From: Florian Eckert <fe@dev.tdt.de>
Date: Tue, 31 Aug 2021 07:11:26 +0000 (+0200)
Subject: Merge pull request #5298 from vgaetera/status-logs
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=a3385480ee3d68341842b951a780208a91e2ff9b;p=project%2Fluci.git

Merge pull request #5298 from vgaetera/status-logs

luci-mod-status: merge status/dmesg with status/syslog
---

a3385480ee3d68341842b951a780208a91e2ff9b
diff --cc modules/luci-base/po/bg/base.po
index 8b293146b9,93788b56e7..5463e44e0c
--- a/modules/luci-base/po/bg/base.po
+++ b/modules/luci-base/po/bg/base.po
@@@ -1230,11 -1220,11 +1230,11 @@@ msgstr "Променя админист
  #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/channel_analysis.js:376
  #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:164
  msgid "Channel"
 -msgstr ""
 +msgstr "Канал"
  
- #: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:75
+ #: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:81
  msgid "Channel Analysis"
 -msgstr ""
 +msgstr "Анализ на канала"
  
  #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/channel_analysis.js:377
  msgid "Channel Width"
@@@ -1460,11 -1438,11 +1460,11 @@@ msgstr "Опитът за свързвÐ
  
  #: modules/luci-base/htdocs/luci-static/resources/rpc.js:411
  msgid "Connection lost"
 -msgstr ""
 +msgstr "Връзката е загубена"
  
- #: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:130
+ #: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:136
  msgid "Connections"
 -msgstr ""
 +msgstr "Връзки"
  
  #: protocols/luci-proto-bonding/htdocs/luci-static/resources/protocol/bonding.js:378
  msgid "Consider the slave up when all ARP IP targets are reachable (all, 1)"
@@@ -7927,9 -7902,9 +7928,9 @@@ msgstr "
  
  #: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:17
  #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:10
- #: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:118
+ #: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:124
  msgid "Wireless"
 -msgstr ""
 +msgstr "Безжичен"
  
  #: modules/luci-base/htdocs/luci-static/resources/network.js:2988
  #: modules/luci-compat/luasrc/model/network.lua:1419