Better error texts.

This commit is contained in:
Martin Rotter 2014-02-22 21:08:47 +01:00
parent 0a6671e86e
commit add7708052
5 changed files with 482 additions and 36 deletions

View File

@ -522,6 +522,26 @@
<source>Select previous message</source>
<translation>Vybrat předchozí zprávu</translation>
</message>
<message>
<source>Check for updates</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Check if new application updates are available.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Check if new update for the application is available for download.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cannot check for updates</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>You cannot check for updates because feed update is ongoing.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FormSettings</name>
@ -1029,6 +1049,14 @@ Autoři této aplikace nenesou žádnou odpovědnost za ztrátu Vašich dat.</tr
<source>Follow OS style</source>
<translation>Podle nastavení systému</translation>
</message>
<message>
<source>Keep message selection in the middle of the message list viewport</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>You dit not executed any connection test yet.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FormStandardCategoryDetails</name>
@ -1383,14 +1411,6 @@ Autoři této aplikace nenesou žádnou odpovědnost za ztrátu Vašich dat.</tr
<source>Fetch metadata</source>
<translation>Načíst metadata</translation>
</message>
<message>
<source>Feed metadata fetched successfully.</source>
<translation>Metadata načtena úspěšně.</translation>
</message>
<message>
<source>Error occurred.</source>
<translation>Při načtení nastala chyba.</translation>
</message>
<message>
<source>No metadata fetched so far.</source>
<translation>Metadata doposud nenačtena.</translation>
@ -1407,6 +1427,88 @@ Autoři této aplikace nenesou žádnou odpovědnost za ztrátu Vašich dat.</tr
<source>Do not auto-update at all</source>
<translation>Zakázat auto-aktualizace</translation>
</message>
<message>
<source>All metadata fetched successfully.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Feed and icon metadata fetched.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Result: %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Feed or icon metatada not fetched.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Error: %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>No metadata fetched.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FormUpdate</name>
<message>
<source>Dialog</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Current release</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Available release</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Changes</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Status</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>unknown</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Connection error occurred.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>List with updates was not
downloaded successfully.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>New release available.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>This is new version which can be
downloaded and installed.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>This is new version. Upgrade to it manually or via your system package manager.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>No new releases available.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>This release is not newer than
currently installed one..</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FormWelcome</name>
@ -1653,6 +1755,54 @@ Status auto-aktualizace: %5</translation>
<source>MySQL server works as expected.</source>
<translation>MySQL server pracuje v pořádku.</translation>
</message>
<message>
<source>protocol error</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>host not found</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>connection refused</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>connection timed out</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>SSL handshake failed</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>proxy server connection refused</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>temporary failure</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>proxy authentication required</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>proxy server not found</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>success</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>uknown content</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>unknown error</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ShortcutCatcher</name>

View File

@ -522,6 +522,26 @@
<source>Select previous message</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Check for updates</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Check if new application updates are available.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Check if new update for the application is available for download.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cannot check for updates</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>You cannot check for updates because feed update is ongoing.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FormSettings</name>
@ -1011,6 +1031,14 @@ Authors of this application are NOT responsible for lost data.</source>
<source>Follow OS style</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Keep message selection in the middle of the message list viewport</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>You dit not executed any connection test yet.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FormStandardCategoryDetails</name>
@ -1365,14 +1393,6 @@ Authors of this application are NOT responsible for lost data.</source>
<source>Fetch metadata</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Feed metadata fetched successfully.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Error occurred.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>No metadata fetched so far.</source>
<translation type="unfinished"></translation>
@ -1389,6 +1409,88 @@ Authors of this application are NOT responsible for lost data.</source>
<source>Do not auto-update at all</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>All metadata fetched successfully.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Feed and icon metadata fetched.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Result: %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Feed or icon metatada not fetched.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Error: %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>No metadata fetched.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FormUpdate</name>
<message>
<source>Dialog</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Current release</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Available release</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Changes</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Status</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>unknown</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Connection error occurred.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>List with updates was not
downloaded successfully.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>New release available.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>This is new version which can be
downloaded and installed.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>This is new version. Upgrade to it manually or via your system package manager.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>No new releases available.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>This release is not newer than
currently installed one..</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FormWelcome</name>
@ -1626,6 +1728,54 @@ Auto-update status: %5</source>
<source>MySQL server works as expected.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>protocol error</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>host not found</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>connection refused</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>connection timed out</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>SSL handshake failed</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>proxy server connection refused</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>temporary failure</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>proxy authentication required</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>proxy server not found</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>success</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>uknown content</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>unknown error</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ShortcutCatcher</name>

View File

@ -522,6 +522,26 @@
<source>Select previous message</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Check for updates</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Check if new application updates are available.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Check if new update for the application is available for download.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cannot check for updates</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>You cannot check for updates because feed update is ongoing.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FormSettings</name>
@ -1029,6 +1049,14 @@ Auteurs van Rssguard zijn NIET verantwoordelijk voor verlies van gegevens.</tran
<source>Follow OS style</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Keep message selection in the middle of the message list viewport</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>You dit not executed any connection test yet.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FormStandardCategoryDetails</name>
@ -1383,14 +1411,6 @@ Auteurs van Rssguard zijn NIET verantwoordelijk voor verlies van gegevens.</tran
<source>Fetch metadata</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Feed metadata fetched successfully.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Error occurred.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>No metadata fetched so far.</source>
<translation type="unfinished"></translation>
@ -1407,6 +1427,88 @@ Auteurs van Rssguard zijn NIET verantwoordelijk voor verlies van gegevens.</tran
<source>Do not auto-update at all</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>All metadata fetched successfully.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Feed and icon metadata fetched.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Result: %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Feed or icon metatada not fetched.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Error: %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>No metadata fetched.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FormUpdate</name>
<message>
<source>Dialog</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Current release</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Available release</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Changes</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Status</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>unknown</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Connection error occurred.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>List with updates was not
downloaded successfully.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>New release available.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>This is new version which can be
downloaded and installed.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>This is new version. Upgrade to it manually or via your system package manager.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>No new releases available.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>This release is not newer than
currently installed one..</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FormWelcome</name>
@ -1651,6 +1753,54 @@ Status automatisch bijwerken: %5</translation>
<source>MySQL server works as expected.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>protocol error</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>host not found</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>connection refused</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>connection timed out</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>SSL handshake failed</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>proxy server connection refused</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>temporary failure</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>proxy authentication required</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>proxy server not found</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>success</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>uknown content</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>unknown error</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ShortcutCatcher</name>

View File

@ -126,10 +126,6 @@ QPair<FeedsModelStandardFeed*, QNetworkReply::NetworkError> FeedsModelStandardFe
QString root_tag_name = root_element.tagName();
if (root_tag_name == "rdf:RDF") {
if (result.first == NULL) {
result.first = new FeedsModelStandardFeed();
}
// We found RDF feed.
QDomElement channel_element = root_element.namedItem("channel").toElement();
@ -138,10 +134,6 @@ QPair<FeedsModelStandardFeed*, QNetworkReply::NetworkError> FeedsModelStandardFe
result.first->setDescription(channel_element.namedItem("description").toElement().text());
}
else if (root_tag_name == "rss") {
if (result.first == NULL) {
result.first = new FeedsModelStandardFeed();
}
// We found RSS 0.91/0.92/0.93/2.0/2.0.1 feed.
QString rss_type = root_element.attribute("version", "2.0");
@ -158,15 +150,16 @@ QPair<FeedsModelStandardFeed*, QNetworkReply::NetworkError> FeedsModelStandardFe
result.first->setDescription(channel_element.namedItem("description").toElement().text());
}
else if (root_tag_name == "feed") {
if (result.first == NULL) {
result.first = new FeedsModelStandardFeed();
}
// We found ATOM feed.
result.first->setType(StandardAtom10);
result.first->setTitle(root_element.namedItem("title").toElement().text());
result.first->setDescription(root_element.namedItem("subtitle").toElement().text());
}
else {
// File was downloaded and it really was XML file
// but feed format was NOT recognized.
result.second = QNetworkReply::UnknownContentError;
}
}
return result;

View File

@ -267,6 +267,9 @@ void FormStandardFeedDetails::guessFeed() {
tr("Result: %1.").arg(NetworkFactory::networkErrorText(result.second)),
tr("Feed or icon metatada not fetched."));
}
// Remove temporary feed object.
delete result.first;
}
else {
// No feed guessed, even no icon available.