diff --git a/localization/rssguard-cs_CZ.ts b/localization/rssguard-cs_CZ.ts
index 087e7f19a..0c182c800 100644
--- a/localization/rssguard-cs_CZ.ts
+++ b/localization/rssguard-cs_CZ.ts
@@ -522,6 +522,26 @@
Select previous messageVybrat předchozí zprávu
+
+ Check for updates
+
+
+
+ Check if new application updates are available.
+
+
+
+ Check if new update for the application is available for download.
+
+
+
+ Cannot check for updates
+
+
+
+ You cannot check for updates because feed update is ongoing.
+
+ FormSettings
@@ -1029,6 +1049,14 @@ Autoři této aplikace nenesou žádnou odpovědnost za ztrátu Vašich dat.Follow OS style
Podle nastavení systému
+
+ Keep message selection in the middle of the message list viewport
+
+
+
+ You dit not executed any connection test yet.
+
+ FormStandardCategoryDetails
@@ -1383,14 +1411,6 @@ Autoři této aplikace nenesou žádnou odpovědnost za ztrátu Vašich dat.Fetch metadata
Načíst metadata
-
- Feed metadata fetched successfully.
- Metadata načtena úspěšně.
-
-
- Error occurred.
- Při načtení nastala chyba.
- No metadata fetched so far.Metadata doposud nenačtena.
@@ -1407,6 +1427,88 @@ Autoři této aplikace nenesou žádnou odpovědnost za ztrátu Vašich dat.Do not auto-update at all
Zakázat auto-aktualizace
+
+ All metadata fetched successfully.
+
+
+
+ Feed and icon metadata fetched.
+
+
+
+ Result: %1.
+
+
+
+ Feed or icon metatada not fetched.
+
+
+
+ Error: %1.
+
+
+
+ No metadata fetched.
+
+
+
+
+ FormUpdate
+
+ Dialog
+
+
+
+ Current release
+
+
+
+ Available release
+
+
+
+ Changes
+
+
+
+ Status
+
+
+
+ unknown
+
+
+
+ Connection error occurred.
+
+
+
+ List with updates was not
+downloaded successfully.
+
+
+
+ New release available.
+
+
+
+ This is new version which can be
+downloaded and installed.
+
+
+
+ This is new version. Upgrade to it manually or via your system package manager.
+
+
+
+ No new releases available.
+
+
+
+ This release is not newer than
+currently installed one..
+
+ FormWelcome
@@ -1653,6 +1755,54 @@ Status auto-aktualizace: %5
MySQL server works as expected.MySQL server pracuje v pořádku.
+
+ protocol error
+
+
+
+ host not found
+
+
+
+ connection refused
+
+
+
+ connection timed out
+
+
+
+ SSL handshake failed
+
+
+
+ proxy server connection refused
+
+
+
+ temporary failure
+
+
+
+ proxy authentication required
+
+
+
+ proxy server not found
+
+
+
+ success
+
+
+
+ uknown content
+
+
+
+ unknown error
+
+ ShortcutCatcher
diff --git a/localization/rssguard-en_GB.ts b/localization/rssguard-en_GB.ts
index 2be899efd..b84a37234 100644
--- a/localization/rssguard-en_GB.ts
+++ b/localization/rssguard-en_GB.ts
@@ -522,6 +522,26 @@
Select previous message
+
+ Check for updates
+
+
+
+ Check if new application updates are available.
+
+
+
+ Check if new update for the application is available for download.
+
+
+
+ Cannot check for updates
+
+
+
+ You cannot check for updates because feed update is ongoing.
+
+ FormSettings
@@ -1011,6 +1031,14 @@ Authors of this application are NOT responsible for lost data.
Follow OS style
+
+ Keep message selection in the middle of the message list viewport
+
+
+
+ You dit not executed any connection test yet.
+
+ FormStandardCategoryDetails
@@ -1365,14 +1393,6 @@ Authors of this application are NOT responsible for lost data.
Fetch metadata
-
- Feed metadata fetched successfully.
-
-
-
- Error occurred.
-
- No metadata fetched so far.
@@ -1389,6 +1409,88 @@ Authors of this application are NOT responsible for lost data.
Do not auto-update at all
+
+ All metadata fetched successfully.
+
+
+
+ Feed and icon metadata fetched.
+
+
+
+ Result: %1.
+
+
+
+ Feed or icon metatada not fetched.
+
+
+
+ Error: %1.
+
+
+
+ No metadata fetched.
+
+
+
+
+ FormUpdate
+
+ Dialog
+
+
+
+ Current release
+
+
+
+ Available release
+
+
+
+ Changes
+
+
+
+ Status
+
+
+
+ unknown
+
+
+
+ Connection error occurred.
+
+
+
+ List with updates was not
+downloaded successfully.
+
+
+
+ New release available.
+
+
+
+ This is new version which can be
+downloaded and installed.
+
+
+
+ This is new version. Upgrade to it manually or via your system package manager.
+
+
+
+ No new releases available.
+
+
+
+ This release is not newer than
+currently installed one..
+
+ FormWelcome
@@ -1626,6 +1728,54 @@ Auto-update status: %5
MySQL server works as expected.
+
+ protocol error
+
+
+
+ host not found
+
+
+
+ connection refused
+
+
+
+ connection timed out
+
+
+
+ SSL handshake failed
+
+
+
+ proxy server connection refused
+
+
+
+ temporary failure
+
+
+
+ proxy authentication required
+
+
+
+ proxy server not found
+
+
+
+ success
+
+
+
+ uknown content
+
+
+
+ unknown error
+
+ ShortcutCatcher
diff --git a/localization/rssguard-nl_NL.ts b/localization/rssguard-nl_NL.ts
index 519422a99..71934d25a 100644
--- a/localization/rssguard-nl_NL.ts
+++ b/localization/rssguard-nl_NL.ts
@@ -522,6 +522,26 @@
Select previous message
+
+ Check for updates
+
+
+
+ Check if new application updates are available.
+
+
+
+ Check if new update for the application is available for download.
+
+
+
+ Cannot check for updates
+
+
+
+ You cannot check for updates because feed update is ongoing.
+
+ FormSettings
@@ -1029,6 +1049,14 @@ Auteurs van Rssguard zijn NIET verantwoordelijk voor verlies van gegevens.Follow OS style
+
+ Keep message selection in the middle of the message list viewport
+
+
+
+ You dit not executed any connection test yet.
+
+ FormStandardCategoryDetails
@@ -1383,14 +1411,6 @@ Auteurs van Rssguard zijn NIET verantwoordelijk voor verlies van gegevens.Fetch metadata
-
- Feed metadata fetched successfully.
-
-
-
- Error occurred.
-
- No metadata fetched so far.
@@ -1407,6 +1427,88 @@ Auteurs van Rssguard zijn NIET verantwoordelijk voor verlies van gegevens.Do not auto-update at all
+
+ All metadata fetched successfully.
+
+
+
+ Feed and icon metadata fetched.
+
+
+
+ Result: %1.
+
+
+
+ Feed or icon metatada not fetched.
+
+
+
+ Error: %1.
+
+
+
+ No metadata fetched.
+
+
+
+
+ FormUpdate
+
+ Dialog
+
+
+
+ Current release
+
+
+
+ Available release
+
+
+
+ Changes
+
+
+
+ Status
+
+
+
+ unknown
+
+
+
+ Connection error occurred.
+
+
+
+ List with updates was not
+downloaded successfully.
+
+
+
+ New release available.
+
+
+
+ This is new version which can be
+downloaded and installed.
+
+
+
+ This is new version. Upgrade to it manually or via your system package manager.
+
+
+
+ No new releases available.
+
+
+
+ This release is not newer than
+currently installed one..
+
+ FormWelcome
@@ -1651,6 +1753,54 @@ Status automatisch bijwerken: %5
MySQL server works as expected.
+
+ protocol error
+
+
+
+ host not found
+
+
+
+ connection refused
+
+
+
+ connection timed out
+
+
+
+ SSL handshake failed
+
+
+
+ proxy server connection refused
+
+
+
+ temporary failure
+
+
+
+ proxy authentication required
+
+
+
+ proxy server not found
+
+
+
+ success
+
+
+
+ uknown content
+
+
+
+ unknown error
+
+ ShortcutCatcher
diff --git a/src/core/feedsmodelstandardfeed.cpp b/src/core/feedsmodelstandardfeed.cpp
index 4f62462ea..3d87e8d8f 100755
--- a/src/core/feedsmodelstandardfeed.cpp
+++ b/src/core/feedsmodelstandardfeed.cpp
@@ -126,10 +126,6 @@ QPair 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 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 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;
diff --git a/src/gui/formstandardfeeddetails.cpp b/src/gui/formstandardfeeddetails.cpp
index 5548cd28a..ff9032b59 100644
--- a/src/gui/formstandardfeeddetails.cpp
+++ b/src/gui/formstandardfeeddetails.cpp
@@ -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.