po: update tinyproxy translations

12 files changed, 2928 insertions, 1464 deletions

diff --git a/po/ca/tinyproxy.po b/po/ca/tinyproxy.po
index faca82f98..a3aa067dc 100644
--- a/po/ca/tinyproxy.po
+++ b/po/ca/tinyproxy.po
@@ -13,162 +13,308 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0\n"
 
-#. Tinyproxy
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:1
-msgid "Tinyproxy"
-msgstr "Tinyproxy"
+msgid ""
+"<em>Via proxy</em> routes requests to the given target via the specifed "
+"upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
+"target"
+msgstr ""
 
-#. Tinyproxy is a small and fast non-caching HTTP(S)-Proxy
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:2
-msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
-msgstr "Tinyproxy és un proxy HTTP no caché petit i ràpid"
+msgid ""
+"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"requests"
+msgstr ""
+
+msgid "Allowed clients"
+msgstr ""
+
+msgid "Allowed connect ports"
+msgstr ""
+
+msgid "Bind address"
+msgstr ""
+
+msgid ""
+"By default, basic POSIX expressions are used for filtering. Enable this to "
+"activate extended regular expressions"
+msgstr ""
+
+msgid ""
+"By default, filter strings are treated as case-insensitive. Enable this to "
+"make the matching case-sensitive"
+msgstr ""
+
+msgid ""
+"By default, filtering is done based on domain names. Enable this to match "
+"against URLs instead"
+msgstr ""
+
+msgid ""
+"By default, the filter rules act as blacklist. Enable this option to only "
+"allow matched URLs or domain names"
+msgstr ""
+
+msgid ""
+"Can be either an IP address or range, a domain name or \".\" for any host "
+"without domain"
+msgstr ""
+
+msgid "Connection timeout"
+msgstr ""
+
+msgid "Default deny"
+msgstr ""
+
+msgid "Enable Tinyproxy server"
+msgstr ""
+
+msgid "Error page"
+msgstr ""
+
+msgid "Filter by RegExp"
+msgstr ""
+
+msgid "Filter by URLs"
+msgstr ""
+
+msgid "Filter case-sensitive"
+msgstr ""
+
+msgid "Filter file"
+msgstr ""
+
+msgid "Filtering and ACLs"
+msgstr ""
+
+msgid "General settings"
+msgstr ""
+
+msgid "Group"
+msgstr ""
+
+msgid "HTML template file to serve for stat host requests"
+msgstr ""
+
+msgid "HTML template file to serve when HTTP errors occur"
+msgstr ""
+
+msgid "Header whitelist"
+msgstr ""
+
+msgid ""
+"List of IP addresses or ranges which are allowed to use the proxy server"
+msgstr ""
+
+msgid ""
+"List of allowed ports for the CONNECT method. A single value \"0\" allows "
+"all ports"
+msgstr ""
+
+msgid "Listen address"
+msgstr ""
+
+msgid "Listen port"
+msgstr ""
+
+msgid "Log file"
+msgstr ""
+
+msgid "Log file to use for dumping messages"
+msgstr ""
 
-#. Allow access from
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:3
-msgid "Allow access from"
-msgstr "Permet l'accés des de"
-
-#. Allowed headers for anonymous proxy
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:4
-msgid "Allowed headers for anonymous proxy"
-msgstr "Capçaleres permeses pel proxy anònim"
-
-#. Bind outgoing traffic to address
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:5
-msgid "Bind outgoing traffic to address"
-msgstr "Vincula el tràfic sortint a l'adreça"
-
-#. Ports allowed for CONNECT method
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:6
-msgid "Ports allowed for CONNECT method"
-msgstr "Ports permesos pel mètode CONNECT"
-
-#. 0 = disabled, empty = all
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:7
-msgid "0 = disabled, empty = all"
-msgstr "0 = desactivats, buit = tots"
-
-#. Error document
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:8
-msgid "Error document"
-msgstr "Document d'error"
-
-#. Filter list
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:9
-msgid "Filter list"
-msgstr "Llista de filtre"
-
-#. Case sensitive filters
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:10
-msgid "Case sensitive filters"
-msgstr "Filtres distingint majúscules i minúscules"
-
-#. Filter list is a whitelist
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:11
-msgid "Filter list is a whitelist"
-msgstr "La llista de filtre és una llista blanca"
-
-#. Extended regular expression filters
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:12
-msgid "Extended regular expression filters"
-msgstr "Filtres d'expressions regulars exteses"
-
-#. Filter URLs instead of domains
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:13
-msgid "Filter URLs instead of domains"
-msgstr "Filtra URLs en comptes de dominis"
-
-#. Listen on address
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:14
-msgid "Listen on address"
-msgstr "Escolta a l'adreça"
-
-#. Logfile
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:15
-msgid "Logfile"
-msgstr "Fitxer de registre"
-
-#. Log level
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:16
 msgid "Log level"
 msgstr "Nivell de registre"
 
-#. Maximum number of clients
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:17
-msgid "Maximum number of clients"
-msgstr "Màxim número de clients"
+msgid "Logging verbosity of the Tinyproxy process"
+msgstr ""
 
-#. Maximum requests per thread
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:18
-msgid "Maximum requests per thread"
-msgstr "Màximes peticions per fil"
+msgid "Max. clients"
+msgstr ""
+
+msgid "Max. requests per server"
+msgstr ""
 
-#. Max. spare servers
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:19
 msgid "Max. spare servers"
 msgstr "Màx servidors spare"
 
-#. Min. spare servers
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:20
+msgid "Maximum allowed number of concurrently connected clients"
+msgstr ""
+
+msgid ""
+"Maximum allowed number of requests per process. If it is exeeded, the "
+"process is restarted. Zero means unlimited."
+msgstr ""
+
+msgid "Maximum number of prepared idle processes"
+msgstr ""
+
+msgid "Maximum number of seconds an inactive connection is held open"
+msgstr ""
+
 msgid "Min. spare servers"
 msgstr "Mín servidors spare"
 
-#. Spare servers to start with
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:21
-msgid "Spare servers to start with"
-msgstr "Servidors spare amb els que començar"
-
-#. Statistic document
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:22
-msgid "Statistic document"
-msgstr "Document estadístic"
-
-#. Write to syslog
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:23
-msgid "Write to syslog"
-msgstr "Escriu al syslog"
-
-#. Connection Timeout
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:24
-msgid "Connection Timeout"
-msgstr "Temps d'espera excedit"
-
-#. Value of Via-Header
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:25
-msgid "Value of Via-Header"
-msgstr "Valor de Via-Header"
-
-#. Include client IP
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:26
-msgid "Include client IP"
-msgstr "Inclou client IP"
-
-#. Via proxy
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:27
-msgid "Via proxy"
-msgstr "Via proxy"
+msgid "Minimum number of prepared idle processes"
+msgstr ""
+
+msgid "Number of idle processes to start when launching Tinyproxy"
+msgstr ""
+
+msgid "Plaintext file with URLs or domains to filter. One entry per line"
+msgstr ""
+
+msgid "Policy"
+msgstr ""
+
+msgid "Privacy settings"
+msgstr ""
 
-#. Reject access
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:28
 msgid "Reject access"
 msgstr "Rebutja accés"
 
-#. Upstream Control
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:29
-msgid "Upstream Control"
-msgstr "Control de pujada"
+msgid "Server Settings"
+msgstr ""
+
+msgid "Server limits"
+msgstr ""
+
+msgid ""
+"Specifies HTTP header names which are allowed to pass-through, all others "
+"are discarded. Leave empty to disable header filtering"
+msgstr ""
+
+msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
+msgstr ""
+
+msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
+msgstr ""
+
+msgid ""
+"Specifies the address Tinyproxy binds to for outbound forwarded requests"
+msgstr ""
+
+msgid "Specifies the addresses Tinyproxy is listening on for requests"
+msgstr ""
+
+msgid "Specifies the group name the Tinyproxy process is running as"
+msgstr ""
+
+msgid ""
+"Specifies the upstream proxy to use for accessing the target host. Format is "
+"<code>address:port</code>"
+msgstr ""
+
+msgid "Specifies the user name the Tinyproxy process is running as"
+msgstr ""
+
+msgid "Start spare servers"
+msgstr ""
+
+msgid "Statistics page"
+msgstr ""
 
-#. Target host
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:30
 msgid "Target host"
 msgstr "Màquina destí"
 
-#. Type
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:31
-msgid "Type"
-msgstr "Tipus"
+msgid "Tinyproxy"
+msgstr "Tinyproxy"
+
+msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
+msgstr "Tinyproxy és un proxy HTTP no caché petit i ràpid"
+
+msgid "Upstream Proxies"
+msgstr ""
+
+msgid ""
+"Upstream proxy rules define proxy servers to use when accessing certain IP "
+"addresses or domains."
+msgstr ""
+
+msgid "Use syslog"
+msgstr ""
+
+msgid "User"
+msgstr ""
+
+msgid "Via hostname"
+msgstr ""
+
+msgid "Via proxy"
+msgstr "Via proxy"
+
+msgid "Writes log messages to syslog instead of a log file"
+msgstr ""
+
+msgid "X-Tinyproxy header"
+msgstr ""
+
+#~ msgid "Allow access from"
+#~ msgstr "Permet l'accés des de"
+
+#~ msgid "Allowed headers for anonymous proxy"
+#~ msgstr "Capçaleres permeses pel proxy anònim"
+
+#~ msgid "Bind outgoing traffic to address"
+#~ msgstr "Vincula el tràfic sortint a l'adreça"
+
+#~ msgid "Ports allowed for CONNECT method"
+#~ msgstr "Ports permesos pel mètode CONNECT"
+
+#~ msgid "0 = disabled, empty = all"
+#~ msgstr "0 = desactivats, buit = tots"
+
+#~ msgid "Error document"
+#~ msgstr "Document d'error"
+
+#~ msgid "Filter list"
+#~ msgstr "Llista de filtre"
+
+#~ msgid "Case sensitive filters"
+#~ msgstr "Filtres distingint majúscules i minúscules"
+
+#~ msgid "Filter list is a whitelist"
+#~ msgstr "La llista de filtre és una llista blanca"
+
+#~ msgid "Extended regular expression filters"
+#~ msgstr "Filtres d'expressions regulars exteses"
+
+#~ msgid "Filter URLs instead of domains"
+#~ msgstr "Filtra URLs en comptes de dominis"
+
+#~ msgid "Listen on address"
+#~ msgstr "Escolta a l'adreça"
+
+#~ msgid "Logfile"
+#~ msgstr "Fitxer de registre"
+
+#~ msgid "Maximum number of clients"
+#~ msgstr "Màxim número de clients"
+
+#~ msgid "Maximum requests per thread"
+#~ msgstr "Màximes peticions per fil"
+
+#~ msgid "Spare servers to start with"
+#~ msgstr "Servidors spare amb els que començar"
+
+#~ msgid "Statistic document"
+#~ msgstr "Document estadístic"
+
+#~ msgid "Write to syslog"
+#~ msgstr "Escriu al syslog"
+
+#~ msgid "Connection Timeout"
+#~ msgstr "Temps d'espera excedit"
+
+#~ msgid "Value of Via-Header"
+#~ msgstr "Valor de Via-Header"
+
+#~ msgid "Include client IP"
+#~ msgstr "Inclou client IP"
+
+#~ msgid "Upstream Control"
+#~ msgstr "Control de pujada"
+
+#~ msgid "Type"
+#~ msgstr "Tipus"
 
-#. Upstream Proxy
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:32
-msgid "Upstream Proxy"
-msgstr "Proxy de pujada"
+#~ msgid "Upstream Proxy"
+#~ msgstr "Proxy de pujada"
diff --git a/po/de/tinyproxy.po b/po/de/tinyproxy.po
index 1a53f860f..0a0994f92 100644
--- a/po/de/tinyproxy.po
+++ b/po/de/tinyproxy.po
@@ -12,162 +12,308 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
-#. Tinyproxy
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:1
-msgid "Tinyproxy"
-msgstr "Tinyproxy"
+msgid ""
+"<em>Via proxy</em> routes requests to the given target via the specifed "
+"upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
+"target"
+msgstr ""
 
-#. Tinyproxy is a small and fast non-caching HTTP(S)-Proxy
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:2
-msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
-msgstr "Tinyproxy ist ein schlanker HTTP(S)-Proxy ohne Zwischenspeicher"
+msgid ""
+"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"requests"
+msgstr ""
+
+msgid "Allowed clients"
+msgstr ""
+
+msgid "Allowed connect ports"
+msgstr ""
+
+msgid "Bind address"
+msgstr ""
+
+msgid ""
+"By default, basic POSIX expressions are used for filtering. Enable this to "
+"activate extended regular expressions"
+msgstr ""
+
+msgid ""
+"By default, filter strings are treated as case-insensitive. Enable this to "
+"make the matching case-sensitive"
+msgstr ""
+
+msgid ""
+"By default, filtering is done based on domain names. Enable this to match "
+"against URLs instead"
+msgstr ""
+
+msgid ""
+"By default, the filter rules act as blacklist. Enable this option to only "
+"allow matched URLs or domain names"
+msgstr ""
+
+msgid ""
+"Can be either an IP address or range, a domain name or \".\" for any host "
+"without domain"
+msgstr ""
+
+msgid "Connection timeout"
+msgstr ""
+
+msgid "Default deny"
+msgstr ""
+
+msgid "Enable Tinyproxy server"
+msgstr ""
+
+msgid "Error page"
+msgstr ""
+
+msgid "Filter by RegExp"
+msgstr ""
+
+msgid "Filter by URLs"
+msgstr ""
+
+msgid "Filter case-sensitive"
+msgstr ""
+
+msgid "Filter file"
+msgstr ""
+
+msgid "Filtering and ACLs"
+msgstr ""
+
+msgid "General settings"
+msgstr ""
+
+msgid "Group"
+msgstr ""
+
+msgid "HTML template file to serve for stat host requests"
+msgstr ""
+
+msgid "HTML template file to serve when HTTP errors occur"
+msgstr ""
+
+msgid "Header whitelist"
+msgstr ""
+
+msgid ""
+"List of IP addresses or ranges which are allowed to use the proxy server"
+msgstr ""
+
+msgid ""
+"List of allowed ports for the CONNECT method. A single value \"0\" allows "
+"all ports"
+msgstr ""
+
+msgid "Listen address"
+msgstr ""
+
+msgid "Listen port"
+msgstr ""
+
+msgid "Log file"
+msgstr ""
+
+msgid "Log file to use for dumping messages"
+msgstr ""
 
-#. Allow access from
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:3
-msgid "Allow access from"
-msgstr "Proxyzugang erlauben von"
-
-#. Allowed headers for anonymous proxy
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:4
-msgid "Allowed headers for anonymous proxy"
-msgstr "Erlaube Header für anonymen Proxy"
-
-#. Bind outgoing traffic to address
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:5
-msgid "Bind outgoing traffic to address"
-msgstr "Ausgehendenden Verkehr an Adresse binden"
-
-#. Ports allowed for CONNECT method
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:6
-msgid "Ports allowed for CONNECT method"
-msgstr "Ports für CONNECT-Methode"
-
-#. 0 = disabled, empty = all
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:7
-msgid "0 = disabled, empty = all"
-msgstr "0 = deaktiviert, leer = alle"
-
-#. Error document
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:8
-msgid "Error document"
-msgstr "Fehlerseite"
-
-#. Filter list
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:9
-msgid "Filter list"
-msgstr "Filterliste"
-
-#. Case sensitive filters
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:10
-msgid "Case sensitive filters"
-msgstr "Filter unterscheiden Groß-/Kleinschreibung"
-
-#. Filter list is a whitelist
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:11
-msgid "Filter list is a whitelist"
-msgstr "Filterliste ist eine Whitelist"
-
-#. Extended regular expression filters
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:12
-msgid "Extended regular expression filters"
-msgstr "Erweiterte reguläre Ausdrücke für Filter"
-
-#. Filter URLs instead of domains
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:13
-msgid "Filter URLs instead of domains"
-msgstr "Filtere URLs statt Domains"
-
-#. Listen on address
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:14
-msgid "Listen on address"
-msgstr "An Adresse binden"
-
-#. Logfile
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:15
-msgid "Logfile"
-msgstr "Protokolldatei"
-
-#. Log level
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:16
 msgid "Log level"
 msgstr "Protokolllevel"
 
-#. Maximum number of clients
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:17
-msgid "Maximum number of clients"
-msgstr "Maximale Anzahl an Clients"
+msgid "Logging verbosity of the Tinyproxy process"
+msgstr ""
 
-#. Maximum requests per thread
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:18
-msgid "Maximum requests per thread"
-msgstr "Maximale Anfragen pro Prozess"
+msgid "Max. clients"
+msgstr ""
+
+msgid "Max. requests per server"
+msgstr ""
 
-#. Max. spare servers
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:19
 msgid "Max. spare servers"
 msgstr "Max. Prozesszahl"
 
-#. Min. spare servers
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:20
+msgid "Maximum allowed number of concurrently connected clients"
+msgstr ""
+
+msgid ""
+"Maximum allowed number of requests per process. If it is exeeded, the "
+"process is restarted. Zero means unlimited."
+msgstr ""
+
+msgid "Maximum number of prepared idle processes"
+msgstr ""
+
+msgid "Maximum number of seconds an inactive connection is held open"
+msgstr ""
+
 msgid "Min. spare servers"
 msgstr "Min. Prozesszahl"
 
-#. Spare servers to start with
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:21
-msgid "Spare servers to start with"
-msgstr "Anfängliche Prozesszahl"
-
-#. Statistic document
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:22
-msgid "Statistic document"
-msgstr "Statistikseite"
-
-#. Write to syslog
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:23
-msgid "Write to syslog"
-msgstr "In Systemprotokoll schreiben"
-
-#. Connection Timeout
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:24
-msgid "Connection Timeout"
-msgstr "Verbindungstimeout"
-
-#. Value of Via-Header
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:25
-msgid "Value of Via-Header"
-msgstr "Wert des Via-Headers"
-
-#. Include client IP
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:26
-msgid "Include client IP"
-msgstr "Client-IP übertragen"
-
-#. Via proxy
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:27
-msgid "Via proxy"
-msgstr "Über Proxy"
+msgid "Minimum number of prepared idle processes"
+msgstr ""
+
+msgid "Number of idle processes to start when launching Tinyproxy"
+msgstr ""
+
+msgid "Plaintext file with URLs or domains to filter. One entry per line"
+msgstr ""
+
+msgid "Policy"
+msgstr ""
+
+msgid "Privacy settings"
+msgstr ""
 
-#. Reject access
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:28
 msgid "Reject access"
 msgstr "Verbiete Zugriff"
 
-#. Upstream Control
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:29
-msgid "Upstream Control"
-msgstr "Zugangskontrolle"
+msgid "Server Settings"
+msgstr ""
+
+msgid "Server limits"
+msgstr ""
+
+msgid ""
+"Specifies HTTP header names which are allowed to pass-through, all others "
+"are discarded. Leave empty to disable header filtering"
+msgstr ""
+
+msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
+msgstr ""
+
+msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
+msgstr ""
+
+msgid ""
+"Specifies the address Tinyproxy binds to for outbound forwarded requests"
+msgstr ""
+
+msgid "Specifies the addresses Tinyproxy is listening on for requests"
+msgstr ""
+
+msgid "Specifies the group name the Tinyproxy process is running as"
+msgstr ""
+
+msgid ""
+"Specifies the upstream proxy to use for accessing the target host. Format is "
+"<code>address:port</code>"
+msgstr ""
+
+msgid "Specifies the user name the Tinyproxy process is running as"
+msgstr ""
+
+msgid "Start spare servers"
+msgstr ""
+
+msgid "Statistics page"
+msgstr ""
 
-#. Target host
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:30
 msgid "Target host"
 msgstr "Zielhost"
 
-#. Type
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:31
-msgid "Type"
-msgstr "Methode"
+msgid "Tinyproxy"
+msgstr "Tinyproxy"
+
+msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
+msgstr "Tinyproxy ist ein schlanker HTTP(S)-Proxy ohne Zwischenspeicher"
+
+msgid "Upstream Proxies"
+msgstr ""
+
+msgid ""
+"Upstream proxy rules define proxy servers to use when accessing certain IP "
+"addresses or domains."
+msgstr ""
+
+msgid "Use syslog"
+msgstr ""
+
+msgid "User"
+msgstr ""
+
+msgid "Via hostname"
+msgstr ""
+
+msgid "Via proxy"
+msgstr "Über Proxy"
+
+msgid "Writes log messages to syslog instead of a log file"
+msgstr ""
+
+msgid "X-Tinyproxy header"
+msgstr ""
+
+#~ msgid "Allow access from"
+#~ msgstr "Proxyzugang erlauben von"
+
+#~ msgid "Allowed headers for anonymous proxy"
+#~ msgstr "Erlaube Header für anonymen Proxy"
+
+#~ msgid "Bind outgoing traffic to address"
+#~ msgstr "Ausgehendenden Verkehr an Adresse binden"
+
+#~ msgid "Ports allowed for CONNECT method"
+#~ msgstr "Ports für CONNECT-Methode"
+
+#~ msgid "0 = disabled, empty = all"
+#~ msgstr "0 = deaktiviert, leer = alle"
+
+#~ msgid "Error document"
+#~ msgstr "Fehlerseite"
+
+#~ msgid "Filter list"
+#~ msgstr "Filterliste"
+
+#~ msgid "Case sensitive filters"
+#~ msgstr "Filter unterscheiden Groß-/Kleinschreibung"
+
+#~ msgid "Filter list is a whitelist"
+#~ msgstr "Filterliste ist eine Whitelist"
+
+#~ msgid "Extended regular expression filters"
+#~ msgstr "Erweiterte reguläre Ausdrücke für Filter"
+
+#~ msgid "Filter URLs instead of domains"
+#~ msgstr "Filtere URLs statt Domains"
+
+#~ msgid "Listen on address"
+#~ msgstr "An Adresse binden"
+
+#~ msgid "Logfile"
+#~ msgstr "Protokolldatei"
+
+#~ msgid "Maximum number of clients"
+#~ msgstr "Maximale Anzahl an Clients"
+
+#~ msgid "Maximum requests per thread"
+#~ msgstr "Maximale Anfragen pro Prozess"
+
+#~ msgid "Spare servers to start with"
+#~ msgstr "Anfängliche Prozesszahl"
+
+#~ msgid "Statistic document"
+#~ msgstr "Statistikseite"
+
+#~ msgid "Write to syslog"
+#~ msgstr "In Systemprotokoll schreiben"
+
+#~ msgid "Connection Timeout"
+#~ msgstr "Verbindungstimeout"
+
+#~ msgid "Value of Via-Header"
+#~ msgstr "Wert des Via-Headers"
+
+#~ msgid "Include client IP"
+#~ msgstr "Client-IP übertragen"
+
+#~ msgid "Upstream Control"
+#~ msgstr "Zugangskontrolle"
+
+#~ msgid "Type"
+#~ msgstr "Methode"
 
-#. Upstream Proxy
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:32
-msgid "Upstream Proxy"
-msgstr "Zugangsproxy"
+#~ msgid "Upstream Proxy"
+#~ msgstr "Zugangsproxy"
diff --git a/po/el/tinyproxy.po b/po/el/tinyproxy.po
index 33274480a..84671a2a6 100644
--- a/po/el/tinyproxy.po
+++ b/po/el/tinyproxy.po
@@ -12,162 +12,236 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
-#. Tinyproxy
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:1
-msgid "Tinyproxy"
+msgid ""
+"<em>Via proxy</em> routes requests to the given target via the specifed "
+"upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
+"target"
 msgstr ""
 
-#. Tinyproxy is a small and fast non-caching HTTP(S)-Proxy
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:2
-msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
+msgid ""
+"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"requests"
+msgstr ""
+
+msgid "Allowed clients"
+msgstr ""
+
+msgid "Allowed connect ports"
+msgstr ""
+
+msgid "Bind address"
+msgstr ""
+
+msgid ""
+"By default, basic POSIX expressions are used for filtering. Enable this to "
+"activate extended regular expressions"
+msgstr ""
+
+msgid ""
+"By default, filter strings are treated as case-insensitive. Enable this to "
+"make the matching case-sensitive"
+msgstr ""
+
+msgid ""
+"By default, filtering is done based on domain names. Enable this to match "
+"against URLs instead"
+msgstr ""
+
+msgid ""
+"By default, the filter rules act as blacklist. Enable this option to only "
+"allow matched URLs or domain names"
+msgstr ""
+
+msgid ""
+"Can be either an IP address or range, a domain name or \".\" for any host "
+"without domain"
+msgstr ""
+
+msgid "Connection timeout"
+msgstr ""
+
+msgid "Default deny"
+msgstr ""
+
+msgid "Enable Tinyproxy server"
+msgstr ""
+
+msgid "Error page"
+msgstr ""
+
+msgid "Filter by RegExp"
+msgstr ""
+
+msgid "Filter by URLs"
+msgstr ""
+
+msgid "Filter case-sensitive"
 msgstr ""
 
-#. Allow access from
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:3
-msgid "Allow access from"
+msgid "Filter file"
 msgstr ""
 
-#. Allowed headers for anonymous proxy
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:4
-msgid "Allowed headers for anonymous proxy"
+msgid "Filtering and ACLs"
 msgstr ""
 
-#. Bind outgoing traffic to address
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:5
-msgid "Bind outgoing traffic to address"
+msgid "General settings"
 msgstr ""
 
-#. Ports allowed for CONNECT method
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:6
-msgid "Ports allowed for CONNECT method"
+msgid "Group"
 msgstr ""
 
-#. 0 = disabled, empty = all
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:7
-msgid "0 = disabled, empty = all"
+msgid "HTML template file to serve for stat host requests"
 msgstr ""
 
-#. Error document
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:8
-msgid "Error document"
+msgid "HTML template file to serve when HTTP errors occur"
 msgstr ""
 
-#. Filter list
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:9
-msgid "Filter list"
+msgid "Header whitelist"
 msgstr ""
 
-#. Case sensitive filters
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:10
-msgid "Case sensitive filters"
+msgid ""
+"List of IP addresses or ranges which are allowed to use the proxy server"
 msgstr ""
 
-#. Filter list is a whitelist
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:11
-msgid "Filter list is a whitelist"
+msgid ""
+"List of allowed ports for the CONNECT method. A single value \"0\" allows "
+"all ports"
 msgstr ""
 
-#. Extended regular expression filters
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:12
-msgid "Extended regular expression filters"
+msgid "Listen address"
 msgstr ""
 
-#. Filter URLs instead of domains
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:13
-msgid "Filter URLs instead of domains"
+msgid "Listen port"
 msgstr ""
 
-#. Listen on address
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:14
-msgid "Listen on address"
+msgid "Log file"
 msgstr ""
 
-#. Logfile
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:15
-msgid "Logfile"
+msgid "Log file to use for dumping messages"
 msgstr ""
 
-#. Log level
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:16
 msgid "Log level"
 msgstr ""
 
-#. Maximum number of clients
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:17
-msgid "Maximum number of clients"
+msgid "Logging verbosity of the Tinyproxy process"
+msgstr ""
+
+msgid "Max. clients"
 msgstr ""
 
-#. Maximum requests per thread
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:18
-msgid "Maximum requests per thread"
+msgid "Max. requests per server"
 msgstr ""
 
-#. Max. spare servers
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:19
 msgid "Max. spare servers"
 msgstr ""
 
-#. Min. spare servers
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:20
-msgid "Min. spare servers"
+msgid "Maximum allowed number of concurrently connected clients"
 msgstr ""
 
-#. Spare servers to start with
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:21
-msgid "Spare servers to start with"
+msgid ""
+"Maximum allowed number of requests per process. If it is exeeded, the "
+"process is restarted. Zero means unlimited."
 msgstr ""
 
-#. Statistic document
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:22
-msgid "Statistic document"
+msgid "Maximum number of prepared idle processes"
 msgstr ""
 
-#. Write to syslog
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:23
-msgid "Write to syslog"
+msgid "Maximum number of seconds an inactive connection is held open"
 msgstr ""
 
-#. Connection Timeout
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:24
-msgid "Connection Timeout"
+msgid "Min. spare servers"
 msgstr ""
 
-#. Value of Via-Header
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:25
-msgid "Value of Via-Header"
+msgid "Minimum number of prepared idle processes"
 msgstr ""
 
-#. Include client IP
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:26
-msgid "Include client IP"
+msgid "Number of idle processes to start when launching Tinyproxy"
 msgstr ""
 
-#. Via proxy
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:27
-msgid "Via proxy"
+msgid "Plaintext file with URLs or domains to filter. One entry per line"
+msgstr ""
+
+msgid "Policy"
+msgstr ""
+
+msgid "Privacy settings"
 msgstr ""
 
-#. Reject access
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:28
 msgid "Reject access"
 msgstr ""
 
-#. Upstream Control
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:29
-msgid "Upstream Control"
+msgid "Server Settings"
+msgstr ""
+
+msgid "Server limits"
+msgstr ""
+
+msgid ""
+"Specifies HTTP header names which are allowed to pass-through, all others "
+"are discarded. Leave empty to disable header filtering"
+msgstr ""
+
+msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
+msgstr ""
+
+msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
+msgstr ""
+
+msgid ""
+"Specifies the address Tinyproxy binds to for outbound forwarded requests"
+msgstr ""
+
+msgid "Specifies the addresses Tinyproxy is listening on for requests"
+msgstr ""
+
+msgid "Specifies the group name the Tinyproxy process is running as"
+msgstr ""
+
+msgid ""
+"Specifies the upstream proxy to use for accessing the target host. Format is "
+"<code>address:port</code>"
+msgstr ""
+
+msgid "Specifies the user name the Tinyproxy process is running as"
+msgstr ""
+
+msgid "Start spare servers"
+msgstr ""
+
+msgid "Statistics page"
 msgstr ""
 
-#. Target host
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:30
 msgid "Target host"
 msgstr ""
 
-#. Type
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:31
-msgid "Type"
+msgid "Tinyproxy"
+msgstr ""
+
+msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
+msgstr ""
+
+msgid "Upstream Proxies"
+msgstr ""
+
+msgid ""
+"Upstream proxy rules define proxy servers to use when accessing certain IP "
+"addresses or domains."
+msgstr ""
+
+msgid "Use syslog"
+msgstr ""
+
+msgid "User"
+msgstr ""
+
+msgid "Via hostname"
+msgstr ""
+
+msgid "Via proxy"
+msgstr ""
+
+msgid "Writes log messages to syslog instead of a log file"
 msgstr ""
 
-#. Upstream Proxy
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:32
-msgid "Upstream Proxy"
+msgid "X-Tinyproxy header"
 msgstr ""
diff --git a/po/en/tinyproxy.po b/po/en/tinyproxy.po
index 0b6d249e6..5af6066a7 100644
--- a/po/en/tinyproxy.po
+++ b/po/en/tinyproxy.po
@@ -12,162 +12,308 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
-#. Tinyproxy
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:1
-msgid "Tinyproxy"
-msgstr "Tinyproxy"
+msgid ""
+"<em>Via proxy</em> routes requests to the given target via the specifed "
+"upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
+"target"
+msgstr ""
 
-#. Tinyproxy is a small and fast non-caching HTTP(S)-Proxy
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:2
-msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
-msgstr "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
+msgid ""
+"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"requests"
+msgstr ""
+
+msgid "Allowed clients"
+msgstr ""
+
+msgid "Allowed connect ports"
+msgstr ""
+
+msgid "Bind address"
+msgstr ""
+
+msgid ""
+"By default, basic POSIX expressions are used for filtering. Enable this to "
+"activate extended regular expressions"
+msgstr ""
+
+msgid ""
+"By default, filter strings are treated as case-insensitive. Enable this to "
+"make the matching case-sensitive"
+msgstr ""
+
+msgid ""
+"By default, filtering is done based on domain names. Enable this to match "
+"against URLs instead"
+msgstr ""
+
+msgid ""
+"By default, the filter rules act as blacklist. Enable this option to only "
+"allow matched URLs or domain names"
+msgstr ""
+
+msgid ""
+"Can be either an IP address or range, a domain name or \".\" for any host "
+"without domain"
+msgstr ""
+
+msgid "Connection timeout"
+msgstr ""
+
+msgid "Default deny"
+msgstr ""
+
+msgid "Enable Tinyproxy server"
+msgstr ""
+
+msgid "Error page"
+msgstr ""
+
+msgid "Filter by RegExp"
+msgstr ""
+
+msgid "Filter by URLs"
+msgstr ""
+
+msgid "Filter case-sensitive"
+msgstr ""
+
+msgid "Filter file"
+msgstr ""
+
+msgid "Filtering and ACLs"
+msgstr ""
+
+msgid "General settings"
+msgstr ""
+
+msgid "Group"
+msgstr ""
+
+msgid "HTML template file to serve for stat host requests"
+msgstr ""
+
+msgid "HTML template file to serve when HTTP errors occur"
+msgstr ""
+
+msgid "Header whitelist"
+msgstr ""
+
+msgid ""
+"List of IP addresses or ranges which are allowed to use the proxy server"
+msgstr ""
+
+msgid ""
+"List of allowed ports for the CONNECT method. A single value \"0\" allows "
+"all ports"
+msgstr ""
+
+msgid "Listen address"
+msgstr ""
+
+msgid "Listen port"
+msgstr ""
+
+msgid "Log file"
+msgstr ""
+
+msgid "Log file to use for dumping messages"
+msgstr ""
 
-#. Allow access from
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:3
-msgid "Allow access from"
-msgstr "Allow access from"
-
-#. Allowed headers for anonymous proxy
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:4
-msgid "Allowed headers for anonymous proxy"
-msgstr "Allowed headers for anonymous proxy"
-
-#. Bind outgoing traffic to address
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:5
-msgid "Bind outgoing traffic to address"
-msgstr "Bind outgoing traffic to address"
-
-#. Ports allowed for CONNECT method
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:6
-msgid "Ports allowed for CONNECT method"
-msgstr "Ports allowed for CONNECT method"
-
-#. 0 = disabled, empty = all
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:7
-msgid "0 = disabled, empty = all"
-msgstr "0 = disabled, empty = all"
-
-#. Error document
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:8
-msgid "Error document"
-msgstr "Error document"
-
-#. Filter list
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:9
-msgid "Filter list"
-msgstr "Filter list"
-
-#. Case sensitive filters
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:10
-msgid "Case sensitive filters"
-msgstr "Case sensitive filters"
-
-#. Filter list is a whitelist
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:11
-msgid "Filter list is a whitelist"
-msgstr "Filter list is a whitelist"
-
-#. Extended regular expression filters
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:12
-msgid "Extended regular expression filters"
-msgstr "Extended regular expression filters"
-
-#. Filter URLs instead of domains
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:13
-msgid "Filter URLs instead of domains"
-msgstr "Filter URLs instead of domains"
-
-#. Listen on address
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:14
-msgid "Listen on address"
-msgstr "Listen on address"
-
-#. Logfile
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:15
-msgid "Logfile"
-msgstr "Logfile"
-
-#. Log level
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:16
 msgid "Log level"
 msgstr "Log level"
 
-#. Maximum number of clients
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:17
-msgid "Maximum number of clients"
-msgstr "Maximum number of clients"
+msgid "Logging verbosity of the Tinyproxy process"
+msgstr ""
 
-#. Maximum requests per thread
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:18
-msgid "Maximum requests per thread"
-msgstr "Maximum requests per thread"
+msgid "Max. clients"
+msgstr ""
+
+msgid "Max. requests per server"
+msgstr ""
 
-#. Max. spare servers
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:19
 msgid "Max. spare servers"
 msgstr "Max. spare servers"
 
-#. Min. spare servers
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:20
+msgid "Maximum allowed number of concurrently connected clients"
+msgstr ""
+
+msgid ""
+"Maximum allowed number of requests per process. If it is exeeded, the "
+"process is restarted. Zero means unlimited."
+msgstr ""
+
+msgid "Maximum number of prepared idle processes"
+msgstr ""
+
+msgid "Maximum number of seconds an inactive connection is held open"
+msgstr ""
+
 msgid "Min. spare servers"
 msgstr "Min. spare servers"
 
-#. Spare servers to start with
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:21
-msgid "Spare servers to start with"
-msgstr "Spare servers to start with"
-
-#. Statistic document
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:22
-msgid "Statistic document"
-msgstr "Statistic document"
-
-#. Write to syslog
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:23
-msgid "Write to syslog"
-msgstr "Write to syslog"
-
-#. Connection Timeout
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:24
-msgid "Connection Timeout"
-msgstr "Connection Timeout"
-
-#. Value of Via-Header
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:25
-msgid "Value of Via-Header"
-msgstr "Value of Via-Header"
-
-#. Include client IP
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:26
-msgid "Include client IP"
-msgstr "Include client IP"
-
-#. Via proxy
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:27
-msgid "Via proxy"
-msgstr "Via proxy"
+msgid "Minimum number of prepared idle processes"
+msgstr ""
+
+msgid "Number of idle processes to start when launching Tinyproxy"
+msgstr ""
+
+msgid "Plaintext file with URLs or domains to filter. One entry per line"
+msgstr ""
+
+msgid "Policy"
+msgstr ""
+
+msgid "Privacy settings"
+msgstr ""
 
-#. Reject access
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:28
 msgid "Reject access"
 msgstr "Reject access"
 
-#. Upstream Control
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:29
-msgid "Upstream Control"
-msgstr "Upstream Control"
+msgid "Server Settings"
+msgstr ""
+
+msgid "Server limits"
+msgstr ""
+
+msgid ""
+"Specifies HTTP header names which are allowed to pass-through, all others "
+"are discarded. Leave empty to disable header filtering"
+msgstr ""
+
+msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
+msgstr ""
+
+msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
+msgstr ""
+
+msgid ""
+"Specifies the address Tinyproxy binds to for outbound forwarded requests"
+msgstr ""
+
+msgid "Specifies the addresses Tinyproxy is listening on for requests"
+msgstr ""
+
+msgid "Specifies the group name the Tinyproxy process is running as"
+msgstr ""
+
+msgid ""
+"Specifies the upstream proxy to use for accessing the target host. Format is "
+"<code>address:port</code>"
+msgstr ""
+
+msgid "Specifies the user name the Tinyproxy process is running as"
+msgstr ""
+
+msgid "Start spare servers"
+msgstr ""
+
+msgid "Statistics page"
+msgstr ""
 
-#. Target host
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:30
 msgid "Target host"
 msgstr "Target host"
 
-#. Type
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:31
-msgid "Type"
-msgstr "Type"
+msgid "Tinyproxy"
+msgstr "Tinyproxy"
+
+msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
+msgstr "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
+
+msgid "Upstream Proxies"
+msgstr ""
+
+msgid ""
+"Upstream proxy rules define proxy servers to use when accessing certain IP "
+"addresses or domains."
+msgstr ""
+
+msgid "Use syslog"
+msgstr ""
+
+msgid "User"
+msgstr ""
+
+msgid "Via hostname"
+msgstr ""
+
+msgid "Via proxy"
+msgstr "Via proxy"
+
+msgid "Writes log messages to syslog instead of a log file"
+msgstr ""
+
+msgid "X-Tinyproxy header"
+msgstr ""
+
+#~ msgid "Allow access from"
+#~ msgstr "Allow access from"
+
+#~ msgid "Allowed headers for anonymous proxy"
+#~ msgstr "Allowed headers for anonymous proxy"
+
+#~ msgid "Bind outgoing traffic to address"
+#~ msgstr "Bind outgoing traffic to address"
+
+#~ msgid "Ports allowed for CONNECT method"
+#~ msgstr "Ports allowed for CONNECT method"
+
+#~ msgid "0 = disabled, empty = all"
+#~ msgstr "0 = disabled, empty = all"
+
+#~ msgid "Error document"
+#~ msgstr "Error document"
+
+#~ msgid "Filter list"
+#~ msgstr "Filter list"
+
+#~ msgid "Case sensitive filters"
+#~ msgstr "Case sensitive filters"
+
+#~ msgid "Filter list is a whitelist"
+#~ msgstr "Filter list is a whitelist"
+
+#~ msgid "Extended regular expression filters"
+#~ msgstr "Extended regular expression filters"
+
+#~ msgid "Filter URLs instead of domains"
+#~ msgstr "Filter URLs instead of domains"
+
+#~ msgid "Listen on address"
+#~ msgstr "Listen on address"
+
+#~ msgid "Logfile"
+#~ msgstr "Logfile"
+
+#~ msgid "Maximum number of clients"
+#~ msgstr "Maximum number of clients"
+
+#~ msgid "Maximum requests per thread"
+#~ msgstr "Maximum requests per thread"
+
+#~ msgid "Spare servers to start with"
+#~ msgstr "Spare servers to start with"
+
+#~ msgid "Statistic document"
+#~ msgstr "Statistic document"
+
+#~ msgid "Write to syslog"
+#~ msgstr "Write to syslog"
+
+#~ msgid "Connection Timeout"
+#~ msgstr "Connection Timeout"
+
+#~ msgid "Value of Via-Header"
+#~ msgstr "Value of Via-Header"
+
+#~ msgid "Include client IP"
+#~ msgstr "Include client IP"
+
+#~ msgid "Upstream Control"
+#~ msgstr "Upstream Control"
+
+#~ msgid "Type"
+#~ msgstr "Type"
 
-#. Upstream Proxy
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:32
-msgid "Upstream Proxy"
-msgstr "Upstream Proxy"
+#~ msgid "Upstream Proxy"
+#~ msgstr "Upstream Proxy"
diff --git a/po/es/tinyproxy.po b/po/es/tinyproxy.po
index d7b10c66e..c80945d2e 100644
--- a/po/es/tinyproxy.po
+++ b/po/es/tinyproxy.po
@@ -11,162 +11,308 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0\n"
 
-#. Tinyproxy
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:1
-msgid "Tinyproxy"
-msgstr "Tinyproxy"
+msgid ""
+"<em>Via proxy</em> routes requests to the given target via the specifed "
+"upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
+"target"
+msgstr ""
 
-#. Tinyproxy is a small and fast non-caching HTTP(S)-Proxy
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:2
-msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
-msgstr "Tinyproxy es un pequeño y rápido Proxy de HTTP(S) sin cache"
+msgid ""
+"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"requests"
+msgstr ""
+
+msgid "Allowed clients"
+msgstr ""
+
+msgid "Allowed connect ports"
+msgstr ""
+
+msgid "Bind address"
+msgstr ""
+
+msgid ""
+"By default, basic POSIX expressions are used for filtering. Enable this to "
+"activate extended regular expressions"
+msgstr ""
+
+msgid ""
+"By default, filter strings are treated as case-insensitive. Enable this to "
+"make the matching case-sensitive"
+msgstr ""
+
+msgid ""
+"By default, filtering is done based on domain names. Enable this to match "
+"against URLs instead"
+msgstr ""
+
+msgid ""
+"By default, the filter rules act as blacklist. Enable this option to only "
+"allow matched URLs or domain names"
+msgstr ""
+
+msgid ""
+"Can be either an IP address or range, a domain name or \".\" for any host "
+"without domain"
+msgstr ""
+
+msgid "Connection timeout"
+msgstr ""
+
+msgid "Default deny"
+msgstr ""
+
+msgid "Enable Tinyproxy server"
+msgstr ""
+
+msgid "Error page"
+msgstr ""
+
+msgid "Filter by RegExp"
+msgstr ""
+
+msgid "Filter by URLs"
+msgstr ""
+
+msgid "Filter case-sensitive"
+msgstr ""
+
+msgid "Filter file"
+msgstr ""
+
+msgid "Filtering and ACLs"
+msgstr ""
+
+msgid "General settings"
+msgstr ""
+
+msgid "Group"
+msgstr ""
+
+msgid "HTML template file to serve for stat host requests"
+msgstr ""
+
+msgid "HTML template file to serve when HTTP errors occur"
+msgstr ""
+
+msgid "Header whitelist"
+msgstr ""
+
+msgid ""
+"List of IP addresses or ranges which are allowed to use the proxy server"
+msgstr ""
+
+msgid ""
+"List of allowed ports for the CONNECT method. A single value \"0\" allows "
+"all ports"
+msgstr ""
+
+msgid "Listen address"
+msgstr ""
+
+msgid "Listen port"
+msgstr ""
+
+msgid "Log file"
+msgstr ""
+
+msgid "Log file to use for dumping messages"
+msgstr ""
 
-#. Allow access from
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:3
-msgid "Allow access from"
-msgstr "Permitir acceso desde"
-
-#. Allowed headers for anonymous proxy
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:4
-msgid "Allowed headers for anonymous proxy"
-msgstr "Encabezados permitidos de proxies anónimos"
-
-#. Bind outgoing traffic to address
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:5
-msgid "Bind outgoing traffic to address"
-msgstr "Ligar tráfico de salida a la dirección"
-
-#. Ports allowed for CONNECT method
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:6
-msgid "Ports allowed for CONNECT method"
-msgstr "Puertos permitidos para el método CONNECT"
-
-#. 0 = disabled, empty = all
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:7
-msgid "0 = disabled, empty = all"
-msgstr "0 = Deshabilitado, vacío = todos"
-
-#. Error document
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:8
-msgid "Error document"
-msgstr "Error en documento"
-
-#. Filter list
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:9
-msgid "Filter list"
-msgstr "Lista de filtros"
-
-#. Case sensitive filters
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:10
-msgid "Case sensitive filters"
-msgstr "Filtros de mayúsculas y minúsculas "
-
-#. Filter list is a whitelist
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:11
-msgid "Filter list is a whitelist"
-msgstr "La Lista de Filtros es una lista blanca"
-
-#. Extended regular expression filters
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:12
-msgid "Extended regular expression filters"
-msgstr "Filtros extendido para expresiones regulares"
-
-#. Filter URLs instead of domains
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:13
-msgid "Filter URLs instead of domains"
-msgstr "Filtrar URLs en vez de dominios"
-
-#. Listen on address
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:14
-msgid "Listen on address"
-msgstr "Escuchar en dirección"
-
-#. Logfile
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:15
-msgid "Logfile"
-msgstr "Logfile"
-
-#. Log level
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:16
 msgid "Log level"
 msgstr "Nivel de LOG"
 
-#. Maximum number of clients
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:17
-msgid "Maximum number of clients"
-msgstr "Número máximo de clientes"
+msgid "Logging verbosity of the Tinyproxy process"
+msgstr ""
 
-#. Maximum requests per thread
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:18
-msgid "Maximum requests per thread"
-msgstr "Máximas peticiones por hilo"
+msgid "Max. clients"
+msgstr ""
+
+msgid "Max. requests per server"
+msgstr ""
 
-#. Max. spare servers
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:19
 msgid "Max. spare servers"
 msgstr "Máxima cantidad de servidores de \"repuestos\""
 
-#. Min. spare servers
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:20
+msgid "Maximum allowed number of concurrently connected clients"
+msgstr ""
+
+msgid ""
+"Maximum allowed number of requests per process. If it is exeeded, the "
+"process is restarted. Zero means unlimited."
+msgstr ""
+
+msgid "Maximum number of prepared idle processes"
+msgstr ""
+
+msgid "Maximum number of seconds an inactive connection is held open"
+msgstr ""
+
 msgid "Min. spare servers"
 msgstr "Mínima cantidad de servidores de \"repuestos\""
 
-#. Spare servers to start with
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:21
-msgid "Spare servers to start with"
-msgstr "Spare servers to start with"
-
-#. Statistic document
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:22
-msgid "Statistic document"
-msgstr "Documento de estadística"
-
-#. Write to syslog
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:23
-msgid "Write to syslog"
-msgstr "Escribir al syslog"
-
-#. Connection Timeout
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:24
-msgid "Connection Timeout"
-msgstr "Tiempo agotado para la conexión"
-
-#. Value of Via-Header
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:25
-msgid "Value of Via-Header"
-msgstr "Valor para Via-Header"
-
-#. Include client IP
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:26
-msgid "Include client IP"
-msgstr "Incluir IP del cliente"
-
-#. Via proxy
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:27
-msgid "Via proxy"
-msgstr "Via proxy"
+msgid "Minimum number of prepared idle processes"
+msgstr ""
+
+msgid "Number of idle processes to start when launching Tinyproxy"
+msgstr ""
+
+msgid "Plaintext file with URLs or domains to filter. One entry per line"
+msgstr ""
+
+msgid "Policy"
+msgstr ""
+
+msgid "Privacy settings"
+msgstr ""
 
-#. Reject access
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:28
 msgid "Reject access"
 msgstr "Rechazar acceso"
 
-#. Upstream Control
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:29
-msgid "Upstream Control"
-msgstr "Control de subida (upstream)"
+msgid "Server Settings"
+msgstr ""
+
+msgid "Server limits"
+msgstr ""
+
+msgid ""
+"Specifies HTTP header names which are allowed to pass-through, all others "
+"are discarded. Leave empty to disable header filtering"
+msgstr ""
+
+msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
+msgstr ""
+
+msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
+msgstr ""
+
+msgid ""
+"Specifies the address Tinyproxy binds to for outbound forwarded requests"
+msgstr ""
+
+msgid "Specifies the addresses Tinyproxy is listening on for requests"
+msgstr ""
+
+msgid "Specifies the group name the Tinyproxy process is running as"
+msgstr ""
+
+msgid ""
+"Specifies the upstream proxy to use for accessing the target host. Format is "
+"<code>address:port</code>"
+msgstr ""
+
+msgid "Specifies the user name the Tinyproxy process is running as"
+msgstr ""
+
+msgid "Start spare servers"
+msgstr ""
+
+msgid "Statistics page"
+msgstr ""
 
-#. Target host
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:30
 msgid "Target host"
 msgstr "Host de destino "
 
-#. Type
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:31
-msgid "Type"
-msgstr "Tipo"
+msgid "Tinyproxy"
+msgstr "Tinyproxy"
+
+msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
+msgstr "Tinyproxy es un pequeño y rápido Proxy de HTTP(S) sin cache"
+
+msgid "Upstream Proxies"
+msgstr ""
+
+msgid ""
+"Upstream proxy rules define proxy servers to use when accessing certain IP "
+"addresses or domains."
+msgstr ""
+
+msgid "Use syslog"
+msgstr ""
+
+msgid "User"
+msgstr ""
+
+msgid "Via hostname"
+msgstr ""
+
+msgid "Via proxy"
+msgstr "Via proxy"
+
+msgid "Writes log messages to syslog instead of a log file"
+msgstr ""
+
+msgid "X-Tinyproxy header"
+msgstr ""
+
+#~ msgid "Allow access from"
+#~ msgstr "Permitir acceso desde"
+
+#~ msgid "Allowed headers for anonymous proxy"
+#~ msgstr "Encabezados permitidos de proxies anónimos"
+
+#~ msgid "Bind outgoing traffic to address"
+#~ msgstr "Ligar tráfico de salida a la dirección"
+
+#~ msgid "Ports allowed for CONNECT method"
+#~ msgstr "Puertos permitidos para el método CONNECT"
+
+#~ msgid "0 = disabled, empty = all"
+#~ msgstr "0 = Deshabilitado, vacío = todos"
+
+#~ msgid "Error document"
+#~ msgstr "Error en documento"
+
+#~ msgid "Filter list"
+#~ msgstr "Lista de filtros"
+
+#~ msgid "Case sensitive filters"
+#~ msgstr "Filtros de mayúsculas y minúsculas "
+
+#~ msgid "Filter list is a whitelist"
+#~ msgstr "La Lista de Filtros es una lista blanca"
+
+#~ msgid "Extended regular expression filters"
+#~ msgstr "Filtros extendido para expresiones regulares"
+
+#~ msgid "Filter URLs instead of domains"
+#~ msgstr "Filtrar URLs en vez de dominios"
+
+#~ msgid "Listen on address"
+#~ msgstr "Escuchar en dirección"
+
+#~ msgid "Logfile"
+#~ msgstr "Logfile"
+
+#~ msgid "Maximum number of clients"
+#~ msgstr "Número máximo de clientes"
+
+#~ msgid "Maximum requests per thread"
+#~ msgstr "Máximas peticiones por hilo"
+
+#~ msgid "Spare servers to start with"
+#~ msgstr "Spare servers to start with"
+
+#~ msgid "Statistic document"
+#~ msgstr "Documento de estadística"
+
+#~ msgid "Write to syslog"
+#~ msgstr "Escribir al syslog"
+
+#~ msgid "Connection Timeout"
+#~ msgstr "Tiempo agotado para la conexión"
+
+#~ msgid "Value of Via-Header"
+#~ msgstr "Valor para Via-Header"
+
+#~ msgid "Include client IP"
+#~ msgstr "Incluir IP del cliente"
+
+#~ msgid "Upstream Control"
+#~ msgstr "Control de subida (upstream)"
+
+#~ msgid "Type"
+#~ msgstr "Tipo"
 
-#. Upstream Proxy
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:32
-msgid "Upstream Proxy"
-msgstr "Proxy de subida (upstream)"
+#~ msgid "Upstream Proxy"
+#~ msgstr "Proxy de subida (upstream)"
diff --git a/po/fr/tinyproxy.po b/po/fr/tinyproxy.po
index a38cd0d96..cbe879687 100644
--- a/po/fr/tinyproxy.po
+++ b/po/fr/tinyproxy.po
@@ -12,162 +12,308 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
-#. Tinyproxy
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:1
-msgid "Tinyproxy"
-msgstr "Tinyproxy"
+msgid ""
+"<em>Via proxy</em> routes requests to the given target via the specifed "
+"upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
+"target"
+msgstr ""
 
-#. Tinyproxy is a small and fast non-caching HTTP(S)-Proxy
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:2
-msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
-msgstr "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
+msgid ""
+"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"requests"
+msgstr ""
+
+msgid "Allowed clients"
+msgstr ""
+
+msgid "Allowed connect ports"
+msgstr ""
+
+msgid "Bind address"
+msgstr ""
+
+msgid ""
+"By default, basic POSIX expressions are used for filtering. Enable this to "
+"activate extended regular expressions"
+msgstr ""
+
+msgid ""
+"By default, filter strings are treated as case-insensitive. Enable this to "
+"make the matching case-sensitive"
+msgstr ""
+
+msgid ""
+"By default, filtering is done based on domain names. Enable this to match "
+"against URLs instead"
+msgstr ""
+
+msgid ""
+"By default, the filter rules act as blacklist. Enable this option to only "
+"allow matched URLs or domain names"
+msgstr ""
+
+msgid ""
+"Can be either an IP address or range, a domain name or \".\" for any host "
+"without domain"
+msgstr ""
+
+msgid "Connection timeout"
+msgstr ""
+
+msgid "Default deny"
+msgstr ""
+
+msgid "Enable Tinyproxy server"
+msgstr ""
+
+msgid "Error page"
+msgstr ""
+
+msgid "Filter by RegExp"
+msgstr ""
+
+msgid "Filter by URLs"
+msgstr ""
+
+msgid "Filter case-sensitive"
+msgstr ""
+
+msgid "Filter file"
+msgstr ""
+
+msgid "Filtering and ACLs"
+msgstr ""
+
+msgid "General settings"
+msgstr ""
+
+msgid "Group"
+msgstr ""
+
+msgid "HTML template file to serve for stat host requests"
+msgstr ""
+
+msgid "HTML template file to serve when HTTP errors occur"
+msgstr ""
+
+msgid "Header whitelist"
+msgstr ""
+
+msgid ""
+"List of IP addresses or ranges which are allowed to use the proxy server"
+msgstr ""
+
+msgid ""
+"List of allowed ports for the CONNECT method. A single value \"0\" allows "
+"all ports"
+msgstr ""
+
+msgid "Listen address"
+msgstr ""
+
+msgid "Listen port"
+msgstr ""
+
+msgid "Log file"
+msgstr ""
+
+msgid "Log file to use for dumping messages"
+msgstr ""
 
-#. Allow access from
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:3
-msgid "Allow access from"
-msgstr "Allow access from"
-
-#. Allowed headers for anonymous proxy
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:4
-msgid "Allowed headers for anonymous proxy"
-msgstr "Allowed headers for anonymous proxy"
-
-#. Bind outgoing traffic to address
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:5
-msgid "Bind outgoing traffic to address"
-msgstr "Lier le trafic sortant à l'adresse ip"
-
-#. Ports allowed for CONNECT method
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:6
-msgid "Ports allowed for CONNECT method"
-msgstr "Ports allowed for CONNECT method"
-
-#. 0 = disabled, empty = all
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:7
-msgid "0 = disabled, empty = all"
-msgstr "0 = disabled, empty = all"
-
-#. Error document
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:8
-msgid "Error document"
-msgstr "Fichier d'erreur"
-
-#. Filter list
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:9
-msgid "Filter list"
-msgstr "Liste de filtres"
-
-#. Case sensitive filters
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:10
-msgid "Case sensitive filters"
-msgstr "Case sensitive filters"
-
-#. Filter list is a whitelist
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:11
-msgid "Filter list is a whitelist"
-msgstr "Filter list is a whitelist"
-
-#. Extended regular expression filters
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:12
-msgid "Extended regular expression filters"
-msgstr "Extended regular expression filters"
-
-#. Filter URLs instead of domains
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:13
-msgid "Filter URLs instead of domains"
-msgstr "Filter URLs instead of domains"
-
-#. Listen on address
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:14
-msgid "Listen on address"
-msgstr "Listen on address"
-
-#. Logfile
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:15
-msgid "Logfile"
-msgstr "Chemin du fichier de log"
-
-#. Log level
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:16
 msgid "Log level"
 msgstr "Niveau de log"
 
-#. Maximum number of clients
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:17
-msgid "Maximum number of clients"
-msgstr "Nombre maximum de clients"
+msgid "Logging verbosity of the Tinyproxy process"
+msgstr ""
 
-#. Maximum requests per thread
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:18
-msgid "Maximum requests per thread"
-msgstr "Maximum de connexion par processus"
+msgid "Max. clients"
+msgstr ""
+
+msgid "Max. requests per server"
+msgstr ""
 
-#. Max. spare servers
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:19
 msgid "Max. spare servers"
 msgstr "Nombre Maximum de processus serveur"
 
-#. Min. spare servers
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:20
+msgid "Maximum allowed number of concurrently connected clients"
+msgstr ""
+
+msgid ""
+"Maximum allowed number of requests per process. If it is exeeded, the "
+"process is restarted. Zero means unlimited."
+msgstr ""
+
+msgid "Maximum number of prepared idle processes"
+msgstr ""
+
+msgid "Maximum number of seconds an inactive connection is held open"
+msgstr ""
+
 msgid "Min. spare servers"
 msgstr "Nombre Minimum de processus serveur"
 
-#. Spare servers to start with
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:21
-msgid "Spare servers to start with"
-msgstr "Nombre de processus serveur lancés au demarrage"
-
-#. Statistic document
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:22
-msgid "Statistic document"
-msgstr "Fichier de statistiques"
-
-#. Write to syslog
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:23
-msgid "Write to syslog"
-msgstr "Écrire dans le journal système (Syslog)"
-
-#. Connection Timeout
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:24
-msgid "Connection Timeout"
-msgstr "Délai de connexion"
-
-#. Value of Via-Header
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:25
-msgid "Value of Via-Header"
-msgstr "Valeur de l'entête \"VIA\" utilisée comme nom d'hôte"
-
-#. Include client IP
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:26
-msgid "Include client IP"
-msgstr "Inclure l'ip du client"
-
-#. Via proxy
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:27
-msgid "Via proxy"
-msgstr "Via proxy"
+msgid "Minimum number of prepared idle processes"
+msgstr ""
+
+msgid "Number of idle processes to start when launching Tinyproxy"
+msgstr ""
+
+msgid "Plaintext file with URLs or domains to filter. One entry per line"
+msgstr ""
+
+msgid "Policy"
+msgstr ""
+
+msgid "Privacy settings"
+msgstr ""
 
-#. Reject access
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:28
 msgid "Reject access"
 msgstr "Refuser l'accès"
 
-#. Upstream Control
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:29
-msgid "Upstream Control"
-msgstr "Upstream Control"
+msgid "Server Settings"
+msgstr ""
+
+msgid "Server limits"
+msgstr ""
+
+msgid ""
+"Specifies HTTP header names which are allowed to pass-through, all others "
+"are discarded. Leave empty to disable header filtering"
+msgstr ""
+
+msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
+msgstr ""
+
+msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
+msgstr ""
+
+msgid ""
+"Specifies the address Tinyproxy binds to for outbound forwarded requests"
+msgstr ""
+
+msgid "Specifies the addresses Tinyproxy is listening on for requests"
+msgstr ""
+
+msgid "Specifies the group name the Tinyproxy process is running as"
+msgstr ""
+
+msgid ""
+"Specifies the upstream proxy to use for accessing the target host. Format is "
+"<code>address:port</code>"
+msgstr ""
+
+msgid "Specifies the user name the Tinyproxy process is running as"
+msgstr ""
+
+msgid "Start spare servers"
+msgstr ""
+
+msgid "Statistics page"
+msgstr ""
 
-#. Target host
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:30
 msgid "Target host"
 msgstr "Hôte de destination"
 
-#. Type
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:31
-msgid "Type"
-msgstr "Type"
+msgid "Tinyproxy"
+msgstr "Tinyproxy"
+
+msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
+msgstr "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
+
+msgid "Upstream Proxies"
+msgstr ""
+
+msgid ""
+"Upstream proxy rules define proxy servers to use when accessing certain IP "
+"addresses or domains."
+msgstr ""
+
+msgid "Use syslog"
+msgstr ""
+
+msgid "User"
+msgstr ""
+
+msgid "Via hostname"
+msgstr ""
+
+msgid "Via proxy"
+msgstr "Via proxy"
+
+msgid "Writes log messages to syslog instead of a log file"
+msgstr ""
+
+msgid "X-Tinyproxy header"
+msgstr ""
+
+#~ msgid "Allow access from"
+#~ msgstr "Allow access from"
+
+#~ msgid "Allowed headers for anonymous proxy"
+#~ msgstr "Allowed headers for anonymous proxy"
+
+#~ msgid "Bind outgoing traffic to address"
+#~ msgstr "Lier le trafic sortant à l'adresse ip"
+
+#~ msgid "Ports allowed for CONNECT method"
+#~ msgstr "Ports allowed for CONNECT method"
+
+#~ msgid "0 = disabled, empty = all"
+#~ msgstr "0 = disabled, empty = all"
+
+#~ msgid "Error document"
+#~ msgstr "Fichier d'erreur"
+
+#~ msgid "Filter list"
+#~ msgstr "Liste de filtres"
+
+#~ msgid "Case sensitive filters"
+#~ msgstr "Case sensitive filters"
+
+#~ msgid "Filter list is a whitelist"
+#~ msgstr "Filter list is a whitelist"
+
+#~ msgid "Extended regular expression filters"
+#~ msgstr "Extended regular expression filters"
+
+#~ msgid "Filter URLs instead of domains"
+#~ msgstr "Filter URLs instead of domains"
+
+#~ msgid "Listen on address"
+#~ msgstr "Listen on address"
+
+#~ msgid "Logfile"
+#~ msgstr "Chemin du fichier de log"
+
+#~ msgid "Maximum number of clients"
+#~ msgstr "Nombre maximum de clients"
+
+#~ msgid "Maximum requests per thread"
+#~ msgstr "Maximum de connexion par processus"
+
+#~ msgid "Spare servers to start with"
+#~ msgstr "Nombre de processus serveur lancés au demarrage"
+
+#~ msgid "Statistic document"
+#~ msgstr "Fichier de statistiques"
+
+#~ msgid "Write to syslog"
+#~ msgstr "Écrire dans le journal système (Syslog)"
+
+#~ msgid "Connection Timeout"
+#~ msgstr "Délai de connexion"
+
+#~ msgid "Value of Via-Header"
+#~ msgstr "Valeur de l'entête \"VIA\" utilisée comme nom d'hôte"
+
+#~ msgid "Include client IP"
+#~ msgstr "Inclure l'ip du client"
+
+#~ msgid "Upstream Control"
+#~ msgstr "Upstream Control"
+
+#~ msgid "Type"
+#~ msgstr "Type"
 
-#. Upstream Proxy
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:32
-msgid "Upstream Proxy"
-msgstr "Proxy"
+#~ msgid "Upstream Proxy"
+#~ msgstr "Proxy"
diff --git a/po/it/tinyproxy.po b/po/it/tinyproxy.po
index 0c4f236f1..aa5eb23b2 100644
--- a/po/it/tinyproxy.po
+++ b/po/it/tinyproxy.po
@@ -12,162 +12,236 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
-#. Tinyproxy
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:1
-msgid "Tinyproxy"
+msgid ""
+"<em>Via proxy</em> routes requests to the given target via the specifed "
+"upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
+"target"
 msgstr ""
 
-#. Tinyproxy is a small and fast non-caching HTTP(S)-Proxy
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:2
-msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
+msgid ""
+"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"requests"
+msgstr ""
+
+msgid "Allowed clients"
+msgstr ""
+
+msgid "Allowed connect ports"
+msgstr ""
+
+msgid "Bind address"
+msgstr ""
+
+msgid ""
+"By default, basic POSIX expressions are used for filtering. Enable this to "
+"activate extended regular expressions"
+msgstr ""
+
+msgid ""
+"By default, filter strings are treated as case-insensitive. Enable this to "
+"make the matching case-sensitive"
+msgstr ""
+
+msgid ""
+"By default, filtering is done based on domain names. Enable this to match "
+"against URLs instead"
+msgstr ""
+
+msgid ""
+"By default, the filter rules act as blacklist. Enable this option to only "
+"allow matched URLs or domain names"
+msgstr ""
+
+msgid ""
+"Can be either an IP address or range, a domain name or \".\" for any host "
+"without domain"
+msgstr ""
+
+msgid "Connection timeout"
+msgstr ""
+
+msgid "Default deny"
+msgstr ""
+
+msgid "Enable Tinyproxy server"
+msgstr ""
+
+msgid "Error page"
+msgstr ""
+
+msgid "Filter by RegExp"
+msgstr ""
+
+msgid "Filter by URLs"
+msgstr ""
+
+msgid "Filter case-sensitive"
 msgstr ""
 
-#. Allow access from
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:3
-msgid "Allow access from"
+msgid "Filter file"
 msgstr ""
 
-#. Allowed headers for anonymous proxy
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:4
-msgid "Allowed headers for anonymous proxy"
+msgid "Filtering and ACLs"
 msgstr ""
 
-#. Bind outgoing traffic to address
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:5
-msgid "Bind outgoing traffic to address"
+msgid "General settings"
 msgstr ""
 
-#. Ports allowed for CONNECT method
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:6
-msgid "Ports allowed for CONNECT method"
+msgid "Group"
 msgstr ""
 
-#. 0 = disabled, empty = all
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:7
-msgid "0 = disabled, empty = all"
+msgid "HTML template file to serve for stat host requests"
 msgstr ""
 
-#. Error document
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:8
-msgid "Error document"
+msgid "HTML template file to serve when HTTP errors occur"
 msgstr ""
 
-#. Filter list
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:9
-msgid "Filter list"
+msgid "Header whitelist"
 msgstr ""
 
-#. Case sensitive filters
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:10
-msgid "Case sensitive filters"
+msgid ""
+"List of IP addresses or ranges which are allowed to use the proxy server"
 msgstr ""
 
-#. Filter list is a whitelist
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:11
-msgid "Filter list is a whitelist"
+msgid ""
+"List of allowed ports for the CONNECT method. A single value \"0\" allows "
+"all ports"
 msgstr ""
 
-#. Extended regular expression filters
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:12
-msgid "Extended regular expression filters"
+msgid "Listen address"
 msgstr ""
 
-#. Filter URLs instead of domains
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:13
-msgid "Filter URLs instead of domains"
+msgid "Listen port"
 msgstr ""
 
-#. Listen on address
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:14
-msgid "Listen on address"
+msgid "Log file"
 msgstr ""
 
-#. Logfile
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:15
-msgid "Logfile"
+msgid "Log file to use for dumping messages"
 msgstr ""
 
-#. Log level
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:16
 msgid "Log level"
 msgstr ""
 
-#. Maximum number of clients
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:17
-msgid "Maximum number of clients"
+msgid "Logging verbosity of the Tinyproxy process"
+msgstr ""
+
+msgid "Max. clients"
 msgstr ""
 
-#. Maximum requests per thread
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:18
-msgid "Maximum requests per thread"
+msgid "Max. requests per server"
 msgstr ""
 
-#. Max. spare servers
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:19
 msgid "Max. spare servers"
 msgstr ""
 
-#. Min. spare servers
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:20
-msgid "Min. spare servers"
+msgid "Maximum allowed number of concurrently connected clients"
 msgstr ""
 
-#. Spare servers to start with
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:21
-msgid "Spare servers to start with"
+msgid ""
+"Maximum allowed number of requests per process. If it is exeeded, the "
+"process is restarted. Zero means unlimited."
 msgstr ""
 
-#. Statistic document
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:22
-msgid "Statistic document"
+msgid "Maximum number of prepared idle processes"
 msgstr ""
 
-#. Write to syslog
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:23
-msgid "Write to syslog"
+msgid "Maximum number of seconds an inactive connection is held open"
 msgstr ""
 
-#. Connection Timeout
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:24
-msgid "Connection Timeout"
+msgid "Min. spare servers"
 msgstr ""
 
-#. Value of Via-Header
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:25
-msgid "Value of Via-Header"
+msgid "Minimum number of prepared idle processes"
 msgstr ""
 
-#. Include client IP
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:26
-msgid "Include client IP"
+msgid "Number of idle processes to start when launching Tinyproxy"
 msgstr ""
 
-#. Via proxy
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:27
-msgid "Via proxy"
+msgid "Plaintext file with URLs or domains to filter. One entry per line"
+msgstr ""
+
+msgid "Policy"
+msgstr ""
+
+msgid "Privacy settings"
 msgstr ""
 
-#. Reject access
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:28
 msgid "Reject access"
 msgstr ""
 
-#. Upstream Control
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:29
-msgid "Upstream Control"
+msgid "Server Settings"
+msgstr ""
+
+msgid "Server limits"
+msgstr ""
+
+msgid ""
+"Specifies HTTP header names which are allowed to pass-through, all others "
+"are discarded. Leave empty to disable header filtering"
+msgstr ""
+
+msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
+msgstr ""
+
+msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
+msgstr ""
+
+msgid ""
+"Specifies the address Tinyproxy binds to for outbound forwarded requests"
+msgstr ""
+
+msgid "Specifies the addresses Tinyproxy is listening on for requests"
+msgstr ""
+
+msgid "Specifies the group name the Tinyproxy process is running as"
+msgstr ""
+
+msgid ""
+"Specifies the upstream proxy to use for accessing the target host. Format is "
+"<code>address:port</code>"
+msgstr ""
+
+msgid "Specifies the user name the Tinyproxy process is running as"
+msgstr ""
+
+msgid "Start spare servers"
+msgstr ""
+
+msgid "Statistics page"
 msgstr ""
 
-#. Target host
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:30
 msgid "Target host"
 msgstr ""
 
-#. Type
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:31
-msgid "Type"
+msgid "Tinyproxy"
+msgstr ""
+
+msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
+msgstr ""
+
+msgid "Upstream Proxies"
+msgstr ""
+
+msgid ""
+"Upstream proxy rules define proxy servers to use when accessing certain IP "
+"addresses or domains."
+msgstr ""
+
+msgid "Use syslog"
+msgstr ""
+
+msgid "User"
+msgstr ""
+
+msgid "Via hostname"
+msgstr ""
+
+msgid "Via proxy"
+msgstr ""
+
+msgid "Writes log messages to syslog instead of a log file"
 msgstr ""
 
-#. Upstream Proxy
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:32
-msgid "Upstream Proxy"
+msgid "X-Tinyproxy header"
 msgstr ""
diff --git a/po/ja/tinyproxy.po b/po/ja/tinyproxy.po
index 0c4f236f1..aa5eb23b2 100644
--- a/po/ja/tinyproxy.po
+++ b/po/ja/tinyproxy.po
@@ -12,162 +12,236 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
-#. Tinyproxy
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:1
-msgid "Tinyproxy"
+msgid ""
+"<em>Via proxy</em> routes requests to the given target via the specifed "
+"upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
+"target"
 msgstr ""
 
-#. Tinyproxy is a small and fast non-caching HTTP(S)-Proxy
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:2
-msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
+msgid ""
+"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"requests"
+msgstr ""
+
+msgid "Allowed clients"
+msgstr ""
+
+msgid "Allowed connect ports"
+msgstr ""
+
+msgid "Bind address"
+msgstr ""
+
+msgid ""
+"By default, basic POSIX expressions are used for filtering. Enable this to "
+"activate extended regular expressions"
+msgstr ""
+
+msgid ""
+"By default, filter strings are treated as case-insensitive. Enable this to "
+"make the matching case-sensitive"
+msgstr ""
+
+msgid ""
+"By default, filtering is done based on domain names. Enable this to match "
+"against URLs instead"
+msgstr ""
+
+msgid ""
+"By default, the filter rules act as blacklist. Enable this option to only "
+"allow matched URLs or domain names"
+msgstr ""
+
+msgid ""
+"Can be either an IP address or range, a domain name or \".\" for any host "
+"without domain"
+msgstr ""
+
+msgid "Connection timeout"
+msgstr ""
+
+msgid "Default deny"
+msgstr ""
+
+msgid "Enable Tinyproxy server"
+msgstr ""
+
+msgid "Error page"
+msgstr ""
+
+msgid "Filter by RegExp"
+msgstr ""
+
+msgid "Filter by URLs"
+msgstr ""
+
+msgid "Filter case-sensitive"
 msgstr ""
 
-#. Allow access from
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:3
-msgid "Allow access from"
+msgid "Filter file"
 msgstr ""
 
-#. Allowed headers for anonymous proxy
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:4
-msgid "Allowed headers for anonymous proxy"
+msgid "Filtering and ACLs"
 msgstr ""
 
-#. Bind outgoing traffic to address
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:5
-msgid "Bind outgoing traffic to address"
+msgid "General settings"
 msgstr ""
 
-#. Ports allowed for CONNECT method
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:6
-msgid "Ports allowed for CONNECT method"
+msgid "Group"
 msgstr ""
 
-#. 0 = disabled, empty = all
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:7
-msgid "0 = disabled, empty = all"
+msgid "HTML template file to serve for stat host requests"
 msgstr ""
 
-#. Error document
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:8
-msgid "Error document"
+msgid "HTML template file to serve when HTTP errors occur"
 msgstr ""
 
-#. Filter list
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:9
-msgid "Filter list"
+msgid "Header whitelist"
 msgstr ""
 
-#. Case sensitive filters
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:10
-msgid "Case sensitive filters"
+msgid ""
+"List of IP addresses or ranges which are allowed to use the proxy server"
 msgstr ""
 
-#. Filter list is a whitelist
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:11
-msgid "Filter list is a whitelist"
+msgid ""
+"List of allowed ports for the CONNECT method. A single value \"0\" allows "
+"all ports"
 msgstr ""
 
-#. Extended regular expression filters
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:12
-msgid "Extended regular expression filters"
+msgid "Listen address"
 msgstr ""
 
-#. Filter URLs instead of domains
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:13
-msgid "Filter URLs instead of domains"
+msgid "Listen port"
 msgstr ""
 
-#. Listen on address
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:14
-msgid "Listen on address"
+msgid "Log file"
 msgstr ""
 
-#. Logfile
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:15
-msgid "Logfile"
+msgid "Log file to use for dumping messages"
 msgstr ""
 
-#. Log level
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:16
 msgid "Log level"
 msgstr ""
 
-#. Maximum number of clients
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:17
-msgid "Maximum number of clients"
+msgid "Logging verbosity of the Tinyproxy process"
+msgstr ""
+
+msgid "Max. clients"
 msgstr ""
 
-#. Maximum requests per thread
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:18
-msgid "Maximum requests per thread"
+msgid "Max. requests per server"
 msgstr ""
 
-#. Max. spare servers
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:19
 msgid "Max. spare servers"
 msgstr ""
 
-#. Min. spare servers
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:20
-msgid "Min. spare servers"
+msgid "Maximum allowed number of concurrently connected clients"
 msgstr ""
 
-#. Spare servers to start with
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:21
-msgid "Spare servers to start with"
+msgid ""
+"Maximum allowed number of requests per process. If it is exeeded, the "
+"process is restarted. Zero means unlimited."
 msgstr ""
 
-#. Statistic document
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:22
-msgid "Statistic document"
+msgid "Maximum number of prepared idle processes"
 msgstr ""
 
-#. Write to syslog
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:23
-msgid "Write to syslog"
+msgid "Maximum number of seconds an inactive connection is held open"
 msgstr ""
 
-#. Connection Timeout
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:24
-msgid "Connection Timeout"
+msgid "Min. spare servers"
 msgstr ""
 
-#. Value of Via-Header
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:25
-msgid "Value of Via-Header"
+msgid "Minimum number of prepared idle processes"
 msgstr ""
 
-#. Include client IP
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:26
-msgid "Include client IP"
+msgid "Number of idle processes to start when launching Tinyproxy"
 msgstr ""
 
-#. Via proxy
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:27
-msgid "Via proxy"
+msgid "Plaintext file with URLs or domains to filter. One entry per line"
+msgstr ""
+
+msgid "Policy"
+msgstr ""
+
+msgid "Privacy settings"
 msgstr ""
 
-#. Reject access
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:28
 msgid "Reject access"
 msgstr ""
 
-#. Upstream Control
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:29
-msgid "Upstream Control"
+msgid "Server Settings"
+msgstr ""
+
+msgid "Server limits"
+msgstr ""
+
+msgid ""
+"Specifies HTTP header names which are allowed to pass-through, all others "
+"are discarded. Leave empty to disable header filtering"
+msgstr ""
+
+msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
+msgstr ""
+
+msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
+msgstr ""
+
+msgid ""
+"Specifies the address Tinyproxy binds to for outbound forwarded requests"
+msgstr ""
+
+msgid "Specifies the addresses Tinyproxy is listening on for requests"
+msgstr ""
+
+msgid "Specifies the group name the Tinyproxy process is running as"
+msgstr ""
+
+msgid ""
+"Specifies the upstream proxy to use for accessing the target host. Format is "
+"<code>address:port</code>"
+msgstr ""
+
+msgid "Specifies the user name the Tinyproxy process is running as"
+msgstr ""
+
+msgid "Start spare servers"
+msgstr ""
+
+msgid "Statistics page"
 msgstr ""
 
-#. Target host
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:30
 msgid "Target host"
 msgstr ""
 
-#. Type
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:31
-msgid "Type"
+msgid "Tinyproxy"
+msgstr ""
+
+msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
+msgstr ""
+
+msgid "Upstream Proxies"
+msgstr ""
+
+msgid ""
+"Upstream proxy rules define proxy servers to use when accessing certain IP "
+"addresses or domains."
+msgstr ""
+
+msgid "Use syslog"
+msgstr ""
+
+msgid "User"
+msgstr ""
+
+msgid "Via hostname"
+msgstr ""
+
+msgid "Via proxy"
+msgstr ""
+
+msgid "Writes log messages to syslog instead of a log file"
 msgstr ""
 
-#. Upstream Proxy
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:32
-msgid "Upstream Proxy"
+msgid "X-Tinyproxy header"
 msgstr ""
diff --git a/po/pt/tinyproxy.po b/po/pt/tinyproxy.po
index f09a3a002..d5b5062c3 100644
--- a/po/pt/tinyproxy.po
+++ b/po/pt/tinyproxy.po
@@ -12,162 +12,308 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
-#. Tinyproxy
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:1
-msgid "Tinyproxy"
-msgstr "Tinyproxy"
+msgid ""
+"<em>Via proxy</em> routes requests to the given target via the specifed "
+"upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
+"target"
+msgstr ""
 
-#. Tinyproxy is a small and fast non-caching HTTP(S)-Proxy
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:2
-msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
-msgstr "Tinyproxy é um pequeno e rápido Proxy-HTTP(S) sem suporte à cache"
+msgid ""
+"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"requests"
+msgstr ""
+
+msgid "Allowed clients"
+msgstr ""
+
+msgid "Allowed connect ports"
+msgstr ""
+
+msgid "Bind address"
+msgstr ""
+
+msgid ""
+"By default, basic POSIX expressions are used for filtering. Enable this to "
+"activate extended regular expressions"
+msgstr ""
+
+msgid ""
+"By default, filter strings are treated as case-insensitive. Enable this to "
+"make the matching case-sensitive"
+msgstr ""
+
+msgid ""
+"By default, filtering is done based on domain names. Enable this to match "
+"against URLs instead"
+msgstr ""
+
+msgid ""
+"By default, the filter rules act as blacklist. Enable this option to only "
+"allow matched URLs or domain names"
+msgstr ""
+
+msgid ""
+"Can be either an IP address or range, a domain name or \".\" for any host "
+"without domain"
+msgstr ""
+
+msgid "Connection timeout"
+msgstr ""
+
+msgid "Default deny"
+msgstr ""
+
+msgid "Enable Tinyproxy server"
+msgstr ""
+
+msgid "Error page"
+msgstr ""
+
+msgid "Filter by RegExp"
+msgstr ""
+
+msgid "Filter by URLs"
+msgstr ""
+
+msgid "Filter case-sensitive"
+msgstr ""
+
+msgid "Filter file"
+msgstr ""
+
+msgid "Filtering and ACLs"
+msgstr ""
+
+msgid "General settings"
+msgstr ""
+
+msgid "Group"
+msgstr ""
+
+msgid "HTML template file to serve for stat host requests"
+msgstr ""
+
+msgid "HTML template file to serve when HTTP errors occur"
+msgstr ""
+
+msgid "Header whitelist"
+msgstr ""
+
+msgid ""
+"List of IP addresses or ranges which are allowed to use the proxy server"
+msgstr ""
+
+msgid ""
+"List of allowed ports for the CONNECT method. A single value \"0\" allows "
+"all ports"
+msgstr ""
+
+msgid "Listen address"
+msgstr ""
+
+msgid "Listen port"
+msgstr ""
+
+msgid "Log file"
+msgstr ""
+
+msgid "Log file to use for dumping messages"
+msgstr ""
 
-#. Allow access from
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:3
-msgid "Allow access from"
-msgstr "Permitir acesso de"
-
-#. Allowed headers for anonymous proxy
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:4
-msgid "Allowed headers for anonymous proxy"
-msgstr "Cabeçalhos permitidos para proxy anônimo"
-
-#. Bind outgoing traffic to address
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:5
-msgid "Bind outgoing traffic to address"
-msgstr "Associar o tráfego de saída ao endereço"
-
-#. Ports allowed for CONNECT method
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:6
-msgid "Ports allowed for CONNECT method"
-msgstr "Portas permitidas para o método CONNECT "
-
-#. 0 = disabled, empty = all
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:7
-msgid "0 = disabled, empty = all"
-msgstr "0 = desativado, vazio = todas"
-
-#. Error document
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:8
-msgid "Error document"
-msgstr "Documento de erro"
-
-#. Filter list
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:9
-msgid "Filter list"
-msgstr "Lista de filtros"
-
-#. Case sensitive filters
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:10
-msgid "Case sensitive filters"
-msgstr "Filtros \"case sensitive\""
-
-#. Filter list is a whitelist
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:11
-msgid "Filter list is a whitelist"
-msgstr "A lista de filtros é uma lista branca"
-
-#. Extended regular expression filters
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:12
-msgid "Extended regular expression filters"
-msgstr "Filtros com suporte à expressões regulares"
-
-#. Filter URLs instead of domains
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:13
-msgid "Filter URLs instead of domains"
-msgstr "Filtrar URLs em vez de domínios"
-
-#. Listen on address
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:14
-msgid "Listen on address"
-msgstr "Escutar no endereço"
-
-#. Logfile
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:15
-msgid "Logfile"
-msgstr "Arquivo de log"
-
-#. Log level
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:16
 msgid "Log level"
 msgstr "Nível do log"
 
-#. Maximum number of clients
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:17
-msgid "Maximum number of clients"
-msgstr "Número máximo de clientes"
+msgid "Logging verbosity of the Tinyproxy process"
+msgstr ""
 
-#. Maximum requests per thread
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:18
-msgid "Maximum requests per thread"
-msgstr "Máximo de solicitações por thread"
+msgid "Max. clients"
+msgstr ""
+
+msgid "Max. requests per server"
+msgstr ""
 
-#. Max. spare servers
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:19
 msgid "Max. spare servers"
 msgstr "Max. servidores sobressalentes"
 
-#. Min. spare servers
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:20
+msgid "Maximum allowed number of concurrently connected clients"
+msgstr ""
+
+msgid ""
+"Maximum allowed number of requests per process. If it is exeeded, the "
+"process is restarted. Zero means unlimited."
+msgstr ""
+
+msgid "Maximum number of prepared idle processes"
+msgstr ""
+
+msgid "Maximum number of seconds an inactive connection is held open"
+msgstr ""
+
 msgid "Min. spare servers"
 msgstr "Min. servidores sobressalentes"
 
-#. Spare servers to start with
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:21
-msgid "Spare servers to start with"
-msgstr "Servidores sobressalentes iniciar com"
-
-#. Statistic document
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:22
-msgid "Statistic document"
-msgstr "Documento de estatísticas"
-
-#. Write to syslog
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:23
-msgid "Write to syslog"
-msgstr "Escrever para syslog"
-
-#. Connection Timeout
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:24
-msgid "Connection Timeout"
-msgstr "Timeout de conexão"
-
-#. Value of Via-Header
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:25
-msgid "Value of Via-Header"
-msgstr "Valor do cabeçalho \"Via-Header\""
-
-#. Include client IP
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:26
-msgid "Include client IP"
-msgstr "Incluir o IP do cliente"
-
-#. Via proxy
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:27
-msgid "Via proxy"
-msgstr "Via proxy"
+msgid "Minimum number of prepared idle processes"
+msgstr ""
+
+msgid "Number of idle processes to start when launching Tinyproxy"
+msgstr ""
+
+msgid "Plaintext file with URLs or domains to filter. One entry per line"
+msgstr ""
+
+msgid "Policy"
+msgstr ""
+
+msgid "Privacy settings"
+msgstr ""
 
-#. Reject access
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:28
 msgid "Reject access"
 msgstr "Rejeitar o acesso"
 
-#. Upstream Control
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:29
-msgid "Upstream Control"
-msgstr "Controle de Upstream"
+msgid "Server Settings"
+msgstr ""
+
+msgid "Server limits"
+msgstr ""
+
+msgid ""
+"Specifies HTTP header names which are allowed to pass-through, all others "
+"are discarded. Leave empty to disable header filtering"
+msgstr ""
+
+msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
+msgstr ""
+
+msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
+msgstr ""
+
+msgid ""
+"Specifies the address Tinyproxy binds to for outbound forwarded requests"
+msgstr ""
+
+msgid "Specifies the addresses Tinyproxy is listening on for requests"
+msgstr ""
+
+msgid "Specifies the group name the Tinyproxy process is running as"
+msgstr ""
+
+msgid ""
+"Specifies the upstream proxy to use for accessing the target host. Format is "
+"<code>address:port</code>"
+msgstr ""
+
+msgid "Specifies the user name the Tinyproxy process is running as"
+msgstr ""
+
+msgid "Start spare servers"
+msgstr ""
+
+msgid "Statistics page"
+msgstr ""
 
-#. Target host
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:30
 msgid "Target host"
 msgstr "Host de destino"
 
-#. Type
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:31
-msgid "Type"
-msgstr "Tipo"
+msgid "Tinyproxy"
+msgstr "Tinyproxy"
+
+msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
+msgstr "Tinyproxy é um pequeno e rápido Proxy-HTTP(S) sem suporte à cache"
+
+msgid "Upstream Proxies"
+msgstr ""
+
+msgid ""
+"Upstream proxy rules define proxy servers to use when accessing certain IP "
+"addresses or domains."
+msgstr ""
+
+msgid "Use syslog"
+msgstr ""
+
+msgid "User"
+msgstr ""
+
+msgid "Via hostname"
+msgstr ""
+
+msgid "Via proxy"
+msgstr "Via proxy"
+
+msgid "Writes log messages to syslog instead of a log file"
+msgstr ""
+
+msgid "X-Tinyproxy header"
+msgstr ""
+
+#~ msgid "Allow access from"
+#~ msgstr "Permitir acesso de"
+
+#~ msgid "Allowed headers for anonymous proxy"
+#~ msgstr "Cabeçalhos permitidos para proxy anônimo"
+
+#~ msgid "Bind outgoing traffic to address"
+#~ msgstr "Associar o tráfego de saída ao endereço"
+
+#~ msgid "Ports allowed for CONNECT method"
+#~ msgstr "Portas permitidas para o método CONNECT "
+
+#~ msgid "0 = disabled, empty = all"
+#~ msgstr "0 = desativado, vazio = todas"
+
+#~ msgid "Error document"
+#~ msgstr "Documento de erro"
+
+#~ msgid "Filter list"
+#~ msgstr "Lista de filtros"
+
+#~ msgid "Case sensitive filters"
+#~ msgstr "Filtros \"case sensitive\""
+
+#~ msgid "Filter list is a whitelist"
+#~ msgstr "A lista de filtros é uma lista branca"
+
+#~ msgid "Extended regular expression filters"
+#~ msgstr "Filtros com suporte à expressões regulares"
+
+#~ msgid "Filter URLs instead of domains"
+#~ msgstr "Filtrar URLs em vez de domínios"
+
+#~ msgid "Listen on address"
+#~ msgstr "Escutar no endereço"
+
+#~ msgid "Logfile"
+#~ msgstr "Arquivo de log"
+
+#~ msgid "Maximum number of clients"
+#~ msgstr "Número máximo de clientes"
+
+#~ msgid "Maximum requests per thread"
+#~ msgstr "Máximo de solicitações por thread"
+
+#~ msgid "Spare servers to start with"
+#~ msgstr "Servidores sobressalentes iniciar com"
+
+#~ msgid "Statistic document"
+#~ msgstr "Documento de estatísticas"
+
+#~ msgid "Write to syslog"
+#~ msgstr "Escrever para syslog"
+
+#~ msgid "Connection Timeout"
+#~ msgstr "Timeout de conexão"
+
+#~ msgid "Value of Via-Header"
+#~ msgstr "Valor do cabeçalho \"Via-Header\""
+
+#~ msgid "Include client IP"
+#~ msgstr "Incluir o IP do cliente"
+
+#~ msgid "Upstream Control"
+#~ msgstr "Controle de Upstream"
+
+#~ msgid "Type"
+#~ msgstr "Tipo"
 
-#. Upstream Proxy
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:32
-msgid "Upstream Proxy"
-msgstr "Proxy para Upstream"
+#~ msgid "Upstream Proxy"
+#~ msgstr "Proxy para Upstream"
diff --git a/po/pt_BR/tinyproxy.po b/po/pt_BR/tinyproxy.po
index 83958f2ea..6765e1353 100644
--- a/po/pt_BR/tinyproxy.po
+++ b/po/pt_BR/tinyproxy.po
@@ -12,162 +12,308 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
-#. Tinyproxy
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:1
-msgid "Tinyproxy"
-msgstr "Tinyproxy"
+msgid ""
+"<em>Via proxy</em> routes requests to the given target via the specifed "
+"upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
+"target"
+msgstr ""
 
-#. Tinyproxy is a small and fast non-caching HTTP(S)-Proxy
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:2
-msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
-msgstr "Tinyproxy é um pequeno e rápido Proxy-HTTP(S) sem suporte à cache"
+msgid ""
+"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"requests"
+msgstr ""
+
+msgid "Allowed clients"
+msgstr ""
+
+msgid "Allowed connect ports"
+msgstr ""
+
+msgid "Bind address"
+msgstr ""
+
+msgid ""
+"By default, basic POSIX expressions are used for filtering. Enable this to "
+"activate extended regular expressions"
+msgstr ""
+
+msgid ""
+"By default, filter strings are treated as case-insensitive. Enable this to "
+"make the matching case-sensitive"
+msgstr ""
+
+msgid ""
+"By default, filtering is done based on domain names. Enable this to match "
+"against URLs instead"
+msgstr ""
+
+msgid ""
+"By default, the filter rules act as blacklist. Enable this option to only "
+"allow matched URLs or domain names"
+msgstr ""
+
+msgid ""
+"Can be either an IP address or range, a domain name or \".\" for any host "
+"without domain"
+msgstr ""
+
+msgid "Connection timeout"
+msgstr ""
+
+msgid "Default deny"
+msgstr ""
+
+msgid "Enable Tinyproxy server"
+msgstr ""
+
+msgid "Error page"
+msgstr ""
+
+msgid "Filter by RegExp"
+msgstr ""
+
+msgid "Filter by URLs"
+msgstr ""
+
+msgid "Filter case-sensitive"
+msgstr ""
+
+msgid "Filter file"
+msgstr ""
+
+msgid "Filtering and ACLs"
+msgstr ""
+
+msgid "General settings"
+msgstr ""
+
+msgid "Group"
+msgstr ""
+
+msgid "HTML template file to serve for stat host requests"
+msgstr ""
+
+msgid "HTML template file to serve when HTTP errors occur"
+msgstr ""
+
+msgid "Header whitelist"
+msgstr ""
+
+msgid ""
+"List of IP addresses or ranges which are allowed to use the proxy server"
+msgstr ""
+
+msgid ""
+"List of allowed ports for the CONNECT method. A single value \"0\" allows "
+"all ports"
+msgstr ""
+
+msgid "Listen address"
+msgstr ""
+
+msgid "Listen port"
+msgstr ""
+
+msgid "Log file"
+msgstr ""
+
+msgid "Log file to use for dumping messages"
+msgstr ""
 
-#. Allow access from
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:3
-msgid "Allow access from"
-msgstr "Permitir acesso de"
-
-#. Allowed headers for anonymous proxy
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:4
-msgid "Allowed headers for anonymous proxy"
-msgstr "Cabeçalhos permitidos para proxy anônimo"
-
-#. Bind outgoing traffic to address
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:5
-msgid "Bind outgoing traffic to address"
-msgstr "Associar o tráfego de saída ao endereço"
-
-#. Ports allowed for CONNECT method
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:6
-msgid "Ports allowed for CONNECT method"
-msgstr "Portas permitidas para o método CONNECT "
-
-#. 0 = disabled, empty = all
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:7
-msgid "0 = disabled, empty = all"
-msgstr "0 = desativado, vazio = todas"
-
-#. Error document
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:8
-msgid "Error document"
-msgstr "Documento de erro"
-
-#. Filter list
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:9
-msgid "Filter list"
-msgstr "Lista de filtros"
-
-#. Case sensitive filters
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:10
-msgid "Case sensitive filters"
-msgstr "Filtros \"case sensitive\""
-
-#. Filter list is a whitelist
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:11
-msgid "Filter list is a whitelist"
-msgstr "A lista de filtros é uma lista branca"
-
-#. Extended regular expression filters
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:12
-msgid "Extended regular expression filters"
-msgstr "Filtros com suporte à expressões regulares"
-
-#. Filter URLs instead of domains
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:13
-msgid "Filter URLs instead of domains"
-msgstr "Filtrar URLs em vez de domínios"
-
-#. Listen on address
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:14
-msgid "Listen on address"
-msgstr "Escutar no endereço"
-
-#. Logfile
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:15
-msgid "Logfile"
-msgstr "Arquivo de log"
-
-#. Log level
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:16
 msgid "Log level"
 msgstr "Nível do log"
 
-#. Maximum number of clients
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:17
-msgid "Maximum number of clients"
-msgstr "Número máximo de clientes"
+msgid "Logging verbosity of the Tinyproxy process"
+msgstr ""
 
-#. Maximum requests per thread
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:18
-msgid "Maximum requests per thread"
-msgstr "Máximo de solicitações por thread"
+msgid "Max. clients"
+msgstr ""
+
+msgid "Max. requests per server"
+msgstr ""
 
-#. Max. spare servers
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:19
 msgid "Max. spare servers"
 msgstr "Max. servidores sobressalentes"
 
-#. Min. spare servers
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:20
+msgid "Maximum allowed number of concurrently connected clients"
+msgstr ""
+
+msgid ""
+"Maximum allowed number of requests per process. If it is exeeded, the "
+"process is restarted. Zero means unlimited."
+msgstr ""
+
+msgid "Maximum number of prepared idle processes"
+msgstr ""
+
+msgid "Maximum number of seconds an inactive connection is held open"
+msgstr ""
+
 msgid "Min. spare servers"
 msgstr "Min. servidores sobressalentes"
 
-#. Spare servers to start with
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:21
-msgid "Spare servers to start with"
-msgstr "Servidores sobressalentes iniciar com"
-
-#. Statistic document
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:22
-msgid "Statistic document"
-msgstr "Documento de estatísticas"
-
-#. Write to syslog
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:23
-msgid "Write to syslog"
-msgstr "Escrever para syslog"
-
-#. Connection Timeout
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:24
-msgid "Connection Timeout"
-msgstr "Timeout de conexão"
-
-#. Value of Via-Header
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:25
-msgid "Value of Via-Header"
-msgstr "Valor do cabeçalho \"Via-Header\""
-
-#. Include client IP
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:26
-msgid "Include client IP"
-msgstr "Incluir o IP do cliente"
-
-#. Via proxy
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:27
-msgid "Via proxy"
-msgstr "Via proxy"
+msgid "Minimum number of prepared idle processes"
+msgstr ""
+
+msgid "Number of idle processes to start when launching Tinyproxy"
+msgstr ""
+
+msgid "Plaintext file with URLs or domains to filter. One entry per line"
+msgstr ""
+
+msgid "Policy"
+msgstr ""
+
+msgid "Privacy settings"
+msgstr ""
 
-#. Reject access
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:28
 msgid "Reject access"
 msgstr "Rejeitar o acesso"
 
-#. Upstream Control
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:29
-msgid "Upstream Control"
-msgstr "Controle de Upstream"
+msgid "Server Settings"
+msgstr ""
+
+msgid "Server limits"
+msgstr ""
+
+msgid ""
+"Specifies HTTP header names which are allowed to pass-through, all others "
+"are discarded. Leave empty to disable header filtering"
+msgstr ""
+
+msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
+msgstr ""
+
+msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
+msgstr ""
+
+msgid ""
+"Specifies the address Tinyproxy binds to for outbound forwarded requests"
+msgstr ""
+
+msgid "Specifies the addresses Tinyproxy is listening on for requests"
+msgstr ""
+
+msgid "Specifies the group name the Tinyproxy process is running as"
+msgstr ""
+
+msgid ""
+"Specifies the upstream proxy to use for accessing the target host. Format is "
+"<code>address:port</code>"
+msgstr ""
+
+msgid "Specifies the user name the Tinyproxy process is running as"
+msgstr ""
+
+msgid "Start spare servers"
+msgstr ""
+
+msgid "Statistics page"
+msgstr ""
 
-#. Target host
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:30
 msgid "Target host"
 msgstr "Host de destino"
 
-#. Type
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:31
-msgid "Type"
-msgstr "Tipo"
+msgid "Tinyproxy"
+msgstr "Tinyproxy"
+
+msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
+msgstr "Tinyproxy é um pequeno e rápido Proxy-HTTP(S) sem suporte à cache"
+
+msgid "Upstream Proxies"
+msgstr ""
+
+msgid ""
+"Upstream proxy rules define proxy servers to use when accessing certain IP "
+"addresses or domains."
+msgstr ""
+
+msgid "Use syslog"
+msgstr ""
+
+msgid "User"
+msgstr ""
+
+msgid "Via hostname"
+msgstr ""
+
+msgid "Via proxy"
+msgstr "Via proxy"
+
+msgid "Writes log messages to syslog instead of a log file"
+msgstr ""
+
+msgid "X-Tinyproxy header"
+msgstr ""
+
+#~ msgid "Allow access from"
+#~ msgstr "Permitir acesso de"
+
+#~ msgid "Allowed headers for anonymous proxy"
+#~ msgstr "Cabeçalhos permitidos para proxy anônimo"
+
+#~ msgid "Bind outgoing traffic to address"
+#~ msgstr "Associar o tráfego de saída ao endereço"
+
+#~ msgid "Ports allowed for CONNECT method"
+#~ msgstr "Portas permitidas para o método CONNECT "
+
+#~ msgid "0 = disabled, empty = all"
+#~ msgstr "0 = desativado, vazio = todas"
+
+#~ msgid "Error document"
+#~ msgstr "Documento de erro"
+
+#~ msgid "Filter list"
+#~ msgstr "Lista de filtros"
+
+#~ msgid "Case sensitive filters"
+#~ msgstr "Filtros \"case sensitive\""
+
+#~ msgid "Filter list is a whitelist"
+#~ msgstr "A lista de filtros é uma lista branca"
+
+#~ msgid "Extended regular expression filters"
+#~ msgstr "Filtros com suporte à expressões regulares"
+
+#~ msgid "Filter URLs instead of domains"
+#~ msgstr "Filtrar URLs em vez de domínios"
+
+#~ msgid "Listen on address"
+#~ msgstr "Escutar no endereço"
+
+#~ msgid "Logfile"
+#~ msgstr "Arquivo de log"
+
+#~ msgid "Maximum number of clients"
+#~ msgstr "Número máximo de clientes"
+
+#~ msgid "Maximum requests per thread"
+#~ msgstr "Máximo de solicitações por thread"
+
+#~ msgid "Spare servers to start with"
+#~ msgstr "Servidores sobressalentes iniciar com"
+
+#~ msgid "Statistic document"
+#~ msgstr "Documento de estatísticas"
+
+#~ msgid "Write to syslog"
+#~ msgstr "Escrever para syslog"
+
+#~ msgid "Connection Timeout"
+#~ msgstr "Timeout de conexão"
+
+#~ msgid "Value of Via-Header"
+#~ msgstr "Valor do cabeçalho \"Via-Header\""
+
+#~ msgid "Include client IP"
+#~ msgstr "Incluir o IP do cliente"
+
+#~ msgid "Upstream Control"
+#~ msgstr "Controle de Upstream"
+
+#~ msgid "Type"
+#~ msgstr "Tipo"
 
-#. Upstream Proxy
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:32
-msgid "Upstream Proxy"
-msgstr "Proxy para Upstream"
+#~ msgid "Upstream Proxy"
+#~ msgstr "Proxy para Upstream"
diff --git a/po/ru/tinyproxy.po b/po/ru/tinyproxy.po
index 0c4f236f1..aa5eb23b2 100644
--- a/po/ru/tinyproxy.po
+++ b/po/ru/tinyproxy.po
@@ -12,162 +12,236 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
-#. Tinyproxy
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:1
-msgid "Tinyproxy"
+msgid ""
+"<em>Via proxy</em> routes requests to the given target via the specifed "
+"upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
+"target"
 msgstr ""
 
-#. Tinyproxy is a small and fast non-caching HTTP(S)-Proxy
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:2
-msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
+msgid ""
+"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"requests"
+msgstr ""
+
+msgid "Allowed clients"
+msgstr ""
+
+msgid "Allowed connect ports"
+msgstr ""
+
+msgid "Bind address"
+msgstr ""
+
+msgid ""
+"By default, basic POSIX expressions are used for filtering. Enable this to "
+"activate extended regular expressions"
+msgstr ""
+
+msgid ""
+"By default, filter strings are treated as case-insensitive. Enable this to "
+"make the matching case-sensitive"
+msgstr ""
+
+msgid ""
+"By default, filtering is done based on domain names. Enable this to match "
+"against URLs instead"
+msgstr ""
+
+msgid ""
+"By default, the filter rules act as blacklist. Enable this option to only "
+"allow matched URLs or domain names"
+msgstr ""
+
+msgid ""
+"Can be either an IP address or range, a domain name or \".\" for any host "
+"without domain"
+msgstr ""
+
+msgid "Connection timeout"
+msgstr ""
+
+msgid "Default deny"
+msgstr ""
+
+msgid "Enable Tinyproxy server"
+msgstr ""
+
+msgid "Error page"
+msgstr ""
+
+msgid "Filter by RegExp"
+msgstr ""
+
+msgid "Filter by URLs"
+msgstr ""
+
+msgid "Filter case-sensitive"
 msgstr ""
 
-#. Allow access from
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:3
-msgid "Allow access from"
+msgid "Filter file"
 msgstr ""
 
-#. Allowed headers for anonymous proxy
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:4
-msgid "Allowed headers for anonymous proxy"
+msgid "Filtering and ACLs"
 msgstr ""
 
-#. Bind outgoing traffic to address
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:5
-msgid "Bind outgoing traffic to address"
+msgid "General settings"
 msgstr ""
 
-#. Ports allowed for CONNECT method
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:6
-msgid "Ports allowed for CONNECT method"
+msgid "Group"
 msgstr ""
 
-#. 0 = disabled, empty = all
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:7
-msgid "0 = disabled, empty = all"
+msgid "HTML template file to serve for stat host requests"
 msgstr ""
 
-#. Error document
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:8
-msgid "Error document"
+msgid "HTML template file to serve when HTTP errors occur"
 msgstr ""
 
-#. Filter list
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:9
-msgid "Filter list"
+msgid "Header whitelist"
 msgstr ""
 
-#. Case sensitive filters
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:10
-msgid "Case sensitive filters"
+msgid ""
+"List of IP addresses or ranges which are allowed to use the proxy server"
 msgstr ""
 
-#. Filter list is a whitelist
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:11
-msgid "Filter list is a whitelist"
+msgid ""
+"List of allowed ports for the CONNECT method. A single value \"0\" allows "
+"all ports"
 msgstr ""
 
-#. Extended regular expression filters
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:12
-msgid "Extended regular expression filters"
+msgid "Listen address"
 msgstr ""
 
-#. Filter URLs instead of domains
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:13
-msgid "Filter URLs instead of domains"
+msgid "Listen port"
 msgstr ""
 
-#. Listen on address
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:14
-msgid "Listen on address"
+msgid "Log file"
 msgstr ""
 
-#. Logfile
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:15
-msgid "Logfile"
+msgid "Log file to use for dumping messages"
 msgstr ""
 
-#. Log level
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:16
 msgid "Log level"
 msgstr ""
 
-#. Maximum number of clients
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:17
-msgid "Maximum number of clients"
+msgid "Logging verbosity of the Tinyproxy process"
+msgstr ""
+
+msgid "Max. clients"
 msgstr ""
 
-#. Maximum requests per thread
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:18
-msgid "Maximum requests per thread"
+msgid "Max. requests per server"
 msgstr ""
 
-#. Max. spare servers
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:19
 msgid "Max. spare servers"
 msgstr ""
 
-#. Min. spare servers
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:20
-msgid "Min. spare servers"
+msgid "Maximum allowed number of concurrently connected clients"
 msgstr ""
 
-#. Spare servers to start with
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:21
-msgid "Spare servers to start with"
+msgid ""
+"Maximum allowed number of requests per process. If it is exeeded, the "
+"process is restarted. Zero means unlimited."
 msgstr ""
 
-#. Statistic document
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:22
-msgid "Statistic document"
+msgid "Maximum number of prepared idle processes"
 msgstr ""
 
-#. Write to syslog
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:23
-msgid "Write to syslog"
+msgid "Maximum number of seconds an inactive connection is held open"
 msgstr ""
 
-#. Connection Timeout
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:24
-msgid "Connection Timeout"
+msgid "Min. spare servers"
 msgstr ""
 
-#. Value of Via-Header
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:25
-msgid "Value of Via-Header"
+msgid "Minimum number of prepared idle processes"
 msgstr ""
 
-#. Include client IP
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:26
-msgid "Include client IP"
+msgid "Number of idle processes to start when launching Tinyproxy"
 msgstr ""
 
-#. Via proxy
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:27
-msgid "Via proxy"
+msgid "Plaintext file with URLs or domains to filter. One entry per line"
+msgstr ""
+
+msgid "Policy"
+msgstr ""
+
+msgid "Privacy settings"
 msgstr ""
 
-#. Reject access
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:28
 msgid "Reject access"
 msgstr ""
 
-#. Upstream Control
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:29
-msgid "Upstream Control"
+msgid "Server Settings"
+msgstr ""
+
+msgid "Server limits"
+msgstr ""
+
+msgid ""
+"Specifies HTTP header names which are allowed to pass-through, all others "
+"are discarded. Leave empty to disable header filtering"
+msgstr ""
+
+msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
+msgstr ""
+
+msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
+msgstr ""
+
+msgid ""
+"Specifies the address Tinyproxy binds to for outbound forwarded requests"
+msgstr ""
+
+msgid "Specifies the addresses Tinyproxy is listening on for requests"
+msgstr ""
+
+msgid "Specifies the group name the Tinyproxy process is running as"
+msgstr ""
+
+msgid ""
+"Specifies the upstream proxy to use for accessing the target host. Format is "
+"<code>address:port</code>"
+msgstr ""
+
+msgid "Specifies the user name the Tinyproxy process is running as"
+msgstr ""
+
+msgid "Start spare servers"
+msgstr ""
+
+msgid "Statistics page"
 msgstr ""
 
-#. Target host
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:30
 msgid "Target host"
 msgstr ""
 
-#. Type
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:31
-msgid "Type"
+msgid "Tinyproxy"
+msgstr ""
+
+msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
+msgstr ""
+
+msgid "Upstream Proxies"
+msgstr ""
+
+msgid ""
+"Upstream proxy rules define proxy servers to use when accessing certain IP "
+"addresses or domains."
+msgstr ""
+
+msgid "Use syslog"
+msgstr ""
+
+msgid "User"
+msgstr ""
+
+msgid "Via hostname"
+msgstr ""
+
+msgid "Via proxy"
+msgstr ""
+
+msgid "Writes log messages to syslog instead of a log file"
 msgstr ""
 
-#. Upstream Proxy
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:32
-msgid "Upstream Proxy"
+msgid "X-Tinyproxy header"
 msgstr ""
diff --git a/po/vi/tinyproxy.po b/po/vi/tinyproxy.po
index 433b82185..2a431926a 100644
--- a/po/vi/tinyproxy.po
+++ b/po/vi/tinyproxy.po
@@ -13,162 +13,308 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0\n"
 
-#. Tinyproxy
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:1
-msgid "Tinyproxy"
-msgstr "Tinyproxy"
+msgid ""
+"<em>Via proxy</em> routes requests to the given target via the specifed "
+"upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
+"target"
+msgstr ""
 
-#. Tinyproxy is a small and fast non-caching HTTP(S)-Proxy
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:2
-msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
-msgstr "Tinyproxy là một proxy nhỏ và nhanh không-cạc HTTP(S)"
+msgid ""
+"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"requests"
+msgstr ""
+
+msgid "Allowed clients"
+msgstr ""
+
+msgid "Allowed connect ports"
+msgstr ""
+
+msgid "Bind address"
+msgstr ""
+
+msgid ""
+"By default, basic POSIX expressions are used for filtering. Enable this to "
+"activate extended regular expressions"
+msgstr ""
+
+msgid ""
+"By default, filter strings are treated as case-insensitive. Enable this to "
+"make the matching case-sensitive"
+msgstr ""
+
+msgid ""
+"By default, filtering is done based on domain names. Enable this to match "
+"against URLs instead"
+msgstr ""
+
+msgid ""
+"By default, the filter rules act as blacklist. Enable this option to only "
+"allow matched URLs or domain names"
+msgstr ""
+
+msgid ""
+"Can be either an IP address or range, a domain name or \".\" for any host "
+"without domain"
+msgstr ""
+
+msgid "Connection timeout"
+msgstr ""
+
+msgid "Default deny"
+msgstr ""
+
+msgid "Enable Tinyproxy server"
+msgstr ""
+
+msgid "Error page"
+msgstr ""
+
+msgid "Filter by RegExp"
+msgstr ""
+
+msgid "Filter by URLs"
+msgstr ""
+
+msgid "Filter case-sensitive"
+msgstr ""
+
+msgid "Filter file"
+msgstr ""
+
+msgid "Filtering and ACLs"
+msgstr ""
+
+msgid "General settings"
+msgstr ""
+
+msgid "Group"
+msgstr ""
+
+msgid "HTML template file to serve for stat host requests"
+msgstr ""
+
+msgid "HTML template file to serve when HTTP errors occur"
+msgstr ""
+
+msgid "Header whitelist"
+msgstr ""
+
+msgid ""
+"List of IP addresses or ranges which are allowed to use the proxy server"
+msgstr ""
+
+msgid ""
+"List of allowed ports for the CONNECT method. A single value \"0\" allows "
+"all ports"
+msgstr ""
+
+msgid "Listen address"
+msgstr ""
+
+msgid "Listen port"
+msgstr ""
+
+msgid "Log file"
+msgstr ""
+
+msgid "Log file to use for dumping messages"
+msgstr ""
 
-#. Allow access from
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:3
-msgid "Allow access from"
-msgstr "Cho phép truy cập từ"
-
-#. Allowed headers for anonymous proxy
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:4
-msgid "Allowed headers for anonymous proxy"
-msgstr "Cho phép headers cho anonymous proxy"
-
-#. Bind outgoing traffic to address
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:5
-msgid "Bind outgoing traffic to address"
-msgstr "Blind lưu lượng truy cập ngoài vào địa chỉ"
-
-#. Ports allowed for CONNECT method
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:6
-msgid "Ports allowed for CONNECT method"
-msgstr "Cổng cho phép phương pháp CONNECT"
-
-#. 0 = disabled, empty = all
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:7
-msgid "0 = disabled, empty = all"
-msgstr "0=vô hiệu hóa, rỗng = tất cả"
-
-#. Error document
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:8
-msgid "Error document"
-msgstr "Tài liệu lỗi"
-
-#. Filter list
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:9
-msgid "Filter list"
-msgstr "Lọc list"
-
-#. Case sensitive filters
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:10
-msgid "Case sensitive filters"
-msgstr "Lọc phím nhạy cảm"
-
-#. Filter list is a whitelist
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:11
-msgid "Filter list is a whitelist"
-msgstr "Lọc list là một whitelist"
-
-#. Extended regular expression filters
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:12
-msgid "Extended regular expression filters"
-msgstr "Mở rộng các bộ lọc thường xuyên biểu"
-
-#. Filter URLs instead of domains
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:13
-msgid "Filter URLs instead of domains"
-msgstr "Lọc URLs thay domain"
-
-#. Listen on address
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:14
-msgid "Listen on address"
-msgstr "Nghe trên địa chỉ"
-
-#. Logfile
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:15
-msgid "Logfile"
-msgstr "Logfile"
-
-#. Log level
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:16
 msgid "Log level"
 msgstr "Log level"
 
-#. Maximum number of clients
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:17
-msgid "Maximum number of clients"
-msgstr "Tối đa số lượng khách hàng"
+msgid "Logging verbosity of the Tinyproxy process"
+msgstr ""
 
-#. Maximum requests per thread
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:18
-msgid "Maximum requests per thread"
-msgstr "Tối đa yêu cầu trên thread"
+msgid "Max. clients"
+msgstr ""
+
+msgid "Max. requests per server"
+msgstr ""
 
-#. Max. spare servers
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:19
 msgid "Max. spare servers"
 msgstr "Tối đa spare servers"
 
-#. Min. spare servers
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:20
+msgid "Maximum allowed number of concurrently connected clients"
+msgstr ""
+
+msgid ""
+"Maximum allowed number of requests per process. If it is exeeded, the "
+"process is restarted. Zero means unlimited."
+msgstr ""
+
+msgid "Maximum number of prepared idle processes"
+msgstr ""
+
+msgid "Maximum number of seconds an inactive connection is held open"
+msgstr ""
+
 msgid "Min. spare servers"
 msgstr "Tối thiểu spare servers"
 
-#. Spare servers to start with
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:21
-msgid "Spare servers to start with"
-msgstr "Spare servers bắt đầu với"
-
-#. Statistic document
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:22
-msgid "Statistic document"
-msgstr "Tài liệu thống kê"
-
-#. Write to syslog
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:23
-msgid "Write to syslog"
-msgstr "viết tới syslog"
-
-#. Connection Timeout
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:24
-msgid "Connection Timeout"
-msgstr "Kết nối hết hiệu lực"
-
-#. Value of Via-Header
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:25
-msgid "Value of Via-Header"
-msgstr "Giá trị của Via-Header"
-
-#. Include client IP
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:26
-msgid "Include client IP"
-msgstr "Bao gồm IP của khách hàng"
-
-#. Via proxy
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:27
-msgid "Via proxy"
-msgstr "Via proxy"
+msgid "Minimum number of prepared idle processes"
+msgstr ""
+
+msgid "Number of idle processes to start when launching Tinyproxy"
+msgstr ""
+
+msgid "Plaintext file with URLs or domains to filter. One entry per line"
+msgstr ""
+
+msgid "Policy"
+msgstr ""
+
+msgid "Privacy settings"
+msgstr ""
 
-#. Reject access
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:28
 msgid "Reject access"
 msgstr "Từ chối truy cập "
 
-#. Upstream Control
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:29
-msgid "Upstream Control"
-msgstr "Điều khiển Upstream "
+msgid "Server Settings"
+msgstr ""
+
+msgid "Server limits"
+msgstr ""
+
+msgid ""
+"Specifies HTTP header names which are allowed to pass-through, all others "
+"are discarded. Leave empty to disable header filtering"
+msgstr ""
+
+msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
+msgstr ""
+
+msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
+msgstr ""
+
+msgid ""
+"Specifies the address Tinyproxy binds to for outbound forwarded requests"
+msgstr ""
+
+msgid "Specifies the addresses Tinyproxy is listening on for requests"
+msgstr ""
+
+msgid "Specifies the group name the Tinyproxy process is running as"
+msgstr ""
+
+msgid ""
+"Specifies the upstream proxy to use for accessing the target host. Format is "
+"<code>address:port</code>"
+msgstr ""
+
+msgid "Specifies the user name the Tinyproxy process is running as"
+msgstr ""
+
+msgid "Start spare servers"
+msgstr ""
+
+msgid "Statistics page"
+msgstr ""
 
-#. Target host
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:30
 msgid "Target host"
 msgstr "Host mục tiêu"
 
-#. Type
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:31
-msgid "Type"
-msgstr "Loại "
+msgid "Tinyproxy"
+msgstr "Tinyproxy"
+
+msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
+msgstr "Tinyproxy là một proxy nhỏ và nhanh không-cạc HTTP(S)"
+
+msgid "Upstream Proxies"
+msgstr ""
+
+msgid ""
+"Upstream proxy rules define proxy servers to use when accessing certain IP "
+"addresses or domains."
+msgstr ""
+
+msgid "Use syslog"
+msgstr ""
+
+msgid "User"
+msgstr ""
+
+msgid "Via hostname"
+msgstr ""
+
+msgid "Via proxy"
+msgstr "Via proxy"
+
+msgid "Writes log messages to syslog instead of a log file"
+msgstr ""
+
+msgid "X-Tinyproxy header"
+msgstr ""
+
+#~ msgid "Allow access from"
+#~ msgstr "Cho phép truy cập từ"
+
+#~ msgid "Allowed headers for anonymous proxy"
+#~ msgstr "Cho phép headers cho anonymous proxy"
+
+#~ msgid "Bind outgoing traffic to address"
+#~ msgstr "Blind lưu lượng truy cập ngoài vào địa chỉ"
+
+#~ msgid "Ports allowed for CONNECT method"
+#~ msgstr "Cổng cho phép phương pháp CONNECT"
+
+#~ msgid "0 = disabled, empty = all"
+#~ msgstr "0=vô hiệu hóa, rỗng = tất cả"
+
+#~ msgid "Error document"
+#~ msgstr "Tài liệu lỗi"
+
+#~ msgid "Filter list"
+#~ msgstr "Lọc list"
+
+#~ msgid "Case sensitive filters"
+#~ msgstr "Lọc phím nhạy cảm"
+
+#~ msgid "Filter list is a whitelist"
+#~ msgstr "Lọc list là một whitelist"
+
+#~ msgid "Extended regular expression filters"
+#~ msgstr "Mở rộng các bộ lọc thường xuyên biểu"
+
+#~ msgid "Filter URLs instead of domains"
+#~ msgstr "Lọc URLs thay domain"
+
+#~ msgid "Listen on address"
+#~ msgstr "Nghe trên địa chỉ"
+
+#~ msgid "Logfile"
+#~ msgstr "Logfile"
+
+#~ msgid "Maximum number of clients"
+#~ msgstr "Tối đa số lượng khách hàng"
+
+#~ msgid "Maximum requests per thread"
+#~ msgstr "Tối đa yêu cầu trên thread"
+
+#~ msgid "Spare servers to start with"
+#~ msgstr "Spare servers bắt đầu với"
+
+#~ msgid "Statistic document"
+#~ msgstr "Tài liệu thống kê"
+
+#~ msgid "Write to syslog"
+#~ msgstr "viết tới syslog"
+
+#~ msgid "Connection Timeout"
+#~ msgstr "Kết nối hết hiệu lực"
+
+#~ msgid "Value of Via-Header"
+#~ msgstr "Giá trị của Via-Header"
+
+#~ msgid "Include client IP"
+#~ msgstr "Bao gồm IP của khách hàng"
+
+#~ msgid "Upstream Control"
+#~ msgstr "Điều khiển Upstream "
+
+#~ msgid "Type"
+#~ msgstr "Loại "
 
-#. Upstream Proxy
-#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:32
-msgid "Upstream Proxy"
-msgstr "Upstream Proxy"
+#~ msgid "Upstream Proxy"
+#~ msgstr "Upstream Proxy"