Fix various mistakes.

diff --git a/src/access.c b/src/access.c
index ec95fc7105b3fa7f39f691e90bc9ab9d3399448c..e70cda2a60ef94077eb0b65ea8cc0c6ebe6a437e 100644 (file)
--- a/src/access.c
+++ b/src/access.c
@@ -1442,7 +1442,7 @@ const idclass_t access_entry_class = {
       .type     = PT_STR,
       .id       = "prefix",
       .name     = N_("Allowed networks"),
-      .desc     = N_("List of allowed IPv4 or IPv6 hosts or networks (comma separated)."),
+      .desc     = N_("List of allowed IPv4 or IPv6 hosts or networks (comma-separated)."),
       .set      = access_entry_class_prefix_set,
       .get      = access_entry_class_prefix_get,
       .opts     = PO_ADVANCED
@@ -2026,7 +2026,7 @@ const idclass_t ipblock_entry_class = {
       .id       = "prefix",
       .name     = N_("Network prefix"),
       .desc     = N_("The network prefix(es) to block, "
-                     "e.g.192.168.2.0/24 (comma separated list)."),
+                     "e.g.192.168.2.0/24 (comma-separated list)."),
       .set      = ipblock_entry_class_prefix_set,
       .get      = ipblock_entry_class_prefix_get,
     },

diff --git a/src/config.c b/src/config.c
index cffbf3453361d68c685e7da888a21396090c26f4..cb3ceddf7b143ecebd4559e39baf92f6b1742a12 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -2209,7 +2209,7 @@ const idclass_t config_class = {
       .type   = PT_INT,
       .id     = "chiconscheme",
       .name   = N_("Channel icon name scheme"),
-      .desc   = N_("Select scheme to generathe the channel icon names "
+      .desc   = N_("Scheme to generate the the channel icon names "
                    "(all lower-case, service name picons etc.)."),
       .list   = config_class_chiconscheme_list,
       .off    = offsetof(config_t, chicon_scheme),

diff --git a/src/idnode.h b/src/idnode.h
index 49fb42be827fe7662c39115996b0c3500c79961f..45a6f27472d00ece96783c8f3aca4e82df1297e4 100644 (file)
--- a/src/idnode.h
+++ b/src/idnode.h
@@ -61,7 +61,7 @@ struct idclass {
   const struct idclass   *ic_super;        ///< Parent class
   const char             *ic_class;        ///< Class name
   const char             *ic_caption;      ///< Class description
-  const char             *ic_order;        ///< Property order (comma separated)
+  const char             *ic_order;        ///< Property order (comma-separated)
   const property_group_t *ic_groups;       ///< Groups for visual representation
   const property_t       *ic_properties;   ///< Property list
   const char             *ic_event;        ///< Events to fire on add/delete/title

diff --git a/src/input/mpegts/linuxdvb/linuxdvb_frontend.c b/src/input/mpegts/linuxdvb/linuxdvb_frontend.c
index 39bffd434d584efbe7c4845f834a629079f89ef0..3303e8751eda02a241062a53866d834b5313cc60 100644 (file)
--- a/src/input/mpegts/linuxdvb/linuxdvb_frontend.c
+++ b/src/input/mpegts/linuxdvb/linuxdvb_frontend.c
@@ -281,7 +281,7 @@ const idclass_t linuxdvb_frontend_dvbs_class =
                      "case, the position, the polarization and low-high "
                      "band settings must be equal. If you set another "
                      "tuner as master, then this tuner will act as "
-                     "a slave and tvheadend will assure that this tuner "
+                     "a slave and Tvheadend will assure that this tuner "
                      "will not use incompatible parameters (position, "
                      "polarization, lo-hi)."),
       .list     = linuxdvb_frontend_dvbs_class_master_enum,

diff --git a/src/main.c b/src/main.c
index 2106ec62a79d7cc5feb3f810e37204e5c23d2dc4..fcda4838a85722ef629968db2e3012a899d24e6f 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -686,7 +686,7 @@ main(int argc, char **argv)
       OPT_BOOL, &opt_dbus_session },
 #endif
 #if ENABLE_LINUXDVB
-    { 'a', "adapters",  N_("Only use specified DVB adapters (comma separated, -1 = none)"),
+    { 'a', "adapters",  N_("Only use specified DVB adapters (comma-separated, -1 = none)"),
       OPT_STR, &opt_dvb_adapters },
 #endif
 #if ENABLE_SATIP_SERVER

diff --git a/src/service.c b/src/service.c
index 93c821f72c1f51c7f8b5d9f0b7f5383e4a7c39ae..9c9c734e0bdfbf84fd71d74c9d427bfc226e5da4 100644 (file)
--- a/src/service.c
+++ b/src/service.c
@@ -199,7 +199,7 @@ const idclass_t service_class = {
       .type     = PT_BOOL,
       .id       = "encrypted",
       .name     = N_("Encrypted"),
-      .desc     = N_("The service encryption status."),
+      .desc     = N_("The service`s encryption status."),
       .get      = service_class_encrypted_get,
       .opts     = PO_NOSAVE | PO_RDONLY
     },

diff --git a/src/tvhlog.c b/src/tvhlog.c
index 71dbb3f7204c1dbe9fd76a5c80c18e5af4b2d598..faedc1a32e108f88b26f3e84b0cae266d95c26f3 100644 (file)
--- a/src/tvhlog.c
+++ b/src/tvhlog.c
@@ -668,7 +668,7 @@ const idclass_t tvhlog_conf_class = {
       .type   = PT_STR,
       .id     = "debugsubs",
       .name   = N_("Debug subsystems"),
-      .desc   = N_("Enter comma separated list of subsystems you want "
+      .desc   = N_("Enter comma-separated list of subsystems you want "
                    "debugging output for (e.g "
                    "+linuxdvb,+subscriptions,+mpegts)."),
       .get    = tvhlog_class_debugsubs_get,
@@ -691,7 +691,7 @@ const idclass_t tvhlog_conf_class = {
       .type   = PT_STR,
       .id     = "tracesubs",
       .name   = N_("Trace subsystems"),
-      .desc   = N_("Enter comma separated list of subsystems you want "
+      .desc   = N_("Enter comma-separated list of subsystems you want "
                    "to get traces for (e.g +linuxdvb,+subscriptions,+mpegts)."),
       .get    = tvhlog_class_tracesubs_get,
       .set    = tvhlog_class_tracesubs_set,

diff --git a/src/wizard.c b/src/wizard.c
index d8800e816211e711e450a337d3772e72c085d4ec..bff004932831cf85993fef051e165c9e1bb0bdb9 100644 (file)
--- a/src/wizard.c
+++ b/src/wizard.c
@@ -425,7 +425,7 @@ wizard_page_t *wizard_login(const char *lang)
       .id       = "network",
       .name     = N_("Allowed network"),
       .desc     = N_("Enter allowed network prefix(es). You can enter a "
-                     "comma seperated list of prefixes here."),
+                     "comma-seperated list of prefixes here."),
       .get      = wizard_get_value_network,
       .set      = wizard_set_value_network,
       .group    = 1