Rework LuCI build system

 * Rename subdirectories to their repective OpenWrt package names
 * Make each LuCI module its own standalone package
 * Deploy a shared luci.mk which is used by each module Makefile

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

2320 files changed, 10786 insertions, 5555 deletions

diff --git a/applications/freifunk-community/Makefile b/applications/freifunk-community/Makefile
deleted file mode 100644
index 81a96f6a83..0000000000
--- a/applications/freifunk-community/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-include ../../build/config.mk
-include ../../build/module.mk
\ No newline at end of file
diff --git a/applications/luci-ahcp/Makefile b/applications/luci-ahcp/Makefile
deleted file mode 100644
index a70e950adc..0000000000
--- a/applications/luci-ahcp/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-PO = ahcp
-
-include ../../build/config.mk
-include ../../build/module.mk
diff --git a/applications/luci-app-ahcp/Makefile b/applications/luci-app-ahcp/Makefile
new file mode 100644
index 0000000000..bb4d4158d0
--- /dev/null
+++ b/applications/luci-app-ahcp/Makefile
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=LuCI Support for AHCPd
+LUCI_DEPENDS:=+ahcpd
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/applications/luci-ahcp/luasrc/controller/ahcp.lua b/applications/luci-app-ahcp/luasrc/controller/ahcp.lua
index 704ec4f84a..704ec4f84a 100644
--- a/applications/luci-ahcp/luasrc/controller/ahcp.lua
+++ b/applications/luci-app-ahcp/luasrc/controller/ahcp.lua
diff --git a/applications/luci-ahcp/luasrc/model/cbi/ahcp.lua b/applications/luci-app-ahcp/luasrc/model/cbi/ahcp.lua
index a48f8b4b52..a48f8b4b52 100644
--- a/applications/luci-ahcp/luasrc/model/cbi/ahcp.lua
+++ b/applications/luci-app-ahcp/luasrc/model/cbi/ahcp.lua
diff --git a/applications/luci-ahcp/luasrc/view/admin_status/index/ahcp.htm b/applications/luci-app-ahcp/luasrc/view/admin_status/index/ahcp.htm
index ef4cfca56a..ef4cfca56a 100644
--- a/applications/luci-ahcp/luasrc/view/admin_status/index/ahcp.htm
+++ b/applications/luci-app-ahcp/luasrc/view/admin_status/index/ahcp.htm
diff --git a/applications/luci-ahcp/luasrc/view/ahcp_status.htm b/applications/luci-app-ahcp/luasrc/view/ahcp_status.htm
index 88796cb1c5..88796cb1c5 100644
--- a/applications/luci-ahcp/luasrc/view/ahcp_status.htm
+++ b/applications/luci-app-ahcp/luasrc/view/ahcp_status.htm
diff --git a/po/ca/ahcp.po b/applications/luci-app-ahcp/po/ca/ahcp.po
index 89108fd78c..89108fd78c 100644
--- a/po/ca/ahcp.po
+++ b/applications/luci-app-ahcp/po/ca/ahcp.po
diff --git a/po/cs/ahcp.po b/applications/luci-app-ahcp/po/cs/ahcp.po
index 0a9e0afadc..0a9e0afadc 100644
--- a/po/cs/ahcp.po
+++ b/applications/luci-app-ahcp/po/cs/ahcp.po
diff --git a/po/de/ahcp.po b/applications/luci-app-ahcp/po/de/ahcp.po
index 6df34d8d98..6df34d8d98 100644
--- a/po/de/ahcp.po
+++ b/applications/luci-app-ahcp/po/de/ahcp.po
diff --git a/po/el/ahcp.po b/applications/luci-app-ahcp/po/el/ahcp.po
index 0d7d6bd797..0d7d6bd797 100644
--- a/po/el/ahcp.po
+++ b/applications/luci-app-ahcp/po/el/ahcp.po
diff --git a/po/en/ahcp.po b/applications/luci-app-ahcp/po/en/ahcp.po
index 4ad2ab278e..4ad2ab278e 100644
--- a/po/en/ahcp.po
+++ b/applications/luci-app-ahcp/po/en/ahcp.po
diff --git a/po/es/ahcp.po b/applications/luci-app-ahcp/po/es/ahcp.po
index 512606a129..512606a129 100644
--- a/po/es/ahcp.po
+++ b/applications/luci-app-ahcp/po/es/ahcp.po
diff --git a/po/fr/ahcp.po b/applications/luci-app-ahcp/po/fr/ahcp.po
index 1163518078..1163518078 100644
--- a/po/fr/ahcp.po
+++ b/applications/luci-app-ahcp/po/fr/ahcp.po
diff --git a/po/he/ahcp.po b/applications/luci-app-ahcp/po/he/ahcp.po
index 1c45cc8536..1c45cc8536 100644
--- a/po/he/ahcp.po
+++ b/applications/luci-app-ahcp/po/he/ahcp.po
diff --git a/po/hu/ahcp.po b/applications/luci-app-ahcp/po/hu/ahcp.po
index a0a91be3d1..a0a91be3d1 100644
--- a/po/hu/ahcp.po
+++ b/applications/luci-app-ahcp/po/hu/ahcp.po
diff --git a/po/it/ahcp.po b/applications/luci-app-ahcp/po/it/ahcp.po
index 56d9516bd9..56d9516bd9 100644
--- a/po/it/ahcp.po
+++ b/applications/luci-app-ahcp/po/it/ahcp.po
diff --git a/po/ja/ahcp.po b/applications/luci-app-ahcp/po/ja/ahcp.po
index dd78ccdfff..dd78ccdfff 100644
--- a/po/ja/ahcp.po
+++ b/applications/luci-app-ahcp/po/ja/ahcp.po
diff --git a/po/ms/ahcp.po b/applications/luci-app-ahcp/po/ms/ahcp.po
index 0b6963b1ea..0b6963b1ea 100644
--- a/po/ms/ahcp.po
+++ b/applications/luci-app-ahcp/po/ms/ahcp.po
diff --git a/po/no/ahcp.po b/applications/luci-app-ahcp/po/no/ahcp.po
index 4c3bc03aad..4c3bc03aad 100644
--- a/po/no/ahcp.po
+++ b/applications/luci-app-ahcp/po/no/ahcp.po
diff --git a/po/pl/ahcp.po b/applications/luci-app-ahcp/po/pl/ahcp.po
index 5095224940..5095224940 100644
--- a/po/pl/ahcp.po
+++ b/applications/luci-app-ahcp/po/pl/ahcp.po
diff --git a/po/pt_BR/ahcp.po b/applications/luci-app-ahcp/po/pt-br/ahcp.po
index 55ec29cdc7..55ec29cdc7 100644
--- a/po/pt_BR/ahcp.po
+++ b/applications/luci-app-ahcp/po/pt-br/ahcp.po
diff --git a/po/pt/ahcp.po b/applications/luci-app-ahcp/po/pt/ahcp.po
index f96fc453dd..f96fc453dd 100644
--- a/po/pt/ahcp.po
+++ b/applications/luci-app-ahcp/po/pt/ahcp.po
diff --git a/po/ro/ahcp.po b/applications/luci-app-ahcp/po/ro/ahcp.po
index 2882b31fdb..2882b31fdb 100644
--- a/po/ro/ahcp.po
+++ b/applications/luci-app-ahcp/po/ro/ahcp.po
diff --git a/po/ru/ahcp.po b/applications/luci-app-ahcp/po/ru/ahcp.po
index f08cb70877..f08cb70877 100644
--- a/po/ru/ahcp.po
+++ b/applications/luci-app-ahcp/po/ru/ahcp.po
diff --git a/po/sk/ahcp.po b/applications/luci-app-ahcp/po/sk/ahcp.po
index b61849039f..b61849039f 100644
--- a/po/sk/ahcp.po
+++ b/applications/luci-app-ahcp/po/sk/ahcp.po
diff --git a/po/sv/ahcp.po b/applications/luci-app-ahcp/po/sv/ahcp.po
index b5f0b7d6d4..b5f0b7d6d4 100644
--- a/po/sv/ahcp.po
+++ b/applications/luci-app-ahcp/po/sv/ahcp.po
diff --git a/po/templates/ahcp.pot b/applications/luci-app-ahcp/po/templates/ahcp.pot
index ea6bb42524..ea6bb42524 100644
--- a/po/templates/ahcp.pot
+++ b/applications/luci-app-ahcp/po/templates/ahcp.pot
diff --git a/po/templates/asterisk.pot b/applications/luci-app-ahcp/po/templates/asterisk.pot
index e69de29bb2..e69de29bb2 100644
--- a/po/templates/asterisk.pot
+++ b/applications/luci-app-ahcp/po/templates/asterisk.pot
diff --git a/po/templates/base.pot b/applications/luci-app-ahcp/po/templates/base.pot
index f71e6d3263..f71e6d3263 100644
--- a/po/templates/base.pot
+++ b/applications/luci-app-ahcp/po/templates/base.pot
diff --git a/po/templates/commands.pot b/applications/luci-app-ahcp/po/templates/commands.pot
index 5d2ffae6db..5d2ffae6db 100644
--- a/po/templates/commands.pot
+++ b/applications/luci-app-ahcp/po/templates/commands.pot
diff --git a/po/templates/coovachilli.pot b/applications/luci-app-ahcp/po/templates/coovachilli.pot
index c1a2bed344..c1a2bed344 100644
--- a/po/templates/coovachilli.pot
+++ b/applications/luci-app-ahcp/po/templates/coovachilli.pot
diff --git a/po/templates/ddns.pot b/applications/luci-app-ahcp/po/templates/ddns.pot
index c3b8c9367d..c3b8c9367d 100644
--- a/po/templates/ddns.pot
+++ b/applications/luci-app-ahcp/po/templates/ddns.pot
diff --git a/po/templates/diag_core.pot b/applications/luci-app-ahcp/po/templates/diag_core.pot
index 1b34f8381c..1b34f8381c 100644
--- a/po/templates/diag_core.pot
+++ b/applications/luci-app-ahcp/po/templates/diag_core.pot
diff --git a/po/templates/diag_devinfo.pot b/applications/luci-app-ahcp/po/templates/diag_devinfo.pot
index 350466c0d2..350466c0d2 100644
--- a/po/templates/diag_devinfo.pot
+++ b/applications/luci-app-ahcp/po/templates/diag_devinfo.pot
diff --git a/po/templates/ffwizard.pot b/applications/luci-app-ahcp/po/templates/ffwizard.pot
index 3da2ddf62b..3da2ddf62b 100644
--- a/po/templates/ffwizard.pot
+++ b/applications/luci-app-ahcp/po/templates/ffwizard.pot
diff --git a/po/templates/firewall.pot b/applications/luci-app-ahcp/po/templates/firewall.pot
index 402aa6973a..402aa6973a 100644
--- a/po/templates/firewall.pot
+++ b/applications/luci-app-ahcp/po/templates/firewall.pot
diff --git a/po/templates/freifunk-policyrouting.pot b/applications/luci-app-ahcp/po/templates/freifunk-policyrouting.pot
index b4c35c177c..b4c35c177c 100644
--- a/po/templates/freifunk-policyrouting.pot
+++ b/applications/luci-app-ahcp/po/templates/freifunk-policyrouting.pot
diff --git a/po/templates/freifunk.pot b/applications/luci-app-ahcp/po/templates/freifunk.pot
index 0b1cddf7a7..0b1cddf7a7 100644
--- a/po/templates/freifunk.pot
+++ b/applications/luci-app-ahcp/po/templates/freifunk.pot
diff --git a/po/templates/hd_idle.pot b/applications/luci-app-ahcp/po/templates/hd_idle.pot
index 2bf38f1be5..2bf38f1be5 100644
--- a/po/templates/hd_idle.pot
+++ b/applications/luci-app-ahcp/po/templates/hd_idle.pot
diff --git a/po/templates/meshwizard.pot b/applications/luci-app-ahcp/po/templates/meshwizard.pot
index 9dfdec5013..9dfdec5013 100644
--- a/po/templates/meshwizard.pot
+++ b/applications/luci-app-ahcp/po/templates/meshwizard.pot
diff --git a/po/templates/minidlna.pot b/applications/luci-app-ahcp/po/templates/minidlna.pot
index 2b35d1e716..2b35d1e716 100644
--- a/po/templates/minidlna.pot
+++ b/applications/luci-app-ahcp/po/templates/minidlna.pot
diff --git a/po/templates/mmc_over_gpio.pot b/applications/luci-app-ahcp/po/templates/mmc_over_gpio.pot
index 1cc8de33f2..1cc8de33f2 100644
--- a/po/templates/mmc_over_gpio.pot
+++ b/applications/luci-app-ahcp/po/templates/mmc_over_gpio.pot
diff --git a/po/templates/multiwan.pot b/applications/luci-app-ahcp/po/templates/multiwan.pot
index 954eed11da..954eed11da 100644
--- a/po/templates/multiwan.pot
+++ b/applications/luci-app-ahcp/po/templates/multiwan.pot
diff --git a/po/templates/ntpc.pot b/applications/luci-app-ahcp/po/templates/ntpc.pot
index 1ed4c40e47..1ed4c40e47 100644
--- a/po/templates/ntpc.pot
+++ b/applications/luci-app-ahcp/po/templates/ntpc.pot
diff --git a/po/templates/olsr.pot b/applications/luci-app-ahcp/po/templates/olsr.pot
index 6bd63c2a2a..6bd63c2a2a 100644
--- a/po/templates/olsr.pot
+++ b/applications/luci-app-ahcp/po/templates/olsr.pot
diff --git a/po/templates/openvpn.pot b/applications/luci-app-ahcp/po/templates/openvpn.pot
index 001747e294..001747e294 100644
--- a/po/templates/openvpn.pot
+++ b/applications/luci-app-ahcp/po/templates/openvpn.pot
diff --git a/po/templates/p2pblock.pot b/applications/luci-app-ahcp/po/templates/p2pblock.pot
index 6fa5da1100..6fa5da1100 100644
--- a/po/templates/p2pblock.pot
+++ b/applications/luci-app-ahcp/po/templates/p2pblock.pot
diff --git a/po/templates/p910nd.pot b/applications/luci-app-ahcp/po/templates/p910nd.pot
index 3674fdb249..3674fdb249 100644
--- a/po/templates/p910nd.pot
+++ b/applications/luci-app-ahcp/po/templates/p910nd.pot
diff --git a/po/templates/pbx-voicemail.pot b/applications/luci-app-ahcp/po/templates/pbx-voicemail.pot
index 35cdca33ac..35cdca33ac 100644
--- a/po/templates/pbx-voicemail.pot
+++ b/applications/luci-app-ahcp/po/templates/pbx-voicemail.pot
diff --git a/po/templates/pbx.pot b/applications/luci-app-ahcp/po/templates/pbx.pot
index 86dd2eb72d..86dd2eb72d 100644
--- a/po/templates/pbx.pot
+++ b/applications/luci-app-ahcp/po/templates/pbx.pot
diff --git a/po/templates/polipo.pot b/applications/luci-app-ahcp/po/templates/polipo.pot
index beb0bdb774..beb0bdb774 100644
--- a/po/templates/polipo.pot
+++ b/applications/luci-app-ahcp/po/templates/polipo.pot
diff --git a/po/templates/qos.pot b/applications/luci-app-ahcp/po/templates/qos.pot
index 26ea8f7971..26ea8f7971 100644
--- a/po/templates/qos.pot
+++ b/applications/luci-app-ahcp/po/templates/qos.pot
diff --git a/po/templates/radvd.pot b/applications/luci-app-ahcp/po/templates/radvd.pot
index ff9eb547ad..ff9eb547ad 100644
--- a/po/templates/radvd.pot
+++ b/applications/luci-app-ahcp/po/templates/radvd.pot
diff --git a/po/templates/rrdtool.pot b/applications/luci-app-ahcp/po/templates/rrdtool.pot
index 0a105ecd4c..0a105ecd4c 100644
--- a/po/templates/rrdtool.pot
+++ b/applications/luci-app-ahcp/po/templates/rrdtool.pot
diff --git a/po/templates/samba.pot b/applications/luci-app-ahcp/po/templates/samba.pot
index d91400b0c7..d91400b0c7 100644
--- a/po/templates/samba.pot
+++ b/applications/luci-app-ahcp/po/templates/samba.pot
diff --git a/po/templates/splash.pot b/applications/luci-app-ahcp/po/templates/splash.pot
index f29b736915..f29b736915 100644
--- a/po/templates/splash.pot
+++ b/applications/luci-app-ahcp/po/templates/splash.pot
diff --git a/po/templates/statistics.pot b/applications/luci-app-ahcp/po/templates/statistics.pot
index 5f2e9dd2c5..5f2e9dd2c5 100644
--- a/po/templates/statistics.pot
+++ b/applications/luci-app-ahcp/po/templates/statistics.pot
diff --git a/po/templates/tinyproxy.pot b/applications/luci-app-ahcp/po/templates/tinyproxy.pot
index 712fad92aa..712fad92aa 100644
--- a/po/templates/tinyproxy.pot
+++ b/applications/luci-app-ahcp/po/templates/tinyproxy.pot
diff --git a/po/templates/transmission.pot b/applications/luci-app-ahcp/po/templates/transmission.pot
index 5892abcad1..5892abcad1 100644
--- a/po/templates/transmission.pot
+++ b/applications/luci-app-ahcp/po/templates/transmission.pot
diff --git a/po/templates/upnp.pot b/applications/luci-app-ahcp/po/templates/upnp.pot
index 86aaee3437..86aaee3437 100644
--- a/po/templates/upnp.pot
+++ b/applications/luci-app-ahcp/po/templates/upnp.pot
diff --git a/po/templates/ushare.pot b/applications/luci-app-ahcp/po/templates/ushare.pot
index 7e4dbc1548..7e4dbc1548 100644
--- a/po/templates/ushare.pot
+++ b/applications/luci-app-ahcp/po/templates/ushare.pot
diff --git a/po/templates/uvc_streamer.pot b/applications/luci-app-ahcp/po/templates/uvc_streamer.pot
index 08980eb629..08980eb629 100644
--- a/po/templates/uvc_streamer.pot
+++ b/applications/luci-app-ahcp/po/templates/uvc_streamer.pot
diff --git a/po/templates/vnstat.pot b/applications/luci-app-ahcp/po/templates/vnstat.pot
index 4dccf05c7c..4dccf05c7c 100644
--- a/po/templates/vnstat.pot
+++ b/applications/luci-app-ahcp/po/templates/vnstat.pot
diff --git a/po/templates/voice_core.pot b/applications/luci-app-ahcp/po/templates/voice_core.pot
index 64c93ebac6..64c93ebac6 100644
--- a/po/templates/voice_core.pot
+++ b/applications/luci-app-ahcp/po/templates/voice_core.pot
diff --git a/po/templates/voice_diag.pot b/applications/luci-app-ahcp/po/templates/voice_diag.pot
index ba28b45307..ba28b45307 100644
--- a/po/templates/voice_diag.pot
+++ b/applications/luci-app-ahcp/po/templates/voice_diag.pot
diff --git a/po/templates/watchcat.pot b/applications/luci-app-ahcp/po/templates/watchcat.pot
index 490ec5c5e3..490ec5c5e3 100644
--- a/po/templates/watchcat.pot
+++ b/applications/luci-app-ahcp/po/templates/watchcat.pot
diff --git a/po/templates/wol.pot b/applications/luci-app-ahcp/po/templates/wol.pot
index 1305c53889..1305c53889 100644
--- a/po/templates/wol.pot
+++ b/applications/luci-app-ahcp/po/templates/wol.pot
diff --git a/po/templates/wshaper.pot b/applications/luci-app-ahcp/po/templates/wshaper.pot
index 42de011b30..42de011b30 100644
--- a/po/templates/wshaper.pot
+++ b/applications/luci-app-ahcp/po/templates/wshaper.pot
diff --git a/po/tr/ahcp.po b/applications/luci-app-ahcp/po/tr/ahcp.po
index ca33071826..ca33071826 100644
--- a/po/tr/ahcp.po
+++ b/applications/luci-app-ahcp/po/tr/ahcp.po
diff --git a/po/uk/ahcp.po b/applications/luci-app-ahcp/po/uk/ahcp.po
index 764901988a..764901988a 100644
--- a/po/uk/ahcp.po
+++ b/applications/luci-app-ahcp/po/uk/ahcp.po
diff --git a/po/vi/ahcp.po b/applications/luci-app-ahcp/po/vi/ahcp.po
index 1041add8f0..1041add8f0 100644
--- a/po/vi/ahcp.po
+++ b/applications/luci-app-ahcp/po/vi/ahcp.po
diff --git a/po/zh_CN/ahcp.po b/applications/luci-app-ahcp/po/zh-cn/ahcp.po
index 295bbe7f12..295bbe7f12 100644
--- a/po/zh_CN/ahcp.po
+++ b/applications/luci-app-ahcp/po/zh-cn/ahcp.po
diff --git a/po/zh_TW/ahcp.po b/applications/luci-app-ahcp/po/zh-tw/ahcp.po
index dc7f6c5a00..dc7f6c5a00 100644
--- a/po/zh_TW/ahcp.po
+++ b/applications/luci-app-ahcp/po/zh-tw/ahcp.po
diff --git a/applications/luci-ahcp/root/etc/uci-defaults/luci-ahcp b/applications/luci-app-ahcp/root/etc/uci-defaults/luci-ahcp
index f2b2487cac..f2b2487cac 100755
--- a/applications/luci-ahcp/root/etc/uci-defaults/luci-ahcp
+++ b/applications/luci-app-ahcp/root/etc/uci-defaults/luci-ahcp
diff --git a/applications/luci-pbx/root/etc/config/pbx-google b/applications/luci-app-ahcp/src/Makefile
index e69de29bb2..e69de29bb2 100644
--- a/applications/luci-pbx/root/etc/config/pbx-google
+++ b/applications/luci-app-ahcp/src/Makefile
diff --git a/applications/luci-app-asterisk/Makefile b/applications/luci-app-asterisk/Makefile
new file mode 100644
index 0000000000..bb4d4158d0
--- /dev/null
+++ b/applications/luci-app-asterisk/Makefile
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=LuCI Support for AHCPd
+LUCI_DEPENDS:=+ahcpd
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/applications/luci-asterisk/ipkg/postinst b/applications/luci-app-asterisk/ipkg/postinst
index a4fae6df1d..a4fae6df1d 100755
--- a/applications/luci-asterisk/ipkg/postinst
+++ b/applications/luci-app-asterisk/ipkg/postinst
diff --git a/applications/luci-asterisk/luasrc/asterisk.lua b/applications/luci-app-asterisk/luasrc/asterisk.lua
index 15081cc9a4..15081cc9a4 100644
--- a/applications/luci-asterisk/luasrc/asterisk.lua
+++ b/applications/luci-app-asterisk/luasrc/asterisk.lua
diff --git a/applications/luci-asterisk/luasrc/asterisk/cc_idd.lua b/applications/luci-app-asterisk/luasrc/asterisk/cc_idd.lua
index b209b11397..b209b11397 100644
--- a/applications/luci-asterisk/luasrc/asterisk/cc_idd.lua
+++ b/applications/luci-app-asterisk/luasrc/asterisk/cc_idd.lua
diff --git a/applications/luci-asterisk/luasrc/controller/asterisk.lua b/applications/luci-app-asterisk/luasrc/controller/asterisk.lua
index 54b9525e7b..54b9525e7b 100644
--- a/applications/luci-asterisk/luasrc/controller/asterisk.lua
+++ b/applications/luci-app-asterisk/luasrc/controller/asterisk.lua
diff --git a/applications/luci-asterisk/luasrc/model/cbi/asterisk-dialplans.lua b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-dialplans.lua
index 4e4dce06bc..4e4dce06bc 100644
--- a/applications/luci-asterisk/luasrc/model/cbi/asterisk-dialplans.lua
+++ b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-dialplans.lua
diff --git a/applications/luci-asterisk/luasrc/model/cbi/asterisk-iax-connections.lua b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-iax-connections.lua
index 0102c1b937..0102c1b937 100644
--- a/applications/luci-asterisk/luasrc/model/cbi/asterisk-iax-connections.lua
+++ b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-iax-connections.lua
diff --git a/applications/luci-asterisk/luasrc/model/cbi/asterisk-meetme.lua b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-meetme.lua
index 0817445989..0817445989 100644
--- a/applications/luci-asterisk/luasrc/model/cbi/asterisk-meetme.lua
+++ b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-meetme.lua
diff --git a/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-app.lua b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-mod-app.lua
index 0a0a2d512e..0a0a2d512e 100644
--- a/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-app.lua
+++ b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-mod-app.lua
diff --git a/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-cdr.lua b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-mod-cdr.lua
index ee1960d1ba..ee1960d1ba 100644
--- a/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-cdr.lua
+++ b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-mod-cdr.lua
diff --git a/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-chan.lua b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-mod-chan.lua
index 835cbdcfae..835cbdcfae 100644
--- a/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-chan.lua
+++ b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-mod-chan.lua
diff --git a/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-codec.lua b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-mod-codec.lua
index 3c8d95840e..3c8d95840e 100644
--- a/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-codec.lua
+++ b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-mod-codec.lua
diff --git a/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-format.lua b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-mod-format.lua
index da3989b2d4..da3989b2d4 100644
--- a/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-format.lua
+++ b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-mod-format.lua
diff --git a/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-func.lua b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-mod-func.lua
index 7d80641f30..7d80641f30 100644
--- a/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-func.lua
+++ b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-mod-func.lua
diff --git a/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-pbx.lua b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-mod-pbx.lua
index 8b22b5cb2d..8b22b5cb2d 100644
--- a/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-pbx.lua
+++ b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-mod-pbx.lua
diff --git a/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-res-feature.lua b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-mod-res-feature.lua
index 35c5d47607..35c5d47607 100644
--- a/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-res-feature.lua
+++ b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-mod-res-feature.lua
diff --git a/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-res.lua b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-mod-res.lua
index 5ef6bddd49..5ef6bddd49 100644
--- a/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-res.lua
+++ b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-mod-res.lua
diff --git a/applications/luci-asterisk/luasrc/model/cbi/asterisk-sip-connections.lua b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-sip-connections.lua
index efb84a01f7..efb84a01f7 100644
--- a/applications/luci-asterisk/luasrc/model/cbi/asterisk-sip-connections.lua
+++ b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-sip-connections.lua
diff --git a/applications/luci-asterisk/luasrc/model/cbi/asterisk-voice.lua b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-voice.lua
index af0259549a..af0259549a 100644
--- a/applications/luci-asterisk/luasrc/model/cbi/asterisk-voice.lua
+++ b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-voice.lua
diff --git a/applications/luci-asterisk/luasrc/model/cbi/asterisk.lua b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk.lua
index 7580f22ecc..7580f22ecc 100644
--- a/applications/luci-asterisk/luasrc/model/cbi/asterisk.lua
+++ b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk.lua
diff --git a/applications/luci-asterisk/luasrc/model/cbi/asterisk/dialplan_out.lua b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk/dialplan_out.lua
index 3115e10d6b..3115e10d6b 100644
--- a/applications/luci-asterisk/luasrc/model/cbi/asterisk/dialplan_out.lua
+++ b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk/dialplan_out.lua
diff --git a/applications/luci-asterisk/luasrc/model/cbi/asterisk/dialplans.lua b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk/dialplans.lua
index 3a993da456..3a993da456 100644
--- a/applications/luci-asterisk/luasrc/model/cbi/asterisk/dialplans.lua
+++ b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk/dialplans.lua
diff --git a/applications/luci-asterisk/luasrc/model/cbi/asterisk/dialzones.lua b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk/dialzones.lua
index 4867911c54..4867911c54 100644
--- a/applications/luci-asterisk/luasrc/model/cbi/asterisk/dialzones.lua
+++ b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk/dialzones.lua
diff --git a/applications/luci-asterisk/luasrc/model/cbi/asterisk/meetme.lua b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk/meetme.lua
index b02a8f6120..b02a8f6120 100644
--- a/applications/luci-asterisk/luasrc/model/cbi/asterisk/meetme.lua
+++ b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk/meetme.lua
diff --git a/applications/luci-asterisk/luasrc/model/cbi/asterisk/meetme_settings.lua b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk/meetme_settings.lua
index 511d7a71a7..511d7a71a7 100644
--- a/applications/luci-asterisk/luasrc/model/cbi/asterisk/meetme_settings.lua
+++ b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk/meetme_settings.lua
diff --git a/applications/luci-asterisk/luasrc/model/cbi/asterisk/phone_sip.lua b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk/phone_sip.lua
index 49d3a07763..49d3a07763 100644
--- a/applications/luci-asterisk/luasrc/model/cbi/asterisk/phone_sip.lua
+++ b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk/phone_sip.lua
diff --git a/applications/luci-asterisk/luasrc/model/cbi/asterisk/phones.lua b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk/phones.lua
index 7c8f03f000..7c8f03f000 100644
--- a/applications/luci-asterisk/luasrc/model/cbi/asterisk/phones.lua
+++ b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk/phones.lua
diff --git a/applications/luci-asterisk/luasrc/model/cbi/asterisk/trunk_sip.lua b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk/trunk_sip.lua
index e2e73eefbe..e2e73eefbe 100644
--- a/applications/luci-asterisk/luasrc/model/cbi/asterisk/trunk_sip.lua
+++ b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk/trunk_sip.lua
diff --git a/applications/luci-asterisk/luasrc/model/cbi/asterisk/trunks.lua b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk/trunks.lua
index 85527c297c..85527c297c 100644
--- a/applications/luci-asterisk/luasrc/model/cbi/asterisk/trunks.lua
+++ b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk/trunks.lua
diff --git a/applications/luci-asterisk/luasrc/model/cbi/asterisk/voicemail.lua b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk/voicemail.lua
index 5d0de756b3..5d0de756b3 100644
--- a/applications/luci-asterisk/luasrc/model/cbi/asterisk/voicemail.lua
+++ b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk/voicemail.lua
diff --git a/applications/luci-asterisk/luasrc/model/cbi/asterisk/voicemail_settings.lua b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk/voicemail_settings.lua
index cad2adb95f..cad2adb95f 100644
--- a/applications/luci-asterisk/luasrc/model/cbi/asterisk/voicemail_settings.lua
+++ b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk/voicemail_settings.lua
diff --git a/applications/luci-asterisk/luasrc/view/asterisk/cbi/cell.htm b/applications/luci-app-asterisk/luasrc/view/asterisk/cbi/cell.htm
index b5d618ff95..b5d618ff95 100644
--- a/applications/luci-asterisk/luasrc/view/asterisk/cbi/cell.htm
+++ b/applications/luci-app-asterisk/luasrc/view/asterisk/cbi/cell.htm
diff --git a/applications/luci-asterisk/luasrc/view/asterisk/dialplans.htm b/applications/luci-app-asterisk/luasrc/view/asterisk/dialplans.htm
index a46a8db179..a46a8db179 100644
--- a/applications/luci-asterisk/luasrc/view/asterisk/dialplans.htm
+++ b/applications/luci-app-asterisk/luasrc/view/asterisk/dialplans.htm
diff --git a/applications/luci-asterisk/luasrc/view/asterisk/dialzones.htm b/applications/luci-app-asterisk/luasrc/view/asterisk/dialzones.htm
index f93496df8b..f93496df8b 100644
--- a/applications/luci-asterisk/luasrc/view/asterisk/dialzones.htm
+++ b/applications/luci-app-asterisk/luasrc/view/asterisk/dialzones.htm
diff --git a/po/ca/asterisk.po b/applications/luci-app-asterisk/po/ca/asterisk.po
index 9775758e42..9775758e42 100644
--- a/po/ca/asterisk.po
+++ b/applications/luci-app-asterisk/po/ca/asterisk.po
diff --git a/po/cs/asterisk.po b/applications/luci-app-asterisk/po/cs/asterisk.po
index 7341d57cbd..7341d57cbd 100644
--- a/po/cs/asterisk.po
+++ b/applications/luci-app-asterisk/po/cs/asterisk.po
diff --git a/po/de/asterisk.po b/applications/luci-app-asterisk/po/de/asterisk.po
index f289849bd1..f289849bd1 100644
--- a/po/de/asterisk.po
+++ b/applications/luci-app-asterisk/po/de/asterisk.po
diff --git a/po/el/asterisk.po b/applications/luci-app-asterisk/po/el/asterisk.po
index 7a0fee7750..7a0fee7750 100644
--- a/po/el/asterisk.po
+++ b/applications/luci-app-asterisk/po/el/asterisk.po
diff --git a/po/en/asterisk.po b/applications/luci-app-asterisk/po/en/asterisk.po
index e462f56b86..e462f56b86 100644
--- a/po/en/asterisk.po
+++ b/applications/luci-app-asterisk/po/en/asterisk.po
diff --git a/po/es/asterisk.po b/applications/luci-app-asterisk/po/es/asterisk.po
index 8e2fe1e307..8e2fe1e307 100644
--- a/po/es/asterisk.po
+++ b/applications/luci-app-asterisk/po/es/asterisk.po
diff --git a/po/fr/asterisk.po b/applications/luci-app-asterisk/po/fr/asterisk.po
index 75c1d38e43..75c1d38e43 100644
--- a/po/fr/asterisk.po
+++ b/applications/luci-app-asterisk/po/fr/asterisk.po
diff --git a/po/he/asterisk.po b/applications/luci-app-asterisk/po/he/asterisk.po
index 25ed5bb142..25ed5bb142 100644
--- a/po/he/asterisk.po
+++ b/applications/luci-app-asterisk/po/he/asterisk.po
diff --git a/po/hu/asterisk.po b/applications/luci-app-asterisk/po/hu/asterisk.po
index c6a5d81b3e..c6a5d81b3e 100644
--- a/po/hu/asterisk.po
+++ b/applications/luci-app-asterisk/po/hu/asterisk.po
diff --git a/po/it/asterisk.po b/applications/luci-app-asterisk/po/it/asterisk.po
index 9eb24da5d1..9eb24da5d1 100644
--- a/po/it/asterisk.po
+++ b/applications/luci-app-asterisk/po/it/asterisk.po
diff --git a/po/ja/asterisk.po b/applications/luci-app-asterisk/po/ja/asterisk.po
index 98bd10b4a3..98bd10b4a3 100644
--- a/po/ja/asterisk.po
+++ b/applications/luci-app-asterisk/po/ja/asterisk.po
diff --git a/po/ms/asterisk.po b/applications/luci-app-asterisk/po/ms/asterisk.po
index e1260e1ba5..e1260e1ba5 100644
--- a/po/ms/asterisk.po
+++ b/applications/luci-app-asterisk/po/ms/asterisk.po
diff --git a/po/no/asterisk.po b/applications/luci-app-asterisk/po/no/asterisk.po
index 70c448d9fc..70c448d9fc 100644
--- a/po/no/asterisk.po
+++ b/applications/luci-app-asterisk/po/no/asterisk.po
diff --git a/po/pl/asterisk.po b/applications/luci-app-asterisk/po/pl/asterisk.po
index f092853297..f092853297 100644
--- a/po/pl/asterisk.po
+++ b/applications/luci-app-asterisk/po/pl/asterisk.po
diff --git a/po/pt_BR/asterisk.po b/applications/luci-app-asterisk/po/pt-br/asterisk.po
index 07d7052809..07d7052809 100644
--- a/po/pt_BR/asterisk.po
+++ b/applications/luci-app-asterisk/po/pt-br/asterisk.po
diff --git a/po/pt/asterisk.po b/applications/luci-app-asterisk/po/pt/asterisk.po
index d1b98363af..d1b98363af 100644
--- a/po/pt/asterisk.po
+++ b/applications/luci-app-asterisk/po/pt/asterisk.po
diff --git a/po/ro/asterisk.po b/applications/luci-app-asterisk/po/ro/asterisk.po
index e271370070..e271370070 100644
--- a/po/ro/asterisk.po
+++ b/applications/luci-app-asterisk/po/ro/asterisk.po
diff --git a/po/ru/asterisk.po b/applications/luci-app-asterisk/po/ru/asterisk.po
index acedb82e60..acedb82e60 100644
--- a/po/ru/asterisk.po
+++ b/applications/luci-app-asterisk/po/ru/asterisk.po
diff --git a/po/sk/asterisk.po b/applications/luci-app-asterisk/po/sk/asterisk.po
index e69de29bb2..e69de29bb2 100644
--- a/po/sk/asterisk.po
+++ b/applications/luci-app-asterisk/po/sk/asterisk.po
diff --git a/po/sv/asterisk.po b/applications/luci-app-asterisk/po/sv/asterisk.po
index e69de29bb2..e69de29bb2 100644
--- a/po/sv/asterisk.po
+++ b/applications/luci-app-asterisk/po/sv/asterisk.po
diff --git a/applications/luci-pbx/root/etc/config/pbx-voip b/applications/luci-app-asterisk/po/templates/asterisk.pot
index e69de29bb2..e69de29bb2 100644
--- a/applications/luci-pbx/root/etc/config/pbx-voip
+++ b/applications/luci-app-asterisk/po/templates/asterisk.pot
diff --git a/po/tr/asterisk.po b/applications/luci-app-asterisk/po/tr/asterisk.po
index c8b4e58c1a..c8b4e58c1a 100644
--- a/po/tr/asterisk.po
+++ b/applications/luci-app-asterisk/po/tr/asterisk.po
diff --git a/po/uk/asterisk.po b/applications/luci-app-asterisk/po/uk/asterisk.po
index d6dd63e91d..d6dd63e91d 100644
--- a/po/uk/asterisk.po
+++ b/applications/luci-app-asterisk/po/uk/asterisk.po
diff --git a/po/vi/asterisk.po b/applications/luci-app-asterisk/po/vi/asterisk.po
index d1cc6b255f..d1cc6b255f 100644
--- a/po/vi/asterisk.po
+++ b/applications/luci-app-asterisk/po/vi/asterisk.po
diff --git a/po/zh_CN/asterisk.po b/applications/luci-app-asterisk/po/zh-cn/asterisk.po
index 9ef2f1f584..9ef2f1f584 100644
--- a/po/zh_CN/asterisk.po
+++ b/applications/luci-app-asterisk/po/zh-cn/asterisk.po
diff --git a/po/zh_TW/asterisk.po b/applications/luci-app-asterisk/po/zh-tw/asterisk.po
index c7eef9d1bd..c7eef9d1bd 100644
--- a/po/zh_TW/asterisk.po
+++ b/applications/luci-app-asterisk/po/zh-tw/asterisk.po
diff --git a/applications/luci-asterisk/root/etc/config/asterisk b/applications/luci-app-asterisk/root/etc/config/asterisk
index 248409793c..248409793c 100644
--- a/applications/luci-asterisk/root/etc/config/asterisk
+++ b/applications/luci-app-asterisk/root/etc/config/asterisk
diff --git a/applications/luci-asterisk/root/etc/uci-defaults/luci-asterisk b/applications/luci-app-asterisk/root/etc/uci-defaults/luci-asterisk
index e45819f602..e45819f602 100755
--- a/applications/luci-asterisk/root/etc/uci-defaults/luci-asterisk
+++ b/applications/luci-app-asterisk/root/etc/uci-defaults/luci-asterisk
diff --git a/applications/luci-app-commands/Makefile b/applications/luci-app-commands/Makefile
new file mode 100644
index 0000000000..dc5d0ca849
--- /dev/null
+++ b/applications/luci-app-commands/Makefile
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=LuCI Shell Command Module
+LUCI_DEPENDS:=
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/applications/luci-commands/luasrc/controller/commands.lua b/applications/luci-app-commands/luasrc/controller/commands.lua
index b9f0ce8794..b9f0ce8794 100644
--- a/applications/luci-commands/luasrc/controller/commands.lua
+++ b/applications/luci-app-commands/luasrc/controller/commands.lua
diff --git a/applications/luci-commands/luasrc/model/cbi/commands.lua b/applications/luci-app-commands/luasrc/model/cbi/commands.lua
index 1359eb2acd..1359eb2acd 100644
--- a/applications/luci-commands/luasrc/model/cbi/commands.lua
+++ b/applications/luci-app-commands/luasrc/model/cbi/commands.lua
diff --git a/applications/luci-commands/luasrc/view/commands.htm b/applications/luci-app-commands/luasrc/view/commands.htm
index 83792a91fd..83792a91fd 100644
--- a/applications/luci-commands/luasrc/view/commands.htm
+++ b/applications/luci-app-commands/luasrc/view/commands.htm
diff --git a/po/ca/commands.po b/applications/luci-app-commands/po/ca/commands.po
index 9dc23b2f45..9dc23b2f45 100644
--- a/po/ca/commands.po
+++ b/applications/luci-app-commands/po/ca/commands.po
diff --git a/po/cs/commands.po b/applications/luci-app-commands/po/cs/commands.po
index 64949bdef2..64949bdef2 100644
--- a/po/cs/commands.po
+++ b/applications/luci-app-commands/po/cs/commands.po
diff --git a/po/de/commands.po b/applications/luci-app-commands/po/de/commands.po
index 09c56b3990..09c56b3990 100644
--- a/po/de/commands.po
+++ b/applications/luci-app-commands/po/de/commands.po
diff --git a/po/el/commands.po b/applications/luci-app-commands/po/el/commands.po
index 0e9e65d268..0e9e65d268 100644
--- a/po/el/commands.po
+++ b/applications/luci-app-commands/po/el/commands.po
diff --git a/po/en/commands.po b/applications/luci-app-commands/po/en/commands.po
index 754a229c1a..754a229c1a 100644
--- a/po/en/commands.po
+++ b/applications/luci-app-commands/po/en/commands.po
diff --git a/po/es/commands.po b/applications/luci-app-commands/po/es/commands.po
index 80524529b5..80524529b5 100644
--- a/po/es/commands.po
+++ b/applications/luci-app-commands/po/es/commands.po
diff --git a/po/fr/commands.po b/applications/luci-app-commands/po/fr/commands.po
index fac1aff9c4..fac1aff9c4 100644
--- a/po/fr/commands.po
+++ b/applications/luci-app-commands/po/fr/commands.po
diff --git a/po/he/commands.po b/applications/luci-app-commands/po/he/commands.po
index 0e9e65d268..0e9e65d268 100644
--- a/po/he/commands.po
+++ b/applications/luci-app-commands/po/he/commands.po
diff --git a/po/hu/commands.po b/applications/luci-app-commands/po/hu/commands.po
index 5cd0ec7432..5cd0ec7432 100644
--- a/po/hu/commands.po
+++ b/applications/luci-app-commands/po/hu/commands.po
diff --git a/po/it/commands.po b/applications/luci-app-commands/po/it/commands.po
index c14b910fc8..c14b910fc8 100644
--- a/po/it/commands.po
+++ b/applications/luci-app-commands/po/it/commands.po
diff --git a/po/ja/commands.po b/applications/luci-app-commands/po/ja/commands.po
index 3b01a35cfd..3b01a35cfd 100644
--- a/po/ja/commands.po
+++ b/applications/luci-app-commands/po/ja/commands.po
diff --git a/po/ms/commands.po b/applications/luci-app-commands/po/ms/commands.po
index 6fbb9834e9..6fbb9834e9 100644
--- a/po/ms/commands.po
+++ b/applications/luci-app-commands/po/ms/commands.po
diff --git a/po/no/commands.po b/applications/luci-app-commands/po/no/commands.po
index 29b76e5a26..29b76e5a26 100644
--- a/po/no/commands.po
+++ b/applications/luci-app-commands/po/no/commands.po
diff --git a/po/pl/commands.po b/applications/luci-app-commands/po/pl/commands.po
index 6f660ba12d..6f660ba12d 100644
--- a/po/pl/commands.po
+++ b/applications/luci-app-commands/po/pl/commands.po
diff --git a/po/pt_BR/commands.po b/applications/luci-app-commands/po/pt-br/commands.po
index 83c7bd5db5..83c7bd5db5 100644
--- a/po/pt_BR/commands.po
+++ b/applications/luci-app-commands/po/pt-br/commands.po
diff --git a/po/pt/commands.po b/applications/luci-app-commands/po/pt/commands.po
index a46b7d21b8..a46b7d21b8 100644
--- a/po/pt/commands.po
+++ b/applications/luci-app-commands/po/pt/commands.po
diff --git a/po/ro/commands.po b/applications/luci-app-commands/po/ro/commands.po
index 05c4574b9d..05c4574b9d 100644
--- a/po/ro/commands.po
+++ b/applications/luci-app-commands/po/ro/commands.po
diff --git a/po/ru/commands.po b/applications/luci-app-commands/po/ru/commands.po
index 6197231c1c..6197231c1c 100644
--- a/po/ru/commands.po
+++ b/applications/luci-app-commands/po/ru/commands.po
diff --git a/po/sk/commands.po b/applications/luci-app-commands/po/sk/commands.po
index 4133dfb2d5..4133dfb2d5 100644
--- a/po/sk/commands.po
+++ b/applications/luci-app-commands/po/sk/commands.po
diff --git a/po/sv/commands.po b/applications/luci-app-commands/po/sv/commands.po
index 9fbe0afeef..9fbe0afeef 100644
--- a/po/sv/commands.po
+++ b/applications/luci-app-commands/po/sv/commands.po
diff --git a/applications/luci-app-commands/po/templates/commands.pot b/applications/luci-app-commands/po/templates/commands.pot
new file mode 100644
index 0000000000..5d2ffae6db
--- /dev/null
+++ b/applications/luci-app-commands/po/templates/commands.pot
@@ -0,0 +1,84 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "A short textual description of the configured command"
+msgstr ""
+
+msgid "Access command with"
+msgstr ""
+
+msgid ""
+"Allow executing the command and downloading its output without prior "
+"authentication"
+msgstr ""
+
+msgid "Allow the user to provide additional command line arguments"
+msgstr ""
+
+msgid "Arguments:"
+msgstr ""
+
+msgid "Binary data not displayed, download instead."
+msgstr ""
+
+msgid "Code:"
+msgstr ""
+
+msgid "Collecting data..."
+msgstr ""
+
+msgid "Command"
+msgstr ""
+
+msgid "Command failed"
+msgstr ""
+
+msgid "Command line to execute"
+msgstr ""
+
+msgid "Command successful"
+msgstr ""
+
+msgid "Command:"
+msgstr ""
+
+msgid "Configure"
+msgstr ""
+
+msgid "Custom Commands"
+msgstr ""
+
+msgid "Custom arguments"
+msgstr ""
+
+msgid "Dashboard"
+msgstr ""
+
+msgid "Description"
+msgstr ""
+
+msgid "Download"
+msgstr ""
+
+msgid "Failed to execute command!"
+msgstr ""
+
+msgid "Link"
+msgstr ""
+
+msgid "Loading"
+msgstr ""
+
+msgid "Public access"
+msgstr ""
+
+msgid "Run"
+msgstr ""
+
+msgid ""
+"This page allows you to configure custom shell commands which can be easily "
+"invoked from the web interface."
+msgstr ""
+
+msgid "Waiting for command to complete..."
+msgstr ""
diff --git a/po/tr/commands.po b/applications/luci-app-commands/po/tr/commands.po
index 4132274025..4132274025 100644
--- a/po/tr/commands.po
+++ b/applications/luci-app-commands/po/tr/commands.po
diff --git a/po/uk/commands.po b/applications/luci-app-commands/po/uk/commands.po
index 74a19f3742..74a19f3742 100644
--- a/po/uk/commands.po
+++ b/applications/luci-app-commands/po/uk/commands.po
diff --git a/po/vi/commands.po b/applications/luci-app-commands/po/vi/commands.po
index 4132274025..4132274025 100644
--- a/po/vi/commands.po
+++ b/applications/luci-app-commands/po/vi/commands.po
diff --git a/po/zh_CN/commands.po b/applications/luci-app-commands/po/zh-cn/commands.po
index 8b2b032b61..8b2b032b61 100644
--- a/po/zh_CN/commands.po
+++ b/applications/luci-app-commands/po/zh-cn/commands.po
diff --git a/po/zh_TW/commands.po b/applications/luci-app-commands/po/zh-tw/commands.po
index 4377ead46e..4377ead46e 100644
--- a/po/zh_TW/commands.po
+++ b/applications/luci-app-commands/po/zh-tw/commands.po
diff --git a/applications/luci-app-coovachilli/Makefile b/applications/luci-app-coovachilli/Makefile
new file mode 100644
index 0000000000..61209917cd
--- /dev/null
+++ b/applications/luci-app-coovachilli/Makefile
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=LuCI Support for Coova Chilli
+LUCI_DEPENDS:=@BROKEN
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/applications/luci-coovachilli/luasrc/controller/coovachilli.lua b/applications/luci-app-coovachilli/luasrc/controller/coovachilli.lua
index aa0a5cc730..aa0a5cc730 100644
--- a/applications/luci-coovachilli/luasrc/controller/coovachilli.lua
+++ b/applications/luci-app-coovachilli/luasrc/controller/coovachilli.lua
diff --git a/applications/luci-coovachilli/luasrc/model/cbi/coovachilli.lua b/applications/luci-app-coovachilli/luasrc/model/cbi/coovachilli.lua
index e97987dd7e..e97987dd7e 100644
--- a/applications/luci-coovachilli/luasrc/model/cbi/coovachilli.lua
+++ b/applications/luci-app-coovachilli/luasrc/model/cbi/coovachilli.lua
diff --git a/applications/luci-coovachilli/luasrc/model/cbi/coovachilli_auth.lua b/applications/luci-app-coovachilli/luasrc/model/cbi/coovachilli_auth.lua
index 064df2b4fa..064df2b4fa 100644
--- a/applications/luci-coovachilli/luasrc/model/cbi/coovachilli_auth.lua
+++ b/applications/luci-app-coovachilli/luasrc/model/cbi/coovachilli_auth.lua
diff --git a/applications/luci-coovachilli/luasrc/model/cbi/coovachilli_network.lua b/applications/luci-app-coovachilli/luasrc/model/cbi/coovachilli_network.lua
index 2e9768ff3d..2e9768ff3d 100644
--- a/applications/luci-coovachilli/luasrc/model/cbi/coovachilli_network.lua
+++ b/applications/luci-app-coovachilli/luasrc/model/cbi/coovachilli_network.lua
diff --git a/applications/luci-coovachilli/luasrc/model/cbi/coovachilli_radius.lua b/applications/luci-app-coovachilli/luasrc/model/cbi/coovachilli_radius.lua
index ee838b0864..ee838b0864 100644
--- a/applications/luci-coovachilli/luasrc/model/cbi/coovachilli_radius.lua
+++ b/applications/luci-app-coovachilli/luasrc/model/cbi/coovachilli_radius.lua
diff --git a/po/ca/coovachilli.po b/applications/luci-app-coovachilli/po/ca/coovachilli.po
index 085d9917d6..085d9917d6 100644
--- a/po/ca/coovachilli.po
+++ b/applications/luci-app-coovachilli/po/ca/coovachilli.po
diff --git a/po/cs/coovachilli.po b/applications/luci-app-coovachilli/po/cs/coovachilli.po
index 0dc5fc0cd3..0dc5fc0cd3 100644
--- a/po/cs/coovachilli.po
+++ b/applications/luci-app-coovachilli/po/cs/coovachilli.po
diff --git a/po/de/coovachilli.po b/applications/luci-app-coovachilli/po/de/coovachilli.po
index d8322db3ef..d8322db3ef 100644
--- a/po/de/coovachilli.po
+++ b/applications/luci-app-coovachilli/po/de/coovachilli.po
diff --git a/po/el/coovachilli.po b/applications/luci-app-coovachilli/po/el/coovachilli.po
index 90d693d4ab..90d693d4ab 100644
--- a/po/el/coovachilli.po
+++ b/applications/luci-app-coovachilli/po/el/coovachilli.po
diff --git a/po/en/coovachilli.po b/applications/luci-app-coovachilli/po/en/coovachilli.po
index ebaa3452b2..ebaa3452b2 100644
--- a/po/en/coovachilli.po
+++ b/applications/luci-app-coovachilli/po/en/coovachilli.po
diff --git a/po/es/coovachilli.po b/applications/luci-app-coovachilli/po/es/coovachilli.po
index 886da590ef..886da590ef 100644
--- a/po/es/coovachilli.po
+++ b/applications/luci-app-coovachilli/po/es/coovachilli.po
diff --git a/po/fr/coovachilli.po b/applications/luci-app-coovachilli/po/fr/coovachilli.po
index b95bb4491b..b95bb4491b 100644
--- a/po/fr/coovachilli.po
+++ b/applications/luci-app-coovachilli/po/fr/coovachilli.po
diff --git a/po/he/coovachilli.po b/applications/luci-app-coovachilli/po/he/coovachilli.po
index 04efb54da3..04efb54da3 100644
--- a/po/he/coovachilli.po
+++ b/applications/luci-app-coovachilli/po/he/coovachilli.po
diff --git a/po/hu/coovachilli.po b/applications/luci-app-coovachilli/po/hu/coovachilli.po
index 5ac8278f32..5ac8278f32 100644
--- a/po/hu/coovachilli.po
+++ b/applications/luci-app-coovachilli/po/hu/coovachilli.po
diff --git a/po/it/coovachilli.po b/applications/luci-app-coovachilli/po/it/coovachilli.po
index dbf5b9630f..dbf5b9630f 100644
--- a/po/it/coovachilli.po
+++ b/applications/luci-app-coovachilli/po/it/coovachilli.po
diff --git a/po/ja/coovachilli.po b/applications/luci-app-coovachilli/po/ja/coovachilli.po
index 941571256f..941571256f 100644
--- a/po/ja/coovachilli.po
+++ b/applications/luci-app-coovachilli/po/ja/coovachilli.po
diff --git a/po/ms/coovachilli.po b/applications/luci-app-coovachilli/po/ms/coovachilli.po
index d910ef2db8..d910ef2db8 100644
--- a/po/ms/coovachilli.po
+++ b/applications/luci-app-coovachilli/po/ms/coovachilli.po
diff --git a/po/no/coovachilli.po b/applications/luci-app-coovachilli/po/no/coovachilli.po
index f37afdd550..f37afdd550 100644
--- a/po/no/coovachilli.po
+++ b/applications/luci-app-coovachilli/po/no/coovachilli.po
diff --git a/po/pl/coovachilli.po b/applications/luci-app-coovachilli/po/pl/coovachilli.po
index 7dc2ef853a..7dc2ef853a 100644
--- a/po/pl/coovachilli.po
+++ b/applications/luci-app-coovachilli/po/pl/coovachilli.po
diff --git a/po/pt_BR/coovachilli.po b/applications/luci-app-coovachilli/po/pt-br/coovachilli.po
index 9c219812fb..9c219812fb 100644
--- a/po/pt_BR/coovachilli.po
+++ b/applications/luci-app-coovachilli/po/pt-br/coovachilli.po
diff --git a/po/pt/coovachilli.po b/applications/luci-app-coovachilli/po/pt/coovachilli.po
index 115ae03ae0..115ae03ae0 100644
--- a/po/pt/coovachilli.po
+++ b/applications/luci-app-coovachilli/po/pt/coovachilli.po
diff --git a/po/ro/coovachilli.po b/applications/luci-app-coovachilli/po/ro/coovachilli.po
index 8f458bb810..8f458bb810 100644
--- a/po/ro/coovachilli.po
+++ b/applications/luci-app-coovachilli/po/ro/coovachilli.po
diff --git a/po/ru/coovachilli.po b/applications/luci-app-coovachilli/po/ru/coovachilli.po
index 379ff7eaa6..379ff7eaa6 100644
--- a/po/ru/coovachilli.po
+++ b/applications/luci-app-coovachilli/po/ru/coovachilli.po
diff --git a/po/sk/coovachilli.po b/applications/luci-app-coovachilli/po/sk/coovachilli.po
index bb5b1b9ff4..bb5b1b9ff4 100644
--- a/po/sk/coovachilli.po
+++ b/applications/luci-app-coovachilli/po/sk/coovachilli.po
diff --git a/po/sv/coovachilli.po b/applications/luci-app-coovachilli/po/sv/coovachilli.po
index 8695ce5a75..8695ce5a75 100644
--- a/po/sv/coovachilli.po
+++ b/applications/luci-app-coovachilli/po/sv/coovachilli.po
diff --git a/applications/luci-app-coovachilli/po/templates/coovachilli.pot b/applications/luci-app-coovachilli/po/templates/coovachilli.pot
new file mode 100644
index 0000000000..c1a2bed344
--- /dev/null
+++ b/applications/luci-app-coovachilli/po/templates/coovachilli.pot
@@ -0,0 +1,14 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "CoovaChilli"
+msgstr ""
+
+msgid "Network Configuration"
+msgstr ""
+
+msgid "RADIUS configuration"
+msgstr ""
+
+msgid "UAM and MAC Authentication"
+msgstr ""
diff --git a/po/tr/coovachilli.po b/applications/luci-app-coovachilli/po/tr/coovachilli.po
index b70a840384..b70a840384 100644
--- a/po/tr/coovachilli.po
+++ b/applications/luci-app-coovachilli/po/tr/coovachilli.po
diff --git a/po/uk/coovachilli.po b/applications/luci-app-coovachilli/po/uk/coovachilli.po
index 07ffc5562e..07ffc5562e 100644
--- a/po/uk/coovachilli.po
+++ b/applications/luci-app-coovachilli/po/uk/coovachilli.po
diff --git a/po/vi/coovachilli.po b/applications/luci-app-coovachilli/po/vi/coovachilli.po
index 66abf0dc6c..66abf0dc6c 100644
--- a/po/vi/coovachilli.po
+++ b/applications/luci-app-coovachilli/po/vi/coovachilli.po
diff --git a/po/zh_CN/coovachilli.po b/applications/luci-app-coovachilli/po/zh-cn/coovachilli.po
index 7ab003293d..7ab003293d 100644
--- a/po/zh_CN/coovachilli.po
+++ b/applications/luci-app-coovachilli/po/zh-cn/coovachilli.po
diff --git a/po/zh_TW/coovachilli.po b/applications/luci-app-coovachilli/po/zh-tw/coovachilli.po
index aad8a4d7a6..aad8a4d7a6 100644
--- a/po/zh_TW/coovachilli.po
+++ b/applications/luci-app-coovachilli/po/zh-tw/coovachilli.po
diff --git a/applications/luci-coovachilli/root/etc/config/coovachilli b/applications/luci-app-coovachilli/root/etc/config/coovachilli
index 0b6be2c593..0b6be2c593 100644
--- a/applications/luci-coovachilli/root/etc/config/coovachilli
+++ b/applications/luci-app-coovachilli/root/etc/config/coovachilli
diff --git a/applications/luci-ddns/CHANGELOG b/applications/luci-app-ddns/CHANGELOG
index 34c2c8d227..34c2c8d227 100644
--- a/applications/luci-ddns/CHANGELOG
+++ b/applications/luci-app-ddns/CHANGELOG
diff --git a/applications/luci-app-ddns/Makefile b/applications/luci-app-ddns/Makefile
new file mode 100644
index 0000000000..303537ecc2
--- /dev/null
+++ b/applications/luci-app-ddns/Makefile
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=LuCI Support for Dynamic DNS
+LUCI_DEPENDS:=+ddns-scripts
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/applications/luci-ddns/ipkg/postinst b/applications/luci-app-ddns/ipkg/postinst
index a2c13fa34c..a2c13fa34c 100644
--- a/applications/luci-ddns/ipkg/postinst
+++ b/applications/luci-app-ddns/ipkg/postinst
diff --git a/applications/luci-ddns/luasrc/controller/ddns.lua b/applications/luci-app-ddns/luasrc/controller/ddns.lua
index b11388c30c..b11388c30c 100644
--- a/applications/luci-ddns/luasrc/controller/ddns.lua
+++ b/applications/luci-app-ddns/luasrc/controller/ddns.lua
diff --git a/applications/luci-app-ddns/luasrc/model/cbi/ddns/ddns.lua b/applications/luci-app-ddns/luasrc/model/cbi/ddns/ddns.lua
new file mode 100644
index 0000000000..1c7e04a96e
--- /dev/null
+++ b/applications/luci-app-ddns/luasrc/model/cbi/ddns/ddns.lua
@@ -0,0 +1,135 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+Copyright 2013 Manuel Munz <freifunk at somakoma dot de>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+]]--
+
+require("luci.tools.webadmin")
+
+m = Map("ddns", translate("Dynamic DNS"),
+	translate("Dynamic DNS allows that your router can be reached with " ..
+		"a fixed hostname while having a dynamically changing " ..
+		"IP address."))
+
+s = m:section(TypedSection, "service", "")
+s.addremove = true
+s.anonymous = false
+
+s:option(Flag, "enabled", translate("Enable"))
+
+interface = s:option(ListValue, "interface", translate("Event interface"), translate("Network on which the ddns-updater scripts will be started"))
+luci.tools.webadmin.cbi_add_networks(interface)
+interface.default = "wan"
+
+svc = s:option(ListValue, "service_name", translate("Service"))
+svc.rmempty = false
+svc.default = "dyndns.org"
+
+local services = { }
+local fd = io.open("/usr/lib/ddns/services", "r")
+if fd then
+	local ln
+	repeat
+		ln = fd:read("*l")
+		local s = ln and ln:match('^%s*"([^"]+)"')
+		if s then services[#services+1] = s end
+	until not ln
+	fd:close()
+end
+
+local v
+for _, v in luci.util.vspairs(services) do
+	svc:value(v)
+end
+
+function svc.cfgvalue(...)
+	local v = Value.cfgvalue(...)
+	if not v or #v == 0 then
+		return "-"
+	else
+		return v
+	end
+end
+
+function svc.write(self, section, value)
+	if value == "-" then
+		m.uci:delete("ddns", section, self.option)
+	else
+		Value.write(self, section, value)
+	end
+end
+
+svc:value("-", "-- "..translate("custom").." --")
+
+local url = s:option(Value, "update_url", translate("Custom update-URL"))
+url:depends("service_name", "-")
+url.rmempty = true
+
+local hostname = s:option(Value, "domain", translate("Hostname"))
+hostname.rmempty = true
+hostname.default = "mypersonaldomain.dyndns.org"
+hostname.datatype = "host"
+
+local username = s:option(Value, "username", translate("Username"))
+username.rmempty = true
+
+local pw = s:option(Value, "password", translate("Password"))
+pw.rmempty = true
+pw.password = true
+
+require("luci.tools.webadmin")
+
+local src = s:option(ListValue, "ip_source",
+	translate("Source of IP address"))
+src.default = "network"
+src:value("network", translate("network"))
+src:value("interface", translate("interface"))
+src:value("web", translate("URL"))
+
+local iface = s:option(ListValue, "ip_network", translate("Network"))
+iface:depends("ip_source", "network")
+iface.rmempty = true
+iface.default = "wan"
+luci.tools.webadmin.cbi_add_networks(iface)
+iface = s:option(ListValue, "ip_interface", translate("Interface"))
+iface:depends("ip_source", "interface")
+iface.rmempty = true
+for k, v in pairs(luci.sys.net.devices()) do
+	iface:value(v)
+end
+
+local web = s:option(Value, "ip_url", translate("URL"))
+web:depends("ip_source", "web")
+web.default = "http://checkip.dyndns.com/"
+web.rmempty = true
+
+
+local ci = s:option(Value, "check_interval", translate("Check for changed IP every")) 
+ci.datatype = "and(uinteger,min(1))" 
+ci.default = 10 
+
+local unit = s:option(ListValue, "check_unit", translate("Check-time unit"))
+unit.default = "minutes"
+unit:value("minutes", translate("min"))
+unit:value("hours", translate("h"))
+
+fi = s:option(Value, "force_interval", translate("Force update every")) 
+fi.datatype = "and(uinteger,min(1))" 
+fi.default = 72 
+
+local unit = s:option(ListValue, "force_unit", translate("Force-time unit"))
+unit.default = "hours"
+unit:value("minutes", translate("min"))
+unit:value("hours", translate("h"))
+
+
+return m
diff --git a/applications/luci-ddns/luasrc/model/cbi/ddns/detail.lua b/applications/luci-app-ddns/luasrc/model/cbi/ddns/detail.lua
index 748586cdf6..748586cdf6 100644
--- a/applications/luci-ddns/luasrc/model/cbi/ddns/detail.lua
+++ b/applications/luci-app-ddns/luasrc/model/cbi/ddns/detail.lua
diff --git a/applications/luci-ddns/luasrc/model/cbi/ddns/hints.lua b/applications/luci-app-ddns/luasrc/model/cbi/ddns/hints.lua
index dfbc7468cd..dfbc7468cd 100644
--- a/applications/luci-ddns/luasrc/model/cbi/ddns/hints.lua
+++ b/applications/luci-app-ddns/luasrc/model/cbi/ddns/hints.lua
diff --git a/applications/luci-ddns/luasrc/model/cbi/ddns/overview.lua b/applications/luci-app-ddns/luasrc/model/cbi/ddns/overview.lua
index 5d24ee5a04..5d24ee5a04 100644
--- a/applications/luci-ddns/luasrc/model/cbi/ddns/overview.lua
+++ b/applications/luci-app-ddns/luasrc/model/cbi/ddns/overview.lua
diff --git a/applications/luci-ddns/luasrc/tools/ddns.lua b/applications/luci-app-ddns/luasrc/tools/ddns.lua
index ad7b5e86f2..ad7b5e86f2 100644
--- a/applications/luci-ddns/luasrc/tools/ddns.lua
+++ b/applications/luci-app-ddns/luasrc/tools/ddns.lua
diff --git a/applications/luci-ddns/luasrc/view/admin_status/index/ddns.htm b/applications/luci-app-ddns/luasrc/view/admin_status/index/ddns.htm
index 9791065083..9791065083 100644
--- a/applications/luci-ddns/luasrc/view/admin_status/index/ddns.htm
+++ b/applications/luci-app-ddns/luasrc/view/admin_status/index/ddns.htm
diff --git a/applications/luci-ddns/luasrc/view/ddns/detail_logview.htm b/applications/luci-app-ddns/luasrc/view/ddns/detail_logview.htm
index 494b7435cd..494b7435cd 100644
--- a/applications/luci-ddns/luasrc/view/ddns/detail_logview.htm
+++ b/applications/luci-app-ddns/luasrc/view/ddns/detail_logview.htm
diff --git a/applications/luci-ddns/luasrc/view/ddns/detail_lvalue.htm b/applications/luci-app-ddns/luasrc/view/ddns/detail_lvalue.htm
index d516837b2b..d516837b2b 100644
--- a/applications/luci-ddns/luasrc/view/ddns/detail_lvalue.htm
+++ b/applications/luci-app-ddns/luasrc/view/ddns/detail_lvalue.htm
diff --git a/applications/luci-ddns/luasrc/view/ddns/detail_value.htm b/applications/luci-app-ddns/luasrc/view/ddns/detail_value.htm
index 7cb28e282e..7cb28e282e 100644
--- a/applications/luci-ddns/luasrc/view/ddns/detail_value.htm
+++ b/applications/luci-app-ddns/luasrc/view/ddns/detail_value.htm
diff --git a/applications/luci-ddns/luasrc/view/ddns/overview_doubleline.htm b/applications/luci-app-ddns/luasrc/view/ddns/overview_doubleline.htm
index 1d1b4be019..1d1b4be019 100644
--- a/applications/luci-ddns/luasrc/view/ddns/overview_doubleline.htm
+++ b/applications/luci-app-ddns/luasrc/view/ddns/overview_doubleline.htm
diff --git a/applications/luci-ddns/luasrc/view/ddns/overview_enabled.htm b/applications/luci-app-ddns/luasrc/view/ddns/overview_enabled.htm
index 64b3dae455..64b3dae455 100644
--- a/applications/luci-ddns/luasrc/view/ddns/overview_enabled.htm
+++ b/applications/luci-app-ddns/luasrc/view/ddns/overview_enabled.htm
diff --git a/applications/luci-ddns/luasrc/view/ddns/overview_startstop.htm b/applications/luci-app-ddns/luasrc/view/ddns/overview_startstop.htm
index 8255aa63f3..8255aa63f3 100644
--- a/applications/luci-ddns/luasrc/view/ddns/overview_startstop.htm
+++ b/applications/luci-app-ddns/luasrc/view/ddns/overview_startstop.htm
diff --git a/applications/luci-ddns/luasrc/view/ddns/overview_status.htm b/applications/luci-app-ddns/luasrc/view/ddns/overview_status.htm
index 37c54be25f..37c54be25f 100644
--- a/applications/luci-ddns/luasrc/view/ddns/overview_status.htm
+++ b/applications/luci-app-ddns/luasrc/view/ddns/overview_status.htm
diff --git a/applications/luci-ddns/luasrc/view/ddns/system_status.htm b/applications/luci-app-ddns/luasrc/view/ddns/system_status.htm
index db9d1d1a01..db9d1d1a01 100644
--- a/applications/luci-ddns/luasrc/view/ddns/system_status.htm
+++ b/applications/luci-app-ddns/luasrc/view/ddns/system_status.htm
diff --git a/po/ca/ddns.po b/applications/luci-app-ddns/po/ca/ddns.po
index caa3916769..caa3916769 100644
--- a/po/ca/ddns.po
+++ b/applications/luci-app-ddns/po/ca/ddns.po
diff --git a/po/cs/ddns.po b/applications/luci-app-ddns/po/cs/ddns.po
index 15c1e228db..15c1e228db 100644
--- a/po/cs/ddns.po
+++ b/applications/luci-app-ddns/po/cs/ddns.po
diff --git a/po/de/ddns.po b/applications/luci-app-ddns/po/de/ddns.po
index 9706dbd106..9706dbd106 100644
--- a/po/de/ddns.po
+++ b/applications/luci-app-ddns/po/de/ddns.po
diff --git a/po/el/ddns.po b/applications/luci-app-ddns/po/el/ddns.po
index bf12b2395d..bf12b2395d 100644
--- a/po/el/ddns.po
+++ b/applications/luci-app-ddns/po/el/ddns.po
diff --git a/po/en/ddns.po b/applications/luci-app-ddns/po/en/ddns.po
index 66f199ff81..66f199ff81 100644
--- a/po/en/ddns.po
+++ b/applications/luci-app-ddns/po/en/ddns.po
diff --git a/po/es/ddns.po b/applications/luci-app-ddns/po/es/ddns.po
index 2eb721016a..2eb721016a 100644
--- a/po/es/ddns.po
+++ b/applications/luci-app-ddns/po/es/ddns.po
diff --git a/po/fr/ddns.po b/applications/luci-app-ddns/po/fr/ddns.po
index 13615a8e79..13615a8e79 100644
--- a/po/fr/ddns.po
+++ b/applications/luci-app-ddns/po/fr/ddns.po
diff --git a/po/he/ddns.po b/applications/luci-app-ddns/po/he/ddns.po
index 8c23c090e2..8c23c090e2 100644
--- a/po/he/ddns.po
+++ b/applications/luci-app-ddns/po/he/ddns.po
diff --git a/po/hu/ddns.po b/applications/luci-app-ddns/po/hu/ddns.po
index 561b61634c..561b61634c 100644
--- a/po/hu/ddns.po
+++ b/applications/luci-app-ddns/po/hu/ddns.po
diff --git a/po/it/ddns.po b/applications/luci-app-ddns/po/it/ddns.po
index 9b16f39918..9b16f39918 100644
--- a/po/it/ddns.po
+++ b/applications/luci-app-ddns/po/it/ddns.po
diff --git a/po/ja/ddns.po b/applications/luci-app-ddns/po/ja/ddns.po
index 66aff8ca4e..66aff8ca4e 100644
--- a/po/ja/ddns.po
+++ b/applications/luci-app-ddns/po/ja/ddns.po
diff --git a/po/ms/ddns.po b/applications/luci-app-ddns/po/ms/ddns.po
index 7404e255ce..7404e255ce 100644
--- a/po/ms/ddns.po
+++ b/applications/luci-app-ddns/po/ms/ddns.po
diff --git a/po/no/ddns.po b/applications/luci-app-ddns/po/no/ddns.po
index 50b313a196..50b313a196 100644
--- a/po/no/ddns.po
+++ b/applications/luci-app-ddns/po/no/ddns.po
diff --git a/po/pl/ddns.po b/applications/luci-app-ddns/po/pl/ddns.po
index 3909783045..3909783045 100644
--- a/po/pl/ddns.po
+++ b/applications/luci-app-ddns/po/pl/ddns.po
diff --git a/po/pt_BR/ddns.po b/applications/luci-app-ddns/po/pt-br/ddns.po
index 49fa5ceeda..49fa5ceeda 100644
--- a/po/pt_BR/ddns.po
+++ b/applications/luci-app-ddns/po/pt-br/ddns.po
diff --git a/po/pt/ddns.po b/applications/luci-app-ddns/po/pt/ddns.po
index 748097e520..748097e520 100644
--- a/po/pt/ddns.po
+++ b/applications/luci-app-ddns/po/pt/ddns.po
diff --git a/po/ro/ddns.po b/applications/luci-app-ddns/po/ro/ddns.po
index 535b21ed7c..535b21ed7c 100644
--- a/po/ro/ddns.po
+++ b/applications/luci-app-ddns/po/ro/ddns.po
diff --git a/po/ru/ddns.po b/applications/luci-app-ddns/po/ru/ddns.po
index eda11d8190..eda11d8190 100644
--- a/po/ru/ddns.po
+++ b/applications/luci-app-ddns/po/ru/ddns.po
diff --git a/po/sk/ddns.po b/applications/luci-app-ddns/po/sk/ddns.po
index a3e29c635d..a3e29c635d 100644
--- a/po/sk/ddns.po
+++ b/applications/luci-app-ddns/po/sk/ddns.po
diff --git a/po/sv/ddns.po b/applications/luci-app-ddns/po/sv/ddns.po
index 0c6e46f664..0c6e46f664 100644
--- a/po/sv/ddns.po
+++ b/applications/luci-app-ddns/po/sv/ddns.po
diff --git a/applications/luci-app-ddns/po/templates/ddns.pot b/applications/luci-app-ddns/po/templates/ddns.pot
new file mode 100644
index 0000000000..0f77200943
--- /dev/null
+++ b/applications/luci-app-ddns/po/templates/ddns.pot
@@ -0,0 +1,489 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "&"
+msgstr ""
+
+msgid "Basic Settings"
+msgstr ""
+
+msgid ""
+"Below a list of configuration tips for your system to run Dynamic DNS "
+"updates without limitations"
+msgstr ""
+
+msgid ""
+"Below is a list of configured DDNS configurations and their current state."
+"<br />If you want to send updates for IPv4 and IPv6 you need to define two "
+"separate Configurations i.e. 'myddns_ipv4' and 'myddns_ipv6'"
+msgstr ""
+
+msgid ""
+"BusyBox's nslookup and Wget do not support to specify the IP version to use "
+"for communication with DDNS Provider."
+msgstr ""
+
+msgid ""
+"BusyBox's nslookup does not support to specify to use TCP instead of default "
+"UDP when requesting DNS server"
+msgstr ""
+
+msgid "Check Interval"
+msgstr ""
+
+msgid "Check for changed IP every"
+msgstr ""
+
+msgid "Check-time unit"
+msgstr ""
+
+msgid "Config error"
+msgstr ""
+
+msgid "Configure here the details for selected Dynamic DNS service"
+msgstr ""
+
+msgid ""
+"Currently DDNS updates are not started at boot or on interface events.<br /"
+">This is the default if you run DDNS scripts by yourself (i.e. via cron with "
+"force_interval set to '0')"
+msgstr ""
+
+msgid ""
+"Currently DDNS updates are not started at boot or on interface events.<br /"
+">You can start/stop each configuration here. It will run until next reboot."
+msgstr ""
+
+msgid "Custom update script to be used for updating your DDNS Provider."
+msgstr ""
+
+msgid "Custom update-URL"
+msgstr ""
+
+msgid "Custom update-script"
+msgstr ""
+
+msgid "DDNS Autostart disabled"
+msgstr ""
+
+msgid "DDNS Service provider"
+msgstr ""
+
+msgid "DNS requests via TCP not supported"
+msgstr ""
+
+msgid "DNS-Server"
+msgstr ""
+
+msgid "Defines the Web page to read systems IPv4-Address from"
+msgstr ""
+
+msgid "Defines the Web page to read systems IPv6-Address from"
+msgstr ""
+
+msgid "Defines the interface to read systems IP-Address from"
+msgstr ""
+
+msgid "Defines the network to read systems IPv4-Address from"
+msgstr ""
+
+msgid "Defines the network to read systems IPv6-Address from"
+msgstr ""
+
+msgid ""
+"Defines the source to read systems IPv4-Address from, that will be send to "
+"the DDNS provider"
+msgstr ""
+
+msgid ""
+"Defines the source to read systems IPv6-Address from, that will be send to "
+"the DDNS provider"
+msgstr ""
+
+msgid "Defines which IP address 'IPv4/IPv6' is send to the DDNS provider"
+msgstr ""
+
+msgid "Details for"
+msgstr ""
+
+msgid "Dynamic DNS"
+msgstr ""
+
+msgid ""
+"Dynamic DNS allows that your router can be reached with a fixed hostname "
+"while having a dynamically changing IP address."
+msgstr ""
+
+msgid "Enable secure communication with DDNS provider"
+msgstr ""
+
+msgid "Error Retry Counter"
+msgstr ""
+
+msgid "Error Retry Interval"
+msgstr ""
+
+msgid "Event Network"
+msgstr ""
+
+msgid "Event interface"
+msgstr ""
+
+msgid "File not found"
+msgstr ""
+
+msgid "File not found or empty"
+msgstr ""
+
+msgid ""
+"Follow this link<br />You will find more hints to optimize your system to "
+"run DDNS scripts with all options"
+msgstr ""
+
+msgid "Force IP Version"
+msgstr ""
+
+msgid "Force IP Version not supported"
+msgstr ""
+
+msgid "Force Interval"
+msgstr ""
+
+msgid "Force TCP on DNS"
+msgstr ""
+
+msgid "Force update every"
+msgstr ""
+
+msgid "Force-time unit"
+msgstr ""
+
+msgid "Forced IP Version don't matched"
+msgstr ""
+
+msgid "Format"
+msgstr ""
+
+msgid "Format: IP or FQDN"
+msgstr ""
+
+msgid "HTTPS not supported"
+msgstr ""
+
+msgid "Hints"
+msgstr ""
+
+msgid "Hostname/Domain"
+msgstr ""
+
+msgid "IP address source"
+msgstr ""
+
+msgid "IP address version"
+msgstr ""
+
+msgid "IPv6 address must be given in square brackets"
+msgstr ""
+
+msgid ""
+"IPv6 is currently not (fully) supported by this system<br />Please follow "
+"the instructions on OpenWrt's homepage to enable IPv6 support<br />or update "
+"your system to the latest OpenWrt Release"
+msgstr ""
+
+msgid "IPv6 not supported"
+msgstr ""
+
+msgid ""
+"If this service section is disabled it could not be started.<br />Neither "
+"from LuCI interface nor from console"
+msgstr ""
+
+msgid ""
+"In some versions cURL/libcurl in OpenWrt is compiled without proxy support."
+msgstr ""
+
+msgid ""
+"Interval to check for changed IP<br />Values below 5 minutes == 300 seconds "
+"are not supported"
+msgstr ""
+
+msgid ""
+"Interval to force updates send to DDNS Provider<br />Setting this parameter "
+"to 0 will force the script to only run once<br />Values lower 'Check "
+"Interval' except '0' are not supported"
+msgstr ""
+
+msgid "Last Update"
+msgstr ""
+
+msgid "Log File Viewer"
+msgstr ""
+
+msgid "Log to file"
+msgstr ""
+
+msgid "Log to syslog"
+msgstr ""
+
+msgid ""
+"Neither GNU Wget with SSL nor cURL installed to support updates via HTTPS "
+"protocol."
+msgstr ""
+
+msgid "Network on which the ddns-updater scripts will be started"
+msgstr ""
+
+msgid "Never"
+msgstr ""
+
+msgid "Next Update"
+msgstr ""
+
+msgid "No data"
+msgstr ""
+
+msgid "No logging"
+msgstr ""
+
+msgid "OPTIONAL: Force the usage of pure IPv4/IPv6 only communication."
+msgstr ""
+
+msgid "OPTIONAL: Force the use of TCP instead of default UDP on DNS requests."
+msgstr ""
+
+msgid "OPTIONAL: Proxy-Server for detection and updates."
+msgstr ""
+
+msgid "OPTIONAL: Use non-default DNS-Server to detect 'Registered IP'."
+msgstr ""
+
+msgid "Old version of ddns-scripts installed"
+msgstr ""
+
+msgid "On Error the script will retry the failed action after given time"
+msgstr ""
+
+msgid "On Error the script will stop execution after given number of retrys"
+msgstr ""
+
+msgid "PROXY-Server"
+msgstr ""
+
+msgid "PROXY-Server not supported"
+msgstr ""
+
+msgid "Please [Save & Apply] your changes first"
+msgstr ""
+
+msgid "Please press [Read] button"
+msgstr ""
+
+msgid "Process ID"
+msgstr ""
+
+msgid "Read / Reread log file"
+msgstr ""
+
+msgid "Registered IP"
+msgstr ""
+
+msgid "Replaces [DOMAIN] in Update-URL"
+msgstr ""
+
+msgid "Replaces [PASSWORD] in Update-URL"
+msgstr ""
+
+msgid "Replaces [USERNAME] in Update-URL"
+msgstr ""
+
+msgid "Run once"
+msgstr ""
+
+msgid "Script"
+msgstr ""
+
+msgid "Service"
+msgstr ""
+
+msgid "Show more"
+msgstr ""
+
+msgid "Source of IP address"
+msgstr ""
+
+msgid "Start / Stop"
+msgstr ""
+
+msgid "Stopped"
+msgstr ""
+
+msgid "There is no service configured."
+msgstr ""
+
+msgid "Timer Settings"
+msgstr ""
+
+msgid "URL"
+msgstr ""
+
+msgid "URL to detect"
+msgstr ""
+
+msgid "Unknown error"
+msgstr ""
+
+msgid ""
+"Update URL to be used for updating your DDNS Provider.<br />Follow "
+"instructions you will find on their WEB page."
+msgstr ""
+
+msgid "Update error"
+msgstr ""
+
+msgid "Use HTTP Secure"
+msgstr ""
+
+msgid "User defined script to read systems IP-Address"
+msgstr ""
+
+msgid ""
+"Writes detailed messages to log file. File will be truncated automatically."
+msgstr ""
+
+msgid ""
+"Writes log messages to syslog. Critical Errors will always be written to "
+"syslog."
+msgstr ""
+
+msgid "You should install BIND host package for DNS requests."
+msgstr ""
+
+msgid "You should install GNU Wget with SSL (prefered) or cURL package."
+msgstr ""
+
+msgid "You should install GNU Wget with SSL or replace libcurl."
+msgstr ""
+
+msgid "cURL is installed, but libcurl was compiled without proxy support."
+msgstr ""
+
+msgid "cURL without Proxy Support"
+msgstr ""
+
+msgid "can not detect local IP. Please select a different Source combination"
+msgstr ""
+
+msgid "can not resolve host:"
+msgstr ""
+
+msgid "config error"
+msgstr ""
+
+msgid "custom"
+msgstr ""
+
+msgid "days"
+msgstr ""
+
+msgid "directory or path/file"
+msgstr ""
+
+msgid "either url or script could be set"
+msgstr ""
+
+msgid "enable here"
+msgstr ""
+
+msgid "file or directory not found or not 'IGNORE'"
+msgstr ""
+
+msgid "h"
+msgstr ""
+
+msgid "hours"
+msgstr ""
+
+msgid "install update here"
+msgstr ""
+
+msgid "interface"
+msgstr ""
+
+msgid "invalid - Sample"
+msgstr ""
+
+msgid "min"
+msgstr ""
+
+msgid "minimum value '0'"
+msgstr ""
+
+msgid "minimum value '1'"
+msgstr ""
+
+msgid "minimum value 5 minutes == 300 seconds"
+msgstr ""
+
+msgid "minutes"
+msgstr ""
+
+msgid "missing / required"
+msgstr ""
+
+msgid "must be greater or equal 'Check Interval'"
+msgstr ""
+
+msgid "must start with 'http://'"
+msgstr ""
+
+msgid "nc (netcat) can not connect"
+msgstr ""
+
+msgid "network"
+msgstr ""
+
+msgid "never"
+msgstr ""
+
+msgid "no data"
+msgstr ""
+
+msgid "not found or not executable - Sample: '/path/to/script.sh'"
+msgstr ""
+
+msgid "nslookup can not resolve host"
+msgstr ""
+
+msgid "or"
+msgstr ""
+
+msgid "please disable"
+msgstr ""
+
+msgid "please remove entry"
+msgstr ""
+
+msgid "please select 'IPv4' address version"
+msgstr ""
+
+msgid "please select 'IPv4' address version in"
+msgstr ""
+
+msgid "proxy port missing"
+msgstr ""
+
+msgid "seconds"
+msgstr ""
+
+msgid "to run HTTPS without verification of server certificates (insecure)"
+msgstr ""
+
+msgid "unknown error"
+msgstr ""
+
+msgid "unspecific error"
+msgstr ""
+
+msgid "use hostname, FQDN, IPv4- or IPv6-Address"
+msgstr ""
diff --git a/po/tr/ddns.po b/applications/luci-app-ddns/po/tr/ddns.po
index 0d0e97eeb2..0d0e97eeb2 100644
--- a/po/tr/ddns.po
+++ b/applications/luci-app-ddns/po/tr/ddns.po
diff --git a/po/uk/ddns.po b/applications/luci-app-ddns/po/uk/ddns.po
index ba94cdfff3..ba94cdfff3 100644
--- a/po/uk/ddns.po
+++ b/applications/luci-app-ddns/po/uk/ddns.po
diff --git a/po/vi/ddns.po b/applications/luci-app-ddns/po/vi/ddns.po
index d8fa832a07..d8fa832a07 100644
--- a/po/vi/ddns.po
+++ b/applications/luci-app-ddns/po/vi/ddns.po
diff --git a/po/zh_CN/ddns.po b/applications/luci-app-ddns/po/zh-cn/ddns.po
index ad4cbaddcb..ad4cbaddcb 100644
--- a/po/zh_CN/ddns.po
+++ b/applications/luci-app-ddns/po/zh-cn/ddns.po
diff --git a/po/zh_TW/ddns.po b/applications/luci-app-ddns/po/zh-tw/ddns.po
index 96037c6938..96037c6938 100644
--- a/po/zh_TW/ddns.po
+++ b/applications/luci-app-ddns/po/zh-tw/ddns.po
diff --git a/applications/luci-ddns/root/etc/uci-defaults/luci-ddns b/applications/luci-app-ddns/root/etc/uci-defaults/luci-ddns
index 4849e59b7f..5d3f56f984 100755
--- a/applications/luci-ddns/root/etc/uci-defaults/luci-ddns
+++ b/applications/luci-app-ddns/root/etc/uci-defaults/luci-ddns
@@ -1,5 +1,10 @@
 #!/bin/sh
 
+# luci updates are not in sync with ddns-script updates !!!
+# needed because luci update might delete helper script
+# copy dynamic_dns_helper.tmp.sh from ddns-scripts
+cp -f /usr/lib/ddns/dynamic_dns_lucihelper.tmp.sh /usr/lib/ddns/dynamic_dns_lucihelper.sh
+
 # no longer needed for "Save and Apply" to restart ddns
 uci -q batch <<-EOF >/dev/null
 	delete ucitrack.@ddns[-1]
diff --git a/applications/luci-app-ddns/root/usr/lib/ddns/dynamic_dns_lucihelper.sh b/applications/luci-app-ddns/root/usr/lib/ddns/dynamic_dns_lucihelper.sh
new file mode 100755
index 0000000000..1782d1f038
--- /dev/null
+++ b/applications/luci-app-ddns/root/usr/lib/ddns/dynamic_dns_lucihelper.sh
@@ -0,0 +1,82 @@
+#!/bin/sh
+# /usr/lib/ddns/luci_dns_helper.sh
+#
+# Written by Christian Schoenebeck in August 2014 to support:
+# this script is used by luci-app-ddns
+# - getting registered IP
+# - check if possible to get local IP
+# - verifing given DNS- or Proxy-Server
+#
+# variables in small chars are read from /etc/config/ddns
+# variables in big chars are defined inside these scripts as gloval vars
+# variables in big chars beginning with "__" are local defined inside functions only
+# set -vx  	#script debugger
+
+[ $# -lt 2 ] && exit 1
+
+. /usr/lib/ddns/dynamic_dns_functions.sh	# global vars are also defined here
+
+# set -vx  	#script debugger
+
+# preset some variables wrong or not set in dynamic_dns_functions.sh
+SECTION_ID="dynamic_dns_lucihelper"
+LOGFILE="$LOGDIR/$SECTION_ID.log"
+LUCI_HELPER="ACTIV"	# supress verbose and critical logging
+# global variables normally set by reading DDNS UCI configuration
+use_logfile=0
+use_syslog=0
+
+case "$1" in
+	get_registered_ip)
+		local IP
+		domain=$2			# Hostname/Domain
+		use_ipv6=${3:-"0"}		# Use IPv6 - default IPv4
+		force_ipversion=${4:-"0"}	# Force IP Version - default 0 - No
+		force_dnstcp=${5:-"0"}		# Force TCP on DNS - default 0 - No
+		dns_server=${6:-""}		# DNS server - default No DNS
+		get_registered_ip IP
+		[ $? -ne 0 ] && IP=""
+		echo -n "$IP"			# suppress LF
+		;;
+	verify_dns)
+		# $2 == dns-server to verify	# no need for force_dnstcp because
+						# verify with nc (netcat) uses tcp anyway
+		use_ipv6=${3:-"0"}		# Use IPv6 - default IPv4
+		force_ipversion=${4:-"0"}	# Force IP Version - default 0 - No
+		verify_dns "$2"
+		;;
+	verify_proxy)
+		# $2 == proxy string to verify
+		use_ipv6=${3:-"0"}		# Use IPv6 - default IPv4
+		force_ipversion=${4:-"0"}	# Force IP Version - default 0 - No
+		verify_proxy "$2"
+		;;
+	get_local_ip)
+		local IP
+		use_ipv6="$2"			# Use IPv6
+		ip_source="$3"			# IP source
+		ip_network="$4"			# set if source = "network" otherwise "-"
+		ip_url="$5"			# set if source = "web" otherwise "-"
+		ip_interface="$6"		# set if source = "interface" itherwiase "-"
+		ip_script="$7"			# set if source = "script" otherwise "-"
+		proxy="$8"			# proxy if set
+		force_ipversion="0"		# not needed but must be set
+		use_https="0"			# not needed but must be set
+		[ -n "$proxy" -a "$ip_source" == "web" ] && {
+			# proxy defined, used for ip_source=web
+			export HTTP_PROXY="http://$proxy"
+			export HTTPS_PROXY="http://$proxy"
+			export http_proxy="http://$proxy"
+			export https_proxy="http://$proxy"
+		}
+		# don't need IP only the return code
+		[ "$ip_source" == "web" -o  "$ip_source" == "script"] && {		
+			# we wait only 3 seconds for an 
+			# answer from "web" or "script"
+			__timeout 3 -- get_local_ip IP
+		} || get_local_ip IP
+		;;
+	*)	
+		return 1
+		;;
+esac
diff --git a/applications/luci-app-diag-core/Makefile b/applications/luci-app-diag-core/Makefile
new file mode 100644
index 0000000000..ac9f499b12
--- /dev/null
+++ b/applications/luci-app-diag-core/Makefile
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=LuCI Diagnostics Tools (Core)
+LUCI_DEPENDS:=
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/applications/luci-diag-core/luasrc/controller/luci_diag.lua b/applications/luci-app-diag-core/luasrc/controller/luci_diag.lua
index 4a8a020031..4a8a020031 100644
--- a/applications/luci-diag-core/luasrc/controller/luci_diag.lua
+++ b/applications/luci-app-diag-core/luasrc/controller/luci_diag.lua
diff --git a/applications/luci-diag-core/luasrc/view/diag/index.htm b/applications/luci-app-diag-core/luasrc/view/diag/index.htm
index 6b1efa1a88..6b1efa1a88 100644
--- a/applications/luci-diag-core/luasrc/view/diag/index.htm
+++ b/applications/luci-app-diag-core/luasrc/view/diag/index.htm
diff --git a/applications/luci-diag-core/luasrc/view/diag/network_config_index.htm b/applications/luci-app-diag-core/luasrc/view/diag/network_config_index.htm
index 67980a6e74..67980a6e74 100644
--- a/applications/luci-diag-core/luasrc/view/diag/network_config_index.htm
+++ b/applications/luci-app-diag-core/luasrc/view/diag/network_config_index.htm
diff --git a/po/ca/diag_core.po b/applications/luci-app-diag-core/po/ca/diag_core.po
index ffe0ded633..ffe0ded633 100644
--- a/po/ca/diag_core.po
+++ b/applications/luci-app-diag-core/po/ca/diag_core.po
diff --git a/po/cs/diag_core.po b/applications/luci-app-diag-core/po/cs/diag_core.po
index dcfea7750f..dcfea7750f 100644
--- a/po/cs/diag_core.po
+++ b/applications/luci-app-diag-core/po/cs/diag_core.po
diff --git a/po/de/diag_core.po b/applications/luci-app-diag-core/po/de/diag_core.po
index feda0fcb68..feda0fcb68 100644
--- a/po/de/diag_core.po
+++ b/applications/luci-app-diag-core/po/de/diag_core.po
diff --git a/po/el/diag_core.po b/applications/luci-app-diag-core/po/el/diag_core.po
index 8e57c52495..8e57c52495 100644
--- a/po/el/diag_core.po
+++ b/applications/luci-app-diag-core/po/el/diag_core.po
diff --git a/po/en/diag_core.po b/applications/luci-app-diag-core/po/en/diag_core.po
index aa030efb98..aa030efb98 100644
--- a/po/en/diag_core.po
+++ b/applications/luci-app-diag-core/po/en/diag_core.po
diff --git a/po/es/diag_core.po b/applications/luci-app-diag-core/po/es/diag_core.po
index 8b9b3b5817..8b9b3b5817 100644
--- a/po/es/diag_core.po
+++ b/applications/luci-app-diag-core/po/es/diag_core.po
diff --git a/po/fr/diag_core.po b/applications/luci-app-diag-core/po/fr/diag_core.po
index a5b4e6adc1..a5b4e6adc1 100644
--- a/po/fr/diag_core.po
+++ b/applications/luci-app-diag-core/po/fr/diag_core.po
diff --git a/po/he/diag_core.po b/applications/luci-app-diag-core/po/he/diag_core.po
index b4d73e0222..b4d73e0222 100644
--- a/po/he/diag_core.po
+++ b/applications/luci-app-diag-core/po/he/diag_core.po
diff --git a/po/hu/diag_core.po b/applications/luci-app-diag-core/po/hu/diag_core.po
index f9f6e66cf7..f9f6e66cf7 100644
--- a/po/hu/diag_core.po
+++ b/applications/luci-app-diag-core/po/hu/diag_core.po
diff --git a/po/it/diag_core.po b/applications/luci-app-diag-core/po/it/diag_core.po
index 39d4cedff6..39d4cedff6 100644
--- a/po/it/diag_core.po
+++ b/applications/luci-app-diag-core/po/it/diag_core.po
diff --git a/po/ja/diag_core.po b/applications/luci-app-diag-core/po/ja/diag_core.po
index f67657fdf8..f67657fdf8 100644
--- a/po/ja/diag_core.po
+++ b/applications/luci-app-diag-core/po/ja/diag_core.po
diff --git a/po/ms/diag_core.po b/applications/luci-app-diag-core/po/ms/diag_core.po
index 90fefc50d1..90fefc50d1 100644
--- a/po/ms/diag_core.po
+++ b/applications/luci-app-diag-core/po/ms/diag_core.po
diff --git a/po/no/diag_core.po b/applications/luci-app-diag-core/po/no/diag_core.po
index 4955d47352..4955d47352 100644
--- a/po/no/diag_core.po
+++ b/applications/luci-app-diag-core/po/no/diag_core.po
diff --git a/po/pl/diag_core.po b/applications/luci-app-diag-core/po/pl/diag_core.po
index 0935fdbfa0..0935fdbfa0 100644
--- a/po/pl/diag_core.po
+++ b/applications/luci-app-diag-core/po/pl/diag_core.po
diff --git a/po/pt_BR/diag_core.po b/applications/luci-app-diag-core/po/pt-br/diag_core.po
index e27315bc59..e27315bc59 100644
--- a/po/pt_BR/diag_core.po
+++ b/applications/luci-app-diag-core/po/pt-br/diag_core.po
diff --git a/po/pt/diag_core.po b/applications/luci-app-diag-core/po/pt/diag_core.po
index 6083f285e4..6083f285e4 100644
--- a/po/pt/diag_core.po
+++ b/applications/luci-app-diag-core/po/pt/diag_core.po
diff --git a/po/ro/diag_core.po b/applications/luci-app-diag-core/po/ro/diag_core.po
index 604841eb8d..604841eb8d 100644
--- a/po/ro/diag_core.po
+++ b/applications/luci-app-diag-core/po/ro/diag_core.po
diff --git a/po/ru/diag_core.po b/applications/luci-app-diag-core/po/ru/diag_core.po
index 1abaa8c6c8..1abaa8c6c8 100644
--- a/po/ru/diag_core.po
+++ b/applications/luci-app-diag-core/po/ru/diag_core.po
diff --git a/po/sk/diag_core.po b/applications/luci-app-diag-core/po/sk/diag_core.po
index 389516fd12..389516fd12 100644
--- a/po/sk/diag_core.po
+++ b/applications/luci-app-diag-core/po/sk/diag_core.po
diff --git a/po/sv/diag_core.po b/applications/luci-app-diag-core/po/sv/diag_core.po
index dd0a81a644..dd0a81a644 100644
--- a/po/sv/diag_core.po
+++ b/applications/luci-app-diag-core/po/sv/diag_core.po
diff --git a/applications/luci-app-diag-core/po/templates/diag_core.pot b/applications/luci-app-diag-core/po/templates/diag_core.pot
new file mode 100644
index 0000000000..1b34f8381c
--- /dev/null
+++ b/applications/luci-app-diag-core/po/templates/diag_core.pot
@@ -0,0 +1,23 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "Configure Diagnostics"
+msgstr ""
+
+msgid "Diagnostics"
+msgstr ""
+
+msgid ""
+"The diagnostics available under this menu depend on what modules you have "
+"installed on your device."
+msgstr ""
+
+msgid ""
+"The entries in the menu allow you to perform diagnostic tests on your system "
+"to aid in troubleshooting."
+msgstr ""
+
+msgid ""
+"With this menu you can configure network diagnostics, such as network device "
+"scans and ping tests."
+msgstr ""
diff --git a/po/tr/diag_core.po b/applications/luci-app-diag-core/po/tr/diag_core.po
index d0b6211043..d0b6211043 100644
--- a/po/tr/diag_core.po
+++ b/applications/luci-app-diag-core/po/tr/diag_core.po
diff --git a/po/uk/diag_core.po b/applications/luci-app-diag-core/po/uk/diag_core.po
index eae98867cc..eae98867cc 100644
--- a/po/uk/diag_core.po
+++ b/applications/luci-app-diag-core/po/uk/diag_core.po
diff --git a/po/vi/diag_core.po b/applications/luci-app-diag-core/po/vi/diag_core.po
index d0b6211043..d0b6211043 100644
--- a/po/vi/diag_core.po
+++ b/applications/luci-app-diag-core/po/vi/diag_core.po
diff --git a/po/zh_CN/diag_core.po b/applications/luci-app-diag-core/po/zh-cn/diag_core.po
index e857d3d828..e857d3d828 100644
--- a/po/zh_CN/diag_core.po
+++ b/applications/luci-app-diag-core/po/zh-cn/diag_core.po
diff --git a/po/zh_TW/diag_core.po b/applications/luci-app-diag-core/po/zh-tw/diag_core.po
index 3cb3169998..3cb3169998 100644
--- a/po/zh_TW/diag_core.po
+++ b/applications/luci-app-diag-core/po/zh-tw/diag_core.po
diff --git a/applications/luci-app-diag-devinfo/Makefile b/applications/luci-app-diag-devinfo/Makefile
new file mode 100644
index 0000000000..258fdee60b
--- /dev/null
+++ b/applications/luci-app-diag-devinfo/Makefile
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=LuCI Diagnostics Tools (Device Info)
+LUCI_DEPENDS:=+luci-app-diag-core +smap +netdiscover +mac-to-devinfo +httping +smap-to-devinfo +netdiscover-to-devinfo
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/applications/luci-diag-devinfo/luasrc/controller/luci_diag/devinfo_common.lua b/applications/luci-app-diag-devinfo/luasrc/controller/luci_diag/devinfo_common.lua
index c124cd3101..c124cd3101 100644
--- a/applications/luci-diag-devinfo/luasrc/controller/luci_diag/devinfo_common.lua
+++ b/applications/luci-app-diag-devinfo/luasrc/controller/luci_diag/devinfo_common.lua
diff --git a/applications/luci-diag-devinfo/luasrc/controller/luci_diag/luci_diag_devinfo.lua b/applications/luci-app-diag-devinfo/luasrc/controller/luci_diag/luci_diag_devinfo.lua
index 7a2fbd91a3..7a2fbd91a3 100644
--- a/applications/luci-diag-devinfo/luasrc/controller/luci_diag/luci_diag_devinfo.lua
+++ b/applications/luci-app-diag-devinfo/luasrc/controller/luci_diag/luci_diag_devinfo.lua
diff --git a/applications/luci-diag-devinfo/luasrc/controller/luci_diag/netdiscover_common.lua b/applications/luci-app-diag-devinfo/luasrc/controller/luci_diag/netdiscover_common.lua
index 592ca1eaa9..592ca1eaa9 100644
--- a/applications/luci-diag-devinfo/luasrc/controller/luci_diag/netdiscover_common.lua
+++ b/applications/luci-app-diag-devinfo/luasrc/controller/luci_diag/netdiscover_common.lua
diff --git a/applications/luci-diag-devinfo/luasrc/controller/luci_diag/smap_common.lua b/applications/luci-app-diag-devinfo/luasrc/controller/luci_diag/smap_common.lua
index e9aeaa6214..e9aeaa6214 100644
--- a/applications/luci-diag-devinfo/luasrc/controller/luci_diag/smap_common.lua
+++ b/applications/luci-app-diag-devinfo/luasrc/controller/luci_diag/smap_common.lua
diff --git a/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/mactodevinfo.lua b/applications/luci-app-diag-devinfo/luasrc/model/cbi/luci_diag/mactodevinfo.lua
index baf02c89cf..baf02c89cf 100644
--- a/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/mactodevinfo.lua
+++ b/applications/luci-app-diag-devinfo/luasrc/model/cbi/luci_diag/mactodevinfo.lua
diff --git a/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo.lua b/applications/luci-app-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo.lua
index 535c46ba7b..535c46ba7b 100644
--- a/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo.lua
+++ b/applications/luci-app-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo.lua
diff --git a/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo_config.lua b/applications/luci-app-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo_config.lua
index e982bcef6c..e982bcef6c 100644
--- a/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo_config.lua
+++ b/applications/luci-app-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo_config.lua
diff --git a/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo_config_mini.lua b/applications/luci-app-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo_config_mini.lua
index a99ddf9b82..a99ddf9b82 100644
--- a/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo_config_mini.lua
+++ b/applications/luci-app-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo_config_mini.lua
diff --git a/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo_mini.lua b/applications/luci-app-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo_mini.lua
index 271c114d2b..271c114d2b 100644
--- a/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo_mini.lua
+++ b/applications/luci-app-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo_mini.lua
diff --git a/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo.lua b/applications/luci-app-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo.lua
index ff808d9ef7..ff808d9ef7 100644
--- a/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo.lua
+++ b/applications/luci-app-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo.lua
diff --git a/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo_config.lua b/applications/luci-app-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo_config.lua
index 20b6987f2d..20b6987f2d 100644
--- a/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo_config.lua
+++ b/applications/luci-app-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo_config.lua
diff --git a/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo_config_mini.lua b/applications/luci-app-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo_config_mini.lua
index aff4a98aed..aff4a98aed 100644
--- a/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo_config_mini.lua
+++ b/applications/luci-app-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo_config_mini.lua
diff --git a/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo_mini.lua b/applications/luci-app-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo_mini.lua
index 5b7bb0f0a4..5b7bb0f0a4 100644
--- a/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo_mini.lua
+++ b/applications/luci-app-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo_mini.lua
diff --git a/applications/luci-diag-devinfo/luasrc/view/diag/smapsection.htm b/applications/luci-app-diag-devinfo/luasrc/view/diag/smapsection.htm
index 742f659575..742f659575 100644
--- a/applications/luci-diag-devinfo/luasrc/view/diag/smapsection.htm
+++ b/applications/luci-app-diag-devinfo/luasrc/view/diag/smapsection.htm
diff --git a/applications/luci-diag-devinfo/luasrc/view/diag/smapvalue.htm b/applications/luci-app-diag-devinfo/luasrc/view/diag/smapvalue.htm
index 60aa70a300..60aa70a300 100644
--- a/applications/luci-diag-devinfo/luasrc/view/diag/smapvalue.htm
+++ b/applications/luci-app-diag-devinfo/luasrc/view/diag/smapvalue.htm
diff --git a/po/ca/diag_devinfo.po b/applications/luci-app-diag-devinfo/po/ca/diag_devinfo.po
index 9739a4b3b9..9739a4b3b9 100644
--- a/po/ca/diag_devinfo.po
+++ b/applications/luci-app-diag-devinfo/po/ca/diag_devinfo.po
diff --git a/po/cs/diag_devinfo.po b/applications/luci-app-diag-devinfo/po/cs/diag_devinfo.po
index 73fe67e2e4..73fe67e2e4 100644
--- a/po/cs/diag_devinfo.po
+++ b/applications/luci-app-diag-devinfo/po/cs/diag_devinfo.po
diff --git a/po/de/diag_devinfo.po b/applications/luci-app-diag-devinfo/po/de/diag_devinfo.po
index 606358aa00..606358aa00 100644
--- a/po/de/diag_devinfo.po
+++ b/applications/luci-app-diag-devinfo/po/de/diag_devinfo.po
diff --git a/po/el/diag_devinfo.po b/applications/luci-app-diag-devinfo/po/el/diag_devinfo.po
index 7a247cbd92..7a247cbd92 100644
--- a/po/el/diag_devinfo.po
+++ b/applications/luci-app-diag-devinfo/po/el/diag_devinfo.po
diff --git a/po/en/diag_devinfo.po b/applications/luci-app-diag-devinfo/po/en/diag_devinfo.po
index 7adbbeaaf2..7adbbeaaf2 100644
--- a/po/en/diag_devinfo.po
+++ b/applications/luci-app-diag-devinfo/po/en/diag_devinfo.po
diff --git a/po/es/diag_devinfo.po b/applications/luci-app-diag-devinfo/po/es/diag_devinfo.po
index 0b44ff3eb7..0b44ff3eb7 100644
--- a/po/es/diag_devinfo.po
+++ b/applications/luci-app-diag-devinfo/po/es/diag_devinfo.po
diff --git a/po/fr/diag_devinfo.po b/applications/luci-app-diag-devinfo/po/fr/diag_devinfo.po
index e3d3809b9f..e3d3809b9f 100644
--- a/po/fr/diag_devinfo.po
+++ b/applications/luci-app-diag-devinfo/po/fr/diag_devinfo.po
diff --git a/po/he/diag_devinfo.po b/applications/luci-app-diag-devinfo/po/he/diag_devinfo.po
index 7161955d81..7161955d81 100644
--- a/po/he/diag_devinfo.po
+++ b/applications/luci-app-diag-devinfo/po/he/diag_devinfo.po
diff --git a/po/hu/diag_devinfo.po b/applications/luci-app-diag-devinfo/po/hu/diag_devinfo.po
index 52019941b2..52019941b2 100644
--- a/po/hu/diag_devinfo.po
+++ b/applications/luci-app-diag-devinfo/po/hu/diag_devinfo.po
diff --git a/po/it/diag_devinfo.po b/applications/luci-app-diag-devinfo/po/it/diag_devinfo.po
index 767245c84a..767245c84a 100644
--- a/po/it/diag_devinfo.po
+++ b/applications/luci-app-diag-devinfo/po/it/diag_devinfo.po
diff --git a/po/ja/diag_devinfo.po b/applications/luci-app-diag-devinfo/po/ja/diag_devinfo.po
index 1ef3dadc23..1ef3dadc23 100644
--- a/po/ja/diag_devinfo.po
+++ b/applications/luci-app-diag-devinfo/po/ja/diag_devinfo.po
diff --git a/po/ms/diag_devinfo.po b/applications/luci-app-diag-devinfo/po/ms/diag_devinfo.po
index 27d2b46170..27d2b46170 100644
--- a/po/ms/diag_devinfo.po
+++ b/applications/luci-app-diag-devinfo/po/ms/diag_devinfo.po
diff --git a/po/no/diag_devinfo.po b/applications/luci-app-diag-devinfo/po/no/diag_devinfo.po
index 4ada96badb..4ada96badb 100644
--- a/po/no/diag_devinfo.po
+++ b/applications/luci-app-diag-devinfo/po/no/diag_devinfo.po
diff --git a/po/pl/diag_devinfo.po b/applications/luci-app-diag-devinfo/po/pl/diag_devinfo.po
index 32ccdce516..32ccdce516 100644
--- a/po/pl/diag_devinfo.po
+++ b/applications/luci-app-diag-devinfo/po/pl/diag_devinfo.po
diff --git a/po/pt_BR/diag_devinfo.po b/applications/luci-app-diag-devinfo/po/pt-br/diag_devinfo.po
index 53face0d5d..53face0d5d 100644
--- a/po/pt_BR/diag_devinfo.po
+++ b/applications/luci-app-diag-devinfo/po/pt-br/diag_devinfo.po
diff --git a/po/pt/diag_devinfo.po b/applications/luci-app-diag-devinfo/po/pt/diag_devinfo.po
index afe488503d..afe488503d 100644
--- a/po/pt/diag_devinfo.po
+++ b/applications/luci-app-diag-devinfo/po/pt/diag_devinfo.po
diff --git a/po/ro/diag_devinfo.po b/applications/luci-app-diag-devinfo/po/ro/diag_devinfo.po
index eefbd5e18f..eefbd5e18f 100644
--- a/po/ro/diag_devinfo.po
+++ b/applications/luci-app-diag-devinfo/po/ro/diag_devinfo.po
diff --git a/po/ru/diag_devinfo.po b/applications/luci-app-diag-devinfo/po/ru/diag_devinfo.po
index 7531dde444..7531dde444 100644
--- a/po/ru/diag_devinfo.po
+++ b/applications/luci-app-diag-devinfo/po/ru/diag_devinfo.po
diff --git a/po/sk/diag_devinfo.po b/applications/luci-app-diag-devinfo/po/sk/diag_devinfo.po
index 0d62204ca1..0d62204ca1 100644
--- a/po/sk/diag_devinfo.po
+++ b/applications/luci-app-diag-devinfo/po/sk/diag_devinfo.po
diff --git a/po/sv/diag_devinfo.po b/applications/luci-app-diag-devinfo/po/sv/diag_devinfo.po
index cf74fbc77f..cf74fbc77f 100644
--- a/po/sv/diag_devinfo.po
+++ b/applications/luci-app-diag-devinfo/po/sv/diag_devinfo.po
diff --git a/applications/luci-app-diag-devinfo/po/templates/diag_devinfo.pot b/applications/luci-app-diag-devinfo/po/templates/diag_devinfo.pot
new file mode 100644
index 0000000000..350466c0d2
--- /dev/null
+++ b/applications/luci-app-diag-devinfo/po/templates/diag_devinfo.pot
@@ -0,0 +1,199 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "Actions"
+msgstr ""
+
+msgid "Add"
+msgstr ""
+
+msgid "Beginning of MAC address range"
+msgstr ""
+
+msgid "Config Phone Scan"
+msgstr ""
+
+msgid "Configure"
+msgstr ""
+
+msgid "Configure Scans"
+msgstr ""
+
+msgid ""
+"Configure scanning for devices on specified networks. Decreasing 'Timeout', "
+"'Repeat Count', and/or 'Sleep Between Requests' may speed up scans, but also "
+"may fail to find some devices."
+msgstr ""
+
+msgid ""
+"Configure scanning for supported SIP devices on specified networks. "
+"Decreasing 'Timeout', 'Repeat Count', and/or 'Sleep Between Requests' may "
+"speed up scans, but also may fail to find some devices."
+msgstr ""
+
+msgid "Delete"
+msgstr ""
+
+msgid "Device Scan Config"
+msgstr ""
+
+msgid "Device Type"
+msgstr ""
+
+msgid "Devices discovered for"
+msgstr ""
+
+msgid "Devices on Network"
+msgstr ""
+
+msgid "Edit"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "End of MAC address range"
+msgstr ""
+
+msgid "Go to relevant configuration page"
+msgstr ""
+
+msgid "IP Address"
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid "Invalid"
+msgstr ""
+
+msgid "Link to Device"
+msgstr ""
+
+msgid "MAC Address"
+msgstr ""
+
+msgid "MAC Device Info Overrides"
+msgstr ""
+
+msgid "MAC Device Override"
+msgstr ""
+
+msgid "MAC range and information used to override system and IEEE databases"
+msgstr ""
+
+msgid "Milliseconds to sleep between requests (default 100)"
+msgstr ""
+
+msgid "Model"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Network Device Scan"
+msgstr ""
+
+msgid "Network Device Scanning Configuration"
+msgstr ""
+
+msgid "Networks to scan for devices"
+msgstr ""
+
+msgid "Networks to scan for supported devices"
+msgstr ""
+
+msgid "No SIP devices"
+msgstr ""
+
+msgid "No devices detected"
+msgstr ""
+
+msgid "Number of times to send requests (default 1)"
+msgstr ""
+
+msgid "OUI Owner"
+msgstr ""
+
+msgid ""
+"Override the information returned by the MAC to Device Info Script (mac-to-"
+"devinfo) for a specified range of MAC Addresses"
+msgstr ""
+
+msgid "Perform Scans (this can take a few minutes)"
+msgstr ""
+
+msgid "Phone Information"
+msgstr ""
+
+msgid "Phone Scan"
+msgstr ""
+
+msgid "Phone Scanning Configuration"
+msgstr ""
+
+msgid "Phones"
+msgstr ""
+
+msgid "Ports"
+msgstr ""
+
+msgid "Raw"
+msgstr ""
+
+msgid "Repeat Count"
+msgstr ""
+
+msgid "Repeat Scans (this can take a few minutes)"
+msgstr ""
+
+msgid "SIP Device Information"
+msgstr ""
+
+msgid "SIP Device Scan"
+msgstr ""
+
+msgid "SIP Device Scanning Configuration"
+msgstr ""
+
+msgid "SIP Devices on Network"
+msgstr ""
+
+msgid "SIP devices discovered for"
+msgstr ""
+
+msgid "Scan for devices on specified networks."
+msgstr ""
+
+msgid "Scan for supported SIP devices on specified networks."
+msgstr ""
+
+msgid "Scanning Configuration"
+msgstr ""
+
+msgid "Scans for devices on specified networks."
+msgstr ""
+
+msgid "Sleep Between Requests"
+msgstr ""
+
+msgid "Subnet"
+msgstr ""
+
+msgid "This section contains no values yet"
+msgstr ""
+
+msgid "Time to wait for responses in seconds (default 10)"
+msgstr ""
+
+msgid "Timeout"
+msgstr ""
+
+msgid "Use Configuration"
+msgstr ""
+
+msgid "Vendor"
+msgstr ""
+
+msgid "check other networks"
+msgstr ""
diff --git a/po/tr/diag_devinfo.po b/applications/luci-app-diag-devinfo/po/tr/diag_devinfo.po
index 32516758bc..32516758bc 100644
--- a/po/tr/diag_devinfo.po
+++ b/applications/luci-app-diag-devinfo/po/tr/diag_devinfo.po
diff --git a/po/uk/diag_devinfo.po b/applications/luci-app-diag-devinfo/po/uk/diag_devinfo.po
index 03f49eb065..03f49eb065 100644
--- a/po/uk/diag_devinfo.po
+++ b/applications/luci-app-diag-devinfo/po/uk/diag_devinfo.po
diff --git a/po/vi/diag_devinfo.po b/applications/luci-app-diag-devinfo/po/vi/diag_devinfo.po
index 32516758bc..32516758bc 100644
--- a/po/vi/diag_devinfo.po
+++ b/applications/luci-app-diag-devinfo/po/vi/diag_devinfo.po
diff --git a/po/zh_CN/diag_devinfo.po b/applications/luci-app-diag-devinfo/po/zh-cn/diag_devinfo.po
index fe4d241579..fe4d241579 100644
--- a/po/zh_CN/diag_devinfo.po
+++ b/applications/luci-app-diag-devinfo/po/zh-cn/diag_devinfo.po
diff --git a/po/zh_TW/diag_devinfo.po b/applications/luci-app-diag-devinfo/po/zh-tw/diag_devinfo.po
index fe14f68d7a..fe14f68d7a 100644
--- a/po/zh_TW/diag_devinfo.po
+++ b/applications/luci-app-diag-devinfo/po/zh-tw/diag_devinfo.po
diff --git a/applications/luci-diag-devinfo/root/etc/config/luci_devinfo b/applications/luci-app-diag-devinfo/root/etc/config/luci_devinfo
index 1bcdc198c0..1bcdc198c0 100644
--- a/applications/luci-diag-devinfo/root/etc/config/luci_devinfo
+++ b/applications/luci-app-diag-devinfo/root/etc/config/luci_devinfo
diff --git a/applications/luci-app-dump1090/Makefile b/applications/luci-app-dump1090/Makefile
new file mode 100644
index 0000000000..e6abd44b39
--- /dev/null
+++ b/applications/luci-app-dump1090/Makefile
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=LuCI Support for dump1090
+LUCI_DEPENDS:=+dump1090
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/applications/luci-dump1090/luasrc/controller/dump1090.lua b/applications/luci-app-dump1090/luasrc/controller/dump1090.lua
index c29c22fc60..c29c22fc60 100644
--- a/applications/luci-dump1090/luasrc/controller/dump1090.lua
+++ b/applications/luci-app-dump1090/luasrc/controller/dump1090.lua
diff --git a/applications/luci-dump1090/luasrc/model/cbi/dump1090.lua b/applications/luci-app-dump1090/luasrc/model/cbi/dump1090.lua
index e9ed336c13..e9ed336c13 100644
--- a/applications/luci-dump1090/luasrc/model/cbi/dump1090.lua
+++ b/applications/luci-app-dump1090/luasrc/model/cbi/dump1090.lua
diff --git a/applications/luci-dump1090/root/etc/uci-defaults/luci-dump1090 b/applications/luci-app-dump1090/root/etc/uci-defaults/luci-dump1090
index 4475d2fb93..4475d2fb93 100644
--- a/applications/luci-dump1090/root/etc/uci-defaults/luci-dump1090
+++ b/applications/luci-app-dump1090/root/etc/uci-defaults/luci-dump1090
diff --git a/applications/luci-app-firewall/Makefile b/applications/luci-app-firewall/Makefile
new file mode 100644
index 0000000000..21804d7c2d
--- /dev/null
+++ b/applications/luci-app-firewall/Makefile
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=Firewall and Portforwarding application
+LUCI_DEPENDS:=+firewall
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/applications/luci-firewall/luasrc/controller/firewall.lua b/applications/luci-app-firewall/luasrc/controller/firewall.lua
index 5a6ab0ad31..5a6ab0ad31 100644
--- a/applications/luci-firewall/luasrc/controller/firewall.lua
+++ b/applications/luci-app-firewall/luasrc/controller/firewall.lua
diff --git a/applications/luci-firewall/luasrc/model/cbi/firewall/custom.lua b/applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua
index 9b53a8a62f..9b53a8a62f 100644
--- a/applications/luci-firewall/luasrc/model/cbi/firewall/custom.lua
+++ b/applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua
diff --git a/applications/luci-firewall/luasrc/model/cbi/firewall/forward-details.lua b/applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua
index c80a6d0e7a..c80a6d0e7a 100644
--- a/applications/luci-firewall/luasrc/model/cbi/firewall/forward-details.lua
+++ b/applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua
diff --git a/applications/luci-firewall/luasrc/model/cbi/firewall/forwards.lua b/applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua
index 5f7a69b255..5f7a69b255 100644
--- a/applications/luci-firewall/luasrc/model/cbi/firewall/forwards.lua
+++ b/applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua
diff --git a/applications/luci-firewall/luasrc/model/cbi/firewall/rule-details.lua b/applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua
index d29879c247..d29879c247 100644
--- a/applications/luci-firewall/luasrc/model/cbi/firewall/rule-details.lua
+++ b/applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua
diff --git a/applications/luci-firewall/luasrc/model/cbi/firewall/rules.lua b/applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua
index 9bfa66bd08..9bfa66bd08 100644
--- a/applications/luci-firewall/luasrc/model/cbi/firewall/rules.lua
+++ b/applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua
diff --git a/applications/luci-firewall/luasrc/model/cbi/firewall/zone-details.lua b/applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua
index e5bcb34dae..e5bcb34dae 100644
--- a/applications/luci-firewall/luasrc/model/cbi/firewall/zone-details.lua
+++ b/applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua
diff --git a/applications/luci-firewall/luasrc/model/cbi/firewall/zones.lua b/applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua
index e6d8548bf4..e6d8548bf4 100644
--- a/applications/luci-firewall/luasrc/model/cbi/firewall/zones.lua
+++ b/applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua
diff --git a/applications/luci-firewall/luasrc/tools/firewall.lua b/applications/luci-app-firewall/luasrc/tools/firewall.lua
index 07162cba5c..07162cba5c 100644
--- a/applications/luci-firewall/luasrc/tools/firewall.lua
+++ b/applications/luci-app-firewall/luasrc/tools/firewall.lua
diff --git a/applications/luci-firewall/luasrc/view/firewall/cbi_addforward.htm b/applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm
index 3726f643df..3726f643df 100644
--- a/applications/luci-firewall/luasrc/view/firewall/cbi_addforward.htm
+++ b/applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm
diff --git a/applications/luci-firewall/luasrc/view/firewall/cbi_addrule.htm b/applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm
index 463b2e05f4..463b2e05f4 100644
--- a/applications/luci-firewall/luasrc/view/firewall/cbi_addrule.htm
+++ b/applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm
diff --git a/applications/luci-firewall/luasrc/view/firewall/cbi_addsnat.htm b/applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm
index 4e1681c11d..4e1681c11d 100644
--- a/applications/luci-firewall/luasrc/view/firewall/cbi_addsnat.htm
+++ b/applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm
diff --git a/po/ca/firewall.po b/applications/luci-app-firewall/po/ca/firewall.po
index 1843a16490..1843a16490 100644
--- a/po/ca/firewall.po
+++ b/applications/luci-app-firewall/po/ca/firewall.po
diff --git a/po/cs/firewall.po b/applications/luci-app-firewall/po/cs/firewall.po
index beda490f25..beda490f25 100644
--- a/po/cs/firewall.po
+++ b/applications/luci-app-firewall/po/cs/firewall.po
diff --git a/po/de/firewall.po b/applications/luci-app-firewall/po/de/firewall.po
index 0e5ddcf1ab..0e5ddcf1ab 100644
--- a/po/de/firewall.po
+++ b/applications/luci-app-firewall/po/de/firewall.po
diff --git a/po/el/firewall.po b/applications/luci-app-firewall/po/el/firewall.po
index dbd0b9e5c6..dbd0b9e5c6 100644
--- a/po/el/firewall.po
+++ b/applications/luci-app-firewall/po/el/firewall.po
diff --git a/po/en/firewall.po b/applications/luci-app-firewall/po/en/firewall.po
index 2684067e2a..2684067e2a 100644
--- a/po/en/firewall.po
+++ b/applications/luci-app-firewall/po/en/firewall.po
diff --git a/po/es/firewall.po b/applications/luci-app-firewall/po/es/firewall.po
index 452809c2ca..452809c2ca 100644
--- a/po/es/firewall.po
+++ b/applications/luci-app-firewall/po/es/firewall.po
diff --git a/po/fr/firewall.po b/applications/luci-app-firewall/po/fr/firewall.po
index 96f3f510bf..96f3f510bf 100644
--- a/po/fr/firewall.po
+++ b/applications/luci-app-firewall/po/fr/firewall.po
diff --git a/po/he/firewall.po b/applications/luci-app-firewall/po/he/firewall.po
index aec566ae0b..aec566ae0b 100644
--- a/po/he/firewall.po
+++ b/applications/luci-app-firewall/po/he/firewall.po
diff --git a/po/hu/firewall.po b/applications/luci-app-firewall/po/hu/firewall.po
index 1c0ec5e414..1c0ec5e414 100644
--- a/po/hu/firewall.po
+++ b/applications/luci-app-firewall/po/hu/firewall.po
diff --git a/po/it/firewall.po b/applications/luci-app-firewall/po/it/firewall.po
index 2f87efc692..2f87efc692 100644
--- a/po/it/firewall.po
+++ b/applications/luci-app-firewall/po/it/firewall.po
diff --git a/po/ja/firewall.po b/applications/luci-app-firewall/po/ja/firewall.po
index 877a6f0ef2..877a6f0ef2 100644
--- a/po/ja/firewall.po
+++ b/applications/luci-app-firewall/po/ja/firewall.po
diff --git a/po/ms/firewall.po b/applications/luci-app-firewall/po/ms/firewall.po
index ccbec60702..ccbec60702 100644
--- a/po/ms/firewall.po
+++ b/applications/luci-app-firewall/po/ms/firewall.po
diff --git a/po/no/firewall.po b/applications/luci-app-firewall/po/no/firewall.po
index e49f3ac961..e49f3ac961 100644
--- a/po/no/firewall.po
+++ b/applications/luci-app-firewall/po/no/firewall.po
diff --git a/po/pl/firewall.po b/applications/luci-app-firewall/po/pl/firewall.po
index 18be74d231..18be74d231 100644
--- a/po/pl/firewall.po
+++ b/applications/luci-app-firewall/po/pl/firewall.po
diff --git a/po/pt_BR/firewall.po b/applications/luci-app-firewall/po/pt-br/firewall.po
index f32f70e5f0..f32f70e5f0 100644
--- a/po/pt_BR/firewall.po
+++ b/applications/luci-app-firewall/po/pt-br/firewall.po
diff --git a/po/pt/firewall.po b/applications/luci-app-firewall/po/pt/firewall.po
index 304e3659ce..304e3659ce 100644
--- a/po/pt/firewall.po
+++ b/applications/luci-app-firewall/po/pt/firewall.po
diff --git a/po/ro/firewall.po b/applications/luci-app-firewall/po/ro/firewall.po
index 391b949dc8..391b949dc8 100644
--- a/po/ro/firewall.po
+++ b/applications/luci-app-firewall/po/ro/firewall.po
diff --git a/po/ru/firewall.po b/applications/luci-app-firewall/po/ru/firewall.po
index aa5c5a85ed..aa5c5a85ed 100644
--- a/po/ru/firewall.po
+++ b/applications/luci-app-firewall/po/ru/firewall.po
diff --git a/po/sk/firewall.po b/applications/luci-app-firewall/po/sk/firewall.po
index 32cd193f66..32cd193f66 100644
--- a/po/sk/firewall.po
+++ b/applications/luci-app-firewall/po/sk/firewall.po
diff --git a/po/sv/firewall.po b/applications/luci-app-firewall/po/sv/firewall.po
index f3e7fd943c..f3e7fd943c 100644
--- a/po/sv/firewall.po
+++ b/applications/luci-app-firewall/po/sv/firewall.po
diff --git a/applications/luci-app-firewall/po/templates/firewall.pot b/applications/luci-app-firewall/po/templates/firewall.pot
new file mode 100644
index 0000000000..402aa6973a
--- /dev/null
+++ b/applications/luci-app-firewall/po/templates/firewall.pot
@@ -0,0 +1,425 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "%s in %s"
+msgstr ""
+
+msgid "%s%s with %s"
+msgstr ""
+
+msgid "%s, %s in %s"
+msgstr ""
+
+msgid "(Unnamed Entry)"
+msgstr ""
+
+msgid "(Unnamed Rule)"
+msgstr ""
+
+msgid "(Unnamed SNAT)"
+msgstr ""
+
+msgid "-- Please choose --"
+msgstr ""
+
+msgid "-- custom --"
+msgstr ""
+
+msgid "<var>%d</var> pkts. per <var>%s</var>"
+msgstr ""
+
+msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
+msgstr ""
+
+msgid "<var>%s</var> and limit to %s"
+msgstr ""
+
+msgid "Action"
+msgstr ""
+
+msgid "Add"
+msgstr ""
+
+msgid "Add and edit..."
+msgstr ""
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Allow forward from <em>source zones</em>:"
+msgstr ""
+
+msgid "Allow forward to <em>destination zones</em>:"
+msgstr ""
+
+msgid "Any"
+msgstr ""
+
+msgid "Covered networks"
+msgstr ""
+
+msgid "Custom Rules"
+msgstr ""
+
+msgid ""
+"Custom rules allow you to execute arbritary iptables commands which are not "
+"otherwise covered by the firewall framework. The commands are executed after "
+"each firewall restart, right after the default ruleset has been loaded."
+msgstr ""
+
+msgid "Destination IP address"
+msgstr ""
+
+msgid "Destination address"
+msgstr ""
+
+msgid "Destination port"
+msgstr ""
+
+msgid "Destination zone"
+msgstr ""
+
+msgid "Do not rewrite"
+msgstr ""
+
+msgid "Drop invalid packets"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "Enable NAT Loopback"
+msgstr ""
+
+msgid "Enable SYN-flood protection"
+msgstr ""
+
+msgid "Enable logging on this zone"
+msgstr ""
+
+msgid "External IP address"
+msgstr ""
+
+msgid "External port"
+msgstr ""
+
+msgid "External zone"
+msgstr ""
+
+msgid "Extra arguments"
+msgstr ""
+
+msgid "Firewall"
+msgstr ""
+
+msgid "Firewall - Custom Rules"
+msgstr ""
+
+msgid "Firewall - Port Forwards"
+msgstr ""
+
+msgid "Firewall - Traffic Rules"
+msgstr ""
+
+msgid "Firewall - Zone Settings"
+msgstr ""
+
+msgid "Force connection tracking"
+msgstr ""
+
+msgid "Forward"
+msgstr ""
+
+msgid "Forward to"
+msgstr ""
+
+msgid "From %s in %s"
+msgstr ""
+
+msgid "From %s in %s with source %s"
+msgstr ""
+
+msgid "From %s in %s with source %s and %s"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "IPv4"
+msgstr ""
+
+msgid "IPv4 and IPv6"
+msgstr ""
+
+msgid "IPv4 only"
+msgstr ""
+
+msgid "IPv6"
+msgstr ""
+
+msgid "IPv6 only"
+msgstr ""
+
+msgid "Input"
+msgstr ""
+
+msgid "Inter-Zone Forwarding"
+msgstr ""
+
+msgid "Internal IP address"
+msgstr ""
+
+msgid "Internal port"
+msgstr ""
+
+msgid "Internal zone"
+msgstr ""
+
+msgid "Limit log messages"
+msgstr ""
+
+msgid "MSS clamping"
+msgstr ""
+
+msgid "Masquerading"
+msgstr ""
+
+msgid "Match"
+msgstr ""
+
+msgid "Match ICMP type"
+msgstr ""
+
+msgid "Match forwarded traffic to the given destination port or port range."
+msgstr ""
+
+msgid ""
+"Match incoming traffic directed at the given destination port or port range "
+"on this host"
+msgstr ""
+
+msgid ""
+"Match incoming traffic originating from the given source port or port range "
+"on the client host."
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "New SNAT rule"
+msgstr ""
+
+msgid "New forward rule"
+msgstr ""
+
+msgid "New input rule"
+msgstr ""
+
+msgid "New port forward"
+msgstr ""
+
+msgid "New source NAT"
+msgstr ""
+
+msgid "Only match incoming traffic directed at the given IP address."
+msgstr ""
+
+msgid "Only match incoming traffic from these MACs."
+msgstr ""
+
+msgid "Only match incoming traffic from this IP or range."
+msgstr ""
+
+msgid ""
+"Only match incoming traffic originating from the given source port or port "
+"range on the client host"
+msgstr ""
+
+msgid "Open ports on router"
+msgstr ""
+
+msgid "Other..."
+msgstr ""
+
+msgid "Output"
+msgstr ""
+
+msgid "Passes additional arguments to iptables. Use with care!"
+msgstr ""
+
+msgid "Port Forwards"
+msgstr ""
+
+msgid ""
+"Port forwarding allows remote computers on the Internet to connect to a "
+"specific computer or service within the private LAN."
+msgstr ""
+
+msgid "Protocol"
+msgstr ""
+
+msgid ""
+"Redirect matched incoming traffic to the given port on the internal host"
+msgstr ""
+
+msgid "Redirect matched incoming traffic to the specified internal host"
+msgstr ""
+
+msgid "Restrict Masquerading to given destination subnets"
+msgstr ""
+
+msgid "Restrict Masquerading to given source subnets"
+msgstr ""
+
+msgid "Restrict to address family"
+msgstr ""
+
+msgid "Rewrite matched traffic to the given address."
+msgstr ""
+
+msgid ""
+"Rewrite matched traffic to the given source port. May be left empty to only "
+"rewrite the IP address."
+msgstr ""
+
+msgid "Rewrite to source %s"
+msgstr ""
+
+msgid "Rewrite to source %s, %s"
+msgstr ""
+
+msgid "SNAT IP address"
+msgstr ""
+
+msgid "SNAT port"
+msgstr ""
+
+msgid "Source IP address"
+msgstr ""
+
+msgid "Source MAC address"
+msgstr ""
+
+msgid "Source NAT"
+msgstr ""
+
+msgid ""
+"Source NAT is a specific form of masquerading which allows fine grained "
+"control over the source IP used for outgoing traffic, for example to map "
+"multiple WAN addresses to internal subnets."
+msgstr ""
+
+msgid "Source address"
+msgstr ""
+
+msgid "Source port"
+msgstr ""
+
+msgid "Source zone"
+msgstr ""
+
+msgid ""
+"The firewall creates zones over your network interfaces to control network "
+"traffic flow."
+msgstr ""
+
+msgid ""
+"The options below control the forwarding policies between this zone (%s) and "
+"other zones. <em>Destination zones</em> cover forwarded traffic "
+"<strong>originating from %q</strong>. <em>Source zones</em> match forwarded "
+"traffic from other zones <strong>targeted at %q</strong>. The forwarding "
+"rule is <em>unidirectional</em>, e.g. a forward from lan to wan does "
+"<em>not</em> imply a permission to forward from wan to lan as well."
+msgstr ""
+
+msgid ""
+"This page allows you to change advanced properties of the port forwarding "
+"entry. In most cases there is no need to modify those settings."
+msgstr ""
+
+msgid ""
+"This page allows you to change advanced properties of the traffic rule "
+"entry, such as matched source and destination hosts."
+msgstr ""
+
+msgid ""
+"This section defines common properties of %q. The <em>input</em> and "
+"<em>output</em> options set the default policies for traffic entering and "
+"leaving this zone while the <em>forward</em> option describes the policy for "
+"forwarded traffic between different networks within the zone. <em>Covered "
+"networks</em> specifies which available networks are members of this zone."
+msgstr ""
+
+msgid "To %s at %s on <var>this device</var>"
+msgstr ""
+
+msgid "To %s in %s"
+msgstr ""
+
+msgid "To %s on <var>this device</var>"
+msgstr ""
+
+msgid "To %s, %s in %s"
+msgstr ""
+
+msgid "To source IP"
+msgstr ""
+
+msgid "To source port"
+msgstr ""
+
+msgid "Traffic Rules"
+msgstr ""
+
+msgid ""
+"Traffic rules define policies for packets traveling between different zones, "
+"for example to reject traffic between certain hosts or to open WAN ports on "
+"the router."
+msgstr ""
+
+msgid "Via %s"
+msgstr ""
+
+msgid "Via %s at %s"
+msgstr ""
+
+msgid ""
+"You may specify multiple by selecting \"-- custom --\" and then entering "
+"protocols separated by space."
+msgstr ""
+
+msgid "Zone %q"
+msgstr ""
+
+msgid "Zone ⇒ Forwardings"
+msgstr ""
+
+msgid "Zones"
+msgstr ""
+
+msgid "accept"
+msgstr ""
+
+msgid "any"
+msgstr ""
+
+msgid "any host"
+msgstr ""
+
+msgid "any router IP"
+msgstr ""
+
+msgid "any zone"
+msgstr ""
+
+msgid "don't track"
+msgstr ""
+
+msgid "drop"
+msgstr ""
+
+msgid "reject"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
diff --git a/po/tr/firewall.po b/applications/luci-app-firewall/po/tr/firewall.po
index 60a2190fe4..60a2190fe4 100644
--- a/po/tr/firewall.po
+++ b/applications/luci-app-firewall/po/tr/firewall.po
diff --git a/po/uk/firewall.po b/applications/luci-app-firewall/po/uk/firewall.po
index 3705306505..3705306505 100644
--- a/po/uk/firewall.po
+++ b/applications/luci-app-firewall/po/uk/firewall.po
diff --git a/po/vi/firewall.po b/applications/luci-app-firewall/po/vi/firewall.po
index 645aa8829a..645aa8829a 100644
--- a/po/vi/firewall.po
+++ b/applications/luci-app-firewall/po/vi/firewall.po
diff --git a/po/zh_CN/firewall.po b/applications/luci-app-firewall/po/zh-cn/firewall.po
index 03c1b003b8..03c1b003b8 100644
--- a/po/zh_CN/firewall.po
+++ b/applications/luci-app-firewall/po/zh-cn/firewall.po
diff --git a/po/zh_TW/firewall.po b/applications/luci-app-firewall/po/zh-tw/firewall.po
index 6ff2df70d4..6ff2df70d4 100644
--- a/po/zh_TW/firewall.po
+++ b/applications/luci-app-firewall/po/zh-tw/firewall.po
diff --git a/applications/luci-app-freifunk-diagnostics/Makefile b/applications/luci-app-freifunk-diagnostics/Makefile
new file mode 100644
index 0000000000..d511684b64
--- /dev/null
+++ b/applications/luci-app-freifunk-diagnostics/Makefile
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=Tools for network diagnosis like traceroute and ping
+LUCI_DEPENDS:=
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/applications/luci-freifunk-diagnostics/ipkg/postinst b/applications/luci-app-freifunk-diagnostics/ipkg/postinst
index cc814c365c..cc814c365c 100644
--- a/applications/luci-freifunk-diagnostics/ipkg/postinst
+++ b/applications/luci-app-freifunk-diagnostics/ipkg/postinst
diff --git a/applications/luci-freifunk-diagnostics/luasrc/controller/freifunk/diag.lua b/applications/luci-app-freifunk-diagnostics/luasrc/controller/freifunk/diag.lua
index 2a5db6751a..2a5db6751a 100644
--- a/applications/luci-freifunk-diagnostics/luasrc/controller/freifunk/diag.lua
+++ b/applications/luci-app-freifunk-diagnostics/luasrc/controller/freifunk/diag.lua
diff --git a/applications/luci-freifunk-diagnostics/luasrc/view/freifunk/diagnostics.htm b/applications/luci-app-freifunk-diagnostics/luasrc/view/freifunk/diagnostics.htm
index 24f9bae61b..24f9bae61b 100644
--- a/applications/luci-freifunk-diagnostics/luasrc/view/freifunk/diagnostics.htm
+++ b/applications/luci-app-freifunk-diagnostics/luasrc/view/freifunk/diagnostics.htm
diff --git a/applications/luci-freifunk-diagnostics/root/etc/uci-defaults/luci-freifunk-diagnostics b/applications/luci-app-freifunk-diagnostics/root/etc/uci-defaults/luci-freifunk-diagnostics
index 963d8a4efc..963d8a4efc 100644
--- a/applications/luci-freifunk-diagnostics/root/etc/uci-defaults/luci-freifunk-diagnostics
+++ b/applications/luci-app-freifunk-diagnostics/root/etc/uci-defaults/luci-freifunk-diagnostics
diff --git a/applications/luci-app-freifunk-policyrouting/Makefile b/applications/luci-app-freifunk-policyrouting/Makefile
new file mode 100644
index 0000000000..f60c2ea055
--- /dev/null
+++ b/applications/luci-app-freifunk-policyrouting/Makefile
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=Policy routing for mesh traffic
+LUCI_DEPENDS:=+freifunk-policyrouting
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/applications/luci-freifunk-policyrouting/luasrc/controller/freifunk/policy-routing.lua b/applications/luci-app-freifunk-policyrouting/luasrc/controller/freifunk/policy-routing.lua
index ec087d93a1..ec087d93a1 100644
--- a/applications/luci-freifunk-policyrouting/luasrc/controller/freifunk/policy-routing.lua
+++ b/applications/luci-app-freifunk-policyrouting/luasrc/controller/freifunk/policy-routing.lua
diff --git a/applications/luci-freifunk-policyrouting/luasrc/model/cbi/freifunk/policyrouting.lua b/applications/luci-app-freifunk-policyrouting/luasrc/model/cbi/freifunk/policyrouting.lua
index f7f0467719..f7f0467719 100644
--- a/applications/luci-freifunk-policyrouting/luasrc/model/cbi/freifunk/policyrouting.lua
+++ b/applications/luci-app-freifunk-policyrouting/luasrc/model/cbi/freifunk/policyrouting.lua
diff --git a/po/ca/freifunk-policyrouting.po b/applications/luci-app-freifunk-policyrouting/po/ca/freifunk-policyrouting.po
index c1d96e03ee..c1d96e03ee 100644
--- a/po/ca/freifunk-policyrouting.po
+++ b/applications/luci-app-freifunk-policyrouting/po/ca/freifunk-policyrouting.po
diff --git a/po/cs/freifunk-policyrouting.po b/applications/luci-app-freifunk-policyrouting/po/cs/freifunk-policyrouting.po
index 4ec9f8da82..4ec9f8da82 100644
--- a/po/cs/freifunk-policyrouting.po
+++ b/applications/luci-app-freifunk-policyrouting/po/cs/freifunk-policyrouting.po
diff --git a/po/de/freifunk-policyrouting.po b/applications/luci-app-freifunk-policyrouting/po/de/freifunk-policyrouting.po
index 79c22953b7..79c22953b7 100644
--- a/po/de/freifunk-policyrouting.po
+++ b/applications/luci-app-freifunk-policyrouting/po/de/freifunk-policyrouting.po
diff --git a/po/el/freifunk-policyrouting.po b/applications/luci-app-freifunk-policyrouting/po/el/freifunk-policyrouting.po
index 3c9a17e0d4..3c9a17e0d4 100644
--- a/po/el/freifunk-policyrouting.po
+++ b/applications/luci-app-freifunk-policyrouting/po/el/freifunk-policyrouting.po
diff --git a/po/en/freifunk-policyrouting.po b/applications/luci-app-freifunk-policyrouting/po/en/freifunk-policyrouting.po
index 3c9a17e0d4..3c9a17e0d4 100644
--- a/po/en/freifunk-policyrouting.po
+++ b/applications/luci-app-freifunk-policyrouting/po/en/freifunk-policyrouting.po
diff --git a/po/es/freifunk-policyrouting.po b/applications/luci-app-freifunk-policyrouting/po/es/freifunk-policyrouting.po
index 8af3458dfe..8af3458dfe 100644
--- a/po/es/freifunk-policyrouting.po
+++ b/applications/luci-app-freifunk-policyrouting/po/es/freifunk-policyrouting.po
diff --git a/po/fr/freifunk-policyrouting.po b/applications/luci-app-freifunk-policyrouting/po/fr/freifunk-policyrouting.po
index 3c9a17e0d4..3c9a17e0d4 100644
--- a/po/fr/freifunk-policyrouting.po
+++ b/applications/luci-app-freifunk-policyrouting/po/fr/freifunk-policyrouting.po
diff --git a/po/he/freifunk-policyrouting.po b/applications/luci-app-freifunk-policyrouting/po/he/freifunk-policyrouting.po
index 8d83098d6f..8d83098d6f 100644
--- a/po/he/freifunk-policyrouting.po
+++ b/applications/luci-app-freifunk-policyrouting/po/he/freifunk-policyrouting.po
diff --git a/po/hu/freifunk-policyrouting.po b/applications/luci-app-freifunk-policyrouting/po/hu/freifunk-policyrouting.po
index 8d83098d6f..8d83098d6f 100644
--- a/po/hu/freifunk-policyrouting.po
+++ b/applications/luci-app-freifunk-policyrouting/po/hu/freifunk-policyrouting.po
diff --git a/po/it/freifunk-policyrouting.po b/applications/luci-app-freifunk-policyrouting/po/it/freifunk-policyrouting.po
index 61ac6c0d4b..61ac6c0d4b 100644
--- a/po/it/freifunk-policyrouting.po
+++ b/applications/luci-app-freifunk-policyrouting/po/it/freifunk-policyrouting.po
diff --git a/po/ja/freifunk-policyrouting.po b/applications/luci-app-freifunk-policyrouting/po/ja/freifunk-policyrouting.po
index 3c9a17e0d4..3c9a17e0d4 100644
--- a/po/ja/freifunk-policyrouting.po
+++ b/applications/luci-app-freifunk-policyrouting/po/ja/freifunk-policyrouting.po
diff --git a/po/ms/freifunk-policyrouting.po b/applications/luci-app-freifunk-policyrouting/po/ms/freifunk-policyrouting.po
index 3c9a17e0d4..3c9a17e0d4 100644
--- a/po/ms/freifunk-policyrouting.po
+++ b/applications/luci-app-freifunk-policyrouting/po/ms/freifunk-policyrouting.po
diff --git a/po/no/freifunk-policyrouting.po b/applications/luci-app-freifunk-policyrouting/po/no/freifunk-policyrouting.po
index 3c9a17e0d4..3c9a17e0d4 100644
--- a/po/no/freifunk-policyrouting.po
+++ b/applications/luci-app-freifunk-policyrouting/po/no/freifunk-policyrouting.po
diff --git a/po/pl/freifunk-policyrouting.po b/applications/luci-app-freifunk-policyrouting/po/pl/freifunk-policyrouting.po
index bcb4492a09..bcb4492a09 100644
--- a/po/pl/freifunk-policyrouting.po
+++ b/applications/luci-app-freifunk-policyrouting/po/pl/freifunk-policyrouting.po
diff --git a/po/pt_BR/freifunk-policyrouting.po b/applications/luci-app-freifunk-policyrouting/po/pt-br/freifunk-policyrouting.po
index 4aac8ca15a..4aac8ca15a 100644
--- a/po/pt_BR/freifunk-policyrouting.po
+++ b/applications/luci-app-freifunk-policyrouting/po/pt-br/freifunk-policyrouting.po
diff --git a/po/pt/freifunk-policyrouting.po b/applications/luci-app-freifunk-policyrouting/po/pt/freifunk-policyrouting.po
index 41a6b21b7c..41a6b21b7c 100644
--- a/po/pt/freifunk-policyrouting.po
+++ b/applications/luci-app-freifunk-policyrouting/po/pt/freifunk-policyrouting.po
diff --git a/po/ro/freifunk-policyrouting.po b/applications/luci-app-freifunk-policyrouting/po/ro/freifunk-policyrouting.po
index 3386101bb9..3386101bb9 100644
--- a/po/ro/freifunk-policyrouting.po
+++ b/applications/luci-app-freifunk-policyrouting/po/ro/freifunk-policyrouting.po
diff --git a/po/ru/freifunk-policyrouting.po b/applications/luci-app-freifunk-policyrouting/po/ru/freifunk-policyrouting.po
index a4ba704f71..a4ba704f71 100644
--- a/po/ru/freifunk-policyrouting.po
+++ b/applications/luci-app-freifunk-policyrouting/po/ru/freifunk-policyrouting.po
diff --git a/po/sk/freifunk-policyrouting.po b/applications/luci-app-freifunk-policyrouting/po/sk/freifunk-policyrouting.po
index b1a7810324..b1a7810324 100644
--- a/po/sk/freifunk-policyrouting.po
+++ b/applications/luci-app-freifunk-policyrouting/po/sk/freifunk-policyrouting.po
diff --git a/po/sv/freifunk-policyrouting.po b/applications/luci-app-freifunk-policyrouting/po/sv/freifunk-policyrouting.po
index 1310afa962..1310afa962 100644
--- a/po/sv/freifunk-policyrouting.po
+++ b/applications/luci-app-freifunk-policyrouting/po/sv/freifunk-policyrouting.po
diff --git a/applications/luci-app-freifunk-policyrouting/po/templates/freifunk-policyrouting.pot b/applications/luci-app-freifunk-policyrouting/po/templates/freifunk-policyrouting.pot
new file mode 100644
index 0000000000..b4c35c177c
--- /dev/null
+++ b/applications/luci-app-freifunk-policyrouting/po/templates/freifunk-policyrouting.pot
@@ -0,0 +1,42 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid ""
+"All traffic from interfaces belonging to these zones will be sent via a "
+"gateway in the mesh network."
+msgstr ""
+
+msgid "Enable Policy Routing"
+msgstr ""
+
+msgid "Fallback to mesh"
+msgstr ""
+
+msgid "Firewall zones"
+msgstr ""
+
+msgid ""
+"If no default route is received from the mesh network then traffic which "
+"belongs to the selected firewall zones is routed via your internet "
+"connection as a fallback. If you do not want this and instead block that "
+"traffic then you should select this option."
+msgstr ""
+
+msgid ""
+"If your own gateway is not available then fallback to the mesh default "
+"gateway."
+msgstr ""
+
+msgid "Policy Routing"
+msgstr ""
+
+msgid "Strict Filtering"
+msgstr ""
+
+msgid ""
+"These pages can be used to setup policy routing for certain firewall zones. "
+"This is useful if you need to use your own internet connection for yourself "
+"but you don't want to share it with others (thats why it can also be called "
+"'Ego Mode'). Your own traffic is then sent via your internet connection "
+"while traffic originating from the mesh will use another gateway in the mesh."
+msgstr ""
diff --git a/po/tr/freifunk-policyrouting.po b/applications/luci-app-freifunk-policyrouting/po/tr/freifunk-policyrouting.po
index af1616fa48..af1616fa48 100644
--- a/po/tr/freifunk-policyrouting.po
+++ b/applications/luci-app-freifunk-policyrouting/po/tr/freifunk-policyrouting.po
diff --git a/po/uk/freifunk-policyrouting.po b/applications/luci-app-freifunk-policyrouting/po/uk/freifunk-policyrouting.po
index e4cc687e92..e4cc687e92 100644
--- a/po/uk/freifunk-policyrouting.po
+++ b/applications/luci-app-freifunk-policyrouting/po/uk/freifunk-policyrouting.po
diff --git a/po/vi/freifunk-policyrouting.po b/applications/luci-app-freifunk-policyrouting/po/vi/freifunk-policyrouting.po
index 3c9a17e0d4..3c9a17e0d4 100644
--- a/po/vi/freifunk-policyrouting.po
+++ b/applications/luci-app-freifunk-policyrouting/po/vi/freifunk-policyrouting.po
diff --git a/po/zh_CN/freifunk-policyrouting.po b/applications/luci-app-freifunk-policyrouting/po/zh-cn/freifunk-policyrouting.po
index ff0aabc3ce..ff0aabc3ce 100644
--- a/po/zh_CN/freifunk-policyrouting.po
+++ b/applications/luci-app-freifunk-policyrouting/po/zh-cn/freifunk-policyrouting.po
diff --git a/po/zh_TW/freifunk-policyrouting.po b/applications/luci-app-freifunk-policyrouting/po/zh-tw/freifunk-policyrouting.po
index 58efa74c50..58efa74c50 100644
--- a/po/zh_TW/freifunk-policyrouting.po
+++ b/applications/luci-app-freifunk-policyrouting/po/zh-tw/freifunk-policyrouting.po
diff --git a/applications/luci-app-freifunk-widgets/Makefile b/applications/luci-app-freifunk-widgets/Makefile
new file mode 100644
index 0000000000..d748827ba3
--- /dev/null
+++ b/applications/luci-app-freifunk-widgets/Makefile
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=Widgets for the Freifunk index page
+LUCI_DEPENDS:=+luci-mod-freifunk
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/applications/luci-freifunk-widgets/luasrc/controller/freifunk/widgets.lua b/applications/luci-app-freifunk-widgets/luasrc/controller/freifunk/widgets.lua
index 5bbd53f57d..5bbd53f57d 100644
--- a/applications/luci-freifunk-widgets/luasrc/controller/freifunk/widgets.lua
+++ b/applications/luci-app-freifunk-widgets/luasrc/controller/freifunk/widgets.lua
diff --git a/applications/luci-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/heightwidth.lua b/applications/luci-app-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/heightwidth.lua
index b572187bdd..b572187bdd 100644
--- a/applications/luci-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/heightwidth.lua
+++ b/applications/luci-app-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/heightwidth.lua
diff --git a/applications/luci-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/html.lua b/applications/luci-app-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/html.lua
index 367e8a269e..367e8a269e 100644
--- a/applications/luci-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/html.lua
+++ b/applications/luci-app-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/html.lua
diff --git a/applications/luci-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/iframe.lua b/applications/luci-app-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/iframe.lua
index b9cbcaee56..b9cbcaee56 100644
--- a/applications/luci-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/iframe.lua
+++ b/applications/luci-app-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/iframe.lua
diff --git a/applications/luci-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/rssfeed.lua b/applications/luci-app-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/rssfeed.lua
index 5df5a346fe..5df5a346fe 100644
--- a/applications/luci-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/rssfeed.lua
+++ b/applications/luci-app-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/rssfeed.lua
diff --git a/applications/luci-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/search.lua b/applications/luci-app-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/search.lua
index 735dc7cdff..735dc7cdff 100644
--- a/applications/luci-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/search.lua
+++ b/applications/luci-app-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/search.lua
diff --git a/applications/luci-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/widget.lua b/applications/luci-app-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/widget.lua
index 5adfc8f850..5adfc8f850 100644
--- a/applications/luci-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/widget.lua
+++ b/applications/luci-app-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/widget.lua
diff --git a/applications/luci-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/widgets_overview.lua b/applications/luci-app-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/widgets_overview.lua
index 50771d7e0d..50771d7e0d 100644
--- a/applications/luci-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/widgets_overview.lua
+++ b/applications/luci-app-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/widgets_overview.lua
diff --git a/applications/luci-freifunk-widgets/luasrc/view/freifunk/widgets/clear/main.htm b/applications/luci-app-freifunk-widgets/luasrc/view/freifunk/widgets/clear/main.htm
index df01839f44..df01839f44 100644
--- a/applications/luci-freifunk-widgets/luasrc/view/freifunk/widgets/clear/main.htm
+++ b/applications/luci-app-freifunk-widgets/luasrc/view/freifunk/widgets/clear/main.htm
diff --git a/applications/luci-freifunk-widgets/luasrc/view/freifunk/widgets/html/main.htm b/applications/luci-app-freifunk-widgets/luasrc/view/freifunk/widgets/html/main.htm
index 87ad5b6292..87ad5b6292 100644
--- a/applications/luci-freifunk-widgets/luasrc/view/freifunk/widgets/html/main.htm
+++ b/applications/luci-app-freifunk-widgets/luasrc/view/freifunk/widgets/html/main.htm
diff --git a/applications/luci-freifunk-widgets/luasrc/view/freifunk/widgets/iframe/main.htm b/applications/luci-app-freifunk-widgets/luasrc/view/freifunk/widgets/iframe/main.htm
index f0d89d7425..f0d89d7425 100644
--- a/applications/luci-freifunk-widgets/luasrc/view/freifunk/widgets/iframe/main.htm
+++ b/applications/luci-app-freifunk-widgets/luasrc/view/freifunk/widgets/iframe/main.htm
diff --git a/applications/luci-freifunk-widgets/luasrc/view/freifunk/widgets/rssfeed/main.htm b/applications/luci-app-freifunk-widgets/luasrc/view/freifunk/widgets/rssfeed/main.htm
index 08fc550ecd..08fc550ecd 100644
--- a/applications/luci-freifunk-widgets/luasrc/view/freifunk/widgets/rssfeed/main.htm
+++ b/applications/luci-app-freifunk-widgets/luasrc/view/freifunk/widgets/rssfeed/main.htm
diff --git a/applications/luci-freifunk-widgets/luasrc/view/freifunk/widgets/search/main.htm b/applications/luci-app-freifunk-widgets/luasrc/view/freifunk/widgets/search/main.htm
index e319f15fbc..e319f15fbc 100644
--- a/applications/luci-freifunk-widgets/luasrc/view/freifunk/widgets/search/main.htm
+++ b/applications/luci-app-freifunk-widgets/luasrc/view/freifunk/widgets/search/main.htm
diff --git a/applications/luci-freifunk-widgets/root/etc/config/freifunk-widgets b/applications/luci-app-freifunk-widgets/root/etc/config/freifunk-widgets
index 5a9f3254fa..5a9f3254fa 100644
--- a/applications/luci-freifunk-widgets/root/etc/config/freifunk-widgets
+++ b/applications/luci-app-freifunk-widgets/root/etc/config/freifunk-widgets
diff --git a/applications/luci-freifunk-widgets/root/lib/upgrade/keep.d/freifunk-widgets b/applications/luci-app-freifunk-widgets/root/lib/upgrade/keep.d/freifunk-widgets
index ce5537ac20..ce5537ac20 100644
--- a/applications/luci-freifunk-widgets/root/lib/upgrade/keep.d/freifunk-widgets
+++ b/applications/luci-app-freifunk-widgets/root/lib/upgrade/keep.d/freifunk-widgets
diff --git a/applications/luci-app-hd-idle/Makefile b/applications/luci-app-hd-idle/Makefile
new file mode 100644
index 0000000000..07d5cadd99
--- /dev/null
+++ b/applications/luci-app-hd-idle/Makefile
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=Hard Disk Idle Spin-Down module
+LUCI_DEPENDS:=+hd-idle
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/applications/luci-hd-idle/ipkg/postinst b/applications/luci-app-hd-idle/ipkg/postinst
index c12bac57f2..c12bac57f2 100644
--- a/applications/luci-hd-idle/ipkg/postinst
+++ b/applications/luci-app-hd-idle/ipkg/postinst
diff --git a/applications/luci-hd-idle/luasrc/controller/hd_idle.lua b/applications/luci-app-hd-idle/luasrc/controller/hd_idle.lua
index a6f4adc382..a6f4adc382 100644
--- a/applications/luci-hd-idle/luasrc/controller/hd_idle.lua
+++ b/applications/luci-app-hd-idle/luasrc/controller/hd_idle.lua
diff --git a/applications/luci-hd-idle/luasrc/model/cbi/hd_idle.lua b/applications/luci-app-hd-idle/luasrc/model/cbi/hd_idle.lua
index 0c844ca4e0..0c844ca4e0 100644
--- a/applications/luci-hd-idle/luasrc/model/cbi/hd_idle.lua
+++ b/applications/luci-app-hd-idle/luasrc/model/cbi/hd_idle.lua
diff --git a/po/ca/hd_idle.po b/applications/luci-app-hd-idle/po/ca/hd_idle.po
index 9aa2c13c15..9aa2c13c15 100644
--- a/po/ca/hd_idle.po
+++ b/applications/luci-app-hd-idle/po/ca/hd_idle.po
diff --git a/po/cs/hd_idle.po b/applications/luci-app-hd-idle/po/cs/hd_idle.po
index 3b8aa9d4e0..3b8aa9d4e0 100644
--- a/po/cs/hd_idle.po
+++ b/applications/luci-app-hd-idle/po/cs/hd_idle.po
diff --git a/po/de/hd_idle.po b/applications/luci-app-hd-idle/po/de/hd_idle.po
index 890df678dd..890df678dd 100644
--- a/po/de/hd_idle.po
+++ b/applications/luci-app-hd-idle/po/de/hd_idle.po
diff --git a/po/el/hd_idle.po b/applications/luci-app-hd-idle/po/el/hd_idle.po
index 2df912756c..2df912756c 100644
--- a/po/el/hd_idle.po
+++ b/applications/luci-app-hd-idle/po/el/hd_idle.po
diff --git a/po/en/hd_idle.po b/applications/luci-app-hd-idle/po/en/hd_idle.po
index d3058a7b0a..d3058a7b0a 100644
--- a/po/en/hd_idle.po
+++ b/applications/luci-app-hd-idle/po/en/hd_idle.po
diff --git a/po/es/hd_idle.po b/applications/luci-app-hd-idle/po/es/hd_idle.po
index d36bd78c59..d36bd78c59 100644
--- a/po/es/hd_idle.po
+++ b/applications/luci-app-hd-idle/po/es/hd_idle.po
diff --git a/po/fr/hd_idle.po b/applications/luci-app-hd-idle/po/fr/hd_idle.po
index 4b54e27c4c..4b54e27c4c 100644
--- a/po/fr/hd_idle.po
+++ b/applications/luci-app-hd-idle/po/fr/hd_idle.po
diff --git a/po/he/hd_idle.po b/applications/luci-app-hd-idle/po/he/hd_idle.po
index 6a268f4af7..6a268f4af7 100644
--- a/po/he/hd_idle.po
+++ b/applications/luci-app-hd-idle/po/he/hd_idle.po
diff --git a/po/hu/hd_idle.po b/applications/luci-app-hd-idle/po/hu/hd_idle.po
index 424532eda2..424532eda2 100644
--- a/po/hu/hd_idle.po
+++ b/applications/luci-app-hd-idle/po/hu/hd_idle.po
diff --git a/po/it/hd_idle.po b/applications/luci-app-hd-idle/po/it/hd_idle.po
index 09c7c09534..09c7c09534 100644
--- a/po/it/hd_idle.po
+++ b/applications/luci-app-hd-idle/po/it/hd_idle.po
diff --git a/po/ja/hd_idle.po b/applications/luci-app-hd-idle/po/ja/hd_idle.po
index 0ec9d68528..0ec9d68528 100644
--- a/po/ja/hd_idle.po
+++ b/applications/luci-app-hd-idle/po/ja/hd_idle.po
diff --git a/po/ms/hd_idle.po b/applications/luci-app-hd-idle/po/ms/hd_idle.po
index 7facf69f9a..7facf69f9a 100644
--- a/po/ms/hd_idle.po
+++ b/applications/luci-app-hd-idle/po/ms/hd_idle.po
diff --git a/po/no/hd_idle.po b/applications/luci-app-hd-idle/po/no/hd_idle.po
index 24ae1d0004..24ae1d0004 100644
--- a/po/no/hd_idle.po
+++ b/applications/luci-app-hd-idle/po/no/hd_idle.po
diff --git a/po/pl/hd_idle.po b/applications/luci-app-hd-idle/po/pl/hd_idle.po
index e66e3a9e10..e66e3a9e10 100644
--- a/po/pl/hd_idle.po
+++ b/applications/luci-app-hd-idle/po/pl/hd_idle.po
diff --git a/po/pt_BR/hd_idle.po b/applications/luci-app-hd-idle/po/pt-br/hd_idle.po
index 9abeb92767..9abeb92767 100644
--- a/po/pt_BR/hd_idle.po
+++ b/applications/luci-app-hd-idle/po/pt-br/hd_idle.po
diff --git a/po/pt/hd_idle.po b/applications/luci-app-hd-idle/po/pt/hd_idle.po
index 9ce3829ea7..9ce3829ea7 100644
--- a/po/pt/hd_idle.po
+++ b/applications/luci-app-hd-idle/po/pt/hd_idle.po
diff --git a/po/ro/hd_idle.po b/applications/luci-app-hd-idle/po/ro/hd_idle.po
index d619f0a9a2..d619f0a9a2 100644
--- a/po/ro/hd_idle.po
+++ b/applications/luci-app-hd-idle/po/ro/hd_idle.po
diff --git a/po/ru/hd_idle.po b/applications/luci-app-hd-idle/po/ru/hd_idle.po
index 51f1f6cd39..51f1f6cd39 100644
--- a/po/ru/hd_idle.po
+++ b/applications/luci-app-hd-idle/po/ru/hd_idle.po
diff --git a/po/sk/hd_idle.po b/applications/luci-app-hd-idle/po/sk/hd_idle.po
index 6c3a352990..6c3a352990 100644
--- a/po/sk/hd_idle.po
+++ b/applications/luci-app-hd-idle/po/sk/hd_idle.po
diff --git a/po/sv/hd_idle.po b/applications/luci-app-hd-idle/po/sv/hd_idle.po
index bac2024ebd..bac2024ebd 100644
--- a/po/sv/hd_idle.po
+++ b/applications/luci-app-hd-idle/po/sv/hd_idle.po
diff --git a/applications/luci-app-hd-idle/po/templates/hd_idle.pot b/applications/luci-app-hd-idle/po/templates/hd_idle.pot
new file mode 100644
index 0000000000..2bf38f1be5
--- /dev/null
+++ b/applications/luci-app-hd-idle/po/templates/hd_idle.pot
@@ -0,0 +1,34 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "Disk"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "Enable debug"
+msgstr ""
+
+msgid "Idle-time"
+msgstr ""
+
+msgid "Idle-time unit"
+msgstr ""
+
+msgid "Settings"
+msgstr ""
+
+msgid "h"
+msgstr ""
+
+msgid "hd-idle"
+msgstr ""
+
+msgid ""
+"hd-idle is a utility program for spinning-down external disks after a period "
+"of idle time."
+msgstr ""
+
+msgid "min"
+msgstr ""
diff --git a/po/tr/hd_idle.po b/applications/luci-app-hd-idle/po/tr/hd_idle.po
index d4fdabde9a..d4fdabde9a 100644
--- a/po/tr/hd_idle.po
+++ b/applications/luci-app-hd-idle/po/tr/hd_idle.po
diff --git a/po/uk/hd_idle.po b/applications/luci-app-hd-idle/po/uk/hd_idle.po
index e84f770fe6..e84f770fe6 100644
--- a/po/uk/hd_idle.po
+++ b/applications/luci-app-hd-idle/po/uk/hd_idle.po
diff --git a/po/vi/hd_idle.po b/applications/luci-app-hd-idle/po/vi/hd_idle.po
index 8d8821ab8c..8d8821ab8c 100644
--- a/po/vi/hd_idle.po
+++ b/applications/luci-app-hd-idle/po/vi/hd_idle.po
diff --git a/po/zh_CN/hd_idle.po b/applications/luci-app-hd-idle/po/zh-cn/hd_idle.po
index cb3dccd3b2..cb3dccd3b2 100644
--- a/po/zh_CN/hd_idle.po
+++ b/applications/luci-app-hd-idle/po/zh-cn/hd_idle.po
diff --git a/po/zh_TW/hd_idle.po b/applications/luci-app-hd-idle/po/zh-tw/hd_idle.po
index 4355315c39..4355315c39 100644
--- a/po/zh_TW/hd_idle.po
+++ b/applications/luci-app-hd-idle/po/zh-tw/hd_idle.po
diff --git a/applications/luci-hd-idle/root/etc/uci-defaults/luci-hd_idle b/applications/luci-app-hd-idle/root/etc/uci-defaults/luci-hd_idle
index 92f4356367..92f4356367 100755
--- a/applications/luci-hd-idle/root/etc/uci-defaults/luci-hd_idle
+++ b/applications/luci-app-hd-idle/root/etc/uci-defaults/luci-hd_idle
diff --git a/applications/luci-app-ltqtapi/Makefile b/applications/luci-app-ltqtapi/Makefile
new file mode 100644
index 0000000000..bf4a99928b
--- /dev/null
+++ b/applications/luci-app-ltqtapi/Makefile
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=LuCI Support for Lantiq Devices
+LUCI_DEPENDS:=@BROKEN
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/applications/luci-ltqtapi/luasrc/controller/ltqtapi.lua b/applications/luci-app-ltqtapi/luasrc/controller/ltqtapi.lua
index abce09cea8..abce09cea8 100644
--- a/applications/luci-ltqtapi/luasrc/controller/ltqtapi.lua
+++ b/applications/luci-app-ltqtapi/luasrc/controller/ltqtapi.lua
diff --git a/applications/luci-ltqtapi/luasrc/model/cbi/luci_ltqtapi/account.lua b/applications/luci-app-ltqtapi/luasrc/model/cbi/luci_ltqtapi/account.lua
index 40e00f346f..40e00f346f 100644
--- a/applications/luci-ltqtapi/luasrc/model/cbi/luci_ltqtapi/account.lua
+++ b/applications/luci-app-ltqtapi/luasrc/model/cbi/luci_ltqtapi/account.lua
diff --git a/applications/luci-ltqtapi/luasrc/model/cbi/luci_ltqtapi/contact.lua b/applications/luci-app-ltqtapi/luasrc/model/cbi/luci_ltqtapi/contact.lua
index 08311b5152..08311b5152 100644
--- a/applications/luci-ltqtapi/luasrc/model/cbi/luci_ltqtapi/contact.lua
+++ b/applications/luci-app-ltqtapi/luasrc/model/cbi/luci_ltqtapi/contact.lua
diff --git a/applications/luci-ltqtapi/luasrc/view/admin_status/index/telephony.htm b/applications/luci-app-ltqtapi/luasrc/view/admin_status/index/telephony.htm
index c7a58dd3ea..c7a58dd3ea 100644
--- a/applications/luci-ltqtapi/luasrc/view/admin_status/index/telephony.htm
+++ b/applications/luci-app-ltqtapi/luasrc/view/admin_status/index/telephony.htm
diff --git a/applications/luci-ltqtapi/luasrc/view/telephony_status.htm b/applications/luci-app-ltqtapi/luasrc/view/telephony_status.htm
index 234f909342..234f909342 100644
--- a/applications/luci-ltqtapi/luasrc/view/telephony_status.htm
+++ b/applications/luci-app-ltqtapi/luasrc/view/telephony_status.htm
diff --git a/applications/luci-app-meshwizard/Makefile b/applications/luci-app-meshwizard/Makefile
new file mode 100644
index 0000000000..fb2610eb0e
--- /dev/null
+++ b/applications/luci-app-meshwizard/Makefile
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=Shellscript based wizard to setup mesh networks
+LUCI_DEPENDS:=+meshwizard
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/applications/luci-meshwizard/ipkg/postinst b/applications/luci-app-meshwizard/ipkg/postinst
index 0599082efe..0599082efe 100644
--- a/applications/luci-meshwizard/ipkg/postinst
+++ b/applications/luci-app-meshwizard/ipkg/postinst
diff --git a/applications/luci-meshwizard/luasrc/controller/meshwizard.lua b/applications/luci-app-meshwizard/luasrc/controller/meshwizard.lua
index 942987db50..942987db50 100644
--- a/applications/luci-meshwizard/luasrc/controller/meshwizard.lua
+++ b/applications/luci-app-meshwizard/luasrc/controller/meshwizard.lua
diff --git a/applications/luci-meshwizard/luasrc/model/cbi/freifunk/meshwizard.lua b/applications/luci-app-meshwizard/luasrc/model/cbi/freifunk/meshwizard.lua
index 68f7a5a257..68f7a5a257 100644
--- a/applications/luci-meshwizard/luasrc/model/cbi/freifunk/meshwizard.lua
+++ b/applications/luci-app-meshwizard/luasrc/model/cbi/freifunk/meshwizard.lua
diff --git a/po/ca/meshwizard.po b/applications/luci-app-meshwizard/po/ca/meshwizard.po
index 6d7bf936bc..6d7bf936bc 100644
--- a/po/ca/meshwizard.po
+++ b/applications/luci-app-meshwizard/po/ca/meshwizard.po
diff --git a/po/cs/meshwizard.po b/applications/luci-app-meshwizard/po/cs/meshwizard.po
index b1253d0190..b1253d0190 100644
--- a/po/cs/meshwizard.po
+++ b/applications/luci-app-meshwizard/po/cs/meshwizard.po
diff --git a/po/de/meshwizard.po b/applications/luci-app-meshwizard/po/de/meshwizard.po
index 87802be2ff..87802be2ff 100644
--- a/po/de/meshwizard.po
+++ b/applications/luci-app-meshwizard/po/de/meshwizard.po
diff --git a/po/el/meshwizard.po b/applications/luci-app-meshwizard/po/el/meshwizard.po
index 1aeff1e342..1aeff1e342 100644
--- a/po/el/meshwizard.po
+++ b/applications/luci-app-meshwizard/po/el/meshwizard.po
diff --git a/po/en/meshwizard.po b/applications/luci-app-meshwizard/po/en/meshwizard.po
index a67c71f5cd..a67c71f5cd 100644
--- a/po/en/meshwizard.po
+++ b/applications/luci-app-meshwizard/po/en/meshwizard.po
diff --git a/po/es/meshwizard.po b/applications/luci-app-meshwizard/po/es/meshwizard.po
index 9471d42f98..9471d42f98 100644
--- a/po/es/meshwizard.po
+++ b/applications/luci-app-meshwizard/po/es/meshwizard.po
diff --git a/po/fr/meshwizard.po b/applications/luci-app-meshwizard/po/fr/meshwizard.po
index c9f7b0204b..c9f7b0204b 100644
--- a/po/fr/meshwizard.po
+++ b/applications/luci-app-meshwizard/po/fr/meshwizard.po
diff --git a/po/he/meshwizard.po b/applications/luci-app-meshwizard/po/he/meshwizard.po
index acf5f10263..acf5f10263 100644
--- a/po/he/meshwizard.po
+++ b/applications/luci-app-meshwizard/po/he/meshwizard.po
diff --git a/po/hu/meshwizard.po b/applications/luci-app-meshwizard/po/hu/meshwizard.po
index 22aeccefa7..22aeccefa7 100644
--- a/po/hu/meshwizard.po
+++ b/applications/luci-app-meshwizard/po/hu/meshwizard.po
diff --git a/po/it/meshwizard.po b/applications/luci-app-meshwizard/po/it/meshwizard.po
index b1b979954f..b1b979954f 100644
--- a/po/it/meshwizard.po
+++ b/applications/luci-app-meshwizard/po/it/meshwizard.po
diff --git a/po/ja/meshwizard.po b/applications/luci-app-meshwizard/po/ja/meshwizard.po
index a67c71f5cd..a67c71f5cd 100644
--- a/po/ja/meshwizard.po
+++ b/applications/luci-app-meshwizard/po/ja/meshwizard.po
diff --git a/po/ms/meshwizard.po b/applications/luci-app-meshwizard/po/ms/meshwizard.po
index a67c71f5cd..a67c71f5cd 100644
--- a/po/ms/meshwizard.po
+++ b/applications/luci-app-meshwizard/po/ms/meshwizard.po
diff --git a/po/no/meshwizard.po b/applications/luci-app-meshwizard/po/no/meshwizard.po
index a67c71f5cd..a67c71f5cd 100644
--- a/po/no/meshwizard.po
+++ b/applications/luci-app-meshwizard/po/no/meshwizard.po
diff --git a/po/pl/meshwizard.po b/applications/luci-app-meshwizard/po/pl/meshwizard.po
index 79409aa4a2..79409aa4a2 100644
--- a/po/pl/meshwizard.po
+++ b/applications/luci-app-meshwizard/po/pl/meshwizard.po
diff --git a/po/pt_BR/meshwizard.po b/applications/luci-app-meshwizard/po/pt-br/meshwizard.po
index a2238e52e8..a2238e52e8 100644
--- a/po/pt_BR/meshwizard.po
+++ b/applications/luci-app-meshwizard/po/pt-br/meshwizard.po
diff --git a/po/pt/meshwizard.po b/applications/luci-app-meshwizard/po/pt/meshwizard.po
index 41957698b5..41957698b5 100644
--- a/po/pt/meshwizard.po
+++ b/applications/luci-app-meshwizard/po/pt/meshwizard.po
diff --git a/po/ro/meshwizard.po b/applications/luci-app-meshwizard/po/ro/meshwizard.po
index 9f1c46656d..9f1c46656d 100644
--- a/po/ro/meshwizard.po
+++ b/applications/luci-app-meshwizard/po/ro/meshwizard.po
diff --git a/po/ru/meshwizard.po b/applications/luci-app-meshwizard/po/ru/meshwizard.po
index 876ac36dae..876ac36dae 100644
--- a/po/ru/meshwizard.po
+++ b/applications/luci-app-meshwizard/po/ru/meshwizard.po
diff --git a/po/sk/meshwizard.po b/applications/luci-app-meshwizard/po/sk/meshwizard.po
index c86708ad1d..c86708ad1d 100644
--- a/po/sk/meshwizard.po
+++ b/applications/luci-app-meshwizard/po/sk/meshwizard.po
diff --git a/po/sv/meshwizard.po b/applications/luci-app-meshwizard/po/sv/meshwizard.po
index b898024ec8..b898024ec8 100644
--- a/po/sv/meshwizard.po
+++ b/applications/luci-app-meshwizard/po/sv/meshwizard.po
diff --git a/po/ms/ffwizard.po b/applications/luci-app-meshwizard/po/templates/meshwizard.pot
index 6217b8fbab..9dfdec5013 100644
--- a/po/ms/ffwizard.po
+++ b/applications/luci-app-meshwizard/po/templates/meshwizard.pot
@@ -1,13 +1,7 @@
 msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+msgstr "Content-Type: text/plain; charset=UTF-8"
 
-msgid "Allow to transfer anonymous statistics about this node"
+msgid "Activate or deactivate IPv6 config globally."
 msgstr ""
 
 msgid "Channel"
@@ -16,10 +10,10 @@ msgstr ""
 msgid "Check this to protect your LAN from other nodes or clients"
 msgstr ""
 
-msgid "Configure network"
+msgid "Cleanup config"
 msgstr ""
 
-msgid "Connect your node with other nodes with a tunnel via the internet."
+msgid "Configure this interface"
 msgstr ""
 
 msgid "DHCP IP range"
@@ -28,61 +22,52 @@ msgstr ""
 msgid "DHCP will automatically assign ip addresses to clients"
 msgstr ""
 
-msgid "DNS Server"
-msgstr ""
-
 msgid "Enable DHCP"
 msgstr ""
 
-msgid "Gateway"
+msgid "Enable RA"
 msgstr ""
 
-msgid "Heartbeat"
+msgid "Enabled"
 msgstr ""
 
-msgid "IP address"
+msgid "General Settings"
 msgstr ""
 
-msgid "L2gvpn tunnel"
+msgid "IPv6 Settings"
 msgstr ""
 
-msgid "Limit download bandwidth"
+msgid ""
+"If this is selected then config is cleaned before setting new config options."
 msgstr ""
 
-msgid "Limit upload bandwidth"
+msgid "Interfaces"
 msgstr ""
 
 msgid "Mesh IP address"
 msgstr ""
 
-msgid "Mesh IPv6 Address"
-msgstr ""
-
-msgid "Netmask"
-msgstr ""
-
-msgid "Password"
+msgid "Mesh IPv6 address"
 msgstr ""
 
-msgid "Password confirmation"
+msgid "Mesh Wizard"
 msgstr ""
 
-msgid "Password successfully changed"
+msgid ""
+"Note: this will set up this interface for mesh operation, i.e. add it to "
+"zone 'freifunk' and enable olsr."
 msgstr ""
 
 msgid "Protect LAN"
 msgstr ""
 
-msgid "Protocol"
-msgstr ""
-
-msgid "Select this checkbox to configure your network interfaces."
-msgstr ""
-
 msgid ""
 "Select this to allow others to use your connection to access the internet."
 msgstr ""
 
+msgid "Send router advertisements on this device."
+msgstr ""
+
 msgid "Share your internet connection"
 msgstr ""
 
@@ -93,10 +78,12 @@ msgid ""
 "the defaults from the community profile will be used."
 msgstr ""
 
-msgid "The ipv6 address is calculated auomatically."
+msgid "The given IP address is not inside the mesh network range"
 msgstr ""
 
-msgid "The protocol to use for internet connectivity."
+msgid ""
+"This is a unique IPv6 address in CIDR notation (e.g. 2001:1:2:3::1/64) and "
+"has to be registered at your local community."
 msgstr ""
 
 msgid ""
@@ -112,12 +99,6 @@ msgid ""
 "another similar wireless community network."
 msgstr ""
 
-msgid "Unknown Error"
-msgstr ""
-
-msgid "Username"
-msgstr ""
-
 msgid "Virtual Access Point (VAP)"
 msgstr ""
 
@@ -127,32 +108,5 @@ msgstr ""
 msgid "Your device and neighbouring nodes have to use the same channel."
 msgstr ""
 
-msgid "dhcp"
-msgstr ""
-
-msgid "kbit/s"
-msgstr ""
-
-msgid "static"
-msgstr ""
-
-msgid "Configure this interface."
-msgstr ""
-
 msgid "recommended"
 msgstr ""
-
-msgid "Basic settings"
-msgstr ""
-
-msgid "Basic settings are incomplete. Please go to"
-msgstr ""
-
-msgid "Error"
-msgstr ""
-
-msgid "You can not use the wizard because some necessary values are missing."
-msgstr ""
-
-msgid "and fill out all required fields."
-msgstr ""
diff --git a/po/tr/meshwizard.po b/applications/luci-app-meshwizard/po/tr/meshwizard.po
index 92cabd4844..92cabd4844 100644
--- a/po/tr/meshwizard.po
+++ b/applications/luci-app-meshwizard/po/tr/meshwizard.po
diff --git a/po/uk/meshwizard.po b/applications/luci-app-meshwizard/po/uk/meshwizard.po
index 9a317b7ea0..9a317b7ea0 100644
--- a/po/uk/meshwizard.po
+++ b/applications/luci-app-meshwizard/po/uk/meshwizard.po
diff --git a/po/vi/meshwizard.po b/applications/luci-app-meshwizard/po/vi/meshwizard.po
index a67c71f5cd..a67c71f5cd 100644
--- a/po/vi/meshwizard.po
+++ b/applications/luci-app-meshwizard/po/vi/meshwizard.po
diff --git a/po/zh_CN/meshwizard.po b/applications/luci-app-meshwizard/po/zh-cn/meshwizard.po
index d5d0707f17..d5d0707f17 100644
--- a/po/zh_CN/meshwizard.po
+++ b/applications/luci-app-meshwizard/po/zh-cn/meshwizard.po
diff --git a/po/zh_TW/meshwizard.po b/applications/luci-app-meshwizard/po/zh-tw/meshwizard.po
index a4d29e8c10..a4d29e8c10 100644
--- a/po/zh_TW/meshwizard.po
+++ b/applications/luci-app-meshwizard/po/zh-tw/meshwizard.po
diff --git a/applications/luci-meshwizard/root/etc/uci-defaults/meshwizard b/applications/luci-app-meshwizard/root/etc/uci-defaults/meshwizard
index 6ceb1b7142..6ceb1b7142 100644
--- a/applications/luci-meshwizard/root/etc/uci-defaults/meshwizard
+++ b/applications/luci-app-meshwizard/root/etc/uci-defaults/meshwizard
diff --git a/applications/luci-app-minidlna/Makefile b/applications/luci-app-minidlna/Makefile
new file mode 100644
index 0000000000..4790aa32ce
--- /dev/null
+++ b/applications/luci-app-minidlna/Makefile
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=LuCI Support for miniDLNA
+LUCI_DEPENDS:=+minidlna
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/applications/luci-minidlna/luasrc/controller/minidlna.lua b/applications/luci-app-minidlna/luasrc/controller/minidlna.lua
index 606cf6d7b4..606cf6d7b4 100644
--- a/applications/luci-minidlna/luasrc/controller/minidlna.lua
+++ b/applications/luci-app-minidlna/luasrc/controller/minidlna.lua
diff --git a/applications/luci-minidlna/luasrc/model/cbi/minidlna.lua b/applications/luci-app-minidlna/luasrc/model/cbi/minidlna.lua
index 41e2826ee7..41e2826ee7 100644
--- a/applications/luci-minidlna/luasrc/model/cbi/minidlna.lua
+++ b/applications/luci-app-minidlna/luasrc/model/cbi/minidlna.lua
diff --git a/applications/luci-minidlna/luasrc/view/admin_status/index/minidlna.htm b/applications/luci-app-minidlna/luasrc/view/admin_status/index/minidlna.htm
index b2feeb2efd..b2feeb2efd 100644
--- a/applications/luci-minidlna/luasrc/view/admin_status/index/minidlna.htm
+++ b/applications/luci-app-minidlna/luasrc/view/admin_status/index/minidlna.htm
diff --git a/applications/luci-minidlna/luasrc/view/minidlna_status.htm b/applications/luci-app-minidlna/luasrc/view/minidlna_status.htm
index 098a72a073..098a72a073 100644
--- a/applications/luci-minidlna/luasrc/view/minidlna_status.htm
+++ b/applications/luci-app-minidlna/luasrc/view/minidlna_status.htm
diff --git a/po/ca/minidlna.po b/applications/luci-app-minidlna/po/ca/minidlna.po
index bf160080ec..bf160080ec 100644
--- a/po/ca/minidlna.po
+++ b/applications/luci-app-minidlna/po/ca/minidlna.po
diff --git a/po/cs/minidlna.po b/applications/luci-app-minidlna/po/cs/minidlna.po
index bf5a7f442c..bf5a7f442c 100644
--- a/po/cs/minidlna.po
+++ b/applications/luci-app-minidlna/po/cs/minidlna.po
diff --git a/po/de/minidlna.po b/applications/luci-app-minidlna/po/de/minidlna.po
index d912c926bd..d912c926bd 100644
--- a/po/de/minidlna.po
+++ b/applications/luci-app-minidlna/po/de/minidlna.po
diff --git a/po/el/minidlna.po b/applications/luci-app-minidlna/po/el/minidlna.po
index 48c6188390..48c6188390 100644
--- a/po/el/minidlna.po
+++ b/applications/luci-app-minidlna/po/el/minidlna.po
diff --git a/po/en/minidlna.po b/applications/luci-app-minidlna/po/en/minidlna.po
index 5934d42e9e..5934d42e9e 100644
--- a/po/en/minidlna.po
+++ b/applications/luci-app-minidlna/po/en/minidlna.po
diff --git a/po/es/minidlna.po b/applications/luci-app-minidlna/po/es/minidlna.po
index 5f6b3964f3..5f6b3964f3 100644
--- a/po/es/minidlna.po
+++ b/applications/luci-app-minidlna/po/es/minidlna.po
diff --git a/po/fr/minidlna.po b/applications/luci-app-minidlna/po/fr/minidlna.po
index d638b0cba7..d638b0cba7 100644
--- a/po/fr/minidlna.po
+++ b/applications/luci-app-minidlna/po/fr/minidlna.po
diff --git a/po/he/minidlna.po b/applications/luci-app-minidlna/po/he/minidlna.po
index 48c6188390..48c6188390 100644
--- a/po/he/minidlna.po
+++ b/applications/luci-app-minidlna/po/he/minidlna.po
diff --git a/po/hu/minidlna.po b/applications/luci-app-minidlna/po/hu/minidlna.po
index 52fbe749eb..52fbe749eb 100644
--- a/po/hu/minidlna.po
+++ b/applications/luci-app-minidlna/po/hu/minidlna.po
diff --git a/po/it/minidlna.po b/applications/luci-app-minidlna/po/it/minidlna.po
index 1c0abc6722..1c0abc6722 100644
--- a/po/it/minidlna.po
+++ b/applications/luci-app-minidlna/po/it/minidlna.po
diff --git a/po/ja/minidlna.po b/applications/luci-app-minidlna/po/ja/minidlna.po
index 4cfc3385b9..4cfc3385b9 100644
--- a/po/ja/minidlna.po
+++ b/applications/luci-app-minidlna/po/ja/minidlna.po
diff --git a/po/ms/minidlna.po b/applications/luci-app-minidlna/po/ms/minidlna.po
index 8df98a821f..8df98a821f 100644
--- a/po/ms/minidlna.po
+++ b/applications/luci-app-minidlna/po/ms/minidlna.po
diff --git a/po/no/minidlna.po b/applications/luci-app-minidlna/po/no/minidlna.po
index 4b24712f74..4b24712f74 100644
--- a/po/no/minidlna.po
+++ b/applications/luci-app-minidlna/po/no/minidlna.po
diff --git a/po/pl/minidlna.po b/applications/luci-app-minidlna/po/pl/minidlna.po
index b4a8a6f676..b4a8a6f676 100644
--- a/po/pl/minidlna.po
+++ b/applications/luci-app-minidlna/po/pl/minidlna.po
diff --git a/po/pt_BR/minidlna.po b/applications/luci-app-minidlna/po/pt-br/minidlna.po
index 3d53abd466..3d53abd466 100644
--- a/po/pt_BR/minidlna.po
+++ b/applications/luci-app-minidlna/po/pt-br/minidlna.po
diff --git a/po/pt/minidlna.po b/applications/luci-app-minidlna/po/pt/minidlna.po
index 96132cdf61..96132cdf61 100644
--- a/po/pt/minidlna.po
+++ b/applications/luci-app-minidlna/po/pt/minidlna.po
diff --git a/po/ro/minidlna.po b/applications/luci-app-minidlna/po/ro/minidlna.po
index cba5fe6a7a..cba5fe6a7a 100644
--- a/po/ro/minidlna.po
+++ b/applications/luci-app-minidlna/po/ro/minidlna.po
diff --git a/po/ru/minidlna.po b/applications/luci-app-minidlna/po/ru/minidlna.po
index 539e8ca03d..539e8ca03d 100644
--- a/po/ru/minidlna.po
+++ b/applications/luci-app-minidlna/po/ru/minidlna.po
diff --git a/po/sk/minidlna.po b/applications/luci-app-minidlna/po/sk/minidlna.po
index 19c3e536d4..19c3e536d4 100644
--- a/po/sk/minidlna.po
+++ b/applications/luci-app-minidlna/po/sk/minidlna.po
diff --git a/po/sv/minidlna.po b/applications/luci-app-minidlna/po/sv/minidlna.po
index 51a3f3a63f..51a3f3a63f 100644
--- a/po/sv/minidlna.po
+++ b/applications/luci-app-minidlna/po/sv/minidlna.po
diff --git a/applications/luci-app-minidlna/po/templates/minidlna.pot b/applications/luci-app-minidlna/po/templates/minidlna.pot
new file mode 100644
index 0000000000..2b35d1e716
--- /dev/null
+++ b/applications/luci-app-minidlna/po/templates/minidlna.pot
@@ -0,0 +1,157 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Album art names:"
+msgstr ""
+
+msgid "Announced model number:"
+msgstr ""
+
+msgid "Announced serial number:"
+msgstr ""
+
+msgid "Browse directory"
+msgstr ""
+
+msgid "Collecting data..."
+msgstr ""
+
+msgid "Database directory:"
+msgstr ""
+
+msgid "Enable TIVO:"
+msgstr ""
+
+msgid "Enable inotify:"
+msgstr ""
+
+msgid "Enable:"
+msgstr ""
+
+msgid "Friendly name:"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "Interfaces:"
+msgstr ""
+
+msgid "Log directory:"
+msgstr ""
+
+msgid "Media directories:"
+msgstr ""
+
+msgid ""
+"MiniDLNA is server software with the aim of being fully compliant with DLNA/"
+"UPnP-AV clients."
+msgstr ""
+
+msgid ""
+"Model number the miniDLNA daemon will report to clients in its XML "
+"description."
+msgstr ""
+
+msgid "Music"
+msgstr ""
+
+msgid "Network interfaces to serve."
+msgstr ""
+
+msgid "Notify interval in seconds."
+msgstr ""
+
+msgid "Notify interval:"
+msgstr ""
+
+msgid "Pictures"
+msgstr ""
+
+msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic."
+msgstr ""
+
+msgid "Port:"
+msgstr ""
+
+msgid "Presentation URL:"
+msgstr ""
+
+msgid "Root container:"
+msgstr ""
+
+msgid ""
+"Serial number the miniDLNA daemon will report to clients in its XML "
+"description."
+msgstr ""
+
+msgid ""
+"Set this if you want to customize the name that shows up on your clients."
+msgstr ""
+
+msgid ""
+"Set this if you would like to specify the directory where you want MiniDLNA "
+"to store its database and album art cache."
+msgstr ""
+
+msgid ""
+"Set this if you would like to specify the directory where you want MiniDLNA "
+"to store its log file."
+msgstr ""
+
+msgid ""
+"Set this to enable inotify monitoring to automatically discover new files."
+msgstr ""
+
+msgid ""
+"Set this to enable support for streaming .jpg and .mp3 files to a TiVo "
+"supporting HMO."
+msgstr ""
+
+msgid ""
+"Set this to strictly adhere to DLNA standards. This will allow server-side "
+"downscaling of very large JPEG images, which may hurt JPEG serving "
+"performance on (at least) Sony DLNA products."
+msgstr ""
+
+msgid ""
+"Set this to the directory you want scanned. If you want to restrict the "
+"directory to a specific content type, you can prepend the type ('A' for "
+"audio, 'V' for video, 'P' for images), followed by a comma, to the directory "
+"(eg. media_dir=A,/mnt/media/Music). Multiple directories can be specified."
+msgstr ""
+
+msgid "Specify the path to the MiniSSDPd socket."
+msgstr ""
+
+msgid "Standard container"
+msgstr ""
+
+msgid "Strict to DLNA standard:"
+msgstr ""
+
+msgid ""
+"The miniDLNA service is active, serving %d audio, %d video and %d image "
+"files."
+msgstr ""
+
+msgid "The miniDLNA service is not running."
+msgstr ""
+
+msgid "This is a list of file names to check for when searching for album art."
+msgstr ""
+
+msgid "Video"
+msgstr ""
+
+msgid "miniDLNA"
+msgstr ""
+
+msgid "miniDLNA Status"
+msgstr ""
+
+msgid "miniSSDP socket:"
+msgstr ""
diff --git a/po/tr/minidlna.po b/applications/luci-app-minidlna/po/tr/minidlna.po
index 070d64c4e8..070d64c4e8 100644
--- a/po/tr/minidlna.po
+++ b/applications/luci-app-minidlna/po/tr/minidlna.po
diff --git a/po/uk/minidlna.po b/applications/luci-app-minidlna/po/uk/minidlna.po
index 7df732fb0f..7df732fb0f 100644
--- a/po/uk/minidlna.po
+++ b/applications/luci-app-minidlna/po/uk/minidlna.po
diff --git a/po/vi/minidlna.po b/applications/luci-app-minidlna/po/vi/minidlna.po
index 070d64c4e8..070d64c4e8 100644
--- a/po/vi/minidlna.po
+++ b/applications/luci-app-minidlna/po/vi/minidlna.po
diff --git a/po/zh_CN/minidlna.po b/applications/luci-app-minidlna/po/zh-cn/minidlna.po
index 998975689f..998975689f 100644
--- a/po/zh_CN/minidlna.po
+++ b/applications/luci-app-minidlna/po/zh-cn/minidlna.po
diff --git a/po/zh_TW/minidlna.po b/applications/luci-app-minidlna/po/zh-tw/minidlna.po
index 1af3280993..1af3280993 100644
--- a/po/zh_TW/minidlna.po
+++ b/applications/luci-app-minidlna/po/zh-tw/minidlna.po
diff --git a/applications/luci-minidlna/root/etc/uci-defaults/luci-minidlna b/applications/luci-app-minidlna/root/etc/uci-defaults/luci-minidlna
index df43c1b37b..df43c1b37b 100755
--- a/applications/luci-minidlna/root/etc/uci-defaults/luci-minidlna
+++ b/applications/luci-app-minidlna/root/etc/uci-defaults/luci-minidlna
diff --git a/applications/luci-app-mjpg-streamer/Makefile b/applications/luci-app-mjpg-streamer/Makefile
new file mode 100644
index 0000000000..faa024d1a7
--- /dev/null
+++ b/applications/luci-app-mjpg-streamer/Makefile
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=MJPG-Streamer service configuration module
+LUCI_DEPENDS:=+mjpg-streamer
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/applications/luci-mjpg-streamer/ipkg/postinst b/applications/luci-app-mjpg-streamer/ipkg/postinst
index cfca9d308f..cfca9d308f 100644
--- a/applications/luci-mjpg-streamer/ipkg/postinst
+++ b/applications/luci-app-mjpg-streamer/ipkg/postinst
diff --git a/applications/luci-mjpg-streamer/luasrc/controller/mjpg-streamer.lua b/applications/luci-app-mjpg-streamer/luasrc/controller/mjpg-streamer.lua
index 97b9aa4abb..97b9aa4abb 100644
--- a/applications/luci-mjpg-streamer/luasrc/controller/mjpg-streamer.lua
+++ b/applications/luci-app-mjpg-streamer/luasrc/controller/mjpg-streamer.lua
diff --git a/applications/luci-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua b/applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua
index 1a627a6f3a..1a627a6f3a 100644
--- a/applications/luci-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua
+++ b/applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua
diff --git a/applications/luci-mjpg-streamer/root/etc/uci-defaults/luci-mjpg-streamer b/applications/luci-app-mjpg-streamer/root/etc/uci-defaults/luci-mjpg-streamer
index 6a380cfe5d..6a380cfe5d 100755
--- a/applications/luci-mjpg-streamer/root/etc/uci-defaults/luci-mjpg-streamer
+++ b/applications/luci-app-mjpg-streamer/root/etc/uci-defaults/luci-mjpg-streamer
diff --git a/applications/luci-app-mmc-over-gpio/Makefile b/applications/luci-app-mmc-over-gpio/Makefile
new file mode 100644
index 0000000000..4e7d69552c
--- /dev/null
+++ b/applications/luci-app-mmc-over-gpio/Makefile
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=MMC-over-GPIO configuration module
+LUCI_DEPENDS:=+kmod-mmc-over-gpio
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/applications/luci-mmc-over-gpio/ipkg/postinst b/applications/luci-app-mmc-over-gpio/ipkg/postinst
index 6d18799af9..6d18799af9 100644
--- a/applications/luci-mmc-over-gpio/ipkg/postinst
+++ b/applications/luci-app-mmc-over-gpio/ipkg/postinst
diff --git a/applications/luci-mmc-over-gpio/luasrc/controller/mmc_over_gpio.lua b/applications/luci-app-mmc-over-gpio/luasrc/controller/mmc_over_gpio.lua
index b9984cb89b..b9984cb89b 100644
--- a/applications/luci-mmc-over-gpio/luasrc/controller/mmc_over_gpio.lua
+++ b/applications/luci-app-mmc-over-gpio/luasrc/controller/mmc_over_gpio.lua
diff --git a/applications/luci-mmc-over-gpio/luasrc/model/cbi/mmc_over_gpio.lua b/applications/luci-app-mmc-over-gpio/luasrc/model/cbi/mmc_over_gpio.lua
index 04d356c193..04d356c193 100644
--- a/applications/luci-mmc-over-gpio/luasrc/model/cbi/mmc_over_gpio.lua
+++ b/applications/luci-app-mmc-over-gpio/luasrc/model/cbi/mmc_over_gpio.lua
diff --git a/po/ca/mmc_over_gpio.po b/applications/luci-app-mmc-over-gpio/po/ca/mmc_over_gpio.po
index 558e10a798..558e10a798 100644
--- a/po/ca/mmc_over_gpio.po
+++ b/applications/luci-app-mmc-over-gpio/po/ca/mmc_over_gpio.po
diff --git a/po/cs/mmc_over_gpio.po b/applications/luci-app-mmc-over-gpio/po/cs/mmc_over_gpio.po
index 6a7b7b12a2..6a7b7b12a2 100644
--- a/po/cs/mmc_over_gpio.po
+++ b/applications/luci-app-mmc-over-gpio/po/cs/mmc_over_gpio.po
diff --git a/po/de/mmc_over_gpio.po b/applications/luci-app-mmc-over-gpio/po/de/mmc_over_gpio.po
index 3b21417138..3b21417138 100644
--- a/po/de/mmc_over_gpio.po
+++ b/applications/luci-app-mmc-over-gpio/po/de/mmc_over_gpio.po
diff --git a/po/el/mmc_over_gpio.po b/applications/luci-app-mmc-over-gpio/po/el/mmc_over_gpio.po
index 8aadeff892..8aadeff892 100644
--- a/po/el/mmc_over_gpio.po
+++ b/applications/luci-app-mmc-over-gpio/po/el/mmc_over_gpio.po
diff --git a/po/en/mmc_over_gpio.po b/applications/luci-app-mmc-over-gpio/po/en/mmc_over_gpio.po
index bd8f3c87be..bd8f3c87be 100644
--- a/po/en/mmc_over_gpio.po
+++ b/applications/luci-app-mmc-over-gpio/po/en/mmc_over_gpio.po
diff --git a/po/es/mmc_over_gpio.po b/applications/luci-app-mmc-over-gpio/po/es/mmc_over_gpio.po
index ee0b0c6755..ee0b0c6755 100644
--- a/po/es/mmc_over_gpio.po
+++ b/applications/luci-app-mmc-over-gpio/po/es/mmc_over_gpio.po
diff --git a/po/fr/mmc_over_gpio.po b/applications/luci-app-mmc-over-gpio/po/fr/mmc_over_gpio.po
index 64dc899270..64dc899270 100644
--- a/po/fr/mmc_over_gpio.po
+++ b/applications/luci-app-mmc-over-gpio/po/fr/mmc_over_gpio.po
diff --git a/po/he/mmc_over_gpio.po b/applications/luci-app-mmc-over-gpio/po/he/mmc_over_gpio.po
index bf506c0dcd..bf506c0dcd 100644
--- a/po/he/mmc_over_gpio.po
+++ b/applications/luci-app-mmc-over-gpio/po/he/mmc_over_gpio.po
diff --git a/po/hu/mmc_over_gpio.po b/applications/luci-app-mmc-over-gpio/po/hu/mmc_over_gpio.po
index 758c711036..758c711036 100644
--- a/po/hu/mmc_over_gpio.po
+++ b/applications/luci-app-mmc-over-gpio/po/hu/mmc_over_gpio.po
diff --git a/po/it/mmc_over_gpio.po b/applications/luci-app-mmc-over-gpio/po/it/mmc_over_gpio.po
index e0f371a182..e0f371a182 100644
--- a/po/it/mmc_over_gpio.po
+++ b/applications/luci-app-mmc-over-gpio/po/it/mmc_over_gpio.po
diff --git a/po/ja/mmc_over_gpio.po b/applications/luci-app-mmc-over-gpio/po/ja/mmc_over_gpio.po
index 5c0f1028f2..5c0f1028f2 100644
--- a/po/ja/mmc_over_gpio.po
+++ b/applications/luci-app-mmc-over-gpio/po/ja/mmc_over_gpio.po
diff --git a/po/ms/mmc_over_gpio.po b/applications/luci-app-mmc-over-gpio/po/ms/mmc_over_gpio.po
index edbb2ce6f2..edbb2ce6f2 100644
--- a/po/ms/mmc_over_gpio.po
+++ b/applications/luci-app-mmc-over-gpio/po/ms/mmc_over_gpio.po
diff --git a/po/no/mmc_over_gpio.po b/applications/luci-app-mmc-over-gpio/po/no/mmc_over_gpio.po
index ea9a533d13..ea9a533d13 100644
--- a/po/no/mmc_over_gpio.po
+++ b/applications/luci-app-mmc-over-gpio/po/no/mmc_over_gpio.po
diff --git a/po/pl/mmc_over_gpio.po b/applications/luci-app-mmc-over-gpio/po/pl/mmc_over_gpio.po
index ff5b51b2f9..ff5b51b2f9 100644
--- a/po/pl/mmc_over_gpio.po
+++ b/applications/luci-app-mmc-over-gpio/po/pl/mmc_over_gpio.po
diff --git a/po/pt_BR/mmc_over_gpio.po b/applications/luci-app-mmc-over-gpio/po/pt-br/mmc_over_gpio.po
index 9fbbf0f98c..9fbbf0f98c 100644
--- a/po/pt_BR/mmc_over_gpio.po
+++ b/applications/luci-app-mmc-over-gpio/po/pt-br/mmc_over_gpio.po
diff --git a/po/pt/mmc_over_gpio.po b/applications/luci-app-mmc-over-gpio/po/pt/mmc_over_gpio.po
index 497c0b09ae..497c0b09ae 100644
--- a/po/pt/mmc_over_gpio.po
+++ b/applications/luci-app-mmc-over-gpio/po/pt/mmc_over_gpio.po
diff --git a/po/ro/mmc_over_gpio.po b/applications/luci-app-mmc-over-gpio/po/ro/mmc_over_gpio.po
index e465f0a013..e465f0a013 100644
--- a/po/ro/mmc_over_gpio.po
+++ b/applications/luci-app-mmc-over-gpio/po/ro/mmc_over_gpio.po
diff --git a/po/ru/mmc_over_gpio.po b/applications/luci-app-mmc-over-gpio/po/ru/mmc_over_gpio.po
index dcc2e93d74..dcc2e93d74 100644
--- a/po/ru/mmc_over_gpio.po
+++ b/applications/luci-app-mmc-over-gpio/po/ru/mmc_over_gpio.po
diff --git a/po/sk/mmc_over_gpio.po b/applications/luci-app-mmc-over-gpio/po/sk/mmc_over_gpio.po
index 587ee42ba5..587ee42ba5 100644
--- a/po/sk/mmc_over_gpio.po
+++ b/applications/luci-app-mmc-over-gpio/po/sk/mmc_over_gpio.po
diff --git a/po/sv/mmc_over_gpio.po b/applications/luci-app-mmc-over-gpio/po/sv/mmc_over_gpio.po
index d6e5ace13a..d6e5ace13a 100644
--- a/po/sv/mmc_over_gpio.po
+++ b/applications/luci-app-mmc-over-gpio/po/sv/mmc_over_gpio.po
diff --git a/applications/luci-app-mmc-over-gpio/po/templates/mmc_over_gpio.pot b/applications/luci-app-mmc-over-gpio/po/templates/mmc_over_gpio.pot
new file mode 100644
index 0000000000..1cc8de33f2
--- /dev/null
+++ b/applications/luci-app-mmc-over-gpio/po/templates/mmc_over_gpio.pot
@@ -0,0 +1,29 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "CLK_pin"
+msgstr ""
+
+msgid "CS_pin"
+msgstr ""
+
+msgid "DI_pin"
+msgstr ""
+
+msgid "DO_pin"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "MMC/SD driver configuration"
+msgstr ""
+
+msgid "Mode"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Settings"
+msgstr ""
diff --git a/po/tr/mmc_over_gpio.po b/applications/luci-app-mmc-over-gpio/po/tr/mmc_over_gpio.po
index 349b8fc236..349b8fc236 100644
--- a/po/tr/mmc_over_gpio.po
+++ b/applications/luci-app-mmc-over-gpio/po/tr/mmc_over_gpio.po
diff --git a/po/uk/mmc_over_gpio.po b/applications/luci-app-mmc-over-gpio/po/uk/mmc_over_gpio.po
index e9b37f2b63..e9b37f2b63 100644
--- a/po/uk/mmc_over_gpio.po
+++ b/applications/luci-app-mmc-over-gpio/po/uk/mmc_over_gpio.po
diff --git a/po/vi/mmc_over_gpio.po b/applications/luci-app-mmc-over-gpio/po/vi/mmc_over_gpio.po
index febcbc08ee..febcbc08ee 100644
--- a/po/vi/mmc_over_gpio.po
+++ b/applications/luci-app-mmc-over-gpio/po/vi/mmc_over_gpio.po
diff --git a/po/zh_CN/mmc_over_gpio.po b/applications/luci-app-mmc-over-gpio/po/zh-cn/mmc_over_gpio.po
index 27dcefda1d..27dcefda1d 100644
--- a/po/zh_CN/mmc_over_gpio.po
+++ b/applications/luci-app-mmc-over-gpio/po/zh-cn/mmc_over_gpio.po
diff --git a/po/zh_TW/mmc_over_gpio.po b/applications/luci-app-mmc-over-gpio/po/zh-tw/mmc_over_gpio.po
index fe12e6652b..fe12e6652b 100644
--- a/po/zh_TW/mmc_over_gpio.po
+++ b/applications/luci-app-mmc-over-gpio/po/zh-tw/mmc_over_gpio.po
diff --git a/applications/luci-mmc-over-gpio/root/etc/uci-defaults/luci-mmc-over-gpio b/applications/luci-app-mmc-over-gpio/root/etc/uci-defaults/luci-mmc-over-gpio
index c6e79e60d4..c6e79e60d4 100755
--- a/applications/luci-mmc-over-gpio/root/etc/uci-defaults/luci-mmc-over-gpio
+++ b/applications/luci-app-mmc-over-gpio/root/etc/uci-defaults/luci-mmc-over-gpio
diff --git a/applications/luci-app-multiwan/Makefile b/applications/luci-app-multiwan/Makefile
new file mode 100644
index 0000000000..20fba89b0d
--- /dev/null
+++ b/applications/luci-app-multiwan/Makefile
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=LuCI Support for the OpenWrt MultiWAN agent
+LUCI_DEPENDS:=+multiwan
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/applications/luci-multiwan/luasrc/controller/multiwan.lua b/applications/luci-app-multiwan/luasrc/controller/multiwan.lua
index b596ef7e34..b596ef7e34 100644
--- a/applications/luci-multiwan/luasrc/controller/multiwan.lua
+++ b/applications/luci-app-multiwan/luasrc/controller/multiwan.lua
diff --git a/applications/luci-multiwan/luasrc/model/cbi/multiwan/multiwan.lua b/applications/luci-app-multiwan/luasrc/model/cbi/multiwan/multiwan.lua
index 586b6307de..586b6307de 100644
--- a/applications/luci-multiwan/luasrc/model/cbi/multiwan/multiwan.lua
+++ b/applications/luci-app-multiwan/luasrc/model/cbi/multiwan/multiwan.lua
diff --git a/applications/luci-multiwan/luasrc/model/cbi/multiwan/multiwanmini.lua b/applications/luci-app-multiwan/luasrc/model/cbi/multiwan/multiwanmini.lua
index d38974549c..d38974549c 100644
--- a/applications/luci-multiwan/luasrc/model/cbi/multiwan/multiwanmini.lua
+++ b/applications/luci-app-multiwan/luasrc/model/cbi/multiwan/multiwanmini.lua
diff --git a/applications/luci-multiwan/luasrc/view/admin_status/index/multiwan.htm b/applications/luci-app-multiwan/luasrc/view/admin_status/index/multiwan.htm
index 79c04539ff..79c04539ff 100644
--- a/applications/luci-multiwan/luasrc/view/admin_status/index/multiwan.htm
+++ b/applications/luci-app-multiwan/luasrc/view/admin_status/index/multiwan.htm
diff --git a/applications/luci-multiwan/luasrc/view/multiwan_status.htm b/applications/luci-app-multiwan/luasrc/view/multiwan_status.htm
index 8c4127b237..8c4127b237 100644
--- a/applications/luci-multiwan/luasrc/view/multiwan_status.htm
+++ b/applications/luci-app-multiwan/luasrc/view/multiwan_status.htm
diff --git a/po/ca/multiwan.po b/applications/luci-app-multiwan/po/ca/multiwan.po
index eb81ae8132..eb81ae8132 100644
--- a/po/ca/multiwan.po
+++ b/applications/luci-app-multiwan/po/ca/multiwan.po
diff --git a/po/cs/multiwan.po b/applications/luci-app-multiwan/po/cs/multiwan.po
index 0629827e0c..0629827e0c 100644
--- a/po/cs/multiwan.po
+++ b/applications/luci-app-multiwan/po/cs/multiwan.po
diff --git a/po/de/multiwan.po b/applications/luci-app-multiwan/po/de/multiwan.po
index f2bec627fa..f2bec627fa 100644
--- a/po/de/multiwan.po
+++ b/applications/luci-app-multiwan/po/de/multiwan.po
diff --git a/po/el/multiwan.po b/applications/luci-app-multiwan/po/el/multiwan.po
index 48d31659cf..48d31659cf 100644
--- a/po/el/multiwan.po
+++ b/applications/luci-app-multiwan/po/el/multiwan.po
diff --git a/po/en/multiwan.po b/applications/luci-app-multiwan/po/en/multiwan.po
index 241e6d020e..241e6d020e 100644
--- a/po/en/multiwan.po
+++ b/applications/luci-app-multiwan/po/en/multiwan.po
diff --git a/po/es/multiwan.po b/applications/luci-app-multiwan/po/es/multiwan.po
index 1a54f7557b..1a54f7557b 100644
--- a/po/es/multiwan.po
+++ b/applications/luci-app-multiwan/po/es/multiwan.po
diff --git a/po/fr/multiwan.po b/applications/luci-app-multiwan/po/fr/multiwan.po
index 39b1421737..39b1421737 100644
--- a/po/fr/multiwan.po
+++ b/applications/luci-app-multiwan/po/fr/multiwan.po
diff --git a/po/he/multiwan.po b/applications/luci-app-multiwan/po/he/multiwan.po
index 2188822ef7..2188822ef7 100644
--- a/po/he/multiwan.po
+++ b/applications/luci-app-multiwan/po/he/multiwan.po
diff --git a/po/hu/multiwan.po b/applications/luci-app-multiwan/po/hu/multiwan.po
index 20ff8d60b0..20ff8d60b0 100644
--- a/po/hu/multiwan.po
+++ b/applications/luci-app-multiwan/po/hu/multiwan.po
diff --git a/po/it/multiwan.po b/applications/luci-app-multiwan/po/it/multiwan.po
index 863b351045..863b351045 100644
--- a/po/it/multiwan.po
+++ b/applications/luci-app-multiwan/po/it/multiwan.po
diff --git a/po/ja/multiwan.po b/applications/luci-app-multiwan/po/ja/multiwan.po
index ab41562901..ab41562901 100644
--- a/po/ja/multiwan.po
+++ b/applications/luci-app-multiwan/po/ja/multiwan.po
diff --git a/po/ms/multiwan.po b/applications/luci-app-multiwan/po/ms/multiwan.po
index d175246eb0..d175246eb0 100644
--- a/po/ms/multiwan.po
+++ b/applications/luci-app-multiwan/po/ms/multiwan.po
diff --git a/po/no/multiwan.po b/applications/luci-app-multiwan/po/no/multiwan.po
index a6e8bc4de1..a6e8bc4de1 100644
--- a/po/no/multiwan.po
+++ b/applications/luci-app-multiwan/po/no/multiwan.po
diff --git a/po/pl/multiwan.po b/applications/luci-app-multiwan/po/pl/multiwan.po
index 5904aed2e6..5904aed2e6 100644
--- a/po/pl/multiwan.po
+++ b/applications/luci-app-multiwan/po/pl/multiwan.po
diff --git a/po/pt_BR/multiwan.po b/applications/luci-app-multiwan/po/pt-br/multiwan.po
index ba72b820c5..ba72b820c5 100644
--- a/po/pt_BR/multiwan.po
+++ b/applications/luci-app-multiwan/po/pt-br/multiwan.po
diff --git a/po/pt/multiwan.po b/applications/luci-app-multiwan/po/pt/multiwan.po
index 95eeba8203..95eeba8203 100644
--- a/po/pt/multiwan.po
+++ b/applications/luci-app-multiwan/po/pt/multiwan.po
diff --git a/po/ro/multiwan.po b/applications/luci-app-multiwan/po/ro/multiwan.po
index cd51944582..cd51944582 100644
--- a/po/ro/multiwan.po
+++ b/applications/luci-app-multiwan/po/ro/multiwan.po
diff --git a/po/ru/multiwan.po b/applications/luci-app-multiwan/po/ru/multiwan.po
index c12d9204ee..c12d9204ee 100644
--- a/po/ru/multiwan.po
+++ b/applications/luci-app-multiwan/po/ru/multiwan.po
diff --git a/po/sk/multiwan.po b/applications/luci-app-multiwan/po/sk/multiwan.po
index b113eac31d..b113eac31d 100644
--- a/po/sk/multiwan.po
+++ b/applications/luci-app-multiwan/po/sk/multiwan.po
diff --git a/po/sv/multiwan.po b/applications/luci-app-multiwan/po/sv/multiwan.po
index fae4c5803a..fae4c5803a 100644
--- a/po/sv/multiwan.po
+++ b/applications/luci-app-multiwan/po/sv/multiwan.po
diff --git a/applications/luci-app-multiwan/po/templates/multiwan.pot b/applications/luci-app-multiwan/po/templates/multiwan.pot
new file mode 100644
index 0000000000..954eed11da
--- /dev/null
+++ b/applications/luci-app-multiwan/po/templates/multiwan.pot
@@ -0,0 +1,108 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "Attempts Before WAN Failover"
+msgstr ""
+
+msgid "Attempts Before WAN Recovery"
+msgstr ""
+
+msgid "Auto"
+msgstr ""
+
+msgid "Collecting data..."
+msgstr ""
+
+msgid ""
+"Configure rules for directing outbound traffic through specified WAN Uplinks."
+msgstr ""
+
+msgid "DNS Server(s)"
+msgstr ""
+
+msgid "Default Route"
+msgstr ""
+
+msgid "Destination Address"
+msgstr ""
+
+msgid "Disable"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "Failing"
+msgstr ""
+
+msgid "Failover Traffic Destination"
+msgstr ""
+
+msgid "Health Monitor ICMP Host(s)"
+msgstr ""
+
+msgid "Health Monitor ICMP Timeout"
+msgstr ""
+
+msgid "Health Monitor Interval"
+msgstr ""
+
+msgid ""
+"Health Monitor detects and corrects network changes and failed connections."
+msgstr ""
+
+msgid "KO"
+msgstr ""
+
+msgid "Load Balancer Distribution"
+msgstr ""
+
+msgid "Load Balancer(Compatibility)"
+msgstr ""
+
+msgid "Load Balancer(Performance)"
+msgstr ""
+
+msgid "Multi-WAN"
+msgstr ""
+
+msgid "Multi-WAN Status"
+msgstr ""
+
+msgid "Multi-WAN Traffic Rules"
+msgstr ""
+
+msgid ""
+"Multi-WAN allows for the use of multiple uplinks for load balancing and "
+"failover."
+msgstr ""
+
+msgid "None"
+msgstr ""
+
+msgid "OK"
+msgstr ""
+
+msgid "Ports"
+msgstr ""
+
+msgid "Protocol"
+msgstr ""
+
+msgid "Recovering"
+msgstr ""
+
+msgid "Source Address"
+msgstr ""
+
+msgid "Unknown"
+msgstr ""
+
+msgid "WAN Interfaces"
+msgstr ""
+
+msgid "WAN Uplink"
+msgstr ""
+
+msgid "all"
+msgstr ""
diff --git a/po/tr/multiwan.po b/applications/luci-app-multiwan/po/tr/multiwan.po
index e9d6ece55c..e9d6ece55c 100644
--- a/po/tr/multiwan.po
+++ b/applications/luci-app-multiwan/po/tr/multiwan.po
diff --git a/po/uk/multiwan.po b/applications/luci-app-multiwan/po/uk/multiwan.po
index 922b402c2c..922b402c2c 100644
--- a/po/uk/multiwan.po
+++ b/applications/luci-app-multiwan/po/uk/multiwan.po
diff --git a/po/vi/multiwan.po b/applications/luci-app-multiwan/po/vi/multiwan.po
index e9d6ece55c..e9d6ece55c 100644
--- a/po/vi/multiwan.po
+++ b/applications/luci-app-multiwan/po/vi/multiwan.po
diff --git a/po/zh_CN/multiwan.po b/applications/luci-app-multiwan/po/zh-cn/multiwan.po
index dfb495876f..dfb495876f 100644
--- a/po/zh_CN/multiwan.po
+++ b/applications/luci-app-multiwan/po/zh-cn/multiwan.po
diff --git a/po/zh_TW/multiwan.po b/applications/luci-app-multiwan/po/zh-tw/multiwan.po
index 9bfbb8f856..9bfbb8f856 100644
--- a/po/zh_TW/multiwan.po
+++ b/applications/luci-app-multiwan/po/zh-tw/multiwan.po
diff --git a/applications/luci-app-ntpc/Makefile b/applications/luci-app-ntpc/Makefile
new file mode 100644
index 0000000000..b30f967a1c
--- /dev/null
+++ b/applications/luci-app-ntpc/Makefile
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=NTP time synchronisation configuration module
+LUCI_DEPENDS:=+ntpclient
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/applications/luci-ntpc/luasrc/controller/ntpc.lua b/applications/luci-app-ntpc/luasrc/controller/ntpc.lua
index b7f4cdfc78..b7f4cdfc78 100644
--- a/applications/luci-ntpc/luasrc/controller/ntpc.lua
+++ b/applications/luci-app-ntpc/luasrc/controller/ntpc.lua
diff --git a/applications/luci-ntpc/luasrc/model/cbi/ntpc/ntpc.lua b/applications/luci-app-ntpc/luasrc/model/cbi/ntpc/ntpc.lua
index 5265359c6a..5265359c6a 100644
--- a/applications/luci-ntpc/luasrc/model/cbi/ntpc/ntpc.lua
+++ b/applications/luci-app-ntpc/luasrc/model/cbi/ntpc/ntpc.lua
diff --git a/applications/luci-ntpc/luasrc/model/cbi/ntpc/ntpcmini.lua b/applications/luci-app-ntpc/luasrc/model/cbi/ntpc/ntpcmini.lua
index 2a6c415242..2a6c415242 100644
--- a/applications/luci-ntpc/luasrc/model/cbi/ntpc/ntpcmini.lua
+++ b/applications/luci-app-ntpc/luasrc/model/cbi/ntpc/ntpcmini.lua
diff --git a/po/ca/ntpc.po b/applications/luci-app-ntpc/po/ca/ntpc.po
index 1a0f5fbc80..1a0f5fbc80 100644
--- a/po/ca/ntpc.po
+++ b/applications/luci-app-ntpc/po/ca/ntpc.po
diff --git a/po/cs/ntpc.po b/applications/luci-app-ntpc/po/cs/ntpc.po
index 8c342deaab..8c342deaab 100644
--- a/po/cs/ntpc.po
+++ b/applications/luci-app-ntpc/po/cs/ntpc.po
diff --git a/po/de/ntpc.po b/applications/luci-app-ntpc/po/de/ntpc.po
index b6109358d0..b6109358d0 100644
--- a/po/de/ntpc.po
+++ b/applications/luci-app-ntpc/po/de/ntpc.po
diff --git a/po/el/ntpc.po b/applications/luci-app-ntpc/po/el/ntpc.po
index c8f22ebaa5..c8f22ebaa5 100644
--- a/po/el/ntpc.po
+++ b/applications/luci-app-ntpc/po/el/ntpc.po
diff --git a/po/en/ntpc.po b/applications/luci-app-ntpc/po/en/ntpc.po
index 803a99656a..803a99656a 100644
--- a/po/en/ntpc.po
+++ b/applications/luci-app-ntpc/po/en/ntpc.po
diff --git a/po/es/ntpc.po b/applications/luci-app-ntpc/po/es/ntpc.po
index 40edf249bb..40edf249bb 100644
--- a/po/es/ntpc.po
+++ b/applications/luci-app-ntpc/po/es/ntpc.po
diff --git a/po/fr/ntpc.po b/applications/luci-app-ntpc/po/fr/ntpc.po
index d417e15e47..d417e15e47 100644
--- a/po/fr/ntpc.po
+++ b/applications/luci-app-ntpc/po/fr/ntpc.po
diff --git a/po/he/ntpc.po b/applications/luci-app-ntpc/po/he/ntpc.po
index 9d2bee6303..9d2bee6303 100644
--- a/po/he/ntpc.po
+++ b/applications/luci-app-ntpc/po/he/ntpc.po
diff --git a/po/hu/ntpc.po b/applications/luci-app-ntpc/po/hu/ntpc.po
index f69046f5fc..f69046f5fc 100644
--- a/po/hu/ntpc.po
+++ b/applications/luci-app-ntpc/po/hu/ntpc.po
diff --git a/po/it/ntpc.po b/applications/luci-app-ntpc/po/it/ntpc.po
index 4b027b7f49..4b027b7f49 100644
--- a/po/it/ntpc.po
+++ b/applications/luci-app-ntpc/po/it/ntpc.po
diff --git a/po/ja/ntpc.po b/applications/luci-app-ntpc/po/ja/ntpc.po
index bb6135cc2d..bb6135cc2d 100644
--- a/po/ja/ntpc.po
+++ b/applications/luci-app-ntpc/po/ja/ntpc.po
diff --git a/po/ms/ntpc.po b/applications/luci-app-ntpc/po/ms/ntpc.po
index abbfdbe6b1..abbfdbe6b1 100644
--- a/po/ms/ntpc.po
+++ b/applications/luci-app-ntpc/po/ms/ntpc.po
diff --git a/po/no/ntpc.po b/applications/luci-app-ntpc/po/no/ntpc.po
index 7b3fd0b369..7b3fd0b369 100644
--- a/po/no/ntpc.po
+++ b/applications/luci-app-ntpc/po/no/ntpc.po
diff --git a/po/pl/ntpc.po b/applications/luci-app-ntpc/po/pl/ntpc.po
index c2cb3e8a94..c2cb3e8a94 100644
--- a/po/pl/ntpc.po
+++ b/applications/luci-app-ntpc/po/pl/ntpc.po
diff --git a/po/pt_BR/ntpc.po b/applications/luci-app-ntpc/po/pt-br/ntpc.po
index 9e8849a2d5..9e8849a2d5 100644
--- a/po/pt_BR/ntpc.po
+++ b/applications/luci-app-ntpc/po/pt-br/ntpc.po
diff --git a/po/pt/ntpc.po b/applications/luci-app-ntpc/po/pt/ntpc.po
index 70e7952c80..70e7952c80 100644
--- a/po/pt/ntpc.po
+++ b/applications/luci-app-ntpc/po/pt/ntpc.po
diff --git a/po/ro/ntpc.po b/applications/luci-app-ntpc/po/ro/ntpc.po
index 893419f20d..893419f20d 100644
--- a/po/ro/ntpc.po
+++ b/applications/luci-app-ntpc/po/ro/ntpc.po
diff --git a/po/ru/ntpc.po b/applications/luci-app-ntpc/po/ru/ntpc.po
index 229b6101ba..229b6101ba 100644
--- a/po/ru/ntpc.po
+++ b/applications/luci-app-ntpc/po/ru/ntpc.po
diff --git a/po/sk/ntpc.po b/applications/luci-app-ntpc/po/sk/ntpc.po
index d3f8fb8724..d3f8fb8724 100644
--- a/po/sk/ntpc.po
+++ b/applications/luci-app-ntpc/po/sk/ntpc.po
diff --git a/po/sv/ntpc.po b/applications/luci-app-ntpc/po/sv/ntpc.po
index 00715e65b3..00715e65b3 100644
--- a/po/sv/ntpc.po
+++ b/applications/luci-app-ntpc/po/sv/ntpc.po
diff --git a/applications/luci-app-ntpc/po/templates/ntpc.pot b/applications/luci-app-ntpc/po/templates/ntpc.pot
new file mode 100644
index 0000000000..1ed4c40e47
--- /dev/null
+++ b/applications/luci-app-ntpc/po/templates/ntpc.pot
@@ -0,0 +1,41 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "Clock Adjustment"
+msgstr ""
+
+msgid "Count of time measurements"
+msgstr ""
+
+msgid "Current system time"
+msgstr ""
+
+msgid "General"
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid "Offset frequency"
+msgstr ""
+
+msgid "Port"
+msgstr ""
+
+msgid "Synchronizes the system time"
+msgstr ""
+
+msgid "Time Server"
+msgstr ""
+
+msgid "Time Servers"
+msgstr ""
+
+msgid "Time Synchronisation"
+msgstr ""
+
+msgid "Update interval (in seconds)"
+msgstr ""
+
+msgid "empty = infinite"
+msgstr ""
diff --git a/po/tr/ntpc.po b/applications/luci-app-ntpc/po/tr/ntpc.po
index 657b2e8be7..657b2e8be7 100644
--- a/po/tr/ntpc.po
+++ b/applications/luci-app-ntpc/po/tr/ntpc.po
diff --git a/po/uk/ntpc.po b/applications/luci-app-ntpc/po/uk/ntpc.po
index 451f783f98..451f783f98 100644
--- a/po/uk/ntpc.po
+++ b/applications/luci-app-ntpc/po/uk/ntpc.po
diff --git a/po/vi/ntpc.po b/applications/luci-app-ntpc/po/vi/ntpc.po
index 4de0971cb8..4de0971cb8 100644
--- a/po/vi/ntpc.po
+++ b/applications/luci-app-ntpc/po/vi/ntpc.po
diff --git a/po/zh_CN/ntpc.po b/applications/luci-app-ntpc/po/zh-cn/ntpc.po
index 0821c3f46f..0821c3f46f 100644
--- a/po/zh_CN/ntpc.po
+++ b/applications/luci-app-ntpc/po/zh-cn/ntpc.po
diff --git a/po/zh_TW/ntpc.po b/applications/luci-app-ntpc/po/zh-tw/ntpc.po
index a898671136..a898671136 100644
--- a/po/zh_TW/ntpc.po
+++ b/applications/luci-app-ntpc/po/zh-tw/ntpc.po
diff --git a/applications/luci-app-ocserv/Makefile b/applications/luci-app-ocserv/Makefile
new file mode 100644
index 0000000000..3fbf4d2c1b
--- /dev/null
+++ b/applications/luci-app-ocserv/Makefile
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=LuCI Support for OpenConnect VPN
+LUCI_DEPENDS:=+ocserv +certtool
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/applications/luci-ocserv/luasrc/controller/ocserv.lua b/applications/luci-app-ocserv/luasrc/controller/ocserv.lua
index 229102da64..229102da64 100644
--- a/applications/luci-ocserv/luasrc/controller/ocserv.lua
+++ b/applications/luci-app-ocserv/luasrc/controller/ocserv.lua
diff --git a/applications/luci-ocserv/luasrc/model/cbi/ocserv/main.lua b/applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua
index c4289f0520..c4289f0520 100644
--- a/applications/luci-ocserv/luasrc/model/cbi/ocserv/main.lua
+++ b/applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua
diff --git a/applications/luci-ocserv/luasrc/model/cbi/ocserv/user-config.lua b/applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua
index 3e241cb67f..3e241cb67f 100644
--- a/applications/luci-ocserv/luasrc/model/cbi/ocserv/user-config.lua
+++ b/applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua
diff --git a/applications/luci-ocserv/luasrc/model/cbi/ocserv/users.lua b/applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua
index 2f69c014e2..2f69c014e2 100644
--- a/applications/luci-ocserv/luasrc/model/cbi/ocserv/users.lua
+++ b/applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua
diff --git a/applications/luci-ocserv/luasrc/view/admin_status/index/ocserv.htm b/applications/luci-app-ocserv/luasrc/view/admin_status/index/ocserv.htm
index 4575806954..4575806954 100644
--- a/applications/luci-ocserv/luasrc/view/admin_status/index/ocserv.htm
+++ b/applications/luci-app-ocserv/luasrc/view/admin_status/index/ocserv.htm
diff --git a/applications/luci-ocserv/luasrc/view/ocserv_status.htm b/applications/luci-app-ocserv/luasrc/view/ocserv_status.htm
index fabc1bca9e..fabc1bca9e 100644
--- a/applications/luci-ocserv/luasrc/view/ocserv_status.htm
+++ b/applications/luci-app-ocserv/luasrc/view/ocserv_status.htm
diff --git a/applications/luci-app-olsr-services/Makefile b/applications/luci-app-olsr-services/Makefile
new file mode 100644
index 0000000000..b1daf6daad
--- /dev/null
+++ b/applications/luci-app-olsr-services/Makefile
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=Show services announced with the nameservice plugin
+LUCI_DEPENDS:=+luci-app-olsr +olsrd +olsrd-mod-nameservice
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/applications/luci-olsr-services/luasrc/controller/services.lua b/applications/luci-app-olsr-services/luasrc/controller/services.lua
index a4636bfd57..a4636bfd57 100644
--- a/applications/luci-olsr-services/luasrc/controller/services.lua
+++ b/applications/luci-app-olsr-services/luasrc/controller/services.lua
diff --git a/applications/luci-olsr-services/luasrc/view/freifunk-services/services.htm b/applications/luci-app-olsr-services/luasrc/view/freifunk-services/services.htm
index fbb39de884..fbb39de884 100644
--- a/applications/luci-olsr-services/luasrc/view/freifunk-services/services.htm
+++ b/applications/luci-app-olsr-services/luasrc/view/freifunk-services/services.htm
diff --git a/applications/luci-app-olsr-viz/Makefile b/applications/luci-app-olsr-viz/Makefile
new file mode 100644
index 0000000000..e1a1185092
--- /dev/null
+++ b/applications/luci-app-olsr-viz/Makefile
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=OLSR Visualisation
+LUCI_DEPENDS:=+luci-app-olsr +olsrd +olsrd-mod-txtinfo
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/applications/luci-olsr-viz/htdocs/cgi-bin/olsr-viz.sh b/applications/luci-app-olsr-viz/htdocs/cgi-bin/olsr-viz.sh
index e33c632465..e33c632465 100755
--- a/applications/luci-olsr-viz/htdocs/cgi-bin/olsr-viz.sh
+++ b/applications/luci-app-olsr-viz/htdocs/cgi-bin/olsr-viz.sh
diff --git a/applications/luci-olsr-viz/htdocs/cgi-bin/vizdata.sh b/applications/luci-app-olsr-viz/htdocs/cgi-bin/vizdata.sh
index 5a74f2be94..5a74f2be94 100755
--- a/applications/luci-olsr-viz/htdocs/cgi-bin/vizdata.sh
+++ b/applications/luci-app-olsr-viz/htdocs/cgi-bin/vizdata.sh
diff --git a/applications/luci-olsr-viz/htdocs/luci-static/resources/olsr-viz.js b/applications/luci-app-olsr-viz/htdocs/luci-static/resources/olsr-viz.js
index 49435a4a33..49435a4a33 100644
--- a/applications/luci-olsr-viz/htdocs/luci-static/resources/olsr-viz.js
+++ b/applications/luci-app-olsr-viz/htdocs/luci-static/resources/olsr-viz.js
diff --git a/applications/luci-olsr-viz/htdocs/luci-static/resources/olsr-viz/dot_down.gif b/applications/luci-app-olsr-viz/htdocs/luci-static/resources/olsr-viz/dot_down.gif
index c4244202f7..c4244202f7 100644
--- a/applications/luci-olsr-viz/htdocs/luci-static/resources/olsr-viz/dot_down.gif
+++ b/applications/luci-app-olsr-viz/htdocs/luci-static/resources/olsr-viz/dot_down.gif
diff --git a/applications/luci-olsr-viz/htdocs/luci-static/resources/olsr-viz/dot_good.gif b/applications/luci-app-olsr-viz/htdocs/luci-static/resources/olsr-viz/dot_good.gif
index 3a2be32b42..3a2be32b42 100644
--- a/applications/luci-olsr-viz/htdocs/luci-static/resources/olsr-viz/dot_good.gif
+++ b/applications/luci-app-olsr-viz/htdocs/luci-static/resources/olsr-viz/dot_good.gif
diff --git a/applications/luci-olsr-viz/htdocs/luci-static/resources/olsr-viz/dot_ok.gif b/applications/luci-app-olsr-viz/htdocs/luci-static/resources/olsr-viz/dot_ok.gif
index b5dd48da75..b5dd48da75 100644
--- a/applications/luci-olsr-viz/htdocs/luci-static/resources/olsr-viz/dot_ok.gif
+++ b/applications/luci-app-olsr-viz/htdocs/luci-static/resources/olsr-viz/dot_ok.gif
diff --git a/applications/luci-olsr-viz/htdocs/luci-static/resources/olsr-viz/dot_weak.gif b/applications/luci-app-olsr-viz/htdocs/luci-static/resources/olsr-viz/dot_weak.gif
index 36542c4d62..36542c4d62 100644
--- a/applications/luci-olsr-viz/htdocs/luci-static/resources/olsr-viz/dot_weak.gif
+++ b/applications/luci-app-olsr-viz/htdocs/luci-static/resources/olsr-viz/dot_weak.gif
diff --git a/applications/luci-olsr-viz/htdocs/luci-static/resources/olsr-viz/node-hna-mini.gif b/applications/luci-app-olsr-viz/htdocs/luci-static/resources/olsr-viz/node-hna-mini.gif
index 529b3d7e96..529b3d7e96 100644
--- a/applications/luci-olsr-viz/htdocs/luci-static/resources/olsr-viz/node-hna-mini.gif
+++ b/applications/luci-app-olsr-viz/htdocs/luci-static/resources/olsr-viz/node-hna-mini.gif
diff --git a/applications/luci-olsr-viz/htdocs/luci-static/resources/olsr-viz/node-mini.gif b/applications/luci-app-olsr-viz/htdocs/luci-static/resources/olsr-viz/node-mini.gif
index 4d8b7c94e0..4d8b7c94e0 100644
--- a/applications/luci-olsr-viz/htdocs/luci-static/resources/olsr-viz/node-mini.gif
+++ b/applications/luci-app-olsr-viz/htdocs/luci-static/resources/olsr-viz/node-mini.gif
diff --git a/applications/luci-olsr-viz/luasrc/controller/olsr-viz.lua b/applications/luci-app-olsr-viz/luasrc/controller/olsr-viz.lua
index 672486c53b..672486c53b 100644
--- a/applications/luci-olsr-viz/luasrc/controller/olsr-viz.lua
+++ b/applications/luci-app-olsr-viz/luasrc/controller/olsr-viz.lua
diff --git a/applications/luci-olsr-viz/luasrc/view/olsr-viz/olsr-viz.htm b/applications/luci-app-olsr-viz/luasrc/view/olsr-viz/olsr-viz.htm
index 47bd88405f..47bd88405f 100644
--- a/applications/luci-olsr-viz/luasrc/view/olsr-viz/olsr-viz.htm
+++ b/applications/luci-app-olsr-viz/luasrc/view/olsr-viz/olsr-viz.htm
diff --git a/applications/luci-app-olsr/Makefile b/applications/luci-app-olsr/Makefile
new file mode 100644
index 0000000000..f30c242d53
--- /dev/null
+++ b/applications/luci-app-olsr/Makefile
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=OLSR configuration and status module
+LUCI_DEPENDS:=+olsrd +olsrd-mod-jsoninfo +luci-lib-luaneightbl
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/applications/luci-olsr/htdocs/cgi-bin-nodes.html b/applications/luci-app-olsr/htdocs/cgi-bin-nodes.html
index 80d235f15b..80d235f15b 120000
--- a/applications/luci-olsr/htdocs/cgi-bin-nodes.html
+++ b/applications/luci-app-olsr/htdocs/cgi-bin-nodes.html
diff --git a/applications/luci-olsr/htdocs/cgi-bin-status.html b/applications/luci-app-olsr/htdocs/cgi-bin-status.html
index 0270f4a66b..0270f4a66b 100644
--- a/applications/luci-olsr/htdocs/cgi-bin-status.html
+++ b/applications/luci-app-olsr/htdocs/cgi-bin-status.html
diff --git a/applications/luci-olsr/ipkg/postinst b/applications/luci-app-olsr/ipkg/postinst
index 8d9a034a19..8d9a034a19 100755
--- a/applications/luci-olsr/ipkg/postinst
+++ b/applications/luci-app-olsr/ipkg/postinst
diff --git a/applications/luci-olsr/luasrc/controller/olsr.lua b/applications/luci-app-olsr/luasrc/controller/olsr.lua
index 4573f690b5..4573f690b5 100644
--- a/applications/luci-olsr/luasrc/controller/olsr.lua
+++ b/applications/luci-app-olsr/luasrc/controller/olsr.lua
diff --git a/applications/luci-olsr/luasrc/controller/olsr4.lua b/applications/luci-app-olsr/luasrc/controller/olsr4.lua
index 31a3101bc2..31a3101bc2 100644
--- a/applications/luci-olsr/luasrc/controller/olsr4.lua
+++ b/applications/luci-app-olsr/luasrc/controller/olsr4.lua
diff --git a/applications/luci-olsr/luasrc/controller/olsr6.lua b/applications/luci-app-olsr/luasrc/controller/olsr6.lua
index 9fbaa0427b..9fbaa0427b 100644
--- a/applications/luci-olsr/luasrc/controller/olsr6.lua
+++ b/applications/luci-app-olsr/luasrc/controller/olsr6.lua
diff --git a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua b/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua
index 46121747d4..46121747d4 100644
--- a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua
+++ b/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua
diff --git a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd6.lua b/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua
index 2b8d60cd1a..2b8d60cd1a 100644
--- a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd6.lua
+++ b/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua
diff --git a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrddisplay.lua b/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrddisplay.lua
index 48dc965c78..48dc965c78 100644
--- a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrddisplay.lua
+++ b/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrddisplay.lua
diff --git a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdhna.lua b/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua
index d5ee79f24a..d5ee79f24a 100644
--- a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdhna.lua
+++ b/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua
diff --git a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua b/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua
index 21b2ec8677..21b2ec8677 100644
--- a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua
+++ b/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua
diff --git a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdiface.lua b/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua
index 9673d9afcd..9673d9afcd 100644
--- a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdiface.lua
+++ b/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua
diff --git a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua b/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua
index 85818acb3a..85818acb3a 100644
--- a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua
+++ b/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua
diff --git a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua b/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua
index bd72c56adf..bd72c56adf 100644
--- a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua
+++ b/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua
diff --git a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua b/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua
index 221938e7a8..221938e7a8 100644
--- a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua
+++ b/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua
diff --git a/applications/luci-olsr/luasrc/tools/olsr.lua b/applications/luci-app-olsr/luasrc/tools/olsr.lua
index dfd8262f0d..dfd8262f0d 100644
--- a/applications/luci-olsr/luasrc/tools/olsr.lua
+++ b/applications/luci-app-olsr/luasrc/tools/olsr.lua
diff --git a/applications/luci-olsr/luasrc/view/status-olsr/common_js.htm b/applications/luci-app-olsr/luasrc/view/status-olsr/common_js.htm
index 1ee763e119..1ee763e119 100644
--- a/applications/luci-olsr/luasrc/view/status-olsr/common_js.htm
+++ b/applications/luci-app-olsr/luasrc/view/status-olsr/common_js.htm
diff --git a/applications/luci-olsr/luasrc/view/status-olsr/error_olsr.htm b/applications/luci-app-olsr/luasrc/view/status-olsr/error_olsr.htm
index 2c872fa5a2..2c872fa5a2 100644
--- a/applications/luci-olsr/luasrc/view/status-olsr/error_olsr.htm
+++ b/applications/luci-app-olsr/luasrc/view/status-olsr/error_olsr.htm
diff --git a/applications/luci-olsr/luasrc/view/status-olsr/hna.htm b/applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm
index 689bafdfae..689bafdfae 100644
--- a/applications/luci-olsr/luasrc/view/status-olsr/hna.htm
+++ b/applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm
diff --git a/applications/luci-olsr/luasrc/view/status-olsr/interfaces.htm b/applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm
index dd1a21ea6d..dd1a21ea6d 100644
--- a/applications/luci-olsr/luasrc/view/status-olsr/interfaces.htm
+++ b/applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm
diff --git a/applications/luci-olsr/luasrc/view/status-olsr/legend.htm b/applications/luci-app-olsr/luasrc/view/status-olsr/legend.htm
index 2f598489dc..2f598489dc 100644
--- a/applications/luci-olsr/luasrc/view/status-olsr/legend.htm
+++ b/applications/luci-app-olsr/luasrc/view/status-olsr/legend.htm
diff --git a/applications/luci-olsr/luasrc/view/status-olsr/mid.htm b/applications/luci-app-olsr/luasrc/view/status-olsr/mid.htm
index ec5caaa953..ec5caaa953 100644
--- a/applications/luci-olsr/luasrc/view/status-olsr/mid.htm
+++ b/applications/luci-app-olsr/luasrc/view/status-olsr/mid.htm
diff --git a/applications/luci-olsr/luasrc/view/status-olsr/neighbors.htm b/applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm
index daa52831f6..daa52831f6 100644
--- a/applications/luci-olsr/luasrc/view/status-olsr/neighbors.htm
+++ b/applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm
diff --git a/applications/luci-olsr/luasrc/view/status-olsr/overview.htm b/applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm
index 6d8eca874a..6d8eca874a 100644
--- a/applications/luci-olsr/luasrc/view/status-olsr/overview.htm
+++ b/applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm
diff --git a/applications/luci-olsr/luasrc/view/status-olsr/routes.htm b/applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm
index 76e1b1078b..76e1b1078b 100644
--- a/applications/luci-olsr/luasrc/view/status-olsr/routes.htm
+++ b/applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm
diff --git a/applications/luci-olsr/luasrc/view/status-olsr/smartgw.htm b/applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm
index 75d0c1c2fb..75d0c1c2fb 100644
--- a/applications/luci-olsr/luasrc/view/status-olsr/smartgw.htm
+++ b/applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm
diff --git a/applications/luci-olsr/luasrc/view/status-olsr/topology.htm b/applications/luci-app-olsr/luasrc/view/status-olsr/topology.htm
index eb3df5ff51..eb3df5ff51 100644
--- a/applications/luci-olsr/luasrc/view/status-olsr/topology.htm
+++ b/applications/luci-app-olsr/luasrc/view/status-olsr/topology.htm
diff --git a/po/ca/olsr.po b/applications/luci-app-olsr/po/ca/olsr.po
index db4bce1b19..db4bce1b19 100644
--- a/po/ca/olsr.po
+++ b/applications/luci-app-olsr/po/ca/olsr.po
diff --git a/po/cs/olsr.po b/applications/luci-app-olsr/po/cs/olsr.po
index 31669072d8..31669072d8 100644
--- a/po/cs/olsr.po
+++ b/applications/luci-app-olsr/po/cs/olsr.po
diff --git a/po/de/olsr.po b/applications/luci-app-olsr/po/de/olsr.po
index 8be91d7469..8be91d7469 100644
--- a/po/de/olsr.po
+++ b/applications/luci-app-olsr/po/de/olsr.po
diff --git a/po/el/olsr.po b/applications/luci-app-olsr/po/el/olsr.po
index a3cf0d2ae1..a3cf0d2ae1 100644
--- a/po/el/olsr.po
+++ b/applications/luci-app-olsr/po/el/olsr.po
diff --git a/po/en/olsr.po b/applications/luci-app-olsr/po/en/olsr.po
index 131005e1ee..131005e1ee 100644
--- a/po/en/olsr.po
+++ b/applications/luci-app-olsr/po/en/olsr.po
diff --git a/po/es/olsr.po b/applications/luci-app-olsr/po/es/olsr.po
index 0e161bda43..0e161bda43 100644
--- a/po/es/olsr.po
+++ b/applications/luci-app-olsr/po/es/olsr.po
diff --git a/po/fr/olsr.po b/applications/luci-app-olsr/po/fr/olsr.po
index e93a6bd20f..e93a6bd20f 100644
--- a/po/fr/olsr.po
+++ b/applications/luci-app-olsr/po/fr/olsr.po
diff --git a/po/he/olsr.po b/applications/luci-app-olsr/po/he/olsr.po
index 38aa43bffb..38aa43bffb 100644
--- a/po/he/olsr.po
+++ b/applications/luci-app-olsr/po/he/olsr.po
diff --git a/po/hu/olsr.po b/applications/luci-app-olsr/po/hu/olsr.po
index 38aa43bffb..38aa43bffb 100644
--- a/po/hu/olsr.po
+++ b/applications/luci-app-olsr/po/hu/olsr.po
diff --git a/po/it/olsr.po b/applications/luci-app-olsr/po/it/olsr.po
index a88d2970ce..a88d2970ce 100644
--- a/po/it/olsr.po
+++ b/applications/luci-app-olsr/po/it/olsr.po
diff --git a/po/ja/olsr.po b/applications/luci-app-olsr/po/ja/olsr.po
index b3f0109345..b3f0109345 100644
--- a/po/ja/olsr.po
+++ b/applications/luci-app-olsr/po/ja/olsr.po
diff --git a/po/ms/olsr.po b/applications/luci-app-olsr/po/ms/olsr.po
index c0edce15c1..c0edce15c1 100644
--- a/po/ms/olsr.po
+++ b/applications/luci-app-olsr/po/ms/olsr.po
diff --git a/po/no/olsr.po b/applications/luci-app-olsr/po/no/olsr.po
index 38aa43bffb..38aa43bffb 100644
--- a/po/no/olsr.po
+++ b/applications/luci-app-olsr/po/no/olsr.po
diff --git a/po/pl/olsr.po b/applications/luci-app-olsr/po/pl/olsr.po
index 64a99f6069..64a99f6069 100644
--- a/po/pl/olsr.po
+++ b/applications/luci-app-olsr/po/pl/olsr.po
diff --git a/po/pt_BR/olsr.po b/applications/luci-app-olsr/po/pt-br/olsr.po
index 1461c1dd8b..1461c1dd8b 100644
--- a/po/pt_BR/olsr.po
+++ b/applications/luci-app-olsr/po/pt-br/olsr.po
diff --git a/po/pt/olsr.po b/applications/luci-app-olsr/po/pt/olsr.po
index 4e04248f5b..4e04248f5b 100644
--- a/po/pt/olsr.po
+++ b/applications/luci-app-olsr/po/pt/olsr.po
diff --git a/po/ro/olsr.po b/applications/luci-app-olsr/po/ro/olsr.po
index 257fab3733..257fab3733 100644
--- a/po/ro/olsr.po
+++ b/applications/luci-app-olsr/po/ro/olsr.po
diff --git a/po/ru/olsr.po b/applications/luci-app-olsr/po/ru/olsr.po
index 51267e084c..51267e084c 100644
--- a/po/ru/olsr.po
+++ b/applications/luci-app-olsr/po/ru/olsr.po
diff --git a/po/sk/olsr.po b/applications/luci-app-olsr/po/sk/olsr.po
index fdd37e3aff..fdd37e3aff 100644
--- a/po/sk/olsr.po
+++ b/applications/luci-app-olsr/po/sk/olsr.po
diff --git a/po/sv/olsr.po b/applications/luci-app-olsr/po/sv/olsr.po
index 9af47a4054..9af47a4054 100644
--- a/po/sv/olsr.po
+++ b/applications/luci-app-olsr/po/sv/olsr.po
diff --git a/applications/luci-app-olsr/po/templates/olsr.pot b/applications/luci-app-olsr/po/templates/olsr.pot
new file mode 100644
index 0000000000..6bd63c2a2a
--- /dev/null
+++ b/applications/luci-app-olsr/po/templates/olsr.pot
@@ -0,0 +1,680 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "Active MID announcements"
+msgstr ""
+
+msgid "Active OLSR nodes"
+msgstr ""
+
+msgid "Active host net announcements"
+msgstr ""
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Allow gateways with NAT"
+msgstr ""
+
+msgid "Allow the selection of an outgoing ipv4 gateway with NAT"
+msgstr ""
+
+msgid "Announce uplink"
+msgstr ""
+
+msgid "Announced network"
+msgstr ""
+
+msgid "Bad (ETX > 10)"
+msgstr ""
+
+msgid "Bad (SNR < 5)"
+msgstr ""
+
+msgid "Both values must use the dotted decimal notation."
+msgstr ""
+
+msgid "Broadcast address"
+msgstr ""
+
+msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
+msgstr ""
+
+msgid "Can only be a valid IPv6 address or 'default'"
+msgstr ""
+
+msgid "Configuration"
+msgstr ""
+
+msgid ""
+"Could not get any data. Make sure the jsoninfo plugin is installed and "
+"allows connections from localhost."
+msgstr ""
+
+msgid "Display"
+msgstr ""
+
+msgid "Downlink"
+msgstr ""
+
+msgid "Download Config"
+msgstr ""
+
+msgid "ETX"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid ""
+"Enable SmartGateway. If it is disabled, then all other SmartGateway "
+"parameters are ignored. Default is \"no\"."
+msgstr ""
+
+msgid "Enable this interface."
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid "Expected retransmission count"
+msgstr ""
+
+msgid "FIB metric"
+msgstr ""
+
+msgid ""
+"FIBMetric controls the metric value of the host-routes OLSRd sets. \"flat\" "
+"means that the metric value is always 2. This is the preferred value because "
+"it helps the linux kernel routing to clean up older routes. \"correct\" uses "
+"the hopcount as the metric value. \"approx\" use the hopcount as the metric "
+"value too, but does only update the hopcount if the nexthop changes too. "
+"Default is \"flat\"."
+msgstr ""
+
+msgid "Fisheye mechanism for TCs (checked means on). Default is \"on\""
+msgstr ""
+
+msgid "Gateway"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "General settings"
+msgstr ""
+
+msgid "Good (2 < ETX < 4)"
+msgstr ""
+
+msgid "Good (30 > SNR > 20)"
+msgstr ""
+
+msgid "Green"
+msgstr ""
+
+msgid "HNA"
+msgstr ""
+
+msgid "HNA Announcements"
+msgstr ""
+
+msgid "HNA interval"
+msgstr ""
+
+msgid "HNA validity time"
+msgstr ""
+
+msgid "HNA6 Announcements"
+msgstr ""
+
+msgid "Hello"
+msgstr ""
+
+msgid "Hello interval"
+msgstr ""
+
+msgid "Hello validity time"
+msgstr ""
+
+msgid "Hide IPv4"
+msgstr ""
+
+msgid "Hide IPv6"
+msgstr ""
+
+msgid "Hna4"
+msgstr ""
+
+msgid "Hna6"
+msgstr ""
+
+msgid "Hops"
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA messages."
+msgstr ""
+
+msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA6 messages."
+msgstr ""
+
+msgid ""
+"Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
+"robustness to the link sensing but delays neighbor registration. Defaults is "
+"\"yes\""
+msgstr ""
+
+msgid "IP Addresses"
+msgstr ""
+
+msgid ""
+"IP-version to use. If 6and4 is selected then one olsrd instance is started "
+"for each protocol."
+msgstr ""
+
+msgid "IPv4"
+msgstr ""
+
+msgid "IPv4 broadcast"
+msgstr ""
+
+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 "
+"interface broadcast IP."
+msgstr ""
+
+msgid "IPv4 source"
+msgstr ""
+
+msgid ""
+"IPv4 src address for outgoing OLSR packages. Default is \"0.0.0.0\", which "
+"triggers usage of the interface IP."
+msgstr ""
+
+msgid "IPv6"
+msgstr ""
+
+msgid "IPv6 multicast"
+msgstr ""
+
+msgid ""
+"IPv6 multicast address. Default is \"FF02::6D\", the manet-router linklocal "
+"multicast."
+msgstr ""
+
+msgid ""
+"IPv6 network must be given in full notation, prefix must be in CIDR notation."
+msgstr ""
+
+msgid "IPv6 source"
+msgstr ""
+
+msgid ""
+"IPv6 src prefix. OLSRd will choose one of the interface IPs which matches "
+"the prefix of this parameter. Default is \"0::/0\", which triggers the usage "
+"of a not-linklocal interface IP."
+msgstr ""
+
+msgid "IPv6-Prefix of the uplink"
+msgstr ""
+
+msgid ""
+"If the route to the current gateway is to be changed, the ETX value of this "
+"gateway is multiplied with this value before it is compared to the new one. "
+"The parameter can be a value between 0.1 and 1.0, but should be close to 1.0 "
+"if changed.<br /><b>WARNING:</b> This parameter should not be used together "
+"with the etx_ffeth metric!<br />Defaults to \"1.0\"."
+msgstr ""
+
+msgid ""
+"If this Node uses NAT for connections to the internet. Default is \"yes\"."
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid ""
+"Interface Mode is used to prevent unnecessary packet forwarding on switched "
+"ethernet interfaces. valid Modes are \"mesh\" and \"ether\". Default is "
+"\"mesh\"."
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Interfaces Defaults"
+msgstr ""
+
+msgid "Internet protocol"
+msgstr ""
+
+msgid ""
+"Interval to poll network interfaces for configuration changes (in seconds). "
+"Default is \"2.5\"."
+msgstr ""
+
+msgid "Invalid Value for LQMult-Value. Must be between 0.01 and 1.0."
+msgstr ""
+
+msgid ""
+"Invalid Value for LQMult-Value. You must use a decimal number between 0.01 "
+"and 1.0 here."
+msgstr ""
+
+msgid "Known OLSR routes"
+msgstr ""
+
+msgid "LQ"
+msgstr ""
+
+msgid "LQ aging"
+msgstr ""
+
+msgid "LQ algorithm"
+msgstr ""
+
+msgid "LQ fisheye"
+msgstr ""
+
+msgid "LQ level"
+msgstr ""
+
+msgid ""
+"LQMult requires two values (IP address or 'default' and multiplicator) "
+"seperated by space."
+msgstr ""
+
+msgid "Last hop"
+msgstr ""
+
+msgid "Legend"
+msgstr ""
+
+msgid "Library"
+msgstr ""
+
+msgid "Link Quality Settings"
+msgstr ""
+
+msgid ""
+"Link quality aging factor (only for lq level 2). Tuning parameter for "
+"etx_float and etx_fpm, smaller values mean slower changes of ETX value. "
+"(allowed values are between 0.01 and 1.0)"
+msgstr ""
+
+msgid ""
+"Link quality algorithm (only for lq level 2).<br /><b>etx_float</b>: "
+"floating point ETX with exponential aging<br /><b>etx_fpm</b> : same as "
+"etx_float, but with integer arithmetic<br /><b>etx_ff</b> : ETX freifunk, an "
+"etx variant which use all OLSR traffic (instead of only hellos) for ETX "
+"calculation<br /><b>etx_ffeth</b>: incompatible variant of etx_ff that "
+"allows ethernet links with ETX 0.1.<br />Defaults to \"etx_ff\""
+msgstr ""
+
+msgid ""
+"Link quality level switch between hopcount and cost-based (mostly ETX) "
+"routing.<br /><b>0</b> = do not use link quality<br /><b>2</b> = use link "
+"quality for MPR selection and routing<br />Default is \"2\""
+msgstr ""
+
+msgid "LinkQuality Multiplicator"
+msgstr ""
+
+msgid "Links per node (average)"
+msgstr ""
+
+msgid "Links total"
+msgstr ""
+
+msgid "Local interface IP"
+msgstr ""
+
+msgid "MID"
+msgstr ""
+
+msgid "MID interval"
+msgstr ""
+
+msgid "MID validity time"
+msgstr ""
+
+msgid "MTU"
+msgstr ""
+
+msgid "Main IP"
+msgstr ""
+
+msgid ""
+"Make sure that OLSRd is running, the \"jsoninfo\" plugin is loaded, "
+"configured on port 9090 and accepts connections from \"127.0.0.1\"."
+msgstr ""
+
+msgid "Metric"
+msgstr ""
+
+msgid "Mode"
+msgstr ""
+
+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 /"
+">reduce LQ to 192.168.0.1 by half: 192.168.0.1 0.5<br />reduce LQ to all "
+"nodes on this interface by 20%: default 0.8"
+msgstr ""
+
+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 /"
+">reduce LQ to fd91:662e:3c58::1 by half: fd91:662e:3c58::1 0.5<br />reduce "
+"LQ to all nodes on this interface by 20%: default 0.8"
+msgstr ""
+
+msgid "NAT threshold"
+msgstr ""
+
+msgid "NLQ"
+msgstr ""
+
+msgid "Neighbors"
+msgstr ""
+
+msgid "Neighbour IP"
+msgstr ""
+
+msgid "Neighbours"
+msgstr ""
+
+msgid "Netmask"
+msgstr ""
+
+msgid "Network"
+msgstr ""
+
+msgid "Network address"
+msgstr ""
+
+msgid "Nic changes poll interval"
+msgstr ""
+
+msgid "Nodes"
+msgstr ""
+
+msgid "OLSR"
+msgstr ""
+
+msgid "OLSR - Display Options"
+msgstr ""
+
+msgid "OLSR - HNA-Announcements"
+msgstr ""
+
+msgid "OLSR - HNA6-Announcements"
+msgstr ""
+
+msgid "OLSR - Plugins"
+msgstr ""
+
+msgid "OLSR Daemon"
+msgstr ""
+
+msgid "OLSR Daemon - Interface"
+msgstr ""
+
+msgid "OLSR connections"
+msgstr ""
+
+msgid "OLSR gateway"
+msgstr ""
+
+msgid "OLSR node"
+msgstr ""
+
+msgid "Orange"
+msgstr ""
+
+msgid "Overview"
+msgstr ""
+
+msgid "Overview of currently active OLSR host net announcements"
+msgstr ""
+
+msgid "Overview of currently established OLSR connections"
+msgstr ""
+
+msgid "Overview of currently known OLSR nodes"
+msgstr ""
+
+msgid "Overview of currently known routes to other OLSR nodes"
+msgstr ""
+
+msgid "Overview of interfaces where OLSR is running"
+msgstr ""
+
+msgid "Overview of known multiple interface announcements"
+msgstr ""
+
+msgid "Overview of smart gateways in this network"
+msgstr ""
+
+msgid "Plugin configuration"
+msgstr ""
+
+msgid "Plugins"
+msgstr ""
+
+msgid "Polling rate for OLSR sockets in seconds. Default is 0.05."
+msgstr ""
+
+msgid "Pollrate"
+msgstr ""
+
+msgid "Port"
+msgstr ""
+
+msgid "Prefix"
+msgstr ""
+
+msgid "Red"
+msgstr ""
+
+msgid "Resolve"
+msgstr ""
+
+msgid ""
+"Resolve hostnames on status pages. It is generally safe to allow this, but "
+"if you use public IPs and have unstable DNS-Setup then those pages will load "
+"really slow. In this case disable it here."
+msgstr ""
+
+msgid "Routes"
+msgstr ""
+
+msgid "Secondary OLSR interfaces"
+msgstr ""
+
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is 0.0.0.0, which triggers usage of the "
+"IP of the first interface."
+msgstr ""
+
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is ::, which triggers usage of the IP of "
+"the first interface."
+msgstr ""
+
+msgid "Show IPv4"
+msgstr ""
+
+msgid "Show IPv6"
+msgstr ""
+
+msgid "Signal Noise Ratio in dB"
+msgstr ""
+
+msgid "SmartGW"
+msgstr ""
+
+msgid "SmartGW announcements"
+msgstr ""
+
+msgid "SmartGateway is not configured on this system."
+msgstr ""
+
+msgid "Source address"
+msgstr ""
+
+msgid ""
+"Specifies the speed of the uplink in kilobits/s. First parameter is "
+"upstream, second parameter is downstream. Default is \"128 1024\"."
+msgstr ""
+
+msgid "Speed of the uplink"
+msgstr ""
+
+msgid "State"
+msgstr ""
+
+msgid "Status"
+msgstr ""
+
+msgid "Still usable (20 > SNR > 5)"
+msgstr ""
+
+msgid "Still usable (4 < ETX < 10)"
+msgstr ""
+
+msgid "Success rate of packages received from the neighbour"
+msgstr ""
+
+msgid "Success rate of packages sent to the neighbour"
+msgstr ""
+
+msgid "TC"
+msgstr ""
+
+msgid "TC interval"
+msgstr ""
+
+msgid "TC validity time"
+msgstr ""
+
+msgid "TOS value"
+msgstr ""
+
+msgid ""
+"The OLSR daemon is an implementation of the Optimized Link State Routing "
+"protocol. As such it allows mesh routing for any network equipment. It runs "
+"on any wifi card that supports ad-hoc mode and of course on any ethernet "
+"device. Visit <a href='http://www.olsr.org'>olsrd.org</a> for help and "
+"documentation."
+msgstr ""
+
+msgid ""
+"The fixed willingness to use. If not set willingness will be calculated "
+"dynamically based on battery/power status. Default is \"3\"."
+msgstr ""
+
+msgid "The interface OLSRd should serve."
+msgstr ""
+
+msgid ""
+"The port OLSR uses. This should usually stay at the IANA assigned port 698. "
+"It can have a value between 1 and 65535."
+msgstr ""
+
+msgid ""
+"This can be used to signal the external IPv6 prefix of the uplink to the "
+"clients. This might allow a client to change it's local IPv6 address to use "
+"the IPv6 gateway without any kind of address translation. The maximum prefix "
+"length is 64 bits. Default is \"::/0\" (no prefix)."
+msgstr ""
+
+msgid "Timing and Validity"
+msgstr ""
+
+msgid "Topology"
+msgstr ""
+
+msgid ""
+"Type of service value for the IP header of control traffic. Default is "
+"\"16\"."
+msgstr ""
+
+msgid "Unable to connect to the OLSR daemon!"
+msgstr ""
+
+msgid "Uplink"
+msgstr ""
+
+msgid "Uplink uses NAT"
+msgstr ""
+
+msgid "Use hysteresis"
+msgstr ""
+
+msgid "Validity Time"
+msgstr ""
+
+msgid "Version"
+msgstr ""
+
+msgid "Very good (ETX < 2)"
+msgstr ""
+
+msgid "Very good (SNR > 30)"
+msgstr ""
+
+msgid "WLAN"
+msgstr ""
+
+msgid ""
+"Warning: kmod-ipip is not installed. Without kmod-ipip SmartGateway will not "
+"work, please install it."
+msgstr ""
+
+msgid "Weight"
+msgstr ""
+
+msgid ""
+"When multiple links exist between hosts the weight of interface is used to "
+"determine the link to use. Normally the weight is automatically calculated "
+"by olsrd based on the characteristics of the interface, but here you can "
+"specify a fixed value. Olsrd will choose links with the lowest value.<br /"
+"><b>Note:</b> Interface weight is used only when LinkQualityLevel is set to "
+"0. For any other value of LinkQualityLevel, the interface ETX value is used "
+"instead."
+msgstr ""
+
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA of 0.0.0.0/0, ::ffff:0:0/96 or 2000::/3. "
+"Default setting is \"both\"."
+msgstr ""
+
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA6 ::ffff:0:0/96 or 2000::/3. Default "
+"setting is \"both\"."
+msgstr ""
+
+msgid "Willingness"
+msgstr ""
+
+msgid "Yellow"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "yes"
+msgstr ""
diff --git a/po/tr/olsr.po b/applications/luci-app-olsr/po/tr/olsr.po
index 18641896de..18641896de 100644
--- a/po/tr/olsr.po
+++ b/applications/luci-app-olsr/po/tr/olsr.po
diff --git a/po/uk/olsr.po b/applications/luci-app-olsr/po/uk/olsr.po
index d35fe31737..d35fe31737 100644
--- a/po/uk/olsr.po
+++ b/applications/luci-app-olsr/po/uk/olsr.po
diff --git a/po/vi/olsr.po b/applications/luci-app-olsr/po/vi/olsr.po
index 698e5288e2..698e5288e2 100644
--- a/po/vi/olsr.po
+++ b/applications/luci-app-olsr/po/vi/olsr.po
diff --git a/po/zh_CN/olsr.po b/applications/luci-app-olsr/po/zh-cn/olsr.po
index 37264f584a..37264f584a 100644
--- a/po/zh_CN/olsr.po
+++ b/applications/luci-app-olsr/po/zh-cn/olsr.po
diff --git a/po/zh_TW/olsr.po b/applications/luci-app-olsr/po/zh-tw/olsr.po
index 797874d8f1..797874d8f1 100644
--- a/po/zh_TW/olsr.po
+++ b/applications/luci-app-olsr/po/zh-tw/olsr.po
diff --git a/applications/luci-olsr/root/etc/config/luci_olsr b/applications/luci-app-olsr/root/etc/config/luci_olsr
index 2dd4ffac1a..2dd4ffac1a 100644
--- a/applications/luci-olsr/root/etc/config/luci_olsr
+++ b/applications/luci-app-olsr/root/etc/config/luci_olsr
diff --git a/applications/luci-olsr/root/etc/uci-defaults/luci-olsr b/applications/luci-app-olsr/root/etc/uci-defaults/luci-olsr
index 63c01e4a2c..63c01e4a2c 100755
--- a/applications/luci-olsr/root/etc/uci-defaults/luci-olsr
+++ b/applications/luci-app-olsr/root/etc/uci-defaults/luci-olsr
diff --git a/applications/luci-app-openvpn/Makefile b/applications/luci-app-openvpn/Makefile
new file mode 100644
index 0000000000..a8070fd3fe
--- /dev/null
+++ b/applications/luci-app-openvpn/Makefile
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=LuCI Support for OpenVPN
+LUCI_DEPENDS:=
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/applications/luci-openvpn/luasrc/controller/openvpn.lua b/applications/luci-app-openvpn/luasrc/controller/openvpn.lua
index 8695dae848..8695dae848 100644
--- a/applications/luci-openvpn/luasrc/controller/openvpn.lua
+++ b/applications/luci-app-openvpn/luasrc/controller/openvpn.lua
diff --git a/applications/luci-openvpn/luasrc/model/cbi/openvpn-advanced.lua b/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua
index f47af6d2f1..f47af6d2f1 100644
--- a/applications/luci-openvpn/luasrc/model/cbi/openvpn-advanced.lua
+++ b/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua
diff --git a/applications/luci-openvpn/luasrc/model/cbi/openvpn-basic.lua b/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua
index 92f7cb5692..92f7cb5692 100644
--- a/applications/luci-openvpn/luasrc/model/cbi/openvpn-basic.lua
+++ b/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua
diff --git a/applications/luci-openvpn/luasrc/model/cbi/openvpn.lua b/applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua
index 2f865e0020..2f865e0020 100644
--- a/applications/luci-openvpn/luasrc/model/cbi/openvpn.lua
+++ b/applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua
diff --git a/applications/luci-openvpn/luasrc/view/openvpn/cbi-select-input-add.htm b/applications/luci-app-openvpn/luasrc/view/openvpn/cbi-select-input-add.htm
index 0166de778e..0166de778e 100644
--- a/applications/luci-openvpn/luasrc/view/openvpn/cbi-select-input-add.htm
+++ b/applications/luci-app-openvpn/luasrc/view/openvpn/cbi-select-input-add.htm
diff --git a/applications/luci-openvpn/luasrc/view/openvpn/pageswitch.htm b/applications/luci-app-openvpn/luasrc/view/openvpn/pageswitch.htm
index 4f4e869e5c..4f4e869e5c 100644
--- a/applications/luci-openvpn/luasrc/view/openvpn/pageswitch.htm
+++ b/applications/luci-app-openvpn/luasrc/view/openvpn/pageswitch.htm
diff --git a/po/ca/openvpn.po b/applications/luci-app-openvpn/po/ca/openvpn.po
index c7863b244a..c7863b244a 100644
--- a/po/ca/openvpn.po
+++ b/applications/luci-app-openvpn/po/ca/openvpn.po
diff --git a/po/cs/openvpn.po b/applications/luci-app-openvpn/po/cs/openvpn.po
index 58cfa901b0..58cfa901b0 100644
--- a/po/cs/openvpn.po
+++ b/applications/luci-app-openvpn/po/cs/openvpn.po
diff --git a/po/de/openvpn.po b/applications/luci-app-openvpn/po/de/openvpn.po
index ce77281e07..ce77281e07 100644
--- a/po/de/openvpn.po
+++ b/applications/luci-app-openvpn/po/de/openvpn.po
diff --git a/po/el/openvpn.po b/applications/luci-app-openvpn/po/el/openvpn.po
index c10521f015..c10521f015 100644
--- a/po/el/openvpn.po
+++ b/applications/luci-app-openvpn/po/el/openvpn.po
diff --git a/po/en/openvpn.po b/applications/luci-app-openvpn/po/en/openvpn.po
index 710d723335..710d723335 100644
--- a/po/en/openvpn.po
+++ b/applications/luci-app-openvpn/po/en/openvpn.po
diff --git a/po/es/openvpn.po b/applications/luci-app-openvpn/po/es/openvpn.po
index 13ae8da7c4..13ae8da7c4 100644
--- a/po/es/openvpn.po
+++ b/applications/luci-app-openvpn/po/es/openvpn.po
diff --git a/po/fr/openvpn.po b/applications/luci-app-openvpn/po/fr/openvpn.po
index 84a43c28e7..84a43c28e7 100644
--- a/po/fr/openvpn.po
+++ b/applications/luci-app-openvpn/po/fr/openvpn.po
diff --git a/po/he/openvpn.po b/applications/luci-app-openvpn/po/he/openvpn.po
index bf02ef3d9b..bf02ef3d9b 100644
--- a/po/he/openvpn.po
+++ b/applications/luci-app-openvpn/po/he/openvpn.po
diff --git a/po/hu/openvpn.po b/applications/luci-app-openvpn/po/hu/openvpn.po
index c6b22ebbd4..c6b22ebbd4 100644
--- a/po/hu/openvpn.po
+++ b/applications/luci-app-openvpn/po/hu/openvpn.po
diff --git a/po/it/openvpn.po b/applications/luci-app-openvpn/po/it/openvpn.po
index 0ee93063b2..0ee93063b2 100644
--- a/po/it/openvpn.po
+++ b/applications/luci-app-openvpn/po/it/openvpn.po
diff --git a/po/ja/openvpn.po b/applications/luci-app-openvpn/po/ja/openvpn.po
index c4aaae96df..c4aaae96df 100644
--- a/po/ja/openvpn.po
+++ b/applications/luci-app-openvpn/po/ja/openvpn.po
diff --git a/po/ms/openvpn.po b/applications/luci-app-openvpn/po/ms/openvpn.po
index 5cac2c231d..5cac2c231d 100644
--- a/po/ms/openvpn.po
+++ b/applications/luci-app-openvpn/po/ms/openvpn.po
diff --git a/po/no/openvpn.po b/applications/luci-app-openvpn/po/no/openvpn.po
index bf02ef3d9b..bf02ef3d9b 100644
--- a/po/no/openvpn.po
+++ b/applications/luci-app-openvpn/po/no/openvpn.po
diff --git a/po/pl/openvpn.po b/applications/luci-app-openvpn/po/pl/openvpn.po
index c514157dd4..c514157dd4 100644
--- a/po/pl/openvpn.po
+++ b/applications/luci-app-openvpn/po/pl/openvpn.po
diff --git a/po/pt_BR/openvpn.po b/applications/luci-app-openvpn/po/pt-br/openvpn.po
index 002c388551..002c388551 100644
--- a/po/pt_BR/openvpn.po
+++ b/applications/luci-app-openvpn/po/pt-br/openvpn.po
diff --git a/po/pt/openvpn.po b/applications/luci-app-openvpn/po/pt/openvpn.po
index 9da2d95676..9da2d95676 100644
--- a/po/pt/openvpn.po
+++ b/applications/luci-app-openvpn/po/pt/openvpn.po
diff --git a/po/ro/openvpn.po b/applications/luci-app-openvpn/po/ro/openvpn.po
index 9c3be89a45..9c3be89a45 100644
--- a/po/ro/openvpn.po
+++ b/applications/luci-app-openvpn/po/ro/openvpn.po
diff --git a/po/ru/openvpn.po b/applications/luci-app-openvpn/po/ru/openvpn.po
index 4bae5a2932..4bae5a2932 100644
--- a/po/ru/openvpn.po
+++ b/applications/luci-app-openvpn/po/ru/openvpn.po
diff --git a/po/sk/openvpn.po b/applications/luci-app-openvpn/po/sk/openvpn.po
index f8755342d6..f8755342d6 100644
--- a/po/sk/openvpn.po
+++ b/applications/luci-app-openvpn/po/sk/openvpn.po
diff --git a/po/sv/openvpn.po b/applications/luci-app-openvpn/po/sv/openvpn.po
index 9188488f02..9188488f02 100644
--- a/po/sv/openvpn.po
+++ b/applications/luci-app-openvpn/po/sv/openvpn.po
diff --git a/applications/luci-app-openvpn/po/templates/openvpn.pot b/applications/luci-app-openvpn/po/templates/openvpn.pot
new file mode 100644
index 0000000000..001747e294
--- /dev/null
+++ b/applications/luci-app-openvpn/po/templates/openvpn.pot
@@ -0,0 +1,539 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "%s"
+msgstr ""
+
+msgid "'net30', 'p2p', or 'subnet'"
+msgstr ""
+
+msgid "Accept options pushed from server"
+msgstr ""
+
+msgid "Add"
+msgstr ""
+
+msgid "Add route after establishing connection"
+msgstr ""
+
+msgid "Additional authentication over TLS"
+msgstr ""
+
+msgid "Allow client-to-client traffic"
+msgstr ""
+
+msgid "Allow multiple clients with same certificate"
+msgstr ""
+
+msgid "Allow only one session"
+msgstr ""
+
+msgid "Allow remote to change its IP or port"
+msgstr ""
+
+msgid "Allowed maximum of connected clients"
+msgstr ""
+
+msgid "Allowed maximum of internal"
+msgstr ""
+
+msgid "Allowed maximum of new connections"
+msgstr ""
+
+msgid "Append log to file"
+msgstr ""
+
+msgid "Authenticate using username/password"
+msgstr ""
+
+msgid "Automatically redirect default route"
+msgstr ""
+
+msgid "Below is a list of configured OpenVPN instances and their current state"
+msgstr ""
+
+msgid "Call down cmd/script before TUN/TAP close"
+msgstr ""
+
+msgid "Certificate authority"
+msgstr ""
+
+msgid "Change process priority"
+msgstr ""
+
+msgid "Change to directory before initialization"
+msgstr ""
+
+msgid "Check peer certificate against a CRL"
+msgstr ""
+
+msgid "Chroot to directory after initialization"
+msgstr ""
+
+msgid "Client is disabled"
+msgstr ""
+
+msgid "Configuration category"
+msgstr ""
+
+msgid "Configure client mode"
+msgstr ""
+
+msgid "Configure server bridge"
+msgstr ""
+
+msgid "Configure server mode"
+msgstr ""
+
+msgid "Connect through Socks5 proxy"
+msgstr ""
+
+msgid "Connect to remote host through an HTTP proxy"
+msgstr ""
+
+msgid "Connection retry interval"
+msgstr ""
+
+msgid "Cryptography"
+msgstr ""
+
+msgid "Daemonize after initialization"
+msgstr ""
+
+msgid "Delay n seconds after connection"
+msgstr ""
+
+msgid "Delay tun/tap open and up script execution"
+msgstr ""
+
+msgid "Diffie Hellman parameters"
+msgstr ""
+
+msgid "Directory for custom client config files"
+msgstr ""
+
+msgid "Disable Paging"
+msgstr ""
+
+msgid "Disable cipher initialisation vector"
+msgstr ""
+
+msgid "Disable options consistency check"
+msgstr ""
+
+msgid "Disable replay protection"
+msgstr ""
+
+msgid "Do not bind to local address and port"
+msgstr ""
+
+msgid "Don't actually execute ifconfig"
+msgstr ""
+
+msgid "Don't add routes automatically"
+msgstr ""
+
+msgid "Don't cache --askpass or --auth-user-pass passwords"
+msgstr ""
+
+msgid "Don't inherit global push options"
+msgstr ""
+
+msgid "Don't log timestamps"
+msgstr ""
+
+msgid "Don't re-read key on restart"
+msgstr ""
+
+msgid "Don't require client certificate"
+msgstr ""
+
+msgid "Don't use adaptive lzo compression"
+msgstr ""
+
+msgid "Don't warn on ifconfig inconsistencies"
+msgstr ""
+
+msgid "Echo parameters to log"
+msgstr ""
+
+msgid "Empirically measure MTU"
+msgstr ""
+
+msgid "Enable OpenSSL hardware crypto engines"
+msgstr ""
+
+msgid "Enable Path MTU discovery"
+msgstr ""
+
+msgid "Enable Static Key encryption mode (non-TLS)"
+msgstr ""
+
+msgid "Enable TLS and assume client role"
+msgstr ""
+
+msgid "Enable TLS and assume server role"
+msgstr ""
+
+msgid "Enable internal datagram fragmentation"
+msgstr ""
+
+msgid "Enable management interface on <em>IP</em> <em>port</em>"
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid "Encryption cipher for packets"
+msgstr ""
+
+msgid "Execute shell cmd after routes are added"
+msgstr ""
+
+msgid "Execute shell command on remote ip change"
+msgstr ""
+
+msgid ""
+"Executed in server mode on new client connections, when the client is still "
+"untrusted"
+msgstr ""
+
+msgid ""
+"Executed in server mode whenever an IPv4 address/route or MAC address is "
+"added to OpenVPN's internal routing table"
+msgstr ""
+
+msgid "Exit on TLS negotiation failure"
+msgstr ""
+
+msgid "Get PEM password from controlling tty before we daemonize"
+msgstr ""
+
+msgid "HMAC authentication for packets"
+msgstr ""
+
+msgid "Handling of authentication failures"
+msgstr ""
+
+msgid ""
+"Helper directive to simplify the expression of --ping and --ping-restart in "
+"server mode configurations"
+msgstr ""
+
+msgid "If hostname resolve fails, retry"
+msgstr ""
+
+msgid "Instance \"%s\""
+msgstr ""
+
+msgid "Invalid"
+msgstr ""
+
+msgid "Keep local IP address on restart"
+msgstr ""
+
+msgid "Keep remote IP address on restart"
+msgstr ""
+
+msgid "Keep tun/tap device open on restart"
+msgstr ""
+
+msgid "Key transition window"
+msgstr ""
+
+msgid "Limit repeated log messages"
+msgstr ""
+
+msgid "Local certificate"
+msgstr ""
+
+msgid "Local host name or ip address"
+msgstr ""
+
+msgid "Local private key"
+msgstr ""
+
+msgid "Major mode"
+msgstr ""
+
+msgid "Make tun device IPv6 capable"
+msgstr ""
+
+msgid "Maximum number of queued TCP output packets"
+msgstr ""
+
+msgid "Networking"
+msgstr ""
+
+msgid "Number of allocated broadcast buffers"
+msgstr ""
+
+msgid "Number of lines for log file history"
+msgstr ""
+
+msgid "Only accept connections from given X509 name"
+msgstr ""
+
+msgid "Only process ping timeouts if routes exist"
+msgstr ""
+
+msgid "OpenVPN"
+msgstr ""
+
+msgid "OpenVPN instances"
+msgstr ""
+
+msgid "Optimize TUN/TAP/UDP writes"
+msgstr ""
+
+msgid "Output to syslog and do not daemonize"
+msgstr ""
+
+msgid "Overview"
+msgstr ""
+
+msgid "PKCS#12 file containing keys"
+msgstr ""
+
+msgid "Pass environment variables to script"
+msgstr ""
+
+msgid "Persist replay-protection state"
+msgstr ""
+
+msgid "Persist/unpersist ifconfig-pool"
+msgstr ""
+
+msgid "Ping remote every n seconds over TCP/UDP port"
+msgstr ""
+
+msgid "Policy level over usage of external programs and scripts"
+msgstr ""
+
+msgid "Port"
+msgstr ""
+
+msgid "Protocol"
+msgstr ""
+
+msgid "Proxy timeout in seconds"
+msgstr ""
+
+msgid "Push an ifconfig option to remote"
+msgstr ""
+
+msgid "Push options to peer"
+msgstr ""
+
+msgid "Query management channel for private key"
+msgstr ""
+
+msgid "Randomly choose remote server"
+msgstr ""
+
+msgid "Refuse connection if no custom client config"
+msgstr ""
+
+msgid "Remap SIGUSR1 signals"
+msgstr ""
+
+msgid "Remote host name or ip address"
+msgstr ""
+
+msgid "Remote ping timeout"
+msgstr ""
+
+msgid "Renegotiate data chan. key after bytes"
+msgstr ""
+
+msgid "Renegotiate data chan. key after packets"
+msgstr ""
+
+msgid "Renegotiate data chan. key after seconds"
+msgstr ""
+
+msgid "Replay protection sliding window size"
+msgstr ""
+
+msgid "Require explicit designation on certificate"
+msgstr ""
+
+msgid "Require explicit key usage on certificate"
+msgstr ""
+
+msgid "Restart after remote ping timeout"
+msgstr ""
+
+msgid "Retransmit timeout on TLS control channel"
+msgstr ""
+
+msgid "Retry indefinitely on HTTP proxy errors"
+msgstr ""
+
+msgid "Retry indefinitely on Socks proxy errors"
+msgstr ""
+
+msgid "Route subnet to client"
+msgstr ""
+
+msgid "Run as an inetd or xinetd server"
+msgstr ""
+
+msgid "Run script cmd on client connection"
+msgstr ""
+
+msgid "Run script cmd on client disconnection"
+msgstr ""
+
+msgid "Run up/down scripts for all restarts"
+msgstr ""
+
+msgid "Send notification to peer on disconnect"
+msgstr ""
+
+msgid "Service"
+msgstr ""
+
+msgid "Set GID to group"
+msgstr ""
+
+msgid "Set TCP/UDP MTU"
+msgstr ""
+
+msgid "Set UID to user"
+msgstr ""
+
+msgid "Set aside a pool of subnets"
+msgstr ""
+
+msgid "Set extended HTTP proxy options"
+msgstr ""
+
+msgid "Set output verbosity"
+msgstr ""
+
+msgid "Set size of real and virtual address hash tables"
+msgstr ""
+
+msgid "Set the TCP/UDP receive buffer size"
+msgstr ""
+
+msgid "Set the TCP/UDP send buffer size"
+msgstr ""
+
+msgid "Set tun/tap TX queue length"
+msgstr ""
+
+msgid "Set tun/tap adapter parameters"
+msgstr ""
+
+msgid "Set tun/tap device MTU"
+msgstr ""
+
+msgid "Set tun/tap device overhead"
+msgstr ""
+
+msgid "Set upper bound on TCP MSS"
+msgstr ""
+
+msgid "Shaping for peer bandwidth"
+msgstr ""
+
+msgid "Shell cmd to execute after tun device open"
+msgstr ""
+
+msgid "Shell cmd to run after tun device close"
+msgstr ""
+
+msgid "Shell command to verify X509 name"
+msgstr ""
+
+msgid "Silence the output of replay warnings"
+msgstr ""
+
+msgid "Size of cipher key"
+msgstr ""
+
+msgid "Specify a default gateway for routes"
+msgstr ""
+
+msgid "Start OpenVPN in a hibernating state"
+msgstr ""
+
+msgid "Start/Stop"
+msgstr ""
+
+msgid "Started"
+msgstr ""
+
+msgid "Status file format version"
+msgstr ""
+
+msgid "Switch to advanced configuration »"
+msgstr ""
+
+msgid "TCP/UDP port # for both local and remote"
+msgstr ""
+
+msgid "TCP/UDP port # for local (default=1194)"
+msgstr ""
+
+msgid "TCP/UDP port # for remote (default=1194)"
+msgstr ""
+
+msgid "TLS cipher"
+msgstr ""
+
+msgid "TOS passthrough (applies to IPv4 only)"
+msgstr ""
+
+msgid "Temporary directory for client-connect return file"
+msgstr ""
+
+msgid "Timeframe for key exchange"
+msgstr ""
+
+msgid "Type of used device"
+msgstr ""
+
+msgid "Use fast LZO compression"
+msgstr ""
+
+msgid "Use individual addresses rather than /30 subnets"
+msgstr ""
+
+msgid "Use protocol"
+msgstr ""
+
+msgid "Use tun/tap device node"
+msgstr ""
+
+msgid "Use username as common name"
+msgstr ""
+
+msgid "VPN"
+msgstr ""
+
+msgid "Write log to file"
+msgstr ""
+
+msgid "Write process ID to file"
+msgstr ""
+
+msgid "Write status to file every n seconds"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "tun/tap device"
+msgstr ""
+
+msgid "tun/tap inactivity timeout"
+msgstr ""
+
+msgid "yes (%i)"
+msgstr ""
+
+msgid "« Switch to basic configuration"
+msgstr ""
diff --git a/po/tr/openvpn.po b/applications/luci-app-openvpn/po/tr/openvpn.po
index c57805bdc0..c57805bdc0 100644
--- a/po/tr/openvpn.po
+++ b/applications/luci-app-openvpn/po/tr/openvpn.po
diff --git a/po/uk/openvpn.po b/applications/luci-app-openvpn/po/uk/openvpn.po
index 129c596873..129c596873 100644
--- a/po/uk/openvpn.po
+++ b/applications/luci-app-openvpn/po/uk/openvpn.po
diff --git a/po/vi/openvpn.po b/applications/luci-app-openvpn/po/vi/openvpn.po
index da4e4f23c3..da4e4f23c3 100644
--- a/po/vi/openvpn.po
+++ b/applications/luci-app-openvpn/po/vi/openvpn.po
diff --git a/po/zh_CN/openvpn.po b/applications/luci-app-openvpn/po/zh-cn/openvpn.po
index 7f22a97c45..7f22a97c45 100644
--- a/po/zh_CN/openvpn.po
+++ b/applications/luci-app-openvpn/po/zh-cn/openvpn.po
diff --git a/po/zh_TW/openvpn.po b/applications/luci-app-openvpn/po/zh-tw/openvpn.po
index bddb9c7ae0..bddb9c7ae0 100644
--- a/po/zh_TW/openvpn.po
+++ b/applications/luci-app-openvpn/po/zh-tw/openvpn.po
diff --git a/applications/luci-openvpn/root/etc/config/openvpn_recipes b/applications/luci-app-openvpn/root/etc/config/openvpn_recipes
index 1b394dffbc..1b394dffbc 100644
--- a/applications/luci-openvpn/root/etc/config/openvpn_recipes
+++ b/applications/luci-app-openvpn/root/etc/config/openvpn_recipes
diff --git a/applications/luci-app-p2pblock/Makefile b/applications/luci-app-p2pblock/Makefile
new file mode 100644
index 0000000000..4dbeb5eaa5
--- /dev/null
+++ b/applications/luci-app-p2pblock/Makefile
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=LuCI Support for the Freifunk P2P-Block addon
+LUCI_DEPENDS:=+luci-app-firewall +freifunk-p2pblock
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/applications/luci-p2pblock/ipkg/postinst b/applications/luci-app-p2pblock/ipkg/postinst
index 448025b761..448025b761 100755
--- a/applications/luci-p2pblock/ipkg/postinst
+++ b/applications/luci-app-p2pblock/ipkg/postinst
diff --git a/applications/luci-p2pblock/luasrc/controller/ff_p2pblock.lua b/applications/luci-app-p2pblock/luasrc/controller/ff_p2pblock.lua
index 887f18756f..887f18756f 100644
--- a/applications/luci-p2pblock/luasrc/controller/ff_p2pblock.lua
+++ b/applications/luci-app-p2pblock/luasrc/controller/ff_p2pblock.lua
diff --git a/applications/luci-p2pblock/luasrc/model/cbi/luci_fw/p2pblock.lua b/applications/luci-app-p2pblock/luasrc/model/cbi/luci_fw/p2pblock.lua
index 35f76cd2bc..35f76cd2bc 100644
--- a/applications/luci-p2pblock/luasrc/model/cbi/luci_fw/p2pblock.lua
+++ b/applications/luci-app-p2pblock/luasrc/model/cbi/luci_fw/p2pblock.lua
diff --git a/po/ca/p2pblock.po b/applications/luci-app-p2pblock/po/ca/p2pblock.po
index fe99a772ef..fe99a772ef 100644
--- a/po/ca/p2pblock.po
+++ b/applications/luci-app-p2pblock/po/ca/p2pblock.po
diff --git a/po/cs/p2pblock.po b/applications/luci-app-p2pblock/po/cs/p2pblock.po
index 02eafef459..02eafef459 100644
--- a/po/cs/p2pblock.po
+++ b/applications/luci-app-p2pblock/po/cs/p2pblock.po
diff --git a/po/de/p2pblock.po b/applications/luci-app-p2pblock/po/de/p2pblock.po
index e3613d650a..e3613d650a 100644
--- a/po/de/p2pblock.po
+++ b/applications/luci-app-p2pblock/po/de/p2pblock.po
diff --git a/po/el/p2pblock.po b/applications/luci-app-p2pblock/po/el/p2pblock.po
index 9db357ac5d..9db357ac5d 100644
--- a/po/el/p2pblock.po
+++ b/applications/luci-app-p2pblock/po/el/p2pblock.po
diff --git a/po/en/p2pblock.po b/applications/luci-app-p2pblock/po/en/p2pblock.po
index 00cccc8e62..00cccc8e62 100644
--- a/po/en/p2pblock.po
+++ b/applications/luci-app-p2pblock/po/en/p2pblock.po
diff --git a/po/es/p2pblock.po b/applications/luci-app-p2pblock/po/es/p2pblock.po
index 1edc53304f..1edc53304f 100644
--- a/po/es/p2pblock.po
+++ b/applications/luci-app-p2pblock/po/es/p2pblock.po
diff --git a/po/fr/p2pblock.po b/applications/luci-app-p2pblock/po/fr/p2pblock.po
index 524d3d0850..524d3d0850 100644
--- a/po/fr/p2pblock.po
+++ b/applications/luci-app-p2pblock/po/fr/p2pblock.po
diff --git a/po/he/p2pblock.po b/applications/luci-app-p2pblock/po/he/p2pblock.po
index 5b2679b4b9..5b2679b4b9 100644
--- a/po/he/p2pblock.po
+++ b/applications/luci-app-p2pblock/po/he/p2pblock.po
diff --git a/po/hu/p2pblock.po b/applications/luci-app-p2pblock/po/hu/p2pblock.po
index 4f1dffa209..4f1dffa209 100644
--- a/po/hu/p2pblock.po
+++ b/applications/luci-app-p2pblock/po/hu/p2pblock.po
diff --git a/po/it/p2pblock.po b/applications/luci-app-p2pblock/po/it/p2pblock.po
index 3be501051b..3be501051b 100644
--- a/po/it/p2pblock.po
+++ b/applications/luci-app-p2pblock/po/it/p2pblock.po
diff --git a/po/ja/p2pblock.po b/applications/luci-app-p2pblock/po/ja/p2pblock.po
index 00cccc8e62..00cccc8e62 100644
--- a/po/ja/p2pblock.po
+++ b/applications/luci-app-p2pblock/po/ja/p2pblock.po
diff --git a/po/ms/p2pblock.po b/applications/luci-app-p2pblock/po/ms/p2pblock.po
index 00cccc8e62..00cccc8e62 100644
--- a/po/ms/p2pblock.po
+++ b/applications/luci-app-p2pblock/po/ms/p2pblock.po
diff --git a/po/no/p2pblock.po b/applications/luci-app-p2pblock/po/no/p2pblock.po
index af9c25ea34..af9c25ea34 100644
--- a/po/no/p2pblock.po
+++ b/applications/luci-app-p2pblock/po/no/p2pblock.po
diff --git a/po/pl/p2pblock.po b/applications/luci-app-p2pblock/po/pl/p2pblock.po
index 9222a0863f..9222a0863f 100644
--- a/po/pl/p2pblock.po
+++ b/applications/luci-app-p2pblock/po/pl/p2pblock.po
diff --git a/po/pt_BR/p2pblock.po b/applications/luci-app-p2pblock/po/pt-br/p2pblock.po
index de3638164e..de3638164e 100644
--- a/po/pt_BR/p2pblock.po
+++ b/applications/luci-app-p2pblock/po/pt-br/p2pblock.po
diff --git a/po/pt/p2pblock.po b/applications/luci-app-p2pblock/po/pt/p2pblock.po
index 365f9f277e..365f9f277e 100644
--- a/po/pt/p2pblock.po
+++ b/applications/luci-app-p2pblock/po/pt/p2pblock.po
diff --git a/po/ro/p2pblock.po b/applications/luci-app-p2pblock/po/ro/p2pblock.po
index 2f7d74e7fd..2f7d74e7fd 100644
--- a/po/ro/p2pblock.po
+++ b/applications/luci-app-p2pblock/po/ro/p2pblock.po
diff --git a/po/ru/p2pblock.po b/applications/luci-app-p2pblock/po/ru/p2pblock.po
index f6a27401b0..f6a27401b0 100644
--- a/po/ru/p2pblock.po
+++ b/applications/luci-app-p2pblock/po/ru/p2pblock.po
diff --git a/po/sk/p2pblock.po b/applications/luci-app-p2pblock/po/sk/p2pblock.po
index 1881b3cebd..1881b3cebd 100644
--- a/po/sk/p2pblock.po
+++ b/applications/luci-app-p2pblock/po/sk/p2pblock.po
diff --git a/po/sv/p2pblock.po b/applications/luci-app-p2pblock/po/sv/p2pblock.po
index de6e66a89d..de6e66a89d 100644
--- a/po/sv/p2pblock.po
+++ b/applications/luci-app-p2pblock/po/sv/p2pblock.po
diff --git a/applications/luci-app-p2pblock/po/templates/p2pblock.pot b/applications/luci-app-p2pblock/po/templates/p2pblock.pot
new file mode 100644
index 0000000000..6fa5da1100
--- /dev/null
+++ b/applications/luci-app-p2pblock/po/templates/p2pblock.pot
@@ -0,0 +1,31 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "Block Time"
+msgstr ""
+
+msgid "Enable P2P-Block"
+msgstr ""
+
+msgid "IP-P2P"
+msgstr ""
+
+msgid "Layer7-Protocols"
+msgstr ""
+
+msgid "P2P-Block"
+msgstr ""
+
+msgid ""
+"P2P-Block is a greylisting mechanism to block various peer-to-peer protocols "
+"for non-whitelisted clients."
+msgstr ""
+
+msgid "Portrange"
+msgstr ""
+
+msgid "Whitelisted IPs"
+msgstr ""
+
+msgid "seconds"
+msgstr ""
diff --git a/po/tr/p2pblock.po b/applications/luci-app-p2pblock/po/tr/p2pblock.po
index 7c670d8ecc..7c670d8ecc 100644
--- a/po/tr/p2pblock.po
+++ b/applications/luci-app-p2pblock/po/tr/p2pblock.po
diff --git a/po/uk/p2pblock.po b/applications/luci-app-p2pblock/po/uk/p2pblock.po
index 3e7dff9fa2..3e7dff9fa2 100644
--- a/po/uk/p2pblock.po
+++ b/applications/luci-app-p2pblock/po/uk/p2pblock.po
diff --git a/po/vi/p2pblock.po b/applications/luci-app-p2pblock/po/vi/p2pblock.po
index 4bad090461..4bad090461 100644
--- a/po/vi/p2pblock.po
+++ b/applications/luci-app-p2pblock/po/vi/p2pblock.po
diff --git a/po/zh_CN/p2pblock.po b/applications/luci-app-p2pblock/po/zh-cn/p2pblock.po
index 66725be6e1..66725be6e1 100644
--- a/po/zh_CN/p2pblock.po
+++ b/applications/luci-app-p2pblock/po/zh-cn/p2pblock.po
diff --git a/po/zh_TW/p2pblock.po b/applications/luci-app-p2pblock/po/zh-tw/p2pblock.po
index f542f7794b..f542f7794b 100644
--- a/po/zh_TW/p2pblock.po
+++ b/applications/luci-app-p2pblock/po/zh-tw/p2pblock.po
diff --git a/applications/luci-p2pblock/root/etc/uci-defaults/luci-p2pblock b/applications/luci-app-p2pblock/root/etc/uci-defaults/luci-p2pblock
index 030ebbed17..030ebbed17 100755
--- a/applications/luci-p2pblock/root/etc/uci-defaults/luci-p2pblock
+++ b/applications/luci-app-p2pblock/root/etc/uci-defaults/luci-p2pblock
diff --git a/applications/luci-app-p910nd/Makefile b/applications/luci-app-p910nd/Makefile
new file mode 100644
index 0000000000..adb35bd47f
--- /dev/null
+++ b/applications/luci-app-p910nd/Makefile
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=p910nd - Printer server module
+LUCI_DEPENDS:=+p910nd
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/applications/luci-p910nd/ipkg/postinst b/applications/luci-app-p910nd/ipkg/postinst
index 36a91e21b1..36a91e21b1 100644
--- a/applications/luci-p910nd/ipkg/postinst
+++ b/applications/luci-app-p910nd/ipkg/postinst
diff --git a/applications/luci-p910nd/luasrc/controller/p910nd.lua b/applications/luci-app-p910nd/luasrc/controller/p910nd.lua
index 4efaef8a18..4efaef8a18 100644
--- a/applications/luci-p910nd/luasrc/controller/p910nd.lua
+++ b/applications/luci-app-p910nd/luasrc/controller/p910nd.lua
diff --git a/applications/luci-p910nd/luasrc/model/cbi/p910nd.lua b/applications/luci-app-p910nd/luasrc/model/cbi/p910nd.lua
index 7580a3e74e..7580a3e74e 100644
--- a/applications/luci-p910nd/luasrc/model/cbi/p910nd.lua
+++ b/applications/luci-app-p910nd/luasrc/model/cbi/p910nd.lua
diff --git a/po/ca/p910nd.po b/applications/luci-app-p910nd/po/ca/p910nd.po
index 6862df4692..6862df4692 100644
--- a/po/ca/p910nd.po
+++ b/applications/luci-app-p910nd/po/ca/p910nd.po
diff --git a/po/cs/p910nd.po b/applications/luci-app-p910nd/po/cs/p910nd.po
index e4f1c71e5c..e4f1c71e5c 100644
--- a/po/cs/p910nd.po
+++ b/applications/luci-app-p910nd/po/cs/p910nd.po
diff --git a/po/de/p910nd.po b/applications/luci-app-p910nd/po/de/p910nd.po
index 7d1628c1cf..7d1628c1cf 100644
--- a/po/de/p910nd.po
+++ b/applications/luci-app-p910nd/po/de/p910nd.po
diff --git a/po/el/p910nd.po b/applications/luci-app-p910nd/po/el/p910nd.po
index 13b97c02ea..13b97c02ea 100644
--- a/po/el/p910nd.po
+++ b/applications/luci-app-p910nd/po/el/p910nd.po
diff --git a/po/en/p910nd.po b/applications/luci-app-p910nd/po/en/p910nd.po
index 766673ac73..766673ac73 100644
--- a/po/en/p910nd.po
+++ b/applications/luci-app-p910nd/po/en/p910nd.po
diff --git a/po/es/p910nd.po b/applications/luci-app-p910nd/po/es/p910nd.po
index f558c99488..f558c99488 100644
--- a/po/es/p910nd.po
+++ b/applications/luci-app-p910nd/po/es/p910nd.po
diff --git a/po/fr/p910nd.po b/applications/luci-app-p910nd/po/fr/p910nd.po
index 5621e102df..5621e102df 100644
--- a/po/fr/p910nd.po
+++ b/applications/luci-app-p910nd/po/fr/p910nd.po
diff --git a/po/he/p910nd.po b/applications/luci-app-p910nd/po/he/p910nd.po
index 3accdca6ad..3accdca6ad 100644
--- a/po/he/p910nd.po
+++ b/applications/luci-app-p910nd/po/he/p910nd.po
diff --git a/po/hu/p910nd.po b/applications/luci-app-p910nd/po/hu/p910nd.po
index 717987190c..717987190c 100644
--- a/po/hu/p910nd.po
+++ b/applications/luci-app-p910nd/po/hu/p910nd.po
diff --git a/po/it/p910nd.po b/applications/luci-app-p910nd/po/it/p910nd.po
index 47bf687362..47bf687362 100644
--- a/po/it/p910nd.po
+++ b/applications/luci-app-p910nd/po/it/p910nd.po
diff --git a/po/ja/p910nd.po b/applications/luci-app-p910nd/po/ja/p910nd.po
index 42335cefaf..42335cefaf 100644
--- a/po/ja/p910nd.po
+++ b/applications/luci-app-p910nd/po/ja/p910nd.po
diff --git a/po/ms/p910nd.po b/applications/luci-app-p910nd/po/ms/p910nd.po
index 254fc66c28..254fc66c28 100644
--- a/po/ms/p910nd.po
+++ b/applications/luci-app-p910nd/po/ms/p910nd.po
diff --git a/po/no/p910nd.po b/applications/luci-app-p910nd/po/no/p910nd.po
index 3bf49c566f..3bf49c566f 100644
--- a/po/no/p910nd.po
+++ b/applications/luci-app-p910nd/po/no/p910nd.po
diff --git a/po/pl/p910nd.po b/applications/luci-app-p910nd/po/pl/p910nd.po
index c5f611ab73..c5f611ab73 100644
--- a/po/pl/p910nd.po
+++ b/applications/luci-app-p910nd/po/pl/p910nd.po
diff --git a/po/pt_BR/p910nd.po b/applications/luci-app-p910nd/po/pt-br/p910nd.po
index de7c42948a..de7c42948a 100644
--- a/po/pt_BR/p910nd.po
+++ b/applications/luci-app-p910nd/po/pt-br/p910nd.po
diff --git a/po/pt/p910nd.po b/applications/luci-app-p910nd/po/pt/p910nd.po
index 734967e8a5..734967e8a5 100644
--- a/po/pt/p910nd.po
+++ b/applications/luci-app-p910nd/po/pt/p910nd.po
diff --git a/po/ro/p910nd.po b/applications/luci-app-p910nd/po/ro/p910nd.po
index 7cad5c0695..7cad5c0695 100644
--- a/po/ro/p910nd.po
+++ b/applications/luci-app-p910nd/po/ro/p910nd.po
diff --git a/po/ru/p910nd.po b/applications/luci-app-p910nd/po/ru/p910nd.po
index 923b22e00e..923b22e00e 100644
--- a/po/ru/p910nd.po
+++ b/applications/luci-app-p910nd/po/ru/p910nd.po
diff --git a/po/sk/p910nd.po b/applications/luci-app-p910nd/po/sk/p910nd.po
index 5282dd724e..5282dd724e 100644
--- a/po/sk/p910nd.po
+++ b/applications/luci-app-p910nd/po/sk/p910nd.po
diff --git a/po/sv/p910nd.po b/applications/luci-app-p910nd/po/sv/p910nd.po
index 98febee6b4..98febee6b4 100644
--- a/po/sv/p910nd.po
+++ b/applications/luci-app-p910nd/po/sv/p910nd.po
diff --git a/applications/luci-app-p910nd/po/templates/p910nd.pot b/applications/luci-app-p910nd/po/templates/p910nd.pot
new file mode 100644
index 0000000000..3674fdb249
--- /dev/null
+++ b/applications/luci-app-p910nd/po/templates/p910nd.pot
@@ -0,0 +1,34 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "Bidirectional mode"
+msgstr ""
+
+msgid "Device"
+msgstr ""
+
+msgid ""
+"First you have to install the packages to get support for USB (kmod-usb-"
+"printer) or parallel port (kmod-lp)."
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid "Port"
+msgstr ""
+
+msgid "Settings"
+msgstr ""
+
+msgid "Specifies the interface to listen on."
+msgstr ""
+
+msgid "TCP listener port."
+msgstr ""
+
+msgid "enable"
+msgstr ""
+
+msgid "p910nd - Printer server"
+msgstr ""
diff --git a/po/tr/p910nd.po b/applications/luci-app-p910nd/po/tr/p910nd.po
index ed69a011bc..ed69a011bc 100644
--- a/po/tr/p910nd.po
+++ b/applications/luci-app-p910nd/po/tr/p910nd.po
diff --git a/po/uk/p910nd.po b/applications/luci-app-p910nd/po/uk/p910nd.po
index 237054d2c5..237054d2c5 100644
--- a/po/uk/p910nd.po
+++ b/applications/luci-app-p910nd/po/uk/p910nd.po
diff --git a/po/vi/p910nd.po b/applications/luci-app-p910nd/po/vi/p910nd.po
index 10035b8676..10035b8676 100644
--- a/po/vi/p910nd.po
+++ b/applications/luci-app-p910nd/po/vi/p910nd.po
diff --git a/po/zh_CN/p910nd.po b/applications/luci-app-p910nd/po/zh-cn/p910nd.po
index c14e2e7cba..c14e2e7cba 100644
--- a/po/zh_CN/p910nd.po
+++ b/applications/luci-app-p910nd/po/zh-cn/p910nd.po
diff --git a/po/zh_TW/p910nd.po b/applications/luci-app-p910nd/po/zh-tw/p910nd.po
index 7d6c08041e..7d6c08041e 100644
--- a/po/zh_TW/p910nd.po
+++ b/applications/luci-app-p910nd/po/zh-tw/p910nd.po
diff --git a/applications/luci-p910nd/root/etc/uci-defaults/luci-p910nd b/applications/luci-app-p910nd/root/etc/uci-defaults/luci-p910nd
index 80f6d62fa2..80f6d62fa2 100755
--- a/applications/luci-p910nd/root/etc/uci-defaults/luci-p910nd
+++ b/applications/luci-app-p910nd/root/etc/uci-defaults/luci-p910nd
diff --git a/applications/luci-pbx-voicemail/COPYING b/applications/luci-app-pbx-voicemail/COPYING
index 94a9ed024d..94a9ed024d 100644
--- a/applications/luci-pbx-voicemail/COPYING
+++ b/applications/luci-app-pbx-voicemail/COPYING
diff --git a/applications/luci-app-pbx-voicemail/Makefile b/applications/luci-app-pbx-voicemail/Makefile
new file mode 100644
index 0000000000..d31d429f13
--- /dev/null
+++ b/applications/luci-app-pbx-voicemail/Makefile
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=LuCI PBX Administration Voicemail Support
+LUCI_DEPENDS:=+luci-app-pbx +asterisk18 +msmtp +coreutils-base64
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/applications/luci-pbx-voicemail/luasrc/controller/pbx-voicemail.lua b/applications/luci-app-pbx-voicemail/luasrc/controller/pbx-voicemail.lua
index 6f3dfac05e..6f3dfac05e 100644
--- a/applications/luci-pbx-voicemail/luasrc/controller/pbx-voicemail.lua
+++ b/applications/luci-app-pbx-voicemail/luasrc/controller/pbx-voicemail.lua
diff --git a/applications/luci-pbx-voicemail/luasrc/model/cbi/pbx-voicemail.lua b/applications/luci-app-pbx-voicemail/luasrc/model/cbi/pbx-voicemail.lua
index 9ff2ed97fe..9ff2ed97fe 100644
--- a/applications/luci-pbx-voicemail/luasrc/model/cbi/pbx-voicemail.lua
+++ b/applications/luci-app-pbx-voicemail/luasrc/model/cbi/pbx-voicemail.lua
diff --git a/po/ca/pbx-voicemail.po b/applications/luci-app-pbx-voicemail/po/ca/pbx-voicemail.po
index c0119f7735..c0119f7735 100644
--- a/po/ca/pbx-voicemail.po
+++ b/applications/luci-app-pbx-voicemail/po/ca/pbx-voicemail.po
diff --git a/po/cs/pbx-voicemail.po b/applications/luci-app-pbx-voicemail/po/cs/pbx-voicemail.po
index 6d94b3522c..6d94b3522c 100644
--- a/po/cs/pbx-voicemail.po
+++ b/applications/luci-app-pbx-voicemail/po/cs/pbx-voicemail.po
diff --git a/po/de/pbx-voicemail.po b/applications/luci-app-pbx-voicemail/po/de/pbx-voicemail.po
index 224b5a929b..224b5a929b 100644
--- a/po/de/pbx-voicemail.po
+++ b/applications/luci-app-pbx-voicemail/po/de/pbx-voicemail.po
diff --git a/po/el/pbx-voicemail.po b/applications/luci-app-pbx-voicemail/po/el/pbx-voicemail.po
index fc0a2e351f..fc0a2e351f 100644
--- a/po/el/pbx-voicemail.po
+++ b/applications/luci-app-pbx-voicemail/po/el/pbx-voicemail.po
diff --git a/po/en/pbx-voicemail.po b/applications/luci-app-pbx-voicemail/po/en/pbx-voicemail.po
index 79c8848bdb..79c8848bdb 100644
--- a/po/en/pbx-voicemail.po
+++ b/applications/luci-app-pbx-voicemail/po/en/pbx-voicemail.po
diff --git a/po/es/pbx-voicemail.po b/applications/luci-app-pbx-voicemail/po/es/pbx-voicemail.po
index 384e169de1..384e169de1 100644
--- a/po/es/pbx-voicemail.po
+++ b/applications/luci-app-pbx-voicemail/po/es/pbx-voicemail.po
diff --git a/po/fr/pbx-voicemail.po b/applications/luci-app-pbx-voicemail/po/fr/pbx-voicemail.po
index 0ccaa502e6..0ccaa502e6 100644
--- a/po/fr/pbx-voicemail.po
+++ b/applications/luci-app-pbx-voicemail/po/fr/pbx-voicemail.po
diff --git a/po/he/pbx-voicemail.po b/applications/luci-app-pbx-voicemail/po/he/pbx-voicemail.po
index be25f0b591..be25f0b591 100644
--- a/po/he/pbx-voicemail.po
+++ b/applications/luci-app-pbx-voicemail/po/he/pbx-voicemail.po
diff --git a/po/hu/pbx-voicemail.po b/applications/luci-app-pbx-voicemail/po/hu/pbx-voicemail.po
index be25f0b591..be25f0b591 100644
--- a/po/hu/pbx-voicemail.po
+++ b/applications/luci-app-pbx-voicemail/po/hu/pbx-voicemail.po
diff --git a/po/it/pbx-voicemail.po b/applications/luci-app-pbx-voicemail/po/it/pbx-voicemail.po
index fe8c4bf004..fe8c4bf004 100644
--- a/po/it/pbx-voicemail.po
+++ b/applications/luci-app-pbx-voicemail/po/it/pbx-voicemail.po
diff --git a/po/ja/pbx-voicemail.po b/applications/luci-app-pbx-voicemail/po/ja/pbx-voicemail.po
index 19e26bffa8..19e26bffa8 100644
--- a/po/ja/pbx-voicemail.po
+++ b/applications/luci-app-pbx-voicemail/po/ja/pbx-voicemail.po
diff --git a/po/ms/pbx-voicemail.po b/applications/luci-app-pbx-voicemail/po/ms/pbx-voicemail.po
index bf633a6702..bf633a6702 100644
--- a/po/ms/pbx-voicemail.po
+++ b/applications/luci-app-pbx-voicemail/po/ms/pbx-voicemail.po
diff --git a/po/no/pbx-voicemail.po b/applications/luci-app-pbx-voicemail/po/no/pbx-voicemail.po
index be25f0b591..be25f0b591 100644
--- a/po/no/pbx-voicemail.po
+++ b/applications/luci-app-pbx-voicemail/po/no/pbx-voicemail.po
diff --git a/po/pl/pbx-voicemail.po b/applications/luci-app-pbx-voicemail/po/pl/pbx-voicemail.po
index 3f07fe4ba4..3f07fe4ba4 100644
--- a/po/pl/pbx-voicemail.po
+++ b/applications/luci-app-pbx-voicemail/po/pl/pbx-voicemail.po
diff --git a/po/pt_BR/pbx-voicemail.po b/applications/luci-app-pbx-voicemail/po/pt-br/pbx-voicemail.po
index 2e3a51e7f9..2e3a51e7f9 100644
--- a/po/pt_BR/pbx-voicemail.po
+++ b/applications/luci-app-pbx-voicemail/po/pt-br/pbx-voicemail.po
diff --git a/po/pt/pbx-voicemail.po b/applications/luci-app-pbx-voicemail/po/pt/pbx-voicemail.po
index f5cfd89e49..f5cfd89e49 100644
--- a/po/pt/pbx-voicemail.po
+++ b/applications/luci-app-pbx-voicemail/po/pt/pbx-voicemail.po
diff --git a/po/ro/pbx-voicemail.po b/applications/luci-app-pbx-voicemail/po/ro/pbx-voicemail.po
index 42b66f6238..42b66f6238 100644
--- a/po/ro/pbx-voicemail.po
+++ b/applications/luci-app-pbx-voicemail/po/ro/pbx-voicemail.po
diff --git a/po/ru/pbx-voicemail.po b/applications/luci-app-pbx-voicemail/po/ru/pbx-voicemail.po
index ae49c6dd8f..ae49c6dd8f 100644
--- a/po/ru/pbx-voicemail.po
+++ b/applications/luci-app-pbx-voicemail/po/ru/pbx-voicemail.po
diff --git a/po/sk/pbx-voicemail.po b/applications/luci-app-pbx-voicemail/po/sk/pbx-voicemail.po
index c3a5c5ff92..c3a5c5ff92 100644
--- a/po/sk/pbx-voicemail.po
+++ b/applications/luci-app-pbx-voicemail/po/sk/pbx-voicemail.po
diff --git a/po/sv/pbx-voicemail.po b/applications/luci-app-pbx-voicemail/po/sv/pbx-voicemail.po
index ea62b395b3..ea62b395b3 100644
--- a/po/sv/pbx-voicemail.po
+++ b/applications/luci-app-pbx-voicemail/po/sv/pbx-voicemail.po
diff --git a/applications/luci-app-pbx-voicemail/po/templates/pbx-voicemail.pot b/applications/luci-app-pbx-voicemail/po/templates/pbx-voicemail.pot
new file mode 100644
index 0000000000..35cdca33ac
--- /dev/null
+++ b/applications/luci-app-pbx-voicemail/po/templates/pbx-voicemail.pot
@@ -0,0 +1,81 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "Email Addresses that Receive Voicemail"
+msgstr ""
+
+msgid "Enable Voicemail"
+msgstr ""
+
+msgid "Global Voicemail Setup"
+msgstr ""
+
+msgid ""
+"Here you can configure a global voicemail for this PBX. Since this system is "
+"intended to run on embedded systems like routers, there is no local storage "
+"of voicemail - it must be sent out by email. Therefore you need to configure "
+"an outgoing mail (SMTP) server (for example your ISP's, Google's, or Yahoo's "
+"SMTP server), and provide a list of addresses that receive recorded "
+"voicemail."
+msgstr ""
+
+msgid ""
+"In order for this PBX to send emails containing voicemail recordings, you "
+"need to set up an SMTP server here. Your ISP usually provides an SMTP server "
+"for that purpose. You can also set up a third party SMTP server such as the "
+"one provided by Google or Yahoo."
+msgstr ""
+
+msgid "Last Sent Voicemail Log"
+msgstr ""
+
+msgid "Local Storage Directory"
+msgstr ""
+
+msgid "No"
+msgstr ""
+
+msgid "Outgoing mail (SMTP) Server"
+msgstr ""
+
+msgid "SMTP Password"
+msgstr ""
+
+msgid "SMTP Port Number"
+msgstr ""
+
+msgid "SMTP Server Authentication"
+msgstr ""
+
+msgid "SMTP Server Hostname or IP Address"
+msgstr ""
+
+msgid "SMTP User Name"
+msgstr ""
+
+msgid "Secure Connection Using TLS"
+msgstr ""
+
+msgid "Voicemail Setup"
+msgstr ""
+
+msgid ""
+"When you enable voicemail, you will have the opportunity to specify email "
+"addresses that receive recorded voicemail. You must also set up an SMTP "
+"server below."
+msgstr ""
+
+msgid "Yes"
+msgstr ""
+
+msgid ""
+"You can also retain copies of voicemail messages on the device running your "
+"PBX. The path specified here will be created if it doesn't exist. Beware of "
+"limited space on embedded devices like routers, and enable this option only "
+"if you know what you are doing."
+msgstr ""
+
+msgid ""
+"Your real SMTP password is not shown for your protection. It will be changed "
+"only when you change the value in this box."
+msgstr ""
diff --git a/po/tr/pbx-voicemail.po b/applications/luci-app-pbx-voicemail/po/tr/pbx-voicemail.po
index 19e26bffa8..19e26bffa8 100644
--- a/po/tr/pbx-voicemail.po
+++ b/applications/luci-app-pbx-voicemail/po/tr/pbx-voicemail.po
diff --git a/po/uk/pbx-voicemail.po b/applications/luci-app-pbx-voicemail/po/uk/pbx-voicemail.po
index 565418376a..565418376a 100644
--- a/po/uk/pbx-voicemail.po
+++ b/applications/luci-app-pbx-voicemail/po/uk/pbx-voicemail.po
diff --git a/po/vi/pbx-voicemail.po b/applications/luci-app-pbx-voicemail/po/vi/pbx-voicemail.po
index 19e26bffa8..19e26bffa8 100644
--- a/po/vi/pbx-voicemail.po
+++ b/applications/luci-app-pbx-voicemail/po/vi/pbx-voicemail.po
diff --git a/po/zh_CN/pbx-voicemail.po b/applications/luci-app-pbx-voicemail/po/zh-cn/pbx-voicemail.po
index 0be8258a08..0be8258a08 100644
--- a/po/zh_CN/pbx-voicemail.po
+++ b/applications/luci-app-pbx-voicemail/po/zh-cn/pbx-voicemail.po
diff --git a/po/zh_TW/pbx-voicemail.po b/applications/luci-app-pbx-voicemail/po/zh-tw/pbx-voicemail.po
index 14de629830..14de629830 100644
--- a/po/zh_TW/pbx-voicemail.po
+++ b/applications/luci-app-pbx-voicemail/po/zh-tw/pbx-voicemail.po
diff --git a/applications/luci-pbx-voicemail/root/etc/config/pbx-voicemail b/applications/luci-app-pbx-voicemail/root/etc/config/pbx-voicemail
index 94e3e96ae8..94e3e96ae8 100644
--- a/applications/luci-pbx-voicemail/root/etc/config/pbx-voicemail
+++ b/applications/luci-app-pbx-voicemail/root/etc/config/pbx-voicemail
diff --git a/applications/luci-pbx-voicemail/root/etc/pbx-voicemail/pbx-move-greeting b/applications/luci-app-pbx-voicemail/root/etc/pbx-voicemail/pbx-move-greeting
index 21fe69414b..21fe69414b 100755
--- a/applications/luci-pbx-voicemail/root/etc/pbx-voicemail/pbx-move-greeting
+++ b/applications/luci-app-pbx-voicemail/root/etc/pbx-voicemail/pbx-move-greeting
diff --git a/applications/luci-pbx-voicemail/root/etc/pbx-voicemail/pbx-msmtprc-account-auth.TEMPLATE b/applications/luci-app-pbx-voicemail/root/etc/pbx-voicemail/pbx-msmtprc-account-auth.TEMPLATE
index 6b2026c108..6b2026c108 100644
--- a/applications/luci-pbx-voicemail/root/etc/pbx-voicemail/pbx-msmtprc-account-auth.TEMPLATE
+++ b/applications/luci-app-pbx-voicemail/root/etc/pbx-voicemail/pbx-msmtprc-account-auth.TEMPLATE
diff --git a/applications/luci-pbx-voicemail/root/etc/pbx-voicemail/pbx-msmtprc-account-default.TEMPLATE b/applications/luci-app-pbx-voicemail/root/etc/pbx-voicemail/pbx-msmtprc-account-default.TEMPLATE
index a001c64630..a001c64630 100644
--- a/applications/luci-pbx-voicemail/root/etc/pbx-voicemail/pbx-msmtprc-account-default.TEMPLATE
+++ b/applications/luci-app-pbx-voicemail/root/etc/pbx-voicemail/pbx-msmtprc-account-default.TEMPLATE
diff --git a/applications/luci-pbx-voicemail/root/etc/pbx-voicemail/pbx-msmtprc-account.TEMPLATE b/applications/luci-app-pbx-voicemail/root/etc/pbx-voicemail/pbx-msmtprc-account.TEMPLATE
index fd1f47959b..fd1f47959b 100644
--- a/applications/luci-pbx-voicemail/root/etc/pbx-voicemail/pbx-msmtprc-account.TEMPLATE
+++ b/applications/luci-app-pbx-voicemail/root/etc/pbx-voicemail/pbx-msmtprc-account.TEMPLATE
diff --git a/applications/luci-pbx-voicemail/root/etc/pbx-voicemail/pbx-msmtprc-defaults.TEMPLATE b/applications/luci-app-pbx-voicemail/root/etc/pbx-voicemail/pbx-msmtprc-defaults.TEMPLATE
index a4456b8f87..a4456b8f87 100644
--- a/applications/luci-pbx-voicemail/root/etc/pbx-voicemail/pbx-msmtprc-defaults.TEMPLATE
+++ b/applications/luci-app-pbx-voicemail/root/etc/pbx-voicemail/pbx-msmtprc-defaults.TEMPLATE
diff --git a/applications/luci-pbx-voicemail/root/etc/pbx-voicemail/pbx-send-voicemail b/applications/luci-app-pbx-voicemail/root/etc/pbx-voicemail/pbx-send-voicemail
index ba639d01a9..ba639d01a9 100755
--- a/applications/luci-pbx-voicemail/root/etc/pbx-voicemail/pbx-send-voicemail
+++ b/applications/luci-app-pbx-voicemail/root/etc/pbx-voicemail/pbx-send-voicemail
diff --git a/applications/luci-pbx/COPYING b/applications/luci-app-pbx/COPYING
index 94a9ed024d..94a9ed024d 100644
--- a/applications/luci-pbx/COPYING
+++ b/applications/luci-app-pbx/COPYING
diff --git a/applications/luci-pbx/CREDITS-SOUNDS b/applications/luci-app-pbx/CREDITS-SOUNDS
index 1fa64bc6cb..1fa64bc6cb 100644
--- a/applications/luci-pbx/CREDITS-SOUNDS
+++ b/applications/luci-app-pbx/CREDITS-SOUNDS
diff --git a/applications/luci-pbx/LICENSE-SOUNDS b/applications/luci-app-pbx/LICENSE-SOUNDS
index fe9c8221a2..fe9c8221a2 100644
--- a/applications/luci-pbx/LICENSE-SOUNDS
+++ b/applications/luci-app-pbx/LICENSE-SOUNDS
diff --git a/applications/luci-app-pbx/Makefile b/applications/luci-app-pbx/Makefile
new file mode 100644
index 0000000000..1379dcf890
--- /dev/null
+++ b/applications/luci-app-pbx/Makefile
@@ -0,0 +1,19 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=LuCI PBX Administration
+LUCI_DEPENDS:= \
+	+asterisk18 +asterisk18-app-authenticate +asterisk18-app-disa \
+	+asterisk18-app-setcallerid +asterisk18-app-system +asterisk18-chan-gtalk \
+	+asterisk18-codec-a-mu +asterisk18-codec-alaw +asterisk18-func-cut \
+	+asterisk18-res-clioriginate +asterisk18-func-channel +asterisk18-chan-local \
+	+asterisk18-app-record +asterisk18-app-senddtmf +asterisk18-res-crypto
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/applications/luci-pbx/luasrc/controller/pbx.lua b/applications/luci-app-pbx/luasrc/controller/pbx.lua
index b77814b150..b77814b150 100644
--- a/applications/luci-pbx/luasrc/controller/pbx.lua
+++ b/applications/luci-app-pbx/luasrc/controller/pbx.lua
diff --git a/applications/luci-pbx/luasrc/model/cbi/pbx-advanced.lua b/applications/luci-app-pbx/luasrc/model/cbi/pbx-advanced.lua
index 5d4f135c5b..5d4f135c5b 100644
--- a/applications/luci-pbx/luasrc/model/cbi/pbx-advanced.lua
+++ b/applications/luci-app-pbx/luasrc/model/cbi/pbx-advanced.lua
diff --git a/applications/luci-pbx/luasrc/model/cbi/pbx-calls.lua b/applications/luci-app-pbx/luasrc/model/cbi/pbx-calls.lua
index ca373d63a3..ca373d63a3 100644
--- a/applications/luci-pbx/luasrc/model/cbi/pbx-calls.lua
+++ b/applications/luci-app-pbx/luasrc/model/cbi/pbx-calls.lua
diff --git a/applications/luci-pbx/luasrc/model/cbi/pbx-google.lua b/applications/luci-app-pbx/luasrc/model/cbi/pbx-google.lua
index 3c36a168d9..3c36a168d9 100644
--- a/applications/luci-pbx/luasrc/model/cbi/pbx-google.lua
+++ b/applications/luci-app-pbx/luasrc/model/cbi/pbx-google.lua
diff --git a/applications/luci-pbx/luasrc/model/cbi/pbx-users.lua b/applications/luci-app-pbx/luasrc/model/cbi/pbx-users.lua
index c7c8b4d8bb..c7c8b4d8bb 100644
--- a/applications/luci-pbx/luasrc/model/cbi/pbx-users.lua
+++ b/applications/luci-app-pbx/luasrc/model/cbi/pbx-users.lua
diff --git a/applications/luci-pbx/luasrc/model/cbi/pbx-voip.lua b/applications/luci-app-pbx/luasrc/model/cbi/pbx-voip.lua
index ed1ed1edb1..ed1ed1edb1 100644
--- a/applications/luci-pbx/luasrc/model/cbi/pbx-voip.lua
+++ b/applications/luci-app-pbx/luasrc/model/cbi/pbx-voip.lua
diff --git a/applications/luci-pbx/luasrc/model/cbi/pbx.lua b/applications/luci-app-pbx/luasrc/model/cbi/pbx.lua
index 4c5fcbdecd..4c5fcbdecd 100644
--- a/applications/luci-pbx/luasrc/model/cbi/pbx.lua
+++ b/applications/luci-app-pbx/luasrc/model/cbi/pbx.lua
diff --git a/po/ca/pbx.po b/applications/luci-app-pbx/po/ca/pbx.po
index c8a0a9967e..c8a0a9967e 100644
--- a/po/ca/pbx.po
+++ b/applications/luci-app-pbx/po/ca/pbx.po
diff --git a/po/cs/pbx.po b/applications/luci-app-pbx/po/cs/pbx.po
index 8b69ef15d8..8b69ef15d8 100644
--- a/po/cs/pbx.po
+++ b/applications/luci-app-pbx/po/cs/pbx.po
diff --git a/po/de/pbx.po b/applications/luci-app-pbx/po/de/pbx.po
index 3bc4bd428e..3bc4bd428e 100644
--- a/po/de/pbx.po
+++ b/applications/luci-app-pbx/po/de/pbx.po
diff --git a/po/el/pbx.po b/applications/luci-app-pbx/po/el/pbx.po
index 717e2563b4..717e2563b4 100644
--- a/po/el/pbx.po
+++ b/applications/luci-app-pbx/po/el/pbx.po
diff --git a/po/en/pbx.po b/applications/luci-app-pbx/po/en/pbx.po
index 8b995e1a39..8b995e1a39 100644
--- a/po/en/pbx.po
+++ b/applications/luci-app-pbx/po/en/pbx.po
diff --git a/po/es/pbx.po b/applications/luci-app-pbx/po/es/pbx.po
index 8071b61f08..8071b61f08 100644
--- a/po/es/pbx.po
+++ b/applications/luci-app-pbx/po/es/pbx.po
diff --git a/po/fr/pbx.po b/applications/luci-app-pbx/po/fr/pbx.po
index 971a696488..971a696488 100644
--- a/po/fr/pbx.po
+++ b/applications/luci-app-pbx/po/fr/pbx.po
diff --git a/po/he/pbx.po b/applications/luci-app-pbx/po/he/pbx.po
index 2a458214df..2a458214df 100644
--- a/po/he/pbx.po
+++ b/applications/luci-app-pbx/po/he/pbx.po
diff --git a/po/hu/pbx.po b/applications/luci-app-pbx/po/hu/pbx.po
index 2a458214df..2a458214df 100644
--- a/po/hu/pbx.po
+++ b/applications/luci-app-pbx/po/hu/pbx.po
diff --git a/po/it/pbx.po b/applications/luci-app-pbx/po/it/pbx.po
index 6da8e45d96..6da8e45d96 100644
--- a/po/it/pbx.po
+++ b/applications/luci-app-pbx/po/it/pbx.po
diff --git a/po/ja/pbx.po b/applications/luci-app-pbx/po/ja/pbx.po
index 76199f4191..76199f4191 100644
--- a/po/ja/pbx.po
+++ b/applications/luci-app-pbx/po/ja/pbx.po
diff --git a/po/ms/pbx.po b/applications/luci-app-pbx/po/ms/pbx.po
index 23403f290f..23403f290f 100644
--- a/po/ms/pbx.po
+++ b/applications/luci-app-pbx/po/ms/pbx.po
diff --git a/po/no/pbx.po b/applications/luci-app-pbx/po/no/pbx.po
index 2a458214df..2a458214df 100644
--- a/po/no/pbx.po
+++ b/applications/luci-app-pbx/po/no/pbx.po
diff --git a/po/pl/pbx.po b/applications/luci-app-pbx/po/pl/pbx.po
index 4e80a45815..4e80a45815 100644
--- a/po/pl/pbx.po
+++ b/applications/luci-app-pbx/po/pl/pbx.po
diff --git a/po/pt_BR/pbx.po b/applications/luci-app-pbx/po/pt-br/pbx.po
index fd93e4fffb..fd93e4fffb 100644
--- a/po/pt_BR/pbx.po
+++ b/applications/luci-app-pbx/po/pt-br/pbx.po
diff --git a/po/pt/pbx.po b/applications/luci-app-pbx/po/pt/pbx.po
index 75b6c8cd1a..75b6c8cd1a 100644
--- a/po/pt/pbx.po
+++ b/applications/luci-app-pbx/po/pt/pbx.po
diff --git a/po/ro/pbx.po b/applications/luci-app-pbx/po/ro/pbx.po
index 49e8daccf4..49e8daccf4 100644
--- a/po/ro/pbx.po
+++ b/applications/luci-app-pbx/po/ro/pbx.po
diff --git a/po/ru/pbx.po b/applications/luci-app-pbx/po/ru/pbx.po
index e85c947e1a..e85c947e1a 100644
--- a/po/ru/pbx.po
+++ b/applications/luci-app-pbx/po/ru/pbx.po
diff --git a/po/sk/pbx.po b/applications/luci-app-pbx/po/sk/pbx.po
index 7b6d4a5c64..7b6d4a5c64 100644
--- a/po/sk/pbx.po
+++ b/applications/luci-app-pbx/po/sk/pbx.po
diff --git a/po/sv/pbx.po b/applications/luci-app-pbx/po/sv/pbx.po
index 400289b6bb..400289b6bb 100644
--- a/po/sv/pbx.po
+++ b/applications/luci-app-pbx/po/sv/pbx.po
diff --git a/applications/luci-app-pbx/po/templates/pbx.pot b/applications/luci-app-pbx/po/templates/pbx.pot
new file mode 100644
index 0000000000..86dd2eb72d
--- /dev/null
+++ b/applications/luci-app-pbx/po/templates/pbx.pot
@@ -0,0 +1,477 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Available"
+msgstr ""
+
+msgid ""
+"Avoid using anything but alpha-numeric characters, space, comma, and period."
+msgstr ""
+
+msgid "Away"
+msgstr ""
+
+msgid "Blacklisted Numbers"
+msgstr ""
+
+msgid "Call Routing"
+msgstr ""
+
+msgid "Call-back Numbers"
+msgstr ""
+
+msgid "Call-back Provider"
+msgstr ""
+
+msgid "Call-through Numbers"
+msgstr ""
+
+msgid "Copy-paste large lists of numbers here."
+msgstr ""
+
+msgid ""
+"Designate numbers that are allowed to call through this system and which "
+"user's privileges they will have."
+msgstr ""
+
+msgid ""
+"Designate numbers to whom the system will hang up and call back, which "
+"provider will be used to call them, and which user's privileges will be "
+"granted to them."
+msgstr ""
+
+msgid "Dials numbers unmatched elsewhere"
+msgstr ""
+
+msgid "Do Not Disturb"
+msgstr ""
+
+msgid "Domain/IP Address/Dynamic Domain"
+msgstr ""
+
+msgid "Dynamic List of Blacklisted Numbers"
+msgstr ""
+
+msgid "Email"
+msgstr ""
+
+msgid "Enable Incoming Calls (Register via SIP)"
+msgstr ""
+
+msgid "Enable Incoming Calls (set Status below)"
+msgstr ""
+
+msgid "Enable Outgoing Calls"
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid ""
+"Enter a VoIP provider to use for call-back in the format username@some.host."
+"name, as listed in \"Outgoing Calls\" above. It's easiest to copy and paste "
+"the providers from above. Invalid entries, including providers not enabled "
+"for outgoing calls, will be rejected silently."
+msgstr ""
+
+msgid ""
+"Enter phone numbers that you want to decline calls from automatically. You "
+"should probably omit the country code and any leading zeroes, but please "
+"experiment to make sure you are blocking numbers from your desired area "
+"successfully."
+msgstr ""
+
+msgid ""
+"Enter this IP (or IP:port) in the Server/Registrar setting of SIP devices "
+"you will use ONLY locally and never from a remote location."
+msgstr ""
+
+msgid ""
+"Enter this hostname (or hostname:port) in the Server/Registrar setting of "
+"SIP devices you will use from a remote location (they will work locally too)."
+msgstr ""
+
+msgid "External SIP Port"
+msgstr ""
+
+msgid ""
+"For each provider enabled for incoming calls, here you can restrict which "
+"users to ring on incoming calls. If the list is empty, the system will "
+"indicate that all users enabled for incoming calls will ring. Invalid "
+"usernames will be rejected silently. Also, entering a username here "
+"overrides the user's setting to not receive incoming calls. This way, you "
+"can make certain users ring only for specific providers. Entries can be made "
+"in a space-separated list, and/or one per line by hitting enter after every "
+"one."
+msgstr ""
+
+msgid ""
+"For each user enabled for outgoing calls you can restrict what providers the "
+"user can use for outgoing calls. By default all users can use all providers. "
+"To show up in the list below the user should be allowed to make outgoing "
+"calls in the \"User Accounts\" page. Enter VoIP providers in the format "
+"username@some.host.name, as listed in \"Outgoing Calls\" above. It's easiest "
+"to copy and paste the providers from above. Invalid entries, including "
+"providers not enabled for outgoing calls, will be rejected silently. Entries "
+"can be made in a space-separated list, and/or one per line by hitting enter "
+"after every one."
+msgstr ""
+
+msgid "Full Name"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "Google Accounts"
+msgstr ""
+
+msgid "Google Talk Status"
+msgstr ""
+
+msgid "Google Talk Status Message"
+msgstr ""
+
+msgid "Google Voice/Talk Accounts"
+msgstr ""
+
+msgid "Hang-up Delay"
+msgstr ""
+
+msgid ""
+"Here you must configure at least one SIP account, that you will use to "
+"register with this service. Use this account either in an Analog Telephony "
+"Adapter (ATA), or in a SIP software like CSipSimple, Linphone, or Sipdroid "
+"on your smartphone, or Ekiga, Linphone, or X-Lite on your computer. By "
+"default, all SIP accounts will ring simultaneously if a call is made to one "
+"of your VoIP provider accounts or GV numbers."
+msgstr ""
+
+msgid ""
+"How long to wait before hanging up. If the provider you use to dial "
+"automatically forwards to voicemail, you can set this value to a delay that "
+"will allow you to hang up before your call gets forwarded and you get billed "
+"for it."
+msgstr ""
+
+msgid ""
+"If setting Server/Registrar to %s or %s does not work for you, try setting "
+"it to %s or %s and entering this port number in a separate field that "
+"specifies the Server/Registrar port number. Beware that some devices have a "
+"confusing setting that sets the port where SIP requests originate from on "
+"the SIP device itself (the bind port). The port specified on this page is "
+"NOT this bind port but the port this service listens on."
+msgstr ""
+
+msgid ""
+"If you experience jittery or high latency audio during heavy downloads, you "
+"may want to enable QoS. QoS prioritizes traffic to and from your network for "
+"specified ports and IP addresses, resulting in better latency and throughput "
+"for sound in our case. If enabled below, a QoS rule for this service will be "
+"configured by the PBX automatically, but you must visit the QoS "
+"configuration page (Network->QoS) to configure other critical QoS settings "
+"like Download and Upload speed."
+msgstr ""
+
+msgid ""
+"If you have more than one account that can make outgoing calls, you should "
+"enter a list of phone numbers and/or prefixes in the following fields for "
+"each provider listed. Invalid prefixes are removed silently, and only 0-9, "
+"X, Z, N, #, *, and + are valid characters. The letter X matches 0-9, Z "
+"matches 1-9, and N matches 2-9. For example to make calls to Germany through "
+"a provider, you can enter 49. To make calls to North America, you can enter "
+"1NXXNXXXXXX. If one of your providers can make \"local\" calls to an area "
+"code like New York's 646, you can enter 646NXXXXXX for that provider. You "
+"should leave one account with an empty list to make calls with it by "
+"default, if no other provider's prefixes match. The system will "
+"automatically replace an empty list with a message that the provider dials "
+"all numbers not matched by another provider's prefixes. Be as specific as "
+"possible (i.e. 1NXXNXXXXXX is better than 1). Please note all international "
+"dial codes are discarded (e.g. 00, 011, 010, 0011). Entries can be made in a "
+"space-separated list, and/or one per line by hitting enter after every one."
+msgstr ""
+
+msgid "Incoming Calls"
+msgstr ""
+
+msgid "Insert QoS Rules"
+msgstr ""
+
+msgid "Makes Outgoing Calls"
+msgstr ""
+
+msgid "NOTE: There are no Google or SIP provider accounts configured."
+msgstr ""
+
+msgid ""
+"NOTE: There are no Google or SIP provider accounts enabled for incoming "
+"calls."
+msgstr ""
+
+msgid ""
+"NOTE: There are no Google or SIP provider accounts enabled for outgoing "
+"calls."
+msgstr ""
+
+msgid "NOTE: There are no local user accounts configured."
+msgstr ""
+
+msgid "NOTE: There are no local user accounts enabled for outgoing calls."
+msgstr ""
+
+msgid "No"
+msgstr ""
+
+msgid "Number of Seconds to Ring"
+msgstr ""
+
+msgid "Outbound Proxy"
+msgstr ""
+
+msgid "Outgoing Calls"
+msgstr ""
+
+msgid "PBX Main Page"
+msgstr ""
+
+msgid "PBX Service Status"
+msgstr ""
+
+msgid "PIN"
+msgstr ""
+
+msgid "Password"
+msgstr ""
+
+msgid ""
+"Pick a random port number between 6500 and 9500 for the service to listen "
+"on. Do not pick the standard 5060, because it is often subject to brute-"
+"force attacks. When finished, (1) click \"Save and Apply\", and (2) look in "
+"the \"SIP Device/Softphone Accounts\" section for updated Server and Port "
+"settings for your SIP Devices/Softphones."
+msgstr ""
+
+msgid "Port Setting for SIP Devices"
+msgstr ""
+
+msgid "Providers Used for Outgoing Calls"
+msgstr ""
+
+msgid "QoS Settings"
+msgstr ""
+
+msgid "RTP Port Range End"
+msgstr ""
+
+msgid "RTP Port Range Start"
+msgstr ""
+
+msgid ""
+"RTP traffic carries actual voice packets. This is the start of the port "
+"range that will be used for setting up RTP communication. It's usually OK to "
+"leave this at the default value."
+msgstr ""
+
+msgid "Receives Incoming Calls"
+msgstr ""
+
+msgid "Remote Usage"
+msgstr ""
+
+msgid "Rings users enabled for incoming calls"
+msgstr ""
+
+msgid "SIP Accounts"
+msgstr ""
+
+msgid "SIP Device/Softphone Accounts"
+msgstr ""
+
+msgid "SIP Provider Accounts"
+msgstr ""
+
+msgid "SIP Realm (needed by some providers)"
+msgstr ""
+
+msgid "SIP Server/Registrar"
+msgstr ""
+
+msgid "SIP Server/Registrar Port"
+msgstr ""
+
+msgid "Server Setting"
+msgstr ""
+
+msgid "Server Setting for Local SIP Devices"
+msgstr ""
+
+msgid "Server Setting for Remote SIP Devices"
+msgstr ""
+
+msgid "Service Status"
+msgstr ""
+
+msgid ""
+"Set the number of seconds to ring users upon incoming calls before hanging "
+"up or going to voicemail, if the voicemail is installed and enabled."
+msgstr ""
+
+msgid "Space-Separated List of Blacklisted Numbers"
+msgstr ""
+
+msgid "Specify numbers individually here. Press enter to add more numbers."
+msgstr ""
+
+msgid ""
+"Specify numbers individually here. Press enter to add more numbers. You will "
+"have to experiment with what country and area codes you need to add to the "
+"number."
+msgstr ""
+
+msgid ""
+"The number(s) specified above will be able to dial out with this user's "
+"providers. Invalid usernames, including users not enabled for outgoing "
+"calls, are dropped silently. Please verify that the entry was accepted."
+msgstr ""
+
+msgid ""
+"This configuration page allows you to configure a phone system (PBX) service "
+"which permits making phone calls through multiple Google and SIP (like "
+"Sipgate, SipSorcery, and Betamax) accounts and sharing them among many SIP "
+"devices. Note that Google accounts, SIP accounts, and local user accounts "
+"are configured in the \"Google Accounts\", \"SIP Accounts\", and \"User "
+"Accounts\" sub-sections. You must add at least one User Account to this PBX, "
+"and then configure a SIP device or softphone to use the account, in order to "
+"make and receive calls with your Google/SIP accounts. Configuring multiple "
+"users will allow you to make free calls between all users, and share the "
+"configured Google and SIP accounts. If you have more than one Google and SIP "
+"accounts set up, you should probably configure how calls to and from them "
+"are routed in the \"Call Routing\" page. If you're interested in using your "
+"own PBX from anywhere in the world, then visit the \"Remote Usage\" section "
+"in the \"Advanced Settings\" page."
+msgstr ""
+
+msgid ""
+"This is the name that the VoIP server will use to identify itself when "
+"registering to VoIP (SIP) providers. Some providers require this to a "
+"specific string matching a hardware SIP device."
+msgstr ""
+
+msgid ""
+"This is where you indicate which Google/SIP accounts are used to call what "
+"country/area codes, which users can use what SIP/Google accounts, how "
+"incoming calls are routed, what numbers can get into this PBX with a "
+"password, and what numbers are blacklisted."
+msgstr ""
+
+msgid ""
+"This is where you set up your Google (Talk and Voice) Accounts, in order to "
+"start using them for dialing and receiving calls (voice chat and real phone "
+"calls). Please make at least one voice call using the Google Talk plugin "
+"installable through the GMail interface, and then log out from your account "
+"everywhere. Click \"Add\" to add as many accounts as you wish."
+msgstr ""
+
+msgid ""
+"This is where you set up your SIP (VoIP) accounts ts like Sipgate, "
+"SipSorcery, the popular Betamax providers, and any other providers with SIP "
+"settings in order to start using them for dialing and receiving calls (SIP "
+"uri and real phone calls). Click \"Add\" to add as many accounts as you wish."
+msgstr ""
+
+msgid ""
+"This option should be set to \"Yes\" if you have a DID (real telephone "
+"number) associated with this SIP account or want to receive SIP uri calls "
+"through this provider."
+msgstr ""
+
+msgid ""
+"This section contains settings that do not need to be changed under normal "
+"circumstances. In addition, here you can configure your system for use with "
+"remote SIP devices, and resolve call quality issues by enabling the "
+"insertion of QoS rules."
+msgstr ""
+
+msgid ""
+"Use (four to five digit) numeric user name if you are connecting normal "
+"telephones with ATAs to this system (so they can dial user names)."
+msgstr ""
+
+msgid ""
+"Use this account to make outgoing calls as configured in the \"Call Routing"
+"\" section."
+msgstr ""
+
+msgid "Use this account to make outgoing calls."
+msgstr ""
+
+msgid "User Accounts"
+msgstr ""
+
+msgid "User Agent String"
+msgstr ""
+
+msgid "User Name"
+msgstr ""
+
+msgid "Uses providers enabled for outgoing calls"
+msgstr ""
+
+msgid ""
+"When somebody starts voice chat with your GTalk account or calls the GVoice, "
+"number (if you have Google Voice), the call will be forwarded to any users "
+"that are online (registered using a SIP device or softphone) and permitted "
+"to receive the call. If you have Google Voice, you must go to your GVoice "
+"settings and forward calls to Google chat in order to actually receive calls "
+"made to your GVoice number. If you have trouble receiving calls from GVoice, "
+"experiment with the Call Screening option in your GVoice Settings. Finally, "
+"make sure no other client is online with this account (browser in gmail, "
+"mobile/desktop Google Talk App) as it may interfere."
+msgstr ""
+
+msgid ""
+"When your password is saved, it disappears from this field and is not "
+"displayed for your protection. The previously saved password will be changed "
+"only when you enter a value different from the saved one."
+msgstr ""
+
+msgid "Yes"
+msgstr ""
+
+msgid ""
+"You can enter your domain name, external IP address, or dynamic domain name "
+"here. The best thing to input is a static IP address. If your IP address is "
+"dynamic and it changes, your configuration will become invalid. Hence, it's "
+"recommended to set up Dynamic DNS in this case. and enter your Dynamic DNS "
+"hostname here. You can configure Dynamic DNS with the luci-app-ddns package."
+msgstr ""
+
+msgid "You can specify a real name to show up in the Caller ID here."
+msgstr ""
+
+msgid ""
+"You can use your SIP devices/softphones with this system from a remote "
+"location as well, as long as your Internet Service Provider gives you a "
+"public IP. You will be able to call other local users for free (e.g. other "
+"Analog Telephone Adapters (ATAs)) and use your VoIP providers to make calls "
+"as if you were local to the PBX. After configuring this tab, go back to "
+"where users are configured and see the new Server and Port setting you need "
+"to configure the remote SIP devices with. Please note that if this PBX is "
+"not running on your router/gateway, you will need to configure port "
+"forwarding (NAT) on your router/gateway. Please forward the ports below (SIP "
+"port and RTP range) to the IP address of the device running this PBX."
+msgstr ""
+
+msgid ""
+"Your PIN disappears when saved for your protection. It will be changed only "
+"when you enter a value different from the saved one. Leaving the PIN empty "
+"is possible, but please beware of the security implications."
+msgstr ""
+
+msgid ""
+"Your password disappears when saved for your protection. It will be changed "
+"only when you enter a value different from the saved one."
+msgstr ""
diff --git a/po/tr/pbx.po b/applications/luci-app-pbx/po/tr/pbx.po
index 59af3e878d..59af3e878d 100644
--- a/po/tr/pbx.po
+++ b/applications/luci-app-pbx/po/tr/pbx.po
diff --git a/po/uk/pbx.po b/applications/luci-app-pbx/po/uk/pbx.po
index d65a784435..d65a784435 100644
--- a/po/uk/pbx.po
+++ b/applications/luci-app-pbx/po/uk/pbx.po
diff --git a/po/vi/pbx.po b/applications/luci-app-pbx/po/vi/pbx.po
index 59af3e878d..59af3e878d 100644
--- a/po/vi/pbx.po
+++ b/applications/luci-app-pbx/po/vi/pbx.po
diff --git a/po/zh_CN/pbx.po b/applications/luci-app-pbx/po/zh-cn/pbx.po
index 8ac03e1aa0..8ac03e1aa0 100644
--- a/po/zh_CN/pbx.po
+++ b/applications/luci-app-pbx/po/zh-cn/pbx.po
diff --git a/po/zh_TW/pbx.po b/applications/luci-app-pbx/po/zh-tw/pbx.po
index aa05be778f..aa05be778f 100644
--- a/po/zh_TW/pbx.po
+++ b/applications/luci-app-pbx/po/zh-tw/pbx.po
diff --git a/applications/luci-pbx/root/etc/config/pbx b/applications/luci-app-pbx/root/etc/config/pbx
index ca7c1669d0..ca7c1669d0 100644
--- a/applications/luci-pbx/root/etc/config/pbx
+++ b/applications/luci-app-pbx/root/etc/config/pbx
diff --git a/applications/luci-pbx/root/etc/config/pbx-advanced b/applications/luci-app-pbx/root/etc/config/pbx-advanced
index 39da6f880c..39da6f880c 100644
--- a/applications/luci-pbx/root/etc/config/pbx-advanced
+++ b/applications/luci-app-pbx/root/etc/config/pbx-advanced
diff --git a/applications/luci-pbx/root/etc/config/pbx-calls b/applications/luci-app-pbx/root/etc/config/pbx-calls
index 822bd4a1be..822bd4a1be 100644
--- a/applications/luci-pbx/root/etc/config/pbx-calls
+++ b/applications/luci-app-pbx/root/etc/config/pbx-calls
diff --git a/modules/base/root/lib/uci/upload/.gitignore b/applications/luci-app-pbx/root/etc/config/pbx-google
index e69de29bb2..e69de29bb2 100644
--- a/modules/base/root/lib/uci/upload/.gitignore
+++ b/applications/luci-app-pbx/root/etc/config/pbx-google
diff --git a/applications/luci-pbx/root/etc/config/pbx-users b/applications/luci-app-pbx/root/etc/config/pbx-users
index a4277b1bfe..a4277b1bfe 100644
--- a/applications/luci-pbx/root/etc/config/pbx-users
+++ b/applications/luci-app-pbx/root/etc/config/pbx-users
diff --git a/applications/luci-app-pbx/root/etc/config/pbx-voip b/applications/luci-app-pbx/root/etc/config/pbx-voip
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/applications/luci-app-pbx/root/etc/config/pbx-voip
diff --git a/applications/luci-pbx/root/etc/init.d/pbx-asterisk b/applications/luci-app-pbx/root/etc/init.d/pbx-asterisk
index e05ae11cd6..e05ae11cd6 100755
--- a/applications/luci-pbx/root/etc/init.d/pbx-asterisk
+++ b/applications/luci-app-pbx/root/etc/init.d/pbx-asterisk
diff --git a/applications/luci-pbx/root/etc/pbx-asterisk/asterisk.conf.TEMPLATE b/applications/luci-app-pbx/root/etc/pbx-asterisk/asterisk.conf.TEMPLATE
index ac5439615b..ac5439615b 100644
--- a/applications/luci-pbx/root/etc/pbx-asterisk/asterisk.conf.TEMPLATE
+++ b/applications/luci-app-pbx/root/etc/pbx-asterisk/asterisk.conf.TEMPLATE
diff --git a/applications/luci-pbx/root/etc/pbx-asterisk/delayedcallback b/applications/luci-app-pbx/root/etc/pbx-asterisk/delayedcallback
index 903efe9ad9..903efe9ad9 100755
--- a/applications/luci-pbx/root/etc/pbx-asterisk/delayedcallback
+++ b/applications/luci-app-pbx/root/etc/pbx-asterisk/delayedcallback
diff --git a/applications/luci-pbx/root/etc/pbx-asterisk/extensions.conf.TEMPLATE b/applications/luci-app-pbx/root/etc/pbx-asterisk/extensions.conf.TEMPLATE
index c8966edd87..c8966edd87 100644
--- a/applications/luci-pbx/root/etc/pbx-asterisk/extensions.conf.TEMPLATE
+++ b/applications/luci-app-pbx/root/etc/pbx-asterisk/extensions.conf.TEMPLATE
diff --git a/applications/luci-pbx/root/etc/pbx-asterisk/extensions_blacklist.conf.TEMPLATE b/applications/luci-app-pbx/root/etc/pbx-asterisk/extensions_blacklist.conf.TEMPLATE
index 54ee989b0f..54ee989b0f 100644
--- a/applications/luci-pbx/root/etc/pbx-asterisk/extensions_blacklist.conf.TEMPLATE
+++ b/applications/luci-app-pbx/root/etc/pbx-asterisk/extensions_blacklist.conf.TEMPLATE
diff --git a/applications/luci-pbx/root/etc/pbx-asterisk/extensions_blacklist_footer.conf.TEMPLATE b/applications/luci-app-pbx/root/etc/pbx-asterisk/extensions_blacklist_footer.conf.TEMPLATE
index da964f2388..da964f2388 100644
--- a/applications/luci-pbx/root/etc/pbx-asterisk/extensions_blacklist_footer.conf.TEMPLATE
+++ b/applications/luci-app-pbx/root/etc/pbx-asterisk/extensions_blacklist_footer.conf.TEMPLATE
diff --git a/applications/luci-pbx/root/etc/pbx-asterisk/extensions_blacklist_header.conf.TEMPLATE b/applications/luci-app-pbx/root/etc/pbx-asterisk/extensions_blacklist_header.conf.TEMPLATE
index de0e984652..de0e984652 100644
--- a/applications/luci-pbx/root/etc/pbx-asterisk/extensions_blacklist_header.conf.TEMPLATE
+++ b/applications/luci-app-pbx/root/etc/pbx-asterisk/extensions_blacklist_header.conf.TEMPLATE
diff --git a/applications/luci-pbx/root/etc/pbx-asterisk/extensions_callback-check.conf.TEMPLATE b/applications/luci-app-pbx/root/etc/pbx-asterisk/extensions_callback-check.conf.TEMPLATE
index 06b1a4b6b9..06b1a4b6b9 100644
--- a/applications/luci-pbx/root/etc/pbx-asterisk/extensions_callback-check.conf.TEMPLATE
+++ b/applications/luci-app-pbx/root/etc/pbx-asterisk/extensions_callback-check.conf.TEMPLATE
diff --git a/applications/luci-pbx/root/etc/pbx-asterisk/extensions_callback-check_footer.conf.TEMPLATE b/applications/luci-app-pbx/root/etc/pbx-asterisk/extensions_callback-check_footer.conf.TEMPLATE
index 282fe9e8ff..282fe9e8ff 100644
--- a/applications/luci-pbx/root/etc/pbx-asterisk/extensions_callback-check_footer.conf.TEMPLATE
+++ b/applications/luci-app-pbx/root/etc/pbx-asterisk/extensions_callback-check_footer.conf.TEMPLATE
diff --git a/applications/luci-pbx/root/etc/pbx-asterisk/extensions_callback-check_header.conf.TEMPLATE b/applications/luci-app-pbx/root/etc/pbx-asterisk/extensions_callback-check_header.conf.TEMPLATE
index be289c4d33..be289c4d33 100644
--- a/applications/luci-pbx/root/etc/pbx-asterisk/extensions_callback-check_header.conf.TEMPLATE
+++ b/applications/luci-app-pbx/root/etc/pbx-asterisk/extensions_callback-check_header.conf.TEMPLATE
diff --git a/applications/luci-pbx/root/etc/pbx-asterisk/extensions_callback_gtalk.conf.TEMPLATE b/applications/luci-app-pbx/root/etc/pbx-asterisk/extensions_callback_gtalk.conf.TEMPLATE
index 43eec788f3..43eec788f3 100644
--- a/applications/luci-pbx/root/etc/pbx-asterisk/extensions_callback_gtalk.conf.TEMPLATE
+++ b/applications/luci-app-pbx/root/etc/pbx-asterisk/extensions_callback_gtalk.conf.TEMPLATE
diff --git a/applications/luci-pbx/root/etc/pbx-asterisk/extensions_callback_header.conf.TEMPLATE b/applications/luci-app-pbx/root/etc/pbx-asterisk/extensions_callback_header.conf.TEMPLATE
index 0b8fb4c23f..0b8fb4c23f 100644
--- a/applications/luci-pbx/root/etc/pbx-asterisk/extensions_callback_header.conf.TEMPLATE
+++ b/applications/luci-app-pbx/root/etc/pbx-asterisk/extensions_callback_header.conf.TEMPLATE
diff --git a/applications/luci-pbx/root/etc/pbx-asterisk/extensions_callback_sip.conf.TEMPLATE b/applications/luci-app-pbx/root/etc/pbx-asterisk/extensions_callback_sip.conf.TEMPLATE
index 300e9fa0e8..300e9fa0e8 100644
--- a/applications/luci-pbx/root/etc/pbx-asterisk/extensions_callback_sip.conf.TEMPLATE
+++ b/applications/luci-app-pbx/root/etc/pbx-asterisk/extensions_callback_sip.conf.TEMPLATE
diff --git a/applications/luci-pbx/root/etc/pbx-asterisk/extensions_default.conf.TEMPLATE b/applications/luci-app-pbx/root/etc/pbx-asterisk/extensions_default.conf.TEMPLATE
index 35836e290a..35836e290a 100644
--- a/applications/luci-pbx/root/etc/pbx-asterisk/extensions_default.conf.TEMPLATE
+++ b/applications/luci-app-pbx/root/etc/pbx-asterisk/extensions_default.conf.TEMPLATE
diff --git a/applications/luci-pbx/root/etc/pbx-asterisk/extensions_default_user.conf.TEMPLATE b/applications/luci-app-pbx/root/etc/pbx-asterisk/extensions_default_user.conf.TEMPLATE
index 1910ff4d96..1910ff4d96 100644
--- a/applications/luci-pbx/root/etc/pbx-asterisk/extensions_default_user.conf.TEMPLATE
+++ b/applications/luci-app-pbx/root/etc/pbx-asterisk/extensions_default_user.conf.TEMPLATE
diff --git a/applications/luci-pbx/root/etc/pbx-asterisk/extensions_disa-check.conf.TEMPLATE b/applications/luci-app-pbx/root/etc/pbx-asterisk/extensions_disa-check.conf.TEMPLATE
index ba2379b738..ba2379b738 100644
--- a/applications/luci-pbx/root/etc/pbx-asterisk/extensions_disa-check.conf.TEMPLATE
+++ b/applications/luci-app-pbx/root/etc/pbx-asterisk/extensions_disa-check.conf.TEMPLATE
diff --git a/applications/luci-pbx/root/etc/pbx-asterisk/extensions_disa-check_footer.conf.TEMPLATE b/applications/luci-app-pbx/root/etc/pbx-asterisk/extensions_disa-check_footer.conf.TEMPLATE
index 74056fa01d..74056fa01d 100644
--- a/applications/luci-pbx/root/etc/pbx-asterisk/extensions_disa-check_footer.conf.TEMPLATE
+++ b/applications/luci-app-pbx/root/etc/pbx-asterisk/extensions_disa-check_footer.conf.TEMPLATE
diff --git a/applications/luci-pbx/root/etc/pbx-asterisk/extensions_disa-check_header.conf.TEMPLATE b/applications/luci-app-pbx/root/etc/pbx-asterisk/extensions_disa-check_header.conf.TEMPLATE
index e0d67b8025..e0d67b8025 100644
--- a/applications/luci-pbx/root/etc/pbx-asterisk/extensions_disa-check_header.conf.TEMPLATE
+++ b/applications/luci-app-pbx/root/etc/pbx-asterisk/extensions_disa-check_header.conf.TEMPLATE
diff --git a/applications/luci-pbx/root/etc/pbx-asterisk/extensions_disa-nopin.conf.TEMPLATE b/applications/luci-app-pbx/root/etc/pbx-asterisk/extensions_disa-nopin.conf.TEMPLATE
index 74e48de8c1..74e48de8c1 100644
--- a/applications/luci-pbx/root/etc/pbx-asterisk/extensions_disa-nopin.conf.TEMPLATE
+++ b/applications/luci-app-pbx/root/etc/pbx-asterisk/extensions_disa-nopin.conf.TEMPLATE
diff --git a/applications/luci-pbx/root/etc/pbx-asterisk/extensions_disa.conf.TEMPLATE b/applications/luci-app-pbx/root/etc/pbx-asterisk/extensions_disa.conf.TEMPLATE
index 3dd8fa35c9..3dd8fa35c9 100644
--- a/applications/luci-pbx/root/etc/pbx-asterisk/extensions_disa.conf.TEMPLATE
+++ b/applications/luci-app-pbx/root/etc/pbx-asterisk/extensions_disa.conf.TEMPLATE
diff --git a/applications/luci-pbx/root/etc/pbx-asterisk/extensions_disa_header.conf.TEMPLATE b/applications/luci-app-pbx/root/etc/pbx-asterisk/extensions_disa_header.conf.TEMPLATE
index a742271146..a742271146 100644
--- a/applications/luci-pbx/root/etc/pbx-asterisk/extensions_disa_header.conf.TEMPLATE
+++ b/applications/luci-app-pbx/root/etc/pbx-asterisk/extensions_disa_header.conf.TEMPLATE
diff --git a/applications/luci-pbx/root/etc/pbx-asterisk/extensions_incoming_context_gtalk.conf.TEMPLATE b/applications/luci-app-pbx/root/etc/pbx-asterisk/extensions_incoming_context_gtalk.conf.TEMPLATE
index 3f9cf4c7d9..3f9cf4c7d9 100644
--- a/applications/luci-pbx/root/etc/pbx-asterisk/extensions_incoming_context_gtalk.conf.TEMPLATE
+++ b/applications/luci-app-pbx/root/etc/pbx-asterisk/extensions_incoming_context_gtalk.conf.TEMPLATE
diff --git a/applications/luci-pbx/root/etc/pbx-asterisk/extensions_incoming_context_gtalk_header.conf.TEMPLATE b/applications/luci-app-pbx/root/etc/pbx-asterisk/extensions_incoming_context_gtalk_header.conf.TEMPLATE
index f6e44a5bf0..f6e44a5bf0 100644
--- a/applications/luci-pbx/root/etc/pbx-asterisk/extensions_incoming_context_gtalk_header.conf.TEMPLATE
+++ b/applications/luci-app-pbx/root/etc/pbx-asterisk/extensions_incoming_context_gtalk_header.conf.TEMPLATE
diff --git a/applications/luci-pbx/root/etc/pbx-asterisk/extensions_incoming_context_sip.conf.TEMPLATE b/applications/luci-app-pbx/root/etc/pbx-asterisk/extensions_incoming_context_sip.conf.TEMPLATE
index b2c3716bf4..b2c3716bf4 100644
--- a/applications/luci-pbx/root/etc/pbx-asterisk/extensions_incoming_context_sip.conf.TEMPLATE
+++ b/applications/luci-app-pbx/root/etc/pbx-asterisk/extensions_incoming_context_sip.conf.TEMPLATE
diff --git a/applications/luci-pbx/root/etc/pbx-asterisk/extensions_outgoing_dial_local_user.conf.TEMPLATE b/applications/luci-app-pbx/root/etc/pbx-asterisk/extensions_outgoing_dial_local_user.conf.TEMPLATE
index 45e8758846..45e8758846 100644
--- a/applications/luci-pbx/root/etc/pbx-asterisk/extensions_outgoing_dial_local_user.conf.TEMPLATE
+++ b/applications/luci-app-pbx/root/etc/pbx-asterisk/extensions_outgoing_dial_local_user.conf.TEMPLATE
diff --git a/applications/luci-pbx/root/etc/pbx-asterisk/extensions_outgoing_gtalk.conf.TEMPLATE b/applications/luci-app-pbx/root/etc/pbx-asterisk/extensions_outgoing_gtalk.conf.TEMPLATE
index 259c2ceaa1..259c2ceaa1 100644
--- a/applications/luci-pbx/root/etc/pbx-asterisk/extensions_outgoing_gtalk.conf.TEMPLATE
+++ b/applications/luci-app-pbx/root/etc/pbx-asterisk/extensions_outgoing_gtalk.conf.TEMPLATE
diff --git a/applications/luci-pbx/root/etc/pbx-asterisk/extensions_outgoing_pattern_gtalk.conf.TEMPLATE b/applications/luci-app-pbx/root/etc/pbx-asterisk/extensions_outgoing_pattern_gtalk.conf.TEMPLATE
index 1fa7713e23..1fa7713e23 100644
--- a/applications/luci-pbx/root/etc/pbx-asterisk/extensions_outgoing_pattern_gtalk.conf.TEMPLATE
+++ b/applications/luci-app-pbx/root/etc/pbx-asterisk/extensions_outgoing_pattern_gtalk.conf.TEMPLATE
diff --git a/applications/luci-pbx/root/etc/pbx-asterisk/extensions_outgoing_pattern_sip.conf.TEMPLATE b/applications/luci-app-pbx/root/etc/pbx-asterisk/extensions_outgoing_pattern_sip.conf.TEMPLATE
index 178b6deaa6..178b6deaa6 100644
--- a/applications/luci-pbx/root/etc/pbx-asterisk/extensions_outgoing_pattern_sip.conf.TEMPLATE
+++ b/applications/luci-app-pbx/root/etc/pbx-asterisk/extensions_outgoing_pattern_sip.conf.TEMPLATE
diff --git a/applications/luci-pbx/root/etc/pbx-asterisk/extensions_outgoing_sip.conf.TEMPLATE b/applications/luci-app-pbx/root/etc/pbx-asterisk/extensions_outgoing_sip.conf.TEMPLATE
index 9b1d9addc9..9b1d9addc9 100644
--- a/applications/luci-pbx/root/etc/pbx-asterisk/extensions_outgoing_sip.conf.TEMPLATE
+++ b/applications/luci-app-pbx/root/etc/pbx-asterisk/extensions_outgoing_sip.conf.TEMPLATE
diff --git a/applications/luci-pbx/root/etc/pbx-asterisk/extensions_user_context_footer.conf.TEMPLATE b/applications/luci-app-pbx/root/etc/pbx-asterisk/extensions_user_context_footer.conf.TEMPLATE
index a2ba28c055..a2ba28c055 100644
--- a/applications/luci-pbx/root/etc/pbx-asterisk/extensions_user_context_footer.conf.TEMPLATE
+++ b/applications/luci-app-pbx/root/etc/pbx-asterisk/extensions_user_context_footer.conf.TEMPLATE
diff --git a/applications/luci-pbx/root/etc/pbx-asterisk/extensions_user_context_header.conf.TEMPLATE b/applications/luci-app-pbx/root/etc/pbx-asterisk/extensions_user_context_header.conf.TEMPLATE
index 5931eaf28b..5931eaf28b 100644
--- a/applications/luci-pbx/root/etc/pbx-asterisk/extensions_user_context_header.conf.TEMPLATE
+++ b/applications/luci-app-pbx/root/etc/pbx-asterisk/extensions_user_context_header.conf.TEMPLATE
diff --git a/applications/luci-pbx/root/etc/pbx-asterisk/extensions_voicemail_disabled.conf.TEMPLATE b/applications/luci-app-pbx/root/etc/pbx-asterisk/extensions_voicemail_disabled.conf.TEMPLATE
index be23c294df..be23c294df 100644
--- a/applications/luci-pbx/root/etc/pbx-asterisk/extensions_voicemail_disabled.conf.TEMPLATE
+++ b/applications/luci-app-pbx/root/etc/pbx-asterisk/extensions_voicemail_disabled.conf.TEMPLATE
diff --git a/applications/luci-pbx/root/etc/pbx-asterisk/extensions_voicemail_enabled.conf.TEMPLATE b/applications/luci-app-pbx/root/etc/pbx-asterisk/extensions_voicemail_enabled.conf.TEMPLATE
index 4edd9cb426..4edd9cb426 100644
--- a/applications/luci-pbx/root/etc/pbx-asterisk/extensions_voicemail_enabled.conf.TEMPLATE
+++ b/applications/luci-app-pbx/root/etc/pbx-asterisk/extensions_voicemail_enabled.conf.TEMPLATE
diff --git a/applications/luci-pbx/root/etc/pbx-asterisk/gtalk.conf.TEMPLATE b/applications/luci-app-pbx/root/etc/pbx-asterisk/gtalk.conf.TEMPLATE
index 4f07a71660..4f07a71660 100644
--- a/applications/luci-pbx/root/etc/pbx-asterisk/gtalk.conf.TEMPLATE
+++ b/applications/luci-app-pbx/root/etc/pbx-asterisk/gtalk.conf.TEMPLATE
diff --git a/applications/luci-pbx/root/etc/pbx-asterisk/indications.conf.TEMPLATE b/applications/luci-app-pbx/root/etc/pbx-asterisk/indications.conf.TEMPLATE
index d7088db7c4..d7088db7c4 100644
--- a/applications/luci-pbx/root/etc/pbx-asterisk/indications.conf.TEMPLATE
+++ b/applications/luci-app-pbx/root/etc/pbx-asterisk/indications.conf.TEMPLATE
diff --git a/applications/luci-pbx/root/etc/pbx-asterisk/jabber.conf.TEMPLATE b/applications/luci-app-pbx/root/etc/pbx-asterisk/jabber.conf.TEMPLATE
index cf71e1f8f4..cf71e1f8f4 100644
--- a/applications/luci-pbx/root/etc/pbx-asterisk/jabber.conf.TEMPLATE
+++ b/applications/luci-app-pbx/root/etc/pbx-asterisk/jabber.conf.TEMPLATE
diff --git a/applications/luci-pbx/root/etc/pbx-asterisk/jabber_users.conf.TEMPLATE b/applications/luci-app-pbx/root/etc/pbx-asterisk/jabber_users.conf.TEMPLATE
index 3ee2463ed2..3ee2463ed2 100644
--- a/applications/luci-pbx/root/etc/pbx-asterisk/jabber_users.conf.TEMPLATE
+++ b/applications/luci-app-pbx/root/etc/pbx-asterisk/jabber_users.conf.TEMPLATE
diff --git a/applications/luci-pbx/root/etc/pbx-asterisk/logger.conf.TEMPLATE b/applications/luci-app-pbx/root/etc/pbx-asterisk/logger.conf.TEMPLATE
index e57325013a..e57325013a 100644
--- a/applications/luci-pbx/root/etc/pbx-asterisk/logger.conf.TEMPLATE
+++ b/applications/luci-app-pbx/root/etc/pbx-asterisk/logger.conf.TEMPLATE
diff --git a/applications/luci-pbx/root/etc/pbx-asterisk/manager.conf.TEMPLATE b/applications/luci-app-pbx/root/etc/pbx-asterisk/manager.conf.TEMPLATE
index 2ac2f0033f..2ac2f0033f 100644
--- a/applications/luci-pbx/root/etc/pbx-asterisk/manager.conf.TEMPLATE
+++ b/applications/luci-app-pbx/root/etc/pbx-asterisk/manager.conf.TEMPLATE
diff --git a/applications/luci-pbx/root/etc/pbx-asterisk/modules.conf.TEMPLATE b/applications/luci-app-pbx/root/etc/pbx-asterisk/modules.conf.TEMPLATE
index 93c74336d1..93c74336d1 100644
--- a/applications/luci-pbx/root/etc/pbx-asterisk/modules.conf.TEMPLATE
+++ b/applications/luci-app-pbx/root/etc/pbx-asterisk/modules.conf.TEMPLATE
diff --git a/applications/luci-pbx/root/etc/pbx-asterisk/rtp.conf.TEMPLATE b/applications/luci-app-pbx/root/etc/pbx-asterisk/rtp.conf.TEMPLATE
index 10d577d3a2..10d577d3a2 100644
--- a/applications/luci-pbx/root/etc/pbx-asterisk/rtp.conf.TEMPLATE
+++ b/applications/luci-app-pbx/root/etc/pbx-asterisk/rtp.conf.TEMPLATE
diff --git a/applications/luci-pbx/root/etc/pbx-asterisk/sip.conf.TEMPLATE b/applications/luci-app-pbx/root/etc/pbx-asterisk/sip.conf.TEMPLATE
index 8f3b112ff6..8f3b112ff6 100644
--- a/applications/luci-pbx/root/etc/pbx-asterisk/sip.conf.TEMPLATE
+++ b/applications/luci-app-pbx/root/etc/pbx-asterisk/sip.conf.TEMPLATE
diff --git a/applications/luci-pbx/root/etc/pbx-asterisk/sip_peer.TEMPLATE b/applications/luci-app-pbx/root/etc/pbx-asterisk/sip_peer.TEMPLATE
index 30abaadd58..30abaadd58 100644
--- a/applications/luci-pbx/root/etc/pbx-asterisk/sip_peer.TEMPLATE
+++ b/applications/luci-app-pbx/root/etc/pbx-asterisk/sip_peer.TEMPLATE
diff --git a/applications/luci-pbx/root/etc/pbx-asterisk/sip_registration.TEMPLATE b/applications/luci-app-pbx/root/etc/pbx-asterisk/sip_registration.TEMPLATE
index e139d43f03..e139d43f03 100644
--- a/applications/luci-pbx/root/etc/pbx-asterisk/sip_registration.TEMPLATE
+++ b/applications/luci-app-pbx/root/etc/pbx-asterisk/sip_registration.TEMPLATE
diff --git a/applications/luci-pbx/root/etc/pbx-asterisk/sip_user.TEMPLATE b/applications/luci-app-pbx/root/etc/pbx-asterisk/sip_user.TEMPLATE
index 61a8b0b86b..61a8b0b86b 100644
--- a/applications/luci-pbx/root/etc/pbx-asterisk/sip_user.TEMPLATE
+++ b/applications/luci-app-pbx/root/etc/pbx-asterisk/sip_user.TEMPLATE
diff --git a/applications/luci-pbx/root/etc/pbx-asterisk/sounds/agent-alreadyon.gsm b/applications/luci-app-pbx/root/etc/pbx-asterisk/sounds/agent-alreadyon.gsm
index 83fe27ecfa..83fe27ecfa 100644
--- a/applications/luci-pbx/root/etc/pbx-asterisk/sounds/agent-alreadyon.gsm
+++ b/applications/luci-app-pbx/root/etc/pbx-asterisk/sounds/agent-alreadyon.gsm
diff --git a/applications/luci-pbx/root/etc/pbx-asterisk/sounds/agent-incorrect.gsm b/applications/luci-app-pbx/root/etc/pbx-asterisk/sounds/agent-incorrect.gsm
index 27d934beb0..27d934beb0 100644
--- a/applications/luci-pbx/root/etc/pbx-asterisk/sounds/agent-incorrect.gsm
+++ b/applications/luci-app-pbx/root/etc/pbx-asterisk/sounds/agent-incorrect.gsm
diff --git a/applications/luci-pbx/root/etc/pbx-asterisk/sounds/agent-pass.gsm b/applications/luci-app-pbx/root/etc/pbx-asterisk/sounds/agent-pass.gsm
index f95637bb32..f95637bb32 100644
--- a/applications/luci-pbx/root/etc/pbx-asterisk/sounds/agent-pass.gsm
+++ b/applications/luci-app-pbx/root/etc/pbx-asterisk/sounds/agent-pass.gsm
diff --git a/applications/luci-pbx/root/etc/pbx-asterisk/sounds/auth-incorrect.gsm b/applications/luci-app-pbx/root/etc/pbx-asterisk/sounds/auth-incorrect.gsm
index 12fec25d56..12fec25d56 100644
--- a/applications/luci-pbx/root/etc/pbx-asterisk/sounds/auth-incorrect.gsm
+++ b/applications/luci-app-pbx/root/etc/pbx-asterisk/sounds/auth-incorrect.gsm
diff --git a/applications/luci-pbx/root/etc/pbx-asterisk/sounds/auth-thankyou.gsm b/applications/luci-app-pbx/root/etc/pbx-asterisk/sounds/auth-thankyou.gsm
index 93f936d1a0..93f936d1a0 100644
--- a/applications/luci-pbx/root/etc/pbx-asterisk/sounds/auth-thankyou.gsm
+++ b/applications/luci-app-pbx/root/etc/pbx-asterisk/sounds/auth-thankyou.gsm
diff --git a/applications/luci-pbx/root/etc/pbx-asterisk/sounds/beep.gsm b/applications/luci-app-pbx/root/etc/pbx-asterisk/sounds/beep.gsm
index d38eda9cc5..d38eda9cc5 100644
--- a/applications/luci-pbx/root/etc/pbx-asterisk/sounds/beep.gsm
+++ b/applications/luci-app-pbx/root/etc/pbx-asterisk/sounds/beep.gsm
diff --git a/applications/luci-pbx/root/etc/pbx-asterisk/sounds/vm-goodbye.gsm b/applications/luci-app-pbx/root/etc/pbx-asterisk/sounds/vm-goodbye.gsm
index 735b281c8e..735b281c8e 100644
--- a/applications/luci-pbx/root/etc/pbx-asterisk/sounds/vm-goodbye.gsm
+++ b/applications/luci-app-pbx/root/etc/pbx-asterisk/sounds/vm-goodbye.gsm
diff --git a/applications/luci-app-polipo/Makefile b/applications/luci-app-polipo/Makefile
new file mode 100644
index 0000000000..1fbafe7ed6
--- /dev/null
+++ b/applications/luci-app-polipo/Makefile
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=LuCI Support for the Polipo Proxy
+LUCI_DEPENDS:=+polipo
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/applications/luci-polipo/ipkg/postinst b/applications/luci-app-polipo/ipkg/postinst
index 0e23e2a4ae..0e23e2a4ae 100755
--- a/applications/luci-polipo/ipkg/postinst
+++ b/applications/luci-app-polipo/ipkg/postinst
diff --git a/applications/luci-polipo/luasrc/controller/polipo.lua b/applications/luci-app-polipo/luasrc/controller/polipo.lua
index 1113f8f267..1113f8f267 100644
--- a/applications/luci-polipo/luasrc/controller/polipo.lua
+++ b/applications/luci-app-polipo/luasrc/controller/polipo.lua
diff --git a/applications/luci-polipo/luasrc/model/cbi/polipo.lua b/applications/luci-app-polipo/luasrc/model/cbi/polipo.lua
index 6dc35d581a..6dc35d581a 100644
--- a/applications/luci-polipo/luasrc/model/cbi/polipo.lua
+++ b/applications/luci-app-polipo/luasrc/model/cbi/polipo.lua
diff --git a/applications/luci-polipo/luasrc/view/polipo_status.htm b/applications/luci-app-polipo/luasrc/view/polipo_status.htm
index c2695ca82b..c2695ca82b 100644
--- a/applications/luci-polipo/luasrc/view/polipo_status.htm
+++ b/applications/luci-app-polipo/luasrc/view/polipo_status.htm
diff --git a/po/ca/polipo.po b/applications/luci-app-polipo/po/ca/polipo.po
index 76a7093f48..76a7093f48 100644
--- a/po/ca/polipo.po
+++ b/applications/luci-app-polipo/po/ca/polipo.po
diff --git a/po/cs/polipo.po b/applications/luci-app-polipo/po/cs/polipo.po
index 9fa249d597..9fa249d597 100644
--- a/po/cs/polipo.po
+++ b/applications/luci-app-polipo/po/cs/polipo.po
diff --git a/po/de/polipo.po b/applications/luci-app-polipo/po/de/polipo.po
index 50f7819ed3..50f7819ed3 100644
--- a/po/de/polipo.po
+++ b/applications/luci-app-polipo/po/de/polipo.po
diff --git a/po/el/polipo.po b/applications/luci-app-polipo/po/el/polipo.po
index e7a62dd446..e7a62dd446 100644
--- a/po/el/polipo.po
+++ b/applications/luci-app-polipo/po/el/polipo.po
diff --git a/po/en/polipo.po b/applications/luci-app-polipo/po/en/polipo.po
index 1bdb0c1d8a..1bdb0c1d8a 100644
--- a/po/en/polipo.po
+++ b/applications/luci-app-polipo/po/en/polipo.po
diff --git a/po/es/polipo.po b/applications/luci-app-polipo/po/es/polipo.po
index 84ba24ec9b..84ba24ec9b 100644
--- a/po/es/polipo.po
+++ b/applications/luci-app-polipo/po/es/polipo.po
diff --git a/po/fr/polipo.po b/applications/luci-app-polipo/po/fr/polipo.po
index f4e49aea56..f4e49aea56 100644
--- a/po/fr/polipo.po
+++ b/applications/luci-app-polipo/po/fr/polipo.po
diff --git a/po/he/polipo.po b/applications/luci-app-polipo/po/he/polipo.po
index 931228e5bb..931228e5bb 100644
--- a/po/he/polipo.po
+++ b/applications/luci-app-polipo/po/he/polipo.po
diff --git a/po/hu/polipo.po b/applications/luci-app-polipo/po/hu/polipo.po
index 931228e5bb..931228e5bb 100644
--- a/po/hu/polipo.po
+++ b/applications/luci-app-polipo/po/hu/polipo.po
diff --git a/po/it/polipo.po b/applications/luci-app-polipo/po/it/polipo.po
index 6bc06690db..6bc06690db 100644
--- a/po/it/polipo.po
+++ b/applications/luci-app-polipo/po/it/polipo.po
diff --git a/po/ja/polipo.po b/applications/luci-app-polipo/po/ja/polipo.po
index 81ce9a7836..81ce9a7836 100644
--- a/po/ja/polipo.po
+++ b/applications/luci-app-polipo/po/ja/polipo.po
diff --git a/po/ms/polipo.po b/applications/luci-app-polipo/po/ms/polipo.po
index 7517dccfac..7517dccfac 100644
--- a/po/ms/polipo.po
+++ b/applications/luci-app-polipo/po/ms/polipo.po
diff --git a/po/no/polipo.po b/applications/luci-app-polipo/po/no/polipo.po
index 931228e5bb..931228e5bb 100644
--- a/po/no/polipo.po
+++ b/applications/luci-app-polipo/po/no/polipo.po
diff --git a/po/pl/polipo.po b/applications/luci-app-polipo/po/pl/polipo.po
index 698edc98c5..698edc98c5 100644
--- a/po/pl/polipo.po
+++ b/applications/luci-app-polipo/po/pl/polipo.po
diff --git a/po/pt_BR/polipo.po b/applications/luci-app-polipo/po/pt-br/polipo.po
index 881d5c0791..881d5c0791 100644
--- a/po/pt_BR/polipo.po
+++ b/applications/luci-app-polipo/po/pt-br/polipo.po
diff --git a/po/pt/polipo.po b/applications/luci-app-polipo/po/pt/polipo.po
index cdce586d9c..cdce586d9c 100644
--- a/po/pt/polipo.po
+++ b/applications/luci-app-polipo/po/pt/polipo.po
diff --git a/po/ro/polipo.po b/applications/luci-app-polipo/po/ro/polipo.po
index 2c2710a143..2c2710a143 100644
--- a/po/ro/polipo.po
+++ b/applications/luci-app-polipo/po/ro/polipo.po
diff --git a/po/ru/polipo.po b/applications/luci-app-polipo/po/ru/polipo.po
index f1d49688a6..f1d49688a6 100644
--- a/po/ru/polipo.po
+++ b/applications/luci-app-polipo/po/ru/polipo.po
diff --git a/po/sk/polipo.po b/applications/luci-app-polipo/po/sk/polipo.po
index e003c175a9..e003c175a9 100644
--- a/po/sk/polipo.po
+++ b/applications/luci-app-polipo/po/sk/polipo.po
diff --git a/po/sv/polipo.po b/applications/luci-app-polipo/po/sv/polipo.po
index 7b64c7ad6d..7b64c7ad6d 100644
--- a/po/sv/polipo.po
+++ b/applications/luci-app-polipo/po/sv/polipo.po
diff --git a/applications/luci-app-polipo/po/templates/polipo.pot b/applications/luci-app-polipo/po/templates/polipo.pot
new file mode 100644
index 0000000000..beb0bdb774
--- /dev/null
+++ b/applications/luci-app-polipo/po/templates/polipo.pot
@@ -0,0 +1,195 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Allowed clients"
+msgstr ""
+
+msgid "Always use system DNS resolver"
+msgstr ""
+
+msgid ""
+"Basic HTTP authentication supported. Provide username and password in "
+"username:password format."
+msgstr ""
+
+msgid "Configuration"
+msgstr ""
+
+msgid "DNS and Query Settings"
+msgstr ""
+
+msgid "DNS server address"
+msgstr ""
+
+msgid "Delete cache files time"
+msgstr ""
+
+msgid "Disk cache location"
+msgstr ""
+
+msgid "Do not query IPv6"
+msgstr ""
+
+msgid "Enable if cache (proxy) is shared by multiple users."
+msgstr ""
+
+msgid "First PMM segment size (in bytes)"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "How much RAM should Polipo use for its cache."
+msgstr ""
+
+msgid "In RAM cache size (in bytes)"
+msgstr ""
+
+msgid "Listen address"
+msgstr ""
+
+msgid "Listen port"
+msgstr ""
+
+msgid ""
+"Location where polipo will cache files permanently. Use of external storage "
+"devices is recommended, because the cache can grow considerably. Leave it "
+"empty to disable on-disk cache."
+msgstr ""
+
+msgid "Log file location"
+msgstr ""
+
+msgid "Log to syslog"
+msgstr ""
+
+msgid "Logging and RAM"
+msgstr ""
+
+msgid "Never use system DNS resolver"
+msgstr ""
+
+msgid "On-Disk Cache"
+msgstr ""
+
+msgid "PMM segments size (in bytes)"
+msgstr ""
+
+msgid "Parent Proxy"
+msgstr ""
+
+msgid "Parent proxy address"
+msgstr ""
+
+msgid ""
+"Parent proxy address (in host:port format), to which Polipo will forward the "
+"requests."
+msgstr ""
+
+msgid "Parent proxy authentication"
+msgstr ""
+
+msgid "Polipo"
+msgstr ""
+
+msgid "Polipo Status"
+msgstr ""
+
+msgid "Polipo is a small and fast caching web proxy."
+msgstr ""
+
+msgid "Poor Man's Multiplexing"
+msgstr ""
+
+msgid ""
+"Poor Man's Multiplexing (PMM) is a technique that simulates multiplexing by "
+"requesting an instance in multiple segments. It tries to lower the latency "
+"caused by the weakness of HTTP protocol. NOTE: some sites may not work with "
+"PMM enabled."
+msgstr ""
+
+msgid "Port on which Polipo will listen"
+msgstr ""
+
+msgid "Proxy"
+msgstr ""
+
+msgid "Query DNS by hostname"
+msgstr ""
+
+msgid "Query DNS directly, fallback to system resolver"
+msgstr ""
+
+msgid "Query DNS directly, for unknown hosts fall back to system resolver"
+msgstr ""
+
+msgid "Query DNS for IPv6"
+msgstr ""
+
+msgid "Query IPv4 and IPv6, prefer IPv4"
+msgstr ""
+
+msgid "Query IPv4 and IPv6, prefer IPv6"
+msgstr ""
+
+msgid "Query only IPv6"
+msgstr ""
+
+msgid ""
+"Set the DNS server address to use, if you want Polipo to use different DNS "
+"server than the host system."
+msgstr ""
+
+msgid "Shared cache"
+msgstr ""
+
+msgid ""
+"Size of the first PMM segment. If not defined, it defaults to twice the PMM "
+"segment size."
+msgstr ""
+
+msgid "Size to which cached files should be truncated"
+msgstr ""
+
+msgid "Status"
+msgstr ""
+
+msgid "Syslog facility"
+msgstr ""
+
+msgid ""
+"The interface on which Polipo will listen. To listen on all interfaces use "
+"0.0.0.0 or :: (IPv6)."
+msgstr ""
+
+msgid "Time after which cached files will be deleted"
+msgstr ""
+
+msgid "Time after which cached files will be truncated"
+msgstr ""
+
+msgid "To enable PMM, PMM segment size must be set to some positive value."
+msgstr ""
+
+msgid "Truncate cache files size (in bytes)"
+msgstr ""
+
+msgid "Truncate cache files time"
+msgstr ""
+
+msgid ""
+"Use of external storage device is recommended, because the log file is "
+"written frequently and can grow considerably."
+msgstr ""
+
+msgid ""
+"When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients "
+"that are allowed to connect. The format is IP address or network address "
+"(192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))"
+msgstr ""
+
+msgid "enable"
+msgstr ""
diff --git a/po/tr/polipo.po b/applications/luci-app-polipo/po/tr/polipo.po
index 25982ec16b..25982ec16b 100644
--- a/po/tr/polipo.po
+++ b/applications/luci-app-polipo/po/tr/polipo.po
diff --git a/po/uk/polipo.po b/applications/luci-app-polipo/po/uk/polipo.po
index 9b1b637b84..9b1b637b84 100644
--- a/po/uk/polipo.po
+++ b/applications/luci-app-polipo/po/uk/polipo.po
diff --git a/po/vi/polipo.po b/applications/luci-app-polipo/po/vi/polipo.po
index 0765db325c..0765db325c 100644
--- a/po/vi/polipo.po
+++ b/applications/luci-app-polipo/po/vi/polipo.po
diff --git a/po/zh_CN/polipo.po b/applications/luci-app-polipo/po/zh-cn/polipo.po
index 7dcbe2344a..7dcbe2344a 100644
--- a/po/zh_CN/polipo.po
+++ b/applications/luci-app-polipo/po/zh-cn/polipo.po
diff --git a/po/zh_TW/polipo.po b/applications/luci-app-polipo/po/zh-tw/polipo.po
index 5058897bc4..5058897bc4 100644
--- a/po/zh_TW/polipo.po
+++ b/applications/luci-app-polipo/po/zh-tw/polipo.po
diff --git a/applications/luci-polipo/root/etc/uci-defaults/luci-polipo b/applications/luci-app-polipo/root/etc/uci-defaults/luci-polipo
index 0c570630da..0c570630da 100755
--- a/applications/luci-polipo/root/etc/uci-defaults/luci-polipo
+++ b/applications/luci-app-polipo/root/etc/uci-defaults/luci-polipo
diff --git a/applications/luci-polipo/root/usr/sbin/polipo_purge b/applications/luci-app-polipo/root/usr/sbin/polipo_purge
index 23ba571927..23ba571927 100755
--- a/applications/luci-polipo/root/usr/sbin/polipo_purge
+++ b/applications/luci-app-polipo/root/usr/sbin/polipo_purge
diff --git a/applications/luci-app-qos/Makefile b/applications/luci-app-qos/Makefile
new file mode 100644
index 0000000000..dd322a347a
--- /dev/null
+++ b/applications/luci-app-qos/Makefile
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=Quality of Service configuration module
+LUCI_DEPENDS:=+qos-scripts
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/applications/luci-qos/luasrc/controller/qos.lua b/applications/luci-app-qos/luasrc/controller/qos.lua
index 4a7092de74..4a7092de74 100644
--- a/applications/luci-qos/luasrc/controller/qos.lua
+++ b/applications/luci-app-qos/luasrc/controller/qos.lua
diff --git a/applications/luci-qos/luasrc/model/cbi/qos/qos.lua b/applications/luci-app-qos/luasrc/model/cbi/qos/qos.lua
index 6965078edf..6965078edf 100644
--- a/applications/luci-qos/luasrc/model/cbi/qos/qos.lua
+++ b/applications/luci-app-qos/luasrc/model/cbi/qos/qos.lua
diff --git a/po/ca/qos.po b/applications/luci-app-qos/po/ca/qos.po
index 7871b12066..7871b12066 100644
--- a/po/ca/qos.po
+++ b/applications/luci-app-qos/po/ca/qos.po
diff --git a/po/cs/qos.po b/applications/luci-app-qos/po/cs/qos.po
index 361e4d5426..361e4d5426 100644
--- a/po/cs/qos.po
+++ b/applications/luci-app-qos/po/cs/qos.po
diff --git a/po/de/qos.po b/applications/luci-app-qos/po/de/qos.po
index 6ba5701fd7..6ba5701fd7 100644
--- a/po/de/qos.po
+++ b/applications/luci-app-qos/po/de/qos.po
diff --git a/po/el/qos.po b/applications/luci-app-qos/po/el/qos.po
index b417b8b9aa..b417b8b9aa 100644
--- a/po/el/qos.po
+++ b/applications/luci-app-qos/po/el/qos.po
diff --git a/po/en/qos.po b/applications/luci-app-qos/po/en/qos.po
index aeb7b27b29..aeb7b27b29 100644
--- a/po/en/qos.po
+++ b/applications/luci-app-qos/po/en/qos.po
diff --git a/po/es/qos.po b/applications/luci-app-qos/po/es/qos.po
index 3c8206ddca..3c8206ddca 100644
--- a/po/es/qos.po
+++ b/applications/luci-app-qos/po/es/qos.po
diff --git a/po/fr/qos.po b/applications/luci-app-qos/po/fr/qos.po
index a4a81f124d..a4a81f124d 100644
--- a/po/fr/qos.po
+++ b/applications/luci-app-qos/po/fr/qos.po
diff --git a/po/he/qos.po b/applications/luci-app-qos/po/he/qos.po
index 71c2e3c073..71c2e3c073 100644
--- a/po/he/qos.po
+++ b/applications/luci-app-qos/po/he/qos.po
diff --git a/po/hu/qos.po b/applications/luci-app-qos/po/hu/qos.po
index d69ff082a7..d69ff082a7 100644
--- a/po/hu/qos.po
+++ b/applications/luci-app-qos/po/hu/qos.po
diff --git a/po/it/qos.po b/applications/luci-app-qos/po/it/qos.po
index 00fb331b34..00fb331b34 100644
--- a/po/it/qos.po
+++ b/applications/luci-app-qos/po/it/qos.po
diff --git a/po/ja/qos.po b/applications/luci-app-qos/po/ja/qos.po
index 857cf5b83b..857cf5b83b 100644
--- a/po/ja/qos.po
+++ b/applications/luci-app-qos/po/ja/qos.po
diff --git a/po/ms/qos.po b/applications/luci-app-qos/po/ms/qos.po
index ab30492127..ab30492127 100644
--- a/po/ms/qos.po
+++ b/applications/luci-app-qos/po/ms/qos.po
diff --git a/po/no/qos.po b/applications/luci-app-qos/po/no/qos.po
index a560b0fa0e..a560b0fa0e 100644
--- a/po/no/qos.po
+++ b/applications/luci-app-qos/po/no/qos.po
diff --git a/po/pl/qos.po b/applications/luci-app-qos/po/pl/qos.po
index 7b740c78f8..7b740c78f8 100644
--- a/po/pl/qos.po
+++ b/applications/luci-app-qos/po/pl/qos.po
diff --git a/po/pt_BR/qos.po b/applications/luci-app-qos/po/pt-br/qos.po
index 1ebaea2a2e..1ebaea2a2e 100644
--- a/po/pt_BR/qos.po
+++ b/applications/luci-app-qos/po/pt-br/qos.po
diff --git a/po/pt/qos.po b/applications/luci-app-qos/po/pt/qos.po
index 2299a78484..2299a78484 100644
--- a/po/pt/qos.po
+++ b/applications/luci-app-qos/po/pt/qos.po
diff --git a/po/ro/qos.po b/applications/luci-app-qos/po/ro/qos.po
index 239c1f8506..239c1f8506 100644
--- a/po/ro/qos.po
+++ b/applications/luci-app-qos/po/ro/qos.po
diff --git a/po/ru/qos.po b/applications/luci-app-qos/po/ru/qos.po
index 6c3639243e..6c3639243e 100644
--- a/po/ru/qos.po
+++ b/applications/luci-app-qos/po/ru/qos.po
diff --git a/po/sk/qos.po b/applications/luci-app-qos/po/sk/qos.po
index 102e5a94e9..102e5a94e9 100644
--- a/po/sk/qos.po
+++ b/applications/luci-app-qos/po/sk/qos.po
diff --git a/po/sv/qos.po b/applications/luci-app-qos/po/sv/qos.po
index 44f8a351eb..44f8a351eb 100644
--- a/po/sv/qos.po
+++ b/applications/luci-app-qos/po/sv/qos.po
diff --git a/applications/luci-app-qos/po/templates/qos.pot b/applications/luci-app-qos/po/templates/qos.pot
new file mode 100644
index 0000000000..26ea8f7971
--- /dev/null
+++ b/applications/luci-app-qos/po/templates/qos.pot
@@ -0,0 +1,79 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "Calculate overhead"
+msgstr ""
+
+msgid "Classification Rules"
+msgstr ""
+
+msgid "Classification group"
+msgstr ""
+
+msgid "Comment"
+msgstr ""
+
+msgid "Destination host"
+msgstr ""
+
+msgid "Download speed (kbit/s)"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "Half-duplex"
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Number of bytes"
+msgstr ""
+
+msgid "Ports"
+msgstr ""
+
+msgid "Protocol"
+msgstr ""
+
+msgid "QoS"
+msgstr ""
+
+msgid "Quality of Service"
+msgstr ""
+
+msgid "Service"
+msgstr ""
+
+msgid "Source host"
+msgstr ""
+
+msgid "Target"
+msgstr ""
+
+msgid "Upload speed (kbit/s)"
+msgstr ""
+
+msgid ""
+"With <abbr title=\"Quality of Service\">QoS</abbr> you can prioritize "
+"network traffic selected by addresses, ports or services."
+msgstr ""
+
+msgid "all"
+msgstr ""
+
+msgid "default"
+msgstr ""
+
+msgid "express"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
+msgid "normal"
+msgstr ""
+
+msgid "priority"
+msgstr ""
diff --git a/po/tr/qos.po b/applications/luci-app-qos/po/tr/qos.po
index 74647be141..74647be141 100644
--- a/po/tr/qos.po
+++ b/applications/luci-app-qos/po/tr/qos.po
diff --git a/po/uk/qos.po b/applications/luci-app-qos/po/uk/qos.po
index d48100b121..d48100b121 100644
--- a/po/uk/qos.po
+++ b/applications/luci-app-qos/po/uk/qos.po
diff --git a/po/vi/qos.po b/applications/luci-app-qos/po/vi/qos.po
index 82492727c9..82492727c9 100644
--- a/po/vi/qos.po
+++ b/applications/luci-app-qos/po/vi/qos.po
diff --git a/po/zh_CN/qos.po b/applications/luci-app-qos/po/zh-cn/qos.po
index 92ff7d0897..92ff7d0897 100644
--- a/po/zh_CN/qos.po
+++ b/applications/luci-app-qos/po/zh-cn/qos.po
diff --git a/po/zh_TW/qos.po b/applications/luci-app-qos/po/zh-tw/qos.po
index 5cc338bb0d..5cc338bb0d 100644
--- a/po/zh_TW/qos.po
+++ b/applications/luci-app-qos/po/zh-tw/qos.po
diff --git a/applications/luci-app-radvd/Makefile b/applications/luci-app-radvd/Makefile
new file mode 100644
index 0000000000..9b353ed596
--- /dev/null
+++ b/applications/luci-app-radvd/Makefile
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=LuCI Support for Radvd
+LUCI_DEPENDS:=+radvd
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/applications/luci-radvd/ipkg/postinst b/applications/luci-app-radvd/ipkg/postinst
index 88aaf83308..88aaf83308 100644
--- a/applications/luci-radvd/ipkg/postinst
+++ b/applications/luci-app-radvd/ipkg/postinst
diff --git a/applications/luci-radvd/luasrc/controller/radvd.lua b/applications/luci-app-radvd/luasrc/controller/radvd.lua
index 58dcbb2eac..58dcbb2eac 100644
--- a/applications/luci-radvd/luasrc/controller/radvd.lua
+++ b/applications/luci-app-radvd/luasrc/controller/radvd.lua
diff --git a/applications/luci-radvd/luasrc/model/cbi/radvd.lua b/applications/luci-app-radvd/luasrc/model/cbi/radvd.lua
index a43e8d9548..a43e8d9548 100644
--- a/applications/luci-radvd/luasrc/model/cbi/radvd.lua
+++ b/applications/luci-app-radvd/luasrc/model/cbi/radvd.lua
diff --git a/applications/luci-radvd/luasrc/model/cbi/radvd/dnssl.lua b/applications/luci-app-radvd/luasrc/model/cbi/radvd/dnssl.lua
index ec67f308ae..ec67f308ae 100644
--- a/applications/luci-radvd/luasrc/model/cbi/radvd/dnssl.lua
+++ b/applications/luci-app-radvd/luasrc/model/cbi/radvd/dnssl.lua
diff --git a/applications/luci-radvd/luasrc/model/cbi/radvd/interface.lua b/applications/luci-app-radvd/luasrc/model/cbi/radvd/interface.lua
index 519664cdc2..519664cdc2 100644
--- a/applications/luci-radvd/luasrc/model/cbi/radvd/interface.lua
+++ b/applications/luci-app-radvd/luasrc/model/cbi/radvd/interface.lua
diff --git a/applications/luci-radvd/luasrc/model/cbi/radvd/prefix.lua b/applications/luci-app-radvd/luasrc/model/cbi/radvd/prefix.lua
index 6032986510..6032986510 100644
--- a/applications/luci-radvd/luasrc/model/cbi/radvd/prefix.lua
+++ b/applications/luci-app-radvd/luasrc/model/cbi/radvd/prefix.lua
diff --git a/applications/luci-radvd/luasrc/model/cbi/radvd/rdnss.lua b/applications/luci-app-radvd/luasrc/model/cbi/radvd/rdnss.lua
index ea65263996..ea65263996 100644
--- a/applications/luci-radvd/luasrc/model/cbi/radvd/rdnss.lua
+++ b/applications/luci-app-radvd/luasrc/model/cbi/radvd/rdnss.lua
diff --git a/applications/luci-radvd/luasrc/model/cbi/radvd/route.lua b/applications/luci-app-radvd/luasrc/model/cbi/radvd/route.lua
index 97c72a4ec3..97c72a4ec3 100644
--- a/applications/luci-radvd/luasrc/model/cbi/radvd/route.lua
+++ b/applications/luci-app-radvd/luasrc/model/cbi/radvd/route.lua
diff --git a/po/ca/radvd.po b/applications/luci-app-radvd/po/ca/radvd.po
index a9a317d4dd..a9a317d4dd 100644
--- a/po/ca/radvd.po
+++ b/applications/luci-app-radvd/po/ca/radvd.po
diff --git a/po/cs/radvd.po b/applications/luci-app-radvd/po/cs/radvd.po
index ab4e4af5aa..ab4e4af5aa 100644
--- a/po/cs/radvd.po
+++ b/applications/luci-app-radvd/po/cs/radvd.po
diff --git a/po/de/radvd.po b/applications/luci-app-radvd/po/de/radvd.po
index 4afdbb0ca3..4afdbb0ca3 100644
--- a/po/de/radvd.po
+++ b/applications/luci-app-radvd/po/de/radvd.po
diff --git a/po/el/radvd.po b/applications/luci-app-radvd/po/el/radvd.po
index 00763c9231..00763c9231 100644
--- a/po/el/radvd.po
+++ b/applications/luci-app-radvd/po/el/radvd.po
diff --git a/po/en/radvd.po b/applications/luci-app-radvd/po/en/radvd.po
index 8e0fb01a51..8e0fb01a51 100644
--- a/po/en/radvd.po
+++ b/applications/luci-app-radvd/po/en/radvd.po
diff --git a/po/es/radvd.po b/applications/luci-app-radvd/po/es/radvd.po
index 86561920bf..86561920bf 100644
--- a/po/es/radvd.po
+++ b/applications/luci-app-radvd/po/es/radvd.po
diff --git a/po/fr/radvd.po b/applications/luci-app-radvd/po/fr/radvd.po
index b26e6e060b..b26e6e060b 100644
--- a/po/fr/radvd.po
+++ b/applications/luci-app-radvd/po/fr/radvd.po
diff --git a/po/he/radvd.po b/applications/luci-app-radvd/po/he/radvd.po
index 63ec16816b..63ec16816b 100644
--- a/po/he/radvd.po
+++ b/applications/luci-app-radvd/po/he/radvd.po
diff --git a/po/hu/radvd.po b/applications/luci-app-radvd/po/hu/radvd.po
index 90aa4bafaf..90aa4bafaf 100644
--- a/po/hu/radvd.po
+++ b/applications/luci-app-radvd/po/hu/radvd.po
diff --git a/po/it/radvd.po b/applications/luci-app-radvd/po/it/radvd.po
index cda09b7098..cda09b7098 100644
--- a/po/it/radvd.po
+++ b/applications/luci-app-radvd/po/it/radvd.po
diff --git a/po/ja/radvd.po b/applications/luci-app-radvd/po/ja/radvd.po
index 35cde34f4a..35cde34f4a 100644
--- a/po/ja/radvd.po
+++ b/applications/luci-app-radvd/po/ja/radvd.po
diff --git a/po/ms/radvd.po b/applications/luci-app-radvd/po/ms/radvd.po
index 8e0fb01a51..8e0fb01a51 100644
--- a/po/ms/radvd.po
+++ b/applications/luci-app-radvd/po/ms/radvd.po
diff --git a/po/no/radvd.po b/applications/luci-app-radvd/po/no/radvd.po
index 1c43442e5d..1c43442e5d 100644
--- a/po/no/radvd.po
+++ b/applications/luci-app-radvd/po/no/radvd.po
diff --git a/po/pl/radvd.po b/applications/luci-app-radvd/po/pl/radvd.po
index a080c97823..a080c97823 100644
--- a/po/pl/radvd.po
+++ b/applications/luci-app-radvd/po/pl/radvd.po
diff --git a/po/pt_BR/radvd.po b/applications/luci-app-radvd/po/pt-br/radvd.po
index 62c63bb19a..62c63bb19a 100644
--- a/po/pt_BR/radvd.po
+++ b/applications/luci-app-radvd/po/pt-br/radvd.po
diff --git a/po/pt/radvd.po b/applications/luci-app-radvd/po/pt/radvd.po
index 8e0fb01a51..8e0fb01a51 100644
--- a/po/pt/radvd.po
+++ b/applications/luci-app-radvd/po/pt/radvd.po
diff --git a/po/ro/radvd.po b/applications/luci-app-radvd/po/ro/radvd.po
index 77e3d9ee20..77e3d9ee20 100644
--- a/po/ro/radvd.po
+++ b/applications/luci-app-radvd/po/ro/radvd.po
diff --git a/po/ru/radvd.po b/applications/luci-app-radvd/po/ru/radvd.po
index 37cc9428dd..37cc9428dd 100644
--- a/po/ru/radvd.po
+++ b/applications/luci-app-radvd/po/ru/radvd.po
diff --git a/po/sk/radvd.po b/applications/luci-app-radvd/po/sk/radvd.po
index 9bd26fa345..9bd26fa345 100644
--- a/po/sk/radvd.po
+++ b/applications/luci-app-radvd/po/sk/radvd.po
diff --git a/po/sv/radvd.po b/applications/luci-app-radvd/po/sv/radvd.po
index 46a3bf96f5..46a3bf96f5 100644
--- a/po/sv/radvd.po
+++ b/applications/luci-app-radvd/po/sv/radvd.po
diff --git a/applications/luci-app-radvd/po/templates/radvd.pot b/applications/luci-app-radvd/po/templates/radvd.pot
new file mode 100644
index 0000000000..ff9eb547ad
--- /dev/null
+++ b/applications/luci-app-radvd/po/templates/radvd.pot
@@ -0,0 +1,360 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "6to4 interface"
+msgstr ""
+
+msgid "Address"
+msgstr ""
+
+msgid "Addresses"
+msgstr ""
+
+msgid "Advanced"
+msgstr ""
+
+msgid "Advertise Home Agent flag"
+msgstr ""
+
+msgid "Advertise router address"
+msgstr ""
+
+msgid "Advertised Domain Suffixes"
+msgstr ""
+
+msgid ""
+"Advertised IPv6 RDNSS. If empty, the current IPv6 address of the interface "
+"is used"
+msgstr ""
+
+msgid "Advertised IPv6 prefixes"
+msgstr ""
+
+msgid ""
+"Advertised IPv6 prefixes. If empty, the current interface prefix is used"
+msgstr ""
+
+msgid "Advertises Mobile IPv6 Home Agent capability (RFC3775)"
+msgstr ""
+
+msgid "Advertises Mobile Router registration capability (NEMO Basic)"
+msgstr ""
+
+msgid ""
+"Advertises assumed reachability time in milliseconds of neighbours in the RA "
+"if specified. 0 disables reachability advertisements"
+msgstr ""
+
+msgid ""
+"Advertises the default Hop Count value for outgoing unicast packets in the "
+"RA. 0 disables hopcount advertisements"
+msgstr ""
+
+msgid "Advertises the default router preference"
+msgstr ""
+
+msgid ""
+"Advertises the given link MTU in the RA if specified. 0 disables MTU "
+"advertisements"
+msgstr ""
+
+msgid ""
+"Advertises the length of time in seconds that addresses generated from the "
+"prefix via stateless address autoconfiguration remain preferred."
+msgstr ""
+
+msgid ""
+"Advertises the length of time in seconds that the prefix is valid for the "
+"purpose of on-link determination."
+msgstr ""
+
+msgid ""
+"Advertises the lifetime of the default router in seconds. 0 indicates that "
+"the node is no default router"
+msgstr ""
+
+msgid ""
+"Advertises the time in seconds the router is offering Mobile IPv6 Home Agent "
+"services"
+msgstr ""
+
+msgid ""
+"Advertises wait time in milliseconds between Neighbor Solicitation messages "
+"in the RA if specified. 0 disables retransmit advertisements"
+msgstr ""
+
+msgid "Advertising"
+msgstr ""
+
+msgid "Autonomous"
+msgstr ""
+
+msgid "Clients"
+msgstr ""
+
+msgid "Configuration flag"
+msgstr ""
+
+msgid "Current hop limit"
+msgstr ""
+
+msgid "DNSSL"
+msgstr ""
+
+msgid "DNSSL Configuration"
+msgstr ""
+
+msgid "Default lifetime"
+msgstr ""
+
+msgid "Default preference"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "Enable advertisements"
+msgstr ""
+
+msgid "Enables router advertisements and solicitations"
+msgstr ""
+
+msgid ""
+"Enables the additional stateful administered autoconfiguration protocol "
+"(RFC2462)"
+msgstr ""
+
+msgid ""
+"Enables the autoconfiguration of additional, non address information "
+"(RFC2462)"
+msgstr ""
+
+msgid "General"
+msgstr ""
+
+msgid "Home Agent information"
+msgstr ""
+
+msgid "Home Agent lifetime"
+msgstr ""
+
+msgid "Home Agent preference"
+msgstr ""
+
+msgid "Include Home Agent Information in the RA"
+msgstr ""
+
+msgid "Include Mobile IPv6 Advertisement Interval option to RA"
+msgstr ""
+
+msgid "Includes the link-layer address of the outgoing interface in the RA"
+msgstr ""
+
+msgid ""
+"Indicates that the address of interface is sent instead of network prefix, "
+"as is required by Mobile IPv6"
+msgstr ""
+
+msgid ""
+"Indicates that the underlying link is not broadcast capable, prevents "
+"unsolicited advertisements from being sent"
+msgstr ""
+
+msgid ""
+"Indicates that this prefix can be used for autonomous address configuration "
+"(RFC4862)"
+msgstr ""
+
+msgid ""
+"Indicates that this prefix can be used for on-link determination (RFC4861)"
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid "Interface Configuration"
+msgstr ""
+
+msgid "Interface required"
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Lifetime"
+msgstr ""
+
+msgid "Link MTU"
+msgstr ""
+
+msgid "Managed flag"
+msgstr ""
+
+msgid "Max. interval"
+msgstr ""
+
+msgid "Maximum advertisement interval"
+msgstr ""
+
+msgid "Minimum advertisement delay"
+msgstr ""
+
+msgid "Minimum advertisement interval"
+msgstr ""
+
+msgid "Mobile IPv6"
+msgstr ""
+
+msgid "Mobile IPv6 interval option"
+msgstr ""
+
+msgid "Mobile IPv6 router registration"
+msgstr ""
+
+msgid "Multicast"
+msgstr ""
+
+msgid "On-link"
+msgstr ""
+
+msgid "On-link determination"
+msgstr ""
+
+msgid "Preference"
+msgstr ""
+
+msgid "Preferred lifetime"
+msgstr ""
+
+msgid "Prefix"
+msgstr ""
+
+msgid "Prefix Configuration"
+msgstr ""
+
+msgid "Prefixes"
+msgstr ""
+
+msgid "RDNSS"
+msgstr ""
+
+msgid "RDNSS Configuration"
+msgstr ""
+
+msgid "Radvd"
+msgstr ""
+
+msgid "Radvd - DNSSL"
+msgstr ""
+
+msgid "Radvd - Interface %q"
+msgstr ""
+
+msgid "Radvd - Prefix"
+msgstr ""
+
+msgid "Radvd - RDNSS"
+msgstr ""
+
+msgid "Radvd - Route"
+msgstr ""
+
+msgid ""
+"Radvd is a router advertisement daemon for IPv6. It listens to router "
+"solicitations and sends router advertisements as described in RFC 4861."
+msgstr ""
+
+msgid "Reachable time"
+msgstr ""
+
+msgid ""
+"Restrict communication to specified clients, leave empty to use multicast"
+msgstr ""
+
+msgid "Retransmit timer"
+msgstr ""
+
+msgid "Route Configuration"
+msgstr ""
+
+msgid "Routes"
+msgstr ""
+
+msgid "Source link-layer address"
+msgstr ""
+
+msgid ""
+"Specifies a logical interface name to derive a 6to4 prefix from. The "
+"interfaces public IPv4 address is combined with 2002::/3 and the value of "
+"the prefix option"
+msgstr ""
+
+msgid "Specifies the lifetime associated with the route in seconds."
+msgstr ""
+
+msgid "Specifies the logical interface name this section belongs to"
+msgstr ""
+
+msgid ""
+"Specifies the maximum duration how long the DNSSL entries are used for name "
+"resolution."
+msgstr ""
+
+msgid ""
+"Specifies the maximum duration how long the RDNSS entries are used for name "
+"resolution."
+msgstr ""
+
+msgid "Specifies the preference associated with the default router"
+msgstr ""
+
+msgid "Suffix"
+msgstr ""
+
+msgid ""
+"The maximum time allowed between sending unsolicited multicast router "
+"advertisements from the interface, in seconds"
+msgstr ""
+
+msgid ""
+"The minimum time allowed between sending multicast router advertisements "
+"from the interface, in seconds"
+msgstr ""
+
+msgid ""
+"The minimum time allowed between sending unsolicited multicast router "
+"advertisements from the interface, in seconds"
+msgstr ""
+
+msgid "The preference for the Home Agent sending this RA"
+msgstr ""
+
+msgid "Timing"
+msgstr ""
+
+msgid "Unicast only"
+msgstr ""
+
+msgid "Valid lifetime"
+msgstr ""
+
+msgid "Validity time"
+msgstr ""
+
+msgid "default"
+msgstr ""
+
+msgid "high"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
+msgid "medium"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "yes"
+msgstr ""
diff --git a/po/tr/radvd.po b/applications/luci-app-radvd/po/tr/radvd.po
index 8b8ed8f811..8b8ed8f811 100644
--- a/po/tr/radvd.po
+++ b/applications/luci-app-radvd/po/tr/radvd.po
diff --git a/po/uk/radvd.po b/applications/luci-app-radvd/po/uk/radvd.po
index 648035db6c..648035db6c 100644
--- a/po/uk/radvd.po
+++ b/applications/luci-app-radvd/po/uk/radvd.po
diff --git a/po/vi/radvd.po b/applications/luci-app-radvd/po/vi/radvd.po
index 8e0fb01a51..8e0fb01a51 100644
--- a/po/vi/radvd.po
+++ b/applications/luci-app-radvd/po/vi/radvd.po
diff --git a/po/zh_CN/radvd.po b/applications/luci-app-radvd/po/zh-cn/radvd.po
index f3dae7fbc7..f3dae7fbc7 100644
--- a/po/zh_CN/radvd.po
+++ b/applications/luci-app-radvd/po/zh-cn/radvd.po
diff --git a/po/zh_TW/radvd.po b/applications/luci-app-radvd/po/zh-tw/radvd.po
index aed76c5274..aed76c5274 100644
--- a/po/zh_TW/radvd.po
+++ b/applications/luci-app-radvd/po/zh-tw/radvd.po
diff --git a/applications/luci-radvd/root/etc/uci-defaults/luci-radvd b/applications/luci-app-radvd/root/etc/uci-defaults/luci-radvd
index c1f3b7546d..c1f3b7546d 100755
--- a/applications/luci-radvd/root/etc/uci-defaults/luci-radvd
+++ b/applications/luci-app-radvd/root/etc/uci-defaults/luci-radvd
diff --git a/applications/luci-app-samba/Makefile b/applications/luci-app-samba/Makefile
new file mode 100644
index 0000000000..ba599b30c3
--- /dev/null
+++ b/applications/luci-app-samba/Makefile
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=Network Shares - Samba SMB/CIFS module
+LUCI_DEPENDS:=+samba36-server
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/applications/luci-samba/luasrc/controller/samba.lua b/applications/luci-app-samba/luasrc/controller/samba.lua
index ee7d44aa4d..ee7d44aa4d 100644
--- a/applications/luci-samba/luasrc/controller/samba.lua
+++ b/applications/luci-app-samba/luasrc/controller/samba.lua
diff --git a/applications/luci-samba/luasrc/model/cbi/samba.lua b/applications/luci-app-samba/luasrc/model/cbi/samba.lua
index 91526374a4..91526374a4 100644
--- a/applications/luci-samba/luasrc/model/cbi/samba.lua
+++ b/applications/luci-app-samba/luasrc/model/cbi/samba.lua
diff --git a/po/ca/samba.po b/applications/luci-app-samba/po/ca/samba.po
index 0668b1b146..0668b1b146 100644
--- a/po/ca/samba.po
+++ b/applications/luci-app-samba/po/ca/samba.po
diff --git a/po/cs/samba.po b/applications/luci-app-samba/po/cs/samba.po
index fefb7ff873..fefb7ff873 100644
--- a/po/cs/samba.po
+++ b/applications/luci-app-samba/po/cs/samba.po
diff --git a/po/de/samba.po b/applications/luci-app-samba/po/de/samba.po
index a5ceb056cc..a5ceb056cc 100644
--- a/po/de/samba.po
+++ b/applications/luci-app-samba/po/de/samba.po
diff --git a/po/el/samba.po b/applications/luci-app-samba/po/el/samba.po
index 7cc722d592..7cc722d592 100644
--- a/po/el/samba.po
+++ b/applications/luci-app-samba/po/el/samba.po
diff --git a/po/en/samba.po b/applications/luci-app-samba/po/en/samba.po
index f524c1448e..f524c1448e 100644
--- a/po/en/samba.po
+++ b/applications/luci-app-samba/po/en/samba.po
diff --git a/po/es/samba.po b/applications/luci-app-samba/po/es/samba.po
index 950a817971..950a817971 100644
--- a/po/es/samba.po
+++ b/applications/luci-app-samba/po/es/samba.po
diff --git a/po/fr/samba.po b/applications/luci-app-samba/po/fr/samba.po
index 88779009cb..88779009cb 100644
--- a/po/fr/samba.po
+++ b/applications/luci-app-samba/po/fr/samba.po
diff --git a/po/he/samba.po b/applications/luci-app-samba/po/he/samba.po
index dd21a4a545..dd21a4a545 100644
--- a/po/he/samba.po
+++ b/applications/luci-app-samba/po/he/samba.po
diff --git a/po/hu/samba.po b/applications/luci-app-samba/po/hu/samba.po
index 64d1e22a54..64d1e22a54 100644
--- a/po/hu/samba.po
+++ b/applications/luci-app-samba/po/hu/samba.po
diff --git a/po/it/samba.po b/applications/luci-app-samba/po/it/samba.po
index 4645782513..4645782513 100644
--- a/po/it/samba.po
+++ b/applications/luci-app-samba/po/it/samba.po
diff --git a/po/ja/samba.po b/applications/luci-app-samba/po/ja/samba.po
index c5275075af..c5275075af 100644
--- a/po/ja/samba.po
+++ b/applications/luci-app-samba/po/ja/samba.po
diff --git a/po/ms/samba.po b/applications/luci-app-samba/po/ms/samba.po
index e29133e1b9..e29133e1b9 100644
--- a/po/ms/samba.po
+++ b/applications/luci-app-samba/po/ms/samba.po
diff --git a/po/no/samba.po b/applications/luci-app-samba/po/no/samba.po
index 1c5c8077f1..1c5c8077f1 100644
--- a/po/no/samba.po
+++ b/applications/luci-app-samba/po/no/samba.po
diff --git a/po/pl/samba.po b/applications/luci-app-samba/po/pl/samba.po
index 74826227b0..74826227b0 100644
--- a/po/pl/samba.po
+++ b/applications/luci-app-samba/po/pl/samba.po
diff --git a/po/pt_BR/samba.po b/applications/luci-app-samba/po/pt-br/samba.po
index a7531522d0..a7531522d0 100644
--- a/po/pt_BR/samba.po
+++ b/applications/luci-app-samba/po/pt-br/samba.po
diff --git a/po/pt/samba.po b/applications/luci-app-samba/po/pt/samba.po
index 4c5a2cd24c..4c5a2cd24c 100644
--- a/po/pt/samba.po
+++ b/applications/luci-app-samba/po/pt/samba.po
diff --git a/po/ro/samba.po b/applications/luci-app-samba/po/ro/samba.po
index 4bc341557f..4bc341557f 100644
--- a/po/ro/samba.po
+++ b/applications/luci-app-samba/po/ro/samba.po
diff --git a/po/ru/samba.po b/applications/luci-app-samba/po/ru/samba.po
index 82906e36ed..82906e36ed 100644
--- a/po/ru/samba.po
+++ b/applications/luci-app-samba/po/ru/samba.po
diff --git a/po/sk/samba.po b/applications/luci-app-samba/po/sk/samba.po
index 66ec9e0307..66ec9e0307 100644
--- a/po/sk/samba.po
+++ b/applications/luci-app-samba/po/sk/samba.po
diff --git a/po/sv/samba.po b/applications/luci-app-samba/po/sv/samba.po
index b19b6e3c31..b19b6e3c31 100644
--- a/po/sv/samba.po
+++ b/applications/luci-app-samba/po/sv/samba.po
diff --git a/applications/luci-app-samba/po/templates/samba.pot b/applications/luci-app-samba/po/templates/samba.pot
new file mode 100644
index 0000000000..d91400b0c7
--- /dev/null
+++ b/applications/luci-app-samba/po/templates/samba.pot
@@ -0,0 +1,66 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "Allow guests"
+msgstr ""
+
+msgid "Allow system users to reach their home directories via network shares"
+msgstr ""
+
+msgid "Allowed users"
+msgstr ""
+
+msgid "Create mask"
+msgstr ""
+
+msgid "Description"
+msgstr ""
+
+msgid "Directory mask"
+msgstr ""
+
+msgid "Edit Template"
+msgstr ""
+
+msgid "Edit the template that is used for generating the samba configuration."
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid "Mask for new directories"
+msgstr ""
+
+msgid "Mask for new files"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Network Shares"
+msgstr ""
+
+msgid "Path"
+msgstr ""
+
+msgid "Read-only"
+msgstr ""
+
+msgid "Share home-directories"
+msgstr ""
+
+msgid "Shared Directories"
+msgstr ""
+
+msgid ""
+"This is the content of the file '/etc/samba/smb.conf.template' from which "
+"your samba configuration will be generated. Values enclosed by pipe symbols "
+"('|') should not be changed. They get their values from the 'General "
+"Settings' tab."
+msgstr ""
+
+msgid "Workgroup"
+msgstr ""
diff --git a/po/tr/samba.po b/applications/luci-app-samba/po/tr/samba.po
index fda2f6e26e..fda2f6e26e 100644
--- a/po/tr/samba.po
+++ b/applications/luci-app-samba/po/tr/samba.po
diff --git a/po/uk/samba.po b/applications/luci-app-samba/po/uk/samba.po
index 6f2a920915..6f2a920915 100644
--- a/po/uk/samba.po
+++ b/applications/luci-app-samba/po/uk/samba.po
diff --git a/po/vi/samba.po b/applications/luci-app-samba/po/vi/samba.po
index 4e5638da24..4e5638da24 100644
--- a/po/vi/samba.po
+++ b/applications/luci-app-samba/po/vi/samba.po
diff --git a/po/zh_CN/samba.po b/applications/luci-app-samba/po/zh-cn/samba.po
index 4ff671b85a..4ff671b85a 100644
--- a/po/zh_CN/samba.po
+++ b/applications/luci-app-samba/po/zh-cn/samba.po
diff --git a/po/zh_TW/samba.po b/applications/luci-app-samba/po/zh-tw/samba.po
index 6ec99ee20b..6ec99ee20b 100644
--- a/po/zh_TW/samba.po
+++ b/applications/luci-app-samba/po/zh-tw/samba.po
diff --git a/applications/luci-app-shairplay/Makefile b/applications/luci-app-shairplay/Makefile
new file mode 100644
index 0000000000..dcc0611785
--- /dev/null
+++ b/applications/luci-app-shairplay/Makefile
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=LuCI Support for Shairplay
+LUCI_DEPENDS:=+shairplay
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/applications/luci-shairplay/luasrc/controller/shairplay.lua b/applications/luci-app-shairplay/luasrc/controller/shairplay.lua
index 3a2c2ea1be..3a2c2ea1be 100644
--- a/applications/luci-shairplay/luasrc/controller/shairplay.lua
+++ b/applications/luci-app-shairplay/luasrc/controller/shairplay.lua
diff --git a/applications/luci-shairplay/luasrc/model/cbi/shairplay.lua b/applications/luci-app-shairplay/luasrc/model/cbi/shairplay.lua
index e957ce697c..e957ce697c 100644
--- a/applications/luci-shairplay/luasrc/model/cbi/shairplay.lua
+++ b/applications/luci-app-shairplay/luasrc/model/cbi/shairplay.lua
diff --git a/applications/luci-shairplay/root/etc/uci-defaults/luci-shairplay b/applications/luci-app-shairplay/root/etc/uci-defaults/luci-shairplay
index efc8a89bb0..efc8a89bb0 100644
--- a/applications/luci-shairplay/root/etc/uci-defaults/luci-shairplay
+++ b/applications/luci-app-shairplay/root/etc/uci-defaults/luci-shairplay
diff --git a/applications/luci-app-shairport/Makefile b/applications/luci-app-shairport/Makefile
new file mode 100644
index 0000000000..f174ef4687
--- /dev/null
+++ b/applications/luci-app-shairport/Makefile
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=LuCI Support for Shairport
+LUCI_DEPENDS:=+shairport
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/applications/luci-shairport/luasrc/controller/shairport.lua b/applications/luci-app-shairport/luasrc/controller/shairport.lua
index d201eca542..d201eca542 100644
--- a/applications/luci-shairport/luasrc/controller/shairport.lua
+++ b/applications/luci-app-shairport/luasrc/controller/shairport.lua
diff --git a/applications/luci-shairport/luasrc/model/cbi/shairport.lua b/applications/luci-app-shairport/luasrc/model/cbi/shairport.lua
index 974d7850dd..974d7850dd 100644
--- a/applications/luci-shairport/luasrc/model/cbi/shairport.lua
+++ b/applications/luci-app-shairport/luasrc/model/cbi/shairport.lua
diff --git a/applications/luci-shairport/root/etc/uci-defaults/luci-shairport b/applications/luci-app-shairport/root/etc/uci-defaults/luci-shairport
index be9412bac8..be9412bac8 100644
--- a/applications/luci-shairport/root/etc/uci-defaults/luci-shairport
+++ b/applications/luci-app-shairport/root/etc/uci-defaults/luci-shairport
diff --git a/applications/luci-app-siitwizard/Makefile b/applications/luci-app-siitwizard/Makefile
new file mode 100644
index 0000000000..e8a8e555e4
--- /dev/null
+++ b/applications/luci-app-siitwizard/Makefile
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=SIIT IPv4-over-IPv6 configuration wizard
+LUCI_DEPENDS:=+kmod-siit
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/applications/luci-siitwizard/luasrc/controller/siitwizard.lua b/applications/luci-app-siitwizard/luasrc/controller/siitwizard.lua
index 2e0fd0812a..2e0fd0812a 100644
--- a/applications/luci-siitwizard/luasrc/controller/siitwizard.lua
+++ b/applications/luci-app-siitwizard/luasrc/controller/siitwizard.lua
diff --git a/applications/luci-siitwizard/luasrc/model/cbi/siitwizard.lua b/applications/luci-app-siitwizard/luasrc/model/cbi/siitwizard.lua
index 57ba556ac5..57ba556ac5 100644
--- a/applications/luci-siitwizard/luasrc/model/cbi/siitwizard.lua
+++ b/applications/luci-app-siitwizard/luasrc/model/cbi/siitwizard.lua
diff --git a/applications/luci-siitwizard/root/etc/config/siit b/applications/luci-app-siitwizard/root/etc/config/siit
index c594547d93..c594547d93 100644
--- a/applications/luci-siitwizard/root/etc/config/siit
+++ b/applications/luci-app-siitwizard/root/etc/config/siit
diff --git a/applications/luci-app-splash/Makefile b/applications/luci-app-splash/Makefile
new file mode 100644
index 0000000000..345f8910ff
--- /dev/null
+++ b/applications/luci-app-splash/Makefile
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=Freifunk DHCP-Splash application
+LUCI_DEPENDS:=+luci-lib-nixio +tc +kmod-sched +iptables-mod-nat-extra +iptables-mod-ipopt
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/applications/luci-splash/README b/applications/luci-app-splash/README
index 5a7af14c24..5a7af14c24 100644
--- a/applications/luci-splash/README
+++ b/applications/luci-app-splash/README
diff --git a/applications/luci-splash/htdocs/cgi-bin/splash/splash.sh b/applications/luci-app-splash/htdocs/cgi-bin/splash/splash.sh
index 76f6d4d3e4..76f6d4d3e4 100755
--- a/applications/luci-splash/htdocs/cgi-bin/splash/splash.sh
+++ b/applications/luci-app-splash/htdocs/cgi-bin/splash/splash.sh
diff --git a/applications/luci-splash/htdocs/luci/splash/index.html b/applications/luci-app-splash/htdocs/luci/splash/index.html
index 486409a2ef..486409a2ef 100644
--- a/applications/luci-splash/htdocs/luci/splash/index.html
+++ b/applications/luci-app-splash/htdocs/luci/splash/index.html
diff --git a/applications/luci-splash/ipkg/postinst b/applications/luci-app-splash/ipkg/postinst
index a87729e431..a87729e431 100755
--- a/applications/luci-splash/ipkg/postinst
+++ b/applications/luci-app-splash/ipkg/postinst
diff --git a/applications/luci-splash/luasrc/controller/splash/splash.lua b/applications/luci-app-splash/luasrc/controller/splash/splash.lua
index 97d0400822..97d0400822 100644
--- a/applications/luci-splash/luasrc/controller/splash/splash.lua
+++ b/applications/luci-app-splash/luasrc/controller/splash/splash.lua
diff --git a/applications/luci-splash/luasrc/model/cbi/splash/splash.lua b/applications/luci-app-splash/luasrc/model/cbi/splash/splash.lua
index 206ef70531..206ef70531 100644
--- a/applications/luci-splash/luasrc/model/cbi/splash/splash.lua
+++ b/applications/luci-app-splash/luasrc/model/cbi/splash/splash.lua
diff --git a/applications/luci-splash/luasrc/model/cbi/splash/splashtext.lua b/applications/luci-app-splash/luasrc/model/cbi/splash/splashtext.lua
index 00c5aba947..00c5aba947 100644
--- a/applications/luci-splash/luasrc/model/cbi/splash/splashtext.lua
+++ b/applications/luci-app-splash/luasrc/model/cbi/splash/splashtext.lua
diff --git a/applications/luci-splash/luasrc/view/admin_status/splash.htm b/applications/luci-app-splash/luasrc/view/admin_status/splash.htm
index 61b32bab9e..61b32bab9e 100644
--- a/applications/luci-splash/luasrc/view/admin_status/splash.htm
+++ b/applications/luci-app-splash/luasrc/view/admin_status/splash.htm
diff --git a/applications/luci-splash/luasrc/view/splash/blocked.htm b/applications/luci-app-splash/luasrc/view/splash/blocked.htm
index de61ecf011..de61ecf011 100644
--- a/applications/luci-splash/luasrc/view/splash/blocked.htm
+++ b/applications/luci-app-splash/luasrc/view/splash/blocked.htm
diff --git a/applications/luci-splash/luasrc/view/splash/splash.htm b/applications/luci-app-splash/luasrc/view/splash/splash.htm
index 2ebee273b4..2ebee273b4 100644
--- a/applications/luci-splash/luasrc/view/splash/splash.htm
+++ b/applications/luci-app-splash/luasrc/view/splash/splash.htm
diff --git a/applications/luci-splash/luasrc/view/splash_splash/index.htm b/applications/luci-app-splash/luasrc/view/splash_splash/index.htm
index ab754913d3..ab754913d3 100644
--- a/applications/luci-splash/luasrc/view/splash_splash/index.htm
+++ b/applications/luci-app-splash/luasrc/view/splash_splash/index.htm
diff --git a/applications/luci-splash/luasrc/view/splash_splash/splash.htm b/applications/luci-app-splash/luasrc/view/splash_splash/splash.htm
index 8554913cd8..8554913cd8 100644
--- a/applications/luci-splash/luasrc/view/splash_splash/splash.htm
+++ b/applications/luci-app-splash/luasrc/view/splash_splash/splash.htm
diff --git a/po/ca/splash.po b/applications/luci-app-splash/po/ca/splash.po
index 3afef1a7b3..3afef1a7b3 100644
--- a/po/ca/splash.po
+++ b/applications/luci-app-splash/po/ca/splash.po
diff --git a/po/cs/splash.po b/applications/luci-app-splash/po/cs/splash.po
index 671afd79e2..671afd79e2 100644
--- a/po/cs/splash.po
+++ b/applications/luci-app-splash/po/cs/splash.po
diff --git a/po/de/splash.po b/applications/luci-app-splash/po/de/splash.po
index 8b1cd9a5ec..8b1cd9a5ec 100644
--- a/po/de/splash.po
+++ b/applications/luci-app-splash/po/de/splash.po
diff --git a/po/el/splash.po b/applications/luci-app-splash/po/el/splash.po
index df90478f71..df90478f71 100644
--- a/po/el/splash.po
+++ b/applications/luci-app-splash/po/el/splash.po
diff --git a/po/en/splash.po b/applications/luci-app-splash/po/en/splash.po
index 615be16b23..615be16b23 100644
--- a/po/en/splash.po
+++ b/applications/luci-app-splash/po/en/splash.po
diff --git a/po/es/splash.po b/applications/luci-app-splash/po/es/splash.po
index 836352ea9b..836352ea9b 100644
--- a/po/es/splash.po
+++ b/applications/luci-app-splash/po/es/splash.po
diff --git a/po/fr/splash.po b/applications/luci-app-splash/po/fr/splash.po
index e525ab316c..e525ab316c 100644
--- a/po/fr/splash.po
+++ b/applications/luci-app-splash/po/fr/splash.po
diff --git a/po/he/splash.po b/applications/luci-app-splash/po/he/splash.po
index bf7e2f0745..bf7e2f0745 100644
--- a/po/he/splash.po
+++ b/applications/luci-app-splash/po/he/splash.po
diff --git a/po/hu/splash.po b/applications/luci-app-splash/po/hu/splash.po
index f2c7da14ab..f2c7da14ab 100644
--- a/po/hu/splash.po
+++ b/applications/luci-app-splash/po/hu/splash.po
diff --git a/po/it/splash.po b/applications/luci-app-splash/po/it/splash.po
index 8964b6c3fb..8964b6c3fb 100644
--- a/po/it/splash.po
+++ b/applications/luci-app-splash/po/it/splash.po
diff --git a/po/ja/splash.po b/applications/luci-app-splash/po/ja/splash.po
index 615be16b23..615be16b23 100644
--- a/po/ja/splash.po
+++ b/applications/luci-app-splash/po/ja/splash.po
diff --git a/po/ms/splash.po b/applications/luci-app-splash/po/ms/splash.po
index 615be16b23..615be16b23 100644
--- a/po/ms/splash.po
+++ b/applications/luci-app-splash/po/ms/splash.po
diff --git a/po/no/splash.po b/applications/luci-app-splash/po/no/splash.po
index 615be16b23..615be16b23 100644
--- a/po/no/splash.po
+++ b/applications/luci-app-splash/po/no/splash.po
diff --git a/po/pl/splash.po b/applications/luci-app-splash/po/pl/splash.po
index 68568848f0..68568848f0 100644
--- a/po/pl/splash.po
+++ b/applications/luci-app-splash/po/pl/splash.po
diff --git a/po/pt_BR/splash.po b/applications/luci-app-splash/po/pt-br/splash.po
index cbdc8016c1..cbdc8016c1 100644
--- a/po/pt_BR/splash.po
+++ b/applications/luci-app-splash/po/pt-br/splash.po
diff --git a/po/pt/splash.po b/applications/luci-app-splash/po/pt/splash.po
index 05bee4f323..05bee4f323 100644
--- a/po/pt/splash.po
+++ b/applications/luci-app-splash/po/pt/splash.po
diff --git a/po/ro/splash.po b/applications/luci-app-splash/po/ro/splash.po
index 615be16b23..615be16b23 100644
--- a/po/ro/splash.po
+++ b/applications/luci-app-splash/po/ro/splash.po
diff --git a/po/ru/splash.po b/applications/luci-app-splash/po/ru/splash.po
index 3f470dba0d..3f470dba0d 100644
--- a/po/ru/splash.po
+++ b/applications/luci-app-splash/po/ru/splash.po
diff --git a/po/sk/splash.po b/applications/luci-app-splash/po/sk/splash.po
index e9dd448ec5..e9dd448ec5 100644
--- a/po/sk/splash.po
+++ b/applications/luci-app-splash/po/sk/splash.po
diff --git a/po/sv/splash.po b/applications/luci-app-splash/po/sv/splash.po
index cd573b212f..cd573b212f 100644
--- a/po/sv/splash.po
+++ b/applications/luci-app-splash/po/sv/splash.po
diff --git a/applications/luci-app-splash/po/templates/splash.pot b/applications/luci-app-splash/po/templates/splash.pot
new file mode 100644
index 0000000000..f29b736915
--- /dev/null
+++ b/applications/luci-app-splash/po/templates/splash.pot
@@ -0,0 +1,295 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "Accept"
+msgstr ""
+
+msgid ""
+"Access to the internet might be possible nevertheless, because some "
+"activists of this project share their private internet connections. These "
+"few connections are shared between all users. That means available bandwidth "
+"is limited and because of this we ask you not to do any of the following:"
+msgstr ""
+
+msgid ""
+"Access to the network is not guaranteed. It can be interrupted at any time "
+"without notice for any reason, for certain devices, and/or may be blocked "
+"for certain users."
+msgstr ""
+
+msgid "Active Clients"
+msgstr ""
+
+msgid "Allowed hosts/subnets"
+msgstr ""
+
+msgid ""
+"As an alternative to editing the complete splash text you can also just "
+"include some custom text in the default splash page by entering it here."
+msgstr ""
+
+msgid ""
+"Bandwidth limit for clients is only activated when both up- and download "
+"limit are set. Use a value of 0 here to completely disable this limitation. "
+"Whitelisted clients are not limited."
+msgstr ""
+
+msgid ""
+"Become an active member of this community and help by operating your own node"
+msgstr ""
+
+msgid "Blacklist"
+msgstr ""
+
+msgid "Blocked"
+msgstr ""
+
+msgid ""
+"By accepting these rules you can use this network for %s hour(s). After this "
+"time you need to accept these rules again."
+msgstr ""
+
+msgid "Clearance time"
+msgstr ""
+
+msgid "Client-Splash"
+msgstr ""
+
+msgid ""
+"Client-Splash is a hotspot authentification system for wireless mesh "
+"networks."
+msgstr ""
+
+msgid ""
+"Clients are redirected to this page after they have accepted the splash. If "
+"this is left empty they are redirected to the page they had requested."
+msgstr ""
+
+msgid "Clients download speed is limited to this value (kbyte/s)"
+msgstr ""
+
+msgid ""
+"Clients that have accepted the splash are allowed to use the network for "
+"that many hours."
+msgstr ""
+
+msgid "Clients upload speed is limited to this value (kbyte/s)"
+msgstr ""
+
+msgid "Contact"
+msgstr ""
+
+msgid "Decline"
+msgstr ""
+
+msgid ""
+"Destination hosts and networks that are excluded from splashing, i.e. they "
+"are always allowed."
+msgstr ""
+
+msgid "Donate some money to help us keep this project alive."
+msgstr ""
+
+msgid "Download limit"
+msgstr ""
+
+msgid "Edit the complete splash text"
+msgstr ""
+
+msgid "Fair Use Policy"
+msgstr ""
+
+msgid "Firewall zone"
+msgstr ""
+
+msgid "General"
+msgstr ""
+
+msgid "Get in %s with the operator of this access point."
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid "IP Address"
+msgstr ""
+
+msgid ""
+"If you operate your own wifi equipment use channels different from ours."
+msgstr ""
+
+msgid "If you use this network on a regular basis we ask for your support:"
+msgstr ""
+
+msgid "Include your own text in the default splash"
+msgstr ""
+
+msgid "Intercept client traffic on this Interface"
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Interfaces that are used for Splash."
+msgstr ""
+
+msgid ""
+"KB/s (Download/Upload). You may be able to remove this limit by actively "
+"contributing to this project."
+msgstr ""
+
+msgid "Legally Prohibited Activities"
+msgstr ""
+
+msgid "Legally Prohibited content"
+msgstr ""
+
+msgid "MAC Address"
+msgstr ""
+
+msgid "MAC addresses in this list are blocked."
+msgstr ""
+
+msgid ""
+"MAC addresses of whitelisted clients. These do not need to accept the splash "
+"and are not bandwidth limited."
+msgstr ""
+
+msgid "Netmask"
+msgstr ""
+
+msgid "Network"
+msgstr ""
+
+msgid "No clients connected"
+msgstr ""
+
+msgid ""
+"Please note that we are not an internet service provider but an experimental "
+"community network."
+msgstr ""
+
+msgid "Policy"
+msgstr ""
+
+msgid "Redirect target"
+msgstr ""
+
+msgid "Safety"
+msgstr ""
+
+msgid "Save"
+msgstr ""
+
+msgid "Splash rules are integrated in this firewall zone"
+msgstr ""
+
+msgid "Splashtext"
+msgstr ""
+
+msgid ""
+"The network, like the Internet, is unencrypted and open. Each participant is "
+"responsible for the safety of their own connections and devices."
+msgstr ""
+
+msgid ""
+"The open and free wireless network of volunteers (\"Operators\") provides "
+"the necessary equipment and Internet connections (\"Infrastructure\") at "
+"their own expense."
+msgstr ""
+
+msgid ""
+"The operator claims no liability for loss of data, unauthorized access/"
+"damage to devices, or financial losses that participants may suffer from the "
+"use of the network."
+msgstr ""
+
+msgid ""
+"The participant agrees to not perform any action and refrain from acts which "
+"may violate the law or infringe upon the rights of third parties."
+msgstr ""
+
+msgid ""
+"The participant agrees to not transfer content over the network which "
+"violates the law."
+msgstr ""
+
+msgid ""
+"The participant agrees to not use the network in any way which will harm the "
+"infrastructure, the network itself, its operators or other participants."
+msgstr ""
+
+msgid ""
+"These Terms of Use govern the use of the network by its participants' "
+"computer, PDA, or similar device (\"Devices\") within the network."
+msgstr ""
+
+msgid "Time remaining"
+msgstr ""
+
+msgid ""
+"To ask for the reason why you have been blocked or ask for access again you "
+"can try to contact the owner of this access point:"
+msgstr ""
+
+msgid "Traffic in/out"
+msgstr ""
+
+msgid "Upload limit"
+msgstr ""
+
+msgid "Usage Agreement"
+msgstr ""
+
+msgid "Welcome"
+msgstr ""
+
+msgid "Whitelist"
+msgstr ""
+
+msgid "You are now connected to the free wireless mesh network"
+msgstr ""
+
+msgid ""
+"You can enter your own text that is displayed to clients here.<br />It is "
+"possible to use the following markers: ###COMMUNITY###, ###COMMUNITY_URL###, "
+"###CONTACTURL###, ###LEASETIME###, ###LIMIT### and ###ACCEPT###."
+msgstr ""
+
+msgid ""
+"Your access to this network has been blocked, most likely because you did "
+"something that our rules explicitly forbid."
+msgstr ""
+
+msgid "Your bandwidth is limited to"
+msgstr ""
+
+msgid "blacklisted"
+msgstr ""
+
+msgid "expired"
+msgstr ""
+
+msgid "optional when using host addresses"
+msgstr ""
+
+msgid "perform any kind of illegal activities"
+msgstr ""
+
+msgid "splashed"
+msgstr ""
+
+msgid "temporarily blocked"
+msgstr ""
+
+msgid "unknown"
+msgstr ""
+
+msgid "use filesharing applications on this network"
+msgstr ""
+
+msgid "waste bandwidth with unneccesary downloads or streams"
+msgstr ""
+
+msgid "whitelisted"
+msgstr ""
diff --git a/po/tr/splash.po b/applications/luci-app-splash/po/tr/splash.po
index 03fa7b3b74..03fa7b3b74 100644
--- a/po/tr/splash.po
+++ b/applications/luci-app-splash/po/tr/splash.po
diff --git a/po/uk/splash.po b/applications/luci-app-splash/po/uk/splash.po
index 2364c63d41..2364c63d41 100644
--- a/po/uk/splash.po
+++ b/applications/luci-app-splash/po/uk/splash.po
diff --git a/po/vi/splash.po b/applications/luci-app-splash/po/vi/splash.po
index 615be16b23..615be16b23 100644
--- a/po/vi/splash.po
+++ b/applications/luci-app-splash/po/vi/splash.po
diff --git a/po/zh_CN/splash.po b/applications/luci-app-splash/po/zh-cn/splash.po
index 439b774e6c..439b774e6c 100644
--- a/po/zh_CN/splash.po
+++ b/applications/luci-app-splash/po/zh-cn/splash.po
diff --git a/po/zh_TW/splash.po b/applications/luci-app-splash/po/zh-tw/splash.po
index 1125abfeda..1125abfeda 100644
--- a/po/zh_TW/splash.po
+++ b/applications/luci-app-splash/po/zh-tw/splash.po
diff --git a/applications/luci-splash/root/etc/config/luci_splash b/applications/luci-app-splash/root/etc/config/luci_splash
index c4cfef5dd9..c4cfef5dd9 100644
--- a/applications/luci-splash/root/etc/config/luci_splash
+++ b/applications/luci-app-splash/root/etc/config/luci_splash
diff --git a/applications/luci-splash/root/etc/config/luci_splash_leases b/applications/luci-app-splash/root/etc/config/luci_splash_leases
index 6afdd90ede..6afdd90ede 100644
--- a/applications/luci-splash/root/etc/config/luci_splash_leases
+++ b/applications/luci-app-splash/root/etc/config/luci_splash_leases
diff --git a/applications/luci-splash/root/etc/hotplug.d/iface/25-splash b/applications/luci-app-splash/root/etc/hotplug.d/iface/25-splash
index 045e908c72..045e908c72 100644
--- a/applications/luci-splash/root/etc/hotplug.d/iface/25-splash
+++ b/applications/luci-app-splash/root/etc/hotplug.d/iface/25-splash
diff --git a/applications/luci-splash/root/etc/init.d/luci_splash b/applications/luci-app-splash/root/etc/init.d/luci_splash
index feefabd81a..feefabd81a 100755
--- a/applications/luci-splash/root/etc/init.d/luci_splash
+++ b/applications/luci-app-splash/root/etc/init.d/luci_splash
diff --git a/applications/luci-splash/root/usr/sbin/luci-splash b/applications/luci-app-splash/root/usr/sbin/luci-splash
index 6b1e41edbd..6b1e41edbd 100755
--- a/applications/luci-splash/root/usr/sbin/luci-splash
+++ b/applications/luci-app-splash/root/usr/sbin/luci-splash
diff --git a/applications/luci-app-statistics/Makefile b/applications/luci-app-statistics/Makefile
new file mode 100644
index 0000000000..af07cfbd02
--- /dev/null
+++ b/applications/luci-app-statistics/Makefile
@@ -0,0 +1,16 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=LuCI Statistics Application
+LUCI_DEPENDS:= \
+	+collectd +rrdtool1 +collectd-mod-rrdtool +collectd-mod-iwinfo \
+	+collectd-mod-interface +collectd-mod-load +collectd-mod-network
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/applications/luci-statistics/ipkg/postinst b/applications/luci-app-statistics/ipkg/postinst
index 7e81b3667f..7e81b3667f 100755
--- a/applications/luci-statistics/ipkg/postinst
+++ b/applications/luci-app-statistics/ipkg/postinst
diff --git a/applications/luci-statistics/luasrc/controller/luci_statistics/luci_statistics.lua b/applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua
index 5729bb186a..5729bb186a 100644
--- a/applications/luci-statistics/luasrc/controller/luci_statistics/luci_statistics.lua
+++ b/applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua
diff --git a/applications/luci-statistics/luasrc/model/cbi/luci_statistics/collectd.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/collectd.lua
index 2343854f66..2343854f66 100644
--- a/applications/luci-statistics/luasrc/model/cbi/luci_statistics/collectd.lua
+++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/collectd.lua
diff --git a/applications/luci-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua
index 81e9c05a55..81e9c05a55 100644
--- a/applications/luci-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua
+++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua
diff --git a/applications/luci-statistics/luasrc/model/cbi/luci_statistics/cpu.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpu.lua
index 26d5f07c84..26d5f07c84 100644
--- a/applications/luci-statistics/luasrc/model/cbi/luci_statistics/cpu.lua
+++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpu.lua
diff --git a/applications/luci-statistics/luasrc/model/cbi/luci_statistics/csv.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/csv.lua
index 4f5aeef1d0..4f5aeef1d0 100644
--- a/applications/luci-statistics/luasrc/model/cbi/luci_statistics/csv.lua
+++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/csv.lua
diff --git a/applications/luci-statistics/luasrc/model/cbi/luci_statistics/df.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/df.lua
index 1a3245fc04..1a3245fc04 100644
--- a/applications/luci-statistics/luasrc/model/cbi/luci_statistics/df.lua
+++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/df.lua
diff --git a/applications/luci-statistics/luasrc/model/cbi/luci_statistics/disk.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/disk.lua
index 7592b44403..7592b44403 100644
--- a/applications/luci-statistics/luasrc/model/cbi/luci_statistics/disk.lua
+++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/disk.lua
diff --git a/applications/luci-statistics/luasrc/model/cbi/luci_statistics/dns.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/dns.lua
index 28d9e5de33..28d9e5de33 100644
--- a/applications/luci-statistics/luasrc/model/cbi/luci_statistics/dns.lua
+++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/dns.lua
diff --git a/applications/luci-statistics/luasrc/model/cbi/luci_statistics/email.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/email.lua
index c5733d8cf8..c5733d8cf8 100644
--- a/applications/luci-statistics/luasrc/model/cbi/luci_statistics/email.lua
+++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/email.lua
diff --git a/applications/luci-statistics/luasrc/model/cbi/luci_statistics/exec.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/exec.lua
index 997d455d9a..997d455d9a 100644
--- a/applications/luci-statistics/luasrc/model/cbi/luci_statistics/exec.lua
+++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/exec.lua
diff --git a/applications/luci-statistics/luasrc/model/cbi/luci_statistics/interface.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/interface.lua
index dbb3e9dc06..dbb3e9dc06 100644
--- a/applications/luci-statistics/luasrc/model/cbi/luci_statistics/interface.lua
+++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/interface.lua
diff --git a/applications/luci-statistics/luasrc/model/cbi/luci_statistics/iptables.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/iptables.lua
index 1f7341c46e..1f7341c46e 100644
--- a/applications/luci-statistics/luasrc/model/cbi/luci_statistics/iptables.lua
+++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/iptables.lua
diff --git a/applications/luci-statistics/luasrc/model/cbi/luci_statistics/irq.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/irq.lua
index d6aa2e96c3..d6aa2e96c3 100644
--- a/applications/luci-statistics/luasrc/model/cbi/luci_statistics/irq.lua
+++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/irq.lua
diff --git a/applications/luci-statistics/luasrc/model/cbi/luci_statistics/iwinfo.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/iwinfo.lua
index 5e9340dc46..5e9340dc46 100644
--- a/applications/luci-statistics/luasrc/model/cbi/luci_statistics/iwinfo.lua
+++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/iwinfo.lua
diff --git a/applications/luci-statistics/luasrc/model/cbi/luci_statistics/load.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/load.lua
index e59a4b8f7e..e59a4b8f7e 100644
--- a/applications/luci-statistics/luasrc/model/cbi/luci_statistics/load.lua
+++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/load.lua
diff --git a/applications/luci-statistics/luasrc/model/cbi/luci_statistics/memory.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/memory.lua
index 5510a5a8e8..5510a5a8e8 100644
--- a/applications/luci-statistics/luasrc/model/cbi/luci_statistics/memory.lua
+++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/memory.lua
diff --git a/applications/luci-statistics/luasrc/model/cbi/luci_statistics/netlink.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/netlink.lua
index 3417d0902d..3417d0902d 100644
--- a/applications/luci-statistics/luasrc/model/cbi/luci_statistics/netlink.lua
+++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/netlink.lua
diff --git a/applications/luci-statistics/luasrc/model/cbi/luci_statistics/network.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/network.lua
index 8a0068973e..8a0068973e 100644
--- a/applications/luci-statistics/luasrc/model/cbi/luci_statistics/network.lua
+++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/network.lua
diff --git a/applications/luci-statistics/luasrc/model/cbi/luci_statistics/nut.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/nut.lua
index ad030718cf..ad030718cf 100644
--- a/applications/luci-statistics/luasrc/model/cbi/luci_statistics/nut.lua
+++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/nut.lua
diff --git a/applications/luci-statistics/luasrc/model/cbi/luci_statistics/olsrd.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/olsrd.lua
index e3eb7b2c4b..e3eb7b2c4b 100644
--- a/applications/luci-statistics/luasrc/model/cbi/luci_statistics/olsrd.lua
+++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/olsrd.lua
diff --git a/applications/luci-statistics/luasrc/model/cbi/luci_statistics/ping.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/ping.lua
index c55ac87368..c55ac87368 100644
--- a/applications/luci-statistics/luasrc/model/cbi/luci_statistics/ping.lua
+++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/ping.lua
diff --git a/applications/luci-statistics/luasrc/model/cbi/luci_statistics/processes.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/processes.lua
index 3aea6b3c71..3aea6b3c71 100644
--- a/applications/luci-statistics/luasrc/model/cbi/luci_statistics/processes.lua
+++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/processes.lua
diff --git a/applications/luci-statistics/luasrc/model/cbi/luci_statistics/rrdtool.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/rrdtool.lua
index 75716341c8..75716341c8 100644
--- a/applications/luci-statistics/luasrc/model/cbi/luci_statistics/rrdtool.lua
+++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/rrdtool.lua
diff --git a/applications/luci-statistics/luasrc/model/cbi/luci_statistics/splash_leases.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/splash_leases.lua
index a15ed0ecce..a15ed0ecce 100644
--- a/applications/luci-statistics/luasrc/model/cbi/luci_statistics/splash_leases.lua
+++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/splash_leases.lua
diff --git a/applications/luci-statistics/luasrc/model/cbi/luci_statistics/tcpconns.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/tcpconns.lua
index 9d0f6e137c..9d0f6e137c 100644
--- a/applications/luci-statistics/luasrc/model/cbi/luci_statistics/tcpconns.lua
+++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/tcpconns.lua
diff --git a/applications/luci-statistics/luasrc/model/cbi/luci_statistics/unixsock.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/unixsock.lua
index cbd52ec1fe..cbd52ec1fe 100644
--- a/applications/luci-statistics/luasrc/model/cbi/luci_statistics/unixsock.lua
+++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/unixsock.lua
diff --git a/applications/luci-statistics/luasrc/model/cbi/luci_statistics/uptime.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/uptime.lua
index 3a6c4644e3..3a6c4644e3 100644
--- a/applications/luci-statistics/luasrc/model/cbi/luci_statistics/uptime.lua
+++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/uptime.lua
diff --git a/applications/luci-statistics/luasrc/statistics/datatree.lua b/applications/luci-app-statistics/luasrc/statistics/datatree.lua
index 850b83a998..850b83a998 100644
--- a/applications/luci-statistics/luasrc/statistics/datatree.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/datatree.lua
diff --git a/applications/luci-statistics/luasrc/statistics/i18n.lua b/applications/luci-app-statistics/luasrc/statistics/i18n.lua
index a1a2fa9de3..a1a2fa9de3 100644
--- a/applications/luci-statistics/luasrc/statistics/i18n.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/i18n.lua
diff --git a/applications/luci-statistics/luasrc/statistics/rrdtool.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool.lua
index dbcae9dc6b..dbcae9dc6b 100644
--- a/applications/luci-statistics/luasrc/statistics/rrdtool.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool.lua
diff --git a/applications/luci-statistics/luasrc/statistics/rrdtool/colors.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/colors.lua
index 2da9f5a08a..2da9f5a08a 100644
--- a/applications/luci-statistics/luasrc/statistics/rrdtool/colors.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/colors.lua
diff --git a/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/conntrack.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/conntrack.lua
index 0da546c0b4..0da546c0b4 100644
--- a/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/conntrack.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/conntrack.lua
diff --git a/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/cpu.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpu.lua
index c0e86245c0..c0e86245c0 100644
--- a/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/cpu.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpu.lua
diff --git a/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/df.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/df.lua
index fa206badbd..fa206badbd 100644
--- a/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/df.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/df.lua
diff --git a/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/disk.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/disk.lua
index ebc37ef3a4..ebc37ef3a4 100644
--- a/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/disk.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/disk.lua
diff --git a/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/dns.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/dns.lua
index 94a148d810..94a148d810 100644
--- a/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/dns.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/dns.lua
diff --git a/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/interface.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/interface.lua
index a6f3b5c6a6..a6f3b5c6a6 100644
--- a/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/interface.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/interface.lua
diff --git a/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/iptables.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/iptables.lua
index c1adbdc619..c1adbdc619 100644
--- a/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/iptables.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/iptables.lua
diff --git a/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/irq.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/irq.lua
index aabe14a037..aabe14a037 100644
--- a/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/irq.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/irq.lua
diff --git a/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/iwinfo.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/iwinfo.lua
index 0c6eed9936..0c6eed9936 100644
--- a/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/iwinfo.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/iwinfo.lua
diff --git a/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/load.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/load.lua
index 4cb4795ef6..4cb4795ef6 100644
--- a/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/load.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/load.lua
diff --git a/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/memory.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/memory.lua
index a1c65f56d7..a1c65f56d7 100644
--- a/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/memory.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/memory.lua
diff --git a/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/netlink.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/netlink.lua
index 9313952518..9313952518 100644
--- a/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/netlink.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/netlink.lua
diff --git a/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/nut.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/nut.lua
index 69f1ae305c..69f1ae305c 100644
--- a/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/nut.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/nut.lua
diff --git a/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/olsrd.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/olsrd.lua
index 3ca2f03ec8..3ca2f03ec8 100644
--- a/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/olsrd.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/olsrd.lua
diff --git a/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/ping.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/ping.lua
index bdffc85997..bdffc85997 100644
--- a/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/ping.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/ping.lua
diff --git a/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/processes.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/processes.lua
index 6f83c8e283..6f83c8e283 100644
--- a/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/processes.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/processes.lua
diff --git a/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/splash_leases.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/splash_leases.lua
index 69f3c113cd..69f3c113cd 100644
--- a/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/splash_leases.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/splash_leases.lua
diff --git a/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/tcpconns.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/tcpconns.lua
index 4f1c221f9b..4f1c221f9b 100644
--- a/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/tcpconns.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/tcpconns.lua
diff --git a/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/uptime.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/uptime.lua
index 077ec57e83..077ec57e83 100644
--- a/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/uptime.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/uptime.lua
diff --git a/applications/luci-statistics/luasrc/view/admin_statistics/index.htm b/applications/luci-app-statistics/luasrc/view/admin_statistics/index.htm
index 25157da40a..25157da40a 100644
--- a/applications/luci-statistics/luasrc/view/admin_statistics/index.htm
+++ b/applications/luci-app-statistics/luasrc/view/admin_statistics/index.htm
diff --git a/applications/luci-statistics/luasrc/view/public_statistics/graph.htm b/applications/luci-app-statistics/luasrc/view/public_statistics/graph.htm
index 8a8256bbbf..8a8256bbbf 100644
--- a/applications/luci-statistics/luasrc/view/public_statistics/graph.htm
+++ b/applications/luci-app-statistics/luasrc/view/public_statistics/graph.htm
diff --git a/po/ca/rrdtool.po b/applications/luci-app-statistics/po/ca/rrdtool.po
index 7c03aad9a3..7c03aad9a3 100644
--- a/po/ca/rrdtool.po
+++ b/applications/luci-app-statistics/po/ca/rrdtool.po
diff --git a/po/ca/statistics.po b/applications/luci-app-statistics/po/ca/statistics.po
index 39a425d87d..39a425d87d 100644
--- a/po/ca/statistics.po
+++ b/applications/luci-app-statistics/po/ca/statistics.po
diff --git a/po/cs/rrdtool.po b/applications/luci-app-statistics/po/cs/rrdtool.po
index e6149ecaa3..e6149ecaa3 100644
--- a/po/cs/rrdtool.po
+++ b/applications/luci-app-statistics/po/cs/rrdtool.po
diff --git a/po/cs/statistics.po b/applications/luci-app-statistics/po/cs/statistics.po
index af6904656f..af6904656f 100644
--- a/po/cs/statistics.po
+++ b/applications/luci-app-statistics/po/cs/statistics.po
diff --git a/po/de/rrdtool.po b/applications/luci-app-statistics/po/de/rrdtool.po
index 390fd2e6c6..390fd2e6c6 100644
--- a/po/de/rrdtool.po
+++ b/applications/luci-app-statistics/po/de/rrdtool.po
diff --git a/po/de/statistics.po b/applications/luci-app-statistics/po/de/statistics.po
index a523d7792a..a523d7792a 100644
--- a/po/de/statistics.po
+++ b/applications/luci-app-statistics/po/de/statistics.po
diff --git a/po/el/rrdtool.po b/applications/luci-app-statistics/po/el/rrdtool.po
index 1d81166ecf..1d81166ecf 100644
--- a/po/el/rrdtool.po
+++ b/applications/luci-app-statistics/po/el/rrdtool.po
diff --git a/po/el/statistics.po b/applications/luci-app-statistics/po/el/statistics.po
index c55afdf51e..c55afdf51e 100644
--- a/po/el/statistics.po
+++ b/applications/luci-app-statistics/po/el/statistics.po
diff --git a/po/en/rrdtool.po b/applications/luci-app-statistics/po/en/rrdtool.po
index d780144537..d780144537 100644
--- a/po/en/rrdtool.po
+++ b/applications/luci-app-statistics/po/en/rrdtool.po
diff --git a/po/en/statistics.po b/applications/luci-app-statistics/po/en/statistics.po
index 5de07640c0..5de07640c0 100644
--- a/po/en/statistics.po
+++ b/applications/luci-app-statistics/po/en/statistics.po
diff --git a/po/es/rrdtool.po b/applications/luci-app-statistics/po/es/rrdtool.po
index 3cf27a28b1..3cf27a28b1 100644
--- a/po/es/rrdtool.po
+++ b/applications/luci-app-statistics/po/es/rrdtool.po
diff --git a/po/es/statistics.po b/applications/luci-app-statistics/po/es/statistics.po
index 3571a53d34..3571a53d34 100644
--- a/po/es/statistics.po
+++ b/applications/luci-app-statistics/po/es/statistics.po
diff --git a/po/fr/rrdtool.po b/applications/luci-app-statistics/po/fr/rrdtool.po
index 95545db6d1..95545db6d1 100644
--- a/po/fr/rrdtool.po
+++ b/applications/luci-app-statistics/po/fr/rrdtool.po
diff --git a/po/fr/statistics.po b/applications/luci-app-statistics/po/fr/statistics.po
index f1fec699da..f1fec699da 100644
--- a/po/fr/statistics.po
+++ b/applications/luci-app-statistics/po/fr/statistics.po
diff --git a/po/he/rrdtool.po b/applications/luci-app-statistics/po/he/rrdtool.po
index 32b74f7598..32b74f7598 100644
--- a/po/he/rrdtool.po
+++ b/applications/luci-app-statistics/po/he/rrdtool.po
diff --git a/po/he/statistics.po b/applications/luci-app-statistics/po/he/statistics.po
index 6ad747565c..6ad747565c 100644
--- a/po/he/statistics.po
+++ b/applications/luci-app-statistics/po/he/statistics.po
diff --git a/po/hu/rrdtool.po b/applications/luci-app-statistics/po/hu/rrdtool.po
index 582c939eb6..582c939eb6 100644
--- a/po/hu/rrdtool.po
+++ b/applications/luci-app-statistics/po/hu/rrdtool.po
diff --git a/po/hu/statistics.po b/applications/luci-app-statistics/po/hu/statistics.po
index 2480c80b12..2480c80b12 100644
--- a/po/hu/statistics.po
+++ b/applications/luci-app-statistics/po/hu/statistics.po
diff --git a/po/it/rrdtool.po b/applications/luci-app-statistics/po/it/rrdtool.po
index 8ae44722f8..8ae44722f8 100644
--- a/po/it/rrdtool.po
+++ b/applications/luci-app-statistics/po/it/rrdtool.po
diff --git a/po/it/statistics.po b/applications/luci-app-statistics/po/it/statistics.po
index 1e3fc6db5c..1e3fc6db5c 100644
--- a/po/it/statistics.po
+++ b/applications/luci-app-statistics/po/it/statistics.po
diff --git a/po/ja/rrdtool.po b/applications/luci-app-statistics/po/ja/rrdtool.po
index 95545db6d1..95545db6d1 100644
--- a/po/ja/rrdtool.po
+++ b/applications/luci-app-statistics/po/ja/rrdtool.po
diff --git a/po/ja/statistics.po b/applications/luci-app-statistics/po/ja/statistics.po
index 99c5e1bcfd..99c5e1bcfd 100644
--- a/po/ja/statistics.po
+++ b/applications/luci-app-statistics/po/ja/statistics.po
diff --git a/po/ms/rrdtool.po b/applications/luci-app-statistics/po/ms/rrdtool.po
index 1f81fc669a..1f81fc669a 100644
--- a/po/ms/rrdtool.po
+++ b/applications/luci-app-statistics/po/ms/rrdtool.po
diff --git a/po/ms/statistics.po b/applications/luci-app-statistics/po/ms/statistics.po
index e8280534e2..e8280534e2 100644
--- a/po/ms/statistics.po
+++ b/applications/luci-app-statistics/po/ms/statistics.po
diff --git a/po/no/rrdtool.po b/applications/luci-app-statistics/po/no/rrdtool.po
index d336ec3dad..d336ec3dad 100644
--- a/po/no/rrdtool.po
+++ b/applications/luci-app-statistics/po/no/rrdtool.po
diff --git a/po/no/statistics.po b/applications/luci-app-statistics/po/no/statistics.po
index a4706b77de..a4706b77de 100644
--- a/po/no/statistics.po
+++ b/applications/luci-app-statistics/po/no/statistics.po
diff --git a/po/pl/rrdtool.po b/applications/luci-app-statistics/po/pl/rrdtool.po
index bf451ecc76..bf451ecc76 100644
--- a/po/pl/rrdtool.po
+++ b/applications/luci-app-statistics/po/pl/rrdtool.po
diff --git a/po/pl/statistics.po b/applications/luci-app-statistics/po/pl/statistics.po
index 8b4c61438f..8b4c61438f 100644
--- a/po/pl/statistics.po
+++ b/applications/luci-app-statistics/po/pl/statistics.po
diff --git a/po/pt_BR/rrdtool.po b/applications/luci-app-statistics/po/pt-br/rrdtool.po
index 510b4a8f87..510b4a8f87 100644
--- a/po/pt_BR/rrdtool.po
+++ b/applications/luci-app-statistics/po/pt-br/rrdtool.po
diff --git a/po/pt_BR/statistics.po b/applications/luci-app-statistics/po/pt-br/statistics.po
index 81d036ce9f..81d036ce9f 100644
--- a/po/pt_BR/statistics.po
+++ b/applications/luci-app-statistics/po/pt-br/statistics.po
diff --git a/po/pt/rrdtool.po b/applications/luci-app-statistics/po/pt/rrdtool.po
index 6abbaf7cdd..6abbaf7cdd 100644
--- a/po/pt/rrdtool.po
+++ b/applications/luci-app-statistics/po/pt/rrdtool.po
diff --git a/po/pt/statistics.po b/applications/luci-app-statistics/po/pt/statistics.po
index 7a71434a93..7a71434a93 100644
--- a/po/pt/statistics.po
+++ b/applications/luci-app-statistics/po/pt/statistics.po
diff --git a/po/ro/rrdtool.po b/applications/luci-app-statistics/po/ro/rrdtool.po
index 98787591fe..98787591fe 100644
--- a/po/ro/rrdtool.po
+++ b/applications/luci-app-statistics/po/ro/rrdtool.po
diff --git a/po/ro/statistics.po b/applications/luci-app-statistics/po/ro/statistics.po
index ff5d564272..ff5d564272 100644
--- a/po/ro/statistics.po
+++ b/applications/luci-app-statistics/po/ro/statistics.po
diff --git a/po/ru/rrdtool.po b/applications/luci-app-statistics/po/ru/rrdtool.po
index a63a850806..a63a850806 100644
--- a/po/ru/rrdtool.po
+++ b/applications/luci-app-statistics/po/ru/rrdtool.po
diff --git a/po/ru/statistics.po b/applications/luci-app-statistics/po/ru/statistics.po
index 5fc15f6721..5fc15f6721 100644
--- a/po/ru/statistics.po
+++ b/applications/luci-app-statistics/po/ru/statistics.po
diff --git a/po/sk/rrdtool.po b/applications/luci-app-statistics/po/sk/rrdtool.po
index fd3781f5f3..fd3781f5f3 100644
--- a/po/sk/rrdtool.po
+++ b/applications/luci-app-statistics/po/sk/rrdtool.po
diff --git a/po/sk/statistics.po b/applications/luci-app-statistics/po/sk/statistics.po
index d941336eab..d941336eab 100644
--- a/po/sk/statistics.po
+++ b/applications/luci-app-statistics/po/sk/statistics.po
diff --git a/po/sv/rrdtool.po b/applications/luci-app-statistics/po/sv/rrdtool.po
index 580c9f35c8..580c9f35c8 100644
--- a/po/sv/rrdtool.po
+++ b/applications/luci-app-statistics/po/sv/rrdtool.po
diff --git a/po/sv/statistics.po b/applications/luci-app-statistics/po/sv/statistics.po
index fba752fdd4..fba752fdd4 100644
--- a/po/sv/statistics.po
+++ b/applications/luci-app-statistics/po/sv/statistics.po
diff --git a/applications/luci-app-statistics/po/templates/rrdtool.pot b/applications/luci-app-statistics/po/templates/rrdtool.pot
new file mode 100644
index 0000000000..0a105ecd4c
--- /dev/null
+++ b/applications/luci-app-statistics/po/templates/rrdtool.pot
@@ -0,0 +1,349 @@
+#  rrdtool.pot
+#  generated from ./applications/luci-statistics/luasrc/i18n/rrdtool.en.lua
+msgid ""
+msgstr "Content-Type: text/plain; charset=ISO-8859-1"
+
+#. %H: Wireless - Signal Noise Ratio
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:1
+msgid "stat_dg_title_wireless__signal_noise"
+msgstr ""
+
+#. dBm
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:2
+msgid "stat_dg_label_wireless__signal_noise"
+msgstr ""
+
+#. Noise Level
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:3
+msgid "stat_ds_signal_noise"
+msgstr ""
+
+#. Signal Strength
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:4
+msgid "stat_ds_signal_power"
+msgstr ""
+
+#. %H: Wireless - Signal Quality
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:5
+msgid "stat_dg_title_wireless__signal_quality"
+msgstr ""
+
+#. n
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:6
+msgid "stat_dg_label_wireless__signal_quality"
+msgstr ""
+
+#. Signal Quality
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:7
+msgid "stat_ds_signal_quality"
+msgstr ""
+
+#. %H: ICMP Roundtrip Times
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:8
+msgid "stat_dg_title_ping"
+msgstr ""
+
+#. ms
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:9
+msgid "stat_dg_label_ping"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:10
+msgid "stat_ds_ping"
+msgstr ""
+
+#. %H: Firewall - Processed Packets
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:11
+msgid "stat_dg_title_iptables__ipt_packets"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:12
+msgid "stat_dg_label_iptables__ipt_packets"
+msgstr ""
+
+#. Chain \"%di\"
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:13
+msgid "stat_ds_ipt_packets"
+msgstr ""
+
+#. %H: Netlink - Transfer on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:14
+msgid "stat_dg_title_netlink__if_octets"
+msgstr ""
+
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:15
+msgid "stat_dg_label_netlink__if_octets"
+msgstr ""
+
+#. Bytes (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:16
+msgid "stat_ds_if_octets"
+msgstr ""
+
+#. %H: Netlink - Packets on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:17
+msgid "stat_dg_title_netlink__if_packets"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:18
+msgid "stat_dg_label_netlink__if_packets"
+msgstr ""
+
+#. Processed (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:19
+msgid "stat_ds_if_packets"
+msgstr ""
+
+#. Dropped   (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:20
+msgid "stat_ds_if_dropped"
+msgstr ""
+
+#. Errors    (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:21
+msgid "stat_ds_if_errors"
+msgstr ""
+
+#. %H: Netlink - Multicast on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:22
+msgid "stat_dg_title_netlink__if_multicast"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:23
+msgid "stat_dg_label_netlink__if_multicast"
+msgstr ""
+
+#. Packets
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:24
+msgid "stat_ds_if_multicast"
+msgstr ""
+
+#. %H: Netlink - Collisions on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:25
+msgid "stat_dg_title_netlink__if_collisions"
+msgstr ""
+
+#. Collisions/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:26
+msgid "stat_dg_label_netlink__if_collisions"
+msgstr ""
+
+#. Collisions
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:27
+msgid "stat_ds_if_collisions"
+msgstr ""
+
+#. %H: Netlink - Errors on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:28
+msgid "stat_dg_title_netlink__if_tx_errors"
+msgstr ""
+
+#. Errors/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:29
+msgid "stat_dg_label_netlink__if_tx_errors"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:30
+msgid "stat_ds_if_tx_errors"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:31
+msgid "stat_ds_if_rx_errors"
+msgstr ""
+
+#. %H: Processes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:32
+msgid "stat_dg_title_processes"
+msgstr ""
+
+#. Processes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:33
+msgid "stat_dg_label_processes"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:34
+msgid "stat_ds_ps_state"
+msgstr ""
+
+#. %H: Process %pi - used cpu time
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:35
+msgid "stat_dg_title_processes__ps_cputime"
+msgstr ""
+
+#. Jiffies
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:36
+msgid "stat_dg_label_processes__ps_cputime"
+msgstr ""
+
+#. system
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:37
+msgid "stat_ds_ps_cputime__syst"
+msgstr ""
+
+#. user
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:38
+msgid "stat_ds_ps_cputime__user"
+msgstr ""
+
+#. %H: Process %pi - threads and processes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:39
+msgid "stat_dg_title_processes__ps_count"
+msgstr ""
+
+#. Count
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:40
+msgid "stat_dg_label_processes__ps_count"
+msgstr ""
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:41
+msgid "stat_ds_ps_count"
+msgstr ""
+
+#. %H: Process %pi - page faults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:42
+msgid "stat_dg_title_processes__ps_pagefaults"
+msgstr ""
+
+#. Pagefaults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:43
+msgid "stat_dg_label_processes__ps_pagefaults"
+msgstr ""
+
+#. page faults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:44
+msgid "stat_ds_ps_pagefaults"
+msgstr ""
+
+#. %H: Process %pi - virtual memory size
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:45
+msgid "stat_dg_title_processes__ps_rss"
+msgstr ""
+
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:46
+msgid "stat_dg_label_processes__ps_rss"
+msgstr ""
+
+#. virtual memory
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:47
+msgid "stat_ds_ps_rss"
+msgstr ""
+
+#. %H: Usage on Processor #%pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:48
+msgid "stat_dg_title_cpu"
+msgstr ""
+
+#. %
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:49
+msgid "stat_dg_label_cpu"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:50
+msgid "stat_ds_cpu"
+msgstr ""
+
+#. %H: Transfer on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:51
+msgid "stat_dg_title_interface__if_octets"
+msgstr ""
+
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:52
+msgid "stat_dg_label_interface__if_octets"
+msgstr ""
+
+#. %H: Packets on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:53
+msgid "stat_dg_title_interface__if_packets"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:54
+msgid "stat_dg_label_interface__if_packets"
+msgstr ""
+
+#. %H: TCP-Connections to Port %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:55
+msgid "stat_dg_title_tcpconns"
+msgstr ""
+
+#. Connections/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:56
+msgid "stat_dg_label_tcpconns"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:57
+msgid "stat_ds_tcp_connections"
+msgstr ""
+
+#. %H: Disk Space Usage on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:58
+msgid "stat_dg_title_df"
+msgstr ""
+
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:59
+msgid "stat_dg_label_df"
+msgstr ""
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:60
+msgid "stat_ds_df__free"
+msgstr ""
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:61
+msgid "stat_ds_df__used"
+msgstr ""
+
+#. %H: Interrupts
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:62
+msgid "stat_dg_title_irq"
+msgstr ""
+
+#. Issues/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:63
+msgid "stat_dg_label_irq"
+msgstr ""
+
+#. IRQ %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:64
+msgid "stat_ds_irq"
+msgstr ""
+
+#. %H: System Load
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:65
+msgid "stat_dg_title_load"
+msgstr ""
+
+#. Load
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:66
+msgid "stat_dg_label_load"
+msgstr ""
+
+#. 1 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:67
+msgid "stat_ds_load__shortterm"
+msgstr ""
+
+#. 5 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:68
+msgid "stat_ds_load__midterm"
+msgstr ""
+
+#. 15 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:69
+msgid "stat_ds_load__longterm"
+msgstr ""
diff --git a/applications/luci-app-statistics/po/templates/statistics.pot b/applications/luci-app-statistics/po/templates/statistics.pot
new file mode 100644
index 0000000000..5f2e9dd2c5
--- /dev/null
+++ b/applications/luci-app-statistics/po/templates/statistics.pot
@@ -0,0 +1,586 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "Action (target)"
+msgstr ""
+
+msgid "Add command for reading values"
+msgstr ""
+
+msgid "Add matching rule"
+msgstr ""
+
+msgid "Add multiple hosts separated by space."
+msgstr ""
+
+msgid "Add notification command"
+msgstr ""
+
+msgid "Base Directory"
+msgstr ""
+
+msgid "Basic monitoring"
+msgstr ""
+
+msgid "CPU Plugin Configuration"
+msgstr ""
+
+msgid "CSV Output"
+msgstr ""
+
+msgid "CSV Plugin Configuration"
+msgstr ""
+
+msgid "Cache collected data for"
+msgstr ""
+
+msgid "Cache flush interval"
+msgstr ""
+
+msgid "Chain"
+msgstr ""
+
+msgid "CollectLinks"
+msgstr ""
+
+msgid "CollectRoutes"
+msgstr ""
+
+msgid "CollectTopology"
+msgstr ""
+
+msgid "Collectd"
+msgstr ""
+
+msgid "Collectd Settings"
+msgstr ""
+
+msgid ""
+"Collectd is a small daemon for collecting data from various sources through "
+"different plugins. On this page you can change general settings for the "
+"collectd daemon."
+msgstr ""
+
+msgid "Conntrack"
+msgstr ""
+
+msgid "Conntrack Plugin Configuration"
+msgstr ""
+
+msgid "DF Plugin Configuration"
+msgstr ""
+
+msgid "DNS"
+msgstr ""
+
+msgid "DNS Plugin Configuration"
+msgstr ""
+
+msgid "Data collection interval"
+msgstr ""
+
+msgid "Datasets definition file"
+msgstr ""
+
+msgid "Destination ip range"
+msgstr ""
+
+msgid "Directory for collectd plugins"
+msgstr ""
+
+msgid "Directory for sub-configurations"
+msgstr ""
+
+msgid "Disk Plugin Configuration"
+msgstr ""
+
+msgid "Disk Space Usage"
+msgstr ""
+
+msgid "Disk Usage"
+msgstr ""
+
+msgid "Display Host »"
+msgstr ""
+
+msgid "Display timespan »"
+msgstr ""
+
+msgid "E-Mail Plugin Configuration"
+msgstr ""
+
+msgid "Email"
+msgstr ""
+
+msgid "Enable this plugin"
+msgstr ""
+
+msgid "Exec"
+msgstr ""
+
+msgid "Exec Plugin Configuration"
+msgstr ""
+
+msgid "Filter class monitoring"
+msgstr ""
+
+msgid "Firewall"
+msgstr ""
+
+msgid "Flush cache after"
+msgstr ""
+
+msgid "Forwarding between listen and server addresses"
+msgstr ""
+
+msgid "Graphs"
+msgstr ""
+
+msgid "Group"
+msgstr ""
+
+msgid ""
+"Here you can define external commands which will be started by collectd in "
+"order to read certain values. The values will be read from stdout."
+msgstr ""
+
+msgid ""
+"Here you can define external commands which will be started by collectd when "
+"certain threshold values have been reached. The values leading to invokation "
+"will be feeded to the the called programs stdin."
+msgstr ""
+
+msgid ""
+"Here you can define various criteria by which the monitored iptables rules "
+"are selected."
+msgstr ""
+
+msgid "Host"
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid "IP or hostname where to get the txtinfo output from"
+msgstr ""
+
+msgid "IRQ Plugin Configuration"
+msgstr ""
+
+msgid "Ignore source addresses"
+msgstr ""
+
+msgid "Incoming interface"
+msgstr ""
+
+msgid "Interface Plugin Configuration"
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Interrupts"
+msgstr ""
+
+msgid "Interval for pings"
+msgstr ""
+
+msgid "Iptables Plugin Configuration"
+msgstr ""
+
+msgid "Leave unselected to automatically determine interfaces to monitor."
+msgstr ""
+
+msgid "Listen host"
+msgstr ""
+
+msgid "Listen port"
+msgstr ""
+
+msgid "Listener interfaces"
+msgstr ""
+
+msgid "Load Plugin Configuration"
+msgstr ""
+
+msgid "Maximum allowed connections"
+msgstr ""
+
+msgid "Memory"
+msgstr ""
+
+msgid "Memory Plugin Configuration"
+msgstr ""
+
+msgid "Monitor all except specified"
+msgstr ""
+
+msgid "Monitor all local listen ports"
+msgstr ""
+
+msgid "Monitor devices"
+msgstr ""
+
+msgid "Monitor disks and partitions"
+msgstr ""
+
+msgid "Monitor filesystem types"
+msgstr ""
+
+msgid "Monitor hosts"
+msgstr ""
+
+msgid "Monitor interfaces"
+msgstr ""
+
+msgid "Monitor interrupts"
+msgstr ""
+
+msgid "Monitor local ports"
+msgstr ""
+
+msgid "Monitor mount points"
+msgstr ""
+
+msgid "Monitor processes"
+msgstr ""
+
+msgid "Monitor remote ports"
+msgstr ""
+
+msgid "Name of the rule"
+msgstr ""
+
+msgid "Netlink"
+msgstr ""
+
+msgid "Netlink Plugin Configuration"
+msgstr ""
+
+msgid "Network"
+msgstr ""
+
+msgid "Network Plugin Configuration"
+msgstr ""
+
+msgid "Network plugins"
+msgstr ""
+
+msgid "Network protocol"
+msgstr ""
+
+msgid "Number of threads for data collection"
+msgstr ""
+
+msgid "OLSRd"
+msgstr ""
+
+msgid "OLSRd Plugin Configuration"
+msgstr ""
+
+msgid "Only create average RRAs"
+msgstr ""
+
+msgid "Options"
+msgstr ""
+
+msgid "Outgoing interface"
+msgstr ""
+
+msgid "Output plugins"
+msgstr ""
+
+msgid "Ping"
+msgstr ""
+
+msgid "Ping Plugin Configuration"
+msgstr ""
+
+msgid "Port"
+msgstr ""
+
+msgid "Processes"
+msgstr ""
+
+msgid "Processes Plugin Configuration"
+msgstr ""
+
+msgid "Processes to monitor separated by space"
+msgstr ""
+
+msgid "Processor"
+msgstr ""
+
+msgid "Qdisc monitoring"
+msgstr ""
+
+msgid "RRD XFiles Factor"
+msgstr ""
+
+msgid "RRD heart beat interval"
+msgstr ""
+
+msgid "RRD step interval"
+msgstr ""
+
+msgid "RRDTool"
+msgstr ""
+
+msgid "RRDTool Plugin Configuration"
+msgstr ""
+
+msgid "Rows per RRA"
+msgstr ""
+
+msgid "Script"
+msgstr ""
+
+msgid "Seconds"
+msgstr ""
+
+msgid "Server host"
+msgstr ""
+
+msgid "Server port"
+msgstr ""
+
+msgid "Shaping class monitoring"
+msgstr ""
+
+msgid "Socket file"
+msgstr ""
+
+msgid "Socket group"
+msgstr ""
+
+msgid "Socket permissions"
+msgstr ""
+
+msgid "Source ip range"
+msgstr ""
+
+msgid "Specifies what information to collect about links."
+msgstr ""
+
+msgid "Specifies what information to collect about routes."
+msgstr ""
+
+msgid "Specifies what information to collect about the global topology."
+msgstr ""
+
+msgid "Statistics"
+msgstr ""
+
+msgid "Storage directory"
+msgstr ""
+
+msgid "Storage directory for the csv files"
+msgstr ""
+
+msgid "Store data values as rates instead of absolute values"
+msgstr ""
+
+msgid "Stored timespans"
+msgstr ""
+
+msgid "System Load"
+msgstr ""
+
+msgid "System plugins"
+msgstr ""
+
+msgid "TCP Connections"
+msgstr ""
+
+msgid "TCPConns Plugin Configuration"
+msgstr ""
+
+msgid "TTL for network packets"
+msgstr ""
+
+msgid "TTL for ping packets"
+msgstr ""
+
+msgid "Table"
+msgstr ""
+
+msgid "The NUT plugin reads information about Uninterruptible Power Supplies."
+msgstr ""
+
+msgid ""
+"The OLSRd plugin reads information about meshed networks from the txtinfo "
+"plugin of OLSRd."
+msgstr ""
+
+msgid ""
+"The conntrack plugin collects statistics about the number of tracked "
+"connections."
+msgstr ""
+
+msgid "The cpu plugin collects basic statistics about the processor usage."
+msgstr ""
+
+msgid ""
+"The csv plugin stores collected data in csv file format for further "
+"processing by external programs."
+msgstr ""
+
+msgid ""
+"The df plugin collects statistics about the disk space usage on different "
+"devices, mount points or filesystem types."
+msgstr ""
+
+msgid ""
+"The disk plugin collects detailled usage statistics for selected partitions "
+"or whole disks."
+msgstr ""
+
+msgid ""
+"The dns plugin collects detailled statistics about dns related traffic on "
+"selected interfaces."
+msgstr ""
+
+msgid ""
+"The email plugin creates a unix socket which can be used to transmit email-"
+"statistics to a running collectd daemon. This plugin is primarily intended "
+"to be used in conjunction with Mail::SpamAssasin::Plugin::Collectd but can "
+"be used in other ways as well."
+msgstr ""
+
+msgid ""
+"The exec plugin starts external commands to read values from or to notify "
+"external processes when certain threshold values have been reached."
+msgstr ""
+
+msgid ""
+"The interface plugin collects traffic statistics on selected interfaces."
+msgstr ""
+
+msgid ""
+"The iptables plugin will monitor selected firewall rules and collect "
+"informations about processed bytes and packets per rule."
+msgstr ""
+
+msgid ""
+"The irq plugin will monitor the rate of issues per second for each selected "
+"interrupt. If no interrupt is selected then all interrupts are monitored."
+msgstr ""
+
+msgid ""
+"The iwinfo plugin collects statistics about wireless signal strength, noise "
+"and quality."
+msgstr ""
+
+msgid "The load plugin collects statistics about the general system load."
+msgstr ""
+
+msgid "The memory plugin collects statistics about the memory usage."
+msgstr ""
+
+msgid ""
+"The netlink plugin collects extended informations like qdisc-, class- and "
+"filter-statistics for selected interfaces."
+msgstr ""
+
+msgid ""
+"The network plugin provides network based communication between different "
+"collectd instances. Collectd can operate both in client and server mode. In "
+"client mode locally collected date is transferred to a collectd server "
+"instance, in server mode the local instance receives data from other hosts."
+msgstr ""
+
+msgid ""
+"The ping plugin will send icmp echo replies to selected hosts and measure "
+"the roundtrip time for each host."
+msgstr ""
+
+msgid ""
+"The processes plugin collects informations like cpu time, page faults and "
+"memory usage of selected processes."
+msgstr ""
+
+msgid ""
+"The rrdtool plugin stores the collected data in rrd database files, the "
+"foundation of the diagrams.<br /><br /><strong>Warning: Setting the wrong "
+"values will result in a very high memory consumption in the temporary "
+"directory. This can render the device unusable!</strong>"
+msgstr ""
+
+msgid ""
+"The statistics package is based on <a href=\"http://collectd.org/index.shtml"
+"\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD "
+"Tool</a> to render diagram images from collected data."
+msgstr ""
+
+msgid ""
+"The tcpconns plugin collects informations about open tcp connections on "
+"selected ports."
+msgstr ""
+
+msgid ""
+"The unixsock plugin creates a unix socket which can be used to read "
+"collected data from a running collectd instance."
+msgstr ""
+
+msgid ""
+"This section defines on which interfaces collectd will wait for incoming "
+"connections."
+msgstr ""
+
+msgid ""
+"This section defines to which servers the locally collected data is sent to."
+msgstr ""
+
+msgid "Try to lookup fully qualified hostname"
+msgstr ""
+
+msgid "UPS"
+msgstr ""
+
+msgid "UPS Plugin Configuration"
+msgstr ""
+
+msgid "UPS name in NUT ups@host format"
+msgstr ""
+
+msgid "UnixSock"
+msgstr ""
+
+msgid "Unixsock Plugin Configuration"
+msgstr ""
+
+msgid "Used PID file"
+msgstr ""
+
+msgid "User"
+msgstr ""
+
+msgid "Verbose monitoring"
+msgstr ""
+
+msgid "Wireless"
+msgstr ""
+
+msgid "Wireless iwinfo Plugin Configuration"
+msgstr ""
+
+msgid "e.g. br-ff"
+msgstr ""
+
+msgid "e.g. br-lan"
+msgstr ""
+
+msgid "e.g. reject-with tcp-reset"
+msgstr ""
+
+msgid "max. 16 chars"
+msgstr ""
+
+msgid "reduces rrd size"
+msgstr ""
+
+msgid "seconds; multiple separated by space"
+msgstr ""
+
+msgid "server interfaces"
+msgstr ""
diff --git a/po/tr/rrdtool.po b/applications/luci-app-statistics/po/tr/rrdtool.po
index cb2187b4bb..cb2187b4bb 100644
--- a/po/tr/rrdtool.po
+++ b/applications/luci-app-statistics/po/tr/rrdtool.po
diff --git a/po/tr/statistics.po b/applications/luci-app-statistics/po/tr/statistics.po
index d963dd89d8..d963dd89d8 100644
--- a/po/tr/statistics.po
+++ b/applications/luci-app-statistics/po/tr/statistics.po
diff --git a/po/uk/rrdtool.po b/applications/luci-app-statistics/po/uk/rrdtool.po
index 5a535f19bb..5a535f19bb 100644
--- a/po/uk/rrdtool.po
+++ b/applications/luci-app-statistics/po/uk/rrdtool.po
diff --git a/po/uk/statistics.po b/applications/luci-app-statistics/po/uk/statistics.po
index daa4af2dc6..daa4af2dc6 100644
--- a/po/uk/statistics.po
+++ b/applications/luci-app-statistics/po/uk/statistics.po
diff --git a/po/vi/rrdtool.po b/applications/luci-app-statistics/po/vi/rrdtool.po
index ca94cf8d0c..ca94cf8d0c 100644
--- a/po/vi/rrdtool.po
+++ b/applications/luci-app-statistics/po/vi/rrdtool.po
diff --git a/po/vi/statistics.po b/applications/luci-app-statistics/po/vi/statistics.po
index c853c8a3f0..c853c8a3f0 100644
--- a/po/vi/statistics.po
+++ b/applications/luci-app-statistics/po/vi/statistics.po
diff --git a/po/zh_CN/rrdtool.po b/applications/luci-app-statistics/po/zh-cn/rrdtool.po
index 4e6ee4b4da..4e6ee4b4da 100644
--- a/po/zh_CN/rrdtool.po
+++ b/applications/luci-app-statistics/po/zh-cn/rrdtool.po
diff --git a/po/zh_CN/statistics.po b/applications/luci-app-statistics/po/zh-cn/statistics.po
index 797c591bda..797c591bda 100644
--- a/po/zh_CN/statistics.po
+++ b/applications/luci-app-statistics/po/zh-cn/statistics.po
diff --git a/po/zh_TW/rrdtool.po b/applications/luci-app-statistics/po/zh-tw/rrdtool.po
index 9245260b4c..9245260b4c 100644
--- a/po/zh_TW/rrdtool.po
+++ b/applications/luci-app-statistics/po/zh-tw/rrdtool.po
diff --git a/po/zh_TW/statistics.po b/applications/luci-app-statistics/po/zh-tw/statistics.po
index 7f4e7e47c3..7f4e7e47c3 100644
--- a/po/zh_TW/statistics.po
+++ b/applications/luci-app-statistics/po/zh-tw/statistics.po
diff --git a/applications/luci-statistics/root/etc/config/luci_statistics b/applications/luci-app-statistics/root/etc/config/luci_statistics
index e39db3513a..e39db3513a 100644
--- a/applications/luci-statistics/root/etc/config/luci_statistics
+++ b/applications/luci-app-statistics/root/etc/config/luci_statistics
diff --git a/applications/luci-statistics/root/etc/init.d/luci_statistics b/applications/luci-app-statistics/root/etc/init.d/luci_statistics
index 936f3a63c3..936f3a63c3 100755
--- a/applications/luci-statistics/root/etc/init.d/luci_statistics
+++ b/applications/luci-app-statistics/root/etc/init.d/luci_statistics
diff --git a/applications/luci-statistics/root/etc/uci-defaults/luci-statistics b/applications/luci-app-statistics/root/etc/uci-defaults/luci-statistics
index e94a8637c8..e94a8637c8 100755
--- a/applications/luci-statistics/root/etc/uci-defaults/luci-statistics
+++ b/applications/luci-app-statistics/root/etc/uci-defaults/luci-statistics
diff --git a/applications/luci-statistics/root/usr/bin/stat-genconfig b/applications/luci-app-statistics/root/usr/bin/stat-genconfig
index 86773b4e58..86773b4e58 100755
--- a/applications/luci-statistics/root/usr/bin/stat-genconfig
+++ b/applications/luci-app-statistics/root/usr/bin/stat-genconfig
diff --git a/applications/luci-app-tinyproxy/Makefile b/applications/luci-app-tinyproxy/Makefile
new file mode 100644
index 0000000000..02751b849d
--- /dev/null
+++ b/applications/luci-app-tinyproxy/Makefile
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=Tinyproxy - HTTP(S)-Proxy configuration
+LUCI_DEPENDS:=+tinyproxy
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/applications/luci-tinyproxy/luasrc/controller/tinyproxy.lua b/applications/luci-app-tinyproxy/luasrc/controller/tinyproxy.lua
index 0b81b90865..0b81b90865 100644
--- a/applications/luci-tinyproxy/luasrc/controller/tinyproxy.lua
+++ b/applications/luci-app-tinyproxy/luasrc/controller/tinyproxy.lua
diff --git a/applications/luci-tinyproxy/luasrc/model/cbi/tinyproxy.lua b/applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua
index 4c2a3cbfe8..4c2a3cbfe8 100644
--- a/applications/luci-tinyproxy/luasrc/model/cbi/tinyproxy.lua
+++ b/applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua
diff --git a/applications/luci-tinyproxy/luasrc/view/tinyproxy_status.htm b/applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm
index c85a206bd3..c85a206bd3 100644
--- a/applications/luci-tinyproxy/luasrc/view/tinyproxy_status.htm
+++ b/applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm
diff --git a/po/ca/tinyproxy.po b/applications/luci-app-tinyproxy/po/ca/tinyproxy.po
index 69cd99e5b9..69cd99e5b9 100644
--- a/po/ca/tinyproxy.po
+++ b/applications/luci-app-tinyproxy/po/ca/tinyproxy.po
diff --git a/po/cs/tinyproxy.po b/applications/luci-app-tinyproxy/po/cs/tinyproxy.po
index 2a2cbdc84a..2a2cbdc84a 100644
--- a/po/cs/tinyproxy.po
+++ b/applications/luci-app-tinyproxy/po/cs/tinyproxy.po
diff --git a/po/de/tinyproxy.po b/applications/luci-app-tinyproxy/po/de/tinyproxy.po
index d444872437..d444872437 100644
--- a/po/de/tinyproxy.po
+++ b/applications/luci-app-tinyproxy/po/de/tinyproxy.po
diff --git a/po/el/tinyproxy.po b/applications/luci-app-tinyproxy/po/el/tinyproxy.po
index 718424e0ce..718424e0ce 100644
--- a/po/el/tinyproxy.po
+++ b/applications/luci-app-tinyproxy/po/el/tinyproxy.po
diff --git a/po/en/tinyproxy.po b/applications/luci-app-tinyproxy/po/en/tinyproxy.po
index 4650f3e1fc..4650f3e1fc 100644
--- a/po/en/tinyproxy.po
+++ b/applications/luci-app-tinyproxy/po/en/tinyproxy.po
diff --git a/po/es/tinyproxy.po b/applications/luci-app-tinyproxy/po/es/tinyproxy.po
index c9faff194a..c9faff194a 100644
--- a/po/es/tinyproxy.po
+++ b/applications/luci-app-tinyproxy/po/es/tinyproxy.po
diff --git a/po/fr/tinyproxy.po b/applications/luci-app-tinyproxy/po/fr/tinyproxy.po
index d359442a20..d359442a20 100644
--- a/po/fr/tinyproxy.po
+++ b/applications/luci-app-tinyproxy/po/fr/tinyproxy.po
diff --git a/po/he/tinyproxy.po b/applications/luci-app-tinyproxy/po/he/tinyproxy.po
index 5c4ddddb09..5c4ddddb09 100644
--- a/po/he/tinyproxy.po
+++ b/applications/luci-app-tinyproxy/po/he/tinyproxy.po
diff --git a/po/hu/tinyproxy.po b/applications/luci-app-tinyproxy/po/hu/tinyproxy.po
index 5c4ddddb09..5c4ddddb09 100644
--- a/po/hu/tinyproxy.po
+++ b/applications/luci-app-tinyproxy/po/hu/tinyproxy.po
diff --git a/po/it/tinyproxy.po b/applications/luci-app-tinyproxy/po/it/tinyproxy.po
index 34528c1139..34528c1139 100644
--- a/po/it/tinyproxy.po
+++ b/applications/luci-app-tinyproxy/po/it/tinyproxy.po
diff --git a/po/ja/tinyproxy.po b/applications/luci-app-tinyproxy/po/ja/tinyproxy.po
index 03ea890fee..03ea890fee 100644
--- a/po/ja/tinyproxy.po
+++ b/applications/luci-app-tinyproxy/po/ja/tinyproxy.po
diff --git a/po/ms/tinyproxy.po b/applications/luci-app-tinyproxy/po/ms/tinyproxy.po
index 08ed7dc47a..08ed7dc47a 100644
--- a/po/ms/tinyproxy.po
+++ b/applications/luci-app-tinyproxy/po/ms/tinyproxy.po
diff --git a/po/no/tinyproxy.po b/applications/luci-app-tinyproxy/po/no/tinyproxy.po
index 5c4ddddb09..5c4ddddb09 100644
--- a/po/no/tinyproxy.po
+++ b/applications/luci-app-tinyproxy/po/no/tinyproxy.po
diff --git a/po/pl/tinyproxy.po b/applications/luci-app-tinyproxy/po/pl/tinyproxy.po
index 8e3bfc7f75..8e3bfc7f75 100644
--- a/po/pl/tinyproxy.po
+++ b/applications/luci-app-tinyproxy/po/pl/tinyproxy.po
diff --git a/po/pt_BR/tinyproxy.po b/applications/luci-app-tinyproxy/po/pt-br/tinyproxy.po
index ef7ffdad87..ef7ffdad87 100644
--- a/po/pt_BR/tinyproxy.po
+++ b/applications/luci-app-tinyproxy/po/pt-br/tinyproxy.po
diff --git a/po/pt/tinyproxy.po b/applications/luci-app-tinyproxy/po/pt/tinyproxy.po
index 833a7fa621..833a7fa621 100644
--- a/po/pt/tinyproxy.po
+++ b/applications/luci-app-tinyproxy/po/pt/tinyproxy.po
diff --git a/po/ro/tinyproxy.po b/applications/luci-app-tinyproxy/po/ro/tinyproxy.po
index 799fecbc9f..799fecbc9f 100644
--- a/po/ro/tinyproxy.po
+++ b/applications/luci-app-tinyproxy/po/ro/tinyproxy.po
diff --git a/po/ru/tinyproxy.po b/applications/luci-app-tinyproxy/po/ru/tinyproxy.po
index f9a3c23d16..f9a3c23d16 100644
--- a/po/ru/tinyproxy.po
+++ b/applications/luci-app-tinyproxy/po/ru/tinyproxy.po
diff --git a/po/sk/tinyproxy.po b/applications/luci-app-tinyproxy/po/sk/tinyproxy.po
index 128c71d4f2..128c71d4f2 100644
--- a/po/sk/tinyproxy.po
+++ b/applications/luci-app-tinyproxy/po/sk/tinyproxy.po
diff --git a/po/sv/tinyproxy.po b/applications/luci-app-tinyproxy/po/sv/tinyproxy.po
index f706056c25..f706056c25 100644
--- a/po/sv/tinyproxy.po
+++ b/applications/luci-app-tinyproxy/po/sv/tinyproxy.po
diff --git a/applications/luci-app-tinyproxy/po/templates/tinyproxy.pot b/applications/luci-app-tinyproxy/po/templates/tinyproxy.pot
new file mode 100644
index 0000000000..712fad92aa
--- /dev/null
+++ b/applications/luci-app-tinyproxy/po/templates/tinyproxy.pot
@@ -0,0 +1,248 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid ""
+"<em>Via proxy</em> routes requests to the given target via the specifed "
+"upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
+"target"
+msgstr ""
+
+msgid ""
+"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"requests"
+msgstr ""
+
+msgid "Allowed clients"
+msgstr ""
+
+msgid "Allowed connect ports"
+msgstr ""
+
+msgid "Bind address"
+msgstr ""
+
+msgid ""
+"By default, basic POSIX expressions are used for filtering. Enable this to "
+"activate extended regular expressions"
+msgstr ""
+
+msgid ""
+"By default, filter strings are treated as case-insensitive. Enable this to "
+"make the matching case-sensitive"
+msgstr ""
+
+msgid ""
+"By default, filtering is done based on domain names. Enable this to match "
+"against URLs instead"
+msgstr ""
+
+msgid ""
+"By default, the filter rules act as blacklist. Enable this option to only "
+"allow matched URLs or domain names"
+msgstr ""
+
+msgid ""
+"Can be either an IP address or range, a domain name or \".\" for any host "
+"without domain"
+msgstr ""
+
+msgid "Configuration"
+msgstr ""
+
+msgid "Connection timeout"
+msgstr ""
+
+msgid "Default deny"
+msgstr ""
+
+msgid "Enable Tinyproxy server"
+msgstr ""
+
+msgid "Error page"
+msgstr ""
+
+msgid "Failed to retrieve statistics from url:"
+msgstr ""
+
+msgid "Filter by RegExp"
+msgstr ""
+
+msgid "Filter by URLs"
+msgstr ""
+
+msgid "Filter case-sensitive"
+msgstr ""
+
+msgid "Filter file"
+msgstr ""
+
+msgid "Filtering and ACLs"
+msgstr ""
+
+msgid "General settings"
+msgstr ""
+
+msgid "Group"
+msgstr ""
+
+msgid "HTML template file to serve for stat host requests"
+msgstr ""
+
+msgid "HTML template file to serve when HTTP errors occur"
+msgstr ""
+
+msgid "Header whitelist"
+msgstr ""
+
+msgid ""
+"List of IP addresses or ranges which are allowed to use the proxy server"
+msgstr ""
+
+msgid ""
+"List of allowed ports for the CONNECT method. A single value \"0\" allows "
+"all ports"
+msgstr ""
+
+msgid "Listen address"
+msgstr ""
+
+msgid "Listen port"
+msgstr ""
+
+msgid "Log file"
+msgstr ""
+
+msgid "Log file to use for dumping messages"
+msgstr ""
+
+msgid "Log level"
+msgstr ""
+
+msgid "Logging verbosity of the Tinyproxy process"
+msgstr ""
+
+msgid "Max. clients"
+msgstr ""
+
+msgid "Max. requests per server"
+msgstr ""
+
+msgid "Max. spare servers"
+msgstr ""
+
+msgid "Maximum allowed number of concurrently connected clients"
+msgstr ""
+
+msgid ""
+"Maximum allowed number of requests per process. If it is exeeded, the "
+"process is restarted. Zero means unlimited."
+msgstr ""
+
+msgid "Maximum number of prepared idle processes"
+msgstr ""
+
+msgid "Maximum number of seconds an inactive connection is held open"
+msgstr ""
+
+msgid "Min. spare servers"
+msgstr ""
+
+msgid "Minimum number of prepared idle processes"
+msgstr ""
+
+msgid "Number of idle processes to start when launching Tinyproxy"
+msgstr ""
+
+msgid "Plaintext file with URLs or domains to filter. One entry per line"
+msgstr ""
+
+msgid "Policy"
+msgstr ""
+
+msgid "Privacy settings"
+msgstr ""
+
+msgid "Reject access"
+msgstr ""
+
+msgid "Server Settings"
+msgstr ""
+
+msgid "Server limits"
+msgstr ""
+
+msgid ""
+"Specifies HTTP header names which are allowed to pass-through, all others "
+"are discarded. Leave empty to disable header filtering"
+msgstr ""
+
+msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
+msgstr ""
+
+msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
+msgstr ""
+
+msgid ""
+"Specifies the address Tinyproxy binds to for outbound forwarded requests"
+msgstr ""
+
+msgid "Specifies the addresses Tinyproxy is listening on for requests"
+msgstr ""
+
+msgid "Specifies the group name the Tinyproxy process is running as"
+msgstr ""
+
+msgid ""
+"Specifies the upstream proxy to use for accessing the target host. Format is "
+"<code>address:port</code>"
+msgstr ""
+
+msgid "Specifies the user name the Tinyproxy process is running as"
+msgstr ""
+
+msgid "Start spare servers"
+msgstr ""
+
+msgid "Statistics page"
+msgstr ""
+
+msgid "Status"
+msgstr ""
+
+msgid "Target host"
+msgstr ""
+
+msgid "Tinyproxy"
+msgstr ""
+
+msgid "Tinyproxy Status"
+msgstr ""
+
+msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
+msgstr ""
+
+msgid "Upstream Proxies"
+msgstr ""
+
+msgid ""
+"Upstream proxy rules define proxy servers to use when accessing certain IP "
+"addresses or domains."
+msgstr ""
+
+msgid "Use syslog"
+msgstr ""
+
+msgid "User"
+msgstr ""
+
+msgid "Via hostname"
+msgstr ""
+
+msgid "Via proxy"
+msgstr ""
+
+msgid "Writes log messages to syslog instead of a log file"
+msgstr ""
+
+msgid "X-Tinyproxy header"
+msgstr ""
diff --git a/po/tr/tinyproxy.po b/applications/luci-app-tinyproxy/po/tr/tinyproxy.po
index a7af49df2f..a7af49df2f 100644
--- a/po/tr/tinyproxy.po
+++ b/applications/luci-app-tinyproxy/po/tr/tinyproxy.po
diff --git a/po/uk/tinyproxy.po b/applications/luci-app-tinyproxy/po/uk/tinyproxy.po
index 2e268ba7fe..2e268ba7fe 100644
--- a/po/uk/tinyproxy.po
+++ b/applications/luci-app-tinyproxy/po/uk/tinyproxy.po
diff --git a/po/vi/tinyproxy.po b/applications/luci-app-tinyproxy/po/vi/tinyproxy.po
index 6c825f5368..6c825f5368 100644
--- a/po/vi/tinyproxy.po
+++ b/applications/luci-app-tinyproxy/po/vi/tinyproxy.po
diff --git a/po/zh_CN/tinyproxy.po b/applications/luci-app-tinyproxy/po/zh-cn/tinyproxy.po
index 828e952e09..828e952e09 100644
--- a/po/zh_CN/tinyproxy.po
+++ b/applications/luci-app-tinyproxy/po/zh-cn/tinyproxy.po
diff --git a/po/zh_TW/tinyproxy.po b/applications/luci-app-tinyproxy/po/zh-tw/tinyproxy.po
index 849fcdeffb..849fcdeffb 100644
--- a/po/zh_TW/tinyproxy.po
+++ b/applications/luci-app-tinyproxy/po/zh-tw/tinyproxy.po
diff --git a/applications/luci-app-transmission/Makefile b/applications/luci-app-transmission/Makefile
new file mode 100644
index 0000000000..45175b7d17
--- /dev/null
+++ b/applications/luci-app-transmission/Makefile
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=LuCI Support for Transmission
+LUCI_DEPENDS:=+transmission-daemon
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/applications/luci-transmission/luasrc/controller/transmission.lua b/applications/luci-app-transmission/luasrc/controller/transmission.lua
index 2c4df46b7c..2c4df46b7c 100644
--- a/applications/luci-transmission/luasrc/controller/transmission.lua
+++ b/applications/luci-app-transmission/luasrc/controller/transmission.lua
diff --git a/applications/luci-transmission/luasrc/model/cbi/transmission.lua b/applications/luci-app-transmission/luasrc/model/cbi/transmission.lua
index 4f9e3c5476..4f9e3c5476 100644
--- a/applications/luci-transmission/luasrc/model/cbi/transmission.lua
+++ b/applications/luci-app-transmission/luasrc/model/cbi/transmission.lua
diff --git a/po/ca/transmission.po b/applications/luci-app-transmission/po/ca/transmission.po
index 2498393a9c..2498393a9c 100644
--- a/po/ca/transmission.po
+++ b/applications/luci-app-transmission/po/ca/transmission.po
diff --git a/po/cs/transmission.po b/applications/luci-app-transmission/po/cs/transmission.po
index b6166ec03c..b6166ec03c 100644
--- a/po/cs/transmission.po
+++ b/applications/luci-app-transmission/po/cs/transmission.po
diff --git a/po/de/transmission.po b/applications/luci-app-transmission/po/de/transmission.po
index 4b665ff656..4b665ff656 100644
--- a/po/de/transmission.po
+++ b/applications/luci-app-transmission/po/de/transmission.po
diff --git a/po/el/transmission.po b/applications/luci-app-transmission/po/el/transmission.po
index 3125fc2751..3125fc2751 100644
--- a/po/el/transmission.po
+++ b/applications/luci-app-transmission/po/el/transmission.po
diff --git a/po/en/transmission.po b/applications/luci-app-transmission/po/en/transmission.po
index 3125fc2751..3125fc2751 100644
--- a/po/en/transmission.po
+++ b/applications/luci-app-transmission/po/en/transmission.po
diff --git a/po/es/transmission.po b/applications/luci-app-transmission/po/es/transmission.po
index 9eeb2fb6bc..9eeb2fb6bc 100644
--- a/po/es/transmission.po
+++ b/applications/luci-app-transmission/po/es/transmission.po
diff --git a/po/fr/transmission.po b/applications/luci-app-transmission/po/fr/transmission.po
index 3125fc2751..3125fc2751 100644
--- a/po/fr/transmission.po
+++ b/applications/luci-app-transmission/po/fr/transmission.po
diff --git a/po/he/transmission.po b/applications/luci-app-transmission/po/he/transmission.po
index 3125fc2751..3125fc2751 100644
--- a/po/he/transmission.po
+++ b/applications/luci-app-transmission/po/he/transmission.po
diff --git a/po/hu/transmission.po b/applications/luci-app-transmission/po/hu/transmission.po
index 040f83802e..040f83802e 100644
--- a/po/hu/transmission.po
+++ b/applications/luci-app-transmission/po/hu/transmission.po
diff --git a/po/it/transmission.po b/applications/luci-app-transmission/po/it/transmission.po
index 1008fad277..1008fad277 100644
--- a/po/it/transmission.po
+++ b/applications/luci-app-transmission/po/it/transmission.po
diff --git a/po/ja/transmission.po b/applications/luci-app-transmission/po/ja/transmission.po
index dded65038a..dded65038a 100644
--- a/po/ja/transmission.po
+++ b/applications/luci-app-transmission/po/ja/transmission.po
diff --git a/po/ms/transmission.po b/applications/luci-app-transmission/po/ms/transmission.po
index 3125fc2751..3125fc2751 100644
--- a/po/ms/transmission.po
+++ b/applications/luci-app-transmission/po/ms/transmission.po
diff --git a/po/no/transmission.po b/applications/luci-app-transmission/po/no/transmission.po
index cb8684181c..cb8684181c 100644
--- a/po/no/transmission.po
+++ b/applications/luci-app-transmission/po/no/transmission.po
diff --git a/po/pl/transmission.po b/applications/luci-app-transmission/po/pl/transmission.po
index f010d56da8..f010d56da8 100644
--- a/po/pl/transmission.po
+++ b/applications/luci-app-transmission/po/pl/transmission.po
diff --git a/po/pt_BR/transmission.po b/applications/luci-app-transmission/po/pt-br/transmission.po
index 82ba6a46e4..82ba6a46e4 100644
--- a/po/pt_BR/transmission.po
+++ b/applications/luci-app-transmission/po/pt-br/transmission.po
diff --git a/po/pt/transmission.po b/applications/luci-app-transmission/po/pt/transmission.po
index 512ca970dc..512ca970dc 100644
--- a/po/pt/transmission.po
+++ b/applications/luci-app-transmission/po/pt/transmission.po
diff --git a/po/ro/transmission.po b/applications/luci-app-transmission/po/ro/transmission.po
index 8e0fc7dcce..8e0fc7dcce 100644
--- a/po/ro/transmission.po
+++ b/applications/luci-app-transmission/po/ro/transmission.po
diff --git a/po/ru/transmission.po b/applications/luci-app-transmission/po/ru/transmission.po
index fac9510a59..fac9510a59 100644
--- a/po/ru/transmission.po
+++ b/applications/luci-app-transmission/po/ru/transmission.po
diff --git a/po/sk/transmission.po b/applications/luci-app-transmission/po/sk/transmission.po
index 4b4c3afd9a..4b4c3afd9a 100644
--- a/po/sk/transmission.po
+++ b/applications/luci-app-transmission/po/sk/transmission.po
diff --git a/po/sv/transmission.po b/applications/luci-app-transmission/po/sv/transmission.po
index e276ebf538..e276ebf538 100644
--- a/po/sv/transmission.po
+++ b/applications/luci-app-transmission/po/sv/transmission.po
diff --git a/applications/luci-app-transmission/po/templates/transmission.pot b/applications/luci-app-transmission/po/templates/transmission.pot
new file mode 100644
index 0000000000..5892abcad1
--- /dev/null
+++ b/applications/luci-app-transmission/po/templates/transmission.pot
@@ -0,0 +1,283 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "Alternative download speed"
+msgstr ""
+
+msgid "Alternative speed enabled"
+msgstr ""
+
+msgid "Alternative speed time begin"
+msgstr ""
+
+msgid "Alternative speed time day"
+msgstr ""
+
+msgid "Alternative speed time end"
+msgstr ""
+
+msgid "Alternative speed timing enabled"
+msgstr ""
+
+msgid "Alternative upload speed"
+msgstr ""
+
+msgid "Automatically start added torrents"
+msgstr ""
+
+msgid "Bandwidth settings"
+msgstr ""
+
+msgid "Binding address IPv4"
+msgstr ""
+
+msgid "Binding address IPv6"
+msgstr ""
+
+msgid "Block list enabled"
+msgstr ""
+
+msgid "Blocklist URL"
+msgstr ""
+
+msgid "Blocklists"
+msgstr ""
+
+msgid "Cache size in MB"
+msgstr ""
+
+msgid "Config file directory"
+msgstr ""
+
+msgid "DHT enabled"
+msgstr ""
+
+msgid "Debug"
+msgstr ""
+
+msgid "Download directory"
+msgstr ""
+
+msgid "Download queue enabled"
+msgstr ""
+
+msgid "Download queue size"
+msgstr ""
+
+msgid "Enable watch directory"
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid "Encryption"
+msgstr ""
+
+msgid "Error"
+msgstr ""
+
+msgid "Fast"
+msgstr ""
+
+msgid "Files and Locations"
+msgstr ""
+
+msgid "Forced"
+msgstr ""
+
+msgid "Full"
+msgstr ""
+
+msgid "Global peer limit"
+msgstr ""
+
+msgid "Global settings"
+msgstr ""
+
+msgid "Idle seeding limit"
+msgstr ""
+
+msgid "Idle seeding limit enabled"
+msgstr ""
+
+msgid "Incomplete directory"
+msgstr ""
+
+msgid "Incomplete directory enabled"
+msgstr ""
+
+msgid "Info"
+msgstr ""
+
+msgid "LPD enabled"
+msgstr ""
+
+msgid "Lazy bitfield enabled"
+msgstr ""
+
+msgid "Message level"
+msgstr ""
+
+msgid "Miscellaneous"
+msgstr ""
+
+msgid "None"
+msgstr ""
+
+msgid ""
+"Number/bitfield. Start with 0, then for each day you want the scheduler "
+"enabled, add a value. For Sunday - 1, Monday - 2, Tuesday - 4, Wednesday - "
+"8, Thursday - 16, Friday - 32, Saturday - 64"
+msgstr ""
+
+msgid "Off"
+msgstr ""
+
+msgid "Open Web Interface"
+msgstr ""
+
+msgid "PEX enabled"
+msgstr ""
+
+msgid "Peer Port settings"
+msgstr ""
+
+msgid "Peer congestion algorithm"
+msgstr ""
+
+msgid "Peer limit per torrent"
+msgstr ""
+
+msgid "Peer port"
+msgstr ""
+
+msgid "Peer port random high"
+msgstr ""
+
+msgid "Peer port random low"
+msgstr ""
+
+msgid "Peer port random on start"
+msgstr ""
+
+msgid "Peer settings"
+msgstr ""
+
+msgid "Peer socket tos"
+msgstr ""
+
+msgid "Port forwarding enabled"
+msgstr ""
+
+msgid "Preferred"
+msgstr ""
+
+msgid "Prefetch enabled"
+msgstr ""
+
+msgid "Queue stalled enabled"
+msgstr ""
+
+msgid "Queue stalled minutes"
+msgstr ""
+
+msgid "Queueing"
+msgstr ""
+
+msgid "RPC URL"
+msgstr ""
+
+msgid "RPC authentication required"
+msgstr ""
+
+msgid "RPC bind address"
+msgstr ""
+
+msgid "RPC enabled"
+msgstr ""
+
+msgid "RPC password"
+msgstr ""
+
+msgid "RPC port"
+msgstr ""
+
+msgid "RPC settings"
+msgstr ""
+
+msgid "RPC username"
+msgstr ""
+
+msgid "RPC whitelist"
+msgstr ""
+
+msgid "RPC whitelist enabled"
+msgstr ""
+
+msgid "Ratio limit"
+msgstr ""
+
+msgid "Ratio limit enabled"
+msgstr ""
+
+msgid "Rename partial files"
+msgstr ""
+
+msgid "Run daemon as user"
+msgstr ""
+
+msgid "Scheduling"
+msgstr ""
+
+msgid "Scrape paused torrents enabled"
+msgstr ""
+
+msgid "Script torrent done enabled"
+msgstr ""
+
+msgid "Script torrent done filename"
+msgstr ""
+
+msgid "Seed queue enabled"
+msgstr ""
+
+msgid "Seed queue size"
+msgstr ""
+
+msgid "Speed limit down"
+msgstr ""
+
+msgid "Speed limit down enabled"
+msgstr ""
+
+msgid "Speed limit up"
+msgstr ""
+
+msgid "Speed limit up enabled"
+msgstr ""
+
+msgid "Transmission"
+msgstr ""
+
+msgid ""
+"Transmission daemon is a simple bittorrent client, here you can configure "
+"the settings."
+msgstr ""
+
+msgid "Trash original torrent files"
+msgstr ""
+
+msgid "Upload slots per torrent"
+msgstr ""
+
+msgid "Watch directory"
+msgstr ""
+
+msgid "in minutes from midnight"
+msgstr ""
+
+msgid "preallocation"
+msgstr ""
+
+msgid "uTP enabled"
+msgstr ""
diff --git a/po/tr/transmission.po b/applications/luci-app-transmission/po/tr/transmission.po
index 5a4df01496..5a4df01496 100644
--- a/po/tr/transmission.po
+++ b/applications/luci-app-transmission/po/tr/transmission.po
diff --git a/po/uk/transmission.po b/applications/luci-app-transmission/po/uk/transmission.po
index 1736934420..1736934420 100644
--- a/po/uk/transmission.po
+++ b/applications/luci-app-transmission/po/uk/transmission.po
diff --git a/po/vi/transmission.po b/applications/luci-app-transmission/po/vi/transmission.po
index 3125fc2751..3125fc2751 100644
--- a/po/vi/transmission.po
+++ b/applications/luci-app-transmission/po/vi/transmission.po
diff --git a/po/zh_CN/transmission.po b/applications/luci-app-transmission/po/zh-cn/transmission.po
index 9dd34915e0..9dd34915e0 100644
--- a/po/zh_CN/transmission.po
+++ b/applications/luci-app-transmission/po/zh-cn/transmission.po
diff --git a/po/zh_TW/transmission.po b/applications/luci-app-transmission/po/zh-tw/transmission.po
index 78da18dd15..78da18dd15 100644
--- a/po/zh_TW/transmission.po
+++ b/applications/luci-app-transmission/po/zh-tw/transmission.po
diff --git a/applications/luci-transmission/root/etc/uci-defaults/luci-transmission b/applications/luci-app-transmission/root/etc/uci-defaults/luci-transmission
index 456e8b89ac..456e8b89ac 100644
--- a/applications/luci-transmission/root/etc/uci-defaults/luci-transmission
+++ b/applications/luci-app-transmission/root/etc/uci-defaults/luci-transmission
diff --git a/applications/luci-app-udpxy/Makefile b/applications/luci-app-udpxy/Makefile
new file mode 100644
index 0000000000..cb8f179232
--- /dev/null
+++ b/applications/luci-app-udpxy/Makefile
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=LuCI Support for udpxy
+LUCI_DEPENDS:=+udpxy
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/applications/luci-udpxy/luasrc/controller/udpxy.lua b/applications/luci-app-udpxy/luasrc/controller/udpxy.lua
index bc85b0bb00..bc85b0bb00 100644
--- a/applications/luci-udpxy/luasrc/controller/udpxy.lua
+++ b/applications/luci-app-udpxy/luasrc/controller/udpxy.lua
diff --git a/applications/luci-udpxy/luasrc/model/cbi/udpxy.lua b/applications/luci-app-udpxy/luasrc/model/cbi/udpxy.lua
index b08f93baf6..b08f93baf6 100644
--- a/applications/luci-udpxy/luasrc/model/cbi/udpxy.lua
+++ b/applications/luci-app-udpxy/luasrc/model/cbi/udpxy.lua
diff --git a/applications/luci-udpxy/root/etc/uci-defaults/luci-udpxy b/applications/luci-app-udpxy/root/etc/uci-defaults/luci-udpxy
index e93c078807..e93c078807 100644
--- a/applications/luci-udpxy/root/etc/uci-defaults/luci-udpxy
+++ b/applications/luci-app-udpxy/root/etc/uci-defaults/luci-udpxy
diff --git a/applications/luci-app-upnp/Makefile b/applications/luci-app-upnp/Makefile
new file mode 100644
index 0000000000..324e3e2aa4
--- /dev/null
+++ b/applications/luci-app-upnp/Makefile
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=Universal Plug & Play configuration module
+LUCI_DEPENDS:=+miniupnpd
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/applications/luci-upnp/luasrc/controller/upnp.lua b/applications/luci-app-upnp/luasrc/controller/upnp.lua
index 83fa94154b..83fa94154b 100644
--- a/applications/luci-upnp/luasrc/controller/upnp.lua
+++ b/applications/luci-app-upnp/luasrc/controller/upnp.lua
diff --git a/applications/luci-upnp/luasrc/model/cbi/upnp/upnp.lua b/applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua
index 3d98d6682f..3d98d6682f 100644
--- a/applications/luci-upnp/luasrc/model/cbi/upnp/upnp.lua
+++ b/applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua
diff --git a/applications/luci-upnp/luasrc/view/admin_status/index/upnp.htm b/applications/luci-app-upnp/luasrc/view/admin_status/index/upnp.htm
index d0c2e2ed50..d0c2e2ed50 100644
--- a/applications/luci-upnp/luasrc/view/admin_status/index/upnp.htm
+++ b/applications/luci-app-upnp/luasrc/view/admin_status/index/upnp.htm
diff --git a/applications/luci-upnp/luasrc/view/upnp_status.htm b/applications/luci-app-upnp/luasrc/view/upnp_status.htm
index d50ed0c4d7..d50ed0c4d7 100644
--- a/applications/luci-upnp/luasrc/view/upnp_status.htm
+++ b/applications/luci-app-upnp/luasrc/view/upnp_status.htm
diff --git a/po/ca/upnp.po b/applications/luci-app-upnp/po/ca/upnp.po
index 3176bb516f..3176bb516f 100644
--- a/po/ca/upnp.po
+++ b/applications/luci-app-upnp/po/ca/upnp.po
diff --git a/po/cs/upnp.po b/applications/luci-app-upnp/po/cs/upnp.po
index a712f8262b..a712f8262b 100644
--- a/po/cs/upnp.po
+++ b/applications/luci-app-upnp/po/cs/upnp.po
diff --git a/po/de/upnp.po b/applications/luci-app-upnp/po/de/upnp.po
index 2edd93c5dc..2edd93c5dc 100644
--- a/po/de/upnp.po
+++ b/applications/luci-app-upnp/po/de/upnp.po
diff --git a/po/el/upnp.po b/applications/luci-app-upnp/po/el/upnp.po
index 775a7f70c8..775a7f70c8 100644
--- a/po/el/upnp.po
+++ b/applications/luci-app-upnp/po/el/upnp.po
diff --git a/po/en/upnp.po b/applications/luci-app-upnp/po/en/upnp.po
index 72d21bae51..72d21bae51 100644
--- a/po/en/upnp.po
+++ b/applications/luci-app-upnp/po/en/upnp.po
diff --git a/po/es/upnp.po b/applications/luci-app-upnp/po/es/upnp.po
index 79a2800975..79a2800975 100644
--- a/po/es/upnp.po
+++ b/applications/luci-app-upnp/po/es/upnp.po
diff --git a/po/fr/upnp.po b/applications/luci-app-upnp/po/fr/upnp.po
index 0cdb86d15a..0cdb86d15a 100644
--- a/po/fr/upnp.po
+++ b/applications/luci-app-upnp/po/fr/upnp.po
diff --git a/po/he/upnp.po b/applications/luci-app-upnp/po/he/upnp.po
index d67355095f..d67355095f 100644
--- a/po/he/upnp.po
+++ b/applications/luci-app-upnp/po/he/upnp.po
diff --git a/po/hu/upnp.po b/applications/luci-app-upnp/po/hu/upnp.po
index e4c5e12ec5..e4c5e12ec5 100644
--- a/po/hu/upnp.po
+++ b/applications/luci-app-upnp/po/hu/upnp.po
diff --git a/po/it/upnp.po b/applications/luci-app-upnp/po/it/upnp.po
index a8ef2e98a9..a8ef2e98a9 100644
--- a/po/it/upnp.po
+++ b/applications/luci-app-upnp/po/it/upnp.po
diff --git a/po/ja/upnp.po b/applications/luci-app-upnp/po/ja/upnp.po
index 79e2153600..79e2153600 100644
--- a/po/ja/upnp.po
+++ b/applications/luci-app-upnp/po/ja/upnp.po
diff --git a/po/ms/upnp.po b/applications/luci-app-upnp/po/ms/upnp.po
index c3e71846d7..c3e71846d7 100644
--- a/po/ms/upnp.po
+++ b/applications/luci-app-upnp/po/ms/upnp.po
diff --git a/po/no/upnp.po b/applications/luci-app-upnp/po/no/upnp.po
index 37ff9bff67..37ff9bff67 100644
--- a/po/no/upnp.po
+++ b/applications/luci-app-upnp/po/no/upnp.po
diff --git a/po/pl/upnp.po b/applications/luci-app-upnp/po/pl/upnp.po
index e891dce488..e891dce488 100644
--- a/po/pl/upnp.po
+++ b/applications/luci-app-upnp/po/pl/upnp.po
diff --git a/po/pt_BR/upnp.po b/applications/luci-app-upnp/po/pt-br/upnp.po
index ae9e7fe076..ae9e7fe076 100644
--- a/po/pt_BR/upnp.po
+++ b/applications/luci-app-upnp/po/pt-br/upnp.po
diff --git a/po/pt/upnp.po b/applications/luci-app-upnp/po/pt/upnp.po
index 91c94f34df..91c94f34df 100644
--- a/po/pt/upnp.po
+++ b/applications/luci-app-upnp/po/pt/upnp.po
diff --git a/po/ro/upnp.po b/applications/luci-app-upnp/po/ro/upnp.po
index 84f515832a..84f515832a 100644
--- a/po/ro/upnp.po
+++ b/applications/luci-app-upnp/po/ro/upnp.po
diff --git a/po/ru/upnp.po b/applications/luci-app-upnp/po/ru/upnp.po
index 626672bd2c..626672bd2c 100644
--- a/po/ru/upnp.po
+++ b/applications/luci-app-upnp/po/ru/upnp.po
diff --git a/po/sk/upnp.po b/applications/luci-app-upnp/po/sk/upnp.po
index 57631638de..57631638de 100644
--- a/po/sk/upnp.po
+++ b/applications/luci-app-upnp/po/sk/upnp.po
diff --git a/po/sv/upnp.po b/applications/luci-app-upnp/po/sv/upnp.po
index 11c20c140c..11c20c140c 100644
--- a/po/sv/upnp.po
+++ b/applications/luci-app-upnp/po/sv/upnp.po
diff --git a/applications/luci-app-upnp/po/templates/upnp.pot b/applications/luci-app-upnp/po/templates/upnp.pot
new file mode 100644
index 0000000000..86aaee3437
--- /dev/null
+++ b/applications/luci-app-upnp/po/templates/upnp.pot
@@ -0,0 +1,129 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid ""
+"ACLs specify which external ports may be redirected to which internal "
+"addresses and ports"
+msgstr ""
+
+msgid "Action"
+msgstr ""
+
+msgid "Active UPnP Redirects"
+msgstr ""
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Allow adding forwards only to requesting ip addresses"
+msgstr ""
+
+msgid "Announced model number"
+msgstr ""
+
+msgid "Announced serial number"
+msgstr ""
+
+msgid "Clean rules interval"
+msgstr ""
+
+msgid "Clean rules threshold"
+msgstr ""
+
+msgid "Client Address"
+msgstr ""
+
+msgid "Client Port"
+msgstr ""
+
+msgid "Collecting data..."
+msgstr ""
+
+msgid "Comment"
+msgstr ""
+
+msgid "Delete Redirect"
+msgstr ""
+
+msgid "Device UUID"
+msgstr ""
+
+msgid "Downlink"
+msgstr ""
+
+msgid "Enable NAT-PMP functionality"
+msgstr ""
+
+msgid "Enable UPnP functionality"
+msgstr ""
+
+msgid "Enable additional logging"
+msgstr ""
+
+msgid "Enable secure mode"
+msgstr ""
+
+msgid "External Port"
+msgstr ""
+
+msgid "External ports"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "Internal addresses"
+msgstr ""
+
+msgid "Internal ports"
+msgstr ""
+
+msgid "MiniUPnP ACLs"
+msgstr ""
+
+msgid "MiniUPnP settings"
+msgstr ""
+
+msgid "Notify interval"
+msgstr ""
+
+msgid "Port"
+msgstr ""
+
+msgid "Presentation URL"
+msgstr ""
+
+msgid "Protocol"
+msgstr ""
+
+msgid "Puts extra debugging information into the system log"
+msgstr ""
+
+msgid "Report system instead of daemon uptime"
+msgstr ""
+
+msgid "Start UPnP and NAT-PMP service"
+msgstr ""
+
+msgid "There are no active redirects."
+msgstr ""
+
+msgid "UPNP"
+msgstr ""
+
+msgid ""
+"UPnP allows clients in the local network to automatically configure the "
+"router."
+msgstr ""
+
+msgid "UPnP lease file"
+msgstr ""
+
+msgid "Universal Plug & Play"
+msgstr ""
+
+msgid "Uplink"
+msgstr ""
+
+msgid "Value in KByte/s, informational only"
+msgstr ""
diff --git a/po/tr/upnp.po b/applications/luci-app-upnp/po/tr/upnp.po
index bf0e59a54f..bf0e59a54f 100644
--- a/po/tr/upnp.po
+++ b/applications/luci-app-upnp/po/tr/upnp.po
diff --git a/po/uk/upnp.po b/applications/luci-app-upnp/po/uk/upnp.po
index 7646109c78..7646109c78 100644
--- a/po/uk/upnp.po
+++ b/applications/luci-app-upnp/po/uk/upnp.po
diff --git a/po/vi/upnp.po b/applications/luci-app-upnp/po/vi/upnp.po
index 7c7ea9d5cf..7c7ea9d5cf 100644
--- a/po/vi/upnp.po
+++ b/applications/luci-app-upnp/po/vi/upnp.po
diff --git a/po/zh_CN/upnp.po b/applications/luci-app-upnp/po/zh-cn/upnp.po
index 1749b9e7bd..1749b9e7bd 100644
--- a/po/zh_CN/upnp.po
+++ b/applications/luci-app-upnp/po/zh-cn/upnp.po
diff --git a/po/zh_TW/upnp.po b/applications/luci-app-upnp/po/zh-tw/upnp.po
index 356801b077..356801b077 100644
--- a/po/zh_TW/upnp.po
+++ b/applications/luci-app-upnp/po/zh-tw/upnp.po
diff --git a/applications/luci-upnp/root/etc/uci-defaults/luci-upnp b/applications/luci-app-upnp/root/etc/uci-defaults/luci-upnp
index fe22a3e3c1..fe22a3e3c1 100755
--- a/applications/luci-upnp/root/etc/uci-defaults/luci-upnp
+++ b/applications/luci-app-upnp/root/etc/uci-defaults/luci-upnp
diff --git a/applications/luci-app-ushare/Makefile b/applications/luci-app-ushare/Makefile
new file mode 100644
index 0000000000..7b90a00751
--- /dev/null
+++ b/applications/luci-app-ushare/Makefile
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=uShare - UPnP A/V & DLNA Media Server
+LUCI_DEPENDS:=+ushare
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/applications/luci-ushare/ipkg/postinst b/applications/luci-app-ushare/ipkg/postinst
index 54b1a33b4d..54b1a33b4d 100644
--- a/applications/luci-ushare/ipkg/postinst
+++ b/applications/luci-app-ushare/ipkg/postinst
diff --git a/applications/luci-ushare/luasrc/controller/ushare.lua b/applications/luci-app-ushare/luasrc/controller/ushare.lua
index eed853239b..eed853239b 100644
--- a/applications/luci-ushare/luasrc/controller/ushare.lua
+++ b/applications/luci-app-ushare/luasrc/controller/ushare.lua
diff --git a/applications/luci-ushare/luasrc/model/cbi/ushare.lua b/applications/luci-app-ushare/luasrc/model/cbi/ushare.lua
index 7032b2d5ce..7032b2d5ce 100644
--- a/applications/luci-ushare/luasrc/model/cbi/ushare.lua
+++ b/applications/luci-app-ushare/luasrc/model/cbi/ushare.lua
diff --git a/po/ca/ushare.po b/applications/luci-app-ushare/po/ca/ushare.po
index 9d64596936..9d64596936 100644
--- a/po/ca/ushare.po
+++ b/applications/luci-app-ushare/po/ca/ushare.po
diff --git a/po/cs/ushare.po b/applications/luci-app-ushare/po/cs/ushare.po
index d908e91e94..d908e91e94 100644
--- a/po/cs/ushare.po
+++ b/applications/luci-app-ushare/po/cs/ushare.po
diff --git a/po/de/ushare.po b/applications/luci-app-ushare/po/de/ushare.po
index d7d7e229be..d7d7e229be 100644
--- a/po/de/ushare.po
+++ b/applications/luci-app-ushare/po/de/ushare.po
diff --git a/po/el/ushare.po b/applications/luci-app-ushare/po/el/ushare.po
index 331c8a0d65..331c8a0d65 100644
--- a/po/el/ushare.po
+++ b/applications/luci-app-ushare/po/el/ushare.po
diff --git a/po/en/ushare.po b/applications/luci-app-ushare/po/en/ushare.po
index 5e5d65f9bd..5e5d65f9bd 100644
--- a/po/en/ushare.po
+++ b/applications/luci-app-ushare/po/en/ushare.po
diff --git a/po/es/ushare.po b/applications/luci-app-ushare/po/es/ushare.po
index e8422b9545..e8422b9545 100644
--- a/po/es/ushare.po
+++ b/applications/luci-app-ushare/po/es/ushare.po
diff --git a/po/fr/ushare.po b/applications/luci-app-ushare/po/fr/ushare.po
index e2e917d9a7..e2e917d9a7 100644
--- a/po/fr/ushare.po
+++ b/applications/luci-app-ushare/po/fr/ushare.po
diff --git a/po/he/ushare.po b/applications/luci-app-ushare/po/he/ushare.po
index 4858a9a80c..4858a9a80c 100644
--- a/po/he/ushare.po
+++ b/applications/luci-app-ushare/po/he/ushare.po
diff --git a/po/hu/ushare.po b/applications/luci-app-ushare/po/hu/ushare.po
index 6efa5211b6..6efa5211b6 100644
--- a/po/hu/ushare.po
+++ b/applications/luci-app-ushare/po/hu/ushare.po
diff --git a/po/it/ushare.po b/applications/luci-app-ushare/po/it/ushare.po
index 5837a11acd..5837a11acd 100644
--- a/po/it/ushare.po
+++ b/applications/luci-app-ushare/po/it/ushare.po
diff --git a/po/ja/ushare.po b/applications/luci-app-ushare/po/ja/ushare.po
index a217eceaa1..a217eceaa1 100644
--- a/po/ja/ushare.po
+++ b/applications/luci-app-ushare/po/ja/ushare.po
diff --git a/po/ms/ushare.po b/applications/luci-app-ushare/po/ms/ushare.po
index 40b24f20f8..40b24f20f8 100644
--- a/po/ms/ushare.po
+++ b/applications/luci-app-ushare/po/ms/ushare.po
diff --git a/po/no/ushare.po b/applications/luci-app-ushare/po/no/ushare.po
index 321d29e3bc..321d29e3bc 100644
--- a/po/no/ushare.po
+++ b/applications/luci-app-ushare/po/no/ushare.po
diff --git a/po/pl/ushare.po b/applications/luci-app-ushare/po/pl/ushare.po
index 2a26404ade..2a26404ade 100644
--- a/po/pl/ushare.po
+++ b/applications/luci-app-ushare/po/pl/ushare.po
diff --git a/po/pt_BR/ushare.po b/applications/luci-app-ushare/po/pt-br/ushare.po
index 5fc872e87c..5fc872e87c 100644
--- a/po/pt_BR/ushare.po
+++ b/applications/luci-app-ushare/po/pt-br/ushare.po
diff --git a/po/pt/ushare.po b/applications/luci-app-ushare/po/pt/ushare.po
index 795a963d18..795a963d18 100644
--- a/po/pt/ushare.po
+++ b/applications/luci-app-ushare/po/pt/ushare.po
diff --git a/po/ro/ushare.po b/applications/luci-app-ushare/po/ro/ushare.po
index 3c997545a2..3c997545a2 100644
--- a/po/ro/ushare.po
+++ b/applications/luci-app-ushare/po/ro/ushare.po
diff --git a/po/ru/ushare.po b/applications/luci-app-ushare/po/ru/ushare.po
index ac08e946d5..ac08e946d5 100644
--- a/po/ru/ushare.po
+++ b/applications/luci-app-ushare/po/ru/ushare.po
diff --git a/po/sk/ushare.po b/applications/luci-app-ushare/po/sk/ushare.po
index 4c9022b652..4c9022b652 100644
--- a/po/sk/ushare.po
+++ b/applications/luci-app-ushare/po/sk/ushare.po
diff --git a/po/sv/ushare.po b/applications/luci-app-ushare/po/sv/ushare.po
index 50fc9d6d4f..50fc9d6d4f 100644
--- a/po/sv/ushare.po
+++ b/applications/luci-app-ushare/po/sv/ushare.po
diff --git a/applications/luci-app-ushare/po/templates/ushare.pot b/applications/luci-app-ushare/po/templates/ushare.pot
new file mode 100644
index 0000000000..7e4dbc1548
--- /dev/null
+++ b/applications/luci-app-ushare/po/templates/ushare.pot
@@ -0,0 +1,38 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "Content directories"
+msgstr ""
+
+msgid "Disable telnet console"
+msgstr ""
+
+msgid "Disable webinterface"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid "Options"
+msgstr ""
+
+msgid "Servername"
+msgstr ""
+
+msgid "Settings"
+msgstr ""
+
+msgid "Username"
+msgstr ""
+
+msgid "uShare"
+msgstr ""
+
+msgid ""
+"uShare is a UPnP (TM) A/V & DLNA Media Server. It implements the server "
+"component that provides UPnP media devices with information on available "
+"multimedia files."
+msgstr ""
diff --git a/po/tr/ushare.po b/applications/luci-app-ushare/po/tr/ushare.po
index c905c57a5c..c905c57a5c 100644
--- a/po/tr/ushare.po
+++ b/applications/luci-app-ushare/po/tr/ushare.po
diff --git a/po/uk/ushare.po b/applications/luci-app-ushare/po/uk/ushare.po
index d79f896703..d79f896703 100644
--- a/po/uk/ushare.po
+++ b/applications/luci-app-ushare/po/uk/ushare.po
diff --git a/po/vi/ushare.po b/applications/luci-app-ushare/po/vi/ushare.po
index 20e5df7135..20e5df7135 100644
--- a/po/vi/ushare.po
+++ b/applications/luci-app-ushare/po/vi/ushare.po
diff --git a/po/zh_CN/ushare.po b/applications/luci-app-ushare/po/zh-cn/ushare.po
index f426526e69..f426526e69 100644
--- a/po/zh_CN/ushare.po
+++ b/applications/luci-app-ushare/po/zh-cn/ushare.po
diff --git a/po/zh_TW/ushare.po b/applications/luci-app-ushare/po/zh-tw/ushare.po
index eba6677a5e..eba6677a5e 100644
--- a/po/zh_TW/ushare.po
+++ b/applications/luci-app-ushare/po/zh-tw/ushare.po
diff --git a/applications/luci-ushare/root/etc/uci-defaults/luci-ushare b/applications/luci-app-ushare/root/etc/uci-defaults/luci-ushare
index 8bcb6e4118..8bcb6e4118 100755
--- a/applications/luci-ushare/root/etc/uci-defaults/luci-ushare
+++ b/applications/luci-app-ushare/root/etc/uci-defaults/luci-ushare
diff --git a/applications/luci-app-vnstat/Makefile b/applications/luci-app-vnstat/Makefile
new file mode 100644
index 0000000000..6d98610d6d
--- /dev/null
+++ b/applications/luci-app-vnstat/Makefile
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=LuCI Support for VnStat
+LUCI_DEPENDS:=+vnstat +vnstati
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/applications/luci-vnstat/ipkg/postinst b/applications/luci-app-vnstat/ipkg/postinst
index 816084a489..816084a489 100755
--- a/applications/luci-vnstat/ipkg/postinst
+++ b/applications/luci-app-vnstat/ipkg/postinst
diff --git a/applications/luci-vnstat/luasrc/controller/vnstat.lua b/applications/luci-app-vnstat/luasrc/controller/vnstat.lua
index 3871fa254c..3871fa254c 100644
--- a/applications/luci-vnstat/luasrc/controller/vnstat.lua
+++ b/applications/luci-app-vnstat/luasrc/controller/vnstat.lua
diff --git a/applications/luci-vnstat/luasrc/model/cbi/vnstat.lua b/applications/luci-app-vnstat/luasrc/model/cbi/vnstat.lua
index 38b06ba9a7..38b06ba9a7 100644
--- a/applications/luci-vnstat/luasrc/model/cbi/vnstat.lua
+++ b/applications/luci-app-vnstat/luasrc/model/cbi/vnstat.lua
diff --git a/applications/luci-vnstat/luasrc/view/vnstat.htm b/applications/luci-app-vnstat/luasrc/view/vnstat.htm
index d67f9b3be7..d67f9b3be7 100644
--- a/applications/luci-vnstat/luasrc/view/vnstat.htm
+++ b/applications/luci-app-vnstat/luasrc/view/vnstat.htm
diff --git a/po/ca/vnstat.po b/applications/luci-app-vnstat/po/ca/vnstat.po
index 536228ee81..536228ee81 100644
--- a/po/ca/vnstat.po
+++ b/applications/luci-app-vnstat/po/ca/vnstat.po
diff --git a/po/cs/vnstat.po b/applications/luci-app-vnstat/po/cs/vnstat.po
index 4818374199..4818374199 100644
--- a/po/cs/vnstat.po
+++ b/applications/luci-app-vnstat/po/cs/vnstat.po
diff --git a/po/de/vnstat.po b/applications/luci-app-vnstat/po/de/vnstat.po
index e42f4f0f0e..e42f4f0f0e 100644
--- a/po/de/vnstat.po
+++ b/applications/luci-app-vnstat/po/de/vnstat.po
diff --git a/po/el/vnstat.po b/applications/luci-app-vnstat/po/el/vnstat.po
index 9d237780db..9d237780db 100644
--- a/po/el/vnstat.po
+++ b/applications/luci-app-vnstat/po/el/vnstat.po
diff --git a/po/en/vnstat.po b/applications/luci-app-vnstat/po/en/vnstat.po
index 9d237780db..9d237780db 100644
--- a/po/en/vnstat.po
+++ b/applications/luci-app-vnstat/po/en/vnstat.po
diff --git a/po/es/vnstat.po b/applications/luci-app-vnstat/po/es/vnstat.po
index b91e1bb5da..b91e1bb5da 100644
--- a/po/es/vnstat.po
+++ b/applications/luci-app-vnstat/po/es/vnstat.po
diff --git a/po/fr/vnstat.po b/applications/luci-app-vnstat/po/fr/vnstat.po
index 23b644aca1..23b644aca1 100644
--- a/po/fr/vnstat.po
+++ b/applications/luci-app-vnstat/po/fr/vnstat.po
diff --git a/po/he/vnstat.po b/applications/luci-app-vnstat/po/he/vnstat.po
index f0ef3a78ba..f0ef3a78ba 100644
--- a/po/he/vnstat.po
+++ b/applications/luci-app-vnstat/po/he/vnstat.po
diff --git a/po/hu/vnstat.po b/applications/luci-app-vnstat/po/hu/vnstat.po
index b198c5db28..b198c5db28 100644
--- a/po/hu/vnstat.po
+++ b/applications/luci-app-vnstat/po/hu/vnstat.po
diff --git a/po/it/vnstat.po b/applications/luci-app-vnstat/po/it/vnstat.po
index 8cc6e5b393..8cc6e5b393 100644
--- a/po/it/vnstat.po
+++ b/applications/luci-app-vnstat/po/it/vnstat.po
diff --git a/po/ja/vnstat.po b/applications/luci-app-vnstat/po/ja/vnstat.po
index 8708c6fb00..8708c6fb00 100644
--- a/po/ja/vnstat.po
+++ b/applications/luci-app-vnstat/po/ja/vnstat.po
diff --git a/po/ms/vnstat.po b/applications/luci-app-vnstat/po/ms/vnstat.po
index 9d237780db..9d237780db 100644
--- a/po/ms/vnstat.po
+++ b/applications/luci-app-vnstat/po/ms/vnstat.po
diff --git a/po/no/vnstat.po b/applications/luci-app-vnstat/po/no/vnstat.po
index c1e94d29ee..c1e94d29ee 100644
--- a/po/no/vnstat.po
+++ b/applications/luci-app-vnstat/po/no/vnstat.po
diff --git a/po/pl/vnstat.po b/applications/luci-app-vnstat/po/pl/vnstat.po
index 5b0d8b09e9..5b0d8b09e9 100644
--- a/po/pl/vnstat.po
+++ b/applications/luci-app-vnstat/po/pl/vnstat.po
diff --git a/po/pt_BR/vnstat.po b/applications/luci-app-vnstat/po/pt-br/vnstat.po
index 47cf09aed9..47cf09aed9 100644
--- a/po/pt_BR/vnstat.po
+++ b/applications/luci-app-vnstat/po/pt-br/vnstat.po
diff --git a/po/pt/vnstat.po b/applications/luci-app-vnstat/po/pt/vnstat.po
index 729789055e..729789055e 100644
--- a/po/pt/vnstat.po
+++ b/applications/luci-app-vnstat/po/pt/vnstat.po
diff --git a/po/ro/vnstat.po b/applications/luci-app-vnstat/po/ro/vnstat.po
index 093182bde6..093182bde6 100644
--- a/po/ro/vnstat.po
+++ b/applications/luci-app-vnstat/po/ro/vnstat.po
diff --git a/po/ru/vnstat.po b/applications/luci-app-vnstat/po/ru/vnstat.po
index 5254ca1ee1..5254ca1ee1 100644
--- a/po/ru/vnstat.po
+++ b/applications/luci-app-vnstat/po/ru/vnstat.po
diff --git a/po/sk/vnstat.po b/applications/luci-app-vnstat/po/sk/vnstat.po
index 5926ecfeb0..5926ecfeb0 100644
--- a/po/sk/vnstat.po
+++ b/applications/luci-app-vnstat/po/sk/vnstat.po
diff --git a/po/sv/vnstat.po b/applications/luci-app-vnstat/po/sv/vnstat.po
index 113c4d2755..113c4d2755 100644
--- a/po/sv/vnstat.po
+++ b/applications/luci-app-vnstat/po/sv/vnstat.po
diff --git a/applications/luci-app-vnstat/po/templates/vnstat.pot b/applications/luci-app-vnstat/po/templates/vnstat.pot
new file mode 100644
index 0000000000..4dccf05c7c
--- /dev/null
+++ b/applications/luci-app-vnstat/po/templates/vnstat.pot
@@ -0,0 +1,51 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "Configuration"
+msgstr ""
+
+msgid "Daily traffic"
+msgstr ""
+
+msgid "Graphs"
+msgstr ""
+
+msgid "Hourly traffic"
+msgstr ""
+
+msgid "Monitor selected interfaces"
+msgstr ""
+
+msgid "Monthly traffic"
+msgstr ""
+
+msgid ""
+"No database has been set up yet. Go to the VnStat configuration and enable "
+"monitoring for one or more interfaces."
+msgstr ""
+
+msgid "Restart VnStat"
+msgstr ""
+
+msgid "Summary display"
+msgstr ""
+
+msgid "Top 10 display"
+msgstr ""
+
+msgid "Update »"
+msgstr ""
+
+msgid "VnStat"
+msgstr ""
+
+msgid "VnStat Graphs"
+msgstr ""
+
+msgid "VnStat Traffic Monitor"
+msgstr ""
+
+msgid ""
+"VnStat is a network traffic monitor for Linux that keeps a log of network "
+"traffic for the selected interface(s)."
+msgstr ""
diff --git a/po/tr/vnstat.po b/applications/luci-app-vnstat/po/tr/vnstat.po
index 5e001c9326..5e001c9326 100644
--- a/po/tr/vnstat.po
+++ b/applications/luci-app-vnstat/po/tr/vnstat.po
diff --git a/po/uk/vnstat.po b/applications/luci-app-vnstat/po/uk/vnstat.po
index 5f9d25783a..5f9d25783a 100644
--- a/po/uk/vnstat.po
+++ b/applications/luci-app-vnstat/po/uk/vnstat.po
diff --git a/po/vi/vnstat.po b/applications/luci-app-vnstat/po/vi/vnstat.po
index 9e837ad9e5..9e837ad9e5 100644
--- a/po/vi/vnstat.po
+++ b/applications/luci-app-vnstat/po/vi/vnstat.po
diff --git a/po/zh_CN/vnstat.po b/applications/luci-app-vnstat/po/zh-cn/vnstat.po
index 68e4905f05..68e4905f05 100644
--- a/po/zh_CN/vnstat.po
+++ b/applications/luci-app-vnstat/po/zh-cn/vnstat.po
diff --git a/po/zh_TW/vnstat.po b/applications/luci-app-vnstat/po/zh-tw/vnstat.po
index 261747aad2..261747aad2 100644
--- a/po/zh_TW/vnstat.po
+++ b/applications/luci-app-vnstat/po/zh-tw/vnstat.po
diff --git a/applications/luci-vnstat/root/etc/uci-defaults/luci-vnstat b/applications/luci-app-vnstat/root/etc/uci-defaults/luci-vnstat
index fa204b3b48..fa204b3b48 100755
--- a/applications/luci-vnstat/root/etc/uci-defaults/luci-vnstat
+++ b/applications/luci-app-vnstat/root/etc/uci-defaults/luci-vnstat
diff --git a/applications/luci-app-voice-core/Makefile b/applications/luci-app-voice-core/Makefile
new file mode 100644
index 0000000000..3641bdd924
--- /dev/null
+++ b/applications/luci-app-voice-core/Makefile
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=LuCI Voice Software (Core)
+LUCI_DEPENDS:=
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/applications/luci-voice-core/luasrc/controller/luci_voice.lua b/applications/luci-app-voice-core/luasrc/controller/luci_voice.lua
index 728afb6a45..728afb6a45 100644
--- a/applications/luci-voice-core/luasrc/controller/luci_voice.lua
+++ b/applications/luci-app-voice-core/luasrc/controller/luci_voice.lua
diff --git a/applications/luci-voice-core/luasrc/view/luci_voice/index.htm b/applications/luci-app-voice-core/luasrc/view/luci_voice/index.htm
index 73d2ce4466..73d2ce4466 100644
--- a/applications/luci-voice-core/luasrc/view/luci_voice/index.htm
+++ b/applications/luci-app-voice-core/luasrc/view/luci_voice/index.htm
diff --git a/applications/luci-voice-core/luasrc/view/luci_voice/phone_index.htm b/applications/luci-app-voice-core/luasrc/view/luci_voice/phone_index.htm
index 89b866114a..89b866114a 100644
--- a/applications/luci-voice-core/luasrc/view/luci_voice/phone_index.htm
+++ b/applications/luci-app-voice-core/luasrc/view/luci_voice/phone_index.htm
diff --git a/po/ca/voice_core.po b/applications/luci-app-voice-core/po/ca/voice_core.po
index 068620965b..068620965b 100644
--- a/po/ca/voice_core.po
+++ b/applications/luci-app-voice-core/po/ca/voice_core.po
diff --git a/po/cs/voice_core.po b/applications/luci-app-voice-core/po/cs/voice_core.po
index e4eae35ae5..e4eae35ae5 100644
--- a/po/cs/voice_core.po
+++ b/applications/luci-app-voice-core/po/cs/voice_core.po
diff --git a/po/de/voice_core.po b/applications/luci-app-voice-core/po/de/voice_core.po
index 2a03b63412..2a03b63412 100644
--- a/po/de/voice_core.po
+++ b/applications/luci-app-voice-core/po/de/voice_core.po
diff --git a/po/el/voice_core.po b/applications/luci-app-voice-core/po/el/voice_core.po
index 01abb41393..01abb41393 100644
--- a/po/el/voice_core.po
+++ b/applications/luci-app-voice-core/po/el/voice_core.po
diff --git a/po/en/voice_core.po b/applications/luci-app-voice-core/po/en/voice_core.po
index 297f873138..297f873138 100644
--- a/po/en/voice_core.po
+++ b/applications/luci-app-voice-core/po/en/voice_core.po
diff --git a/po/es/voice_core.po b/applications/luci-app-voice-core/po/es/voice_core.po
index 74e2c23cae..74e2c23cae 100644
--- a/po/es/voice_core.po
+++ b/applications/luci-app-voice-core/po/es/voice_core.po
diff --git a/po/fr/voice_core.po b/applications/luci-app-voice-core/po/fr/voice_core.po
index 71ef06285a..71ef06285a 100644
--- a/po/fr/voice_core.po
+++ b/applications/luci-app-voice-core/po/fr/voice_core.po
diff --git a/po/he/voice_core.po b/applications/luci-app-voice-core/po/he/voice_core.po
index 74440e343d..74440e343d 100644
--- a/po/he/voice_core.po
+++ b/applications/luci-app-voice-core/po/he/voice_core.po
diff --git a/po/hu/voice_core.po b/applications/luci-app-voice-core/po/hu/voice_core.po
index 07eaa14d70..07eaa14d70 100644
--- a/po/hu/voice_core.po
+++ b/applications/luci-app-voice-core/po/hu/voice_core.po
diff --git a/po/it/voice_core.po b/applications/luci-app-voice-core/po/it/voice_core.po
index 4d22ff03b2..4d22ff03b2 100644
--- a/po/it/voice_core.po
+++ b/applications/luci-app-voice-core/po/it/voice_core.po
diff --git a/po/ja/voice_core.po b/applications/luci-app-voice-core/po/ja/voice_core.po
index c7e60e204f..c7e60e204f 100644
--- a/po/ja/voice_core.po
+++ b/applications/luci-app-voice-core/po/ja/voice_core.po
diff --git a/po/ms/voice_core.po b/applications/luci-app-voice-core/po/ms/voice_core.po
index a866bec5d4..a866bec5d4 100644
--- a/po/ms/voice_core.po
+++ b/applications/luci-app-voice-core/po/ms/voice_core.po
diff --git a/po/no/voice_core.po b/applications/luci-app-voice-core/po/no/voice_core.po
index a0149da4bb..a0149da4bb 100644
--- a/po/no/voice_core.po
+++ b/applications/luci-app-voice-core/po/no/voice_core.po
diff --git a/po/pl/voice_core.po b/applications/luci-app-voice-core/po/pl/voice_core.po
index 39950f85f9..39950f85f9 100644
--- a/po/pl/voice_core.po
+++ b/applications/luci-app-voice-core/po/pl/voice_core.po
diff --git a/po/pt_BR/voice_core.po b/applications/luci-app-voice-core/po/pt-br/voice_core.po
index 18cab7235b..18cab7235b 100644
--- a/po/pt_BR/voice_core.po
+++ b/applications/luci-app-voice-core/po/pt-br/voice_core.po
diff --git a/po/pt/voice_core.po b/applications/luci-app-voice-core/po/pt/voice_core.po
index 07d6093f67..07d6093f67 100644
--- a/po/pt/voice_core.po
+++ b/applications/luci-app-voice-core/po/pt/voice_core.po
diff --git a/po/ro/voice_core.po b/applications/luci-app-voice-core/po/ro/voice_core.po
index 1776a51fe1..1776a51fe1 100644
--- a/po/ro/voice_core.po
+++ b/applications/luci-app-voice-core/po/ro/voice_core.po
diff --git a/po/ru/voice_core.po b/applications/luci-app-voice-core/po/ru/voice_core.po
index b6631dfc05..b6631dfc05 100644
--- a/po/ru/voice_core.po
+++ b/applications/luci-app-voice-core/po/ru/voice_core.po
diff --git a/po/sk/voice_core.po b/applications/luci-app-voice-core/po/sk/voice_core.po
index 9c30581d14..9c30581d14 100644
--- a/po/sk/voice_core.po
+++ b/applications/luci-app-voice-core/po/sk/voice_core.po
diff --git a/po/sv/voice_core.po b/applications/luci-app-voice-core/po/sv/voice_core.po
index 803726a384..803726a384 100644
--- a/po/sv/voice_core.po
+++ b/applications/luci-app-voice-core/po/sv/voice_core.po
diff --git a/applications/luci-app-voice-core/po/templates/voice_core.pot b/applications/luci-app-voice-core/po/templates/voice_core.pot
new file mode 100644
index 0000000000..64c93ebac6
--- /dev/null
+++ b/applications/luci-app-voice-core/po/templates/voice_core.pot
@@ -0,0 +1,8 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "Phones"
+msgstr ""
+
+msgid "Voice"
+msgstr ""
diff --git a/po/tr/voice_core.po b/applications/luci-app-voice-core/po/tr/voice_core.po
index 642538e201..642538e201 100644
--- a/po/tr/voice_core.po
+++ b/applications/luci-app-voice-core/po/tr/voice_core.po
diff --git a/po/uk/voice_core.po b/applications/luci-app-voice-core/po/uk/voice_core.po
index 4886d7298a..4886d7298a 100644
--- a/po/uk/voice_core.po
+++ b/applications/luci-app-voice-core/po/uk/voice_core.po
diff --git a/po/vi/voice_core.po b/applications/luci-app-voice-core/po/vi/voice_core.po
index 3e45434c69..3e45434c69 100644
--- a/po/vi/voice_core.po
+++ b/applications/luci-app-voice-core/po/vi/voice_core.po
diff --git a/po/zh_CN/voice_core.po b/applications/luci-app-voice-core/po/zh-cn/voice_core.po
index 09788894ed..09788894ed 100644
--- a/po/zh_CN/voice_core.po
+++ b/applications/luci-app-voice-core/po/zh-cn/voice_core.po
diff --git a/po/zh_TW/voice_core.po b/applications/luci-app-voice-core/po/zh-tw/voice_core.po
index e1bbf7a9d6..e1bbf7a9d6 100644
--- a/po/zh_TW/voice_core.po
+++ b/applications/luci-app-voice-core/po/zh-tw/voice_core.po
diff --git a/applications/luci-app-voice-diag/Makefile b/applications/luci-app-voice-diag/Makefile
new file mode 100644
index 0000000000..c9c9a2036f
--- /dev/null
+++ b/applications/luci-app-voice-diag/Makefile
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=LuCI Voice Software (Diagnostics)
+LUCI_DEPENDS:=+luci-app-diag-devinfo
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/applications/luci-voice-diag/luasrc/controller/luci_voice/luci_voice_diag.lua b/applications/luci-app-voice-diag/luasrc/controller/luci_voice/luci_voice_diag.lua
index 7c3f341ed0..7c3f341ed0 100644
--- a/applications/luci-voice-diag/luasrc/controller/luci_voice/luci_voice_diag.lua
+++ b/applications/luci-app-voice-diag/luasrc/controller/luci_voice/luci_voice_diag.lua
diff --git a/applications/luci-voice-diag/luasrc/view/luci_voice/diag_index.htm b/applications/luci-app-voice-diag/luasrc/view/luci_voice/diag_index.htm
index 387d2ab62d..387d2ab62d 100644
--- a/applications/luci-voice-diag/luasrc/view/luci_voice/diag_index.htm
+++ b/applications/luci-app-voice-diag/luasrc/view/luci_voice/diag_index.htm
diff --git a/po/ca/voice_diag.po b/applications/luci-app-voice-diag/po/ca/voice_diag.po
index 0396100a3c..0396100a3c 100644
--- a/po/ca/voice_diag.po
+++ b/applications/luci-app-voice-diag/po/ca/voice_diag.po
diff --git a/po/cs/voice_diag.po b/applications/luci-app-voice-diag/po/cs/voice_diag.po
index 4939d20888..4939d20888 100644
--- a/po/cs/voice_diag.po
+++ b/applications/luci-app-voice-diag/po/cs/voice_diag.po
diff --git a/po/de/voice_diag.po b/applications/luci-app-voice-diag/po/de/voice_diag.po
index f60dc08d01..f60dc08d01 100644
--- a/po/de/voice_diag.po
+++ b/applications/luci-app-voice-diag/po/de/voice_diag.po
diff --git a/po/el/voice_diag.po b/applications/luci-app-voice-diag/po/el/voice_diag.po
index 4ff4f86605..4ff4f86605 100644
--- a/po/el/voice_diag.po
+++ b/applications/luci-app-voice-diag/po/el/voice_diag.po
diff --git a/po/en/voice_diag.po b/applications/luci-app-voice-diag/po/en/voice_diag.po
index 12bb4592d8..12bb4592d8 100644
--- a/po/en/voice_diag.po
+++ b/applications/luci-app-voice-diag/po/en/voice_diag.po
diff --git a/po/es/voice_diag.po b/applications/luci-app-voice-diag/po/es/voice_diag.po
index f2f4da27ae..f2f4da27ae 100644
--- a/po/es/voice_diag.po
+++ b/applications/luci-app-voice-diag/po/es/voice_diag.po
diff --git a/po/fr/voice_diag.po b/applications/luci-app-voice-diag/po/fr/voice_diag.po
index c550f06295..c550f06295 100644
--- a/po/fr/voice_diag.po
+++ b/applications/luci-app-voice-diag/po/fr/voice_diag.po
diff --git a/po/he/voice_diag.po b/applications/luci-app-voice-diag/po/he/voice_diag.po
index 3cd1c9f0e3..3cd1c9f0e3 100644
--- a/po/he/voice_diag.po
+++ b/applications/luci-app-voice-diag/po/he/voice_diag.po
diff --git a/po/hu/voice_diag.po b/applications/luci-app-voice-diag/po/hu/voice_diag.po
index 79d237985b..79d237985b 100644
--- a/po/hu/voice_diag.po
+++ b/applications/luci-app-voice-diag/po/hu/voice_diag.po
diff --git a/po/it/voice_diag.po b/applications/luci-app-voice-diag/po/it/voice_diag.po
index 620aedf561..620aedf561 100644
--- a/po/it/voice_diag.po
+++ b/applications/luci-app-voice-diag/po/it/voice_diag.po
diff --git a/po/ja/voice_diag.po b/applications/luci-app-voice-diag/po/ja/voice_diag.po
index 715f4118c6..715f4118c6 100644
--- a/po/ja/voice_diag.po
+++ b/applications/luci-app-voice-diag/po/ja/voice_diag.po
diff --git a/po/ms/voice_diag.po b/applications/luci-app-voice-diag/po/ms/voice_diag.po
index bf65c1459e..bf65c1459e 100644
--- a/po/ms/voice_diag.po
+++ b/applications/luci-app-voice-diag/po/ms/voice_diag.po
diff --git a/po/no/voice_diag.po b/applications/luci-app-voice-diag/po/no/voice_diag.po
index de7aaf2f28..de7aaf2f28 100644
--- a/po/no/voice_diag.po
+++ b/applications/luci-app-voice-diag/po/no/voice_diag.po
diff --git a/po/pl/voice_diag.po b/applications/luci-app-voice-diag/po/pl/voice_diag.po
index cb19e22c85..cb19e22c85 100644
--- a/po/pl/voice_diag.po
+++ b/applications/luci-app-voice-diag/po/pl/voice_diag.po
diff --git a/po/pt_BR/voice_diag.po b/applications/luci-app-voice-diag/po/pt-br/voice_diag.po
index c5d426dfdf..c5d426dfdf 100644
--- a/po/pt_BR/voice_diag.po
+++ b/applications/luci-app-voice-diag/po/pt-br/voice_diag.po
diff --git a/po/pt/voice_diag.po b/applications/luci-app-voice-diag/po/pt/voice_diag.po
index 5162c84369..5162c84369 100644
--- a/po/pt/voice_diag.po
+++ b/applications/luci-app-voice-diag/po/pt/voice_diag.po
diff --git a/po/ro/voice_diag.po b/applications/luci-app-voice-diag/po/ro/voice_diag.po
index e6ee682063..e6ee682063 100644
--- a/po/ro/voice_diag.po
+++ b/applications/luci-app-voice-diag/po/ro/voice_diag.po
diff --git a/po/ru/voice_diag.po b/applications/luci-app-voice-diag/po/ru/voice_diag.po
index 5c98de0157..5c98de0157 100644
--- a/po/ru/voice_diag.po
+++ b/applications/luci-app-voice-diag/po/ru/voice_diag.po
diff --git a/po/sk/voice_diag.po b/applications/luci-app-voice-diag/po/sk/voice_diag.po
index 874e11fc51..874e11fc51 100644
--- a/po/sk/voice_diag.po
+++ b/applications/luci-app-voice-diag/po/sk/voice_diag.po
diff --git a/po/sv/voice_diag.po b/applications/luci-app-voice-diag/po/sv/voice_diag.po
index 5caf949e00..5caf949e00 100644
--- a/po/sv/voice_diag.po
+++ b/applications/luci-app-voice-diag/po/sv/voice_diag.po
diff --git a/applications/luci-app-voice-diag/po/templates/voice_diag.pot b/applications/luci-app-voice-diag/po/templates/voice_diag.pot
new file mode 100644
index 0000000000..ba28b45307
--- /dev/null
+++ b/applications/luci-app-voice-diag/po/templates/voice_diag.pot
@@ -0,0 +1,15 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "Diagnostics"
+msgstr ""
+
+msgid ""
+"The diagnostics available on your device depend on the modules that you have "
+"installed."
+msgstr ""
+
+msgid ""
+"Under this menu are options that allow you to configure and perform tests on "
+"the voice operations of your system. These are known as diagnostics."
+msgstr ""
diff --git a/po/tr/voice_diag.po b/applications/luci-app-voice-diag/po/tr/voice_diag.po
index 715f4118c6..715f4118c6 100644
--- a/po/tr/voice_diag.po
+++ b/applications/luci-app-voice-diag/po/tr/voice_diag.po
diff --git a/po/uk/voice_diag.po b/applications/luci-app-voice-diag/po/uk/voice_diag.po
index 60c55ba6ea..60c55ba6ea 100644
--- a/po/uk/voice_diag.po
+++ b/applications/luci-app-voice-diag/po/uk/voice_diag.po
diff --git a/po/vi/voice_diag.po b/applications/luci-app-voice-diag/po/vi/voice_diag.po
index 715f4118c6..715f4118c6 100644
--- a/po/vi/voice_diag.po
+++ b/applications/luci-app-voice-diag/po/vi/voice_diag.po
diff --git a/po/zh_CN/voice_diag.po b/applications/luci-app-voice-diag/po/zh-cn/voice_diag.po
index 4bad894e37..4bad894e37 100644
--- a/po/zh_CN/voice_diag.po
+++ b/applications/luci-app-voice-diag/po/zh-cn/voice_diag.po
diff --git a/po/zh_TW/voice_diag.po b/applications/luci-app-voice-diag/po/zh-tw/voice_diag.po
index 5207a8b2ca..5207a8b2ca 100644
--- a/po/zh_TW/voice_diag.po
+++ b/applications/luci-app-voice-diag/po/zh-tw/voice_diag.po
diff --git a/applications/luci-app-watchcat/Makefile b/applications/luci-app-watchcat/Makefile
new file mode 100644
index 0000000000..7ad86c84c0
--- /dev/null
+++ b/applications/luci-app-watchcat/Makefile
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=LuCI Support for Watchcat
+LUCI_DEPENDS:=+watchcat
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/applications/luci-watchcat/ipkg/postinst b/applications/luci-app-watchcat/ipkg/postinst
index 99114604ac..99114604ac 100644
--- a/applications/luci-watchcat/ipkg/postinst
+++ b/applications/luci-app-watchcat/ipkg/postinst
diff --git a/applications/luci-watchcat/luasrc/controller/watchcat.lua b/applications/luci-app-watchcat/luasrc/controller/watchcat.lua
index 5eba5cdebb..5eba5cdebb 100644
--- a/applications/luci-watchcat/luasrc/controller/watchcat.lua
+++ b/applications/luci-app-watchcat/luasrc/controller/watchcat.lua
diff --git a/applications/luci-watchcat/luasrc/model/cbi/watchcat/watchcat.lua b/applications/luci-app-watchcat/luasrc/model/cbi/watchcat/watchcat.lua
index fd7038c87b..fd7038c87b 100644
--- a/applications/luci-watchcat/luasrc/model/cbi/watchcat/watchcat.lua
+++ b/applications/luci-app-watchcat/luasrc/model/cbi/watchcat/watchcat.lua
diff --git a/po/ca/watchcat.po b/applications/luci-app-watchcat/po/ca/watchcat.po
index 36e6405451..36e6405451 100644
--- a/po/ca/watchcat.po
+++ b/applications/luci-app-watchcat/po/ca/watchcat.po
diff --git a/po/cs/watchcat.po b/applications/luci-app-watchcat/po/cs/watchcat.po
index 1bfd435b7f..1bfd435b7f 100644
--- a/po/cs/watchcat.po
+++ b/applications/luci-app-watchcat/po/cs/watchcat.po
diff --git a/po/de/watchcat.po b/applications/luci-app-watchcat/po/de/watchcat.po
index 1bbc6d5263..1bbc6d5263 100644
--- a/po/de/watchcat.po
+++ b/applications/luci-app-watchcat/po/de/watchcat.po
diff --git a/po/el/watchcat.po b/applications/luci-app-watchcat/po/el/watchcat.po
index 4aa0c6b639..4aa0c6b639 100644
--- a/po/el/watchcat.po
+++ b/applications/luci-app-watchcat/po/el/watchcat.po
diff --git a/po/en/watchcat.po b/applications/luci-app-watchcat/po/en/watchcat.po
index 0f9099c5a2..0f9099c5a2 100644
--- a/po/en/watchcat.po
+++ b/applications/luci-app-watchcat/po/en/watchcat.po
diff --git a/po/es/watchcat.po b/applications/luci-app-watchcat/po/es/watchcat.po
index c1f58fe3cb..c1f58fe3cb 100644
--- a/po/es/watchcat.po
+++ b/applications/luci-app-watchcat/po/es/watchcat.po
diff --git a/po/fr/watchcat.po b/applications/luci-app-watchcat/po/fr/watchcat.po
index 23af4693c8..23af4693c8 100644
--- a/po/fr/watchcat.po
+++ b/applications/luci-app-watchcat/po/fr/watchcat.po
diff --git a/po/he/watchcat.po b/applications/luci-app-watchcat/po/he/watchcat.po
index 4aa0c6b639..4aa0c6b639 100644
--- a/po/he/watchcat.po
+++ b/applications/luci-app-watchcat/po/he/watchcat.po
diff --git a/po/hu/watchcat.po b/applications/luci-app-watchcat/po/hu/watchcat.po
index 253eb77d85..253eb77d85 100644
--- a/po/hu/watchcat.po
+++ b/applications/luci-app-watchcat/po/hu/watchcat.po
diff --git a/po/it/watchcat.po b/applications/luci-app-watchcat/po/it/watchcat.po
index 0acdd180ef..0acdd180ef 100644
--- a/po/it/watchcat.po
+++ b/applications/luci-app-watchcat/po/it/watchcat.po
diff --git a/po/ja/watchcat.po b/applications/luci-app-watchcat/po/ja/watchcat.po
index 1ae0eb4cc9..1ae0eb4cc9 100644
--- a/po/ja/watchcat.po
+++ b/applications/luci-app-watchcat/po/ja/watchcat.po
diff --git a/po/ms/watchcat.po b/applications/luci-app-watchcat/po/ms/watchcat.po
index 0da283c79d..0da283c79d 100644
--- a/po/ms/watchcat.po
+++ b/applications/luci-app-watchcat/po/ms/watchcat.po
diff --git a/po/no/watchcat.po b/applications/luci-app-watchcat/po/no/watchcat.po
index 4aa0c6b639..4aa0c6b639 100644
--- a/po/no/watchcat.po
+++ b/applications/luci-app-watchcat/po/no/watchcat.po
diff --git a/po/pl/watchcat.po b/applications/luci-app-watchcat/po/pl/watchcat.po
index ebb67eeac4..ebb67eeac4 100644
--- a/po/pl/watchcat.po
+++ b/applications/luci-app-watchcat/po/pl/watchcat.po
diff --git a/po/pt_BR/watchcat.po b/applications/luci-app-watchcat/po/pt-br/watchcat.po
index fe97036379..fe97036379 100644
--- a/po/pt_BR/watchcat.po
+++ b/applications/luci-app-watchcat/po/pt-br/watchcat.po
diff --git a/po/pt/watchcat.po b/applications/luci-app-watchcat/po/pt/watchcat.po
index f939dc9c65..f939dc9c65 100644
--- a/po/pt/watchcat.po
+++ b/applications/luci-app-watchcat/po/pt/watchcat.po
diff --git a/po/ro/watchcat.po b/applications/luci-app-watchcat/po/ro/watchcat.po
index cda0911bb4..cda0911bb4 100644
--- a/po/ro/watchcat.po
+++ b/applications/luci-app-watchcat/po/ro/watchcat.po
diff --git a/po/ru/watchcat.po b/applications/luci-app-watchcat/po/ru/watchcat.po
index 83b95e2015..83b95e2015 100644
--- a/po/ru/watchcat.po
+++ b/applications/luci-app-watchcat/po/ru/watchcat.po
diff --git a/po/sk/watchcat.po b/applications/luci-app-watchcat/po/sk/watchcat.po
index 2ff7de99a1..2ff7de99a1 100644
--- a/po/sk/watchcat.po
+++ b/applications/luci-app-watchcat/po/sk/watchcat.po
diff --git a/po/sv/watchcat.po b/applications/luci-app-watchcat/po/sv/watchcat.po
index dd2365a472..dd2365a472 100644
--- a/po/sv/watchcat.po
+++ b/applications/luci-app-watchcat/po/sv/watchcat.po
diff --git a/applications/luci-app-watchcat/po/templates/watchcat.pot b/applications/luci-app-watchcat/po/templates/watchcat.pot
new file mode 100644
index 0000000000..490ec5c5e3
--- /dev/null
+++ b/applications/luci-app-watchcat/po/templates/watchcat.pot
@@ -0,0 +1,46 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "Forced reboot delay"
+msgstr ""
+
+msgid "Host address to ping"
+msgstr ""
+
+msgid ""
+"How often to check internet connection. Default unit is seconds, you can you "
+"use the suffix 'm' for minutes, 'h' for hours or 'd' for days"
+msgstr ""
+
+msgid ""
+"In periodic mode, it defines the reboot period. In internet mode, it defines "
+"the longest period of time without internet access before a reboot is "
+"engaged.Default unit is seconds, you can use the suffix 'm' for minutes, 'h' "
+"for hours or 'd' for days"
+msgstr ""
+
+msgid "Operating mode"
+msgstr ""
+
+msgid "Period"
+msgstr ""
+
+msgid "Ping host"
+msgstr ""
+
+msgid "Ping period"
+msgstr ""
+
+msgid "Watchcat"
+msgstr ""
+
+msgid ""
+"Watchcat allows configuring a periodic reboot when the Internet connection "
+"has been lost for a certain period of time."
+msgstr ""
+
+msgid ""
+"When rebooting the system, the watchcat will trigger a soft reboot. Entering "
+"a non zero value here will trigger a delayed hard reboot if the soft reboot "
+"fails. Enter a number of seconds to enable, use 0 to disable"
+msgstr ""
diff --git a/po/tr/watchcat.po b/applications/luci-app-watchcat/po/tr/watchcat.po
index 633e7fb7df..633e7fb7df 100644
--- a/po/tr/watchcat.po
+++ b/applications/luci-app-watchcat/po/tr/watchcat.po
diff --git a/po/uk/watchcat.po b/applications/luci-app-watchcat/po/uk/watchcat.po
index a7c2dd8c29..a7c2dd8c29 100644
--- a/po/uk/watchcat.po
+++ b/applications/luci-app-watchcat/po/uk/watchcat.po
diff --git a/po/vi/watchcat.po b/applications/luci-app-watchcat/po/vi/watchcat.po
index 633e7fb7df..633e7fb7df 100644
--- a/po/vi/watchcat.po
+++ b/applications/luci-app-watchcat/po/vi/watchcat.po
diff --git a/po/zh_CN/watchcat.po b/applications/luci-app-watchcat/po/zh-cn/watchcat.po
index 991fc48a23..991fc48a23 100644
--- a/po/zh_CN/watchcat.po
+++ b/applications/luci-app-watchcat/po/zh-cn/watchcat.po
diff --git a/po/zh_TW/watchcat.po b/applications/luci-app-watchcat/po/zh-tw/watchcat.po
index b4e52bbf41..b4e52bbf41 100644
--- a/po/zh_TW/watchcat.po
+++ b/applications/luci-app-watchcat/po/zh-tw/watchcat.po
diff --git a/applications/luci-watchcat/root/etc/uci-defaults/luci-watchcat b/applications/luci-app-watchcat/root/etc/uci-defaults/luci-watchcat
index 8cdb8c7b9f..8cdb8c7b9f 100644
--- a/applications/luci-watchcat/root/etc/uci-defaults/luci-watchcat
+++ b/applications/luci-app-watchcat/root/etc/uci-defaults/luci-watchcat
diff --git a/applications/luci-app-wol/Makefile b/applications/luci-app-wol/Makefile
new file mode 100644
index 0000000000..d935ee9030
--- /dev/null
+++ b/applications/luci-app-wol/Makefile
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=LuCI Support for Wake-on-LAN
+LUCI_DEPENDS:=+etherwake
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/applications/luci-wol/luasrc/controller/wol.lua b/applications/luci-app-wol/luasrc/controller/wol.lua
index 73a9594b2a..73a9594b2a 100644
--- a/applications/luci-wol/luasrc/controller/wol.lua
+++ b/applications/luci-app-wol/luasrc/controller/wol.lua
diff --git a/applications/luci-wol/luasrc/model/cbi/wol.lua b/applications/luci-app-wol/luasrc/model/cbi/wol.lua
index ece9e4983a..ece9e4983a 100644
--- a/applications/luci-wol/luasrc/model/cbi/wol.lua
+++ b/applications/luci-app-wol/luasrc/model/cbi/wol.lua
diff --git a/po/ca/wol.po b/applications/luci-app-wol/po/ca/wol.po
index 42f7cf75ac..42f7cf75ac 100644
--- a/po/ca/wol.po
+++ b/applications/luci-app-wol/po/ca/wol.po
diff --git a/po/cs/wol.po b/applications/luci-app-wol/po/cs/wol.po
index 6ee7f67b89..6ee7f67b89 100644
--- a/po/cs/wol.po
+++ b/applications/luci-app-wol/po/cs/wol.po
diff --git a/po/de/wol.po b/applications/luci-app-wol/po/de/wol.po
index 21ebc8f2a0..21ebc8f2a0 100644
--- a/po/de/wol.po
+++ b/applications/luci-app-wol/po/de/wol.po
diff --git a/po/el/wol.po b/applications/luci-app-wol/po/el/wol.po
index cb7c3b9712..cb7c3b9712 100644
--- a/po/el/wol.po
+++ b/applications/luci-app-wol/po/el/wol.po
diff --git a/po/en/wol.po b/applications/luci-app-wol/po/en/wol.po
index 48c7302a34..48c7302a34 100644
--- a/po/en/wol.po
+++ b/applications/luci-app-wol/po/en/wol.po
diff --git a/po/es/wol.po b/applications/luci-app-wol/po/es/wol.po
index f5bcf6bf49..f5bcf6bf49 100644
--- a/po/es/wol.po
+++ b/applications/luci-app-wol/po/es/wol.po
diff --git a/po/fr/wol.po b/applications/luci-app-wol/po/fr/wol.po
index 0bed86d8fc..0bed86d8fc 100644
--- a/po/fr/wol.po
+++ b/applications/luci-app-wol/po/fr/wol.po
diff --git a/po/he/wol.po b/applications/luci-app-wol/po/he/wol.po
index cb7c3b9712..cb7c3b9712 100644
--- a/po/he/wol.po
+++ b/applications/luci-app-wol/po/he/wol.po
diff --git a/po/hu/wol.po b/applications/luci-app-wol/po/hu/wol.po
index f47191cba8..f47191cba8 100644
--- a/po/hu/wol.po
+++ b/applications/luci-app-wol/po/hu/wol.po
diff --git a/po/it/wol.po b/applications/luci-app-wol/po/it/wol.po
index 63ac0d8dc1..63ac0d8dc1 100644
--- a/po/it/wol.po
+++ b/applications/luci-app-wol/po/it/wol.po
diff --git a/po/ja/wol.po b/applications/luci-app-wol/po/ja/wol.po
index c18b831937..c18b831937 100644
--- a/po/ja/wol.po
+++ b/applications/luci-app-wol/po/ja/wol.po
diff --git a/po/ms/wol.po b/applications/luci-app-wol/po/ms/wol.po
index 74380f27bb..74380f27bb 100644
--- a/po/ms/wol.po
+++ b/applications/luci-app-wol/po/ms/wol.po
diff --git a/po/no/wol.po b/applications/luci-app-wol/po/no/wol.po
index 2f0a8ad638..2f0a8ad638 100644
--- a/po/no/wol.po
+++ b/applications/luci-app-wol/po/no/wol.po
diff --git a/po/pl/wol.po b/applications/luci-app-wol/po/pl/wol.po
index c599b9ec3a..c599b9ec3a 100644
--- a/po/pl/wol.po
+++ b/applications/luci-app-wol/po/pl/wol.po
diff --git a/po/pt_BR/wol.po b/applications/luci-app-wol/po/pt-br/wol.po
index 6a21a855b6..6a21a855b6 100644
--- a/po/pt_BR/wol.po
+++ b/applications/luci-app-wol/po/pt-br/wol.po
diff --git a/po/pt/wol.po b/applications/luci-app-wol/po/pt/wol.po
index 540e543690..540e543690 100644
--- a/po/pt/wol.po
+++ b/applications/luci-app-wol/po/pt/wol.po
diff --git a/po/ro/wol.po b/applications/luci-app-wol/po/ro/wol.po
index 154a3f9fba..154a3f9fba 100644
--- a/po/ro/wol.po
+++ b/applications/luci-app-wol/po/ro/wol.po
diff --git a/po/ru/wol.po b/applications/luci-app-wol/po/ru/wol.po
index 9a84366010..9a84366010 100644
--- a/po/ru/wol.po
+++ b/applications/luci-app-wol/po/ru/wol.po
diff --git a/po/sk/wol.po b/applications/luci-app-wol/po/sk/wol.po
index eea59ebc3d..eea59ebc3d 100644
--- a/po/sk/wol.po
+++ b/applications/luci-app-wol/po/sk/wol.po
diff --git a/po/sv/wol.po b/applications/luci-app-wol/po/sv/wol.po
index 44b59958d9..44b59958d9 100644
--- a/po/sv/wol.po
+++ b/applications/luci-app-wol/po/sv/wol.po
diff --git a/applications/luci-app-wol/po/templates/wol.pot b/applications/luci-app-wol/po/templates/wol.pot
new file mode 100644
index 0000000000..1305c53889
--- /dev/null
+++ b/applications/luci-app-wol/po/templates/wol.pot
@@ -0,0 +1,37 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "Broadcast on all interfaces"
+msgstr ""
+
+msgid "Choose the host to wake up or enter a custom MAC address to use"
+msgstr ""
+
+msgid "Host to wake up"
+msgstr ""
+
+msgid "Network interface to use"
+msgstr ""
+
+msgid ""
+"Sometimes only one of the two tools works. If one fails, try the other one"
+msgstr ""
+
+msgid "Specifies the interface the WoL packet is sent on"
+msgstr ""
+
+msgid "Starting WoL utility:"
+msgstr ""
+
+msgid "Wake on LAN"
+msgstr ""
+
+msgid ""
+"Wake on LAN is a mechanism to remotely boot computers in the local network."
+msgstr ""
+
+msgid "Wake up host"
+msgstr ""
+
+msgid "WoL program"
+msgstr ""
diff --git a/po/tr/wol.po b/applications/luci-app-wol/po/tr/wol.po
index 9be6934cf1..9be6934cf1 100644
--- a/po/tr/wol.po
+++ b/applications/luci-app-wol/po/tr/wol.po
diff --git a/po/uk/wol.po b/applications/luci-app-wol/po/uk/wol.po
index c09d144b36..c09d144b36 100644
--- a/po/uk/wol.po
+++ b/applications/luci-app-wol/po/uk/wol.po
diff --git a/po/vi/wol.po b/applications/luci-app-wol/po/vi/wol.po
index 9be6934cf1..9be6934cf1 100644
--- a/po/vi/wol.po
+++ b/applications/luci-app-wol/po/vi/wol.po
diff --git a/po/zh_CN/wol.po b/applications/luci-app-wol/po/zh-cn/wol.po
index 6d9cc7227e..6d9cc7227e 100644
--- a/po/zh_CN/wol.po
+++ b/applications/luci-app-wol/po/zh-cn/wol.po
diff --git a/po/zh_TW/wol.po b/applications/luci-app-wol/po/zh-tw/wol.po
index ee290ec2ed..ee290ec2ed 100644
--- a/po/zh_TW/wol.po
+++ b/applications/luci-app-wol/po/zh-tw/wol.po
diff --git a/applications/luci-app-wshaper/Makefile b/applications/luci-app-wshaper/Makefile
new file mode 100644
index 0000000000..63e63aba28
--- /dev/null
+++ b/applications/luci-app-wshaper/Makefile
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=LuCI Support for wshaper
+LUCI_DEPENDS:=+wshaper
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/applications/luci-wshaper/ipkg/postinst b/applications/luci-app-wshaper/ipkg/postinst
index dad884259d..dad884259d 100644
--- a/applications/luci-wshaper/ipkg/postinst
+++ b/applications/luci-app-wshaper/ipkg/postinst
diff --git a/applications/luci-wshaper/luasrc/controller/wshaper.lua b/applications/luci-app-wshaper/luasrc/controller/wshaper.lua
index 9d7f01e9d5..9d7f01e9d5 100644
--- a/applications/luci-wshaper/luasrc/controller/wshaper.lua
+++ b/applications/luci-app-wshaper/luasrc/controller/wshaper.lua
diff --git a/applications/luci-wshaper/luasrc/model/cbi/wshaper.lua b/applications/luci-app-wshaper/luasrc/model/cbi/wshaper.lua
index faa64f66df..faa64f66df 100644
--- a/applications/luci-wshaper/luasrc/model/cbi/wshaper.lua
+++ b/applications/luci-app-wshaper/luasrc/model/cbi/wshaper.lua
diff --git a/po/ca/wshaper.po b/applications/luci-app-wshaper/po/ca/wshaper.po
index 2560383329..2560383329 100644
--- a/po/ca/wshaper.po
+++ b/applications/luci-app-wshaper/po/ca/wshaper.po
diff --git a/po/cs/wshaper.po b/applications/luci-app-wshaper/po/cs/wshaper.po
index bca6c4e579..bca6c4e579 100644
--- a/po/cs/wshaper.po
+++ b/applications/luci-app-wshaper/po/cs/wshaper.po
diff --git a/po/de/wshaper.po b/applications/luci-app-wshaper/po/de/wshaper.po
index 39dd61771a..39dd61771a 100644
--- a/po/de/wshaper.po
+++ b/applications/luci-app-wshaper/po/de/wshaper.po
diff --git a/po/el/wshaper.po b/applications/luci-app-wshaper/po/el/wshaper.po
index 6d2f092846..6d2f092846 100644
--- a/po/el/wshaper.po
+++ b/applications/luci-app-wshaper/po/el/wshaper.po
diff --git a/po/en/wshaper.po b/applications/luci-app-wshaper/po/en/wshaper.po
index d646e764cf..d646e764cf 100644
--- a/po/en/wshaper.po
+++ b/applications/luci-app-wshaper/po/en/wshaper.po
diff --git a/po/es/wshaper.po b/applications/luci-app-wshaper/po/es/wshaper.po
index f562760d5c..f562760d5c 100644
--- a/po/es/wshaper.po
+++ b/applications/luci-app-wshaper/po/es/wshaper.po
diff --git a/po/fr/wshaper.po b/applications/luci-app-wshaper/po/fr/wshaper.po
index ad334c0a78..ad334c0a78 100644
--- a/po/fr/wshaper.po
+++ b/applications/luci-app-wshaper/po/fr/wshaper.po
diff --git a/po/he/wshaper.po b/applications/luci-app-wshaper/po/he/wshaper.po
index d646e764cf..d646e764cf 100644
--- a/po/he/wshaper.po
+++ b/applications/luci-app-wshaper/po/he/wshaper.po
diff --git a/po/hu/wshaper.po b/applications/luci-app-wshaper/po/hu/wshaper.po
index 2377fa543c..2377fa543c 100644
--- a/po/hu/wshaper.po
+++ b/applications/luci-app-wshaper/po/hu/wshaper.po
diff --git a/po/it/wshaper.po b/applications/luci-app-wshaper/po/it/wshaper.po
index 6a72c7e5de..6a72c7e5de 100644
--- a/po/it/wshaper.po
+++ b/applications/luci-app-wshaper/po/it/wshaper.po
diff --git a/po/ja/wshaper.po b/applications/luci-app-wshaper/po/ja/wshaper.po
index d58476cf3e..d58476cf3e 100644
--- a/po/ja/wshaper.po
+++ b/applications/luci-app-wshaper/po/ja/wshaper.po
diff --git a/po/ms/wshaper.po b/applications/luci-app-wshaper/po/ms/wshaper.po
index d646e764cf..d646e764cf 100644
--- a/po/ms/wshaper.po
+++ b/applications/luci-app-wshaper/po/ms/wshaper.po
diff --git a/po/no/wshaper.po b/applications/luci-app-wshaper/po/no/wshaper.po
index d646e764cf..d646e764cf 100644
--- a/po/no/wshaper.po
+++ b/applications/luci-app-wshaper/po/no/wshaper.po
diff --git a/po/pl/wshaper.po b/applications/luci-app-wshaper/po/pl/wshaper.po
index a85bf00449..a85bf00449 100644
--- a/po/pl/wshaper.po
+++ b/applications/luci-app-wshaper/po/pl/wshaper.po
diff --git a/po/pt_BR/wshaper.po b/applications/luci-app-wshaper/po/pt-br/wshaper.po
index f973ebb5cd..f973ebb5cd 100644
--- a/po/pt_BR/wshaper.po
+++ b/applications/luci-app-wshaper/po/pt-br/wshaper.po
diff --git a/po/pt/wshaper.po b/applications/luci-app-wshaper/po/pt/wshaper.po
index 96a7be8165..96a7be8165 100644
--- a/po/pt/wshaper.po
+++ b/applications/luci-app-wshaper/po/pt/wshaper.po
diff --git a/po/ro/wshaper.po b/applications/luci-app-wshaper/po/ro/wshaper.po
index d2569f6d23..d2569f6d23 100644
--- a/po/ro/wshaper.po
+++ b/applications/luci-app-wshaper/po/ro/wshaper.po
diff --git a/po/ru/wshaper.po b/applications/luci-app-wshaper/po/ru/wshaper.po
index 1984aacb62..1984aacb62 100644
--- a/po/ru/wshaper.po
+++ b/applications/luci-app-wshaper/po/ru/wshaper.po
diff --git a/po/sk/wshaper.po b/applications/luci-app-wshaper/po/sk/wshaper.po
index 4e03aa8f8a..4e03aa8f8a 100644
--- a/po/sk/wshaper.po
+++ b/applications/luci-app-wshaper/po/sk/wshaper.po
diff --git a/po/sv/wshaper.po b/applications/luci-app-wshaper/po/sv/wshaper.po
index b85651a619..b85651a619 100644
--- a/po/sv/wshaper.po
+++ b/applications/luci-app-wshaper/po/sv/wshaper.po
diff --git a/applications/luci-app-wshaper/po/templates/wshaper.pot b/applications/luci-app-wshaper/po/templates/wshaper.pot
new file mode 100644
index 0000000000..42de011b30
--- /dev/null
+++ b/applications/luci-app-wshaper/po/templates/wshaper.pot
@@ -0,0 +1,43 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "Downlink"
+msgstr ""
+
+msgid "Downstream bandwidth in kbit/s"
+msgstr ""
+
+msgid "Host or Network in CIDR notation."
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid "Low priority destination ports"
+msgstr ""
+
+msgid "Low priority hosts (Destination)"
+msgstr ""
+
+msgid "Low priority hosts (Source)"
+msgstr ""
+
+msgid "Low priority source ports"
+msgstr ""
+
+msgid "Uplink"
+msgstr ""
+
+msgid "Upstream bandwidth in kbit/s"
+msgstr ""
+
+msgid "Wondershaper"
+msgstr ""
+
+msgid "Wondershaper settings"
+msgstr ""
+
+msgid ""
+"Wondershaper shapes traffic to ensure low latencies for interactive traffic "
+"even when your internet connection is highly saturated."
+msgstr ""
diff --git a/po/tr/wshaper.po b/applications/luci-app-wshaper/po/tr/wshaper.po
index 7c0acb06d1..7c0acb06d1 100644
--- a/po/tr/wshaper.po
+++ b/applications/luci-app-wshaper/po/tr/wshaper.po
diff --git a/po/uk/wshaper.po b/applications/luci-app-wshaper/po/uk/wshaper.po
index 94d20df992..94d20df992 100644
--- a/po/uk/wshaper.po
+++ b/applications/luci-app-wshaper/po/uk/wshaper.po
diff --git a/po/vi/wshaper.po b/applications/luci-app-wshaper/po/vi/wshaper.po
index d646e764cf..d646e764cf 100644
--- a/po/vi/wshaper.po
+++ b/applications/luci-app-wshaper/po/vi/wshaper.po
diff --git a/po/zh_CN/wshaper.po b/applications/luci-app-wshaper/po/zh-cn/wshaper.po
index a35ccd02d0..a35ccd02d0 100644
--- a/po/zh_CN/wshaper.po
+++ b/applications/luci-app-wshaper/po/zh-cn/wshaper.po
diff --git a/po/zh_TW/wshaper.po b/applications/luci-app-wshaper/po/zh-tw/wshaper.po
index 18148259f0..18148259f0 100644
--- a/po/zh_TW/wshaper.po
+++ b/applications/luci-app-wshaper/po/zh-tw/wshaper.po
diff --git a/applications/luci-wshaper/root/etc/uci-defaults/wshaper b/applications/luci-app-wshaper/root/etc/uci-defaults/wshaper
index 918dff2801..918dff2801 100644
--- a/applications/luci-wshaper/root/etc/uci-defaults/wshaper
+++ b/applications/luci-app-wshaper/root/etc/uci-defaults/wshaper
diff --git a/applications/luci-asterisk/Makefile b/applications/luci-asterisk/Makefile
deleted file mode 100644
index 1b8cf53cd2..0000000000
--- a/applications/luci-asterisk/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-PO = asterisk
-
-include ../../build/config.mk
-include ../../build/module.mk
diff --git a/applications/luci-commands/Makefile b/applications/luci-commands/Makefile
deleted file mode 100644
index 64801c2b27..0000000000
--- a/applications/luci-commands/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-PO = commands
-
-include ../../build/config.mk
-include ../../build/module.mk
diff --git a/applications/luci-coovachilli/Makefile b/applications/luci-coovachilli/Makefile
deleted file mode 100644
index a98ccb8473..0000000000
--- a/applications/luci-coovachilli/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-PO = coovachilli
-
-include ../../build/config.mk
-include ../../build/module.mk
diff --git a/applications/luci-ddns/Makefile b/applications/luci-ddns/Makefile
deleted file mode 100644
index 3f57d63c69..0000000000
--- a/applications/luci-ddns/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-PO = ddns
-
-include ../../build/config.mk
-include ../../build/module.mk
diff --git a/applications/luci-ddns/ipkg/postinst-pkg b/applications/luci-ddns/ipkg/postinst-pkg
deleted file mode 100644
index a2c13fa34c..0000000000
--- a/applications/luci-ddns/ipkg/postinst-pkg
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-[ -n "${IPKG_INSTROOT}" ] || {
-	( . /etc/uci-defaults/luci-ddns ) && rm -f /etc/uci-defaults/luci-ddns
-	exit 0
-}
diff --git a/applications/luci-diag-core/Makefile b/applications/luci-diag-core/Makefile
deleted file mode 100644
index 15518749d5..0000000000
--- a/applications/luci-diag-core/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-PO = diag_core
-
-include ../../build/config.mk
-include ../../build/module.mk
diff --git a/applications/luci-diag-devinfo/Makefile b/applications/luci-diag-devinfo/Makefile
deleted file mode 100644
index 3844248ed6..0000000000
--- a/applications/luci-diag-devinfo/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-PO=diag_devinfo
-
-include ../../build/config.mk
-include ../../build/module.mk
diff --git a/applications/luci-dump1090/Makefile b/applications/luci-dump1090/Makefile
deleted file mode 100644
index be4c0ea87d..0000000000
--- a/applications/luci-dump1090/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-PO = dump1090
-
-include ../../build/config.mk
-include ../../build/module.mk
diff --git a/applications/luci-firewall/Makefile b/applications/luci-firewall/Makefile
deleted file mode 100644
index df755bfb0c..0000000000
--- a/applications/luci-firewall/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-PO = firewall
-
-include ../../build/config.mk
-include ../../build/module.mk
diff --git a/applications/luci-freifunk-diagnostics/Makefile b/applications/luci-freifunk-diagnostics/Makefile
deleted file mode 100644
index f7fac7740e..0000000000
--- a/applications/luci-freifunk-diagnostics/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-include ../../build/config.mk
-include ../../build/module.mk
diff --git a/applications/luci-freifunk-policyrouting/Makefile b/applications/luci-freifunk-policyrouting/Makefile
deleted file mode 100644
index 3efa329b7e..0000000000
--- a/applications/luci-freifunk-policyrouting/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-PO = freifunk-policyrouting
-
-include ../../build/config.mk
-include ../../build/module.mk
diff --git a/applications/luci-freifunk-widgets/Makefile b/applications/luci-freifunk-widgets/Makefile
deleted file mode 100644
index a386a32028..0000000000
--- a/applications/luci-freifunk-widgets/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-PO = freifunk-widgets
-
-include ../../build/config.mk
-include ../../build/module.mk
diff --git a/applications/luci-hd-idle/Makefile b/applications/luci-hd-idle/Makefile
deleted file mode 100644
index d70bb8789c..0000000000
--- a/applications/luci-hd-idle/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-PO = hd_idle
-
-include ../../build/config.mk
-include ../../build/module.mk
diff --git a/applications/luci-ltqtapi/Makefile b/applications/luci-ltqtapi/Makefile
deleted file mode 100644
index 77925c4e33..0000000000
--- a/applications/luci-ltqtapi/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-PO = telephony
-
-include ../../build/config.mk
-include ../../build/module.mk
diff --git a/applications/luci-meshwizard/Makefile b/applications/luci-meshwizard/Makefile
deleted file mode 100644
index 6d60a52016..0000000000
--- a/applications/luci-meshwizard/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-PO = meshwizard
-
-include ../../build/config.mk
-include ../../build/module.mk
diff --git a/applications/luci-minidlna/Makefile b/applications/luci-minidlna/Makefile
deleted file mode 100644
index b4d05955e2..0000000000
--- a/applications/luci-minidlna/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-PO = minidlna
-
-include ../../build/config.mk
-include ../../build/module.mk
diff --git a/applications/luci-mjpg-streamer/Makefile b/applications/luci-mjpg-streamer/Makefile
deleted file mode 100644
index 1726202af2..0000000000
--- a/applications/luci-mjpg-streamer/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-PO = mjpg-streamer
-
-include ../../build/config.mk
-include ../../build/module.mk
diff --git a/applications/luci-mmc-over-gpio/Makefile b/applications/luci-mmc-over-gpio/Makefile
deleted file mode 100644
index 3f031cb713..0000000000
--- a/applications/luci-mmc-over-gpio/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-PO = mmc_over_gpio
-
-include ../../build/config.mk
-include ../../build/module.mk
diff --git a/applications/luci-multiwan/Makefile b/applications/luci-multiwan/Makefile
deleted file mode 100644
index cab4e304c3..0000000000
--- a/applications/luci-multiwan/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-PO = multiwan
-
-include ../../build/config.mk
-include ../../build/module.mk
diff --git a/applications/luci-ntpc/Makefile b/applications/luci-ntpc/Makefile
deleted file mode 100644
index 392e8fed10..0000000000
--- a/applications/luci-ntpc/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-PO = ntpc
-
-include ../../build/config.mk
-include ../../build/module.mk
diff --git a/applications/luci-ocserv/Makefile b/applications/luci-ocserv/Makefile
deleted file mode 100644
index 74cd597d68..0000000000
--- a/applications/luci-ocserv/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-PO = ocserv
-
-include ../../build/config.mk
-include ../../build/module.mk
diff --git a/applications/luci-olsr-services/Makefile b/applications/luci-olsr-services/Makefile
deleted file mode 100644
index 572afba3c3..0000000000
--- a/applications/luci-olsr-services/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-PO =
-
-include ../../build/config.mk
-include ../../build/module.mk
diff --git a/applications/luci-olsr-viz/Makefile b/applications/luci-olsr-viz/Makefile
deleted file mode 100644
index a4f7c76ef9..0000000000
--- a/applications/luci-olsr-viz/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-PO = 
-
-include ../../build/config.mk
-include ../../build/module.mk
diff --git a/applications/luci-olsr/Makefile b/applications/luci-olsr/Makefile
deleted file mode 100644
index 119cffc919..0000000000
--- a/applications/luci-olsr/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-PO = olsr
-
-include ../../build/config.mk
-include ../../build/module.mk
diff --git a/applications/luci-openvpn/Makefile b/applications/luci-openvpn/Makefile
deleted file mode 100644
index f394a81725..0000000000
--- a/applications/luci-openvpn/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-PO = openvpn
-
-include ../../build/config.mk
-include ../../build/module.mk
diff --git a/applications/luci-p2pblock/Makefile b/applications/luci-p2pblock/Makefile
deleted file mode 100644
index 07ce232f88..0000000000
--- a/applications/luci-p2pblock/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-PO = p2pblock
-
-include ../../build/config.mk
-include ../../build/module.mk
diff --git a/applications/luci-p910nd/Makefile b/applications/luci-p910nd/Makefile
deleted file mode 100644
index 30073fbd59..0000000000
--- a/applications/luci-p910nd/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-PO = p910nd
-
-include ../../build/config.mk
-include ../../build/module.mk
diff --git a/applications/luci-pbx-voicemail/Makefile b/applications/luci-pbx-voicemail/Makefile
deleted file mode 100644
index 19c69a1497..0000000000
--- a/applications/luci-pbx-voicemail/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-PO = pbx-voicemail
-
-include ../../build/config.mk
-include ../../build/module.mk
diff --git a/applications/luci-pbx/Makefile b/applications/luci-pbx/Makefile
deleted file mode 100644
index 9a720f0d2a..0000000000
--- a/applications/luci-pbx/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-PO = pbx
-
-include ../../build/config.mk
-include ../../build/module.mk
diff --git a/applications/luci-polipo/Makefile b/applications/luci-polipo/Makefile
deleted file mode 100644
index 4f5743f443..0000000000
--- a/applications/luci-polipo/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-PO = polipo
-
-include ../../build/config.mk
-include ../../build/module.mk
diff --git a/applications/luci-qos/Makefile b/applications/luci-qos/Makefile
deleted file mode 100644
index ef79869a30..0000000000
--- a/applications/luci-qos/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-PO = qos
-
-include ../../build/config.mk
-include ../../build/module.mk
diff --git a/applications/luci-radvd/Makefile b/applications/luci-radvd/Makefile
deleted file mode 100644
index 68c6b99c48..0000000000
--- a/applications/luci-radvd/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-PO = radvd
-
-include ../../build/config.mk
-include ../../build/module.mk
diff --git a/applications/luci-samba/Makefile b/applications/luci-samba/Makefile
deleted file mode 100644
index e91079bb0a..0000000000
--- a/applications/luci-samba/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-PO = samba
-
-include ../../build/config.mk
-include ../../build/module.mk
diff --git a/applications/luci-shairplay/Makefile b/applications/luci-shairplay/Makefile
deleted file mode 100644
index b6c2db4a5b..0000000000
--- a/applications/luci-shairplay/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-PO = shairplay
-
-include ../../build/config.mk
-include ../../build/module.mk
diff --git a/applications/luci-shairport/Makefile b/applications/luci-shairport/Makefile
deleted file mode 100644
index 4c827554c4..0000000000
--- a/applications/luci-shairport/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-PO = shairport
-
-include ../../build/config.mk
-include ../../build/module.mk
diff --git a/applications/luci-siitwizard/Makefile b/applications/luci-siitwizard/Makefile
deleted file mode 100644
index a4f7c76ef9..0000000000
--- a/applications/luci-siitwizard/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-PO = 
-
-include ../../build/config.mk
-include ../../build/module.mk
diff --git a/applications/luci-splash/Makefile b/applications/luci-splash/Makefile
deleted file mode 100644
index 6e625c0e57..0000000000
--- a/applications/luci-splash/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-PO = splash
-
-include ../../build/config.mk
-include ../../build/module.mk
diff --git a/applications/luci-statistics/Makefile b/applications/luci-statistics/Makefile
deleted file mode 100644
index ff3d67021c..0000000000
--- a/applications/luci-statistics/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-PO = statistics rrdtool
-
-include ../../build/config.mk
-include ../../build/module.mk
diff --git a/applications/luci-tinyproxy/Makefile b/applications/luci-tinyproxy/Makefile
deleted file mode 100644
index 0123c164b0..0000000000
--- a/applications/luci-tinyproxy/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-PO = tinyproxy
-
-include ../../build/config.mk
-include ../../build/module.mk
diff --git a/applications/luci-transmission/Makefile b/applications/luci-transmission/Makefile
deleted file mode 100644
index a30d474b8d..0000000000
--- a/applications/luci-transmission/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-PO = transmission
-
-include ../../build/config.mk
-include ../../build/module.mk
diff --git a/applications/luci-udpxy/Makefile b/applications/luci-udpxy/Makefile
deleted file mode 100644
index 05228b169d..0000000000
--- a/applications/luci-udpxy/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-PO = udpxy
-
-include ../../build/config.mk
-include ../../build/module.mk
diff --git a/applications/luci-upnp/Makefile b/applications/luci-upnp/Makefile
deleted file mode 100644
index 2f850c618e..0000000000
--- a/applications/luci-upnp/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-PO = upnp
-
-include ../../build/config.mk
-include ../../build/module.mk
diff --git a/applications/luci-ushare/Makefile b/applications/luci-ushare/Makefile
deleted file mode 100644
index 9b0a6e4abd..0000000000
--- a/applications/luci-ushare/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-PO = ushare
-
-include ../../build/config.mk
-include ../../build/module.mk
diff --git a/applications/luci-vnstat/Makefile b/applications/luci-vnstat/Makefile
deleted file mode 100644
index 0d76c05e17..0000000000
--- a/applications/luci-vnstat/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-PO = vnstat
-
-include ../../build/config.mk
-include ../../build/module.mk
diff --git a/applications/luci-voice-core/Makefile b/applications/luci-voice-core/Makefile
deleted file mode 100644
index d57c456d56..0000000000
--- a/applications/luci-voice-core/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-PO=voice_core
-
-include ../../build/config.mk
-include ../../build/module.mk
diff --git a/applications/luci-voice-diag/Makefile b/applications/luci-voice-diag/Makefile
deleted file mode 100644
index b764ed43a7..0000000000
--- a/applications/luci-voice-diag/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-PO=voice_diag
-
-include ../../build/config.mk
-include ../../build/module.mk
diff --git a/applications/luci-watchcat/Makefile b/applications/luci-watchcat/Makefile
deleted file mode 100644
index 2cb156c0bc..0000000000
--- a/applications/luci-watchcat/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-PO=watchcat
-include ../../build/config.mk
-include ../../build/module.mk
diff --git a/applications/luci-wol/Makefile b/applications/luci-wol/Makefile
deleted file mode 100644
index 7c4a85b985..0000000000
--- a/applications/luci-wol/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-PO = wol
-
-include ../../build/config.mk
-include ../../build/module.mk
diff --git a/applications/luci-wshaper/Makefile b/applications/luci-wshaper/Makefile
deleted file mode 100644
index fcdd099fae..0000000000
--- a/applications/luci-wshaper/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-PO = wshaper
-
-include ../../build/config.mk
-include ../../build/module.mk
diff --git a/applications/myapplication/Makefile b/applications/myapplication/Makefile
deleted file mode 100644
index 81a96f6a83..0000000000
--- a/applications/myapplication/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-include ../../build/config.mk
-include ../../build/module.mk
\ No newline at end of file
diff --git a/collections/luci-light/Makefile b/collections/luci-light/Makefile
new file mode 100644
index 0000000000..9eee97bf9b
--- /dev/null
+++ b/collections/luci-light/Makefile
@@ -0,0 +1,17 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TYPE:=col
+LUCI_BASENAME:=light
+
+LUCI_TITLE:=Minimum package set using only admin mini and the standard theme
+LUCI_DEPENDS:=+uhttpd +luci-mod-admin-mini +luci-theme-openwrt @BROKEN
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/collections/luci-ssl/Makefile b/collections/luci-ssl/Makefile
new file mode 100644
index 0000000000..07c9c50680
--- /dev/null
+++ b/collections/luci-ssl/Makefile
@@ -0,0 +1,17 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TYPE:=col
+LUCI_BASENAME:=ssl
+
+LUCI_TITLE:=Standard OpenWrt set with HTTPS support
+LUCI_DEPENDS:=+luci +libustream-polarssl +px5g
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/collections/luci/Makefile b/collections/luci/Makefile
new file mode 100644
index 0000000000..dff5be67fa
--- /dev/null
+++ b/collections/luci/Makefile
@@ -0,0 +1,19 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TYPE:=col
+LUCI_BASENAME:=luci
+
+LUCI_TITLE:=Standard OpenWrt set including full admin with ppp support and the default Bootstrap theme
+LUCI_DEPENDS:= \
+	+uhttpd +uhttpd-mod-ubus +luci-mod-admin-full +luci-theme-bootstrap \
+	+luci-app-firewall +luci-proto-ppp +libiwinfo-lua +luci-lib-nixio
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/libs/httpclient/Makefile b/libs/httpclient/Makefile
deleted file mode 100644
index f7fac7740e..0000000000
--- a/libs/httpclient/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-include ../../build/config.mk
-include ../../build/module.mk
diff --git a/libs/json/Makefile b/libs/json/Makefile
deleted file mode 100644
index f7fac7740e..0000000000
--- a/libs/json/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-include ../../build/config.mk
-include ../../build/module.mk
diff --git a/libs/luaneightbl/Makefile b/libs/luaneightbl/Makefile
deleted file mode 100644
index dc2db6740f..0000000000
--- a/libs/luaneightbl/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-ifneq (,$(wildcard ../../build/config.mk))
-include ../../build/config.mk
-include ../../build/module.mk
-include ../../build/gccconfig.mk
-else
-include standalone.mk
-endif
-
-NEIGHTBL_CFLAGS = $(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) $(WFLAGS)
-
-NEIGHTBL_OBJ = src/neightbl.o
-NEIGHTBL_LIB = src/neightbl.so
-
-%.o: %.c
-	$(CC) $(NEIGHTBL_CFLAGS) $(LUA_CFLAGS) $(FPIC) -c -o $@ $<
-
-compile: $(NEIGHTBL_OBJ)
-	$(LINK) $(SHLIB_FLAGS) -o $(NEIGHTBL_LIB) $(NEIGHTBL_OBJ)
-	mkdir -p dist$(LUA_LIBRARYDIR)
-	cp $(NEIGHTBL_LIB) dist$(LUA_LIBRARYDIR)/
-
-clean: luaclean
-	rm -f src/*.o src/*.so src/*.a src/*.dll
-
diff --git a/libs/luci-lib-httpclient/Makefile b/libs/luci-lib-httpclient/Makefile
new file mode 100644
index 0000000000..1e7fd1bc85
--- /dev/null
+++ b/libs/luci-lib-httpclient/Makefile
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=HTTP(S) client library
+LUCI_DEPENDS:=+luci-base +luci-lib-nixio
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/libs/httpclient/luasrc/httpclient.lua b/libs/luci-lib-httpclient/luasrc/httpclient.lua
index e9fec5dbbb..e9fec5dbbb 100644
--- a/libs/httpclient/luasrc/httpclient.lua
+++ b/libs/luci-lib-httpclient/luasrc/httpclient.lua
diff --git a/libs/httpclient/luasrc/httpclient/receiver.lua b/libs/luci-lib-httpclient/luasrc/httpclient/receiver.lua
index 4f08e93fe0..4f08e93fe0 100644
--- a/libs/httpclient/luasrc/httpclient/receiver.lua
+++ b/libs/luci-lib-httpclient/luasrc/httpclient/receiver.lua
diff --git a/libs/luci-lib-json/Makefile b/libs/luci-lib-json/Makefile
new file mode 100644
index 0000000000..069886d5c3
--- /dev/null
+++ b/libs/luci-lib-json/Makefile
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=LuCI JSON library
+LUCI_DEPENDS:=
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/libs/json/luasrc/json.lua b/libs/luci-lib-json/luasrc/json.lua
index 8dbaf91836..8dbaf91836 100644
--- a/libs/json/luasrc/json.lua
+++ b/libs/luci-lib-json/luasrc/json.lua
diff --git a/libs/luci-lib-luaneightbl/Makefile b/libs/luci-lib-luaneightbl/Makefile
new file mode 100644
index 0000000000..d9ab98079c
--- /dev/null
+++ b/libs/luci-lib-luaneightbl/Makefile
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=neightbl - Lua lib for IPv6 neighbors
+LUCI_DEPENDS:=+luci-base
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/libs/luaneightbl/src/neightbl.c b/libs/luci-lib-luaneightbl/src/neightbl.c
index 987ec5e32e..987ec5e32e 100644
--- a/libs/luaneightbl/src/neightbl.c
+++ b/libs/luci-lib-luaneightbl/src/neightbl.c
diff --git a/libs/nixio/.gitignore b/libs/luci-lib-nixio/.gitignore
index a21f2a2d7a..a21f2a2d7a 100644
--- a/libs/nixio/.gitignore
+++ b/libs/luci-lib-nixio/.gitignore
diff --git a/libs/nixio/LICENSE b/libs/luci-lib-nixio/LICENSE
index f49a4e16e6..f49a4e16e6 100644
--- a/libs/nixio/LICENSE
+++ b/libs/luci-lib-nixio/LICENSE
diff --git a/libs/luci-lib-nixio/Makefile b/libs/luci-lib-nixio/Makefile
new file mode 100644
index 0000000000..41800fe54b
--- /dev/null
+++ b/libs/luci-lib-nixio/Makefile
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=NIXIO POSIX library
+LUCI_DEPENDS:=+PACKAGE_luci-lib-nixio_openssl:libopenssl +PACKAGE_luci-lib-nixio_cyassl:libcyassl +liblua
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/libs/nixio/NOTICE b/libs/luci-lib-nixio/NOTICE
index f557831e8e..f557831e8e 100644
--- a/libs/nixio/NOTICE
+++ b/libs/luci-lib-nixio/NOTICE
diff --git a/libs/nixio/README b/libs/luci-lib-nixio/README
index ba9b36b30e..ba9b36b30e 100644
--- a/libs/nixio/README
+++ b/libs/luci-lib-nixio/README
diff --git a/libs/nixio/axTLS/Makefile b/libs/luci-lib-nixio/axTLS/Makefile
index 02c33d2482..02c33d2482 100644
--- a/libs/nixio/axTLS/Makefile
+++ b/libs/luci-lib-nixio/axTLS/Makefile
diff --git a/libs/nixio/axTLS/README b/libs/luci-lib-nixio/axTLS/README
index c8926d9bfc..c8926d9bfc 100644
--- a/libs/nixio/axTLS/README
+++ b/libs/luci-lib-nixio/axTLS/README
diff --git a/libs/nixio/axTLS/bindings/Config.in b/libs/luci-lib-nixio/axTLS/bindings/Config.in
index 12a696ba8b..12a696ba8b 100644
--- a/libs/nixio/axTLS/bindings/Config.in
+++ b/libs/luci-lib-nixio/axTLS/bindings/Config.in
diff --git a/libs/nixio/axTLS/bindings/Makefile b/libs/luci-lib-nixio/axTLS/bindings/Makefile
index 7654fbba57..7654fbba57 100644
--- a/libs/nixio/axTLS/bindings/Makefile
+++ b/libs/luci-lib-nixio/axTLS/bindings/Makefile
diff --git a/libs/nixio/axTLS/bindings/README b/libs/luci-lib-nixio/axTLS/bindings/README
index 8bc3109c12..8bc3109c12 100644
--- a/libs/nixio/axTLS/bindings/README
+++ b/libs/luci-lib-nixio/axTLS/bindings/README
diff --git a/libs/nixio/axTLS/bindings/csharp/Makefile b/libs/luci-lib-nixio/axTLS/bindings/csharp/Makefile
index 3414f85621..3414f85621 100644
--- a/libs/nixio/axTLS/bindings/csharp/Makefile
+++ b/libs/luci-lib-nixio/axTLS/bindings/csharp/Makefile
diff --git a/libs/nixio/axTLS/bindings/csharp/axTLS.cs b/libs/luci-lib-nixio/axTLS/bindings/csharp/axTLS.cs
index cf64a256e7..cf64a256e7 100644
--- a/libs/nixio/axTLS/bindings/csharp/axTLS.cs
+++ b/libs/luci-lib-nixio/axTLS/bindings/csharp/axTLS.cs
diff --git a/libs/nixio/axTLS/bindings/generate_SWIG_interface.pl b/libs/luci-lib-nixio/axTLS/bindings/generate_SWIG_interface.pl
index 4b2517988f..4b2517988f 100755
--- a/libs/nixio/axTLS/bindings/generate_SWIG_interface.pl
+++ b/libs/luci-lib-nixio/axTLS/bindings/generate_SWIG_interface.pl
diff --git a/libs/nixio/axTLS/bindings/generate_interface.pl b/libs/luci-lib-nixio/axTLS/bindings/generate_interface.pl
index c24bff9f40..c24bff9f40 100755
--- a/libs/nixio/axTLS/bindings/generate_interface.pl
+++ b/libs/luci-lib-nixio/axTLS/bindings/generate_interface.pl
diff --git a/libs/nixio/axTLS/bindings/java/Makefile b/libs/luci-lib-nixio/axTLS/bindings/java/Makefile
index 8df1d0aa83..8df1d0aa83 100644
--- a/libs/nixio/axTLS/bindings/java/Makefile
+++ b/libs/luci-lib-nixio/axTLS/bindings/java/Makefile
diff --git a/libs/nixio/axTLS/bindings/java/SSL.java b/libs/luci-lib-nixio/axTLS/bindings/java/SSL.java
index b53a6da067..b53a6da067 100644
--- a/libs/nixio/axTLS/bindings/java/SSL.java
+++ b/libs/luci-lib-nixio/axTLS/bindings/java/SSL.java
diff --git a/libs/nixio/axTLS/bindings/java/SSLCTX.java b/libs/luci-lib-nixio/axTLS/bindings/java/SSLCTX.java
index 1cd3e032f0..1cd3e032f0 100644
--- a/libs/nixio/axTLS/bindings/java/SSLCTX.java
+++ b/libs/luci-lib-nixio/axTLS/bindings/java/SSLCTX.java
diff --git a/libs/nixio/axTLS/bindings/java/SSLClient.java b/libs/luci-lib-nixio/axTLS/bindings/java/SSLClient.java
index f65fe9c53f..f65fe9c53f 100644
--- a/libs/nixio/axTLS/bindings/java/SSLClient.java
+++ b/libs/luci-lib-nixio/axTLS/bindings/java/SSLClient.java
diff --git a/libs/nixio/axTLS/bindings/java/SSLReadHolder.java b/libs/luci-lib-nixio/axTLS/bindings/java/SSLReadHolder.java
index 91fd76b23f..91fd76b23f 100644
--- a/libs/nixio/axTLS/bindings/java/SSLReadHolder.java
+++ b/libs/luci-lib-nixio/axTLS/bindings/java/SSLReadHolder.java
diff --git a/libs/nixio/axTLS/bindings/java/SSLServer.java b/libs/luci-lib-nixio/axTLS/bindings/java/SSLServer.java
index 514ccb0342..514ccb0342 100644
--- a/libs/nixio/axTLS/bindings/java/SSLServer.java
+++ b/libs/luci-lib-nixio/axTLS/bindings/java/SSLServer.java
diff --git a/libs/nixio/axTLS/bindings/java/SSLUtil.java b/libs/luci-lib-nixio/axTLS/bindings/java/SSLUtil.java
index 3d53de51cb..3d53de51cb 100644
--- a/libs/nixio/axTLS/bindings/java/SSLUtil.java
+++ b/libs/luci-lib-nixio/axTLS/bindings/java/SSLUtil.java
diff --git a/libs/nixio/axTLS/bindings/lua/Makefile b/libs/luci-lib-nixio/axTLS/bindings/lua/Makefile
index daacf92150..daacf92150 100644
--- a/libs/nixio/axTLS/bindings/lua/Makefile
+++ b/libs/luci-lib-nixio/axTLS/bindings/lua/Makefile
diff --git a/libs/nixio/axTLS/bindings/perl/Makefile b/libs/luci-lib-nixio/axTLS/bindings/perl/Makefile
index 92fd3c50f7..92fd3c50f7 100644
--- a/libs/nixio/axTLS/bindings/perl/Makefile
+++ b/libs/luci-lib-nixio/axTLS/bindings/perl/Makefile
diff --git a/libs/nixio/axTLS/bindings/vbnet/Makefile b/libs/luci-lib-nixio/axTLS/bindings/vbnet/Makefile
index 7da60d02ed..7da60d02ed 100644
--- a/libs/nixio/axTLS/bindings/vbnet/Makefile
+++ b/libs/luci-lib-nixio/axTLS/bindings/vbnet/Makefile
diff --git a/libs/nixio/axTLS/bindings/vbnet/axTLSvb.vb b/libs/luci-lib-nixio/axTLS/bindings/vbnet/axTLSvb.vb
index 9388273ce8..9388273ce8 100644
--- a/libs/nixio/axTLS/bindings/vbnet/axTLSvb.vb
+++ b/libs/luci-lib-nixio/axTLS/bindings/vbnet/axTLSvb.vb
diff --git a/libs/nixio/axTLS/config/.config b/libs/luci-lib-nixio/axTLS/config/.config
index 46cd061b4d..46cd061b4d 100644
--- a/libs/nixio/axTLS/config/.config
+++ b/libs/luci-lib-nixio/axTLS/config/.config
diff --git a/libs/nixio/axTLS/config/Config.in b/libs/luci-lib-nixio/axTLS/config/Config.in
index dc40756465..dc40756465 100644
--- a/libs/nixio/axTLS/config/Config.in
+++ b/libs/luci-lib-nixio/axTLS/config/Config.in
diff --git a/libs/nixio/axTLS/config/JMeter.jmx b/libs/luci-lib-nixio/axTLS/config/JMeter.jmx
index f62c03f0ee..f62c03f0ee 100755
--- a/libs/nixio/axTLS/config/JMeter.jmx
+++ b/libs/luci-lib-nixio/axTLS/config/JMeter.jmx
diff --git a/libs/nixio/axTLS/config/Rules.mak b/libs/luci-lib-nixio/axTLS/config/Rules.mak
index c0308da053..c0308da053 100644
--- a/libs/nixio/axTLS/config/Rules.mak
+++ b/libs/luci-lib-nixio/axTLS/config/Rules.mak
diff --git a/libs/nixio/axTLS/config/axhttpd.aip b/libs/luci-lib-nixio/axTLS/config/axhttpd.aip
index 412fe3b4d1..412fe3b4d1 100755
--- a/libs/nixio/axTLS/config/axhttpd.aip
+++ b/libs/luci-lib-nixio/axTLS/config/axhttpd.aip
diff --git a/libs/nixio/axTLS/config/axtls.RES b/libs/luci-lib-nixio/axTLS/config/axtls.RES
index 2929b3b679..2929b3b679 100644
--- a/libs/nixio/axTLS/config/axtls.RES
+++ b/libs/luci-lib-nixio/axTLS/config/axtls.RES
diff --git a/libs/nixio/axTLS/config/axtls.rc b/libs/luci-lib-nixio/axTLS/config/axtls.rc
index 0f288aa91f..0f288aa91f 100644
--- a/libs/nixio/axTLS/config/axtls.rc
+++ b/libs/luci-lib-nixio/axTLS/config/axtls.rc
diff --git a/libs/nixio/axTLS/config/config.h b/libs/luci-lib-nixio/axTLS/config/config.h
index 0f861f34b3..0f861f34b3 100644
--- a/libs/nixio/axTLS/config/config.h
+++ b/libs/luci-lib-nixio/axTLS/config/config.h
diff --git a/libs/nixio/axTLS/config/linuxconfig b/libs/luci-lib-nixio/axTLS/config/linuxconfig
index 614fdd80e4..614fdd80e4 100644
--- a/libs/nixio/axTLS/config/linuxconfig
+++ b/libs/luci-lib-nixio/axTLS/config/linuxconfig
diff --git a/libs/nixio/axTLS/config/makefile.conf b/libs/luci-lib-nixio/axTLS/config/makefile.conf
index 9f9db13301..9f9db13301 100644
--- a/libs/nixio/axTLS/config/makefile.conf
+++ b/libs/luci-lib-nixio/axTLS/config/makefile.conf
diff --git a/libs/nixio/axTLS/config/makefile.dotnet.conf b/libs/luci-lib-nixio/axTLS/config/makefile.dotnet.conf
index 9cff4fddf1..9cff4fddf1 100644
--- a/libs/nixio/axTLS/config/makefile.dotnet.conf
+++ b/libs/luci-lib-nixio/axTLS/config/makefile.dotnet.conf
diff --git a/libs/nixio/axTLS/config/makefile.java.conf b/libs/luci-lib-nixio/axTLS/config/makefile.java.conf
index 9b22462908..9b22462908 100644
--- a/libs/nixio/axTLS/config/makefile.java.conf
+++ b/libs/luci-lib-nixio/axTLS/config/makefile.java.conf
diff --git a/libs/nixio/axTLS/config/makefile.post b/libs/luci-lib-nixio/axTLS/config/makefile.post
index 033981c4d1..033981c4d1 100644
--- a/libs/nixio/axTLS/config/makefile.post
+++ b/libs/luci-lib-nixio/axTLS/config/makefile.post
diff --git a/libs/nixio/axTLS/config/scripts/config/Kconfig-language.txt b/libs/luci-lib-nixio/axTLS/config/scripts/config/Kconfig-language.txt
index 493749b32a..493749b32a 100644
--- a/libs/nixio/axTLS/config/scripts/config/Kconfig-language.txt
+++ b/libs/luci-lib-nixio/axTLS/config/scripts/config/Kconfig-language.txt
diff --git a/libs/nixio/axTLS/config/scripts/config/Makefile b/libs/luci-lib-nixio/axTLS/config/scripts/config/Makefile
index 739950163b..739950163b 100644
--- a/libs/nixio/axTLS/config/scripts/config/Makefile
+++ b/libs/luci-lib-nixio/axTLS/config/scripts/config/Makefile
diff --git a/libs/nixio/axTLS/config/scripts/config/conf.c b/libs/luci-lib-nixio/axTLS/config/scripts/config/conf.c
index 15244678e8..15244678e8 100644
--- a/libs/nixio/axTLS/config/scripts/config/conf.c
+++ b/libs/luci-lib-nixio/axTLS/config/scripts/config/conf.c
diff --git a/libs/nixio/axTLS/config/scripts/config/confdata.c b/libs/luci-lib-nixio/axTLS/config/scripts/config/confdata.c
index a59e245508..a59e245508 100644
--- a/libs/nixio/axTLS/config/scripts/config/confdata.c
+++ b/libs/luci-lib-nixio/axTLS/config/scripts/config/confdata.c
diff --git a/libs/nixio/axTLS/config/scripts/config/expr.c b/libs/luci-lib-nixio/axTLS/config/scripts/config/expr.c
index 30e4f9d69c..30e4f9d69c 100644
--- a/libs/nixio/axTLS/config/scripts/config/expr.c
+++ b/libs/luci-lib-nixio/axTLS/config/scripts/config/expr.c
diff --git a/libs/nixio/axTLS/config/scripts/config/expr.h b/libs/luci-lib-nixio/axTLS/config/scripts/config/expr.h
index 7d39ff43e6..7d39ff43e6 100644
--- a/libs/nixio/axTLS/config/scripts/config/expr.h
+++ b/libs/luci-lib-nixio/axTLS/config/scripts/config/expr.h
diff --git a/libs/nixio/axTLS/config/scripts/config/lex.zconf.c_shipped b/libs/luci-lib-nixio/axTLS/config/scripts/config/lex.zconf.c_shipped
index b877bb6b3c..b877bb6b3c 100644
--- a/libs/nixio/axTLS/config/scripts/config/lex.zconf.c_shipped
+++ b/libs/luci-lib-nixio/axTLS/config/scripts/config/lex.zconf.c_shipped
diff --git a/libs/nixio/axTLS/config/scripts/config/lkc.h b/libs/luci-lib-nixio/axTLS/config/scripts/config/lkc.h
index b8a67fc9d6..b8a67fc9d6 100644
--- a/libs/nixio/axTLS/config/scripts/config/lkc.h
+++ b/libs/luci-lib-nixio/axTLS/config/scripts/config/lkc.h
diff --git a/libs/nixio/axTLS/config/scripts/config/lkc_proto.h b/libs/luci-lib-nixio/axTLS/config/scripts/config/lkc_proto.h
index 6dc6d0c48e..6dc6d0c48e 100644
--- a/libs/nixio/axTLS/config/scripts/config/lkc_proto.h
+++ b/libs/luci-lib-nixio/axTLS/config/scripts/config/lkc_proto.h
diff --git a/libs/nixio/axTLS/config/scripts/config/lxdialog/BIG.FAT.WARNING b/libs/luci-lib-nixio/axTLS/config/scripts/config/lxdialog/BIG.FAT.WARNING
index a8999d82bd..a8999d82bd 100644
--- a/libs/nixio/axTLS/config/scripts/config/lxdialog/BIG.FAT.WARNING
+++ b/libs/luci-lib-nixio/axTLS/config/scripts/config/lxdialog/BIG.FAT.WARNING
diff --git a/libs/nixio/axTLS/config/scripts/config/lxdialog/checklist.c b/libs/luci-lib-nixio/axTLS/config/scripts/config/lxdialog/checklist.c
index 71de4a191d..71de4a191d 100644
--- a/libs/nixio/axTLS/config/scripts/config/lxdialog/checklist.c
+++ b/libs/luci-lib-nixio/axTLS/config/scripts/config/lxdialog/checklist.c
diff --git a/libs/nixio/axTLS/config/scripts/config/lxdialog/colors.h b/libs/luci-lib-nixio/axTLS/config/scripts/config/lxdialog/colors.h
index d34dd37c6f..d34dd37c6f 100644
--- a/libs/nixio/axTLS/config/scripts/config/lxdialog/colors.h
+++ b/libs/luci-lib-nixio/axTLS/config/scripts/config/lxdialog/colors.h
diff --git a/libs/nixio/axTLS/config/scripts/config/lxdialog/dialog.h b/libs/luci-lib-nixio/axTLS/config/scripts/config/lxdialog/dialog.h
index 7bab3ad0e1..7bab3ad0e1 100644
--- a/libs/nixio/axTLS/config/scripts/config/lxdialog/dialog.h
+++ b/libs/luci-lib-nixio/axTLS/config/scripts/config/lxdialog/dialog.h
diff --git a/libs/nixio/axTLS/config/scripts/config/lxdialog/inputbox.c b/libs/luci-lib-nixio/axTLS/config/scripts/config/lxdialog/inputbox.c
index fa7bebc693..fa7bebc693 100644
--- a/libs/nixio/axTLS/config/scripts/config/lxdialog/inputbox.c
+++ b/libs/luci-lib-nixio/axTLS/config/scripts/config/lxdialog/inputbox.c
diff --git a/libs/nixio/axTLS/config/scripts/config/lxdialog/menubox.c b/libs/luci-lib-nixio/axTLS/config/scripts/config/lxdialog/menubox.c
index 873dc587b8..873dc587b8 100644
--- a/libs/nixio/axTLS/config/scripts/config/lxdialog/menubox.c
+++ b/libs/luci-lib-nixio/axTLS/config/scripts/config/lxdialog/menubox.c
diff --git a/libs/nixio/axTLS/config/scripts/config/lxdialog/msgbox.c b/libs/luci-lib-nixio/axTLS/config/scripts/config/lxdialog/msgbox.c
index 93692e1fbc..93692e1fbc 100644
--- a/libs/nixio/axTLS/config/scripts/config/lxdialog/msgbox.c
+++ b/libs/luci-lib-nixio/axTLS/config/scripts/config/lxdialog/msgbox.c
diff --git a/libs/nixio/axTLS/config/scripts/config/lxdialog/textbox.c b/libs/luci-lib-nixio/axTLS/config/scripts/config/lxdialog/textbox.c
index a5a460b5cc..a5a460b5cc 100644
--- a/libs/nixio/axTLS/config/scripts/config/lxdialog/textbox.c
+++ b/libs/luci-lib-nixio/axTLS/config/scripts/config/lxdialog/textbox.c
diff --git a/libs/nixio/axTLS/config/scripts/config/lxdialog/util.c b/libs/luci-lib-nixio/axTLS/config/scripts/config/lxdialog/util.c
index 6f83951b90..6f83951b90 100644
--- a/libs/nixio/axTLS/config/scripts/config/lxdialog/util.c
+++ b/libs/luci-lib-nixio/axTLS/config/scripts/config/lxdialog/util.c
diff --git a/libs/nixio/axTLS/config/scripts/config/lxdialog/yesno.c b/libs/luci-lib-nixio/axTLS/config/scripts/config/lxdialog/yesno.c
index 11fcc25f51..11fcc25f51 100644
--- a/libs/nixio/axTLS/config/scripts/config/lxdialog/yesno.c
+++ b/libs/luci-lib-nixio/axTLS/config/scripts/config/lxdialog/yesno.c
diff --git a/libs/nixio/axTLS/config/scripts/config/mconf.c b/libs/luci-lib-nixio/axTLS/config/scripts/config/mconf.c
index 406eb29c3b..406eb29c3b 100644
--- a/libs/nixio/axTLS/config/scripts/config/mconf.c
+++ b/libs/luci-lib-nixio/axTLS/config/scripts/config/mconf.c
diff --git a/libs/nixio/axTLS/config/scripts/config/menu.c b/libs/luci-lib-nixio/axTLS/config/scripts/config/menu.c
index 0c13156f33..0c13156f33 100644
--- a/libs/nixio/axTLS/config/scripts/config/menu.c
+++ b/libs/luci-lib-nixio/axTLS/config/scripts/config/menu.c
diff --git a/libs/nixio/axTLS/config/scripts/config/mkconfigs b/libs/luci-lib-nixio/axTLS/config/scripts/config/mkconfigs
index 3cb7bb1754..3cb7bb1754 100755
--- a/libs/nixio/axTLS/config/scripts/config/mkconfigs
+++ b/libs/luci-lib-nixio/axTLS/config/scripts/config/mkconfigs
diff --git a/libs/nixio/axTLS/config/scripts/config/symbol.c b/libs/luci-lib-nixio/axTLS/config/scripts/config/symbol.c
index ea629728ac..ea629728ac 100644
--- a/libs/nixio/axTLS/config/scripts/config/symbol.c
+++ b/libs/luci-lib-nixio/axTLS/config/scripts/config/symbol.c
diff --git a/libs/nixio/axTLS/config/scripts/config/util.c b/libs/luci-lib-nixio/axTLS/config/scripts/config/util.c
index 8fc95a2a70..8fc95a2a70 100644
--- a/libs/nixio/axTLS/config/scripts/config/util.c
+++ b/libs/luci-lib-nixio/axTLS/config/scripts/config/util.c
diff --git a/libs/nixio/axTLS/config/scripts/config/zconf.l b/libs/luci-lib-nixio/axTLS/config/scripts/config/zconf.l
index 55517b2877..55517b2877 100644
--- a/libs/nixio/axTLS/config/scripts/config/zconf.l
+++ b/libs/luci-lib-nixio/axTLS/config/scripts/config/zconf.l
diff --git a/libs/nixio/axTLS/config/scripts/config/zconf.tab.c_shipped b/libs/luci-lib-nixio/axTLS/config/scripts/config/zconf.tab.c_shipped
index cc68dcb9a3..cc68dcb9a3 100644
--- a/libs/nixio/axTLS/config/scripts/config/zconf.tab.c_shipped
+++ b/libs/luci-lib-nixio/axTLS/config/scripts/config/zconf.tab.c_shipped
diff --git a/libs/nixio/axTLS/config/scripts/config/zconf.tab.h_shipped b/libs/luci-lib-nixio/axTLS/config/scripts/config/zconf.tab.h_shipped
index 3b191ef599..3b191ef599 100644
--- a/libs/nixio/axTLS/config/scripts/config/zconf.tab.h_shipped
+++ b/libs/luci-lib-nixio/axTLS/config/scripts/config/zconf.tab.h_shipped
diff --git a/libs/nixio/axTLS/config/scripts/config/zconf.y b/libs/luci-lib-nixio/axTLS/config/scripts/config/zconf.y
index cf45da0b20..cf45da0b20 100644
--- a/libs/nixio/axTLS/config/scripts/config/zconf.y
+++ b/libs/luci-lib-nixio/axTLS/config/scripts/config/zconf.y
diff --git a/libs/nixio/axTLS/config/win32config b/libs/luci-lib-nixio/axTLS/config/win32config
index 6c8d607126..6c8d607126 100644
--- a/libs/nixio/axTLS/config/win32config
+++ b/libs/luci-lib-nixio/axTLS/config/win32config
diff --git a/libs/nixio/axTLS/crypto/Makefile b/libs/luci-lib-nixio/axTLS/crypto/Makefile
index 3ea8bdde0c..3ea8bdde0c 100644
--- a/libs/nixio/axTLS/crypto/Makefile
+++ b/libs/luci-lib-nixio/axTLS/crypto/Makefile
diff --git a/libs/nixio/axTLS/crypto/aes.c b/libs/luci-lib-nixio/axTLS/crypto/aes.c
index 038a45bd85..038a45bd85 100644
--- a/libs/nixio/axTLS/crypto/aes.c
+++ b/libs/luci-lib-nixio/axTLS/crypto/aes.c
diff --git a/libs/nixio/axTLS/crypto/bigint.c b/libs/luci-lib-nixio/axTLS/crypto/bigint.c
index 53a5839293..53a5839293 100644
--- a/libs/nixio/axTLS/crypto/bigint.c
+++ b/libs/luci-lib-nixio/axTLS/crypto/bigint.c
diff --git a/libs/nixio/axTLS/crypto/bigint.h b/libs/luci-lib-nixio/axTLS/crypto/bigint.h
index 2966a3edb3..2966a3edb3 100644
--- a/libs/nixio/axTLS/crypto/bigint.h
+++ b/libs/luci-lib-nixio/axTLS/crypto/bigint.h
diff --git a/libs/nixio/axTLS/crypto/bigint_impl.h b/libs/luci-lib-nixio/axTLS/crypto/bigint_impl.h
index 1483154a41..1483154a41 100644
--- a/libs/nixio/axTLS/crypto/bigint_impl.h
+++ b/libs/luci-lib-nixio/axTLS/crypto/bigint_impl.h
diff --git a/libs/nixio/axTLS/crypto/crypto.h b/libs/luci-lib-nixio/axTLS/crypto/crypto.h
index 5c95f21596..5c95f21596 100644
--- a/libs/nixio/axTLS/crypto/crypto.h
+++ b/libs/luci-lib-nixio/axTLS/crypto/crypto.h
diff --git a/libs/nixio/axTLS/crypto/crypto_misc.c b/libs/luci-lib-nixio/axTLS/crypto/crypto_misc.c
index 59b72ec08d..59b72ec08d 100644
--- a/libs/nixio/axTLS/crypto/crypto_misc.c
+++ b/libs/luci-lib-nixio/axTLS/crypto/crypto_misc.c
diff --git a/libs/nixio/axTLS/crypto/hmac.c b/libs/luci-lib-nixio/axTLS/crypto/hmac.c
index 9199ff2207..9199ff2207 100644
--- a/libs/nixio/axTLS/crypto/hmac.c
+++ b/libs/luci-lib-nixio/axTLS/crypto/hmac.c
diff --git a/libs/nixio/axTLS/crypto/md2.c b/libs/luci-lib-nixio/axTLS/crypto/md2.c
index bfcbd24bbe..bfcbd24bbe 100644
--- a/libs/nixio/axTLS/crypto/md2.c
+++ b/libs/luci-lib-nixio/axTLS/crypto/md2.c
diff --git a/libs/nixio/axTLS/crypto/md5.c b/libs/luci-lib-nixio/axTLS/crypto/md5.c
index b4f86cab58..b4f86cab58 100644
--- a/libs/nixio/axTLS/crypto/md5.c
+++ b/libs/luci-lib-nixio/axTLS/crypto/md5.c
diff --git a/libs/nixio/axTLS/crypto/rc4.c b/libs/luci-lib-nixio/axTLS/crypto/rc4.c
index 57136b82bd..57136b82bd 100644
--- a/libs/nixio/axTLS/crypto/rc4.c
+++ b/libs/luci-lib-nixio/axTLS/crypto/rc4.c
diff --git a/libs/nixio/axTLS/crypto/rsa.c b/libs/luci-lib-nixio/axTLS/crypto/rsa.c
index 31627bb319..31627bb319 100644
--- a/libs/nixio/axTLS/crypto/rsa.c
+++ b/libs/luci-lib-nixio/axTLS/crypto/rsa.c
diff --git a/libs/nixio/axTLS/crypto/sha1.c b/libs/luci-lib-nixio/axTLS/crypto/sha1.c
index be19100797..be19100797 100644
--- a/libs/nixio/axTLS/crypto/sha1.c
+++ b/libs/luci-lib-nixio/axTLS/crypto/sha1.c
diff --git a/libs/nixio/axTLS/docsrc/Makefile b/libs/luci-lib-nixio/axTLS/docsrc/Makefile
index 28266869b7..28266869b7 100644
--- a/libs/nixio/axTLS/docsrc/Makefile
+++ b/libs/luci-lib-nixio/axTLS/docsrc/Makefile
diff --git a/libs/nixio/axTLS/docsrc/axTLS.dox b/libs/luci-lib-nixio/axTLS/docsrc/axTLS.dox
index d9959b21dd..d9959b21dd 100644
--- a/libs/nixio/axTLS/docsrc/axTLS.dox
+++ b/libs/luci-lib-nixio/axTLS/docsrc/axTLS.dox
diff --git a/libs/nixio/axTLS/docsrc/doco_footer.html b/libs/luci-lib-nixio/axTLS/docsrc/doco_footer.html
index 20c4e70b7a..20c4e70b7a 100644
--- a/libs/nixio/axTLS/docsrc/doco_footer.html
+++ b/libs/luci-lib-nixio/axTLS/docsrc/doco_footer.html
diff --git a/libs/nixio/axTLS/docsrc/images/axolotl.jpg b/libs/luci-lib-nixio/axTLS/docsrc/images/axolotl.jpg
index 7352bbae83..7352bbae83 100644
--- a/libs/nixio/axTLS/docsrc/images/axolotl.jpg
+++ b/libs/luci-lib-nixio/axTLS/docsrc/images/axolotl.jpg
diff --git a/libs/nixio/axTLS/docsrc/images/tsbasbw.gif b/libs/luci-lib-nixio/axTLS/docsrc/images/tsbasbw.gif
index cf03b121bf..cf03b121bf 100644
--- a/libs/nixio/axTLS/docsrc/images/tsbasbw.gif
+++ b/libs/luci-lib-nixio/axTLS/docsrc/images/tsbasbw.gif
diff --git a/libs/nixio/axTLS/httpd/Config.in b/libs/luci-lib-nixio/axTLS/httpd/Config.in
index 513d57ae30..513d57ae30 100644
--- a/libs/nixio/axTLS/httpd/Config.in
+++ b/libs/luci-lib-nixio/axTLS/httpd/Config.in
diff --git a/libs/nixio/axTLS/httpd/Makefile b/libs/luci-lib-nixio/axTLS/httpd/Makefile
index b8c18d2445..b8c18d2445 100644
--- a/libs/nixio/axTLS/httpd/Makefile
+++ b/libs/luci-lib-nixio/axTLS/httpd/Makefile
diff --git a/libs/nixio/axTLS/httpd/axhttp.h b/libs/luci-lib-nixio/axTLS/httpd/axhttp.h
index 73c299fb14..73c299fb14 100644
--- a/libs/nixio/axTLS/httpd/axhttp.h
+++ b/libs/luci-lib-nixio/axTLS/httpd/axhttp.h
diff --git a/libs/nixio/axTLS/httpd/axhttpd.c b/libs/luci-lib-nixio/axTLS/httpd/axhttpd.c
index 35d36f64c1..35d36f64c1 100644
--- a/libs/nixio/axTLS/httpd/axhttpd.c
+++ b/libs/luci-lib-nixio/axTLS/httpd/axhttpd.c
diff --git a/libs/nixio/axTLS/httpd/htpasswd.c b/libs/luci-lib-nixio/axTLS/httpd/htpasswd.c
index 1a7a2311f8..1a7a2311f8 100644
--- a/libs/nixio/axTLS/httpd/htpasswd.c
+++ b/libs/luci-lib-nixio/axTLS/httpd/htpasswd.c
diff --git a/libs/nixio/axTLS/httpd/kepler-1.1-snapshot-20070521-1825.tar.gz b/libs/luci-lib-nixio/axTLS/httpd/kepler-1.1-snapshot-20070521-1825.tar.gz
index d1caec5a53..d1caec5a53 100755
--- a/libs/nixio/axTLS/httpd/kepler-1.1-snapshot-20070521-1825.tar.gz
+++ b/libs/luci-lib-nixio/axTLS/httpd/kepler-1.1-snapshot-20070521-1825.tar.gz
diff --git a/libs/nixio/axTLS/httpd/kepler.patch b/libs/luci-lib-nixio/axTLS/httpd/kepler.patch
index dbab7e501c..dbab7e501c 100644
--- a/libs/nixio/axTLS/httpd/kepler.patch
+++ b/libs/luci-lib-nixio/axTLS/httpd/kepler.patch
diff --git a/libs/nixio/axTLS/httpd/proc.c b/libs/luci-lib-nixio/axTLS/httpd/proc.c
index 3c897c98b0..3c897c98b0 100644
--- a/libs/nixio/axTLS/httpd/proc.c
+++ b/libs/luci-lib-nixio/axTLS/httpd/proc.c
diff --git a/libs/nixio/axTLS/httpd/tdate_parse.c b/libs/luci-lib-nixio/axTLS/httpd/tdate_parse.c
index 813bdc578b..813bdc578b 100644
--- a/libs/nixio/axTLS/httpd/tdate_parse.c
+++ b/libs/luci-lib-nixio/axTLS/httpd/tdate_parse.c
diff --git a/libs/nixio/axTLS/samples/Config.in b/libs/luci-lib-nixio/axTLS/samples/Config.in
index ecad25eeb7..ecad25eeb7 100644
--- a/libs/nixio/axTLS/samples/Config.in
+++ b/libs/luci-lib-nixio/axTLS/samples/Config.in
diff --git a/libs/nixio/axTLS/samples/Makefile b/libs/luci-lib-nixio/axTLS/samples/Makefile
index afbdd43d1b..afbdd43d1b 100644
--- a/libs/nixio/axTLS/samples/Makefile
+++ b/libs/luci-lib-nixio/axTLS/samples/Makefile
diff --git a/libs/nixio/axTLS/samples/c/Makefile b/libs/luci-lib-nixio/axTLS/samples/c/Makefile
index 17cf9e7c12..17cf9e7c12 100644
--- a/libs/nixio/axTLS/samples/c/Makefile
+++ b/libs/luci-lib-nixio/axTLS/samples/c/Makefile
diff --git a/libs/nixio/axTLS/samples/c/axssl.c b/libs/luci-lib-nixio/axTLS/samples/c/axssl.c
index 6892ee452b..6892ee452b 100644
--- a/libs/nixio/axTLS/samples/c/axssl.c
+++ b/libs/luci-lib-nixio/axTLS/samples/c/axssl.c
diff --git a/libs/nixio/axTLS/samples/csharp/Makefile b/libs/luci-lib-nixio/axTLS/samples/csharp/Makefile
index 46c2421dce..46c2421dce 100644
--- a/libs/nixio/axTLS/samples/csharp/Makefile
+++ b/libs/luci-lib-nixio/axTLS/samples/csharp/Makefile
diff --git a/libs/nixio/axTLS/samples/csharp/axssl.cs b/libs/luci-lib-nixio/axTLS/samples/csharp/axssl.cs
index dae2b8a41f..dae2b8a41f 100644
--- a/libs/nixio/axTLS/samples/csharp/axssl.cs
+++ b/libs/luci-lib-nixio/axTLS/samples/csharp/axssl.cs
diff --git a/libs/nixio/axTLS/samples/java/Makefile b/libs/luci-lib-nixio/axTLS/samples/java/Makefile
index b10a79f372..b10a79f372 100644
--- a/libs/nixio/axTLS/samples/java/Makefile
+++ b/libs/luci-lib-nixio/axTLS/samples/java/Makefile
diff --git a/libs/nixio/axTLS/samples/java/axssl.java b/libs/luci-lib-nixio/axTLS/samples/java/axssl.java
index 2057f29662..2057f29662 100644
--- a/libs/nixio/axTLS/samples/java/axssl.java
+++ b/libs/luci-lib-nixio/axTLS/samples/java/axssl.java
diff --git a/libs/nixio/axTLS/samples/java/manifest.mf b/libs/luci-lib-nixio/axTLS/samples/java/manifest.mf
index b906ed29ed..b906ed29ed 100644
--- a/libs/nixio/axTLS/samples/java/manifest.mf
+++ b/libs/luci-lib-nixio/axTLS/samples/java/manifest.mf
diff --git a/libs/nixio/axTLS/samples/lua/Makefile b/libs/luci-lib-nixio/axTLS/samples/lua/Makefile
index a460da3c55..a460da3c55 100644
--- a/libs/nixio/axTLS/samples/lua/Makefile
+++ b/libs/luci-lib-nixio/axTLS/samples/lua/Makefile
diff --git a/libs/nixio/axTLS/samples/lua/axssl.lua b/libs/luci-lib-nixio/axTLS/samples/lua/axssl.lua
index 6ea26b69dd..6ea26b69dd 100755
--- a/libs/nixio/axTLS/samples/lua/axssl.lua
+++ b/libs/luci-lib-nixio/axTLS/samples/lua/axssl.lua
diff --git a/libs/nixio/axTLS/samples/perl/Makefile b/libs/luci-lib-nixio/axTLS/samples/perl/Makefile
index 5200c4302e..5200c4302e 100644
--- a/libs/nixio/axTLS/samples/perl/Makefile
+++ b/libs/luci-lib-nixio/axTLS/samples/perl/Makefile
diff --git a/libs/nixio/axTLS/samples/perl/axssl.pl b/libs/luci-lib-nixio/axTLS/samples/perl/axssl.pl
index e49d52270d..e49d52270d 100755
--- a/libs/nixio/axTLS/samples/perl/axssl.pl
+++ b/libs/luci-lib-nixio/axTLS/samples/perl/axssl.pl
diff --git a/libs/nixio/axTLS/samples/vbnet/Makefile b/libs/luci-lib-nixio/axTLS/samples/vbnet/Makefile
index 0984d4e02e..0984d4e02e 100644
--- a/libs/nixio/axTLS/samples/vbnet/Makefile
+++ b/libs/luci-lib-nixio/axTLS/samples/vbnet/Makefile
diff --git a/libs/nixio/axTLS/samples/vbnet/axssl.vb b/libs/luci-lib-nixio/axTLS/samples/vbnet/axssl.vb
index 1b423c8659..1b423c8659 100644
--- a/libs/nixio/axTLS/samples/vbnet/axssl.vb
+++ b/libs/luci-lib-nixio/axTLS/samples/vbnet/axssl.vb
diff --git a/libs/nixio/axTLS/ssl/BigIntConfig.in b/libs/luci-lib-nixio/axTLS/ssl/BigIntConfig.in
index 04c7438c07..04c7438c07 100644
--- a/libs/nixio/axTLS/ssl/BigIntConfig.in
+++ b/libs/luci-lib-nixio/axTLS/ssl/BigIntConfig.in
diff --git a/libs/nixio/axTLS/ssl/Config.in b/libs/luci-lib-nixio/axTLS/ssl/Config.in
index d047d420ec..d047d420ec 100644
--- a/libs/nixio/axTLS/ssl/Config.in
+++ b/libs/luci-lib-nixio/axTLS/ssl/Config.in
diff --git a/libs/nixio/axTLS/ssl/Makefile b/libs/luci-lib-nixio/axTLS/ssl/Makefile
index 704d90a9b2..704d90a9b2 100644
--- a/libs/nixio/axTLS/ssl/Makefile
+++ b/libs/luci-lib-nixio/axTLS/ssl/Makefile
diff --git a/libs/nixio/axTLS/ssl/asn1.c b/libs/luci-lib-nixio/axTLS/ssl/asn1.c
index 4f2e6db240..4f2e6db240 100644
--- a/libs/nixio/axTLS/ssl/asn1.c
+++ b/libs/luci-lib-nixio/axTLS/ssl/asn1.c
diff --git a/libs/nixio/axTLS/ssl/cert.h b/libs/luci-lib-nixio/axTLS/ssl/cert.h
index 7a85d2d843..7a85d2d843 100644
--- a/libs/nixio/axTLS/ssl/cert.h
+++ b/libs/luci-lib-nixio/axTLS/ssl/cert.h
diff --git a/libs/nixio/axTLS/ssl/crypto_misc.h b/libs/luci-lib-nixio/axTLS/ssl/crypto_misc.h
index 97cb0f2d23..97cb0f2d23 100644
--- a/libs/nixio/axTLS/ssl/crypto_misc.h
+++ b/libs/luci-lib-nixio/axTLS/ssl/crypto_misc.h
diff --git a/libs/nixio/axTLS/ssl/gen_cert.c b/libs/luci-lib-nixio/axTLS/ssl/gen_cert.c
index 94b74903ca..94b74903ca 100644
--- a/libs/nixio/axTLS/ssl/gen_cert.c
+++ b/libs/luci-lib-nixio/axTLS/ssl/gen_cert.c
diff --git a/libs/nixio/axTLS/ssl/loader.c b/libs/luci-lib-nixio/axTLS/ssl/loader.c
index 4232f7eec0..4232f7eec0 100644
--- a/libs/nixio/axTLS/ssl/loader.c
+++ b/libs/luci-lib-nixio/axTLS/ssl/loader.c
diff --git a/libs/nixio/axTLS/ssl/openssl.c b/libs/luci-lib-nixio/axTLS/ssl/openssl.c
index b6b955008b..b6b955008b 100644
--- a/libs/nixio/axTLS/ssl/openssl.c
+++ b/libs/luci-lib-nixio/axTLS/ssl/openssl.c
diff --git a/libs/nixio/axTLS/ssl/os_port.c b/libs/luci-lib-nixio/axTLS/ssl/os_port.c
index 6a71000b47..6a71000b47 100644
--- a/libs/nixio/axTLS/ssl/os_port.c
+++ b/libs/luci-lib-nixio/axTLS/ssl/os_port.c
diff --git a/libs/nixio/axTLS/ssl/os_port.h b/libs/luci-lib-nixio/axTLS/ssl/os_port.h
index 262c4dd705..262c4dd705 100644
--- a/libs/nixio/axTLS/ssl/os_port.h
+++ b/libs/luci-lib-nixio/axTLS/ssl/os_port.h
diff --git a/libs/nixio/axTLS/ssl/p12.c b/libs/luci-lib-nixio/axTLS/ssl/p12.c
index 6ed92e431d..6ed92e431d 100644
--- a/libs/nixio/axTLS/ssl/p12.c
+++ b/libs/luci-lib-nixio/axTLS/ssl/p12.c
diff --git a/libs/nixio/axTLS/ssl/private_key.h b/libs/luci-lib-nixio/axTLS/ssl/private_key.h
index 96a5253312..96a5253312 100644
--- a/libs/nixio/axTLS/ssl/private_key.h
+++ b/libs/luci-lib-nixio/axTLS/ssl/private_key.h
diff --git a/libs/nixio/axTLS/ssl/ssl.h b/libs/luci-lib-nixio/axTLS/ssl/ssl.h
index 539d0a3058..539d0a3058 100644
--- a/libs/nixio/axTLS/ssl/ssl.h
+++ b/libs/luci-lib-nixio/axTLS/ssl/ssl.h
diff --git a/libs/nixio/axTLS/ssl/test/Makefile b/libs/luci-lib-nixio/axTLS/ssl/test/Makefile
index 56c711f197..56c711f197 100644
--- a/libs/nixio/axTLS/ssl/test/Makefile
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/Makefile
diff --git a/libs/nixio/axTLS/ssl/test/axTLS.ca_key.pem b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.ca_key.pem
index 7c8ac8af28..7c8ac8af28 100644
--- a/libs/nixio/axTLS/ssl/test/axTLS.ca_key.pem
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.ca_key.pem
diff --git a/libs/nixio/axTLS/ssl/test/axTLS.ca_x509.cer b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.ca_x509.cer
index 9c9936b8e9..9c9936b8e9 100644
--- a/libs/nixio/axTLS/ssl/test/axTLS.ca_x509.cer
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.ca_x509.cer
diff --git a/libs/nixio/axTLS/ssl/test/axTLS.ca_x509.pem b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.ca_x509.pem
index 86f659710c..86f659710c 100644
--- a/libs/nixio/axTLS/ssl/test/axTLS.ca_x509.pem
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.ca_x509.pem
diff --git a/libs/nixio/axTLS/ssl/test/axTLS.device_key b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.device_key
index 4e981d143e..4e981d143e 100644
--- a/libs/nixio/axTLS/ssl/test/axTLS.device_key
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.device_key
diff --git a/libs/nixio/axTLS/ssl/test/axTLS.device_key.pem b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.device_key.pem
index 2bcf5e37b3..2bcf5e37b3 100644
--- a/libs/nixio/axTLS/ssl/test/axTLS.device_key.pem
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.device_key.pem
diff --git a/libs/nixio/axTLS/ssl/test/axTLS.encrypted.p8 b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.encrypted.p8
index 8b0a7eb411..8b0a7eb411 100644
--- a/libs/nixio/axTLS/ssl/test/axTLS.encrypted.p8
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.encrypted.p8
diff --git a/libs/nixio/axTLS/ssl/test/axTLS.encrypted_pem.p8 b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.encrypted_pem.p8
index 19ca3c5eae..19ca3c5eae 100644
--- a/libs/nixio/axTLS/ssl/test/axTLS.encrypted_pem.p8
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.encrypted_pem.p8
diff --git a/libs/nixio/axTLS/ssl/test/axTLS.key_1024 b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.key_1024
index 5b6ba1d037..5b6ba1d037 100644
--- a/libs/nixio/axTLS/ssl/test/axTLS.key_1024
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.key_1024
diff --git a/libs/nixio/axTLS/ssl/test/axTLS.key_1024.pem b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.key_1024.pem
index 4f5ad4ece6..4f5ad4ece6 100644
--- a/libs/nixio/axTLS/ssl/test/axTLS.key_1024.pem
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.key_1024.pem
diff --git a/libs/nixio/axTLS/ssl/test/axTLS.key_2048 b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.key_2048
index 0af642de23..0af642de23 100644
--- a/libs/nixio/axTLS/ssl/test/axTLS.key_2048
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.key_2048
diff --git a/libs/nixio/axTLS/ssl/test/axTLS.key_2048.pem b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.key_2048.pem
index beddb721bf..beddb721bf 100644
--- a/libs/nixio/axTLS/ssl/test/axTLS.key_2048.pem
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.key_2048.pem
diff --git a/libs/nixio/axTLS/ssl/test/axTLS.key_4096 b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.key_4096
index c205382ab7..c205382ab7 100644
--- a/libs/nixio/axTLS/ssl/test/axTLS.key_4096
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.key_4096
diff --git a/libs/nixio/axTLS/ssl/test/axTLS.key_4096.pem b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.key_4096.pem
index 9929467f45..9929467f45 100644
--- a/libs/nixio/axTLS/ssl/test/axTLS.key_4096.pem
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.key_4096.pem
diff --git a/libs/nixio/axTLS/ssl/test/axTLS.key_512 b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.key_512
index 7ae50f23bd..7ae50f23bd 100644
--- a/libs/nixio/axTLS/ssl/test/axTLS.key_512
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.key_512
diff --git a/libs/nixio/axTLS/ssl/test/axTLS.key_512.pem b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.key_512.pem
index 1e2fb41f87..1e2fb41f87 100644
--- a/libs/nixio/axTLS/ssl/test/axTLS.key_512.pem
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.key_512.pem
diff --git a/libs/nixio/axTLS/ssl/test/axTLS.key_aes128.pem b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.key_aes128.pem
index 8961bd9a59..8961bd9a59 100644
--- a/libs/nixio/axTLS/ssl/test/axTLS.key_aes128.pem
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.key_aes128.pem
diff --git a/libs/nixio/axTLS/ssl/test/axTLS.key_aes256.pem b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.key_aes256.pem
index 7671a302fb..7671a302fb 100644
--- a/libs/nixio/axTLS/ssl/test/axTLS.key_aes256.pem
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.key_aes256.pem
diff --git a/libs/nixio/axTLS/ssl/test/axTLS.noname.p12 b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.noname.p12
index 9d27999fa0..9d27999fa0 100644
--- a/libs/nixio/axTLS/ssl/test/axTLS.noname.p12
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.noname.p12
diff --git a/libs/nixio/axTLS/ssl/test/axTLS.unencrypted.p8 b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.unencrypted.p8
index d04694b1fd..d04694b1fd 100644
--- a/libs/nixio/axTLS/ssl/test/axTLS.unencrypted.p8
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.unencrypted.p8
diff --git a/libs/nixio/axTLS/ssl/test/axTLS.unencrypted_pem.p8 b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.unencrypted_pem.p8
index e07375a848..e07375a848 100644
--- a/libs/nixio/axTLS/ssl/test/axTLS.unencrypted_pem.p8
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.unencrypted_pem.p8
diff --git a/libs/nixio/axTLS/ssl/test/axTLS.withCA.p12 b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.withCA.p12
index ae029dee0f..ae029dee0f 100644
--- a/libs/nixio/axTLS/ssl/test/axTLS.withCA.p12
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.withCA.p12
diff --git a/libs/nixio/axTLS/ssl/test/axTLS.withoutCA.p12 b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.withoutCA.p12
index c4eb54c444..c4eb54c444 100644
--- a/libs/nixio/axTLS/ssl/test/axTLS.withoutCA.p12
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.withoutCA.p12
diff --git a/libs/nixio/axTLS/ssl/test/axTLS.x509_1024.cer b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.x509_1024.cer
index fc92d05642..fc92d05642 100644
--- a/libs/nixio/axTLS/ssl/test/axTLS.x509_1024.cer
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.x509_1024.cer
diff --git a/libs/nixio/axTLS/ssl/test/axTLS.x509_1024.pem b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.x509_1024.pem
index 81f3eaf1c4..81f3eaf1c4 100644
--- a/libs/nixio/axTLS/ssl/test/axTLS.x509_1024.pem
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.x509_1024.pem
diff --git a/libs/nixio/axTLS/ssl/test/axTLS.x509_2048.cer b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.x509_2048.cer
index c0badf7288..c0badf7288 100644
--- a/libs/nixio/axTLS/ssl/test/axTLS.x509_2048.cer
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.x509_2048.cer
diff --git a/libs/nixio/axTLS/ssl/test/axTLS.x509_2048.pem b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.x509_2048.pem
index 1ed0141afb..1ed0141afb 100644
--- a/libs/nixio/axTLS/ssl/test/axTLS.x509_2048.pem
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.x509_2048.pem
diff --git a/libs/nixio/axTLS/ssl/test/axTLS.x509_4096.cer b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.x509_4096.cer
index 40bbe94fdd..40bbe94fdd 100644
--- a/libs/nixio/axTLS/ssl/test/axTLS.x509_4096.cer
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.x509_4096.cer
diff --git a/libs/nixio/axTLS/ssl/test/axTLS.x509_4096.pem b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.x509_4096.pem
index b7aed1caba..b7aed1caba 100644
--- a/libs/nixio/axTLS/ssl/test/axTLS.x509_4096.pem
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.x509_4096.pem
diff --git a/libs/nixio/axTLS/ssl/test/axTLS.x509_512.cer b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.x509_512.cer
index 48c6e13aa0..48c6e13aa0 100644
--- a/libs/nixio/axTLS/ssl/test/axTLS.x509_512.cer
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.x509_512.cer
diff --git a/libs/nixio/axTLS/ssl/test/axTLS.x509_512.pem b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.x509_512.pem
index 8191e489f3..8191e489f3 100644
--- a/libs/nixio/axTLS/ssl/test/axTLS.x509_512.pem
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.x509_512.pem
diff --git a/libs/nixio/axTLS/ssl/test/axTLS.x509_aes128.pem b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.x509_aes128.pem
index 9a75fe960e..9a75fe960e 100644
--- a/libs/nixio/axTLS/ssl/test/axTLS.x509_aes128.pem
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.x509_aes128.pem
diff --git a/libs/nixio/axTLS/ssl/test/axTLS.x509_aes256.pem b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.x509_aes256.pem
index 4f3074e011..4f3074e011 100644
--- a/libs/nixio/axTLS/ssl/test/axTLS.x509_aes256.pem
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.x509_aes256.pem
diff --git a/libs/nixio/axTLS/ssl/test/axTLS.x509_bad_after.pem b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.x509_bad_after.pem
index 79eb9ccd68..79eb9ccd68 100644
--- a/libs/nixio/axTLS/ssl/test/axTLS.x509_bad_after.pem
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.x509_bad_after.pem
diff --git a/libs/nixio/axTLS/ssl/test/axTLS.x509_bad_before.pem b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.x509_bad_before.pem
index fe72b541b2..fe72b541b2 100644
--- a/libs/nixio/axTLS/ssl/test/axTLS.x509_bad_before.pem
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.x509_bad_before.pem
diff --git a/libs/nixio/axTLS/ssl/test/axTLS.x509_device.cer b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.x509_device.cer
index c966743c9c..c966743c9c 100644
--- a/libs/nixio/axTLS/ssl/test/axTLS.x509_device.cer
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.x509_device.cer
diff --git a/libs/nixio/axTLS/ssl/test/axTLS.x509_device.pem b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.x509_device.pem
index e9cbaaf314..e9cbaaf314 100644
--- a/libs/nixio/axTLS/ssl/test/axTLS.x509_device.pem
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.x509_device.pem
diff --git a/libs/nixio/axTLS/ssl/test/datatest.c b/libs/luci-lib-nixio/axTLS/ssl/test/datatest.c
index 2a5e836e5b..2a5e836e5b 100644
--- a/libs/nixio/axTLS/ssl/test/datatest.c
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/datatest.c
diff --git a/libs/nixio/axTLS/ssl/test/datatest.c.old b/libs/luci-lib-nixio/axTLS/ssl/test/datatest.c.old
index a5703fb9ec..a5703fb9ec 100644
--- a/libs/nixio/axTLS/ssl/test/datatest.c.old
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/datatest.c.old
diff --git a/libs/nixio/axTLS/ssl/test/deutsche_telecom.x509_ca b/libs/luci-lib-nixio/axTLS/ssl/test/deutsche_telecom.x509_ca
index 0f4b96a0d5..0f4b96a0d5 100644
--- a/libs/nixio/axTLS/ssl/test/deutsche_telecom.x509_ca
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/deutsche_telecom.x509_ca
diff --git a/libs/nixio/axTLS/ssl/test/equifax.x509_ca b/libs/luci-lib-nixio/axTLS/ssl/test/equifax.x509_ca
index 79b0a3f987..79b0a3f987 100644
--- a/libs/nixio/axTLS/ssl/test/equifax.x509_ca
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/equifax.x509_ca
diff --git a/libs/nixio/axTLS/ssl/test/gnutls.cer b/libs/luci-lib-nixio/axTLS/ssl/test/gnutls.cer
index 312e365404..312e365404 100755
--- a/libs/nixio/axTLS/ssl/test/gnutls.cer
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/gnutls.cer
diff --git a/libs/nixio/axTLS/ssl/test/header_issue.dat b/libs/luci-lib-nixio/axTLS/ssl/test/header_issue.dat
index a48d23d2b9..a48d23d2b9 100755
--- a/libs/nixio/axTLS/ssl/test/header_issue.dat
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/header_issue.dat
diff --git a/libs/nixio/axTLS/ssl/test/killopenssl.sh b/libs/luci-lib-nixio/axTLS/ssl/test/killopenssl.sh
index 17950fbaef..17950fbaef 100755
--- a/libs/nixio/axTLS/ssl/test/killopenssl.sh
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/killopenssl.sh
diff --git a/libs/nixio/axTLS/ssl/test/make_certs.sh b/libs/luci-lib-nixio/axTLS/ssl/test/make_certs.sh
index dfc39d4f53..dfc39d4f53 100755
--- a/libs/nixio/axTLS/ssl/test/make_certs.sh
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/make_certs.sh
diff --git a/libs/nixio/axTLS/ssl/test/microsoft.x509_ca b/libs/luci-lib-nixio/axTLS/ssl/test/microsoft.x509_ca
index b90803452b..b90803452b 100644
--- a/libs/nixio/axTLS/ssl/test/microsoft.x509_ca
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/microsoft.x509_ca
diff --git a/libs/nixio/axTLS/ssl/test/microsoft.x509_ca.pem b/libs/luci-lib-nixio/axTLS/ssl/test/microsoft.x509_ca.pem
index 478e60b070..478e60b070 100644
--- a/libs/nixio/axTLS/ssl/test/microsoft.x509_ca.pem
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/microsoft.x509_ca.pem
diff --git a/libs/nixio/axTLS/ssl/test/ms_iis.cer b/libs/luci-lib-nixio/axTLS/ssl/test/ms_iis.cer
index 250b926d68..250b926d68 100755
--- a/libs/nixio/axTLS/ssl/test/ms_iis.cer
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/ms_iis.cer
diff --git a/libs/nixio/axTLS/ssl/test/perf_bigint.c b/libs/luci-lib-nixio/axTLS/ssl/test/perf_bigint.c
index a4ffab6a3a..a4ffab6a3a 100644
--- a/libs/nixio/axTLS/ssl/test/perf_bigint.c
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/perf_bigint.c
diff --git a/libs/nixio/axTLS/ssl/test/socgen.cer b/libs/luci-lib-nixio/axTLS/ssl/test/socgen.cer
index a4278705b7..a4278705b7 100755
--- a/libs/nixio/axTLS/ssl/test/socgen.cer
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/socgen.cer
diff --git a/libs/nixio/axTLS/ssl/test/ssltest.c b/libs/luci-lib-nixio/axTLS/ssl/test/ssltest.c
index d525e1a686..d525e1a686 100644
--- a/libs/nixio/axTLS/ssl/test/ssltest.c
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/ssltest.c
diff --git a/libs/nixio/axTLS/ssl/test/ssltest.c.bak b/libs/luci-lib-nixio/axTLS/ssl/test/ssltest.c.bak
index ca9637f9ac..ca9637f9ac 100644
--- a/libs/nixio/axTLS/ssl/test/ssltest.c.bak
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/ssltest.c.bak
diff --git a/libs/nixio/axTLS/ssl/test/test_axssl.sh b/libs/luci-lib-nixio/axTLS/ssl/test/test_axssl.sh
index acf11a630c..acf11a630c 100755
--- a/libs/nixio/axTLS/ssl/test/test_axssl.sh
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/test_axssl.sh
diff --git a/libs/nixio/axTLS/ssl/test/thawte.x509_ca b/libs/luci-lib-nixio/axTLS/ssl/test/thawte.x509_ca
index 59b1059f84..59b1059f84 100644
--- a/libs/nixio/axTLS/ssl/test/thawte.x509_ca
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/thawte.x509_ca
diff --git a/libs/nixio/axTLS/ssl/test/verisign.x509_ca b/libs/luci-lib-nixio/axTLS/ssl/test/verisign.x509_ca
index d2ea1289d6..d2ea1289d6 100644
--- a/libs/nixio/axTLS/ssl/test/verisign.x509_ca
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/verisign.x509_ca
diff --git a/libs/nixio/axTLS/ssl/test/verisign.x509_ca.pem b/libs/luci-lib-nixio/axTLS/ssl/test/verisign.x509_ca.pem
index d5ef5d241b..d5ef5d241b 100644
--- a/libs/nixio/axTLS/ssl/test/verisign.x509_ca.pem
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/verisign.x509_ca.pem
diff --git a/libs/nixio/axTLS/ssl/test/verisign.x509_my_cert b/libs/luci-lib-nixio/axTLS/ssl/test/verisign.x509_my_cert
index 426c9ff7f1..426c9ff7f1 100644
--- a/libs/nixio/axTLS/ssl/test/verisign.x509_my_cert
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/verisign.x509_my_cert
diff --git a/libs/nixio/axTLS/ssl/test/verisign.x509_my_cert.pem b/libs/luci-lib-nixio/axTLS/ssl/test/verisign.x509_my_cert.pem
index 5b6c1ffedd..5b6c1ffedd 100644
--- a/libs/nixio/axTLS/ssl/test/verisign.x509_my_cert.pem
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/verisign.x509_my_cert.pem
diff --git a/libs/nixio/axTLS/ssl/tls1.c b/libs/luci-lib-nixio/axTLS/ssl/tls1.c
index 658c2c15d4..658c2c15d4 100755
--- a/libs/nixio/axTLS/ssl/tls1.c
+++ b/libs/luci-lib-nixio/axTLS/ssl/tls1.c
diff --git a/libs/nixio/axTLS/ssl/tls1.h b/libs/luci-lib-nixio/axTLS/ssl/tls1.h
index b64b4fda62..b64b4fda62 100755
--- a/libs/nixio/axTLS/ssl/tls1.h
+++ b/libs/luci-lib-nixio/axTLS/ssl/tls1.h
diff --git a/libs/nixio/axTLS/ssl/tls1_clnt.c b/libs/luci-lib-nixio/axTLS/ssl/tls1_clnt.c
index 91314333c0..91314333c0 100644
--- a/libs/nixio/axTLS/ssl/tls1_clnt.c
+++ b/libs/luci-lib-nixio/axTLS/ssl/tls1_clnt.c
diff --git a/libs/nixio/axTLS/ssl/tls1_svr.c b/libs/luci-lib-nixio/axTLS/ssl/tls1_svr.c
index 45b9bec6a6..45b9bec6a6 100644
--- a/libs/nixio/axTLS/ssl/tls1_svr.c
+++ b/libs/luci-lib-nixio/axTLS/ssl/tls1_svr.c
diff --git a/libs/nixio/axTLS/ssl/version.h b/libs/luci-lib-nixio/axTLS/ssl/version.h
index 72260bf19e..72260bf19e 100644
--- a/libs/nixio/axTLS/ssl/version.h
+++ b/libs/luci-lib-nixio/axTLS/ssl/version.h
diff --git a/libs/nixio/axTLS/ssl/x509.c b/libs/luci-lib-nixio/axTLS/ssl/x509.c
index 37db7f4e81..37db7f4e81 100644
--- a/libs/nixio/axTLS/ssl/x509.c
+++ b/libs/luci-lib-nixio/axTLS/ssl/x509.c
diff --git a/libs/nixio/axTLS/www/bin/.htaccess b/libs/luci-lib-nixio/axTLS/www/bin/.htaccess
index 4496fa9edd..4496fa9edd 100644
--- a/libs/nixio/axTLS/www/bin/.htaccess
+++ b/libs/luci-lib-nixio/axTLS/www/bin/.htaccess
diff --git a/libs/nixio/axTLS/www/favicon.ico b/libs/luci-lib-nixio/axTLS/www/favicon.ico
index 9f6f30e4c6..9f6f30e4c6 100644
--- a/libs/nixio/axTLS/www/favicon.ico
+++ b/libs/luci-lib-nixio/axTLS/www/favicon.ico
diff --git a/libs/nixio/axTLS/www/index.html b/libs/luci-lib-nixio/axTLS/www/index.html
index 25cd2e69b1..25cd2e69b1 100755
--- a/libs/nixio/axTLS/www/index.html
+++ b/libs/luci-lib-nixio/axTLS/www/index.html
diff --git a/libs/nixio/axTLS/www/lua/download.lua b/libs/luci-lib-nixio/axTLS/www/lua/download.lua
index 2ee1a71e93..2ee1a71e93 100644
--- a/libs/nixio/axTLS/www/lua/download.lua
+++ b/libs/luci-lib-nixio/axTLS/www/lua/download.lua
diff --git a/libs/nixio/axTLS/www/lua/env.lua b/libs/luci-lib-nixio/axTLS/www/lua/env.lua
index c4298477b6..c4298477b6 100644
--- a/libs/nixio/axTLS/www/lua/env.lua
+++ b/libs/luci-lib-nixio/axTLS/www/lua/env.lua
diff --git a/libs/nixio/axTLS/www/lua/overview.lp b/libs/luci-lib-nixio/axTLS/www/lua/overview.lp
index 4d17002a01..4d17002a01 100644
--- a/libs/nixio/axTLS/www/lua/overview.lp
+++ b/libs/luci-lib-nixio/axTLS/www/lua/overview.lp
diff --git a/libs/nixio/axTLS/www/lua/prepara_sql2.lua b/libs/luci-lib-nixio/axTLS/www/lua/prepara_sql2.lua
index 6a37c2fef7..6a37c2fef7 100644
--- a/libs/nixio/axTLS/www/lua/prepara_sql2.lua
+++ b/libs/luci-lib-nixio/axTLS/www/lua/prepara_sql2.lua
diff --git a/libs/nixio/axTLS/www/lua/test_conc.lua b/libs/luci-lib-nixio/axTLS/www/lua/test_conc.lua
index bbb9be784a..bbb9be784a 100644
--- a/libs/nixio/axTLS/www/lua/test_conc.lua
+++ b/libs/luci-lib-nixio/axTLS/www/lua/test_conc.lua
diff --git a/libs/nixio/axTLS/www/lua/test_cookies.lp b/libs/luci-lib-nixio/axTLS/www/lua/test_cookies.lp
index 932b9c5e98..932b9c5e98 100644
--- a/libs/nixio/axTLS/www/lua/test_cookies.lp
+++ b/libs/luci-lib-nixio/axTLS/www/lua/test_cookies.lp
diff --git a/libs/nixio/axTLS/www/lua/test_cookies.lua b/libs/luci-lib-nixio/axTLS/www/lua/test_cookies.lua
index 6af935e894..6af935e894 100644
--- a/libs/nixio/axTLS/www/lua/test_cookies.lua
+++ b/libs/luci-lib-nixio/axTLS/www/lua/test_cookies.lua
diff --git a/libs/nixio/axTLS/www/lua/test_err.lua b/libs/luci-lib-nixio/axTLS/www/lua/test_err.lua
index 4d6ffc9708..4d6ffc9708 100644
--- a/libs/nixio/axTLS/www/lua/test_err.lua
+++ b/libs/luci-lib-nixio/axTLS/www/lua/test_err.lua
diff --git a/libs/nixio/axTLS/www/lua/test_fs.lua b/libs/luci-lib-nixio/axTLS/www/lua/test_fs.lua
index 566ed8b204..566ed8b204 100644
--- a/libs/nixio/axTLS/www/lua/test_fs.lua
+++ b/libs/luci-lib-nixio/axTLS/www/lua/test_fs.lua
diff --git a/libs/nixio/axTLS/www/lua/test_htk.lua b/libs/luci-lib-nixio/axTLS/www/lua/test_htk.lua
index ac1de6c31b..ac1de6c31b 100644
--- a/libs/nixio/axTLS/www/lua/test_htk.lua
+++ b/libs/luci-lib-nixio/axTLS/www/lua/test_htk.lua
diff --git a/libs/nixio/axTLS/www/lua/test_lib.lua b/libs/luci-lib-nixio/axTLS/www/lua/test_lib.lua
index 5041253725..5041253725 100644
--- a/libs/nixio/axTLS/www/lua/test_lib.lua
+++ b/libs/luci-lib-nixio/axTLS/www/lua/test_lib.lua
diff --git a/libs/nixio/axTLS/www/lua/test_main.html b/libs/luci-lib-nixio/axTLS/www/lua/test_main.html
index a50dd639ca..a50dd639ca 100644
--- a/libs/nixio/axTLS/www/lua/test_main.html
+++ b/libs/luci-lib-nixio/axTLS/www/lua/test_main.html
diff --git a/libs/nixio/axTLS/www/lua/test_main.lp b/libs/luci-lib-nixio/axTLS/www/lua/test_main.lp
index 917ee1e536..917ee1e536 100644
--- a/libs/nixio/axTLS/www/lua/test_main.lp
+++ b/libs/luci-lib-nixio/axTLS/www/lua/test_main.lp
diff --git a/libs/nixio/axTLS/www/lua/test_main.lua b/libs/luci-lib-nixio/axTLS/www/lua/test_main.lua
index 0e997a2d57..0e997a2d57 100644
--- a/libs/nixio/axTLS/www/lua/test_main.lua
+++ b/libs/luci-lib-nixio/axTLS/www/lua/test_main.lua
diff --git a/libs/nixio/axTLS/www/lua/test_session.lua b/libs/luci-lib-nixio/axTLS/www/lua/test_session.lua
index d97cc45201..d97cc45201 100644
--- a/libs/nixio/axTLS/www/lua/test_session.lua
+++ b/libs/luci-lib-nixio/axTLS/www/lua/test_session.lua
diff --git a/libs/nixio/axTLS/www/lua/test_sql.lua b/libs/luci-lib-nixio/axTLS/www/lua/test_sql.lua
index 085ce978c7..085ce978c7 100644
--- a/libs/nixio/axTLS/www/lua/test_sql.lua
+++ b/libs/luci-lib-nixio/axTLS/www/lua/test_sql.lua
diff --git a/libs/nixio/axTLS/www/lua/test_sql2.lua b/libs/luci-lib-nixio/axTLS/www/lua/test_sql2.lua
index a2f6ee12dc..a2f6ee12dc 100644
--- a/libs/nixio/axTLS/www/lua/test_sql2.lua
+++ b/libs/luci-lib-nixio/axTLS/www/lua/test_sql2.lua
diff --git a/libs/nixio/axTLS/www/lua/test_variables.lp b/libs/luci-lib-nixio/axTLS/www/lua/test_variables.lp
index c1ac332f02..c1ac332f02 100644
--- a/libs/nixio/axTLS/www/lua/test_variables.lp
+++ b/libs/luci-lib-nixio/axTLS/www/lua/test_variables.lp
diff --git a/libs/nixio/axTLS/www/test_dir/bin/.htaccess b/libs/luci-lib-nixio/axTLS/www/test_dir/bin/.htaccess
index 8fd8c463a1..8fd8c463a1 100644
--- a/libs/nixio/axTLS/www/test_dir/bin/.htaccess
+++ b/libs/luci-lib-nixio/axTLS/www/test_dir/bin/.htaccess
diff --git a/libs/nixio/axTLS/www/test_dir/no_http/.htaccess b/libs/luci-lib-nixio/axTLS/www/test_dir/no_http/.htaccess
index 3e20076a2c..3e20076a2c 100644
--- a/libs/nixio/axTLS/www/test_dir/no_http/.htaccess
+++ b/libs/luci-lib-nixio/axTLS/www/test_dir/no_http/.htaccess
diff --git a/libs/nixio/axTLS/www/test_dir/no_http/.htpasswd b/libs/luci-lib-nixio/axTLS/www/test_dir/no_http/.htpasswd
index 0471b01400..0471b01400 100644
--- a/libs/nixio/axTLS/www/test_dir/no_http/.htpasswd
+++ b/libs/luci-lib-nixio/axTLS/www/test_dir/no_http/.htpasswd
diff --git a/libs/nixio/axTLS/www/test_dir/no_http/index.html b/libs/luci-lib-nixio/axTLS/www/test_dir/no_http/index.html
index 8b86eba8ed..8b86eba8ed 100644
--- a/libs/nixio/axTLS/www/test_dir/no_http/index.html
+++ b/libs/luci-lib-nixio/axTLS/www/test_dir/no_http/index.html
diff --git a/libs/nixio/axTLS/www/test_dir/no_ssl/.htaccess b/libs/luci-lib-nixio/axTLS/www/test_dir/no_ssl/.htaccess
index d980d265a5..d980d265a5 100644
--- a/libs/nixio/axTLS/www/test_dir/no_ssl/.htaccess
+++ b/libs/luci-lib-nixio/axTLS/www/test_dir/no_ssl/.htaccess
diff --git a/libs/nixio/axTLS/www/test_dir/no_ssl/index.html b/libs/luci-lib-nixio/axTLS/www/test_dir/no_ssl/index.html
index 8b86eba8ed..8b86eba8ed 100644
--- a/libs/nixio/axTLS/www/test_dir/no_ssl/index.html
+++ b/libs/luci-lib-nixio/axTLS/www/test_dir/no_ssl/index.html
diff --git a/libs/nixio/axtls-config/.config b/libs/luci-lib-nixio/axtls-config/.config
index 46cd061b4d..46cd061b4d 100644
--- a/libs/nixio/axtls-config/.config
+++ b/libs/luci-lib-nixio/axtls-config/.config
diff --git a/libs/nixio/axtls-config/config.h b/libs/luci-lib-nixio/axtls-config/config.h
index 0f861f34b3..0f861f34b3 100644
--- a/libs/nixio/axtls-config/config.h
+++ b/libs/luci-lib-nixio/axtls-config/config.h
diff --git a/libs/nixio/axtls-root/etc/nixio/rsa_main.der b/libs/luci-lib-nixio/axtls-root/etc/nixio/rsa_main.der
index e17fdc0a0c..e17fdc0a0c 100644
--- a/libs/nixio/axtls-root/etc/nixio/rsa_main.der
+++ b/libs/luci-lib-nixio/axtls-root/etc/nixio/rsa_main.der
diff --git a/libs/nixio/docsrc/CHANGELOG.lua b/libs/luci-lib-nixio/docsrc/CHANGELOG.lua
index fb1cf160b6..fb1cf160b6 100644
--- a/libs/nixio/docsrc/CHANGELOG.lua
+++ b/libs/luci-lib-nixio/docsrc/CHANGELOG.lua
diff --git a/libs/nixio/docsrc/README.lua b/libs/luci-lib-nixio/docsrc/README.lua
index b957a69903..b957a69903 100644
--- a/libs/nixio/docsrc/README.lua
+++ b/libs/luci-lib-nixio/docsrc/README.lua
diff --git a/libs/nixio/docsrc/nixio.CryptoHash.lua b/libs/luci-lib-nixio/docsrc/nixio.CryptoHash.lua
index a08b48d680..a08b48d680 100644
--- a/libs/nixio/docsrc/nixio.CryptoHash.lua
+++ b/libs/luci-lib-nixio/docsrc/nixio.CryptoHash.lua
diff --git a/libs/nixio/docsrc/nixio.File.lua b/libs/luci-lib-nixio/docsrc/nixio.File.lua
index 368562a2a1..368562a2a1 100644
--- a/libs/nixio/docsrc/nixio.File.lua
+++ b/libs/luci-lib-nixio/docsrc/nixio.File.lua
diff --git a/libs/nixio/docsrc/nixio.Socket.lua b/libs/luci-lib-nixio/docsrc/nixio.Socket.lua
index 7123393bf4..7123393bf4 100644
--- a/libs/nixio/docsrc/nixio.Socket.lua
+++ b/libs/luci-lib-nixio/docsrc/nixio.Socket.lua
diff --git a/libs/nixio/docsrc/nixio.TLSContext.lua b/libs/luci-lib-nixio/docsrc/nixio.TLSContext.lua
index 7cc071195a..7cc071195a 100644
--- a/libs/nixio/docsrc/nixio.TLSContext.lua
+++ b/libs/luci-lib-nixio/docsrc/nixio.TLSContext.lua
diff --git a/libs/nixio/docsrc/nixio.TLSSocket.lua b/libs/luci-lib-nixio/docsrc/nixio.TLSSocket.lua
index b932cde0d2..b932cde0d2 100644
--- a/libs/nixio/docsrc/nixio.TLSSocket.lua
+++ b/libs/luci-lib-nixio/docsrc/nixio.TLSSocket.lua
diff --git a/libs/nixio/docsrc/nixio.UnifiedIO.lua b/libs/luci-lib-nixio/docsrc/nixio.UnifiedIO.lua
index 6e407ff2ca..6e407ff2ca 100644
--- a/libs/nixio/docsrc/nixio.UnifiedIO.lua
+++ b/libs/luci-lib-nixio/docsrc/nixio.UnifiedIO.lua
diff --git a/libs/nixio/docsrc/nixio.bin.lua b/libs/luci-lib-nixio/docsrc/nixio.bin.lua
index 13e125d3cc..13e125d3cc 100644
--- a/libs/nixio/docsrc/nixio.bin.lua
+++ b/libs/luci-lib-nixio/docsrc/nixio.bin.lua
diff --git a/libs/nixio/docsrc/nixio.bit.lua b/libs/luci-lib-nixio/docsrc/nixio.bit.lua
index 6951dd5321..6951dd5321 100644
--- a/libs/nixio/docsrc/nixio.bit.lua
+++ b/libs/luci-lib-nixio/docsrc/nixio.bit.lua
diff --git a/libs/nixio/docsrc/nixio.crypto.lua b/libs/luci-lib-nixio/docsrc/nixio.crypto.lua
index 158d0fc0bd..158d0fc0bd 100644
--- a/libs/nixio/docsrc/nixio.crypto.lua
+++ b/libs/luci-lib-nixio/docsrc/nixio.crypto.lua
diff --git a/libs/nixio/docsrc/nixio.fs.lua b/libs/luci-lib-nixio/docsrc/nixio.fs.lua
index 5d08719e96..5d08719e96 100644
--- a/libs/nixio/docsrc/nixio.fs.lua
+++ b/libs/luci-lib-nixio/docsrc/nixio.fs.lua
diff --git a/libs/nixio/docsrc/nixio.lua b/libs/luci-lib-nixio/docsrc/nixio.lua
index 1b434d76de..1b434d76de 100644
--- a/libs/nixio/docsrc/nixio.lua
+++ b/libs/luci-lib-nixio/docsrc/nixio.lua
diff --git a/libs/nixio/nixio-0.3-1.rockspec b/libs/luci-lib-nixio/nixio-0.3-1.rockspec
index 755cf815d2..755cf815d2 100644
--- a/libs/nixio/nixio-0.3-1.rockspec
+++ b/libs/luci-lib-nixio/nixio-0.3-1.rockspec
diff --git a/libs/nixio/root/lib/upgrade/luci-add-conffiles.sh b/libs/luci-lib-nixio/root/lib/upgrade/luci-add-conffiles.sh
index 77399b9872..77399b9872 100644
--- a/libs/nixio/root/lib/upgrade/luci-add-conffiles.sh
+++ b/libs/luci-lib-nixio/root/lib/upgrade/luci-add-conffiles.sh
diff --git a/libs/nixio/lua/bit.lua b/libs/luci-lib-nixio/root/usr/lib/lua/bit.lua
index cdfecb1a48..cdfecb1a48 100644
--- a/libs/nixio/lua/bit.lua
+++ b/libs/luci-lib-nixio/root/usr/lib/lua/bit.lua
diff --git a/libs/nixio/lua/nixio/fs.lua b/libs/luci-lib-nixio/root/usr/lib/lua/nixio/fs.lua
index 8883835f30..8883835f30 100644
--- a/libs/nixio/lua/nixio/fs.lua
+++ b/libs/luci-lib-nixio/root/usr/lib/lua/nixio/fs.lua
diff --git a/libs/nixio/lua/nixio/util.lua b/libs/luci-lib-nixio/root/usr/lib/lua/nixio/util.lua
index 63d2f62147..63d2f62147 100644
--- a/libs/nixio/lua/nixio/util.lua
+++ b/libs/luci-lib-nixio/root/usr/lib/lua/nixio/util.lua
diff --git a/libs/nixio/Makefile b/libs/luci-lib-nixio/src/Makefile
index 49ba3ff229..aaa4292bd9 100644
--- a/libs/nixio/Makefile
+++ b/libs/luci-lib-nixio/src/Makefile
@@ -1,34 +1,29 @@
-ifneq (,$(wildcard ../../build/config.mk))
-include ../../build/config.mk
-include ../../build/module.mk
-include ../../build/gccconfig.mk
-else
-include standalone.mk
-endif
-
+OS            = $(shell uname)
 AXTLS_VERSION = 1.2.1
 AXTLS_DIR     = axTLS
 AXTLS_FILE    = $(AXTLS_DIR)-$(AXTLS_VERSION).tar.gz
 #NIXIO_TLS    ?= openssl
 NIXIO_SHADOW ?= $(shell echo 'int main(void){ return !getspnam("root"); }' | $(CC) $(CFLAGS) -include shadow.h -xc -o/dev/null - 2>/dev/null && echo yes)
 NIXIO_SO      = nixio.so
-NIXIO_LDFLAGS =
+NIXIO_LDFLAGS = -llua -lm -ldl
+CFLAGS       += -std=gnu99
 
 ifeq (,$(findstring Darwin,$(OS)))
-	NIXIO_LDFLAGS += -lcrypt
+	NIXIO_LDFLAGS += -lcrypt -shared
 else
+        NIXIO_LDFLAGS += -bundle -undefined dynamic_lookup
 	EXTRA_CFLAGS += -D__DARWIN__
 endif
 
-NIXIO_OBJ = src/nixio.o src/socket.o src/sockopt.o src/bind.o src/address.o \
-	    src/protoent.o src/poll.o src/io.o src/file.o src/splice.o src/process.o \
-	    src/syslog.o src/bit.o src/binary.o src/fs.o src/user.o \
-	    $(if $(NIXIO_TLS),src/tls-crypto.o src/tls-context.o src/tls-socket.o,)
+NIXIO_OBJ = nixio.o socket.o sockopt.o bind.o address.o \
+	    protoent.o poll.o io.o file.o splice.o process.o \
+	    syslog.o bit.o binary.o fs.o user.o \
+	    $(if $(NIXIO_TLS),tls-crypto.o tls-context.o tls-socket.o,)
 
 ifeq ($(NIXIO_TLS),axtls)
-	TLS_CFLAGS = -IaxTLS/ssl -IaxTLS/crypto -IaxTLS/config -include src/axtls-compat.h
-	TLS_DEPENDS = src/axtls-compat.o
-	NIXIO_OBJ += src/axtls-compat.o src/libaxtls.a
+	TLS_CFLAGS = -IaxTLS/ssl -IaxTLS/crypto -IaxTLS/config -include axtls-compat.h
+	TLS_DEPENDS = axtls-compat.o
+	NIXIO_OBJ += axtls-compat.o libaxtls.a
 endif
 
 ifeq ($(NIXIO_TLS),openssl)
@@ -37,9 +32,9 @@ endif
 
 ifeq ($(NIXIO_TLS),cyassl)
 	NIXIO_LDFLAGS += -lcyassl
-	TLS_DEPENDS = src/cyassl-compat.o
-	TLS_CFLAGS = -include src/cyassl-compat.h
-	NIXIO_OBJ += src/cyassl-compat.o
+	TLS_DEPENDS = cyassl-compat.o
+	TLS_CFLAGS = -include cyassl-compat.h
+	NIXIO_OBJ += cyassl-compat.o
 endif
 
 ifeq ($(NIXIO_TLS),)
@@ -60,7 +55,7 @@ ifneq (,$(findstring MINGW,$(OS))$(findstring mingw,$(OS))$(findstring Windows,$
 ifneq (,$(NIXIO_CROSS_CC))
 	CC:=$(NIXIO_CROSS_CC)
 endif
-	NIXIO_OBJ += src/mingw-compat.o
+	NIXIO_OBJ += mingw-compat.o
 	NIXIO_LDFLAGS_POST:=-llua -lssl -lcrypto -lws2_32 -lgdi32
 	FPIC:=
 	EXTRA_CFLAGS += -D_WIN32_WINNT=0x0501
@@ -71,28 +66,28 @@ endif
 
 
 %.o: %.c
-	$(COMPILE) $(NIXIO_CFLAGS) $(LUA_CFLAGS) $(FPIC) -c -o $@ $< 
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(NIXIO_CFLAGS) $(LUA_CFLAGS) $(FPIC) -c -o $@ $< 
 
 ifneq ($(NIXIO_TLS),)
-src/tls-crypto.o: $(TLS_DEPENDS) src/tls-crypto.c
-	$(COMPILE) $(NIXIO_CFLAGS) $(LUA_CFLAGS) $(FPIC) $(TLS_CFLAGS) -c -o $@ src/tls-crypto.c
+tls-crypto.o: $(TLS_DEPENDS) tls-crypto.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(NIXIO_CFLAGS) $(LUA_CFLAGS) $(FPIC) $(TLS_CFLAGS) -c -o $@ tls-crypto.c
 
-src/tls-context.o: $(TLS_DEPENDS) src/tls-context.c
-	$(COMPILE) $(NIXIO_CFLAGS) $(LUA_CFLAGS) $(FPIC) $(TLS_CFLAGS) -c -o $@ src/tls-context.c
+tls-context.o: $(TLS_DEPENDS) tls-context.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(NIXIO_CFLAGS) $(LUA_CFLAGS) $(FPIC) $(TLS_CFLAGS) -c -o $@ tls-context.c
 	
-src/tls-socket.o: $(TLS_DEPENDS) src/tls-socket.c
-	$(COMPILE) $(NIXIO_CFLAGS) $(LUA_CFLAGS) $(FPIC) $(TLS_CFLAGS) -c -o $@ src/tls-socket.c
+tls-socket.o: $(TLS_DEPENDS) tls-socket.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(NIXIO_CFLAGS) $(LUA_CFLAGS) $(FPIC) $(TLS_CFLAGS) -c -o $@ tls-socket.c
 	
-src/axtls-compat.o: src/libaxtls.a src/axtls-compat.c
-	$(COMPILE) $(NIXIO_CFLAGS) $(LUA_CFLAGS) $(FPIC) $(TLS_CFLAGS) -c -o $@ src/axtls-compat.c
+axtls-compat.o: libaxtls.a axtls-compat.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(NIXIO_CFLAGS) $(LUA_CFLAGS) $(FPIC) $(TLS_CFLAGS) -c -o $@ axtls-compat.c
 	mkdir -p dist
 	cp -pR axtls-root/* dist/
 endif	
 
 compile: $(NIXIO_OBJ)
-	$(LINK) $(SHLIB_FLAGS) -o src/$(NIXIO_SO) $(NIXIO_OBJ) $(NIXIO_LDFLAGS) $(NIXIO_LDFLAGS_POST)
-	mkdir -p dist$(LUA_LIBRARYDIR)
-	cp src/$(NIXIO_SO) dist$(LUA_LIBRARYDIR)/$(NIXIO_SO)
+	$(CC) $(LDFLAGS) $(SHLIB_FLAGS) -o $(NIXIO_SO) $(NIXIO_OBJ) $(NIXIO_LDFLAGS) $(NIXIO_LDFLAGS_POST)
+	mkdir -p dist/usr/lib/lua
+	cp $(NIXIO_SO) dist/usr/lib/lua/$(NIXIO_SO)
 
 $(AXTLS_DIR)/.prepared:
 	#rm -rf $(AXTLS_DIR)
@@ -100,7 +95,7 @@ $(AXTLS_DIR)/.prepared:
 	cp axtls-config/.config axtls-config/config.h $(AXTLS_DIR)/config
 	touch $@
 
-src/libaxtls.a: $(AXTLS_DIR)/.prepared
+libaxtls.a: $(AXTLS_DIR)/.prepared
 	$(MAKE) -C $(AXTLS_DIR) CC="$(CC)" CFLAGS="$(CFLAGS) $(EXTRA_CFLAGS) $(FPIC) -Wall -pedantic -I../config -I../ssl -I../crypto" LDFLAGS="$(LDFLAGS)" OS="$(OS)" clean all
 	cp -p $(AXTLS_DIR)/_stage/libaxtls.a src
 	# *************************************************************************
@@ -116,10 +111,10 @@ src/libaxtls.a: $(AXTLS_DIR)/.prepared
 	#
 	#**************************************************************************
 
-clean: luaclean
-	rm -f src/*.o src/*.so src/*.a src/*.dll
+clean:
+	rm -f *.o *.so *.a *.dll
 	rm -f $(AXTLS_DIR)/.prepared
 
-install: build
-	cp -pR dist$(LUA_MODULEDIR)/* $(LUA_MODULEDIR)
-	cp -pR dist$(LUA_LIBRARYDIR)/* $(LUA_LIBRARYDIR)
+install: compile
+	mkdir -p $(DESTDIR)
+	cp -pR dist/* $(DESTDIR)/
diff --git a/libs/nixio/src/address.c b/libs/luci-lib-nixio/src/address.c
index 4fd557d6a7..4fd557d6a7 100644
--- a/libs/nixio/src/address.c
+++ b/libs/luci-lib-nixio/src/address.c
diff --git a/libs/nixio/src/axtls-compat.c b/libs/luci-lib-nixio/src/axtls-compat.c
index 2c5b746c2d..2c5b746c2d 100644
--- a/libs/nixio/src/axtls-compat.c
+++ b/libs/luci-lib-nixio/src/axtls-compat.c
diff --git a/libs/nixio/src/axtls-compat.h b/libs/luci-lib-nixio/src/axtls-compat.h
index aee24f56c8..aee24f56c8 100644
--- a/libs/nixio/src/axtls-compat.h
+++ b/libs/luci-lib-nixio/src/axtls-compat.h
diff --git a/libs/nixio/src/binary.c b/libs/luci-lib-nixio/src/binary.c
index 2c41622280..2c41622280 100644
--- a/libs/nixio/src/binary.c
+++ b/libs/luci-lib-nixio/src/binary.c
diff --git a/libs/nixio/src/bind.c b/libs/luci-lib-nixio/src/bind.c
index 68e1df8a8c..68e1df8a8c 100644
--- a/libs/nixio/src/bind.c
+++ b/libs/luci-lib-nixio/src/bind.c
diff --git a/libs/nixio/src/bit.c b/libs/luci-lib-nixio/src/bit.c
index 1b352c51c5..1b352c51c5 100644
--- a/libs/nixio/src/bit.c
+++ b/libs/luci-lib-nixio/src/bit.c
diff --git a/libs/nixio/src/cyassl-compat.c b/libs/luci-lib-nixio/src/cyassl-compat.c
index a483119ac9..a483119ac9 100644
--- a/libs/nixio/src/cyassl-compat.c
+++ b/libs/luci-lib-nixio/src/cyassl-compat.c
diff --git a/libs/nixio/src/cyassl-compat.h b/libs/luci-lib-nixio/src/cyassl-compat.h
index b2cdc92331..b2cdc92331 100644
--- a/libs/nixio/src/cyassl-compat.h
+++ b/libs/luci-lib-nixio/src/cyassl-compat.h
diff --git a/libs/nixio/src/file.c b/libs/luci-lib-nixio/src/file.c
index b86e040e1d..b86e040e1d 100644
--- a/libs/nixio/src/file.c
+++ b/libs/luci-lib-nixio/src/file.c
diff --git a/libs/nixio/src/fs.c b/libs/luci-lib-nixio/src/fs.c
index 12ca111ac0..12ca111ac0 100644
--- a/libs/nixio/src/fs.c
+++ b/libs/luci-lib-nixio/src/fs.c
diff --git a/libs/nixio/src/io.c b/libs/luci-lib-nixio/src/io.c
index 12d5c7df45..12d5c7df45 100644
--- a/libs/nixio/src/io.c
+++ b/libs/luci-lib-nixio/src/io.c
diff --git a/libs/nixio/src/mingw-compat.c b/libs/luci-lib-nixio/src/mingw-compat.c
index 02be504a13..02be504a13 100644
--- a/libs/nixio/src/mingw-compat.c
+++ b/libs/luci-lib-nixio/src/mingw-compat.c
diff --git a/libs/nixio/src/mingw-compat.h b/libs/luci-lib-nixio/src/mingw-compat.h
index a26a4beecf..a26a4beecf 100644
--- a/libs/nixio/src/mingw-compat.h
+++ b/libs/luci-lib-nixio/src/mingw-compat.h
diff --git a/libs/nixio/src/nixio-tls.h b/libs/luci-lib-nixio/src/nixio-tls.h
index 0fac5a980d..0fac5a980d 100644
--- a/libs/nixio/src/nixio-tls.h
+++ b/libs/luci-lib-nixio/src/nixio-tls.h
diff --git a/libs/nixio/src/nixio.c b/libs/luci-lib-nixio/src/nixio.c
index ae81c6f964..ae81c6f964 100644
--- a/libs/nixio/src/nixio.c
+++ b/libs/luci-lib-nixio/src/nixio.c
diff --git a/libs/nixio/src/nixio.h b/libs/luci-lib-nixio/src/nixio.h
index 8802e92043..8802e92043 100644
--- a/libs/nixio/src/nixio.h
+++ b/libs/luci-lib-nixio/src/nixio.h
diff --git a/libs/nixio/src/poll.c b/libs/luci-lib-nixio/src/poll.c
index 1211bc72ac..1211bc72ac 100644
--- a/libs/nixio/src/poll.c
+++ b/libs/luci-lib-nixio/src/poll.c
diff --git a/libs/nixio/src/process.c b/libs/luci-lib-nixio/src/process.c
index 5ae9b829ea..5ae9b829ea 100644
--- a/libs/nixio/src/process.c
+++ b/libs/luci-lib-nixio/src/process.c
diff --git a/libs/nixio/src/protoent.c b/libs/luci-lib-nixio/src/protoent.c
index bda68a5845..bda68a5845 100644
--- a/libs/nixio/src/protoent.c
+++ b/libs/luci-lib-nixio/src/protoent.c
diff --git a/libs/nixio/src/socket.c b/libs/luci-lib-nixio/src/socket.c
index 17c6afc790..17c6afc790 100644
--- a/libs/nixio/src/socket.c
+++ b/libs/luci-lib-nixio/src/socket.c
diff --git a/libs/nixio/src/sockopt.c b/libs/luci-lib-nixio/src/sockopt.c
index cede884ce4..cede884ce4 100644
--- a/libs/nixio/src/sockopt.c
+++ b/libs/luci-lib-nixio/src/sockopt.c
diff --git a/libs/nixio/src/splice.c b/libs/luci-lib-nixio/src/splice.c
index db63ea9a89..db63ea9a89 100644
--- a/libs/nixio/src/splice.c
+++ b/libs/luci-lib-nixio/src/splice.c
diff --git a/libs/nixio/src/syslog.c b/libs/luci-lib-nixio/src/syslog.c
index 89f1b1dda1..89f1b1dda1 100644
--- a/libs/nixio/src/syslog.c
+++ b/libs/luci-lib-nixio/src/syslog.c
diff --git a/libs/nixio/src/tls-context.c b/libs/luci-lib-nixio/src/tls-context.c
index e9a833f590..e9a833f590 100644
--- a/libs/nixio/src/tls-context.c
+++ b/libs/luci-lib-nixio/src/tls-context.c
diff --git a/libs/nixio/src/tls-crypto.c b/libs/luci-lib-nixio/src/tls-crypto.c
index 714ec4e60c..714ec4e60c 100644
--- a/libs/nixio/src/tls-crypto.c
+++ b/libs/luci-lib-nixio/src/tls-crypto.c
diff --git a/libs/nixio/src/tls-socket.c b/libs/luci-lib-nixio/src/tls-socket.c
index fe4cb60755..fe4cb60755 100644
--- a/libs/nixio/src/tls-socket.c
+++ b/libs/luci-lib-nixio/src/tls-socket.c
diff --git a/libs/nixio/src/user.c b/libs/luci-lib-nixio/src/user.c
index b701bac955..b701bac955 100644
--- a/libs/nixio/src/user.c
+++ b/libs/luci-lib-nixio/src/user.c
diff --git a/libs/nixio/standalone.mk b/libs/luci-lib-nixio/standalone.mk
index 95f6bece42..95f6bece42 100644
--- a/libs/nixio/standalone.mk
+++ b/libs/luci-lib-nixio/standalone.mk
diff --git a/libs/luci-lib-px5g/Makefile b/libs/luci-lib-px5g/Makefile
new file mode 100644
index 0000000000..906a1052e3
--- /dev/null
+++ b/libs/luci-lib-px5g/Makefile
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=RSA/X.509 Key Generator (required for LuCId SSL support)
+LUCI_DEPENDS:=+luci-lib-nixio
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/libs/px5g/lua/px5g/util.lua b/libs/luci-lib-px5g/lua/px5g/util.lua
index 0f07c81b8c..0f07c81b8c 100644
--- a/libs/px5g/lua/px5g/util.lua
+++ b/libs/luci-lib-px5g/lua/px5g/util.lua
diff --git a/libs/px5g/root/usr/sbin/px5g-genkeys b/libs/luci-lib-px5g/root/usr/sbin/px5g-genkeys
index 87a66bfe26..87a66bfe26 100755
--- a/libs/px5g/root/usr/sbin/px5g-genkeys
+++ b/libs/luci-lib-px5g/root/usr/sbin/px5g-genkeys
diff --git a/libs/px5g/src/library/bignum.c b/libs/luci-lib-px5g/src/library/bignum.c
index 8b7c12ff00..8b7c12ff00 100644
--- a/libs/px5g/src/library/bignum.c
+++ b/libs/luci-lib-px5g/src/library/bignum.c
diff --git a/libs/px5g/src/library/havege.c b/libs/luci-lib-px5g/src/library/havege.c
index 266299d3bb..266299d3bb 100644
--- a/libs/px5g/src/library/havege.c
+++ b/libs/luci-lib-px5g/src/library/havege.c
diff --git a/libs/px5g/src/library/rsa.c b/libs/luci-lib-px5g/src/library/rsa.c
index 131b6c6c9c..131b6c6c9c 100644
--- a/libs/px5g/src/library/rsa.c
+++ b/libs/luci-lib-px5g/src/library/rsa.c
diff --git a/libs/px5g/src/library/sha1.c b/libs/luci-lib-px5g/src/library/sha1.c
index 54a4416f31..54a4416f31 100644
--- a/libs/px5g/src/library/sha1.c
+++ b/libs/luci-lib-px5g/src/library/sha1.c
diff --git a/libs/px5g/src/library/timing.c b/libs/luci-lib-px5g/src/library/timing.c
index 6b7ab740e1..6b7ab740e1 100644
--- a/libs/px5g/src/library/timing.c
+++ b/libs/luci-lib-px5g/src/library/timing.c
diff --git a/libs/px5g/src/library/x509write.c b/libs/luci-lib-px5g/src/library/x509write.c
index 173610c1a0..173610c1a0 100644
--- a/libs/px5g/src/library/x509write.c
+++ b/libs/luci-lib-px5g/src/library/x509write.c
diff --git a/libs/px5g/src/polarssl/bignum.h b/libs/luci-lib-px5g/src/polarssl/bignum.h
index c667303329..c667303329 100644
--- a/libs/px5g/src/polarssl/bignum.h
+++ b/libs/luci-lib-px5g/src/polarssl/bignum.h
diff --git a/libs/px5g/src/polarssl/bn_mul.h b/libs/luci-lib-px5g/src/polarssl/bn_mul.h
index f6d34da58a..f6d34da58a 100644
--- a/libs/px5g/src/polarssl/bn_mul.h
+++ b/libs/luci-lib-px5g/src/polarssl/bn_mul.h
diff --git a/libs/px5g/src/polarssl/config.h b/libs/luci-lib-px5g/src/polarssl/config.h
index 6463e5219f..6463e5219f 100644
--- a/libs/px5g/src/polarssl/config.h
+++ b/libs/luci-lib-px5g/src/polarssl/config.h
diff --git a/libs/px5g/src/polarssl/havege.h b/libs/luci-lib-px5g/src/polarssl/havege.h
index c27cecac0f..c27cecac0f 100644
--- a/libs/px5g/src/polarssl/havege.h
+++ b/libs/luci-lib-px5g/src/polarssl/havege.h
diff --git a/libs/px5g/src/polarssl/rsa.h b/libs/luci-lib-px5g/src/polarssl/rsa.h
index b31dc2f144..b31dc2f144 100644
--- a/libs/px5g/src/polarssl/rsa.h
+++ b/libs/luci-lib-px5g/src/polarssl/rsa.h
diff --git a/libs/px5g/src/polarssl/sha1.h b/libs/luci-lib-px5g/src/polarssl/sha1.h
index 3ca7dc3195..3ca7dc3195 100644
--- a/libs/px5g/src/polarssl/sha1.h
+++ b/libs/luci-lib-px5g/src/polarssl/sha1.h
diff --git a/libs/px5g/src/polarssl/timing.h b/libs/luci-lib-px5g/src/polarssl/timing.h
index 62d627f61b..62d627f61b 100644
--- a/libs/px5g/src/polarssl/timing.h
+++ b/libs/luci-lib-px5g/src/polarssl/timing.h
diff --git a/libs/px5g/src/polarssl/x509.h b/libs/luci-lib-px5g/src/polarssl/x509.h
index 908a1dbf51..908a1dbf51 100644
--- a/libs/px5g/src/polarssl/x509.h
+++ b/libs/luci-lib-px5g/src/polarssl/x509.h
diff --git a/libs/px5g/src/px5g.c b/libs/luci-lib-px5g/src/px5g.c
index feecd01275..feecd01275 100644
--- a/libs/px5g/src/px5g.c
+++ b/libs/luci-lib-px5g/src/px5g.c
diff --git a/libs/px5g/src/px5g.h b/libs/luci-lib-px5g/src/px5g.h
index 47542b5c06..47542b5c06 100644
--- a/libs/px5g/src/px5g.h
+++ b/libs/luci-lib-px5g/src/px5g.h
diff --git a/libs/luci-lib-rpcc/Makefile b/libs/luci-lib-rpcc/Makefile
new file mode 100644
index 0000000000..e0fea28a5c
--- /dev/null
+++ b/libs/luci-lib-rpcc/Makefile
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=LuCI Support for AHCPd
+LUCI_DEPENDS:=@BROKEN
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/libs/rpcc/luasrc/rpcc.lua b/libs/luci-lib-rpcc/luasrc/rpcc.lua
index ef94d3bbd5..ef94d3bbd5 100644
--- a/libs/rpcc/luasrc/rpcc.lua
+++ b/libs/luci-lib-rpcc/luasrc/rpcc.lua
diff --git a/libs/rpcc/luasrc/rpcc/ruci.lua b/libs/luci-lib-rpcc/luasrc/rpcc/ruci.lua
index 05cb728059..05cb728059 100644
--- a/libs/rpcc/luasrc/rpcc/ruci.lua
+++ b/libs/luci-lib-rpcc/luasrc/rpcc/ruci.lua
diff --git a/libs/px5g/Makefile b/libs/px5g/Makefile
deleted file mode 100644
index 80a650ed00..0000000000
--- a/libs/px5g/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-include ../../build/config.mk
-include ../../build/module.mk
-include ../../build/gccconfig.mk
-
-PX5G_LIB_CFLAGS = -Isrc/ -include src/polarssl/rsa.h \
-	-include src/polarssl/x509.h \
-	$(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) $(WFLAGS)
-
-PX5G_OBJ_CFLAGS = -Isrc/ \
-	$(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) $(WFLAGS)
-
-PX5G_LIB = src/library/bignum.o src/library/havege.o src/library/rsa.o \
-		src/library/sha1.o src/library/timing.o src/library/x509write.o
-PX5G_OBJ = src/px5g.o
-
-src/library/%.o: src/library/%.c
-	$(CC) $(PX5G_LIB_CFLAGS) $(FPIC) -c -o $@ $<
-
-%.o: %.c
-	$(CC) $(PX5G_OBJ_CFLAGS) $(LUA_CFLAGS) $(FPIC) -c -o $@ $<
-
-compile: $(PX5G_LIB) $(PX5G_OBJ)
-	$(LINK) $(SHLIB_FLAGS) -o src/px5g.so $(PX5G_OBJ) $(PX5G_LIB)
-	mkdir -p dist$(LUA_LIBRARYDIR)
-	cp src/px5g.so dist$(LUA_LIBRARYDIR)/px5g.so
-
-clean: luaclean
-	rm -f $(PX5G_OBJ) $(PX5G_LIB) src/*.o src/*.so src/*.a src/*.dll
diff --git a/libs/rpcc/Makefile b/libs/rpcc/Makefile
deleted file mode 100644
index 81a96f6a83..0000000000
--- a/libs/rpcc/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-include ../../build/config.mk
-include ../../build/module.mk
\ No newline at end of file
diff --git a/luci.mk b/luci.mk
new file mode 100644
index 0000000000..12e9b02ef2
--- /dev/null
+++ b/luci.mk
@@ -0,0 +1,206 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+LUCI_NAME?=$(notdir ${CURDIR})
+LUCI_TYPE?=$(word 2,$(subst -, ,$(LUCI_NAME)))
+LUCI_BASENAME?=$(patsubst luci-$(LUCI_TYPE)-%,%,$(LUCI_NAME))
+LUCI_LANGUAGES:=$(filter-out templates,$(notdir $(wildcard ${CURDIR}/po/*)))
+LUCI_DEFAULTS:=$(notdir $(wildcard ${CURDIR}/root/etc/uci-defaults/*))
+
+# Language code titles
+LUCI_LANG.ca=Català (Catalan)
+LUCI_LANG.cs=Čeština (Czech)
+LUCI_LANG.de=Deutsch (German)
+LUCI_LANG.el=Ελληνικά (Greek)
+LUCI_LANG.en=English
+LUCI_LANG.es=Español (Spanish)
+LUCI_LANG.fr=Français (French)
+LUCI_LANG.he=עִבְרִית (Hebrew)
+LUCI_LANG.hu=Magyar (Hungarian)
+LUCI_LANG.it=Italiano (Italian)
+LUCI_LANG.ja=日本語 (Japanese)
+LUCI_LANG.ms=Bahasa Melayu (Malay)
+LUCI_LANG.no=Norsk (Norwegian)
+LUCI_LANG.pl=Polski (Polish)
+LUCI_LANG.pt-br=Português do Brasil (Brazialian Portuguese)
+LUCI_LANG.pt=Português (Portuguese)
+LUCI_LANG.ro=Română (Romanian)
+LUCI_LANG.ru=Русский (Russian)
+LUCI_LANG.sk=Slovenčina (Slovene)
+LUCI_LANG.sv=Svenska (Swedish)
+LUCI_LANG.tr=Türkçe (Turkish)
+LUCI_LANG.uk=украї́нська (Ukrainian)
+LUCI_LANG.vi=Tiếng Việt (Vietnamese)
+LUCI_LANG.zh-cn=普通话 (Chinese)
+LUCI_LANG.zh-tw=臺灣華語 (Taiwanese)
+
+# Submenu titles
+LUCI_MENU.col=1. Collections
+LUCI_MENU.mod=2. Modules
+LUCI_MENU.app=3. Applications
+LUCI_MENU.theme=4. Themes
+LUCI_MENU.proto=5. Protocols
+LUCI_MENU.lib=6. Libraries
+
+
+PKG_NAME?=$(LUCI_NAME)
+
+PKG_VERSION?=$(if $(DUMP),x,$(strip $(shell \
+	if svn info >/dev/null 2>/dev/null; then \
+		revision="svn-r$$(LC_ALL=C svn info | sed -ne 's/^Revision: //p')"; \
+	elif git log -1 >/dev/null 2>/dev/null; then \
+		revision="svn-r$$(LC_ALL=C git log -1 | sed -ne 's/.*git-svn-id: .*@\([0-9]\+\) .*/\1/p')"; \
+		if [ "$$revision" = "svn-r" ]; then \
+			set -- $$(git log -1 --format="%ct %h"); \
+			secs="$$(($$1 % 86400))"; \
+			yday="$$(date --utc --date="@$$1" "+%y.%j")"; \
+			revision="$$(printf 'git-%s.%05d-%s' "$$yday" "$$secs" "$$2")"; \
+		fi; \
+	else \
+		revision="unknown"; \
+	fi; \
+	echo "$$revision" \
+)))
+
+PKG_RELEASE?=1
+PKG_INSTALL:=$(if $(realpath src/Makefile),1)
+PKG_BUILD_DEPENDS += lua/host luci-base/host $(LUCI_BUILD_DEPENDS)
+PKG_CONFIG_DEPENDS += CONFIG_LUCI_SRCDIET
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/$(PKG_NAME)
+  SECTION:=luci
+  CATEGORY:=LuCI
+  SUBMENU:=$(if $(LUCI_MENU.$(LUCI_TYPE)),$(LUCI_MENU.$(LUCI_TYPE)),$(LUCI_MENU.app))
+  TITLE:=$(if $(LUCI_TITLE),$(LUCI_TITLE),LuCI $(LUCI_NAME) $(LUCI_TYPE))
+  DEPENDS:=$(foreach lang,$(LUCI_LANGUAGES),+LUCI_LANG_$(lang):luci-i18n-$(LUCI_BASENAME)-$(lang)) $(LUCI_DEPENDS)
+endef
+
+ifneq ($(LUCI_DESCRIPTION),)
+ define Package/$(PKG_NAME)/description
+   $(strip $(LUCI_DESCRIPTION))
+ endef
+endif
+
+# Language selection for luci-base
+ifeq ($(PKG_NAME),luci-base)
+ define Package/luci-base/config
+   config LUCI_SRCDIET
+	bool "Minify Lua sources"
+	default n
+
+   menu "Translations"$(foreach lang,$(LUCI_LANGUAGES),
+
+     config LUCI_LANG_$(lang)
+	   bool "$(shell echo '$(LUCI_LANG.$(lang))' | sed -e 's/^.* (\(.*\))$$/\1/') ($(lang))")
+
+   endmenu
+ endef
+endif
+
+define Build/Prepare
+	for d in luasrc htdocs root src; do \
+	  if [ -d ./$$$$d ]; then \
+	    mkdir -p $(PKG_BUILD_DIR)/$$$$d; \
+		$(CP) ./$$$$d/* $(PKG_BUILD_DIR)/$$$$d/; \
+	  fi; \
+	done
+	$(call Build/Prepare/Default)
+endef
+
+define Build/Configure
+endef
+
+ifneq ($(wildcard ${CURDIR}/src/Makefile),)
+ MAKE_PATH := src/
+ MAKE_VARS += FPIC="$(FPIC)" LUCI_VERSION="$(PKG_VERSION)"
+
+ define Build/Compile
+	$(call Build/Compile/Default,clean compile)
+ endef
+else
+ define Build/Compile
+ endef
+endif
+
+HTDOCS = /www
+LUA_LIBRARYDIR = /usr/lib/lua
+LUCI_LIBRARYDIR = $(LUA_LIBRARYDIR)/luci
+
+define SrcDiet
+	$(FIND) $(1) -type f -name '*.lua' | while read src; do \
+		if $(STAGING_DIR_HOST)/bin/lua $(STAGING_DIR_HOST)/bin/LuaSrcDiet \
+			--noopt-binequiv -o "$$$$src.o" "$$$$src"; \
+		then mv "$$$$src.o" "$$$$src"; fi; \
+	done
+endef
+
+define Package/$(PKG_NAME)/install
+	if [ -d $(PKG_BUILD_DIR)/luasrc ]; then \
+	  $(INSTALL_DIR) $(1)$(LUCI_LIBRARYDIR); \
+	  cp -pR $(PKG_BUILD_DIR)/luasrc/* $(1)$(LUCI_LIBRARYDIR)/; \
+	  $(if $(CONFIG_LUCI_SRCDIET),$(call SrcDiet,$(1)$(LUCI_LIBRARYDIR)/),true); \
+	else true; fi
+	if [ -d $(PKG_BUILD_DIR)/htdocs ]; then \
+	  $(INSTALL_DIR) $(1)$(HTDOCS); \
+	  cp -pR $(PKG_BUILD_DIR)/htdocs/* $(1)$(HTDOCS)/; \
+	else true; fi
+	if [ -d $(PKG_BUILD_DIR)/root ]; then \
+	  $(INSTALL_DIR) $(1)/; \
+	  cp -pR $(PKG_BUILD_DIR)/root/* $(1)/; \
+	else true; fi
+	if [ -d $(PKG_BUILD_DIR)/src ]; then \
+	  $(call Build/Install/Default) \
+	  $(CP) $(PKG_INSTALL_DIR)/* $(1)/; \
+	else true; fi
+endef
+
+ifneq ($(LUCI_DEFAULTS),)
+define Package/$(PKG_NAME)/postinst
+[ -n "$${IPKG_INSTROOT}" ] || {$(foreach script,$(LUCI_DEFAULTS),
+	(. /etc/uci-defaults/$(script)) && rm -f /etc/uci-defaults/$(script))
+	exit 0
+}
+endef
+endif
+
+
+LUCI_BUILD_PACKAGES := $(PKG_NAME)
+
+define LuciTranslation
+  define Package/luci-i18n-$(LUCI_BASENAME)-$(1)
+    SECTION:=luci
+    CATEGORY:=LuCI
+    TITLE:=$(PKG_NAME) - $(1) translation
+    HIDDEN:=1
+  endef
+
+  define Package/luci-i18n-$(LUCI_BASENAME)-$(1)/install
+	$$(INSTALL_DIR) $$(1)/etc/uci-defaults
+	echo "uci set luci.languages.$(subst -,_,$(1))='$(LUCI_LANG.$(1))'; uci commit luci" \
+		> $$(1)/etc/uci-defaults/luci-i18n-$(LUCI_BASENAME)-$(1)
+	$$(INSTALL_DIR) $$(1)$(LUCI_LIBRARYDIR)/i18n
+	$(foreach po,$(wildcard ${CURDIR}/po/$(1)/*.po), \
+		po2lmo $(po) \
+			$$(1)$(LUCI_LIBRARYDIR)/i18n/$(basename $(notdir $(po))).$(1).lmo;)
+  endef
+
+  define Package/luci-i18n-$(LUCI_BASENAME)-$(1)/postinst
+	[ -n "$$$${IPKG_INSTROOT}" ] || {
+		(. /etc/uci-defaults/luci-i18n-$(LUCI_BASENAME)-$(1)) && rm -f /etc/uci-defaults/luci-i18n-$(LUCI_BASENAME)-$(1)
+		exit 0
+	}
+  endef
+
+  LUCI_BUILD_PACKAGES += luci-i18n-$(LUCI_BASENAME)-$(1)
+
+endef
+
+$(foreach lang,$(LUCI_LANGUAGES),$(eval $(call LuciTranslation,$(lang))))
+$(foreach pkg,$(LUCI_BUILD_PACKAGES),$(eval $(call BuildPackage,$(pkg))))
diff --git a/modules/admin-full/Makefile b/modules/admin-full/Makefile
deleted file mode 100644
index 819d13f33f..0000000000
--- a/modules/admin-full/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-include ../../build/config.mk
-include ../../build/module.mk
-include ../../build/gccconfig.mk
-
-BWC_LDFLAGS    = -ldl
-BWC_CFLAGS     =
-BWC_BIN        = luci-bwc
-BWC_OBJ        = src/luci-bwc.o
-
-%.o: %.c
-	$(COMPILE) $(BWC_CFLAGS) $(LUA_CFLAGS) $(FPIC) -c -o $@ $<
-
-compile: build-clean $(BWC_OBJ)
-	$(LINK) -o src/$(BWC_BIN) $(BWC_OBJ) $(BWC_LDFLAGS)
-	mkdir -p dist/usr/bin
-	cp src/$(BWC_BIN) dist/usr/bin/$(BWC_BIN)
-
-install: build
-	cp -pR dist/usr/bin/$(BWC_BIN) /usr/bin/$(BWC_BIN)
-
-clean: build-clean
-
-build-clean:
-	rm -f src/*.o src/$(BWC_BIN)
diff --git a/modules/admin-mini/Makefile b/modules/admin-mini/Makefile
deleted file mode 100644
index 81a96f6a83..0000000000
--- a/modules/admin-mini/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-include ../../build/config.mk
-include ../../build/module.mk
\ No newline at end of file
diff --git a/modules/base/Makefile b/modules/base/Makefile
deleted file mode 100644
index ad16ec7376..0000000000
--- a/modules/base/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-ifneq (,$(wildcard ../../build/config.mk))
-include ../../build/config.mk
-include ../../build/module.mk
-include ../../build/gccconfig.mk
-else
-include standalone.mk
-endif
-
-TPL_LDFLAGS    =
-TPL_CFLAGS     =
-TPL_SO         = parser.so
-TPL_PO2LMO     = po2lmo
-TPL_PO2LMO_OBJ = src/po2lmo.o
-TPL_LMO_OBJ    = src/template_lmo.o
-TPL_COMMON_OBJ = src/template_parser.o src/template_utils.o
-TPL_LUALIB_OBJ = src/template_lualib.o
-
-%.o: %.c
-	$(COMPILE) $(TPL_CFLAGS) $(LUA_CFLAGS) $(FPIC) -c -o $@ $<
-
-compile: build-clean $(TPL_COMMON_OBJ) $(TPL_LUALIB_OBJ) $(TPL_LMO_OBJ) $(TPL_PO2LMO_OBJ)
-	$(LINK) $(SHLIB_FLAGS) $(TPL_LDFLAGS) -o src/$(TPL_SO) \
-		$(TPL_COMMON_OBJ) $(TPL_LMO_OBJ) $(TPL_LUALIB_OBJ)
-	$(LINK) -o src/$(TPL_PO2LMO) \
-		$(TPL_LMO_OBJ) $(TPL_PO2LMO_OBJ)
-	mkdir -p dist$(LUCI_LIBRARYDIR)/template
-	cp src/$(TPL_SO) dist$(LUCI_LIBRARYDIR)/template/$(TPL_SO)
-
-install: build
-	cp -pR dist$(LUA_LIBRARYDIR)/* $(LUA_LIBRARYDIR)
-
-clean: build-clean
-
-build-clean:
-	rm -f src/*.o src/$(TPL_SO)
-
-host-compile: build-clean host-clean $(TPL_LMO_OBJ) $(TPL_PO2LMO_OBJ)
-	$(LINK) -o src/$(TPL_PO2LMO) $(TPL_LMO_OBJ) $(TPL_PO2LMO_OBJ)
-
-host-install: host-compile
-	cp src/$(TPL_PO2LMO) ../../build/$(TPL_PO2LMO)
-
-host-clean:
-	rm -f src/$(TPL_PO2LMO)
-	rm -f ../../build/$(TPL_PO2LMO)
diff --git a/modules/failsafe/Makefile b/modules/failsafe/Makefile
deleted file mode 100644
index 81a96f6a83..0000000000
--- a/modules/failsafe/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-include ../../build/config.mk
-include ../../build/module.mk
\ No newline at end of file
diff --git a/modules/freifunk/Makefile b/modules/freifunk/Makefile
deleted file mode 100644
index 82c5b1324e..0000000000
--- a/modules/freifunk/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-PO = freifunk
-
-include ../../build/config.mk
-include ../../build/module.mk
diff --git a/modules/luci-base/Makefile b/modules/luci-base/Makefile
new file mode 100644
index 0000000000..ea40adc267
--- /dev/null
+++ b/modules/luci-base/Makefile
@@ -0,0 +1,42 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=luci-base
+
+LUCI_TYPE:=mod
+LUCI_BASENAME:=base
+
+LUCI_TITLE:=LuCI core libraries
+
+PKG_SOURCE:=LuaSrcDiet-0.12.1.tar.bz2
+PKG_SOURCE_URL:=https://luasrcdiet.googlecode.com/files
+PKG_MD5SUM:=8a0812701e29b6715e4d76f2f118264a
+
+HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/LuaSrcDiet-0.12.1
+
+include $(INCLUDE_DIR)/host-build.mk
+
+include ../../luci.mk
+
+define Host/Configure
+endef
+
+define Host/Compile
+	$(MAKE) -C src/ clean po2lmo
+	$(MAKE) -C $(HOST_BUILD_DIR) bin/LuaSrcDiet.lua
+endef
+
+define Host/Install
+	$(INSTALL_DIR) $(STAGING_DIR_HOST)/bin
+	$(INSTALL_BIN) src/po2lmo $(STAGING_DIR_HOST)/bin/po2lmo
+	$(INSTALL_BIN) $(HOST_BUILD_DIR)/bin/LuaSrcDiet.lua $(STAGING_DIR_HOST)/bin/LuaSrcDiet
+endef
+
+$(eval $(call HostBuild))
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/modules/base/htdocs/cgi-bin/luci b/modules/luci-base/htdocs/cgi-bin/luci
index 529d1d0bc5..529d1d0bc5 100755
--- a/modules/base/htdocs/cgi-bin/luci
+++ b/modules/luci-base/htdocs/cgi-bin/luci
diff --git a/modules/base/htdocs/luci-static/resources/cbi.js b/modules/luci-base/htdocs/luci-static/resources/cbi.js
index 02814a5428..02814a5428 100644
--- a/modules/base/htdocs/luci-static/resources/cbi.js
+++ b/modules/luci-base/htdocs/luci-static/resources/cbi.js
diff --git a/modules/base/htdocs/luci-static/resources/cbi/add.gif b/modules/luci-base/htdocs/luci-static/resources/cbi/add.gif
index 0888abf85e..0888abf85e 100644
--- a/modules/base/htdocs/luci-static/resources/cbi/add.gif
+++ b/modules/luci-base/htdocs/luci-static/resources/cbi/add.gif
diff --git a/modules/base/htdocs/luci-static/resources/cbi/apply.gif b/modules/luci-base/htdocs/luci-static/resources/cbi/apply.gif
index 82ae7ed821..82ae7ed821 100644
--- a/modules/base/htdocs/luci-static/resources/cbi/apply.gif
+++ b/modules/luci-base/htdocs/luci-static/resources/cbi/apply.gif
diff --git a/modules/base/htdocs/luci-static/resources/cbi/arrow.gif b/modules/luci-base/htdocs/luci-static/resources/cbi/arrow.gif
index 10d797e9b0..10d797e9b0 100644
--- a/modules/base/htdocs/luci-static/resources/cbi/arrow.gif
+++ b/modules/luci-base/htdocs/luci-static/resources/cbi/arrow.gif
diff --git a/modules/base/htdocs/luci-static/resources/cbi/down.gif b/modules/luci-base/htdocs/luci-static/resources/cbi/down.gif
index f0bb6a4ea6..f0bb6a4ea6 100644
--- a/modules/base/htdocs/luci-static/resources/cbi/down.gif
+++ b/modules/luci-base/htdocs/luci-static/resources/cbi/down.gif
diff --git a/modules/base/htdocs/luci-static/resources/cbi/download.gif b/modules/luci-base/htdocs/luci-static/resources/cbi/download.gif
index f99a5383b2..f99a5383b2 100644
--- a/modules/base/htdocs/luci-static/resources/cbi/download.gif
+++ b/modules/luci-base/htdocs/luci-static/resources/cbi/download.gif
diff --git a/modules/base/htdocs/luci-static/resources/cbi/edit.gif b/modules/luci-base/htdocs/luci-static/resources/cbi/edit.gif
index 7b02b6e72a..7b02b6e72a 100644
--- a/modules/base/htdocs/luci-static/resources/cbi/edit.gif
+++ b/modules/luci-base/htdocs/luci-static/resources/cbi/edit.gif
diff --git a/modules/base/htdocs/luci-static/resources/cbi/fieldadd.gif b/modules/luci-base/htdocs/luci-static/resources/cbi/fieldadd.gif
index 431ff64d1f..431ff64d1f 100644
--- a/modules/base/htdocs/luci-static/resources/cbi/fieldadd.gif
+++ b/modules/luci-base/htdocs/luci-static/resources/cbi/fieldadd.gif
diff --git a/modules/base/htdocs/luci-static/resources/cbi/file.gif b/modules/luci-base/htdocs/luci-static/resources/cbi/file.gif
index 3b1217dd65..3b1217dd65 100644
--- a/modules/base/htdocs/luci-static/resources/cbi/file.gif
+++ b/modules/luci-base/htdocs/luci-static/resources/cbi/file.gif
diff --git a/modules/base/htdocs/luci-static/resources/cbi/find.gif b/modules/luci-base/htdocs/luci-static/resources/cbi/find.gif
index 9ae5e3489b..9ae5e3489b 100644
--- a/modules/base/htdocs/luci-static/resources/cbi/find.gif
+++ b/modules/luci-base/htdocs/luci-static/resources/cbi/find.gif
diff --git a/modules/base/htdocs/luci-static/resources/cbi/folder.gif b/modules/luci-base/htdocs/luci-static/resources/cbi/folder.gif
index 22b583bb59..22b583bb59 100644
--- a/modules/base/htdocs/luci-static/resources/cbi/folder.gif
+++ b/modules/luci-base/htdocs/luci-static/resources/cbi/folder.gif
diff --git a/modules/base/htdocs/luci-static/resources/cbi/help.gif b/modules/luci-base/htdocs/luci-static/resources/cbi/help.gif
index 9dfa0e196a..9dfa0e196a 100644
--- a/modules/base/htdocs/luci-static/resources/cbi/help.gif
+++ b/modules/luci-base/htdocs/luci-static/resources/cbi/help.gif
diff --git a/modules/base/htdocs/luci-static/resources/cbi/key.gif b/modules/luci-base/htdocs/luci-static/resources/cbi/key.gif
index e3853e5afd..e3853e5afd 100644
--- a/modules/base/htdocs/luci-static/resources/cbi/key.gif
+++ b/modules/luci-base/htdocs/luci-static/resources/cbi/key.gif
diff --git a/modules/base/htdocs/luci-static/resources/cbi/link.gif b/modules/luci-base/htdocs/luci-static/resources/cbi/link.gif
index f0bb78da6b..f0bb78da6b 100644
--- a/modules/base/htdocs/luci-static/resources/cbi/link.gif
+++ b/modules/luci-base/htdocs/luci-static/resources/cbi/link.gif
diff --git a/modules/base/htdocs/luci-static/resources/cbi/reload.gif b/modules/luci-base/htdocs/luci-static/resources/cbi/reload.gif
index 8268958a19..8268958a19 100644
--- a/modules/base/htdocs/luci-static/resources/cbi/reload.gif
+++ b/modules/luci-base/htdocs/luci-static/resources/cbi/reload.gif
diff --git a/modules/base/htdocs/luci-static/resources/cbi/remove.gif b/modules/luci-base/htdocs/luci-static/resources/cbi/remove.gif
index bf43a0a0bc..bf43a0a0bc 100644
--- a/modules/base/htdocs/luci-static/resources/cbi/remove.gif
+++ b/modules/luci-base/htdocs/luci-static/resources/cbi/remove.gif
diff --git a/modules/base/htdocs/luci-static/resources/cbi/reset.gif b/modules/luci-base/htdocs/luci-static/resources/cbi/reset.gif
index c941c19028..c941c19028 100644
--- a/modules/base/htdocs/luci-static/resources/cbi/reset.gif
+++ b/modules/luci-base/htdocs/luci-static/resources/cbi/reset.gif
diff --git a/modules/base/htdocs/luci-static/resources/cbi/save.gif b/modules/luci-base/htdocs/luci-static/resources/cbi/save.gif
index 35e949963e..35e949963e 100644
--- a/modules/base/htdocs/luci-static/resources/cbi/save.gif
+++ b/modules/luci-base/htdocs/luci-static/resources/cbi/save.gif
diff --git a/modules/base/htdocs/luci-static/resources/cbi/up.gif b/modules/luci-base/htdocs/luci-static/resources/cbi/up.gif
index e8234178ef..e8234178ef 100644
--- a/modules/base/htdocs/luci-static/resources/cbi/up.gif
+++ b/modules/luci-base/htdocs/luci-static/resources/cbi/up.gif
diff --git a/modules/base/htdocs/luci-static/resources/cbi/user.gif b/modules/luci-base/htdocs/luci-static/resources/cbi/user.gif
index dcb5c2a899..dcb5c2a899 100644
--- a/modules/base/htdocs/luci-static/resources/cbi/user.gif
+++ b/modules/luci-base/htdocs/luci-static/resources/cbi/user.gif
diff --git a/modules/base/htdocs/luci-static/resources/icons/bridge.png b/modules/luci-base/htdocs/luci-static/resources/icons/bridge.png
index 4c163bf692..4c163bf692 100644
--- a/modules/base/htdocs/luci-static/resources/icons/bridge.png
+++ b/modules/luci-base/htdocs/luci-static/resources/icons/bridge.png
diff --git a/modules/base/htdocs/luci-static/resources/icons/bridge_disabled.png b/modules/luci-base/htdocs/luci-static/resources/icons/bridge_disabled.png
index 0f367c5369..0f367c5369 100644
--- a/modules/base/htdocs/luci-static/resources/icons/bridge_disabled.png
+++ b/modules/luci-base/htdocs/luci-static/resources/icons/bridge_disabled.png
diff --git a/modules/base/htdocs/luci-static/resources/icons/encryption.png b/modules/luci-base/htdocs/luci-static/resources/icons/encryption.png
index 41d2ba9ace..41d2ba9ace 100644
--- a/modules/base/htdocs/luci-static/resources/icons/encryption.png
+++ b/modules/luci-base/htdocs/luci-static/resources/icons/encryption.png
diff --git a/modules/base/htdocs/luci-static/resources/icons/encryption_disabled.png b/modules/luci-base/htdocs/luci-static/resources/icons/encryption_disabled.png
index f2e05a4251..f2e05a4251 100644
--- a/modules/base/htdocs/luci-static/resources/icons/encryption_disabled.png
+++ b/modules/luci-base/htdocs/luci-static/resources/icons/encryption_disabled.png
diff --git a/modules/base/htdocs/luci-static/resources/icons/ethernet.png b/modules/luci-base/htdocs/luci-static/resources/icons/ethernet.png
index a02538124c..a02538124c 100644
--- a/modules/base/htdocs/luci-static/resources/icons/ethernet.png
+++ b/modules/luci-base/htdocs/luci-static/resources/icons/ethernet.png
diff --git a/modules/base/htdocs/luci-static/resources/icons/ethernet_disabled.png b/modules/luci-base/htdocs/luci-static/resources/icons/ethernet_disabled.png
index 2bb02e455a..2bb02e455a 100644
--- a/modules/base/htdocs/luci-static/resources/icons/ethernet_disabled.png
+++ b/modules/luci-base/htdocs/luci-static/resources/icons/ethernet_disabled.png
diff --git a/modules/base/htdocs/luci-static/resources/icons/loading.gif b/modules/luci-base/htdocs/luci-static/resources/icons/loading.gif
index 5bb90fd6a4..5bb90fd6a4 100644
--- a/modules/base/htdocs/luci-static/resources/icons/loading.gif
+++ b/modules/luci-base/htdocs/luci-static/resources/icons/loading.gif
diff --git a/modules/base/htdocs/luci-static/resources/icons/port_down.png b/modules/luci-base/htdocs/luci-static/resources/icons/port_down.png
index 25ea172324..25ea172324 100644
--- a/modules/base/htdocs/luci-static/resources/icons/port_down.png
+++ b/modules/luci-base/htdocs/luci-static/resources/icons/port_down.png
diff --git a/modules/base/htdocs/luci-static/resources/icons/port_up.png b/modules/luci-base/htdocs/luci-static/resources/icons/port_up.png
index e063037910..e063037910 100644
--- a/modules/base/htdocs/luci-static/resources/icons/port_up.png
+++ b/modules/luci-base/htdocs/luci-static/resources/icons/port_up.png
diff --git a/modules/base/htdocs/luci-static/resources/icons/signal-0-25.png b/modules/luci-base/htdocs/luci-static/resources/icons/signal-0-25.png
index 2e5dff4663..2e5dff4663 100644
--- a/modules/base/htdocs/luci-static/resources/icons/signal-0-25.png
+++ b/modules/luci-base/htdocs/luci-static/resources/icons/signal-0-25.png
diff --git a/modules/base/htdocs/luci-static/resources/icons/signal-0.png b/modules/luci-base/htdocs/luci-static/resources/icons/signal-0.png
index 114583a676..114583a676 100644
--- a/modules/base/htdocs/luci-static/resources/icons/signal-0.png
+++ b/modules/luci-base/htdocs/luci-static/resources/icons/signal-0.png
diff --git a/modules/base/htdocs/luci-static/resources/icons/signal-25-50.png b/modules/luci-base/htdocs/luci-static/resources/icons/signal-25-50.png
index ee8cc4f1ce..ee8cc4f1ce 100644
--- a/modules/base/htdocs/luci-static/resources/icons/signal-25-50.png
+++ b/modules/luci-base/htdocs/luci-static/resources/icons/signal-25-50.png
diff --git a/modules/base/htdocs/luci-static/resources/icons/signal-50-75.png b/modules/luci-base/htdocs/luci-static/resources/icons/signal-50-75.png
index 26bcbf715d..26bcbf715d 100644
--- a/modules/base/htdocs/luci-static/resources/icons/signal-50-75.png
+++ b/modules/luci-base/htdocs/luci-static/resources/icons/signal-50-75.png
diff --git a/modules/base/htdocs/luci-static/resources/icons/signal-75-100.png b/modules/luci-base/htdocs/luci-static/resources/icons/signal-75-100.png
index 5cffaa1b84..5cffaa1b84 100644
--- a/modules/base/htdocs/luci-static/resources/icons/signal-75-100.png
+++ b/modules/luci-base/htdocs/luci-static/resources/icons/signal-75-100.png
diff --git a/modules/base/htdocs/luci-static/resources/icons/signal-none.png b/modules/luci-base/htdocs/luci-static/resources/icons/signal-none.png
index b77585c0f0..b77585c0f0 100644
--- a/modules/base/htdocs/luci-static/resources/icons/signal-none.png
+++ b/modules/luci-base/htdocs/luci-static/resources/icons/signal-none.png
diff --git a/modules/base/htdocs/luci-static/resources/icons/switch.png b/modules/luci-base/htdocs/luci-static/resources/icons/switch.png
index 5c99ba5684..5c99ba5684 100644
--- a/modules/base/htdocs/luci-static/resources/icons/switch.png
+++ b/modules/luci-base/htdocs/luci-static/resources/icons/switch.png
diff --git a/modules/base/htdocs/luci-static/resources/icons/switch_disabled.png b/modules/luci-base/htdocs/luci-static/resources/icons/switch_disabled.png
index b8c84c8dc4..b8c84c8dc4 100644
--- a/modules/base/htdocs/luci-static/resources/icons/switch_disabled.png
+++ b/modules/luci-base/htdocs/luci-static/resources/icons/switch_disabled.png
diff --git a/modules/base/htdocs/luci-static/resources/icons/tunnel.png b/modules/luci-base/htdocs/luci-static/resources/icons/tunnel.png
index c5a09dd685..c5a09dd685 100644
--- a/modules/base/htdocs/luci-static/resources/icons/tunnel.png
+++ b/modules/luci-base/htdocs/luci-static/resources/icons/tunnel.png
diff --git a/modules/base/htdocs/luci-static/resources/icons/tunnel_disabled.png b/modules/luci-base/htdocs/luci-static/resources/icons/tunnel_disabled.png
index ad9856cfec..ad9856cfec 100644
--- a/modules/base/htdocs/luci-static/resources/icons/tunnel_disabled.png
+++ b/modules/luci-base/htdocs/luci-static/resources/icons/tunnel_disabled.png
diff --git a/modules/base/htdocs/luci-static/resources/icons/vlan.png b/modules/luci-base/htdocs/luci-static/resources/icons/vlan.png
index 5c99ba5684..5c99ba5684 100644
--- a/modules/base/htdocs/luci-static/resources/icons/vlan.png
+++ b/modules/luci-base/htdocs/luci-static/resources/icons/vlan.png
diff --git a/modules/base/htdocs/luci-static/resources/icons/vlan_disabled.png b/modules/luci-base/htdocs/luci-static/resources/icons/vlan_disabled.png
index b8c84c8dc4..b8c84c8dc4 100644
--- a/modules/base/htdocs/luci-static/resources/icons/vlan_disabled.png
+++ b/modules/luci-base/htdocs/luci-static/resources/icons/vlan_disabled.png
diff --git a/modules/base/htdocs/luci-static/resources/icons/wifi.png b/modules/luci-base/htdocs/luci-static/resources/icons/wifi.png
index 528ce2b4e9..528ce2b4e9 100644
--- a/modules/base/htdocs/luci-static/resources/icons/wifi.png
+++ b/modules/luci-base/htdocs/luci-static/resources/icons/wifi.png
diff --git a/modules/base/htdocs/luci-static/resources/icons/wifi_big.png b/modules/luci-base/htdocs/luci-static/resources/icons/wifi_big.png
index d73a5e7401..d73a5e7401 100644
--- a/modules/base/htdocs/luci-static/resources/icons/wifi_big.png
+++ b/modules/luci-base/htdocs/luci-static/resources/icons/wifi_big.png
diff --git a/modules/base/htdocs/luci-static/resources/icons/wifi_big_disabled.png b/modules/luci-base/htdocs/luci-static/resources/icons/wifi_big_disabled.png
index af93b37b7a..af93b37b7a 100644
--- a/modules/base/htdocs/luci-static/resources/icons/wifi_big_disabled.png
+++ b/modules/luci-base/htdocs/luci-static/resources/icons/wifi_big_disabled.png
diff --git a/modules/base/htdocs/luci-static/resources/icons/wifi_disabled.png b/modules/luci-base/htdocs/luci-static/resources/icons/wifi_disabled.png
index 338a34f78c..338a34f78c 100644
--- a/modules/base/htdocs/luci-static/resources/icons/wifi_disabled.png
+++ b/modules/luci-base/htdocs/luci-static/resources/icons/wifi_disabled.png
diff --git a/modules/base/htdocs/luci-static/resources/xhr.js b/modules/luci-base/htdocs/luci-static/resources/xhr.js
index 701c12ac19..701c12ac19 100644
--- a/modules/base/htdocs/luci-static/resources/xhr.js
+++ b/modules/luci-base/htdocs/luci-static/resources/xhr.js
diff --git a/modules/base/luasrc/cacheloader.lua b/modules/luci-base/luasrc/cacheloader.lua
index 942c4b7b48..942c4b7b48 100644
--- a/modules/base/luasrc/cacheloader.lua
+++ b/modules/luci-base/luasrc/cacheloader.lua
diff --git a/modules/base/luasrc/cbi.lua b/modules/luci-base/luasrc/cbi.lua
index ae570b1556..ae570b1556 100644
--- a/modules/base/luasrc/cbi.lua
+++ b/modules/luci-base/luasrc/cbi.lua
diff --git a/modules/base/luasrc/cbi/datatypes.lua b/modules/luci-base/luasrc/cbi/datatypes.lua
index c5f4ec0f0d..c5f4ec0f0d 100644
--- a/modules/base/luasrc/cbi/datatypes.lua
+++ b/modules/luci-base/luasrc/cbi/datatypes.lua
diff --git a/modules/base/luasrc/ccache.lua b/modules/luci-base/luasrc/ccache.lua
index 56ccbc3efe..56ccbc3efe 100644
--- a/modules/base/luasrc/ccache.lua
+++ b/modules/luci-base/luasrc/ccache.lua
diff --git a/modules/base/luasrc/config.lua b/modules/luci-base/luasrc/config.lua
index 53db82b322..53db82b322 100644
--- a/modules/base/luasrc/config.lua
+++ b/modules/luci-base/luasrc/config.lua
diff --git a/modules/base/luasrc/controller/admin/servicectl.lua b/modules/luci-base/luasrc/controller/admin/servicectl.lua
index 753d2c77f1..753d2c77f1 100644
--- a/modules/base/luasrc/controller/admin/servicectl.lua
+++ b/modules/luci-base/luasrc/controller/admin/servicectl.lua
diff --git a/modules/base/luasrc/debug.lua b/modules/luci-base/luasrc/debug.lua
index 8ff1bb6981..8ff1bb6981 100644
--- a/modules/base/luasrc/debug.lua
+++ b/modules/luci-base/luasrc/debug.lua
diff --git a/modules/base/luasrc/dispatcher.lua b/modules/luci-base/luasrc/dispatcher.lua
index f7e16e77b6..f7e16e77b6 100644
--- a/modules/base/luasrc/dispatcher.lua
+++ b/modules/luci-base/luasrc/dispatcher.lua
diff --git a/modules/base/luasrc/fs.lua b/modules/luci-base/luasrc/fs.lua
index a81ff675d4..a81ff675d4 100644
--- a/modules/base/luasrc/fs.lua
+++ b/modules/luci-base/luasrc/fs.lua
diff --git a/modules/base/luasrc/http.lua b/modules/luci-base/luasrc/http.lua
index e8430b7276..e8430b7276 100644
--- a/modules/base/luasrc/http.lua
+++ b/modules/luci-base/luasrc/http.lua
diff --git a/modules/base/luasrc/http/protocol.lua b/modules/luci-base/luasrc/http/protocol.lua
index 6431b04031..6431b04031 100644
--- a/modules/base/luasrc/http/protocol.lua
+++ b/modules/luci-base/luasrc/http/protocol.lua
diff --git a/modules/base/luasrc/http/protocol/conditionals.lua b/modules/luci-base/luasrc/http/protocol/conditionals.lua
index 75e1f7b37c..75e1f7b37c 100644
--- a/modules/base/luasrc/http/protocol/conditionals.lua
+++ b/modules/luci-base/luasrc/http/protocol/conditionals.lua
diff --git a/modules/base/luasrc/http/protocol/date.lua b/modules/luci-base/luasrc/http/protocol/date.lua
index 83d11e2c25..83d11e2c25 100644
--- a/modules/base/luasrc/http/protocol/date.lua
+++ b/modules/luci-base/luasrc/http/protocol/date.lua
diff --git a/modules/base/luasrc/http/protocol/mime.lua b/modules/luci-base/luasrc/http/protocol/mime.lua
index c878160664..c878160664 100644
--- a/modules/base/luasrc/http/protocol/mime.lua
+++ b/modules/luci-base/luasrc/http/protocol/mime.lua
diff --git a/modules/base/luasrc/i18n.lua b/modules/luci-base/luasrc/i18n.lua
index 545a8aed93..545a8aed93 100644
--- a/modules/base/luasrc/i18n.lua
+++ b/modules/luci-base/luasrc/i18n.lua
diff --git a/modules/base/luasrc/init.lua b/modules/luci-base/luasrc/init.lua
index 4d66e86734..4d66e86734 100644
--- a/modules/base/luasrc/init.lua
+++ b/modules/luci-base/luasrc/init.lua
diff --git a/modules/base/luasrc/ip.lua b/modules/luci-base/luasrc/ip.lua
index 60ca090135..60ca090135 100644
--- a/modules/base/luasrc/ip.lua
+++ b/modules/luci-base/luasrc/ip.lua
diff --git a/modules/base/luasrc/ltn12.lua b/modules/luci-base/luasrc/ltn12.lua
index b59fb8c48a..b59fb8c48a 100644
--- a/modules/base/luasrc/ltn12.lua
+++ b/modules/luci-base/luasrc/ltn12.lua
diff --git a/modules/base/luasrc/model/cbi/admin_network/proto_dhcp.lua b/modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua
index fe3fec6fa1..fe3fec6fa1 100644
--- a/modules/base/luasrc/model/cbi/admin_network/proto_dhcp.lua
+++ b/modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua
diff --git a/modules/base/luasrc/model/cbi/admin_network/proto_none.lua b/modules/luci-base/luasrc/model/cbi/admin_network/proto_none.lua
index 0e34b67de6..0e34b67de6 100644
--- a/modules/base/luasrc/model/cbi/admin_network/proto_none.lua
+++ b/modules/luci-base/luasrc/model/cbi/admin_network/proto_none.lua
diff --git a/modules/base/luasrc/model/cbi/admin_network/proto_static.lua b/modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua
index 338c0b7d83..338c0b7d83 100644
--- a/modules/base/luasrc/model/cbi/admin_network/proto_static.lua
+++ b/modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua
diff --git a/modules/base/luasrc/model/firewall.lua b/modules/luci-base/luasrc/model/firewall.lua
index a9f6fdb7fc..a9f6fdb7fc 100644
--- a/modules/base/luasrc/model/firewall.lua
+++ b/modules/luci-base/luasrc/model/firewall.lua
diff --git a/modules/base/luasrc/model/ipkg.lua b/modules/luci-base/luasrc/model/ipkg.lua
index c927e71163..c927e71163 100644
--- a/modules/base/luasrc/model/ipkg.lua
+++ b/modules/luci-base/luasrc/model/ipkg.lua
diff --git a/modules/base/luasrc/model/network.lua b/modules/luci-base/luasrc/model/network.lua
index 6119abd73c..6119abd73c 100644
--- a/modules/base/luasrc/model/network.lua
+++ b/modules/luci-base/luasrc/model/network.lua
diff --git a/modules/base/luasrc/model/uci.lua b/modules/luci-base/luasrc/model/uci.lua
index a394563047..a394563047 100644
--- a/modules/base/luasrc/model/uci.lua
+++ b/modules/luci-base/luasrc/model/uci.lua
diff --git a/modules/base/luasrc/sauth.lua b/modules/luci-base/luasrc/sauth.lua
index 32f172dcda..32f172dcda 100644
--- a/modules/base/luasrc/sauth.lua
+++ b/modules/luci-base/luasrc/sauth.lua
diff --git a/modules/base/luasrc/sgi/cgi.lua b/modules/luci-base/luasrc/sgi/cgi.lua
index 04ae9aa592..04ae9aa592 100644
--- a/modules/base/luasrc/sgi/cgi.lua
+++ b/modules/luci-base/luasrc/sgi/cgi.lua
diff --git a/modules/base/luasrc/sgi/uhttpd.lua b/modules/luci-base/luasrc/sgi/uhttpd.lua
index db8780f7ec..db8780f7ec 100644
--- a/modules/base/luasrc/sgi/uhttpd.lua
+++ b/modules/luci-base/luasrc/sgi/uhttpd.lua
diff --git a/modules/base/luasrc/store.lua b/modules/luci-base/luasrc/store.lua
index c33ef07e11..c33ef07e11 100644
--- a/modules/base/luasrc/store.lua
+++ b/modules/luci-base/luasrc/store.lua
diff --git a/modules/base/luasrc/sys.lua b/modules/luci-base/luasrc/sys.lua
index 3a04f6bada..3a04f6bada 100644
--- a/modules/base/luasrc/sys.lua
+++ b/modules/luci-base/luasrc/sys.lua
diff --git a/modules/base/luasrc/sys/iptparser.lua b/modules/luci-base/luasrc/sys/iptparser.lua
index d82363309a..d82363309a 100644
--- a/modules/base/luasrc/sys/iptparser.lua
+++ b/modules/luci-base/luasrc/sys/iptparser.lua
diff --git a/modules/base/luasrc/sys/zoneinfo.lua b/modules/luci-base/luasrc/sys/zoneinfo.lua
index f5a12bfcb6..f5a12bfcb6 100644
--- a/modules/base/luasrc/sys/zoneinfo.lua
+++ b/modules/luci-base/luasrc/sys/zoneinfo.lua
diff --git a/modules/base/luasrc/sys/zoneinfo/tzdata.lua b/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua
index 8c7cc2add4..8c7cc2add4 100644
--- a/modules/base/luasrc/sys/zoneinfo/tzdata.lua
+++ b/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua
diff --git a/modules/base/luasrc/sys/zoneinfo/tzoffset.lua b/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua
index d2f77ed281..d2f77ed281 100644
--- a/modules/base/luasrc/sys/zoneinfo/tzoffset.lua
+++ b/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua
diff --git a/modules/base/luasrc/template.lua b/modules/luci-base/luasrc/template.lua
index ea01d3c214..ea01d3c214 100644
--- a/modules/base/luasrc/template.lua
+++ b/modules/luci-base/luasrc/template.lua
diff --git a/modules/base/luasrc/tools/proto.lua b/modules/luci-base/luasrc/tools/proto.lua
index 4df02696b0..4df02696b0 100644
--- a/modules/base/luasrc/tools/proto.lua
+++ b/modules/luci-base/luasrc/tools/proto.lua
diff --git a/modules/base/luasrc/tools/status.lua b/modules/luci-base/luasrc/tools/status.lua
index 0efc51be23..0efc51be23 100644
--- a/modules/base/luasrc/tools/status.lua
+++ b/modules/luci-base/luasrc/tools/status.lua
diff --git a/modules/base/luasrc/tools/webadmin.lua b/modules/luci-base/luasrc/tools/webadmin.lua
index 0e09be9800..0e09be9800 100644
--- a/modules/base/luasrc/tools/webadmin.lua
+++ b/modules/luci-base/luasrc/tools/webadmin.lua
diff --git a/modules/base/luasrc/util.lua b/modules/luci-base/luasrc/util.lua
index da761e219a..da761e219a 100644
--- a/modules/base/luasrc/util.lua
+++ b/modules/luci-base/luasrc/util.lua
diff --git a/modules/base/luasrc/version.lua b/modules/luci-base/luasrc/version.lua
index 9e5cb719c4..9e5cb719c4 100644
--- a/modules/base/luasrc/version.lua
+++ b/modules/luci-base/luasrc/version.lua
diff --git a/modules/base/luasrc/view/cbi/apply_xhr.htm b/modules/luci-base/luasrc/view/cbi/apply_xhr.htm
index 1814c9393b..1814c9393b 100644
--- a/modules/base/luasrc/view/cbi/apply_xhr.htm
+++ b/modules/luci-base/luasrc/view/cbi/apply_xhr.htm
diff --git a/modules/base/luasrc/view/cbi/browser.htm b/modules/luci-base/luasrc/view/cbi/browser.htm
index e4a4077d55..e4a4077d55 100644
--- a/modules/base/luasrc/view/cbi/browser.htm
+++ b/modules/luci-base/luasrc/view/cbi/browser.htm
diff --git a/modules/base/luasrc/view/cbi/button.htm b/modules/luci-base/luasrc/view/cbi/button.htm
index 30f8ddfda5..30f8ddfda5 100644
--- a/modules/base/luasrc/view/cbi/button.htm
+++ b/modules/luci-base/luasrc/view/cbi/button.htm
diff --git a/modules/base/luasrc/view/cbi/cell_valuefooter.htm b/modules/luci-base/luasrc/view/cbi/cell_valuefooter.htm
index 220ebd42ba..220ebd42ba 100644
--- a/modules/base/luasrc/view/cbi/cell_valuefooter.htm
+++ b/modules/luci-base/luasrc/view/cbi/cell_valuefooter.htm
diff --git a/modules/base/luasrc/view/cbi/cell_valueheader.htm b/modules/luci-base/luasrc/view/cbi/cell_valueheader.htm
index 9e2e145ddb..9e2e145ddb 100644
--- a/modules/base/luasrc/view/cbi/cell_valueheader.htm
+++ b/modules/luci-base/luasrc/view/cbi/cell_valueheader.htm
diff --git a/modules/base/luasrc/view/cbi/compound.htm b/modules/luci-base/luasrc/view/cbi/compound.htm
index 12d02bb1d8..12d02bb1d8 100644
--- a/modules/base/luasrc/view/cbi/compound.htm
+++ b/modules/luci-base/luasrc/view/cbi/compound.htm
diff --git a/modules/base/luasrc/view/cbi/delegator.htm b/modules/luci-base/luasrc/view/cbi/delegator.htm
index 4fd19265d8..4fd19265d8 100644
--- a/modules/base/luasrc/view/cbi/delegator.htm
+++ b/modules/luci-base/luasrc/view/cbi/delegator.htm
diff --git a/modules/base/luasrc/view/cbi/dvalue.htm b/modules/luci-base/luasrc/view/cbi/dvalue.htm
index 78e6f323d7..78e6f323d7 100644
--- a/modules/base/luasrc/view/cbi/dvalue.htm
+++ b/modules/luci-base/luasrc/view/cbi/dvalue.htm
diff --git a/modules/base/luasrc/view/cbi/dynlist.htm b/modules/luci-base/luasrc/view/cbi/dynlist.htm
index fd626a4ecf..fd626a4ecf 100644
--- a/modules/base/luasrc/view/cbi/dynlist.htm
+++ b/modules/luci-base/luasrc/view/cbi/dynlist.htm
diff --git a/modules/base/luasrc/view/cbi/filebrowser.htm b/modules/luci-base/luasrc/view/cbi/filebrowser.htm
index a79beebba7..a79beebba7 100644
--- a/modules/base/luasrc/view/cbi/filebrowser.htm
+++ b/modules/luci-base/luasrc/view/cbi/filebrowser.htm
diff --git a/modules/base/luasrc/view/cbi/firewall_zoneforwards.htm b/modules/luci-base/luasrc/view/cbi/firewall_zoneforwards.htm
index 2a433b5696..2a433b5696 100644
--- a/modules/base/luasrc/view/cbi/firewall_zoneforwards.htm
+++ b/modules/luci-base/luasrc/view/cbi/firewall_zoneforwards.htm
diff --git a/modules/base/luasrc/view/cbi/firewall_zonelist.htm b/modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm
index 7973437f40..7973437f40 100644
--- a/modules/base/luasrc/view/cbi/firewall_zonelist.htm
+++ b/modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm
diff --git a/modules/base/luasrc/view/cbi/footer.htm b/modules/luci-base/luasrc/view/cbi/footer.htm
index 115250a82d..115250a82d 100644
--- a/modules/base/luasrc/view/cbi/footer.htm
+++ b/modules/luci-base/luasrc/view/cbi/footer.htm
diff --git a/modules/base/luasrc/view/cbi/full_valuefooter.htm b/modules/luci-base/luasrc/view/cbi/full_valuefooter.htm
index 4876fbcc99..4876fbcc99 100644
--- a/modules/base/luasrc/view/cbi/full_valuefooter.htm
+++ b/modules/luci-base/luasrc/view/cbi/full_valuefooter.htm
diff --git a/modules/base/luasrc/view/cbi/full_valueheader.htm b/modules/luci-base/luasrc/view/cbi/full_valueheader.htm
index aaf085473a..aaf085473a 100644
--- a/modules/base/luasrc/view/cbi/full_valueheader.htm
+++ b/modules/luci-base/luasrc/view/cbi/full_valueheader.htm
diff --git a/modules/base/luasrc/view/cbi/fvalue.htm b/modules/luci-base/luasrc/view/cbi/fvalue.htm
index a1e0808e8d..a1e0808e8d 100644
--- a/modules/base/luasrc/view/cbi/fvalue.htm
+++ b/modules/luci-base/luasrc/view/cbi/fvalue.htm
diff --git a/modules/base/luasrc/view/cbi/header.htm b/modules/luci-base/luasrc/view/cbi/header.htm
index 2bddaba61a..2bddaba61a 100644
--- a/modules/base/luasrc/view/cbi/header.htm
+++ b/modules/luci-base/luasrc/view/cbi/header.htm
diff --git a/modules/base/luasrc/view/cbi/lvalue.htm b/modules/luci-base/luasrc/view/cbi/lvalue.htm
index 8cc086db42..8cc086db42 100644
--- a/modules/base/luasrc/view/cbi/lvalue.htm
+++ b/modules/luci-base/luasrc/view/cbi/lvalue.htm
diff --git a/modules/base/luasrc/view/cbi/map.htm b/modules/luci-base/luasrc/view/cbi/map.htm
index 053220d185..053220d185 100644
--- a/modules/base/luasrc/view/cbi/map.htm
+++ b/modules/luci-base/luasrc/view/cbi/map.htm
diff --git a/modules/base/luasrc/view/cbi/mvalue.htm b/modules/luci-base/luasrc/view/cbi/mvalue.htm
index 6a0b3881d0..6a0b3881d0 100644
--- a/modules/base/luasrc/view/cbi/mvalue.htm
+++ b/modules/luci-base/luasrc/view/cbi/mvalue.htm
diff --git a/modules/base/luasrc/view/cbi/network_ifacelist.htm b/modules/luci-base/luasrc/view/cbi/network_ifacelist.htm
index 643d849a50..643d849a50 100644
--- a/modules/base/luasrc/view/cbi/network_ifacelist.htm
+++ b/modules/luci-base/luasrc/view/cbi/network_ifacelist.htm
diff --git a/modules/base/luasrc/view/cbi/network_netinfo.htm b/modules/luci-base/luasrc/view/cbi/network_netinfo.htm
index 4fd84112a4..4fd84112a4 100644
--- a/modules/base/luasrc/view/cbi/network_netinfo.htm
+++ b/modules/luci-base/luasrc/view/cbi/network_netinfo.htm
diff --git a/modules/base/luasrc/view/cbi/network_netlist.htm b/modules/luci-base/luasrc/view/cbi/network_netlist.htm
index 7e23d149a8..7e23d149a8 100644
--- a/modules/base/luasrc/view/cbi/network_netlist.htm
+++ b/modules/luci-base/luasrc/view/cbi/network_netlist.htm
diff --git a/modules/base/luasrc/view/cbi/nsection.htm b/modules/luci-base/luasrc/view/cbi/nsection.htm
index 32e73e748d..32e73e748d 100644
--- a/modules/base/luasrc/view/cbi/nsection.htm
+++ b/modules/luci-base/luasrc/view/cbi/nsection.htm
diff --git a/modules/base/luasrc/view/cbi/nullsection.htm b/modules/luci-base/luasrc/view/cbi/nullsection.htm
index bd48950958..bd48950958 100644
--- a/modules/base/luasrc/view/cbi/nullsection.htm
+++ b/modules/luci-base/luasrc/view/cbi/nullsection.htm
diff --git a/modules/base/luasrc/view/cbi/simpleform.htm b/modules/luci-base/luasrc/view/cbi/simpleform.htm
index 5216cd50f1..5216cd50f1 100644
--- a/modules/base/luasrc/view/cbi/simpleform.htm
+++ b/modules/luci-base/luasrc/view/cbi/simpleform.htm
diff --git a/modules/base/luasrc/view/cbi/tabcontainer.htm b/modules/luci-base/luasrc/view/cbi/tabcontainer.htm
index 38c435d6a1..38c435d6a1 100644
--- a/modules/base/luasrc/view/cbi/tabcontainer.htm
+++ b/modules/luci-base/luasrc/view/cbi/tabcontainer.htm
diff --git a/modules/base/luasrc/view/cbi/tabmenu.htm b/modules/luci-base/luasrc/view/cbi/tabmenu.htm
index b96ac9ce4b..b96ac9ce4b 100644
--- a/modules/base/luasrc/view/cbi/tabmenu.htm
+++ b/modules/luci-base/luasrc/view/cbi/tabmenu.htm
diff --git a/modules/base/luasrc/view/cbi/tblsection.htm b/modules/luci-base/luasrc/view/cbi/tblsection.htm
index d928791167..d928791167 100644
--- a/modules/base/luasrc/view/cbi/tblsection.htm
+++ b/modules/luci-base/luasrc/view/cbi/tblsection.htm
diff --git a/modules/base/luasrc/view/cbi/tsection.htm b/modules/luci-base/luasrc/view/cbi/tsection.htm
index 087548bf28..087548bf28 100644
--- a/modules/base/luasrc/view/cbi/tsection.htm
+++ b/modules/luci-base/luasrc/view/cbi/tsection.htm
diff --git a/modules/base/luasrc/view/cbi/tvalue.htm b/modules/luci-base/luasrc/view/cbi/tvalue.htm
index 4841c370a4..4841c370a4 100644
--- a/modules/base/luasrc/view/cbi/tvalue.htm
+++ b/modules/luci-base/luasrc/view/cbi/tvalue.htm
diff --git a/modules/base/luasrc/view/cbi/ucisection.htm b/modules/luci-base/luasrc/view/cbi/ucisection.htm
index 3b69f12f2e..3b69f12f2e 100644
--- a/modules/base/luasrc/view/cbi/ucisection.htm
+++ b/modules/luci-base/luasrc/view/cbi/ucisection.htm
diff --git a/modules/base/luasrc/view/cbi/upload.htm b/modules/luci-base/luasrc/view/cbi/upload.htm
index 7770934111..7770934111 100644
--- a/modules/base/luasrc/view/cbi/upload.htm
+++ b/modules/luci-base/luasrc/view/cbi/upload.htm
diff --git a/modules/base/luasrc/view/cbi/value.htm b/modules/luci-base/luasrc/view/cbi/value.htm
index d1a7bea5c6..d1a7bea5c6 100644
--- a/modules/base/luasrc/view/cbi/value.htm
+++ b/modules/luci-base/luasrc/view/cbi/value.htm
diff --git a/modules/base/luasrc/view/cbi/valuefooter.htm b/modules/luci-base/luasrc/view/cbi/valuefooter.htm
index 805312e451..805312e451 100644
--- a/modules/base/luasrc/view/cbi/valuefooter.htm
+++ b/modules/luci-base/luasrc/view/cbi/valuefooter.htm
diff --git a/modules/base/luasrc/view/cbi/valueheader.htm b/modules/luci-base/luasrc/view/cbi/valueheader.htm
index 761a54aed0..761a54aed0 100644
--- a/modules/base/luasrc/view/cbi/valueheader.htm
+++ b/modules/luci-base/luasrc/view/cbi/valueheader.htm
diff --git a/modules/base/luasrc/view/error404.htm b/modules/luci-base/luasrc/view/error404.htm
index 813604d12c..813604d12c 100644
--- a/modules/base/luasrc/view/error404.htm
+++ b/modules/luci-base/luasrc/view/error404.htm
diff --git a/modules/base/luasrc/view/error500.htm b/modules/luci-base/luasrc/view/error500.htm
index 14ba0410a4..14ba0410a4 100644
--- a/modules/base/luasrc/view/error500.htm
+++ b/modules/luci-base/luasrc/view/error500.htm
diff --git a/modules/base/luasrc/view/footer.htm b/modules/luci-base/luasrc/view/footer.htm
index 6c6d214210..6c6d214210 100644
--- a/modules/base/luasrc/view/footer.htm
+++ b/modules/luci-base/luasrc/view/footer.htm
diff --git a/modules/base/luasrc/view/header.htm b/modules/luci-base/luasrc/view/header.htm
index 77018b1173..77018b1173 100644
--- a/modules/base/luasrc/view/header.htm
+++ b/modules/luci-base/luasrc/view/header.htm
diff --git a/modules/base/luasrc/view/indexer.htm b/modules/luci-base/luasrc/view/indexer.htm
index c628289711..c628289711 100644
--- a/modules/base/luasrc/view/indexer.htm
+++ b/modules/luci-base/luasrc/view/indexer.htm
diff --git a/modules/base/luasrc/view/sysauth.htm b/modules/luci-base/luasrc/view/sysauth.htm
index e87f26c2c8..e87f26c2c8 100644
--- a/modules/base/luasrc/view/sysauth.htm
+++ b/modules/luci-base/luasrc/view/sysauth.htm
diff --git a/po/ca/base.po b/modules/luci-base/po/ca/base.po
index 29e27cf8cb..29e27cf8cb 100644
--- a/po/ca/base.po
+++ b/modules/luci-base/po/ca/base.po
diff --git a/po/cs/base.po b/modules/luci-base/po/cs/base.po
index 709145a8f7..709145a8f7 100644
--- a/po/cs/base.po
+++ b/modules/luci-base/po/cs/base.po
diff --git a/po/de/base.po b/modules/luci-base/po/de/base.po
index 4b33e320b4..4b33e320b4 100644
--- a/po/de/base.po
+++ b/modules/luci-base/po/de/base.po
diff --git a/po/el/base.po b/modules/luci-base/po/el/base.po
index e0ddba94ea..e0ddba94ea 100644
--- a/po/el/base.po
+++ b/modules/luci-base/po/el/base.po
diff --git a/po/en/base.po b/modules/luci-base/po/en/base.po
index f2708181b0..f2708181b0 100644
--- a/po/en/base.po
+++ b/modules/luci-base/po/en/base.po
diff --git a/po/es/base.po b/modules/luci-base/po/es/base.po
index fb35d64701..fb35d64701 100644
--- a/po/es/base.po
+++ b/modules/luci-base/po/es/base.po
diff --git a/po/fr/base.po b/modules/luci-base/po/fr/base.po
index 56a5c951b4..56a5c951b4 100644
--- a/po/fr/base.po
+++ b/modules/luci-base/po/fr/base.po
diff --git a/po/he/base.po b/modules/luci-base/po/he/base.po
index 56f81d0c90..56f81d0c90 100644
--- a/po/he/base.po
+++ b/modules/luci-base/po/he/base.po
diff --git a/po/hu/base.po b/modules/luci-base/po/hu/base.po
index 6fb8e18571..6fb8e18571 100644
--- a/po/hu/base.po
+++ b/modules/luci-base/po/hu/base.po
diff --git a/po/it/base.po b/modules/luci-base/po/it/base.po
index bab990d23b..bab990d23b 100644
--- a/po/it/base.po
+++ b/modules/luci-base/po/it/base.po
diff --git a/po/ja/base.po b/modules/luci-base/po/ja/base.po
index 0b625ed968..0b625ed968 100644
--- a/po/ja/base.po
+++ b/modules/luci-base/po/ja/base.po
diff --git a/po/ms/base.po b/modules/luci-base/po/ms/base.po
index 30fac6b9eb..30fac6b9eb 100644
--- a/po/ms/base.po
+++ b/modules/luci-base/po/ms/base.po
diff --git a/po/no/base.po b/modules/luci-base/po/no/base.po
index 118c5c9ee5..118c5c9ee5 100644
--- a/po/no/base.po
+++ b/modules/luci-base/po/no/base.po
diff --git a/po/pl/base.po b/modules/luci-base/po/pl/base.po
index 6e82be1f1e..6e82be1f1e 100644
--- a/po/pl/base.po
+++ b/modules/luci-base/po/pl/base.po
diff --git a/po/pt_BR/base.po b/modules/luci-base/po/pt-br/base.po
index 0118b53bae..0118b53bae 100644
--- a/po/pt_BR/base.po
+++ b/modules/luci-base/po/pt-br/base.po
diff --git a/po/pt/base.po b/modules/luci-base/po/pt/base.po
index 48177c35a6..48177c35a6 100644
--- a/po/pt/base.po
+++ b/modules/luci-base/po/pt/base.po
diff --git a/po/ro/base.po b/modules/luci-base/po/ro/base.po
index 36a9b1ff4d..36a9b1ff4d 100644
--- a/po/ro/base.po
+++ b/modules/luci-base/po/ro/base.po
diff --git a/po/ru/base.po b/modules/luci-base/po/ru/base.po
index 7a073f57cb..7a073f57cb 100644
--- a/po/ru/base.po
+++ b/modules/luci-base/po/ru/base.po
diff --git a/po/sk/base.po b/modules/luci-base/po/sk/base.po
index 6a724ed533..6a724ed533 100644
--- a/po/sk/base.po
+++ b/modules/luci-base/po/sk/base.po
diff --git a/po/sv/base.po b/modules/luci-base/po/sv/base.po
index f7d4ae6e94..f7d4ae6e94 100644
--- a/po/sv/base.po
+++ b/modules/luci-base/po/sv/base.po
diff --git a/modules/luci-base/po/templates/base.pot b/modules/luci-base/po/templates/base.pot
new file mode 100644
index 0000000000..f71e6d3263
--- /dev/null
+++ b/modules/luci-base/po/templates/base.pot
@@ -0,0 +1,2856 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "(%d minute window, %d second interval)"
+msgstr ""
+
+msgid "(%s available)"
+msgstr ""
+
+msgid "(empty)"
+msgstr ""
+
+msgid "(no interfaces attached)"
+msgstr ""
+
+msgid "-- Additional Field --"
+msgstr ""
+
+msgid "-- Please choose --"
+msgstr ""
+
+msgid "-- custom --"
+msgstr ""
+
+msgid "1 Minute Load:"
+msgstr ""
+
+msgid "15 Minute Load:"
+msgstr ""
+
+msgid "5 Minute Load:"
+msgstr ""
+
+msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
+msgstr ""
+
+msgid "<abbr title=\"Domain Name System\">DNS</abbr> query port"
+msgstr ""
+
+msgid "<abbr title=\"Domain Name System\">DNS</abbr> server port"
+msgstr ""
+
+msgid ""
+"<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
+"order of the resolvfile"
+msgstr ""
+
+msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+msgstr ""
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
+msgstr ""
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
+msgstr ""
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
+msgstr ""
+
+msgid ""
+"<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address or Network "
+"(CIDR)"
+msgstr ""
+
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
+msgstr ""
+
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
+msgstr ""
+
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
+msgstr ""
+
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
+msgstr ""
+
+msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
+msgstr ""
+
+msgid ""
+"<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
+"Protocol\">DHCP</abbr> leases"
+msgstr ""
+
+msgid ""
+"<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
+"Domain Name System\">EDNS0</abbr> packet size"
+msgstr ""
+
+msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
+msgstr ""
+
+msgid "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>"
+msgstr ""
+
+msgid "ADSL"
+msgstr ""
+
+msgid "ADSL Status"
+msgstr ""
+
+msgid "APN"
+msgstr ""
+
+msgid "AR Support"
+msgstr ""
+
+msgid "ARP retry threshold"
+msgstr ""
+
+msgid "ATM Bridges"
+msgstr ""
+
+msgid "ATM Virtual Channel Identifier (VCI)"
+msgstr ""
+
+msgid "ATM Virtual Path Identifier (VPI)"
+msgstr ""
+
+msgid ""
+"ATM bridges expose encapsulated ethernet in AAL5 connections as virtual "
+"Linux network interfaces which can be used in conjunction with DHCP or PPP "
+"to dial into the provider network."
+msgstr ""
+
+msgid "ATM device number"
+msgstr ""
+
+msgid "Access Concentrator"
+msgstr ""
+
+msgid "Access Point"
+msgstr ""
+
+msgid "Action"
+msgstr ""
+
+msgid "Actions"
+msgstr ""
+
+msgid "Activate this network"
+msgstr ""
+
+msgid "Active <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Routes"
+msgstr ""
+
+msgid "Active <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Routes"
+msgstr ""
+
+msgid "Active Connections"
+msgstr ""
+
+msgid "Active DHCP Leases"
+msgstr ""
+
+msgid "Active DHCPv6 Leases"
+msgstr ""
+
+msgid "Ad-Hoc"
+msgstr ""
+
+msgid "Add"
+msgstr ""
+
+msgid "Add local domain suffix to names served from hosts files"
+msgstr ""
+
+msgid "Add new interface..."
+msgstr ""
+
+msgid "Additional Hosts files"
+msgstr ""
+
+msgid "Address"
+msgstr ""
+
+msgid "Address to access local relay bridge"
+msgstr ""
+
+msgid "Administration"
+msgstr ""
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Alert"
+msgstr ""
+
+msgid "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"
+msgstr ""
+
+msgid "Allow all except listed"
+msgstr ""
+
+msgid "Allow listed only"
+msgstr ""
+
+msgid "Allow localhost"
+msgstr ""
+
+msgid "Allow remote hosts to connect to local SSH forwarded ports"
+msgstr ""
+
+msgid "Allow root logins with password"
+msgstr ""
+
+msgid "Allow the <em>root</em> user to login with password"
+msgstr ""
+
+msgid ""
+"Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
+msgstr ""
+
+msgid "Always announce default router"
+msgstr ""
+
+msgid ""
+"Always use 40MHz channels even if the secondary channel overlaps. Using this "
+"option does not comply with IEEE 802.11n-2009!"
+msgstr ""
+
+msgid "An additional network will be created if you leave this unchecked."
+msgstr ""
+
+msgid "Announce as default router even if no public prefix is available."
+msgstr ""
+
+msgid "Announced DNS domains"
+msgstr ""
+
+msgid "Announced DNS servers"
+msgstr ""
+
+msgid "Antenna 1"
+msgstr ""
+
+msgid "Antenna 2"
+msgstr ""
+
+msgid "Antenna Configuration"
+msgstr ""
+
+msgid "Any zone"
+msgstr ""
+
+msgid "Apply"
+msgstr ""
+
+msgid "Applying changes"
+msgstr ""
+
+msgid ""
+"Assign a part of given length of every public IPv6-prefix to this interface"
+msgstr ""
+
+msgid "Assign interfaces..."
+msgstr ""
+
+msgid ""
+"Assign prefix parts using this hexadecimal subprefix ID for this interface."
+msgstr ""
+
+msgid "Associated Stations"
+msgstr ""
+
+msgid "Atheros 802.11%s Wireless Controller"
+msgstr ""
+
+msgid "Authentication"
+msgstr ""
+
+msgid "Authoritative"
+msgstr ""
+
+msgid "Authorization Required"
+msgstr ""
+
+msgid "Auto Refresh"
+msgstr ""
+
+msgid "Automatic"
+msgstr ""
+
+msgid "Automatic Homenet (HNCP)"
+msgstr ""
+
+msgid "Available"
+msgstr ""
+
+msgid "Available packages"
+msgstr ""
+
+msgid "Average:"
+msgstr ""
+
+msgid "BSSID"
+msgstr ""
+
+msgid "Back"
+msgstr ""
+
+msgid "Back to Overview"
+msgstr ""
+
+msgid "Back to configuration"
+msgstr ""
+
+msgid "Back to overview"
+msgstr ""
+
+msgid "Back to scan results"
+msgstr ""
+
+msgid "Background Scan"
+msgstr ""
+
+msgid "Backup / Flash Firmware"
+msgstr ""
+
+msgid "Backup / Restore"
+msgstr ""
+
+msgid "Backup file list"
+msgstr ""
+
+msgid "Bad address specified!"
+msgstr ""
+
+msgid "Band"
+msgstr ""
+
+msgid ""
+"Below is the determined list of files to backup. It consists of changed "
+"configuration files marked by opkg, essential base files and the user "
+"defined backup patterns."
+msgstr ""
+
+msgid "Bitrate"
+msgstr ""
+
+msgid "Bogus NX Domain Override"
+msgstr ""
+
+msgid "Bridge"
+msgstr ""
+
+msgid "Bridge interfaces"
+msgstr ""
+
+msgid "Bridge unit number"
+msgstr ""
+
+msgid "Bring up on boot"
+msgstr ""
+
+msgid "Broadcom 802.11%s Wireless Controller"
+msgstr ""
+
+msgid "Broadcom BCM%04x 802.11 Wireless Controller"
+msgstr ""
+
+msgid "Buffered"
+msgstr ""
+
+msgid "Buttons"
+msgstr ""
+
+msgid "CPU"
+msgstr ""
+
+msgid "CPU usage (%)"
+msgstr ""
+
+msgid "Cached"
+msgstr ""
+
+msgid "Cancel"
+msgstr ""
+
+msgid "Category"
+msgstr ""
+
+msgid "Chain"
+msgstr ""
+
+msgid "Changes"
+msgstr ""
+
+msgid "Changes applied."
+msgstr ""
+
+msgid "Changes the administrator password for accessing the device"
+msgstr ""
+
+msgid "Channel"
+msgstr ""
+
+msgid "Check"
+msgstr ""
+
+msgid "Checksum"
+msgstr ""
+
+msgid ""
+"Choose the firewall zone you want to assign to this interface. Select "
+"<em>unspecified</em> to remove the interface from the associated zone or "
+"fill out the <em>create</em> field to define a new zone and attach the "
+"interface to it."
+msgstr ""
+
+msgid ""
+"Choose the network(s) you want to attach to this wireless interface or fill "
+"out the <em>create</em> field to define a new network."
+msgstr ""
+
+msgid "Cipher"
+msgstr ""
+
+msgid ""
+"Click \"Generate archive\" to download a tar archive of the current "
+"configuration files. To reset the firmware to its initial state, click "
+"\"Perform reset\" (only possible with squashfs images)."
+msgstr ""
+
+msgid "Client"
+msgstr ""
+
+msgid "Client ID to send when requesting DHCP"
+msgstr ""
+
+msgid ""
+"Close inactive connection after the given amount of seconds, use 0 to "
+"persist connection"
+msgstr ""
+
+msgid "Close list..."
+msgstr ""
+
+msgid "Collecting data..."
+msgstr ""
+
+msgid "Command"
+msgstr ""
+
+msgid "Common Configuration"
+msgstr ""
+
+msgid "Compression"
+msgstr ""
+
+msgid "Configuration"
+msgstr ""
+
+msgid "Configuration applied."
+msgstr ""
+
+msgid "Configuration files will be kept."
+msgstr ""
+
+msgid "Configures this mount as overlay storage for block-extroot"
+msgstr ""
+
+msgid "Confirmation"
+msgstr ""
+
+msgid "Connect"
+msgstr ""
+
+msgid "Connected"
+msgstr ""
+
+msgid "Connection Limit"
+msgstr ""
+
+msgid "Connections"
+msgstr ""
+
+msgid "Country"
+msgstr ""
+
+msgid "Country Code"
+msgstr ""
+
+msgid "Cover the following interface"
+msgstr ""
+
+msgid "Cover the following interfaces"
+msgstr ""
+
+msgid "Create / Assign firewall-zone"
+msgstr ""
+
+msgid "Create Interface"
+msgstr ""
+
+msgid "Create a bridge over multiple interfaces"
+msgstr ""
+
+msgid "Critical"
+msgstr ""
+
+msgid "Cron Log Level"
+msgstr ""
+
+msgid "Custom Interface"
+msgstr ""
+
+msgid "Custom delegated IPv6-prefix"
+msgstr ""
+
+msgid ""
+"Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
+"\">LED</abbr>s if possible."
+msgstr ""
+
+msgid "DHCP Leases"
+msgstr ""
+
+msgid "DHCP Server"
+msgstr ""
+
+msgid "DHCP and DNS"
+msgstr ""
+
+msgid "DHCP client"
+msgstr ""
+
+msgid "DHCP-Options"
+msgstr ""
+
+msgid "DHCPv6 Leases"
+msgstr ""
+
+msgid "DHCPv6 client"
+msgstr ""
+
+msgid "DHCPv6-Mode"
+msgstr ""
+
+msgid "DHCPv6-Service"
+msgstr ""
+
+msgid "DNS"
+msgstr ""
+
+msgid "DNS forwardings"
+msgstr ""
+
+msgid "DNS-Label / FQDN"
+msgstr ""
+
+msgid "DS-Lite AFTR address"
+msgstr ""
+
+msgid "DUID"
+msgstr ""
+
+msgid "Debug"
+msgstr ""
+
+msgid "Default %d"
+msgstr ""
+
+msgid "Default gateway"
+msgstr ""
+
+msgid "Default state"
+msgstr ""
+
+msgid "Define a name for this network."
+msgstr ""
+
+msgid ""
+"Define additional DHCP options, for example "
+"\"<code>6,192.168.2.1,192.168.2.2</code>\" which advertises different DNS "
+"servers to clients."
+msgstr ""
+
+msgid "Delete"
+msgstr ""
+
+msgid "Delete this interface"
+msgstr ""
+
+msgid "Delete this network"
+msgstr ""
+
+msgid "Description"
+msgstr ""
+
+msgid "Design"
+msgstr ""
+
+msgid "Destination"
+msgstr ""
+
+msgid "Device"
+msgstr ""
+
+msgid "Device Configuration"
+msgstr ""
+
+msgid "Diagnostics"
+msgstr ""
+
+msgid "Directory"
+msgstr ""
+
+msgid "Disable"
+msgstr ""
+
+msgid ""
+"Disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for "
+"this interface."
+msgstr ""
+
+msgid "Disable DNS setup"
+msgstr ""
+
+msgid "Disable HW-Beacon timer"
+msgstr ""
+
+msgid "Disabled"
+msgstr ""
+
+msgid "Discard upstream RFC1918 responses"
+msgstr ""
+
+msgid "Displaying only packages containing"
+msgstr ""
+
+msgid "Distance Optimization"
+msgstr ""
+
+msgid "Distance to farthest network member in meters."
+msgstr ""
+
+msgid "Diversity"
+msgstr ""
+
+msgid ""
+"Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
+"\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
+"Forwarder for <abbr title=\"Network Address Translation\">NAT</abbr> "
+"firewalls"
+msgstr ""
+
+msgid "Do not cache negative replies, e.g. for not existing domains"
+msgstr ""
+
+msgid "Do not forward requests that cannot be answered by public name servers"
+msgstr ""
+
+msgid "Do not forward reverse lookups for local networks"
+msgstr ""
+
+msgid "Do not send probe responses"
+msgstr ""
+
+msgid "Domain required"
+msgstr ""
+
+msgid "Domain whitelist"
+msgstr ""
+
+msgid ""
+"Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
+"<abbr title=\"Domain Name System\">DNS</abbr>-Name"
+msgstr ""
+
+msgid "Download and install package"
+msgstr ""
+
+msgid "Download backup"
+msgstr ""
+
+msgid "Dropbear Instance"
+msgstr ""
+
+msgid ""
+"Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access "
+"and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"
+msgstr ""
+
+msgid "Dual-Stack Lite (RFC6333)"
+msgstr ""
+
+msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
+msgstr ""
+
+msgid "Dynamic tunnel"
+msgstr ""
+
+msgid ""
+"Dynamically allocate DHCP addresses for clients. If disabled, only clients "
+"having static leases will be served."
+msgstr ""
+
+msgid "EAP-Method"
+msgstr ""
+
+msgid "Edit"
+msgstr ""
+
+msgid "Edit this interface"
+msgstr ""
+
+msgid "Edit this network"
+msgstr ""
+
+msgid "Emergency"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
+msgstr ""
+
+msgid "Enable HE.net dynamic endpoint update"
+msgstr ""
+
+msgid "Enable IPv6 negotiation on the PPP link"
+msgstr ""
+
+msgid "Enable Jumbo Frame passthrough"
+msgstr ""
+
+msgid "Enable NTP client"
+msgstr ""
+
+msgid "Enable TFTP server"
+msgstr ""
+
+msgid "Enable VLAN functionality"
+msgstr ""
+
+msgid "Enable learning and aging"
+msgstr ""
+
+msgid "Enable this mount"
+msgstr ""
+
+msgid "Enable this swap"
+msgstr ""
+
+msgid "Enable/Disable"
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid "Enables the Spanning Tree Protocol on this bridge"
+msgstr ""
+
+msgid "Encapsulation mode"
+msgstr ""
+
+msgid "Encryption"
+msgstr ""
+
+msgid "Erasing..."
+msgstr ""
+
+msgid "Error"
+msgstr ""
+
+msgid "Ethernet Adapter"
+msgstr ""
+
+msgid "Ethernet Switch"
+msgstr ""
+
+msgid "Expand hosts"
+msgstr ""
+
+msgid "Expires"
+msgstr ""
+
+msgid ""
+"Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
+msgstr ""
+
+msgid "External"
+msgstr ""
+
+msgid "External system log server"
+msgstr ""
+
+msgid "External system log server port"
+msgstr ""
+
+msgid "Fast Frames"
+msgstr ""
+
+msgid "File"
+msgstr ""
+
+msgid "Filename of the boot image advertised to clients"
+msgstr ""
+
+msgid "Filesystem"
+msgstr ""
+
+msgid "Filter"
+msgstr ""
+
+msgid "Filter private"
+msgstr ""
+
+msgid "Filter useless"
+msgstr ""
+
+msgid "Find and join network"
+msgstr ""
+
+msgid "Find package"
+msgstr ""
+
+msgid "Finish"
+msgstr ""
+
+msgid "Firewall"
+msgstr ""
+
+msgid "Firewall Settings"
+msgstr ""
+
+msgid "Firewall Status"
+msgstr ""
+
+msgid "Firmware Version"
+msgstr ""
+
+msgid "Fixed source port for outbound DNS queries"
+msgstr ""
+
+msgid "Flags"
+msgstr ""
+
+msgid "Flash Firmware"
+msgstr ""
+
+msgid "Flash image..."
+msgstr ""
+
+msgid "Flash new firmware image"
+msgstr ""
+
+msgid "Flash operations"
+msgstr ""
+
+msgid "Flashing..."
+msgstr ""
+
+msgid "Force"
+msgstr ""
+
+msgid "Force 40MHz mode"
+msgstr ""
+
+msgid "Force CCMP (AES)"
+msgstr ""
+
+msgid "Force DHCP on this network even if another server is detected."
+msgstr ""
+
+msgid "Force TKIP"
+msgstr ""
+
+msgid "Force TKIP and CCMP (AES)"
+msgstr ""
+
+msgid "Forward DHCP traffic"
+msgstr ""
+
+msgid "Forward broadcast traffic"
+msgstr ""
+
+msgid "Forwarding mode"
+msgstr ""
+
+msgid "Fragmentation Threshold"
+msgstr ""
+
+msgid "Frame Bursting"
+msgstr ""
+
+msgid "Free"
+msgstr ""
+
+msgid "Free space"
+msgstr ""
+
+msgid "Frequency Hopping"
+msgstr ""
+
+msgid "GHz"
+msgstr ""
+
+msgid "GPRS only"
+msgstr ""
+
+msgid "Gateway"
+msgstr ""
+
+msgid "Gateway ports"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "General Setup"
+msgstr ""
+
+msgid "Generate archive"
+msgstr ""
+
+msgid "Generic 802.11%s Wireless Controller"
+msgstr ""
+
+msgid "Given password confirmation did not match, password not changed!"
+msgstr ""
+
+msgid "Global network options"
+msgstr ""
+
+msgid "Go to password configuration..."
+msgstr ""
+
+msgid "Go to relevant configuration page"
+msgstr ""
+
+msgid "Guest"
+msgstr ""
+
+msgid "HE.net password"
+msgstr ""
+
+msgid "HE.net username"
+msgstr ""
+
+msgid "HT mode (802.11n)"
+msgstr ""
+
+msgid "Handler"
+msgstr ""
+
+msgid "Hang Up"
+msgstr ""
+
+msgid ""
+"Here you can configure the basic aspects of your device like its hostname or "
+"the timezone."
+msgstr ""
+
+msgid ""
+"Here you can paste public SSH-Keys (one per line) for SSH public-key "
+"authentication."
+msgstr ""
+
+msgid "Hermes 802.11b Wireless Controller"
+msgstr ""
+
+msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+msgstr ""
+
+msgid "Host entries"
+msgstr ""
+
+msgid "Host expiry timeout"
+msgstr ""
+
+msgid "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid "Hostname to send when requesting DHCP"
+msgstr ""
+
+msgid "Hostnames"
+msgstr ""
+
+msgid "IP address"
+msgstr ""
+
+msgid "IPv4"
+msgstr ""
+
+msgid "IPv4 Firewall"
+msgstr ""
+
+msgid "IPv4 WAN Status"
+msgstr ""
+
+msgid "IPv4 address"
+msgstr ""
+
+msgid "IPv4 and IPv6"
+msgstr ""
+
+msgid "IPv4 assignment length"
+msgstr ""
+
+msgid "IPv4 broadcast"
+msgstr ""
+
+msgid "IPv4 gateway"
+msgstr ""
+
+msgid "IPv4 netmask"
+msgstr ""
+
+msgid "IPv4 only"
+msgstr ""
+
+msgid "IPv4 prefix length"
+msgstr ""
+
+msgid "IPv4-Address"
+msgstr ""
+
+msgid "IPv6"
+msgstr ""
+
+msgid "IPv6 Firewall"
+msgstr ""
+
+msgid "IPv6 Settings"
+msgstr ""
+
+msgid "IPv6 ULA-Prefix"
+msgstr ""
+
+msgid "IPv6 WAN Status"
+msgstr ""
+
+msgid "IPv6 address"
+msgstr ""
+
+msgid "IPv6 assignment hint"
+msgstr ""
+
+msgid "IPv6 assignment length"
+msgstr ""
+
+msgid "IPv6 gateway"
+msgstr ""
+
+msgid "IPv6 only"
+msgstr ""
+
+msgid "IPv6 prefix"
+msgstr ""
+
+msgid "IPv6 prefix length"
+msgstr ""
+
+msgid "IPv6 routed prefix"
+msgstr ""
+
+msgid "IPv6-Address"
+msgstr ""
+
+msgid "IPv6-in-IPv4 (RFC4213)"
+msgstr ""
+
+msgid "IPv6-over-IPv4 (6rd)"
+msgstr ""
+
+msgid "IPv6-over-IPv4 (6to4)"
+msgstr ""
+
+msgid "Identity"
+msgstr ""
+
+msgid ""
+"If specified, mount the device by its UUID instead of a fixed device node"
+msgstr ""
+
+msgid ""
+"If specified, mount the device by the partition label instead of a fixed "
+"device node"
+msgstr ""
+
+msgid "If unchecked, no default route is configured"
+msgstr ""
+
+msgid "If unchecked, the advertised DNS server addresses are ignored"
+msgstr ""
+
+msgid ""
+"If your physical memory is insufficient unused data can be temporarily "
+"swapped to a swap-device resulting in a higher amount of usable <abbr title="
+"\"Random Access Memory\">RAM</abbr>. Be aware that swapping data is a very "
+"slow process as the swap-device cannot be accessed with the high datarates "
+"of the <abbr title=\"Random Access Memory\">RAM</abbr>."
+msgstr ""
+
+msgid "Ignore Hosts files"
+msgstr ""
+
+msgid "Ignore interface"
+msgstr ""
+
+msgid "Ignore resolve file"
+msgstr ""
+
+msgid "Image"
+msgstr ""
+
+msgid "In"
+msgstr ""
+
+msgid "Inactivity timeout"
+msgstr ""
+
+msgid "Inbound:"
+msgstr ""
+
+msgid "Info"
+msgstr ""
+
+msgid "Initscript"
+msgstr ""
+
+msgid "Initscripts"
+msgstr ""
+
+msgid "Install"
+msgstr ""
+
+msgid "Install iputils-traceroute6 for IPv6 traceroute"
+msgstr ""
+
+msgid "Install package %q"
+msgstr ""
+
+msgid "Install protocol extensions..."
+msgstr ""
+
+msgid "Installed packages"
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid "Interface Configuration"
+msgstr ""
+
+msgid "Interface Overview"
+msgstr ""
+
+msgid "Interface is reconnecting..."
+msgstr ""
+
+msgid "Interface is shutting down..."
+msgstr ""
+
+msgid "Interface not present or not connected yet."
+msgstr ""
+
+msgid "Interface reconnected"
+msgstr ""
+
+msgid "Interface shut down"
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Internal Server Error"
+msgstr ""
+
+msgid "Invalid"
+msgstr ""
+
+msgid "Invalid VLAN ID given! Only IDs between %d and %d are allowed."
+msgstr ""
+
+msgid "Invalid VLAN ID given! Only unique IDs are allowed"
+msgstr ""
+
+msgid "Invalid username and/or password! Please try again."
+msgstr ""
+
+msgid ""
+"It appears that you are trying to flash an image that does not fit into the "
+"flash memory, please verify the image file!"
+msgstr ""
+
+msgid "Java Script required!"
+msgstr ""
+
+msgid "Join Network"
+msgstr ""
+
+msgid "Join Network: Settings"
+msgstr ""
+
+msgid "Join Network: Wireless Scan"
+msgstr ""
+
+msgid "Keep settings"
+msgstr ""
+
+msgid "Kernel Log"
+msgstr ""
+
+msgid "Kernel Version"
+msgstr ""
+
+msgid "Key"
+msgstr ""
+
+msgid "Key #%d"
+msgstr ""
+
+msgid "Kill"
+msgstr ""
+
+msgid "L2TP"
+msgstr ""
+
+msgid "L2TP Server"
+msgstr ""
+
+msgid "LCP echo failure threshold"
+msgstr ""
+
+msgid "LCP echo interval"
+msgstr ""
+
+msgid "LLC"
+msgstr ""
+
+msgid "Label"
+msgstr ""
+
+msgid "Language"
+msgstr ""
+
+msgid "Language and Style"
+msgstr ""
+
+msgid "Lease validity time"
+msgstr ""
+
+msgid "Leasefile"
+msgstr ""
+
+msgid "Leasetime"
+msgstr ""
+
+msgid "Leasetime remaining"
+msgstr ""
+
+msgid "Leave empty to autodetect"
+msgstr ""
+
+msgid "Leave empty to use the current WAN address"
+msgstr ""
+
+msgid "Legend:"
+msgstr ""
+
+msgid "Limit"
+msgstr ""
+
+msgid "Line Attenuation"
+msgstr ""
+
+msgid "Line Speed"
+msgstr ""
+
+msgid "Line State"
+msgstr ""
+
+msgid "Link On"
+msgstr ""
+
+msgid ""
+"List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
+"requests to"
+msgstr ""
+
+msgid "List of domains to allow RFC1918 responses for"
+msgstr ""
+
+msgid "List of hosts that supply bogus NX domain results"
+msgstr ""
+
+msgid "Listen only on the given interface or, if unspecified, on all"
+msgstr ""
+
+msgid "Listening port for inbound DNS queries"
+msgstr ""
+
+msgid "Load"
+msgstr ""
+
+msgid "Load Average"
+msgstr ""
+
+msgid "Loading"
+msgstr ""
+
+msgid "Local IPv4 address"
+msgstr ""
+
+msgid "Local IPv6 address"
+msgstr ""
+
+msgid "Local Startup"
+msgstr ""
+
+msgid "Local Time"
+msgstr ""
+
+msgid "Local domain"
+msgstr ""
+
+msgid ""
+"Local domain specification. Names matching this domain are never forwarded "
+"and are resolved from DHCP or hosts files only"
+msgstr ""
+
+msgid "Local domain suffix appended to DHCP names and hosts file entries"
+msgstr ""
+
+msgid "Local server"
+msgstr ""
+
+msgid ""
+"Localise hostname depending on the requesting subnet if multiple IPs are "
+"available"
+msgstr ""
+
+msgid "Localise queries"
+msgstr ""
+
+msgid "Locked to channel %d used by %s"
+msgstr ""
+
+msgid "Log output level"
+msgstr ""
+
+msgid "Log queries"
+msgstr ""
+
+msgid "Logging"
+msgstr ""
+
+msgid "Login"
+msgstr ""
+
+msgid "Logout"
+msgstr ""
+
+msgid "Lowest leased address as offset from the network address."
+msgstr ""
+
+msgid "MAC-Address"
+msgstr ""
+
+msgid "MAC-Address Filter"
+msgstr ""
+
+msgid "MAC-Filter"
+msgstr ""
+
+msgid "MAC-List"
+msgstr ""
+
+msgid "MB/s"
+msgstr ""
+
+msgid "MHz"
+msgstr ""
+
+msgid "MTU"
+msgstr ""
+
+msgid "Maximum Rate"
+msgstr ""
+
+msgid "Maximum allowed number of active DHCP leases"
+msgstr ""
+
+msgid "Maximum allowed number of concurrent DNS queries"
+msgstr ""
+
+msgid "Maximum allowed size of EDNS.0 UDP packets"
+msgstr ""
+
+msgid "Maximum amount of seconds to wait for the modem to become ready"
+msgstr ""
+
+msgid "Maximum hold time"
+msgstr ""
+
+msgid "Maximum number of leased addresses."
+msgstr ""
+
+msgid "Mbit/s"
+msgstr ""
+
+msgid "Memory"
+msgstr ""
+
+msgid "Memory usage (%)"
+msgstr ""
+
+msgid "Metric"
+msgstr ""
+
+msgid "Minimum Rate"
+msgstr ""
+
+msgid "Minimum hold time"
+msgstr ""
+
+msgid "Missing protocol extension for proto %q"
+msgstr ""
+
+msgid "Mode"
+msgstr ""
+
+msgid "Model"
+msgstr ""
+
+msgid "Modem device"
+msgstr ""
+
+msgid "Modem init timeout"
+msgstr ""
+
+msgid "Monitor"
+msgstr ""
+
+msgid "Mount Entry"
+msgstr ""
+
+msgid "Mount Point"
+msgstr ""
+
+msgid "Mount Points"
+msgstr ""
+
+msgid "Mount Points - Mount Entry"
+msgstr ""
+
+msgid "Mount Points - Swap Entry"
+msgstr ""
+
+msgid ""
+"Mount Points define at which point a memory device will be attached to the "
+"filesystem"
+msgstr ""
+
+msgid "Mount options"
+msgstr ""
+
+msgid "Mount point"
+msgstr ""
+
+msgid "Mounted file systems"
+msgstr ""
+
+msgid "Move down"
+msgstr ""
+
+msgid "Move up"
+msgstr ""
+
+msgid "Multicast Rate"
+msgstr ""
+
+msgid "Multicast address"
+msgstr ""
+
+msgid "NAS ID"
+msgstr ""
+
+msgid "NDP-Proxy"
+msgstr ""
+
+msgid "NTP server candidates"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Name of the new interface"
+msgstr ""
+
+msgid "Name of the new network"
+msgstr ""
+
+msgid "Navigation"
+msgstr ""
+
+msgid "Netmask"
+msgstr ""
+
+msgid "Network"
+msgstr ""
+
+msgid "Network Utilities"
+msgstr ""
+
+msgid "Network boot image"
+msgstr ""
+
+msgid "Network without interfaces."
+msgstr ""
+
+msgid "Next »"
+msgstr ""
+
+msgid "No DHCP Server configured for this interface"
+msgstr ""
+
+msgid "No chains in this table"
+msgstr ""
+
+msgid "No files found"
+msgstr ""
+
+msgid "No information available"
+msgstr ""
+
+msgid "No negative cache"
+msgstr ""
+
+msgid "No network configured on this device"
+msgstr ""
+
+msgid "No network name specified"
+msgstr ""
+
+msgid "No package lists available"
+msgstr ""
+
+msgid "No password set!"
+msgstr ""
+
+msgid "No rules in this chain"
+msgstr ""
+
+msgid "No zone assigned"
+msgstr ""
+
+msgid "Noise"
+msgstr ""
+
+msgid "Noise Margin"
+msgstr ""
+
+msgid "Noise:"
+msgstr ""
+
+msgid "None"
+msgstr ""
+
+msgid "Normal"
+msgstr ""
+
+msgid "Not Found"
+msgstr ""
+
+msgid "Not associated"
+msgstr ""
+
+msgid "Not connected"
+msgstr ""
+
+msgid "Note: Configuration files will be erased."
+msgstr ""
+
+msgid "Notice"
+msgstr ""
+
+msgid "Nslookup"
+msgstr ""
+
+msgid "OK"
+msgstr ""
+
+msgid "OPKG-Configuration"
+msgstr ""
+
+msgid "Off-State Delay"
+msgstr ""
+
+msgid ""
+"On this page you can configure the network interfaces. You can bridge "
+"several interfaces by ticking the \"bridge interfaces\" field and enter the "
+"names of several network interfaces separated by spaces. You can also use "
+"<abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
+"<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
+"<samp>eth0.1</samp>)."
+msgstr ""
+
+msgid "On-State Delay"
+msgstr ""
+
+msgid "One of hostname or mac address must be specified!"
+msgstr ""
+
+msgid "One or more fields contain invalid values!"
+msgstr ""
+
+msgid "One or more required fields have no value!"
+msgstr ""
+
+msgid "Open list..."
+msgstr ""
+
+msgid "Option changed"
+msgstr ""
+
+msgid "Option removed"
+msgstr ""
+
+msgid "Options"
+msgstr ""
+
+msgid "Other:"
+msgstr ""
+
+msgid "Out"
+msgstr ""
+
+msgid "Outbound:"
+msgstr ""
+
+msgid "Outdoor Channels"
+msgstr ""
+
+msgid "Override MAC address"
+msgstr ""
+
+msgid "Override MTU"
+msgstr ""
+
+msgid "Override the gateway in DHCP responses"
+msgstr ""
+
+msgid ""
+"Override the netmask sent to clients. Normally it is calculated from the "
+"subnet that is served."
+msgstr ""
+
+msgid "Override the table used for internal routes"
+msgstr ""
+
+msgid "Overview"
+msgstr ""
+
+msgid "Owner"
+msgstr ""
+
+msgid "PAP/CHAP password"
+msgstr ""
+
+msgid "PAP/CHAP username"
+msgstr ""
+
+msgid "PID"
+msgstr ""
+
+msgid "PIN"
+msgstr ""
+
+msgid "PPP"
+msgstr ""
+
+msgid "PPPoA Encapsulation"
+msgstr ""
+
+msgid "PPPoATM"
+msgstr ""
+
+msgid "PPPoE"
+msgstr ""
+
+msgid "PPtP"
+msgstr ""
+
+msgid "Package libiwinfo required!"
+msgstr ""
+
+msgid "Package lists are older than 24 hours"
+msgstr ""
+
+msgid "Package name"
+msgstr ""
+
+msgid "Packets"
+msgstr ""
+
+msgid "Part of zone %q"
+msgstr ""
+
+msgid "Password"
+msgstr ""
+
+msgid "Password authentication"
+msgstr ""
+
+msgid "Password of Private Key"
+msgstr ""
+
+msgid "Password successfully changed!"
+msgstr ""
+
+msgid "Path to CA-Certificate"
+msgstr ""
+
+msgid "Path to Client-Certificate"
+msgstr ""
+
+msgid "Path to Private Key"
+msgstr ""
+
+msgid "Path to executable which handles the button event"
+msgstr ""
+
+msgid "Peak:"
+msgstr ""
+
+msgid "Perform reboot"
+msgstr ""
+
+msgid "Perform reset"
+msgstr ""
+
+msgid "Phy Rate:"
+msgstr ""
+
+msgid "Physical Settings"
+msgstr ""
+
+msgid "Ping"
+msgstr ""
+
+msgid "Pkts."
+msgstr ""
+
+msgid "Please enter your username and password."
+msgstr ""
+
+msgid "Please wait: Device rebooting..."
+msgstr ""
+
+msgid "Policy"
+msgstr ""
+
+msgid "Port"
+msgstr ""
+
+msgid "Port %d"
+msgstr ""
+
+msgid "Port %d is untagged in multiple VLANs!"
+msgstr ""
+
+msgid "Port status:"
+msgstr ""
+
+msgid ""
+"Presume peer to be dead after given amount of LCP echo failures, use 0 to "
+"ignore failures"
+msgstr ""
+
+msgid "Prevents client-to-client communication"
+msgstr ""
+
+msgid "Prism2/2.5/3 802.11b Wireless Controller"
+msgstr ""
+
+msgid "Proceed"
+msgstr ""
+
+msgid "Processes"
+msgstr ""
+
+msgid "Prot."
+msgstr ""
+
+msgid "Protocol"
+msgstr ""
+
+msgid "Protocol family"
+msgstr ""
+
+msgid "Protocol of the new interface"
+msgstr ""
+
+msgid "Protocol support is not installed"
+msgstr ""
+
+msgid "Provide NTP server"
+msgstr ""
+
+msgid "Provide new network"
+msgstr ""
+
+msgid "Pseudo Ad-Hoc (ahdemo)"
+msgstr ""
+
+msgid "Public prefix routed to this device for distribution to clients."
+msgstr ""
+
+msgid "Quality"
+msgstr ""
+
+msgid "RTS/CTS Threshold"
+msgstr ""
+
+msgid "RX"
+msgstr ""
+
+msgid "RX Rate"
+msgstr ""
+
+msgid "RaLink 802.11%s Wireless Controller"
+msgstr ""
+
+msgid "Radius-Accounting-Port"
+msgstr ""
+
+msgid "Radius-Accounting-Secret"
+msgstr ""
+
+msgid "Radius-Accounting-Server"
+msgstr ""
+
+msgid "Radius-Authentication-Port"
+msgstr ""
+
+msgid "Radius-Authentication-Secret"
+msgstr ""
+
+msgid "Radius-Authentication-Server"
+msgstr ""
+
+msgid ""
+"Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
+"Configuration Protocol\">DHCP</abbr>-Server"
+msgstr ""
+
+msgid ""
+"Really delete this interface? The deletion cannot be undone!\\nYou might "
+"lose access to this device if you are connected via this interface."
+msgstr ""
+
+msgid ""
+"Really delete this wireless network? The deletion cannot be undone!\\nYou "
+"might lose access to this device if you are connected via this network."
+msgstr ""
+
+msgid "Really reset all changes?"
+msgstr ""
+
+msgid ""
+"Really shut down network?\\nYou might lose access to this device if you are "
+"connected via this interface."
+msgstr ""
+
+msgid ""
+"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if "
+"you are connected via this interface."
+msgstr ""
+
+msgid "Really switch protocol?"
+msgstr ""
+
+msgid "Realtime Connections"
+msgstr ""
+
+msgid "Realtime Graphs"
+msgstr ""
+
+msgid "Realtime Load"
+msgstr ""
+
+msgid "Realtime Traffic"
+msgstr ""
+
+msgid "Realtime Wireless"
+msgstr ""
+
+msgid "Rebind protection"
+msgstr ""
+
+msgid "Reboot"
+msgstr ""
+
+msgid "Rebooting..."
+msgstr ""
+
+msgid "Reboots the operating system of your device"
+msgstr ""
+
+msgid "Receive"
+msgstr ""
+
+msgid "Receiver Antenna"
+msgstr ""
+
+msgid "Reconnect this interface"
+msgstr ""
+
+msgid "Reconnecting interface"
+msgstr ""
+
+msgid "References"
+msgstr ""
+
+msgid "Regulatory Domain"
+msgstr ""
+
+msgid "Relay"
+msgstr ""
+
+msgid "Relay Bridge"
+msgstr ""
+
+msgid "Relay between networks"
+msgstr ""
+
+msgid "Relay bridge"
+msgstr ""
+
+msgid "Remote IPv4 address"
+msgstr ""
+
+msgid "Remove"
+msgstr ""
+
+msgid "Repeat scan"
+msgstr ""
+
+msgid "Replace entry"
+msgstr ""
+
+msgid "Replace wireless configuration"
+msgstr ""
+
+msgid "Request IPv6-address"
+msgstr ""
+
+msgid "Request IPv6-prefix of length"
+msgstr ""
+
+msgid "Required for certain ISPs, e.g. Charter with DOCSIS 3"
+msgstr ""
+
+msgid "Reset"
+msgstr ""
+
+msgid "Reset Counters"
+msgstr ""
+
+msgid "Reset to defaults"
+msgstr ""
+
+msgid "Resolv and Hosts Files"
+msgstr ""
+
+msgid "Resolve file"
+msgstr ""
+
+msgid "Restart"
+msgstr ""
+
+msgid "Restart Firewall"
+msgstr ""
+
+msgid "Restore backup"
+msgstr ""
+
+msgid "Reveal/hide password"
+msgstr ""
+
+msgid "Revert"
+msgstr ""
+
+msgid "Root"
+msgstr ""
+
+msgid "Root directory for files served via TFTP"
+msgstr ""
+
+msgid "Router Advertisement-Service"
+msgstr ""
+
+msgid "Router Password"
+msgstr ""
+
+msgid "Routes"
+msgstr ""
+
+msgid ""
+"Routes specify over which interface and gateway a certain host or network "
+"can be reached."
+msgstr ""
+
+msgid "Rule #"
+msgstr ""
+
+msgid "Run a filesystem check before mounting the device"
+msgstr ""
+
+msgid "Run filesystem check"
+msgstr ""
+
+msgid "SSH Access"
+msgstr ""
+
+msgid "SSH-Keys"
+msgstr ""
+
+msgid "SSID"
+msgstr ""
+
+msgid "Save"
+msgstr ""
+
+msgid "Save & Apply"
+msgstr ""
+
+msgid "Save &#38; Apply"
+msgstr ""
+
+msgid "Scan"
+msgstr ""
+
+msgid "Scheduled Tasks"
+msgstr ""
+
+msgid "Section added"
+msgstr ""
+
+msgid "Section removed"
+msgstr ""
+
+msgid "See \"mount\" manpage for details"
+msgstr ""
+
+msgid ""
+"Send LCP echo requests at the given interval in seconds, only effective in "
+"conjunction with failure threshold"
+msgstr ""
+
+msgid "Separate Clients"
+msgstr ""
+
+msgid "Separate WDS"
+msgstr ""
+
+msgid "Server Settings"
+msgstr ""
+
+msgid "Service Name"
+msgstr ""
+
+msgid "Service Type"
+msgstr ""
+
+msgid "Services"
+msgstr ""
+
+msgid "Set up Time Synchronization"
+msgstr ""
+
+msgid "Setup DHCP Server"
+msgstr ""
+
+msgid "Show current backup file list"
+msgstr ""
+
+msgid "Shutdown this interface"
+msgstr ""
+
+msgid "Shutdown this network"
+msgstr ""
+
+msgid "Signal"
+msgstr ""
+
+msgid "Signal:"
+msgstr ""
+
+msgid "Size"
+msgstr ""
+
+msgid "Skip"
+msgstr ""
+
+msgid "Skip to content"
+msgstr ""
+
+msgid "Skip to navigation"
+msgstr ""
+
+msgid "Slot time"
+msgstr ""
+
+msgid "Software"
+msgstr ""
+
+msgid "Some fields are invalid, cannot save values!"
+msgstr ""
+
+msgid "Sorry, the object you requested was not found."
+msgstr ""
+
+msgid "Sorry, the server encountered an unexpected error."
+msgstr ""
+
+msgid ""
+"Sorry, there is no sysupgrade support present; a new firmware image must be "
+"flashed manually. Please refer to the OpenWrt wiki for device specific "
+"install instructions."
+msgstr ""
+
+msgid "Sort"
+msgstr ""
+
+msgid "Source"
+msgstr ""
+
+msgid "Specifies the button state to handle"
+msgstr ""
+
+msgid "Specifies the directory the device is attached to"
+msgstr ""
+
+msgid "Specifies the listening port of this <em>Dropbear</em> instance"
+msgstr ""
+
+msgid ""
+"Specifies the maximum amount of failed ARP requests until hosts are presumed "
+"to be dead"
+msgstr ""
+
+msgid ""
+"Specifies the maximum amount of seconds after which hosts are presumed to be "
+"dead"
+msgstr ""
+
+msgid "Specify the secret encryption key here."
+msgstr ""
+
+msgid "Start"
+msgstr ""
+
+msgid "Start priority"
+msgstr ""
+
+msgid "Startup"
+msgstr ""
+
+msgid "Static IPv4 Routes"
+msgstr ""
+
+msgid "Static IPv6 Routes"
+msgstr ""
+
+msgid "Static Leases"
+msgstr ""
+
+msgid "Static Routes"
+msgstr ""
+
+msgid "Static WDS"
+msgstr ""
+
+msgid "Static address"
+msgstr ""
+
+msgid ""
+"Static leases are used to assign fixed IP addresses and symbolic hostnames "
+"to DHCP clients. They are also required for non-dynamic interface "
+"configurations where only hosts with a corresponding lease are served."
+msgstr ""
+
+msgid "Status"
+msgstr ""
+
+msgid "Stop"
+msgstr ""
+
+msgid "Strict order"
+msgstr ""
+
+msgid "Submit"
+msgstr ""
+
+msgid "Swap"
+msgstr ""
+
+msgid "Swap Entry"
+msgstr ""
+
+msgid "Switch"
+msgstr ""
+
+msgid "Switch %q"
+msgstr ""
+
+msgid "Switch %q (%s)"
+msgstr ""
+
+msgid "Switch protocol"
+msgstr ""
+
+msgid "Sync with browser"
+msgstr ""
+
+msgid "Synchronizing..."
+msgstr ""
+
+msgid "System"
+msgstr ""
+
+msgid "System Log"
+msgstr ""
+
+msgid "System Properties"
+msgstr ""
+
+msgid "System log buffer size"
+msgstr ""
+
+msgid "TCP:"
+msgstr ""
+
+msgid "TFTP Settings"
+msgstr ""
+
+msgid "TFTP server root"
+msgstr ""
+
+msgid "TX"
+msgstr ""
+
+msgid "TX Rate"
+msgstr ""
+
+msgid "Table"
+msgstr ""
+
+msgid "Target"
+msgstr ""
+
+msgid "Terminate"
+msgstr ""
+
+msgid ""
+"The <em>Device Configuration</em> section covers physical settings of the "
+"radio hardware such as channel, transmit power or antenna selection which "
+"are shared among all defined wireless networks (if the radio hardware is "
+"multi-SSID capable). Per network settings like encryption or operation mode "
+"are grouped in the <em>Interface Configuration</em>."
+msgstr ""
+
+msgid ""
+"The <em>libiwinfo-lua</em> package is not installed. You must install this "
+"component for working wireless configuration!"
+msgstr ""
+
+msgid ""
+"The HE.net endpoint update configuration changed, you must now use the plain "
+"username instead of the user ID!"
+msgstr ""
+
+msgid ""
+"The IPv6 prefix assigned to the provider, usually ends with <code>::</code>"
+msgstr ""
+
+msgid ""
+"The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
+"code> and <code>_</code>"
+msgstr ""
+
+msgid ""
+"The device file of the memory or partition (<abbr title=\"for example\">e.g."
+"</abbr> <code>/dev/sda1</code>)"
+msgstr ""
+
+msgid ""
+"The filesystem that was used to format the memory (<abbr title=\"for example"
+"\">e.g.</abbr> <samp><abbr title=\"Third Extended Filesystem\">ext3</abbr></"
+"samp>)"
+msgstr ""
+
+msgid ""
+"The flash image was uploaded. Below is the checksum and file size listed, "
+"compare them with the original file to ensure data integrity.<br /> Click "
+"\"Proceed\" below to start the flash procedure."
+msgstr ""
+
+msgid "The following changes have been committed"
+msgstr ""
+
+msgid "The following changes have been reverted"
+msgstr ""
+
+msgid "The following rules are currently active on this system."
+msgstr ""
+
+msgid "The given network name is not unique"
+msgstr ""
+
+msgid ""
+"The hardware is not multi-SSID capable and the existing configuration will "
+"be replaced if you proceed."
+msgstr ""
+
+msgid ""
+"The length of the IPv4 prefix in bits, the remainder is used in the IPv6 "
+"addresses."
+msgstr ""
+
+msgid "The length of the IPv6 prefix in bits"
+msgstr ""
+
+msgid ""
+"The network ports on this device can be combined to several <abbr title="
+"\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
+"communicate directly with each other. <abbr title=\"Virtual Local Area "
+"Network\">VLAN</abbr>s are often used to separate different network "
+"segments. Often there is by default one Uplink port for a connection to the "
+"next greater network like the internet and other ports for a local network."
+msgstr ""
+
+msgid "The selected protocol needs a device assigned"
+msgstr ""
+
+msgid ""
+"The system is erasing the configuration partition now and will reboot itself "
+"when finished."
+msgstr ""
+
+msgid ""
+"The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
+"few minutes before you try to reconnect. It might be necessary to renew the "
+"address of your computer to reach the device again, depending on your "
+"settings."
+msgstr ""
+
+msgid ""
+"The uploaded image file does not contain a supported format. Make sure that "
+"you choose the generic image format for your platform."
+msgstr ""
+
+msgid "There are no active leases."
+msgstr ""
+
+msgid "There are no pending changes to apply!"
+msgstr ""
+
+msgid "There are no pending changes to revert!"
+msgstr ""
+
+msgid "There are no pending changes!"
+msgstr ""
+
+msgid ""
+"There is no device assigned yet, please attach a network device in the "
+"\"Physical Settings\" tab"
+msgstr ""
+
+msgid ""
+"There is no password set on this router. Please configure a root password to "
+"protect the web interface and enable SSH."
+msgstr ""
+
+msgid "This IPv4 address of the relay"
+msgstr ""
+
+msgid ""
+"This is a list of shell glob patterns for matching files and directories to "
+"include during sysupgrade. Modified files in /etc/config/ and certain other "
+"configurations are automatically preserved."
+msgstr ""
+
+msgid ""
+"This is either the \"Update Key\" configured for the tunnel or the account "
+"password if no update key has been configured"
+msgstr ""
+
+msgid ""
+"This is the content of /etc/rc.local. Insert your own commands here (in "
+"front of 'exit 0') to execute them at the end of the boot process."
+msgstr ""
+
+msgid ""
+"This is the local endpoint address assigned by the tunnel broker, it usually "
+"ends with <code>:2</code>"
+msgstr ""
+
+msgid ""
+"This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr> in the local network"
+msgstr ""
+
+msgid "This is the plain username for logging into the account"
+msgstr ""
+
+msgid ""
+"This is the prefix routed to you by the tunnel broker for use by clients"
+msgstr ""
+
+msgid "This is the system crontab in which scheduled tasks can be defined."
+msgstr ""
+
+msgid ""
+"This is usually the address of the nearest PoP operated by the tunnel broker"
+msgstr ""
+
+msgid ""
+"This list gives an overview over currently running system processes and "
+"their status."
+msgstr ""
+
+msgid "This page allows the configuration of custom button actions"
+msgstr ""
+
+msgid "This page gives an overview over currently active network connections."
+msgstr ""
+
+msgid "This section contains no values yet"
+msgstr ""
+
+msgid "Time Synchronization"
+msgstr ""
+
+msgid "Time Synchronization is not configured yet."
+msgstr ""
+
+msgid "Timezone"
+msgstr ""
+
+msgid ""
+"To restore configuration files, you can upload a previously generated backup "
+"archive here."
+msgstr ""
+
+msgid "Total Available"
+msgstr ""
+
+msgid "Traceroute"
+msgstr ""
+
+msgid "Traffic"
+msgstr ""
+
+msgid "Transfer"
+msgstr ""
+
+msgid "Transmission Rate"
+msgstr ""
+
+msgid "Transmit"
+msgstr ""
+
+msgid "Transmit Power"
+msgstr ""
+
+msgid "Transmitter Antenna"
+msgstr ""
+
+msgid "Trigger"
+msgstr ""
+
+msgid "Trigger Mode"
+msgstr ""
+
+msgid "Tunnel ID"
+msgstr ""
+
+msgid "Tunnel Interface"
+msgstr ""
+
+msgid "Tunnel Link"
+msgstr ""
+
+msgid "Turbo Mode"
+msgstr ""
+
+msgid "Tx-Power"
+msgstr ""
+
+msgid "Type"
+msgstr ""
+
+msgid "UDP:"
+msgstr ""
+
+msgid "UMTS only"
+msgstr ""
+
+msgid "UMTS/GPRS/EV-DO"
+msgstr ""
+
+msgid "USB Device"
+msgstr ""
+
+msgid "UUID"
+msgstr ""
+
+msgid "Unable to dispatch"
+msgstr ""
+
+msgid "Unknown"
+msgstr ""
+
+msgid "Unknown Error, password not changed!"
+msgstr ""
+
+msgid "Unmanaged"
+msgstr ""
+
+msgid "Unsaved Changes"
+msgstr ""
+
+msgid "Unsupported protocol type."
+msgstr ""
+
+msgid "Update lists"
+msgstr ""
+
+msgid ""
+"Upload a sysupgrade-compatible image here to replace the running firmware. "
+"Check \"Keep settings\" to retain the current configuration (requires an "
+"OpenWrt compatible firmware image)."
+msgstr ""
+
+msgid "Upload archive..."
+msgstr ""
+
+msgid "Uploaded File"
+msgstr ""
+
+msgid "Uptime"
+msgstr ""
+
+msgid "Use <code>/etc/ethers</code>"
+msgstr ""
+
+msgid "Use DHCP gateway"
+msgstr ""
+
+msgid "Use DNS servers advertised by peer"
+msgstr ""
+
+msgid "Use ISO/IEC 3166 alpha2 country codes."
+msgstr ""
+
+msgid "Use MTU on tunnel interface"
+msgstr ""
+
+msgid "Use TTL on tunnel interface"
+msgstr ""
+
+msgid "Use as root filesystem"
+msgstr ""
+
+msgid "Use broadcast flag"
+msgstr ""
+
+msgid "Use builtin IPv6-management"
+msgstr ""
+
+msgid "Use custom DNS servers"
+msgstr ""
+
+msgid "Use default gateway"
+msgstr ""
+
+msgid "Use gateway metric"
+msgstr ""
+
+msgid "Use routing table"
+msgstr ""
+
+msgid ""
+"Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
+"em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
+"address to use and the <em>Hostname</em> is assigned as symbolic name to the "
+"requesting host."
+msgstr ""
+
+msgid "Used"
+msgstr ""
+
+msgid "Used Key Slot"
+msgstr ""
+
+msgid "Username"
+msgstr ""
+
+msgid "VC-Mux"
+msgstr ""
+
+msgid "VLAN Interface"
+msgstr ""
+
+msgid "VLANs on %q"
+msgstr ""
+
+msgid "VLANs on %q (%s)"
+msgstr ""
+
+msgid "VPN Server"
+msgstr ""
+
+msgid "Vendor Class to send when requesting DHCP"
+msgstr ""
+
+msgid "Verify"
+msgstr ""
+
+msgid "Version"
+msgstr ""
+
+msgid "WDS"
+msgstr ""
+
+msgid "WEP Open System"
+msgstr ""
+
+msgid "WEP Shared Key"
+msgstr ""
+
+msgid "WEP passphrase"
+msgstr ""
+
+msgid "WMM Mode"
+msgstr ""
+
+msgid "WPA passphrase"
+msgstr ""
+
+msgid ""
+"WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
+"and ad-hoc mode) to be installed."
+msgstr ""
+
+msgid "Waiting for changes to be applied..."
+msgstr ""
+
+msgid "Waiting for command to complete..."
+msgstr ""
+
+msgid "Warning"
+msgstr ""
+
+msgid "Warning: There are unsaved changes that will be lost while rebooting!"
+msgstr ""
+
+msgid "Wifi"
+msgstr ""
+
+msgid "Wireless"
+msgstr ""
+
+msgid "Wireless Adapter"
+msgstr ""
+
+msgid "Wireless Network"
+msgstr ""
+
+msgid "Wireless Overview"
+msgstr ""
+
+msgid "Wireless Security"
+msgstr ""
+
+msgid "Wireless is disabled or not associated"
+msgstr ""
+
+msgid "Wireless is restarting..."
+msgstr ""
+
+msgid "Wireless network is disabled"
+msgstr ""
+
+msgid "Wireless network is enabled"
+msgstr ""
+
+msgid "Wireless restarted"
+msgstr ""
+
+msgid "Wireless shut down"
+msgstr ""
+
+msgid "Write received DNS requests to syslog"
+msgstr ""
+
+msgid "XR Support"
+msgstr ""
+
+msgid ""
+"You can enable or disable installed init scripts here. Changes will applied "
+"after a device reboot.<br /><strong>Warning: If you disable essential init "
+"scripts like \"network\", your device might become inaccessible!</strong>"
+msgstr ""
+
+msgid ""
+"You must enable Java Script in your browser or LuCI will not work properly."
+msgstr ""
+
+msgid "any"
+msgstr ""
+
+msgid "auto"
+msgstr ""
+
+msgid "automatic"
+msgstr ""
+
+msgid "baseT"
+msgstr ""
+
+msgid "bridged"
+msgstr ""
+
+msgid "create:"
+msgstr ""
+
+msgid "creates a bridge over specified interface(s)"
+msgstr ""
+
+msgid "dB"
+msgstr ""
+
+msgid "dBm"
+msgstr ""
+
+msgid "disable"
+msgstr ""
+
+msgid "disabled"
+msgstr ""
+
+msgid "expired"
+msgstr ""
+
+msgid ""
+"file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr>-leases will be stored"
+msgstr ""
+
+msgid "forward"
+msgstr ""
+
+msgid "full-duplex"
+msgstr ""
+
+msgid "half-duplex"
+msgstr ""
+
+msgid "help"
+msgstr ""
+
+msgid "hidden"
+msgstr ""
+
+msgid "hybrid mode"
+msgstr ""
+
+msgid "if target is a network"
+msgstr ""
+
+msgid "input"
+msgstr ""
+
+msgid "kB"
+msgstr ""
+
+msgid "kB/s"
+msgstr ""
+
+msgid "kbit/s"
+msgstr ""
+
+msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "no link"
+msgstr ""
+
+msgid "none"
+msgstr ""
+
+msgid "off"
+msgstr ""
+
+msgid "on"
+msgstr ""
+
+msgid "open"
+msgstr ""
+
+msgid "relay mode"
+msgstr ""
+
+msgid "routed"
+msgstr ""
+
+msgid "server mode"
+msgstr ""
+
+msgid "stateful-only"
+msgstr ""
+
+msgid "stateless"
+msgstr ""
+
+msgid "stateless + stateful"
+msgstr ""
+
+msgid "tagged"
+msgstr ""
+
+msgid "unknown"
+msgstr ""
+
+msgid "unlimited"
+msgstr ""
+
+msgid "unspecified"
+msgstr ""
+
+msgid "unspecified -or- create:"
+msgstr ""
+
+msgid "untagged"
+msgstr ""
+
+msgid "yes"
+msgstr ""
+
+msgid "« Back"
+msgstr ""
diff --git a/po/tr/base.po b/modules/luci-base/po/tr/base.po
index fdf65fcbfb..fdf65fcbfb 100644
--- a/po/tr/base.po
+++ b/modules/luci-base/po/tr/base.po
diff --git a/po/uk/base.po b/modules/luci-base/po/uk/base.po
index 4fd1f6096b..4fd1f6096b 100644
--- a/po/uk/base.po
+++ b/modules/luci-base/po/uk/base.po
diff --git a/po/vi/base.po b/modules/luci-base/po/vi/base.po
index e2b3a23533..e2b3a23533 100644
--- a/po/vi/base.po
+++ b/modules/luci-base/po/vi/base.po
diff --git a/po/zh_CN/base.po b/modules/luci-base/po/zh-cn/base.po
index b66e2e9c54..b66e2e9c54 100644
--- a/po/zh_CN/base.po
+++ b/modules/luci-base/po/zh-cn/base.po
diff --git a/po/zh_TW/base.po b/modules/luci-base/po/zh-tw/base.po
index a94be30f77..a94be30f77 100644
--- a/po/zh_TW/base.po
+++ b/modules/luci-base/po/zh-tw/base.po
diff --git a/modules/base/root/etc/config/luci b/modules/luci-base/root/etc/config/luci
index c503a8f1e0..c503a8f1e0 100644
--- a/modules/base/root/etc/config/luci
+++ b/modules/luci-base/root/etc/config/luci
diff --git a/modules/base/root/etc/config/ucitrack b/modules/luci-base/root/etc/config/ucitrack
index cd3cb8515c..cd3cb8515c 100644
--- a/modules/base/root/etc/config/ucitrack
+++ b/modules/luci-base/root/etc/config/ucitrack
diff --git a/modules/luci-base/root/lib/uci/upload/.gitignore b/modules/luci-base/root/lib/uci/upload/.gitignore
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/modules/luci-base/root/lib/uci/upload/.gitignore
diff --git a/modules/base/root/sbin/luci-reload b/modules/luci-base/root/sbin/luci-reload
index cc41da2bb7..cc41da2bb7 100755
--- a/modules/base/root/sbin/luci-reload
+++ b/modules/luci-base/root/sbin/luci-reload
diff --git a/modules/base/root/www/index.html b/modules/luci-base/root/www/index.html
index 0a7238b556..0a7238b556 100644
--- a/modules/base/root/www/index.html
+++ b/modules/luci-base/root/www/index.html
diff --git a/modules/luci-base/src/Makefile b/modules/luci-base/src/Makefile
new file mode 100644
index 0000000000..7bb7f2ebe0
--- /dev/null
+++ b/modules/luci-base/src/Makefile
@@ -0,0 +1,21 @@
+%.o: %.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(FPIC) -c -o $@ $<
+
+clean:
+	rm -f po2lmo parser.so version.lua *.o
+
+po2lmo: po2lmo.o template_lmo.o
+	$(CC) $(LDFLAGS) -o $@ $^
+
+parser.so: template_parser.o template_utils.o template_lmo.o template_lualib.o
+	$(CC) $(LDFLAGS) -shared -o $@ $^
+
+version.lua:
+	./mkversion.sh $@ $(LUCI_VERSION)
+
+compile: parser.so version.lua
+
+install: compile
+	mkdir -p $(DESTDIR)/usr/lib/lua/luci/template
+	cp parser.so $(DESTDIR)/usr/lib/lua/luci/template/parser.so
+	cp version.lua $(DESTDIR)/usr/lib/lua/luci/version.lua
diff --git a/build/mkversion.sh b/modules/luci-base/src/mkversion.sh
index 3680008dfe..55b0ebd22f 100755
--- a/build/mkversion.sh
+++ b/modules/luci-base/src/mkversion.sh
@@ -32,10 +32,10 @@ if pcall(dofile, "/etc/openwrt_release") and _G.DISTRIB_DESCRIPTION then
 	distname    = ""
 	distversion = _G.DISTRIB_DESCRIPTION
 else
-	distname    = "${2:-OpenWrt}"
-	distversion = "${3:-Development Snapshot}"
+	distname    = "OpenWrt"
+	distversion = "Development Snapshot"
 end
 
 luciname    = "$variant"
-luciversion = "${5:-svn}"
+luciversion = "${2:-Git}"
 EOF
diff --git a/modules/base/src/po2lmo.c b/modules/luci-base/src/po2lmo.c
index 0da792b680..0da792b680 100644
--- a/modules/base/src/po2lmo.c
+++ b/modules/luci-base/src/po2lmo.c
diff --git a/modules/base/src/template_lmo.c b/modules/luci-base/src/template_lmo.c
index 27205a7228..27205a7228 100644
--- a/modules/base/src/template_lmo.c
+++ b/modules/luci-base/src/template_lmo.c
diff --git a/modules/base/src/template_lmo.h b/modules/luci-base/src/template_lmo.h
index 57f59aa56b..57f59aa56b 100644
--- a/modules/base/src/template_lmo.h
+++ b/modules/luci-base/src/template_lmo.h
diff --git a/modules/base/src/template_lualib.c b/modules/luci-base/src/template_lualib.c
index 1035611885..1035611885 100644
--- a/modules/base/src/template_lualib.c
+++ b/modules/luci-base/src/template_lualib.c
diff --git a/modules/base/src/template_lualib.h b/modules/luci-base/src/template_lualib.h
index 1b659be126..1b659be126 100644
--- a/modules/base/src/template_lualib.h
+++ b/modules/luci-base/src/template_lualib.h
diff --git a/modules/base/src/template_parser.c b/modules/luci-base/src/template_parser.c
index c263fbf9fd..c263fbf9fd 100644
--- a/modules/base/src/template_parser.c
+++ b/modules/luci-base/src/template_parser.c
diff --git a/modules/base/src/template_parser.h b/modules/luci-base/src/template_parser.h
index a3200a2df3..a3200a2df3 100644
--- a/modules/base/src/template_parser.h
+++ b/modules/luci-base/src/template_parser.h
diff --git a/modules/base/src/template_utils.c b/modules/luci-base/src/template_utils.c
index 80542bd4f3..80542bd4f3 100644
--- a/modules/base/src/template_utils.c
+++ b/modules/luci-base/src/template_utils.c
diff --git a/modules/base/src/template_utils.h b/modules/luci-base/src/template_utils.h
index c54af757c5..c54af757c5 100644
--- a/modules/base/src/template_utils.h
+++ b/modules/luci-base/src/template_utils.h
diff --git a/modules/base/standalone.mk b/modules/luci-base/standalone.mk
index 66a0e5a2e7..66a0e5a2e7 100644
--- a/modules/base/standalone.mk
+++ b/modules/luci-base/standalone.mk
diff --git a/modules/luci-mod-admin-full/Makefile b/modules/luci-mod-admin-full/Makefile
new file mode 100644
index 0000000000..11230d66dc
--- /dev/null
+++ b/modules/luci-mod-admin-full/Makefile
@@ -0,0 +1,15 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=LuCI Administration - full-featured for full control
+LUCI_DEPENDS:=+luci-base
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
+
diff --git a/modules/admin-full/htdocs/luci-static/resources/bandwidth.svg b/modules/luci-mod-admin-full/htdocs/luci-static/resources/bandwidth.svg
index 4f9148833a..4f9148833a 100644
--- a/modules/admin-full/htdocs/luci-static/resources/bandwidth.svg
+++ b/modules/luci-mod-admin-full/htdocs/luci-static/resources/bandwidth.svg
diff --git a/modules/admin-full/htdocs/luci-static/resources/connections.svg b/modules/luci-mod-admin-full/htdocs/luci-static/resources/connections.svg
index 816f7e6a75..816f7e6a75 100644
--- a/modules/admin-full/htdocs/luci-static/resources/connections.svg
+++ b/modules/luci-mod-admin-full/htdocs/luci-static/resources/connections.svg
diff --git a/modules/admin-full/htdocs/luci-static/resources/load.svg b/modules/luci-mod-admin-full/htdocs/luci-static/resources/load.svg
index d6817027ab..d6817027ab 100644
--- a/modules/admin-full/htdocs/luci-static/resources/load.svg
+++ b/modules/luci-mod-admin-full/htdocs/luci-static/resources/load.svg
diff --git a/modules/admin-full/htdocs/luci-static/resources/wifirate.svg b/modules/luci-mod-admin-full/htdocs/luci-static/resources/wifirate.svg
index d3e848b93f..d3e848b93f 100644
--- a/modules/admin-full/htdocs/luci-static/resources/wifirate.svg
+++ b/modules/luci-mod-admin-full/htdocs/luci-static/resources/wifirate.svg
diff --git a/modules/admin-full/htdocs/luci-static/resources/wireless.svg b/modules/luci-mod-admin-full/htdocs/luci-static/resources/wireless.svg
index 99d9840f6b..99d9840f6b 100644
--- a/modules/admin-full/htdocs/luci-static/resources/wireless.svg
+++ b/modules/luci-mod-admin-full/htdocs/luci-static/resources/wireless.svg
diff --git a/modules/admin-full/luasrc/controller/admin/filebrowser.lua b/modules/luci-mod-admin-full/luasrc/controller/admin/filebrowser.lua
index d83139fd70..d83139fd70 100644
--- a/modules/admin-full/luasrc/controller/admin/filebrowser.lua
+++ b/modules/luci-mod-admin-full/luasrc/controller/admin/filebrowser.lua
diff --git a/modules/admin-full/luasrc/controller/admin/index.lua b/modules/luci-mod-admin-full/luasrc/controller/admin/index.lua
index 4e832529d9..4e832529d9 100644
--- a/modules/admin-full/luasrc/controller/admin/index.lua
+++ b/modules/luci-mod-admin-full/luasrc/controller/admin/index.lua
diff --git a/modules/admin-full/luasrc/controller/admin/network.lua b/modules/luci-mod-admin-full/luasrc/controller/admin/network.lua
index 4388864eb1..4388864eb1 100644
--- a/modules/admin-full/luasrc/controller/admin/network.lua
+++ b/modules/luci-mod-admin-full/luasrc/controller/admin/network.lua
diff --git a/modules/admin-full/luasrc/controller/admin/status.lua b/modules/luci-mod-admin-full/luasrc/controller/admin/status.lua
index 89ebda7353..89ebda7353 100644
--- a/modules/admin-full/luasrc/controller/admin/status.lua
+++ b/modules/luci-mod-admin-full/luasrc/controller/admin/status.lua
diff --git a/modules/admin-full/luasrc/controller/admin/system.lua b/modules/luci-mod-admin-full/luasrc/controller/admin/system.lua
index 5fa4c3a387..5fa4c3a387 100644
--- a/modules/admin-full/luasrc/controller/admin/system.lua
+++ b/modules/luci-mod-admin-full/luasrc/controller/admin/system.lua
diff --git a/modules/admin-full/luasrc/controller/admin/uci.lua b/modules/luci-mod-admin-full/luasrc/controller/admin/uci.lua
index 34e40ee624..34e40ee624 100644
--- a/modules/admin-full/luasrc/controller/admin/uci.lua
+++ b/modules/luci-mod-admin-full/luasrc/controller/admin/uci.lua
diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/dhcp.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/dhcp.lua
index bd6f403c53..bd6f403c53 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_network/dhcp.lua
+++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/dhcp.lua
diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/hosts.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/hosts.lua
index b4fee8cf07..b4fee8cf07 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_network/hosts.lua
+++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/hosts.lua
diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/iface_add.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/iface_add.lua
index 92026b157b..92026b157b 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_network/iface_add.lua
+++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/iface_add.lua
diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/ifaces.lua
index 9be5ff1a7d..9be5ff1a7d 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua
+++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/ifaces.lua
diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/network.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/network.lua
index f2984b5810..f2984b5810 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_network/network.lua
+++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/network.lua
diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/proto_ahcp.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/proto_ahcp.lua
index 26dc33abb8..26dc33abb8 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_network/proto_ahcp.lua
+++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/proto_ahcp.lua
diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/routes.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/routes.lua
index 469748c87a..469748c87a 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_network/routes.lua
+++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/routes.lua
diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/vlan.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/vlan.lua
index fbea03af98..fbea03af98 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_network/vlan.lua
+++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/vlan.lua
diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi.lua
index f61fda3737..f61fda3737 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
+++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi.lua
diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/wifi_add.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_add.lua
index cb42648865..cb42648865 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_network/wifi_add.lua
+++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_add.lua
diff --git a/modules/admin-full/luasrc/model/cbi/admin_status/processes.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_status/processes.lua
index c34c70ffae..c34c70ffae 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_status/processes.lua
+++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_status/processes.lua
diff --git a/modules/admin-full/luasrc/model/cbi/admin_system/admin.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/admin.lua
index a3da6beb6f..a3da6beb6f 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_system/admin.lua
+++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/admin.lua
diff --git a/modules/admin-full/luasrc/model/cbi/admin_system/backupfiles.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/backupfiles.lua
index a063ec0aa4..a063ec0aa4 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_system/backupfiles.lua
+++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/backupfiles.lua
diff --git a/modules/admin-full/luasrc/model/cbi/admin_system/buttons.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/buttons.lua
index d7581830d3..d7581830d3 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_system/buttons.lua
+++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/buttons.lua
diff --git a/modules/admin-full/luasrc/model/cbi/admin_system/crontab.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/crontab.lua
index 3e1b9d85d0..3e1b9d85d0 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_system/crontab.lua
+++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/crontab.lua
diff --git a/modules/admin-full/luasrc/model/cbi/admin_system/fstab.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/fstab.lua
index 8ac3d6d5e7..8ac3d6d5e7 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_system/fstab.lua
+++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/fstab.lua
diff --git a/modules/admin-full/luasrc/model/cbi/admin_system/fstab/mount.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/fstab/mount.lua
index bac886888a..bac886888a 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_system/fstab/mount.lua
+++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/fstab/mount.lua
diff --git a/modules/admin-full/luasrc/model/cbi/admin_system/fstab/swap.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/fstab/swap.lua
index 01d0ff90a5..01d0ff90a5 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_system/fstab/swap.lua
+++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/fstab/swap.lua
diff --git a/modules/admin-full/luasrc/model/cbi/admin_system/ipkg.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/ipkg.lua
index e9ff5b1460..e9ff5b1460 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_system/ipkg.lua
+++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/ipkg.lua
diff --git a/modules/admin-full/luasrc/model/cbi/admin_system/leds.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/leds.lua
index b912f5ece8..b912f5ece8 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_system/leds.lua
+++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/leds.lua
diff --git a/modules/admin-full/luasrc/model/cbi/admin_system/startup.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/startup.lua
index fc35f774a9..fc35f774a9 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_system/startup.lua
+++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/startup.lua
diff --git a/modules/admin-full/luasrc/model/cbi/admin_system/system.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/system.lua
index 5e82289bd8..5e82289bd8 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_system/system.lua
+++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/system.lua
diff --git a/modules/admin-full/luasrc/view/admin_network/diagnostics.htm b/modules/luci-mod-admin-full/luasrc/view/admin_network/diagnostics.htm
index d1bef2a8b7..d1bef2a8b7 100644
--- a/modules/admin-full/luasrc/view/admin_network/diagnostics.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_network/diagnostics.htm
diff --git a/modules/admin-full/luasrc/view/admin_network/iface_overview.htm b/modules/luci-mod-admin-full/luasrc/view/admin_network/iface_overview.htm
index 4be062985a..4be062985a 100644
--- a/modules/admin-full/luasrc/view/admin_network/iface_overview.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_network/iface_overview.htm
diff --git a/modules/admin-full/luasrc/view/admin_network/iface_status.htm b/modules/luci-mod-admin-full/luasrc/view/admin_network/iface_status.htm
index 8136383969..8136383969 100644
--- a/modules/admin-full/luasrc/view/admin_network/iface_status.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_network/iface_status.htm
diff --git a/modules/admin-full/luasrc/view/admin_network/lease_status.htm b/modules/luci-mod-admin-full/luasrc/view/admin_network/lease_status.htm
index 0ba334ee9d..0ba334ee9d 100644
--- a/modules/admin-full/luasrc/view/admin_network/lease_status.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_network/lease_status.htm
diff --git a/modules/admin-full/luasrc/view/admin_network/switch_status.htm b/modules/luci-mod-admin-full/luasrc/view/admin_network/switch_status.htm
index b299575e2f..b299575e2f 100644
--- a/modules/admin-full/luasrc/view/admin_network/switch_status.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_network/switch_status.htm
diff --git a/modules/admin-full/luasrc/view/admin_network/wifi_join.htm b/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_join.htm
index f3b6dddefc..f3b6dddefc 100644
--- a/modules/admin-full/luasrc/view/admin_network/wifi_join.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_join.htm
diff --git a/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm b/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_overview.htm
index 312fd08654..312fd08654 100644
--- a/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_overview.htm
diff --git a/modules/admin-full/luasrc/view/admin_network/wifi_status.htm b/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_status.htm
index 2484fd3c6b..2484fd3c6b 100644
--- a/modules/admin-full/luasrc/view/admin_network/wifi_status.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_status.htm
diff --git a/modules/admin-full/luasrc/view/admin_status/bandwidth.htm b/modules/luci-mod-admin-full/luasrc/view/admin_status/bandwidth.htm
index 0c53c95bed..0c53c95bed 100644
--- a/modules/admin-full/luasrc/view/admin_status/bandwidth.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_status/bandwidth.htm
diff --git a/modules/admin-full/luasrc/view/admin_status/connections.htm b/modules/luci-mod-admin-full/luasrc/view/admin_status/connections.htm
index 80c8b70e3c..80c8b70e3c 100644
--- a/modules/admin-full/luasrc/view/admin_status/connections.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_status/connections.htm
diff --git a/modules/admin-full/luasrc/view/admin_status/dmesg.htm b/modules/luci-mod-admin-full/luasrc/view/admin_status/dmesg.htm
index 7757460a05..7757460a05 100644
--- a/modules/admin-full/luasrc/view/admin_status/dmesg.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_status/dmesg.htm
diff --git a/modules/admin-full/luasrc/view/admin_status/index.htm b/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm
index cfeb91ac7a..cfeb91ac7a 100644
--- a/modules/admin-full/luasrc/view/admin_status/index.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm
diff --git a/modules/admin-full/luasrc/view/admin_status/iptables.htm b/modules/luci-mod-admin-full/luasrc/view/admin_status/iptables.htm
index 957604e8af..957604e8af 100644
--- a/modules/admin-full/luasrc/view/admin_status/iptables.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_status/iptables.htm
diff --git a/modules/admin-full/luasrc/view/admin_status/load.htm b/modules/luci-mod-admin-full/luasrc/view/admin_status/load.htm
index a002715ec8..a002715ec8 100644
--- a/modules/admin-full/luasrc/view/admin_status/load.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_status/load.htm
diff --git a/modules/admin-full/luasrc/view/admin_status/routes.htm b/modules/luci-mod-admin-full/luasrc/view/admin_status/routes.htm
index 4e7287b705..4e7287b705 100644
--- a/modules/admin-full/luasrc/view/admin_status/routes.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_status/routes.htm
diff --git a/modules/admin-full/luasrc/view/admin_status/syslog.htm b/modules/luci-mod-admin-full/luasrc/view/admin_status/syslog.htm
index 06aeeb01a6..06aeeb01a6 100644
--- a/modules/admin-full/luasrc/view/admin_status/syslog.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_status/syslog.htm
diff --git a/modules/admin-full/luasrc/view/admin_status/wireless.htm b/modules/luci-mod-admin-full/luasrc/view/admin_status/wireless.htm
index 465143ebce..465143ebce 100644
--- a/modules/admin-full/luasrc/view/admin_status/wireless.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_status/wireless.htm
diff --git a/modules/admin-full/luasrc/view/admin_system/applyreboot.htm b/modules/luci-mod-admin-full/luasrc/view/admin_system/applyreboot.htm
index 56721a6104..56721a6104 100644
--- a/modules/admin-full/luasrc/view/admin_system/applyreboot.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_system/applyreboot.htm
diff --git a/modules/admin-full/luasrc/view/admin_system/backupfiles.htm b/modules/luci-mod-admin-full/luasrc/view/admin_system/backupfiles.htm
index 38b5f03a14..38b5f03a14 100644
--- a/modules/admin-full/luasrc/view/admin_system/backupfiles.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_system/backupfiles.htm
diff --git a/modules/admin-full/luasrc/view/admin_system/clock_status.htm b/modules/luci-mod-admin-full/luasrc/view/admin_system/clock_status.htm
index 84e151075f..84e151075f 100644
--- a/modules/admin-full/luasrc/view/admin_system/clock_status.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_system/clock_status.htm
diff --git a/modules/admin-full/luasrc/view/admin_system/flashops.htm b/modules/luci-mod-admin-full/luasrc/view/admin_system/flashops.htm
index debc796e89..debc796e89 100644
--- a/modules/admin-full/luasrc/view/admin_system/flashops.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_system/flashops.htm
diff --git a/modules/admin-full/luasrc/view/admin_system/ipkg.htm b/modules/luci-mod-admin-full/luasrc/view/admin_system/ipkg.htm
index 7f0956cfde..7f0956cfde 100644
--- a/modules/admin-full/luasrc/view/admin_system/ipkg.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_system/ipkg.htm
diff --git a/modules/admin-full/luasrc/view/admin_system/packages.htm b/modules/luci-mod-admin-full/luasrc/view/admin_system/packages.htm
index 00b4be4868..00b4be4868 100644
--- a/modules/admin-full/luasrc/view/admin_system/packages.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_system/packages.htm
diff --git a/modules/admin-full/luasrc/view/admin_system/reboot.htm b/modules/luci-mod-admin-full/luasrc/view/admin_system/reboot.htm
index 5f2912d925..5f2912d925 100644
--- a/modules/admin-full/luasrc/view/admin_system/reboot.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_system/reboot.htm
diff --git a/modules/admin-full/luasrc/view/admin_system/upgrade.htm b/modules/luci-mod-admin-full/luasrc/view/admin_system/upgrade.htm
index ce285332eb..ce285332eb 100644
--- a/modules/admin-full/luasrc/view/admin_system/upgrade.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_system/upgrade.htm
diff --git a/modules/admin-full/luasrc/view/admin_uci/apply.htm b/modules/luci-mod-admin-full/luasrc/view/admin_uci/apply.htm
index f6a68126de..f6a68126de 100644
--- a/modules/admin-full/luasrc/view/admin_uci/apply.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_uci/apply.htm
diff --git a/modules/admin-full/luasrc/view/admin_uci/changelog.htm b/modules/luci-mod-admin-full/luasrc/view/admin_uci/changelog.htm
index e195befb3e..e195befb3e 100644
--- a/modules/admin-full/luasrc/view/admin_uci/changelog.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_uci/changelog.htm
diff --git a/modules/admin-full/luasrc/view/admin_uci/changes.htm b/modules/luci-mod-admin-full/luasrc/view/admin_uci/changes.htm
index 2415de316f..2415de316f 100644
--- a/modules/admin-full/luasrc/view/admin_uci/changes.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_uci/changes.htm
diff --git a/modules/admin-full/luasrc/view/admin_uci/revert.htm b/modules/luci-mod-admin-full/luasrc/view/admin_uci/revert.htm
index 739b752046..739b752046 100644
--- a/modules/admin-full/luasrc/view/admin_uci/revert.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_uci/revert.htm
diff --git a/modules/admin-full/luasrc/view/cbi/wireless_modefreq.htm b/modules/luci-mod-admin-full/luasrc/view/cbi/wireless_modefreq.htm
index ac14593e79..ac14593e79 100644
--- a/modules/admin-full/luasrc/view/cbi/wireless_modefreq.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/cbi/wireless_modefreq.htm
diff --git a/modules/luci-mod-admin-full/src/Makefile b/modules/luci-mod-admin-full/src/Makefile
new file mode 100644
index 0000000000..47045fc5c4
--- /dev/null
+++ b/modules/luci-mod-admin-full/src/Makefile
@@ -0,0 +1,14 @@
+%.o: %.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(FPIC) -c -o $@ $<
+
+clean:
+	rm -f luci-bwc *.o
+
+luci-bwc: luci-bwc.o
+	$(CC) $(LDFLAGS) -shared -o $@ $^
+
+compile: luci-bwc
+
+install: compile
+	mkdir -p $(DESTDIR)/usr/bin
+	cp luci-bwc $(DESTDIR)/usr/bin/luci-bwc
diff --git a/modules/admin-full/src/luci-bwc.c b/modules/luci-mod-admin-full/src/luci-bwc.c
index 05e46671e8..05e46671e8 100644
--- a/modules/admin-full/src/luci-bwc.c
+++ b/modules/luci-mod-admin-full/src/luci-bwc.c
diff --git a/modules/luci-mod-admin-mini/Makefile b/modules/luci-mod-admin-mini/Makefile
new file mode 100644
index 0000000000..5da4cafc94
--- /dev/null
+++ b/modules/luci-mod-admin-mini/Makefile
@@ -0,0 +1,15 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=LuCI Essentials - stripped down and user-friendly
+LUCI_DEPENDS:=+luci-base @BROKEN
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
+
diff --git a/modules/admin-mini/luasrc/controller/mini/index.lua b/modules/luci-mod-admin-mini/luasrc/controller/mini/index.lua
index 9d6a38ed43..9d6a38ed43 100644
--- a/modules/admin-mini/luasrc/controller/mini/index.lua
+++ b/modules/luci-mod-admin-mini/luasrc/controller/mini/index.lua
diff --git a/modules/admin-mini/luasrc/controller/mini/network.lua b/modules/luci-mod-admin-mini/luasrc/controller/mini/network.lua
index 8b9356dd6e..8b9356dd6e 100644
--- a/modules/admin-mini/luasrc/controller/mini/network.lua
+++ b/modules/luci-mod-admin-mini/luasrc/controller/mini/network.lua
diff --git a/modules/admin-mini/luasrc/controller/mini/system.lua b/modules/luci-mod-admin-mini/luasrc/controller/mini/system.lua
index 71b5b63519..71b5b63519 100644
--- a/modules/admin-mini/luasrc/controller/mini/system.lua
+++ b/modules/luci-mod-admin-mini/luasrc/controller/mini/system.lua
diff --git a/modules/admin-mini/luasrc/model/cbi/mini/dhcp.lua b/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/dhcp.lua
index 5547db6cdd..5547db6cdd 100644
--- a/modules/admin-mini/luasrc/model/cbi/mini/dhcp.lua
+++ b/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/dhcp.lua
diff --git a/modules/admin-mini/luasrc/model/cbi/mini/index.lua b/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/index.lua
index 71b5dafa3c..71b5dafa3c 100644
--- a/modules/admin-mini/luasrc/model/cbi/mini/index.lua
+++ b/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/index.lua
diff --git a/modules/admin-mini/luasrc/model/cbi/mini/luci.lua b/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/luci.lua
index 78255c1d97..78255c1d97 100644
--- a/modules/admin-mini/luasrc/model/cbi/mini/luci.lua
+++ b/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/luci.lua
diff --git a/modules/admin-mini/luasrc/model/cbi/mini/network.lua b/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/network.lua
index 57edc47187..57edc47187 100644
--- a/modules/admin-mini/luasrc/model/cbi/mini/network.lua
+++ b/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/network.lua
diff --git a/modules/admin-mini/luasrc/model/cbi/mini/passwd.lua b/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/passwd.lua
index 6f13bb0fc8..6f13bb0fc8 100644
--- a/modules/admin-mini/luasrc/model/cbi/mini/passwd.lua
+++ b/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/passwd.lua
diff --git a/modules/admin-mini/luasrc/model/cbi/mini/system.lua b/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/system.lua
index 593af04f25..593af04f25 100644
--- a/modules/admin-mini/luasrc/model/cbi/mini/system.lua
+++ b/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/system.lua
diff --git a/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua b/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/wifi.lua
index a18c072e73..a18c072e73 100644
--- a/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua
+++ b/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/wifi.lua
diff --git a/modules/admin-mini/luasrc/view/mini/applyreboot.htm b/modules/luci-mod-admin-mini/luasrc/view/mini/applyreboot.htm
index 8ff7118c7e..8ff7118c7e 100644
--- a/modules/admin-mini/luasrc/view/mini/applyreboot.htm
+++ b/modules/luci-mod-admin-mini/luasrc/view/mini/applyreboot.htm
diff --git a/modules/admin-mini/luasrc/view/mini/backup.htm b/modules/luci-mod-admin-mini/luasrc/view/mini/backup.htm
index eb9dc46e47..eb9dc46e47 100644
--- a/modules/admin-mini/luasrc/view/mini/backup.htm
+++ b/modules/luci-mod-admin-mini/luasrc/view/mini/backup.htm
diff --git a/modules/admin-mini/luasrc/view/mini/index.htm b/modules/luci-mod-admin-mini/luasrc/view/mini/index.htm
index c14d3b0b23..c14d3b0b23 100644
--- a/modules/admin-mini/luasrc/view/mini/index.htm
+++ b/modules/luci-mod-admin-mini/luasrc/view/mini/index.htm
diff --git a/modules/admin-mini/luasrc/view/mini/reboot.htm b/modules/luci-mod-admin-mini/luasrc/view/mini/reboot.htm
index 9e57d89f9f..9e57d89f9f 100644
--- a/modules/admin-mini/luasrc/view/mini/reboot.htm
+++ b/modules/luci-mod-admin-mini/luasrc/view/mini/reboot.htm
diff --git a/modules/admin-mini/luasrc/view/mini/upgrade.htm b/modules/luci-mod-admin-mini/luasrc/view/mini/upgrade.htm
index 6ff5d84919..6ff5d84919 100644
--- a/modules/admin-mini/luasrc/view/mini/upgrade.htm
+++ b/modules/luci-mod-admin-mini/luasrc/view/mini/upgrade.htm
diff --git a/modules/luci-mod-failsafe/Makefile b/modules/luci-mod-failsafe/Makefile
new file mode 100644
index 0000000000..8afc614f26
--- /dev/null
+++ b/modules/luci-mod-failsafe/Makefile
@@ -0,0 +1,15 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=LuCI Fail-Safe - Fail-Safe sysupgrade module
+LUCI_DEPENDS:=+luci-base
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
+
diff --git a/modules/failsafe/luasrc/controller/failsafe/failsafe.lua b/modules/luci-mod-failsafe/luasrc/controller/failsafe/failsafe.lua
index db4bda6605..db4bda6605 100644
--- a/modules/failsafe/luasrc/controller/failsafe/failsafe.lua
+++ b/modules/luci-mod-failsafe/luasrc/controller/failsafe/failsafe.lua
diff --git a/modules/failsafe/luasrc/view/failsafe/applyreboot.htm b/modules/luci-mod-failsafe/luasrc/view/failsafe/applyreboot.htm
index 866d213f05..866d213f05 100644
--- a/modules/failsafe/luasrc/view/failsafe/applyreboot.htm
+++ b/modules/luci-mod-failsafe/luasrc/view/failsafe/applyreboot.htm
diff --git a/modules/failsafe/luasrc/view/failsafe/flashops.htm b/modules/luci-mod-failsafe/luasrc/view/failsafe/flashops.htm
index 5ff23e5c17..5ff23e5c17 100644
--- a/modules/failsafe/luasrc/view/failsafe/flashops.htm
+++ b/modules/luci-mod-failsafe/luasrc/view/failsafe/flashops.htm
diff --git a/modules/failsafe/luasrc/view/failsafe/reboot.htm b/modules/luci-mod-failsafe/luasrc/view/failsafe/reboot.htm
index e2e4db035b..e2e4db035b 100644
--- a/modules/failsafe/luasrc/view/failsafe/reboot.htm
+++ b/modules/luci-mod-failsafe/luasrc/view/failsafe/reboot.htm
diff --git a/modules/failsafe/luasrc/view/failsafe/upgrade.htm b/modules/luci-mod-failsafe/luasrc/view/failsafe/upgrade.htm
index 7a86000efb..7a86000efb 100644
--- a/modules/failsafe/luasrc/view/failsafe/upgrade.htm
+++ b/modules/luci-mod-failsafe/luasrc/view/failsafe/upgrade.htm
diff --git a/modules/luci-mod-freifunk-community/Makefile b/modules/luci-mod-freifunk-community/Makefile
new file mode 100644
index 0000000000..ad6c4ce2ef
--- /dev/null
+++ b/modules/luci-mod-freifunk-community/Makefile
@@ -0,0 +1,19 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=Freifunk Community Meta-Package
+LUCI_DEPENDS:= \
+	+iptables-mod-nat-extra +iptables-mod-ipopt +luci-app-splash \
+	+olsrd +olsrd-mod-dyn-gw-plain +olsrd-mod-jsoninfo +olsrd-mod-nameservice \
+	+olsrd-mod-watchdog +kmod-tun +ip +freifunk-watchdog +luci-app-olsr \
+	+luci-app-olsr-services +freifunk-gwcheck +freifunk-mapupdate
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
+
diff --git a/modules/luci-mod-freifunk/Makefile b/modules/luci-mod-freifunk/Makefile
new file mode 100644
index 0000000000..550db1df15
--- /dev/null
+++ b/modules/luci-mod-freifunk/Makefile
@@ -0,0 +1,15 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=LuCI Freifunk module
+LUCI_DEPENDS:=+luci-mod-admin-full +luci-lib-json +freifunk-firewall +freifunk-common
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
+
diff --git a/modules/freifunk/htdocs/luci-static/flashing.html b/modules/luci-mod-freifunk/htdocs/luci-static/flashing.html
index 43e51236d7..43e51236d7 100644
--- a/modules/freifunk/htdocs/luci-static/flashing.html
+++ b/modules/luci-mod-freifunk/htdocs/luci-static/flashing.html
diff --git a/modules/freifunk/htdocs/luci-static/resources/OSMLatLon.htm b/modules/luci-mod-freifunk/htdocs/luci-static/resources/OSMLatLon.htm
index 18be30be35..18be30be35 100644
--- a/modules/freifunk/htdocs/luci-static/resources/OSMLatLon.htm
+++ b/modules/luci-mod-freifunk/htdocs/luci-static/resources/OSMLatLon.htm
diff --git a/modules/freifunk/htdocs/luci-static/resources/flashing.gif b/modules/luci-mod-freifunk/htdocs/luci-static/resources/flashing.gif
index e207fc56a1..e207fc56a1 100644
--- a/modules/freifunk/htdocs/luci-static/resources/flashing.gif
+++ b/modules/luci-mod-freifunk/htdocs/luci-static/resources/flashing.gif
diff --git a/modules/freifunk/htdocs/luci-static/resources/freifunk-map/hna.gif b/modules/luci-mod-freifunk/htdocs/luci-static/resources/freifunk-map/hna.gif
index 818780d153..818780d153 100644
--- a/modules/freifunk/htdocs/luci-static/resources/freifunk-map/hna.gif
+++ b/modules/luci-mod-freifunk/htdocs/luci-static/resources/freifunk-map/hna.gif
diff --git a/modules/freifunk/htdocs/luci-static/resources/freifunk-map/node.gif b/modules/luci-mod-freifunk/htdocs/luci-static/resources/freifunk-map/node.gif
index f64ab162a4..f64ab162a4 100644
--- a/modules/freifunk/htdocs/luci-static/resources/freifunk-map/node.gif
+++ b/modules/luci-mod-freifunk/htdocs/luci-static/resources/freifunk-map/node.gif
diff --git a/modules/freifunk/htdocs/luci-static/resources/osm.js b/modules/luci-mod-freifunk/htdocs/luci-static/resources/osm.js
index cae0cd66f7..cae0cd66f7 100644
--- a/modules/freifunk/htdocs/luci-static/resources/osm.js
+++ b/modules/luci-mod-freifunk/htdocs/luci-static/resources/osm.js
diff --git a/modules/freifunk/luasrc/controller/freifunk/freifunk.lua b/modules/luci-mod-freifunk/luasrc/controller/freifunk/freifunk.lua
index d4606e750f..d4606e750f 100644
--- a/modules/freifunk/luasrc/controller/freifunk/freifunk.lua
+++ b/modules/luci-mod-freifunk/luasrc/controller/freifunk/freifunk.lua
diff --git a/modules/freifunk/luasrc/controller/freifunk/remote_update.lua b/modules/luci-mod-freifunk/luasrc/controller/freifunk/remote_update.lua
index cc8dd142de..cc8dd142de 100644
--- a/modules/freifunk/luasrc/controller/freifunk/remote_update.lua
+++ b/modules/luci-mod-freifunk/luasrc/controller/freifunk/remote_update.lua
diff --git a/modules/freifunk/luasrc/model/cbi/freifunk/basics.lua b/modules/luci-mod-freifunk/luasrc/model/cbi/freifunk/basics.lua
index 8987b1cb46..8987b1cb46 100644
--- a/modules/freifunk/luasrc/model/cbi/freifunk/basics.lua
+++ b/modules/luci-mod-freifunk/luasrc/model/cbi/freifunk/basics.lua
diff --git a/modules/freifunk/luasrc/model/cbi/freifunk/contact.lua b/modules/luci-mod-freifunk/luasrc/model/cbi/freifunk/contact.lua
index 30e94a3e96..30e94a3e96 100644
--- a/modules/freifunk/luasrc/model/cbi/freifunk/contact.lua
+++ b/modules/luci-mod-freifunk/luasrc/model/cbi/freifunk/contact.lua
diff --git a/modules/freifunk/luasrc/model/cbi/freifunk/profile.lua b/modules/luci-mod-freifunk/luasrc/model/cbi/freifunk/profile.lua
index c9bd23ed61..c9bd23ed61 100644
--- a/modules/freifunk/luasrc/model/cbi/freifunk/profile.lua
+++ b/modules/luci-mod-freifunk/luasrc/model/cbi/freifunk/profile.lua
diff --git a/modules/freifunk/luasrc/model/cbi/freifunk/profile_expert.lua b/modules/luci-mod-freifunk/luasrc/model/cbi/freifunk/profile_expert.lua
index 0d890e1df6..0d890e1df6 100644
--- a/modules/freifunk/luasrc/model/cbi/freifunk/profile_expert.lua
+++ b/modules/luci-mod-freifunk/luasrc/model/cbi/freifunk/profile_expert.lua
diff --git a/modules/freifunk/luasrc/model/cbi/freifunk/user_index.lua b/modules/luci-mod-freifunk/luasrc/model/cbi/freifunk/user_index.lua
index fe1d8fe7ed..fe1d8fe7ed 100644
--- a/modules/freifunk/luasrc/model/cbi/freifunk/user_index.lua
+++ b/modules/luci-mod-freifunk/luasrc/model/cbi/freifunk/user_index.lua
diff --git a/modules/freifunk/luasrc/view/cbi/osmll_value.htm b/modules/luci-mod-freifunk/luasrc/view/cbi/osmll_value.htm
index 78b4dff91f..78b4dff91f 100644
--- a/modules/freifunk/luasrc/view/cbi/osmll_value.htm
+++ b/modules/luci-mod-freifunk/luasrc/view/cbi/osmll_value.htm
diff --git a/modules/freifunk/luasrc/view/freifunk-map/frame.htm b/modules/luci-mod-freifunk/luasrc/view/freifunk-map/frame.htm
index b2e168363f..b2e168363f 100644
--- a/modules/freifunk/luasrc/view/freifunk-map/frame.htm
+++ b/modules/luci-mod-freifunk/luasrc/view/freifunk-map/frame.htm
diff --git a/modules/freifunk/luasrc/view/freifunk-map/map.htm b/modules/luci-mod-freifunk/luasrc/view/freifunk-map/map.htm
index c3951f9c63..c3951f9c63 100644
--- a/modules/freifunk/luasrc/view/freifunk-map/map.htm
+++ b/modules/luci-mod-freifunk/luasrc/view/freifunk-map/map.htm
diff --git a/modules/freifunk/luasrc/view/freifunk/adminindex.htm b/modules/luci-mod-freifunk/luasrc/view/freifunk/adminindex.htm
index e0252ba891..e0252ba891 100644
--- a/modules/freifunk/luasrc/view/freifunk/adminindex.htm
+++ b/modules/luci-mod-freifunk/luasrc/view/freifunk/adminindex.htm
diff --git a/modules/freifunk/luasrc/view/freifunk/contact.htm b/modules/luci-mod-freifunk/luasrc/view/freifunk/contact.htm
index 2d79ccd406..2d79ccd406 100644
--- a/modules/freifunk/luasrc/view/freifunk/contact.htm
+++ b/modules/luci-mod-freifunk/luasrc/view/freifunk/contact.htm
diff --git a/modules/freifunk/luasrc/view/freifunk/index.htm b/modules/luci-mod-freifunk/luasrc/view/freifunk/index.htm
index 0fcec45971..0fcec45971 100644
--- a/modules/freifunk/luasrc/view/freifunk/index.htm
+++ b/modules/luci-mod-freifunk/luasrc/view/freifunk/index.htm
diff --git a/modules/freifunk/luasrc/view/freifunk/profile_error.htm b/modules/luci-mod-freifunk/luasrc/view/freifunk/profile_error.htm
index 984fa0acfc..984fa0acfc 100644
--- a/modules/freifunk/luasrc/view/freifunk/profile_error.htm
+++ b/modules/luci-mod-freifunk/luasrc/view/freifunk/profile_error.htm
diff --git a/modules/freifunk/luasrc/view/freifunk/public_status.htm b/modules/luci-mod-freifunk/luasrc/view/freifunk/public_status.htm
index 10bd849d7d..10bd849d7d 100644
--- a/modules/freifunk/luasrc/view/freifunk/public_status.htm
+++ b/modules/luci-mod-freifunk/luasrc/view/freifunk/public_status.htm
diff --git a/modules/freifunk/luasrc/view/freifunk/remote_update.htm b/modules/luci-mod-freifunk/luasrc/view/freifunk/remote_update.htm
index 092ec47143..092ec47143 100644
--- a/modules/freifunk/luasrc/view/freifunk/remote_update.htm
+++ b/modules/luci-mod-freifunk/luasrc/view/freifunk/remote_update.htm
diff --git a/po/ca/freifunk.po b/modules/luci-mod-freifunk/po/ca/freifunk.po
index 338c688282..338c688282 100644
--- a/po/ca/freifunk.po
+++ b/modules/luci-mod-freifunk/po/ca/freifunk.po
diff --git a/po/cs/freifunk.po b/modules/luci-mod-freifunk/po/cs/freifunk.po
index cf22c008bb..cf22c008bb 100644
--- a/po/cs/freifunk.po
+++ b/modules/luci-mod-freifunk/po/cs/freifunk.po
diff --git a/po/de/freifunk.po b/modules/luci-mod-freifunk/po/de/freifunk.po
index ff6e6bc67d..ff6e6bc67d 100644
--- a/po/de/freifunk.po
+++ b/modules/luci-mod-freifunk/po/de/freifunk.po
diff --git a/po/el/freifunk.po b/modules/luci-mod-freifunk/po/el/freifunk.po
index 95d58eae0b..95d58eae0b 100644
--- a/po/el/freifunk.po
+++ b/modules/luci-mod-freifunk/po/el/freifunk.po
diff --git a/po/en/freifunk.po b/modules/luci-mod-freifunk/po/en/freifunk.po
index 1a0b425e90..1a0b425e90 100644
--- a/po/en/freifunk.po
+++ b/modules/luci-mod-freifunk/po/en/freifunk.po
diff --git a/po/es/freifunk.po b/modules/luci-mod-freifunk/po/es/freifunk.po
index 7242268d96..7242268d96 100644
--- a/po/es/freifunk.po
+++ b/modules/luci-mod-freifunk/po/es/freifunk.po
diff --git a/po/fr/freifunk.po b/modules/luci-mod-freifunk/po/fr/freifunk.po
index 028a2ce2b1..028a2ce2b1 100644
--- a/po/fr/freifunk.po
+++ b/modules/luci-mod-freifunk/po/fr/freifunk.po
diff --git a/po/he/freifunk.po b/modules/luci-mod-freifunk/po/he/freifunk.po
index 3dfdefd595..3dfdefd595 100644
--- a/po/he/freifunk.po
+++ b/modules/luci-mod-freifunk/po/he/freifunk.po
diff --git a/po/hu/freifunk.po b/modules/luci-mod-freifunk/po/hu/freifunk.po
index 71829ef517..71829ef517 100644
--- a/po/hu/freifunk.po
+++ b/modules/luci-mod-freifunk/po/hu/freifunk.po
diff --git a/po/it/freifunk.po b/modules/luci-mod-freifunk/po/it/freifunk.po
index 9bbeebc548..9bbeebc548 100644
--- a/po/it/freifunk.po
+++ b/modules/luci-mod-freifunk/po/it/freifunk.po
diff --git a/po/ja/freifunk.po b/modules/luci-mod-freifunk/po/ja/freifunk.po
index 028a2ce2b1..028a2ce2b1 100644
--- a/po/ja/freifunk.po
+++ b/modules/luci-mod-freifunk/po/ja/freifunk.po
diff --git a/po/ms/freifunk.po b/modules/luci-mod-freifunk/po/ms/freifunk.po
index 262991d217..262991d217 100644
--- a/po/ms/freifunk.po
+++ b/modules/luci-mod-freifunk/po/ms/freifunk.po
diff --git a/po/no/freifunk.po b/modules/luci-mod-freifunk/po/no/freifunk.po
index 62df8b9f7a..62df8b9f7a 100644
--- a/po/no/freifunk.po
+++ b/modules/luci-mod-freifunk/po/no/freifunk.po
diff --git a/po/pl/freifunk.po b/modules/luci-mod-freifunk/po/pl/freifunk.po
index ac46e1fd2c..ac46e1fd2c 100644
--- a/po/pl/freifunk.po
+++ b/modules/luci-mod-freifunk/po/pl/freifunk.po
diff --git a/po/pt_BR/freifunk.po b/modules/luci-mod-freifunk/po/pt-br/freifunk.po
index a906a937b2..a906a937b2 100644
--- a/po/pt_BR/freifunk.po
+++ b/modules/luci-mod-freifunk/po/pt-br/freifunk.po
diff --git a/po/pt/freifunk.po b/modules/luci-mod-freifunk/po/pt/freifunk.po
index b5b822b880..b5b822b880 100644
--- a/po/pt/freifunk.po
+++ b/modules/luci-mod-freifunk/po/pt/freifunk.po
diff --git a/po/ro/freifunk.po b/modules/luci-mod-freifunk/po/ro/freifunk.po
index 408abd8de6..408abd8de6 100644
--- a/po/ro/freifunk.po
+++ b/modules/luci-mod-freifunk/po/ro/freifunk.po
diff --git a/po/ru/freifunk.po b/modules/luci-mod-freifunk/po/ru/freifunk.po
index 0943a3b485..0943a3b485 100644
--- a/po/ru/freifunk.po
+++ b/modules/luci-mod-freifunk/po/ru/freifunk.po
diff --git a/po/sk/freifunk.po b/modules/luci-mod-freifunk/po/sk/freifunk.po
index 343f02204b..343f02204b 100644
--- a/po/sk/freifunk.po
+++ b/modules/luci-mod-freifunk/po/sk/freifunk.po
diff --git a/po/sv/freifunk.po b/modules/luci-mod-freifunk/po/sv/freifunk.po
index cf42fa159b..cf42fa159b 100644
--- a/po/sv/freifunk.po
+++ b/modules/luci-mod-freifunk/po/sv/freifunk.po
diff --git a/po/tr/freifunk.po b/modules/luci-mod-freifunk/po/tr/freifunk.po
index f485e01b42..f485e01b42 100644
--- a/po/tr/freifunk.po
+++ b/modules/luci-mod-freifunk/po/tr/freifunk.po
diff --git a/po/uk/freifunk.po b/modules/luci-mod-freifunk/po/uk/freifunk.po
index 5abfa11cc7..5abfa11cc7 100644
--- a/po/uk/freifunk.po
+++ b/modules/luci-mod-freifunk/po/uk/freifunk.po
diff --git a/po/vi/freifunk.po b/modules/luci-mod-freifunk/po/vi/freifunk.po
index 8076d61b21..8076d61b21 100644
--- a/po/vi/freifunk.po
+++ b/modules/luci-mod-freifunk/po/vi/freifunk.po
diff --git a/po/zh_CN/freifunk.po b/modules/luci-mod-freifunk/po/zh-cn/freifunk.po
index 213058d2cc..213058d2cc 100644
--- a/po/zh_CN/freifunk.po
+++ b/modules/luci-mod-freifunk/po/zh-cn/freifunk.po
diff --git a/po/zh_TW/freifunk.po b/modules/luci-mod-freifunk/po/zh-tw/freifunk.po
index 51432e2e3b..51432e2e3b 100644
--- a/po/zh_TW/freifunk.po
+++ b/modules/luci-mod-freifunk/po/zh-tw/freifunk.po
diff --git a/modules/luci-mod-rpc/Makefile b/modules/luci-mod-rpc/Makefile
new file mode 100644
index 0000000000..e64c86c628
--- /dev/null
+++ b/modules/luci-mod-rpc/Makefile
@@ -0,0 +1,15 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=LuCI RPC - JSON-RPC API
+LUCI_DEPENDS:=+luci-lib-json
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
+
diff --git a/modules/rpc/luasrc/controller/rpc.lua b/modules/luci-mod-rpc/luasrc/controller/rpc.lua
index 359184c744..359184c744 100644
--- a/modules/rpc/luasrc/controller/rpc.lua
+++ b/modules/luci-mod-rpc/luasrc/controller/rpc.lua
diff --git a/modules/rpc/luasrc/jsonrpc.lua b/modules/luci-mod-rpc/luasrc/jsonrpc.lua
index 71c95d549b..71c95d549b 100644
--- a/modules/rpc/luasrc/jsonrpc.lua
+++ b/modules/luci-mod-rpc/luasrc/jsonrpc.lua
diff --git a/modules/rpc/luasrc/jsonrpcbind/uci.lua b/modules/luci-mod-rpc/luasrc/jsonrpcbind/uci.lua
index 195398674f..195398674f 100644
--- a/modules/rpc/luasrc/jsonrpcbind/uci.lua
+++ b/modules/luci-mod-rpc/luasrc/jsonrpcbind/uci.lua
diff --git a/modules/rpc/Makefile b/modules/rpc/Makefile
deleted file mode 100644
index 81a96f6a83..0000000000
--- a/modules/rpc/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-include ../../build/config.mk
-include ../../build/module.mk
\ No newline at end of file
diff --git a/po/ca/ffwizard.po b/po/ca/ffwizard.po
deleted file mode 100644
index c0dfa53904..0000000000
--- a/po/ca/ffwizard.po
+++ /dev/null
@@ -1,162 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2014-06-02 05:50+0200\n"
-"Last-Translator: Alex <alexhenrie24@gmail.com>\n"
-"Language-Team: none\n"
-"Language: ca\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.6\n"
-
-msgid "Allow to transfer anonymous statistics about this node"
-msgstr ""
-
-msgid "Channel"
-msgstr "Canal"
-
-msgid "Check this to protect your LAN from other nodes or clients"
-msgstr ""
-
-msgid "Configure network"
-msgstr ""
-
-msgid "Connect your node with other nodes with a tunnel via the internet."
-msgstr ""
-
-msgid "DHCP IP range"
-msgstr ""
-
-msgid "DHCP will automatically assign ip addresses to clients"
-msgstr ""
-
-msgid "DNS Server"
-msgstr ""
-
-msgid "Enable DHCP"
-msgstr ""
-
-msgid "Gateway"
-msgstr "Passarel·la"
-
-msgid "Heartbeat"
-msgstr "Batec del cor"
-
-msgid "IP address"
-msgstr "Adreça IP"
-
-msgid "L2gvpn tunnel"
-msgstr "Túnel L2gvpn"
-
-msgid "Limit download bandwidth"
-msgstr ""
-
-msgid "Limit upload bandwidth"
-msgstr ""
-
-msgid "Mesh IP address"
-msgstr ""
-
-msgid "Mesh IPv6 Address"
-msgstr ""
-
-msgid "Netmask"
-msgstr "Màscara de xarxa"
-
-msgid "Password"
-msgstr "Contrasenya"
-
-msgid "Password confirmation"
-msgstr "Confirmació de contrasenya"
-
-msgid "Password successfully changed"
-msgstr "Contrasenya canviada amb èxit"
-
-msgid "Protect LAN"
-msgstr "Protegeix la LAN"
-
-msgid "Protocol"
-msgstr "Protocol"
-
-msgid "Select this checkbox to configure your network interfaces."
-msgstr ""
-
-msgid ""
-"Select this to allow others to use your connection to access the internet."
-msgstr ""
-
-msgid "Share your internet connection"
-msgstr "Compartiu la vostra connexió a Internet"
-
-msgid ""
-"The IP range from which clients are assigned ip addresses (e.g. "
-"10.1.2.1/28). If this is a range inside your mesh network range, then it "
-"will be announced as HNA. Any other range will use NAT. If left empty then "
-"the defaults from the community profile will be used."
-msgstr ""
-
-msgid "The ipv6 address is calculated auomatically."
-msgstr "L'adreça ipv6 es calcula automàticament."
-
-msgid "The protocol to use for internet connectivity."
-msgstr ""
-
-msgid ""
-"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
-"registered at your local community."
-msgstr ""
-
-msgid "This will setup a new virtual wireless interface in Access Point mode."
-msgstr ""
-
-msgid ""
-"This wizard will assist you in setting up your router for Freifunk or "
-"another similar wireless community network."
-msgstr ""
-
-msgid "Unknown Error"
-msgstr "Error desconegut"
-
-msgid "Username"
-msgstr "Nom d'usuari"
-
-msgid "Virtual Access Point (VAP)"
-msgstr "Virtual Access Point (VAP)"
-
-msgid "Wizard"
-msgstr ""
-
-msgid "Your device and neighbouring nodes have to use the same channel."
-msgstr ""
-
-msgid "dhcp"
-msgstr "dhcp"
-
-msgid "kbit/s"
-msgstr "kbit/s"
-
-msgid "static"
-msgstr "estàtic"
-
-msgid "Configure this interface."
-msgstr ""
-
-msgid "recommended"
-msgstr "recomanat"
-
-msgid "Basic settings"
-msgstr "Ajusts bàsics"
-
-msgid "Basic settings are incomplete. Please go to"
-msgstr "Els ajusts bàsics estan incomplets. Si us plau, aneu a"
-
-msgid "Error"
-msgstr "Error"
-
-msgid "You can not use the wizard because some necessary values are missing."
-msgstr ""
-
-msgid "and fill out all required fields."
-msgstr ""
diff --git a/po/ca/uvc_streamer.po b/po/ca/uvc_streamer.po
deleted file mode 100644
index 8ae7b14681..0000000000
--- a/po/ca/uvc_streamer.po
+++ /dev/null
@@ -1,43 +0,0 @@
-#  uvc_streamer.pot
-#  generated from ./applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2014-07-01 03:54+0200\n"
-"Last-Translator: Alex <alexhenrie24@gmail.com>\n"
-"Language-Team: none\n"
-"Language: ca\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.6\n"
-
-#. Frames per second
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:1
-msgid "Frames per second"
-msgstr "Trames al segon"
-
-#. Resolution
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:2
-msgid "Resolution"
-msgstr "Resolució"
-
-#. Settings
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:3
-msgid "Settings"
-msgstr "Ajusts"
-
-#. Webcam streaming
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:4
-msgid "Webcam streaming"
-msgstr "Transmissió de càmera web"
-
-#. Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a href=\"http://%s:%i/\">http://%s:%i/</a>
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:5
-msgid ""
-"Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a "
-"href=\"http://%s:%i/\">http://%s:%i/</a>"
-msgstr ""
-"Configureu la teva càmera compatible amb Linux-UVC. Dirigiu el vostre "
-"navegador a, per exemple, <a href=\"http://%s:%i/\">http://%s:%i/</a>"
diff --git a/po/cs/ffwizard.po b/po/cs/ffwizard.po
deleted file mode 100644
index 4c0071eeca..0000000000
--- a/po/cs/ffwizard.po
+++ /dev/null
@@ -1,166 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2014-08-08 21:15+0200\n"
-"Last-Translator: koli <lukas.koluch@gmail.com>\n"
-"Language-Team: none\n"
-"Language: cs\n"
-"MIME-Version: 1.0\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: Pootle 2.0.6\n"
-
-msgid "Allow to transfer anonymous statistics about this node"
-msgstr "Povolit přenášení anonymních statistik o tomto uzlu."
-
-msgid "Channel"
-msgstr "Kanál"
-
-msgid "Check this to protect your LAN from other nodes or clients"
-msgstr ""
-
-msgid "Configure network"
-msgstr "Nastavit síť"
-
-msgid "Connect your node with other nodes with a tunnel via the internet."
-msgstr "Propojit váš uzel s jinými pomocí tunelu skrz internet."
-
-msgid "DHCP IP range"
-msgstr "Rozsah IP adres DHCP"
-
-msgid "DHCP will automatically assign ip addresses to clients"
-msgstr "DHCP bude klientům automaticky přidělovat IP adresy"
-
-msgid "DNS Server"
-msgstr "DNS server"
-
-msgid "Enable DHCP"
-msgstr "Povolit DHCP"
-
-msgid "Gateway"
-msgstr "Brána"
-
-msgid "Heartbeat"
-msgstr ""
-
-msgid "IP address"
-msgstr "IP adresa"
-
-msgid "L2gvpn tunnel"
-msgstr "L2gvpn tunel"
-
-msgid "Limit download bandwidth"
-msgstr "Omezit šířku pásma pro stahování"
-
-msgid "Limit upload bandwidth"
-msgstr "Omezit šířku pásma pro nahrávání"
-
-msgid "Mesh IP address"
-msgstr ""
-
-msgid "Mesh IPv6 Address"
-msgstr ""
-
-msgid "Netmask"
-msgstr "Netmask"
-
-msgid "Password"
-msgstr "Heslo"
-
-msgid "Password confirmation"
-msgstr "Potvrdit heslo"
-
-msgid "Password successfully changed"
-msgstr "Heslo bylo úspěšně změněno"
-
-msgid "Protect LAN"
-msgstr "Ochránit LAN"
-
-msgid "Protocol"
-msgstr "Protokol"
-
-msgid "Select this checkbox to configure your network interfaces."
-msgstr "Zaškrtněte toto pole, pokud chcete nastavit vaše síťová rozhraní"
-
-msgid ""
-"Select this to allow others to use your connection to access the internet."
-msgstr ""
-"Zaškrtnutím povolíte ostatním využití vašeho rozhraní pro přístup k "
-"internetu."
-
-msgid "Share your internet connection"
-msgstr "Sdílet připojení k internetu"
-
-msgid ""
-"The IP range from which clients are assigned ip addresses (e.g. "
-"10.1.2.1/28). If this is a range inside your mesh network range, then it "
-"will be announced as HNA. Any other range will use NAT. If left empty then "
-"the defaults from the community profile will be used."
-msgstr ""
-
-msgid "The ipv6 address is calculated auomatically."
-msgstr "IPv6 adresy jsou počítány automaticky."
-
-msgid "The protocol to use for internet connectivity."
-msgstr "Protokol, který slouží k připojení k Internetu."
-
-msgid ""
-"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
-"registered at your local community."
-msgstr ""
-
-msgid "This will setup a new virtual wireless interface in Access Point mode."
-msgstr "Nastaví nové virtuální bezdrátové rozhraní v režimu Access Pointu"
-
-msgid ""
-"This wizard will assist you in setting up your router for Freifunk or "
-"another similar wireless community network."
-msgstr ""
-"Tento průvodce vám pomůže s nastavením vašeho routeru pro Freifunk nebo "
-"podobnou komunitní bezdrátovou síť."
-
-msgid "Unknown Error"
-msgstr "Neznámá chyba"
-
-msgid "Username"
-msgstr "Uživatelské jméno"
-
-msgid "Virtual Access Point (VAP)"
-msgstr "Virtuální přístupový bod (Virtual Access Point, VAP)"
-
-msgid "Wizard"
-msgstr "Průvodce"
-
-msgid "Your device and neighbouring nodes have to use the same channel."
-msgstr ""
-
-msgid "dhcp"
-msgstr "DHCP"
-
-msgid "kbit/s"
-msgstr "kbit/s"
-
-msgid "static"
-msgstr ""
-
-msgid "Configure this interface."
-msgstr "Nastavit toto rozhraní."
-
-msgid "recommended"
-msgstr "doporučené"
-
-msgid "Basic settings"
-msgstr "Základní nastavení"
-
-msgid "Basic settings are incomplete. Please go to"
-msgstr "Základní nastavení není kompletní. Prosím pokračujte"
-
-msgid "Error"
-msgstr "Chyba"
-
-msgid "You can not use the wizard because some necessary values are missing."
-msgstr "Nemůžete použít průvodce, protože chybí některé nezbytné hodnoty."
-
-msgid "and fill out all required fields."
-msgstr "a vyplňte všechna požadovaná pole."
diff --git a/po/cs/uvc_streamer.po b/po/cs/uvc_streamer.po
deleted file mode 100644
index 2a53342d97..0000000000
--- a/po/cs/uvc_streamer.po
+++ /dev/null
@@ -1,44 +0,0 @@
-#  uvc_streamer.pot
-#  generated from ./applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2012-04-24 14:51+0200\n"
-"Last-Translator: awm1 <awm1klimes8vladimir@gmail.com>\n"
-"Language-Team: none\n"
-"Language: cs\n"
-"MIME-Version: 1.0\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: Pootle 2.0.4\n"
-
-#. Frames per second
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:1
-msgid "Frames per second"
-msgstr "Počet snímků za sekundu"
-
-#. Resolution
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:2
-msgid "Resolution"
-msgstr "Rozlišení"
-
-#. Settings
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:3
-msgid "Settings"
-msgstr "Nastavení"
-
-#. Webcam streaming
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:4
-msgid "Webcam streaming"
-msgstr "Stream z webkamery"
-
-#. Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a href=\"http://%s:%i/\">http://%s:%i/</a>
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:5
-msgid ""
-"Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a "
-"href=\"http://%s:%i/\">http://%s:%i/</a>"
-msgstr ""
-"Toto menu umožňuje konfiguraci připojených webkamer kompatibilních s UVC. "
-"Videostream je dostupný přes webový prohlížeč na síťové adrese routeru, "
-"např. <a href=\"http://%s:%i/\">http://%s:%i/</a>"
diff --git a/po/de/ffwizard.po b/po/de/ffwizard.po
deleted file mode 100644
index a4827b6a88..0000000000
--- a/po/de/ffwizard.po
+++ /dev/null
@@ -1,180 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: ffwizard\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: 2011-06-11 01:47+0200\n"
-"Last-Translator: Jo-Philipp <xm@subsignal.org>\n"
-"Language-Team: \n"
-"Language: de\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.4\n"
-"X-Poedit-Language: German\n"
-"X-Poedit-Country: GERMANY\n"
-
-msgid "Allow to transfer anonymous statistics about this node"
-msgstr "Diesem Node erlauben anonyme Nutzungsstatistiken zu übertragen"
-
-msgid "Channel"
-msgstr "Kanal"
-
-msgid "Check this to protect your LAN from other nodes or clients"
-msgstr "Rechner im eigenen LAN vor Zugriffen aus dem Freifunknetzwerk schützen"
-
-msgid "Configure network"
-msgstr "Netzwerk konfigurieren"
-
-msgid "Connect your node with other nodes with a tunnel via the internet."
-msgstr "Dieses Node mit anderen Nodes über einen Internettunnel verbinden."
-
-msgid "DHCP IP range"
-msgstr "DHCP IP-Bereich"
-
-msgid "DHCP will automatically assign ip addresses to clients"
-msgstr "DHCP weist verbundenen Benutzern ohne OLSR automatisch IP-Adressen zu"
-
-msgid "DNS Server"
-msgstr "DNS Server"
-
-msgid "Enable DHCP"
-msgstr "DHCP aktivieren"
-
-msgid "Gateway"
-msgstr "Gateway"
-
-msgid "Heartbeat"
-msgstr "Heartbeat"
-
-msgid "IP address"
-msgstr "IP-Adresse"
-
-msgid "L2gvpn tunnel"
-msgstr "L2gvpn Tunnel"
-
-msgid "Limit download bandwidth"
-msgstr "Downloadbandbreite limitieren"
-
-msgid "Limit upload bandwidth"
-msgstr "Uploadbandbreite limitieren"
-
-msgid "Mesh IP address"
-msgstr "Mesh IP-Adresse"
-
-msgid "Mesh IPv6 Address"
-msgstr "Mesh IPv6-Adresse"
-
-msgid "Netmask"
-msgstr "Netzmaske"
-
-msgid "Password"
-msgstr "Passwort"
-
-msgid "Password confirmation"
-msgstr "Passwort bestätigen"
-
-msgid "Password successfully changed"
-msgstr "Passwort erfolgreich geändert"
-
-msgid "Protect LAN"
-msgstr "LAN-Netzwerk schützen"
-
-msgid "Protocol"
-msgstr "Protokoll"
-
-msgid "Select this checkbox to configure your network interfaces."
-msgstr "Diese Checkbox aktivieren um Schnittstellen zu konfigurieren."
-
-msgid ""
-"Select this to allow others to use your connection to access the internet."
-msgstr "Anderen erlauben die eigene Internetverbindung mitzubenutzen."
-
-msgid "Share your internet connection"
-msgstr "Internet freigeben"
-
-msgid ""
-"The IP range from which clients are assigned ip addresses (e.g. "
-"10.1.2.1/28). If this is a range inside your mesh network range, then it "
-"will be announced as HNA. Any other range will use NAT. If left empty then "
-"the defaults from the community profile will be used."
-msgstr ""
-"Der IP-Bereich aus dem Clients IPs zugewiesen bekommen (z.B. 10.1.2.1/28). "
-"Liegt dieser Bereich innerhalb des Mesh-Netzwerks, dann werden diese Clients "
-"als HNA von OLSRd angekündigt, ansonsten wird NAT verwendet. Wird dieses "
-"Feld leer gelassen dann wird der Wert aus dem Community-Profil verwendet."
-
-msgid "The ipv6 address is calculated auomatically."
-msgstr "Die IPv6-Adresse wird automatisch generiert."
-
-msgid "The protocol to use for internet connectivity."
-msgstr "Protokoll für den Internetzugang."
-
-msgid ""
-"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
-"registered at your local community."
-msgstr ""
-"Hier muss eine netzweit eindeutige IP-Adresse verwendet werden, z.B. "
-"10.1.1.1. Diese muss von der lokalen Community zugewiesen sein oder dort "
-"registriert werden."
-
-msgid "This will setup a new virtual wireless interface in Access Point mode."
-msgstr ""
-"Diese Option richtet ein zusätzliches WLAN-Netzwerk als Access Point für "
-"Clients ein."
-
-msgid ""
-"This wizard will assist you in setting up your router for Freifunk or "
-"another similar wireless community network."
-msgstr ""
-"Dieser Assistent hilft beim Einrichten des Routers für Freifunk oder "
-"ähnliche Wireless Community Netzwerke."
-
-msgid "Unknown Error"
-msgstr "Unbekannter Fehler"
-
-msgid "Username"
-msgstr "Benutzername"
-
-msgid "Virtual Access Point (VAP)"
-msgstr "Virtueller Access Point (VAP)"
-
-msgid "Wizard"
-msgstr "Freifunkassistent"
-
-msgid "Your device and neighbouring nodes have to use the same channel."
-msgstr ""
-"Hier sollte der selbe Kanal wie auf benachbarten Nodes verwendet werden."
-
-msgid "dhcp"
-msgstr "DHCP"
-
-msgid "kbit/s"
-msgstr "KBit/s"
-
-msgid "static"
-msgstr "Statisch"
-
-msgid "Configure this interface."
-msgstr "Dieses Netzwerkinterface einrichten."
-
-msgid "recommended"
-msgstr "empfohlen"
-
-msgid "Basic settings"
-msgstr "Grundeinstellungen"
-
-msgid "Basic settings are incomplete. Please go to"
-msgstr ""
-"Ein oder mehrere wichtige Grundeinstellungen fehlen. Bitte besuche die Seite"
-
-msgid "Error"
-msgstr "Fehler"
-
-msgid "You can not use the wizard because some necessary values are missing."
-msgstr ""
-"Der ffwizard kann nicht benutzt werden da einige wichtige Grundeinstellungen "
-"fehlen."
-
-msgid "and fill out all required fields."
-msgstr "und fülle alle dort benötigten Felder aus."
diff --git a/po/de/uvc_streamer.po b/po/de/uvc_streamer.po
deleted file mode 100644
index 0dd8a6560d..0000000000
--- a/po/de/uvc_streamer.po
+++ /dev/null
@@ -1,43 +0,0 @@
-#  uvc_streamer.pot
-#  generated from ./applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2012-01-26 12:12+0200\n"
-"Last-Translator: Manuel <freifunk@somakoma.de>\n"
-"Language-Team: none\n"
-"Language: de\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.4\n"
-
-#. Frames per second
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:1
-msgid "Frames per second"
-msgstr "Frames pro Sekunde"
-
-#. Resolution
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:2
-msgid "Resolution"
-msgstr "Auflösung"
-
-#. Settings
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:3
-msgid "Settings"
-msgstr "Einstellungen"
-
-#. Webcam streaming
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:4
-msgid "Webcam streaming"
-msgstr "Webcam Streaming"
-
-#. Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a href=\"http://%s:%i/\">http://%s:%i/</a>
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:5
-msgid ""
-"Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a "
-"href=\"http://%s:%i/\">http://%s:%i/</a>"
-msgstr ""
-"Richten sie ihre Linux-UVC kompatible Webcam ein. Rufen sie mit ihrem "
-"Browser z.B. <a href=\"http://%s:%i/\">http://%s:%i/</a> auf"
diff --git a/po/el/ffwizard.po b/po/el/ffwizard.po
deleted file mode 100644
index fd0e0c423d..0000000000
--- a/po/el/ffwizard.po
+++ /dev/null
@@ -1,181 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2012-03-31 15:37+0200\n"
-"Last-Translator: Vasilis <acinonyx@openwrt.gr>\n"
-"Language-Team: none\n"
-"Language: el\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.4\n"
-
-msgid "Allow to transfer anonymous statistics about this node"
-msgstr "Να επιτρέπεται η μεταφορά ανώνυμων στατιστικών αυτού του κόμβου"
-
-msgid "Channel"
-msgstr "Κανάλι"
-
-msgid "Check this to protect your LAN from other nodes or clients"
-msgstr "Επιλέξτε για να προστατέψετε το LAN σας από άλλους κόμβους ή πελάτες"
-
-msgid "Configure network"
-msgstr "Παραμετροποίηση δικτύου"
-
-msgid "Connect your node with other nodes with a tunnel via the internet."
-msgstr ""
-"Συνδέστε τον κόμβο σας με άλλους κόμβους χρησιμοποιώντας τούνελ μέσω του "
-"διαδικτύου."
-
-msgid "DHCP IP range"
-msgstr "Εύρος DHCP IP"
-
-msgid "DHCP will automatically assign ip addresses to clients"
-msgstr "Το DHCP θα αποδώσει αυτόματα διευθύνσεις ip στους πελάτες"
-
-msgid "DNS Server"
-msgstr "Εξυπηρετητής DNS"
-
-msgid "Enable DHCP"
-msgstr "Ενεργοποίηση DHCP"
-
-msgid "Gateway"
-msgstr "Πύλη"
-
-msgid "Heartbeat"
-msgstr "Καρδιακός Παλμός"
-
-msgid "IP address"
-msgstr "Διεύθυνση IP"
-
-msgid "L2gvpn tunnel"
-msgstr "Τούνελ L2gvpn"
-
-msgid "Limit download bandwidth"
-msgstr "Περιορισμός ταχύτητας κατεβάσματος"
-
-msgid "Limit upload bandwidth"
-msgstr "Περιορισμός ταχύτητας ανεβάσματος"
-
-msgid "Mesh IP address"
-msgstr "IP διεύθυνση πλέγματος"
-
-msgid "Mesh IPv6 Address"
-msgstr "IPv6 Διεύθυνση Δικτύου Πλέγματος"
-
-msgid "Netmask"
-msgstr "Μάσκα δικτύου"
-
-msgid "Password"
-msgstr "Κωδικός πρόσβασης"
-
-msgid "Password confirmation"
-msgstr "Επιβεβαίωση κωδικού πρόσβασης"
-
-msgid "Password successfully changed"
-msgstr "Ο κωδικός πρόσβασης άλλαξε επιτυχώς"
-
-msgid "Protect LAN"
-msgstr "Προστασία LAN"
-
-msgid "Protocol"
-msgstr "Πρωτόκολλο"
-
-msgid "Select this checkbox to configure your network interfaces."
-msgstr "Επιλέξτε για να παραμετροποιήσετε τις διεπαφές δικτύου."
-
-msgid ""
-"Select this to allow others to use your connection to access the internet."
-msgstr ""
-"Επιλέξτε για να επιτρέπεται σε άλλους να χρησιμοποιήσουν την σύνδεσή σας για "
-"πρόσβαση στο διαδίκτυο."
-
-msgid "Share your internet connection"
-msgstr "Διαμοιρασμός σύνδεσης διαδικτύου"
-
-msgid ""
-"The IP range from which clients are assigned ip addresses (e.g. "
-"10.1.2.1/28). If this is a range inside your mesh network range, then it "
-"will be announced as HNA. Any other range will use NAT. If left empty then "
-"the defaults from the community profile will be used."
-msgstr ""
-"Το εύρος IP από το οποίο θα αποδίδονται στους πελάτες διευθύνσεις ip (π.χ. "
-"10.1.2.1/28). Εάν αυτό είναι εύρος εντός του δικτύου πλέγματος, τότε θα "
-"ανακοινώνεται ως HNA. Οποιοδήποτε άλλο εύρος θα χρησιμοποιεί το NAT. Εάν "
-"αφεθεί κενό τότε θα χρησιμοποιηθούν οι ρυθμίσεις από το προφίλ κοινότητας."
-
-msgid "The ipv6 address is calculated auomatically."
-msgstr "Η διεύθυνση ipv6 υπολογίζεται αυτόματα."
-
-msgid "The protocol to use for internet connectivity."
-msgstr ""
-"Το πρωτόκολλο που θα χρησιμοποιήσετε για την διαδικτυακή συνδεσιμότητα. "
-
-msgid ""
-"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
-"registered at your local community."
-msgstr ""
-"Αυτή είναι μία μοναδική διεύθυνση στο πλέγμα (π.χ 10.1.1.1) και πρέπει να "
-"καταχωρηθεί στην τοπική σας κοινότητα."
-
-msgid "This will setup a new virtual wireless interface in Access Point mode."
-msgstr ""
-"Αυτή η επιλογή θα ρυθμίσει μία νέα εικονική ασύρματη διεπαφή σε λειτουργία "
-"Σημείου Πρόσβασης. "
-
-msgid ""
-"This wizard will assist you in setting up your router for Freifunk or "
-"another similar wireless community network."
-msgstr ""
-"Αυτός ο οδηγός θα σας βοηθήσει να στήσετε το δρομολογητής σας για το "
-"Freifunk  ή άλλο παρόμοιο δίκτυο."
-
-msgid "Unknown Error"
-msgstr "Άγνωστο Σφάλμα"
-
-msgid "Username"
-msgstr "Όνομα χρήστη"
-
-msgid "Virtual Access Point (VAP)"
-msgstr "Εικονικό Σημείο Πρόσβασης (VAP)"
-
-msgid "Wizard"
-msgstr "Οδηγός"
-
-msgid "Your device and neighbouring nodes have to use the same channel."
-msgstr ""
-"Η συσκευή σας και οι γειτονικοί σας κόμβοι πρέπει να χρησιμοποιούν το ίδιο "
-"κανάλι."
-
-msgid "dhcp"
-msgstr "dhcp"
-
-msgid "kbit/s"
-msgstr "kbit/s"
-
-msgid "static"
-msgstr "στατικό"
-
-msgid "Configure this interface."
-msgstr "Παραμετροποίηση αυτής της διεπαφής."
-
-msgid "recommended"
-msgstr "προτεινόμενο"
-
-msgid "Basic settings"
-msgstr "Βασικές ρυθμίσεις"
-
-msgid "Basic settings are incomplete. Please go to"
-msgstr "Οι βασικές ρυθμίσεις είναι ημιτελείς. Παρακαλώ προχωρήστε στο"
-
-msgid "Error"
-msgstr "Σφάλμα"
-
-msgid "You can not use the wizard because some necessary values are missing."
-msgstr ""
-"Δεν μπορείτε να χρησιμοποιήσετε τον οδηγό γιατί κάποιες απαραίτητες τιμές "
-"δεν έχουν συμπληρωθεί."
-
-msgid "and fill out all required fields."
-msgstr "και συμπληρώστε όλα τα απαραίτητα πεδία."
diff --git a/po/el/uvc_streamer.po b/po/el/uvc_streamer.po
deleted file mode 100644
index f3601731b0..0000000000
--- a/po/el/uvc_streamer.po
+++ /dev/null
@@ -1,41 +0,0 @@
-#  uvc_streamer.pot
-#  generated from ./applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2012-03-12 13:02+0200\n"
-"Last-Translator: elkos <elkosmas@gmail.com>\n"
-"Language-Team: none\n"
-"Language: el\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.4\n"
-
-#. Frames per second
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:1
-msgid "Frames per second"
-msgstr ""
-
-#. Resolution
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:2
-msgid "Resolution"
-msgstr "Ανάλυση"
-
-#. Settings
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:3
-msgid "Settings"
-msgstr "Ρυθμίσεις"
-
-#. Webcam streaming
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:4
-msgid "Webcam streaming"
-msgstr ""
-
-#. Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a href=\"http://%s:%i/\">http://%s:%i/</a>
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:5
-msgid ""
-"Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a "
-"href=\"http://%s:%i/\">http://%s:%i/</a>"
-msgstr ""
diff --git a/po/en/ffwizard.po b/po/en/ffwizard.po
deleted file mode 100644
index ac523a42e5..0000000000
--- a/po/en/ffwizard.po
+++ /dev/null
@@ -1,171 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2012-03-15 17:26+0200\n"
-"Last-Translator: Anonymous Pootle User\n"
-"Language-Team: none\n"
-"Language: en\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.4\n"
-
-msgid "Allow to transfer anonymous statistics about this node"
-msgstr "Allow to transfer anonymous statistics about this node"
-
-msgid "Channel"
-msgstr "Channel"
-
-msgid "Check this to protect your LAN from other nodes or clients"
-msgstr "Check this to protect your LAN from other nodes or clients"
-
-msgid "Configure network"
-msgstr "Configure network"
-
-msgid "Connect your node with other nodes with a tunnel via the internet."
-msgstr "Connect your node with other nodes with a tunnel via the internet."
-
-msgid "DHCP IP range"
-msgstr "DHCP IP range"
-
-msgid "DHCP will automatically assign ip addresses to clients"
-msgstr "DHCP will automatically assign ip addresses to clients"
-
-msgid "DNS Server"
-msgstr "DNS Server"
-
-msgid "Enable DHCP"
-msgstr "Enable DHCP"
-
-msgid "Gateway"
-msgstr "Gateway"
-
-msgid "Heartbeat"
-msgstr "Heartbeat"
-
-msgid "IP address"
-msgstr "IP address"
-
-msgid "L2gvpn tunnel"
-msgstr "L2gvpn tunnel"
-
-msgid "Limit download bandwidth"
-msgstr "Limit download bandwidth"
-
-msgid "Limit upload bandwidth"
-msgstr "Limit upload bandwidth"
-
-msgid "Mesh IP address"
-msgstr "Mesh IP address"
-
-msgid "Mesh IPv6 Address"
-msgstr "Mesh IPv6 Address"
-
-msgid "Netmask"
-msgstr "Netmask"
-
-msgid "Password"
-msgstr "Password"
-
-msgid "Password confirmation"
-msgstr "Password confirmation"
-
-msgid "Password successfully changed"
-msgstr "Password successfully changed"
-
-msgid "Protect LAN"
-msgstr "Protect LAN"
-
-msgid "Protocol"
-msgstr "Protocol"
-
-msgid "Select this checkbox to configure your network interfaces."
-msgstr "Select this checkbox to configure your network interfaces."
-
-msgid ""
-"Select this to allow others to use your connection to access the internet."
-msgstr ""
-"Select this to allow others to use your connection to access the internet."
-
-msgid "Share your internet connection"
-msgstr "Share your internet connection"
-
-msgid ""
-"The IP range from which clients are assigned ip addresses (e.g. "
-"10.1.2.1/28). If this is a range inside your mesh network range, then it "
-"will be announced as HNA. Any other range will use NAT. If left empty then "
-"the defaults from the community profile will be used."
-msgstr ""
-"The IP range from which clients are assigned ip addresses (e.g. "
-"10.1.2.1/28). If this is a range inside your mesh network range, then it "
-"will be announced as HNA. Any other range will use NAT. If left empty then "
-"the defaults from the community profile will be used."
-
-msgid "The ipv6 address is calculated auomatically."
-msgstr "The ipv6 address is calculated automatically."
-
-msgid "The protocol to use for internet connectivity."
-msgstr "The protocol to use for internet connectivity."
-
-msgid ""
-"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
-"registered at your local community."
-msgstr ""
-"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
-"registered at your local community."
-
-msgid "This will setup a new virtual wireless interface in Access Point mode."
-msgstr "This will setup a new virtual wireless interface in Access Point mode."
-
-msgid ""
-"This wizard will assist you in setting up your router for Freifunk or "
-"another similar wireless community network."
-msgstr ""
-"This wizard will assist you in setting up your router for Freifunk or "
-"another similar wireless community network."
-
-msgid "Unknown Error"
-msgstr "Unknown Error"
-
-msgid "Username"
-msgstr "Username"
-
-msgid "Virtual Access Point (VAP)"
-msgstr "Virtual Access Point (VAP)"
-
-msgid "Wizard"
-msgstr "Wizard"
-
-msgid "Your device and neighbouring nodes have to use the same channel."
-msgstr "Your device and neighbouring nodes have to use the same channel."
-
-msgid "dhcp"
-msgstr "dhcp"
-
-msgid "kbit/s"
-msgstr "kbit/s"
-
-msgid "static"
-msgstr "static"
-
-msgid "Configure this interface."
-msgstr "Configure this interface."
-
-msgid "recommended"
-msgstr "recommended"
-
-msgid "Basic settings"
-msgstr "Basic settings"
-
-msgid "Basic settings are incomplete. Please go to"
-msgstr "Basic settings are incomplete. Please go to"
-
-msgid "Error"
-msgstr "Error"
-
-msgid "You can not use the wizard because some necessary values are missing."
-msgstr "You can not use the wizard because some necessary values are missing."
-
-msgid "and fill out all required fields."
-msgstr "and fill out all required fields."
diff --git a/po/en/uvc_streamer.po b/po/en/uvc_streamer.po
deleted file mode 100644
index 1d9825a7b6..0000000000
--- a/po/en/uvc_streamer.po
+++ /dev/null
@@ -1,40 +0,0 @@
-#  uvc_streamer.pot
-#  generated from ./applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#. Frames per second
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:1
-msgid "Frames per second"
-msgstr "Frames per second"
-
-#. Resolution
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:2
-msgid "Resolution"
-msgstr "Resolution"
-
-#. Settings
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:3
-msgid "Settings"
-msgstr "Settings"
-
-#. Webcam streaming
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:4
-msgid "Webcam streaming"
-msgstr "Webcam streaming"
-
-#. Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a href=\"http://%s:%i/\">http://%s:%i/</a>
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:5
-msgid ""
-"Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a "
-"href=\"http://%s:%i/\">http://%s:%i/</a>"
-msgstr ""
-"Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a "
-"href=\"http://%s:%i/\">http://%s:%i/</a>"
diff --git a/po/es/ffwizard.po b/po/es/ffwizard.po
deleted file mode 100644
index 5d86dfc235..0000000000
--- a/po/es/ffwizard.po
+++ /dev/null
@@ -1,172 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2012-09-15 21:47+0200\n"
-"Last-Translator: José Vicente <josevteg@gmail.com>\n"
-"Language-Team: none\n"
-"Language: es\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.6\n"
-
-msgid "Allow to transfer anonymous statistics about this node"
-msgstr ""
-"Permitir la transferencia de información estadística anónima sobre este nodo"
-
-msgid "Channel"
-msgstr "Canal"
-
-msgid "Check this to protect your LAN from other nodes or clients"
-msgstr "Proteger su LAN de otros nodos o clientes"
-
-msgid "Configure network"
-msgstr "Configurar red"
-
-msgid "Connect your node with other nodes with a tunnel via the internet."
-msgstr "Conecte su nodo con otros vía un túnel por internet."
-
-msgid "DHCP IP range"
-msgstr "Rango de IPs de DHCP"
-
-msgid "DHCP will automatically assign ip addresses to clients"
-msgstr "DHCP asignará automáticamente direcciones IP a los clientes"
-
-msgid "DNS Server"
-msgstr "Servidor DNS"
-
-msgid "Enable DHCP"
-msgstr "Habilitar DHCP"
-
-msgid "Gateway"
-msgstr "Pasarela"
-
-msgid "Heartbeat"
-msgstr "Pulso"
-
-msgid "IP address"
-msgstr "Dirección IP"
-
-msgid "L2gvpn tunnel"
-msgstr "Túnel L2gvpn"
-
-msgid "Limit download bandwidth"
-msgstr "Límite de velocidad de descarga"
-
-msgid "Limit upload bandwidth"
-msgstr "Límite de velocidad de subida"
-
-msgid "Mesh IP address"
-msgstr "Dirección IP del mesh"
-
-msgid "Mesh IPv6 Address"
-msgstr "Dirección IPv6 del mesh"
-
-msgid "Netmask"
-msgstr "Máscara de red"
-
-msgid "Password"
-msgstr "Contraseña"
-
-msgid "Password confirmation"
-msgstr "Confirmación de contraseña"
-
-msgid "Password successfully changed"
-msgstr "Contraseña cambiada"
-
-msgid "Protect LAN"
-msgstr "Protege la LAN"
-
-msgid "Protocol"
-msgstr "Protocolo"
-
-msgid "Select this checkbox to configure your network interfaces."
-msgstr "Configurar sus interfaces de red."
-
-msgid ""
-"Select this to allow others to use your connection to access the internet."
-msgstr "Permitir a otros usar su conexión para acceder a internet."
-
-msgid "Share your internet connection"
-msgstr "Comparta su dirección de internet"
-
-msgid ""
-"The IP range from which clients are assigned ip addresses (e.g. "
-"10.1.2.1/28). If this is a range inside your mesh network range, then it "
-"will be announced as HNA. Any other range will use NAT. If left empty then "
-"the defaults from the community profile will be used."
-msgstr ""
-"Rango IP de direcciones que se reparten a los clientes (ej. 10.1.2.1/28). Si "
-"el rango está dentro de su red mesh, se declarará como HNA. Cualquier otro "
-"rango usará NAT. Si se deja vacío se usarán los valores por defectos del "
-"perfil comunitario."
-
-msgid "The ipv6 address is calculated auomatically."
-msgstr "La dirección IPv6 se calcula automáticamente."
-
-msgid "The protocol to use for internet connectivity."
-msgstr "Protocolo usado para lo conectividad a internet."
-
-msgid ""
-"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
-"registered at your local community."
-msgstr ""
-"Dirección única en el mesh (ej. 10.1.1.1) que tiene que estar registrada en "
-"su comunidad local."
-
-msgid "This will setup a new virtual wireless interface in Access Point mode."
-msgstr ""
-"Configurar un nuevo interfaz virtual inalámbrico en modo punto de acceso."
-
-msgid ""
-"This wizard will assist you in setting up your router for Freifunk or "
-"another similar wireless community network."
-msgstr ""
-"Este asistente le ayudará a configurar su router para Freifunk o una red "
-"comunitaria inalámbrica similar."
-
-msgid "Unknown Error"
-msgstr "Error desconocido"
-
-msgid "Username"
-msgstr "Nombre de usuario"
-
-msgid "Virtual Access Point (VAP)"
-msgstr "Punto de acceso virtual (VAP)"
-
-msgid "Wizard"
-msgstr "Asistente"
-
-msgid "Your device and neighbouring nodes have to use the same channel."
-msgstr "Su dispositivo y nodos vecinos tienen que usar el mismo canal."
-
-msgid "dhcp"
-msgstr "DHCP"
-
-msgid "kbit/s"
-msgstr "Kbit/s"
-
-msgid "static"
-msgstr "estático"
-
-msgid "Configure this interface."
-msgstr "Configurar esta interfaz."
-
-msgid "recommended"
-msgstr "recomendado"
-
-msgid "Basic settings"
-msgstr "Configuración básica"
-
-msgid "Basic settings are incomplete. Please go to"
-msgstr "La configuración básica está incompleta. Por favor, vaya a"
-
-msgid "Error"
-msgstr "Error"
-
-msgid "You can not use the wizard because some necessary values are missing."
-msgstr "No puede usar el asistente porque faltan algunos valores necesarios."
-
-msgid "and fill out all required fields."
-msgstr "y rellene los campos requeridos."
diff --git a/po/es/uvc_streamer.po b/po/es/uvc_streamer.po
deleted file mode 100644
index ed1656720b..0000000000
--- a/po/es/uvc_streamer.po
+++ /dev/null
@@ -1,43 +0,0 @@
-#  uvc_streamer.pot
-#  generated from ./applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2012-04-15 23:39+0200\n"
-"Last-Translator: jarre2 <jarre2_es_jose@hotmail.com>\n"
-"Language-Team: none\n"
-"Language: es\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.4\n"
-
-#. Frames per second
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:1
-msgid "Frames per second"
-msgstr "Cuadros por segundo"
-
-#. Resolution
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:2
-msgid "Resolution"
-msgstr "Resolución"
-
-#. Settings
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:3
-msgid "Settings"
-msgstr "Ajustes"
-
-#. Webcam streaming
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:4
-msgid "Webcam streaming"
-msgstr "Hacer Streaming con Webcam"
-
-#. Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a href=\"http://%s:%i/\">http://%s:%i/</a>
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:5
-msgid ""
-"Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a "
-"href=\"http://%s:%i/\">http://%s:%i/</a>"
-msgstr ""
-"Configure una webcam compatible con Linux-UVC Diríjase con su navegador a: "
-"<a href=\"http://%s:%i/\">http://%s:%i/</a>"
diff --git a/po/fr/ffwizard.po b/po/fr/ffwizard.po
deleted file mode 100644
index b4ed531a77..0000000000
--- a/po/fr/ffwizard.po
+++ /dev/null
@@ -1,159 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-msgid "Allow to transfer anonymous statistics about this node"
-msgstr ""
-
-msgid "Channel"
-msgstr ""
-
-msgid "Check this to protect your LAN from other nodes or clients"
-msgstr ""
-
-msgid "Configure network"
-msgstr ""
-
-msgid "Connect your node with other nodes with a tunnel via the internet."
-msgstr ""
-
-msgid "DHCP IP range"
-msgstr ""
-
-msgid "DHCP will automatically assign ip addresses to clients"
-msgstr ""
-
-msgid "DNS Server"
-msgstr ""
-
-msgid "Enable DHCP"
-msgstr ""
-
-msgid "Gateway"
-msgstr ""
-
-msgid "Heartbeat"
-msgstr ""
-
-msgid "IP address"
-msgstr ""
-
-msgid "L2gvpn tunnel"
-msgstr ""
-
-msgid "Limit download bandwidth"
-msgstr ""
-
-msgid "Limit upload bandwidth"
-msgstr ""
-
-msgid "Mesh IP address"
-msgstr ""
-
-msgid "Mesh IPv6 Address"
-msgstr ""
-
-msgid "Netmask"
-msgstr ""
-
-msgid "Password"
-msgstr ""
-
-msgid "Password confirmation"
-msgstr ""
-
-msgid "Password successfully changed"
-msgstr ""
-
-msgid "Protect LAN"
-msgstr ""
-
-msgid "Protocol"
-msgstr ""
-
-msgid "Select this checkbox to configure your network interfaces."
-msgstr ""
-
-msgid ""
-"Select this to allow others to use your connection to access the internet."
-msgstr ""
-
-msgid "Share your internet connection"
-msgstr ""
-
-msgid ""
-"The IP range from which clients are assigned ip addresses (e.g. "
-"10.1.2.1/28). If this is a range inside your mesh network range, then it "
-"will be announced as HNA. Any other range will use NAT. If left empty then "
-"the defaults from the community profile will be used."
-msgstr ""
-
-msgid "The ipv6 address is calculated auomatically."
-msgstr ""
-
-msgid "The protocol to use for internet connectivity."
-msgstr ""
-
-msgid ""
-"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
-"registered at your local community."
-msgstr ""
-
-msgid "This will setup a new virtual wireless interface in Access Point mode."
-msgstr ""
-
-msgid ""
-"This wizard will assist you in setting up your router for Freifunk or "
-"another similar wireless community network."
-msgstr ""
-
-msgid "Unknown Error"
-msgstr ""
-
-msgid "Username"
-msgstr ""
-
-msgid "Virtual Access Point (VAP)"
-msgstr ""
-
-msgid "Wizard"
-msgstr ""
-
-msgid "Your device and neighbouring nodes have to use the same channel."
-msgstr ""
-
-msgid "dhcp"
-msgstr ""
-
-msgid "kbit/s"
-msgstr ""
-
-msgid "static"
-msgstr ""
-
-msgid "Configure this interface."
-msgstr ""
-
-msgid "recommended"
-msgstr ""
-
-msgid "Basic settings"
-msgstr ""
-
-msgid "Basic settings are incomplete. Please go to"
-msgstr ""
-
-msgid "Error"
-msgstr ""
-
-msgid "You can not use the wizard because some necessary values are missing."
-msgstr ""
-
-msgid "and fill out all required fields."
-msgstr ""
diff --git a/po/fr/uvc_streamer.po b/po/fr/uvc_streamer.po
deleted file mode 100644
index 5295f33124..0000000000
--- a/po/fr/uvc_streamer.po
+++ /dev/null
@@ -1,43 +0,0 @@
-#  uvc_streamer.pot
-#  generated from ./applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2011-11-23 22:22+0200\n"
-"Last-Translator: fredb <fblistes+luci@free.fr>\n"
-"Language-Team: none\n"
-"Language: fr\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Pootle 2.0.4\n"
-
-#. Frames per second
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:1
-msgid "Frames per second"
-msgstr "images par seconde"
-
-#. Resolution
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:2
-msgid "Resolution"
-msgstr "Résolution"
-
-#. Settings
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:3
-msgid "Settings"
-msgstr "Paramètres"
-
-#. Webcam streaming
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:4
-msgid "Webcam streaming"
-msgstr "Flux de la webcam"
-
-#. Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a href=\"http://%s:%i/\">http://%s:%i/</a>
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:5
-msgid ""
-"Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a "
-"href=\"http://%s:%i/\">http://%s:%i/</a>"
-msgstr ""
-"Configurer votre webcam compatible Linux-UVC. Entrez par exemple <a href="
-"\"http://%s:%i/\">http://%s:%i/</a> dans votre navigateur"
diff --git a/po/he/ffwizard.po b/po/he/ffwizard.po
deleted file mode 100644
index 3b13704d80..0000000000
--- a/po/he/ffwizard.po
+++ /dev/null
@@ -1,159 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-msgid "Allow to transfer anonymous statistics about this node"
-msgstr ""
-
-msgid "Channel"
-msgstr ""
-
-msgid "Check this to protect your LAN from other nodes or clients"
-msgstr ""
-
-msgid "Configure network"
-msgstr ""
-
-msgid "Connect your node with other nodes with a tunnel via the internet."
-msgstr ""
-
-msgid "DHCP IP range"
-msgstr ""
-
-msgid "DHCP will automatically assign ip addresses to clients"
-msgstr ""
-
-msgid "DNS Server"
-msgstr ""
-
-msgid "Enable DHCP"
-msgstr ""
-
-msgid "Gateway"
-msgstr ""
-
-msgid "Heartbeat"
-msgstr ""
-
-msgid "IP address"
-msgstr ""
-
-msgid "L2gvpn tunnel"
-msgstr ""
-
-msgid "Limit download bandwidth"
-msgstr ""
-
-msgid "Limit upload bandwidth"
-msgstr ""
-
-msgid "Mesh IP address"
-msgstr ""
-
-msgid "Mesh IPv6 Address"
-msgstr ""
-
-msgid "Netmask"
-msgstr ""
-
-msgid "Password"
-msgstr ""
-
-msgid "Password confirmation"
-msgstr ""
-
-msgid "Password successfully changed"
-msgstr ""
-
-msgid "Protect LAN"
-msgstr ""
-
-msgid "Protocol"
-msgstr ""
-
-msgid "Select this checkbox to configure your network interfaces."
-msgstr ""
-
-msgid ""
-"Select this to allow others to use your connection to access the internet."
-msgstr ""
-
-msgid "Share your internet connection"
-msgstr ""
-
-msgid ""
-"The IP range from which clients are assigned ip addresses (e.g. "
-"10.1.2.1/28). If this is a range inside your mesh network range, then it "
-"will be announced as HNA. Any other range will use NAT. If left empty then "
-"the defaults from the community profile will be used."
-msgstr ""
-
-msgid "The ipv6 address is calculated auomatically."
-msgstr ""
-
-msgid "The protocol to use for internet connectivity."
-msgstr ""
-
-msgid ""
-"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
-"registered at your local community."
-msgstr ""
-
-msgid "This will setup a new virtual wireless interface in Access Point mode."
-msgstr ""
-
-msgid ""
-"This wizard will assist you in setting up your router for Freifunk or "
-"another similar wireless community network."
-msgstr ""
-
-msgid "Unknown Error"
-msgstr ""
-
-msgid "Username"
-msgstr ""
-
-msgid "Virtual Access Point (VAP)"
-msgstr ""
-
-msgid "Wizard"
-msgstr ""
-
-msgid "Your device and neighbouring nodes have to use the same channel."
-msgstr ""
-
-msgid "dhcp"
-msgstr ""
-
-msgid "kbit/s"
-msgstr ""
-
-msgid "static"
-msgstr ""
-
-msgid "Configure this interface."
-msgstr ""
-
-msgid "recommended"
-msgstr ""
-
-msgid "Basic settings"
-msgstr ""
-
-msgid "Basic settings are incomplete. Please go to"
-msgstr ""
-
-msgid "Error"
-msgstr ""
-
-msgid "You can not use the wizard because some necessary values are missing."
-msgstr ""
-
-msgid "and fill out all required fields."
-msgstr ""
diff --git a/po/he/uvc_streamer.po b/po/he/uvc_streamer.po
deleted file mode 100644
index 6728905d01..0000000000
--- a/po/he/uvc_streamer.po
+++ /dev/null
@@ -1,45 +0,0 @@
-#  uvc_streamer.pot
-#  generated from ./applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2012-09-10 03:50+0200\n"
-"Last-Translator: Snoof <sagim9@gmail.com>\n"
-"Language-Team: none\n"
-"Language: he\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.6\n"
-
-#. Frames per second
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:1
-msgid "Frames per second"
-msgstr "פריימים לשניה"
-
-# אפשר גם אבחנה
-#. Resolution
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:2
-msgid "Resolution"
-msgstr "רזולוציה"
-
-#. Settings
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:3
-msgid "Settings"
-msgstr "הגדרות"
-
-#. Webcam streaming
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:4
-msgid "Webcam streaming"
-msgstr "שידור באמצעות מצלמת רשת"
-
-#. Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a href=\"http://%s:%i/\">http://%s:%i/</a>
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:5
-#, fuzzy
-msgid ""
-"Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a "
-"href=\"http://%s:%i/\">http://%s:%i/</a>"
-msgstr ""
-"הגדר את מצלמת הרשת התואמת Linux-UVC שלך. הפנה את הדפדפן שלך לכתובת כמו <a "
-"href=\"http://%s:%i/\">http://%s:%i/</a>."
diff --git a/po/hu/ffwizard.po b/po/hu/ffwizard.po
deleted file mode 100644
index 6bae6c55f2..0000000000
--- a/po/hu/ffwizard.po
+++ /dev/null
@@ -1,175 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-msgid "Allow to transfer anonymous statistics about this node"
-msgstr "Névtelen statisztikák küldésének engedélyezése erről a csomópontról"
-
-msgid "Channel"
-msgstr "Csatorna"
-
-msgid "Check this to protect your LAN from other nodes or clients"
-msgstr ""
-"Pipáld be ezt, hogy megvédd a LAN-od más csomópontoktól vagy kliensektől"
-
-msgid "Configure network"
-msgstr "Hálózat beállítása"
-
-msgid "Connect your node with other nodes with a tunnel via the internet."
-msgstr ""
-"Csomópontod összekötése más csomópontokkal internetes alagút segítségével"
-
-msgid "DHCP IP range"
-msgstr "DHCP IP tartomány"
-
-msgid "DHCP will automatically assign ip addresses to clients"
-msgstr "A DHCP automatikusan ki fog osztani IP címeket a klienseknek"
-
-msgid "DNS Server"
-msgstr "DNS szerver"
-
-msgid "Enable DHCP"
-msgstr "DHCP bekapcsolása"
-
-msgid "Gateway"
-msgstr "Átjáró"
-
-msgid "Heartbeat"
-msgstr "Szívverés"
-
-msgid "IP address"
-msgstr "IP cím"
-
-msgid "L2gvpn tunnel"
-msgstr "L2gvpn alagút"
-
-msgid "Limit download bandwidth"
-msgstr "Letöltési sávszélesség korlátozása"
-
-msgid "Limit upload bandwidth"
-msgstr "Feltöltési sávszélesség korlátozása"
-
-msgid "Mesh IP address"
-msgstr "Háló IP cím"
-
-msgid "Mesh IPv6 Address"
-msgstr "Háló IPv6 cím"
-
-msgid "Netmask"
-msgstr "Hálózati maszk"
-
-msgid "Password"
-msgstr "Jelszó"
-
-msgid "Password confirmation"
-msgstr "Jelszó megerősítése"
-
-msgid "Password successfully changed"
-msgstr "Jelszó sikeresen megváltoztatva"
-
-msgid "Protect LAN"
-msgstr "A LAN védelme"
-
-msgid "Protocol"
-msgstr "Protokoll"
-
-msgid "Select this checkbox to configure your network interfaces."
-msgstr "Válaszd ezt a jelölőnégyzetet a hálózati interfészeid beállításához"
-
-msgid ""
-"Select this to allow others to use your connection to access the internet."
-msgstr ""
-"Válaszd ezt, ha engedélyezni akarod másoknak, hogy elérjék az internetet a "
-"kapcsolatodon keresztül"
-
-msgid "Share your internet connection"
-msgstr "Internetkapcsolatod megosztása"
-
-msgid ""
-"The IP range from which clients are assigned ip addresses (e.g. "
-"10.1.2.1/28). If this is a range inside your mesh network range, then it "
-"will be announced as HNA. Any other range will use NAT. If left empty then "
-"the defaults from the community profile will be used."
-msgstr ""
-"Az az IP tartomány, amelyből kikerülnek a kliensek címei (pl. 10.1.2.1/28). "
-"Ha ez egy, a hálózatodon található tartomány, akkor HNA-ként lesz "
-"bejelentve. Minden más tartomány NAT-ot fog használni. Ha üresen hagyod, "
-"akkor a közösségi profilból kiolvasott alapértelmezések lesznek használatban."
-
-msgid "The ipv6 address is calculated auomatically."
-msgstr "Az IPv6 cím automatikusan számolódik."
-
-msgid "The protocol to use for internet connectivity."
-msgstr "Az internetes tevékenységekhez használt protokoll"
-
-msgid ""
-"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
-"registered at your local community."
-msgstr ""
-"Ez egy egyedi cím a hálózaton (pl. 10.1.1.1), és a helyi közösségnél kell "
-"regisztrálva lennie."
-
-msgid "This will setup a new virtual wireless interface in Access Point mode."
-msgstr ""
-"Ez létre fog hozni egy új virtuális vezeték nélküli interfészt Access Point "
-"módban."
-
-msgid ""
-"This wizard will assist you in setting up your router for Freifunk or "
-"another similar wireless community network."
-msgstr ""
-"Ez a varázsló segíteni fog téged a router beállításában Freifunk és más "
-"hasonló vezeték nélküli közösségi hálózatokhoz."
-
-msgid "Unknown Error"
-msgstr "Ismeretlen hiba"
-
-msgid "Username"
-msgstr "Felhasználói név"
-
-msgid "Virtual Access Point (VAP)"
-msgstr "Virtuális hozzáférési pont (VAP)"
-
-msgid "Wizard"
-msgstr "Varázsló"
-
-msgid "Your device and neighbouring nodes have to use the same channel."
-msgstr ""
-"Az eszközödnek és a szomszédos csomópontoknak ugyanazt a csatornát kell "
-"használniuk."
-
-msgid "dhcp"
-msgstr "dhcp"
-
-msgid "kbit/s"
-msgstr "kbit/s"
-
-msgid "static"
-msgstr "állandó"
-
-msgid "Configure this interface."
-msgstr "Interfész beállítása."
-
-msgid "recommended"
-msgstr "ajánlott"
-
-msgid "Basic settings"
-msgstr "Alapvető beállítások"
-
-msgid "Basic settings are incomplete. Please go to"
-msgstr "Az alapvető beállítások nem teljesek. Kérem, menjen ide:"
-
-msgid "Error"
-msgstr "Hiba"
-
-msgid "You can not use the wizard because some necessary values are missing."
-msgstr "Nem használhatod a varázslót, mert néhány szükséges érték hiányzik."
-
-msgid "and fill out all required fields."
-msgstr "és töltse ki az összes szükséges mezőt."
diff --git a/po/hu/uvc_streamer.po b/po/hu/uvc_streamer.po
deleted file mode 100644
index d38d667b99..0000000000
--- a/po/hu/uvc_streamer.po
+++ /dev/null
@@ -1,43 +0,0 @@
-#  uvc_streamer.pot
-#  generated from ./applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2012-03-30 09:02+0200\n"
-"Last-Translator: juhosg <juhosg@openwrt.org>\n"
-"Language-Team: none\n"
-"Language: hu\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.4\n"
-
-#. Frames per second
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:1
-msgid "Frames per second"
-msgstr "Másodpercenkénti képkockák"
-
-#. Resolution
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:2
-msgid "Resolution"
-msgstr "Felbontás"
-
-#. Settings
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:3
-msgid "Settings"
-msgstr "Beállítások"
-
-#. Webcam streaming
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:4
-msgid "Webcam streaming"
-msgstr "Webkamera stream-elés"
-
-#. Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a href=\"http://%s:%i/\">http://%s:%i/</a>
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:5
-msgid ""
-"Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a "
-"href=\"http://%s:%i/\">http://%s:%i/</a>"
-msgstr ""
-"Állítsa be a Linux-UVC kompatibilis webkameráját. Nyissa meg böngészővel "
-"pl.  <a href=\"http://%s:%i/\">http://%s:%i/</a>"
diff --git a/po/it/ffwizard.po b/po/it/ffwizard.po
deleted file mode 100644
index f00ce418d5..0000000000
--- a/po/it/ffwizard.po
+++ /dev/null
@@ -1,180 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2013-02-09 21:27+0200\n"
-"Last-Translator: Francesco <3gasas@gmail.com>\n"
-"Language-Team: none\n"
-"Language: it\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.6\n"
-
-msgid "Allow to transfer anonymous statistics about this node"
-msgstr "Permette di trasferire le statistiche in forma anonima su questo nodo"
-
-msgid "Channel"
-msgstr "Canale"
-
-msgid "Check this to protect your LAN from other nodes or clients"
-msgstr ""
-"Selezionare questa opzione per proteggere la LAN da altri nodi o clienti"
-
-msgid "Configure network"
-msgstr "Configura la Rete"
-
-msgid "Connect your node with other nodes with a tunnel via the internet."
-msgstr "Collegare il nodo con gli altri nodi con un tunnel via Internet."
-
-msgid "DHCP IP range"
-msgstr "Intervallo IP DHCP"
-
-msgid "DHCP will automatically assign ip addresses to clients"
-msgstr "DHCP assegna automaticamente gli indirizzi IP ai client"
-
-msgid "DNS Server"
-msgstr "Server DNS"
-
-msgid "Enable DHCP"
-msgstr "Attiva DHCP"
-
-msgid "Gateway"
-msgstr "Gateway"
-
-msgid "Heartbeat"
-msgstr "Heartbeat"
-
-msgid "IP address"
-msgstr "Indirizzo IP"
-
-msgid "L2gvpn tunnel"
-msgstr "Tunnel L2gvpn"
-
-msgid "Limit download bandwidth"
-msgstr "Limitare la banda passante in download"
-
-msgid "Limit upload bandwidth"
-msgstr "Limitare la banda passante in upload"
-
-msgid "Mesh IP address"
-msgstr "Indirizzo IP Mesh"
-
-msgid "Mesh IPv6 Address"
-msgstr "Indirizzo IPv6 Mesh"
-
-msgid "Netmask"
-msgstr "Maschera Rete"
-
-msgid "Password"
-msgstr "Password"
-
-msgid "Password confirmation"
-msgstr "Conferma Password"
-
-msgid "Password successfully changed"
-msgstr "Password modificata correttamente"
-
-msgid "Protect LAN"
-msgstr "Proteggi LAN"
-
-msgid "Protocol"
-msgstr "Protocollo"
-
-msgid "Select this checkbox to configure your network interfaces."
-msgstr ""
-"Selezionare questa casella di controllo per configurare le interfacce di "
-"rete"
-
-msgid ""
-"Select this to allow others to use your connection to access the internet."
-msgstr ""
-"Selezionare questa opzione per consentire ad altri di utilizzare la "
-"connessione per accedere a Internet."
-
-msgid "Share your internet connection"
-msgstr "Condividi la tua connessione a Internet"
-
-msgid ""
-"The IP range from which clients are assigned ip addresses (e.g. "
-"10.1.2.1/28). If this is a range inside your mesh network range, then it "
-"will be announced as HNA. Any other range will use NAT. If left empty then "
-"the defaults from the community profile will be used."
-msgstr ""
-"L'intervallo di IP i quali vengono assegnati ai client gli indirizzi IP (ad "
-"esempio 10.1.2.1/28). Se si tratta di un intervallo all'interno della rete "
-"Mesh, allora sarà annunciato come HNA. Ogni altro intervallo userà il NAT. "
-"Se lasciato vuoto, le impostazioni predefinite del profilo della comunità "
-"verrà utilizzato."
-
-msgid "The ipv6 address is calculated auomatically."
-msgstr "L'indirizzo IPv6 viene calcolato automaticamente."
-
-msgid "The protocol to use for internet connectivity."
-msgstr "Il protocollo da utilizzare per la connettività internet."
-
-msgid ""
-"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
-"registered at your local community."
-msgstr ""
-"Si tratta di un indirizzo univoco nella mesh (ad esempio 10.1.1.1) e deve "
-"essere registrato presso la comunità locale."
-
-msgid "This will setup a new virtual wireless interface in Access Point mode."
-msgstr ""
-"In questo modo isi mposta una nuova interfaccia virtuale wireless in "
-"modalità Punto di Accesso."
-
-msgid ""
-"This wizard will assist you in setting up your router for Freifunk or "
-"another similar wireless community network."
-msgstr ""
-"Questa procedura guidata vi aiuterà a configurare il router per Freifunk o "
-"un'altra comunità di Rete wireless simile."
-
-msgid "Unknown Error"
-msgstr "Errore Sconosciuto"
-
-msgid "Username"
-msgstr "Nome Utente"
-
-msgid "Virtual Access Point (VAP)"
-msgstr "Punto di Accesso Virtuale (VAP)"
-
-msgid "Wizard"
-msgstr "Procedura Guidata"
-
-msgid "Your device and neighbouring nodes have to use the same channel."
-msgstr "Il dispositivo e nodi adiacenti devono utilizzare lo stesso canale."
-
-msgid "dhcp"
-msgstr "dhcp"
-
-msgid "kbit/s"
-msgstr "kbit/s"
-
-msgid "static"
-msgstr "statico"
-
-msgid "Configure this interface."
-msgstr "Configura questa interfaccia."
-
-msgid "recommended"
-msgstr "raccomandato"
-
-msgid "Basic settings"
-msgstr "Impostazioni Base"
-
-msgid "Basic settings are incomplete. Please go to"
-msgstr "Le impostazioni base sono incomplete. Andare in"
-
-msgid "Error"
-msgstr "Errore"
-
-msgid "You can not use the wizard because some necessary values are missing."
-msgstr ""
-"Non è possibile utilizzare la procedura guidata perché alcuni valori "
-"necessari sono mancanti."
-
-msgid "and fill out all required fields."
-msgstr "e compilare tutti i campi richiesti."
diff --git a/po/it/uvc_streamer.po b/po/it/uvc_streamer.po
deleted file mode 100644
index 11cb6c21b1..0000000000
--- a/po/it/uvc_streamer.po
+++ /dev/null
@@ -1,43 +0,0 @@
-#  uvc_streamer.pot
-#  generated from ./applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2012-04-19 23:17+0200\n"
-"Last-Translator: claudyus <claudyus84@gmail.com>\n"
-"Language-Team: none\n"
-"Language: it\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.4\n"
-
-#. Frames per second
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:1
-msgid "Frames per second"
-msgstr "Frame per secondo"
-
-#. Resolution
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:2
-msgid "Resolution"
-msgstr "Risoluzione"
-
-#. Settings
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:3
-msgid "Settings"
-msgstr "Impostazioni"
-
-#. Webcam streaming
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:4
-msgid "Webcam streaming"
-msgstr "Streaming della webcam"
-
-#. Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a href=\"http://%s:%i/\">http://%s:%i/</a>
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:5
-msgid ""
-"Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a "
-"href=\"http://%s:%i/\">http://%s:%i/</a>"
-msgstr ""
-"Configura la tua webcam compatibile Linux-UVC. Prova con il browser <a href="
-"\"http://%s:%i/\">http://%s:%i/</a>"
diff --git a/po/ja/ffwizard.po b/po/ja/ffwizard.po
deleted file mode 100644
index 408745d22d..0000000000
--- a/po/ja/ffwizard.po
+++ /dev/null
@@ -1,159 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-
-msgid "Allow to transfer anonymous statistics about this node"
-msgstr ""
-
-msgid "Channel"
-msgstr ""
-
-msgid "Check this to protect your LAN from other nodes or clients"
-msgstr ""
-
-msgid "Configure network"
-msgstr ""
-
-msgid "Connect your node with other nodes with a tunnel via the internet."
-msgstr ""
-
-msgid "DHCP IP range"
-msgstr ""
-
-msgid "DHCP will automatically assign ip addresses to clients"
-msgstr ""
-
-msgid "DNS Server"
-msgstr ""
-
-msgid "Enable DHCP"
-msgstr ""
-
-msgid "Gateway"
-msgstr ""
-
-msgid "Heartbeat"
-msgstr ""
-
-msgid "IP address"
-msgstr ""
-
-msgid "L2gvpn tunnel"
-msgstr ""
-
-msgid "Limit download bandwidth"
-msgstr ""
-
-msgid "Limit upload bandwidth"
-msgstr ""
-
-msgid "Mesh IP address"
-msgstr ""
-
-msgid "Mesh IPv6 Address"
-msgstr ""
-
-msgid "Netmask"
-msgstr ""
-
-msgid "Password"
-msgstr ""
-
-msgid "Password confirmation"
-msgstr ""
-
-msgid "Password successfully changed"
-msgstr ""
-
-msgid "Protect LAN"
-msgstr ""
-
-msgid "Protocol"
-msgstr ""
-
-msgid "Select this checkbox to configure your network interfaces."
-msgstr ""
-
-msgid ""
-"Select this to allow others to use your connection to access the internet."
-msgstr ""
-
-msgid "Share your internet connection"
-msgstr ""
-
-msgid ""
-"The IP range from which clients are assigned ip addresses (e.g. "
-"10.1.2.1/28). If this is a range inside your mesh network range, then it "
-"will be announced as HNA. Any other range will use NAT. If left empty then "
-"the defaults from the community profile will be used."
-msgstr ""
-
-msgid "The ipv6 address is calculated auomatically."
-msgstr ""
-
-msgid "The protocol to use for internet connectivity."
-msgstr ""
-
-msgid ""
-"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
-"registered at your local community."
-msgstr ""
-
-msgid "This will setup a new virtual wireless interface in Access Point mode."
-msgstr ""
-
-msgid ""
-"This wizard will assist you in setting up your router for Freifunk or "
-"another similar wireless community network."
-msgstr ""
-
-msgid "Unknown Error"
-msgstr ""
-
-msgid "Username"
-msgstr ""
-
-msgid "Virtual Access Point (VAP)"
-msgstr ""
-
-msgid "Wizard"
-msgstr ""
-
-msgid "Your device and neighbouring nodes have to use the same channel."
-msgstr ""
-
-msgid "dhcp"
-msgstr ""
-
-msgid "kbit/s"
-msgstr ""
-
-msgid "static"
-msgstr ""
-
-msgid "Configure this interface."
-msgstr ""
-
-msgid "recommended"
-msgstr ""
-
-msgid "Basic settings"
-msgstr ""
-
-msgid "Basic settings are incomplete. Please go to"
-msgstr ""
-
-msgid "Error"
-msgstr ""
-
-msgid "You can not use the wizard because some necessary values are missing."
-msgstr ""
-
-msgid "and fill out all required fields."
-msgstr ""
diff --git a/po/ja/uvc_streamer.po b/po/ja/uvc_streamer.po
deleted file mode 100644
index ac20906a03..0000000000
--- a/po/ja/uvc_streamer.po
+++ /dev/null
@@ -1,43 +0,0 @@
-#  uvc_streamer.pot
-#  generated from ./applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2011-06-17 10:56+0200\n"
-"Last-Translator: Kentaro <kentaro.matsuyama@gmail.com>\n"
-"Language-Team: none\n"
-"Language: ja\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Pootle 2.0.4\n"
-
-#. Frames per second
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:1
-msgid "Frames per second"
-msgstr "FPS"
-
-#. Resolution
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:2
-msgid "Resolution"
-msgstr "解像度"
-
-#. Settings
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:3
-msgid "Settings"
-msgstr "設定"
-
-#. Webcam streaming
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:4
-msgid "Webcam streaming"
-msgstr "ウェブカムストリーミング"
-
-#. Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a href=\"http://%s:%i/\">http://%s:%i/</a>
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:5
-msgid ""
-"Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a "
-"href=\"http://%s:%i/\">http://%s:%i/</a>"
-msgstr ""
-"Linux-UVC互換のウェブカムを設定します。ブラウザで<a href=\"http://%s:%i/"
-"\">http://%s:%i/</a>にアクセスしてください。"
diff --git a/po/ms/uvc_streamer.po b/po/ms/uvc_streamer.po
deleted file mode 100644
index b88074a9e8..0000000000
--- a/po/ms/uvc_streamer.po
+++ /dev/null
@@ -1,37 +0,0 @@
-#  uvc_streamer.pot
-#  generated from ./applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Frames per second
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:1
-msgid "Frames per second"
-msgstr ""
-
-#. Resolution
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:2
-msgid "Resolution"
-msgstr ""
-
-#. Settings
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:3
-msgid "Settings"
-msgstr ""
-
-#. Webcam streaming
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:4
-msgid "Webcam streaming"
-msgstr ""
-
-#. Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a href=\"http://%s:%i/\">http://%s:%i/</a>
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:5
-msgid ""
-"Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a "
-"href=\"http://%s:%i/\">http://%s:%i/</a>"
-msgstr ""
diff --git a/po/no/ffwizard.po b/po/no/ffwizard.po
deleted file mode 100644
index 3b13704d80..0000000000
--- a/po/no/ffwizard.po
+++ /dev/null
@@ -1,159 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-msgid "Allow to transfer anonymous statistics about this node"
-msgstr ""
-
-msgid "Channel"
-msgstr ""
-
-msgid "Check this to protect your LAN from other nodes or clients"
-msgstr ""
-
-msgid "Configure network"
-msgstr ""
-
-msgid "Connect your node with other nodes with a tunnel via the internet."
-msgstr ""
-
-msgid "DHCP IP range"
-msgstr ""
-
-msgid "DHCP will automatically assign ip addresses to clients"
-msgstr ""
-
-msgid "DNS Server"
-msgstr ""
-
-msgid "Enable DHCP"
-msgstr ""
-
-msgid "Gateway"
-msgstr ""
-
-msgid "Heartbeat"
-msgstr ""
-
-msgid "IP address"
-msgstr ""
-
-msgid "L2gvpn tunnel"
-msgstr ""
-
-msgid "Limit download bandwidth"
-msgstr ""
-
-msgid "Limit upload bandwidth"
-msgstr ""
-
-msgid "Mesh IP address"
-msgstr ""
-
-msgid "Mesh IPv6 Address"
-msgstr ""
-
-msgid "Netmask"
-msgstr ""
-
-msgid "Password"
-msgstr ""
-
-msgid "Password confirmation"
-msgstr ""
-
-msgid "Password successfully changed"
-msgstr ""
-
-msgid "Protect LAN"
-msgstr ""
-
-msgid "Protocol"
-msgstr ""
-
-msgid "Select this checkbox to configure your network interfaces."
-msgstr ""
-
-msgid ""
-"Select this to allow others to use your connection to access the internet."
-msgstr ""
-
-msgid "Share your internet connection"
-msgstr ""
-
-msgid ""
-"The IP range from which clients are assigned ip addresses (e.g. "
-"10.1.2.1/28). If this is a range inside your mesh network range, then it "
-"will be announced as HNA. Any other range will use NAT. If left empty then "
-"the defaults from the community profile will be used."
-msgstr ""
-
-msgid "The ipv6 address is calculated auomatically."
-msgstr ""
-
-msgid "The protocol to use for internet connectivity."
-msgstr ""
-
-msgid ""
-"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
-"registered at your local community."
-msgstr ""
-
-msgid "This will setup a new virtual wireless interface in Access Point mode."
-msgstr ""
-
-msgid ""
-"This wizard will assist you in setting up your router for Freifunk or "
-"another similar wireless community network."
-msgstr ""
-
-msgid "Unknown Error"
-msgstr ""
-
-msgid "Username"
-msgstr ""
-
-msgid "Virtual Access Point (VAP)"
-msgstr ""
-
-msgid "Wizard"
-msgstr ""
-
-msgid "Your device and neighbouring nodes have to use the same channel."
-msgstr ""
-
-msgid "dhcp"
-msgstr ""
-
-msgid "kbit/s"
-msgstr ""
-
-msgid "static"
-msgstr ""
-
-msgid "Configure this interface."
-msgstr ""
-
-msgid "recommended"
-msgstr ""
-
-msgid "Basic settings"
-msgstr ""
-
-msgid "Basic settings are incomplete. Please go to"
-msgstr ""
-
-msgid "Error"
-msgstr ""
-
-msgid "You can not use the wizard because some necessary values are missing."
-msgstr ""
-
-msgid "and fill out all required fields."
-msgstr ""
diff --git a/po/no/uvc_streamer.po b/po/no/uvc_streamer.po
deleted file mode 100644
index fc111f0a52..0000000000
--- a/po/no/uvc_streamer.po
+++ /dev/null
@@ -1,38 +0,0 @@
-#  uvc_streamer.pot
-#  generated from ./applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#. Frames per second
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:1
-msgid "Frames per second"
-msgstr ""
-
-#. Resolution
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:2
-msgid "Resolution"
-msgstr ""
-
-#. Settings
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:3
-msgid "Settings"
-msgstr ""
-
-#. Webcam streaming
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:4
-msgid "Webcam streaming"
-msgstr ""
-
-#. Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a href=\"http://%s:%i/\">http://%s:%i/</a>
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:5
-msgid ""
-"Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a "
-"href=\"http://%s:%i/\">http://%s:%i/</a>"
-msgstr ""
diff --git a/po/pl/ffwizard.po b/po/pl/ffwizard.po
deleted file mode 100644
index a944149e6f..0000000000
--- a/po/pl/ffwizard.po
+++ /dev/null
@@ -1,178 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2012-08-30 12:42+0200\n"
-"Last-Translator: Staszek <fistaszek@tlen.pl>\n"
-"Language-Team: none\n"
-"Language: pl\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2);\n"
-"X-Generator: Pootle 2.0.6\n"
-
-msgid "Allow to transfer anonymous statistics about this node"
-msgstr "Pozwól na wysyłanie anonimowych statystyk o tym węźle"
-
-msgid "Channel"
-msgstr "Kanał"
-
-msgid "Check this to protect your LAN from other nodes or clients"
-msgstr ""
-"Zaznacz to, aby chronić Twoją sieć LAN przed innymi węzłami i klientami"
-
-msgid "Configure network"
-msgstr "Skonfiguruj sieć"
-
-msgid "Connect your node with other nodes with a tunnel via the internet."
-msgstr "Połącz swój węzeł z innymi węzłami przez tunel przez internet."
-
-msgid "DHCP IP range"
-msgstr "Zakres IP dla DHCP"
-
-msgid "DHCP will automatically assign ip addresses to clients"
-msgstr "DHCP automatycznie przypisze adresy IP klientom"
-
-msgid "DNS Server"
-msgstr "Serwer DNS"
-
-msgid "Enable DHCP"
-msgstr "Włącz DHCP"
-
-msgid "Gateway"
-msgstr "Brama"
-
-msgid "Heartbeat"
-msgstr "Bicie serca"
-
-msgid "IP address"
-msgstr "Adres IP"
-
-# Po polsku dla polaka jest tak samo niezrozumiałe jak po angielsku dla anglika, więc tłumaczenie uważam za dobre.
-msgid "L2gvpn tunnel"
-msgstr "Tunel L2gvpn"
-
-msgid "Limit download bandwidth"
-msgstr "Ogranicz szybkość pobierania"
-
-msgid "Limit upload bandwidth"
-msgstr "Ogranicz szybkość wysyłania"
-
-msgid "Mesh IP address"
-msgstr "Adres IP typu Mesh"
-
-msgid "Mesh IPv6 Address"
-msgstr "Adres IPv6 typu Mesh"
-
-msgid "Netmask"
-msgstr "Maska sieci"
-
-msgid "Password"
-msgstr "Hasło"
-
-msgid "Password confirmation"
-msgstr "Potwierdź hasło"
-
-msgid "Password successfully changed"
-msgstr "Hasło pomyślnie zmienione"
-
-msgid "Protect LAN"
-msgstr "Chroń LAN"
-
-msgid "Protocol"
-msgstr "Protokół"
-
-msgid "Select this checkbox to configure your network interfaces."
-msgstr "Zaznacz to pole, aby skonfigurować interfejsy sieciowe."
-
-msgid ""
-"Select this to allow others to use your connection to access the internet."
-msgstr ""
-"Zaznacz to, aby pozwolić innym na używanie Twojego łącza, by korzystać z "
-"internetu."
-
-msgid "Share your internet connection"
-msgstr "Udostępnij swoje łącze innym"
-
-msgid ""
-"The IP range from which clients are assigned ip addresses (e.g. "
-"10.1.2.1/28). If this is a range inside your mesh network range, then it "
-"will be announced as HNA. Any other range will use NAT. If left empty then "
-"the defaults from the community profile will be used."
-msgstr ""
-"Zakres IP, z którego klientom są przyznawane adresy IP (np. 10.1.2.1/28). "
-"Jeśli to zakres wewnątrz zakresu Twojej sieci mesh, będzie ogłoszony jako "
-"HNA. Każdy inny zakres będzie używał NAT. Jeśli pozostawisz pole puste, "
-"zostanie użyta domyślna wartość z profilu społeczności."
-
-msgid "The ipv6 address is calculated auomatically."
-msgstr "Adres IPv6 jest wyliczany automatycznie."
-
-msgid "The protocol to use for internet connectivity."
-msgstr "Protokół używany do łączenia z internetem."
-
-msgid ""
-"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
-"registered at your local community."
-msgstr ""
-"Jest to unikalny adres w sieci mesh (np. 10.1.1.1) i musi być zarejestrowany "
-"w lokalnej społeczności."
-
-msgid "This will setup a new virtual wireless interface in Access Point mode."
-msgstr ""
-"To ustawi nowy wirtualny interfejs bezprzewodowy w trybie punktu dostępowego "
-"(AP)."
-
-msgid ""
-"This wizard will assist you in setting up your router for Freifunk or "
-"another similar wireless community network."
-msgstr ""
-"Ten kreator pomoże Ci w konfiguracji routera do działania z kratową siecią "
-"typu Freifunk lub innej podobnej wspólnotowej sieci bezprzewodowej."
-
-msgid "Unknown Error"
-msgstr "Nieznany błąd"
-
-msgid "Username"
-msgstr "Nazwa użytkownika"
-
-msgid "Virtual Access Point (VAP)"
-msgstr "Wirtualny punkt dostępowy (VAP)"
-
-msgid "Wizard"
-msgstr "Kreator"
-
-msgid "Your device and neighbouring nodes have to use the same channel."
-msgstr "Twoje urządzenie i okoliczne węzły muszą używać tego samego kanału."
-
-msgid "dhcp"
-msgstr "DHCP"
-
-msgid "kbit/s"
-msgstr "kbit/s"
-
-msgid "static"
-msgstr "stały"
-
-msgid "Configure this interface."
-msgstr "Skonfiguruj ten interfejs."
-
-msgid "recommended"
-msgstr "zalecane"
-
-msgid "Basic settings"
-msgstr "Podstawowe ustawienia"
-
-msgid "Basic settings are incomplete. Please go to"
-msgstr "Podstawowe ustawienia są niekompletne. Idź do"
-
-msgid "Error"
-msgstr "Błąd"
-
-msgid "You can not use the wizard because some necessary values are missing."
-msgstr ""
-"Nie możesz użyć tego kreatora, ponieważ brakuje części niezbędnych danych."
-
-msgid "and fill out all required fields."
-msgstr "i wypełnij wszystkie wymagane pola."
diff --git a/po/pl/uvc_streamer.po b/po/pl/uvc_streamer.po
deleted file mode 100644
index cd3666309c..0000000000
--- a/po/pl/uvc_streamer.po
+++ /dev/null
@@ -1,44 +0,0 @@
-#  uvc_streamer.pot
-#  generated from ./applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2011-08-25 19:35+0200\n"
-"Last-Translator: Staszek <fistaszek@tlen.pl>\n"
-"Language-Team: none\n"
-"Language: pl\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2);\n"
-"X-Generator: Pootle 2.0.4\n"
-
-#. Frames per second
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:1
-msgid "Frames per second"
-msgstr "Klatek na sekundę"
-
-#. Resolution
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:2
-msgid "Resolution"
-msgstr "Rozdzielczość"
-
-#. Settings
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:3
-msgid "Settings"
-msgstr "Ustawienia"
-
-#. Webcam streaming
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:4
-msgid "Webcam streaming"
-msgstr "Strumieniowanie z kamery internetowej"
-
-#. Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a href=\"http://%s:%i/\">http://%s:%i/</a>
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:5
-msgid ""
-"Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a "
-"href=\"http://%s:%i/\">http://%s:%i/</a>"
-msgstr ""
-"Skonfiguruj swoją kamerę internetową zgodną z Linux-UVC. Wpisz w "
-"przeglądarce adres <a href=\"http://%s:%i/\">http://%s:%i/</a>"
diff --git a/po/pt/ffwizard.po b/po/pt/ffwizard.po
deleted file mode 100644
index deff99c2c1..0000000000
--- a/po/pt/ffwizard.po
+++ /dev/null
@@ -1,174 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2013-06-03 12:19+0200\n"
-"Last-Translator: joao.f.vieira <joao.f.vieira@gmail.com>\n"
-"Language-Team: none\n"
-"Language: pt\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.6\n"
-
-msgid "Allow to transfer anonymous statistics about this node"
-msgstr "Permitir a transferência de estatísticas anónimas acerca deste nó"
-
-msgid "Channel"
-msgstr "Canal"
-
-msgid "Check this to protect your LAN from other nodes or clients"
-msgstr "Selecione isto para proteger a sua LAN de outros nós ou clientes"
-
-msgid "Configure network"
-msgstr "Configurar rede"
-
-msgid "Connect your node with other nodes with a tunnel via the internet."
-msgstr "Ligue o seu nó com outros nós com um túnel via internet"
-
-msgid "DHCP IP range"
-msgstr "Gama de IPs DHCP"
-
-msgid "DHCP will automatically assign ip addresses to clients"
-msgstr "O DHCP irá atribuir automaticamente endereços IP aos clientes"
-
-msgid "DNS Server"
-msgstr "Servidor DNS"
-
-msgid "Enable DHCP"
-msgstr "Ativar DHCP"
-
-msgid "Gateway"
-msgstr "Gateway"
-
-msgid "Heartbeat"
-msgstr "Heartbeat"
-
-msgid "IP address"
-msgstr "Endereço IP"
-
-msgid "L2gvpn tunnel"
-msgstr "Túnel L2gvpn"
-
-msgid "Limit download bandwidth"
-msgstr "Limitar largura de banda de download"
-
-msgid "Limit upload bandwidth"
-msgstr "Limitar largura de banda de upload"
-
-msgid "Mesh IP address"
-msgstr "Endereço IP da malha"
-
-msgid "Mesh IPv6 Address"
-msgstr "Endereço IPv6 da malha"
-
-msgid "Netmask"
-msgstr "Máscara de rede"
-
-msgid "Password"
-msgstr "Password"
-
-msgid "Password confirmation"
-msgstr "Confirmar password"
-
-msgid "Password successfully changed"
-msgstr "Password alterada com sucesso"
-
-msgid "Protect LAN"
-msgstr "Proteger LAN"
-
-msgid "Protocol"
-msgstr "Protocolo"
-
-msgid "Select this checkbox to configure your network interfaces."
-msgstr "Selecione esta caixa para configurar as suas interfaces de rede."
-
-msgid ""
-"Select this to allow others to use your connection to access the internet."
-msgstr "Selecione isto para permitir a utilização do seu acesso à internet."
-
-msgid "Share your internet connection"
-msgstr "Partilhe a sua ligação à internet"
-
-msgid ""
-"The IP range from which clients are assigned ip addresses (e.g. "
-"10.1.2.1/28). If this is a range inside your mesh network range, then it "
-"will be announced as HNA. Any other range will use NAT. If left empty then "
-"the defaults from the community profile will be used."
-msgstr ""
-"A gama de IP a partir da qual os clientes atribuem os endereços IP (ex. "
-"10.1.2.1./28). Se esta é uma gama dentro das suas gamas de rede, então eles "
-"serão anunciados como HNA. Qualquer outra gama usará NAT. Se for deixado em "
-"branco será aplicadas as pré-definições do perfil comunitário."
-
-msgid "The ipv6 address is calculated auomatically."
-msgstr "O endereço IPv6 é calculado automaticamente."
-
-msgid "The protocol to use for internet connectivity."
-msgstr "O protocolo a ser usado na conectividade à internet."
-
-msgid ""
-"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
-"registered at your local community."
-msgstr ""
-"Este é o endereço único na rede (e.g. 10.1.1.1) e tem de estar na sua "
-"comunidade local."
-
-msgid "This will setup a new virtual wireless interface in Access Point mode."
-msgstr ""
-"Isto irá configurar a nova interface wireless virtual no modo de Ponto de "
-"Acesso."
-
-msgid ""
-"This wizard will assist you in setting up your router for Freifunk or "
-"another similar wireless community network."
-msgstr ""
-"Este assistente írá ajudá-lo a configurar o seu router para a Freifunk ou "
-"outras redes wireless comunitárias similares."
-
-msgid "Unknown Error"
-msgstr "Erro Desconhecido"
-
-msgid "Username"
-msgstr "Utilizador"
-
-msgid "Virtual Access Point (VAP)"
-msgstr "Ponto de Acesso Virtual (VAP)"
-
-msgid "Wizard"
-msgstr "Assistente"
-
-msgid "Your device and neighbouring nodes have to use the same channel."
-msgstr "O seu dispositivo e os nós vizinhos têm de usar o mesmo canal."
-
-msgid "dhcp"
-msgstr "dhcp"
-
-msgid "kbit/s"
-msgstr "kbit/s"
-
-msgid "static"
-msgstr "estático"
-
-msgid "Configure this interface."
-msgstr "Configurar esta interface."
-
-msgid "recommended"
-msgstr "recomendado"
-
-msgid "Basic settings"
-msgstr "Definições básicas"
-
-msgid "Basic settings are incomplete. Please go to"
-msgstr "As definições básicas não estão completas. Vá até"
-
-msgid "Error"
-msgstr "Erro"
-
-msgid "You can not use the wizard because some necessary values are missing."
-msgstr ""
-"Não pode utilizar o assistente porque alguns parâmetros necessários estão em "
-"falta."
-
-msgid "and fill out all required fields."
-msgstr "e preencha os campos necessários."
diff --git a/po/pt/uvc_streamer.po b/po/pt/uvc_streamer.po
deleted file mode 100644
index a8a899934e..0000000000
--- a/po/pt/uvc_streamer.po
+++ /dev/null
@@ -1,43 +0,0 @@
-#  uvc_streamer.pot
-#  generated from ./applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2013-05-01 00:50+0200\n"
-"Last-Translator: pedromrgoncalves <pedromrgoncalves@gmail.com>\n"
-"Language-Team: none\n"
-"Language: pt\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.6\n"
-
-#. Frames per second
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:1
-msgid "Frames per second"
-msgstr "Frames por segundo"
-
-#. Resolution
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:2
-msgid "Resolution"
-msgstr "Resolução"
-
-#. Settings
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:3
-msgid "Settings"
-msgstr "Definições"
-
-#. Webcam streaming
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:4
-msgid "Webcam streaming"
-msgstr "Streaming de Webcam"
-
-#. Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a href=\"http://%s:%i/\">http://%s:%i/</a>
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:5
-msgid ""
-"Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a "
-"href=\"http://%s:%i/\">http://%s:%i/</a>"
-msgstr ""
-"Configure a sua webcam Linux-UVC compatível. Encaminhe o seu browser para "
-"ex: <a href=\"http://%s:%i/\">http://%s:%i/</a>"
diff --git a/po/pt_BR/ffwizard.po b/po/pt_BR/ffwizard.po
deleted file mode 100644
index 5bc0c1183b..0000000000
--- a/po/pt_BR/ffwizard.po
+++ /dev/null
@@ -1,178 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2012-09-27 00:35+0200\n"
-"Last-Translator: Luiz Angelo <luizluca@gmail.com>\n"
-"Language-Team: none\n"
-"Language: pt_BR\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Pootle 2.0.6\n"
-
-msgid "Allow to transfer anonymous statistics about this node"
-msgstr "Permitir a transferência de estatísticas anônimas sobre este nó"
-
-msgid "Channel"
-msgstr "Canal"
-
-msgid "Check this to protect your LAN from other nodes or clients"
-msgstr ""
-"Marque isto para proteger sua rede local (LAN) de outros nós ou clientes"
-
-msgid "Configure network"
-msgstr "Configurar a rede"
-
-msgid "Connect your node with other nodes with a tunnel via the internet."
-msgstr "Conecte seu nó com outros nós por um túnel pela internet."
-
-msgid "DHCP IP range"
-msgstr "Faixa de IP do DHCP"
-
-msgid "DHCP will automatically assign ip addresses to clients"
-msgstr "O DHCP irá atribuir automaticamente endereços IP para os clientes"
-
-msgid "DNS Server"
-msgstr "Servidor DNS"
-
-msgid "Enable DHCP"
-msgstr "Habilitar DHCP"
-
-msgid "Gateway"
-msgstr "Roteador"
-
-msgid "Heartbeat"
-msgstr "Pulsação de Monitoramento (Heartbeat)"
-
-msgid "IP address"
-msgstr "Endereço IP"
-
-msgid "L2gvpn tunnel"
-msgstr "Tunel l2gvpn"
-
-msgid "Limit download bandwidth"
-msgstr "Limitar a velocidade para baixar"
-
-msgid "Limit upload bandwidth"
-msgstr "Limitar a velocidade para subir"
-
-msgid "Mesh IP address"
-msgstr "Endereço IP da rede em malha"
-
-msgid "Mesh IPv6 Address"
-msgstr "Endereço IPv6 da rede em malha"
-
-msgid "Netmask"
-msgstr "Máscara de Rede"
-
-msgid "Password"
-msgstr "Senha"
-
-msgid "Password confirmation"
-msgstr "Confirmação da Senha"
-
-msgid "Password successfully changed"
-msgstr "A senha foi alterada com sucesso"
-
-msgid "Protect LAN"
-msgstr "Proteger rede local (LAN)"
-
-msgid "Protocol"
-msgstr "Protocolo"
-
-msgid "Select this checkbox to configure your network interfaces."
-msgstr "Selecione esta opção para configurar suas interfaces de rede."
-
-msgid ""
-"Select this to allow others to use your connection to access the internet."
-msgstr ""
-"Selecione isto para permitir que outros usem sua conexão para acessar a "
-"internet."
-
-msgid "Share your internet connection"
-msgstr "Compartilhar sua conexão com a internet"
-
-msgid ""
-"The IP range from which clients are assigned ip addresses (e.g. "
-"10.1.2.1/28). If this is a range inside your mesh network range, then it "
-"will be announced as HNA. Any other range will use NAT. If left empty then "
-"the defaults from the community profile will be used."
-msgstr ""
-"Faixa de endereços IP atribuídos aos clientes (ex: 10.1.2.1/28). Se esta "
-"faixa está dentro da faixa da rede em malha, então ela será anunciada como "
-"<abbr title=\"Host and network association, Associação de equipamentos e "
-"redes\">HNA</abbr>. Qualquer outra faixa irá utilizar NAT. Se deixada vazia, "
-"os padrões do perfil da comunidade será usada."
-
-msgid "The ipv6 address is calculated auomatically."
-msgstr "O endereço IPv6 é calculado automaticamente."
-
-msgid "The protocol to use for internet connectivity."
-msgstr "O protocolo usado para a conectividade com a internet."
-
-msgid ""
-"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
-"registered at your local community."
-msgstr ""
-"Este é um endereço único na rede em malha (ex: 10.1.1.1) e tem que ser "
-"registrado na sua comunidade local."
-
-msgid "This will setup a new virtual wireless interface in Access Point mode."
-msgstr ""
-"Isto configurará uma nova interface de rede sem fio virtual em modo de ponto "
-"de acesso."
-
-msgid ""
-"This wizard will assist you in setting up your router for Freifunk or "
-"another similar wireless community network."
-msgstr ""
-"Este assistente irá ajudá-lo na configuração do seu roteador para Freifunk "
-"outra rede comunitária sem fio similar."
-
-msgid "Unknown Error"
-msgstr "Erro Desconhecido"
-
-msgid "Username"
-msgstr "Usuário"
-
-msgid "Virtual Access Point (VAP)"
-msgstr "Ponto de Acesso Virtual (VAP)"
-
-msgid "Wizard"
-msgstr "Assistente"
-
-msgid "Your device and neighbouring nodes have to use the same channel."
-msgstr "Seu dispositivo e os nós vizinhos devem utilizar o mesmo canal."
-
-msgid "dhcp"
-msgstr "dhcp"
-
-msgid "kbit/s"
-msgstr "kbit/s"
-
-msgid "static"
-msgstr "estático"
-
-msgid "Configure this interface."
-msgstr "Configurar esta interface."
-
-msgid "recommended"
-msgstr "recomendado"
-
-msgid "Basic settings"
-msgstr "Configuração básica"
-
-msgid "Basic settings are incomplete. Please go to"
-msgstr "As configurações básicas estão incompletas. Por favor vá para"
-
-msgid "Error"
-msgstr "Erro"
-
-msgid "You can not use the wizard because some necessary values are missing."
-msgstr ""
-"Você não pode usar o assistente porque algum dos valores necessários estão "
-"ausentes."
-
-msgid "and fill out all required fields."
-msgstr "e preencha todos os campos necessários."
diff --git a/po/pt_BR/uvc_streamer.po b/po/pt_BR/uvc_streamer.po
deleted file mode 100644
index 9ae2e616b6..0000000000
--- a/po/pt_BR/uvc_streamer.po
+++ /dev/null
@@ -1,40 +0,0 @@
-#  uvc_streamer.pot
-#  generated from ./applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#. Frames per second
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:1
-msgid "Frames per second"
-msgstr "Quadros por segundo"
-
-#. Resolution
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:2
-msgid "Resolution"
-msgstr "Resolução"
-
-#. Settings
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:3
-msgid "Settings"
-msgstr "Definições"
-
-#. Webcam streaming
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:4
-msgid "Webcam streaming"
-msgstr "Webcam transmitindo"
-
-#. Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a href=\"http://%s:%i/\">http://%s:%i/</a>
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:5
-msgid ""
-"Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a "
-"href=\"http://%s:%i/\">http://%s:%i/</a>"
-msgstr ""
-"Configure sua webcam compatível com Linux-UVC. Aponte seu navegador para, "
-"por exemplo, <a href=\"http://%s:%i/\">http://%s:%i/</a>"
diff --git a/po/ro/ffwizard.po b/po/ro/ffwizard.po
deleted file mode 100644
index 8becd02219..0000000000
--- a/po/ro/ffwizard.po
+++ /dev/null
@@ -1,165 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2014-06-29 19:18+0200\n"
-"Last-Translator: xxvirusxx <condor20_05@yahoo.it>\n"
-"Language-Team: none\n"
-"Language: ro\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"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: Pootle 2.0.6\n"
-
-msgid "Allow to transfer anonymous statistics about this node"
-msgstr ""
-
-msgid "Channel"
-msgstr "Canal"
-
-msgid "Check this to protect your LAN from other nodes or clients"
-msgstr ""
-
-msgid "Configure network"
-msgstr "Configurare reţea"
-
-msgid "Connect your node with other nodes with a tunnel via the internet."
-msgstr ""
-
-msgid "DHCP IP range"
-msgstr ""
-
-msgid "DHCP will automatically assign ip addresses to clients"
-msgstr "DHCP va aloca automat adrese ip la clienti"
-
-msgid "DNS Server"
-msgstr "Server DNS"
-
-msgid "Enable DHCP"
-msgstr "Activeaza DHCP"
-
-msgid "Gateway"
-msgstr "Gateway"
-
-msgid "Heartbeat"
-msgstr ""
-
-msgid "IP address"
-msgstr "Adresa IP"
-
-msgid "L2gvpn tunnel"
-msgstr ""
-
-msgid "Limit download bandwidth"
-msgstr "Limiteaza viteza de download"
-
-msgid "Limit upload bandwidth"
-msgstr "Limiteaza viteza de upload"
-
-msgid "Mesh IP address"
-msgstr ""
-
-msgid "Mesh IPv6 Address"
-msgstr ""
-
-msgid "Netmask"
-msgstr ""
-
-msgid "Password"
-msgstr "Parola"
-
-msgid "Password confirmation"
-msgstr "Confirmare parolă"
-
-msgid "Password successfully changed"
-msgstr "Parolă schimbată cu succes"
-
-msgid "Protect LAN"
-msgstr "Protejeaza reteaua locala LAN"
-
-msgid "Protocol"
-msgstr "Protocol"
-
-msgid "Select this checkbox to configure your network interfaces."
-msgstr "Bifeaza aici pentru a configura interfetele de retea."
-
-msgid ""
-"Select this to allow others to use your connection to access the internet."
-msgstr ""
-"Selecteaza aici pentru a permite altora sa-ti foloseasca legatura ta de "
-"Internet."
-
-msgid "Share your internet connection"
-msgstr "Partajeaza cu altii conexiunea ta de Internet"
-
-msgid ""
-"The IP range from which clients are assigned ip addresses (e.g. "
-"10.1.2.1/28). If this is a range inside your mesh network range, then it "
-"will be announced as HNA. Any other range will use NAT. If left empty then "
-"the defaults from the community profile will be used."
-msgstr ""
-
-msgid "The ipv6 address is calculated auomatically."
-msgstr ""
-
-msgid "The protocol to use for internet connectivity."
-msgstr ""
-
-msgid ""
-"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
-"registered at your local community."
-msgstr ""
-
-msgid "This will setup a new virtual wireless interface in Access Point mode."
-msgstr ""
-
-msgid ""
-"This wizard will assist you in setting up your router for Freifunk or "
-"another similar wireless community network."
-msgstr ""
-
-msgid "Unknown Error"
-msgstr "Eroare necunoscută"
-
-msgid "Username"
-msgstr "Utilizator"
-
-msgid "Virtual Access Point (VAP)"
-msgstr ""
-
-msgid "Wizard"
-msgstr ""
-
-msgid "Your device and neighbouring nodes have to use the same channel."
-msgstr ""
-
-msgid "dhcp"
-msgstr ""
-
-msgid "kbit/s"
-msgstr ""
-
-msgid "static"
-msgstr ""
-
-msgid "Configure this interface."
-msgstr "Configureaza aceasta interfata"
-
-msgid "recommended"
-msgstr "recomandat"
-
-msgid "Basic settings"
-msgstr "Setari de baza"
-
-msgid "Basic settings are incomplete. Please go to"
-msgstr "Setările de bază sunt incomplete. Mergeţi la"
-
-msgid "Error"
-msgstr "Eroare"
-
-msgid "You can not use the wizard because some necessary values are missing."
-msgstr ""
-
-msgid "and fill out all required fields."
-msgstr ""
diff --git a/po/ro/uvc_streamer.po b/po/ro/uvc_streamer.po
deleted file mode 100644
index d6f43c2ba9..0000000000
--- a/po/ro/uvc_streamer.po
+++ /dev/null
@@ -1,44 +0,0 @@
-#  uvc_streamer.pot
-#  generated from ./applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2011-10-07 16:52+0200\n"
-"Last-Translator: Daniel <daniel.petre@pitesti.rcs-rds.ro>\n"
-"Language-Team: none\n"
-"Language: ro\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"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: Pootle 2.0.4\n"
-
-#. Frames per second
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:1
-msgid "Frames per second"
-msgstr "Frame pe secunda"
-
-#. Resolution
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:2
-msgid "Resolution"
-msgstr "Rezolutie"
-
-#. Settings
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:3
-msgid "Settings"
-msgstr "Setari"
-
-#. Webcam streaming
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:4
-msgid "Webcam streaming"
-msgstr "Emisie webcam"
-
-#. Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a href=\"http://%s:%i/\">http://%s:%i/</a>
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:5
-msgid ""
-"Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a "
-"href=\"http://%s:%i/\">http://%s:%i/</a>"
-msgstr ""
-"Configureaza-ti webcamul compatibil Linux-UC. Pointeaza browserul catre <a "
-"href=\"http://%s:%i/\">http://%s:%i/</a> de exemplu"
diff --git a/po/ru/ffwizard.po b/po/ru/ffwizard.po
deleted file mode 100644
index afc10b96e1..0000000000
--- a/po/ru/ffwizard.po
+++ /dev/null
@@ -1,183 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: LuCI: ffwizard\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: 2012-08-15 17:17+0300\n"
-"Last-Translator: Roman A. aka BasicXP <x12ozmouse@ya.ru>\n"
-"Language-Team: Russian <x12ozmouse@ya.ru>\n"
-"Language: ru\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Pootle 2.0.6\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-
-msgid "Allow to transfer anonymous statistics about this node"
-msgstr "Разрешить передачу анонимной статистики с этого узла"
-
-msgid "Channel"
-msgstr "Канал"
-
-msgid "Check this to protect your LAN from other nodes or clients"
-msgstr ""
-"Выберите это для зашиты вашей локальной сети от других узлов и клиентов"
-
-msgid "Configure network"
-msgstr "Конфигурировать сеть"
-
-msgid "Connect your node with other nodes with a tunnel via the internet."
-msgstr "Соединять ваш узел с другими узлами туннелем через интернет."
-
-msgid "DHCP IP range"
-msgstr "Диапазон IP-адресов DHCP"
-
-msgid "DHCP will automatically assign ip addresses to clients"
-msgstr "DHCP автоматически назначит IP-адреса клиентам"
-
-msgid "DNS Server"
-msgstr "Сервер DNS"
-
-msgid "Enable DHCP"
-msgstr "Разрешить DHCP"
-
-msgid "Gateway"
-msgstr "Шлюз"
-
-msgid "Heartbeat"
-msgstr "Состояние"
-
-msgid "IP address"
-msgstr "IP-адрес"
-
-msgid "L2gvpn tunnel"
-msgstr "L2gvpn туннель"
-
-msgid "Limit download bandwidth"
-msgstr "Ограничить пропускную способность загрузки"
-
-msgid "Limit upload bandwidth"
-msgstr "Ограничить пропускную способность передачи"
-
-msgid "Mesh IP address"
-msgstr "IP-адрес ячейки"
-
-msgid "Mesh IPv6 Address"
-msgstr "IPv6-адрес ячейки"
-
-msgid "Netmask"
-msgstr "Маска сети"
-
-msgid "Password"
-msgstr "Пароль"
-
-msgid "Password confirmation"
-msgstr "Подтверждение пароля"
-
-msgid "Password successfully changed"
-msgstr "Пароль успешно изменён"
-
-msgid "Protect LAN"
-msgstr "Защитить LAN"
-
-msgid "Protocol"
-msgstr "Протокол"
-
-msgid "Select this checkbox to configure your network interfaces."
-msgstr "Настроить сетевые интерфейсы"
-
-msgid ""
-"Select this to allow others to use your connection to access the internet."
-msgstr ""
-"Разрешить другим пользователям использовать ваше соединение для доступа в "
-"интернет."
-
-msgid "Share your internet connection"
-msgstr "Разрешить другим использовать ваше интернет-соединение"
-
-msgid ""
-"The IP range from which clients are assigned ip addresses (e.g. "
-"10.1.2.1/28). If this is a range inside your mesh network range, then it "
-"will be announced as HNA. Any other range will use NAT. If left empty then "
-"the defaults from the community profile will be used."
-msgstr ""
-"Диапазон IP-адресов клиентов (например, 10.1.2.1/28). Если данный диапазон "
-"находится внутри диапазона вашей ячеистой сети, то он будет анонсирован как "
-"HNA. Любой другой диапазон будет использовать NAT. Если значение не задано, "
-"то будут использоваться настройки из профиля сообщества."
-
-# TYPO: auomatically -> automatically
-# ipv6 -> IPv6
-msgid "The ipv6 address is calculated auomatically."
-msgstr "IPv6-адрес рассчитывается автоматически."
-
-msgid "The protocol to use for internet connectivity."
-msgstr "Протокол доступа в интернет."
-
-msgid ""
-"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
-"registered at your local community."
-msgstr ""
-"Уникальный адрес в ячейке (например, 10.1.1.1). Адрес должен быть "
-"зарегистрирован в вашем местном сообществе."
-
-msgid "This will setup a new virtual wireless interface in Access Point mode."
-msgstr ""
-"Установка нового виртуального беспроводного интерфейса в режим \"Точка "
-"доступа\"."
-
-msgid ""
-"This wizard will assist you in setting up your router for Freifunk or "
-"another similar wireless community network."
-msgstr ""
-"Этот помощник поможет вам в настройке маршрутизатора для Freifunk-сети или "
-"другой аналогичной беспроводного сети."
-
-msgid "Unknown Error"
-msgstr "Неизвестная ошибка"
-
-msgid "Username"
-msgstr "Имя пользователя"
-
-msgid "Virtual Access Point (VAP)"
-msgstr "Виртуальная точка доступа (VAP)"
-
-msgid "Wizard"
-msgstr "Помощник"
-
-msgid "Your device and neighbouring nodes have to use the same channel."
-msgstr ""
-"Ваше устройство и соседние узлы должны использовать один и тот же канал."
-
-msgid "dhcp"
-msgstr "DHCP"
-
-msgid "kbit/s"
-msgstr "кбит/с"
-
-msgid "static"
-msgstr "статический"
-
-msgid "Configure this interface."
-msgstr "Настроить интерфейс."
-
-msgid "recommended"
-msgstr "рекомендуемый"
-
-msgid "Basic settings"
-msgstr "Главные настройки"
-
-msgid "Basic settings are incomplete. Please go to"
-msgstr "Ошибка в главных настройках. Пожалуйста, перейдите в"
-
-msgid "Error"
-msgstr "Ошибка"
-
-msgid "You can not use the wizard because some necessary values are missing."
-msgstr ""
-"Вы не можете использовать помощника, так как некоторые необходимые значения "
-"отсутствуют."
-
-msgid "and fill out all required fields."
-msgstr "и заполните все требуемые поля."
diff --git a/po/ru/uvc_streamer.po b/po/ru/uvc_streamer.po
deleted file mode 100644
index c9e859c6de..0000000000
--- a/po/ru/uvc_streamer.po
+++ /dev/null
@@ -1,46 +0,0 @@
-#  uvc_streamer.pot
-#  generated from ./applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua
-msgid ""
-msgstr ""
-"Project-Id-Version: LuCI: uvc_streamer\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: 2012-08-15 11:46+0300\n"
-"Last-Translator: Roman A. aka BasicXP <x12ozmouse@ya.ru>\n"
-"Language-Team: Russian <x12ozmouse@ya.ru>\n"
-"Language: ru\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Pootle 2.0.4\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-
-#. Frames per second
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:1
-msgid "Frames per second"
-msgstr "Количество кадров в секунду"
-
-#. Resolution
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:2
-msgid "Resolution"
-msgstr "Разрешение"
-
-#. Settings
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:3
-msgid "Settings"
-msgstr "Настройки"
-
-#. Webcam streaming
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:4
-msgid "Webcam streaming"
-msgstr "Потоковое вещание с веб-камеры"
-
-#. Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a href=\"http://%s:%i/\">http://%s:%i/</a>
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:5
-msgid ""
-"Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a "
-"href=\"http://%s:%i/\">http://%s:%i/</a>"
-msgstr ""
-"Настройте вашу Linux-UVC-совместимую веб-камеру. Перейдите на страницу <a "
-"href=\"http://%s:%i/\">http://%s:%i/</a>"
diff --git a/po/sk/ffwizard.po b/po/sk/ffwizard.po
deleted file mode 100644
index 96ff0d2f39..0000000000
--- a/po/sk/ffwizard.po
+++ /dev/null
@@ -1,159 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ASCII\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-
-msgid "Allow to transfer anonymous statistics about this node"
-msgstr ""
-
-msgid "Channel"
-msgstr ""
-
-msgid "Check this to protect your LAN from other nodes or clients"
-msgstr ""
-
-msgid "Configure network"
-msgstr ""
-
-msgid "Connect your node with other nodes with a tunnel via the internet."
-msgstr ""
-
-msgid "DHCP IP range"
-msgstr ""
-
-msgid "DHCP will automatically assign ip addresses to clients"
-msgstr ""
-
-msgid "DNS Server"
-msgstr ""
-
-msgid "Enable DHCP"
-msgstr ""
-
-msgid "Gateway"
-msgstr ""
-
-msgid "Heartbeat"
-msgstr ""
-
-msgid "IP address"
-msgstr ""
-
-msgid "L2gvpn tunnel"
-msgstr ""
-
-msgid "Limit download bandwidth"
-msgstr ""
-
-msgid "Limit upload bandwidth"
-msgstr ""
-
-msgid "Mesh IP address"
-msgstr ""
-
-msgid "Mesh IPv6 Address"
-msgstr ""
-
-msgid "Netmask"
-msgstr ""
-
-msgid "Password"
-msgstr ""
-
-msgid "Password confirmation"
-msgstr ""
-
-msgid "Password successfully changed"
-msgstr ""
-
-msgid "Protect LAN"
-msgstr ""
-
-msgid "Protocol"
-msgstr ""
-
-msgid "Select this checkbox to configure your network interfaces."
-msgstr ""
-
-msgid ""
-"Select this to allow others to use your connection to access the internet."
-msgstr ""
-
-msgid "Share your internet connection"
-msgstr ""
-
-msgid ""
-"The IP range from which clients are assigned ip addresses (e.g. "
-"10.1.2.1/28). If this is a range inside your mesh network range, then it "
-"will be announced as HNA. Any other range will use NAT. If left empty then "
-"the defaults from the community profile will be used."
-msgstr ""
-
-msgid "The ipv6 address is calculated auomatically."
-msgstr ""
-
-msgid "The protocol to use for internet connectivity."
-msgstr ""
-
-msgid ""
-"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
-"registered at your local community."
-msgstr ""
-
-msgid "This will setup a new virtual wireless interface in Access Point mode."
-msgstr ""
-
-msgid ""
-"This wizard will assist you in setting up your router for Freifunk or "
-"another similar wireless community network."
-msgstr ""
-
-msgid "Unknown Error"
-msgstr ""
-
-msgid "Username"
-msgstr ""
-
-msgid "Virtual Access Point (VAP)"
-msgstr ""
-
-msgid "Wizard"
-msgstr ""
-
-msgid "Your device and neighbouring nodes have to use the same channel."
-msgstr ""
-
-msgid "dhcp"
-msgstr ""
-
-msgid "kbit/s"
-msgstr ""
-
-msgid "static"
-msgstr ""
-
-msgid "Configure this interface."
-msgstr ""
-
-msgid "recommended"
-msgstr ""
-
-msgid "Basic settings"
-msgstr ""
-
-msgid "Basic settings are incomplete. Please go to"
-msgstr ""
-
-msgid "Error"
-msgstr ""
-
-msgid "You can not use the wizard because some necessary values are missing."
-msgstr ""
-
-msgid "and fill out all required fields."
-msgstr ""
diff --git a/po/sk/uvc_streamer.po b/po/sk/uvc_streamer.po
deleted file mode 100644
index b251f29f53..0000000000
--- a/po/sk/uvc_streamer.po
+++ /dev/null
@@ -1,38 +0,0 @@
-#  uvc_streamer.pot
-#  generated from ./applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua
-msgid ""
-msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"MIME-Version: 1.0\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-
-#. Frames per second
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:1
-msgid "Frames per second"
-msgstr ""
-
-#. Resolution
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:2
-msgid "Resolution"
-msgstr ""
-
-#. Settings
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:3
-msgid "Settings"
-msgstr ""
-
-#. Webcam streaming
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:4
-msgid "Webcam streaming"
-msgstr ""
-
-#. Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a href=\"http://%s:%i/\">http://%s:%i/</a>
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:5
-msgid ""
-"Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a "
-"href=\"http://%s:%i/\">http://%s:%i/</a>"
-msgstr ""
diff --git a/po/sv/ffwizard.po b/po/sv/ffwizard.po
deleted file mode 100644
index 61a2324e2e..0000000000
--- a/po/sv/ffwizard.po
+++ /dev/null
@@ -1,166 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2014-04-28 02:56+0200\n"
-"Last-Translator: Umeaboy <kristoffer.grundstrom1983@gmail.com>\n"
-"Language-Team: none\n"
-"Language: sv\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.6\n"
-
-msgid "Allow to transfer anonymous statistics about this node"
-msgstr "Tillåt att överföra anonym statistik om denna nod"
-
-msgid "Channel"
-msgstr "Kanal"
-
-msgid "Check this to protect your LAN from other nodes or clients"
-msgstr ""
-"Bocka för det här för att skydda ditt LAN från andra noder eller klienter"
-
-msgid "Configure network"
-msgstr "Konfigurera nätverk"
-
-msgid "Connect your node with other nodes with a tunnel via the internet."
-msgstr "Anslut din nod med andra noder med en tunnel via internet."
-
-msgid "DHCP IP range"
-msgstr "IP-avstånd för DHCP"
-
-msgid "DHCP will automatically assign ip addresses to clients"
-msgstr "DHCP kommer automatiskt tilldela IP-adresser till klienter"
-
-msgid "DNS Server"
-msgstr "DNS-server"
-
-msgid "Enable DHCP"
-msgstr "Aktivera DNS-servern"
-
-msgid "Gateway"
-msgstr "Gateway"
-
-msgid "Heartbeat"
-msgstr "Hjärtslag"
-
-msgid "IP address"
-msgstr "IP-adress"
-
-msgid "L2gvpn tunnel"
-msgstr ""
-
-msgid "Limit download bandwidth"
-msgstr "Begränsa bandbredd för nerladdning"
-
-msgid "Limit upload bandwidth"
-msgstr "Begränsa bandbredd för uppladdning"
-
-msgid "Mesh IP address"
-msgstr "Maskera IP-adress"
-
-msgid "Mesh IPv6 Address"
-msgstr "Maskera IPv6-adress"
-
-msgid "Netmask"
-msgstr "Nätmask"
-
-msgid "Password"
-msgstr "Lösenord"
-
-msgid "Password confirmation"
-msgstr "Bekräftelse av lösenord"
-
-msgid "Password successfully changed"
-msgstr "Ändring av lösenordet lyckades"
-
-msgid "Protect LAN"
-msgstr "Skydda LAN"
-
-msgid "Protocol"
-msgstr "Protokoll"
-
-msgid "Select this checkbox to configure your network interfaces."
-msgstr "Markera den här kryssrutan för att konfigurera dina nätverksgränssnitt."
-
-msgid ""
-"Select this to allow others to use your connection to access the internet."
-msgstr ""
-"Välj det här för att tillåta andra att använda din anslutning för att få "
-"tillgång till internet."
-
-msgid "Share your internet connection"
-msgstr "Dela din internet-anslutning"
-
-msgid ""
-"The IP range from which clients are assigned ip addresses (e.g. "
-"10.1.2.1/28). If this is a range inside your mesh network range, then it "
-"will be announced as HNA. Any other range will use NAT. If left empty then "
-"the defaults from the community profile will be used."
-msgstr ""
-
-#, fuzzy
-msgid "The ipv6 address is calculated auomatically."
-msgstr "IPv6-adressen beräknas automatiskt."
-
-msgid "The protocol to use for internet connectivity."
-msgstr "Protokollet som ska användas för anslutbarhet till internet."
-
-msgid ""
-"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
-"registered at your local community."
-msgstr ""
-
-msgid "This will setup a new virtual wireless interface in Access Point mode."
-msgstr ""
-
-msgid ""
-"This wizard will assist you in setting up your router for Freifunk or "
-"another similar wireless community network."
-msgstr ""
-
-msgid "Unknown Error"
-msgstr "Okänt fel"
-
-msgid "Username"
-msgstr "Användarnamn"
-
-msgid "Virtual Access Point (VAP)"
-msgstr ""
-
-msgid "Wizard"
-msgstr "Guide"
-
-msgid "Your device and neighbouring nodes have to use the same channel."
-msgstr "Din enhet och grannarnas noder måste använda samma kanal."
-
-msgid "dhcp"
-msgstr "dhcp"
-
-msgid "kbit/s"
-msgstr "kbit/s"
-
-msgid "static"
-msgstr "statisk"
-
-msgid "Configure this interface."
-msgstr "Konfigurera det här gränssnittet"
-
-msgid "recommended"
-msgstr "rekommenderas"
-
-msgid "Basic settings"
-msgstr "Standardinställningar"
-
-msgid "Basic settings are incomplete. Please go to"
-msgstr "Standardinställningarna är inte kompletta. Vänligen gå till"
-
-msgid "Error"
-msgstr "Fel"
-
-msgid "You can not use the wizard because some necessary values are missing."
-msgstr "Du kan inte använda guiden för att några värden som behövs saknas."
-
-msgid "and fill out all required fields."
-msgstr "och fyll i alla fält som behövs."
diff --git a/po/sv/uvc_streamer.po b/po/sv/uvc_streamer.po
deleted file mode 100644
index f4bd4a01e1..0000000000
--- a/po/sv/uvc_streamer.po
+++ /dev/null
@@ -1,39 +0,0 @@
-#  uvc_streamer.pot
-#  generated from ./applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua
-msgid ""
-msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: sv\n"
-"MIME-Version: 1.0\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#. Frames per second
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:1
-msgid "Frames per second"
-msgstr ""
-
-#. Resolution
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:2
-msgid "Resolution"
-msgstr ""
-
-#. Settings
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:3
-msgid "Settings"
-msgstr ""
-
-#. Webcam streaming
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:4
-msgid "Webcam streaming"
-msgstr ""
-
-#. Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a href=\"http://%s:%i/\">http://%s:%i/</a>
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:5
-msgid ""
-"Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a "
-"href=\"http://%s:%i/\">http://%s:%i/</a>"
-msgstr ""
diff --git a/po/tr/ffwizard.po b/po/tr/ffwizard.po
deleted file mode 100644
index d46f261587..0000000000
--- a/po/tr/ffwizard.po
+++ /dev/null
@@ -1,159 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ASCII\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-
-msgid "Allow to transfer anonymous statistics about this node"
-msgstr ""
-
-msgid "Channel"
-msgstr ""
-
-msgid "Check this to protect your LAN from other nodes or clients"
-msgstr ""
-
-msgid "Configure network"
-msgstr ""
-
-msgid "Connect your node with other nodes with a tunnel via the internet."
-msgstr ""
-
-msgid "DHCP IP range"
-msgstr ""
-
-msgid "DHCP will automatically assign ip addresses to clients"
-msgstr ""
-
-msgid "DNS Server"
-msgstr ""
-
-msgid "Enable DHCP"
-msgstr ""
-
-msgid "Gateway"
-msgstr ""
-
-msgid "Heartbeat"
-msgstr ""
-
-msgid "IP address"
-msgstr ""
-
-msgid "L2gvpn tunnel"
-msgstr ""
-
-msgid "Limit download bandwidth"
-msgstr ""
-
-msgid "Limit upload bandwidth"
-msgstr ""
-
-msgid "Mesh IP address"
-msgstr ""
-
-msgid "Mesh IPv6 Address"
-msgstr ""
-
-msgid "Netmask"
-msgstr ""
-
-msgid "Password"
-msgstr ""
-
-msgid "Password confirmation"
-msgstr ""
-
-msgid "Password successfully changed"
-msgstr ""
-
-msgid "Protect LAN"
-msgstr ""
-
-msgid "Protocol"
-msgstr ""
-
-msgid "Select this checkbox to configure your network interfaces."
-msgstr ""
-
-msgid ""
-"Select this to allow others to use your connection to access the internet."
-msgstr ""
-
-msgid "Share your internet connection"
-msgstr ""
-
-msgid ""
-"The IP range from which clients are assigned ip addresses (e.g. "
-"10.1.2.1/28). If this is a range inside your mesh network range, then it "
-"will be announced as HNA. Any other range will use NAT. If left empty then "
-"the defaults from the community profile will be used."
-msgstr ""
-
-msgid "The ipv6 address is calculated auomatically."
-msgstr ""
-
-msgid "The protocol to use for internet connectivity."
-msgstr ""
-
-msgid ""
-"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
-"registered at your local community."
-msgstr ""
-
-msgid "This will setup a new virtual wireless interface in Access Point mode."
-msgstr ""
-
-msgid ""
-"This wizard will assist you in setting up your router for Freifunk or "
-"another similar wireless community network."
-msgstr ""
-
-msgid "Unknown Error"
-msgstr ""
-
-msgid "Username"
-msgstr ""
-
-msgid "Virtual Access Point (VAP)"
-msgstr ""
-
-msgid "Wizard"
-msgstr ""
-
-msgid "Your device and neighbouring nodes have to use the same channel."
-msgstr ""
-
-msgid "dhcp"
-msgstr ""
-
-msgid "kbit/s"
-msgstr ""
-
-msgid "static"
-msgstr ""
-
-msgid "Configure this interface."
-msgstr ""
-
-msgid "recommended"
-msgstr ""
-
-msgid "Basic settings"
-msgstr ""
-
-msgid "Basic settings are incomplete. Please go to"
-msgstr ""
-
-msgid "Error"
-msgstr ""
-
-msgid "You can not use the wizard because some necessary values are missing."
-msgstr ""
-
-msgid "and fill out all required fields."
-msgstr ""
diff --git a/po/tr/uvc_streamer.po b/po/tr/uvc_streamer.po
deleted file mode 100644
index 54ec5d06d8..0000000000
--- a/po/tr/uvc_streamer.po
+++ /dev/null
@@ -1,45 +0,0 @@
-#  uvc_streamer.pot
-#  generated from ./applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2012-10-11 22:30+0200\n"
-"Last-Translator: vincenzo <tayfun_ozturk@hotmail.com>\n"
-"Language-Team: none\n"
-"Language: tr\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Pootle 2.0.6\n"
-
-#. Frames per second
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:1
-msgid "Frames per second"
-msgstr "Saniyedeki Kare Sayısı"
-
-#. Resolution
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:2
-msgid "Resolution"
-msgstr "Çözünürlük"
-
-#. Settings
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:3
-msgid "Settings"
-msgstr "Ayarlar"
-
-# akışı yayın olarak çevirdim
-#. Webcam streaming
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:4
-msgid "Webcam streaming"
-msgstr "Webcam Yayını"
-
-# Linux-UVC uyumlu web kameranızı yapılandırın.örneği internet tarayıcınıza  <a href="http://%s:%i/">http://%s:%i/</a> yazın.
-#. Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a href=\"http://%s:%i/\">http://%s:%i/</a>
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:5
-msgid ""
-"Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a "
-"href=\"http://%s:%i/\">http://%s:%i/</a>"
-msgstr ""
-"Linux-UVC uyumlu web kameranızı yapılandırın.örneği internet tarayıcınıza  "
-"<a href=\"http://%s:%i/\">http://%s:%i/</a> yazın."
diff --git a/po/uk/ffwizard.po b/po/uk/ffwizard.po
deleted file mode 100644
index c5455efefa..0000000000
--- a/po/uk/ffwizard.po
+++ /dev/null
@@ -1,163 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2013-05-26 18:16+0200\n"
-"Last-Translator: Yurii <yuripet@gmail.com>\n"
-"Language-Team: none\n"
-"Language: uk\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Pootle 2.0.6\n"
-
-msgid "Allow to transfer anonymous statistics about this node"
-msgstr ""
-
-msgid "Channel"
-msgstr ""
-
-msgid "Check this to protect your LAN from other nodes or clients"
-msgstr ""
-
-msgid "Configure network"
-msgstr "Настроювання мережі"
-
-msgid "Connect your node with other nodes with a tunnel via the internet."
-msgstr ""
-
-msgid "DHCP IP range"
-msgstr ""
-
-msgid "DHCP will automatically assign ip addresses to clients"
-msgstr ""
-
-msgid "DNS Server"
-msgstr ""
-
-msgid "Enable DHCP"
-msgstr ""
-
-msgid "Gateway"
-msgstr ""
-
-msgid "Heartbeat"
-msgstr ""
-
-msgid "IP address"
-msgstr ""
-
-msgid "L2gvpn tunnel"
-msgstr ""
-
-msgid "Limit download bandwidth"
-msgstr ""
-
-msgid "Limit upload bandwidth"
-msgstr ""
-
-msgid "Mesh IP address"
-msgstr ""
-
-msgid "Mesh IPv6 Address"
-msgstr ""
-
-msgid "Netmask"
-msgstr ""
-
-msgid "Password"
-msgstr "Пароль"
-
-msgid "Password confirmation"
-msgstr "Підтвердження пароля"
-
-msgid "Password successfully changed"
-msgstr "Пароль успішно змінено"
-
-msgid "Protect LAN"
-msgstr "Захистити LAN"
-
-msgid "Protocol"
-msgstr "Протокол"
-
-msgid "Select this checkbox to configure your network interfaces."
-msgstr ""
-
-msgid ""
-"Select this to allow others to use your connection to access the internet."
-msgstr ""
-
-msgid "Share your internet connection"
-msgstr ""
-
-msgid ""
-"The IP range from which clients are assigned ip addresses (e.g. "
-"10.1.2.1/28). If this is a range inside your mesh network range, then it "
-"will be announced as HNA. Any other range will use NAT. If left empty then "
-"the defaults from the community profile will be used."
-msgstr ""
-
-msgid "The ipv6 address is calculated auomatically."
-msgstr ""
-
-msgid "The protocol to use for internet connectivity."
-msgstr ""
-
-msgid ""
-"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
-"registered at your local community."
-msgstr ""
-
-msgid "This will setup a new virtual wireless interface in Access Point mode."
-msgstr ""
-
-msgid ""
-"This wizard will assist you in setting up your router for Freifunk or "
-"another similar wireless community network."
-msgstr ""
-
-msgid "Unknown Error"
-msgstr "Невідома помилка"
-
-msgid "Username"
-msgstr "Ім'я користувача"
-
-msgid "Virtual Access Point (VAP)"
-msgstr "Віртуальна точка доступу (VAP)"
-
-msgid "Wizard"
-msgstr ""
-
-msgid "Your device and neighbouring nodes have to use the same channel."
-msgstr "Ваш пристрій і сусідні вузли мають використовувати один і той же канал."
-
-msgid "dhcp"
-msgstr "DHCP"
-
-msgid "kbit/s"
-msgstr "Кбіт/с"
-
-msgid "static"
-msgstr "статична"
-
-msgid "Configure this interface."
-msgstr "Сконфігурувати цей інтерфейс."
-
-msgid "recommended"
-msgstr "рекомендовано"
-
-msgid "Basic settings"
-msgstr "Основні параметри"
-
-msgid "Basic settings are incomplete. Please go to"
-msgstr "Основні параметри є неповними. Перейдіть до"
-
-msgid "Error"
-msgstr "Помилка"
-
-msgid "You can not use the wizard because some necessary values are missing."
-msgstr ""
-
-msgid "and fill out all required fields."
-msgstr ""
diff --git a/po/uk/uvc_streamer.po b/po/uk/uvc_streamer.po
deleted file mode 100644
index 8ec7980736..0000000000
--- a/po/uk/uvc_streamer.po
+++ /dev/null
@@ -1,44 +0,0 @@
-#  uvc_streamer.pot
-#  generated from ./applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2013-05-26 18:54+0200\n"
-"Last-Translator: Yurii <yuripet@gmail.com>\n"
-"Language-Team: none\n"
-"Language: uk\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Pootle 2.0.6\n"
-
-#. Frames per second
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:1
-msgid "Frames per second"
-msgstr "Кадрів на секунду"
-
-#. Resolution
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:2
-msgid "Resolution"
-msgstr "Роздільна здатність"
-
-#. Settings
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:3
-msgid "Settings"
-msgstr "Настройки"
-
-#. Webcam streaming
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:4
-msgid "Webcam streaming"
-msgstr "Транслювання з веб-камери"
-
-#. Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a href=\"http://%s:%i/\">http://%s:%i/</a>
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:5
-msgid ""
-"Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a "
-"href=\"http://%s:%i/\">http://%s:%i/</a>"
-msgstr ""
-"Настройте вашу Linux-UVC сумісну веб-камеру. Введіть у вашому браузері, "
-"наприклад, <a href=\"http://%s:%i/\">http://%s:%i/</a>"
diff --git a/po/vi/ffwizard.po b/po/vi/ffwizard.po
deleted file mode 100644
index 408745d22d..0000000000
--- a/po/vi/ffwizard.po
+++ /dev/null
@@ -1,159 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-
-msgid "Allow to transfer anonymous statistics about this node"
-msgstr ""
-
-msgid "Channel"
-msgstr ""
-
-msgid "Check this to protect your LAN from other nodes or clients"
-msgstr ""
-
-msgid "Configure network"
-msgstr ""
-
-msgid "Connect your node with other nodes with a tunnel via the internet."
-msgstr ""
-
-msgid "DHCP IP range"
-msgstr ""
-
-msgid "DHCP will automatically assign ip addresses to clients"
-msgstr ""
-
-msgid "DNS Server"
-msgstr ""
-
-msgid "Enable DHCP"
-msgstr ""
-
-msgid "Gateway"
-msgstr ""
-
-msgid "Heartbeat"
-msgstr ""
-
-msgid "IP address"
-msgstr ""
-
-msgid "L2gvpn tunnel"
-msgstr ""
-
-msgid "Limit download bandwidth"
-msgstr ""
-
-msgid "Limit upload bandwidth"
-msgstr ""
-
-msgid "Mesh IP address"
-msgstr ""
-
-msgid "Mesh IPv6 Address"
-msgstr ""
-
-msgid "Netmask"
-msgstr ""
-
-msgid "Password"
-msgstr ""
-
-msgid "Password confirmation"
-msgstr ""
-
-msgid "Password successfully changed"
-msgstr ""
-
-msgid "Protect LAN"
-msgstr ""
-
-msgid "Protocol"
-msgstr ""
-
-msgid "Select this checkbox to configure your network interfaces."
-msgstr ""
-
-msgid ""
-"Select this to allow others to use your connection to access the internet."
-msgstr ""
-
-msgid "Share your internet connection"
-msgstr ""
-
-msgid ""
-"The IP range from which clients are assigned ip addresses (e.g. "
-"10.1.2.1/28). If this is a range inside your mesh network range, then it "
-"will be announced as HNA. Any other range will use NAT. If left empty then "
-"the defaults from the community profile will be used."
-msgstr ""
-
-msgid "The ipv6 address is calculated auomatically."
-msgstr ""
-
-msgid "The protocol to use for internet connectivity."
-msgstr ""
-
-msgid ""
-"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
-"registered at your local community."
-msgstr ""
-
-msgid "This will setup a new virtual wireless interface in Access Point mode."
-msgstr ""
-
-msgid ""
-"This wizard will assist you in setting up your router for Freifunk or "
-"another similar wireless community network."
-msgstr ""
-
-msgid "Unknown Error"
-msgstr ""
-
-msgid "Username"
-msgstr ""
-
-msgid "Virtual Access Point (VAP)"
-msgstr ""
-
-msgid "Wizard"
-msgstr ""
-
-msgid "Your device and neighbouring nodes have to use the same channel."
-msgstr ""
-
-msgid "dhcp"
-msgstr ""
-
-msgid "kbit/s"
-msgstr ""
-
-msgid "static"
-msgstr ""
-
-msgid "Configure this interface."
-msgstr ""
-
-msgid "recommended"
-msgstr ""
-
-msgid "Basic settings"
-msgstr ""
-
-msgid "Basic settings are incomplete. Please go to"
-msgstr ""
-
-msgid "Error"
-msgstr ""
-
-msgid "You can not use the wizard because some necessary values are missing."
-msgstr ""
-
-msgid "and fill out all required fields."
-msgstr ""
diff --git a/po/vi/uvc_streamer.po b/po/vi/uvc_streamer.po
deleted file mode 100644
index c38d323577..0000000000
--- a/po/vi/uvc_streamer.po
+++ /dev/null
@@ -1,38 +0,0 @@
-#  uvc_streamer.pot
-#  generated from ./applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-
-#. Frames per second
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:1
-msgid "Frames per second"
-msgstr ""
-
-#. Resolution
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:2
-msgid "Resolution"
-msgstr ""
-
-#. Settings
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:3
-msgid "Settings"
-msgstr ""
-
-#. Webcam streaming
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:4
-msgid "Webcam streaming"
-msgstr ""
-
-#. Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a href=\"http://%s:%i/\">http://%s:%i/</a>
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:5
-msgid ""
-"Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a "
-"href=\"http://%s:%i/\">http://%s:%i/</a>"
-msgstr ""
diff --git a/po/zh_CN/ffwizard.po b/po/zh_CN/ffwizard.po
deleted file mode 100644
index c704013bee..0000000000
--- a/po/zh_CN/ffwizard.po
+++ /dev/null
@@ -1,166 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2014-01-02 13:09+0200\n"
-"Last-Translator: Jonir <peterpuyi@live.cn>\n"
-"Language-Team: none\n"
-"Language: zh_CN\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Pootle 2.0.6\n"
-
-msgid "Allow to transfer anonymous statistics about this node"
-msgstr "允许传输这个节点的匿名统计资料"
-
-msgid "Channel"
-msgstr "通道"
-
-# “访问”是擅自加的，以使语句通顺。
-msgid "Check this to protect your LAN from other nodes or clients"
-msgstr "勾选此项，以阻止其他节点或客户端的访问"
-
-msgid "Configure network"
-msgstr "配置网络"
-
-msgid "Connect your node with other nodes with a tunnel via the internet."
-msgstr "从internet上其他节点通过隧道连接到你的节点"
-
-msgid "DHCP IP range"
-msgstr "DHCP IP地址区间"
-
-msgid "DHCP will automatically assign ip addresses to clients"
-msgstr "DHCP自动分配IP地址给客户端"
-
-msgid "DNS Server"
-msgstr "DNS服务"
-
-msgid "Enable DHCP"
-msgstr "启动DHCP"
-
-msgid "Gateway"
-msgstr "网关"
-
-msgid "Heartbeat"
-msgstr "心跳"
-
-msgid "IP address"
-msgstr "IP地址"
-
-msgid "L2gvpn tunnel"
-msgstr "L2gvpn 隧道"
-
-msgid "Limit download bandwidth"
-msgstr "限制下载带宽"
-
-msgid "Limit upload bandwidth"
-msgstr "限制上传带宽"
-
-msgid "Mesh IP address"
-msgstr "Mesh IP地址"
-
-msgid "Mesh IPv6 Address"
-msgstr "Mesh IPv6地址"
-
-msgid "Netmask"
-msgstr "网络掩码"
-
-msgid "Password"
-msgstr "密码"
-
-msgid "Password confirmation"
-msgstr "密码确认"
-
-msgid "Password successfully changed"
-msgstr "密码修改成功"
-
-msgid "Protect LAN"
-msgstr "局域网保护"
-
-msgid "Protocol"
-msgstr "协议"
-
-msgid "Select this checkbox to configure your network interfaces."
-msgstr "选取此勾选框以配置你的网络接口"
-
-msgid ""
-"Select this to allow others to use your connection to access the internet."
-msgstr "选择这个选项以允许他人通过你的连接来接入互联网"
-
-msgid "Share your internet connection"
-msgstr "共享你的互联网连接"
-
-# 抛砖引玉，求修正。
-msgid ""
-"The IP range from which clients are assigned ip addresses (e.g. "
-"10.1.2.1/28). If this is a range inside your mesh network range, then it "
-"will be announced as HNA. Any other range will use NAT. If left empty then "
-"the defaults from the community profile will be used."
-msgstr "客户端从IP地址区间中分配地址。如果这个区间是网格网区间的子区间，他将被声明为HNA。其他子区间则使用NAT。如果它置空，默认将采用社区档案。"
-
-msgid "The ipv6 address is calculated auomatically."
-msgstr "自动计算IPv6地址"
-
-msgid "The protocol to use for internet connectivity."
-msgstr "用于互联网连接的协议"
-
-msgid ""
-"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
-"registered at your local community."
-msgstr "这是网格中的唯一地址，必须注册到你的本地社区。"
-
-msgid "This will setup a new virtual wireless interface in Access Point mode."
-msgstr "在AP模式下，这将新建一个虚拟无线接口"
-
-msgid ""
-"This wizard will assist you in setting up your router for Freifunk or "
-"another similar wireless community network."
-msgstr "本向导将帮你针对Freifunk或者其他类似的无线社区网络来配置你的路由器"
-
-msgid "Unknown Error"
-msgstr "未知错误"
-
-msgid "Username"
-msgstr "用户名"
-
-msgid "Virtual Access Point (VAP)"
-msgstr "虚拟接入点(VAP)"
-
-msgid "Wizard"
-msgstr "向导"
-
-# neighbouring nodes不知道怎么翻译最好，请指教
-msgid "Your device and neighbouring nodes have to use the same channel."
-msgstr "你的设备必须与邻接节点使用相同的信道。"
-
-# 术语，不译
-msgid "dhcp"
-msgstr "DHCP"
-
-msgid "kbit/s"
-msgstr "千比特/秒"
-
-msgid "static"
-msgstr "静态"
-
-msgid "Configure this interface."
-msgstr "配置此接口"
-
-msgid "recommended"
-msgstr "建议"
-
-msgid "Basic settings"
-msgstr "基本设置"
-
-msgid "Basic settings are incomplete. Please go to"
-msgstr "基本不完整，请到"
-
-msgid "Error"
-msgstr "错误"
-
-msgid "You can not use the wizard because some necessary values are missing."
-msgstr "你无法使用向导，因为缺失一些必要参数"
-
-msgid "and fill out all required fields."
-msgstr "填写所有要求的字段"
diff --git a/po/zh_CN/uvc_streamer.po b/po/zh_CN/uvc_streamer.po
deleted file mode 100644
index f6745ad9a6..0000000000
--- a/po/zh_CN/uvc_streamer.po
+++ /dev/null
@@ -1,41 +0,0 @@
-#  uvc_streamer.pot
-#  generated from ./applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2013-10-10 05:44+0200\n"
-"Last-Translator: Tanyingyu <Tanyingyu@163.com>\n"
-"Language-Team: none\n"
-"Language: zh_CN\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Pootle 2.0.6\n"
-
-#. Frames per second
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:1
-msgid "Frames per second"
-msgstr "FPS"
-
-#. Resolution
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:2
-msgid "Resolution"
-msgstr "分辨率"
-
-#. Settings
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:3
-msgid "Settings"
-msgstr "设置"
-
-#. Webcam streaming
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:4
-msgid "Webcam streaming"
-msgstr "网络相机流"
-
-#. Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a href=\"http://%s:%i/\">http://%s:%i/</a>
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:5
-msgid ""
-"Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a "
-"href=\"http://%s:%i/\">http://%s:%i/</a>"
-msgstr "配置兼容的网络相机。用浏览器访问<a href=\"http://%s:%i/\">http://%s:%i/</a>"
diff --git a/po/zh_TW/ffwizard.po b/po/zh_TW/ffwizard.po
deleted file mode 100644
index a009601d52..0000000000
--- a/po/zh_TW/ffwizard.po
+++ /dev/null
@@ -1,164 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2014-05-14 22:37+0200\n"
-"Last-Translator: omnistack <omnistack@gmail.com>\n"
-"Language-Team: none\n"
-"Language: zh_TW\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Pootle 2.0.6\n"
-
-msgid "Allow to transfer anonymous statistics about this node"
-msgstr "允許匿名傳輸關於這個結點的狀況"
-
-msgid "Channel"
-msgstr "頻道"
-
-msgid "Check this to protect your LAN from other nodes or clients"
-msgstr "檢查這個以便保護來自其它結點或用戶端的區域網路"
-
-msgid "Configure network"
-msgstr "網路設定"
-
-msgid "Connect your node with other nodes with a tunnel via the internet."
-msgstr "透過公眾網路用通道連結你的結點到另一個結點"
-
-msgid "DHCP IP range"
-msgstr "DHCP IP分配範圍"
-
-msgid "DHCP will automatically assign ip addresses to clients"
-msgstr "DHCP將會自動指定ip位址給客戶端"
-
-msgid "DNS Server"
-msgstr "DNS伺服器"
-
-msgid "Enable DHCP"
-msgstr "啟用DHCP"
-
-msgid "Gateway"
-msgstr "匝道器"
-
-msgid "Heartbeat"
-msgstr "心跳"
-
-msgid "IP address"
-msgstr "IP位址"
-
-msgid "L2gvpn tunnel"
-msgstr "L2gvpn通道"
-
-msgid "Limit download bandwidth"
-msgstr "限制下載頻寬"
-
-msgid "Limit upload bandwidth"
-msgstr "限制上傳頻寬"
-
-msgid "Mesh IP address"
-msgstr "Mesh任意網基站IP位址"
-
-msgid "Mesh IPv6 Address"
-msgstr "Mesh任意網基站IPv6位址"
-
-msgid "Netmask"
-msgstr "子網路遮罩"
-
-msgid "Password"
-msgstr "密碼"
-
-msgid "Password confirmation"
-msgstr "密碼再確認"
-
-msgid "Password successfully changed"
-msgstr "密碼變更成功"
-
-msgid "Protect LAN"
-msgstr "受保護的網路"
-
-msgid "Protocol"
-msgstr "協定"
-
-msgid "Select this checkbox to configure your network interfaces."
-msgstr "勾選檢查框以便設定你的網路介面"
-
-msgid ""
-"Select this to allow others to use your connection to access the internet."
-msgstr "選到這個以便允許其他人可使用你的連線去存取Internet公眾網路"
-
-msgid "Share your internet connection"
-msgstr "分享你的Internet公眾網路連線"
-
-msgid ""
-"The IP range from which clients are assigned ip addresses (e.g. "
-"10.1.2.1/28). If this is a range inside your mesh network range, then it "
-"will be announced as HNA. Any other range will use NAT. If left empty then "
-"the defaults from the community profile will be used."
-msgstr ""
-"這個IP的範圍從某個客戶端被指定的IP位址開始(e.g 10.1.2.1/28).假若這是在一個網狀網絡範圍中的某個範圍,然後他將會被公告當HNA. "
-"任何其他範圍者將使用NAT.假如留空白,那群預設設定值將會被使用"
-
-msgid "The ipv6 address is calculated auomatically."
-msgstr "ipv6位只會被自動計算出"
-
-msgid "The protocol to use for internet connectivity."
-msgstr "這個協定是用在Intenet網路連線用"
-
-msgid ""
-"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
-"registered at your local community."
-msgstr "這是獨一無二的位址在網路中 (e.g 10.1.1.1) 並且已經備註冊到你本地社群中"
-
-msgid "This will setup a new virtual wireless interface in Access Point mode."
-msgstr "這將會設定一個新的虛擬無線網路介面在AP模式"
-
-msgid ""
-"This wizard will assist you in setting up your router for Freifunk or "
-"another similar wireless community network."
-msgstr "這個精靈將會引導你去設置你的路由器給Freifunk或者其他類似的無線社群網組"
-
-msgid "Unknown Error"
-msgstr "未知錯誤"
-
-msgid "Username"
-msgstr "使用者名稱"
-
-msgid "Virtual Access Point (VAP)"
-msgstr "虛擬AP存取點(VAP)"
-
-msgid "Wizard"
-msgstr "精靈"
-
-msgid "Your device and neighbouring nodes have to use the same channel."
-msgstr "你的設備和網路芳鄰結點必須使用相同的通道."
-
-msgid "dhcp"
-msgstr "dhcp"
-
-msgid "kbit/s"
-msgstr "kbit/s"
-
-msgid "static"
-msgstr "靜態"
-
-msgid "Configure this interface."
-msgstr "設定這個介面"
-
-msgid "recommended"
-msgstr "建議值"
-
-msgid "Basic settings"
-msgstr "基本設定"
-
-msgid "Basic settings are incomplete. Please go to"
-msgstr "基本設定值不完全. 請過去設好"
-
-msgid "Error"
-msgstr "錯誤"
-
-msgid "You can not use the wizard because some necessary values are missing."
-msgstr "你將無法使用這個精靈因為某些必要的數值已經遺失."
-
-msgid "and fill out all required fields."
-msgstr "並且填滿所有必須的欄位"
diff --git a/po/zh_TW/uvc_streamer.po b/po/zh_TW/uvc_streamer.po
deleted file mode 100644
index 93473efa98..0000000000
--- a/po/zh_TW/uvc_streamer.po
+++ /dev/null
@@ -1,42 +0,0 @@
-#  uvc_streamer.pot
-#  generated from ./applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2014-05-21 10:42+0200\n"
-"Last-Translator: omnistack <omnistack@gmail.com>\n"
-"Language-Team: none\n"
-"Language: zh_TW\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Pootle 2.0.6\n"
-
-#. Frames per second
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:1
-msgid "Frames per second"
-msgstr "每秒顯示幀數"
-
-#. Resolution
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:2
-msgid "Resolution"
-msgstr "解析度"
-
-#. Settings
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:3
-msgid "Settings"
-msgstr "設定值"
-
-#. Webcam streaming
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:4
-msgid "Webcam streaming"
-msgstr "Webcam 網路攝影機串流"
-
-#. Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a href=\"http://%s:%i/\">http://%s:%i/</a>
-#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:5
-msgid ""
-"Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a "
-"href=\"http://%s:%i/\">http://%s:%i/</a>"
-msgstr ""
-"設定你的Linux-UVC相容的網路攝影機.將瀏覽器指向例如<a href=\"http://%s:%i/\">http://％S：％I /</ A> "
diff --git a/protocols/3g/Makefile b/protocols/3g/Makefile
deleted file mode 100644
index f7fac7740e..0000000000
--- a/protocols/3g/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-include ../../build/config.mk
-include ../../build/module.mk
diff --git a/protocols/ipv6/Makefile b/protocols/ipv6/Makefile
deleted file mode 100644
index f7fac7740e..0000000000
--- a/protocols/ipv6/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-include ../../build/config.mk
-include ../../build/module.mk
diff --git a/protocols/luci-proto-3g/Makefile b/protocols/luci-proto-3g/Makefile
new file mode 100644
index 0000000000..d1d5455dc8
--- /dev/null
+++ b/protocols/luci-proto-3g/Makefile
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=Support for 3G
+LUCI_DEPENDS:=+comgt
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/protocols/3g/luasrc/model/cbi/admin_network/proto_3g.lua b/protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua
index 9c1a762827..9c1a762827 100644
--- a/protocols/3g/luasrc/model/cbi/admin_network/proto_3g.lua
+++ b/protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua
diff --git a/protocols/luci-proto-ipv6/Makefile b/protocols/luci-proto-ipv6/Makefile
new file mode 100644
index 0000000000..f0ca605f84
--- /dev/null
+++ b/protocols/luci-proto-ipv6/Makefile
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=Support for DHCPv6/6in4/6to4/6rd/DS-Lite
+LUCI_DEPENDS:=
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/protocols/ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua b/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua
index 9b668cdda8..9b668cdda8 100644
--- a/protocols/ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua
+++ b/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua
diff --git a/protocols/ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua b/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua
index 3835561dd7..3835561dd7 100644
--- a/protocols/ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua
+++ b/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua
diff --git a/protocols/ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua b/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua
index c0cb95b2ba..c0cb95b2ba 100644
--- a/protocols/ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua
+++ b/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua
diff --git a/protocols/ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua b/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua
index 51f17878d7..51f17878d7 100644
--- a/protocols/ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua
+++ b/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua
diff --git a/protocols/ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua b/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua
index 2d9e258c32..2d9e258c32 100644
--- a/protocols/ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua
+++ b/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua
diff --git a/protocols/ipv6/luasrc/model/cbi/admin_network/proto_hnet.lua b/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_hnet.lua
index 0cf8c01017..0cf8c01017 100644
--- a/protocols/ipv6/luasrc/model/cbi/admin_network/proto_hnet.lua
+++ b/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_hnet.lua
diff --git a/protocols/ipv6/luasrc/model/network/proto_4x6.lua b/protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua
index 91adfa944f..91adfa944f 100644
--- a/protocols/ipv6/luasrc/model/network/proto_4x6.lua
+++ b/protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua
diff --git a/protocols/ipv6/luasrc/model/network/proto_6x4.lua b/protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua
index b800b0b540..b800b0b540 100644
--- a/protocols/ipv6/luasrc/model/network/proto_6x4.lua
+++ b/protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua
diff --git a/protocols/ipv6/luasrc/model/network/proto_dhcpv6.lua b/protocols/luci-proto-ipv6/luasrc/model/network/proto_dhcpv6.lua
index 59463d18a9..59463d18a9 100644
--- a/protocols/ipv6/luasrc/model/network/proto_dhcpv6.lua
+++ b/protocols/luci-proto-ipv6/luasrc/model/network/proto_dhcpv6.lua
diff --git a/protocols/ipv6/luasrc/model/network/proto_hnet.lua b/protocols/luci-proto-ipv6/luasrc/model/network/proto_hnet.lua
index d3e094f20f..d3e094f20f 100644
--- a/protocols/ipv6/luasrc/model/network/proto_hnet.lua
+++ b/protocols/luci-proto-ipv6/luasrc/model/network/proto_hnet.lua
diff --git a/protocols/luci-proto-openconnect/Makefile b/protocols/luci-proto-openconnect/Makefile
new file mode 100644
index 0000000000..31f52749b9
--- /dev/null
+++ b/protocols/luci-proto-openconnect/Makefile
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=Support for OpenConnect VPN
+LUCI_DEPENDS:=+openconnect
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/protocols/openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua b/protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua
index 2e2eacee0a..2e2eacee0a 100644
--- a/protocols/openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua
+++ b/protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua
diff --git a/protocols/openconnect/luasrc/model/network/proto_openconnect.lua b/protocols/luci-proto-openconnect/luasrc/model/network/proto_openconnect.lua
index 26744cde80..26744cde80 100644
--- a/protocols/openconnect/luasrc/model/network/proto_openconnect.lua
+++ b/protocols/luci-proto-openconnect/luasrc/model/network/proto_openconnect.lua
diff --git a/protocols/luci-proto-ppp/Makefile b/protocols/luci-proto-ppp/Makefile
new file mode 100644
index 0000000000..70db744ea6
--- /dev/null
+++ b/protocols/luci-proto-ppp/Makefile
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=Support for PPP/PPPoE/PPPoA/PPtP
+LUCI_DEPENDS:=
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/protocols/ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua b/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua
index c1dd56e126..c1dd56e126 100644
--- a/protocols/ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua
+++ b/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua
diff --git a/protocols/ppp/luasrc/model/cbi/admin_network/proto_ppp.lua b/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua
index 659e733a79..659e733a79 100644
--- a/protocols/ppp/luasrc/model/cbi/admin_network/proto_ppp.lua
+++ b/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua
diff --git a/protocols/ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua b/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua
index c32e2828d7..c32e2828d7 100644
--- a/protocols/ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua
+++ b/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua
diff --git a/protocols/ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua b/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua
index ec258a5282..ec258a5282 100644
--- a/protocols/ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua
+++ b/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua
diff --git a/protocols/ppp/luasrc/model/cbi/admin_network/proto_pptp.lua b/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua
index ea9858e7de..ea9858e7de 100644
--- a/protocols/ppp/luasrc/model/cbi/admin_network/proto_pptp.lua
+++ b/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua
diff --git a/protocols/ppp/luasrc/model/network/proto_ppp.lua b/protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua
index dfd545f353..dfd545f353 100644
--- a/protocols/ppp/luasrc/model/network/proto_ppp.lua
+++ b/protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua
diff --git a/protocols/luci-proto-relay/Makefile b/protocols/luci-proto-relay/Makefile
new file mode 100644
index 0000000000..d9c04f76a8
--- /dev/null
+++ b/protocols/luci-proto-relay/Makefile
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=Support for relayd pseudo bridges
+LUCI_DEPENDS:=+relayd
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/protocols/relay/luasrc/model/cbi/admin_network/proto_relay.lua b/protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua
index 017bb9bfa6..017bb9bfa6 100644
--- a/protocols/relay/luasrc/model/cbi/admin_network/proto_relay.lua
+++ b/protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua
diff --git a/protocols/relay/luasrc/model/network/proto_relay.lua b/protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua
index 42bd1f846a..42bd1f846a 100644
--- a/protocols/relay/luasrc/model/network/proto_relay.lua
+++ b/protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua
diff --git a/protocols/openconnect/Makefile b/protocols/openconnect/Makefile
deleted file mode 100644
index f7fac7740e..0000000000
--- a/protocols/openconnect/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-include ../../build/config.mk
-include ../../build/module.mk
diff --git a/protocols/ppp/Makefile b/protocols/ppp/Makefile
deleted file mode 100644
index f7fac7740e..0000000000
--- a/protocols/ppp/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-include ../../build/config.mk
-include ../../build/module.mk
diff --git a/protocols/relay/Makefile b/protocols/relay/Makefile
deleted file mode 100644
index f7fac7740e..0000000000
--- a/protocols/relay/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-include ../../build/config.mk
-include ../../build/module.mk
diff --git a/themes/bootstrap/Makefile b/themes/bootstrap/Makefile
deleted file mode 100644
index 81a96f6a83..0000000000
--- a/themes/bootstrap/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-include ../../build/config.mk
-include ../../build/module.mk
\ No newline at end of file
diff --git a/themes/freifunk-bno/Makefile b/themes/freifunk-bno/Makefile
deleted file mode 100644
index 81a96f6a83..0000000000
--- a/themes/freifunk-bno/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-include ../../build/config.mk
-include ../../build/module.mk
\ No newline at end of file
diff --git a/themes/freifunk-generic/Makefile b/themes/freifunk-generic/Makefile
deleted file mode 100644
index f7fac7740e..0000000000
--- a/themes/freifunk-generic/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-include ../../build/config.mk
-include ../../build/module.mk
diff --git a/themes/luci-theme-bootstrap/Makefile b/themes/luci-theme-bootstrap/Makefile
new file mode 100644
index 0000000000..c4e684ed18
--- /dev/null
+++ b/themes/luci-theme-bootstrap/Makefile
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=Bootstrap Theme (default)
+LUCI_DEPENDS:=
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/themes/bootstrap/htdocs/luci-static/bootstrap/cascade.css b/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/cascade.css
index 9b5ee3a804..9b5ee3a804 100644
--- a/themes/bootstrap/htdocs/luci-static/bootstrap/cascade.css
+++ b/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/cascade.css
diff --git a/themes/bootstrap/htdocs/luci-static/bootstrap/favicon.ico b/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/favicon.ico
index 77a138ba0c..77a138ba0c 100644
--- a/themes/bootstrap/htdocs/luci-static/bootstrap/favicon.ico
+++ b/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/favicon.ico
diff --git a/themes/bootstrap/htdocs/luci-static/bootstrap/html5.js b/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/html5.js
index 1ec510f2a4..1ec510f2a4 100644
--- a/themes/bootstrap/htdocs/luci-static/bootstrap/html5.js
+++ b/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/html5.js
diff --git a/themes/bootstrap/htdocs/luci-static/bootstrap/mobile.css b/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/mobile.css
index e9d9b61aa2..e9d9b61aa2 100644
--- a/themes/bootstrap/htdocs/luci-static/bootstrap/mobile.css
+++ b/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/mobile.css
diff --git a/themes/bootstrap/ipkg/postinst b/themes/luci-theme-bootstrap/ipkg/postinst
index 8a2dd18d26..8a2dd18d26 100755
--- a/themes/bootstrap/ipkg/postinst
+++ b/themes/luci-theme-bootstrap/ipkg/postinst
diff --git a/themes/bootstrap/luasrc/view/themes/bootstrap/footer.htm b/themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/footer.htm
index 09b497a101..09b497a101 100644
--- a/themes/bootstrap/luasrc/view/themes/bootstrap/footer.htm
+++ b/themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/footer.htm
diff --git a/themes/bootstrap/luasrc/view/themes/bootstrap/header.htm b/themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm
index 12818cbc5f..12818cbc5f 100644
--- a/themes/bootstrap/luasrc/view/themes/bootstrap/header.htm
+++ b/themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm
diff --git a/themes/bootstrap/root/etc/uci-defaults/luci-theme-bootstrap b/themes/luci-theme-bootstrap/root/etc/uci-defaults/luci-theme-bootstrap
index ddefd3b04f..ddefd3b04f 100755
--- a/themes/bootstrap/root/etc/uci-defaults/luci-theme-bootstrap
+++ b/themes/luci-theme-bootstrap/root/etc/uci-defaults/luci-theme-bootstrap
diff --git a/themes/luci-theme-freifunk-bno/Makefile b/themes/luci-theme-freifunk-bno/Makefile
new file mode 100644
index 0000000000..1491a97746
--- /dev/null
+++ b/themes/luci-theme-freifunk-bno/Makefile
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=Freifunk Berlin Nordost Theme
+LUCI_DEPENDS:=
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/cascade.css b/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/cascade.css
index 4f89b2d3af..4f89b2d3af 100644
--- a/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/cascade.css
+++ b/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/cascade.css
diff --git a/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/bgoption.png b/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/bgoption.png
index 6fd1e2f347..6fd1e2f347 100644
--- a/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/bgoption.png
+++ b/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/bgoption.png
diff --git a/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/favicon.ico b/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/favicon.ico
index 7247cfac5f..7247cfac5f 100644
--- a/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/favicon.ico
+++ b/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/favicon.ico
diff --git a/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/header-back.gif b/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/header-back.gif
index 21fe02b1e9..21fe02b1e9 100644
--- a/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/header-back.gif
+++ b/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/header-back.gif
diff --git a/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/header-left.gif b/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/header-left.gif
index a3258ccb6d..a3258ccb6d 100644
--- a/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/header-left.gif
+++ b/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/header-left.gif
diff --git a/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/header-right.gif b/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/header-right.gif
index 93d0291a21..93d0291a21 100644
--- a/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/header-right.gif
+++ b/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/header-right.gif
diff --git a/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/logo.gif b/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/logo.gif
index ff00d6ddb8..ff00d6ddb8 100644
--- a/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/logo.gif
+++ b/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/logo.gif
diff --git a/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/main-back.png b/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/main-back.png
index 34aca44e01..34aca44e01 100644
--- a/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/main-back.png
+++ b/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/main-back.png
diff --git a/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/schriftzug.gif b/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/schriftzug.gif
index 82607d533f..82607d533f 100644
--- a/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/schriftzug.gif
+++ b/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/schriftzug.gif
diff --git a/themes/freifunk-bno/ipkg/postinst b/themes/luci-theme-freifunk-bno/ipkg/postinst
index 5972881a89..5972881a89 100755
--- a/themes/freifunk-bno/ipkg/postinst
+++ b/themes/luci-theme-freifunk-bno/ipkg/postinst
diff --git a/themes/freifunk-bno/luasrc/view/themes/freifunk-bno/footer.htm b/themes/luci-theme-freifunk-bno/luasrc/view/themes/freifunk-bno/footer.htm
index 21d1ca68a3..21d1ca68a3 100644
--- a/themes/freifunk-bno/luasrc/view/themes/freifunk-bno/footer.htm
+++ b/themes/luci-theme-freifunk-bno/luasrc/view/themes/freifunk-bno/footer.htm
diff --git a/themes/freifunk-bno/luasrc/view/themes/freifunk-bno/header.htm b/themes/luci-theme-freifunk-bno/luasrc/view/themes/freifunk-bno/header.htm
index 5099d186fe..5099d186fe 100644
--- a/themes/freifunk-bno/luasrc/view/themes/freifunk-bno/header.htm
+++ b/themes/luci-theme-freifunk-bno/luasrc/view/themes/freifunk-bno/header.htm
diff --git a/themes/freifunk-bno/root/etc/uci-defaults/luci-theme-freifunk-bno b/themes/luci-theme-freifunk-bno/root/etc/uci-defaults/luci-theme-freifunk-bno
index e5fb8a12dc..e5fb8a12dc 100755
--- a/themes/freifunk-bno/root/etc/uci-defaults/luci-theme-freifunk-bno
+++ b/themes/luci-theme-freifunk-bno/root/etc/uci-defaults/luci-theme-freifunk-bno
diff --git a/themes/luci-theme-freifunk-generic/Makefile b/themes/luci-theme-freifunk-generic/Makefile
new file mode 100644
index 0000000000..2fc62fdbca
--- /dev/null
+++ b/themes/luci-theme-freifunk-generic/Makefile
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=Freifunk Generic Theme
+LUCI_DEPENDS:=
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/themes/freifunk-generic/htdocs/luci-static/freifunk-generic/bg.jpg b/themes/luci-theme-freifunk-generic/htdocs/luci-static/freifunk-generic/bg.jpg
index 822527ead8..822527ead8 100644
--- a/themes/freifunk-generic/htdocs/luci-static/freifunk-generic/bg.jpg
+++ b/themes/luci-theme-freifunk-generic/htdocs/luci-static/freifunk-generic/bg.jpg
diff --git a/themes/freifunk-generic/htdocs/luci-static/freifunk-generic/cascade.css b/themes/luci-theme-freifunk-generic/htdocs/luci-static/freifunk-generic/cascade.css
index ed97427c91..ed97427c91 100644
--- a/themes/freifunk-generic/htdocs/luci-static/freifunk-generic/cascade.css
+++ b/themes/luci-theme-freifunk-generic/htdocs/luci-static/freifunk-generic/cascade.css
diff --git a/themes/freifunk-generic/htdocs/luci-static/freifunk-generic/header.jpg b/themes/luci-theme-freifunk-generic/htdocs/luci-static/freifunk-generic/header.jpg
index 2fde5a2125..2fde5a2125 100644
--- a/themes/freifunk-generic/htdocs/luci-static/freifunk-generic/header.jpg
+++ b/themes/luci-theme-freifunk-generic/htdocs/luci-static/freifunk-generic/header.jpg
diff --git a/themes/freifunk-generic/htdocs/luci-static/freifunk-generic/ie7.css b/themes/luci-theme-freifunk-generic/htdocs/luci-static/freifunk-generic/ie7.css
index 67ed9fb816..67ed9fb816 100644
--- a/themes/freifunk-generic/htdocs/luci-static/freifunk-generic/ie7.css
+++ b/themes/luci-theme-freifunk-generic/htdocs/luci-static/freifunk-generic/ie7.css
diff --git a/themes/freifunk-generic/htdocs/luci-static/freifunk-generic/logo.jpg b/themes/luci-theme-freifunk-generic/htdocs/luci-static/freifunk-generic/logo.jpg
index ea06ce77f4..ea06ce77f4 100644
--- a/themes/freifunk-generic/htdocs/luci-static/freifunk-generic/logo.jpg
+++ b/themes/luci-theme-freifunk-generic/htdocs/luci-static/freifunk-generic/logo.jpg
diff --git a/themes/freifunk-generic/htdocs/luci-static/freifunk-generic/mobile.css b/themes/luci-theme-freifunk-generic/htdocs/luci-static/freifunk-generic/mobile.css
index 37d77b4f43..37d77b4f43 100644
--- a/themes/freifunk-generic/htdocs/luci-static/freifunk-generic/mobile.css
+++ b/themes/luci-theme-freifunk-generic/htdocs/luci-static/freifunk-generic/mobile.css
diff --git a/themes/freifunk-generic/htdocs/luci-static/freifunk-generic/smallscreen.css b/themes/luci-theme-freifunk-generic/htdocs/luci-static/freifunk-generic/smallscreen.css
index 660cd8df4d..660cd8df4d 100644
--- a/themes/freifunk-generic/htdocs/luci-static/freifunk-generic/smallscreen.css
+++ b/themes/luci-theme-freifunk-generic/htdocs/luci-static/freifunk-generic/smallscreen.css
diff --git a/themes/freifunk-generic/ipkg/postinst b/themes/luci-theme-freifunk-generic/ipkg/postinst
index 76edf36217..76edf36217 100644
--- a/themes/freifunk-generic/ipkg/postinst
+++ b/themes/luci-theme-freifunk-generic/ipkg/postinst
diff --git a/themes/freifunk-generic/luasrc/view/themes/freifunk-generic/footer.htm b/themes/luci-theme-freifunk-generic/luasrc/view/themes/freifunk-generic/footer.htm
index e9df8cda00..e9df8cda00 100644
--- a/themes/freifunk-generic/luasrc/view/themes/freifunk-generic/footer.htm
+++ b/themes/luci-theme-freifunk-generic/luasrc/view/themes/freifunk-generic/footer.htm
diff --git a/themes/freifunk-generic/luasrc/view/themes/freifunk-generic/header.htm b/themes/luci-theme-freifunk-generic/luasrc/view/themes/freifunk-generic/header.htm
index e8b1c062d1..e8b1c062d1 100644
--- a/themes/freifunk-generic/luasrc/view/themes/freifunk-generic/header.htm
+++ b/themes/luci-theme-freifunk-generic/luasrc/view/themes/freifunk-generic/header.htm
diff --git a/themes/freifunk-generic/root/etc/uci-defaults/luci-theme-freifunk-generic b/themes/luci-theme-freifunk-generic/root/etc/uci-defaults/luci-theme-freifunk-generic
index 131f54e216..131f54e216 100644
--- a/themes/freifunk-generic/root/etc/uci-defaults/luci-theme-freifunk-generic
+++ b/themes/luci-theme-freifunk-generic/root/etc/uci-defaults/luci-theme-freifunk-generic
diff --git a/themes/luci-theme-openwrt/Makefile b/themes/luci-theme-openwrt/Makefile
new file mode 100644
index 0000000000..b873d80727
--- /dev/null
+++ b/themes/luci-theme-openwrt/Makefile
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=LuCI OpenWrt.org theme
+LUCI_DEPENDS:=
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/themes/openwrt/htdocs/luci-static/openwrt.org/cascade.css b/themes/luci-theme-openwrt/htdocs/luci-static/openwrt.org/cascade.css
index 4a6877fa98..4a6877fa98 100644
--- a/themes/openwrt/htdocs/luci-static/openwrt.org/cascade.css
+++ b/themes/luci-theme-openwrt/htdocs/luci-static/openwrt.org/cascade.css
diff --git a/themes/openwrt/htdocs/luci-static/openwrt.org/ie6.css b/themes/luci-theme-openwrt/htdocs/luci-static/openwrt.org/ie6.css
index 14db3f86e5..14db3f86e5 100644
--- a/themes/openwrt/htdocs/luci-static/openwrt.org/ie6.css
+++ b/themes/luci-theme-openwrt/htdocs/luci-static/openwrt.org/ie6.css
diff --git a/themes/openwrt/htdocs/luci-static/openwrt.org/ie7.css b/themes/luci-theme-openwrt/htdocs/luci-static/openwrt.org/ie7.css
index 9e569b28bd..9e569b28bd 100644
--- a/themes/openwrt/htdocs/luci-static/openwrt.org/ie7.css
+++ b/themes/luci-theme-openwrt/htdocs/luci-static/openwrt.org/ie7.css
diff --git a/themes/openwrt/htdocs/luci-static/openwrt.org/ie8.css b/themes/luci-theme-openwrt/htdocs/luci-static/openwrt.org/ie8.css
index 890988c417..890988c417 100644
--- a/themes/openwrt/htdocs/luci-static/openwrt.org/ie8.css
+++ b/themes/luci-theme-openwrt/htdocs/luci-static/openwrt.org/ie8.css
diff --git a/themes/openwrt/htdocs/luci-static/openwrt.org/tabbg.png b/themes/luci-theme-openwrt/htdocs/luci-static/openwrt.org/tabbg.png
index c84c437cda..c84c437cda 100644
--- a/themes/openwrt/htdocs/luci-static/openwrt.org/tabbg.png
+++ b/themes/luci-theme-openwrt/htdocs/luci-static/openwrt.org/tabbg.png
diff --git a/themes/openwrt/ipkg/postinst b/themes/luci-theme-openwrt/ipkg/postinst
index 48ea52273f..48ea52273f 100755
--- a/themes/openwrt/ipkg/postinst
+++ b/themes/luci-theme-openwrt/ipkg/postinst
diff --git a/themes/openwrt/luasrc/view/themes/openwrt.org/footer.htm b/themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/footer.htm
index 5830cb932b..5830cb932b 100644
--- a/themes/openwrt/luasrc/view/themes/openwrt.org/footer.htm
+++ b/themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/footer.htm
diff --git a/themes/openwrt/luasrc/view/themes/openwrt.org/header.htm b/themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm
index 5006723e6a..5006723e6a 100644
--- a/themes/openwrt/luasrc/view/themes/openwrt.org/header.htm
+++ b/themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm
diff --git a/themes/openwrt/root/etc/uci-defaults/luci-theme-openwrt b/themes/luci-theme-openwrt/root/etc/uci-defaults/luci-theme-openwrt
index d8dea0467e..d8dea0467e 100755
--- a/themes/openwrt/root/etc/uci-defaults/luci-theme-openwrt
+++ b/themes/luci-theme-openwrt/root/etc/uci-defaults/luci-theme-openwrt
diff --git a/themes/openwrt/Makefile b/themes/openwrt/Makefile
deleted file mode 100644
index 81a96f6a83..0000000000
--- a/themes/openwrt/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-include ../../build/config.mk
-include ../../build/module.mk
\ No newline at end of file