Imported Translations from Transifex

Change-Id: Ie208685045a154bc4f27706ae0c27d5de155a108

22 files changed, 1997 insertions, 2091 deletions

diff --git a/nova/locale/bs/LC_MESSAGES/nova.po b/nova/locale/bs/LC_MESSAGES/nova.po
index a3c88edac..47cb598dc 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-18 00:04+0000\n"
+"POT-Creation-Date: 2013-04-19 00:03+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"
@@ -904,396 +904,386 @@ msgstr ""
 
 #: nova/exception.py:873
 #, python-format
-msgid "Scheduler cost function %(cost_fn_str)s could not be found."
-msgstr ""
-
-#: nova/exception.py:878
-#, python-format
-msgid "Scheduler weight flag not found: %(flag_name)s"
-msgstr ""
-
-#: nova/exception.py:882
-#, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:887
+#: nova/exception.py:878
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:892
+#: nova/exception.py:883
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:888
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:892
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:896
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:910
+#: nova/exception.py:901
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:914
+#: nova/exception.py:905
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:918
+#: nova/exception.py:909
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:922
+#: nova/exception.py:913
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:926
+#: nova/exception.py:917
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:930
+#: nova/exception.py:921
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:925
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:929
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:933
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:937
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:951
+#: nova/exception.py:942
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:955
+#: nova/exception.py:946
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:959
+#: nova/exception.py:950
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:963
+#: nova/exception.py:954
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:969
+#: nova/exception.py:960
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:973
+#: nova/exception.py:964
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:977
+#: nova/exception.py:968
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:981
+#: nova/exception.py:972
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:985
+#: nova/exception.py:976
 msgid "Image is larger than instance type allows"
 msgstr ""
 
-#: nova/exception.py:989
+#: nova/exception.py:980
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:993
+#: nova/exception.py:984
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:997
+#: nova/exception.py:988
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:1001
+#: nova/exception.py:992
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:1005
+#: nova/exception.py:996
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1009
+#: nova/exception.py:1000
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1007
 #, python-format
 msgid ""
 "Quota exceeded for %(overs)s: Requested %(req)s, but already used "
 "%(used)d of %(allowed)d %(resource)s"
 msgstr ""
 
-#: nova/exception.py:1021
+#: nova/exception.py:1012
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1025
+#: nova/exception.py:1016
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1029
+#: nova/exception.py:1020
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1033
+#: nova/exception.py:1024
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1037
+#: nova/exception.py:1028
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1032
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1036
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1040
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1044
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1049
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1053
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1057
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1070
+#: nova/exception.py:1061
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1075
+#: nova/exception.py:1066
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1079
+#: nova/exception.py:1070
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1083
+#: nova/exception.py:1074
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1089
+#: nova/exception.py:1080
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1093
+#: nova/exception.py:1084
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1089
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1093
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1107
+#: nova/exception.py:1098
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1111
+#: nova/exception.py:1102
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1115
+#: nova/exception.py:1106
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1119
+#: nova/exception.py:1110
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1123
+#: nova/exception.py:1114
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1127
+#: nova/exception.py:1118
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1131
+#: nova/exception.py:1122
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1135
+#: nova/exception.py:1126
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1139
+#: nova/exception.py:1130
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1143
+#: nova/exception.py:1134
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1148
+#: nova/exception.py:1139
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1153
+#: nova/exception.py:1144
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1157
+#: nova/exception.py:1148
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1161
+#: nova/exception.py:1152
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1167
+#: nova/exception.py:1158
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1171
+#: nova/exception.py:1162
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1176
+#: nova/exception.py:1167
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1172
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1176
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1189
+#: nova/exception.py:1180
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1193
+#: nova/exception.py:1184
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1197
+#: nova/exception.py:1188
 #, python-format
 msgid "The service from servicegroup driver %(driver) is temporarily unavailable."
 msgstr ""
 
-#: nova/exception.py:1202
+#: nova/exception.py:1193
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1207
+#: nova/exception.py:1198
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1212
+#: nova/exception.py:1203
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1217
+#: nova/exception.py:1208
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
@@ -6277,38 +6267,38 @@ msgid ""
 "memory(host:%(avail)s <= instance:%(mem_inst)s)"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:75
+#: nova/scheduler/filter_scheduler.py:74
 #, python-format
 msgid "Attempting to build %(num_instances)d instance(s)"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:229
+#: nova/scheduler/filter_scheduler.py:228
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:246
+#: nova/scheduler/filter_scheduler.py:245
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:275
+#: nova/scheduler/filter_scheduler.py:274
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:341
+#: nova/scheduler/filter_scheduler.py:340
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:354
+#: nova/scheduler/filter_scheduler.py:353
 #, python-format
 msgid "Choosing host %(chosen_host)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:387
+#: nova/scheduler/filter_scheduler.py:386
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -10781,3 +10771,9 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Scheduler cost function %(cost_fn_str)s could not be found."
+#~ msgstr ""
+
+#~ msgid "Scheduler weight flag not found: %(flag_name)s"
+#~ msgstr ""
+
diff --git a/nova/locale/cs/LC_MESSAGES/nova.po b/nova/locale/cs/LC_MESSAGES/nova.po
index 097fc4e16..b6e9704fd 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-18 00:04+0000\n"
+"POT-Creation-Date: 2013-04-19 00:03+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"
@@ -943,28 +943,18 @@ msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr "Filtr hostitelů plánovače %(filter_name)s nemohl být nalezen."
 
 #: nova/exception.py:873
-#, python-format
-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."
-
-#: nova/exception.py:878
-#, python-format
-msgid "Scheduler weight flag not found: %(flag_name)s"
-msgstr "Příznak váhy plánovače nemohl být nalezen: %(flag_name)s"
-
-#: nova/exception.py:882
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr "Instance %(instance_id)s nemá žádná metadata s klíčem %(metadata_key)s."
 
-#: nova/exception.py:887
+#: nova/exception.py:878
 #, fuzzy, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr "Instance %(instance_id)s nemá žádná metadata s klíčem %(metadata_key)s."
 
-#: nova/exception.py:892
+#: nova/exception.py:883
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
@@ -973,375 +963,375 @@ msgstr ""
 "Instance typu %(instance_type_id)s nemá žádné dodatečné specifikace s "
 "klíčem %(extra_specs_key)s."
 
-#: nova/exception.py:897
+#: nova/exception.py:888
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr "Soubor %(file_path)s nemohl být nalezen."
 
-#: nova/exception.py:901
+#: nova/exception.py:892
 msgid "Zero files could be found."
 msgstr "Nalezeno nula souborů."
 
-#: nova/exception.py:905
+#: nova/exception.py:896
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr "Nenalezen virtuální přepínač sdružený se síťovým adaptérem %(adapter)s."
 
-#: nova/exception.py:910
+#: nova/exception.py:901
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr "Síťový adaptér %(adapter)s nemohl být nalezen."
 
-#: nova/exception.py:914
+#: nova/exception.py:905
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr "Třída %(class_name)s nemohla být nalezena: %(exception)s"
 
-#: nova/exception.py:918
+#: nova/exception.py:909
 msgid "Action not allowed."
 msgstr "Činnost není povolena."
 
-#: nova/exception.py:922
+#: nova/exception.py:913
 msgid "Rotation is not allowed for snapshots"
 msgstr "Střídání není povoleno pro snímky"
 
-#: nova/exception.py:926
+#: nova/exception.py:917
 msgid "Rotation param is required for backup image_type"
 msgstr "Parametr rotation je vyžadován pro backup image_type"
 
-#: nova/exception.py:930
+#: nova/exception.py:921
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr "Dvojice klíčů %(key_name)s již existuje."
 
-#: nova/exception.py:934
+#: nova/exception.py:925
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr "Instance %(name)s již existuje."
 
-#: nova/exception.py:938
+#: nova/exception.py:929
 #, fuzzy, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr "Instance typu %(name)s již existuje."
 
-#: nova/exception.py:942
+#: nova/exception.py:933
 #, fuzzy, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr "Instance typu %(name)s již existuje."
 
-#: nova/exception.py:946
+#: nova/exception.py:937
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:951
+#: nova/exception.py:942
 #, fuzzy, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr "%(path)s je ve sdíleném úložišti: %(reason)s"
 
-#: nova/exception.py:955
+#: nova/exception.py:946
 #, fuzzy, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr "%(path)s je ve sdíleném úložišti: %(reason)s"
 
-#: nova/exception.py:959
+#: nova/exception.py:950
 msgid "Migration error"
 msgstr "Chyba přesunu"
 
-#: nova/exception.py:963
+#: nova/exception.py:954
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr "Poškozené tělo zprávy: %(reason)s"
 
-#: nova/exception.py:969
+#: nova/exception.py:960
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr "Nelze najít nastavení v %(path)s"
 
-#: nova/exception.py:973
+#: nova/exception.py:964
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr "Nelze načíst aplikaci vložení '%(name)s' z %(path)s"
 
-#: nova/exception.py:977
+#: nova/exception.py:968
 #, fuzzy
 msgid "When resizing, instances must change flavor!"
 msgstr "Při změně velikosti ji musí instance změnit také!"
 
-#: nova/exception.py:981
+#: nova/exception.py:972
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:985
+#: nova/exception.py:976
 msgid "Image is larger than instance type allows"
 msgstr "Obraz je větší než typ instance povoluje"
 
-#: nova/exception.py:989
+#: nova/exception.py:980
 msgid "Instance type's memory is too small for requested image."
 msgstr "Typ paměti instance je pro požadovaný obraz příliš malý."
 
-#: nova/exception.py:993
+#: nova/exception.py:984
 msgid "Instance type's disk is too small for requested image."
 msgstr "Typ disku instance je pro požadovaný obraz příliš malý."
 
-#: nova/exception.py:997
+#: nova/exception.py:988
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr "Pro spuštění %(uuid)s je v uzlu výpočtu nedostatek volné paměti."
 
-#: nova/exception.py:1001
+#: nova/exception.py:992
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr "Nelze získat metriky šířky pásma/procesoru/disku pro tohoto hostitele."
 
-#: nova/exception.py:1005
+#: nova/exception.py:996
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr "Nebyl nalezen žádný platný hostitel. %(reason)s"
 
-#: nova/exception.py:1009
+#: nova/exception.py:1000
 msgid "Quota exceeded"
 msgstr "Kvóta překročena"
 
-#: nova/exception.py:1016
+#: nova/exception.py:1007
 #, fuzzy, python-format
 msgid ""
 "Quota exceeded for %(overs)s: Requested %(req)s, but already used "
 "%(used)d of %(allowed)d %(resource)s"
 msgstr "Překročena kvóta pro %(pid)s, pokus o spuštění %(min_count)s instancí"
 
-#: nova/exception.py:1021
+#: nova/exception.py:1012
 #, fuzzy
 msgid "Maximum number of floating ips exceeded"
 msgstr "Vybrán maximální počet hostitelů (%d)"
 
-#: nova/exception.py:1025
+#: nova/exception.py:1016
 #, fuzzy
 msgid "Maximum number of fixed ips exceeded"
 msgstr "Vybrán maximální počet hostitelů (%d)"
 
-#: nova/exception.py:1029
+#: nova/exception.py:1020
 #, fuzzy, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr "Vybrán maximální počet hostitelů (%d)"
 
-#: nova/exception.py:1033
+#: nova/exception.py:1024
 msgid "Personality file limit exceeded"
 msgstr "Překročen limit osobnostního souboru"
 
-#: nova/exception.py:1037
+#: nova/exception.py:1028
 msgid "Personality file path too long"
 msgstr "Cesta osobnostního souboru je příliš dlouhá"
 
-#: nova/exception.py:1041
+#: nova/exception.py:1032
 msgid "Personality file content too long"
 msgstr "Obsah osobnostního souboru je příliš dlouhý"
 
-#: nova/exception.py:1045
+#: nova/exception.py:1036
 #, fuzzy
 msgid "Maximum number of key pairs exceeded"
 msgstr "Vybrán maximální počet hostitelů (%d)"
 
-#: nova/exception.py:1049
+#: nova/exception.py:1040
 #, fuzzy
 msgid "Maximum number of security groups or rules exceeded"
 msgstr "Vybrán maximální počet hostitelů (%d)"
 
-#: nova/exception.py:1053
+#: nova/exception.py:1044
 #, fuzzy, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr "Agregát %(aggregate_id)s nemá hostitele %(host)s."
 
-#: nova/exception.py:1058
+#: nova/exception.py:1049
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr "Agregát %(aggregate_id)s nemohl být nalezen."
 
-#: nova/exception.py:1062
+#: nova/exception.py:1053
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr "Agregát %(aggregate_name)s již existuje."
 
-#: nova/exception.py:1066
+#: nova/exception.py:1057
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr "Agregát %(aggregate_id)s nemá hostitele %(host)s."
 
-#: nova/exception.py:1070
+#: nova/exception.py:1061
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr "Agregát %(aggregate_id)s nemá žádná metadata s klíčem %(metadata_key)s."
 
-#: nova/exception.py:1075
+#: nova/exception.py:1066
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr "Agregát %(aggregate_id)s již má hostitele %(host)s."
 
-#: nova/exception.py:1079
+#: nova/exception.py:1070
 msgid "Unable to create instance type"
 msgstr "Nelze vytvořit typ instance"
 
-#: nova/exception.py:1083
+#: nova/exception.py:1074
 #, fuzzy, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr "Nelze nastavit heslo správce. Instance %s není spuštěna"
 
-#: nova/exception.py:1089
+#: nova/exception.py:1080
 #, fuzzy, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr "Zjišťěna existující vlan s id %(vlan)"
 
-#: nova/exception.py:1093
+#: nova/exception.py:1084
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1089
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr "Instance %(instance_id)s nemohla být nastavena."
 
-#: nova/exception.py:1102
+#: nova/exception.py:1093
 #, fuzzy, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr "Konzole pro instanci %(instance_id)s nemohla být nalezena."
 
-#: nova/exception.py:1107
+#: nova/exception.py:1098
 #, fuzzy, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr "Svazek %(volume_id)s nemohl být nastaven."
 
-#: nova/exception.py:1111
+#: nova/exception.py:1102
 #, fuzzy, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr "Snímek %(snapshot_id)s nemohl být nalezen."
 
-#: nova/exception.py:1115
+#: nova/exception.py:1106
 #, fuzzy, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr "Obraz %(image_id)s nemohl být nalezen."
 
-#: nova/exception.py:1119
+#: nova/exception.py:1110
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1123
+#: nova/exception.py:1114
 #, fuzzy, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr "Získávání obrazu %(image)s"
 
-#: nova/exception.py:1127
+#: nova/exception.py:1118
 #, fuzzy, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr "Získávání obrazu %(image)s"
 
-#: nova/exception.py:1131
+#: nova/exception.py:1122
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1135
+#: nova/exception.py:1126
 #, fuzzy, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr "Plovoucí ip nenalezeno pro hostitele %(host)s."
 
-#: nova/exception.py:1139
+#: nova/exception.py:1130
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr "Instance %(instance_id)s nenalezena"
 
-#: nova/exception.py:1143
+#: nova/exception.py:1134
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1148
+#: nova/exception.py:1139
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1153
+#: nova/exception.py:1144
 #, fuzzy, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr "Navrácení sítě pro instnac"
 
-#: nova/exception.py:1157
+#: nova/exception.py:1148
 #, fuzzy, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr "Navrácení sítě pro instnac"
 
-#: nova/exception.py:1161
+#: nova/exception.py:1152
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1167
+#: nova/exception.py:1158
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1171
+#: nova/exception.py:1162
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1176
+#: nova/exception.py:1167
 #, fuzzy, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr "Připojit svazek %(volume_id)s k instanci %(instance_id)s na %(device)s"
 
-#: nova/exception.py:1181
+#: nova/exception.py:1172
 #, fuzzy, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr "Dvojice klíčů %(name)s nenalezena pro uživatele %(user_id)s"
 
-#: nova/exception.py:1185
+#: nova/exception.py:1176
 #, fuzzy, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr "Kvóta pro projekt %(project_id)s nemohla být nalezena."
 
-#: nova/exception.py:1189
+#: nova/exception.py:1180
 #, fuzzy, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr "Projekt %(project_id)s nemohl být nalezen."
 
-#: nova/exception.py:1193
+#: nova/exception.py:1184
 #, fuzzy
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr "set_admin_password není tímto ovladačem zavedeno"
 
-#: nova/exception.py:1197
+#: nova/exception.py:1188
 #, python-format
 msgid "The service from servicegroup driver %(driver) is temporarily unavailable."
 msgstr ""
 
-#: nova/exception.py:1202
+#: nova/exception.py:1193
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1207
+#: nova/exception.py:1198
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1212
+#: nova/exception.py:1203
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1217
+#: nova/exception.py:1208
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
@@ -6542,38 +6532,38 @@ msgstr ""
 "Nelze přesunout %(instance_id)s do %(dest)s: Nedostatek paměti "
 "(hostitel:%(avail)s <= instance:%(mem_inst)s)"
 
-#: nova/scheduler/filter_scheduler.py:75
+#: nova/scheduler/filter_scheduler.py:74
 #, python-format
 msgid "Attempting to build %(num_instances)d instance(s)"
 msgstr "Pokus o sestavení %(num_instances)d instancí"
 
-#: nova/scheduler/filter_scheduler.py:229
+#: nova/scheduler/filter_scheduler.py:228
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:246
+#: nova/scheduler/filter_scheduler.py:245
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:275
+#: nova/scheduler/filter_scheduler.py:274
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:341
+#: nova/scheduler/filter_scheduler.py:340
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr "Filtrováno %(hosts)s"
 
-#: nova/scheduler/filter_scheduler.py:354
+#: nova/scheduler/filter_scheduler.py:353
 #, python-format
 msgid "Choosing host %(chosen_host)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:387
+#: nova/scheduler/filter_scheduler.py:386
 #, fuzzy, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -11281,3 +11271,9 @@ 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 "Scheduler weight flag not found: %(flag_name)s"
+#~ msgstr "Příznak váhy plánovače nemohl být nalezen: %(flag_name)s"
+
diff --git a/nova/locale/da/LC_MESSAGES/nova.po b/nova/locale/da/LC_MESSAGES/nova.po
index 3e4c64933..b646198e7 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-18 00:04+0000\n"
+"POT-Creation-Date: 2013-04-19 00:03+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"
@@ -904,396 +904,386 @@ msgstr ""
 
 #: nova/exception.py:873
 #, python-format
-msgid "Scheduler cost function %(cost_fn_str)s could not be found."
-msgstr ""
-
-#: nova/exception.py:878
-#, python-format
-msgid "Scheduler weight flag not found: %(flag_name)s"
-msgstr ""
-
-#: nova/exception.py:882
-#, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:887
+#: nova/exception.py:878
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:892
+#: nova/exception.py:883
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:888
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:892
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:896
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:910
+#: nova/exception.py:901
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:914
+#: nova/exception.py:905
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:918
+#: nova/exception.py:909
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:922
+#: nova/exception.py:913
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:926
+#: nova/exception.py:917
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:930
+#: nova/exception.py:921
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:925
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:929
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:933
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:937
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:951
+#: nova/exception.py:942
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:955
+#: nova/exception.py:946
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:959
+#: nova/exception.py:950
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:963
+#: nova/exception.py:954
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:969
+#: nova/exception.py:960
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:973
+#: nova/exception.py:964
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:977
+#: nova/exception.py:968
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:981
+#: nova/exception.py:972
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:985
+#: nova/exception.py:976
 msgid "Image is larger than instance type allows"
 msgstr ""
 
-#: nova/exception.py:989
+#: nova/exception.py:980
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:993
+#: nova/exception.py:984
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:997
+#: nova/exception.py:988
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:1001
+#: nova/exception.py:992
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:1005
+#: nova/exception.py:996
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1009
+#: nova/exception.py:1000
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1007
 #, python-format
 msgid ""
 "Quota exceeded for %(overs)s: Requested %(req)s, but already used "
 "%(used)d of %(allowed)d %(resource)s"
 msgstr ""
 
-#: nova/exception.py:1021
+#: nova/exception.py:1012
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1025
+#: nova/exception.py:1016
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1029
+#: nova/exception.py:1020
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1033
+#: nova/exception.py:1024
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1037
+#: nova/exception.py:1028
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1032
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1036
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1040
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1044
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1049
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1053
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1057
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1070
+#: nova/exception.py:1061
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1075
+#: nova/exception.py:1066
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1079
+#: nova/exception.py:1070
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1083
+#: nova/exception.py:1074
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1089
+#: nova/exception.py:1080
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1093
+#: nova/exception.py:1084
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1089
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1093
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1107
+#: nova/exception.py:1098
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1111
+#: nova/exception.py:1102
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1115
+#: nova/exception.py:1106
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1119
+#: nova/exception.py:1110
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1123
+#: nova/exception.py:1114
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1127
+#: nova/exception.py:1118
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1131
+#: nova/exception.py:1122
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1135
+#: nova/exception.py:1126
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1139
+#: nova/exception.py:1130
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1143
+#: nova/exception.py:1134
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1148
+#: nova/exception.py:1139
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1153
+#: nova/exception.py:1144
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1157
+#: nova/exception.py:1148
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1161
+#: nova/exception.py:1152
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1167
+#: nova/exception.py:1158
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1171
+#: nova/exception.py:1162
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1176
+#: nova/exception.py:1167
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1172
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1176
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1189
+#: nova/exception.py:1180
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1193
+#: nova/exception.py:1184
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1197
+#: nova/exception.py:1188
 #, python-format
 msgid "The service from servicegroup driver %(driver) is temporarily unavailable."
 msgstr ""
 
-#: nova/exception.py:1202
+#: nova/exception.py:1193
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1207
+#: nova/exception.py:1198
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1212
+#: nova/exception.py:1203
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1217
+#: nova/exception.py:1208
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
@@ -6277,38 +6267,38 @@ msgid ""
 "memory(host:%(avail)s <= instance:%(mem_inst)s)"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:75
+#: nova/scheduler/filter_scheduler.py:74
 #, python-format
 msgid "Attempting to build %(num_instances)d instance(s)"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:229
+#: nova/scheduler/filter_scheduler.py:228
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:246
+#: nova/scheduler/filter_scheduler.py:245
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:275
+#: nova/scheduler/filter_scheduler.py:274
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:341
+#: nova/scheduler/filter_scheduler.py:340
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:354
+#: nova/scheduler/filter_scheduler.py:353
 #, python-format
 msgid "Choosing host %(chosen_host)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:387
+#: nova/scheduler/filter_scheduler.py:386
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -10782,3 +10772,9 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Scheduler cost function %(cost_fn_str)s could not be found."
+#~ msgstr ""
+
+#~ msgid "Scheduler weight flag not found: %(flag_name)s"
+#~ msgstr ""
+
diff --git a/nova/locale/de/LC_MESSAGES/nova.po b/nova/locale/de/LC_MESSAGES/nova.po
index 15b16a93d..44b4e115e 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-18 00:04+0000\n"
+"POT-Creation-Date: 2013-04-19 00:03+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"
@@ -910,396 +910,386 @@ msgstr ""
 
 #: nova/exception.py:873
 #, python-format
-msgid "Scheduler cost function %(cost_fn_str)s could not be found."
-msgstr ""
-
-#: nova/exception.py:878
-#, python-format
-msgid "Scheduler weight flag not found: %(flag_name)s"
-msgstr ""
-
-#: nova/exception.py:882
-#, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:887
+#: nova/exception.py:878
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:892
+#: nova/exception.py:883
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:888
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:892
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:896
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:910
+#: nova/exception.py:901
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:914
+#: nova/exception.py:905
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:918
+#: nova/exception.py:909
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:922
+#: nova/exception.py:913
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:926
+#: nova/exception.py:917
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:930
+#: nova/exception.py:921
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:925
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:929
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:933
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:937
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:951
+#: nova/exception.py:942
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:955
+#: nova/exception.py:946
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:959
+#: nova/exception.py:950
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:963
+#: nova/exception.py:954
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:969
+#: nova/exception.py:960
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:973
+#: nova/exception.py:964
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:977
+#: nova/exception.py:968
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:981
+#: nova/exception.py:972
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:985
+#: nova/exception.py:976
 msgid "Image is larger than instance type allows"
 msgstr ""
 
-#: nova/exception.py:989
+#: nova/exception.py:980
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:993
+#: nova/exception.py:984
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:997
+#: nova/exception.py:988
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:1001
+#: nova/exception.py:992
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:1005
+#: nova/exception.py:996
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1009
+#: nova/exception.py:1000
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1007
 #, python-format
 msgid ""
 "Quota exceeded for %(overs)s: Requested %(req)s, but already used "
 "%(used)d of %(allowed)d %(resource)s"
 msgstr ""
 
-#: nova/exception.py:1021
+#: nova/exception.py:1012
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1025
+#: nova/exception.py:1016
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1029
+#: nova/exception.py:1020
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1033
+#: nova/exception.py:1024
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1037
+#: nova/exception.py:1028
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1032
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1036
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1040
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1044
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1049
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1053
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1057
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1070
+#: nova/exception.py:1061
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1075
+#: nova/exception.py:1066
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1079
+#: nova/exception.py:1070
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1083
+#: nova/exception.py:1074
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1089
+#: nova/exception.py:1080
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1093
+#: nova/exception.py:1084
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1089
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1093
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1107
+#: nova/exception.py:1098
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1111
+#: nova/exception.py:1102
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1115
+#: nova/exception.py:1106
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1119
+#: nova/exception.py:1110
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1123
+#: nova/exception.py:1114
 #, fuzzy, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr "keine Methode für diese Nachricht gefunden: %s"
 
-#: nova/exception.py:1127
+#: nova/exception.py:1118
 #, fuzzy, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr "keine Methode für diese Nachricht gefunden: %s"
 
-#: nova/exception.py:1131
+#: nova/exception.py:1122
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1135
+#: nova/exception.py:1126
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1139
+#: nova/exception.py:1130
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1143
+#: nova/exception.py:1134
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1148
+#: nova/exception.py:1139
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1153
+#: nova/exception.py:1144
 #, fuzzy, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr "Nicht möglich Volumen zur Instanze %s hinzuzufügen"
 
-#: nova/exception.py:1157
+#: nova/exception.py:1148
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1161
+#: nova/exception.py:1152
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1167
+#: nova/exception.py:1158
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1171
+#: nova/exception.py:1162
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1176
+#: nova/exception.py:1167
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1172
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1176
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1189
+#: nova/exception.py:1180
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1193
+#: nova/exception.py:1184
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1197
+#: nova/exception.py:1188
 #, python-format
 msgid "The service from servicegroup driver %(driver) is temporarily unavailable."
 msgstr ""
 
-#: nova/exception.py:1202
+#: nova/exception.py:1193
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1207
+#: nova/exception.py:1198
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1212
+#: nova/exception.py:1203
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1217
+#: nova/exception.py:1208
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
@@ -6297,38 +6287,38 @@ msgid ""
 "memory(host:%(avail)s <= instance:%(mem_inst)s)"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:75
+#: nova/scheduler/filter_scheduler.py:74
 #, python-format
 msgid "Attempting to build %(num_instances)d instance(s)"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:229
+#: nova/scheduler/filter_scheduler.py:228
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:246
+#: nova/scheduler/filter_scheduler.py:245
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:275
+#: nova/scheduler/filter_scheduler.py:274
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:341
+#: nova/scheduler/filter_scheduler.py:340
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:354
+#: nova/scheduler/filter_scheduler.py:353
 #, python-format
 msgid "Choosing host %(chosen_host)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:387
+#: nova/scheduler/filter_scheduler.py:386
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -10813,3 +10803,9 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Scheduler cost function %(cost_fn_str)s could not be found."
+#~ msgstr ""
+
+#~ msgid "Scheduler weight flag not found: %(flag_name)s"
+#~ msgstr ""
+
diff --git a/nova/locale/en_AU/LC_MESSAGES/nova.po b/nova/locale/en_AU/LC_MESSAGES/nova.po
index ca1f94d4d..a37dae43c 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-18 00:04+0000\n"
+"POT-Creation-Date: 2013-04-19 00:03+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"
@@ -915,396 +915,386 @@ msgstr ""
 
 #: nova/exception.py:873
 #, python-format
-msgid "Scheduler cost function %(cost_fn_str)s could not be found."
-msgstr ""
-
-#: nova/exception.py:878
-#, python-format
-msgid "Scheduler weight flag not found: %(flag_name)s"
-msgstr ""
-
-#: nova/exception.py:882
-#, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:887
+#: nova/exception.py:878
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:892
+#: nova/exception.py:883
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:888
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:892
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:896
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:910
+#: nova/exception.py:901
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:914
+#: nova/exception.py:905
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:918
+#: nova/exception.py:909
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:922
+#: nova/exception.py:913
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:926
+#: nova/exception.py:917
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:930
+#: nova/exception.py:921
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:925
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:929
 #, fuzzy, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr "group %s already exists"
 
-#: nova/exception.py:942
+#: nova/exception.py:933
 #, fuzzy, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr "group %s already exists"
 
-#: nova/exception.py:946
+#: nova/exception.py:937
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:951
+#: nova/exception.py:942
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:955
+#: nova/exception.py:946
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:959
+#: nova/exception.py:950
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:963
+#: nova/exception.py:954
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:969
+#: nova/exception.py:960
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:973
+#: nova/exception.py:964
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:977
+#: nova/exception.py:968
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:981
+#: nova/exception.py:972
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:985
+#: nova/exception.py:976
 msgid "Image is larger than instance type allows"
 msgstr ""
 
-#: nova/exception.py:989
+#: nova/exception.py:980
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:993
+#: nova/exception.py:984
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:997
+#: nova/exception.py:988
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:1001
+#: nova/exception.py:992
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:1005
+#: nova/exception.py:996
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1009
+#: nova/exception.py:1000
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1007
 #, python-format
 msgid ""
 "Quota exceeded for %(overs)s: Requested %(req)s, but already used "
 "%(used)d of %(allowed)d %(resource)s"
 msgstr ""
 
-#: nova/exception.py:1021
+#: nova/exception.py:1012
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1025
+#: nova/exception.py:1016
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1029
+#: nova/exception.py:1020
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1033
+#: nova/exception.py:1024
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1037
+#: nova/exception.py:1028
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1032
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1036
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1040
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1044
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1049
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1053
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1057
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1070
+#: nova/exception.py:1061
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1075
+#: nova/exception.py:1066
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1079
+#: nova/exception.py:1070
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1083
+#: nova/exception.py:1074
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1089
+#: nova/exception.py:1080
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1093
+#: nova/exception.py:1084
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1089
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1093
 #, fuzzy, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr "instance %s: booted"
 
-#: nova/exception.py:1107
+#: nova/exception.py:1098
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1111
+#: nova/exception.py:1102
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1115
+#: nova/exception.py:1106
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1119
+#: nova/exception.py:1110
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1123
+#: nova/exception.py:1114
 #, fuzzy, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr "Could not attach image to loopback: %s"
 
-#: nova/exception.py:1127
+#: nova/exception.py:1118
 #, fuzzy, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr "Could not attach image to loopback: %s"
 
-#: nova/exception.py:1131
+#: nova/exception.py:1122
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1135
+#: nova/exception.py:1126
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1139
+#: nova/exception.py:1130
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1143
+#: nova/exception.py:1134
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1148
+#: nova/exception.py:1139
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1153
+#: nova/exception.py:1144
 #, fuzzy, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr "Going to try to terminate %s"
 
-#: nova/exception.py:1157
+#: nova/exception.py:1148
 #, fuzzy, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr "Going to try to terminate %s"
 
-#: nova/exception.py:1161
+#: nova/exception.py:1152
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1167
+#: nova/exception.py:1158
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1171
+#: nova/exception.py:1162
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1176
+#: nova/exception.py:1167
 #, fuzzy, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 
-#: nova/exception.py:1181
+#: nova/exception.py:1172
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1176
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1189
+#: nova/exception.py:1180
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1193
+#: nova/exception.py:1184
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1197
+#: nova/exception.py:1188
 #, python-format
 msgid "The service from servicegroup driver %(driver) is temporarily unavailable."
 msgstr ""
 
-#: nova/exception.py:1202
+#: nova/exception.py:1193
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1207
+#: nova/exception.py:1198
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1212
+#: nova/exception.py:1203
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1217
+#: nova/exception.py:1208
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
@@ -6366,38 +6356,38 @@ msgid ""
 "memory(host:%(avail)s <= instance:%(mem_inst)s)"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:75
+#: nova/scheduler/filter_scheduler.py:74
 #, python-format
 msgid "Attempting to build %(num_instances)d instance(s)"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:229
+#: nova/scheduler/filter_scheduler.py:228
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:246
+#: nova/scheduler/filter_scheduler.py:245
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:275
+#: nova/scheduler/filter_scheduler.py:274
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:341
+#: nova/scheduler/filter_scheduler.py:340
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:354
+#: nova/scheduler/filter_scheduler.py:353
 #, python-format
 msgid "Choosing host %(chosen_host)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:387
+#: nova/scheduler/filter_scheduler.py:386
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -10926,3 +10916,9 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Scheduler cost function %(cost_fn_str)s could not be found."
+#~ msgstr ""
+
+#~ msgid "Scheduler weight flag not found: %(flag_name)s"
+#~ msgstr ""
+
diff --git a/nova/locale/en_GB/LC_MESSAGES/nova.po b/nova/locale/en_GB/LC_MESSAGES/nova.po
index bb3a790dd..2e26edae5 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-18 00:04+0000\n"
+"POT-Creation-Date: 2013-04-19 00:03+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"
@@ -915,396 +915,386 @@ msgstr ""
 
 #: nova/exception.py:873
 #, python-format
-msgid "Scheduler cost function %(cost_fn_str)s could not be found."
-msgstr ""
-
-#: nova/exception.py:878
-#, python-format
-msgid "Scheduler weight flag not found: %(flag_name)s"
-msgstr ""
-
-#: nova/exception.py:882
-#, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:887
+#: nova/exception.py:878
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:892
+#: nova/exception.py:883
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:888
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:892
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:896
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:910
+#: nova/exception.py:901
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:914
+#: nova/exception.py:905
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:918
+#: nova/exception.py:909
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:922
+#: nova/exception.py:913
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:926
+#: nova/exception.py:917
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:930
+#: nova/exception.py:921
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:925
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:929
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:933
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:937
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:951
+#: nova/exception.py:942
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:955
+#: nova/exception.py:946
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:959
+#: nova/exception.py:950
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:963
+#: nova/exception.py:954
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:969
+#: nova/exception.py:960
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:973
+#: nova/exception.py:964
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:977
+#: nova/exception.py:968
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:981
+#: nova/exception.py:972
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:985
+#: nova/exception.py:976
 msgid "Image is larger than instance type allows"
 msgstr ""
 
-#: nova/exception.py:989
+#: nova/exception.py:980
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:993
+#: nova/exception.py:984
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:997
+#: nova/exception.py:988
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:1001
+#: nova/exception.py:992
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:1005
+#: nova/exception.py:996
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1009
+#: nova/exception.py:1000
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1007
 #, python-format
 msgid ""
 "Quota exceeded for %(overs)s: Requested %(req)s, but already used "
 "%(used)d of %(allowed)d %(resource)s"
 msgstr ""
 
-#: nova/exception.py:1021
+#: nova/exception.py:1012
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1025
+#: nova/exception.py:1016
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1029
+#: nova/exception.py:1020
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1033
+#: nova/exception.py:1024
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1037
+#: nova/exception.py:1028
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1032
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1036
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1040
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1044
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1049
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1053
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1057
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1070
+#: nova/exception.py:1061
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1075
+#: nova/exception.py:1066
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1079
+#: nova/exception.py:1070
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1083
+#: nova/exception.py:1074
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1089
+#: nova/exception.py:1080
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1093
+#: nova/exception.py:1084
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1089
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1093
 #, fuzzy, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/exception.py:1107
+#: nova/exception.py:1098
 #, fuzzy, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/exception.py:1111
+#: nova/exception.py:1102
 #, fuzzy, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/exception.py:1115
+#: nova/exception.py:1106
 #, fuzzy, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/exception.py:1119
+#: nova/exception.py:1110
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1123
+#: nova/exception.py:1114
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1127
+#: nova/exception.py:1118
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1131
+#: nova/exception.py:1122
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1135
+#: nova/exception.py:1126
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1139
+#: nova/exception.py:1130
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/exception.py:1143
+#: nova/exception.py:1134
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1148
+#: nova/exception.py:1139
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1153
+#: nova/exception.py:1144
 #, fuzzy, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr "Unable to attach volume to instance %s"
 
-#: nova/exception.py:1157
+#: nova/exception.py:1148
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1161
+#: nova/exception.py:1152
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1167
+#: nova/exception.py:1158
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1171
+#: nova/exception.py:1162
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1176
+#: nova/exception.py:1167
 #, fuzzy, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/exception.py:1181
+#: nova/exception.py:1172
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1176
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1189
+#: nova/exception.py:1180
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1193
+#: nova/exception.py:1184
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1197
+#: nova/exception.py:1188
 #, python-format
 msgid "The service from servicegroup driver %(driver) is temporarily unavailable."
 msgstr ""
 
-#: nova/exception.py:1202
+#: nova/exception.py:1193
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1207
+#: nova/exception.py:1198
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1212
+#: nova/exception.py:1203
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1217
+#: nova/exception.py:1208
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
@@ -6328,38 +6318,38 @@ msgid ""
 "memory(host:%(avail)s <= instance:%(mem_inst)s)"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:75
+#: nova/scheduler/filter_scheduler.py:74
 #, python-format
 msgid "Attempting to build %(num_instances)d instance(s)"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:229
+#: nova/scheduler/filter_scheduler.py:228
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:246
+#: nova/scheduler/filter_scheduler.py:245
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:275
+#: nova/scheduler/filter_scheduler.py:274
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:341
+#: nova/scheduler/filter_scheduler.py:340
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:354
+#: nova/scheduler/filter_scheduler.py:353
 #, python-format
 msgid "Choosing host %(chosen_host)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:387
+#: nova/scheduler/filter_scheduler.py:386
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -10868,3 +10858,9 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Scheduler cost function %(cost_fn_str)s could not be found."
+#~ msgstr ""
+
+#~ msgid "Scheduler weight flag not found: %(flag_name)s"
+#~ msgstr ""
+
diff --git a/nova/locale/en_US/LC_MESSAGES/nova.po b/nova/locale/en_US/LC_MESSAGES/nova.po
index 830bb35f0..d1dccbe48 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-18 00:04+0000\n"
+"POT-Creation-Date: 2013-04-19 00:03+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"
@@ -944,20 +944,10 @@ msgstr "Scheduler Host Filter %(filter_name)s could not be found."
 
 #: nova/exception.py:873
 #, python-format
-msgid "Scheduler cost function %(cost_fn_str)s could not be found."
-msgstr "Scheduler cost function %(cost_fn_str)s could not be found."
-
-#: nova/exception.py:878
-#, python-format
-msgid "Scheduler weight flag not found: %(flag_name)s"
-msgstr "Scheduler weight flag not found: %(flag_name)s"
-
-#: nova/exception.py:882
-#, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 
-#: nova/exception.py:887
+#: nova/exception.py:878
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
@@ -966,7 +956,7 @@ msgstr ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 
-#: nova/exception.py:892
+#: nova/exception.py:883
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
@@ -975,63 +965,63 @@ msgstr ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 
-#: nova/exception.py:897
+#: nova/exception.py:888
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr "File %(file_path)s could not be found."
 
-#: nova/exception.py:901
+#: nova/exception.py:892
 msgid "Zero files could be found."
 msgstr "Zero files could be found."
 
-#: nova/exception.py:905
+#: nova/exception.py:896
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr "Virtual switch associated with the network adapter %(adapter)s not found."
 
-#: nova/exception.py:910
+#: nova/exception.py:901
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr "Network adapter %(adapter)s could not be found."
 
-#: nova/exception.py:914
+#: nova/exception.py:905
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr "Class %(class_name)s could not be found: %(exception)s"
 
-#: nova/exception.py:918
+#: nova/exception.py:909
 msgid "Action not allowed."
 msgstr "Action not allowed."
 
-#: nova/exception.py:922
+#: nova/exception.py:913
 msgid "Rotation is not allowed for snapshots"
 msgstr "Rotation is not allowed for snapshots"
 
-#: nova/exception.py:926
+#: nova/exception.py:917
 msgid "Rotation param is required for backup image_type"
 msgstr "Rotation param is required for backup image_type"
 
-#: nova/exception.py:930
+#: nova/exception.py:921
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr "Key pair %(key_name)s already exists."
 
-#: nova/exception.py:934
+#: nova/exception.py:925
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr "Instance %(name)s already exists."
 
-#: nova/exception.py:938
+#: nova/exception.py:929
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr "Instance Type with name %(name)s already exists."
 
-#: nova/exception.py:942
+#: nova/exception.py:933
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr "Instance Type with ID %(flavor_id)s already exists."
 
-#: nova/exception.py:946
+#: nova/exception.py:937
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
@@ -1040,75 +1030,75 @@ msgstr ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 
-#: nova/exception.py:951
+#: nova/exception.py:942
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr "%(path)s is not on shared storage: %(reason)s"
 
-#: nova/exception.py:955
+#: nova/exception.py:946
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr "%(path)s is not on local storage: %(reason)s"
 
-#: nova/exception.py:959
+#: nova/exception.py:950
 msgid "Migration error"
 msgstr "Migration error"
 
-#: nova/exception.py:963
+#: nova/exception.py:954
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr "Malformed message body: %(reason)s"
 
-#: nova/exception.py:969
+#: nova/exception.py:960
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr "Could not find config at %(path)s"
 
-#: nova/exception.py:973
+#: nova/exception.py:964
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr "Could not load paste app '%(name)s' from %(path)s"
 
-#: nova/exception.py:977
+#: nova/exception.py:968
 msgid "When resizing, instances must change flavor!"
 msgstr "When resizing, instances must change flavor!"
 
-#: nova/exception.py:981
+#: nova/exception.py:972
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:985
+#: nova/exception.py:976
 msgid "Image is larger than instance type allows"
 msgstr "Image is larger than instance type allows"
 
-#: nova/exception.py:989
+#: nova/exception.py:980
 msgid "Instance type's memory is too small for requested image."
 msgstr "Instance type's memory is too small for requested image."
 
-#: nova/exception.py:993
+#: nova/exception.py:984
 msgid "Instance type's disk is too small for requested image."
 msgstr "Instance type's disk is too small for requested image."
 
-#: nova/exception.py:997
+#: nova/exception.py:988
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr "Insufficient free memory on compute node to start %(uuid)s."
 
-#: nova/exception.py:1001
+#: nova/exception.py:992
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr "Could not fetch bandwidth/cpu/disk metrics for this host."
 
-#: nova/exception.py:1005
+#: nova/exception.py:996
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr "No valid host was found. %(reason)s"
 
-#: nova/exception.py:1009
+#: nova/exception.py:1000
 msgid "Quota exceeded"
 msgstr "Quota exceeded"
 
-#: nova/exception.py:1016
+#: nova/exception.py:1007
 #, python-format
 msgid ""
 "Quota exceeded for %(overs)s: Requested %(req)s, but already used "
@@ -1117,41 +1107,41 @@ msgstr ""
 "Quota exceeded for %(overs)s: Requested %(req)s, but already used "
 "%(used)d of %(allowed)d %(resource)s"
 
-#: nova/exception.py:1021
+#: nova/exception.py:1012
 msgid "Maximum number of floating ips exceeded"
 msgstr "Maximum number of floating ips exceeded"
 
-#: nova/exception.py:1025
+#: nova/exception.py:1016
 #, fuzzy
 msgid "Maximum number of fixed ips exceeded"
 msgstr "Maximum number of floating ips exceeded"
 
-#: nova/exception.py:1029
+#: nova/exception.py:1020
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr "Maximum number of metadata items exceeds %(allowed)d"
 
-#: nova/exception.py:1033
+#: nova/exception.py:1024
 msgid "Personality file limit exceeded"
 msgstr "Personality file limit exceeded"
 
-#: nova/exception.py:1037
+#: nova/exception.py:1028
 msgid "Personality file path too long"
 msgstr "Personality file path too long"
 
-#: nova/exception.py:1041
+#: nova/exception.py:1032
 msgid "Personality file content too long"
 msgstr "Personality file content too long"
 
-#: nova/exception.py:1045
+#: nova/exception.py:1036
 msgid "Maximum number of key pairs exceeded"
 msgstr "Maximum number of key pairs exceeded"
 
-#: nova/exception.py:1049
+#: nova/exception.py:1040
 msgid "Maximum number of security groups or rules exceeded"
 msgstr "Maximum number of security groups or rules exceeded"
 
-#: nova/exception.py:1053
+#: nova/exception.py:1044
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
@@ -1160,125 +1150,125 @@ msgstr ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 
-#: nova/exception.py:1058
+#: nova/exception.py:1049
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr "Aggregate %(aggregate_id)s could not be found."
 
-#: nova/exception.py:1062
+#: nova/exception.py:1053
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr "Aggregate %(aggregate_name)s already exists."
 
-#: nova/exception.py:1066
+#: nova/exception.py:1057
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr "Aggregate %(aggregate_id)s has no host %(host)s."
 
-#: nova/exception.py:1070
+#: nova/exception.py:1061
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 
-#: nova/exception.py:1075
+#: nova/exception.py:1066
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr "Aggregate %(aggregate_id)s already has host %(host)s."
 
-#: nova/exception.py:1079
+#: nova/exception.py:1070
 msgid "Unable to create instance type"
 msgstr "Unable to create instance type"
 
-#: nova/exception.py:1083
+#: nova/exception.py:1074
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr "Failed to set admin password on %(instance)s because %(reason)s"
 
-#: nova/exception.py:1089
+#: nova/exception.py:1080
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr "Detected existing vlan with id %(vlan)d"
 
-#: nova/exception.py:1093
+#: nova/exception.py:1084
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1089
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr "Instance %(instance_id)s could not be found."
 
-#: nova/exception.py:1102
+#: nova/exception.py:1093
 #, fuzzy, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr "Console for instance %(instance_uuid)s could not be found."
 
-#: nova/exception.py:1107
+#: nova/exception.py:1098
 #, fuzzy, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr "Volume %(volume_id)s could not be found."
 
-#: nova/exception.py:1111
+#: nova/exception.py:1102
 #, fuzzy, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr "Port %(port_id)s could not be found."
 
-#: nova/exception.py:1115
+#: nova/exception.py:1106
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr "Marker %(marker)s could not be found."
 
-#: nova/exception.py:1119
+#: nova/exception.py:1110
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr "Invalid id: %(val)s (expecting \"i-...\")."
 
-#: nova/exception.py:1123
+#: nova/exception.py:1114
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr "Could not fetch image %(image_id)s"
 
-#: nova/exception.py:1127
+#: nova/exception.py:1118
 #, fuzzy, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr "Could not fetch image %(image_id)s"
 
-#: nova/exception.py:1131
+#: nova/exception.py:1122
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr "Task %(task_name)s is already running on host %(host)s"
 
-#: nova/exception.py:1135
+#: nova/exception.py:1126
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr "Task %(task_name)s is not running on host %(host)s"
 
-#: nova/exception.py:1139
+#: nova/exception.py:1130
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr "Instance %(instance_uuid)s is locked"
 
-#: nova/exception.py:1143
+#: nova/exception.py:1134
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 
-#: nova/exception.py:1148
+#: nova/exception.py:1139
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 
-#: nova/exception.py:1153
+#: nova/exception.py:1144
 #, fuzzy, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr "Failed to dealloc network for deleted instance"
 
-#: nova/exception.py:1157
+#: nova/exception.py:1148
 #, fuzzy, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr "Failed to dealloc network for deleted instance"
 
-#: nova/exception.py:1161
+#: nova/exception.py:1152
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
@@ -1287,11 +1277,11 @@ msgstr ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 
-#: nova/exception.py:1167
+#: nova/exception.py:1158
 msgid "User data needs to be valid base 64."
 msgstr "User data needs to be valid base 64."
 
-#: nova/exception.py:1171
+#: nova/exception.py:1162
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
@@ -1300,56 +1290,56 @@ msgstr ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 
-#: nova/exception.py:1176
+#: nova/exception.py:1167
 #, fuzzy, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 
-#: nova/exception.py:1181
+#: nova/exception.py:1172
 #, fuzzy, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr "Keypair %(name)s not found for user %(user_id)s"
 
-#: nova/exception.py:1185
+#: nova/exception.py:1176
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr "The CA file for %(project)s could not be found"
 
-#: nova/exception.py:1189
+#: nova/exception.py:1180
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr "The CRL file for %(project)s could not be found"
 
-#: nova/exception.py:1193
+#: nova/exception.py:1184
 #, fuzzy
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr "set_admin_password is not implemented by this driver."
 
-#: nova/exception.py:1197
+#: nova/exception.py:1188
 #, python-format
 msgid "The service from servicegroup driver %(driver) is temporarily unavailable."
 msgstr ""
 
-#: nova/exception.py:1202
+#: nova/exception.py:1193
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1207
+#: nova/exception.py:1198
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1212
+#: nova/exception.py:1203
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1217
+#: nova/exception.py:1208
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
@@ -6521,21 +6511,21 @@ msgstr ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
 "memory(host:%(avail)s <= instance:%(mem_inst)s)"
 
-#: nova/scheduler/filter_scheduler.py:75
+#: nova/scheduler/filter_scheduler.py:74
 #, python-format
 msgid "Attempting to build %(num_instances)d instance(s)"
 msgstr "Attempting to build %(num_instances)d instance(s)"
 
-#: nova/scheduler/filter_scheduler.py:229
+#: nova/scheduler/filter_scheduler.py:228
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr "Invalid value for 'scheduler_max_attempts', must be >= 1"
 
-#: nova/scheduler/filter_scheduler.py:246
+#: nova/scheduler/filter_scheduler.py:245
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:275
+#: nova/scheduler/filter_scheduler.py:274
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
@@ -6544,17 +6534,17 @@ msgstr ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 
-#: nova/scheduler/filter_scheduler.py:341
+#: nova/scheduler/filter_scheduler.py:340
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr "Filtered %(hosts)s"
 
-#: nova/scheduler/filter_scheduler.py:354
+#: nova/scheduler/filter_scheduler.py:353
 #, python-format
 msgid "Choosing host %(chosen_host)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:387
+#: nova/scheduler/filter_scheduler.py:386
 #, fuzzy, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -11241,3 +11231,9 @@ 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 "Scheduler weight flag not found: %(flag_name)s"
+#~ msgstr "Scheduler weight flag not found: %(flag_name)s"
+
diff --git a/nova/locale/es/LC_MESSAGES/nova.po b/nova/locale/es/LC_MESSAGES/nova.po
index 35a4ffc68..4d196d8ed 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-18 00:04+0000\n"
+"POT-Creation-Date: 2013-04-19 00:03+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"
@@ -924,397 +924,387 @@ msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
 #: nova/exception.py:873
-#, python-format
-msgid "Scheduler cost function %(cost_fn_str)s could not be found."
-msgstr ""
-
-#: nova/exception.py:878
-#, python-format
-msgid "Scheduler weight flag not found: %(flag_name)s"
-msgstr ""
-
-#: nova/exception.py:882
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr "La instacia %(instance_id)s no esta suspendida"
 
-#: nova/exception.py:887
+#: nova/exception.py:878
 #, fuzzy, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr "La instacia %(instance_id)s no esta suspendida"
 
-#: nova/exception.py:892
+#: nova/exception.py:883
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:888
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:892
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:896
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:910
+#: nova/exception.py:901
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:914
+#: nova/exception.py:905
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:918
+#: nova/exception.py:909
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:922
+#: nova/exception.py:913
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:926
+#: nova/exception.py:917
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:930
+#: nova/exception.py:921
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:925
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:929
 #, fuzzy, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr "el grupo %s ya existe"
 
-#: nova/exception.py:942
+#: nova/exception.py:933
 #, fuzzy, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr "el grupo %s ya existe"
 
-#: nova/exception.py:946
+#: nova/exception.py:937
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:951
+#: nova/exception.py:942
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:955
+#: nova/exception.py:946
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:959
+#: nova/exception.py:950
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:963
+#: nova/exception.py:954
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:969
+#: nova/exception.py:960
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:973
+#: nova/exception.py:964
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:977
+#: nova/exception.py:968
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:981
+#: nova/exception.py:972
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:985
+#: nova/exception.py:976
 msgid "Image is larger than instance type allows"
 msgstr ""
 
-#: nova/exception.py:989
+#: nova/exception.py:980
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:993
+#: nova/exception.py:984
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:997
+#: nova/exception.py:988
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:1001
+#: nova/exception.py:992
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:1005
+#: nova/exception.py:996
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1009
+#: nova/exception.py:1000
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1007
 #, python-format
 msgid ""
 "Quota exceeded for %(overs)s: Requested %(req)s, but already used "
 "%(used)d of %(allowed)d %(resource)s"
 msgstr ""
 
-#: nova/exception.py:1021
+#: nova/exception.py:1012
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1025
+#: nova/exception.py:1016
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1029
+#: nova/exception.py:1020
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1033
+#: nova/exception.py:1024
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1037
+#: nova/exception.py:1028
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1032
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1036
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1040
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1044
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1049
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1053
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1057
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1070
+#: nova/exception.py:1061
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1075
+#: nova/exception.py:1066
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1079
+#: nova/exception.py:1070
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1083
+#: nova/exception.py:1074
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1089
+#: nova/exception.py:1080
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1093
+#: nova/exception.py:1084
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1089
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1093
 #, fuzzy, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr "La instacia %(instance_id)s no esta suspendida"
 
-#: nova/exception.py:1107
+#: nova/exception.py:1098
 #, fuzzy, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr "La instacia %(instance_id)s no esta suspendida"
 
-#: nova/exception.py:1111
+#: nova/exception.py:1102
 #, fuzzy, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr "La instacia %(instance_id)s no esta suspendida"
 
-#: nova/exception.py:1115
+#: nova/exception.py:1106
 #, fuzzy, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr "La instacia %(instance_id)s no esta suspendida"
 
-#: nova/exception.py:1119
+#: nova/exception.py:1110
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1123
+#: nova/exception.py:1114
 #, fuzzy, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr "No se puede unir la imagen con el loopback: %s"
 
-#: nova/exception.py:1127
+#: nova/exception.py:1118
 #, fuzzy, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr "No se puede unir la imagen con el loopback: %s"
 
-#: nova/exception.py:1131
+#: nova/exception.py:1122
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1135
+#: nova/exception.py:1126
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1139
+#: nova/exception.py:1130
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr "La instacia %(instance_id)s no esta suspendida"
 
-#: nova/exception.py:1143
+#: nova/exception.py:1134
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1148
+#: nova/exception.py:1139
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1153
+#: nova/exception.py:1144
 #, fuzzy, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr "Vamos a ejecutar %s insntacias..."
 
-#: nova/exception.py:1157
+#: nova/exception.py:1148
 #, fuzzy, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr "Vamos a ejecutar %s insntacias..."
 
-#: nova/exception.py:1161
+#: nova/exception.py:1152
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1167
+#: nova/exception.py:1158
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1171
+#: nova/exception.py:1162
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1176
+#: nova/exception.py:1167
 #, fuzzy, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr "La instacia %(instance_id)s no esta suspendida"
 
-#: nova/exception.py:1181
+#: nova/exception.py:1172
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1176
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1189
+#: nova/exception.py:1180
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1193
+#: nova/exception.py:1184
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1197
+#: nova/exception.py:1188
 #, python-format
 msgid "The service from servicegroup driver %(driver) is temporarily unavailable."
 msgstr ""
 
-#: nova/exception.py:1202
+#: nova/exception.py:1193
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1207
+#: nova/exception.py:1198
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1212
+#: nova/exception.py:1203
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1217
+#: nova/exception.py:1208
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
@@ -6385,38 +6375,38 @@ msgid ""
 "memory(host:%(avail)s <= instance:%(mem_inst)s)"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:75
+#: nova/scheduler/filter_scheduler.py:74
 #, python-format
 msgid "Attempting to build %(num_instances)d instance(s)"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:229
+#: nova/scheduler/filter_scheduler.py:228
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:246
+#: nova/scheduler/filter_scheduler.py:245
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:275
+#: nova/scheduler/filter_scheduler.py:274
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:341
+#: nova/scheduler/filter_scheduler.py:340
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:354
+#: nova/scheduler/filter_scheduler.py:353
 #, python-format
 msgid "Choosing host %(chosen_host)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:387
+#: nova/scheduler/filter_scheduler.py:386
 #, fuzzy, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -10947,3 +10937,9 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Scheduler cost function %(cost_fn_str)s could not be found."
+#~ msgstr ""
+
+#~ msgid "Scheduler weight flag not found: %(flag_name)s"
+#~ msgstr ""
+
diff --git a/nova/locale/fr/LC_MESSAGES/nova.po b/nova/locale/fr/LC_MESSAGES/nova.po
index 0e84f753d..6bc0f5467 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-18 00:04+0000\n"
+"POT-Creation-Date: 2013-04-19 00:03+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"
@@ -948,23 +948,13 @@ msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr "La plannification de filtre hôte %(filter_name)s ne peut être trouvée."
 
 #: nova/exception.py:873
-#, python-format
-msgid "Scheduler cost function %(cost_fn_str)s could not be found."
-msgstr ""
-
-#: nova/exception.py:878
-#, python-format
-msgid "Scheduler weight flag not found: %(flag_name)s"
-msgstr ""
-
-#: nova/exception.py:882
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 "Le volume %(volume_id)s n'a pas de métadonnée avec la clé "
 "%(metadata_key)s."
 
-#: nova/exception.py:887
+#: nova/exception.py:878
 #, fuzzy, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
@@ -973,330 +963,330 @@ msgstr ""
 "Le volume %(volume_id)s n'a pas de métadonnée avec la clé "
 "%(metadata_key)s."
 
-#: nova/exception.py:892
+#: nova/exception.py:883
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:888
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:892
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:896
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:910
+#: nova/exception.py:901
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:914
+#: nova/exception.py:905
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:918
+#: nova/exception.py:909
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:922
+#: nova/exception.py:913
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:926
+#: nova/exception.py:917
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:930
+#: nova/exception.py:921
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:925
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:929
 #, fuzzy, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr "Le type d'instance avec le nom %(instance_type_name)s ne peut être trouvé."
 
-#: nova/exception.py:942
+#: nova/exception.py:933
 #, fuzzy, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr "L'IP dynamique %(address)s est associée."
 
-#: nova/exception.py:946
+#: nova/exception.py:937
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:951
+#: nova/exception.py:942
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:955
+#: nova/exception.py:946
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:959
+#: nova/exception.py:950
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:963
+#: nova/exception.py:954
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:969
+#: nova/exception.py:960
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:973
+#: nova/exception.py:964
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:977
+#: nova/exception.py:968
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:981
+#: nova/exception.py:972
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:985
+#: nova/exception.py:976
 msgid "Image is larger than instance type allows"
 msgstr ""
 
-#: nova/exception.py:989
+#: nova/exception.py:980
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:993
+#: nova/exception.py:984
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:997
+#: nova/exception.py:988
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:1001
+#: nova/exception.py:992
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:1005
+#: nova/exception.py:996
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1009
+#: nova/exception.py:1000
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1007
 #, python-format
 msgid ""
 "Quota exceeded for %(overs)s: Requested %(req)s, but already used "
 "%(used)d of %(allowed)d %(resource)s"
 msgstr ""
 
-#: nova/exception.py:1021
+#: nova/exception.py:1012
 #, fuzzy
 msgid "Maximum number of floating ips exceeded"
 msgstr "Aucunes IPs dynamiques existes."
 
-#: nova/exception.py:1025
+#: nova/exception.py:1016
 #, fuzzy
 msgid "Maximum number of fixed ips exceeded"
 msgstr "Aucunes IPs dynamiques existes."
 
-#: nova/exception.py:1029
+#: nova/exception.py:1020
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1033
+#: nova/exception.py:1024
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1037
+#: nova/exception.py:1028
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1032
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1036
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1040
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1044
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1049
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1053
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1057
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1070
+#: nova/exception.py:1061
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1075
+#: nova/exception.py:1066
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1079
+#: nova/exception.py:1070
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1083
+#: nova/exception.py:1074
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1089
+#: nova/exception.py:1080
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1093
+#: nova/exception.py:1084
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1089
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr "L'instance %(instance_id)s n'a pas pu être trouvée."
 
-#: nova/exception.py:1102
+#: nova/exception.py:1093
 #, fuzzy, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr "La console pour l'instance %(instance_id)s ne peut être trouvée."
 
-#: nova/exception.py:1107
+#: nova/exception.py:1098
 #, fuzzy, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr "Le volume %(volume_id)s n'a pas pu être trouvé."
 
-#: nova/exception.py:1111
+#: nova/exception.py:1102
 #, fuzzy, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr "Le snapshot %(snapshot_id)s n'a pas été trouvé."
 
-#: nova/exception.py:1115
+#: nova/exception.py:1106
 #, fuzzy, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr "L'image %(image_id)s n'a pas été trouvée."
 
-#: nova/exception.py:1119
+#: nova/exception.py:1110
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1123
+#: nova/exception.py:1114
 #, fuzzy, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr "Aucun noyau trouvé pour l'image %(image_id)s."
 
-#: nova/exception.py:1127
+#: nova/exception.py:1118
 #, fuzzy, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr "Aucun noyau trouvé pour l'image %(image_id)s."
 
-#: nova/exception.py:1131
+#: nova/exception.py:1122
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1135
+#: nova/exception.py:1126
 #, fuzzy, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr "Aucune IP dynamique trouvée pour l'hôte %(host)s."
 
-#: nova/exception.py:1139
+#: nova/exception.py:1130
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr "L'instance %(instance_id)s n'a pas pu être trouvée."
 
-#: nova/exception.py:1143
+#: nova/exception.py:1134
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1148
+#: nova/exception.py:1139
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1153
+#: nova/exception.py:1144
 #, fuzzy, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr "Va essayer d'arrêter %s"
 
-#: nova/exception.py:1157
+#: nova/exception.py:1148
 #, fuzzy, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr "Va essayer d'arrêter %s"
 
-#: nova/exception.py:1161
+#: nova/exception.py:1152
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1167
+#: nova/exception.py:1158
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1171
+#: nova/exception.py:1162
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1176
+#: nova/exception.py:1167
 #, fuzzy, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
@@ -1305,48 +1295,48 @@ msgstr ""
 "Montage du volume %(volume_id)s sur l'instance %(instance_id)s en tant "
 "que %(device)s"
 
-#: nova/exception.py:1181
+#: nova/exception.py:1172
 #, fuzzy, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr "La paire de clés %(name)s est introuvable pour l'utilisateur %(user_id)s"
 
-#: nova/exception.py:1185
+#: nova/exception.py:1176
 #, fuzzy, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr "Le quota pour le projet %(project_id)s ne peut pas être trouvé."
 
-#: nova/exception.py:1189
+#: nova/exception.py:1180
 #, fuzzy, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr "Le projet %(project_id)s n'a pas été trouvé."
 
-#: nova/exception.py:1193
+#: nova/exception.py:1184
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1197
+#: nova/exception.py:1188
 #, python-format
 msgid "The service from servicegroup driver %(driver) is temporarily unavailable."
 msgstr ""
 
-#: nova/exception.py:1202
+#: nova/exception.py:1193
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1207
+#: nova/exception.py:1198
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1212
+#: nova/exception.py:1203
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1217
+#: nova/exception.py:1208
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
@@ -6450,38 +6440,38 @@ msgid ""
 "memory(host:%(avail)s <= instance:%(mem_inst)s)"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:75
+#: nova/scheduler/filter_scheduler.py:74
 #, python-format
 msgid "Attempting to build %(num_instances)d instance(s)"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:229
+#: nova/scheduler/filter_scheduler.py:228
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:246
+#: nova/scheduler/filter_scheduler.py:245
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:275
+#: nova/scheduler/filter_scheduler.py:274
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:341
+#: nova/scheduler/filter_scheduler.py:340
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:354
+#: nova/scheduler/filter_scheduler.py:353
 #, python-format
 msgid "Choosing host %(chosen_host)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:387
+#: nova/scheduler/filter_scheduler.py:386
 #, fuzzy, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -11029,3 +11019,9 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Scheduler cost function %(cost_fn_str)s could not be found."
+#~ msgstr ""
+
+#~ msgid "Scheduler weight flag not found: %(flag_name)s"
+#~ msgstr ""
+
diff --git a/nova/locale/it/LC_MESSAGES/nova.po b/nova/locale/it/LC_MESSAGES/nova.po
index 600291d69..5fc494e7e 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-18 00:04+0000\n"
+"POT-Creation-Date: 2013-04-19 00:03+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"
@@ -913,396 +913,386 @@ msgstr ""
 
 #: nova/exception.py:873
 #, python-format
-msgid "Scheduler cost function %(cost_fn_str)s could not be found."
-msgstr ""
-
-#: nova/exception.py:878
-#, python-format
-msgid "Scheduler weight flag not found: %(flag_name)s"
-msgstr ""
-
-#: nova/exception.py:882
-#, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:887
+#: nova/exception.py:878
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:892
+#: nova/exception.py:883
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:888
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:892
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:896
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:910
+#: nova/exception.py:901
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:914
+#: nova/exception.py:905
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:918
+#: nova/exception.py:909
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:922
+#: nova/exception.py:913
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:926
+#: nova/exception.py:917
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:930
+#: nova/exception.py:921
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:925
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:929
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:933
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:937
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:951
+#: nova/exception.py:942
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:955
+#: nova/exception.py:946
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:959
+#: nova/exception.py:950
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:963
+#: nova/exception.py:954
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:969
+#: nova/exception.py:960
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:973
+#: nova/exception.py:964
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:977
+#: nova/exception.py:968
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:981
+#: nova/exception.py:972
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:985
+#: nova/exception.py:976
 msgid "Image is larger than instance type allows"
 msgstr ""
 
-#: nova/exception.py:989
+#: nova/exception.py:980
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:993
+#: nova/exception.py:984
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:997
+#: nova/exception.py:988
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:1001
+#: nova/exception.py:992
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:1005
+#: nova/exception.py:996
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1009
+#: nova/exception.py:1000
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1007
 #, python-format
 msgid ""
 "Quota exceeded for %(overs)s: Requested %(req)s, but already used "
 "%(used)d of %(allowed)d %(resource)s"
 msgstr ""
 
-#: nova/exception.py:1021
+#: nova/exception.py:1012
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1025
+#: nova/exception.py:1016
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1029
+#: nova/exception.py:1020
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1033
+#: nova/exception.py:1024
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1037
+#: nova/exception.py:1028
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1032
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1036
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1040
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1044
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1049
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1053
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1057
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1070
+#: nova/exception.py:1061
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1075
+#: nova/exception.py:1066
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1079
+#: nova/exception.py:1070
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1083
+#: nova/exception.py:1074
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1089
+#: nova/exception.py:1080
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1093
+#: nova/exception.py:1084
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1089
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1093
 #, fuzzy, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr "istanza %s: creazione snapshot in corso"
 
-#: nova/exception.py:1107
+#: nova/exception.py:1098
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1111
+#: nova/exception.py:1102
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1115
+#: nova/exception.py:1106
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1119
+#: nova/exception.py:1110
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1123
+#: nova/exception.py:1114
 #, fuzzy, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr "nessun metodo per il messaggio: %s"
 
-#: nova/exception.py:1127
+#: nova/exception.py:1118
 #, fuzzy, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr "nessun metodo per il messaggio: %s"
 
-#: nova/exception.py:1131
+#: nova/exception.py:1122
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1135
+#: nova/exception.py:1126
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1139
+#: nova/exception.py:1130
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1143
+#: nova/exception.py:1134
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1148
+#: nova/exception.py:1139
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1153
+#: nova/exception.py:1144
 #, fuzzy, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr "Impossibile montare il volume all'istanza %s"
 
-#: nova/exception.py:1157
+#: nova/exception.py:1148
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1161
+#: nova/exception.py:1152
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1167
+#: nova/exception.py:1158
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1171
+#: nova/exception.py:1162
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1176
+#: nova/exception.py:1167
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1172
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1176
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1189
+#: nova/exception.py:1180
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1193
+#: nova/exception.py:1184
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1197
+#: nova/exception.py:1188
 #, python-format
 msgid "The service from servicegroup driver %(driver) is temporarily unavailable."
 msgstr ""
 
-#: nova/exception.py:1202
+#: nova/exception.py:1193
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1207
+#: nova/exception.py:1198
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1212
+#: nova/exception.py:1203
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1217
+#: nova/exception.py:1208
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
@@ -6330,38 +6320,38 @@ msgid ""
 "memory(host:%(avail)s <= instance:%(mem_inst)s)"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:75
+#: nova/scheduler/filter_scheduler.py:74
 #, python-format
 msgid "Attempting to build %(num_instances)d instance(s)"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:229
+#: nova/scheduler/filter_scheduler.py:228
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:246
+#: nova/scheduler/filter_scheduler.py:245
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:275
+#: nova/scheduler/filter_scheduler.py:274
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:341
+#: nova/scheduler/filter_scheduler.py:340
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:354
+#: nova/scheduler/filter_scheduler.py:353
 #, python-format
 msgid "Choosing host %(chosen_host)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:387
+#: nova/scheduler/filter_scheduler.py:386
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -10866,3 +10856,9 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Scheduler cost function %(cost_fn_str)s could not be found."
+#~ msgstr ""
+
+#~ msgid "Scheduler weight flag not found: %(flag_name)s"
+#~ msgstr ""
+
diff --git a/nova/locale/ja/LC_MESSAGES/nova.po b/nova/locale/ja/LC_MESSAGES/nova.po
index 575af26ca..d335d0cff 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-18 00:04+0000\n"
+"POT-Creation-Date: 2013-04-19 00:03+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"
@@ -915,396 +915,386 @@ msgstr ""
 
 #: nova/exception.py:873
 #, python-format
-msgid "Scheduler cost function %(cost_fn_str)s could not be found."
-msgstr ""
-
-#: nova/exception.py:878
-#, python-format
-msgid "Scheduler weight flag not found: %(flag_name)s"
-msgstr ""
-
-#: nova/exception.py:882
-#, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:887
+#: nova/exception.py:878
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:892
+#: nova/exception.py:883
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:888
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:892
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:896
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:910
+#: nova/exception.py:901
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:914
+#: nova/exception.py:905
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:918
+#: nova/exception.py:909
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:922
+#: nova/exception.py:913
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:926
+#: nova/exception.py:917
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:930
+#: nova/exception.py:921
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:925
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:929
 #, fuzzy, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr "グループ %s は既に存在しています。"
 
-#: nova/exception.py:942
+#: nova/exception.py:933
 #, fuzzy, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr "グループ %s は既に存在しています。"
 
-#: nova/exception.py:946
+#: nova/exception.py:937
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:951
+#: nova/exception.py:942
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:955
+#: nova/exception.py:946
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:959
+#: nova/exception.py:950
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:963
+#: nova/exception.py:954
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:969
+#: nova/exception.py:960
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:973
+#: nova/exception.py:964
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:977
+#: nova/exception.py:968
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:981
+#: nova/exception.py:972
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:985
+#: nova/exception.py:976
 msgid "Image is larger than instance type allows"
 msgstr ""
 
-#: nova/exception.py:989
+#: nova/exception.py:980
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:993
+#: nova/exception.py:984
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:997
+#: nova/exception.py:988
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:1001
+#: nova/exception.py:992
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:1005
+#: nova/exception.py:996
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1009
+#: nova/exception.py:1000
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1007
 #, python-format
 msgid ""
 "Quota exceeded for %(overs)s: Requested %(req)s, but already used "
 "%(used)d of %(allowed)d %(resource)s"
 msgstr ""
 
-#: nova/exception.py:1021
+#: nova/exception.py:1012
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1025
+#: nova/exception.py:1016
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1029
+#: nova/exception.py:1020
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1033
+#: nova/exception.py:1024
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1037
+#: nova/exception.py:1028
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1032
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1036
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1040
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1044
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1049
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1053
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1057
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1070
+#: nova/exception.py:1061
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1075
+#: nova/exception.py:1066
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1079
+#: nova/exception.py:1070
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1083
+#: nova/exception.py:1074
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1089
+#: nova/exception.py:1080
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1093
+#: nova/exception.py:1084
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1089
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1093
 #, fuzzy, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr "インスタンス %s: 起動しました。"
 
-#: nova/exception.py:1107
+#: nova/exception.py:1098
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1111
+#: nova/exception.py:1102
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1115
+#: nova/exception.py:1106
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1119
+#: nova/exception.py:1110
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1123
+#: nova/exception.py:1114
 #, fuzzy, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr "イメージをループバック %s にアタッチできません。"
 
-#: nova/exception.py:1127
+#: nova/exception.py:1118
 #, fuzzy, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr "イメージをループバック %s にアタッチできません。"
 
-#: nova/exception.py:1131
+#: nova/exception.py:1122
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1135
+#: nova/exception.py:1126
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1139
+#: nova/exception.py:1130
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1143
+#: nova/exception.py:1134
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1148
+#: nova/exception.py:1139
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1153
+#: nova/exception.py:1144
 #, fuzzy, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr "%s を停止しようとしています"
 
-#: nova/exception.py:1157
+#: nova/exception.py:1148
 #, fuzzy, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr "%s を停止しようとしています"
 
-#: nova/exception.py:1161
+#: nova/exception.py:1152
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1167
+#: nova/exception.py:1158
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1171
+#: nova/exception.py:1162
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1176
+#: nova/exception.py:1167
 #, fuzzy, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr "ボリューム %(volume_id)s をインスタンス %(instance_id)s のデバイス %(device)s に接続"
 
-#: nova/exception.py:1181
+#: nova/exception.py:1172
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1176
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1189
+#: nova/exception.py:1180
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1193
+#: nova/exception.py:1184
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1197
+#: nova/exception.py:1188
 #, python-format
 msgid "The service from servicegroup driver %(driver) is temporarily unavailable."
 msgstr ""
 
-#: nova/exception.py:1202
+#: nova/exception.py:1193
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1207
+#: nova/exception.py:1198
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1212
+#: nova/exception.py:1203
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1217
+#: nova/exception.py:1208
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
@@ -6363,38 +6353,38 @@ msgid ""
 "memory(host:%(avail)s <= instance:%(mem_inst)s)"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:75
+#: nova/scheduler/filter_scheduler.py:74
 #, python-format
 msgid "Attempting to build %(num_instances)d instance(s)"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:229
+#: nova/scheduler/filter_scheduler.py:228
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:246
+#: nova/scheduler/filter_scheduler.py:245
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:275
+#: nova/scheduler/filter_scheduler.py:274
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:341
+#: nova/scheduler/filter_scheduler.py:340
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:354
+#: nova/scheduler/filter_scheduler.py:353
 #, python-format
 msgid "Choosing host %(chosen_host)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:387
+#: nova/scheduler/filter_scheduler.py:386
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -10914,3 +10904,9 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Scheduler cost function %(cost_fn_str)s could not be found."
+#~ msgstr ""
+
+#~ msgid "Scheduler weight flag not found: %(flag_name)s"
+#~ msgstr ""
+
diff --git a/nova/locale/ko/LC_MESSAGES/nova.po b/nova/locale/ko/LC_MESSAGES/nova.po
index 51e9acc69..ce7805375 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-18 00:04+0000\n"
+"POT-Creation-Date: 2013-04-19 00:03+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"
@@ -910,396 +910,386 @@ msgstr ""
 
 #: nova/exception.py:873
 #, python-format
-msgid "Scheduler cost function %(cost_fn_str)s could not be found."
-msgstr ""
-
-#: nova/exception.py:878
-#, python-format
-msgid "Scheduler weight flag not found: %(flag_name)s"
-msgstr ""
-
-#: nova/exception.py:882
-#, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:887
+#: nova/exception.py:878
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:892
+#: nova/exception.py:883
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:888
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:892
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:896
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:910
+#: nova/exception.py:901
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:914
+#: nova/exception.py:905
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:918
+#: nova/exception.py:909
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:922
+#: nova/exception.py:913
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:926
+#: nova/exception.py:917
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:930
+#: nova/exception.py:921
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:925
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:929
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:933
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:937
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:951
+#: nova/exception.py:942
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:955
+#: nova/exception.py:946
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:959
+#: nova/exception.py:950
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:963
+#: nova/exception.py:954
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:969
+#: nova/exception.py:960
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:973
+#: nova/exception.py:964
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:977
+#: nova/exception.py:968
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:981
+#: nova/exception.py:972
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:985
+#: nova/exception.py:976
 msgid "Image is larger than instance type allows"
 msgstr ""
 
-#: nova/exception.py:989
+#: nova/exception.py:980
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:993
+#: nova/exception.py:984
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:997
+#: nova/exception.py:988
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:1001
+#: nova/exception.py:992
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:1005
+#: nova/exception.py:996
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1009
+#: nova/exception.py:1000
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1007
 #, python-format
 msgid ""
 "Quota exceeded for %(overs)s: Requested %(req)s, but already used "
 "%(used)d of %(allowed)d %(resource)s"
 msgstr ""
 
-#: nova/exception.py:1021
+#: nova/exception.py:1012
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1025
+#: nova/exception.py:1016
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1029
+#: nova/exception.py:1020
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1033
+#: nova/exception.py:1024
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1037
+#: nova/exception.py:1028
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1032
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1036
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1040
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1044
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1049
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1053
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1057
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1070
+#: nova/exception.py:1061
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1075
+#: nova/exception.py:1066
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1079
+#: nova/exception.py:1070
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1083
+#: nova/exception.py:1074
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1089
+#: nova/exception.py:1080
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1093
+#: nova/exception.py:1084
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1089
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1093
 #, fuzzy, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr "인스턴스 %s: 스냅샷 저장중"
 
-#: nova/exception.py:1107
+#: nova/exception.py:1098
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1111
+#: nova/exception.py:1102
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1115
+#: nova/exception.py:1106
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1119
+#: nova/exception.py:1110
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1123
+#: nova/exception.py:1114
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1127
+#: nova/exception.py:1118
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1131
+#: nova/exception.py:1122
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1135
+#: nova/exception.py:1126
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1139
+#: nova/exception.py:1130
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1143
+#: nova/exception.py:1134
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1148
+#: nova/exception.py:1139
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1153
+#: nova/exception.py:1144
 #, fuzzy, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr "%s 인스턴스에 볼륨장착 할 수 없습니다"
 
-#: nova/exception.py:1157
+#: nova/exception.py:1148
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1161
+#: nova/exception.py:1152
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1167
+#: nova/exception.py:1158
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1171
+#: nova/exception.py:1162
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1176
+#: nova/exception.py:1167
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1172
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1176
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1189
+#: nova/exception.py:1180
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1193
+#: nova/exception.py:1184
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1197
+#: nova/exception.py:1188
 #, python-format
 msgid "The service from servicegroup driver %(driver) is temporarily unavailable."
 msgstr ""
 
-#: nova/exception.py:1202
+#: nova/exception.py:1193
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1207
+#: nova/exception.py:1198
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1212
+#: nova/exception.py:1203
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1217
+#: nova/exception.py:1208
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
@@ -6296,38 +6286,38 @@ msgid ""
 "memory(host:%(avail)s <= instance:%(mem_inst)s)"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:75
+#: nova/scheduler/filter_scheduler.py:74
 #, python-format
 msgid "Attempting to build %(num_instances)d instance(s)"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:229
+#: nova/scheduler/filter_scheduler.py:228
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:246
+#: nova/scheduler/filter_scheduler.py:245
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:275
+#: nova/scheduler/filter_scheduler.py:274
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:341
+#: nova/scheduler/filter_scheduler.py:340
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:354
+#: nova/scheduler/filter_scheduler.py:353
 #, python-format
 msgid "Choosing host %(chosen_host)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:387
+#: nova/scheduler/filter_scheduler.py:386
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -10819,3 +10809,9 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Scheduler cost function %(cost_fn_str)s could not be found."
+#~ msgstr ""
+
+#~ msgid "Scheduler weight flag not found: %(flag_name)s"
+#~ msgstr ""
+
diff --git a/nova/locale/nb/LC_MESSAGES/nova.po b/nova/locale/nb/LC_MESSAGES/nova.po
index ae2fd1fea..636137b08 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-18 00:04+0000\n"
+"POT-Creation-Date: 2013-04-19 00:03+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"
@@ -911,396 +911,386 @@ msgstr ""
 
 #: nova/exception.py:873
 #, python-format
-msgid "Scheduler cost function %(cost_fn_str)s could not be found."
-msgstr ""
-
-#: nova/exception.py:878
-#, python-format
-msgid "Scheduler weight flag not found: %(flag_name)s"
-msgstr ""
-
-#: nova/exception.py:882
-#, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:887
+#: nova/exception.py:878
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:892
+#: nova/exception.py:883
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:888
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:892
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:896
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:910
+#: nova/exception.py:901
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:914
+#: nova/exception.py:905
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:918
+#: nova/exception.py:909
 msgid "Action not allowed."
 msgstr "Handlingen er ikke tillatt."
 
-#: nova/exception.py:922
+#: nova/exception.py:913
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:926
+#: nova/exception.py:917
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:930
+#: nova/exception.py:921
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:925
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:929
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:933
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:937
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:951
+#: nova/exception.py:942
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:955
+#: nova/exception.py:946
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:959
+#: nova/exception.py:950
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:963
+#: nova/exception.py:954
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:969
+#: nova/exception.py:960
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:973
+#: nova/exception.py:964
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:977
+#: nova/exception.py:968
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:981
+#: nova/exception.py:972
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:985
+#: nova/exception.py:976
 msgid "Image is larger than instance type allows"
 msgstr ""
 
-#: nova/exception.py:989
+#: nova/exception.py:980
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:993
+#: nova/exception.py:984
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:997
+#: nova/exception.py:988
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:1001
+#: nova/exception.py:992
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:1005
+#: nova/exception.py:996
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1009
+#: nova/exception.py:1000
 msgid "Quota exceeded"
 msgstr "Kvote overskredet"
 
-#: nova/exception.py:1016
+#: nova/exception.py:1007
 #, python-format
 msgid ""
 "Quota exceeded for %(overs)s: Requested %(req)s, but already used "
 "%(used)d of %(allowed)d %(resource)s"
 msgstr ""
 
-#: nova/exception.py:1021
+#: nova/exception.py:1012
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1025
+#: nova/exception.py:1016
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1029
+#: nova/exception.py:1020
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1033
+#: nova/exception.py:1024
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1037
+#: nova/exception.py:1028
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1032
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1036
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1040
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1044
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1049
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1053
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1057
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1070
+#: nova/exception.py:1061
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1075
+#: nova/exception.py:1066
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1079
+#: nova/exception.py:1070
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1083
+#: nova/exception.py:1074
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1089
+#: nova/exception.py:1080
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1093
+#: nova/exception.py:1084
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1089
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1093
 #, fuzzy, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr "Tjeneste %(service_id)s ble ikke funnet."
 
-#: nova/exception.py:1107
+#: nova/exception.py:1098
 #, fuzzy, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr "Prosjekt %(project_id)s ble ikke funnet."
 
-#: nova/exception.py:1111
+#: nova/exception.py:1102
 #, fuzzy, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr "Prosjekt %(project_id)s ble ikke funnet."
 
-#: nova/exception.py:1115
+#: nova/exception.py:1106
 #, fuzzy, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr "Tjeneste %(service_id)s ble ikke funnet."
 
-#: nova/exception.py:1119
+#: nova/exception.py:1110
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1123
+#: nova/exception.py:1114
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1127
+#: nova/exception.py:1118
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1131
+#: nova/exception.py:1122
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1135
+#: nova/exception.py:1126
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1139
+#: nova/exception.py:1130
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1143
+#: nova/exception.py:1134
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1148
+#: nova/exception.py:1139
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1153
+#: nova/exception.py:1144
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1157
+#: nova/exception.py:1148
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1161
+#: nova/exception.py:1152
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1167
+#: nova/exception.py:1158
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1171
+#: nova/exception.py:1162
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1176
+#: nova/exception.py:1167
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1172
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1176
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1189
+#: nova/exception.py:1180
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1193
+#: nova/exception.py:1184
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1197
+#: nova/exception.py:1188
 #, python-format
 msgid "The service from servicegroup driver %(driver) is temporarily unavailable."
 msgstr ""
 
-#: nova/exception.py:1202
+#: nova/exception.py:1193
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1207
+#: nova/exception.py:1198
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1212
+#: nova/exception.py:1203
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1217
+#: nova/exception.py:1208
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
@@ -6296,38 +6286,38 @@ msgid ""
 "memory(host:%(avail)s <= instance:%(mem_inst)s)"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:75
+#: nova/scheduler/filter_scheduler.py:74
 #, python-format
 msgid "Attempting to build %(num_instances)d instance(s)"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:229
+#: nova/scheduler/filter_scheduler.py:228
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:246
+#: nova/scheduler/filter_scheduler.py:245
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:275
+#: nova/scheduler/filter_scheduler.py:274
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:341
+#: nova/scheduler/filter_scheduler.py:340
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:354
+#: nova/scheduler/filter_scheduler.py:353
 #, python-format
 msgid "Choosing host %(chosen_host)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:387
+#: nova/scheduler/filter_scheduler.py:386
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -10809,3 +10799,9 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Scheduler cost function %(cost_fn_str)s could not be found."
+#~ msgstr ""
+
+#~ msgid "Scheduler weight flag not found: %(flag_name)s"
+#~ msgstr ""
+
diff --git a/nova/locale/nova.pot b/nova/locale/nova.pot
index fd276ab8d..53e699e41 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.221\n"
+"Project-Id-Version: nova jenkins.nova.propose.translation.update.222\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-04-18 00:04+0000\n"
+"POT-Creation-Date: 2013-04-19 00:03+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"
@@ -904,396 +904,386 @@ msgstr ""
 
 #: nova/exception.py:873
 #, python-format
-msgid "Scheduler cost function %(cost_fn_str)s could not be found."
-msgstr ""
-
-#: nova/exception.py:878
-#, python-format
-msgid "Scheduler weight flag not found: %(flag_name)s"
-msgstr ""
-
-#: nova/exception.py:882
-#, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:887
+#: nova/exception.py:878
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:892
+#: nova/exception.py:883
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:888
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:892
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:896
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:910
+#: nova/exception.py:901
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:914
+#: nova/exception.py:905
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:918
+#: nova/exception.py:909
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:922
+#: nova/exception.py:913
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:926
+#: nova/exception.py:917
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:930
+#: nova/exception.py:921
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:925
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:929
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:933
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:937
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:951
+#: nova/exception.py:942
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:955
+#: nova/exception.py:946
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:959
+#: nova/exception.py:950
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:963
+#: nova/exception.py:954
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:969
+#: nova/exception.py:960
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:973
+#: nova/exception.py:964
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:977
+#: nova/exception.py:968
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:981
+#: nova/exception.py:972
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:985
+#: nova/exception.py:976
 msgid "Image is larger than instance type allows"
 msgstr ""
 
-#: nova/exception.py:989
+#: nova/exception.py:980
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:993
+#: nova/exception.py:984
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:997
+#: nova/exception.py:988
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:1001
+#: nova/exception.py:992
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:1005
+#: nova/exception.py:996
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1009
+#: nova/exception.py:1000
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1007
 #, python-format
 msgid ""
 "Quota exceeded for %(overs)s: Requested %(req)s, but already used "
 "%(used)d of %(allowed)d %(resource)s"
 msgstr ""
 
-#: nova/exception.py:1021
+#: nova/exception.py:1012
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1025
+#: nova/exception.py:1016
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1029
+#: nova/exception.py:1020
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1033
+#: nova/exception.py:1024
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1037
+#: nova/exception.py:1028
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1032
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1036
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1040
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1044
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1049
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1053
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1057
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1070
+#: nova/exception.py:1061
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1075
+#: nova/exception.py:1066
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1079
+#: nova/exception.py:1070
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1083
+#: nova/exception.py:1074
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1089
+#: nova/exception.py:1080
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1093
+#: nova/exception.py:1084
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1089
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1093
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1107
+#: nova/exception.py:1098
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1111
+#: nova/exception.py:1102
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1115
+#: nova/exception.py:1106
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1119
+#: nova/exception.py:1110
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1123
+#: nova/exception.py:1114
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1127
+#: nova/exception.py:1118
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1131
+#: nova/exception.py:1122
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1135
+#: nova/exception.py:1126
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1139
+#: nova/exception.py:1130
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1143
+#: nova/exception.py:1134
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1148
+#: nova/exception.py:1139
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1153
+#: nova/exception.py:1144
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1157
+#: nova/exception.py:1148
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1161
+#: nova/exception.py:1152
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1167
+#: nova/exception.py:1158
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1171
+#: nova/exception.py:1162
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1176
+#: nova/exception.py:1167
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1172
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1176
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1189
+#: nova/exception.py:1180
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1193
+#: nova/exception.py:1184
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1197
+#: nova/exception.py:1188
 #, python-format
 msgid "The service from servicegroup driver %(driver) is temporarily unavailable."
 msgstr ""
 
-#: nova/exception.py:1202
+#: nova/exception.py:1193
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1207
+#: nova/exception.py:1198
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1212
+#: nova/exception.py:1203
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1217
+#: nova/exception.py:1208
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
@@ -6277,38 +6267,38 @@ msgid ""
 "memory(host:%(avail)s <= instance:%(mem_inst)s)"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:75
+#: nova/scheduler/filter_scheduler.py:74
 #, python-format
 msgid "Attempting to build %(num_instances)d instance(s)"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:229
+#: nova/scheduler/filter_scheduler.py:228
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:246
+#: nova/scheduler/filter_scheduler.py:245
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:275
+#: nova/scheduler/filter_scheduler.py:274
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:341
+#: nova/scheduler/filter_scheduler.py:340
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:354
+#: nova/scheduler/filter_scheduler.py:353
 #, python-format
 msgid "Choosing host %(chosen_host)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:387
+#: nova/scheduler/filter_scheduler.py:386
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
diff --git a/nova/locale/pt_BR/LC_MESSAGES/nova.po b/nova/locale/pt_BR/LC_MESSAGES/nova.po
index 30d836aa6..15bdbd3f1 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-18 00:04+0000\n"
+"POT-Creation-Date: 2013-04-19 00:03+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"
@@ -915,396 +915,386 @@ msgstr ""
 
 #: nova/exception.py:873
 #, python-format
-msgid "Scheduler cost function %(cost_fn_str)s could not be found."
-msgstr ""
-
-#: nova/exception.py:878
-#, python-format
-msgid "Scheduler weight flag not found: %(flag_name)s"
-msgstr ""
-
-#: nova/exception.py:882
-#, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:887
+#: nova/exception.py:878
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:892
+#: nova/exception.py:883
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:888
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:892
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:896
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:910
+#: nova/exception.py:901
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:914
+#: nova/exception.py:905
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:918
+#: nova/exception.py:909
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:922
+#: nova/exception.py:913
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:926
+#: nova/exception.py:917
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:930
+#: nova/exception.py:921
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:925
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:929
 #, fuzzy, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr "group %s já existe"
 
-#: nova/exception.py:942
+#: nova/exception.py:933
 #, fuzzy, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr "group %s já existe"
 
-#: nova/exception.py:946
+#: nova/exception.py:937
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:951
+#: nova/exception.py:942
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:955
+#: nova/exception.py:946
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:959
+#: nova/exception.py:950
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:963
+#: nova/exception.py:954
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:969
+#: nova/exception.py:960
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:973
+#: nova/exception.py:964
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:977
+#: nova/exception.py:968
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:981
+#: nova/exception.py:972
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:985
+#: nova/exception.py:976
 msgid "Image is larger than instance type allows"
 msgstr ""
 
-#: nova/exception.py:989
+#: nova/exception.py:980
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:993
+#: nova/exception.py:984
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:997
+#: nova/exception.py:988
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:1001
+#: nova/exception.py:992
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:1005
+#: nova/exception.py:996
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1009
+#: nova/exception.py:1000
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1007
 #, python-format
 msgid ""
 "Quota exceeded for %(overs)s: Requested %(req)s, but already used "
 "%(used)d of %(allowed)d %(resource)s"
 msgstr ""
 
-#: nova/exception.py:1021
+#: nova/exception.py:1012
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1025
+#: nova/exception.py:1016
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1029
+#: nova/exception.py:1020
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1033
+#: nova/exception.py:1024
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1037
+#: nova/exception.py:1028
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1032
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1036
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1040
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1044
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1049
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1053
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1057
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1070
+#: nova/exception.py:1061
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1075
+#: nova/exception.py:1066
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1079
+#: nova/exception.py:1070
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1083
+#: nova/exception.py:1074
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1089
+#: nova/exception.py:1080
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1093
+#: nova/exception.py:1084
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1089
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1093
 #, fuzzy, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr "A instância %(instance_id)s não está executando."
 
-#: nova/exception.py:1107
+#: nova/exception.py:1098
 #, fuzzy, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr "Volume %(volume_id)s não pode ser encontrado."
 
-#: nova/exception.py:1111
+#: nova/exception.py:1102
 #, fuzzy, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr "Projeto %(project_id)s não foi encontrado."
 
-#: nova/exception.py:1115
+#: nova/exception.py:1106
 #, fuzzy, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr "Imagem %(image_id)s não foi encontrada."
 
-#: nova/exception.py:1119
+#: nova/exception.py:1110
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1123
+#: nova/exception.py:1114
 #, fuzzy, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr "Kernel não encontrado para a imagem %(image_id)s."
 
-#: nova/exception.py:1127
+#: nova/exception.py:1118
 #, fuzzy, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr "Kernel não encontrado para a imagem %(image_id)s."
 
-#: nova/exception.py:1131
+#: nova/exception.py:1122
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1135
+#: nova/exception.py:1126
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1139
+#: nova/exception.py:1130
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr "A instância %(instance_id)s não está executando."
 
-#: nova/exception.py:1143
+#: nova/exception.py:1134
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1148
+#: nova/exception.py:1139
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1153
+#: nova/exception.py:1144
 #, fuzzy, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr "Começando a terminar instâncias"
 
-#: nova/exception.py:1157
+#: nova/exception.py:1148
 #, fuzzy, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr "Começando a terminar instâncias"
 
-#: nova/exception.py:1161
+#: nova/exception.py:1152
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1167
+#: nova/exception.py:1158
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1171
+#: nova/exception.py:1162
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1176
+#: nova/exception.py:1167
 #, fuzzy, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr "A instância %(instance_id)s não está executando."
 
-#: nova/exception.py:1181
+#: nova/exception.py:1172
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1176
 #, fuzzy, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr "Projeto %(project_id)s não foi encontrado."
 
-#: nova/exception.py:1189
+#: nova/exception.py:1180
 #, fuzzy, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr "Projeto %(project_id)s não foi encontrado."
 
-#: nova/exception.py:1193
+#: nova/exception.py:1184
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1197
+#: nova/exception.py:1188
 #, python-format
 msgid "The service from servicegroup driver %(driver) is temporarily unavailable."
 msgstr ""
 
-#: nova/exception.py:1202
+#: nova/exception.py:1193
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1207
+#: nova/exception.py:1198
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1212
+#: nova/exception.py:1203
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1217
+#: nova/exception.py:1208
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
@@ -6370,38 +6360,38 @@ msgid ""
 "memory(host:%(avail)s <= instance:%(mem_inst)s)"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:75
+#: nova/scheduler/filter_scheduler.py:74
 #, python-format
 msgid "Attempting to build %(num_instances)d instance(s)"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:229
+#: nova/scheduler/filter_scheduler.py:228
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:246
+#: nova/scheduler/filter_scheduler.py:245
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:275
+#: nova/scheduler/filter_scheduler.py:274
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:341
+#: nova/scheduler/filter_scheduler.py:340
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:354
+#: nova/scheduler/filter_scheduler.py:353
 #, python-format
 msgid "Choosing host %(chosen_host)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:387
+#: nova/scheduler/filter_scheduler.py:386
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -10927,3 +10917,9 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Scheduler cost function %(cost_fn_str)s could not be found."
+#~ msgstr ""
+
+#~ msgid "Scheduler weight flag not found: %(flag_name)s"
+#~ msgstr ""
+
diff --git a/nova/locale/ru/LC_MESSAGES/nova.po b/nova/locale/ru/LC_MESSAGES/nova.po
index 6cbbfbd8b..34c191a8f 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-18 00:04+0000\n"
+"POT-Creation-Date: 2013-04-19 00:03+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"
@@ -933,405 +933,395 @@ msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
 #: nova/exception.py:873
-#, python-format
-msgid "Scheduler cost function %(cost_fn_str)s could not be found."
-msgstr ""
-
-#: nova/exception.py:878
-#, python-format
-msgid "Scheduler weight flag not found: %(flag_name)s"
-msgstr ""
-
-#: nova/exception.py:882
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr "Копия %(instance_id)s не имеет метаданных с ключом %(metadata_key)s."
 
-#: nova/exception.py:887
+#: nova/exception.py:878
 #, fuzzy, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr "Копия %(instance_id)s не имеет метаданных с ключом %(metadata_key)s."
 
-#: nova/exception.py:892
+#: nova/exception.py:883
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:888
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr "Файл %(file_path)s не может быть найден."
 
-#: nova/exception.py:901
+#: nova/exception.py:892
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:896
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 "Не найден виртуальный переключатель ассоциированный с сетевым адаптером "
 "%(adapter)s."
 
-#: nova/exception.py:910
+#: nova/exception.py:901
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr "Сетевой адаптер %(adapter)s не может быть найден."
 
-#: nova/exception.py:914
+#: nova/exception.py:905
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr "Класс %(class_name)s не найден: %(exception)s"
 
-#: nova/exception.py:918
+#: nova/exception.py:909
 msgid "Action not allowed."
 msgstr "Действие не разрешено."
 
-#: nova/exception.py:922
+#: nova/exception.py:913
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:926
+#: nova/exception.py:917
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:930
+#: nova/exception.py:921
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:925
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr "Копия %(name)s уже существует."
 
-#: nova/exception.py:938
+#: nova/exception.py:929
 #, fuzzy, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr "Тип копии %(name)s уже существует."
 
-#: nova/exception.py:942
+#: nova/exception.py:933
 #, fuzzy, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr "Тип копии %(name)s уже существует."
 
-#: nova/exception.py:946
+#: nova/exception.py:937
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:951
+#: nova/exception.py:942
 #, fuzzy, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr "%(path)s располагается на общедоступном накопителе: %(reason)s"
 
-#: nova/exception.py:955
+#: nova/exception.py:946
 #, fuzzy, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr "%(path)s располагается на общедоступном накопителе: %(reason)s"
 
-#: nova/exception.py:959
+#: nova/exception.py:950
 msgid "Migration error"
 msgstr "Ошибка перемещения"
 
-#: nova/exception.py:963
+#: nova/exception.py:954
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr "Неправильное тело сообщения: %(reason)s"
 
-#: nova/exception.py:969
+#: nova/exception.py:960
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr "Невозможно найти конфигурацию по адресу %(path)s"
 
-#: nova/exception.py:973
+#: nova/exception.py:964
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:977
+#: nova/exception.py:968
 #, fuzzy
 msgid "When resizing, instances must change flavor!"
 msgstr "При изменении размера, копии должны изменить размер!"
 
-#: nova/exception.py:981
+#: nova/exception.py:972
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:985
+#: nova/exception.py:976
 msgid "Image is larger than instance type allows"
 msgstr "Образ больше, чем допустимо для этого типа копии"
 
-#: nova/exception.py:989
+#: nova/exception.py:980
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:993
+#: nova/exception.py:984
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:997
+#: nova/exception.py:988
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr "Недостаточно памяти на узле сети compute для запуска %(uuid)s."
 
-#: nova/exception.py:1001
+#: nova/exception.py:992
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:1005
+#: nova/exception.py:996
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr "Допустимый узел не найден. %(reason)s"
 
-#: nova/exception.py:1009
+#: nova/exception.py:1000
 msgid "Quota exceeded"
 msgstr "Превышена квота"
 
-#: nova/exception.py:1016
+#: nova/exception.py:1007
 #, fuzzy, python-format
 msgid ""
 "Quota exceeded for %(overs)s: Requested %(req)s, but already used "
 "%(used)d of %(allowed)d %(resource)s"
 msgstr "Превышена квота для %(pid)s, попытка выполнить %(min_count)s копий"
 
-#: nova/exception.py:1021
+#: nova/exception.py:1012
 #, fuzzy
 msgid "Maximum number of floating ips exceeded"
 msgstr "Выбрано макс. количество узлов (%d)"
 
-#: nova/exception.py:1025
+#: nova/exception.py:1016
 #, fuzzy
 msgid "Maximum number of fixed ips exceeded"
 msgstr "Выбрано макс. количество узлов (%d)"
 
-#: nova/exception.py:1029
+#: nova/exception.py:1020
 #, fuzzy, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr "Выбрано макс. количество узлов (%d)"
 
-#: nova/exception.py:1033
+#: nova/exception.py:1024
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1037
+#: nova/exception.py:1028
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1032
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1036
 #, fuzzy
 msgid "Maximum number of key pairs exceeded"
 msgstr "Выбрано макс. количество узлов (%d)"
 
-#: nova/exception.py:1049
+#: nova/exception.py:1040
 #, fuzzy
 msgid "Maximum number of security groups or rules exceeded"
 msgstr "Выбрано макс. количество узлов (%d)"
 
-#: nova/exception.py:1053
+#: nova/exception.py:1044
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1049
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1053
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1057
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1070
+#: nova/exception.py:1061
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1075
+#: nova/exception.py:1066
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1079
+#: nova/exception.py:1070
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1083
+#: nova/exception.py:1074
 #, fuzzy, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr "Невозможно назначить пароль администратора. Копия %s не выполняется"
 
-#: nova/exception.py:1089
+#: nova/exception.py:1080
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1093
+#: nova/exception.py:1084
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1089
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr "Копия %(instance_id)s не найдена."
 
-#: nova/exception.py:1102
+#: nova/exception.py:1093
 #, fuzzy, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr "Консоль для копии %(instance_id)s не найдена."
 
-#: nova/exception.py:1107
+#: nova/exception.py:1098
 #, fuzzy, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr "Том %(volume_id)s не найден."
 
-#: nova/exception.py:1111
+#: nova/exception.py:1102
 #, fuzzy, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr "Снимок %(snapshot_id)s не может быть найден."
 
-#: nova/exception.py:1115
+#: nova/exception.py:1106
 #, fuzzy, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr "Образ %(image_id)s не найден."
 
-#: nova/exception.py:1119
+#: nova/exception.py:1110
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1123
+#: nova/exception.py:1114
 #, fuzzy, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr "Получение образа %(image)s"
 
-#: nova/exception.py:1127
+#: nova/exception.py:1118
 #, fuzzy, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr "Получение образа %(image)s"
 
-#: nova/exception.py:1131
+#: nova/exception.py:1122
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1135
+#: nova/exception.py:1126
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1139
+#: nova/exception.py:1130
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr "Копия %(instance_id)s не найдена"
 
-#: nova/exception.py:1143
+#: nova/exception.py:1134
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1148
+#: nova/exception.py:1139
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1153
+#: nova/exception.py:1144
 #, fuzzy, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr "Выполнение запуска копий"
 
-#: nova/exception.py:1157
+#: nova/exception.py:1148
 #, fuzzy, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr "Выполнение запуска копий"
 
-#: nova/exception.py:1161
+#: nova/exception.py:1152
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1167
+#: nova/exception.py:1158
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1171
+#: nova/exception.py:1162
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1176
+#: nova/exception.py:1167
 #, fuzzy, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr "Подключить том %(volume_id)s для копии %(instance_id)s на %(device)s"
 
-#: nova/exception.py:1181
+#: nova/exception.py:1172
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1176
 #, fuzzy, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr "Квота проекта %(project_id)s не найдена."
 
-#: nova/exception.py:1189
+#: nova/exception.py:1180
 #, fuzzy, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr "Проект %(project_id)s не найден."
 
-#: nova/exception.py:1193
+#: nova/exception.py:1184
 #, fuzzy
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr "set_admin_password не реализован в этой драйвере."
 
-#: nova/exception.py:1197
+#: nova/exception.py:1188
 #, python-format
 msgid "The service from servicegroup driver %(driver) is temporarily unavailable."
 msgstr ""
 
-#: nova/exception.py:1202
+#: nova/exception.py:1193
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1207
+#: nova/exception.py:1198
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1212
+#: nova/exception.py:1203
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1217
+#: nova/exception.py:1208
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
@@ -6499,38 +6489,38 @@ msgid ""
 "memory(host:%(avail)s <= instance:%(mem_inst)s)"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:75
+#: nova/scheduler/filter_scheduler.py:74
 #, python-format
 msgid "Attempting to build %(num_instances)d instance(s)"
 msgstr "Попытка собрать %(num_instances)d копию(й)"
 
-#: nova/scheduler/filter_scheduler.py:229
+#: nova/scheduler/filter_scheduler.py:228
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:246
+#: nova/scheduler/filter_scheduler.py:245
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:275
+#: nova/scheduler/filter_scheduler.py:274
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:341
+#: nova/scheduler/filter_scheduler.py:340
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr "Отфильтрованы %(hosts)s"
 
-#: nova/scheduler/filter_scheduler.py:354
+#: nova/scheduler/filter_scheduler.py:353
 #, python-format
 msgid "Choosing host %(chosen_host)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:387
+#: nova/scheduler/filter_scheduler.py:386
 #, fuzzy, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr "Невозможно переместить копию (%(instance_id)s) на текущий узел (%(host)s)."
@@ -11153,3 +11143,9 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr "Образ должен быть доступен"
 
+#~ msgid "Scheduler cost function %(cost_fn_str)s could not be found."
+#~ msgstr ""
+
+#~ msgid "Scheduler weight flag not found: %(flag_name)s"
+#~ msgstr ""
+
diff --git a/nova/locale/tl/LC_MESSAGES/nova.po b/nova/locale/tl/LC_MESSAGES/nova.po
index e53772e8d..1d30eade4 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-18 00:04+0000\n"
+"POT-Creation-Date: 2013-04-19 00:03+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"
@@ -904,396 +904,386 @@ msgstr ""
 
 #: nova/exception.py:873
 #, python-format
-msgid "Scheduler cost function %(cost_fn_str)s could not be found."
-msgstr ""
-
-#: nova/exception.py:878
-#, python-format
-msgid "Scheduler weight flag not found: %(flag_name)s"
-msgstr ""
-
-#: nova/exception.py:882
-#, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:887
+#: nova/exception.py:878
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:892
+#: nova/exception.py:883
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:888
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:892
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:896
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:910
+#: nova/exception.py:901
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:914
+#: nova/exception.py:905
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:918
+#: nova/exception.py:909
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:922
+#: nova/exception.py:913
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:926
+#: nova/exception.py:917
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:930
+#: nova/exception.py:921
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:925
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:929
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:933
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:937
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:951
+#: nova/exception.py:942
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:955
+#: nova/exception.py:946
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:959
+#: nova/exception.py:950
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:963
+#: nova/exception.py:954
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:969
+#: nova/exception.py:960
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:973
+#: nova/exception.py:964
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:977
+#: nova/exception.py:968
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:981
+#: nova/exception.py:972
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:985
+#: nova/exception.py:976
 msgid "Image is larger than instance type allows"
 msgstr ""
 
-#: nova/exception.py:989
+#: nova/exception.py:980
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:993
+#: nova/exception.py:984
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:997
+#: nova/exception.py:988
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:1001
+#: nova/exception.py:992
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:1005
+#: nova/exception.py:996
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1009
+#: nova/exception.py:1000
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1007
 #, python-format
 msgid ""
 "Quota exceeded for %(overs)s: Requested %(req)s, but already used "
 "%(used)d of %(allowed)d %(resource)s"
 msgstr ""
 
-#: nova/exception.py:1021
+#: nova/exception.py:1012
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1025
+#: nova/exception.py:1016
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1029
+#: nova/exception.py:1020
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1033
+#: nova/exception.py:1024
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1037
+#: nova/exception.py:1028
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1032
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1036
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1040
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1044
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1049
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1053
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1057
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1070
+#: nova/exception.py:1061
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1075
+#: nova/exception.py:1066
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1079
+#: nova/exception.py:1070
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1083
+#: nova/exception.py:1074
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1089
+#: nova/exception.py:1080
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1093
+#: nova/exception.py:1084
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1089
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1093
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1107
+#: nova/exception.py:1098
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1111
+#: nova/exception.py:1102
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1115
+#: nova/exception.py:1106
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1119
+#: nova/exception.py:1110
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1123
+#: nova/exception.py:1114
 #, fuzzy, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr "walang paraan para sa mensahe: %s"
 
-#: nova/exception.py:1127
+#: nova/exception.py:1118
 #, fuzzy, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr "walang paraan para sa mensahe: %s"
 
-#: nova/exception.py:1131
+#: nova/exception.py:1122
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1135
+#: nova/exception.py:1126
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1139
+#: nova/exception.py:1130
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1143
+#: nova/exception.py:1134
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1148
+#: nova/exception.py:1139
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1153
+#: nova/exception.py:1144
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1157
+#: nova/exception.py:1148
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1161
+#: nova/exception.py:1152
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1167
+#: nova/exception.py:1158
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1171
+#: nova/exception.py:1162
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1176
+#: nova/exception.py:1167
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1172
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1176
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1189
+#: nova/exception.py:1180
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1193
+#: nova/exception.py:1184
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1197
+#: nova/exception.py:1188
 #, python-format
 msgid "The service from servicegroup driver %(driver) is temporarily unavailable."
 msgstr ""
 
-#: nova/exception.py:1202
+#: nova/exception.py:1193
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1207
+#: nova/exception.py:1198
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1212
+#: nova/exception.py:1203
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1217
+#: nova/exception.py:1208
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
@@ -6278,38 +6268,38 @@ msgid ""
 "memory(host:%(avail)s <= instance:%(mem_inst)s)"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:75
+#: nova/scheduler/filter_scheduler.py:74
 #, python-format
 msgid "Attempting to build %(num_instances)d instance(s)"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:229
+#: nova/scheduler/filter_scheduler.py:228
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:246
+#: nova/scheduler/filter_scheduler.py:245
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:275
+#: nova/scheduler/filter_scheduler.py:274
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:341
+#: nova/scheduler/filter_scheduler.py:340
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:354
+#: nova/scheduler/filter_scheduler.py:353
 #, python-format
 msgid "Choosing host %(chosen_host)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:387
+#: nova/scheduler/filter_scheduler.py:386
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -10782,3 +10772,9 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Scheduler cost function %(cost_fn_str)s could not be found."
+#~ msgstr ""
+
+#~ msgid "Scheduler weight flag not found: %(flag_name)s"
+#~ msgstr ""
+
diff --git a/nova/locale/tr/LC_MESSAGES/nova.po b/nova/locale/tr/LC_MESSAGES/nova.po
index 73a1bfc01..322352ae6 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-18 00:04+0000\n"
+"POT-Creation-Date: 2013-04-19 00:03+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"
@@ -904,396 +904,386 @@ msgstr ""
 
 #: nova/exception.py:873
 #, python-format
-msgid "Scheduler cost function %(cost_fn_str)s could not be found."
-msgstr ""
-
-#: nova/exception.py:878
-#, python-format
-msgid "Scheduler weight flag not found: %(flag_name)s"
-msgstr ""
-
-#: nova/exception.py:882
-#, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:887
+#: nova/exception.py:878
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:892
+#: nova/exception.py:883
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:888
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:892
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:896
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:910
+#: nova/exception.py:901
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:914
+#: nova/exception.py:905
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:918
+#: nova/exception.py:909
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:922
+#: nova/exception.py:913
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:926
+#: nova/exception.py:917
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:930
+#: nova/exception.py:921
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:925
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:929
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:933
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:937
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:951
+#: nova/exception.py:942
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:955
+#: nova/exception.py:946
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:959
+#: nova/exception.py:950
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:963
+#: nova/exception.py:954
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:969
+#: nova/exception.py:960
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:973
+#: nova/exception.py:964
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:977
+#: nova/exception.py:968
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:981
+#: nova/exception.py:972
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:985
+#: nova/exception.py:976
 msgid "Image is larger than instance type allows"
 msgstr ""
 
-#: nova/exception.py:989
+#: nova/exception.py:980
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:993
+#: nova/exception.py:984
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:997
+#: nova/exception.py:988
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:1001
+#: nova/exception.py:992
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:1005
+#: nova/exception.py:996
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1009
+#: nova/exception.py:1000
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1007
 #, python-format
 msgid ""
 "Quota exceeded for %(overs)s: Requested %(req)s, but already used "
 "%(used)d of %(allowed)d %(resource)s"
 msgstr ""
 
-#: nova/exception.py:1021
+#: nova/exception.py:1012
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1025
+#: nova/exception.py:1016
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1029
+#: nova/exception.py:1020
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1033
+#: nova/exception.py:1024
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1037
+#: nova/exception.py:1028
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1032
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1036
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1040
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1044
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1049
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1053
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1057
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1070
+#: nova/exception.py:1061
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1075
+#: nova/exception.py:1066
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1079
+#: nova/exception.py:1070
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1083
+#: nova/exception.py:1074
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1089
+#: nova/exception.py:1080
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1093
+#: nova/exception.py:1084
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1089
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1093
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1107
+#: nova/exception.py:1098
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1111
+#: nova/exception.py:1102
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1115
+#: nova/exception.py:1106
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1119
+#: nova/exception.py:1110
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1123
+#: nova/exception.py:1114
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1127
+#: nova/exception.py:1118
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1131
+#: nova/exception.py:1122
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1135
+#: nova/exception.py:1126
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1139
+#: nova/exception.py:1130
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1143
+#: nova/exception.py:1134
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1148
+#: nova/exception.py:1139
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1153
+#: nova/exception.py:1144
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1157
+#: nova/exception.py:1148
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1161
+#: nova/exception.py:1152
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1167
+#: nova/exception.py:1158
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1171
+#: nova/exception.py:1162
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1176
+#: nova/exception.py:1167
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1172
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1176
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1189
+#: nova/exception.py:1180
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1193
+#: nova/exception.py:1184
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1197
+#: nova/exception.py:1188
 #, python-format
 msgid "The service from servicegroup driver %(driver) is temporarily unavailable."
 msgstr ""
 
-#: nova/exception.py:1202
+#: nova/exception.py:1193
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1207
+#: nova/exception.py:1198
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1212
+#: nova/exception.py:1203
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1217
+#: nova/exception.py:1208
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
@@ -6277,38 +6267,38 @@ msgid ""
 "memory(host:%(avail)s <= instance:%(mem_inst)s)"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:75
+#: nova/scheduler/filter_scheduler.py:74
 #, python-format
 msgid "Attempting to build %(num_instances)d instance(s)"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:229
+#: nova/scheduler/filter_scheduler.py:228
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:246
+#: nova/scheduler/filter_scheduler.py:245
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:275
+#: nova/scheduler/filter_scheduler.py:274
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:341
+#: nova/scheduler/filter_scheduler.py:340
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:354
+#: nova/scheduler/filter_scheduler.py:353
 #, python-format
 msgid "Choosing host %(chosen_host)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:387
+#: nova/scheduler/filter_scheduler.py:386
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -10781,3 +10771,9 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Scheduler cost function %(cost_fn_str)s could not be found."
+#~ msgstr ""
+
+#~ msgid "Scheduler weight flag not found: %(flag_name)s"
+#~ msgstr ""
+
diff --git a/nova/locale/tr_TR/LC_MESSAGES/nova.po b/nova/locale/tr_TR/LC_MESSAGES/nova.po
index 9782d35c3..c19ebd348 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-18 00:04+0000\n"
+"POT-Creation-Date: 2013-04-19 00:03+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"
@@ -930,27 +930,17 @@ msgstr "%(filter_name)s zamanlayıcı sunucu filtresi bulunamadı."
 
 #: nova/exception.py:873
 #, python-format
-msgid "Scheduler cost function %(cost_fn_str)s could not be found."
-msgstr "%(cost_fn_str)s zamanlayıcı maliyet fonksiyonu bulunamadı."
-
-#: nova/exception.py:878
-#, python-format
-msgid "Scheduler weight flag not found: %(flag_name)s"
-msgstr "Zamanlayıcı yük bayrağı bulunamadı: %(flag_name)s"
-
-#: nova/exception.py:882
-#, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:887
+#: nova/exception.py:878
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:892
+#: nova/exception.py:883
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
@@ -959,373 +949,373 @@ msgstr ""
 "%(instance_type_id)s örnek türü %(extra_specs_key)s anahtarı ile ekstra "
 "özelliklere sahip değil."
 
-#: nova/exception.py:897
+#: nova/exception.py:888
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr "%(file_path)s dosyası bulunamadı."
 
-#: nova/exception.py:901
+#: nova/exception.py:892
 msgid "Zero files could be found."
 msgstr "Hiç dosya bulunamadı."
 
-#: nova/exception.py:905
+#: nova/exception.py:896
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 "%(adapter)s ağ bağdaştırıcısı ile ilişkilendirilen sanal anahtar "
 "bulunamadı."
 
-#: nova/exception.py:910
+#: nova/exception.py:901
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr "%(adapter)s ağ bağdaştırıcısı bulunamadı."
 
-#: nova/exception.py:914
+#: nova/exception.py:905
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr "%(class_name)s sınıfı bulunamadı: %(exception)s"
 
-#: nova/exception.py:918
+#: nova/exception.py:909
 msgid "Action not allowed."
 msgstr "İşlem için izin verilmiyor."
 
-#: nova/exception.py:922
+#: nova/exception.py:913
 msgid "Rotation is not allowed for snapshots"
 msgstr "Önceki sistem geri görüntüsüne dönmek için izin verilmiyor."
 
-#: nova/exception.py:926
+#: nova/exception.py:917
 msgid "Rotation param is required for backup image_type"
 msgstr "Yedek imajı geri dönüş parametresi gerekli"
 
-#: nova/exception.py:930
+#: nova/exception.py:921
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr "%(key_name)s anahtar çifti zaten var."
 
-#: nova/exception.py:934
+#: nova/exception.py:925
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr "%(name)s örneği zaten var."
 
-#: nova/exception.py:938
+#: nova/exception.py:929
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:933
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:937
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:951
+#: nova/exception.py:942
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:955
+#: nova/exception.py:946
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:959
+#: nova/exception.py:950
 msgid "Migration error"
 msgstr "Geçiş hatası."
 
-#: nova/exception.py:963
+#: nova/exception.py:954
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr "Hatalı biçimlendirilmiş mesaj gövdesi: %(reason)s"
 
-#: nova/exception.py:969
+#: nova/exception.py:960
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr "%(path)s'deki yapılandırma bulunamadı"
 
-#: nova/exception.py:973
+#: nova/exception.py:964
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:977
+#: nova/exception.py:968
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:981
+#: nova/exception.py:972
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:985
+#: nova/exception.py:976
 msgid "Image is larger than instance type allows"
 msgstr "İmaj dosyası verilen örneğin müsade ettiği türden daha büyük"
 
-#: nova/exception.py:989
+#: nova/exception.py:980
 msgid "Instance type's memory is too small for requested image."
 msgstr "Örnek türün belleği istenilen imaj dosyası için çok küçük."
 
-#: nova/exception.py:993
+#: nova/exception.py:984
 msgid "Instance type's disk is too small for requested image."
 msgstr "Örnek türünün diski istenilen imaj dosyası için çok küçük."
 
-#: nova/exception.py:997
+#: nova/exception.py:988
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr "%(uuid)s hesaplama düğümü başlatmada yetersiz boş hafıza."
 
-#: nova/exception.py:1001
+#: nova/exception.py:992
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr "Bu sunucu için bant genişliği/cpu/disk ölçümleri alınamadı."
 
-#: nova/exception.py:1005
+#: nova/exception.py:996
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr "Geçerli bir sunucu bulunamadı: %(reason)s"
 
-#: nova/exception.py:1009
+#: nova/exception.py:1000
 msgid "Quota exceeded"
 msgstr "Kota aşıldı"
 
-#: nova/exception.py:1016
+#: nova/exception.py:1007
 #, python-format
 msgid ""
 "Quota exceeded for %(overs)s: Requested %(req)s, but already used "
 "%(used)d of %(allowed)d %(resource)s"
 msgstr ""
 
-#: nova/exception.py:1021
+#: nova/exception.py:1012
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1025
+#: nova/exception.py:1016
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1029
+#: nova/exception.py:1020
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1033
+#: nova/exception.py:1024
 msgid "Personality file limit exceeded"
 msgstr "Kişisel dosya limiti aşıldı"
 
-#: nova/exception.py:1037
+#: nova/exception.py:1028
 msgid "Personality file path too long"
 msgstr "Kişisel dosya yolu çok uzun"
 
-#: nova/exception.py:1041
+#: nova/exception.py:1032
 msgid "Personality file content too long"
 msgstr "Kişisel dosya içeriği çok uzun"
 
-#: nova/exception.py:1045
+#: nova/exception.py:1036
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1040
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1044
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1049
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr "%(aggregate_id)s kümesi bulunamadı."
 
-#: nova/exception.py:1062
+#: nova/exception.py:1053
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr "%(aggregate_name)s kümesi zaten var."
 
-#: nova/exception.py:1066
+#: nova/exception.py:1057
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr "%(aggregate_id)s kümesi %(host)s sunucusuna sahip değil."
 
-#: nova/exception.py:1070
+#: nova/exception.py:1061
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 "%(aggregate_id)s kümesi %(metadata_key)s. anahtarı ile hiç metadata'sı "
 "yok."
 
-#: nova/exception.py:1075
+#: nova/exception.py:1066
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr "%(aggregate_id)s kümesi zaten%(host)s sunucusuna sahip."
 
-#: nova/exception.py:1079
+#: nova/exception.py:1070
 msgid "Unable to create instance type"
 msgstr "Örnek tür oluşturulamıyor."
 
-#: nova/exception.py:1083
+#: nova/exception.py:1074
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1089
+#: nova/exception.py:1080
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1093
+#: nova/exception.py:1084
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1089
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr "%(instance_id)s örneği bulunamadı."
 
-#: nova/exception.py:1102
+#: nova/exception.py:1093
 #, fuzzy, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr "%(instance_id)s örneği bulunamadı."
 
-#: nova/exception.py:1107
+#: nova/exception.py:1098
 #, fuzzy, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr "%(volume_id)s bölümü bulunamadı."
 
-#: nova/exception.py:1111
+#: nova/exception.py:1102
 #, fuzzy, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr "%(project_id)s projesi bulunamadı."
 
-#: nova/exception.py:1115
+#: nova/exception.py:1106
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1119
+#: nova/exception.py:1110
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1123
+#: nova/exception.py:1114
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1127
+#: nova/exception.py:1118
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1131
+#: nova/exception.py:1122
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1135
+#: nova/exception.py:1126
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1139
+#: nova/exception.py:1130
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1143
+#: nova/exception.py:1134
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1148
+#: nova/exception.py:1139
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1153
+#: nova/exception.py:1144
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1157
+#: nova/exception.py:1148
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1161
+#: nova/exception.py:1152
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1167
+#: nova/exception.py:1158
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1171
+#: nova/exception.py:1162
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1176
+#: nova/exception.py:1167
 #, fuzzy, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr "%(device)s'daki %(instance_id)s örneğine %(volume_id)s birimini bağla"
 
-#: nova/exception.py:1181
+#: nova/exception.py:1172
 #, fuzzy, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr "%(user_id)s kullanıcısı için %(name)s anahtar çifti bulunamadı"
 
-#: nova/exception.py:1185
+#: nova/exception.py:1176
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1189
+#: nova/exception.py:1180
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1193
+#: nova/exception.py:1184
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1197
+#: nova/exception.py:1188
 #, python-format
 msgid "The service from servicegroup driver %(driver) is temporarily unavailable."
 msgstr ""
 
-#: nova/exception.py:1202
+#: nova/exception.py:1193
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1207
+#: nova/exception.py:1198
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1212
+#: nova/exception.py:1203
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1217
+#: nova/exception.py:1208
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
@@ -6386,38 +6376,38 @@ msgid ""
 "memory(host:%(avail)s <= instance:%(mem_inst)s)"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:75
+#: nova/scheduler/filter_scheduler.py:74
 #, python-format
 msgid "Attempting to build %(num_instances)d instance(s)"
 msgstr "%(num_instances)d örnek(leri) kurulmaya çalışılıyor."
 
-#: nova/scheduler/filter_scheduler.py:229
+#: nova/scheduler/filter_scheduler.py:228
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:246
+#: nova/scheduler/filter_scheduler.py:245
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:275
+#: nova/scheduler/filter_scheduler.py:274
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:341
+#: nova/scheduler/filter_scheduler.py:340
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr "%(hosts)s filtrelendi"
 
-#: nova/scheduler/filter_scheduler.py:354
+#: nova/scheduler/filter_scheduler.py:353
 #, python-format
 msgid "Choosing host %(chosen_host)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:387
+#: nova/scheduler/filter_scheduler.py:386
 #, fuzzy, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr "Mevcut (%(host)s) sunucusundan (%(instance_id)s) örneği geçirilemez."
@@ -10927,3 +10917,9 @@ 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 "Scheduler weight flag not found: %(flag_name)s"
+#~ msgstr "Zamanlayıcı yük bayrağı bulunamadı: %(flag_name)s"
+
diff --git a/nova/locale/uk/LC_MESSAGES/nova.po b/nova/locale/uk/LC_MESSAGES/nova.po
index 7a419eb85..d25b7a29e 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-18 00:04+0000\n"
+"POT-Creation-Date: 2013-04-19 00:03+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"
@@ -905,396 +905,386 @@ msgstr ""
 
 #: nova/exception.py:873
 #, python-format
-msgid "Scheduler cost function %(cost_fn_str)s could not be found."
-msgstr ""
-
-#: nova/exception.py:878
-#, python-format
-msgid "Scheduler weight flag not found: %(flag_name)s"
-msgstr ""
-
-#: nova/exception.py:882
-#, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:887
+#: nova/exception.py:878
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:892
+#: nova/exception.py:883
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:888
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:892
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:896
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:910
+#: nova/exception.py:901
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:914
+#: nova/exception.py:905
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:918
+#: nova/exception.py:909
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:922
+#: nova/exception.py:913
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:926
+#: nova/exception.py:917
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:930
+#: nova/exception.py:921
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:925
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:929
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:933
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:937
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:951
+#: nova/exception.py:942
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:955
+#: nova/exception.py:946
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:959
+#: nova/exception.py:950
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:963
+#: nova/exception.py:954
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:969
+#: nova/exception.py:960
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:973
+#: nova/exception.py:964
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:977
+#: nova/exception.py:968
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:981
+#: nova/exception.py:972
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:985
+#: nova/exception.py:976
 msgid "Image is larger than instance type allows"
 msgstr ""
 
-#: nova/exception.py:989
+#: nova/exception.py:980
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:993
+#: nova/exception.py:984
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:997
+#: nova/exception.py:988
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:1001
+#: nova/exception.py:992
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:1005
+#: nova/exception.py:996
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1009
+#: nova/exception.py:1000
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1007
 #, python-format
 msgid ""
 "Quota exceeded for %(overs)s: Requested %(req)s, but already used "
 "%(used)d of %(allowed)d %(resource)s"
 msgstr ""
 
-#: nova/exception.py:1021
+#: nova/exception.py:1012
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1025
+#: nova/exception.py:1016
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1029
+#: nova/exception.py:1020
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1033
+#: nova/exception.py:1024
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1037
+#: nova/exception.py:1028
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1032
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1036
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1040
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1044
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1049
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1053
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1057
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1070
+#: nova/exception.py:1061
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1075
+#: nova/exception.py:1066
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1079
+#: nova/exception.py:1070
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1083
+#: nova/exception.py:1074
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1089
+#: nova/exception.py:1080
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1093
+#: nova/exception.py:1084
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1089
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1093
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1107
+#: nova/exception.py:1098
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1111
+#: nova/exception.py:1102
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1115
+#: nova/exception.py:1106
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1119
+#: nova/exception.py:1110
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1123
+#: nova/exception.py:1114
 #, fuzzy, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr "без порядку для повідомлень: %s"
 
-#: nova/exception.py:1127
+#: nova/exception.py:1118
 #, fuzzy, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr "без порядку для повідомлень: %s"
 
-#: nova/exception.py:1131
+#: nova/exception.py:1122
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1135
+#: nova/exception.py:1126
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1139
+#: nova/exception.py:1130
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1143
+#: nova/exception.py:1134
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1148
+#: nova/exception.py:1139
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1153
+#: nova/exception.py:1144
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1157
+#: nova/exception.py:1148
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1161
+#: nova/exception.py:1152
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1167
+#: nova/exception.py:1158
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1171
+#: nova/exception.py:1162
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1176
+#: nova/exception.py:1167
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1172
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1176
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1189
+#: nova/exception.py:1180
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1193
+#: nova/exception.py:1184
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1197
+#: nova/exception.py:1188
 #, python-format
 msgid "The service from servicegroup driver %(driver) is temporarily unavailable."
 msgstr ""
 
-#: nova/exception.py:1202
+#: nova/exception.py:1193
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1207
+#: nova/exception.py:1198
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1212
+#: nova/exception.py:1203
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1217
+#: nova/exception.py:1208
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
@@ -6284,38 +6274,38 @@ msgid ""
 "memory(host:%(avail)s <= instance:%(mem_inst)s)"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:75
+#: nova/scheduler/filter_scheduler.py:74
 #, python-format
 msgid "Attempting to build %(num_instances)d instance(s)"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:229
+#: nova/scheduler/filter_scheduler.py:228
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:246
+#: nova/scheduler/filter_scheduler.py:245
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:275
+#: nova/scheduler/filter_scheduler.py:274
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:341
+#: nova/scheduler/filter_scheduler.py:340
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:354
+#: nova/scheduler/filter_scheduler.py:353
 #, python-format
 msgid "Choosing host %(chosen_host)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:387
+#: nova/scheduler/filter_scheduler.py:386
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -10789,3 +10779,9 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Scheduler cost function %(cost_fn_str)s could not be found."
+#~ msgstr ""
+
+#~ msgid "Scheduler weight flag not found: %(flag_name)s"
+#~ msgstr ""
+
diff --git a/nova/locale/zh_CN/LC_MESSAGES/nova.po b/nova/locale/zh_CN/LC_MESSAGES/nova.po
index 5c48e9596..97313e4c4 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-18 00:04+0000\n"
+"POT-Creation-Date: 2013-04-19 00:03+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"
@@ -919,403 +919,393 @@ msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr "调度器主机过滤器 %(filter_name)s 没有找到。"
 
 #: nova/exception.py:873
-#, python-format
-msgid "Scheduler cost function %(cost_fn_str)s could not be found."
-msgstr "调度器的成本函数 %(cost_fn_str)s 没有找到。"
-
-#: nova/exception.py:878
-#, python-format
-msgid "Scheduler weight flag not found: %(flag_name)s"
-msgstr "未找到调度器的权重标记：%(flag_name)s"
-
-#: nova/exception.py:882
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr "实例 %(instance_id)s 没有键为 %(metadata_key)s 的元数据。"
 
-#: nova/exception.py:887
+#: nova/exception.py:878
 #, fuzzy, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr "实例 %(instance_id)s 没有键为 %(metadata_key)s 的元数据。"
 
-#: nova/exception.py:892
+#: nova/exception.py:883
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr "实例类型 %(instance_type_id)s 没有额外的 键为%(extra_specs_key)s 的规格说明。"
 
-#: nova/exception.py:897
+#: nova/exception.py:888
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr "找不到文件 %(file_path)s。"
 
-#: nova/exception.py:901
+#: nova/exception.py:892
 msgid "Zero files could be found."
 msgstr "没找到文件"
 
-#: nova/exception.py:905
+#: nova/exception.py:896
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr "未找到与网络适配器 %(adapter)s 关联的虚拟交换机。"
 
-#: nova/exception.py:910
+#: nova/exception.py:901
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr "未找到网络适配器 %(adapter)s。"
 
-#: nova/exception.py:914
+#: nova/exception.py:905
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr "找不到类 %(class_name)s ：异常 %(exception)s"
 
-#: nova/exception.py:918
+#: nova/exception.py:909
 msgid "Action not allowed."
 msgstr "操作不允许。"
 
-#: nova/exception.py:922
+#: nova/exception.py:913
 msgid "Rotation is not allowed for snapshots"
 msgstr "快照不允许循环。"
 
-#: nova/exception.py:926
+#: nova/exception.py:917
 msgid "Rotation param is required for backup image_type"
 msgstr "备份 image_type 要求循环参数。"
 
-#: nova/exception.py:930
+#: nova/exception.py:921
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr "密钥对 %(key_name)s 已经存在。"
 
-#: nova/exception.py:934
+#: nova/exception.py:925
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr "实例 %(name)s 已经存在。"
 
-#: nova/exception.py:938
+#: nova/exception.py:929
 #, fuzzy, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr "实例类型 %(name)s 已经存在。"
 
-#: nova/exception.py:942
+#: nova/exception.py:933
 #, fuzzy, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr "实例类型 %(name)s 已经存在。"
 
-#: nova/exception.py:946
+#: nova/exception.py:937
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:951
+#: nova/exception.py:942
 #, fuzzy, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr "%(path)s 在共享存储上：%(reason)s"
 
-#: nova/exception.py:955
+#: nova/exception.py:946
 #, fuzzy, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr "%(path)s 在共享存储上：%(reason)s"
 
-#: nova/exception.py:959
+#: nova/exception.py:950
 msgid "Migration error"
 msgstr "迁移错误"
 
-#: nova/exception.py:963
+#: nova/exception.py:954
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr "错误格式的消息体： %(reason)s"
 
-#: nova/exception.py:969
+#: nova/exception.py:960
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr "在 %(path)s 找不到配置文件。"
 
-#: nova/exception.py:973
+#: nova/exception.py:964
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr "无法从路径 %(path)s 中加载应用 '%(name)s'"
 
-#: nova/exception.py:977
+#: nova/exception.py:968
 #, fuzzy
 msgid "When resizing, instances must change flavor!"
 msgstr "调整时实例的大小必须要发生变化。"
 
-#: nova/exception.py:981
+#: nova/exception.py:972
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:985
+#: nova/exception.py:976
 msgid "Image is larger than instance type allows"
 msgstr "镜像比实例类型所允许的大。"
 
-#: nova/exception.py:989
+#: nova/exception.py:980
 msgid "Instance type's memory is too small for requested image."
 msgstr "实例类型的内存对于所请求的镜像太小。"
 
-#: nova/exception.py:993
+#: nova/exception.py:984
 msgid "Instance type's disk is too small for requested image."
 msgstr "实例类型的磁盘对于所请求的镜像太小。"
 
-#: nova/exception.py:997
+#: nova/exception.py:988
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr "没有足够的可用内存来启动计算节点  %(uuid)s。"
 
-#: nova/exception.py:1001
+#: nova/exception.py:992
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr "无法获取此主机的带宽、CPU和磁盘指标。"
 
-#: nova/exception.py:1005
+#: nova/exception.py:996
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr "找不到有效主机，原因是 %(reason)s。"
 
-#: nova/exception.py:1009
+#: nova/exception.py:1000
 msgid "Quota exceeded"
 msgstr "超出配额"
 
-#: nova/exception.py:1016
+#: nova/exception.py:1007
 #, fuzzy, python-format
 msgid ""
 "Quota exceeded for %(overs)s: Requested %(req)s, but already used "
 "%(used)d of %(allowed)d %(resource)s"
 msgstr "%(pid)s 已经超过配额，试图运行 %(min_count)s 个实例"
 
-#: nova/exception.py:1021
+#: nova/exception.py:1012
 #, fuzzy
 msgid "Maximum number of floating ips exceeded"
 msgstr "所选择主机的最大数目(%d)"
 
-#: nova/exception.py:1025
+#: nova/exception.py:1016
 #, fuzzy
 msgid "Maximum number of fixed ips exceeded"
 msgstr "所选择主机的最大数目(%d)"
 
-#: nova/exception.py:1029
+#: nova/exception.py:1020
 #, fuzzy, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr "所选择主机的最大数目(%d)"
 
-#: nova/exception.py:1033
+#: nova/exception.py:1024
 msgid "Personality file limit exceeded"
 msgstr "超过个性化文件限制"
 
-#: nova/exception.py:1037
+#: nova/exception.py:1028
 msgid "Personality file path too long"
 msgstr "个性化文件路径太长"
 
-#: nova/exception.py:1041
+#: nova/exception.py:1032
 msgid "Personality file content too long"
 msgstr "个性化文件内容太长"
 
-#: nova/exception.py:1045
+#: nova/exception.py:1036
 #, fuzzy
 msgid "Maximum number of key pairs exceeded"
 msgstr "所选择主机的最大数目(%d)"
 
-#: nova/exception.py:1049
+#: nova/exception.py:1040
 #, fuzzy
 msgid "Maximum number of security groups or rules exceeded"
 msgstr "所选择主机的最大数目(%d)"
 
-#: nova/exception.py:1053
+#: nova/exception.py:1044
 #, fuzzy, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr "聚合 %(aggregate_id)s没有主机 %(host)s。"
 
-#: nova/exception.py:1058
+#: nova/exception.py:1049
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr "找不到聚合 %(aggregate_id)s。"
 
-#: nova/exception.py:1062
+#: nova/exception.py:1053
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr "聚合 %(aggregate_name)s 已经存在。"
 
-#: nova/exception.py:1066
+#: nova/exception.py:1057
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr "聚合 %(aggregate_id)s没有主机 %(host)s。"
 
-#: nova/exception.py:1070
+#: nova/exception.py:1061
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr "聚合 %(aggregate_id)s 没有键为 %(metadata_key)s 的元数据。"
 
-#: nova/exception.py:1075
+#: nova/exception.py:1066
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr "聚合 %(aggregate_id)s已经有主机 %(host)s。"
 
-#: nova/exception.py:1079
+#: nova/exception.py:1070
 msgid "Unable to create instance type"
 msgstr "无法创建实例类型。"
 
-#: nova/exception.py:1083
+#: nova/exception.py:1074
 #, fuzzy, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr "设置管理员密码失败。实例 %s 没有运行"
 
-#: nova/exception.py:1089
+#: nova/exception.py:1080
 #, fuzzy, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr "检测到已存在的id为%(vlan) vlan"
 
-#: nova/exception.py:1093
+#: nova/exception.py:1084
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1089
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr "实例 %(instance_id)s 没有找到。"
 
-#: nova/exception.py:1102
+#: nova/exception.py:1093
 #, fuzzy, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr "没有为实例 %(instance_id)s 找到控制台。"
 
-#: nova/exception.py:1107
+#: nova/exception.py:1098
 #, fuzzy, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr "卷 %(volume_id)s 没有找到。"
 
-#: nova/exception.py:1111
+#: nova/exception.py:1102
 #, fuzzy, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr "快照 %(snapshot_id)s 没有找到。"
 
-#: nova/exception.py:1115
+#: nova/exception.py:1106
 #, fuzzy, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr "镜像 %(image_id)s 没有找到。"
 
-#: nova/exception.py:1119
+#: nova/exception.py:1110
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1123
+#: nova/exception.py:1114
 #, fuzzy, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr "获取镜像 %(image)s"
 
-#: nova/exception.py:1127
+#: nova/exception.py:1118
 #, fuzzy, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr "获取镜像 %(image)s"
 
-#: nova/exception.py:1131
+#: nova/exception.py:1122
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1135
+#: nova/exception.py:1126
 #, fuzzy, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr "没有为主机 %(host)s 找到浮动IP。"
 
-#: nova/exception.py:1139
+#: nova/exception.py:1130
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr "没有找到实例 %(instance_id)s"
 
-#: nova/exception.py:1143
+#: nova/exception.py:1134
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1148
+#: nova/exception.py:1139
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1153
+#: nova/exception.py:1144
 #, fuzzy, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr "释放实例的网络"
 
-#: nova/exception.py:1157
+#: nova/exception.py:1148
 #, fuzzy, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr "释放实例的网络"
 
-#: nova/exception.py:1161
+#: nova/exception.py:1152
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1167
+#: nova/exception.py:1158
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1171
+#: nova/exception.py:1162
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1176
+#: nova/exception.py:1167
 #, fuzzy, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr "把卷 %(volume_id)s 附加到实例 %(instance_id)s 上位置在 %(device)s"
 
-#: nova/exception.py:1181
+#: nova/exception.py:1172
 #, fuzzy, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr "密钥对 %(name)s 没有为用户 %(user_id)s 找到。"
 
-#: nova/exception.py:1185
+#: nova/exception.py:1176
 #, fuzzy, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr "没有为项目 %(project_id)s 找到配额。"
 
-#: nova/exception.py:1189
+#: nova/exception.py:1180
 #, fuzzy, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr "项目 %(project_id)s 没有找到。"
 
-#: nova/exception.py:1193
+#: nova/exception.py:1184
 #, fuzzy
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr "该驱动不能执行set_admin_password。"
 
-#: nova/exception.py:1197
+#: nova/exception.py:1188
 #, python-format
 msgid "The service from servicegroup driver %(driver) is temporarily unavailable."
 msgstr ""
 
-#: nova/exception.py:1202
+#: nova/exception.py:1193
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1207
+#: nova/exception.py:1198
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1212
+#: nova/exception.py:1203
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1217
+#: nova/exception.py:1208
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
@@ -6463,38 +6453,38 @@ msgid ""
 "memory(host:%(avail)s <= instance:%(mem_inst)s)"
 msgstr "无法迁移 %(instance_id)s 到 %(dest)s 上：缺少内存(主机：%(avail)s <= 实例：%(mem_inst)s)"
 
-#: nova/scheduler/filter_scheduler.py:75
+#: nova/scheduler/filter_scheduler.py:74
 #, python-format
 msgid "Attempting to build %(num_instances)d instance(s)"
 msgstr "尝试创建 %(num_instances)d 个实例"
 
-#: nova/scheduler/filter_scheduler.py:229
+#: nova/scheduler/filter_scheduler.py:228
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:246
+#: nova/scheduler/filter_scheduler.py:245
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:275
+#: nova/scheduler/filter_scheduler.py:274
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:341
+#: nova/scheduler/filter_scheduler.py:340
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr "过滤掉的主机 %(hosts)s"
 
-#: nova/scheduler/filter_scheduler.py:354
+#: nova/scheduler/filter_scheduler.py:353
 #, python-format
 msgid "Choosing host %(chosen_host)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:387
+#: nova/scheduler/filter_scheduler.py:386
 #, fuzzy, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr "无法迁移 %(instance_id)s 到 %(dest)s 上：缺少内存(主机：%(avail)s <= 实例：%(mem_inst)s)"
@@ -11126,3 +11116,9 @@ 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 "Scheduler weight flag not found: %(flag_name)s"
+#~ msgstr "未找到调度器的权重标记：%(flag_name)s"
+
diff --git a/nova/locale/zh_TW/LC_MESSAGES/nova.po b/nova/locale/zh_TW/LC_MESSAGES/nova.po
index 855c16c33..9d2d9414d 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-18 00:04+0000\n"
+"POT-Creation-Date: 2013-04-19 00:03+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"
@@ -910,396 +910,386 @@ msgstr ""
 
 #: nova/exception.py:873
 #, python-format
-msgid "Scheduler cost function %(cost_fn_str)s could not be found."
-msgstr ""
-
-#: nova/exception.py:878
-#, python-format
-msgid "Scheduler weight flag not found: %(flag_name)s"
-msgstr ""
-
-#: nova/exception.py:882
-#, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:887
+#: nova/exception.py:878
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:892
+#: nova/exception.py:883
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:888
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:892
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:896
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:910
+#: nova/exception.py:901
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:914
+#: nova/exception.py:905
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:918
+#: nova/exception.py:909
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:922
+#: nova/exception.py:913
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:926
+#: nova/exception.py:917
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:930
+#: nova/exception.py:921
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:925
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:929
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:933
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:937
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:951
+#: nova/exception.py:942
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:955
+#: nova/exception.py:946
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:959
+#: nova/exception.py:950
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:963
+#: nova/exception.py:954
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:969
+#: nova/exception.py:960
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:973
+#: nova/exception.py:964
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:977
+#: nova/exception.py:968
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:981
+#: nova/exception.py:972
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:985
+#: nova/exception.py:976
 msgid "Image is larger than instance type allows"
 msgstr ""
 
-#: nova/exception.py:989
+#: nova/exception.py:980
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:993
+#: nova/exception.py:984
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:997
+#: nova/exception.py:988
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:1001
+#: nova/exception.py:992
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:1005
+#: nova/exception.py:996
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1009
+#: nova/exception.py:1000
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1007
 #, python-format
 msgid ""
 "Quota exceeded for %(overs)s: Requested %(req)s, but already used "
 "%(used)d of %(allowed)d %(resource)s"
 msgstr ""
 
-#: nova/exception.py:1021
+#: nova/exception.py:1012
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1025
+#: nova/exception.py:1016
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1029
+#: nova/exception.py:1020
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1033
+#: nova/exception.py:1024
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1037
+#: nova/exception.py:1028
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1032
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1036
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1040
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1044
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1049
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1053
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1057
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1070
+#: nova/exception.py:1061
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1075
+#: nova/exception.py:1066
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1079
+#: nova/exception.py:1070
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1083
+#: nova/exception.py:1074
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1089
+#: nova/exception.py:1080
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1093
+#: nova/exception.py:1084
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1089
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1093
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1107
+#: nova/exception.py:1098
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1111
+#: nova/exception.py:1102
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1115
+#: nova/exception.py:1106
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1119
+#: nova/exception.py:1110
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1123
+#: nova/exception.py:1114
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1127
+#: nova/exception.py:1118
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1131
+#: nova/exception.py:1122
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1135
+#: nova/exception.py:1126
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1139
+#: nova/exception.py:1130
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1143
+#: nova/exception.py:1134
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1148
+#: nova/exception.py:1139
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1153
+#: nova/exception.py:1144
 #, fuzzy, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr "無法掛載Volume 到虛擬機器 %s"
 
-#: nova/exception.py:1157
+#: nova/exception.py:1148
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1161
+#: nova/exception.py:1152
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1167
+#: nova/exception.py:1158
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1171
+#: nova/exception.py:1162
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1176
+#: nova/exception.py:1167
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1172
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1176
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1189
+#: nova/exception.py:1180
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1193
+#: nova/exception.py:1184
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1197
+#: nova/exception.py:1188
 #, python-format
 msgid "The service from servicegroup driver %(driver) is temporarily unavailable."
 msgstr ""
 
-#: nova/exception.py:1202
+#: nova/exception.py:1193
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1207
+#: nova/exception.py:1198
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1212
+#: nova/exception.py:1203
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1217
+#: nova/exception.py:1208
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
@@ -6294,38 +6284,38 @@ msgid ""
 "memory(host:%(avail)s <= instance:%(mem_inst)s)"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:75
+#: nova/scheduler/filter_scheduler.py:74
 #, python-format
 msgid "Attempting to build %(num_instances)d instance(s)"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:229
+#: nova/scheduler/filter_scheduler.py:228
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:246
+#: nova/scheduler/filter_scheduler.py:245
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:275
+#: nova/scheduler/filter_scheduler.py:274
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:341
+#: nova/scheduler/filter_scheduler.py:340
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:354
+#: nova/scheduler/filter_scheduler.py:353
 #, python-format
 msgid "Choosing host %(chosen_host)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:387
+#: nova/scheduler/filter_scheduler.py:386
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -10810,3 +10800,9 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Scheduler cost function %(cost_fn_str)s could not be found."
+#~ msgstr ""
+
+#~ msgid "Scheduler weight flag not found: %(flag_name)s"
+#~ msgstr ""
+