diff --git a/TODO b/TODO index e8bdeeaf4..f61d79dce 100644 --- a/TODO +++ b/TODO @@ -38,7 +38,6 @@ * http://fragments.turtlemeat.com/pythonwebserver.php - improve and test tracker authentication code (remember login/pass) (need a tracker to test this) - support zipped torrents? (useful?) -- Add option for RSS customization (refresh interval, max news per RSS...) - Allow to disable UPnP/NAT-PMP/LSD in options? - Allow to automatically delete torrents when they reach a given ratio (in options) : easy - Allow to limit the number of downloading torrents simultaneously (other are paused until a download finishes) @@ -51,8 +50,6 @@ // in v1.0.0 (partial) - WIP - Fix all (or almost all) opened bugs in bug tracker -- Add an option 'Automatically update search plugins' -- Add an option 'Display current speed in title bar' - Improve systray tooltip - Use tooltips in options to explain - Keep documention up to date @@ -104,6 +101,7 @@ beta6->beta7 changelog: - FEATURE: Added an option to automatically delete torrents when they reach a given ratio (>= 1.0) - FEATURE: Added an option to display current transfer speeds in title bar - FEATURE: Added "Mark all as read" function for RSS feeds +- FEATURE: Added some RSS settings in program preferences - BUGFIX: In torrent content, it is now easier to filter all torrents using right click menu - BUGFIX: Updated man page / README / INSTALL - BUGFIX: Paused torrents could be displayed as connected for a sec after checking diff --git a/src/GUI.cpp b/src/GUI.cpp index 049eef41d..9c3bc0a40 100644 --- a/src/GUI.cpp +++ b/src/GUI.cpp @@ -56,7 +56,7 @@ namespace fs = boost::filesystem; *****************************************************/ // Constructor -GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent), displaySpeedInTitle(false), force_exit(false) { +GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent), displaySpeedInTitle(false), force_exit(false), refreshInterval(1500) { setupUi(this); setWindowTitle(tr("qBittorrent %1", "e.g: qBittorrent v0.x").arg(QString::fromUtf8(VERSION))); QSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent")); @@ -790,6 +790,12 @@ void GUI::configureSession(bool deleteOptions) { qDebug("Configuring session"); // General displaySpeedInTitle = options->speedInTitleBar(); + unsigned int new_refreshInterval = options->getRefreshInterval(); + if(refreshInterval != new_refreshInterval) { + refreshInterval = new_refreshInterval; + refresher->stop(); + refresher->start(refreshInterval); + } // Downloads // * Save path BTSession->setDefaultSavePath(options->getSavePath()); diff --git a/src/GUI.h b/src/GUI.h index 2ea66b016..7ab54eae1 100644 --- a/src/GUI.h +++ b/src/GUI.h @@ -66,6 +66,7 @@ class GUI : public QMainWindow, private Ui::MainWindow{ bool systrayIntegration; bool displaySpeedInTitle; bool force_exit; + unsigned int refreshInterval; QTimer *refresher; // Keyboard shortcuts QShortcut *switchSearchShortcut; diff --git a/src/Icons/configure.png b/src/Icons/configure.png new file mode 100644 index 000000000..4461aa753 Binary files /dev/null and b/src/Icons/configure.png differ diff --git a/src/Icons/connection.png b/src/Icons/connection.png index 8ca174316..e2b1bc553 100644 Binary files a/src/Icons/connection.png and b/src/Icons/connection.png differ diff --git a/src/Icons/download.png b/src/Icons/download.png new file mode 100644 index 000000000..a867ed478 Binary files /dev/null and b/src/Icons/download.png differ diff --git a/src/Icons/exec.png b/src/Icons/exec.png deleted file mode 100644 index 14dc7455c..000000000 Binary files a/src/Icons/exec.png and /dev/null differ diff --git a/src/icons.qrc b/src/icons.qrc index 363bb088a..c042536d8 100644 --- a/src/icons.qrc +++ b/src/icons.qrc @@ -12,7 +12,6 @@ Icons/downarrow.png Icons/description.png Icons/qbittorrent16.png - Icons/exec.png Icons/systemtray.png Icons/unhappy.png Icons/filter.png @@ -45,6 +44,8 @@ Icons/search32.png Icons/bt_settings.png Icons/star.png + Icons/configure.png + Icons/download.png Icons/flags/portugal.png Icons/flags/france.png Icons/flags/ukraine.png diff --git a/src/lang/qbittorrent_bg.qm b/src/lang/qbittorrent_bg.qm index abe729b8a..f7f583766 100644 Binary files a/src/lang/qbittorrent_bg.qm and b/src/lang/qbittorrent_bg.qm differ diff --git a/src/lang/qbittorrent_bg.ts b/src/lang/qbittorrent_bg.ts index 43b76c7ad..30588c663 100644 --- a/src/lang/qbittorrent_bg.ts +++ b/src/lang/qbittorrent_bg.ts @@ -2519,17 +2519,17 @@ Are you sure you want to quit qBittorrent? Търси - + Delete Изтрий - + Rename Преименувай - + Refresh Обнови @@ -2539,110 +2539,115 @@ Are you sure you want to quit qBittorrent? Образуване - + Delete selected streams Изтрий маркираните потоци - + Refresh RSS streams Обнови потоците RSS - + Add a new RSS stream Добави нов поток RSS - + <b>News:</b> <i>(double-click to open the link in your web browser)</i> <b>Новини:</b> <i>(щракни двойно за отваряне на линка в браузъра)</i> - + Add RSS stream Добави поток RSS - + Refresh all streams Обнови всички потоци - + RSS streams: Потоци RSS: - + 2 2 + + + Mark all as read + + RSSImp - + Please type a rss stream url Моля въведете url на поток rss - + Stream URL: Поток URL: - + Please choose a new name for this stream Моля изберете ново име за този поток - + New stream name: Ново име на потока: - + Are you sure? -- qBittorrent Сигурни ли сте? -- qBittorrent - + &Yes &Да - + &No &Не - + Are you sure you want to delete this stream from the list? Сигурни ли сте че искате да изтриете този поток от списъка? - + Description: Описание: - + url: url: - + Last refresh: Последно обновяване: - + qBittorrent qBittorrent - + This rss feed is already in the list. Този rss feed е вече в списъка. @@ -2658,13 +2663,13 @@ Are you sure you want to quit qBittorrent? RssStream - + %1 ago 10min ago преди %1 - + Never Никога diff --git a/src/lang/qbittorrent_ca.qm b/src/lang/qbittorrent_ca.qm index ff5c61a86..b24df0ecd 100644 Binary files a/src/lang/qbittorrent_ca.qm and b/src/lang/qbittorrent_ca.qm differ diff --git a/src/lang/qbittorrent_ca.ts b/src/lang/qbittorrent_ca.ts index bdf58cfc9..0ecec6a23 100644 --- a/src/lang/qbittorrent_ca.ts +++ b/src/lang/qbittorrent_ca.ts @@ -2401,17 +2401,17 @@ Are you sure you want to quit qBittorrent? Cercar - + Delete Esborra - + Rename - + Refresh @@ -2421,110 +2421,115 @@ Are you sure you want to quit qBittorrent? Crear - + Delete selected streams - + Refresh RSS streams - + Add a new RSS stream - + <b>News:</b> <i>(double-click to open the link in your web browser)</i> - + Add RSS stream - + Refresh all streams - + RSS streams: - + 2 2 + + + Mark all as read + + RSSImp - + Please type a rss stream url - + Stream URL: - + Please choose a new name for this stream - + New stream name: - + Are you sure? -- qBittorrent Estàs segur? -- qBittorrent - + &Yes &Yes - + &No &No - + Are you sure you want to delete this stream from the list? - + Description: - + url: - + Last refresh: - + qBittorrent - + This rss feed is already in the list. @@ -2540,13 +2545,13 @@ Are you sure you want to quit qBittorrent? RssStream - + %1 ago 10min ago - + Never diff --git a/src/lang/qbittorrent_da.qm b/src/lang/qbittorrent_da.qm index 694cff71f..1685342ea 100644 Binary files a/src/lang/qbittorrent_da.qm and b/src/lang/qbittorrent_da.qm differ diff --git a/src/lang/qbittorrent_da.ts b/src/lang/qbittorrent_da.ts index dab2ffdb8..72a78d5b0 100644 --- a/src/lang/qbittorrent_da.ts +++ b/src/lang/qbittorrent_da.ts @@ -1838,17 +1838,17 @@ Are you sure you want to quit qBittorrent? Søg - + Delete Slet - + Rename - + Refresh @@ -1858,110 +1858,115 @@ Are you sure you want to quit qBittorrent? Opret - + Delete selected streams - + Refresh RSS streams - + Add a new RSS stream - + <b>News:</b> <i>(double-click to open the link in your web browser)</i> - + Add RSS stream - + Refresh all streams - + RSS streams: - + 2 2 + + + Mark all as read + + RSSImp - + Please type a rss stream url - + Stream URL: - + Please choose a new name for this stream - + New stream name: - + Are you sure? -- qBittorrent Er du sikker? -- qBittorrent - + &Yes &Ja - + &No &Nej - + Are you sure you want to delete this stream from the list? - + Description: - + url: - + Last refresh: - + qBittorrent qBittorrent - + This rss feed is already in the list. @@ -1977,13 +1982,13 @@ Are you sure you want to quit qBittorrent? RssStream - + %1 ago 10min ago - + Never diff --git a/src/lang/qbittorrent_de.qm b/src/lang/qbittorrent_de.qm index 25afdb8c3..61038b9ef 100644 Binary files a/src/lang/qbittorrent_de.qm and b/src/lang/qbittorrent_de.qm differ diff --git a/src/lang/qbittorrent_de.ts b/src/lang/qbittorrent_de.ts index 8d7657480..6b8e1f517 100644 --- a/src/lang/qbittorrent_de.ts +++ b/src/lang/qbittorrent_de.ts @@ -2497,17 +2497,17 @@ Möchten sie qBittorrent wirklich beenden? Suche - + Delete Löschen - + Rename Umbenennen - + Refresh Aktualisieren @@ -2517,70 +2517,75 @@ Möchten sie qBittorrent wirklich beenden? Erstellen - + Delete selected streams Lösche ausgewählte Streams - + Refresh RSS streams Aktualisiere RSS Streams - + Add a new RSS stream neuen RSS Stream hinzufügen - + <b>News:</b> <i>(double-click to open the link in your web browser)</i> <b>News:</b> <i>(Doppelklick um den Link im Webbrowser zu öffnen)</i> - + Add RSS stream RSS Stream hinzufügen - + Refresh all streams Aktualisiere alle Streams - + RSS streams: RSS Streams: - + 2 2 + + + Mark all as read + + RSSImp - + Please type a rss stream url Bitte eine RSS Stream Adresse eingeben - + Stream URL: Stream URL: - + Please choose a new name for this stream Bitte wählen sie einen neuen Namen für diesen Stream - + New stream name: Neuer Stream Name: - + Are you sure? -- qBittorrent Sind Sie sicher? -- qBittorrent @@ -2590,12 +2595,12 @@ Möchten sie qBittorrent wirklich beenden? Möchten sie den Stream wirklich aus der Liste löschen? - + &Yes &Ja - + &No &Nein @@ -2610,32 +2615,32 @@ Möchten sie qBittorrent wirklich beenden? keine Beschreibung verfügbar - + Are you sure you want to delete this stream from the list? Möchten sie den Stream wirklich aus der Liste löschen? - + Description: Beschreibung: - + url: URL: - + Last refresh: Letzte Aktualisierung: - + qBittorrent qBittorrent - + This rss feed is already in the list. Dieser RSS-Feed ist bereits in der Liste. @@ -2651,13 +2656,13 @@ Möchten sie qBittorrent wirklich beenden? RssStream - + %1 ago 10min ago vor %1 - + Never Niemals diff --git a/src/lang/qbittorrent_el.qm b/src/lang/qbittorrent_el.qm index 489d7b280..088de0430 100644 Binary files a/src/lang/qbittorrent_el.qm and b/src/lang/qbittorrent_el.qm differ diff --git a/src/lang/qbittorrent_el.ts b/src/lang/qbittorrent_el.ts index f57d8dccd..82db4ae9f 100644 --- a/src/lang/qbittorrent_el.ts +++ b/src/lang/qbittorrent_el.ts @@ -2603,17 +2603,17 @@ Are you sure you want to quit qBittorrent? Αναζήτηση - + Delete Διαγραφή - + Rename Μςτονομασία - + Refresh Ανανέωση @@ -2623,110 +2623,115 @@ Are you sure you want to quit qBittorrent? Δημιουργία - + Delete selected streams Διαγραφή επιλεγμένων τροφοδοτήσεων - + Refresh RSS streams Ανανέωση RSS τροφοδοτήσεων - + Add a new RSS stream Προσθήκη μιας νέας τροφοδότησης RSS - + <b>News:</b> <i>(double-click to open the link in your web browser)</i> <b>Νέα:</b> <i>(διπλό κλικ για άνοιγμα της σελίδας στον περιηγητή σας)</i> - + Add RSS stream Προσθήκη τροφοδότησης RSS - + Refresh all streams Ανανέωση όλων των τροφοδοτήσεων - + RSS streams: Τροφοδοτήσεις RSS: - + 2 2 + + + Mark all as read + + RSSImp - + Please type a rss stream url Παρακαλώ εισάγετε ένα url τροφοδοσίας rss - + Stream URL: URL τροφοδοσίας: - + Please choose a new name for this stream Παρακαλώ επιέξτε ένα νέο όνομα για αυτήν την τροφοδοσία - + New stream name: Νέο όνομα τροφοδοσίας: - + Are you sure? -- qBittorrent Είστε σίγουρος? -- qBittorrent - + &Yes &Ναι - + &No &Όχι - + Are you sure you want to delete this stream from the list? Είστε σίγουρος οτι θέλετε να διαγράψετε αυτή τη τροφοδοσία από τη λίστα? - + Description: Περιγραφή: - + url: url: - + Last refresh: Τελευταία ανανέωση: - + qBittorrent qBittorrent - + This rss feed is already in the list. Αυτή η τροφοδοσία rss είναι ήδη στη λίστα. @@ -2742,13 +2747,13 @@ Are you sure you want to quit qBittorrent? RssStream - + %1 ago 10min ago %1 πριν - + Never Ποτέ diff --git a/src/lang/qbittorrent_en.qm b/src/lang/qbittorrent_en.qm index acb64df82..0943c1613 100644 Binary files a/src/lang/qbittorrent_en.qm and b/src/lang/qbittorrent_en.qm differ diff --git a/src/lang/qbittorrent_en.ts b/src/lang/qbittorrent_en.ts index d40f0bf3e..c059a3e04 100644 --- a/src/lang/qbittorrent_en.ts +++ b/src/lang/qbittorrent_en.ts @@ -1220,125 +1220,130 @@ Are you sure you want to quit qBittorrent? - + Delete - + Rename - + Refresh - + Delete selected streams - + Refresh RSS streams - + Add a new RSS stream - + <b>News:</b> <i>(double-click to open the link in your web browser)</i> - + Add RSS stream - + Refresh all streams - + RSS streams: - + 2 + + + Mark all as read + + RSSImp - + Please type a rss stream url - + Stream URL: - + Please choose a new name for this stream - + New stream name: - + Are you sure? -- qBittorrent - + &Yes - + &No - + Are you sure you want to delete this stream from the list? - + Description: - + url: - + Last refresh: - + qBittorrent - + This rss feed is already in the list. @@ -1354,13 +1359,13 @@ Are you sure you want to quit qBittorrent? RssStream - + %1 ago 10min ago - + Never diff --git a/src/lang/qbittorrent_es.qm b/src/lang/qbittorrent_es.qm index 75f7c00c6..99757ccea 100644 Binary files a/src/lang/qbittorrent_es.qm and b/src/lang/qbittorrent_es.qm differ diff --git a/src/lang/qbittorrent_es.ts b/src/lang/qbittorrent_es.ts index ba5eb1a09..616ebf475 100644 --- a/src/lang/qbittorrent_es.ts +++ b/src/lang/qbittorrent_es.ts @@ -2532,17 +2532,17 @@ Are you sure you want to quit qBittorrent? Buscar - + Delete Borrar - + Rename Renombrar - + Refresh Actualizar @@ -2552,110 +2552,115 @@ Are you sure you want to quit qBittorrent? Crear - + Delete selected streams Borrar los flujos seleccionados - + Refresh RSS streams Actualizar los flujos de RSS - + Add a new RSS stream Agregar un nuevo flujo de RSS - + <b>News:</b> <i>(double-click to open the link in your web browser)</i> <b>Noticias: </b> <i>(da doble clic para abrir el vínculo en tu navegador)</i> - + Add RSS stream Agregar flujo RSS - + Refresh all streams Actualizar todos los flujos - + RSS streams: Flujos RSS: - + 2 2 + + + Mark all as read + + RSSImp - + Please type a rss stream url Por favor escribe una URL de flujo de RSS - + Stream URL: URL del flujo: - + Please choose a new name for this stream Por favor selecciona un nuevo nombre para este flujo - + New stream name: Nuevo nombre del flujo: - + Are you sure? -- qBittorrent ¿Estás seguro? -- qBittorrent - + &Yes &Sí - + &No &No - + Are you sure you want to delete this stream from the list? ¿Estás seguro de que deseas borrar este flujo de la lista? - + Description: Descripción: - + url: url: - + Last refresh: Última actualización: - + qBittorrent qBittorrent - + This rss feed is already in the list. Esta fuente de rss ya está en la lista. @@ -2671,13 +2676,13 @@ Are you sure you want to quit qBittorrent? RssStream - + %1 ago 10min ago Hace %1 - + Never Nunca diff --git a/src/lang/qbittorrent_fi.qm b/src/lang/qbittorrent_fi.qm index 27fcb9535..627ccd93b 100644 Binary files a/src/lang/qbittorrent_fi.qm and b/src/lang/qbittorrent_fi.qm differ diff --git a/src/lang/qbittorrent_fi.ts b/src/lang/qbittorrent_fi.ts index 620e34cf4..0c3b7081d 100644 --- a/src/lang/qbittorrent_fi.ts +++ b/src/lang/qbittorrent_fi.ts @@ -2007,17 +2007,17 @@ Are you sure you want to quit qBittorrent? Etsi - + Delete Poista - + Rename - + Refresh @@ -2027,110 +2027,115 @@ Are you sure you want to quit qBittorrent? Luo - + Delete selected streams - + Refresh RSS streams - + Add a new RSS stream - + <b>News:</b> <i>(double-click to open the link in your web browser)</i> - + Add RSS stream - + Refresh all streams - + RSS streams: - + 2 2 + + + Mark all as read + + RSSImp - + Please type a rss stream url - + Stream URL: - + Please choose a new name for this stream - + New stream name: - + Are you sure? -- qBittorrent Oletko varma? — qBittorrent - + &Yes &Kyllä - + &No &Ei - + Are you sure you want to delete this stream from the list? - + Description: - + url: - + Last refresh: - + qBittorrent - + This rss feed is already in the list. @@ -2146,13 +2151,13 @@ Are you sure you want to quit qBittorrent? RssStream - + %1 ago 10min ago - + Never diff --git a/src/lang/qbittorrent_fr.qm b/src/lang/qbittorrent_fr.qm index 245e81cf1..edba1c6e3 100644 Binary files a/src/lang/qbittorrent_fr.qm and b/src/lang/qbittorrent_fr.qm differ diff --git a/src/lang/qbittorrent_fr.ts b/src/lang/qbittorrent_fr.ts index 2178c2943..4729ea751 100644 --- a/src/lang/qbittorrent_fr.ts +++ b/src/lang/qbittorrent_fr.ts @@ -2686,17 +2686,17 @@ Etes-vous certain de vouloir quitter qBittorrent ? Recherche - + Delete Supprimer - + Rename Renommer - + Refresh Rafraîchir @@ -2711,65 +2711,70 @@ Etes-vous certain de vouloir quitter qBittorrent ? Flux RSS : - + Delete selected streams Supprimer les flux sélectionnés - + Refresh RSS streams Rafraîchir les flux RSS - + Add a new RSS stream Ajouter un flux RSS - + <b>News:</b> <i>(double-click to open the link in your web browser)</i> <b>Articles :</b> <i>(double-clic pour ouvrir le lien dans votre navigateur)</i> - + Add RSS stream Ajouter un flux RSS - + Refresh all streams Rafraîchir tous les flux - + RSS streams: Flux RSS : - + 2 + + + Mark all as read + + RSSImp - + Please type a rss stream url Veuillez entrer l'url du flux RSS - + Stream URL: URL du flux : - + Please choose a new name for this stream Veuillez choisir un nouveau nom pour ce flux - + New stream name: Nouveau nom de flux : @@ -2779,7 +2784,7 @@ Etes-vous certain de vouloir quitter qBittorrent ? Aucune description disponible - + Are you sure? -- qBittorrent Etes vous sûr ? -- qBittorrent @@ -2789,12 +2794,12 @@ Etes-vous certain de vouloir quitter qBittorrent ? Etes-vous certain de vouloir supprimer ce flux de la liste ? - + &Yes &Oui - + &No &Non @@ -2809,32 +2814,32 @@ Etes-vous certain de vouloir quitter qBittorrent ? Aucune description disponible - + Are you sure you want to delete this stream from the list? Etes-vous certain de vouloir supprimer ce flux de la liste ? - + Description: Description : - + url: url : - + Last refresh: Dernier rafraîchissement : - + qBittorrent qBittorrent - + This rss feed is already in the list. Cette source RSS est déjà dans votre liste. @@ -2850,13 +2855,13 @@ Etes-vous certain de vouloir quitter qBittorrent ? RssStream - + %1 ago 10min ago il y a %1 - + Never Jamais diff --git a/src/lang/qbittorrent_hu.qm b/src/lang/qbittorrent_hu.qm index e5387424a..e3226fa3c 100644 Binary files a/src/lang/qbittorrent_hu.qm and b/src/lang/qbittorrent_hu.qm differ diff --git a/src/lang/qbittorrent_hu.ts b/src/lang/qbittorrent_hu.ts index ceeaef4c8..967e102f9 100644 --- a/src/lang/qbittorrent_hu.ts +++ b/src/lang/qbittorrent_hu.ts @@ -1743,85 +1743,90 @@ Mégis leállítod a qBittorrentet? Keresés - + Delete Törlés - + Rename Átnevezés - + Refresh Frissítés - + Delete selected streams Kijelölt csatornák törlése - + Refresh RSS streams RSS csatornák ellenőrzése - + Add a new RSS stream RSS hírcsatorna hozzáadása - + <b>News:</b> <i>(double-click to open the link in your web browser)</i> <b>Hírek:</b> <i>(dupla kattintás a böngészőben való megtekintéshez)</i> - + Add RSS stream RSS csatorna hozzádása - + Refresh all streams Összes csatorna ellenőrzése - + RSS streams: Hírcsatornák: - + 2 2 + + + Mark all as read + + RSSImp - + Please type a rss stream url Kérlek add meg a csatorna url címét - + Stream URL: Csatorna címe: - + Please choose a new name for this stream Kérlek válassz új nevet a csatornának - + New stream name: Az új név: - + Are you sure? -- qBittorrent Egészen biztos? -- qBittorrent @@ -1831,12 +1836,12 @@ Mégis leállítod a qBittorrentet? Egészen biztos, hogy törlöd ezt a hírcsatornát a listáról? - + &Yes &Igen - + &No &Nem @@ -1851,32 +1856,32 @@ Mégis leállítod a qBittorrentet? Nincs leírás - + Are you sure you want to delete this stream from the list? Egészen biztos, hogy törlöd ezt a hírcsatornát a listáról? - + Description: Leírás: - + url: url: - + Last refresh: Utolsó frissítés: - + qBittorrent qBittorrent - + This rss feed is already in the list. Ez a hírcsatorna már felvéve. @@ -1892,13 +1897,13 @@ Mégis leállítod a qBittorrentet? RssStream - + %1 ago 10min ago %1 előtt - + Never Soha diff --git a/src/lang/qbittorrent_it.qm b/src/lang/qbittorrent_it.qm index 877dac9fd..ceb0a8562 100644 Binary files a/src/lang/qbittorrent_it.qm and b/src/lang/qbittorrent_it.qm differ diff --git a/src/lang/qbittorrent_it.ts b/src/lang/qbittorrent_it.ts index cf982459a..e0e223114 100644 --- a/src/lang/qbittorrent_it.ts +++ b/src/lang/qbittorrent_it.ts @@ -2237,17 +2237,17 @@ Sei sicuro di voler uscire da qBittorrent? Ricerca - + Delete Cancella - + Rename Rinomina - + Refresh Aggiorna @@ -2257,70 +2257,75 @@ Sei sicuro di voler uscire da qBittorrent? Crea - + Delete selected streams Cancella i flussi selezionati - + Refresh RSS streams Aggiorna i flussi RSS - + Add a new RSS stream Aggiungi un nuovo flusso RSS - + <b>News:</b> <i>(double-click to open the link in your web browser)</i> <b>News:</b> <i>(doppio-clic per aprire il link nel tuo browser web)</i> - + Add RSS stream Aggiungi flusso RSS - + Refresh all streams Aggiorna tutti i flussi - + RSS streams: Flussi RSS: - + 2 2 + + + Mark all as read + + RSSImp - + Please type a rss stream url Per favore digitare l'url di un flusso rss - + Stream URL: URL del flusso: - + Please choose a new name for this stream Per favore scegliere un nuovo nome per questo flusso - + New stream name: Nuovo nome del flusso: - + Are you sure? -- qBittorrent Sei sicuro? -- qBittorrent @@ -2330,42 +2335,42 @@ Sei sicuro di voler uscire da qBittorrent? Sei sicuro di voler cancellare questo flusso dalla lista ? - + &Yes &Sì - + &No &No - + Are you sure you want to delete this stream from the list? Sei sicuro di voler cancellare questo flusso dalla lista? - + Description: Descrizione: - + url: url: - + Last refresh: Ultimo aggiornamento: - + qBittorrent qBittorrent - + This rss feed is already in the list. Questo feed rss è già nella lista. @@ -2381,13 +2386,13 @@ Sei sicuro di voler uscire da qBittorrent? RssStream - + %1 ago 10min ago %1 fa - + Never Mai diff --git a/src/lang/qbittorrent_ja.qm b/src/lang/qbittorrent_ja.qm index cf1b362ae..cc34184eb 100644 Binary files a/src/lang/qbittorrent_ja.qm and b/src/lang/qbittorrent_ja.qm differ diff --git a/src/lang/qbittorrent_ja.ts b/src/lang/qbittorrent_ja.ts index cbe4f2789..f520c6f8e 100644 --- a/src/lang/qbittorrent_ja.ts +++ b/src/lang/qbittorrent_ja.ts @@ -1808,7 +1808,7 @@ qBittorrent を終了してもよろしいですか? 検索 - + RSS streams: RSS ストリーム: @@ -1818,17 +1818,17 @@ qBittorrent を終了してもよろしいですか? ニュース: - + Delete 削除 - + Rename 名前の変更 - + Refresh 更新 @@ -1843,60 +1843,65 @@ qBittorrent を終了してもよろしいですか? RSS ストリーム : - + Delete selected streams 選択されたストリームを削除します - + Refresh RSS streams RSS ストリームの更新 - + Add a new RSS stream 新しい RSS ストリームを追加します - + <b>News:</b> <i>(double-click to open the link in your web browser)</i> <b>ニュース:</b> <i>(お使いの web ブラウザでリンクを開くにはダブルクリックします)</i> - + Add RSS stream RSS ストリームの追加 - + Refresh all streams すべてのストリームの更新 - + 2 2 + + + Mark all as read + + RSSImp - + Please type a rss stream url rss ストリームの url を入力してください - + Stream URL: ストリームの URL: - + Please choose a new name for this stream このストリームの新しい名前を選択してください - + New stream name: 新しいストリーム名: @@ -1906,7 +1911,7 @@ qBittorrent を終了してもよろしいですか? 利用可能な説明がありません - + Are you sure? -- qBittorrent よろしいですか? -- qBittorrent @@ -1916,12 +1921,12 @@ qBittorrent を終了してもよろしいですか? 一覧からこのストリームを削除してもよろしいですか ? - + &Yes はい(&Y) - + &No いいえ(&N) @@ -1931,32 +1936,32 @@ qBittorrent を終了してもよろしいですか? 更新なし - + Are you sure you want to delete this stream from the list? 一覧からこのストリームを削除してもよろしいですか ? - + Description: 説明: - + url: url: - + Last refresh: 最後の更新: - + qBittorrent qBittorrent - + This rss feed is already in the list. この rss フィードはすでに一覧にあります。 @@ -1972,13 +1977,13 @@ qBittorrent を終了してもよろしいですか? RssStream - + %1 ago 10min ago %1 前 - + Never しない diff --git a/src/lang/qbittorrent_ko.qm b/src/lang/qbittorrent_ko.qm index bf3f2987a..062db1f98 100644 Binary files a/src/lang/qbittorrent_ko.qm and b/src/lang/qbittorrent_ko.qm differ diff --git a/src/lang/qbittorrent_ko.ts b/src/lang/qbittorrent_ko.ts index 307a8d759..4daa8cc88 100644 --- a/src/lang/qbittorrent_ko.ts +++ b/src/lang/qbittorrent_ko.ts @@ -2546,17 +2546,17 @@ Are you sure you want to quit qBittorrent? 검색 - + Delete 삭제 - + Rename 이름 바꾸기 - + Refresh 새로 고침 @@ -2566,110 +2566,115 @@ Are you sure you want to quit qBittorrent? 생성하기 - + Delete selected streams 선택된 스트림 삭제하기 - + Refresh RSS streams RSS 스트림 새로고침 - + Add a new RSS stream 새 RSS 스트림 추가 - + <b>News:</b> <i>(double-click to open the link in your web browser)</i> <b>뉴스:</b> <i>(링크를 웹브라우저에서 열려면 더블 클릭하세요)</i> - + Add RSS stream RSS 스트림 추가 - + Refresh all streams 모든 스트림 새로고침 - + RSS streams: RSS 스트림: - + 2 2 + + + Mark all as read + + RSSImp - + Please type a rss stream url RSS 스트림 주소(url)를 입력하세요 - + Stream URL: 스트림 URL: - + Please choose a new name for this stream 이 스트림의 이름을 입력하세요 - + New stream name: 새 스트림 이름: - + Are you sure? -- qBittorrent 재확인 해주십시요? -- 큐비토런트 - + &Yes &예 - + &No &아니요 - + Are you sure you want to delete this stream from the list? 이 스트림을 리스트에서 지우시겠습니까? - + Description: 설명: - + url: - + Last refresh: 최근 새로고침: - + qBittorrent 큐비토런트 - + This rss feed is already in the list. 이 RSS 피드는 이미 리스트에 포함되어 있습니다. @@ -2685,13 +2690,13 @@ Are you sure you want to quit qBittorrent? RssStream - + %1 ago 10min ago %1분전 - + Never 전혀 사용안함 diff --git a/src/lang/qbittorrent_nb.qm b/src/lang/qbittorrent_nb.qm index 881ca778f..f87ee6d9e 100644 Binary files a/src/lang/qbittorrent_nb.qm and b/src/lang/qbittorrent_nb.qm differ diff --git a/src/lang/qbittorrent_nb.ts b/src/lang/qbittorrent_nb.ts index 2e43ce22a..39b94761d 100644 --- a/src/lang/qbittorrent_nb.ts +++ b/src/lang/qbittorrent_nb.ts @@ -2110,17 +2110,17 @@ Are you sure you want to quit qBittorrent? Søk - + Delete Slett - + Rename - + Refresh @@ -2130,110 +2130,115 @@ Are you sure you want to quit qBittorrent? Opprett - + Delete selected streams - + Refresh RSS streams - + Add a new RSS stream - + <b>News:</b> <i>(double-click to open the link in your web browser)</i> - + Add RSS stream - + Refresh all streams - + RSS streams: - + 2 2 + + + Mark all as read + + RSSImp - + Please type a rss stream url - + Stream URL: - + Please choose a new name for this stream - + New stream name: - + Are you sure? -- qBittorrent Er du sikker? -- qBittorrent - + &Yes &Ja - + &No &Nei - + Are you sure you want to delete this stream from the list? - + Description: - + url: - + Last refresh: - + qBittorrent qBittorrent - + This rss feed is already in the list. @@ -2249,13 +2254,13 @@ Are you sure you want to quit qBittorrent? RssStream - + %1 ago 10min ago - + Never diff --git a/src/lang/qbittorrent_nl.qm b/src/lang/qbittorrent_nl.qm index 4b38e4b9a..788e252e1 100644 Binary files a/src/lang/qbittorrent_nl.qm and b/src/lang/qbittorrent_nl.qm differ diff --git a/src/lang/qbittorrent_nl.ts b/src/lang/qbittorrent_nl.ts index 1ae8bbd0b..cb4bda072 100644 --- a/src/lang/qbittorrent_nl.ts +++ b/src/lang/qbittorrent_nl.ts @@ -2502,17 +2502,17 @@ Weet u zeker dat u qBittorrent wilt afsluiten? Zoeken - + Delete Verwijderen - + Rename Hernoemen - + Refresh Vernieuwen @@ -2522,110 +2522,115 @@ Weet u zeker dat u qBittorrent wilt afsluiten? Maken - + Delete selected streams Geselecteerde stream verwijderen - + Refresh RSS streams Vernieuw RRS streams - + Add a new RSS stream Voeg een nieuwe RSS stream toe - + <b>News:</b> <i>(double-click to open the link in your web browser)</i> <b>Nieuws:</b> <i>(dubbel-klik om de link in uw webbrowser te openen)</i> - + Add RSS stream RSS stream toevoegen - + Refresh all streams Alle streams vernieuwen - + RSS streams: RSS streams: - + 2 2 + + + Mark all as read + + RSSImp - + Please type a rss stream url Geef alstublieft een rss stream url - + Stream URL: Stream URL: - + Please choose a new name for this stream Kies een nieuwe naam voor deze stream - + New stream name: Nieuwe stream naam: - + Are you sure? -- qBittorrent Weet u het zeker? -- qBittorrent - + &Yes &Ja - + &No &Nee - + Are you sure you want to delete this stream from the list? Weet u zeker dat u deze stream van de lijst wilt verwijderen? - + Description: Omschrijving: - + url: url: - + Last refresh: Laatste vernieuwing: - + qBittorrent qBittorrent - + This rss feed is already in the list. Deze rss feed staat al in de lijst. @@ -2641,13 +2646,13 @@ Weet u zeker dat u qBittorrent wilt afsluiten? RssStream - + %1 ago 10min ago %1 geleden - + Never Nooit diff --git a/src/lang/qbittorrent_pl.qm b/src/lang/qbittorrent_pl.qm index 83031bc50..653a98793 100644 Binary files a/src/lang/qbittorrent_pl.qm and b/src/lang/qbittorrent_pl.qm differ diff --git a/src/lang/qbittorrent_pl.ts b/src/lang/qbittorrent_pl.ts index fa600a3c1..15c30148a 100644 --- a/src/lang/qbittorrent_pl.ts +++ b/src/lang/qbittorrent_pl.ts @@ -2595,17 +2595,17 @@ Czy napewno zamknąć qBittorrent? Szukaj - + Delete Skasuj - + Rename Zmień nazwę - + Refresh Odśwież @@ -2615,70 +2615,75 @@ Czy napewno zamknąć qBittorrent? Utwórz - + Delete selected streams Usuń wybrane strumienie - + Refresh RSS streams Odśwież strumień RSS - + Add a new RSS stream Dodaj nowy strumień RSS - + <b>News:</b> <i>(double-click to open the link in your web browser)</i> <b>News:</b> <i>(kliknij dwa razy aby otworzyć link w przeglądarce)</i> - + Add RSS stream Dodaj strumień RSS - + Refresh all streams Odśwież wszystkie strumienie - + RSS streams: Strumienie RSS: - + 2 2 + + + Mark all as read + + RSSImp - + Please type a rss stream url Sprecyzuj typ url strumienia rss - + Stream URL: Strumień URL: - + Please choose a new name for this stream Wybierz nową nazwę dla tego strumienia - + New stream name: Nowa nazwa strumienia: - + Are you sure? -- qBittorrent Jesteś pewny? -- qBittorrent @@ -2688,12 +2693,12 @@ Czy napewno zamknąć qBittorrent? Jesteś pewien że chcesz usunąć ten strumień z listy? - + &Yes &Tak - + &No &Nie @@ -2708,32 +2713,32 @@ Czy napewno zamknąć qBittorrent? żaden opis niedostępny - + Are you sure you want to delete this stream from the list? Jesteś pewien że chcesz usunąć ten strumień z listy? - + Description: Opis: - + url: url: - + Last refresh: Ostatnie odświeżanie: - + qBittorrent qBittorrent - + This rss feed is already in the list. Ten kanał informacyjny rss feed już jest na liście. @@ -2749,13 +2754,13 @@ Czy napewno zamknąć qBittorrent? RssStream - + %1 ago 10min ago %1 temu - + Never Nigdy diff --git a/src/lang/qbittorrent_pt.qm b/src/lang/qbittorrent_pt.qm index 1191d0a72..c935c3e5d 100644 Binary files a/src/lang/qbittorrent_pt.qm and b/src/lang/qbittorrent_pt.qm differ diff --git a/src/lang/qbittorrent_pt.ts b/src/lang/qbittorrent_pt.ts index aaf2aa1d1..bf48127c8 100644 --- a/src/lang/qbittorrent_pt.ts +++ b/src/lang/qbittorrent_pt.ts @@ -2359,17 +2359,17 @@ Deseja mesmo sair do qBittorrent? Busca - + Delete Apagar - + Rename Renomear - + Refresh Atualizar @@ -2379,70 +2379,75 @@ Deseja mesmo sair do qBittorrent? Criar - + Delete selected streams Deletar streams selecionadas - + Refresh RSS streams Atualizar RSS streams - + Add a new RSS stream Adicionar um novo stream de RSS - + <b>News:</b> <i>(double-click to open the link in your web browser)</i> <b>Info:</b> <i>(clique-duplo para abrir o link no seu browser)</i> - + Add RSS stream Adicionar stream RSS - + Refresh all streams Atualizar todos streams - + RSS streams: streams RSS: - + 2 2 + + + Mark all as read + + RSSImp - + Please type a rss stream url Digite uma url de stream rss - + Stream URL: Stream URL: - + Please choose a new name for this stream Escolha um novo nome para esse stream - + New stream name: Novo nome do stream: - + Are you sure? -- qBittorrent Tem certeza? -- qBittorrent @@ -2452,42 +2457,42 @@ Deseja mesmo sair do qBittorrent? Quer mesmo deletar este stream da lista ? - + &Yes &Sim - + &No &Não - + Are you sure you want to delete this stream from the list? Quer mesmo deletar este stream da lista ? - + Description: Descrição: - + url: url: - + Last refresh: Última atualização: - + qBittorrent qBittorrent - + This rss feed is already in the list. @@ -2503,13 +2508,13 @@ Deseja mesmo sair do qBittorrent? RssStream - + %1 ago 10min ago %1 atrás - + Never diff --git a/src/lang/qbittorrent_pt_BR.qm b/src/lang/qbittorrent_pt_BR.qm index 1191d0a72..c935c3e5d 100644 Binary files a/src/lang/qbittorrent_pt_BR.qm and b/src/lang/qbittorrent_pt_BR.qm differ diff --git a/src/lang/qbittorrent_pt_BR.ts b/src/lang/qbittorrent_pt_BR.ts index aaf2aa1d1..bf48127c8 100644 --- a/src/lang/qbittorrent_pt_BR.ts +++ b/src/lang/qbittorrent_pt_BR.ts @@ -2359,17 +2359,17 @@ Deseja mesmo sair do qBittorrent? Busca - + Delete Apagar - + Rename Renomear - + Refresh Atualizar @@ -2379,70 +2379,75 @@ Deseja mesmo sair do qBittorrent? Criar - + Delete selected streams Deletar streams selecionadas - + Refresh RSS streams Atualizar RSS streams - + Add a new RSS stream Adicionar um novo stream de RSS - + <b>News:</b> <i>(double-click to open the link in your web browser)</i> <b>Info:</b> <i>(clique-duplo para abrir o link no seu browser)</i> - + Add RSS stream Adicionar stream RSS - + Refresh all streams Atualizar todos streams - + RSS streams: streams RSS: - + 2 2 + + + Mark all as read + + RSSImp - + Please type a rss stream url Digite uma url de stream rss - + Stream URL: Stream URL: - + Please choose a new name for this stream Escolha um novo nome para esse stream - + New stream name: Novo nome do stream: - + Are you sure? -- qBittorrent Tem certeza? -- qBittorrent @@ -2452,42 +2457,42 @@ Deseja mesmo sair do qBittorrent? Quer mesmo deletar este stream da lista ? - + &Yes &Sim - + &No &Não - + Are you sure you want to delete this stream from the list? Quer mesmo deletar este stream da lista ? - + Description: Descrição: - + url: url: - + Last refresh: Última atualização: - + qBittorrent qBittorrent - + This rss feed is already in the list. @@ -2503,13 +2508,13 @@ Deseja mesmo sair do qBittorrent? RssStream - + %1 ago 10min ago %1 atrás - + Never diff --git a/src/lang/qbittorrent_ro.qm b/src/lang/qbittorrent_ro.qm index 334cab4a5..8e40212e5 100644 Binary files a/src/lang/qbittorrent_ro.qm and b/src/lang/qbittorrent_ro.qm differ diff --git a/src/lang/qbittorrent_ro.ts b/src/lang/qbittorrent_ro.ts index 485781173..5cf4a5598 100644 --- a/src/lang/qbittorrent_ro.ts +++ b/src/lang/qbittorrent_ro.ts @@ -2275,17 +2275,17 @@ Doriţi să ieşiţi din qBittorrent? Caută - + Delete Şterge - + Rename Redenumeşte - + Refresh Reînnoieşte @@ -2295,110 +2295,115 @@ Doriţi să ieşiţi din qBittorrent? Crează - + Delete selected streams Şterge itemul selectat - + Refresh RSS streams Reînnoieşte firul RSS - + Add a new RSS stream Adaugă un nou fir RSS - + <b>News:</b> <i>(double-click to open the link in your web browser)</i> <b>Noutăţi:</b> <i>(dubli click pentru a deschide)</i> - + Add RSS stream Adaugă RSS fir - + Refresh all streams Reînnoieşte toate firele - + RSS streams: Fire RSS: - + 2 2 + + + Mark all as read + + RSSImp - + Please type a rss stream url Introduceţi adresa URL la RSS fir - + Stream URL: Adresa URL: - + Please choose a new name for this stream Alegeţi un nume nou la acest fir - + New stream name: Numele nou: - + Are you sure? -- qBittorrent Sunteţi siguri? -- qBittorrent - + &Yes &Yes - + &No &No - + Are you sure you want to delete this stream from the list? Doriţi să ştergeţi acest fir din listă ? - + Description: Descriere: - + url: URL: - + Last refresh: Ultima reînnoire: - + qBittorrent qBittorrent - + This rss feed is already in the list. Acest RSS este deacum în listă. @@ -2414,13 +2419,13 @@ Doriţi să ieşiţi din qBittorrent? RssStream - + %1 ago 10min ago %1 în urmă - + Never Niciodată diff --git a/src/lang/qbittorrent_ru.qm b/src/lang/qbittorrent_ru.qm index 596d03908..183b51f5a 100644 Binary files a/src/lang/qbittorrent_ru.qm and b/src/lang/qbittorrent_ru.qm differ diff --git a/src/lang/qbittorrent_ru.ts b/src/lang/qbittorrent_ru.ts index aad4e58b1..9261f2588 100644 --- a/src/lang/qbittorrent_ru.ts +++ b/src/lang/qbittorrent_ru.ts @@ -2487,17 +2487,17 @@ Are you sure you want to quit qBittorrent? Поиск - + Delete Удалить - + Rename Переименовать - + Refresh Обновить @@ -2507,110 +2507,115 @@ Are you sure you want to quit qBittorrent? Создать - + Delete selected streams Удалить выбранные потоки - + Refresh RSS streams Обновить RSS потоки - + Add a new RSS stream Добавить новый RSS поток - + <b>News:</b> <i>(double-click to open the link in your web browser)</i> <b>Новости:</b> <i>(двойной клик откроет ссылку в вашем браузере)</i> - + Add RSS stream Добавить RSS поток - + Refresh all streams Обновить все потоки - + RSS streams: RSS потоки: - + 2 2 + + + Mark all as read + + RSSImp - + Please type a rss stream url Введите URL RSS потока - + Stream URL: URL потока: - + Please choose a new name for this stream Выберите новое имя для потока - + New stream name: Новое имя потока: - + Are you sure? -- qBittorrent Вы уверены? -- qBittorrent - + &Yes &Да - + &No &Нет - + Are you sure you want to delete this stream from the list? Вы уверены что хотите удалить этот поток из списка? - + Description: Описание: - + url: URL: - + Last refresh: Последнее обновление: - + qBittorrent qBittorrent - + This rss feed is already in the list. Эта RSS ячейка уже в списке. @@ -2626,13 +2631,13 @@ Are you sure you want to quit qBittorrent? RssStream - + %1 ago 10min ago %1 назад - + Never Никогда diff --git a/src/lang/qbittorrent_sk.qm b/src/lang/qbittorrent_sk.qm index 40a424462..98a505a8c 100644 Binary files a/src/lang/qbittorrent_sk.qm and b/src/lang/qbittorrent_sk.qm differ diff --git a/src/lang/qbittorrent_sk.ts b/src/lang/qbittorrent_sk.ts index e078a8216..74d24019a 100644 --- a/src/lang/qbittorrent_sk.ts +++ b/src/lang/qbittorrent_sk.ts @@ -2385,65 +2385,70 @@ Ste si istý, že chcete ukončiť qBittorrent? Vyhľadávanie - + Delete selected streams Zmazať vybrané streamy - + Refresh RSS streams Obnoviť RSS streamy - + Add a new RSS stream Pridať nový RSS stream - + <b>News:</b> <i>(double-click to open the link in your web browser)</i> <b>Novinky:</b> <i>(dvojitým kliknutím otvoríte odkaz vo webovom prehliadači)</i> - + Delete Zmazať - + Rename Premenovať - + Refresh Obnoviť - + Add RSS stream Pridať RSS stream - + Refresh all streams Obnoviť všetky streamy - + RSS streams: RSS streamy: - + 2 2 + + + Mark all as read + + RSSImp - + Are you sure? -- qBittorrent Ste si istý? -- qBittorrent @@ -2453,62 +2458,62 @@ Ste si istý, že chcete ukončiť qBittorrent? Ste si istý, že chcete zmazať tento stream zo zoznamu? - + &Yes &Áno - + &No &Nie - + Please choose a new name for this stream Prosím, zvoľte nový názov pre tento stream - + New stream name: Nový názov streamu: - + Please type a rss stream url Prosím, napíšte URL RSS streamu - + Stream URL: URL streamu: - + Are you sure you want to delete this stream from the list? Ste si istý, že chcete zmazať tento stream zo zoznamu? - + Description: Popis: - + url: url: - + Last refresh: Posledné obnovenie: - + qBittorrent qBittorrent - + This rss feed is already in the list. Tento RSS feed už je v zozname. @@ -2524,13 +2529,13 @@ Ste si istý, že chcete ukončiť qBittorrent? RssStream - + %1 ago 10min ago pred %1 min - + Never Nikdy diff --git a/src/lang/qbittorrent_sv.qm b/src/lang/qbittorrent_sv.qm index 04feaeace..f04680bd3 100644 Binary files a/src/lang/qbittorrent_sv.qm and b/src/lang/qbittorrent_sv.qm differ diff --git a/src/lang/qbittorrent_sv.ts b/src/lang/qbittorrent_sv.ts index 12d04c336..2068de0c7 100644 --- a/src/lang/qbittorrent_sv.ts +++ b/src/lang/qbittorrent_sv.ts @@ -1663,85 +1663,90 @@ Are you sure you want to quit qBittorrent? Sök - + Delete Ta bort - + Rename Byt namn - + Refresh Uppdatera - + Delete selected streams Ta bort markerade kanaler - + Refresh RSS streams Uppdatera RSS-kanaler - + Add a new RSS stream Lägg till en ny RSS-kanal - + <b>News:</b> <i>(double-click to open the link in your web browser)</i> <b>Nyheter:</b> <i>(dubbelklicka för att öppna länken i din webbläsare)</i> - + Add RSS stream Lägg till RSS-kanal - + Refresh all streams Uppdatera alla kanaler - + RSS streams: RSS-kanaler: - + 2 2 + + + Mark all as read + + RSSImp - + Please type a rss stream url Ange en url för en RSS-kanal - + Stream URL: URL för kanal: - + Please choose a new name for this stream Välj ett nytt namn för den här kanalen - + New stream name: Nytt kanalnamn: - + Are you sure? -- qBittorrent Är du säker? -- qBittorrent @@ -1751,42 +1756,42 @@ Are you sure you want to quit qBittorrent? Är du säker på att du vill ta bort den här kanalen från listan? - + &Yes &Ja - + &No &Nej - + Are you sure you want to delete this stream from the list? Är du säker på att du vill ta bort den här kanalen från listan? - + Description: Beskrivning: - + url: url: - + Last refresh: Senast uppdaterad: - + qBittorrent qBittorrent - + This rss feed is already in the list. Den här kanalen finns redan i listan. @@ -1802,13 +1807,13 @@ Are you sure you want to quit qBittorrent? RssStream - + %1 ago 10min ago %1 sedan - + Never Aldrig diff --git a/src/lang/qbittorrent_tr.qm b/src/lang/qbittorrent_tr.qm index 1bde28ee3..fe25d6876 100644 Binary files a/src/lang/qbittorrent_tr.qm and b/src/lang/qbittorrent_tr.qm differ diff --git a/src/lang/qbittorrent_tr.ts b/src/lang/qbittorrent_tr.ts index 0f8de426f..31af2d03b 100644 --- a/src/lang/qbittorrent_tr.ts +++ b/src/lang/qbittorrent_tr.ts @@ -2465,17 +2465,17 @@ Are you sure you want to quit qBittorrent? Arama - + Delete Sil - + Rename - + Refresh @@ -2485,110 +2485,115 @@ Are you sure you want to quit qBittorrent? Oluştur - + Delete selected streams - + Refresh RSS streams - + Add a new RSS stream - + <b>News:</b> <i>(double-click to open the link in your web browser)</i> - + Add RSS stream - + Refresh all streams - + RSS streams: - + 2 2 + + + Mark all as read + + RSSImp - + Please type a rss stream url - + Stream URL: - + Please choose a new name for this stream - + New stream name: - + Are you sure? -- qBittorrent Emin misiniz? -- qBittorrent - + &Yes &Evet - + &No &Hayır - + Are you sure you want to delete this stream from the list? - + Description: - + url: - + Last refresh: - + qBittorrent qBittorrent - + This rss feed is already in the list. @@ -2604,13 +2609,13 @@ Are you sure you want to quit qBittorrent? RssStream - + %1 ago 10min ago - + Never diff --git a/src/lang/qbittorrent_uk.qm b/src/lang/qbittorrent_uk.qm index 7540ca817..811308617 100644 Binary files a/src/lang/qbittorrent_uk.qm and b/src/lang/qbittorrent_uk.qm differ diff --git a/src/lang/qbittorrent_uk.ts b/src/lang/qbittorrent_uk.ts index d10af3806..b069f773c 100644 --- a/src/lang/qbittorrent_uk.ts +++ b/src/lang/qbittorrent_uk.ts @@ -2497,17 +2497,17 @@ Are you sure you want to quit qBittorrent? Пошук - + Delete Видалити - + Rename Переіменувати - + Refresh Обновити @@ -2517,70 +2517,75 @@ Are you sure you want to quit qBittorrent? Створити - + Delete selected streams Видалити вибрані потоки - + Refresh RSS streams Обновити потоки RSS - + Add a new RSS stream Додати новий потік RSS - + <b>News:</b> <i>(double-click to open the link in your web browser)</i> <b>Новини:</b> <i>(подвійний клік відкриє посилання у вашому броузері)</i> - + Add RSS stream Додать потік RSS - + Refresh all streams Обновити всі потоки - + RSS streams: Потоки RSS: - + 2 2 + + + Mark all as read + + RSSImp - + Please type a rss stream url Будь-ласка, введіть url потоку rss - + Stream URL: URL потоку: - + Please choose a new name for this stream Будь-ласка, виберіть нове ім'я для цього потоку - + New stream name: Нове ім'я потоку: - + Are you sure? -- qBittorrent Ви впевнені? -- qBittorrent @@ -2590,42 +2595,42 @@ Are you sure you want to quit qBittorrent? Ви впевнені що хочете видалити цей потік зі списку? - + &Yes &Так - + &No &Ні - + Are you sure you want to delete this stream from the list? Ви впевнені що хочете видалити цей потік зі списку? - + Description: Опис: - + url: url: - + Last refresh: Останнє обновлення: - + qBittorrent qBittorrent - + This rss feed is already in the list. Цей rss-стрічка вже є в списку. @@ -2641,13 +2646,13 @@ Are you sure you want to quit qBittorrent? RssStream - + %1 ago 10min ago %1 тому - + Never Ніколи diff --git a/src/lang/qbittorrent_zh.qm b/src/lang/qbittorrent_zh.qm index 605149fcc..d59d64129 100644 Binary files a/src/lang/qbittorrent_zh.qm and b/src/lang/qbittorrent_zh.qm differ diff --git a/src/lang/qbittorrent_zh.ts b/src/lang/qbittorrent_zh.ts index ba8db8251..a31b9574c 100644 --- a/src/lang/qbittorrent_zh.ts +++ b/src/lang/qbittorrent_zh.ts @@ -2436,17 +2436,17 @@ Are you sure you want to quit qBittorrent? 搜索 - + Delete 删除 - + Rename 重命名 - + Refresh 重新载入 @@ -2456,70 +2456,75 @@ Are you sure you want to quit qBittorrent? 创建 - + Delete selected streams 删除选中的资源 - + Refresh RSS streams 重新载入RSS资源 - + Add a new RSS stream 加入新RSS资源 - + <b>News:</b> <i>(double-click to open the link in your web browser)</i> <b>新闻:</b> <i>(双击以连接到网页浏览器)</i> - + Add RSS stream 加入RSS资源 - + Refresh all streams 重新载入所有资源 - + RSS streams: RSS资源: - + 2 2 + + + Mark all as read + + RSSImp - + Please type a rss stream url - + Stream URL: 网址资源: - + Please choose a new name for this stream 请选择资源名 - + New stream name: 新资源名: - + Are you sure? -- qBittorrent 确定? -- qBittorrent @@ -2529,42 +2534,42 @@ Are you sure you want to quit qBittorrent? 确定要从列表中删除此资源吗? - + &Yes &是 - + &No &否 - + Are you sure you want to delete this stream from the list? 确定要从列表中删除此资源吗? - + Description: 声明: - + url: 网址: - + Last refresh: 最近重新载入: - + qBittorrent qBittorrent - + This rss feed is already in the list. @@ -2580,13 +2585,13 @@ Are you sure you want to quit qBittorrent? RssStream - + %1 ago 10min ago %1前 - + Never diff --git a/src/options.ui b/src/options.ui index 47baf29ad..2afa47ee7 100644 --- a/src/options.ui +++ b/src/options.ui @@ -5,7 +5,7 @@ 0 0 - 597 + 663 560 @@ -211,6 +211,50 @@ + + + + + + transfer lists refresh interval: + + + + + + + 10 + + + 99999 + + + 1500 + + + + + + + ms + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + @@ -309,8 +353,8 @@ - 20 - 40 + 623 + 20 @@ -322,7 +366,7 @@ Downloads - :/Icons/gear.png + :/Icons/download.png @@ -575,6 +619,19 @@ + + + + Qt::Horizontal + + + + 20 + 20 + + + + @@ -1372,38 +1429,16 @@ - IP Filter + Misc - :/Icons/filter.png + :/Icons/configure.png - - 6 - - - 9 - - - 9 - - - 9 - - - 9 - - - - - Activate IP Filtering - - - - false + true Filter Settings @@ -1424,8 +1459,21 @@ 9 + + + + Activate IP Filtering + + + :/Icons/filter.png + + + + + false + 0 @@ -1503,6 +1551,9 @@ + + false + Add Range @@ -1513,6 +1564,9 @@ + + false + Remove Range @@ -1555,16 +1609,26 @@ + + false + Filter file path: - + + + false + + + + false + ... @@ -1575,6 +1639,126 @@ + + + + RSS + + + + + + + + + 48 + 48 + + + + + 48 + 48 + + + + + + + :/Icons/rss32.png + + + true + + + + + + + + + + + RSS feeds refresh interval: + + + + + + + 1 + + + 999999 + + + 5 + + + + + + + minutes + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + Maximum number of articles per feed: + + + + + + + 9999 + + + 50 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + diff --git a/src/options_imp.cpp b/src/options_imp.cpp index 5d8ab13e2..8a5cb9029 100644 --- a/src/options_imp.cpp +++ b/src/options_imp.cpp @@ -147,6 +147,7 @@ options_imp::options_imp(QWidget *parent):QDialog(parent){ connect(comboStyle, SIGNAL(currentIndexChanged(int)), this, SLOT(enableApplyButton())); connect(checkConfirmExit, SIGNAL(stateChanged(int)), this, SLOT(enableApplyButton())); connect(checkSpeedInTitle, SIGNAL(stateChanged(int)), this, SLOT(enableApplyButton())); + connect(spinRefreshInterval, SIGNAL(valueChanged(QString)), this, SLOT(enableApplyButton())); connect(checkNoSystray, SIGNAL(stateChanged(int)), this, SLOT(enableApplyButton())); connect(checkCloseToSystray, SIGNAL(stateChanged(int)), this, SLOT(enableApplyButton())); connect(checkMinimizeToSysTray, SIGNAL(stateChanged(int)), this, SLOT(enableApplyButton())); @@ -193,11 +194,13 @@ options_imp::options_imp(QWidget *parent):QDialog(parent){ connect(checkRatioRemove, SIGNAL(stateChanged(int)), this, SLOT(enableApplyButton())); connect(spinRatio, SIGNAL(valueChanged(QString)), this, SLOT(enableApplyButton())); connect(spinMaxRatio, SIGNAL(valueChanged(QString)), this, SLOT(enableApplyButton())); - // IP Filter tab + // Misc tab connect(checkIPFilter, SIGNAL(stateChanged(int)), this, SLOT(enableApplyButton())); connect(addFilterRangeButton, SIGNAL(clicked()), this, SLOT(enableApplyButton())); connect(delFilterRangeButton, SIGNAL(clicked()), this, SLOT(enableApplyButton())); connect(textFilterPath, SIGNAL(textChanged(QString)), this, SLOT(enableApplyButton())); + connect(spinRSSRefresh, SIGNAL(valueChanged(QString)), this, SLOT(enableApplyButton())); + connect(spinRSSMaxArticlesPerFeed, SIGNAL(valueChanged(QString)), this, SLOT(enableApplyButton())); // Disable apply Button applyButton->setEnabled(false); if(!QSystemTrayIcon::supportsMessages()){ @@ -256,6 +259,7 @@ void options_imp::saveOptions(){ settings.setValue(QString::fromUtf8("Style"), getStyle()); settings.setValue(QString::fromUtf8("ExitConfirm"), confirmOnExit()); settings.setValue(QString::fromUtf8("SpeedInTitleBar"), speedInTitleBar()); + settings.setValue(QString::fromUtf8("RefreshInterval"), getRefreshInterval()); settings.setValue(QString::fromUtf8("SystrayEnabled"), systrayIntegration()); settings.setValue(QString::fromUtf8("CloseToTray"), closeToTray()); settings.setValue(QString::fromUtf8("MinimizeToTray"), minimizeToTray()); @@ -314,7 +318,8 @@ void options_imp::saveOptions(){ settings.setValue(QString::fromUtf8("MaxRatio"), getDeleteRatio()); // End Bittorrent preferences settings.endGroup(); - // IPFilter preferences + // Misc preferences + // * IPFilter settings.beginGroup("IPFilter"); settings.setValue(QString::fromUtf8("Enabled"), isFilteringEnabled()); if(isFilteringEnabled()){ @@ -322,6 +327,12 @@ void options_imp::saveOptions(){ } // End IPFilter preferences settings.endGroup(); + // * RSS + settings.beginGroup("RSS"); + settings.setValue(QString::fromUtf8("RSSRefresh"), spinRSSRefresh->value()); + settings.setValue(QString::fromUtf8("RSSMaxArticlesPerFeed"), spinRSSMaxArticlesPerFeed->value()); + // End RSS preferences + settings.endGroup(); // End preferences settings.endGroup(); } @@ -389,6 +400,7 @@ void options_imp::loadOptions(){ setStyle(settings.value(QString::fromUtf8("Style"), 4).toInt()); checkConfirmExit->setChecked(settings.value(QString::fromUtf8("ExitConfirm"), true).toBool()); checkSpeedInTitle->setChecked(settings.value(QString::fromUtf8("SpeedInTitleBar"), false).toBool()); + spinRefreshInterval->setValue(settings.value(QString::fromUtf8("RefreshInterval"), 1500).toInt()); checkNoSystray->setChecked(!settings.value(QString::fromUtf8("SystrayEnabled"), true).toBool()); if(!systrayIntegration()) { disableSystrayOptions(); @@ -543,20 +555,25 @@ void options_imp::loadOptions(){ } // End Bittorrent preferences settings.endGroup(); - // IPFilter preferences + // Misc preferences + // * IP Filter settings.beginGroup("IPFilter"); checkIPFilter->setChecked(settings.value(QString::fromUtf8("Enabled"), false).toBool()); if(isFilteringEnabled()) { - filterBox->setEnabled(true); + enableFilter(2); // Enable textFilterPath->setText(settings.value(QString::fromUtf8("File"), QString()).toString()); processFilterFile(textFilterPath->text()); } else { - // Disable + enableFilter(0); // Disable filterBox->setEnabled(false); } - // End IPFilter preferences + // End IP Filter settings.endGroup(); - // End Preferences + // * RSS + settings.beginGroup("RSS"); + spinRSSRefresh->setValue(settings.value(QString::fromUtf8("RSSRefresh"), 5).toInt()); + spinRSSMaxArticlesPerFeed->setValue(settings.value(QString::fromUtf8("RSSMaxArticlesPerFeed"), 50).toInt()); + // End RSS preferences settings.endGroup(); } @@ -586,6 +603,10 @@ bool options_imp::closeToTray() const{ return checkCloseToSystray->isChecked(); } +unsigned int options_imp::getRefreshInterval() const { + return spinRefreshInterval->value(); +} + bool options_imp::confirmOnExit() const{ return checkConfirmExit->isChecked(); } @@ -787,10 +808,20 @@ void options_imp::enableMaxUploadsLimitPerTorrent(int checkBoxValue){ void options_imp::enableFilter(int checkBoxValue){ if(checkBoxValue!=2){ //Disable - filterBox->setEnabled(false); + filtersList->setEnabled(false); + addFilterRangeButton->setEnabled(false); + delFilterRangeButton->setEnabled(false); + lblFilterPath->setEnabled(false); + textFilterPath->setEnabled(false); + browseFilterButton->setEnabled(false); }else{ //enable - filterBox->setEnabled(true); + filtersList->setEnabled(true); + addFilterRangeButton->setEnabled(true); + delFilterRangeButton->setEnabled(true); + lblFilterPath->setEnabled(true); + textFilterPath->setEnabled(true); + browseFilterButton->setEnabled(true); } } diff --git a/src/options_imp.h b/src/options_imp.h index 2c3ed2da2..58946b432 100644 --- a/src/options_imp.h +++ b/src/options_imp.h @@ -56,6 +56,7 @@ class options_imp : public QDialog, private Ui::Dialog{ int getStyle() const; bool confirmOnExit() const; bool speedInTitleBar() const; + unsigned int getRefreshInterval() const; bool systrayIntegration() const; bool minimizeToTray() const; bool closeToTray() const; diff --git a/src/rss.h b/src/rss.h index b8e2a01ed..017f86643 100644 --- a/src/rss.h +++ b/src/rss.h @@ -22,11 +22,6 @@ #ifndef RSS_H #define RSS_H -// MAX ITEM A STREAM -#define STREAM_MAX_ITEM 50 -// 10min -#define STREAM_REFRESH_INTERVAL 600000 - #include #include #include @@ -270,9 +265,9 @@ class RssStream : public QObject{ return tr("%1 ago", "10min ago").arg(misc::userFriendlyDuration((long)(lastRefresh.elapsed()/1000.)).replace("<", "<")); } - unsigned int getLastRefreshElapsed() const{ + int getLastRefreshElapsed() const{ if(!refreshed) - return STREAM_REFRESH_INTERVAL+1; + return -1; return lastRefresh.elapsed(); } @@ -285,6 +280,9 @@ class RssStream : public QObject{ private: // read and create items from a rss document short readDoc(const QDomDocument& doc) { + QSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent")); + unsigned int max_articles = settings.value(QString::fromUtf8("Preferences/RSS/RSSMaxArticlesPerFeed"), 50).toInt(); + qDebug("Reading %d articles max in xml file", max_articles); // is it a rss file ? QDomElement root = doc.documentElement(); if(root.tagName() == QString::fromUtf8("html")){ @@ -319,7 +317,7 @@ class RssStream : public QObject{ else if (property.tagName() == "image") image = property.text(); else if(property.tagName() == "item") { - if(getNbNews() < STREAM_MAX_ITEM) { + if(getNbNews() < max_articles) { listItem.append(new RssItem(property)); } } @@ -333,6 +331,8 @@ class RssStream : public QObject{ // not actually used, it is used to resize the list of item AFTER the update, instead of delete it BEFORE, some troubles void resizeList() { + QSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent")); + unsigned int max_articles = settings.value(QString::fromUtf8("Preferences/RSS/RSSMaxArticlesPerFeed"), 50).toInt(); unsigned short lastindex = 0; QString firstTitle = getItem(0)->getTitle(); unsigned short listsize = getNbNews(); @@ -343,30 +343,31 @@ class RssStream : public QObject{ for(unsigned short i=0; iSTREAM_MAX_ITEM) { - listItem.removeAt(STREAM_MAX_ITEM); + while(getNbNews() > max_articles) { + listItem.removeLast(); } } // existing and opening test after download short openRss(){ + qDebug("openRss() called"); QDomDocument doc("Rss Seed"); QFile fileRss(filePath); if(!fileRss.open(QIODevice::ReadOnly | QIODevice::Text)) { - qDebug("error : open failed, no file or locked, "+filePath.toUtf8()); - if(QFile::exists(filePath)) { - fileRss.remove(); - } - return -1; + qDebug("openRss error : open failed, no file or locked, "+filePath.toUtf8()); + if(QFile::exists(filePath)) { + fileRss.remove(); + } + return -1; } if(!doc.setContent(&fileRss)) { - qDebug("can't read temp file, might be empty"); - fileRss.close(); - if(QFile::exists(filePath)) { - fileRss.remove(); - } - return -1; + qDebug("can't read temp file, might be empty"); + fileRss.close(); + if(QFile::exists(filePath)) { + fileRss.remove(); + } + return -1; } // start reading the xml short return_lecture = readDoc(doc); @@ -386,6 +387,7 @@ class RssManager : public QObject{ QHash streams; downloadThread *downloader; QTimer newsRefresher; + unsigned int refreshInterval; signals: void feedInfosChanged(QString url, QString aliasOrUrl, unsigned int nbUnread); @@ -462,7 +464,7 @@ class RssManager : public QObject{ foreach(stream, streams){ QString url = stream->getUrl(); if(stream->isLoading()) return; - if(stream->getLastRefreshElapsed() < STREAM_REFRESH_INTERVAL) return; + if(stream->getLastRefreshElapsed() != -1 && stream->getLastRefreshElapsed() < (int)refreshInterval) return; qDebug("Refreshing old feed: %s...", (const char*)url.toUtf8()); stream->setLoading(true); downloader->downloadUrl(url); @@ -470,6 +472,14 @@ class RssManager : public QObject{ downloader->downloadUrl(stream->getIconUrl()); } } + // See if refreshInterval has changed + QSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent")); + unsigned int new_refreshInterval = settings.value(QString::fromUtf8("Preferences/RSS/RSSRefresh"), 5).toInt(); + if(new_refreshInterval != refreshInterval) { + refreshInterval = new_refreshInterval; + newsRefresher.stop(); + newsRefresher.start(refreshInterval*60000); + } } public : @@ -479,7 +489,9 @@ class RssManager : public QObject{ connect(downloader, SIGNAL(downloadFailure(QString, QString)), this, SLOT(handleDownloadFailure(QString, QString))); loadStreamList(); connect(&newsRefresher, SIGNAL(timeout()), this, SLOT(refreshOldFeeds())); - newsRefresher.start(60000); // 1min + QSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent")); + refreshInterval = settings.value(QString::fromUtf8("Preferences/RSS/RSSRefresh"), 5).toInt(); + newsRefresher.start(refreshInterval*60000); } ~RssManager(){ diff --git a/src/search.qrc b/src/search.qrc index 474061e7e..af4ee944b 100644 --- a/src/search.qrc +++ b/src/search.qrc @@ -12,5 +12,6 @@ search_engine/engines/piratebay.py search_engine/engines/isohunt.png search_engine/engines/btjunkie.png + search_engine/engines/bittorrent_slow.py \ No newline at end of file