17 files changed, 16 insertions, 35 deletions
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"