intl: merged en strings (thanks ProfYaffle) - 3rd

src/access.c

@@ -1249,9 +1249,9 @@ access_entry_conn_limit_type_enum ( void *p, const char *lang )
 {
   static struct strtab
   conn_limit_type_tab[] = {
-    { N_("All (Streaming + DVR)"),  ACCESS_CONN_LIMIT_TYPE_ALL },
-    { N_("Streaming"),              ACCESS_CONN_LIMIT_TYPE_STREAMING   },
-    { N_("DVR"),                    ACCESS_CONN_LIMIT_TYPE_DVR },
+    { N_("All (Streaming plus DVR)"),  ACCESS_CONN_LIMIT_TYPE_ALL },
+    { N_("Streaming"),                 ACCESS_CONN_LIMIT_TYPE_STREAMING   },
+    { N_("DVR"),                       ACCESS_CONN_LIMIT_TYPE_DVR },
   };
   return strtab2htsmsg(conn_limit_type_tab, 1, lang);
 }
@@ -1372,7 +1372,7 @@ const idclass_t access_entry_class = {
       .type     = PT_STR,
       .islist   = 1,
       .id       = "dvr_config",
-      .name     = N_("DVR Config Profiles"),
+      .name     = N_("DVR Configuration Profiles"),
       .set      = access_entry_dvr_config_set,
       .get      = access_entry_dvr_config_get,
       .list     = dvr_entry_class_config_name_list,
@@ -1414,7 +1414,7 @@ const idclass_t access_entry_class = {
       .type     = PT_S64,
       .intsplit = CHANNEL_SPLIT,
       .id       = "channel_max",
-      .name     = N_("Max Channel Num"),
+      .name     = N_("Maximum Channel Num"),
       .off      = offsetof(access_entry_t, ae_chmax),
     },
     {

src/bouquet.c

@@ -881,7 +881,7 @@ const idclass_t bouquet_class = {
     {
       .type     = PT_U32,
       .id       = "services_seen",
-      .name     = N_("# Seen Services"),
+      .name     = N_("# Services Seen"),
       .off      = offsetof(bouquet_t, bq_services_seen),
       .opts     = PO_RDONLY,
     },

src/descrambler/cwc.c

@@ -1736,7 +1736,7 @@ const idclass_t caclient_cwc_class =
     {
       .type     = PT_STR,
       .id       = "hostname",
-      .name     = N_("Hostname / IP"),
+      .name     = N_("Hostname/IP"),
       .off      = offsetof(cwc_t, cwc_hostname),
       .def.s    = "localhost",
     },

src/dvr/dvr_autorec.c

@@ -608,7 +608,7 @@ dvr_autorec_entry_class_time_list_(void *o, const char *lang)
 static htsmsg_t *
 dvr_autorec_entry_class_extra_list(void *o, const char *lang)
 {
-  const char *msg = N_("Not set (use channel or DVR config)");
+  const char *msg = N_("Not set (use channel or DVR configuration)");
   return dvr_entry_class_duration_list(o, tvh_gettext_lang(lang, msg), 4*60, 1, lang);
 }
 
@@ -732,7 +732,7 @@ dvr_autorec_entry_class_weekdays_rend(uint32_t weekdays, const char *lang)
   size_t l;
   int i;
   if (weekdays == 0x7f)
-    strcpy(buf + 1, tvh_gettext_lang(lang, N_("All days")));
+    strcpy(buf + 1, tvh_gettext_lang(lang, N_("Every day")));
   else if (weekdays == 0)
     strcpy(buf + 1, tvh_gettext_lang(lang, N_("No days")));
   else {
@@ -938,7 +938,7 @@ const idclass_t dvr_autorec_entry_class = {
     {
       .type     = PT_BOOL,
       .id       = "fulltext",
-      .name     = N_("Fulltext"),
+      .name     = N_("Full-text"),
       .off      = offsetof(dvr_autorec_entry_t, dae_fulltext),
     },
     {
@@ -997,7 +997,7 @@ const idclass_t dvr_autorec_entry_class = {
       .type     = PT_U32,
       .islist   = 1,
       .id       = "weekdays",
-      .name     = N_("Week Days"),
+      .name     = N_("Days of Week"),
       .set      = dvr_autorec_entry_class_weekdays_set,
       .get      = dvr_autorec_entry_class_weekdays_get_,
       .list     = dvr_autorec_entry_class_weekdays_list,

src/dvr/dvr_config.c

@@ -692,7 +692,7 @@ static htsmsg_t *
 dvr_config_class_extra_list(void *o, const char *lang)
 {
   return dvr_entry_class_duration_list(o, 
-           tvh_gettext_lang(lang, N_("Not set (none or channel config)")),
+           tvh_gettext_lang(lang, N_("Not set (none or channel configuration)")),
            4*60, 1, lang);
 }
 
@@ -770,7 +770,7 @@ const idclass_t dvr_config_class = {
     {
       .type     = PT_STR,
       .id       = "name",
-      .name     = N_("Config Name"),
+      .name     = N_("Configuration Name"),
       .set      = dvr_config_class_name_set,
       .off      = offsetof(dvr_config_t, dvr_config_name),
       .def.s    = "! New config",
@@ -861,7 +861,7 @@ const idclass_t dvr_config_class = {
     {
       .type     = PT_STR,
       .id       = "charset",
-      .name     = N_("Filename Charset"),
+      .name     = N_("Filename Character Set"),
       .off      = offsetof(dvr_config_t, dvr_charset),
       .set      = dvr_config_class_charset_set,
       .list     = dvr_config_class_charset_list,

src/dvr/dvr_db.c

@@ -1970,7 +1970,7 @@ dvr_entry_class_duration_list(void *o, const char *not_set, int max, int step, c
 static htsmsg_t *
 dvr_entry_class_extra_list(void *o, const char *lang)
 {
-  const char *msg = N_("Not set (use channel or DVR config)");
+  const char *msg = N_("Not set (use channel or DVR configuration)");
   return dvr_entry_class_duration_list(o, tvh_gettext_lang(lang, msg), 4*60, 1, lang);
 }
 

src/dvr/dvr_timerec.c

@@ -609,7 +609,7 @@ const idclass_t dvr_timerec_entry_class = {
       .type     = PT_U32,
       .islist   = 1,
       .id       = "weekdays",
-      .name     = N_("Week Days"),
+      .name     = N_("Days of Week"),
       .set      = dvr_timerec_entry_class_weekdays_set,
       .get      = dvr_timerec_entry_class_weekdays_get,
       .list     = dvr_autorec_entry_class_weekdays_list,

src/input/mpegts/iptv/iptv.c

@@ -465,21 +465,21 @@ const idclass_t iptv_network_class = {
     {
       .type     = PT_U32,
       .id       = "max_streams",
-      .name     = N_("Max Input Streams"),
+      .name     = N_("Maximum Input Streams"),
       .off      = offsetof(iptv_network_t, in_max_streams),
       .def.i    = 0,
     },
     {
       .type     = PT_U32,
       .id       = "max_bandwidth",
-      .name     = N_("Max Bandwidth (Kbps)"),
+      .name     = N_("Maximum Bandwidth (Kbps)"),
       .off      = offsetof(iptv_network_t, in_max_bandwidth),
       .def.i    = 0,
     },
     {
       .type     = PT_U32,
       .id       = "max_timeout",
-      .name     = N_("Max timeout (seconds)"),
+      .name     = N_("Maximum timeout (seconds)"),
       .off      = offsetof(iptv_network_t, in_max_timeout),
       .def.i    = 15,
     },

src/input/mpegts/linuxdvb/linuxdvb_frontend.c

@@ -131,7 +131,7 @@ const idclass_t linuxdvb_frontend_class =
     {
       .type     = PT_BOOL,
       .id       = "old_status",
-      .name     = N_("Force old status"),
+      .name     = N_("Force Old Status"),
       .opts     = PO_ADVANCED,
       .off      = offsetof(linuxdvb_frontend_t, lfe_old_status),
     },

src/input/mpegts/linuxdvb/linuxdvb_satconf.c

@@ -587,13 +587,13 @@ static struct linuxdvb_satconf_type linuxdvb_satconf_types[] = {
   },
   {
     .type  = "2port",
-    .name  = N_("2-port Switch (Universal LNB)"),
+    .name  = N_("2-Port Switch (Universal LNB)"),
     .idc   = &linuxdvb_satconf_2port_class,
     .ports = 2, 
   },
   {
     .type  = "4port",
-    .name  = N_("4-port Switch (Universal LNB)"),
+    .name  = N_("4-Port Switch (Universal LNB)"),
     .idc   = &linuxdvb_satconf_4port_class,
     .ports = 4, 
   },

src/input/mpegts/mpegts_mux_dvb.c

@@ -207,7 +207,7 @@ const idclass_t dvb_mux_dvbt_class =
   .ic_caption    = N_("Linux DVB-T Multiplex"),
   .ic_properties = (const property_t[]){
     {
-      MUX_PROP_STR("delsys", N_("Delivery System"), dvbt, delsys, N_("DVBT")),
+      MUX_PROP_STR("delsys", N_("Delivery System"), dvbt, delsys, N_("DVB-T")),
     },
     {
       .type     = PT_U32,
@@ -608,7 +608,7 @@ const idclass_t dvb_mux_dvbs_class =
     {
       .type     = PT_STR,
       .id       = "orbital",
-      .name     = N_("Orbital Pos."),
+      .name     = N_("Orbital Position"),
       .set      = dvb_mux_dvbs_class_orbital_set,
       .get      = dvb_mux_dvbs_class_orbital_get,
       .opts     = PO_ADVANCED | PO_RDONLY

src/input/mpegts/mpegts_network.c

@@ -235,7 +235,7 @@ const idclass_t mpegts_network_class =
     {
       .type     = PT_INT,
       .id       = "scanq_length",
-      .name     = N_("Scan Q length"),
+      .name     = N_("Scan Queue length"),
       .opts     = PO_RDONLY | PO_NOSAVE,
       .get      = mpegts_network_class_get_scanq_length,
     },

src/input/mpegts/mpegts_service.c

@@ -74,9 +74,9 @@ static htsmsg_t *
 mpegts_service_pref_capid_lock_list ( void *o, const char *lang )
 {
   static const struct strtab tab[] = {
-    { N_("Off"),                0 },
-    { N_("On"),                 1 },
-    { N_("Only Pref. CA PID"),  2 },
+    { N_("Off"),                    0 },
+    { N_("On"),                     1 },
+    { N_("Only Preferred CA PID"),  2 },
   };
    return strtab2htsmsg(tab, 1, lang);
 }
@@ -183,14 +183,14 @@ const idclass_t mpegts_service_class =
     {
       .type     = PT_U16,
       .id       = "prefcapid",
-      .name     = N_("Pref. CA PID"),
+      .name     = N_("Preferred CA PID"),
       .off      = offsetof(mpegts_service_t, s_dvb_prefcapid),
       .opts     = PO_ADVANCED,
     },
     {
       .type     = PT_INT,
       .id       = "prefcapid_lock",
-      .name     = N_("Lock Pref. CA PID"),
+      .name     = N_("Lock Preferred CA PID"),
       .off      = offsetof(mpegts_service_t, s_dvb_prefcapid_lock),
       .opts     = PO_ADVANCED,
       .list     = mpegts_service_pref_capid_lock_list,

src/input/mpegts/satip/satip.c

@@ -272,7 +272,7 @@ const idclass_t satip_device_class =
     {
       .type     = PT_BOOL,
       .id       = "disableworkarounds",
-      .name     = N_("Disable device-/firmware-specific workarounds"),
+      .name     = N_("Disable device/firmware-specific workarounds"),
       .opts     = PO_ADVANCED,
       .off      = offsetof(satip_device_t, sd_disable_workarounds),
     },
@@ -363,7 +363,7 @@ const idclass_t satip_device_class =
     {
       .type     = PT_STR,
       .id       = "configid",
-      .name     = N_("Config ID"),
+      .name     = N_("Configuration ID"),
       .opts     = PO_RDONLY | PO_NOSAVE,
       .off      = offsetof(satip_device_t, sd_info.configid),
     },

src/main.c

@@ -644,17 +644,17 @@ main(int argc, char **argv)
     { 'v', "version",   N_("Show version information"),OPT_BOOL, &opt_version },
 
     {   0, NULL,        N_("Service Configuration"),   OPT_BOOL, NULL         },
-    { 'c', "config",    N_("Alternate config path"),   OPT_STR,  &opt_config  },
-    { 'B', "nobackup",  N_("Don't backup config tree at upgrade"), OPT_BOOL, &opt_nobackup },
+    { 'c', "config",    N_("Alternate configuration path"), OPT_STR,  &opt_config  },
+    { 'B', "nobackup",  N_("Don't backup configuration tree at upgrade"), OPT_BOOL, &opt_nobackup },
     { 'f', "fork",      N_("Fork and run as daemon"),  OPT_BOOL, &opt_fork    },
     { 'u', "user",      N_("Run as user"),             OPT_STR,  &opt_user    },
     { 'g', "group",     N_("Run as group"),            OPT_STR,  &opt_group   },
-    { 'p', "pid",       N_("Alternate pid path"),      OPT_STR,  &opt_pidpath },
+    { 'p', "pid",       N_("Alternate PID path"),      OPT_STR,  &opt_pidpath },
     { 'C', "firstrun",  N_("If no user account exists then create one with\n"
 	                   "no username and no password. Use with care as\n"
 	                   "it will allow world-wide administrative access\n"
-	                   "to your Tvheadend installation until you edit/create\n"
-	                   "access-control from within the Tvheadend UI"),
+	                   "to your Tvheadend installation until you create or edit\n"
+	                   "the access-control from within the Tvheadend web interface."),
       OPT_BOOL, &opt_firstrun },
 #if ENABLE_DBUS_1
     { 'U', "dbus",      N_("Enable DBus"),
@@ -694,7 +694,7 @@ main(int argc, char **argv)
     {   0, NULL,        N_("Debug Options"),           OPT_BOOL, NULL         },
     { 'd', "stderr",    N_("Enable debug on stderr"),  OPT_BOOL, &opt_stderr  },
     { 's', "syslog",    N_("Enable debug to syslog"),  OPT_BOOL, &opt_syslog  },
-    { 'S', "nosyslog",  N_("Disable syslog (all msgs)"), OPT_BOOL, &opt_nosyslog },
+    { 'S', "nosyslog",  N_("Disable syslog (all messages)"), OPT_BOOL, &opt_nosyslog },
     { 'l', "logfile",   N_("Enable debug to file"),    OPT_STR,  &opt_logpath },
     {   0, "debug",     N_("Enable debug subsystems"),  OPT_STR,  &opt_log_debug },
 #if ENABLE_TRACE

src/streaming.c

@@ -425,7 +425,7 @@ streaming_code2txt(int code)
   case SM_CODE_MUX_NOT_ENABLED:
     return N_("Mux not enabled");
   case SM_CODE_NOT_FREE:
-    return N_("Adapter in use by other subscription");
+    return N_("Adapter in use by another subscription");
   case SM_CODE_TUNING_FAILED:
     return N_("Tuning failed");
   case SM_CODE_SVC_NOT_ENABLED:

src/webui/static/app/comet.js

@@ -51,7 +51,7 @@ tvheadend.cometPoller = function() {
             try {
                 tvheadend.comet.fireEvent(m.notificationClass, m);
             } catch (e) {
-                tvheadend.log(_('comet failure') + ' [e=' + e.message + ']');
+                tvheadend.log(_('Comet failure') + ' [e=' + e.message + ']');
             }
         }
         cometRequest.delay(100);

src/webui/static/app/config.js

@@ -394,7 +394,7 @@ tvheadend.satipsrvconf = function(panel, index) {
     });
     var muxcnf = new Ext.form.NumberField({
          name: 'satip_muxcnf',
-         fieldLabel: _('Muxes Handling (0 = auto, 1 = keep, 2 = reject)')
+         fieldLabel: _('Mux Handling (0 = auto, 1 = keep, 2 = reject)')
     });
     var dvbs = new Ext.form.NumberField({
          name: 'satip_dvbs',

src/webui/static/app/dvr.js

@@ -28,7 +28,7 @@ tvheadend.dvrDetails = function(uuid) {
             content += '<img class="x-epg-chicon" src="' + chicon + '">';
 
         if (duplicate)
-            content += '<div class="x-epg-meta"><font color="red"><div class="x-epg-prefix">' + _('Will be skipped') + '<br>' + _('because is rerun of:') + '</div>' + tvheadend.niceDate(duplicate * 1000) + '</font></div>';
+            content += '<div class="x-epg-meta"><font color="red"><div class="x-epg-prefix">' + _('Will be skipped') + '<br>' + _('because it is a rerun of:') + '</div>' + tvheadend.niceDate(duplicate * 1000) + '</font></div>';
 
         if (title)
           content += '<div class="x-epg-title">' + title + '</div>';
@@ -272,7 +272,7 @@ tvheadend.dvr_upcoming = function(panel, index) {
         selected: selected,
         beforeedit: beforeedit,
         help: function() {
-            new tvheadend.help(_('DVR-Upcoming/Current Recordings'), 'dvr_upcoming.html');
+            new tvheadend.help(_('DVR - Upcoming/Current Recordings'), 'dvr_upcoming.html');
         }
     });
 
@@ -352,7 +352,7 @@ tvheadend.dvr_finished = function(panel, index) {
         tbar: [downloadButton],
         selected: selected,
         help: function() {
-            new tvheadend.help(_('DVR-Finished Recordings'), 'dvr_finished.html');
+            new tvheadend.help(_('DVR - Finished Recordings'), 'dvr_finished.html');
         }
     });
 
@@ -433,7 +433,7 @@ tvheadend.dvr_failed = function(panel, index) {
         tbar: [downloadButton],
         selected: selected,
         help: function() {
-            new tvheadend.help(_('DVR-Failed Recordings'), 'dvr_failed.html');
+            new tvheadend.help(_('DVR - Failed Recordings'), 'dvr_failed.html');
         }
     });
 
@@ -474,8 +474,8 @@ tvheadend.autorec_editor = function(panel, index) {
 
     tvheadend.idnode_grid(panel, {
         url: 'api/dvr/autorec',
-        titleS: _('DVR AutoRec Entry'),
-        titleP: _('DVR AutoRec Entries'),
+        titleS: _('DVR Autorec Entry'),
+        titleP: _('DVR Autorec Entries'),
         iconCls: 'autoRec',
         tabIndex: index,
         columns: {
@@ -522,7 +522,7 @@ tvheadend.autorec_editor = function(panel, index) {
           direction: 'ASC'
         },
         help: function() {
-            new tvheadend.help(_('DVR AutoRec'), 'dvr_autorec.html');
+            new tvheadend.help(_('DVR Autorec'), 'dvr_autorec.html');
         }
     });
 
@@ -573,7 +573,7 @@ tvheadend.timerec_editor = function(panel, index) {
           direction: 'ASC'
         },
         help: function() {
-            new tvheadend.help(_('DVR TimeRec'), 'dvr_timerec.html');
+            new tvheadend.help(_('DVR Timerec'), 'dvr_timerec.html');
         }
     });