diff --git a/localization/rssguard-cs_CZ.ts b/localization/rssguard-cs_CZ.ts index 7abc8dbb2..a55cd3495 100644 --- a/localization/rssguard-cs_CZ.ts +++ b/localization/rssguard-cs_CZ.ts @@ -1,6 +1,6 @@ - + Application @@ -210,30 +210,6 @@ Tato stránka obsahuje %n kanálů. Text display in status bar when particular feed is updated. Aktualizován kanál '%1' - - Cannot defragment database - Databázi nelze nefragmentovat - - - Database cannot be defragmented because feed update is ongoing. - Databázi nelze defragmentovat, protože právě běží aktualizace kanálů. - - - Database defragmented - Databáze defragmentována - - - Database was successfully defragmented. - Databáze byla úspěšně defragmentována. - - - Database was not defragmented - Database nedefragmentována - - - Database was not defragmented. This database backend does not support it or it cannot be defragmented now. - Databáze nebyla defragmentována. Tento typ databáze defragmentaci neumožňuje nebo databáze nemůže být defragmentována nyní. - Toolbar for feeds Panel kanálů @@ -242,6 +218,14 @@ Tato stránka obsahuje %n kanálů. Error when loading initial feeds Chyba při načítání úvodních kanálů + + Cannot cleanup database + + + + Cannot cleanup database, because another critical action is running. + + FeedsImportExportModel @@ -267,12 +251,10 @@ Tato stránka obsahuje %n kanálů. Titles of feeds/categories. - Feed list header "titles" column tooltip. Názvy kanálů/kategorií. Counts of unread/all meesages. - Feed list header "counts" column tooltip. Počty nepřečtených/všech zpráviček. @@ -770,6 +752,37 @@ Automatický update: %5 Popis je v pořádku. + + FormDatabaseCleanup + + Cleanup database + + + + Cleanup settings + + + + Shrink database file. + + + + Remove all messages older than + + + + Remove all read messages. + + + + day(s) + + den + dny + dnů + + + FormFeedDetails @@ -1247,10 +1260,6 @@ Automatický update: %5 Hides main window if it is visible and shows it if it is hidden. Skryje hlavní ikno, je-li aktuálně viditelné. Jinak jej zobrazí. - - Defragment database file so that its size decreases. - Defragmentuje a optimalizuje databázi. - Hides or shows the list of feeds/categories. Skryje nebo zobrazí seznam kanálů/kategorií. @@ -1367,10 +1376,6 @@ Automatický update: %5 View selected feeds in &newspaper mode Zobrazit vybrané kanály v &novinovém náhledu - - &Defragment database - &Optimalizovat databázi - &Clean all feeds &Vyčistit všechny kanály @@ -1539,6 +1544,10 @@ Automatický update: %5 Send selected message via e-mail Odeslat vybranou zprávu přes e-mail + + &Cleanup database + + FormRestoreDatabaseSettings @@ -1620,9 +1629,7 @@ Automatický update: %5 Language - Language settings section. ----------- -Language column of language list. + Language settings section. Lokalizace @@ -1680,12 +1687,10 @@ Language column of language list. Code - Lang. code column of language list. Kód Version - Version column of skin list. Verze @@ -1759,7 +1764,6 @@ Language column of language list. Name - Skin list name column. Název @@ -2191,7 +2195,7 @@ MySQL backend will automatically use database with name "rssguard". Do Working database - + Mouse gestures work with middle mouse button. Possible gestures are: • previous web page (drag mouse left), • next web page (drag mouse right), @@ -2223,7 +2227,7 @@ MySQL backend will automatically use database with name "rssguard". Do Select client - + Placeholders: • %1 - title of selected message, • %2 - body of selected message. @@ -2401,52 +2405,42 @@ Přejít na web aplikace a stáhnout jej ručně. MessagesModel Id - Tooltip for ID of message. Read - Tooltip for "read" column in msg list. Přečteno Deleted - Tooltip for "deleted" column in msg list. Smazáno Important - Tooltip for "important" column in msg list. Důležité Feed - Tooltip for name of feed for message. Kanál Title - Tooltip for title of message. Nadpis Url - Tooltip for url of message. Author - Tooltip for author of message. Autor Created on - Tooltip for creation date of message. Vytvořeno Contents - Tooltip for contents of message. Obsah @@ -2491,7 +2485,6 @@ Přejít na web aplikace a stáhnout jej ručně. Permanently deleted - Tooltip for "pdeleted" column in msg list. Permanentně smazáno @@ -2500,7 +2493,6 @@ Přejít na web aplikace a stáhnout jej ručně. Attachments - Tooltip for attachments of message. Přílohy @@ -2650,6 +2642,14 @@ Přejít na web aplikace a stáhnout jej ručně. Network status. žádné chyby + + access to content was denied + + + + connection timed out or was cancelled + + QObject diff --git a/localization/rssguard-de_DE.ts b/localization/rssguard-de_DE.ts index b91c51109..49cc28175 100644 --- a/localization/rssguard-de_DE.ts +++ b/localization/rssguard-de_DE.ts @@ -1,6 +1,6 @@ - + Application @@ -203,30 +203,6 @@ This website contains %n feed(s). Text display in status bar when particular feed is updated. Upgedateter feed '%1' - - Cannot defragment database - Kann die Datenbank nicht defragmentieren - - - Database cannot be defragmented because feed update is ongoing. - Die Datenbank kann nicht defragmentiert werden weil der Feed Update noch läuft. - - - Database defragmented - Datenbank defragmentiert - - - Database was successfully defragmented. - Die Datenbank wurde erfolgreich defragmentiert. - - - Database was not defragmented - Die Datenbank wurde nicht defragmentiert - - - Database was not defragmented. This database backend does not support it or it cannot be defragmented now. - Die Datenbank wurde nicht defragmentiert. Dieser Datenbank-Backend hat diese Funktion nicht oder sie kann jetzt nicht defragmentiert werden. - Toolbar for feeds Toolbar für Feeds @@ -235,6 +211,14 @@ This website contains %n feed(s). Error when loading initial feeds + + Cannot cleanup database + + + + Cannot cleanup database, because another critical action is running. + + FeedsImportExportModel @@ -260,12 +244,10 @@ This website contains %n feed(s). Titles of feeds/categories. - Feed list header "titles" column tooltip. Titel der Feeds/Kategorien. Counts of unread/all meesages. - Feed list header "counts" column tooltip. Anzahl ungelesener/aller Nachrichten. @@ -753,6 +735,36 @@ Auto-update status: %5 Die Beschreibung ist OK. + + FormDatabaseCleanup + + Cleanup database + + + + Cleanup settings + + + + Shrink database file. + + + + Remove all messages older than + + + + Remove all read messages. + + + + day(s) + + + + + + FormFeedDetails @@ -1230,10 +1242,6 @@ Auto-update status: %5 Hides main window if it is visible and shows it if it is hidden. Hauptfenster verstecken falls es sichtbar was oder sichtbar falls es versteckt war. - - Defragment database file so that its size decreases. - Defragmentiere die Datenbankdatei so dass sie kleiner wird. - Hides or shows the list of feeds/categories. Versteckt oder zeigt die Liste der Feeds/Kategorien an. @@ -1350,10 +1358,6 @@ Auto-update status: %5 View selected feeds in &newspaper mode - - &Defragment database - - &Clean all feeds @@ -1522,6 +1526,10 @@ Auto-update status: %5 Send selected message via e-mail + + &Cleanup database + + FormRestoreDatabaseSettings @@ -1603,9 +1611,7 @@ Auto-update status: %5 Language - Language settings section. ----------- -Language column of language list. + Language settings section. Sprache @@ -1663,12 +1669,10 @@ Language column of language list. Code - Lang. code column of language list. Code Version - Version column of skin list. Version @@ -1742,7 +1746,6 @@ Language column of language list. Name - Skin list name column. Name @@ -2162,7 +2165,7 @@ MySQL backend will automatically use database with name "rssguard". Do Working database - + Mouse gestures work with middle mouse button. Possible gestures are: • previous web page (drag mouse left), • next web page (drag mouse right), @@ -2194,7 +2197,7 @@ MySQL backend will automatically use database with name "rssguard". Do Select client - + Placeholders: • %1 - title of selected message, • %2 - body of selected message. @@ -2374,52 +2377,42 @@ Go to application website to obtain it manually. MessagesModel Id - Tooltip for ID of message. ID Read - Tooltip for "read" column in msg list. Lesen Deleted - Tooltip for "deleted" column in msg list. Gelöscht Important - Tooltip for "important" column in msg list. Wichtig Feed - Tooltip for name of feed for message. Feed Title - Tooltip for title of message. Titel Url - Tooltip for url of message. Url Author - Tooltip for author of message. Author Created on - Tooltip for creation date of message. Erstellt am Contents - Tooltip for contents of message. Inhalt @@ -2464,7 +2457,6 @@ Go to application website to obtain it manually. Permanently deleted - Tooltip for "pdeleted" column in msg list. @@ -2473,7 +2465,6 @@ Go to application website to obtain it manually. Attachments - Tooltip for attachments of message. @@ -2623,6 +2614,14 @@ Go to application website to obtain it manually. Network status. + + access to content was denied + + + + connection timed out or was cancelled + + QObject diff --git a/localization/rssguard-en_GB.ts b/localization/rssguard-en_GB.ts index 03ecc6a72..52ed9ab82 100644 --- a/localization/rssguard-en_GB.ts +++ b/localization/rssguard-en_GB.ts @@ -1,6 +1,6 @@ - + Application @@ -203,30 +203,6 @@ This website contains %n feed(s). Text display in status bar when particular feed is updated. - - Cannot defragment database - - - - Database cannot be defragmented because feed update is ongoing. - - - - Database defragmented - - - - Database was successfully defragmented. - - - - Database was not defragmented - - - - Database was not defragmented. This database backend does not support it or it cannot be defragmented now. - - Toolbar for feeds @@ -235,6 +211,14 @@ This website contains %n feed(s). Error when loading initial feeds + + Cannot cleanup database + + + + Cannot cleanup database, because another critical action is running. + + FeedsImportExportModel @@ -260,12 +244,10 @@ This website contains %n feed(s). Titles of feeds/categories. - Feed list header "titles" column tooltip. Counts of unread/all meesages. - Feed list header "counts" column tooltip. @@ -753,6 +735,36 @@ Auto-update status: %5 + + FormDatabaseCleanup + + Cleanup database + + + + Cleanup settings + + + + Shrink database file. + + + + Remove all messages older than + + + + Remove all read messages. + + + + day(s) + + + + + + FormFeedDetails @@ -1230,10 +1242,6 @@ Auto-update status: %5 Hides main window if it is visible and shows it if it is hidden. - - Defragment database file so that its size decreases. - - Hides or shows the list of feeds/categories. @@ -1350,10 +1358,6 @@ Auto-update status: %5 View selected feeds in &newspaper mode - - &Defragment database - - &Clean all feeds @@ -1522,6 +1526,10 @@ Auto-update status: %5 Send selected message via e-mail + + &Cleanup database + + FormRestoreDatabaseSettings @@ -1603,9 +1611,7 @@ Auto-update status: %5 Language - Language settings section. ----------- -Language column of language list. + Language settings section. @@ -1663,12 +1669,10 @@ Language column of language list. Code - Lang. code column of language list. Version - Version column of skin list. @@ -1742,7 +1746,6 @@ Language column of language list. Name - Skin list name column. @@ -2160,7 +2163,7 @@ MySQL backend will automatically use database with name "rssguard". Do Working database - + Mouse gestures work with middle mouse button. Possible gestures are: • previous web page (drag mouse left), • next web page (drag mouse right), @@ -2192,7 +2195,7 @@ MySQL backend will automatically use database with name "rssguard". Do Select client - + Placeholders: • %1 - title of selected message, • %2 - body of selected message. @@ -2369,52 +2372,42 @@ Go to application website to obtain it manually. MessagesModel Id - Tooltip for ID of message. Read - Tooltip for "read" column in msg list. Deleted - Tooltip for "deleted" column in msg list. Important - Tooltip for "important" column in msg list. Feed - Tooltip for name of feed for message. Title - Tooltip for title of message. Url - Tooltip for url of message. Author - Tooltip for author of message. Created on - Tooltip for creation date of message. Contents - Tooltip for contents of message. @@ -2459,7 +2452,6 @@ Go to application website to obtain it manually. Permanently deleted - Tooltip for "pdeleted" column in msg list. @@ -2468,7 +2460,6 @@ Go to application website to obtain it manually. Attachments - Tooltip for attachments of message. @@ -2618,6 +2609,14 @@ Go to application website to obtain it manually. Network status. + + access to content was denied + + + + connection timed out or was cancelled + + QObject diff --git a/localization/rssguard-en_US.ts b/localization/rssguard-en_US.ts index cb8b87588..da9f7ec20 100644 --- a/localization/rssguard-en_US.ts +++ b/localization/rssguard-en_US.ts @@ -1,35 +1,35 @@ - + Application - + Output directory is not writable. - + Settings file not copied to output directory successfully. - + Database file not copied to output directory successfully. - + Database restoration was not initiated. Make sure that output directory is writable. - + Settings restoration was not initiated. Make sure that output directory is writable. - + Application is already running. @@ -231,60 +231,40 @@ This website contains %n feed(s). FeedMessageViewer - + Toolbar for feeds - + Toolbar for messages - + Error when loading initial feeds - + Feed update started Text display in status bar when feed update is started. - + Updated feed '%1' Text display in status bar when particular feed is updated. - - - Cannot defragment database - - - - - Database cannot be defragmented because feed update is ongoing. - - - - - Database defragmented - - - Database was successfully defragmented. + Cannot cleanup database - - Database was not defragmented - - - - - Database was not defragmented. This database backend does not support it or it cannot be defragmented now. + + Cannot cleanup database, because another critical action is running. @@ -323,13 +303,11 @@ This website contains %n feed(s). Titles of feeds/categories. - Feed list header "titles" column tooltip. Counts of unread/all meesages. - Feed list header "counts" column tooltip. @@ -453,12 +431,12 @@ Auto-update status: %5 FeedsView - + Cannot update all items - + Cannot update selected items @@ -483,12 +461,12 @@ Auto-update status: %5 - + You cannot update all items because another another critical operation is ongoing. - + You cannot update selected items because another critical operation is ongoing. @@ -920,6 +898,42 @@ Auto-update status: %5 + + FormDatabaseCleanup + + + Cleanup database + + + + + Cleanup settings + + + + + Shrink database file. + + + + + Remove all messages older than + + + + + Remove all read messages. + + + + + day(s) + + + + + + FormFeedDetails @@ -1684,208 +1698,195 @@ Auto-update status: %5 - - &Defragment database + + &Cleanup database - Defragment database file so that its size decreases. - - - - &Feed list - + Hides or shows the list of feeds/categories. - + &Clean all feeds - + Deletes all messages from all feeds. - + Select &next feed/category - + Select &previous feed/category - + Select &next message - + Select &previous message - + Check for &updates - + Check if new update for the application is available for download. - + &Main menu - + Hides or displays the main menu. - + Enable &JavaScript - + Enable external &plugins - + Auto-load &images - + Report a &bug (GitHub)... - + &Toolbars - + Switch visibility of main toolbars. - + &Feed/message list headers - + &Import feeds - + Imports feeds you want from selected file. - + &Export feeds - + Exports feeds you want to selected file. - + Report a bug (BitBucket)... - + &Donate via PayPal - + Display &wiki - + &Empty recycle bin - + &Restore all messages - + Restore &selected messages - + &Restart - + &Restore database/settings - + &Backup database/settings - + Switch message list layout orientation - + &Downloads - + Send selected message via e-mail - - - - Cannot check for updates - - - You cannot check for updates because feed update is ongoing. + Cannot check for updates - - - - - Cannot open external browser + + + You cannot check for updates because feed update is ongoing. @@ -1893,6 +1894,14 @@ Auto-update status: %5 + Cannot open external browser + + + + + + + Cannot open external browser. Navigate to application website manually. @@ -1997,9 +2006,7 @@ Auto-update status: %5 Language - Language settings section. ----------- -Language column of language list. + Language settings section. @@ -2309,7 +2316,7 @@ Authors of this application are NOT responsible for lost data. Select client - + Placeholders: • %1 - title of selected message, @@ -2471,7 +2478,7 @@ MySQL backend will automatically use database with name "rssguard". Do &Show password - + Mouse gestures work with middle mouse button. Possible gestures are: • previous web page (drag mouse left), @@ -2493,14 +2500,12 @@ MySQL backend will automatically use database with name "rssguard". Do Code - Lang. code column of language list. Version - Version column of skin list. @@ -2517,7 +2522,6 @@ MySQL backend will automatically use database with name "rssguard". Do Name - Skin list name column. @@ -2958,73 +2962,61 @@ currently installed one. Id - Tooltip for ID of message. Read - Tooltip for "read" column in msg list. Deleted - Tooltip for "deleted" column in msg list. Important - Tooltip for "important" column in msg list. Feed - Tooltip for name of feed for message. Title - Tooltip for title of message. Url - Tooltip for url of message. Author - Tooltip for author of message. Created on - Tooltip for creation date of message. Contents - Tooltip for contents of message. Permanently deleted - Tooltip for "pdeleted" column in msg list. Attachments - Tooltip for attachments of message. @@ -3183,79 +3175,89 @@ currently installed one. - + + access to content was denied + + + + host not found Network status. - + + connection timed out or was cancelled + + + + connection refused Network status. - + connection timed out Network status. - + SSL handshake failed Network status. - + proxy server connection refused Network status. - + temporary failure Network status. - + authentication failed Network status. - + proxy authentication required Network status. - + proxy server not found Network status. - + no errors Network status. - + uknown content Network status. - + content not found Network status. - + unknown error Network status. @@ -3359,7 +3361,7 @@ currently installed one. SystemTrayIcon - + %1 Unread news: %2 diff --git a/localization/rssguard-fr_FR.ts b/localization/rssguard-fr_FR.ts index 126827619..7344de7dd 100644 --- a/localization/rssguard-fr_FR.ts +++ b/localization/rssguard-fr_FR.ts @@ -1,6 +1,6 @@ - + Application @@ -203,30 +203,6 @@ This website contains %n feed(s). Text display in status bar when particular feed is updated. Flux mis à jour '%1' - - Cannot defragment database - Impossible de défragmenter la base de données - - - Database cannot be defragmented because feed update is ongoing. - Impossible de défragmenter la base de donnée car une mise à jour est en cours. - - - Database defragmented - Base de données défragmentée - - - Database was successfully defragmented. - La base de données a été défragmentée avec succès. - - - Database was not defragmented - La base de données n'a pas été défragmentée - - - Database was not defragmented. This database backend does not support it or it cannot be defragmented now. - La base de données n'a pas été défragmentée. Le logiciel de base de données ne le supporte pas ou il est impossible de la défragmenter actuellement. - Toolbar for feeds Barre d'outils pour les flux @@ -235,6 +211,14 @@ This website contains %n feed(s). Error when loading initial feeds + + Cannot cleanup database + + + + Cannot cleanup database, because another critical action is running. + + FeedsImportExportModel @@ -260,12 +244,10 @@ This website contains %n feed(s). Titles of feeds/categories. - Feed list header "titles" column tooltip. Titres des flux/catégories. Counts of unread/all meesages. - Feed list header "counts" column tooltip. Nombre des messages lus/non-lus. @@ -754,6 +736,36 @@ Auto-update status: %5 + + FormDatabaseCleanup + + Cleanup database + + + + Cleanup settings + + + + Shrink database file. + + + + Remove all messages older than + + + + Remove all read messages. + + + + day(s) + + + + + + FormFeedDetails @@ -1231,10 +1243,6 @@ Auto-update status: %5 Hides main window if it is visible and shows it if it is hidden. Cacher la fenêtre principale si il est visible et la montrer si il est cacher. - - Defragment database file so that its size decreases. - Défragmenter la base de données afin que sa taille diminue. - Hides or shows the list of feeds/categories. Cacher ou montrer la liste des flux/catégories. @@ -1351,10 +1359,6 @@ Auto-update status: %5 View selected feeds in &newspaper mode Voir les flux sélectionnés dans le mode &journal - - &Defragment database - &Défragmenter la base de données - &Clean all feeds &Nettoyer tout les flux @@ -1523,6 +1527,10 @@ Auto-update status: %5 Send selected message via e-mail + + &Cleanup database + + FormRestoreDatabaseSettings @@ -1604,9 +1612,7 @@ Auto-update status: %5 Language - Language settings section. ----------- -Language column of language list. + Language settings section. Langage @@ -1664,12 +1670,10 @@ Language column of language list. Code - Lang. code column of language list. Code Version - Version column of skin list. Version @@ -1743,7 +1747,6 @@ Language column of language list. Name - Skin list name column. Nom @@ -2173,7 +2176,7 @@ MySQL backend will automatically use database with name "rssguard". Do Working database - + Mouse gestures work with middle mouse button. Possible gestures are: • previous web page (drag mouse left), • next web page (drag mouse right), @@ -2205,7 +2208,7 @@ MySQL backend will automatically use database with name "rssguard". Do Select client - + Placeholders: • %1 - title of selected message, • %2 - body of selected message. @@ -2386,52 +2389,42 @@ Aller sur le site de l'application pour les obtenir manuellement.MessagesModel Id - Tooltip for ID of message. Id Read - Tooltip for "read" column in msg list. Lire Deleted - Tooltip for "deleted" column in msg list. Supprimé Important - Tooltip for "important" column in msg list. Important Feed - Tooltip for name of feed for message. Flux Title - Tooltip for title of message. Titre Url - Tooltip for url of message. Url Author - Tooltip for author of message. Auteur Created on - Tooltip for creation date of message. Crée sur Contents - Tooltip for contents of message. Contenus @@ -2476,7 +2469,6 @@ Aller sur le site de l'application pour les obtenir manuellement. Permanently deleted - Tooltip for "pdeleted" column in msg list. @@ -2485,7 +2477,6 @@ Aller sur le site de l'application pour les obtenir manuellement. Attachments - Tooltip for attachments of message. @@ -2635,6 +2626,14 @@ Aller sur le site de l'application pour les obtenir manuellement.Network status. Pas d'erreurs + + access to content was denied + + + + connection timed out or was cancelled + + QObject diff --git a/localization/rssguard-it_IT.ts b/localization/rssguard-it_IT.ts index 16d3ddfe1..e9c4baf3e 100644 --- a/localization/rssguard-it_IT.ts +++ b/localization/rssguard-it_IT.ts @@ -1,6 +1,6 @@ - + Application @@ -203,30 +203,6 @@ This website contains %n feed(s). Text display in status bar when particular feed is updated. Feed '%1' aggiornato - - Cannot defragment database - Impossibile deframmentare database - - - Database cannot be defragmented because feed update is ongoing. - Il database non può essere deframmentato perché è in in corso l'aggiornamento del feed. - - - Database defragmented - Database deframmentato - - - Database was successfully defragmented. - Il database è stato deframmentato con successo. - - - Database was not defragmented - Il database non è stato deframmentato - - - Database was not defragmented. This database backend does not support it or it cannot be defragmented now. - - Toolbar for feeds Toolbar per i feed @@ -235,6 +211,14 @@ This website contains %n feed(s). Error when loading initial feeds + + Cannot cleanup database + + + + Cannot cleanup database, because another critical action is running. + + FeedsImportExportModel @@ -260,12 +244,10 @@ This website contains %n feed(s). Titles of feeds/categories. - Feed list header "titles" column tooltip. Titoli dei feed/categorie. Counts of unread/all meesages. - Feed list header "counts" column tooltip. Conteggio dei messaggi non letti/tutti. @@ -753,6 +735,36 @@ Auto-update status: %5 + + FormDatabaseCleanup + + Cleanup database + + + + Cleanup settings + + + + Shrink database file. + + + + Remove all messages older than + + + + Remove all read messages. + + + + day(s) + + + + + + FormFeedDetails @@ -1230,10 +1242,6 @@ Auto-update status: %5 Hides main window if it is visible and shows it if it is hidden. Nasconde la finestra principale se è visibile e la mostra se è nascosta. - - Defragment database file so that its size decreases. - Deframmenta il file del database cosi la dimensione diminuisce. - Hides or shows the list of feeds/categories. Nascondi o mostra l'elenco dei feed/categorie. @@ -1350,10 +1358,6 @@ Auto-update status: %5 View selected feeds in &newspaper mode - - &Defragment database - &Deframmenta database - &Clean all feeds @@ -1522,6 +1526,10 @@ Auto-update status: %5 Send selected message via e-mail + + &Cleanup database + + FormRestoreDatabaseSettings @@ -1603,9 +1611,7 @@ Auto-update status: %5 Language - Language settings section. ----------- -Language column of language list. + Language settings section. Lingua @@ -1663,12 +1669,10 @@ Language column of language list. Code - Lang. code column of language list. Codice Version - Version column of skin list. Versione @@ -1742,7 +1746,6 @@ Language column of language list. Name - Skin list name column. Nome @@ -2162,7 +2165,7 @@ MySQL backend will automatically use database with name "rssguard". Do Working database - + Mouse gestures work with middle mouse button. Possible gestures are: • previous web page (drag mouse left), • next web page (drag mouse right), @@ -2194,7 +2197,7 @@ MySQL backend will automatically use database with name "rssguard". Do Select client - + Placeholders: • %1 - title of selected message, • %2 - body of selected message. @@ -2374,52 +2377,42 @@ Go to application website to obtain it manually. MessagesModel Id - Tooltip for ID of message. Id Read - Tooltip for "read" column in msg list. Leggi Deleted - Tooltip for "deleted" column in msg list. Eliminato Important - Tooltip for "important" column in msg list. Importante Feed - Tooltip for name of feed for message. Feed Title - Tooltip for title of message. Titolo Url - Tooltip for url of message. Url Author - Tooltip for author of message. Autore Created on - Tooltip for creation date of message. Creato il Contents - Tooltip for contents of message. Contenuti @@ -2464,7 +2457,6 @@ Go to application website to obtain it manually. Permanently deleted - Tooltip for "pdeleted" column in msg list. @@ -2473,7 +2465,6 @@ Go to application website to obtain it manually. Attachments - Tooltip for attachments of message. @@ -2623,6 +2614,14 @@ Go to application website to obtain it manually. Network status. + + access to content was denied + + + + connection timed out or was cancelled + + QObject diff --git a/localization/rssguard-nl_NL.ts b/localization/rssguard-nl_NL.ts index 0cec818fd..f2a27c303 100644 --- a/localization/rssguard-nl_NL.ts +++ b/localization/rssguard-nl_NL.ts @@ -1,6 +1,6 @@ - + Application @@ -205,30 +205,6 @@ Deze website bevat % n feed(s). Text display in status bar when particular feed is updated. Feed bijwerken '%1' - - Cannot defragment database - Kan database niet defragmenteren - - - Database cannot be defragmented because feed update is ongoing. - Kan database niet defragmenteren omdat feeds aan het updaten zijn. - - - Database defragmented - Database gedefragmenteerd - - - Database was successfully defragmented. - Database is met succes gedefragmenteerd. - - - Database was not defragmented - Database is niet gedefragmenteerd - - - Database was not defragmented. This database backend does not support it or it cannot be defragmented now. - Database is niet gedefragmenteerd. Deze database backend word niet ondersteund of kan nu niet worden gedefragmenteerd. - Toolbar for feeds Werkbalk voor feeds @@ -237,6 +213,14 @@ Deze website bevat % n feed(s). Error when loading initial feeds + + Cannot cleanup database + + + + Cannot cleanup database, because another critical action is running. + + FeedsImportExportModel @@ -262,12 +246,10 @@ Deze website bevat % n feed(s). Titles of feeds/categories. - Feed list header "titles" column tooltip. Naam van feeds/categorieën. Counts of unread/all meesages. - Feed list header "counts" column tooltip. Aantal van alle ongelezen berichten. @@ -762,6 +744,36 @@ Auto-update status: %5 Omschrijving is ok. + + FormDatabaseCleanup + + Cleanup database + + + + Cleanup settings + + + + Shrink database file. + + + + Remove all messages older than + + + + Remove all read messages. + + + + day(s) + + + + + + FormFeedDetails @@ -1239,10 +1251,6 @@ Auto-update status: %5 Hides main window if it is visible and shows it if it is hidden. Verberg hoofdvenster als het zichtbaar is en toon het als het verborgen is. - - Defragment database file so that its size decreases. - Defragmenteren databasebestand zodat de grootte afneemt. - Hides or shows the list of feeds/categories. Verberg of toon de lijst van feeds/categorieën. @@ -1359,10 +1367,6 @@ Auto-update status: %5 View selected feeds in &newspaper mode Bekijk de geselecteerde items in de kra&ntweergave modus - - &Defragment database - &Defragmenteer database - &Clean all feeds Alle feeds ops&chonen @@ -1532,6 +1536,10 @@ Exporteer feeds die je wilt van het geselecteerde bestand. Send selected message via e-mail + + &Cleanup database + + FormRestoreDatabaseSettings @@ -1613,9 +1621,7 @@ Exporteer feeds die je wilt van het geselecteerde bestand. Language - Language settings section. ----------- -Language column of language list. + Language settings section. Taal @@ -1673,12 +1679,10 @@ Language column of language list. Code - Lang. code column of language list. Code Version - Version column of skin list. Versie @@ -1752,7 +1756,6 @@ Language column of language list. Name - Skin list name column. Naam @@ -2188,7 +2191,7 @@ MySQL backend maakt automatisch gebruik van databank met de naam "rssguard& Working database - + Mouse gestures work with middle mouse button. Possible gestures are: • previous web page (drag mouse left), • next web page (drag mouse right), @@ -2220,7 +2223,7 @@ MySQL backend maakt automatisch gebruik van databank met de naam "rssguard& Select client - + Placeholders: • %1 - title of selected message, • %2 - body of selected message. @@ -2401,52 +2404,42 @@ Ga naar RRSguard website en download het handmatig. MessagesModel Id - Tooltip for ID of message. ld Read - Tooltip for "read" column in msg list. Lees Deleted - Tooltip for "deleted" column in msg list. verwijder Important - Tooltip for "important" column in msg list. Belangrijk Feed - Tooltip for name of feed for message. Feed Title - Tooltip for title of message. Titel Url - Tooltip for url of message. Url Author - Tooltip for author of message. Auteur Created on - Tooltip for creation date of message. Gemaakt op Contents - Tooltip for contents of message. Inhoud @@ -2491,7 +2484,6 @@ Ga naar RRSguard website en download het handmatig. Permanently deleted - Tooltip for "pdeleted" column in msg list. Definitief verwijderd @@ -2500,7 +2492,6 @@ Ga naar RRSguard website en download het handmatig. Attachments - Tooltip for attachments of message. Bijlagen @@ -2650,6 +2641,14 @@ Ga naar RRSguard website en download het handmatig. Network status. geen fouten + + access to content was denied + + + + connection timed out or was cancelled + + QObject diff --git a/localization/rssguard-sv_SE.ts b/localization/rssguard-sv_SE.ts index a0e40ba21..0b1fa25a3 100644 --- a/localization/rssguard-sv_SE.ts +++ b/localization/rssguard-sv_SE.ts @@ -1,6 +1,6 @@ - + Application @@ -205,30 +205,6 @@ Denna webbsida innehåller %1 flöden. Text display in status bar when particular feed is updated. Uppdaterade flödet '%1' - - Cannot defragment database - Kan inte defragmentera databasen - - - Database cannot be defragmented because feed update is ongoing. - Databasen kan inte defragmenteras eftersom flödesuppdatering pågår. - - - Database defragmented - Databasen defragmenterad - - - Database was successfully defragmented. - Databasen defragmenterades korrekt. - - - Database was not defragmented - Databasen defragmenterades inte - - - Database was not defragmented. This database backend does not support it or it cannot be defragmented now. - Databasen defragmenterades inte. Stöddatabasen stöder inte defragmentering, eller så kan den inte defragmenteras just nu. - Toolbar for feeds Verktygsfält för flöden @@ -237,6 +213,14 @@ Denna webbsida innehåller %1 flöden. Error when loading initial feeds + + Cannot cleanup database + + + + Cannot cleanup database, because another critical action is running. + + FeedsImportExportModel @@ -262,12 +246,10 @@ Denna webbsida innehåller %1 flöden. Titles of feeds/categories. - Feed list header "titles" column tooltip. Namn på kategorier/flöden. Counts of unread/all meesages. - Feed list header "counts" column tooltip. Antal meddelanden. @@ -761,6 +743,36 @@ Uppdateringsstatus: %5 Beskrivningen är ok. + + FormDatabaseCleanup + + Cleanup database + + + + Cleanup settings + + + + Shrink database file. + + + + Remove all messages older than + + + + Remove all read messages. + + + + day(s) + + + + + + FormFeedDetails @@ -1238,10 +1250,6 @@ Uppdateringsstatus: %5 Hides main window if it is visible and shows it if it is hidden. Dölj programfönstret om det är synligt, och visa det om det är dolt. - - Defragment database file so that its size decreases. - Defragmentera databasfilen för att minska storleken. - Hides or shows the list of feeds/categories. Dölj/Visa listan med flöden/kategorier. @@ -1358,10 +1366,6 @@ Uppdateringsstatus: %5 View selected feeds in &newspaper mode Visa markerade flöden som &tidningsvy - - &Defragment database - &Defragmentera databasen - &Clean all feeds &Rensa alla flöden @@ -1530,6 +1534,10 @@ Uppdateringsstatus: %5 Send selected message via e-mail Skicka meddelandet via e-post + + &Cleanup database + + FormRestoreDatabaseSettings @@ -1611,9 +1619,7 @@ Uppdateringsstatus: %5 Language - Language settings section. ----------- -Language column of language list. + Language settings section. Språk @@ -1671,12 +1677,10 @@ Language column of language list. Code - Lang. code column of language list. Språkkod Version - Version column of skin list. Version @@ -1750,7 +1754,6 @@ Language column of language list. Name - Skin list name column. Namn @@ -2185,7 +2188,7 @@ MySQL-gränssnittet använder automatiskt en datbas med namnet "rssguard&qu Working database Arbetsdatabas - + Mouse gestures work with middle mouse button. Possible gestures are: • previous web page (drag mouse left), • next web page (drag mouse right), @@ -2221,7 +2224,7 @@ MySQL-gränssnittet använder automatiskt en datbas med namnet "rssguard&qu Select client Välj klient - + Placeholders: • %1 - title of selected message, • %2 - body of selected message. @@ -2403,52 +2406,42 @@ Gå till programmets hemsida för att hämta den manuellt. MessagesModel Id - Tooltip for ID of message. ID Read - Tooltip for "read" column in msg list. Läst Deleted - Tooltip for "deleted" column in msg list. Borttaget Important - Tooltip for "important" column in msg list. Viktigt Feed - Tooltip for name of feed for message. Flöde Title - Tooltip for title of message. Titel Url - Tooltip for url of message. URL Author - Tooltip for author of message. Författare Created on - Tooltip for creation date of message. Skapad Contents - Tooltip for contents of message. Innehåll @@ -2493,7 +2486,6 @@ Gå till programmets hemsida för att hämta den manuellt. Permanently deleted - Tooltip for "pdeleted" column in msg list. Permanent borttagna @@ -2502,7 +2494,6 @@ Gå till programmets hemsida för att hämta den manuellt. Attachments - Tooltip for attachments of message. Bilagor @@ -2652,6 +2643,14 @@ Gå till programmets hemsida för att hämta den manuellt. Network status. Inga fel + + access to content was denied + + + + connection timed out or was cancelled + + QObject diff --git a/src/definitions/definitions.h.in b/src/definitions/definitions.h.in index f6d5b7096..518d77236 100755 --- a/src/definitions/definitions.h.in +++ b/src/definitions/definitions.h.in @@ -60,6 +60,7 @@ #define DOWNLOAD_TIMEOUT 5000 #define MESSAGES_VIEW_DEFAULT_COL 170 #define FEEDS_VIEW_COLUMN_COUNT 2 +#define DEFAULT_DAYS_TO_DELETE_MSG 14 #define ELLIPSIS_LENGTH 3 #define MIN_CATEGORY_NAME_LENGTH 3 #define INTERNAL_URL_NEWSPAPER "@APP_LOW_NAME@:newspaper" diff --git a/src/gui/feedmessageviewer.cpp b/src/gui/feedmessageviewer.cpp index 0b4df7a62..403a3aaff 100755 --- a/src/gui/feedmessageviewer.cpp +++ b/src/gui/feedmessageviewer.cpp @@ -34,6 +34,7 @@ #include "gui/statusbar.h" #include "gui/systemtrayicon.h" #include "gui/messagebox.h" +#include "gui/formdatabasecleanup.h" #include "gui/messagestoolbar.h" #include "gui/feedstoolbar.h" #include @@ -50,6 +51,7 @@ #include #include #include +#include FeedMessageViewer::FeedMessageViewer(QWidget *parent) @@ -262,6 +264,8 @@ void FeedMessageViewer::createConnections() { connect(m_feedsView, SIGNAL(feedsUpdateRequested(QList)), this, SLOT(updateFeeds(QList))); // Toolbar forwardings. + connect(form_main->m_ui->m_actionCleanupDatabase, + SIGNAL(triggered()), this, SLOT(showDbCleanupAssistant())); connect(form_main->m_ui->m_actionSwitchImportanceOfSelectedMessages, SIGNAL(triggered()), m_messagesView, SLOT(switchSelectedMessagesImportance())); connect(form_main->m_ui->m_actionDeleteSelectedMessages, @@ -400,32 +404,19 @@ void FeedMessageViewer::initializeViews() { setTabOrder(m_toolBarMessages, m_messagesBrowser); } -void FeedMessageViewer::vacuumDatabase() { - if (!qApp->feedUpdateLock()->tryLock()) { - // Lock was not obtained because - // it is used probably by feed updater or application - // is quitting. - qApp->showGuiMessage(tr("Cannot defragment database"), - tr("Database cannot be defragmented because feed update is ongoing."), - QSystemTrayIcon::Warning, - this); - return; - } +void FeedMessageViewer::showDbCleanupAssistant() { + if (qApp->feedUpdateLock()->tryLock()) { + QPointer form_pointer = new FormDatabaseCleanup(this); + form_pointer.data()->exec(); + delete form_pointer.data(); - if (qApp->database()->vacuumDatabase()) { - qApp->showGuiMessage(tr("Database defragmented"), - tr("Database was successfully defragmented."), - QSystemTrayIcon::Information, - this); + qApp->feedUpdateLock()->unlock(); } else { - qApp->showGuiMessage(tr("Database was not defragmented"), - tr("Database was not defragmented. This database backend does not support it or it cannot be defragmented now."), - QSystemTrayIcon::Warning, - this); + qApp->showGuiMessage(tr("Cannot cleanup database"), + tr("Cannot cleanup database, because another critical action is running."), + QSystemTrayIcon::Warning, this); } - - qApp->feedUpdateLock()->unlock(); } void FeedMessageViewer::refreshVisualProperties() { diff --git a/src/gui/feedmessageviewer.h b/src/gui/feedmessageviewer.h index 08e89b08e..702810126 100644 --- a/src/gui/feedmessageviewer.h +++ b/src/gui/feedmessageviewer.h @@ -93,7 +93,7 @@ class FeedMessageViewer : public TabContent { void setListHeadersEnabled(bool enable); // Runs "cleanup" of the database. - void vacuumDatabase(); + void showDbCleanupAssistant(); // Reloads some changeable visual settings. void refreshVisualProperties(); diff --git a/src/gui/formdatabasecleanup.cpp b/src/gui/formdatabasecleanup.cpp index e12881d0c..3cf557a30 100644 --- a/src/gui/formdatabasecleanup.cpp +++ b/src/gui/formdatabasecleanup.cpp @@ -11,7 +11,9 @@ FormDatabaseCleanup::FormDatabaseCleanup(QWidget *parent) : QDialog(parent), m_u setWindowFlags(Qt::MSWindowsFixedSizeDialogHint | Qt::Dialog | Qt::WindowSystemMenuHint | Qt::WindowTitleHint); setWindowIcon(qApp->icons()->fromTheme("cleanup-database")); + connect(m_ui->m_spinDays, SIGNAL(valueChanged(int)), this, SLOT(updateDaysSuffix(int))); + m_ui->m_spinDays->setValue(DEFAULT_DAYS_TO_DELETE_MSG); // TODO: Vytvořil jsem základ okna pro mazání. // v tomto okně se nastaví parametry mazání - jak staré zprávy, zda přečtené, zda vakuovat db // do třídy DatabaseCleaner se dodělají metody, které budou samotné mazání provádět @@ -25,3 +27,7 @@ FormDatabaseCleanup::FormDatabaseCleanup(QWidget *parent) : QDialog(parent), m_u FormDatabaseCleanup::~FormDatabaseCleanup() { delete m_ui; } + +void FormDatabaseCleanup::updateDaysSuffix(int number) { + m_ui->m_spinDays->setSuffix(tr(" day(s)", 0, number)); +} diff --git a/src/gui/formdatabasecleanup.h b/src/gui/formdatabasecleanup.h index fd3dee573..6b4adbe47 100644 --- a/src/gui/formdatabasecleanup.h +++ b/src/gui/formdatabasecleanup.h @@ -17,6 +17,9 @@ class FormDatabaseCleanup : public QDialog { explicit FormDatabaseCleanup(QWidget *parent = 0); virtual ~FormDatabaseCleanup(); + private slots: + void updateDaysSuffix(int number); + private: Ui::FormDatabaseCleanup *m_ui; }; diff --git a/src/gui/formdatabasecleanup.ui b/src/gui/formdatabasecleanup.ui index 9ff6ac44c..79095fd8e 100644 --- a/src/gui/formdatabasecleanup.ui +++ b/src/gui/formdatabasecleanup.ui @@ -1,9 +1,7 @@ + - - - FormDatabaseCleanup - + 0 @@ -13,30 +11,101 @@ - Dialog + Cleanup database - - - - 30 - 240 - 341 - 32 - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - + + + + + Cleanup settings + + + + + + Shrink database file. + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Remove all messages older than + + + + + + + Remove all read messages. + + + + + + + 1 + + + 1000 + + + 1 + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + 24 + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + - - buttonBox + m_btnBox accepted() FormDatabaseCleanup accept() @@ -52,7 +121,7 @@ - buttonBox + m_btnBox rejected() FormDatabaseCleanup reject()