- Fixed RSS feed filter matching (did not take 'not' tokens into consideration)

- Added a RSS feed filter tester for easy setup)
- Updated language files
This commit is contained in:
Christophe Dumez 2009-08-21 08:19:32 +00:00
commit f80bd42361
55 changed files with 5123 additions and 1316 deletions

View file

@ -758,6 +758,138 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FeedDownloader</name>
<message>
<location filename="../FeedDownloader.ui" line="14"/>
<source>RSS Feed downloader</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../FeedDownloader.ui" line="29"/>
<source>RSS feed:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../FeedDownloader.ui" line="43"/>
<source>Feed name</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../FeedDownloader.ui" line="65"/>
<source>Automatically download torrents from this feed</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../FeedDownloader.ui" line="81"/>
<source>Download filters</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../FeedDownloader.ui" line="99"/>
<source>Filters:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../FeedDownloader.ui" line="209"/>
<source>Filter settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../FeedDownloader.ui" line="228"/>
<source>Matches:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../FeedDownloader.ui" line="241"/>
<source>Does not match:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../FeedDownloader.ui" line="254"/>
<source>Destination folder:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../FeedDownloader.ui" line="293"/>
<source>...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../FeedDownloader.ui" line="306"/>
<source>Filter testing</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../FeedDownloader.ui" line="322"/>
<source>Torrent title:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../FeedDownloader.ui" line="335"/>
<source>Result:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../FeedDownloader.ui" line="357"/>
<source>Test</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FeedDownloaderDlg</name>
<message>
<location filename="../FeedDownloader.h" line="292"/>
<source>New filter</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../FeedDownloader.h" line="299"/>
<source>Please choose a name for this filter</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../FeedDownloader.h" line="299"/>
<source>Filter name:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../FeedDownloader.h" line="307"/>
<location filename="../FeedDownloader.h" line="322"/>
<source>Invalid filter name</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../FeedDownloader.h" line="307"/>
<source>The filter name cannot be left empty.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../FeedDownloader.h" line="322"/>
<source>This filter name is already in use.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../FeedDownloader.h" line="343"/>
<source>Filter testing error</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../FeedDownloader.h" line="343"/>
<source>Please specify a test torrent name.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../FeedDownloader.h" line="350"/>
<source>matches</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../FeedDownloader.h" line="352"/>
<source>does not match</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FilterParserThread</name>
<message>
@ -1388,6 +1520,16 @@ p, li { white-space: pre-wrap; }
<source>Open news URL</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../rss.ui" line="253"/>
<source>Copy feed URL</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../rss.ui" line="262"/>
<source>RSS feed downloader</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../rss.ui" line="83"/>
<source>Delete selected streams</source>
@ -1432,86 +1574,86 @@ p, li { white-space: pre-wrap; }
<context>
<name>RSSImp</name>
<message>
<location filename="../rss_imp.cpp" line="194"/>
<location filename="../rss_imp.cpp" line="219"/>
<source>Please type a rss stream url</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../rss_imp.cpp" line="194"/>
<location filename="../rss_imp.cpp" line="219"/>
<source>Stream URL:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../rss_imp.cpp" line="134"/>
<location filename="../rss_imp.cpp" line="139"/>
<source>Please choose a new name for this stream</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../rss_imp.cpp" line="134"/>
<location filename="../rss_imp.cpp" line="139"/>
<source>New stream name:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../rss_imp.cpp" line="80"/>
<location filename="../rss_imp.cpp" line="85"/>
<source>Are you sure? -- qBittorrent</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../rss_imp.cpp" line="81"/>
<location filename="../rss_imp.cpp" line="86"/>
<source>&amp;Yes</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../rss_imp.cpp" line="81"/>
<location filename="../rss_imp.cpp" line="86"/>
<source>&amp;No</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../rss_imp.cpp" line="80"/>
<location filename="../rss_imp.cpp" line="85"/>
<source>Are you sure you want to delete this stream from the list?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../rss_imp.cpp" line="187"/>
<location filename="../rss_imp.cpp" line="210"/>
<location filename="../rss_imp.cpp" line="224"/>
<location filename="../rss_imp.cpp" line="321"/>
<location filename="../rss_imp.cpp" line="207"/>
<location filename="../rss_imp.cpp" line="235"/>
<location filename="../rss_imp.cpp" line="249"/>
<location filename="../rss_imp.cpp" line="346"/>
<source>Description:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../rss_imp.cpp" line="187"/>
<location filename="../rss_imp.cpp" line="210"/>
<location filename="../rss_imp.cpp" line="224"/>
<location filename="../rss_imp.cpp" line="321"/>
<location filename="../rss_imp.cpp" line="207"/>
<location filename="../rss_imp.cpp" line="235"/>
<location filename="../rss_imp.cpp" line="249"/>
<location filename="../rss_imp.cpp" line="346"/>
<source>url:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../rss_imp.cpp" line="187"/>
<location filename="../rss_imp.cpp" line="210"/>
<location filename="../rss_imp.cpp" line="224"/>
<location filename="../rss_imp.cpp" line="321"/>
<location filename="../rss_imp.cpp" line="207"/>
<location filename="../rss_imp.cpp" line="235"/>
<location filename="../rss_imp.cpp" line="249"/>
<location filename="../rss_imp.cpp" line="346"/>
<source>Last refresh:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../rss_imp.cpp" line="201"/>
<location filename="../rss_imp.cpp" line="226"/>
<source>qBittorrent</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../rss_imp.cpp" line="202"/>
<location filename="../rss_imp.cpp" line="227"/>
<source>This rss feed is already in the list.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../rss_imp.cpp" line="259"/>
<location filename="../rss_imp.cpp" line="284"/>
<source>Date: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../rss_imp.cpp" line="262"/>
<location filename="../rss_imp.cpp" line="287"/>
<source>Author: </source>
<translation type="unfinished"></translation>
</message>
@ -1519,7 +1661,7 @@ p, li { white-space: pre-wrap; }
<context>
<name>RssItem</name>
<message>
<location filename="../rss.h" line="296"/>
<location filename="../rss.h" line="327"/>
<source>No description available</source>
<translation type="unfinished"></translation>
</message>
@ -1527,13 +1669,18 @@ p, li { white-space: pre-wrap; }
<context>
<name>RssStream</name>
<message>
<location filename="../rss.h" line="489"/>
<location filename="../rss.h" line="520"/>
<source>%1 ago</source>
<comment>10min ago</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../rss.h" line="488"/>
<location filename="../rss.h" line="586"/>
<source>Automatically downloading %1 torrent from %2 RSS feed...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../rss.h" line="519"/>
<source>Never</source>
<translation type="unfinished"></translation>
</message>
@ -1836,97 +1983,97 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../bittorrent.cpp" line="289"/>
<location filename="../bittorrent.cpp" line="295"/>
<source>&apos;%1&apos; was removed permanently.</source>
<comment>&apos;xxx.avi&apos; was removed permanently.</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../bittorrent.cpp" line="291"/>
<location filename="../bittorrent.cpp" line="297"/>
<source>&apos;%1&apos; was removed.</source>
<comment>&apos;xxx.avi&apos; was removed.</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../bittorrent.cpp" line="367"/>
<location filename="../bittorrent.cpp" line="373"/>
<source>&apos;%1&apos; is not a valid magnet URI.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../bittorrent.cpp" line="392"/>
<location filename="../bittorrent.cpp" line="535"/>
<location filename="../bittorrent.cpp" line="538"/>
<location filename="../bittorrent.cpp" line="398"/>
<location filename="../bittorrent.cpp" line="541"/>
<location filename="../bittorrent.cpp" line="544"/>
<source>&apos;%1&apos; is already in download list.</source>
<comment>e.g: &apos;xxx.avi&apos; is already in download list.</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../bittorrent.cpp" line="473"/>
<location filename="../bittorrent.cpp" line="637"/>
<location filename="../bittorrent.cpp" line="642"/>
<location filename="../bittorrent.cpp" line="479"/>
<location filename="../bittorrent.cpp" line="649"/>
<location filename="../bittorrent.cpp" line="654"/>
<source>&apos;%1&apos; resumed. (fast resume)</source>
<comment>&apos;/home/y/xxx.torrent&apos; was resumed. (fast resume)</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../bittorrent.cpp" line="475"/>
<location filename="../bittorrent.cpp" line="639"/>
<location filename="../bittorrent.cpp" line="644"/>
<location filename="../bittorrent.cpp" line="481"/>
<location filename="../bittorrent.cpp" line="651"/>
<location filename="../bittorrent.cpp" line="656"/>
<source>&apos;%1&apos; added to download list.</source>
<comment>&apos;/home/y/xxx.torrent&apos; was added to download list.</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../bittorrent.cpp" line="509"/>
<location filename="../bittorrent.cpp" line="513"/>
<location filename="../bittorrent.cpp" line="515"/>
<location filename="../bittorrent.cpp" line="519"/>
<source>Unable to decode torrent file: &apos;%1&apos;</source>
<comment>e.g: Unable to decode torrent file: &apos;/home/y/xxx.torrent&apos;</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../bittorrent.cpp" line="516"/>
<location filename="../bittorrent.cpp" line="522"/>
<source>This file is either corrupted or this isn&apos;t a torrent.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../bittorrent.cpp" line="957"/>
<location filename="../bittorrent.cpp" line="969"/>
<source>&lt;font color=&apos;red&apos;&gt;%1&lt;/font&gt; &lt;i&gt;was blocked due to your IP filter&lt;/i&gt;</source>
<comment>x.y.z.w was blocked</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../bittorrent.cpp" line="959"/>
<location filename="../bittorrent.cpp" line="971"/>
<source>&lt;font color=&apos;red&apos;&gt;%1&lt;/font&gt; &lt;i&gt;was banned due to corrupt pieces&lt;/i&gt;</source>
<comment>x.y.z.w was banned</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../bittorrent.cpp" line="1277"/>
<location filename="../bittorrent.cpp" line="1293"/>
<source>Couldn&apos;t listen on any of the given ports.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../bittorrent.cpp" line="1316"/>
<location filename="../bittorrent.cpp" line="1332"/>
<source>UPnP/NAT-PMP: Port mapping failure, message: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../bittorrent.cpp" line="1321"/>
<location filename="../bittorrent.cpp" line="1337"/>
<source>UPnP/NAT-PMP: Port mapping successful, message: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../bittorrent.cpp" line="1336"/>
<location filename="../bittorrent.cpp" line="1352"/>
<source>Fast resume data was rejected for torrent %1, checking again...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../bittorrent.cpp" line="1341"/>
<location filename="../bittorrent.cpp" line="1357"/>
<source>Url seed lookup failed for url: %1, message: %2</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../bittorrent.cpp" line="1409"/>
<location filename="../bittorrent.cpp" line="1425"/>
<source>Downloading &apos;%1&apos;, please wait...</source>
<comment>e.g: Downloading &apos;xxx.torrent&apos;, please wait...</comment>
<translation type="unfinished"></translation>
@ -1935,112 +2082,112 @@ p, li { white-space: pre-wrap; }
<context>
<name>createTorrentDialog</name>
<message>
<location filename="../createtorrent.ui" line="534"/>
<location filename="../createtorrent.ui" line="520"/>
<source>Cancel</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../createtorrent.ui" line="13"/>
<location filename="../createtorrent.ui" line="14"/>
<source>Torrent Creation Tool</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../createtorrent.ui" line="42"/>
<location filename="../createtorrent.ui" line="43"/>
<source>Torrent file creation</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../createtorrent.ui" line="102"/>
<location filename="../createtorrent.ui" line="105"/>
<source>Announce urls (trackers):</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../createtorrent.ui" line="137"/>
<location filename="../createtorrent.ui" line="140"/>
<source>Comment (optional):</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../createtorrent.ui" line="118"/>
<location filename="../createtorrent.ui" line="121"/>
<source>Web seeds urls (optional):</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../createtorrent.ui" line="52"/>
<location filename="../createtorrent.ui" line="53"/>
<source>File or folder to add to the torrent:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../createtorrent.ui" line="64"/>
<location filename="../createtorrent.ui" line="65"/>
<source>Add a file</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../createtorrent.ui" line="74"/>
<location filename="../createtorrent.ui" line="76"/>
<source>Add a folder</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../createtorrent.ui" line="400"/>
<location filename="../createtorrent.ui" line="395"/>
<source>Piece size:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../createtorrent.ui" line="411"/>
<location filename="../createtorrent.ui" line="406"/>
<source>32 KiB</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../createtorrent.ui" line="416"/>
<location filename="../createtorrent.ui" line="411"/>
<source>64 KiB</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../createtorrent.ui" line="421"/>
<location filename="../createtorrent.ui" line="416"/>
<source>128 KiB</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../createtorrent.ui" line="426"/>
<location filename="../createtorrent.ui" line="421"/>
<source>256 KiB</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../createtorrent.ui" line="431"/>
<location filename="../createtorrent.ui" line="426"/>
<source>512 KiB</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../createtorrent.ui" line="436"/>
<location filename="../createtorrent.ui" line="431"/>
<source>1 MiB</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../createtorrent.ui" line="441"/>
<location filename="../createtorrent.ui" line="436"/>
<source>2 MiB</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../createtorrent.ui" line="446"/>
<location filename="../createtorrent.ui" line="441"/>
<source>4 MiB</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../createtorrent.ui" line="469"/>
<location filename="../createtorrent.ui" line="464"/>
<source>Private (won&apos;t be distributed on DHT network if enabled)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../createtorrent.ui" line="476"/>
<location filename="../createtorrent.ui" line="471"/>
<source>Start seeding after creation</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../createtorrent.ui" line="527"/>
<location filename="../createtorrent.ui" line="513"/>
<source>Create and save...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../createtorrent.ui" line="483"/>
<location filename="../createtorrent.ui" line="478"/>
<source>Progress:</source>
<translation type="unfinished"></translation>
</message>