Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Tooltips and wizard: Mistakes were made, mistakes were corrected. Man… 
…y thanks once again @ProfYaffle.
  • Loading branch information
@perexg
Mark Clarkstone authored and perexg committed Feb 10, 2016
1 parent fdbf7e2 commit ae3cf80
Show file tree
Hide file tree
Showing 16 changed files with 114 additions and 92 deletions.
14 changes: 7 additions & 7 deletions src/access.c
View file
Expand Up @@ -1511,8 +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."),
.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,
Expand Down Expand Up @@ -1547,7 +1547,7 @@ const idclass_t access_entry_class = {
.type = PT_BOOL,
.id = "all_rw_dvr",
.name = N_("All DVR (rw)"),
.desc = N_("Allow/disallow read/write access to other users "
.desc = N_("Allow/disallow read/write access to other users' "
"DVR entries."),
.off = offsetof(access_entry_t, ae_all_rw_dvr),
},
Expand Down Expand Up @@ -1584,7 +1584,7 @@ const idclass_t access_entry_class = {
.type = PT_BOOL,
.id = "admin",
.name = N_("Admin"),
.desc = N_("Allow/disallow access to the Configuration tab."),
.desc = N_("Allow/disallow access to the 'Configuration' tab."),
.off = offsetof(access_entry_t, ae_admin),
},
{
Expand Down Expand Up @@ -1625,7 +1625,7 @@ const idclass_t access_entry_class = {
.type = PT_BOOL,
.id = "channel_tag_exclude",
.name = N_("Exclude channel tags"),
.desc = N_("Enable excluding of user-config defined channel "
.desc = N_("Enable exclusion 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),
Expand Down Expand Up @@ -1872,8 +1872,8 @@ const idclass_t passwd_entry_class = {
.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."),
.desc = N_("Username of the entry (this should match a "
"username from within the \"Access Entries\" tab."),
.off = offsetof(passwd_entry_t, pw_username),
},
{
Expand Down
13 changes: 7 additions & 6 deletions src/channels.c
View file
Expand Up @@ -415,7 +415,8 @@ const idclass_t channel_class = {
"EPG data to the channel (using the channel name "
"for matching). If you turn this option off, only "
"the OTA EPG grabber will be used for this channel "
"unless the EPG Source option is not set manually."),
"unless you've specifically set a different EPG "
"Source."),
.off = offsetof(channel_t, ch_epgauto),
.opts = PO_ADVANCED,
},
Expand Down Expand Up @@ -461,10 +462,10 @@ const idclass_t channel_class = {
.id = "epg_running",
.name = N_("Use EPG running state"),
.desc = N_("Use EPG running state. Use EITp/f to decide "
"event start/stop. This is also known as accurate "
"recording. Note that this can have unexpected "
"results if the broadcaster isn`t very good at "
"time keeping."),
"event start/stop. This is also known as "
"\"Accurate Recording\". Note that this can have "
"unexpected results if the broadcaster isn`t very "
"good at time keeping."),
.off = offsetof(channel_t, ch_epg_running),
.list = channel_class_epg_running_list,
.opts = PO_ADVANCED
Expand Down Expand Up @@ -1399,7 +1400,7 @@ const idclass_t channel_tag_class = {
.type = PT_BOOL,
.id = "internal",
.name = N_("Internal"),
.desc = N_("Use tag internally (don`t expose to clients)."),
.desc = N_("Use tag internally (don't expose to clients)."),
.off = offsetof(channel_tag_t, ct_internal),
.opts = PO_ADVANCED
},
Expand Down
16 changes: 8 additions & 8 deletions src/dvr/dvr_autorec.c
View file
Expand Up @@ -1006,9 +1006,9 @@ const idclass_t dvr_autorec_entry_class = {
.name = N_("Directory"),
.desc = N_("When specified, this setting overrides the "
"subdirectory rules (except the base directory) "
"specified by the DVR configuration and puts all "
"recordings done by this entry into the specified "
"subdirectory. See Help for more info."),
"defined in the DVR configuration and puts all "
"recordings done by this entry into the "
"subdirectory named here. See Help for more info."),
.off = offsetof(dvr_autorec_entry_t, dae_directory),
},
{
Expand Down Expand Up @@ -1043,7 +1043,7 @@ const idclass_t dvr_autorec_entry_class = {
.type = PT_STR,
.id = "tag",
.name = N_("Channel tag"),
.desc = N_("A channel tag (e.g. a group of channels) on which "
.desc = N_("A channel tag (e.g. a group of channels) to which "
"this rule applies."),
.set = dvr_autorec_entry_class_tag_set,
.get = dvr_autorec_entry_class_tag_get,
Expand All @@ -1066,7 +1066,7 @@ const idclass_t dvr_autorec_entry_class = {
.id = "content_type",
.name = N_("Content type"),
.desc = N_("The content type (Movie/Drama, Sports, etc.) to "
"be used to filter matching events/programmes."),
"be used to filter matching events/programs."),
.list = dvr_autorec_entry_class_content_type_list,
.off = offsetof(dvr_autorec_entry_t, dae_content_type),
.opts = PO_ADVANCED
Expand Down Expand Up @@ -1120,7 +1120,7 @@ const idclass_t dvr_autorec_entry_class = {
.islist = 1,
.id = "weekdays",
.name = N_("Days of week"),
.desc = N_("Days of the week which the rule should apply."),
.desc = N_("Days of the week to which the rule should apply."),
.set = dvr_autorec_entry_class_weekdays_set,
.get = dvr_autorec_entry_class_weekdays_get_,
.list = dvr_autorec_entry_class_weekdays_list,
Expand All @@ -1132,7 +1132,7 @@ const idclass_t dvr_autorec_entry_class = {
.id = "minduration",
.name = N_("Minimum duration"),
.desc = N_("The minimal duration of a matching event - in "
"other words, only match programmes that are no "
"other words, only match programs that are no "
"shorter than this duration."),
.list = dvr_autorec_entry_class_minduration_list,
.off = offsetof(dvr_autorec_entry_t, dae_minduration),
Expand Down Expand Up @@ -1261,7 +1261,7 @@ const idclass_t dvr_autorec_entry_class = {
.type = PT_STR,
.id = "creator",
.name = N_("Creator"),
.desc = N_("The user who created the recording or the "
.desc = N_("The user who created the recording, or the "
"auto-recording source and IP address if scheduled "
"by a matching rule."),
.off = offsetof(dvr_autorec_entry_t, dae_creator),
Expand Down
27 changes: 14 additions & 13 deletions src/dvr/dvr_config.c
View file
Expand Up @@ -937,12 +937,13 @@ const idclass_t dvr_config_class = {
.id = "pre-extra-time",
.name = N_("Pre-recording padding"),
.desc = N_("Start recording earlier than the defined "
"start time by x minutes, for example if a program "
"is to start at 13:00 and you set a padding of 5 "
"Start recording earlier than the defined start "
"time by x minutes: for example, if a program is "
"to start at 13:00 and you set a padding of 5 "
"minutes it will start recording at 12:54:30 "
"(including a warming-up time of 30 seconds). If this "
"isn't set the pre-recording padding if set in the "
"channel or DVR entry will be used."),
"(including a warm-up time of 30 seconds). If this "
"isn't specified, any pre-recording padding as set "
"in the channel or DVR entry will be used."),
.off = offsetof(dvr_config_t, dvr_extra_time_pre),
.list = dvr_config_class_extra_list,
.opts = PO_ADVANCED,
Expand Down Expand Up @@ -976,9 +977,9 @@ const idclass_t dvr_config_class = {
.id = "epg-running",
.name = N_("Use EPG running state"),
.desc = N_("Use EITp/f to decide event start/stop. This is "
"also known as accurate recording. Note that this "
"can have unexpected results if the broadcaster "
"isn`t very good at time keeping."),
"also known as \"Accurate Recording\". Note that "
"this can have unexpected results if the "
"broadcaster isn't very good at time keeping."),
.off = offsetof(dvr_config_t, dvr_running),
.opts = PO_ADVANCED,
.def.u32 = 1,
Expand Down Expand Up @@ -1122,9 +1123,9 @@ const idclass_t dvr_config_class = {
.id = "day-dir",
.name = N_("Make subdirectories per day"),
.desc = N_("Create a new directory per day in the "
"recording system path. Only days when anything is "
"recorded will the folder be created. The format of the "
"directory will be ISO standard YYYY-MM-DD."),
"recording system path. Folders will only be "
"created when something is recorded. The format "
"of the directory will be ISO standard YYYY-MM-DD."),
.off = offsetof(dvr_config_t, dvr_dir_per_day),
.opts = PO_EXPERT,
.group = 4,
Expand All @@ -1136,7 +1137,7 @@ const idclass_t dvr_config_class = {
.desc = N_("Create a directory per channel when "
"storing recordings. If both this and the 'directory "
"per day' checkbox is enabled, the date-directory "
"will be parent to the per-channel directory."),
"will be the parent of the per-channel directory."),
.off = offsetof(dvr_config_t, dvr_channel_dir),
.opts = PO_EXPERT,
.group = 4,
Expand Down Expand Up @@ -1210,7 +1211,7 @@ const idclass_t dvr_config_class = {
.type = PT_BOOL,
.id = "omit-title",
.name = N_("Don't include title in filename"),
.desc = N_("Don`t include the title in the filename."),
.desc = N_("Don't include the title in the filename."),
.off = offsetof(dvr_config_t, dvr_omit_title),
.opts = PO_EXPERT,
.group = 6,
Expand Down
27 changes: 14 additions & 13 deletions src/dvr/dvr_db.c
View file
Expand Up @@ -2835,13 +2835,14 @@ const idclass_t dvr_entry_class = {
.type = PT_TIME,
.id = "start_extra",
.name = N_("Pre-recording padding"),
.desc = N_("Start recording earlier than the EPG/timer defined "
"start time by x minutes, for example if a program "
"is to start at 13:00 and you set a padding of 5 "
"minutes it will start recording at 12:54:30 "
"(including a warming-up time of 30 seconds). If this "
"isn't set the pre-recording padding if set in the "
"channel or DVR profile will be used."),
.desc = N_("Start recording earlier than the "
"EPG/timer-defined start time by x minutes: for "
"example, if a program is to start at 13:00 and "
"you set a padding of 5 minutes, it will start "
"recording at 12:54:30 (including a warm-up time "
"of 30 seconds). If this isn't specified, any "
"pre-recording padding as set in the channel or "
"DVR profile will be used."),
.off = offsetof(dvr_entry_t, de_start_extra),
.set = dvr_entry_class_start_extra_set,
.list = dvr_entry_class_extra_list,
Expand Down Expand Up @@ -2888,7 +2889,7 @@ const idclass_t dvr_entry_class = {
.type = PT_TIME,
.id = "duration",
.name = N_("Duration"),
.desc = N_("The total recording time including pre and post "
.desc = N_("The total recording time including pre- and post-"
"recording padding."),
.get = dvr_entry_class_duration_get,
.opts = PO_RDONLY | PO_NOSAVE | PO_DURATION,
Expand Down Expand Up @@ -3027,7 +3028,7 @@ const idclass_t dvr_entry_class = {
.type = PT_STR,
.id = "creator",
.name = N_("Creator"),
.desc = N_("The user who created the recording or the "
.desc = N_("The user who created the recording, or the "
"auto-recording source and IP address if scheduled "
"by a matching rule."),
.off = offsetof(dvr_entry_t, de_creator),
Expand Down Expand Up @@ -3086,15 +3087,15 @@ const idclass_t dvr_entry_class = {
.type = PT_BOOL,
.id = "noresched",
.name = N_("Don't reschedule"),
.desc = N_("Don`t re-schedule if recording fails."),
.desc = N_("Don't re-schedule if recording fails."),
.off = offsetof(dvr_entry_t, de_dont_reschedule),
.opts = PO_HIDDEN | PO_NOUI,
},
{
.type = PT_BOOL,
.id = "norerecord",
.name = N_("Don't re-record"),
.desc = N_("Don`t re-record if recording fails."),
.desc = N_("Don't re-record if recording fails."),
.off = offsetof(dvr_entry_t, de_dont_rerecord),
.opts = PO_HIDDEN | PO_ADVANCED,
},
Expand All @@ -3119,7 +3120,7 @@ const idclass_t dvr_entry_class = {
.type = PT_STR,
.id = "timerec",
.name = N_("Auto time record"),
.desc = N_("Timer based automatic recording."),
.desc = N_("Timer-based automatic recording."),
.set = dvr_entry_class_timerec_set,
.get = dvr_entry_class_timerec_get,
.opts = PO_RDONLY | PO_EXPERT,
Expand All @@ -3128,7 +3129,7 @@ const idclass_t dvr_entry_class = {
.type = PT_STR,
.id = "timerec_caption",
.name = N_("Time record caption"),
.desc = N_("Timer based automatic record caption."),
.desc = N_("Timer-based automatic record caption."),
.get = dvr_entry_class_timerec_caption_get,
.opts = PO_RDONLY | PO_NOSAVE | PO_HIDDEN | PO_NOUI,
},
Expand Down
6 changes: 3 additions & 3 deletions src/dvr/dvr_timerec.c
View file
Expand Up @@ -579,7 +579,7 @@ const idclass_t dvr_timerec_entry_class = {
.type = PT_STR,
.id = "start",
.name = N_("Start"),
.desc = N_("Time to start the recording/Time the recording started."),
.desc = N_("Time to start the recording/time the recording started."),
.set = dvr_timerec_entry_class_start_set,
.get = dvr_timerec_entry_class_start_get,
.list = dvr_timerec_entry_class_time_list,
Expand All @@ -590,7 +590,7 @@ const idclass_t dvr_timerec_entry_class = {
.type = PT_STR,
.id = "stop",
.name = N_("Stop"),
.desc = N_("Time to stop recording/Time the recording stopped."),
.desc = N_("Time to stop recording/time the recording stopped."),
.set = dvr_timerec_entry_class_stop_set,
.get = dvr_timerec_entry_class_stop_get,
.list = dvr_timerec_entry_class_time_list,
Expand Down Expand Up @@ -662,7 +662,7 @@ const idclass_t dvr_timerec_entry_class = {
.type = PT_STR,
.id = "creator",
.name = N_("Creator"),
.desc = N_("The user who created the recording or the "
.desc = N_("The user who created the recording, or the "
"auto-recording source and IP address if scheduled "
"by a matching rule."),
.off = offsetof(dvr_timerec_entry_t, dte_creator),
Expand Down
7 changes: 4 additions & 3 deletions src/input/mpegts/iptv/iptv_mux.c
View file
Expand Up @@ -250,9 +250,10 @@ const idclass_t iptv_mux_class =
.type = PT_U32,
.id = "iptv_buffer_limit",
.name = N_("Buffering limit (ms)"),
.desc = N_("Specifies the incoming buffering limit in milliseconds (PCR based). "
"If PCR time difference from the system clock is higher, the incoming "
"stream is paused."),
.desc = N_("Specifies the incoming buffering limit in "
"milliseconds (PCR based). If the PCR time "
"difference from the system clock is higher than "
"this, the incoming stream is paused."),
.off = offsetof(iptv_mux_t, mm_iptv_buffer_limit),
.opts = PO_ADVANCED,
},
Expand Down
4 changes: 2 additions & 2 deletions src/input/mpegts/mpegts_input.c
View file
Expand Up @@ -278,8 +278,8 @@ const idclass_t mpegts_input_class =
.id = "initscan",
.name = N_("Initial scan"),
.desc = N_("Allow the initial scan tuning on this device "
"(scan when Tvheadend starts). See Skip Initial "
"Scan in the network settings for further details."),
"(scan when Tvheadend starts). See 'Skip Initial "
"Scan' in the network settings for further details."),
.off = offsetof(mpegts_input_t, mi_initscan),
.def.i = 1,
.opts = PO_ADVANCED,
Expand Down
2 changes: 1 addition & 1 deletion src/input/mpegts/mpegts_mux.c
View file
Expand Up @@ -530,7 +530,7 @@ const idclass_t mpegts_mux_class =
.type = PT_STR,
.id = "name",
.name = N_("Name"),
.desc = N_("The name (or freq) the mux is on."),
.desc = N_("The name (or frequency) the mux is on."),
.opts = PO_RDONLY | PO_NOSAVE,
.get = mpegts_mux_class_get_name,
},
Expand Down
2 changes: 1 addition & 1 deletion src/input/mpegts/mpegts_mux_dvb.c
View file
Expand Up @@ -449,7 +449,7 @@ const idclass_t dvb_mux_dvbs_class =
.type = PT_U32,
.id = "frequency",
.name = N_("Frequency (kHz)"),
.desc = N_("The frequency of the mux/transponder in Hertz,"),
.desc = N_("The frequency of the mux/transponder in Hertz."),
.off = offsetof(dvb_mux_t, lm_tuning.dmc_fe_freq),
.set = dvb_mux_dvbs_class_frequency_set,
},
Expand Down
6 changes: 3 additions & 3 deletions src/input/mpegts/mpegts_network.c
View file
Expand Up @@ -175,9 +175,9 @@ const idclass_t mpegts_network_class =
.type = PT_BOOL,
.id = "skipinitscan",
.name = N_("Skip initial scan"),
.desc = N_("Skip scanning known muxes on Tvheadend start. "
"If initial scan is allowed and new muxes are "
"found they will be scanned too. See Help for "
.desc = N_("Skip scanning known muxes when Tvheadend starts. "
"If \"initial scan\" is allowed and new muxes are "
"found then they will still be scanned. See Help for "
"more details."),
.off = offsetof(mpegts_network_t, mn_skipinitscan),
.opts = PO_EXPERT,
Expand Down

0 comments on commit ae3cf80

Please sign in to comment.