luci-app-statistics: treat APC UPS "host" setting as single value option

Existing Lua code incorrectly stated that the "Host" option takes a space
sparated list of hostnames which is not the case since the collect plugin
does not handle multiple hosts.

This change reverts the configuration to a simple value as proposed by
the original PR and adjusts the config summary accordingly, while retaining
the translation string.

Ref: https://github.com/openwrt/luci/pull/5010#issuecomment-827285319
Fixes: dd5d96afd ("luci-app-statistics: fix APC UPS host configuration")
Fixes: e7d22dce5 ("luci-app-statistics: convert collectd configuration to client side views")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>

diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js
index 17ec51be5379ec7742070a7f3a964220c4ebaec7..32f0cecdabebea20879ad524beee0c1847095c2b 100644 (file)
--- a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js
+++ b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js
@@ -11,13 +11,10 @@ return baseclass.extend({
 
                o = s.option(form.Flag, 'enable', _('Enable this plugin'));
 
-               o = s.option(form.DynamicList, 'Host', _('Monitor host'));
+               o = s.option(form.Value, 'Host', _('Monitor host'));
                o.default = 'localhost';
                o.datatype = 'host';
                o.depends('enable', '1');
-               o.write = function(section_id, value) {
-                       return form.Value.prototype.write.call(this, section_id, L.toArray(value).join(' '));
-               };
 
                o = s.option(form.Value, 'Port', _('Port for apcupsd communication'));
                o.default = '3551';
@@ -26,11 +23,6 @@ return baseclass.extend({
        },
 
        configSummary: function(section) {
-               var hosts = L.toArray(section.Host);
-               if (hosts.length)
-                       return N_(hosts.length,
-                               'Monitoring APC UPS at host %s, port %d',
-                               'Monitoring APC UPS at hosts %s, port %d'
-                       ).format(hosts.join(', '), section.Port || 3551);
+               return _('Monitoring APC UPS at host %s, port %d').format(section.Host || 'localhost', section.Port || 3551);
        }
 });

diff --git a/applications/luci-app-statistics/po/ar/statistics.po b/applications/luci-app-statistics/po/ar/statistics.po
index e7332aead94c96f47f240e7b9290b81a0620690c..b38b04695c01a6258d9425db471843f2859a87f5 100644 (file)
--- a/applications/luci-app-statistics/po/ar/statistics.po
+++ b/applications/luci-app-statistics/po/ar/statistics.po
@@ -662,15 +662,9 @@ msgstr ""
 msgid "Monitoring %s, %s, %s"
 msgstr ""
 
-#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js:29
+#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js:26
 msgid "Monitoring APC UPS at host %s, port %d"
-msgid_plural "Monitoring APC UPS at hosts %s, port %d"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
+msgstr ""
 
 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/dhcpleases.js:19
 msgid "Monitoring DHCP leases enabled"

diff --git a/applications/luci-app-statistics/po/bg/statistics.po b/applications/luci-app-statistics/po/bg/statistics.po
index f27c585898c14f4a423dbdcd1907e1c824dee955..be555d534c7d3caebc930a99d85896b2784e4ea1 100644 (file)
--- a/applications/luci-app-statistics/po/bg/statistics.po
+++ b/applications/luci-app-statistics/po/bg/statistics.po
@@ -661,11 +661,9 @@ msgstr ""
 msgid "Monitoring %s, %s, %s"
 msgstr ""
 
-#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js:29
+#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js:26
 msgid "Monitoring APC UPS at host %s, port %d"
-msgid_plural "Monitoring APC UPS at hosts %s, port %d"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
 
 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/dhcpleases.js:19
 msgid "Monitoring DHCP leases enabled"

diff --git a/applications/luci-app-statistics/po/bn_BD/statistics.po b/applications/luci-app-statistics/po/bn_BD/statistics.po
index 1a09936f714d7dab17c4347934f21e029a1607e5..12f09398b115790c4f8cd14554888e4146c6596f 100644 (file)
--- a/applications/luci-app-statistics/po/bn_BD/statistics.po
+++ b/applications/luci-app-statistics/po/bn_BD/statistics.po
@@ -659,11 +659,9 @@ msgstr ""
 msgid "Monitoring %s, %s, %s"
 msgstr ""
 
-#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js:29
+#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js:26
 msgid "Monitoring APC UPS at host %s, port %d"
-msgid_plural "Monitoring APC UPS at hosts %s, port %d"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
 
 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/dhcpleases.js:19
 msgid "Monitoring DHCP leases enabled"

diff --git a/applications/luci-app-statistics/po/ca/statistics.po b/applications/luci-app-statistics/po/ca/statistics.po
index fff8c762ebf16383ae19f319faa9e43fc0a1cbca..3897e933cc03e3a8fe1e9a10a198be50ecbfeb1d 100644 (file)
--- a/applications/luci-app-statistics/po/ca/statistics.po
+++ b/applications/luci-app-statistics/po/ca/statistics.po
@@ -672,11 +672,9 @@ msgstr ""
 msgid "Monitoring %s, %s, %s"
 msgstr ""
 
-#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js:29
+#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js:26
 msgid "Monitoring APC UPS at host %s, port %d"
-msgid_plural "Monitoring APC UPS at hosts %s, port %d"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
 
 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/dhcpleases.js:19
 msgid "Monitoring DHCP leases enabled"

diff --git a/applications/luci-app-statistics/po/cs/statistics.po b/applications/luci-app-statistics/po/cs/statistics.po
index de2d783464da292a235b82e9693ec360e0e62834..df729eb0879b8b26ab3877c8dc33298c7ab537d0 100644 (file)
--- a/applications/luci-app-statistics/po/cs/statistics.po
+++ b/applications/luci-app-statistics/po/cs/statistics.po
@@ -670,12 +670,9 @@ msgstr ""
 msgid "Monitoring %s, %s, %s"
 msgstr ""
 
-#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js:29
+#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js:26
 msgid "Monitoring APC UPS at host %s, port %d"
-msgid_plural "Monitoring APC UPS at hosts %s, port %d"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr ""
 
 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/dhcpleases.js:19
 msgid "Monitoring DHCP leases enabled"

diff --git a/applications/luci-app-statistics/po/de/statistics.po b/applications/luci-app-statistics/po/de/statistics.po
index 07f00717101737076495c52a904cd4beb6ff1413..36f4cacc810daca35f92dcdf324918e072c9a3cc 100644 (file)
--- a/applications/luci-app-statistics/po/de/statistics.po
+++ b/applications/luci-app-statistics/po/de/statistics.po
@@ -676,11 +676,10 @@ msgstr "Überwachung von %s und %s"
 msgid "Monitoring %s, %s, %s"
 msgstr "Überwachung von %s, %s, %s"
 
-#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js:29
+#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js:26
+#, fuzzy
 msgid "Monitoring APC UPS at host %s, port %d"
-msgid_plural "Monitoring APC UPS at hosts %s, port %d"
-msgstr[0] "Überwachung von APC USV am Host %s, Port %d"
-msgstr[1] "Überwachung von APC USV an Hosts %s, Port %d"
+msgstr "Überwachung von APC USV am Host %s, Port %d"
 
 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/dhcpleases.js:19
 msgid "Monitoring DHCP leases enabled"

diff --git a/applications/luci-app-statistics/po/el/statistics.po b/applications/luci-app-statistics/po/el/statistics.po
index 5a3478d24e9583ea9c8f7d657f6aafe6fadee022..5d93a54747bdcef76c884223a1cc1a63f96dfba1 100644 (file)
--- a/applications/luci-app-statistics/po/el/statistics.po
+++ b/applications/luci-app-statistics/po/el/statistics.po
@@ -663,11 +663,9 @@ msgstr ""
 msgid "Monitoring %s, %s, %s"
 msgstr ""
 
-#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js:29
+#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js:26
 msgid "Monitoring APC UPS at host %s, port %d"
-msgid_plural "Monitoring APC UPS at hosts %s, port %d"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
 
 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/dhcpleases.js:19
 msgid "Monitoring DHCP leases enabled"

diff --git a/applications/luci-app-statistics/po/en/statistics.po b/applications/luci-app-statistics/po/en/statistics.po
index 6e50552dc5d75dc73fb1e154fe42fc3c1ef8a157..bcb6c8a7eb5d6b8eadbec9eef1a913f881988f95 100644 (file)
--- a/applications/luci-app-statistics/po/en/statistics.po
+++ b/applications/luci-app-statistics/po/en/statistics.po
@@ -668,11 +668,9 @@ msgstr ""
 msgid "Monitoring %s, %s, %s"
 msgstr ""
 
-#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js:29
+#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js:26
 msgid "Monitoring APC UPS at host %s, port %d"
-msgid_plural "Monitoring APC UPS at hosts %s, port %d"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
 
 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/dhcpleases.js:19
 msgid "Monitoring DHCP leases enabled"

diff --git a/applications/luci-app-statistics/po/es/statistics.po b/applications/luci-app-statistics/po/es/statistics.po
index d3376af445c253de468e1596d73cfe50e1c3998b..b16806845fa854652684e48a43c1de25ca1b528b 100644 (file)
--- a/applications/luci-app-statistics/po/es/statistics.po
+++ b/applications/luci-app-statistics/po/es/statistics.po
@@ -676,11 +676,10 @@ msgstr "Monitoreando %s y %s"
 msgid "Monitoring %s, %s, %s"
 msgstr "Monitoreando %s, %s, %s"
 
-#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js:29
+#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js:26
+#, fuzzy
 msgid "Monitoring APC UPS at host %s, port %d"
-msgid_plural "Monitoring APC UPS at hosts %s, port %d"
-msgstr[0] "Supervisión de APC UPS en el host %s, puerto %d"
-msgstr[1] "Supervisión de UPS de APC en hosts %s, puerto %d"
+msgstr "Supervisión de APC UPS en el host %s, puerto %d"
 
 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/dhcpleases.js:19
 msgid "Monitoring DHCP leases enabled"

diff --git a/applications/luci-app-statistics/po/fi/statistics.po b/applications/luci-app-statistics/po/fi/statistics.po
index 79d2ccb8109a87cca57228bd25bba72abc3f98a0..41fdf1a18885c7bcb04ff682bf35498780cb82fa 100644 (file)
--- a/applications/luci-app-statistics/po/fi/statistics.po
+++ b/applications/luci-app-statistics/po/fi/statistics.po
@@ -668,11 +668,10 @@ msgstr "Valvotaan kohdetta %s ja %s"
 msgid "Monitoring %s, %s, %s"
 msgstr "Valvonta %s, %s, %s"
 
-#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js:29
+#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js:26
+#, fuzzy
 msgid "Monitoring APC UPS at host %s, port %d"
-msgid_plural "Monitoring APC UPS at hosts %s, port %d"
-msgstr[0] "Valvotaan APC UPS isäntää %s, port %d"
-msgstr[1] "Valvotaan APC UPS isäntiä %s, port %d"
+msgstr "Valvotaan APC UPS isäntää %s, port %d"
 
 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/dhcpleases.js:19
 msgid "Monitoring DHCP leases enabled"

diff --git a/applications/luci-app-statistics/po/fr/statistics.po b/applications/luci-app-statistics/po/fr/statistics.po
index a404ddbb7fe341499ff42a846550421e3d641585..d618bddc09232a6213f66b590b75339cf6b924a3 100644 (file)
--- a/applications/luci-app-statistics/po/fr/statistics.po
+++ b/applications/luci-app-statistics/po/fr/statistics.po
@@ -669,11 +669,10 @@ msgstr "Surveillance de %s et %s"
 msgid "Monitoring %s, %s, %s"
 msgstr "Surveillance de %s, %s, %s"
 
-#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js:29
+#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js:26
+#, fuzzy
 msgid "Monitoring APC UPS at host %s, port %d"
-msgid_plural "Monitoring APC UPS at hosts %s, port %d"
-msgstr[0] "Surveillance des APC UPS au niveau de l'hôte %s, port %s"
-msgstr[1] "Surveillance des APC UPS au niveau des hôtes %s, port %s"
+msgstr "Surveillance des APC UPS au niveau de l'hôte %s, port %s"
 
 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/dhcpleases.js:19
 msgid "Monitoring DHCP leases enabled"

diff --git a/applications/luci-app-statistics/po/he/statistics.po b/applications/luci-app-statistics/po/he/statistics.po
index 6ce3dbe9619dfcaeb0ce23b7ab6e6874fe7d8b14..409a384c1972a0452821530ef1d991ec2454e469 100644 (file)
--- a/applications/luci-app-statistics/po/he/statistics.po
+++ b/applications/luci-app-statistics/po/he/statistics.po
@@ -661,11 +661,9 @@ msgstr ""
 msgid "Monitoring %s, %s, %s"
 msgstr ""
 
-#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js:29
+#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js:26
 msgid "Monitoring APC UPS at host %s, port %d"
-msgid_plural "Monitoring APC UPS at hosts %s, port %d"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
 
 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/dhcpleases.js:19
 msgid "Monitoring DHCP leases enabled"

diff --git a/applications/luci-app-statistics/po/hi/statistics.po b/applications/luci-app-statistics/po/hi/statistics.po
index 5dfff9cbbfb7c602484f61b274a875b94eed4d71..6143934f5fd14879b13d6513b727114cc8e34563 100644 (file)
--- a/applications/luci-app-statistics/po/hi/statistics.po
+++ b/applications/luci-app-statistics/po/hi/statistics.po
@@ -661,11 +661,9 @@ msgstr ""
 msgid "Monitoring %s, %s, %s"
 msgstr ""
 
-#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js:29
+#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js:26
 msgid "Monitoring APC UPS at host %s, port %d"
-msgid_plural "Monitoring APC UPS at hosts %s, port %d"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
 
 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/dhcpleases.js:19
 msgid "Monitoring DHCP leases enabled"

diff --git a/applications/luci-app-statistics/po/hu/statistics.po b/applications/luci-app-statistics/po/hu/statistics.po
index a81ce2992942f3aafc1a96aa3d39b3ab233e0840..3270702d54ca77c19040d9ba0d4c8544f5984258 100644 (file)
--- a/applications/luci-app-statistics/po/hu/statistics.po
+++ b/applications/luci-app-statistics/po/hu/statistics.po
@@ -672,11 +672,9 @@ msgstr ""
 msgid "Monitoring %s, %s, %s"
 msgstr ""
 
-#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js:29
+#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js:26
 msgid "Monitoring APC UPS at host %s, port %d"
-msgid_plural "Monitoring APC UPS at hosts %s, port %d"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
 
 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/dhcpleases.js:19
 msgid "Monitoring DHCP leases enabled"

diff --git a/applications/luci-app-statistics/po/it/statistics.po b/applications/luci-app-statistics/po/it/statistics.po
index cef042a124494afd44f793c95b4fed0ce3cd2764..36a211f86b2953f85d7b3bba2b16e2c795098e08 100644 (file)
--- a/applications/luci-app-statistics/po/it/statistics.po
+++ b/applications/luci-app-statistics/po/it/statistics.po
@@ -668,11 +668,9 @@ msgstr ""
 msgid "Monitoring %s, %s, %s"
 msgstr ""
 
-#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js:29
+#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js:26
 msgid "Monitoring APC UPS at host %s, port %d"
-msgid_plural "Monitoring APC UPS at hosts %s, port %d"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
 
 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/dhcpleases.js:19
 msgid "Monitoring DHCP leases enabled"

diff --git a/applications/luci-app-statistics/po/ja/statistics.po b/applications/luci-app-statistics/po/ja/statistics.po
index 8ee9c7ac33ea82d908865ed48de6ad678ad11ad9..97850e338657cb960a2dfe575a3cc744c87e39d1 100644 (file)
--- a/applications/luci-app-statistics/po/ja/statistics.po
+++ b/applications/luci-app-statistics/po/ja/statistics.po
@@ -674,10 +674,10 @@ msgstr "%s および %s を監視"
 msgid "Monitoring %s, %s, %s"
 msgstr "%s、%s および %s を監視"
 
-#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js:29
+#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js:26
+#, fuzzy
 msgid "Monitoring APC UPS at host %s, port %d"
-msgid_plural "Monitoring APC UPS at hosts %s, port %d"
-msgstr[0] "ホスト %s、ポート %d で APC UPS を監視中"
+msgstr "ホスト %s、ポート %d で APC UPS を監視中"
 
 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/dhcpleases.js:19
 msgid "Monitoring DHCP leases enabled"

diff --git a/applications/luci-app-statistics/po/ko/statistics.po b/applications/luci-app-statistics/po/ko/statistics.po
index 55fba5ed2d9e7927b86cc2a899e2f7169e4023ce..489f2c648240fe10b342344e6468093253c33211 100644 (file)
--- a/applications/luci-app-statistics/po/ko/statistics.po
+++ b/applications/luci-app-statistics/po/ko/statistics.po
@@ -661,10 +661,9 @@ msgstr ""
 msgid "Monitoring %s, %s, %s"
 msgstr ""
 
-#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js:29
+#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js:26
 msgid "Monitoring APC UPS at host %s, port %d"
-msgid_plural "Monitoring APC UPS at hosts %s, port %d"
-msgstr[0] ""
+msgstr ""
 
 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/dhcpleases.js:19
 msgid "Monitoring DHCP leases enabled"

diff --git a/applications/luci-app-statistics/po/mr/statistics.po b/applications/luci-app-statistics/po/mr/statistics.po
index bda32fa44beea3cbc6335fe8459e9af7445f2f32..dc132f2ecf9a2ae301e6e5b6e53670426886b941 100644 (file)
--- a/applications/luci-app-statistics/po/mr/statistics.po
+++ b/applications/luci-app-statistics/po/mr/statistics.po
@@ -661,11 +661,9 @@ msgstr ""
 msgid "Monitoring %s, %s, %s"
 msgstr ""
 
-#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js:29
+#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js:26
 msgid "Monitoring APC UPS at host %s, port %d"
-msgid_plural "Monitoring APC UPS at hosts %s, port %d"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
 
 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/dhcpleases.js:19
 msgid "Monitoring DHCP leases enabled"

diff --git a/applications/luci-app-statistics/po/ms/statistics.po b/applications/luci-app-statistics/po/ms/statistics.po
index 8599571b61e4022f9a036a98d4b0b55ca7b02861..2bf126dcf9acadab727da633982c30ce98d31311 100644 (file)
--- a/applications/luci-app-statistics/po/ms/statistics.po
+++ b/applications/luci-app-statistics/po/ms/statistics.po
@@ -661,10 +661,9 @@ msgstr ""
 msgid "Monitoring %s, %s, %s"
 msgstr ""
 
-#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js:29
+#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js:26
 msgid "Monitoring APC UPS at host %s, port %d"
-msgid_plural "Monitoring APC UPS at hosts %s, port %d"
-msgstr[0] ""
+msgstr ""
 
 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/dhcpleases.js:19
 msgid "Monitoring DHCP leases enabled"

diff --git a/applications/luci-app-statistics/po/nb_NO/statistics.po b/applications/luci-app-statistics/po/nb_NO/statistics.po
index 02fc769d7c3b9686e36bc7eacdb5d6a38eb35a51..c3fd97e0daff8f3016b5fd9887bb4ad958e3e38d 100644 (file)
--- a/applications/luci-app-statistics/po/nb_NO/statistics.po
+++ b/applications/luci-app-statistics/po/nb_NO/statistics.po
@@ -663,11 +663,9 @@ msgstr ""
 msgid "Monitoring %s, %s, %s"
 msgstr ""
 
-#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js:29
+#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js:26
 msgid "Monitoring APC UPS at host %s, port %d"
-msgid_plural "Monitoring APC UPS at hosts %s, port %d"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
 
 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/dhcpleases.js:19
 msgid "Monitoring DHCP leases enabled"

diff --git a/applications/luci-app-statistics/po/nl/statistics.po b/applications/luci-app-statistics/po/nl/statistics.po
index b2d3d2a82fc5d051d1afedf4c4100404df2dab57..3666aaf301a425a75cb2dad34b7a482324264033 100644 (file)
--- a/applications/luci-app-statistics/po/nl/statistics.po
+++ b/applications/luci-app-statistics/po/nl/statistics.po
@@ -660,11 +660,9 @@ msgstr ""
 msgid "Monitoring %s, %s, %s"
 msgstr ""
 
-#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js:29
+#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js:26
 msgid "Monitoring APC UPS at host %s, port %d"
-msgid_plural "Monitoring APC UPS at hosts %s, port %d"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
 
 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/dhcpleases.js:19
 msgid "Monitoring DHCP leases enabled"

diff --git a/applications/luci-app-statistics/po/pl/statistics.po b/applications/luci-app-statistics/po/pl/statistics.po
index cd55160902fef989878f03abfdf64b1e2ba7d103..170b19f7d3939e17af2606511259a9c3523243dd 100644 (file)
--- a/applications/luci-app-statistics/po/pl/statistics.po
+++ b/applications/luci-app-statistics/po/pl/statistics.po
@@ -682,12 +682,10 @@ msgstr "Monitorowanie %s i %s"
 msgid "Monitoring %s, %s, %s"
 msgstr "Monitorowanie %s, %s, %s"
 
-#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js:29
+#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js:26
+#, fuzzy
 msgid "Monitoring APC UPS at host %s, port %d"
-msgid_plural "Monitoring APC UPS at hosts %s, port %d"
-msgstr[0] "Monitorowanie APC UPS na hoście % s, port %d"
-msgstr[1] "Monitorowanie APC UPS na hostach % s, portach %d"
-msgstr[2] "Monitorowanie APC UPS na hoście % s, port %d"
+msgstr "Monitorowanie APC UPS na hoście % s, port %d"
 
 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/dhcpleases.js:19
 msgid "Monitoring DHCP leases enabled"

diff --git a/applications/luci-app-statistics/po/pt/statistics.po b/applications/luci-app-statistics/po/pt/statistics.po
index 37fc216efe4c323e5a5ea9f904abc1a9cb55be9b..968ab5acaf925a0fa3cd9b66ad4b112a8f3a3504 100644 (file)
--- a/applications/luci-app-statistics/po/pt/statistics.po
+++ b/applications/luci-app-statistics/po/pt/statistics.po
@@ -677,11 +677,10 @@ msgstr "Monitorando %s e %s"
 msgid "Monitoring %s, %s, %s"
 msgstr "Monitorando %s, %s, %s"
 
-#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js:29
+#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js:26
+#, fuzzy
 msgid "Monitoring APC UPS at host %s, port %d"
-msgid_plural "Monitoring APC UPS at hosts %s, port %d"
-msgstr[0] "Monitorando APC UPS no host %s, porta %d"
-msgstr[1] "Monitorando APC UPS nos hosts %s, porta %d"
+msgstr "Monitorando APC UPS no host %s, porta %d"
 
 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/dhcpleases.js:19
 msgid "Monitoring DHCP leases enabled"
@@ -1343,7 +1342,8 @@ msgstr ""
 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/ipstatistics.js:8
 msgid ""
 "The ipstatistics plugin collects IPv4 and IPv6 statistics to compare them."
-msgstr "O plugin ipstatistics coleta estatísticas IPv4 e IPv6 para compará-las."
+msgstr ""
+"O plugin ipstatistics coleta estatísticas IPv4 e IPv6 para compará-las."
 
 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/iptables.js:9
 msgid ""

diff --git a/applications/luci-app-statistics/po/pt_BR/statistics.po b/applications/luci-app-statistics/po/pt_BR/statistics.po
index 0e4c234e3ec18b9165cbdc8486f080c5aee12969..cc70eda96e7aa6cae59c035e2f14dc39590e2e9c 100644 (file)
--- a/applications/luci-app-statistics/po/pt_BR/statistics.po
+++ b/applications/luci-app-statistics/po/pt_BR/statistics.po
@@ -679,11 +679,10 @@ msgstr "Monitorando %s e %s"
 msgid "Monitoring %s, %s, %s"
 msgstr "Monitorando %s, %s, %s"
 
-#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js:29
+#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js:26
+#, fuzzy
 msgid "Monitoring APC UPS at host %s, port %d"
-msgid_plural "Monitoring APC UPS at hosts %s, port %d"
-msgstr[0] "Monitorando APC UPS no host %s, porta %d"
-msgstr[1] "Monitorando APC UPS nos hosts %s, portas %d"
+msgstr "Monitorando APC UPS no host %s, porta %d"
 
 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/dhcpleases.js:19
 msgid "Monitoring DHCP leases enabled"

diff --git a/applications/luci-app-statistics/po/ro/statistics.po b/applications/luci-app-statistics/po/ro/statistics.po
index df8d024092b007488a6e963dbeea0906150f0946..564eb97e00c641bfbd1b31644994e0a559f757e9 100644 (file)
--- a/applications/luci-app-statistics/po/ro/statistics.po
+++ b/applications/luci-app-statistics/po/ro/statistics.po
@@ -662,12 +662,9 @@ msgstr ""
 msgid "Monitoring %s, %s, %s"
 msgstr ""
 
-#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js:29
+#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js:26
 msgid "Monitoring APC UPS at host %s, port %d"
-msgid_plural "Monitoring APC UPS at hosts %s, port %d"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr ""
 
 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/dhcpleases.js:19
 msgid "Monitoring DHCP leases enabled"

diff --git a/applications/luci-app-statistics/po/ru/statistics.po b/applications/luci-app-statistics/po/ru/statistics.po
index fe7eb548dcaabe9a17b377e01995bbc0ca768797..381a4848b298fd360fb07ac359a15760117fb958 100644 (file)
--- a/applications/luci-app-statistics/po/ru/statistics.po
+++ b/applications/luci-app-statistics/po/ru/statistics.po
@@ -681,12 +681,10 @@ msgstr "Мониторинг %s и %s"
 msgid "Monitoring %s, %s, %s"
 msgstr "Мониторинг %s, %s, %s"
 
-#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js:29
+#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js:26
+#, fuzzy
 msgid "Monitoring APC UPS at host %s, port %d"
-msgid_plural "Monitoring APC UPS at hosts %s, port %d"
-msgstr[0] "Мониторинг APC UPS на узле %s, порт %s"
-msgstr[1] "Мониторинг APC UPS на узлах %s, порт %s"
-msgstr[2] "Мониторинг APC UPS на узлах %s, порт %s"
+msgstr "Мониторинг APC UPS на узле %s, порт %s"
 
 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/dhcpleases.js:19
 msgid "Monitoring DHCP leases enabled"

diff --git a/applications/luci-app-statistics/po/sk/statistics.po b/applications/luci-app-statistics/po/sk/statistics.po
index 011c567416ead61d015da386eef0beffd9ef3acf..c6bade397cfadbf2649ddf60fb82161572236d40 100644 (file)
--- a/applications/luci-app-statistics/po/sk/statistics.po
+++ b/applications/luci-app-statistics/po/sk/statistics.po
@@ -659,12 +659,9 @@ msgstr ""
 msgid "Monitoring %s, %s, %s"
 msgstr ""
 
-#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js:29
+#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js:26
 msgid "Monitoring APC UPS at host %s, port %d"
-msgid_plural "Monitoring APC UPS at hosts %s, port %d"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr ""
 
 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/dhcpleases.js:19
 msgid "Monitoring DHCP leases enabled"

diff --git a/applications/luci-app-statistics/po/sv/statistics.po b/applications/luci-app-statistics/po/sv/statistics.po
index 760da605f9978ff9c3deaf4c95544544b1f39bfd..0e059f01bba5d93632c5205b80cb068393ef29c5 100644 (file)
--- a/applications/luci-app-statistics/po/sv/statistics.po
+++ b/applications/luci-app-statistics/po/sv/statistics.po
@@ -659,11 +659,9 @@ msgstr ""
 msgid "Monitoring %s, %s, %s"
 msgstr ""
 
-#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js:29
+#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js:26
 msgid "Monitoring APC UPS at host %s, port %d"
-msgid_plural "Monitoring APC UPS at hosts %s, port %d"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
 
 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/dhcpleases.js:19
 msgid "Monitoring DHCP leases enabled"

diff --git a/applications/luci-app-statistics/po/templates/statistics.pot b/applications/luci-app-statistics/po/templates/statistics.pot
index ecc0798f153828fd8ad6e4154659702daad87b06..e8d349a735a6b7587e46a65bb743903cb8b2d237 100644 (file)
--- a/applications/luci-app-statistics/po/templates/statistics.pot
+++ b/applications/luci-app-statistics/po/templates/statistics.pot
@@ -648,11 +648,9 @@ msgstr ""
 msgid "Monitoring %s, %s, %s"
 msgstr ""
 
-#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js:29
+#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js:26
 msgid "Monitoring APC UPS at host %s, port %d"
-msgid_plural "Monitoring APC UPS at hosts %s, port %d"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
 
 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/dhcpleases.js:19
 msgid "Monitoring DHCP leases enabled"

diff --git a/applications/luci-app-statistics/po/tr/statistics.po b/applications/luci-app-statistics/po/tr/statistics.po
index bdb563d038dc7f57d72fb0cd44a3a2c36ba3f9c7..b2c10ef29bec6836a8599cc170b43e184d243314 100644 (file)
--- a/applications/luci-app-statistics/po/tr/statistics.po
+++ b/applications/luci-app-statistics/po/tr/statistics.po
@@ -659,10 +659,9 @@ msgstr ""
 msgid "Monitoring %s, %s, %s"
 msgstr ""
 
-#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js:29
+#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js:26
 msgid "Monitoring APC UPS at host %s, port %d"
-msgid_plural "Monitoring APC UPS at hosts %s, port %d"
-msgstr[0] ""
+msgstr ""
 
 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/dhcpleases.js:19
 msgid "Monitoring DHCP leases enabled"

diff --git a/applications/luci-app-statistics/po/uk/statistics.po b/applications/luci-app-statistics/po/uk/statistics.po
index 7a68df3fa14768e8e4bdb69be66a7dd89b58178c..0fdb49acf58b58f019cacc7cc9eb90328367baf5 100644 (file)
--- a/applications/luci-app-statistics/po/uk/statistics.po
+++ b/applications/luci-app-statistics/po/uk/statistics.po
@@ -662,12 +662,9 @@ msgstr ""
 msgid "Monitoring %s, %s, %s"
 msgstr ""
 
-#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js:29
+#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js:26
 msgid "Monitoring APC UPS at host %s, port %d"
-msgid_plural "Monitoring APC UPS at hosts %s, port %d"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr ""
 
 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/dhcpleases.js:19
 msgid "Monitoring DHCP leases enabled"

diff --git a/applications/luci-app-statistics/po/vi/statistics.po b/applications/luci-app-statistics/po/vi/statistics.po
index 72b9ab452098e34013f4be24078d4ffdf038bc3d..640dd981916cc21b16958e0d92b3d8da9e292a0e 100644 (file)
--- a/applications/luci-app-statistics/po/vi/statistics.po
+++ b/applications/luci-app-statistics/po/vi/statistics.po
@@ -670,10 +670,9 @@ msgstr ""
 msgid "Monitoring %s, %s, %s"
 msgstr ""
 
-#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js:29
+#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js:26
 msgid "Monitoring APC UPS at host %s, port %d"
-msgid_plural "Monitoring APC UPS at hosts %s, port %d"
-msgstr[0] ""
+msgstr ""
 
 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/dhcpleases.js:19
 msgid "Monitoring DHCP leases enabled"

diff --git a/applications/luci-app-statistics/po/zh_Hans/statistics.po b/applications/luci-app-statistics/po/zh_Hans/statistics.po
index c8fe04066d0ee42f9bc7c02ad0e9ee69ea5effae..ba98f1098f27d06cb78fb730e7b076eaf0226ff9 100644 (file)
--- a/applications/luci-app-statistics/po/zh_Hans/statistics.po
+++ b/applications/luci-app-statistics/po/zh_Hans/statistics.po
@@ -671,10 +671,10 @@ msgstr "监视 %s 和 %s"
 msgid "Monitoring %s, %s, %s"
 msgstr "监视 %s, %s, %s"
 
-#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js:29
+#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js:26
+#, fuzzy
 msgid "Monitoring APC UPS at host %s, port %d"
-msgid_plural "Monitoring APC UPS at hosts %s, port %d"
-msgstr[0] "在主机 %s，端口 %d 上监视APC UPS"
+msgstr "在主机 %s，端口 %d 上监视APC UPS"
 
 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/dhcpleases.js:19
 msgid "Monitoring DHCP leases enabled"

diff --git a/applications/luci-app-statistics/po/zh_Hant/statistics.po b/applications/luci-app-statistics/po/zh_Hant/statistics.po
index ea4aa1909331a4877ab39a263bfd593c009ee977..ae379c3e216d0eb3e268e4401cb455c10c61eb26 100644 (file)
--- a/applications/luci-app-statistics/po/zh_Hant/statistics.po
+++ b/applications/luci-app-statistics/po/zh_Hant/statistics.po
@@ -670,10 +670,10 @@ msgstr "監視 ％s 和 ％s"
 msgid "Monitoring %s, %s, %s"
 msgstr "監視 %s, %s, %s"
 
-#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js:29
+#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js:26
+#, fuzzy
 msgid "Monitoring APC UPS at host %s, port %d"
-msgid_plural "Monitoring APC UPS at hosts %s, port %d"
-msgstr[0] "正在主機位置 %s 阜號 %d 的位置上監測 APC UPS"
+msgstr "正在主機位置 %s 阜號 %d 的位置上監測 APC UPS"
 
 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/dhcpleases.js:19
 msgid "Monitoring DHCP leases enabled"