po: resync polipo translation

13 files changed, 1854 insertions, 2399 deletions

diff --git a/po/ca/polipo.po b/po/ca/polipo.po
index 6ce52dbcc..3c1a5cc50 100644
--- a/po/ca/polipo.po
+++ b/po/ca/polipo.po
@@ -13,49 +13,58 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0\n"
 
-#. Polipo
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:1
-msgid "Polipo"
-msgstr "Polipo"
-
-#. On-Disk Cache
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:2
-msgid "On-Disk Cache"
-msgstr "Memòria cau en disc"
+msgid "Advanced Settings"
+msgstr ""
 
-#. Shared cache
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:3
-msgid "Shared cache"
-msgstr "Memòria cau compartida"
+msgid "Allowed clients"
+msgstr "Clients permesos"
 
-#. Enable if cache (proxy) is shared by multiple users.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:4
-msgid "Enable if cache (proxy) is shared by multiple users."
-msgstr "Activa si la memòria cau (proxy) és compartida per múltiples usuaris."
+msgid "Always use system DNS resolver"
+msgstr ""
 
-#. To enable polipo on-disk cache cleaning (highly recommended), you should add a cron job in Scheduled Tasks services that will execute /usr/sbin/polipo_purge script. For example to perform disk cache cleanup every day at 6:00 in the morning you should add the following line in Scheduled Tasks \"0 6 * * *	/usr/sbin/polipo_purge\" (without quotes).
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:5
 msgid ""
-"To enable polipo on-disk cache cleaning (highly recommended), you should add "
-"a cron job in Scheduled Tasks services that will execute /usr/sbin/"
-"polipo_purge script. For example to perform disk cache cleanup every day at "
-"6:00 in the morning you should add the following line in Scheduled Tasks \"0 "
-"6 * * *\\t/usr/sbin/polipo_purge\" (without quotes)."
+"Basic HTTP authentication supported. Provide username and password in "
+"username:password format."
+msgstr ""
+"Se suporta autenticació HTTP bàsica. Entra el nom d'usuari i contrasenya en "
+"format usuari:contrasenya."
+
+msgid "DNS and Query Settings"
 msgstr ""
-"Per activar la neteja memòria cau en disc de polipo (altament recomenat), "
-"hauries d'afegir una tasca de cron al servei de Tasques Programades que "
-"executaran l'script /usr/sbin/polipo_purge. Per exemple, per executar la "
-"neteja de memòria cau del disc cada dia a les 6:00 del matí, hauries "
-"d'afegir la següent línia a les Tasques Programades: \"0 6 * * * /usr/sbin/"
-"polipo_purge\" (sense cometes)."
-
-#. Disk cache location
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:6
+
+msgid "DNS server address"
+msgstr "Adreça de servidor DNS"
+
+msgid "Delete cache files time"
+msgstr "Hora d'esborrat de fitxers de memòria cau"
+
 msgid "Disk cache location"
 msgstr "Localització de la memòria cau del disc"
 
-#. Location where polipo will cache files permanently. Use of external storage devices is recommended, because the cache can grow considerably. Leave it empty to disable on-disk cache.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:7
+msgid "Do not query IPv6"
+msgstr ""
+
+msgid "Enable if cache (proxy) is shared by multiple users."
+msgstr "Activa si la memòria cau (proxy) és compartida per múltiples usuaris."
+
+msgid "First PMM segment size (in bytes)"
+msgstr "Mida de segment del primer PMM (en bytes)"
+
+msgid "General Settings"
+msgstr ""
+
+msgid "How much RAM should Polipo use for its cache."
+msgstr "Quanta RAM hauria de fer servir Polipo per la seva memòria cau"
+
+msgid "In RAM cache size (in bytes)"
+msgstr "Mida de memòria cau a la RAM (en bytes)"
+
+msgid "Listen address"
+msgstr "Adreça que rep connexions"
+
+msgid "Listen port"
+msgstr "Port que rep connexions"
+
 msgid ""
 "Location where polipo will cache files permanently. Use of external storage "
 "devices is recommended, because the cache can grow considerably. Leave it "
@@ -66,184 +75,110 @@ msgstr ""
 "pot créixer considerablement. Deixa-ho buit per desactivar la memòria cau en "
 "disc."
 
-#. Truncate cache files size (in bytes)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:8
-msgid "Truncate cache files size (in bytes)"
-msgstr "Mida de truncatge de fitxer de memòria cau (en bytes)"
-
-#. Size to which cached files should be truncated. (default value: 1048576)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:9
-msgid ""
-"Size to which cached files should be truncated. (default value: 1048576)"
-msgstr ""
-"Mida a la qual els fitxers de memòria cau s'haurien de truncar (valor per "
-"defecte: 1048576)"
+msgid "Log file location"
+msgstr "Localització de fitxer registre"
 
-#. Truncate cache files time
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:10
-msgid "Truncate cache files time"
-msgstr "Hora de truncatge de fitxers de memòria cau"
+msgid "Log to syslog"
+msgstr "Registra al syslog"
 
-#. Time after which cached files will be truncated. (default value: 4d12h)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:11
-msgid "Time after which cached files will be truncated. (default value: 4d12h)"
+msgid "Logging and RAM"
 msgstr ""
-"Hora després de la qual els fitxers de memòria cau es truncaran (valor per "
-"defecte: 4d12h)."
-
-#. Delete cache files time
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:12
-msgid "Delete cache files time"
-msgstr "Hora d'esborrat de fitxers de memòria cau"
 
-#. Time after which cached files will be deleted. (default value: 32d)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:13
-msgid "Time after which cached files will be deleted. (default value: 32d)"
+msgid "Never use system DNS resolver"
 msgstr ""
-"Hora després de la qual els fitxers de memòria s'esborraran (valor per "
-"defecte: 32d)."
 
-#. Polipo is a small and fast caching web proxy.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:14
-msgid "Polipo is a small and fast caching web proxy."
-msgstr "Polipo és un proxy caché web petit i ràpid."
+msgid "On-Disk Cache"
+msgstr "Memòria cau en disc"
+
+msgid "PMM segments size (in bytes)"
+msgstr "Mida de segments MMS (en bytes)"
 
-#. General
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:15
-msgid "General"
-msgstr "General"
+msgid "Parent Proxy"
+msgstr ""
 
-#. Allowed clients
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:16
-msgid "Allowed clients"
-msgstr "Clients permesos"
+msgid "Parent proxy address"
+msgstr "Adreça de proxy pare"
 
-#. When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients that are allowed to connect. The format is IP address or network address (192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6)).
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:17
 msgid ""
-"When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients "
-"that are allowed to connect. The format is IP address or network address "
-"(192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))."
+"Parent proxy address (in host:port format), to which Polipo will forward the "
+"requests."
 msgstr ""
-"Quan l'adreça d'escolta s'estableix a 0.0.0.0 o :: (IPv6), has de llistar "
-"els clients que es permeten per connectar. El format és adreça IP o adreça "
-"de xarxa (192.168.1.123, 192.168.1.0/24, 2001:660:116::/47 (IPv6))."
+"Adreça de proxy pare (en format host:port), al que Polipo readreçarà les "
+"sol·licituds."
 
-#. In RAM cache size (in bytes)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:18
-msgid "In RAM cache size (in bytes)"
-msgstr "Mida de memòria cau a la RAM (en bytes)"
+msgid "Parent proxy authentication"
+msgstr "Autenticació de proxy pare"
 
-#. How much RAM should Polipo use for its cache.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:19
-msgid "How much RAM should Polipo use for its cache."
-msgstr "Quanta RAM hauria de fer servir Polipo per la seva memòria cau"
+msgid "Polipo"
+msgstr "Polipo"
 
-#. DNS server address
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:20
-msgid "DNS server address"
-msgstr "Adreça de servidor DNS"
+msgid "Polipo is a small and fast caching web proxy."
+msgstr "Polipo és un proxy caché web petit i ràpid."
+
+msgid "Poor Man's Multiplexing"
+msgstr "Multiplexació Poor Man's"
 
-#. Set the DNS server address to use, if you want Polipo to use different DNS server than the host system.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:21
 msgid ""
-"Set the DNS server address to use, if you want Polipo to use different DNS "
-"server than the host system."
+"Poor Man's Multiplexing (PMM) is a technique that simulates multiplexing by "
+"requesting an instance in multiple segments. It tries to lower the latency "
+"caused by the weakness of HTTP protocol. NOTE: some sites may not work with "
+"PMM enabled."
 msgstr ""
-"Estableix l'adreça de servidor DNS a utilitzar, si vols que Polipo faci "
-"servir un servidor DNS diferent al del sistema."
+"Multiplexació Poor Man's (PMM) és una tècnica que multiplexa sol·licitant "
+"una instància en segments múltiples. Intenta reduir la latència causada per "
+"la feblesa del protocol HTTP. NOTA: algunes pàgines poden no funcionar amb "
+"la PMM activada."
 
-#. Query DNS for IPv6
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:22
-msgid "Query DNS for IPv6"
-msgstr "Consulta DNS per IPv6"
+msgid "Port on which Polipo will listen"
+msgstr ""
 
-#. false = Do not query IPv6; reluctantly = Query both, prefer IPv4; happily = Query both, prefer IPv6; true = Query only IPv6
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:23
-msgid ""
-"false = Do not query IPv6; reluctantly = Query both, prefer IPv4; happily = "
-"Query both, prefer IPv6; true = Query only IPv6"
+msgid "Proxy"
 msgstr ""
-"fals = No consultis IPv6; a contracor = Consulta els dos, prefereix IPv4; "
-"feliçment = Consulta els dos, prefereix IPv6; cert = Consulta només IPv6"
 
-#. Query DNS by hostname
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:24
 msgid "Query DNS by hostname"
 msgstr "Consulta DNS per nom de màquina"
 
-#. false = Never use system DNS resolver; reluctantly = Query DNS directly, if DNS server is unavailable fail to system DNS resolver; happily = Query DNS directly, if host could not be found fallback to system DNS resolver; true = Always use system DNS resolver
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:25
-msgid ""
-"false = Never use system DNS resolver; reluctantly = Query DNS directly, if "
-"DNS server is unavailable fail to system DNS resolver; happily = Query DNS "
-"directly, if host could not be found fallback to system DNS resolver; true = "
-"Always use system DNS resolver"
+msgid "Query DNS directly, fallback to system resolver"
 msgstr ""
-"fals = mai utilitzis resoledor DNS; a contracor = Consulta DNS directament, "
-"si el servidor DNS està indisponible no utilitzis el sistema resoledor de "
-"DNS; feliçment = Consulta DNS directament, si la màquina no es pot trobar, "
-"vés al sistema resoledor de DNS; cert = Utilitza sistema resoledor DNS sempre"
 
-#. Syslog facility
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:26
-msgid "Syslog facility"
-msgstr "Instal·lació syslog"
+msgid "Query DNS directly, for unknown hosts fall back to system resolver"
+msgstr ""
 
-#. Log file location
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:27
-msgid "Log file location"
-msgstr "Localització de fitxer registre"
+msgid "Query DNS for IPv6"
+msgstr "Consulta DNS per IPv6"
 
-#. Use of external storage device is recommended, because the log file is written frequently and can grow considerably.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:28
-msgid ""
-"Use of external storage device is recommended, because the log file is "
-"written frequently and can grow considerably."
+msgid "Query IPv4 and IPv6, prefer IPv4"
 msgstr ""
-"Es recomana l'ǘs de dispositius d'emmagatzematge externs, ja que el fitxer "
-"de registre és escrit freqüentment i pot créixer considerablement."
 
-#. Log to syslog
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:29
-msgid "Log to syslog"
-msgstr "Registra al syslog"
+msgid "Query IPv4 and IPv6, prefer IPv6"
+msgstr ""
 
-#. Parent proxy authentication
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:30
-msgid "Parent proxy authentication"
-msgstr "Autenticació de proxy pare"
+msgid "Query only IPv6"
+msgstr ""
 
-#. Basic HTTP authentication supported. Provide username and password in username:password format.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:31
 msgid ""
-"Basic HTTP authentication supported. Provide username and password in "
-"username:password format."
+"Set the DNS server address to use, if you want Polipo to use different DNS "
+"server than the host system."
 msgstr ""
-"Se suporta autenticació HTTP bàsica. Entra el nom d'usuari i contrasenya en "
-"format usuari:contrasenya."
+"Estableix l'adreça de servidor DNS a utilitzar, si vols que Polipo faci "
+"servir un servidor DNS diferent al del sistema."
 
-#. Parent proxy address
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:32
-msgid "Parent proxy address"
-msgstr "Adreça de proxy pare"
+msgid "Shared cache"
+msgstr "Memòria cau compartida"
 
-#. Parent proxy address (in host:port format), to which Polipo will forward the requests.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:33
 msgid ""
-"Parent proxy address (in host:port format), to which Polipo will forward the "
-"requests."
+"Size of the first PMM segment. If not defined, it defaults to twice the PMM "
+"segment size."
 msgstr ""
-"Adreça de proxy pare (en format host:port), al que Polipo readreçarà les "
-"sol·licituds."
+"Mida del primer segment PMM. Si no es defineix, per defecte és el doble de "
+"la mida de segment MMS."
 
-#. Listen address
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:34
-msgid "Listen address"
-msgstr "Adreça que rep connexions"
+msgid "Size to which cached files should be truncated"
+msgstr ""
+
+msgid "Syslog facility"
+msgstr "Instal·lació syslog"
 
-#. The interface on which Polipo will listen. To listen on all interfaces use 0.0.0.0 or :: (IPv6).
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:35
 msgid ""
 "The interface on which Polipo will listen. To listen on all interfaces use "
 "0.0.0.0 or :: (IPv6)."
@@ -251,56 +186,103 @@ msgstr ""
 "La interfície a la que Polipo rebrà les connexions. Per rebre-les a a totes "
 "les interfícies, utilitza 0.0.0.0 o :: (IPv6)."
 
-#. Listen port
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:36
-msgid "Listen port"
-msgstr "Port que rep connexions"
-
-#. Port on which Polipo will listen. (default value: 8123)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:37
-msgid "Port on which Polipo will listen. (default value: 8123)"
-msgstr "Port al que Polipo rebrà les connexions (valor per defecte: 8123)."
+msgid "Time after which cached files will be deleted"
+msgstr ""
 
-#. Poor Man's Multiplexing
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:38
-msgid "Poor Man's Multiplexing"
-msgstr "Multiplexació Poor Man's"
+msgid "Time after which cached files will be truncated"
+msgstr ""
 
-#. Poor Man's Multiplexing (PMM) is a technique that simulates multiplexing by requesting an instance in multiple segments. It tries to lower the latency caused by the weakness of HTTP protocol. NOTE: some sites may not work with PMM enabled.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:39
-msgid ""
-"Poor Man's Multiplexing (PMM) is a technique that simulates multiplexing by "
-"requesting an instance in multiple segments. It tries to lower the latency "
-"caused by the weakness of HTTP protocol. NOTE: some sites may not work with "
-"PMM enabled."
+msgid "To enable PMM, PMM segment size must be set to some positive value."
 msgstr ""
-"Multiplexació Poor Man's (PMM) és una tècnica que multiplexa sol·licitant "
-"una instància en segments múltiples. Intenta reduir la latència causada per "
-"la feblesa del protocol HTTP. NOTA: algunes pàgines poden no funcionar amb "
-"la PMM activada."
 
-#. First PMM segment size (in bytes)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:40
-msgid "First PMM segment size (in bytes)"
-msgstr "Mida de segment del primer PMM (en bytes)"
+msgid "Truncate cache files size (in bytes)"
+msgstr "Mida de truncatge de fitxer de memòria cau (en bytes)"
+
+msgid "Truncate cache files time"
+msgstr "Hora de truncatge de fitxers de memòria cau"
 
-#. Size of the first PMM segment. If not defined, it defaults to twice the PMM segment size.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:41
 msgid ""
-"Size of the first PMM segment. If not defined, it defaults to twice the PMM "
-"segment size."
+"Use of external storage device is recommended, because the log file is "
+"written frequently and can grow considerably."
 msgstr ""
-"Mida del primer segment PMM. Si no es defineix, per defecte és el doble de "
-"la mida de segment MMS."
+"Es recomana l'ǘs de dispositius d'emmagatzematge externs, ja que el fitxer "
+"de registre és escrit freqüentment i pot créixer considerablement."
 
-#. PMM segments size (in bytes)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:42
-msgid "PMM segments size (in bytes)"
-msgstr "Mida de segments MMS (en bytes)"
+msgid ""
+"When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients "
+"that are allowed to connect. The format is IP address or network address "
+"(192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))"
+msgstr ""
 
-#. To enable PMM, PMM segment size must be set to some positive value.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:43
-msgid "polipo_pmm_pmmsize_desc"
+msgid "enable"
 msgstr ""
-"Per habilitar el PMM, la mida dels segments PMM s'ha d'establir a algun "
-"valor positiu."
+
+#~ msgid ""
+#~ "To enable polipo on-disk cache cleaning (highly recommended), you should "
+#~ "add a cron job in Scheduled Tasks services that will execute /usr/sbin/"
+#~ "polipo_purge script. For example to perform disk cache cleanup every day "
+#~ "at 6:00 in the morning you should add the following line in Scheduled "
+#~ "Tasks \"0 6 * * *\\t/usr/sbin/polipo_purge\" (without quotes)."
+#~ msgstr ""
+#~ "Per activar la neteja memòria cau en disc de polipo (altament recomenat), "
+#~ "hauries d'afegir una tasca de cron al servei de Tasques Programades que "
+#~ "executaran l'script /usr/sbin/polipo_purge. Per exemple, per executar la "
+#~ "neteja de memòria cau del disc cada dia a les 6:00 del matí, hauries "
+#~ "d'afegir la següent línia a les Tasques Programades: \"0 6 * * * /usr/"
+#~ "sbin/polipo_purge\" (sense cometes)."
+
+#~ msgid ""
+#~ "Size to which cached files should be truncated. (default value: 1048576)"
+#~ msgstr ""
+#~ "Mida a la qual els fitxers de memòria cau s'haurien de truncar (valor per "
+#~ "defecte: 1048576)"
+
+#~ msgid ""
+#~ "Time after which cached files will be truncated. (default value: 4d12h)"
+#~ msgstr ""
+#~ "Hora després de la qual els fitxers de memòria cau es truncaran (valor "
+#~ "per defecte: 4d12h)."
+
+#~ msgid "Time after which cached files will be deleted. (default value: 32d)"
+#~ msgstr ""
+#~ "Hora després de la qual els fitxers de memòria s'esborraran (valor per "
+#~ "defecte: 32d)."
+
+#~ msgid "General"
+#~ msgstr "General"
+
+#~ msgid ""
+#~ "When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients "
+#~ "that are allowed to connect. The format is IP address or network address "
+#~ "(192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))."
+#~ msgstr ""
+#~ "Quan l'adreça d'escolta s'estableix a 0.0.0.0 o :: (IPv6), has de llistar "
+#~ "els clients que es permeten per connectar. El format és adreça IP o "
+#~ "adreça de xarxa (192.168.1.123, 192.168.1.0/24, 2001:660:116::/47 (IPv6))."
+
+#~ msgid ""
+#~ "false = Do not query IPv6; reluctantly = Query both, prefer IPv4; happily "
+#~ "= Query both, prefer IPv6; true = Query only IPv6"
+#~ msgstr ""
+#~ "fals = No consultis IPv6; a contracor = Consulta els dos, prefereix IPv4; "
+#~ "feliçment = Consulta els dos, prefereix IPv6; cert = Consulta només IPv6"
+
+#~ msgid ""
+#~ "false = Never use system DNS resolver; reluctantly = Query DNS directly, "
+#~ "if DNS server is unavailable fail to system DNS resolver; happily = Query "
+#~ "DNS directly, if host could not be found fallback to system DNS resolver; "
+#~ "true = Always use system DNS resolver"
+#~ msgstr ""
+#~ "fals = mai utilitzis resoledor DNS; a contracor = Consulta DNS "
+#~ "directament, si el servidor DNS està indisponible no utilitzis el sistema "
+#~ "resoledor de DNS; feliçment = Consulta DNS directament, si la màquina no "
+#~ "es pot trobar, vés al sistema resoledor de DNS; cert = Utilitza sistema "
+#~ "resoledor DNS sempre"
+
+#~ msgid "Port on which Polipo will listen. (default value: 8123)"
+#~ msgstr "Port al que Polipo rebrà les connexions (valor per defecte: 8123)."
+
+#~ msgid "polipo_pmm_pmmsize_desc"
+#~ msgstr ""
+#~ "Per habilitar el PMM, la mida dels segments PMM s'ha d'establir a algun "
+#~ "valor positiu."
diff --git a/po/de/polipo.po b/po/de/polipo.po
index c99c759d7..1b17086b3 100644
--- a/po/de/polipo.po
+++ b/po/de/polipo.po
@@ -11,47 +11,66 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0\n"
 
-#. Polipo
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:1
-msgid "Polipo"
-msgstr "Polipo"
+msgid "Advanced Settings"
+msgstr ""
 
-#. On-Disk Cache
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:2
-msgid "On-Disk Cache"
-msgstr "Festplatten-Cache"
+#, fuzzy
+msgid "Allowed clients"
+msgstr "Zugelassene Endgeräte"
+
+msgid "Always use system DNS resolver"
+msgstr ""
 
-# Verteilt? Gemeinsam?
-#. Shared cache
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:3
 #, fuzzy
-msgid "Shared cache"
-msgstr "Verteilter Cache"
+msgid ""
+"Basic HTTP authentication supported. Provide username and password in "
+"username:password format."
+msgstr ""
+"Grund-Authentifizierung mittels Benutzernamen und Passwort über HTTP im "
+"Format benutzername:passwort"
+
+msgid "DNS and Query Settings"
+msgstr ""
+
+msgid "DNS server address"
+msgstr "Adresse des DNS-Servers"
+
+msgid "Delete cache files time"
+msgstr ""
+
+msgid "Disk cache location"
+msgstr "Cache-Verzeichnis"
+
+msgid "Do not query IPv6"
+msgstr ""
 
 # Klingt komisch
-#. Enable if cache (proxy) is shared by multiple users.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:4
 #, fuzzy
 msgid "Enable if cache (proxy) is shared by multiple users."
 msgstr "Cache hat mehrere Benutzer"
 
-#. To enable polipo on-disk cache cleaning (highly recommended), you should add a cron job in Scheduled Tasks services that will execute /usr/sbin/polipo_purge script. For example to perform disk cache cleanup every day at 6:00 in the morning you should add the following line in Scheduled Tasks \"0 6 * * *	/usr/sbin/polipo_purge\" (without quotes).
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:5
-msgid ""
-"To enable polipo on-disk cache cleaning (highly recommended), you should add "
-"a cron job in Scheduled Tasks services that will execute /usr/sbin/"
-"polipo_purge script. For example to perform disk cache cleanup every day at "
-"6:00 in the morning you should add the following line in Scheduled Tasks \"0 "
-"6 * * *\\t/usr/sbin/polipo_purge\" (without quotes)."
+msgid "First PMM segment size (in bytes)"
+msgstr "Größe des ersten PMM - Segment in bytes"
+
+msgid "General Settings"
 msgstr ""
 
-#. Disk cache location
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:6
-msgid "Disk cache location"
-msgstr "Cache-Verzeichnis"
+#, fuzzy
+msgid "How much RAM should Polipo use for its cache."
+msgstr "Wie viel Arbeitsspeicher Polipo für den Puffer benutzen soll."
+
+#, fuzzy
+msgid "In RAM cache size (in bytes)"
+msgstr "Größe des Pufferspeichers im Arbeitsspeicher (bytes)"
+
+#, fuzzy
+msgid "Listen address"
+msgstr "Aktivierte Adressen/ Schnittstellen"
+
+#, fuzzy
+msgid "Listen port"
+msgstr "Aktiver Port"
 
-#. Location where polipo will cache files permanently. Use of external storage devices is recommended, because the cache can grow considerably. Leave it empty to disable on-disk cache.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:7
 msgid ""
 "Location where polipo will cache files permanently. Use of external storage "
 "devices is recommended, because the cache can grow considerably. Leave it "
@@ -61,197 +80,116 @@ msgstr ""
 "externen Datenträgern empfohlen, da der Cache sehr groß werden kann. Lassen "
 "Sie diese Option leer um den Cache zu deaktivieren."
 
-#. Truncate cache files size (in bytes)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:8
-msgid "Truncate cache files size (in bytes)"
-msgstr ""
-
-#. Size to which cached files should be truncated. (default value: 1048576)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:9
-msgid ""
-"Size to which cached files should be truncated. (default value: 1048576)"
-msgstr ""
+#, fuzzy
+msgid "Log file location"
+msgstr "Ort der Protokollierungsdatei"
 
-#. Truncate cache files time
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:10
-msgid "Truncate cache files time"
-msgstr ""
+#, fuzzy
+msgid "Log to syslog"
+msgstr "Protokoll im Systemprotokoll (syslog) speichern"
 
-#. Time after which cached files will be truncated. (default value: 4d12h)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:11
-msgid "Time after which cached files will be truncated. (default value: 4d12h)"
+msgid "Logging and RAM"
 msgstr ""
 
-#. Delete cache files time
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:12
-msgid "Delete cache files time"
+msgid "Never use system DNS resolver"
 msgstr ""
 
-#. Time after which cached files will be deleted. (default value: 32d)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:13
-#, fuzzy
-msgid "Time after which cached files will be deleted. (default value: 32d)"
-msgstr ""
-"Speicherort für permanent gespeicherte Dateien. Es wird die Benutzung von "
-"externen Datenträgern empfohlen, da der Cache sehr groß werden kann. Lassen "
-"Sie diese Option leer um den Cache zu deaktivieren."
+msgid "On-Disk Cache"
+msgstr "Festplatten-Cache"
 
-#. Polipo is a small and fast caching web proxy.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:14
-msgid "Polipo is a small and fast caching web proxy."
-msgstr "Polipo ist ein kleiner und schneller Webproxy."
+msgid "PMM segments size (in bytes)"
+msgstr "Größe des normalen PMM - Segment in bytes"
 
-#. General
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:15
-msgid "General"
-msgstr "Allgemein"
+msgid "Parent Proxy"
+msgstr ""
 
-#. Allowed clients
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:16
 #, fuzzy
-msgid "Allowed clients"
-msgstr "Zugelassene Endgeräte"
+msgid "Parent proxy address"
+msgstr "Adresse des Übergeordneten Proxyservers"
 
-#. When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients that are allowed to connect. The format is IP address or network address (192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6)).
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:17
 #, fuzzy
 msgid ""
-"When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients "
-"that are allowed to connect. The format is IP address or network address "
-"(192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))."
+"Parent proxy address (in host:port format), to which Polipo will forward the "
+"requests."
 msgstr ""
-"Wenn der Server auf alle Anfragen (0.0.0.0 bzw. ::) hört, dann müssen die "
-"zugelassenen Gegenpunkte, die berechtig sind eine Verbindung aufzubauen, "
-"hier eingetragen werden. Als Format hier bitte die IP-Adresse oder "
-"Nerzwerkmaske auswählen (192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 "
-"(IPv6))"
+"Adresse des Übergeordneten Proxyservers (in host:port Format), zu dem Polipo "
+"die Anfragen weiterleiten soll"
 
-#. In RAM cache size (in bytes)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:18
 #, fuzzy
-msgid "In RAM cache size (in bytes)"
-msgstr "Größe des Pufferspeichers im Arbeitsspeicher (bytes)"
+msgid "Parent proxy authentication"
+msgstr "Authentifizierung für übergeordneten Proxyserver"
 
-#. How much RAM should Polipo use for its cache.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:19
-#, fuzzy
-msgid "How much RAM should Polipo use for its cache."
-msgstr "Wie viel Arbeitsspeicher Polipo für den Puffer benutzen soll."
+msgid "Polipo"
+msgstr "Polipo"
 
-#. DNS server address
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:20
-msgid "DNS server address"
-msgstr "Adresse des DNS-Servers"
+msgid "Polipo is a small and fast caching web proxy."
+msgstr "Polipo ist ein kleiner und schneller Webproxy."
+
+msgid "Poor Man's Multiplexing"
+msgstr "<abbr title=\"Poor Mans Multiplexing\">PMM</abbr>"
 
-#. Set the DNS server address to use, if you want Polipo to use different DNS server than the host system.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:21
-#, fuzzy
 msgid ""
-"Set the DNS server address to use, if you want Polipo to use different DNS "
-"server than the host system."
+"Poor Man's Multiplexing (PMM) is a technique that simulates multiplexing by "
+"requesting an instance in multiple segments. It tries to lower the latency "
+"caused by the weakness of HTTP protocol. NOTE: some sites may not work with "
+"PMM enabled."
 msgstr ""
-"Geben Sie einen DNS-Server an, wenn Polipo diesen Server statt den DNS-"
-"Server für das System verwenden soll."
 
-#. Query DNS for IPv6
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:22
-#, fuzzy
-msgid "Query DNS for IPv6"
-msgstr "DNS-Anfragen für IPv6"
+msgid "Port on which Polipo will listen"
+msgstr ""
 
-#. false = Do not query IPv6; reluctantly = Query both, prefer IPv4; happily = Query both, prefer IPv6; true = Query only IPv6
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:23
-#, fuzzy
-msgid ""
-"false = Do not query IPv6; reluctantly = Query both, prefer IPv4; happily = "
-"Query both, prefer IPv6; true = Query only IPv6"
+msgid "Proxy"
 msgstr ""
-"false = Beachtet IPv6 nicht, nur IPv4 möglich; reluctantly = Beachtet sowohl "
-"IPv4 als auch IPv6, IPv4 wird bevorzugt; happily = Beachtet sowohl IPv4 als "
-"auch IPv6, IPv6 wird bevorzugt; true = Beachtet IPv4 nicht, nur IPv6 möglich"
 
-#. Query DNS by hostname
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:24
 msgid "Query DNS by hostname"
 msgstr ""
 
-#. false = Never use system DNS resolver; reluctantly = Query DNS directly, if DNS server is unavailable fail to system DNS resolver; happily = Query DNS directly, if host could not be found fallback to system DNS resolver; true = Always use system DNS resolver
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:25
-msgid ""
-"false = Never use system DNS resolver; reluctantly = Query DNS directly, if "
-"DNS server is unavailable fail to system DNS resolver; happily = Query DNS "
-"directly, if host could not be found fallback to system DNS resolver; true = "
-"Always use system DNS resolver"
+msgid "Query DNS directly, fallback to system resolver"
 msgstr ""
 
-#. Syslog facility
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:26
-#, fuzzy
-msgid "Syslog facility"
-msgstr "Einstellungen zur Protokollierungsdatei"
+msgid "Query DNS directly, for unknown hosts fall back to system resolver"
+msgstr ""
 
-#. Log file location
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:27
 #, fuzzy
-msgid "Log file location"
-msgstr "Ort der Protokollierungsdatei"
+msgid "Query DNS for IPv6"
+msgstr "DNS-Anfragen für IPv6"
 
-#. Use of external storage device is recommended, because the log file is written frequently and can grow considerably.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:28
-#, fuzzy
-msgid ""
-"Use of external storage device is recommended, because the log file is "
-"written frequently and can grow considerably."
+msgid "Query IPv4 and IPv6, prefer IPv4"
 msgstr ""
-"Es sollte ein Externes Speichermedium verwendet werden, da die "
-"Protokolldatei regelmäßig geschrieben wird und dadurch sehr groß werden kann."
 
-#. Log to syslog
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:29
-#, fuzzy
-msgid "Log to syslog"
-msgstr "Protokoll im Systemprotokoll (syslog) speichern"
+msgid "Query IPv4 and IPv6, prefer IPv6"
+msgstr ""
 
-#. Parent proxy authentication
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:30
-#, fuzzy
-msgid "Parent proxy authentication"
-msgstr "Authentifizierung für übergeordneten Proxyserver"
+msgid "Query only IPv6"
+msgstr ""
 
-#. Basic HTTP authentication supported. Provide username and password in username:password format.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:31
 #, fuzzy
 msgid ""
-"Basic HTTP authentication supported. Provide username and password in "
-"username:password format."
+"Set the DNS server address to use, if you want Polipo to use different DNS "
+"server than the host system."
 msgstr ""
-"Grund-Authentifizierung mittels Benutzernamen und Passwort über HTTP im "
-"Format benutzername:passwort"
+"Geben Sie einen DNS-Server an, wenn Polipo diesen Server statt den DNS-"
+"Server für das System verwenden soll."
 
-#. Parent proxy address
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:32
+# Verteilt? Gemeinsam?
 #, fuzzy
-msgid "Parent proxy address"
-msgstr "Adresse des Übergeordneten Proxyservers"
+msgid "Shared cache"
+msgstr "Verteilter Cache"
 
-#. Parent proxy address (in host:port format), to which Polipo will forward the requests.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:33
-#, fuzzy
 msgid ""
-"Parent proxy address (in host:port format), to which Polipo will forward the "
-"requests."
+"Size of the first PMM segment. If not defined, it defaults to twice the PMM "
+"segment size."
+msgstr ""
+"Größe des ersten Segments. Wenn diese Option leer ist, wird hierfür die "
+"Doppelte Größe des PMM-Segments angenommen"
+
+msgid "Size to which cached files should be truncated"
 msgstr ""
-"Adresse des Übergeordneten Proxyservers (in host:port Format), zu dem Polipo "
-"die Anfragen weiterleiten soll"
 
-#. Listen address
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:34
 #, fuzzy
-msgid "Listen address"
-msgstr "Aktivierte Adressen/ Schnittstellen"
+msgid "Syslog facility"
+msgstr "Einstellungen zur Protokollierungsdatei"
 
-#. The interface on which Polipo will listen. To listen on all interfaces use 0.0.0.0 or :: (IPv6).
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:35
 #, fuzzy
 msgid ""
 "The interface on which Polipo will listen. To listen on all interfaces use "
@@ -260,54 +198,72 @@ msgstr ""
 "Auf diesen Schnittstellen soll Polipo aktiviert sein. Um Polipo auf allen "
 "Schnittstellen zu aktivieren bitte 0.0.0.0 bzw. :: (IPv6) angeben"
 
-#. Listen port
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:36
-#, fuzzy
-msgid "Listen port"
-msgstr "Aktiver Port"
+msgid "Time after which cached files will be deleted"
+msgstr ""
 
-#. Port on which Polipo will listen. (default value: 8123)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:37
-#, fuzzy
-msgid "Port on which Polipo will listen. (default value: 8123)"
+msgid "Time after which cached files will be truncated"
 msgstr ""
-"Beschreibt, welcher Port von Polipo genutzt werden soll. Grundeinstellung: "
-"Port 8123"
 
-#. Poor Man&#39;s Multiplexing
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:38
-msgid "Poor Man's Multiplexing"
-msgstr "<abbr title=\"Poor Mans Multiplexing\">PMM</abbr>"
+msgid "To enable PMM, PMM segment size must be set to some positive value."
+msgstr "Um PMM zu aktivieren muss hier ein Wert eingetragen werden"
 
-#. Poor Man&#39;s Multiplexing (PMM) is a technique that simulates multiplexing by requesting an instance in multiple segments. It tries to lower the latency caused by the weakness of HTTP protocol. NOTE: some sites may not work with PMM enabled.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:39
-msgid ""
-"Poor Man's Multiplexing (PMM) is a technique that simulates multiplexing by "
-"requesting an instance in multiple segments. It tries to lower the latency "
-"caused by the weakness of HTTP protocol. NOTE: some sites may not work with "
-"PMM enabled."
+msgid "Truncate cache files size (in bytes)"
 msgstr ""
 
-#. First PMM segment size (in bytes)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:40
-msgid "First PMM segment size (in bytes)"
-msgstr "Größe des ersten PMM - Segment in bytes"
+msgid "Truncate cache files time"
+msgstr ""
 
-#. Size of the first PMM segment. If not defined, it defaults to twice the PMM segment size.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:41
+#, fuzzy
 msgid ""
-"Size of the first PMM segment. If not defined, it defaults to twice the PMM "
-"segment size."
+"Use of external storage device is recommended, because the log file is "
+"written frequently and can grow considerably."
 msgstr ""
-"Größe des ersten Segments. Wenn diese Option leer ist, wird hierfür die "
-"Doppelte Größe des PMM-Segments angenommen"
+"Es sollte ein Externes Speichermedium verwendet werden, da die "
+"Protokolldatei regelmäßig geschrieben wird und dadurch sehr groß werden kann."
 
-#. PMM segments size (in bytes)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:42
-msgid "PMM segments size (in bytes)"
-msgstr "Größe des normalen PMM - Segment in bytes"
+msgid ""
+"When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients "
+"that are allowed to connect. The format is IP address or network address "
+"(192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))"
+msgstr ""
 
-#. To enable PMM, PMM segment size must be set to some positive value.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:43
-msgid "To enable PMM, PMM segment size must be set to some positive value."
-msgstr "Um PMM zu aktivieren muss hier ein Wert eingetragen werden"
+msgid "enable"
+msgstr ""
+
+#, fuzzy
+#~ msgid "Time after which cached files will be deleted. (default value: 32d)"
+#~ msgstr ""
+#~ "Speicherort für permanent gespeicherte Dateien. Es wird die Benutzung von "
+#~ "externen Datenträgern empfohlen, da der Cache sehr groß werden kann. "
+#~ "Lassen Sie diese Option leer um den Cache zu deaktivieren."
+
+#~ msgid "General"
+#~ msgstr "Allgemein"
+
+#, fuzzy
+#~ msgid ""
+#~ "When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients "
+#~ "that are allowed to connect. The format is IP address or network address "
+#~ "(192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))."
+#~ msgstr ""
+#~ "Wenn der Server auf alle Anfragen (0.0.0.0 bzw. ::) hört, dann müssen die "
+#~ "zugelassenen Gegenpunkte, die berechtig sind eine Verbindung aufzubauen, "
+#~ "hier eingetragen werden. Als Format hier bitte die IP-Adresse oder "
+#~ "Nerzwerkmaske auswählen (192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 "
+#~ "(IPv6))"
+
+#, fuzzy
+#~ msgid ""
+#~ "false = Do not query IPv6; reluctantly = Query both, prefer IPv4; happily "
+#~ "= Query both, prefer IPv6; true = Query only IPv6"
+#~ msgstr ""
+#~ "false = Beachtet IPv6 nicht, nur IPv4 möglich; reluctantly = Beachtet "
+#~ "sowohl IPv4 als auch IPv6, IPv4 wird bevorzugt; happily = Beachtet sowohl "
+#~ "IPv4 als auch IPv6, IPv6 wird bevorzugt; true = Beachtet IPv4 nicht, nur "
+#~ "IPv6 möglich"
+
+#, fuzzy
+#~ msgid "Port on which Polipo will listen. (default value: 8123)"
+#~ msgstr ""
+#~ "Beschreibt, welcher Port von Polipo genutzt werden soll. "
+#~ "Grundeinstellung: Port 8123"
diff --git a/po/el/polipo.po b/po/el/polipo.po
index 461a33f4f..8dc0b6a93 100644
--- a/po/el/polipo.po
+++ b/po/el/polipo.po
@@ -12,251 +12,186 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
-#. Polipo
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:1
-msgid "Polipo"
+msgid "Advanced Settings"
 msgstr ""
 
-#. On-Disk Cache
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:2
-msgid "On-Disk Cache"
+msgid "Allowed clients"
 msgstr ""
 
-#. Shared cache
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:3
-msgid "Shared cache"
+msgid "Always use system DNS resolver"
 msgstr ""
 
-#. Enable if cache (proxy) is shared by multiple users.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:4
-msgid "Enable if cache (proxy) is shared by multiple users."
+msgid ""
+"Basic HTTP authentication supported. Provide username and password in "
+"username:password format."
 msgstr ""
 
-#. To enable polipo on-disk cache cleaning (highly recommended), you should add a cron job in Scheduled Tasks services that will execute /usr/sbin/polipo_purge script. For example to perform disk cache cleanup every day at 6:00 in the morning you should add the following line in Scheduled Tasks \"0 6 * * *	/usr/sbin/polipo_purge\" (without quotes).
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:5
-msgid ""
-"To enable polipo on-disk cache cleaning (highly recommended), you should add "
-"a cron job in Scheduled Tasks services that will execute /usr/sbin/"
-"polipo_purge script. For example to perform disk cache cleanup every day at "
-"6:00 in the morning you should add the following line in Scheduled Tasks \"0 "
-"6 * * *\\t/usr/sbin/polipo_purge\" (without quotes)."
+msgid "DNS and Query Settings"
+msgstr ""
+
+msgid "DNS server address"
+msgstr ""
+
+msgid "Delete cache files time"
 msgstr ""
 
-#. Disk cache location
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:6
 msgid "Disk cache location"
 msgstr ""
 
-#. Location where polipo will cache files permanently. Use of external storage devices is recommended, because the cache can grow considerably. Leave it empty to disable on-disk cache.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:7
+msgid "Do not query IPv6"
+msgstr ""
+
+msgid "Enable if cache (proxy) is shared by multiple users."
+msgstr ""
+
+msgid "First PMM segment size (in bytes)"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "How much RAM should Polipo use for its cache."
+msgstr ""
+
+msgid "In RAM cache size (in bytes)"
+msgstr ""
+
+msgid "Listen address"
+msgstr ""
+
+msgid "Listen port"
+msgstr ""
+
 msgid ""
 "Location where polipo will cache files permanently. Use of external storage "
 "devices is recommended, because the cache can grow considerably. Leave it "
 "empty to disable on-disk cache."
 msgstr ""
 
-#. Truncate cache files size (in bytes)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:8
-msgid "Truncate cache files size (in bytes)"
+msgid "Log file location"
 msgstr ""
 
-#. Size to which cached files should be truncated. (default value: 1048576)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:9
-msgid ""
-"Size to which cached files should be truncated. (default value: 1048576)"
+msgid "Log to syslog"
 msgstr ""
 
-#. Truncate cache files time
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:10
-msgid "Truncate cache files time"
+msgid "Logging and RAM"
 msgstr ""
 
-#. Time after which cached files will be truncated. (default value: 4d12h)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:11
-msgid "Time after which cached files will be truncated. (default value: 4d12h)"
+msgid "Never use system DNS resolver"
 msgstr ""
 
-#. Delete cache files time
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:12
-msgid "Delete cache files time"
+msgid "On-Disk Cache"
 msgstr ""
 
-#. Time after which cached files will be deleted. (default value: 32d)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:13
-msgid "Time after which cached files will be deleted. (default value: 32d)"
+msgid "PMM segments size (in bytes)"
 msgstr ""
 
-#. Polipo is a small and fast caching web proxy.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:14
-msgid "Polipo is a small and fast caching web proxy."
+msgid "Parent Proxy"
 msgstr ""
 
-#. General
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:15
-msgid "General"
+msgid "Parent proxy address"
 msgstr ""
 
-#. Allowed clients
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:16
-msgid "Allowed clients"
+msgid ""
+"Parent proxy address (in host:port format), to which Polipo will forward the "
+"requests."
 msgstr ""
 
-#. When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients that are allowed to connect. The format is IP address or network address (192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6)).
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:17
-msgid ""
-"When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients "
-"that are allowed to connect. The format is IP address or network address "
-"(192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))."
+msgid "Parent proxy authentication"
 msgstr ""
 
-#. In RAM cache size (in bytes)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:18
-msgid "In RAM cache size (in bytes)"
+msgid "Polipo"
 msgstr ""
 
-#. How much RAM should Polipo use for its cache.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:19
-msgid "How much RAM should Polipo use for its cache."
+msgid "Polipo is a small and fast caching web proxy."
 msgstr ""
 
-#. DNS server address
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:20
-msgid "DNS server address"
+msgid "Poor Man's Multiplexing"
 msgstr ""
 
-#. Set the DNS server address to use, if you want Polipo to use different DNS server than the host system.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:21
 msgid ""
-"Set the DNS server address to use, if you want Polipo to use different DNS "
-"server than the host system."
+"Poor Man's Multiplexing (PMM) is a technique that simulates multiplexing by "
+"requesting an instance in multiple segments. It tries to lower the latency "
+"caused by the weakness of HTTP protocol. NOTE: some sites may not work with "
+"PMM enabled."
 msgstr ""
 
-#. Query DNS for IPv6
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:22
-msgid "Query DNS for IPv6"
+msgid "Port on which Polipo will listen"
 msgstr ""
 
-#. false = Do not query IPv6; reluctantly = Query both, prefer IPv4; happily = Query both, prefer IPv6; true = Query only IPv6
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:23
-msgid ""
-"false = Do not query IPv6; reluctantly = Query both, prefer IPv4; happily = "
-"Query both, prefer IPv6; true = Query only IPv6"
+msgid "Proxy"
 msgstr ""
 
-#. Query DNS by hostname
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:24
 msgid "Query DNS by hostname"
 msgstr ""
 
-#. false = Never use system DNS resolver; reluctantly = Query DNS directly, if DNS server is unavailable fail to system DNS resolver; happily = Query DNS directly, if host could not be found fallback to system DNS resolver; true = Always use system DNS resolver
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:25
-msgid ""
-"false = Never use system DNS resolver; reluctantly = Query DNS directly, if "
-"DNS server is unavailable fail to system DNS resolver; happily = Query DNS "
-"directly, if host could not be found fallback to system DNS resolver; true = "
-"Always use system DNS resolver"
+msgid "Query DNS directly, fallback to system resolver"
 msgstr ""
 
-#. Syslog facility
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:26
-msgid "Syslog facility"
+msgid "Query DNS directly, for unknown hosts fall back to system resolver"
 msgstr ""
 
-#. Log file location
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:27
-msgid "Log file location"
+msgid "Query DNS for IPv6"
 msgstr ""
 
-#. Use of external storage device is recommended, because the log file is written frequently and can grow considerably.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:28
-msgid ""
-"Use of external storage device is recommended, because the log file is "
-"written frequently and can grow considerably."
+msgid "Query IPv4 and IPv6, prefer IPv4"
 msgstr ""
 
-#. Log to syslog
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:29
-msgid "Log to syslog"
+msgid "Query IPv4 and IPv6, prefer IPv6"
 msgstr ""
 
-#. Parent proxy authentication
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:30
-msgid "Parent proxy authentication"
+msgid "Query only IPv6"
 msgstr ""
 
-#. Basic HTTP authentication supported. Provide username and password in username:password format.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:31
 msgid ""
-"Basic HTTP authentication supported. Provide username and password in "
-"username:password format."
+"Set the DNS server address to use, if you want Polipo to use different DNS "
+"server than the host system."
 msgstr ""
 
-#. Parent proxy address
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:32
-msgid "Parent proxy address"
+msgid "Shared cache"
 msgstr ""
 
-#. Parent proxy address (in host:port format), to which Polipo will forward the requests.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:33
 msgid ""
-"Parent proxy address (in host:port format), to which Polipo will forward the "
-"requests."
+"Size of the first PMM segment. If not defined, it defaults to twice the PMM "
+"segment size."
 msgstr ""
 
-#. Listen address
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:34
-msgid "Listen address"
+msgid "Size to which cached files should be truncated"
+msgstr ""
+
+msgid "Syslog facility"
 msgstr ""
 
-#. The interface on which Polipo will listen. To listen on all interfaces use 0.0.0.0 or :: (IPv6).
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:35
 msgid ""
 "The interface on which Polipo will listen. To listen on all interfaces use "
 "0.0.0.0 or :: (IPv6)."
 msgstr ""
 
-#. Listen port
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:36
-msgid "Listen port"
+msgid "Time after which cached files will be deleted"
 msgstr ""
 
-#. Port on which Polipo will listen. (default value: 8123)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:37
-msgid "Port on which Polipo will listen. (default value: 8123)"
+msgid "Time after which cached files will be truncated"
 msgstr ""
 
-#. Poor Man&#39;s Multiplexing
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:38
-msgid "Poor Man's Multiplexing"
+msgid "To enable PMM, PMM segment size must be set to some positive value."
 msgstr ""
 
-#. Poor Man&#39;s Multiplexing (PMM) is a technique that simulates multiplexing by requesting an instance in multiple segments. It tries to lower the latency caused by the weakness of HTTP protocol. NOTE: some sites may not work with PMM enabled.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:39
-msgid ""
-"Poor Man's Multiplexing (PMM) is a technique that simulates multiplexing by "
-"requesting an instance in multiple segments. It tries to lower the latency "
-"caused by the weakness of HTTP protocol. NOTE: some sites may not work with "
-"PMM enabled."
+msgid "Truncate cache files size (in bytes)"
 msgstr ""
 
-#. First PMM segment size (in bytes)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:40
-msgid "First PMM segment size (in bytes)"
+msgid "Truncate cache files time"
 msgstr ""
 
-#. Size of the first PMM segment. If not defined, it defaults to twice the PMM segment size.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:41
 msgid ""
-"Size of the first PMM segment. If not defined, it defaults to twice the PMM "
-"segment size."
+"Use of external storage device is recommended, because the log file is "
+"written frequently and can grow considerably."
 msgstr ""
 
-#. PMM segments size (in bytes)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:42
-msgid "PMM segments size (in bytes)"
+msgid ""
+"When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients "
+"that are allowed to connect. The format is IP address or network address "
+"(192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))"
 msgstr ""
 
-#. To enable PMM, PMM segment size must be set to some positive value.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:43
-msgid "To enable PMM, PMM segment size must be set to some positive value."
+msgid "enable"
 msgstr ""
diff --git a/po/en/polipo.po b/po/en/polipo.po
index f7f62f2aa..7afcb68c2 100644
--- a/po/en/polipo.po
+++ b/po/en/polipo.po
@@ -12,217 +12,91 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
-#. Polipo
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:1
-msgid "Polipo"
-msgstr "Polipo"
-
-#. On-Disk Cache
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:2
-msgid "On-Disk Cache"
-msgstr "On-Disk Cache"
-
-#. Shared cache
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:3
-msgid "Shared cache"
-msgstr "Shared cache"
+msgid "Advanced Settings"
+msgstr ""
 
-#. Enable if cache (proxy) is shared by multiple users.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:4
-msgid "Enable if cache (proxy) is shared by multiple users."
-msgstr "Enable if cache (proxy) is shared by multiple users."
+msgid "Allowed clients"
+msgstr "Allowed clients"
 
-#. To enable polipo on-disk cache cleaning (highly recommended), you should add a cron job in Scheduled Tasks services that will execute /usr/sbin/polipo_purge script. For example to perform disk cache cleanup every day at 6:00 in the morning you should add the following line in Scheduled Tasks \"0 6 * * *	/usr/sbin/polipo_purge\" (without quotes).
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:5
-msgid ""
-"To enable polipo on-disk cache cleaning (highly recommended), you should add "
-"a cron job in Scheduled Tasks services that will execute /usr/sbin/"
-"polipo_purge script. For example to perform disk cache cleanup every day at "
-"6:00 in the morning you should add the following line in Scheduled Tasks \"0 "
-"6 * * *\\t/usr/sbin/polipo_purge\" (without quotes)."
+msgid "Always use system DNS resolver"
 msgstr ""
-"To enable polipo on-disk cache cleaning (highly recommended), you should add "
-"a cron job in Scheduled Tasks services that will execute /usr/sbin/"
-"polipo_purge script. For example to perform disk cache cleanup every day at "
-"6:00 in the morning you should add the following line in Scheduled Tasks \"0 "
-"6 * * *\t/usr/sbin/polipo_purge\" (without quotes)."
-
-#. Disk cache location
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:6
-msgid "Disk cache location"
-msgstr "Disk cache location"
 
-#. Location where polipo will cache files permanently. Use of external storage devices is recommended, because the cache can grow considerably. Leave it empty to disable on-disk cache.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:7
 msgid ""
-"Location where polipo will cache files permanently. Use of external storage "
-"devices is recommended, because the cache can grow considerably. Leave it "
-"empty to disable on-disk cache."
+"Basic HTTP authentication supported. Provide username and password in "
+"username:password format."
 msgstr ""
-"Location where polipo will cache files permanently. Use of external storage "
-"devices is recommended, because the cache can grow considerably. Leave it "
-"empty to disable on-disk cache."
-
-#. Truncate cache files size (in bytes)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:8
-msgid "Truncate cache files size (in bytes)"
-msgstr "Truncate cache files size (in bytes)"
+"Basic HTTP authentication supported. Provide username and password in "
+"username:password format."
 
-#. Size to which cached files should be truncated. (default value: 1048576)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:9
-msgid ""
-"Size to which cached files should be truncated. (default value: 1048576)"
+msgid "DNS and Query Settings"
 msgstr ""
-"Size to which cached files should be truncated. (default value: 1048576)"
-
-#. Truncate cache files time
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:10
-msgid "Truncate cache files time"
-msgstr "Truncate cache files time"
 
-#. Time after which cached files will be truncated. (default value: 4d12h)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:11
-msgid "Time after which cached files will be truncated. (default value: 4d12h)"
-msgstr ""
-"Time after which cached files will be truncated. (default value: 4d12h)"
+msgid "DNS server address"
+msgstr "DNS server address"
 
-#. Delete cache files time
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:12
 msgid "Delete cache files time"
 msgstr "Delete cache files time"
 
-#. Time after which cached files will be deleted. (default value: 32d)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:13
-msgid "Time after which cached files will be deleted. (default value: 32d)"
-msgstr "Time after which cached files will be deleted. (default value: 32d)"
+msgid "Disk cache location"
+msgstr "Disk cache location"
 
-#. Polipo is a small and fast caching web proxy.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:14
-msgid "Polipo is a small and fast caching web proxy."
-msgstr "Polipo is a small and fast caching web proxy."
+msgid "Do not query IPv6"
+msgstr ""
 
-#. General
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:15
-msgid "General"
-msgstr "General"
+msgid "Enable if cache (proxy) is shared by multiple users."
+msgstr "Enable if cache (proxy) is shared by multiple users."
 
-#. Allowed clients
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:16
-msgid "Allowed clients"
-msgstr "Allowed clients"
+msgid "First PMM segment size (in bytes)"
+msgstr "First PMM segment size (in bytes)"
 
-#. When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients that are allowed to connect. The format is IP address or network address (192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6)).
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:17
-msgid ""
-"When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients "
-"that are allowed to connect. The format is IP address or network address "
-"(192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))."
+msgid "General Settings"
 msgstr ""
-"When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients "
-"that are allowed to connect. The format is IP address or network address "
-"(192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))."
 
-#. In RAM cache size (in bytes)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:18
-msgid "In RAM cache size (in bytes)"
-msgstr "In RAM cache size (in bytes)"
-
-#. How much RAM should Polipo use for its cache.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:19
 msgid "How much RAM should Polipo use for its cache."
 msgstr "How much RAM should Polipo use for its cache."
 
-#. DNS server address
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:20
-msgid "DNS server address"
-msgstr "DNS server address"
-
-#. Set the DNS server address to use, if you want Polipo to use different DNS server than the host system.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:21
-msgid ""
-"Set the DNS server address to use, if you want Polipo to use different DNS "
-"server than the host system."
-msgstr ""
-"Set the DNS server address to use, if you want Polipo to use different DNS "
-"server than the host system."
-
-#. Query DNS for IPv6
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:22
-msgid "Query DNS for IPv6"
-msgstr "Query DNS for IPv6"
+msgid "In RAM cache size (in bytes)"
+msgstr "In RAM cache size (in bytes)"
 
-#. false = Do not query IPv6; reluctantly = Query both, prefer IPv4; happily = Query both, prefer IPv6; true = Query only IPv6
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:23
-msgid ""
-"false = Do not query IPv6; reluctantly = Query both, prefer IPv4; happily = "
-"Query both, prefer IPv6; true = Query only IPv6"
-msgstr ""
-"false = Do not query IPv6; reluctantly = Query both, prefer IPv4; happily = "
-"Query both, prefer IPv6; true = Query only IPv6"
+msgid "Listen address"
+msgstr "Listen address"
 
-#. Query DNS by hostname
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:24
-msgid "Query DNS by hostname"
-msgstr "Query DNS by hostname"
+msgid "Listen port"
+msgstr "Listen port"
 
-#. false = Never use system DNS resolver; reluctantly = Query DNS directly, if DNS server is unavailable fail to system DNS resolver; happily = Query DNS directly, if host could not be found fallback to system DNS resolver; true = Always use system DNS resolver
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:25
 msgid ""
-"false = Never use system DNS resolver; reluctantly = Query DNS directly, if "
-"DNS server is unavailable fail to system DNS resolver; happily = Query DNS "
-"directly, if host could not be found fallback to system DNS resolver; true = "
-"Always use system DNS resolver"
+"Location where polipo will cache files permanently. Use of external storage "
+"devices is recommended, because the cache can grow considerably. Leave it "
+"empty to disable on-disk cache."
 msgstr ""
-"false = Never use system DNS resolver; reluctantly = Query DNS directly, if "
-"DNS server is unavailable fail to system DNS resolver; happily = Query DNS "
-"directly, if host could not be found fallback to system DNS resolver; true = "
-"Always use system DNS resolver"
-
-#. Syslog facility
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:26
-msgid "Syslog facility"
-msgstr "Syslog facility"
+"Location where polipo will cache files permanently. Use of external storage "
+"devices is recommended, because the cache can grow considerably. Leave it "
+"empty to disable on-disk cache."
 
-#. Log file location
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:27
 msgid "Log file location"
 msgstr "Log file location"
 
-#. Use of external storage device is recommended, because the log file is written frequently and can grow considerably.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:28
-msgid ""
-"Use of external storage device is recommended, because the log file is "
-"written frequently and can grow considerably."
-msgstr ""
-"Use of external storage device is recommended, because the log file is "
-"written frequently and can grow considerably."
-
-#. Log to syslog
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:29
 msgid "Log to syslog"
 msgstr "Log to syslog"
 
-#. Parent proxy authentication
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:30
-msgid "Parent proxy authentication"
-msgstr "Parent proxy authentication"
+msgid "Logging and RAM"
+msgstr ""
 
-#. Basic HTTP authentication supported. Provide username and password in username:password format.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:31
-msgid ""
-"Basic HTTP authentication supported. Provide username and password in "
-"username:password format."
+msgid "Never use system DNS resolver"
+msgstr ""
+
+msgid "On-Disk Cache"
+msgstr "On-Disk Cache"
+
+msgid "PMM segments size (in bytes)"
+msgstr "PMM segments size (in bytes)"
+
+msgid "Parent Proxy"
 msgstr ""
-"Basic HTTP authentication supported. Provide username and password in "
-"username:password format."
 
-#. Parent proxy address
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:32
 msgid "Parent proxy address"
 msgstr "Parent proxy address"
 
-#. Parent proxy address (in host:port format), to which Polipo will forward the requests.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:33
 msgid ""
 "Parent proxy address (in host:port format), to which Polipo will forward the "
 "requests."
@@ -230,37 +104,18 @@ msgstr ""
 "Parent proxy address (in host:port format), to which Polipo will forward the "
 "requests."
 
-#. Listen address
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:34
-msgid "Listen address"
-msgstr "Listen address"
-
-#. The interface on which Polipo will listen. To listen on all interfaces use 0.0.0.0 or :: (IPv6).
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:35
-msgid ""
-"The interface on which Polipo will listen. To listen on all interfaces use "
-"0.0.0.0 or :: (IPv6)."
-msgstr ""
-"The interface on which Polipo will listen. To listen on all interfaces use "
-"0.0.0.0 or :: (IPv6)."
+msgid "Parent proxy authentication"
+msgstr "Parent proxy authentication"
 
-#. Listen port
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:36
-msgid "Listen port"
-msgstr "Listen port"
+msgid "Polipo"
+msgstr "Polipo"
 
-#. Port on which Polipo will listen. (default value: 8123)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:37
-msgid "Port on which Polipo will listen. (default value: 8123)"
-msgstr "Port on which Polipo will listen. (default value: 8123)"
+msgid "Polipo is a small and fast caching web proxy."
+msgstr "Polipo is a small and fast caching web proxy."
 
-#. Poor Man&#39;s Multiplexing
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:38
 msgid "Poor Man's Multiplexing"
 msgstr "Poor Man&#39;s Multiplexing"
 
-#. Poor Man&#39;s Multiplexing (PMM) is a technique that simulates multiplexing by requesting an instance in multiple segments. It tries to lower the latency caused by the weakness of HTTP protocol. NOTE: some sites may not work with PMM enabled.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:39
 msgid ""
 "Poor Man's Multiplexing (PMM) is a technique that simulates multiplexing by "
 "requesting an instance in multiple segments. It tries to lower the latency "
@@ -272,13 +127,43 @@ msgstr ""
 "latency caused by the weakness of HTTP protocol. NOTE: some sites may not "
 "work with PMM enabled."
 
-#. First PMM segment size (in bytes)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:40
-msgid "First PMM segment size (in bytes)"
-msgstr "First PMM segment size (in bytes)"
+msgid "Port on which Polipo will listen"
+msgstr ""
+
+msgid "Proxy"
+msgstr ""
+
+msgid "Query DNS by hostname"
+msgstr "Query DNS by hostname"
+
+msgid "Query DNS directly, fallback to system resolver"
+msgstr ""
+
+msgid "Query DNS directly, for unknown hosts fall back to system resolver"
+msgstr ""
+
+msgid "Query DNS for IPv6"
+msgstr "Query DNS for IPv6"
+
+msgid "Query IPv4 and IPv6, prefer IPv4"
+msgstr ""
+
+msgid "Query IPv4 and IPv6, prefer IPv6"
+msgstr ""
+
+msgid "Query only IPv6"
+msgstr ""
+
+msgid ""
+"Set the DNS server address to use, if you want Polipo to use different DNS "
+"server than the host system."
+msgstr ""
+"Set the DNS server address to use, if you want Polipo to use different DNS "
+"server than the host system."
+
+msgid "Shared cache"
+msgstr "Shared cache"
 
-#. Size of the first PMM segment. If not defined, it defaults to twice the PMM segment size.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:41
 msgid ""
 "Size of the first PMM segment. If not defined, it defaults to twice the PMM "
 "segment size."
@@ -286,12 +171,105 @@ msgstr ""
 "Size of the first PMM segment. If not defined, it defaults to twice the PMM "
 "segment size."
 
-#. PMM segments size (in bytes)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:42
-msgid "PMM segments size (in bytes)"
-msgstr "PMM segments size (in bytes)"
+msgid "Size to which cached files should be truncated"
+msgstr ""
+
+msgid "Syslog facility"
+msgstr "Syslog facility"
+
+msgid ""
+"The interface on which Polipo will listen. To listen on all interfaces use "
+"0.0.0.0 or :: (IPv6)."
+msgstr ""
+"The interface on which Polipo will listen. To listen on all interfaces use "
+"0.0.0.0 or :: (IPv6)."
+
+msgid "Time after which cached files will be deleted"
+msgstr ""
+
+msgid "Time after which cached files will be truncated"
+msgstr ""
 
-#. To enable PMM, PMM segment size must be set to some positive value.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:43
 msgid "To enable PMM, PMM segment size must be set to some positive value."
 msgstr "To enable PMM, PMM segment size must be set to some positive value."
+
+msgid "Truncate cache files size (in bytes)"
+msgstr "Truncate cache files size (in bytes)"
+
+msgid "Truncate cache files time"
+msgstr "Truncate cache files time"
+
+msgid ""
+"Use of external storage device is recommended, because the log file is "
+"written frequently and can grow considerably."
+msgstr ""
+"Use of external storage device is recommended, because the log file is "
+"written frequently and can grow considerably."
+
+msgid ""
+"When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients "
+"that are allowed to connect. The format is IP address or network address "
+"(192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))"
+msgstr ""
+
+msgid "enable"
+msgstr ""
+
+#~ msgid ""
+#~ "To enable polipo on-disk cache cleaning (highly recommended), you should "
+#~ "add a cron job in Scheduled Tasks services that will execute /usr/sbin/"
+#~ "polipo_purge script. For example to perform disk cache cleanup every day "
+#~ "at 6:00 in the morning you should add the following line in Scheduled "
+#~ "Tasks \"0 6 * * *\\t/usr/sbin/polipo_purge\" (without quotes)."
+#~ msgstr ""
+#~ "To enable polipo on-disk cache cleaning (highly recommended), you should "
+#~ "add a cron job in Scheduled Tasks services that will execute /usr/sbin/"
+#~ "polipo_purge script. For example to perform disk cache cleanup every day "
+#~ "at 6:00 in the morning you should add the following line in Scheduled "
+#~ "Tasks \"0 6 * * *\t/usr/sbin/polipo_purge\" (without quotes)."
+
+#~ msgid ""
+#~ "Size to which cached files should be truncated. (default value: 1048576)"
+#~ msgstr ""
+#~ "Size to which cached files should be truncated. (default value: 1048576)"
+
+#~ msgid ""
+#~ "Time after which cached files will be truncated. (default value: 4d12h)"
+#~ msgstr ""
+#~ "Time after which cached files will be truncated. (default value: 4d12h)"
+
+#~ msgid "Time after which cached files will be deleted. (default value: 32d)"
+#~ msgstr "Time after which cached files will be deleted. (default value: 32d)"
+
+#~ msgid "General"
+#~ msgstr "General"
+
+#~ msgid ""
+#~ "When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients "
+#~ "that are allowed to connect. The format is IP address or network address "
+#~ "(192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))."
+#~ msgstr ""
+#~ "When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients "
+#~ "that are allowed to connect. The format is IP address or network address "
+#~ "(192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))."
+
+#~ msgid ""
+#~ "false = Do not query IPv6; reluctantly = Query both, prefer IPv4; happily "
+#~ "= Query both, prefer IPv6; true = Query only IPv6"
+#~ msgstr ""
+#~ "false = Do not query IPv6; reluctantly = Query both, prefer IPv4; happily "
+#~ "= Query both, prefer IPv6; true = Query only IPv6"
+
+#~ msgid ""
+#~ "false = Never use system DNS resolver; reluctantly = Query DNS directly, "
+#~ "if DNS server is unavailable fail to system DNS resolver; happily = Query "
+#~ "DNS directly, if host could not be found fallback to system DNS resolver; "
+#~ "true = Always use system DNS resolver"
+#~ msgstr ""
+#~ "false = Never use system DNS resolver; reluctantly = Query DNS directly, "
+#~ "if DNS server is unavailable fail to system DNS resolver; happily = Query "
+#~ "DNS directly, if host could not be found fallback to system DNS resolver; "
+#~ "true = Always use system DNS resolver"
+
+#~ msgid "Port on which Polipo will listen. (default value: 8123)"
+#~ msgstr "Port on which Polipo will listen. (default value: 8123)"
diff --git a/po/es/polipo.po b/po/es/polipo.po
index 9d9c55e7c..2427ca7c1 100644
--- a/po/es/polipo.po
+++ b/po/es/polipo.po
@@ -11,227 +11,91 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0\n"
 
-#. Polipo
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:1
-msgid "Polipo"
-msgstr "Polipo"
-
-#. On-Disk Cache
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:2
-msgid "On-Disk Cache"
-msgstr "Cache en disco"
-
-#. Shared cache
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:3
-msgid "Shared cache"
-msgstr "Cache compartida"
+msgid "Advanced Settings"
+msgstr ""
 
-#. Enable if cache (proxy) is shared by multiple users.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:4
-msgid "Enable if cache (proxy) is shared by multiple users."
-msgstr "Activar si la cache (proxy) is compartida por multiples usuarios."
+msgid "Allowed clients"
+msgstr "Clientes permitos"
 
-#. To enable polipo on-disk cache cleaning (highly recommended), you should add a cron job in Scheduled Tasks services that will execute /usr/sbin/polipo_purge script. For example to perform disk cache cleanup every day at 6:00 in the morning you should add the following line in Scheduled Tasks \"0 6 * * *	/usr/sbin/polipo_purge\" (without quotes).
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:5
-msgid ""
-"To enable polipo on-disk cache cleaning (highly recommended), you should add "
-"a cron job in Scheduled Tasks services that will execute /usr/sbin/"
-"polipo_purge script. For example to perform disk cache cleanup every day at "
-"6:00 in the morning you should add the following line in Scheduled Tasks \"0 "
-"6 * * *\\t/usr/sbin/polipo_purge\" (without quotes)."
+msgid "Always use system DNS resolver"
 msgstr ""
-"Para activar la limpieza de la cache en disco polipo (recomendada), se "
-"recomienda agregar un trabajo al cron in los Servicios de Tareas Programadas "
-"el cual ejecutará el script /usr/sbin/polipo_purge. Por ejemplo para "
-"ejecutar una limpieza de la cache de disco todos los días a las 6:00 a.m. "
-"deberá agregar la siguiente línea en el Servicio de Tareas Programadas.-&amp;"
-"quot;0 6 * * * /usr/sbin/polipo_purge&amp;quot; (sin las comillas)."
-
-#. Disk cache location
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:6
-msgid "Disk cache location"
-msgstr "Ubicación de la caché de disco"
 
-#. Location where polipo will cache files permanently. Use of external storage devices is recommended, because the cache can grow considerably. Leave it empty to disable on-disk cache.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:7
 msgid ""
-"Location where polipo will cache files permanently. Use of external storage "
-"devices is recommended, because the cache can grow considerably. Leave it "
-"empty to disable on-disk cache."
+"Basic HTTP authentication supported. Provide username and password in "
+"username:password format."
 msgstr ""
-"Ubicación donde polipo creará archivos permanentemente. Se recomienda el uso "
-"de dispositivos de almacenamiento externo, ya que la cache puede aumentar "
-"considerablemente. Deje en blanco para desactivar la cache en disco"
-
-#. Truncate cache files size (in bytes)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:8
-msgid "Truncate cache files size (in bytes)"
-msgstr "Truncar el tamaño del archivo de la cache (en bytes)"
+"Autenticación soportada: Basic HTTP. Provee del nombre de usuario y "
+"contraseña in el formato username:password."
 
-#. Size to which cached files should be truncated. (default value: 1048576)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:9
-msgid ""
-"Size to which cached files should be truncated. (default value: 1048576)"
+msgid "DNS and Query Settings"
 msgstr ""
-"Tamaño del archivo sobre el cual la cache deberá ser truncada. (valor por "
-"defecto: 1048576)"
-
-#. Truncate cache files time
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:10
-msgid "Truncate cache files time"
-msgstr "Truncar tiempo del archivo de cache "
 
-#. Time after which cached files will be truncated. (default value: 4d12h)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:11
-msgid "Time after which cached files will be truncated. (default value: 4d12h)"
-msgstr ""
-"Tiempo transcurrido necesario antes de truncar los archivos cacheado. (valor "
-"por defecto: 4d12h)"
+msgid "DNS server address"
+msgstr "Dirección del servidor DNS"
 
-#. Delete cache files time
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:12
 msgid "Delete cache files time"
 msgstr "Timpo para eliminar archivos de cache"
 
-#. Time after which cached files will be deleted. (default value: 32d)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:13
-msgid "Time after which cached files will be deleted. (default value: 32d)"
-msgstr ""
-"Tiempo transcurrido necesario antes de eliminar los archivos en la cache. "
-"(valor por defecto: 32d)"
+msgid "Disk cache location"
+msgstr "Ubicación de la caché de disco"
 
-#. Polipo is a small and fast caching web proxy.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:14
-msgid "Polipo is a small and fast caching web proxy."
-msgstr "Polipo es un rápido y pequeño servidor proxy de web."
+msgid "Do not query IPv6"
+msgstr ""
 
-#. General
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:15
-msgid "General"
-msgstr "General"
+msgid "Enable if cache (proxy) is shared by multiple users."
+msgstr "Activar si la cache (proxy) is compartida por multiples usuarios."
 
-#. Allowed clients
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:16
-msgid "Allowed clients"
-msgstr "Clientes permitos"
+msgid "First PMM segment size (in bytes)"
+msgstr "Tamaño del primer segmento PMM  (en bytes)"
 
-#. When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients that are allowed to connect. The format is IP address or network address (192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6)).
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:17
-msgid ""
-"When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients "
-"that are allowed to connect. The format is IP address or network address "
-"(192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))."
+msgid "General Settings"
 msgstr ""
-"Cuando la dirección a escuchar es establecida en 0.0.0.0 or :: (en caso de "
-"utilizar IPv6), deberá listar los clientes que se encuentran permitos a "
-"conectarse. El formato a utilizar deberá indicarse con la dirección IP o "
-"bien la dirección de Red.Por ejemplo: (192.168.1.123, 192.168.1.0/24, "
-"2001:660:116::/48 (IPv6))."
-
-#. In RAM cache size (in bytes)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:18
-msgid "In RAM cache size (in bytes)"
-msgstr "Tamaño (en bytes) de la cache en RAM"
 
-#. How much RAM should Polipo use for its cache.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:19
 msgid "How much RAM should Polipo use for its cache."
 msgstr "Cuánta RAM Polipo utilizará para este tipo de cache?."
 
-#. DNS server address
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:20
-msgid "DNS server address"
-msgstr "Dirección del servidor DNS"
-
-#. Set the DNS server address to use, if you want Polipo to use different DNS server than the host system.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:21
-msgid ""
-"Set the DNS server address to use, if you want Polipo to use different DNS "
-"server than the host system."
-msgstr ""
-"Indique la dirección del servidor DNS a utilizar, si prefiere que Polipo "
-"utilice una dirección para el servidor DNS distinta al utilizado en el "
-"sistema."
-
-#. Query DNS for IPv6
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:22
-msgid "Query DNS for IPv6"
-msgstr "Consulta DNS para IPv6"
+msgid "In RAM cache size (in bytes)"
+msgstr "Tamaño (en bytes) de la cache en RAM"
 
-#. false = Do not query IPv6; reluctantly = Query both, prefer IPv4; happily = Query both, prefer IPv6; true = Query only IPv6
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:23
-msgid ""
-"false = Do not query IPv6; reluctantly = Query both, prefer IPv4; happily = "
-"Query both, prefer IPv6; true = Query only IPv6"
-msgstr ""
-"false = No consulta IPv6, reluctantly = Consulta ambos, preferencia IPv4; "
-"happily = Consulta ambos, preferencia IPv6; true = Consulta sólamente IPv6"
+msgid "Listen address"
+msgstr "Dirección de escucha"
 
-#. Query DNS by hostname
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:24
-msgid "Query DNS by hostname"
-msgstr "Consultar DNS por nombre de host"
+msgid "Listen port"
+msgstr "Puerto de escucha:"
 
-#. false = Never use system DNS resolver; reluctantly = Query DNS directly, if DNS server is unavailable fail to system DNS resolver; happily = Query DNS directly, if host could not be found fallback to system DNS resolver; true = Always use system DNS resolver
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:25
 msgid ""
-"false = Never use system DNS resolver; reluctantly = Query DNS directly, if "
-"DNS server is unavailable fail to system DNS resolver; happily = Query DNS "
-"directly, if host could not be found fallback to system DNS resolver; true = "
-"Always use system DNS resolver"
+"Location where polipo will cache files permanently. Use of external storage "
+"devices is recommended, because the cache can grow considerably. Leave it "
+"empty to disable on-disk cache."
 msgstr ""
-"false = Nunca use el sistema de resolución de DNS, reluctantly = Consultar "
-"DNS directamente, si el servidor DNS no está disponible al utilizar el "
-"sistema de resolución de DNS, hapilly = Consultar DNS directamente, si el "
-"host no se pudo encontrar volver al sistema de resolución de DNS; true = "
-"Siempre use el sistema de resolución de DNS"
-
-#. Syslog facility
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:26
-msgid "Syslog facility"
-msgstr "Falicidad Syslog"
+"Ubicación donde polipo creará archivos permanentemente. Se recomienda el uso "
+"de dispositivos de almacenamiento externo, ya que la cache puede aumentar "
+"considerablemente. Deje en blanco para desactivar la cache en disco"
 
-#. Log file location
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:27
 msgid "Log file location"
 msgstr "Ubicación del archivo de Log"
 
-#. Use of external storage device is recommended, because the log file is written frequently and can grow considerably.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:28
-msgid ""
-"Use of external storage device is recommended, because the log file is "
-"written frequently and can grow considerably."
-msgstr ""
-"El uso de un dispositivo externo de almacenamiento es recomendado, debido a "
-"que el archivo log es escrito con mucha frecuencia y el mismo puede "
-"incrementar su tamaño de forma considerable."
-
-#. Log to syslog
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:29
 msgid "Log to syslog"
 msgstr "Loguear al sistema Syslog"
 
-#. Parent proxy authentication
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:30
-msgid "Parent proxy authentication"
-msgstr "Padre(s) de proxy de autenticación "
+msgid "Logging and RAM"
+msgstr ""
 
-#. Basic HTTP authentication supported. Provide username and password in username:password format.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:31
-msgid ""
-"Basic HTTP authentication supported. Provide username and password in "
-"username:password format."
+msgid "Never use system DNS resolver"
+msgstr ""
+
+msgid "On-Disk Cache"
+msgstr "Cache en disco"
+
+msgid "PMM segments size (in bytes)"
+msgstr "Tamaño de segmentos PMM (en bytes)"
+
+msgid "Parent Proxy"
 msgstr ""
-"Autenticación soportada: Basic HTTP. Provee del nombre de usuario y "
-"contraseña in el formato username:password."
 
-#. Parent proxy address
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:32
 msgid "Parent proxy address"
 msgstr "Dirección padre de proxy"
 
-#. Parent proxy address (in host:port format), to which Polipo will forward the requests.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:33
 msgid ""
 "Parent proxy address (in host:port format), to which Polipo will forward the "
 "requests."
@@ -239,37 +103,18 @@ msgstr ""
 "Dirección padre del proxy (en formato host:port), al cual Polipo hará "
 "forward de las peticiones."
 
-#. Listen address
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:34
-msgid "Listen address"
-msgstr "Dirección de escucha"
-
-#. The interface on which Polipo will listen. To listen on all interfaces use 0.0.0.0 or :: (IPv6).
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:35
-msgid ""
-"The interface on which Polipo will listen. To listen on all interfaces use "
-"0.0.0.0 or :: (IPv6)."
-msgstr ""
-"La interface en la cual Polipo escuchará. Para escuchar en todas las "
-"interfaces utilice 0.0.0.0 o :: (IPv6)."
+msgid "Parent proxy authentication"
+msgstr "Padre(s) de proxy de autenticación "
 
-#. Listen port
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:36
-msgid "Listen port"
-msgstr "Puerto de escucha:"
+msgid "Polipo"
+msgstr "Polipo"
 
-#. Port on which Polipo will listen. (default value: 8123)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:37
-msgid "Port on which Polipo will listen. (default value: 8123)"
-msgstr "Puerto de escucha que Polipo utilizará. (valor por defecto: 8123)"
+msgid "Polipo is a small and fast caching web proxy."
+msgstr "Polipo es un rápido y pequeño servidor proxy de web."
 
-#. Poor Man&#39;s Multiplexing
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:38
 msgid "Poor Man's Multiplexing"
 msgstr "Poor Man&amp;#39;s Multiplexing"
 
-#. Poor Man&#39;s Multiplexing (PMM) is a technique that simulates multiplexing by requesting an instance in multiple segments. It tries to lower the latency caused by the weakness of HTTP protocol. NOTE: some sites may not work with PMM enabled.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:39
 msgid ""
 "Poor Man's Multiplexing (PMM) is a technique that simulates multiplexing by "
 "requesting an instance in multiple segments. It tries to lower the latency "
@@ -281,13 +126,44 @@ msgstr ""
 "latencia provocada por la debilidad del protocolo HTTP. NOTA: algunos sitios "
 "pueden no funcionar con PMM habilitado."
 
-#. First PMM segment size (in bytes)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:40
-msgid "First PMM segment size (in bytes)"
-msgstr "Tamaño del primer segmento PMM  (en bytes)"
+msgid "Port on which Polipo will listen"
+msgstr ""
+
+msgid "Proxy"
+msgstr ""
+
+msgid "Query DNS by hostname"
+msgstr "Consultar DNS por nombre de host"
+
+msgid "Query DNS directly, fallback to system resolver"
+msgstr ""
+
+msgid "Query DNS directly, for unknown hosts fall back to system resolver"
+msgstr ""
+
+msgid "Query DNS for IPv6"
+msgstr "Consulta DNS para IPv6"
+
+msgid "Query IPv4 and IPv6, prefer IPv4"
+msgstr ""
+
+msgid "Query IPv4 and IPv6, prefer IPv6"
+msgstr ""
+
+msgid "Query only IPv6"
+msgstr ""
+
+msgid ""
+"Set the DNS server address to use, if you want Polipo to use different DNS "
+"server than the host system."
+msgstr ""
+"Indique la dirección del servidor DNS a utilizar, si prefiere que Polipo "
+"utilice una dirección para el servidor DNS distinta al utilizado en el "
+"sistema."
+
+msgid "Shared cache"
+msgstr "Cache compartida"
 
-#. Size of the first PMM segment. If not defined, it defaults to twice the PMM segment size.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:41
 msgid ""
 "Size of the first PMM segment. If not defined, it defaults to twice the PMM "
 "segment size."
@@ -295,14 +171,120 @@ msgstr ""
 "Tamaño del primer segmento PMM. Si no se encuentra definido, su valor por "
 "defecto es el doble del tamaño del segmento PMM."
 
-#. PMM segments size (in bytes)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:42
-msgid "PMM segments size (in bytes)"
-msgstr "Tamaño de segmentos PMM (en bytes)"
+msgid "Size to which cached files should be truncated"
+msgstr ""
+
+msgid "Syslog facility"
+msgstr "Falicidad Syslog"
+
+msgid ""
+"The interface on which Polipo will listen. To listen on all interfaces use "
+"0.0.0.0 or :: (IPv6)."
+msgstr ""
+"La interface en la cual Polipo escuchará. Para escuchar en todas las "
+"interfaces utilice 0.0.0.0 o :: (IPv6)."
+
+msgid "Time after which cached files will be deleted"
+msgstr ""
 
-#. To enable PMM, PMM segment size must be set to some positive value.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:43
-msgid "polipo_pmm_pmmsize_desc"
+msgid "Time after which cached files will be truncated"
 msgstr ""
-"Para activar PMM, el tamaño del segmento PMM debe ser establecido a un valor "
-"mayor a 0 (valor positivo)."
+
+msgid "To enable PMM, PMM segment size must be set to some positive value."
+msgstr ""
+
+msgid "Truncate cache files size (in bytes)"
+msgstr "Truncar el tamaño del archivo de la cache (en bytes)"
+
+msgid "Truncate cache files time"
+msgstr "Truncar tiempo del archivo de cache "
+
+msgid ""
+"Use of external storage device is recommended, because the log file is "
+"written frequently and can grow considerably."
+msgstr ""
+"El uso de un dispositivo externo de almacenamiento es recomendado, debido a "
+"que el archivo log es escrito con mucha frecuencia y el mismo puede "
+"incrementar su tamaño de forma considerable."
+
+msgid ""
+"When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients "
+"that are allowed to connect. The format is IP address or network address "
+"(192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))"
+msgstr ""
+
+msgid "enable"
+msgstr ""
+
+#~ msgid ""
+#~ "To enable polipo on-disk cache cleaning (highly recommended), you should "
+#~ "add a cron job in Scheduled Tasks services that will execute /usr/sbin/"
+#~ "polipo_purge script. For example to perform disk cache cleanup every day "
+#~ "at 6:00 in the morning you should add the following line in Scheduled "
+#~ "Tasks \"0 6 * * *\\t/usr/sbin/polipo_purge\" (without quotes)."
+#~ msgstr ""
+#~ "Para activar la limpieza de la cache en disco polipo (recomendada), se "
+#~ "recomienda agregar un trabajo al cron in los Servicios de Tareas "
+#~ "Programadas el cual ejecutará el script /usr/sbin/polipo_purge. Por "
+#~ "ejemplo para ejecutar una limpieza de la cache de disco todos los días a "
+#~ "las 6:00 a.m. deberá agregar la siguiente línea en el Servicio de Tareas "
+#~ "Programadas.-&amp;quot;0 6 * * * /usr/sbin/polipo_purge&amp;quot; (sin "
+#~ "las comillas)."
+
+#~ msgid ""
+#~ "Size to which cached files should be truncated. (default value: 1048576)"
+#~ msgstr ""
+#~ "Tamaño del archivo sobre el cual la cache deberá ser truncada. (valor por "
+#~ "defecto: 1048576)"
+
+#~ msgid ""
+#~ "Time after which cached files will be truncated. (default value: 4d12h)"
+#~ msgstr ""
+#~ "Tiempo transcurrido necesario antes de truncar los archivos cacheado. "
+#~ "(valor por defecto: 4d12h)"
+
+#~ msgid "Time after which cached files will be deleted. (default value: 32d)"
+#~ msgstr ""
+#~ "Tiempo transcurrido necesario antes de eliminar los archivos en la cache. "
+#~ "(valor por defecto: 32d)"
+
+#~ msgid "General"
+#~ msgstr "General"
+
+#~ msgid ""
+#~ "When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients "
+#~ "that are allowed to connect. The format is IP address or network address "
+#~ "(192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))."
+#~ msgstr ""
+#~ "Cuando la dirección a escuchar es establecida en 0.0.0.0 or :: (en caso "
+#~ "de utilizar IPv6), deberá listar los clientes que se encuentran permitos "
+#~ "a conectarse. El formato a utilizar deberá indicarse con la dirección IP "
+#~ "o bien la dirección de Red.Por ejemplo: (192.168.1.123, 192.168.1.0/24, "
+#~ "2001:660:116::/48 (IPv6))."
+
+#~ msgid ""
+#~ "false = Do not query IPv6; reluctantly = Query both, prefer IPv4; happily "
+#~ "= Query both, prefer IPv6; true = Query only IPv6"
+#~ msgstr ""
+#~ "false = No consulta IPv6, reluctantly = Consulta ambos, preferencia IPv4; "
+#~ "happily = Consulta ambos, preferencia IPv6; true = Consulta sólamente IPv6"
+
+#~ msgid ""
+#~ "false = Never use system DNS resolver; reluctantly = Query DNS directly, "
+#~ "if DNS server is unavailable fail to system DNS resolver; happily = Query "
+#~ "DNS directly, if host could not be found fallback to system DNS resolver; "
+#~ "true = Always use system DNS resolver"
+#~ msgstr ""
+#~ "false = Nunca use el sistema de resolución de DNS, reluctantly = "
+#~ "Consultar DNS directamente, si el servidor DNS no está disponible al "
+#~ "utilizar el sistema de resolución de DNS, hapilly = Consultar DNS "
+#~ "directamente, si el host no se pudo encontrar volver al sistema de "
+#~ "resolución de DNS; true = Siempre use el sistema de resolución de DNS"
+
+#~ msgid "Port on which Polipo will listen. (default value: 8123)"
+#~ msgstr "Puerto de escucha que Polipo utilizará. (valor por defecto: 8123)"
+
+#~ msgid "polipo_pmm_pmmsize_desc"
+#~ msgstr ""
+#~ "Para activar PMM, el tamaño del segmento PMM debe ser establecido a un "
+#~ "valor mayor a 0 (valor positivo)."
diff --git a/po/fr/polipo.po b/po/fr/polipo.po
index 873ec13e4..efa4dbc55 100644
--- a/po/fr/polipo.po
+++ b/po/fr/polipo.po
@@ -12,251 +12,186 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
-#. Polipo
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:1
-msgid "Polipo"
+msgid "Advanced Settings"
 msgstr ""
 
-#. On-Disk Cache
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:2
-msgid "On-Disk Cache"
+msgid "Allowed clients"
 msgstr ""
 
-#. Shared cache
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:3
-msgid "Shared cache"
+msgid "Always use system DNS resolver"
 msgstr ""
 
-#. Enable if cache (proxy) is shared by multiple users.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:4
-msgid "Enable if cache (proxy) is shared by multiple users."
+msgid ""
+"Basic HTTP authentication supported. Provide username and password in "
+"username:password format."
 msgstr ""
 
-#. To enable polipo on-disk cache cleaning (highly recommended), you should add a cron job in Scheduled Tasks services that will execute /usr/sbin/polipo_purge script. For example to perform disk cache cleanup every day at 6:00 in the morning you should add the following line in Scheduled Tasks \"0 6 * * *	/usr/sbin/polipo_purge\" (without quotes).
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:5
-msgid ""
-"To enable polipo on-disk cache cleaning (highly recommended), you should add "
-"a cron job in Scheduled Tasks services that will execute /usr/sbin/"
-"polipo_purge script. For example to perform disk cache cleanup every day at "
-"6:00 in the morning you should add the following line in Scheduled Tasks \"0 "
-"6 * * *\\t/usr/sbin/polipo_purge\" (without quotes)."
+msgid "DNS and Query Settings"
+msgstr ""
+
+msgid "DNS server address"
+msgstr ""
+
+msgid "Delete cache files time"
 msgstr ""
 
-#. Disk cache location
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:6
 msgid "Disk cache location"
 msgstr ""
 
-#. Location where polipo will cache files permanently. Use of external storage devices is recommended, because the cache can grow considerably. Leave it empty to disable on-disk cache.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:7
+msgid "Do not query IPv6"
+msgstr ""
+
+msgid "Enable if cache (proxy) is shared by multiple users."
+msgstr ""
+
+msgid "First PMM segment size (in bytes)"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "How much RAM should Polipo use for its cache."
+msgstr ""
+
+msgid "In RAM cache size (in bytes)"
+msgstr ""
+
+msgid "Listen address"
+msgstr ""
+
+msgid "Listen port"
+msgstr ""
+
 msgid ""
 "Location where polipo will cache files permanently. Use of external storage "
 "devices is recommended, because the cache can grow considerably. Leave it "
 "empty to disable on-disk cache."
 msgstr ""
 
-#. Truncate cache files size (in bytes)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:8
-msgid "Truncate cache files size (in bytes)"
+msgid "Log file location"
 msgstr ""
 
-#. Size to which cached files should be truncated. (default value: 1048576)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:9
-msgid ""
-"Size to which cached files should be truncated. (default value: 1048576)"
+msgid "Log to syslog"
 msgstr ""
 
-#. Truncate cache files time
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:10
-msgid "Truncate cache files time"
+msgid "Logging and RAM"
 msgstr ""
 
-#. Time after which cached files will be truncated. (default value: 4d12h)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:11
-msgid "Time after which cached files will be truncated. (default value: 4d12h)"
+msgid "Never use system DNS resolver"
 msgstr ""
 
-#. Delete cache files time
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:12
-msgid "Delete cache files time"
+msgid "On-Disk Cache"
 msgstr ""
 
-#. Time after which cached files will be deleted. (default value: 32d)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:13
-msgid "Time after which cached files will be deleted. (default value: 32d)"
+msgid "PMM segments size (in bytes)"
 msgstr ""
 
-#. Polipo is a small and fast caching web proxy.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:14
-msgid "Polipo is a small and fast caching web proxy."
+msgid "Parent Proxy"
 msgstr ""
 
-#. General
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:15
-msgid "General"
+msgid "Parent proxy address"
 msgstr ""
 
-#. Allowed clients
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:16
-msgid "Allowed clients"
+msgid ""
+"Parent proxy address (in host:port format), to which Polipo will forward the "
+"requests."
 msgstr ""
 
-#. When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients that are allowed to connect. The format is IP address or network address (192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6)).
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:17
-msgid ""
-"When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients "
-"that are allowed to connect. The format is IP address or network address "
-"(192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))."
+msgid "Parent proxy authentication"
 msgstr ""
 
-#. In RAM cache size (in bytes)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:18
-msgid "In RAM cache size (in bytes)"
+msgid "Polipo"
 msgstr ""
 
-#. How much RAM should Polipo use for its cache.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:19
-msgid "How much RAM should Polipo use for its cache."
+msgid "Polipo is a small and fast caching web proxy."
 msgstr ""
 
-#. DNS server address
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:20
-msgid "DNS server address"
+msgid "Poor Man's Multiplexing"
 msgstr ""
 
-#. Set the DNS server address to use, if you want Polipo to use different DNS server than the host system.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:21
 msgid ""
-"Set the DNS server address to use, if you want Polipo to use different DNS "
-"server than the host system."
+"Poor Man's Multiplexing (PMM) is a technique that simulates multiplexing by "
+"requesting an instance in multiple segments. It tries to lower the latency "
+"caused by the weakness of HTTP protocol. NOTE: some sites may not work with "
+"PMM enabled."
 msgstr ""
 
-#. Query DNS for IPv6
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:22
-msgid "Query DNS for IPv6"
+msgid "Port on which Polipo will listen"
 msgstr ""
 
-#. false = Do not query IPv6; reluctantly = Query both, prefer IPv4; happily = Query both, prefer IPv6; true = Query only IPv6
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:23
-msgid ""
-"false = Do not query IPv6; reluctantly = Query both, prefer IPv4; happily = "
-"Query both, prefer IPv6; true = Query only IPv6"
+msgid "Proxy"
 msgstr ""
 
-#. Query DNS by hostname
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:24
 msgid "Query DNS by hostname"
 msgstr ""
 
-#. false = Never use system DNS resolver; reluctantly = Query DNS directly, if DNS server is unavailable fail to system DNS resolver; happily = Query DNS directly, if host could not be found fallback to system DNS resolver; true = Always use system DNS resolver
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:25
-msgid ""
-"false = Never use system DNS resolver; reluctantly = Query DNS directly, if "
-"DNS server is unavailable fail to system DNS resolver; happily = Query DNS "
-"directly, if host could not be found fallback to system DNS resolver; true = "
-"Always use system DNS resolver"
+msgid "Query DNS directly, fallback to system resolver"
 msgstr ""
 
-#. Syslog facility
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:26
-msgid "Syslog facility"
+msgid "Query DNS directly, for unknown hosts fall back to system resolver"
 msgstr ""
 
-#. Log file location
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:27
-msgid "Log file location"
+msgid "Query DNS for IPv6"
 msgstr ""
 
-#. Use of external storage device is recommended, because the log file is written frequently and can grow considerably.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:28
-msgid ""
-"Use of external storage device is recommended, because the log file is "
-"written frequently and can grow considerably."
+msgid "Query IPv4 and IPv6, prefer IPv4"
 msgstr ""
 
-#. Log to syslog
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:29
-msgid "Log to syslog"
+msgid "Query IPv4 and IPv6, prefer IPv6"
 msgstr ""
 
-#. Parent proxy authentication
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:30
-msgid "Parent proxy authentication"
+msgid "Query only IPv6"
 msgstr ""
 
-#. Basic HTTP authentication supported. Provide username and password in username:password format.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:31
 msgid ""
-"Basic HTTP authentication supported. Provide username and password in "
-"username:password format."
+"Set the DNS server address to use, if you want Polipo to use different DNS "
+"server than the host system."
 msgstr ""
 
-#. Parent proxy address
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:32
-msgid "Parent proxy address"
+msgid "Shared cache"
 msgstr ""
 
-#. Parent proxy address (in host:port format), to which Polipo will forward the requests.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:33
 msgid ""
-"Parent proxy address (in host:port format), to which Polipo will forward the "
-"requests."
+"Size of the first PMM segment. If not defined, it defaults to twice the PMM "
+"segment size."
 msgstr ""
 
-#. Listen address
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:34
-msgid "Listen address"
+msgid "Size to which cached files should be truncated"
+msgstr ""
+
+msgid "Syslog facility"
 msgstr ""
 
-#. The interface on which Polipo will listen. To listen on all interfaces use 0.0.0.0 or :: (IPv6).
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:35
 msgid ""
 "The interface on which Polipo will listen. To listen on all interfaces use "
 "0.0.0.0 or :: (IPv6)."
 msgstr ""
 
-#. Listen port
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:36
-msgid "Listen port"
+msgid "Time after which cached files will be deleted"
 msgstr ""
 
-#. Port on which Polipo will listen. (default value: 8123)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:37
-msgid "Port on which Polipo will listen. (default value: 8123)"
+msgid "Time after which cached files will be truncated"
 msgstr ""
 
-#. Poor Man&#39;s Multiplexing
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:38
-msgid "Poor Man's Multiplexing"
+msgid "To enable PMM, PMM segment size must be set to some positive value."
 msgstr ""
 
-#. Poor Man&#39;s Multiplexing (PMM) is a technique that simulates multiplexing by requesting an instance in multiple segments. It tries to lower the latency caused by the weakness of HTTP protocol. NOTE: some sites may not work with PMM enabled.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:39
-msgid ""
-"Poor Man's Multiplexing (PMM) is a technique that simulates multiplexing by "
-"requesting an instance in multiple segments. It tries to lower the latency "
-"caused by the weakness of HTTP protocol. NOTE: some sites may not work with "
-"PMM enabled."
+msgid "Truncate cache files size (in bytes)"
 msgstr ""
 
-#. First PMM segment size (in bytes)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:40
-msgid "First PMM segment size (in bytes)"
+msgid "Truncate cache files time"
 msgstr ""
 
-#. Size of the first PMM segment. If not defined, it defaults to twice the PMM segment size.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:41
 msgid ""
-"Size of the first PMM segment. If not defined, it defaults to twice the PMM "
-"segment size."
+"Use of external storage device is recommended, because the log file is "
+"written frequently and can grow considerably."
 msgstr ""
 
-#. PMM segments size (in bytes)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:42
-msgid "PMM segments size (in bytes)"
+msgid ""
+"When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients "
+"that are allowed to connect. The format is IP address or network address "
+"(192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))"
 msgstr ""
 
-#. To enable PMM, PMM segment size must be set to some positive value.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:43
-msgid "To enable PMM, PMM segment size must be set to some positive value."
+msgid "enable"
 msgstr ""
diff --git a/po/it/polipo.po b/po/it/polipo.po
index 873ec13e4..efa4dbc55 100644
--- a/po/it/polipo.po
+++ b/po/it/polipo.po
@@ -12,251 +12,186 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
-#. Polipo
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:1
-msgid "Polipo"
+msgid "Advanced Settings"
 msgstr ""
 
-#. On-Disk Cache
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:2
-msgid "On-Disk Cache"
+msgid "Allowed clients"
 msgstr ""
 
-#. Shared cache
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:3
-msgid "Shared cache"
+msgid "Always use system DNS resolver"
 msgstr ""
 
-#. Enable if cache (proxy) is shared by multiple users.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:4
-msgid "Enable if cache (proxy) is shared by multiple users."
+msgid ""
+"Basic HTTP authentication supported. Provide username and password in "
+"username:password format."
 msgstr ""
 
-#. To enable polipo on-disk cache cleaning (highly recommended), you should add a cron job in Scheduled Tasks services that will execute /usr/sbin/polipo_purge script. For example to perform disk cache cleanup every day at 6:00 in the morning you should add the following line in Scheduled Tasks \"0 6 * * *	/usr/sbin/polipo_purge\" (without quotes).
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:5
-msgid ""
-"To enable polipo on-disk cache cleaning (highly recommended), you should add "
-"a cron job in Scheduled Tasks services that will execute /usr/sbin/"
-"polipo_purge script. For example to perform disk cache cleanup every day at "
-"6:00 in the morning you should add the following line in Scheduled Tasks \"0 "
-"6 * * *\\t/usr/sbin/polipo_purge\" (without quotes)."
+msgid "DNS and Query Settings"
+msgstr ""
+
+msgid "DNS server address"
+msgstr ""
+
+msgid "Delete cache files time"
 msgstr ""
 
-#. Disk cache location
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:6
 msgid "Disk cache location"
 msgstr ""
 
-#. Location where polipo will cache files permanently. Use of external storage devices is recommended, because the cache can grow considerably. Leave it empty to disable on-disk cache.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:7
+msgid "Do not query IPv6"
+msgstr ""
+
+msgid "Enable if cache (proxy) is shared by multiple users."
+msgstr ""
+
+msgid "First PMM segment size (in bytes)"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "How much RAM should Polipo use for its cache."
+msgstr ""
+
+msgid "In RAM cache size (in bytes)"
+msgstr ""
+
+msgid "Listen address"
+msgstr ""
+
+msgid "Listen port"
+msgstr ""
+
 msgid ""
 "Location where polipo will cache files permanently. Use of external storage "
 "devices is recommended, because the cache can grow considerably. Leave it "
 "empty to disable on-disk cache."
 msgstr ""
 
-#. Truncate cache files size (in bytes)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:8
-msgid "Truncate cache files size (in bytes)"
+msgid "Log file location"
 msgstr ""
 
-#. Size to which cached files should be truncated. (default value: 1048576)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:9
-msgid ""
-"Size to which cached files should be truncated. (default value: 1048576)"
+msgid "Log to syslog"
 msgstr ""
 
-#. Truncate cache files time
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:10
-msgid "Truncate cache files time"
+msgid "Logging and RAM"
 msgstr ""
 
-#. Time after which cached files will be truncated. (default value: 4d12h)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:11
-msgid "Time after which cached files will be truncated. (default value: 4d12h)"
+msgid "Never use system DNS resolver"
 msgstr ""
 
-#. Delete cache files time
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:12
-msgid "Delete cache files time"
+msgid "On-Disk Cache"
 msgstr ""
 
-#. Time after which cached files will be deleted. (default value: 32d)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:13
-msgid "Time after which cached files will be deleted. (default value: 32d)"
+msgid "PMM segments size (in bytes)"
 msgstr ""
 
-#. Polipo is a small and fast caching web proxy.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:14
-msgid "Polipo is a small and fast caching web proxy."
+msgid "Parent Proxy"
 msgstr ""
 
-#. General
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:15
-msgid "General"
+msgid "Parent proxy address"
 msgstr ""
 
-#. Allowed clients
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:16
-msgid "Allowed clients"
+msgid ""
+"Parent proxy address (in host:port format), to which Polipo will forward the "
+"requests."
 msgstr ""
 
-#. When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients that are allowed to connect. The format is IP address or network address (192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6)).
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:17
-msgid ""
-"When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients "
-"that are allowed to connect. The format is IP address or network address "
-"(192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))."
+msgid "Parent proxy authentication"
 msgstr ""
 
-#. In RAM cache size (in bytes)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:18
-msgid "In RAM cache size (in bytes)"
+msgid "Polipo"
 msgstr ""
 
-#. How much RAM should Polipo use for its cache.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:19
-msgid "How much RAM should Polipo use for its cache."
+msgid "Polipo is a small and fast caching web proxy."
 msgstr ""
 
-#. DNS server address
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:20
-msgid "DNS server address"
+msgid "Poor Man's Multiplexing"
 msgstr ""
 
-#. Set the DNS server address to use, if you want Polipo to use different DNS server than the host system.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:21
 msgid ""
-"Set the DNS server address to use, if you want Polipo to use different DNS "
-"server than the host system."
+"Poor Man's Multiplexing (PMM) is a technique that simulates multiplexing by "
+"requesting an instance in multiple segments. It tries to lower the latency "
+"caused by the weakness of HTTP protocol. NOTE: some sites may not work with "
+"PMM enabled."
 msgstr ""
 
-#. Query DNS for IPv6
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:22
-msgid "Query DNS for IPv6"
+msgid "Port on which Polipo will listen"
 msgstr ""
 
-#. false = Do not query IPv6; reluctantly = Query both, prefer IPv4; happily = Query both, prefer IPv6; true = Query only IPv6
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:23
-msgid ""
-"false = Do not query IPv6; reluctantly = Query both, prefer IPv4; happily = "
-"Query both, prefer IPv6; true = Query only IPv6"
+msgid "Proxy"
 msgstr ""
 
-#. Query DNS by hostname
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:24
 msgid "Query DNS by hostname"
 msgstr ""
 
-#. false = Never use system DNS resolver; reluctantly = Query DNS directly, if DNS server is unavailable fail to system DNS resolver; happily = Query DNS directly, if host could not be found fallback to system DNS resolver; true = Always use system DNS resolver
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:25
-msgid ""
-"false = Never use system DNS resolver; reluctantly = Query DNS directly, if "
-"DNS server is unavailable fail to system DNS resolver; happily = Query DNS "
-"directly, if host could not be found fallback to system DNS resolver; true = "
-"Always use system DNS resolver"
+msgid "Query DNS directly, fallback to system resolver"
 msgstr ""
 
-#. Syslog facility
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:26
-msgid "Syslog facility"
+msgid "Query DNS directly, for unknown hosts fall back to system resolver"
 msgstr ""
 
-#. Log file location
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:27
-msgid "Log file location"
+msgid "Query DNS for IPv6"
 msgstr ""
 
-#. Use of external storage device is recommended, because the log file is written frequently and can grow considerably.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:28
-msgid ""
-"Use of external storage device is recommended, because the log file is "
-"written frequently and can grow considerably."
+msgid "Query IPv4 and IPv6, prefer IPv4"
 msgstr ""
 
-#. Log to syslog
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:29
-msgid "Log to syslog"
+msgid "Query IPv4 and IPv6, prefer IPv6"
 msgstr ""
 
-#. Parent proxy authentication
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:30
-msgid "Parent proxy authentication"
+msgid "Query only IPv6"
 msgstr ""
 
-#. Basic HTTP authentication supported. Provide username and password in username:password format.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:31
 msgid ""
-"Basic HTTP authentication supported. Provide username and password in "
-"username:password format."
+"Set the DNS server address to use, if you want Polipo to use different DNS "
+"server than the host system."
 msgstr ""
 
-#. Parent proxy address
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:32
-msgid "Parent proxy address"
+msgid "Shared cache"
 msgstr ""
 
-#. Parent proxy address (in host:port format), to which Polipo will forward the requests.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:33
 msgid ""
-"Parent proxy address (in host:port format), to which Polipo will forward the "
-"requests."
+"Size of the first PMM segment. If not defined, it defaults to twice the PMM "
+"segment size."
 msgstr ""
 
-#. Listen address
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:34
-msgid "Listen address"
+msgid "Size to which cached files should be truncated"
+msgstr ""
+
+msgid "Syslog facility"
 msgstr ""
 
-#. The interface on which Polipo will listen. To listen on all interfaces use 0.0.0.0 or :: (IPv6).
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:35
 msgid ""
 "The interface on which Polipo will listen. To listen on all interfaces use "
 "0.0.0.0 or :: (IPv6)."
 msgstr ""
 
-#. Listen port
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:36
-msgid "Listen port"
+msgid "Time after which cached files will be deleted"
 msgstr ""
 
-#. Port on which Polipo will listen. (default value: 8123)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:37
-msgid "Port on which Polipo will listen. (default value: 8123)"
+msgid "Time after which cached files will be truncated"
 msgstr ""
 
-#. Poor Man&#39;s Multiplexing
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:38
-msgid "Poor Man's Multiplexing"
+msgid "To enable PMM, PMM segment size must be set to some positive value."
 msgstr ""
 
-#. Poor Man&#39;s Multiplexing (PMM) is a technique that simulates multiplexing by requesting an instance in multiple segments. It tries to lower the latency caused by the weakness of HTTP protocol. NOTE: some sites may not work with PMM enabled.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:39
-msgid ""
-"Poor Man's Multiplexing (PMM) is a technique that simulates multiplexing by "
-"requesting an instance in multiple segments. It tries to lower the latency "
-"caused by the weakness of HTTP protocol. NOTE: some sites may not work with "
-"PMM enabled."
+msgid "Truncate cache files size (in bytes)"
 msgstr ""
 
-#. First PMM segment size (in bytes)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:40
-msgid "First PMM segment size (in bytes)"
+msgid "Truncate cache files time"
 msgstr ""
 
-#. Size of the first PMM segment. If not defined, it defaults to twice the PMM segment size.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:41
 msgid ""
-"Size of the first PMM segment. If not defined, it defaults to twice the PMM "
-"segment size."
+"Use of external storage device is recommended, because the log file is "
+"written frequently and can grow considerably."
 msgstr ""
 
-#. PMM segments size (in bytes)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:42
-msgid "PMM segments size (in bytes)"
+msgid ""
+"When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients "
+"that are allowed to connect. The format is IP address or network address "
+"(192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))"
 msgstr ""
 
-#. To enable PMM, PMM segment size must be set to some positive value.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:43
-msgid "To enable PMM, PMM segment size must be set to some positive value."
+msgid "enable"
 msgstr ""
diff --git a/po/ja/polipo.po b/po/ja/polipo.po
index 873ec13e4..efa4dbc55 100644
--- a/po/ja/polipo.po
+++ b/po/ja/polipo.po
@@ -12,251 +12,186 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
-#. Polipo
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:1
-msgid "Polipo"
+msgid "Advanced Settings"
 msgstr ""
 
-#. On-Disk Cache
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:2
-msgid "On-Disk Cache"
+msgid "Allowed clients"
 msgstr ""
 
-#. Shared cache
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:3
-msgid "Shared cache"
+msgid "Always use system DNS resolver"
 msgstr ""
 
-#. Enable if cache (proxy) is shared by multiple users.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:4
-msgid "Enable if cache (proxy) is shared by multiple users."
+msgid ""
+"Basic HTTP authentication supported. Provide username and password in "
+"username:password format."
 msgstr ""
 
-#. To enable polipo on-disk cache cleaning (highly recommended), you should add a cron job in Scheduled Tasks services that will execute /usr/sbin/polipo_purge script. For example to perform disk cache cleanup every day at 6:00 in the morning you should add the following line in Scheduled Tasks \"0 6 * * *	/usr/sbin/polipo_purge\" (without quotes).
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:5
-msgid ""
-"To enable polipo on-disk cache cleaning (highly recommended), you should add "
-"a cron job in Scheduled Tasks services that will execute /usr/sbin/"
-"polipo_purge script. For example to perform disk cache cleanup every day at "
-"6:00 in the morning you should add the following line in Scheduled Tasks \"0 "
-"6 * * *\\t/usr/sbin/polipo_purge\" (without quotes)."
+msgid "DNS and Query Settings"
+msgstr ""
+
+msgid "DNS server address"
+msgstr ""
+
+msgid "Delete cache files time"
 msgstr ""
 
-#. Disk cache location
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:6
 msgid "Disk cache location"
 msgstr ""
 
-#. Location where polipo will cache files permanently. Use of external storage devices is recommended, because the cache can grow considerably. Leave it empty to disable on-disk cache.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:7
+msgid "Do not query IPv6"
+msgstr ""
+
+msgid "Enable if cache (proxy) is shared by multiple users."
+msgstr ""
+
+msgid "First PMM segment size (in bytes)"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "How much RAM should Polipo use for its cache."
+msgstr ""
+
+msgid "In RAM cache size (in bytes)"
+msgstr ""
+
+msgid "Listen address"
+msgstr ""
+
+msgid "Listen port"
+msgstr ""
+
 msgid ""
 "Location where polipo will cache files permanently. Use of external storage "
 "devices is recommended, because the cache can grow considerably. Leave it "
 "empty to disable on-disk cache."
 msgstr ""
 
-#. Truncate cache files size (in bytes)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:8
-msgid "Truncate cache files size (in bytes)"
+msgid "Log file location"
 msgstr ""
 
-#. Size to which cached files should be truncated. (default value: 1048576)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:9
-msgid ""
-"Size to which cached files should be truncated. (default value: 1048576)"
+msgid "Log to syslog"
 msgstr ""
 
-#. Truncate cache files time
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:10
-msgid "Truncate cache files time"
+msgid "Logging and RAM"
 msgstr ""
 
-#. Time after which cached files will be truncated. (default value: 4d12h)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:11
-msgid "Time after which cached files will be truncated. (default value: 4d12h)"
+msgid "Never use system DNS resolver"
 msgstr ""
 
-#. Delete cache files time
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:12
-msgid "Delete cache files time"
+msgid "On-Disk Cache"
 msgstr ""
 
-#. Time after which cached files will be deleted. (default value: 32d)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:13
-msgid "Time after which cached files will be deleted. (default value: 32d)"
+msgid "PMM segments size (in bytes)"
 msgstr ""
 
-#. Polipo is a small and fast caching web proxy.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:14
-msgid "Polipo is a small and fast caching web proxy."
+msgid "Parent Proxy"
 msgstr ""
 
-#. General
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:15
-msgid "General"
+msgid "Parent proxy address"
 msgstr ""
 
-#. Allowed clients
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:16
-msgid "Allowed clients"
+msgid ""
+"Parent proxy address (in host:port format), to which Polipo will forward the "
+"requests."
 msgstr ""
 
-#. When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients that are allowed to connect. The format is IP address or network address (192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6)).
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:17
-msgid ""
-"When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients "
-"that are allowed to connect. The format is IP address or network address "
-"(192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))."
+msgid "Parent proxy authentication"
 msgstr ""
 
-#. In RAM cache size (in bytes)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:18
-msgid "In RAM cache size (in bytes)"
+msgid "Polipo"
 msgstr ""
 
-#. How much RAM should Polipo use for its cache.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:19
-msgid "How much RAM should Polipo use for its cache."
+msgid "Polipo is a small and fast caching web proxy."
 msgstr ""
 
-#. DNS server address
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:20
-msgid "DNS server address"
+msgid "Poor Man's Multiplexing"
 msgstr ""
 
-#. Set the DNS server address to use, if you want Polipo to use different DNS server than the host system.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:21
 msgid ""
-"Set the DNS server address to use, if you want Polipo to use different DNS "
-"server than the host system."
+"Poor Man's Multiplexing (PMM) is a technique that simulates multiplexing by "
+"requesting an instance in multiple segments. It tries to lower the latency "
+"caused by the weakness of HTTP protocol. NOTE: some sites may not work with "
+"PMM enabled."
 msgstr ""
 
-#. Query DNS for IPv6
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:22
-msgid "Query DNS for IPv6"
+msgid "Port on which Polipo will listen"
 msgstr ""
 
-#. false = Do not query IPv6; reluctantly = Query both, prefer IPv4; happily = Query both, prefer IPv6; true = Query only IPv6
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:23
-msgid ""
-"false = Do not query IPv6; reluctantly = Query both, prefer IPv4; happily = "
-"Query both, prefer IPv6; true = Query only IPv6"
+msgid "Proxy"
 msgstr ""
 
-#. Query DNS by hostname
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:24
 msgid "Query DNS by hostname"
 msgstr ""
 
-#. false = Never use system DNS resolver; reluctantly = Query DNS directly, if DNS server is unavailable fail to system DNS resolver; happily = Query DNS directly, if host could not be found fallback to system DNS resolver; true = Always use system DNS resolver
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:25
-msgid ""
-"false = Never use system DNS resolver; reluctantly = Query DNS directly, if "
-"DNS server is unavailable fail to system DNS resolver; happily = Query DNS "
-"directly, if host could not be found fallback to system DNS resolver; true = "
-"Always use system DNS resolver"
+msgid "Query DNS directly, fallback to system resolver"
 msgstr ""
 
-#. Syslog facility
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:26
-msgid "Syslog facility"
+msgid "Query DNS directly, for unknown hosts fall back to system resolver"
 msgstr ""
 
-#. Log file location
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:27
-msgid "Log file location"
+msgid "Query DNS for IPv6"
 msgstr ""
 
-#. Use of external storage device is recommended, because the log file is written frequently and can grow considerably.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:28
-msgid ""
-"Use of external storage device is recommended, because the log file is "
-"written frequently and can grow considerably."
+msgid "Query IPv4 and IPv6, prefer IPv4"
 msgstr ""
 
-#. Log to syslog
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:29
-msgid "Log to syslog"
+msgid "Query IPv4 and IPv6, prefer IPv6"
 msgstr ""
 
-#. Parent proxy authentication
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:30
-msgid "Parent proxy authentication"
+msgid "Query only IPv6"
 msgstr ""
 
-#. Basic HTTP authentication supported. Provide username and password in username:password format.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:31
 msgid ""
-"Basic HTTP authentication supported. Provide username and password in "
-"username:password format."
+"Set the DNS server address to use, if you want Polipo to use different DNS "
+"server than the host system."
 msgstr ""
 
-#. Parent proxy address
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:32
-msgid "Parent proxy address"
+msgid "Shared cache"
 msgstr ""
 
-#. Parent proxy address (in host:port format), to which Polipo will forward the requests.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:33
 msgid ""
-"Parent proxy address (in host:port format), to which Polipo will forward the "
-"requests."
+"Size of the first PMM segment. If not defined, it defaults to twice the PMM "
+"segment size."
 msgstr ""
 
-#. Listen address
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:34
-msgid "Listen address"
+msgid "Size to which cached files should be truncated"
+msgstr ""
+
+msgid "Syslog facility"
 msgstr ""
 
-#. The interface on which Polipo will listen. To listen on all interfaces use 0.0.0.0 or :: (IPv6).
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:35
 msgid ""
 "The interface on which Polipo will listen. To listen on all interfaces use "
 "0.0.0.0 or :: (IPv6)."
 msgstr ""
 
-#. Listen port
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:36
-msgid "Listen port"
+msgid "Time after which cached files will be deleted"
 msgstr ""
 
-#. Port on which Polipo will listen. (default value: 8123)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:37
-msgid "Port on which Polipo will listen. (default value: 8123)"
+msgid "Time after which cached files will be truncated"
 msgstr ""
 
-#. Poor Man&#39;s Multiplexing
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:38
-msgid "Poor Man's Multiplexing"
+msgid "To enable PMM, PMM segment size must be set to some positive value."
 msgstr ""
 
-#. Poor Man&#39;s Multiplexing (PMM) is a technique that simulates multiplexing by requesting an instance in multiple segments. It tries to lower the latency caused by the weakness of HTTP protocol. NOTE: some sites may not work with PMM enabled.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:39
-msgid ""
-"Poor Man's Multiplexing (PMM) is a technique that simulates multiplexing by "
-"requesting an instance in multiple segments. It tries to lower the latency "
-"caused by the weakness of HTTP protocol. NOTE: some sites may not work with "
-"PMM enabled."
+msgid "Truncate cache files size (in bytes)"
 msgstr ""
 
-#. First PMM segment size (in bytes)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:40
-msgid "First PMM segment size (in bytes)"
+msgid "Truncate cache files time"
 msgstr ""
 
-#. Size of the first PMM segment. If not defined, it defaults to twice the PMM segment size.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:41
 msgid ""
-"Size of the first PMM segment. If not defined, it defaults to twice the PMM "
-"segment size."
+"Use of external storage device is recommended, because the log file is "
+"written frequently and can grow considerably."
 msgstr ""
 
-#. PMM segments size (in bytes)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:42
-msgid "PMM segments size (in bytes)"
+msgid ""
+"When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients "
+"that are allowed to connect. The format is IP address or network address "
+"(192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))"
 msgstr ""
 
-#. To enable PMM, PMM segment size must be set to some positive value.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:43
-msgid "To enable PMM, PMM segment size must be set to some positive value."
+msgid "enable"
 msgstr ""
diff --git a/po/pt/polipo.po b/po/pt/polipo.po
index de71af8ae..be0245851 100644
--- a/po/pt/polipo.po
+++ b/po/pt/polipo.po
@@ -11,48 +11,58 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0\n"
 
-#. Polipo
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:1
-msgid "Polipo"
-msgstr "Polipo"
-
-#. On-Disk Cache
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:2
-msgid "On-Disk Cache"
-msgstr "Cache em disco"
+msgid "Advanced Settings"
+msgstr ""
 
-#. Shared cache
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:3
-msgid "Shared cache"
-msgstr "Cache partilhada"
+msgid "Allowed clients"
+msgstr "Clientes permitidos"
 
-#. Enable if cache (proxy) is shared by multiple users.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:4
-msgid "Enable if cache (proxy) is shared by multiple users."
-msgstr "Activar se a cache (proxy) for partilhada por multiplos utilizadores."
+msgid "Always use system DNS resolver"
+msgstr ""
 
-#. To enable polipo on-disk cache cleaning (highly recommended), you should add a cron job in Scheduled Tasks services that will execute /usr/sbin/polipo_purge script. For example to perform disk cache cleanup every day at 6:00 in the morning you should add the following line in Scheduled Tasks \"0 6 * * *	/usr/sbin/polipo_purge\" (without quotes).
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:5
 msgid ""
-"To enable polipo on-disk cache cleaning (highly recommended), you should add "
-"a cron job in Scheduled Tasks services that will execute /usr/sbin/"
-"polipo_purge script. For example to perform disk cache cleanup every day at "
-"6:00 in the morning you should add the following line in Scheduled Tasks \"0 "
-"6 * * *\\t/usr/sbin/polipo_purge\" (without quotes)."
+"Basic HTTP authentication supported. Provide username and password in "
+"username:password format."
+msgstr ""
+"É suportada a autenticação basica HTTP. Indique username e password no "
+"formato username:password."
+
+msgid "DNS and Query Settings"
 msgstr ""
-"Para activar a limpeza de cache em disco (altamente recomendado), deve "
-"acrescentar uma tarefa cron (\"Serviços\") que execute o script /usr/sbin/"
-"polipo_purge. Como exemplo, para executar uma limpeza da cache diariamente "
-"pelas 06H00 deve acrescentar a seguinte linha: \"0 6 * * * /usr/sbin/"
-"polipo_purge\" (sem as aspas)."
-
-#. Disk cache location
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:6
+
+msgid "DNS server address"
+msgstr "Endereço do servidor DNS"
+
+msgid "Delete cache files time"
+msgstr "Tempo para remoção dos ficheiros de cache"
+
 msgid "Disk cache location"
 msgstr "Localização da cache em disco"
 
-#. Location where polipo will cache files permanently. Use of external storage devices is recommended, because the cache can grow considerably. Leave it empty to disable on-disk cache.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:7
+msgid "Do not query IPv6"
+msgstr ""
+
+msgid "Enable if cache (proxy) is shared by multiple users."
+msgstr "Activar se a cache (proxy) for partilhada por multiplos utilizadores."
+
+msgid "First PMM segment size (in bytes)"
+msgstr "Tamanho do primeiro segmento PMM (em bytes)"
+
+msgid "General Settings"
+msgstr ""
+
+msgid "How much RAM should Polipo use for its cache."
+msgstr "Quanta memória RAM deverá ser usada pelo polipo para a sua cache."
+
+msgid "In RAM cache size (in bytes)"
+msgstr "Tamanho da cache em RAM (bytes)"
+
+msgid "Listen address"
+msgstr "Endereço local"
+
+msgid "Listen port"
+msgstr "Porta local"
+
 msgid ""
 "Location where polipo will cache files permanently. Use of external storage "
 "devices is recommended, because the cache can grow considerably. Leave it "
@@ -63,184 +73,110 @@ msgstr ""
 "grande crescimento da cache. Deixe em branco para desactivar a cache em "
 "disco."
 
-#. Truncate cache files size (in bytes)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:8
-msgid "Truncate cache files size (in bytes)"
-msgstr "Tamanho de trancagem dos ficheiros de cache (bytes)"
-
-#. Size to which cached files should be truncated. (default value: 1048576)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:9
-msgid ""
-"Size to which cached files should be truncated. (default value: 1048576)"
-msgstr ""
-"Tamanho com o qual devem ser trancados os ficheiros da cache. (valor pre-"
-"definido: 1048576)"
+msgid "Log file location"
+msgstr "Localização do ficheiro de registo"
 
-#. Truncate cache files time
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:10
-msgid "Truncate cache files time"
-msgstr "Tempo de trancagem dos ficheiros de cache"
+msgid "Log to syslog"
+msgstr "Registar para o syslog"
 
-#. Time after which cached files will be truncated. (default value: 4d12h)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:11
-msgid "Time after which cached files will be truncated. (default value: 4d12h)"
+msgid "Logging and RAM"
 msgstr ""
-"Tempo após o qual os ficheiros de cache serão trancados. (valor pre-"
-"definido: 4d12h)"
-
-#. Delete cache files time
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:12
-msgid "Delete cache files time"
-msgstr "Tempo para remoção dos ficheiros de cache"
 
-#. Time after which cached files will be deleted. (default value: 32d)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:13
-msgid "Time after which cached files will be deleted. (default value: 32d)"
+msgid "Never use system DNS resolver"
 msgstr ""
-"Tempo apos o qual os ficheiros de cache serão removidos. (valor pré-"
-"definido: 32d)"
 
-#. Polipo is a small and fast caching web proxy.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:14
-msgid "Polipo is a small and fast caching web proxy."
-msgstr "O polipo é um proxy web ligeiro e rápido."
+msgid "On-Disk Cache"
+msgstr "Cache em disco"
+
+msgid "PMM segments size (in bytes)"
+msgstr "Tamanho do segmento PMM (em bytes)"
 
-#. General
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:15
-msgid "General"
-msgstr "Geral"
+msgid "Parent Proxy"
+msgstr ""
 
-#. Allowed clients
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:16
-msgid "Allowed clients"
-msgstr "Clientes permitidos"
+msgid "Parent proxy address"
+msgstr "Endereço do proxy de hierarquia superior."
 
-#. When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients that are allowed to connect. The format is IP address or network address (192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6)).
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:17
 msgid ""
-"When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients "
-"that are allowed to connect. The format is IP address or network address "
-"(192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))."
+"Parent proxy address (in host:port format), to which Polipo will forward the "
+"requests."
 msgstr ""
-"Quando o endereço de listen fôr 0.0.0.0 (IPv4) ou :: (IPv6), deve listar os "
-"clientes que tiverem permissão para ligação. O formato é endereço de host ou "
-"endereço de rede (192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))."
+"Endereço do proxy de hierarquia superior (no formato host:porta), ao qual o "
+"polipo irá encaminhar os seus pedidos."
 
-#. In RAM cache size (in bytes)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:18
-msgid "In RAM cache size (in bytes)"
-msgstr "Tamanho da cache em RAM (bytes)"
+msgid "Parent proxy authentication"
+msgstr "Autenticação em cache de hierarquia superior"
 
-#. How much RAM should Polipo use for its cache.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:19
-msgid "How much RAM should Polipo use for its cache."
-msgstr "Quanta memória RAM deverá ser usada pelo polipo para a sua cache."
+msgid "Polipo"
+msgstr "Polipo"
 
-#. DNS server address
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:20
-msgid "DNS server address"
-msgstr "Endereço do servidor DNS"
+msgid "Polipo is a small and fast caching web proxy."
+msgstr "O polipo é um proxy web ligeiro e rápido."
+
+msgid "Poor Man's Multiplexing"
+msgstr "Multiplexagem simples"
 
-#. Set the DNS server address to use, if you want Polipo to use different DNS server than the host system.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:21
 msgid ""
-"Set the DNS server address to use, if you want Polipo to use different DNS "
-"server than the host system."
+"Poor Man's Multiplexing (PMM) is a technique that simulates multiplexing by "
+"requesting an instance in multiple segments. It tries to lower the latency "
+"caused by the weakness of HTTP protocol. NOTE: some sites may not work with "
+"PMM enabled."
 msgstr ""
-"Define o endereço do servidor de DNS a usar, caso pretenda que o polipo "
-"utilize um servidor alternativo ao do sistema."
+"A multiplexagem simples (PMM) consiste na simulação de multiplexagem através "
+"da requesição de um pedido em multiplos segmentos. O método tenta baixar a "
+"latencia causada pela debilidade do protocolo HTTP. Nota: alguns sites web "
+"não funcionam com a activação de PMM."
 
-#. Query DNS for IPv6
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:22
-msgid "Query DNS for IPv6"
-msgstr "Pedidos IPv6 ao DNS"
+msgid "Port on which Polipo will listen"
+msgstr ""
 
-#. false = Do not query IPv6; reluctantly = Query both, prefer IPv4; happily = Query both, prefer IPv6; true = Query only IPv6
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:23
-msgid ""
-"false = Do not query IPv6; reluctantly = Query both, prefer IPv4; happily = "
-"Query both, prefer IPv6; true = Query only IPv6"
+msgid "Proxy"
 msgstr ""
-"false = Não pedir IPv6; reluctantly=Pedir ambos e preferir IPv4; "
-"happily=Pedir ambos, preferir IPv6; true=Pedir apenas IPv6"
 
-#. Query DNS by hostname
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:24
 msgid "Query DNS by hostname"
 msgstr "Pedidos ao DNS através de hostname"
 
-#. false = Never use system DNS resolver; reluctantly = Query DNS directly, if DNS server is unavailable fail to system DNS resolver; happily = Query DNS directly, if host could not be found fallback to system DNS resolver; true = Always use system DNS resolver
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:25
-msgid ""
-"false = Never use system DNS resolver; reluctantly = Query DNS directly, if "
-"DNS server is unavailable fail to system DNS resolver; happily = Query DNS "
-"directly, if host could not be found fallback to system DNS resolver; true = "
-"Always use system DNS resolver"
+msgid "Query DNS directly, fallback to system resolver"
 msgstr ""
-"false=nunca usar o resolver do sistema; reluctantly=pedir DNS directamente, "
-"se o servidor DNS estiver indisponivel recorrer do resolver DNS do sistema; "
-"happily=pedir DNS directamente, se o host nao for encontrado, recorrer ao "
-"resolver DNS do sistema; true=Usar sempre o resolver DNS do sistema"
 
-#. Syslog facility
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:26
-msgid "Syslog facility"
-msgstr "Categoria dos eventos polipo no registo do sistema"
+msgid "Query DNS directly, for unknown hosts fall back to system resolver"
+msgstr ""
 
-#. Log file location
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:27
-msgid "Log file location"
-msgstr "Localização do ficheiro de registo"
+msgid "Query DNS for IPv6"
+msgstr "Pedidos IPv6 ao DNS"
 
-#. Use of external storage device is recommended, because the log file is written frequently and can grow considerably.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:28
-msgid ""
-"Use of external storage device is recommended, because the log file is "
-"written frequently and can grow considerably."
+msgid "Query IPv4 and IPv6, prefer IPv4"
 msgstr ""
-"É recomendado o recurso a sistemas de armazenamento de ficheiros externos, "
-"devido ao rápido crescimento do ficheiro de registo."
 
-#. Log to syslog
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:29
-msgid "Log to syslog"
-msgstr "Registar para o syslog"
+msgid "Query IPv4 and IPv6, prefer IPv6"
+msgstr ""
 
-#. Parent proxy authentication
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:30
-msgid "Parent proxy authentication"
-msgstr "Autenticação em cache de hierarquia superior"
+msgid "Query only IPv6"
+msgstr ""
 
-#. Basic HTTP authentication supported. Provide username and password in username:password format.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:31
 msgid ""
-"Basic HTTP authentication supported. Provide username and password in "
-"username:password format."
+"Set the DNS server address to use, if you want Polipo to use different DNS "
+"server than the host system."
 msgstr ""
-"É suportada a autenticação basica HTTP. Indique username e password no "
-"formato username:password."
+"Define o endereço do servidor de DNS a usar, caso pretenda que o polipo "
+"utilize um servidor alternativo ao do sistema."
 
-#. Parent proxy address
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:32
-msgid "Parent proxy address"
-msgstr "Endereço do proxy de hierarquia superior."
+msgid "Shared cache"
+msgstr "Cache partilhada"
 
-#. Parent proxy address (in host:port format), to which Polipo will forward the requests.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:33
 msgid ""
-"Parent proxy address (in host:port format), to which Polipo will forward the "
-"requests."
+"Size of the first PMM segment. If not defined, it defaults to twice the PMM "
+"segment size."
 msgstr ""
-"Endereço do proxy de hierarquia superior (no formato host:porta), ao qual o "
-"polipo irá encaminhar os seus pedidos."
+"Tamanho do primeiro segmento PMM. Se não estiver definido, reverte para o "
+"dobro do tamanho do segmento PMM."
 
-#. Listen address
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:34
-msgid "Listen address"
-msgstr "Endereço local"
+msgid "Size to which cached files should be truncated"
+msgstr ""
+
+msgid "Syslog facility"
+msgstr "Categoria dos eventos polipo no registo do sistema"
 
-#. The interface on which Polipo will listen. To listen on all interfaces use 0.0.0.0 or :: (IPv6).
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:35
 msgid ""
 "The interface on which Polipo will listen. To listen on all interfaces use "
 "0.0.0.0 or :: (IPv6)."
@@ -248,56 +184,103 @@ msgstr ""
 "O interface no qual o polipo será activado. Para activar em todos os "
 "endereços, use 0.0.0.0 ou :: (IPv6)."
 
-#. Listen port
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:36
-msgid "Listen port"
-msgstr "Porta local"
-
-#. Port on which Polipo will listen. (default value: 8123)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:37
-msgid "Port on which Polipo will listen. (default value: 8123)"
-msgstr "Porta local na qual o polipo será activado. (pre-definido: 8123)"
+msgid "Time after which cached files will be deleted"
+msgstr ""
 
-#. Poor Man&#39;s Multiplexing
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:38
-msgid "Poor Man's Multiplexing"
-msgstr "Multiplexagem simples"
+msgid "Time after which cached files will be truncated"
+msgstr ""
 
-#. Poor Man&#39;s Multiplexing (PMM) is a technique that simulates multiplexing by requesting an instance in multiple segments. It tries to lower the latency caused by the weakness of HTTP protocol. NOTE: some sites may not work with PMM enabled.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:39
-msgid ""
-"Poor Man's Multiplexing (PMM) is a technique that simulates multiplexing by "
-"requesting an instance in multiple segments. It tries to lower the latency "
-"caused by the weakness of HTTP protocol. NOTE: some sites may not work with "
-"PMM enabled."
+msgid "To enable PMM, PMM segment size must be set to some positive value."
 msgstr ""
-"A multiplexagem simples (PMM) consiste na simulação de multiplexagem através "
-"da requesição de um pedido em multiplos segmentos. O método tenta baixar a "
-"latencia causada pela debilidade do protocolo HTTP. Nota: alguns sites web "
-"não funcionam com a activação de PMM."
 
-#. First PMM segment size (in bytes)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:40
-msgid "First PMM segment size (in bytes)"
-msgstr "Tamanho do primeiro segmento PMM (em bytes)"
+msgid "Truncate cache files size (in bytes)"
+msgstr "Tamanho de trancagem dos ficheiros de cache (bytes)"
+
+msgid "Truncate cache files time"
+msgstr "Tempo de trancagem dos ficheiros de cache"
 
-#. Size of the first PMM segment. If not defined, it defaults to twice the PMM segment size.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:41
 msgid ""
-"Size of the first PMM segment. If not defined, it defaults to twice the PMM "
-"segment size."
+"Use of external storage device is recommended, because the log file is "
+"written frequently and can grow considerably."
 msgstr ""
-"Tamanho do primeiro segmento PMM. Se não estiver definido, reverte para o "
-"dobro do tamanho do segmento PMM."
+"É recomendado o recurso a sistemas de armazenamento de ficheiros externos, "
+"devido ao rápido crescimento do ficheiro de registo."
 
-#. PMM segments size (in bytes)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:42
-msgid "PMM segments size (in bytes)"
-msgstr "Tamanho do segmento PMM (em bytes)"
+msgid ""
+"When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients "
+"that are allowed to connect. The format is IP address or network address "
+"(192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))"
+msgstr ""
 
-#. To enable PMM, PMM segment size must be set to some positive value.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:43
-msgid "polipo_pmm_pmmsize_desc"
+msgid "enable"
 msgstr ""
-"Para activar PMM, o tamanho do segmento PMM deve ser definido para um "
-"qualquer valor positivo."
+
+#~ msgid ""
+#~ "To enable polipo on-disk cache cleaning (highly recommended), you should "
+#~ "add a cron job in Scheduled Tasks services that will execute /usr/sbin/"
+#~ "polipo_purge script. For example to perform disk cache cleanup every day "
+#~ "at 6:00 in the morning you should add the following line in Scheduled "
+#~ "Tasks \"0 6 * * *\\t/usr/sbin/polipo_purge\" (without quotes)."
+#~ msgstr ""
+#~ "Para activar a limpeza de cache em disco (altamente recomendado), deve "
+#~ "acrescentar uma tarefa cron (\"Serviços\") que execute o script /usr/sbin/"
+#~ "polipo_purge. Como exemplo, para executar uma limpeza da cache "
+#~ "diariamente pelas 06H00 deve acrescentar a seguinte linha: \"0 6 * * * /"
+#~ "usr/sbin/polipo_purge\" (sem as aspas)."
+
+#~ msgid ""
+#~ "Size to which cached files should be truncated. (default value: 1048576)"
+#~ msgstr ""
+#~ "Tamanho com o qual devem ser trancados os ficheiros da cache. (valor pre-"
+#~ "definido: 1048576)"
+
+#~ msgid ""
+#~ "Time after which cached files will be truncated. (default value: 4d12h)"
+#~ msgstr ""
+#~ "Tempo após o qual os ficheiros de cache serão trancados. (valor pre-"
+#~ "definido: 4d12h)"
+
+#~ msgid "Time after which cached files will be deleted. (default value: 32d)"
+#~ msgstr ""
+#~ "Tempo apos o qual os ficheiros de cache serão removidos. (valor pré-"
+#~ "definido: 32d)"
+
+#~ msgid "General"
+#~ msgstr "Geral"
+
+#~ msgid ""
+#~ "When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients "
+#~ "that are allowed to connect. The format is IP address or network address "
+#~ "(192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))."
+#~ msgstr ""
+#~ "Quando o endereço de listen fôr 0.0.0.0 (IPv4) ou :: (IPv6), deve listar "
+#~ "os clientes que tiverem permissão para ligação. O formato é endereço de "
+#~ "host ou endereço de rede (192.168.1.123, 192.168.1.0/24, "
+#~ "2001:660:116::/48 (IPv6))."
+
+#~ msgid ""
+#~ "false = Do not query IPv6; reluctantly = Query both, prefer IPv4; happily "
+#~ "= Query both, prefer IPv6; true = Query only IPv6"
+#~ msgstr ""
+#~ "false = Não pedir IPv6; reluctantly=Pedir ambos e preferir IPv4; "
+#~ "happily=Pedir ambos, preferir IPv6; true=Pedir apenas IPv6"
+
+#~ msgid ""
+#~ "false = Never use system DNS resolver; reluctantly = Query DNS directly, "
+#~ "if DNS server is unavailable fail to system DNS resolver; happily = Query "
+#~ "DNS directly, if host could not be found fallback to system DNS resolver; "
+#~ "true = Always use system DNS resolver"
+#~ msgstr ""
+#~ "false=nunca usar o resolver do sistema; reluctantly=pedir DNS "
+#~ "directamente, se o servidor DNS estiver indisponivel recorrer do resolver "
+#~ "DNS do sistema; happily=pedir DNS directamente, se o host nao for "
+#~ "encontrado, recorrer ao resolver DNS do sistema; true=Usar sempre o "
+#~ "resolver DNS do sistema"
+
+#~ msgid "Port on which Polipo will listen. (default value: 8123)"
+#~ msgstr "Porta local na qual o polipo será activado. (pre-definido: 8123)"
+
+#~ msgid "polipo_pmm_pmmsize_desc"
+#~ msgstr ""
+#~ "Para activar PMM, o tamanho do segmento PMM deve ser definido para um "
+#~ "qualquer valor positivo."
diff --git a/po/pt_BR/polipo.po b/po/pt_BR/polipo.po
index c929104c3..fbbe4e632 100644
--- a/po/pt_BR/polipo.po
+++ b/po/pt_BR/polipo.po
@@ -11,48 +11,58 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0\n"
 
-#. Polipo
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:1
-msgid "Polipo"
-msgstr "Polipo"
-
-#. On-Disk Cache
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:2
-msgid "On-Disk Cache"
-msgstr "Cache em disco"
+msgid "Advanced Settings"
+msgstr ""
 
-#. Shared cache
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:3
-msgid "Shared cache"
-msgstr "Cache partilhada"
+msgid "Allowed clients"
+msgstr "Clientes permitidos"
 
-#. Enable if cache (proxy) is shared by multiple users.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:4
-msgid "Enable if cache (proxy) is shared by multiple users."
-msgstr "Activar se a cache (proxy) for partilhada por multiplos utilizadores."
+msgid "Always use system DNS resolver"
+msgstr ""
 
-#. To enable polipo on-disk cache cleaning (highly recommended), you should add a cron job in Scheduled Tasks services that will execute /usr/sbin/polipo_purge script. For example to perform disk cache cleanup every day at 6:00 in the morning you should add the following line in Scheduled Tasks \"0 6 * * *	/usr/sbin/polipo_purge\" (without quotes).
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:5
 msgid ""
-"To enable polipo on-disk cache cleaning (highly recommended), you should add "
-"a cron job in Scheduled Tasks services that will execute /usr/sbin/"
-"polipo_purge script. For example to perform disk cache cleanup every day at "
-"6:00 in the morning you should add the following line in Scheduled Tasks \"0 "
-"6 * * *\\t/usr/sbin/polipo_purge\" (without quotes)."
+"Basic HTTP authentication supported. Provide username and password in "
+"username:password format."
+msgstr ""
+"É suportada a autenticação basica HTTP. Indique username e password no "
+"formato username:password."
+
+msgid "DNS and Query Settings"
 msgstr ""
-"Para activar a limpeza de cache em disco (altamente recomendado), deve "
-"acrescentar uma tarefa cron (\"Serviços\") que execute o script /usr/sbin/"
-"polipo_purge. Como exemplo, para executar uma limpeza da cache diariamente "
-"pelas 06H00 deve acrescentar a seguinte linha: \"0 6 * * * /usr/sbin/"
-"polipo_purge\" (sem as aspas)."
-
-#. Disk cache location
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:6
+
+msgid "DNS server address"
+msgstr "Endereço do servidor DNS"
+
+msgid "Delete cache files time"
+msgstr "Tempo para remoção dos ficheiros de cache"
+
 msgid "Disk cache location"
 msgstr "Localização da cache em disco"
 
-#. Location where polipo will cache files permanently. Use of external storage devices is recommended, because the cache can grow considerably. Leave it empty to disable on-disk cache.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:7
+msgid "Do not query IPv6"
+msgstr ""
+
+msgid "Enable if cache (proxy) is shared by multiple users."
+msgstr "Activar se a cache (proxy) for partilhada por multiplos utilizadores."
+
+msgid "First PMM segment size (in bytes)"
+msgstr "Tamanho do primeiro segmento PMM (em bytes)"
+
+msgid "General Settings"
+msgstr ""
+
+msgid "How much RAM should Polipo use for its cache."
+msgstr "Quanta memória RAM deverá ser usada pelo polipo para a sua cache."
+
+msgid "In RAM cache size (in bytes)"
+msgstr "Tamanho da cache em RAM (bytes)"
+
+msgid "Listen address"
+msgstr "Endereço local"
+
+msgid "Listen port"
+msgstr "Porta local"
+
 msgid ""
 "Location where polipo will cache files permanently. Use of external storage "
 "devices is recommended, because the cache can grow considerably. Leave it "
@@ -63,184 +73,110 @@ msgstr ""
 "grande crescimento da cache. Deixe em branco para desactivar a cache em "
 "disco."
 
-#. Truncate cache files size (in bytes)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:8
-msgid "Truncate cache files size (in bytes)"
-msgstr "Tamanho de trancagem dos ficheiros de cache (bytes)"
-
-#. Size to which cached files should be truncated. (default value: 1048576)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:9
-msgid ""
-"Size to which cached files should be truncated. (default value: 1048576)"
-msgstr ""
-"Tamanho com o qual devem ser trancados os ficheiros da cache. (valor pre-"
-"definido: 1048576)"
+msgid "Log file location"
+msgstr "Localização do ficheiro de registo"
 
-#. Truncate cache files time
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:10
-msgid "Truncate cache files time"
-msgstr "Tempo de trancagem dos ficheiros de cache"
+msgid "Log to syslog"
+msgstr "Registar para o syslog"
 
-#. Time after which cached files will be truncated. (default value: 4d12h)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:11
-msgid "Time after which cached files will be truncated. (default value: 4d12h)"
+msgid "Logging and RAM"
 msgstr ""
-"Tempo após o qual os ficheiros de cache serão trancados. (valor pre-"
-"definido: 4d12h)"
-
-#. Delete cache files time
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:12
-msgid "Delete cache files time"
-msgstr "Tempo para remoção dos ficheiros de cache"
 
-#. Time after which cached files will be deleted. (default value: 32d)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:13
-msgid "Time after which cached files will be deleted. (default value: 32d)"
+msgid "Never use system DNS resolver"
 msgstr ""
-"Tempo apos o qual os ficheiros de cache serão removidos. (valor pré-"
-"definido: 32d)"
 
-#. Polipo is a small and fast caching web proxy.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:14
-msgid "Polipo is a small and fast caching web proxy."
-msgstr "O polipo é um proxy web ligeiro e rápido."
+msgid "On-Disk Cache"
+msgstr "Cache em disco"
+
+msgid "PMM segments size (in bytes)"
+msgstr "Tamanho do segmento PMM (em bytes)"
 
-#. General
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:15
-msgid "General"
-msgstr "Geral"
+msgid "Parent Proxy"
+msgstr ""
 
-#. Allowed clients
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:16
-msgid "Allowed clients"
-msgstr "Clientes permitidos"
+msgid "Parent proxy address"
+msgstr "Endereço do proxy de hierarquia superior."
 
-#. When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients that are allowed to connect. The format is IP address or network address (192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6)).
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:17
 msgid ""
-"When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients "
-"that are allowed to connect. The format is IP address or network address "
-"(192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))."
+"Parent proxy address (in host:port format), to which Polipo will forward the "
+"requests."
 msgstr ""
-"Quando o endereço de listen fôr 0.0.0.0 (IPv4) ou :: (IPv6), deve listar os "
-"clientes que tiverem permissão para ligação. O formato é endereço de host ou "
-"endereço de rede (192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))."
+"Endereço do proxy de hierarquia superior (no formato host:porta), ao qual o "
+"polipo irá encaminhar os seus pedidos."
 
-#. In RAM cache size (in bytes)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:18
-msgid "In RAM cache size (in bytes)"
-msgstr "Tamanho da cache em RAM (bytes)"
+msgid "Parent proxy authentication"
+msgstr "Autenticação em cache de hierarquia superior"
 
-#. How much RAM should Polipo use for its cache.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:19
-msgid "How much RAM should Polipo use for its cache."
-msgstr "Quanta memória RAM deverá ser usada pelo polipo para a sua cache."
+msgid "Polipo"
+msgstr "Polipo"
 
-#. DNS server address
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:20
-msgid "DNS server address"
-msgstr "Endereço do servidor DNS"
+msgid "Polipo is a small and fast caching web proxy."
+msgstr "O polipo é um proxy web ligeiro e rápido."
+
+msgid "Poor Man's Multiplexing"
+msgstr "Multiplexagem simples"
 
-#. Set the DNS server address to use, if you want Polipo to use different DNS server than the host system.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:21
 msgid ""
-"Set the DNS server address to use, if you want Polipo to use different DNS "
-"server than the host system."
+"Poor Man's Multiplexing (PMM) is a technique that simulates multiplexing by "
+"requesting an instance in multiple segments. It tries to lower the latency "
+"caused by the weakness of HTTP protocol. NOTE: some sites may not work with "
+"PMM enabled."
 msgstr ""
-"Define o endereço do servidor de DNS a usar, caso pretenda que o polipo "
-"utilize um servidor alternativo ao do sistema."
+"A multiplexagem simples (PMM) consiste na simulação de multiplexagem através "
+"da requesição de um pedido em multiplos segmentos. O método tenta baixar a "
+"latencia causada pela debilidade do protocolo HTTP. Nota: alguns sites web "
+"não funcionam com a activação de PMM."
 
-#. Query DNS for IPv6
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:22
-msgid "Query DNS for IPv6"
-msgstr "Pedidos IPv6 ao DNS"
+msgid "Port on which Polipo will listen"
+msgstr ""
 
-#. false = Do not query IPv6; reluctantly = Query both, prefer IPv4; happily = Query both, prefer IPv6; true = Query only IPv6
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:23
-msgid ""
-"false = Do not query IPv6; reluctantly = Query both, prefer IPv4; happily = "
-"Query both, prefer IPv6; true = Query only IPv6"
+msgid "Proxy"
 msgstr ""
-"false = Não pedir IPv6; reluctantly=Pedir ambos e preferir IPv4; "
-"happily=Pedir ambos, preferir IPv6; true=Pedir apenas IPv6"
 
-#. Query DNS by hostname
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:24
 msgid "Query DNS by hostname"
 msgstr "Pedidos ao DNS através de hostname"
 
-#. false = Never use system DNS resolver; reluctantly = Query DNS directly, if DNS server is unavailable fail to system DNS resolver; happily = Query DNS directly, if host could not be found fallback to system DNS resolver; true = Always use system DNS resolver
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:25
-msgid ""
-"false = Never use system DNS resolver; reluctantly = Query DNS directly, if "
-"DNS server is unavailable fail to system DNS resolver; happily = Query DNS "
-"directly, if host could not be found fallback to system DNS resolver; true = "
-"Always use system DNS resolver"
+msgid "Query DNS directly, fallback to system resolver"
 msgstr ""
-"false=nunca usar o resolver do sistema; reluctantly=pedir DNS directamente, "
-"se o servidor DNS estiver indisponivel recorrer do resolver DNS do sistema; "
-"happily=pedir DNS directamente, se o host nao for encontrado, recorrer ao "
-"resolver DNS do sistema; true=Usar sempre o resolver DNS do sistema"
 
-#. Syslog facility
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:26
-msgid "Syslog facility"
-msgstr "Categoria dos eventos polipo no registo do sistema"
+msgid "Query DNS directly, for unknown hosts fall back to system resolver"
+msgstr ""
 
-#. Log file location
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:27
-msgid "Log file location"
-msgstr "Localização do ficheiro de registo"
+msgid "Query DNS for IPv6"
+msgstr "Pedidos IPv6 ao DNS"
 
-#. Use of external storage device is recommended, because the log file is written frequently and can grow considerably.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:28
-msgid ""
-"Use of external storage device is recommended, because the log file is "
-"written frequently and can grow considerably."
+msgid "Query IPv4 and IPv6, prefer IPv4"
 msgstr ""
-"É recomendado o recurso a sistemas de armazenamento de ficheiros externos, "
-"devido ao rápido crescimento do ficheiro de registo."
 
-#. Log to syslog
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:29
-msgid "Log to syslog"
-msgstr "Registar para o syslog"
+msgid "Query IPv4 and IPv6, prefer IPv6"
+msgstr ""
 
-#. Parent proxy authentication
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:30
-msgid "Parent proxy authentication"
-msgstr "Autenticação em cache de hierarquia superior"
+msgid "Query only IPv6"
+msgstr ""
 
-#. Basic HTTP authentication supported. Provide username and password in username:password format.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:31
 msgid ""
-"Basic HTTP authentication supported. Provide username and password in "
-"username:password format."
+"Set the DNS server address to use, if you want Polipo to use different DNS "
+"server than the host system."
 msgstr ""
-"É suportada a autenticação basica HTTP. Indique username e password no "
-"formato username:password."
+"Define o endereço do servidor de DNS a usar, caso pretenda que o polipo "
+"utilize um servidor alternativo ao do sistema."
 
-#. Parent proxy address
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:32
-msgid "Parent proxy address"
-msgstr "Endereço do proxy de hierarquia superior."
+msgid "Shared cache"
+msgstr "Cache partilhada"
 
-#. Parent proxy address (in host:port format), to which Polipo will forward the requests.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:33
 msgid ""
-"Parent proxy address (in host:port format), to which Polipo will forward the "
-"requests."
+"Size of the first PMM segment. If not defined, it defaults to twice the PMM "
+"segment size."
 msgstr ""
-"Endereço do proxy de hierarquia superior (no formato host:porta), ao qual o "
-"polipo irá encaminhar os seus pedidos."
+"Tamanho do primeiro segmento PMM. Se não estiver definido, reverte para o "
+"dobro do tamanho do segmento PMM."
 
-#. Listen address
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:34
-msgid "Listen address"
-msgstr "Endereço local"
+msgid "Size to which cached files should be truncated"
+msgstr ""
+
+msgid "Syslog facility"
+msgstr "Categoria dos eventos polipo no registo do sistema"
 
-#. The interface on which Polipo will listen. To listen on all interfaces use 0.0.0.0 or :: (IPv6).
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:35
 msgid ""
 "The interface on which Polipo will listen. To listen on all interfaces use "
 "0.0.0.0 or :: (IPv6)."
@@ -248,56 +184,103 @@ msgstr ""
 "O interface no qual o polipo será activado. Para activar em todos os "
 "endereços, use 0.0.0.0 ou :: (IPv6)."
 
-#. Listen port
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:36
-msgid "Listen port"
-msgstr "Porta local"
-
-#. Port on which Polipo will listen. (default value: 8123)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:37
-msgid "Port on which Polipo will listen. (default value: 8123)"
-msgstr "Porta local na qual o polipo será activado. (pre-definido: 8123)"
+msgid "Time after which cached files will be deleted"
+msgstr ""
 
-#. Poor Man&#39;s Multiplexing
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:38
-msgid "Poor Man's Multiplexing"
-msgstr "Multiplexagem simples"
+msgid "Time after which cached files will be truncated"
+msgstr ""
 
-#. Poor Man&#39;s Multiplexing (PMM) is a technique that simulates multiplexing by requesting an instance in multiple segments. It tries to lower the latency caused by the weakness of HTTP protocol. NOTE: some sites may not work with PMM enabled.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:39
-msgid ""
-"Poor Man's Multiplexing (PMM) is a technique that simulates multiplexing by "
-"requesting an instance in multiple segments. It tries to lower the latency "
-"caused by the weakness of HTTP protocol. NOTE: some sites may not work with "
-"PMM enabled."
+msgid "To enable PMM, PMM segment size must be set to some positive value."
 msgstr ""
-"A multiplexagem simples (PMM) consiste na simulação de multiplexagem através "
-"da requesição de um pedido em multiplos segmentos. O método tenta baixar a "
-"latencia causada pela debilidade do protocolo HTTP. Nota: alguns sites web "
-"não funcionam com a activação de PMM."
 
-#. First PMM segment size (in bytes)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:40
-msgid "First PMM segment size (in bytes)"
-msgstr "Tamanho do primeiro segmento PMM (em bytes)"
+msgid "Truncate cache files size (in bytes)"
+msgstr "Tamanho de trancagem dos ficheiros de cache (bytes)"
+
+msgid "Truncate cache files time"
+msgstr "Tempo de trancagem dos ficheiros de cache"
 
-#. Size of the first PMM segment. If not defined, it defaults to twice the PMM segment size.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:41
 msgid ""
-"Size of the first PMM segment. If not defined, it defaults to twice the PMM "
-"segment size."
+"Use of external storage device is recommended, because the log file is "
+"written frequently and can grow considerably."
 msgstr ""
-"Tamanho do primeiro segmento PMM. Se não estiver definido, reverte para o "
-"dobro do tamanho do segmento PMM."
+"É recomendado o recurso a sistemas de armazenamento de ficheiros externos, "
+"devido ao rápido crescimento do ficheiro de registo."
 
-#. PMM segments size (in bytes)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:42
-msgid "PMM segments size (in bytes)"
-msgstr "Tamanho do segmento PMM (em bytes)"
+msgid ""
+"When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients "
+"that are allowed to connect. The format is IP address or network address "
+"(192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))"
+msgstr ""
 
-#. To enable PMM, PMM segment size must be set to some positive value.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:43
-msgid "polipo_pmm_pmmsize_desc"
+msgid "enable"
 msgstr ""
-"Para activar PMM, o tamanho do segmento PMM deve ser definido para um "
-"qualquer valor positivo."
+
+#~ msgid ""
+#~ "To enable polipo on-disk cache cleaning (highly recommended), you should "
+#~ "add a cron job in Scheduled Tasks services that will execute /usr/sbin/"
+#~ "polipo_purge script. For example to perform disk cache cleanup every day "
+#~ "at 6:00 in the morning you should add the following line in Scheduled "
+#~ "Tasks \"0 6 * * *\\t/usr/sbin/polipo_purge\" (without quotes)."
+#~ msgstr ""
+#~ "Para activar a limpeza de cache em disco (altamente recomendado), deve "
+#~ "acrescentar uma tarefa cron (\"Serviços\") que execute o script /usr/sbin/"
+#~ "polipo_purge. Como exemplo, para executar uma limpeza da cache "
+#~ "diariamente pelas 06H00 deve acrescentar a seguinte linha: \"0 6 * * * /"
+#~ "usr/sbin/polipo_purge\" (sem as aspas)."
+
+#~ msgid ""
+#~ "Size to which cached files should be truncated. (default value: 1048576)"
+#~ msgstr ""
+#~ "Tamanho com o qual devem ser trancados os ficheiros da cache. (valor pre-"
+#~ "definido: 1048576)"
+
+#~ msgid ""
+#~ "Time after which cached files will be truncated. (default value: 4d12h)"
+#~ msgstr ""
+#~ "Tempo após o qual os ficheiros de cache serão trancados. (valor pre-"
+#~ "definido: 4d12h)"
+
+#~ msgid "Time after which cached files will be deleted. (default value: 32d)"
+#~ msgstr ""
+#~ "Tempo apos o qual os ficheiros de cache serão removidos. (valor pré-"
+#~ "definido: 32d)"
+
+#~ msgid "General"
+#~ msgstr "Geral"
+
+#~ msgid ""
+#~ "When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients "
+#~ "that are allowed to connect. The format is IP address or network address "
+#~ "(192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))."
+#~ msgstr ""
+#~ "Quando o endereço de listen fôr 0.0.0.0 (IPv4) ou :: (IPv6), deve listar "
+#~ "os clientes que tiverem permissão para ligação. O formato é endereço de "
+#~ "host ou endereço de rede (192.168.1.123, 192.168.1.0/24, "
+#~ "2001:660:116::/48 (IPv6))."
+
+#~ msgid ""
+#~ "false = Do not query IPv6; reluctantly = Query both, prefer IPv4; happily "
+#~ "= Query both, prefer IPv6; true = Query only IPv6"
+#~ msgstr ""
+#~ "false = Não pedir IPv6; reluctantly=Pedir ambos e preferir IPv4; "
+#~ "happily=Pedir ambos, preferir IPv6; true=Pedir apenas IPv6"
+
+#~ msgid ""
+#~ "false = Never use system DNS resolver; reluctantly = Query DNS directly, "
+#~ "if DNS server is unavailable fail to system DNS resolver; happily = Query "
+#~ "DNS directly, if host could not be found fallback to system DNS resolver; "
+#~ "true = Always use system DNS resolver"
+#~ msgstr ""
+#~ "false=nunca usar o resolver do sistema; reluctantly=pedir DNS "
+#~ "directamente, se o servidor DNS estiver indisponivel recorrer do resolver "
+#~ "DNS do sistema; happily=pedir DNS directamente, se o host nao for "
+#~ "encontrado, recorrer ao resolver DNS do sistema; true=Usar sempre o "
+#~ "resolver DNS do sistema"
+
+#~ msgid "Port on which Polipo will listen. (default value: 8123)"
+#~ msgstr "Porta local na qual o polipo será activado. (pre-definido: 8123)"
+
+#~ msgid "polipo_pmm_pmmsize_desc"
+#~ msgstr ""
+#~ "Para activar PMM, o tamanho do segmento PMM deve ser definido para um "
+#~ "qualquer valor positivo."
diff --git a/po/ru/polipo.po b/po/ru/polipo.po
index 873ec13e4..efa4dbc55 100644
--- a/po/ru/polipo.po
+++ b/po/ru/polipo.po
@@ -12,251 +12,186 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
-#. Polipo
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:1
-msgid "Polipo"
+msgid "Advanced Settings"
 msgstr ""
 
-#. On-Disk Cache
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:2
-msgid "On-Disk Cache"
+msgid "Allowed clients"
 msgstr ""
 
-#. Shared cache
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:3
-msgid "Shared cache"
+msgid "Always use system DNS resolver"
 msgstr ""
 
-#. Enable if cache (proxy) is shared by multiple users.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:4
-msgid "Enable if cache (proxy) is shared by multiple users."
+msgid ""
+"Basic HTTP authentication supported. Provide username and password in "
+"username:password format."
 msgstr ""
 
-#. To enable polipo on-disk cache cleaning (highly recommended), you should add a cron job in Scheduled Tasks services that will execute /usr/sbin/polipo_purge script. For example to perform disk cache cleanup every day at 6:00 in the morning you should add the following line in Scheduled Tasks \"0 6 * * *	/usr/sbin/polipo_purge\" (without quotes).
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:5
-msgid ""
-"To enable polipo on-disk cache cleaning (highly recommended), you should add "
-"a cron job in Scheduled Tasks services that will execute /usr/sbin/"
-"polipo_purge script. For example to perform disk cache cleanup every day at "
-"6:00 in the morning you should add the following line in Scheduled Tasks \"0 "
-"6 * * *\\t/usr/sbin/polipo_purge\" (without quotes)."
+msgid "DNS and Query Settings"
+msgstr ""
+
+msgid "DNS server address"
+msgstr ""
+
+msgid "Delete cache files time"
 msgstr ""
 
-#. Disk cache location
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:6
 msgid "Disk cache location"
 msgstr ""
 
-#. Location where polipo will cache files permanently. Use of external storage devices is recommended, because the cache can grow considerably. Leave it empty to disable on-disk cache.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:7
+msgid "Do not query IPv6"
+msgstr ""
+
+msgid "Enable if cache (proxy) is shared by multiple users."
+msgstr ""
+
+msgid "First PMM segment size (in bytes)"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "How much RAM should Polipo use for its cache."
+msgstr ""
+
+msgid "In RAM cache size (in bytes)"
+msgstr ""
+
+msgid "Listen address"
+msgstr ""
+
+msgid "Listen port"
+msgstr ""
+
 msgid ""
 "Location where polipo will cache files permanently. Use of external storage "
 "devices is recommended, because the cache can grow considerably. Leave it "
 "empty to disable on-disk cache."
 msgstr ""
 
-#. Truncate cache files size (in bytes)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:8
-msgid "Truncate cache files size (in bytes)"
+msgid "Log file location"
 msgstr ""
 
-#. Size to which cached files should be truncated. (default value: 1048576)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:9
-msgid ""
-"Size to which cached files should be truncated. (default value: 1048576)"
+msgid "Log to syslog"
 msgstr ""
 
-#. Truncate cache files time
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:10
-msgid "Truncate cache files time"
+msgid "Logging and RAM"
 msgstr ""
 
-#. Time after which cached files will be truncated. (default value: 4d12h)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:11
-msgid "Time after which cached files will be truncated. (default value: 4d12h)"
+msgid "Never use system DNS resolver"
 msgstr ""
 
-#. Delete cache files time
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:12
-msgid "Delete cache files time"
+msgid "On-Disk Cache"
 msgstr ""
 
-#. Time after which cached files will be deleted. (default value: 32d)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:13
-msgid "Time after which cached files will be deleted. (default value: 32d)"
+msgid "PMM segments size (in bytes)"
 msgstr ""
 
-#. Polipo is a small and fast caching web proxy.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:14
-msgid "Polipo is a small and fast caching web proxy."
+msgid "Parent Proxy"
 msgstr ""
 
-#. General
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:15
-msgid "General"
+msgid "Parent proxy address"
 msgstr ""
 
-#. Allowed clients
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:16
-msgid "Allowed clients"
+msgid ""
+"Parent proxy address (in host:port format), to which Polipo will forward the "
+"requests."
 msgstr ""
 
-#. When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients that are allowed to connect. The format is IP address or network address (192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6)).
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:17
-msgid ""
-"When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients "
-"that are allowed to connect. The format is IP address or network address "
-"(192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))."
+msgid "Parent proxy authentication"
 msgstr ""
 
-#. In RAM cache size (in bytes)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:18
-msgid "In RAM cache size (in bytes)"
+msgid "Polipo"
 msgstr ""
 
-#. How much RAM should Polipo use for its cache.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:19
-msgid "How much RAM should Polipo use for its cache."
+msgid "Polipo is a small and fast caching web proxy."
 msgstr ""
 
-#. DNS server address
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:20
-msgid "DNS server address"
+msgid "Poor Man's Multiplexing"
 msgstr ""
 
-#. Set the DNS server address to use, if you want Polipo to use different DNS server than the host system.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:21
 msgid ""
-"Set the DNS server address to use, if you want Polipo to use different DNS "
-"server than the host system."
+"Poor Man's Multiplexing (PMM) is a technique that simulates multiplexing by "
+"requesting an instance in multiple segments. It tries to lower the latency "
+"caused by the weakness of HTTP protocol. NOTE: some sites may not work with "
+"PMM enabled."
 msgstr ""
 
-#. Query DNS for IPv6
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:22
-msgid "Query DNS for IPv6"
+msgid "Port on which Polipo will listen"
 msgstr ""
 
-#. false = Do not query IPv6; reluctantly = Query both, prefer IPv4; happily = Query both, prefer IPv6; true = Query only IPv6
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:23
-msgid ""
-"false = Do not query IPv6; reluctantly = Query both, prefer IPv4; happily = "
-"Query both, prefer IPv6; true = Query only IPv6"
+msgid "Proxy"
 msgstr ""
 
-#. Query DNS by hostname
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:24
 msgid "Query DNS by hostname"
 msgstr ""
 
-#. false = Never use system DNS resolver; reluctantly = Query DNS directly, if DNS server is unavailable fail to system DNS resolver; happily = Query DNS directly, if host could not be found fallback to system DNS resolver; true = Always use system DNS resolver
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:25
-msgid ""
-"false = Never use system DNS resolver; reluctantly = Query DNS directly, if "
-"DNS server is unavailable fail to system DNS resolver; happily = Query DNS "
-"directly, if host could not be found fallback to system DNS resolver; true = "
-"Always use system DNS resolver"
+msgid "Query DNS directly, fallback to system resolver"
 msgstr ""
 
-#. Syslog facility
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:26
-msgid "Syslog facility"
+msgid "Query DNS directly, for unknown hosts fall back to system resolver"
 msgstr ""
 
-#. Log file location
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:27
-msgid "Log file location"
+msgid "Query DNS for IPv6"
 msgstr ""
 
-#. Use of external storage device is recommended, because the log file is written frequently and can grow considerably.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:28
-msgid ""
-"Use of external storage device is recommended, because the log file is "
-"written frequently and can grow considerably."
+msgid "Query IPv4 and IPv6, prefer IPv4"
 msgstr ""
 
-#. Log to syslog
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:29
-msgid "Log to syslog"
+msgid "Query IPv4 and IPv6, prefer IPv6"
 msgstr ""
 
-#. Parent proxy authentication
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:30
-msgid "Parent proxy authentication"
+msgid "Query only IPv6"
 msgstr ""
 
-#. Basic HTTP authentication supported. Provide username and password in username:password format.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:31
 msgid ""
-"Basic HTTP authentication supported. Provide username and password in "
-"username:password format."
+"Set the DNS server address to use, if you want Polipo to use different DNS "
+"server than the host system."
 msgstr ""
 
-#. Parent proxy address
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:32
-msgid "Parent proxy address"
+msgid "Shared cache"
 msgstr ""
 
-#. Parent proxy address (in host:port format), to which Polipo will forward the requests.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:33
 msgid ""
-"Parent proxy address (in host:port format), to which Polipo will forward the "
-"requests."
+"Size of the first PMM segment. If not defined, it defaults to twice the PMM "
+"segment size."
 msgstr ""
 
-#. Listen address
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:34
-msgid "Listen address"
+msgid "Size to which cached files should be truncated"
+msgstr ""
+
+msgid "Syslog facility"
 msgstr ""
 
-#. The interface on which Polipo will listen. To listen on all interfaces use 0.0.0.0 or :: (IPv6).
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:35
 msgid ""
 "The interface on which Polipo will listen. To listen on all interfaces use "
 "0.0.0.0 or :: (IPv6)."
 msgstr ""
 
-#. Listen port
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:36
-msgid "Listen port"
+msgid "Time after which cached files will be deleted"
 msgstr ""
 
-#. Port on which Polipo will listen. (default value: 8123)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:37
-msgid "Port on which Polipo will listen. (default value: 8123)"
+msgid "Time after which cached files will be truncated"
 msgstr ""
 
-#. Poor Man&#39;s Multiplexing
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:38
-msgid "Poor Man's Multiplexing"
+msgid "To enable PMM, PMM segment size must be set to some positive value."
 msgstr ""
 
-#. Poor Man&#39;s Multiplexing (PMM) is a technique that simulates multiplexing by requesting an instance in multiple segments. It tries to lower the latency caused by the weakness of HTTP protocol. NOTE: some sites may not work with PMM enabled.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:39
-msgid ""
-"Poor Man's Multiplexing (PMM) is a technique that simulates multiplexing by "
-"requesting an instance in multiple segments. It tries to lower the latency "
-"caused by the weakness of HTTP protocol. NOTE: some sites may not work with "
-"PMM enabled."
+msgid "Truncate cache files size (in bytes)"
 msgstr ""
 
-#. First PMM segment size (in bytes)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:40
-msgid "First PMM segment size (in bytes)"
+msgid "Truncate cache files time"
 msgstr ""
 
-#. Size of the first PMM segment. If not defined, it defaults to twice the PMM segment size.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:41
 msgid ""
-"Size of the first PMM segment. If not defined, it defaults to twice the PMM "
-"segment size."
+"Use of external storage device is recommended, because the log file is "
+"written frequently and can grow considerably."
 msgstr ""
 
-#. PMM segments size (in bytes)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:42
-msgid "PMM segments size (in bytes)"
+msgid ""
+"When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients "
+"that are allowed to connect. The format is IP address or network address "
+"(192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))"
 msgstr ""
 
-#. To enable PMM, PMM segment size must be set to some positive value.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:43
-msgid "To enable PMM, PMM segment size must be set to some positive value."
+msgid "enable"
 msgstr ""
diff --git a/po/templates/polipo.pot b/po/templates/polipo.pot
index f75f6d0a2..3caf88332 100644
--- a/po/templates/polipo.pot
+++ b/po/templates/polipo.pot
@@ -1,253 +1,186 @@
-#  polipo.pot
-#  generated from ./applications/luci-polipo/luasrc/i18n/polipo.en.lua
 msgid ""
 msgstr "Content-Type: text/plain; charset=UTF-8"
 
-#. Polipo
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:1
-msgid "Polipo"
+msgid "Advanced Settings"
 msgstr ""
 
-#. On-Disk Cache
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:2
-msgid "On-Disk Cache"
+msgid "Allowed clients"
 msgstr ""
 
-#. Shared cache
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:3
-msgid "Shared cache"
+msgid "Always use system DNS resolver"
 msgstr ""
 
-#. Enable if cache (proxy) is shared by multiple users.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:4
-msgid "Enable if cache (proxy) is shared by multiple users."
+msgid ""
+"Basic HTTP authentication supported. Provide username and password in "
+"username:password format."
 msgstr ""
 
-#. To enable polipo on-disk cache cleaning (highly recommended), you should add a cron job in Scheduled Tasks services that will execute /usr/sbin/polipo_purge script. For example to perform disk cache cleanup every day at 6:00 in the morning you should add the following line in Scheduled Tasks &quot;0 6 * * *	/usr/sbin/polipo_purge&quot; (without quotes).
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:5
-msgid ""
-"To enable polipo on-disk cache cleaning (highly recommended), you should add "
-"a cron job in Scheduled Tasks services that will execute /usr/sbin/"
-"polipo_purge script. For example to perform disk cache cleanup every day at "
-"6:00 in the morning you should add the following line in Scheduled Tasks \"0 "
-"6 * * *\\t/usr/sbin/polipo_purge\" (without quotes)."
+msgid "DNS and Query Settings"
+msgstr ""
+
+msgid "DNS server address"
+msgstr ""
+
+msgid "Delete cache files time"
 msgstr ""
 
-#. Disk cache location
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:6
 msgid "Disk cache location"
 msgstr ""
 
-#. Location where polipo will cache files permanently. Use of external storage devices is recommended, because the cache can grow considerably. Leave it empty to disable on-disk cache.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:7
+msgid "Do not query IPv6"
+msgstr ""
+
+msgid "Enable if cache (proxy) is shared by multiple users."
+msgstr ""
+
+msgid "First PMM segment size (in bytes)"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "How much RAM should Polipo use for its cache."
+msgstr ""
+
+msgid "In RAM cache size (in bytes)"
+msgstr ""
+
+msgid "Listen address"
+msgstr ""
+
+msgid "Listen port"
+msgstr ""
+
 msgid ""
 "Location where polipo will cache files permanently. Use of external storage "
 "devices is recommended, because the cache can grow considerably. Leave it "
 "empty to disable on-disk cache."
 msgstr ""
 
-#. Truncate cache files size (in bytes)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:8
-msgid "Truncate cache files size (in bytes)"
+msgid "Log file location"
 msgstr ""
 
-#. Size to which cached files should be truncated. (default value: 1048576)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:9
-msgid ""
-"Size to which cached files should be truncated. (default value: 1048576)"
+msgid "Log to syslog"
 msgstr ""
 
-#. Truncate cache files time
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:10
-msgid "Truncate cache files time"
+msgid "Logging and RAM"
 msgstr ""
 
-#. Time after which cached files will be truncated. (default value: 4d12h)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:11
-msgid "Time after which cached files will be truncated. (default value: 4d12h)"
+msgid "Never use system DNS resolver"
 msgstr ""
 
-#. Delete cache files time
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:12
-msgid "Delete cache files time"
+msgid "On-Disk Cache"
 msgstr ""
 
-#. Time after which cached files will be deleted. (default value: 32d)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:13
-msgid "Time after which cached files will be deleted. (default value: 32d)"
+msgid "PMM segments size (in bytes)"
 msgstr ""
 
-#. Polipo is a small and fast caching web proxy.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:14
-msgid "Polipo is a small and fast caching web proxy."
+msgid "Parent Proxy"
 msgstr ""
 
-#. General
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:15
-msgid "General"
+msgid "Parent proxy address"
 msgstr ""
 
-#. Allowed clients
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:16
-msgid "Allowed clients"
+msgid ""
+"Parent proxy address (in host:port format), to which Polipo will forward the "
+"requests."
 msgstr ""
 
-#. When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients that are allowed to connect. The format is IP address or network address (192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6)).
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:17
-msgid ""
-"When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients "
-"that are allowed to connect. The format is IP address or network address "
-"(192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))."
+msgid "Parent proxy authentication"
 msgstr ""
 
-#. In RAM cache size (in bytes)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:18
-msgid "In RAM cache size (in bytes)"
+msgid "Polipo"
 msgstr ""
 
-#. How much RAM should Polipo use for its cache.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:19
-msgid "How much RAM should Polipo use for its cache."
+msgid "Polipo is a small and fast caching web proxy."
 msgstr ""
 
-#. DNS server address
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:20
-msgid "DNS server address"
+msgid "Poor Man's Multiplexing"
 msgstr ""
 
-#. Set the DNS server address to use, if you want Polipo to use different DNS server than the host system.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:21
 msgid ""
-"Set the DNS server address to use, if you want Polipo to use different DNS "
-"server than the host system."
+"Poor Man's Multiplexing (PMM) is a technique that simulates multiplexing by "
+"requesting an instance in multiple segments. It tries to lower the latency "
+"caused by the weakness of HTTP protocol. NOTE: some sites may not work with "
+"PMM enabled."
 msgstr ""
 
-#. Query DNS for IPv6
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:22
-msgid "Query DNS for IPv6"
+msgid "Port on which Polipo will listen"
 msgstr ""
 
-#. false = Do not query IPv6; reluctantly = Query both, prefer IPv4; happily = Query both, prefer IPv6; true = Query only IPv6
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:23
-msgid ""
-"false = Do not query IPv6; reluctantly = Query both, prefer IPv4; happily = "
-"Query both, prefer IPv6; true = Query only IPv6"
+msgid "Proxy"
 msgstr ""
 
-#. Query DNS by hostname
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:24
 msgid "Query DNS by hostname"
 msgstr ""
 
-#. false = Never use system DNS resolver; reluctantly = Query DNS directly, if DNS server is unavailable fail to system DNS resolver; happily = Query DNS directly, if host could not be found fallback to system DNS resolver; true = Always use system DNS resolver
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:25
-msgid ""
-"false = Never use system DNS resolver; reluctantly = Query DNS directly, if "
-"DNS server is unavailable fail to system DNS resolver; happily = Query DNS "
-"directly, if host could not be found fallback to system DNS resolver; true = "
-"Always use system DNS resolver"
+msgid "Query DNS directly, fallback to system resolver"
 msgstr ""
 
-#. Syslog facility
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:26
-msgid "Syslog facility"
+msgid "Query DNS directly, for unknown hosts fall back to system resolver"
 msgstr ""
 
-#. Log file location
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:27
-msgid "Log file location"
+msgid "Query DNS for IPv6"
 msgstr ""
 
-#. Use of external storage device is recommended, because the log file is written frequently and can grow considerably.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:28
-msgid ""
-"Use of external storage device is recommended, because the log file is "
-"written frequently and can grow considerably."
+msgid "Query IPv4 and IPv6, prefer IPv4"
 msgstr ""
 
-#. Log to syslog
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:29
-msgid "Log to syslog"
+msgid "Query IPv4 and IPv6, prefer IPv6"
 msgstr ""
 
-#. Parent proxy authentication
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:30
-msgid "Parent proxy authentication"
+msgid "Query only IPv6"
 msgstr ""
 
-#. Basic HTTP authentication supported. Provide username and password in username:password format.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:31
 msgid ""
-"Basic HTTP authentication supported. Provide username and password in "
-"username:password format."
+"Set the DNS server address to use, if you want Polipo to use different DNS "
+"server than the host system."
 msgstr ""
 
-#. Parent proxy address
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:32
-msgid "Parent proxy address"
+msgid "Shared cache"
 msgstr ""
 
-#. Parent proxy address (in host:port format), to which Polipo will forward the requests.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:33
 msgid ""
-"Parent proxy address (in host:port format), to which Polipo will forward the "
-"requests."
+"Size of the first PMM segment. If not defined, it defaults to twice the PMM "
+"segment size."
 msgstr ""
 
-#. Listen address
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:34
-msgid "Listen address"
+msgid "Size to which cached files should be truncated"
+msgstr ""
+
+msgid "Syslog facility"
 msgstr ""
 
-#. The interface on which Polipo will listen. To listen on all interfaces use 0.0.0.0 or :: (IPv6).
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:35
 msgid ""
 "The interface on which Polipo will listen. To listen on all interfaces use "
 "0.0.0.0 or :: (IPv6)."
 msgstr ""
 
-#. Listen port
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:36
-msgid "Listen port"
+msgid "Time after which cached files will be deleted"
 msgstr ""
 
-#. Port on which Polipo will listen. (default value: 8123)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:37
-msgid "Port on which Polipo will listen. (default value: 8123)"
+msgid "Time after which cached files will be truncated"
 msgstr ""
 
-#. Poor Man&#39;s Multiplexing
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:38
-msgid "Poor Man's Multiplexing"
+msgid "To enable PMM, PMM segment size must be set to some positive value."
 msgstr ""
 
-#. Poor Man&#39;s Multiplexing (PMM) is a technique that simulates multiplexing by requesting an instance in multiple segments. It tries to lower the latency caused by the weakness of HTTP protocol. NOTE: some sites may not work with PMM enabled.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:39
-msgid ""
-"Poor Man's Multiplexing (PMM) is a technique that simulates multiplexing by "
-"requesting an instance in multiple segments. It tries to lower the latency "
-"caused by the weakness of HTTP protocol. NOTE: some sites may not work with "
-"PMM enabled."
+msgid "Truncate cache files size (in bytes)"
 msgstr ""
 
-#. First PMM segment size (in bytes)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:40
-msgid "First PMM segment size (in bytes)"
+msgid "Truncate cache files time"
 msgstr ""
 
-#. Size of the first PMM segment. If not defined, it defaults to twice the PMM segment size.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:41
 msgid ""
-"Size of the first PMM segment. If not defined, it defaults to twice the PMM "
-"segment size."
+"Use of external storage device is recommended, because the log file is "
+"written frequently and can grow considerably."
 msgstr ""
 
-#. PMM segments size (in bytes)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:42
-msgid "PMM segments size (in bytes)"
+msgid ""
+"When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients "
+"that are allowed to connect. The format is IP address or network address "
+"(192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))"
 msgstr ""
 
-#. To enable PMM, PMM segment size must be set to some positive value.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:43
-msgid "To enable PMM, PMM segment size must be set to some positive value."
+msgid "enable"
 msgstr ""
diff --git a/po/vi/polipo.po b/po/vi/polipo.po
index 3c408a42c..e555b9b33 100644
--- a/po/vi/polipo.po
+++ b/po/vi/polipo.po
@@ -13,216 +13,91 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0\n"
 
-#. Polipo
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:1
-msgid "Polipo"
-msgstr "Polipo"
-
-#. On-Disk Cache
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:2
-msgid "On-Disk Cache"
-msgstr "Cạc trên ổ đĩa"
-
-#. Shared cache
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:3
-msgid "Shared cache"
-msgstr "Cạc trên ổ đĩa"
+msgid "Advanced Settings"
+msgstr ""
 
-#. Enable if cache (proxy) is shared by multiple users.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:4
-msgid "Enable if cache (proxy) is shared by multiple users."
-msgstr "Kích hoạt nếu cạc được chia rẻ bởi nhiều người dùng."
+msgid "Allowed clients"
+msgstr "Đối tượng cho phép"
 
-#. To enable polipo on-disk cache cleaning (highly recommended), you should add a cron job in Scheduled Tasks services that will execute /usr/sbin/polipo_purge script. For example to perform disk cache cleanup every day at 6:00 in the morning you should add the following line in Scheduled Tasks \"0 6 * * *	/usr/sbin/polipo_purge\" (without quotes).
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:5
-msgid ""
-"To enable polipo on-disk cache cleaning (highly recommended), you should add "
-"a cron job in Scheduled Tasks services that will execute /usr/sbin/"
-"polipo_purge script. For example to perform disk cache cleanup every day at "
-"6:00 in the morning you should add the following line in Scheduled Tasks \"0 "
-"6 * * *\\t/usr/sbin/polipo_purge\" (without quotes)."
+msgid "Always use system DNS resolver"
 msgstr ""
-"Để kích hoạt tính năng làm sạch trên cạc đĩa polipo (rất khuyến khích), bạn "
-"nên thêm vào một công việc cron trong những công tác đã schedule, nó sẽ thực "
-"hiện / usr / sbin / polipo_purge script. Ví dụ: để thực hiện các đĩa bộ nhớ "
-"cache mỗi ngày vào lúc 6:00 sáng, bạn nên thêm dòng sau trong Scheduled công "
-"việc &amp;quot;0 6 * * * /usr/sbin/polipo_purge&amp;quot; (không có dấu "
-"ngoặc kép)."
-
-#. Disk cache location
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:6
-msgid "Disk cache location"
-msgstr "Vị trí cạc đĩa"
 
-#. Location where polipo will cache files permanently. Use of external storage devices is recommended, because the cache can grow considerably. Leave it empty to disable on-disk cache.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:7
 msgid ""
-"Location where polipo will cache files permanently. Use of external storage "
-"devices is recommended, because the cache can grow considerably. Leave it "
-"empty to disable on-disk cache."
+"Basic HTTP authentication supported. Provide username and password in "
+"username:password format."
 msgstr ""
-"Vị trị mà polipo sẽ định các tập tin thường xuyên. Sử dụng thiết bị nhớ "
-"ngoài được khuyến khích, bởi vì cạc có thể lớn lên đáng kể. Để lại nó trống "
-"để vô hiệu hóa Trên cạc trên đĩa."
-
-#. Truncate cache files size (in bytes)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:8
-msgid "Truncate cache files size (in bytes)"
-msgstr "Bỏ bớt những tập tin cạc với dung lượng  (bytes)"
-
-#. Size to which cached files should be truncated. (default value: 1048576)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:9
-msgid ""
-"Size to which cached files should be truncated. (default value: 1048576)"
-msgstr "Dung lượng mà những tập tin cạc bị cắt bỏ. (Giá trị: 1048576)"
+"Sự chứng thực HTTP Cơ bản được hỗ trợ. Cung cấp tên người dùng và mật khẩu "
+"trong tên người dùng: mật khẩu định dạng"
 
-#. Truncate cache files time
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:10
-msgid "Truncate cache files time"
-msgstr "Cắt bỏ tập tin cạc khi"
+msgid "DNS and Query Settings"
+msgstr ""
 
-#. Time after which cached files will be truncated. (default value: 4d12h)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:11
-msgid "Time after which cached files will be truncated. (default value: 4d12h)"
-msgstr "Thời gian khi tập tin cạc sẽ bị cắt bỏ (Giá trị: 4d12h)"
+msgid "DNS server address"
+msgstr "Địa chỉ tên miền máy chủ"
 
-#. Delete cache files time
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:12
 msgid "Delete cache files time"
 msgstr "Xóa tập tin cạc khi"
 
-#. Time after which cached files will be deleted. (default value: 32d)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:13
-msgid "Time after which cached files will be deleted. (default value: 32d)"
-msgstr "Thời gian khi tập tin cạc sẽ bị xóa. (Giá trị: 32d)"
+msgid "Disk cache location"
+msgstr "Vị trí cạc đĩa"
 
-#. Polipo is a small and fast caching web proxy.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:14
-msgid "Polipo is a small and fast caching web proxy."
-msgstr "Polipo là một web proxy nhỏ và nhanh caching."
+msgid "Do not query IPv6"
+msgstr ""
 
-#. General
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:15
-msgid "General"
-msgstr "Tổng quát"
+msgid "Enable if cache (proxy) is shared by multiple users."
+msgstr "Kích hoạt nếu cạc được chia rẻ bởi nhiều người dùng."
 
-#. Allowed clients
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:16
-msgid "Allowed clients"
-msgstr "Đối tượng cho phép"
+msgid "First PMM segment size (in bytes)"
+msgstr "Dung lượng phân đoạn PMM đầu tiên (in bytes)"
 
-#. When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients that are allowed to connect. The format is IP address or network address (192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6)).
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:17
-msgid ""
-"When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients "
-"that are allowed to connect. The format is IP address or network address "
-"(192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))."
+msgid "General Settings"
 msgstr ""
-"Khi nghe địa chỉ được đặt ở 0.0.0.0 hoặc :: (IPv6), bạn phải liệt kê những "
-"đối tượng được phép kết nối. Định dạng là địa chỉ IP hoặc địa chỉ mạng "
-"(192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))."
-
-#. In RAM cache size (in bytes)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:18
-msgid "In RAM cache size (in bytes)"
-msgstr "Trong RAM dung lượng cạc (tính theo bytes)"
 
-#. How much RAM should Polipo use for its cache.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:19
 msgid "How much RAM should Polipo use for its cache."
 msgstr "Bao nhiêu RAM Polipo nên dùng cho cạc."
 
-#. DNS server address
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:20
-msgid "DNS server address"
-msgstr "Địa chỉ tên miền máy chủ"
-
-#. Set the DNS server address to use, if you want Polipo to use different DNS server than the host system.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:21
-msgid ""
-"Set the DNS server address to use, if you want Polipo to use different DNS "
-"server than the host system."
-msgstr ""
-"Cài đặt địa chỉ tên miền máy chủ để sử dụng, nếu bạn muốn Polipo dùng tên "
-"miền khác với hệ thông chính. "
-
-#. Query DNS for IPv6
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:22
-msgid "Query DNS for IPv6"
-msgstr "Tra vấn DNS cho IPv6"
+msgid "In RAM cache size (in bytes)"
+msgstr "Trong RAM dung lượng cạc (tính theo bytes)"
 
-#. false = Do not query IPv6; reluctantly = Query both, prefer IPv4; happily = Query both, prefer IPv6; true = Query only IPv6
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:23
-msgid ""
-"false = Do not query IPv6; reluctantly = Query both, prefer IPv4; happily = "
-"Query both, prefer IPv6; true = Query only IPv6"
-msgstr ""
-"False = Đừng truy vấn IPv6; reluctantly = Truy vấn cả hai, IPv4 được chuộng "
-"hơn; happily = truy vấn cả hai, IPv6 chuộng hơn; true = chỉ truy vấn IPv6"
+msgid "Listen address"
+msgstr "Địa chỉ nge"
 
-#. Query DNS by hostname
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:24
-msgid "Query DNS by hostname"
-msgstr "Tra vấn DNS bằng hostname"
+msgid "Listen port"
+msgstr "Cổng nghe"
 
-#. false = Never use system DNS resolver; reluctantly = Query DNS directly, if DNS server is unavailable fail to system DNS resolver; happily = Query DNS directly, if host could not be found fallback to system DNS resolver; true = Always use system DNS resolver
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:25
 msgid ""
-"false = Never use system DNS resolver; reluctantly = Query DNS directly, if "
-"DNS server is unavailable fail to system DNS resolver; happily = Query DNS "
-"directly, if host could not be found fallback to system DNS resolver; true = "
-"Always use system DNS resolver"
+"Location where polipo will cache files permanently. Use of external storage "
+"devices is recommended, because the cache can grow considerably. Leave it "
+"empty to disable on-disk cache."
 msgstr ""
-"false = Đừng bao giờ dùng bộ phân tích hệ thống DNS; reluctantly = Truy vấn "
-"DNS trực tiếp, nếu DNS server không có sẵn trong bộ phân tích hệ thống DNS; "
-"happily = truy vấn DNS trực tiếp, nếu host bị đẩy lùi so với bộ phân tích hệ "
-"thống DNS; true = Luân luân dùng bộ phân tích hệ thống DNS"
-
-#. Syslog facility
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:26
-msgid "Syslog facility"
-msgstr "Syslog facility"
+"Vị trị mà polipo sẽ định các tập tin thường xuyên. Sử dụng thiết bị nhớ "
+"ngoài được khuyến khích, bởi vì cạc có thể lớn lên đáng kể. Để lại nó trống "
+"để vô hiệu hóa Trên cạc trên đĩa."
 
-#. Log file location
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:27
 msgid "Log file location"
 msgstr "Vị trí tập tin sổ ghi"
 
-#. Use of external storage device is recommended, because the log file is written frequently and can grow considerably.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:28
-msgid ""
-"Use of external storage device is recommended, because the log file is "
-"written frequently and can grow considerably."
-msgstr ""
-"Nên dùng bộ nhớ ngoài bởi vì tập tin sổ ghi được viết rất nhiều lần và có "
-"thể phát tán rất mạnh. "
-
-#. Log to syslog
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:29
 msgid "Log to syslog"
 msgstr "Log to syslog"
 
-#. Parent proxy authentication
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:30
-msgid "Parent proxy authentication"
-msgstr "Xác thực parent proxy "
+msgid "Logging and RAM"
+msgstr ""
 
-#. Basic HTTP authentication supported. Provide username and password in username:password format.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:31
-msgid ""
-"Basic HTTP authentication supported. Provide username and password in "
-"username:password format."
+msgid "Never use system DNS resolver"
+msgstr ""
+
+msgid "On-Disk Cache"
+msgstr "Cạc trên ổ đĩa"
+
+msgid "PMM segments size (in bytes)"
+msgstr "Dung lượng phân đoạn PMM (in bytes)"
+
+msgid "Parent Proxy"
 msgstr ""
-"Sự chứng thực HTTP Cơ bản được hỗ trợ. Cung cấp tên người dùng và mật khẩu "
-"trong tên người dùng: mật khẩu định dạng"
 
-#. Parent proxy address
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:32
 msgid "Parent proxy address"
 msgstr "Địa chỉ parent proxy "
 
-#. Parent proxy address (in host:port format), to which Polipo will forward the requests.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:33
 msgid ""
 "Parent proxy address (in host:port format), to which Polipo will forward the "
 "requests."
@@ -230,37 +105,18 @@ msgstr ""
 "Địa chỉ parent proxy (in host:port format), cái mà Polipo sẽ chuyển yêu cầu "
 "tới."
 
-#. Listen address
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:34
-msgid "Listen address"
-msgstr "Địa chỉ nge"
-
-#. The interface on which Polipo will listen. To listen on all interfaces use 0.0.0.0 or :: (IPv6).
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:35
-msgid ""
-"The interface on which Polipo will listen. To listen on all interfaces use "
-"0.0.0.0 or :: (IPv6)."
-msgstr ""
-"Giao diện mà Polipo sẽ nghe. Để nghe trên tất cả các giao diện dùng 0.0.0.0 "
-"hoặc :: (IPv6)"
+msgid "Parent proxy authentication"
+msgstr "Xác thực parent proxy "
 
-#. Listen port
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:36
-msgid "Listen port"
-msgstr "Cổng nghe"
+msgid "Polipo"
+msgstr "Polipo"
 
-#. Port on which Polipo will listen. (default value: 8123)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:37
-msgid "Port on which Polipo will listen. (default value: 8123)"
-msgstr "Cổng mà Polipo sẽ nghe. (giá trị: 8123)"
+msgid "Polipo is a small and fast caching web proxy."
+msgstr "Polipo là một web proxy nhỏ và nhanh caching."
 
-#. Poor Man&#39;s Multiplexing
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:38
 msgid "Poor Man's Multiplexing"
 msgstr "Poor Man&amp;#39;s Multiplexing"
 
-#. Poor Man&#39;s Multiplexing (PMM) is a technique that simulates multiplexing by requesting an instance in multiple segments. It tries to lower the latency caused by the weakness of HTTP protocol. NOTE: some sites may not work with PMM enabled.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:39
 msgid ""
 "Poor Man's Multiplexing (PMM) is a technique that simulates multiplexing by "
 "requesting an instance in multiple segments. It tries to lower the latency "
@@ -272,13 +128,43 @@ msgstr ""
 "hạ thấp sự trễ nãi do các điểm yếu HTTP protocol gây ra. Chú ý: một số trang "
 "web có thể không hoạt động với PMM bật."
 
-#. First PMM segment size (in bytes)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:40
-msgid "First PMM segment size (in bytes)"
-msgstr "Dung lượng phân đoạn PMM đầu tiên (in bytes)"
+msgid "Port on which Polipo will listen"
+msgstr ""
+
+msgid "Proxy"
+msgstr ""
+
+msgid "Query DNS by hostname"
+msgstr "Tra vấn DNS bằng hostname"
+
+msgid "Query DNS directly, fallback to system resolver"
+msgstr ""
+
+msgid "Query DNS directly, for unknown hosts fall back to system resolver"
+msgstr ""
+
+msgid "Query DNS for IPv6"
+msgstr "Tra vấn DNS cho IPv6"
+
+msgid "Query IPv4 and IPv6, prefer IPv4"
+msgstr ""
+
+msgid "Query IPv4 and IPv6, prefer IPv6"
+msgstr ""
+
+msgid "Query only IPv6"
+msgstr ""
+
+msgid ""
+"Set the DNS server address to use, if you want Polipo to use different DNS "
+"server than the host system."
+msgstr ""
+"Cài đặt địa chỉ tên miền máy chủ để sử dụng, nếu bạn muốn Polipo dùng tên "
+"miền khác với hệ thông chính. "
+
+msgid "Shared cache"
+msgstr "Cạc trên ổ đĩa"
 
-#. Size of the first PMM segment. If not defined, it defaults to twice the PMM segment size.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:41
 msgid ""
 "Size of the first PMM segment. If not defined, it defaults to twice the PMM "
 "segment size."
@@ -286,13 +172,110 @@ msgstr ""
 "Dung lượng của phân đoạn PMM đầu tiên. Nếu không định nghĩa sẽ mặc định dung "
 "lượng của phân đoạn PMM gấp 2 lần"
 
-#. PMM segments size (in bytes)
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:42
-msgid "PMM segments size (in bytes)"
-msgstr "Dung lượng phân đoạn PMM (in bytes)"
+msgid "Size to which cached files should be truncated"
+msgstr ""
+
+msgid "Syslog facility"
+msgstr "Syslog facility"
+
+msgid ""
+"The interface on which Polipo will listen. To listen on all interfaces use "
+"0.0.0.0 or :: (IPv6)."
+msgstr ""
+"Giao diện mà Polipo sẽ nghe. Để nghe trên tất cả các giao diện dùng 0.0.0.0 "
+"hoặc :: (IPv6)"
+
+msgid "Time after which cached files will be deleted"
+msgstr ""
+
+msgid "Time after which cached files will be truncated"
+msgstr ""
+
+msgid "To enable PMM, PMM segment size must be set to some positive value."
+msgstr ""
+
+msgid "Truncate cache files size (in bytes)"
+msgstr "Bỏ bớt những tập tin cạc với dung lượng  (bytes)"
+
+msgid "Truncate cache files time"
+msgstr "Cắt bỏ tập tin cạc khi"
+
+msgid ""
+"Use of external storage device is recommended, because the log file is "
+"written frequently and can grow considerably."
+msgstr ""
+"Nên dùng bộ nhớ ngoài bởi vì tập tin sổ ghi được viết rất nhiều lần và có "
+"thể phát tán rất mạnh. "
 
-#. To enable PMM, PMM segment size must be set to some positive value.
-#: applications/luci-polipo/luasrc/i18n/polipo.en.lua:43
-msgid "polipo_pmm_pmmsize_desc"
+msgid ""
+"When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients "
+"that are allowed to connect. The format is IP address or network address "
+"(192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))"
 msgstr ""
-"Để kích hoạt PMM, dung lượng phân đoạn PMM phải được đặt những giá trị dương."
+
+msgid "enable"
+msgstr ""
+
+#~ msgid ""
+#~ "To enable polipo on-disk cache cleaning (highly recommended), you should "
+#~ "add a cron job in Scheduled Tasks services that will execute /usr/sbin/"
+#~ "polipo_purge script. For example to perform disk cache cleanup every day "
+#~ "at 6:00 in the morning you should add the following line in Scheduled "
+#~ "Tasks \"0 6 * * *\\t/usr/sbin/polipo_purge\" (without quotes)."
+#~ msgstr ""
+#~ "Để kích hoạt tính năng làm sạch trên cạc đĩa polipo (rất khuyến khích), "
+#~ "bạn nên thêm vào một công việc cron trong những công tác đã schedule, nó "
+#~ "sẽ thực hiện / usr / sbin / polipo_purge script. Ví dụ: để thực hiện các "
+#~ "đĩa bộ nhớ cache mỗi ngày vào lúc 6:00 sáng, bạn nên thêm dòng sau trong "
+#~ "Scheduled công việc &amp;quot;0 6 * * * /usr/sbin/polipo_purge&amp;quot; "
+#~ "(không có dấu ngoặc kép)."
+
+#~ msgid ""
+#~ "Size to which cached files should be truncated. (default value: 1048576)"
+#~ msgstr "Dung lượng mà những tập tin cạc bị cắt bỏ. (Giá trị: 1048576)"
+
+#~ msgid ""
+#~ "Time after which cached files will be truncated. (default value: 4d12h)"
+#~ msgstr "Thời gian khi tập tin cạc sẽ bị cắt bỏ (Giá trị: 4d12h)"
+
+#~ msgid "Time after which cached files will be deleted. (default value: 32d)"
+#~ msgstr "Thời gian khi tập tin cạc sẽ bị xóa. (Giá trị: 32d)"
+
+#~ msgid "General"
+#~ msgstr "Tổng quát"
+
+#~ msgid ""
+#~ "When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients "
+#~ "that are allowed to connect. The format is IP address or network address "
+#~ "(192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))."
+#~ msgstr ""
+#~ "Khi nghe địa chỉ được đặt ở 0.0.0.0 hoặc :: (IPv6), bạn phải liệt kê "
+#~ "những đối tượng được phép kết nối. Định dạng là địa chỉ IP hoặc địa chỉ "
+#~ "mạng (192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))."
+
+#~ msgid ""
+#~ "false = Do not query IPv6; reluctantly = Query both, prefer IPv4; happily "
+#~ "= Query both, prefer IPv6; true = Query only IPv6"
+#~ msgstr ""
+#~ "False = Đừng truy vấn IPv6; reluctantly = Truy vấn cả hai, IPv4 được "
+#~ "chuộng hơn; happily = truy vấn cả hai, IPv6 chuộng hơn; true = chỉ truy "
+#~ "vấn IPv6"
+
+#~ msgid ""
+#~ "false = Never use system DNS resolver; reluctantly = Query DNS directly, "
+#~ "if DNS server is unavailable fail to system DNS resolver; happily = Query "
+#~ "DNS directly, if host could not be found fallback to system DNS resolver; "
+#~ "true = Always use system DNS resolver"
+#~ msgstr ""
+#~ "false = Đừng bao giờ dùng bộ phân tích hệ thống DNS; reluctantly = Truy "
+#~ "vấn DNS trực tiếp, nếu DNS server không có sẵn trong bộ phân tích hệ "
+#~ "thống DNS; happily = truy vấn DNS trực tiếp, nếu host bị đẩy lùi so với "
+#~ "bộ phân tích hệ thống DNS; true = Luân luân dùng bộ phân tích hệ thống DNS"
+
+#~ msgid "Port on which Polipo will listen. (default value: 8123)"
+#~ msgstr "Cổng mà Polipo sẽ nghe. (giá trị: 8123)"
+
+#~ msgid "polipo_pmm_pmmsize_desc"
+#~ msgstr ""
+#~ "Để kích hoạt PMM, dung lượng phân đoạn PMM phải được đặt những giá trị "
+#~ "dương."