luci-base: fix typos

Signed-off-by: Balázs Úr <balazs@urbalazs.hu>
(backported from commit d0bc86bcc3fc0c6668e04601344daa956cea2b32)

diff --git a/modules/luci-base/htdocs/luci-static/resources/network.js b/modules/luci-base/htdocs/luci-static/resources/network.js
index 8c34b4cfedd6ab9b99410a8d2a3c5a8134a2dd6a..796b613beeb2cb20ffa237bee0faa907925ff2b2 100644 (file)
--- a/modules/luci-base/htdocs/luci-static/resources/network.js
+++ b/modules/luci-base/htdocs/luci-static/resources/network.js
@@ -5,7 +5,7 @@
 
 var proto_errors = {
        CONNECT_FAILED:                 _('Connection attempt failed'),
-       INVALID_ADDRESS:                _('IP address in invalid'),
+       INVALID_ADDRESS:                _('IP address is invalid'),
        INVALID_GATEWAY:                _('Gateway address is invalid'),
        INVALID_LOCAL_ADDRESS:  _('Local IP address is invalid'),
        MISSING_ADDRESS:                _('IP address is missing'),

diff --git a/modules/luci-base/htdocs/luci-static/resources/protocol/static.js b/modules/luci-base/htdocs/luci-static/resources/protocol/static.js
index 9039acd5f3ca43ff134b0a0b5cb93eea7383c66d..2d70ae681fa394f3acb82a16bcdd83f82b0f522b 100644 (file)
--- a/modules/luci-base/htdocs/luci-static/resources/protocol/static.js
+++ b/modules/luci-base/htdocs/luci-static/resources/protocol/static.js
@@ -195,7 +195,7 @@ return network.registerProtocol('static', {
                        var n = parseInt(value, 16);
 
                        if (!/^(0x)?[0-9a-fA-F]+$/.test(value) || isNaN(n) || n >= 0xffffffff)
-                               return _('Expecting an hexadecimal assignment hint');
+                               return _('Expecting a hexadecimal assignment hint');
 
                        return true;
                };

diff --git a/modules/luci-compat/luasrc/model/network.lua b/modules/luci-compat/luasrc/model/network.lua
index 1f761e315e510e78638eb0bce27e40e671b118e4..42b8b87520da20514839d9d34048a2ae750eadc0 100644 (file)
--- a/modules/luci-compat/luasrc/model/network.lua
+++ b/modules/luci-compat/luasrc/model/network.lua
@@ -25,7 +25,7 @@ IFACE_PATTERNS_WIRELESS = { "^wlan%d", "^wl%d", "^ath%d", "^%w+%.network%d" }
 
 IFACE_ERRORS = {
        CONNECT_FAILED                  = lng.translate("Connection attempt failed"),
-       INVALID_ADDRESS                 = lng.translate("IP address in invalid"),
+       INVALID_ADDRESS                 = lng.translate("IP address is invalid"),
        INVALID_GATEWAY                 = lng.translate("Gateway address is invalid"),
        INVALID_LOCAL_ADDRESS   = lng.translate("Local IP address is invalid"),
        MISSING_ADDRESS                 = lng.translate("IP address is missing"),

diff --git a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js
index fc3682d20b180f3b33c7825623cdf27b6071c5b8..fda6c4f2fcd315bbec8f4a341c7ad380e8e184f4 100644 (file)
--- a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js
+++ b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js
@@ -33,7 +33,7 @@ CBILeaseStatus = form.DummyValue.extend({
                                        E('div', { 'class': 'th' }, _('Hostname')),
                                        E('div', { 'class': 'th' }, _('IPv4-Address')),
                                        E('div', { 'class': 'th' }, _('MAC-Address')),
-                                       E('div', { 'class': 'th' }, _('Leasetime remaining'))
+                                       E('div', { 'class': 'th' }, _('Lease time remaining'))
                                ]),
                                E('div', { 'class': 'tr placeholder' }, [
                                        E('div', { 'class': 'td' }, E('em', _('Collecting data...')))

diff --git a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js
index 282cafcbaa6e46081baef2384173680d16289073..5a3d64e7ac60fe181bcd1c89792b82e8953af84e 100644 (file)
--- a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js
+++ b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js
@@ -24,15 +24,15 @@ function renderbox(dsl) {
                                _('Line Attenuation (LATN)'), '%.1f dB / %.1f dB'.format(dsl.line_attenuation_down, dsl.line_attenuation_up),
                                _('Signal Attenuation (SATN)'), '%.1f dB / %.1f dB'.format(dsl.signal_attenuation_down, dsl.signal_attenuation_up),
                                _('Noise Margin (SNR)'), '%.1f dB / %.1f dB'.format(dsl.noise_margin_down, dsl.noise_margin_up),
-                               _('Aggregate Transmit Power(ACTATP)'), '%.1f dB / %.1f dB'.format(dsl.actatp_down, dsl.actatp_up),
+                               _('Aggregate Transmit Power (ACTATP)'), '%.1f dB / %.1f dB'.format(dsl.actatp_down, dsl.actatp_up),
                                _('Forward Error Correction Seconds (FECS)'), '%d / %d'.format(dsl.errors_fecs_near, dsl.errors_fecs_far),
                                _('Errored seconds (ES)'), '%d / %d'.format(dsl.errors_es_near, dsl.errors_es_far),
                                _('Severely Errored Seconds (SES)'), '%d / %d'.format(dsl.errors_ses_near, dsl.errors_ses_far),
                                _('Loss of Signal Seconds (LOSS)'), '%d / %d'.format(dsl.errors_loss_near, dsl.errors_loss_far),
                                _('Unavailable Seconds (UAS)'), '%d / %d'.format(dsl.errors_uas_near, dsl.errors_uas_far),
                                _('Header Error Code Errors (HEC)'), '%d / %d'.format(dsl.errors_hec_near, dsl.errors_hec_far),
-                               _('Non Pre-emtive CRC errors (CRC_P)'), '%d / %d'.format(dsl.errors_crc_p_near, dsl.errors_crc_p_far),
-                               _('Pre-emtive CRC errors (CRCP_P)'), '%d / %d'.format(dsl.errors_crcp_p_near, dsl.errors_crcp_p_far),
+                               _('Non Pre-emptive CRC errors (CRC_P)'), '%d / %d'.format(dsl.errors_crc_p_near, dsl.errors_crc_p_far),
+                               _('Pre-emptive CRC errors (CRCP_P)'), '%d / %d'.format(dsl.errors_crcp_p_near, dsl.errors_crcp_p_far),
                                _('ATU-C System Vendor ID'), dsl.atuc_vendor_id,
                                _('Power Management Mode'), dsl.power_mode_s
                        ])