Tooltips: Same as before, lots more tooltips and a few changes to existing ones.

diff --git a/src/access.c b/src/access.c
index b1acbecea8a9b27cc50bedba5a54ab4f900c8eb9..ec95fc7105b3fa7f39f691e90bc9ab9d3399448c 100644 (file)
--- a/src/access.c
+++ b/src/access.c
@@ -1428,19 +1428,21 @@ const idclass_t access_entry_class = {
       .type     = PT_BOOL,
       .id       = "enabled",
       .name     = N_("Enabled"),
+      .desc     = N_("Enable/disable the entry."),
       .off      = offsetof(access_entry_t, ae_enabled),
     },
     {
       .type     = PT_STR,
       .id       = "username",
       .name     = N_("Username"),
+      .desc     = N_("Username for the entry (login username)."),
       .off      = offsetof(access_entry_t, ae_username),
     },
     {
       .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
@@ -1449,6 +1451,7 @@ const idclass_t access_entry_class = {
       .type     = PT_INT,
       .id       = "uilevel",
       .name     = N_("User interface level"),
+      .desc     = N_("Default user interface level."),
       .off      = offsetof(access_entry_t, ae_uilevel),
       .list     = uilevel_get_list,
       .opts     = PO_EXPERT
@@ -1457,6 +1460,7 @@ const idclass_t access_entry_class = {
       .type     = PT_INT,
       .id       = "uilevel_nochange",
       .name     = N_("Persistent user interface level"),
+      .desc     = N_("Prevent changing of interface view level."),
       .off      = offsetof(access_entry_t, ae_uilevel_nochange),
       .list     = uilevel_nochange_get_list,
       .opts     = PO_EXPERT
@@ -1465,6 +1469,7 @@ const idclass_t access_entry_class = {
       .type     = PT_STR,
       .id       = "lang",
       .name     = N_("Language"),
+      .desc     = N_("Default language."),
       .list     = language_get_list,
       .off      = offsetof(access_entry_t, ae_lang),
       .opts     = PO_ADVANCED,
@@ -1473,6 +1478,7 @@ const idclass_t access_entry_class = {
       .type     = PT_STR,
       .id       = "langui",
       .name     = N_("Web interface language"),
+      .desc     = N_("Default web interface language."),
       .list     = language_get_ui_list,
       .off      = offsetof(access_entry_t, ae_lang_ui),
       .opts     = PO_ADVANCED,
@@ -1481,18 +1487,23 @@ const idclass_t access_entry_class = {
       .type     = PT_BOOL,
       .id       = "streaming",
       .name     = N_("Streaming"),
+      .desc     = N_("Allow/disallow HTTP streaming."),
       .off      = offsetof(access_entry_t, ae_streaming),
     },
     {
       .type     = PT_BOOL,
       .id       = "adv_streaming",
       .name     = N_("Advanced streaming"),
+      .desc     = N_("Allow/disallow advanced http streaming, "
+                     "e.g, direct service or mux links."),
       .off      = offsetof(access_entry_t, ae_adv_streaming),
     },
     {
       .type     = PT_BOOL,
       .id       = "htsp_streaming",
       .name     = N_("HTSP streaming"),
+      .desc     = N_("Allow/disallow HTSP protocol streaming, "
+                     "e.g Kodi (via pvr.hts) or Movian."),
       .off      = offsetof(access_entry_t, ae_htsp_streaming),
     },
     {
@@ -1500,6 +1511,8 @@ const idclass_t access_entry_class = {
       .islist   = 1,
       .id       = "profile",
       .name     = N_("Streaming profiles"),
+      .desc     = N_("The streaming profile to use/used, if not set the "
+                     "default will be used."),
       .set      = access_entry_profile_set,
       .get      = access_entry_profile_get,
       .list     = profile_class_get_list,
@@ -1510,30 +1523,39 @@ const idclass_t access_entry_class = {
       .type     = PT_BOOL,
       .id       = "dvr",
       .name     = N_("Video recorder"),
+      .desc     = N_("Allow/disallow access to video recorder "
+                     "functionality (including Autorecs)."),
       .off      = offsetof(access_entry_t, ae_dvr),
     },
     {
       .type     = PT_BOOL,
       .id       = "htsp_dvr",
       .name     = N_("HTSP DVR"),
+      .desc     = N_("Allow/disallow access to DVR via the HTSP "
+                     "protocol."),
       .off      = offsetof(access_entry_t, ae_htsp_dvr),
     },
     {
       .type     = PT_BOOL,
       .id       = "all_dvr",
-      .name     = N_("All DVR"),
+      .name     = N_("View all DVR entries"),
+      .desc     = N_("Allow/disallow access to other users DVR entries "
+                     "(read only)."),
       .off      = offsetof(access_entry_t, ae_all_dvr),
     },
     {
       .type     = PT_BOOL,
       .id       = "all_rw_dvr",
       .name     = N_("All DVR (rw)"),
+      .desc     = N_("Allow/disallow read/write access to other users "
+                     "DVR entries."),
       .off      = offsetof(access_entry_t, ae_all_rw_dvr),
     },
     {
       .type     = PT_BOOL,
       .id       = "failed_dvr",
       .name     = N_("Failed DVR"),
+      .desc     = N_("Allow/disallow access to all failed DVR entries."),
       .off      = offsetof(access_entry_t, ae_failed_dvr),
       .opts     = PO_ADVANCED | PO_HIDDEN,
     },
@@ -1542,6 +1564,8 @@ const idclass_t access_entry_class = {
       .islist   = 1,
       .id       = "dvr_config",
       .name     = N_("DVR configuration profiles"),
+      .desc     = N_("Allowed DVR profiles. This limits the profiles "
+                     "the user has access to."),
       .set      = access_entry_dvr_config_set,
       .get      = access_entry_dvr_config_get,
       .list     = dvr_entry_class_config_name_list,
@@ -1552,18 +1576,22 @@ const idclass_t access_entry_class = {
       .type     = PT_BOOL,
       .id       = "webui",
       .name     = N_("Web interface"),
+      .desc     = N_("Allow/disallow web interface access (this "
+                     " includes access to the EPG)."),
       .off      = offsetof(access_entry_t, ae_webui),
     },
     {
       .type     = PT_BOOL,
       .id       = "admin",
       .name     = N_("Admin"),
+      .desc     = N_("Allow/disallow access to the Configuration tab."),
       .off      = offsetof(access_entry_t, ae_admin),
     },
     {
       .type     = PT_INT,
       .id       = "conn_limit_type",
       .name     = N_("Connection limit type"),
+      .desc     = N_("Restrict connections to this type."),
       .off      = offsetof(access_entry_t, ae_conn_limit_type),
       .list     = access_entry_conn_limit_type_enum,
       .opts     = PO_EXPERT
@@ -1572,6 +1600,8 @@ const idclass_t access_entry_class = {
       .type     = PT_U32,
       .id       = "conn_limit",
       .name     = N_("Limit connections"),
+      .desc     = N_("The number of allowed connections this user can "
+                     "make to the server."),
       .off      = offsetof(access_entry_t, ae_conn_limit),
       .opts     = PO_EXPERT
     },
@@ -1580,6 +1610,7 @@ const idclass_t access_entry_class = {
       .intsplit = CHANNEL_SPLIT,
       .id       = "channel_min",
       .name     = N_("Minimal channel number"),
+      .desc     = N_("Lowest channel number the user can access."),
       .off      = offsetof(access_entry_t, ae_chmin),
     },
     {
@@ -1587,12 +1618,16 @@ const idclass_t access_entry_class = {
       .intsplit = CHANNEL_SPLIT,
       .id       = "channel_max",
       .name     = N_("Maximal channel number"),
+      .desc     = N_("Highest channel number the user can access."),
       .off      = offsetof(access_entry_t, ae_chmax),
     },
     {
       .type     = PT_BOOL,
       .id       = "channel_tag_exclude",
       .name     = N_("Exclude channel tags"),
+      .desc     = N_("Enable excluding of user-config defined channel "
+                     "tags. This will prevent the user from accessing "
+                     "channels associated with the tags selected (below)."),
       .off      = offsetof(access_entry_t, ae_chtags_exclude),
       .opts     = PO_ADVANCED,
     },
@@ -1601,6 +1636,7 @@ const idclass_t access_entry_class = {
       .islist   = 1,
       .id       = "channel_tag",
       .name     = N_("Channel tags"),
+      .desc     = N_("Channel tags the user is allowed access to/excluded from."),
       .set      = access_entry_chtag_set,
       .get      = access_entry_chtag_get,
       .list     = channel_tag_class_get_list,
@@ -1611,6 +1647,7 @@ const idclass_t access_entry_class = {
       .type     = PT_STR,
       .id       = "comment",
       .name     = N_("Comment"),
+      .desc     = N_("Free-form text field, enter whatever you like here."),
       .off      = offsetof(access_entry_t, ae_comment),
     },
     {
@@ -1828,18 +1865,22 @@ const idclass_t passwd_entry_class = {
       .type     = PT_BOOL,
       .id       = "enabled",
       .name     = N_("Enabled"),
+      .desc     = N_("Enable/disable the entry."),
       .off      = offsetof(passwd_entry_t, pw_enabled),
     },
     {
       .type     = PT_STR,
       .id       = "username",
       .name     = N_("Username"),
+      .desc     = N_("Username of the entry. (this should match "
+                     "a username from within the Access Entries tab."),
       .off      = offsetof(passwd_entry_t, pw_username),
     },
     {
       .type     = PT_STR,
       .id       = "password",
       .name     = N_("Password"),
+      .desc     = N_("Password for the entry."),
       .off      = offsetof(passwd_entry_t, pw_password),
       .opts     = PO_PASSWORD | PO_NOSAVE,
       .set      = passwd_entry_class_password_set,
@@ -1856,6 +1897,7 @@ const idclass_t passwd_entry_class = {
       .type     = PT_STR,
       .id       = "comment",
       .name     = N_("Comment"),
+      .desc     = N_("Free-form text field, enter whatever you like here."),
       .off      = offsetof(passwd_entry_t, pw_comment),
     },
     {
@@ -1976,18 +2018,22 @@ const idclass_t ipblock_entry_class = {
       .type     = PT_BOOL,
       .id       = "enabled",
       .name     = N_("Enabled"),
+      .desc     = N_("Enable/disable the entry."),
       .off      = offsetof(ipblock_entry_t, ib_enabled),
     },
     {
       .type     = PT_STR,
       .id       = "prefix",
       .name     = N_("Network prefix"),
+      .desc     = N_("The network prefix(es) to block, "
+                     "e.g.192.168.2.0/24 (comma separated list)."),
       .set      = ipblock_entry_class_prefix_set,
       .get      = ipblock_entry_class_prefix_get,
     },
     {
       .type     = PT_STR,
       .id       = "comment",
+      .desc     = N_("Free-form text field, enter whatever you like here."),
       .name     = N_("Comment"),
       .off      = offsetof(ipblock_entry_t, ib_comment),
     },

diff --git a/src/channels.c b/src/channels.c
index 5fa1c824a8f2abb2f239d494cff60485c8acb5a1..605c39ca10233e53a28affa379e6967cb84810a6 100644 (file)
--- a/src/channels.c
+++ b/src/channels.c
@@ -1377,12 +1377,14 @@ const idclass_t channel_tag_class = {
       .type     = PT_BOOL,
       .id       = "enabled",
       .name     = N_("Enabled"),
+      .desc     = N_("Enable/disable the tag."),
       .off      = offsetof(channel_tag_t, ct_enabled),
     },
     {
       .type     = PT_U32,
       .id       = "index",
       .name     = N_("Sort index"),
+      .desc     = N_("Sort index."),
       .off      = offsetof(channel_tag_t, ct_index),
       .opts     = PO_ADVANCED,
     },
@@ -1390,12 +1392,14 @@ const idclass_t channel_tag_class = {
       .type     = PT_STR,
       .id       = "name",
       .name     = N_("Name"),
+      .desc     = N_("Name of the tag."),
       .off      = offsetof(channel_tag_t, ct_name),
     },
     {
       .type     = PT_BOOL,
       .id       = "internal",
       .name     = N_("Internal"),
+      .desc     = N_("Use tag internally (don`t expose to clients)."),
       .off      = offsetof(channel_tag_t, ct_internal),
       .opts     = PO_ADVANCED
     },
@@ -1403,6 +1407,9 @@ const idclass_t channel_tag_class = {
       .type     = PT_BOOL,
       .id       = "private",
       .name     = N_("Private"),
+      .desc     = N_("Only allow users with this tag (or those with "
+                     "no tags at all) set in "
+                     "access configuration to use the tag."),
       .off      = offsetof(channel_tag_t, ct_private),
       .opts     = PO_ADVANCED
     },
@@ -1410,6 +1417,8 @@ const idclass_t channel_tag_class = {
       .type     = PT_STR,
       .id       = "icon",
       .name     = N_("Icon (full URL)"),
+      .desc     = N_("Full path to an icon used to depict the tag. "
+                     "This can be a TV network logotype, etc."),
       .off      = offsetof(channel_tag_t, ct_icon),
       .notify   = channel_tag_class_icon_notify,
       .opts     = PO_ADVANCED
@@ -1418,6 +1427,7 @@ const idclass_t channel_tag_class = {
       .type     = PT_STR,
       .id       = "icon_public_url",
       .name     = N_("Icon URL"),
+      .desc     = N_("Relative path to the imagecache copy of the icon."),
       .get      = channel_tag_class_get_icon,
       .opts     = PO_RDONLY | PO_NOSAVE | PO_HIDDEN | PO_EXPERT,
     },
@@ -1425,6 +1435,8 @@ const idclass_t channel_tag_class = {
       .type     = PT_BOOL,
       .id       = "titled_icon",
       .name     = N_("Icon has title"),
+      .desc     = N_("If set, presentation of the tag icon will not "
+                     "superimpose the tag name on top of the icon."),
       .off      = offsetof(channel_tag_t, ct_titled_icon),
       .opts     = PO_ADVANCED
     },
@@ -1432,6 +1444,7 @@ const idclass_t channel_tag_class = {
       .type     = PT_STR,
       .id       = "comment",
       .name     = N_("Comment"),
+      .desc     = N_("Free-form text field, enter whatever you like here."),
       .off      = offsetof(channel_tag_t, ct_comment),
     },
     {}

diff --git a/src/timeshift.c b/src/timeshift.c
index d563616b35126226f13136d8b0bdcdb306033414..8ceaff9cccb3edd7498bc3e2c41d27c71162ac64 100644 (file)
--- a/src/timeshift.c
+++ b/src/timeshift.c
@@ -182,7 +182,7 @@ const idclass_t timeshift_conf_class = {
       */
       .desc   = N_("Only activate timeshift when the client makes the first "
                    "rewind, fast-forward or pause request. Note, "
-                   "because there is no buffer on the first request, "
+                   "because there is no buffer on the first request "
                    "rewinding is not possible."),
       .off    = offsetof(timeshift_conf_t, ondemand),
     },