summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--po/ca/admin-core.po3
-rw-r--r--po/ca/asterisk.po10
-rw-r--r--po/ca/cbi.po2
-rw-r--r--po/ca/ddns.po2
-rw-r--r--po/ca/initmgr.po2
-rw-r--r--po/ca/livestats.po2
-rw-r--r--po/ca/luci-fw.po2
-rw-r--r--po/ca/ntpc.po2
-rw-r--r--po/ca/olsr.po2
-rw-r--r--po/ca/openvpn.po2
-rw-r--r--po/ca/qos.po2
-rw-r--r--po/ca/rrdtool.po2
-rw-r--r--po/ca/samba.po2
-rw-r--r--po/ca/statistics.po2
-rw-r--r--po/ca/sysauth.po2
-rw-r--r--po/ca/tinyproxy.po2
-rw-r--r--po/ca/upnp.po2
-rw-r--r--po/ca/ushare.po10
-rw-r--r--po/de/admin-core.po3
-rw-r--r--po/de/asterisk.po11
-rw-r--r--po/de/cbi.po2
-rw-r--r--po/de/ddns.po2
-rw-r--r--po/de/initmgr.po2
-rw-r--r--po/de/livestats.po2
-rw-r--r--po/de/luci-fw.po2
-rw-r--r--po/de/ntpc.po2
-rw-r--r--po/de/olsr.po2
-rw-r--r--po/de/openvpn.po2
-rw-r--r--po/de/p910nd.po2
-rw-r--r--po/de/polipo.po2
-rw-r--r--po/de/rrdtool.po2
-rw-r--r--po/de/samba.po2
-rw-r--r--po/de/statistics.po2
-rw-r--r--po/de/tinyproxy.po2
-rw-r--r--po/de/upnp.po2
-rw-r--r--po/de/ushare.po10
-rw-r--r--po/el/admin-core.po3
-rw-r--r--po/el/asterisk.po10
-rw-r--r--po/el/cbi.po2
-rw-r--r--po/el/coovachilli.po4
-rw-r--r--po/el/initmgr.po2
-rw-r--r--po/el/livestats.po2
-rw-r--r--po/el/luci-fw.po2
-rw-r--r--po/el/ntpc.po2
-rw-r--r--po/el/olsr.po2
-rw-r--r--po/el/openvpn.po2
-rw-r--r--po/el/p910nd.po2
-rw-r--r--po/el/polipo.po2
-rw-r--r--po/el/qos.po2
-rw-r--r--po/el/rrdtool.po2
-rw-r--r--po/el/samba.po2
-rw-r--r--po/el/statistics.po2
-rw-r--r--po/el/sysauth.po2
-rw-r--r--po/el/tinyproxy.po2
-rw-r--r--po/el/upnp.po2
-rw-r--r--po/el/ushare.po10
-rw-r--r--po/el/uvc_streamer.po4
-rw-r--r--po/el/uvl.po4
-rw-r--r--po/en/admin-core.po3
-rw-r--r--po/en/asterisk.po10
-rw-r--r--po/en/cbi.po2
-rw-r--r--po/en/initmgr.po2
-rw-r--r--po/en/livestats.po2
-rw-r--r--po/en/luci-fw.po2
-rw-r--r--po/en/ntpc.po2
-rw-r--r--po/en/olsr.po2
-rw-r--r--po/en/openvpn.po2
-rw-r--r--po/en/p910nd.po2
-rw-r--r--po/en/polipo.po2
-rw-r--r--po/en/qos.po2
-rw-r--r--po/en/rrdtool.po2
-rw-r--r--po/en/samba.po2
-rw-r--r--po/en/statistics.po2
-rw-r--r--po/en/tinyproxy.po2
-rw-r--r--po/en/ushare.po10
-rw-r--r--po/es/admin-core.po3
-rw-r--r--po/es/asterisk.po10
-rw-r--r--po/es/cbi.po2
-rw-r--r--po/es/coovachilli.po4
-rw-r--r--po/es/ddns.po2
-rw-r--r--po/es/initmgr.po2
-rw-r--r--po/es/livestats.po2
-rw-r--r--po/es/luci-fw.po2
-rw-r--r--po/es/ntpc.po2
-rw-r--r--po/es/olsr.po2
-rw-r--r--po/es/openvpn.po2
-rw-r--r--po/es/qos.po2
-rw-r--r--po/es/rrdtool.po2
-rw-r--r--po/es/samba.po2
-rw-r--r--po/es/statistics.po2
-rw-r--r--po/es/tinyproxy.po2
-rw-r--r--po/es/upnp.po2
-rw-r--r--po/es/ushare.po10
-rw-r--r--po/fr/admin-core.po3
-rw-r--r--po/fr/asterisk.po10
-rw-r--r--po/fr/cbi.po2
-rw-r--r--po/fr/coovachilli.po4
-rw-r--r--po/fr/ddns.po2
-rw-r--r--po/fr/initmgr.po2
-rw-r--r--po/fr/livestats.po2
-rw-r--r--po/fr/luci-fw.po2
-rw-r--r--po/fr/ntpc.po2
-rw-r--r--po/fr/olsr.po2
-rw-r--r--po/fr/openvpn.po2
-rw-r--r--po/fr/p910nd.po2
-rw-r--r--po/fr/polipo.po2
-rw-r--r--po/fr/rrdtool.po2
-rw-r--r--po/fr/samba.po2
-rw-r--r--po/fr/statistics.po2
-rw-r--r--po/fr/tinyproxy.po2
-rw-r--r--po/fr/upnp.po2
-rw-r--r--po/fr/ushare.po10
-rw-r--r--po/fr/uvl.po4
-rw-r--r--po/fr/wifi.po4
-rw-r--r--po/it/admin-core.po3
-rw-r--r--po/it/asterisk.po10
-rw-r--r--po/it/cbi.po2
-rw-r--r--po/it/coovachilli.po4
-rw-r--r--po/it/ddns.po2
-rw-r--r--po/it/initmgr.po2
-rw-r--r--po/it/livestats.po2
-rw-r--r--po/it/luci-fw.po2
-rw-r--r--po/it/ntpc.po2
-rw-r--r--po/it/olsr.po2
-rw-r--r--po/it/openvpn.po2
-rw-r--r--po/it/p910nd.po2
-rw-r--r--po/it/polipo.po2
-rw-r--r--po/it/qos.po2
-rw-r--r--po/it/rrdtool.po2
-rw-r--r--po/it/samba.po2
-rw-r--r--po/it/statistics.po2
-rw-r--r--po/it/sysauth.po2
-rw-r--r--po/it/tinyproxy.po2
-rw-r--r--po/it/upnp.po2
-rw-r--r--po/it/ushare.po10
-rw-r--r--po/it/uvc_streamer.po4
-rw-r--r--po/it/uvl.po4
-rw-r--r--po/ja/admin-core.po3
-rw-r--r--po/ja/asterisk.po10
-rw-r--r--po/ja/cbi.po2
-rw-r--r--po/ja/coovachilli.po4
-rw-r--r--po/ja/ddns.po2
-rw-r--r--po/ja/initmgr.po2
-rw-r--r--po/ja/livestats.po2
-rw-r--r--po/ja/luci-fw.po2
-rw-r--r--po/ja/ntpc.po2
-rw-r--r--po/ja/olsr.po2
-rw-r--r--po/ja/openvpn.po2
-rw-r--r--po/ja/p910nd.po2
-rw-r--r--po/ja/polipo.po2
-rw-r--r--po/ja/qos.po2
-rw-r--r--po/ja/rrdtool.po2
-rw-r--r--po/ja/samba.po2
-rw-r--r--po/ja/statistics.po2
-rw-r--r--po/ja/sysauth.po2
-rw-r--r--po/ja/tinyproxy.po2
-rw-r--r--po/ja/upnp.po2
-rw-r--r--po/ja/ushare.po10
-rw-r--r--po/ja/uvc_streamer.po4
-rw-r--r--po/ja/uvl.po4
-rw-r--r--po/ja/wifi.po4
-rw-r--r--po/pt/admin-core.po3
-rw-r--r--po/pt/asterisk.po5
-rw-r--r--po/pt/cbi.po2
-rw-r--r--po/pt/coovachilli.po4
-rw-r--r--po/pt/ddns.po2
-rw-r--r--po/pt/initmgr.po2
-rw-r--r--po/pt/livestats.po2
-rw-r--r--po/pt/luci-fw.po2
-rw-r--r--po/pt/ntpc.po2
-rw-r--r--po/pt/olsr.po2
-rw-r--r--po/pt/p910nd.po2
-rw-r--r--po/pt/qos.po2
-rw-r--r--po/pt/rrdtool.po2
-rw-r--r--po/pt/samba.po2
-rw-r--r--po/pt/statistics.po2
-rw-r--r--po/pt/sysauth.po2
-rw-r--r--po/pt/tinyproxy.po2
-rw-r--r--po/pt/upnp.po2
-rw-r--r--po/pt/ushare.po10
-rw-r--r--po/pt_BR/admin-core.po3
-rw-r--r--po/pt_BR/asterisk.po5
-rw-r--r--po/pt_BR/cbi.po2
-rw-r--r--po/pt_BR/coovachilli.po4
-rw-r--r--po/pt_BR/ddns.po2
-rw-r--r--po/pt_BR/initmgr.po2
-rw-r--r--po/pt_BR/livestats.po2
-rw-r--r--po/pt_BR/luci-fw.po2
-rw-r--r--po/pt_BR/ntpc.po2
-rw-r--r--po/pt_BR/olsr.po2
-rw-r--r--po/pt_BR/p910nd.po2
-rw-r--r--po/pt_BR/qos.po2
-rw-r--r--po/pt_BR/rrdtool.po2
-rw-r--r--po/pt_BR/samba.po2
-rw-r--r--po/pt_BR/statistics.po2
-rw-r--r--po/pt_BR/sysauth.po2
-rw-r--r--po/pt_BR/tinyproxy.po2
-rw-r--r--po/pt_BR/upnp.po2
-rw-r--r--po/pt_BR/ushare.po10
-rw-r--r--po/ru/admin-core.po3
-rw-r--r--po/ru/asterisk.po10
-rw-r--r--po/ru/cbi.po2
-rw-r--r--po/ru/coovachilli.po4
-rw-r--r--po/ru/ddns.po2
-rw-r--r--po/ru/initmgr.po2
-rw-r--r--po/ru/livestats.po2
-rw-r--r--po/ru/luci-fw.po2
-rw-r--r--po/ru/ntpc.po2
-rw-r--r--po/ru/olsr.po2
-rw-r--r--po/ru/openvpn.po2
-rw-r--r--po/ru/p910nd.po2
-rw-r--r--po/ru/polipo.po2
-rw-r--r--po/ru/qos.po2
-rw-r--r--po/ru/rrdtool.po2
-rw-r--r--po/ru/samba.po2
-rw-r--r--po/ru/statistics.po2
-rw-r--r--po/ru/sysauth.po2
-rw-r--r--po/ru/tinyproxy.po2
-rw-r--r--po/ru/upnp.po2
-rw-r--r--po/ru/ushare.po10
-rw-r--r--po/ru/uvc_streamer.po4
-rw-r--r--po/ru/uvl.po4
-rw-r--r--po/ru/wifi.po4
-rw-r--r--po/templates/admin-core.pot2
-rw-r--r--po/templates/asterisk.pot2
-rw-r--r--po/templates/cbi.pot2
-rw-r--r--po/templates/coovachilli.pot2
-rw-r--r--po/templates/default.pot2
-rw-r--r--po/templates/freifunk.pot2
-rw-r--r--po/templates/initmgr.pot2
-rw-r--r--po/templates/livestats.pot2
-rw-r--r--po/templates/luci-fw.pot2
-rw-r--r--po/templates/ntpc.pot2
-rw-r--r--po/templates/olsr.pot2
-rw-r--r--po/templates/openvpn.pot2
-rw-r--r--po/templates/p910nd.pot2
-rw-r--r--po/templates/polipo.pot2
-rw-r--r--po/templates/qos.pot2
-rw-r--r--po/templates/rrdtool.pot2
-rw-r--r--po/templates/samba.pot2
-rw-r--r--po/templates/statistics.pot2
-rw-r--r--po/templates/tinyproxy.pot2
-rw-r--r--po/templates/ushare.pot2
-rw-r--r--po/templates/uvc_streamer.pot2
-rw-r--r--po/templates/uvl.pot2
-rw-r--r--po/templates/wifi.pot2
-rw-r--r--po/vi/admin-core.po7
-rw-r--r--po/vi/asterisk.po10
-rw-r--r--po/vi/cbi.po2
-rw-r--r--po/vi/ddns.po2
-rw-r--r--po/vi/initmgr.po2
-rw-r--r--po/vi/livestats.po2
-rw-r--r--po/vi/luci-fw.po2
-rw-r--r--po/vi/ntpc.po2
-rw-r--r--po/vi/olsr.po2
-rw-r--r--po/vi/openvpn.po2
-rw-r--r--po/vi/p910nd.po2
-rw-r--r--po/vi/qos.po2
-rw-r--r--po/vi/rrdtool.po2
-rw-r--r--po/vi/samba.po2
-rw-r--r--po/vi/statistics.po2
-rw-r--r--po/vi/sysauth.po2
-rw-r--r--po/vi/tinyproxy.po2
-rw-r--r--po/vi/upnp.po2
-rw-r--r--po/vi/ushare.po10
-rw-r--r--po/vi/uvl.po4
-rw-r--r--po/zh_CN/admin-core.po8
-rw-r--r--po/zh_CN/asterisk.po9
-rw-r--r--po/zh_CN/cbi.po2
-rw-r--r--po/zh_CN/ddns.po2
-rw-r--r--po/zh_CN/initmgr.po2
-rw-r--r--po/zh_CN/luci-fw.po2
-rw-r--r--po/zh_CN/openvpn.po2
-rw-r--r--po/zh_CN/samba.po2
-rw-r--r--po/zh_CN/statistics.po2
-rw-r--r--po/zh_CN/sysauth.po2
-rw-r--r--po/zh_CN/wifi.po4
277 files changed, 317 insertions, 493 deletions
diff --git a/po/ca/admin-core.po b/po/ca/admin-core.po
index ea0c7b6f3..88ede9556 100644
--- a/po/ca/admin-core.po
+++ b/po/ca/admin-core.po
@@ -97,7 +97,8 @@ msgstr ""
#: i18n/english/luasrc/i18n/admin-core.en.lua:13
msgid ""
"Notice: In <abbr title=\"Lua Configuration Interface\">LuCI</abbr> changes "
-"have to be confirmed by clicking Changes - Save &amp; Apply before being applied."
+"have to be confirmed by clicking Changes - Save &amp; Apply before being "
+"applied."
msgstr ""
"Alerta: A <abbr title=\"Interfície de configuració Lua\">LuCI</abbr> els "
"canvis s&#39;han de confirmar clicant \"Canvis --> Desa &amp; Aplica\" abans "
diff --git a/po/ca/asterisk.po b/po/ca/asterisk.po
index 71318c9a0..4bfb63c3a 100644
--- a/po/ca/asterisk.po
+++ b/po/ca/asterisk.po
@@ -118,11 +118,6 @@ msgstr "Transmet silenci SLINEAR mentre s'enregistri un canal"
msgid "Verbose Level"
msgstr "Nivell de detall"
-#. Time Zone
-#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:22
-msgid "Time Zone"
-msgstr "Fus horari"
-
#. Section dialplan
#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:23
msgid "Section dialplan"
@@ -1127,8 +1122,3 @@ msgstr "Configuració de zona de veu"
#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:250
msgid "Message Format"
msgstr "Format de missatge"
-
-#. Time Zone
-#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:251
-msgid "asterisk_voicezone_zone"
-msgstr "Zona horària"
diff --git a/po/ca/cbi.po b/po/ca/cbi.po
index 48665ab19..cba47122c 100644
--- a/po/ca/cbi.po
+++ b/po/ca/cbi.po
@@ -103,5 +103,5 @@ msgstr "Fitxer pujat"
#. Search file...
#: i18n/english/luasrc/i18n/cbi.en.lua:17
-msgid "cbi_browser"
+msgid "Search file..."
msgstr "Cerca fitxer..."
diff --git a/po/ca/ddns.po b/po/ca/ddns.po
index ef916605d..9e0586de6 100644
--- a/po/ca/ddns.po
+++ b/po/ca/ddns.po
@@ -54,5 +54,5 @@ msgstr "Unitat de temps de forceig"
#. Custom Update-URL
#: applications/luci-ddns/luasrc/i18n/ddns.en.lua:8
-msgid "ddns_service_updateurl"
+msgid "Custom Update-URL"
msgstr "URL d'actualització personalitzada"
diff --git a/po/ca/initmgr.po b/po/ca/initmgr.po
index 823ff52f6..b7c83b1ef 100644
--- a/po/ca/initmgr.po
+++ b/po/ca/initmgr.po
@@ -42,5 +42,5 @@ msgstr "Script d'inici"
#. Enable/Disable
#: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:5
-msgid "initmgr_enabled"
+msgid "Enable/Disable"
msgstr "Activa/Desactiva"
diff --git a/po/ca/livestats.po b/po/ca/livestats.po
index 23d1135fb..a0cf22903 100644
--- a/po/ca/livestats.po
+++ b/po/ca/livestats.po
@@ -45,5 +45,5 @@ msgstr "Estat Wireless en temps real"
#. Realtime Network Traffic
#: applications/luci-livestats/luasrc/i18n/livestats.en.lua:7
-msgid "livestats_stat_traffic"
+msgid "Realtime Network Traffic"
msgstr "Estat de xarxa en temps real"
diff --git a/po/ca/luci-fw.po b/po/ca/luci-fw.po
index 4ad8b7b5c..9200a777d 100644
--- a/po/ca/luci-fw.po
+++ b/po/ca/luci-fw.po
@@ -263,5 +263,5 @@ msgstr "Xarxes"
#. contained networks
#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:56
-msgid "firewall_zone_network_desc"
+msgid "contained networks"
msgstr "Xarxes contingudes"
diff --git a/po/ca/ntpc.po b/po/ca/ntpc.po
index 64c42c52c..85e3a9339 100644
--- a/po/ca/ntpc.po
+++ b/po/ca/ntpc.po
@@ -55,5 +55,5 @@ msgstr "Compensació de freqüència"
#. Current system time
#: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:9
-msgid "ntpc_current"
+msgid "Current system time"
msgstr "Horari del sistema actual"
diff --git a/po/ca/olsr.po b/po/ca/olsr.po
index 3592c79fd..ad2718b18 100644
--- a/po/ca/olsr.po
+++ b/po/ca/olsr.po
@@ -661,5 +661,5 @@ msgstr "Fitxer de clau"
#. Watchdog timestamp file
#: applications/luci-olsr/luasrc/i18n/olsr.en.lua:128
-msgid "olsrd_loadplugin_file"
+msgid "Watchdog timestamp file"
msgstr "Fitxer de marca horària de Watchdog"
diff --git a/po/ca/openvpn.po b/po/ca/openvpn.po
index 3af4774ca..9e56364c7 100644
--- a/po/ca/openvpn.po
+++ b/po/ca/openvpn.po
@@ -964,5 +964,5 @@ msgstr "Requereix ús de clau explícita extesa al certificat"
#. Require normal and extended key usage on certificate
#: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:196
-msgid "openvpn_param_remote_cert_tls"
+msgid "Require normal and extended key usage on certificate"
msgstr "Requereix ús de clau normal i extesa al certificat"
diff --git a/po/ca/qos.po b/po/ca/qos.po
index 984283bf4..18c4fe089 100644
--- a/po/ca/qos.po
+++ b/po/ca/qos.po
@@ -108,5 +108,5 @@ msgstr "prioritat"
#. Bytes sent
#: applications/luci-qos/luasrc/i18n/qos.en.lua:18
-msgid "qos_connbytes"
+msgid "Bytes sent"
msgstr "Bytes enviats"
diff --git a/po/ca/rrdtool.po b/po/ca/rrdtool.po
index a31c9ff89..278a64f1b 100644
--- a/po/ca/rrdtool.po
+++ b/po/ca/rrdtool.po
@@ -270,5 +270,5 @@ msgstr "5 min"
#. 15 min
#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:69
-msgid "stat_ds_load__longterm"
+msgid "15 min"
msgstr "15 min"
diff --git a/po/ca/samba.po b/po/ca/samba.po
index 8bfffeec1..a5e4efa84 100644
--- a/po/ca/samba.po
+++ b/po/ca/samba.po
@@ -97,5 +97,5 @@ msgstr "Màscara de directori"
#. Mask for new directories
#: applications/luci-samba/luasrc/i18n/samba.en.lua:17
-msgid "samba_sambashare_dirmask_desc"
+msgid "Mask for new directories"
msgstr "Màscara per directoris nous"
diff --git a/po/ca/statistics.po b/po/ca/statistics.po
index f0e2f75e0..3047f5aba 100644
--- a/po/ca/statistics.po
+++ b/po/ca/statistics.po
@@ -825,5 +825,5 @@ msgstr ""
#. Enable this plugin
#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:212
-msgid "lucistatistics_collectdwireless_enable"
+msgid "Enable this plugin"
msgstr "Activa aquest connector"
diff --git a/po/ca/sysauth.po b/po/ca/sysauth.po
index c5934a16d..f733f72f9 100644
--- a/po/ca/sysauth.po
+++ b/po/ca/sysauth.po
@@ -25,5 +25,5 @@ msgstr "Si us plau entra el teu nom d'usuari i contrasenya."
#. Invalid username and/or password! Please try again.
#: i18n/english/luasrc/i18n/sysauth.en.lua:3
-msgid "sysauth_failed"
+msgid "Invalid username and/or password! Please try again."
msgstr "Usuari i/o contrasenya invàlids! Si us plau prova-ho de nou."
diff --git a/po/ca/tinyproxy.po b/po/ca/tinyproxy.po
index eb090fd4a..faca82f98 100644
--- a/po/ca/tinyproxy.po
+++ b/po/ca/tinyproxy.po
@@ -170,5 +170,5 @@ msgstr "Tipus"
#. Upstream Proxy
#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:32
-msgid "tinyproxy_upstream_via"
+msgid "Upstream Proxy"
msgstr "Proxy de pujada"
diff --git a/po/ca/upnp.po b/po/ca/upnp.po
index bdfc97a60..0edbbc869 100644
--- a/po/ca/upnp.po
+++ b/po/ca/upnp.po
@@ -53,5 +53,5 @@ msgstr "Enllaç de baixada"
#. Uplink
#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:7
-msgid "upnpd_config_upload"
+msgid "Uplink"
msgstr "Enllaç de pujada"
diff --git a/po/ca/ushare.po b/po/ca/ushare.po
index 0e2b2fef7..5608a998c 100644
--- a/po/ca/ushare.po
+++ b/po/ca/ushare.po
@@ -42,13 +42,3 @@ msgstr "Nom de servidor"
#: applications/luci-ushare/luasrc/i18n/ushare.en.lua:6
msgid "Settings"
msgstr "Configuració"
-
-#. uShare
-#: applications/luci-ushare/luasrc/i18n/ushare.en.lua:7
-msgid "uShare"
-msgstr "uShare"
-
-#. uShare
-#: applications/luci-ushare/luasrc/i18n/ushare.en.lua:8
-msgid "ushare_desc"
-msgstr "uShare"
diff --git a/po/de/admin-core.po b/po/de/admin-core.po
index 962c64aed..8f8c735fd 100644
--- a/po/de/admin-core.po
+++ b/po/de/admin-core.po
@@ -91,7 +91,8 @@ msgstr ""
#: i18n/english/luasrc/i18n/admin-core.en.lua:13
msgid ""
"Notice: In <abbr title=\"Lua Configuration Interface\">LuCI</abbr> changes "
-"have to be confirmed by clicking Changes - Save &amp; Apply before being applied."
+"have to be confirmed by clicking Changes - Save &amp; Apply before being "
+"applied."
msgstr ""
"Hinweis: In LuCI werden getätigte Änderungen erst nach einem Klick auf "
"Änderungen - Speichern &amp; Anwenden angewandt."
diff --git a/po/de/asterisk.po b/po/de/asterisk.po
index cf18b8b10..3947abd35 100644
--- a/po/de/asterisk.po
+++ b/po/de/asterisk.po
@@ -127,12 +127,6 @@ msgstr ""
msgid "Verbose Level"
msgstr "Fehlerausgabestufe"
-#. Time Zone
-#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:22
-#, fuzzy
-msgid "Time Zone"
-msgstr "Fehlerausgabestufe"
-
#. Section dialplan
#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:23
msgid "Section dialplan"
@@ -1137,8 +1131,3 @@ msgstr ""
#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:250
msgid "Message Format"
msgstr ""
-
-#. Time Zone
-#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:251
-msgid "asterisk_voicezone_zone"
-msgstr ""
diff --git a/po/de/cbi.po b/po/de/cbi.po
index f435d6712..02d7c916b 100644
--- a/po/de/cbi.po
+++ b/po/de/cbi.po
@@ -101,5 +101,5 @@ msgstr "hochgeladene Datei"
#. Search file...
#: i18n/english/luasrc/i18n/cbi.en.lua:17
-msgid "cbi_browser"
+msgid "Search file..."
msgstr "Datei suchen..."
diff --git a/po/de/ddns.po b/po/de/ddns.po
index b16887f82..5b7809123 100644
--- a/po/de/ddns.po
+++ b/po/de/ddns.po
@@ -53,5 +53,5 @@ msgstr "Erzwinge-Zeiteinheit"
#. Custom Update-URL
#: applications/luci-ddns/luasrc/i18n/ddns.en.lua:8
-msgid "ddns_service_updateurl"
+msgid "Custom Update-URL"
msgstr "Eigene Update-URL"
diff --git a/po/de/initmgr.po b/po/de/initmgr.po
index cf9a81719..74c4ac90b 100644
--- a/po/de/initmgr.po
+++ b/po/de/initmgr.po
@@ -41,5 +41,5 @@ msgstr "Startscript"
#. Enable/Disable
#: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:5
-msgid "initmgr_enabled"
+msgid "Enable/Disable"
msgstr "Aktivieren/Deaktivieren"
diff --git a/po/de/livestats.po b/po/de/livestats.po
index 28b43187e..44df863c8 100644
--- a/po/de/livestats.po
+++ b/po/de/livestats.po
@@ -44,5 +44,5 @@ msgstr "Echtzeit-Drahtlosstatus"
#. Realtime Network Traffic
#: applications/luci-livestats/luasrc/i18n/livestats.en.lua:7
-msgid "livestats_stat_traffic"
+msgid "Realtime Network Traffic"
msgstr "Echtzeit-Netzwerkverkehr"
diff --git a/po/de/luci-fw.po b/po/de/luci-fw.po
index 92c969e9f..b7b1502e9 100644
--- a/po/de/luci-fw.po
+++ b/po/de/luci-fw.po
@@ -259,5 +259,5 @@ msgstr "Netzwerke"
#. contained networks
#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:56
-msgid "firewall_zone_network_desc"
+msgid "contained networks"
msgstr "verbundene Netzwerke"
diff --git a/po/de/ntpc.po b/po/de/ntpc.po
index c03afdaac..6fbe88ecd 100644
--- a/po/de/ntpc.po
+++ b/po/de/ntpc.po
@@ -54,5 +54,5 @@ msgstr "Frequenzabweichung"
#. Current system time
#: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:9
-msgid "ntpc_current"
+msgid "Current system time"
msgstr "Aktuelle Systemzeit"
diff --git a/po/de/olsr.po b/po/de/olsr.po
index 78ea8ad6c..2aad923f5 100644
--- a/po/de/olsr.po
+++ b/po/de/olsr.po
@@ -664,5 +664,5 @@ msgstr "Schlüsseldatei"
#. Watchdog timestamp file
#: applications/luci-olsr/luasrc/i18n/olsr.en.lua:128
-msgid "olsrd_loadplugin_file"
+msgid "Watchdog timestamp file"
msgstr "Watchdog Zeitstempeldatei"
diff --git a/po/de/openvpn.po b/po/de/openvpn.po
index a56d1c8d5..d566e00df 100644
--- a/po/de/openvpn.po
+++ b/po/de/openvpn.po
@@ -1065,5 +1065,5 @@ msgstr "Zertifikat explizit auf erweiterten Verwendungszweck prüfen"
#. Require normal and extended key usage on certificate
#: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:196
-msgid "openvpn_param_remote_cert_tls"
+msgid "Require normal and extended key usage on certificate"
msgstr "Explizit auf normalen und erweiterten Verwendungszweck prüfen"
diff --git a/po/de/p910nd.po b/po/de/p910nd.po
index 59d09645e..276e9d0ed 100644
--- a/po/de/p910nd.po
+++ b/po/de/p910nd.po
@@ -33,5 +33,5 @@ msgstr "Bidirektionaler Modus"
#. p910nd listens on port 910+N. E.g. 9100 for the first printer.
#: applications/luci-p910nd/luasrc/i18n/p910nd.en.lua:4
-msgid "port_help"
+msgid "p910nd listens on port 910+N. E.g. 9100 for the first printer."
msgstr "p910nd hoert auf Port 910+N. Z.B. 9100 fuer ersten Drucker"
diff --git a/po/de/polipo.po b/po/de/polipo.po
index f20fd06d3..8c74fdabc 100644
--- a/po/de/polipo.po
+++ b/po/de/polipo.po
@@ -309,5 +309,5 @@ msgstr "Größe des normalen PMM - Segment in bytes"
#. 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 "To enable PMM, PMM segment size must be set to some positive value."
msgstr "Um PMM zu aktivieren muss hier ein Wert eingetragen werden"
diff --git a/po/de/rrdtool.po b/po/de/rrdtool.po
index 55e942140..b6f532cc4 100644
--- a/po/de/rrdtool.po
+++ b/po/de/rrdtool.po
@@ -268,5 +268,5 @@ msgstr "5 Minuten"
#. 15 min
#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:69
-msgid "stat_ds_load__longterm"
+msgid "15 min"
msgstr "15 Minuten"
diff --git a/po/de/samba.po b/po/de/samba.po
index 5a6487684..7696eff26 100644
--- a/po/de/samba.po
+++ b/po/de/samba.po
@@ -96,5 +96,5 @@ msgstr "Verzeichnismaske"
#. Mask for new directories
#: applications/luci-samba/luasrc/i18n/samba.en.lua:17
-msgid "samba_sambashare_dirmask_desc"
+msgid "Mask for new directories"
msgstr "Maske für neue Verzeichnisse"
diff --git a/po/de/statistics.po b/po/de/statistics.po
index c1110109f..e737d3895 100644
--- a/po/de/statistics.po
+++ b/po/de/statistics.po
@@ -821,5 +821,5 @@ msgstr ""
#. Enable this plugin
#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:212
-msgid "lucistatistics_collectdwireless_enable"
+msgid "Enable this plugin"
msgstr "Plugin aktivieren"
diff --git a/po/de/tinyproxy.po b/po/de/tinyproxy.po
index 6d9672b6e..1a53f860f 100644
--- a/po/de/tinyproxy.po
+++ b/po/de/tinyproxy.po
@@ -169,5 +169,5 @@ msgstr "Methode"
#. Upstream Proxy
#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:32
-msgid "tinyproxy_upstream_via"
+msgid "Upstream Proxy"
msgstr "Zugangsproxy"
diff --git a/po/de/upnp.po b/po/de/upnp.po
index 535e90c22..084b65fc5 100644
--- a/po/de/upnp.po
+++ b/po/de/upnp.po
@@ -52,5 +52,5 @@ msgstr "Downlink"
#. Uplink
#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:7
-msgid "upnpd_config_upload"
+msgid "Uplink"
msgstr "Uplink"
diff --git a/po/de/ushare.po b/po/de/ushare.po
index 526280991..1d10e391f 100644
--- a/po/de/ushare.po
+++ b/po/de/ushare.po
@@ -41,13 +41,3 @@ msgstr "Servername"
#: applications/luci-ushare/luasrc/i18n/ushare.en.lua:6
msgid "Settings"
msgstr "Einstellungen"
-
-#. uShare
-#: applications/luci-ushare/luasrc/i18n/ushare.en.lua:7
-msgid "uShare"
-msgstr "uShare"
-
-#. uShare
-#: applications/luci-ushare/luasrc/i18n/ushare.en.lua:8
-msgid "ushare_desc"
-msgstr "uShare"
diff --git a/po/el/admin-core.po b/po/el/admin-core.po
index ced5a5f01..bdccb99b6 100644
--- a/po/el/admin-core.po
+++ b/po/el/admin-core.po
@@ -97,7 +97,8 @@ msgstr ""
#: i18n/english/luasrc/i18n/admin-core.en.lua:13
msgid ""
"Notice: In <abbr title=\"Lua Configuration Interface\">LuCI</abbr> changes "
-"have to be confirmed by clicking Changes - Save &amp; Apply before being applied."
+"have to be confirmed by clicking Changes - Save &amp; Apply before being "
+"applied."
msgstr ""
"Σημείωση: Πριν εφαρμοστούν οι αλλαγές στο <abbr title=\"Lua Configuration "
"Interface\">LuCI</abbr> πρέπει να επιβεβαιωθούν κλικάροντας το Αλλαγές - "
diff --git a/po/el/asterisk.po b/po/el/asterisk.po
index 83c05455d..496c92dde 100644
--- a/po/el/asterisk.po
+++ b/po/el/asterisk.po
@@ -117,11 +117,6 @@ msgstr ""
msgid "Verbose Level"
msgstr ""
-#. Time Zone
-#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:22
-msgid "Time Zone"
-msgstr ""
-
#. Section dialplan
#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:23
msgid "Section dialplan"
@@ -1126,8 +1121,3 @@ msgstr ""
#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:250
msgid "Message Format"
msgstr ""
-
-#. Time Zone
-#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:251
-msgid "asterisk_voicezone_zone"
-msgstr ""
diff --git a/po/el/cbi.po b/po/el/cbi.po
index 0f217325e..d93774540 100644
--- a/po/el/cbi.po
+++ b/po/el/cbi.po
@@ -102,5 +102,5 @@ msgstr "Το Αρχείο Ανέβηκε"
#. Search file...
#: i18n/english/luasrc/i18n/cbi.en.lua:17
-msgid "cbi_browser"
+msgid "Search file..."
msgstr "Εύρεση αρχείου..."
diff --git a/po/el/coovachilli.po b/po/el/coovachilli.po
index ec559349d..a9128ed63 100644
--- a/po/el/coovachilli.po
+++ b/po/el/coovachilli.po
@@ -904,5 +904,7 @@ msgstr ""
#. Suffix to add to the MAC address in order to form the User-Name, which is sent to the radius server
#: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:177
-msgid "coovachilli_macauth_macsuffix_desc"
+msgid ""
+"Suffix to add to the MAC address in order to form the User-Name, which is "
+"sent to the radius server"
msgstr ""
diff --git a/po/el/initmgr.po b/po/el/initmgr.po
index b5ba8f653..f0cd99035 100644
--- a/po/el/initmgr.po
+++ b/po/el/initmgr.po
@@ -42,5 +42,5 @@ msgstr "Σενάριο εκκίνησης"
#. Enable/Disable
#: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:5
-msgid "initmgr_enabled"
+msgid "Enable/Disable"
msgstr "Ενεργοποίηση/Απενεργοποίηση"
diff --git a/po/el/livestats.po b/po/el/livestats.po
index c48e02286..45149c191 100644
--- a/po/el/livestats.po
+++ b/po/el/livestats.po
@@ -44,5 +44,5 @@ msgstr "Στατιστικά Ασύρματου σε Πραγμ. Χρόνο"
#. Realtime Network Traffic
#: applications/luci-livestats/luasrc/i18n/livestats.en.lua:7
-msgid "livestats_stat_traffic"
+msgid "Realtime Network Traffic"
msgstr "Κίνηση Δικτύου σε Πραγμ. Χρόνο"
diff --git a/po/el/luci-fw.po b/po/el/luci-fw.po
index 33472a173..b958504ff 100644
--- a/po/el/luci-fw.po
+++ b/po/el/luci-fw.po
@@ -241,5 +241,5 @@ msgstr ""
#. contained networks
#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:56
-msgid "firewall_zone_network_desc"
+msgid "contained networks"
msgstr ""
diff --git a/po/el/ntpc.po b/po/el/ntpc.po
index 803364494..d6b012e1c 100644
--- a/po/el/ntpc.po
+++ b/po/el/ntpc.po
@@ -54,5 +54,5 @@ msgstr "Συχνότητα Μετάθεσης"
#. Current system time
#: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:9
-msgid "ntpc_current"
+msgid "Current system time"
msgstr "Τρέχουσα ώρα συστήματος"
diff --git a/po/el/olsr.po b/po/el/olsr.po
index 43570e914..b1100af34 100644
--- a/po/el/olsr.po
+++ b/po/el/olsr.po
@@ -644,5 +644,5 @@ msgstr ""
#. Watchdog timestamp file
#: applications/luci-olsr/luasrc/i18n/olsr.en.lua:128
-msgid "olsrd_loadplugin_file"
+msgid "Watchdog timestamp file"
msgstr ""
diff --git a/po/el/openvpn.po b/po/el/openvpn.po
index 21ee00897..206d4057b 100644
--- a/po/el/openvpn.po
+++ b/po/el/openvpn.po
@@ -959,5 +959,5 @@ msgstr ""
#. Require normal and extended key usage on certificate
#: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:196
-msgid "openvpn_param_remote_cert_tls"
+msgid "Require normal and extended key usage on certificate"
msgstr ""
diff --git a/po/el/p910nd.po b/po/el/p910nd.po
index 78e1c58f0..216c00613 100644
--- a/po/el/p910nd.po
+++ b/po/el/p910nd.po
@@ -31,5 +31,5 @@ msgstr ""
#. p910nd listens on port 910+N. E.g. 9100 for the first printer.
#: applications/luci-p910nd/luasrc/i18n/p910nd.en.lua:4
-msgid "port_help"
+msgid "p910nd listens on port 910+N. E.g. 9100 for the first printer."
msgstr ""
diff --git a/po/el/polipo.po b/po/el/polipo.po
index ac13509f6..e06474810 100644
--- a/po/el/polipo.po
+++ b/po/el/polipo.po
@@ -258,5 +258,5 @@ 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 "To enable PMM, PMM segment size must be set to some positive value."
msgstr ""
diff --git a/po/el/qos.po b/po/el/qos.po
index a552073bd..331394149 100644
--- a/po/el/qos.po
+++ b/po/el/qos.po
@@ -108,5 +108,5 @@ msgstr "προτεραιότητα"
#. Bytes sent
#: applications/luci-qos/luasrc/i18n/qos.en.lua:18
-msgid "qos_connbytes"
+msgid "Bytes sent"
msgstr "Απεσταλμένα byte"
diff --git a/po/el/rrdtool.po b/po/el/rrdtool.po
index 537ec3bae..0b652b9ef 100644
--- a/po/el/rrdtool.po
+++ b/po/el/rrdtool.po
@@ -269,5 +269,5 @@ msgstr ""
#. 15 min
#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:69
-msgid "stat_ds_load__longterm"
+msgid "15 min"
msgstr ""
diff --git a/po/el/samba.po b/po/el/samba.po
index 8cd83d301..d10356b6c 100644
--- a/po/el/samba.po
+++ b/po/el/samba.po
@@ -94,5 +94,5 @@ msgstr ""
#. Mask for new directories
#: applications/luci-samba/luasrc/i18n/samba.en.lua:17
-msgid "samba_sambashare_dirmask_desc"
+msgid "Mask for new directories"
msgstr ""
diff --git a/po/el/statistics.po b/po/el/statistics.po
index 4dba6d3ba..5f17daf38 100644
--- a/po/el/statistics.po
+++ b/po/el/statistics.po
@@ -766,5 +766,5 @@ msgstr ""
#. Enable this plugin
#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:212
-msgid "lucistatistics_collectdwireless_enable"
+msgid "Enable this plugin"
msgstr ""
diff --git a/po/el/sysauth.po b/po/el/sysauth.po
index 67c09da4d..334d4f228 100644
--- a/po/el/sysauth.po
+++ b/po/el/sysauth.po
@@ -24,5 +24,5 @@ msgstr "Παρακαλώ εισάγετε όνομα χρήστη και κωδ
#. Invalid username and/or password! Please try again.
#: i18n/english/luasrc/i18n/sysauth.en.lua:3
-msgid "sysauth_failed"
+msgid "Invalid username and/or password! Please try again."
msgstr "Άκυρο όνομα χρήστη και/ή κωδικός πρόσβασης! Παρακαλώ προσπαθήστε ξανά."
diff --git a/po/el/tinyproxy.po b/po/el/tinyproxy.po
index f964e0c1e..33274480a 100644
--- a/po/el/tinyproxy.po
+++ b/po/el/tinyproxy.po
@@ -169,5 +169,5 @@ msgstr ""
#. Upstream Proxy
#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:32
-msgid "tinyproxy_upstream_via"
+msgid "Upstream Proxy"
msgstr ""
diff --git a/po/el/upnp.po b/po/el/upnp.po
index 01b3e452d..e213345d8 100644
--- a/po/el/upnp.po
+++ b/po/el/upnp.po
@@ -48,5 +48,5 @@ msgstr ""
#. Uplink
#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:7
-msgid "upnpd_config_upload"
+msgid "Uplink"
msgstr ""
diff --git a/po/el/ushare.po b/po/el/ushare.po
index 197feca41..3e059a289 100644
--- a/po/el/ushare.po
+++ b/po/el/ushare.po
@@ -41,13 +41,3 @@ msgstr ""
#: applications/luci-ushare/luasrc/i18n/ushare.en.lua:6
msgid "Settings"
msgstr ""
-
-#. uShare
-#: applications/luci-ushare/luasrc/i18n/ushare.en.lua:7
-msgid "uShare"
-msgstr ""
-
-#. uShare
-#: applications/luci-ushare/luasrc/i18n/ushare.en.lua:8
-msgid "ushare_desc"
-msgstr ""
diff --git a/po/el/uvc_streamer.po b/po/el/uvc_streamer.po
index a6f930698..6091e5095 100644
--- a/po/el/uvc_streamer.po
+++ b/po/el/uvc_streamer.po
@@ -34,5 +34,7 @@ msgstr ""
#. Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a href=\"http://%s:%i/\">http://%s:%i/</a>
#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:5
-msgid "uvc_streamer_desc"
+msgid ""
+"Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a "
+"href=\"http://%s:%i/\">http://%s:%i/</a>"
msgstr ""
diff --git a/po/el/uvl.po b/po/el/uvl.po
index c856143e5..b28a773c2 100644
--- a/po/el/uvl.po
+++ b/po/el/uvl.po
@@ -207,5 +207,7 @@ msgstr ""
#. In dependency check for enum value \"%i\":\n%c
#: libs/uvl/luasrc/i18n/uvl.en.lua:39
-msgid "uvl_err_dep_badenum"
+msgid ""
+"In dependency check for enum value \"%i\":\n"
+"%c"
msgstr ""
diff --git a/po/en/admin-core.po b/po/en/admin-core.po
index f10ebb259..c464a3e2b 100644
--- a/po/en/admin-core.po
+++ b/po/en/admin-core.po
@@ -93,7 +93,8 @@ msgstr ""
#: i18n/english/luasrc/i18n/admin-core.en.lua:13
msgid ""
"Notice: In <abbr title=\"Lua Configuration Interface\">LuCI</abbr> changes "
-"have to be confirmed by clicking Changes - Save &amp; Apply before being applied."
+"have to be confirmed by clicking Changes - Save &amp; Apply before being "
+"applied."
msgstr ""
"Notice: In <abbr title=\"Lua Configuration Interface\">LuCI</abbr> changes "
"have to be confirmed by clicking Changes - Save &amp; Apply before being "
diff --git a/po/en/asterisk.po b/po/en/asterisk.po
index d8e28f985..0d1f19aed 100644
--- a/po/en/asterisk.po
+++ b/po/en/asterisk.po
@@ -117,11 +117,6 @@ msgstr "Transmit SLINEAR silence while recording a channel"
msgid "Verbose Level"
msgstr "Verbose Level"
-#. Time Zone
-#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:22
-msgid "Time Zone"
-msgstr "Time Zone"
-
#. Section dialplan
#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:23
msgid "Section dialplan"
@@ -1126,8 +1121,3 @@ msgstr "Voice Zone settings"
#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:250
msgid "Message Format"
msgstr "Message Format"
-
-#. Time Zone
-#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:251
-msgid "asterisk_voicezone_zone"
-msgstr "Time Zone"
diff --git a/po/en/cbi.po b/po/en/cbi.po
index f116ddb5b..2fe848058 100644
--- a/po/en/cbi.po
+++ b/po/en/cbi.po
@@ -102,5 +102,5 @@ msgstr "Uploaded File"
#. Search file...
#: i18n/english/luasrc/i18n/cbi.en.lua:17
-msgid "cbi_browser"
+msgid "Search file..."
msgstr "Search file..."
diff --git a/po/en/initmgr.po b/po/en/initmgr.po
index 7a1776689..8b3daea76 100644
--- a/po/en/initmgr.po
+++ b/po/en/initmgr.po
@@ -41,5 +41,5 @@ msgstr "Initscript"
#. Enable/Disable
#: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:5
-msgid "initmgr_enabled"
+msgid "Enable/Disable"
msgstr "Enable/Disable"
diff --git a/po/en/livestats.po b/po/en/livestats.po
index 573709da1..1725bf6f0 100644
--- a/po/en/livestats.po
+++ b/po/en/livestats.po
@@ -44,5 +44,5 @@ msgstr "Realtime Wireless Status"
#. Realtime Network Traffic
#: applications/luci-livestats/luasrc/i18n/livestats.en.lua:7
-msgid "livestats_stat_traffic"
+msgid "Realtime Network Traffic"
msgstr "Realtime Network Traffic"
diff --git a/po/en/luci-fw.po b/po/en/luci-fw.po
index f2dfa386a..a9f294730 100644
--- a/po/en/luci-fw.po
+++ b/po/en/luci-fw.po
@@ -258,5 +258,5 @@ msgstr "Networks"
#. contained networks
#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:56
-msgid "firewall_zone_network_desc"
+msgid "contained networks"
msgstr "contained networks"
diff --git a/po/en/ntpc.po b/po/en/ntpc.po
index 06088b2a7..c21d0d289 100644
--- a/po/en/ntpc.po
+++ b/po/en/ntpc.po
@@ -54,5 +54,5 @@ msgstr "Offset Frequency"
#. Current system time
#: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:9
-msgid "ntpc_current"
+msgid "Current system time"
msgstr "Current system time"
diff --git a/po/en/olsr.po b/po/en/olsr.po
index f119be81a..0df02408c 100644
--- a/po/en/olsr.po
+++ b/po/en/olsr.po
@@ -659,5 +659,5 @@ msgstr "Key file"
#. Watchdog timestamp file
#: applications/luci-olsr/luasrc/i18n/olsr.en.lua:128
-msgid "olsrd_loadplugin_file"
+msgid "Watchdog timestamp file"
msgstr "Watchdog timestamp file"
diff --git a/po/en/openvpn.po b/po/en/openvpn.po
index edb1d9018..8b6faa69c 100644
--- a/po/en/openvpn.po
+++ b/po/en/openvpn.po
@@ -960,5 +960,5 @@ msgstr "Require extended explicit key usage on certificate"
#. Require normal and extended key usage on certificate
#: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:196
-msgid "openvpn_param_remote_cert_tls"
+msgid "Require normal and extended key usage on certificate"
msgstr "Require normal and extended key usage on certificate"
diff --git a/po/en/p910nd.po b/po/en/p910nd.po
index 2c24f123f..3b8778df1 100644
--- a/po/en/p910nd.po
+++ b/po/en/p910nd.po
@@ -33,5 +33,5 @@ msgstr "Bidirectional mode"
#. p910nd listens on port 910+N. E.g. 9100 for the first printer.
#: applications/luci-p910nd/luasrc/i18n/p910nd.en.lua:4
-msgid "port_help"
+msgid "p910nd listens on port 910+N. E.g. 9100 for the first printer."
msgstr "p910nd listens on port 910+N. E.g. 9100 for the first printer."
diff --git a/po/en/polipo.po b/po/en/polipo.po
index 7deec0f75..9a627456d 100644
--- a/po/en/polipo.po
+++ b/po/en/polipo.po
@@ -293,5 +293,5 @@ msgstr "PMM segments size (in bytes)"
#. 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 "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."
diff --git a/po/en/qos.po b/po/en/qos.po
index 818bc73e8..17c430f6a 100644
--- a/po/en/qos.po
+++ b/po/en/qos.po
@@ -102,5 +102,5 @@ msgstr "priority"
#. Bytes sent
#: applications/luci-qos/luasrc/i18n/qos.en.lua:18
-msgid "qos_connbytes"
+msgid "Bytes sent"
msgstr "Bytes sent"
diff --git a/po/en/rrdtool.po b/po/en/rrdtool.po
index 4ed983cab..9ac8acdd0 100644
--- a/po/en/rrdtool.po
+++ b/po/en/rrdtool.po
@@ -269,5 +269,5 @@ msgstr "5 min"
#. 15 min
#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:69
-msgid "stat_ds_load__longterm"
+msgid "15 min"
msgstr "15 min"
diff --git a/po/en/samba.po b/po/en/samba.po
index cd8cebc10..36c7496e9 100644
--- a/po/en/samba.po
+++ b/po/en/samba.po
@@ -94,5 +94,5 @@ msgstr "Directory Mask"
#. Mask for new directories
#: applications/luci-samba/luasrc/i18n/samba.en.lua:17
-msgid "samba_sambashare_dirmask_desc"
+msgid "Mask for new directories"
msgstr "Mask for new directories"
diff --git a/po/en/statistics.po b/po/en/statistics.po
index c46de9ae0..bdfc2c727 100644
--- a/po/en/statistics.po
+++ b/po/en/statistics.po
@@ -814,5 +814,5 @@ msgstr ""
#. Enable this plugin
#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:212
-msgid "lucistatistics_collectdwireless_enable"
+msgid "Enable this plugin"
msgstr "Enable this plugin"
diff --git a/po/en/tinyproxy.po b/po/en/tinyproxy.po
index 88d72b5c5..0b6d249e6 100644
--- a/po/en/tinyproxy.po
+++ b/po/en/tinyproxy.po
@@ -169,5 +169,5 @@ msgstr "Type"
#. Upstream Proxy
#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:32
-msgid "tinyproxy_upstream_via"
+msgid "Upstream Proxy"
msgstr "Upstream Proxy"
diff --git a/po/en/ushare.po b/po/en/ushare.po
index 8df345213..bd6846032 100644
--- a/po/en/ushare.po
+++ b/po/en/ushare.po
@@ -41,13 +41,3 @@ msgstr "Servername"
#: applications/luci-ushare/luasrc/i18n/ushare.en.lua:6
msgid "Settings"
msgstr "Settings"
-
-#. uShare
-#: applications/luci-ushare/luasrc/i18n/ushare.en.lua:7
-msgid "uShare"
-msgstr "uShare"
-
-#. uShare
-#: applications/luci-ushare/luasrc/i18n/ushare.en.lua:8
-msgid "ushare_desc"
-msgstr "uShare"
diff --git a/po/es/admin-core.po b/po/es/admin-core.po
index 636a9e5bc..165005519 100644
--- a/po/es/admin-core.po
+++ b/po/es/admin-core.po
@@ -97,7 +97,8 @@ msgstr ""
#: i18n/english/luasrc/i18n/admin-core.en.lua:13
msgid ""
"Notice: In <abbr title=\"Lua Configuration Interface\">LuCI</abbr> changes "
-"have to be confirmed by clicking Changes - Save &amp; Apply before being applied."
+"have to be confirmed by clicking Changes - Save &amp; Apply before being "
+"applied."
msgstr ""
"Aviso: En <abbr title=\"Lua Configuration Interface\">LuCI</abbr> los "
"cambios deben ser confirmados haciendo clic en \"Cambios\" y luego en "
diff --git a/po/es/asterisk.po b/po/es/asterisk.po
index c9f99084d..87786c386 100644
--- a/po/es/asterisk.po
+++ b/po/es/asterisk.po
@@ -117,11 +117,6 @@ msgstr ""
msgid "Verbose Level"
msgstr ""
-#. Time Zone
-#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:22
-msgid "Time Zone"
-msgstr ""
-
#. Section dialplan
#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:23
msgid "Section dialplan"
@@ -1126,8 +1121,3 @@ msgstr ""
#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:250
msgid "Message Format"
msgstr ""
-
-#. Time Zone
-#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:251
-msgid "asterisk_voicezone_zone"
-msgstr ""
diff --git a/po/es/cbi.po b/po/es/cbi.po
index b4d0dc0e5..8c9fe4966 100644
--- a/po/es/cbi.po
+++ b/po/es/cbi.po
@@ -103,5 +103,5 @@ msgstr "Archivo cargado"
#. Search file...
#: i18n/english/luasrc/i18n/cbi.en.lua:17
-msgid "cbi_browser"
+msgid "Search file..."
msgstr "Buscar archivo..."
diff --git a/po/es/coovachilli.po b/po/es/coovachilli.po
index f26be129f..507e773f9 100644
--- a/po/es/coovachilli.po
+++ b/po/es/coovachilli.po
@@ -904,5 +904,7 @@ msgstr ""
#. Suffix to add to the MAC address in order to form the User-Name, which is sent to the radius server
#: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:177
-msgid "coovachilli_macauth_macsuffix_desc"
+msgid ""
+"Suffix to add to the MAC address in order to form the User-Name, which is "
+"sent to the radius server"
msgstr ""
diff --git a/po/es/ddns.po b/po/es/ddns.po
index 2249af438..2a528b213 100644
--- a/po/es/ddns.po
+++ b/po/es/ddns.po
@@ -52,5 +52,5 @@ msgstr "Forzar unidad de tiempo"
#. Custom Update-URL
#: applications/luci-ddns/luasrc/i18n/ddns.en.lua:8
-msgid "ddns_service_updateurl"
+msgid "Custom Update-URL"
msgstr "Dirección URL personalizada para la actualización"
diff --git a/po/es/initmgr.po b/po/es/initmgr.po
index 824d03ba5..7098ab9ff 100644
--- a/po/es/initmgr.po
+++ b/po/es/initmgr.po
@@ -41,5 +41,5 @@ msgstr "Nombre del script de inicio"
#. Enable/Disable
#: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:5
-msgid "initmgr_enabled"
+msgid "Enable/Disable"
msgstr "Activar/Desactivar"
diff --git a/po/es/livestats.po b/po/es/livestats.po
index eb6030027..15ee2ff39 100644
--- a/po/es/livestats.po
+++ b/po/es/livestats.po
@@ -43,5 +43,5 @@ msgstr "Estado en tiempo real de la red wireless"
#. Realtime Network Traffic
#: applications/luci-livestats/luasrc/i18n/livestats.en.lua:7
-msgid "livestats_stat_traffic"
+msgid "Realtime Network Traffic"
msgstr "Tráfico en tiempo real de la red"
diff --git a/po/es/luci-fw.po b/po/es/luci-fw.po
index 17918dbb7..541c874a1 100644
--- a/po/es/luci-fw.po
+++ b/po/es/luci-fw.po
@@ -262,5 +262,5 @@ msgstr "Redes"
#. contained networks
#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:56
-msgid "firewall_zone_network_desc"
+msgid "contained networks"
msgstr "redes contenidas"
diff --git a/po/es/ntpc.po b/po/es/ntpc.po
index 03a793cd9..70ac8f5ee 100644
--- a/po/es/ntpc.po
+++ b/po/es/ntpc.po
@@ -53,5 +53,5 @@ msgstr "Corrimiento de Frecuencia"
#. Current system time
#: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:9
-msgid "ntpc_current"
+msgid "Current system time"
msgstr "Hora actual del sistema"
diff --git a/po/es/olsr.po b/po/es/olsr.po
index 92e98b6f0..be3fe51a4 100644
--- a/po/es/olsr.po
+++ b/po/es/olsr.po
@@ -669,5 +669,5 @@ msgstr "Archivo de clave"
#. Watchdog timestamp file
#: applications/luci-olsr/luasrc/i18n/olsr.en.lua:128
-msgid "olsrd_loadplugin_file"
+msgid "Watchdog timestamp file"
msgstr "Archivo para el \"sello de tiempo\" de Watchdog"
diff --git a/po/es/openvpn.po b/po/es/openvpn.po
index f2d6e08f5..c7b27057b 100644
--- a/po/es/openvpn.po
+++ b/po/es/openvpn.po
@@ -959,5 +959,5 @@ msgstr ""
#. Require normal and extended key usage on certificate
#: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:196
-msgid "openvpn_param_remote_cert_tls"
+msgid "Require normal and extended key usage on certificate"
msgstr ""
diff --git a/po/es/qos.po b/po/es/qos.po
index c85beb932..f6deeef44 100644
--- a/po/es/qos.po
+++ b/po/es/qos.po
@@ -106,5 +106,5 @@ msgstr "prioridad"
#. Bytes sent
#: applications/luci-qos/luasrc/i18n/qos.en.lua:18
-msgid "qos_connbytes"
+msgid "Bytes sent"
msgstr "Bytes enviados"
diff --git a/po/es/rrdtool.po b/po/es/rrdtool.po
index 44b09e798..a4cbee1e9 100644
--- a/po/es/rrdtool.po
+++ b/po/es/rrdtool.po
@@ -269,5 +269,5 @@ msgstr ""
#. 15 min
#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:69
-msgid "stat_ds_load__longterm"
+msgid "15 min"
msgstr ""
diff --git a/po/es/samba.po b/po/es/samba.po
index 4e4656229..40ce32499 100644
--- a/po/es/samba.po
+++ b/po/es/samba.po
@@ -95,5 +95,5 @@ msgstr "Máscara de Directorio"
#. Mask for new directories
#: applications/luci-samba/luasrc/i18n/samba.en.lua:17
-msgid "samba_sambashare_dirmask_desc"
+msgid "Mask for new directories"
msgstr "Máscara para directorios nuevos"
diff --git a/po/es/statistics.po b/po/es/statistics.po
index 89c8b091d..4cc7206b0 100644
--- a/po/es/statistics.po
+++ b/po/es/statistics.po
@@ -818,5 +818,5 @@ msgstr ""
#. Enable this plugin
#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:212
-msgid "lucistatistics_collectdwireless_enable"
+msgid "Enable this plugin"
msgstr ""
diff --git a/po/es/tinyproxy.po b/po/es/tinyproxy.po
index 9459d909a..d7b10c66e 100644
--- a/po/es/tinyproxy.po
+++ b/po/es/tinyproxy.po
@@ -168,5 +168,5 @@ msgstr "Tipo"
#. Upstream Proxy
#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:32
-msgid "tinyproxy_upstream_via"
+msgid "Upstream Proxy"
msgstr "Proxy de subida (upstream)"
diff --git a/po/es/upnp.po b/po/es/upnp.po
index 2aa791bb1..944154fee 100644
--- a/po/es/upnp.po
+++ b/po/es/upnp.po
@@ -51,5 +51,5 @@ msgstr "Enlace de bajada (downlink)"
#. Uplink
#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:7
-msgid "upnpd_config_upload"
+msgid "Uplink"
msgstr "Enlace de subida (uplink)"
diff --git a/po/es/ushare.po b/po/es/ushare.po
index 1a9a2a9a7..dc92c126e 100644
--- a/po/es/ushare.po
+++ b/po/es/ushare.po
@@ -40,13 +40,3 @@ msgstr "Nombre del Servidor (Servername)"
#: applications/luci-ushare/luasrc/i18n/ushare.en.lua:6
msgid "Settings"
msgstr "Configuración"
-
-#. uShare
-#: applications/luci-ushare/luasrc/i18n/ushare.en.lua:7
-msgid "uShare"
-msgstr "uShare"
-
-#. uShare
-#: applications/luci-ushare/luasrc/i18n/ushare.en.lua:8
-msgid "ushare_desc"
-msgstr "uShare"
diff --git a/po/fr/admin-core.po b/po/fr/admin-core.po
index 116483382..05a8429d5 100644
--- a/po/fr/admin-core.po
+++ b/po/fr/admin-core.po
@@ -92,7 +92,8 @@ msgstr ""
#: i18n/english/luasrc/i18n/admin-core.en.lua:13
msgid ""
"Notice: In <abbr title=\"Lua Configuration Interface\">LuCI</abbr> changes "
-"have to be confirmed by clicking Changes - Save &amp; Apply before being applied."
+"have to be confirmed by clicking Changes - Save &amp; Apply before being "
+"applied."
msgstr ""
"Vous trouverez une page de navigation sur le côté gauche permettant "
"d'accèder aux différentes pages de configuration."
diff --git a/po/fr/asterisk.po b/po/fr/asterisk.po
index eadaf1f3f..a774a35d8 100644
--- a/po/fr/asterisk.po
+++ b/po/fr/asterisk.po
@@ -117,11 +117,6 @@ msgstr ""
msgid "Verbose Level"
msgstr ""
-#. Time Zone
-#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:22
-msgid "Time Zone"
-msgstr ""
-
#. Section dialplan
#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:23
msgid "Section dialplan"
@@ -1126,8 +1121,3 @@ msgstr ""
#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:250
msgid "Message Format"
msgstr ""
-
-#. Time Zone
-#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:251
-msgid "asterisk_voicezone_zone"
-msgstr ""
diff --git a/po/fr/cbi.po b/po/fr/cbi.po
index 884e55d1e..1767fae7d 100644
--- a/po/fr/cbi.po
+++ b/po/fr/cbi.po
@@ -102,5 +102,5 @@ msgstr "Fichier Uploadé"
#. Search file...
#: i18n/english/luasrc/i18n/cbi.en.lua:17
-msgid "cbi_browser"
+msgid "Search file..."
msgstr "Chercher un fichier..."
diff --git a/po/fr/coovachilli.po b/po/fr/coovachilli.po
index fcbde0d7d..2bdf6bddb 100644
--- a/po/fr/coovachilli.po
+++ b/po/fr/coovachilli.po
@@ -904,5 +904,7 @@ msgstr ""
#. Suffix to add to the MAC address in order to form the User-Name, which is sent to the radius server
#: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:177
-msgid "coovachilli_macauth_macsuffix_desc"
+msgid ""
+"Suffix to add to the MAC address in order to form the User-Name, which is "
+"sent to the radius server"
msgstr ""
diff --git a/po/fr/ddns.po b/po/fr/ddns.po
index 9f674cbe4..555401e3c 100644
--- a/po/fr/ddns.po
+++ b/po/fr/ddns.po
@@ -53,5 +53,5 @@ msgstr "Unité de temps"
#. Custom Update-URL
#: applications/luci-ddns/luasrc/i18n/ddns.en.lua:8
-msgid "ddns_service_updateurl"
+msgid "Custom Update-URL"
msgstr "Url de mise à jour personnalisée"
diff --git a/po/fr/initmgr.po b/po/fr/initmgr.po
index 3273c33f1..b1c4fac10 100644
--- a/po/fr/initmgr.po
+++ b/po/fr/initmgr.po
@@ -37,5 +37,5 @@ msgstr ""
#. Enable/Disable
#: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:5
-msgid "initmgr_enabled"
+msgid "Enable/Disable"
msgstr ""
diff --git a/po/fr/livestats.po b/po/fr/livestats.po
index 5a1b08d37..ffea8e456 100644
--- a/po/fr/livestats.po
+++ b/po/fr/livestats.po
@@ -44,5 +44,5 @@ msgstr ""
#. Realtime Network Traffic
#: applications/luci-livestats/luasrc/i18n/livestats.en.lua:7
-msgid "livestats_stat_traffic"
+msgid "Realtime Network Traffic"
msgstr ""
diff --git a/po/fr/luci-fw.po b/po/fr/luci-fw.po
index 122265f50..d58407181 100644
--- a/po/fr/luci-fw.po
+++ b/po/fr/luci-fw.po
@@ -261,5 +261,5 @@ msgstr "Réseaux"
#. contained networks
#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:56
-msgid "firewall_zone_network_desc"
+msgid "contained networks"
msgstr "réseaux compris"
diff --git a/po/fr/ntpc.po b/po/fr/ntpc.po
index b1e6417dc..664381f1c 100644
--- a/po/fr/ntpc.po
+++ b/po/fr/ntpc.po
@@ -54,5 +54,5 @@ msgstr ""
#. Current system time
#: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:9
-msgid "ntpc_current"
+msgid "Current system time"
msgstr ""
diff --git a/po/fr/olsr.po b/po/fr/olsr.po
index dc531cc09..d4c35cbff 100644
--- a/po/fr/olsr.po
+++ b/po/fr/olsr.po
@@ -644,5 +644,5 @@ msgstr ""
#. Watchdog timestamp file
#: applications/luci-olsr/luasrc/i18n/olsr.en.lua:128
-msgid "olsrd_loadplugin_file"
+msgid "Watchdog timestamp file"
msgstr ""
diff --git a/po/fr/openvpn.po b/po/fr/openvpn.po
index 3883ec08e..7a9be0f70 100644
--- a/po/fr/openvpn.po
+++ b/po/fr/openvpn.po
@@ -959,5 +959,5 @@ msgstr ""
#. Require normal and extended key usage on certificate
#: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:196
-msgid "openvpn_param_remote_cert_tls"
+msgid "Require normal and extended key usage on certificate"
msgstr ""
diff --git a/po/fr/p910nd.po b/po/fr/p910nd.po
index a24f1018c..4cfb5e01e 100644
--- a/po/fr/p910nd.po
+++ b/po/fr/p910nd.po
@@ -31,5 +31,5 @@ msgstr ""
#. p910nd listens on port 910+N. E.g. 9100 for the first printer.
#: applications/luci-p910nd/luasrc/i18n/p910nd.en.lua:4
-msgid "port_help"
+msgid "p910nd listens on port 910+N. E.g. 9100 for the first printer."
msgstr ""
diff --git a/po/fr/polipo.po b/po/fr/polipo.po
index 38709ff4b..95d32a406 100644
--- a/po/fr/polipo.po
+++ b/po/fr/polipo.po
@@ -258,5 +258,5 @@ 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 "To enable PMM, PMM segment size must be set to some positive value."
msgstr ""
diff --git a/po/fr/rrdtool.po b/po/fr/rrdtool.po
index 496f0623e..a126371ed 100644
--- a/po/fr/rrdtool.po
+++ b/po/fr/rrdtool.po
@@ -269,5 +269,5 @@ msgstr ""
#. 15 min
#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:69
-msgid "stat_ds_load__longterm"
+msgid "15 min"
msgstr ""
diff --git a/po/fr/samba.po b/po/fr/samba.po
index b9d997ea1..79308d89e 100644
--- a/po/fr/samba.po
+++ b/po/fr/samba.po
@@ -94,5 +94,5 @@ msgstr ""
#. Mask for new directories
#: applications/luci-samba/luasrc/i18n/samba.en.lua:17
-msgid "samba_sambashare_dirmask_desc"
+msgid "Mask for new directories"
msgstr ""
diff --git a/po/fr/statistics.po b/po/fr/statistics.po
index b64adae46..16d7043b9 100644
--- a/po/fr/statistics.po
+++ b/po/fr/statistics.po
@@ -759,5 +759,5 @@ msgstr ""
#. Enable this plugin
#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:212
-msgid "lucistatistics_collectdwireless_enable"
+msgid "Enable this plugin"
msgstr ""
diff --git a/po/fr/tinyproxy.po b/po/fr/tinyproxy.po
index 1fdb7e273..4c7e9f748 100644
--- a/po/fr/tinyproxy.po
+++ b/po/fr/tinyproxy.po
@@ -169,5 +169,5 @@ msgstr "Type"
#. Upstream Proxy
#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:32
-msgid "tinyproxy_upstream_via"
+msgid "Upstream Proxy"
msgstr "Proxy"
diff --git a/po/fr/upnp.po b/po/fr/upnp.po
index 892b47cc4..ce108f3e4 100644
--- a/po/fr/upnp.po
+++ b/po/fr/upnp.po
@@ -48,5 +48,5 @@ msgstr ""
#. Uplink
#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:7
-msgid "upnpd_config_upload"
+msgid "Uplink"
msgstr ""
diff --git a/po/fr/ushare.po b/po/fr/ushare.po
index c0ff09ca1..d52f05c46 100644
--- a/po/fr/ushare.po
+++ b/po/fr/ushare.po
@@ -41,13 +41,3 @@ msgstr ""
#: applications/luci-ushare/luasrc/i18n/ushare.en.lua:6
msgid "Settings"
msgstr ""
-
-#. uShare
-#: applications/luci-ushare/luasrc/i18n/ushare.en.lua:7
-msgid "uShare"
-msgstr ""
-
-#. uShare
-#: applications/luci-ushare/luasrc/i18n/ushare.en.lua:8
-msgid "ushare_desc"
-msgstr ""
diff --git a/po/fr/uvl.po b/po/fr/uvl.po
index a0289acb2..ba5b46e3a 100644
--- a/po/fr/uvl.po
+++ b/po/fr/uvl.po
@@ -207,5 +207,7 @@ msgstr ""
#. In dependency check for enum value \"%i\":\n%c
#: libs/uvl/luasrc/i18n/uvl.en.lua:39
-msgid "uvl_err_dep_badenum"
+msgid ""
+"In dependency check for enum value \"%i\":\n"
+"%c"
msgstr ""
diff --git a/po/fr/wifi.po b/po/fr/wifi.po
index cf5f8c9d4..2aada4166 100644
--- a/po/fr/wifi.po
+++ b/po/fr/wifi.po
@@ -204,5 +204,7 @@ msgstr ""
#. WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP and ad-hoc mode) to be installed.
#: i18n/english/luasrc/i18n/wifi.en.lua:39
-msgid "wifi_wpareq"
+msgid ""
+"WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
+"and ad-hoc mode) to be installed."
msgstr ""
diff --git a/po/it/admin-core.po b/po/it/admin-core.po
index 65f50956c..2a93b432f 100644
--- a/po/it/admin-core.po
+++ b/po/it/admin-core.po
@@ -96,7 +96,8 @@ msgstr ""
#: i18n/english/luasrc/i18n/admin-core.en.lua:13
msgid ""
"Notice: In <abbr title=\"Lua Configuration Interface\">LuCI</abbr> changes "
-"have to be confirmed by clicking Changes - Save &amp; Apply before being applied."
+"have to be confirmed by clicking Changes - Save &amp; Apply before being "
+"applied."
msgstr ""
"Nota: Le modifiche devono essere confermate in <abbr title=\"Lua "
"Configuration Interface\">LuCI</abbr> cliccando Modifiche - Salva e Applica "
diff --git a/po/it/asterisk.po b/po/it/asterisk.po
index 83c05455d..496c92dde 100644
--- a/po/it/asterisk.po
+++ b/po/it/asterisk.po
@@ -117,11 +117,6 @@ msgstr ""
msgid "Verbose Level"
msgstr ""
-#. Time Zone
-#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:22
-msgid "Time Zone"
-msgstr ""
-
#. Section dialplan
#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:23
msgid "Section dialplan"
@@ -1126,8 +1121,3 @@ msgstr ""
#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:250
msgid "Message Format"
msgstr ""
-
-#. Time Zone
-#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:251
-msgid "asterisk_voicezone_zone"
-msgstr ""
diff --git a/po/it/cbi.po b/po/it/cbi.po
index d27056c8e..fd788b381 100644
--- a/po/it/cbi.po
+++ b/po/it/cbi.po
@@ -101,5 +101,5 @@ msgstr "Invia file"
#. Search file...
#: i18n/english/luasrc/i18n/cbi.en.lua:17
-msgid "cbi_browser"
+msgid "Search file..."
msgstr "Cerca file..."
diff --git a/po/it/coovachilli.po b/po/it/coovachilli.po
index ec559349d..a9128ed63 100644
--- a/po/it/coovachilli.po
+++ b/po/it/coovachilli.po
@@ -904,5 +904,7 @@ msgstr ""
#. Suffix to add to the MAC address in order to form the User-Name, which is sent to the radius server
#: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:177
-msgid "coovachilli_macauth_macsuffix_desc"
+msgid ""
+"Suffix to add to the MAC address in order to form the User-Name, which is "
+"sent to the radius server"
msgstr ""
diff --git a/po/it/ddns.po b/po/it/ddns.po
index 1952651b4..f1eab7dda 100644
--- a/po/it/ddns.po
+++ b/po/it/ddns.po
@@ -51,5 +51,5 @@ msgstr ""
#. Custom Update-URL
#: applications/luci-ddns/luasrc/i18n/ddns.en.lua:8
-msgid "ddns_service_updateurl"
+msgid "Custom Update-URL"
msgstr ""
diff --git a/po/it/initmgr.po b/po/it/initmgr.po
index fb094f7a9..36e1bf789 100644
--- a/po/it/initmgr.po
+++ b/po/it/initmgr.po
@@ -37,5 +37,5 @@ msgstr ""
#. Enable/Disable
#: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:5
-msgid "initmgr_enabled"
+msgid "Enable/Disable"
msgstr ""
diff --git a/po/it/livestats.po b/po/it/livestats.po
index 5a1b08d37..ffea8e456 100644
--- a/po/it/livestats.po
+++ b/po/it/livestats.po
@@ -44,5 +44,5 @@ msgstr ""
#. Realtime Network Traffic
#: applications/luci-livestats/luasrc/i18n/livestats.en.lua:7
-msgid "livestats_stat_traffic"
+msgid "Realtime Network Traffic"
msgstr ""
diff --git a/po/it/luci-fw.po b/po/it/luci-fw.po
index 8738cd8f3..802da6977 100644
--- a/po/it/luci-fw.po
+++ b/po/it/luci-fw.po
@@ -241,5 +241,5 @@ msgstr ""
#. contained networks
#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:56
-msgid "firewall_zone_network_desc"
+msgid "contained networks"
msgstr ""
diff --git a/po/it/ntpc.po b/po/it/ntpc.po
index b1e6417dc..664381f1c 100644
--- a/po/it/ntpc.po
+++ b/po/it/ntpc.po
@@ -54,5 +54,5 @@ msgstr ""
#. Current system time
#: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:9
-msgid "ntpc_current"
+msgid "Current system time"
msgstr ""
diff --git a/po/it/olsr.po b/po/it/olsr.po
index dc531cc09..d4c35cbff 100644
--- a/po/it/olsr.po
+++ b/po/it/olsr.po
@@ -644,5 +644,5 @@ msgstr ""
#. Watchdog timestamp file
#: applications/luci-olsr/luasrc/i18n/olsr.en.lua:128
-msgid "olsrd_loadplugin_file"
+msgid "Watchdog timestamp file"
msgstr ""
diff --git a/po/it/openvpn.po b/po/it/openvpn.po
index 3883ec08e..7a9be0f70 100644
--- a/po/it/openvpn.po
+++ b/po/it/openvpn.po
@@ -959,5 +959,5 @@ msgstr ""
#. Require normal and extended key usage on certificate
#: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:196
-msgid "openvpn_param_remote_cert_tls"
+msgid "Require normal and extended key usage on certificate"
msgstr ""
diff --git a/po/it/p910nd.po b/po/it/p910nd.po
index a24f1018c..4cfb5e01e 100644
--- a/po/it/p910nd.po
+++ b/po/it/p910nd.po
@@ -31,5 +31,5 @@ msgstr ""
#. p910nd listens on port 910+N. E.g. 9100 for the first printer.
#: applications/luci-p910nd/luasrc/i18n/p910nd.en.lua:4
-msgid "port_help"
+msgid "p910nd listens on port 910+N. E.g. 9100 for the first printer."
msgstr ""
diff --git a/po/it/polipo.po b/po/it/polipo.po
index 38709ff4b..95d32a406 100644
--- a/po/it/polipo.po
+++ b/po/it/polipo.po
@@ -258,5 +258,5 @@ 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 "To enable PMM, PMM segment size must be set to some positive value."
msgstr ""
diff --git a/po/it/qos.po b/po/it/qos.po
index 499bb1d08..92d999efa 100644
--- a/po/it/qos.po
+++ b/po/it/qos.po
@@ -101,5 +101,5 @@ msgstr ""
#. Bytes sent
#: applications/luci-qos/luasrc/i18n/qos.en.lua:18
-msgid "qos_connbytes"
+msgid "Bytes sent"
msgstr ""
diff --git a/po/it/rrdtool.po b/po/it/rrdtool.po
index 496f0623e..a126371ed 100644
--- a/po/it/rrdtool.po
+++ b/po/it/rrdtool.po
@@ -269,5 +269,5 @@ msgstr ""
#. 15 min
#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:69
-msgid "stat_ds_load__longterm"
+msgid "15 min"
msgstr ""
diff --git a/po/it/samba.po b/po/it/samba.po
index b9d997ea1..79308d89e 100644
--- a/po/it/samba.po
+++ b/po/it/samba.po
@@ -94,5 +94,5 @@ msgstr ""
#. Mask for new directories
#: applications/luci-samba/luasrc/i18n/samba.en.lua:17
-msgid "samba_sambashare_dirmask_desc"
+msgid "Mask for new directories"
msgstr ""
diff --git a/po/it/statistics.po b/po/it/statistics.po
index b64adae46..16d7043b9 100644
--- a/po/it/statistics.po
+++ b/po/it/statistics.po
@@ -759,5 +759,5 @@ msgstr ""
#. Enable this plugin
#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:212
-msgid "lucistatistics_collectdwireless_enable"
+msgid "Enable this plugin"
msgstr ""
diff --git a/po/it/sysauth.po b/po/it/sysauth.po
index 711b60966..05a320046 100644
--- a/po/it/sysauth.po
+++ b/po/it/sysauth.po
@@ -24,5 +24,5 @@ msgstr "Per favore inserisci i tuoi username e password."
#. Invalid username and/or password! Please try again.
#: i18n/english/luasrc/i18n/sysauth.en.lua:3
-msgid "sysauth_failed"
+msgid "Invalid username and/or password! Please try again."
msgstr "Username o password non validi! Per favore riprova."
diff --git a/po/it/tinyproxy.po b/po/it/tinyproxy.po
index df4b3498e..0c4f236f1 100644
--- a/po/it/tinyproxy.po
+++ b/po/it/tinyproxy.po
@@ -169,5 +169,5 @@ msgstr ""
#. Upstream Proxy
#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:32
-msgid "tinyproxy_upstream_via"
+msgid "Upstream Proxy"
msgstr ""
diff --git a/po/it/upnp.po b/po/it/upnp.po
index 892b47cc4..ce108f3e4 100644
--- a/po/it/upnp.po
+++ b/po/it/upnp.po
@@ -48,5 +48,5 @@ msgstr ""
#. Uplink
#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:7
-msgid "upnpd_config_upload"
+msgid "Uplink"
msgstr ""
diff --git a/po/it/ushare.po b/po/it/ushare.po
index c0ff09ca1..d52f05c46 100644
--- a/po/it/ushare.po
+++ b/po/it/ushare.po
@@ -41,13 +41,3 @@ msgstr ""
#: applications/luci-ushare/luasrc/i18n/ushare.en.lua:6
msgid "Settings"
msgstr ""
-
-#. uShare
-#: applications/luci-ushare/luasrc/i18n/ushare.en.lua:7
-msgid "uShare"
-msgstr ""
-
-#. uShare
-#: applications/luci-ushare/luasrc/i18n/ushare.en.lua:8
-msgid "ushare_desc"
-msgstr ""
diff --git a/po/it/uvc_streamer.po b/po/it/uvc_streamer.po
index 0431eb192..aa4bc111e 100644
--- a/po/it/uvc_streamer.po
+++ b/po/it/uvc_streamer.po
@@ -34,5 +34,7 @@ msgstr ""
#. Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a href=\"http://%s:%i/\">http://%s:%i/</a>
#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:5
-msgid "uvc_streamer_desc"
+msgid ""
+"Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a "
+"href=\"http://%s:%i/\">http://%s:%i/</a>"
msgstr ""
diff --git a/po/it/uvl.po b/po/it/uvl.po
index a0289acb2..ba5b46e3a 100644
--- a/po/it/uvl.po
+++ b/po/it/uvl.po
@@ -207,5 +207,7 @@ msgstr ""
#. In dependency check for enum value \"%i\":\n%c
#: libs/uvl/luasrc/i18n/uvl.en.lua:39
-msgid "uvl_err_dep_badenum"
+msgid ""
+"In dependency check for enum value \"%i\":\n"
+"%c"
msgstr ""
diff --git a/po/ja/admin-core.po b/po/ja/admin-core.po
index 27c9ed36e..3d06d918e 100644
--- a/po/ja/admin-core.po
+++ b/po/ja/admin-core.po
@@ -94,7 +94,8 @@ msgstr "以下のページからルーターの全ての重要な設定を調整
#: i18n/english/luasrc/i18n/admin-core.en.lua:13
msgid ""
"Notice: In <abbr title=\"Lua Configuration Interface\">LuCI</abbr> changes "
-"have to be confirmed by clicking Changes - Save &amp; Apply before being applied."
+"have to be confirmed by clicking Changes - Save &amp; Apply before being "
+"applied."
msgstr ""
"注意: <abbr title=\"Lua Configuration Interface\">LuCI</abbr> で変更を行うに"
"は適用前に「保存 &amp; 適用」をクリックして確認する必要があります。"
diff --git a/po/ja/asterisk.po b/po/ja/asterisk.po
index eadaf1f3f..a774a35d8 100644
--- a/po/ja/asterisk.po
+++ b/po/ja/asterisk.po
@@ -117,11 +117,6 @@ msgstr ""
msgid "Verbose Level"
msgstr ""
-#. Time Zone
-#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:22
-msgid "Time Zone"
-msgstr ""
-
#. Section dialplan
#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:23
msgid "Section dialplan"
@@ -1126,8 +1121,3 @@ msgstr ""
#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:250
msgid "Message Format"
msgstr ""
-
-#. Time Zone
-#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:251
-msgid "asterisk_voicezone_zone"
-msgstr ""
diff --git a/po/ja/cbi.po b/po/ja/cbi.po
index 45038e58f..8ab65e494 100644
--- a/po/ja/cbi.po
+++ b/po/ja/cbi.po
@@ -101,5 +101,5 @@ msgstr "アップロード完了"
#. Search file...
#: i18n/english/luasrc/i18n/cbi.en.lua:17
-msgid "cbi_browser"
+msgid "Search file..."
msgstr "Search file..."
diff --git a/po/ja/coovachilli.po b/po/ja/coovachilli.po
index fcbde0d7d..2bdf6bddb 100644
--- a/po/ja/coovachilli.po
+++ b/po/ja/coovachilli.po
@@ -904,5 +904,7 @@ msgstr ""
#. Suffix to add to the MAC address in order to form the User-Name, which is sent to the radius server
#: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:177
-msgid "coovachilli_macauth_macsuffix_desc"
+msgid ""
+"Suffix to add to the MAC address in order to form the User-Name, which is "
+"sent to the radius server"
msgstr ""
diff --git a/po/ja/ddns.po b/po/ja/ddns.po
index d0ddf21b5..c91b55849 100644
--- a/po/ja/ddns.po
+++ b/po/ja/ddns.po
@@ -51,5 +51,5 @@ msgstr ""
#. Custom Update-URL
#: applications/luci-ddns/luasrc/i18n/ddns.en.lua:8
-msgid "ddns_service_updateurl"
+msgid "Custom Update-URL"
msgstr ""
diff --git a/po/ja/initmgr.po b/po/ja/initmgr.po
index 3273c33f1..b1c4fac10 100644
--- a/po/ja/initmgr.po
+++ b/po/ja/initmgr.po
@@ -37,5 +37,5 @@ msgstr ""
#. Enable/Disable
#: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:5
-msgid "initmgr_enabled"
+msgid "Enable/Disable"
msgstr ""
diff --git a/po/ja/livestats.po b/po/ja/livestats.po
index 5a1b08d37..ffea8e456 100644
--- a/po/ja/livestats.po
+++ b/po/ja/livestats.po
@@ -44,5 +44,5 @@ msgstr ""
#. Realtime Network Traffic
#: applications/luci-livestats/luasrc/i18n/livestats.en.lua:7
-msgid "livestats_stat_traffic"
+msgid "Realtime Network Traffic"
msgstr ""
diff --git a/po/ja/luci-fw.po b/po/ja/luci-fw.po
index 8738cd8f3..802da6977 100644
--- a/po/ja/luci-fw.po
+++ b/po/ja/luci-fw.po
@@ -241,5 +241,5 @@ msgstr ""
#. contained networks
#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:56
-msgid "firewall_zone_network_desc"
+msgid "contained networks"
msgstr ""
diff --git a/po/ja/ntpc.po b/po/ja/ntpc.po
index b1e6417dc..664381f1c 100644
--- a/po/ja/ntpc.po
+++ b/po/ja/ntpc.po
@@ -54,5 +54,5 @@ msgstr ""
#. Current system time
#: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:9
-msgid "ntpc_current"
+msgid "Current system time"
msgstr ""
diff --git a/po/ja/olsr.po b/po/ja/olsr.po
index dc531cc09..d4c35cbff 100644
--- a/po/ja/olsr.po
+++ b/po/ja/olsr.po
@@ -644,5 +644,5 @@ msgstr ""
#. Watchdog timestamp file
#: applications/luci-olsr/luasrc/i18n/olsr.en.lua:128
-msgid "olsrd_loadplugin_file"
+msgid "Watchdog timestamp file"
msgstr ""
diff --git a/po/ja/openvpn.po b/po/ja/openvpn.po
index 3883ec08e..7a9be0f70 100644
--- a/po/ja/openvpn.po
+++ b/po/ja/openvpn.po
@@ -959,5 +959,5 @@ msgstr ""
#. Require normal and extended key usage on certificate
#: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:196
-msgid "openvpn_param_remote_cert_tls"
+msgid "Require normal and extended key usage on certificate"
msgstr ""
diff --git a/po/ja/p910nd.po b/po/ja/p910nd.po
index a24f1018c..4cfb5e01e 100644
--- a/po/ja/p910nd.po
+++ b/po/ja/p910nd.po
@@ -31,5 +31,5 @@ msgstr ""
#. p910nd listens on port 910+N. E.g. 9100 for the first printer.
#: applications/luci-p910nd/luasrc/i18n/p910nd.en.lua:4
-msgid "port_help"
+msgid "p910nd listens on port 910+N. E.g. 9100 for the first printer."
msgstr ""
diff --git a/po/ja/polipo.po b/po/ja/polipo.po
index 38709ff4b..95d32a406 100644
--- a/po/ja/polipo.po
+++ b/po/ja/polipo.po
@@ -258,5 +258,5 @@ 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 "To enable PMM, PMM segment size must be set to some positive value."
msgstr ""
diff --git a/po/ja/qos.po b/po/ja/qos.po
index 499bb1d08..92d999efa 100644
--- a/po/ja/qos.po
+++ b/po/ja/qos.po
@@ -101,5 +101,5 @@ msgstr ""
#. Bytes sent
#: applications/luci-qos/luasrc/i18n/qos.en.lua:18
-msgid "qos_connbytes"
+msgid "Bytes sent"
msgstr ""
diff --git a/po/ja/rrdtool.po b/po/ja/rrdtool.po
index 496f0623e..a126371ed 100644
--- a/po/ja/rrdtool.po
+++ b/po/ja/rrdtool.po
@@ -269,5 +269,5 @@ msgstr ""
#. 15 min
#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:69
-msgid "stat_ds_load__longterm"
+msgid "15 min"
msgstr ""
diff --git a/po/ja/samba.po b/po/ja/samba.po
index b9d997ea1..79308d89e 100644
--- a/po/ja/samba.po
+++ b/po/ja/samba.po
@@ -94,5 +94,5 @@ msgstr ""
#. Mask for new directories
#: applications/luci-samba/luasrc/i18n/samba.en.lua:17
-msgid "samba_sambashare_dirmask_desc"
+msgid "Mask for new directories"
msgstr ""
diff --git a/po/ja/statistics.po b/po/ja/statistics.po
index b64adae46..16d7043b9 100644
--- a/po/ja/statistics.po
+++ b/po/ja/statistics.po
@@ -759,5 +759,5 @@ msgstr ""
#. Enable this plugin
#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:212
-msgid "lucistatistics_collectdwireless_enable"
+msgid "Enable this plugin"
msgstr ""
diff --git a/po/ja/sysauth.po b/po/ja/sysauth.po
index 657d53246..89c64e1d9 100644
--- a/po/ja/sysauth.po
+++ b/po/ja/sysauth.po
@@ -24,5 +24,5 @@ msgstr "あなたのユーザー名とパスワードを入力してください
#. Invalid username and/or password! Please try again.
#: i18n/english/luasrc/i18n/sysauth.en.lua:3
-msgid "sysauth_failed"
+msgid "Invalid username and/or password! Please try again."
msgstr "ユーザー名とパスワードが不正です! 再度試してください。"
diff --git a/po/ja/tinyproxy.po b/po/ja/tinyproxy.po
index df4b3498e..0c4f236f1 100644
--- a/po/ja/tinyproxy.po
+++ b/po/ja/tinyproxy.po
@@ -169,5 +169,5 @@ msgstr ""
#. Upstream Proxy
#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:32
-msgid "tinyproxy_upstream_via"
+msgid "Upstream Proxy"
msgstr ""
diff --git a/po/ja/upnp.po b/po/ja/upnp.po
index 892b47cc4..ce108f3e4 100644
--- a/po/ja/upnp.po
+++ b/po/ja/upnp.po
@@ -48,5 +48,5 @@ msgstr ""
#. Uplink
#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:7
-msgid "upnpd_config_upload"
+msgid "Uplink"
msgstr ""
diff --git a/po/ja/ushare.po b/po/ja/ushare.po
index c0ff09ca1..d52f05c46 100644
--- a/po/ja/ushare.po
+++ b/po/ja/ushare.po
@@ -41,13 +41,3 @@ msgstr ""
#: applications/luci-ushare/luasrc/i18n/ushare.en.lua:6
msgid "Settings"
msgstr ""
-
-#. uShare
-#: applications/luci-ushare/luasrc/i18n/ushare.en.lua:7
-msgid "uShare"
-msgstr ""
-
-#. uShare
-#: applications/luci-ushare/luasrc/i18n/ushare.en.lua:8
-msgid "ushare_desc"
-msgstr ""
diff --git a/po/ja/uvc_streamer.po b/po/ja/uvc_streamer.po
index 0431eb192..aa4bc111e 100644
--- a/po/ja/uvc_streamer.po
+++ b/po/ja/uvc_streamer.po
@@ -34,5 +34,7 @@ msgstr ""
#. Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a href=\"http://%s:%i/\">http://%s:%i/</a>
#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:5
-msgid "uvc_streamer_desc"
+msgid ""
+"Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a "
+"href=\"http://%s:%i/\">http://%s:%i/</a>"
msgstr ""
diff --git a/po/ja/uvl.po b/po/ja/uvl.po
index a0289acb2..ba5b46e3a 100644
--- a/po/ja/uvl.po
+++ b/po/ja/uvl.po
@@ -207,5 +207,7 @@ msgstr ""
#. In dependency check for enum value \"%i\":\n%c
#: libs/uvl/luasrc/i18n/uvl.en.lua:39
-msgid "uvl_err_dep_badenum"
+msgid ""
+"In dependency check for enum value \"%i\":\n"
+"%c"
msgstr ""
diff --git a/po/ja/wifi.po b/po/ja/wifi.po
index 6f3fccece..49685f196 100644
--- a/po/ja/wifi.po
+++ b/po/ja/wifi.po
@@ -204,5 +204,7 @@ msgstr "プローブレスポンスを送信しない"
#. WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP and ad-hoc mode) to be installed.
#: i18n/english/luasrc/i18n/wifi.en.lua:39
-msgid "wifi_wpareq"
+msgid ""
+"WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
+"and ad-hoc mode) to be installed."
msgstr ""
diff --git a/po/pt/admin-core.po b/po/pt/admin-core.po
index 795940fbf..003fddbf9 100644
--- a/po/pt/admin-core.po
+++ b/po/pt/admin-core.po
@@ -97,7 +97,8 @@ msgstr ""
#: i18n/english/luasrc/i18n/admin-core.en.lua:13
msgid ""
"Notice: In <abbr title=\"Lua Configuration Interface\">LuCI</abbr> changes "
-"have to be confirmed by clicking Changes - Save &amp; Apply before being applied."
+"have to be confirmed by clicking Changes - Save &amp; Apply before being "
+"applied."
msgstr ""
"Aviso: No <abbr title=\"Interface de configuração Lua\">LuCI</abbr> as "
"alterações devem ser confirmadas clicando em Alterações - Salvar &amp; "
diff --git a/po/pt/asterisk.po b/po/pt/asterisk.po
index 9cde54f0b..8d90601c8 100644
--- a/po/pt/asterisk.po
+++ b/po/pt/asterisk.po
@@ -1142,8 +1142,3 @@ msgstr "Secção do Plano de Marcação"
#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:250
msgid "Message Format"
msgstr ""
-
-#. Time Zone
-#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:251
-msgid "asterisk_voicezone_zone"
-msgstr ""
diff --git a/po/pt/cbi.po b/po/pt/cbi.po
index e321566d8..27533f0a6 100644
--- a/po/pt/cbi.po
+++ b/po/pt/cbi.po
@@ -101,5 +101,5 @@ msgstr "Ficheiro carregado"
#. Search file...
#: i18n/english/luasrc/i18n/cbi.en.lua:17
-msgid "cbi_browser"
+msgid "Search file..."
msgstr "Procurar ficheiro..."
diff --git a/po/pt/coovachilli.po b/po/pt/coovachilli.po
index cf2705d64..14bfb90b6 100644
--- a/po/pt/coovachilli.po
+++ b/po/pt/coovachilli.po
@@ -993,5 +993,7 @@ msgstr ""
#. Suffix to add to the MAC address in order to form the User-Name, which is sent to the radius server
#: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:177
-msgid "coovachilli_macauth_macsuffix_desc"
+msgid ""
+"Suffix to add to the MAC address in order to form the User-Name, which is "
+"sent to the radius server"
msgstr ""
diff --git a/po/pt/ddns.po b/po/pt/ddns.po
index 4bbc6608a..0d4e1140a 100644
--- a/po/pt/ddns.po
+++ b/po/pt/ddns.po
@@ -52,5 +52,5 @@ msgstr "Unidade de tempo para actualização forçada"
#. Custom Update-URL
#: applications/luci-ddns/luasrc/i18n/ddns.en.lua:8
-msgid "ddns_service_updateurl"
+msgid "Custom Update-URL"
msgstr "URL para actualização personalizada"
diff --git a/po/pt/initmgr.po b/po/pt/initmgr.po
index 1ed6ee747..7ee5ec7da 100644
--- a/po/pt/initmgr.po
+++ b/po/pt/initmgr.po
@@ -42,5 +42,5 @@ msgstr "Script de inicialização"
#. Enable/Disable
#: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:5
-msgid "initmgr_enabled"
+msgid "Enable/Disable"
msgstr "Ativar/Desativar"
diff --git a/po/pt/livestats.po b/po/pt/livestats.po
index 9fd7d83a8..d68d7c09b 100644
--- a/po/pt/livestats.po
+++ b/po/pt/livestats.po
@@ -43,5 +43,5 @@ msgstr "Estado wireless em tempo-real"
#. Realtime Network Traffic
#: applications/luci-livestats/luasrc/i18n/livestats.en.lua:7
-msgid "livestats_stat_traffic"
+msgid "Realtime Network Traffic"
msgstr "Tráfego de rede em tempo-real"
diff --git a/po/pt/luci-fw.po b/po/pt/luci-fw.po
index 33e968b06..d0f77307c 100644
--- a/po/pt/luci-fw.po
+++ b/po/pt/luci-fw.po
@@ -259,5 +259,5 @@ msgstr "Redes"
#. contained networks
#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:56
-msgid "firewall_zone_network_desc"
+msgid "contained networks"
msgstr "redes contidas"
diff --git a/po/pt/ntpc.po b/po/pt/ntpc.po
index 7b6be5f39..ea6226059 100644
--- a/po/pt/ntpc.po
+++ b/po/pt/ntpc.po
@@ -53,5 +53,5 @@ msgstr "Frequência do Offset"
#. Current system time
#: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:9
-msgid "ntpc_current"
+msgid "Current system time"
msgstr "Hora actual do sistema"
diff --git a/po/pt/olsr.po b/po/pt/olsr.po
index 8eb5920c6..432a7e114 100644
--- a/po/pt/olsr.po
+++ b/po/pt/olsr.po
@@ -671,5 +671,5 @@ msgstr "Ficheiro de chave"
#. Watchdog timestamp file
#: applications/luci-olsr/luasrc/i18n/olsr.en.lua:128
-msgid "olsrd_loadplugin_file"
+msgid "Watchdog timestamp file"
msgstr "Ficheiro da timestamp do watchdog"
diff --git a/po/pt/p910nd.po b/po/pt/p910nd.po
index 7f41fca85..1f9130b09 100644
--- a/po/pt/p910nd.po
+++ b/po/pt/p910nd.po
@@ -33,5 +33,5 @@ msgstr "Modo bidirecional"
#. p910nd listens on port 910+N. E.g. 9100 for the first printer.
#: applications/luci-p910nd/luasrc/i18n/p910nd.en.lua:4
-msgid "port_help"
+msgid "p910nd listens on port 910+N. E.g. 9100 for the first printer."
msgstr "p910nd escuta na porta 910+N. Ex. 9100 para a primeira impressora."
diff --git a/po/pt/qos.po b/po/pt/qos.po
index c559fdf39..f198d4ecf 100644
--- a/po/pt/qos.po
+++ b/po/pt/qos.po
@@ -109,5 +109,5 @@ msgstr "alta"
#. Bytes sent
#: applications/luci-qos/luasrc/i18n/qos.en.lua:18
-msgid "qos_connbytes"
+msgid "Bytes sent"
msgstr "Bytes enviados"
diff --git a/po/pt/rrdtool.po b/po/pt/rrdtool.po
index 60296270f..713aa99aa 100644
--- a/po/pt/rrdtool.po
+++ b/po/pt/rrdtool.po
@@ -268,5 +268,5 @@ msgstr "5 min"
#. 15 min
#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:69
-msgid "stat_ds_load__longterm"
+msgid "15 min"
msgstr "15 min"
diff --git a/po/pt/samba.po b/po/pt/samba.po
index 05a7efd22..2d8f3665b 100644
--- a/po/pt/samba.po
+++ b/po/pt/samba.po
@@ -96,5 +96,5 @@ msgstr "Máscara do Diretório"
#. Mask for new directories
#: applications/luci-samba/luasrc/i18n/samba.en.lua:17
-msgid "samba_sambashare_dirmask_desc"
+msgid "Mask for new directories"
msgstr "Máscara para novos diretórios"
diff --git a/po/pt/statistics.po b/po/pt/statistics.po
index b7058503a..160c4a7eb 100644
--- a/po/pt/statistics.po
+++ b/po/pt/statistics.po
@@ -819,5 +819,5 @@ msgstr ""
#. Enable this plugin
#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:212
-msgid "lucistatistics_collectdwireless_enable"
+msgid "Enable this plugin"
msgstr "Habilitar este plugin"
diff --git a/po/pt/sysauth.po b/po/pt/sysauth.po
index f6cf5e5c0..8da846554 100644
--- a/po/pt/sysauth.po
+++ b/po/pt/sysauth.po
@@ -23,5 +23,5 @@ msgstr "Insira o seu username e password."
#. Invalid username and/or password! Please try again.
#: i18n/english/luasrc/i18n/sysauth.en.lua:3
-msgid "sysauth_failed"
+msgid "Invalid username and/or password! Please try again."
msgstr "Username inválido e/ou a password! Por favor, tente novamente."
diff --git a/po/pt/tinyproxy.po b/po/pt/tinyproxy.po
index a6256c33b..5ccd6014e 100644
--- a/po/pt/tinyproxy.po
+++ b/po/pt/tinyproxy.po
@@ -169,5 +169,5 @@ msgstr "Tipo"
#. Upstream Proxy
#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:32
-msgid "tinyproxy_upstream_via"
+msgid "Upstream Proxy"
msgstr "Proxy para Upstream"
diff --git a/po/pt/upnp.po b/po/pt/upnp.po
index 8e463ca79..e5c25b52e 100644
--- a/po/pt/upnp.po
+++ b/po/pt/upnp.po
@@ -51,5 +51,5 @@ msgstr "Link para download"
#. Uplink
#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:7
-msgid "upnpd_config_upload"
+msgid "Uplink"
msgstr "Link para Upload"
diff --git a/po/pt/ushare.po b/po/pt/ushare.po
index 19f974fca..5938c1df4 100644
--- a/po/pt/ushare.po
+++ b/po/pt/ushare.po
@@ -41,13 +41,3 @@ msgstr "Nome do servidor"
#: applications/luci-ushare/luasrc/i18n/ushare.en.lua:6
msgid "Settings"
msgstr "Configurações"
-
-#. uShare
-#: applications/luci-ushare/luasrc/i18n/ushare.en.lua:7
-msgid "uShare"
-msgstr "uShare"
-
-#. uShare
-#: applications/luci-ushare/luasrc/i18n/ushare.en.lua:8
-msgid "ushare_desc"
-msgstr "uShare"
diff --git a/po/pt_BR/admin-core.po b/po/pt_BR/admin-core.po
index 994fb88d9..d21cef2d0 100644
--- a/po/pt_BR/admin-core.po
+++ b/po/pt_BR/admin-core.po
@@ -97,7 +97,8 @@ msgstr ""
#: i18n/english/luasrc/i18n/admin-core.en.lua:13
msgid ""
"Notice: In <abbr title=\"Lua Configuration Interface\">LuCI</abbr> changes "
-"have to be confirmed by clicking Changes - Save &amp; Apply before being applied."
+"have to be confirmed by clicking Changes - Save &amp; Apply before being "
+"applied."
msgstr ""
"Aviso: No <abbr title=\"Interface de configuração Lua\">LuCI</abbr> as "
"alterações devem ser confirmadas clicando em Alterações - Salvar &amp; "
diff --git a/po/pt_BR/asterisk.po b/po/pt_BR/asterisk.po
index e40f24322..5e6623266 100644
--- a/po/pt_BR/asterisk.po
+++ b/po/pt_BR/asterisk.po
@@ -1136,8 +1136,3 @@ msgstr ""
#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:250
msgid "Message Format"
msgstr ""
-
-#. Time Zone
-#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:251
-msgid "asterisk_voicezone_zone"
-msgstr ""
diff --git a/po/pt_BR/cbi.po b/po/pt_BR/cbi.po
index 6e85e2995..de0d86987 100644
--- a/po/pt_BR/cbi.po
+++ b/po/pt_BR/cbi.po
@@ -101,5 +101,5 @@ msgstr "Ficheiro carregado"
#. Search file...
#: i18n/english/luasrc/i18n/cbi.en.lua:17
-msgid "cbi_browser"
+msgid "Search file..."
msgstr "Procurar ficheiro..."
diff --git a/po/pt_BR/coovachilli.po b/po/pt_BR/coovachilli.po
index 1948d1be7..c3743b1a6 100644
--- a/po/pt_BR/coovachilli.po
+++ b/po/pt_BR/coovachilli.po
@@ -942,5 +942,7 @@ msgstr ""
#. Suffix to add to the MAC address in order to form the User-Name, which is sent to the radius server
#: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:177
-msgid "coovachilli_macauth_macsuffix_desc"
+msgid ""
+"Suffix to add to the MAC address in order to form the User-Name, which is "
+"sent to the radius server"
msgstr ""
diff --git a/po/pt_BR/ddns.po b/po/pt_BR/ddns.po
index 70df6288f..e4f9db874 100644
--- a/po/pt_BR/ddns.po
+++ b/po/pt_BR/ddns.po
@@ -52,5 +52,5 @@ msgstr "Unidade de tempo para actualização forçada"
#. Custom Update-URL
#: applications/luci-ddns/luasrc/i18n/ddns.en.lua:8
-msgid "ddns_service_updateurl"
+msgid "Custom Update-URL"
msgstr "URL para actualização personalizada"
diff --git a/po/pt_BR/initmgr.po b/po/pt_BR/initmgr.po
index 2cd39c177..f84c3036b 100644
--- a/po/pt_BR/initmgr.po
+++ b/po/pt_BR/initmgr.po
@@ -42,5 +42,5 @@ msgstr "Script de inicialização"
#. Enable/Disable
#: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:5
-msgid "initmgr_enabled"
+msgid "Enable/Disable"
msgstr "Ativar/Desativar"
diff --git a/po/pt_BR/livestats.po b/po/pt_BR/livestats.po
index 151900711..15568c6f8 100644
--- a/po/pt_BR/livestats.po
+++ b/po/pt_BR/livestats.po
@@ -43,5 +43,5 @@ msgstr "Estado wireless em tempo-real"
#. Realtime Network Traffic
#: applications/luci-livestats/luasrc/i18n/livestats.en.lua:7
-msgid "livestats_stat_traffic"
+msgid "Realtime Network Traffic"
msgstr "Tráfego de rede em tempo-real"
diff --git a/po/pt_BR/luci-fw.po b/po/pt_BR/luci-fw.po
index b3a1995da..b683f5d9e 100644
--- a/po/pt_BR/luci-fw.po
+++ b/po/pt_BR/luci-fw.po
@@ -259,5 +259,5 @@ msgstr "Redes"
#. contained networks
#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:56
-msgid "firewall_zone_network_desc"
+msgid "contained networks"
msgstr "redes contidas"
diff --git a/po/pt_BR/ntpc.po b/po/pt_BR/ntpc.po
index 3255e648b..cdb3c8b77 100644
--- a/po/pt_BR/ntpc.po
+++ b/po/pt_BR/ntpc.po
@@ -53,5 +53,5 @@ msgstr "Frequência do Offset"
#. Current system time
#: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:9
-msgid "ntpc_current"
+msgid "Current system time"
msgstr "Hora actual do sistema"
diff --git a/po/pt_BR/olsr.po b/po/pt_BR/olsr.po
index e1fee4ff1..b8c11fd93 100644
--- a/po/pt_BR/olsr.po
+++ b/po/pt_BR/olsr.po
@@ -671,5 +671,5 @@ msgstr "Ficheiro de chave"
#. Watchdog timestamp file
#: applications/luci-olsr/luasrc/i18n/olsr.en.lua:128
-msgid "olsrd_loadplugin_file"
+msgid "Watchdog timestamp file"
msgstr "Ficheiro da timestamp do watchdog"
diff --git a/po/pt_BR/p910nd.po b/po/pt_BR/p910nd.po
index f4885dd02..ae9cbe591 100644
--- a/po/pt_BR/p910nd.po
+++ b/po/pt_BR/p910nd.po
@@ -33,5 +33,5 @@ msgstr "Modo bidirecional"
#. p910nd listens on port 910+N. E.g. 9100 for the first printer.
#: applications/luci-p910nd/luasrc/i18n/p910nd.en.lua:4
-msgid "port_help"
+msgid "p910nd listens on port 910+N. E.g. 9100 for the first printer."
msgstr "p910nd escuta na porta 910+N. Ex. 9100 para a primeira impressora."
diff --git a/po/pt_BR/qos.po b/po/pt_BR/qos.po
index 28f92acd3..f303c5cf8 100644
--- a/po/pt_BR/qos.po
+++ b/po/pt_BR/qos.po
@@ -109,5 +109,5 @@ msgstr "alta"
#. Bytes sent
#: applications/luci-qos/luasrc/i18n/qos.en.lua:18
-msgid "qos_connbytes"
+msgid "Bytes sent"
msgstr "Bytes enviados"
diff --git a/po/pt_BR/rrdtool.po b/po/pt_BR/rrdtool.po
index 68a4adc19..b846ee097 100644
--- a/po/pt_BR/rrdtool.po
+++ b/po/pt_BR/rrdtool.po
@@ -268,5 +268,5 @@ msgstr "5 min"
#. 15 min
#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:69
-msgid "stat_ds_load__longterm"
+msgid "15 min"
msgstr "15 min"
diff --git a/po/pt_BR/samba.po b/po/pt_BR/samba.po
index 2e84f90af..d04b2fc26 100644
--- a/po/pt_BR/samba.po
+++ b/po/pt_BR/samba.po
@@ -96,5 +96,5 @@ msgstr "Máscara do Diretório"
#. Mask for new directories
#: applications/luci-samba/luasrc/i18n/samba.en.lua:17
-msgid "samba_sambashare_dirmask_desc"
+msgid "Mask for new directories"
msgstr "Máscara para novos diretórios"
diff --git a/po/pt_BR/statistics.po b/po/pt_BR/statistics.po
index ebd9c7166..c1d70a5ea 100644
--- a/po/pt_BR/statistics.po
+++ b/po/pt_BR/statistics.po
@@ -819,5 +819,5 @@ msgstr ""
#. Enable this plugin
#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:212
-msgid "lucistatistics_collectdwireless_enable"
+msgid "Enable this plugin"
msgstr "Habilitar este plugin"
diff --git a/po/pt_BR/sysauth.po b/po/pt_BR/sysauth.po
index 4a2dadb68..84b7276ca 100644
--- a/po/pt_BR/sysauth.po
+++ b/po/pt_BR/sysauth.po
@@ -23,5 +23,5 @@ msgstr "Insira o seu username e password."
#. Invalid username and/or password! Please try again.
#: i18n/english/luasrc/i18n/sysauth.en.lua:3
-msgid "sysauth_failed"
+msgid "Invalid username and/or password! Please try again."
msgstr "Username inválido e/ou a password! Por favor, tente novamente."
diff --git a/po/pt_BR/tinyproxy.po b/po/pt_BR/tinyproxy.po
index 5f7a85107..d0722b4ee 100644
--- a/po/pt_BR/tinyproxy.po
+++ b/po/pt_BR/tinyproxy.po
@@ -169,5 +169,5 @@ msgstr "Tipo"
#. Upstream Proxy
#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:32
-msgid "tinyproxy_upstream_via"
+msgid "Upstream Proxy"
msgstr "Proxy para Upstream"
diff --git a/po/pt_BR/upnp.po b/po/pt_BR/upnp.po
index a76a68ca2..879bf6230 100644
--- a/po/pt_BR/upnp.po
+++ b/po/pt_BR/upnp.po
@@ -51,5 +51,5 @@ msgstr "Link para download"
#. Uplink
#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:7
-msgid "upnpd_config_upload"
+msgid "Uplink"
msgstr "Link para Upload"
diff --git a/po/pt_BR/ushare.po b/po/pt_BR/ushare.po
index c883de08b..fb8336328 100644
--- a/po/pt_BR/ushare.po
+++ b/po/pt_BR/ushare.po
@@ -41,13 +41,3 @@ msgstr "Nome do servidor"
#: applications/luci-ushare/luasrc/i18n/ushare.en.lua:6
msgid "Settings"
msgstr "Configurações"
-
-#. uShare
-#: applications/luci-ushare/luasrc/i18n/ushare.en.lua:7
-msgid "uShare"
-msgstr "uShare"
-
-#. uShare
-#: applications/luci-ushare/luasrc/i18n/ushare.en.lua:8
-msgid "ushare_desc"
-msgstr "uShare"
diff --git a/po/ru/admin-core.po b/po/ru/admin-core.po
index 54c8a3c58..99073be5c 100644
--- a/po/ru/admin-core.po
+++ b/po/ru/admin-core.po
@@ -94,7 +94,8 @@ msgstr ""
#: i18n/english/luasrc/i18n/admin-core.en.lua:13
msgid ""
"Notice: In <abbr title=\"Lua Configuration Interface\">LuCI</abbr> changes "
-"have to be confirmed by clicking Changes - Save &amp; Apply before being applied."
+"have to be confirmed by clicking Changes - Save &amp; Apply before being "
+"applied."
msgstr ""
"Внимание: В <abbr title=\"Lua Конфигурационный Интерфейс\">LuCI</abbr> "
"изменения принимаются после нажатия - Принять."
diff --git a/po/ru/asterisk.po b/po/ru/asterisk.po
index eadaf1f3f..a774a35d8 100644
--- a/po/ru/asterisk.po
+++ b/po/ru/asterisk.po
@@ -117,11 +117,6 @@ msgstr ""
msgid "Verbose Level"
msgstr ""
-#. Time Zone
-#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:22
-msgid "Time Zone"
-msgstr ""
-
#. Section dialplan
#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:23
msgid "Section dialplan"
@@ -1126,8 +1121,3 @@ msgstr ""
#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:250
msgid "Message Format"
msgstr ""
-
-#. Time Zone
-#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:251
-msgid "asterisk_voicezone_zone"
-msgstr ""
diff --git a/po/ru/cbi.po b/po/ru/cbi.po
index 055bd9059..05ceaf61e 100644
--- a/po/ru/cbi.po
+++ b/po/ru/cbi.po
@@ -98,5 +98,5 @@ msgstr ""
#. Search file...
#: i18n/english/luasrc/i18n/cbi.en.lua:17
-msgid "cbi_browser"
+msgid "Search file..."
msgstr ""
diff --git a/po/ru/coovachilli.po b/po/ru/coovachilli.po
index fcbde0d7d..2bdf6bddb 100644
--- a/po/ru/coovachilli.po
+++ b/po/ru/coovachilli.po
@@ -904,5 +904,7 @@ msgstr ""
#. Suffix to add to the MAC address in order to form the User-Name, which is sent to the radius server
#: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:177
-msgid "coovachilli_macauth_macsuffix_desc"
+msgid ""
+"Suffix to add to the MAC address in order to form the User-Name, which is "
+"sent to the radius server"
msgstr ""
diff --git a/po/ru/ddns.po b/po/ru/ddns.po
index d0ddf21b5..c91b55849 100644
--- a/po/ru/ddns.po
+++ b/po/ru/ddns.po
@@ -51,5 +51,5 @@ msgstr ""
#. Custom Update-URL
#: applications/luci-ddns/luasrc/i18n/ddns.en.lua:8
-msgid "ddns_service_updateurl"
+msgid "Custom Update-URL"
msgstr ""
diff --git a/po/ru/initmgr.po b/po/ru/initmgr.po
index 3273c33f1..b1c4fac10 100644
--- a/po/ru/initmgr.po
+++ b/po/ru/initmgr.po
@@ -37,5 +37,5 @@ msgstr ""
#. Enable/Disable
#: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:5
-msgid "initmgr_enabled"
+msgid "Enable/Disable"
msgstr ""
diff --git a/po/ru/livestats.po b/po/ru/livestats.po
index 5a1b08d37..ffea8e456 100644
--- a/po/ru/livestats.po
+++ b/po/ru/livestats.po
@@ -44,5 +44,5 @@ msgstr ""
#. Realtime Network Traffic
#: applications/luci-livestats/luasrc/i18n/livestats.en.lua:7
-msgid "livestats_stat_traffic"
+msgid "Realtime Network Traffic"
msgstr ""
diff --git a/po/ru/luci-fw.po b/po/ru/luci-fw.po
index 8738cd8f3..802da6977 100644
--- a/po/ru/luci-fw.po
+++ b/po/ru/luci-fw.po
@@ -241,5 +241,5 @@ msgstr ""
#. contained networks
#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:56
-msgid "firewall_zone_network_desc"
+msgid "contained networks"
msgstr ""
diff --git a/po/ru/ntpc.po b/po/ru/ntpc.po
index b1e6417dc..664381f1c 100644
--- a/po/ru/ntpc.po
+++ b/po/ru/ntpc.po
@@ -54,5 +54,5 @@ msgstr ""
#. Current system time
#: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:9
-msgid "ntpc_current"
+msgid "Current system time"
msgstr ""
diff --git a/po/ru/olsr.po b/po/ru/olsr.po
index dc531cc09..d4c35cbff 100644
--- a/po/ru/olsr.po
+++ b/po/ru/olsr.po
@@ -644,5 +644,5 @@ msgstr ""
#. Watchdog timestamp file
#: applications/luci-olsr/luasrc/i18n/olsr.en.lua:128
-msgid "olsrd_loadplugin_file"
+msgid "Watchdog timestamp file"
msgstr ""
diff --git a/po/ru/openvpn.po b/po/ru/openvpn.po
index 3883ec08e..7a9be0f70 100644
--- a/po/ru/openvpn.po
+++ b/po/ru/openvpn.po
@@ -959,5 +959,5 @@ msgstr ""
#. Require normal and extended key usage on certificate
#: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:196
-msgid "openvpn_param_remote_cert_tls"
+msgid "Require normal and extended key usage on certificate"
msgstr ""
diff --git a/po/ru/p910nd.po b/po/ru/p910nd.po
index a24f1018c..4cfb5e01e 100644
--- a/po/ru/p910nd.po
+++ b/po/ru/p910nd.po
@@ -31,5 +31,5 @@ msgstr ""
#. p910nd listens on port 910+N. E.g. 9100 for the first printer.
#: applications/luci-p910nd/luasrc/i18n/p910nd.en.lua:4
-msgid "port_help"
+msgid "p910nd listens on port 910+N. E.g. 9100 for the first printer."
msgstr ""
diff --git a/po/ru/polipo.po b/po/ru/polipo.po
index 38709ff4b..95d32a406 100644
--- a/po/ru/polipo.po
+++ b/po/ru/polipo.po
@@ -258,5 +258,5 @@ 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 "To enable PMM, PMM segment size must be set to some positive value."
msgstr ""
diff --git a/po/ru/qos.po b/po/ru/qos.po
index 499bb1d08..92d999efa 100644
--- a/po/ru/qos.po
+++ b/po/ru/qos.po
@@ -101,5 +101,5 @@ msgstr ""
#. Bytes sent
#: applications/luci-qos/luasrc/i18n/qos.en.lua:18
-msgid "qos_connbytes"
+msgid "Bytes sent"
msgstr ""
diff --git a/po/ru/rrdtool.po b/po/ru/rrdtool.po
index 496f0623e..a126371ed 100644
--- a/po/ru/rrdtool.po
+++ b/po/ru/rrdtool.po
@@ -269,5 +269,5 @@ msgstr ""
#. 15 min
#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:69
-msgid "stat_ds_load__longterm"
+msgid "15 min"
msgstr ""
diff --git a/po/ru/samba.po b/po/ru/samba.po
index b9d997ea1..79308d89e 100644
--- a/po/ru/samba.po
+++ b/po/ru/samba.po
@@ -94,5 +94,5 @@ msgstr ""
#. Mask for new directories
#: applications/luci-samba/luasrc/i18n/samba.en.lua:17
-msgid "samba_sambashare_dirmask_desc"
+msgid "Mask for new directories"
msgstr ""
diff --git a/po/ru/statistics.po b/po/ru/statistics.po
index b64adae46..16d7043b9 100644
--- a/po/ru/statistics.po
+++ b/po/ru/statistics.po
@@ -759,5 +759,5 @@ msgstr ""
#. Enable this plugin
#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:212
-msgid "lucistatistics_collectdwireless_enable"
+msgid "Enable this plugin"
msgstr ""
diff --git a/po/ru/sysauth.po b/po/ru/sysauth.po
index 4f570eaab..4d72a3d9d 100644
--- a/po/ru/sysauth.po
+++ b/po/ru/sysauth.po
@@ -24,5 +24,5 @@ msgstr "Пожалуйста, введите логин и пароль."
#. Invalid username and/or password! Please try again.
#: i18n/english/luasrc/i18n/sysauth.en.lua:3
-msgid "sysauth_failed"
+msgid "Invalid username and/or password! Please try again."
msgstr "Неверный логин и/или пароль! Пожалуйста попробуйте снова."
diff --git a/po/ru/tinyproxy.po b/po/ru/tinyproxy.po
index df4b3498e..0c4f236f1 100644
--- a/po/ru/tinyproxy.po
+++ b/po/ru/tinyproxy.po
@@ -169,5 +169,5 @@ msgstr ""
#. Upstream Proxy
#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:32
-msgid "tinyproxy_upstream_via"
+msgid "Upstream Proxy"
msgstr ""
diff --git a/po/ru/upnp.po b/po/ru/upnp.po
index 892b47cc4..ce108f3e4 100644
--- a/po/ru/upnp.po
+++ b/po/ru/upnp.po
@@ -48,5 +48,5 @@ msgstr ""
#. Uplink
#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:7
-msgid "upnpd_config_upload"
+msgid "Uplink"
msgstr ""
diff --git a/po/ru/ushare.po b/po/ru/ushare.po
index c0ff09ca1..d52f05c46 100644
--- a/po/ru/ushare.po
+++ b/po/ru/ushare.po
@@ -41,13 +41,3 @@ msgstr ""
#: applications/luci-ushare/luasrc/i18n/ushare.en.lua:6
msgid "Settings"
msgstr ""
-
-#. uShare
-#: applications/luci-ushare/luasrc/i18n/ushare.en.lua:7
-msgid "uShare"
-msgstr ""
-
-#. uShare
-#: applications/luci-ushare/luasrc/i18n/ushare.en.lua:8
-msgid "ushare_desc"
-msgstr ""
diff --git a/po/ru/uvc_streamer.po b/po/ru/uvc_streamer.po
index 0431eb192..aa4bc111e 100644
--- a/po/ru/uvc_streamer.po
+++ b/po/ru/uvc_streamer.po
@@ -34,5 +34,7 @@ msgstr ""
#. Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a href=\"http://%s:%i/\">http://%s:%i/</a>
#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:5
-msgid "uvc_streamer_desc"
+msgid ""
+"Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a "
+"href=\"http://%s:%i/\">http://%s:%i/</a>"
msgstr ""
diff --git a/po/ru/uvl.po b/po/ru/uvl.po
index a0289acb2..ba5b46e3a 100644
--- a/po/ru/uvl.po
+++ b/po/ru/uvl.po
@@ -207,5 +207,7 @@ msgstr ""
#. In dependency check for enum value \"%i\":\n%c
#: libs/uvl/luasrc/i18n/uvl.en.lua:39
-msgid "uvl_err_dep_badenum"
+msgid ""
+"In dependency check for enum value \"%i\":\n"
+"%c"
msgstr ""
diff --git a/po/ru/wifi.po b/po/ru/wifi.po
index cf5f8c9d4..2aada4166 100644
--- a/po/ru/wifi.po
+++ b/po/ru/wifi.po
@@ -204,5 +204,7 @@ msgstr ""
#. WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP and ad-hoc mode) to be installed.
#: i18n/english/luasrc/i18n/wifi.en.lua:39
-msgid "wifi_wpareq"
+msgid ""
+"WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
+"and ad-hoc mode) to be installed."
msgstr ""
diff --git a/po/templates/admin-core.pot b/po/templates/admin-core.pot
index 9f9bebcfe..8ee0bed81 100644
--- a/po/templates/admin-core.pot
+++ b/po/templates/admin-core.pot
@@ -2105,5 +2105,5 @@ msgstr ""
#. The flash image was uploaded. Below is the checksum and file size listed, compare them with the original file to ensure data integrity.<br /> Click \"Proceed\" below to start the flash procedure.
#: i18n/english/luasrc/i18n/admin-core.en.lua:412
-msgid "admin_upgrade_uploaded"
+msgid "The flash image was uploaded. Below is the checksum and file size listed, compare them with the original file to ensure data integrity.<br /> Click \"Proceed\" below to start the flash procedure."
msgstr ""
diff --git a/po/templates/asterisk.pot b/po/templates/asterisk.pot
index 3f9a857c6..00d211d64 100644
--- a/po/templates/asterisk.pot
+++ b/po/templates/asterisk.pot
@@ -1120,5 +1120,5 @@ msgstr ""
#. Time Zone
#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:251
-msgid "asterisk_voicezone_zone"
+msgid "Time Zone"
msgstr ""
diff --git a/po/templates/cbi.pot b/po/templates/cbi.pot
index 8500e8ceb..1b9db9935 100644
--- a/po/templates/cbi.pot
+++ b/po/templates/cbi.pot
@@ -89,5 +89,5 @@ msgstr ""
#. Search file...
#: i18n/english/luasrc/i18n/cbi.en.lua:17
-msgid "cbi_browser"
+msgid "Search file..."
msgstr ""
diff --git a/po/templates/coovachilli.pot b/po/templates/coovachilli.pot
index 925fed377..0b7206764 100644
--- a/po/templates/coovachilli.pot
+++ b/po/templates/coovachilli.pot
@@ -895,5 +895,5 @@ msgstr ""
#. Suffix to add to the MAC address in order to form the User-Name, which is sent to the radius server
#: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:177
-msgid "coovachilli_macauth_macsuffix_desc"
+msgid "Suffix to add to the MAC address in order to form the User-Name, which is sent to the radius server"
msgstr ""
diff --git a/po/templates/default.pot b/po/templates/default.pot
index ad82372b2..86730653c 100644
--- a/po/templates/default.pot
+++ b/po/templates/default.pot
@@ -522,5 +522,5 @@ msgstr ""
#. Zone
#: i18n/english/luasrc/i18n/default.en.lua:104
-msgid "zone"
+msgid "Zone"
msgstr ""
diff --git a/po/templates/freifunk.pot b/po/templates/freifunk.pot
index 57d5da86d..b466a2cc4 100644
--- a/po/templates/freifunk.pot
+++ b/po/templates/freifunk.pot
@@ -244,5 +244,5 @@ msgid "Verify downloaded images"
msgstr ""
#. Confirm Upgrade
-msgid "ff_remote_update_confirm"
+msgid "Confirm Upgrade"
msgstr ""
diff --git a/po/templates/initmgr.pot b/po/templates/initmgr.pot
index ff776b746..bd7dcaa16 100644
--- a/po/templates/initmgr.pot
+++ b/po/templates/initmgr.pot
@@ -28,5 +28,5 @@ msgstr ""
#. Enable/Disable
#: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:5
-msgid "initmgr_enabled"
+msgid "Enable/Disable"
msgstr ""
diff --git a/po/templates/livestats.pot b/po/templates/livestats.pot
index cf420da18..705303847 100644
--- a/po/templates/livestats.pot
+++ b/po/templates/livestats.pot
@@ -35,5 +35,5 @@ msgstr ""
#. Realtime Network Traffic
#: applications/luci-livestats/luasrc/i18n/livestats.en.lua:7
-msgid "livestats_stat_traffic"
+msgid "Realtime Network Traffic"
msgstr ""
diff --git a/po/templates/luci-fw.pot b/po/templates/luci-fw.pot
index 5e6a37a1f..049732fb0 100644
--- a/po/templates/luci-fw.pot
+++ b/po/templates/luci-fw.pot
@@ -232,5 +232,5 @@ msgstr ""
#. contained networks
#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:56
-msgid "firewall_zone_network_desc"
+msgid "contained networks"
msgstr ""
diff --git a/po/templates/ntpc.pot b/po/templates/ntpc.pot
index d9883be72..8d85d0b11 100644
--- a/po/templates/ntpc.pot
+++ b/po/templates/ntpc.pot
@@ -45,5 +45,5 @@ msgstr ""
#. Current system time
#: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:9
-msgid "ntpc_current"
+msgid "Current system time"
msgstr ""
diff --git a/po/templates/olsr.pot b/po/templates/olsr.pot
index 2514cfbf1..02a2f0960 100644
--- a/po/templates/olsr.pot
+++ b/po/templates/olsr.pot
@@ -635,5 +635,5 @@ msgstr ""
#. Watchdog timestamp file
#: applications/luci-olsr/luasrc/i18n/olsr.en.lua:128
-msgid "olsrd_loadplugin_file"
+msgid "Watchdog timestamp file"
msgstr ""
diff --git a/po/templates/openvpn.pot b/po/templates/openvpn.pot
index 26b819efd..964594d71 100644
--- a/po/templates/openvpn.pot
+++ b/po/templates/openvpn.pot
@@ -950,5 +950,5 @@ msgstr ""
#. Require normal and extended key usage on certificate
#: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:196
-msgid "openvpn_param_remote_cert_tls"
+msgid "Require normal and extended key usage on certificate"
msgstr ""
diff --git a/po/templates/p910nd.pot b/po/templates/p910nd.pot
index 6996010c4..7758852cb 100644
--- a/po/templates/p910nd.pot
+++ b/po/templates/p910nd.pot
@@ -22,5 +22,5 @@ msgstr ""
#. p910nd listens on port 910+N. E.g. 9100 for the first printer.
#: applications/luci-p910nd/luasrc/i18n/p910nd.en.lua:4
-msgid "port_help"
+msgid "p910nd listens on port 910+N. E.g. 9100 for the first printer."
msgstr ""
diff --git a/po/templates/polipo.pot b/po/templates/polipo.pot
index 4c582ab32..f75f6d0a2 100644
--- a/po/templates/polipo.pot
+++ b/po/templates/polipo.pot
@@ -249,5 +249,5 @@ 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 "To enable PMM, PMM segment size must be set to some positive value."
msgstr ""
diff --git a/po/templates/qos.pot b/po/templates/qos.pot
index 1fbb709cc..975f892ae 100644
--- a/po/templates/qos.pot
+++ b/po/templates/qos.pot
@@ -96,5 +96,5 @@ msgstr ""
#. Bytes sent
#: applications/luci-qos/luasrc/i18n/qos.en.lua:18
-msgid "qos_connbytes"
+msgid "Bytes sent"
msgstr ""
diff --git a/po/templates/rrdtool.pot b/po/templates/rrdtool.pot
index bedcbbb61..7554a2763 100644
--- a/po/templates/rrdtool.pot
+++ b/po/templates/rrdtool.pot
@@ -260,5 +260,5 @@ msgstr ""
#. 15 min
#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:69
-msgid "stat_ds_load__longterm"
+msgid "15 min"
msgstr ""
diff --git a/po/templates/samba.pot b/po/templates/samba.pot
index 2cd5c132d..2558db907 100644
--- a/po/templates/samba.pot
+++ b/po/templates/samba.pot
@@ -85,5 +85,5 @@ msgstr ""
#. Mask for new directories
#: applications/luci-samba/luasrc/i18n/samba.en.lua:17
-msgid "samba_sambashare_dirmask_desc"
+msgid "Mask for new directories"
msgstr ""
diff --git a/po/templates/statistics.pot b/po/templates/statistics.pot
index 4b1435dd2..2cbe6994d 100644
--- a/po/templates/statistics.pot
+++ b/po/templates/statistics.pot
@@ -750,5 +750,5 @@ msgstr ""
#. Enable this plugin
#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:212
-msgid "lucistatistics_collectdwireless_enable"
+msgid "Enable this plugin"
msgstr ""
diff --git a/po/templates/tinyproxy.pot b/po/templates/tinyproxy.pot
index e155a980e..3cbd319e1 100644
--- a/po/templates/tinyproxy.pot
+++ b/po/templates/tinyproxy.pot
@@ -160,5 +160,5 @@ msgstr ""
#. Upstream Proxy
#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:32
-msgid "tinyproxy_upstream_via"
+msgid "Upstream Proxy"
msgstr ""
diff --git a/po/templates/ushare.pot b/po/templates/ushare.pot
index 4a10b0c1b..8c3063d76 100644
--- a/po/templates/ushare.pot
+++ b/po/templates/ushare.pot
@@ -40,5 +40,5 @@ msgstr ""
#. uShare
#: applications/luci-ushare/luasrc/i18n/ushare.en.lua:8
-msgid "ushare_desc"
+msgid "uShare"
msgstr ""
diff --git a/po/templates/uvc_streamer.pot b/po/templates/uvc_streamer.pot
index 54910153e..08980eb62 100644
--- a/po/templates/uvc_streamer.pot
+++ b/po/templates/uvc_streamer.pot
@@ -25,5 +25,5 @@ msgstr ""
#. Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a href=\"http://%s:%i/\">http://%s:%i/</a>
#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:5
-msgid "uvc_streamer_desc"
+msgid "Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a href=\"http://%s:%i/\">http://%s:%i/</a>"
msgstr ""
diff --git a/po/templates/uvl.pot b/po/templates/uvl.pot
index a5a3ee8d5..a617bba1a 100644
--- a/po/templates/uvl.pot
+++ b/po/templates/uvl.pot
@@ -198,5 +198,5 @@ msgstr ""
#. In dependency check for enum value \"%i\":\n%c
#: libs/uvl/luasrc/i18n/uvl.en.lua:39
-msgid "uvl_err_dep_badenum"
+msgid "In dependency check for enum value \"%i\":\n%c"
msgstr ""
diff --git a/po/templates/wifi.pot b/po/templates/wifi.pot
index 2159b1a84..fa612badb 100644
--- a/po/templates/wifi.pot
+++ b/po/templates/wifi.pot
@@ -195,5 +195,5 @@ msgstr ""
#. WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP and ad-hoc mode) to be installed.
#: i18n/english/luasrc/i18n/wifi.en.lua:39
-msgid "wifi_wpareq"
+msgid "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP and ad-hoc mode) to be installed."
msgstr ""
diff --git a/po/vi/admin-core.po b/po/vi/admin-core.po
index a17243143..cdee44d11 100644
--- a/po/vi/admin-core.po
+++ b/po/vi/admin-core.po
@@ -95,11 +95,12 @@ msgstr ""
#: i18n/english/luasrc/i18n/admin-core.en.lua:13
msgid ""
"Notice: In <abbr title=\"Lua Configuration Interface\">LuCI</abbr> changes "
-"have to be confirmed by clicking Changes - Save &amp; Apply before being applied."
+"have to be confirmed by clicking Changes - Save &amp; Apply before being "
+"applied."
msgstr ""
"Ghi chú: Trong <abbr title=\"Cấu hình giao diện Lua \">LuCI</abbr> những "
-"thay đổi phải được xác nhận bằng cách nhấn vào Changes - Save &amp; Áp "
-"dụng trước khi được áp dụng."
+"thay đổi phải được xác nhận bằng cách nhấn vào Changes - Save &amp; Áp dụng "
+"trước khi được áp dụng."
#. As we always want to improve this interface we are looking forward to your feedback and suggestions.
#: i18n/english/luasrc/i18n/admin-core.en.lua:14
diff --git a/po/vi/asterisk.po b/po/vi/asterisk.po
index b46542ed2..104b5139c 100644
--- a/po/vi/asterisk.po
+++ b/po/vi/asterisk.po
@@ -118,11 +118,6 @@ msgstr "Truyền SLINEAR silence trong khi recording một channel"
msgid "Verbose Level"
msgstr "Verbose Level"
-#. Time Zone
-#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:22
-msgid "Time Zone"
-msgstr "Múi giờ"
-
#. Section dialplan
#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:23
msgid "Section dialplan"
@@ -1127,8 +1122,3 @@ msgstr "Cài đặt voice zone"
#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:250
msgid "Message Format"
msgstr "Message Format"
-
-#. Time Zone
-#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:251
-msgid "asterisk_voicezone_zone"
-msgstr "Time Zone"
diff --git a/po/vi/cbi.po b/po/vi/cbi.po
index ad028eff7..d6b1503fe 100644
--- a/po/vi/cbi.po
+++ b/po/vi/cbi.po
@@ -105,5 +105,5 @@ msgstr "Tập tin đã tải lên"
#. Search file...
#: i18n/english/luasrc/i18n/cbi.en.lua:17
-msgid "cbi_browser"
+msgid "Search file..."
msgstr "Tìm tập tin..."
diff --git a/po/vi/ddns.po b/po/vi/ddns.po
index 2a8bbefb7..efcb800f3 100644
--- a/po/vi/ddns.po
+++ b/po/vi/ddns.po
@@ -54,5 +54,5 @@ msgstr "Force-đơn vị thời gian"
#. Custom Update-URL
#: applications/luci-ddns/luasrc/i18n/ddns.en.lua:8
-msgid "ddns_service_updateurl"
+msgid "Custom Update-URL"
msgstr "Tùy chỉnh cập nhật - URL"
diff --git a/po/vi/initmgr.po b/po/vi/initmgr.po
index 721d3a738..2b075fffd 100644
--- a/po/vi/initmgr.po
+++ b/po/vi/initmgr.po
@@ -42,5 +42,5 @@ msgstr "Initscript"
#. Enable/Disable
#: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:5
-msgid "initmgr_enabled"
+msgid "Enable/Disable"
msgstr "Cho kích hoạt/ Vô hiệu hóa"
diff --git a/po/vi/livestats.po b/po/vi/livestats.po
index f71f5d0d3..5eead7fda 100644
--- a/po/vi/livestats.po
+++ b/po/vi/livestats.po
@@ -45,5 +45,5 @@ msgstr "Tình trạng Realtime Wireless"
#. Realtime Network Traffic
#: applications/luci-livestats/luasrc/i18n/livestats.en.lua:7
-msgid "livestats_stat_traffic"
+msgid "Realtime Network Traffic"
msgstr "Lưu thông mạng realtime"
diff --git a/po/vi/luci-fw.po b/po/vi/luci-fw.po
index dc9be69e0..23d513e97 100644
--- a/po/vi/luci-fw.po
+++ b/po/vi/luci-fw.po
@@ -260,5 +260,5 @@ msgstr "Networks"
#. contained networks
#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:56
-msgid "firewall_zone_network_desc"
+msgid "contained networks"
msgstr "contained networks"
diff --git a/po/vi/ntpc.po b/po/vi/ntpc.po
index 27ba50f05..1ba5b06a2 100644
--- a/po/vi/ntpc.po
+++ b/po/vi/ntpc.po
@@ -55,5 +55,5 @@ msgstr "tần số offset "
#. Current system time
#: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:9
-msgid "ntpc_current"
+msgid "Current system time"
msgstr "Thời gian hiện tại của hệ thống"
diff --git a/po/vi/olsr.po b/po/vi/olsr.po
index 54071ad90..c7bb51640 100644
--- a/po/vi/olsr.po
+++ b/po/vi/olsr.po
@@ -658,5 +658,5 @@ msgstr "Tập tin chính"
#. Watchdog timestamp file
#: applications/luci-olsr/luasrc/i18n/olsr.en.lua:128
-msgid "olsrd_loadplugin_file"
+msgid "Watchdog timestamp file"
msgstr "Tập tin watchdog timestamp"
diff --git a/po/vi/openvpn.po b/po/vi/openvpn.po
index d6ff1c58a..3afbd764e 100644
--- a/po/vi/openvpn.po
+++ b/po/vi/openvpn.po
@@ -963,5 +963,5 @@ msgstr "Yêu cầu gia hạn rõ ràng về cách sử dụng key trên giấy c
#. Require normal and extended key usage on certificate
#: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:196
-msgid "openvpn_param_remote_cert_tls"
+msgid "Require normal and extended key usage on certificate"
msgstr "Yêu cầu bình thường và mở rộng sử dụng key trên giấy chứng nhận"
diff --git a/po/vi/p910nd.po b/po/vi/p910nd.po
index 1a9880c8e..f83a19d37 100644
--- a/po/vi/p910nd.po
+++ b/po/vi/p910nd.po
@@ -34,5 +34,5 @@ msgstr "Chế độ 2 chiều"
#. p910nd listens on port 910+N. E.g. 9100 for the first printer.
#: applications/luci-p910nd/luasrc/i18n/p910nd.en.lua:4
-msgid "port_help"
+msgid "p910nd listens on port 910+N. E.g. 9100 for the first printer."
msgstr "p910nd tiếp thu ở cổng 910+N. E.g. 9100 cho máy in đầu tiên."
diff --git a/po/vi/qos.po b/po/vi/qos.po
index c41ef8896..6dab5382e 100644
--- a/po/vi/qos.po
+++ b/po/vi/qos.po
@@ -108,5 +108,5 @@ msgstr "ưu tiên"
#. Bytes sent
#: applications/luci-qos/luasrc/i18n/qos.en.lua:18
-msgid "qos_connbytes"
+msgid "Bytes sent"
msgstr "Bytes đã gửi"
diff --git a/po/vi/rrdtool.po b/po/vi/rrdtool.po
index 0cc60dd0a..883dc1df2 100644
--- a/po/vi/rrdtool.po
+++ b/po/vi/rrdtool.po
@@ -279,5 +279,5 @@ msgstr "5 phút"
#. 15 min
#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:69
-msgid "stat_ds_load__longterm"
+msgid "15 min"
msgstr "15 phút"
diff --git a/po/vi/samba.po b/po/vi/samba.po
index 889d82c88..c4f1c7eeb 100644
--- a/po/vi/samba.po
+++ b/po/vi/samba.po
@@ -97,5 +97,5 @@ msgstr "Thư mục Mask"
#. Mask for new directories
#: applications/luci-samba/luasrc/i18n/samba.en.lua:17
-msgid "samba_sambashare_dirmask_desc"
+msgid "Mask for new directories"
msgstr "Mask cho thư mục mới"
diff --git a/po/vi/statistics.po b/po/vi/statistics.po
index 9be74ec9c..c21a78f56 100644
--- a/po/vi/statistics.po
+++ b/po/vi/statistics.po
@@ -818,5 +818,5 @@ msgstr ""
#. Enable this plugin
#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:212
-msgid "lucistatistics_collectdwireless_enable"
+msgid "Enable this plugin"
msgstr "Kích hoạt plugin này"
diff --git a/po/vi/sysauth.po b/po/vi/sysauth.po
index 867d26ee9..f39b70896 100644
--- a/po/vi/sysauth.po
+++ b/po/vi/sysauth.po
@@ -25,5 +25,5 @@ msgstr "Nhập tên và mật mã"
#. Invalid username and/or password! Please try again.
#: i18n/english/luasrc/i18n/sysauth.en.lua:3
-msgid "sysauth_failed"
+msgid "Invalid username and/or password! Please try again."
msgstr "Tên và mật mã không đúng. Xin thử lại "
diff --git a/po/vi/tinyproxy.po b/po/vi/tinyproxy.po
index 127b72b43..433b82185 100644
--- a/po/vi/tinyproxy.po
+++ b/po/vi/tinyproxy.po
@@ -170,5 +170,5 @@ msgstr "Loại "
#. Upstream Proxy
#: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:32
-msgid "tinyproxy_upstream_via"
+msgid "Upstream Proxy"
msgstr "Upstream Proxy"
diff --git a/po/vi/upnp.po b/po/vi/upnp.po
index 7eaad4143..a22c7eaa0 100644
--- a/po/vi/upnp.po
+++ b/po/vi/upnp.po
@@ -52,5 +52,5 @@ msgstr "Downlink"
#. Uplink
#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:7
-msgid "upnpd_config_upload"
+msgid "Uplink"
msgstr "Uplink"
diff --git a/po/vi/ushare.po b/po/vi/ushare.po
index 284e70086..c6a8b1e51 100644
--- a/po/vi/ushare.po
+++ b/po/vi/ushare.po
@@ -42,13 +42,3 @@ msgstr "tên máy chủ"
#: applications/luci-ushare/luasrc/i18n/ushare.en.lua:6
msgid "Settings"
msgstr "Cài đặt"
-
-#. uShare
-#: applications/luci-ushare/luasrc/i18n/ushare.en.lua:7
-msgid "uShare"
-msgstr "uShare"
-
-#. uShare
-#: applications/luci-ushare/luasrc/i18n/ushare.en.lua:8
-msgid "ushare_desc"
-msgstr "uShare"
diff --git a/po/vi/uvl.po b/po/vi/uvl.po
index 4beb72b8e..e7d7ea783 100644
--- a/po/vi/uvl.po
+++ b/po/vi/uvl.po
@@ -231,5 +231,7 @@ msgstr "Recursive phụ thuộc cho các tùy chọn \"% i\" được phát hi
#. In dependency check for enum value \"%i\":\n%c
#: libs/uvl/luasrc/i18n/uvl.en.lua:39
-msgid "uvl_err_dep_badenum"
+msgid ""
+"In dependency check for enum value \"%i\":\n"
+"%c"
msgstr "Trong kiểm tra các phụ thuộc cho giá trị enum \"% i\": \\ n% c"
diff --git a/po/zh_CN/admin-core.po b/po/zh_CN/admin-core.po
index a6f549477..4ba3990c6 100644
--- a/po/zh_CN/admin-core.po
+++ b/po/zh_CN/admin-core.po
@@ -84,7 +84,8 @@ msgstr "你可以在以下的页面修改路由器的所有重要参数."
#: i18n/english/luasrc/i18n/admin-core.en.lua:13
msgid ""
"Notice: In <abbr title=\"Lua Configuration Interface\">LuCI</abbr> changes "
-"have to be confirmed by clicking Changes - Save &amp; Apply before being applied."
+"have to be confirmed by clicking Changes - Save &amp; Apply before being "
+"applied."
msgstr ""
#. As we always want to improve this interface we are looking forward to your feedback and suggestions.
@@ -2175,5 +2176,8 @@ msgstr ""
#. The flash image was uploaded. Below is the checksum and file size listed, compare them with the original file to ensure data integrity.<br /> Click \"Proceed\" below to start the flash procedure.
#: i18n/english/luasrc/i18n/admin-core.en.lua:412
-msgid "admin_upgrade_uploaded"
+msgid ""
+"The flash image was uploaded. Below is the checksum and file size listed, "
+"compare them with the original file to ensure data integrity.<br /> Click "
+"\"Proceed\" below to start the flash procedure."
msgstr ""
diff --git a/po/zh_CN/asterisk.po b/po/zh_CN/asterisk.po
index 5c75de851..2d6140c71 100644
--- a/po/zh_CN/asterisk.po
+++ b/po/zh_CN/asterisk.po
@@ -117,9 +117,9 @@ msgid "Verbose Level"
msgstr ""
#. Time Zone
-#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:22
+#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:251
msgid "Time Zone"
-msgstr ""
+msgstr "时区"
#. Section dialplan
#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:23
@@ -1125,8 +1125,3 @@ msgstr ""
#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:250
msgid "Message Format"
msgstr "消息格式"
-
-#. Time Zone
-#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:251
-msgid "asterisk_voicezone_zone"
-msgstr "时区"
diff --git a/po/zh_CN/cbi.po b/po/zh_CN/cbi.po
index 08a5154db..14c58ac27 100644
--- a/po/zh_CN/cbi.po
+++ b/po/zh_CN/cbi.po
@@ -97,5 +97,5 @@ msgstr "更新文件"
#. Search file...
#: i18n/english/luasrc/i18n/cbi.en.lua:17
-msgid "cbi_browser"
+msgid "Search file..."
msgstr "搜索文件…"
diff --git a/po/zh_CN/ddns.po b/po/zh_CN/ddns.po
index 32b48c448..50be37608 100644
--- a/po/zh_CN/ddns.po
+++ b/po/zh_CN/ddns.po
@@ -50,5 +50,5 @@ msgstr ""
#. Custom Update-URL
#: applications/luci-ddns/luasrc/i18n/ddns.en.lua:8
-msgid "ddns_service_updateurl"
+msgid "Custom Update-URL"
msgstr ""
diff --git a/po/zh_CN/initmgr.po b/po/zh_CN/initmgr.po
index ea507b7b2..127d79b03 100644
--- a/po/zh_CN/initmgr.po
+++ b/po/zh_CN/initmgr.po
@@ -36,5 +36,5 @@ msgstr ""
#. Enable/Disable
#: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:5
-msgid "initmgr_enabled"
+msgid "Enable/Disable"
msgstr "启用/禁用"
diff --git a/po/zh_CN/luci-fw.po b/po/zh_CN/luci-fw.po
index 547dc0ce1..a8efbeada 100644
--- a/po/zh_CN/luci-fw.po
+++ b/po/zh_CN/luci-fw.po
@@ -240,5 +240,5 @@ msgstr ""
#. contained networks
#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:56
-msgid "firewall_zone_network_desc"
+msgid "contained networks"
msgstr ""
diff --git a/po/zh_CN/openvpn.po b/po/zh_CN/openvpn.po
index 7139e919d..b1305056f 100644
--- a/po/zh_CN/openvpn.po
+++ b/po/zh_CN/openvpn.po
@@ -958,5 +958,5 @@ msgstr ""
#. Require normal and extended key usage on certificate
#: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:196
-msgid "openvpn_param_remote_cert_tls"
+msgid "Require normal and extended key usage on certificate"
msgstr ""
diff --git a/po/zh_CN/samba.po b/po/zh_CN/samba.po
index cccc3f49f..4859b7d5b 100644
--- a/po/zh_CN/samba.po
+++ b/po/zh_CN/samba.po
@@ -93,5 +93,5 @@ msgstr ""
#. Mask for new directories
#: applications/luci-samba/luasrc/i18n/samba.en.lua:17
-msgid "samba_sambashare_dirmask_desc"
+msgid "Mask for new directories"
msgstr ""
diff --git a/po/zh_CN/statistics.po b/po/zh_CN/statistics.po
index d45057be0..ee7f2a5c8 100644
--- a/po/zh_CN/statistics.po
+++ b/po/zh_CN/statistics.po
@@ -763,5 +763,5 @@ msgstr ""
#. Enable this plugin
#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:212
-msgid "lucistatistics_collectdwireless_enable"
+msgid "Enable this plugin"
msgstr ""
diff --git a/po/zh_CN/sysauth.po b/po/zh_CN/sysauth.po
index 2588c0c96..446e07fca 100644
--- a/po/zh_CN/sysauth.po
+++ b/po/zh_CN/sysauth.po
@@ -23,5 +23,5 @@ msgstr "请输入您的用户名和密码"
#. Invalid username and/or password! Please try again.
#: i18n/english/luasrc/i18n/sysauth.en.lua:3
-msgid "sysauth_failed"
+msgid "Invalid username and/or password! Please try again."
msgstr "无效的用户名和(或)密码!请重新输入"
diff --git a/po/zh_CN/wifi.po b/po/zh_CN/wifi.po
index e949c765e..37028989e 100644
--- a/po/zh_CN/wifi.po
+++ b/po/zh_CN/wifi.po
@@ -203,5 +203,7 @@ msgstr ""
#. WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP and ad-hoc mode) to be installed.
#: i18n/english/luasrc/i18n/wifi.en.lua:39
-msgid "wifi_wpareq"
+msgid ""
+"WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
+"and ad-hoc mode) to be installed."
msgstr ""