diff --git a/heat/locale/de/LC_MESSAGES/heat-log-error.po b/heat/locale/de/LC_MESSAGES/heat-log-error.po
index 82da3e999..03afc3e78 100644
--- a/heat/locale/de/LC_MESSAGES/heat-log-error.po
+++ b/heat/locale/de/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: 2015-02-17 06:02+0000\n"
-"PO-Revision-Date: 2015-02-16 22:06+0000\n"
+"POT-Creation-Date: 2015-02-24 06:03+0000\n"
+"PO-Revision-Date: 2015-02-23 21:31+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/heat/language/"
 "de/)\n"
@@ -25,7 +25,7 @@ msgstr ""
 msgid "Ec2Token authorization failed, no auth_uri specified in config file"
 msgstr ""
 
-#: heat/api/aws/utils.py:98
+#: heat/api/aws/utils.py:99
 #, python-format
 msgid "Request does not contain %s parameter!"
 msgstr ""
@@ -34,11 +34,11 @@ msgstr ""
 msgid "Request does not contain required MetricData"
 msgstr ""
 
-#: heat/common/context.py:200
+#: heat/common/context.py:203
 msgid "Keystone v3 API connection failed, no password trust or auth_token!"
 msgstr ""
 
-#: heat/common/exception.py:116
+#: heat/common/exception.py:115
 msgid "Exception in string format operation"
 msgstr "Ausnahme bei Zeichenfolgeformatoperation"
 
@@ -68,20 +68,20 @@ msgstr ""
 msgid "Failed to add user %(user)s to role %(role)s, check role exists!"
 msgstr ""
 
-#: heat/common/lifecycle_plugin_utils.py:44
+#: heat/common/lifecycle_plugin_utils.py:46
 msgid "failed to get lifecycle plug point classes"
 msgstr ""
 
-#: heat/common/lifecycle_plugin_utils.py:51
+#: heat/common/lifecycle_plugin_utils.py:53
 #, python-format
 msgid "failed to instantiate stack lifecycle class %s"
 msgstr ""
 
-#: heat/common/lifecycle_plugin_utils.py:56
+#: heat/common/lifecycle_plugin_utils.py:58
 msgid "failed to sort lifecycle plug point classes"
 msgstr ""
 
-#: heat/common/lifecycle_plugin_utils.py:109
+#: heat/common/lifecycle_plugin_utils.py:111
 #, python-format
 msgid "%(opname) %(ci)s failed for %(a)s on %(sid)s"
 msgstr ""
@@ -91,30 +91,30 @@ msgstr ""
 msgid "Failed to import module %s"
 msgstr ""
 
-#: heat/common/wsgi.py:267
+#: heat/common/wsgi.py:265
 msgid "SIGTERM received"
 msgstr "SIGTERM erhalten"
 
-#: heat/common/wsgi.py:276
+#: heat/common/wsgi.py:274
 msgid "SIGHUP received"
 msgstr "SIGHUP empfangen"
 
-#: heat/common/wsgi.py:304
+#: heat/common/wsgi.py:302
 #, python-format
 msgid "Removing dead child %s"
 msgstr "Entfernen von inaktivem untergeordnetem Element %s"
 
-#: heat/common/wsgi.py:662
+#: heat/common/wsgi.py:660
 #, python-format
 msgid "Exception handling resource: %s"
 msgstr "Ausnahmebehandlungsressource: %s"
 
-#: heat/common/wsgi.py:684
+#: heat/common/wsgi.py:682
 #, python-format
 msgid "Returning %(code)s to user: %(explanation)s"
 msgstr ""
 
-#: heat/common/wsgi.py:758
+#: heat/common/wsgi.py:756
 #, python-format
 msgid "Unexpected error occurred serving API: %s"
 msgstr ""
@@ -127,17 +127,17 @@ msgstr ""
 msgid "Unexpected number of keys in watch_data.data!"
 msgstr ""
 
-#: heat/engine/environment.py:470
+#: heat/engine/environment.py:469
 #, python-format
 msgid "Failed to read %s"
 msgstr ""
 
-#: heat/engine/environment.py:482
+#: heat/engine/environment.py:481
 #, python-format
 msgid "Failed to parse %(file_path)s"
 msgstr ""
 
-#: heat/engine/environment.py:486
+#: heat/engine/environment.py:485
 #, python-format
 msgid "Failed to read %(file_path)s"
 msgstr ""
@@ -166,12 +166,12 @@ msgstr "Datenbankfehler %s"
 msgid "signal %(name)s : %(msg)s"
 msgstr "Signal %(name)s : %(msg)s"
 
-#: heat/engine/service.py:352
+#: heat/engine/service.py:356
 #, python-format
 msgid "Failed to stop engine service, %s"
 msgstr ""
 
-#: heat/engine/service.py:1364
+#: heat/engine/service.py:1374
 msgid "Filtering by namespace/metric not yet supported"
 msgstr ""
 
@@ -180,6 +180,11 @@ msgstr ""
 msgid "Unable to retrieve stack %s for periodic task"
 msgstr ""
 
+#: heat/engine/stack.py:487
+#, python-format
+msgid "Exception: %s"
+msgstr "Ausnahmesituation: %s"
+
 #: heat/engine/stack.py:737
 #, python-format
 msgid "Unexpected action %s passed to update!"
@@ -200,6 +205,11 @@ msgstr ""
 msgid "Resource %(name)s create failed: %(ex)s"
 msgstr ""
 
+#: heat/engine/worker.py:76
+#, python-format
+msgid "WorkerService is failed to stop, %s"
+msgstr ""
+
 #: heat/engine/clients/__init__.py:143
 #, python-format
 msgid "Invalid cloud_backend setting in heat.conf detected  - %s"
@@ -226,7 +236,7 @@ msgstr ""
 msgid "exception: %s"
 msgstr ""
 
-#: heat/engine/resources/wait_condition.py:71
+#: heat/engine/resources/wait_condition.py:72
 #, python-format
 msgid "Metadata failed validation for %s"
 msgstr ""
@@ -253,6 +263,6 @@ msgstr "Regel %s konnte nicht verstanden werden"
 msgid "No handler for matches of kind %s"
 msgstr "Kein Handler für Übereinstimmungen des Typs %s"
 
-#: heat/openstack/common/service.py:269
+#: heat/openstack/common/service.py:268
 msgid "Unhandled exception"
 msgstr "Nicht behandelte Ausnahme"
diff --git a/heat/locale/es/LC_MESSAGES/heat-log-error.po b/heat/locale/es/LC_MESSAGES/heat-log-error.po
index f716b8118..de1a38d8b 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: 2015-02-17 06:02+0000\n"
-"PO-Revision-Date: 2015-02-16 22:06+0000\n"
+"POT-Creation-Date: 2015-02-24 06:03+0000\n"
+"PO-Revision-Date: 2015-02-23 21:31+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/heat/language/"
 "es/)\n"
@@ -26,7 +26,7 @@ msgstr ""
 "Ec2Token autorización ha fallado, ningún auth_uri especificado en el archivo "
 "de configuración"
 
-#: heat/api/aws/utils.py:98
+#: heat/api/aws/utils.py:99
 #, python-format
 msgid "Request does not contain %s parameter!"
 msgstr "Solicitud no contiene parámetro %s!"
@@ -35,11 +35,11 @@ msgstr "Solicitud no contiene parámetro %s!"
 msgid "Request does not contain required MetricData"
 msgstr "Solicitud no contiene el requisito MetricData"
 
-#: heat/common/context.py:200
+#: heat/common/context.py:203
 msgid "Keystone v3 API connection failed, no password trust or auth_token!"
 msgstr ""
 
-#: heat/common/exception.py:116
+#: heat/common/exception.py:115
 msgid "Exception in string format operation"
 msgstr "Excepción en la operación de formato de cadena"
 
@@ -69,22 +69,22 @@ msgstr ""
 msgid "Failed to add user %(user)s to role %(role)s, check role exists!"
 msgstr ""
 
-#: heat/common/lifecycle_plugin_utils.py:44
+#: heat/common/lifecycle_plugin_utils.py:46
 msgid "failed to get lifecycle plug point classes"
 msgstr "fallo a obtener clases de punto de conexión de ciclo de vida "
 
-#: heat/common/lifecycle_plugin_utils.py:51
+#: heat/common/lifecycle_plugin_utils.py:53
 #, python-format
 msgid "failed to instantiate stack lifecycle class %s"
 msgstr "fallo al instanciar clase de ciclo de vida de la pila %s"
 
-#: heat/common/lifecycle_plugin_utils.py:56
+#: heat/common/lifecycle_plugin_utils.py:58
 msgid "failed to sort lifecycle plug point classes"
 msgstr ""
 "ha ocurrido un error al ordenar las clases del punto de conexión de ciclo de "
 "vida"
 
-#: heat/common/lifecycle_plugin_utils.py:109
+#: heat/common/lifecycle_plugin_utils.py:111
 #, python-format
 msgid "%(opname) %(ci)s failed for %(a)s on %(sid)s"
 msgstr "%(opname) %(ci)s fallo por %(a)s en %(sid)s"
@@ -94,30 +94,30 @@ msgstr "%(opname) %(ci)s fallo por %(a)s en %(sid)s"
 msgid "Failed to import module %s"
 msgstr "No se ha podido importar el modulo %s"
 
-#: heat/common/wsgi.py:267
+#: heat/common/wsgi.py:265
 msgid "SIGTERM received"
 msgstr "Se ha recibido SIGTERM"
 
-#: heat/common/wsgi.py:276
+#: heat/common/wsgi.py:274
 msgid "SIGHUP received"
 msgstr ""
 
-#: heat/common/wsgi.py:304
+#: heat/common/wsgi.py:302
 #, python-format
 msgid "Removing dead child %s"
 msgstr "Eliminando hijo muerto %s"
 
-#: heat/common/wsgi.py:662
+#: heat/common/wsgi.py:660
 #, python-format
 msgid "Exception handling resource: %s"
 msgstr "Excepción al manejar recurso: %s"
 
-#: heat/common/wsgi.py:684
+#: heat/common/wsgi.py:682
 #, python-format
 msgid "Returning %(code)s to user: %(explanation)s"
 msgstr "Devolviendo %(code)s al usuario: %(explanation)s"
 
-#: heat/common/wsgi.py:758
+#: heat/common/wsgi.py:756
 #, python-format
 msgid "Unexpected error occurred serving API: %s"
 msgstr "Error inesperado ha ocurrido sirviendo API: %s"
@@ -130,17 +130,17 @@ msgstr ""
 msgid "Unexpected number of keys in watch_data.data!"
 msgstr ""
 
-#: heat/engine/environment.py:470
+#: heat/engine/environment.py:469
 #, python-format
 msgid "Failed to read %s"
 msgstr "Ha fallado leer %s"
 
-#: heat/engine/environment.py:482
+#: heat/engine/environment.py:481
 #, python-format
 msgid "Failed to parse %(file_path)s"
 msgstr ""
 
-#: heat/engine/environment.py:486
+#: heat/engine/environment.py:485
 #, python-format
 msgid "Failed to read %(file_path)s"
 msgstr ""
@@ -169,12 +169,12 @@ msgstr "Error de base de datos %s"
 msgid "signal %(name)s : %(msg)s"
 msgstr "señal %(name)s : %(msg)s"
 
-#: heat/engine/service.py:352
+#: heat/engine/service.py:356
 #, python-format
 msgid "Failed to stop engine service, %s"
 msgstr ""
 
-#: heat/engine/service.py:1364
+#: heat/engine/service.py:1374
 msgid "Filtering by namespace/metric not yet supported"
 msgstr ""
 
@@ -183,6 +183,11 @@ msgstr ""
 msgid "Unable to retrieve stack %s for periodic task"
 msgstr "No ha sido posible obtener la pila %s para tareas periódicas"
 
+#: heat/engine/stack.py:487
+#, python-format
+msgid "Exception: %s"
+msgstr ""
+
 #: heat/engine/stack.py:737
 #, python-format
 msgid "Unexpected action %s passed to update!"
@@ -203,6 +208,11 @@ msgstr ""
 msgid "Resource %(name)s create failed: %(ex)s"
 msgstr ""
 
+#: heat/engine/worker.py:76
+#, python-format
+msgid "WorkerService is failed to stop, %s"
+msgstr ""
+
 #: heat/engine/clients/__init__.py:143
 #, python-format
 msgid "Invalid cloud_backend setting in heat.conf detected  - %s"
@@ -229,7 +239,7 @@ msgstr ""
 msgid "exception: %s"
 msgstr ""
 
-#: heat/engine/resources/wait_condition.py:71
+#: heat/engine/resources/wait_condition.py:72
 #, python-format
 msgid "Metadata failed validation for %s"
 msgstr ""
@@ -256,6 +266,6 @@ msgstr "Ha ocurrido un error al interpretar la regla %s"
 msgid "No handler for matches of kind %s"
 msgstr "No hay manejador para coincidencias de clase %s"
 
-#: heat/openstack/common/service.py:269
+#: heat/openstack/common/service.py:268
 msgid "Unhandled exception"
 msgstr "Excepción no controlada"
diff --git a/heat/locale/es/LC_MESSAGES/heat-log-info.po b/heat/locale/es/LC_MESSAGES/heat-log-info.po
index 53da898da..f4bc297e8 100644
--- a/heat/locale/es/LC_MESSAGES/heat-log-info.po
+++ b/heat/locale/es/LC_MESSAGES/heat-log-info.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Heat\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-02-18 06:02+0000\n"
-"PO-Revision-Date: 2015-02-17 15:44+0000\n"
+"POT-Creation-Date: 2015-02-24 06:02+0000\n"
+"PO-Revision-Date: 2015-02-23 21:31+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/heat/language/"
 "es/)\n"
@@ -49,7 +49,7 @@ msgstr "Autenticación AWS correcta."
 msgid "AWS authentication failure."
 msgstr "Autenticación AWS incorrecta."
 
-#: heat/api/cfn/v1/stacks.py:440 heat/engine/service.py:761
+#: heat/api/cfn/v1/stacks.py:440 heat/engine/service.py:771
 msgid "validate_template"
 msgstr "validate_template"
 
@@ -141,91 +141,96 @@ msgstr "borrando %s"
 msgid "%s timed out"
 msgstr ""
 
-#: heat/engine/service.py:350
+#: heat/engine/service.py:354
 msgid "Engine service is stopped successfully"
 msgstr ""
 
-#: heat/engine/service.py:362
+#: heat/engine/service.py:364
+#, python-format
+msgid "WorkerService is stopped in engine %s"
+msgstr ""
+
+#: heat/engine/service.py:372
 #, python-format
 msgid "Waiting stack %s processing to be finished"
 msgstr ""
 
-#: heat/engine/service.py:366
+#: heat/engine/service.py:376
 #, python-format
 msgid "Stack %s processing was finished"
 msgstr "Pila %s procesando ha finalizado"
 
-#: heat/engine/service.py:371
+#: heat/engine/service.py:381
 #, python-format
 msgid "Service %s is deleted"
 msgstr ""
 
-#: heat/engine/service.py:374
+#: heat/engine/service.py:384
 msgid "All threads were gone, terminating engine"
 msgstr ""
 
-#: heat/engine/service.py:565
+#: heat/engine/service.py:575
 #, python-format
 msgid "previewing stack %s"
 msgstr ""
 
-#: heat/engine/service.py:605
+#: heat/engine/service.py:615
 #, python-format
 msgid "Creating stack %s"
 msgstr ""
 
-#: heat/engine/service.py:628
+#: heat/engine/service.py:638
 #, python-format
 msgid "Stack create failed, status %s"
 msgstr ""
 
-#: heat/engine/service.py:663
+#: heat/engine/service.py:673
 #, python-format
 msgid "Updating stack %s"
 msgstr ""
 
-#: heat/engine/service.py:727
+#: heat/engine/service.py:737
 #, python-format
 msgid "Starting cancel of updating stack %s"
 msgstr ""
 
-#: heat/engine/service.py:856
+#: heat/engine/service.py:866
 #, python-format
 msgid "Deleting stack %s"
 msgstr ""
 
-#: heat/engine/service.py:909
+#: heat/engine/service.py:919
 #, python-format
 msgid "abandoning stack %s"
 msgstr ""
 
-#: heat/engine/service.py:1194
+#: heat/engine/service.py:1204
 #, python-format
 msgid ""
 "%(stack)s is in state %(action)s_IN_PROGRESS, snapshot is not permitted."
 msgstr ""
 
-#: heat/engine/service.py:1237
+#: heat/engine/service.py:1247
 #, python-format
 msgid "Checking stack %s"
 msgstr ""
 
-#: heat/engine/service.py:1591
+#: heat/engine/service.py:1541
 #, python-format
 msgid "Service %s is updated"
 msgstr ""
 
-#: heat/engine/service.py:1602
+#: heat/engine/service.py:1552
 #, python-format
 msgid "Service %s was aborted"
 msgstr ""
 
-#: heat/engine/service.py:1611
+#: heat/engine/service.py:1561
 #, python-format
 msgid "Service %s is restarted"
 msgstr ""
 
-#: heat/engine/service.py:1624
+#: heat/engine/service.py:1574
 #, python-format
 msgid "Service %s is started"
 msgstr ""
@@ -343,6 +348,14 @@ msgstr ""
 msgid "no action for new state %s"
 msgstr ""
 
+#: heat/engine/worker.py:60
+msgid "Starting WorkerService ..."
+msgstr ""
+
+#: heat/engine/worker.py:71
+msgid "Stopping WorkerService ..."
+msgstr ""
+
 #: heat/engine/clients/os/cinder.py:62
 #, python-format
 msgid "Creating Cinder client with volume API version %d."
@@ -373,7 +386,7 @@ msgstr ""
 msgid "ElasticIp create %s"
 msgstr ""
 
-#: heat/engine/resources/loadbalancer.py:504
+#: heat/engine/resources/loadbalancer.py:507
 #, python-format
 msgid "Using custom loadbalancer template %s"
 msgstr ""
diff --git a/heat/locale/fr/LC_MESSAGES/heat-log-error.po b/heat/locale/fr/LC_MESSAGES/heat-log-error.po
index 430fc2938..7a93b763b 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: 2015-02-17 06:02+0000\n"
-"PO-Revision-Date: 2015-02-16 22:06+0000\n"
+"POT-Creation-Date: 2015-02-24 06:03+0000\n"
+"PO-Revision-Date: 2015-02-23 21:31+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/heat/language/"
 "fr/)\n"
@@ -26,7 +26,7 @@ msgstr ""
 "Échec de l’autorisation Ec2Token, pas auth_uri spécifié dans le fichier de "
 "configuration"
 
-#: heat/api/aws/utils.py:98
+#: heat/api/aws/utils.py:99
 #, python-format
 msgid "Request does not contain %s parameter!"
 msgstr "La requete ne doit pas contenir le paramètre %s!"
@@ -35,13 +35,13 @@ msgstr "La requete ne doit pas contenir le paramètre %s!"
 msgid "Request does not contain required MetricData"
 msgstr "La requête ne doit pas contenir comme pré-requis MetricData"
 
-#: heat/common/context.py:200
+#: heat/common/context.py:203
 msgid "Keystone v3 API connection failed, no password trust or auth_token!"
 msgstr ""
 "Échec de la connexion Keystone v3 API, pas de mot de passe de confiance ou "
 "auth_token!"
 
-#: heat/common/exception.py:116
+#: heat/common/exception.py:115
 msgid "Exception in string format operation"
 msgstr "Exception dans le formatage de la chaîne"
 
@@ -73,20 +73,20 @@ msgstr ""
 "Échec d'ajout de l'utilisateur %(user)s pour le rôle %(role)s, vérifier si "
 "le role existe!"
 
-#: heat/common/lifecycle_plugin_utils.py:44
+#: heat/common/lifecycle_plugin_utils.py:46
 msgid "failed to get lifecycle plug point classes"
 msgstr ""
 
-#: heat/common/lifecycle_plugin_utils.py:51
+#: heat/common/lifecycle_plugin_utils.py:53
 #, python-format
 msgid "failed to instantiate stack lifecycle class %s"
 msgstr ""
 
-#: heat/common/lifecycle_plugin_utils.py:56
+#: heat/common/lifecycle_plugin_utils.py:58
 msgid "failed to sort lifecycle plug point classes"
 msgstr ""
 
-#: heat/common/lifecycle_plugin_utils.py:109
+#: heat/common/lifecycle_plugin_utils.py:111
 #, python-format
 msgid "%(opname) %(ci)s failed for %(a)s on %(sid)s"
 msgstr "%(opname) %(ci)s échec pour  %(a)s sur %(sid)s"
@@ -96,30 +96,30 @@ msgstr "%(opname) %(ci)s échec pour  %(a)s sur %(sid)s"
 msgid "Failed to import module %s"
 msgstr "Echec lors de l'import du module %s"
 
-#: heat/common/wsgi.py:267
+#: heat/common/wsgi.py:265
 msgid "SIGTERM received"
 msgstr "SIGTERM reçu"
 
-#: heat/common/wsgi.py:276
+#: heat/common/wsgi.py:274
 msgid "SIGHUP received"
 msgstr "SIGHUP reçu"
 
-#: heat/common/wsgi.py:304
+#: heat/common/wsgi.py:302
 #, python-format
 msgid "Removing dead child %s"
 msgstr "Retrait de l'enfant arrêté %s"
 
-#: heat/common/wsgi.py:662
+#: heat/common/wsgi.py:660
 #, python-format
 msgid "Exception handling resource: %s"
 msgstr "Exception lors du traitement de la ressource : %s"
 
-#: heat/common/wsgi.py:684
+#: heat/common/wsgi.py:682
 #, python-format
 msgid "Returning %(code)s to user: %(explanation)s"
 msgstr "Renvoie %(code)s à l'utilisateur : %(explanation)s"
 
-#: heat/common/wsgi.py:758
+#: heat/common/wsgi.py:756
 #, python-format
 msgid "Unexpected error occurred serving API: %s"
 msgstr ""
@@ -132,17 +132,17 @@ msgstr ""
 msgid "Unexpected number of keys in watch_data.data!"
 msgstr ""
 
-#: heat/engine/environment.py:470
+#: heat/engine/environment.py:469
 #, python-format
 msgid "Failed to read %s"
 msgstr "Echec de lecture %s"
 
-#: heat/engine/environment.py:482
+#: heat/engine/environment.py:481
 #, python-format
 msgid "Failed to parse %(file_path)s"
 msgstr "Echec d'analyse  %(file_path)s"
 
-#: heat/engine/environment.py:486
+#: heat/engine/environment.py:485
 #, python-format
 msgid "Failed to read %(file_path)s"
 msgstr "Echec de lecture %(file_path)s"
@@ -171,12 +171,12 @@ msgstr "Erreur base de donné %s"
 msgid "signal %(name)s : %(msg)s"
 msgstr "signal %(name)s : %(msg)s"
 
-#: heat/engine/service.py:352
+#: heat/engine/service.py:356
 #, python-format
 msgid "Failed to stop engine service, %s"
 msgstr ""
 
-#: heat/engine/service.py:1364
+#: heat/engine/service.py:1374
 msgid "Filtering by namespace/metric not yet supported"
 msgstr ""
 
@@ -185,6 +185,11 @@ msgstr ""
 msgid "Unable to retrieve stack %s for periodic task"
 msgstr "Impossible de récupérer la stack %s pour la tache périodique"
 
+#: heat/engine/stack.py:487
+#, python-format
+msgid "Exception: %s"
+msgstr ""
+
 #: heat/engine/stack.py:737
 #, python-format
 msgid "Unexpected action %s passed to update!"
@@ -205,6 +210,11 @@ msgstr "Ressource %(name)s échec de suppression: %(ex)s"
 msgid "Resource %(name)s create failed: %(ex)s"
 msgstr ""
 
+#: heat/engine/worker.py:76
+#, python-format
+msgid "WorkerService is failed to stop, %s"
+msgstr ""
+
 #: heat/engine/clients/__init__.py:143
 #, python-format
 msgid "Invalid cloud_backend setting in heat.conf detected  - %s"
@@ -231,7 +241,7 @@ msgstr ""
 msgid "exception: %s"
 msgstr ""
 
-#: heat/engine/resources/wait_condition.py:71
+#: heat/engine/resources/wait_condition.py:72
 #, python-format
 msgid "Metadata failed validation for %s"
 msgstr "Echec de validation de metadata pour %s"
@@ -258,6 +268,6 @@ msgstr "Règle %s incompréhensible"
 msgid "No handler for matches of kind %s"
 msgstr "Aucun gestionnaire pour les correspondances de type %s"
 
-#: heat/openstack/common/service.py:269
+#: heat/openstack/common/service.py:268
 msgid "Unhandled exception"
 msgstr "Exception non gérée"
diff --git a/heat/locale/fr/LC_MESSAGES/heat-log-info.po b/heat/locale/fr/LC_MESSAGES/heat-log-info.po
index 69db03243..2823a5b63 100644
--- a/heat/locale/fr/LC_MESSAGES/heat-log-info.po
+++ b/heat/locale/fr/LC_MESSAGES/heat-log-info.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Heat\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-02-18 06:02+0000\n"
-"PO-Revision-Date: 2015-02-17 15:44+0000\n"
+"POT-Creation-Date: 2015-02-24 06:02+0000\n"
+"PO-Revision-Date: 2015-02-23 21:31+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/heat/language/"
 "fr/)\n"
@@ -49,7 +49,7 @@ msgstr "Succès de l'authentification AWS"
 msgid "AWS authentication failure."
 msgstr "Echec de l'authentification AWS"
 
-#: heat/api/cfn/v1/stacks.py:440 heat/engine/service.py:761
+#: heat/api/cfn/v1/stacks.py:440 heat/engine/service.py:771
 msgid "validate_template"
 msgstr "validate_template"
 
@@ -141,91 +141,96 @@ msgstr "Suppression %s"
 msgid "%s timed out"
 msgstr ""
 
-#: heat/engine/service.py:350
+#: heat/engine/service.py:354
 msgid "Engine service is stopped successfully"
 msgstr ""
 
-#: heat/engine/service.py:362
+#: heat/engine/service.py:364
+#, python-format
+msgid "WorkerService is stopped in engine %s"
+msgstr ""
+
+#: heat/engine/service.py:372
 #, python-format
 msgid "Waiting stack %s processing to be finished"
 msgstr ""
 
-#: heat/engine/service.py:366
+#: heat/engine/service.py:376
 #, python-format
 msgid "Stack %s processing was finished"
 msgstr ""
 
-#: heat/engine/service.py:371
+#: heat/engine/service.py:381
 #, python-format
 msgid "Service %s is deleted"
 msgstr ""
 
-#: heat/engine/service.py:374
+#: heat/engine/service.py:384
 msgid "All threads were gone, terminating engine"
 msgstr ""
 
-#: heat/engine/service.py:565
+#: heat/engine/service.py:575
 #, python-format
 msgid "previewing stack %s"
 msgstr ""
 
-#: heat/engine/service.py:605
+#: heat/engine/service.py:615
 #, python-format
 msgid "Creating stack %s"
 msgstr "Création de la stack %s"
 
-#: heat/engine/service.py:628
+#: heat/engine/service.py:638
 #, python-format
 msgid "Stack create failed, status %s"
 msgstr "Echec de création de la stack, status %s"
 
-#: heat/engine/service.py:663
+#: heat/engine/service.py:673
 #, python-format
 msgid "Updating stack %s"
 msgstr "Mise à jour de la stack %s"
 
-#: heat/engine/service.py:727
+#: heat/engine/service.py:737
 #, python-format
 msgid "Starting cancel of updating stack %s"
 msgstr ""
 
-#: heat/engine/service.py:856
+#: heat/engine/service.py:866
 #, python-format
 msgid "Deleting stack %s"
 msgstr "Suppresion de la stack %s"
 
-#: heat/engine/service.py:909
+#: heat/engine/service.py:919
 #, python-format
 msgid "abandoning stack %s"
 msgstr "Abandon de la stack %s"
 
-#: heat/engine/service.py:1194
+#: heat/engine/service.py:1204
 #, python-format
 msgid ""
 "%(stack)s is in state %(action)s_IN_PROGRESS, snapshot is not permitted."
 msgstr ""
 
-#: heat/engine/service.py:1237
+#: heat/engine/service.py:1247
 #, python-format
 msgid "Checking stack %s"
 msgstr "Vérification de la stack %s"
 
-#: heat/engine/service.py:1591
+#: heat/engine/service.py:1541
 #, python-format
 msgid "Service %s is updated"
 msgstr ""
 
-#: heat/engine/service.py:1602
+#: heat/engine/service.py:1552
 #, python-format
 msgid "Service %s was aborted"
 msgstr ""
 
-#: heat/engine/service.py:1611
+#: heat/engine/service.py:1561
 #, python-format
 msgid "Service %s is restarted"
 msgstr ""
 
-#: heat/engine/service.py:1624
+#: heat/engine/service.py:1574
 #, python-format
 msgid "Service %s is started"
 msgstr ""
@@ -343,6 +348,14 @@ msgstr ""
 msgid "no action for new state %s"
 msgstr ""
 
+#: heat/engine/worker.py:60
+msgid "Starting WorkerService ..."
+msgstr ""
+
+#: heat/engine/worker.py:71
+msgid "Stopping WorkerService ..."
+msgstr ""
+
 #: heat/engine/clients/os/cinder.py:62
 #, python-format
 msgid "Creating Cinder client with volume API version %d."
@@ -373,7 +386,7 @@ msgstr ""
 msgid "ElasticIp create %s"
 msgstr ""
 
-#: heat/engine/resources/loadbalancer.py:504
+#: heat/engine/resources/loadbalancer.py:507
 #, python-format
 msgid "Using custom loadbalancer template %s"
 msgstr ""
diff --git a/heat/locale/heat-log-error.pot b/heat/locale/heat-log-error.pot
index f73ea43fb..324e506ea 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.dev106\n"
+"Project-Id-Version: heat 2015.1.dev147\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-02-17 06:02+0000\n"
+"POT-Creation-Date: 2015-02-24 06: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"
@@ -21,7 +21,7 @@ msgstr ""
 msgid "Ec2Token authorization failed, no auth_uri specified in config file"
 msgstr ""
 
-#: heat/api/aws/utils.py:98
+#: heat/api/aws/utils.py:99
 #, python-format
 msgid "Request does not contain %s parameter!"
 msgstr ""
@@ -30,11 +30,11 @@ msgstr ""
 msgid "Request does not contain required MetricData"
 msgstr ""
 
-#: heat/common/context.py:200
+#: heat/common/context.py:203
 msgid "Keystone v3 API connection failed, no password trust or auth_token!"
 msgstr ""
 
-#: heat/common/exception.py:116
+#: heat/common/exception.py:115
 msgid "Exception in string format operation"
 msgstr ""
 
@@ -64,20 +64,20 @@ msgstr ""
 msgid "Failed to add user %(user)s to role %(role)s, check role exists!"
 msgstr ""
 
-#: heat/common/lifecycle_plugin_utils.py:44
+#: heat/common/lifecycle_plugin_utils.py:46
 msgid "failed to get lifecycle plug point classes"
 msgstr ""
 
-#: heat/common/lifecycle_plugin_utils.py:51
+#: heat/common/lifecycle_plugin_utils.py:53
 #, python-format
 msgid "failed to instantiate stack lifecycle class %s"
 msgstr ""
 
-#: heat/common/lifecycle_plugin_utils.py:56
+#: heat/common/lifecycle_plugin_utils.py:58
 msgid "failed to sort lifecycle plug point classes"
 msgstr ""
 
-#: heat/common/lifecycle_plugin_utils.py:109
+#: heat/common/lifecycle_plugin_utils.py:111
 #, python-format
 msgid "%(opname) %(ci)s failed for %(a)s on %(sid)s"
 msgstr ""
@@ -87,30 +87,30 @@ msgstr ""
 msgid "Failed to import module %s"
 msgstr ""
 
-#: heat/common/wsgi.py:267
+#: heat/common/wsgi.py:265
 msgid "SIGTERM received"
 msgstr ""
 
-#: heat/common/wsgi.py:276
+#: heat/common/wsgi.py:274
 msgid "SIGHUP received"
 msgstr ""
 
-#: heat/common/wsgi.py:304
+#: heat/common/wsgi.py:302
 #, python-format
 msgid "Removing dead child %s"
 msgstr ""
 
-#: heat/common/wsgi.py:662
+#: heat/common/wsgi.py:660
 #, python-format
 msgid "Exception handling resource: %s"
 msgstr ""
 
-#: heat/common/wsgi.py:684
+#: heat/common/wsgi.py:682
 #, python-format
 msgid "Returning %(code)s to user: %(explanation)s"
 msgstr ""
 
-#: heat/common/wsgi.py:758
+#: heat/common/wsgi.py:756
 #, python-format
 msgid "Unexpected error occurred serving API: %s"
 msgstr ""
@@ -123,17 +123,17 @@ msgstr ""
 msgid "Unexpected number of keys in watch_data.data!"
 msgstr ""
 
-#: heat/engine/environment.py:470
+#: heat/engine/environment.py:469
 #, python-format
 msgid "Failed to read %s"
 msgstr ""
 
-#: heat/engine/environment.py:482
+#: heat/engine/environment.py:481
 #, python-format
 msgid "Failed to parse %(file_path)s"
 msgstr ""
 
-#: heat/engine/environment.py:486
+#: heat/engine/environment.py:485
 #, python-format
 msgid "Failed to read %(file_path)s"
 msgstr ""
@@ -162,12 +162,12 @@ msgstr ""
 msgid "signal %(name)s : %(msg)s"
 msgstr ""
 
-#: heat/engine/service.py:352
+#: heat/engine/service.py:356
 #, python-format
 msgid "Failed to stop engine service, %s"
 msgstr ""
 
-#: heat/engine/service.py:1364
+#: heat/engine/service.py:1374
 msgid "Filtering by namespace/metric not yet supported"
 msgstr ""
 
@@ -176,6 +176,11 @@ msgstr ""
 msgid "Unable to retrieve stack %s for periodic task"
 msgstr ""
 
+#: heat/engine/stack.py:487
+#, python-format
+msgid "Exception: %s"
+msgstr ""
+
 #: heat/engine/stack.py:737
 #, python-format
 msgid "Unexpected action %s passed to update!"
@@ -196,6 +201,11 @@ msgstr ""
 msgid "Resource %(name)s create failed: %(ex)s"
 msgstr ""
 
+#: heat/engine/worker.py:76
+#, python-format
+msgid "WorkerService is failed to stop, %s"
+msgstr ""
+
 #: heat/engine/clients/__init__.py:143
 #, python-format
 msgid "Invalid cloud_backend setting in heat.conf detected  - %s"
@@ -222,7 +232,7 @@ msgstr ""
 msgid "exception: %s"
 msgstr ""
 
-#: heat/engine/resources/wait_condition.py:71
+#: heat/engine/resources/wait_condition.py:72
 #, python-format
 msgid "Metadata failed validation for %s"
 msgstr ""
@@ -249,7 +259,7 @@ msgstr ""
 msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: heat/openstack/common/service.py:269
+#: heat/openstack/common/service.py:268
 msgid "Unhandled exception"
 msgstr ""
 
diff --git a/heat/locale/heat-log-info.pot b/heat/locale/heat-log-info.pot
index 8b949f4b9..0bc88e110 100644
--- a/heat/locale/heat-log-info.pot
+++ b/heat/locale/heat-log-info.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: heat 2015.1.dev117\n"
+"Project-Id-Version: heat 2015.1.dev147\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-02-18 06:02+0000\n"
+"POT-Creation-Date: 2015-02-24 06:02+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"
@@ -46,7 +46,7 @@ msgstr ""
 msgid "AWS authentication failure."
 msgstr ""
 
-#: heat/api/cfn/v1/stacks.py:440 heat/engine/service.py:761
+#: heat/api/cfn/v1/stacks.py:440 heat/engine/service.py:771
 msgid "validate_template"
 msgstr ""
 
@@ -138,90 +138,95 @@ msgstr ""
 msgid "%s timed out"
 msgstr ""
 
-#: heat/engine/service.py:350
+#: heat/engine/service.py:354
 msgid "Engine service is stopped successfully"
 msgstr ""
 
-#: heat/engine/service.py:362
+#: heat/engine/service.py:364
+#, python-format
+msgid "WorkerService is stopped in engine %s"
+msgstr ""
+
+#: heat/engine/service.py:372
 #, python-format
 msgid "Waiting stack %s processing to be finished"
 msgstr ""
 
-#: heat/engine/service.py:366
+#: heat/engine/service.py:376
 #, python-format
 msgid "Stack %s processing was finished"
 msgstr ""
 
-#: heat/engine/service.py:371
+#: heat/engine/service.py:381
 #, python-format
 msgid "Service %s is deleted"
 msgstr ""
 
-#: heat/engine/service.py:374
+#: heat/engine/service.py:384
 msgid "All threads were gone, terminating engine"
 msgstr ""
 
-#: heat/engine/service.py:565
+#: heat/engine/service.py:575
 #, python-format
 msgid "previewing stack %s"
 msgstr ""
 
-#: heat/engine/service.py:605
+#: heat/engine/service.py:615
 #, python-format
 msgid "Creating stack %s"
 msgstr ""
 
-#: heat/engine/service.py:628
+#: heat/engine/service.py:638
 #, python-format
 msgid "Stack create failed, status %s"
 msgstr ""
 
-#: heat/engine/service.py:663
+#: heat/engine/service.py:673
 #, python-format
 msgid "Updating stack %s"
 msgstr ""
 
-#: heat/engine/service.py:727
+#: heat/engine/service.py:737
 #, python-format
 msgid "Starting cancel of updating stack %s"
 msgstr ""
 
-#: heat/engine/service.py:856
+#: heat/engine/service.py:866
 #, python-format
 msgid "Deleting stack %s"
 msgstr ""
 
-#: heat/engine/service.py:909
+#: heat/engine/service.py:919
 #, python-format
 msgid "abandoning stack %s"
 msgstr ""
 
-#: heat/engine/service.py:1194
+#: heat/engine/service.py:1204
 #, python-format
 msgid "%(stack)s is in state %(action)s_IN_PROGRESS, snapshot is not permitted."
 msgstr ""
 
-#: heat/engine/service.py:1237
+#: heat/engine/service.py:1247
 #, python-format
 msgid "Checking stack %s"
 msgstr ""
 
-#: heat/engine/service.py:1591
+#: heat/engine/service.py:1541
 #, python-format
 msgid "Service %s is updated"
 msgstr ""
 
-#: heat/engine/service.py:1602
+#: heat/engine/service.py:1552
 #, python-format
 msgid "Service %s was aborted"
 msgstr ""
 
-#: heat/engine/service.py:1611
+#: heat/engine/service.py:1561
 #, python-format
 msgid "Service %s is restarted"
 msgstr ""
 
-#: heat/engine/service.py:1624
+#: heat/engine/service.py:1574
 #, python-format
 msgid "Service %s is started"
 msgstr ""
@@ -338,6 +343,14 @@ msgstr ""
 msgid "no action for new state %s"
 msgstr ""
 
+#: heat/engine/worker.py:60
+msgid "Starting WorkerService ..."
+msgstr ""
+
+#: heat/engine/worker.py:71
+msgid "Stopping WorkerService ..."
+msgstr ""
+
 #: heat/engine/clients/os/cinder.py:62
 #, python-format
 msgid "Creating Cinder client with volume API version %d."
@@ -368,7 +381,7 @@ msgstr ""
 msgid "ElasticIp create %s"
 msgstr ""
 
-#: heat/engine/resources/loadbalancer.py:504
+#: heat/engine/resources/loadbalancer.py:507
 #, python-format
 msgid "Using custom loadbalancer template %s"
 msgstr ""
diff --git a/heat/locale/heat.pot b/heat/locale/heat.pot
index f56ee6bdb..93a5b89b4 100644
--- a/heat/locale/heat.pot
+++ b/heat/locale/heat.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: heat 2015.1.dev117\n"
+"Project-Id-Version: heat 2015.1.dev147\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-02-18 06:02+0000\n"
+"POT-Creation-Date: 2015-02-24 06:02+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"
@@ -1278,71 +1278,71 @@ msgstr ""
 msgid "Stack Name"
 msgstr ""
 
-#: heat/engine/properties.py:84
+#: heat/engine/properties.py:87
 #, python-format
 msgid "Unknown key(s) %s"
 msgstr ""
 
-#: heat/engine/properties.py:106
+#: heat/engine/properties.py:109
 #, python-format
 msgid "No %s specified"
 msgstr ""
 
-#: heat/engine/properties.py:116
+#: heat/engine/properties.py:119
 #, python-format
 msgid "%(schema)s supplied for %(type)s %(data)s"
 msgstr ""
 
-#: heat/engine/properties.py:234
+#: heat/engine/properties.py:245
 #, python-format
 msgid "Value '%s' is not an integer"
 msgstr ""
 
-#: heat/engine/properties.py:250
+#: heat/engine/properties.py:261
 msgid "Value must be a string"
 msgstr ""
 
-#: heat/engine/properties.py:272
+#: heat/engine/properties.py:291
 #, python-format
 msgid "\"%s\" is not a map"
 msgstr ""
 
-#: heat/engine/properties.py:282
+#: heat/engine/properties.py:301
 #, python-format
 msgid "\"%s\" is not a list"
 msgstr ""
 
-#: heat/engine/properties.py:295
+#: heat/engine/properties.py:314
 #, python-format
 msgid "\"%s\" is not a valid boolean"
 msgstr ""
 
-#: heat/engine/properties.py:357
+#: heat/engine/properties.py:376
 #, python-format
 msgid "Property %(prop)s: %(ua)s and %(im)s cannot both be True"
 msgstr ""
 
-#: heat/engine/properties.py:368
+#: heat/engine/properties.py:387
 #, python-format
 msgid "Property error : %s"
 msgstr ""
 
-#: heat/engine/properties.py:373
+#: heat/engine/properties.py:392
 #, python-format
 msgid "Property %s not implemented yet"
 msgstr ""
 
-#: heat/engine/properties.py:378
+#: heat/engine/properties.py:397
 #, python-format
 msgid "Unknown Property %s"
 msgstr ""
 
-#: heat/engine/properties.py:383
+#: heat/engine/properties.py:402
 #, python-format
 msgid "%(prefix)sInvalid Property %(key)s"
 msgstr ""
 
-#: heat/engine/properties.py:406
+#: heat/engine/properties.py:425
 #, python-format
 msgid "%(prefix)sProperty %(key)s not assigned"
 msgstr ""
@@ -1438,51 +1438,38 @@ msgstr ""
 msgid "%s Timed out"
 msgstr ""
 
-#: heat/engine/service.py:506
+#: heat/engine/service.py:516
 #, python-format
 msgid ""
 "You have reached the maximum stacks per tenant, %d. Please delete some "
 "stacks."
 msgstr ""
 
-#: heat/engine/service.py:569 heat/engine/service.py:632
+#: heat/engine/service.py:579 heat/engine/service.py:642
 msgid "Convergence engine"
 msgstr ""
 
-#: heat/engine/service.py:668
+#: heat/engine/service.py:678
 msgid "Updating a stack when it is suspended"
 msgstr ""
 
-#: heat/engine/service.py:672
+#: heat/engine/service.py:682
 msgid "Updating a stack when it is deleting"
 msgstr ""
 
-#: heat/engine/service.py:724
+#: heat/engine/service.py:734
 #, python-format
 msgid "Cancelling update when stack is %s"
 msgstr ""
 
-#: heat/engine/service.py:763
+#: heat/engine/service.py:773
 msgid "No Template provided."
 msgstr ""
 
-#: heat/engine/service.py:1432
+#: heat/engine/service.py:1442
 msgid "server_id must be specified"
 msgstr ""
 
-#: heat/engine/service.py:1485
-msgid "deployment_id must be specified"
-msgstr ""
-
-#: heat/engine/service.py:1503
-#, python-format
-msgid "Deployment exited with non-zero status code: %s"
-msgstr ""
-
-#: heat/engine/service.py:1530
-msgid "Outputs received"
-msgstr ""
-
 #: heat/engine/stack.py:91
 #, python-format
 msgid ""
@@ -2062,12 +2049,12 @@ msgid ""
 msgstr ""
 
 #: heat/engine/resources/instance_group.py:64
-#: heat/engine/resources/loadbalancer.py:369
-#: heat/engine/resources/loadbalancer.py:374
-#: heat/engine/resources/loadbalancer.py:383
-#: heat/engine/resources/loadbalancer.py:388
-#: heat/engine/resources/loadbalancer.py:393
-#: heat/engine/resources/loadbalancer.py:398
+#: heat/engine/resources/loadbalancer.py:372
+#: heat/engine/resources/loadbalancer.py:377
+#: heat/engine/resources/loadbalancer.py:386
+#: heat/engine/resources/loadbalancer.py:391
+#: heat/engine/resources/loadbalancer.py:396
+#: heat/engine/resources/loadbalancer.py:401
 #: heat/engine/resources/aws/autoscaling_group.py:119
 #: heat/engine/resources/aws/autoscaling_group.py:161
 #: heat/engine/resources/aws/autoscaling_group.py:166
@@ -2110,18 +2097,28 @@ msgstr ""
 msgid "A comma-delimited list of server ip addresses. (Heat extension)."
 msgstr ""
 
-#: heat/engine/resources/instance_group.py:155
+#: heat/engine/resources/instance_group.py:143
+#, python-format
+msgid "Maximum %s is 1 hour."
+msgstr ""
+
+#: heat/engine/resources/instance_group.py:156
 #, python-format
 msgid "%(lc)s (%(ref)s) reference can not be found."
 msgstr ""
 
-#: heat/engine/resources/instance_group.py:160
+#: heat/engine/resources/instance_group.py:161
 #, python-format
 msgid ""
 "%(lc)s (%(ref)s) requires a reference to the configuration not just the "
 "name of the resource."
 msgstr ""
 
+#: heat/engine/resources/instance_group.py:306
+#, python-format
+msgid "The current %s will result in stack update timeout."
+msgstr ""
+
 #: heat/engine/resources/internet_gateway.py:70
 #, python-format
 msgid "Expected 1 external network, found %d"
@@ -2139,83 +2136,83 @@ msgstr ""
 msgid "ID of the VPNGateway to attach to the VPC."
 msgstr ""
 
-#: heat/engine/resources/loadbalancer.py:298
+#: heat/engine/resources/loadbalancer.py:301
 msgid "The Availability Zones in which to create the load balancer."
 msgstr ""
 
-#: heat/engine/resources/loadbalancer.py:303
+#: heat/engine/resources/loadbalancer.py:306
 msgid "An application health check for the instances."
 msgstr ""
 
-#: heat/engine/resources/loadbalancer.py:307
+#: heat/engine/resources/loadbalancer.py:310
 msgid ""
 "The number of consecutive health probe successes required before moving "
 "the instance to the healthy state."
 msgstr ""
 
-#: heat/engine/resources/loadbalancer.py:314
+#: heat/engine/resources/loadbalancer.py:317
 msgid ""
 "The approximate interval, in seconds, between health checks of an "
 "individual instance."
 msgstr ""
 
-#: heat/engine/resources/loadbalancer.py:320
+#: heat/engine/resources/loadbalancer.py:323
 msgid "The port being checked."
 msgstr ""
 
-#: heat/engine/resources/loadbalancer.py:325
+#: heat/engine/resources/loadbalancer.py:328
 msgid "Health probe timeout, in seconds."
 msgstr ""
 
-#: heat/engine/resources/loadbalancer.py:330
+#: heat/engine/resources/loadbalancer.py:333
 msgid ""
 "The number of consecutive health probe failures required before moving "
 "the instance to the unhealthy state"
 msgstr ""
 
-#: heat/engine/resources/loadbalancer.py:339
+#: heat/engine/resources/loadbalancer.py:342
 msgid "The list of instance IDs load balanced."
 msgstr ""
 
-#: heat/engine/resources/loadbalancer.py:344
+#: heat/engine/resources/loadbalancer.py:347
 msgid "One or more listeners for this load balancer."
 msgstr ""
 
-#: heat/engine/resources/loadbalancer.py:350
+#: heat/engine/resources/loadbalancer.py:353
 msgid "TCP port on which the instance server is listening."
 msgstr ""
 
-#: heat/engine/resources/loadbalancer.py:356
+#: heat/engine/resources/loadbalancer.py:359
 msgid "The external load balancer port number."
 msgstr ""
 
-#: heat/engine/resources/loadbalancer.py:361
+#: heat/engine/resources/loadbalancer.py:364
 msgid "The load balancer transport protocol to use."
 msgstr ""
 
-#: heat/engine/resources/loadbalancer.py:405
+#: heat/engine/resources/loadbalancer.py:408
 msgid "The name of the hosted zone that is associated with the LoadBalancer."
 msgstr ""
 
-#: heat/engine/resources/loadbalancer.py:409
+#: heat/engine/resources/loadbalancer.py:412
 msgid "The ID of the hosted zone name that is associated with the LoadBalancer."
 msgstr ""
 
-#: heat/engine/resources/loadbalancer.py:413
+#: heat/engine/resources/loadbalancer.py:416
 msgid "The DNS name for the LoadBalancer."
 msgstr ""
 
-#: heat/engine/resources/loadbalancer.py:416
+#: heat/engine/resources/loadbalancer.py:419
 msgid ""
 "The security group that you can use as part of your inbound rules for "
 "your LoadBalancer's back-end instances."
 msgstr ""
 
-#: heat/engine/resources/loadbalancer.py:420
+#: heat/engine/resources/loadbalancer.py:423
 msgid "Owner of the source security group."
 msgstr ""
 
-#: heat/engine/resources/loadbalancer.py:582
+#: heat/engine/resources/loadbalancer.py:585
 msgid "Custom LoadBalancer template can not be found"
 msgstr ""
 
@@ -5704,30 +5701,39 @@ msgstr ""
 msgid "ID of project for API authentication"
 msgstr ""
 
-#: heat/engine/resources/software_config/software_deployment.py:489
+#: heat/engine/resources/software_config/software_deployment.py:469
+#, python-format
+msgid "Deployment exited with non-zero status code: %s"
+msgstr ""
+
+#: heat/engine/resources/software_config/software_deployment.py:496
+msgid "Outputs received"
+msgstr ""
+
+#: heat/engine/resources/software_config/software_deployment.py:538
 #, python-format
 msgid ""
 "Resource %s's property user_data_format should be set to SOFTWARE_CONFIG "
 "since there are software deployments on it."
 msgstr ""
 
-#: heat/engine/resources/software_config/software_deployment.py:527
+#: heat/engine/resources/software_config/software_deployment.py:576
 msgid "A map of Nova names and IDs to apply configuration to."
 msgstr ""
 
-#: heat/engine/resources/software_config/software_deployment.py:539
+#: heat/engine/resources/software_config/software_deployment.py:588
 msgid ""
 "A map of Nova names and captured stdouts from the configuration execution"
 " to each server."
 msgstr ""
 
-#: heat/engine/resources/software_config/software_deployment.py:543
+#: heat/engine/resources/software_config/software_deployment.py:592
 msgid ""
 "A map of Nova names and captured stderrs from the configuration execution"
 " to each server."
 msgstr ""
 
-#: heat/engine/resources/software_config/software_deployment.py:547
+#: heat/engine/resources/software_config/software_deployment.py:596
 msgid ""
 "A map of Nova names and returned status code from the configuration "
 "execution"
@@ -5862,7 +5868,7 @@ msgid ""
 "deprecated. Use only \"network\" property."
 msgstr ""
 
-#: heat/tests/test_software_deployment.py:691
+#: heat/tests/test_software_deployment.py:741
 msgid "need more memory."
 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 f5c85098d..f13b35bb2 100644
--- a/heat/locale/ko_KR/LC_MESSAGES/heat-log-error.po
+++ b/heat/locale/ko_KR/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: 2015-02-17 06:02+0000\n"
-"PO-Revision-Date: 2015-02-16 22:06+0000\n"
+"POT-Creation-Date: 2015-02-24 06:03+0000\n"
+"PO-Revision-Date: 2015-02-23 21:31+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Korean (Korea) (http://www.transifex.com/projects/p/heat/"
 "language/ko_KR/)\n"
@@ -24,7 +24,7 @@ msgstr ""
 msgid "Ec2Token authorization failed, no auth_uri specified in config file"
 msgstr "Ec2Token 인증 실패, 설정 파일에 지정된 auth_uri 가 없음."
 
-#: heat/api/aws/utils.py:98
+#: heat/api/aws/utils.py:99
 #, python-format
 msgid "Request does not contain %s parameter!"
 msgstr "%s 매개변수가 요청에 포함되지 않음 !"
@@ -33,11 +33,11 @@ msgstr "%s 매개변수가 요청에 포함되지 않음 !"
 msgid "Request does not contain required MetricData"
 msgstr "요청에 필요한 MetricData 가 없음. "
 
-#: heat/common/context.py:200
+#: heat/common/context.py:203
 msgid "Keystone v3 API connection failed, no password trust or auth_token!"
 msgstr "신뢰할수 없는 비밀번호나 auth_token으로 Keystone v3 API 연결 실패, "
 
-#: heat/common/exception.py:116
+#: heat/common/exception.py:115
 msgid "Exception in string format operation"
 msgstr "문자열 형식화 오퍼레이션의 예외"
 
@@ -69,20 +69,20 @@ msgstr ""
 "규정 %(role)s에 사용자 %(user)s 를 추가하는데 실패했습니다. 규정을 확인하세"
 "요.!"
 
-#: heat/common/lifecycle_plugin_utils.py:44
+#: heat/common/lifecycle_plugin_utils.py:46
 msgid "failed to get lifecycle plug point classes"
 msgstr "라이프 사이클 플러그 포인트 클래스를 가져 오지 못했습니다"
 
-#: heat/common/lifecycle_plugin_utils.py:51
+#: heat/common/lifecycle_plugin_utils.py:53
 #, python-format
 msgid "failed to instantiate stack lifecycle class %s"
 msgstr "스택 수명주기 %s 클래스의 인스턴스를 실패"
 
-#: heat/common/lifecycle_plugin_utils.py:56
+#: heat/common/lifecycle_plugin_utils.py:58
 msgid "failed to sort lifecycle plug point classes"
 msgstr "라이프 사이클 플러그 포인트 클래스를 정렬하는 데 실패"
 
-#: heat/common/lifecycle_plugin_utils.py:109
+#: heat/common/lifecycle_plugin_utils.py:111
 #, python-format
 msgid "%(opname) %(ci)s failed for %(a)s on %(sid)s"
 msgstr "%(sid)s의 %(a)s를 위한  %(opname) %(ci)s 실패 "
@@ -92,30 +92,30 @@ msgstr "%(sid)s의 %(a)s를 위한  %(opname) %(ci)s 실패 "
 msgid "Failed to import module %s"
 msgstr "%s의 모듈을 가져 오는 데 실패했습니다."
 
-#: heat/common/wsgi.py:267
+#: heat/common/wsgi.py:265
 msgid "SIGTERM received"
 msgstr "SIGTERM 수신"
 
-#: heat/common/wsgi.py:276
+#: heat/common/wsgi.py:274
 msgid "SIGHUP received"
 msgstr ""
 
-#: heat/common/wsgi.py:304
+#: heat/common/wsgi.py:302
 #, python-format
 msgid "Removing dead child %s"
 msgstr ""
 
-#: heat/common/wsgi.py:662
+#: heat/common/wsgi.py:660
 #, python-format
 msgid "Exception handling resource: %s"
 msgstr "자원 처리 예외: %s"
 
-#: heat/common/wsgi.py:684
+#: heat/common/wsgi.py:682
 #, python-format
 msgid "Returning %(code)s to user: %(explanation)s"
 msgstr "%(code)s을(를) 사용자에게 리턴 중: %(explanation)s"
 
-#: heat/common/wsgi.py:758
+#: heat/common/wsgi.py:756
 #, python-format
 msgid "Unexpected error occurred serving API: %s"
 msgstr ""
@@ -128,17 +128,17 @@ msgstr ""
 msgid "Unexpected number of keys in watch_data.data!"
 msgstr "watch_data.data의 키의 예기치 않은 수!"
 
-#: heat/engine/environment.py:470
+#: heat/engine/environment.py:469
 #, python-format
 msgid "Failed to read %s"
 msgstr "%s를 읽지 못했습니다."
 
-#: heat/engine/environment.py:482
+#: heat/engine/environment.py:481
 #, python-format
 msgid "Failed to parse %(file_path)s"
 msgstr "%(file_path)s를 구문 분석하는 데 실패했습니다."
 
-#: heat/engine/environment.py:486
+#: heat/engine/environment.py:485
 #, python-format
 msgid "Failed to read %(file_path)s"
 msgstr "%(file_path)s를 읽는데 실패했습니다. "
@@ -167,12 +167,12 @@ msgstr "DB %s에 오류가 있습니다. "
 msgid "signal %(name)s : %(msg)s"
 msgstr ""
 
-#: heat/engine/service.py:352
+#: heat/engine/service.py:356
 #, python-format
 msgid "Failed to stop engine service, %s"
 msgstr ""
 
-#: heat/engine/service.py:1364
+#: heat/engine/service.py:1374
 msgid "Filtering by namespace/metric not yet supported"
 msgstr "네임 스페이스의 필터링 / 메트릭은 아직 지원하지 않습니다. "
 
@@ -181,6 +181,11 @@ msgstr "네임 스페이스의 필터링 / 메트릭은 아직 지원하지 않
 msgid "Unable to retrieve stack %s for periodic task"
 msgstr "주기적인 작업에 대한 스택 %s를 검색 할 수 없습니다"
 
+#: heat/engine/stack.py:487
+#, python-format
+msgid "Exception: %s"
+msgstr ""
+
 #: heat/engine/stack.py:737
 #, python-format
 msgid "Unexpected action %s passed to update!"
@@ -201,6 +206,11 @@ msgstr "자원 %(name)s를 지울수 없습니다. : %(ex)s"
 msgid "Resource %(name)s create failed: %(ex)s"
 msgstr ""
 
+#: heat/engine/worker.py:76
+#, python-format
+msgid "WorkerService is failed to stop, %s"
+msgstr ""
+
 #: heat/engine/clients/__init__.py:143
 #, python-format
 msgid "Invalid cloud_backend setting in heat.conf detected  - %s"
@@ -230,7 +240,7 @@ msgstr ""
 msgid "exception: %s"
 msgstr ""
 
-#: heat/engine/resources/wait_condition.py:71
+#: heat/engine/resources/wait_condition.py:72
 #, python-format
 msgid "Metadata failed validation for %s"
 msgstr "메타 데이터는 %s의 유효성 검증을 실패했습니다"
@@ -257,6 +267,6 @@ msgstr "%s 규칙을 이해하는데 실패했습니다"
 msgid "No handler for matches of kind %s"
 msgstr "%s 유형의 일치에 대한 핸들러가 없음"
 
-#: heat/openstack/common/service.py:269
+#: heat/openstack/common/service.py:268
 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 071646aa4..5caeb4aee 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: 2015-02-17 06:02+0000\n"
-"PO-Revision-Date: 2015-02-16 22:06+0000\n"
+"POT-Creation-Date: 2015-02-24 06:03+0000\n"
+"PO-Revision-Date: 2015-02-23 21:31+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/heat/"
 "language/pt_BR/)\n"
@@ -26,7 +26,7 @@ msgstr ""
 "Autorização Ec2Token falhou, auth_uri não especificada no arquivo de "
 "configuração"
 
-#: heat/api/aws/utils.py:98
+#: heat/api/aws/utils.py:99
 #, python-format
 msgid "Request does not contain %s parameter!"
 msgstr "Requisição não contém parâmetro %s!"
@@ -35,11 +35,11 @@ msgstr "Requisição não contém parâmetro %s!"
 msgid "Request does not contain required MetricData"
 msgstr "Requisição não contém MetricData requerida"
 
-#: heat/common/context.py:200
+#: heat/common/context.py:203
 msgid "Keystone v3 API connection failed, no password trust or auth_token!"
 msgstr ""
 
-#: heat/common/exception.py:116
+#: heat/common/exception.py:115
 msgid "Exception in string format operation"
 msgstr "Exceção na operação de formato de sequência"
 
@@ -69,20 +69,20 @@ msgstr ""
 msgid "Failed to add user %(user)s to role %(role)s, check role exists!"
 msgstr ""
 
-#: heat/common/lifecycle_plugin_utils.py:44
+#: heat/common/lifecycle_plugin_utils.py:46
 msgid "failed to get lifecycle plug point classes"
 msgstr ""
 
-#: heat/common/lifecycle_plugin_utils.py:51
+#: heat/common/lifecycle_plugin_utils.py:53
 #, python-format
 msgid "failed to instantiate stack lifecycle class %s"
 msgstr ""
 
-#: heat/common/lifecycle_plugin_utils.py:56
+#: heat/common/lifecycle_plugin_utils.py:58
 msgid "failed to sort lifecycle plug point classes"
 msgstr ""
 
-#: heat/common/lifecycle_plugin_utils.py:109
+#: heat/common/lifecycle_plugin_utils.py:111
 #, python-format
 msgid "%(opname) %(ci)s failed for %(a)s on %(sid)s"
 msgstr ""
@@ -92,30 +92,30 @@ msgstr ""
 msgid "Failed to import module %s"
 msgstr "Falha ao importar módulo %s"
 
-#: heat/common/wsgi.py:267
+#: heat/common/wsgi.py:265
 msgid "SIGTERM received"
 msgstr "SIGTERM recebido"
 
-#: heat/common/wsgi.py:276
+#: heat/common/wsgi.py:274
 msgid "SIGHUP received"
 msgstr "SIGHUP recebido"
 
-#: heat/common/wsgi.py:304
+#: heat/common/wsgi.py:302
 #, python-format
 msgid "Removing dead child %s"
 msgstr "Removendo filho inativo %s"
 
-#: heat/common/wsgi.py:662
+#: heat/common/wsgi.py:660
 #, python-format
 msgid "Exception handling resource: %s"
 msgstr "Exceção ao manipular recurso: %s"
 
-#: heat/common/wsgi.py:684
+#: heat/common/wsgi.py:682
 #, python-format
 msgid "Returning %(code)s to user: %(explanation)s"
 msgstr "Retornando %(code)s para o usuário: %(explanation)s"
 
-#: heat/common/wsgi.py:758
+#: heat/common/wsgi.py:756
 #, python-format
 msgid "Unexpected error occurred serving API: %s"
 msgstr ""
@@ -128,17 +128,17 @@ msgstr ""
 msgid "Unexpected number of keys in watch_data.data!"
 msgstr ""
 
-#: heat/engine/environment.py:470
+#: heat/engine/environment.py:469
 #, python-format
 msgid "Failed to read %s"
 msgstr ""
 
-#: heat/engine/environment.py:482
+#: heat/engine/environment.py:481
 #, python-format
 msgid "Failed to parse %(file_path)s"
 msgstr ""
 
-#: heat/engine/environment.py:486
+#: heat/engine/environment.py:485
 #, python-format
 msgid "Failed to read %(file_path)s"
 msgstr ""
@@ -167,12 +167,12 @@ msgstr ""
 msgid "signal %(name)s : %(msg)s"
 msgstr ""
 
-#: heat/engine/service.py:352
+#: heat/engine/service.py:356
 #, python-format
 msgid "Failed to stop engine service, %s"
 msgstr ""
 
-#: heat/engine/service.py:1364
+#: heat/engine/service.py:1374
 msgid "Filtering by namespace/metric not yet supported"
 msgstr ""
 
@@ -181,6 +181,11 @@ msgstr ""
 msgid "Unable to retrieve stack %s for periodic task"
 msgstr ""
 
+#: heat/engine/stack.py:487
+#, python-format
+msgid "Exception: %s"
+msgstr ""
+
 #: heat/engine/stack.py:737
 #, python-format
 msgid "Unexpected action %s passed to update!"
@@ -201,6 +206,11 @@ msgstr ""
 msgid "Resource %(name)s create failed: %(ex)s"
 msgstr ""
 
+#: heat/engine/worker.py:76
+#, python-format
+msgid "WorkerService is failed to stop, %s"
+msgstr ""
+
 #: heat/engine/clients/__init__.py:143
 #, python-format
 msgid "Invalid cloud_backend setting in heat.conf detected  - %s"
@@ -227,7 +237,7 @@ msgstr ""
 msgid "exception: %s"
 msgstr ""
 
-#: heat/engine/resources/wait_condition.py:71
+#: heat/engine/resources/wait_condition.py:72
 #, python-format
 msgid "Metadata failed validation for %s"
 msgstr ""
@@ -254,6 +264,6 @@ msgstr "Falha ao interpretar regra %s"
 msgid "No handler for matches of kind %s"
 msgstr "Nenhum manipulador para correspondências do tipo %s"
 
-#: heat/openstack/common/service.py:269
+#: heat/openstack/common/service.py:268
 msgid "Unhandled exception"
 msgstr "Exceção não tratada"