Imported Translations from Transifex

Change-Id: Ib7dd5ace2eaf2060ea0a65ff9100a1fdbc10ccdf

22 files changed, 730 insertions, 997 deletions

diff --git a/nova/locale/bs/LC_MESSAGES/nova.po b/nova/locale/bs/LC_MESSAGES/nova.po
index 47cb598dc..5a01e48fc 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-04-19 00:03+0000\n"
+"POT-Creation-Date: 2013-04-20 00:04+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"
@@ -198,7 +198,7 @@ msgstr ""
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:270 nova/api/openstack/compute/servers.py:1341
+#: nova/exception.py:270 nova/api/openstack/compute/servers.py:1332
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 msgid "Invalid metadata"
 msgstr ""
@@ -2418,8 +2418,8 @@ msgstr ""
 #: nova/api/openstack/compute/servers.py:574
 #: nova/api/openstack/compute/servers.py:741
 #: nova/api/openstack/compute/servers.py:1011
-#: nova/api/openstack/compute/servers.py:1117
-#: nova/api/openstack/compute/servers.py:1290
+#: nova/api/openstack/compute/servers.py:1108
+#: nova/api/openstack/compute/servers.py:1281
 msgid "Instance could not be found"
 msgstr ""
 
@@ -2532,102 +2532,87 @@ msgid "Personality cannot be updated."
 msgstr ""
 
 #: nova/api/openstack/compute/servers.py:1029
-#: nova/api/openstack/compute/servers.py:1049
+#: nova/api/openstack/compute/servers.py:1046
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1035
-#, python-format
-msgid "Error in confirm-resize %s"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:1052
+#: nova/api/openstack/compute/servers.py:1049
 msgid "Flavor used by the instance could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1058
-#, python-format
-msgid "Error in revert-resize %s"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:1071
+#: nova/api/openstack/compute/servers.py:1065
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1075
+#: nova/api/openstack/compute/servers.py:1069
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1088
-#, python-format
-msgid "Error in reboot %s"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:1100
+#: nova/api/openstack/compute/servers.py:1091
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1103
+#: nova/api/openstack/compute/servers.py:1094
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1127
+#: nova/api/openstack/compute/servers.py:1118
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1136
+#: nova/api/openstack/compute/servers.py:1127
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1163
+#: nova/api/openstack/compute/servers.py:1154
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1176
+#: nova/api/openstack/compute/servers.py:1167
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1180
-#: nova/api/openstack/compute/servers.py:1389
+#: nova/api/openstack/compute/servers.py:1171
+#: nova/api/openstack/compute/servers.py:1380
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1186
+#: nova/api/openstack/compute/servers.py:1177
 msgid "Unable to set password on instance"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1195
+#: nova/api/openstack/compute/servers.py:1186
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1208
+#: nova/api/openstack/compute/servers.py:1199
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1211
+#: nova/api/openstack/compute/servers.py:1202
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1229
+#: nova/api/openstack/compute/servers.py:1220
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:303
 #: nova/api/openstack/compute/contrib/keypairs.py:78
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1235
+#: nova/api/openstack/compute/servers.py:1226
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1299
+#: nova/api/openstack/compute/servers.py:1290
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1332
+#: nova/api/openstack/compute/servers.py:1323
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1416
+#: nova/api/openstack/compute/servers.py:1407
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr ""
@@ -6662,17 +6647,17 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3275
+#: nova/tests/api/openstack/compute/test_servers.py:3315
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3280
+#: nova/tests/api/openstack/compute/test_servers.py:3320
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3285
+#: nova/tests/api/openstack/compute/test_servers.py:3325
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
@@ -10771,9 +10756,12 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Scheduler cost function %(cost_fn_str)s could not be found."
+#~ msgid "Error in confirm-resize %s"
+#~ msgstr ""
+
+#~ msgid "Error in revert-resize %s"
 #~ msgstr ""
 
-#~ msgid "Scheduler weight flag not found: %(flag_name)s"
+#~ msgid "Error in reboot %s"
 #~ msgstr ""
 
diff --git a/nova/locale/cs/LC_MESSAGES/nova.po b/nova/locale/cs/LC_MESSAGES/nova.po
index b6e9704fd..97fc1964a 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-04-19 00:03+0000\n"
+"POT-Creation-Date: 2013-04-20 00:04+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"
@@ -209,7 +209,7 @@ msgstr "Obdržen neplatný vstup"
 msgid "Invalid volume"
 msgstr "Neplatný svazek"
 
-#: nova/exception.py:270 nova/api/openstack/compute/servers.py:1341
+#: nova/exception.py:270 nova/api/openstack/compute/servers.py:1332
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 msgid "Invalid metadata"
 msgstr "Neplatná metadata"
@@ -2497,8 +2497,8 @@ msgstr "Hostitel %(host)s nemohl být nalezen."
 #: nova/api/openstack/compute/servers.py:574
 #: nova/api/openstack/compute/servers.py:741
 #: nova/api/openstack/compute/servers.py:1011
-#: nova/api/openstack/compute/servers.py:1117
-#: nova/api/openstack/compute/servers.py:1290
+#: nova/api/openstack/compute/servers.py:1108
+#: nova/api/openstack/compute/servers.py:1281
 msgid "Instance could not be found"
 msgstr "Instance nemohla být nalezena"
 
@@ -2617,105 +2617,90 @@ msgid "Personality cannot be updated."
 msgstr "id nemůže být None"
 
 #: nova/api/openstack/compute/servers.py:1029
-#: nova/api/openstack/compute/servers.py:1049
+#: nova/api/openstack/compute/servers.py:1046
 msgid "Instance has not been resized."
 msgstr "Instanci nebyla změněna velikost."
 
-#: nova/api/openstack/compute/servers.py:1035
-#, python-format
-msgid "Error in confirm-resize %s"
-msgstr "Chyba v confirm-resize %s"
-
-#: nova/api/openstack/compute/servers.py:1052
+#: nova/api/openstack/compute/servers.py:1049
 #, fuzzy
 msgid "Flavor used by the instance could not be found."
 msgstr "Instance %(instance_id)s nemohla být nastavena."
 
-#: nova/api/openstack/compute/servers.py:1058
-#, python-format
-msgid "Error in revert-resize %s"
-msgstr "Chyba v revert-resize %s"
-
-#: nova/api/openstack/compute/servers.py:1071
+#: nova/api/openstack/compute/servers.py:1065
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr "Argument 'type' pro restart není HARD či SOFT"
 
-#: nova/api/openstack/compute/servers.py:1075
+#: nova/api/openstack/compute/servers.py:1069
 msgid "Missing argument 'type' for reboot"
 msgstr "Chybí argument 'type' pro restart"
 
-#: nova/api/openstack/compute/servers.py:1088
-#, python-format
-msgid "Error in reboot %s"
-msgstr "Chyba v restartu %s"
-
-#: nova/api/openstack/compute/servers.py:1100
+#: nova/api/openstack/compute/servers.py:1091
 msgid "Unable to locate requested flavor."
 msgstr "Nelze najít požadovanou konfiguraci."
 
-#: nova/api/openstack/compute/servers.py:1103
+#: nova/api/openstack/compute/servers.py:1094
 #, fuzzy
 msgid "Resize requires a flavor change."
 msgstr "Resize vyžaduje změnu velikosti."
 
-#: nova/api/openstack/compute/servers.py:1127
+#: nova/api/openstack/compute/servers.py:1118
 msgid "Missing imageRef attribute"
 msgstr "Chybí vlastnost imageRef"
 
-#: nova/api/openstack/compute/servers.py:1136
+#: nova/api/openstack/compute/servers.py:1127
 msgid "Invalid imageRef provided."
 msgstr "Zadáno neplatné imageRef."
 
-#: nova/api/openstack/compute/servers.py:1163
+#: nova/api/openstack/compute/servers.py:1154
 msgid "Missing flavorRef attribute"
 msgstr "Chybí vlastnost flavorRef"
 
-#: nova/api/openstack/compute/servers.py:1176
+#: nova/api/openstack/compute/servers.py:1167
 msgid "No adminPass was specified"
 msgstr "Nebylo zadáno adminPass"
 
-#: nova/api/openstack/compute/servers.py:1180
-#: nova/api/openstack/compute/servers.py:1389
+#: nova/api/openstack/compute/servers.py:1171
+#: nova/api/openstack/compute/servers.py:1380
 msgid "Invalid adminPass"
 msgstr "Neplatné adminPass"
 
-#: nova/api/openstack/compute/servers.py:1186
+#: nova/api/openstack/compute/servers.py:1177
 #, fuzzy
 msgid "Unable to set password on instance"
 msgstr "Nelze restartovat instanci"
 
-#: nova/api/openstack/compute/servers.py:1195
+#: nova/api/openstack/compute/servers.py:1186
 msgid "Unable to parse metadata key/value pairs."
 msgstr "Nelze zpracovat metadata dvojic hodnot/klíčů."
 
-#: nova/api/openstack/compute/servers.py:1208
+#: nova/api/openstack/compute/servers.py:1199
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr "Požadavek na změnu velikosti má neplatnou vlastnost 'flavorRef'."
 
-#: nova/api/openstack/compute/servers.py:1211
+#: nova/api/openstack/compute/servers.py:1202
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr "Požadavek na změnu velikosti vyžaduje vlastnost 'flavorRef'."
 
-#: nova/api/openstack/compute/servers.py:1229
+#: nova/api/openstack/compute/servers.py:1220
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:303
 #: nova/api/openstack/compute/contrib/keypairs.py:78
 msgid "Invalid request body"
 msgstr "Neplatné tělo požadavku"
 
-#: nova/api/openstack/compute/servers.py:1235
+#: nova/api/openstack/compute/servers.py:1226
 msgid "Could not parse imageRef from request."
 msgstr "Nelze zpracovat imageRef z požadavku."
 
-#: nova/api/openstack/compute/servers.py:1299
+#: nova/api/openstack/compute/servers.py:1290
 msgid "Cannot find image for rebuild"
 msgstr "Nelze najít obraz ke znovu sestavení"
 
-#: nova/api/openstack/compute/servers.py:1332
+#: nova/api/openstack/compute/servers.py:1323
 msgid "createImage entity requires name attribute"
 msgstr "Objekt createImage cyžaduje vlastnost name"
 
-#: nova/api/openstack/compute/servers.py:1416
+#: nova/api/openstack/compute/servers.py:1407
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr "Odstraňování voleb '%(unk_opt_str)s' z fronty"
@@ -6933,18 +6918,18 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3275
+#: nova/tests/api/openstack/compute/test_servers.py:3315
 #, fuzzy
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr "Překročena kvóta pro %(pid)s, pokus o spuštění %(min_count)s instancí"
 
-#: nova/tests/api/openstack/compute/test_servers.py:3280
+#: nova/tests/api/openstack/compute/test_servers.py:3320
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3285
+#: nova/tests/api/openstack/compute/test_servers.py:3325
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
@@ -11271,9 +11256,12 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr "stav musí být dostupný"
 
-#~ msgid "Scheduler cost function %(cost_fn_str)s could not be found."
-#~ msgstr "Funkce nákladů plánovače %(cost_fn_str)s nemohla být nalezena."
+#~ msgid "Error in confirm-resize %s"
+#~ msgstr "Chyba v confirm-resize %s"
+
+#~ msgid "Error in revert-resize %s"
+#~ msgstr "Chyba v revert-resize %s"
 
-#~ msgid "Scheduler weight flag not found: %(flag_name)s"
-#~ msgstr "Příznak váhy plánovače nemohl být nalezen: %(flag_name)s"
+#~ msgid "Error in reboot %s"
+#~ msgstr "Chyba v restartu %s"
 
diff --git a/nova/locale/da/LC_MESSAGES/nova.po b/nova/locale/da/LC_MESSAGES/nova.po
index b646198e7..06802a0b6 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-04-19 00:03+0000\n"
+"POT-Creation-Date: 2013-04-20 00:04+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"
@@ -198,7 +198,7 @@ msgstr ""
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:270 nova/api/openstack/compute/servers.py:1341
+#: nova/exception.py:270 nova/api/openstack/compute/servers.py:1332
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 msgid "Invalid metadata"
 msgstr ""
@@ -2418,8 +2418,8 @@ msgstr ""
 #: nova/api/openstack/compute/servers.py:574
 #: nova/api/openstack/compute/servers.py:741
 #: nova/api/openstack/compute/servers.py:1011
-#: nova/api/openstack/compute/servers.py:1117
-#: nova/api/openstack/compute/servers.py:1290
+#: nova/api/openstack/compute/servers.py:1108
+#: nova/api/openstack/compute/servers.py:1281
 msgid "Instance could not be found"
 msgstr ""
 
@@ -2532,102 +2532,87 @@ msgid "Personality cannot be updated."
 msgstr ""
 
 #: nova/api/openstack/compute/servers.py:1029
-#: nova/api/openstack/compute/servers.py:1049
+#: nova/api/openstack/compute/servers.py:1046
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1035
-#, python-format
-msgid "Error in confirm-resize %s"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:1052
+#: nova/api/openstack/compute/servers.py:1049
 msgid "Flavor used by the instance could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1058
-#, python-format
-msgid "Error in revert-resize %s"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:1071
+#: nova/api/openstack/compute/servers.py:1065
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1075
+#: nova/api/openstack/compute/servers.py:1069
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1088
-#, python-format
-msgid "Error in reboot %s"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:1100
+#: nova/api/openstack/compute/servers.py:1091
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1103
+#: nova/api/openstack/compute/servers.py:1094
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1127
+#: nova/api/openstack/compute/servers.py:1118
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1136
+#: nova/api/openstack/compute/servers.py:1127
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1163
+#: nova/api/openstack/compute/servers.py:1154
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1176
+#: nova/api/openstack/compute/servers.py:1167
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1180
-#: nova/api/openstack/compute/servers.py:1389
+#: nova/api/openstack/compute/servers.py:1171
+#: nova/api/openstack/compute/servers.py:1380
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1186
+#: nova/api/openstack/compute/servers.py:1177
 msgid "Unable to set password on instance"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1195
+#: nova/api/openstack/compute/servers.py:1186
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1208
+#: nova/api/openstack/compute/servers.py:1199
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1211
+#: nova/api/openstack/compute/servers.py:1202
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1229
+#: nova/api/openstack/compute/servers.py:1220
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:303
 #: nova/api/openstack/compute/contrib/keypairs.py:78
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1235
+#: nova/api/openstack/compute/servers.py:1226
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1299
+#: nova/api/openstack/compute/servers.py:1290
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1332
+#: nova/api/openstack/compute/servers.py:1323
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1416
+#: nova/api/openstack/compute/servers.py:1407
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr ""
@@ -6662,17 +6647,17 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3275
+#: nova/tests/api/openstack/compute/test_servers.py:3315
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3280
+#: nova/tests/api/openstack/compute/test_servers.py:3320
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3285
+#: nova/tests/api/openstack/compute/test_servers.py:3325
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
@@ -10772,9 +10757,12 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Scheduler cost function %(cost_fn_str)s could not be found."
+#~ msgid "Error in confirm-resize %s"
+#~ msgstr ""
+
+#~ msgid "Error in revert-resize %s"
 #~ msgstr ""
 
-#~ msgid "Scheduler weight flag not found: %(flag_name)s"
+#~ msgid "Error in reboot %s"
 #~ msgstr ""
 
diff --git a/nova/locale/de/LC_MESSAGES/nova.po b/nova/locale/de/LC_MESSAGES/nova.po
index 44b4e115e..a374366f3 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-04-19 00:03+0000\n"
+"POT-Creation-Date: 2013-04-20 00:04+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"
@@ -203,7 +203,7 @@ msgstr ""
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:270 nova/api/openstack/compute/servers.py:1341
+#: nova/exception.py:270 nova/api/openstack/compute/servers.py:1332
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 msgid "Invalid metadata"
 msgstr ""
@@ -2426,8 +2426,8 @@ msgstr ""
 #: nova/api/openstack/compute/servers.py:574
 #: nova/api/openstack/compute/servers.py:741
 #: nova/api/openstack/compute/servers.py:1011
-#: nova/api/openstack/compute/servers.py:1117
-#: nova/api/openstack/compute/servers.py:1290
+#: nova/api/openstack/compute/servers.py:1108
+#: nova/api/openstack/compute/servers.py:1281
 msgid "Instance could not be found"
 msgstr ""
 
@@ -2540,102 +2540,87 @@ msgid "Personality cannot be updated."
 msgstr ""
 
 #: nova/api/openstack/compute/servers.py:1029
-#: nova/api/openstack/compute/servers.py:1049
+#: nova/api/openstack/compute/servers.py:1046
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1035
-#, python-format
-msgid "Error in confirm-resize %s"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:1052
+#: nova/api/openstack/compute/servers.py:1049
 msgid "Flavor used by the instance could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1058
-#, python-format
-msgid "Error in revert-resize %s"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:1071
+#: nova/api/openstack/compute/servers.py:1065
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1075
+#: nova/api/openstack/compute/servers.py:1069
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1088
-#, python-format
-msgid "Error in reboot %s"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:1100
+#: nova/api/openstack/compute/servers.py:1091
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1103
+#: nova/api/openstack/compute/servers.py:1094
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1127
+#: nova/api/openstack/compute/servers.py:1118
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1136
+#: nova/api/openstack/compute/servers.py:1127
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1163
+#: nova/api/openstack/compute/servers.py:1154
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1176
+#: nova/api/openstack/compute/servers.py:1167
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1180
-#: nova/api/openstack/compute/servers.py:1389
+#: nova/api/openstack/compute/servers.py:1171
+#: nova/api/openstack/compute/servers.py:1380
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1186
+#: nova/api/openstack/compute/servers.py:1177
 msgid "Unable to set password on instance"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1195
+#: nova/api/openstack/compute/servers.py:1186
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1208
+#: nova/api/openstack/compute/servers.py:1199
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1211
+#: nova/api/openstack/compute/servers.py:1202
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1229
+#: nova/api/openstack/compute/servers.py:1220
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:303
 #: nova/api/openstack/compute/contrib/keypairs.py:78
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1235
+#: nova/api/openstack/compute/servers.py:1226
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1299
+#: nova/api/openstack/compute/servers.py:1290
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1332
+#: nova/api/openstack/compute/servers.py:1323
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1416
+#: nova/api/openstack/compute/servers.py:1407
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr ""
@@ -6682,17 +6667,17 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3275
+#: nova/tests/api/openstack/compute/test_servers.py:3315
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3280
+#: nova/tests/api/openstack/compute/test_servers.py:3320
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3285
+#: nova/tests/api/openstack/compute/test_servers.py:3325
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
@@ -10803,9 +10788,12 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Scheduler cost function %(cost_fn_str)s could not be found."
+#~ msgid "Error in confirm-resize %s"
+#~ msgstr ""
+
+#~ msgid "Error in revert-resize %s"
 #~ msgstr ""
 
-#~ msgid "Scheduler weight flag not found: %(flag_name)s"
+#~ msgid "Error in reboot %s"
 #~ msgstr ""
 
diff --git a/nova/locale/en_AU/LC_MESSAGES/nova.po b/nova/locale/en_AU/LC_MESSAGES/nova.po
index a37dae43c..3db613e42 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-04-19 00:03+0000\n"
+"POT-Creation-Date: 2013-04-20 00:04+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"
@@ -204,7 +204,7 @@ msgstr ""
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:270 nova/api/openstack/compute/servers.py:1341
+#: nova/exception.py:270 nova/api/openstack/compute/servers.py:1332
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 msgid "Invalid metadata"
 msgstr ""
@@ -2438,8 +2438,8 @@ msgstr ""
 #: nova/api/openstack/compute/servers.py:574
 #: nova/api/openstack/compute/servers.py:741
 #: nova/api/openstack/compute/servers.py:1011
-#: nova/api/openstack/compute/servers.py:1117
-#: nova/api/openstack/compute/servers.py:1290
+#: nova/api/openstack/compute/servers.py:1108
+#: nova/api/openstack/compute/servers.py:1281
 msgid "Instance could not be found"
 msgstr ""
 
@@ -2554,103 +2554,88 @@ msgid "Personality cannot be updated."
 msgstr "Mountpoint cannot be translated: %s"
 
 #: nova/api/openstack/compute/servers.py:1029
-#: nova/api/openstack/compute/servers.py:1049
+#: nova/api/openstack/compute/servers.py:1046
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1035
-#, python-format
-msgid "Error in confirm-resize %s"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:1052
+#: nova/api/openstack/compute/servers.py:1049
 msgid "Flavor used by the instance could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1058
-#, python-format
-msgid "Error in revert-resize %s"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:1071
+#: nova/api/openstack/compute/servers.py:1065
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1075
+#: nova/api/openstack/compute/servers.py:1069
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1088
-#, python-format
-msgid "Error in reboot %s"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:1100
+#: nova/api/openstack/compute/servers.py:1091
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1103
+#: nova/api/openstack/compute/servers.py:1094
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1127
+#: nova/api/openstack/compute/servers.py:1118
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1136
+#: nova/api/openstack/compute/servers.py:1127
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1163
+#: nova/api/openstack/compute/servers.py:1154
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1176
+#: nova/api/openstack/compute/servers.py:1167
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1180
-#: nova/api/openstack/compute/servers.py:1389
+#: nova/api/openstack/compute/servers.py:1171
+#: nova/api/openstack/compute/servers.py:1380
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1186
+#: nova/api/openstack/compute/servers.py:1177
 #, fuzzy
 msgid "Unable to set password on instance"
 msgstr "Going to start terminating instances"
 
-#: nova/api/openstack/compute/servers.py:1195
+#: nova/api/openstack/compute/servers.py:1186
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1208
+#: nova/api/openstack/compute/servers.py:1199
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1211
+#: nova/api/openstack/compute/servers.py:1202
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1229
+#: nova/api/openstack/compute/servers.py:1220
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:303
 #: nova/api/openstack/compute/contrib/keypairs.py:78
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1235
+#: nova/api/openstack/compute/servers.py:1226
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1299
+#: nova/api/openstack/compute/servers.py:1290
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1332
+#: nova/api/openstack/compute/servers.py:1323
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1416
+#: nova/api/openstack/compute/servers.py:1407
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr ""
@@ -6752,17 +6737,17 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3275
+#: nova/tests/api/openstack/compute/test_servers.py:3315
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3280
+#: nova/tests/api/openstack/compute/test_servers.py:3320
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3285
+#: nova/tests/api/openstack/compute/test_servers.py:3325
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
@@ -10916,9 +10901,12 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Scheduler cost function %(cost_fn_str)s could not be found."
+#~ msgid "Error in confirm-resize %s"
+#~ msgstr ""
+
+#~ msgid "Error in revert-resize %s"
 #~ msgstr ""
 
-#~ msgid "Scheduler weight flag not found: %(flag_name)s"
+#~ msgid "Error in reboot %s"
 #~ msgstr ""
 
diff --git a/nova/locale/en_GB/LC_MESSAGES/nova.po b/nova/locale/en_GB/LC_MESSAGES/nova.po
index 2e26edae5..185235caf 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-04-19 00:03+0000\n"
+"POT-Creation-Date: 2013-04-20 00:04+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"
@@ -203,7 +203,7 @@ msgstr "Invalid input received"
 msgid "Invalid volume"
 msgstr "Invalid volume"
 
-#: nova/exception.py:270 nova/api/openstack/compute/servers.py:1341
+#: nova/exception.py:270 nova/api/openstack/compute/servers.py:1332
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 msgid "Invalid metadata"
 msgstr ""
@@ -2433,8 +2433,8 @@ msgstr "Instance %(instance_id)s is not running."
 #: nova/api/openstack/compute/servers.py:574
 #: nova/api/openstack/compute/servers.py:741
 #: nova/api/openstack/compute/servers.py:1011
-#: nova/api/openstack/compute/servers.py:1117
-#: nova/api/openstack/compute/servers.py:1290
+#: nova/api/openstack/compute/servers.py:1108
+#: nova/api/openstack/compute/servers.py:1281
 msgid "Instance could not be found"
 msgstr ""
 
@@ -2547,103 +2547,88 @@ msgid "Personality cannot be updated."
 msgstr ""
 
 #: nova/api/openstack/compute/servers.py:1029
-#: nova/api/openstack/compute/servers.py:1049
+#: nova/api/openstack/compute/servers.py:1046
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1035
-#, python-format
-msgid "Error in confirm-resize %s"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:1052
+#: nova/api/openstack/compute/servers.py:1049
 #, fuzzy
 msgid "Flavor used by the instance could not be found."
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/api/openstack/compute/servers.py:1058
-#, python-format
-msgid "Error in revert-resize %s"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:1071
+#: nova/api/openstack/compute/servers.py:1065
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1075
+#: nova/api/openstack/compute/servers.py:1069
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1088
-#, python-format
-msgid "Error in reboot %s"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:1100
+#: nova/api/openstack/compute/servers.py:1091
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1103
+#: nova/api/openstack/compute/servers.py:1094
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1127
+#: nova/api/openstack/compute/servers.py:1118
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1136
+#: nova/api/openstack/compute/servers.py:1127
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1163
+#: nova/api/openstack/compute/servers.py:1154
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1176
+#: nova/api/openstack/compute/servers.py:1167
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1180
-#: nova/api/openstack/compute/servers.py:1389
+#: nova/api/openstack/compute/servers.py:1171
+#: nova/api/openstack/compute/servers.py:1380
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1186
+#: nova/api/openstack/compute/servers.py:1177
 msgid "Unable to set password on instance"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1195
+#: nova/api/openstack/compute/servers.py:1186
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1208
+#: nova/api/openstack/compute/servers.py:1199
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1211
+#: nova/api/openstack/compute/servers.py:1202
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1229
+#: nova/api/openstack/compute/servers.py:1220
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:303
 #: nova/api/openstack/compute/contrib/keypairs.py:78
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1235
+#: nova/api/openstack/compute/servers.py:1226
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1299
+#: nova/api/openstack/compute/servers.py:1290
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1332
+#: nova/api/openstack/compute/servers.py:1323
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1416
+#: nova/api/openstack/compute/servers.py:1407
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr ""
@@ -6713,17 +6698,17 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3275
+#: nova/tests/api/openstack/compute/test_servers.py:3315
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3280
+#: nova/tests/api/openstack/compute/test_servers.py:3320
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3285
+#: nova/tests/api/openstack/compute/test_servers.py:3325
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
@@ -10858,9 +10843,12 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Scheduler cost function %(cost_fn_str)s could not be found."
+#~ msgid "Error in confirm-resize %s"
+#~ msgstr ""
+
+#~ msgid "Error in revert-resize %s"
 #~ msgstr ""
 
-#~ msgid "Scheduler weight flag not found: %(flag_name)s"
+#~ msgid "Error in reboot %s"
 #~ msgstr ""
 
diff --git a/nova/locale/en_US/LC_MESSAGES/nova.po b/nova/locale/en_US/LC_MESSAGES/nova.po
index d1dccbe48..f8a5f486a 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-04-19 00:03+0000\n"
+"POT-Creation-Date: 2013-04-20 00:04+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"
@@ -206,7 +206,7 @@ msgstr "Invalid input received"
 msgid "Invalid volume"
 msgstr "Invalid volume"
 
-#: nova/exception.py:270 nova/api/openstack/compute/servers.py:1341
+#: nova/exception.py:270 nova/api/openstack/compute/servers.py:1332
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 msgid "Invalid metadata"
 msgstr "Invalid metadata"
@@ -2496,8 +2496,8 @@ msgstr "Host '%s' could not be found."
 #: nova/api/openstack/compute/servers.py:574
 #: nova/api/openstack/compute/servers.py:741
 #: nova/api/openstack/compute/servers.py:1011
-#: nova/api/openstack/compute/servers.py:1117
-#: nova/api/openstack/compute/servers.py:1290
+#: nova/api/openstack/compute/servers.py:1108
+#: nova/api/openstack/compute/servers.py:1281
 msgid "Instance could not be found"
 msgstr "Instance could not be found"
 
@@ -2611,104 +2611,89 @@ msgid "Personality cannot be updated."
 msgstr "HostId cannot be updated."
 
 #: nova/api/openstack/compute/servers.py:1029
-#: nova/api/openstack/compute/servers.py:1049
+#: nova/api/openstack/compute/servers.py:1046
 msgid "Instance has not been resized."
 msgstr "Instance has not been resized."
 
-#: nova/api/openstack/compute/servers.py:1035
-#, python-format
-msgid "Error in confirm-resize %s"
-msgstr "Error in confirm-resize %s"
-
-#: nova/api/openstack/compute/servers.py:1052
+#: nova/api/openstack/compute/servers.py:1049
 #, fuzzy
 msgid "Flavor used by the instance could not be found."
 msgstr "Instance %(instance_id)s could not be found."
 
-#: nova/api/openstack/compute/servers.py:1058
-#, python-format
-msgid "Error in revert-resize %s"
-msgstr "Error in revert-resize %s"
-
-#: nova/api/openstack/compute/servers.py:1071
+#: nova/api/openstack/compute/servers.py:1065
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr "Argument 'type' for reboot is not HARD or SOFT"
 
-#: nova/api/openstack/compute/servers.py:1075
+#: nova/api/openstack/compute/servers.py:1069
 msgid "Missing argument 'type' for reboot"
 msgstr "Missing argument 'type' for reboot"
 
-#: nova/api/openstack/compute/servers.py:1088
-#, python-format
-msgid "Error in reboot %s"
-msgstr "Error in reboot %s"
-
-#: nova/api/openstack/compute/servers.py:1100
+#: nova/api/openstack/compute/servers.py:1091
 msgid "Unable to locate requested flavor."
 msgstr "Unable to locate requested flavor."
 
-#: nova/api/openstack/compute/servers.py:1103
+#: nova/api/openstack/compute/servers.py:1094
 msgid "Resize requires a flavor change."
 msgstr "Resize requires a flavor change."
 
-#: nova/api/openstack/compute/servers.py:1127
+#: nova/api/openstack/compute/servers.py:1118
 msgid "Missing imageRef attribute"
 msgstr "Missing imageRef attribute"
 
-#: nova/api/openstack/compute/servers.py:1136
+#: nova/api/openstack/compute/servers.py:1127
 msgid "Invalid imageRef provided."
 msgstr "Invalid imageRef provided."
 
-#: nova/api/openstack/compute/servers.py:1163
+#: nova/api/openstack/compute/servers.py:1154
 msgid "Missing flavorRef attribute"
 msgstr "Missing flavorRef attribute"
 
-#: nova/api/openstack/compute/servers.py:1176
+#: nova/api/openstack/compute/servers.py:1167
 msgid "No adminPass was specified"
 msgstr "No adminPass was specified"
 
-#: nova/api/openstack/compute/servers.py:1180
-#: nova/api/openstack/compute/servers.py:1389
+#: nova/api/openstack/compute/servers.py:1171
+#: nova/api/openstack/compute/servers.py:1380
 msgid "Invalid adminPass"
 msgstr "Invalid adminPass"
 
-#: nova/api/openstack/compute/servers.py:1186
+#: nova/api/openstack/compute/servers.py:1177
 #, fuzzy
 msgid "Unable to set password on instance"
 msgstr "Failed to soft reboot instance."
 
-#: nova/api/openstack/compute/servers.py:1195
+#: nova/api/openstack/compute/servers.py:1186
 msgid "Unable to parse metadata key/value pairs."
 msgstr "Unable to parse metadata key/value pairs."
 
-#: nova/api/openstack/compute/servers.py:1208
+#: nova/api/openstack/compute/servers.py:1199
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr "Resize request has invalid 'flavorRef' attribute."
 
-#: nova/api/openstack/compute/servers.py:1211
+#: nova/api/openstack/compute/servers.py:1202
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr "Resize requests require 'flavorRef' attribute."
 
-#: nova/api/openstack/compute/servers.py:1229
+#: nova/api/openstack/compute/servers.py:1220
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:303
 #: nova/api/openstack/compute/contrib/keypairs.py:78
 msgid "Invalid request body"
 msgstr "Invalid request body"
 
-#: nova/api/openstack/compute/servers.py:1235
+#: nova/api/openstack/compute/servers.py:1226
 msgid "Could not parse imageRef from request."
 msgstr "Could not parse imageRef from request."
 
-#: nova/api/openstack/compute/servers.py:1299
+#: nova/api/openstack/compute/servers.py:1290
 msgid "Cannot find image for rebuild"
 msgstr "Cannot find image for rebuild"
 
-#: nova/api/openstack/compute/servers.py:1332
+#: nova/api/openstack/compute/servers.py:1323
 msgid "createImage entity requires name attribute"
 msgstr "createImage entity requires name attribute"
 
-#: nova/api/openstack/compute/servers.py:1416
+#: nova/api/openstack/compute/servers.py:1407
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr "Removing options '%(unk_opt_str)s' from query"
@@ -6928,7 +6913,7 @@ msgstr "200 No Roles"
 msgid "unexpected role header"
 msgstr "unexpected role header"
 
-#: nova/tests/api/openstack/compute/test_servers.py:3275
+#: nova/tests/api/openstack/compute/test_servers.py:3315
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
@@ -6936,11 +6921,11 @@ msgstr ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 
-#: nova/tests/api/openstack/compute/test_servers.py:3280
+#: nova/tests/api/openstack/compute/test_servers.py:3320
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 
-#: nova/tests/api/openstack/compute/test_servers.py:3285
+#: nova/tests/api/openstack/compute/test_servers.py:3325
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 
@@ -11231,9 +11216,12 @@ msgstr "Cinderclient connection created using URL: %s"
 msgid "status must be 'available'"
 msgstr "status must be available"
 
-#~ msgid "Scheduler cost function %(cost_fn_str)s could not be found."
-#~ msgstr "Scheduler cost function %(cost_fn_str)s could not be found."
+#~ msgid "Error in confirm-resize %s"
+#~ msgstr "Error in confirm-resize %s"
+
+#~ msgid "Error in revert-resize %s"
+#~ msgstr "Error in revert-resize %s"
 
-#~ msgid "Scheduler weight flag not found: %(flag_name)s"
-#~ msgstr "Scheduler weight flag not found: %(flag_name)s"
+#~ msgid "Error in reboot %s"
+#~ msgstr "Error in reboot %s"
 
diff --git a/nova/locale/es/LC_MESSAGES/nova.po b/nova/locale/es/LC_MESSAGES/nova.po
index 4d196d8ed..3e2694685 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-04-19 00:03+0000\n"
+"POT-Creation-Date: 2013-04-20 00:04+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"
@@ -210,7 +210,7 @@ msgstr "Entrada invalida recibida"
 msgid "Invalid volume"
 msgstr "Volumen inválido"
 
-#: nova/exception.py:270 nova/api/openstack/compute/servers.py:1341
+#: nova/exception.py:270 nova/api/openstack/compute/servers.py:1332
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 msgid "Invalid metadata"
 msgstr ""
@@ -2449,8 +2449,8 @@ msgstr "La instacia %(instance_id)s no esta suspendida"
 #: nova/api/openstack/compute/servers.py:574
 #: nova/api/openstack/compute/servers.py:741
 #: nova/api/openstack/compute/servers.py:1011
-#: nova/api/openstack/compute/servers.py:1117
-#: nova/api/openstack/compute/servers.py:1290
+#: nova/api/openstack/compute/servers.py:1108
+#: nova/api/openstack/compute/servers.py:1281
 msgid "Instance could not be found"
 msgstr ""
 
@@ -2565,104 +2565,89 @@ msgid "Personality cannot be updated."
 msgstr "Punto de montaje no puede ser traducido: %s"
 
 #: nova/api/openstack/compute/servers.py:1029
-#: nova/api/openstack/compute/servers.py:1049
+#: nova/api/openstack/compute/servers.py:1046
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1035
-#, python-format
-msgid "Error in confirm-resize %s"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:1052
+#: nova/api/openstack/compute/servers.py:1049
 #, fuzzy
 msgid "Flavor used by the instance could not be found."
 msgstr "La instacia %(instance_id)s no esta suspendida"
 
-#: nova/api/openstack/compute/servers.py:1058
-#, python-format
-msgid "Error in revert-resize %s"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:1071
+#: nova/api/openstack/compute/servers.py:1065
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1075
+#: nova/api/openstack/compute/servers.py:1069
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1088
-#, python-format
-msgid "Error in reboot %s"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:1100
+#: nova/api/openstack/compute/servers.py:1091
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1103
+#: nova/api/openstack/compute/servers.py:1094
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1127
+#: nova/api/openstack/compute/servers.py:1118
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1136
+#: nova/api/openstack/compute/servers.py:1127
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1163
+#: nova/api/openstack/compute/servers.py:1154
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1176
+#: nova/api/openstack/compute/servers.py:1167
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1180
-#: nova/api/openstack/compute/servers.py:1389
+#: nova/api/openstack/compute/servers.py:1171
+#: nova/api/openstack/compute/servers.py:1380
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1186
+#: nova/api/openstack/compute/servers.py:1177
 #, fuzzy
 msgid "Unable to set password on instance"
 msgstr "Fallo a reinicia la instancia"
 
-#: nova/api/openstack/compute/servers.py:1195
+#: nova/api/openstack/compute/servers.py:1186
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1208
+#: nova/api/openstack/compute/servers.py:1199
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1211
+#: nova/api/openstack/compute/servers.py:1202
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1229
+#: nova/api/openstack/compute/servers.py:1220
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:303
 #: nova/api/openstack/compute/contrib/keypairs.py:78
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1235
+#: nova/api/openstack/compute/servers.py:1226
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1299
+#: nova/api/openstack/compute/servers.py:1290
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1332
+#: nova/api/openstack/compute/servers.py:1323
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1416
+#: nova/api/openstack/compute/servers.py:1407
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr ""
@@ -6773,17 +6758,17 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3275
+#: nova/tests/api/openstack/compute/test_servers.py:3315
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3280
+#: nova/tests/api/openstack/compute/test_servers.py:3320
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3285
+#: nova/tests/api/openstack/compute/test_servers.py:3325
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
@@ -10937,9 +10922,12 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Scheduler cost function %(cost_fn_str)s could not be found."
+#~ msgid "Error in confirm-resize %s"
+#~ msgstr ""
+
+#~ msgid "Error in revert-resize %s"
 #~ msgstr ""
 
-#~ msgid "Scheduler weight flag not found: %(flag_name)s"
+#~ msgid "Error in reboot %s"
 #~ msgstr ""
 
diff --git a/nova/locale/fr/LC_MESSAGES/nova.po b/nova/locale/fr/LC_MESSAGES/nova.po
index 6bc0f5467..1f0e95d7e 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-04-19 00:03+0000\n"
+"POT-Creation-Date: 2013-04-20 00:04+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"
@@ -208,7 +208,7 @@ msgstr "Entrée invalide reçue"
 msgid "Invalid volume"
 msgstr "Volume invalide"
 
-#: nova/exception.py:270 nova/api/openstack/compute/servers.py:1341
+#: nova/exception.py:270 nova/api/openstack/compute/servers.py:1332
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 msgid "Invalid metadata"
 msgstr ""
@@ -2496,8 +2496,8 @@ msgstr "L'hôte %(host)s ne peut pas être trouvé."
 #: nova/api/openstack/compute/servers.py:574
 #: nova/api/openstack/compute/servers.py:741
 #: nova/api/openstack/compute/servers.py:1011
-#: nova/api/openstack/compute/servers.py:1117
-#: nova/api/openstack/compute/servers.py:1290
+#: nova/api/openstack/compute/servers.py:1108
+#: nova/api/openstack/compute/servers.py:1281
 msgid "Instance could not be found"
 msgstr ""
 
@@ -2612,104 +2612,89 @@ msgid "Personality cannot be updated."
 msgstr "Le point de montage ne peut pas être traduit : %s"
 
 #: nova/api/openstack/compute/servers.py:1029
-#: nova/api/openstack/compute/servers.py:1049
+#: nova/api/openstack/compute/servers.py:1046
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1035
-#, python-format
-msgid "Error in confirm-resize %s"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:1052
+#: nova/api/openstack/compute/servers.py:1049
 #, fuzzy
 msgid "Flavor used by the instance could not be found."
 msgstr "L'instance %(instance_id)s n'a pas pu être trouvée."
 
-#: nova/api/openstack/compute/servers.py:1058
-#, python-format
-msgid "Error in revert-resize %s"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:1071
+#: nova/api/openstack/compute/servers.py:1065
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1075
+#: nova/api/openstack/compute/servers.py:1069
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1088
-#, python-format
-msgid "Error in reboot %s"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:1100
+#: nova/api/openstack/compute/servers.py:1091
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1103
+#: nova/api/openstack/compute/servers.py:1094
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1127
+#: nova/api/openstack/compute/servers.py:1118
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1136
+#: nova/api/openstack/compute/servers.py:1127
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1163
+#: nova/api/openstack/compute/servers.py:1154
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1176
+#: nova/api/openstack/compute/servers.py:1167
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1180
-#: nova/api/openstack/compute/servers.py:1389
+#: nova/api/openstack/compute/servers.py:1171
+#: nova/api/openstack/compute/servers.py:1380
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1186
+#: nova/api/openstack/compute/servers.py:1177
 #, fuzzy
 msgid "Unable to set password on instance"
 msgstr "Échec du redémarrage de l'instance"
 
-#: nova/api/openstack/compute/servers.py:1195
+#: nova/api/openstack/compute/servers.py:1186
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1208
+#: nova/api/openstack/compute/servers.py:1199
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1211
+#: nova/api/openstack/compute/servers.py:1202
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1229
+#: nova/api/openstack/compute/servers.py:1220
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:303
 #: nova/api/openstack/compute/contrib/keypairs.py:78
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1235
+#: nova/api/openstack/compute/servers.py:1226
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1299
+#: nova/api/openstack/compute/servers.py:1290
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1332
+#: nova/api/openstack/compute/servers.py:1323
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1416
+#: nova/api/openstack/compute/servers.py:1407
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr ""
@@ -6838,17 +6823,17 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3275
+#: nova/tests/api/openstack/compute/test_servers.py:3315
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3280
+#: nova/tests/api/openstack/compute/test_servers.py:3320
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3285
+#: nova/tests/api/openstack/compute/test_servers.py:3325
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
@@ -11019,9 +11004,12 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Scheduler cost function %(cost_fn_str)s could not be found."
+#~ msgid "Error in confirm-resize %s"
+#~ msgstr ""
+
+#~ msgid "Error in revert-resize %s"
 #~ msgstr ""
 
-#~ msgid "Scheduler weight flag not found: %(flag_name)s"
+#~ msgid "Error in reboot %s"
 #~ msgstr ""
 
diff --git a/nova/locale/it/LC_MESSAGES/nova.po b/nova/locale/it/LC_MESSAGES/nova.po
index 5fc494e7e..5a6e780aa 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-04-19 00:03+0000\n"
+"POT-Creation-Date: 2013-04-20 00:04+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"
@@ -204,7 +204,7 @@ msgstr "E' stato ricevuto un input non valido"
 msgid "Invalid volume"
 msgstr "Volume non valido"
 
-#: nova/exception.py:270 nova/api/openstack/compute/servers.py:1341
+#: nova/exception.py:270 nova/api/openstack/compute/servers.py:1332
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 msgid "Invalid metadata"
 msgstr ""
@@ -2431,8 +2431,8 @@ msgstr ""
 #: nova/api/openstack/compute/servers.py:574
 #: nova/api/openstack/compute/servers.py:741
 #: nova/api/openstack/compute/servers.py:1011
-#: nova/api/openstack/compute/servers.py:1117
-#: nova/api/openstack/compute/servers.py:1290
+#: nova/api/openstack/compute/servers.py:1108
+#: nova/api/openstack/compute/servers.py:1281
 msgid "Instance could not be found"
 msgstr ""
 
@@ -2545,103 +2545,88 @@ msgid "Personality cannot be updated."
 msgstr ""
 
 #: nova/api/openstack/compute/servers.py:1029
-#: nova/api/openstack/compute/servers.py:1049
+#: nova/api/openstack/compute/servers.py:1046
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1035
-#, python-format
-msgid "Error in confirm-resize %s"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:1052
+#: nova/api/openstack/compute/servers.py:1049
 msgid "Flavor used by the instance could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1058
-#, python-format
-msgid "Error in revert-resize %s"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:1071
+#: nova/api/openstack/compute/servers.py:1065
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1075
+#: nova/api/openstack/compute/servers.py:1069
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1088
-#, python-format
-msgid "Error in reboot %s"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:1100
+#: nova/api/openstack/compute/servers.py:1091
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1103
+#: nova/api/openstack/compute/servers.py:1094
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1127
+#: nova/api/openstack/compute/servers.py:1118
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1136
+#: nova/api/openstack/compute/servers.py:1127
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1163
+#: nova/api/openstack/compute/servers.py:1154
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1176
+#: nova/api/openstack/compute/servers.py:1167
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1180
-#: nova/api/openstack/compute/servers.py:1389
+#: nova/api/openstack/compute/servers.py:1171
+#: nova/api/openstack/compute/servers.py:1380
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1186
+#: nova/api/openstack/compute/servers.py:1177
 #, fuzzy
 msgid "Unable to set password on instance"
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/api/openstack/compute/servers.py:1195
+#: nova/api/openstack/compute/servers.py:1186
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1208
+#: nova/api/openstack/compute/servers.py:1199
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1211
+#: nova/api/openstack/compute/servers.py:1202
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1229
+#: nova/api/openstack/compute/servers.py:1220
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:303
 #: nova/api/openstack/compute/contrib/keypairs.py:78
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1235
+#: nova/api/openstack/compute/servers.py:1226
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1299
+#: nova/api/openstack/compute/servers.py:1290
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1332
+#: nova/api/openstack/compute/servers.py:1323
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1416
+#: nova/api/openstack/compute/servers.py:1407
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr ""
@@ -6715,17 +6700,17 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3275
+#: nova/tests/api/openstack/compute/test_servers.py:3315
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3280
+#: nova/tests/api/openstack/compute/test_servers.py:3320
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3285
+#: nova/tests/api/openstack/compute/test_servers.py:3325
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
@@ -10856,9 +10841,12 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Scheduler cost function %(cost_fn_str)s could not be found."
+#~ msgid "Error in confirm-resize %s"
+#~ msgstr ""
+
+#~ msgid "Error in revert-resize %s"
 #~ msgstr ""
 
-#~ msgid "Scheduler weight flag not found: %(flag_name)s"
+#~ msgid "Error in reboot %s"
 #~ msgstr ""
 
diff --git a/nova/locale/ja/LC_MESSAGES/nova.po b/nova/locale/ja/LC_MESSAGES/nova.po
index d335d0cff..17069cbab 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-04-19 00:03+0000\n"
+"POT-Creation-Date: 2013-04-20 00:04+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"
@@ -204,7 +204,7 @@ msgstr ""
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:270 nova/api/openstack/compute/servers.py:1341
+#: nova/exception.py:270 nova/api/openstack/compute/servers.py:1332
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 msgid "Invalid metadata"
 msgstr ""
@@ -2437,8 +2437,8 @@ msgstr ""
 #: nova/api/openstack/compute/servers.py:574
 #: nova/api/openstack/compute/servers.py:741
 #: nova/api/openstack/compute/servers.py:1011
-#: nova/api/openstack/compute/servers.py:1117
-#: nova/api/openstack/compute/servers.py:1290
+#: nova/api/openstack/compute/servers.py:1108
+#: nova/api/openstack/compute/servers.py:1281
 msgid "Instance could not be found"
 msgstr ""
 
@@ -2553,103 +2553,88 @@ msgid "Personality cannot be updated."
 msgstr "マウントポイントを変換できません。 %s"
 
 #: nova/api/openstack/compute/servers.py:1029
-#: nova/api/openstack/compute/servers.py:1049
+#: nova/api/openstack/compute/servers.py:1046
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1035
-#, python-format
-msgid "Error in confirm-resize %s"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:1052
+#: nova/api/openstack/compute/servers.py:1049
 msgid "Flavor used by the instance could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1058
-#, python-format
-msgid "Error in revert-resize %s"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:1071
+#: nova/api/openstack/compute/servers.py:1065
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1075
+#: nova/api/openstack/compute/servers.py:1069
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1088
-#, python-format
-msgid "Error in reboot %s"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:1100
+#: nova/api/openstack/compute/servers.py:1091
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1103
+#: nova/api/openstack/compute/servers.py:1094
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1127
+#: nova/api/openstack/compute/servers.py:1118
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1136
+#: nova/api/openstack/compute/servers.py:1127
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1163
+#: nova/api/openstack/compute/servers.py:1154
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1176
+#: nova/api/openstack/compute/servers.py:1167
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1180
-#: nova/api/openstack/compute/servers.py:1389
+#: nova/api/openstack/compute/servers.py:1171
+#: nova/api/openstack/compute/servers.py:1380
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1186
+#: nova/api/openstack/compute/servers.py:1177
 #, fuzzy
 msgid "Unable to set password on instance"
 msgstr "インスタンス終了処理を開始します。"
 
-#: nova/api/openstack/compute/servers.py:1195
+#: nova/api/openstack/compute/servers.py:1186
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1208
+#: nova/api/openstack/compute/servers.py:1199
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1211
+#: nova/api/openstack/compute/servers.py:1202
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1229
+#: nova/api/openstack/compute/servers.py:1220
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:303
 #: nova/api/openstack/compute/contrib/keypairs.py:78
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1235
+#: nova/api/openstack/compute/servers.py:1226
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1299
+#: nova/api/openstack/compute/servers.py:1290
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1332
+#: nova/api/openstack/compute/servers.py:1323
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1416
+#: nova/api/openstack/compute/servers.py:1407
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr ""
@@ -6749,17 +6734,17 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3275
+#: nova/tests/api/openstack/compute/test_servers.py:3315
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3280
+#: nova/tests/api/openstack/compute/test_servers.py:3320
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3285
+#: nova/tests/api/openstack/compute/test_servers.py:3325
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
@@ -10904,9 +10889,12 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Scheduler cost function %(cost_fn_str)s could not be found."
+#~ msgid "Error in confirm-resize %s"
+#~ msgstr ""
+
+#~ msgid "Error in revert-resize %s"
 #~ msgstr ""
 
-#~ msgid "Scheduler weight flag not found: %(flag_name)s"
+#~ msgid "Error in reboot %s"
 #~ msgstr ""
 
diff --git a/nova/locale/ko/LC_MESSAGES/nova.po b/nova/locale/ko/LC_MESSAGES/nova.po
index ce7805375..147ff5aa7 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-04-19 00:03+0000\n"
+"POT-Creation-Date: 2013-04-20 00:04+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"
@@ -203,7 +203,7 @@ msgstr ""
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:270 nova/api/openstack/compute/servers.py:1341
+#: nova/exception.py:270 nova/api/openstack/compute/servers.py:1332
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 msgid "Invalid metadata"
 msgstr ""
@@ -2424,8 +2424,8 @@ msgstr ""
 #: nova/api/openstack/compute/servers.py:574
 #: nova/api/openstack/compute/servers.py:741
 #: nova/api/openstack/compute/servers.py:1011
-#: nova/api/openstack/compute/servers.py:1117
-#: nova/api/openstack/compute/servers.py:1290
+#: nova/api/openstack/compute/servers.py:1108
+#: nova/api/openstack/compute/servers.py:1281
 msgid "Instance could not be found"
 msgstr ""
 
@@ -2538,102 +2538,87 @@ msgid "Personality cannot be updated."
 msgstr ""
 
 #: nova/api/openstack/compute/servers.py:1029
-#: nova/api/openstack/compute/servers.py:1049
+#: nova/api/openstack/compute/servers.py:1046
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1035
-#, python-format
-msgid "Error in confirm-resize %s"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:1052
+#: nova/api/openstack/compute/servers.py:1049
 msgid "Flavor used by the instance could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1058
-#, python-format
-msgid "Error in revert-resize %s"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:1071
+#: nova/api/openstack/compute/servers.py:1065
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1075
+#: nova/api/openstack/compute/servers.py:1069
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1088
-#, python-format
-msgid "Error in reboot %s"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:1100
+#: nova/api/openstack/compute/servers.py:1091
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1103
+#: nova/api/openstack/compute/servers.py:1094
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1127
+#: nova/api/openstack/compute/servers.py:1118
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1136
+#: nova/api/openstack/compute/servers.py:1127
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1163
+#: nova/api/openstack/compute/servers.py:1154
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1176
+#: nova/api/openstack/compute/servers.py:1167
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1180
-#: nova/api/openstack/compute/servers.py:1389
+#: nova/api/openstack/compute/servers.py:1171
+#: nova/api/openstack/compute/servers.py:1380
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1186
+#: nova/api/openstack/compute/servers.py:1177
 msgid "Unable to set password on instance"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1195
+#: nova/api/openstack/compute/servers.py:1186
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1208
+#: nova/api/openstack/compute/servers.py:1199
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1211
+#: nova/api/openstack/compute/servers.py:1202
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1229
+#: nova/api/openstack/compute/servers.py:1220
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:303
 #: nova/api/openstack/compute/contrib/keypairs.py:78
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1235
+#: nova/api/openstack/compute/servers.py:1226
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1299
+#: nova/api/openstack/compute/servers.py:1290
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1332
+#: nova/api/openstack/compute/servers.py:1323
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1416
+#: nova/api/openstack/compute/servers.py:1407
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr ""
@@ -6681,17 +6666,17 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3275
+#: nova/tests/api/openstack/compute/test_servers.py:3315
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3280
+#: nova/tests/api/openstack/compute/test_servers.py:3320
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3285
+#: nova/tests/api/openstack/compute/test_servers.py:3325
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
@@ -10809,9 +10794,12 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Scheduler cost function %(cost_fn_str)s could not be found."
+#~ msgid "Error in confirm-resize %s"
+#~ msgstr ""
+
+#~ msgid "Error in revert-resize %s"
 #~ msgstr ""
 
-#~ msgid "Scheduler weight flag not found: %(flag_name)s"
+#~ msgid "Error in reboot %s"
 #~ msgstr ""
 
diff --git a/nova/locale/nb/LC_MESSAGES/nova.po b/nova/locale/nb/LC_MESSAGES/nova.po
index 636137b08..25294245e 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-04-19 00:03+0000\n"
+"POT-Creation-Date: 2013-04-20 00:04+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"
@@ -205,7 +205,7 @@ msgstr ""
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:270 nova/api/openstack/compute/servers.py:1341
+#: nova/exception.py:270 nova/api/openstack/compute/servers.py:1332
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 msgid "Invalid metadata"
 msgstr ""
@@ -2426,8 +2426,8 @@ msgstr "Tjeneste %(service_id)s ble ikke funnet."
 #: nova/api/openstack/compute/servers.py:574
 #: nova/api/openstack/compute/servers.py:741
 #: nova/api/openstack/compute/servers.py:1011
-#: nova/api/openstack/compute/servers.py:1117
-#: nova/api/openstack/compute/servers.py:1290
+#: nova/api/openstack/compute/servers.py:1108
+#: nova/api/openstack/compute/servers.py:1281
 msgid "Instance could not be found"
 msgstr ""
 
@@ -2540,103 +2540,88 @@ msgid "Personality cannot be updated."
 msgstr ""
 
 #: nova/api/openstack/compute/servers.py:1029
-#: nova/api/openstack/compute/servers.py:1049
+#: nova/api/openstack/compute/servers.py:1046
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1035
-#, python-format
-msgid "Error in confirm-resize %s"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:1052
+#: nova/api/openstack/compute/servers.py:1049
 #, fuzzy
 msgid "Flavor used by the instance could not be found."
 msgstr "Ressurs ble ikke funnet."
 
-#: nova/api/openstack/compute/servers.py:1058
-#, python-format
-msgid "Error in revert-resize %s"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:1071
+#: nova/api/openstack/compute/servers.py:1065
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1075
+#: nova/api/openstack/compute/servers.py:1069
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1088
-#, python-format
-msgid "Error in reboot %s"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:1100
+#: nova/api/openstack/compute/servers.py:1091
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1103
+#: nova/api/openstack/compute/servers.py:1094
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1127
+#: nova/api/openstack/compute/servers.py:1118
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1136
+#: nova/api/openstack/compute/servers.py:1127
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1163
+#: nova/api/openstack/compute/servers.py:1154
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1176
+#: nova/api/openstack/compute/servers.py:1167
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1180
-#: nova/api/openstack/compute/servers.py:1389
+#: nova/api/openstack/compute/servers.py:1171
+#: nova/api/openstack/compute/servers.py:1380
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1186
+#: nova/api/openstack/compute/servers.py:1177
 msgid "Unable to set password on instance"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1195
+#: nova/api/openstack/compute/servers.py:1186
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1208
+#: nova/api/openstack/compute/servers.py:1199
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1211
+#: nova/api/openstack/compute/servers.py:1202
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1229
+#: nova/api/openstack/compute/servers.py:1220
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:303
 #: nova/api/openstack/compute/contrib/keypairs.py:78
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1235
+#: nova/api/openstack/compute/servers.py:1226
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1299
+#: nova/api/openstack/compute/servers.py:1290
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1332
+#: nova/api/openstack/compute/servers.py:1323
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1416
+#: nova/api/openstack/compute/servers.py:1407
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr ""
@@ -6683,17 +6668,17 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3275
+#: nova/tests/api/openstack/compute/test_servers.py:3315
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3280
+#: nova/tests/api/openstack/compute/test_servers.py:3320
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3285
+#: nova/tests/api/openstack/compute/test_servers.py:3325
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
@@ -10799,9 +10784,12 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Scheduler cost function %(cost_fn_str)s could not be found."
+#~ msgid "Error in confirm-resize %s"
+#~ msgstr ""
+
+#~ msgid "Error in revert-resize %s"
 #~ msgstr ""
 
-#~ msgid "Scheduler weight flag not found: %(flag_name)s"
+#~ msgid "Error in reboot %s"
 #~ msgstr ""
 
diff --git a/nova/locale/nova.pot b/nova/locale/nova.pot
index 53e699e41..4a2aaecd9 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.222\n"
+"Project-Id-Version: nova jenkins.nova.propose.translation.update.223\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-04-19 00:03+0000\n"
+"POT-Creation-Date: 2013-04-20 00:04+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"
@@ -198,7 +198,7 @@ msgstr ""
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:270 nova/api/openstack/compute/servers.py:1341
+#: nova/exception.py:270 nova/api/openstack/compute/servers.py:1332
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 msgid "Invalid metadata"
 msgstr ""
@@ -2418,8 +2418,8 @@ msgstr ""
 #: nova/api/openstack/compute/servers.py:574
 #: nova/api/openstack/compute/servers.py:741
 #: nova/api/openstack/compute/servers.py:1011
-#: nova/api/openstack/compute/servers.py:1117
-#: nova/api/openstack/compute/servers.py:1290
+#: nova/api/openstack/compute/servers.py:1108
+#: nova/api/openstack/compute/servers.py:1281
 msgid "Instance could not be found"
 msgstr ""
 
@@ -2532,102 +2532,87 @@ msgid "Personality cannot be updated."
 msgstr ""
 
 #: nova/api/openstack/compute/servers.py:1029
-#: nova/api/openstack/compute/servers.py:1049
+#: nova/api/openstack/compute/servers.py:1046
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1035
-#, python-format
-msgid "Error in confirm-resize %s"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:1052
+#: nova/api/openstack/compute/servers.py:1049
 msgid "Flavor used by the instance could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1058
-#, python-format
-msgid "Error in revert-resize %s"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:1071
+#: nova/api/openstack/compute/servers.py:1065
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1075
+#: nova/api/openstack/compute/servers.py:1069
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1088
-#, python-format
-msgid "Error in reboot %s"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:1100
+#: nova/api/openstack/compute/servers.py:1091
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1103
+#: nova/api/openstack/compute/servers.py:1094
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1127
+#: nova/api/openstack/compute/servers.py:1118
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1136
+#: nova/api/openstack/compute/servers.py:1127
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1163
+#: nova/api/openstack/compute/servers.py:1154
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1176
+#: nova/api/openstack/compute/servers.py:1167
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1180
-#: nova/api/openstack/compute/servers.py:1389
+#: nova/api/openstack/compute/servers.py:1171
+#: nova/api/openstack/compute/servers.py:1380
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1186
+#: nova/api/openstack/compute/servers.py:1177
 msgid "Unable to set password on instance"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1195
+#: nova/api/openstack/compute/servers.py:1186
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1208
+#: nova/api/openstack/compute/servers.py:1199
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1211
+#: nova/api/openstack/compute/servers.py:1202
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1229
+#: nova/api/openstack/compute/servers.py:1220
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:303
 #: nova/api/openstack/compute/contrib/keypairs.py:78
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1235
+#: nova/api/openstack/compute/servers.py:1226
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1299
+#: nova/api/openstack/compute/servers.py:1290
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1332
+#: nova/api/openstack/compute/servers.py:1323
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1416
+#: nova/api/openstack/compute/servers.py:1407
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr ""
@@ -6662,17 +6647,17 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3275
+#: nova/tests/api/openstack/compute/test_servers.py:3315
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3280
+#: nova/tests/api/openstack/compute/test_servers.py:3320
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3285
+#: nova/tests/api/openstack/compute/test_servers.py:3325
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
diff --git a/nova/locale/pt_BR/LC_MESSAGES/nova.po b/nova/locale/pt_BR/LC_MESSAGES/nova.po
index 15bdbd3f1..6267bfbee 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-04-19 00:03+0000\n"
+"POT-Creation-Date: 2013-04-20 00:04+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"
@@ -204,7 +204,7 @@ msgstr "Dados recebidos é inválido"
 msgid "Invalid volume"
 msgstr "Volume inválido"
 
-#: nova/exception.py:270 nova/api/openstack/compute/servers.py:1341
+#: nova/exception.py:270 nova/api/openstack/compute/servers.py:1332
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 msgid "Invalid metadata"
 msgstr ""
@@ -2438,8 +2438,8 @@ msgstr "Host %(host)s não encontrado."
 #: nova/api/openstack/compute/servers.py:574
 #: nova/api/openstack/compute/servers.py:741
 #: nova/api/openstack/compute/servers.py:1011
-#: nova/api/openstack/compute/servers.py:1117
-#: nova/api/openstack/compute/servers.py:1290
+#: nova/api/openstack/compute/servers.py:1108
+#: nova/api/openstack/compute/servers.py:1281
 msgid "Instance could not be found"
 msgstr ""
 
@@ -2554,104 +2554,89 @@ msgid "Personality cannot be updated."
 msgstr "Ponto de montagem não pode ser traduzido: %s"
 
 #: nova/api/openstack/compute/servers.py:1029
-#: nova/api/openstack/compute/servers.py:1049
+#: nova/api/openstack/compute/servers.py:1046
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1035
-#, python-format
-msgid "Error in confirm-resize %s"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:1052
+#: nova/api/openstack/compute/servers.py:1049
 #, fuzzy
 msgid "Flavor used by the instance could not be found."
 msgstr "Serviço %(service_id)s não encontrado."
 
-#: nova/api/openstack/compute/servers.py:1058
-#, python-format
-msgid "Error in revert-resize %s"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:1071
+#: nova/api/openstack/compute/servers.py:1065
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1075
+#: nova/api/openstack/compute/servers.py:1069
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1088
-#, python-format
-msgid "Error in reboot %s"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:1100
+#: nova/api/openstack/compute/servers.py:1091
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1103
+#: nova/api/openstack/compute/servers.py:1094
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1127
+#: nova/api/openstack/compute/servers.py:1118
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1136
+#: nova/api/openstack/compute/servers.py:1127
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1163
+#: nova/api/openstack/compute/servers.py:1154
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1176
+#: nova/api/openstack/compute/servers.py:1167
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1180
-#: nova/api/openstack/compute/servers.py:1389
+#: nova/api/openstack/compute/servers.py:1171
+#: nova/api/openstack/compute/servers.py:1380
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1186
+#: nova/api/openstack/compute/servers.py:1177
 #, fuzzy
 msgid "Unable to set password on instance"
 msgstr "Falhou ao reiniciar instância"
 
-#: nova/api/openstack/compute/servers.py:1195
+#: nova/api/openstack/compute/servers.py:1186
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1208
+#: nova/api/openstack/compute/servers.py:1199
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1211
+#: nova/api/openstack/compute/servers.py:1202
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1229
+#: nova/api/openstack/compute/servers.py:1220
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:303
 #: nova/api/openstack/compute/contrib/keypairs.py:78
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1235
+#: nova/api/openstack/compute/servers.py:1226
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1299
+#: nova/api/openstack/compute/servers.py:1290
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1332
+#: nova/api/openstack/compute/servers.py:1323
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1416
+#: nova/api/openstack/compute/servers.py:1407
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr ""
@@ -6756,17 +6741,17 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3275
+#: nova/tests/api/openstack/compute/test_servers.py:3315
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3280
+#: nova/tests/api/openstack/compute/test_servers.py:3320
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3285
+#: nova/tests/api/openstack/compute/test_servers.py:3325
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
@@ -10917,9 +10902,12 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Scheduler cost function %(cost_fn_str)s could not be found."
+#~ msgid "Error in confirm-resize %s"
+#~ msgstr ""
+
+#~ msgid "Error in revert-resize %s"
 #~ msgstr ""
 
-#~ msgid "Scheduler weight flag not found: %(flag_name)s"
+#~ msgid "Error in reboot %s"
 #~ msgstr ""
 
diff --git a/nova/locale/ru/LC_MESSAGES/nova.po b/nova/locale/ru/LC_MESSAGES/nova.po
index 34c191a8f..7997760be 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-04-19 00:03+0000\n"
+"POT-Creation-Date: 2013-04-20 00:04+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"
@@ -211,7 +211,7 @@ msgstr ""
 msgid "Invalid volume"
 msgstr "Недопустимый том"
 
-#: nova/exception.py:270 nova/api/openstack/compute/servers.py:1341
+#: nova/exception.py:270 nova/api/openstack/compute/servers.py:1332
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 msgid "Invalid metadata"
 msgstr "Недопустимые метаданные"
@@ -2483,8 +2483,8 @@ msgstr "Узел %(host)s не найден."
 #: nova/api/openstack/compute/servers.py:574
 #: nova/api/openstack/compute/servers.py:741
 #: nova/api/openstack/compute/servers.py:1011
-#: nova/api/openstack/compute/servers.py:1117
-#: nova/api/openstack/compute/servers.py:1290
+#: nova/api/openstack/compute/servers.py:1108
+#: nova/api/openstack/compute/servers.py:1281
 msgid "Instance could not be found"
 msgstr "Копия не найдена"
 
@@ -2600,105 +2600,90 @@ msgid "Personality cannot be updated."
 msgstr "Точка подключения не может быть переведена: %s"
 
 #: nova/api/openstack/compute/servers.py:1029
-#: nova/api/openstack/compute/servers.py:1049
+#: nova/api/openstack/compute/servers.py:1046
 msgid "Instance has not been resized."
 msgstr "С копией не производилось изменение размера."
 
-#: nova/api/openstack/compute/servers.py:1035
-#, python-format
-msgid "Error in confirm-resize %s"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:1052
+#: nova/api/openstack/compute/servers.py:1049
 #, fuzzy
 msgid "Flavor used by the instance could not be found."
 msgstr "Копия %(instance_id)s не найдена."
 
-#: nova/api/openstack/compute/servers.py:1058
-#, python-format
-msgid "Error in revert-resize %s"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:1071
+#: nova/api/openstack/compute/servers.py:1065
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1075
+#: nova/api/openstack/compute/servers.py:1069
 msgid "Missing argument 'type' for reboot"
 msgstr "Отсутствует аргумент типа 'type' для перезагрузки"
 
-#: nova/api/openstack/compute/servers.py:1088
-#, python-format
-msgid "Error in reboot %s"
-msgstr "Ошибка при перезагрузке %s"
-
-#: nova/api/openstack/compute/servers.py:1100
+#: nova/api/openstack/compute/servers.py:1091
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1103
+#: nova/api/openstack/compute/servers.py:1094
 #, fuzzy
 msgid "Resize requires a flavor change."
 msgstr "Изменение размера требует изменения объёма."
 
-#: nova/api/openstack/compute/servers.py:1127
+#: nova/api/openstack/compute/servers.py:1118
 msgid "Missing imageRef attribute"
 msgstr "Отсутствует атрибут imageRef"
 
-#: nova/api/openstack/compute/servers.py:1136
+#: nova/api/openstack/compute/servers.py:1127
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1163
+#: nova/api/openstack/compute/servers.py:1154
 msgid "Missing flavorRef attribute"
 msgstr "Отсутствует атрибут flavorRef"
 
-#: nova/api/openstack/compute/servers.py:1176
+#: nova/api/openstack/compute/servers.py:1167
 msgid "No adminPass was specified"
 msgstr "adminPass не был задан"
 
-#: nova/api/openstack/compute/servers.py:1180
-#: nova/api/openstack/compute/servers.py:1389
+#: nova/api/openstack/compute/servers.py:1171
+#: nova/api/openstack/compute/servers.py:1380
 msgid "Invalid adminPass"
 msgstr "Недопустимый adminPass"
 
-#: nova/api/openstack/compute/servers.py:1186
+#: nova/api/openstack/compute/servers.py:1177
 #, fuzzy
 msgid "Unable to set password on instance"
 msgstr "Ошибка перезагрузки копии"
 
-#: nova/api/openstack/compute/servers.py:1195
+#: nova/api/openstack/compute/servers.py:1186
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1208
+#: nova/api/openstack/compute/servers.py:1199
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr "Запрос изменения размера имеет недопустимый атрибут 'flavorRef'."
 
-#: nova/api/openstack/compute/servers.py:1211
+#: nova/api/openstack/compute/servers.py:1202
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr "Запросы изменение размера требуют атрибут 'flavorRef'."
 
-#: nova/api/openstack/compute/servers.py:1229
+#: nova/api/openstack/compute/servers.py:1220
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:303
 #: nova/api/openstack/compute/contrib/keypairs.py:78
 msgid "Invalid request body"
 msgstr "Недопустимый запрос тела"
 
-#: nova/api/openstack/compute/servers.py:1235
+#: nova/api/openstack/compute/servers.py:1226
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1299
+#: nova/api/openstack/compute/servers.py:1290
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1332
+#: nova/api/openstack/compute/servers.py:1323
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1416
+#: nova/api/openstack/compute/servers.py:1407
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr "Удаление параметров '%(unk_opt_str)s' из запроса"
@@ -6886,18 +6871,18 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3275
+#: nova/tests/api/openstack/compute/test_servers.py:3315
 #, fuzzy
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr "Превышена квота для %(pid)s, попытка выполнить %(min_count)s копий"
 
-#: nova/tests/api/openstack/compute/test_servers.py:3280
+#: nova/tests/api/openstack/compute/test_servers.py:3320
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3285
+#: nova/tests/api/openstack/compute/test_servers.py:3325
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
@@ -11143,9 +11128,12 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr "Образ должен быть доступен"
 
-#~ msgid "Scheduler cost function %(cost_fn_str)s could not be found."
+#~ msgid "Error in confirm-resize %s"
 #~ msgstr ""
 
-#~ msgid "Scheduler weight flag not found: %(flag_name)s"
+#~ msgid "Error in revert-resize %s"
 #~ msgstr ""
 
+#~ msgid "Error in reboot %s"
+#~ msgstr "Ошибка при перезагрузке %s"
+
diff --git a/nova/locale/tl/LC_MESSAGES/nova.po b/nova/locale/tl/LC_MESSAGES/nova.po
index 1d30eade4..c1a3af2fb 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-04-19 00:03+0000\n"
+"POT-Creation-Date: 2013-04-20 00:04+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"
@@ -198,7 +198,7 @@ msgstr ""
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:270 nova/api/openstack/compute/servers.py:1341
+#: nova/exception.py:270 nova/api/openstack/compute/servers.py:1332
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 msgid "Invalid metadata"
 msgstr ""
@@ -2418,8 +2418,8 @@ msgstr ""
 #: nova/api/openstack/compute/servers.py:574
 #: nova/api/openstack/compute/servers.py:741
 #: nova/api/openstack/compute/servers.py:1011
-#: nova/api/openstack/compute/servers.py:1117
-#: nova/api/openstack/compute/servers.py:1290
+#: nova/api/openstack/compute/servers.py:1108
+#: nova/api/openstack/compute/servers.py:1281
 msgid "Instance could not be found"
 msgstr ""
 
@@ -2532,102 +2532,87 @@ msgid "Personality cannot be updated."
 msgstr ""
 
 #: nova/api/openstack/compute/servers.py:1029
-#: nova/api/openstack/compute/servers.py:1049
+#: nova/api/openstack/compute/servers.py:1046
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1035
-#, python-format
-msgid "Error in confirm-resize %s"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:1052
+#: nova/api/openstack/compute/servers.py:1049
 msgid "Flavor used by the instance could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1058
-#, python-format
-msgid "Error in revert-resize %s"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:1071
+#: nova/api/openstack/compute/servers.py:1065
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1075
+#: nova/api/openstack/compute/servers.py:1069
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1088
-#, python-format
-msgid "Error in reboot %s"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:1100
+#: nova/api/openstack/compute/servers.py:1091
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1103
+#: nova/api/openstack/compute/servers.py:1094
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1127
+#: nova/api/openstack/compute/servers.py:1118
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1136
+#: nova/api/openstack/compute/servers.py:1127
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1163
+#: nova/api/openstack/compute/servers.py:1154
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1176
+#: nova/api/openstack/compute/servers.py:1167
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1180
-#: nova/api/openstack/compute/servers.py:1389
+#: nova/api/openstack/compute/servers.py:1171
+#: nova/api/openstack/compute/servers.py:1380
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1186
+#: nova/api/openstack/compute/servers.py:1177
 msgid "Unable to set password on instance"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1195
+#: nova/api/openstack/compute/servers.py:1186
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1208
+#: nova/api/openstack/compute/servers.py:1199
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1211
+#: nova/api/openstack/compute/servers.py:1202
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1229
+#: nova/api/openstack/compute/servers.py:1220
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:303
 #: nova/api/openstack/compute/contrib/keypairs.py:78
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1235
+#: nova/api/openstack/compute/servers.py:1226
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1299
+#: nova/api/openstack/compute/servers.py:1290
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1332
+#: nova/api/openstack/compute/servers.py:1323
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1416
+#: nova/api/openstack/compute/servers.py:1407
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr ""
@@ -6663,17 +6648,17 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3275
+#: nova/tests/api/openstack/compute/test_servers.py:3315
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3280
+#: nova/tests/api/openstack/compute/test_servers.py:3320
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3285
+#: nova/tests/api/openstack/compute/test_servers.py:3325
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
@@ -10772,9 +10757,12 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Scheduler cost function %(cost_fn_str)s could not be found."
+#~ msgid "Error in confirm-resize %s"
+#~ msgstr ""
+
+#~ msgid "Error in revert-resize %s"
 #~ msgstr ""
 
-#~ msgid "Scheduler weight flag not found: %(flag_name)s"
+#~ msgid "Error in reboot %s"
 #~ msgstr ""
 
diff --git a/nova/locale/tr/LC_MESSAGES/nova.po b/nova/locale/tr/LC_MESSAGES/nova.po
index 322352ae6..f796eed2d 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-04-19 00:03+0000\n"
+"POT-Creation-Date: 2013-04-20 00:04+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"
@@ -198,7 +198,7 @@ msgstr ""
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:270 nova/api/openstack/compute/servers.py:1341
+#: nova/exception.py:270 nova/api/openstack/compute/servers.py:1332
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 msgid "Invalid metadata"
 msgstr ""
@@ -2418,8 +2418,8 @@ msgstr ""
 #: nova/api/openstack/compute/servers.py:574
 #: nova/api/openstack/compute/servers.py:741
 #: nova/api/openstack/compute/servers.py:1011
-#: nova/api/openstack/compute/servers.py:1117
-#: nova/api/openstack/compute/servers.py:1290
+#: nova/api/openstack/compute/servers.py:1108
+#: nova/api/openstack/compute/servers.py:1281
 msgid "Instance could not be found"
 msgstr ""
 
@@ -2532,102 +2532,87 @@ msgid "Personality cannot be updated."
 msgstr ""
 
 #: nova/api/openstack/compute/servers.py:1029
-#: nova/api/openstack/compute/servers.py:1049
+#: nova/api/openstack/compute/servers.py:1046
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1035
-#, python-format
-msgid "Error in confirm-resize %s"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:1052
+#: nova/api/openstack/compute/servers.py:1049
 msgid "Flavor used by the instance could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1058
-#, python-format
-msgid "Error in revert-resize %s"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:1071
+#: nova/api/openstack/compute/servers.py:1065
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1075
+#: nova/api/openstack/compute/servers.py:1069
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1088
-#, python-format
-msgid "Error in reboot %s"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:1100
+#: nova/api/openstack/compute/servers.py:1091
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1103
+#: nova/api/openstack/compute/servers.py:1094
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1127
+#: nova/api/openstack/compute/servers.py:1118
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1136
+#: nova/api/openstack/compute/servers.py:1127
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1163
+#: nova/api/openstack/compute/servers.py:1154
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1176
+#: nova/api/openstack/compute/servers.py:1167
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1180
-#: nova/api/openstack/compute/servers.py:1389
+#: nova/api/openstack/compute/servers.py:1171
+#: nova/api/openstack/compute/servers.py:1380
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1186
+#: nova/api/openstack/compute/servers.py:1177
 msgid "Unable to set password on instance"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1195
+#: nova/api/openstack/compute/servers.py:1186
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1208
+#: nova/api/openstack/compute/servers.py:1199
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1211
+#: nova/api/openstack/compute/servers.py:1202
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1229
+#: nova/api/openstack/compute/servers.py:1220
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:303
 #: nova/api/openstack/compute/contrib/keypairs.py:78
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1235
+#: nova/api/openstack/compute/servers.py:1226
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1299
+#: nova/api/openstack/compute/servers.py:1290
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1332
+#: nova/api/openstack/compute/servers.py:1323
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1416
+#: nova/api/openstack/compute/servers.py:1407
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr ""
@@ -6662,17 +6647,17 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3275
+#: nova/tests/api/openstack/compute/test_servers.py:3315
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3280
+#: nova/tests/api/openstack/compute/test_servers.py:3320
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3285
+#: nova/tests/api/openstack/compute/test_servers.py:3325
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
@@ -10771,9 +10756,12 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Scheduler cost function %(cost_fn_str)s could not be found."
+#~ msgid "Error in confirm-resize %s"
+#~ msgstr ""
+
+#~ msgid "Error in revert-resize %s"
 #~ msgstr ""
 
-#~ msgid "Scheduler weight flag not found: %(flag_name)s"
+#~ msgid "Error in reboot %s"
 #~ msgstr ""
 
diff --git a/nova/locale/tr_TR/LC_MESSAGES/nova.po b/nova/locale/tr_TR/LC_MESSAGES/nova.po
index c19ebd348..2bb06f122 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-04-19 00:03+0000\n"
+"POT-Creation-Date: 2013-04-20 00:04+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"
@@ -202,7 +202,7 @@ msgstr "Geçersiz giriş yapıldı"
 msgid "Invalid volume"
 msgstr "Geçersiz bölüm"
 
-#: nova/exception.py:270 nova/api/openstack/compute/servers.py:1341
+#: nova/exception.py:270 nova/api/openstack/compute/servers.py:1332
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 msgid "Invalid metadata"
 msgstr "Geçersiz metadata"
@@ -2459,8 +2459,8 @@ msgstr "%(flavor_id)s örnek türü bulunamadı."
 #: nova/api/openstack/compute/servers.py:574
 #: nova/api/openstack/compute/servers.py:741
 #: nova/api/openstack/compute/servers.py:1011
-#: nova/api/openstack/compute/servers.py:1117
-#: nova/api/openstack/compute/servers.py:1290
+#: nova/api/openstack/compute/servers.py:1108
+#: nova/api/openstack/compute/servers.py:1281
 msgid "Instance could not be found"
 msgstr "Örnek bulunamadı."
 
@@ -2574,108 +2574,93 @@ msgid "Personality cannot be updated."
 msgstr "%s için kişisel içerik çözümlenemedi"
 
 #: nova/api/openstack/compute/servers.py:1029
-#: nova/api/openstack/compute/servers.py:1049
+#: nova/api/openstack/compute/servers.py:1046
 msgid "Instance has not been resized."
 msgstr "Örnek tekrar boyutlandırılacak şekilde ayarlanmadı."
 
-#: nova/api/openstack/compute/servers.py:1035
-#, python-format
-msgid "Error in confirm-resize %s"
-msgstr "Yeniden boyutlandırma onayında hata %s"
-
-#: nova/api/openstack/compute/servers.py:1052
+#: nova/api/openstack/compute/servers.py:1049
 #, fuzzy
 msgid "Flavor used by the instance could not be found."
 msgstr "%(instance_id)s örneği bulunamadı."
 
-#: nova/api/openstack/compute/servers.py:1058
-#, python-format
-msgid "Error in revert-resize %s"
-msgstr "Yeniden boyutlandırma dönüşünde hata %s"
-
-#: nova/api/openstack/compute/servers.py:1071
+#: nova/api/openstack/compute/servers.py:1065
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr "Önyükleme için argüman türü HARD veya SOFT değil"
 
-#: nova/api/openstack/compute/servers.py:1075
+#: nova/api/openstack/compute/servers.py:1069
 msgid "Missing argument 'type' for reboot"
 msgstr "Önyükleme için tür argümanı eksik"
 
-#: nova/api/openstack/compute/servers.py:1088
-#, python-format
-msgid "Error in reboot %s"
-msgstr "Önyükleme sırasında hata %s"
-
-#: nova/api/openstack/compute/servers.py:1100
+#: nova/api/openstack/compute/servers.py:1091
 msgid "Unable to locate requested flavor."
 msgstr "İstenilen örnek türü konumlandırılamıyor."
 
-#: nova/api/openstack/compute/servers.py:1103
+#: nova/api/openstack/compute/servers.py:1094
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1127
+#: nova/api/openstack/compute/servers.py:1118
 msgid "Missing imageRef attribute"
 msgstr "İmaj referans özelliği eksik"
 
-#: nova/api/openstack/compute/servers.py:1136
+#: nova/api/openstack/compute/servers.py:1127
 msgid "Invalid imageRef provided."
 msgstr "Geçersiz imaj referansı verildi."
 
-#: nova/api/openstack/compute/servers.py:1163
+#: nova/api/openstack/compute/servers.py:1154
 msgid "Missing flavorRef attribute"
 msgstr "Örnek türü referans özelliği eksik"
 
-#: nova/api/openstack/compute/servers.py:1176
+#: nova/api/openstack/compute/servers.py:1167
 msgid "No adminPass was specified"
 msgstr "Belirlenmiş bir yönetici parolası yok"
 
-#: nova/api/openstack/compute/servers.py:1180
-#: nova/api/openstack/compute/servers.py:1389
+#: nova/api/openstack/compute/servers.py:1171
+#: nova/api/openstack/compute/servers.py:1380
 msgid "Invalid adminPass"
 msgstr "Geçersiz yönetici parolası"
 
-#: nova/api/openstack/compute/servers.py:1186
+#: nova/api/openstack/compute/servers.py:1177
 #, fuzzy
 msgid "Unable to set password on instance"
 msgstr "Örnek kapatmada hata oluştu."
 
-#: nova/api/openstack/compute/servers.py:1195
+#: nova/api/openstack/compute/servers.py:1186
 msgid "Unable to parse metadata key/value pairs."
 msgstr "Çözümlenemeyen metadata anahtar/değer çifti."
 
-#: nova/api/openstack/compute/servers.py:1208
+#: nova/api/openstack/compute/servers.py:1199
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 "Yeniden boyutlandırma isteği geçersiz örnek türü referansı özelliğine "
 "sahip."
 
-#: nova/api/openstack/compute/servers.py:1211
+#: nova/api/openstack/compute/servers.py:1202
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 "Yeniden boyutlandırma isteği geçersiz örnek türü referansı özelliği "
 "gerektirir."
 
-#: nova/api/openstack/compute/servers.py:1229
+#: nova/api/openstack/compute/servers.py:1220
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:303
 #: nova/api/openstack/compute/contrib/keypairs.py:78
 msgid "Invalid request body"
 msgstr "Geçersiz istek gövdesi"
 
-#: nova/api/openstack/compute/servers.py:1235
+#: nova/api/openstack/compute/servers.py:1226
 msgid "Could not parse imageRef from request."
 msgstr "İstekte bulunulan imaj referansı çözümlenemedi."
 
-#: nova/api/openstack/compute/servers.py:1299
+#: nova/api/openstack/compute/servers.py:1290
 msgid "Cannot find image for rebuild"
 msgstr "Yeniden kurulum için imaj dosyası bulunamadı."
 
-#: nova/api/openstack/compute/servers.py:1332
+#: nova/api/openstack/compute/servers.py:1323
 msgid "createImage entity requires name attribute"
 msgstr "createImage varlığının isim özelliğine ihtiyacı var"
 
-#: nova/api/openstack/compute/servers.py:1416
+#: nova/api/openstack/compute/servers.py:1407
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr "Sorgudan '%(unk_opt_str)s' seçenekleri kaldırılıyor"
@@ -6775,17 +6760,17 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3275
+#: nova/tests/api/openstack/compute/test_servers.py:3315
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3280
+#: nova/tests/api/openstack/compute/test_servers.py:3320
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3285
+#: nova/tests/api/openstack/compute/test_servers.py:3325
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
@@ -10917,9 +10902,12 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr "İmaj müsait olmak zorunda"
 
-#~ msgid "Scheduler cost function %(cost_fn_str)s could not be found."
-#~ msgstr "%(cost_fn_str)s zamanlayıcı maliyet fonksiyonu bulunamadı."
+#~ msgid "Error in confirm-resize %s"
+#~ msgstr "Yeniden boyutlandırma onayında hata %s"
+
+#~ msgid "Error in revert-resize %s"
+#~ msgstr "Yeniden boyutlandırma dönüşünde hata %s"
 
-#~ msgid "Scheduler weight flag not found: %(flag_name)s"
-#~ msgstr "Zamanlayıcı yük bayrağı bulunamadı: %(flag_name)s"
+#~ msgid "Error in reboot %s"
+#~ msgstr "Önyükleme sırasında hata %s"
 
diff --git a/nova/locale/uk/LC_MESSAGES/nova.po b/nova/locale/uk/LC_MESSAGES/nova.po
index d25b7a29e..caa245381 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-04-19 00:03+0000\n"
+"POT-Creation-Date: 2013-04-20 00:04+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"
@@ -199,7 +199,7 @@ msgstr ""
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:270 nova/api/openstack/compute/servers.py:1341
+#: nova/exception.py:270 nova/api/openstack/compute/servers.py:1332
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 msgid "Invalid metadata"
 msgstr ""
@@ -2421,8 +2421,8 @@ msgstr ""
 #: nova/api/openstack/compute/servers.py:574
 #: nova/api/openstack/compute/servers.py:741
 #: nova/api/openstack/compute/servers.py:1011
-#: nova/api/openstack/compute/servers.py:1117
-#: nova/api/openstack/compute/servers.py:1290
+#: nova/api/openstack/compute/servers.py:1108
+#: nova/api/openstack/compute/servers.py:1281
 msgid "Instance could not be found"
 msgstr ""
 
@@ -2535,102 +2535,87 @@ msgid "Personality cannot be updated."
 msgstr ""
 
 #: nova/api/openstack/compute/servers.py:1029
-#: nova/api/openstack/compute/servers.py:1049
+#: nova/api/openstack/compute/servers.py:1046
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1035
-#, python-format
-msgid "Error in confirm-resize %s"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:1052
+#: nova/api/openstack/compute/servers.py:1049
 msgid "Flavor used by the instance could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1058
-#, python-format
-msgid "Error in revert-resize %s"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:1071
+#: nova/api/openstack/compute/servers.py:1065
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1075
+#: nova/api/openstack/compute/servers.py:1069
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1088
-#, python-format
-msgid "Error in reboot %s"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:1100
+#: nova/api/openstack/compute/servers.py:1091
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1103
+#: nova/api/openstack/compute/servers.py:1094
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1127
+#: nova/api/openstack/compute/servers.py:1118
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1136
+#: nova/api/openstack/compute/servers.py:1127
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1163
+#: nova/api/openstack/compute/servers.py:1154
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1176
+#: nova/api/openstack/compute/servers.py:1167
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1180
-#: nova/api/openstack/compute/servers.py:1389
+#: nova/api/openstack/compute/servers.py:1171
+#: nova/api/openstack/compute/servers.py:1380
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1186
+#: nova/api/openstack/compute/servers.py:1177
 msgid "Unable to set password on instance"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1195
+#: nova/api/openstack/compute/servers.py:1186
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1208
+#: nova/api/openstack/compute/servers.py:1199
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1211
+#: nova/api/openstack/compute/servers.py:1202
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1229
+#: nova/api/openstack/compute/servers.py:1220
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:303
 #: nova/api/openstack/compute/contrib/keypairs.py:78
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1235
+#: nova/api/openstack/compute/servers.py:1226
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1299
+#: nova/api/openstack/compute/servers.py:1290
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1332
+#: nova/api/openstack/compute/servers.py:1323
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1416
+#: nova/api/openstack/compute/servers.py:1407
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr ""
@@ -6669,17 +6654,17 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3275
+#: nova/tests/api/openstack/compute/test_servers.py:3315
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3280
+#: nova/tests/api/openstack/compute/test_servers.py:3320
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3285
+#: nova/tests/api/openstack/compute/test_servers.py:3325
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
@@ -10779,9 +10764,12 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Scheduler cost function %(cost_fn_str)s could not be found."
+#~ msgid "Error in confirm-resize %s"
+#~ msgstr ""
+
+#~ msgid "Error in revert-resize %s"
 #~ msgstr ""
 
-#~ msgid "Scheduler weight flag not found: %(flag_name)s"
+#~ msgid "Error in reboot %s"
 #~ msgstr ""
 
diff --git a/nova/locale/zh_CN/LC_MESSAGES/nova.po b/nova/locale/zh_CN/LC_MESSAGES/nova.po
index 97313e4c4..8ba28d3ed 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-04-19 00:03+0000\n"
+"POT-Creation-Date: 2013-04-20 00:04+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"
@@ -206,7 +206,7 @@ msgstr "收到无效的输入"
 msgid "Invalid volume"
 msgstr "无效的卷"
 
-#: nova/exception.py:270 nova/api/openstack/compute/servers.py:1341
+#: nova/exception.py:270 nova/api/openstack/compute/servers.py:1332
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 msgid "Invalid metadata"
 msgstr "无效的元数据"
@@ -2463,8 +2463,8 @@ msgstr "主机 %(host)s 没有找到。"
 #: nova/api/openstack/compute/servers.py:574
 #: nova/api/openstack/compute/servers.py:741
 #: nova/api/openstack/compute/servers.py:1011
-#: nova/api/openstack/compute/servers.py:1117
-#: nova/api/openstack/compute/servers.py:1290
+#: nova/api/openstack/compute/servers.py:1108
+#: nova/api/openstack/compute/servers.py:1281
 msgid "Instance could not be found"
 msgstr "无法找到实例"
 
@@ -2583,105 +2583,90 @@ msgid "Personality cannot be updated."
 msgstr "id不能是None"
 
 #: nova/api/openstack/compute/servers.py:1029
-#: nova/api/openstack/compute/servers.py:1049
+#: nova/api/openstack/compute/servers.py:1046
 msgid "Instance has not been resized."
 msgstr "实例还没有调整大小。"
 
-#: nova/api/openstack/compute/servers.py:1035
-#, python-format
-msgid "Error in confirm-resize %s"
-msgstr "confirm-resize中的错误 %s"
-
-#: nova/api/openstack/compute/servers.py:1052
+#: nova/api/openstack/compute/servers.py:1049
 #, fuzzy
 msgid "Flavor used by the instance could not be found."
 msgstr "实例 %(instance_id)s 没有找到。"
 
-#: nova/api/openstack/compute/servers.py:1058
-#, python-format
-msgid "Error in revert-resize %s"
-msgstr "revert-resize中的错误 %s"
-
-#: nova/api/openstack/compute/servers.py:1071
+#: nova/api/openstack/compute/servers.py:1065
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr "重启的参数'type'既不是HARD也不是SOFT"
 
-#: nova/api/openstack/compute/servers.py:1075
+#: nova/api/openstack/compute/servers.py:1069
 msgid "Missing argument 'type' for reboot"
 msgstr "缺少重启的参数'type'"
 
-#: nova/api/openstack/compute/servers.py:1088
-#, python-format
-msgid "Error in reboot %s"
-msgstr "重启中错误 %s"
-
-#: nova/api/openstack/compute/servers.py:1100
+#: nova/api/openstack/compute/servers.py:1091
 msgid "Unable to locate requested flavor."
 msgstr "无法找到请求的类型。"
 
-#: nova/api/openstack/compute/servers.py:1103
+#: nova/api/openstack/compute/servers.py:1094
 #, fuzzy
 msgid "Resize requires a flavor change."
 msgstr "调整大小需要尺寸的改变。"
 
-#: nova/api/openstack/compute/servers.py:1127
+#: nova/api/openstack/compute/servers.py:1118
 msgid "Missing imageRef attribute"
 msgstr "缺少属性imageRef"
 
-#: nova/api/openstack/compute/servers.py:1136
+#: nova/api/openstack/compute/servers.py:1127
 msgid "Invalid imageRef provided."
 msgstr "提供了无效的imageRef。"
 
-#: nova/api/openstack/compute/servers.py:1163
+#: nova/api/openstack/compute/servers.py:1154
 msgid "Missing flavorRef attribute"
 msgstr "缺少属性flavorRef"
 
-#: nova/api/openstack/compute/servers.py:1176
+#: nova/api/openstack/compute/servers.py:1167
 msgid "No adminPass was specified"
 msgstr "没有确定adminPass"
 
-#: nova/api/openstack/compute/servers.py:1180
-#: nova/api/openstack/compute/servers.py:1389
+#: nova/api/openstack/compute/servers.py:1171
+#: nova/api/openstack/compute/servers.py:1380
 msgid "Invalid adminPass"
 msgstr "无效的adminPass"
 
-#: nova/api/openstack/compute/servers.py:1186
+#: nova/api/openstack/compute/servers.py:1177
 #, fuzzy
 msgid "Unable to set password on instance"
 msgstr "重新启动实例失败"
 
-#: nova/api/openstack/compute/servers.py:1195
+#: nova/api/openstack/compute/servers.py:1186
 msgid "Unable to parse metadata key/value pairs."
 msgstr "无法解析元数据键/值对"
 
-#: nova/api/openstack/compute/servers.py:1208
+#: nova/api/openstack/compute/servers.py:1199
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr "调整大小请求中的属性'flavorRef'无效。"
 
-#: nova/api/openstack/compute/servers.py:1211
+#: nova/api/openstack/compute/servers.py:1202
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr "调整大小请求要求有属性'flavorRef'。"
 
-#: nova/api/openstack/compute/servers.py:1229
+#: nova/api/openstack/compute/servers.py:1220
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:303
 #: nova/api/openstack/compute/contrib/keypairs.py:78
 msgid "Invalid request body"
 msgstr "无效的请求主体"
 
-#: nova/api/openstack/compute/servers.py:1235
+#: nova/api/openstack/compute/servers.py:1226
 msgid "Could not parse imageRef from request."
 msgstr "无法解析请求中的imageRef。"
 
-#: nova/api/openstack/compute/servers.py:1299
+#: nova/api/openstack/compute/servers.py:1290
 msgid "Cannot find image for rebuild"
 msgstr "无法找到用来重新创建的镜像"
 
-#: nova/api/openstack/compute/servers.py:1332
+#: nova/api/openstack/compute/servers.py:1323
 msgid "createImage entity requires name attribute"
 msgstr "实体createImage需要属性name"
 
-#: nova/api/openstack/compute/servers.py:1416
+#: nova/api/openstack/compute/servers.py:1407
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr "正在从查询语句中移除选项 '%(unk_opt_str)s'"
@@ -6852,18 +6837,18 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3275
+#: nova/tests/api/openstack/compute/test_servers.py:3315
 #, fuzzy
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr "%(pid)s 已经超过配额，试图运行 %(min_count)s 个实例"
 
-#: nova/tests/api/openstack/compute/test_servers.py:3280
+#: nova/tests/api/openstack/compute/test_servers.py:3320
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3285
+#: nova/tests/api/openstack/compute/test_servers.py:3325
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
@@ -11116,9 +11101,12 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr "状态必须可用"
 
-#~ msgid "Scheduler cost function %(cost_fn_str)s could not be found."
-#~ msgstr "调度器的成本函数 %(cost_fn_str)s 没有找到。"
+#~ msgid "Error in confirm-resize %s"
+#~ msgstr "confirm-resize中的错误 %s"
+
+#~ msgid "Error in revert-resize %s"
+#~ msgstr "revert-resize中的错误 %s"
 
-#~ msgid "Scheduler weight flag not found: %(flag_name)s"
-#~ msgstr "未找到调度器的权重标记：%(flag_name)s"
+#~ msgid "Error in reboot %s"
+#~ msgstr "重启中错误 %s"
 
diff --git a/nova/locale/zh_TW/LC_MESSAGES/nova.po b/nova/locale/zh_TW/LC_MESSAGES/nova.po
index 9d2d9414d..7c91f83a2 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-04-19 00:03+0000\n"
+"POT-Creation-Date: 2013-04-20 00:04+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"
@@ -203,7 +203,7 @@ msgstr ""
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:270 nova/api/openstack/compute/servers.py:1341
+#: nova/exception.py:270 nova/api/openstack/compute/servers.py:1332
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 msgid "Invalid metadata"
 msgstr ""
@@ -2425,8 +2425,8 @@ msgstr ""
 #: nova/api/openstack/compute/servers.py:574
 #: nova/api/openstack/compute/servers.py:741
 #: nova/api/openstack/compute/servers.py:1011
-#: nova/api/openstack/compute/servers.py:1117
-#: nova/api/openstack/compute/servers.py:1290
+#: nova/api/openstack/compute/servers.py:1108
+#: nova/api/openstack/compute/servers.py:1281
 msgid "Instance could not be found"
 msgstr ""
 
@@ -2539,102 +2539,87 @@ msgid "Personality cannot be updated."
 msgstr ""
 
 #: nova/api/openstack/compute/servers.py:1029
-#: nova/api/openstack/compute/servers.py:1049
+#: nova/api/openstack/compute/servers.py:1046
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1035
-#, python-format
-msgid "Error in confirm-resize %s"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:1052
+#: nova/api/openstack/compute/servers.py:1049
 msgid "Flavor used by the instance could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1058
-#, python-format
-msgid "Error in revert-resize %s"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:1071
+#: nova/api/openstack/compute/servers.py:1065
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1075
+#: nova/api/openstack/compute/servers.py:1069
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1088
-#, python-format
-msgid "Error in reboot %s"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:1100
+#: nova/api/openstack/compute/servers.py:1091
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1103
+#: nova/api/openstack/compute/servers.py:1094
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1127
+#: nova/api/openstack/compute/servers.py:1118
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1136
+#: nova/api/openstack/compute/servers.py:1127
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1163
+#: nova/api/openstack/compute/servers.py:1154
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1176
+#: nova/api/openstack/compute/servers.py:1167
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1180
-#: nova/api/openstack/compute/servers.py:1389
+#: nova/api/openstack/compute/servers.py:1171
+#: nova/api/openstack/compute/servers.py:1380
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1186
+#: nova/api/openstack/compute/servers.py:1177
 msgid "Unable to set password on instance"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1195
+#: nova/api/openstack/compute/servers.py:1186
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1208
+#: nova/api/openstack/compute/servers.py:1199
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1211
+#: nova/api/openstack/compute/servers.py:1202
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1229
+#: nova/api/openstack/compute/servers.py:1220
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:303
 #: nova/api/openstack/compute/contrib/keypairs.py:78
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1235
+#: nova/api/openstack/compute/servers.py:1226
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1299
+#: nova/api/openstack/compute/servers.py:1290
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1332
+#: nova/api/openstack/compute/servers.py:1323
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1416
+#: nova/api/openstack/compute/servers.py:1407
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr ""
@@ -6679,17 +6664,17 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3275
+#: nova/tests/api/openstack/compute/test_servers.py:3315
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3280
+#: nova/tests/api/openstack/compute/test_servers.py:3320
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3285
+#: nova/tests/api/openstack/compute/test_servers.py:3325
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
@@ -10800,9 +10785,12 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Scheduler cost function %(cost_fn_str)s could not be found."
+#~ msgid "Error in confirm-resize %s"
+#~ msgstr ""
+
+#~ msgid "Error in revert-resize %s"
 #~ msgstr ""
 
-#~ msgid "Scheduler weight flag not found: %(flag_name)s"
+#~ msgid "Error in reboot %s"
 #~ msgstr ""