luci-0.8: merge complete trunk

3 files changed, 11 insertions, 3 deletions

diff --git a/i18n/english/luasrc/i18n/admin-core.en.lua b/i18n/english/luasrc/i18n/admin-core.en.lua
index 64729f8fc8..d7ec3823b1 100644
--- a/i18n/english/luasrc/i18n/admin-core.en.lua
+++ b/i18n/english/luasrc/i18n/admin-core.en.lua
@@ -45,7 +45,7 @@ a_s_packages_do = 'Perform Actions'
 a_s_packages_install = 'Install'
 a_s_packages_installurl = 'Download and install package'
 a_s_packages_ipkg = 'Edit package lists and installation targets'
-a_s_packages_name = 'Paketname'
+a_s_packages_name = 'Package name'
 a_s_packages_remove = 'Remove'
 a_s_packages_search = 'Find package'
 a_s_packages_update = 'Package lists updated'
@@ -96,6 +96,10 @@ a_srv_http_authrealm = 'Authentication Realm'
 a_srv_http_authrealm1 = 'The realm which will be displayed at the authentication prompt for protected pages.'
 a_srv_http_config1 = 'defaults to <code>/etc/httpd.conf</code>'
 a_srv_http_root = 'Document root'
+a_srv_http_keepalive = 'Enable Keep-Alive'
+a_srv_http_timeout = 'Connection timeout'
+a_srv_http_path = 'Plugin path'
+a_srv_lucittpd = 'A lightweight HTTP/1.1 webserver written in C and Lua designed to serve LuCI'
 a_srv_dropbear1 = 'Dropbear offers <abbr title="Secure Shell">SSH</abbr> network shell access and an integrated <abbr title="Secure Copy">SCP</abbr> server'
 a_srv_d_pwauth = 'Password authentication'
 a_srv_d_pwauth1 = 'Allow <abbr title="Secure Shell">SSH</abbr> password authentication'
diff --git a/i18n/english/luasrc/i18n/admin-core.en.xml b/i18n/english/luasrc/i18n/admin-core.en.xml
index 0bd7177aa2..16c4bdbd27 100644
--- a/i18n/english/luasrc/i18n/admin-core.en.xml
+++ b/i18n/english/luasrc/i18n/admin-core.en.xml
@@ -49,7 +49,7 @@
 <i18n:msg xml:id="a_s_packages_install">Install</i18n:msg>
 <i18n:msg xml:id="a_s_packages_installurl">Download and install package</i18n:msg>
 <i18n:msg xml:id="a_s_packages_ipkg">Edit package lists and installation targets</i18n:msg>
-<i18n:msg xml:id="a_s_packages_name">Paketname</i18n:msg>
+<i18n:msg xml:id="a_s_packages_name">Package name</i18n:msg>
 <i18n:msg xml:id="a_s_packages_remove">Remove</i18n:msg>
 <i18n:msg xml:id="a_s_packages_search">Find package</i18n:msg>
 <i18n:msg xml:id="a_s_packages_update">Package lists updated</i18n:msg>
@@ -104,7 +104,7 @@
 <i18n:msg xml:id="a_srv_d_pwauth">Password authentication</i18n:msg>
 <i18n:msg xml:id="a_srv_d_pwauth1">Allow <abbr title="Secure Shell">SSH</abbr> password authentication</i18n:msg>
 <i18n:msg xml:id="a_w_channel">Channel</i18n:msg>
-<i18n:msg xml:id="a_w_wifi1">On this pages you find confiugration options for <abbr title="Wireless Local Area Network">WLAN</abbr> based wireless networks.</i18n:msg>
+<i18n:msg xml:id="a_w_wifi1">On this pages you can find configuration options for <abbr title="Wireless Local Area Network">WLAN</abbr> based wireless networks.</i18n:msg>
 <i18n:msg xml:id="a_w_wifi2">You can easily integrate your 802.11a/b/g/n-devices into your physical network and use the virtual adapter support to build wireless repeaters or offer several networks with one device.</i18n:msg>
 <i18n:msg xml:id="a_w_wifi3">There is support for Managed, Client, Ad-Hoc and <abbr title="Wireless Distribution System">WDS</abbr> operating modes as well as <abbr title="Wi-Fi Protected Access">WPA</abbr> and <abbr title="Wi-Fi Protected Access 2">WPA2</abbr> encryption for secure communnication.</i18n:msg>
 <i18n:msg xml:id="a_w_devices1">Here you can configure installed wifi devices.</i18n:msg>
diff --git a/i18n/german/luasrc/i18n/admin-core.de.lua b/i18n/german/luasrc/i18n/admin-core.de.lua
index a5280cc38e..c0acee8b64 100644
--- a/i18n/german/luasrc/i18n/admin-core.de.lua
+++ b/i18n/german/luasrc/i18n/admin-core.de.lua
@@ -94,6 +94,10 @@ a_srv_http_authrealm = 'Anmeldeaufforderung'
 a_srv_http_authrealm1 = 'Aufforderungstext zum Anmelden im Administrationsbereich'
 a_srv_http_config1 = '/etc/httpd.conf wenn leer'
 a_srv_http_root = 'Wurzelverzeichnis'
+a_srv_http_keepalive = 'Keep-Alive aktivieren'
+a_srv_http_timeout = 'Verbindungszeitlimit'
+a_srv_http_path = 'Pluginpfad'
+a_srv_lucittpd = 'Ein schlanker HTTP/1.1 webserver in C und Lua geschrieben um LuCI zu betreiben.'
 a_srv_services1 = 'Dienste und Dämonen stellen bestimmte Funktionalitäten auf dem Router zur Verfügung.'
 a_srv_services2 = 'Es handelt sich hierbei meist um Netzwerkserver, die verschiedene Aufgaben auf dem Router erfüllen, beispielsweise Shell-Zugang ermöglichen oder diese Weboberfläche per HTTP anbieten.'
 a_st_i_status1 = 'Hier finden sich Informationen über den aktuellen Status des Systems, beispielsweise Prozessortakt, Speicherauslastung und Netzwerkschnittstellen.'