diff options
| author | Paul Oranje <p.oranje@xs4all.nl> | 2015-05-02 10:44:17 +0200 |
|---|---|---|
| committer | Paul Oranje <p.oranje@xs4all.nl> | 2015-05-02 10:44:17 +0200 |
| commit | ae8e971eef2be269beab9465139869055918d878 (patch) | |
| tree | 5314a2d5b494884271d8900cba6afc348952279b /modules/luci-mod-freifunk | |
| parent | 4742d1c2112ace9d1299c69fb086c1646bb04911 (diff) | |
| parent | 36879e9e8658601dc3e86ff9251da3fc3666efe0 (diff) | |
Merge branch 'master' of https://github.com/openwrt/luci into proto=ipv6+aiccu+fixes
Diffstat (limited to 'modules/luci-mod-freifunk')
| -rw-r--r-- | modules/luci-mod-freifunk/luasrc/view/freifunk/public_status.htm | 8 | ||||
| -rw-r--r-- | modules/luci-mod-freifunk/po/it/freifunk.po | 2 | ||||
| -rw-r--r-- | modules/luci-mod-freifunk/po/zh-cn/freifunk.po | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/modules/luci-mod-freifunk/luasrc/view/freifunk/public_status.htm b/modules/luci-mod-freifunk/luasrc/view/freifunk/public_status.htm index 72bd136c5..42a58f9dd 100644 --- a/modules/luci-mod-freifunk/luasrc/view/freifunk/public_status.htm +++ b/modules/luci-mod-freifunk/luasrc/view/freifunk/public_status.htm @@ -23,12 +23,12 @@ local load = string.format("%.2f, %.2f, %.2f", loads[1] / 65535.0, loads[2] / 65 local mem = string.format( "%.2f MB (%.2f %s, %.2f %s, %.2f %s)", - memory.total / 1024 / 1024, - (memory.total - memory.free) / 1024 / 1024, + meminfo.total / 1024 / 1024, + (meminfo.total - meminfo.free) / 1024 / 1024, tostring(i18n.translate("used")), - memory.free / 1024 / 1024, + meminfo.free / 1024 / 1024, tostring(i18n.translate("free")), - memory.buffered / 1024 / 1024, + meminfo.buffered / 1024 / 1024, tostring(i18n.translate("buffered")) ) diff --git a/modules/luci-mod-freifunk/po/it/freifunk.po b/modules/luci-mod-freifunk/po/it/freifunk.po index 9bbeebc54..26610f75c 100644 --- a/modules/luci-mod-freifunk/po/it/freifunk.po +++ b/modules/luci-mod-freifunk/po/it/freifunk.po @@ -314,7 +314,7 @@ msgid "" msgstr "" "Il servizio OLSRd non è configurato per acquisire i dati di posizione della " "rete. <br/> Assicurarsi che il plugin nameservice sia configurato " -"correttamente e che l'opzione <em>latlon_file</ em> è abilitata." +"correttamente e che l'opzione <em>latlon_file</em> è abilitata." msgid "The installed firmware is the most recent version." msgstr "Il firmware installato è la versione più recente." diff --git a/modules/luci-mod-freifunk/po/zh-cn/freifunk.po b/modules/luci-mod-freifunk/po/zh-cn/freifunk.po index 213058d2c..2d58b1653 100644 --- a/modules/luci-mod-freifunk/po/zh-cn/freifunk.po +++ b/modules/luci-mod-freifunk/po/zh-cn/freifunk.po @@ -297,7 +297,7 @@ msgstr "TX" msgid "" "The <em>libiwinfo</em> package is not installed. You must install this " "component for working wireless configuration!" -msgstr "<em> libiwinfo </ em>包没有安装。进行无线配置您必须安装此组件！" +msgstr "<em> libiwinfo </em>包没有安装。进行无线配置您必须安装此组件！" msgid "" "The OLSRd service is not configured to capture position data from the " @@ -305,7 +305,7 @@ msgid "" "configured and that the <em>latlon_file</em> option is enabled." msgstr "" "没有配置OLSRd从网络获取位置数据。<br />请确保正确配置域名服务插件，且<em> " -"latlon_file </ em>选项被启用。" +"latlon_file </em>选项被启用。" msgid "The installed firmware is the most recent version." msgstr "所安装固件为最新版本。" |