From 9688e102c4c1bc9c9c816797826d86189c94a430 Mon Sep 17 00:00:00 2001 From: Steven Barth Date: Sat, 31 May 2008 14:48:48 +0000 Subject: [PATCH 1/1] * Core translation part 3 --- i18n/english/luasrc/i18n/admin-core.en | 13 +++++++++++++ i18n/english/luasrc/i18n/default.en | 2 ++ modules/admin-core/luasrc/controller/admin/services.lua | 4 ++-- .../admin-core/luasrc/model/cbi/admin_services/dropbear.lua | 9 ++++----- .../admin-core/luasrc/model/cbi/admin_services/httpd.lua | 11 +++++------ 5 files changed, 26 insertions(+), 13 deletions(-) diff --git a/i18n/english/luasrc/i18n/admin-core.en b/i18n/english/luasrc/i18n/admin-core.en index 13d176ce7..33301618a 100644 --- a/i18n/english/luasrc/i18n/admin-core.en +++ b/i18n/english/luasrc/i18n/admin-core.en @@ -85,7 +85,20 @@ a_s_reboot1 = "Reboots the operating system of your device" a_s_reboot_do = "Perform reboot" a_s_reboot_running = "Please wait: Device rebooting..." +a_srv_http = "HTTP-Server" +a_srv_ssh = "SSH-Server" a_srv_services1 = "Services and daemons perform certain tasks on your device." a_srv_services2 = [[Most of them are network servers, that offer a certain service for your device or network like shell access, serving webpages like LuCI, doing mesh routing, sending e-mails, ...]] + +a_srv_http1 = "A small webserver which can be used to serve LuCI." +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 /etc/httpd.conf" +a_srv_http_root = "Document root" + +a_srv_dropbear1 = "Dropbear offers SSH network shell access and an integrated SCP server" +a_srv_d_pwauth = "Password authentication" +a_srv_d_pwauth1 = "Allow SSH password authentication" + diff --git a/i18n/english/luasrc/i18n/default.en b/i18n/english/luasrc/i18n/default.en index 488ce594e..2b5cfaa87 100644 --- a/i18n/english/luasrc/i18n/default.en +++ b/i18n/english/luasrc/i18n/default.en @@ -6,6 +6,7 @@ apply = "Apply" changes = "Changes" code = "Code" config = "Configuration" +configfile = "Configuration file" confirmation = "Confirmation" delete = "Delete" @@ -40,6 +41,7 @@ overview = "Overview" packagemanager = "Package Manager" password = "Password" path = "Path" +port = "Port" reboot = "Reboot" reset = "Reset" diff --git a/modules/admin-core/luasrc/controller/admin/services.lua b/modules/admin-core/luasrc/controller/admin/services.lua index bebbb0e89..8a2aa65c4 100644 --- a/modules/admin-core/luasrc/controller/admin/services.lua +++ b/modules/admin-core/luasrc/controller/admin/services.lua @@ -11,12 +11,12 @@ function index() local page = node("admin", "services", "httpd") page.target = cbi("admin_services/httpd") - page.title = "HTTP-Server" + page.title = "Busybox HTTPd" page.order = 10 local page = node("admin", "services", "dropbear") page.target = cbi("admin_services/dropbear") - page.title = "SSH-Server" + page.title = "Dropbear SSHd" page.order = 20 local page = node("admin", "services", "dnsmasq") diff --git a/modules/admin-core/luasrc/model/cbi/admin_services/dropbear.lua b/modules/admin-core/luasrc/model/cbi/admin_services/dropbear.lua index 3ecf95335..6a1cab7a8 100644 --- a/modules/admin-core/luasrc/model/cbi/admin_services/dropbear.lua +++ b/modules/admin-core/luasrc/model/cbi/admin_services/dropbear.lua @@ -1,14 +1,13 @@ --- ToDo: Translate, Add descriptions -m = Map("dropbear", "SSH-Server", [[Der SSH-Server ermöglicht Shell-Zugriff -über das Netzwerk und bietet einen integrierten SCP-Dienst.]]) +m = Map("dropbear", "Dropbear SSHd", translate("a_srv_dropbear1", [[Der SSH-Server ermöglicht Shell-Zugriff +über das Netzwerk und bietet einen integrierten SCP-Dienst.]])) s = m:section(TypedSection, "dropbear") s.anonymous = true -port = s:option(Value, "Port", "Port") +port = s:option(Value, "Port", translate("port", "Port")) port.isinteger = true -pwauth = s:option(Flag, "PasswordAuth", "Passwortanmeldung", "Erlaube Anmeldung per Passwort") +pwauth = s:option(Flag, "PasswordAuth", translate("a_srv_d_pwauth", "Passwortanmeldung"), translate("a_srv_d_pwauth1", "Erlaube Anmeldung per Passwort")) pwauth.enabled = 'on' pwauth.disabled = 'off' diff --git a/modules/admin-core/luasrc/model/cbi/admin_services/httpd.lua b/modules/admin-core/luasrc/model/cbi/admin_services/httpd.lua index 3bd49a2d7..acd36fb0a 100644 --- a/modules/admin-core/luasrc/model/cbi/admin_services/httpd.lua +++ b/modules/admin-core/luasrc/model/cbi/admin_services/httpd.lua @@ -1,18 +1,17 @@ --- ToDo: Translate, Add descriptions -m = Map("httpd", "HTTP-Server", "Der HTTP-Server ist u.a. für die Bereitstellung dieser Obefläche zuständig.") +m = Map("httpd", "Busybox HTTPd", translate("a_srv_http1", "Ein kleiner Webserver, der für die Bereitstellung von LuCI genutzt werden kann.")) s = m:section(TypedSection, "httpd") s.anonymous = true -port = s:option(Value, "port", "Port") +port = s:option(Value, "port", translate("port", "Port")) port.isinteger = true -s:option(Value, "home", "Wurzelverzeichnis") +s:option(Value, "home", translate("a_srv_http_root", "Wurzelverzeichnis")) -config = s:option(Value, "c_file", "Konfigurationsdatei", "/etc/httpd.conf wenn leer") +config = s:option(Value, "c_file", translate("configfile", "Konfigurationsdatei"), translate("a_srv_http_config1", "/etc/httpd.conf wenn leer")) config.rmempty = true -realm = s:option(Value, "realm", "Anmeldeaufforderung", "Aufforderungstext zum Anmelden im Administrationsbereich") +realm = s:option(Value, "realm", translate("a_srv_http_authrealm", "Anmeldeaufforderung"), translate("a_srv_http_authrealm1", "Aufforderungstext zum Anmelden im Administrationsbereich")) realm.rmempty = true return m \ No newline at end of file -- 2.11.0