diff --git a/heat/locale/de/LC_MESSAGES/heat-log-error.po b/heat/locale/de/LC_MESSAGES/heat-log-error.po
index 9f1010bb86..f229b3624a 100644
--- a/heat/locale/de/LC_MESSAGES/heat-log-error.po
+++ b/heat/locale/de/LC_MESSAGES/heat-log-error.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Heat\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-10-23 06:00+0000\n"
-"PO-Revision-Date: 2014-10-21 00:51+0000\n"
-"Last-Translator: Ettore Atalan <atalanttore@googlemail.com>\n"
+"POT-Creation-Date: 2014-10-26 06:00+0000\n"
+"PO-Revision-Date: 2014-10-24 01:08+0000\n"
+"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/heat/language/"
 "de/)\n"
 "Language: de\n"
@@ -176,11 +176,11 @@ msgstr "Ursprüngliche Ausnahme wird gelöscht: %s"
 msgid "Unexpected exception occurred %d time(s)... retrying."
 msgstr "Unerwartete Ausnahme %d mal(e) aufgetreten... Neuversuch."
 
-#: heat/openstack/common/loopingcall.py:89
+#: heat/openstack/common/loopingcall.py:95
 msgid "in fixed duration looping call"
 msgstr "in Schleifenaufruf mit festgelegter Dauer"
 
-#: heat/openstack/common/loopingcall.py:131
+#: heat/openstack/common/loopingcall.py:138
 msgid "in dynamic looping call"
 msgstr "in dynamischen Schleifenaufruf"
 
@@ -199,10 +199,6 @@ msgstr "Kein Handler für Übereinstimmungen des Typs %s"
 msgid "Failed to understand rule %r"
 msgstr "Regel %r konnte nicht verstanden werden"
 
-#: heat/openstack/common/service.py:188
-msgid "Exception during rpc cleanup."
-msgstr "Ausnahme bei RPC Cleanup."
-
-#: heat/openstack/common/service.py:277
+#: heat/openstack/common/service.py:269
 msgid "Unhandled exception"
 msgstr "Nicht behandelte Ausnahme"
diff --git a/heat/locale/en_AU/LC_MESSAGES/heat-log-error.po b/heat/locale/en_AU/LC_MESSAGES/heat-log-error.po
index b12374c3b2..395e2fe7c5 100644
--- a/heat/locale/en_AU/LC_MESSAGES/heat-log-error.po
+++ b/heat/locale/en_AU/LC_MESSAGES/heat-log-error.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Heat\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-10-23 06:00+0000\n"
-"PO-Revision-Date: 2014-10-21 00:51+0000\n"
+"POT-Creation-Date: 2014-10-26 06:00+0000\n"
+"PO-Revision-Date: 2014-10-24 01:08+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: English (Australia) (http://www.transifex.com/projects/p/heat/"
 "language/en_AU/)\n"
@@ -174,11 +174,11 @@ msgstr "Original exception being dropped: %s"
 msgid "Unexpected exception occurred %d time(s)... retrying."
 msgstr "Unexpected exception occurred %d time(s)... retrying."
 
-#: heat/openstack/common/loopingcall.py:89
+#: heat/openstack/common/loopingcall.py:95
 msgid "in fixed duration looping call"
 msgstr "in fixed duration looping call"
 
-#: heat/openstack/common/loopingcall.py:131
+#: heat/openstack/common/loopingcall.py:138
 msgid "in dynamic looping call"
 msgstr "in dynamic looping call"
 
@@ -197,10 +197,6 @@ msgstr "No handler for matches of kind %s"
 msgid "Failed to understand rule %r"
 msgstr "Failed to understand rule %r"
 
-#: heat/openstack/common/service.py:188
-msgid "Exception during rpc cleanup."
-msgstr "Exception during rpc cleanup."
-
-#: heat/openstack/common/service.py:277
+#: heat/openstack/common/service.py:269
 msgid "Unhandled exception"
 msgstr "Unhandled exception"
diff --git a/heat/locale/en_GB/LC_MESSAGES/heat-log-error.po b/heat/locale/en_GB/LC_MESSAGES/heat-log-error.po
index d89bbf0530..0480a8a2bb 100644
--- a/heat/locale/en_GB/LC_MESSAGES/heat-log-error.po
+++ b/heat/locale/en_GB/LC_MESSAGES/heat-log-error.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Heat\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-10-20 06:02+0000\n"
-"PO-Revision-Date: 2014-08-07 07:52+0000\n"
+"POT-Creation-Date: 2014-10-26 06:00+0000\n"
+"PO-Revision-Date: 2014-10-24 01:08+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/"
 "heat/language/en_GB/)\n"
@@ -56,8 +56,8 @@ msgstr ""
 msgid "Trust impersonation failed"
 msgstr ""
 
-#: heat/common/heat_keystoneclient.py:338
-#: heat/common/heat_keystoneclient.py:425
+#: heat/common/heat_keystoneclient.py:342
+#: heat/common/heat_keystoneclient.py:429
 #, python-format
 msgid "Failed to add user %(user)s to role %(role)s, check role exists!"
 msgstr ""
@@ -114,17 +114,17 @@ msgstr ""
 msgid "Invalid type for %(mapping_name)s from %(module)s"
 msgstr ""
 
-#: heat/engine/resource.py:908 heat/engine/resource.py:935
+#: heat/engine/resource.py:898 heat/engine/resource.py:925
 #, python-format
 msgid "DB error %s"
 msgstr ""
 
-#: heat/engine/service.py:261
+#: heat/engine/service.py:260
 #, python-format
 msgid "Unable to retrieve stack %s for periodic task"
 msgstr ""
 
-#: heat/engine/service.py:1348
+#: heat/engine/service.py:1355
 msgid "Filtering by namespace/metric not yet supported"
 msgstr ""
 
@@ -174,11 +174,11 @@ msgstr "Original exception being dropped: %s"
 msgid "Unexpected exception occurred %d time(s)... retrying."
 msgstr "Unexpected exception occurred %d time(s)... retrying."
 
-#: heat/openstack/common/loopingcall.py:89
+#: heat/openstack/common/loopingcall.py:95
 msgid "in fixed duration looping call"
 msgstr "in fixed duration looping call"
 
-#: heat/openstack/common/loopingcall.py:131
+#: heat/openstack/common/loopingcall.py:138
 msgid "in dynamic looping call"
 msgstr "in dynamic looping call"
 
@@ -197,10 +197,6 @@ msgstr "No handler for matches of kind %s"
 msgid "Failed to understand rule %r"
 msgstr "Failed to understand rule %r"
 
-#: heat/openstack/common/service.py:188
-msgid "Exception during rpc cleanup."
-msgstr "Exception during rpc cleanup."
-
-#: heat/openstack/common/service.py:277
+#: heat/openstack/common/service.py:269
 msgid "Unhandled exception"
 msgstr "Unhandled exception"
diff --git a/heat/locale/es/LC_MESSAGES/heat-log-error.po b/heat/locale/es/LC_MESSAGES/heat-log-error.po
index f5a58be8e3..badfa3facc 100644
--- a/heat/locale/es/LC_MESSAGES/heat-log-error.po
+++ b/heat/locale/es/LC_MESSAGES/heat-log-error.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Heat\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-10-23 06:00+0000\n"
-"PO-Revision-Date: 2014-10-21 00:51+0000\n"
+"POT-Creation-Date: 2014-10-26 06:00+0000\n"
+"PO-Revision-Date: 2014-10-24 01:08+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/heat/language/"
 "es/)\n"
@@ -179,11 +179,11 @@ msgstr "Se está descartando excepción original: %s"
 msgid "Unexpected exception occurred %d time(s)... retrying."
 msgstr "La excepción inesperada ha ocurrido %d vez(veces)... reintentando."
 
-#: heat/openstack/common/loopingcall.py:89
+#: heat/openstack/common/loopingcall.py:95
 msgid "in fixed duration looping call"
 msgstr "en llamada en bucle de duración fija"
 
-#: heat/openstack/common/loopingcall.py:131
+#: heat/openstack/common/loopingcall.py:138
 msgid "in dynamic looping call"
 msgstr "en llamada en bucle dinámica"
 
@@ -202,10 +202,6 @@ msgstr "No hay manejador para coincidencias de clase %s"
 msgid "Failed to understand rule %r"
 msgstr "Ha ocurrido un error al interpretar la regla %r"
 
-#: heat/openstack/common/service.py:188
-msgid "Exception during rpc cleanup."
-msgstr "Excepción durante limpieza de rpc."
-
-#: heat/openstack/common/service.py:277
+#: heat/openstack/common/service.py:269
 msgid "Unhandled exception"
 msgstr "Excepción no controlada"
diff --git a/heat/locale/fr/LC_MESSAGES/heat-log-error.po b/heat/locale/fr/LC_MESSAGES/heat-log-error.po
index a1d839de68..0a5a6b5e24 100644
--- a/heat/locale/fr/LC_MESSAGES/heat-log-error.po
+++ b/heat/locale/fr/LC_MESSAGES/heat-log-error.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Heat\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-10-23 06:00+0000\n"
-"PO-Revision-Date: 2014-10-21 00:51+0000\n"
+"POT-Creation-Date: 2014-10-26 06:00+0000\n"
+"PO-Revision-Date: 2014-10-24 01:08+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/heat/language/"
 "fr/)\n"
@@ -175,11 +175,11 @@ msgstr "Exception d'origine en cours de suppression : %s"
 msgid "Unexpected exception occurred %d time(s)... retrying."
 msgstr "Exception inattendue survenue %d fois... Nouvel essai."
 
-#: heat/openstack/common/loopingcall.py:89
+#: heat/openstack/common/loopingcall.py:95
 msgid "in fixed duration looping call"
 msgstr "dans l'appel en boucle de durée fixe"
 
-#: heat/openstack/common/loopingcall.py:131
+#: heat/openstack/common/loopingcall.py:138
 msgid "in dynamic looping call"
 msgstr "dans l'appel en boucle dynamique"
 
@@ -198,10 +198,6 @@ msgstr "Aucun gestionnaire pour les correspondances de type %s"
 msgid "Failed to understand rule %r"
 msgstr "Règle %r incompréhensible"
 
-#: heat/openstack/common/service.py:188
-msgid "Exception during rpc cleanup."
-msgstr "Exception pendant le nettoyage rpc."
-
-#: heat/openstack/common/service.py:277
+#: heat/openstack/common/service.py:269
 msgid "Unhandled exception"
 msgstr "Exception non gérée"
diff --git a/heat/locale/heat-log-error.pot b/heat/locale/heat-log-error.pot
index 992b0929e3..77c15a50a3 100644
--- a/heat/locale/heat-log-error.pot
+++ b/heat/locale/heat-log-error.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: heat 2015.1.dev161.g6b9a2b5\n"
+"Project-Id-Version: heat 2015.1.dev215.g609cfc8\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-10-20 06:02+0000\n"
+"POT-Creation-Date: 2014-10-26 06:00+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"
@@ -54,8 +54,8 @@ msgstr ""
 msgid "Trust impersonation failed"
 msgstr ""
 
-#: heat/common/heat_keystoneclient.py:338
-#: heat/common/heat_keystoneclient.py:425
+#: heat/common/heat_keystoneclient.py:342
+#: heat/common/heat_keystoneclient.py:429
 #, python-format
 msgid "Failed to add user %(user)s to role %(role)s, check role exists!"
 msgstr ""
@@ -112,17 +112,17 @@ msgstr ""
 msgid "Invalid type for %(mapping_name)s from %(module)s"
 msgstr ""
 
-#: heat/engine/resource.py:908 heat/engine/resource.py:935
+#: heat/engine/resource.py:898 heat/engine/resource.py:925
 #, python-format
 msgid "DB error %s"
 msgstr ""
 
-#: heat/engine/service.py:261
+#: heat/engine/service.py:260
 #, python-format
 msgid "Unable to retrieve stack %s for periodic task"
 msgstr ""
 
-#: heat/engine/service.py:1348
+#: heat/engine/service.py:1355
 msgid "Filtering by namespace/metric not yet supported"
 msgstr ""
 
@@ -172,11 +172,11 @@ msgstr ""
 msgid "Unexpected exception occurred %d time(s)... retrying."
 msgstr ""
 
-#: heat/openstack/common/loopingcall.py:89
+#: heat/openstack/common/loopingcall.py:95
 msgid "in fixed duration looping call"
 msgstr ""
 
-#: heat/openstack/common/loopingcall.py:131
+#: heat/openstack/common/loopingcall.py:138
 msgid "in dynamic looping call"
 msgstr ""
 
@@ -195,11 +195,7 @@ msgstr ""
 msgid "Failed to understand rule %r"
 msgstr ""
 
-#: heat/openstack/common/service.py:188
-msgid "Exception during rpc cleanup."
-msgstr ""
-
-#: heat/openstack/common/service.py:277
+#: heat/openstack/common/service.py:269
 msgid "Unhandled exception"
 msgstr ""
 
diff --git a/heat/locale/heat-log-warning.pot b/heat/locale/heat-log-warning.pot
index a30999a8cb..00b15147aa 100644
--- a/heat/locale/heat-log-warning.pot
+++ b/heat/locale/heat-log-warning.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: heat 2015.1.dev161.g6b9a2b5\n"
+"Project-Id-Version: heat 2015.1.dev215.g609cfc8\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-10-20 06:02+0000\n"
+"POT-Creation-Date: 2014-10-26 06:00+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"
@@ -33,38 +33,38 @@ msgid ""
 "falling back to using default"
 msgstr ""
 
-#: heat/common/heat_keystoneclient.py:306
+#: heat/common/heat_keystoneclient.py:310
 #, python-format
 msgid "Truncating the username %s to the last 64 characters."
 msgstr ""
 
-#: heat/common/heat_keystoneclient.py:404
+#: heat/common/heat_keystoneclient.py:408
 msgid ""
 "Falling back to legacy non-domain user create, configure domain in "
 "heat.conf"
 msgstr ""
 
-#: heat/common/heat_keystoneclient.py:458
+#: heat/common/heat_keystoneclient.py:462
 msgid ""
 "Falling back to legacy non-domain user delete, configure domain in "
 "heat.conf"
 msgstr ""
 
-#: heat/common/heat_keystoneclient.py:479
-#: heat/common/heat_keystoneclient.py:496
+#: heat/common/heat_keystoneclient.py:483
+#: heat/common/heat_keystoneclient.py:500
 msgid "Falling back to legacy non-domain project, configure domain in heat.conf"
 msgstr ""
 
-#: heat/common/heat_keystoneclient.py:587
-#: heat/common/heat_keystoneclient.py:604
+#: heat/common/heat_keystoneclient.py:591
+#: heat/common/heat_keystoneclient.py:608
 msgid "Falling back to legacy non-domain keypair, configure domain in heat.conf"
 msgstr ""
 
-#: heat/common/heat_keystoneclient.py:623
+#: heat/common/heat_keystoneclient.py:627
 msgid "Falling back to legacy non-domain disable, configure domain in heat.conf"
 msgstr ""
 
-#: heat/common/heat_keystoneclient.py:633
+#: heat/common/heat_keystoneclient.py:637
 msgid "Falling back to legacy non-domain enable, configure domain in heat.conf"
 msgstr ""
 
@@ -78,32 +78,32 @@ msgstr ""
 msgid "Changing %(path)s from %(was)s to %(now)s"
 msgstr ""
 
-#: heat/engine/resource.py:887
+#: heat/engine/resource.py:877
 #, python-format
 msgid "db error %s"
 msgstr ""
 
-#: heat/engine/resource.py:1073
+#: heat/engine/resource.py:1063
 #, python-format
 msgid "Resource %s does not implement metadata update"
 msgstr ""
 
-#: heat/engine/service.py:276
+#: heat/engine/service.py:275
 #, python-format
 msgid "periodic_task db error watch rule removed? %(ex)s"
 msgstr ""
 
-#: heat/engine/service.py:1070
+#: heat/engine/service.py:1077
 #, python-format
 msgid "Access denied to resource %s"
 msgstr ""
 
-#: heat/engine/service.py:1325
+#: heat/engine/service.py:1332
 #, python-format
 msgid "show_watch (all) db error %s"
 msgstr ""
 
-#: heat/engine/service.py:1354
+#: heat/engine/service.py:1361
 #, python-format
 msgid "show_metric (all) db error %s"
 msgstr ""
@@ -195,12 +195,12 @@ msgstr ""
 msgid "Failed to fetch resource attributes: %s"
 msgstr ""
 
-#: heat/openstack/common/loopingcall.py:82
+#: heat/openstack/common/loopingcall.py:87
 #, python-format
-msgid "task run outlasted interval by %s sec"
+msgid "task %(func_name)s run outlasted interval by %(delay).2f sec"
 msgstr ""
 
-#: heat/openstack/common/service.py:364
+#: heat/openstack/common/service.py:356
 #, python-format
 msgid "pid %d not in child list"
 msgstr ""
diff --git a/heat/locale/heat.pot b/heat/locale/heat.pot
index 2ceab7f537..e04c5de28c 100644
--- a/heat/locale/heat.pot
+++ b/heat/locale/heat.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: heat 2015.1.dev203.gce6dac2\n"
+"Project-Id-Version: heat 2015.1.dev215.g609cfc8\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-10-23 06:00+0000\n"
+"POT-Creation-Date: 2014-10-26 06:00+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"
@@ -1854,9 +1854,9 @@ msgid "truncating shrinkage to %s"
 msgstr ""
 
 #: heat/engine/resources/autoscaling.py:114
-#: heat/engine/resources/autoscaling.py:482
-#: heat/engine/resources/autoscaling.py:515
-#: heat/engine/resources/autoscaling.py:520
+#: heat/engine/resources/autoscaling.py:505
+#: heat/engine/resources/autoscaling.py:538
+#: heat/engine/resources/autoscaling.py:543
 #: heat/engine/resources/instance.py:193 heat/engine/resources/instance.py:198
 #: heat/engine/resources/instance.py:203 heat/engine/resources/instance.py:208
 #: heat/engine/resources/instance.py:213 heat/engine/resources/instance.py:218
@@ -1875,8 +1875,8 @@ msgid "Not Implemented."
 msgstr ""
 
 #: heat/engine/resources/autoscaling.py:119
-#: heat/engine/resources/autoscaling.py:487
-msgid "Name of LaunchConfiguration resource."
+#: heat/engine/resources/autoscaling.py:510
+msgid "The reference to a LaunchConfiguration resource."
 msgstr ""
 
 #: heat/engine/resources/autoscaling.py:125
@@ -1884,12 +1884,12 @@ msgid "Desired number of instances."
 msgstr ""
 
 #: heat/engine/resources/autoscaling.py:131
-#: heat/engine/resources/autoscaling.py:528
+#: heat/engine/resources/autoscaling.py:551
 msgid "List of LoadBalancer resources."
 msgstr ""
 
 #: heat/engine/resources/autoscaling.py:135
-#: heat/engine/resources/autoscaling.py:544
+#: heat/engine/resources/autoscaling.py:567
 msgid "Tags to attach to this group."
 msgstr ""
 
@@ -1897,120 +1897,132 @@ msgstr ""
 msgid "A comma-delimited list of server ip addresses. (Heat extension)."
 msgstr ""
 
-#: heat/engine/resources/autoscaling.py:415
+#: heat/engine/resources/autoscaling.py:205
+#, python-format
+msgid "%(lc)s (%(ref)s) reference can not be found."
+msgstr ""
+
+#: heat/engine/resources/autoscaling.py:210
+#, python-format
+msgid ""
+"%(lc)s (%(ref)s) requires a reference to the configuration not just the "
+"name of the resource."
+msgstr ""
+
+#: heat/engine/resources/autoscaling.py:438
 #, python-format
 msgid "Unsupported resource '%s' in LoadBalancerNames"
 msgstr ""
 
-#: heat/engine/resources/autoscaling.py:493
+#: heat/engine/resources/autoscaling.py:516
 msgid "Maximum number of instances in the group."
 msgstr ""
 
-#: heat/engine/resources/autoscaling.py:499
+#: heat/engine/resources/autoscaling.py:522
 msgid "Minimum number of instances in the group."
 msgstr ""
 
-#: heat/engine/resources/autoscaling.py:505
-#: heat/engine/resources/autoscaling.py:772
+#: heat/engine/resources/autoscaling.py:528
+#: heat/engine/resources/autoscaling.py:796
 #: heat/engine/resources/aws/scaling_policy.py:72
 #: heat/engine/resources/openstack/scaling_policy.py:80
 msgid "Cooldown period, in seconds."
 msgstr ""
 
-#: heat/engine/resources/autoscaling.py:510
+#: heat/engine/resources/autoscaling.py:533
 msgid "Desired initial number of instances."
 msgstr ""
 
-#: heat/engine/resources/autoscaling.py:532
+#: heat/engine/resources/autoscaling.py:555
 msgid ""
 "Use only with Neutron, to list the internal subnet to which the instance "
 "will be attached; needed only if multiple exist; list length must be "
 "exactly 1."
 msgstr ""
 
-#: heat/engine/resources/autoscaling.py:538
+#: heat/engine/resources/autoscaling.py:561
 msgid "UUID of the internal subnet to which the instance will be attached."
 msgstr ""
 
-#: heat/engine/resources/autoscaling.py:645
+#: heat/engine/resources/autoscaling.py:669
 #, python-format
 msgid "Start resizing the group %(group)s"
 msgstr ""
 
-#: heat/engine/resources/autoscaling.py:660
+#: heat/engine/resources/autoscaling.py:684
 msgid "Failed sending error notification"
 msgstr ""
 
-#: heat/engine/resources/autoscaling.py:665
+#: heat/engine/resources/autoscaling.py:689
 #, python-format
 msgid "End resizing the group %(group)s"
 msgstr ""
 
-#: heat/engine/resources/autoscaling.py:693
+#: heat/engine/resources/autoscaling.py:717
 msgid "MinSize can not be greater than MaxSize"
 msgstr ""
 
-#: heat/engine/resources/autoscaling.py:697
+#: heat/engine/resources/autoscaling.py:721
 msgid "The size of AutoScalingGroup can not be less than zero"
 msgstr ""
 
-#: heat/engine/resources/autoscaling.py:703
+#: heat/engine/resources/autoscaling.py:727
 msgid "DesiredCapacity must be between MinSize and MaxSize"
 msgstr ""
 
-#: heat/engine/resources/autoscaling.py:712
+#: heat/engine/resources/autoscaling.py:736
 msgid "Anything other than one VPCZoneIdentifier"
 msgstr ""
 
-#: heat/engine/resources/autoscaling.py:749
+#: heat/engine/resources/autoscaling.py:773
 msgid ""
 "Resource definition for the resources in the group, in HOT format. The "
 "value of this property is the definition of a resource just as if it had "
 "been declared in the template itself."
 msgstr ""
 
-#: heat/engine/resources/autoscaling.py:758
+#: heat/engine/resources/autoscaling.py:782
 msgid "Maximum number of resources in the group."
 msgstr ""
 
-#: heat/engine/resources/autoscaling.py:765
+#: heat/engine/resources/autoscaling.py:789
 msgid "Minimum number of resources in the group."
 msgstr ""
 
-#: heat/engine/resources/autoscaling.py:777
+#: heat/engine/resources/autoscaling.py:801
 msgid "Desired initial number of resources."
 msgstr ""
 
-#: heat/engine/resources/autoscaling.py:782
+#: heat/engine/resources/autoscaling.py:806
 msgid "Policy for rolling updates for this scaling group."
 msgstr ""
 
-#: heat/engine/resources/autoscaling.py:788
+#: heat/engine/resources/autoscaling.py:812
 msgid ""
 "The minimum number of resources in service while rolling updates are "
 "being executed."
 msgstr ""
 
-#: heat/engine/resources/autoscaling.py:794
+#: heat/engine/resources/autoscaling.py:818
 msgid "The maximum number of resources to replace at once."
 msgstr ""
 
-#: heat/engine/resources/autoscaling.py:799
+#: heat/engine/resources/autoscaling.py:823
 msgid "The number of seconds to wait between batches of updates."
 msgstr ""
 
-#: heat/engine/resources/autoscaling.py:809
+#: heat/engine/resources/autoscaling.py:833
 #: heat/engine/resources/resource_group.py:173
 msgid ""
 "A map of resource names to the specified attribute of each individual "
 "resource."
 msgstr ""
 
-#: heat/engine/resources/autoscaling.py:813
+#: heat/engine/resources/autoscaling.py:837
 msgid "A list of the specified attribute of each individual resource."
 msgstr ""
 
-#: heat/engine/resources/autoscaling.py:816
+#: heat/engine/resources/autoscaling.py:840
 msgid "The current size of AutoscalingResourceGroup."
 msgstr ""
 
@@ -3375,30 +3387,30 @@ msgstr ""
 msgid "A map containing all headers for the container."
 msgstr ""
 
-#: heat/engine/resources/swiftsignal.py:47
+#: heat/engine/resources/swiftsignal.py:45
 #: heat/engine/resources/wait_condition.py:292
 #, python-format
 msgid "%(len)d of %(count)d received - %(reasons)s"
 msgstr ""
 
-#: heat/engine/resources/swiftsignal.py:49
+#: heat/engine/resources/swiftsignal.py:47
 #: heat/engine/resources/wait_condition.py:294
 #, python-format
 msgid "%(len)d of %(count)d received"
 msgstr ""
 
-#: heat/engine/resources/swiftsignal.py:71
+#: heat/engine/resources/swiftsignal.py:70
 msgid ""
 "Tokens are not needed for Swift TempURLs.  This attribute is being kept "
 "for compatibility with the OS::Heat::WaitConditionHandle resource"
 msgstr ""
 
-#: heat/engine/resources/swiftsignal.py:77
+#: heat/engine/resources/swiftsignal.py:76
 #: heat/engine/resources/wait_condition.py:125
 msgid "Endpoint/url which can be used for signalling handle"
 msgstr ""
 
-#: heat/engine/resources/swiftsignal.py:81
+#: heat/engine/resources/swiftsignal.py:80
 #: heat/engine/resources/wait_condition.py:129
 msgid ""
 "Convenience attribute, provides curl CLI command prefix, which can be "
@@ -3407,20 +3419,20 @@ msgid ""
 "by adding --data-binary '{\"status\": \"FAILURE\"}'"
 msgstr ""
 
-#: heat/engine/resources/swiftsignal.py:142
+#: heat/engine/resources/swiftsignal.py:144
 msgid ""
 "URL of TempURL where resource will signal completion and optionally "
 "upload data."
 msgstr ""
 
-#: heat/engine/resources/swiftsignal.py:147
+#: heat/engine/resources/swiftsignal.py:149
 msgid ""
 "The maximum number of seconds to wait for the resource to signal "
 "completion.  Once the timeout is reached, creation of the signal resource"
 " will fail."
 msgstr ""
 
-#: heat/engine/resources/swiftsignal.py:158
+#: heat/engine/resources/swiftsignal.py:160
 #: heat/engine/resources/wait_condition.py:329
 #: heat/engine/resources/wait_condition.py:451
 msgid ""
@@ -3428,16 +3440,16 @@ msgid ""
 "creation process continues."
 msgstr ""
 
-#: heat/engine/resources/swiftsignal.py:172
+#: heat/engine/resources/swiftsignal.py:174
 msgid "JSON data that was uploaded via the SwiftSignalHandle."
 msgstr ""
 
-#: heat/engine/resources/swiftsignal.py:209
+#: heat/engine/resources/swiftsignal.py:211
 #, python-format
 msgid "\"%(url)s\" is not a valid SwiftSignalHandle.  The %(part)s is invalid"
 msgstr ""
 
-#: heat/engine/resources/swiftsignal.py:245
+#: heat/engine/resources/swiftsignal.py:247
 #, python-format
 msgid "Unknown status: %s"
 msgstr ""
@@ -5470,22 +5482,22 @@ msgid ""
 "characters. Please use unicode() or translate() instead."
 msgstr ""
 
-#: heat/openstack/common/log.py:327
+#: heat/openstack/common/log.py:287
 #, python-format
 msgid "Deprecated: %s"
 msgstr ""
 
-#: heat/openstack/common/log.py:436
+#: heat/openstack/common/log.py:395
 #, python-format
 msgid "Error loading logging config %(log_config)s: %(err_msg)s"
 msgstr ""
 
-#: heat/openstack/common/log.py:486
+#: heat/openstack/common/log.py:456
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: heat/openstack/common/log.py:729
+#: heat/openstack/common/log.py:707
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
@@ -5508,11 +5520,11 @@ msgstr ""
 msgid "Rules must be an instance of dict or Rules, got %s instead"
 msgstr ""
 
-#: heat/openstack/common/processutils.py:58
+#: heat/openstack/common/processutils.py:59
 msgid "Unexpected error while running command."
 msgstr ""
 
-#: heat/openstack/common/processutils.py:61
+#: heat/openstack/common/processutils.py:62
 #, python-format
 msgid ""
 "%(description)s\n"
@@ -5524,18 +5536,28 @@ msgstr ""
 
 #: heat/openstack/common/processutils.py:143
 #, python-format
-msgid "Got unknown keyword args to utils.execute: %r"
+msgid "Got unknown keyword args: %r"
 msgstr ""
 
-#: heat/openstack/common/processutils.py:149
+#: heat/openstack/common/processutils.py:148
 msgid "Command requested root, but did not specify a root helper."
 msgstr ""
 
-#: heat/openstack/common/processutils.py:246
+#: heat/openstack/common/processutils.py:158
+#, python-format
+msgid "Running cmd (subprocess): %s"
+msgstr ""
+
+#: heat/openstack/common/processutils.py:206
+#, python-format
+msgid "%r failed. Retrying."
+msgstr ""
+
+#: heat/openstack/common/processutils.py:248
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: heat/openstack/common/processutils.py:250
+#: heat/openstack/common/processutils.py:252
 msgid "process_input not supported over SSH"
 msgstr ""
 
@@ -5574,20 +5596,30 @@ msgstr ""
 msgid "Invalid string format: %s"
 msgstr ""
 
-#: heat/openstack/common/versionutils.py:70
+#: heat/openstack/common/versionutils.py:90
 #, python-format
 msgid ""
 "%(what)s is deprecated as of %(as_of)s in favor of %(in_favor_of)s and "
 "may be removed in %(remove_in)s."
 msgstr ""
 
-#: heat/openstack/common/versionutils.py:74
+#: heat/openstack/common/versionutils.py:94
 #, python-format
 msgid ""
 "%(what)s is deprecated as of %(as_of)s and may be removed in "
 "%(remove_in)s. It will not be superseded."
 msgstr ""
 
+#: heat/openstack/common/versionutils.py:98
+#, python-format
+msgid "%(what)s is deprecated as of %(as_of)s in favor of %(in_favor_of)s."
+msgstr ""
+
+#: heat/openstack/common/versionutils.py:101
+#, python-format
+msgid "%(what)s is deprecated as of %(as_of)s. It will not be superseded."
+msgstr ""
+
 #: heat/openstack/common/crypto/utils.py:30
 msgid "An unknown error occurred in crypto utils."
 msgstr ""
diff --git a/heat/locale/ja/LC_MESSAGES/heat-log-error.po b/heat/locale/ja/LC_MESSAGES/heat-log-error.po
index a509c2b5f3..fd9b210d1d 100644
--- a/heat/locale/ja/LC_MESSAGES/heat-log-error.po
+++ b/heat/locale/ja/LC_MESSAGES/heat-log-error.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Heat\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-10-20 06:02+0000\n"
-"PO-Revision-Date: 2014-08-07 07:52+0000\n"
+"POT-Creation-Date: 2014-10-26 06:00+0000\n"
+"PO-Revision-Date: 2014-10-24 01:08+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/heat/language/"
 "ja/)\n"
@@ -58,8 +58,8 @@ msgstr ""
 msgid "Trust impersonation failed"
 msgstr ""
 
-#: heat/common/heat_keystoneclient.py:338
-#: heat/common/heat_keystoneclient.py:425
+#: heat/common/heat_keystoneclient.py:342
+#: heat/common/heat_keystoneclient.py:429
 #, python-format
 msgid "Failed to add user %(user)s to role %(role)s, check role exists!"
 msgstr ""
@@ -116,17 +116,17 @@ msgstr ""
 msgid "Invalid type for %(mapping_name)s from %(module)s"
 msgstr ""
 
-#: heat/engine/resource.py:908 heat/engine/resource.py:935
+#: heat/engine/resource.py:898 heat/engine/resource.py:925
 #, python-format
 msgid "DB error %s"
 msgstr ""
 
-#: heat/engine/service.py:261
+#: heat/engine/service.py:260
 #, python-format
 msgid "Unable to retrieve stack %s for periodic task"
 msgstr ""
 
-#: heat/engine/service.py:1348
+#: heat/engine/service.py:1355
 msgid "Filtering by namespace/metric not yet supported"
 msgstr ""
 
@@ -176,11 +176,11 @@ msgstr "除去される元の例外: %s"
 msgid "Unexpected exception occurred %d time(s)... retrying."
 msgstr "予期せぬ例外が、%d回()発生しました。再試行中。"
 
-#: heat/openstack/common/loopingcall.py:89
+#: heat/openstack/common/loopingcall.py:95
 msgid "in fixed duration looping call"
 msgstr "一定期間の呼び出しループ"
 
-#: heat/openstack/common/loopingcall.py:131
+#: heat/openstack/common/loopingcall.py:138
 msgid "in dynamic looping call"
 msgstr "動的呼び出しループ"
 
@@ -199,10 +199,6 @@ msgstr "種類 %s の一致向けのハンドラーがありません"
 msgid "Failed to understand rule %r"
 msgstr "ルール %r を解釈できませんでした"
 
-#: heat/openstack/common/service.py:188
-msgid "Exception during rpc cleanup."
-msgstr "RPCクリーンアップ中に例外が発生"
-
-#: heat/openstack/common/service.py:277
+#: heat/openstack/common/service.py:269
 msgid "Unhandled exception"
 msgstr "未処理例外"
diff --git a/heat/locale/ko_KR/LC_MESSAGES/heat-log-error.po b/heat/locale/ko_KR/LC_MESSAGES/heat-log-error.po
index 502ab6e800..834fe97e83 100644
--- a/heat/locale/ko_KR/LC_MESSAGES/heat-log-error.po
+++ b/heat/locale/ko_KR/LC_MESSAGES/heat-log-error.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Heat\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-10-20 06:02+0000\n"
-"PO-Revision-Date: 2014-10-17 10:50+0000\n"
-"Last-Translator: Mario Cho <hephaex@gmail.com>\n"
+"POT-Creation-Date: 2014-10-26 06:00+0000\n"
+"PO-Revision-Date: 2014-10-24 01:08+0000\n"
+"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Korean (Korea) (http://www.transifex.com/projects/p/heat/"
 "language/ko_KR/)\n"
 "Language: ko_KR\n"
@@ -57,8 +57,8 @@ msgstr "신뢰할 수 있는 token 재설정 실패!"
 msgid "Trust impersonation failed"
 msgstr "트러스트의 위장이 실패했습니다."
 
-#: heat/common/heat_keystoneclient.py:338
-#: heat/common/heat_keystoneclient.py:425
+#: heat/common/heat_keystoneclient.py:342
+#: heat/common/heat_keystoneclient.py:429
 #, python-format
 msgid "Failed to add user %(user)s to role %(role)s, check role exists!"
 msgstr ""
@@ -117,17 +117,17 @@ msgstr "%(module)s로부터 %(mapping_name)s 를 읽을 수 없습니다. "
 msgid "Invalid type for %(mapping_name)s from %(module)s"
 msgstr "%(module)s로부터 %(mapping_name)s의 속성이 맞지 않습니다."
 
-#: heat/engine/resource.py:908 heat/engine/resource.py:935
+#: heat/engine/resource.py:898 heat/engine/resource.py:925
 #, python-format
 msgid "DB error %s"
 msgstr "DB %s에 오류가 있습니다. "
 
-#: heat/engine/service.py:261
+#: heat/engine/service.py:260
 #, python-format
 msgid "Unable to retrieve stack %s for periodic task"
 msgstr "주기적인 작업에 대한 스택 %s를 검색 할 수 없습니다"
 
-#: heat/engine/service.py:1348
+#: heat/engine/service.py:1355
 msgid "Filtering by namespace/metric not yet supported"
 msgstr "네임 스페이스의 필터링 / 메트릭은 아직 지원하지 않습니다. "
 
@@ -180,11 +180,11 @@ msgstr "기존 예외가 삭제됨: %s"
 msgid "Unexpected exception occurred %d time(s)... retrying."
 msgstr "예기치 않은 예외 %d 번 발생하였습니다... 다시 시도중."
 
-#: heat/openstack/common/loopingcall.py:89
+#: heat/openstack/common/loopingcall.py:95
 msgid "in fixed duration looping call"
 msgstr "고정 기간 루프 호출에서"
 
-#: heat/openstack/common/loopingcall.py:131
+#: heat/openstack/common/loopingcall.py:138
 msgid "in dynamic looping call"
 msgstr "동적 루프 호출에서"
 
@@ -203,10 +203,6 @@ msgstr "%s 유형의 일치에 대한 핸들러가 없음"
 msgid "Failed to understand rule %r"
 msgstr "룰 %r를 이해하지 못했습니다."
 
-#: heat/openstack/common/service.py:188
-msgid "Exception during rpc cleanup."
-msgstr "RPC 정리하는 동안 예외입니다."
-
-#: heat/openstack/common/service.py:277
+#: heat/openstack/common/service.py:269
 msgid "Unhandled exception"
 msgstr "처리되지 않은 예외"
diff --git a/heat/locale/pt_BR/LC_MESSAGES/heat-log-error.po b/heat/locale/pt_BR/LC_MESSAGES/heat-log-error.po
index f2deda0a31..8da805f280 100644
--- a/heat/locale/pt_BR/LC_MESSAGES/heat-log-error.po
+++ b/heat/locale/pt_BR/LC_MESSAGES/heat-log-error.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Heat\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-10-23 06:00+0000\n"
-"PO-Revision-Date: 2014-10-21 00:51+0000\n"
+"POT-Creation-Date: 2014-10-26 06:00+0000\n"
+"PO-Revision-Date: 2014-10-24 01:08+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/heat/"
 "language/pt_BR/)\n"
@@ -177,11 +177,11 @@ msgstr "Exceção original sendo descartada: %s"
 msgid "Unexpected exception occurred %d time(s)... retrying."
 msgstr "Exceção não esperada ocorreu %d vez(es)... tentando novamente."
 
-#: heat/openstack/common/loopingcall.py:89
+#: heat/openstack/common/loopingcall.py:95
 msgid "in fixed duration looping call"
 msgstr "em uma chamada de laço de duração fixa"
 
-#: heat/openstack/common/loopingcall.py:131
+#: heat/openstack/common/loopingcall.py:138
 msgid "in dynamic looping call"
 msgstr "em chamada de laço dinâmico"
 
@@ -200,10 +200,6 @@ msgstr "Nenhum manipulador para correspondências do tipo %s"
 msgid "Failed to understand rule %r"
 msgstr "Falha ao interpretar regra %r"
 
-#: heat/openstack/common/service.py:188
-msgid "Exception during rpc cleanup."
-msgstr "Exceção durante limpeza de RPC."
-
-#: heat/openstack/common/service.py:277
+#: heat/openstack/common/service.py:269
 msgid "Unhandled exception"
 msgstr "Exceção não tratada"
diff --git a/heat/locale/vi_VN/LC_MESSAGES/heat-log-error.po b/heat/locale/vi_VN/LC_MESSAGES/heat-log-error.po
index 2c83eb5d47..c58400ab04 100644
--- a/heat/locale/vi_VN/LC_MESSAGES/heat-log-error.po
+++ b/heat/locale/vi_VN/LC_MESSAGES/heat-log-error.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Heat\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-10-20 06:02+0000\n"
-"PO-Revision-Date: 2014-08-07 07:52+0000\n"
+"POT-Creation-Date: 2014-10-26 06:00+0000\n"
+"PO-Revision-Date: 2014-10-24 01:08+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/"
 "heat/language/vi_VN/)\n"
@@ -56,8 +56,8 @@ msgstr ""
 msgid "Trust impersonation failed"
 msgstr ""
 
-#: heat/common/heat_keystoneclient.py:338
-#: heat/common/heat_keystoneclient.py:425
+#: heat/common/heat_keystoneclient.py:342
+#: heat/common/heat_keystoneclient.py:429
 #, python-format
 msgid "Failed to add user %(user)s to role %(role)s, check role exists!"
 msgstr ""
@@ -114,17 +114,17 @@ msgstr ""
 msgid "Invalid type for %(mapping_name)s from %(module)s"
 msgstr ""
 
-#: heat/engine/resource.py:908 heat/engine/resource.py:935
+#: heat/engine/resource.py:898 heat/engine/resource.py:925
 #, python-format
 msgid "DB error %s"
 msgstr ""
 
-#: heat/engine/service.py:261
+#: heat/engine/service.py:260
 #, python-format
 msgid "Unable to retrieve stack %s for periodic task"
 msgstr ""
 
-#: heat/engine/service.py:1348
+#: heat/engine/service.py:1355
 msgid "Filtering by namespace/metric not yet supported"
 msgstr ""
 
@@ -174,11 +174,11 @@ msgstr "Ngoại lệ ban đầu được giảm xuống: %s"
 msgid "Unexpected exception occurred %d time(s)... retrying."
 msgstr "Ngoại lệ bất ngờ xảy ra %d thời gian(s) ... thử lại"
 
-#: heat/openstack/common/loopingcall.py:89
+#: heat/openstack/common/loopingcall.py:95
 msgid "in fixed duration looping call"
 msgstr "trong cuộc gọi vòng lặp thời khoảng cố định "
 
-#: heat/openstack/common/loopingcall.py:131
+#: heat/openstack/common/loopingcall.py:138
 msgid "in dynamic looping call"
 msgstr "trong cuộc gọi lặp động"
 
@@ -197,10 +197,6 @@ msgstr "Không có bộ xử lý thích ứng của loại %s"
 msgid "Failed to understand rule %r"
 msgstr "Không hiểu luật %r"
 
-#: heat/openstack/common/service.py:188
-msgid "Exception during rpc cleanup."
-msgstr "Ngoại lệ trong quá trình dọn dẹp RPC"
-
-#: heat/openstack/common/service.py:277
+#: heat/openstack/common/service.py:269
 msgid "Unhandled exception"
 msgstr "ngoại lệ không được quản lý"
diff --git a/heat/locale/zh_CN/LC_MESSAGES/heat-log-error.po b/heat/locale/zh_CN/LC_MESSAGES/heat-log-error.po
index 1b8ac84ce2..dc4af39b33 100644
--- a/heat/locale/zh_CN/LC_MESSAGES/heat-log-error.po
+++ b/heat/locale/zh_CN/LC_MESSAGES/heat-log-error.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Heat\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-10-20 06:02+0000\n"
-"PO-Revision-Date: 2014-08-07 07:52+0000\n"
+"POT-Creation-Date: 2014-10-26 06:00+0000\n"
+"PO-Revision-Date: 2014-10-24 01:08+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/heat/"
 "language/zh_CN/)\n"
@@ -56,8 +56,8 @@ msgstr ""
 msgid "Trust impersonation failed"
 msgstr ""
 
-#: heat/common/heat_keystoneclient.py:338
-#: heat/common/heat_keystoneclient.py:425
+#: heat/common/heat_keystoneclient.py:342
+#: heat/common/heat_keystoneclient.py:429
 #, python-format
 msgid "Failed to add user %(user)s to role %(role)s, check role exists!"
 msgstr ""
@@ -114,17 +114,17 @@ msgstr ""
 msgid "Invalid type for %(mapping_name)s from %(module)s"
 msgstr ""
 
-#: heat/engine/resource.py:908 heat/engine/resource.py:935
+#: heat/engine/resource.py:898 heat/engine/resource.py:925
 #, python-format
 msgid "DB error %s"
 msgstr ""
 
-#: heat/engine/service.py:261
+#: heat/engine/service.py:260
 #, python-format
 msgid "Unable to retrieve stack %s for periodic task"
 msgstr ""
 
-#: heat/engine/service.py:1348
+#: heat/engine/service.py:1355
 msgid "Filtering by namespace/metric not yet supported"
 msgstr ""
 
@@ -174,11 +174,11 @@ msgstr "正在删除原始异常：%s"
 msgid "Unexpected exception occurred %d time(s)... retrying."
 msgstr "意外的异常已发生 %d 次...正在重试。"
 
-#: heat/openstack/common/loopingcall.py:89
+#: heat/openstack/common/loopingcall.py:95
 msgid "in fixed duration looping call"
 msgstr "在固定时段内循环调用"
 
-#: heat/openstack/common/loopingcall.py:131
+#: heat/openstack/common/loopingcall.py:138
 msgid "in dynamic looping call"
 msgstr "在动态循环调用中"
 
@@ -197,10 +197,6 @@ msgstr "对于类型为 %s 的匹配项，不存在任何处理程序"
 msgid "Failed to understand rule %r"
 msgstr "未能理解规则 %r "
 
-#: heat/openstack/common/service.py:188
-msgid "Exception during rpc cleanup."
-msgstr "在RPC清除期间发生异常。"
-
-#: heat/openstack/common/service.py:277
+#: heat/openstack/common/service.py:269
 msgid "Unhandled exception"
 msgstr "存在未处理的异常"