From 22aa9711b0811494e7d1e7409b4e832eb8de714d Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Sun, 29 Mar 2015 08:50:04 +0200 Subject: [PATCH] Work on logging, now even better. Updated translations. --- localization/rssguard-cs_CZ.ts | 80 +++++++------------ localization/rssguard-de_DE.ts | 26 +----- localization/rssguard-en_GB.ts | 26 +----- localization/rssguard-en_US.ts | 31 +------ localization/rssguard-fr_FR.ts | 26 +----- localization/rssguard-it_IT.ts | 26 +----- localization/rssguard-nl_NL.ts | 26 +----- localization/rssguard-sv_SE.ts | 26 +----- resources/text/CHANGELOG | 17 ++++ src/miscellaneous/databasefactory.cpp | 1 - src/miscellaneous/localization.cpp | 1 - src/miscellaneous/settings.cpp | 1 - src/miscellaneous/skinfactory.cpp | 1 - src/miscellaneous/systemfactory.cpp | 1 - src/network-web/downloadmanager.cpp | 2 +- .../silentnetworkaccessmanager.cpp | 1 - .../webbrowsernetworkaccessmanager.cpp | 1 - src/network-web/webfactory.cpp | 1 - 18 files changed, 63 insertions(+), 231 deletions(-) diff --git a/localization/rssguard-cs_CZ.ts b/localization/rssguard-cs_CZ.ts index 3f91a7d76..c3c84a89c 100644 --- a/localization/rssguard-cs_CZ.ts +++ b/localization/rssguard-cs_CZ.ts @@ -1,6 +1,6 @@ - + Application @@ -33,39 +33,35 @@ DownloadItem Ico - + Ico Filename - + Název souboru Error opening output file: %1 - - - - ? - + Problém s otevřením souboru: %1 &Try again - + &Zkusit znovu &Stop - + Z&astavit &Open file - + &Otevřít soubor Open &folder - + &Otevřít složku Select destination for downloaded file - + Zvolit cílové umístění pro stahovaný soubor Error: %1 @@ -73,31 +69,31 @@ Cannot open folder - + Nelze otevřít složku Cannot open output folder. Open it manually. - + Výstupní složku nelze otevřít, otevřte ji ručně. Cancelled - + Zrušeno Download directory couldn't be created - + Cílový adresář nemohl být vytvořen Error when saving file: %1 - + Chyba při ukládání souboru: %1 %1 of %2 (%3 per second) - %4 - + %1 of %2 (%3 za vteřinu) - %4 %1 of %2 - download completed - + %1 z %2 - stahování dokončeno @@ -108,18 +104,18 @@ %n minutes remaining - - - - + + %n minuta do konce + %n minuty do konce + %n minut do konce %n seconds remaining - - - - + + %n vteřina do konce + %n vteřiny do konce + %n vteřin do konce @@ -140,10 +136,10 @@ Downloading %n file(s)... - - - - + + Stahuji %n soubor... + Stahuji %n soubory... + Stahuji %n souborů... @@ -212,12 +208,10 @@ 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. @@ -1542,9 +1536,7 @@ and/or settings were backed or not. Also make sure that target foder is writable Language - Language settings section. ----------- -Language column of language list. + Language settings section. Lokalizace @@ -1602,12 +1594,10 @@ Language column of language list. Code - Lang. code column of language list. Kód Version - Version column of skin list. Verze @@ -1685,7 +1675,6 @@ Language column of language list. Name - Skin list name column. Název @@ -2270,52 +2259,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 @@ -2360,7 +2339,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 diff --git a/localization/rssguard-de_DE.ts b/localization/rssguard-de_DE.ts index 7c672c003..9ed5cb42c 100644 --- a/localization/rssguard-de_DE.ts +++ b/localization/rssguard-de_DE.ts @@ -1,6 +1,6 @@ - + Application @@ -43,10 +43,6 @@ Error opening output file: %1 - - ? - - &Try again @@ -209,12 +205,10 @@ 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. @@ -1529,9 +1523,7 @@ and/or settings were backed or not. Also make sure that target foder is writable Language - Language settings section. ----------- -Language column of language list. + Language settings section. Sprache @@ -1589,12 +1581,10 @@ Language column of language list. Code - Lang. code column of language list. Code Version - Version column of skin list. Version @@ -1672,7 +1662,6 @@ Language column of language list. Name - Skin list name column. Name @@ -2241,52 +2230,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 @@ -2331,7 +2310,6 @@ Go to application website to obtain it manually. Permanently deleted - Tooltip for "pdeleted" column in msg list. diff --git a/localization/rssguard-en_GB.ts b/localization/rssguard-en_GB.ts index c23ec35b1..5b7902fea 100644 --- a/localization/rssguard-en_GB.ts +++ b/localization/rssguard-en_GB.ts @@ -1,6 +1,6 @@ - + Application @@ -43,10 +43,6 @@ Error opening output file: %1 - - ? - - &Try again @@ -209,12 +205,10 @@ Titles of feeds/categories. - Feed list header "titles" column tooltip. Counts of unread/all meesages. - Feed list header "counts" column tooltip. @@ -1529,9 +1523,7 @@ and/or settings were backed or not. Also make sure that target foder is writable Language - Language settings section. ----------- -Language column of language list. + Language settings section. @@ -1589,12 +1581,10 @@ Language column of language list. Code - Lang. code column of language list. Version - Version column of skin list. @@ -1672,7 +1662,6 @@ Language column of language list. Name - Skin list name column. @@ -2236,52 +2225,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. @@ -2326,7 +2305,6 @@ Go to application website to obtain it manually. Permanently deleted - Tooltip for "pdeleted" column in msg list. diff --git a/localization/rssguard-en_US.ts b/localization/rssguard-en_US.ts index 610abe165..a5b670860 100644 --- a/localization/rssguard-en_US.ts +++ b/localization/rssguard-en_US.ts @@ -1,6 +1,6 @@ - + Application @@ -118,11 +118,6 @@ %1 of %2 - download completed - - - ? - - DownloadManager @@ -261,13 +256,11 @@ Titles of feeds/categories. - Feed list header "titles" column tooltip. Counts of unread/all meesages. - Feed list header "counts" column tooltip. @@ -1904,9 +1897,7 @@ and/or settings were backed or not. Also make sure that target foder is writable Language - Language settings section. ----------- -Language column of language list. + Language settings section. @@ -2357,14 +2348,12 @@ Authors of this application are NOT responsible for lost data. Code - Lang. code column of language list. Version - Version column of skin list. @@ -2382,7 +2371,6 @@ Authors of this application are NOT responsible for lost data. Name - Skin list name column. @@ -2786,67 +2774,56 @@ 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. @@ -3127,12 +3104,12 @@ currently installed one. StatusBar - + Fullscreen mode - + Switch application between fulscreen/normal states right from this status bar icon. diff --git a/localization/rssguard-fr_FR.ts b/localization/rssguard-fr_FR.ts index 5473c9184..0ccb75e38 100644 --- a/localization/rssguard-fr_FR.ts +++ b/localization/rssguard-fr_FR.ts @@ -1,6 +1,6 @@ - + Application @@ -43,10 +43,6 @@ Error opening output file: %1 - - ? - - &Try again @@ -209,12 +205,10 @@ 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. @@ -1530,9 +1524,7 @@ and/or settings were backed or not. Also make sure that target foder is writable Language - Language settings section. ----------- -Language column of language list. + Language settings section. Langage @@ -1590,12 +1582,10 @@ Language column of language list. Code - Lang. code column of language list. Code Version - Version column of skin list. Version @@ -1673,7 +1663,6 @@ Language column of language list. Name - Skin list name column. Nom @@ -2259,52 +2248,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 @@ -2349,7 +2328,6 @@ Aller sur le site de l'application pour les obtenir manuellement. Permanently deleted - Tooltip for "pdeleted" column in msg list. diff --git a/localization/rssguard-it_IT.ts b/localization/rssguard-it_IT.ts index 602751559..4834aee07 100644 --- a/localization/rssguard-it_IT.ts +++ b/localization/rssguard-it_IT.ts @@ -1,6 +1,6 @@ - + Application @@ -43,10 +43,6 @@ Error opening output file: %1 - - ? - - &Try again @@ -209,12 +205,10 @@ 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. @@ -1529,9 +1523,7 @@ and/or settings were backed or not. Also make sure that target foder is writable Language - Language settings section. ----------- -Language column of language list. + Language settings section. Lingua @@ -1589,12 +1581,10 @@ Language column of language list. Code - Lang. code column of language list. Codice Version - Version column of skin list. Versione @@ -1672,7 +1662,6 @@ Language column of language list. Name - Skin list name column. Nome @@ -2241,52 +2230,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 @@ -2331,7 +2310,6 @@ Go to application website to obtain it manually. Permanently deleted - Tooltip for "pdeleted" column in msg list. diff --git a/localization/rssguard-nl_NL.ts b/localization/rssguard-nl_NL.ts index fb10c8cf4..add4a8d63 100644 --- a/localization/rssguard-nl_NL.ts +++ b/localization/rssguard-nl_NL.ts @@ -1,6 +1,6 @@ - + Application @@ -43,10 +43,6 @@ Error opening output file: %1 Fout bij het openen van uitvoerbestand: %1 - - ? - ? - &Try again &Probeer opnieuw @@ -209,12 +205,10 @@ 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. @@ -1538,9 +1532,7 @@ Exporteer feeds die je wilt van het geselecteerde bestand. Language - Language settings section. ----------- -Language column of language list. + Language settings section. Taal @@ -1598,12 +1590,10 @@ Language column of language list. Code - Lang. code column of language list. Code Version - Version column of skin list. Versie @@ -1681,7 +1671,6 @@ Language column of language list. Name - Skin list name column. Naam @@ -2271,52 +2260,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 @@ -2361,7 +2340,6 @@ Ga naar RRSguard website en download het handmatig. Permanently deleted - Tooltip for "pdeleted" column in msg list. Definitief verwijderd diff --git a/localization/rssguard-sv_SE.ts b/localization/rssguard-sv_SE.ts index 2f5a40906..e3c37ccc9 100644 --- a/localization/rssguard-sv_SE.ts +++ b/localization/rssguard-sv_SE.ts @@ -1,6 +1,6 @@ - + Application @@ -43,10 +43,6 @@ Error opening output file: %1 Kunde inte öppna utdatafil: %1 - - ? - ? - &Try again &Försök igen @@ -209,12 +205,10 @@ 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. @@ -1536,9 +1530,7 @@ och/eller inställningar sparades. Tillse också att målmappen inte är skrivsk Language - Language settings section. ----------- -Language column of language list. + Language settings section. Språk @@ -1596,12 +1588,10 @@ Language column of language list. Code - Lang. code column of language list. Språkkod Version - Version column of skin list. Version @@ -1679,7 +1669,6 @@ Language column of language list. Name - Skin list name column. Namn @@ -2267,52 +2256,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 @@ -2357,7 +2336,6 @@ Gå till programmets hemsida för att hämta den manuellt. Permanently deleted - Tooltip for "pdeleted" column in msg list. Permanent borttagna diff --git a/resources/text/CHANGELOG b/resources/text/CHANGELOG index 05fd5658b..7092b3d15 100644 --- a/resources/text/CHANGELOG +++ b/resources/text/CHANGELOG @@ -1,4 +1,21 @@ +

2.3.0

+ +Fixed: +
    +
  • +
+ +Added: +
    +
  • Better format for logged messages. Logging to file is possible via "rssguard 2> log.txt" command.
  • +
+ +Changed: +
    +
+ +

2.2.0

Fixed: diff --git a/src/miscellaneous/databasefactory.cpp b/src/miscellaneous/databasefactory.cpp index 075d140ee..a2d5cac6a 100755 --- a/src/miscellaneous/databasefactory.cpp +++ b/src/miscellaneous/databasefactory.cpp @@ -36,7 +36,6 @@ DatabaseFactory::DatabaseFactory(QObject *parent) } DatabaseFactory::~DatabaseFactory() { - qDebug("Destroying DatabaseFactory object."); } DatabaseFactory::MySQLError DatabaseFactory::mysqlTestConnection(const QString &hostname, int port, diff --git a/src/miscellaneous/localization.cpp b/src/miscellaneous/localization.cpp index cb9a6aee0..320fc059d 100755 --- a/src/miscellaneous/localization.cpp +++ b/src/miscellaneous/localization.cpp @@ -30,7 +30,6 @@ Localization::Localization(QObject *parent) } Localization::~Localization() { - qDebug("Destroying Localization instance."); } QString Localization::desiredLanguage() { diff --git a/src/miscellaneous/settings.cpp b/src/miscellaneous/settings.cpp index 021755297..6a7a0b2aa 100755 --- a/src/miscellaneous/settings.cpp +++ b/src/miscellaneous/settings.cpp @@ -244,7 +244,6 @@ Settings::Settings(const QString &file_name, Format format, const SettingsType & Settings::~Settings() { checkSettings(); - qDebug("Deleting Settings instance."); } QString Settings::pathName() const { diff --git a/src/miscellaneous/skinfactory.cpp b/src/miscellaneous/skinfactory.cpp index d48a55ef0..e4184b348 100755 --- a/src/miscellaneous/skinfactory.cpp +++ b/src/miscellaneous/skinfactory.cpp @@ -29,7 +29,6 @@ SkinFactory::SkinFactory(QObject *parent) : QObject(parent) { } SkinFactory::~SkinFactory() { - qDebug("Destroying SkinFactory instance."); } void SkinFactory::loadCurrentSkin() { diff --git a/src/miscellaneous/systemfactory.cpp b/src/miscellaneous/systemfactory.cpp index 23f75fc2b..724298204 100755 --- a/src/miscellaneous/systemfactory.cpp +++ b/src/miscellaneous/systemfactory.cpp @@ -47,7 +47,6 @@ SystemFactory::SystemFactory(QObject *parent) : QObject(parent) { } SystemFactory::~SystemFactory() { - qDebug("Destroying SystemFactory instance."); } SystemFactory::AutoStartStatus SystemFactory::getAutoStartStatus() { diff --git a/src/network-web/downloadmanager.cpp b/src/network-web/downloadmanager.cpp index 1c91f6ee6..e408f861c 100644 --- a/src/network-web/downloadmanager.cpp +++ b/src/network-web/downloadmanager.cpp @@ -384,7 +384,7 @@ void DownloadItem::updateInfoLabel() { } info = QString(tr("%1 of %2 (%3 per second) - %4")).arg(DownloadManager::dataString(m_bytesReceived), - bytesTotal == 0 ? tr("?") : DownloadManager::dataString(bytesTotal), + bytesTotal == 0 ? "?" : DownloadManager::dataString(bytesTotal), DownloadManager::dataString((int)speed), remaining); } diff --git a/src/network-web/silentnetworkaccessmanager.cpp b/src/network-web/silentnetworkaccessmanager.cpp index 7896efadc..d20b5bb3b 100644 --- a/src/network-web/silentnetworkaccessmanager.cpp +++ b/src/network-web/silentnetworkaccessmanager.cpp @@ -30,7 +30,6 @@ SilentNetworkAccessManager::SilentNetworkAccessManager(QObject *parent) } SilentNetworkAccessManager::~SilentNetworkAccessManager() { - qDebug("Destroying SilentNetworkAccessManages instance."); } void SilentNetworkAccessManager::onAuthenticationRequired(QNetworkReply *reply, QAuthenticator *authenticator) { diff --git a/src/network-web/webbrowsernetworkaccessmanager.cpp b/src/network-web/webbrowsernetworkaccessmanager.cpp index 760dc8b4c..6d9cc02d0 100755 --- a/src/network-web/webbrowsernetworkaccessmanager.cpp +++ b/src/network-web/webbrowsernetworkaccessmanager.cpp @@ -31,7 +31,6 @@ WebBrowserNetworkAccessManager::WebBrowserNetworkAccessManager(QObject *parent) } WebBrowserNetworkAccessManager::~WebBrowserNetworkAccessManager() { - qDebug("Destroying WebBrowserNetworkAccessManager instance."); } void WebBrowserNetworkAccessManager::onAuthenticationRequired(QNetworkReply *reply, QAuthenticator *authenticator) { diff --git a/src/network-web/webfactory.cpp b/src/network-web/webfactory.cpp index 53298f6ca..5deec9b1c 100755 --- a/src/network-web/webfactory.cpp +++ b/src/network-web/webfactory.cpp @@ -18,7 +18,6 @@ WebFactory::WebFactory(QObject *parent) } WebFactory::~WebFactory() { - qDebug("Destroying WebFactory instance."); } void WebFactory::loadState() {