35 files changed, 26 insertions, 20 deletions

diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile
index 2458ebd28b..c75247b55f 100644
--- a/contrib/package/luci/Makefile
+++ b/contrib/package/luci/Makefile
@@ -46,19 +46,32 @@ endef
 define Package/luci
   $(call Package/luci/template)
   MENU:=1
-  DEPENDS:=+lua +luaposix +luci-addons
+  DEPENDS:=+lua +luaposix
 endef
 
-define Package/luci/conffiles
+define Package/luci/install		
+	$(call Package/luci/install/template,$(1),core)
+endef
+
+
+### Web Packages ###
+define Package/luci-web
+  $(call Package/luci/template)
+  DEPENDS:=luci +luci-addons
+  TITLE:=LuCI - Webframework
+endef
+
+define Package/luci-web/conffiles
 /etc/config/luci
 endef
 
-define Package/luci/install		
-	$(call Package/luci/install/template,$(1),core)
+define Package/luci-web/install
+	$(call Package/luci/install/template,$(1),web)
 	$(call Package/luci/install/template,$(1),themes/fledermaus)
 endef
 
 
+
 ### Community Packages ###
 
 define Package/luci-ff-halle
@@ -111,7 +124,7 @@ endef
 
 define Package/luci-mod-admin-core
   $(call Package/luci/template)
-  DEPENDS:=luci
+  DEPENDS:=luci +luci-web
   TITLE:=Core administrative pages
 endef
 
diff --git a/core/src/i18n/default.en b/core/src/i18n/default.en
deleted file mode 100644
index d76b770e96..0000000000
--- a/core/src/i18n/default.en
+++ /dev/null
@@ -1,14 +0,0 @@
-add = "Add"
-save = "Save"
-reset = "Reset"
-
-load = "Load"
-webif = "Webinterface"
-public = "Public"
-admin = "Administration"
-apply = "Apply"
-changes = "Changes"
-revert = "Revert"
-
-config = "Configuration"
-path = "Path"
\ No newline at end of file
diff --git a/i18n/english/Makefile b/i18n/english/Makefile
new file mode 100644
index 0000000000..81a96f6a83
--- /dev/null
+++ b/i18n/english/Makefile
@@ -0,0 +1,2 @@
+include ../../build/config.mk
+include ../../build/module.mk
\ No newline at end of file
diff --git a/core/src/i18n/cbi.en b/i18n/english/src/i18n/cbi.en
index 6069cec453..6069cec453 100644
--- a/core/src/i18n/cbi.en
+++ b/i18n/english/src/i18n/cbi.en
diff --git a/web/Makefile b/web/Makefile
new file mode 100644
index 0000000000..5e64bcd1f0
--- /dev/null
+++ b/web/Makefile
@@ -0,0 +1,2 @@
+include ../build/config.mk
+include ../build/module.mk
\ No newline at end of file
diff --git a/core/root/etc/config/luci b/web/root/etc/config/luci
index 87170a9b18..87170a9b18 100644
--- a/core/root/etc/config/luci
+++ b/web/root/etc/config/luci
diff --git a/core/root/www/resources/cbi.js b/web/root/www/resources/cbi.js
index a3a47aa45b..a3a47aa45b 100644
--- a/core/root/www/resources/cbi.js
+++ b/web/root/www/resources/cbi.js
diff --git a/core/src/cbi.lua b/web/src/cbi.lua
index b7097b5d95..b7097b5d95 100644
--- a/core/src/cbi.lua
+++ b/web/src/cbi.lua
diff --git a/core/src/config.lua b/web/src/config.lua
index 854b128145..854b128145 100644
--- a/core/src/config.lua
+++ b/web/src/config.lua
diff --git a/core/src/dispatcher.lua b/web/src/dispatcher.lua
index 103260c485..175f0dcb0b 100644
--- a/core/src/dispatcher.lua
+++ b/web/src/dispatcher.lua
@@ -127,7 +127,10 @@ function dispatch()
 	tpl.viewns.uploadctrl = luci.http.dispatcher_upload()
 	tpl.viewns.media      = luci.config.main.mediaurlbase
 	tpl.viewns.resource   = luci.config.main.resourcebase
-
+	
+	-- Load default translation
+	require("luci.i18n").loadc("default")
+	
 
 	if c and type(c.target) == "function" then
 		dispatched = c
diff --git a/core/src/http.lua b/web/src/http.lua
index fa8821c5a3..fa8821c5a3 100644
--- a/core/src/http.lua
+++ b/web/src/http.lua
diff --git a/core/src/i18n.lua b/web/src/i18n.lua
index 3a8a9a6c76..3a8a9a6c76 100644
--- a/core/src/i18n.lua
+++ b/web/src/i18n.lua
diff --git a/core/src/template.lua b/web/src/template.lua
index 369aa0a30b..369aa0a30b 100644
--- a/core/src/template.lua
+++ b/web/src/template.lua
diff --git a/core/src/view/cbi/dvalue.htm b/web/src/view/cbi/dvalue.htm
index f54667def6..f54667def6 100644
--- a/core/src/view/cbi/dvalue.htm
+++ b/web/src/view/cbi/dvalue.htm
diff --git a/core/src/view/cbi/footer.htm b/web/src/view/cbi/footer.htm
index 2acf710cdd..2acf710cdd 100644
--- a/core/src/view/cbi/footer.htm
+++ b/web/src/view/cbi/footer.htm
diff --git a/core/src/view/cbi/full_valuefooter.htm b/web/src/view/cbi/full_valuefooter.htm
index 6151a3a66a..6151a3a66a 100644
--- a/core/src/view/cbi/full_valuefooter.htm
+++ b/web/src/view/cbi/full_valuefooter.htm
diff --git a/core/src/view/cbi/full_valueheader.htm b/web/src/view/cbi/full_valueheader.htm
index 062efa2ddd..062efa2ddd 100644
--- a/core/src/view/cbi/full_valueheader.htm
+++ b/web/src/view/cbi/full_valueheader.htm
diff --git a/core/src/view/cbi/fvalue.htm b/web/src/view/cbi/fvalue.htm
index b609f1d4f4..b609f1d4f4 100644
--- a/core/src/view/cbi/fvalue.htm
+++ b/web/src/view/cbi/fvalue.htm
diff --git a/core/src/view/cbi/header.htm b/web/src/view/cbi/header.htm
index 4229aaf0df..4229aaf0df 100644
--- a/core/src/view/cbi/header.htm
+++ b/web/src/view/cbi/header.htm
diff --git a/core/src/view/cbi/lvalue.htm b/web/src/view/cbi/lvalue.htm
index f1ae5a0939..f1ae5a0939 100644
--- a/core/src/view/cbi/lvalue.htm
+++ b/web/src/view/cbi/lvalue.htm
diff --git a/core/src/view/cbi/map.htm b/web/src/view/cbi/map.htm
index 835393c1c5..835393c1c5 100644
--- a/core/src/view/cbi/map.htm
+++ b/web/src/view/cbi/map.htm
diff --git a/core/src/view/cbi/mvalue.htm b/web/src/view/cbi/mvalue.htm
index bed66e569a..bed66e569a 100644
--- a/core/src/view/cbi/mvalue.htm
+++ b/web/src/view/cbi/mvalue.htm
diff --git a/core/src/view/cbi/nsection.htm b/web/src/view/cbi/nsection.htm
index fff597ad06..fff597ad06 100644
--- a/core/src/view/cbi/nsection.htm
+++ b/web/src/view/cbi/nsection.htm
diff --git a/core/src/view/cbi/tblsection.htm b/web/src/view/cbi/tblsection.htm
index df16efbed0..df16efbed0 100644
--- a/core/src/view/cbi/tblsection.htm
+++ b/web/src/view/cbi/tblsection.htm
diff --git a/core/src/view/cbi/tiny_valuefooter.htm b/web/src/view/cbi/tiny_valuefooter.htm
index e65ebb6c03..e65ebb6c03 100644
--- a/core/src/view/cbi/tiny_valuefooter.htm
+++ b/web/src/view/cbi/tiny_valuefooter.htm
diff --git a/core/src/view/cbi/tiny_valueheader.htm b/web/src/view/cbi/tiny_valueheader.htm
index b9b26bd6a2..b9b26bd6a2 100644
--- a/core/src/view/cbi/tiny_valueheader.htm
+++ b/web/src/view/cbi/tiny_valueheader.htm
diff --git a/core/src/view/cbi/tsection.htm b/web/src/view/cbi/tsection.htm
index 37b18b5d42..37b18b5d42 100644
--- a/core/src/view/cbi/tsection.htm
+++ b/web/src/view/cbi/tsection.htm
diff --git a/core/src/view/cbi/ucisection.htm b/web/src/view/cbi/ucisection.htm
index 0abc37e7c6..0abc37e7c6 100644
--- a/core/src/view/cbi/ucisection.htm
+++ b/web/src/view/cbi/ucisection.htm
diff --git a/core/src/view/cbi/value.htm b/web/src/view/cbi/value.htm
index 31bf38f77c..31bf38f77c 100644
--- a/core/src/view/cbi/value.htm
+++ b/web/src/view/cbi/value.htm
diff --git a/core/src/view/cbi/valuefooter.htm b/web/src/view/cbi/valuefooter.htm
index bc9d1b127a..bc9d1b127a 100644
--- a/core/src/view/cbi/valuefooter.htm
+++ b/web/src/view/cbi/valuefooter.htm
diff --git a/core/src/view/cbi/valueheader.htm b/web/src/view/cbi/valueheader.htm
index 8d9802f57f..8d9802f57f 100644
--- a/core/src/view/cbi/valueheader.htm
+++ b/web/src/view/cbi/valueheader.htm
diff --git a/core/src/view/error404.htm b/web/src/view/error404.htm
index 60daee2cbd..60daee2cbd 100644
--- a/core/src/view/error404.htm
+++ b/web/src/view/error404.htm
diff --git a/core/src/view/error500.htm b/web/src/view/error500.htm
index 8af22e8f20..8af22e8f20 100644
--- a/core/src/view/error500.htm
+++ b/web/src/view/error500.htm
diff --git a/core/src/view/footer.htm b/web/src/view/footer.htm
index c8506ac5c6..c8506ac5c6 100644
--- a/core/src/view/footer.htm
+++ b/web/src/view/footer.htm
diff --git a/core/src/view/header.htm b/web/src/view/header.htm
index 5f876781f6..5f876781f6 100644
--- a/core/src/view/header.htm
+++ b/web/src/view/header.htm