diff --git a/src/sunstone/public/js/plugins/templates-tab.js b/src/sunstone/public/js/plugins/templates-tab.js
index 6f2e08eebb..bff23a64c6 100644
--- a/src/sunstone/public/js/plugins/templates-tab.js
+++ b/src/sunstone/public/js/plugins/templates-tab.js
@@ -2531,7 +2531,7 @@ function setupCreateTemplateDialog(){
''+
''+
'
'+
- '
'+tr("Add network contextualization parameters. For each NIC defined in the NETWORK section, ETH%i_IP, ETH%i_NETWORK... parameters will be included in the CONTEXT section and will be available in the Virtual Machine")+'
'+
+ '
'+tr("Add network contextualization parameters. For each NIC defined in the NETWORK section, ETH$i_IP, ETH$i_NETWORK... parameters will be included in the CONTEXT section and will be available in the Virtual Machine")+'
'+
'
'+
''+
''+
diff --git a/src/sunstone/public/js/plugins/vms-tab.js b/src/sunstone/public/js/plugins/vms-tab.js
index 2404e48dd4..4a82e54324 100644
--- a/src/sunstone/public/js/plugins/vms-tab.js
+++ b/src/sunstone/public/js/plugins/vms-tab.js
@@ -794,7 +794,7 @@ var vm_buttons = {
type: "action",
text: '',
layout: "vmsplay_buttons",
- tip: tr("This will resume selected stopped or suspended VMs")
+ tip: tr("This will resume selected VMs")
},
"VM.stop" : {
type: "action",
@@ -806,7 +806,7 @@ var vm_buttons = {
type: "action",
text: tr("Boot"),
layout: "vmsplanification_buttons",
- tip: tr("This will redeploy selected VMs (in UNKNOWN or BOOT state)")
+ tip: tr("This will force the hypervisor boot action of VMs stuck in UNKNOWN or BOOT state")
},
"VM.reboot" : {
type: "action",
@@ -824,13 +824,13 @@ var vm_buttons = {
type: "action",
text: tr("Power Off"),
layout: "vmspause_buttons",
- tip: tr("This will send a power off signal to running VMs. They can be restarted later.")
+ tip: tr("This will send a power off signal to running VMs. They can be resumed later.")
},
"VM.poweroff_hard" : {
type: "action",
text: tr("Power Off") + ' hard',
layout: "vmspause_buttons",
- tip: tr("This will send a power off signal to running VMs. They can be restarted later.")
+ tip: tr("This will send a forced power off signal to running VMs. They can be resumed later.")
},
"VM.undeploy" : {
type: "action",
@@ -2078,7 +2078,7 @@ function setupSaveAsDialog(){
\
\
'+tr("Sets the specified VM disk to be saved in a new Image.")+'
\
- '+tr("Deferred: The Image is created immediately, but the contents are saved only if the VM is shut down gracefully (i.e., using Shutdown or Cancel; not Delete)")+'
\
+ '+tr("Deferred: The Image is created immediately, but the contents are saved only if the VM is shut down gracefully (i.e., using Shutdown; not Delete)")+'
\
'+tr("Hot: The Image will be saved immediately.")+'