From 2160131d66b021b1d4f890d7089f900c7d8fc22e Mon Sep 17 00:00:00 2001
From: Steven Barth <steven@midlink.org>
Date: Sat, 17 Jan 2009 13:21:50 +0000
Subject: [PATCH] Merge r4064

---
 modules/admin-full/luasrc/controller/admin/system.lua    | 2 +-
 modules/admin-full/luasrc/view/admin_system/packages.htm | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/admin-full/luasrc/controller/admin/system.lua b/modules/admin-full/luasrc/controller/admin/system.lua
index 9071bfdfe..efd0e9d6a 100644
--- a/modules/admin-full/luasrc/controller/admin/system.lua
+++ b/modules/admin-full/luasrc/controller/admin/system.lua
@@ -20,7 +20,7 @@ function index()
 	entry({"admin", "system"}, alias("admin", "system", "system"), i18n("system"), 30).index = true
 	entry({"admin", "system", "system"}, cbi("admin_system/system"), i18n("system"), 1)
 	entry({"admin", "system", "packages"}, call("action_packages"), i18n("a_s_packages"), 10)
-	entry({"admin", "system", "packages", "ipkg"}, form("admin_system/ipkg"), i18n("a_s_p_ipkg"))
+	entry({"admin", "system", "packages", "ipkg"}, form("admin_system/ipkg"))
 	entry({"admin", "system", "passwd"}, form("admin_system/passwd"), i18n("a_s_changepw"), 20)
 	entry({"admin", "system", "sshkeys"}, form("admin_system/sshkeys"), i18n("a_s_sshkeys"), 30)
 	entry({"admin", "system", "processes"}, form("admin_system/processes"), i18n("process_head"), 45)
diff --git a/modules/admin-full/luasrc/view/admin_system/packages.htm b/modules/admin-full/luasrc/view/admin_system/packages.htm
index 34b8212a6..084dab2fe 100644
--- a/modules/admin-full/luasrc/view/admin_system/packages.htm
+++ b/modules/admin-full/luasrc/view/admin_system/packages.htm
@@ -49,7 +49,6 @@ end
 			<ul>
 				<li><a href="<%=REQUEST_URI%>/ipkg"><%:a_s_packages_ipkg%></a></li>
 				<li><a href="<%=REQUEST_URI%>?update=1"><%:a_s_packages_updatelist%></a></li>
-				<li><a href="<%=REQUEST_URI%>?upgrade=1"><%:a_s_packages_upgrade%></a></li>
 			</ul>
 			<br />
 			<fieldset class="cbi-section-node">
-- 
2.11.0