Imported Translations from Transifex

Change-Id: Ic42793b5844219cdc2dfed82a5e3b8aad0d88136

23 files changed, 2025 insertions, 3396 deletions

diff --git a/nova/locale/bs/LC_MESSAGES/nova.po b/nova/locale/bs/LC_MESSAGES/nova.po
index 3996b0b00..f4adeb507 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-06 19:37+0000\n"
+"POT-Creation-Date: 2013-05-07 19:38+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"
@@ -168,7 +168,7 @@ msgid ""
 msgstr ""
 
 #: nova/exception.py:235 nova/api/ec2/cloud.py:463
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2769
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2765
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -2726,7 +2726,7 @@ msgstr ""
 msgid "Detach interface %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/baremetal_nodes.py:193
+#: nova/api/openstack/compute/contrib/baremetal_nodes.py:192
 msgid "Must specify id or address"
 msgstr ""
 
@@ -3760,238 +3760,238 @@ msgstr ""
 msgid "No nova entries in syslog!"
 msgstr ""
 
-#: nova/compute/api.py:282
+#: nova/compute/api.py:281
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:289
+#: nova/compute/api.py:288
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:298
+#: nova/compute/api.py:297
 #, 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
+#: nova/compute/api.py:317
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:328
+#: nova/compute/api.py:327
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:332
+#: nova/compute/api.py:331
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:336
+#: nova/compute/api.py:335
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:469
+#: nova/compute/api.py:468
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:509
+#: nova/compute/api.py:508
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:623
+#: nova/compute/api.py:622
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:739
+#: nova/compute/api.py:738
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:766
+#: nova/compute/api.py:765
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1040
+#: nova/compute/api.py:1036
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1176
+#: nova/compute/api.py:1172
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1182
+#: nova/compute/api.py:1178
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1192
+#: nova/compute/api.py:1188
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1236
+#: nova/compute/api.py:1232
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1260
+#: nova/compute/api.py:1256
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1310
+#: nova/compute/api.py:1306
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1327
+#: nova/compute/api.py:1323
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1400
+#: nova/compute/api.py:1396
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1637
+#: nova/compute/api.py:1633
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:1988
+#: nova/compute/api.py:1984
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1997
+#: nova/compute/api.py:1993
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2039
+#: nova/compute/api.py:2035
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2179
+#: nova/compute/api.py:2175
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2286
+#: nova/compute/api.py:2282
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2294
+#: nova/compute/api.py:2290
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2366
+#: nova/compute/api.py:2362
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2479
+#: nova/compute/api.py:2475
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2498
+#: nova/compute/api.py:2494
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2502
+#: nova/compute/api.py:2498
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2749
+#: nova/compute/api.py:2745
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2753
+#: nova/compute/api.py:2749
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2850
+#: nova/compute/api.py:2845
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2853
+#: nova/compute/api.py:2848
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2861
+#: nova/compute/api.py:2856
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2867
+#: nova/compute/api.py:2862
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2887
+#: nova/compute/api.py:2880
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2890
+#: nova/compute/api.py:2883
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2897
+#: nova/compute/api.py:2890
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2962
+#: nova/compute/api.py:2954
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:2967
+#: nova/compute/api.py:2959
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:2975
+#: nova/compute/api.py:2967
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:2978
+#: nova/compute/api.py:2970
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3064 nova/compute/api.py:3141
+#: nova/compute/api.py:3047 nova/compute/api.py:3121
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3080
+#: nova/compute/api.py:3063
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3083
+#: nova/compute/api.py:3066
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3094
+#: nova/compute/api.py:3075
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3148
+#: nova/compute/api.py:3128
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4972,17 +4972,17 @@ msgid ""
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1543
+#: nova/db/sqlalchemy/api.py:1546
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2834
+#: nova/db/sqlalchemy/api.py:2837
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4335
+#: nova/db/sqlalchemy/api.py:4332
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5334,20 +5334,20 @@ msgstr ""
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:495
+#: nova/network/manager.py:480
 msgid "network allocations"
 msgstr ""
 
-#: nova/network/manager.py:502
+#: nova/network/manager.py:487
 #, python-format
 msgid "networks retrieved for instance: |%(networks_list)s|"
 msgstr ""
 
-#: nova/network/manager.py:550
+#: nova/network/manager.py:535
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:816
+#: nova/network/manager.py:801
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -5355,98 +5355,98 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:842
+#: nova/network/manager.py:827
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to allocate fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:896
+#: nova/network/manager.py:879
 msgid "Failed to update usages deallocating fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:930
+#: nova/network/manager.py:911
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:953
+#: nova/network/manager.py:934
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:957
+#: nova/network/manager.py:938
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:966
+#: nova/network/manager.py:947
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:971
+#: nova/network/manager.py:952
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:975
+#: nova/network/manager.py:956
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:979
+#: nova/network/manager.py:960
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:998
+#: nova/network/manager.py:979
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1022
+#: nova/network/manager.py:1003
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1042
+#: 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:1123
+#: nova/network/manager.py:1104
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1126
+#: nova/network/manager.py:1107
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1137
+#: nova/network/manager.py:1118
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1194
+#: nova/network/manager.py:1175
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1213
+#: nova/network/manager.py:1194
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1813
+#: nova/network/manager.py:1794
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1820
+#: nova/network/manager.py:1801
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5516,44 +5516,44 @@ msgstr ""
 msgid "Fail to delete port %(portid)s with failure: %(exception)s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:321
+#: nova/network/quantumv2/api.py:318
 #, python-format
 msgid "deallocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:330
+#: nova/network/quantumv2/api.py:327
 #, python-format
 msgid "Failed to delete quantum port %(portid)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:354
+#: nova/network/quantumv2/api.py:349
 #, python-format
 msgid "Failed to delete quantum port %(port_id)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:381
+#: nova/network/quantumv2/api.py:373
 #, python-format
 msgid "get_instance_nw_info() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:413
+#: 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:443
+#: 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:453
+#: nova/network/quantumv2/api.py:445
 #, python-format
 msgid "validate_networks() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:722
+#: nova/network/quantumv2/api.py:688
 #, python-format
 msgid "Multiple floating IP pools matches found for name '%s'"
 msgstr ""
@@ -6713,7 +6713,7 @@ msgstr ""
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:8707
+#: nova/tests/compute/test_compute.py:8725
 msgid "spawn error"
 msgstr ""
 
@@ -10837,65 +10837,3 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Unexpected error while running command."
-#~ msgstr "Neočekivana greška prilikom pokretanja komande."
-
-#~ msgid ""
-#~ "%(description)s\n"
-#~ "Command: %(cmd)s\n"
-#~ "Exit code: %(exit_code)s\n"
-#~ "Stdout: %(stdout)r\n"
-#~ "Stderr: %(stderr)r"
-#~ msgstr ""
-
-#~ msgid "Error clearing stale veth %s"
-#~ msgstr ""
-
-#~ msgid "Failed unplugging VLAN interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Unplugged VLAN interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Failed unplugging bridge interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Unplugged bridge interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Failed unplugging gateway interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Unplugged gateway interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Network %(net)s for port %(port_id)s not found!"
-#~ msgstr ""
-
-#~ msgid "Host filter ignoring hosts: %(ignored_hosts_str)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "No hosts matched due to not "
-#~ "matching 'force_hosts'value of "
-#~ "'%(forced_hosts_str)s'"
-#~ msgstr ""
-
-#~ msgid "Host filter forcing available hosts to %(forced_hosts_str)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "Getting block stats failed, device might"
-#~ " have been detached. Code=%(errcode)s "
-#~ "Error=%(e)s"
-#~ msgstr ""
-
-#~ msgid "Must specify vmwareapi_wsdl_loc"
-#~ msgstr ""
-
-#~ msgid "Unable to get SR for this host: %s"
-#~ msgstr ""
-
-#~ msgid "VM.assert_can_migratefailed"
-#~ msgstr ""
-
diff --git a/nova/locale/cs/LC_MESSAGES/nova.po b/nova/locale/cs/LC_MESSAGES/nova.po
index b6153ed69..b34b859d2 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-06 19:37+0000\n"
+"POT-Creation-Date: 2013-05-07 19:38+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"
@@ -174,7 +174,7 @@ msgid ""
 msgstr ""
 
 #: nova/exception.py:235 nova/api/ec2/cloud.py:463
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2769
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2765
 msgid "Keypair data is invalid"
 msgstr "Data páru klíčů jsou neplatná"
 
@@ -2813,7 +2813,7 @@ msgstr "vlastnost není podporována: %s"
 msgid "Detach interface %s"
 msgstr "Spouštění rozhraní VLAN %s"
 
-#: nova/api/openstack/compute/contrib/baremetal_nodes.py:193
+#: nova/api/openstack/compute/contrib/baremetal_nodes.py:192
 msgid "Must specify id or address"
 msgstr ""
 
@@ -3894,26 +3894,26 @@ msgstr ""
 msgid "No nova entries in syslog!"
 msgstr ""
 
-#: nova/compute/api.py:282
+#: nova/compute/api.py:281
 #, 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:289
+#: nova/compute/api.py:288
 #, 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:298
+#: nova/compute/api.py:297
 #, 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:318
+#: nova/compute/api.py:317
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
@@ -3922,99 +3922,99 @@ msgstr ""
 "Překročena kvóta pro %(pid)s, pokus o nastavení %(num_metadata)s "
 "vlastností metadat"
 
-#: nova/compute/api.py:328
+#: nova/compute/api.py:327
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:332
+#: nova/compute/api.py:331
 #, 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:336
+#: nova/compute/api.py:335
 #, 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:469
+#: nova/compute/api.py:468
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:509
+#: nova/compute/api.py:508
 #, fuzzy
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr "Nelze připojit svazek k instanci %s"
 
-#: nova/compute/api.py:623
+#: nova/compute/api.py:622
 #, python-format
 msgid "Going to run %s instances..."
 msgstr "Chystá se spuštění %s instancí..."
 
-#: nova/compute/api.py:739
+#: nova/compute/api.py:738
 #, python-format
 msgid "bdm %s"
 msgstr "bdm %s"
 
-#: nova/compute/api.py:766
+#: nova/compute/api.py:765
 #, python-format
 msgid "block_device_mapping %s"
 msgstr "block_device_mapping %s"
 
-#: nova/compute/api.py:1040
+#: nova/compute/api.py:1036
 #, fuzzy
 msgid "instance termination disabled"
 msgstr "BUde spuštěno ukončování insatncí"
 
-#: nova/compute/api.py:1176
+#: nova/compute/api.py:1172
 #, 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:1182
+#: nova/compute/api.py:1178
 #, fuzzy
 msgid "going to delete a resizing instance"
 msgstr "BUde spuštěno ukončování insatncí"
 
-#: nova/compute/api.py:1192
+#: nova/compute/api.py:1188
 #, 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:1236
+#: nova/compute/api.py:1232
 #, fuzzy
 msgid "Going to try to soft delete instance"
 msgstr "Pokus o jemné smazání %s"
 
-#: nova/compute/api.py:1260
+#: nova/compute/api.py:1256
 #, fuzzy
 msgid "Going to try to terminate instance"
 msgstr "Pokus o ukončení %s"
 
-#: nova/compute/api.py:1310
+#: nova/compute/api.py:1306
 #, fuzzy
 msgid "Going to try to stop instance"
 msgstr "Pokus o zastavení %s"
 
-#: nova/compute/api.py:1327
+#: nova/compute/api.py:1323
 #, fuzzy
 msgid "Going to try to start instance"
 msgstr "Pokus o spuštění %s"
 
-#: nova/compute/api.py:1400
+#: nova/compute/api.py:1396
 #, python-format
 msgid "Searching by: %s"
 msgstr "Hledání podle: %s"
 
-#: nova/compute/api.py:1637
+#: nova/compute/api.py:1633
 #, fuzzy, python-format
 msgid "snapshot for %s"
 msgstr "Spouštění snímku ve VM %s"
 
-#: nova/compute/api.py:1988
+#: nova/compute/api.py:1984
 msgid "flavor_id is None. Assuming migration."
 msgstr "flavor_id je None. Předpokládán přesun."
 
-#: nova/compute/api.py:1997
+#: nova/compute/api.py:1993
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
@@ -4023,62 +4023,62 @@ msgstr ""
 "Stará instance typu %(current_instance_type_name)s, nová instance typu "
 "%(new_instance_type_name)s"
 
-#: nova/compute/api.py:2039
+#: nova/compute/api.py:2035
 #, 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:2179
+#: nova/compute/api.py:2175
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2286
+#: nova/compute/api.py:2282
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2294
+#: nova/compute/api.py:2290
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2366
+#: nova/compute/api.py:2362
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2479
+#: nova/compute/api.py:2475
 #, fuzzy, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr "Pokus o ukončení %s"
 
-#: nova/compute/api.py:2498
+#: nova/compute/api.py:2494
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2502
+#: nova/compute/api.py:2498
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2749
+#: nova/compute/api.py:2745
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2753
+#: nova/compute/api.py:2749
 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:2850
+#: nova/compute/api.py:2845
 #, 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:2853
+#: nova/compute/api.py:2848
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr "Bezpečnostní skupina %s nemůže být prázdná."
 
-#: nova/compute/api.py:2861
+#: nova/compute/api.py:2856
 #, fuzzy, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
@@ -4087,65 +4087,65 @@ msgstr ""
 "Hodnota (%s) parametru GroupName je neplatná. Délka překračuje maximum "
 "255 znaků."
 
-#: nova/compute/api.py:2867
+#: nova/compute/api.py:2862
 #, 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:2887
+#: nova/compute/api.py:2880
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2890
+#: nova/compute/api.py:2883
 #, python-format
 msgid "Create Security Group %s"
 msgstr "Vytvořit bezpečnostní skupinu %s"
 
-#: nova/compute/api.py:2897
+#: nova/compute/api.py:2890
 #, python-format
 msgid "Security group %s already exists"
 msgstr "Bezpečnostní skupina %s již existuje"
 
-#: nova/compute/api.py:2962
+#: nova/compute/api.py:2954
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "Nelze zničit vbd %s"
 
-#: nova/compute/api.py:2967
+#: nova/compute/api.py:2959
 #, fuzzy
 msgid "Security group is still in use"
 msgstr "Id bezpečnostní skupiny by mělo být celé číslo"
 
-#: nova/compute/api.py:2975
+#: nova/compute/api.py:2967
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:2978
+#: nova/compute/api.py:2970
 #, python-format
 msgid "Delete security group %s"
 msgstr "Smazat bezpečnostní skupinu %s"
 
-#: nova/compute/api.py:3064 nova/compute/api.py:3141
+#: nova/compute/api.py:3047 nova/compute/api.py:3121
 #, python-format
 msgid "Rule (%s) not found"
 msgstr "Pravidlo (%s) nenalezeno"
 
-#: nova/compute/api.py:3080
+#: nova/compute/api.py:3063
 #, fuzzy
 msgid "Quota exceeded, too many security group rules."
 msgstr "Přidávání pravidla bezpečnostní skupiny: %r"
 
-#: nova/compute/api.py:3083
+#: nova/compute/api.py:3066
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr "Povolit přístup bezpečnostní skupiny %s"
 
-#: nova/compute/api.py:3094
+#: nova/compute/api.py:3075
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr "Zrušit přístup bezpečnostní skupiny %s"
 
-#: nova/compute/api.py:3148
+#: nova/compute/api.py:3128
 msgid "Security group id should be integer"
 msgstr "Id bezpečnostní skupiny by mělo být celé číslo"
 
@@ -5189,17 +5189,17 @@ msgid ""
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1543
+#: nova/db/sqlalchemy/api.py:1546
 #, fuzzy, python-format
 msgid "Invalid instance id %s in request"
 msgstr "instance %s: zachráněna"
 
-#: nova/db/sqlalchemy/api.py:2834
+#: nova/db/sqlalchemy/api.py:2837
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4335
+#: nova/db/sqlalchemy/api.py:4332
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5558,22 +5558,22 @@ msgstr "%s odloučených zastaralých ip"
 msgid "setting network host"
 msgstr "nastavování hostitele sítě"
 
-#: nova/network/manager.py:495
+#: nova/network/manager.py:480
 #, fuzzy
 msgid "network allocations"
 msgstr "přidělování sítě pro instanci %s"
 
-#: nova/network/manager.py:502
+#: nova/network/manager.py:487
 #, fuzzy, python-format
 msgid "networks retrieved for instance: |%(networks_list)s|"
 msgstr "sítě získané pro instanci |%(instance_id)s|: |%(networks)s|"
 
-#: nova/network/manager.py:550
+#: nova/network/manager.py:535
 #, fuzzy
 msgid "network deallocation for instance"
 msgstr "oddělení sítě pro instanci |%s|"
 
-#: nova/network/manager.py:816
+#: nova/network/manager.py:801
 #, fuzzy, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -5584,79 +5584,79 @@ msgstr ""
 " Instance |%(instance)s| je v zóně |%(zone2)s|. Nebude vytvořen žádný "
 "záznam DNS."
 
-#: nova/network/manager.py:842
+#: nova/network/manager.py:827
 #, fuzzy, python-format
 msgid "Quota exceeded for %(pid)s, tried to allocate fixed IP"
 msgstr "Pro %s překročena kvóta, pokus o přidělení adresy"
 
-#: nova/network/manager.py:896
+#: nova/network/manager.py:879
 #, fuzzy
 msgid "Failed to update usages deallocating fixed IP"
 msgstr "Nelze aktualizovat svazek v db"
 
-#: nova/network/manager.py:930
+#: nova/network/manager.py:911
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:953
+#: nova/network/manager.py:934
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr "Vypůjčená IP |%(address)s|"
 
-#: nova/network/manager.py:957
+#: nova/network/manager.py:938
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr "Vypůjčená IP %s není přidělena"
 
-#: nova/network/manager.py:966
+#: nova/network/manager.py:947
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr "Vypůjčena IP |%s|, která není přidělena"
 
-#: nova/network/manager.py:971
+#: nova/network/manager.py:952
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr "Uvolněna IP |%(address)s|"
 
-#: nova/network/manager.py:975
+#: nova/network/manager.py:956
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr "Uvolněna IP %s, která není přidělena"
 
-#: nova/network/manager.py:979
+#: nova/network/manager.py:960
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr "Uvolněna IP %s, která nebyla vypůjčena"
 
-#: nova/network/manager.py:998
+#: nova/network/manager.py:979
 #, fuzzy, python-format
 msgid "%s must be an integer"
 msgstr "parametr offset musí být celé číslo"
 
-#: nova/network/manager.py:1022
+#: nova/network/manager.py:1003
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1042
+#: 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:1123
+#: nova/network/manager.py:1104
 msgid "cidr already in use"
 msgstr "cidr je již používáno"
 
-#: nova/network/manager.py:1126
+#: nova/network/manager.py:1107
 #, 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:1137
+#: nova/network/manager.py:1118
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
@@ -5665,22 +5665,22 @@ msgstr ""
 "požadovaný cidr (%(cidr)s) je v konfliktu s existujícím menším cidr "
 "(%(smaller)s)"
 
-#: nova/network/manager.py:1194
+#: nova/network/manager.py:1175
 msgid "Network already exists!"
 msgstr "Síť již existuje!"
 
-#: nova/network/manager.py:1213
+#: nova/network/manager.py:1194
 #, 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:1813
+#: nova/network/manager.py:1794
 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:1820
+#: nova/network/manager.py:1801
 #, fuzzy, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5754,44 +5754,44 @@ msgstr "Hostitel nenalezen"
 msgid "Fail to delete port %(portid)s with failure: %(exception)s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:321
+#: nova/network/quantumv2/api.py:318
 #, fuzzy, python-format
 msgid "deallocate_for_instance() for %s"
 msgstr "oddělení sítě pro instanci |%s|"
 
-#: nova/network/quantumv2/api.py:330
+#: nova/network/quantumv2/api.py:327
 #, fuzzy, python-format
 msgid "Failed to delete quantum port %(portid)s "
 msgstr "Nelze smazat svazek v db"
 
-#: nova/network/quantumv2/api.py:354
+#: nova/network/quantumv2/api.py:349
 #, fuzzy, python-format
 msgid "Failed to delete quantum port %(port_id)s "
 msgstr "Nelze smazat svazek v db"
 
-#: nova/network/quantumv2/api.py:381
+#: nova/network/quantumv2/api.py:373
 #, fuzzy, python-format
 msgid "get_instance_nw_info() for %s"
 msgstr "Informace o síti instance: |%s|"
 
-#: nova/network/quantumv2/api.py:413
+#: 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:443
+#: 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:453
+#: nova/network/quantumv2/api.py:445
 #, fuzzy, python-format
 msgid "validate_networks() for %s"
 msgstr "Špatný formát sítě"
 
-#: nova/network/quantumv2/api.py:722
+#: nova/network/quantumv2/api.py:688
 #, fuzzy, python-format
 msgid "Multiple floating IP pools matches found for name '%s'"
 msgstr "Plovoucí ip není nalezena pro id %(id)s."
@@ -6984,7 +6984,7 @@ msgstr "Po vynuceném ukončení instancí: %s"
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:8707
+#: nova/tests/compute/test_compute.py:8725
 #, fuzzy
 msgid "spawn error"
 msgstr "neznámá chyby připojení hosta"
@@ -11339,70 +11339,3 @@ msgstr "stav musí být dostupný"
 msgid "status must be 'available'"
 msgstr "stav musí být dostupný"
 
-#~ msgid "Unexpected error while running command."
-#~ msgstr "Při spuštění příkazu došlo k nečekané chybě."
-
-#~ msgid ""
-#~ "%(description)s\n"
-#~ "Command: %(cmd)s\n"
-#~ "Exit code: %(exit_code)s\n"
-#~ "Stdout: %(stdout)r\n"
-#~ "Stderr: %(stderr)r"
-#~ msgstr ""
-#~ "%(description)s\n"
-#~ "Příkaz: %(cmd)s\n"
-#~ "Kód ukončení: %(exit_code)s\n"
-#~ "Stdout: %(stdout)r\n"
-#~ "Stderr: %(stderr)r"
-
-#~ msgid "Error clearing stale veth %s"
-#~ msgstr "Chyba při spouštění xvp: %s"
-
-#~ msgid "Failed unplugging VLAN interface '%s'"
-#~ msgstr "Nelze při odpojení vif instance '%s'"
-
-#~ msgid "Unplugged VLAN interface '%s'"
-#~ msgstr "Nelze při odpojení vif instance '%s'"
-
-#~ msgid "Failed unplugging bridge interface '%s'"
-#~ msgstr "Nelze při odpojení vif instance '%s'"
-
-#~ msgid "Unplugged bridge interface '%s'"
-#~ msgstr "Nelze při odpojení vif instance '%s'"
-
-#~ msgid "Failed unplugging gateway interface '%s'"
-#~ msgstr "Nelze při odpojení vif instance '%s'"
-
-#~ msgid "Unplugged gateway interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Network %(net)s for port %(port_id)s not found!"
-#~ msgstr "Síť %(network_id)s nemohla být nalezena."
-
-#~ msgid "Host filter ignoring hosts: %(ignored_hosts_str)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "No hosts matched due to not "
-#~ "matching 'force_hosts'value of "
-#~ "'%(forced_hosts_str)s'"
-#~ msgstr ""
-
-#~ msgid "Host filter forcing available hosts to %(forced_hosts_str)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "Getting block stats failed, device might"
-#~ " have been detached. Code=%(errcode)s "
-#~ "Error=%(e)s"
-#~ msgstr ""
-
-#~ msgid "Must specify vmwareapi_wsdl_loc"
-#~ msgstr "Je třeba zadat vmwareapi_wsdl_loc"
-
-#~ msgid "Unable to get SR for this host: %s"
-#~ msgstr "Nelze získat SR pro tohoto hostitele: %s"
-
-#~ msgid "VM.assert_can_migratefailed"
-#~ msgstr ""
-
diff --git a/nova/locale/da/LC_MESSAGES/nova.po b/nova/locale/da/LC_MESSAGES/nova.po
index cc0e7f1c8..9d282f076 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-06 19:37+0000\n"
+"POT-Creation-Date: 2013-05-07 19:38+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"
@@ -168,7 +168,7 @@ msgid ""
 msgstr ""
 
 #: nova/exception.py:235 nova/api/ec2/cloud.py:463
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2769
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2765
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -2726,7 +2726,7 @@ msgstr ""
 msgid "Detach interface %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/baremetal_nodes.py:193
+#: nova/api/openstack/compute/contrib/baremetal_nodes.py:192
 msgid "Must specify id or address"
 msgstr ""
 
@@ -3760,238 +3760,238 @@ msgstr ""
 msgid "No nova entries in syslog!"
 msgstr ""
 
-#: nova/compute/api.py:282
+#: nova/compute/api.py:281
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:289
+#: nova/compute/api.py:288
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:298
+#: nova/compute/api.py:297
 #, 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
+#: nova/compute/api.py:317
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:328
+#: nova/compute/api.py:327
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:332
+#: nova/compute/api.py:331
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:336
+#: nova/compute/api.py:335
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:469
+#: nova/compute/api.py:468
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:509
+#: nova/compute/api.py:508
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:623
+#: nova/compute/api.py:622
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:739
+#: nova/compute/api.py:738
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:766
+#: nova/compute/api.py:765
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1040
+#: nova/compute/api.py:1036
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1176
+#: nova/compute/api.py:1172
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1182
+#: nova/compute/api.py:1178
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1192
+#: nova/compute/api.py:1188
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1236
+#: nova/compute/api.py:1232
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1260
+#: nova/compute/api.py:1256
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1310
+#: nova/compute/api.py:1306
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1327
+#: nova/compute/api.py:1323
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1400
+#: nova/compute/api.py:1396
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1637
+#: nova/compute/api.py:1633
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:1988
+#: nova/compute/api.py:1984
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1997
+#: nova/compute/api.py:1993
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2039
+#: nova/compute/api.py:2035
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2179
+#: nova/compute/api.py:2175
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2286
+#: nova/compute/api.py:2282
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2294
+#: nova/compute/api.py:2290
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2366
+#: nova/compute/api.py:2362
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2479
+#: nova/compute/api.py:2475
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2498
+#: nova/compute/api.py:2494
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2502
+#: nova/compute/api.py:2498
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2749
+#: nova/compute/api.py:2745
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2753
+#: nova/compute/api.py:2749
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2850
+#: nova/compute/api.py:2845
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2853
+#: nova/compute/api.py:2848
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2861
+#: nova/compute/api.py:2856
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2867
+#: nova/compute/api.py:2862
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2887
+#: nova/compute/api.py:2880
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2890
+#: nova/compute/api.py:2883
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2897
+#: nova/compute/api.py:2890
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2962
+#: nova/compute/api.py:2954
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:2967
+#: nova/compute/api.py:2959
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:2975
+#: nova/compute/api.py:2967
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:2978
+#: nova/compute/api.py:2970
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3064 nova/compute/api.py:3141
+#: nova/compute/api.py:3047 nova/compute/api.py:3121
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3080
+#: nova/compute/api.py:3063
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3083
+#: nova/compute/api.py:3066
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3094
+#: nova/compute/api.py:3075
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3148
+#: nova/compute/api.py:3128
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4972,17 +4972,17 @@ msgid ""
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1543
+#: nova/db/sqlalchemy/api.py:1546
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2834
+#: nova/db/sqlalchemy/api.py:2837
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4335
+#: nova/db/sqlalchemy/api.py:4332
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5334,20 +5334,20 @@ msgstr ""
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:495
+#: nova/network/manager.py:480
 msgid "network allocations"
 msgstr ""
 
-#: nova/network/manager.py:502
+#: nova/network/manager.py:487
 #, python-format
 msgid "networks retrieved for instance: |%(networks_list)s|"
 msgstr ""
 
-#: nova/network/manager.py:550
+#: nova/network/manager.py:535
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:816
+#: nova/network/manager.py:801
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -5355,98 +5355,98 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:842
+#: nova/network/manager.py:827
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to allocate fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:896
+#: nova/network/manager.py:879
 msgid "Failed to update usages deallocating fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:930
+#: nova/network/manager.py:911
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:953
+#: nova/network/manager.py:934
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:957
+#: nova/network/manager.py:938
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:966
+#: nova/network/manager.py:947
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:971
+#: nova/network/manager.py:952
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:975
+#: nova/network/manager.py:956
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:979
+#: nova/network/manager.py:960
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:998
+#: nova/network/manager.py:979
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1022
+#: nova/network/manager.py:1003
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1042
+#: 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:1123
+#: nova/network/manager.py:1104
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1126
+#: nova/network/manager.py:1107
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1137
+#: nova/network/manager.py:1118
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1194
+#: nova/network/manager.py:1175
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1213
+#: nova/network/manager.py:1194
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1813
+#: nova/network/manager.py:1794
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1820
+#: nova/network/manager.py:1801
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5516,44 +5516,44 @@ msgstr ""
 msgid "Fail to delete port %(portid)s with failure: %(exception)s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:321
+#: nova/network/quantumv2/api.py:318
 #, python-format
 msgid "deallocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:330
+#: nova/network/quantumv2/api.py:327
 #, python-format
 msgid "Failed to delete quantum port %(portid)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:354
+#: nova/network/quantumv2/api.py:349
 #, python-format
 msgid "Failed to delete quantum port %(port_id)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:381
+#: nova/network/quantumv2/api.py:373
 #, python-format
 msgid "get_instance_nw_info() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:413
+#: 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:443
+#: 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:453
+#: nova/network/quantumv2/api.py:445
 #, python-format
 msgid "validate_networks() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:722
+#: nova/network/quantumv2/api.py:688
 #, python-format
 msgid "Multiple floating IP pools matches found for name '%s'"
 msgstr ""
@@ -6713,7 +6713,7 @@ msgstr ""
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:8707
+#: nova/tests/compute/test_compute.py:8725
 msgid "spawn error"
 msgstr ""
 
@@ -10838,65 +10838,3 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Unexpected error while running command."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "%(description)s\n"
-#~ "Command: %(cmd)s\n"
-#~ "Exit code: %(exit_code)s\n"
-#~ "Stdout: %(stdout)r\n"
-#~ "Stderr: %(stderr)r"
-#~ msgstr ""
-
-#~ msgid "Error clearing stale veth %s"
-#~ msgstr ""
-
-#~ msgid "Failed unplugging VLAN interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Unplugged VLAN interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Failed unplugging bridge interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Unplugged bridge interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Failed unplugging gateway interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Unplugged gateway interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Network %(net)s for port %(port_id)s not found!"
-#~ msgstr ""
-
-#~ msgid "Host filter ignoring hosts: %(ignored_hosts_str)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "No hosts matched due to not "
-#~ "matching 'force_hosts'value of "
-#~ "'%(forced_hosts_str)s'"
-#~ msgstr ""
-
-#~ msgid "Host filter forcing available hosts to %(forced_hosts_str)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "Getting block stats failed, device might"
-#~ " have been detached. Code=%(errcode)s "
-#~ "Error=%(e)s"
-#~ msgstr ""
-
-#~ msgid "Must specify vmwareapi_wsdl_loc"
-#~ msgstr ""
-
-#~ msgid "Unable to get SR for this host: %s"
-#~ msgstr ""
-
-#~ msgid "VM.assert_can_migratefailed"
-#~ msgstr ""
-
diff --git a/nova/locale/de/LC_MESSAGES/nova.po b/nova/locale/de/LC_MESSAGES/nova.po
index 02882f5fa..24503a76a 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-06 19:37+0000\n"
+"POT-Creation-Date: 2013-05-07 19:38+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"
@@ -168,7 +168,7 @@ msgid ""
 msgstr ""
 
 #: nova/exception.py:235 nova/api/ec2/cloud.py:463
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2769
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2765
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -2730,7 +2730,7 @@ msgstr ""
 msgid "Detach interface %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/baremetal_nodes.py:193
+#: nova/api/openstack/compute/contrib/baremetal_nodes.py:192
 msgid "Must specify id or address"
 msgstr ""
 
@@ -3767,239 +3767,239 @@ msgstr ""
 msgid "No nova entries in syslog!"
 msgstr ""
 
-#: nova/compute/api.py:282
+#: nova/compute/api.py:281
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:289
+#: nova/compute/api.py:288
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:298
+#: nova/compute/api.py:297
 #, 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
+#: nova/compute/api.py:317
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:328
+#: nova/compute/api.py:327
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:332
+#: nova/compute/api.py:331
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:336
+#: nova/compute/api.py:335
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:469
+#: nova/compute/api.py:468
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:509
+#: nova/compute/api.py:508
 #, 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:623
+#: nova/compute/api.py:622
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:739
+#: nova/compute/api.py:738
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:766
+#: nova/compute/api.py:765
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1040
+#: nova/compute/api.py:1036
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1176
+#: nova/compute/api.py:1172
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1182
+#: nova/compute/api.py:1178
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1192
+#: nova/compute/api.py:1188
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1236
+#: nova/compute/api.py:1232
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1260
+#: nova/compute/api.py:1256
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1310
+#: nova/compute/api.py:1306
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1327
+#: nova/compute/api.py:1323
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1400
+#: nova/compute/api.py:1396
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1637
+#: nova/compute/api.py:1633
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:1988
+#: nova/compute/api.py:1984
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1997
+#: nova/compute/api.py:1993
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2039
+#: nova/compute/api.py:2035
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2179
+#: nova/compute/api.py:2175
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2286
+#: nova/compute/api.py:2282
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2294
+#: nova/compute/api.py:2290
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2366
+#: nova/compute/api.py:2362
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2479
+#: nova/compute/api.py:2475
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2498
+#: nova/compute/api.py:2494
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2502
+#: nova/compute/api.py:2498
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2749
+#: nova/compute/api.py:2745
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2753
+#: nova/compute/api.py:2749
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2850
+#: nova/compute/api.py:2845
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2853
+#: nova/compute/api.py:2848
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2861
+#: nova/compute/api.py:2856
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2867
+#: nova/compute/api.py:2862
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2887
+#: nova/compute/api.py:2880
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2890
+#: nova/compute/api.py:2883
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2897
+#: nova/compute/api.py:2890
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2962
+#: nova/compute/api.py:2954
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "Nicht möglich volume %s zufinden"
 
-#: nova/compute/api.py:2967
+#: nova/compute/api.py:2959
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:2975
+#: nova/compute/api.py:2967
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:2978
+#: nova/compute/api.py:2970
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3064 nova/compute/api.py:3141
+#: nova/compute/api.py:3047 nova/compute/api.py:3121
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3080
+#: nova/compute/api.py:3063
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3083
+#: nova/compute/api.py:3066
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3094
+#: nova/compute/api.py:3075
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3148
+#: nova/compute/api.py:3128
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4987,17 +4987,17 @@ msgid ""
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1543
+#: nova/db/sqlalchemy/api.py:1546
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2834
+#: nova/db/sqlalchemy/api.py:2837
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4335
+#: nova/db/sqlalchemy/api.py:4332
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5349,20 +5349,20 @@ msgstr ""
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:495
+#: nova/network/manager.py:480
 msgid "network allocations"
 msgstr ""
 
-#: nova/network/manager.py:502
+#: nova/network/manager.py:487
 #, python-format
 msgid "networks retrieved for instance: |%(networks_list)s|"
 msgstr ""
 
-#: nova/network/manager.py:550
+#: nova/network/manager.py:535
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:816
+#: nova/network/manager.py:801
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -5370,98 +5370,98 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:842
+#: nova/network/manager.py:827
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to allocate fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:896
+#: nova/network/manager.py:879
 msgid "Failed to update usages deallocating fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:930
+#: nova/network/manager.py:911
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:953
+#: nova/network/manager.py:934
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:957
+#: nova/network/manager.py:938
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:966
+#: nova/network/manager.py:947
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:971
+#: nova/network/manager.py:952
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:975
+#: nova/network/manager.py:956
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:979
+#: nova/network/manager.py:960
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:998
+#: nova/network/manager.py:979
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1022
+#: nova/network/manager.py:1003
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1042
+#: 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:1123
+#: nova/network/manager.py:1104
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1126
+#: nova/network/manager.py:1107
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1137
+#: nova/network/manager.py:1118
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1194
+#: nova/network/manager.py:1175
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1213
+#: nova/network/manager.py:1194
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1813
+#: nova/network/manager.py:1794
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1820
+#: nova/network/manager.py:1801
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5532,44 +5532,44 @@ msgstr "Instanz %s pausiert"
 msgid "Fail to delete port %(portid)s with failure: %(exception)s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:321
+#: nova/network/quantumv2/api.py:318
 #, python-format
 msgid "deallocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:330
+#: nova/network/quantumv2/api.py:327
 #, python-format
 msgid "Failed to delete quantum port %(portid)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:354
+#: nova/network/quantumv2/api.py:349
 #, python-format
 msgid "Failed to delete quantum port %(port_id)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:381
+#: nova/network/quantumv2/api.py:373
 #, python-format
 msgid "get_instance_nw_info() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:413
+#: 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:443
+#: 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:453
+#: nova/network/quantumv2/api.py:445
 #, python-format
 msgid "validate_networks() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:722
+#: nova/network/quantumv2/api.py:688
 #, python-format
 msgid "Multiple floating IP pools matches found for name '%s'"
 msgstr ""
@@ -6729,7 +6729,7 @@ msgstr ""
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:8707
+#: nova/tests/compute/test_compute.py:8725
 msgid "spawn error"
 msgstr ""
 
@@ -10865,70 +10865,3 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Unexpected error while running command."
-#~ msgstr "Unerwarteter Fehler bei Ausführung des Kommandos."
-
-#~ msgid ""
-#~ "%(description)s\n"
-#~ "Command: %(cmd)s\n"
-#~ "Exit code: %(exit_code)s\n"
-#~ "Stdout: %(stdout)r\n"
-#~ "Stderr: %(stderr)r"
-#~ msgstr ""
-#~ "%(description)s\n"
-#~ "Befehl: %(cmd)s\n"
-#~ "Exit-Code: %(exit_code)s\n"
-#~ "Stdout: %(stdout)r\n"
-#~ "Stderr: %(stderr)r"
-
-#~ msgid "Error clearing stale veth %s"
-#~ msgstr ""
-
-#~ msgid "Failed unplugging VLAN interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Unplugged VLAN interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Failed unplugging bridge interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Unplugged bridge interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Failed unplugging gateway interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Unplugged gateway interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Network %(net)s for port %(port_id)s not found!"
-#~ msgstr ""
-
-#~ msgid "Host filter ignoring hosts: %(ignored_hosts_str)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "No hosts matched due to not "
-#~ "matching 'force_hosts'value of "
-#~ "'%(forced_hosts_str)s'"
-#~ msgstr ""
-
-#~ msgid "Host filter forcing available hosts to %(forced_hosts_str)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "Getting block stats failed, device might"
-#~ " have been detached. Code=%(errcode)s "
-#~ "Error=%(e)s"
-#~ msgstr ""
-
-#~ msgid "Must specify vmwareapi_wsdl_loc"
-#~ msgstr ""
-
-#~ msgid "Unable to get SR for this host: %s"
-#~ msgstr ""
-
-#~ msgid "VM.assert_can_migratefailed"
-#~ msgstr ""
-
diff --git a/nova/locale/en_AU/LC_MESSAGES/nova.po b/nova/locale/en_AU/LC_MESSAGES/nova.po
index a4f7c8f3f..27b9f3b4a 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-06 19:37+0000\n"
+"POT-Creation-Date: 2013-05-07 19:38+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"
@@ -169,7 +169,7 @@ msgid ""
 msgstr ""
 
 #: nova/exception.py:235 nova/api/ec2/cloud.py:463
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2769
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2765
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -2747,7 +2747,7 @@ msgstr "attribute not supported: %s"
 msgid "Detach interface %s"
 msgstr "Starting VLAN interface %s"
 
-#: nova/api/openstack/compute/contrib/baremetal_nodes.py:193
+#: nova/api/openstack/compute/contrib/baremetal_nodes.py:192
 msgid "Must specify id or address"
 msgstr ""
 
@@ -3802,247 +3802,247 @@ msgstr ""
 msgid "No nova entries in syslog!"
 msgstr ""
 
-#: nova/compute/api.py:282
+#: nova/compute/api.py:281
 #, 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:289
+#: nova/compute/api.py:288
 #, 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:298
+#: nova/compute/api.py:297
 #, 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
+#: nova/compute/api.py:317
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:328
+#: nova/compute/api.py:327
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:332
+#: nova/compute/api.py:331
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:336
+#: nova/compute/api.py:335
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:469
+#: nova/compute/api.py:468
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:509
+#: nova/compute/api.py:508
 #, fuzzy
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr "Unable to attach volume to instance %s"
 
-#: nova/compute/api.py:623
+#: nova/compute/api.py:622
 #, python-format
 msgid "Going to run %s instances..."
 msgstr "Going to run %s instances..."
 
-#: nova/compute/api.py:739
+#: nova/compute/api.py:738
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:766
+#: nova/compute/api.py:765
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1040
+#: nova/compute/api.py:1036
 #, fuzzy
 msgid "instance termination disabled"
 msgstr "Going to start terminating instances"
 
-#: nova/compute/api.py:1176
+#: nova/compute/api.py:1172
 #, fuzzy, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr "instance %s: booted"
 
-#: nova/compute/api.py:1182
+#: nova/compute/api.py:1178
 #, fuzzy
 msgid "going to delete a resizing instance"
 msgstr "Going to start terminating instances"
 
-#: nova/compute/api.py:1192
+#: nova/compute/api.py:1188
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1236
+#: nova/compute/api.py:1232
 #, fuzzy
 msgid "Going to try to soft delete instance"
 msgstr "Going to try to terminate %s"
 
-#: nova/compute/api.py:1260
+#: nova/compute/api.py:1256
 #, fuzzy
 msgid "Going to try to terminate instance"
 msgstr "Going to try to terminate %s"
 
-#: nova/compute/api.py:1310
+#: nova/compute/api.py:1306
 #, fuzzy
 msgid "Going to try to stop instance"
 msgstr "Going to try to terminate %s"
 
-#: nova/compute/api.py:1327
+#: nova/compute/api.py:1323
 #, fuzzy
 msgid "Going to try to start instance"
 msgstr "Going to try to terminate %s"
 
-#: nova/compute/api.py:1400
+#: nova/compute/api.py:1396
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1637
+#: nova/compute/api.py:1633
 #, fuzzy, python-format
 msgid "snapshot for %s"
 msgstr "Starting snapshot for VM %s"
 
-#: nova/compute/api.py:1988
+#: nova/compute/api.py:1984
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1997
+#: nova/compute/api.py:1993
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2039
+#: nova/compute/api.py:2035
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2179
+#: nova/compute/api.py:2175
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2286
+#: nova/compute/api.py:2282
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2294
+#: nova/compute/api.py:2290
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2366
+#: nova/compute/api.py:2362
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2479
+#: nova/compute/api.py:2475
 #, fuzzy, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr "Going to try to terminate %s"
 
-#: nova/compute/api.py:2498
+#: nova/compute/api.py:2494
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2502
+#: nova/compute/api.py:2498
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2749
+#: nova/compute/api.py:2745
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2753
+#: nova/compute/api.py:2749
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2850
+#: nova/compute/api.py:2845
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2853
+#: nova/compute/api.py:2848
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2861
+#: nova/compute/api.py:2856
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2867
+#: nova/compute/api.py:2862
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2887
+#: nova/compute/api.py:2880
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2890
+#: nova/compute/api.py:2883
 #, python-format
 msgid "Create Security Group %s"
 msgstr "Create Security Group %s"
 
-#: nova/compute/api.py:2897
+#: nova/compute/api.py:2890
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2962
+#: nova/compute/api.py:2954
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "Unable to destroy VBD %s"
 
-#: nova/compute/api.py:2967
+#: nova/compute/api.py:2959
 #, fuzzy
 msgid "Security group is still in use"
 msgstr "Revoke security group ingress %s"
 
-#: nova/compute/api.py:2975
+#: nova/compute/api.py:2967
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:2978
+#: nova/compute/api.py:2970
 #, python-format
 msgid "Delete security group %s"
 msgstr "Delete security group %s"
 
-#: nova/compute/api.py:3064 nova/compute/api.py:3141
+#: nova/compute/api.py:3047 nova/compute/api.py:3121
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3080
+#: nova/compute/api.py:3063
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3083
+#: nova/compute/api.py:3066
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr "Authorise security group ingress %s"
 
-#: nova/compute/api.py:3094
+#: nova/compute/api.py:3075
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr "Revoke security group ingress %s"
 
-#: nova/compute/api.py:3148
+#: nova/compute/api.py:3128
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -5045,17 +5045,17 @@ msgid ""
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1543
+#: nova/db/sqlalchemy/api.py:1546
 #, fuzzy, python-format
 msgid "Invalid instance id %s in request"
 msgstr "instance %s: rescued"
 
-#: nova/db/sqlalchemy/api.py:2834
+#: nova/db/sqlalchemy/api.py:2837
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4335
+#: nova/db/sqlalchemy/api.py:4332
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5408,20 +5408,20 @@ msgstr ""
 msgid "setting network host"
 msgstr "setting network host"
 
-#: nova/network/manager.py:495
+#: nova/network/manager.py:480
 msgid "network allocations"
 msgstr ""
 
-#: nova/network/manager.py:502
+#: nova/network/manager.py:487
 #, python-format
 msgid "networks retrieved for instance: |%(networks_list)s|"
 msgstr ""
 
-#: nova/network/manager.py:550
+#: nova/network/manager.py:535
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:816
+#: nova/network/manager.py:801
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -5429,92 +5429,92 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:842
+#: nova/network/manager.py:827
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to allocate fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:896
+#: nova/network/manager.py:879
 msgid "Failed to update usages deallocating fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:930
+#: nova/network/manager.py:911
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:953
+#: nova/network/manager.py:934
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:957
+#: nova/network/manager.py:938
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:966
+#: nova/network/manager.py:947
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:971
+#: nova/network/manager.py:952
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:975
+#: nova/network/manager.py:956
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:979
+#: nova/network/manager.py:960
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr "IP %s released that was not leased"
 
-#: nova/network/manager.py:998
+#: nova/network/manager.py:979
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1022
+#: nova/network/manager.py:1003
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1042
+#: 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:1123
+#: nova/network/manager.py:1104
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1126
+#: nova/network/manager.py:1107
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1137
+#: nova/network/manager.py:1118
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1194
+#: nova/network/manager.py:1175
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1213
+#: nova/network/manager.py:1194
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1813
+#: nova/network/manager.py:1794
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
@@ -5522,7 +5522,7 @@ msgstr ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 
-#: nova/network/manager.py:1820
+#: nova/network/manager.py:1801
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5594,44 +5594,44 @@ msgstr "instance %s: booted"
 msgid "Fail to delete port %(portid)s with failure: %(exception)s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:321
+#: nova/network/quantumv2/api.py:318
 #, python-format
 msgid "deallocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:330
+#: nova/network/quantumv2/api.py:327
 #, python-format
 msgid "Failed to delete quantum port %(portid)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:354
+#: nova/network/quantumv2/api.py:349
 #, python-format
 msgid "Failed to delete quantum port %(port_id)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:381
+#: nova/network/quantumv2/api.py:373
 #, python-format
 msgid "get_instance_nw_info() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:413
+#: 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:443
+#: 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:453
+#: nova/network/quantumv2/api.py:445
 #, python-format
 msgid "validate_networks() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:722
+#: nova/network/quantumv2/api.py:688
 #, fuzzy, python-format
 msgid "Multiple floating IP pools matches found for name '%s'"
 msgstr "setting network host"
@@ -6800,7 +6800,7 @@ msgstr ""
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:8707
+#: nova/tests/compute/test_compute.py:8725
 msgid "spawn error"
 msgstr ""
 
@@ -10979,70 +10979,3 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Unexpected error while running command."
-#~ msgstr "Unexpected error while running command."
-
-#~ msgid ""
-#~ "%(description)s\n"
-#~ "Command: %(cmd)s\n"
-#~ "Exit code: %(exit_code)s\n"
-#~ "Stdout: %(stdout)r\n"
-#~ "Stderr: %(stderr)r"
-#~ msgstr ""
-#~ "%(description)s\n"
-#~ "Command: %(cmd)s\n"
-#~ "Exit code: %(exit_code)s\n"
-#~ "Stdout: %(stdout)r\n"
-#~ "Stderr: %(stderr)r"
-
-#~ msgid "Error clearing stale veth %s"
-#~ msgstr "Error starting xvp: %s"
-
-#~ msgid "Failed unplugging VLAN interface '%s'"
-#~ msgstr "Failed to decrypt private key: %s"
-
-#~ msgid "Unplugged VLAN interface '%s'"
-#~ msgstr "Failed to decrypt private key: %s"
-
-#~ msgid "Failed unplugging bridge interface '%s'"
-#~ msgstr "Starting Bridge interface for %s"
-
-#~ msgid "Unplugged bridge interface '%s'"
-#~ msgstr "Starting Bridge interface for %s"
-
-#~ msgid "Failed unplugging gateway interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Unplugged gateway interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Network %(net)s for port %(port_id)s not found!"
-#~ msgstr ""
-
-#~ msgid "Host filter ignoring hosts: %(ignored_hosts_str)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "No hosts matched due to not "
-#~ "matching 'force_hosts'value of "
-#~ "'%(forced_hosts_str)s'"
-#~ msgstr ""
-
-#~ msgid "Host filter forcing available hosts to %(forced_hosts_str)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "Getting block stats failed, device might"
-#~ " have been detached. Code=%(errcode)s "
-#~ "Error=%(e)s"
-#~ msgstr ""
-
-#~ msgid "Must specify vmwareapi_wsdl_loc"
-#~ msgstr ""
-
-#~ msgid "Unable to get SR for this host: %s"
-#~ msgstr ""
-
-#~ msgid "VM.assert_can_migratefailed"
-#~ msgstr ""
-
diff --git a/nova/locale/en_GB/LC_MESSAGES/nova.po b/nova/locale/en_GB/LC_MESSAGES/nova.po
index c21d8b165..428fd74a4 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-06 19:37+0000\n"
+"POT-Creation-Date: 2013-05-07 19:38+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"
@@ -168,7 +168,7 @@ msgid ""
 msgstr ""
 
 #: nova/exception.py:235 nova/api/ec2/cloud.py:463
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2769
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2765
 msgid "Keypair data is invalid"
 msgstr "Keypair data is invalid"
 
@@ -2738,7 +2738,7 @@ msgstr ""
 msgid "Detach interface %s"
 msgstr "Starting VLAN interface %s"
 
-#: nova/api/openstack/compute/contrib/baremetal_nodes.py:193
+#: nova/api/openstack/compute/contrib/baremetal_nodes.py:192
 msgid "Must specify id or address"
 msgstr ""
 
@@ -3782,240 +3782,240 @@ msgstr ""
 msgid "No nova entries in syslog!"
 msgstr ""
 
-#: nova/compute/api.py:282
+#: nova/compute/api.py:281
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:289
+#: nova/compute/api.py:288
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:298
+#: nova/compute/api.py:297
 #, 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
+#: nova/compute/api.py:317
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:328
+#: nova/compute/api.py:327
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:332
+#: nova/compute/api.py:331
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:336
+#: nova/compute/api.py:335
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:469
+#: nova/compute/api.py:468
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:509
+#: nova/compute/api.py:508
 #, fuzzy
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr "Unable to attach volume to instance %s"
 
-#: nova/compute/api.py:623
+#: nova/compute/api.py:622
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:739
+#: nova/compute/api.py:738
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:766
+#: nova/compute/api.py:765
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1040
+#: nova/compute/api.py:1036
 #, fuzzy
 msgid "instance termination disabled"
 msgstr "Virtual Interface creation failed"
 
-#: nova/compute/api.py:1176
+#: nova/compute/api.py:1172
 #, 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:1182
+#: nova/compute/api.py:1178
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1192
+#: nova/compute/api.py:1188
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1236
+#: nova/compute/api.py:1232
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1260
+#: nova/compute/api.py:1256
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1310
+#: nova/compute/api.py:1306
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1327
+#: nova/compute/api.py:1323
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1400
+#: nova/compute/api.py:1396
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1637
+#: nova/compute/api.py:1633
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:1988
+#: nova/compute/api.py:1984
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1997
+#: nova/compute/api.py:1993
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2039
+#: nova/compute/api.py:2035
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2179
+#: nova/compute/api.py:2175
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2286
+#: nova/compute/api.py:2282
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2294
+#: nova/compute/api.py:2290
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2366
+#: nova/compute/api.py:2362
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2479
+#: nova/compute/api.py:2475
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2498
+#: nova/compute/api.py:2494
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2502
+#: nova/compute/api.py:2498
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2749
+#: nova/compute/api.py:2745
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2753
+#: nova/compute/api.py:2749
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2850
+#: nova/compute/api.py:2845
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2853
+#: nova/compute/api.py:2848
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2861
+#: nova/compute/api.py:2856
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2867
+#: nova/compute/api.py:2862
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2887
+#: nova/compute/api.py:2880
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2890
+#: nova/compute/api.py:2883
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2897
+#: nova/compute/api.py:2890
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2962
+#: nova/compute/api.py:2954
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "Unable to destroy VBD %s"
 
-#: nova/compute/api.py:2967
+#: nova/compute/api.py:2959
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:2975
+#: nova/compute/api.py:2967
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:2978
+#: nova/compute/api.py:2970
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3064 nova/compute/api.py:3141
+#: nova/compute/api.py:3047 nova/compute/api.py:3121
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3080
+#: nova/compute/api.py:3063
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3083
+#: nova/compute/api.py:3066
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3094
+#: nova/compute/api.py:3075
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3148
+#: nova/compute/api.py:3128
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -5012,17 +5012,17 @@ msgid ""
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1543
+#: nova/db/sqlalchemy/api.py:1546
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2834
+#: nova/db/sqlalchemy/api.py:2837
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4335
+#: nova/db/sqlalchemy/api.py:4332
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5374,20 +5374,20 @@ msgstr ""
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:495
+#: nova/network/manager.py:480
 msgid "network allocations"
 msgstr ""
 
-#: nova/network/manager.py:502
+#: nova/network/manager.py:487
 #, python-format
 msgid "networks retrieved for instance: |%(networks_list)s|"
 msgstr ""
 
-#: nova/network/manager.py:550
+#: nova/network/manager.py:535
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:816
+#: nova/network/manager.py:801
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -5395,98 +5395,98 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:842
+#: nova/network/manager.py:827
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to allocate fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:896
+#: nova/network/manager.py:879
 msgid "Failed to update usages deallocating fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:930
+#: nova/network/manager.py:911
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:953
+#: nova/network/manager.py:934
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:957
+#: nova/network/manager.py:938
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:966
+#: nova/network/manager.py:947
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:971
+#: nova/network/manager.py:952
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:975
+#: nova/network/manager.py:956
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:979
+#: nova/network/manager.py:960
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:998
+#: nova/network/manager.py:979
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1022
+#: nova/network/manager.py:1003
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1042
+#: 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:1123
+#: nova/network/manager.py:1104
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1126
+#: nova/network/manager.py:1107
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1137
+#: nova/network/manager.py:1118
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1194
+#: nova/network/manager.py:1175
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1213
+#: nova/network/manager.py:1194
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1813
+#: nova/network/manager.py:1794
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1820
+#: nova/network/manager.py:1801
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5558,44 +5558,44 @@ msgstr "instance %s: suspending"
 msgid "Fail to delete port %(portid)s with failure: %(exception)s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:321
+#: nova/network/quantumv2/api.py:318
 #, python-format
 msgid "deallocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:330
+#: nova/network/quantumv2/api.py:327
 #, python-format
 msgid "Failed to delete quantum port %(portid)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:354
+#: nova/network/quantumv2/api.py:349
 #, python-format
 msgid "Failed to delete quantum port %(port_id)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:381
+#: nova/network/quantumv2/api.py:373
 #, python-format
 msgid "get_instance_nw_info() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:413
+#: 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:443
+#: 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:453
+#: nova/network/quantumv2/api.py:445
 #, python-format
 msgid "validate_networks() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:722
+#: nova/network/quantumv2/api.py:688
 #, python-format
 msgid "Multiple floating IP pools matches found for name '%s'"
 msgstr ""
@@ -6761,7 +6761,7 @@ msgstr ""
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:8707
+#: nova/tests/compute/test_compute.py:8725
 msgid "spawn error"
 msgstr ""
 
@@ -10921,70 +10921,3 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Unexpected error while running command."
-#~ msgstr "Unexpected error while running command."
-
-#~ msgid ""
-#~ "%(description)s\n"
-#~ "Command: %(cmd)s\n"
-#~ "Exit code: %(exit_code)s\n"
-#~ "Stdout: %(stdout)r\n"
-#~ "Stderr: %(stderr)r"
-#~ msgstr ""
-#~ "%(description)s\n"
-#~ "Command: %(cmd)s\n"
-#~ "Exit code: %(exit_code)s\n"
-#~ "Stdout: %(stdout)r\n"
-#~ "Stderr: %(stderr)r"
-
-#~ msgid "Error clearing stale veth %s"
-#~ msgstr ""
-
-#~ msgid "Failed unplugging VLAN interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Unplugged VLAN interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Failed unplugging bridge interface '%s'"
-#~ msgstr "Starting Bridge interface for %s"
-
-#~ msgid "Unplugged bridge interface '%s'"
-#~ msgstr "Starting Bridge interface for %s"
-
-#~ msgid "Failed unplugging gateway interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Unplugged gateway interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Network %(net)s for port %(port_id)s not found!"
-#~ msgstr ""
-
-#~ msgid "Host filter ignoring hosts: %(ignored_hosts_str)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "No hosts matched due to not "
-#~ "matching 'force_hosts'value of "
-#~ "'%(forced_hosts_str)s'"
-#~ msgstr ""
-
-#~ msgid "Host filter forcing available hosts to %(forced_hosts_str)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "Getting block stats failed, device might"
-#~ " have been detached. Code=%(errcode)s "
-#~ "Error=%(e)s"
-#~ msgstr ""
-
-#~ msgid "Must specify vmwareapi_wsdl_loc"
-#~ msgstr ""
-
-#~ msgid "Unable to get SR for this host: %s"
-#~ msgstr ""
-
-#~ msgid "VM.assert_can_migratefailed"
-#~ msgstr ""
-
diff --git a/nova/locale/en_US/LC_MESSAGES/nova.po b/nova/locale/en_US/LC_MESSAGES/nova.po
index 123f1c850..6a2a8fe4c 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-06 19:37+0000\n"
+"POT-Creation-Date: 2013-05-07 19:38+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"
@@ -171,7 +171,7 @@ msgid ""
 msgstr ""
 
 #: nova/exception.py:235 nova/api/ec2/cloud.py:463
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2769
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2765
 msgid "Keypair data is invalid"
 msgstr "Keypair data is invalid"
 
@@ -2806,7 +2806,7 @@ msgstr "attribute not supported: %s"
 msgid "Detach interface %s"
 msgstr "Starting VLAN interface %s"
 
-#: nova/api/openstack/compute/contrib/baremetal_nodes.py:193
+#: nova/api/openstack/compute/contrib/baremetal_nodes.py:192
 msgid "Must specify id or address"
 msgstr ""
 
@@ -3879,16 +3879,16 @@ msgstr ""
 msgid "No nova entries in syslog!"
 msgstr ""
 
-#: nova/compute/api.py:282
+#: nova/compute/api.py:281
 msgid "Cannot run any more instances of this type."
 msgstr "Cannot run any more instances of this type."
 
-#: nova/compute/api.py:289
+#: nova/compute/api.py:288
 #, 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:298
+#: nova/compute/api.py:297
 #, python-format
 msgid ""
 "%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
@@ -3897,7 +3897,7 @@ msgstr ""
 "%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
 "instances. %(msg)s"
 
-#: nova/compute/api.py:318
+#: nova/compute/api.py:317
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
@@ -3906,93 +3906,93 @@ msgstr ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 
-#: nova/compute/api.py:328
+#: nova/compute/api.py:327
 msgid "Metadata property key blank"
 msgstr "Metadata property key blank"
 
-#: nova/compute/api.py:332
+#: nova/compute/api.py:331
 msgid "Metadata property key greater than 255 characters"
 msgstr "Metadata property key greater than 255 characters"
 
-#: nova/compute/api.py:336
+#: nova/compute/api.py:335
 msgid "Metadata property value greater than 255 characters"
 msgstr "Metadata property value greater than 255 characters"
 
-#: nova/compute/api.py:469
+#: nova/compute/api.py:468
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:509
+#: nova/compute/api.py:508
 #, fuzzy
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr "Unable to attach boot volume to instance %s"
 
-#: nova/compute/api.py:623
+#: nova/compute/api.py:622
 #, python-format
 msgid "Going to run %s instances..."
 msgstr "Going to run %s instances..."
 
-#: nova/compute/api.py:739
+#: nova/compute/api.py:738
 #, python-format
 msgid "bdm %s"
 msgstr "bdm %s"
 
-#: nova/compute/api.py:766
+#: nova/compute/api.py:765
 #, python-format
 msgid "block_device_mapping %s"
 msgstr "block_device_mapping %s"
 
-#: nova/compute/api.py:1040
+#: nova/compute/api.py:1036
 #, fuzzy
 msgid "instance termination disabled"
 msgstr "Going to start terminating instances"
 
-#: nova/compute/api.py:1176
+#: nova/compute/api.py:1172
 #, 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:1182
+#: nova/compute/api.py:1178
 #, fuzzy
 msgid "going to delete a resizing instance"
 msgstr "Going to start terminating instances"
 
-#: nova/compute/api.py:1192
+#: nova/compute/api.py:1188
 #, 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:1236
+#: nova/compute/api.py:1232
 msgid "Going to try to soft delete instance"
 msgstr "Going to try to soft delete instance"
 
-#: nova/compute/api.py:1260
+#: nova/compute/api.py:1256
 msgid "Going to try to terminate instance"
 msgstr "Going to try to terminate instance"
 
-#: nova/compute/api.py:1310
+#: nova/compute/api.py:1306
 msgid "Going to try to stop instance"
 msgstr "Going to try to stop instance"
 
-#: nova/compute/api.py:1327
+#: nova/compute/api.py:1323
 msgid "Going to try to start instance"
 msgstr "Going to try to start instance"
 
-#: nova/compute/api.py:1400
+#: nova/compute/api.py:1396
 #, python-format
 msgid "Searching by: %s"
 msgstr "Searching by: %s"
 
-#: nova/compute/api.py:1637
+#: nova/compute/api.py:1633
 #, python-format
 msgid "snapshot for %s"
 msgstr "snapshot for %s"
 
-#: nova/compute/api.py:1988
+#: nova/compute/api.py:1984
 msgid "flavor_id is None. Assuming migration."
 msgstr "flavor_id is None. Assuming migration."
 
-#: nova/compute/api.py:1997
+#: nova/compute/api.py:1993
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
@@ -4001,62 +4001,62 @@ msgstr ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 
-#: nova/compute/api.py:2039
+#: nova/compute/api.py:2035
 #, 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:2179
+#: nova/compute/api.py:2175
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2286
+#: nova/compute/api.py:2282
 msgid "Locking"
 msgstr "Locking"
 
-#: nova/compute/api.py:2294
+#: nova/compute/api.py:2290
 msgid "Unlocking"
 msgstr "Unlocking"
 
-#: nova/compute/api.py:2366
+#: nova/compute/api.py:2362
 msgid "Volume must be attached in order to detach."
 msgstr "Volume must be attached in order to detach."
 
-#: nova/compute/api.py:2479
+#: nova/compute/api.py:2475
 #, 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:2498
+#: nova/compute/api.py:2494
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2502
+#: nova/compute/api.py:2498
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2749
+#: nova/compute/api.py:2745
 msgid "Keypair name contains unsafe characters"
 msgstr "Keypair name contains unsafe characters"
 
-#: nova/compute/api.py:2753
+#: nova/compute/api.py:2749
 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:2850
+#: nova/compute/api.py:2845
 #, 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:2853
+#: nova/compute/api.py:2848
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr "Security group %s cannot be empty."
 
-#: nova/compute/api.py:2861
+#: nova/compute/api.py:2856
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
@@ -4065,63 +4065,63 @@ msgstr ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 
-#: nova/compute/api.py:2867
+#: nova/compute/api.py:2862
 #, 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:2887
+#: nova/compute/api.py:2880
 msgid "Quota exceeded, too many security groups."
 msgstr "Quota exceeded, too many security groups."
 
-#: nova/compute/api.py:2890
+#: nova/compute/api.py:2883
 #, python-format
 msgid "Create Security Group %s"
 msgstr "Create Security Group %s"
 
-#: nova/compute/api.py:2897
+#: nova/compute/api.py:2890
 #, python-format
 msgid "Security group %s already exists"
 msgstr "Security group %s already exists"
 
-#: nova/compute/api.py:2962
+#: nova/compute/api.py:2954
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "Unable to destroy vbd %s"
 
-#: nova/compute/api.py:2967
+#: nova/compute/api.py:2959
 msgid "Security group is still in use"
 msgstr "Security group is still in use"
 
-#: nova/compute/api.py:2975
+#: nova/compute/api.py:2967
 msgid "Failed to update usages deallocating security group"
 msgstr "Failed to update usages deallocating security group"
 
-#: nova/compute/api.py:2978
+#: nova/compute/api.py:2970
 #, python-format
 msgid "Delete security group %s"
 msgstr "Delete security group %s"
 
-#: nova/compute/api.py:3064 nova/compute/api.py:3141
+#: nova/compute/api.py:3047 nova/compute/api.py:3121
 #, python-format
 msgid "Rule (%s) not found"
 msgstr "Rule (%s) not found"
 
-#: nova/compute/api.py:3080
+#: nova/compute/api.py:3063
 msgid "Quota exceeded, too many security group rules."
 msgstr "Quota exceeded, too many security group rules."
 
-#: nova/compute/api.py:3083
+#: nova/compute/api.py:3066
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr "Authorize security group ingress %s"
 
-#: nova/compute/api.py:3094
+#: nova/compute/api.py:3075
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr "Revoke security group ingress %s"
 
-#: nova/compute/api.py:3148
+#: nova/compute/api.py:3128
 msgid "Security group id should be integer"
 msgstr "Security group id should be integer"
 
@@ -5164,17 +5164,17 @@ msgid ""
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1543
+#: nova/db/sqlalchemy/api.py:1546
 #, fuzzy, python-format
 msgid "Invalid instance id %s in request"
 msgstr "instance %s: rescued"
 
-#: nova/db/sqlalchemy/api.py:2834
+#: nova/db/sqlalchemy/api.py:2837
 #, 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:4335
+#: nova/db/sqlalchemy/api.py:4332
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5540,20 +5540,20 @@ msgstr "Disassociated %s stale fixed ip(s)"
 msgid "setting network host"
 msgstr "setting network host"
 
-#: nova/network/manager.py:495
+#: nova/network/manager.py:480
 msgid "network allocations"
 msgstr "network allocations"
 
-#: nova/network/manager.py:502
+#: nova/network/manager.py:487
 #, fuzzy, python-format
 msgid "networks retrieved for instance: |%(networks_list)s|"
 msgstr "networks retrieved for instance: |%(networks)s|"
 
-#: nova/network/manager.py:550
+#: nova/network/manager.py:535
 msgid "network deallocation for instance"
 msgstr "network deallocation for instance"
 
-#: nova/network/manager.py:816
+#: nova/network/manager.py:801
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -5564,61 +5564,61 @@ msgstr ""
 "|%(zone)s|. Instance is in zone |%(zone2)s|. No DNS record will be "
 "created."
 
-#: nova/network/manager.py:842
+#: nova/network/manager.py:827
 #, fuzzy, python-format
 msgid "Quota exceeded for %(pid)s, tried to allocate fixed IP"
 msgstr "Quota exceeded for %(pid)s, tried to allocate floating IP"
 
-#: nova/network/manager.py:896
+#: nova/network/manager.py:879
 #, fuzzy
 msgid "Failed to update usages deallocating fixed IP"
 msgstr "Failed to update usages deallocating floating IP"
 
-#: nova/network/manager.py:930
+#: nova/network/manager.py:911
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr "Unable to release %s because vif doesn't exist."
 
-#: nova/network/manager.py:953
+#: nova/network/manager.py:934
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr "Leased IP |%(address)s|"
 
-#: nova/network/manager.py:957
+#: nova/network/manager.py:938
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr "IP %s leased that is not associated"
 
-#: nova/network/manager.py:966
+#: nova/network/manager.py:947
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr "IP |%s| leased that isn't allocated"
 
-#: nova/network/manager.py:971
+#: nova/network/manager.py:952
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr "Released IP |%(address)s|"
 
-#: nova/network/manager.py:975
+#: nova/network/manager.py:956
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr "IP %s released that is not associated"
 
-#: nova/network/manager.py:979
+#: nova/network/manager.py:960
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr "IP %s released that was not leased"
 
-#: nova/network/manager.py:998
+#: nova/network/manager.py:979
 #, python-format
 msgid "%s must be an integer"
 msgstr "%s must be an integer"
 
-#: nova/network/manager.py:1022
+#: nova/network/manager.py:1003
 msgid "Maximum allowed length for 'label' is 255."
 msgstr "Maximum allowed length for 'label' is 255."
 
-#: nova/network/manager.py:1042
+#: nova/network/manager.py:1023
 #, python-format
 msgid ""
 "Subnet(s) too large, defaulting to /%s.  To override, specify "
@@ -5627,16 +5627,16 @@ msgstr ""
 "Subnet(s) too large, defaulting to /%s.  To override, specify "
 "network_size flag."
 
-#: nova/network/manager.py:1123
+#: nova/network/manager.py:1104
 msgid "cidr already in use"
 msgstr "cidr already in use"
 
-#: nova/network/manager.py:1126
+#: nova/network/manager.py:1107
 #, 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:1137
+#: nova/network/manager.py:1118
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
@@ -5645,16 +5645,16 @@ msgstr ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 
-#: nova/network/manager.py:1194
+#: nova/network/manager.py:1175
 msgid "Network already exists!"
 msgstr "Network already exists!"
 
-#: nova/network/manager.py:1213
+#: nova/network/manager.py:1194
 #, 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:1813
+#: nova/network/manager.py:1794
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
@@ -5662,7 +5662,7 @@ msgstr ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 
-#: nova/network/manager.py:1820
+#: nova/network/manager.py:1801
 #, fuzzy, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5736,44 +5736,44 @@ msgstr "Host not found"
 msgid "Fail to delete port %(portid)s with failure: %(exception)s"
 msgstr "Fail to delete port %(portid)s with failure: %(exception)s"
 
-#: nova/network/quantumv2/api.py:321
+#: nova/network/quantumv2/api.py:318
 #, python-format
 msgid "deallocate_for_instance() for %s"
 msgstr "deallocate_for_instance() for %s"
 
-#: nova/network/quantumv2/api.py:330
+#: nova/network/quantumv2/api.py:327
 #, python-format
 msgid "Failed to delete quantum port %(portid)s "
 msgstr "Failed to delete quantum port %(portid)s "
 
-#: nova/network/quantumv2/api.py:354
+#: nova/network/quantumv2/api.py:349
 #, fuzzy, python-format
 msgid "Failed to delete quantum port %(port_id)s "
 msgstr "Failed to delete quantum port %(portid)s "
 
-#: nova/network/quantumv2/api.py:381
+#: nova/network/quantumv2/api.py:373
 #, python-format
 msgid "get_instance_nw_info() for %s"
 msgstr "get_instance_nw_info() for %s"
 
-#: nova/network/quantumv2/api.py:413
+#: nova/network/quantumv2/api.py:405
 #, fuzzy, python-format
 msgid ""
 "Unable to update port %(portid)s on subnet %(subnet_id)s with failure: "
 "%(exception)s"
 msgstr "Fail to delete port %(portid)s with failure: %(exception)s"
 
-#: nova/network/quantumv2/api.py:443
+#: nova/network/quantumv2/api.py:435
 #, fuzzy, python-format
 msgid "Unable to update port %(portid)s with failure: %(exception)s"
 msgstr "Fail to delete port %(portid)s with failure: %(exception)s"
 
-#: nova/network/quantumv2/api.py:453
+#: nova/network/quantumv2/api.py:445
 #, python-format
 msgid "validate_networks() for %s"
 msgstr "validate_networks() for %s"
 
-#: nova/network/quantumv2/api.py:722
+#: nova/network/quantumv2/api.py:688
 #, python-format
 msgid "Multiple floating IP pools matches found for name '%s'"
 msgstr "Multiple floating IP pools matches found for name '%s'"
@@ -6980,7 +6980,7 @@ msgstr "After force-killing instances: %s"
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:8707
+#: nova/tests/compute/test_compute.py:8725
 #, fuzzy
 msgid "spawn error"
 msgstr "unknown guestmount error"
@@ -11300,61 +11300,3 @@ msgstr "status must be available"
 msgid "status must be 'available'"
 msgstr "status must be available"
 
-#~ msgid "Unexpected error while running command."
-#~ msgstr "Unexpected error while running command."
-
-#~ msgid ""
-#~ "%(description)s\n"
-#~ "Command: %(cmd)s\n"
-#~ "Exit code: %(exit_code)s\n"
-#~ "Stdout: %(stdout)r\n"
-#~ "Stderr: %(stderr)r"
-#~ msgstr ""
-#~ "%(description)s\n"
-#~ "Command: %(cmd)s\n"
-#~ "Exit code: %(exit_code)s\n"
-#~ "Stdout: %(stdout)r\n"
-#~ "Stderr: %(stderr)r"
-
-#~ msgid "Error clearing stale veth %s"
-#~ msgstr "Error starting xvp: %s"
-
-#~ msgid "Failed unplugging VLAN interface '%s'"
-#~ msgstr "Failed unplugging gateway interface '%s'"
-
-#~ msgid "Unplugged VLAN interface '%s'"
-#~ msgstr "Unplugged gateway interface '%s'"
-
-#~ msgid "Failed unplugging bridge interface '%s'"
-#~ msgstr "Failed unplugging gateway interface '%s'"
-
-#~ msgid "Unplugged bridge interface '%s'"
-#~ msgstr "Unplugged gateway interface '%s'"
-
-#~ msgid "Failed unplugging gateway interface '%s'"
-#~ msgstr "Failed unplugging gateway interface '%s'"
-
-#~ msgid "Unplugged gateway interface '%s'"
-#~ msgstr "Unplugged gateway interface '%s'"
-
-#~ msgid "Network %(net)s for port %(port_id)s not found!"
-#~ msgstr "Network %(network_id)s could not be found."
-
-#~ msgid ""
-#~ "No hosts matched due to not "
-#~ "matching 'force_hosts'value of "
-#~ "'%(forced_hosts_str)s'"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "Getting block stats failed, device might"
-#~ " have been detached. Code=%(errcode)s "
-#~ "Error=%(e)s"
-#~ msgstr ""
-
-#~ msgid "Must specify vmwareapi_wsdl_loc"
-#~ msgstr "Must specify vmwareapi_wsdl_loc"
-
-#~ msgid "Unable to get SR for this host: %s"
-#~ msgstr "Unable to get SR for this host: %s"
-
diff --git a/nova/locale/es/LC_MESSAGES/nova.po b/nova/locale/es/LC_MESSAGES/nova.po
index b35f586dc..407d920ed 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-06 19:37+0000\n"
+"POT-Creation-Date: 2013-05-07 19:38+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"
@@ -175,7 +175,7 @@ msgid ""
 msgstr ""
 
 #: nova/exception.py:235 nova/api/ec2/cloud.py:463
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2769
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2765
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -2759,7 +2759,7 @@ msgstr "atributo no soportado: %s"
 msgid "Detach interface %s"
 msgstr "Iniciando interfaz VLAN %s"
 
-#: nova/api/openstack/compute/contrib/baremetal_nodes.py:193
+#: nova/api/openstack/compute/contrib/baremetal_nodes.py:192
 msgid "Must specify id or address"
 msgstr ""
 
@@ -3815,251 +3815,251 @@ msgstr ""
 msgid "No nova entries in syslog!"
 msgstr ""
 
-#: nova/compute/api.py:282
+#: nova/compute/api.py:281
 #, 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:289
+#: nova/compute/api.py:288
 #, 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:298
+#: nova/compute/api.py:297
 #, 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
+#: nova/compute/api.py:317
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:328
+#: nova/compute/api.py:327
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:332
+#: nova/compute/api.py:331
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:336
+#: nova/compute/api.py:335
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:469
+#: nova/compute/api.py:468
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:509
+#: nova/compute/api.py:508
 #, fuzzy
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr "Imposible adjuntar volumen a la instancia %s"
 
-#: nova/compute/api.py:623
+#: nova/compute/api.py:622
 #, python-format
 msgid "Going to run %s instances..."
 msgstr "Vamos a ejecutar %s insntacias..."
 
-#: nova/compute/api.py:739
+#: nova/compute/api.py:738
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:766
+#: nova/compute/api.py:765
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1040
+#: nova/compute/api.py:1036
 #, fuzzy
 msgid "instance termination disabled"
 msgstr "Se va a iniciar la finalización de las instancias"
 
-#: nova/compute/api.py:1176
+#: nova/compute/api.py:1172
 #, 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:1182
+#: nova/compute/api.py:1178
 #, fuzzy
 msgid "going to delete a resizing instance"
 msgstr "Se va a iniciar la finalización de las instancias"
 
-#: nova/compute/api.py:1192
+#: nova/compute/api.py:1188
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1236
+#: nova/compute/api.py:1232
 #, fuzzy
 msgid "Going to try to soft delete instance"
 msgstr "Vamos a ejecutar %s insntacias..."
 
-#: nova/compute/api.py:1260
+#: nova/compute/api.py:1256
 #, fuzzy
 msgid "Going to try to terminate instance"
 msgstr "Se va a iniciar la finalización de las instancias"
 
-#: nova/compute/api.py:1310
+#: nova/compute/api.py:1306
 #, fuzzy
 msgid "Going to try to stop instance"
 msgstr "Vamos a ejecutar %s insntacias..."
 
-#: nova/compute/api.py:1327
+#: nova/compute/api.py:1323
 #, fuzzy
 msgid "Going to try to start instance"
 msgstr "Vamos a ejecutar %s insntacias..."
 
-#: nova/compute/api.py:1400
+#: nova/compute/api.py:1396
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1637
+#: nova/compute/api.py:1633
 #, fuzzy, python-format
 msgid "snapshot for %s"
 msgstr "Comenzando snapshot para la VM %s"
 
-#: nova/compute/api.py:1988
+#: nova/compute/api.py:1984
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1997
+#: nova/compute/api.py:1993
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2039
+#: nova/compute/api.py:2035
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2179
+#: nova/compute/api.py:2175
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2286
+#: nova/compute/api.py:2282
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2294
+#: nova/compute/api.py:2290
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2366
+#: nova/compute/api.py:2362
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2479
+#: nova/compute/api.py:2475
 #, 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:2498
+#: nova/compute/api.py:2494
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2502
+#: nova/compute/api.py:2498
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2749
+#: nova/compute/api.py:2745
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2753
+#: nova/compute/api.py:2749
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2850
+#: nova/compute/api.py:2845
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2853
+#: nova/compute/api.py:2848
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2861
+#: nova/compute/api.py:2856
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2867
+#: nova/compute/api.py:2862
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2887
+#: nova/compute/api.py:2880
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2890
+#: nova/compute/api.py:2883
 #, python-format
 msgid "Create Security Group %s"
 msgstr "Crear Grupo de Seguridad %s"
 
-#: nova/compute/api.py:2897
+#: nova/compute/api.py:2890
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2962
+#: nova/compute/api.py:2954
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "Imposible destruir VBD %s"
 
-#: nova/compute/api.py:2967
+#: nova/compute/api.py:2959
 #, fuzzy
 msgid "Security group is still in use"
 msgstr "Revocar ingreso al grupo de seguridad %s"
 
-#: nova/compute/api.py:2975
+#: nova/compute/api.py:2967
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:2978
+#: nova/compute/api.py:2970
 #, python-format
 msgid "Delete security group %s"
 msgstr "Borrar grupo de seguridad %s"
 
-#: nova/compute/api.py:3064 nova/compute/api.py:3141
+#: nova/compute/api.py:3047 nova/compute/api.py:3121
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3080
+#: nova/compute/api.py:3063
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3083
+#: nova/compute/api.py:3066
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr "Autorizar ingreso al grupo de seguridad %s"
 
-#: nova/compute/api.py:3094
+#: nova/compute/api.py:3075
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr "Revocar ingreso al grupo de seguridad %s"
 
-#: nova/compute/api.py:3148
+#: nova/compute/api.py:3128
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -5064,17 +5064,17 @@ msgid ""
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1543
+#: nova/db/sqlalchemy/api.py:1546
 #, fuzzy, python-format
 msgid "Invalid instance id %s in request"
 msgstr "instancia %s: rescatada"
 
-#: nova/db/sqlalchemy/api.py:2834
+#: nova/db/sqlalchemy/api.py:2837
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4335
+#: nova/db/sqlalchemy/api.py:4332
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5427,20 +5427,20 @@ msgstr ""
 msgid "setting network host"
 msgstr "configurando la red del host"
 
-#: nova/network/manager.py:495
+#: nova/network/manager.py:480
 msgid "network allocations"
 msgstr ""
 
-#: nova/network/manager.py:502
+#: nova/network/manager.py:487
 #, python-format
 msgid "networks retrieved for instance: |%(networks_list)s|"
 msgstr ""
 
-#: nova/network/manager.py:550
+#: nova/network/manager.py:535
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:816
+#: nova/network/manager.py:801
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -5448,98 +5448,98 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:842
+#: nova/network/manager.py:827
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to allocate fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:896
+#: nova/network/manager.py:879
 msgid "Failed to update usages deallocating fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:930
+#: nova/network/manager.py:911
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:953
+#: nova/network/manager.py:934
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:957
+#: nova/network/manager.py:938
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:966
+#: nova/network/manager.py:947
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:971
+#: nova/network/manager.py:952
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:975
+#: nova/network/manager.py:956
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:979
+#: nova/network/manager.py:960
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:998
+#: nova/network/manager.py:979
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1022
+#: nova/network/manager.py:1003
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1042
+#: 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:1123
+#: nova/network/manager.py:1104
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1126
+#: nova/network/manager.py:1107
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1137
+#: nova/network/manager.py:1118
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1194
+#: nova/network/manager.py:1175
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1213
+#: nova/network/manager.py:1194
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1813
+#: nova/network/manager.py:1794
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1820
+#: nova/network/manager.py:1801
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5611,44 +5611,44 @@ msgstr "instancia %s: arrancada"
 msgid "Fail to delete port %(portid)s with failure: %(exception)s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:321
+#: nova/network/quantumv2/api.py:318
 #, python-format
 msgid "deallocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:330
+#: nova/network/quantumv2/api.py:327
 #, python-format
 msgid "Failed to delete quantum port %(portid)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:354
+#: nova/network/quantumv2/api.py:349
 #, python-format
 msgid "Failed to delete quantum port %(port_id)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:381
+#: nova/network/quantumv2/api.py:373
 #, python-format
 msgid "get_instance_nw_info() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:413
+#: 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:443
+#: 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:453
+#: nova/network/quantumv2/api.py:445
 #, python-format
 msgid "validate_networks() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:722
+#: nova/network/quantumv2/api.py:688
 #, fuzzy, python-format
 msgid "Multiple floating IP pools matches found for name '%s'"
 msgstr "configurando la red del host"
@@ -6821,7 +6821,7 @@ msgstr ""
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:8707
+#: nova/tests/compute/test_compute.py:8725
 msgid "spawn error"
 msgstr ""
 
@@ -11000,70 +11000,3 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Unexpected error while running command."
-#~ msgstr "Error inesperado mientras el comando se ejecutaba"
-
-#~ msgid ""
-#~ "%(description)s\n"
-#~ "Command: %(cmd)s\n"
-#~ "Exit code: %(exit_code)s\n"
-#~ "Stdout: %(stdout)r\n"
-#~ "Stderr: %(stderr)r"
-#~ msgstr ""
-#~ "%(description)s\n"
-#~ "Comando: %(cmd)s\n"
-#~ "Código de salida: %(exit_code)s\n"
-#~ "Stdout: %(stdout)r\n"
-#~ "Stderr: %(stderr)r"
-
-#~ msgid "Error clearing stale veth %s"
-#~ msgstr ""
-
-#~ msgid "Failed unplugging VLAN interface '%s'"
-#~ msgstr "Fallo al suspender la instancia"
-
-#~ msgid "Unplugged VLAN interface '%s'"
-#~ msgstr "Fallo al suspender la instancia"
-
-#~ msgid "Failed unplugging bridge interface '%s'"
-#~ msgstr "Iniciando interfaz puente para %s"
-
-#~ msgid "Unplugged bridge interface '%s'"
-#~ msgstr "Iniciando interfaz puente para %s"
-
-#~ msgid "Failed unplugging gateway interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Unplugged gateway interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Network %(net)s for port %(port_id)s not found!"
-#~ msgstr ""
-
-#~ msgid "Host filter ignoring hosts: %(ignored_hosts_str)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "No hosts matched due to not "
-#~ "matching 'force_hosts'value of "
-#~ "'%(forced_hosts_str)s'"
-#~ msgstr ""
-
-#~ msgid "Host filter forcing available hosts to %(forced_hosts_str)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "Getting block stats failed, device might"
-#~ " have been detached. Code=%(errcode)s "
-#~ "Error=%(e)s"
-#~ msgstr ""
-
-#~ msgid "Must specify vmwareapi_wsdl_loc"
-#~ msgstr ""
-
-#~ msgid "Unable to get SR for this host: %s"
-#~ msgstr ""
-
-#~ msgid "VM.assert_can_migratefailed"
-#~ msgstr ""
-
diff --git a/nova/locale/fr/LC_MESSAGES/nova.po b/nova/locale/fr/LC_MESSAGES/nova.po
index a425addc2..9aedf4721 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-06 19:37+0000\n"
+"POT-Creation-Date: 2013-05-07 19:38+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"
@@ -173,7 +173,7 @@ msgid ""
 msgstr ""
 
 #: nova/exception.py:235 nova/api/ec2/cloud.py:463
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2769
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2765
 msgid "Keypair data is invalid"
 msgstr "La paire de clés de donnée n'est pas valide"
 
@@ -2806,7 +2806,7 @@ msgstr "attribut non reconnu : %s"
 msgid "Detach interface %s"
 msgstr "Démarrage de l'interface VLAN %s"
 
-#: nova/api/openstack/compute/contrib/baremetal_nodes.py:193
+#: nova/api/openstack/compute/contrib/baremetal_nodes.py:192
 msgid "Must specify id or address"
 msgstr ""
 
@@ -3870,251 +3870,251 @@ msgstr ""
 msgid "No nova entries in syslog!"
 msgstr ""
 
-#: nova/compute/api.py:282
+#: nova/compute/api.py:281
 #, 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:289
+#: nova/compute/api.py:288
 #, 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:298
+#: nova/compute/api.py:297
 #, 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
+#: nova/compute/api.py:317
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:328
+#: nova/compute/api.py:327
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:332
+#: nova/compute/api.py:331
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:336
+#: nova/compute/api.py:335
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:469
+#: nova/compute/api.py:468
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:509
+#: nova/compute/api.py:508
 #, fuzzy
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr "Impossible d'attacher le volume à l'instance %s"
 
-#: nova/compute/api.py:623
+#: nova/compute/api.py:622
 #, python-format
 msgid "Going to run %s instances..."
 msgstr "Démarrage de %s instances..."
 
-#: nova/compute/api.py:739
+#: nova/compute/api.py:738
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:766
+#: nova/compute/api.py:765
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1040
+#: nova/compute/api.py:1036
 #, fuzzy
 msgid "instance termination disabled"
 msgstr "Début de la destruction d'instance"
 
-#: nova/compute/api.py:1176
+#: nova/compute/api.py:1172
 #, 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:1182
+#: nova/compute/api.py:1178
 #, fuzzy
 msgid "going to delete a resizing instance"
 msgstr "Début de la destruction d'instance"
 
-#: nova/compute/api.py:1192
+#: nova/compute/api.py:1188
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1236
+#: nova/compute/api.py:1232
 #, fuzzy
 msgid "Going to try to soft delete instance"
 msgstr "Va essayer d'arrêter %s"
 
-#: nova/compute/api.py:1260
+#: nova/compute/api.py:1256
 #, fuzzy
 msgid "Going to try to terminate instance"
 msgstr "Va essayer d'arrêter %s"
 
-#: nova/compute/api.py:1310
+#: nova/compute/api.py:1306
 #, fuzzy
 msgid "Going to try to stop instance"
 msgstr "Va essayer d'arrêter %s"
 
-#: nova/compute/api.py:1327
+#: nova/compute/api.py:1323
 #, fuzzy
 msgid "Going to try to start instance"
 msgstr "Va essayer d'arrêter %s"
 
-#: nova/compute/api.py:1400
+#: nova/compute/api.py:1396
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1637
+#: nova/compute/api.py:1633
 #, fuzzy, python-format
 msgid "snapshot for %s"
 msgstr "Début de création d'instantané (snapshot) pour la VM %s"
 
-#: nova/compute/api.py:1988
+#: nova/compute/api.py:1984
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1997
+#: nova/compute/api.py:1993
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2039
+#: nova/compute/api.py:2035
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2179
+#: nova/compute/api.py:2175
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2286
+#: nova/compute/api.py:2282
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2294
+#: nova/compute/api.py:2290
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2366
+#: nova/compute/api.py:2362
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2479
+#: nova/compute/api.py:2475
 #, fuzzy, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr "Va essayer d'arrêter %s"
 
-#: nova/compute/api.py:2498
+#: nova/compute/api.py:2494
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2502
+#: nova/compute/api.py:2498
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2749
+#: nova/compute/api.py:2745
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2753
+#: nova/compute/api.py:2749
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2850
+#: nova/compute/api.py:2845
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2853
+#: nova/compute/api.py:2848
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2861
+#: nova/compute/api.py:2856
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2867
+#: nova/compute/api.py:2862
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2887
+#: nova/compute/api.py:2880
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2890
+#: nova/compute/api.py:2883
 #, python-format
 msgid "Create Security Group %s"
 msgstr "Création du groupe de sécurité %s"
 
-#: nova/compute/api.py:2897
+#: nova/compute/api.py:2890
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2962
+#: nova/compute/api.py:2954
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "Impossible de supprimer le VBD %s"
 
-#: nova/compute/api.py:2967
+#: nova/compute/api.py:2959
 #, fuzzy
 msgid "Security group is still in use"
 msgstr "Révocation de groupe de sécurité %s"
 
-#: nova/compute/api.py:2975
+#: nova/compute/api.py:2967
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:2978
+#: nova/compute/api.py:2970
 #, python-format
 msgid "Delete security group %s"
 msgstr "Suppression du groupe de sécurité %s"
 
-#: nova/compute/api.py:3064 nova/compute/api.py:3141
+#: nova/compute/api.py:3047 nova/compute/api.py:3121
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3080
+#: nova/compute/api.py:3063
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3083
+#: nova/compute/api.py:3066
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr "Authorisation du groupe de sécurité %s"
 
-#: nova/compute/api.py:3094
+#: nova/compute/api.py:3075
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr "Révocation de groupe de sécurité %s"
 
-#: nova/compute/api.py:3148
+#: nova/compute/api.py:3128
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -5123,17 +5123,17 @@ msgid ""
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1543
+#: nova/db/sqlalchemy/api.py:1546
 #, fuzzy, python-format
 msgid "Invalid instance id %s in request"
 msgstr "instance %s: récupérée"
 
-#: nova/db/sqlalchemy/api.py:2834
+#: nova/db/sqlalchemy/api.py:2837
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4335
+#: nova/db/sqlalchemy/api.py:4332
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5487,21 +5487,21 @@ msgstr ""
 msgid "setting network host"
 msgstr "réglage de l'hôte réseau"
 
-#: nova/network/manager.py:495
+#: nova/network/manager.py:480
 #, fuzzy
 msgid "network allocations"
 msgstr "Aucun disque sur %(location)s"
 
-#: nova/network/manager.py:502
+#: nova/network/manager.py:487
 #, python-format
 msgid "networks retrieved for instance: |%(networks_list)s|"
 msgstr ""
 
-#: nova/network/manager.py:550
+#: nova/network/manager.py:535
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:816
+#: nova/network/manager.py:801
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -5509,98 +5509,98 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:842
+#: nova/network/manager.py:827
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to allocate fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:896
+#: nova/network/manager.py:879
 msgid "Failed to update usages deallocating fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:930
+#: nova/network/manager.py:911
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:953
+#: nova/network/manager.py:934
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:957
+#: nova/network/manager.py:938
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:966
+#: nova/network/manager.py:947
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:971
+#: nova/network/manager.py:952
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:975
+#: nova/network/manager.py:956
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:979
+#: nova/network/manager.py:960
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr "IP %s libérée qui n'était pas allouée"
 
-#: nova/network/manager.py:998
+#: nova/network/manager.py:979
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1022
+#: nova/network/manager.py:1003
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1042
+#: 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:1123
+#: nova/network/manager.py:1104
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1126
+#: nova/network/manager.py:1107
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1137
+#: nova/network/manager.py:1118
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1194
+#: nova/network/manager.py:1175
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1213
+#: nova/network/manager.py:1194
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1813
+#: nova/network/manager.py:1794
 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:1820
+#: nova/network/manager.py:1801
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5672,44 +5672,44 @@ msgstr "Aucuns types d'instance trouvés."
 msgid "Fail to delete port %(portid)s with failure: %(exception)s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:321
+#: nova/network/quantumv2/api.py:318
 #, python-format
 msgid "deallocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:330
+#: nova/network/quantumv2/api.py:327
 #, python-format
 msgid "Failed to delete quantum port %(portid)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:354
+#: nova/network/quantumv2/api.py:349
 #, python-format
 msgid "Failed to delete quantum port %(port_id)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:381
+#: nova/network/quantumv2/api.py:373
 #, python-format
 msgid "get_instance_nw_info() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:413
+#: 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:443
+#: 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:453
+#: nova/network/quantumv2/api.py:445
 #, python-format
 msgid "validate_networks() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:722
+#: nova/network/quantumv2/api.py:688
 #, fuzzy, python-format
 msgid "Multiple floating IP pools matches found for name '%s'"
 msgstr "Aucune IP dynamique trouvée pour l'id %(id)s."
@@ -6886,7 +6886,7 @@ msgstr ""
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:8707
+#: nova/tests/compute/test_compute.py:8725
 msgid "spawn error"
 msgstr ""
 
@@ -11082,70 +11082,3 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Unexpected error while running command."
-#~ msgstr "Erreur imprévue lors de l'éxecution de la commande"
-
-#~ msgid ""
-#~ "%(description)s\n"
-#~ "Command: %(cmd)s\n"
-#~ "Exit code: %(exit_code)s\n"
-#~ "Stdout: %(stdout)r\n"
-#~ "Stderr: %(stderr)r"
-#~ msgstr ""
-#~ "%(description)s\n"
-#~ "Commande : %(cmd)s\n"
-#~ "Valeur retournée : %(exit_code)s\n"
-#~ "Sortie standard : %(stdout)r\n"
-#~ "Sortie d'erreur : %(stderr)r"
-
-#~ msgid "Error clearing stale veth %s"
-#~ msgstr "Erreur au démarrage xvp : %s"
-
-#~ msgid "Failed unplugging VLAN interface '%s'"
-#~ msgstr "Échec de la suspension de l'instance"
-
-#~ msgid "Unplugged VLAN interface '%s'"
-#~ msgstr "Échec de la suspension de l'instance"
-
-#~ msgid "Failed unplugging bridge interface '%s'"
-#~ msgstr "Démarrage de l'interface de Bridge %s"
-
-#~ msgid "Unplugged bridge interface '%s'"
-#~ msgstr "Démarrage de l'interface de Bridge %s"
-
-#~ msgid "Failed unplugging gateway interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Unplugged gateway interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Network %(net)s for port %(port_id)s not found!"
-#~ msgstr "Le réseau %(network_id)s n'a pas été trouvé."
-
-#~ msgid "Host filter ignoring hosts: %(ignored_hosts_str)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "No hosts matched due to not "
-#~ "matching 'force_hosts'value of "
-#~ "'%(forced_hosts_str)s'"
-#~ msgstr ""
-
-#~ msgid "Host filter forcing available hosts to %(forced_hosts_str)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "Getting block stats failed, device might"
-#~ " have been detached. Code=%(errcode)s "
-#~ "Error=%(e)s"
-#~ msgstr ""
-
-#~ msgid "Must specify vmwareapi_wsdl_loc"
-#~ msgstr ""
-
-#~ msgid "Unable to get SR for this host: %s"
-#~ msgstr ""
-
-#~ msgid "VM.assert_can_migratefailed"
-#~ msgstr ""
-
diff --git a/nova/locale/it/LC_MESSAGES/nova.po b/nova/locale/it/LC_MESSAGES/nova.po
index ef0283d95..c51baca45 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-06 19:37+0000\n"
+"POT-Creation-Date: 2013-05-07 19:38+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"
@@ -169,7 +169,7 @@ msgid ""
 msgstr ""
 
 #: nova/exception.py:235 nova/api/ec2/cloud.py:463
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2769
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2765
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -2737,7 +2737,7 @@ msgstr ""
 msgid "Detach interface %s"
 msgstr "Avviando l'interfaccia VLAN %s"
 
-#: nova/api/openstack/compute/contrib/baremetal_nodes.py:193
+#: nova/api/openstack/compute/contrib/baremetal_nodes.py:192
 msgid "Must specify id or address"
 msgstr ""
 
@@ -3781,242 +3781,242 @@ msgstr ""
 msgid "No nova entries in syslog!"
 msgstr ""
 
-#: nova/compute/api.py:282
+#: nova/compute/api.py:281
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:289
+#: nova/compute/api.py:288
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:298
+#: nova/compute/api.py:297
 #, 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
+#: nova/compute/api.py:317
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:328
+#: nova/compute/api.py:327
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:332
+#: nova/compute/api.py:331
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:336
+#: nova/compute/api.py:335
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:469
+#: nova/compute/api.py:468
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:509
+#: nova/compute/api.py:508
 #, fuzzy
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr "Impossibile montare il volume all'istanza %s"
 
-#: nova/compute/api.py:623
+#: nova/compute/api.py:622
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:739
+#: nova/compute/api.py:738
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:766
+#: nova/compute/api.py:765
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1040
+#: nova/compute/api.py:1036
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1176
+#: nova/compute/api.py:1172
 #, fuzzy, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr "istanza %s: creazione snapshot in corso"
 
-#: nova/compute/api.py:1182
+#: nova/compute/api.py:1178
 #, fuzzy
 msgid "going to delete a resizing instance"
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/compute/api.py:1192
+#: nova/compute/api.py:1188
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1236
+#: nova/compute/api.py:1232
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1260
+#: nova/compute/api.py:1256
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1310
+#: nova/compute/api.py:1306
 #, fuzzy
 msgid "Going to try to stop instance"
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/compute/api.py:1327
+#: nova/compute/api.py:1323
 #, fuzzy
 msgid "Going to try to start instance"
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/compute/api.py:1400
+#: nova/compute/api.py:1396
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1637
+#: nova/compute/api.py:1633
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:1988
+#: nova/compute/api.py:1984
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1997
+#: nova/compute/api.py:1993
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2039
+#: nova/compute/api.py:2035
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2179
+#: nova/compute/api.py:2175
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2286
+#: nova/compute/api.py:2282
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2294
+#: nova/compute/api.py:2290
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2366
+#: nova/compute/api.py:2362
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2479
+#: nova/compute/api.py:2475
 #, fuzzy, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/compute/api.py:2498
+#: nova/compute/api.py:2494
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2502
+#: nova/compute/api.py:2498
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2749
+#: nova/compute/api.py:2745
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2753
+#: nova/compute/api.py:2749
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2850
+#: nova/compute/api.py:2845
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2853
+#: nova/compute/api.py:2848
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2861
+#: nova/compute/api.py:2856
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2867
+#: nova/compute/api.py:2862
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2887
+#: nova/compute/api.py:2880
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2890
+#: nova/compute/api.py:2883
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2897
+#: nova/compute/api.py:2890
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2962
+#: nova/compute/api.py:2954
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "Impossibile localizzare il volume %s"
 
-#: nova/compute/api.py:2967
+#: nova/compute/api.py:2959
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:2975
+#: nova/compute/api.py:2967
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:2978
+#: nova/compute/api.py:2970
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3064 nova/compute/api.py:3141
+#: nova/compute/api.py:3047 nova/compute/api.py:3121
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3080
+#: nova/compute/api.py:3063
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3083
+#: nova/compute/api.py:3066
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3094
+#: nova/compute/api.py:3075
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3148
+#: nova/compute/api.py:3128
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -5014,17 +5014,17 @@ msgid ""
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1543
+#: nova/db/sqlalchemy/api.py:1546
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2834
+#: nova/db/sqlalchemy/api.py:2837
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4335
+#: nova/db/sqlalchemy/api.py:4332
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5377,20 +5377,20 @@ msgstr ""
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:495
+#: nova/network/manager.py:480
 msgid "network allocations"
 msgstr ""
 
-#: nova/network/manager.py:502
+#: nova/network/manager.py:487
 #, python-format
 msgid "networks retrieved for instance: |%(networks_list)s|"
 msgstr ""
 
-#: nova/network/manager.py:550
+#: nova/network/manager.py:535
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:816
+#: nova/network/manager.py:801
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -5398,98 +5398,98 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:842
+#: nova/network/manager.py:827
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to allocate fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:896
+#: nova/network/manager.py:879
 msgid "Failed to update usages deallocating fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:930
+#: nova/network/manager.py:911
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:953
+#: nova/network/manager.py:934
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:957
+#: nova/network/manager.py:938
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:966
+#: nova/network/manager.py:947
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:971
+#: nova/network/manager.py:952
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:975
+#: nova/network/manager.py:956
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:979
+#: nova/network/manager.py:960
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:998
+#: nova/network/manager.py:979
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1022
+#: nova/network/manager.py:1003
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1042
+#: 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:1123
+#: nova/network/manager.py:1104
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1126
+#: nova/network/manager.py:1107
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1137
+#: nova/network/manager.py:1118
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1194
+#: nova/network/manager.py:1175
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1213
+#: nova/network/manager.py:1194
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1813
+#: nova/network/manager.py:1794
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1820
+#: nova/network/manager.py:1801
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5561,44 +5561,44 @@ msgstr "istanza %s: sospensione in corso"
 msgid "Fail to delete port %(portid)s with failure: %(exception)s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:321
+#: nova/network/quantumv2/api.py:318
 #, python-format
 msgid "deallocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:330
+#: nova/network/quantumv2/api.py:327
 #, python-format
 msgid "Failed to delete quantum port %(portid)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:354
+#: nova/network/quantumv2/api.py:349
 #, python-format
 msgid "Failed to delete quantum port %(port_id)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:381
+#: nova/network/quantumv2/api.py:373
 #, python-format
 msgid "get_instance_nw_info() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:413
+#: 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:443
+#: 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:453
+#: nova/network/quantumv2/api.py:445
 #, python-format
 msgid "validate_networks() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:722
+#: nova/network/quantumv2/api.py:688
 #, python-format
 msgid "Multiple floating IP pools matches found for name '%s'"
 msgstr ""
@@ -6763,7 +6763,7 @@ msgstr ""
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:8707
+#: nova/tests/compute/test_compute.py:8725
 msgid "spawn error"
 msgstr ""
 
@@ -10919,70 +10919,3 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Unexpected error while running command."
-#~ msgstr "Si e' verificato un errore inatteso durante l'esecuzione del comando."
-
-#~ msgid ""
-#~ "%(description)s\n"
-#~ "Command: %(cmd)s\n"
-#~ "Exit code: %(exit_code)s\n"
-#~ "Stdout: %(stdout)r\n"
-#~ "Stderr: %(stderr)r"
-#~ msgstr ""
-#~ "%(description)s\n"
-#~ "Comando: %(cmd)s\n"
-#~ "Exit code: %(exit_code)s\n"
-#~ "Stdout: %(stdout)r\n"
-#~ "Stderr: %(stderr)r"
-
-#~ msgid "Error clearing stale veth %s"
-#~ msgstr ""
-
-#~ msgid "Failed unplugging VLAN interface '%s'"
-#~ msgstr "Impossibile sospendere l'istanza"
-
-#~ msgid "Unplugged VLAN interface '%s'"
-#~ msgstr "Impossibile sospendere l'istanza"
-
-#~ msgid "Failed unplugging bridge interface '%s'"
-#~ msgstr "Avviando l'interfaccia Bridge per %s"
-
-#~ msgid "Unplugged bridge interface '%s'"
-#~ msgstr "Avviando l'interfaccia Bridge per %s"
-
-#~ msgid "Failed unplugging gateway interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Unplugged gateway interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Network %(net)s for port %(port_id)s not found!"
-#~ msgstr ""
-
-#~ msgid "Host filter ignoring hosts: %(ignored_hosts_str)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "No hosts matched due to not "
-#~ "matching 'force_hosts'value of "
-#~ "'%(forced_hosts_str)s'"
-#~ msgstr ""
-
-#~ msgid "Host filter forcing available hosts to %(forced_hosts_str)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "Getting block stats failed, device might"
-#~ " have been detached. Code=%(errcode)s "
-#~ "Error=%(e)s"
-#~ msgstr ""
-
-#~ msgid "Must specify vmwareapi_wsdl_loc"
-#~ msgstr ""
-
-#~ msgid "Unable to get SR for this host: %s"
-#~ msgstr ""
-
-#~ msgid "VM.assert_can_migratefailed"
-#~ msgstr ""
-
diff --git a/nova/locale/ja/LC_MESSAGES/nova.po b/nova/locale/ja/LC_MESSAGES/nova.po
index 442816c22..e9ffd1ce5 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-06 19:37+0000\n"
+"POT-Creation-Date: 2013-05-07 19:38+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"
@@ -169,7 +169,7 @@ msgid ""
 msgstr ""
 
 #: nova/exception.py:235 nova/api/ec2/cloud.py:463
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2769
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2765
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -2746,7 +2746,7 @@ msgstr "アトリビュート %s はサポートされていません。"
 msgid "Detach interface %s"
 msgstr "VLANインタフェース %s を開始します。"
 
-#: nova/api/openstack/compute/contrib/baremetal_nodes.py:193
+#: nova/api/openstack/compute/contrib/baremetal_nodes.py:192
 msgid "Must specify id or address"
 msgstr ""
 
@@ -3801,247 +3801,247 @@ msgstr ""
 msgid "No nova entries in syslog!"
 msgstr ""
 
-#: nova/compute/api.py:282
+#: nova/compute/api.py:281
 #, fuzzy
 msgid "Cannot run any more instances of this type."
 msgstr "インスタンスのクオータを超えました。このタイプにおいてはあと %s インスタンスしか実行できません。"
 
-#: nova/compute/api.py:289
+#: nova/compute/api.py:288
 #, fuzzy, python-format
 msgid "Can only run %s more instances of this type."
 msgstr "インスタンスのクオータを超えました。このタイプにおいてはあと %s インスタンスしか実行できません。"
 
-#: nova/compute/api.py:298
+#: nova/compute/api.py:297
 #, 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
+#: nova/compute/api.py:317
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:328
+#: nova/compute/api.py:327
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:332
+#: nova/compute/api.py:331
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:336
+#: nova/compute/api.py:335
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:469
+#: nova/compute/api.py:468
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:509
+#: nova/compute/api.py:508
 #, fuzzy
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr "インスタンス %s にボリュームを接続(attach)できません。"
 
-#: nova/compute/api.py:623
+#: nova/compute/api.py:622
 #, python-format
 msgid "Going to run %s instances..."
 msgstr "%s 個のインスタンスの起動を始めます…"
 
-#: nova/compute/api.py:739
+#: nova/compute/api.py:738
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:766
+#: nova/compute/api.py:765
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1040
+#: nova/compute/api.py:1036
 #, fuzzy
 msgid "instance termination disabled"
 msgstr "インスタンス終了処理を開始します。"
 
-#: nova/compute/api.py:1176
+#: nova/compute/api.py:1172
 #, fuzzy, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr "インスタンス %s: 起動しました。"
 
-#: nova/compute/api.py:1182
+#: nova/compute/api.py:1178
 #, fuzzy
 msgid "going to delete a resizing instance"
 msgstr "インスタンス終了処理を開始します。"
 
-#: nova/compute/api.py:1192
+#: nova/compute/api.py:1188
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1236
+#: nova/compute/api.py:1232
 #, fuzzy
 msgid "Going to try to soft delete instance"
 msgstr "%s を停止しようとしています"
 
-#: nova/compute/api.py:1260
+#: nova/compute/api.py:1256
 #, fuzzy
 msgid "Going to try to terminate instance"
 msgstr "%s を停止しようとしています"
 
-#: nova/compute/api.py:1310
+#: nova/compute/api.py:1306
 #, fuzzy
 msgid "Going to try to stop instance"
 msgstr "%s を停止しようとしています"
 
-#: nova/compute/api.py:1327
+#: nova/compute/api.py:1323
 #, fuzzy
 msgid "Going to try to start instance"
 msgstr "%s を停止しようとしています"
 
-#: nova/compute/api.py:1400
+#: nova/compute/api.py:1396
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1637
+#: nova/compute/api.py:1633
 #, fuzzy, python-format
 msgid "snapshot for %s"
 msgstr "VM %s に対するスナップショットを開始します。"
 
-#: nova/compute/api.py:1988
+#: nova/compute/api.py:1984
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1997
+#: nova/compute/api.py:1993
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2039
+#: nova/compute/api.py:2035
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2179
+#: nova/compute/api.py:2175
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2286
+#: nova/compute/api.py:2282
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2294
+#: nova/compute/api.py:2290
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2366
+#: nova/compute/api.py:2362
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2479
+#: nova/compute/api.py:2475
 #, fuzzy, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr "%s を停止しようとしています"
 
-#: nova/compute/api.py:2498
+#: nova/compute/api.py:2494
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2502
+#: nova/compute/api.py:2498
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2749
+#: nova/compute/api.py:2745
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2753
+#: nova/compute/api.py:2749
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2850
+#: nova/compute/api.py:2845
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2853
+#: nova/compute/api.py:2848
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2861
+#: nova/compute/api.py:2856
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2867
+#: nova/compute/api.py:2862
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2887
+#: nova/compute/api.py:2880
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2890
+#: nova/compute/api.py:2883
 #, python-format
 msgid "Create Security Group %s"
 msgstr "Create Security Group: セキュリティグループ %s を作成します。"
 
-#: nova/compute/api.py:2897
+#: nova/compute/api.py:2890
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2962
+#: nova/compute/api.py:2954
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "VBD %s の削除に失敗しました。"
 
-#: nova/compute/api.py:2967
+#: nova/compute/api.py:2959
 #, fuzzy
 msgid "Security group is still in use"
 msgstr "Revoke security group ingress: セキュリティグループ許可 %s の取消"
 
-#: nova/compute/api.py:2975
+#: nova/compute/api.py:2967
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:2978
+#: nova/compute/api.py:2970
 #, python-format
 msgid "Delete security group %s"
 msgstr "Delete security group: セキュリティグループ %s を削除します。"
 
-#: nova/compute/api.py:3064 nova/compute/api.py:3141
+#: nova/compute/api.py:3047 nova/compute/api.py:3121
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3080
+#: nova/compute/api.py:3063
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3083
+#: nova/compute/api.py:3066
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr "Authorize security group ingress: セキュリティグループ許可 %s"
 
-#: nova/compute/api.py:3094
+#: nova/compute/api.py:3075
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr "Revoke security group ingress: セキュリティグループ許可 %s の取消"
 
-#: nova/compute/api.py:3148
+#: nova/compute/api.py:3128
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -5044,17 +5044,17 @@ msgid ""
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1543
+#: nova/db/sqlalchemy/api.py:1546
 #, fuzzy, python-format
 msgid "Invalid instance id %s in request"
 msgstr "インスタンス %s: rescued"
 
-#: nova/db/sqlalchemy/api.py:2834
+#: nova/db/sqlalchemy/api.py:2837
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4335
+#: nova/db/sqlalchemy/api.py:4332
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5407,20 +5407,20 @@ msgstr ""
 msgid "setting network host"
 msgstr "ネットワークホストの設定をします。"
 
-#: nova/network/manager.py:495
+#: nova/network/manager.py:480
 msgid "network allocations"
 msgstr ""
 
-#: nova/network/manager.py:502
+#: nova/network/manager.py:487
 #, python-format
 msgid "networks retrieved for instance: |%(networks_list)s|"
 msgstr ""
 
-#: nova/network/manager.py:550
+#: nova/network/manager.py:535
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:816
+#: nova/network/manager.py:801
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -5428,98 +5428,98 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:842
+#: nova/network/manager.py:827
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to allocate fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:896
+#: nova/network/manager.py:879
 msgid "Failed to update usages deallocating fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:930
+#: nova/network/manager.py:911
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:953
+#: nova/network/manager.py:934
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:957
+#: nova/network/manager.py:938
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:966
+#: nova/network/manager.py:947
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:971
+#: nova/network/manager.py:952
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:975
+#: nova/network/manager.py:956
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:979
+#: nova/network/manager.py:960
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr "リースしていないIP %s が開放されました。"
 
-#: nova/network/manager.py:998
+#: nova/network/manager.py:979
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1022
+#: nova/network/manager.py:1003
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1042
+#: 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:1123
+#: nova/network/manager.py:1104
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1126
+#: nova/network/manager.py:1107
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1137
+#: nova/network/manager.py:1118
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1194
+#: nova/network/manager.py:1175
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1213
+#: nova/network/manager.py:1194
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1813
+#: nova/network/manager.py:1794
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr "ネットワークの数とVLANの開始番号の和は 4094 より大きくできません。"
 
-#: nova/network/manager.py:1820
+#: nova/network/manager.py:1801
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5591,44 +5591,44 @@ msgstr "インスタンス %s: 起動しました。"
 msgid "Fail to delete port %(portid)s with failure: %(exception)s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:321
+#: nova/network/quantumv2/api.py:318
 #, python-format
 msgid "deallocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:330
+#: nova/network/quantumv2/api.py:327
 #, python-format
 msgid "Failed to delete quantum port %(portid)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:354
+#: nova/network/quantumv2/api.py:349
 #, python-format
 msgid "Failed to delete quantum port %(port_id)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:381
+#: nova/network/quantumv2/api.py:373
 #, python-format
 msgid "get_instance_nw_info() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:413
+#: 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:443
+#: 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:453
+#: nova/network/quantumv2/api.py:445
 #, python-format
 msgid "validate_networks() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:722
+#: nova/network/quantumv2/api.py:688
 #, fuzzy, python-format
 msgid "Multiple floating IP pools matches found for name '%s'"
 msgstr "ネットワークホストの設定をします。"
@@ -6797,7 +6797,7 @@ msgstr ""
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:8707
+#: nova/tests/compute/test_compute.py:8725
 msgid "spawn error"
 msgstr ""
 
@@ -10967,70 +10967,3 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Unexpected error while running command."
-#~ msgstr "コマンド実行において予期しないエラーが発生しました。"
-
-#~ msgid ""
-#~ "%(description)s\n"
-#~ "Command: %(cmd)s\n"
-#~ "Exit code: %(exit_code)s\n"
-#~ "Stdout: %(stdout)r\n"
-#~ "Stderr: %(stderr)r"
-#~ msgstr ""
-#~ "%(description)s\n"
-#~ "コマンド: %(cmd)s\n"
-#~ "終了コード: %(exit_code)s\n"
-#~ "標準出力: %(stdout)r\n"
-#~ "標準エラー出力: %(stderr)r"
-
-#~ msgid "Error clearing stale veth %s"
-#~ msgstr "xvp の開始中にエラー: %s"
-
-#~ msgid "Failed unplugging VLAN interface '%s'"
-#~ msgstr "プライベートキーの復号に失敗しました: %s"
-
-#~ msgid "Unplugged VLAN interface '%s'"
-#~ msgstr "プライベートキーの復号に失敗しました: %s"
-
-#~ msgid "Failed unplugging bridge interface '%s'"
-#~ msgstr "%s 用のブリッジインタフェースを開始します。"
-
-#~ msgid "Unplugged bridge interface '%s'"
-#~ msgstr "%s 用のブリッジインタフェースを開始します。"
-
-#~ msgid "Failed unplugging gateway interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Unplugged gateway interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Network %(net)s for port %(port_id)s not found!"
-#~ msgstr ""
-
-#~ msgid "Host filter ignoring hosts: %(ignored_hosts_str)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "No hosts matched due to not "
-#~ "matching 'force_hosts'value of "
-#~ "'%(forced_hosts_str)s'"
-#~ msgstr ""
-
-#~ msgid "Host filter forcing available hosts to %(forced_hosts_str)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "Getting block stats failed, device might"
-#~ " have been detached. Code=%(errcode)s "
-#~ "Error=%(e)s"
-#~ msgstr ""
-
-#~ msgid "Must specify vmwareapi_wsdl_loc"
-#~ msgstr ""
-
-#~ msgid "Unable to get SR for this host: %s"
-#~ msgstr ""
-
-#~ msgid "VM.assert_can_migratefailed"
-#~ msgstr ""
-
diff --git a/nova/locale/ko/LC_MESSAGES/nova.po b/nova/locale/ko/LC_MESSAGES/nova.po
index 2a536b62c..645628c02 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-06 19:37+0000\n"
+"POT-Creation-Date: 2013-05-07 19:38+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"
@@ -168,7 +168,7 @@ msgid ""
 msgstr ""
 
 #: nova/exception.py:235 nova/api/ec2/cloud.py:463
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2769
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2765
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -2728,7 +2728,7 @@ msgstr ""
 msgid "Detach interface %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/baremetal_nodes.py:193
+#: nova/api/openstack/compute/contrib/baremetal_nodes.py:192
 msgid "Must specify id or address"
 msgstr ""
 
@@ -3766,239 +3766,239 @@ msgstr ""
 msgid "No nova entries in syslog!"
 msgstr ""
 
-#: nova/compute/api.py:282
+#: nova/compute/api.py:281
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:289
+#: nova/compute/api.py:288
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:298
+#: nova/compute/api.py:297
 #, 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
+#: nova/compute/api.py:317
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:328
+#: nova/compute/api.py:327
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:332
+#: nova/compute/api.py:331
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:336
+#: nova/compute/api.py:335
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:469
+#: nova/compute/api.py:468
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:509
+#: nova/compute/api.py:508
 #, fuzzy
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr "%s 인스턴스에 볼륨장착 할 수 없습니다"
 
-#: nova/compute/api.py:623
+#: nova/compute/api.py:622
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:739
+#: nova/compute/api.py:738
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:766
+#: nova/compute/api.py:765
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1040
+#: nova/compute/api.py:1036
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1176
+#: nova/compute/api.py:1172
 #, fuzzy, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr "인스턴스 %s: 스냅샷 저장중"
 
-#: nova/compute/api.py:1182
+#: nova/compute/api.py:1178
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1192
+#: nova/compute/api.py:1188
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1236
+#: nova/compute/api.py:1232
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1260
+#: nova/compute/api.py:1256
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1310
+#: nova/compute/api.py:1306
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1327
+#: nova/compute/api.py:1323
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1400
+#: nova/compute/api.py:1396
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1637
+#: nova/compute/api.py:1633
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:1988
+#: nova/compute/api.py:1984
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1997
+#: nova/compute/api.py:1993
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2039
+#: nova/compute/api.py:2035
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2179
+#: nova/compute/api.py:2175
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2286
+#: nova/compute/api.py:2282
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2294
+#: nova/compute/api.py:2290
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2366
+#: nova/compute/api.py:2362
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2479
+#: nova/compute/api.py:2475
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2498
+#: nova/compute/api.py:2494
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2502
+#: nova/compute/api.py:2498
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2749
+#: nova/compute/api.py:2745
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2753
+#: nova/compute/api.py:2749
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2850
+#: nova/compute/api.py:2845
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2853
+#: nova/compute/api.py:2848
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2861
+#: nova/compute/api.py:2856
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2867
+#: nova/compute/api.py:2862
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2887
+#: nova/compute/api.py:2880
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2890
+#: nova/compute/api.py:2883
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2897
+#: nova/compute/api.py:2890
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2962
+#: nova/compute/api.py:2954
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "%s 볼륨을 찾을수 없습니다"
 
-#: nova/compute/api.py:2967
+#: nova/compute/api.py:2959
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:2975
+#: nova/compute/api.py:2967
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:2978
+#: nova/compute/api.py:2970
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3064 nova/compute/api.py:3141
+#: nova/compute/api.py:3047 nova/compute/api.py:3121
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3080
+#: nova/compute/api.py:3063
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3083
+#: nova/compute/api.py:3066
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3094
+#: nova/compute/api.py:3075
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3148
+#: nova/compute/api.py:3128
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4987,17 +4987,17 @@ msgid ""
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1543
+#: nova/db/sqlalchemy/api.py:1546
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2834
+#: nova/db/sqlalchemy/api.py:2837
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4335
+#: nova/db/sqlalchemy/api.py:4332
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5349,20 +5349,20 @@ msgstr ""
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:495
+#: nova/network/manager.py:480
 msgid "network allocations"
 msgstr ""
 
-#: nova/network/manager.py:502
+#: nova/network/manager.py:487
 #, python-format
 msgid "networks retrieved for instance: |%(networks_list)s|"
 msgstr ""
 
-#: nova/network/manager.py:550
+#: nova/network/manager.py:535
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:816
+#: nova/network/manager.py:801
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -5370,98 +5370,98 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:842
+#: nova/network/manager.py:827
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to allocate fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:896
+#: nova/network/manager.py:879
 msgid "Failed to update usages deallocating fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:930
+#: nova/network/manager.py:911
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:953
+#: nova/network/manager.py:934
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:957
+#: nova/network/manager.py:938
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:966
+#: nova/network/manager.py:947
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:971
+#: nova/network/manager.py:952
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:975
+#: nova/network/manager.py:956
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:979
+#: nova/network/manager.py:960
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:998
+#: nova/network/manager.py:979
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1022
+#: nova/network/manager.py:1003
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1042
+#: 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:1123
+#: nova/network/manager.py:1104
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1126
+#: nova/network/manager.py:1107
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1137
+#: nova/network/manager.py:1118
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1194
+#: nova/network/manager.py:1175
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1213
+#: nova/network/manager.py:1194
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1813
+#: nova/network/manager.py:1794
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1820
+#: nova/network/manager.py:1801
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5531,44 +5531,44 @@ msgstr ""
 msgid "Fail to delete port %(portid)s with failure: %(exception)s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:321
+#: nova/network/quantumv2/api.py:318
 #, python-format
 msgid "deallocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:330
+#: nova/network/quantumv2/api.py:327
 #, python-format
 msgid "Failed to delete quantum port %(portid)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:354
+#: nova/network/quantumv2/api.py:349
 #, python-format
 msgid "Failed to delete quantum port %(port_id)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:381
+#: nova/network/quantumv2/api.py:373
 #, python-format
 msgid "get_instance_nw_info() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:413
+#: 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:443
+#: 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:453
+#: nova/network/quantumv2/api.py:445
 #, python-format
 msgid "validate_networks() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:722
+#: nova/network/quantumv2/api.py:688
 #, python-format
 msgid "Multiple floating IP pools matches found for name '%s'"
 msgstr ""
@@ -6728,7 +6728,7 @@ msgstr ""
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:8707
+#: nova/tests/compute/test_compute.py:8725
 msgid "spawn error"
 msgstr ""
 
@@ -10871,70 +10871,3 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Unexpected error while running command."
-#~ msgstr "명령 실행도중 예측하지 못한 에러가 발생했습니다"
-
-#~ msgid ""
-#~ "%(description)s\n"
-#~ "Command: %(cmd)s\n"
-#~ "Exit code: %(exit_code)s\n"
-#~ "Stdout: %(stdout)r\n"
-#~ "Stderr: %(stderr)r"
-#~ msgstr ""
-#~ "%(description)s\n"
-#~ "Command: %(cmd)s\n"
-#~ "Exit code: %(exit_code)s\n"
-#~ "Stdout: %(stdout)r\n"
-#~ "Stderr: %(stderr)r"
-
-#~ msgid "Error clearing stale veth %s"
-#~ msgstr ""
-
-#~ msgid "Failed unplugging VLAN interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Unplugged VLAN interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Failed unplugging bridge interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Unplugged bridge interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Failed unplugging gateway interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Unplugged gateway interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Network %(net)s for port %(port_id)s not found!"
-#~ msgstr ""
-
-#~ msgid "Host filter ignoring hosts: %(ignored_hosts_str)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "No hosts matched due to not "
-#~ "matching 'force_hosts'value of "
-#~ "'%(forced_hosts_str)s'"
-#~ msgstr ""
-
-#~ msgid "Host filter forcing available hosts to %(forced_hosts_str)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "Getting block stats failed, device might"
-#~ " have been detached. Code=%(errcode)s "
-#~ "Error=%(e)s"
-#~ msgstr ""
-
-#~ msgid "Must specify vmwareapi_wsdl_loc"
-#~ msgstr ""
-
-#~ msgid "Unable to get SR for this host: %s"
-#~ msgstr ""
-
-#~ msgid "VM.assert_can_migratefailed"
-#~ msgstr ""
-
diff --git a/nova/locale/ko_KR/LC_MESSAGES/nova.po b/nova/locale/ko_KR/LC_MESSAGES/nova.po
index 5b2822065..98e7fde29 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-06 19:37+0000\n"
+"POT-Creation-Date: 2013-05-07 19:38+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"
@@ -169,7 +169,7 @@ msgid ""
 msgstr ""
 
 #: nova/exception.py:235 nova/api/ec2/cloud.py:463
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2769
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2765
 msgid "Keypair data is invalid"
 msgstr "Keypair 데이터가 맞지 않습니다"
 
@@ -2727,7 +2727,7 @@ msgstr ""
 msgid "Detach interface %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/baremetal_nodes.py:193
+#: nova/api/openstack/compute/contrib/baremetal_nodes.py:192
 msgid "Must specify id or address"
 msgstr ""
 
@@ -3761,238 +3761,238 @@ msgstr ""
 msgid "No nova entries in syslog!"
 msgstr ""
 
-#: nova/compute/api.py:282
+#: nova/compute/api.py:281
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:289
+#: nova/compute/api.py:288
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:298
+#: nova/compute/api.py:297
 #, 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
+#: nova/compute/api.py:317
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:328
+#: nova/compute/api.py:327
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:332
+#: nova/compute/api.py:331
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:336
+#: nova/compute/api.py:335
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:469
+#: nova/compute/api.py:468
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:509
+#: nova/compute/api.py:508
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:623
+#: nova/compute/api.py:622
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:739
+#: nova/compute/api.py:738
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:766
+#: nova/compute/api.py:765
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1040
+#: nova/compute/api.py:1036
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1176
+#: nova/compute/api.py:1172
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1182
+#: nova/compute/api.py:1178
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1192
+#: nova/compute/api.py:1188
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1236
+#: nova/compute/api.py:1232
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1260
+#: nova/compute/api.py:1256
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1310
+#: nova/compute/api.py:1306
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1327
+#: nova/compute/api.py:1323
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1400
+#: nova/compute/api.py:1396
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1637
+#: nova/compute/api.py:1633
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:1988
+#: nova/compute/api.py:1984
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1997
+#: nova/compute/api.py:1993
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2039
+#: nova/compute/api.py:2035
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2179
+#: nova/compute/api.py:2175
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2286
+#: nova/compute/api.py:2282
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2294
+#: nova/compute/api.py:2290
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2366
+#: nova/compute/api.py:2362
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2479
+#: nova/compute/api.py:2475
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2498
+#: nova/compute/api.py:2494
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2502
+#: nova/compute/api.py:2498
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2749
+#: nova/compute/api.py:2745
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2753
+#: nova/compute/api.py:2749
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2850
+#: nova/compute/api.py:2845
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2853
+#: nova/compute/api.py:2848
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2861
+#: nova/compute/api.py:2856
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2867
+#: nova/compute/api.py:2862
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2887
+#: nova/compute/api.py:2880
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2890
+#: nova/compute/api.py:2883
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2897
+#: nova/compute/api.py:2890
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2962
+#: nova/compute/api.py:2954
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:2967
+#: nova/compute/api.py:2959
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:2975
+#: nova/compute/api.py:2967
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:2978
+#: nova/compute/api.py:2970
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3064 nova/compute/api.py:3141
+#: nova/compute/api.py:3047 nova/compute/api.py:3121
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3080
+#: nova/compute/api.py:3063
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3083
+#: nova/compute/api.py:3066
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3094
+#: nova/compute/api.py:3075
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3148
+#: nova/compute/api.py:3128
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4973,17 +4973,17 @@ msgid ""
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1543
+#: nova/db/sqlalchemy/api.py:1546
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2834
+#: nova/db/sqlalchemy/api.py:2837
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4335
+#: nova/db/sqlalchemy/api.py:4332
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5335,20 +5335,20 @@ msgstr ""
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:495
+#: nova/network/manager.py:480
 msgid "network allocations"
 msgstr ""
 
-#: nova/network/manager.py:502
+#: nova/network/manager.py:487
 #, python-format
 msgid "networks retrieved for instance: |%(networks_list)s|"
 msgstr ""
 
-#: nova/network/manager.py:550
+#: nova/network/manager.py:535
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:816
+#: nova/network/manager.py:801
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -5356,98 +5356,98 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:842
+#: nova/network/manager.py:827
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to allocate fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:896
+#: nova/network/manager.py:879
 msgid "Failed to update usages deallocating fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:930
+#: nova/network/manager.py:911
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:953
+#: nova/network/manager.py:934
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:957
+#: nova/network/manager.py:938
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:966
+#: nova/network/manager.py:947
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:971
+#: nova/network/manager.py:952
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:975
+#: nova/network/manager.py:956
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:979
+#: nova/network/manager.py:960
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:998
+#: nova/network/manager.py:979
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1022
+#: nova/network/manager.py:1003
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1042
+#: 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:1123
+#: nova/network/manager.py:1104
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1126
+#: nova/network/manager.py:1107
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1137
+#: nova/network/manager.py:1118
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1194
+#: nova/network/manager.py:1175
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1213
+#: nova/network/manager.py:1194
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1813
+#: nova/network/manager.py:1794
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1820
+#: nova/network/manager.py:1801
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5517,44 +5517,44 @@ msgstr ""
 msgid "Fail to delete port %(portid)s with failure: %(exception)s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:321
+#: nova/network/quantumv2/api.py:318
 #, python-format
 msgid "deallocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:330
+#: nova/network/quantumv2/api.py:327
 #, python-format
 msgid "Failed to delete quantum port %(portid)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:354
+#: nova/network/quantumv2/api.py:349
 #, python-format
 msgid "Failed to delete quantum port %(port_id)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:381
+#: nova/network/quantumv2/api.py:373
 #, python-format
 msgid "get_instance_nw_info() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:413
+#: 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:443
+#: 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:453
+#: nova/network/quantumv2/api.py:445
 #, python-format
 msgid "validate_networks() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:722
+#: nova/network/quantumv2/api.py:688
 #, python-format
 msgid "Multiple floating IP pools matches found for name '%s'"
 msgstr ""
@@ -6714,7 +6714,7 @@ msgstr ""
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:8707
+#: nova/tests/compute/test_compute.py:8725
 msgid "spawn error"
 msgstr ""
 
diff --git a/nova/locale/nb/LC_MESSAGES/nova.po b/nova/locale/nb/LC_MESSAGES/nova.po
index a95162d4a..3ada2618b 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-06 19:37+0000\n"
+"POT-Creation-Date: 2013-05-07 19:38+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"
@@ -170,7 +170,7 @@ msgid ""
 msgstr ""
 
 #: nova/exception.py:235 nova/api/ec2/cloud.py:463
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2769
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2765
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -2730,7 +2730,7 @@ msgstr ""
 msgid "Detach interface %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/baremetal_nodes.py:193
+#: nova/api/openstack/compute/contrib/baremetal_nodes.py:192
 msgid "Must specify id or address"
 msgstr ""
 
@@ -3771,238 +3771,238 @@ msgstr ""
 msgid "No nova entries in syslog!"
 msgstr ""
 
-#: nova/compute/api.py:282
+#: nova/compute/api.py:281
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:289
+#: nova/compute/api.py:288
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:298
+#: nova/compute/api.py:297
 #, 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
+#: nova/compute/api.py:317
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:328
+#: nova/compute/api.py:327
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:332
+#: nova/compute/api.py:331
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:336
+#: nova/compute/api.py:335
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:469
+#: nova/compute/api.py:468
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:509
+#: nova/compute/api.py:508
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:623
+#: nova/compute/api.py:622
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:739
+#: nova/compute/api.py:738
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:766
+#: nova/compute/api.py:765
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1040
+#: nova/compute/api.py:1036
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1176
+#: nova/compute/api.py:1172
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1182
+#: nova/compute/api.py:1178
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1192
+#: nova/compute/api.py:1188
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1236
+#: nova/compute/api.py:1232
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1260
+#: nova/compute/api.py:1256
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1310
+#: nova/compute/api.py:1306
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1327
+#: nova/compute/api.py:1323
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1400
+#: nova/compute/api.py:1396
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1637
+#: nova/compute/api.py:1633
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:1988
+#: nova/compute/api.py:1984
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1997
+#: nova/compute/api.py:1993
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2039
+#: nova/compute/api.py:2035
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2179
+#: nova/compute/api.py:2175
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2286
+#: nova/compute/api.py:2282
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2294
+#: nova/compute/api.py:2290
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2366
+#: nova/compute/api.py:2362
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2479
+#: nova/compute/api.py:2475
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2498
+#: nova/compute/api.py:2494
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2502
+#: nova/compute/api.py:2498
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2749
+#: nova/compute/api.py:2745
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2753
+#: nova/compute/api.py:2749
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2850
+#: nova/compute/api.py:2845
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2853
+#: nova/compute/api.py:2848
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2861
+#: nova/compute/api.py:2856
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2867
+#: nova/compute/api.py:2862
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2887
+#: nova/compute/api.py:2880
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2890
+#: nova/compute/api.py:2883
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2897
+#: nova/compute/api.py:2890
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2962
+#: nova/compute/api.py:2954
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:2967
+#: nova/compute/api.py:2959
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:2975
+#: nova/compute/api.py:2967
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:2978
+#: nova/compute/api.py:2970
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3064 nova/compute/api.py:3141
+#: nova/compute/api.py:3047 nova/compute/api.py:3121
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3080
+#: nova/compute/api.py:3063
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3083
+#: nova/compute/api.py:3066
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3094
+#: nova/compute/api.py:3075
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3148
+#: nova/compute/api.py:3128
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4983,17 +4983,17 @@ msgid ""
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1543
+#: nova/db/sqlalchemy/api.py:1546
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2834
+#: nova/db/sqlalchemy/api.py:2837
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4335
+#: nova/db/sqlalchemy/api.py:4332
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5345,20 +5345,20 @@ msgstr ""
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:495
+#: nova/network/manager.py:480
 msgid "network allocations"
 msgstr ""
 
-#: nova/network/manager.py:502
+#: nova/network/manager.py:487
 #, python-format
 msgid "networks retrieved for instance: |%(networks_list)s|"
 msgstr ""
 
-#: nova/network/manager.py:550
+#: nova/network/manager.py:535
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:816
+#: nova/network/manager.py:801
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -5366,98 +5366,98 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:842
+#: nova/network/manager.py:827
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to allocate fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:896
+#: nova/network/manager.py:879
 msgid "Failed to update usages deallocating fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:930
+#: nova/network/manager.py:911
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:953
+#: nova/network/manager.py:934
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:957
+#: nova/network/manager.py:938
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:966
+#: nova/network/manager.py:947
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:971
+#: nova/network/manager.py:952
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:975
+#: nova/network/manager.py:956
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:979
+#: nova/network/manager.py:960
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:998
+#: nova/network/manager.py:979
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1022
+#: nova/network/manager.py:1003
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1042
+#: 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:1123
+#: nova/network/manager.py:1104
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1126
+#: nova/network/manager.py:1107
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1137
+#: nova/network/manager.py:1118
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1194
+#: nova/network/manager.py:1175
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1213
+#: nova/network/manager.py:1194
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1813
+#: nova/network/manager.py:1794
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1820
+#: nova/network/manager.py:1801
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5529,44 +5529,44 @@ msgstr "Nettverk ikke funnet"
 msgid "Fail to delete port %(portid)s with failure: %(exception)s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:321
+#: nova/network/quantumv2/api.py:318
 #, python-format
 msgid "deallocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:330
+#: nova/network/quantumv2/api.py:327
 #, python-format
 msgid "Failed to delete quantum port %(portid)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:354
+#: nova/network/quantumv2/api.py:349
 #, python-format
 msgid "Failed to delete quantum port %(port_id)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:381
+#: nova/network/quantumv2/api.py:373
 #, python-format
 msgid "get_instance_nw_info() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:413
+#: 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:443
+#: 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:453
+#: nova/network/quantumv2/api.py:445
 #, python-format
 msgid "validate_networks() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:722
+#: nova/network/quantumv2/api.py:688
 #, python-format
 msgid "Multiple floating IP pools matches found for name '%s'"
 msgstr ""
@@ -6729,7 +6729,7 @@ msgstr ""
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:8707
+#: nova/tests/compute/test_compute.py:8725
 msgid "spawn error"
 msgstr ""
 
@@ -10861,70 +10861,3 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Unexpected error while running command."
-#~ msgstr "Uventet feil under kjøring av kommandoen."
-
-#~ msgid ""
-#~ "%(description)s\n"
-#~ "Command: %(cmd)s\n"
-#~ "Exit code: %(exit_code)s\n"
-#~ "Stdout: %(stdout)r\n"
-#~ "Stderr: %(stderr)r"
-#~ msgstr ""
-#~ "%(description)s\n"
-#~ "Kommando: %(cmd)s\n"
-#~ "Avslutnings-status: %(exit_code)s\n"
-#~ "Standard ut: %(stdout)r\n"
-#~ "Standardfeil: %(stderr)r"
-
-#~ msgid "Error clearing stale veth %s"
-#~ msgstr ""
-
-#~ msgid "Failed unplugging VLAN interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Unplugged VLAN interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Failed unplugging bridge interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Unplugged bridge interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Failed unplugging gateway interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Unplugged gateway interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Network %(net)s for port %(port_id)s not found!"
-#~ msgstr "Nettverk %(network_id)s ble ikke funnet."
-
-#~ msgid "Host filter ignoring hosts: %(ignored_hosts_str)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "No hosts matched due to not "
-#~ "matching 'force_hosts'value of "
-#~ "'%(forced_hosts_str)s'"
-#~ msgstr ""
-
-#~ msgid "Host filter forcing available hosts to %(forced_hosts_str)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "Getting block stats failed, device might"
-#~ " have been detached. Code=%(errcode)s "
-#~ "Error=%(e)s"
-#~ msgstr ""
-
-#~ msgid "Must specify vmwareapi_wsdl_loc"
-#~ msgstr ""
-
-#~ msgid "Unable to get SR for this host: %s"
-#~ msgstr ""
-
-#~ msgid "VM.assert_can_migratefailed"
-#~ msgstr ""
-
diff --git a/nova/locale/nova.pot b/nova/locale/nova.pot
index de0320d0c..072526121 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.239\n"
+"Project-Id-Version: nova jenkins.nova.propose.translation.update.240\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-05-06 19:37+0000\n"
+"POT-Creation-Date: 2013-05-07 19:38+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"
@@ -168,7 +168,7 @@ msgid ""
 msgstr ""
 
 #: nova/exception.py:235 nova/api/ec2/cloud.py:463
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2769
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2765
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -2726,7 +2726,7 @@ msgstr ""
 msgid "Detach interface %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/baremetal_nodes.py:193
+#: nova/api/openstack/compute/contrib/baremetal_nodes.py:192
 msgid "Must specify id or address"
 msgstr ""
 
@@ -3760,238 +3760,238 @@ msgstr ""
 msgid "No nova entries in syslog!"
 msgstr ""
 
-#: nova/compute/api.py:282
+#: nova/compute/api.py:281
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:289
+#: nova/compute/api.py:288
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:298
+#: nova/compute/api.py:297
 #, 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
+#: nova/compute/api.py:317
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:328
+#: nova/compute/api.py:327
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:332
+#: nova/compute/api.py:331
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:336
+#: nova/compute/api.py:335
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:469
+#: nova/compute/api.py:468
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:509
+#: nova/compute/api.py:508
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:623
+#: nova/compute/api.py:622
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:739
+#: nova/compute/api.py:738
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:766
+#: nova/compute/api.py:765
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1040
+#: nova/compute/api.py:1036
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1176
+#: nova/compute/api.py:1172
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1182
+#: nova/compute/api.py:1178
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1192
+#: nova/compute/api.py:1188
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1236
+#: nova/compute/api.py:1232
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1260
+#: nova/compute/api.py:1256
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1310
+#: nova/compute/api.py:1306
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1327
+#: nova/compute/api.py:1323
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1400
+#: nova/compute/api.py:1396
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1637
+#: nova/compute/api.py:1633
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:1988
+#: nova/compute/api.py:1984
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1997
+#: nova/compute/api.py:1993
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2039
+#: nova/compute/api.py:2035
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2179
+#: nova/compute/api.py:2175
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2286
+#: nova/compute/api.py:2282
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2294
+#: nova/compute/api.py:2290
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2366
+#: nova/compute/api.py:2362
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2479
+#: nova/compute/api.py:2475
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2498
+#: nova/compute/api.py:2494
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2502
+#: nova/compute/api.py:2498
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2749
+#: nova/compute/api.py:2745
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2753
+#: nova/compute/api.py:2749
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2850
+#: nova/compute/api.py:2845
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2853
+#: nova/compute/api.py:2848
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2861
+#: nova/compute/api.py:2856
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2867
+#: nova/compute/api.py:2862
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2887
+#: nova/compute/api.py:2880
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2890
+#: nova/compute/api.py:2883
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2897
+#: nova/compute/api.py:2890
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2962
+#: nova/compute/api.py:2954
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:2967
+#: nova/compute/api.py:2959
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:2975
+#: nova/compute/api.py:2967
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:2978
+#: nova/compute/api.py:2970
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3064 nova/compute/api.py:3141
+#: nova/compute/api.py:3047 nova/compute/api.py:3121
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3080
+#: nova/compute/api.py:3063
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3083
+#: nova/compute/api.py:3066
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3094
+#: nova/compute/api.py:3075
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3148
+#: nova/compute/api.py:3128
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4972,17 +4972,17 @@ msgid ""
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1543
+#: nova/db/sqlalchemy/api.py:1546
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2834
+#: nova/db/sqlalchemy/api.py:2837
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4335
+#: nova/db/sqlalchemy/api.py:4332
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5334,20 +5334,20 @@ msgstr ""
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:495
+#: nova/network/manager.py:480
 msgid "network allocations"
 msgstr ""
 
-#: nova/network/manager.py:502
+#: nova/network/manager.py:487
 #, python-format
 msgid "networks retrieved for instance: |%(networks_list)s|"
 msgstr ""
 
-#: nova/network/manager.py:550
+#: nova/network/manager.py:535
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:816
+#: nova/network/manager.py:801
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -5355,98 +5355,98 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:842
+#: nova/network/manager.py:827
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to allocate fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:896
+#: nova/network/manager.py:879
 msgid "Failed to update usages deallocating fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:930
+#: nova/network/manager.py:911
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:953
+#: nova/network/manager.py:934
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:957
+#: nova/network/manager.py:938
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:966
+#: nova/network/manager.py:947
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:971
+#: nova/network/manager.py:952
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:975
+#: nova/network/manager.py:956
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:979
+#: nova/network/manager.py:960
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:998
+#: nova/network/manager.py:979
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1022
+#: nova/network/manager.py:1003
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1042
+#: 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:1123
+#: nova/network/manager.py:1104
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1126
+#: nova/network/manager.py:1107
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1137
+#: nova/network/manager.py:1118
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1194
+#: nova/network/manager.py:1175
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1213
+#: nova/network/manager.py:1194
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1813
+#: nova/network/manager.py:1794
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1820
+#: nova/network/manager.py:1801
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5516,44 +5516,44 @@ msgstr ""
 msgid "Fail to delete port %(portid)s with failure: %(exception)s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:321
+#: nova/network/quantumv2/api.py:318
 #, python-format
 msgid "deallocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:330
+#: nova/network/quantumv2/api.py:327
 #, python-format
 msgid "Failed to delete quantum port %(portid)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:354
+#: nova/network/quantumv2/api.py:349
 #, python-format
 msgid "Failed to delete quantum port %(port_id)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:381
+#: nova/network/quantumv2/api.py:373
 #, python-format
 msgid "get_instance_nw_info() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:413
+#: 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:443
+#: 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:453
+#: nova/network/quantumv2/api.py:445
 #, python-format
 msgid "validate_networks() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:722
+#: nova/network/quantumv2/api.py:688
 #, python-format
 msgid "Multiple floating IP pools matches found for name '%s'"
 msgstr ""
@@ -6713,7 +6713,7 @@ msgstr ""
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:8707
+#: nova/tests/compute/test_compute.py:8725
 msgid "spawn error"
 msgstr ""
 
diff --git a/nova/locale/pt_BR/LC_MESSAGES/nova.po b/nova/locale/pt_BR/LC_MESSAGES/nova.po
index 32da7f70a..87316fdb8 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-06 19:37+0000\n"
+"POT-Creation-Date: 2013-05-07 19:38+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"
@@ -169,7 +169,7 @@ msgid ""
 msgstr ""
 
 #: nova/exception.py:235 nova/api/ec2/cloud.py:463
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2769
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2765
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -2748,7 +2748,7 @@ msgstr "atributo não suportado: %s"
 msgid "Detach interface %s"
 msgstr "Iniciando a VLAN %s"
 
-#: nova/api/openstack/compute/contrib/baremetal_nodes.py:193
+#: nova/api/openstack/compute/contrib/baremetal_nodes.py:192
 msgid "Must specify id or address"
 msgstr ""
 
@@ -3807,246 +3807,246 @@ msgstr ""
 msgid "No nova entries in syslog!"
 msgstr ""
 
-#: nova/compute/api.py:282
+#: nova/compute/api.py:281
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:289
+#: nova/compute/api.py:288
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:298
+#: nova/compute/api.py:297
 #, 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
+#: nova/compute/api.py:317
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:328
+#: nova/compute/api.py:327
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:332
+#: nova/compute/api.py:331
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:336
+#: nova/compute/api.py:335
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:469
+#: nova/compute/api.py:468
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:509
+#: nova/compute/api.py:508
 #, 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:623
+#: nova/compute/api.py:622
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:739
+#: nova/compute/api.py:738
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:766
+#: nova/compute/api.py:765
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1040
+#: nova/compute/api.py:1036
 #, fuzzy
 msgid "instance termination disabled"
 msgstr "Começando a terminar instâncias"
 
-#: nova/compute/api.py:1176
+#: nova/compute/api.py:1172
 #, 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:1182
+#: nova/compute/api.py:1178
 #, fuzzy
 msgid "going to delete a resizing instance"
 msgstr "Começando a terminar instâncias"
 
-#: nova/compute/api.py:1192
+#: nova/compute/api.py:1188
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1236
+#: nova/compute/api.py:1232
 #, fuzzy
 msgid "Going to try to soft delete instance"
 msgstr "Começando a terminar instâncias"
 
-#: nova/compute/api.py:1260
+#: nova/compute/api.py:1256
 #, fuzzy
 msgid "Going to try to terminate instance"
 msgstr "Começando a terminar instâncias"
 
-#: nova/compute/api.py:1310
+#: nova/compute/api.py:1306
 #, fuzzy
 msgid "Going to try to stop instance"
 msgstr "Falhou ao reiniciar instância"
 
-#: nova/compute/api.py:1327
+#: nova/compute/api.py:1323
 #, fuzzy
 msgid "Going to try to start instance"
 msgstr "Começando a terminar instâncias"
 
-#: nova/compute/api.py:1400
+#: nova/compute/api.py:1396
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1637
+#: nova/compute/api.py:1633
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:1988
+#: nova/compute/api.py:1984
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1997
+#: nova/compute/api.py:1993
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2039
+#: nova/compute/api.py:2035
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2179
+#: nova/compute/api.py:2175
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2286
+#: nova/compute/api.py:2282
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2294
+#: nova/compute/api.py:2290
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2366
+#: nova/compute/api.py:2362
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2479
+#: nova/compute/api.py:2475
 #, fuzzy, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr "Começando a terminar instâncias"
 
-#: nova/compute/api.py:2498
+#: nova/compute/api.py:2494
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2502
+#: nova/compute/api.py:2498
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2749
+#: nova/compute/api.py:2745
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2753
+#: nova/compute/api.py:2749
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2850
+#: nova/compute/api.py:2845
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2853
+#: nova/compute/api.py:2848
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2861
+#: nova/compute/api.py:2856
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2867
+#: nova/compute/api.py:2862
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2887
+#: nova/compute/api.py:2880
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2890
+#: nova/compute/api.py:2883
 #, python-format
 msgid "Create Security Group %s"
 msgstr "Criar Grupo de Segurança %s"
 
-#: nova/compute/api.py:2897
+#: nova/compute/api.py:2890
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2962
+#: nova/compute/api.py:2954
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "Não é possível destruir o VBD %s"
 
-#: nova/compute/api.py:2967
+#: nova/compute/api.py:2959
 #, fuzzy
 msgid "Security group is still in use"
 msgstr "Revogado entrada do grupo de segurança %s"
 
-#: nova/compute/api.py:2975
+#: nova/compute/api.py:2967
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:2978
+#: nova/compute/api.py:2970
 #, python-format
 msgid "Delete security group %s"
 msgstr "Excluir grupo de segurança %s"
 
-#: nova/compute/api.py:3064 nova/compute/api.py:3141
+#: nova/compute/api.py:3047 nova/compute/api.py:3121
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3080
+#: nova/compute/api.py:3063
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3083
+#: nova/compute/api.py:3066
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr "Autorizada entrada do grupo de segurança %s"
 
-#: nova/compute/api.py:3094
+#: nova/compute/api.py:3075
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr "Revogado entrada do grupo de segurança %s"
 
-#: nova/compute/api.py:3148
+#: nova/compute/api.py:3128
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -5050,17 +5050,17 @@ msgid ""
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1543
+#: nova/db/sqlalchemy/api.py:1546
 #, fuzzy, python-format
 msgid "Invalid instance id %s in request"
 msgstr "Corpo do pedido está mal formado"
 
-#: nova/db/sqlalchemy/api.py:2834
+#: nova/db/sqlalchemy/api.py:2837
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4335
+#: nova/db/sqlalchemy/api.py:4332
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5413,20 +5413,20 @@ msgstr ""
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:495
+#: nova/network/manager.py:480
 msgid "network allocations"
 msgstr ""
 
-#: nova/network/manager.py:502
+#: nova/network/manager.py:487
 #, python-format
 msgid "networks retrieved for instance: |%(networks_list)s|"
 msgstr ""
 
-#: nova/network/manager.py:550
+#: nova/network/manager.py:535
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:816
+#: nova/network/manager.py:801
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -5434,98 +5434,98 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:842
+#: nova/network/manager.py:827
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to allocate fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:896
+#: nova/network/manager.py:879
 msgid "Failed to update usages deallocating fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:930
+#: nova/network/manager.py:911
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:953
+#: nova/network/manager.py:934
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:957
+#: nova/network/manager.py:938
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:966
+#: nova/network/manager.py:947
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:971
+#: nova/network/manager.py:952
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:975
+#: nova/network/manager.py:956
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:979
+#: nova/network/manager.py:960
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:998
+#: nova/network/manager.py:979
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1022
+#: nova/network/manager.py:1003
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1042
+#: 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:1123
+#: nova/network/manager.py:1104
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1126
+#: nova/network/manager.py:1107
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1137
+#: nova/network/manager.py:1118
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1194
+#: nova/network/manager.py:1175
 msgid "Network already exists!"
 msgstr "Rede já existe!"
 
-#: nova/network/manager.py:1213
+#: nova/network/manager.py:1194
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1813
+#: nova/network/manager.py:1794
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1820
+#: nova/network/manager.py:1801
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5597,44 +5597,44 @@ msgstr "Imagem não encontrada."
 msgid "Fail to delete port %(portid)s with failure: %(exception)s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:321
+#: nova/network/quantumv2/api.py:318
 #, python-format
 msgid "deallocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:330
+#: nova/network/quantumv2/api.py:327
 #, python-format
 msgid "Failed to delete quantum port %(portid)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:354
+#: nova/network/quantumv2/api.py:349
 #, python-format
 msgid "Failed to delete quantum port %(port_id)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:381
+#: nova/network/quantumv2/api.py:373
 #, python-format
 msgid "get_instance_nw_info() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:413
+#: 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:443
+#: 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:453
+#: nova/network/quantumv2/api.py:445
 #, python-format
 msgid "validate_networks() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:722
+#: nova/network/quantumv2/api.py:688
 #, fuzzy, python-format
 msgid "Multiple floating IP pools matches found for name '%s'"
 msgstr "Removendo rede com id %s"
@@ -6804,7 +6804,7 @@ msgstr ""
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:8707
+#: nova/tests/compute/test_compute.py:8725
 msgid "spawn error"
 msgstr ""
 
@@ -10980,70 +10980,3 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Unexpected error while running command."
-#~ msgstr "Erro inesperado ao executar o comando."
-
-#~ msgid ""
-#~ "%(description)s\n"
-#~ "Command: %(cmd)s\n"
-#~ "Exit code: %(exit_code)s\n"
-#~ "Stdout: %(stdout)r\n"
-#~ "Stderr: %(stderr)r"
-#~ msgstr ""
-#~ "%(description)s\n"
-#~ "Comando: %(cmd)s\n"
-#~ "Código de saída: %(exit_code)s\n"
-#~ "Saída padrão: %(stdout)r\n"
-#~ "Erro: %(stderr)r"
-
-#~ msgid "Error clearing stale veth %s"
-#~ msgstr ""
-
-#~ msgid "Failed unplugging VLAN interface '%s'"
-#~ msgstr "Falha ao suspender instância"
-
-#~ msgid "Unplugged VLAN interface '%s'"
-#~ msgstr "Falha ao suspender instância"
-
-#~ msgid "Failed unplugging bridge interface '%s'"
-#~ msgstr "Iniciando a Bridge para %s"
-
-#~ msgid "Unplugged bridge interface '%s'"
-#~ msgstr "Iniciando a Bridge para %s"
-
-#~ msgid "Failed unplugging gateway interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Unplugged gateway interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Network %(net)s for port %(port_id)s not found!"
-#~ msgstr "Rede %(network_id)s não foi encontrada."
-
-#~ msgid "Host filter ignoring hosts: %(ignored_hosts_str)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "No hosts matched due to not "
-#~ "matching 'force_hosts'value of "
-#~ "'%(forced_hosts_str)s'"
-#~ msgstr ""
-
-#~ msgid "Host filter forcing available hosts to %(forced_hosts_str)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "Getting block stats failed, device might"
-#~ " have been detached. Code=%(errcode)s "
-#~ "Error=%(e)s"
-#~ msgstr ""
-
-#~ msgid "Must specify vmwareapi_wsdl_loc"
-#~ msgstr ""
-
-#~ msgid "Unable to get SR for this host: %s"
-#~ msgstr ""
-
-#~ msgid "VM.assert_can_migratefailed"
-#~ msgstr ""
-
diff --git a/nova/locale/ru/LC_MESSAGES/nova.po b/nova/locale/ru/LC_MESSAGES/nova.po
index 056685261..2bf1e5855 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-06 19:37+0000\n"
+"POT-Creation-Date: 2013-05-07 19:38+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"
@@ -176,7 +176,7 @@ msgid ""
 msgstr ""
 
 #: nova/exception.py:235 nova/api/ec2/cloud.py:463
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2769
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2765
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -2797,7 +2797,7 @@ msgstr "аттрибут не поддерживается: %s"
 msgid "Detach interface %s"
 msgstr "Запуск интерфейса VLAN %s"
 
-#: nova/api/openstack/compute/contrib/baremetal_nodes.py:193
+#: nova/api/openstack/compute/contrib/baremetal_nodes.py:192
 msgid "Must specify id or address"
 msgstr ""
 
@@ -3870,26 +3870,26 @@ msgstr ""
 msgid "No nova entries in syslog!"
 msgstr ""
 
-#: nova/compute/api.py:282
+#: nova/compute/api.py:281
 #, fuzzy
 msgid "Cannot run any more instances of this type."
 msgstr ""
 "Превышена квота копий. Вы не можете запустить дополнительные копии этого "
 "типа."
 
-#: nova/compute/api.py:289
+#: nova/compute/api.py:288
 #, fuzzy, python-format
 msgid "Can only run %s more instances of this type."
 msgstr "Превышена квота копий. Вы можете запустить только %s копий этого типа."
 
-#: nova/compute/api.py:298
+#: nova/compute/api.py:297
 #, 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:318
+#: nova/compute/api.py:317
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
@@ -3898,97 +3898,97 @@ msgstr ""
 "Превышена квота для %(pid)s, попытка назначить %(num_metadata)s свойств "
 "метаданных"
 
-#: nova/compute/api.py:328
+#: nova/compute/api.py:327
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:332
+#: nova/compute/api.py:331
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:336
+#: nova/compute/api.py:335
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:469
+#: nova/compute/api.py:468
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:509
+#: nova/compute/api.py:508
 #, fuzzy
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr "Невозможно присоединить том для копии %s"
 
-#: nova/compute/api.py:623
+#: nova/compute/api.py:622
 #, python-format
 msgid "Going to run %s instances..."
 msgstr "Выполняет запуск %s копий..."
 
-#: nova/compute/api.py:739
+#: nova/compute/api.py:738
 #, python-format
 msgid "bdm %s"
 msgstr "bdm %s"
 
-#: nova/compute/api.py:766
+#: nova/compute/api.py:765
 #, python-format
 msgid "block_device_mapping %s"
 msgstr "block_device_mapping %s"
 
-#: nova/compute/api.py:1040
+#: nova/compute/api.py:1036
 #, fuzzy
 msgid "instance termination disabled"
 msgstr "Выполнение завершения работы копий"
 
-#: nova/compute/api.py:1176
+#: nova/compute/api.py:1172
 #, fuzzy, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr "Тип копии %(instance_type_id)s не найден."
 
-#: nova/compute/api.py:1182
+#: nova/compute/api.py:1178
 #, fuzzy
 msgid "going to delete a resizing instance"
 msgstr "Выполнение завершения работы копий"
 
-#: nova/compute/api.py:1192
+#: nova/compute/api.py:1188
 #, fuzzy, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr "Отсутствует узел для копии %s, немедленное удаление"
 
-#: nova/compute/api.py:1236
+#: nova/compute/api.py:1232
 #, fuzzy
 msgid "Going to try to soft delete instance"
 msgstr "Выполнение запуска копий"
 
-#: nova/compute/api.py:1260
+#: nova/compute/api.py:1256
 #, fuzzy
 msgid "Going to try to terminate instance"
 msgstr "Будет выполнения попытка завершить работу %s"
 
-#: nova/compute/api.py:1310
+#: nova/compute/api.py:1306
 #, fuzzy
 msgid "Going to try to stop instance"
 msgstr "Попытка остановить %s"
 
-#: nova/compute/api.py:1327
+#: nova/compute/api.py:1323
 #, fuzzy
 msgid "Going to try to start instance"
 msgstr "Попытка запустить %s"
 
-#: nova/compute/api.py:1400
+#: nova/compute/api.py:1396
 #, python-format
 msgid "Searching by: %s"
 msgstr "Поиск по: %s"
 
-#: nova/compute/api.py:1637
+#: nova/compute/api.py:1633
 #, fuzzy, python-format
 msgid "snapshot for %s"
 msgstr "Запуск снимка для ВМ %s"
 
-#: nova/compute/api.py:1988
+#: nova/compute/api.py:1984
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1997
+#: nova/compute/api.py:1993
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
@@ -3997,62 +3997,62 @@ msgstr ""
 "Устаревший тип копии %(current_instance_type_name)s,  новый тип копии "
 "%(new_instance_type_name)s"
 
-#: nova/compute/api.py:2039
+#: nova/compute/api.py:2035
 #, 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:2179
+#: nova/compute/api.py:2175
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2286
+#: nova/compute/api.py:2282
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2294
+#: nova/compute/api.py:2290
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2366
+#: nova/compute/api.py:2362
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2479
+#: nova/compute/api.py:2475
 #, fuzzy, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr "Будет выполнения попытка завершить работу %s"
 
-#: nova/compute/api.py:2498
+#: nova/compute/api.py:2494
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2502
+#: nova/compute/api.py:2498
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2749
+#: nova/compute/api.py:2745
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2753
+#: nova/compute/api.py:2749
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2850
+#: nova/compute/api.py:2845
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2853
+#: nova/compute/api.py:2848
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr "Группа безопасности %s не может быть пустой."
 
-#: nova/compute/api.py:2861
+#: nova/compute/api.py:2856
 #, fuzzy, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
@@ -4061,65 +4061,65 @@ msgstr ""
 "Значение (%s) для параметра GroupName недопустимо. Длина превышает "
 "максимально допустимое значение 255."
 
-#: nova/compute/api.py:2867
+#: nova/compute/api.py:2862
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2887
+#: nova/compute/api.py:2880
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2890
+#: nova/compute/api.py:2883
 #, python-format
 msgid "Create Security Group %s"
 msgstr "Создать группу безопасности %s"
 
-#: nova/compute/api.py:2897
+#: nova/compute/api.py:2890
 #, python-format
 msgid "Security group %s already exists"
 msgstr "Группа безопасности %s уже существует"
 
-#: nova/compute/api.py:2962
+#: nova/compute/api.py:2954
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "Невозможно ликвидировать vbd %s"
 
-#: nova/compute/api.py:2967
+#: nova/compute/api.py:2959
 #, fuzzy
 msgid "Security group is still in use"
 msgstr "Группа безопасности (%s) не найдена"
 
-#: nova/compute/api.py:2975
+#: nova/compute/api.py:2967
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:2978
+#: nova/compute/api.py:2970
 #, python-format
 msgid "Delete security group %s"
 msgstr "Удалить группу безопасности %s"
 
-#: nova/compute/api.py:3064 nova/compute/api.py:3141
+#: nova/compute/api.py:3047 nova/compute/api.py:3121
 #, python-format
 msgid "Rule (%s) not found"
 msgstr "Правило (%s) не найдено"
 
-#: nova/compute/api.py:3080
+#: nova/compute/api.py:3063
 #, fuzzy
 msgid "Quota exceeded, too many security group rules."
 msgstr "Добавление правила группы безопасности: %r"
 
-#: nova/compute/api.py:3083
+#: nova/compute/api.py:3066
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3094
+#: nova/compute/api.py:3075
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3148
+#: nova/compute/api.py:3128
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -5152,17 +5152,17 @@ msgid ""
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1543
+#: nova/db/sqlalchemy/api.py:1546
 #, fuzzy, python-format
 msgid "Invalid instance id %s in request"
 msgstr "Недопустимый запрос тела"
 
-#: nova/db/sqlalchemy/api.py:2834
+#: nova/db/sqlalchemy/api.py:2837
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4335
+#: nova/db/sqlalchemy/api.py:4332
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5517,22 +5517,22 @@ msgstr ""
 msgid "setting network host"
 msgstr "установка сетевого узла"
 
-#: nova/network/manager.py:495
+#: nova/network/manager.py:480
 #, fuzzy
 msgid "network allocations"
 msgstr "сетевые распределения для копии %s"
 
-#: nova/network/manager.py:502
+#: nova/network/manager.py:487
 #, fuzzy, python-format
 msgid "networks retrieved for instance: |%(networks_list)s|"
 msgstr "исключение сетевых распределений для копии |%s|"
 
-#: nova/network/manager.py:550
+#: nova/network/manager.py:535
 #, fuzzy
 msgid "network deallocation for instance"
 msgstr "исключение сетевых распределений для копии |%s|"
 
-#: nova/network/manager.py:816
+#: nova/network/manager.py:801
 #, fuzzy, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -5543,79 +5543,79 @@ msgstr ""
 "доступной зоне |%(zone)s|. Копия |%(instance)s| расположена в зоне "
 "|%(zone2)s|. Запись DNS не будет создана."
 
-#: nova/network/manager.py:842
+#: nova/network/manager.py:827
 #, fuzzy, python-format
 msgid "Quota exceeded for %(pid)s, tried to allocate fixed IP"
 msgstr "Превышена квота для %s, попытка выделения адреса"
 
-#: nova/network/manager.py:896
+#: nova/network/manager.py:879
 #, fuzzy
 msgid "Failed to update usages deallocating fixed IP"
 msgstr "Ошибка обновления тома в базе данных"
 
-#: nova/network/manager.py:930
+#: nova/network/manager.py:911
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:953
+#: nova/network/manager.py:934
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr "Арендованный IP |%(address)s|"
 
-#: nova/network/manager.py:957
+#: nova/network/manager.py:938
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:966
+#: nova/network/manager.py:947
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:971
+#: nova/network/manager.py:952
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr "Присвоенный IP |%(address)s|"
 
-#: nova/network/manager.py:975
+#: nova/network/manager.py:956
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:979
+#: nova/network/manager.py:960
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:998
+#: nova/network/manager.py:979
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1022
+#: nova/network/manager.py:1003
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1042
+#: 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:1123
+#: nova/network/manager.py:1104
 msgid "cidr already in use"
 msgstr "cidr уже используется"
 
-#: nova/network/manager.py:1126
+#: nova/network/manager.py:1107
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 "запрошенная cidr (%(cidr)s) конфликтует с существующей супер-сетью "
 "(%(super)s)"
 
-#: nova/network/manager.py:1137
+#: nova/network/manager.py:1118
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
@@ -5624,22 +5624,22 @@ msgstr ""
 "запрошенная cidr (%(cidr)s) конфликтует с существующей, меньшей cidr "
 "(%(smaller)s)"
 
-#: nova/network/manager.py:1194
+#: nova/network/manager.py:1175
 msgid "Network already exists!"
 msgstr "Сеть уже существует!"
 
-#: nova/network/manager.py:1213
+#: nova/network/manager.py:1194
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr "Сеть должна быть исключена из проекта %s перед удалением"
 
-#: nova/network/manager.py:1813
+#: nova/network/manager.py:1794
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1820
+#: nova/network/manager.py:1801
 #, fuzzy, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5713,44 +5713,44 @@ msgstr "Узел не найден"
 msgid "Fail to delete port %(portid)s with failure: %(exception)s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:321
+#: nova/network/quantumv2/api.py:318
 #, fuzzy, python-format
 msgid "deallocate_for_instance() for %s"
 msgstr "исключение сетевых распределений для копии |%s|"
 
-#: nova/network/quantumv2/api.py:330
+#: nova/network/quantumv2/api.py:327
 #, fuzzy, python-format
 msgid "Failed to delete quantum port %(portid)s "
 msgstr "Ошибка удаления тома в базе данных"
 
-#: nova/network/quantumv2/api.py:354
+#: nova/network/quantumv2/api.py:349
 #, fuzzy, python-format
 msgid "Failed to delete quantum port %(port_id)s "
 msgstr "Ошибка удаления тома в базе данных"
 
-#: nova/network/quantumv2/api.py:381
+#: nova/network/quantumv2/api.py:373
 #, python-format
 msgid "get_instance_nw_info() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:413
+#: 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:443
+#: 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:453
+#: nova/network/quantumv2/api.py:445
 #, fuzzy, python-format
 msgid "validate_networks() for %s"
 msgstr "Недопустимый сетевой формат"
 
-#: nova/network/quantumv2/api.py:722
+#: nova/network/quantumv2/api.py:688
 #, fuzzy, python-format
 msgid "Multiple floating IP pools matches found for name '%s'"
 msgstr "установка сетевого узла"
@@ -6937,7 +6937,7 @@ msgstr "После принудительного завершения рабо�
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:8707
+#: nova/tests/compute/test_compute.py:8725
 #, fuzzy
 msgid "spawn error"
 msgstr "Ошибка аутентификации"
@@ -11211,70 +11211,3 @@ msgstr "Образ должен быть доступен"
 msgid "status must be 'available'"
 msgstr "Образ должен быть доступен"
 
-#~ msgid "Unexpected error while running command."
-#~ msgstr "Неожиданная ошибка при выполнении команды."
-
-#~ msgid ""
-#~ "%(description)s\n"
-#~ "Command: %(cmd)s\n"
-#~ "Exit code: %(exit_code)s\n"
-#~ "Stdout: %(stdout)r\n"
-#~ "Stderr: %(stderr)r"
-#~ msgstr ""
-#~ "%(description)s\n"
-#~ "Команда: %(cmd)s\n"
-#~ "Код выхода: %(exit_code)s\n"
-#~ "Stdout: %(stdout)r\n"
-#~ "Stderr: %(stderr)r"
-
-#~ msgid "Error clearing stale veth %s"
-#~ msgstr "Ошибка запуска xvp: %s"
-
-#~ msgid "Failed unplugging VLAN interface '%s'"
-#~ msgstr "Ошибка отсоединения vif копии '%s'"
-
-#~ msgid "Unplugged VLAN interface '%s'"
-#~ msgstr "Ошибка отсоединения vif копии '%s'"
-
-#~ msgid "Failed unplugging bridge interface '%s'"
-#~ msgstr "Ошибка отсоединения vif копии '%s'"
-
-#~ msgid "Unplugged bridge interface '%s'"
-#~ msgstr "Ошибка отсоединения vif копии '%s'"
-
-#~ msgid "Failed unplugging gateway interface '%s'"
-#~ msgstr "Ошибка отсоединения vif копии '%s'"
-
-#~ msgid "Unplugged gateway interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Network %(net)s for port %(port_id)s not found!"
-#~ msgstr "Сеть %(network_id)s не найдена."
-
-#~ msgid "Host filter ignoring hosts: %(ignored_hosts_str)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "No hosts matched due to not "
-#~ "matching 'force_hosts'value of "
-#~ "'%(forced_hosts_str)s'"
-#~ msgstr ""
-
-#~ msgid "Host filter forcing available hosts to %(forced_hosts_str)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "Getting block stats failed, device might"
-#~ " have been detached. Code=%(errcode)s "
-#~ "Error=%(e)s"
-#~ msgstr ""
-
-#~ msgid "Must specify vmwareapi_wsdl_loc"
-#~ msgstr "Необходимо задать vmwareapi_wsdl_loc"
-
-#~ msgid "Unable to get SR for this host: %s"
-#~ msgstr "Невозможно принять SR для этого узла: %s"
-
-#~ msgid "VM.assert_can_migratefailed"
-#~ msgstr ""
-
diff --git a/nova/locale/tl/LC_MESSAGES/nova.po b/nova/locale/tl/LC_MESSAGES/nova.po
index 96467f6ec..d1570f603 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-06 19:37+0000\n"
+"POT-Creation-Date: 2013-05-07 19:38+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"
@@ -168,7 +168,7 @@ msgid ""
 msgstr ""
 
 #: nova/exception.py:235 nova/api/ec2/cloud.py:463
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2769
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2765
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -2726,7 +2726,7 @@ msgstr ""
 msgid "Detach interface %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/baremetal_nodes.py:193
+#: nova/api/openstack/compute/contrib/baremetal_nodes.py:192
 msgid "Must specify id or address"
 msgstr ""
 
@@ -3761,238 +3761,238 @@ msgstr ""
 msgid "No nova entries in syslog!"
 msgstr ""
 
-#: nova/compute/api.py:282
+#: nova/compute/api.py:281
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:289
+#: nova/compute/api.py:288
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:298
+#: nova/compute/api.py:297
 #, 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
+#: nova/compute/api.py:317
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:328
+#: nova/compute/api.py:327
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:332
+#: nova/compute/api.py:331
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:336
+#: nova/compute/api.py:335
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:469
+#: nova/compute/api.py:468
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:509
+#: nova/compute/api.py:508
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:623
+#: nova/compute/api.py:622
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:739
+#: nova/compute/api.py:738
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:766
+#: nova/compute/api.py:765
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1040
+#: nova/compute/api.py:1036
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1176
+#: nova/compute/api.py:1172
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1182
+#: nova/compute/api.py:1178
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1192
+#: nova/compute/api.py:1188
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1236
+#: nova/compute/api.py:1232
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1260
+#: nova/compute/api.py:1256
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1310
+#: nova/compute/api.py:1306
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1327
+#: nova/compute/api.py:1323
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1400
+#: nova/compute/api.py:1396
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1637
+#: nova/compute/api.py:1633
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:1988
+#: nova/compute/api.py:1984
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1997
+#: nova/compute/api.py:1993
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2039
+#: nova/compute/api.py:2035
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2179
+#: nova/compute/api.py:2175
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2286
+#: nova/compute/api.py:2282
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2294
+#: nova/compute/api.py:2290
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2366
+#: nova/compute/api.py:2362
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2479
+#: nova/compute/api.py:2475
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2498
+#: nova/compute/api.py:2494
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2502
+#: nova/compute/api.py:2498
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2749
+#: nova/compute/api.py:2745
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2753
+#: nova/compute/api.py:2749
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2850
+#: nova/compute/api.py:2845
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2853
+#: nova/compute/api.py:2848
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2861
+#: nova/compute/api.py:2856
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2867
+#: nova/compute/api.py:2862
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2887
+#: nova/compute/api.py:2880
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2890
+#: nova/compute/api.py:2883
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2897
+#: nova/compute/api.py:2890
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2962
+#: nova/compute/api.py:2954
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:2967
+#: nova/compute/api.py:2959
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:2975
+#: nova/compute/api.py:2967
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:2978
+#: nova/compute/api.py:2970
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3064 nova/compute/api.py:3141
+#: nova/compute/api.py:3047 nova/compute/api.py:3121
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3080
+#: nova/compute/api.py:3063
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3083
+#: nova/compute/api.py:3066
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3094
+#: nova/compute/api.py:3075
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3148
+#: nova/compute/api.py:3128
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4973,17 +4973,17 @@ msgid ""
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1543
+#: nova/db/sqlalchemy/api.py:1546
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2834
+#: nova/db/sqlalchemy/api.py:2837
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4335
+#: nova/db/sqlalchemy/api.py:4332
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5335,20 +5335,20 @@ msgstr ""
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:495
+#: nova/network/manager.py:480
 msgid "network allocations"
 msgstr ""
 
-#: nova/network/manager.py:502
+#: nova/network/manager.py:487
 #, python-format
 msgid "networks retrieved for instance: |%(networks_list)s|"
 msgstr ""
 
-#: nova/network/manager.py:550
+#: nova/network/manager.py:535
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:816
+#: nova/network/manager.py:801
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -5356,98 +5356,98 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:842
+#: nova/network/manager.py:827
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to allocate fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:896
+#: nova/network/manager.py:879
 msgid "Failed to update usages deallocating fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:930
+#: nova/network/manager.py:911
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:953
+#: nova/network/manager.py:934
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:957
+#: nova/network/manager.py:938
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:966
+#: nova/network/manager.py:947
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:971
+#: nova/network/manager.py:952
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:975
+#: nova/network/manager.py:956
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:979
+#: nova/network/manager.py:960
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:998
+#: nova/network/manager.py:979
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1022
+#: nova/network/manager.py:1003
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1042
+#: 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:1123
+#: nova/network/manager.py:1104
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1126
+#: nova/network/manager.py:1107
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1137
+#: nova/network/manager.py:1118
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1194
+#: nova/network/manager.py:1175
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1213
+#: nova/network/manager.py:1194
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1813
+#: nova/network/manager.py:1794
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1820
+#: nova/network/manager.py:1801
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5517,44 +5517,44 @@ msgstr ""
 msgid "Fail to delete port %(portid)s with failure: %(exception)s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:321
+#: nova/network/quantumv2/api.py:318
 #, python-format
 msgid "deallocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:330
+#: nova/network/quantumv2/api.py:327
 #, python-format
 msgid "Failed to delete quantum port %(portid)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:354
+#: nova/network/quantumv2/api.py:349
 #, python-format
 msgid "Failed to delete quantum port %(port_id)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:381
+#: nova/network/quantumv2/api.py:373
 #, python-format
 msgid "get_instance_nw_info() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:413
+#: 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:443
+#: 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:453
+#: nova/network/quantumv2/api.py:445
 #, python-format
 msgid "validate_networks() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:722
+#: nova/network/quantumv2/api.py:688
 #, python-format
 msgid "Multiple floating IP pools matches found for name '%s'"
 msgstr ""
@@ -6714,7 +6714,7 @@ msgstr ""
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:8707
+#: nova/tests/compute/test_compute.py:8725
 msgid "spawn error"
 msgstr ""
 
@@ -10838,65 +10838,3 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Unexpected error while running command."
-#~ msgstr "Merong hindi-inaasahang pagkakamali habang tumatakbo ang command."
-
-#~ msgid ""
-#~ "%(description)s\n"
-#~ "Command: %(cmd)s\n"
-#~ "Exit code: %(exit_code)s\n"
-#~ "Stdout: %(stdout)r\n"
-#~ "Stderr: %(stderr)r"
-#~ msgstr ""
-
-#~ msgid "Error clearing stale veth %s"
-#~ msgstr ""
-
-#~ msgid "Failed unplugging VLAN interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Unplugged VLAN interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Failed unplugging bridge interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Unplugged bridge interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Failed unplugging gateway interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Unplugged gateway interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Network %(net)s for port %(port_id)s not found!"
-#~ msgstr ""
-
-#~ msgid "Host filter ignoring hosts: %(ignored_hosts_str)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "No hosts matched due to not "
-#~ "matching 'force_hosts'value of "
-#~ "'%(forced_hosts_str)s'"
-#~ msgstr ""
-
-#~ msgid "Host filter forcing available hosts to %(forced_hosts_str)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "Getting block stats failed, device might"
-#~ " have been detached. Code=%(errcode)s "
-#~ "Error=%(e)s"
-#~ msgstr ""
-
-#~ msgid "Must specify vmwareapi_wsdl_loc"
-#~ msgstr ""
-
-#~ msgid "Unable to get SR for this host: %s"
-#~ msgstr ""
-
-#~ msgid "VM.assert_can_migratefailed"
-#~ msgstr ""
-
diff --git a/nova/locale/tr/LC_MESSAGES/nova.po b/nova/locale/tr/LC_MESSAGES/nova.po
index ac91f09f7..1e1d5a860 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-06 19:37+0000\n"
+"POT-Creation-Date: 2013-05-07 19:38+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"
@@ -168,7 +168,7 @@ msgid ""
 msgstr ""
 
 #: nova/exception.py:235 nova/api/ec2/cloud.py:463
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2769
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2765
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -2726,7 +2726,7 @@ msgstr ""
 msgid "Detach interface %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/baremetal_nodes.py:193
+#: nova/api/openstack/compute/contrib/baremetal_nodes.py:192
 msgid "Must specify id or address"
 msgstr ""
 
@@ -3760,238 +3760,238 @@ msgstr ""
 msgid "No nova entries in syslog!"
 msgstr ""
 
-#: nova/compute/api.py:282
+#: nova/compute/api.py:281
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:289
+#: nova/compute/api.py:288
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:298
+#: nova/compute/api.py:297
 #, 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
+#: nova/compute/api.py:317
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:328
+#: nova/compute/api.py:327
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:332
+#: nova/compute/api.py:331
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:336
+#: nova/compute/api.py:335
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:469
+#: nova/compute/api.py:468
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:509
+#: nova/compute/api.py:508
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:623
+#: nova/compute/api.py:622
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:739
+#: nova/compute/api.py:738
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:766
+#: nova/compute/api.py:765
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1040
+#: nova/compute/api.py:1036
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1176
+#: nova/compute/api.py:1172
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1182
+#: nova/compute/api.py:1178
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1192
+#: nova/compute/api.py:1188
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1236
+#: nova/compute/api.py:1232
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1260
+#: nova/compute/api.py:1256
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1310
+#: nova/compute/api.py:1306
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1327
+#: nova/compute/api.py:1323
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1400
+#: nova/compute/api.py:1396
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1637
+#: nova/compute/api.py:1633
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:1988
+#: nova/compute/api.py:1984
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1997
+#: nova/compute/api.py:1993
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2039
+#: nova/compute/api.py:2035
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2179
+#: nova/compute/api.py:2175
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2286
+#: nova/compute/api.py:2282
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2294
+#: nova/compute/api.py:2290
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2366
+#: nova/compute/api.py:2362
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2479
+#: nova/compute/api.py:2475
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2498
+#: nova/compute/api.py:2494
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2502
+#: nova/compute/api.py:2498
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2749
+#: nova/compute/api.py:2745
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2753
+#: nova/compute/api.py:2749
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2850
+#: nova/compute/api.py:2845
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2853
+#: nova/compute/api.py:2848
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2861
+#: nova/compute/api.py:2856
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2867
+#: nova/compute/api.py:2862
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2887
+#: nova/compute/api.py:2880
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2890
+#: nova/compute/api.py:2883
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2897
+#: nova/compute/api.py:2890
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2962
+#: nova/compute/api.py:2954
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:2967
+#: nova/compute/api.py:2959
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:2975
+#: nova/compute/api.py:2967
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:2978
+#: nova/compute/api.py:2970
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3064 nova/compute/api.py:3141
+#: nova/compute/api.py:3047 nova/compute/api.py:3121
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3080
+#: nova/compute/api.py:3063
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3083
+#: nova/compute/api.py:3066
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3094
+#: nova/compute/api.py:3075
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3148
+#: nova/compute/api.py:3128
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4972,17 +4972,17 @@ msgid ""
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1543
+#: nova/db/sqlalchemy/api.py:1546
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2834
+#: nova/db/sqlalchemy/api.py:2837
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4335
+#: nova/db/sqlalchemy/api.py:4332
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5334,20 +5334,20 @@ msgstr ""
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:495
+#: nova/network/manager.py:480
 msgid "network allocations"
 msgstr ""
 
-#: nova/network/manager.py:502
+#: nova/network/manager.py:487
 #, python-format
 msgid "networks retrieved for instance: |%(networks_list)s|"
 msgstr ""
 
-#: nova/network/manager.py:550
+#: nova/network/manager.py:535
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:816
+#: nova/network/manager.py:801
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -5355,98 +5355,98 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:842
+#: nova/network/manager.py:827
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to allocate fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:896
+#: nova/network/manager.py:879
 msgid "Failed to update usages deallocating fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:930
+#: nova/network/manager.py:911
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:953
+#: nova/network/manager.py:934
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:957
+#: nova/network/manager.py:938
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:966
+#: nova/network/manager.py:947
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:971
+#: nova/network/manager.py:952
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:975
+#: nova/network/manager.py:956
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:979
+#: nova/network/manager.py:960
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:998
+#: nova/network/manager.py:979
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1022
+#: nova/network/manager.py:1003
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1042
+#: 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:1123
+#: nova/network/manager.py:1104
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1126
+#: nova/network/manager.py:1107
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1137
+#: nova/network/manager.py:1118
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1194
+#: nova/network/manager.py:1175
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1213
+#: nova/network/manager.py:1194
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1813
+#: nova/network/manager.py:1794
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1820
+#: nova/network/manager.py:1801
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5516,44 +5516,44 @@ msgstr ""
 msgid "Fail to delete port %(portid)s with failure: %(exception)s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:321
+#: nova/network/quantumv2/api.py:318
 #, python-format
 msgid "deallocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:330
+#: nova/network/quantumv2/api.py:327
 #, python-format
 msgid "Failed to delete quantum port %(portid)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:354
+#: nova/network/quantumv2/api.py:349
 #, python-format
 msgid "Failed to delete quantum port %(port_id)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:381
+#: nova/network/quantumv2/api.py:373
 #, python-format
 msgid "get_instance_nw_info() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:413
+#: 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:443
+#: 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:453
+#: nova/network/quantumv2/api.py:445
 #, python-format
 msgid "validate_networks() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:722
+#: nova/network/quantumv2/api.py:688
 #, python-format
 msgid "Multiple floating IP pools matches found for name '%s'"
 msgstr ""
@@ -6713,7 +6713,7 @@ msgstr ""
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:8707
+#: nova/tests/compute/test_compute.py:8725
 msgid "spawn error"
 msgstr ""
 
@@ -10837,65 +10837,3 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Unexpected error while running command."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "%(description)s\n"
-#~ "Command: %(cmd)s\n"
-#~ "Exit code: %(exit_code)s\n"
-#~ "Stdout: %(stdout)r\n"
-#~ "Stderr: %(stderr)r"
-#~ msgstr ""
-
-#~ msgid "Error clearing stale veth %s"
-#~ msgstr ""
-
-#~ msgid "Failed unplugging VLAN interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Unplugged VLAN interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Failed unplugging bridge interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Unplugged bridge interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Failed unplugging gateway interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Unplugged gateway interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Network %(net)s for port %(port_id)s not found!"
-#~ msgstr ""
-
-#~ msgid "Host filter ignoring hosts: %(ignored_hosts_str)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "No hosts matched due to not "
-#~ "matching 'force_hosts'value of "
-#~ "'%(forced_hosts_str)s'"
-#~ msgstr ""
-
-#~ msgid "Host filter forcing available hosts to %(forced_hosts_str)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "Getting block stats failed, device might"
-#~ " have been detached. Code=%(errcode)s "
-#~ "Error=%(e)s"
-#~ msgstr ""
-
-#~ msgid "Must specify vmwareapi_wsdl_loc"
-#~ msgstr ""
-
-#~ msgid "Unable to get SR for this host: %s"
-#~ msgstr ""
-
-#~ msgid "VM.assert_can_migratefailed"
-#~ msgstr ""
-
diff --git a/nova/locale/tr_TR/LC_MESSAGES/nova.po b/nova/locale/tr_TR/LC_MESSAGES/nova.po
index a2c165c31..cbf5af80b 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-06 19:37+0000\n"
+"POT-Creation-Date: 2013-05-07 19:38+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"
@@ -170,7 +170,7 @@ msgid ""
 msgstr ""
 
 #: nova/exception.py:235 nova/api/ec2/cloud.py:463
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2769
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2765
 msgid "Keypair data is invalid"
 msgstr "Anahtar çifti verisi geçersiz"
 
@@ -2777,7 +2777,7 @@ msgstr "Özellik desteklenmiyor: %s"
 msgid "Detach interface %s"
 msgstr "%s VLAN arayüzü başlatılıyor "
 
-#: nova/api/openstack/compute/contrib/baremetal_nodes.py:193
+#: nova/api/openstack/compute/contrib/baremetal_nodes.py:192
 msgid "Must specify id or address"
 msgstr ""
 
@@ -3838,115 +3838,115 @@ msgstr ""
 msgid "No nova entries in syslog!"
 msgstr ""
 
-#: nova/compute/api.py:282
+#: nova/compute/api.py:281
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:289
+#: nova/compute/api.py:288
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:298
+#: nova/compute/api.py:297
 #, 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
+#: nova/compute/api.py:317
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:328
+#: nova/compute/api.py:327
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:332
+#: nova/compute/api.py:331
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:336
+#: nova/compute/api.py:335
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:469
+#: nova/compute/api.py:468
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:509
+#: nova/compute/api.py:508
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:623
+#: nova/compute/api.py:622
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:739
+#: nova/compute/api.py:738
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:766
+#: nova/compute/api.py:765
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1040
+#: nova/compute/api.py:1036
 #, fuzzy
 msgid "instance termination disabled"
 msgstr "Örnekleri sonlandırma işlemi başlatılıyor"
 
-#: nova/compute/api.py:1176
+#: nova/compute/api.py:1172
 #, 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:1182
+#: nova/compute/api.py:1178
 #, fuzzy
 msgid "going to delete a resizing instance"
 msgstr "Örnekleri sonlandırma işlemi başlatılıyor"
 
-#: nova/compute/api.py:1192
+#: nova/compute/api.py:1188
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1236
+#: nova/compute/api.py:1232
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1260
+#: nova/compute/api.py:1256
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1310
+#: nova/compute/api.py:1306
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1327
+#: nova/compute/api.py:1323
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1400
+#: nova/compute/api.py:1396
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1637
+#: nova/compute/api.py:1633
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:1988
+#: nova/compute/api.py:1984
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1997
+#: nova/compute/api.py:1993
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
@@ -3955,125 +3955,125 @@ msgstr ""
 "Eski örnek türü %(current_instance_type_name)s, yeni örnek türü "
 "%(new_instance_type_name)s"
 
-#: nova/compute/api.py:2039
+#: nova/compute/api.py:2035
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2179
+#: nova/compute/api.py:2175
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2286
+#: nova/compute/api.py:2282
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2294
+#: nova/compute/api.py:2290
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2366
+#: nova/compute/api.py:2362
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2479
+#: nova/compute/api.py:2475
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2498
+#: nova/compute/api.py:2494
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2502
+#: nova/compute/api.py:2498
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2749
+#: nova/compute/api.py:2745
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2753
+#: nova/compute/api.py:2749
 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:2850
+#: nova/compute/api.py:2845
 #, 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:2853
+#: nova/compute/api.py:2848
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr "%s güvenlik grubu boş bırakılamaz."
 
-#: nova/compute/api.py:2861
+#: nova/compute/api.py:2856
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2867
+#: nova/compute/api.py:2862
 #, 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:2887
+#: nova/compute/api.py:2880
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2890
+#: nova/compute/api.py:2883
 #, python-format
 msgid "Create Security Group %s"
 msgstr "%s güvenlik grubunu oluşturunuz"
 
-#: nova/compute/api.py:2897
+#: nova/compute/api.py:2890
 #, python-format
 msgid "Security group %s already exists"
 msgstr "%s güvenlik grubu zaten var"
 
-#: nova/compute/api.py:2962
+#: nova/compute/api.py:2954
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:2967
+#: nova/compute/api.py:2959
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:2975
+#: nova/compute/api.py:2967
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:2978
+#: nova/compute/api.py:2970
 #, python-format
 msgid "Delete security group %s"
 msgstr "%s güvenlik grubunu siliniz"
 
-#: nova/compute/api.py:3064 nova/compute/api.py:3141
+#: nova/compute/api.py:3047 nova/compute/api.py:3121
 #, python-format
 msgid "Rule (%s) not found"
 msgstr "Kural (%s) bulunamadı"
 
-#: nova/compute/api.py:3080
+#: nova/compute/api.py:3063
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3083
+#: nova/compute/api.py:3066
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr "Yetkilendirilmiş %s güvenlik grubu girişi"
 
-#: nova/compute/api.py:3094
+#: nova/compute/api.py:3075
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr "%s güvenlik grubu girişini iptal et"
 
-#: nova/compute/api.py:3148
+#: nova/compute/api.py:3128
 msgid "Security group id should be integer"
 msgstr "Güvenlik grup id'si integer olmak zorunda"
 
@@ -5072,17 +5072,17 @@ msgid ""
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1543
+#: nova/db/sqlalchemy/api.py:1546
 #, fuzzy, python-format
 msgid "Invalid instance id %s in request"
 msgstr "%s geçerli bir örnek ismidir"
 
-#: nova/db/sqlalchemy/api.py:2834
+#: nova/db/sqlalchemy/api.py:2837
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4335
+#: nova/db/sqlalchemy/api.py:4332
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5435,20 +5435,20 @@ msgstr ""
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:495
+#: nova/network/manager.py:480
 msgid "network allocations"
 msgstr ""
 
-#: nova/network/manager.py:502
+#: nova/network/manager.py:487
 #, python-format
 msgid "networks retrieved for instance: |%(networks_list)s|"
 msgstr ""
 
-#: nova/network/manager.py:550
+#: nova/network/manager.py:535
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:816
+#: nova/network/manager.py:801
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -5456,98 +5456,98 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:842
+#: nova/network/manager.py:827
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to allocate fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:896
+#: nova/network/manager.py:879
 msgid "Failed to update usages deallocating fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:930
+#: nova/network/manager.py:911
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:953
+#: nova/network/manager.py:934
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:957
+#: nova/network/manager.py:938
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:966
+#: nova/network/manager.py:947
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:971
+#: nova/network/manager.py:952
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:975
+#: nova/network/manager.py:956
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:979
+#: nova/network/manager.py:960
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:998
+#: nova/network/manager.py:979
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1022
+#: nova/network/manager.py:1003
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1042
+#: 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:1123
+#: nova/network/manager.py:1104
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1126
+#: nova/network/manager.py:1107
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1137
+#: nova/network/manager.py:1118
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1194
+#: nova/network/manager.py:1175
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1213
+#: nova/network/manager.py:1194
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1813
+#: nova/network/manager.py:1794
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1820
+#: nova/network/manager.py:1801
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5619,44 +5619,44 @@ msgstr "Öğe bulunamadı"
 msgid "Fail to delete port %(portid)s with failure: %(exception)s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:321
+#: nova/network/quantumv2/api.py:318
 #, python-format
 msgid "deallocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:330
+#: nova/network/quantumv2/api.py:327
 #, python-format
 msgid "Failed to delete quantum port %(portid)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:354
+#: nova/network/quantumv2/api.py:349
 #, python-format
 msgid "Failed to delete quantum port %(port_id)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:381
+#: nova/network/quantumv2/api.py:373
 #, python-format
 msgid "get_instance_nw_info() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:413
+#: 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:443
+#: 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:453
+#: nova/network/quantumv2/api.py:445
 #, python-format
 msgid "validate_networks() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:722
+#: nova/network/quantumv2/api.py:688
 #, python-format
 msgid "Multiple floating IP pools matches found for name '%s'"
 msgstr ""
@@ -6828,7 +6828,7 @@ msgstr "Zorla öldürülen örneklerin ardından: %s"
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:8707
+#: nova/tests/compute/test_compute.py:8725
 #, fuzzy
 msgid "spawn error"
 msgstr "Kimlik doğrulama hatası"
@@ -10988,68 +10988,3 @@ msgstr "İmaj müsait olmak zorunda"
 msgid "status must be 'available'"
 msgstr "İmaj müsait olmak zorunda"
 
-#~ msgid "Unexpected error while running command."
-#~ msgstr "Komut çalışırken beklenmeyen bir hata oluştu."
-
-#~ msgid ""
-#~ "%(description)s\n"
-#~ "Command: %(cmd)s\n"
-#~ "Exit code: %(exit_code)s\n"
-#~ "Stdout: %(stdout)r\n"
-#~ "Stderr: %(stderr)r"
-#~ msgstr ""
-#~ "%(description)s⏎ Komut: %(cmd)s⏎ Çıkış kodu:"
-#~ " %(exit_code)s⏎ Standart çıktı: %(stdout)r⏎ "
-#~ "Standart hata: %(stderr)r"
-
-#~ msgid "Error clearing stale veth %s"
-#~ msgstr "XVP başlatılırken hata oluştu: %s"
-
-#~ msgid "Failed unplugging VLAN interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Unplugged VLAN interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Failed unplugging bridge interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Unplugged bridge interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Failed unplugging gateway interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Unplugged gateway interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Network %(net)s for port %(port_id)s not found!"
-#~ msgstr "%(network_id)s ağı bulunamadı."
-
-#~ msgid "Host filter ignoring hosts: %(ignored_hosts_str)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "No hosts matched due to not "
-#~ "matching 'force_hosts'value of "
-#~ "'%(forced_hosts_str)s'"
-#~ msgstr ""
-
-#~ msgid "Host filter forcing available hosts to %(forced_hosts_str)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "Getting block stats failed, device might"
-#~ " have been detached. Code=%(errcode)s "
-#~ "Error=%(e)s"
-#~ msgstr ""
-
-#~ msgid "Must specify vmwareapi_wsdl_loc"
-#~ msgstr ""
-
-#~ msgid "Unable to get SR for this host: %s"
-#~ msgstr ""
-
-#~ msgid "VM.assert_can_migratefailed"
-#~ msgstr ""
-
diff --git a/nova/locale/uk/LC_MESSAGES/nova.po b/nova/locale/uk/LC_MESSAGES/nova.po
index cd52161f7..02a7a6a0d 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-06 19:37+0000\n"
+"POT-Creation-Date: 2013-05-07 19:38+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"
@@ -169,7 +169,7 @@ msgid ""
 msgstr ""
 
 #: nova/exception.py:235 nova/api/ec2/cloud.py:463
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2769
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2765
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -2729,7 +2729,7 @@ msgstr ""
 msgid "Detach interface %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/baremetal_nodes.py:193
+#: nova/api/openstack/compute/contrib/baremetal_nodes.py:192
 msgid "Must specify id or address"
 msgstr ""
 
@@ -3765,238 +3765,238 @@ msgstr ""
 msgid "No nova entries in syslog!"
 msgstr ""
 
-#: nova/compute/api.py:282
+#: nova/compute/api.py:281
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:289
+#: nova/compute/api.py:288
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:298
+#: nova/compute/api.py:297
 #, 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
+#: nova/compute/api.py:317
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:328
+#: nova/compute/api.py:327
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:332
+#: nova/compute/api.py:331
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:336
+#: nova/compute/api.py:335
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:469
+#: nova/compute/api.py:468
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:509
+#: nova/compute/api.py:508
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:623
+#: nova/compute/api.py:622
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:739
+#: nova/compute/api.py:738
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:766
+#: nova/compute/api.py:765
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1040
+#: nova/compute/api.py:1036
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1176
+#: nova/compute/api.py:1172
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1182
+#: nova/compute/api.py:1178
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1192
+#: nova/compute/api.py:1188
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1236
+#: nova/compute/api.py:1232
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1260
+#: nova/compute/api.py:1256
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1310
+#: nova/compute/api.py:1306
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1327
+#: nova/compute/api.py:1323
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1400
+#: nova/compute/api.py:1396
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1637
+#: nova/compute/api.py:1633
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:1988
+#: nova/compute/api.py:1984
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1997
+#: nova/compute/api.py:1993
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2039
+#: nova/compute/api.py:2035
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2179
+#: nova/compute/api.py:2175
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2286
+#: nova/compute/api.py:2282
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2294
+#: nova/compute/api.py:2290
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2366
+#: nova/compute/api.py:2362
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2479
+#: nova/compute/api.py:2475
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2498
+#: nova/compute/api.py:2494
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2502
+#: nova/compute/api.py:2498
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2749
+#: nova/compute/api.py:2745
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2753
+#: nova/compute/api.py:2749
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2850
+#: nova/compute/api.py:2845
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2853
+#: nova/compute/api.py:2848
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2861
+#: nova/compute/api.py:2856
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2867
+#: nova/compute/api.py:2862
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2887
+#: nova/compute/api.py:2880
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2890
+#: nova/compute/api.py:2883
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2897
+#: nova/compute/api.py:2890
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2962
+#: nova/compute/api.py:2954
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:2967
+#: nova/compute/api.py:2959
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:2975
+#: nova/compute/api.py:2967
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:2978
+#: nova/compute/api.py:2970
 #, python-format
 msgid "Delete security group %s"
 msgstr "Вилучити групу безпеки %s"
 
-#: nova/compute/api.py:3064 nova/compute/api.py:3141
+#: nova/compute/api.py:3047 nova/compute/api.py:3121
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3080
+#: nova/compute/api.py:3063
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3083
+#: nova/compute/api.py:3066
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3094
+#: nova/compute/api.py:3075
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3148
+#: nova/compute/api.py:3128
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4978,17 +4978,17 @@ msgid ""
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1543
+#: nova/db/sqlalchemy/api.py:1546
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2834
+#: nova/db/sqlalchemy/api.py:2837
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4335
+#: nova/db/sqlalchemy/api.py:4332
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5340,20 +5340,20 @@ msgstr ""
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:495
+#: nova/network/manager.py:480
 msgid "network allocations"
 msgstr ""
 
-#: nova/network/manager.py:502
+#: nova/network/manager.py:487
 #, python-format
 msgid "networks retrieved for instance: |%(networks_list)s|"
 msgstr ""
 
-#: nova/network/manager.py:550
+#: nova/network/manager.py:535
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:816
+#: nova/network/manager.py:801
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -5361,98 +5361,98 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:842
+#: nova/network/manager.py:827
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to allocate fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:896
+#: nova/network/manager.py:879
 msgid "Failed to update usages deallocating fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:930
+#: nova/network/manager.py:911
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:953
+#: nova/network/manager.py:934
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:957
+#: nova/network/manager.py:938
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:966
+#: nova/network/manager.py:947
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:971
+#: nova/network/manager.py:952
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:975
+#: nova/network/manager.py:956
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:979
+#: nova/network/manager.py:960
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:998
+#: nova/network/manager.py:979
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1022
+#: nova/network/manager.py:1003
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1042
+#: 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:1123
+#: nova/network/manager.py:1104
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1126
+#: nova/network/manager.py:1107
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1137
+#: nova/network/manager.py:1118
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1194
+#: nova/network/manager.py:1175
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1213
+#: nova/network/manager.py:1194
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1813
+#: nova/network/manager.py:1794
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1820
+#: nova/network/manager.py:1801
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5522,44 +5522,44 @@ msgstr ""
 msgid "Fail to delete port %(portid)s with failure: %(exception)s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:321
+#: nova/network/quantumv2/api.py:318
 #, python-format
 msgid "deallocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:330
+#: nova/network/quantumv2/api.py:327
 #, python-format
 msgid "Failed to delete quantum port %(portid)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:354
+#: nova/network/quantumv2/api.py:349
 #, python-format
 msgid "Failed to delete quantum port %(port_id)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:381
+#: nova/network/quantumv2/api.py:373
 #, python-format
 msgid "get_instance_nw_info() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:413
+#: 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:443
+#: 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:453
+#: nova/network/quantumv2/api.py:445
 #, python-format
 msgid "validate_networks() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:722
+#: nova/network/quantumv2/api.py:688
 #, python-format
 msgid "Multiple floating IP pools matches found for name '%s'"
 msgstr ""
@@ -6720,7 +6720,7 @@ msgstr ""
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:8707
+#: nova/tests/compute/test_compute.py:8725
 msgid "spawn error"
 msgstr ""
 
@@ -10845,65 +10845,3 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Unexpected error while running command."
-#~ msgstr "Неочікувана помилка при виконанні команди."
-
-#~ msgid ""
-#~ "%(description)s\n"
-#~ "Command: %(cmd)s\n"
-#~ "Exit code: %(exit_code)s\n"
-#~ "Stdout: %(stdout)r\n"
-#~ "Stderr: %(stderr)r"
-#~ msgstr ""
-
-#~ msgid "Error clearing stale veth %s"
-#~ msgstr ""
-
-#~ msgid "Failed unplugging VLAN interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Unplugged VLAN interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Failed unplugging bridge interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Unplugged bridge interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Failed unplugging gateway interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Unplugged gateway interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Network %(net)s for port %(port_id)s not found!"
-#~ msgstr ""
-
-#~ msgid "Host filter ignoring hosts: %(ignored_hosts_str)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "No hosts matched due to not "
-#~ "matching 'force_hosts'value of "
-#~ "'%(forced_hosts_str)s'"
-#~ msgstr ""
-
-#~ msgid "Host filter forcing available hosts to %(forced_hosts_str)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "Getting block stats failed, device might"
-#~ " have been detached. Code=%(errcode)s "
-#~ "Error=%(e)s"
-#~ msgstr ""
-
-#~ msgid "Must specify vmwareapi_wsdl_loc"
-#~ msgstr ""
-
-#~ msgid "Unable to get SR for this host: %s"
-#~ msgstr ""
-
-#~ msgid "VM.assert_can_migratefailed"
-#~ msgstr ""
-
diff --git a/nova/locale/zh_CN/LC_MESSAGES/nova.po b/nova/locale/zh_CN/LC_MESSAGES/nova.po
index 2ef729c67..d6125f6d7 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-06 19:37+0000\n"
+"POT-Creation-Date: 2013-05-07 19:38+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"
@@ -171,7 +171,7 @@ msgid ""
 msgstr ""
 
 #: nova/exception.py:235 nova/api/ec2/cloud.py:463
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2769
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2765
 msgid "Keypair data is invalid"
 msgstr "密钥对数据无效"
 
@@ -2779,7 +2779,7 @@ msgstr "属性不支持: %s"
 msgid "Detach interface %s"
 msgstr "正在开启VLAN接口 %s"
 
-#: nova/api/openstack/compute/contrib/baremetal_nodes.py:193
+#: nova/api/openstack/compute/contrib/baremetal_nodes.py:192
 msgid "Must specify id or address"
 msgstr ""
 
@@ -3858,250 +3858,250 @@ msgstr ""
 msgid "No nova entries in syslog!"
 msgstr ""
 
-#: nova/compute/api.py:282
+#: nova/compute/api.py:281
 #, fuzzy
 msgid "Cannot run any more instances of this type."
 msgstr "超过实例的配额。您无法运行更多此类型的实例。"
 
-#: nova/compute/api.py:289
+#: nova/compute/api.py:288
 #, fuzzy, python-format
 msgid "Can only run %s more instances of this type."
 msgstr "超过实例的配额。您只能再运行 %s 个此类型的实例。"
 
-#: nova/compute/api.py:298
+#: nova/compute/api.py:297
 #, 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:318
+#: nova/compute/api.py:317
 #, 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:328
+#: nova/compute/api.py:327
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:332
+#: nova/compute/api.py:331
 #, fuzzy
 msgid "Metadata property key greater than 255 characters"
 msgstr "安全组 %s 不能比255个字符更长。"
 
-#: nova/compute/api.py:336
+#: nova/compute/api.py:335
 #, fuzzy
 msgid "Metadata property value greater than 255 characters"
 msgstr "安全组 %s 不能比255个字符更长。"
 
-#: nova/compute/api.py:469
+#: nova/compute/api.py:468
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:509
+#: nova/compute/api.py:508
 #, fuzzy
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr "无法附加卷到实例 %s"
 
-#: nova/compute/api.py:623
+#: nova/compute/api.py:622
 #, python-format
 msgid "Going to run %s instances..."
 msgstr "准备运行 %s 个实例"
 
-#: nova/compute/api.py:739
+#: nova/compute/api.py:738
 #, python-format
 msgid "bdm %s"
 msgstr "bdm %s"
 
-#: nova/compute/api.py:766
+#: nova/compute/api.py:765
 #, python-format
 msgid "block_device_mapping %s"
 msgstr "block_device_mapping %s"
 
-#: nova/compute/api.py:1040
+#: nova/compute/api.py:1036
 #, fuzzy
 msgid "instance termination disabled"
 msgstr "准备开始终止实例"
 
-#: nova/compute/api.py:1176
+#: nova/compute/api.py:1172
 #, fuzzy, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr "实例类型 %(instance_type_id)s 没有找到。"
 
-#: nova/compute/api.py:1182
+#: nova/compute/api.py:1178
 #, fuzzy
 msgid "going to delete a resizing instance"
 msgstr "准备开始终止实例"
 
-#: nova/compute/api.py:1192
+#: nova/compute/api.py:1188
 #, fuzzy, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr "没有托管实例 %s，立刻删除"
 
-#: nova/compute/api.py:1236
+#: nova/compute/api.py:1232
 #, fuzzy
 msgid "Going to try to soft delete instance"
 msgstr "准备尝试软删除实例 %s"
 
-#: nova/compute/api.py:1260
+#: nova/compute/api.py:1256
 #, fuzzy
 msgid "Going to try to terminate instance"
 msgstr "准备尝试终止实例 %s"
 
-#: nova/compute/api.py:1310
+#: nova/compute/api.py:1306
 #, fuzzy
 msgid "Going to try to stop instance"
 msgstr "准备尝试停止实例 %s"
 
-#: nova/compute/api.py:1327
+#: nova/compute/api.py:1323
 #, fuzzy
 msgid "Going to try to start instance"
 msgstr "准备尝试启动实例 %s"
 
-#: nova/compute/api.py:1400
+#: nova/compute/api.py:1396
 #, python-format
 msgid "Searching by: %s"
 msgstr "搜索条件： %s"
 
-#: nova/compute/api.py:1637
+#: nova/compute/api.py:1633
 #, fuzzy, python-format
 msgid "snapshot for %s"
 msgstr "开始为虚拟机 %s 快照"
 
-#: nova/compute/api.py:1988
+#: nova/compute/api.py:1984
 msgid "flavor_id is None. Assuming migration."
 msgstr "flavor_id为空。假定在迁移。"
 
-#: nova/compute/api.py:1997
+#: nova/compute/api.py:1993
 #, 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:2039
+#: nova/compute/api.py:2035
 #, 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:2179
+#: nova/compute/api.py:2175
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2286
+#: nova/compute/api.py:2282
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2294
+#: nova/compute/api.py:2290
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2366
+#: nova/compute/api.py:2362
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2479
+#: nova/compute/api.py:2475
 #, fuzzy, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr "准备尝试终止实例 %s"
 
-#: nova/compute/api.py:2498
+#: nova/compute/api.py:2494
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2502
+#: nova/compute/api.py:2498
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2749
+#: nova/compute/api.py:2745
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2753
+#: nova/compute/api.py:2749
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr "密钥对名称长度必须在1到255个字符之间"
 
-#: nova/compute/api.py:2850
+#: nova/compute/api.py:2845
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr "安全组 %s 既不是字符串也不是unicode"
 
-#: nova/compute/api.py:2853
+#: nova/compute/api.py:2848
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr "安全组 %s 不能为空。"
 
-#: nova/compute/api.py:2861
+#: nova/compute/api.py:2856
 #, 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:2867
+#: nova/compute/api.py:2862
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr "安全组 %s 不能比255个字符更长。"
 
-#: nova/compute/api.py:2887
+#: nova/compute/api.py:2880
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2890
+#: nova/compute/api.py:2883
 #, python-format
 msgid "Create Security Group %s"
 msgstr "创建安全组 %s"
 
-#: nova/compute/api.py:2897
+#: nova/compute/api.py:2890
 #, python-format
 msgid "Security group %s already exists"
 msgstr "安全组 %s 已经存在"
 
-#: nova/compute/api.py:2962
+#: nova/compute/api.py:2954
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "无法销毁VBD %s"
 
-#: nova/compute/api.py:2967
+#: nova/compute/api.py:2959
 #, fuzzy
 msgid "Security group is still in use"
 msgstr "安全组id应该是整数"
 
-#: nova/compute/api.py:2975
+#: nova/compute/api.py:2967
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:2978
+#: nova/compute/api.py:2970
 #, python-format
 msgid "Delete security group %s"
 msgstr "删除安全组 %s"
 
-#: nova/compute/api.py:3064 nova/compute/api.py:3141
+#: nova/compute/api.py:3047 nova/compute/api.py:3121
 #, python-format
 msgid "Rule (%s) not found"
 msgstr "没有找到规则 (%s)"
 
-#: nova/compute/api.py:3080
+#: nova/compute/api.py:3063
 #, fuzzy
 msgid "Quota exceeded, too many security group rules."
 msgstr "添加安全组规则：%r"
 
-#: nova/compute/api.py:3083
+#: nova/compute/api.py:3066
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr "授权 %s 安全组入口权限"
 
-#: nova/compute/api.py:3094
+#: nova/compute/api.py:3075
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr "撤销 %s 安全组入口权限"
 
-#: nova/compute/api.py:3148
+#: nova/compute/api.py:3128
 msgid "Security group id should be integer"
 msgstr "安全组id应该是整数"
 
@@ -5129,17 +5129,17 @@ msgid ""
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1543
+#: nova/db/sqlalchemy/api.py:1546
 #, fuzzy, python-format
 msgid "Invalid instance id %s in request"
 msgstr "实例 %s：已救援"
 
-#: nova/db/sqlalchemy/api.py:2834
+#: nova/db/sqlalchemy/api.py:2837
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4335
+#: nova/db/sqlalchemy/api.py:4332
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5494,22 +5494,22 @@ msgstr "解除 %s 过期固定ip的关联"
 msgid "setting network host"
 msgstr "设置网络主机"
 
-#: nova/network/manager.py:495
+#: nova/network/manager.py:480
 #, fuzzy
 msgid "network allocations"
 msgstr "实例 %s 的网络分配"
 
-#: nova/network/manager.py:502
+#: nova/network/manager.py:487
 #, fuzzy, python-format
 msgid "networks retrieved for instance: |%(networks_list)s|"
 msgstr "为实例 |%(instance_id)s| 获取的网络：|%(networks)s|"
 
-#: nova/network/manager.py:550
+#: nova/network/manager.py:535
 #, fuzzy
 msgid "network deallocation for instance"
 msgstr "为实例 |%s| 解除网络分配"
 
-#: nova/network/manager.py:816
+#: nova/network/manager.py:801
 #, fuzzy, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -5519,99 +5519,99 @@ msgstr ""
 "instance-dns-zone是 |%(domain)s|，该域位于区域 |%(zone)s| 中。实例|%(instance)s| 在区域 "
 "|%(zone2)s| 里。没有DNS记录将创建。"
 
-#: nova/network/manager.py:842
+#: nova/network/manager.py:827
 #, fuzzy, python-format
 msgid "Quota exceeded for %(pid)s, tried to allocate fixed IP"
 msgstr "%s 的配额超出，尝试分配地址"
 
-#: nova/network/manager.py:896
+#: nova/network/manager.py:879
 #, fuzzy
 msgid "Failed to update usages deallocating fixed IP"
 msgstr "在数据库更新卷失败"
 
-#: nova/network/manager.py:930
+#: nova/network/manager.py:911
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:953
+#: nova/network/manager.py:934
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr "租用的IP |%(address)s|"
 
-#: nova/network/manager.py:957
+#: nova/network/manager.py:938
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr "没有关联的IP %s 被租用了"
 
-#: nova/network/manager.py:966
+#: nova/network/manager.py:947
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr "没有分配的IP |%s| 被租用了"
 
-#: nova/network/manager.py:971
+#: nova/network/manager.py:952
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr "释放的IP |%(address)s|"
 
-#: nova/network/manager.py:975
+#: nova/network/manager.py:956
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr "没有关联的IP %s 被释放了"
 
-#: nova/network/manager.py:979
+#: nova/network/manager.py:960
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr "没有租用的IP %s 被释放了"
 
-#: nova/network/manager.py:998
+#: nova/network/manager.py:979
 #, fuzzy, python-format
 msgid "%s must be an integer"
 msgstr "offset 参数必须是整数"
 
-#: nova/network/manager.py:1022
+#: nova/network/manager.py:1003
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1042
+#: 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:1123
+#: nova/network/manager.py:1104
 msgid "cidr already in use"
 msgstr "cidr 已经在使用"
 
-#: nova/network/manager.py:1126
+#: nova/network/manager.py:1107
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr "请求的cidr (%(cidr)s) 与已存在的超网络 (%(super)s) 冲突"
 
-#: nova/network/manager.py:1137
+#: nova/network/manager.py:1118
 #, 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:1194
+#: nova/network/manager.py:1175
 msgid "Network already exists!"
 msgstr "网络已经存在。"
 
-#: nova/network/manager.py:1213
+#: nova/network/manager.py:1194
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr "网路在删除前必须与项目 %s 解除关联"
 
-#: nova/network/manager.py:1813
+#: nova/network/manager.py:1794
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr "网络数量与VLAN起始数之和不能大于4049"
 
-#: nova/network/manager.py:1820
+#: nova/network/manager.py:1801
 #, fuzzy, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5683,44 +5683,44 @@ msgstr "没有找到主机"
 msgid "Fail to delete port %(portid)s with failure: %(exception)s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:321
+#: nova/network/quantumv2/api.py:318
 #, fuzzy, python-format
 msgid "deallocate_for_instance() for %s"
 msgstr "为实例 |%s| 解除网络分配"
 
-#: nova/network/quantumv2/api.py:330
+#: nova/network/quantumv2/api.py:327
 #, fuzzy, python-format
 msgid "Failed to delete quantum port %(portid)s "
 msgstr "在数据库删除卷失败"
 
-#: nova/network/quantumv2/api.py:354
+#: nova/network/quantumv2/api.py:349
 #, fuzzy, python-format
 msgid "Failed to delete quantum port %(port_id)s "
 msgstr "在数据库删除卷失败"
 
-#: nova/network/quantumv2/api.py:381
+#: nova/network/quantumv2/api.py:373
 #, fuzzy, python-format
 msgid "get_instance_nw_info() for %s"
 msgstr "实例的network_info：|%s|"
 
-#: nova/network/quantumv2/api.py:413
+#: 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:443
+#: 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:453
+#: nova/network/quantumv2/api.py:445
 #, fuzzy, python-format
 msgid "validate_networks() for %s"
 msgstr "错误的网络格式"
 
-#: nova/network/quantumv2/api.py:722
+#: nova/network/quantumv2/api.py:688
 #, fuzzy, python-format
 msgid "Multiple floating IP pools matches found for name '%s'"
 msgstr "找不到适合id %(id)s 的浮动IP。"
@@ -6903,7 +6903,7 @@ msgstr "强制杀死实例后：%s"
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:8707
+#: nova/tests/compute/test_compute.py:8725
 #, fuzzy
 msgid "spawn error"
 msgstr "未知的guestmount错误"
@@ -11184,70 +11184,3 @@ msgstr "状态必须可用"
 msgid "status must be 'available'"
 msgstr "状态必须可用"
 
-#~ msgid "Unexpected error while running command."
-#~ msgstr "运行命令时出现意外错误"
-
-#~ msgid ""
-#~ "%(description)s\n"
-#~ "Command: %(cmd)s\n"
-#~ "Exit code: %(exit_code)s\n"
-#~ "Stdout: %(stdout)r\n"
-#~ "Stderr: %(stderr)r"
-#~ msgstr ""
-#~ "%(description)s\n"
-#~ "命令：%(cmd)s\n"
-#~ "退出代码：%(exit_code)s\n"
-#~ "标准输出：%(stdout)r\n"
-#~ "标准错误输出：%(stderr)r"
-
-#~ msgid "Error clearing stale veth %s"
-#~ msgstr "启动xvp发生错误：%s"
-
-#~ msgid "Failed unplugging VLAN interface '%s'"
-#~ msgstr "移除实例”%s“的虚拟网络设备时失败"
-
-#~ msgid "Unplugged VLAN interface '%s'"
-#~ msgstr "移除实例”%s“的虚拟网络设备时失败"
-
-#~ msgid "Failed unplugging bridge interface '%s'"
-#~ msgstr "移除实例”%s“的虚拟网络设备时失败"
-
-#~ msgid "Unplugged bridge interface '%s'"
-#~ msgstr "移除实例”%s“的虚拟网络设备时失败"
-
-#~ msgid "Failed unplugging gateway interface '%s'"
-#~ msgstr "移除实例”%s“的虚拟网络设备时失败"
-
-#~ msgid "Unplugged gateway interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Network %(net)s for port %(port_id)s not found!"
-#~ msgstr "网络 %(network_id)s 没有找到。"
-
-#~ msgid "Host filter ignoring hosts: %(ignored_hosts_str)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "No hosts matched due to not "
-#~ "matching 'force_hosts'value of "
-#~ "'%(forced_hosts_str)s'"
-#~ msgstr ""
-
-#~ msgid "Host filter forcing available hosts to %(forced_hosts_str)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "Getting block stats failed, device might"
-#~ " have been detached. Code=%(errcode)s "
-#~ "Error=%(e)s"
-#~ msgstr ""
-
-#~ msgid "Must specify vmwareapi_wsdl_loc"
-#~ msgstr "必须指定 vmwareapi_wsdl_loc"
-
-#~ msgid "Unable to get SR for this host: %s"
-#~ msgstr "无法为主机得到存储库：%s"
-
-#~ msgid "VM.assert_can_migratefailed"
-#~ msgstr ""
-
diff --git a/nova/locale/zh_TW/LC_MESSAGES/nova.po b/nova/locale/zh_TW/LC_MESSAGES/nova.po
index 65fce59f6..8ef581057 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-06 19:37+0000\n"
+"POT-Creation-Date: 2013-05-07 19:38+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"
@@ -168,7 +168,7 @@ msgid ""
 msgstr ""
 
 #: nova/exception.py:235 nova/api/ec2/cloud.py:463
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2769
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2765
 msgid "Keypair data is invalid"
 msgstr "無效的Keypair"
 
@@ -2729,7 +2729,7 @@ msgstr ""
 msgid "Detach interface %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/baremetal_nodes.py:193
+#: nova/api/openstack/compute/contrib/baremetal_nodes.py:192
 msgid "Must specify id or address"
 msgstr ""
 
@@ -3766,240 +3766,240 @@ msgstr ""
 msgid "No nova entries in syslog!"
 msgstr ""
 
-#: nova/compute/api.py:282
+#: nova/compute/api.py:281
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:289
+#: nova/compute/api.py:288
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:298
+#: nova/compute/api.py:297
 #, 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
+#: nova/compute/api.py:317
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:328
+#: nova/compute/api.py:327
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:332
+#: nova/compute/api.py:331
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:336
+#: nova/compute/api.py:335
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:469
+#: nova/compute/api.py:468
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:509
+#: nova/compute/api.py:508
 #, fuzzy
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr "無法掛載Volume 到虛擬機器 %s"
 
-#: nova/compute/api.py:623
+#: nova/compute/api.py:622
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:739
+#: nova/compute/api.py:738
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:766
+#: nova/compute/api.py:765
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1040
+#: nova/compute/api.py:1036
 #, fuzzy
 msgid "instance termination disabled"
 msgstr "建立虛擬介面失敗"
 
-#: nova/compute/api.py:1176
+#: nova/compute/api.py:1172
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1182
+#: nova/compute/api.py:1178
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1192
+#: nova/compute/api.py:1188
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1236
+#: nova/compute/api.py:1232
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1260
+#: nova/compute/api.py:1256
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1310
+#: nova/compute/api.py:1306
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1327
+#: nova/compute/api.py:1323
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1400
+#: nova/compute/api.py:1396
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1637
+#: nova/compute/api.py:1633
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:1988
+#: nova/compute/api.py:1984
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1997
+#: nova/compute/api.py:1993
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2039
+#: nova/compute/api.py:2035
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2179
+#: nova/compute/api.py:2175
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2286
+#: nova/compute/api.py:2282
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2294
+#: nova/compute/api.py:2290
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2366
+#: nova/compute/api.py:2362
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2479
+#: nova/compute/api.py:2475
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2498
+#: nova/compute/api.py:2494
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2502
+#: nova/compute/api.py:2498
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2749
+#: nova/compute/api.py:2745
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2753
+#: nova/compute/api.py:2749
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2850
+#: nova/compute/api.py:2845
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2853
+#: nova/compute/api.py:2848
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2861
+#: nova/compute/api.py:2856
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2867
+#: nova/compute/api.py:2862
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2887
+#: nova/compute/api.py:2880
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2890
+#: nova/compute/api.py:2883
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2897
+#: nova/compute/api.py:2890
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2962
+#: nova/compute/api.py:2954
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "找不到Volume %s"
 
-#: nova/compute/api.py:2967
+#: nova/compute/api.py:2959
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:2975
+#: nova/compute/api.py:2967
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:2978
+#: nova/compute/api.py:2970
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3064 nova/compute/api.py:3141
+#: nova/compute/api.py:3047 nova/compute/api.py:3121
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3080
+#: nova/compute/api.py:3063
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3083
+#: nova/compute/api.py:3066
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3094
+#: nova/compute/api.py:3075
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3148
+#: nova/compute/api.py:3128
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4983,17 +4983,17 @@ msgid ""
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1543
+#: nova/db/sqlalchemy/api.py:1546
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2834
+#: nova/db/sqlalchemy/api.py:2837
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4335
+#: nova/db/sqlalchemy/api.py:4332
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5345,20 +5345,20 @@ msgstr ""
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:495
+#: nova/network/manager.py:480
 msgid "network allocations"
 msgstr ""
 
-#: nova/network/manager.py:502
+#: nova/network/manager.py:487
 #, python-format
 msgid "networks retrieved for instance: |%(networks_list)s|"
 msgstr ""
 
-#: nova/network/manager.py:550
+#: nova/network/manager.py:535
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:816
+#: nova/network/manager.py:801
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -5366,98 +5366,98 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:842
+#: nova/network/manager.py:827
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to allocate fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:896
+#: nova/network/manager.py:879
 msgid "Failed to update usages deallocating fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:930
+#: nova/network/manager.py:911
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:953
+#: nova/network/manager.py:934
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:957
+#: nova/network/manager.py:938
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:966
+#: nova/network/manager.py:947
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:971
+#: nova/network/manager.py:952
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:975
+#: nova/network/manager.py:956
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:979
+#: nova/network/manager.py:960
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:998
+#: nova/network/manager.py:979
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1022
+#: nova/network/manager.py:1003
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1042
+#: 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:1123
+#: nova/network/manager.py:1104
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1126
+#: nova/network/manager.py:1107
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1137
+#: nova/network/manager.py:1118
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1194
+#: nova/network/manager.py:1175
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1213
+#: nova/network/manager.py:1194
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1813
+#: nova/network/manager.py:1794
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1820
+#: nova/network/manager.py:1801
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5528,44 +5528,44 @@ msgstr ""
 msgid "Fail to delete port %(portid)s with failure: %(exception)s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:321
+#: nova/network/quantumv2/api.py:318
 #, python-format
 msgid "deallocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:330
+#: nova/network/quantumv2/api.py:327
 #, python-format
 msgid "Failed to delete quantum port %(portid)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:354
+#: nova/network/quantumv2/api.py:349
 #, python-format
 msgid "Failed to delete quantum port %(port_id)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:381
+#: nova/network/quantumv2/api.py:373
 #, python-format
 msgid "get_instance_nw_info() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:413
+#: 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:443
+#: 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:453
+#: nova/network/quantumv2/api.py:445
 #, python-format
 msgid "validate_networks() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:722
+#: nova/network/quantumv2/api.py:688
 #, python-format
 msgid "Multiple floating IP pools matches found for name '%s'"
 msgstr ""
@@ -6727,7 +6727,7 @@ msgstr ""
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:8707
+#: nova/tests/compute/test_compute.py:8725
 msgid "spawn error"
 msgstr ""
 
@@ -10863,70 +10863,3 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Unexpected error while running command."
-#~ msgstr "非預期的執行錯誤"
-
-#~ msgid ""
-#~ "%(description)s\n"
-#~ "Command: %(cmd)s\n"
-#~ "Exit code: %(exit_code)s\n"
-#~ "Stdout: %(stdout)r\n"
-#~ "Stderr: %(stderr)r"
-#~ msgstr ""
-#~ "%(description)s\n"
-#~ "命令: %(cmd)s\n"
-#~ "退出代碼: %(exit_code)s\n"
-#~ "標準輸出: %(stdout)r\n"
-#~ "標準錯誤輸出: %(stderr)r"
-
-#~ msgid "Error clearing stale veth %s"
-#~ msgstr ""
-
-#~ msgid "Failed unplugging VLAN interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Unplugged VLAN interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Failed unplugging bridge interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Unplugged bridge interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Failed unplugging gateway interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Unplugged gateway interface '%s'"
-#~ msgstr ""
-
-#~ msgid "Network %(net)s for port %(port_id)s not found!"
-#~ msgstr ""
-
-#~ msgid "Host filter ignoring hosts: %(ignored_hosts_str)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "No hosts matched due to not "
-#~ "matching 'force_hosts'value of "
-#~ "'%(forced_hosts_str)s'"
-#~ msgstr ""
-
-#~ msgid "Host filter forcing available hosts to %(forced_hosts_str)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "Getting block stats failed, device might"
-#~ " have been detached. Code=%(errcode)s "
-#~ "Error=%(e)s"
-#~ msgstr ""
-
-#~ msgid "Must specify vmwareapi_wsdl_loc"
-#~ msgstr ""
-
-#~ msgid "Unable to get SR for this host: %s"
-#~ msgstr ""
-
-#~ msgid "VM.assert_can_migratefailed"
-#~ msgstr ""
-