diff --git a/sahara/locale/de/LC_MESSAGES/sahara-log-error.po b/sahara/locale/de/LC_MESSAGES/sahara-log-error.po
index 7e05c11969..b19d320250 100644
--- a/sahara/locale/de/LC_MESSAGES/sahara-log-error.po
+++ b/sahara/locale/de/LC_MESSAGES/sahara-log-error.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sahara\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-14 06:10+0000\n"
+"POT-Creation-Date: 2014-08-22 06:11+0000\n"
 "PO-Revision-Date: 2014-07-29 23:43+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/sahara/language/"
@@ -135,23 +135,14 @@ msgid ""
 "\"Decommissioned\" status."
 msgstr ""
 
-#: sahara/service/heat_engine.py:119
-msgid "Unable to complete rollback, aborting"
+#: sahara/service/ops.py:120
+#, python-format
+msgid "Error during operating cluster '%(name)s' (reason: %(reason)s)"
 msgstr ""
 
-#: sahara/service/ops.py:144
+#: sahara/service/ops.py:139
 #, python-format
-msgid "Can't configure cluster '%(name)s' (reason: %(reason)s)"
-msgstr ""
-
-#: sahara/service/ops.py:162
-#, python-format
-msgid "Can't start services for cluster '%(name)s' (reason: %(reason)s)"
-msgstr ""
-
-#: sahara/service/ops.py:213
-#, python-format
-msgid "Can't scale cluster '%(name)s' (reason: %(reason)s)"
+msgid "Error during rollback of cluster '%(name)s' (reason: %(reason)s)"
 msgstr ""
 
 #: sahara/service/trusts.py:64
diff --git a/sahara/locale/de/LC_MESSAGES/sahara-log-info.po b/sahara/locale/de/LC_MESSAGES/sahara-log-info.po
index 71e6b36a1f..1d18c31d2c 100644
--- a/sahara/locale/de/LC_MESSAGES/sahara-log-info.po
+++ b/sahara/locale/de/LC_MESSAGES/sahara-log-info.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sahara\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-14 06:10+0000\n"
+"POT-Creation-Date: 2014-08-22 06:11+0000\n"
 "PO-Revision-Date: 2014-07-16 14:42+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/sahara/language/"
@@ -71,7 +71,7 @@ msgstr "Überspringe periodische Aufgabe %(task)s weil sie deaktiviert ist"
 msgid "Plugin '%(plugin_name)s' loaded %(entry_point)s"
 msgstr ""
 
-#: sahara/plugins/cdh/deploy.py:289
+#: sahara/plugins/cdh/deploy.py:292
 msgid "Cloudera Manager has been started"
 msgstr ""
 
@@ -321,39 +321,34 @@ msgstr ""
 msgid "Hive Metastore server at %s has been started"
 msgstr ""
 
-#: sahara/service/direct_engine.py:281
+#: sahara/service/direct_engine.py:269
 #, python-format
 msgid "Cluster '%s': all instances are active"
 msgstr ""
 
-#: sahara/service/direct_engine.py:293
+#: sahara/service/direct_engine.py:281 sahara/service/heat_engine.py:146
 #, python-format
 msgid "Cluster '%(name)s' creation rollback (reason: %(reason)s)"
 msgstr ""
 
-#: sahara/service/direct_engine.py:301
+#: sahara/service/direct_engine.py:289 sahara/service/heat_engine.py:163
 #, python-format
 msgid "Cluster '%(name)s' scaling rollback (reason: %(reason)s)"
 msgstr ""
 
-#: sahara/service/engine.py:73
+#: sahara/service/engine.py:77
 #, python-format
 msgid "Cluster '%s': all instances have IPs assigned"
 msgstr ""
 
-#: sahara/service/engine.py:83
+#: sahara/service/engine.py:87
 #, python-format
 msgid "Cluster '%s': all instances are accessible"
 msgstr ""
 
-#: sahara/service/heat_engine.py:150
+#: sahara/service/ops.py:115 sahara/service/ops.py:134
 #, python-format
-msgid "Cluster '%s' creation rollback"
-msgstr ""
-
-#: sahara/service/heat_engine.py:165
-#, python-format
-msgid "Cluster '%s' scaling rollback"
+msgid "Cluster with %s was deleted. Canceling current operation."
 msgstr ""
 
 #: sahara/service/periodic.py:96
@@ -387,15 +382,6 @@ msgstr ""
 msgid "Cluster status has been changed: id=%(id)s, New status=%(status)s"
 msgstr ""
 
-#: sahara/utils/general.py:78
-#, python-format
-msgid "Cluster %(name)s (id=%(id)s) was deleted. Canceling current operation."
-msgstr ""
-
-#: sahara/utils/general.py:84 sahara/utils/general.py:85
-msgid "Unknown"
-msgstr ""
-
 #: sahara/utils/timing.py:56
 #, python-format
 msgid "Exception raised by invocation of %(name)s: %(info)s"
diff --git a/sahara/locale/de/LC_MESSAGES/sahara-log-warning.po b/sahara/locale/de/LC_MESSAGES/sahara-log-warning.po
index 2c0b7a7f09..f0a865bc25 100644
--- a/sahara/locale/de/LC_MESSAGES/sahara-log-warning.po
+++ b/sahara/locale/de/LC_MESSAGES/sahara-log-warning.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sahara\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-14 06:10+0000\n"
+"POT-Creation-Date: 2014-08-22 06:11+0000\n"
 "PO-Revision-Date: 2014-07-16 14:29+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/sahara/language/"
@@ -75,43 +75,29 @@ msgstr ""
 msgid "Plugin received wrong applicable target '%s' for xml configs"
 msgstr ""
 
-#: sahara/service/direct_engine.py:82 sahara/service/heat_engine.py:70
-#, python-format
-msgid "Can't start cluster '%(cluster)s' (reason: %(reason)s)"
-msgstr ""
-
-#: sahara/service/direct_engine.py:129 sahara/service/heat_engine.py:104
-#, python-format
-msgid "Can't scale cluster '%(cluster)s' (reason: %(reason)s)"
-msgstr ""
-
-#: sahara/service/direct_engine.py:320
+#: sahara/service/direct_engine.py:311
 #, python-format
 msgid ""
 "Attempted to delete non-existent floating IP in pool %(pool)s from instance "
 "%(instance)s"
 msgstr ""
 
-#: sahara/service/direct_engine.py:328
+#: sahara/service/direct_engine.py:319
 #, python-format
 msgid "Detaching volumes from instance %s failed"
 msgstr ""
 
-#: sahara/service/direct_engine.py:334
+#: sahara/service/direct_engine.py:325
 #, python-format
 msgid "Attempted to delete non-existent instance %s"
 msgstr ""
 
-#: sahara/service/engine.py:169
+#: sahara/service/engine.py:173
 msgid ""
 "Presumably the operation failed because the cluster was deleted by a user "
 "during the process."
 msgstr ""
 
-#: sahara/service/heat_engine.py:124
-msgid "Rollback successful. Throwing off an initial exception."
-msgstr ""
-
 #: sahara/service/heat_engine.py:181
 #, python-format
 msgid "Did not found stack for cluster %s"
diff --git a/sahara/locale/en_AU/LC_MESSAGES/sahara-log-error.po b/sahara/locale/en_AU/LC_MESSAGES/sahara-log-error.po
index 740b834ad4..18260272d2 100644
--- a/sahara/locale/en_AU/LC_MESSAGES/sahara-log-error.po
+++ b/sahara/locale/en_AU/LC_MESSAGES/sahara-log-error.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sahara\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-14 06:10+0000\n"
+"POT-Creation-Date: 2014-08-22 06:11+0000\n"
 "PO-Revision-Date: 2014-07-17 07:01+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: English (Australia) (http://www.transifex.com/projects/p/"
@@ -134,23 +134,14 @@ msgid ""
 "\"Decommissioned\" status."
 msgstr ""
 
-#: sahara/service/heat_engine.py:119
-msgid "Unable to complete rollback, aborting"
+#: sahara/service/ops.py:120
+#, python-format
+msgid "Error during operating cluster '%(name)s' (reason: %(reason)s)"
 msgstr ""
 
-#: sahara/service/ops.py:144
+#: sahara/service/ops.py:139
 #, python-format
-msgid "Can't configure cluster '%(name)s' (reason: %(reason)s)"
-msgstr ""
-
-#: sahara/service/ops.py:162
-#, python-format
-msgid "Can't start services for cluster '%(name)s' (reason: %(reason)s)"
-msgstr ""
-
-#: sahara/service/ops.py:213
-#, python-format
-msgid "Can't scale cluster '%(name)s' (reason: %(reason)s)"
+msgid "Error during rollback of cluster '%(name)s' (reason: %(reason)s)"
 msgstr ""
 
 #: sahara/service/trusts.py:64
diff --git a/sahara/locale/en_AU/LC_MESSAGES/sahara-log-info.po b/sahara/locale/en_AU/LC_MESSAGES/sahara-log-info.po
index 15cb668502..3d404bf4fa 100644
--- a/sahara/locale/en_AU/LC_MESSAGES/sahara-log-info.po
+++ b/sahara/locale/en_AU/LC_MESSAGES/sahara-log-info.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sahara\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-14 06:10+0000\n"
+"POT-Creation-Date: 2014-08-22 06:11+0000\n"
 "PO-Revision-Date: 2014-07-16 14:42+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: English (Australia) (http://www.transifex.com/projects/p/"
@@ -69,7 +69,7 @@ msgstr "Skipping periodic task %(task)s because it is disabled"
 msgid "Plugin '%(plugin_name)s' loaded %(entry_point)s"
 msgstr ""
 
-#: sahara/plugins/cdh/deploy.py:289
+#: sahara/plugins/cdh/deploy.py:292
 msgid "Cloudera Manager has been started"
 msgstr ""
 
@@ -319,39 +319,34 @@ msgstr ""
 msgid "Hive Metastore server at %s has been started"
 msgstr ""
 
-#: sahara/service/direct_engine.py:281
+#: sahara/service/direct_engine.py:269
 #, python-format
 msgid "Cluster '%s': all instances are active"
 msgstr ""
 
-#: sahara/service/direct_engine.py:293
+#: sahara/service/direct_engine.py:281 sahara/service/heat_engine.py:146
 #, python-format
 msgid "Cluster '%(name)s' creation rollback (reason: %(reason)s)"
 msgstr ""
 
-#: sahara/service/direct_engine.py:301
+#: sahara/service/direct_engine.py:289 sahara/service/heat_engine.py:163
 #, python-format
 msgid "Cluster '%(name)s' scaling rollback (reason: %(reason)s)"
 msgstr ""
 
-#: sahara/service/engine.py:73
+#: sahara/service/engine.py:77
 #, python-format
 msgid "Cluster '%s': all instances have IPs assigned"
 msgstr ""
 
-#: sahara/service/engine.py:83
+#: sahara/service/engine.py:87
 #, python-format
 msgid "Cluster '%s': all instances are accessible"
 msgstr ""
 
-#: sahara/service/heat_engine.py:150
+#: sahara/service/ops.py:115 sahara/service/ops.py:134
 #, python-format
-msgid "Cluster '%s' creation rollback"
-msgstr ""
-
-#: sahara/service/heat_engine.py:165
-#, python-format
-msgid "Cluster '%s' scaling rollback"
+msgid "Cluster with %s was deleted. Canceling current operation."
 msgstr ""
 
 #: sahara/service/periodic.py:96
@@ -385,15 +380,6 @@ msgstr ""
 msgid "Cluster status has been changed: id=%(id)s, New status=%(status)s"
 msgstr ""
 
-#: sahara/utils/general.py:78
-#, python-format
-msgid "Cluster %(name)s (id=%(id)s) was deleted. Canceling current operation."
-msgstr ""
-
-#: sahara/utils/general.py:84 sahara/utils/general.py:85
-msgid "Unknown"
-msgstr ""
-
 #: sahara/utils/timing.py:56
 #, python-format
 msgid "Exception raised by invocation of %(name)s: %(info)s"
diff --git a/sahara/locale/en_GB/LC_MESSAGES/sahara-log-error.po b/sahara/locale/en_GB/LC_MESSAGES/sahara-log-error.po
index 07af50d76f..c1449d844a 100644
--- a/sahara/locale/en_GB/LC_MESSAGES/sahara-log-error.po
+++ b/sahara/locale/en_GB/LC_MESSAGES/sahara-log-error.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sahara\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-14 06:10+0000\n"
+"POT-Creation-Date: 2014-08-22 06:11+0000\n"
 "PO-Revision-Date: 2014-07-29 23:43+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/"
@@ -135,23 +135,14 @@ msgid ""
 "\"Decommissioned\" status."
 msgstr ""
 
-#: sahara/service/heat_engine.py:119
-msgid "Unable to complete rollback, aborting"
+#: sahara/service/ops.py:120
+#, python-format
+msgid "Error during operating cluster '%(name)s' (reason: %(reason)s)"
 msgstr ""
 
-#: sahara/service/ops.py:144
+#: sahara/service/ops.py:139
 #, python-format
-msgid "Can't configure cluster '%(name)s' (reason: %(reason)s)"
-msgstr ""
-
-#: sahara/service/ops.py:162
-#, python-format
-msgid "Can't start services for cluster '%(name)s' (reason: %(reason)s)"
-msgstr ""
-
-#: sahara/service/ops.py:213
-#, python-format
-msgid "Can't scale cluster '%(name)s' (reason: %(reason)s)"
+msgid "Error during rollback of cluster '%(name)s' (reason: %(reason)s)"
 msgstr ""
 
 #: sahara/service/trusts.py:64
diff --git a/sahara/locale/en_GB/LC_MESSAGES/sahara-log-info.po b/sahara/locale/en_GB/LC_MESSAGES/sahara-log-info.po
index 37eba50f7b..50e791b96b 100644
--- a/sahara/locale/en_GB/LC_MESSAGES/sahara-log-info.po
+++ b/sahara/locale/en_GB/LC_MESSAGES/sahara-log-info.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sahara\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-14 06:10+0000\n"
+"POT-Creation-Date: 2014-08-22 06:11+0000\n"
 "PO-Revision-Date: 2014-07-29 23:43+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/"
@@ -70,7 +70,7 @@ msgstr "Skipping periodic task %(task)s because it is disabled"
 msgid "Plugin '%(plugin_name)s' loaded %(entry_point)s"
 msgstr ""
 
-#: sahara/plugins/cdh/deploy.py:289
+#: sahara/plugins/cdh/deploy.py:292
 msgid "Cloudera Manager has been started"
 msgstr ""
 
@@ -320,39 +320,34 @@ msgstr ""
 msgid "Hive Metastore server at %s has been started"
 msgstr ""
 
-#: sahara/service/direct_engine.py:281
+#: sahara/service/direct_engine.py:269
 #, python-format
 msgid "Cluster '%s': all instances are active"
 msgstr ""
 
-#: sahara/service/direct_engine.py:293
+#: sahara/service/direct_engine.py:281 sahara/service/heat_engine.py:146
 #, python-format
 msgid "Cluster '%(name)s' creation rollback (reason: %(reason)s)"
 msgstr ""
 
-#: sahara/service/direct_engine.py:301
+#: sahara/service/direct_engine.py:289 sahara/service/heat_engine.py:163
 #, python-format
 msgid "Cluster '%(name)s' scaling rollback (reason: %(reason)s)"
 msgstr ""
 
-#: sahara/service/engine.py:73
+#: sahara/service/engine.py:77
 #, python-format
 msgid "Cluster '%s': all instances have IPs assigned"
 msgstr ""
 
-#: sahara/service/engine.py:83
+#: sahara/service/engine.py:87
 #, python-format
 msgid "Cluster '%s': all instances are accessible"
 msgstr ""
 
-#: sahara/service/heat_engine.py:150
+#: sahara/service/ops.py:115 sahara/service/ops.py:134
 #, python-format
-msgid "Cluster '%s' creation rollback"
-msgstr ""
-
-#: sahara/service/heat_engine.py:165
-#, python-format
-msgid "Cluster '%s' scaling rollback"
+msgid "Cluster with %s was deleted. Canceling current operation."
 msgstr ""
 
 #: sahara/service/periodic.py:96
@@ -386,15 +381,6 @@ msgstr ""
 msgid "Cluster status has been changed: id=%(id)s, New status=%(status)s"
 msgstr ""
 
-#: sahara/utils/general.py:78
-#, python-format
-msgid "Cluster %(name)s (id=%(id)s) was deleted. Canceling current operation."
-msgstr ""
-
-#: sahara/utils/general.py:84 sahara/utils/general.py:85
-msgid "Unknown"
-msgstr ""
-
 #: sahara/utils/timing.py:56
 #, python-format
 msgid "Exception raised by invocation of %(name)s: %(info)s"
diff --git a/sahara/locale/en_GB/LC_MESSAGES/sahara-log-warning.po b/sahara/locale/en_GB/LC_MESSAGES/sahara-log-warning.po
index e22d4ed2fb..7d8e26a2d9 100644
--- a/sahara/locale/en_GB/LC_MESSAGES/sahara-log-warning.po
+++ b/sahara/locale/en_GB/LC_MESSAGES/sahara-log-warning.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sahara\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-14 06:10+0000\n"
+"POT-Creation-Date: 2014-08-22 06:11+0000\n"
 "PO-Revision-Date: 2014-07-29 23:43+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/"
@@ -77,43 +77,29 @@ msgstr ""
 msgid "Plugin received wrong applicable target '%s' for xml configs"
 msgstr ""
 
-#: sahara/service/direct_engine.py:82 sahara/service/heat_engine.py:70
-#, python-format
-msgid "Can't start cluster '%(cluster)s' (reason: %(reason)s)"
-msgstr ""
-
-#: sahara/service/direct_engine.py:129 sahara/service/heat_engine.py:104
-#, python-format
-msgid "Can't scale cluster '%(cluster)s' (reason: %(reason)s)"
-msgstr ""
-
-#: sahara/service/direct_engine.py:320
+#: sahara/service/direct_engine.py:311
 #, python-format
 msgid ""
 "Attempted to delete non-existent floating IP in pool %(pool)s from instance "
 "%(instance)s"
 msgstr ""
 
-#: sahara/service/direct_engine.py:328
+#: sahara/service/direct_engine.py:319
 #, python-format
 msgid "Detaching volumes from instance %s failed"
 msgstr ""
 
-#: sahara/service/direct_engine.py:334
+#: sahara/service/direct_engine.py:325
 #, python-format
 msgid "Attempted to delete non-existent instance %s"
 msgstr ""
 
-#: sahara/service/engine.py:169
+#: sahara/service/engine.py:173
 msgid ""
 "Presumably the operation failed because the cluster was deleted by a user "
 "during the process."
 msgstr ""
 
-#: sahara/service/heat_engine.py:124
-msgid "Rollback successful. Throwing off an initial exception."
-msgstr ""
-
 #: sahara/service/heat_engine.py:181
 #, python-format
 msgid "Did not found stack for cluster %s"
diff --git a/sahara/locale/es/LC_MESSAGES/sahara-log-error.po b/sahara/locale/es/LC_MESSAGES/sahara-log-error.po
index 5a8eeb9e75..41bcb72f1f 100644
--- a/sahara/locale/es/LC_MESSAGES/sahara-log-error.po
+++ b/sahara/locale/es/LC_MESSAGES/sahara-log-error.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sahara\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-14 06:10+0000\n"
+"POT-Creation-Date: 2014-08-22 06:11+0000\n"
 "PO-Revision-Date: 2014-07-29 23:43+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/sahara/language/"
@@ -134,23 +134,14 @@ msgid ""
 "\"Decommissioned\" status."
 msgstr ""
 
-#: sahara/service/heat_engine.py:119
-msgid "Unable to complete rollback, aborting"
+#: sahara/service/ops.py:120
+#, python-format
+msgid "Error during operating cluster '%(name)s' (reason: %(reason)s)"
 msgstr ""
 
-#: sahara/service/ops.py:144
+#: sahara/service/ops.py:139
 #, python-format
-msgid "Can't configure cluster '%(name)s' (reason: %(reason)s)"
-msgstr ""
-
-#: sahara/service/ops.py:162
-#, python-format
-msgid "Can't start services for cluster '%(name)s' (reason: %(reason)s)"
-msgstr ""
-
-#: sahara/service/ops.py:213
-#, python-format
-msgid "Can't scale cluster '%(name)s' (reason: %(reason)s)"
+msgid "Error during rollback of cluster '%(name)s' (reason: %(reason)s)"
 msgstr ""
 
 #: sahara/service/trusts.py:64
diff --git a/sahara/locale/es/LC_MESSAGES/sahara-log-info.po b/sahara/locale/es/LC_MESSAGES/sahara-log-info.po
index 62cf7b7c44..780eb0b81e 100644
--- a/sahara/locale/es/LC_MESSAGES/sahara-log-info.po
+++ b/sahara/locale/es/LC_MESSAGES/sahara-log-info.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sahara\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-14 06:10+0000\n"
+"POT-Creation-Date: 2014-08-22 06:11+0000\n"
 "PO-Revision-Date: 2014-07-16 14:42+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/sahara/language/"
@@ -69,7 +69,7 @@ msgstr "Omitiendo la tarea periódica %(task)s porque está inhabilitada"
 msgid "Plugin '%(plugin_name)s' loaded %(entry_point)s"
 msgstr ""
 
-#: sahara/plugins/cdh/deploy.py:289
+#: sahara/plugins/cdh/deploy.py:292
 msgid "Cloudera Manager has been started"
 msgstr ""
 
@@ -319,39 +319,34 @@ msgstr ""
 msgid "Hive Metastore server at %s has been started"
 msgstr ""
 
-#: sahara/service/direct_engine.py:281
+#: sahara/service/direct_engine.py:269
 #, python-format
 msgid "Cluster '%s': all instances are active"
 msgstr ""
 
-#: sahara/service/direct_engine.py:293
+#: sahara/service/direct_engine.py:281 sahara/service/heat_engine.py:146
 #, python-format
 msgid "Cluster '%(name)s' creation rollback (reason: %(reason)s)"
 msgstr ""
 
-#: sahara/service/direct_engine.py:301
+#: sahara/service/direct_engine.py:289 sahara/service/heat_engine.py:163
 #, python-format
 msgid "Cluster '%(name)s' scaling rollback (reason: %(reason)s)"
 msgstr ""
 
-#: sahara/service/engine.py:73
+#: sahara/service/engine.py:77
 #, python-format
 msgid "Cluster '%s': all instances have IPs assigned"
 msgstr ""
 
-#: sahara/service/engine.py:83
+#: sahara/service/engine.py:87
 #, python-format
 msgid "Cluster '%s': all instances are accessible"
 msgstr ""
 
-#: sahara/service/heat_engine.py:150
+#: sahara/service/ops.py:115 sahara/service/ops.py:134
 #, python-format
-msgid "Cluster '%s' creation rollback"
-msgstr ""
-
-#: sahara/service/heat_engine.py:165
-#, python-format
-msgid "Cluster '%s' scaling rollback"
+msgid "Cluster with %s was deleted. Canceling current operation."
 msgstr ""
 
 #: sahara/service/periodic.py:96
@@ -385,15 +380,6 @@ msgstr ""
 msgid "Cluster status has been changed: id=%(id)s, New status=%(status)s"
 msgstr ""
 
-#: sahara/utils/general.py:78
-#, python-format
-msgid "Cluster %(name)s (id=%(id)s) was deleted. Canceling current operation."
-msgstr ""
-
-#: sahara/utils/general.py:84 sahara/utils/general.py:85
-msgid "Unknown"
-msgstr ""
-
 #: sahara/utils/timing.py:56
 #, python-format
 msgid "Exception raised by invocation of %(name)s: %(info)s"
diff --git a/sahara/locale/fr/LC_MESSAGES/sahara-log-error.po b/sahara/locale/fr/LC_MESSAGES/sahara-log-error.po
index 4c5f26a08a..bc94dc5367 100644
--- a/sahara/locale/fr/LC_MESSAGES/sahara-log-error.po
+++ b/sahara/locale/fr/LC_MESSAGES/sahara-log-error.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sahara\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-14 06:10+0000\n"
+"POT-Creation-Date: 2014-08-22 06:11+0000\n"
 "PO-Revision-Date: 2014-07-29 23:43+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/sahara/language/"
@@ -134,23 +134,14 @@ msgid ""
 "\"Decommissioned\" status."
 msgstr ""
 
-#: sahara/service/heat_engine.py:119
-msgid "Unable to complete rollback, aborting"
+#: sahara/service/ops.py:120
+#, python-format
+msgid "Error during operating cluster '%(name)s' (reason: %(reason)s)"
 msgstr ""
 
-#: sahara/service/ops.py:144
+#: sahara/service/ops.py:139
 #, python-format
-msgid "Can't configure cluster '%(name)s' (reason: %(reason)s)"
-msgstr ""
-
-#: sahara/service/ops.py:162
-#, python-format
-msgid "Can't start services for cluster '%(name)s' (reason: %(reason)s)"
-msgstr ""
-
-#: sahara/service/ops.py:213
-#, python-format
-msgid "Can't scale cluster '%(name)s' (reason: %(reason)s)"
+msgid "Error during rollback of cluster '%(name)s' (reason: %(reason)s)"
 msgstr ""
 
 #: sahara/service/trusts.py:64
diff --git a/sahara/locale/fr/LC_MESSAGES/sahara-log-info.po b/sahara/locale/fr/LC_MESSAGES/sahara-log-info.po
index 8efa37491b..2482df7c1d 100644
--- a/sahara/locale/fr/LC_MESSAGES/sahara-log-info.po
+++ b/sahara/locale/fr/LC_MESSAGES/sahara-log-info.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sahara\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-14 06:10+0000\n"
+"POT-Creation-Date: 2014-08-22 06:11+0000\n"
 "PO-Revision-Date: 2014-07-16 14:42+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/sahara/language/"
@@ -69,7 +69,7 @@ msgstr "Tâche périodique %(task)s car elle est désactivée"
 msgid "Plugin '%(plugin_name)s' loaded %(entry_point)s"
 msgstr ""
 
-#: sahara/plugins/cdh/deploy.py:289
+#: sahara/plugins/cdh/deploy.py:292
 msgid "Cloudera Manager has been started"
 msgstr ""
 
@@ -319,39 +319,34 @@ msgstr ""
 msgid "Hive Metastore server at %s has been started"
 msgstr ""
 
-#: sahara/service/direct_engine.py:281
+#: sahara/service/direct_engine.py:269
 #, python-format
 msgid "Cluster '%s': all instances are active"
 msgstr ""
 
-#: sahara/service/direct_engine.py:293
+#: sahara/service/direct_engine.py:281 sahara/service/heat_engine.py:146
 #, python-format
 msgid "Cluster '%(name)s' creation rollback (reason: %(reason)s)"
 msgstr ""
 
-#: sahara/service/direct_engine.py:301
+#: sahara/service/direct_engine.py:289 sahara/service/heat_engine.py:163
 #, python-format
 msgid "Cluster '%(name)s' scaling rollback (reason: %(reason)s)"
 msgstr ""
 
-#: sahara/service/engine.py:73
+#: sahara/service/engine.py:77
 #, python-format
 msgid "Cluster '%s': all instances have IPs assigned"
 msgstr ""
 
-#: sahara/service/engine.py:83
+#: sahara/service/engine.py:87
 #, python-format
 msgid "Cluster '%s': all instances are accessible"
 msgstr ""
 
-#: sahara/service/heat_engine.py:150
+#: sahara/service/ops.py:115 sahara/service/ops.py:134
 #, python-format
-msgid "Cluster '%s' creation rollback"
-msgstr ""
-
-#: sahara/service/heat_engine.py:165
-#, python-format
-msgid "Cluster '%s' scaling rollback"
+msgid "Cluster with %s was deleted. Canceling current operation."
 msgstr ""
 
 #: sahara/service/periodic.py:96
@@ -385,15 +380,6 @@ msgstr ""
 msgid "Cluster status has been changed: id=%(id)s, New status=%(status)s"
 msgstr ""
 
-#: sahara/utils/general.py:78
-#, python-format
-msgid "Cluster %(name)s (id=%(id)s) was deleted. Canceling current operation."
-msgstr ""
-
-#: sahara/utils/general.py:84 sahara/utils/general.py:85
-msgid "Unknown"
-msgstr ""
-
 #: sahara/utils/timing.py:56
 #, python-format
 msgid "Exception raised by invocation of %(name)s: %(info)s"
diff --git a/sahara/locale/fr/LC_MESSAGES/sahara-log-warning.po b/sahara/locale/fr/LC_MESSAGES/sahara-log-warning.po
index d17a64dab4..9ac71d1d04 100644
--- a/sahara/locale/fr/LC_MESSAGES/sahara-log-warning.po
+++ b/sahara/locale/fr/LC_MESSAGES/sahara-log-warning.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sahara\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-14 06:10+0000\n"
+"POT-Creation-Date: 2014-08-22 06:11+0000\n"
 "PO-Revision-Date: 2014-07-25 15:11+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/sahara/language/"
@@ -74,43 +74,29 @@ msgstr ""
 msgid "Plugin received wrong applicable target '%s' for xml configs"
 msgstr ""
 
-#: sahara/service/direct_engine.py:82 sahara/service/heat_engine.py:70
-#, python-format
-msgid "Can't start cluster '%(cluster)s' (reason: %(reason)s)"
-msgstr ""
-
-#: sahara/service/direct_engine.py:129 sahara/service/heat_engine.py:104
-#, python-format
-msgid "Can't scale cluster '%(cluster)s' (reason: %(reason)s)"
-msgstr ""
-
-#: sahara/service/direct_engine.py:320
+#: sahara/service/direct_engine.py:311
 #, python-format
 msgid ""
 "Attempted to delete non-existent floating IP in pool %(pool)s from instance "
 "%(instance)s"
 msgstr ""
 
-#: sahara/service/direct_engine.py:328
+#: sahara/service/direct_engine.py:319
 #, python-format
 msgid "Detaching volumes from instance %s failed"
 msgstr ""
 
-#: sahara/service/direct_engine.py:334
+#: sahara/service/direct_engine.py:325
 #, python-format
 msgid "Attempted to delete non-existent instance %s"
 msgstr ""
 
-#: sahara/service/engine.py:169
+#: sahara/service/engine.py:173
 msgid ""
 "Presumably the operation failed because the cluster was deleted by a user "
 "during the process."
 msgstr ""
 
-#: sahara/service/heat_engine.py:124
-msgid "Rollback successful. Throwing off an initial exception."
-msgstr ""
-
 #: sahara/service/heat_engine.py:181
 #, python-format
 msgid "Did not found stack for cluster %s"
diff --git a/sahara/locale/it/LC_MESSAGES/sahara-log-error.po b/sahara/locale/it/LC_MESSAGES/sahara-log-error.po
index ae980fa20e..4330dcaa71 100644
--- a/sahara/locale/it/LC_MESSAGES/sahara-log-error.po
+++ b/sahara/locale/it/LC_MESSAGES/sahara-log-error.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sahara\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-14 06:10+0000\n"
+"POT-Creation-Date: 2014-08-22 06:11+0000\n"
 "PO-Revision-Date: 2014-07-29 23:43+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/sahara/language/"
@@ -134,23 +134,14 @@ msgid ""
 "\"Decommissioned\" status."
 msgstr ""
 
-#: sahara/service/heat_engine.py:119
-msgid "Unable to complete rollback, aborting"
+#: sahara/service/ops.py:120
+#, python-format
+msgid "Error during operating cluster '%(name)s' (reason: %(reason)s)"
 msgstr ""
 
-#: sahara/service/ops.py:144
+#: sahara/service/ops.py:139
 #, python-format
-msgid "Can't configure cluster '%(name)s' (reason: %(reason)s)"
-msgstr ""
-
-#: sahara/service/ops.py:162
-#, python-format
-msgid "Can't start services for cluster '%(name)s' (reason: %(reason)s)"
-msgstr ""
-
-#: sahara/service/ops.py:213
-#, python-format
-msgid "Can't scale cluster '%(name)s' (reason: %(reason)s)"
+msgid "Error during rollback of cluster '%(name)s' (reason: %(reason)s)"
 msgstr ""
 
 #: sahara/service/trusts.py:64
diff --git a/sahara/locale/it/LC_MESSAGES/sahara-log-info.po b/sahara/locale/it/LC_MESSAGES/sahara-log-info.po
index 0324cb8272..f35b051f78 100644
--- a/sahara/locale/it/LC_MESSAGES/sahara-log-info.po
+++ b/sahara/locale/it/LC_MESSAGES/sahara-log-info.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sahara\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-14 06:10+0000\n"
+"POT-Creation-Date: 2014-08-22 06:11+0000\n"
 "PO-Revision-Date: 2014-07-16 14:42+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/sahara/language/"
@@ -70,7 +70,7 @@ msgstr "Abbadono dell'attività periodica %(task)s perché è disabilitata"
 msgid "Plugin '%(plugin_name)s' loaded %(entry_point)s"
 msgstr ""
 
-#: sahara/plugins/cdh/deploy.py:289
+#: sahara/plugins/cdh/deploy.py:292
 msgid "Cloudera Manager has been started"
 msgstr ""
 
@@ -320,39 +320,34 @@ msgstr ""
 msgid "Hive Metastore server at %s has been started"
 msgstr ""
 
-#: sahara/service/direct_engine.py:281
+#: sahara/service/direct_engine.py:269
 #, python-format
 msgid "Cluster '%s': all instances are active"
 msgstr ""
 
-#: sahara/service/direct_engine.py:293
+#: sahara/service/direct_engine.py:281 sahara/service/heat_engine.py:146
 #, python-format
 msgid "Cluster '%(name)s' creation rollback (reason: %(reason)s)"
 msgstr ""
 
-#: sahara/service/direct_engine.py:301
+#: sahara/service/direct_engine.py:289 sahara/service/heat_engine.py:163
 #, python-format
 msgid "Cluster '%(name)s' scaling rollback (reason: %(reason)s)"
 msgstr ""
 
-#: sahara/service/engine.py:73
+#: sahara/service/engine.py:77
 #, python-format
 msgid "Cluster '%s': all instances have IPs assigned"
 msgstr ""
 
-#: sahara/service/engine.py:83
+#: sahara/service/engine.py:87
 #, python-format
 msgid "Cluster '%s': all instances are accessible"
 msgstr ""
 
-#: sahara/service/heat_engine.py:150
+#: sahara/service/ops.py:115 sahara/service/ops.py:134
 #, python-format
-msgid "Cluster '%s' creation rollback"
-msgstr ""
-
-#: sahara/service/heat_engine.py:165
-#, python-format
-msgid "Cluster '%s' scaling rollback"
+msgid "Cluster with %s was deleted. Canceling current operation."
 msgstr ""
 
 #: sahara/service/periodic.py:96
@@ -386,15 +381,6 @@ msgstr ""
 msgid "Cluster status has been changed: id=%(id)s, New status=%(status)s"
 msgstr ""
 
-#: sahara/utils/general.py:78
-#, python-format
-msgid "Cluster %(name)s (id=%(id)s) was deleted. Canceling current operation."
-msgstr ""
-
-#: sahara/utils/general.py:84 sahara/utils/general.py:85
-msgid "Unknown"
-msgstr ""
-
 #: sahara/utils/timing.py:56
 #, python-format
 msgid "Exception raised by invocation of %(name)s: %(info)s"
diff --git a/sahara/locale/ja/LC_MESSAGES/sahara-log-error.po b/sahara/locale/ja/LC_MESSAGES/sahara-log-error.po
index 45d410b149..fd0633a612 100644
--- a/sahara/locale/ja/LC_MESSAGES/sahara-log-error.po
+++ b/sahara/locale/ja/LC_MESSAGES/sahara-log-error.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sahara\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-14 06:10+0000\n"
+"POT-Creation-Date: 2014-08-22 06:11+0000\n"
 "PO-Revision-Date: 2014-07-29 23:43+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/sahara/language/"
@@ -134,23 +134,14 @@ msgid ""
 "\"Decommissioned\" status."
 msgstr ""
 
-#: sahara/service/heat_engine.py:119
-msgid "Unable to complete rollback, aborting"
+#: sahara/service/ops.py:120
+#, python-format
+msgid "Error during operating cluster '%(name)s' (reason: %(reason)s)"
 msgstr ""
 
-#: sahara/service/ops.py:144
+#: sahara/service/ops.py:139
 #, python-format
-msgid "Can't configure cluster '%(name)s' (reason: %(reason)s)"
-msgstr ""
-
-#: sahara/service/ops.py:162
-#, python-format
-msgid "Can't start services for cluster '%(name)s' (reason: %(reason)s)"
-msgstr ""
-
-#: sahara/service/ops.py:213
-#, python-format
-msgid "Can't scale cluster '%(name)s' (reason: %(reason)s)"
+msgid "Error during rollback of cluster '%(name)s' (reason: %(reason)s)"
 msgstr ""
 
 #: sahara/service/trusts.py:64
diff --git a/sahara/locale/ko_KR/LC_MESSAGES/sahara-log-error.po b/sahara/locale/ko_KR/LC_MESSAGES/sahara-log-error.po
index af3b5c95d2..e7bf345f28 100644
--- a/sahara/locale/ko_KR/LC_MESSAGES/sahara-log-error.po
+++ b/sahara/locale/ko_KR/LC_MESSAGES/sahara-log-error.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sahara\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-14 06:10+0000\n"
+"POT-Creation-Date: 2014-08-22 06:11+0000\n"
 "PO-Revision-Date: 2014-07-29 23:43+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Korean (Korea) (http://www.transifex.com/projects/p/sahara/"
@@ -134,23 +134,14 @@ msgid ""
 "\"Decommissioned\" status."
 msgstr ""
 
-#: sahara/service/heat_engine.py:119
-msgid "Unable to complete rollback, aborting"
+#: sahara/service/ops.py:120
+#, python-format
+msgid "Error during operating cluster '%(name)s' (reason: %(reason)s)"
 msgstr ""
 
-#: sahara/service/ops.py:144
+#: sahara/service/ops.py:139
 #, python-format
-msgid "Can't configure cluster '%(name)s' (reason: %(reason)s)"
-msgstr ""
-
-#: sahara/service/ops.py:162
-#, python-format
-msgid "Can't start services for cluster '%(name)s' (reason: %(reason)s)"
-msgstr ""
-
-#: sahara/service/ops.py:213
-#, python-format
-msgid "Can't scale cluster '%(name)s' (reason: %(reason)s)"
+msgid "Error during rollback of cluster '%(name)s' (reason: %(reason)s)"
 msgstr ""
 
 #: sahara/service/trusts.py:64
diff --git a/sahara/locale/pt_BR/LC_MESSAGES/sahara-log-error.po b/sahara/locale/pt_BR/LC_MESSAGES/sahara-log-error.po
index 9ea409b911..8fd3faea0e 100644
--- a/sahara/locale/pt_BR/LC_MESSAGES/sahara-log-error.po
+++ b/sahara/locale/pt_BR/LC_MESSAGES/sahara-log-error.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sahara\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-14 06:10+0000\n"
+"POT-Creation-Date: 2014-08-22 06:11+0000\n"
 "PO-Revision-Date: 2014-07-29 23:43+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
@@ -134,23 +134,14 @@ msgid ""
 "\"Decommissioned\" status."
 msgstr ""
 
-#: sahara/service/heat_engine.py:119
-msgid "Unable to complete rollback, aborting"
+#: sahara/service/ops.py:120
+#, python-format
+msgid "Error during operating cluster '%(name)s' (reason: %(reason)s)"
 msgstr ""
 
-#: sahara/service/ops.py:144
+#: sahara/service/ops.py:139
 #, python-format
-msgid "Can't configure cluster '%(name)s' (reason: %(reason)s)"
-msgstr ""
-
-#: sahara/service/ops.py:162
-#, python-format
-msgid "Can't start services for cluster '%(name)s' (reason: %(reason)s)"
-msgstr ""
-
-#: sahara/service/ops.py:213
-#, python-format
-msgid "Can't scale cluster '%(name)s' (reason: %(reason)s)"
+msgid "Error during rollback of cluster '%(name)s' (reason: %(reason)s)"
 msgstr ""
 
 #: sahara/service/trusts.py:64
diff --git a/sahara/locale/pt_BR/LC_MESSAGES/sahara-log-info.po b/sahara/locale/pt_BR/LC_MESSAGES/sahara-log-info.po
index 3023becf32..34332c3784 100644
--- a/sahara/locale/pt_BR/LC_MESSAGES/sahara-log-info.po
+++ b/sahara/locale/pt_BR/LC_MESSAGES/sahara-log-info.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sahara\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-14 06:10+0000\n"
+"POT-Creation-Date: 2014-08-22 06:11+0000\n"
 "PO-Revision-Date: 2014-07-16 14:42+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
@@ -69,7 +69,7 @@ msgstr "Ignorando tarefa periódica %(task)s porque ela está desativada"
 msgid "Plugin '%(plugin_name)s' loaded %(entry_point)s"
 msgstr ""
 
-#: sahara/plugins/cdh/deploy.py:289
+#: sahara/plugins/cdh/deploy.py:292
 msgid "Cloudera Manager has been started"
 msgstr ""
 
@@ -319,39 +319,34 @@ msgstr ""
 msgid "Hive Metastore server at %s has been started"
 msgstr ""
 
-#: sahara/service/direct_engine.py:281
+#: sahara/service/direct_engine.py:269
 #, python-format
 msgid "Cluster '%s': all instances are active"
 msgstr ""
 
-#: sahara/service/direct_engine.py:293
+#: sahara/service/direct_engine.py:281 sahara/service/heat_engine.py:146
 #, python-format
 msgid "Cluster '%(name)s' creation rollback (reason: %(reason)s)"
 msgstr ""
 
-#: sahara/service/direct_engine.py:301
+#: sahara/service/direct_engine.py:289 sahara/service/heat_engine.py:163
 #, python-format
 msgid "Cluster '%(name)s' scaling rollback (reason: %(reason)s)"
 msgstr ""
 
-#: sahara/service/engine.py:73
+#: sahara/service/engine.py:77
 #, python-format
 msgid "Cluster '%s': all instances have IPs assigned"
 msgstr ""
 
-#: sahara/service/engine.py:83
+#: sahara/service/engine.py:87
 #, python-format
 msgid "Cluster '%s': all instances are accessible"
 msgstr ""
 
-#: sahara/service/heat_engine.py:150
+#: sahara/service/ops.py:115 sahara/service/ops.py:134
 #, python-format
-msgid "Cluster '%s' creation rollback"
-msgstr ""
-
-#: sahara/service/heat_engine.py:165
-#, python-format
-msgid "Cluster '%s' scaling rollback"
+msgid "Cluster with %s was deleted. Canceling current operation."
 msgstr ""
 
 #: sahara/service/periodic.py:96
@@ -385,15 +380,6 @@ msgstr ""
 msgid "Cluster status has been changed: id=%(id)s, New status=%(status)s"
 msgstr ""
 
-#: sahara/utils/general.py:78
-#, python-format
-msgid "Cluster %(name)s (id=%(id)s) was deleted. Canceling current operation."
-msgstr ""
-
-#: sahara/utils/general.py:84 sahara/utils/general.py:85
-msgid "Unknown"
-msgstr ""
-
 #: sahara/utils/timing.py:56
 #, python-format
 msgid "Exception raised by invocation of %(name)s: %(info)s"
diff --git a/sahara/locale/sahara-log-error.pot b/sahara/locale/sahara-log-error.pot
index 0667a0e862..d02a694064 100644
--- a/sahara/locale/sahara-log-error.pot
+++ b/sahara/locale/sahara-log-error.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: sahara 2014.2.dev95.g5b2a10e\n"
+"Project-Id-Version: sahara 2014.2.dev118.g44f37ef\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-14 06:10+0000\n"
+"POT-Creation-Date: 2014-08-22 06:11+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"
@@ -131,23 +131,14 @@ msgid ""
 "enter \"Decommissioned\" status."
 msgstr ""
 
-#: sahara/service/heat_engine.py:119
-msgid "Unable to complete rollback, aborting"
+#: sahara/service/ops.py:120
+#, python-format
+msgid "Error during operating cluster '%(name)s' (reason: %(reason)s)"
 msgstr ""
 
-#: sahara/service/ops.py:144
+#: sahara/service/ops.py:139
 #, python-format
-msgid "Can't configure cluster '%(name)s' (reason: %(reason)s)"
-msgstr ""
-
-#: sahara/service/ops.py:162
-#, python-format
-msgid "Can't start services for cluster '%(name)s' (reason: %(reason)s)"
-msgstr ""
-
-#: sahara/service/ops.py:213
-#, python-format
-msgid "Can't scale cluster '%(name)s' (reason: %(reason)s)"
+msgid "Error during rollback of cluster '%(name)s' (reason: %(reason)s)"
 msgstr ""
 
 #: sahara/service/trusts.py:64
diff --git a/sahara/locale/sahara-log-info.pot b/sahara/locale/sahara-log-info.pot
index b056679ba6..a68e57f08e 100644
--- a/sahara/locale/sahara-log-info.pot
+++ b/sahara/locale/sahara-log-info.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: sahara 2014.2.dev95.g5b2a10e\n"
+"Project-Id-Version: sahara 2014.2.dev118.g44f37ef\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-14 06:10+0000\n"
+"POT-Creation-Date: 2014-08-22 06:11+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"
@@ -67,7 +67,7 @@ msgstr ""
 msgid "Plugin '%(plugin_name)s' loaded %(entry_point)s"
 msgstr ""
 
-#: sahara/plugins/cdh/deploy.py:289
+#: sahara/plugins/cdh/deploy.py:292
 msgid "Cloudera Manager has been started"
 msgstr ""
 
@@ -317,39 +317,34 @@ msgstr ""
 msgid "Hive Metastore server at %s has been started"
 msgstr ""
 
-#: sahara/service/direct_engine.py:281
+#: sahara/service/direct_engine.py:269
 #, python-format
 msgid "Cluster '%s': all instances are active"
 msgstr ""
 
-#: sahara/service/direct_engine.py:293
+#: sahara/service/direct_engine.py:281 sahara/service/heat_engine.py:146
 #, python-format
 msgid "Cluster '%(name)s' creation rollback (reason: %(reason)s)"
 msgstr ""
 
-#: sahara/service/direct_engine.py:301
+#: sahara/service/direct_engine.py:289 sahara/service/heat_engine.py:163
 #, python-format
 msgid "Cluster '%(name)s' scaling rollback (reason: %(reason)s)"
 msgstr ""
 
-#: sahara/service/engine.py:73
+#: sahara/service/engine.py:77
 #, python-format
 msgid "Cluster '%s': all instances have IPs assigned"
 msgstr ""
 
-#: sahara/service/engine.py:83
+#: sahara/service/engine.py:87
 #, python-format
 msgid "Cluster '%s': all instances are accessible"
 msgstr ""
 
-#: sahara/service/heat_engine.py:150
+#: sahara/service/ops.py:115 sahara/service/ops.py:134
 #, python-format
-msgid "Cluster '%s' creation rollback"
-msgstr ""
-
-#: sahara/service/heat_engine.py:165
-#, python-format
-msgid "Cluster '%s' scaling rollback"
+msgid "Cluster with %s was deleted. Canceling current operation."
 msgstr ""
 
 #: sahara/service/periodic.py:96
@@ -384,15 +379,6 @@ msgstr ""
 msgid "Cluster status has been changed: id=%(id)s, New status=%(status)s"
 msgstr ""
 
-#: sahara/utils/general.py:78
-#, python-format
-msgid "Cluster %(name)s (id=%(id)s) was deleted. Canceling current operation."
-msgstr ""
-
-#: sahara/utils/general.py:84 sahara/utils/general.py:85
-msgid "Unknown"
-msgstr ""
-
 #: sahara/utils/timing.py:56
 #, python-format
 msgid "Exception raised by invocation of %(name)s: %(info)s"
diff --git a/sahara/locale/sahara-log-warning.pot b/sahara/locale/sahara-log-warning.pot
index 7f7581e516..04a448c6cf 100644
--- a/sahara/locale/sahara-log-warning.pot
+++ b/sahara/locale/sahara-log-warning.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: sahara 2014.2.dev95.g5b2a10e\n"
+"Project-Id-Version: sahara 2014.2.dev118.g44f37ef\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-14 06:10+0000\n"
+"POT-Creation-Date: 2014-08-22 06:11+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"
@@ -72,43 +72,29 @@ msgstr ""
 msgid "Plugin received wrong applicable target '%s' for xml configs"
 msgstr ""
 
-#: sahara/service/direct_engine.py:82 sahara/service/heat_engine.py:70
-#, python-format
-msgid "Can't start cluster '%(cluster)s' (reason: %(reason)s)"
-msgstr ""
-
-#: sahara/service/direct_engine.py:129 sahara/service/heat_engine.py:104
-#, python-format
-msgid "Can't scale cluster '%(cluster)s' (reason: %(reason)s)"
-msgstr ""
-
-#: sahara/service/direct_engine.py:320
+#: sahara/service/direct_engine.py:311
 #, python-format
 msgid ""
 "Attempted to delete non-existent floating IP in pool %(pool)s from "
 "instance %(instance)s"
 msgstr ""
 
-#: sahara/service/direct_engine.py:328
+#: sahara/service/direct_engine.py:319
 #, python-format
 msgid "Detaching volumes from instance %s failed"
 msgstr ""
 
-#: sahara/service/direct_engine.py:334
+#: sahara/service/direct_engine.py:325
 #, python-format
 msgid "Attempted to delete non-existent instance %s"
 msgstr ""
 
-#: sahara/service/engine.py:169
+#: sahara/service/engine.py:173
 msgid ""
 "Presumably the operation failed because the cluster was deleted by a user"
 " during the process."
 msgstr ""
 
-#: sahara/service/heat_engine.py:124
-msgid "Rollback successful. Throwing off an initial exception."
-msgstr ""
-
 #: sahara/service/heat_engine.py:181
 #, python-format
 msgid "Did not found stack for cluster %s"
diff --git a/sahara/locale/vi_VN/LC_MESSAGES/sahara-log-error.po b/sahara/locale/vi_VN/LC_MESSAGES/sahara-log-error.po
index 5ac4a0abc9..3b7c61f08d 100644
--- a/sahara/locale/vi_VN/LC_MESSAGES/sahara-log-error.po
+++ b/sahara/locale/vi_VN/LC_MESSAGES/sahara-log-error.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sahara\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-14 06:10+0000\n"
+"POT-Creation-Date: 2014-08-22 06:11+0000\n"
 "PO-Revision-Date: 2014-07-17 06:41+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/"
@@ -134,23 +134,14 @@ msgid ""
 "\"Decommissioned\" status."
 msgstr ""
 
-#: sahara/service/heat_engine.py:119
-msgid "Unable to complete rollback, aborting"
+#: sahara/service/ops.py:120
+#, python-format
+msgid "Error during operating cluster '%(name)s' (reason: %(reason)s)"
 msgstr ""
 
-#: sahara/service/ops.py:144
+#: sahara/service/ops.py:139
 #, python-format
-msgid "Can't configure cluster '%(name)s' (reason: %(reason)s)"
-msgstr ""
-
-#: sahara/service/ops.py:162
-#, python-format
-msgid "Can't start services for cluster '%(name)s' (reason: %(reason)s)"
-msgstr ""
-
-#: sahara/service/ops.py:213
-#, python-format
-msgid "Can't scale cluster '%(name)s' (reason: %(reason)s)"
+msgid "Error during rollback of cluster '%(name)s' (reason: %(reason)s)"
 msgstr ""
 
 #: sahara/service/trusts.py:64
diff --git a/sahara/locale/zh_CN/LC_MESSAGES/sahara-log-error.po b/sahara/locale/zh_CN/LC_MESSAGES/sahara-log-error.po
index a29d8790f0..0ab7c628b3 100644
--- a/sahara/locale/zh_CN/LC_MESSAGES/sahara-log-error.po
+++ b/sahara/locale/zh_CN/LC_MESSAGES/sahara-log-error.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sahara\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-14 06:10+0000\n"
+"POT-Creation-Date: 2014-08-22 06:11+0000\n"
 "PO-Revision-Date: 2014-07-29 23:43+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/sahara/"
@@ -134,23 +134,14 @@ msgid ""
 "\"Decommissioned\" status."
 msgstr ""
 
-#: sahara/service/heat_engine.py:119
-msgid "Unable to complete rollback, aborting"
+#: sahara/service/ops.py:120
+#, python-format
+msgid "Error during operating cluster '%(name)s' (reason: %(reason)s)"
 msgstr ""
 
-#: sahara/service/ops.py:144
+#: sahara/service/ops.py:139
 #, python-format
-msgid "Can't configure cluster '%(name)s' (reason: %(reason)s)"
-msgstr ""
-
-#: sahara/service/ops.py:162
-#, python-format
-msgid "Can't start services for cluster '%(name)s' (reason: %(reason)s)"
-msgstr ""
-
-#: sahara/service/ops.py:213
-#, python-format
-msgid "Can't scale cluster '%(name)s' (reason: %(reason)s)"
+msgid "Error during rollback of cluster '%(name)s' (reason: %(reason)s)"
 msgstr ""
 
 #: sahara/service/trusts.py:64
diff --git a/sahara/locale/zh_CN/LC_MESSAGES/sahara-log-info.po b/sahara/locale/zh_CN/LC_MESSAGES/sahara-log-info.po
index bc3881c160..bae9b0f865 100644
--- a/sahara/locale/zh_CN/LC_MESSAGES/sahara-log-info.po
+++ b/sahara/locale/zh_CN/LC_MESSAGES/sahara-log-info.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sahara\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-14 06:10+0000\n"
+"POT-Creation-Date: 2014-08-22 06:11+0000\n"
 "PO-Revision-Date: 2014-07-16 14:42+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/sahara/"
@@ -69,7 +69,7 @@ msgstr "正在跳过周期性任务 %(task)s，因为它已禁用"
 msgid "Plugin '%(plugin_name)s' loaded %(entry_point)s"
 msgstr ""
 
-#: sahara/plugins/cdh/deploy.py:289
+#: sahara/plugins/cdh/deploy.py:292
 msgid "Cloudera Manager has been started"
 msgstr ""
 
@@ -319,39 +319,34 @@ msgstr ""
 msgid "Hive Metastore server at %s has been started"
 msgstr ""
 
-#: sahara/service/direct_engine.py:281
+#: sahara/service/direct_engine.py:269
 #, python-format
 msgid "Cluster '%s': all instances are active"
 msgstr ""
 
-#: sahara/service/direct_engine.py:293
+#: sahara/service/direct_engine.py:281 sahara/service/heat_engine.py:146
 #, python-format
 msgid "Cluster '%(name)s' creation rollback (reason: %(reason)s)"
 msgstr ""
 
-#: sahara/service/direct_engine.py:301
+#: sahara/service/direct_engine.py:289 sahara/service/heat_engine.py:163
 #, python-format
 msgid "Cluster '%(name)s' scaling rollback (reason: %(reason)s)"
 msgstr ""
 
-#: sahara/service/engine.py:73
+#: sahara/service/engine.py:77
 #, python-format
 msgid "Cluster '%s': all instances have IPs assigned"
 msgstr ""
 
-#: sahara/service/engine.py:83
+#: sahara/service/engine.py:87
 #, python-format
 msgid "Cluster '%s': all instances are accessible"
 msgstr ""
 
-#: sahara/service/heat_engine.py:150
+#: sahara/service/ops.py:115 sahara/service/ops.py:134
 #, python-format
-msgid "Cluster '%s' creation rollback"
-msgstr ""
-
-#: sahara/service/heat_engine.py:165
-#, python-format
-msgid "Cluster '%s' scaling rollback"
+msgid "Cluster with %s was deleted. Canceling current operation."
 msgstr ""
 
 #: sahara/service/periodic.py:96
@@ -385,15 +380,6 @@ msgstr ""
 msgid "Cluster status has been changed: id=%(id)s, New status=%(status)s"
 msgstr ""
 
-#: sahara/utils/general.py:78
-#, python-format
-msgid "Cluster %(name)s (id=%(id)s) was deleted. Canceling current operation."
-msgstr ""
-
-#: sahara/utils/general.py:84 sahara/utils/general.py:85
-msgid "Unknown"
-msgstr ""
-
 #: sahara/utils/timing.py:56
 #, python-format
 msgid "Exception raised by invocation of %(name)s: %(info)s"