diff --git a/localization/rssguard-cs_CZ.ts b/localization/rssguard-cs_CZ.ts index 0dd84dceb..c61f431f3 100644 --- a/localization/rssguard-cs_CZ.ts +++ b/localization/rssguard-cs_CZ.ts @@ -5,6 +5,7 @@ CornerButton Open new tab + Tooltip for "new tab" webbrowser corner button. Otevřít nový panel @@ -51,10 +52,12 @@ FeedsModel Title + Title text in the feed list header. Nadpis Titles of feeds/categories. + Feed list header tooltips. Názvy kanálů/kategorií. @@ -63,6 +66,7 @@ Root + Name of root item of feed list which can be seen in feed add/edit dialog. Kořen @@ -1532,42 +1536,52 @@ currently installed one. 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 @@ -1671,20 +1685,15 @@ currently installed one. %n unread message(s). + Tooltip for "unread" column of feed list. +---------- +Tooltip for "unread" column of feed list. %n nepřečtená zpráva. %n nepřečtené zprávy. %n nepřečtených zpráv. - - ATOM 1.0 - - - - RSS 2.0/2.0.1 - - @@ -1693,17 +1702,10 @@ This category does not contain any nested items. Tato kategorie neobsahuje žádné podřízené položky. - - RDF - - - - RSS 0.91/0.92/0.93 - - %1 (standard category) %2%3 + Tooltip for standard feed. %1 (standardní kategorie) %2%3 @@ -1713,22 +1715,27 @@ Tato kategorie neobsahuje žádné podřízené položky. Access denied. Invalid username or password used. + Access to MySQL server was denied. Přístup zamítnut. Nesprávne jméno či heslo. Unknown error. + Unknown MySQL error arised. Neznámá chyba. does not use auto-update + Describes feed auto-update status. nepoužívá auto-aktualizace uses global settings + Describes feed auto-update status. používá globální nastavení uses specific settings (%n minute(s) to next auto-update) + Describes feed auto-update status. používá specifické nastavení (%n minuta do další aktualizace) používá specifické nastavení (%n minuty do další aktualizace) @@ -1741,6 +1748,7 @@ Tato kategorie neobsahuje žádné podřízené položky. Encoding: %4 Auto-update status: %5 + Tooltip for feed. %1 (%2) %3 @@ -1753,58 +1761,72 @@ Status auto-aktualizace: %5 protocol error + Network status. chyba protokolu host not found + Network status. hostitel nenalezen connection refused + Network status. spojení odmítnuto connection timed out + Network status. spojení vypršelo SSL handshake failed + Network status. SSL handshake selhal proxy server connection refused + Network status. spojení k proxy serveru odmítnuto temporary failure + Network status. dočasný výpadek proxy authentication required + Network status. proxy autentifikace selhala proxy server not found + Network status. proxy server nenalezen success + Network status. úspěch uknown content + Network status. neznámý obsah unknown error + Network status. neznámá chyba authentication failed + Network status. autentifikace selhala content not found + Network status. obsah nenalezen diff --git a/localization/rssguard-en_GB.ts b/localization/rssguard-en_GB.ts index 33943e8f2..223087482 100644 --- a/localization/rssguard-en_GB.ts +++ b/localization/rssguard-en_GB.ts @@ -5,6 +5,7 @@ CornerButton Open new tab + Tooltip for "new tab" webbrowser corner button. @@ -51,10 +52,12 @@ FeedsModel Title + Title text in the feed list header. Titles of feeds/categories. + Feed list header tooltips. @@ -63,6 +66,7 @@ Root + Name of root item of feed list which can be seen in feed add/edit dialog. @@ -1514,42 +1518,52 @@ currently installed one. 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. @@ -1653,36 +1667,24 @@ currently installed one. %n unread message(s). + Tooltip for "unread" column of feed list. +---------- +Tooltip for "unread" column of feed list. - - ATOM 1.0 - - - - RSS 2.0/2.0.1 - - This category does not contain any nested items. - - RDF - - - - RSS 0.91/0.92/0.93 - - %1 (standard category) %2%3 + Tooltip for standard feed. @@ -1691,22 +1693,27 @@ This category does not contain any nested items. Access denied. Invalid username or password used. + Access to MySQL server was denied. Unknown error. + Unknown MySQL error arised. does not use auto-update + Describes feed auto-update status. uses global settings + Describes feed auto-update status. uses specific settings (%n minute(s) to next auto-update) + Describes feed auto-update status. @@ -1718,6 +1725,7 @@ This category does not contain any nested items. Encoding: %4 Auto-update status: %5 + Tooltip for feed. @@ -1726,58 +1734,72 @@ Auto-update status: %5 protocol error + Network status. host not found + Network status. connection refused + Network status. connection timed out + Network status. SSL handshake failed + Network status. proxy server connection refused + Network status. temporary failure + Network status. proxy authentication required + Network status. proxy server not found + Network status. success + Network status. uknown content + Network status. unknown error + Network status. authentication failed + Network status. content not found + Network status. diff --git a/localization/rssguard-nl_NL.ts b/localization/rssguard-nl_NL.ts index ba97e85cc..f2659a08b 100644 --- a/localization/rssguard-nl_NL.ts +++ b/localization/rssguard-nl_NL.ts @@ -5,6 +5,7 @@ CornerButton Open new tab + Tooltip for "new tab" webbrowser corner button. Open nieuw tabblad @@ -51,10 +52,12 @@ FeedsModel Title + Title text in the feed list header. Titel Titles of feeds/categories. + Feed list header tooltips. Naam van feeds/categorieën. @@ -63,6 +66,7 @@ Root + Name of root item of feed list which can be seen in feed add/edit dialog. Root @@ -1535,42 +1539,52 @@ de geïnstalleerde. 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 @@ -1674,19 +1688,14 @@ de geïnstalleerde. %n unread message(s). + Tooltip for "unread" column of feed list. +---------- +Tooltip for "unread" column of feed list. %n ongelezen bericht. %n ongelezen berichten. - - ATOM 1.0 - ATOM 1.0 - - - RSS 2.0/2.0.1 - RSS 2.0/2.0.1 - @@ -1695,17 +1704,10 @@ This category does not contain any nested items. Deze categorie bevat geen nested items. - - RDF - RDF - - - RSS 0.91/0.92/0.93 - RSS 0.91/0.92/0.93 - %1 (standard category) %2%3 + Tooltip for standard feed. %1 (standaard categorie) %2%3 @@ -1715,22 +1717,27 @@ Deze categorie bevat geen nested items. Access denied. Invalid username or password used. + Access to MySQL server was denied. Toegang geweigerd. Ongeldig gebruikersnaam of paswoord gebruikt. Unknown error. + Unknown MySQL error arised. Onbekende fout. does not use auto-update + Describes feed auto-update status. automatisch bijwerken niet gebruiken uses global settings + Describes feed auto-update status. gebruik algemene instellingen uses specific settings (%n minute(s) to next auto-update) + Describes feed auto-update status. gebruik specifieke instellingen (%n minuut voor volgende automatische update) gebruik specifieke instellingen (%n minuten voor volgende automatische update) @@ -1742,6 +1749,7 @@ Deze categorie bevat geen nested items. Encoding: %4 Auto-update status: %5 + Tooltip for feed. %1 (%2) %3 @@ -1754,58 +1762,72 @@ Status automatisch bijwerken: %5 protocol error + Network status. protocol fout host not found + Network status. host niet gevonden connection refused + Network status. verbinding geweigerd connection timed out + Network status. Verbindings time-out SSL handshake failed + Network status. SSL handshake is mislukt proxy server connection refused + Network status. proxy server verbinding geweigerd temporary failure + Network status. tijdelijke storing proxy authentication required + Network status. proxy verificatie vereist proxy server not found + Network status. proxy server niet gevonden success + Network status. succes uknown content + Network status. onbekende inhoud unknown error + Network status. onbekende fout authentication failed + Network status. verificatie mislukt content not found + Network status. inhoud niet gevonden diff --git a/src/core/databasefactory.cpp b/src/core/databasefactory.cpp index 8b58321a7..89d9b32f4 100644 --- a/src/core/databasefactory.cpp +++ b/src/core/databasefactory.cpp @@ -87,9 +87,11 @@ QString DatabaseFactory::mysqlInterpretErrorCode(MySQLError error_code) { return QObject::tr("No MySQL server is running in the target destination."); case MySQLAccessDenied: + //: Access to MySQL server was denied. return QObject::tr("Access denied. Invalid username or password used."); default: + //: Unknown MySQL error arised. return QObject::tr("Unknown error."); } } diff --git a/src/core/feedsmodel.cpp b/src/core/feedsmodel.cpp index 3e7a5272f..c2deb2d79 100644 --- a/src/core/feedsmodel.cpp +++ b/src/core/feedsmodel.cpp @@ -38,10 +38,16 @@ FeedsModel::FeedsModel(QObject *parent) : QAbstractItemModel(parent) { m_rootItem = new FeedsModelRootItem(); m_rootItem->setId(NO_PARENT_CATEGORY); + + //: Name of root item of feed list which can be seen in feed add/edit dialog. m_rootItem->setTitle(tr("Root")); m_rootItem->setIcon(IconThemeFactory::instance()->fromTheme("folder-root")); m_countsIcon = IconThemeFactory::instance()->fromTheme("mail-mark-unread"); + + //: Title text in the feed list header. m_headerData << tr("Title"); + + //: Feed list header tooltips. m_tooltipData << tr("Titles of feeds/categories.") << tr("Counts of unread/all meesages."); diff --git a/src/core/feedsmodelfeed.cpp b/src/core/feedsmodelfeed.cpp index 02fe56b92..ead675e89 100755 --- a/src/core/feedsmodelfeed.cpp +++ b/src/core/feedsmodelfeed.cpp @@ -52,17 +52,17 @@ int FeedsModelFeed::countOfUnreadMessages() const { QString FeedsModelFeed::typeToString(FeedsModelFeed::Type type) { switch (type) { case StandardAtom10: - return QObject::tr("ATOM 1.0"); + return "ATOM 1.0"; case StandardRdf: - return QObject::tr("RDF"); + return "RDF"; case StandardRss0X: - return QObject::tr("RSS 0.91/0.92/0.93"); + return "RSS 0.91/0.92/0.93"; case StandardRss2X: default: - return QObject::tr("RSS 2.0/2.0.1"); + return "RSS 2.0/2.0.1"; } } diff --git a/src/core/feedsmodelstandardcategory.cpp b/src/core/feedsmodelstandardcategory.cpp index e45cfb291..6afb93f72 100755 --- a/src/core/feedsmodelstandardcategory.cpp +++ b/src/core/feedsmodelstandardcategory.cpp @@ -40,6 +40,7 @@ QVariant FeedsModelStandardCategory::data(int column, int role) const { switch (role) { case Qt::ToolTipRole: if (column == FDS_MODEL_TITLE_INDEX) { + //: Tooltip for standard feed. return QObject::tr("%1 (standard category)\n" "%2%3").arg(m_title, m_description, @@ -48,6 +49,7 @@ QVariant FeedsModelStandardCategory::data(int column, int role) const { ""); } else if (column == FDS_MODEL_COUNTS_INDEX) { + //: Tooltip for "unread" column of feed list. return QObject::tr("%n unread message(s).", "", countOfUnreadMessages()); } else { diff --git a/src/core/feedsmodelstandardfeed.cpp b/src/core/feedsmodelstandardfeed.cpp index 8d33ef5f7..3ac79b9fb 100755 --- a/src/core/feedsmodelstandardfeed.cpp +++ b/src/core/feedsmodelstandardfeed.cpp @@ -227,15 +227,18 @@ QVariant FeedsModelStandardFeed::data(int column, int role) const { switch (m_autoUpdateType) { case DontAutoUpdate: + //: Describes feed auto-update status. auto_update_string = QObject::tr("does not use auto-update"); break; case DefaultAutoUpdate: + //: Describes feed auto-update status. auto_update_string = QObject::tr("uses global settings"); break; case SpecificAutoUpdate: default: + //: Describes feed auto-update status. auto_update_string = QObject::tr("uses specific settings " "(%n minute(s) to next auto-update)", 0, @@ -243,6 +246,7 @@ QVariant FeedsModelStandardFeed::data(int column, int role) const { break; } + //: Tooltip for feed. return QObject::tr("%1 (%2)\n" "%3\n\n" "Encoding: %4\n" @@ -253,6 +257,7 @@ QVariant FeedsModelStandardFeed::data(int column, int role) const { auto_update_string); } else if (column == FDS_MODEL_COUNTS_INDEX) { + //: Tooltip for "unread" column of feed list. return QObject::tr("%n unread message(s).", 0, countOfUnreadMessages()); } else { diff --git a/src/core/messagesmodel.cpp b/src/core/messagesmodel.cpp index cf9c42ba0..8757c075b 100644 --- a/src/core/messagesmodel.cpp +++ b/src/core/messagesmodel.cpp @@ -111,9 +111,17 @@ Message MessagesModel::messageAt(int row_index) const { } void MessagesModel::setupHeaderData() { - m_headerData << tr("Id") << tr("Read") << tr("Deleted") << tr("Important") << - tr("Feed") << tr("Title") << tr("Url") << tr("Author") << - tr("Created on") << tr("Contents"); + m_headerData << /*: Tooltip for ID of message.*/ tr("Id") << + /*: Tooltip for "read" column in msg list.*/ tr("Read") << + /*: Tooltip for "deleted" column in msg list.*/ tr("Deleted") << + /*: Tooltip for "important" column in msg list.*/ tr("Important") << + /*: Tooltip for name of feed for message.*/ tr("Feed") << + /*: Tooltip for title of message.*/ tr("Title") << + /*: Tooltip for url of message.*/ tr("Url") << + /*: Tooltip for author of message.*/ tr("Author") << + /*: Tooltip for creation date of message.*/ tr("Created on") << + /*: Tooltip for contents of message.*/ tr("Contents"); + m_tooltipData << tr("Id of the message.") << tr("Is message read?") << tr("Is message deleted?") << tr("Is message important?") << tr("Id of feed which this message belongs to.") << diff --git a/src/core/networkfactory.cpp b/src/core/networkfactory.cpp index 4bb9c2828..347b87bec 100644 --- a/src/core/networkfactory.cpp +++ b/src/core/networkfactory.cpp @@ -32,48 +32,62 @@ QString NetworkFactory::networkErrorText(QNetworkReply::NetworkError error_code) switch (error_code) { case QNetworkReply::ProtocolUnknownError: case QNetworkReply::ProtocolFailure: + //: Network status. return QObject::tr("protocol error"); case QNetworkReply::HostNotFoundError: + //: Network status. return QObject::tr("host not found"); case QNetworkReply::RemoteHostClosedError: case QNetworkReply::ConnectionRefusedError: + //: Network status. return QObject::tr("connection refused"); case QNetworkReply::TimeoutError: case QNetworkReply::ProxyTimeoutError: + //: Network status. return QObject::tr("connection timed out"); case QNetworkReply::SslHandshakeFailedError: + //: Network status. return QObject::tr("SSL handshake failed"); case QNetworkReply::ProxyConnectionClosedError: case QNetworkReply::ProxyConnectionRefusedError: + //: Network status. return QObject::tr("proxy server connection refused"); case QNetworkReply::TemporaryNetworkFailureError: + //: Network status. return QObject::tr("temporary failure"); case QNetworkReply::AuthenticationRequiredError: + //: Network status. return QObject::tr("authentication failed"); case QNetworkReply::ProxyAuthenticationRequiredError: + //: Network status. return QObject::tr("proxy authentication required"); case QNetworkReply::ProxyNotFoundError: + //: Network status. return QObject::tr("proxy server not found"); case QNetworkReply::NoError: + //: Network status. return QObject::tr("success"); case QNetworkReply::UnknownContentError: + //: Network status. return QObject::tr("uknown content"); case QNetworkReply::ContentNotFoundError: + //: Network status. return QObject::tr("content not found"); default: + //: Network status. return QObject::tr("unknown error"); } } diff --git a/src/core/networkfactory.h b/src/core/networkfactory.h index 529b75f47..c9a82eea8 100644 --- a/src/core/networkfactory.h +++ b/src/core/networkfactory.h @@ -23,7 +23,7 @@ class FeedsModelStandardFeed; -class NetworkFactory { +class NetworkFactory { private: // Constructor. explicit NetworkFactory(); diff --git a/src/gui/cornerbutton.cpp b/src/gui/cornerbutton.cpp index ce5da69a5..84a628874 100644 --- a/src/gui/cornerbutton.cpp +++ b/src/gui/cornerbutton.cpp @@ -21,6 +21,7 @@ CornerButton::CornerButton(QWidget *parent) : QToolButton(parent) { + //: Tooltip for "new tab" webbrowser corner button. setToolTip(tr("Open new tab")); setAutoRaise(true); setIcon(IconThemeFactory::instance()->fromTheme("list-add"));