Merge remote-tracking branch 'weblate/master'

Fixed weblate conflicts. Again. Hopefully.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

diff --cc applications/luci-app-advanced-reboot/po/fr/advanced-reboot.po
index 894681fd2173247776e456976e5e58d4de9a56c5,7c3f6c0331d2da2d03517c5cfed39b55884329b5..c60d395914635eb69f90d31f550c7da0b55f265d
--- 1/applications/luci-app-advanced-reboot/po/fr/advanced-reboot.po
--- 2/applications/luci-app-advanced-reboot/po/fr/advanced-reboot.po
+++ b/applications/luci-app-advanced-reboot/po/fr/advanced-reboot.po
@@@ -8,9 -8,9 +8,9 @@@ msgstr "
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
  "Plural-Forms: nplurals=2; plural=n > 1;\n"
- "X-Generator: Weblate 3.10-dev\n"
+ "X-Generator: Weblate 3.10\n"
  
 -#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:185
 +#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:189
  #: applications/luci-app-advanced-reboot/luasrc/view/advanced_reboot/advanced_reboot.htm:10
  msgid "Advanced Reboot"
  msgstr "Redémarrage avancé"
@@@ -237,12 -237,12 +237,12 @@@ msgstr "Tentative de montage de la part
  
  #: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:53
  msgid "attempting to unmount alternative partition"
- msgstr ""
+ msgstr "Tentative de démontage de la partition alternative"
  
 -#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:226
 -#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:227
 -#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:240
 -#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:241
 +#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:244
 +#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:245
 +#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:258
 +#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:259
  msgid "to"
  msgstr "vers"
  

diff --cc applications/luci-app-advanced-reboot/po/ro/advanced-reboot.po
index 7a589e33cc94033facec63b68124ad0662332146,4031a0bee3fb38412f6abf8b9c0713ee243442cb..5aefa32a9a868f5325d0828fd2a517dc51328e34
--- 1/applications/luci-app-advanced-reboot/po/ro/advanced-reboot.po
--- 2/applications/luci-app-advanced-reboot/po/ro/advanced-reboot.po
+++ b/applications/luci-app-advanced-reboot/po/ro/advanced-reboot.po
@@@ -9,9 -9,9 +9,9 @@@ msgstr "
  "Content-Transfer-Encoding: 8bit\n"
  "Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
  "20)) ? 1 : 2;\n"
- "X-Generator: Weblate 3.10-dev\n"
+ "X-Generator: Weblate 3.10\n"
  
 -#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:185
 +#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:189
  #: applications/luci-app-advanced-reboot/luasrc/view/advanced_reboot/advanced_reboot.htm:10
  msgid "Advanced Reboot"
  msgstr "Repornire Avansata"
@@@ -50,9 -50,9 +50,9 @@@ msgstr "
  
  #: applications/luci-app-advanced-reboot/luasrc/view/advanced_reboot/applyreboot.htm:45
  msgid "Loading"
- msgstr "Incarcare"
+ msgstr "Încărcare"
  
 -#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:213
 +#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:231
  msgid "No access to fw_printenv or fw_printenv!"
  msgstr "Nu aveți acces la fw_printenv sau fw_printenv!"
  

diff --cc applications/luci-app-banip/po/zh-cn/banip.po
Simple merge

diff --cc applications/luci-app-dcwapd/po/pl/dcwapd.po
Simple merge

diff --cc applications/luci-app-firewall/po/sk/firewall.po
index 43e1aab2acf66cc42e2c1dcb99c7494ca6b47ff7,ecf9f2383693e52aa4df280441e619d6f3997771..4bd90bfc6f33b3f758e0e67ed13ed0ad54f0275b
--- 1/applications/luci-app-firewall/po/sk/firewall.po
--- 2/applications/luci-app-firewall/po/sk/firewall.po
+++ b/applications/luci-app-firewall/po/sk/firewall.po
@@@ -44,10 -48,10 +48,10 @@@ msgstr "
  msgid "Accept output"
  msgstr ""
  
 -#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
 -#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
 +#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:215
 +#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:354
  msgid "Action"
- msgstr ""
+ msgstr "Akcia"
  
  #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:246
  msgid ""

diff --cc applications/luci-app-mwan3/po/fr/mwan3.po
index 49b98641e9944763fb73f663ed215bd02b13a401,668579258bccf9b3fd1752c0f4d78c77a8bb03e3..f71573ba3e64228c453c67003910560186f768bc
--- 1/applications/luci-app-mwan3/po/fr/mwan3.po
--- 2/applications/luci-app-mwan3/po/fr/mwan3.po
+++ b/applications/luci-app-mwan3/po/fr/mwan3.po
@@@ -8,11 -8,11 +8,11 @@@ msgstr "
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
  "Plural-Forms: nplurals=2; plural=n > 1;\n"
- "X-Generator: Weblate 3.10-dev\n"
+ "X-Generator: Weblate 3.10\n"
  
 -#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:177
 -#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:193
 -#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:213
 +#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:176
 +#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:192
 +#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:212
  msgid "%d hour"
  msgstr ""
  
@@@ -78,9 -78,9 +78,9 @@@ msgstr "
  
  #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:58
  msgid "-- Please choose --"
- msgstr ""
+ msgstr "-- Choisir --"
  
 -#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:65
 +#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:66
  msgid ""
  "Acceptable values: 1-100. This many Tracking IP addresses must respond for "
  "the link to be deemed up"

diff --cc applications/luci-app-mwan3/po/ro/mwan3.po
index ebffda62d168d02ef3c0a73ab7e76a7f626b952a,250055efb3e6ec7017528e6217a9fbea1d083da7..db2afc06e147cafd5b559ea5df642e170677bb77
--- 1/applications/luci-app-mwan3/po/ro/mwan3.po
--- 2/applications/luci-app-mwan3/po/ro/mwan3.po
+++ b/applications/luci-app-mwan3/po/ro/mwan3.po
@@@ -9,11 -9,11 +9,11 @@@ msgstr "
  "Content-Transfer-Encoding: 8bit\n"
  "Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
  "20)) ? 1 : 2;\n"
- "X-Generator: Weblate 3.10-dev\n"
+ "X-Generator: Weblate 3.10\n"
  
 -#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:177
 -#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:193
 -#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:213
 +#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:176
 +#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:192
 +#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:212
  msgid "%d hour"
  msgstr ""
  
@@@ -174,10 -174,10 +174,10 @@@ msgstr "
  msgid "Enable ssl tracking"
  msgstr ""
  
 -#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:23
  #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:160
 +#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:23
  msgid "Enabled"
- msgstr ""
+ msgstr "Activat"
  
  #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:64
  msgid ""
@@@ -768,10 -768,10 +768,10 @@@ msgstr "
  #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:164
  #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:49
  msgid "Yes"
- msgstr ""
+ msgstr "Da"
  
 -#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua:29
  #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua:80
 +#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua:29
  #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:73
  msgid "blackhole (drop)"
  msgstr ""

diff --cc applications/luci-app-mwan3/po/sk/mwan3.po
index 97b70bc52ff2a75d35f0ab5644b25ec887a38de0,6727ee12378c46f6742c5d75d2c1d1032b8fbbad..f2c8acabf788ae692593d0af7b009d75a200e9a4
--- 1/applications/luci-app-mwan3/po/sk/mwan3.po
--- 2/applications/luci-app-mwan3/po/sk/mwan3.po
+++ b/applications/luci-app-mwan3/po/sk/mwan3.po
@@@ -3,10 -7,12 +7,12 @@@ msgstr "
  "Language: sk\n"
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
+ "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+ "X-Generator: Weblate 3.10\n"
  
 -#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:177
 -#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:193
 -#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:213
 +#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:176
 +#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:192
 +#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:212
  msgid "%d hour"
  msgstr ""
  
@@@ -167,10 -173,10 +173,10 @@@ msgstr "
  msgid "Enable ssl tracking"
  msgstr ""
  
 -#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:23
  #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:160
 +#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:23
  msgid "Enabled"
- msgstr ""
+ msgstr "Zapnuté"
  
  #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:64
  msgid ""

diff --cc applications/luci-app-noddos/po/fr/noddos.po
Simple merge

diff --cc applications/luci-app-nut/po/fr/nut.po
Simple merge

diff --cc applications/luci-app-olsr/po/fr/olsr.po
index 20e754eabd6941bdee7991b2e84e82735e07d365,3bdb34d5942ea098646944129267515b47b918e3..66dbf3f1677c91ba49a3d9002f23cd37f46c4af3
--- 1/applications/luci-app-olsr/po/fr/olsr.po
--- 2/applications/luci-app-olsr/po/fr/olsr.po
+++ b/applications/luci-app-olsr/po/fr/olsr.po
@@@ -168,14 -168,14 +168,14 @@@ msgstr "
  #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:55
  #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:107
  msgid "Gateway"
- msgstr ""
+ msgstr "Passerelle"
  
 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:42
 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:222
  #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:42
  #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:216
 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:31
  #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:31
 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:42
 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:222
 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:31
  msgid "General Settings"
  msgstr "Paramètres généraux"
  
@@@ -312,13 -312,13 +312,13 @@@ msgstr "
  msgid "IPv4"
  msgstr "IPv4"
  
 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:103
  #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:278
 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:103
  msgid "IPv4 broadcast"
- msgstr ""
+ msgstr "Diffusion IPv4"
  
 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:104
  #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:279
 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:104
  msgid ""
  "IPv4 broadcast address for outgoing OLSR packets. One useful example would "
  "be 255.255.255.255. Default is \"0.0.0.0\", which triggers the usage of the "
@@@ -588,10 -588,10 +588,10 @@@ msgstr "
  
  #: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:26
  msgid "MTU"
- msgstr ""
+ msgstr "MTU"
  
 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:126
  #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:132
 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:126
  msgid "Main IP"
  msgstr ""
  
@@@ -606,17 -606,17 +606,17 @@@ msgstr "
  msgid "Metric"
  msgstr "Métrique"
  
 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:226
 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:376
  #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:220
  #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:357
 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:51
  #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:51
 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:226
 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:376
 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:51
  msgid "Mode"
- msgstr ""
+ msgstr "Mode"
  
 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:71
  #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:246
 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:71
  msgid ""
  "Multiply routes with the factor given here. Allowed values are between 0.01 "
  "and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"

diff --cc applications/luci-app-olsr/po/ro/olsr.po
Simple merge

diff --cc applications/luci-app-olsr/po/sk/olsr.po
index 74df7ec6df8a9c6c321cbf73618308f962279189,eacf0d506deb1df26c85bb4ba4bb0bb007bb48c9..ffcd368220171854edace92a60bfc29ca65e92c0
--- 1/applications/luci-app-olsr/po/sk/olsr.po
--- 2/applications/luci-app-olsr/po/sk/olsr.po
+++ b/applications/luci-app-olsr/po/sk/olsr.po
@@@ -129,10 -133,10 +133,10 @@@ msgstr "
  msgid "Enable this interface."
  msgstr ""
  
 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:249
  #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:249
 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:249
  msgid "Enabled"
- msgstr ""
+ msgstr "Zapnuté"
  
  #: applications/luci-app-olsr/luasrc/view/status-olsr/legend.htm:5
  msgid "Expected retransmission count"

diff --cc applications/luci-app-statistics/po/fr/statistics.po
Simple merge

diff --cc modules/luci-base/po/de/base.po
Simple merge

diff --cc modules/luci-base/po/fr/base.po
index 077be70c8b20bd524a94fea424bf38fdd69f7c2b,9acbfe4cf7cec9e77d564e202f41df3c9a1e4a7b..008715d813e5a30e1a8170060e2fab1aceaa3d0e
--- 1/modules/luci-base/po/fr/base.po
--- 2/modules/luci-base/po/fr/base.po
+++ b/modules/luci-base/po/fr/base.po
@@@ -3541,9 -3543,9 +3548,9 @@@ msgstr "
  msgid "No public keys present yet."
  msgstr ""
  
 -#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:83
 +#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:88
  msgid "No rules in this chain."
- msgstr "Aucune règle dans cette chaîne"
+ msgstr "Aucune règle dans cette chaîne."
  
  #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:55
  msgid "No signal"
@@@ -3845,9 -3847,9 +3852,9 @@@ msgstr "Modifier la table utilisée pou
  
  #: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:3
  msgid "Overview"
- msgstr "Vue d'ensemble"
+ msgstr "Vue d\\'ensemble"
  
 -#: modules/luci-base/htdocs/luci-static/resources/ui.js:1632
 +#: modules/luci-base/htdocs/luci-static/resources/ui.js:1696
  msgid "Overwrite existing file \"%s\" ?"
  msgstr ""
  
@@@ -4836,10 -4838,10 +4843,10 @@@ msgstr "Passer au contenu
  
  #: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:194
  msgid "Skip to navigation"
- msgstr "Skip to navigation"
+ msgstr "Passer à la navigation"
  
  #: modules/luci-base/htdocs/luci-static/resources/network.js:2820
 -#: modules/luci-compat/luasrc/model/network.lua:1427
 +#: modules/luci-compat/luasrc/model/network.lua:1428
  msgid "Software VLAN"
  msgstr ""
  
@@@ -6308,9 -6297,9 +6319,9 @@@ msgstr "pas de lien
  msgid "non-empty value"
  msgstr ""
  
 -#: modules/luci-base/htdocs/luci-static/resources/form.js:1448
 +#: modules/luci-base/htdocs/luci-static/resources/form.js:1454
  msgid "none"
- msgstr "aucun"
+ msgstr "Aucun"
  
  #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:40
  #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:54

diff --cc modules/luci-base/po/ja/base.po
Simple merge

diff --cc modules/luci-base/po/pt/base.po
Simple merge

diff --cc modules/luci-base/po/ro/base.po
index 971937e352ec97350a54f98956946a64272d0d61,544a4470a595b0c0d860a4abef6f2dbe5c895354..da200032b440eb0584783b023feb562b029d3de4
--- 1/modules/luci-base/po/ro/base.po
--- 2/modules/luci-base/po/ro/base.po
+++ b/modules/luci-base/po/ro/base.po
@@@ -3398,10 -3393,10 +3398,10 @@@ msgstr "
  msgid "Next »"
  msgstr "Mai departe »"
  
 -#: modules/luci-base/htdocs/luci-static/resources/form.js:1757
 +#: modules/luci-base/htdocs/luci-static/resources/form.js:1762
  #: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:108
  msgid "No"
- msgstr ""
+ msgstr "Nu"
  
  #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:557
  msgid "No DHCP Server configured for this interface"
@@@ -3761,9 -3756,9 +3761,9 @@@ msgstr "
  
  #: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:3
  msgid "Overview"
- msgstr "Prezentare generala"
+ msgstr "Prezentare generală"
  
 -#: modules/luci-base/htdocs/luci-static/resources/ui.js:1632
 +#: modules/luci-base/htdocs/luci-static/resources/ui.js:1696
  msgid "Overwrite existing file \"%s\" ?"
  msgstr ""
  
@@@ -4563,10 -4558,10 +4563,10 @@@ msgstr "
  #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js:424
  #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:119
  msgid "Save"
- msgstr "Salveaza"
+ msgstr "Salvează"
  
  #: modules/luci-base/htdocs/luci-static/resources/luci.js:2924
 -#: modules/luci-base/htdocs/luci-static/resources/ui.js:2488
 +#: modules/luci-base/htdocs/luci-static/resources/ui.js:2552
  #: modules/luci-compat/luasrc/view/cbi/footer.htm:22
  msgid "Save & Apply"
  msgstr "Salveaza si aplica"
@@@ -5935,10 -5913,10 +5935,10 @@@ msgstr "Scrie cererile DNS primite in s
  msgid "Write system log to file"
  msgstr ""
  
 -#: modules/luci-base/htdocs/luci-static/resources/form.js:1757
 +#: modules/luci-base/htdocs/luci-static/resources/form.js:1762
  #: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:109
  msgid "Yes"
- msgstr ""
+ msgstr "Da"
  
  #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:171
  msgid ""

diff --cc modules/luci-base/po/sk/base.po
index 3e3763a4461b1baf46c4d205ed200afc06e6e81b,d2f607216f4e9b8af5563b3dca9935814b122258..9070a7d1f599f93bc9653ade1feccd8831cb6575
--- 1/modules/luci-base/po/sk/base.po
--- 2/modules/luci-base/po/sk/base.po
+++ b/modules/luci-base/po/sk/base.po
@@@ -18,9 -21,9 +21,9 @@@ msgstr "%.1f dB
  msgid "%d Bit"
  msgstr ""
  
 -#: modules/luci-base/htdocs/luci-static/resources/ui.js:2223
 +#: modules/luci-base/htdocs/luci-static/resources/ui.js:2287
  msgid "%d invalid field(s)"
- msgstr ""
+ msgstr "%d neplatných políčok"
  
  #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:32
  msgid "%s is untagged in multiple VLANs!"
@@@ -1027,11 -1029,10 +1030,11 @@@ msgstr "
  #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:58
  #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2013
  #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js:386
 -#: modules/luci-mod-status/luasrc/view/admin_status/iptables.htm:68
 +#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:315
 +#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:318
  #: themes/luci-theme-material/luasrc/view/themes/material/header.htm:204
  msgid "Collecting data..."
- msgstr ""
+ msgstr "Zbieram dáta..."
  
  #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/processes.js:70
  msgid "Command"
@@@ -1351,9 -1352,9 +1354,9 @@@ msgstr "
  
  #: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:108
  msgid "Description"
- msgstr ""
+ msgstr "Popis"
  
 -#: modules/luci-base/htdocs/luci-static/resources/ui.js:1776
 +#: modules/luci-base/htdocs/luci-static/resources/ui.js:1840
  msgid "Deselect"
  msgstr ""
  

diff --cc modules/luci-base/po/zh-cn/base.po
Simple merge