reduce translation overhead

diff --git a/www/manager6/Toolkit.js b/www/manager6/Toolkit.js
index 034218a62ae5ec601f0172dd3505d2403a7818f8..91a4fa64f485ad8579f2c417f9f10edeaa031401 100644 (file)
--- a/www/manager6/Toolkit.js
+++ b/www/manager6/Toolkit.js
@@ -94,7 +94,7 @@ Ext.apply(Ext.form.field.VTypes, {
     pveMail: function(v) {
         return (/^(\w+)([\-+.][\w]+)*@(\w[\-\w]*\.){1,5}([A-Za-z]){2,63}$/).test(v);
     },
-    pveMailText: gettext('This field should be an e-mail address in the format "user@example.com"'),
+    pveMailText: gettext('Example') + ": user@example.com",
 });
 
 // ExtJs 5-6 has an issue with caching

diff --git a/www/manager6/dc/OptionView.js b/www/manager6/dc/OptionView.js
index 386ff156d46c0a5c07195fc1e520bad32a144c5d..8603182e23c695d8760deda179abfd3fe7221735 100644 (file)
--- a/www/manager6/dc/OptionView.js
+++ b/www/manager6/dc/OptionView.js
@@ -86,7 +86,7 @@ Ext.define('PVE.dc.EmailFromEdit', {
                xtype: 'pvetextfield',
                name: 'email_from',
                vtype: 'pveMail',
-               emptyText: gettext('Send emails from root@$hostname'),
+               emptyText: 'root@$hostname',
                deleteEmpty: true,
                value: '',
                fieldLabel: gettext('Email from address')
@@ -104,7 +104,6 @@ Ext.define('PVE.dc.OptionView', {
     alias: ['widget.pveDcOptionView'],
 
     noProxyText: gettext('Do not use any proxy'),
-    noEmailFromText: gettext('Send emails from root@$hostname'),
 
     initComponent : function() {
        var me = this;
@@ -143,7 +142,7 @@ Ext.define('PVE.dc.OptionView', {
                required: true,
                renderer: function(value) {
                    if (!value) {
-                       return me.noEmailFromText;
+                       return 'root@$hostname';
                    }
                    return value;
                }

diff --git a/www/manager6/dc/StorageView.js b/www/manager6/dc/StorageView.js
index 2a9597674e8ec6c4f02af5b1cd7be1df3f96b374..9c29aea125b4f45538709b6c7634fb421819429b 100644 (file)
--- a/www/manager6/dc/StorageView.js
+++ b/www/manager6/dc/StorageView.js
@@ -248,7 +248,7 @@ Ext.define('PVE.dc.StorageView', {
                    renderer: PVE.Utils.format_boolean
                },
                {
-                   header: gettext('Enable'),
+                   header: gettext('Enabled'),
                    width: 80,
                    sortable: true,
                    dataIndex: 'disable',

diff --git a/www/manager6/dc/Support.js b/www/manager6/dc/Support.js
index 1dbe8e3e577d7ea292c588135aeedafba4cf45ee..86b656cd91b478a6cdb72fdbb47d96b8f69b9faf 100644 (file)
--- a/www/manager6/dc/Support.js
+++ b/www/manager6/dc/Support.js
@@ -47,7 +47,7 @@ Ext.define('PVE.dc.Support', {
                waitMsgTarget: me,
                failure: function(response, opts) {
                    Ext.Msg.alert(gettext('Error'), response.htmlStatus);
-                   me.update(gettext('Unable to load subscription status') + ": " + response.htmlStatus);
+                   me.update('Unable to load subscription status' + ": " + response.htmlStatus);
                },
                success: function(response, opts) {
                    var data = response.result.data;

diff --git a/www/manager6/ha/GroupEdit.js b/www/manager6/ha/GroupEdit.js
index a8491b6f28e037bd3fa8c308f17676293a019b91..c899759d44d4d4b11a6d3b1e90b7d0e083f2f22c 100644 (file)
--- a/www/manager6/ha/GroupEdit.js
+++ b/www/manager6/ha/GroupEdit.js
@@ -41,13 +41,13 @@ Ext.define('PVE.ha.GroupInputPanel', {
                xtype: 'pvecheckbox',
                name: 'restricted',
                uncheckedValue: 0,
-               fieldLabel: gettext('restricted')
+               fieldLabel: 'restricted'
            },
            {
                xtype: 'pvecheckbox',
                name: 'nofailback',
                uncheckedValue: 0,
-               fieldLabel: gettext('nofailback')
+               fieldLabel: 'nofailback'
            },
        ];
 

diff --git a/www/manager6/ha/Groups.js b/www/manager6/ha/Groups.js
index 66ca7d915232d5e37a7e06ffe5727a746dd58f3f..2d9430696fe7a692e0f5a4cbf4793058a08bf63d 100644 (file)
--- a/www/manager6/ha/Groups.js
+++ b/www/manager6/ha/Groups.js
@@ -86,14 +86,14 @@ Ext.define('PVE.ha.GroupsView', {
                    dataIndex: 'group'
                },
                {
-                   header: gettext('restricted'),
+                   header: 'restricted',
                    width: 100,
                    sortable: true,
                    renderer: PVE.Utils.format_boolean,
                    dataIndex: 'restricted'
                },
                {
-                   header: gettext('nofailback'),
+                   header: 'nofailback',
                    width: 100,
                    sortable: true,
                    renderer: PVE.Utils.format_boolean,

diff --git a/www/manager6/lxc/ResourceEdit.js b/www/manager6/lxc/ResourceEdit.js
index 8345e20fa7ad21c36bd746c78a95d98fa961ae43..c5d29f05fca0f9cab760c32429186ff89222f1e9 100644 (file)
--- a/www/manager6/lxc/ResourceEdit.js
+++ b/www/manager6/lxc/ResourceEdit.js
@@ -60,7 +60,7 @@ Ext.define('PVE.lxc.MountPointEdit', {
 
        var subject;
        if (unused) {
-           subject = gettext('Unused Mount Point');
+           subject = gettext('Unused Disk');
        } else if (me.create) {
            subject = gettext('Mount Point');
        } else {
@@ -82,7 +82,7 @@ Ext.define('PVE.lxc.MountPointEdit', {
                    var mp = PVE.Parser.parseLxcMountPoint(value);
 
                    if (!mp) {
-                       Ext.Msg.alert(gettext('Error'), gettext('Unable to parse mount point options'));
+                       Ext.Msg.alert(gettext('Error'), 'Unable to parse mount point options');
                        me.close();
                        return;
                    }

diff --git a/www/manager6/node/NetworkEdit.js b/www/manager6/node/NetworkEdit.js
index af798d503149a231ffc40bd8fe817831862b04f9..7b063ba2d324e954f7791bea0ce18a62723b4135 100644 (file)
--- a/www/manager6/node/NetworkEdit.js
+++ b/www/manager6/node/NetworkEdit.js
@@ -57,7 +57,7 @@ Ext.define('PVE.node.NetworkEdit', {
        if (me.iftype === 'bridge') {
            column2.push({
                xtype: 'pvecheckbox',
-               fieldLabel: gettext('Vlan Aware'),
+               fieldLabel: gettext('VLAN aware'),
                name: 'bridge_vlan_aware',
                deleteEmpty: !me.create,
            });

diff --git a/www/manager6/node/NetworkView.js b/www/manager6/node/NetworkView.js
index 93b00fe1a98029736f4e8d964acabf6aaa7fb763..0cfe933515b911f7aee666587bef4e08d66df9b1 100644 (file)
--- a/www/manager6/node/NetworkView.js
+++ b/www/manager6/node/NetworkView.js
@@ -199,7 +199,7 @@ Ext.define('PVE.node.NetworkView', {
                    })
                }, ' ', 
                {
-                   text: gettext('Revert changes'),
+                   text: gettext('Revert'),
                    handler: function() {
                        PVE.Utils.API2Request({
                            url: '/nodes/' + nodename + '/network',

diff --git a/www/manager6/panel/IPSet.js b/www/manager6/panel/IPSet.js
index 821f467fa0a552923668515edddbdfe666aca3de..2b63f2eebc0de63e1c6edd8e9c8264b8c4f0a843 100644 (file)
--- a/www/manager6/panel/IPSet.js
+++ b/www/manager6/panel/IPSet.js
@@ -226,7 +226,7 @@ Ext.define('PVE.IPSetCidrEdit', {
                    checked: false,
                    height: 22, // hack: set same height as text fields
                    uncheckedValue: 0,
-                   fieldLabel: gettext('nomatch')
+                   fieldLabel: 'nomatch'
                }
            ],
            columnB: [

diff --git a/www/manager6/qemu/CPUOptions.js b/www/manager6/qemu/CPUOptions.js
index 711a3e3ad12ca785f0baf3135a1d6492aa39b46d..698a1fac299cb046c2f59f2b1652caa631d28496 100644 (file)
--- a/www/manager6/qemu/CPUOptions.js
+++ b/www/manager6/qemu/CPUOptions.js
@@ -37,7 +37,7 @@ Ext.define('PVE.qemu.CPUOptionsInputPanel', {
                 minValue: 1,
                 maxValue: me.maxvcpus,
                 value: '',
-                fieldLabel: gettext('Vcpus'),
+                fieldLabel: gettext('VCPUs'),
                 allowBlank: true,
                 emptyText: me.maxvcpus
             },

diff --git a/www/manager6/qemu/HDEdit.js b/www/manager6/qemu/HDEdit.js
index cfb951e4aaab13f6973439db1d95828ea6821a14..c80fbf39dceae825425ed1e67530b1374f14ac54 100644 (file)
--- a/www/manager6/qemu/HDEdit.js
+++ b/www/manager6/qemu/HDEdit.js
@@ -240,7 +240,7 @@ Ext.define('PVE.qemu.HDInputPanel', {
 
        me.column2.push({
            xtype: 'pvecheckbox',
-           fieldLabel: gettext('Iothread'),
+           fieldLabel: gettext('IO thread'),
            name: 'iothread'
        });
 
@@ -292,7 +292,7 @@ Ext.define('PVE.qemu.HDEdit', {
                    var value = response.result.data[me.confid];
                    var drive = PVE.Parser.parseQemuDrive(me.confid, value);
                    if (!drive) {
-                       Ext.Msg.alert(gettext('Error'), gettext('Unable to parse drive options'));
+                       Ext.Msg.alert(gettext('Error'), 'Unable to parse drive options');
                        me.close();
                        return;
                    }

diff --git a/www/manager6/qemu/HDThrottle.js b/www/manager6/qemu/HDThrottle.js
index 1fcedd9173fd8c1bf36cbb2e391a19a94da71134..7506cff7624adf2d4a124d715dfb25638d3fc823 100644 (file)
--- a/www/manager6/qemu/HDThrottle.js
+++ b/www/manager6/qemu/HDThrottle.js
@@ -198,7 +198,7 @@ Ext.define('PVE.qemu.HDThrottle', {
                    var value = response.result.data[me.confid];
                    var drive = PVE.Parser.parseQemuDrive(me.confid, value);
                    if (!drive) {
-                       Ext.Msg.alert(gettext('Error'), gettext('Unable to parse drive options'));
+                       Ext.Msg.alert(gettext('Error'), 'Unable to parse drive options');
                        me.close();
                        return;
                    }

diff --git a/www/manager6/qemu/NetworkEdit.js b/www/manager6/qemu/NetworkEdit.js
index 033e7d218ab79689e4bd1720c4b818ce3c357dee..fefa8ac2a29eb78d55d1a02cc9be4286f5f89779 100644 (file)
--- a/www/manager6/qemu/NetworkEdit.js
+++ b/www/manager6/qemu/NetworkEdit.js
@@ -207,7 +207,7 @@ Ext.define('PVE.qemu.NetworkEdit', {
                    var value = me.vmconfig[me.confid];
                    var network = PVE.Parser.parseQemuNetwork(me.confid, value);
                    if (!network) {
-                       Ext.Msg.alert(gettext('Error'), gettext('Unable to parse network options'));
+                       Ext.Msg.alert(gettext('Error'), 'Unable to parse network options');
                        me.close();
                        return;
                    }

diff --git a/www/manager6/qemu/ProcessorEdit.js b/www/manager6/qemu/ProcessorEdit.js
index 533972877860eb781e5510afa11fb7d2cd0cb52e..8f05a77c8d33a690b80c93e84763ac1020a1b3e9 100644 (file)
--- a/www/manager6/qemu/ProcessorEdit.js
+++ b/www/manager6/qemu/ProcessorEdit.js
@@ -74,7 +74,7 @@ Ext.define('PVE.qemu.ProcessorInputPanel', {
            },
            {
                xtype: 'pvecheckbox',
-               fieldLabel: gettext('Enable numa'),
+               fieldLabel: gettext('Enable NUMA'),
                name: 'numa',
                uncheckedValue: 0,
            },

diff --git a/www/manager6/qemu/Smbios1Edit.js b/www/manager6/qemu/Smbios1Edit.js
index f0ff2920820d12c6fa4297b3bf3e0a06587cacc7..78bc193ed041eff5537bdc24ff41a8eb1ac9d906 100644 (file)
--- a/www/manager6/qemu/Smbios1Edit.js
+++ b/www/manager6/qemu/Smbios1Edit.js
@@ -103,7 +103,7 @@ Ext.define('PVE.qemu.Smbios1Edit', {
                if (value) {
                    var data = PVE.Parser.parseQemuSmbios1(value);
                    if (!data) {
-                       Ext.Msg.alert(gettext('Error'), gettext('Unable to parse smbios options'));
+                       Ext.Msg.alert(gettext('Error'), 'Unable to parse smbios options');
                        me.close();
                        return;
                    }

diff --git a/www/manager6/tree/ResourceTree.js b/www/manager6/tree/ResourceTree.js
index 908638e5bed46880c1cc4813b4a0865e57a0c7fa..c38321b668c7e65aabbd42226045662839d5d9fe 100644 (file)
--- a/www/manager6/tree/ResourceTree.js
+++ b/www/manager6/tree/ResourceTree.js
@@ -9,7 +9,7 @@ Ext.define('PVE.tree.ResourceTree', {
        typeDefaults: {
            node: { 
                iconCls: 'x-tree-node-server',
-               text: gettext('Node list')
+               text: gettext('Nodes')
            },
            pool: { 
                iconCls: 'x-tree-node-pool',
@@ -17,7 +17,7 @@ Ext.define('PVE.tree.ResourceTree', {
            },
            storage: {
                iconCls: 'x-tree-node-harddisk',
-               text: gettext('Storage list')
+               text: gettext('Storage')
            },
            qemu: {
                iconCls: 'x-tree-node-computer',

diff --git a/www/manager6/window/Restore.js b/www/manager6/window/Restore.js
index 9cd63f663f0e038e090d431397dcd963215922bb..94997954e0090bc0fe99ec4d099985cf80c750db 100644 (file)
--- a/www/manager6/window/Restore.js
+++ b/www/manager6/window/Restore.js
@@ -120,8 +120,12 @@ Ext.define('PVE.window.Restore', {
            submitBtn.setDisabled(!valid);
        });
 
-       var title = (me.vmtype === 'openvz') ? gettext('Restore CT') : 
-           gettext('Restore VM');
+       var title =  gettext('Restore') + ": " + (
+           (me.vmtype === 'lxc') ? 'CT' : 'VM');
+
+       if (me.vmid) {
+           title += " " + me.vmid;
+       }
 
        Ext.apply(me, {
            title: title,