Merge remote-tracking branch 'origin/master' into pneumatic

This commit is contained in:
Mark McDowall
2012-08-29 20:20:06 -07:00
2 changed files with 4 additions and 4 deletions

View File

@@ -13,11 +13,11 @@ namespace NzbDrone.Web.Models
public bool EnableBacklogSearching { get; set; }
[DisplayName("Automatically Ignore Deleted Episodes")]
[Description("Should NzbDrone automatically ignore episodes that were deleted from disk?")]
[Description("Deleted episodes are automatically ignored.")]
public bool AutoIgnorePreviouslyDownloadedEpisodes { get; set; }
[DisplayName("Allowed Release Groups")]
[Description("Comma separated list of release groups to download episodes")]
[DisplayName("Specified Release Groups")]
[Description("Comma separated list of release groups to download episodes (leave empty for all groups)")]
public string AllowedReleaseGroups { get; set; }
}
}

View File

@@ -3,7 +3,7 @@
@{ Layout = null; }
<div class="warningBox">
Enabling Backlog Searching can use lots of bandwidth and is not recommended for Users with block Usenet accounts or bandwidth restrictions.
Enabling Backlog Searching can use lots of bandwidth and is not recommended for users with block Usenet accounts or bandwidth restrictions.
</div>
<div id="stylized">