summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--NOTICE2
-rw-r--r--applications/luci-app-ahcp/luasrc/controller/ahcp.lua2
-rw-r--r--applications/luci-app-ahcp/luasrc/model/cbi/ahcp.lua2
-rw-r--r--applications/luci-app-asterisk/luasrc/asterisk.lua2
-rw-r--r--applications/luci-app-asterisk/luasrc/controller/asterisk.lua2
-rw-r--r--applications/luci-app-asterisk/luasrc/model/cbi/asterisk-dialplans.lua2
-rw-r--r--applications/luci-app-asterisk/luasrc/model/cbi/asterisk-iax-connections.lua2
-rw-r--r--applications/luci-app-asterisk/luasrc/model/cbi/asterisk-meetme.lua2
-rw-r--r--applications/luci-app-asterisk/luasrc/model/cbi/asterisk-mod-cdr.lua2
-rw-r--r--applications/luci-app-asterisk/luasrc/model/cbi/asterisk-mod-chan.lua2
-rw-r--r--applications/luci-app-asterisk/luasrc/model/cbi/asterisk-mod-codec.lua2
-rw-r--r--applications/luci-app-asterisk/luasrc/model/cbi/asterisk-mod-format.lua2
-rw-r--r--applications/luci-app-asterisk/luasrc/model/cbi/asterisk-mod-func.lua2
-rw-r--r--applications/luci-app-asterisk/luasrc/model/cbi/asterisk-mod-pbx.lua2
-rw-r--r--applications/luci-app-asterisk/luasrc/model/cbi/asterisk-mod-res-feature.lua2
-rw-r--r--applications/luci-app-asterisk/luasrc/model/cbi/asterisk-mod-res.lua2
-rw-r--r--applications/luci-app-asterisk/luasrc/model/cbi/asterisk-sip-connections.lua2
-rw-r--r--applications/luci-app-asterisk/luasrc/model/cbi/asterisk-voice.lua2
-rw-r--r--applications/luci-app-asterisk/luasrc/model/cbi/asterisk.lua2
-rw-r--r--applications/luci-app-asterisk/luasrc/model/cbi/asterisk/dialplan_out.lua2
-rw-r--r--applications/luci-app-asterisk/luasrc/model/cbi/asterisk/dialplans.lua2
-rw-r--r--applications/luci-app-asterisk/luasrc/model/cbi/asterisk/dialzones.lua2
-rw-r--r--applications/luci-app-asterisk/luasrc/model/cbi/asterisk/meetme.lua2
-rw-r--r--applications/luci-app-asterisk/luasrc/model/cbi/asterisk/meetme_settings.lua2
-rw-r--r--applications/luci-app-asterisk/luasrc/model/cbi/asterisk/phone_sip.lua2
-rw-r--r--applications/luci-app-asterisk/luasrc/model/cbi/asterisk/phones.lua2
-rw-r--r--applications/luci-app-asterisk/luasrc/model/cbi/asterisk/trunk_sip.lua2
-rw-r--r--applications/luci-app-asterisk/luasrc/model/cbi/asterisk/trunks.lua2
-rw-r--r--applications/luci-app-asterisk/luasrc/model/cbi/asterisk/voicemail.lua2
-rw-r--r--applications/luci-app-asterisk/luasrc/model/cbi/asterisk/voicemail_settings.lua2
-rw-r--r--applications/luci-app-asterisk/luasrc/view/asterisk/cbi/cell.htm2
-rw-r--r--applications/luci-app-asterisk/luasrc/view/asterisk/dialplans.htm2
-rw-r--r--applications/luci-app-asterisk/luasrc/view/asterisk/dialzones.htm2
-rw-r--r--applications/luci-app-commands/po/de/commands.po2
-rw-r--r--applications/luci-app-coovachilli/luasrc/model/cbi/coovachilli.lua2
-rw-r--r--applications/luci-app-coovachilli/luasrc/model/cbi/coovachilli_auth.lua2
-rw-r--r--applications/luci-app-coovachilli/luasrc/model/cbi/coovachilli_network.lua2
-rw-r--r--applications/luci-app-coovachilli/luasrc/model/cbi/coovachilli_radius.lua2
-rw-r--r--applications/luci-app-ddns/luasrc/controller/ddns.lua2
-rw-r--r--applications/luci-app-ddns/luasrc/model/cbi/ddns/detail.lua2
-rw-r--r--applications/luci-app-diag-devinfo/po/de/diag_devinfo.po2
-rw-r--r--applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua2
-rw-r--r--applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua2
-rw-r--r--applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua2
-rw-r--r--applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua2
-rw-r--r--applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua2
-rw-r--r--applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua2
-rw-r--r--applications/luci-app-firewall/luasrc/tools/firewall.lua2
-rw-r--r--applications/luci-app-freifunk-diagnostics/luasrc/controller/freifunk/diag.lua2
-rw-r--r--applications/luci-app-freifunk-diagnostics/luasrc/view/freifunk/diagnostics.htm2
-rw-r--r--applications/luci-app-freifunk-policyrouting/po/de/freifunk-policyrouting.po2
-rw-r--r--applications/luci-app-hd-idle/po/de/hd_idle.po2
-rw-r--r--applications/luci-app-meshwizard/po/de/meshwizard.po2
-rw-r--r--applications/luci-app-minidlna/po/de/minidlna.po2
-rw-r--r--applications/luci-app-multiwan/po/de/multiwan.po2
-rw-r--r--applications/luci-app-ntpc/luasrc/controller/ntpc.lua2
-rw-r--r--applications/luci-app-ntpc/luasrc/model/cbi/ntpc/ntpc.lua2
-rw-r--r--applications/luci-app-ntpc/luasrc/model/cbi/ntpc/ntpcmini.lua2
-rw-r--r--applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua2
-rw-r--r--applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua2
-rw-r--r--applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua2
-rw-r--r--applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua2
-rw-r--r--applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua2
-rw-r--r--applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua2
-rw-r--r--applications/luci-app-olsr/luasrc/view/status-olsr/error_olsr.htm2
-rw-r--r--applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm2
-rw-r--r--applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm2
-rw-r--r--applications/luci-app-olsr/luasrc/view/status-olsr/mid.htm2
-rw-r--r--applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm2
-rw-r--r--applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm2
-rw-r--r--applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm2
-rw-r--r--applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm2
-rw-r--r--applications/luci-app-olsr/luasrc/view/status-olsr/topology.htm2
-rw-r--r--applications/luci-app-olsr/po/de/olsr.po2
-rw-r--r--applications/luci-app-openvpn/luasrc/controller/openvpn.lua2
-rw-r--r--applications/luci-app-openvpn/luasrc/view/openvpn/pageswitch.htm2
-rw-r--r--applications/luci-app-p2pblock/luasrc/controller/ff_p2pblock.lua2
-rw-r--r--applications/luci-app-p2pblock/luasrc/model/cbi/luci_fw/p2pblock.lua2
-rw-r--r--applications/luci-app-p910nd/po/de/p910nd.po2
-rw-r--r--applications/luci-app-radvd/luasrc/controller/radvd.lua2
-rw-r--r--applications/luci-app-radvd/luasrc/model/cbi/radvd.lua2
-rw-r--r--applications/luci-app-radvd/luasrc/model/cbi/radvd/dnssl.lua2
-rw-r--r--applications/luci-app-radvd/luasrc/model/cbi/radvd/interface.lua2
-rw-r--r--applications/luci-app-radvd/luasrc/model/cbi/radvd/prefix.lua2
-rw-r--r--applications/luci-app-radvd/luasrc/model/cbi/radvd/rdnss.lua2
-rw-r--r--applications/luci-app-radvd/luasrc/model/cbi/radvd/route.lua2
-rw-r--r--applications/luci-app-radvd/po/de/radvd.po2
-rw-r--r--applications/luci-app-radvd/po/en/radvd.po2
-rw-r--r--applications/luci-app-radvd/po/ms/radvd.po2
-rw-r--r--applications/luci-app-radvd/po/pt/radvd.po2
-rw-r--r--applications/luci-app-radvd/po/vi/radvd.po2
-rw-r--r--applications/luci-app-samba/luasrc/controller/samba.lua2
-rw-r--r--applications/luci-app-samba/luasrc/model/cbi/samba.lua2
-rw-r--r--applications/luci-app-siitwizard/luasrc/controller/siitwizard.lua2
-rw-r--r--applications/luci-app-siitwizard/luasrc/model/cbi/siitwizard.lua2
-rw-r--r--applications/luci-app-splash/luasrc/model/cbi/splash/splashtext.lua2
-rw-r--r--applications/luci-app-splash/luasrc/view/admin_status/splash.htm2
-rw-r--r--applications/luci-app-splash/luasrc/view/splash/splash.htm2
-rw-r--r--applications/luci-app-splash/luasrc/view/splash_splash/index.htm2
-rw-r--r--applications/luci-app-splash/luasrc/view/splash_splash/splash.htm2
-rw-r--r--applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua4
-rw-r--r--applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/collectd.lua2
-rw-r--r--applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua2
-rw-r--r--applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpu.lua2
-rw-r--r--applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/csv.lua2
-rw-r--r--applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/df.lua2
-rw-r--r--applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/disk.lua2
-rw-r--r--applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/dns.lua2
-rw-r--r--applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/email.lua2
-rw-r--r--applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/exec.lua2
-rw-r--r--applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/interface.lua2
-rw-r--r--applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/iptables.lua2
-rw-r--r--applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/irq.lua2
-rw-r--r--applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/iwinfo.lua2
-rw-r--r--applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/load.lua2
-rw-r--r--applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/netlink.lua2
-rw-r--r--applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/network.lua2
-rw-r--r--applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/ping.lua2
-rw-r--r--applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/processes.lua2
-rw-r--r--applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/rrdtool.lua2
-rw-r--r--applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/tcpconns.lua2
-rw-r--r--applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/unixsock.lua2
-rw-r--r--applications/luci-app-statistics/luasrc/statistics/datatree.lua2
-rw-r--r--applications/luci-app-statistics/luasrc/statistics/i18n.lua2
-rw-r--r--applications/luci-app-statistics/luasrc/statistics/rrdtool.lua2
-rw-r--r--applications/luci-app-statistics/luasrc/statistics/rrdtool/colors.lua2
-rw-r--r--applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/conntrack.lua2
-rw-r--r--applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpu.lua2
-rw-r--r--applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/df.lua2
-rw-r--r--applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/disk.lua2
-rw-r--r--applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/interface.lua2
-rw-r--r--applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/iptables.lua2
-rw-r--r--applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/irq.lua2
-rw-r--r--applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/iwinfo.lua2
-rw-r--r--applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/load.lua2
-rw-r--r--applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/netlink.lua2
-rw-r--r--applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/ping.lua2
-rw-r--r--applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/processes.lua2
-rw-r--r--applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/tcpconns.lua2
-rw-r--r--applications/luci-app-statistics/luasrc/view/admin_statistics/index.htm2
-rw-r--r--applications/luci-app-statistics/luasrc/view/public_statistics/graph.htm2
-rwxr-xr-xapplications/luci-app-statistics/root/usr/bin/stat-genconfig2
-rw-r--r--applications/luci-app-tinyproxy/luasrc/controller/tinyproxy.lua2
-rw-r--r--applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua2
-rw-r--r--applications/luci-app-upnp/luasrc/controller/upnp.lua2
-rw-r--r--applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua2
-rw-r--r--applications/luci-app-vnstat/luasrc/model/cbi/vnstat.lua2
-rw-r--r--applications/luci-app-vnstat/luasrc/view/vnstat.htm2
-rw-r--r--applications/luci-app-vnstat/po/de/vnstat.po2
-rw-r--r--applications/luci-app-vnstat/po/el/vnstat.po2
-rw-r--r--applications/luci-app-vnstat/po/en/vnstat.po2
-rw-r--r--applications/luci-app-vnstat/po/ms/vnstat.po2
-rw-r--r--applications/luci-app-vnstat/po/vi/vnstat.po2
-rw-r--r--applications/luci-app-wol/luasrc/model/cbi/wol.lua2
-rw-r--r--applications/luci-app-wol/po/de/wol.po2
-rw-r--r--contrib/package/freifunk-firewall/Makefile2
-rw-r--r--contrib/package/freifunk-p2pblock/Makefile2
-rw-r--r--contrib/package/freifunk-watchdog/Makefile2
-rw-r--r--contrib/package/freifunk-watchdog/src/ucix.c2
-rw-r--r--contrib/package/freifunk-watchdog/src/watchdog.c2
-rw-r--r--contrib/package/freifunk-watchdog/src/watchdog.h2
-rw-r--r--contrib/package/remote-update/Makefile2
-rw-r--r--libs/luci-lib-json/luasrc/json.lua2
-rw-r--r--libs/luci-lib-nixio/NOTICE2
-rw-r--r--modules/luci-base/htdocs/luci-static/resources/cbi.js2
-rw-r--r--modules/luci-base/luasrc/cacheloader.lua2
-rw-r--r--modules/luci-base/luasrc/cbi/datatypes.lua2
-rw-r--r--modules/luci-base/luasrc/ccache.lua2
-rw-r--r--modules/luci-base/luasrc/controller/admin/servicectl.lua2
-rw-r--r--modules/luci-base/luasrc/http/protocol.lua2
-rw-r--r--modules/luci-base/luasrc/http/protocol/conditionals.lua2
-rw-r--r--modules/luci-base/luasrc/http/protocol/date.lua2
-rw-r--r--modules/luci-base/luasrc/http/protocol/mime.lua2
-rw-r--r--modules/luci-base/luasrc/ip.lua2
-rw-r--r--modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua2
-rw-r--r--modules/luci-base/luasrc/model/cbi/admin_network/proto_none.lua2
-rw-r--r--modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua2
-rw-r--r--modules/luci-base/luasrc/model/firewall.lua2
-rw-r--r--modules/luci-base/luasrc/model/ipkg.lua2
-rw-r--r--modules/luci-base/luasrc/sgi/uhttpd.lua2
-rw-r--r--modules/luci-base/luasrc/store.lua2
-rw-r--r--modules/luci-base/luasrc/sys/iptparser.lua2
-rw-r--r--modules/luci-base/luasrc/tools/proto.lua2
-rw-r--r--modules/luci-base/luasrc/tools/status.lua2
-rw-r--r--modules/luci-base/luasrc/tools/webadmin.lua2
-rw-r--r--modules/luci-base/luasrc/view/error404.htm2
-rw-r--r--modules/luci-base/luasrc/view/error500.htm2
-rw-r--r--modules/luci-base/luasrc/view/footer.htm2
-rw-r--r--modules/luci-base/luasrc/view/header.htm2
-rw-r--r--modules/luci-base/luasrc/view/indexer.htm2
-rw-r--r--modules/luci-base/luasrc/view/sysauth.htm2
-rw-r--r--modules/luci-base/src/po2lmo.c2
-rw-r--r--modules/luci-base/src/template_lmo.c2
-rw-r--r--modules/luci-base/src/template_lmo.h2
-rw-r--r--modules/luci-base/src/template_lualib.c2
-rw-r--r--modules/luci-base/src/template_lualib.h2
-rw-r--r--modules/luci-base/src/template_parser.c2
-rw-r--r--modules/luci-base/src/template_parser.h2
-rw-r--r--modules/luci-base/src/template_utils.c2
-rw-r--r--modules/luci-base/src/template_utils.h2
-rw-r--r--modules/luci-mod-admin-full/luasrc/controller/admin/filebrowser.lua2
-rw-r--r--modules/luci-mod-admin-full/luasrc/controller/admin/network.lua2
-rw-r--r--modules/luci-mod-admin-full/luasrc/controller/admin/status.lua2
-rw-r--r--modules/luci-mod-admin-full/luasrc/controller/admin/system.lua2
-rw-r--r--modules/luci-mod-admin-full/luasrc/controller/admin/uci.lua2
-rw-r--r--modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/hosts.lua2
-rw-r--r--modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/iface_add.lua2
-rw-r--r--modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/ifaces.lua2
-rw-r--r--modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/network.lua2
-rw-r--r--modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/proto_ahcp.lua2
-rw-r--r--modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/vlan.lua2
-rw-r--r--modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_add.lua2
-rw-r--r--modules/luci-mod-admin-full/luasrc/model/cbi/admin_status/processes.lua2
-rw-r--r--modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/admin.lua2
-rw-r--r--modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/backupfiles.lua2
-rw-r--r--modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/crontab.lua2
-rw-r--r--modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/fstab/mount.lua2
-rw-r--r--modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/fstab/swap.lua2
-rw-r--r--modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/ipkg.lua2
-rw-r--r--modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/startup.lua2
-rw-r--r--modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/system.lua2
-rw-r--r--modules/luci-mod-admin-full/luasrc/view/admin_network/diagnostics.htm2
-rw-r--r--modules/luci-mod-admin-full/luasrc/view/admin_network/iface_overview.htm2
-rw-r--r--modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_join.htm2
-rw-r--r--modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_overview.htm2
-rw-r--r--modules/luci-mod-admin-full/luasrc/view/admin_status/bandwidth.htm2
-rw-r--r--modules/luci-mod-admin-full/luasrc/view/admin_status/connections.htm2
-rw-r--r--modules/luci-mod-admin-full/luasrc/view/admin_status/dmesg.htm2
-rw-r--r--modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm2
-rw-r--r--modules/luci-mod-admin-full/luasrc/view/admin_status/iptables.htm2
-rw-r--r--modules/luci-mod-admin-full/luasrc/view/admin_status/load.htm2
-rw-r--r--modules/luci-mod-admin-full/luasrc/view/admin_status/routes.htm2
-rw-r--r--modules/luci-mod-admin-full/luasrc/view/admin_status/syslog.htm2
-rw-r--r--modules/luci-mod-admin-full/luasrc/view/admin_status/wireless.htm2
-rw-r--r--modules/luci-mod-admin-full/luasrc/view/admin_system/applyreboot.htm2
-rw-r--r--modules/luci-mod-admin-full/luasrc/view/admin_system/backupfiles.htm2
-rw-r--r--modules/luci-mod-admin-full/luasrc/view/admin_system/flashops.htm2
-rw-r--r--modules/luci-mod-admin-full/luasrc/view/admin_system/ipkg.htm2
-rw-r--r--modules/luci-mod-admin-full/luasrc/view/admin_system/packages.htm2
-rw-r--r--modules/luci-mod-admin-full/luasrc/view/admin_system/reboot.htm2
-rw-r--r--modules/luci-mod-admin-full/luasrc/view/admin_system/upgrade.htm2
-rw-r--r--modules/luci-mod-admin-full/luasrc/view/admin_uci/apply.htm2
-rw-r--r--modules/luci-mod-admin-full/luasrc/view/admin_uci/changelog.htm2
-rw-r--r--modules/luci-mod-admin-full/luasrc/view/admin_uci/changes.htm2
-rw-r--r--modules/luci-mod-admin-full/luasrc/view/admin_uci/revert.htm2
-rw-r--r--modules/luci-mod-admin-full/src/luci-bwc.c2
-rw-r--r--modules/luci-mod-admin-mini/luasrc/controller/mini/index.lua2
-rw-r--r--modules/luci-mod-admin-mini/luasrc/controller/mini/network.lua2
-rw-r--r--modules/luci-mod-admin-mini/luasrc/controller/mini/system.lua2
-rw-r--r--modules/luci-mod-admin-mini/luasrc/model/cbi/mini/dhcp.lua2
-rw-r--r--modules/luci-mod-admin-mini/luasrc/model/cbi/mini/luci.lua2
-rw-r--r--modules/luci-mod-admin-mini/luasrc/model/cbi/mini/network.lua2
-rw-r--r--modules/luci-mod-admin-mini/luasrc/model/cbi/mini/passwd.lua2
-rw-r--r--modules/luci-mod-admin-mini/luasrc/model/cbi/mini/wifi.lua2
-rw-r--r--modules/luci-mod-admin-mini/luasrc/view/mini/applyreboot.htm2
-rw-r--r--modules/luci-mod-admin-mini/luasrc/view/mini/backup.htm2
-rw-r--r--modules/luci-mod-admin-mini/luasrc/view/mini/index.htm2
-rw-r--r--modules/luci-mod-admin-mini/luasrc/view/mini/reboot.htm2
-rw-r--r--modules/luci-mod-admin-mini/luasrc/view/mini/upgrade.htm2
-rw-r--r--modules/luci-mod-failsafe/luasrc/controller/failsafe/failsafe.lua2
-rw-r--r--modules/luci-mod-failsafe/luasrc/view/failsafe/applyreboot.htm2
-rw-r--r--modules/luci-mod-failsafe/luasrc/view/failsafe/flashops.htm2
-rw-r--r--modules/luci-mod-failsafe/luasrc/view/failsafe/reboot.htm2
-rw-r--r--modules/luci-mod-failsafe/luasrc/view/failsafe/upgrade.htm2
-rw-r--r--modules/luci-mod-freifunk/luasrc/controller/freifunk/remote_update.lua2
-rw-r--r--modules/luci-mod-freifunk/luasrc/view/freifunk/contact.htm2
-rw-r--r--modules/luci-mod-freifunk/luasrc/view/freifunk/index.htm2
-rw-r--r--modules/luci-mod-freifunk/luasrc/view/freifunk/remote_update.htm2
-rw-r--r--modules/luci-mod-freifunk/po/en/freifunk.po2
-rw-r--r--modules/luci-mod-rpc/luasrc/controller/rpc.lua2
-rw-r--r--modules/luci-mod-rpc/luasrc/jsonrpc.lua2
-rw-r--r--modules/luci-mod-rpc/luasrc/jsonrpcbind/uci.lua2
-rw-r--r--protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua2
-rw-r--r--protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua2
-rw-r--r--protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua2
-rw-r--r--protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua2
-rw-r--r--protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua2
-rw-r--r--protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua2
-rw-r--r--protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua2
-rw-r--r--protocols/luci-proto-ipv6/luasrc/model/network/proto_dhcpv6.lua2
-rw-r--r--protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua2
-rw-r--r--protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua2
-rw-r--r--protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua2
-rw-r--r--protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua2
-rw-r--r--protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua2
-rw-r--r--protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua2
-rw-r--r--protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua2
-rw-r--r--protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua2
-rw-r--r--themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/footer.htm2
-rw-r--r--themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm2
-rw-r--r--themes/luci-theme-freifunk-bno/luasrc/view/themes/freifunk-bno/footer.htm2
-rw-r--r--themes/luci-theme-freifunk-bno/luasrc/view/themes/freifunk-bno/header.htm2
-rw-r--r--themes/luci-theme-freifunk-generic/luasrc/view/themes/freifunk-generic/footer.htm2
-rw-r--r--themes/luci-theme-freifunk-generic/luasrc/view/themes/freifunk-generic/header.htm2
-rw-r--r--themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/footer.htm2
-rw-r--r--themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm2
296 files changed, 297 insertions, 297 deletions
diff --git a/NOTICE b/NOTICE
index c708e5e81c..47e1969213 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,6 +1,6 @@
LuCI - Lua Configuration Interface
Copyright 2008 Steven Barth <steven@midlink.org>
-Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
Licensed under the Apache License, Version 2.0.
Contains code from:
diff --git a/applications/luci-app-ahcp/luasrc/controller/ahcp.lua b/applications/luci-app-ahcp/luasrc/controller/ahcp.lua
index f1515c4ce4..e97da558b5 100644
--- a/applications/luci-app-ahcp/luasrc/controller/ahcp.lua
+++ b/applications/luci-app-ahcp/luasrc/controller/ahcp.lua
@@ -1,4 +1,4 @@
--- Copyright 2011 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2011 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
module("luci.controller.ahcp", package.seeall)
diff --git a/applications/luci-app-ahcp/luasrc/model/cbi/ahcp.lua b/applications/luci-app-ahcp/luasrc/model/cbi/ahcp.lua
index e151b581ab..30897ebf1d 100644
--- a/applications/luci-app-ahcp/luasrc/model/cbi/ahcp.lua
+++ b/applications/luci-app-ahcp/luasrc/model/cbi/ahcp.lua
@@ -1,4 +1,4 @@
--- Copyright 2011 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2011 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
m = Map("ahcpd", translate("AHCP Server"), translate("AHCP is an autoconfiguration protocol " ..
diff --git a/applications/luci-app-asterisk/luasrc/asterisk.lua b/applications/luci-app-asterisk/luasrc/asterisk.lua
index 0a4fc0a047..ceb738d112 100644
--- a/applications/luci-app-asterisk/luasrc/asterisk.lua
+++ b/applications/luci-app-asterisk/luasrc/asterisk.lua
@@ -1,4 +1,4 @@
--- Copyright 2009 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2009 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
module("luci.asterisk", package.seeall)
diff --git a/applications/luci-app-asterisk/luasrc/controller/asterisk.lua b/applications/luci-app-asterisk/luasrc/controller/asterisk.lua
index 4bb81cb183..4923584c9a 100644
--- a/applications/luci-app-asterisk/luasrc/controller/asterisk.lua
+++ b/applications/luci-app-asterisk/luasrc/controller/asterisk.lua
@@ -1,5 +1,5 @@
-- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
module("luci.controller.asterisk", package.seeall)
diff --git a/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-dialplans.lua b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-dialplans.lua
index fbb900195e..d4daa68738 100644
--- a/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-dialplans.lua
+++ b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-dialplans.lua
@@ -1,5 +1,5 @@
-- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
cbimap = Map("asterisk", "asterisk", "")
diff --git a/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-iax-connections.lua b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-iax-connections.lua
index 275e0fb994..d0eaf34bfb 100644
--- a/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-iax-connections.lua
+++ b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-iax-connections.lua
@@ -1,5 +1,5 @@
-- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
cbimap = Map("asterisk", "asterisk", "")
diff --git a/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-meetme.lua b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-meetme.lua
index be89e04503..dd79e46387 100644
--- a/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-meetme.lua
+++ b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-meetme.lua
@@ -1,5 +1,5 @@
-- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
cbimap = Map("asterisk", "asterisk", "")
diff --git a/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-mod-cdr.lua b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-mod-cdr.lua
index c3c1b8cada..13dcba5101 100644
--- a/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-mod-cdr.lua
+++ b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-mod-cdr.lua
@@ -1,5 +1,5 @@
-- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
cbimap = Map("asterisk", "asterisk", "")
diff --git a/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-mod-chan.lua b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-mod-chan.lua
index 13bd2a7515..425569dd0c 100644
--- a/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-mod-chan.lua
+++ b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-mod-chan.lua
@@ -1,5 +1,5 @@
-- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
cbimap = Map("asterisk", "asterisk", "")
diff --git a/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-mod-codec.lua b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-mod-codec.lua
index aadaf9d580..0893c0e2da 100644
--- a/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-mod-codec.lua
+++ b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-mod-codec.lua
@@ -1,5 +1,5 @@
-- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
cbimap = Map("asterisk", "asterisk", "")
diff --git a/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-mod-format.lua b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-mod-format.lua
index ef22d48d78..9b59d94054 100644
--- a/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-mod-format.lua
+++ b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-mod-format.lua
@@ -1,5 +1,5 @@
-- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
cbimap = Map("asterisk", "asterisk", "")
diff --git a/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-mod-func.lua b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-mod-func.lua
index 3ae52d43af..04eb97473a 100644
--- a/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-mod-func.lua
+++ b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-mod-func.lua
@@ -1,5 +1,5 @@
-- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
cbimap = Map("asterisk", "asterisk", "")
diff --git a/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-mod-pbx.lua b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-mod-pbx.lua
index 907dfcc119..cca4f34d5f 100644
--- a/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-mod-pbx.lua
+++ b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-mod-pbx.lua
@@ -1,5 +1,5 @@
-- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
cbimap = Map("asterisk", "asterisk", "")
diff --git a/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-mod-res-feature.lua b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-mod-res-feature.lua
index 37fe68ee8a..783aab2b74 100644
--- a/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-mod-res-feature.lua
+++ b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-mod-res-feature.lua
@@ -1,5 +1,5 @@
-- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
cbimap = Map("asterisk", "asterisk", "")
diff --git a/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-mod-res.lua b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-mod-res.lua
index 581b96a3b7..4bef199d8a 100644
--- a/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-mod-res.lua
+++ b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-mod-res.lua
@@ -1,5 +1,5 @@
-- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
cbimap = Map("asterisk", "asterisk", "")
diff --git a/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-sip-connections.lua b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-sip-connections.lua
index 416ccd6b0e..a095ec3ecc 100644
--- a/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-sip-connections.lua
+++ b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-sip-connections.lua
@@ -1,5 +1,5 @@
-- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
cbimap = Map("asterisk", "asterisk", "")
diff --git a/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-voice.lua b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-voice.lua
index 3b7f9923c3..7341dfbe64 100644
--- a/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-voice.lua
+++ b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-voice.lua
@@ -1,5 +1,5 @@
-- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
cbimap = Map("asterisk", "asterisk", "")
diff --git a/applications/luci-app-asterisk/luasrc/model/cbi/asterisk.lua b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk.lua
index 83476957f8..026aab4c63 100644
--- a/applications/luci-app-asterisk/luasrc/model/cbi/asterisk.lua
+++ b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk.lua
@@ -1,5 +1,5 @@
-- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
cbimap = Map("asterisk", "asterisk", "")
diff --git a/applications/luci-app-asterisk/luasrc/model/cbi/asterisk/dialplan_out.lua b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk/dialplan_out.lua
index 42862ebe01..b4c81bb29d 100644
--- a/applications/luci-app-asterisk/luasrc/model/cbi/asterisk/dialplan_out.lua
+++ b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk/dialplan_out.lua
@@ -1,4 +1,4 @@
--- Copyright 2008 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
local ast = require("luci.asterisk")
diff --git a/applications/luci-app-asterisk/luasrc/model/cbi/asterisk/dialplans.lua b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk/dialplans.lua
index bcc085d132..4ffeca4f8a 100644
--- a/applications/luci-app-asterisk/luasrc/model/cbi/asterisk/dialplans.lua
+++ b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk/dialplans.lua
@@ -1,4 +1,4 @@
--- Copyright 2008 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
local ast = require("luci.asterisk")
diff --git a/applications/luci-app-asterisk/luasrc/model/cbi/asterisk/dialzones.lua b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk/dialzones.lua
index 154e2e56ee..5585c062d2 100644
--- a/applications/luci-app-asterisk/luasrc/model/cbi/asterisk/dialzones.lua
+++ b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk/dialzones.lua
@@ -1,4 +1,4 @@
--- Copyright 2008 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
local ast = require("luci.asterisk")
diff --git a/applications/luci-app-asterisk/luasrc/model/cbi/asterisk/meetme.lua b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk/meetme.lua
index 539468493d..e409d706ae 100644
--- a/applications/luci-app-asterisk/luasrc/model/cbi/asterisk/meetme.lua
+++ b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk/meetme.lua
@@ -1,4 +1,4 @@
--- Copyright 2009 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2009 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
local ast = require "luci.asterisk"
diff --git a/applications/luci-app-asterisk/luasrc/model/cbi/asterisk/meetme_settings.lua b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk/meetme_settings.lua
index ceabd16ac4..9e5aed7f34 100644
--- a/applications/luci-app-asterisk/luasrc/model/cbi/asterisk/meetme_settings.lua
+++ b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk/meetme_settings.lua
@@ -1,4 +1,4 @@
--- Copyright 2009 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2009 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
cbimap = Map("asterisk", "MeetMe - Common Settings",
diff --git a/applications/luci-app-asterisk/luasrc/model/cbi/asterisk/phone_sip.lua b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk/phone_sip.lua
index 039f607fd3..01dfc1682f 100644
--- a/applications/luci-app-asterisk/luasrc/model/cbi/asterisk/phone_sip.lua
+++ b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk/phone_sip.lua
@@ -1,4 +1,4 @@
--- Copyright 2008 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
local ast = require("luci.asterisk")
diff --git a/applications/luci-app-asterisk/luasrc/model/cbi/asterisk/phones.lua b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk/phones.lua
index b22db90858..a6c44f9335 100644
--- a/applications/luci-app-asterisk/luasrc/model/cbi/asterisk/phones.lua
+++ b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk/phones.lua
@@ -1,4 +1,4 @@
--- Copyright 2008 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
local ast = require("luci.asterisk")
diff --git a/applications/luci-app-asterisk/luasrc/model/cbi/asterisk/trunk_sip.lua b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk/trunk_sip.lua
index cf42d118e7..eedc1c2cac 100644
--- a/applications/luci-app-asterisk/luasrc/model/cbi/asterisk/trunk_sip.lua
+++ b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk/trunk_sip.lua
@@ -1,4 +1,4 @@
--- Copyright 2008 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
local ast = require("luci.asterisk")
diff --git a/applications/luci-app-asterisk/luasrc/model/cbi/asterisk/trunks.lua b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk/trunks.lua
index 02f07a5faa..44c8ca87d5 100644
--- a/applications/luci-app-asterisk/luasrc/model/cbi/asterisk/trunks.lua
+++ b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk/trunks.lua
@@ -1,4 +1,4 @@
--- Copyright 2008 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
local ast = require("luci.asterisk")
diff --git a/applications/luci-app-asterisk/luasrc/model/cbi/asterisk/voicemail.lua b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk/voicemail.lua
index 05d9584002..51143e6a88 100644
--- a/applications/luci-app-asterisk/luasrc/model/cbi/asterisk/voicemail.lua
+++ b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk/voicemail.lua
@@ -1,4 +1,4 @@
--- Copyright 2009 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2009 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
local ast = require "luci.asterisk"
diff --git a/applications/luci-app-asterisk/luasrc/model/cbi/asterisk/voicemail_settings.lua b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk/voicemail_settings.lua
index 3bee61cd92..ef52a32e7d 100644
--- a/applications/luci-app-asterisk/luasrc/model/cbi/asterisk/voicemail_settings.lua
+++ b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk/voicemail_settings.lua
@@ -1,4 +1,4 @@
--- Copyright 2009 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2009 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
require "luci.sys.zoneinfo"
diff --git a/applications/luci-app-asterisk/luasrc/view/asterisk/cbi/cell.htm b/applications/luci-app-asterisk/luasrc/view/asterisk/cbi/cell.htm
index fde5503c2a..3afb26bdac 100644
--- a/applications/luci-app-asterisk/luasrc/view/asterisk/cbi/cell.htm
+++ b/applications/luci-app-asterisk/luasrc/view/asterisk/cbi/cell.htm
@@ -1,6 +1,6 @@
<%#
Copyright 2008 Steven Barth <steven@midlink.org>
- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+ Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
Licensed to the public under the Apache License 2.0.
-%>
diff --git a/applications/luci-app-asterisk/luasrc/view/asterisk/dialplans.htm b/applications/luci-app-asterisk/luasrc/view/asterisk/dialplans.htm
index 106ae49bd2..70f986c5bb 100644
--- a/applications/luci-app-asterisk/luasrc/view/asterisk/dialplans.htm
+++ b/applications/luci-app-asterisk/luasrc/view/asterisk/dialplans.htm
@@ -1,6 +1,6 @@
<%#
Copyright 2008 Steven Barth <steven@midlink.org>
- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+ Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
Licensed to the public under the Apache License 2.0.
-%>
diff --git a/applications/luci-app-asterisk/luasrc/view/asterisk/dialzones.htm b/applications/luci-app-asterisk/luasrc/view/asterisk/dialzones.htm
index dcc85b1d2b..ac527918bc 100644
--- a/applications/luci-app-asterisk/luasrc/view/asterisk/dialzones.htm
+++ b/applications/luci-app-asterisk/luasrc/view/asterisk/dialzones.htm
@@ -1,6 +1,6 @@
<%#
Copyright 2008 Steven Barth <steven@midlink.org>
- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+ Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
Licensed to the public under the Apache License 2.0.
-%>
diff --git a/applications/luci-app-commands/po/de/commands.po b/applications/luci-app-commands/po/de/commands.po
index 09c56b3990..2b7c631ace 100644
--- a/applications/luci-app-commands/po/de/commands.po
+++ b/applications/luci-app-commands/po/de/commands.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"PO-Revision-Date: 2012-11-21 18:45+0200\n"
-"Last-Translator: Jo-Philipp <xm@subsignal.org>\n"
+"Last-Translator: Jo-Philipp <jow@openwrt.org>\n"
"Language-Team: none\n"
"Language: de\n"
"MIME-Version: 1.0\n"
diff --git a/applications/luci-app-coovachilli/luasrc/model/cbi/coovachilli.lua b/applications/luci-app-coovachilli/luasrc/model/cbi/coovachilli.lua
index f8cbe5dda7..7a2056c119 100644
--- a/applications/luci-app-coovachilli/luasrc/model/cbi/coovachilli.lua
+++ b/applications/luci-app-coovachilli/luasrc/model/cbi/coovachilli.lua
@@ -1,5 +1,5 @@
-- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
m = Map("coovachilli")
diff --git a/applications/luci-app-coovachilli/luasrc/model/cbi/coovachilli_auth.lua b/applications/luci-app-coovachilli/luasrc/model/cbi/coovachilli_auth.lua
index 294d538735..4123532f41 100644
--- a/applications/luci-app-coovachilli/luasrc/model/cbi/coovachilli_auth.lua
+++ b/applications/luci-app-coovachilli/luasrc/model/cbi/coovachilli_auth.lua
@@ -1,5 +1,5 @@
-- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
m = Map("coovachilli")
diff --git a/applications/luci-app-coovachilli/luasrc/model/cbi/coovachilli_network.lua b/applications/luci-app-coovachilli/luasrc/model/cbi/coovachilli_network.lua
index 31e9994706..e1a084a98d 100644
--- a/applications/luci-app-coovachilli/luasrc/model/cbi/coovachilli_network.lua
+++ b/applications/luci-app-coovachilli/luasrc/model/cbi/coovachilli_network.lua
@@ -1,5 +1,5 @@
-- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
require("luci.sys")
diff --git a/applications/luci-app-coovachilli/luasrc/model/cbi/coovachilli_radius.lua b/applications/luci-app-coovachilli/luasrc/model/cbi/coovachilli_radius.lua
index 6ca7f3a8da..e2cbe495e0 100644
--- a/applications/luci-app-coovachilli/luasrc/model/cbi/coovachilli_radius.lua
+++ b/applications/luci-app-coovachilli/luasrc/model/cbi/coovachilli_radius.lua
@@ -1,5 +1,5 @@
-- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
m = Map("coovachilli")
diff --git a/applications/luci-app-ddns/luasrc/controller/ddns.lua b/applications/luci-app-ddns/luasrc/controller/ddns.lua
index 3ec0eb8b36..3cd52e5e3c 100644
--- a/applications/luci-app-ddns/luasrc/controller/ddns.lua
+++ b/applications/luci-app-ddns/luasrc/controller/ddns.lua
@@ -1,5 +1,5 @@
-- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
-- Copyright 2013 Manuel Munz <freifunk at somakoma dot de>
-- Copyright 2014 Christian Schoenebeck <christian dot schoenebeck at gmail dot com>
-- Licensed to the public under the Apache License 2.0.
diff --git a/applications/luci-app-ddns/luasrc/model/cbi/ddns/detail.lua b/applications/luci-app-ddns/luasrc/model/cbi/ddns/detail.lua
index ea7f6e6a7b..057b8c8aa2 100644
--- a/applications/luci-app-ddns/luasrc/model/cbi/ddns/detail.lua
+++ b/applications/luci-app-ddns/luasrc/model/cbi/ddns/detail.lua
@@ -1,5 +1,5 @@
-- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
-- Copyright 2013 Manuel Munz <freifunk at somakoma dot de>
-- Copyright 2014 Christian Schoenebeck <christian dot schoenebeck at gmail dot com>
-- Licensed to the public under the Apache License 2.0.
diff --git a/applications/luci-app-diag-devinfo/po/de/diag_devinfo.po b/applications/luci-app-diag-devinfo/po/de/diag_devinfo.po
index 606358aa00..2401ece3bd 100644
--- a/applications/luci-app-diag-devinfo/po/de/diag_devinfo.po
+++ b/applications/luci-app-diag-devinfo/po/de/diag_devinfo.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"PO-Revision-Date: 2012-08-10 02:08+0200\n"
-"Last-Translator: Jo-Philipp <xm@subsignal.org>\n"
+"Last-Translator: Jo-Philipp <jow@openwrt.org>\n"
"Language-Team: none\n"
"Language: de\n"
"MIME-Version: 1.0\n"
diff --git a/applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua b/applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua
index bd23143253..968ac3624f 100644
--- a/applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua
+++ b/applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua
@@ -1,4 +1,4 @@
--- Copyright 2011 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2011 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
local fs = require "nixio.fs"
diff --git a/applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua b/applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua
index 7e06edda1b..22f1c77164 100644
--- a/applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua
+++ b/applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua
@@ -1,4 +1,4 @@
--- Copyright 2011 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2011 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
local sys = require "luci.sys"
diff --git a/applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua b/applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua
index b185c71f11..e61ce73cdd 100644
--- a/applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua
+++ b/applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua
@@ -1,5 +1,5 @@
-- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2010-2012 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2010-2012 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
local ds = require "luci.dispatcher"
diff --git a/applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua b/applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua
index 2dcc4e9f25..0cb30b5cda 100644
--- a/applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua
+++ b/applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua
@@ -1,5 +1,5 @@
-- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2010-2012 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2010-2012 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
local sys = require "luci.sys"
diff --git a/applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua b/applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua
index b961a515c8..c533491977 100644
--- a/applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua
+++ b/applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua
@@ -1,5 +1,5 @@
-- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2010-2012 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2010-2012 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
local ds = require "luci.dispatcher"
diff --git a/applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua b/applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua
index 42df10a43d..3eb95ebb57 100644
--- a/applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua
+++ b/applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua
@@ -1,5 +1,5 @@
-- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2010-2011 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2010-2011 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
local nw = require "luci.model.network"
diff --git a/applications/luci-app-firewall/luasrc/tools/firewall.lua b/applications/luci-app-firewall/luasrc/tools/firewall.lua
index 8abbc14d76..6d08fe13a9 100644
--- a/applications/luci-app-firewall/luasrc/tools/firewall.lua
+++ b/applications/luci-app-firewall/luasrc/tools/firewall.lua
@@ -1,4 +1,4 @@
--- Copyright 2011-2012 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2011-2012 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
module("luci.tools.firewall", package.seeall)
diff --git a/applications/luci-app-freifunk-diagnostics/luasrc/controller/freifunk/diag.lua b/applications/luci-app-freifunk-diagnostics/luasrc/controller/freifunk/diag.lua
index f9b101e0f3..7bb47612b6 100644
--- a/applications/luci-app-freifunk-diagnostics/luasrc/controller/freifunk/diag.lua
+++ b/applications/luci-app-freifunk-diagnostics/luasrc/controller/freifunk/diag.lua
@@ -1,5 +1,5 @@
-- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2011 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2011 Jo-Philipp Wich <jow@openwrt.org>
-- Copyright 2013 Manuel Munz <freifunk@somakoma.de>
-- Licensed to the public under the Apache License 2.0.
diff --git a/applications/luci-app-freifunk-diagnostics/luasrc/view/freifunk/diagnostics.htm b/applications/luci-app-freifunk-diagnostics/luasrc/view/freifunk/diagnostics.htm
index 98133cf8bf..2f4914e5d5 100644
--- a/applications/luci-app-freifunk-diagnostics/luasrc/view/freifunk/diagnostics.htm
+++ b/applications/luci-app-freifunk-diagnostics/luasrc/view/freifunk/diagnostics.htm
@@ -1,5 +1,5 @@
<%#
- Copyright 2010 Jo-Philipp Wich <xm@subsignal.org>
+ Copyright 2010 Jo-Philipp Wich <jow@openwrt.org>
Licensed to the public under the Apache License 2.0.
-%>
diff --git a/applications/luci-app-freifunk-policyrouting/po/de/freifunk-policyrouting.po b/applications/luci-app-freifunk-policyrouting/po/de/freifunk-policyrouting.po
index 79c22953b7..bb24f61853 100644
--- a/applications/luci-app-freifunk-policyrouting/po/de/freifunk-policyrouting.po
+++ b/applications/luci-app-freifunk-policyrouting/po/de/freifunk-policyrouting.po
@@ -3,7 +3,7 @@ msgstr ""
"Project-Id-Version: \n"
"POT-Creation-Date: \n"
"PO-Revision-Date: 2012-11-21 20:53+0200\n"
-"Last-Translator: Jo-Philipp <xm@subsignal.org>\n"
+"Last-Translator: Jo-Philipp <jow@openwrt.org>\n"
"Language-Team: \n"
"Language: de\n"
"MIME-Version: 1.0\n"
diff --git a/applications/luci-app-hd-idle/po/de/hd_idle.po b/applications/luci-app-hd-idle/po/de/hd_idle.po
index 890df678dd..02e965c659 100644
--- a/applications/luci-app-hd-idle/po/de/hd_idle.po
+++ b/applications/luci-app-hd-idle/po/de/hd_idle.po
@@ -4,7 +4,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-04-14 10:33+0200\n"
"PO-Revision-Date: 2011-06-11 01:55+0200\n"
-"Last-Translator: Jo-Philipp <xm@subsignal.org>\n"
+"Last-Translator: Jo-Philipp <jow@openwrt.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: de\n"
"MIME-Version: 1.0\n"
diff --git a/applications/luci-app-meshwizard/po/de/meshwizard.po b/applications/luci-app-meshwizard/po/de/meshwizard.po
index 87802be2ff..ef7ba8a96a 100644
--- a/applications/luci-app-meshwizard/po/de/meshwizard.po
+++ b/applications/luci-app-meshwizard/po/de/meshwizard.po
@@ -4,7 +4,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-06-26 15:36+0200\n"
"PO-Revision-Date: 2012-11-21 20:51+0200\n"
-"Last-Translator: Jo-Philipp <xm@subsignal.org>\n"
+"Last-Translator: Jo-Philipp <jow@openwrt.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: de\n"
"MIME-Version: 1.0\n"
diff --git a/applications/luci-app-minidlna/po/de/minidlna.po b/applications/luci-app-minidlna/po/de/minidlna.po
index d912c926bd..22cb0f7e9e 100644
--- a/applications/luci-app-minidlna/po/de/minidlna.po
+++ b/applications/luci-app-minidlna/po/de/minidlna.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"PO-Revision-Date: 2012-04-09 14:39+0200\n"
-"Last-Translator: Jo-Philipp <xm@subsignal.org>\n"
+"Last-Translator: Jo-Philipp <jow@openwrt.org>\n"
"Language-Team: none\n"
"Language: de\n"
"MIME-Version: 1.0\n"
diff --git a/applications/luci-app-multiwan/po/de/multiwan.po b/applications/luci-app-multiwan/po/de/multiwan.po
index f2bec627fa..2fa789fe78 100644
--- a/applications/luci-app-multiwan/po/de/multiwan.po
+++ b/applications/luci-app-multiwan/po/de/multiwan.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"PO-Revision-Date: 2012-08-10 02:55+0200\n"
-"Last-Translator: Jo-Philipp <xm@subsignal.org>\n"
+"Last-Translator: Jo-Philipp <jow@openwrt.org>\n"
"Language-Team: none\n"
"Language: de\n"
"MIME-Version: 1.0\n"
diff --git a/applications/luci-app-ntpc/luasrc/controller/ntpc.lua b/applications/luci-app-ntpc/luasrc/controller/ntpc.lua
index 33d67ec8d0..c21d4eaa7c 100644
--- a/applications/luci-app-ntpc/luasrc/controller/ntpc.lua
+++ b/applications/luci-app-ntpc/luasrc/controller/ntpc.lua
@@ -1,5 +1,5 @@
-- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
module("luci.controller.ntpc", package.seeall)
diff --git a/applications/luci-app-ntpc/luasrc/model/cbi/ntpc/ntpc.lua b/applications/luci-app-ntpc/luasrc/model/cbi/ntpc/ntpc.lua
index 00f5fb5111..21ea88e309 100644
--- a/applications/luci-app-ntpc/luasrc/model/cbi/ntpc/ntpc.lua
+++ b/applications/luci-app-ntpc/luasrc/model/cbi/ntpc/ntpc.lua
@@ -1,5 +1,5 @@
-- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
m = Map("ntpclient", translate("Time Synchronisation"), translate("Synchronizes the system time"))
diff --git a/applications/luci-app-ntpc/luasrc/model/cbi/ntpc/ntpcmini.lua b/applications/luci-app-ntpc/luasrc/model/cbi/ntpc/ntpcmini.lua
index e54813eb90..82811cfbb8 100644
--- a/applications/luci-app-ntpc/luasrc/model/cbi/ntpc/ntpcmini.lua
+++ b/applications/luci-app-ntpc/luasrc/model/cbi/ntpc/ntpcmini.lua
@@ -1,5 +1,5 @@
-- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
require("luci.tools.webadmin")
diff --git a/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua b/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua
index c15f9a991b..a075bcf26d 100644
--- a/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua
+++ b/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua
@@ -1,5 +1,5 @@
-- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2010 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2010 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
require("luci.tools.webadmin")
diff --git a/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua b/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua
index 5020045859..0007e673e2 100644
--- a/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua
+++ b/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua
@@ -1,5 +1,5 @@
-- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2010 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2010 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
require("luci.tools.webadmin")
diff --git a/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua b/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua
index 1c6b510274..d6b7cd16a6 100644
--- a/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua
+++ b/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua
@@ -1,4 +1,4 @@
--- Copyright 2010 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2010 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
local util = require "luci.util"
diff --git a/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua b/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua
index a5e55566da..2f0fa6c38d 100644
--- a/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua
+++ b/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua
@@ -1,4 +1,4 @@
--- Copyright 2010 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2010 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
local util = require "luci.util"
diff --git a/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua b/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua
index 04d3b94547..43d6a08ad1 100644
--- a/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua
+++ b/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua
@@ -1,5 +1,5 @@
-- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2009 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2009 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
local ip = require "luci.ip"
diff --git a/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua b/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua
index 3dcb0f2280..d1c68be24b 100644
--- a/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua
+++ b/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua
@@ -1,5 +1,5 @@
-- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2009 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2009 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
local ip = require "luci.ip"
diff --git a/applications/luci-app-olsr/luasrc/view/status-olsr/error_olsr.htm b/applications/luci-app-olsr/luasrc/view/status-olsr/error_olsr.htm
index 13db0247ae..d9976701fa 100644
--- a/applications/luci-app-olsr/luasrc/view/status-olsr/error_olsr.htm
+++ b/applications/luci-app-olsr/luasrc/view/status-olsr/error_olsr.htm
@@ -1,6 +1,6 @@
<%#
Copyright 2008 Steven Barth <steven@midlink.org>
- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+ Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
Licensed to the public under the Apache License 2.0.
-%>
diff --git a/applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm b/applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm
index 07fbfb9e08..89e4436f72 100644
--- a/applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm
+++ b/applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm
@@ -1,6 +1,6 @@
<%#
Copyright 2008 Steven Barth <steven@midlink.org>
- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+ Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
Copyright 2011 Manuel Munz <freifunk at somakoma dot de>
Licensed to the public under the Apache License 2.0.
-%>
diff --git a/applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm b/applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm
index 224bfcd394..3fb3a58e9c 100644
--- a/applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm
+++ b/applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm
@@ -1,6 +1,6 @@
<%#
Copyright 2008 Steven Barth <steven@midlink.org>
- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+ Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
Copyright 2011 Manuel Munz <freifunk at somakoma dot de>
Licensed to the public under the Apache License 2.0.
-%>
diff --git a/applications/luci-app-olsr/luasrc/view/status-olsr/mid.htm b/applications/luci-app-olsr/luasrc/view/status-olsr/mid.htm
index 93fbd9eb65..3c10bd66aa 100644
--- a/applications/luci-app-olsr/luasrc/view/status-olsr/mid.htm
+++ b/applications/luci-app-olsr/luasrc/view/status-olsr/mid.htm
@@ -1,6 +1,6 @@
<%#
Copyright 2008 Steven Barth <steven@midlink.org>
- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+ Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
Copyright 2011 Manuel Munz <freifunk at somakoma dot de>
Licensed to the public under the Apache License 2.0.
-%>
diff --git a/applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm b/applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm
index 02a3e3fa34..9ad0d8f898 100644
--- a/applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm
+++ b/applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm
@@ -1,6 +1,6 @@
<%#
Copyright 2008 Steven Barth <steven@midlink.org>
- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+ Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
Copyright 2011 Manuel Munz <freifunk at somakoma dot de>
Licensed to the public under the Apache License 2.0.
-%>
diff --git a/applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm b/applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm
index a1fb0bbe48..0a81d17b46 100644
--- a/applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm
+++ b/applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm
@@ -1,6 +1,6 @@
<%#
Copyright 2008 Steven Barth <steven@midlink.org>
- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+ Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
Copyright 2011 Manuel Munz <freifunk at somakoma dot de>
Licensed to the public under the Apache License 2.0.
-%>
diff --git a/applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm b/applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm
index 6980a43622..d2b0c1be8d 100644
--- a/applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm
+++ b/applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm
@@ -1,6 +1,6 @@
<%#
Copyright 2008 Steven Barth <steven@midlink.org>
- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+ Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
Copyright 2011 Manuel Munz <freifunk at somakoma dot de>
Licensed to the public under the Apache License 2.0.
-%>
diff --git a/applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm b/applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm
index 4f848996d4..45f6515339 100644
--- a/applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm
+++ b/applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm
@@ -1,6 +1,6 @@
<%#
Copyright 2008 Steven Barth <steven@midlink.org>
- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+ Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
Copyright 2011 Manuel Munz <freifunk at somakoma dot de>
Licensed to the public under the Apache License 2.0.
-%>
diff --git a/applications/luci-app-olsr/luasrc/view/status-olsr/topology.htm b/applications/luci-app-olsr/luasrc/view/status-olsr/topology.htm
index d302577685..ee69f72d75 100644
--- a/applications/luci-app-olsr/luasrc/view/status-olsr/topology.htm
+++ b/applications/luci-app-olsr/luasrc/view/status-olsr/topology.htm
@@ -1,6 +1,6 @@
<%#
Copyright 2008 Steven Barth <steven@midlink.org>
- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+ Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
Copyright 2011 Manuel Munz <freifunk at somakoma dot de>
Licensed to the public under the Apache License 2.0.
-%>
diff --git a/applications/luci-app-olsr/po/de/olsr.po b/applications/luci-app-olsr/po/de/olsr.po
index 8be91d7469..a23a20d58c 100644
--- a/applications/luci-app-olsr/po/de/olsr.po
+++ b/applications/luci-app-olsr/po/de/olsr.po
@@ -4,7 +4,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: \n"
"PO-Revision-Date: 2012-11-21 20:54+0200\n"
-"Last-Translator: Jo-Philipp <xm@subsignal.org>\n"
+"Last-Translator: Jo-Philipp <jow@openwrt.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: de\n"
"MIME-Version: 1.0\n"
diff --git a/applications/luci-app-openvpn/luasrc/controller/openvpn.lua b/applications/luci-app-openvpn/luasrc/controller/openvpn.lua
index e245ecb734..2e48a469a1 100644
--- a/applications/luci-app-openvpn/luasrc/controller/openvpn.lua
+++ b/applications/luci-app-openvpn/luasrc/controller/openvpn.lua
@@ -1,5 +1,5 @@
-- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
module("luci.controller.openvpn", package.seeall)
diff --git a/applications/luci-app-openvpn/luasrc/view/openvpn/pageswitch.htm b/applications/luci-app-openvpn/luasrc/view/openvpn/pageswitch.htm
index 6590caadc4..ac5c8936ec 100644
--- a/applications/luci-app-openvpn/luasrc/view/openvpn/pageswitch.htm
+++ b/applications/luci-app-openvpn/luasrc/view/openvpn/pageswitch.htm
@@ -1,6 +1,6 @@
<%#
Copyright 2008 Steven Barth <steven@midlink.org>
- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+ Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
Licensed to the public under the Apache License 2.0.
-%>
diff --git a/applications/luci-app-p2pblock/luasrc/controller/ff_p2pblock.lua b/applications/luci-app-p2pblock/luasrc/controller/ff_p2pblock.lua
index 695b5a1dea..eaedda282a 100644
--- a/applications/luci-app-p2pblock/luasrc/controller/ff_p2pblock.lua
+++ b/applications/luci-app-p2pblock/luasrc/controller/ff_p2pblock.lua
@@ -1,4 +1,4 @@
--- Copyright 2009 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2009 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
module("luci.controller.ff_p2pblock", package.seeall)
diff --git a/applications/luci-app-p2pblock/luasrc/model/cbi/luci_fw/p2pblock.lua b/applications/luci-app-p2pblock/luasrc/model/cbi/luci_fw/p2pblock.lua
index ce316ffeb3..1f21429c0d 100644
--- a/applications/luci-app-p2pblock/luasrc/model/cbi/luci_fw/p2pblock.lua
+++ b/applications/luci-app-p2pblock/luasrc/model/cbi/luci_fw/p2pblock.lua
@@ -1,4 +1,4 @@
--- Copyright 2009 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2009 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
local sys = require "luci.sys"
diff --git a/applications/luci-app-p910nd/po/de/p910nd.po b/applications/luci-app-p910nd/po/de/p910nd.po
index 7d1628c1cf..d72e85800d 100644
--- a/applications/luci-app-p910nd/po/de/p910nd.po
+++ b/applications/luci-app-p910nd/po/de/p910nd.po
@@ -4,7 +4,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-05-26 17:57+0200\n"
"PO-Revision-Date: 2012-09-12 14:00+0200\n"
-"Last-Translator: Jo-Philipp <xm@subsignal.org>\n"
+"Last-Translator: Jo-Philipp <jow@openwrt.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: de\n"
"MIME-Version: 1.0\n"
diff --git a/applications/luci-app-radvd/luasrc/controller/radvd.lua b/applications/luci-app-radvd/luasrc/controller/radvd.lua
index 445c931483..9c08f4c3f5 100644
--- a/applications/luci-app-radvd/luasrc/controller/radvd.lua
+++ b/applications/luci-app-radvd/luasrc/controller/radvd.lua
@@ -1,4 +1,4 @@
--- Copyright 2010 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2010 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
module("luci.controller.radvd", package.seeall)
diff --git a/applications/luci-app-radvd/luasrc/model/cbi/radvd.lua b/applications/luci-app-radvd/luasrc/model/cbi/radvd.lua
index 103475ab64..755dcb47c3 100644
--- a/applications/luci-app-radvd/luasrc/model/cbi/radvd.lua
+++ b/applications/luci-app-radvd/luasrc/model/cbi/radvd.lua
@@ -1,4 +1,4 @@
--- Copyright 2010 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2010 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
m = Map("radvd", translate("Radvd"),
diff --git a/applications/luci-app-radvd/luasrc/model/cbi/radvd/dnssl.lua b/applications/luci-app-radvd/luasrc/model/cbi/radvd/dnssl.lua
index e207aa17a5..d331c25d66 100644
--- a/applications/luci-app-radvd/luasrc/model/cbi/radvd/dnssl.lua
+++ b/applications/luci-app-radvd/luasrc/model/cbi/radvd/dnssl.lua
@@ -1,4 +1,4 @@
--- Copyright 2010 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2010 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
local sid = arg[1]
diff --git a/applications/luci-app-radvd/luasrc/model/cbi/radvd/interface.lua b/applications/luci-app-radvd/luasrc/model/cbi/radvd/interface.lua
index 3a644a1ead..e5d03228d9 100644
--- a/applications/luci-app-radvd/luasrc/model/cbi/radvd/interface.lua
+++ b/applications/luci-app-radvd/luasrc/model/cbi/radvd/interface.lua
@@ -1,4 +1,4 @@
--- Copyright 2010 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2010 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
local sid = arg[1]
diff --git a/applications/luci-app-radvd/luasrc/model/cbi/radvd/prefix.lua b/applications/luci-app-radvd/luasrc/model/cbi/radvd/prefix.lua
index 97d84f403c..a2b4285857 100644
--- a/applications/luci-app-radvd/luasrc/model/cbi/radvd/prefix.lua
+++ b/applications/luci-app-radvd/luasrc/model/cbi/radvd/prefix.lua
@@ -1,4 +1,4 @@
--- Copyright 2010 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2010 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
local sid = arg[1]
diff --git a/applications/luci-app-radvd/luasrc/model/cbi/radvd/rdnss.lua b/applications/luci-app-radvd/luasrc/model/cbi/radvd/rdnss.lua
index f48beea46d..d6588ac7af 100644
--- a/applications/luci-app-radvd/luasrc/model/cbi/radvd/rdnss.lua
+++ b/applications/luci-app-radvd/luasrc/model/cbi/radvd/rdnss.lua
@@ -1,4 +1,4 @@
--- Copyright 2010 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2010 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
local sid = arg[1]
diff --git a/applications/luci-app-radvd/luasrc/model/cbi/radvd/route.lua b/applications/luci-app-radvd/luasrc/model/cbi/radvd/route.lua
index 7a90798e02..1aac27a63f 100644
--- a/applications/luci-app-radvd/luasrc/model/cbi/radvd/route.lua
+++ b/applications/luci-app-radvd/luasrc/model/cbi/radvd/route.lua
@@ -1,4 +1,4 @@
--- Copyright 2010 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2010 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
local sid = arg[1]
diff --git a/applications/luci-app-radvd/po/de/radvd.po b/applications/luci-app-radvd/po/de/radvd.po
index 4afdbb0ca3..a294619055 100644
--- a/applications/luci-app-radvd/po/de/radvd.po
+++ b/applications/luci-app-radvd/po/de/radvd.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"PO-Revision-Date: 2012-04-15 16:46+0200\n"
-"Last-Translator: Jo-Philipp <xm@subsignal.org>\n"
+"Last-Translator: Jo-Philipp <jow@openwrt.org>\n"
"Language-Team: German\n"
"Language: de\n"
"MIME-Version: 1.0\n"
diff --git a/applications/luci-app-radvd/po/en/radvd.po b/applications/luci-app-radvd/po/en/radvd.po
index 8e0fb01a51..63f8fa0d5c 100644
--- a/applications/luci-app-radvd/po/en/radvd.po
+++ b/applications/luci-app-radvd/po/en/radvd.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"PO-Revision-Date: 2010-11-21 04:06+0100\n"
-"Last-Translator: <xm@subsignal.org>\n"
+"Last-Translator: <jow@openwrt.org>\n"
"Language-Team: German\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/applications/luci-app-radvd/po/ms/radvd.po b/applications/luci-app-radvd/po/ms/radvd.po
index 8e0fb01a51..63f8fa0d5c 100644
--- a/applications/luci-app-radvd/po/ms/radvd.po
+++ b/applications/luci-app-radvd/po/ms/radvd.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"PO-Revision-Date: 2010-11-21 04:06+0100\n"
-"Last-Translator: <xm@subsignal.org>\n"
+"Last-Translator: <jow@openwrt.org>\n"
"Language-Team: German\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/applications/luci-app-radvd/po/pt/radvd.po b/applications/luci-app-radvd/po/pt/radvd.po
index 8e0fb01a51..63f8fa0d5c 100644
--- a/applications/luci-app-radvd/po/pt/radvd.po
+++ b/applications/luci-app-radvd/po/pt/radvd.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"PO-Revision-Date: 2010-11-21 04:06+0100\n"
-"Last-Translator: <xm@subsignal.org>\n"
+"Last-Translator: <jow@openwrt.org>\n"
"Language-Team: German\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/applications/luci-app-radvd/po/vi/radvd.po b/applications/luci-app-radvd/po/vi/radvd.po
index 8e0fb01a51..63f8fa0d5c 100644
--- a/applications/luci-app-radvd/po/vi/radvd.po
+++ b/applications/luci-app-radvd/po/vi/radvd.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"PO-Revision-Date: 2010-11-21 04:06+0100\n"
-"Last-Translator: <xm@subsignal.org>\n"
+"Last-Translator: <jow@openwrt.org>\n"
"Language-Team: German\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/applications/luci-app-samba/luasrc/controller/samba.lua b/applications/luci-app-samba/luasrc/controller/samba.lua
index e239a8264f..397af6a823 100644
--- a/applications/luci-app-samba/luasrc/controller/samba.lua
+++ b/applications/luci-app-samba/luasrc/controller/samba.lua
@@ -1,5 +1,5 @@
-- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
module("luci.controller.samba", package.seeall)
diff --git a/applications/luci-app-samba/luasrc/model/cbi/samba.lua b/applications/luci-app-samba/luasrc/model/cbi/samba.lua
index 42da8c4073..721191a7ee 100644
--- a/applications/luci-app-samba/luasrc/model/cbi/samba.lua
+++ b/applications/luci-app-samba/luasrc/model/cbi/samba.lua
@@ -1,5 +1,5 @@
-- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
m = Map("samba", translate("Network Shares"))
diff --git a/applications/luci-app-siitwizard/luasrc/controller/siitwizard.lua b/applications/luci-app-siitwizard/luasrc/controller/siitwizard.lua
index 6cbe990341..4d1c140b03 100644
--- a/applications/luci-app-siitwizard/luasrc/controller/siitwizard.lua
+++ b/applications/luci-app-siitwizard/luasrc/controller/siitwizard.lua
@@ -1,5 +1,5 @@
-- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
module "luci.controller.siitwizard"
diff --git a/applications/luci-app-siitwizard/luasrc/model/cbi/siitwizard.lua b/applications/luci-app-siitwizard/luasrc/model/cbi/siitwizard.lua
index 32ba1da6f4..4068cdbf54 100644
--- a/applications/luci-app-siitwizard/luasrc/model/cbi/siitwizard.lua
+++ b/applications/luci-app-siitwizard/luasrc/model/cbi/siitwizard.lua
@@ -1,5 +1,5 @@
-- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
local uci = require "luci.model.uci".cursor()
diff --git a/applications/luci-app-splash/luasrc/model/cbi/splash/splashtext.lua b/applications/luci-app-splash/luasrc/model/cbi/splash/splashtext.lua
index 8d819157a5..8ceffc8183 100644
--- a/applications/luci-app-splash/luasrc/model/cbi/splash/splashtext.lua
+++ b/applications/luci-app-splash/luasrc/model/cbi/splash/splashtext.lua
@@ -1,5 +1,5 @@
-- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
-- Copyright 2010 Manuel Munz <freifunk@somakoma.de>
-- Licensed to the public under the Apache License 2.0.
diff --git a/applications/luci-app-splash/luasrc/view/admin_status/splash.htm b/applications/luci-app-splash/luasrc/view/admin_status/splash.htm
index 91c9b1cf18..67bb2fc49e 100644
--- a/applications/luci-app-splash/luasrc/view/admin_status/splash.htm
+++ b/applications/luci-app-splash/luasrc/view/admin_status/splash.htm
@@ -1,5 +1,5 @@
<%#
- Copyright 2009 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+ Copyright 2009 Jo-Philipp Wich <jow@openwrt.org>
Licensed to the public under the Apache License 2.0.
-%>
diff --git a/applications/luci-app-splash/luasrc/view/splash/splash.htm b/applications/luci-app-splash/luasrc/view/splash/splash.htm
index 3d55866902..7626b600dc 100644
--- a/applications/luci-app-splash/luasrc/view/splash/splash.htm
+++ b/applications/luci-app-splash/luasrc/view/splash/splash.htm
@@ -1,6 +1,6 @@
<%#
Copyright 2008 Steven Barth <steven@midlink.org>
- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+ Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
Copyright 2011 Manuel Munz <freifunk at somakoma dot de>
Licensed to the public under the Apache License 2.0.
-%>
diff --git a/applications/luci-app-splash/luasrc/view/splash_splash/index.htm b/applications/luci-app-splash/luasrc/view/splash_splash/index.htm
index 080555e23c..cbf37d5804 100644
--- a/applications/luci-app-splash/luasrc/view/splash_splash/index.htm
+++ b/applications/luci-app-splash/luasrc/view/splash_splash/index.htm
@@ -1,6 +1,6 @@
<%#
Copyright 2008 Steven Barth <steven@midlink.org>
- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+ Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
Licensed to the public under the Apache License 2.0.
-%>
diff --git a/applications/luci-app-splash/luasrc/view/splash_splash/splash.htm b/applications/luci-app-splash/luasrc/view/splash_splash/splash.htm
index 7704807ba7..c63ad0f184 100644
--- a/applications/luci-app-splash/luasrc/view/splash_splash/splash.htm
+++ b/applications/luci-app-splash/luasrc/view/splash_splash/splash.htm
@@ -1,6 +1,6 @@
<%#
Copyright 2008 Steven Barth <steven@midlink.org>
- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+ Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
Licensed to the public under the Apache License 2.0.
-%>
diff --git a/applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua b/applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua
index dfe9230fa8..329341ddc4 100644
--- a/applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua
+++ b/applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua
@@ -1,5 +1,5 @@
--- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
--- Copyright 2012 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <jow@openwrt.org>
+-- Copyright 2012 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
module("luci.controller.luci_statistics.luci_statistics", package.seeall)
diff --git a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/collectd.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/collectd.lua
index 2e9989280e..663a3f12d4 100644
--- a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/collectd.lua
+++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/collectd.lua
@@ -1,4 +1,4 @@
--- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
require("luci.sys")
diff --git a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua
index 81e9c05a55..f89cdb1fb8 100644
--- a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua
+++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua
@@ -1,6 +1,6 @@
--[[
-Copyright 2011 Jo-Philipp Wich <xm@subsignal.org>
+Copyright 2011 Jo-Philipp Wich <jow@openwrt.org>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
diff --git a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpu.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpu.lua
index 3e1e528b8d..ee3fd254fb 100644
--- a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpu.lua
+++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpu.lua
@@ -1,4 +1,4 @@
--- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
m = Map("luci_statistics",
diff --git a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/csv.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/csv.lua
index 0f65fd76bd..ec45a677bf 100644
--- a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/csv.lua
+++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/csv.lua
@@ -1,4 +1,4 @@
--- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
m = Map("luci_statistics",
diff --git a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/df.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/df.lua
index cfcf4cea02..c6031fdc59 100644
--- a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/df.lua
+++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/df.lua
@@ -1,4 +1,4 @@
--- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
m = Map("luci_statistics",
diff --git a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/disk.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/disk.lua
index 04872d90b4..dc3d3fb2be 100644
--- a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/disk.lua
+++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/disk.lua
@@ -1,4 +1,4 @@
--- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
m = Map("luci_statistics",
diff --git a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/dns.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/dns.lua
index d6abf8846a..29b998b877 100644
--- a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/dns.lua
+++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/dns.lua
@@ -1,4 +1,4 @@
--- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
require("luci.sys")
diff --git a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/email.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/email.lua
index 629e121f13..e6ed4392f1 100644
--- a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/email.lua
+++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/email.lua
@@ -1,4 +1,4 @@
--- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
m = Map("luci_statistics",
diff --git a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/exec.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/exec.lua
index 63dff0fa95..48e0ec2d7a 100644
--- a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/exec.lua
+++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/exec.lua
@@ -1,4 +1,4 @@
--- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
m = Map("luci_statistics",
diff --git a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/interface.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/interface.lua
index b8ee56ffdc..752212f4d4 100644
--- a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/interface.lua
+++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/interface.lua
@@ -1,4 +1,4 @@
--- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
require("luci.sys")
diff --git a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/iptables.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/iptables.lua
index 638c9529ff..aa469843ec 100644
--- a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/iptables.lua
+++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/iptables.lua
@@ -1,4 +1,4 @@
--- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
require("luci.sys.iptparser")
diff --git a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/irq.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/irq.lua
index 42569703f1..6a8c22761a 100644
--- a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/irq.lua
+++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/irq.lua
@@ -1,4 +1,4 @@
--- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
m = Map("luci_statistics",
diff --git a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/iwinfo.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/iwinfo.lua
index 8fc5414ac1..20d9509df8 100644
--- a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/iwinfo.lua
+++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/iwinfo.lua
@@ -1,4 +1,4 @@
--- Copyright 2011 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2011 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
local m, s, o
diff --git a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/load.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/load.lua
index d8e2105343..6578291d8f 100644
--- a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/load.lua
+++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/load.lua
@@ -1,4 +1,4 @@
--- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
m = Map("luci_statistics",
diff --git a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/netlink.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/netlink.lua
index 82a5bc56f5..917abd0c43 100644
--- a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/netlink.lua
+++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/netlink.lua
@@ -1,4 +1,4 @@
--- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
require("luci.sys")
diff --git a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/network.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/network.lua
index c3286a45d9..54b15de83f 100644
--- a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/network.lua
+++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/network.lua
@@ -1,4 +1,4 @@
--- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
m = Map("luci_statistics",
diff --git a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/ping.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/ping.lua
index 3f728a8bff..3179da63b5 100644
--- a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/ping.lua
+++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/ping.lua
@@ -1,4 +1,4 @@
--- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
m = Map("luci_statistics",
diff --git a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/processes.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/processes.lua
index 013e2522ee..4171a886b9 100644
--- a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/processes.lua
+++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/processes.lua
@@ -1,4 +1,4 @@
--- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
m = Map("luci_statistics",
diff --git a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/rrdtool.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/rrdtool.lua
index bfa421e34f..b3bdf874c8 100644
--- a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/rrdtool.lua
+++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/rrdtool.lua
@@ -1,4 +1,4 @@
--- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
m = Map("luci_statistics",
diff --git a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/tcpconns.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/tcpconns.lua
index 4731d84924..3c650180aa 100644
--- a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/tcpconns.lua
+++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/tcpconns.lua
@@ -1,4 +1,4 @@
--- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
m = Map("luci_statistics",
diff --git a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/unixsock.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/unixsock.lua
index 2ae5471155..be79543b22 100644
--- a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/unixsock.lua
+++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/unixsock.lua
@@ -1,4 +1,4 @@
--- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
m = Map("luci_statistics",
diff --git a/applications/luci-app-statistics/luasrc/statistics/datatree.lua b/applications/luci-app-statistics/luasrc/statistics/datatree.lua
index b1ae010f02..806b054cb6 100644
--- a/applications/luci-app-statistics/luasrc/statistics/datatree.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/datatree.lua
@@ -1,4 +1,4 @@
--- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
module("luci.statistics.datatree", package.seeall)
diff --git a/applications/luci-app-statistics/luasrc/statistics/i18n.lua b/applications/luci-app-statistics/luasrc/statistics/i18n.lua
index ac7f1979af..5a2800d5f4 100644
--- a/applications/luci-app-statistics/luasrc/statistics/i18n.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/i18n.lua
@@ -1,4 +1,4 @@
--- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
module("luci.statistics.i18n", package.seeall)
diff --git a/applications/luci-app-statistics/luasrc/statistics/rrdtool.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool.lua
index 8d3482c161..1f8f4ff88b 100644
--- a/applications/luci-app-statistics/luasrc/statistics/rrdtool.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool.lua
@@ -1,4 +1,4 @@
--- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
module("luci.statistics.rrdtool", package.seeall)
diff --git a/applications/luci-app-statistics/luasrc/statistics/rrdtool/colors.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/colors.lua
index 8eca5c36a1..5b35dff67c 100644
--- a/applications/luci-app-statistics/luasrc/statistics/rrdtool/colors.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/colors.lua
@@ -1,4 +1,4 @@
--- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
module("luci.statistics.rrdtool.colors", package.seeall)
diff --git a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/conntrack.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/conntrack.lua
index 0142b8ff36..ee3d68fe16 100644
--- a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/conntrack.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/conntrack.lua
@@ -1,4 +1,4 @@
--- Copyright 2011 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2011 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
module("luci.statistics.rrdtool.definitions.conntrack",package.seeall)
diff --git a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpu.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpu.lua
index 78100356ee..1ca8a23ee9 100644
--- a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpu.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpu.lua
@@ -1,4 +1,4 @@
--- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
module("luci.statistics.rrdtool.definitions.cpu",package.seeall)
diff --git a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/df.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/df.lua
index afe686b22e..78c9ef5044 100644
--- a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/df.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/df.lua
@@ -1,4 +1,4 @@
--- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
module("luci.statistics.rrdtool.definitions.df", package.seeall)
diff --git a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/disk.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/disk.lua
index f2b4c0f06a..8aabb7f64e 100644
--- a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/disk.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/disk.lua
@@ -1,4 +1,4 @@
--- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
module("luci.statistics.rrdtool.definitions.disk", package.seeall)
diff --git a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/interface.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/interface.lua
index c4010a22c4..efa631d557 100644
--- a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/interface.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/interface.lua
@@ -1,4 +1,4 @@
--- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
module("luci.statistics.rrdtool.definitions.interface", package.seeall)
diff --git a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/iptables.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/iptables.lua
index ecfb944301..9790e0e3d2 100644
--- a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/iptables.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/iptables.lua
@@ -1,4 +1,4 @@
--- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
module("luci.statistics.rrdtool.definitions.iptables", package.seeall)
diff --git a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/irq.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/irq.lua
index 3e77257ddb..f61d0da646 100644
--- a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/irq.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/irq.lua
@@ -1,4 +1,4 @@
--- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
module("luci.statistics.rrdtool.definitions.irq", package.seeall)
diff --git a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/iwinfo.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/iwinfo.lua
index 4b829ef542..3ca3381ec4 100644
--- a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/iwinfo.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/iwinfo.lua
@@ -1,4 +1,4 @@
--- Copyright 2011 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2011 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
module("luci.statistics.rrdtool.definitions.iwinfo", package.seeall)
diff --git a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/load.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/load.lua
index 6dd25efce8..ce762dab46 100644
--- a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/load.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/load.lua
@@ -1,4 +1,4 @@
--- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
module("luci.statistics.rrdtool.definitions.load", package.seeall)
diff --git a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/netlink.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/netlink.lua
index cd8db053c1..b4f2ac185e 100644
--- a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/netlink.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/netlink.lua
@@ -1,4 +1,4 @@
--- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
module("luci.statistics.rrdtool.definitions.netlink", package.seeall)
diff --git a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/ping.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/ping.lua
index 1726d23001..1a72caf227 100644
--- a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/ping.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/ping.lua
@@ -1,4 +1,4 @@
--- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
module("luci.statistics.rrdtool.definitions.ping", package.seeall)
diff --git a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/processes.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/processes.lua
index 3778736637..d48441abd2 100644
--- a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/processes.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/processes.lua
@@ -1,4 +1,4 @@
--- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
module("luci.statistics.rrdtool.definitions.processes", package.seeall)
diff --git a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/tcpconns.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/tcpconns.lua
index 9d089f69ac..50a9470de5 100644
--- a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/tcpconns.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/tcpconns.lua
@@ -1,4 +1,4 @@
--- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
module("luci.statistics.rrdtool.definitions.tcpconns", package.seeall)
diff --git a/applications/luci-app-statistics/luasrc/view/admin_statistics/index.htm b/applications/luci-app-statistics/luasrc/view/admin_statistics/index.htm
index 2dc098a386..0000c1961e 100644
--- a/applications/luci-app-statistics/luasrc/view/admin_statistics/index.htm
+++ b/applications/luci-app-statistics/luasrc/view/admin_statistics/index.htm
@@ -1,6 +1,6 @@
<%#
Copyright 2008 Steven Barth <steven@midlink.org>
- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+ Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
Licensed to the public under the Apache License 2.0.
-%>
diff --git a/applications/luci-app-statistics/luasrc/view/public_statistics/graph.htm b/applications/luci-app-statistics/luasrc/view/public_statistics/graph.htm
index b9e3a0e37b..77169518d2 100644
--- a/applications/luci-app-statistics/luasrc/view/public_statistics/graph.htm
+++ b/applications/luci-app-statistics/luasrc/view/public_statistics/graph.htm
@@ -1,6 +1,6 @@
<%#
Copyright 2008 Steven Barth <steven@midlink.org>
- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+ Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
Licensed to the public under the Apache License 2.0.
-%>
diff --git a/applications/luci-app-statistics/root/usr/bin/stat-genconfig b/applications/luci-app-statistics/root/usr/bin/stat-genconfig
index 86773b4e58..cb94e28118 100755
--- a/applications/luci-app-statistics/root/usr/bin/stat-genconfig
+++ b/applications/luci-app-statistics/root/usr/bin/stat-genconfig
@@ -3,7 +3,7 @@
--[[
Luci statistics - collectd configuration generator
-(c) 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+(c) 2008 Freifunk Leipzig / Jo-Philipp Wich <jow@openwrt.org>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
diff --git a/applications/luci-app-tinyproxy/luasrc/controller/tinyproxy.lua b/applications/luci-app-tinyproxy/luasrc/controller/tinyproxy.lua
index f5ec7a5b74..cf7e974d6c 100644
--- a/applications/luci-app-tinyproxy/luasrc/controller/tinyproxy.lua
+++ b/applications/luci-app-tinyproxy/luasrc/controller/tinyproxy.lua
@@ -1,5 +1,5 @@
-- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
module("luci.controller.tinyproxy", package.seeall)
diff --git a/applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua b/applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua
index bf3a040ff1..19bdd9afc1 100644
--- a/applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua
+++ b/applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua
@@ -1,5 +1,5 @@
-- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2008-2010 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2008-2010 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
m = Map("tinyproxy", translate("Tinyproxy"),
diff --git a/applications/luci-app-upnp/luasrc/controller/upnp.lua b/applications/luci-app-upnp/luasrc/controller/upnp.lua
index 619b6f4770..8fc697fd6a 100644
--- a/applications/luci-app-upnp/luasrc/controller/upnp.lua
+++ b/applications/luci-app-upnp/luasrc/controller/upnp.lua
@@ -1,5 +1,5 @@
-- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
module("luci.controller.upnp", package.seeall)
diff --git a/applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua b/applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua
index 46658bc4aa..f1bb450dd5 100644
--- a/applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua
+++ b/applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua
@@ -1,5 +1,5 @@
-- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2008-2011 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2008-2011 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
m = Map("upnpd", luci.util.pcdata(translate("Universal Plug & Play")),
diff --git a/applications/luci-app-vnstat/luasrc/model/cbi/vnstat.lua b/applications/luci-app-vnstat/luasrc/model/cbi/vnstat.lua
index 32b9fce8b4..c60c64950c 100644
--- a/applications/luci-app-vnstat/luasrc/model/cbi/vnstat.lua
+++ b/applications/luci-app-vnstat/luasrc/model/cbi/vnstat.lua
@@ -1,4 +1,4 @@
--- Copyright 2010-2011 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2010-2011 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
local utl = require "luci.util"
diff --git a/applications/luci-app-vnstat/luasrc/view/vnstat.htm b/applications/luci-app-vnstat/luasrc/view/vnstat.htm
index 578bbc92d5..cfa1a5de51 100644
--- a/applications/luci-app-vnstat/luasrc/view/vnstat.htm
+++ b/applications/luci-app-vnstat/luasrc/view/vnstat.htm
@@ -1,5 +1,5 @@
<%#
- Copyright 2010 Jo-Philipp Wich <xm@subsignal.org>
+ Copyright 2010 Jo-Philipp Wich <jow@openwrt.org>
Licensed to the public under the Apache License 2.0.
-%>
diff --git a/applications/luci-app-vnstat/po/de/vnstat.po b/applications/luci-app-vnstat/po/de/vnstat.po
index e42f4f0f0e..aab7494a12 100644
--- a/applications/luci-app-vnstat/po/de/vnstat.po
+++ b/applications/luci-app-vnstat/po/de/vnstat.po
@@ -3,7 +3,7 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: \n"
"PO-Revision-Date: 2010-11-16 21:06+0100\n"
-"Last-Translator: Jo-Philipp Wich <xm@subsignal.org>\n"
+"Last-Translator: Jo-Philipp Wich <jow@openwrt.org>\n"
"Language-Team: German\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/applications/luci-app-vnstat/po/el/vnstat.po b/applications/luci-app-vnstat/po/el/vnstat.po
index 9d237780db..04590eadd4 100644
--- a/applications/luci-app-vnstat/po/el/vnstat.po
+++ b/applications/luci-app-vnstat/po/el/vnstat.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"PO-Revision-Date: 2010-11-16 20:54+0100\n"
-"Last-Translator: <xm@subsignal.org>\n"
+"Last-Translator: <jow@openwrt.org>\n"
"Language-Team: German\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/applications/luci-app-vnstat/po/en/vnstat.po b/applications/luci-app-vnstat/po/en/vnstat.po
index 9d237780db..04590eadd4 100644
--- a/applications/luci-app-vnstat/po/en/vnstat.po
+++ b/applications/luci-app-vnstat/po/en/vnstat.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"PO-Revision-Date: 2010-11-16 20:54+0100\n"
-"Last-Translator: <xm@subsignal.org>\n"
+"Last-Translator: <jow@openwrt.org>\n"
"Language-Team: German\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/applications/luci-app-vnstat/po/ms/vnstat.po b/applications/luci-app-vnstat/po/ms/vnstat.po
index 9d237780db..04590eadd4 100644
--- a/applications/luci-app-vnstat/po/ms/vnstat.po
+++ b/applications/luci-app-vnstat/po/ms/vnstat.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"PO-Revision-Date: 2010-11-16 20:54+0100\n"
-"Last-Translator: <xm@subsignal.org>\n"
+"Last-Translator: <jow@openwrt.org>\n"
"Language-Team: German\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/applications/luci-app-vnstat/po/vi/vnstat.po b/applications/luci-app-vnstat/po/vi/vnstat.po
index 9e837ad9e5..0303835f62 100644
--- a/applications/luci-app-vnstat/po/vi/vnstat.po
+++ b/applications/luci-app-vnstat/po/vi/vnstat.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"PO-Revision-Date: 2010-11-16 20:55+0100\n"
-"Last-Translator: <xm@subsignal.org>\n"
+"Last-Translator: <jow@openwrt.org>\n"
"Language-Team: German\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/applications/luci-app-wol/luasrc/model/cbi/wol.lua b/applications/luci-app-wol/luasrc/model/cbi/wol.lua
index cc4d9b07c9..e87cac3dc2 100644
--- a/applications/luci-app-wol/luasrc/model/cbi/wol.lua
+++ b/applications/luci-app-wol/luasrc/model/cbi/wol.lua
@@ -1,4 +1,4 @@
--- Copyright 2010 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2010 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
local sys = require "luci.sys"
diff --git a/applications/luci-app-wol/po/de/wol.po b/applications/luci-app-wol/po/de/wol.po
index 21ebc8f2a0..52940efa38 100644
--- a/applications/luci-app-wol/po/de/wol.po
+++ b/applications/luci-app-wol/po/de/wol.po
@@ -6,7 +6,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-04-19 00:29+0200\n"
"PO-Revision-Date: 2011-06-11 01:37+0200\n"
-"Last-Translator: Jo-Philipp <xm@subsignal.org>\n"
+"Last-Translator: Jo-Philipp <jow@openwrt.org>\n"
"Language-Team: none\n"
"Language: de\n"
"MIME-Version: 1.0\n"
diff --git a/contrib/package/freifunk-firewall/Makefile b/contrib/package/freifunk-firewall/Makefile
index 5bcb2c8ad5..b9d328c66e 100644
--- a/contrib/package/freifunk-firewall/Makefile
+++ b/contrib/package/freifunk-firewall/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2009 Jo-Philipp Wich <xm@subsignal.org>
+# Copyright (C) 2009 Jo-Philipp Wich <jow@openwrt.org>
#
# This is free software, licensed under the Apache 2.0 license.
#
diff --git a/contrib/package/freifunk-p2pblock/Makefile b/contrib/package/freifunk-p2pblock/Makefile
index 6bf3a96104..8eeafbb4f0 100644
--- a/contrib/package/freifunk-p2pblock/Makefile
+++ b/contrib/package/freifunk-p2pblock/Makefile
@@ -1,6 +1,6 @@
#
# Copyright (C) 2009 Andreas Seidler <tetzlav@subsignal.org>
-# Copyright (C) 2012 Jo-Philipp Wich <xm@subsignal.org>
+# Copyright (C) 2012 Jo-Philipp Wich <jow@openwrt.org>
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
diff --git a/contrib/package/freifunk-watchdog/Makefile b/contrib/package/freifunk-watchdog/Makefile
index 33ba33da3e..c720c251d1 100644
--- a/contrib/package/freifunk-watchdog/Makefile
+++ b/contrib/package/freifunk-watchdog/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2009-2012 Jo-Philipp Wich <xm@subsignal.org>
+# Copyright (C) 2009-2012 Jo-Philipp Wich <jow@openwrt.org>
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
diff --git a/contrib/package/freifunk-watchdog/src/ucix.c b/contrib/package/freifunk-watchdog/src/ucix.c
index 44de25903d..f2f69fc369 100644
--- a/contrib/package/freifunk-watchdog/src/ucix.c
+++ b/contrib/package/freifunk-watchdog/src/ucix.c
@@ -15,7 +15,7 @@
*
* Copyright (C) 2008 John Crispin <blogic@openwrt.org>
*
- * Changed by Jo-Philipp Wich <xm@subsignal.org>
+ * Changed by Jo-Philipp Wich <jow@openwrt.org>
*/
#include <string.h>
diff --git a/contrib/package/freifunk-watchdog/src/watchdog.c b/contrib/package/freifunk-watchdog/src/watchdog.c
index ce66adadb4..f546985c9c 100644
--- a/contrib/package/freifunk-watchdog/src/watchdog.c
+++ b/contrib/package/freifunk-watchdog/src/watchdog.c
@@ -13,7 +13,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
*
- * Copyright (C) 2009 Jo-Philipp Wich <xm@subsignal.org>
+ * Copyright (C) 2009 Jo-Philipp Wich <jow@openwrt.org>
*/
#include "watchdog.h"
diff --git a/contrib/package/freifunk-watchdog/src/watchdog.h b/contrib/package/freifunk-watchdog/src/watchdog.h
index 34d616c3a0..3aa8876400 100644
--- a/contrib/package/freifunk-watchdog/src/watchdog.h
+++ b/contrib/package/freifunk-watchdog/src/watchdog.h
@@ -13,7 +13,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
*
- * Copyright (C) 2009 Jo-Philipp Wich <xm@subsignal.org>
+ * Copyright (C) 2009 Jo-Philipp Wich <jow@openwrt.org>
*/
#include <stdio.h>
diff --git a/contrib/package/remote-update/Makefile b/contrib/package/remote-update/Makefile
index 2bb3b24cde..4f8b3a596b 100644
--- a/contrib/package/remote-update/Makefile
+++ b/contrib/package/remote-update/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2009 Jo-Philipp Wich <xm@subsignal.org>
+# Copyright (C) 2009 Jo-Philipp Wich <jow@openwrt.org>
#
# This is free software, licensed under the Apache 2.0 license.
#
diff --git a/libs/luci-lib-json/luasrc/json.lua b/libs/luci-lib-json/luasrc/json.lua
index 9cf206e960..57b12c9405 100644
--- a/libs/luci-lib-json/luasrc/json.lua
+++ b/libs/luci-lib-json/luasrc/json.lua
@@ -1,5 +1,5 @@
-- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
local nixio = require "nixio"
diff --git a/libs/luci-lib-nixio/NOTICE b/libs/luci-lib-nixio/NOTICE
index f557831e8e..96d119282c 100644
--- a/libs/luci-lib-nixio/NOTICE
+++ b/libs/luci-lib-nixio/NOTICE
@@ -7,4 +7,4 @@ axTLS - Copyright 2008 Cameron Rich
Thanks for testing, feedback and code snippets:
John Crispin <blogic@openwrt.org>
-Jo-Philipp Wich <xm@leipzig.freifunk.net> \ No newline at end of file
+Jo-Philipp Wich <jow@openwrt.org> \ No newline at end of file
diff --git a/modules/luci-base/htdocs/luci-static/resources/cbi.js b/modules/luci-base/htdocs/luci-static/resources/cbi.js
index 02814a5428..5e31bf2099 100644
--- a/modules/luci-base/htdocs/luci-static/resources/cbi.js
+++ b/modules/luci-base/htdocs/luci-static/resources/cbi.js
@@ -2,7 +2,7 @@
LuCI - Lua Configuration Interface
Copyright 2008 Steven Barth <steven@midlink.org>
- Copyright 2008-2012 Jo-Philipp Wich <xm@subsignal.org>
+ Copyright 2008-2012 Jo-Philipp Wich <jow@openwrt.org>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
diff --git a/modules/luci-base/luasrc/cacheloader.lua b/modules/luci-base/luasrc/cacheloader.lua
index a5ca8965f4..11e5f6900f 100644
--- a/modules/luci-base/luasrc/cacheloader.lua
+++ b/modules/luci-base/luasrc/cacheloader.lua
@@ -1,5 +1,5 @@
-- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
local config = require "luci.config"
diff --git a/modules/luci-base/luasrc/cbi/datatypes.lua b/modules/luci-base/luasrc/cbi/datatypes.lua
index c52ac4688a..ebd7e594f7 100644
--- a/modules/luci-base/luasrc/cbi/datatypes.lua
+++ b/modules/luci-base/luasrc/cbi/datatypes.lua
@@ -1,4 +1,4 @@
--- Copyright 2010 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2010 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
local fs = require "nixio.fs"
diff --git a/modules/luci-base/luasrc/ccache.lua b/modules/luci-base/luasrc/ccache.lua
index 14677c7e5d..bcc76e6a7b 100644
--- a/modules/luci-base/luasrc/ccache.lua
+++ b/modules/luci-base/luasrc/ccache.lua
@@ -1,5 +1,5 @@
-- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
local io = require "io"
diff --git a/modules/luci-base/luasrc/controller/admin/servicectl.lua b/modules/luci-base/luasrc/controller/admin/servicectl.lua
index da41c7aaa9..5b855cb24b 100644
--- a/modules/luci-base/luasrc/controller/admin/servicectl.lua
+++ b/modules/luci-base/luasrc/controller/admin/servicectl.lua
@@ -1,4 +1,4 @@
--- Copyright 2010 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2010 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
module("luci.controller.admin.servicectl", package.seeall)
diff --git a/modules/luci-base/luasrc/http/protocol.lua b/modules/luci-base/luasrc/http/protocol.lua
index a0211a6c42..aeb7ea6211 100644
--- a/modules/luci-base/luasrc/http/protocol.lua
+++ b/modules/luci-base/luasrc/http/protocol.lua
@@ -1,4 +1,4 @@
--- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
--- LuCI http protocol class.
diff --git a/modules/luci-base/luasrc/http/protocol/conditionals.lua b/modules/luci-base/luasrc/http/protocol/conditionals.lua
index b8269e30d6..1d40425ff9 100644
--- a/modules/luci-base/luasrc/http/protocol/conditionals.lua
+++ b/modules/luci-base/luasrc/http/protocol/conditionals.lua
@@ -1,4 +1,4 @@
--- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
--- LuCI http protocol implementation - HTTP/1.1 bits.
diff --git a/modules/luci-base/luasrc/http/protocol/date.lua b/modules/luci-base/luasrc/http/protocol/date.lua
index 161107ce08..3105f37f63 100644
--- a/modules/luci-base/luasrc/http/protocol/date.lua
+++ b/modules/luci-base/luasrc/http/protocol/date.lua
@@ -1,4 +1,4 @@
--- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
--- LuCI http protocol implementation - date helper class.
diff --git a/modules/luci-base/luasrc/http/protocol/mime.lua b/modules/luci-base/luasrc/http/protocol/mime.lua
index 2ea4b41638..15da15cf8b 100644
--- a/modules/luci-base/luasrc/http/protocol/mime.lua
+++ b/modules/luci-base/luasrc/http/protocol/mime.lua
@@ -1,4 +1,4 @@
--- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
--- LuCI http protocol implementation - mime helper class.
diff --git a/modules/luci-base/luasrc/ip.lua b/modules/luci-base/luasrc/ip.lua
index 4c2acb04d2..d8aaea91d2 100644
--- a/modules/luci-base/luasrc/ip.lua
+++ b/modules/luci-base/luasrc/ip.lua
@@ -1,4 +1,4 @@
--- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
-- Copyright 2008 Steven Barth <steven@midlink.org>
-- Licensed to the public under the Apache License 2.0.
diff --git a/modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua b/modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua
index 84d6e3d2ee..dc702e4a95 100644
--- a/modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua
+++ b/modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua
@@ -1,4 +1,4 @@
--- Copyright 2011-2012 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2011-2012 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
local map, section, net = ...
diff --git a/modules/luci-base/luasrc/model/cbi/admin_network/proto_none.lua b/modules/luci-base/luasrc/model/cbi/admin_network/proto_none.lua
index 52dc3807e0..6fdded9adb 100644
--- a/modules/luci-base/luasrc/model/cbi/admin_network/proto_none.lua
+++ b/modules/luci-base/luasrc/model/cbi/admin_network/proto_none.lua
@@ -1,4 +1,4 @@
--- Copyright 2011 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2011 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
local map, section, net = ...
diff --git a/modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua b/modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua
index 9348494796..f49fed4a56 100644
--- a/modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua
+++ b/modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua
@@ -1,4 +1,4 @@
--- Copyright 2011 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2011 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
local map, section, net = ...
diff --git a/modules/luci-base/luasrc/model/firewall.lua b/modules/luci-base/luasrc/model/firewall.lua
index a0f334a6b7..5573a9b86c 100644
--- a/modules/luci-base/luasrc/model/firewall.lua
+++ b/modules/luci-base/luasrc/model/firewall.lua
@@ -1,4 +1,4 @@
--- Copyright 2009 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2009 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
local type, pairs, ipairs, table, luci, math
diff --git a/modules/luci-base/luasrc/model/ipkg.lua b/modules/luci-base/luasrc/model/ipkg.lua
index f5a11c23ee..216caa5cca 100644
--- a/modules/luci-base/luasrc/model/ipkg.lua
+++ b/modules/luci-base/luasrc/model/ipkg.lua
@@ -1,4 +1,4 @@
--- Copyright 2008-2011 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2008-2011 Jo-Philipp Wich <jow@openwrt.org>
-- Copyright 2008 Steven Barth <steven@midlink.org>
-- Licensed to the public under the Apache License 2.0.
diff --git a/modules/luci-base/luasrc/sgi/uhttpd.lua b/modules/luci-base/luasrc/sgi/uhttpd.lua
index 64395fe533..2836bf00cf 100644
--- a/modules/luci-base/luasrc/sgi/uhttpd.lua
+++ b/modules/luci-base/luasrc/sgi/uhttpd.lua
@@ -1,4 +1,4 @@
--- Copyright 2010 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2010 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
require "nixio.util"
diff --git a/modules/luci-base/luasrc/store.lua b/modules/luci-base/luasrc/store.lua
index 45444d0bdb..34eb296229 100644
--- a/modules/luci-base/luasrc/store.lua
+++ b/modules/luci-base/luasrc/store.lua
@@ -1,5 +1,5 @@
-- Copyright 2009 Steven Barth <steven@midlink.org>
--- Copyright 2009 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2009 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
local util = require "luci.util"
diff --git a/modules/luci-base/luasrc/sys/iptparser.lua b/modules/luci-base/luasrc/sys/iptparser.lua
index d82363309a..6715937c69 100644
--- a/modules/luci-base/luasrc/sys/iptparser.lua
+++ b/modules/luci-base/luasrc/sys/iptparser.lua
@@ -1,7 +1,7 @@
--[[
Iptables parser and query library
-(c) 2008-2009 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+(c) 2008-2009 Jo-Philipp Wich <jow@openwrt.org>
(c) 2008-2009 Steven Barth <steven@midlink.org>
Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/modules/luci-base/luasrc/tools/proto.lua b/modules/luci-base/luasrc/tools/proto.lua
index a2e20880a5..147688d2ca 100644
--- a/modules/luci-base/luasrc/tools/proto.lua
+++ b/modules/luci-base/luasrc/tools/proto.lua
@@ -1,4 +1,4 @@
--- Copyright 2012 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2012 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
module("luci.tools.proto", package.seeall)
diff --git a/modules/luci-base/luasrc/tools/status.lua b/modules/luci-base/luasrc/tools/status.lua
index 1723525980..6e588fe71d 100644
--- a/modules/luci-base/luasrc/tools/status.lua
+++ b/modules/luci-base/luasrc/tools/status.lua
@@ -1,4 +1,4 @@
--- Copyright 2011 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2011 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
module("luci.tools.status", package.seeall)
diff --git a/modules/luci-base/luasrc/tools/webadmin.lua b/modules/luci-base/luasrc/tools/webadmin.lua
index 75b2f2ebfa..9adac29bfa 100644
--- a/modules/luci-base/luasrc/tools/webadmin.lua
+++ b/modules/luci-base/luasrc/tools/webadmin.lua
@@ -1,5 +1,5 @@
-- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
module("luci.tools.webadmin", package.seeall)
diff --git a/modules/luci-base/luasrc/view/error404.htm b/modules/luci-base/luasrc/view/error404.htm
index e5fe89b956..c2be29ed58 100644
--- a/modules/luci-base/luasrc/view/error404.htm
+++ b/modules/luci-base/luasrc/view/error404.htm
@@ -1,6 +1,6 @@
<%#
Copyright 2008 Steven Barth <steven@midlink.org>
- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+ Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
Licensed to the public under the Apache License 2.0.
-%>
diff --git a/modules/luci-base/luasrc/view/error500.htm b/modules/luci-base/luasrc/view/error500.htm
index 54d88b48af..8fb18ed076 100644
--- a/modules/luci-base/luasrc/view/error500.htm
+++ b/modules/luci-base/luasrc/view/error500.htm
@@ -1,6 +1,6 @@
<%#
Copyright 2008 Steven Barth <steven@midlink.org>
- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+ Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
Licensed to the public under the Apache License 2.0.
-%>
diff --git a/modules/luci-base/luasrc/view/footer.htm b/modules/luci-base/luasrc/view/footer.htm
index a9ba2baef0..f3574b6b10 100644
--- a/modules/luci-base/luasrc/view/footer.htm
+++ b/modules/luci-base/luasrc/view/footer.htm
@@ -1,6 +1,6 @@
<%#
Copyright 2008 Steven Barth <steven@midlink.org>
- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+ Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
Licensed to the public under the Apache License 2.0.
-%>
diff --git a/modules/luci-base/luasrc/view/header.htm b/modules/luci-base/luasrc/view/header.htm
index 9a35eba6c1..f6e20c9a40 100644
--- a/modules/luci-base/luasrc/view/header.htm
+++ b/modules/luci-base/luasrc/view/header.htm
@@ -1,6 +1,6 @@
<%#
Copyright 2008 Steven Barth <steven@midlink.org>
- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+ Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
Licensed to the public under the Apache License 2.0.
-%>
diff --git a/modules/luci-base/luasrc/view/indexer.htm b/modules/luci-base/luasrc/view/indexer.htm
index 37e7297ec5..28fc3debc3 100644
--- a/modules/luci-base/luasrc/view/indexer.htm
+++ b/modules/luci-base/luasrc/view/indexer.htm
@@ -1,6 +1,6 @@
<%#
Copyright 2008 Steven Barth <steven@midlink.org>
- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+ Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
Licensed to the public under the Apache License 2.0.
-%>
diff --git a/modules/luci-base/luasrc/view/sysauth.htm b/modules/luci-base/luasrc/view/sysauth.htm
index a23c61bb77..7f0f0a622b 100644
--- a/modules/luci-base/luasrc/view/sysauth.htm
+++ b/modules/luci-base/luasrc/view/sysauth.htm
@@ -1,6 +1,6 @@
<%#
Copyright 2008 Steven Barth <steven@midlink.org>
- Copyright 2008-2012 Jo-Philipp Wich <xm@subsignal.org>
+ Copyright 2008-2012 Jo-Philipp Wich <jow@openwrt.org>
Licensed to the public under the Apache License 2.0.
-%>
diff --git a/modules/luci-base/src/po2lmo.c b/modules/luci-base/src/po2lmo.c
index 0da792b680..fd927cb52f 100644
--- a/modules/luci-base/src/po2lmo.c
+++ b/modules/luci-base/src/po2lmo.c
@@ -1,7 +1,7 @@
/*
* lmo - Lua Machine Objects - PO to LMO conversion tool
*
- * Copyright (C) 2009-2012 Jo-Philipp Wich <xm@subsignal.org>
+ * Copyright (C) 2009-2012 Jo-Philipp Wich <jow@openwrt.org>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/modules/luci-base/src/template_lmo.c b/modules/luci-base/src/template_lmo.c
index 27205a7228..3d1eaf4e08 100644
--- a/modules/luci-base/src/template_lmo.c
+++ b/modules/luci-base/src/template_lmo.c
@@ -1,7 +1,7 @@
/*
* lmo - Lua Machine Objects - Base functions
*
- * Copyright (C) 2009-2010 Jo-Philipp Wich <xm@subsignal.org>
+ * Copyright (C) 2009-2010 Jo-Philipp Wich <jow@openwrt.org>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/modules/luci-base/src/template_lmo.h b/modules/luci-base/src/template_lmo.h
index 57f59aa56b..f251c63ddd 100644
--- a/modules/luci-base/src/template_lmo.h
+++ b/modules/luci-base/src/template_lmo.h
@@ -1,7 +1,7 @@
/*
* lmo - Lua Machine Objects - General header
*
- * Copyright (C) 2009-2012 Jo-Philipp Wich <xm@subsignal.org>
+ * Copyright (C) 2009-2012 Jo-Philipp Wich <jow@openwrt.org>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/modules/luci-base/src/template_lualib.c b/modules/luci-base/src/template_lualib.c
index 1035611885..d5c8dd6b4c 100644
--- a/modules/luci-base/src/template_lualib.c
+++ b/modules/luci-base/src/template_lualib.c
@@ -1,7 +1,7 @@
/*
* LuCI Template - Lua binding
*
- * Copyright (C) 2009 Jo-Philipp Wich <xm@subsignal.org>
+ * Copyright (C) 2009 Jo-Philipp Wich <jow@openwrt.org>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/modules/luci-base/src/template_lualib.h b/modules/luci-base/src/template_lualib.h
index 1b659be126..ff7746d158 100644
--- a/modules/luci-base/src/template_lualib.h
+++ b/modules/luci-base/src/template_lualib.h
@@ -1,7 +1,7 @@
/*
* LuCI Template - Lua library header
*
- * Copyright (C) 2009 Jo-Philipp Wich <xm@subsignal.org>
+ * Copyright (C) 2009 Jo-Philipp Wich <jow@openwrt.org>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/modules/luci-base/src/template_parser.c b/modules/luci-base/src/template_parser.c
index c263fbf9fd..0ef08c63d2 100644
--- a/modules/luci-base/src/template_parser.c
+++ b/modules/luci-base/src/template_parser.c
@@ -1,7 +1,7 @@
/*
* LuCI Template - Parser implementation
*
- * Copyright (C) 2009-2012 Jo-Philipp Wich <xm@subsignal.org>
+ * Copyright (C) 2009-2012 Jo-Philipp Wich <jow@openwrt.org>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/modules/luci-base/src/template_parser.h b/modules/luci-base/src/template_parser.h
index a3200a2df3..2415e87079 100644
--- a/modules/luci-base/src/template_parser.h
+++ b/modules/luci-base/src/template_parser.h
@@ -1,7 +1,7 @@
/*
* LuCI Template - Parser header
*
- * Copyright (C) 2009 Jo-Philipp Wich <xm@subsignal.org>
+ * Copyright (C) 2009 Jo-Philipp Wich <jow@openwrt.org>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/modules/luci-base/src/template_utils.c b/modules/luci-base/src/template_utils.c
index 6c4baa669c..3979487f12 100644
--- a/modules/luci-base/src/template_utils.c
+++ b/modules/luci-base/src/template_utils.c
@@ -1,7 +1,7 @@
/*
* LuCI Template - Utility functions
*
- * Copyright (C) 2010 Jo-Philipp Wich <xm@subsignal.org>
+ * Copyright (C) 2010 Jo-Philipp Wich <jow@openwrt.org>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/modules/luci-base/src/template_utils.h b/modules/luci-base/src/template_utils.h
index c54af757c5..32a79f93bc 100644
--- a/modules/luci-base/src/template_utils.h
+++ b/modules/luci-base/src/template_utils.h
@@ -1,7 +1,7 @@
/*
* LuCI Template - Utility header
*
- * Copyright (C) 2010-2012 Jo-Philipp Wich <xm@subsignal.org>
+ * Copyright (C) 2010-2012 Jo-Philipp Wich <jow@openwrt.org>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/modules/luci-mod-admin-full/luasrc/controller/admin/filebrowser.lua b/modules/luci-mod-admin-full/luasrc/controller/admin/filebrowser.lua
index 26f861da03..2572615138 100644
--- a/modules/luci-mod-admin-full/luasrc/controller/admin/filebrowser.lua
+++ b/modules/luci-mod-admin-full/luasrc/controller/admin/filebrowser.lua
@@ -1,5 +1,5 @@
-- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
module("luci.controller.admin.filebrowser", package.seeall)
diff --git a/modules/luci-mod-admin-full/luasrc/controller/admin/network.lua b/modules/luci-mod-admin-full/luasrc/controller/admin/network.lua
index 401acad7cd..6e578e013c 100644
--- a/modules/luci-mod-admin-full/luasrc/controller/admin/network.lua
+++ b/modules/luci-mod-admin-full/luasrc/controller/admin/network.lua
@@ -1,5 +1,5 @@
-- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2011 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2011 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
module("luci.controller.admin.network", package.seeall)
diff --git a/modules/luci-mod-admin-full/luasrc/controller/admin/status.lua b/modules/luci-mod-admin-full/luasrc/controller/admin/status.lua
index 01d195bd0f..2d81caf242 100644
--- a/modules/luci-mod-admin-full/luasrc/controller/admin/status.lua
+++ b/modules/luci-mod-admin-full/luasrc/controller/admin/status.lua
@@ -1,5 +1,5 @@
-- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2011 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2011 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
module("luci.controller.admin.status", package.seeall)
diff --git a/modules/luci-mod-admin-full/luasrc/controller/admin/system.lua b/modules/luci-mod-admin-full/luasrc/controller/admin/system.lua
index 0b202a8324..055142b53e 100644
--- a/modules/luci-mod-admin-full/luasrc/controller/admin/system.lua
+++ b/modules/luci-mod-admin-full/luasrc/controller/admin/system.lua
@@ -1,5 +1,5 @@
-- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2008-2011 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2008-2011 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
module("luci.controller.admin.system", package.seeall)
diff --git a/modules/luci-mod-admin-full/luasrc/controller/admin/uci.lua b/modules/luci-mod-admin-full/luasrc/controller/admin/uci.lua
index e6c4251117..6de3c73a3c 100644
--- a/modules/luci-mod-admin-full/luasrc/controller/admin/uci.lua
+++ b/modules/luci-mod-admin-full/luasrc/controller/admin/uci.lua
@@ -1,5 +1,5 @@
-- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2010 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2010 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
module("luci.controller.admin.uci", package.seeall)
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/hosts.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/hosts.lua
index 18f7172224..da7c1181f7 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/hosts.lua
+++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/hosts.lua
@@ -1,5 +1,5 @@
-- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2010 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2010 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
require("luci.sys")
diff --git a/modules/luci-mod-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 4c360839a2..da1e140de0 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/iface_add.lua
+++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/iface_add.lua
@@ -1,4 +1,4 @@
--- Copyright 2009-2010 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2009-2010 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
local nw = require "luci.model.network".init()
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/ifaces.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/ifaces.lua
index d251b31374..eabb257680 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/ifaces.lua
+++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/ifaces.lua
@@ -1,5 +1,5 @@
-- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2008-2011 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2008-2011 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
local fs = require "nixio.fs"
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/network.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/network.lua
index 535e4a1102..2be88fcf80 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/network.lua
+++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/network.lua
@@ -1,5 +1,5 @@
-- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
local fs = require "nixio.fs"
diff --git a/modules/luci-mod-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 34ca7659d0..0818199a93 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/proto_ahcp.lua
+++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/proto_ahcp.lua
@@ -1,4 +1,4 @@
--- Copyright 2011 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2011 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
local map, section, net = ...
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/vlan.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/vlan.lua
index 612c0fbdc8..40f8014f1a 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/vlan.lua
+++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/vlan.lua
@@ -1,5 +1,5 @@
-- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2010-2011 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2010-2011 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
m = Map("network", translate("Switch"), translate("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."))
diff --git a/modules/luci-mod-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 d3af5699d9..96b8b4d740 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_add.lua
+++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_add.lua
@@ -1,4 +1,4 @@
--- Copyright 2009 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2009 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
local fs = require "nixio.fs"
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_status/processes.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_status/processes.lua
index 8a95529a7e..0a6e48fd8e 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_status/processes.lua
+++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_status/processes.lua
@@ -1,5 +1,5 @@
-- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
f = SimpleForm("processes", translate("Processes"), translate("This list gives an overview over currently running system processes and their status."))
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/admin.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/admin.lua
index 8e24336b55..1e475640be 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/admin.lua
+++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/admin.lua
@@ -1,5 +1,5 @@
-- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2011 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2011 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
local fs = require "nixio.fs"
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/backupfiles.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/backupfiles.lua
index b2240a37e7..ee2401e93d 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/backupfiles.lua
+++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/backupfiles.lua
@@ -1,5 +1,5 @@
-- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2011 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2011 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
if luci.http.formvalue("cbid.luci.1._list") then
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/crontab.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/crontab.lua
index 8d3f49837c..bef9651ea1 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/crontab.lua
+++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/crontab.lua
@@ -1,5 +1,5 @@
-- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2008-2013 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2008-2013 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
local fs = require "nixio.fs"
diff --git a/modules/luci-mod-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 14b6ff4d04..3944690071 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/fstab/mount.lua
+++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/fstab/mount.lua
@@ -1,4 +1,4 @@
--- Copyright 2010 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2010 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
local fs = require "nixio.fs"
diff --git a/modules/luci-mod-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 265e69ac5e..82468d5fcc 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/fstab/swap.lua
+++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/fstab/swap.lua
@@ -1,4 +1,4 @@
--- Copyright 2010 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2010 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
local fs = require "nixio.fs"
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/ipkg.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/ipkg.lua
index dc10e30da1..2f3c4927b3 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/ipkg.lua
+++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/ipkg.lua
@@ -1,5 +1,5 @@
-- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2008-2011 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2008-2011 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
local ipkgfile = "/etc/opkg.conf"
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/startup.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/startup.lua
index b215ffd782..9e19ac50a2 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/startup.lua
+++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/startup.lua
@@ -1,5 +1,5 @@
-- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2010-2012 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2010-2012 Jo-Philipp Wich <jow@openwrt.org>
-- Copyright 2010 Manuel Munz <freifunk at somakoma dot de>
-- Licensed to the public under the Apache License 2.0.
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/system.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/system.lua
index f4c2ac11f0..94ba8053ad 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/system.lua
+++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/system.lua
@@ -1,5 +1,5 @@
-- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2011 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2011 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
local sys = require "luci.sys"
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_network/diagnostics.htm b/modules/luci-mod-admin-full/luasrc/view/admin_network/diagnostics.htm
index bd60924f04..e0a04a7f8f 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_network/diagnostics.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_network/diagnostics.htm
@@ -1,5 +1,5 @@
<%#
- Copyright 2010 Jo-Philipp Wich <xm@subsignal.org>
+ Copyright 2010 Jo-Philipp Wich <jow@openwrt.org>
Licensed to the public under the Apache License 2.0.
-%>
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_network/iface_overview.htm b/modules/luci-mod-admin-full/luasrc/view/admin_network/iface_overview.htm
index 3ab679c45f..1de349856e 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_network/iface_overview.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_network/iface_overview.htm
@@ -1,5 +1,5 @@
<%#
- Copyright 2010 Jo-Philipp Wich <xm@subsignal.org>
+ Copyright 2010 Jo-Philipp Wich <jow@openwrt.org>
Licensed to the public under the Apache License 2.0.
-%>
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_join.htm b/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_join.htm
index 45b9e0b3d2..90cc4c03e1 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_join.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_join.htm
@@ -1,5 +1,5 @@
<%#
- Copyright 2009 Jo-Philipp Wich <xm@subsignal.org>
+ Copyright 2009 Jo-Philipp Wich <jow@openwrt.org>
Licensed to the public under the Apache License 2.0.
-%>
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_overview.htm b/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_overview.htm
index 59a048582b..ea60a7f078 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_overview.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_overview.htm
@@ -1,6 +1,6 @@
<%#
Copyright 2008-2009 Steven Barth <steven@midlink.org>
- Copyright 2008-2013 Jo-Philipp Wich <xm@subsignal.org>
+ Copyright 2008-2013 Jo-Philipp Wich <jow@openwrt.org>
Licensed to the public under the Apache License 2.0.
-%>
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/bandwidth.htm b/modules/luci-mod-admin-full/luasrc/view/admin_status/bandwidth.htm
index a89bbe6c66..dbcf06beef 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_status/bandwidth.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_status/bandwidth.htm
@@ -1,5 +1,5 @@
<%#
- Copyright 2010 Jo-Philipp Wich <xm@subsignal.org>
+ Copyright 2010 Jo-Philipp Wich <jow@openwrt.org>
Licensed to the public under the Apache License 2.0.
-%>
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/connections.htm b/modules/luci-mod-admin-full/luasrc/view/admin_status/connections.htm
index a40bee82df..64b950e24b 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_status/connections.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_status/connections.htm
@@ -1,5 +1,5 @@
<%#
- Copyright 2010 Jo-Philipp Wich <xm@subsignal.org>
+ Copyright 2010 Jo-Philipp Wich <jow@openwrt.org>
Licensed to the public under the Apache License 2.0.
-%>
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/dmesg.htm b/modules/luci-mod-admin-full/luasrc/view/admin_status/dmesg.htm
index 15925f0cca..a63bb71128 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_status/dmesg.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_status/dmesg.htm
@@ -1,6 +1,6 @@
<%#
Copyright 2008 Steven Barth <steven@midlink.org>
- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+ Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
Licensed to the public under the Apache License 2.0.
-%>
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm b/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm
index a513e92023..548b22d167 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm
@@ -1,6 +1,6 @@
<%#
Copyright 2008 Steven Barth <steven@midlink.org>
- Copyright 2008-2011 Jo-Philipp Wich <xm@subsignal.org>
+ Copyright 2008-2011 Jo-Philipp Wich <jow@openwrt.org>
Licensed to the public under the Apache License 2.0.
-%>
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/iptables.htm b/modules/luci-mod-admin-full/luasrc/view/admin_status/iptables.htm
index 0d6edacd1a..ba2933adef 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_status/iptables.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_status/iptables.htm
@@ -1,6 +1,6 @@
<%#
Copyright 2008-2009 Steven Barth <steven@midlink.org>
- Copyright 2008-2011 Jo-Philipp Wich <xm@subsignal.org>
+ Copyright 2008-2011 Jo-Philipp Wich <jow@openwrt.org>
Licensed to the public under the Apache License 2.0.
-%>
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/load.htm b/modules/luci-mod-admin-full/luasrc/view/admin_status/load.htm
index 2f923602b8..d095948e50 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_status/load.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_status/load.htm
@@ -1,5 +1,5 @@
<%#
- Copyright 2010 Jo-Philipp Wich <xm@subsignal.org>
+ Copyright 2010 Jo-Philipp Wich <jow@openwrt.org>
Licensed to the public under the Apache License 2.0.
-%>
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/routes.htm b/modules/luci-mod-admin-full/luasrc/view/admin_status/routes.htm
index ebdd64ad48..2d9a4a3dc8 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_status/routes.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_status/routes.htm
@@ -1,6 +1,6 @@
<%#
Copyright 2008-2009 Steven Barth <steven@midlink.org>
- Copyright 2008-2009 Jo-Philipp Wich <xm@subsignal.org>
+ Copyright 2008-2009 Jo-Philipp Wich <jow@openwrt.org>
Licensed to the public under the Apache License 2.0.
-%>
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/syslog.htm b/modules/luci-mod-admin-full/luasrc/view/admin_status/syslog.htm
index 917ff18491..40032a1426 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_status/syslog.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_status/syslog.htm
@@ -1,6 +1,6 @@
<%#
Copyright 2008 Steven Barth <steven@midlink.org>
- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+ Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
Licensed to the public under the Apache License 2.0.
-%>
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/wireless.htm b/modules/luci-mod-admin-full/luasrc/view/admin_status/wireless.htm
index 6aa0a811ad..025fece90b 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_status/wireless.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_status/wireless.htm
@@ -1,5 +1,5 @@
<%#
- Copyright 2011 Jo-Philipp Wich <xm@subsignal.org>
+ Copyright 2011 Jo-Philipp Wich <jow@openwrt.org>
Licensed to the public under the Apache License 2.0.
-%>
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_system/applyreboot.htm b/modules/luci-mod-admin-full/luasrc/view/admin_system/applyreboot.htm
index 162811821a..15c96e34df 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_system/applyreboot.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_system/applyreboot.htm
@@ -1,6 +1,6 @@
<%#
Copyright 2008 Steven Barth <steven@midlink.org>
- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+ Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
Licensed to the public under the Apache License 2.0.
-%>
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_system/backupfiles.htm b/modules/luci-mod-admin-full/luasrc/view/admin_system/backupfiles.htm
index 6e219aacc4..0a6df109df 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_system/backupfiles.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_system/backupfiles.htm
@@ -1,6 +1,6 @@
<%#
Copyright 2008 Steven Barth <steven@midlink.org>
- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+ Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
Licensed to the public under the Apache License 2.0.
-%>
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_system/flashops.htm b/modules/luci-mod-admin-full/luasrc/view/admin_system/flashops.htm
index e658dc20e9..bea565aa05 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_system/flashops.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_system/flashops.htm
@@ -1,6 +1,6 @@
<%#
Copyright 2008 Steven Barth <steven@midlink.org>
- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+ Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
Licensed to the public under the Apache License 2.0.
-%>
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_system/ipkg.htm b/modules/luci-mod-admin-full/luasrc/view/admin_system/ipkg.htm
index 5f3a9b1639..6b812e837e 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_system/ipkg.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_system/ipkg.htm
@@ -1,6 +1,6 @@
<%#
Copyright 2008 Steven Barth <steven@midlink.org>
- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+ Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
Licensed to the public under the Apache License 2.0.
-%>
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_system/packages.htm b/modules/luci-mod-admin-full/luasrc/view/admin_system/packages.htm
index ad33efcbad..1ceda47852 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_system/packages.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_system/packages.htm
@@ -1,6 +1,6 @@
<%#
Copyright 2008 Steven Barth <steven@midlink.org>
- Copyright 2008-2010 Jo-Philipp Wich <xm@subsignal.org>
+ Copyright 2008-2010 Jo-Philipp Wich <jow@openwrt.org>
Licensed to the public under the Apache License 2.0.
-%>
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_system/reboot.htm b/modules/luci-mod-admin-full/luasrc/view/admin_system/reboot.htm
index 9cc6d4d1cb..80768119fe 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_system/reboot.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_system/reboot.htm
@@ -1,6 +1,6 @@
<%#
Copyright 2008 Steven Barth <steven@midlink.org>
- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+ Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
Licensed to the public under the Apache License 2.0.
-%>
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_system/upgrade.htm b/modules/luci-mod-admin-full/luasrc/view/admin_system/upgrade.htm
index 3c3838252e..b9d42357bb 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_system/upgrade.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_system/upgrade.htm
@@ -1,6 +1,6 @@
<%#
Copyright 2008 Steven Barth <steven@midlink.org>
- Copyright 2008-2009 Jo-Philipp Wich <xm@subsignal.org>
+ Copyright 2008-2009 Jo-Philipp Wich <jow@openwrt.org>
Licensed to the public under the Apache License 2.0.
-%>
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_uci/apply.htm b/modules/luci-mod-admin-full/luasrc/view/admin_uci/apply.htm
index d542cac6c5..4284b44d38 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_uci/apply.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_uci/apply.htm
@@ -1,6 +1,6 @@
<%#
Copyright 2008 Steven Barth <steven@midlink.org>
- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+ Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
Licensed to the public under the Apache License 2.0.
-%>
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_uci/changelog.htm b/modules/luci-mod-admin-full/luasrc/view/admin_uci/changelog.htm
index 8648f7c81e..4ed4f0a10f 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_uci/changelog.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_uci/changelog.htm
@@ -1,5 +1,5 @@
<%#
- Copyright 2010 Jo-Philipp Wich <xm@subsignal.org>
+ Copyright 2010 Jo-Philipp Wich <jow@openwrt.org>
Licensed to the public under the Apache License 2.0.
-%>
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_uci/changes.htm b/modules/luci-mod-admin-full/luasrc/view/admin_uci/changes.htm
index 555f89e630..84e22879e0 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_uci/changes.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_uci/changes.htm
@@ -1,6 +1,6 @@
<%#
Copyright 2008 Steven Barth <steven@midlink.org>
- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+ Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
Licensed to the public under the Apache License 2.0.
-%>
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_uci/revert.htm b/modules/luci-mod-admin-full/luasrc/view/admin_uci/revert.htm
index 8f7b3e82e3..d2bdc7a971 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_uci/revert.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_uci/revert.htm
@@ -1,6 +1,6 @@
<%#
Copyright 2008 Steven Barth <steven@midlink.org>
- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+ Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
Licensed to the public under the Apache License 2.0.
-%>
diff --git a/modules/luci-mod-admin-full/src/luci-bwc.c b/modules/luci-mod-admin-full/src/luci-bwc.c
index 05e46671e8..63668d42b3 100644
--- a/modules/luci-mod-admin-full/src/luci-bwc.c
+++ b/modules/luci-mod-admin-full/src/luci-bwc.c
@@ -1,7 +1,7 @@
/*
* luci-bwc - Very simple bandwidth collector cache for LuCI realtime graphs
*
- * Copyright (C) 2010 Jo-Philipp Wich <xm@subsignal.org>
+ * Copyright (C) 2010 Jo-Philipp Wich <jow@openwrt.org>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/modules/luci-mod-admin-mini/luasrc/controller/mini/index.lua b/modules/luci-mod-admin-mini/luasrc/controller/mini/index.lua
index c3f673eb05..dd25f2c52b 100644
--- a/modules/luci-mod-admin-mini/luasrc/controller/mini/index.lua
+++ b/modules/luci-mod-admin-mini/luasrc/controller/mini/index.lua
@@ -1,5 +1,5 @@
-- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
module("luci.controller.mini.index", package.seeall)
diff --git a/modules/luci-mod-admin-mini/luasrc/controller/mini/network.lua b/modules/luci-mod-admin-mini/luasrc/controller/mini/network.lua
index e529551144..0b74c41ec4 100644
--- a/modules/luci-mod-admin-mini/luasrc/controller/mini/network.lua
+++ b/modules/luci-mod-admin-mini/luasrc/controller/mini/network.lua
@@ -1,5 +1,5 @@
-- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
module("luci.controller.mini.network", package.seeall)
diff --git a/modules/luci-mod-admin-mini/luasrc/controller/mini/system.lua b/modules/luci-mod-admin-mini/luasrc/controller/mini/system.lua
index 6422ff415d..74a5ae4d36 100644
--- a/modules/luci-mod-admin-mini/luasrc/controller/mini/system.lua
+++ b/modules/luci-mod-admin-mini/luasrc/controller/mini/system.lua
@@ -1,5 +1,5 @@
-- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
module("luci.controller.mini.system", package.seeall)
diff --git a/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/dhcp.lua b/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/dhcp.lua
index 8f37d51f20..5d3d8ad22a 100644
--- a/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/dhcp.lua
+++ b/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/dhcp.lua
@@ -1,5 +1,5 @@
-- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
local uci = require "luci.model.uci".cursor()
diff --git a/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/luci.lua b/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/luci.lua
index eb31d14b79..a1ef0fe73f 100644
--- a/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/luci.lua
+++ b/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/luci.lua
@@ -1,5 +1,5 @@
-- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
require "luci.config"
diff --git a/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/network.lua b/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/network.lua
index 43a8a13aec..c895430a3b 100644
--- a/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/network.lua
+++ b/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/network.lua
@@ -1,5 +1,5 @@
-- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
local wa = require "luci.tools.webadmin"
diff --git a/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/passwd.lua b/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/passwd.lua
index 22947d6ccf..39123a76e7 100644
--- a/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/passwd.lua
+++ b/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/passwd.lua
@@ -1,5 +1,5 @@
-- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
f = SimpleForm("password", translate("Admin Password"), translate("Change the password of the system administrator (User <code>root</code>)"))
diff --git a/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/wifi.lua b/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/wifi.lua
index 678d5b02f5..0729c44393 100644
--- a/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/wifi.lua
+++ b/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/wifi.lua
@@ -1,5 +1,5 @@
-- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
-- Data init --
diff --git a/modules/luci-mod-admin-mini/luasrc/view/mini/applyreboot.htm b/modules/luci-mod-admin-mini/luasrc/view/mini/applyreboot.htm
index 0af87e813e..4c536249ae 100644
--- a/modules/luci-mod-admin-mini/luasrc/view/mini/applyreboot.htm
+++ b/modules/luci-mod-admin-mini/luasrc/view/mini/applyreboot.htm
@@ -1,6 +1,6 @@
<%#
Copyright 2008 Steven Barth <steven@midlink.org>
- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+ Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
Licensed to the public under the Apache License 2.0.
-%>
diff --git a/modules/luci-mod-admin-mini/luasrc/view/mini/backup.htm b/modules/luci-mod-admin-mini/luasrc/view/mini/backup.htm
index 553ff78cdf..b0f52f791e 100644
--- a/modules/luci-mod-admin-mini/luasrc/view/mini/backup.htm
+++ b/modules/luci-mod-admin-mini/luasrc/view/mini/backup.htm
@@ -1,6 +1,6 @@
<%#
Copyright 2008 Steven Barth <steven@midlink.org>
- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+ Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
Licensed to the public under the Apache License 2.0.
-%>
diff --git a/modules/luci-mod-admin-mini/luasrc/view/mini/index.htm b/modules/luci-mod-admin-mini/luasrc/view/mini/index.htm
index 45c3038059..9fb03c3c66 100644
--- a/modules/luci-mod-admin-mini/luasrc/view/mini/index.htm
+++ b/modules/luci-mod-admin-mini/luasrc/view/mini/index.htm
@@ -1,6 +1,6 @@
<%#
Copyright 2008 Steven Barth <steven@midlink.org>
- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+ Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
Licensed to the public under the Apache License 2.0.
-%>
diff --git a/modules/luci-mod-admin-mini/luasrc/view/mini/reboot.htm b/modules/luci-mod-admin-mini/luasrc/view/mini/reboot.htm
index e4d39510a9..0717f68d88 100644
--- a/modules/luci-mod-admin-mini/luasrc/view/mini/reboot.htm
+++ b/modules/luci-mod-admin-mini/luasrc/view/mini/reboot.htm
@@ -1,6 +1,6 @@
<%#
Copyright 2008 Steven Barth <steven@midlink.org>
- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+ Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
Licensed to the public under the Apache License 2.0.
-%>
diff --git a/modules/luci-mod-admin-mini/luasrc/view/mini/upgrade.htm b/modules/luci-mod-admin-mini/luasrc/view/mini/upgrade.htm
index 551879881d..474c22037a 100644
--- a/modules/luci-mod-admin-mini/luasrc/view/mini/upgrade.htm
+++ b/modules/luci-mod-admin-mini/luasrc/view/mini/upgrade.htm
@@ -1,6 +1,6 @@
<%#
Copyright 2008 Steven Barth <steven@midlink.org>
- Copyright 2008-2009 Jo-Philipp Wich <xm@subsignal.org>
+ Copyright 2008-2009 Jo-Philipp Wich <jow@openwrt.org>
Licensed to the public under the Apache License 2.0.
-%>
diff --git a/modules/luci-mod-failsafe/luasrc/controller/failsafe/failsafe.lua b/modules/luci-mod-failsafe/luasrc/controller/failsafe/failsafe.lua
index 13bc6e5092..6f78643018 100644
--- a/modules/luci-mod-failsafe/luasrc/controller/failsafe/failsafe.lua
+++ b/modules/luci-mod-failsafe/luasrc/controller/failsafe/failsafe.lua
@@ -1,5 +1,5 @@
-- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2008-2011 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2008-2011 Jo-Philipp Wich <jow@openwrt.org>
-- Copyright 2012 Daniel Golle <dgolle@allnet.de>
-- Licensed to the public under the Apache License 2.0.
diff --git a/modules/luci-mod-failsafe/luasrc/view/failsafe/applyreboot.htm b/modules/luci-mod-failsafe/luasrc/view/failsafe/applyreboot.htm
index 2c57ef0b19..0c8cebc137 100644
--- a/modules/luci-mod-failsafe/luasrc/view/failsafe/applyreboot.htm
+++ b/modules/luci-mod-failsafe/luasrc/view/failsafe/applyreboot.htm
@@ -1,6 +1,6 @@
<%#
Copyright 2008 Steven Barth <steven@midlink.org>
- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+ Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
Licensed to the public under the Apache License 2.0.
-%>
diff --git a/modules/luci-mod-failsafe/luasrc/view/failsafe/flashops.htm b/modules/luci-mod-failsafe/luasrc/view/failsafe/flashops.htm
index 985bab8174..29c4d2d6fb 100644
--- a/modules/luci-mod-failsafe/luasrc/view/failsafe/flashops.htm
+++ b/modules/luci-mod-failsafe/luasrc/view/failsafe/flashops.htm
@@ -1,6 +1,6 @@
<%#
Copyright 2008 Steven Barth <steven@midlink.org>
- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+ Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
Copyright 2012 Daniel Golle <dgolle@allnet.de>
Licensed to the public under the Apache License 2.0.
-%>
diff --git a/modules/luci-mod-failsafe/luasrc/view/failsafe/reboot.htm b/modules/luci-mod-failsafe/luasrc/view/failsafe/reboot.htm
index a086a45e33..189939afbe 100644
--- a/modules/luci-mod-failsafe/luasrc/view/failsafe/reboot.htm
+++ b/modules/luci-mod-failsafe/luasrc/view/failsafe/reboot.htm
@@ -1,6 +1,6 @@
<%#
Copyright 2008 Steven Barth <steven@midlink.org>
- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+ Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
Copyright 2012 Daniel Golle <dgolle@allnet.de>
Licensed to the public under the Apache License 2.0.
-%>
diff --git a/modules/luci-mod-failsafe/luasrc/view/failsafe/upgrade.htm b/modules/luci-mod-failsafe/luasrc/view/failsafe/upgrade.htm
index a1ef6fa790..619ed85dea 100644
--- a/modules/luci-mod-failsafe/luasrc/view/failsafe/upgrade.htm
+++ b/modules/luci-mod-failsafe/luasrc/view/failsafe/upgrade.htm
@@ -1,6 +1,6 @@
<%#
Copyright 2008 Steven Barth <steven@midlink.org>
- Copyright 2008-2009 Jo-Philipp Wich <xm@subsignal.org>
+ Copyright 2008-2009 Jo-Philipp Wich <jow@openwrt.org>
Copyright 2012 Daniel Golle <dgolle@allnet.de>
Licensed to the public under the Apache License 2.0.
-%>
diff --git a/modules/luci-mod-freifunk/luasrc/controller/freifunk/remote_update.lua b/modules/luci-mod-freifunk/luasrc/controller/freifunk/remote_update.lua
index 1ddf54b674..b317ab6b5e 100644
--- a/modules/luci-mod-freifunk/luasrc/controller/freifunk/remote_update.lua
+++ b/modules/luci-mod-freifunk/luasrc/controller/freifunk/remote_update.lua
@@ -1,4 +1,4 @@
--- Copyright 2009 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2009 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
module("luci.controller.freifunk.remote_update", package.seeall)
diff --git a/modules/luci-mod-freifunk/luasrc/view/freifunk/contact.htm b/modules/luci-mod-freifunk/luasrc/view/freifunk/contact.htm
index 6290a44899..f7cb4a92bf 100644
--- a/modules/luci-mod-freifunk/luasrc/view/freifunk/contact.htm
+++ b/modules/luci-mod-freifunk/luasrc/view/freifunk/contact.htm
@@ -1,6 +1,6 @@
<%#
Copyright 2008 Steven Barth <steven@midlink.org>
- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+ Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
Copyright 2011 Manuel Munz <freifunk at somakoma dot de>
Licensed to the public under the Apache License 2.0.
-%>
diff --git a/modules/luci-mod-freifunk/luasrc/view/freifunk/index.htm b/modules/luci-mod-freifunk/luasrc/view/freifunk/index.htm
index c1174a2b29..3134f0b1b9 100644
--- a/modules/luci-mod-freifunk/luasrc/view/freifunk/index.htm
+++ b/modules/luci-mod-freifunk/luasrc/view/freifunk/index.htm
@@ -1,6 +1,6 @@
<%#
Copyright 2008 Steven Barth <steven@midlink.org>
- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+ Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
Licensed to the public under the Apache License 2.0.
-%>
diff --git a/modules/luci-mod-freifunk/luasrc/view/freifunk/remote_update.htm b/modules/luci-mod-freifunk/luasrc/view/freifunk/remote_update.htm
index 36b15b5ab0..83e1ee5792 100644
--- a/modules/luci-mod-freifunk/luasrc/view/freifunk/remote_update.htm
+++ b/modules/luci-mod-freifunk/luasrc/view/freifunk/remote_update.htm
@@ -1,6 +1,6 @@
<%#
Copyright 2008 Steven Barth <steven@midlink.org>
- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+ Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
Licensed to the public under the Apache License 2.0.
-%>
diff --git a/modules/luci-mod-freifunk/po/en/freifunk.po b/modules/luci-mod-freifunk/po/en/freifunk.po
index 1a0b425e90..bf99116722 100644
--- a/modules/luci-mod-freifunk/po/en/freifunk.po
+++ b/modules/luci-mod-freifunk/po/en/freifunk.po
@@ -4,7 +4,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-06-30 06:42+0200\n"
"PO-Revision-Date: 2009-07-06 23:21+0200\n"
-"Last-Translator: Jo-Philipp Wich <xm@subsignal.org>\n"
+"Last-Translator: Jo-Philipp Wich <jow@openwrt.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
diff --git a/modules/luci-mod-rpc/luasrc/controller/rpc.lua b/modules/luci-mod-rpc/luasrc/controller/rpc.lua
index b6eff32db7..862e5839f2 100644
--- a/modules/luci-mod-rpc/luasrc/controller/rpc.lua
+++ b/modules/luci-mod-rpc/luasrc/controller/rpc.lua
@@ -1,5 +1,5 @@
-- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
local require = require
diff --git a/modules/luci-mod-rpc/luasrc/jsonrpc.lua b/modules/luci-mod-rpc/luasrc/jsonrpc.lua
index dcdd2ce575..c7f025496d 100644
--- a/modules/luci-mod-rpc/luasrc/jsonrpc.lua
+++ b/modules/luci-mod-rpc/luasrc/jsonrpc.lua
@@ -1,5 +1,5 @@
-- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
module("luci.jsonrpc", package.seeall)
diff --git a/modules/luci-mod-rpc/luasrc/jsonrpcbind/uci.lua b/modules/luci-mod-rpc/luasrc/jsonrpcbind/uci.lua
index 0e046612d6..284801ecf1 100644
--- a/modules/luci-mod-rpc/luasrc/jsonrpcbind/uci.lua
+++ b/modules/luci-mod-rpc/luasrc/jsonrpcbind/uci.lua
@@ -1,5 +1,5 @@
-- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
local uci = require "luci.model.uci".cursor()
diff --git a/protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua b/protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua
index bad2fa2cbd..59bf2f646c 100644
--- a/protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua
+++ b/protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua
@@ -1,4 +1,4 @@
--- Copyright 2011 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2011 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
local map, section, net = ...
diff --git a/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua b/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua
index b167e6f944..88dfe09289 100644
--- a/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua
+++ b/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua
@@ -1,4 +1,4 @@
--- Copyright 2011 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2011 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
local map, section, net = ...
diff --git a/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua b/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua
index 48f9a32ced..708a9c5add 100644
--- a/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua
+++ b/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua
@@ -1,4 +1,4 @@
--- Copyright 2011-2012 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2011-2012 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
local map, section, net = ...
diff --git a/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua b/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua
index e893aca075..50a706974d 100644
--- a/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua
+++ b/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua
@@ -1,4 +1,4 @@
--- Copyright 2011 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2011 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
local map, section, net = ...
diff --git a/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua b/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua
index 92aa63b5bd..9069ff0870 100644
--- a/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua
+++ b/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua
@@ -1,4 +1,4 @@
--- Copyright 2011 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2011 Jo-Philipp Wich <jow@openwrt.org>
-- Copyright 2013 Steven Barth <steven@midlink.org>
-- Licensed to the public under the Apache License 2.0.
diff --git a/protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua b/protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua
index 034c1ee186..daebc2f5d8 100644
--- a/protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua
+++ b/protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua
@@ -1,4 +1,4 @@
--- Copyright 2011 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2011 Jo-Philipp Wich <jow@openwrt.org>
-- Copyright 2013 Steven Barth <steven@midlink.org>
-- Licensed to the public under the Apache License 2.0.
diff --git a/protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua b/protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua
index 59f6f57764..d267ce9119 100644
--- a/protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua
+++ b/protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua
@@ -1,4 +1,4 @@
--- Copyright 2011 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2011 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
local netmod = luci.model.network
diff --git a/protocols/luci-proto-ipv6/luasrc/model/network/proto_dhcpv6.lua b/protocols/luci-proto-ipv6/luasrc/model/network/proto_dhcpv6.lua
index 7aed0d6381..0b45dad050 100644
--- a/protocols/luci-proto-ipv6/luasrc/model/network/proto_dhcpv6.lua
+++ b/protocols/luci-proto-ipv6/luasrc/model/network/proto_dhcpv6.lua
@@ -1,4 +1,4 @@
--- Copyright 2013 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2013 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
local proto = luci.model.network:register_protocol("dhcpv6")
diff --git a/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua b/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua
index d232b197ef..023cc029bf 100644
--- a/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua
+++ b/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua
@@ -1,4 +1,4 @@
--- Copyright 2011 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2011 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
local map, section, net = ...
diff --git a/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua b/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua
index 4433f0e913..0fce97a6bd 100644
--- a/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua
+++ b/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua
@@ -1,4 +1,4 @@
--- Copyright 2011 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2011 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
local map, section, net = ...
diff --git a/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua b/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua
index da639f91df..7df1004fc5 100644
--- a/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua
+++ b/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua
@@ -1,4 +1,4 @@
--- Copyright 2011 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2011 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
local map, section, net = ...
diff --git a/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua b/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua
index 4932a13cfb..0e5bbaf513 100644
--- a/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua
+++ b/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua
@@ -1,4 +1,4 @@
--- Copyright 2011 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2011 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
local map, section, net = ...
diff --git a/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua b/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua
index 08c3c61931..d81db1faee 100644
--- a/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua
+++ b/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua
@@ -1,4 +1,4 @@
--- Copyright 2011-2012 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2011-2012 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
local map, section, net = ...
diff --git a/protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua b/protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua
index d82c0e26a4..e84658c703 100644
--- a/protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua
+++ b/protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua
@@ -1,4 +1,4 @@
--- Copyright 2011 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2011 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
local netmod = luci.model.network
diff --git a/protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua b/protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua
index bef733d1ac..3381d85e47 100644
--- a/protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua
+++ b/protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua
@@ -1,4 +1,4 @@
--- Copyright 2011 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2011 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
local map, section, net = ...
diff --git a/protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua b/protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua
index b4a959cd0f..5d40fc72d5 100644
--- a/protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua
+++ b/protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua
@@ -1,4 +1,4 @@
--- Copyright 2011 Jo-Philipp Wich <xm@subsignal.org>
+-- Copyright 2011 Jo-Philipp Wich <jow@openwrt.org>
-- Licensed to the public under the Apache License 2.0.
local netmod = luci.model.network
diff --git a/themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/footer.htm b/themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/footer.htm
index 0e6b9e3d8f..52188bf5e8 100644
--- a/themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/footer.htm
+++ b/themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/footer.htm
@@ -1,6 +1,6 @@
<%#
Copyright 2008 Steven Barth <steven@midlink.org>
- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+ Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
Copyright 2012 David Menting <david@nut-bolt.nl>
Licensed to the public under the Apache License 2.0.
-%>
diff --git a/themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm b/themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm
index 3a8e7ce05f..f4a6810090 100644
--- a/themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm
+++ b/themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm
@@ -1,6 +1,6 @@
<%#
Copyright 2008 Steven Barth <steven@midlink.org>
- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+ Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
Copyright 2012 David Menting <david@nut-bolt.nl>
Licensed to the public under the Apache License 2.0.
-%>
diff --git a/themes/luci-theme-freifunk-bno/luasrc/view/themes/freifunk-bno/footer.htm b/themes/luci-theme-freifunk-bno/luasrc/view/themes/freifunk-bno/footer.htm
index 4ae1f03922..2dbade371f 100644
--- a/themes/luci-theme-freifunk-bno/luasrc/view/themes/freifunk-bno/footer.htm
+++ b/themes/luci-theme-freifunk-bno/luasrc/view/themes/freifunk-bno/footer.htm
@@ -1,6 +1,6 @@
<%#
Copyright 2008 Steven Barth <steven@midlink.org>
- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+ Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
Licensed to the public under the Apache License 2.0.
-%>
diff --git a/themes/luci-theme-freifunk-bno/luasrc/view/themes/freifunk-bno/header.htm b/themes/luci-theme-freifunk-bno/luasrc/view/themes/freifunk-bno/header.htm
index 462752bb32..d108a08939 100644
--- a/themes/luci-theme-freifunk-bno/luasrc/view/themes/freifunk-bno/header.htm
+++ b/themes/luci-theme-freifunk-bno/luasrc/view/themes/freifunk-bno/header.htm
@@ -1,6 +1,6 @@
<%#
Copyright 2008 Steven Barth <steven@midlink.org>
- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+ Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
Licensed to the public under the Apache License 2.0.
-%>
diff --git a/themes/luci-theme-freifunk-generic/luasrc/view/themes/freifunk-generic/footer.htm b/themes/luci-theme-freifunk-generic/luasrc/view/themes/freifunk-generic/footer.htm
index 3f874e5756..540df713a8 100644
--- a/themes/luci-theme-freifunk-generic/luasrc/view/themes/freifunk-generic/footer.htm
+++ b/themes/luci-theme-freifunk-generic/luasrc/view/themes/freifunk-generic/footer.htm
@@ -1,6 +1,6 @@
<%#
Copyright 2008 Steven Barth <steven@midlink.org>
- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+ Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
Licensed to the public under the Apache License 2.0.
-%>
diff --git a/themes/luci-theme-freifunk-generic/luasrc/view/themes/freifunk-generic/header.htm b/themes/luci-theme-freifunk-generic/luasrc/view/themes/freifunk-generic/header.htm
index 742521dce7..f6d40edb5f 100644
--- a/themes/luci-theme-freifunk-generic/luasrc/view/themes/freifunk-generic/header.htm
+++ b/themes/luci-theme-freifunk-generic/luasrc/view/themes/freifunk-generic/header.htm
@@ -1,6 +1,6 @@
<%#
Copyright 2008 Steven Barth <steven@midlink.org>
- Copyright 2008-2011 Jo-Philipp Wich <xm@subsignal.org>
+ Copyright 2008-2011 Jo-Philipp Wich <jow@openwrt.org>
Licensed to the public under the Apache License 2.0.
-%>
diff --git a/themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/footer.htm b/themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/footer.htm
index 08a40132e5..a056dd84f2 100644
--- a/themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/footer.htm
+++ b/themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/footer.htm
@@ -1,6 +1,6 @@
<%#
Copyright 2008 Steven Barth <steven@midlink.org>
- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+ Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
Licensed to the public under the Apache License 2.0.
-%>
diff --git a/themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm b/themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm
index e9c85921c6..51505d081f 100644
--- a/themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm
+++ b/themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm
@@ -1,6 +1,6 @@
<%#
Copyright 2008 Steven Barth <steven@midlink.org>
- Copyright 2008-2010 Jo-Philipp Wich <xm@subsignal.org>
+ Copyright 2008-2010 Jo-Philipp Wich <jow@openwrt.org>
Licensed to the public under the Apache License 2.0.
-%>