intl: import some changes from en_US

diff --git a/src/access.c b/src/access.c
index 2876f62a93742d9f635e6aa73828f28c9cf6dd8f..67bc38a88a7c6697a5ad46cb937c33007a75e336 100644 (file)
--- a/src/access.c
+++ b/src/access.c
@@ -1819,7 +1819,7 @@ const idclass_t passwd_entry_class = {
       .id       = "username",
       .name     = N_("Username"),
       .desc     = N_("Username of the entry (this should match a "
-                     "username from within the \"Access Entries\" tab."),
+                     "username from within the \"Access Entries\" tab)."),
       .off      = offsetof(passwd_entry_t, pw_username),
     },
     {

diff --git a/src/bouquet.c b/src/bouquet.c
index 623a0b332eeae5795431585c489fab0e89fd4934..f48c6f32c3181ee14b316f82e185fcb3bed4810f 100644 (file)
--- a/src/bouquet.c
+++ b/src/bouquet.c
@@ -788,7 +788,7 @@ static idnode_slist_t bouquest_class_chtag_slist[] = {
   },
   {
     .id   = "type_tags",
-    .name = N_("Create type based tags"),
+    .name = N_("Create type-based tags"),
     .off  = offsetof(bouquet_t, bq_chtag_type_tags),
   },
   {
@@ -1068,7 +1068,7 @@ const idclass_t bouquet_class = {
       .type     = PT_U32,
       .id       = "ext_url_period",
       .name     = N_("Re-fetch period (mins)"),
-      .desc     = N_("Re-fetch the bouquet every x mins."),
+      .desc     = N_("Re-fetch the bouquet every x minutes."),
       .off      = offsetof(bouquet_t, bq_ext_url_period),
       .opts     = PO_ADVANCED | PO_HIDDEN,
       .notify   = bouquet_class_ext_url_notify,

diff --git a/src/config.c b/src/config.c
index 0dc4e4994fbcaa44b3bee4100ced73aa208c8b82..4563d2ff9214857998916bcc890ca0611e112ea2 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -2095,7 +2095,7 @@ const idclass_t config_class = {
       .type   = PT_STR,
       .id     = "cors_origin",
       .name   = N_("HTTP CORS origin"),
-      .desc   = N_("HTTP Cross-origin resource sharing origin. This "
+      .desc   = N_("HTTP CORS (cross-origin resource sharing) origin. This "
                    "option is usually set when Tvheadend is behind a "
                    "proxy. Enter a domain (or IP) to allow "
                    "cross-domain requests."),

diff --git a/src/esfilter.c b/src/esfilter.c
index 0c61a8851d5639322747ccbee9abb0a8939f451e..1c9cb9d6866369b94c509ae365c666fed361abb0 100644 (file)
--- a/src/esfilter.c
+++ b/src/esfilter.c
@@ -652,7 +652,7 @@ const idclass_t esfilter_class_video = {
       .type     = PT_STR,
       .id       = "language",
       .name     = N_("Language"),
-      .desc     = N_("The language the filter should apply to."),
+      .desc     = N_("The language to which the filter should apply."),
       .get      = esfilter_class_language_get,
       .set      = esfilter_class_language_set,
       .list     = esfilter_class_language_enum,
@@ -662,9 +662,8 @@ const idclass_t esfilter_class_video = {
       .type     = PT_STR,
       .id       = "service",
       .name     = N_("Service"),
-      .desc     = N_("The service the filter should apply to. "
-                     "Leave blank to apply the filter to all "
-                     "services."),
+      .desc     = N_("The service to which the filter should apply. "
+                     "Leave blank to apply the filter to all services."),
       .get      = esfilter_class_service_get,
       .set      = esfilter_class_service_set,
       .list     = esfilter_class_service_enum,
@@ -747,7 +746,7 @@ const idclass_t esfilter_class_audio = {
       .type     = PT_STR,
       .id       = "language",
       .name     = N_("Language"),
-      .desc     = N_("The language the filter should apply to."),
+      .desc     = N_("The language to which the filter should apply."),
       .get      = esfilter_class_language_get,
       .set      = esfilter_class_language_set,
       .list     = esfilter_class_language_enum,
@@ -842,7 +841,7 @@ const idclass_t esfilter_class_teletext = {
       .type     = PT_STR,
       .id       = "language",
       .name     = N_("Language"),
-      .desc     = N_("The language the filter should apply to."),
+      .desc     = N_("The language to which the filter should apply."),
       .get      = esfilter_class_language_get,
       .set      = esfilter_class_language_set,
       .list     = esfilter_class_language_enum,
@@ -937,7 +936,7 @@ const idclass_t esfilter_class_subtit = {
       .type     = PT_STR,
       .id       = "language",
       .name     = N_("Language"),
-      .desc     = N_("The language the filter should apply to."),
+      .desc     = N_("The language to which the filter should apply."),
       .get      = esfilter_class_language_get,
       .set      = esfilter_class_language_set,
       .list     = esfilter_class_language_enum,
@@ -1137,7 +1136,7 @@ const idclass_t esfilter_class_other = {
       .type     = PT_STR,
       .id       = "language",
       .name     = N_("Language"),
-      .desc     = N_("The language the filter should apply to."),
+      .desc     = N_("The language to which the filter should apply."),
       .get      = esfilter_class_language_get,
       .set      = esfilter_class_language_set,
       .list     = esfilter_class_language_enum,

diff --git a/src/input/mpegts/mpegts_network.c b/src/input/mpegts/mpegts_network.c
index 4f43968d6e3dfdba351b00eb35efa4dad1537cde..aba8accfce6d2b88a5f5c8afe4f4e63699bc8307 100644 (file)
--- a/src/input/mpegts/mpegts_network.c
+++ b/src/input/mpegts/mpegts_network.c
@@ -196,7 +196,7 @@ const idclass_t mpegts_network_class =
                      "them to verify that they are still working when "
                      "the inputs are not used for streaming. If your "
                      "adapters have problems with lots of (endless) "
-                     "tuning disable this. Note that this option "
+                     "tuning, disable this. Note that this option "
                      "should be OFF for the normal operation. This type "
                      "of mux probing is not required and it may cause "
                      "issues for SAT>IP (limited number of PID filters)."),

diff --git a/src/service_mapper.c b/src/service_mapper.c
index 1c81625b1719328e4d856ac5f9770f90cf670ed6..9b67db6305c37cec7045eb0c4a8bb7f7bd3eb37d 100644 (file)
--- a/src/service_mapper.c
+++ b/src/service_mapper.c
@@ -524,7 +524,7 @@ static const idclass_t service_mapper_conf_class = {
     {
       .type   = PT_BOOL,
       .id     = "type_tags",
-      .name   = N_("Create type based tags"),
+      .name   = N_("Create type-based tags"),
       .desc   = N_("Create SDTV/HDTV/Radio tags."),
       .off    = offsetof(service_mapper_t, d.type_tags),
       .opts   = PO_ADVANCED