Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion js/chooser.js
Original file line number Diff line number Diff line change
Expand Up @@ -690,7 +690,7 @@ var vboxChooser = {


// Table gets tool tips
tip = trans(vboxChooser._vmToolTip, 'UIVMListView').replace('%1',('<b>'+$('<span />')
tip = trans(vboxChooser._vmToolTip, 'UIVirtualMachineItem').replace('%1',('<b>'+$('<span />')
.text(vmn.name).html()+'</b>'+(vmn.currentSnapshotName ? ' (' + $('<span />')
.text(vmn.currentSnapshotName).html() + ')' : '')))
.replace('%2',trans(vboxVMStates.convert(vmn.state),'VBoxGlobal'))
Expand Down
2 changes: 1 addition & 1 deletion js/dialogs.js
Original file line number Diff line number Diff line change
Expand Up @@ -740,7 +740,7 @@ function vboxVMMDialog(select,type,hideDiff,mPath) {
results.reject();
};

$("#vboxVMMDialog").dialog({'closeOnEscape':true,'width':800,'height':500,'buttons':buttons,'modal':true,'autoOpen':true,'classes':{'ui-dialog':'vboxDialogContent vboxVMMDialog'},'title':'<img src="images/vbox/diskimage_16px.png" class="vboxDialogTitleIcon" /> '+trans('Virtual Media Manager','VBoxMediaManagerDlg')}).on("dialogbeforeclose",function(){
$("#vboxVMMDialog").dialog({'closeOnEscape':true,'width':800,'height':500,'buttons':buttons,'modal':true,'autoOpen':true,'classes':{'ui-dialog':'vboxDialogContent vboxVMMDialog'},'title':'<img src="images/vbox/diskimage_16px.png" class="vboxDialogTitleIcon" /> '+trans('Virtual Media Manager','UIMediumManager')}).on("dialogbeforeclose",function(){
$(this).parent().find('span:contains("'+trans('Close','UIMessageCenter')+'")').trigger('click');
});

Expand Down
2 changes: 1 addition & 1 deletion js/jquery.projectPlugins.js
Original file line number Diff line number Diff line change
Expand Up @@ -482,7 +482,7 @@ if(jQuery) (function($){
if( o.expandEasing == undefined ) o.expandEasing = null;
if( o.collapseEasing == undefined ) o.collapseEasing = null;
if( o.multiFolder == undefined ) o.multiFolder = true;
if( o.loadMessage == undefined ) o.loadMessage = trans('Loading ...','UIVMDesktop');
if( o.loadMessage == undefined ) o.loadMessage = trans('Loading ...','phpVirtualBox');
if( o.scrollTo == undefined ) o.scrollTo = null;
if( o.dirsOnly == undefined) o.dirsOnly = false;

Expand Down
39 changes: 22 additions & 17 deletions js/phpvirtualbox.js
Original file line number Diff line number Diff line change
Expand Up @@ -278,10 +278,10 @@ var vboxVMDetailsSections = {
},{
title: 'OS Type', attrib: 'OSTypeDesc'
},{
title: 'Guest Additions Version', attrib: 'guestAdditionsVersion'
title: 'Guest Additions', attrib: 'guestAdditionsVersion', language_context: 'UIVMInformationDialog'
},{
title: 'Groups',
language_context: 'UIGDetails',
language_context: 'UICommon',
condition: function(d){
return (d.groups.length > 1 || (d.groups.length == 1 && d.groups[0] != '/'));
},
Expand Down Expand Up @@ -333,15 +333,20 @@ var vboxVMDetailsSections = {
}
},{
title: "Acceleration",
language_context: 'UIGDetails',
language_context: 'UIDetails',
callback: function(d) {
var acList = [];
if(d['HWVirtExProperties'].Enabled) acList[acList.length] = trans('VT-x/AMD-V');
if(d['HWVirtExProperties'].NestedPaging) acList[acList.length] = trans('Nested Paging');
if(d['CpuProperties']['PAE']) acList[acList.length] = trans('PAE/NX');
if(d['CpuProperties']['HWVirt']) acList[acList.length] = trans('Nested Virtualization');
if(d['EffectiveParavirtProvider'] != 'None')
acList[acList.length] = trans(d['EffectiveParavirtProvider'] + ' Paravirtualization');
if(d['EffectiveParavirtProvider'] != 'None') {
if(d['EffectiveParavirtProvider'] === 'HyperV') {
acList[acList.length] = trans('Hyper-V' + ' Paravirtualization', 'UIDetails');
} else {
acList[acList.length] = trans(d['EffectiveParavirtProvider'] + ' Paravirtualization', 'UIDetails');
}
}

if($('#vboxPane').data('vboxConfig').enableAdvancedConfig) {
if(d['HWVirtExProperties'].LargePages) acList[acList.length] = trans('Large Pages');
Expand Down Expand Up @@ -523,7 +528,7 @@ var vboxVMDetailsSections = {
window.open(vboxEndpointConfig.screen+'?vm='+$(this).data('vmid')+'&full=1','vboxSC','toolbar=1,menubar=0,location=0,directories=0,status=true,resize=true');
}).append(
$('<span />')
.html(trans('Open in new window','UIVMPreviewWindow'))
.html(trans('Open in new window','UIGMachinePreview'))
).appendTo(ul);

/* Hover */
Expand Down Expand Up @@ -1269,7 +1274,7 @@ var vboxVMDetailsSections = {
usb: {
icon: 'usb_16px.png',
title: 'USB',
language_context: 'UIGDetails',
language_context: 'UICommon',
settingsLink: 'USB',
rows: function(d) {

Expand Down Expand Up @@ -1357,7 +1362,7 @@ var vboxVMDetailsSections = {
description: {
icon: 'description_16px.png',
title: 'Description',
language_context: 'UIGDetails',
language_context: 'UICommon',
settingsLink: 'General:2',
rows: function(d) {
return [{
Expand Down Expand Up @@ -2668,15 +2673,15 @@ var vboxMedia = {
icon = null;
switch(type) {
case 'HardDisk':
title = trans('Choose a virtual hard disk file...','UIMachineSettingsStorage');
title = trans('Choose a virtual hard disk file...','UIWizardNewVM');
icon = 'images/vbox/hd_16px.png';
break;
case 'Floppy':
title = trans('Choose a virtual floppy disk file...','UIMachineSettingsStorage');
title = trans('Please choose a virtual floppy disk file','UICommon');
icon = 'images/vbox/fd_16px.png';
break;
case 'DVD':
title = trans('Choose a virtual optical disk file...','UIMachineSettingsStorage');
title = trans('Choose a virtual optical disk file...','UIWizardFirstRun');
icon = 'images/vbox/cd_16px.png';
break;
}
Expand Down Expand Up @@ -2754,10 +2759,10 @@ function vboxWizard() {
this.bg = null;

/* Text on Back button */
this.backText = trans('Back','QIArrowSplitter');
this.backText = trans('Back','QIArrowButtonPress');

/* Text on Next button */
this.nextText = trans('Next','QIArrowSplitter');
this.nextText = trans('Next','QIArrowButtonPress');

/* Text on cancel button */
this.cancelText = trans('Cancel','QIMessageBox');
Expand Down Expand Up @@ -3917,7 +3922,7 @@ function vboxMediaMenu(type,callback,mediumPath) {
menus[menus.length] = {'name':'createD','icon':'hd_new','label':trans('Create a new hard disk...','UIMachineSettingsStorage')};

// choose hard disk
menus[menus.length] = {'name':'chooseD','icon':'select_file','label':trans('Choose a virtual hard disk file...','UIMachineSettingsStorage')};
menus[menus.length] = {'name':'chooseD','icon':'select_file','label':trans('Choose a virtual hard disk file...','UIWizardNewVM')};

// Add VMM?
if($('#vboxPane').data('vboxConfig').enableAdvancedConfig) {
Expand All @@ -3933,7 +3938,7 @@ function vboxMediaMenu(type,callback,mediumPath) {
case 'DVD':

// Choose disk image
menus[menus.length] = {'name':'chooseD','icon':'select_file','label':trans('Choose a virtual optical disk file...','UIMachineSettingsStorage')};
menus[menus.length] = {'name':'chooseD','icon':'select_file','label':trans('Choose a virtual optical disk file...','UIWizardFirstRun')};

// Add VMM?
if($('#vboxPane').data('vboxConfig').enableAdvancedConfig) {
Expand All @@ -3954,7 +3959,7 @@ function vboxMediaMenu(type,callback,mediumPath) {
default:

// Choose disk image
menus[menus.length] = {'name':'chooseD','icon':'select_file','label':trans('Choose a virtual floppy disk file...','UIMachineSettingsStorage')};
menus[menus.length] = {'name':'chooseD','icon':'select_file','label':trans('Please choose a virtual floppy disk file','UICommon')};

// Add VMM?
if($('#vboxPane').data('vboxConfig').enableAdvancedConfig) {
Expand Down Expand Up @@ -4544,7 +4549,7 @@ function vboxLoader(name) {

$('<td />').attr('class', 'vboxLoaderSpinner').html('<img src="images/spinner.gif" width="36" height="39" />').appendTo(tr);

$('<td />').attr('class','vboxLoaderText').html(trans('Loading ...','UIVMDesktop')).appendTo(tr);
$('<td />').attr('class','vboxLoaderText').html(trans('Loading ...','phpVirtualBox')).appendTo(tr);

$(tbl).append(tr).appendTo(div);

Expand Down
8 changes: 4 additions & 4 deletions js/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@ function vboxFileBrowser(root,fn,foldersonly,title,icon,strictFiles) {

var d1 = $('<div />').attr({'id':'vboxBrowseFolder','class':'vboxDialogContent','style':'display:none'});

$('<div />').attr({'id':'vboxBrowseFolderList'}).fileTree({ 'root': (root ? root : '/'),'dirsOnly':foldersonly,'loadMessage':trans('Loading ...','UIVMDesktop'),'scrollTo':'#vboxBrowseFolder'},function(f){
$('<div />').attr({'id':'vboxBrowseFolderList'}).fileTree({ 'root': (root ? root : '/'),'dirsOnly':foldersonly,'loadMessage':trans('Loading ...','phpVirtualBox'),'scrollTo':'#vboxBrowseFolder'},function(f){
buttons[trans('OK','QIMessageBox')](f);
}).appendTo(d1);

Expand All @@ -412,7 +412,7 @@ function vboxBytesConvert(bytes) {
var unitCount;
for(unitCount=0; bytes >= 1024 && unitCount < ext.length; unitCount++) bytes = parseFloat(parseFloat(bytes)/1024);

return Math.round(parseFloat(bytes)*Math.pow(10,2))/Math.pow(10,2) + " " + trans(ext[unitCount], 'VBoxGlobal');
return Math.round(parseFloat(bytes)*Math.pow(10,2))/Math.pow(10,2) + " " + trans(ext[unitCount], 'UICommon');
}
/**
* Parse str param into megabytes
Expand All @@ -422,8 +422,8 @@ function vboxBytesConvert(bytes) {
function vboxConvertMbytes(str) {
str = str.replace(' ',' ');
str = str.split(' ',2);
if(!str[1]) str[1] = trans('MB','VBoxGlobal');
var ext = new Array(trans('B','VBoxGlobal'),trans('KB','VBoxGlobal'),trans('MB','VBoxGlobal'),trans('GB','VBoxGlobal'),trans('TB','VBoxGlobal'));
if(!str[1]) str[1] = trans('MB','UICommon');
var ext = new Array(trans('B','UICommon'),trans('KB','UICommon'),trans('MB','UICommon'),trans('GB','UICommon'),trans('TB','UICommon'));
var index = jQuery.inArray(str[1],ext);
if(index == -1) index = 2;
switch(index) {
Expand Down
35 changes: 16 additions & 19 deletions languages/cs.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,28 @@
<source>Server List</source>
<translation>Seznam serveru</translation>
</message>
<message>
<source>Automatically start the machine after restore</source>
<translation></translation>
</message>
<message>
<source>Loading ...</source>
<translation>Načítání ...</translation>
</message>
</context>
<context>
<name>UIVMDesktop</name>
<name>UIActionPool</name>
<message>
<source>Console</source>
<translation>Konzole</translation>
</message>
<message>
<source>Loading ...</source>
<translation>Načítání…</translation>
<source>About phpVirtualBox...</source>
<translation>O phpVirtualBox...</translation>
</message>
<message>
<source>Install Guest Additions...</source>
<translation></translation>
</message>
</context>
<context>
Expand All @@ -57,26 +69,11 @@
<source>Stop</source>
<translation>Zastavit</translation>
</message>
<message>
<source>VirtualBox User Manual</source>
<translation>Příručka k virtualizační platformě VirtualBox</translation>
</message>
<message>
<source>About</source>
<translation>O aplikaci</translation>
</message>
</context>
<context>
<name>UIActionsPool</name>
<message>
<source>Save State</source>
<translation>Uložit stav</translation>
</message>
<message>
<source>Power Off</source>
<translation>Vypnout</translation>
</message>
</context>
<context>
<!-- Console Tab -->
<name>VBoxConsoleWgt</name>
Expand Down Expand Up @@ -151,7 +148,7 @@
</message>
</context>
<context>
<name>UIVMPreviewWindow</name>
<name>UIGMachinePreview</name>
<message>
<source>Every %1 seconds</source>
<translation>Každých %1 sekund</translation>
Expand Down
35 changes: 16 additions & 19 deletions languages/da.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,28 @@
<source>Server List</source>
<translation>Serverliste</translation>
</message>
<message>
<source>Automatically start the machine after restore</source>
<translation></translation>
</message>
<message>
<source>Loading ...</source>
<translation>Indlæser ...</translation>
</message>
</context>
<context>
<name>UIVMDesktop</name>
<name>UIActionPool</name>
<message>
<source>Console</source>
<translation>Konsol</translation>
</message>
<message>
<source>Loading ...</source>
<translation>Indlæser ...</translation>
<source>About phpVirtualBox...</source>
<translation>Om phpVirtualBox...</translation>
</message>
<message>
<source>Install Guest Additions...</source>
<translation></translation>
</message>
</context>
<context>
Expand All @@ -57,26 +69,11 @@
<source>Stop</source>
<translation>Stop</translation>
</message>
<message>
<source>VirtualBox User Manual</source>
<translation>VirtualBox-brugermanual</translation>
</message>
<message>
<source>About</source>
<translation>Om</translation>
</message>
</context>
<context>
<name>UIActionsPool</name>
<message>
<source>Save State</source>
<translation>Gem tilstand</translation>
</message>
<message>
<source>Power Off</source>
<translation>Sluk</translation>
</message>
</context>
<context>
<!-- Console Tab -->
<name>VBoxConsoleWgt</name>
Expand Down Expand Up @@ -151,7 +148,7 @@
</message>
</context>
<context>
<name>UIVMPreviewWindow</name>
<name>UIGMachinePreview</name>
<message>
<source>Every %1 seconds</source>
<translation>Hvert %1. sekund</translation>
Expand Down
35 changes: 16 additions & 19 deletions languages/de.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,28 @@
<source>Server List</source>
<translation>Server-Liste</translation>
</message>
<message>
<source>Automatically start the machine after restore</source>
<translation></translation>
</message>
<message>
<source>Loading ...</source>
<translation>Lädt ...</translation>
</message>
</context>
<context>
<name>UIVMDesktop</name>
<name>UIActionPool</name>
<message>
<source>Console</source>
<translation>Konsole</translation>
</message>
<message>
<source>Loading ...</source>
<translation>Lädt ...</translation>
<source>About phpVirtualBox...</source>
<translation>Über phpVirtualBox...</translation>
</message>
<message>
<source>Install Guest Additions...</source>
<translation>Gasterweiterungen installieren...</translation>
</message>
</context>
<context>
Expand All @@ -57,26 +69,11 @@
<source>Stop</source>
<translation>Stoppen</translation>
</message>
<message>
<source>VirtualBox User Manual</source>
<translation>VirtualBox Benutzerhandbuch</translation>
</message>
<message>
<source>About</source>
<translation>Über</translation>
</message>
</context>
<context>
<name>UIActionsPool</name>
<message>
<source>Save State</source>
<translation>Zustand speichern</translation>
</message>
<message>
<source>Power Off</source>
<translation>Power Off</translation>
</message>
</context>
<context>
<!-- Console Tab -->
<name>VBoxConsoleWgt</name>
Expand Down Expand Up @@ -151,7 +148,7 @@
</message>
</context>
<context>
<name>UIVMPreviewWindow</name>
<name>UIGMachinePreview</name>
<message>
<source>Every %1 seconds</source>
<translation>alle %1 Sekunde(n)</translation>
Expand Down
Loading