diff --git a/www/manager/lxc/CmdMenu.js b/www/manager/lxc/CmdMenu.js
index f793b2e6..f4498617 100644
--- a/www/manager/lxc/CmdMenu.js
+++ b/www/manager/lxc/CmdMenu.js
@@ -27,7 +27,7 @@ Ext.define('PVE.lxc.CmdMenu', {
 	    });
 	};
 
-	me.title = "CT " + vmid;
+	me.title = gettext('CT') + ' ' + vmid;
 
 	me.items = [
 	    {
@@ -53,7 +53,7 @@ Ext.define('PVE.lxc.CmdMenu', {
 		text: gettext('Suspend'),
 		icon: '/pve2/images/forward.png',
 		handler: function() {
-		    var msg = Ext.String.format(gettext("Do you really want to suspend CT {0}?"), vmid);
+		    var msg = Ext.String.format(gettext("Do you really want to suspend {0}?"), gettext('CT') + ' ' + vmid);
 		    Ext.Msg.confirm(gettext('Confirm'), msg, function(btn) {
 			if (btn !== 'yes') {
 			    return;
@@ -74,7 +74,7 @@ Ext.define('PVE.lxc.CmdMenu', {
 		text: gettext('Shutdown'),
 		icon: '/pve2/images/stop.png',
 		handler: function() {
-		    var msg = Ext.String.format(gettext("Do you really want to shutdown CT {0}?"), vmid);
+		    var msg = Ext.String.format(gettext("Do you really want to shutdown {0}?"), gettext('CT') + ' ' + vmid);
 		    Ext.Msg.confirm(gettext('Confirm'), msg, function(btn) {
 			if (btn !== 'yes') {
 			    return;
@@ -88,7 +88,7 @@ Ext.define('PVE.lxc.CmdMenu', {
 		text: gettext('Stop'),
 		icon: '/pve2/images/gtk-stop.png',
 		handler: function() {
-		    var msg = Ext.String.format(gettext("Do you really want to stop CT {0}?"), vmid);
+		    var msg = Ext.String.format(gettext("Do you really want to stop {0}?"), gettext('CT') + ' ' + vmid);
 		    Ext.Msg.confirm(gettext('Confirm'), msg, function(btn) {
 			if (btn !== 'yes') {
 			    return;
diff --git a/www/manager/lxc/ResourceEdit.js b/www/manager/lxc/ResourceEdit.js
index 1220ceed..3bff0607 100644
--- a/www/manager/lxc/ResourceEdit.js
+++ b/www/manager/lxc/ResourceEdit.js
@@ -94,7 +94,7 @@ Ext.define('PVE.lxc.MemoryInputPanel', {
 		maxValue: 512*1024,
 		value: '512',
 		step: 32,
-		fieldLabel: gettext('Memory (MB)'),
+		fieldLabel: gettext('Memory') + ' (MB)',
 		labelWidth: labelWidth,
 		allowBlank: false
 	    },
@@ -105,7 +105,7 @@ Ext.define('PVE.lxc.MemoryInputPanel', {
 		maxValue: 128*1024,
 		value: '512',
 		step: 32,
-		fieldLabel: gettext('Swap (MB)'),
+		fieldLabel: gettext('Swap') + ' (MB)',
 		labelWidth: labelWidth,
 		allowBlank: false
 	    }
diff --git a/www/manager/node/Config.js b/www/manager/node/Config.js
index 61bb4b21..e6c7ae10 100644
--- a/www/manager/node/Config.js
+++ b/www/manager/node/Config.js
@@ -35,10 +35,10 @@ Ext.define('PVE.node.Config', {
 	    menu: new Ext.menu.Menu({
 		items: [
 		    {
-			text: gettext('Start All VMs'),
+			text: gettext('Start all VMs and Containers'),
 			icon: '/pve2/images/start.png',
 			handler: function() {
-			    var msg = Ext.String.format(gettext("Do you really want to start all Vms on  node {0}?"), nodename);
+			    var msg = Ext.String.format(gettext("Do you really want to start all VMs and Containers on node {0}?"), nodename);
 			    Ext.Msg.confirm(gettext('Confirm'), msg, function(btn) {
 				if (btn !== 'yes') {
 				    return;
@@ -56,10 +56,10 @@ Ext.define('PVE.node.Config', {
 			}
 		    },
 		    {
-			text: gettext('Stop All VMs'),
+			text: gettext('Stop all VMs and Containers'),
 			icon: '/pve2/images/gtk-stop.png',
 			handler: function() {
-			    var msg = Ext.String.format(gettext("Do you really want to stop all Vms on  node {0}?"), nodename);
+			    var msg = Ext.String.format(gettext("Do you really want to stop all VMs and Containers on node {0}?"), nodename);
 			    Ext.Msg.confirm(gettext('Confirm'), msg, function(btn) {
 				if (btn !== 'yes') {
 				    return;
@@ -77,7 +77,7 @@ Ext.define('PVE.node.Config', {
 			}
 		    },
 		    {
-			text: gettext('Migrate All VMs'),
+			text: gettext('Migrate all VMs and Containers'),
 			icon: '/pve2/images/forward.png',
 			handler: function() {
 			    var win = Ext.create('PVE.window.MigrateAll', {
diff --git a/www/manager/qemu/CPUOptions.js b/www/manager/qemu/CPUOptions.js
index b5b74448..d6c9dca7 100644
--- a/www/manager/qemu/CPUOptions.js
+++ b/www/manager/qemu/CPUOptions.js
@@ -80,7 +80,7 @@ Ext.define('PVE.qemu.CPUOptions', {
         });
 	
 	Ext.apply(me, {
-	    subject: gettext('CPU Options'),
+	    subject: gettext('CPU options'),
 	    items: ipanel,
 	    width: 150
 	});
diff --git a/www/manager/qemu/CmdMenu.js b/www/manager/qemu/CmdMenu.js
index a9a8ce4e..0742d55e 100644
--- a/www/manager/qemu/CmdMenu.js
+++ b/www/manager/qemu/CmdMenu.js
@@ -53,7 +53,7 @@ Ext.define('PVE.qemu.CmdMenu', {
 		text: gettext('Suspend'),
 		icon: '/pve2/images/forward.png',
 		handler: function() {
-		    var msg = Ext.String.format(gettext("Do you really want to suspend VM {0}?"), vmid);
+		    var msg = Ext.String.format(gettext("Do you really want to suspend {0}?"), gettext('VM') + ' ' + vmid);
 		    Ext.Msg.confirm(gettext('Confirm'), msg, function(btn) {
 			if (btn !== 'yes') {
 			    return;
@@ -73,7 +73,7 @@ Ext.define('PVE.qemu.CmdMenu', {
 		text: gettext('Shutdown'),
 		icon: '/pve2/images/stop.png',
 		handler: function() {
-		    var msg = Ext.String.format(gettext("Do you really want to shutdown VM {0}?"), vmid);
+		    var msg = Ext.String.format(gettext("Do you really want to shutdown {0}?"), gettext('VM') + ' ' + vmid);
 		    Ext.Msg.confirm(gettext('Confirm'), msg, function(btn) {
 			if (btn !== 'yes') {
 			    return;
@@ -87,7 +87,7 @@ Ext.define('PVE.qemu.CmdMenu', {
 		text: gettext('Stop'),
 		icon: '/pve2/images/gtk-stop.png',
 		handler: function() {
-		    var msg = Ext.String.format(gettext("Do you really want to stop VM {0}?"), vmid);
+		    var msg = Ext.String.format(gettext("Do you really want to stop {0}?"), gettext('VM') + ' ' + vmid);
 		    Ext.Msg.confirm(gettext('Confirm'), msg, function(btn) {
 			if (btn !== 'yes') {
 			    return;
@@ -112,7 +112,7 @@ Ext.define('PVE.qemu.CmdMenu', {
 		text: gettext('Convert to template'),
 		icon: '/pve2/images/forward.png',
 		handler: function() {
-		    var msg = Ext.String.format(gettext("Do you really want to convert VM {0} into a template?"), vmid);
+		    var msg = Ext.String.format(gettext("Do you really want to convert {0} into a template?"), gettext('VM') + ' ' + vmid);
 		    Ext.Msg.confirm(gettext('Confirm'), msg, function(btn) {
 			if (btn !== 'yes') {
 			    return;