Merge pull request #4 from imoore76/develop

5.0-2

29 files changed, 383 insertions, 381 deletions

diff --git a/panes/chooser.html b/panes/chooser.html
index 3814ca9..765d42d 100644
--- a/panes/chooser.html
+++ b/panes/chooser.html
@@ -24,22 +24,22 @@ vboxChooser.setAnchorId('vboxChooserDiv');
 // Stop actions

 var sChildren = [];

 for(var i = 0; i < vboxVMActions.stop_actions.length; i++) {

-	sChildren[sChildren.length] = $.extend(true,{},vboxVMActions[vboxVMActions.stop_actions[i]],{'name':vboxVMActions.stop_actions[i],'iconStringDisabled':'_disabled'});

+	sChildren[sChildren.length] = $.extend(true,{},vboxVMActions[vboxVMActions.stop_actions[i]],{'iconStringDisabled':'_disabled'});

 }

 

 // VM List Group context menu

 vboxChooser.setContextMenu('group', [

-	$.extend({}, vboxVMGroupActions['newmachine'], {name:'newmachine'}),

-	$.extend({}, vboxVMGroupActions['addmachine'], {name:'addmachine'}),

-	$.extend({}, vboxVMGroupActions['rename'], {name:'rename',separator:true}),

-	$.extend({}, vboxVMGroupActions['ungroup'], {name:'ungroup'}),

-	$.extend({},vboxVMActions['start'],{'name':'start','separator' : true}),

-    $.extend({},vboxVMActions['pause'],{'name':'pause'}),

-    $.extend({},vboxVMActions['reset'],{'name':'reset'}),

-	$.extend({},vboxVMActions['stop'],{'name':'stop','children':sChildren}),

-	$.extend({},vboxVMActions['discard'],{'name':'discard','separator' : true}),

-	$.extend({},vboxVMActions['refresh'],{'name':'refresh'}),

-	$.extend({}, vboxVMGroupActions['sort'], {name:'sort',separator:true}),

+	vboxVMGroupActions['newmachine'],

+	vboxVMGroupActions['addmachine'],

+	$.extend({}, vboxVMGroupActions['rename'], {separator: true}),

+	vboxVMGroupActions['ungroup'],

+	$.extend({}, vboxVMActions['start'], {'separator' : true}),

+    vboxVMActions['pause'],

+    vboxVMActions['reset'],

+	$.extend({},vboxVMActions['stop'], {'children':sChildren}),

+	$.extend({},vboxVMActions['discard'], {separator: true}),

+	vboxVMActions['refresh'],

+	$.extend({}, vboxVMGroupActions['sort'], {separator:true}),

 ]);

 

 

@@ -48,17 +48,17 @@ vboxChooser.setContextMenu('group', [
  */

  

 vboxChooser.setContextMenu('vm',[

-   	$.extend({},vboxVMActions['settings'],{'name':'settings'}),

-   	$.extend({},vboxVMActions['clone'],{'name':'clone'}),

-   	$.extend({},vboxVMActions['remove'],{'name':'remove'}),

-   	$.extend({},vboxVMActions['group'],{'name':'group'}),

-   	$.extend({},vboxVMActions['start'],{'name':'start','separator' : true}),

-    $.extend({},vboxVMActions['pause'],{'name':'pause'}),

-    $.extend({},vboxVMActions['reset'],{'name':'reset'}),

-   	$.extend({},vboxVMActions['stop'],{'name':'stop','children':sChildren}),

-   	$.extend({},vboxVMActions['discard'],{'name':'discard','separator' : true}),

-   	$.extend({},vboxVMActions['logs'],{'name':'logs'}),

-   	$.extend({},vboxVMActions['refresh'],{'name':'refresh'})

+   	vboxVMActions['settings'],

+   	vboxVMActions['clone'],

+   	vboxVMActions['remove'],

+   	vboxVMActions['group'],

+   	$.extend({},vboxVMActions['start'], {'separator' : true}),

+    vboxVMActions['pause'],

+    vboxVMActions['reset'],

+   	$.extend({},vboxVMActions['stop'], {'children': sChildren}),

+   	$.extend({},vboxVMActions['discard'], {'separator' : true}),

+   	vboxVMActions['logs'],

+   	vboxVMActions['refresh']

 ]);

 

 // Don't need thse anymore

@@ -68,11 +68,11 @@ sChildren = null;
  * VM list context menu setup

  */

 vboxChooser.setContextMenu('anchor', [

-	$.extend({},vboxVMActions['new'],{'name':'new'}),

-	$.extend({},vboxVMActions['add'],{'name':'add'}),

+	vboxVMActions['new'],

+	vboxVMActions['add'],

 	{

 		'name':'fileImport',

-		'label':trans('Import Appliance...','UIActionPool'),

+		'label':'Import Appliance...',

 		'icon':'import',

 		'click':function(){

 			new vboxWizardImportApplianceDialog().run();

@@ -81,11 +81,11 @@ vboxChooser.setContextMenu('anchor', [
 	},

 	{

 		'name':'fileExport',

-		'label':trans('Export Appliance...','UIActionPool'),

+		'label':'Export Appliance...',

 		'icon':'export',

 		'click':function(){new vboxWizardExportApplianceDialog().run(); }

 	},

-	$.extend({},vboxVMGroupActions['sort'],{'name':'sort','separator':true,click:function(){

+	$.extend({},vboxVMGroupActions['sort'],{'separator':true,click:function(){

 		vboxChooser.sortSelectedGroup(true);

 	}})

 ]);

diff --git a/panes/settingsDisplay.html b/panes/settingsDisplay.html
index 4b7ed37..4b74214 100644
--- a/panes/settingsDisplay.html
+++ b/panes/settingsDisplay.html
@@ -7,12 +7,12 @@
 

 -->

 <ul>

-	<li><a href="#vboxSettingsTabDisplayVideo"><span class='translate'>Video</span></a></li>

+	<li><a href="#vboxSettingsTabDisplayVideo"><span class='translate'>Screen</span></a></li>

 	<li><a href="#vboxSettingsTabDisplayRemote"><span class='translate'>Remote Display</span></a></li>

 </ul>

 

 <!-- Video Tab -->

-<div id='vboxSettingsTabDisplayVideo' title='Video'>

+<div id='vboxSettingsTabDisplayVideo' title='Screen'>

 <table style='width: 100%'>

 	<tr>

 		<th><span class='translate'>Video Memory:</span></th>

diff --git a/panes/settingsGeneral.html b/panes/settingsGeneral.html
index 38631c6..60c6dfa 100644
--- a/panes/settingsGeneral.html
+++ b/panes/settingsGeneral.html
@@ -82,11 +82,6 @@
 						onClick="vboxSnapshotBrowseFolder(this);" />

 		</td>

 	</tr>

-	<tr class='vboxRunningEnabled'>

-		<th><span class='translate'>Removable Media:</span></th>

-		<td><label><input type='checkbox' class='vboxCheckbox' name='vboxSettingsGeneralRemovableMedia' style='width: auto'/>

-		<span class='translate'>Remember Runtime Changes</span></label></td>

-	</tr>

 </table>

 </div>

 

@@ -166,7 +161,7 @@ if($('#vboxPane').data('vboxConfig').vboxAutostartConfig) {
 	$('#vboxSettingsTabGeneralBasic .vboxAutostartConfig').empty().remove();

 }

 

-$('#vboxSettingsTabGeneralEncryption').find('option').html(function(i,h){ return trans(h, 'cipher type')});

+$('#vboxSettingsTabGeneralEncryption').find('option').html(function(i,h){ return trans(h, 'UIMachineSettingsGeneral', 'cipher type')});

 

 /* Browse for snapshot folder */

 function vboxSnapshotBrowseFolder(btn) {

@@ -278,7 +273,6 @@ $('#vboxSettingsDialog').on('dataLoaded', function(){
 	document.forms['frmVboxSettings'].vboxSettingsGeneralOSType.value = $('#vboxSettingsDialog').data('vboxMachineData').OSTypeId;

 	$(document.forms['frmVboxSettings'].vboxSettingsGeneralOSType).change();

 	document.forms['frmVboxSettings'].vboxSettingsGeneralSnapshotFolder.value = $('#vboxSettingsDialog').data('vboxMachineData').snapshotFolder;

-	document.forms['frmVboxSettings'].vboxSettingsGeneralRemovableMedia.checked = ($('#vboxSettingsDialog').data('vboxMachineData').GUI.SaveMountedAtRuntime == 'yes');

 	document.forms['frmVboxSettings'].vboxSettingsGeneralDescription.innerHTML = $('#vboxSettingsDialog').data('vboxMachineData').description;

 

 	/* Advanced config options */

@@ -401,7 +395,6 @@ $('#vboxSettingsDialog').on('dataLoaded', function(){
 		

 	$('#vboxSettingsDialog').data('vboxMachineData').OSTypeId = document.forms['frmVboxSettings'].vboxSettingsGeneralOSType.value;

 	$('#vboxSettingsDialog').data('vboxMachineData').snapshotFolder = document.forms['frmVboxSettings'].vboxSettingsGeneralSnapshotFolder.value;

-	$('#vboxSettingsDialog').data('vboxMachineData').GUI.SaveMountedAtRuntime = (document.forms['frmVboxSettings'].vboxSettingsGeneralRemovableMedia.checked ? 'yes' : 'no');

 	$('#vboxSettingsDialog').data('vboxMachineData').description = 	$(document.forms['frmVboxSettings'].vboxSettingsGeneralDescription).val();

 	

 	if($('#vboxPane').data('vboxConfig').enableAdvancedConfig) {

@@ -439,20 +432,20 @@ function vboxSettingsGeneralValidate() {
     if(!encSettings.enabled && $(document.forms['frmVboxSettings'].vboxSettingsGeneralEncryptionEnable).prop('checked')) {

         

         if(!$(document.forms['frmVboxSettings'].vboxSettingsTabGeneralEncryptionCipher).val()) {

-            vboxAlert("Encryption cipher type not specified.");

+            vboxAlert(trans("Encryption cipher type not specified.", 'UIMachineSettingsGeneral'));

             return false;

         } else if(!$(document.forms['frmVboxSettings'].vboxGeneralEncryptionPassword).val()) {

-            vboxAlert("Encryption password empty.");

+            vboxAlert(trans("Encryption password empty.", 'UIMachineSettingsGeneral'));

             return false;

         } else if($(document.forms['frmVboxSettings'].vboxGeneralEncryptionPassword).val() != $(document.forms['frmVboxSettings'].vboxGeneralEncryptionPassword2).val()) {

-            vboxAlert("Encryption passwords do not match.");

+            vboxAlert(trans("Encryption passwords do not match.", 'UIMachineSettingsGeneral'));

             return false;

         }

         

     // If enabled and poasswords don't match

     } else if($(document.forms['frmVboxSettings'].vboxSettingsGeneralEncryptionEnable).prop('checked')) {

         if($(document.forms['frmVboxSettings'].vboxGeneralEncryptionPassword).val() != $(document.forms['frmVboxSettings'].vboxGeneralEncryptionPassword2).val()) {

-            vboxAlert("Encryption passwords do not match.");

+            vboxAlert(trans("Encryption passwords do not match.", 'UIMachineSettingsGeneral'));

             return false;

         }

     }

diff --git a/panes/settingsGlobalLanguage.html b/panes/settingsGlobalLanguage.html
index 5f5b672..003f5c5 100644
--- a/panes/settingsGlobalLanguage.html
+++ b/panes/settingsGlobalLanguage.html
@@ -37,6 +37,7 @@ var vboxLanguages = [
 	{'id':'zh_cn','name':'Chinese (China)','name_tr':'简体中文 (中国)'},

 	{'id':'zh_tw','name':'Traditional Chinese','name_tr':'正體中文'},

 	{'id':'ro','name':'Romanian','name_tr':'Română'},

+	{'id':'nl','name':'Dutch','name_tr':'Nederlands (Nederland)'},

 ];

 var lList = $('#vboxLanguageList'); 

 $(lList).children().remove();

diff --git a/panes/settingsGlobalNetwork.html b/panes/settingsGlobalNetwork.html
index e422a0a..0fe0b56 100644
--- a/panes/settingsGlobalNetwork.html
+++ b/panes/settingsGlobalNetwork.html
@@ -17,7 +17,10 @@
 					<div class='vboxBordered' style='height: 280px'>

 						<table style='width:100%; border-spacing: 0px;' class='vboxList vboxHover'>

 							<thead>

-								<tr><th style='width: 140px; padding-left: 4px;text-align:left'>Active</th><th style='text-align:left'>Name</th></tr>

+								<tr>

+                                    <th style='width: 140px; padding-left: 4px;text-align:left' class='translate'>Active</th>

+                                    <th style='text-align:left' class='translate'>Name</th>

+                                </tr>

 							</thead>

 							<tbody id='vboxSettingsGlobalNATNetList'>

 								<tr><td>asdf</td><td>asdf</td></tr>

@@ -145,7 +148,7 @@ var sButtons = new Array(
 

 	{

 		'name' : 'addNet',

-		'label' : trans('Add host-only network','UIGlobalSettingsNetwork'),

+		'label' : 'Add host-only network',

 		'icon' : 'add_host_iface',

 		'enabled' : function () { return true; },

 		'click' : function () {

@@ -179,7 +182,7 @@ var sButtons = new Array(
 

 	{

 		'name' : 'delNet',

-		'label' : trans('Remove host-only network','UIGlobalSettingsNetwork'),

+		'label' : 'Remove host-only network',

 		'icon' : 'remove_host_iface',

 		'enabled' : function (item) { return ($(item).data('interface')); },

 		'click' : function () {

@@ -224,7 +227,7 @@ var sButtons = new Array(
 	},

 	{

 		'name' : 'editNet',

-		'label' : trans('Edit host-only network','UIGlobalSettingsNetwork'),

+		'label' : 'Edit host-only network',

 		'icon' : 'guesttools',

 		'enabled' : function (item) { return ($(item).data('interface')); },

 		'click' : function () {

@@ -232,7 +235,8 @@ var sButtons = new Array(
 		}

 	},{

 		name : 'refreshNet',

-		'label' : trans('Refresh','UIVMLogViewer'),

+		'label' : 'Refresh',

+		'language_context': 'UIVMLogViewer',

 		'icon' : 'refresh',

 		click: function() {

 			var l = new vboxLoader();

@@ -245,7 +249,7 @@ var sButtons = new Array(
 	}

 );

 

-var netToolbar = new vboxToolbarSmall(sButtons);

+var netToolbar = new vboxToolbarSmall({buttons: sButtons, language_context: 'UIGlobalSettingsNetwork'});

 netToolbar.renderTo('vboxSettingsGlobalNetToolbar');

 

 $('#vboxSettingsGlobalNetList').on('select',function(e,i){

@@ -259,7 +263,7 @@ var sButtons = new Array(
 

 	{

 		'name' : 'addNet',

-		'label' : trans('Add NAT network','UIGlobalSettingsNetwork'),

+		'label' : 'Add NAT network',

 		'icon' : 'add_host_iface',

 		'click' : function () {

 

@@ -279,7 +283,7 @@ var sButtons = new Array(
 

 	{

 		'name' : 'delNet',

-		'label' : trans('Remove NAT network','UIGlobalSettingsNetwork'),

+		'label' : 'Remove NAT network',

 		'icon' : 'remove_host_iface',

 		'enabled' : function (item) { return (item); },

 		'click' : function () {

@@ -305,7 +309,7 @@ var sButtons = new Array(
 	},

 	{

 		'name' : 'editNet',

-		'label' : trans('Edit NAT network','UIGlobalSettingsNetwork'),

+		'label' : 'Edit NAT network',

 		'icon' : 'guesttools',

 		'enabled' : function (item) { return (item); },

 		'click' : function () {

@@ -313,7 +317,8 @@ var sButtons = new Array(
 		}

 	},{

 		name : 'refreshNet',

-		'label' : trans('Refresh','UIVMLogViewer'),

+		'label' : 'Refresh',

+		'language_context': 'UIVMLogViewer',

 		'icon' : 'refresh',

 		click: function() {

 			var l = new vboxLoader();

@@ -326,7 +331,7 @@ var sButtons = new Array(
 	}

 );

 

-var natNetToolbar = new vboxToolbarSmall(sButtons);

+var natNetToolbar = new vboxToolbarSmall({buttons: sButtons, language_context: 'UIGlobalSettingsNetwork'});

 natNetToolbar.renderTo('vboxSettingsGlobalNATNetToolbar');

 

 $('#vboxSettingsGlobalNATNetList').on('select',function(e,i){

@@ -476,15 +481,12 @@ function vboxSettingsGlobalNetEditDialog() {
 

 	

 	$('#vboxSettingsGlobalNetEdit').tabs('option','active',0);

+	$('#vboxSettingsGlobalNetDHCPEnabled').trigger('click');

 

 	if(nic.dhcpServer && nic.dhcpServer.enabled && !$('#vboxSettingsGlobalNetDHCPEnabled').prop('checked')) {

-		$('#vboxSettingsGlobalNetDHCPEnabled').prop('checked',true);

-		$('#vboxSettingsGlobalNetDHCPEnabled').click();

-		$('#vboxSettingsGlobalNetDHCPEnabled').prop('checked',true);

+		$('#vboxSettingsGlobalNetDHCPEnabled').trigger('click');

 	} else if(nic.dhcpServer && !nic.dhcpServer.enabled && $('#vboxSettingsGlobalNetDHCPEnabled').prop('checked')) {

-		$('#vboxSettingsGlobalNetDHCPEnabled').prop('checked',false);

-		$('#vboxSettingsGlobalNetDHCPEnabled').click();

-		$('#vboxSettingsGlobalNetDHCPEnabled').prop('checked',false);

+		$('#vboxSettingsGlobalNetDHCPEnabled').trigger('click');

 	}

 

 	$('#vboxSettingsGlobalNetEditDialog').dialog('open');

@@ -496,7 +498,7 @@ function vboxSettingsGlobalNetEditDialog() {
 * Edit NAT Network Interface Dialog 

 *

 */

-vboxInitDisplay('vboxSettingsGlobalNATNetworkEditDialog','UIGlobalSettingsNetworkDetails');

+vboxInitDisplay('vboxSettingsGlobalNATNetworkEditDialog', 'UIGlobalSettingsNetworkDetailsNAT');

 

 var buttons = {};

 buttons[trans('OK','QIMessageBox')] = function(){

@@ -543,7 +545,7 @@ function vboxSettingsGlobalNATNetworkEditDialog() {
 	$('#vboxSettingsGlobalNATNetEnabled').triggerHandler('click');

 	$('#vboxSettingsGlobalNATNetIPv6').triggerHandler('click');

 	

-	$('#vboxSettingsGlobalNATNetRules').off('click').on('click',function(){

+	$('#vboxSettingsGlobalNATNetRules').val(trans('Port Forwarding', 'UIGlobalSettingsNetworkDetailsNAT')).off('click').on('click',function(){

 		vboxSettingsGlobalNetworkNatPortForwardingDialog(net, $('#vboxSettingsGlobalNATNetList').children('tr.vboxListItemSelected').first());	

 	});

 	

diff --git a/panes/settingsGlobalNetworkNATPortForwarding.html b/panes/settingsGlobalNetworkNATPortForwarding.html
index 1b17ea3..2130d16 100644
--- a/panes/settingsGlobalNetworkNATPortForwarding.html
+++ b/panes/settingsGlobalNetworkNATPortForwarding.html
@@ -68,7 +68,7 @@
 var sButtons = new Array(
 	{
 		'name' : 'insportfwd',
-		'label' : trans('Insert new rule','UIMachineSettingsPortForwardingDlg'),
+		'label' : 'Insert new rule',
 		'icon' : 'controller_add',
 		'click' : function (e) {
 			var listId = $(e.target).closest('div.vboxTabContent').find('tbody.vboxSettingsGlobalNetworkNatPortForwardingList').first().attr('id');
@@ -89,7 +89,7 @@ var sButtons = new Array(
 	},
 	{
 		'name' : 'delportfwd',
-		'label' : trans('Delete selected rule','UIMachineSettingsPortForwardingDlg'),
+		'label' : 'Delete selected rule',
 		'icon' : 'controller_remove',
 		'click' : function (e) {
 			var listId = $(e.target).closest('div.vboxTabContent').find('tbody.vboxSettingsGlobalNetworkNatPortForwardingList').first().attr('id');
@@ -100,13 +100,13 @@ var sButtons = new Array(
 	}
 );
 
-var pfToolbarIPv4 = new vboxToolbarSmall(sButtons);
+var pfToolbarIPv4 = new vboxToolbarSmall({buttons: sButtons, language_context: 'UIMachineSettingsPortForwardingDlg'});
 pfToolbarIPv4.renderTo('vboxSettingsGlobalNetworkNatPortForwardingToolbarIPv4');
 $('#vboxSettingsGlobalNetworkNatPortForwardingListIPv4').on('select',function(e,el){pfToolbarIPv4.update(el);});
 $('#vboxSettingsGlobalNetworkNatPortForwardingListIPv4').trigger('select');
 
 
-var pfToolbarIPv6 = new vboxToolbarSmall(sButtons);
+var pfToolbarIPv6 = new vboxToolbarSmall({buttons: sButtons, language_context: 'UIMachineSettingsPortForwardingDlg'});
 pfToolbarIPv6.renderTo('vboxSettingsGlobalNetworkNatPortForwardingToolbarIPv6');
 $('#vboxSettingsGlobalNetworkNatPortForwardingListIPv6').on('select',function(e,el){pfToolbarIPv6.update(el);});
 $('#vboxSettingsGlobalNetworkNatPortForwardingListIPv6').trigger('select');
diff --git a/panes/settingsGlobalUsers.html b/panes/settingsGlobalUsers.html
index a868cbc..70fad74 100644
--- a/panes/settingsGlobalUsers.html
+++ b/panes/settingsGlobalUsers.html
@@ -38,7 +38,7 @@ var sButtons = new Array(
 

 	{

 		'name' : 'addUser',

-		'label' : trans('Add User','UIUsers'),

+		'label' : 'Add User',

 		'icon' : 'vm_new',

 		'click' : function () {

 	

@@ -92,7 +92,7 @@ var sButtons = new Array(
 

 	{

 		'name' : 'delUser',

-		'label' : trans('Remove User','UIUsers'),

+		'label' : 'Remove User',

 		'icon' : 'vm_delete',

 		'noDisabledIcon' : true,

 		'enabled' : function (item) { return (item && $(item).data('username') && $(item).data('username') != $('#vboxPane').data('vboxSession').user); },

@@ -116,7 +116,7 @@ var sButtons = new Array(
 	},

 	{

 		'name' : 'chpwUser',

-		'label' : trans('Change Password','UIUsers'),

+		'label' : 'Change Password',

 		'icon' : 'register',

 		'noDisabledIcon' : true,

 		'enabled' : function (item) { return (item && $(item).data('username') && $(item).data('username') == $('#vboxPane').data('vboxSession').user); },

@@ -169,7 +169,7 @@ var sButtons = new Array(
 	},

 	{

 		'name' : 'editUser',

-		'label' : trans('Edit User','UIUsers'),

+		'label' : 'Edit User',

 		'icon' : 'register',

 		'noDisabledIcon' : true,

 		'enabled' : function (item) { return (item && $(item).data('username') && $(item).data('username') != $('#vboxPane').data('vboxSession').user); },

@@ -223,7 +223,7 @@ var sButtons = new Array(
 	}

 );

 

-var userToolbar = new vboxToolbarSmall(sButtons);

+var userToolbar = new vboxToolbarSmall({buttons: sButtons, language_context: 'UIUsers'});

 userToolbar.disabledString = 'dis';

 userToolbar.renderTo('vboxSettingsGlobalUsersToolbar');

 $('#vboxSettingsUserList').on('select', function(e,el){userToolbar.update(el);});

@@ -255,22 +255,5 @@ for(var i in users) {
 }

 $('#vboxSettingsUserList').trigger('select',null);

 

-

-

-/* 

- * 

- * Update Data onSave() 

- * 

- */

-$('#vboxSettingsDialog').on('save',function(){

-	return;

-});

-

-/*

- * Remove dialogs on close

- */

-$('#vboxSettingsDialog').on('close',function(){

-	return;

-});

  

 </script>
\ No newline at end of file
diff --git a/panes/settingsNetwork.html b/panes/settingsNetwork.html
index b3c3943..526d4f3 100644
--- a/panes/settingsNetwork.html
+++ b/panes/settingsNetwork.html
@@ -91,7 +91,7 @@
 	</tr>	

 	<tr class='vboxSettingsNetToggleAdvanced' style='display: none'>

 		<th></th>

-		<td><label><input type='checkbox' class='vboxCheckbox' class='vboxEnablerListen' name='vboxSettingsNetConnected' /> <span class='translate vboxEnablerListen'>Cable connected</span></label></td>

+		<td><label><input type='checkbox' class='vboxCheckbox' class='vboxEnablerListen' name='vboxSettingsNetConnected' /> <span class='translate vboxEnablerListen'>Cable Connected</span></label></td>

 	</tr>

 	<tr class='vboxSettingsNetToggleAdvanced vboxSettingsNetPFButton' style='display: none'>

 		<th></th>

diff --git a/panes/settingsPortForwarding.html b/panes/settingsPortForwarding.html
index 9841358..98b79d7 100644
--- a/panes/settingsPortForwarding.html
+++ b/panes/settingsPortForwarding.html
@@ -40,7 +40,7 @@ $('#vboxSettingsPortForwarding').find('.translate').html(function(i,h){return tr
 var sButtons = new Array(

 	{

 		'name' : 'insportfwd',

-		'label' : trans('Insert new rule','UIMachineSettingsPortForwardingDlg'),

+		'label' : 'Insert new rule',

 		'icon' : 'controller_add',

 		'click' : function () {

 			var rname = null;

@@ -60,7 +60,7 @@ var sButtons = new Array(
 	},

 	{

 		'name' : 'delportfwd',

-		'label' : trans('Delete selected rule','UIMachineSettingsPortForwardingDlg'),

+		'label' : 'Delete selected rule',

 		'icon' : 'controller_remove',

 		'click' : function () {

 			$('#vboxSettingsPortForwardingList').children('tr.vboxListItemSelected').first().remove();

@@ -69,7 +69,7 @@ var sButtons = new Array(
 		'enabled' : function(item) {return ((item && $(item).data('vboxRule')) ? true : false);}

 	}

 );

-var pfToolbar = new vboxToolbarSmall(sButtons);

+var pfToolbar = new vboxToolbarSmall({buttons: sButtons, language_context: 'UIMachineSettingsPortForwardingDlg'});

 pfToolbar.renderTo('vboxSettingsPortForwardingToolbar');

 

 

diff --git a/panes/settingsSharedFolders.html b/panes/settingsSharedFolders.html
index b608025..b94be01 100644
--- a/panes/settingsSharedFolders.html
+++ b/panes/settingsSharedFolders.html
@@ -46,11 +46,11 @@
 var sButtons = new Array(

 

 	{

-		'name' : 'addshared',

-		'label' : trans('Add Shared Folder','UIMachineSettingsSF'),

-		'icon' : 'sf_add',

-		'enabled' : function (item) { return true; },

-		'click' : function () {

+		'name': 'addshared',

+		'label': 'Add Shared Folder',

+		'icon': 'sf_add',

+		'enabled': function (item) { return true; },

+		'click': function () {

 

 			var dialog = vboxSettingsSFEditDialog();

 			

@@ -81,11 +81,11 @@ var sButtons = new Array(
 	},

 

 	{

-		'name' : 'editshared',

-		'label' : trans('Edit Shared Folder','UIMachineSettingsSF'),

-		'icon' : 'sf_edit',

-		'enabled' : function (item) { return $(item).hasClass('vboxListItemSelected');  },

-		'click' : function () {

+		'name': 'editshared',

+		'label': 'Edit Shared Folder',

+		'icon': 'sf_edit',

+		'enabled': function (item) { return $(item).hasClass('vboxListItemSelected');  },

+		'click': function () {

 

 			var dialog = vboxSettingsSFEditDialog();

 			

@@ -118,7 +118,7 @@ var sButtons = new Array(
 	

 	{

 		'name' : 'removeshared',

-		'label' : trans('Remove Shared Folder','UIMachineSettingsSF'),

+		'label' : 'Remove Shared Folder',

 		'icon' : 'sf_remove',

 		'enabled' : function (item) { return $(item).hasClass('vboxListItemSelected'); },

 		'click' : function () {

@@ -135,8 +135,8 @@ var sButtons = new Array(
 

  );

 

-var sfToolbar = new vboxToolbarSmall(sButtons);

-sfToolbar.renderTo('vboxSettingsSFButtons');

+var sfToolbar = new vboxToolbarSmall({buttons: sButtons,

+    language_context: 'UIMachineSettingsSF', renderTo: 'vboxSettingsSFButtons'});

 

 $('#vboxSettingsSharedFoldersList').on('select',function(e,el){sfToolbar.update(el);});

 

diff --git a/panes/settingsStorage.html b/panes/settingsStorage.html
index 6876c8d..5056343 100644
--- a/panes/settingsStorage.html
+++ b/panes/settingsStorage.html
@@ -84,7 +84,7 @@
 							<th></th>

 							<td style='width: 100%'>

 								<label><input type='checkbox' class='vboxCheckbox'

-								name='vboxSettingsStorageHostCache'/> <span class='translate'>Use host I/O cache</span></label></td>

+								name='vboxSettingsStorageHostCache'/> <span class='translate'>Use Host I/O Cache</span></label></td>

 						</tr>

 					</table>

 				</div>

@@ -150,10 +150,14 @@
 								<td><span id='vboxSettingsHDlocation' class='vboxRunningEnabled'>/usr/local/blah/etc..</span></td>

 							</tr>

 							<tr>

-								<th><span class='translate vboxRunningEnabled'>Attached To:</span></th>

+								<th><span class='translate vboxRunningEnabled'>Attached to:</span></th>

 								<td><span id='vboxSettingsHDattached' class='vboxRunningEnabled'>Some Virtual

 								Machine Name</span></td>

 							</tr>

+                            <tr>

+                                <th><span class='translate vboxRunningEnabled'>Encrypted with key:</span></th>

+                                <td><span id='vboxSettingsHDEncrypted' class='vboxRunningEnabled'>--</span></td>

+                            </tr>

 						</table>

 					</div>

 		

@@ -173,7 +177,7 @@
 								<td><span id='vboxSettingsImageLocation' class='vboxRunningEnabled'>/usr/local/blah/etc..</span></td>

 							</tr>

 							<tr>

-								<th><span class='translate vboxRunningEnabled'>Attached To:</span></th>

+								<th><span class='translate vboxRunningEnabled'>Attached to:</span></th>

 								<td><span id='vboxSettingsImageAttached' class='vboxRunningEnabled'>Some Virtual

 								Machine Name</span></td>

 							</tr>

@@ -296,14 +300,14 @@ for(var i=0;i<imgsToLoad.length;i++){
  */ 

 

  /* Menu for adding controllers */

- var vboxSettingsCMenu = new vboxMenu('vboxSettingsAddControllerMenu','vboxSettingsAddControllerMenu');

- vboxSettingsCMenu.iconStringDisabled = '_disabled';

+ var vboxSettingsCMenu = new vboxMenu({id: 'vboxSettingsAddControllerMenu',

+     language_context: 'UIMachineSettingsStorage'});

  var vboxSettingsCMenuItems = [];

  var bustypes = vboxStorage.getBusTypes();

  for(var i = 0; i < bustypes.length; i++) {

  	var bt = bustypes[i];

  	var icon = vboxStorage.getBusIconName(bt);

- 	vboxSettingsCMenuItems[vboxSettingsCMenuItems.length] = {'name':'add'+bt,'icon':icon+"_add",'label':trans('Add '+bt+' Controller','UIMachineSettingsStorage')};

+ 	vboxSettingsCMenuItems[vboxSettingsCMenuItems.length] = {'name':'add'+bt,'icon':icon+"_add",'label':'Add '+bt+' Controller'};

  }

  vboxSettingsCMenu.addMenu(vboxSettingsCMenuItems);

  

@@ -326,12 +330,11 @@ for(var i=0;i<imgsToLoad.length;i++){
  );

  

  /* Storage tree tool bar */

- var scToolbar = new vboxToolbarSmall();

  var vboxSettingsStorageButtons = new Array(

 	{

 		/* Add Attachment Button */

 		'name' : 'addattach',

-		'label' : trans('Add Attachment','UIMachineSettingsStorage'),

+		'label' : 'Add Attachment',

 		'icon' : 'attachment_add',

 		'enabled' : function (item) {

 		

@@ -365,7 +368,7 @@ for(var i=0;i<imgsToLoad.length;i++){
 	{

 		/* Remove Attachment Button */

 		'name' : 'removeattach',

-		'label' : trans('Remove Attachment','UIMachineSettingsStorage'),

+		'label' : 'Remove Attachment',

 		'icon' : 'attachment_remove',

 		'enabled' : function (item) { return (item && $(item).data('attachment')); },

 		'click' : function () {

@@ -390,7 +393,7 @@ for(var i=0;i<imgsToLoad.length;i++){
 	{

 		/* Add Controller Button */

 		'name' : 'addcontroller',

-		'label' : trans('Add Controller','UIMachineSettingsStorage'),

+		'label' : 'Add Controller',

 		'icon' : 'controller_add',

 		'enabled' : function (item) {

 			

@@ -428,7 +431,7 @@ for(var i=0;i<imgsToLoad.length;i++){
 	{

 		/* Remove Controller Button */

 		'name' : 'removecontroller',

-		'label' : trans('Remove Controller','UIMachineSettingsStorage'),

+		'label' : 'Remove Controller',

 		'icon' : 'controller_remove',

 		'enabled' : function (item) { if(item && $(item).data('controller')) return true; },

 		'click' : function () {

@@ -442,13 +445,13 @@ for(var i=0;i<imgsToLoad.length;i++){
 

 

  );

+var scToolbar = new vboxToolbarSmall({buttons: vboxSettingsStorageButtons,

+    language_context: 'UIMachineSettingsStorage', renderTo: 'vboxSettingsControllersButtons'});

 

-scToolbar.addButtons(vboxSettingsStorageButtons);

-scToolbar.renderTo('vboxSettingsControllersButtons');

 

 /* Add controller button menu initialization  */

 scToolbar.getButtonElement("addcontroller").contextMenu({

- 		menu: 'vboxSettingsAddControllerMenu',

+ 		menu: vboxSettingsCMenu.menuId(),

  		mode:'menu',

  		button: 0

  	},

@@ -465,21 +468,15 @@ scToolbar.getButtonElement("addcontroller").contextMenu({
  );

 

 /* Menu for adding attachment */

-if(!$('#vboxSettingsAddAttachmentsMenu').attr('id')) {

-	

-	var ul = $('<ul />').attr({'id':'vboxSettingsAddAttachmentsMenu','class':'contextMenu','style':'display: none'});

-

-	$(ul).append($('<li />').html("<a href='#addCD' style='background-image: url(images/vbox/cd_add_16px.png);' >"+trans('Add CD/DVD Device','UIMachineSettingsStorage')+"</a>"));

-

-	$(ul).append($('<li />').html("<a href='#addHD' style='background-image: url(images/vbox/hd_add_16px.png);' >"+trans('Add Hard Disk','UIMachineSettingsStorage')+"</a>"));

-	

-	$('#vboxPane').append(ul);

+var mAttachMenu = new vboxMenu({id: 'vboxSettingsAddAttachmentsMenu',

+    language_context: 'UIMachineSettingsStorage',

+    menuItems: [{name: 'addCD', icon: 'cd_add', label: 'Add Optical Drive'},

+                {name: 'addHD', icon: 'hd_add', label: 'Add Hard Disk'}]});

 

-}

 

  /* Add attachment button menu initialization  */

 scToolbar.getButtonElement("addattach").contextMenu({

- 		menu: 'vboxSettingsAddAttachmentsMenu',

+ 		menu: mAttachMenu.menuId(),

  		mode:'menu',

  		button: 0

  	},

@@ -494,9 +491,9 @@ $('#vboxSettingsStorageTree').on('itemselect',function(e,el) {scToolbar.update(e
 

 

 /* Medium attachment context menu */

-var vboxSettingsMAMenu = new vboxMenu('vboxSettingsMAMenuL');

-vboxSettingsMAMenu.addMenu([vboxSettingsStorageButtons[1]]);

-

+var vboxSettingsMAMenu = new vboxMenu({'name':'vboxSettingsMAMenuL',

+    'menuItems': [vboxSettingsStorageButtons[1]],

+    'language_context': 'UIMachineSettingsStorage'});

 

 /*

  * Medium menu buttons

@@ -523,7 +520,7 @@ for(var i = 0; i < vboxStorageBusTypes.length; i++) {
 			case 'dvd':

 				b = {

 					'name' : btype+'addcd',

-					'label' : trans('Add CD/DVD Device','UIMachineSettingsStorage'),

+					'label' : 'Add Optical Drive',

 					'icon' : 'cd_add',

 					'click' : function () { 

 						vboxSettingsStorageAddMedium($('#vboxSettingsStorageTree').find('table.vboxListItemSelected').first().parent(),'DVD');

@@ -533,7 +530,7 @@ for(var i = 0; i < vboxStorageBusTypes.length; i++) {
 			case 'disk':

 				b = {

 		    		'name' : btype+'adddrive',

-		    		'label' : trans('Add Hard Disk','UIMachineSettingsStorage'),

+		    		'label' : 'Add Hard Disk',

 		    		'icon' : 'hd_add',

 		    		'click' : function (item) { 

 		    			vboxSettingsStorageAddMedium($('#vboxSettingsStorageTree').find('table.vboxListItemSelected').first().parent());

@@ -543,7 +540,7 @@ for(var i = 0; i < vboxStorageBusTypes.length; i++) {
 			case 'floppy':

 				b = {

 					'name' : btype + 'addfloppy',

-					'label':trans('Add Floppy Device','UIMachineSettingsStorage'),

+					'label':trans('Add Floppy Drive','UIMachineSettingsStorage'),

 					'icon' : 'fd_add',

 					'click' : function (item) {

 						vboxSettingsStorageAddMedium($('#vboxSettingsStorageTree').find('table.vboxListItemSelected').first().parent(),'Floppy'); }

@@ -561,10 +558,9 @@ for(var i = 0; i < vboxStorageBusTypes.length; i++) {
 	menuItems[(menuItems.length-1)].separator = true;

 	menuItems[(menuItems.length-1)].enabled = null; // always enabled

 

-	vboxStorageAttachmentMenus[btype] = new vboxMenu('vboxSettingsController'+btype+'AttachmentsMenu');

-	vboxStorageAttachmentMenus[btype].iconStringDisabled = '_disabled';

-	vboxStorageAttachmentMenus[btype].addMenu(menuItems);

-	

+	vboxStorageAttachmentMenus[btype] = new vboxMenu({name: 'vboxSettingsController'+btype+'AttachmentsMenu',

+	    language_context: 'UIMachineSettingsStorage',

+	    'menuItems': menuItems});	

 	

 }

 

@@ -983,19 +979,19 @@ function vboxSettingsMediumTip(m) {
 

 	// DVD / Floppy images

 	if(m.deviceType != 'HardDisk') {

-		return '<b>'+m.location+'</b><p>'+trans('Attached To:','UIMachineSettingsStorage')+' '+vboxMedia.attachedTo(m)+'</p>';

+		return '<b>'+m.location+'</b><p>'+trans('Attached to:','UIMachineSettingsStorage')+' '+vboxMedia.attachedTo(m)+'</p>';

 	}

 	

 	var mbase = m;

 	if(m.base != m.id) {

 		mbase = vboxMedia.getMediumById(m.base);

 	}

-	var tip = '<b>'+mbase.location+'</b><p>'+trans('Type (Format):','UIMachineSettingsStorage')+' '+vboxMedia.getType(mbase)+' ('+mbase.format+')</p><p>'+trans('Attached To:','UIMachineSettingsStorage')+' '+vboxMedia.attachedTo(mbase)+'</p>';

+	var tip = '<b>'+mbase.location+'</b><p>'+trans('Type (Format):','UIMachineSettingsStorage')+' '+vboxMedia.getType(mbase)+' ('+mbase.format+')</p><p>'+trans('Attached to:','UIMachineSettingsStorage')+' '+vboxMedia.attachedTo(mbase)+'</p>';

 		

 	// Is this a medium that is attached indirectly

 	if(vboxSettingsStorageBusses.isAttachedIndirect(m) && m.base != m.id) {

 		var p = vboxSettingsStorageBusses.isAttached(m);

-		tip += '<hr />'+trans('This base hard disk is indirectly attached using the following differencing hard disk:','VBoxGlobal')+'<br /><b>'+p.location+'</b></p><p>'+trans('Type (Format):','UIMachineSettingsStorage')+' '+vboxMedia.getType(p) + ' (' + p.format + ')'+'</p><p>'+trans('Attached To:','UIMachineSettingsStorage')+' '+vboxMedia.attachedTo(p)+'</p>';

+		tip += '<hr />'+trans('This base hard disk is indirectly attached using the following differencing hard disk:','VBoxGlobal')+'<br /><b>'+p.location+'</b></p><p>'+trans('Type (Format):','UIMachineSettingsStorage')+' '+vboxMedia.getType(p) + ' (' + p.format + ')'+'</p><p>'+trans('Attached to:','UIMachineSettingsStorage')+' '+vboxMedia.attachedTo(p)+'</p>';

 	} else if(m.readOnly) {

     	tip += '<hr />'+trans('Attaching this hard disk will be performed indirectly using a newly created differencing hard disk.','VBoxGlobal');

 	}

@@ -1228,7 +1224,7 @@ function vboxSettingsAddController(con,list) {
     	if(dtypes[i] == 'dvd') {

 		    b = {

 				'name' : con.bus+'addcd',

-				'label' : trans('Add CD/DVD Device','UIMachineSettingsStorage'),

+				'label' : trans('Add Optical Drive','UIMachineSettingsStorage'),

 				'icon' : 'cd_add',

 				'click' : function () { vboxSettingsStorageAddMedium(li,'DVD'); }

 			};

@@ -1241,7 +1237,7 @@ function vboxSettingsAddController(con,list) {
 		    	};

     		

     	} else if(dtypes[i] == 'floppy') {

-    		b = {'label':trans('Add Floppy Device','UIMachineSettingsStorage'),

+    		b = {'label':trans('Add Floppy Drive','UIMachineSettingsStorage'),

 				'icon' : 'fd_add',

 				'click' : function (item) { vboxSettingsStorageAddMedium(li,'Floppy'); }

 				};

@@ -1251,10 +1247,10 @@ function vboxSettingsAddController(con,list) {
    			return (li.find('li').length < (vboxStorage[con.bus].maxPortCount * vboxStorage[con.bus].maxDevicesPerPortCount));

    		};

 

-   		var tb = new vboxToolbarSmall([b]);

-	   	tb.buttonStyle = 'margin:0px;padding:0px;border:0px;background-repeat:no-repeat;background-position:0px 0px;';

-	   	tb.noHover = true;

-	   	tb.renderTo(li.find('td.vboxControllerAttachmentButton'));

+   		var tb = new vboxToolbarSmall({buttons: [b],

+       		  buttonStyle: 'margin:0px;padding:0px;border:0px;background-repeat:no-repeat;background-position:0px 0px;',

+       		  noHover: true,

+       		  renderTo: li.find('td.vboxControllerAttachmentButton')});

    		tb.disable();

    		

 	}

@@ -1454,13 +1450,16 @@ function vboxSettingsSelectAttachment(tbl) {
 

     	var disp = vboxMedia.getMediumById(m.base);

     	name = vboxMedia.getName(disp);

-    		

+ 

+        var encSettings = vboxMedia.getEncryptionSettings(disp);

+

         $('#vboxSettingsHDvsize').html(vboxMbytesConvert(disp.logicalSize));

         $('#vboxSettingsHDasize').html(vboxBytesConvert(disp.size));

         $('#vboxSettingsHDDetails').html(vboxMedia.getHardDiskVariant(disp));

         $('#vboxSettingsHDlocation').html(disp.location);

         $('#vboxSettingsHDtype').html(trans(disp.type,'VBoxGlobal') + ' (' + disp.format + ')');

-        $('#vboxSettingsHDattached').html(vboxMedia.attachedTo(disp));            

+        $('#vboxSettingsHDattached').html(vboxMedia.attachedTo(disp));

+        $('#vboxSettingsHDEncrypted').html(encSettings && encSettings.id ? encSettings.id : '--');

 

         

     } else {

diff --git a/panes/settingsSystem.html b/panes/settingsSystem.html
index c290d8a..68f8669 100644
--- a/panes/settingsSystem.html
+++ b/panes/settingsSystem.html
@@ -76,7 +76,7 @@
 	</tr>	

 	<tr>

 		<th style='text-align:right'><span class='translate'>Extended Features:</span></th>

-		<td><label><input type='checkbox' class='vboxCheckbox' name='vboxSettingsSystemIOAPIC' /> <span class='translate'>Enable IO APIC</span></label></td>

+		<td><label><input type='checkbox' class='vboxCheckbox' name='vboxSettingsSystemIOAPIC' /> <span class='translate'>Enable I/O APIC</span></label></td>

 	</tr>

 	<tr>

 		<th></th>

@@ -84,7 +84,7 @@
 	</tr>

 	<tr>

 		<th></th>

-		<td><label><input type='checkbox' class='vboxCheckbox' name='vboxSettingsSystemRTCUseUTC' /> <span class='translate'>Hardware clock in UTC time</span></label></td>

+		<td><label><input type='checkbox' class='vboxCheckbox' name='vboxSettingsSystemRTCUseUTC' /> <span class='translate'>Hardware Clock in UTC Time</span></label></td>

 	</tr>

 	<tr class='vboxSettingsSystemAdvancedOnly'>

 		<th></th>

@@ -202,9 +202,11 @@
 /* Boot order devices */

 $('#vboxVMBootOrder').find("span.vboxBootOrderDevice").html(function(i,h){return trans(vboxDevice(h),'VBoxGlobal');});

 

-/* CHipsets */

+/* Chipsets */

 $('#vboxSettingsSystemChipsetRow').find('option').html(function(i,h){return trans(h,'VBoxGlobal');});

 

+/* Paravirtualization providers */

+$(document.forms['frmVboxSettings'].vboxSettingsParavirtInterface).find('option').html(function(i,h){return trans(h,'VBoxGlobal', 'ParavirtProvider');});

 

 $('#vboxSettingsSystemMemory').data('form','frmVboxSettings');

 $('#vboxSettingsSystemProcessor').data('form','frmVboxSettings');

diff --git a/panes/settingsUSB.html b/panes/settingsUSB.html
index a0cc75d..a00c495 100644
--- a/panes/settingsUSB.html
+++ b/panes/settingsUSB.html
@@ -29,6 +29,8 @@
 		<table style='width: 100%'>

 			<tr class='vboxRunningEnabled'>

 				<td id='vboxSettingsUSBFilters' style='width: 100%;' class='vboxBordered vboxEnablerListen'>

+                    <!-- Hidden div for context menu -->

+                    <div id='vboxSettingsUSBAddDeviceClick' style='display: none' />

 					<ul id='vboxSettingsUSBFilterList' class='vboxList vboxHover' style='width: 100%'>

 						<li class='vboxListItem'><input type='checkbox' class='vboxCheckbox' />a</li>

 					</ul>

@@ -54,7 +56,7 @@
 

 	{

 		'name' : 'usbnew',

-		'label' : trans('Add Empty Filter','UIMachineSettingsUSB'),

+		'label' : 'Add Empty Filter',

 		'icon' : 'usb_new',

 		'click' : function () {

 			var list = $('#vboxSettingsUSBFilterList');

@@ -74,7 +76,7 @@
 

 	{

 		'name' : 'usbnewdevice',

-		'label' : trans('Add Filter From Device','UIMachineSettingsUSB'),

+		'label' : 'Add Filter From Device',

 		'icon' : 'usb_add',

 		'click' : function (e) {

 

@@ -129,7 +131,7 @@
 	

 	{

 		'name' : 'usbedit',

-		'label' : trans('Edit Filter','UIMachineSettingsUSB'),

+		'label' : 'Edit Filter',

 		'icon' : 'usb_filter_edit',

 		'enabled' : function (item) { return (item && $(item).data('filter') && $(item).data('filter').name); },

 		'click' : function () {

@@ -187,7 +189,7 @@
 

 	{

 		'name' : 'usbremove',

-		'label' : trans('Remove Filter','UIMachineSettingsUSB'),

+		'label' : 'Remove Filter',

 		'icon' : 'usb_remove',

 		'enabled' : function (item) { return (item && $(item).data('filter') && $(item).data('filter').name); },

 		'click' : function () {

@@ -207,7 +209,7 @@
 	

 	{

 		'name' : 'usbup',

-		'label' : trans('Move Filter Up','UIMachineSettingsUSB'),

+		'label' : 'Move Filter Up',

 		'icon' : 'usb_moveup',

 		'enabled' : function (item) {

 			return (item && $(item).data('filter') && $(item).data('filter').name && $(item).attr('id') != $('#vboxSettingsUSBFilterList').children().first().attr('id'));

@@ -229,7 +231,7 @@
 	

 	{

 		'name' : 'usbdown',

-		'label' : trans('Move Filter Down','UIMachineSettingsUSB'),

+		'label' : 'Move Filter Down',

 		'icon' : 'usb_movedown',

 		'enabled' : function (item) {

 			return (item && $(item).data('filter') && $(item).data('filter').name && $(item).attr('id') != $('#vboxSettingsUSBFilterList').children().last().attr('id'));

@@ -251,8 +253,8 @@
 			

  );

 

-var usbToolbar = new vboxToolbarSmall(sButtons);

-usbToolbar.renderTo('vboxSettingsUSBButtons');

+var usbToolbar = new vboxToolbarSmall({buttons: sButtons,

+    language_context: 'UIMachineSettingsUSB', renderTo: 'vboxSettingsUSBButtons'});

 

 $('#vboxSettingsUSBFilterList').on('select',function(e,el){usbToolbar.update(el);});

 

@@ -285,17 +287,8 @@ function vboxSettingsAddUSBFilter(f,noColor) {
 

 

 /* Menu for adding existing USB device */

-if($('#vboxSettingsUSBAddDevice').attr('id')) {

-	$('#vboxSettingsUSBAddDevice').empty();

-} else {

-	$('#vboxPane').append($('<ul />').attr({'class':'contextMenu contextMenuNoBG','style':'display: none','id':'vboxSettingsUSBAddDevice'}));

-}

 

-/* Hidden element that menu is bound to */

-if(!$('#vboxSettingsUSBAddDeviceClick').attr('id')) {

-	

-	$('#vboxSettingsUSBFilters').append($('<div />').attr({'style':'display: none','id':'vboxSettingsUSBAddDeviceClick'}));

-}

+var exUsb = new vboxMenu({id: 'vboxSettingsUSBAddDevice', menuItems: []});

 

 /* Add attachment button menu initialization  */

 $("#vboxSettingsUSBAddDeviceClick").contextMenu({

diff --git a/panes/tabVMDetails.html b/panes/tabVMDetails.html
index 5fb29cf..17876e6 100644
--- a/panes/tabVMDetails.html
+++ b/panes/tabVMDetails.html
@@ -325,7 +325,7 @@ $('#vboxTabVMDetails').on('hide',function(){
 

 //Base function that returns a table row of machine detail data

 //Called from other functions

-function __vboxDetailRow(name,value,cssClass,html) {

+function __vboxDetailRow(name, value, cssClass, html) {

 	

 	// convert to strings

 	if(typeof(value) == 'undefined') value = '';

@@ -374,8 +374,9 @@ function __vboxDetailAddRows(data, rows, table) {
 		if(rows[i].rawRow) {

 			$(table).append(rowData);

 		} else {

+		    var title = trans(rows[i].title, rows[i].language_context);

 			$(table).append(__vboxDetailRow(

-			        rows[i].title,

+			        title,

 			        rowData, 

 			        'vboxDetailName ' + (rows[i].indented ? ' vboxDetailNameIndent' : '') + ' ' + (rows[i].cssClass ? rows[i].cssClass : ''),

 			        rows[i].html));

@@ -399,6 +400,7 @@ function __vboxCreateDetailsSection(data, sectionName, section) {
 		links = false;

 	}

 

+	var title = trans(section.title, section.language_context);

 	var vboxDetailsTable = $('<table />')

 		.attr({'class':'vboxDetailsTable vboxDetailsTableBox'})

 		.append($('<thead />')

@@ -411,7 +413,7 @@ function __vboxCreateDetailsSection(data, sectionName, section) {
 							$('<span />').css({'float':'left'}).addClass((links ? 'vboxDetailsSectionLink' : '')).click(function(){

 								if($(this).hasClass('vboxDetailsSectionLink'))

 									vboxVMsettingsDialog(data,section.settingsLink);

-							}).html(section.title)

+							}).html(title)

 						).append(

 							$('<span />').addClass('vboxArrowImage')

 								.click(function(){ $(this).parent().trigger("dblclick"); })

@@ -705,7 +707,7 @@ for(var i in vboxVMDetailsSections) {
 				})

 				

 			).append(

-				$('<span />').html(vboxVMDetailsSections[i].title)

+				$('<span />').html(trans(vboxVMDetailsSections[i].title, vboxVMDetailsSections[i].language_context))

 				

 			).disableSelection()

 			

diff --git a/panes/tabVMSnapshots.html b/panes/tabVMSnapshots.html
index 8c071c7..f71a042 100644
--- a/panes/tabVMSnapshots.html
+++ b/panes/tabVMSnapshots.html
@@ -86,7 +86,8 @@ var vboxSnapshotButtons = [
             	

   	{

   		'name' : 'take_snapshot',

-  		'label' : trans('Take Snapshot...','UIActionPool'),

+  		'label' : 'Take Snapshot...',

+  		'language_context': 'UIActionPool',

   		'icon' : 'snapshot_take',

   		'enabled' : function(item) {

   			

@@ -196,7 +197,7 @@ var vboxSnapshotButtons = [
   	},

   	{

   		'name' : 'discard_cur_state',

-  		'label' : trans('Restore Snapshot','VBoxSnapshotsWgt'),

+  		'label' : 'Restore Snapshot',

   		'icon' : 'snapshot_restore',

   		'enabled' : function(item) {

   			var vm = vboxChooser.getSingleSelected();

@@ -284,7 +285,7 @@ var vboxSnapshotButtons = [
   	},

   	{

   		'name' : 'delete_snapshot',

-  		'label' : trans('Delete Snapshot','VBoxSnapshotsWgt'),

+  		'label' : 'Delete Snapshot',

   		'icon' : 'snapshot_delete',

   		'enabled' : function(item) {

   			return (item && $(item).data('vboxSnapshot') && $(item).data('vboxSnapshot').name && $(item).data('vboxSnapshot').state != 'current' && $(item).data('vboxSnapshot').children.length <= 1);

@@ -309,12 +310,15 @@ var vboxSnapshotButtons = [
 

 				l.run();				

 			};

-			vboxConfirm(trans('<p>Deleting the snapshot will cause the state information saved in it to be lost, and disk data spread over several image files that VirtualBox has created together with the snapshot will be merged into one file. This can be a lengthy process, and the information in the snapshot cannot be recovered.</p></p>Are you sure you want to delete the selected snapshot <b>%1</b>?</p>','UIMessageCenter').replace('%1',$('<div />').text(snapshot.name).html()),buttons);  	  		

+			vboxConfirm(trans('<p>Deleting the snapshot will cause the state information saved in it to be lost, and '+

+			        'storage data spread over several image files that VirtualBox has created together with the snapshot '+

+			        'will be merged into one file. This can be a lengthy process, and the information in the snapshot cannot '+

+			        'be recovered.</p></p>Are you sure you want to delete the selected snapshot <b>%1</b>?</p>','UIMessageCenter').replace('%1',$('<div />').text(snapshot.name).html()),buttons);  	  		

   	  	}

   	},

   	{

   		'name' : 'show_snapshot_details',

-  		'label' : trans('Show Details','VBoxSnapshotsWgt'),

+  		'label' : 'Show Details',

   		'icon' : 'snapshot_show_details',

   		'enabled' : function(item) {

   			return (item && $(item).data('vboxSnapshot') && $(item).data('vboxSnapshot').name && $(item).data('vboxSnapshot').state != 'current');

@@ -360,7 +364,7 @@ var vboxSnapshotButtons = [
 			  	  		$('<th />').attr({'class':'vboxDetailsSection','colspan':'2'}).disableSelection()

 			  	  			.html("<img style='float:left; margin-right: 3px; ' src='images/vbox/" + section.icon + "' height='16' width='16' /> ")

 			  	  			.append(

-			  	  				$('<span />').css({'float':'left'}).append(document.createTextNode(section.title +' '))

+			  	  				$('<span />').css({'float':'left'}).append(document.createTextNode(trans(section.title, section.language_context) +' '))

 			  	  			)

 			  	  	).appendTo(vboxDetailsTable);

 

@@ -400,7 +404,8 @@ var vboxSnapshotButtons = [
   	},

   	{

   		'name' : 'clone',

-  		'label' : trans('Clone...','UIActionPool'),

+  		'label' : 'Clone...',

+  		'language_context': 'UIActionPool',

   		'icon' : 'vm_clone',

   		'separator' : true,

   		'enabled' : function(item) { 

@@ -425,8 +430,7 @@ var vboxSnapshotButtons = [
 

 

 /* Append Top Toolbar */

-var vboxSnapshotToolbar = new vboxToolbarSmall(vboxSnapshotButtons);

-vboxSnapshotToolbar.size = 22;

+var vboxSnapshotToolbar = new vboxToolbarSmall({buttons: vboxSnapshotButtons, size: 22, language_context: 'VBoxSnapshotsWgt'});

 // special case for 'clone' button because it is 16px rather than 22px

 vboxSnapshotToolbar.addButtonCSS('clone', {'background-position':'6px 4px'});

 vboxSnapshotToolbar.renderTo('vboxSnapshotToolbar');

@@ -434,11 +438,11 @@ vboxSnapshotToolbar.renderTo('vboxSnapshotToolbar');
 vboxInitDisplay('vboxSnapshotToolbar','VBoxSnapshotsWgt');

 

 // Context menu for snapshots

-var vboxSnapshotContextMenu = new vboxMenu('vboxSnapshotContextMenu');

+var vboxSnapshotContextMenu = new vboxMenu({name:'vboxSnapshotContextMenu', language_context: 'VBoxSnapshotsWgt'});

 vboxSnapshotContextMenu.addMenu(vboxSnapshotButtons.slice(-(vboxSnapshotButtons.length-1)));

 

 //Context menu for current state

-var vboxSnapshotContextMenuCurrent = new vboxMenu('vboxSnapshotContextMenuCurrent');

+var vboxSnapshotContextMenuCurrent = new vboxMenu({name: 'vboxSnapshotContextMenuCurrent', language_context: 'VBoxSnapshotsWgt'});

 vboxSnapshotContextMenuCurrent.addMenu([vboxSnapshotButtons[0],vboxSnapshotButtons[(vboxSnapshotButtons.length-2)]]);

 

 

diff --git a/panes/tabs.html b/panes/tabs.html
index a0de98d..1b72f8a 100644
--- a/panes/tabs.html
+++ b/panes/tabs.html
@@ -54,7 +54,7 @@ for(var i = 0; i < tabs.length; i++) {
 		continue;

 

 	// Tab link

-	$('<li />').attr({'class':'ui-corner-all','id':'tabsMain-'+tabs[i].name}).html('<a href="#'+tabs[i].name+'"><span><img src="images/vbox/'+tabs[i].icon+'_16px.png" border="0" /> <span id="'+tabs[i].name+'Title">'+trans(tabs[i].label,'UIVMDesktop')+'</span></span></a>').appendTo('#tablistMain');

+	$('<li />').attr({'class':'ui-corner-all','id':'tabsMain-'+tabs[i].name}).html('<a href="#'+tabs[i].name+'"><span><img src="images/vbox/'+tabs[i].icon+'_16px.png" border="0" /> <span id="'+tabs[i].name+'Title">'+trans(tabs[i].label, 'UIVMDesktop')+'</span></span></a>').appendTo('#tablistMain');

 	

 	tabLoader.addFileToDOM('panes/'+tabs[i].content+'.html',$('#tabMainContent'));

 	

diff --git a/panes/toolbar.html b/panes/toolbar.html
index 4e482e0..b637c60 100644
--- a/panes/toolbar.html
+++ b/panes/toolbar.html
@@ -13,52 +13,55 @@
  * from this toolbar

  */

 var tButtons = [

-	

-	/* All toolbar items need a 'name' property */

-	$.extend({},vboxVMActions['new'],{'name':'new'}),

-	$.extend({},vboxVMActions['settings'],{'name':'settings',click:function(){

-		var vm = vboxChooser.getSingleSelected();

-		if(!vm || vboxVMStates.isRunning(vm) || vboxVMStates.isPaused(vm)) return;

-		vboxVMActions['settings'].click();

-		

-	}}),

-	$.extend({},vboxVMActions['start'],{'name':'start'}),

-	{

-		'name':'stop',

-		'icon':'vm_poweroff',

-		'label':trans('Stop','VBoxSelectorWnd'),

-		'enabled': vboxVMActions['stop'].enabled,

-		'click' : function() {return;}

-	}

+    

+    vboxVMActions['new'],

+    $.extend({},vboxVMActions['settings'],{click: function(){

+        var vm = vboxChooser.getSingleSelected();

+        if(!vm || vboxVMStates.isRunning(vm) || vboxVMStates.isPaused(vm)) return;

+        vboxVMActions['settings'].click();

+        

+    }}),

+    vboxVMActions['start'],

+    {

+        name: 'stop',

+        icon: 'vm_poweroff',

+        label: 'Stop',

+        language_context: 'VBoxSelectorWnd',

+        enabled: vboxVMActions['stop'].enabled,

+        click : function() {return;}

+    }

 ];

 

 /* Append Top Toolbar */

-var vboxChooserToolbarTop = new vboxToolbar(tButtons);

-vboxChooserToolbarTop.size = 32;

-vboxChooserToolbarTop.renderTo('vboxPaneToolbar');

+var vboxChooserToolbarTop = new vboxToolbar({buttons: tButtons, size: 32,

+    language_context: 'UIActionPool', renderTo: 'vboxPaneToolbar'});

 

 /* Stop button menu and actions */

-var ul = $('<ul />').attr({'class':'contextMenu','style':'display: none','id':'vboxStopMenu'});

-$(ul).append($('<li />').html("<a href='#" + 'pause' + "' style='background-image: url(images/vbox/" + vboxVMActions['pause'].icon +"_16px.png);' >"+vboxVMActions['pause'].label+"</a>"));

-$(ul).append($('<li />').html("<a href='#" + 'reset' + "' style='background-image: url(images/vbox/" + vboxVMActions['reset'].icon +"_16px.png);' >"+vboxVMActions['reset'].label+"</a>"));

+var stopMenuItems = [

+    vboxVMActions['pause'],

+    vboxVMActions['reset'],

+];

 for(var i = 0; i < vboxVMActions.stop_actions.length; i++) {

-	var n = vboxVMActions.stop_actions[i];

-	$(ul).append($('<li />').addClass((i==0 ? 'separator' : '')).html("<a href='#" + n + "' style='background-image: url(images/vbox/" + vboxVMActions[n].icon +"_16px.png);' >"+vboxVMActions[n].label+"</a>"));

+    var n = $.extend({}, vboxVMActions[vboxVMActions.stop_actions[i]]);

+    if(i==0) n.separator = true;

+    stopMenuItems[stopMenuItems.length] = n;

 }

-

-/* Append 'Stop' button Menu */

-$('#vboxPane').append(ul);

+stopMenu = new vboxMenu({name: 'stopContextMenu', menuItems: stopMenuItems, language_context: 'UIActionPool'});

 

 vboxChooserToolbarTop.getButtonElement('stop').contextMenu({

-	menu: 'vboxStopMenu',

-	button: 0,

-	mode: 'menu'

-	},function(a, el, pos) {

-        vboxVMActions[a].click();

-	}

+    menu: stopMenu.menuId(),

+    button: 0,

+    mode: 'menu'

+    },function(a, el, pos) {

+        for(var i in vboxVMActions) {

+            if(typeof i == 'string' && vboxVMActions[i].name == a) {

+                vboxVMActions[i].click();

+                return;

+            }

+        }

+    }

 );

 

-

 /* 'Settings' menu items / actions */

 var vboxChooserSettingsMenu = {

 		

@@ -70,19 +73,19 @@ var vboxChooserSettingsMenu = {
 		'icon' : 'hd'

 	},

 	'USB' : {

-		'label' : trans('USB Devices','UIActionPool'),

+		'label' : 'USB',

 		'icon' : 'usb'

 	},

 	'Network' : {

-		'label' : trans('Network Adapters...','UIActionPool'),

+		'label' : 'Network',

 		'icon' : 'nw'

 	},

 	'SharedFolders' : {

-		'label' : trans('Shared Folders...','UIActionPool'),

+		'label' : 'Shared Folders',

 		'icon' : 'sf'

 	},

 	'RemoteDisplay' : {

-		'label' : trans('Enable Remote Display','UIActionPool'),

+		'label' : 'Remote Display',

 		'icon' : 'vrdp',

 		'separator' : true

 	},	

@@ -102,8 +105,8 @@ for(var i in vboxChooserSettingsMenu) {
 	

 	// add name

 	vboxChooserSettingsMenu[i].name = i;

-

-	var li = $('<li />').html("<span class='vboxMenuItemChecked' /><a href='#" + vboxChooserSettingsMenu[i].name + "' style='background-image: url(images/vbox/" + vboxChooserSettingsMenu[i].icon +"_16px.png);' >"+(vboxChooserSettingsMenu[i].label ? vboxChooserSettingsMenu[i].label : ' ')+"</a>");

+    var label = trans(vboxChooserSettingsMenu[i].label, 'UIActionPool'); 

+	var li = $('<li />').html("<span class='vboxMenuItemChecked' /><a href='#" + vboxChooserSettingsMenu[i].name + "' style='background-image: url(images/vbox/" + vboxChooserSettingsMenu[i].icon +"_16px.png);' >"+(label ? label : ' ')+"</a>");

 	if(i == 'storage') { $(li).attr({'style':'display:none','id':'vboxVMSettingsToolbarStorageHolder'}); }

 	if(i == 'USB') {

 		/* 'USB' menu */

@@ -131,13 +134,13 @@ vboxChooserToolbarTop.getButtonElement('settings').contextMenu({
 		

 		if(!vm) return;

 		

-		if(a == 'Network' || a == 'SharedFolders') {

-			vboxVMsettingsDialog(vm, a);

-			return;

-		}

-		

 		switch(a) {

 		

+		    case 'Network':

+		    case 'SharedFolders':

+		        vboxVMsettingsDialog(vm, a);

+		        break;

+

 			case 'GuestAdditions':

 				

 				vboxVMActions['guestAdditionsInstall'].click();				

@@ -313,9 +316,17 @@ function vboxUpdateSettingsMenu(vm) {
 		vboxChooserToolbarTop.getButtonElement("settings").disableContextMenu();

 		return;

 	}

-

 	// enable or disable USB

-	if(vm && vm['USBController'] && vm['USBController']['enabled']) {

+	var usbEnabled = false;

+	if(vm['USBControllers'].length) {

+	    for(var i = 0; i < vm['USBControllers'].length; i++) {

+	        if(vm['USBControllers'][i].type == 'OHCI') {

+	            usbEnabled = true;

+	            break;

+	        }

+	    }

+	}

+	if(usbEnabled) {

 		$('ul.vboxSettingsUSBAttachmentsMenu').children().remove();

 		$('#vboxVMSettingsMenu').find('a[href=#USB]').closest('li').css('display','');

 	} else {

@@ -385,7 +396,7 @@ function vboxUpdateSettingsMenu(vm) {
 		}

 		if(dvdDevices.length) {

 			var ul = null;

-			var li = $('<li />').html("<a href='#dvdDevices' style='background-image:url(images/vbox/cd_16px.png);'>"+trans('CD/DVD Devices','UIActionPool')+'</a>').addClass('vboxVMSettingsStorage');

+			var li = $('<li />').html("<a href='#dvdDevices' style='background-image:url(images/vbox/cd_16px.png);'>"+trans('Optical Drives','UIActionPool')+'</a>').addClass('vboxVMSettingsStorage');

 			if(dvdDevices.length == 1) {

 				ul = dvdDevices[0].children('ul').first();

 			} else {

diff --git a/panes/topmenu.html b/panes/topmenu.html
index da47233..7042455 100644
--- a/panes/topmenu.html
+++ b/panes/topmenu.html
@@ -16,21 +16,21 @@
  */

 

 // Top menu

-var vboxTopMenuBar = new vboxMenuBar('vboxTop');

+var vboxTopMenuBar = new vboxMenuBar({name: 'vboxTop', language_context: 'UIActionPool'});

 

 var menu = {

 	'name':'vboxTopFile',

-	'label':trans('File','UIActionPool'),

+	'label': 'File',

 	'menu':[

         {

 			'name':'fileVMM',

-			'label':trans('Virtual Media Manager...','UIActionPool'),

+			'label':'Virtual Media Manager...',

 			'icon':'diskimage',

 			'click':function(){vboxVMMDialog();}

         },

         {

 			'name':'fileImport',

-			'label':trans('Import Appliance...','UIActionPool'),

+			'label':'Import Appliance...',

 			'icon':'import',

 			'click':function(){

 				

@@ -40,13 +40,13 @@ var menu = {
         },

         {

 			'name':'fileExport',

-			'label':trans('Export Appliance...','UIActionPool'),

+			'label':'Export Appliance...',

 			'icon':'export',

 			'click':function(){new vboxWizardExportApplianceDialog().run();}

         },

         {

 			'name':'filePrefs',

-			'label':trans('Preferences...','UIActionPool'),

+			'label':'Preferences...',

 			'icon':'global_settings',

 			'click':function(){vboxGlobalPrefsDialog();},

 			'separator':true

@@ -58,7 +58,8 @@ if($('#vboxPane').data('vboxSession').user) {
 	if ( $('#vboxPane').data('vboxConfig').authCapabilities.canChangePassword )

 		menu['menu'][menu['menu'].length] = {

 			'name' : 'fileChangePW',

-			'label' : trans('Change Password','UIUsers'),

+			'label' : 'Change Password',

+			'language_context': 'UIUsers',

 			'icon' : 'register',

 			'click': function() {

 				var l = new vboxLoader();

@@ -113,7 +114,7 @@ if($('#vboxPane').data('vboxSession').user) {
 		menu['menu'][menu['menu'].length] = {

 				'name' : 'fileLogout',

 				// Pre-translated title to append username

-				'label' : trans('Log out - %1','UIActionPool').replace('%1',$('#vboxPane').data('vboxSession').user),

+				'label' : trans('Log out - %1','VBoxSelectorWnd').replace('%1',$('#vboxPane').data('vboxSession').user),

 				'icon' : 'exit',

 				'click': function() {

 					

@@ -170,62 +171,63 @@ vboxTopMenuBar.addMenu(menu);
 //VM List Context menu for each VM

 var sChildren = [];

 for(var i = 0; i < vboxVMActions.stop_actions.length; i++) {

-	sChildren[sChildren.length] = $.extend({},vboxVMActions[vboxVMActions.stop_actions[i]],{'name':vboxVMActions.stop_actions[i],'iconStringDisabled':'_disabled'});

+	sChildren[sChildren.length] = vboxVMActions[vboxVMActions.stop_actions[i]];

 }

 

 

 vboxTopMenuBar.addMenu({

-	'name':'vboxTopMachine',

-	'label':trans('Machine','UIActionPool'),

+	'name': 'vboxTopMachine',

+	'label': 'Machine',

 	'enabled' : function(chooser) {

 		return (!chooser || (chooser.selectionMode != vboxSelectionModeSingleGroup));

 	},

 	'menu':[

-	    $.extend({},vboxVMActions['new'],{'name':'new'}),

-	    $.extend({},vboxVMActions['add'],{'name':'add'}),

-	    $.extend({},vboxVMActions['settings'],{'name':'settings'}),

-	    $.extend({},vboxVMActions['clone'],{'name':'clone'}),

-	    $.extend({},vboxVMActions['remove'],{'name':'remove'}),

-	    $.extend({},vboxVMActions['group'],{'name':'group'}),

-	    $.extend({},vboxVMActions['start'],{'name':'start','separator':true}),

-	    $.extend({},vboxVMActions['pause'],{'name':'pause'}),

-	    $.extend({},vboxVMActions['reset'],{'name':'reset'}),

-	    $.extend({},vboxVMActions['stop'],{'name':'stop','children':sChildren}),

-	    $.extend({},vboxVMActions['discard'],{'name':'discard','separator':true}),

-	    $.extend({},vboxVMActions['logs'],{'name':'logs'}),

-	    $.extend({},vboxVMActions['refresh'],{'name':'refresh'})

+	    vboxVMActions['new'],

+	    vboxVMActions['add'],

+	    vboxVMActions['settings'],

+	    vboxVMActions['clone'],

+	    vboxVMActions['remove'],

+	    vboxVMActions['group'],

+	    $.extend({},vboxVMActions['start'],{'separator':true}),

+	    vboxVMActions['pause'],

+	    vboxVMActions['reset'],

+	    $.extend({},vboxVMActions['stop'],{'children':sChildren}),

+	    $.extend({},vboxVMActions['discard'],{'separator':true}),

+	    vboxVMActions['logs'],

+	    vboxVMActions['refresh'],

 	]

 });

 

 		

 vboxTopMenuBar.addMenu({

 	'name':'vboxTopGroup',

-	'label':trans('Group','UIActionPool'),

+	'label':'Group',

 	'enabled' : function(chooser) {

 		return (chooser && (chooser.selectionMode == vboxSelectionModeSingleGroup));

 	},

 	'menu':[

-    	$.extend({}, vboxVMGroupActions['newmachine'], {name:'newmachine'}),

-    	$.extend({}, vboxVMGroupActions['addmachine'], {name:'addmachine'}),

-    	$.extend({}, vboxVMGroupActions['rename'], {name:'rename',separator:true}),

-    	$.extend({}, vboxVMGroupActions['ungroup'], {name:'ungroup'}),

+    	vboxVMGroupActions['newmachine'],

+    	vboxVMGroupActions['addmachine'],

+    	$.extend({}, vboxVMGroupActions['rename'], {separator:true}),

+    	vboxVMGroupActions['ungroup'],

     	$.extend({},vboxVMActions['start'],{'name':'start','separator' : true}),

-        $.extend({},vboxVMActions['pause'],{'name':'pause'}),

-        $.extend({},vboxVMActions['reset'],{'name':'reset'}),

-    	$.extend({},vboxVMActions['stop'],{'name':'stop','children':sChildren}),

-    	$.extend({},vboxVMActions['discard'],{'name':'discard','separator' : true}),

-    	$.extend({},vboxVMActions['refresh'],{'name':'refresh'}),

-    	$.extend({}, vboxVMGroupActions['sort'], {name:'sort',separator:true})

+        vboxVMActions['pause'],

+        vboxVMActions['reset'],

+    	$.extend({},vboxVMActions['stop'],{'children':sChildren}),

+    	$.extend({},vboxVMActions['discard'],{'separator' : true}),

+    	vboxVMActions['refresh'],

+    	$.extend({}, vboxVMGroupActions['sort'], {separator:true})

 	]

 });

 

 vboxTopMenuBar.addMenu({

 	'name':'vboxTopHelp',

-	'label':trans('Help','UIHelpButton'),

+	'label': 'Help',

+	'language_context': 'UIHelpButton',

 	'menu':[

         {

 			'name':'helpvbox',

-			'label':trans('VirtualBox User Manual','UIActionPool'),

+			'label':'VirtualBox User Manual',

 			'icon':'site',

 			'click':function(){

 				window.open('http://www.virtualbox.org/manual/','manual');        	

@@ -234,7 +236,7 @@ vboxTopMenuBar.addMenu({
         

         {

 			'name':'helpAbout',

-			'label':trans('About','UIActionPool'),

+			'label':'About',

 			'icon':'help',

 			'click':function(){

         	

diff --git a/panes/vmm.html b/panes/vmm.html
index 33188d4..f3c2043 100644
--- a/panes/vmm.html
+++ b/panes/vmm.html
@@ -24,7 +24,7 @@
 	<div id='vboxVMMTabs'>

 

 		<ul id='vboxVMMTabList'>

-			<li><a href="#vmmDisks"><span><img id='vmmDisksIcon' style="height:16px;width:16px;vertical-align: middle" src="images/vbox/hd_16px.png" border="0" /> <span class='translate'>Hard drives</span></span></a></li>

+			<li><a href="#vmmDisks"><span><img id='vmmDisksIcon' style="height:16px;width:16px;vertical-align: middle" src="images/vbox/hd_16px.png" border="0" /> <span class='translate'>Hard disks</span></span></a></li>

 			<li><a href="#vmmCDs"><span><img id='vmmCDsIcon' style="height:16px;width:16px;vertical-align: middle" src="images/vbox/cd_16px.png" border="0" /> <span class='translate'>Optical disks</span></span></a></li>

 			<li><a href="#vmmFloppys"><span><img id='vmmFloppysIcon' style="height:16px;width:16px;vertical-align: middle" src="images/vbox/fd_16px.png" border="0" /> <span class='translate'>Floppy disks</span></span></a></li>		

 		</ul>

@@ -284,7 +284,7 @@ var vmmButtons = new Array(
 		 *	Create new HardDisk

 		 */

 		'name' : 'vmmnew',

-		'label' : trans('New','VBoxMediaManagerDlg'),

+		'label' : 'New',

 		'icon' : 'hd_new',

 		'enabled' : function (item) { return(!$("#vboxVMMTabs").tabs('option','active')); },

 		'click' : function () {

@@ -299,7 +299,7 @@ var vmmButtons = new Array(
 		 * Add existing medium to virtualbox

 		 */

 		'name' : 'vmmadd',

-		'label' : trans('Add','VBoxMediaManagerDlg'),

+		'label' : 'Add',

 		'icon' : 'hd_add',

 		'click' : function () {

 			var type = '';

@@ -377,7 +377,7 @@ var vmmButtons = new Array(
 		 *	Copy Medium

 		 */

 		'name' : 'vmmcopy',

-		'label' : trans('Copy...','VBoxMediaManagerDlg'),

+		'label' : 'Copy...',

 		'icon' : 'vdm_add',

 		'separator' : $('#vboxPane').data('vboxConfig').enableAdvancedConfig,

 		'enabled' : function (item) {

@@ -411,7 +411,7 @@ var vmmButtons = new Array(
 		 *	Modify Medium

 		 */

 		'name' : 'vmmmodify',

-		'label' : trans('Modify...','VBoxMediaManagerDlg'),

+		'label' : 'Modify...',

 		'icon' : 'vdm_new',

 		'enabled' : function (item) { 

 			if(!item) return false;

@@ -463,7 +463,7 @@ var vmmButtons = new Array(
 			l.addFileToDOM("panes/vmmModify.html",$(d));

 			l.onLoad = function() {

 				

-				var msg = trans('<p>You are about to change the attributes of the virtual disk located in <b>%1</b>.</p><p>Please choose one of the following medium types and press <b>%2</b> to proceed or <b>%3</b> otherwise.</p>','UIMediumTypeChangeDialog');

+				var msg = trans('<p>You are about to change the settings of the disk image file <b>%1</b>.</p><p>Please choose one of the following modes and press <b>%2</b> to proceed or <b>%3</b> otherwise.</p>','UIMediumTypeChangeDialog');

 				var title = trans('Modify medium attributes','UIMediumTypeChangeDialog');

 				

 				msg = msg.replace('%1',med.location).replace('%2',trans('OK','QIMessageBox')).replace('%3',trans('Cancel','QIMessageBox'));

@@ -475,7 +475,7 @@ var vmmButtons = new Array(
 				

 				$('#vboxVMMModify').find(".translate").html(function(i,h){return trans(h,'UIMediumTypeChangeDialog');}).removeClass('translate');

 

-				$('#vboxVMMModify').find('table.vboxOptions').find('span').html(function(i,h){return trans(h,'VBoxGlobal');});

+				$('#vboxVMMModify').find('table.vboxOptions').find('span').html(function(i,h){return trans(h,'VBoxGlobal', 'MediumType');});

 				

 				// Set correct option

 				$('#vboxVMMModify').find('input').prop('checked',false);

@@ -493,7 +493,7 @@ var vmmButtons = new Array(
 		 *	Remove a medium

 		 */

 		'name' : 'vmmremove',

-		'label' : trans('Remove','VBoxMediaManagerDlg'),

+		'label' : 'Remove',

 		'icon' : 'hd_remove',

 		'enabled' : function (item) {

 			if(!item || item.target) return false;

@@ -526,10 +526,11 @@ var vmmButtons = new Array(
 			if(m.deviceType == 'HardDisk' && $('#vboxPane').data('vboxConfig').deleteOnRemove && m.format != 'iSCSI') {

 

 				

-				q = trans('<p>Do you want to delete the storage unit of the hard disk <nobr><b>%1</b></nobr>?</p><p>If you select <b>Delete</b> ' +

-						'then the specified storage unit will be permanently deleted. This operation <b>cannot be undone</b>.</p><p>If you select '+

-						'<b>Keep</b> then the hard disk will be only removed from the list of known hard disks, but the storage unit will be left '+

-						'untouched which makes it possible to add this hard disk to the list later again.</p>','UIMessageCenter').replace('%1',m.location);

+				q = trans('<p>Do you want to delete the storage unit of the virtual hard disk <nobr><b>%1</b></nobr>?'+

+				        '</p><p>If you select <b>Delete</b> then the specified storage unit will be permanently deleted. '+

+				        'This operation <b>cannot be undone</b>.</p><p>If you select <b>Keep</b> then the hard disk will '+

+				        'be only removed from the list of known hard disks, but the storage unit will be left untouched '+

+				        'which makes it possible to add this hard disk to the list later again.</p>','UIMessageCenter').replace('%1',m.location);

 				

 				buttons[trans('Delete','UIMessageCenter')] = function(){

 					$.when(vboxAjaxRequest('mediumRemove',{'medium':m.location,'type':m.deviceType,'delete':1})).done(function(ret){

@@ -582,7 +583,7 @@ var vmmButtons = new Array(
 		 *	Release a medium from all attachments

 		 */

 		'name' : 'vmmrelease',

-		'label' : trans('Release','VBoxMediaManagerDlg'),

+		'label' : 'Release',

 		'icon' : 'hd_release',

 		'enabled' : function (item) {

 			if(!item || item.target) return false;

@@ -609,7 +610,8 @@ var vmmButtons = new Array(
 			

 			

 			var m = vboxMedia.getMediumById($(elm).find('tr.vboxListItemSelected').first().data('medium'));

-			var q = trans('<p>Are you sure you want to release the %1 <nobr><b>%2</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%3</b>.</p>','UIMessageCenter').replace('%1',trans(mtype,'UIMessageCenter')).replace('%2',m.location);

+			var q = trans('<p>Are you sure you want to release the disk image file <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p>','UIMessageCenter');

+			q = q.replace('%1',m.location);

 			

 			var buttons = {};

 			buttons[trans('Release','UIMessageCenter')] = function(){

@@ -631,7 +633,7 @@ var vmmButtons = new Array(
 				for(var i = 0; i < m.attachedTo.length; i++) {

 					machines[machines.length] = m.attachedTo[i].machine;

 				}

-				q = q.replace('%3','<b>'+machines.join('</b>, <b>') + '</b>');

+				q = q.replace('%2','<b>'+machines.join('</b>, <b>') + '</b>');

 			};

 			

 			

@@ -641,7 +643,7 @@ var vmmButtons = new Array(
 	

 	{

 		'name' : 'vmmrefresh',

-		'label' : trans('Refresh','VBoxMediaManagerDlg'),

+		'label' : 'Refresh',

 		'icon' : 'refresh',

 		'click' : function () {

 

@@ -665,15 +667,15 @@ if(!$('#vboxPane').data('vboxConfig').enableAdvancedConfig) {
 }

 

 /* Toolbar */

-var vmmToolbar = new vboxToolbar(vmmButtons);

-vmmToolbar.renderTo('vboxMMToolbar');

+var vmmToolbar = new vboxToolbar({buttons: vmmButtons,

+    language_context: 'VBoxMediaManagerDlg',

+    renderTo: 'vboxMMToolbar'});

 

 /* Actions Menu */

-var vmmMenu = new vboxMenuBar('vboxMMMenu');

-vmmMenu.iconStringDisabled = '_disabled';

+var vmmMenu = new vboxMenuBar({name: 'vboxMMMenu', language_context: 'VBoxMediaManagerDlg'});

 vmmMenu.addMenu({

 	'name':'vboxMMactions',

-	'label':trans('Actions','VBoxMediaManagerDlg'),

+	'label':'Actions',

 	'menu': vmmButtons

 });

 vmmMenu.renderTo('vboxMMMenu');

@@ -687,9 +689,8 @@ if($('#vboxPane').data('vboxConfig').enableAdvancedConfig) {
 } else {

 	vmmCMButtons = vmmButtons.slice(0,-1);

 }

-var vmmCMenu = new vboxMenu('vboxVMMMediaContextMenu');

-vmmCMenu.iconStringDisabled = '_disabled';

-vmmCMenu.addMenu(vmmCMButtons);

+var vmmCMenu = new vboxMenu({name: 'vboxVMMMediaContextMenu', menuItems: vmmCMButtons,

+    language_context: 'VBoxMediaManagerDlg'});

 

 

 /**

@@ -716,7 +717,7 @@ function vboxVMMMediaInfo(med) {
 	if(m) {

 		attch = vboxMedia.attachedTo(m,true);

 		if(!attch) {

-			attch = trans('Not Attached','UIDetailsPagePrivate');

+			attch = trans('Not Attached','UIGDetails','details (storage)');

 			attchElm.css({'font-style':'italic'});

 		}

 		attchElm.val(attch);

diff --git a/panes/wizardCloneVM.html b/panes/wizardCloneVM.html
index fbf1a5c..a7e67f1 100644
--- a/panes/wizardCloneVM.html
+++ b/panes/wizardCloneVM.html
@@ -25,7 +25,7 @@
 <!-- Step 2 -->

 <div id='wizardCloneVMStep2' title='Clone type' style='display: none'>

 

-	<span class='translate'>&lt;p&gt;Please choose the type of clone you wish to create.&lt;/p&gt;&lt;p&gt;If you choose &lt;b&gt;Full clone&lt;/b&gt;, an exact copy (including all virtual hard drive files) of the original virtual machine will be created.&lt;/p&gt;&lt;p&gt;If you choose &lt;b&gt;Linked clone&lt;/b&gt;, a new machine will be created, but the virtual hard drive files will be tied to the virtual hard drive files of original machine and you will not be able to move the new virtual machine to a different computer without moving the original as well.&lt;/p&gt;</span>

+	<span class='translate'>&lt;p&gt;Please choose the type of clone you wish to create.&lt;/p&gt;&lt;p&gt;If you choose &lt;b&gt;Full clone&lt;/b&gt;, an exact copy (including all virtual hard disk files) of the original virtual machine will be created.&lt;/p&gt;&lt;p&gt;If you choose &lt;b&gt;Linked clone&lt;/b&gt;, a new machine will be created, but the virtual hard disk files will be tied to the virtual hard disk files of original machine and you will not be able to move the new virtual machine to a different computer without moving the original as well.&lt;/p&gt;</span>

 	

 	<span class='translate' id='vboxCloneVMNewSnap'>&lt;p&gt;If you create a &lt;b&gt;Linked clone&lt;/b&gt; then a new snapshot will be created in the original virtual machine as part of the cloning process.&lt;/p&gt;</span>

 	

diff --git a/panes/wizardCopyHD.html b/panes/wizardCopyHD.html
index 53a7ccd..657a2d3 100644
--- a/panes/wizardCopyHD.html
+++ b/panes/wizardCopyHD.html
@@ -7,9 +7,9 @@
 

  -->

 <!-- Step 1 -->

-<div id='wizardCopyHDStep1' title='Hard drive to copy' style='display: none'>

+<div id='wizardCopyHDStep1' title='Hard disk to copy' style='display: none'>

 	

-	<span class='translate'>&lt;p&gt;Please select the virtual hard drive file that you would like to copy if it is not already selected. You can either choose one from the list or use the folder icon beside the list to select one.&lt;/p&gt;</span>

+	<span class='translate'>&lt;p&gt;Please select the virtual hard disk file that you would like to copy if it is not already selected. You can either choose one from the list or use the folder icon beside the list to select one.&lt;/p&gt;</span>

 

 	<div class='vboxOptions'>

 		<table class='vboxOptions'>

@@ -23,9 +23,9 @@
 

 

 <!-- Step 2 -->

-<div id='wizardCopyHDStep2' title='Hard drive file type' style='display: none'>

+<div id='wizardCopyHDStep2' title='Hard disk file type' style='display: none'>

 

-	<p class='translate'>Please choose the type of file that you would like to use for the new virtual hard drive. If you do not need to use it with other virtualization software you can leave this setting unchanged.</p>

+	<p class='translate'>Please choose the type of file that you would like to use for the new virtual hard disk. If you do not need to use it with other virtualization software you can leave this setting unchanged.</p>

 

 	<div class='vboxOptions'>

 		<table class='vboxOptions'>

@@ -46,15 +46,15 @@
 

 

 <!-- Step 3 -->

-<div id='wizardCopyHDStep3' title='Storage on physical hard drive' style='display: none'>

+<div id='wizardCopyHDStep3' title='Storage on physical hard disk' style='display: none'>

 

-	<p class='translate'>Please choose whether the new virtual hard drive file should grow as it is used (dynamically allocated) or if it should be created at its maximum size (fixed size).</p>

+	<p class='translate'>Please choose whether the new virtual hard disk file should grow as it is used (dynamically allocated) or if it should be created at its maximum size (fixed size).</p>

 	

-	<span class='translate vboxCreateDynamic'>&lt;p&gt;A &lt;b&gt;dynamically allocated&lt;/b&gt; hard drive file will only use space on your physical hard drive as it fills up (up to a maximum &lt;b&gt;fixed size&lt;/b&gt;), although it will not shrink again automatically when space on it is freed.&lt;/p&gt;</span>

+	<span class='translate vboxCreateDynamic'>&lt;p&gt;A &lt;b&gt;dynamically allocated&lt;/b&gt; hard disk file will only use space on your physical hard disk as it fills up (up to a maximum &lt;b&gt;fixed size&lt;/b&gt;), although it will not shrink again automatically when space on it is freed.&lt;/p&gt;</span>

 	

-	<span class='translate vboxCreateFixed'>&lt;p&gt;A &lt;b&gt;fixed size&lt;/b&gt; hard drive file may take longer to create on some systems but is often faster to use.&lt;/p&gt;</span>

+	<span class='translate vboxCreateFixed'>&lt;p&gt;A &lt;b&gt;fixed size&lt;/b&gt; hard disk file may take longer to create on some systems but is often faster to use.&lt;/p&gt;</span>

 	

-	<span class='translate vboxCreateSplit2G'>&lt;p&gt;You can also choose to &lt;b&gt;split&lt;/b&gt; the hard drive file into several files of up to two gigabytes each. This is mainly useful if you wish to store the virtual machine on removable USB devices or old systems, some of which cannot handle very large files.</span>

+	<span class='translate vboxCreateSplit2G'>&lt;p&gt;You can also choose to &lt;b&gt;split&lt;/b&gt; the hard disk file into several files of up to two gigabytes each. This is mainly useful if you wish to store the virtual machine on removable USB devices or old systems, some of which cannot handle very large files.</span>

 	

 	<div class='vboxOptions'>

 		<table class='vboxOptions'>

@@ -72,9 +72,9 @@
 </div>

 

 <!-- Step 4 -->

-<div id='wizardCopyHDStep4' title='New hard drive to create' style='display: none'>

+<div id='wizardCopyHDStep4' title='New hard disk to create' style='display: none'>

 

-	<p class='translate'>Please type the name of the new virtual hard drive file into the box below or click on the folder icon to select a different folder to create the file in.</p>

+	<p class='translate'>Please type the name of the new virtual hard disk file into the box below or click on the folder icon to select a different folder to create the file in.</p>

 	

 	<div class='vboxOptions'>

 		<table class='vboxOptions'>

@@ -107,27 +107,29 @@ for(var i = 0; i < vboxHDTypes.length; i++) {
 vboxHDTypesTbl.find('input[value='+$('#vboxPane').data('vboxSystemProperties').defaultHardDiskFormat+']').prop('checked',true).closest('tr').detach().prependTo(vboxHDTypesTbl);

 

 

-/* Choose virtual hard drive button */

-new vboxToolbarSingle({

+/* Choose virtual hard disk button */

+new vboxToolbarSingle({button: {

 	'name' : 'mselecthdbtn',

-	'label' : trans('Choose a virtual hard drive file to copy...','UIWizardCloneVD'),

+	'label' : 'Choose a virtual hard disk file to copy...',

+	'language_context': 'UIWizardCloneVD',

 	'icon' : 'select_file',

 	'click' : function () {

 		vboxMedia.actions.choose(null,'HardDisk',function(med){

 			if(med) copyHDFillDisks(med.base);

 		});

 	}

-}).renderTo('newVMDiskVMM');		

+}}).renderTo('newVMDiskVMM');		

 

 /* Choose location of new file button */

-new vboxToolbarSingle({

+new vboxToolbarSingle({button: {

 	'name' : 'mselecthdbtn',

-	'label' : trans('Choose a location for new virtual hard drive file...','UIWizardNewVD'),

+	'label' : 'Choose a location for new virtual hard disk file...',

+	'language_context': 'UIWizardNewVD',

 	'icon' : 'select_file',

 	'click' : function () {

 		wizardCopyHDBrowseLocation();

 	}

-}).renderTo('newVMDiskVMMDest');		

+}}).renderTo('newVMDiskVMMDest');		

 

 	

 /* Set up disk selection box */

diff --git a/panes/wizardCopyHDAdvanced.html b/panes/wizardCopyHDAdvanced.html
index 37c7943..d2b2b7d 100644
--- a/panes/wizardCopyHDAdvanced.html
+++ b/panes/wizardCopyHDAdvanced.html
@@ -9,7 +9,7 @@
 <!-- Step 1 -->

 <div id='wizardCopyHDStep1' style='display: none'>

 

-	<span class='vboxTableLabel translate'>Hard drive to copy</span>	

+	<span class='vboxTableLabel translate'>Hard disk to copy</span>	

 	<div class='vboxOptions'>

 		<table class='vboxOptions'>

 			<tr style='vertical-align: top;'>

@@ -19,7 +19,7 @@
 		</table>

 	</div>

 

-	<span class='vboxTableLabel translate'>New hard drive to create</span>

+	<span class='vboxTableLabel translate'>New hard disk to create</span>

 	<div class='vboxOptions'>

 		<table class='vboxOptions'>

 			<tr>

@@ -34,7 +34,7 @@
 	<table class='vboxInvisible' style='border: 0px solid transparent; border-spacing: 4px;'>

 		<tr style='vertical-align: top'>

 			<td>

-				<span class='vboxTableLabel translate'>Hard drive file type</span>

+				<span class='vboxTableLabel translate'>Hard disk file type</span>

 				<div class='vboxOptions'>

 					<table class='vboxOptions vboxNewHDWizardFileTypes'>

 						<tr style='vertical-align: top;'>

@@ -50,7 +50,7 @@
 				</div>

 			</td>

 			<td>

-				<span class='vboxTableLabel translate'>Storage on physical hard drive</span>

+				<span class='vboxTableLabel translate'>Storage on physical hard disk</span>

 				<div class='vboxOptions'>

 					<table class='vboxOptions vboxCopyHDWizHDOpts'>

 						<tr style='vertical-align: top;' class='vboxCreateDynamic'>

@@ -88,26 +88,28 @@ for(var i = 0; i < vboxHDTypes.length; i++) {
 vboxHDTypesTbl.find('input[value='+$('#vboxPane').data('vboxSystemProperties').defaultHardDiskFormat+']').prop('checked',true).closest('tr').detach().prependTo(vboxHDTypesTbl);

 

 /* Choose virtual hard drive button */

-new vboxToolbarSingle({

+new vboxToolbarSingle({button: {

 	'name' : 'mselecthdbtn',

-	'label' : trans('Choose a virtual hard drive file to copy...','UIWizardCloneVD'),

+	'label' : 'Choose a virtual hard drive file to copy...',

+	'language_context': 'UIWizardCloneVD',

 	'icon' : 'select_file',

 	'click' : function () {

 		vboxMedia.actions.choose(null,'HardDisk',function(med){

 			if(med) copyHDFillDisks(med.base);

 		});

 	}

-}).renderTo('newVMDiskVMM');		

+}}).renderTo('newVMDiskVMM');		

 

 /* Choose location of new file button */

-new vboxToolbarSingle({

+new vboxToolbarSingle({button: {

 	'name' : 'mselecthdbtn',

-	'label' : trans('Choose a location for new virtual hard drive file...','UIWizardNewVD'),

+	'label' : 'Choose a location for new virtual hard drive file...',

+	'language_context': 'UIWizardNewVD',

 	'icon' : 'select_file',

 	'click' : function () {

 		wizardCopyHDBrowseLocation();

 	}

-}).renderTo('newVMDiskVMMDest');		

+}}).renderTo('newVMDiskVMMDest');		

 

 

 /* Set up disk selection box */

diff --git a/panes/wizardFirstRun.html b/panes/wizardFirstRun.html
index c4863fb..b2c6bac 100644
--- a/panes/wizardFirstRun.html
+++ b/panes/wizardFirstRun.html
@@ -53,10 +53,11 @@ $('#wizardFirstRunStep1').on('show',function(e,wiz){
 	

 	wizardFirstRunFillMedia();

 	

-	var wizardFirstRunBar = new vboxToolbarSingle({

+	var wizardFirstRunBar = new vboxToolbarSingle({button: {

 		/* Add Attachment Button */

 		'name' : 'mselecthdbtnd',

-		'label' : trans('Choose a virtual optical disk file...','UIWizardFirstRun'),

+		'label' : 'Choose a virtual optical disk file...',

+		'language_context': 'UIWizardFirstRun',

 		'icon' : 'select_file',

 		'click' : function () {

 			vboxMedia.actions.choose(null,'DVD',function(med){

@@ -64,7 +65,7 @@ $('#wizardFirstRunStep1').on('show',function(e,wiz){
 				wizardFirstRunFillMedia(med.id);

 			});

 		}

-	});

+	}});

 	wizardFirstRunBar.renderTo('wizardFirstRunChoose');		

 

 	$('#wizardFirstRunMedia').hide();

diff --git a/panes/wizardImportAppliance.html b/panes/wizardImportAppliance.html
index cc25f64..9112a8c 100644
--- a/panes/wizardImportAppliance.html
+++ b/panes/wizardImportAppliance.html
@@ -52,14 +52,15 @@
 <script type='text/javascript'>

 

 /* Draw button */

-new vboxToolbarSingle({

+new vboxToolbarSingle({button: {

 	'name' : 'mselecthdbtn',

-	'label' : trans('Open appliance...','UIWizardImportApp'),

+	'label' : 'Choose a virtual appliance file to import...',

+	'language_context': 'UIWizardImportApp',

 	'icon' : 'select_file',

 	'click' : function () {

 		wizardImportApplianceBrowseLocation()

 	}

-}).renderTo('wizardImportApplianceLocationButton');

+}}).renderTo('wizardImportApplianceLocationButton');

 

 $('#wizardImportApplianceStep2').find('span.translateglob').html(function(i,h){

 	return trans(h,'UIApplianceEditorWidget');

@@ -119,10 +120,10 @@ var vboxApplianceImportProps = {
 			return trans(vboxNetworkAdapterType($('#vboxPane').data('vboxNetworkAdapterTypes')[val]),'VBoxGlobal');

 		}},

 		'Floppy' : {'label':'Floppy','icon':'floppy','checkbox':true},

-		'HardDiskControllerIDE' : {'label':'Hard Disk Controller (IDE)','icon':'ide','edit':''},

-		'HardDiskControllerSATA' : {'label':'Hard Disk Controller (SATA)','icon':'sata','edit':null},

-		'HardDiskControllerSAS' : {'label':'Hard Disk Controller (SAS)','icon':'scsi','edit':null},

-		'HardDiskControllerSCSI' : {'label':'Hard Disk Controller (SCSI)','icon':'scsi','edit':null},

+		'HardDiskControllerIDE' : {'label':'Storage Controller (IDE)','icon':'ide','edit':''},

+		'HardDiskControllerSATA' : {'label':'Storage Controller (SATA)','icon':'sata','edit':null},

+		'HardDiskControllerSAS' : {'label':'Storage Controller (SAS)','icon':'scsi','edit':null},

+		'HardDiskControllerSCSI' : {'label':'Storage Controller (SCSI)','icon':'scsi','edit':null},

 		'HardDiskImage' : {'label':'Virtual Disk Image','icon':'hd','edit':'text'}

 };

 

diff --git a/panes/wizardImportApplianceAdvanced.html b/panes/wizardImportApplianceAdvanced.html
index ee41a72..8ff832f 100644
--- a/panes/wizardImportApplianceAdvanced.html
+++ b/panes/wizardImportApplianceAdvanced.html
@@ -57,7 +57,7 @@ $('#wizardImportApplianceStep1').find('span.translateglob').html(function(i,h){
 	return trans(h,'UIApplianceEditorWidget');

 });

 

-$('#vboxWizardImportApplianceButton').val(trans('Open appliance...','UIWizardImportApp'));

+$('#vboxWizardImportApplianceButton').val(trans('Choose a virtual appliance file to import...','UIWizardImportApp'));

 

 /*

  * 

@@ -113,10 +113,10 @@ var vboxApplianceImportProps = {
 			return trans(vboxNetworkAdapterType($('#vboxPane').data('vboxNetworkAdapterTypes')[val]),'VBoxGlobal');

 		}},

 		'Floppy' : {'label':'Floppy','icon':'floppy','checkbox':true},

-		'HardDiskControllerIDE' : {'label':'Hard Disk Controller (IDE)','icon':'ide','edit':''},

-		'HardDiskControllerSATA' : {'label':'Hard Disk Controller (SATA)','icon':'sata','edit':null},

-		'HardDiskControllerSAS' : {'label':'Hard Disk Controller (SAS)','icon':'scsi','edit':null},

-		'HardDiskControllerSCSI' : {'label':'Hard Disk Controller (SCSI)','icon':'scsi','edit':null},

+		'HardDiskControllerIDE' : {'label':'Storage Controller (IDE)','icon':'ide','edit':''},

+		'HardDiskControllerSATA' : {'label':'Storage Controller (SATA)','icon':'sata','edit':null},

+		'HardDiskControllerSAS' : {'label':'Storage Controller (SAS)','icon':'scsi','edit':null},

+		'HardDiskControllerSCSI' : {'label':'Storage Controller (SCSI)','icon':'scsi','edit':null},

 		'HardDiskImage' : {'label':'Virtual Disk Image','icon':'hd','edit':'text'}

 };

 

diff --git a/panes/wizardNewHD.html b/panes/wizardNewHD.html
index 6b3dbf2..f79de40 100644
--- a/panes/wizardNewHD.html
+++ b/panes/wizardNewHD.html
@@ -7,9 +7,9 @@
 
  -->
 <!-- Step 1 -->
-<div id='wizardNewHDStep1' title='Hard drive file type' style='display: none'>
+<div id='wizardNewHDStep1' title='Hard disk file type' style='display: none'>
 
-	<p class='translate'>Please choose the type of file that you would like to use for the new virtual hard drive. If you do not need to use it with other virtualization software you can leave this setting unchanged.</p>
+	<p class='translate'>Please choose the type of file that you would like to use for the new virtual hard disk. If you do not need to use it with other virtualization software you can leave this setting unchanged.</p>
 
 	<div class='vboxOptions'>
 		<table class='vboxOptions'>
@@ -30,15 +30,15 @@
 
 
 <!-- Step 2 -->
-<div id='wizardNewHDStep2' title='Storage on physical hard drive' style='display: none'>
+<div id='wizardNewHDStep2' title='Storage on physical hard disk' style='display: none'>
 
-	<p class='translate'>Please choose whether the new virtual hard drive file should grow as it is used (dynamically allocated) or if it should be created at its maximum size (fixed size).</p>
+	<p class='translate'>Please choose whether the new virtual hard disk file should grow as it is used (dynamically allocated) or if it should be created at its maximum size (fixed size).</p>
 	
-	<span class='translate vboxCreateDynamic'>&lt;p&gt;A &lt;b&gt;dynamically allocated&lt;/b&gt; hard drive file will only use space on your physical hard drive as it fills up (up to a maximum &lt;b&gt;fixed size&lt;/b&gt;), although it will not shrink again automatically when space on it is freed.&lt;/p&gt;</span>
+	<span class='translate vboxCreateDynamic'>&lt;p&gt;A &lt;b&gt;dynamically allocated&lt;/b&gt; hard disk file will only use space on your physical hard disk as it fills up (up to a maximum &lt;b&gt;fixed size&lt;/b&gt;), although it will not shrink again automatically when space on it is freed.&lt;/p&gt;</span>
 	
-	<span class='translate vboxCreateFixed'>&lt;p&gt;A &lt;b&gt;fixed size&lt;/b&gt; hard drive file may take longer to create on some systems but is often faster to use.&lt;/p&gt;</span>
+	<span class='translate vboxCreateFixed'>&lt;p&gt;A &lt;b&gt;fixed size&lt;/b&gt; hard disk file may take longer to create on some systems but is often faster to use.&lt;/p&gt;</span>
 	
-	<span class='translate vboxCreateSplit2G'>&lt;p&gt;You can also choose to &lt;b&gt;split&lt;/b&gt; the hard drive file into several files of up to two gigabytes each. This is mainly useful if you wish to store the virtual machine on removable USB devices or old systems, some of which cannot handle very large files.</span>
+	<span class='translate vboxCreateSplit2G'>&lt;p&gt;You can also choose to &lt;b&gt;split&lt;/b&gt; the hard disk file into several files of up to two gigabytes each. This is mainly useful if you wish to store the virtual machine on removable USB devices or old systems, some of which cannot handle very large files.</span>
 	
 	<div class='vboxOptions'>
 		<table class='vboxOptions'>
@@ -60,7 +60,7 @@
 <!-- Step 3 -->
 <div id='wizardNewHDStep3' title='File location and size' style='display: none'>
 
-	<p class='translate'>Please type the name of the new virtual hard drive file into the box below or click on the folder icon to select a different folder to create the file in.</p>
+	<p class='translate'>Please type the name of the new virtual hard disk file into the box below or click on the folder icon to select a different folder to create the file in.</p>
 	
 		<div class='vboxOptions'>
 			<table class='vboxOptions'>
@@ -72,7 +72,7 @@
 				</tr>
 			</table>
 		</div>	
-	<p class='translate'>Select the size of the virtual hard drive in megabytes. This size is the limit on the amount of file data that a virtual machine will be able to store on the hard drive.</p>
+	<p class='translate'>Select the size of the virtual hard disk in megabytes. This size is the limit on the amount of file data that a virtual machine will be able to store on the hard disk.</p>
 
 	<div class='vboxOptions'>
 		<table>
@@ -122,14 +122,15 @@ $('#wizardNewHDStep2').find('span.translatevar').html(function(i,h){return trans
  * Location button
  */
  /* Choose location of new file button */
- new vboxToolbarSingle({
+ new vboxToolbarSingle({button: {
  	'name' : 'mselecthdbtn',
- 	'label' : trans('Choose a location for new virtual hard drive file...','UIWizardNewVD'),
+ 	'label' : 'Choose a location for new virtual hard disk file...',
+ 	'language_context': 'UIWizardNewVD',
  	'icon' : 'select_file',
  	'click' : function () {
  		wizardHDBrowseLocation();
  	}
- }).renderTo('wizardHDBrowseLocationButton');		
+ }}).renderTo('wizardHDBrowseLocationButton');		
 
  
 /* Browse for new VDI location */
diff --git a/panes/wizardNewHDAdvanced.html b/panes/wizardNewHDAdvanced.html
index 238e50a..0fbc46a 100644
--- a/panes/wizardNewHDAdvanced.html
+++ b/panes/wizardNewHDAdvanced.html
@@ -48,7 +48,7 @@
 	<table class='vboxInvisible' style='border: 0px solid transparent; border-spacing: 4px;'>
 		<tr style='vertical-align: top'>
 			<td>
-				<span class='vboxTableLabel translate'>Hard drive file type</span>
+				<span class='vboxTableLabel translate'>Hard disk file type</span>
 				<div class='vboxOptions'>
 					<table class='vboxOptions vboxNewHDWizardFileTypes'>
 						<tr style='vertical-align: top;'>
@@ -64,7 +64,7 @@
 				</div>
 			</td>
 			<td>
-				<span class='vboxTableLabel translate'>Storage on physical hard drive</span>
+				<span class='vboxTableLabel translate'>Storage on physical hard disk</span>
 				<div class='vboxOptions'>
 					<table class='vboxOptions'>
 						<tr style='vertical-align: top;' class='vboxCreateDynamic'>
@@ -105,14 +105,15 @@ wizardHDUpdateOptions();
  * Location button
  */
  /* Choose location of new file button */
- new vboxToolbarSingle({
+ new vboxToolbarSingle({button: {
  	'name' : 'mselecthdbtn',
- 	'label' : trans('Choose a location for new virtual hard drive file...','UIWizardNewVD'),
+ 	'label' : 'Choose a location for new virtual hard disk file...',
+ 	'language_context': 'UIWizardNewVD',
  	'icon' : 'select_file',
  	'click' : function () {
  		wizardHDBrowseLocation();
  	}
- }).renderTo('wizardHDBrowseLocationButton');		
+ }}).renderTo('wizardHDBrowseLocationButton');		
 
 
 /*
diff --git a/panes/wizardNewVM.html b/panes/wizardNewVM.html
index 6d79224..3fe1641 100644
--- a/panes/wizardNewVM.html
+++ b/panes/wizardNewVM.html
@@ -66,7 +66,7 @@
 </div>

 

 <!-- Step 3 -->

-<div id='wizardNewVMStep3' title='Hard drive' style='display: none'>

+<div id='wizardNewVMStep3' title='Hard disk' style='display: none'>

 

 	<span id='newVMHDSizeLabel'></span>

 

@@ -75,13 +75,13 @@
 	

 		<table class='vboxOptions' id='newVMBootDiskTable' style='width:100%;'>

 			<tr>

-				<td style='padding:2px; padding-left: 14px'><label><input type="radio" class="vboxRadio" name="newVMDisk" value="none" onClick="newVMToggleNewDisk(true)" /> <span class='translate vboxEnablerListen'>Do not add a virtual hard drive</span></label></td>

+				<td style='padding:2px; padding-left: 14px'><label><input type="radio" class="vboxRadio" name="newVMDisk" value="none" onClick="newVMToggleNewDisk(true)" /> <span class='translate vboxEnablerListen'>Do not add a virtual hard disk</span></label></td>

 			</tr>		

 			<tr id='newVMHDTriggerBind' class='vboxEnablerTrigger'>

-				<td style='padding:2px; padding-left: 14px'><label><input type="radio" class="vboxRadio" name="newVMDisk" value="create" onClick="newVMToggleNewDisk(true)" checked='checked' /> <span class='translate vboxEnablerListen'>Create a virtual hard drive now</span></label></td>

+				<td style='padding:2px; padding-left: 14px'><label><input type="radio" class="vboxRadio" name="newVMDisk" value="create" onClick="newVMToggleNewDisk(true)" checked='checked' /> <span class='translate vboxEnablerListen'>Create a virtual hard disk now</span></label></td>

 			</tr>

 			<tr>

-				<td style='padding:2px; padding-left: 14px'><label><input type="radio" class="vboxRadio" name="newVMDisk" value="existing" onClick="newVMToggleNewDisk(false)" /> <span class='translate vboxEnablerListen'>Use an existing virtual hard drive file</span></label></td>

+				<td style='padding:2px; padding-left: 14px'><label><input type="radio" class="vboxRadio" name="newVMDisk" value="existing" onClick="newVMToggleNewDisk(false)" /> <span class='translate vboxEnablerListen'>Use an existing virtual hard disk file</span></label></td>

 			</tr>		

 			<tr>

 				<td style='padding-left: 24px; white-space: nowrap'>

@@ -107,17 +107,18 @@ $('#wizardNewVMStep1').find('table.vboxOptions').find('span.translate').html(fun
 

 

 

-var wizardNewVMToolbar = new vboxToolbarSingle({

+var wizardNewVMToolbar = new vboxToolbarSingle({button: {

 	/* Add Attachment Button */

 	'name' : 'mselecthdbtn',

-	'label' : trans('Choose a virtual hard disk file...','UIMachineSettingsStorage'),

+	'label' : 'Choose a virtual hard disk file...',

+	'language_context': 'UIMachineSettingsStorage',

 	'icon' : 'select_file',

 	'click' : function () {

 		vboxMedia.actions.choose(null,'HardDisk',function(med){

 			if(med) vmNewFillExistingDisks(med.base);

 		});

 	}

-});

+}});

 wizardNewVMToolbar.renderTo('newVMDiskVMM');		

 

 /* Toggle new / existing */

@@ -205,12 +206,11 @@ function newVMUpdateOS(ostype) {
             "to be allocated to the virtual machine.</p>"+

             "<p>The recommended memory size is <b>%1</b> MB.</p>",'UIWizardNewVM').replace('%1',ostype.recommendedRAM));

 	

-	$('#newVMHDSizeLabel').html(trans("<p>If you wish you can add a virtual hard drive to the new machine. "+

-            "You can either create a new hard drive file or select one from the list "+

-            "or from another location using the folder icon.</p>"+

-            "<p>If you need a more complex storage set-up you can skip this step "+

-            "and make the changes to the machine settings once the machine is created.</p>"+

-            "<p>The recommended size of the hard drive is <b>%1</b>.</p>",'UIWizardNewVM').replace('%1',vboxMbytesConvert(ostype.recommendedHDD)));

+	$('#newVMHDSizeLabel').html(trans("<p>If you wish you can add a virtual hard disk to the new machine. "+

+	        "You can either create a new hard disk file or select one from the list or from another location "+

+	        "using the folder icon.</p><p>If you need a more complex storage set-up you can skip this step "+

+	        "and make the changes to the machine settings once the machine is created.</p><p>The recommended "+

+	        "size of the hard disk is <b>%1</b>.</p>",'UIWizardNewVM').replace('%1',vboxMbytesConvert(ostype.recommendedHDD)));

 	

 }

 

diff --git a/panes/wizardNewVMAdvanced.html b/panes/wizardNewVMAdvanced.html
index 5a6059d..5c7a3c1 100644
--- a/panes/wizardNewVMAdvanced.html
+++ b/panes/wizardNewVMAdvanced.html
@@ -57,18 +57,18 @@
 		</table>

 	</div>

 	

-	<span class='vboxTableLabel translate'>Hard drive</span>

+	<span class='vboxTableLabel translate'>Hard disk</span>

 	<div class='vboxOptions'>

 	

 		<table class='vboxOptions' id='newVMBootDiskTable' style='width:100%;'>

 			<tr>

-				<td style='padding:2px; padding-left: 14px'><label><input type="radio" class="vboxRadio" name="newVMDisk" value="none" onClick="newVMToggleNewDisk(true)" /> <span class='translate vboxEnablerListen'>Do not add a virtual hard drive</span></label></td>

+				<td style='padding:2px; padding-left: 14px'><label><input type="radio" class="vboxRadio" name="newVMDisk" value="none" onClick="newVMToggleNewDisk(true)" /> <span class='translate vboxEnablerListen'>Do not add a virtual hard disk</span></label></td>

 			</tr>		

 			<tr id='newVMHDTriggerBind' class='vboxEnablerTrigger'>

-				<td style='padding:2px; padding-left: 14px'><label><input type="radio" class="vboxRadio" name="newVMDisk" value="create" onClick="newVMToggleNewDisk(true)" checked='checked' /> <span class='translate vboxEnablerListen'>Create a virtual hard drive now</span></label></td>

+				<td style='padding:2px; padding-left: 14px'><label><input type="radio" class="vboxRadio" name="newVMDisk" value="create" onClick="newVMToggleNewDisk(true)" checked='checked' /> <span class='translate vboxEnablerListen'>Create a virtual hard disk now</span></label></td>

 			</tr>

 			<tr>

-				<td style='padding:2px; padding-left: 14px'><label><input type="radio" class="vboxRadio" name="newVMDisk" value="existing" onClick="newVMToggleNewDisk(false)" /> <span class='translate vboxEnablerListen'>Use an existing virtual hard drive file</span></label></td>

+				<td style='padding:2px; padding-left: 14px'><label><input type="radio" class="vboxRadio" name="newVMDisk" value="existing" onClick="newVMToggleNewDisk(false)" /> <span class='translate vboxEnablerListen'>Use an existing virtual hard disk file</span></label></td>

 			</tr>		

 			<tr>

 				<td style='padding-left: 24px; white-space: nowrap'>

@@ -93,17 +93,18 @@ $('#wizardNewVMStep1').find('table.vboxOSTypeOptions').find('span.translate').ht
 }).removeClass('translate');

 

 

-var wizardNewVMToolbar = new vboxToolbarSingle({

+var wizardNewVMToolbar = new vboxToolbarSingle({button: {

 	/* Add Attachment Button */

 	'name' : 'mselecthdbtn',

-	'label' : trans('Choose a virtual hard disk file...','UIMachineSettingsStorage'),

+	'label' : 'Choose a virtual hard disk file...',

+	'language_context': 'UIMachineSettingsStorage',

 	'icon' : 'select_file',

 	'click' : function () {

 		vboxMedia.actions.choose(null,'HardDisk',function(med){

 			if(med) vmNewFillExistingDisks(med.base);

 		});

 	}

-});

+}});

 wizardNewVMToolbar.renderTo('newVMDiskVMM');		

 

 /* Toggle new / existing */

@@ -192,7 +193,7 @@ function newVMUpdateOS(ostype) {
 

 	$('#wizardNewVMSize').slider('value',ostype.recommendedRAM);	

 	$('#newVMSizeLabel').html(trans('The recommended memory size is <b>%1</b> MB.','UIWizardNewVMPage3').replace('%1',ostype.recommendedRAM));

-	$('#newVMHDSizeLabel').html(trans('<p>If you wish you can add a virtual hard drive to the new machine. You can either create a new hard drive file or select one from the list or from another location using the folder icon.</p><p>If you need a more complex storage set-up you can skip this step and make the changes to the machine settings once the machine is created.</p><p>The recommended size of the hard drive is <b>%1</b>.</p>','UIWizardNewVMPage4').replace('%1',vboxMbytesConvert(ostype.recommendedHDD)));

+	$('#newVMHDSizeLabel').html(trans('<p>If you wish you can add a virtual hard disk to the new machine. You can either create a new hard disk file or select one from the list or from another location using the folder icon.</p><p>If you need a more complex storage set-up you can skip this step and make the changes to the machine settings once the machine is created.</p><p>The recommended size of the hard disk is <b>%1</b>.</p>','UIWizardNewVMPage4').replace('%1',vboxMbytesConvert(ostype.recommendedHDD)));

 	

 }