From 4af2c66cad4bd59696f7b4425515b23b0f01f19c Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Thu, 29 Aug 2013 12:02:39 +0200 Subject: [PATCH] some more gettext cleanups, update po files Includes full german translation. --- www/manager/Utils.js | 2 +- www/manager/Workspace.js | 2 +- www/manager/dc/AuthView.js | 2 +- www/manager/node/StatusView.js | 2 +- www/manager/openvz/Summary.js | 2 +- www/manager/qemu/Clone.js | 6 +++--- www/manager/qemu/Config.js | 2 +- www/manager/qemu/NetworkEdit.js | 2 +- www/manager/qemu/OSTypeEdit.js | 2 +- www/manager/qemu/ProcessorEdit.js | 2 +- www/manager/qemu/Summary.js | 2 +- www/manager/window/Migrate.js | 2 +- www/manager/window/Restore.js | 5 +++-- 13 files changed, 17 insertions(+), 16 deletions(-) diff --git a/www/manager/Utils.js b/www/manager/Utils.js index 2fb5eda3..8165e7a6 100644 --- a/www/manager/Utils.js +++ b/www/manager/Utils.js @@ -469,7 +469,7 @@ Ext.define('PVE.Utils', { statics: { task_desc_table: { vncproxy: [ 'VM/CT', gettext('Console') ], - spiceproxy: [ 'VM/CT', gettext('Spice Console') ], + spiceproxy: [ 'VM/CT', gettext('Console') + ' (Spice)' ], vncshell: [ '', gettext('Shell') ], qmsnapshot: [ 'VM', gettext('Snapshot') ], qmrollback: [ 'VM', gettext('Rollback') ], diff --git a/www/manager/Workspace.js b/www/manager/Workspace.js index 1f2379ab..3a99c80a 100644 --- a/www/manager/Workspace.js +++ b/www/manager/Workspace.js @@ -160,7 +160,7 @@ Ext.define('PVE.ConsoleWorkspace', { content = { border: false, bodyPadding: 10, - html: gettext('Error: No such console type') + html: gettext('Error') + ': No such console type' }; } diff --git a/www/manager/dc/AuthView.js b/www/manager/dc/AuthView.js index 68564f7e..74aea825 100644 --- a/www/manager/dc/AuthView.js +++ b/www/manager/dc/AuthView.js @@ -82,7 +82,7 @@ Ext.define('PVE.dc.AuthView', { menu: new Ext.menu.Menu({ items: [ { - text: gettext('Active Directory server'), + text: gettext('Active Directory Server'), handler: function() { var win = Ext.create('PVE.dc.AuthEdit', { authType: 'ad' diff --git a/www/manager/node/StatusView.js b/www/manager/node/StatusView.js index e998e3f7..1af0afc4 100644 --- a/www/manager/node/StatusView.js +++ b/www/manager/node/StatusView.js @@ -48,7 +48,7 @@ Ext.define('PVE.node.StatusView', { memory: { header: gettext('RAM usage'), required: true, renderer: render_meminfo }, swap: { header: gettext('SWAP usage'), required: true, renderer: render_meminfo }, ksm: { header: gettext('KSM sharing'), required: true, renderer: render_ksm }, - rootfs: { header: gettext('HD space (root)'), required: true, renderer: render_meminfo }, + rootfs: { header: gettext('HD space') + ' (root)', required: true, renderer: render_meminfo }, pveversion: { header: gettext('PVE Manager version'), required: true }, kversion: { header: gettext('Kernel version'), required: true } }; diff --git a/www/manager/openvz/Summary.js b/www/manager/openvz/Summary.js index 19ebd344..8084bc6d 100644 --- a/www/manager/openvz/Summary.js +++ b/www/manager/openvz/Summary.js @@ -64,7 +64,7 @@ Ext.define('PVE.openvz.Summary', { }, { xtype: 'pveRRDView', - title: gettext('CPU usage %'), + title: gettext('CPU usage'), pveSelNode: me.pveSelNode, datasource: 'cpu', rrdurl: rrdurl diff --git a/www/manager/qemu/Clone.js b/www/manager/qemu/Clone.js index efd91cec..87b4a988 100644 --- a/www/manager/qemu/Clone.js +++ b/www/manager/qemu/Clone.js @@ -137,13 +137,13 @@ Ext.define('PVE.window.Clone', { col1.push(me.targetSel); - var modelist = [['copy', 'Full Clone']]; + var modelist = [['copy', gettext('Full Clone')]]; if (me.isTemplate) { - modelist.push(['clone', 'Linked Clone']); + modelist.push(['clone', gettext('Linked Clone')]); } me.kv1 = Ext.create('PVE.form.KVComboBox', { - fieldLabel: gettext('Clone Mode'), + fieldLabel: gettext('Mode'), name: 'clonemode', allowBlank: false, value: me.isTemplate ? 'clone' : 'copy', diff --git a/www/manager/qemu/Config.js b/www/manager/qemu/Config.js index e340609e..530d3305 100644 --- a/www/manager/qemu/Config.js +++ b/www/manager/qemu/Config.js @@ -119,7 +119,7 @@ Ext.define('PVE.qemu.Config', { }); var spiceBtn = Ext.create('Ext.Button', { - text: gettext('Spice'), + text: 'SPICE', disabled: !caps.vms['VM.Console'], handler: function() { Ext.core.DomHelper.append(document.body, { diff --git a/www/manager/qemu/NetworkEdit.js b/www/manager/qemu/NetworkEdit.js index df1edf23..ca5d59cc 100644 --- a/www/manager/qemu/NetworkEdit.js +++ b/www/manager/qemu/NetworkEdit.js @@ -137,7 +137,7 @@ Ext.define('PVE.qemu.NetworkInputPanel', { { xtype: 'numberfield', name: 'rate', - fieldLabel: gettext('Rate limit (MB/s)'), + fieldLabel: gettext('Rate limit') + ' (MB/s)', minValue: 0, maxValue: 10*1024, value: '', diff --git a/www/manager/qemu/OSTypeEdit.js b/www/manager/qemu/OSTypeEdit.js index 4150d6fa..e6eb0db6 100644 --- a/www/manager/qemu/OSTypeEdit.js +++ b/www/manager/qemu/OSTypeEdit.js @@ -41,7 +41,7 @@ Ext.define('PVE.qemu.OSTypeInputPanel', { me.column2 = [ { xtype: 'component', - html: 'Linux/' + gettext('Other'), + html: 'Linux/' + gettext('Other OS types'), cls:'x-form-check-group-label' }, { diff --git a/www/manager/qemu/ProcessorEdit.js b/www/manager/qemu/ProcessorEdit.js index 3bb8f07d..4a887c0d 100644 --- a/www/manager/qemu/ProcessorEdit.js +++ b/www/manager/qemu/ProcessorEdit.js @@ -46,7 +46,7 @@ Ext.define('PVE.qemu.ProcessorInputPanel', { xtype: 'CPUModelSelector', name: 'cpu', value: '', - fieldLabel: gettext('CPU type') + fieldLabel: gettext('Type') }, { xtype: 'displayfield', diff --git a/www/manager/qemu/Summary.js b/www/manager/qemu/Summary.js index 9d61c7bd..273ba94c 100644 --- a/www/manager/qemu/Summary.js +++ b/www/manager/qemu/Summary.js @@ -59,7 +59,7 @@ Ext.define('PVE.qemu.Summary', { }, { xtype: 'pveRRDView', - title: gettext('CPU usage %'), + title: gettext('CPU usage'), pveSelNode: me.pveSelNode, datasource: 'cpu', rrdurl: rrdurl diff --git a/www/manager/window/Migrate.js b/www/manager/window/Migrate.js index 40f464c1..322e3f61 100644 --- a/www/manager/window/Migrate.js +++ b/www/manager/window/Migrate.js @@ -84,7 +84,7 @@ Ext.define('PVE.window.Migrate', { }); Ext.apply(me, { - title: gettext('Migrate VM') + " " + me.vmid, + title: gettext('Migrate') + ' VM ' + me.vmid, width: 350, modal: true, layout: 'auto', diff --git a/www/manager/window/Restore.js b/www/manager/window/Restore.js index 77a8bb6a..04e0c995 100644 --- a/www/manager/window/Restore.js +++ b/www/manager/window/Restore.js @@ -102,7 +102,7 @@ Ext.define('PVE.window.Restore', { if (me.vmid) { var msg = gettext('Are you sure you want to restore this VM?') + ' ' + gettext('This will permanently erase current VM data.'); - Ext.Msg.confirm(gettext('Confirmation'), msg, function(btn) { + Ext.Msg.confirm(gettext('Confirm'), msg, function(btn) { if (btn !== 'yes') { return; } @@ -118,7 +118,8 @@ Ext.define('PVE.window.Restore', { submitBtn.setDisabled(!valid); }); - var title = (me.vmtype === 'openvz') ? gettext('Restore CT') : gettext('Restore VM'); + var title = (me.vmtype === 'openvz') ? gettext('Restore CT') : + gettext('Restore VM'); Ext.apply(me, { title: title,