diff --git a/src/NzbDrone.Core/Download/Clients/rTorrent/RTorrent.cs b/src/NzbDrone.Core/Download/Clients/rTorrent/RTorrent.cs index ca2cad20..198b2bb4 100644 --- a/src/NzbDrone.Core/Download/Clients/rTorrent/RTorrent.cs +++ b/src/NzbDrone.Core/Download/Clients/rTorrent/RTorrent.cs @@ -143,7 +143,7 @@ protected override string AddFromTorrentFile(RemoteBook remoteBook, string hash, public override string Name => "rTorrent"; - public override ProviderMessage Message => new ProviderMessage($"rTorrent will not pause torrents when they meet the seed criteria. Chaptarr can remove torrents after seeding is done only when Remove Completed is enabled and the torrent is not protected by Keep seeding permanently or Post-Import Category. After importing it will also set \"{_imported_view}\" as an rTorrent view, which can be used in rTorrent scripts to customize behavior.", ProviderMessageType.Info); + public override ProviderMessage Message => new ProviderMessage($"rTorrent will not pause torrents when they meet the seed criteria. Chaptarr can remove torrents after seeding is done only when Remove Completed is enabled and the torrent is not protected by Preserve torrents in client or Post-Import Category. After importing it will also set \"{_imported_view}\" as an rTorrent view, which can be used in rTorrent scripts to customize behavior.", ProviderMessageType.Info); public override IEnumerable GetItems() { diff --git a/src/NzbDrone.Core/Download/DownloadImportModeResolver.cs b/src/NzbDrone.Core/Download/DownloadImportModeResolver.cs index 87b486e9..41225bbd 100644 --- a/src/NzbDrone.Core/Download/DownloadImportModeResolver.cs +++ b/src/NzbDrone.Core/Download/DownloadImportModeResolver.cs @@ -126,7 +126,7 @@ private string GetPreserveReason(DownloadClientItem downloadClientItem) // Tier 1: per-indexer protection for downloads Chaptarr grabbed. if (grab?.IndexerId > 0 && ShouldNeverMoveForIndexer(grab.IndexerId)) { - return $"the indexer is configured to keep seeding permanently (IndexerId={grab.IndexerId})"; + return $"the indexer is configured to preserve torrents in client (IndexerId={grab.IndexerId})"; } // Tier 2: per-download-client protection for unmanaged downloads (no grab history). diff --git a/src/NzbDrone.Core/Indexers/MyAnonaMouse/MyAnonaMouseSettings.cs b/src/NzbDrone.Core/Indexers/MyAnonaMouse/MyAnonaMouseSettings.cs index 2e0ad275..154f3763 100644 --- a/src/NzbDrone.Core/Indexers/MyAnonaMouse/MyAnonaMouseSettings.cs +++ b/src/NzbDrone.Core/Indexers/MyAnonaMouse/MyAnonaMouseSettings.cs @@ -73,7 +73,7 @@ public int UseFreeleechWedge [FieldDefinition(6, Type = FieldType.Checkbox, Label = "Integrate with Audiobookshelf", HelpText = "If you've connected ABS this will enhance your MAM searching", Hidden = HiddenType.Hidden)] public bool IntegrateWithAbs { get; set; } - [FieldDefinition(7, Type = FieldType.Number, Label = "Seed Time", Unit = "hours", HelpText = "Number of hours to seed after download completes. MAM requires 72 hours within 30 days; values below 72 hours will warn.")] + [FieldDefinition(7, Type = FieldType.Number, Label = "Seed Time", Unit = "hours", HelpText = "Time in hours to seed before the download client stops the torrent. Leave empty to use the download client's default seeding rules. MAM requires at least 72 hours within 30 days; values below 72 hours will warn.")] public int? SeedTimeHours { get; set; } [FieldDefinition(8, Type = FieldType.Number, Label = "Early Download Limit", Unit = "days", HelpText = "Time before release date Chaptarr will download from this indexer, empty is no limit", Advanced = true)] diff --git a/src/NzbDrone.Core/Localization/Core/en.json b/src/NzbDrone.Core/Localization/Core/en.json index 12c5600a..d40e21ed 100644 --- a/src/NzbDrone.Core/Localization/Core/en.json +++ b/src/NzbDrone.Core/Localization/Core/en.json @@ -426,10 +426,10 @@ "ConversionTags": "Conversion Tags", "ConvertedWaitingToImport": "Converted - Waiting to import", "ConvertMp3ToM4b": "Convert MP3 to M4B", - "ConvertMp3ToM4bHelpText": "Before importing, convert downloaded MP3 files to M4B format. Original torrent files follow the same cleanup rules as other downloads: preserve them with Keep seeding permanently or Post-Import Category, otherwise remove them after seeding when Remove Completed Downloads is enabled.", + "ConvertMp3ToM4bHelpText": "Before importing, convert downloaded MP3 files to M4B format. Original torrent files follow the same cleanup rules as other downloads: preserve them with Preserve torrents in client or Post-Import Category, otherwise remove them after seeding when Remove Completed Downloads is enabled.", "ConvertToFormat": "Convert To Format", "ConvertToQuality": "Convert To", - "ConvertToQualityHelpText": "After download, convert compatible files to this format before importing. Original torrent files follow normal cleanup unless protected by Keep seeding permanently on the grabbing indexer or Post-Import Category on the download client. If neither applies, Chaptarr deletes the original torrent files after seeding is done and Remove Completed Downloads is enabled.", + "ConvertToQualityHelpText": "After download, convert compatible files to this format before importing. Original torrent files follow normal cleanup unless protected by Preserve torrents in client on the grabbing indexer or Post-Import Category on the download client. If neither applies, Chaptarr deletes the original torrent files after seeding is done and Remove Completed Downloads is enabled.", "CopyToClipboard": "Copy to clipboard", "CopyUnmanagedDownloads": "Copy unmanaged downloads", "CopyUnmanagedDownloadsHelpText": "When Chaptarr did not grab a download (no grab history), import by copy/hardlink and never remove it from the download client.", @@ -954,8 +954,8 @@ "IndexerSearchCheckNoAvailableIndexersMessage": "All search-capable indexers are temporarily unavailable due to recent indexer errors", "IndexerSearchCheckNoInteractiveMessage": "No indexers available with Interactive Search enabled, Chaptarr will not provide any interactive search results", "IndexerSettings": "Indexer Settings", - "IndexerSettingsNeverMoveOnImport": "Keep seeding permanently", - "IndexerSettingsNeverMoveOnImportHelpText": "For this indexer, always keep grabbed torrents and their files. Typically used for trackers with economy.", + "IndexerSettingsNeverMoveOnImport": "Preserve torrents in client", + "IndexerSettingsNeverMoveOnImportHelpText": "Always copy/hardlink files on import and never remove completed torrents or files from the download client for this indexer. (Does not override client seeding time/ratio limits).", "IndexerSettingsSeedRatio": "Seed Ratio", "IndexerSettingsSeedRatioHelpText": "The ratio a torrent should reach before stopping, empty uses the download client's default. Ratio should be at least 1.0 and follow the indexers rules", "IndexerSettingsSeedTime": "Seed Time", @@ -1632,7 +1632,7 @@ "Remove": "Remove", "RemoveCompleted": "Remove Completed", "RemoveCompletedDownloads": "Remove Completed Downloads", - "RemoveCompletedDownloadsHelpText": "Delete imported downloads from the download client when the client says they are safe to remove. For torrents, this usually means seeding has finished. This does not apply to torrents protected by Post-Import Category or Keep seeding permanently.", + "RemoveCompletedDownloadsHelpText": "Delete imported downloads from the download client when the client says they are safe to remove. For torrents, this usually means seeding has finished. This does not apply to torrents protected by Post-Import Category or Preserve torrents in client.", "RemoveDownloadsAlert": "The Remove settings were moved to the individual Download Client settings in the table above.", "RemoveFailed": "Remove Failed", "RemoveFailedDownloads": "Remove Failed Downloads",