diff --git a/include/functions.php b/include/functions.php
index f883a12e7..4265692ec 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -1663,7 +1663,7 @@
'caption', 'cite', 'center', 'code', 'col', 'colgroup',
'data', 'dd', 'del', 'details', 'description', 'dfn', 'div', 'dl', 'font',
'dt', 'em', 'footer', 'figure', 'figcaption',
- 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'header', 'html', 'i',
+ 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'header', 'hr', 'html', 'i',
'img', 'ins', 'kbd', 'li', 'main', 'mark', 'nav', 'noscript',
'ol', 'p', 'pre', 'q', 'ruby', 'rp', 'rt', 's', 'samp', 'section',
'small', 'source', 'span', 'strike', 'strong', 'sub', 'summary',
diff --git a/locale/de_DE/LC_MESSAGES/messages.mo b/locale/de_DE/LC_MESSAGES/messages.mo
index 7a307dad8..b29dd8322 100644
Binary files a/locale/de_DE/LC_MESSAGES/messages.mo and b/locale/de_DE/LC_MESSAGES/messages.mo differ
diff --git a/locale/de_DE/LC_MESSAGES/messages.po b/locale/de_DE/LC_MESSAGES/messages.po
index fe549e93d..2c2f11881 100644
--- a/locale/de_DE/LC_MESSAGES/messages.po
+++ b/locale/de_DE/LC_MESSAGES/messages.po
@@ -3371,7 +3371,7 @@ msgstr "Keine Profile ausgewählt."
#: js/prefs.js:1353 js/prefs.js:1406
msgid "Activate selected profile?"
-msgstr "Ausgewählte Profile entfernen?"
+msgstr "Ausgewählte Profile aktivieren?"
#: js/prefs.js:1370 js/prefs.js:1422
msgid "Please choose a profile to activate."
diff --git a/plugins/af_comics/init.php b/plugins/af_comics/init.php
index 6bd3c23e2..54054399e 100644
--- a/plugins/af_comics/init.php
+++ b/plugins/af_comics/init.php
@@ -65,7 +65,7 @@ class Af_Comics extends Plugin {
}
print "";
- print "".__('GoComics requires a specific URL to workaround their lack of feed support: http://feeds.feedburner.com/uclick/comic_name (e.g. http://www.gocomics.com/garfield uses http://feeds.feedburner.com/uclick/garfield).')."
";
+ print "".__("To subscribe to GoComics use the comic's regular web page as the feed URL (e.g. for the Garfield comic use http://www.gocomics.com/garfield).")."
";
print "".__('Drop any updated filters into filters.local in plugin directory.')."
";
@@ -89,7 +89,7 @@ class Af_Comics extends Plugin {
if ($auth_login || $auth_pass)
return $feed_data;
- if (preg_match('#^https?://feeds.feedburner.com/uclick/([-a-z]+)#', $fetch_url, $comic)) {
+ if (preg_match('#^https?://(?:feeds\.feedburner\.com/uclick|www\.gocomics\.com)/([-a-z0-9]+)$#i', $fetch_url, $comic)) {
$site_url = 'http://www.gocomics.com/' . $comic[1];
$article_link = $site_url . date('/Y/m/d');
diff --git a/prefs.php b/prefs.php
index b1cdb0b49..82f23f583 100644
--- a/prefs.php
+++ b/prefs.php
@@ -31,6 +31,7 @@
Tiny Tiny RSS : <?php echo __("Preferences") ?>
+