From 7ac6ab4dda90b20afe148c621eb39881f476390e Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@madoka.volgo-balt.ru>
Date: Wed, 1 Jun 2016 16:21:03 +0300
Subject: set referrer-policy to none

---
 index.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/index.php b/index.php
index 10c754803..203ecef66 100644
--- a/index.php
+++ b/index.php
@@ -118,6 +118,7 @@
 	</script>
 
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+	<meta name="referrer" content="none"/>
 
 	<script type="text/javascript">
 		Event.observe(window, 'load', function() {
-- 
cgit v1.2.3


From 2e68712261169d23ea7318d8c8085fc1079a78ef Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@madoka.volgo-balt.ru>
Date: Fri, 3 Jun 2016 12:08:03 +0300
Subject: set referrer policy to 'no-referrer'

---
 index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.php b/index.php
index 203ecef66..ecde3bae2 100644
--- a/index.php
+++ b/index.php
@@ -118,7 +118,7 @@
 	</script>
 
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-	<meta name="referrer" content="none"/>
+	<meta name="referrer" content="no-referrer"/>
 
 	<script type="text/javascript">
 		Event.observe(window, 'load', function() {
-- 
cgit v1.2.3


From 582ff3cf6e617ccb6d6164da7381db80a0183127 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@madoka.volgo-balt.ru>
Date: Tue, 5 Jul 2016 11:01:36 +0300
Subject: af_redditimgur: make sure content_link is defined even if content
 dupcheck is disabled

---
 plugins/af_redditimgur/init.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/af_redditimgur/init.php b/plugins/af_redditimgur/init.php
index 2e0748137..8243b94c4 100755
--- a/plugins/af_redditimgur/init.php
+++ b/plugins/af_redditimgur/init.php
@@ -301,8 +301,9 @@ class Af_RedditImgur extends Plugin {
 			@$doc->loadHTML($article["content"]);
 			$xpath = new DOMXPath($doc);
 
+			$content_link = $xpath->query("(//a[contains(., '[link]')])")->item(0);
+
 			if ($this->host->get($this, "enable_content_dupcheck")) {
-				$content_link = $xpath->query("(//a[contains(., '[link]')])")->item(0);
 
 				if ($content_link) {
 					$content_href = db_escape_string($content_link->getAttribute("href"));
-- 
cgit v1.2.3


From cfc2fe50cb32b43f4c60c1445458eb2211c20583 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@madoka.volgo-balt.ru>
Date: Tue, 5 Jul 2016 11:48:36 +0300
Subject: fix sql error when subscribing to a feed using feed archive

---
 classes/rpc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/rpc.php b/classes/rpc.php
index 617c7a22b..9eb8dbd70 100755
--- a/classes/rpc.php
+++ b/classes/rpc.php
@@ -438,7 +438,7 @@ class RPC extends Handler_Protected {
 					if ($this->dbh->num_rows($result) == 0) {
 						$result = $this->dbh->query("INSERT INTO ttrss_feeds
 										(owner_uid,feed_url,title,cat_id,site_url)
-									VALUES ('$id','".$_SESSION["uid"]."',
+									VALUES ('".$_SESSION["uid"]."',
 									'$feed_url', '$title', NULL, '$site_url')");
 					}
 				}
-- 
cgit v1.2.3


From eb95d1bddf12c6bd11d2d3af5a524e1216ea2264 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Thu, 7 Jul 2016 09:04:38 +0300
Subject: af_redditimgur: handle i.reddituploads.com as pictures

---
 plugins/af_redditimgur/init.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/af_redditimgur/init.php b/plugins/af_redditimgur/init.php
index 8243b94c4..f32578450 100755
--- a/plugins/af_redditimgur/init.php
+++ b/plugins/af_redditimgur/init.php
@@ -179,7 +179,9 @@ class Af_RedditImgur extends Plugin {
 					$found = true;
 				}
 
-				if (preg_match("/\.(jpg|jpeg|gif|png)(\?[0-9][0-9]*)?$/i", $entry->getAttribute("href"))) {
+				if (preg_match("/\.(jpg|jpeg|gif|png)(\?[0-9][0-9]*)?$/i", $entry->getAttribute("href")) ||
+					mb_strpos($entry->getAttribute("href"), "i.reddituploads.com") !== FALSE) {
+
 					_debug("Handling as a picture", $debug);
 
 					$img = $doc->createElement('img');
-- 
cgit v1.2.3


From e6905f7f875db71c934693732b3e03f852268e2c Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Thu, 7 Jul 2016 10:02:55 +0300
Subject: test if mb_internal_encoding() is available in functions.php head

---
 include/functions.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/include/functions.php b/include/functions.php
index d6bd5fb73..3ccc09d75 100755
--- a/include/functions.php
+++ b/include/functions.php
@@ -16,7 +16,9 @@
 
 	libxml_disable_entity_loader(true);
 
-	mb_internal_encoding("UTF-8");
+	// separate test because this is included before sanity checks
+	if (function_exists("mb_internal_encoding")) mb_internal_encoding("UTF-8");
+
 	date_default_timezone_set('UTC');
 	if (defined('E_DEPRECATED')) {
 		error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED);
-- 
cgit v1.2.3


From 5d97019d5d30b259b84feba246eeb4ee08b42a99 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Wed, 20 Jul 2016 13:52:22 +0300
Subject: api: load user plugins properly

---
 api/index.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/api/index.php b/api/index.php
index a8484ef0e..b02a5d679 100644
--- a/api/index.php
+++ b/api/index.php
@@ -57,6 +57,10 @@
 
 	if (!init_plugins()) return;
 
+	if ($_SESSION["uid"]) {
+		load_user_plugins( $_SESSION["uid"]);
+	}
+
 	$method = strtolower($_REQUEST["op"]);
 
 	$handler = new API($_REQUEST);
-- 
cgit v1.2.3


From 4afcf635635c548bbad0a27b7c9c7d2b3804fc61 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Wed, 20 Jul 2016 13:55:51 +0300
Subject: api host: add session validation

---
 api/index.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/api/index.php b/api/index.php
index b02a5d679..d451a3ac8 100644
--- a/api/index.php
+++ b/api/index.php
@@ -58,6 +58,16 @@
 	if (!init_plugins()) return;
 
 	if ($_SESSION["uid"]) {
+		if (!validate_session()) {
+			header("Content-Type: text/json");
+
+			print json_encode(array("seq" => -1,
+				"status" => 1,
+				"content" => array("error" => "NOT_LOGGED_IN")));
+
+			return;
+		}
+
 		load_user_plugins( $_SESSION["uid"]);
 	}
 
-- 
cgit v1.2.3


From 18186149495108becf8e07344cbafef9110b5aa3 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Wed, 20 Jul 2016 15:38:42 +0300
Subject: api: fix article guid not being passed to render article hook

---
 classes/api.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/classes/api.php b/classes/api.php
index 9be04cff9..35c5d5f38 100644
--- a/classes/api.php
+++ b/classes/api.php
@@ -330,7 +330,7 @@ class API extends Handler {
 
 		if ($article_id) {
 
-			$query = "SELECT id,title,link,content,feed_id,comments,int_id,
+			$query = "SELECT id,guid,title,link,content,feed_id,comments,int_id,
 				marked,unread,published,score,note,lang,
 				".SUBSTRING_FOR_DATE."(updated,1,16) as updated,
 				author,(SELECT title FROM ttrss_feeds WHERE id = feed_id) AS feed_title,
@@ -352,6 +352,7 @@ class API extends Handler {
 
 					$article = array(
 						"id" => $line["id"],
+						"guid" => $line["guid"],
 						"title" => $line["title"],
 						"link" => $line["link"],
 						"labels" => get_article_labels($line['id']),
@@ -753,6 +754,7 @@ class API extends Handler {
 
 					$headline_row = array(
 						"id" => (int)$line["id"],
+						"guid" => $line["guid"],
 						"unread" => sql_bool_to_bool($line["unread"]),
 						"marked" => sql_bool_to_bool($line["marked"]),
 						"published" => sql_bool_to_bool($line["published"]),
-- 
cgit v1.2.3


From dae16f72c9551584ccccce2e058f179f62b6ed09 Mon Sep 17 00:00:00 2001
From: JustAMacUser <donotreply@example.org>
Date: Tue, 26 Jul 2016 03:51:22 -0400
Subject: Only strings need 4-byte filtering.

---
 include/rssfuncs.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 mode change 100755 => 100644 include/rssfuncs.php

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
old mode 100755
new mode 100644
index c01e703d1..21ffcbb76
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -778,7 +778,7 @@
 					foreach ($article as $k => $v) {
 
 						// i guess we'll have to take the risk of 4byte unicode labels & tags here
-						if (!is_array($article[$k])) {
+						if (is_string($article[$k])) {
 							$article[$k] = preg_replace('/[\x{10000}-\x{10FFFF}]/u', "\xEF\xBF\xBD", $v);
 						}
 					}
-- 
cgit v1.2.3


From 76ba1df76e9ce3733c990e1d953706b691ee7b14 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Tue, 26 Jul 2016 15:46:54 +0300
Subject: af_redditimgur: use browser UA for readability requests

---
 plugins/af_redditimgur/init.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/plugins/af_redditimgur/init.php b/plugins/af_redditimgur/init.php
index f32578450..1068ec548 100755
--- a/plugins/af_redditimgur/init.php
+++ b/plugins/af_redditimgur/init.php
@@ -349,24 +349,27 @@ class Af_RedditImgur extends Plugin {
 					/* link may lead to a huge video file or whatever, we need to check content type before trying to
 					parse it which p much requires curl */
 
+					$useragent_compat = "Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; WOW64; Trident/6.0)";
+
 					$ch = curl_init($content_link->getAttribute("href"));
 					curl_setopt($ch, CURLOPT_TIMEOUT, 5);
 					curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
 					curl_setopt($ch, CURLOPT_HEADER, true);
 					curl_setopt($ch, CURLOPT_NOBODY, true);
 					curl_setopt($ch, CURLOPT_FOLLOWLOCATION, !ini_get("open_basedir"));
-					curl_setopt($ch, CURLOPT_USERAGENT, SELF_USER_AGENT);
+					curl_setopt($ch, CURLOPT_USERAGENT, $useragent_compat);
 
 					@$result = curl_exec($ch);
 					$content_type = curl_getinfo($ch, CURLINFO_CONTENT_TYPE);
 
 					if ($content_type && strpos($content_type, "text/html") !== FALSE) {
 
-						$tmp = fetch_file_contents($content_link->getAttribute("href"));
+						$tmp = fetch_file_contents(array("url" => $content_link->getAttribute("href"),
+							"useragent" => $useragent_compat));
 
 						//_debug("tmplen: " . mb_strlen($tmp));
 
-						if ($tmp && mb_strlen($tmp) < 65535 * 4) {
+						if ($tmp && mb_strlen($tmp) < 1024 * 250) {
 
 							$r = new Readability($tmp, $content_link->getAttribute("href"));
 
-- 
cgit v1.2.3


From 64c24ecb5973adad700612b0ec913b190e8b1e58 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Tue, 26 Jul 2016 15:55:00 +0300
Subject: add hotkey for toggling VFEED_GROUP_BY_FEED preference

---
 include/functions2.php |  2 ++
 js/tt-rss.js           | 10 ++++++++++
 2 files changed, 12 insertions(+)

diff --git a/include/functions2.php b/include/functions2.php
index 0a4f4309e..aab73d342 100644
--- a/include/functions2.php
+++ b/include/functions2.php
@@ -89,6 +89,7 @@
 				"feed_edit" => __("Edit feed"),
 				"feed_catchup" => __("Mark as read"),
 				"feed_reverse" => __("Reverse headlines"),
+				"feed_toggle_vgroup" => __("Toggle headline grouping"),
 				"feed_debug_update" => __("Debug feed update"),
 				"feed_debug_viewfeed" => __("Debug viewfeed()"),
 				"catchup_all" => __("Mark all feeds as read"),
@@ -158,6 +159,7 @@
 				"f e" => "feed_edit",
 				"f q" => "feed_catchup",
 				"f x" => "feed_reverse",
+				"f g" => "feed_toggle_vgroup",
 				"f *d" => "feed_debug_update",
 				"f *g" => "feed_debug_viewfeed",
 				"f *c" => "toggle_combined_mode",
diff --git a/js/tt-rss.js b/js/tt-rss.js
index 2f738810b..108b65a7f 100644
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -441,6 +441,16 @@ function init() {
 		hotkey_actions["feed_reverse"] = function() {
 				reverseHeadlineOrder();
 		};
+		hotkey_actions["feed_toggle_vgroup"] = function() {
+			var query_str = "?op=rpc&method=togglepref&key=VFEED_GROUP_BY_FEED";
+
+			new Ajax.Request("backend.php", {
+				parameters: query_str,
+				onComplete: function(transport) {
+					viewCurrentFeed();
+			} });
+
+		};
 		hotkey_actions["catchup_all"] = function() {
 				catchupAllFeeds();
 		};
-- 
cgit v1.2.3


From a6fde6c99f7295f0a3fc3e97333158b10e714af5 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Tue, 26 Jul 2016 16:29:17 +0300
Subject: af_redditimgur: support video elements in imgur albums

---
 plugins/af_redditimgur/init.php | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/plugins/af_redditimgur/init.php b/plugins/af_redditimgur/init.php
index 1068ec548..af58197cd 100755
--- a/plugins/af_redditimgur/init.php
+++ b/plugins/af_redditimgur/init.php
@@ -239,7 +239,7 @@ class Af_RedditImgur extends Plugin {
 
 							//if ($debug) print_r($album_content);
 
-							$aentries = $axpath->query("(//div[@class='post-image']/img[@src] | //a[@class='zoom']/img[@src])");
+							$aentries = $axpath->query("(//div[@class='post-image']/img[@src] | //a[@class='zoom']/img[@src] | //div[@class='video-elements']/source)");
 							$urls = [];
 
 							foreach ($aentries as $aentry) {
@@ -247,14 +247,27 @@ class Af_RedditImgur extends Plugin {
 								$url = $aentry->getAttribute("src");
 
 								if (!in_array($url, $urls)) {
-									$img = $doc->createElement('img');
-									$img->setAttribute("src", $url);
-									$entry->parentNode->insertBefore($doc->createElement('br'), $entry);
 
-									$br = $doc->createElement('br');
+									if ($aentry->tagName == "img") {
 
-									$entry->parentNode->insertBefore($img, $entry);
-									$entry->parentNode->insertBefore($br, $entry);
+										$img = $doc->createElement('img');
+										$img->setAttribute("src", $url);
+										$entry->parentNode->insertBefore($doc->createElement('br'), $entry);
+
+										$br = $doc->createElement('br');
+
+										$entry->parentNode->insertBefore($img, $entry);
+										$entry->parentNode->insertBefore($br, $entry);
+									} else if ($aentry->tagName == "source") {
+
+										if (strpos($url, "i.imgur.com") !== FALSE)
+											$poster_url = str_replace(".mp4", "h.jpg", $url);
+										else
+											$poster_url = "";
+
+										$this->handle_as_video($doc, $entry, $url, $poster_url);
+
+									}
 
 									array_push($urls, $url);
 
-- 
cgit v1.2.3


From d419aed5434cd425a0b9be3f65cd6c8c6f930d1a Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Mon, 1 Aug 2016 08:26:11 +0300
Subject: trgm plugin: increase check distance to 3 days

---
 plugins/af_psql_trgm/init.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/af_psql_trgm/init.php b/plugins/af_psql_trgm/init.php
index 521db4b85..0de46b085 100644
--- a/plugins/af_psql_trgm/init.php
+++ b/plugins/af_psql_trgm/init.php
@@ -274,7 +274,7 @@ class Af_Psql_Trgm extends Plugin {
 
 		$result = db_query("SELECT COUNT(id) AS nequal
 		  FROM ttrss_entries, ttrss_user_entries WHERE ref_id = id AND
-		  date_entered >= NOW() - interval '1 day' AND
+		  date_entered >= NOW() - interval '3 days' AND
 		  title = '$title_escaped' AND
 		  guid != '$entry_guid' AND
 		  owner_uid = $owner_uid");
-- 
cgit v1.2.3


From 90e45935bb5573a94afa369a789f45e923f7bc9f Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@madoka.volgo-balt.ru>
Date: Mon, 1 Aug 2016 16:20:14 +0300
Subject: af_redditimgur: try to guess images to embed using content-type

---
 plugins/af_redditimgur/init.php | 33 ++++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/plugins/af_redditimgur/init.php b/plugins/af_redditimgur/init.php
index af58197cd..7414656d5 100755
--- a/plugins/af_redditimgur/init.php
+++ b/plugins/af_redditimgur/init.php
@@ -180,7 +180,8 @@ class Af_RedditImgur extends Plugin {
 				}
 
 				if (preg_match("/\.(jpg|jpeg|gif|png)(\?[0-9][0-9]*)?$/i", $entry->getAttribute("href")) ||
-					mb_strpos($entry->getAttribute("href"), "i.reddituploads.com") !== FALSE) {
+					mb_strpos($entry->getAttribute("href"), "i.reddituploads.com") !== FALSE ||
+					mb_strpos($this->get_content_type($entry->getAttribute("href")), "image/") !== FALSE) {
 
 					_debug("Handling as a picture", $debug);
 
@@ -364,16 +365,7 @@ class Af_RedditImgur extends Plugin {
 
 					$useragent_compat = "Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; WOW64; Trident/6.0)";
 
-					$ch = curl_init($content_link->getAttribute("href"));
-					curl_setopt($ch, CURLOPT_TIMEOUT, 5);
-					curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-					curl_setopt($ch, CURLOPT_HEADER, true);
-					curl_setopt($ch, CURLOPT_NOBODY, true);
-					curl_setopt($ch, CURLOPT_FOLLOWLOCATION, !ini_get("open_basedir"));
-					curl_setopt($ch, CURLOPT_USERAGENT, $useragent_compat);
-
-					@$result = curl_exec($ch);
-					$content_type = curl_getinfo($ch, CURLINFO_CONTENT_TYPE);
+					$content_type = $this->get_content_type($content_link->getAttribute("href"), $useragent_compat);
 
 					if ($content_type && strpos($content_type, "text/html") !== FALSE) {
 
@@ -483,5 +475,24 @@ class Af_RedditImgur extends Plugin {
 		print $doc->saveHTML();
 
 	}
+
+	private function get_content_type($url, $useragent = SELF_USER_AGENT) {
+		$content_type = false;
+
+		if (function_exists("curl_init") && !defined("NO_CURL")) {
+			$ch = curl_init($url);
+			curl_setopt($ch, CURLOPT_TIMEOUT, 5);
+			curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+			curl_setopt($ch, CURLOPT_HEADER, true);
+			curl_setopt($ch, CURLOPT_NOBODY, true);
+			curl_setopt($ch, CURLOPT_FOLLOWLOCATION, !ini_get("open_basedir"));
+			curl_setopt($ch, CURLOPT_USERAGENT, $useragent);
+
+			@$result = curl_exec($ch);
+			$content_type = curl_getinfo($ch, CURLINFO_CONTENT_TYPE);
+		}
+
+		return $content_type;
+	}
 }
 ?>
-- 
cgit v1.2.3


From 8788698b0531573548dceb1c0db0d3fb2f4c2a0b Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Mon, 1 Aug 2016 21:03:36 +0300
Subject: basic tweet embedding using oembed

---
 plugins/af_redditimgur/init.php | 32 ++++++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/plugins/af_redditimgur/init.php b/plugins/af_redditimgur/init.php
index 7414656d5..e283b8cec 100755
--- a/plugins/af_redditimgur/init.php
+++ b/plugins/af_redditimgur/init.php
@@ -29,7 +29,7 @@ class Af_RedditImgur extends Plugin {
 
 		$enable_content_dupcheck = $this->host->get($this, "enable_content_dupcheck");
 		$enable_content_dupcheck_checked = $enable_content_dupcheck ? "checked" : "";
-		
+
 		print "<form dojoType=\"dijit.form.Form\">";
 
 		print "<script type=\"dojo/method\" event=\"onSubmit\" args=\"evt\">
@@ -59,7 +59,7 @@ class Af_RedditImgur extends Plugin {
 		print "<label for=\"enable_readability\">" . __("Extract missing content using Readability") . "</label>";
 
 		print "<br/>";
-		
+
 		print "<input dojoType=\"dijit.form.CheckBox\" id=\"enable_content_dupcheck\"
 			$enable_content_dupcheck_checked name=\"enable_content_dupcheck\">&nbsp;";
 
@@ -95,6 +95,34 @@ class Af_RedditImgur extends Plugin {
 
 				$matches = array();
 
+
+				if (preg_match("/^https?:\/\/twitter.com\/(.*?)\/status\/(.*)/", $entry->getAttribute("href"), $matches)) {
+					_debug("handling as twitter: " . $matches[1] . " " . $matches[2], $debug);
+
+					$oembed_result = fetch_file_contents("https://publish.twitter.com/oembed?url=" . urlencode($entry->getAttribute("href")));
+
+					if ($oembed_result) {
+						$oembed_result = json_decode($oembed_result, true);
+
+						if ($oembed_result && isset($oembed_result["html"])) {
+
+							$tmp = new DOMDocument();
+							if ($tmp->loadHTML($oembed_result["html"])) {
+								$p = $doc->createElement("p");
+
+								$p->appendChild($doc->importNode(
+									$tmp->getElementsByTagName("blockquote")->item(0), TRUE));
+
+								$br = $doc->createElement('br');
+								$entry->parentNode->insertBefore($p, $entry);
+								$entry->parentNode->insertBefore($br, $entry);
+
+								$found = 1;
+							}
+						}
+					}
+				}
+
 				if (preg_match("/\.gfycat.com\/([a-z]+)?(\.[a-z]+)$/i", $entry->getAttribute("href"), $matches)) {
 					$entry->setAttribute("href", "http://www.gfycat.com/".$matches[1]);
 				}
-- 
cgit v1.2.3


From 43db5b99eb6ed7eb80fc2eb3667d067a19d97687 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Mon, 1 Aug 2016 21:07:18 +0300
Subject: af_redditimgur: only check embed url variants unless match is found

---
 plugins/af_redditimgur/init.php | 46 +++++++----------------------------------
 1 file changed, 8 insertions(+), 38 deletions(-)

diff --git a/plugins/af_redditimgur/init.php b/plugins/af_redditimgur/init.php
index e283b8cec..0b96e431b 100755
--- a/plugins/af_redditimgur/init.php
+++ b/plugins/af_redditimgur/init.php
@@ -95,7 +95,6 @@ class Af_RedditImgur extends Plugin {
 
 				$matches = array();
 
-
 				if (preg_match("/^https?:\/\/twitter.com\/(.*?)\/status\/(.*)/", $entry->getAttribute("href"), $matches)) {
 					_debug("handling as twitter: " . $matches[1] . " " . $matches[2], $debug);
 
@@ -123,11 +122,11 @@ class Af_RedditImgur extends Plugin {
 					}
 				}
 
-				if (preg_match("/\.gfycat.com\/([a-z]+)?(\.[a-z]+)$/i", $entry->getAttribute("href"), $matches)) {
+				if (!$found && preg_match("/\.gfycat.com\/([a-z]+)?(\.[a-z]+)$/i", $entry->getAttribute("href"), $matches)) {
 					$entry->setAttribute("href", "http://www.gfycat.com/".$matches[1]);
 				}
 
-				if (preg_match("/https?:\/\/(www\.)?gfycat.com\/([a-z]+)$/i", $entry->getAttribute("href"), $matches)) {
+				if (!$found && preg_match("/https?:\/\/(www\.)?gfycat.com\/([a-z]+)$/i", $entry->getAttribute("href"), $matches)) {
 
 					_debug("Handling as Gfycat", $debug);
 
@@ -161,14 +160,14 @@ class Af_RedditImgur extends Plugin {
 				}
 
 				// imgur .gif -> .gifv
-				if (preg_match("/i\.imgur\.com\/(.*?)\.gif$/i", $entry->getAttribute("href"))) {
+				if (!$found && preg_match("/i\.imgur\.com\/(.*?)\.gif$/i", $entry->getAttribute("href"))) {
 					_debug("Handling as imgur gif (->gifv)", $debug);
 
 					$entry->setAttribute("href",
 						str_replace(".gif", ".gifv", $entry->getAttribute("href")));
 				}
 
-				if (preg_match("/\.(gifv)$/i", $entry->getAttribute("href"))) {
+				if (!$found && preg_match("/\.(gifv)$/i", $entry->getAttribute("href"))) {
 					_debug("Handling as imgur gifv", $debug);
 
 					$source_stream = str_replace(".gifv", ".mp4", $entry->getAttribute("href"));
@@ -182,7 +181,7 @@ class Af_RedditImgur extends Plugin {
 				}
 
 				$matches = array();
-				if (preg_match("/youtube\.com\/v\/([\w-]+)/", $entry->getAttribute("href"), $matches) ||
+				if (!$found && preg_match("/youtube\.com\/v\/([\w-]+)/", $entry->getAttribute("href"), $matches) ||
 					preg_match("/youtube\.com\/.*?[\&\?]v=([\w-]+)/", $entry->getAttribute("href"), $matches) ||
 					preg_match("/youtube\.com\/watch\?v=([\w-]+)/", $entry->getAttribute("href"), $matches) ||
 					preg_match("/\/\/youtu.be\/([\w-]+)/", $entry->getAttribute("href"), $matches)) {
@@ -207,7 +206,7 @@ class Af_RedditImgur extends Plugin {
 					$found = true;
 				}
 
-				if (preg_match("/\.(jpg|jpeg|gif|png)(\?[0-9][0-9]*)?$/i", $entry->getAttribute("href")) ||
+				if (!$found && preg_match("/\.(jpg|jpeg|gif|png)(\?[0-9][0-9]*)?$/i", $entry->getAttribute("href")) ||
 					mb_strpos($entry->getAttribute("href"), "i.reddituploads.com") !== FALSE ||
 					mb_strpos($this->get_content_type($entry->getAttribute("href")), "image/") !== FALSE) {
 
@@ -225,7 +224,7 @@ class Af_RedditImgur extends Plugin {
 
 				// linked albums & pages
 
-				if (preg_match("/^https?:\/\/(m\.)?imgur.com\/([^\.\/]+$)/", $entry->getAttribute("href"), $matches) ||
+				if (!$found && preg_match("/^https?:\/\/(m\.)?imgur.com\/([^\.\/]+$)/", $entry->getAttribute("href"), $matches) ||
 					preg_match("/^https?:\/\/(m\.)?imgur.com\/(a|album|gallery)\/[^\.]+$/", $entry->getAttribute("href"), $matches)) {
 
 					_debug("Handling as an imgur page/album/gallery", $debug);
@@ -239,35 +238,6 @@ class Af_RedditImgur extends Plugin {
 						if (@$adoc->loadHTML($album_content)) {
 							$axpath = new DOMXPath($adoc);
 
-							/*$aentries = $axpath->query("//meta[@property='og:image']");
-							$urls = array();
-
-							foreach ($aentries as $aentry) {
-
-								_debug("og:image content=" . $aentry->getAttribute("content"), $debug);
-
-								$url = str_replace("?fb", "", $aentry->getAttribute("content"));
-								$check_url = basename($url);
-								$check_url = mb_substr($check_url, 0, strrpos($check_url, "."));
-
-								if (!in_array($check_url, $urls)) {
-									$img = $doc->createElement('img');
-									$img->setAttribute("src", $url);
-									$entry->parentNode->insertBefore($doc->createElement('br'), $entry);
-
-									$br = $doc->createElement('br');
-
-									$entry->parentNode->insertBefore($img, $entry);
-									$entry->parentNode->insertBefore($br, $entry);
-
-									array_push($urls, $check_url);
-
-									$found = true;
-								}
-							} */
-
-							//if ($debug) print_r($album_content);
-
 							$aentries = $axpath->query("(//div[@class='post-image']/img[@src] | //a[@class='zoom']/img[@src] | //div[@class='video-elements']/source)");
 							$urls = [];
 
@@ -311,7 +281,7 @@ class Af_RedditImgur extends Plugin {
 				}
 
 				// wtf is this even
-				if (preg_match("/^https?:\/\/gyazo\.com\/([^\.\/]+$)/", $entry->getAttribute("href"), $matches)) {
+				if (!$found && preg_match("/^https?:\/\/gyazo\.com\/([^\.\/]+$)/", $entry->getAttribute("href"), $matches)) {
 					$img_id = $matches[1];
 
 					_debug("handling as gyazo: $img_id", $debug);
-- 
cgit v1.2.3


From 49048482d89b5d428a309933fe27eddc23a234f2 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Tue, 2 Aug 2016 07:56:25 +0300
Subject: af_redditimgur: relax poster image url condition for imgur a bit

---
 plugins/af_redditimgur/init.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/af_redditimgur/init.php b/plugins/af_redditimgur/init.php
index 0b96e431b..e6e2a1709 100755
--- a/plugins/af_redditimgur/init.php
+++ b/plugins/af_redditimgur/init.php
@@ -172,7 +172,7 @@ class Af_RedditImgur extends Plugin {
 
 					$source_stream = str_replace(".gifv", ".mp4", $entry->getAttribute("href"));
 
-					if (strpos($source_stream, "i.imgur.com") !== FALSE)
+					if (strpos($source_stream, "imgur.com") !== FALSE)
 						$poster_url = str_replace(".mp4", "h.jpg", $source_stream);
 
 					$this->handle_as_video($doc, $entry, $source_stream, $poster_url, $debug);
@@ -259,7 +259,7 @@ class Af_RedditImgur extends Plugin {
 										$entry->parentNode->insertBefore($br, $entry);
 									} else if ($aentry->tagName == "source") {
 
-										if (strpos($url, "i.imgur.com") !== FALSE)
+										if (strpos($url, "imgur.com") !== FALSE)
 											$poster_url = str_replace(".mp4", "h.jpg", $url);
 										else
 											$poster_url = "";
-- 
cgit v1.2.3


From e487e92d705541c0aaa252db31cdc7237564be97 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@madoka.volgo-balt.ru>
Date: Tue, 2 Aug 2016 12:25:54 +0300
Subject: readability: increase maximum source document size, reorganize the
 reddit plugin code a bit

---
 plugins/af_readability/init.php |   2 +-
 plugins/af_redditimgur/init.php | 143 +++++++++++++++++++++-------------------
 2 files changed, 76 insertions(+), 69 deletions(-)

diff --git a/plugins/af_readability/init.php b/plugins/af_readability/init.php
index f5b764d9c..f89576e3b 100755
--- a/plugins/af_readability/init.php
+++ b/plugins/af_readability/init.php
@@ -159,7 +159,7 @@ class Af_Readability extends Plugin {
 
 		$tmp = fetch_file_contents($url);
 
-		if ($tmp && mb_strlen($tmp) < 65535 * 4) {
+		if ($tmp && mb_strlen($tmp) < 1024 * 500) {
 			$tmpdoc = new DOMDocument("1.0", "UTF-8");
 
 			if (!$tmpdoc->loadHTML($tmp))
diff --git a/plugins/af_redditimgur/init.php b/plugins/af_redditimgur/init.php
index e6e2a1709..e19220bad 100755
--- a/plugins/af_redditimgur/init.php
+++ b/plugins/af_redditimgur/init.php
@@ -348,75 +348,12 @@ class Af_RedditImgur extends Plugin {
 
 			$found = $this->inline_stuff($article, $doc, $xpath);
 
-			if (!defined('NO_CURL') && function_exists("curl_init") && !$found && $this->host->get($this, "enable_readability") &&
-				mb_strlen(strip_tags($article["content"])) <= 150) {
-
-				if (!class_exists("Readability")) require_once(dirname(dirname(__DIR__)). "/lib/readability/Readability.php");
-
-				if ($content_link &&
-					strpos($content_link->getAttribute("href"), "twitter.com") === FALSE &&
-					strpos($content_link->getAttribute("href"), "youtube.com") === FALSE &&
-					strpos($content_link->getAttribute("href"), "reddit.com") === FALSE) {
-
-					/* link may lead to a huge video file or whatever, we need to check content type before trying to
-					parse it which p much requires curl */
-
-					$useragent_compat = "Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; WOW64; Trident/6.0)";
-
-					$content_type = $this->get_content_type($content_link->getAttribute("href"), $useragent_compat);
-
-					if ($content_type && strpos($content_type, "text/html") !== FALSE) {
-
-						$tmp = fetch_file_contents(array("url" => $content_link->getAttribute("href"),
-							"useragent" => $useragent_compat));
-
-						//_debug("tmplen: " . mb_strlen($tmp));
-
-						if ($tmp && mb_strlen($tmp) < 1024 * 250) {
-
-							$r = new Readability($tmp, $content_link->getAttribute("href"));
-
-							if ($r->init()) {
-
-								$tmpxpath = new DOMXPath($r->dom);
-
-								$entries = $tmpxpath->query('(//a[@href]|//img[@src])');
-
-								foreach ($entries as $entry) {
-									if ($entry->hasAttribute("href")) {
-										$entry->setAttribute("href",
-											rewrite_relative_url($content_link->getAttribute("href"), $entry->getAttribute("href")));
-
-									}
-
-									if ($entry->hasAttribute("src")) {
-										$entry->setAttribute("src",
-											rewrite_relative_url($content_link->getAttribute("href"), $entry->getAttribute("src")));
-
-									}
-
-								}
-
-								$article["content"] = $r->articleContent->innerHTML . "<hr/>" . $article["content"];
-
-								// prob not a very good idea (breaks wikipedia pages, etc) -
-								// inliner currently is not really fit for any random web content
-
-								//$doc = new DOMDocument();
-								//@$doc->loadHTML($article["content"]);
-								//$xpath = new DOMXPath($doc);
-								//$found = $this->inline_stuff($article, $doc, $xpath);
-							}
-						}
-					}
-				}
-
-			}
-
 			$node = $doc->getElementsByTagName('body')->item(0);
 
 			if ($node && $found) {
 				$article["content"] = $doc->saveXML($node);
+			} else if ($content_link) {
+				$article = $this->readability($article, $content_link->getAttribute("href"), $doc, $xpath);
 			}
 		}
 
@@ -466,12 +403,21 @@ class Af_RedditImgur extends Plugin {
 		@$doc->loadHTML("<html><body><a href=\"$url\">[link]</a></body>");
 		$xpath = new DOMXPath($doc);
 
-		print "Inline result: " . $this->inline_stuff([], $doc, $xpath, true) . "\n";
+		$found = $this->inline_stuff([], $doc, $xpath, true);
+
+		print "Inline result: $found\n";
+
+		if (!$found) {
+			print "\nReadability result:\n";
 
-		print "\nResulting HTML:\n";
+			$article = $this->readability([], $url, $doc, $xpath, true);
 
-		print $doc->saveHTML();
+			print_r($article);
+		} else {
+			print "\nResulting HTML:\n";
 
+			print $doc->saveHTML();
+		}
 	}
 
 	private function get_content_type($url, $useragent = SELF_USER_AGENT) {
@@ -492,5 +438,66 @@ class Af_RedditImgur extends Plugin {
 
 		return $content_type;
 	}
+
+	private function readability($article, $url, $doc, $xpath, $debug = false) {
+
+		if (!defined('NO_CURL') && function_exists("curl_init") && $this->host->get($this, "enable_readability") &&
+			mb_strlen(strip_tags($article["content"])) <= 150) {
+
+			if (!class_exists("Readability")) require_once(dirname(dirname(__DIR__)). "/lib/readability/Readability.php");
+
+			if ($url &&
+				strpos($url, "twitter.com") === FALSE &&
+				strpos($url, "youtube.com") === FALSE &&
+				strpos($url, "reddit.com") === FALSE) {
+
+				/* link may lead to a huge video file or whatever, we need to check content type before trying to
+				parse it which p much requires curl */
+
+				$useragent_compat = "Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; WOW64; Trident/6.0)";
+
+				$content_type = $this->get_content_type($url, $useragent_compat);
+
+				if ($content_type && strpos($content_type, "text/html") !== FALSE) {
+
+					$tmp = fetch_file_contents(array("url" => $url,
+						"useragent" => $useragent_compat));
+
+					if ($debug) _debug("tmplen: " . mb_strlen($tmp));
+
+					if ($tmp && mb_strlen($tmp) < 1024 * 500) {
+
+						$r = new Readability($tmp, $url);
+
+						if ($r->init()) {
+
+							$tmpxpath = new DOMXPath($r->dom);
+
+							$entries = $tmpxpath->query('(//a[@href]|//img[@src])');
+
+							foreach ($entries as $entry) {
+								if ($entry->hasAttribute("href")) {
+									$entry->setAttribute("href",
+										rewrite_relative_url($url, $entry->getAttribute("href")));
+
+								}
+
+								if ($entry->hasAttribute("src")) {
+									$entry->setAttribute("src",
+										rewrite_relative_url($url, $entry->getAttribute("src")));
+
+								}
+
+							}
+
+							$article["content"] = $r->articleContent->innerHTML . "<hr/>" . $article["content"];
+						}
+					}
+				}
+			}
+		}
+
+		return $article;
+	}
 }
 ?>
-- 
cgit v1.2.3


From 8c395462be32131fde2aa1f89c5fbc8b99c418a0 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@madoka.volgo-balt.ru>
Date: Tue, 2 Aug 2016 16:45:06 +0300
Subject: af_redditimgur: support .mp4 links

---
 plugins/af_redditimgur/init.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/af_redditimgur/init.php b/plugins/af_redditimgur/init.php
index e19220bad..02c499c6f 100755
--- a/plugins/af_redditimgur/init.php
+++ b/plugins/af_redditimgur/init.php
@@ -167,7 +167,7 @@ class Af_RedditImgur extends Plugin {
 						str_replace(".gif", ".gifv", $entry->getAttribute("href")));
 				}
 
-				if (!$found && preg_match("/\.(gifv)$/i", $entry->getAttribute("href"))) {
+				if (!$found && preg_match("/\.(gifv|mp4)$/i", $entry->getAttribute("href"))) {
 					_debug("Handling as imgur gifv", $debug);
 
 					$source_stream = str_replace(".gifv", ".mp4", $entry->getAttribute("href"));
-- 
cgit v1.2.3


From 46506d3fd69b1dd8137bddf08ed8596771bf0b89 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@madoka.volgo-balt.ru>
Date: Tue, 2 Aug 2016 17:01:53 +0300
Subject: af_redditimgur: rework gfycat pages

---
 plugins/af_redditimgur/init.php | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/plugins/af_redditimgur/init.php b/plugins/af_redditimgur/init.php
index 02c499c6f..e43846abf 100755
--- a/plugins/af_redditimgur/init.php
+++ b/plugins/af_redditimgur/init.php
@@ -138,25 +138,18 @@ class Af_RedditImgur extends Plugin {
 						if (@$tmpdoc->loadHTML($tmp)) {
 							$tmpxpath = new DOMXPath($tmpdoc);
 
-							$source_meta = $tmpxpath->query("//meta[@name='twitter:player:stream' and contains(@content, '.mp4')]")->item(0);
-							$poster_meta = $tmpxpath->query("//meta[@property='og:image' and contains(@content,'thumbs.gfycat.com')]")->item(0);
+							$source_node = $tmpxpath->query("//video[contains(@class,'share-video')]//source[contains(@src, '.mp4')]")->item(0);
+							$poster_node = $tmpxpath->query("//video[contains(@class,'share-video') and @poster]")->item(0);
 
-							if ($source_meta) {
-								$source_stream = $source_meta->getAttribute("content");
-								$poster_url = false;
+							if ($source_node && $poster_node) {
+								$source_stream = $source_node->getAttribute("src");
+								$poster_url = $poster_node->getAttribute("poster");
 
-								if ($source_stream) {
-
-									if ($poster_meta)
-										$poster_url = $poster_meta->getAttribute("content");
-
-									$this->handle_as_video($doc, $entry, $source_stream, $poster_url);
-									$found = 1;
-								}
+								$this->handle_as_video($doc, $entry, $source_stream, $poster_url);
+								$found = 1;
 							}
 						}
 					}
-
 				}
 
 				// imgur .gif -> .gifv
-- 
cgit v1.2.3


From 48007463861d8db8b2b79c2f4f54e0564edb0ec0 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Tue, 2 Aug 2016 18:08:00 +0300
Subject: tweet embed: force utf-8

---
 plugins/af_redditimgur/init.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/af_redditimgur/init.php b/plugins/af_redditimgur/init.php
index e43846abf..7ab07b900 100755
--- a/plugins/af_redditimgur/init.php
+++ b/plugins/af_redditimgur/init.php
@@ -106,7 +106,7 @@ class Af_RedditImgur extends Plugin {
 						if ($oembed_result && isset($oembed_result["html"])) {
 
 							$tmp = new DOMDocument();
-							if ($tmp->loadHTML($oembed_result["html"])) {
+							if ($tmp->loadHTML('<?xml encoding="utf-8" ?>' . $oembed_result["html"])) {
 								$p = $doc->createElement("p");
 
 								$p->appendChild($doc->importNode(
-- 
cgit v1.2.3


From d8b0f06705812ef9e4ee4b1943f53dd82743db19 Mon Sep 17 00:00:00 2001
From: JustAMacUser <donotreply@example.org>
Date: Sat, 6 Aug 2016 14:07:30 -0400
Subject: Remove href attribute if it executes JavaScript.

---
 include/functions2.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/include/functions2.php b/include/functions2.php
index aab73d342..dceea507e 100644
--- a/include/functions2.php
+++ b/include/functions2.php
@@ -1064,6 +1064,10 @@
 						array_push($attrs_to_remove, $attr);
 					}
 
+					if ($attr->nodeName == 'href' && stripos($attr->value, 'javascript:') === 0) {
+						array_push($attrs_to_remove, $attr);
+					}
+
 					if (in_array($attr->nodeName, $disallowed_attributes)) {
 						array_push($attrs_to_remove, $attr);
 					}
-- 
cgit v1.2.3


From babfadbfd245ae8752ba379d594e5c158762a606 Mon Sep 17 00:00:00 2001
From: JustAMacUser <donotreply@example.org>
Date: Sat, 6 Aug 2016 14:16:39 -0400
Subject: Pass the value of cache_images to plugins in HOOK_ARTICLE_FILTER.

---
 include/rssfuncs.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 21ffcbb76..522e4bf22 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -726,7 +726,8 @@
 					"language" => $entry_language,
 					"feed" => array("id" => $feed,
 						"fetch_url" => $fetch_url,
-						"site_url" => $site_url)
+						"site_url" => $site_url,
+						"cache_images" => $cache_images)
 					);
 
 				$entry_plugin_data = "";
-- 
cgit v1.2.3


From 25a533c432036280de057bf10ca7b673e4f4aac4 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Wed, 10 Aug 2016 09:15:52 +0300
Subject: bump static version to 16.8

---
 include/version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/version.php b/include/version.php
index 3169ff222..6ca1b7fc4 100644
--- a/include/version.php
+++ b/include/version.php
@@ -1,5 +1,5 @@
 <?php
-	define('VERSION_STATIC', '16.3');
+	define('VERSION_STATIC', '16.8');
 
 	function get_version() {
 		date_default_timezone_set('UTC');
-- 
cgit v1.2.3


From ee5170424e8dc571b3a811e02f906aef5ee49e83 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Wed, 10 Aug 2016 10:01:05 +0300
Subject: dojo: main UI: load stuff asynchronously

---
 index.php                        |  11 +-
 js/tt-rss.js                     | 361 ++++++++++++++++++++-------------------
 plugins/af_zz_noautoplay/init.js |  59 ++++---
 plugins/shorten_expanded/init.js |  34 ++--
 4 files changed, 245 insertions(+), 220 deletions(-)

diff --git a/index.php b/index.php
index ecde3bae2..36734619f 100644
--- a/index.php
+++ b/index.php
@@ -88,6 +88,15 @@
 	<link rel="shortcut icon" type="image/png" href="images/favicon.png"/>
 	<link rel="icon" type="image/png" sizes="72x72" href="images/favicon-72px.png" />
 
+	<script>
+		dojoConfig = {
+			async: true,
+			packages: [
+				{ name: "fox", location: "../../js" },
+			]
+		};
+	</script>
+
 	<?php
 	foreach (array("lib/prototype.js",
 				"lib/scriptaculous/scriptaculous.js?load=effects,controls",
@@ -105,7 +114,7 @@
 		require_once 'lib/jshrink/Minifier.php';
 
 		print get_minified_js(array("tt-rss",
-			"functions", "feedlist", "viewfeed", "FeedTree", "PluginHost"));
+			"functions", "feedlist", "viewfeed", "PluginHost"));
 
 		foreach (PluginHost::getInstance()->get_plugins() as $n => $p) {
 			if (method_exists($p, "get_js")) {
diff --git a/js/tt-rss.js b/js/tt-rss.js
index 108b65a7f..776c5d02b 100644
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -216,90 +216,94 @@ function genericSanityCheck() {
 
 function init() {
 	try {
-		//dojo.registerModulePath("fox", "../../js/");
-
-		dojo.require("fox.FeedTree");
-
-		dojo.require("dijit.ColorPalette");
-		dojo.require("dijit.Dialog");
-		dojo.require("dijit.form.Button");
-		dojo.require("dijit.form.CheckBox");
-		dojo.require("dijit.form.DropDownButton");
-		dojo.require("dijit.form.FilteringSelect");
-		dojo.require("dijit.form.Form");
-		dojo.require("dijit.form.RadioButton");
-		dojo.require("dijit.form.Select");
-		dojo.require("dijit.form.SimpleTextarea");
-		dojo.require("dijit.form.TextBox");
-		dojo.require("dijit.form.ComboBox");
-		dojo.require("dijit.form.ValidationTextBox");
-		dojo.require("dijit.InlineEditBox");
-		dojo.require("dijit.layout.AccordionContainer");
-		dojo.require("dijit.layout.BorderContainer");
-		dojo.require("dijit.layout.ContentPane");
-		dojo.require("dijit.layout.TabContainer");
-		dojo.require("dijit.Menu");
-		dojo.require("dijit.ProgressBar");
-		dojo.require("dijit.ProgressBar");
-		dojo.require("dijit.Toolbar");
-		dojo.require("dijit.Tree");
-		dojo.require("dijit.tree.dndSource");
-		dojo.require("dojo.data.ItemFileWriteStore");
-
-		dojo.parser.parse();
-
-		if (!genericSanityCheck())
-			return false;
-
-		loading_set_progress(30);
-
-		var a = document.createElement('audio');
-
-		var hasAudio = !!a.canPlayType;
-		var hasSandbox = "sandbox" in document.createElement("iframe");
-		var hasMp3 = !!(a.canPlayType && a.canPlayType('audio/mpeg;').replace(/no/, ''));
-		var clientTzOffset = new Date().getTimezoneOffset() * 60;
-
-		new Ajax.Request("backend.php",	{
-			parameters: {op: "rpc", method: "sanityCheck", hasAudio: hasAudio,
-				hasMp3: hasMp3,
-			 	clientTzOffset: clientTzOffset,
-				hasSandbox: hasSandbox},
-			onComplete: function(transport) {
+		require(['dojo/_base/kernel', 'dojo/ready', 'dojo/parser', 'dojo/_base/loader'], function(dojo, ready, parser) {
+
+			//dojo.registerModulePath("fox", "../../js/");
+
+			dojo.require("fox.FeedTree");
+
+			dojo.require("dijit.ColorPalette");
+			dojo.require("dijit.Dialog");
+			dojo.require("dijit.form.Button");
+			dojo.require("dijit.form.ComboButton");
+			dojo.require("dijit.form.CheckBox");
+			dojo.require("dijit.form.DropDownButton");
+			dojo.require("dijit.form.FilteringSelect");
+			dojo.require("dijit.form.Form");
+			dojo.require("dijit.form.RadioButton");
+			dojo.require("dijit.form.Select");
+			dojo.require("dijit.form.SimpleTextarea");
+			dojo.require("dijit.form.TextBox");
+			dojo.require("dijit.form.ComboBox");
+			dojo.require("dijit.form.ValidationTextBox");
+			dojo.require("dijit.InlineEditBox");
+			dojo.require("dijit.layout.AccordionContainer");
+			dojo.require("dijit.layout.BorderContainer");
+			dojo.require("dijit.layout.ContentPane");
+			dojo.require("dijit.layout.TabContainer");
+			dojo.require("dijit.PopupMenuItem");
+			dojo.require("dijit.Menu");
+			dojo.require("dijit.ProgressBar");
+			dojo.require("dijit.ProgressBar");
+			dojo.require("dijit.Toolbar");
+			dojo.require("dijit.Tree");
+			dojo.require("dijit.tree.dndSource");
+			dojo.require("dojo.data.ItemFileWriteStore");
+
+			dojo.parser.parse();
+
+			if (!genericSanityCheck())
+				return false;
+
+			loading_set_progress(30);
+
+			var a = document.createElement('audio');
+
+			var hasAudio = !!a.canPlayType;
+			var hasSandbox = "sandbox" in document.createElement("iframe");
+			var hasMp3 = !!(a.canPlayType && a.canPlayType('audio/mpeg;').replace(/no/, ''));
+			var clientTzOffset = new Date().getTimezoneOffset() * 60;
+
+			new Ajax.Request("backend.php",	{
+				parameters: {op: "rpc", method: "sanityCheck", hasAudio: hasAudio,
+					hasMp3: hasMp3,
+					clientTzOffset: clientTzOffset,
+					hasSandbox: hasSandbox},
+				onComplete: function(transport) {
 					backend_sanity_check_callback(transport);
 				} });
 
-		hotkey_actions["next_feed"] = function() {
+			hotkey_actions["next_feed"] = function() {
 				var rv = dijit.byId("feedTree").getNextFeed(
-						getActiveFeedId(), activeFeedIsCat());
+					getActiveFeedId(), activeFeedIsCat());
 
 				if (rv) viewfeed({feed: rv[0], is_cat: rv[1], can_wait: true})
-		};
-		hotkey_actions["prev_feed"] = function() {
+			};
+			hotkey_actions["prev_feed"] = function() {
 				var rv = dijit.byId("feedTree").getPreviousFeed(
-						getActiveFeedId(), activeFeedIsCat());
+					getActiveFeedId(), activeFeedIsCat());
 
 				if (rv) viewfeed({feed: rv[0], is_cat: rv[1], can_wait: true})
-		};
-		hotkey_actions["next_article"] = function() {
+			};
+			hotkey_actions["next_article"] = function() {
 				moveToPost('next');
-		};
-		hotkey_actions["prev_article"] = function() {
+			};
+			hotkey_actions["prev_article"] = function() {
 				moveToPost('prev');
-		};
-		hotkey_actions["next_article_noscroll"] = function() {
+			};
+			hotkey_actions["next_article_noscroll"] = function() {
 				moveToPost('next', true);
-		};
-		hotkey_actions["prev_article_noscroll"] = function() {
+			};
+			hotkey_actions["prev_article_noscroll"] = function() {
 				moveToPost('prev', true);
-		};
-		hotkey_actions["next_article_noexpand"] = function() {
+			};
+			hotkey_actions["next_article_noexpand"] = function() {
 				moveToPost('next', true, true);
-		};
-		hotkey_actions["prev_article_noexpand"] = function() {
+			};
+			hotkey_actions["prev_article_noexpand"] = function() {
 				moveToPost('prev', true, true);
-		};
-		hotkey_actions["collapse_article"] = function() {
+			};
+			hotkey_actions["collapse_article"] = function() {
 				var id = getActiveArticleId();
 				var elem = $("CICD-"+id);
 
@@ -311,8 +315,8 @@ function init() {
 						cdmExpandArticle(id);
 					}
 				}
-		};
-		hotkey_actions["toggle_expand"] = function() {
+			};
+			hotkey_actions["toggle_expand"] = function() {
 				var id = getActiveArticleId();
 				var elem = $("CICD-"+id);
 
@@ -324,48 +328,48 @@ function init() {
 						cdmExpandArticle(id);
 					}
 				}
-		};
-		hotkey_actions["search_dialog"] = function() {
+			};
+			hotkey_actions["search_dialog"] = function() {
 				search();
-		};
-		hotkey_actions["toggle_mark"] = function() {
+			};
+			hotkey_actions["toggle_mark"] = function() {
 				selectionToggleMarked(undefined, false, true);
-		};
-		hotkey_actions["toggle_publ"] = function() {
+			};
+			hotkey_actions["toggle_publ"] = function() {
 				selectionTogglePublished(undefined, false, true);
-		};
-		hotkey_actions["toggle_unread"] = function() {
+			};
+			hotkey_actions["toggle_unread"] = function() {
 				selectionToggleUnread(undefined, false, true);
-		};
-		hotkey_actions["edit_tags"] = function() {
+			};
+			hotkey_actions["edit_tags"] = function() {
 				var id = getActiveArticleId();
 				if (id) {
 					editArticleTags(id);
 				};
 			}
-		hotkey_actions["open_in_new_window"] = function() {
+			hotkey_actions["open_in_new_window"] = function() {
 				if (getActiveArticleId()) {
 					openArticleInNewWindow(getActiveArticleId());
 					return;
 				}
-		};
-		hotkey_actions["catchup_below"] = function() {
+			};
+			hotkey_actions["catchup_below"] = function() {
 				catchupRelativeToArticle(1);
-		};
-		hotkey_actions["catchup_above"] = function() {
+			};
+			hotkey_actions["catchup_above"] = function() {
 				catchupRelativeToArticle(0);
-		};
-		hotkey_actions["article_scroll_down"] = function() {
+			};
+			hotkey_actions["article_scroll_down"] = function() {
 				var ctr = $("content_insert") ? $("content_insert") : $("headlines-frame");
 
 				scrollArticle(40);
-		};
-		hotkey_actions["article_scroll_up"] = function() {
+			};
+			hotkey_actions["article_scroll_up"] = function() {
 				var ctr = $("content_insert") ? $("content_insert") : $("headlines-frame");
 
 				scrollArticle(-40);
-		};
-		hotkey_actions["close_article"] = function() {
+			};
+			hotkey_actions["close_article"] = function() {
 				if (isCdmMode()) {
 					if (!getInitParam("cdm_expanded")) {
 						cdmCollapseArticle(false, getActiveArticleId());
@@ -373,8 +377,8 @@ function init() {
 				} else {
 					closeArticlePanel();
 				}
-		};
-		hotkey_actions["email_article"] = function() {
+			};
+			hotkey_actions["email_article"] = function() {
 				if (typeof emailArticle != "undefined") {
 					emailArticle();
 				} else if (typeof mailtoArticle != "undefined") {
@@ -382,103 +386,103 @@ function init() {
 				} else {
 					alert(__("Please enable mail plugin first."));
 				}
-		};
-		hotkey_actions["select_all"] = function() {
+			};
+			hotkey_actions["select_all"] = function() {
 				selectArticles('all');
-		};
-		hotkey_actions["select_unread"] = function() {
+			};
+			hotkey_actions["select_unread"] = function() {
 				selectArticles('unread');
-		};
-		hotkey_actions["select_marked"] = function() {
+			};
+			hotkey_actions["select_marked"] = function() {
 				selectArticles('marked');
-		};
-		hotkey_actions["select_published"] = function() {
+			};
+			hotkey_actions["select_published"] = function() {
 				selectArticles('published');
-		};
-		hotkey_actions["select_invert"] = function() {
+			};
+			hotkey_actions["select_invert"] = function() {
 				selectArticles('invert');
-		};
-		hotkey_actions["select_none"] = function() {
+			};
+			hotkey_actions["select_none"] = function() {
 				selectArticles('none');
-		};
-		hotkey_actions["feed_refresh"] = function() {
+			};
+			hotkey_actions["feed_refresh"] = function() {
 				if (getActiveFeedId() != undefined) {
 					viewfeed({feed: getActiveFeedId(), is_cat: activeFeedIsCat()});
 					return;
 				}
-		};
-		hotkey_actions["feed_unhide_read"] = function() {
+			};
+			hotkey_actions["feed_unhide_read"] = function() {
 				toggleDispRead();
-		};
-		hotkey_actions["feed_subscribe"] = function() {
+			};
+			hotkey_actions["feed_subscribe"] = function() {
 				quickAddFeed();
-		};
-		hotkey_actions["feed_debug_update"] = function() {
-			if (!activeFeedIsCat() && parseInt(getActiveFeedId()) > 0) {
-				window.open("backend.php?op=feeds&method=update_debugger&feed_id=" + getActiveFeedId() +
-				"&csrf_token=" + getInitParam("csrf_token"));
-			} else {
-				alert("You can't debug this kind of feed.");
-			}
-		};
+			};
+			hotkey_actions["feed_debug_update"] = function() {
+				if (!activeFeedIsCat() && parseInt(getActiveFeedId()) > 0) {
+					window.open("backend.php?op=feeds&method=update_debugger&feed_id=" + getActiveFeedId() +
+						"&csrf_token=" + getInitParam("csrf_token"));
+				} else {
+					alert("You can't debug this kind of feed.");
+				}
+			};
 
-		hotkey_actions["feed_debug_viewfeed"] = function() {
-			viewfeed({feed: getActiveFeedId(), is_cat: activeFeedIsCat(), viewfeed_debug: true});
-		};
+			hotkey_actions["feed_debug_viewfeed"] = function() {
+				viewfeed({feed: getActiveFeedId(), is_cat: activeFeedIsCat(), viewfeed_debug: true});
+			};
 
-		hotkey_actions["feed_edit"] = function() {
+			hotkey_actions["feed_edit"] = function() {
 				if (activeFeedIsCat())
 					alert(__("You can't edit this kind of feed."));
 				else
 					editFeed(getActiveFeedId());
-		};
-		hotkey_actions["feed_catchup"] = function() {
+			};
+			hotkey_actions["feed_catchup"] = function() {
 				if (getActiveFeedId() != undefined) {
 					catchupCurrentFeed();
 					return;
 				}
-		};
-		hotkey_actions["feed_reverse"] = function() {
+			};
+			hotkey_actions["feed_reverse"] = function() {
 				reverseHeadlineOrder();
-		};
-		hotkey_actions["feed_toggle_vgroup"] = function() {
-			var query_str = "?op=rpc&method=togglepref&key=VFEED_GROUP_BY_FEED";
+			};
+			hotkey_actions["feed_toggle_vgroup"] = function() {
+				var query_str = "?op=rpc&method=togglepref&key=VFEED_GROUP_BY_FEED";
 
-			new Ajax.Request("backend.php", {
-				parameters: query_str,
-				onComplete: function(transport) {
-					viewCurrentFeed();
-			} });
+				new Ajax.Request("backend.php", {
+					parameters: query_str,
+					onComplete: function(transport) {
+						viewCurrentFeed();
+					} });
 
-		};
-		hotkey_actions["catchup_all"] = function() {
+			};
+			hotkey_actions["catchup_all"] = function() {
 				catchupAllFeeds();
-		};
-		hotkey_actions["cat_toggle_collapse"] = function() {
+			};
+			hotkey_actions["cat_toggle_collapse"] = function() {
 				if (activeFeedIsCat()) {
 					dijit.byId("feedTree").collapseCat(getActiveFeedId());
 					return;
 				}
-		};
-		hotkey_actions["goto_all"] = function() {
+			};
+			hotkey_actions["goto_all"] = function() {
 				viewfeed({feed: -4});
-		};
-		hotkey_actions["goto_fresh"] = function() {
+			};
+			hotkey_actions["goto_fresh"] = function() {
 				viewfeed({feed: -3});
-		};
-		hotkey_actions["goto_marked"] = function() {
+			};
+			hotkey_actions["goto_marked"] = function() {
 				viewfeed({feed: -1});
-		};
-		hotkey_actions["goto_published"] = function() {
+			};
+			hotkey_actions["goto_published"] = function() {
 				viewfeed({feed: -2});
-		};
-		hotkey_actions["goto_tagcloud"] = function() {
+			};
+			hotkey_actions["goto_tagcloud"] = function() {
 				displayDlg(__("Tag cloud"), "printTagCloud");
-		};
-		hotkey_actions["goto_prefs"] = function() {
+			};
+			hotkey_actions["goto_prefs"] = function() {
 				gotoPreferences();
-		};
-		hotkey_actions["select_article_cursor"] = function() {
+			};
+			hotkey_actions["select_article_cursor"] = function() {
 				var id = getArticleUnderPointer();
 				if (id) {
 					var row = $("RROW-" + id);
@@ -494,25 +498,25 @@ function init() {
 						}
 					}
 				}
-		};
-		hotkey_actions["create_label"] = function() {
+			};
+			hotkey_actions["create_label"] = function() {
 				addLabel();
-		};
-		hotkey_actions["create_filter"] = function() {
+			};
+			hotkey_actions["create_filter"] = function() {
 				quickAddFilter();
-		};
-		hotkey_actions["collapse_sidebar"] = function() {
+			};
+			hotkey_actions["collapse_sidebar"] = function() {
 				collapse_feedlist();
-		};
-		hotkey_actions["toggle_embed_original"] = function() {
+			};
+			hotkey_actions["toggle_embed_original"] = function() {
 				if (typeof embedOriginalArticle != "undefined") {
 					if (getActiveArticleId())
 						embedOriginalArticle(getActiveArticleId());
 				} else {
 					alert(__("Please enable embed_original plugin first."));
 				}
-		};
-		hotkey_actions["toggle_widescreen"] = function() {
+			};
+			hotkey_actions["toggle_widescreen"] = function() {
 				if (!isCdmMode()) {
 					_widescreen_mode = !_widescreen_mode;
 
@@ -524,11 +528,11 @@ function init() {
 				} else {
 					alert(__("Widescreen is not available in combined mode."));
 				}
-		};
-		hotkey_actions["help_dialog"] = function() {
+			};
+			hotkey_actions["help_dialog"] = function() {
 				helpDialog("main");
-		};
-		hotkey_actions["toggle_combined_mode"] = function() {
+			};
+			hotkey_actions["toggle_combined_mode"] = function() {
 				notify_progress("Loading, please wait...");
 
 				var value = isCdmMode() ? "false" : "true";
@@ -538,14 +542,14 @@ function init() {
 					parameters: query,
 					onComplete: function(transport) {
 						setInitParam("combined_display_mode",
-								!getInitParam("combined_display_mode"));
+							!getInitParam("combined_display_mode"));
 
 						closeArticlePanel();
 						viewCurrentFeed();
 
-								} });
-		};
-		hotkey_actions["toggle_cdm_expanded"] = function() {
+					} });
+			};
+			hotkey_actions["toggle_cdm_expanded"] = function() {
 				notify_progress("Loading, please wait...");
 
 				var value = getInitParam("cdm_expanded") ? "false" : "true";
@@ -557,8 +561,9 @@ function init() {
 						setInitParam("cdm_expanded", !getInitParam("cdm_expanded"));
 						viewCurrentFeed();
 					} });
-		};
+			};
 
+		});
 
 	} catch (e) {
 		exception_error("init", e);
@@ -568,7 +573,11 @@ function init() {
 function init_second_stage() {
 
 	try {
-		dojo.addOnLoad(function() {
+		Event.observe(window, 'resize', function() {
+			dijit.byId("main").resize();
+		});
+
+		//dojo.addOnLoad(function() {
 			updateFeedList();
 			closeArticlePanel();
 
@@ -594,7 +603,7 @@ function init_second_stage() {
 					}
 			});
 
-		});
+		//});
 
 		delCookie("ttrss_test");
 
diff --git a/plugins/af_zz_noautoplay/init.js b/plugins/af_zz_noautoplay/init.js
index 9b7bf0077..3cf3a381c 100644
--- a/plugins/af_zz_noautoplay/init.js
+++ b/plugins/af_zz_noautoplay/init.js
@@ -1,40 +1,43 @@
-dojo.addOnLoad(function() {
-	PluginHost.register(PluginHost.HOOK_ARTICLE_RENDERED_CDM, function(row) {
-		if (row) {
-			console.log("af_zz_noautoplay!");
-			console.log(row);
-
-			var videos = row.getElementsByTagName("video");
-			console.log(row.innerHTML);
-
-			for (i = 0; i < videos.length; i++) {
-
-				videos[i].removeAttribute("autoplay");
-				videos[i].pause();
-				videos[i].onclick = function() {
-					this.paused ? this.play() : this.pause();
+require(['dojo/_base/kernel', 'dojo/ready'], function  (dojo, ready) {
+	dojo.addOnLoad(function () {
+		PluginHost.register(PluginHost.HOOK_ARTICLE_RENDERED_CDM, function (row) {
+			if (row) {
+				console.log("af_zz_noautoplay!");
+				console.log(row);
+
+				var videos = row.getElementsByTagName("video");
+				console.log(row.innerHTML);
+
+				for (i = 0; i < videos.length; i++) {
+
+					videos[i].removeAttribute("autoplay");
+					videos[i].pause();
+					videos[i].onclick = function () {
+						this.paused ? this.play() : this.pause();
+					}
 				}
 			}
-		}
 
-		return true;
-	});
+			return true;
+		});
 
-	PluginHost.register(PluginHost.HOOK_ARTICLE_RENDERED, function(row) {
-		if (row) {
-			var videos = row.getElementsByTagName("video");
+		PluginHost.register(PluginHost.HOOK_ARTICLE_RENDERED, function (row) {
+			if (row) {
+				var videos = row.getElementsByTagName("video");
 
-			for (i = 0; i < videos.length; i++) {
-				videos[i].removeAttribute("autoplay");
-				videos[i].pause();
-				videos[i].onclick = function() {
-					this.paused ? this.play() : this.pause();
+				for (i = 0; i < videos.length; i++) {
+					videos[i].removeAttribute("autoplay");
+					videos[i].pause();
+					videos[i].onclick = function () {
+						this.paused ? this.play() : this.pause();
+					}
 				}
+
 			}
 
-		}
+			return true;
+		});
 
-		return true;
 	});
 
 });
\ No newline at end of file
diff --git a/plugins/shorten_expanded/init.js b/plugins/shorten_expanded/init.js
index 5e9e84aec..899f8a54d 100644
--- a/plugins/shorten_expanded/init.js
+++ b/plugins/shorten_expanded/init.js
@@ -22,26 +22,30 @@ function expandSizeWrapper(id) {
 
 }
 
-dojo.addOnLoad(function() {
-	PluginHost.register(PluginHost.HOOK_ARTICLE_RENDERED_CDM, function(row) {
-		if (getInitParam('cdm_expanded')) {
+require(['dojo/_base/kernel', 'dojo/ready'], function  (dojo, ready) {
 
-			window.setTimeout(function() {
-				if (row) {
-					if (row.offsetHeight >= _shorten_expanded_threshold * window.innerHeight) {
-						var content = row.select(".cdmContentInner")[0];
+	dojo.addOnLoad(function() {
+		PluginHost.register(PluginHost.HOOK_ARTICLE_RENDERED_CDM, function(row) {
+			if (getInitParam('cdm_expanded')) {
 
-						if (content) {
-							content.innerHTML = "<div class='contentSizeWrapper'>" +
-								content.innerHTML + "</div><button class='expandPrompt' onclick='return expandSizeWrapper(\""+row.id+"\")' "+
-								"href='#'>" + __("Click to expand article") + "</button>";
+				window.setTimeout(function() {
+					if (row) {
+						if (row.offsetHeight >= _shorten_expanded_threshold * window.innerHeight) {
+							var content = row.select(".cdmContentInner")[0];
 
+							if (content) {
+								content.innerHTML = "<div class='contentSizeWrapper'>" +
+									content.innerHTML + "</div><button class='expandPrompt' onclick='return expandSizeWrapper(\""+row.id+"\")' "+
+									"href='#'>" + __("Click to expand article") + "</button>";
+
+							}
 						}
 					}
-				}
-			}, 150);
-		}
+				}, 150);
+			}
 
-		return true;
+			return true;
+		});
 	});
+
 });
-- 
cgit v1.2.3


From 0dbc20a8d48c58a180384a6a1047311c99545e48 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@madoka.volgo-balt.ru>
Date: Wed, 10 Aug 2016 11:48:09 +0300
Subject: load dijit properly, duh

---
 js/tt-rss.js | 749 ++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 377 insertions(+), 372 deletions(-)

diff --git a/js/tt-rss.js b/js/tt-rss.js
index 776c5d02b..e5e7a848f 100644
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -216,352 +216,72 @@ function genericSanityCheck() {
 
 function init() {
 	try {
-		require(['dojo/_base/kernel', 'dojo/ready', 'dojo/parser', 'dojo/_base/loader'], function(dojo, ready, parser) {
-
-			//dojo.registerModulePath("fox", "../../js/");
-
-			dojo.require("fox.FeedTree");
-
-			dojo.require("dijit.ColorPalette");
-			dojo.require("dijit.Dialog");
-			dojo.require("dijit.form.Button");
-			dojo.require("dijit.form.ComboButton");
-			dojo.require("dijit.form.CheckBox");
-			dojo.require("dijit.form.DropDownButton");
-			dojo.require("dijit.form.FilteringSelect");
-			dojo.require("dijit.form.Form");
-			dojo.require("dijit.form.RadioButton");
-			dojo.require("dijit.form.Select");
-			dojo.require("dijit.form.SimpleTextarea");
-			dojo.require("dijit.form.TextBox");
-			dojo.require("dijit.form.ComboBox");
-			dojo.require("dijit.form.ValidationTextBox");
-			dojo.require("dijit.InlineEditBox");
-			dojo.require("dijit.layout.AccordionContainer");
-			dojo.require("dijit.layout.BorderContainer");
-			dojo.require("dijit.layout.ContentPane");
-			dojo.require("dijit.layout.TabContainer");
-			dojo.require("dijit.PopupMenuItem");
-			dojo.require("dijit.Menu");
-			dojo.require("dijit.ProgressBar");
-			dojo.require("dijit.ProgressBar");
-			dojo.require("dijit.Toolbar");
-			dojo.require("dijit.Tree");
-			dojo.require("dijit.tree.dndSource");
-			dojo.require("dojo.data.ItemFileWriteStore");
-
-			dojo.parser.parse();
-
-			if (!genericSanityCheck())
-				return false;
-
-			loading_set_progress(30);
-
-			var a = document.createElement('audio');
-
-			var hasAudio = !!a.canPlayType;
-			var hasSandbox = "sandbox" in document.createElement("iframe");
-			var hasMp3 = !!(a.canPlayType && a.canPlayType('audio/mpeg;').replace(/no/, ''));
-			var clientTzOffset = new Date().getTimezoneOffset() * 60;
-
-			new Ajax.Request("backend.php",	{
-				parameters: {op: "rpc", method: "sanityCheck", hasAudio: hasAudio,
-					hasMp3: hasMp3,
-					clientTzOffset: clientTzOffset,
-					hasSandbox: hasSandbox},
-				onComplete: function(transport) {
-					backend_sanity_check_callback(transport);
-				} });
-
-			hotkey_actions["next_feed"] = function() {
-				var rv = dijit.byId("feedTree").getNextFeed(
-					getActiveFeedId(), activeFeedIsCat());
-
-				if (rv) viewfeed({feed: rv[0], is_cat: rv[1], can_wait: true})
-			};
-			hotkey_actions["prev_feed"] = function() {
-				var rv = dijit.byId("feedTree").getPreviousFeed(
-					getActiveFeedId(), activeFeedIsCat());
-
-				if (rv) viewfeed({feed: rv[0], is_cat: rv[1], can_wait: true})
-			};
-			hotkey_actions["next_article"] = function() {
-				moveToPost('next');
-			};
-			hotkey_actions["prev_article"] = function() {
-				moveToPost('prev');
-			};
-			hotkey_actions["next_article_noscroll"] = function() {
-				moveToPost('next', true);
-			};
-			hotkey_actions["prev_article_noscroll"] = function() {
-				moveToPost('prev', true);
-			};
-			hotkey_actions["next_article_noexpand"] = function() {
-				moveToPost('next', true, true);
-			};
-			hotkey_actions["prev_article_noexpand"] = function() {
-				moveToPost('prev', true, true);
-			};
-			hotkey_actions["collapse_article"] = function() {
-				var id = getActiveArticleId();
-				var elem = $("CICD-"+id);
-
-				if (elem) {
-					if (elem.visible()) {
-						cdmCollapseArticle(null, id);
-					}
-					else {
-						cdmExpandArticle(id);
-					}
-				}
-			};
-			hotkey_actions["toggle_expand"] = function() {
-				var id = getActiveArticleId();
-				var elem = $("CICD-"+id);
-
-				if (elem) {
-					if (elem.visible()) {
-						cdmCollapseArticle(null, id, false);
-					}
-					else {
-						cdmExpandArticle(id);
-					}
-				}
-			};
-			hotkey_actions["search_dialog"] = function() {
-				search();
-			};
-			hotkey_actions["toggle_mark"] = function() {
-				selectionToggleMarked(undefined, false, true);
-			};
-			hotkey_actions["toggle_publ"] = function() {
-				selectionTogglePublished(undefined, false, true);
-			};
-			hotkey_actions["toggle_unread"] = function() {
-				selectionToggleUnread(undefined, false, true);
-			};
-			hotkey_actions["edit_tags"] = function() {
-				var id = getActiveArticleId();
-				if (id) {
-					editArticleTags(id);
-				};
-			}
-			hotkey_actions["open_in_new_window"] = function() {
-				if (getActiveArticleId()) {
-					openArticleInNewWindow(getActiveArticleId());
-					return;
-				}
-			};
-			hotkey_actions["catchup_below"] = function() {
-				catchupRelativeToArticle(1);
-			};
-			hotkey_actions["catchup_above"] = function() {
-				catchupRelativeToArticle(0);
-			};
-			hotkey_actions["article_scroll_down"] = function() {
-				var ctr = $("content_insert") ? $("content_insert") : $("headlines-frame");
-
-				scrollArticle(40);
-			};
-			hotkey_actions["article_scroll_up"] = function() {
-				var ctr = $("content_insert") ? $("content_insert") : $("headlines-frame");
-
-				scrollArticle(-40);
-			};
-			hotkey_actions["close_article"] = function() {
-				if (isCdmMode()) {
-					if (!getInitParam("cdm_expanded")) {
-						cdmCollapseArticle(false, getActiveArticleId());
-					}
-				} else {
-					closeArticlePanel();
-				}
-			};
-			hotkey_actions["email_article"] = function() {
-				if (typeof emailArticle != "undefined") {
-					emailArticle();
-				} else if (typeof mailtoArticle != "undefined") {
-					mailtoArticle();
-				} else {
-					alert(__("Please enable mail plugin first."));
-				}
-			};
-			hotkey_actions["select_all"] = function() {
-				selectArticles('all');
-			};
-			hotkey_actions["select_unread"] = function() {
-				selectArticles('unread');
-			};
-			hotkey_actions["select_marked"] = function() {
-				selectArticles('marked');
-			};
-			hotkey_actions["select_published"] = function() {
-				selectArticles('published');
-			};
-			hotkey_actions["select_invert"] = function() {
-				selectArticles('invert');
-			};
-			hotkey_actions["select_none"] = function() {
-				selectArticles('none');
-			};
-			hotkey_actions["feed_refresh"] = function() {
-				if (getActiveFeedId() != undefined) {
-					viewfeed({feed: getActiveFeedId(), is_cat: activeFeedIsCat()});
-					return;
-				}
-			};
-			hotkey_actions["feed_unhide_read"] = function() {
-				toggleDispRead();
-			};
-			hotkey_actions["feed_subscribe"] = function() {
-				quickAddFeed();
-			};
-			hotkey_actions["feed_debug_update"] = function() {
-				if (!activeFeedIsCat() && parseInt(getActiveFeedId()) > 0) {
-					window.open("backend.php?op=feeds&method=update_debugger&feed_id=" + getActiveFeedId() +
-						"&csrf_token=" + getInitParam("csrf_token"));
-				} else {
-					alert("You can't debug this kind of feed.");
-				}
-			};
-
-			hotkey_actions["feed_debug_viewfeed"] = function() {
-				viewfeed({feed: getActiveFeedId(), is_cat: activeFeedIsCat(), viewfeed_debug: true});
-			};
-
-			hotkey_actions["feed_edit"] = function() {
-				if (activeFeedIsCat())
-					alert(__("You can't edit this kind of feed."));
-				else
-					editFeed(getActiveFeedId());
-			};
-			hotkey_actions["feed_catchup"] = function() {
-				if (getActiveFeedId() != undefined) {
-					catchupCurrentFeed();
-					return;
-				}
-			};
-			hotkey_actions["feed_reverse"] = function() {
-				reverseHeadlineOrder();
-			};
-			hotkey_actions["feed_toggle_vgroup"] = function() {
-				var query_str = "?op=rpc&method=togglepref&key=VFEED_GROUP_BY_FEED";
-
-				new Ajax.Request("backend.php", {
-					parameters: query_str,
-					onComplete: function(transport) {
-						viewCurrentFeed();
-					} });
-
-			};
-			hotkey_actions["catchup_all"] = function() {
-				catchupAllFeeds();
-			};
-			hotkey_actions["cat_toggle_collapse"] = function() {
-				if (activeFeedIsCat()) {
-					dijit.byId("feedTree").collapseCat(getActiveFeedId());
-					return;
-				}
-			};
-			hotkey_actions["goto_all"] = function() {
-				viewfeed({feed: -4});
-			};
-			hotkey_actions["goto_fresh"] = function() {
-				viewfeed({feed: -3});
-			};
-			hotkey_actions["goto_marked"] = function() {
-				viewfeed({feed: -1});
-			};
-			hotkey_actions["goto_published"] = function() {
-				viewfeed({feed: -2});
-			};
-			hotkey_actions["goto_tagcloud"] = function() {
-				displayDlg(__("Tag cloud"), "printTagCloud");
-			};
-			hotkey_actions["goto_prefs"] = function() {
-				gotoPreferences();
-			};
-			hotkey_actions["select_article_cursor"] = function() {
-				var id = getArticleUnderPointer();
-				if (id) {
-					var row = $("RROW-" + id);
-
-					if (row) {
-						var cb = dijit.getEnclosingWidget(
-							row.getElementsByClassName("rchk")[0]);
-
-						if (cb) {
-							cb.attr("checked", !cb.attr("checked"));
-							toggleSelectRowById(cb, "RROW-" + id);
-							return false;
-						}
-					}
-				}
-			};
-			hotkey_actions["create_label"] = function() {
-				addLabel();
-			};
-			hotkey_actions["create_filter"] = function() {
-				quickAddFilter();
-			};
-			hotkey_actions["collapse_sidebar"] = function() {
-				collapse_feedlist();
-			};
-			hotkey_actions["toggle_embed_original"] = function() {
-				if (typeof embedOriginalArticle != "undefined") {
-					if (getActiveArticleId())
-						embedOriginalArticle(getActiveArticleId());
-				} else {
-					alert(__("Please enable embed_original plugin first."));
-				}
-			};
-			hotkey_actions["toggle_widescreen"] = function() {
-				if (!isCdmMode()) {
-					_widescreen_mode = !_widescreen_mode;
-
-					// reset stored sizes because geometry changed
-					setCookie("ttrss_ci_width", 0);
-					setCookie("ttrss_ci_height", 0);
-
-					switchPanelMode(_widescreen_mode);
-				} else {
-					alert(__("Widescreen is not available in combined mode."));
-				}
-			};
-			hotkey_actions["help_dialog"] = function() {
-				helpDialog("main");
-			};
-			hotkey_actions["toggle_combined_mode"] = function() {
-				notify_progress("Loading, please wait...");
-
-				var value = isCdmMode() ? "false" : "true";
-				var query = "?op=rpc&method=setpref&key=COMBINED_DISPLAY_MODE&value=" + value;
-
-				new Ajax.Request("backend.php",	{
-					parameters: query,
-					onComplete: function(transport) {
-						setInitParam("combined_display_mode",
-							!getInitParam("combined_display_mode"));
-
-						closeArticlePanel();
-						viewCurrentFeed();
-
-					} });
-			};
-			hotkey_actions["toggle_cdm_expanded"] = function() {
-				notify_progress("Loading, please wait...");
-
-				var value = getInitParam("cdm_expanded") ? "false" : "true";
-				var query = "?op=rpc&method=setpref&key=CDM_EXPANDED&value=" + value;
-
-				new Ajax.Request("backend.php",	{
-					parameters: query,
-					onComplete: function(transport) {
-						setInitParam("cdm_expanded", !getInitParam("cdm_expanded"));
-						viewCurrentFeed();
-					} });
-			};
+		//dojo.registerModulePath("fox", "../../js/");
+
+		require(['dojo/_base/kernel',
+				'dojo/ready',
+				'dojo/parser',
+				'dojo/_base/loader',
+				"dijit/ProgressBar",
+				"dijit/ColorPalette",
+				"dijit/Dialog",
+				"dijit/form/Button",
+				"dijit/form/ComboButton",
+				"dijit/form/CheckBox",
+				"dijit/form/DropDownButton",
+				"dijit/form/FilteringSelect",
+				"dijit/form/Form",
+				"dijit/form/RadioButton",
+				"dijit/form/Select",
+				"dijit/form/SimpleTextarea",
+				"dijit/form/TextBox",
+				"dijit/form/ComboBox",
+				"dijit/form/ValidationTextBox",
+				"dijit/InlineEditBox",
+				"dijit/layout/AccordionContainer",
+				"dijit/layout/BorderContainer",
+				"dijit/layout/ContentPane",
+				"dijit/layout/TabContainer",
+				"dijit/PopupMenuItem",
+				"dijit/Menu",
+				"dijit/Toolbar",
+				"dijit/Tree",
+				"dijit/tree/dndSource",
+				"dijit/tree/ForestStoreModel",
+				"dojo/data/ItemFileWriteStore" ], function (dojo, ready, parser) {
+
+				ready(function() {
+
+					dojo.require("fox.FeedTree");
+
+					dojo.parser.parse();
+
+					if (!genericSanityCheck())
+						return false;
+
+					loading_set_progress(30);
+
+					var a = document.createElement('audio');
+
+					var hasAudio = !!a.canPlayType;
+					var hasSandbox = "sandbox" in document.createElement("iframe");
+					var hasMp3 = !!(a.canPlayType && a.canPlayType('audio/mpeg;').replace(/no/, ''));
+					var clientTzOffset = new Date().getTimezoneOffset() * 60;
+
+					init_hotkey_actions();
+
+					new Ajax.Request("backend.php",	{
+						parameters: {op: "rpc", method: "sanityCheck", hasAudio: hasAudio,
+							hasMp3: hasMp3,
+							clientTzOffset: clientTzOffset,
+							hasSandbox: hasSandbox},
+						onComplete: function(transport) {
+							backend_sanity_check_callback(transport);
+						} });
+
+
+				});
+
 
 		});
 
@@ -570,40 +290,325 @@ function init() {
 	}
 }
 
-function init_second_stage() {
+function init_hotkey_actions() {
+	hotkey_actions["next_feed"] = function() {
+		var rv = dijit.byId("feedTree").getNextFeed(
+			getActiveFeedId(), activeFeedIsCat());
+
+		if (rv) viewfeed({feed: rv[0], is_cat: rv[1], can_wait: true})
+	};
+	hotkey_actions["prev_feed"] = function() {
+		var rv = dijit.byId("feedTree").getPreviousFeed(
+			getActiveFeedId(), activeFeedIsCat());
+
+		if (rv) viewfeed({feed: rv[0], is_cat: rv[1], can_wait: true})
+	};
+	hotkey_actions["next_article"] = function() {
+		moveToPost('next');
+	};
+	hotkey_actions["prev_article"] = function() {
+		moveToPost('prev');
+	};
+	hotkey_actions["next_article_noscroll"] = function() {
+		moveToPost('next', true);
+	};
+	hotkey_actions["prev_article_noscroll"] = function() {
+		moveToPost('prev', true);
+	};
+	hotkey_actions["next_article_noexpand"] = function() {
+		moveToPost('next', true, true);
+	};
+	hotkey_actions["prev_article_noexpand"] = function() {
+		moveToPost('prev', true, true);
+	};
+	hotkey_actions["collapse_article"] = function() {
+		var id = getActiveArticleId();
+		var elem = $("CICD-"+id);
+
+		if (elem) {
+			if (elem.visible()) {
+				cdmCollapseArticle(null, id);
+			}
+			else {
+				cdmExpandArticle(id);
+			}
+		}
+	};
+	hotkey_actions["toggle_expand"] = function() {
+		var id = getActiveArticleId();
+		var elem = $("CICD-"+id);
+
+		if (elem) {
+			if (elem.visible()) {
+				cdmCollapseArticle(null, id, false);
+			}
+			else {
+				cdmExpandArticle(id);
+			}
+		}
+	};
+	hotkey_actions["search_dialog"] = function() {
+		search();
+	};
+	hotkey_actions["toggle_mark"] = function() {
+		selectionToggleMarked(undefined, false, true);
+	};
+	hotkey_actions["toggle_publ"] = function() {
+		selectionTogglePublished(undefined, false, true);
+	};
+	hotkey_actions["toggle_unread"] = function() {
+		selectionToggleUnread(undefined, false, true);
+	};
+	hotkey_actions["edit_tags"] = function() {
+		var id = getActiveArticleId();
+		if (id) {
+			editArticleTags(id);
+		};
+	}
+	hotkey_actions["open_in_new_window"] = function() {
+		if (getActiveArticleId()) {
+			openArticleInNewWindow(getActiveArticleId());
+			return;
+		}
+	};
+	hotkey_actions["catchup_below"] = function() {
+		catchupRelativeToArticle(1);
+	};
+	hotkey_actions["catchup_above"] = function() {
+		catchupRelativeToArticle(0);
+	};
+	hotkey_actions["article_scroll_down"] = function() {
+		var ctr = $("content_insert") ? $("content_insert") : $("headlines-frame");
+
+		scrollArticle(40);
+	};
+	hotkey_actions["article_scroll_up"] = function() {
+		var ctr = $("content_insert") ? $("content_insert") : $("headlines-frame");
+
+		scrollArticle(-40);
+	};
+	hotkey_actions["close_article"] = function() {
+		if (isCdmMode()) {
+			if (!getInitParam("cdm_expanded")) {
+				cdmCollapseArticle(false, getActiveArticleId());
+			}
+		} else {
+			closeArticlePanel();
+		}
+	};
+	hotkey_actions["email_article"] = function() {
+		if (typeof emailArticle != "undefined") {
+			emailArticle();
+		} else if (typeof mailtoArticle != "undefined") {
+			mailtoArticle();
+		} else {
+			alert(__("Please enable mail plugin first."));
+		}
+	};
+	hotkey_actions["select_all"] = function() {
+		selectArticles('all');
+	};
+	hotkey_actions["select_unread"] = function() {
+		selectArticles('unread');
+	};
+	hotkey_actions["select_marked"] = function() {
+		selectArticles('marked');
+	};
+	hotkey_actions["select_published"] = function() {
+		selectArticles('published');
+	};
+	hotkey_actions["select_invert"] = function() {
+		selectArticles('invert');
+	};
+	hotkey_actions["select_none"] = function() {
+		selectArticles('none');
+	};
+	hotkey_actions["feed_refresh"] = function() {
+		if (getActiveFeedId() != undefined) {
+			viewfeed({feed: getActiveFeedId(), is_cat: activeFeedIsCat()});
+			return;
+		}
+	};
+	hotkey_actions["feed_unhide_read"] = function() {
+		toggleDispRead();
+	};
+	hotkey_actions["feed_subscribe"] = function() {
+		quickAddFeed();
+	};
+	hotkey_actions["feed_debug_update"] = function() {
+		if (!activeFeedIsCat() && parseInt(getActiveFeedId()) > 0) {
+			window.open("backend.php?op=feeds&method=update_debugger&feed_id=" + getActiveFeedId() +
+				"&csrf_token=" + getInitParam("csrf_token"));
+		} else {
+			alert("You can't debug this kind of feed.");
+		}
+	};
 
-	try {
-		Event.observe(window, 'resize', function() {
-			dijit.byId("main").resize();
-		});
+	hotkey_actions["feed_debug_viewfeed"] = function() {
+		viewfeed({feed: getActiveFeedId(), is_cat: activeFeedIsCat(), viewfeed_debug: true});
+	};
 
-		//dojo.addOnLoad(function() {
-			updateFeedList();
-			closeArticlePanel();
+	hotkey_actions["feed_edit"] = function() {
+		if (activeFeedIsCat())
+			alert(__("You can't edit this kind of feed."));
+		else
+			editFeed(getActiveFeedId());
+	};
+	hotkey_actions["feed_catchup"] = function() {
+		if (getActiveFeedId() != undefined) {
+			catchupCurrentFeed();
+			return;
+		}
+	};
+	hotkey_actions["feed_reverse"] = function() {
+		reverseHeadlineOrder();
+	};
+	hotkey_actions["feed_toggle_vgroup"] = function() {
+		var query_str = "?op=rpc&method=togglepref&key=VFEED_GROUP_BY_FEED";
 
-			if (parseInt(getCookie("ttrss_fh_width")) > 0) {
-				dijit.byId("feeds-holder").domNode.setStyle(
-					{width: getCookie("ttrss_fh_width") + "px" });
+		new Ajax.Request("backend.php", {
+			parameters: query_str,
+			onComplete: function(transport) {
+				viewCurrentFeed();
+			} });
+
+	};
+	hotkey_actions["catchup_all"] = function() {
+		catchupAllFeeds();
+	};
+	hotkey_actions["cat_toggle_collapse"] = function() {
+		if (activeFeedIsCat()) {
+			dijit.byId("feedTree").collapseCat(getActiveFeedId());
+			return;
+		}
+	};
+	hotkey_actions["goto_all"] = function() {
+		viewfeed({feed: -4});
+	};
+	hotkey_actions["goto_fresh"] = function() {
+		viewfeed({feed: -3});
+	};
+	hotkey_actions["goto_marked"] = function() {
+		viewfeed({feed: -1});
+	};
+	hotkey_actions["goto_published"] = function() {
+		viewfeed({feed: -2});
+	};
+	hotkey_actions["goto_tagcloud"] = function() {
+		displayDlg(__("Tag cloud"), "printTagCloud");
+	};
+	hotkey_actions["goto_prefs"] = function() {
+		gotoPreferences();
+	};
+	hotkey_actions["select_article_cursor"] = function() {
+		var id = getArticleUnderPointer();
+		if (id) {
+			var row = $("RROW-" + id);
+
+			if (row) {
+				var cb = dijit.getEnclosingWidget(
+					row.getElementsByClassName("rchk")[0]);
+
+				if (cb) {
+					cb.attr("checked", !cb.attr("checked"));
+					toggleSelectRowById(cb, "RROW-" + id);
+					return false;
+				}
 			}
+		}
+	};
+	hotkey_actions["create_label"] = function() {
+		addLabel();
+	};
+	hotkey_actions["create_filter"] = function() {
+		quickAddFilter();
+	};
+	hotkey_actions["collapse_sidebar"] = function() {
+		collapse_feedlist();
+	};
+	hotkey_actions["toggle_embed_original"] = function() {
+		if (typeof embedOriginalArticle != "undefined") {
+			if (getActiveArticleId())
+				embedOriginalArticle(getActiveArticleId());
+		} else {
+			alert(__("Please enable embed_original plugin first."));
+		}
+	};
+	hotkey_actions["toggle_widescreen"] = function() {
+		if (!isCdmMode()) {
+			_widescreen_mode = !_widescreen_mode;
+
+			// reset stored sizes because geometry changed
+			setCookie("ttrss_ci_width", 0);
+			setCookie("ttrss_ci_height", 0);
+
+			switchPanelMode(_widescreen_mode);
+		} else {
+			alert(__("Widescreen is not available in combined mode."));
+		}
+	};
+	hotkey_actions["help_dialog"] = function() {
+		helpDialog("main");
+	};
+	hotkey_actions["toggle_combined_mode"] = function() {
+		notify_progress("Loading, please wait...");
+
+		var value = isCdmMode() ? "false" : "true";
+		var query = "?op=rpc&method=setpref&key=COMBINED_DISPLAY_MODE&value=" + value;
+
+		new Ajax.Request("backend.php",	{
+			parameters: query,
+			onComplete: function(transport) {
+				setInitParam("combined_display_mode",
+					!getInitParam("combined_display_mode"));
+
+				closeArticlePanel();
+				viewCurrentFeed();
 
-			dijit.byId("main").resize();
+			} });
+	};
+	hotkey_actions["toggle_cdm_expanded"] = function() {
+		notify_progress("Loading, please wait...");
 
-			var tmph = dojo.connect(dijit.byId('feeds-holder'), 'resize',
-				function (args) {
-					if (args && args.w >= 0) {
-						setCookie("ttrss_fh_width", args.w, getInitParam("cookie_lifetime"));
-					}
-			});
+		var value = getInitParam("cdm_expanded") ? "false" : "true";
+		var query = "?op=rpc&method=setpref&key=CDM_EXPANDED&value=" + value;
 
-			var tmph = dojo.connect(dijit.byId('content-insert'), 'resize',
-				function (args) {
-					if (args && args.w >= 0 && args.h >= 0) {
-						setCookie("ttrss_ci_width", args.w, getInitParam("cookie_lifetime"));
-						setCookie("ttrss_ci_height", args.h, getInitParam("cookie_lifetime"));
-					}
-			});
+		new Ajax.Request("backend.php",	{
+			parameters: query,
+			onComplete: function(transport) {
+				setInitParam("cdm_expanded", !getInitParam("cdm_expanded"));
+				viewCurrentFeed();
+			} });
+	};
+}
+
+function init_second_stage() {
 
-		//});
+	try {
+		updateFeedList();
+		closeArticlePanel();
+
+		if (parseInt(getCookie("ttrss_fh_width")) > 0) {
+			dijit.byId("feeds-holder").domNode.setStyle(
+				{width: getCookie("ttrss_fh_width") + "px" });
+		}
+
+		dijit.byId("main").resize();
+
+		var tmph = dojo.connect(dijit.byId('feeds-holder'), 'resize',
+			function (args) {
+				if (args && args.w >= 0) {
+					setCookie("ttrss_fh_width", args.w, getInitParam("cookie_lifetime"));
+				}
+		});
+
+		var tmph = dojo.connect(dijit.byId('content-insert'), 'resize',
+			function (args) {
+				if (args && args.w >= 0 && args.h >= 0) {
+					setCookie("ttrss_ci_width", args.w, getInitParam("cookie_lifetime"));
+					setCookie("ttrss_ci_height", args.h, getInitParam("cookie_lifetime"));
+				}
+		});
 
 		delCookie("ttrss_test");
 
-- 
cgit v1.2.3


From fd539f280058f2606ba6a59403287b824b6fd195 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@madoka.volgo-balt.ru>
Date: Wed, 10 Aug 2016 12:22:30 +0300
Subject: prefs: use dojo asynchronously

---
 js/prefs.js | 119 +++++++++++++++++++++++++++++++-----------------------------
 prefs.php   |  17 ++++++++-
 2 files changed, 77 insertions(+), 59 deletions(-)

diff --git a/js/prefs.js b/js/prefs.js
index ddcdbe351..34d595a7d 100755
--- a/js/prefs.js
+++ b/js/prefs.js
@@ -889,22 +889,20 @@ function init_second_stage() {
 		loading_set_progress(50);
 		notify("");
 
-		dojo.addOnLoad(function() {
-			var tab = getURLParam('tab');
+		var tab = getURLParam('tab');
 
-			if (tab) {
-			  	tab = dijit.byId(tab + "Tab");
-				if (tab) dijit.byId("pref-tabs").selectChild(tab);
-			}
+		if (tab) {
+			tab = dijit.byId(tab + "Tab");
+			if (tab) dijit.byId("pref-tabs").selectChild(tab);
+		}
 
-			var method = getURLParam('method');
+		var method = getURLParam('method');
 
-			if (method == 'editFeed') {
-				var param = getURLParam('methodparam');
+		if (method == 'editFeed') {
+			var param = getURLParam('methodparam');
 
-				window.setTimeout('editFeed(' + param + ')', 100);
-			}
-		});
+			window.setTimeout('editFeed(' + param + ')', 100);
+		}
 
 		setTimeout("hotkey_prefix_timeout()", 5*1000);
 
@@ -916,53 +914,58 @@ function init_second_stage() {
 function init() {
 
 	try {
-		dojo.registerModulePath("lib", "..");
-		dojo.registerModulePath("fox", "../../js/");
-
-		dojo.require("dijit.ColorPalette");
-		dojo.require("dijit.Dialog");
-		dojo.require("dijit.form.Button");
-		dojo.require("dijit.form.CheckBox");
-		dojo.require("dijit.form.DropDownButton");
-		dojo.require("dijit.form.FilteringSelect");
-		dojo.require("dijit.form.Form");
-		dojo.require("dijit.form.RadioButton");
-		dojo.require("dijit.form.Select");
-		dojo.require("dijit.form.SimpleTextarea");
-		dojo.require("dijit.form.TextBox");
-		dojo.require("dijit.form.ValidationTextBox");
-		dojo.require("dijit.InlineEditBox");
-		dojo.require("dijit.layout.AccordionContainer");
-		dojo.require("dijit.layout.BorderContainer");
-		dojo.require("dijit.layout.ContentPane");
-		dojo.require("dijit.layout.TabContainer");
-		dojo.require("dijit.Menu");
-		dojo.require("dijit.ProgressBar");
-		dojo.require("dijit.ProgressBar");
-		dojo.require("dijit.Toolbar");
-		dojo.require("dijit.Tree");
-		dojo.require("dijit.tree.dndSource");
-		dojo.require("dojo.data.ItemFileWriteStore");
-
-		dojo.require("lib.CheckBoxTree");
-		dojo.require("fox.PrefFeedTree");
-		dojo.require("fox.PrefFilterTree");
-		dojo.require("fox.PrefLabelTree");
-
-		dojo.parser.parse();
-
-		dojo.addOnLoad(function() {
-			loading_set_progress(50);
-
-			var clientTzOffset = new Date().getTimezoneOffset() * 60;
 
-			new Ajax.Request("backend.php", {
-				parameters: {op: "rpc", method: "sanityCheck",
-				 	clientTzOffset: clientTzOffset },
-					onComplete: function(transport) {
-					backend_sanity_check_callback(transport);
-				} });
-		});
+		require(["dojo/_base/kernel",
+			"dojo/ready",
+			"dojo/parser",
+			"dojo/_base/loader",
+			"dijit/ColorPalette",
+			"dijit/Dialog",
+			"dijit/form/Button",
+			"dijit/form/CheckBox",
+			"dijit/form/DropDownButton",
+			"dijit/form/FilteringSelect",
+			"dijit/form/Form",
+			"dijit/form/RadioButton",
+			"dijit/form/ComboButton",
+			"dijit/form/Select",
+			"dijit/form/SimpleTextarea",
+			"dijit/form/TextBox",
+			"dijit/form/ValidationTextBox",
+			"dijit/InlineEditBox",
+			"dijit/layout/AccordionContainer",
+			"dijit/layout/AccordionPane",
+			"dijit/layout/BorderContainer",
+			"dijit/layout/ContentPane",
+			"dijit/layout/TabContainer",
+			"dijit/Menu",
+			"dijit/ProgressBar",
+			"dijit/Toolbar",
+			"dijit/Tree",
+			"dijit/tree/dndSource",
+			"dojo/data/ItemFileWriteStore"], function (dojo, ready, parser) {
+
+				ready(function() {
+
+					dojo.require("lib.CheckBoxTree");
+					dojo.require("fox.PrefFeedTree");
+					dojo.require("fox.PrefFilterTree");
+					dojo.require("fox.PrefLabelTree");
+
+					parser.parse();
+
+					loading_set_progress(50);
+
+					var clientTzOffset = new Date().getTimezoneOffset() * 60;
+
+					new Ajax.Request("backend.php", {
+						parameters: {op: "rpc", method: "sanityCheck",
+							clientTzOffset: clientTzOffset },
+						onComplete: function(transport) {
+							backend_sanity_check_callback(transport);
+						} });
+				});
+			});
 
 	} catch (e) {
 		exception_error("init", e);
diff --git a/prefs.php b/prefs.php
index b20678abe..931373bad 100644
--- a/prefs.php
+++ b/prefs.php
@@ -54,6 +54,16 @@
 	<link rel="shortcut icon" type="image/png" href="images/favicon.png"/>
 	<link rel="icon" type="image/png" sizes="72x72" href="images/favicon-72px.png" />
 
+	<script>
+		dojoConfig = {
+			async: true,
+			packages: [
+				{ name: "lib", location: "../" },
+				{ name: "fox", location: "../../js" },
+			]
+		};
+	</script>
+
 	<?php
 	foreach (array("lib/prototype.js",
 				"lib/scriptaculous/scriptaculous.js?load=effects,controls",
@@ -72,11 +82,16 @@
 
 		foreach (PluginHost::getInstance()->get_plugins() as $n => $p) {
 			if (method_exists($p, "get_prefs_js")) {
+				echo "try {";
 				echo JShrink\Minifier::minify($p->get_prefs_js());
+				echo "} catch (e) {
+				 	console.warn('failed to initialize plugin JS: $n');
+					console.warn(e);
+				}";
 			}
 		}
 
-		print get_minified_js(array("../lib/CheckBoxTree","functions", "deprecated", "prefs", "PrefFeedTree", "PrefFilterTree", "PrefLabelTree"));
+		print get_minified_js(array("functions", "deprecated", "prefs"));
 
 		init_js_translations();
 	?>
-- 
cgit v1.2.3


From f6d2787a8e139da6af412f87645402e0c193af01 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@madoka.volgo-balt.ru>
Date: Wed, 10 Aug 2016 12:22:55 +0300
Subject: plugins: use require() to hook into dojo

---
 plugins/af_zz_noautoplay/init.js  |  4 +---
 plugins/no_title_counters/init.js | 10 ++++++----
 plugins/no_url_hashes/init.js     | 11 ++++++++---
 plugins/shorten_expanded/init.js  |  2 +-
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/plugins/af_zz_noautoplay/init.js b/plugins/af_zz_noautoplay/init.js
index 3cf3a381c..45dfc55ab 100644
--- a/plugins/af_zz_noautoplay/init.js
+++ b/plugins/af_zz_noautoplay/init.js
@@ -1,5 +1,5 @@
 require(['dojo/_base/kernel', 'dojo/ready'], function  (dojo, ready) {
-	dojo.addOnLoad(function () {
+	ready(function () {
 		PluginHost.register(PluginHost.HOOK_ARTICLE_RENDERED_CDM, function (row) {
 			if (row) {
 				console.log("af_zz_noautoplay!");
@@ -37,7 +37,5 @@ require(['dojo/_base/kernel', 'dojo/ready'], function  (dojo, ready) {
 
 			return true;
 		});
-
 	});
-
 });
\ No newline at end of file
diff --git a/plugins/no_title_counters/init.js b/plugins/no_title_counters/init.js
index 9c16856a2..06edfb3ba 100644
--- a/plugins/no_title_counters/init.js
+++ b/plugins/no_title_counters/init.js
@@ -1,5 +1,7 @@
-dojo.addOnLoad(function() {
-	updateTitle = function() {
-		document.title = "Tiny Tiny RSS";
-	};
+require(['dojo/_base/kernel', 'dojo/ready'], function (dojo, ready) {
+	ready(function () {
+		updateTitle = function () {
+			document.title = "Tiny Tiny RSS";
+		};
+	});
 });
diff --git a/plugins/no_url_hashes/init.js b/plugins/no_url_hashes/init.js
index a437a1f3e..fc4596724 100644
--- a/plugins/no_url_hashes/init.js
+++ b/plugins/no_url_hashes/init.js
@@ -1,4 +1,9 @@
-dojo.addOnLoad(function() {
-	hash_set = function() { };
-	hash_get = function() { };
+require(['dojo/_base/kernel', 'dojo/ready'], function (dojo, ready) {
+	ready(function () {
+		hash_set = function () {
+		};
+		hash_get = function () {
+		};
+	});
 });
+
diff --git a/plugins/shorten_expanded/init.js b/plugins/shorten_expanded/init.js
index 899f8a54d..ffec6271d 100644
--- a/plugins/shorten_expanded/init.js
+++ b/plugins/shorten_expanded/init.js
@@ -24,7 +24,7 @@ function expandSizeWrapper(id) {
 
 require(['dojo/_base/kernel', 'dojo/ready'], function  (dojo, ready) {
 
-	dojo.addOnLoad(function() {
+	ready(function() {
 		PluginHost.register(PluginHost.HOOK_ARTICLE_RENDERED_CDM, function(row) {
 			if (getInitParam('cdm_expanded')) {
 
-- 
cgit v1.2.3


From 546b419f52a741c150874fd233d91b88e88fa71a Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@madoka.volgo-balt.ru>
Date: Wed, 10 Aug 2016 12:23:35 +0300
Subject: catch plugin JS errors

---
 index.php    |  5 +++++
 js/tt-rss.js | 10 +++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/index.php b/index.php
index 36734619f..6b27d9042 100644
--- a/index.php
+++ b/index.php
@@ -118,7 +118,12 @@
 
 		foreach (PluginHost::getInstance()->get_plugins() as $n => $p) {
 			if (method_exists($p, "get_js")) {
+				echo "try {";
 				echo JShrink\Minifier::minify($p->get_js());
+				echo "} catch (e) {
+				 	console.warn('failed to initialize plugin JS: $n');
+					console.warn(e);
+				}";
 			}
 		}
 
diff --git a/js/tt-rss.js b/js/tt-rss.js
index e5e7a848f..78feb6ea3 100644
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -218,10 +218,10 @@ function init() {
 	try {
 		//dojo.registerModulePath("fox", "../../js/");
 
-		require(['dojo/_base/kernel',
-				'dojo/ready',
-				'dojo/parser',
-				'dojo/_base/loader',
+		require(["dojo/_base/kernel",
+				"dojo/ready",
+				"dojo/parser",
+				"dojo/_base/loader",
 				"dijit/ProgressBar",
 				"dijit/ColorPalette",
 				"dijit/Dialog",
@@ -254,7 +254,7 @@ function init() {
 
 					dojo.require("fox.FeedTree");
 
-					dojo.parser.parse();
+					parser.parse();
 
 					if (!genericSanityCheck())
 						return false;
-- 
cgit v1.2.3


From d39a2f8005ba69f2940c8e3b547fbb18dc23bef0 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@madoka.volgo-balt.ru>
Date: Wed, 10 Aug 2016 13:40:24 +0300
Subject: switch modules to new dojo definition format

---
 js/FeedTree.js       | 1010 +++++++++++++++++++++++++-------------------------
 js/PrefFeedTree.js   |  229 ++++++------
 js/PrefFilterTree.js |  182 ++++-----
 js/PrefLabelTree.js  |   62 ++--
 js/prefs.js          |   11 +-
 js/tt-rss.js         |    5 +-
 lib/CheckBoxTree.js  |  904 ++++++++++++++++++++++----------------------
 7 files changed, 1210 insertions(+), 1193 deletions(-)

diff --git a/js/FeedTree.js b/js/FeedTree.js
index c7c892b42..e4daec522 100644
--- a/js/FeedTree.js
+++ b/js/FeedTree.js
@@ -1,589 +1,591 @@
-dojo.provide("fox.FeedTree");
-dojo.provide("fox.FeedStoreModel");
-
-dojo.require("dijit.Tree");
-dojo.require("dijit.Menu");
-
-dojo.declare("fox.FeedStoreModel", dijit.tree.ForestStoreModel, {
-	getItemsInCategory: function (id) {
-		if (!this.store._itemsByIdentity) return undefined;
-
-		cat = this.store._itemsByIdentity['CAT:' + id];
-
-		if (cat && cat.items)
-			return cat.items;
-		else
-			return undefined;
-
-	},
-	getItemById: function(id) {
-		return this.store._itemsByIdentity[id];
-	},
-	getFeedValue: function(feed, is_cat, key) {
-		if (!this.store._itemsByIdentity) return undefined;
-
-		if (is_cat)
-			treeItem = this.store._itemsByIdentity['CAT:' + feed];
-		else
-			treeItem = this.store._itemsByIdentity['FEED:' + feed];
-
-		if (treeItem)
-			return this.store.getValue(treeItem, key);
-	},
-	getFeedName: function(feed, is_cat) {
-		return this.getFeedValue(feed, is_cat, 'name');
-	},
-	getFeedUnread: function(feed, is_cat) {
-		var unread = parseInt(this.getFeedValue(feed, is_cat, 'unread'));
-		return (isNaN(unread)) ? 0 : unread;
-	},
-	setFeedUnread: function(feed, is_cat, unread) {
-		return this.setFeedValue(feed, is_cat, 'unread', parseInt(unread));
-	},
-	setFeedValue: function(feed, is_cat, key, value) {
-		if (!value) value = '';
-		if (!this.store._itemsByIdentity) return undefined;
-
-		if (is_cat)
-			treeItem = this.store._itemsByIdentity['CAT:' + feed];
-		else
-			treeItem = this.store._itemsByIdentity['FEED:' + feed];
-
-		if (treeItem)
-			return this.store.setValue(treeItem, key, value);
-	},
-	getNextUnreadFeed: function (feed, is_cat) {
-		if (!this.store._itemsByIdentity)
-			return null;
+require(["dojo/_base/declare", "dijit/tree/ForestStoreModel"], function (declare) {
+
+	return declare("fox.FeedStoreModel", dijit.tree.ForestStoreModel, {
+		getItemsInCategory: function (id) {
+			if (!this.store._itemsByIdentity) return undefined;
+
+			cat = this.store._itemsByIdentity['CAT:' + id];
+
+			if (cat && cat.items)
+				return cat.items;
+			else
+				return undefined;
+
+		},
+		getItemById: function (id) {
+			return this.store._itemsByIdentity[id];
+		},
+		getFeedValue: function (feed, is_cat, key) {
+			if (!this.store._itemsByIdentity) return undefined;
+
+			if (is_cat)
+				treeItem = this.store._itemsByIdentity['CAT:' + feed];
+			else
+				treeItem = this.store._itemsByIdentity['FEED:' + feed];
+
+			if (treeItem)
+				return this.store.getValue(treeItem, key);
+		},
+		getFeedName: function (feed, is_cat) {
+			return this.getFeedValue(feed, is_cat, 'name');
+		},
+		getFeedUnread: function (feed, is_cat) {
+			var unread = parseInt(this.getFeedValue(feed, is_cat, 'unread'));
+			return (isNaN(unread)) ? 0 : unread;
+		},
+		setFeedUnread: function (feed, is_cat, unread) {
+			return this.setFeedValue(feed, is_cat, 'unread', parseInt(unread));
+		},
+		setFeedValue: function (feed, is_cat, key, value) {
+			if (!value) value = '';
+			if (!this.store._itemsByIdentity) return undefined;
+
+			if (is_cat)
+				treeItem = this.store._itemsByIdentity['CAT:' + feed];
+			else
+				treeItem = this.store._itemsByIdentity['FEED:' + feed];
+
+			if (treeItem)
+				return this.store.setValue(treeItem, key, value);
+		},
+		getNextUnreadFeed: function (feed, is_cat) {
+			if (!this.store._itemsByIdentity)
+				return null;
 
-		if (is_cat) {
-			treeItem = this.store._itemsByIdentity['CAT:' + feed];
-		} else {
-			treeItem = this.store._itemsByIdentity['FEED:' + feed];
-		}
+			if (is_cat) {
+				treeItem = this.store._itemsByIdentity['CAT:' + feed];
+			} else {
+				treeItem = this.store._itemsByIdentity['FEED:' + feed];
+			}
 
-		items = this.store._arrayOfAllItems;
+			items = this.store._arrayOfAllItems;
 
-		for (var i = 0; i < items.length; i++) {
-			if (items[i] == treeItem) {
+			for (var i = 0; i < items.length; i++) {
+				if (items[i] == treeItem) {
 
-				for (var j = i+1; j < items.length; j++) {
-					var unread = this.store.getValue(items[j], 'unread');
-					var id = this.store.getValue(items[j], 'id');
+					for (var j = i + 1; j < items.length; j++) {
+						var unread = this.store.getValue(items[j], 'unread');
+						var id = this.store.getValue(items[j], 'id');
 
-					if (unread > 0 && ((is_cat && id.match("CAT:")) || (!is_cat && id.match("FEED:")))) {
-						if( !is_cat || ! (this.store.hasAttribute(items[j], 'parent_id') && this.store.getValue(items[j], 'parent_id') == feed) ) return items[j];
+						if (unread > 0 && ((is_cat && id.match("CAT:")) || (!is_cat && id.match("FEED:")))) {
+							if (!is_cat || !(this.store.hasAttribute(items[j], 'parent_id') && this.store.getValue(items[j], 'parent_id') == feed)) return items[j];
+						}
 					}
-				}
 
-				for (var j = 0; j < i; j++) {
-					var unread = this.store.getValue(items[j], 'unread');
-					var id = this.store.getValue(items[j], 'id');
+					for (var j = 0; j < i; j++) {
+						var unread = this.store.getValue(items[j], 'unread');
+						var id = this.store.getValue(items[j], 'id');
 
-					if (unread > 0 && ((is_cat && id.match("CAT:")) || (!is_cat && id.match("FEED:")))) {
-						if( !is_cat || ! (this.store.hasAttribute(items[j], 'parent_id') && this.store.getValue(items[j], 'parent_id') == feed) ) return items[j];
+						if (unread > 0 && ((is_cat && id.match("CAT:")) || (!is_cat && id.match("FEED:")))) {
+							if (!is_cat || !(this.store.hasAttribute(items[j], 'parent_id') && this.store.getValue(items[j], 'parent_id') == feed)) return items[j];
+						}
 					}
 				}
 			}
-		}
-
-		return null;
-	},
-	hasCats: function() {
-		if (this.store && this.store._itemsByIdentity)
-			return this.store._itemsByIdentity['CAT:-1'] != undefined;
-		else
-			return false;
-	},
+
+			return null;
+		},
+		hasCats: function () {
+			if (this.store && this.store._itemsByIdentity)
+				return this.store._itemsByIdentity['CAT:-1'] != undefined;
+			else
+				return false;
+		},
+
+	});
 });
 
-dojo.declare("fox.FeedTree", dijit.Tree, {
-	_onKeyPress: function(/* Event */ e) {
-		return; // Stop dijit.Tree from interpreting keystrokes
-	},
-	_createTreeNode: function(args) {
-		var tnode = new dijit._TreeNode(args);
+require(["dojo/_base/declare", "dijit/Tree", "dijit/Menu"], function (declare) {
 
-		if (args.item.icon && args.item.icon[0])
-			tnode.iconNode.src = args.item.icon[0];
+	return declare("fox.FeedTree", dijit.Tree, {
+		_onKeyPress: function(/* Event */ e) {
+			return; // Stop dijit.Tree from interpreting keystrokes
+		},
+		_createTreeNode: function(args) {
+			var tnode = new dijit._TreeNode(args);
 
-		var id = args.item.id[0];
-		var bare_id = parseInt(id.substr(id.indexOf(':')+1));
+			if (args.item.icon && args.item.icon[0])
+				tnode.iconNode.src = args.item.icon[0];
 
-		if (bare_id < _label_base_index) {
-			var span = dojo.doc.createElement('span');
-			var fg_color = args.item.fg_color[0];
-			var bg_color = args.item.bg_color[0];
+			var id = args.item.id[0];
+			var bare_id = parseInt(id.substr(id.indexOf(':')+1));
 
-			span.innerHTML = "&alpha;";
-			span.className = 'labelColorIndicator';
-			span.setStyle({
-				color: fg_color,
-				backgroundColor: bg_color});
+			if (bare_id < _label_base_index) {
+				var span = dojo.doc.createElement('span');
+				var fg_color = args.item.fg_color[0];
+				var bg_color = args.item.bg_color[0];
 
-			dojo.place(span, tnode.iconNode, 'replace');
-		}
+				span.innerHTML = "&alpha;";
+				span.className = 'labelColorIndicator';
+				span.setStyle({
+					color: fg_color,
+					backgroundColor: bg_color});
 
-		if (id.match("FEED:")) {
-			var menu = new dijit.Menu();
-			menu.row_id = bare_id;
+				dojo.place(span, tnode.iconNode, 'replace');
+			}
 
-			menu.addChild(new dijit.MenuItem({
-				label: __("Mark as read"),
-				onClick: function() {
-					catchupFeed(this.getParent().row_id);
-				}}));
+			if (id.match("FEED:")) {
+				var menu = new dijit.Menu();
+				menu.row_id = bare_id;
 
-			if (bare_id > 0) {
 				menu.addChild(new dijit.MenuItem({
-					label: __("Edit feed"),
+					label: __("Mark as read"),
 					onClick: function() {
-						editFeed(this.getParent().row_id, false);
+						catchupFeed(this.getParent().row_id);
 					}}));
 
-				/* menu.addChild(new dijit.MenuItem({
-					label: __("Update feed"),
+				if (bare_id > 0) {
+					menu.addChild(new dijit.MenuItem({
+						label: __("Edit feed"),
+						onClick: function() {
+							editFeed(this.getParent().row_id, false);
+						}}));
+
+					/* menu.addChild(new dijit.MenuItem({
+					 label: __("Update feed"),
+					 onClick: function() {
+					 heduleFeedUpdate(this.getParent().row_id, false);
+					 }})); */
+				}
+
+				menu.bindDomNode(tnode.domNode);
+				tnode._menu = menu;
+			}
+
+			if (id.match("CAT:") && bare_id >= 0) {
+				var menu = new dijit.Menu();
+				menu.row_id = bare_id;
+
+				menu.addChild(new dijit.MenuItem({
+					label: __("Mark as read"),
 					onClick: function() {
-						heduleFeedUpdate(this.getParent().row_id, false);
-					}})); */
+						catchupFeed(this.getParent().row_id, true);
+					}}));
+
+				menu.bindDomNode(tnode.domNode);
+				tnode._menu = menu;
 			}
 
-			menu.bindDomNode(tnode.domNode);
-			tnode._menu = menu;
-		}
-
-		if (id.match("CAT:") && bare_id >= 0) {
-			var menu = new dijit.Menu();
-			menu.row_id = bare_id;
-
-			menu.addChild(new dijit.MenuItem({
-				label: __("Mark as read"),
-				onClick: function() {
-					catchupFeed(this.getParent().row_id, true);
-				}}));
-
-			menu.bindDomNode(tnode.domNode);
-			tnode._menu = menu;
-		}
-
-		if (id.match("CAT:")) {
-			loading = dojo.doc.createElement('img');
-			loading.className = 'loadingNode';
-			loading.src = 'images/blank_icon.gif';
-			dojo.place(loading, tnode.labelNode, 'after');
-			tnode.loadingNode = loading;
-		}
-
-		if (id.match("CAT:") && bare_id == -1) {
-			var menu = new dijit.Menu();
-			menu.row_id = bare_id;
-
-			menu.addChild(new dijit.MenuItem({
-				label: __("Mark all feeds as read"),
-				onClick: function() {
-					catchupAllFeeds();
-				}}));
-
-			menu.bindDomNode(tnode.domNode);
-			tnode._menu = menu;
-		}
-
-		ctr = dojo.doc.createElement('span');
-		ctr.className = 'counterNode';
-		ctr.innerHTML = args.item.unread > 0 ? args.item.unread : args.item.auxcounter;
-
-		//args.item.unread > 0 ? ctr.addClassName("unread") : ctr.removeClassName("unread");
-
-		args.item.unread > 0 || args.item.auxcounter > 0 ? Element.show(ctr) : Element.hide(ctr);
-
-		args.item.unread == 0 && args.item.auxcounter > 0 ? ctr.addClassName("aux") : ctr.removeClassName("aux");
-
-		dojo.place(ctr, tnode.rowNode, 'first');
-		tnode.counterNode = ctr;
-
-		//tnode.labelNode.innerHTML = args.label;
-		return tnode;
-	},
-	postCreate: function() {
-		this.connect(this.model, "onChange", "updateCounter");
-		this.connect(this, "_expandNode", function() {
-			this.hideRead(getInitParam("hide_read_feeds"), getInitParam("hide_read_shows_special"));
-		});
-
-		this.inherited(arguments);
-	},
-	updateCounter: function (item) {
-		var tree = this;
-
-		//console.log("updateCounter: " + item.id[0] + " " + item.unread + " " + tree);
-
-		var node = tree._itemNodesMap[item.id];
-
-		if (node) {
-			node = node[0];
-
-			if (node.counterNode) {
-				ctr = node.counterNode;
-				ctr.innerHTML = item.unread > 0 ? item.unread : item.auxcounter;
-				item.unread > 0 || item.auxcounter > 0 ?
-					Effect.Appear(ctr, {duration : 0.3,
-					queue: { position: 'end', scope: 'CAPPEAR-' + item.id, limit: 1 }}) :
-						Element.hide(ctr);
+			if (id.match("CAT:")) {
+				loading = dojo.doc.createElement('img');
+				loading.className = 'loadingNode';
+				loading.src = 'images/blank_icon.gif';
+				dojo.place(loading, tnode.labelNode, 'after');
+				tnode.loadingNode = loading;
+			}
 
-				item.unread == 0 && item.auxcounter > 0 ? ctr.addClassName("aux") : ctr.removeClassName("aux");
+			if (id.match("CAT:") && bare_id == -1) {
+				var menu = new dijit.Menu();
+				menu.row_id = bare_id;
 
+				menu.addChild(new dijit.MenuItem({
+					label: __("Mark all feeds as read"),
+					onClick: function() {
+						catchupAllFeeds();
+					}}));
+
+				menu.bindDomNode(tnode.domNode);
+				tnode._menu = menu;
 			}
-		}
-
-	},
-	getTooltip: function (item) {
-		if (item.updated)
-			return item.updated;
-		else
-			return "";
-	},
-	getIconClass: function (item, opened) {
-		return (!item || this.model.mayHaveChildren(item)) ? (opened ? "dijitFolderOpened" : "dijitFolderClosed") : "feedIcon";
-	},
-	getLabelClass: function (item, opened) {
-		return (item.unread == 0) ? "dijitTreeLabel" : "dijitTreeLabel Unread";
-	},
-	getRowClass: function (item, opened) {
-		var rc = (!item.error || item.error == '') ? "dijitTreeRow" :
-			"dijitTreeRow Error";
-
-		if (item.unread > 0) rc += " Unread";
-
-		return rc;
-	},
-	getLabel: function(item) {
-		var name = String(item.name);
-
-		/* Horrible */
-		name = name.replace(/&quot;/g, "\"");
-		name = name.replace(/&amp;/g, "&");
-		name = name.replace(/&mdash;/g, "-");
-		name = name.replace(/&lt;/g, "<");
-		name = name.replace(/&gt;/g, ">");
-
-		/* var label;
-
-		if (item.unread > 0) {
-			label = name + " (" + item.unread + ")";
-		} else {
-			label = name;
-		} */
-
-		return name;
-	},
-	expandParentNodes: function(feed, is_cat, list) {
-		try {
-			for (var i = 0; i < list.length; i++) {
-				var id = String(list[i].id);
-				var item = this._itemNodesMap[id];
-
-				if (item) {
-					item = item[0];
-					this._expandNode(item);
+
+			ctr = dojo.doc.createElement('span');
+			ctr.className = 'counterNode';
+			ctr.innerHTML = args.item.unread > 0 ? args.item.unread : args.item.auxcounter;
+
+			//args.item.unread > 0 ? ctr.addClassName("unread") : ctr.removeClassName("unread");
+
+			args.item.unread > 0 || args.item.auxcounter > 0 ? Element.show(ctr) : Element.hide(ctr);
+
+			args.item.unread == 0 && args.item.auxcounter > 0 ? ctr.addClassName("aux") : ctr.removeClassName("aux");
+
+			dojo.place(ctr, tnode.rowNode, 'first');
+			tnode.counterNode = ctr;
+
+			//tnode.labelNode.innerHTML = args.label;
+			return tnode;
+		},
+		postCreate: function() {
+			this.connect(this.model, "onChange", "updateCounter");
+			this.connect(this, "_expandNode", function() {
+				this.hideRead(getInitParam("hide_read_feeds"), getInitParam("hide_read_shows_special"));
+			});
+
+			this.inherited(arguments);
+		},
+		updateCounter: function (item) {
+			var tree = this;
+
+			//console.log("updateCounter: " + item.id[0] + " " + item.unread + " " + tree);
+
+			var node = tree._itemNodesMap[item.id];
+
+			if (node) {
+				node = node[0];
+
+				if (node.counterNode) {
+					ctr = node.counterNode;
+					ctr.innerHTML = item.unread > 0 ? item.unread : item.auxcounter;
+					item.unread > 0 || item.auxcounter > 0 ?
+						Effect.Appear(ctr, {duration : 0.3,
+							queue: { position: 'end', scope: 'CAPPEAR-' + item.id, limit: 1 }}) :
+						Element.hide(ctr);
+
+					item.unread == 0 && item.auxcounter > 0 ? ctr.addClassName("aux") : ctr.removeClassName("aux");
+
 				}
 			}
-		} catch (e) {
-			exception_error("expandParentNodes", e);
-		}
-	},
-	findNodeParentsAndExpandThem: function(feed, is_cat, root, parents) {
-		// expands all parents of specified feed to properly mark it as active
-		// my fav thing about frameworks is doing everything myself
-		try {
-			var test_id = is_cat ? 'CAT:' + feed : 'FEED:' + feed;
-
-			if (!root) {
-				if (!this.model || !this.model.store) return false;
-
-				var items = this.model.store._arrayOfTopLevelItems;
-
-				for (var i = 0; i < items.length; i++) {
-					if (String(items[i].id) == test_id) {
-						this.expandParentNodes(feed, is_cat, parents);
-					} else {
-						this.findNodeParentsAndExpandThem(feed, is_cat, items[i], []);
+
+		},
+		getTooltip: function (item) {
+			if (item.updated)
+				return item.updated;
+			else
+				return "";
+		},
+		getIconClass: function (item, opened) {
+			return (!item || this.model.mayHaveChildren(item)) ? (opened ? "dijitFolderOpened" : "dijitFolderClosed") : "feedIcon";
+		},
+		getLabelClass: function (item, opened) {
+			return (item.unread == 0) ? "dijitTreeLabel" : "dijitTreeLabel Unread";
+		},
+		getRowClass: function (item, opened) {
+			var rc = (!item.error || item.error == '') ? "dijitTreeRow" :
+				"dijitTreeRow Error";
+
+			if (item.unread > 0) rc += " Unread";
+
+			return rc;
+		},
+		getLabel: function(item) {
+			var name = String(item.name);
+
+			/* Horrible */
+			name = name.replace(/&quot;/g, "\"");
+			name = name.replace(/&amp;/g, "&");
+			name = name.replace(/&mdash;/g, "-");
+			name = name.replace(/&lt;/g, "<");
+			name = name.replace(/&gt;/g, ">");
+
+			/* var label;
+
+			 if (item.unread > 0) {
+			 label = name + " (" + item.unread + ")";
+			 } else {
+			 label = name;
+			 } */
+
+			return name;
+		},
+		expandParentNodes: function(feed, is_cat, list) {
+			try {
+				for (var i = 0; i < list.length; i++) {
+					var id = String(list[i].id);
+					var item = this._itemNodesMap[id];
+
+					if (item) {
+						item = item[0];
+						this._expandNode(item);
 					}
 				}
-			} else {
-				if (root.items) {
-					parents.push(root);
+			} catch (e) {
+				exception_error("expandParentNodes", e);
+			}
+		},
+		findNodeParentsAndExpandThem: function(feed, is_cat, root, parents) {
+			// expands all parents of specified feed to properly mark it as active
+			// my fav thing about frameworks is doing everything myself
+			try {
+				var test_id = is_cat ? 'CAT:' + feed : 'FEED:' + feed;
+
+				if (!root) {
+					if (!this.model || !this.model.store) return false;
 
-					for (var i = 0; i < root.items.length; i++) {
-						if (String(root.items[i].id) == test_id) {
+					var items = this.model.store._arrayOfTopLevelItems;
+
+					for (var i = 0; i < items.length; i++) {
+						if (String(items[i].id) == test_id) {
 							this.expandParentNodes(feed, is_cat, parents);
 						} else {
-							this.findNodeParentsAndExpandThem(feed, is_cat, root.items[i], parents.slice(0));
+							this.findNodeParentsAndExpandThem(feed, is_cat, items[i], []);
 						}
 					}
 				} else {
-					if (String(root.id) == test_id) {
-						this.expandParentNodes(feed, is_cat, parents.slice(0));
+					if (root.items) {
+						parents.push(root);
+
+						for (var i = 0; i < root.items.length; i++) {
+							if (String(root.items[i].id) == test_id) {
+								this.expandParentNodes(feed, is_cat, parents);
+							} else {
+								this.findNodeParentsAndExpandThem(feed, is_cat, root.items[i], parents.slice(0));
+							}
+						}
+					} else {
+						if (String(root.id) == test_id) {
+							this.expandParentNodes(feed, is_cat, parents.slice(0));
+						}
 					}
 				}
+			} catch (e) {
+				exception_error("findNodeParentsAndExpandThem", e);
 			}
-		} catch (e) {
-			exception_error("findNodeParentsAndExpandThem", e);
-		}
-	},
-	selectFeed: function(feed, is_cat) {
-		this.findNodeParentsAndExpandThem(feed, is_cat, false, false);
-
-		if (is_cat)
-			treeNode = this._itemNodesMap['CAT:' + feed];
-		else
-			treeNode = this._itemNodesMap['FEED:' + feed];
-
-		if (treeNode) {
-			treeNode = treeNode[0];
-			if (!is_cat) this._expandNode(treeNode);
-			this.set("selectedNodes", [treeNode]);
-		}
-	},
-	setFeedIcon: function(feed, is_cat, src) {
-		if (is_cat)
-			treeNode = this._itemNodesMap['CAT:' + feed];
-		else
-			treeNode = this._itemNodesMap['FEED:' + feed];
-
-		if (treeNode) {
-			treeNode = treeNode[0];
-			treeNode.iconNode.src = src;
-			return true;
-		}
-		return false;
-	},
-	setFeedExpandoIcon: function(feed, is_cat, src) {
-		if (is_cat)
-			treeNode = this._itemNodesMap['CAT:' + feed];
-		else
-			treeNode = this._itemNodesMap['FEED:' + feed];
-
-		if (treeNode) {
-			treeNode = treeNode[0];
-			if (treeNode.loadingNode) {
-				treeNode.loadingNode.src = src;
-				return true;
-			} else {
-				treeNode.expandoNode.src = src;
-				return true;
-			}
-		}
-
-		return false;
-	},
-	hasCats: function() {
-		return this.model.hasCats();
-	},
-	hideReadCat: function (cat, hide, show_special) {
-		if (this.hasCats()) {
-			var tree = this;
+		},
+		selectFeed: function(feed, is_cat) {
+			this.findNodeParentsAndExpandThem(feed, is_cat, false, false);
 
-			if (cat && cat.items) {
-				var cat_unread = tree.hideReadFeeds(cat.items, hide, show_special);
+			if (is_cat)
+				treeNode = this._itemNodesMap['CAT:' + feed];
+			else
+				treeNode = this._itemNodesMap['FEED:' + feed];
+
+			if (treeNode) {
+				treeNode = treeNode[0];
+				if (!is_cat) this._expandNode(treeNode);
+				this.set("selectedNodes", [treeNode]);
+			}
+		},
+		setFeedIcon: function(feed, is_cat, src) {
+			if (is_cat)
+				treeNode = this._itemNodesMap['CAT:' + feed];
+			else
+				treeNode = this._itemNodesMap['FEED:' + feed];
 
-				var id = String(cat.id);
-				var node = tree._itemNodesMap[id];
-				var bare_id = parseInt(id.substr(id.indexOf(":")+1));
+			if (treeNode) {
+				treeNode = treeNode[0];
+				treeNode.iconNode.src = src;
+				return true;
+			}
+			return false;
+		},
+		setFeedExpandoIcon: function(feed, is_cat, src) {
+			if (is_cat)
+				treeNode = this._itemNodesMap['CAT:' + feed];
+			else
+				treeNode = this._itemNodesMap['FEED:' + feed];
 
-				if (node) {
-					var check_unread = tree.model.getFeedUnread(bare_id, true);
+			if (treeNode) {
+				treeNode = treeNode[0];
+				if (treeNode.loadingNode) {
+					treeNode.loadingNode.src = src;
+					return true;
+				} else {
+					treeNode.expandoNode.src = src;
+					return true;
+				}
+			}
 
-					if (hide && cat_unread == 0 && check_unread == 0 && (id != "CAT:-1" || !show_special)) {
-						Effect.Fade(node[0].rowNode, {duration : 0.3,
-							queue: { position: 'end', scope: 'FFADE-' + id, limit: 1 }});
-					} else {
-						Element.show(node[0].rowNode);
-						++cat_unread;
+			return false;
+		},
+		hasCats: function() {
+			return this.model.hasCats();
+		},
+		hideReadCat: function (cat, hide, show_special) {
+			if (this.hasCats()) {
+				var tree = this;
+
+				if (cat && cat.items) {
+					var cat_unread = tree.hideReadFeeds(cat.items, hide, show_special);
+
+					var id = String(cat.id);
+					var node = tree._itemNodesMap[id];
+					var bare_id = parseInt(id.substr(id.indexOf(":")+1));
+
+					if (node) {
+						var check_unread = tree.model.getFeedUnread(bare_id, true);
+
+						if (hide && cat_unread == 0 && check_unread == 0 && (id != "CAT:-1" || !show_special)) {
+							Effect.Fade(node[0].rowNode, {duration : 0.3,
+								queue: { position: 'end', scope: 'FFADE-' + id, limit: 1 }});
+						} else {
+							Element.show(node[0].rowNode);
+							++cat_unread;
+						}
 					}
 				}
 			}
-		}
-	},
-	hideRead: function (hide, show_special) {
-		if (this.hasCats()) {
+		},
+		hideRead: function (hide, show_special) {
+			if (this.hasCats()) {
+
+				var tree = this;
+				var cats = this.model.store._arrayOfTopLevelItems;
 
+				cats.each(function(cat) {
+					tree.hideReadCat(cat, hide, show_special);
+				});
+
+			} else {
+				this.hideReadFeeds(this.model.store._arrayOfTopLevelItems, hide,
+					show_special);
+			}
+		},
+		hideReadFeeds: function (items, hide, show_special) {
 			var tree = this;
-			var cats = this.model.store._arrayOfTopLevelItems;
+			var cat_unread = 0;
 
-			cats.each(function(cat) {
-				tree.hideReadCat(cat, hide, show_special);
-			});
+			items.each(function(feed) {
+				var id = String(feed.id);
 
-		} else {
-			this.hideReadFeeds(this.model.store._arrayOfTopLevelItems, hide,
-				show_special);
-		}
-	},
-	hideReadFeeds: function (items, hide, show_special) {
-		var tree = this;
-		var cat_unread = 0;
-
-		items.each(function(feed) {
-			var id = String(feed.id);
-
-			// it's a subcategory
-			if (feed.items) {
-				tree.hideReadCat(feed, hide, show_special);
-			} else {	// it's a feed
-				var bare_id = parseInt(feed.bare_id);;
-
-				var unread = feed.unread[0];
-				var has_error = feed.error[0] != '';
-				var node = tree._itemNodesMap[id];
-
-				if (node) {
-					if (hide && unread == 0 && !has_error && (bare_id > 0 || bare_id < _label_base_index || !show_special)) {
-						Effect.Fade(node[0].rowNode, {duration : 0.3,
-							queue: { position: 'end', scope: 'FFADE-' + id, limit: 1 }});
-					} else {
-						Element.show(node[0].rowNode);
-						++cat_unread;
+				// it's a subcategory
+				if (feed.items) {
+					tree.hideReadCat(feed, hide, show_special);
+				} else {	// it's a feed
+					var bare_id = parseInt(feed.bare_id);;
+
+					var unread = feed.unread[0];
+					var has_error = feed.error[0] != '';
+					var node = tree._itemNodesMap[id];
+
+					if (node) {
+						if (hide && unread == 0 && !has_error && (bare_id > 0 || bare_id < _label_base_index || !show_special)) {
+							Effect.Fade(node[0].rowNode, {duration : 0.3,
+								queue: { position: 'end', scope: 'FFADE-' + id, limit: 1 }});
+						} else {
+							Element.show(node[0].rowNode);
+							++cat_unread;
+						}
 					}
 				}
-			}
-		});
+			});
 
-		return cat_unread;
-	},
-	collapseCat: function(id) {
-		if (!this.model.hasCats()) return;
+			return cat_unread;
+		},
+		collapseCat: function(id) {
+			if (!this.model.hasCats()) return;
 
-		var tree = this;
+			var tree = this;
 
-		var node = tree._itemNodesMap['CAT:' + id][0];
-		var item = tree.model.store._itemsByIdentity['CAT:' + id];
+			var node = tree._itemNodesMap['CAT:' + id][0];
+			var item = tree.model.store._itemsByIdentity['CAT:' + id];
 
-		if (node && item) {
-			if (!node.isExpanded)
-				tree._expandNode(node);
-			else
-				tree._collapseNode(node);
+			if (node && item) {
+				if (!node.isExpanded)
+					tree._expandNode(node);
+				else
+					tree._collapseNode(node);
 
-		}
-	},
-	getVisibleUnreadFeeds: function() {
-		var items = this.model.store._arrayOfAllItems;
-		var rv = [];
+			}
+		},
+		getVisibleUnreadFeeds: function() {
+			var items = this.model.store._arrayOfAllItems;
+			var rv = [];
 
-		for (var i = 0; i < items.length; i++) {
-			var id = String(items[i].id);
-			var box = this._itemNodesMap[id];
+			for (var i = 0; i < items.length; i++) {
+				var id = String(items[i].id);
+				var box = this._itemNodesMap[id];
 
-			if (box) {
-				var row = box[0].rowNode;
-				var cat = false;
+				if (box) {
+					var row = box[0].rowNode;
+					var cat = false;
 
-				try {
-					cat = box[0].rowNode.parentNode.parentNode;
-				} catch (e) { }
+					try {
+						cat = box[0].rowNode.parentNode.parentNode;
+					} catch (e) { }
 
-				if (row) {
-					if (Element.visible(row) && (!cat || Element.visible(cat))) {
-						var feed_id = String(items[i].bare_id);
-						var is_cat = !id.match('FEED:');
-						var unread = this.model.getFeedUnread(feed_id, is_cat);
+					if (row) {
+						if (Element.visible(row) && (!cat || Element.visible(cat))) {
+							var feed_id = String(items[i].bare_id);
+							var is_cat = !id.match('FEED:');
+							var unread = this.model.getFeedUnread(feed_id, is_cat);
 
-						if (unread > 0)
-							rv.push([feed_id, is_cat]);
+							if (unread > 0)
+								rv.push([feed_id, is_cat]);
 
+						}
 					}
 				}
 			}
-		}
-
-		return rv;
-	},
-	getNextFeed: function (feed, is_cat) {
-		if (is_cat) {
-			treeItem = this.model.store._itemsByIdentity['CAT:' + feed];
-		} else {
-			treeItem = this.model.store._itemsByIdentity['FEED:' + feed];
-		}
-
-		items = this.model.store._arrayOfAllItems;
-		var item = items[0];
-
-		for (var i = 0; i < items.length; i++) {
-			if (items[i] == treeItem) {
-
-				for (var j = i+1; j < items.length; j++) {
-					var id = String(items[j].id);
-					var box = this._itemNodesMap[id];
-
-					if (box) {
-						var row = box[0].rowNode;
-						var cat = box[0].rowNode.parentNode.parentNode;
-
-						if (Element.visible(cat) && Element.visible(row)) {
-							item = items[j];
-							break;
+
+			return rv;
+		},
+		getNextFeed: function (feed, is_cat) {
+			if (is_cat) {
+				treeItem = this.model.store._itemsByIdentity['CAT:' + feed];
+			} else {
+				treeItem = this.model.store._itemsByIdentity['FEED:' + feed];
+			}
+
+			items = this.model.store._arrayOfAllItems;
+			var item = items[0];
+
+			for (var i = 0; i < items.length; i++) {
+				if (items[i] == treeItem) {
+
+					for (var j = i+1; j < items.length; j++) {
+						var id = String(items[j].id);
+						var box = this._itemNodesMap[id];
+
+						if (box) {
+							var row = box[0].rowNode;
+							var cat = box[0].rowNode.parentNode.parentNode;
+
+							if (Element.visible(cat) && Element.visible(row)) {
+								item = items[j];
+								break;
+							}
 						}
 					}
+					break;
 				}
-				break;
 			}
-		}
 
-		if (item) {
-			return [this.model.store.getValue(item, 'bare_id'),
-					 	!this.model.store.getValue(item, 'id').match('FEED:')];
-		} else {
-			return false;
-		}
-	},
-	getPreviousFeed: function (feed, is_cat) {
-		if (is_cat) {
-			treeItem = this.model.store._itemsByIdentity['CAT:' + feed];
-		} else {
-			treeItem = this.model.store._itemsByIdentity['FEED:' + feed];
-		}
-
-		items = this.model.store._arrayOfAllItems;
-		var item = items[0] == treeItem ? items[items.length-1] : items[0];
-
-		for (var i = 0; i < items.length; i++) {
-			if (items[i] == treeItem) {
-
-				for (var j = i-1; j > 0; j--) {
-					var id = String(items[j].id);
-					var box = this._itemNodesMap[id];
-
-					if (box) {
-						var row = box[0].rowNode;
-						var cat = box[0].rowNode.parentNode.parentNode;
-
-						if (Element.visible(cat) && Element.visible(row)) {
-							item = items[j];
-							break;
+			if (item) {
+				return [this.model.store.getValue(item, 'bare_id'),
+					!this.model.store.getValue(item, 'id').match('FEED:')];
+			} else {
+				return false;
+			}
+		},
+		getPreviousFeed: function (feed, is_cat) {
+			if (is_cat) {
+				treeItem = this.model.store._itemsByIdentity['CAT:' + feed];
+			} else {
+				treeItem = this.model.store._itemsByIdentity['FEED:' + feed];
+			}
+
+			items = this.model.store._arrayOfAllItems;
+			var item = items[0] == treeItem ? items[items.length-1] : items[0];
+
+			for (var i = 0; i < items.length; i++) {
+				if (items[i] == treeItem) {
+
+					for (var j = i-1; j > 0; j--) {
+						var id = String(items[j].id);
+						var box = this._itemNodesMap[id];
+
+						if (box) {
+							var row = box[0].rowNode;
+							var cat = box[0].rowNode.parentNode.parentNode;
+
+							if (Element.visible(cat) && Element.visible(row)) {
+								item = items[j];
+								break;
+							}
 						}
-					}
 
+					}
+					break;
 				}
-				break;
 			}
-		}
 
-		if (item) {
-			return [this.model.store.getValue(item, 'bare_id'),
-					 	!this.model.store.getValue(item, 'id').match('FEED:')];
-		} else {
-			return false;
-		}
+			if (item) {
+				return [this.model.store.getValue(item, 'bare_id'),
+					!this.model.store.getValue(item, 'id').match('FEED:')];
+			} else {
+				return false;
+			}
 
-	},
-	getFeedCategory: function(feed) {
-		try {
-			return this.getNodesByItem(this.model.store.
+		},
+		getFeedCategory: function(feed) {
+			try {
+				return this.getNodesByItem(this.model.store.
 					_itemsByIdentity["FEED:" + feed])[0].
-					getParent().item.bare_id[0];
+				getParent().item.bare_id[0];
 
-		} catch (e) {
-			return false;
-		}
-	},
+			} catch (e) {
+				return false;
+			}
+		},
+	});
 });
+
diff --git a/js/PrefFeedTree.js b/js/PrefFeedTree.js
index bf21baa90..c3b0d75f0 100644
--- a/js/PrefFeedTree.js
+++ b/js/PrefFeedTree.js
@@ -1,125 +1,126 @@
-dojo.provide("fox.PrefFeedTree");
-dojo.provide("fox.PrefFeedStore");
+require(["dojo/_base/declare", "dojo/data/ItemFileWriteStore"], function (declare) {
 
-dojo.require("lib.CheckBoxTree");
-dojo.require("dojo.data.ItemFileWriteStore");
+	return declare("fox.PrefFeedStore", dojo.data.ItemFileWriteStore, {
 
-dojo.declare("fox.PrefFeedStore", dojo.data.ItemFileWriteStore, {
+		_saveEverything: function(saveCompleteCallback, saveFailedCallback,
+								  newFileContentString) {
 
-	_saveEverything: function(saveCompleteCallback, saveFailedCallback,
-								newFileContentString) {
+			dojo.xhrPost({
+				url: "backend.php",
+				content: {op: "pref-feeds", method: "savefeedorder",
+					payload: newFileContentString},
+				error: saveFailedCallback,
+				load: saveCompleteCallback});
+		},
 
-		dojo.xhrPost({
-			url: "backend.php",
-			content: {op: "pref-feeds", method: "savefeedorder",
-				payload: newFileContentString},
-			error: saveFailedCallback,
-			load: saveCompleteCallback});
-	},
+	});
 
 });
 
-dojo.declare("fox.PrefFeedTree", lib.CheckBoxTree, {
-	_createTreeNode: function(args) {
-		var tnode = this.inherited(arguments);
-
-		if (args.item.icon)
-			tnode.iconNode.src = args.item.icon[0];
-
-		var param = this.model.store.getValue(args.item, 'param');
-
-		if (param) {
-			param = dojo.doc.createElement('span');
-			param.className = 'feedParam';
-			param.innerHTML = args.item.param[0];
-			//dojo.place(param, tnode.labelNode, 'after');
-			dojo.place(param, tnode.rowNode, 'first');
-		}
-
-		var id = args.item.id[0];
-		var bare_id = parseInt(id.substr(id.indexOf(':')+1));
-
-		if (id.match("CAT:") && bare_id > 0) {
-			var menu = new dijit.Menu();
-			menu.row_id = bare_id;
-			menu.item = args.item;
-
-			menu.addChild(new dijit.MenuItem({
-				label: __("Edit category"),
-				onClick: function() {
-					editCat(this.getParent().row_id, this.getParent().item, null);
-				}}));
-
-
-			menu.addChild(new dijit.MenuItem({
-				label: __("Remove category"),
-				onClick: function() {
-					removeCategory(this.getParent().row_id, this.getParent().item);
-				}}));
-
-			menu.bindDomNode(tnode.domNode);
-			tnode._menu = menu;
-		} else if (id.match("FEED:")) {
-			var menu = new dijit.Menu();
-			menu.row_id = bare_id;
-			menu.item = args.item;
-
-			menu.addChild(new dijit.MenuItem({
-				label: __("Edit feed"),
-				onClick: function() {
-					editFeed(this.getParent().row_id);
-				}}));
-
-			menu.addChild(new dijit.MenuItem({
-				label: __("Unsubscribe"),
-				onClick: function() {
-					unsubscribeFeed(this.getParent().row_id, this.getParent().item.name);
-				}}));
-
-			menu.bindDomNode(tnode.domNode);
-			tnode._menu = menu;
-
-		}
-
-		return tnode;
-	},
-	onDndDrop: function() {
-		this.inherited(arguments);
-		this.tree.model.store.save();
-	},
-	getRowClass: function (item, opened) {
-		return (!item.error || item.error == '') ? "dijitTreeRow" :
-			"dijitTreeRow Error";
-	},
-	getIconClass: function (item, opened) {
-		return (!item || this.model.store.getValue(item, 'type') == 'category') ? (opened ? "dijitFolderOpened" : "dijitFolderClosed") : "feedIcon";
-	},
-	checkItemAcceptance: function(target, source, position) {
-		var item = dijit.getEnclosingWidget(target).item;
-
-		// disable copying items
-		source.copyState = function() { return false; };
-
-		var source_item = false;
-
-		source.forInSelectedItems(function(node) {
-			source_item = node.data.item;
-		});
-
-		if (!source_item || !item) return false;
-
-		var id = this.tree.model.store.getValue(item, 'id');
-		var source_id = source.tree.model.store.getValue(source_item, 'id');
-
-		//console.log(id + " " + position + " " + source_id);
-
-		if (source_id.match("FEED:")) {
-			return ((id.match("CAT:") && position == "over") ||
+require(["dojo/_base/declare", "lib/CheckBoxTree"], function (declare) {
+
+	return declare("fox.PrefFeedTree", lib.CheckBoxTree, {
+		_createTreeNode: function(args) {
+			var tnode = this.inherited(arguments);
+
+			if (args.item.icon)
+				tnode.iconNode.src = args.item.icon[0];
+
+			var param = this.model.store.getValue(args.item, 'param');
+
+			if (param) {
+				param = dojo.doc.createElement('span');
+				param.className = 'feedParam';
+				param.innerHTML = args.item.param[0];
+				//dojo.place(param, tnode.labelNode, 'after');
+				dojo.place(param, tnode.rowNode, 'first');
+			}
+
+			var id = args.item.id[0];
+			var bare_id = parseInt(id.substr(id.indexOf(':')+1));
+
+			if (id.match("CAT:") && bare_id > 0) {
+				var menu = new dijit.Menu();
+				menu.row_id = bare_id;
+				menu.item = args.item;
+
+				menu.addChild(new dijit.MenuItem({
+					label: __("Edit category"),
+					onClick: function() {
+						editCat(this.getParent().row_id, this.getParent().item, null);
+					}}));
+
+
+				menu.addChild(new dijit.MenuItem({
+					label: __("Remove category"),
+					onClick: function() {
+						removeCategory(this.getParent().row_id, this.getParent().item);
+					}}));
+
+				menu.bindDomNode(tnode.domNode);
+				tnode._menu = menu;
+			} else if (id.match("FEED:")) {
+				var menu = new dijit.Menu();
+				menu.row_id = bare_id;
+				menu.item = args.item;
+
+				menu.addChild(new dijit.MenuItem({
+					label: __("Edit feed"),
+					onClick: function() {
+						editFeed(this.getParent().row_id);
+					}}));
+
+				menu.addChild(new dijit.MenuItem({
+					label: __("Unsubscribe"),
+					onClick: function() {
+						unsubscribeFeed(this.getParent().row_id, this.getParent().item.name);
+					}}));
+
+				menu.bindDomNode(tnode.domNode);
+				tnode._menu = menu;
+
+			}
+
+			return tnode;
+		},
+		onDndDrop: function() {
+			this.inherited(arguments);
+			this.tree.model.store.save();
+		},
+		getRowClass: function (item, opened) {
+			return (!item.error || item.error == '') ? "dijitTreeRow" :
+				"dijitTreeRow Error";
+		},
+		getIconClass: function (item, opened) {
+			return (!item || this.model.store.getValue(item, 'type') == 'category') ? (opened ? "dijitFolderOpened" : "dijitFolderClosed") : "feedIcon";
+		},
+		checkItemAcceptance: function(target, source, position) {
+			var item = dijit.getEnclosingWidget(target).item;
+
+			// disable copying items
+			source.copyState = function() { return false; };
+
+			var source_item = false;
+
+			source.forInSelectedItems(function(node) {
+				source_item = node.data.item;
+			});
+
+			if (!source_item || !item) return false;
+
+			var id = this.tree.model.store.getValue(item, 'id');
+			var source_id = source.tree.model.store.getValue(source_item, 'id');
+
+			//console.log(id + " " + position + " " + source_id);
+
+			if (source_id.match("FEED:")) {
+				return ((id.match("CAT:") && position == "over") ||
 				(id.match("FEED:") && position != "over"));
-		} else if (source_id.match("CAT:")) {
-			return ((id.match("CAT:") && !id.match("CAT:0")) ||
+			} else if (source_id.match("CAT:")) {
+				return ((id.match("CAT:") && !id.match("CAT:0")) ||
 				(id.match("root") && position == "over"));
-		}
-	},
+			}
+		},
+	});
 });
 
diff --git a/js/PrefFilterTree.js b/js/PrefFilterTree.js
index ba06bbef4..5e055646c 100644
--- a/js/PrefFilterTree.js
+++ b/js/PrefFilterTree.js
@@ -1,96 +1,102 @@
-dojo.provide("fox.PrefFilterTree");
+require(["dojo/_base/declare", "dojo/data/ItemFileWriteStore"], function (declare) {
 
-dojo.require("lib.CheckBoxTree");
-dojo.require("dojo.data.ItemFileWriteStore");
+	return declare("fox.PrefFilterStore", dojo.data.ItemFileWriteStore, {
 
-dojo.declare("fox.PrefFilterStore", dojo.data.ItemFileWriteStore, {
+		_saveEverything: function (saveCompleteCallback, saveFailedCallback,
+								   newFileContentString) {
 
-	_saveEverything: function(saveCompleteCallback, saveFailedCallback,
-								newFileContentString) {
-
-		dojo.xhrPost({
-			url: "backend.php",
-			content: {op: "pref-filters", method: "savefilterorder",
-				payload: newFileContentString},
-			error: saveFailedCallback,
-			load: saveCompleteCallback});
-	},
+			dojo.xhrPost({
+				url: "backend.php",
+				content: {
+					op: "pref-filters", method: "savefilterorder",
+					payload: newFileContentString
+				},
+				error: saveFailedCallback,
+				load: saveCompleteCallback
+			});
+		},
 
+	});
 });
 
-dojo.declare("fox.PrefFilterTree", lib.CheckBoxTree, {
-	_createTreeNode: function(args) {
-		var tnode = this.inherited(arguments);
-
-		var enabled = this.model.store.getValue(args.item, 'enabled');
-		var param = this.model.store.getValue(args.item, 'param');
-		var rules = this.model.store.getValue(args.item, 'rules');
-
-		if (param) {
-			param = dojo.doc.createElement('span');
-			param.className = (enabled != false) ? 'labelParam' : 'labelParam filterDisabled';
-			param.innerHTML = args.item.param[0];
-			dojo.place(param, tnode.rowNode, 'first');
-		}
-
-		if (rules) {
-			param = dojo.doc.createElement('span');
-			param.className = 'filterRules';
-			param.innerHTML = rules;
-			dojo.place(param, tnode.rowNode, 'next');
-		}
-
-		if (this.model.store.getValue(args.item, 'id') != 'root') {
-			var img = dojo.doc.createElement('img');
-			img.src ='images/filter.png';
-			img.className = 'markedPic';
-			tnode._filterIconNode = img;
-			dojo.place(tnode._filterIconNode, tnode.labelNode, 'before');
-		}
-
-		return tnode;
-	},
-
-	getLabel: function(item) {
-		var label = item.name;
-
-		var feed = this.model.store.getValue(item, 'feed');
-		var inverse = this.model.store.getValue(item, 'inverse');
-
-		if (feed)
-			label += " (" + __("in") + " " + feed + ")";
-
-		if (inverse)
-			label += " (" + __("Inverse") + ")";
-
-/*		if (item.param)
-			label = "<span class=\"labelFixedLength\">" + label +
-				"</span>" + item.param[0]; */
-
-		return label;
-	},
-	getIconClass: function (item, opened) {
-		return (!item || this.model.mayHaveChildren(item)) ? (opened ? "dijitFolderOpened" : "dijitFolderClosed") : "invisible";
-	},
-	getLabelClass: function (item, opened) {
-		var enabled = this.model.store.getValue(item, 'enabled');
-		return (enabled != false) ? "dijitTreeLabel labelFixedLength" : "dijitTreeLabel labelFixedLength filterDisabled";
-	},
-	getRowClass: function (item, opened) {
-		return (!item.error || item.error == '') ? "dijitTreeRow" :
-			"dijitTreeRow Error";
-	},
-	checkItemAcceptance: function(target, source, position) {
-		var item = dijit.getEnclosingWidget(target).item;
-
-		// disable copying items
-		source.copyState = function() { return false; };
-
-		return position != 'over';
-	},
-	onDndDrop: function() {
-		this.inherited(arguments);
-		this.tree.model.store.save();
-	},
+require(["dojo/_base/declare", "lib/CheckBoxTree"], function (declare) {
+
+	return declare("fox.PrefFilterTree", lib.CheckBoxTree, {
+		_createTreeNode: function(args) {
+			var tnode = this.inherited(arguments);
+
+			var enabled = this.model.store.getValue(args.item, 'enabled');
+			var param = this.model.store.getValue(args.item, 'param');
+			var rules = this.model.store.getValue(args.item, 'rules');
+
+			if (param) {
+				param = dojo.doc.createElement('span');
+				param.className = (enabled != false) ? 'labelParam' : 'labelParam filterDisabled';
+				param.innerHTML = args.item.param[0];
+				dojo.place(param, tnode.rowNode, 'first');
+			}
+
+			if (rules) {
+				param = dojo.doc.createElement('span');
+				param.className = 'filterRules';
+				param.innerHTML = rules;
+				dojo.place(param, tnode.rowNode, 'next');
+			}
+
+			if (this.model.store.getValue(args.item, 'id') != 'root') {
+				var img = dojo.doc.createElement('img');
+				img.src ='images/filter.png';
+				img.className = 'markedPic';
+				tnode._filterIconNode = img;
+				dojo.place(tnode._filterIconNode, tnode.labelNode, 'before');
+			}
+
+			return tnode;
+		},
+
+		getLabel: function(item) {
+			var label = item.name;
+
+			var feed = this.model.store.getValue(item, 'feed');
+			var inverse = this.model.store.getValue(item, 'inverse');
+
+			if (feed)
+				label += " (" + __("in") + " " + feed + ")";
+
+			if (inverse)
+				label += " (" + __("Inverse") + ")";
+
+			/*		if (item.param)
+			 label = "<span class=\"labelFixedLength\">" + label +
+			 "</span>" + item.param[0]; */
+
+			return label;
+		},
+		getIconClass: function (item, opened) {
+			return (!item || this.model.mayHaveChildren(item)) ? (opened ? "dijitFolderOpened" : "dijitFolderClosed") : "invisible";
+		},
+		getLabelClass: function (item, opened) {
+			var enabled = this.model.store.getValue(item, 'enabled');
+			return (enabled != false) ? "dijitTreeLabel labelFixedLength" : "dijitTreeLabel labelFixedLength filterDisabled";
+		},
+		getRowClass: function (item, opened) {
+			return (!item.error || item.error == '') ? "dijitTreeRow" :
+				"dijitTreeRow Error";
+		},
+		checkItemAcceptance: function(target, source, position) {
+			var item = dijit.getEnclosingWidget(target).item;
+
+			// disable copying items
+			source.copyState = function() { return false; };
+
+			return position != 'over';
+		},
+		onDndDrop: function() {
+			this.inherited(arguments);
+			this.tree.model.store.save();
+		},
+	});
+
 });
 
+
diff --git a/js/PrefLabelTree.js b/js/PrefLabelTree.js
index 2f7dc0f53..673fd19ad 100644
--- a/js/PrefLabelTree.js
+++ b/js/PrefLabelTree.js
@@ -1,43 +1,43 @@
-dojo.provide("fox.PrefLabelTree");
+require(["dojo/_base/declare", "lib/CheckBoxTree", "dijit/form/DropDownButton"], function (declare) {
 
-dojo.require("lib.CheckBoxTree");
-dojo.require("dijit.form.DropDownButton");
+	return declare("fox.PrefLabelTree", lib.CheckBoxTree, {
+		setNameById: function (id, name) {
+			var item = this.model.store._itemsByIdentity['LABEL:' + id];
 
-dojo.declare("fox.PrefLabelTree", lib.CheckBoxTree, {
-	setNameById: function (id, name) {
-		var item = this.model.store._itemsByIdentity['LABEL:' + id];
+			if (item)
+				this.model.store.setValue(item, 'name', name);
 
-		if (item)
-			this.model.store.setValue(item, 'name', name);
+		},
+		_createTreeNode: function(args) {
+			var tnode = this.inherited(arguments);
 
-	},
-	_createTreeNode: function(args) {
-		var tnode = this.inherited(arguments);
+			var fg_color = this.model.store.getValue(args.item, 'fg_color');
+			var bg_color = this.model.store.getValue(args.item, 'bg_color');
+			var type = this.model.store.getValue(args.item, 'type');
+			var bare_id = this.model.store.getValue(args.item, 'bare_id');
 
-		var fg_color = this.model.store.getValue(args.item, 'fg_color');
-		var bg_color = this.model.store.getValue(args.item, 'bg_color');
-		var type = this.model.store.getValue(args.item, 'type');
-		var bare_id = this.model.store.getValue(args.item, 'bare_id');
+			if (type == 'label') {
+				var span = dojo.doc.createElement('span');
+				span.innerHTML = '&alpha;';
+				span.className = 'labelColorIndicator';
+				span.id = 'LICID-' + bare_id;
 
-		if (type == 'label') {
-			var span = dojo.doc.createElement('span');
-			span.innerHTML = '&alpha;';
-			span.className = 'labelColorIndicator';
-			span.id = 'LICID-' + bare_id;
+				span.setStyle({
+					color: fg_color,
+					backgroundColor: bg_color});
 
-			span.setStyle({
-				color: fg_color,
-				backgroundColor: bg_color});
+				tnode._labelIconNode = span;
 
-			tnode._labelIconNode = span;
+				dojo.place(tnode._labelIconNode, tnode.labelNode, 'before');
+			}
 
-			dojo.place(tnode._labelIconNode, tnode.labelNode, 'before');
-		}
+			return tnode;
+		},
+		getIconClass: function (item, opened) {
+			return (!item || this.model.mayHaveChildren(item)) ? (opened ? "dijitFolderOpened" : "dijitFolderClosed") : "invisible";
+		},
+	});
 
-		return tnode;
-	},
-	getIconClass: function (item, opened) {
-		return (!item || this.model.mayHaveChildren(item)) ? (opened ? "dijitFolderOpened" : "dijitFolderClosed") : "invisible";
-	},
 });
 
+
diff --git a/js/prefs.js b/js/prefs.js
index 34d595a7d..fdbb51ec0 100755
--- a/js/prefs.js
+++ b/js/prefs.js
@@ -943,15 +943,12 @@ function init() {
 			"dijit/Toolbar",
 			"dijit/Tree",
 			"dijit/tree/dndSource",
-			"dojo/data/ItemFileWriteStore"], function (dojo, ready, parser) {
+			"dojo/data/ItemFileWriteStore",
+			"fox/PrefFeedTree",
+			"fox/PrefFilterTree",
+			"fox/PrefLabelTree" ], function (dojo, ready, parser) {
 
 				ready(function() {
-
-					dojo.require("lib.CheckBoxTree");
-					dojo.require("fox.PrefFeedTree");
-					dojo.require("fox.PrefFilterTree");
-					dojo.require("fox.PrefLabelTree");
-
 					parser.parse();
 
 					loading_set_progress(50);
diff --git a/js/tt-rss.js b/js/tt-rss.js
index 78feb6ea3..1b84025d1 100644
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -248,12 +248,11 @@ function init() {
 				"dijit/Tree",
 				"dijit/tree/dndSource",
 				"dijit/tree/ForestStoreModel",
-				"dojo/data/ItemFileWriteStore" ], function (dojo, ready, parser) {
+				"dojo/data/ItemFileWriteStore",
+				"fox/FeedTree" ], function (dojo, ready, parser) {
 
 				ready(function() {
 
-					dojo.require("fox.FeedTree");
-
 					parser.parse();
 
 					if (!genericSanityCheck())
diff --git a/lib/CheckBoxTree.js b/lib/CheckBoxTree.js
index 48cfbae9a..1684c7174 100644
--- a/lib/CheckBoxTree.js
+++ b/lib/CheckBoxTree.js
@@ -1,474 +1,486 @@
-dojo.provide("lib.CheckBoxTree");
-dojo.provide("lib.CheckBoxStoreModel");
+//dojo.provide("lib.CheckBoxTree");
+//dojo.provide("lib.CheckBoxStoreModel");
 
 // THIS WIDGET IS BASED ON DOJO/DIJIT 1.4.0 AND WILL NOT WORK WITH PREVIOUS VERSIONS
 //
 //	Release date: 02/05/2010
 //
 
-dojo.require("dijit.Tree");
-dojo.require("dijit.form.CheckBox");
-
-dojo.declare( "lib.CheckBoxStoreModel", dijit.tree.TreeStoreModel,
-{
-	// checkboxAll: Boolean
-	//		If true, every node in the tree will receive a checkbox regardless if the 'checkbox' attribute
-	//		is specified in the dojo.data.
-	checkboxAll: true,
-
-	// checkboxState: Boolean
-	// 		The default state applied to every checkbox unless otherwise specified in the dojo.data.
-	//		(see also: checkboxIdent)
-	checkboxState: false,
-
-	// checkboxRoot: Boolean
-	//		If true, the root node will receive a checkbox eventhough it's not a true entry in the store.
-	//		This attribute is independent of the showRoot attribute of the tree itself. If the tree
-	//		attribute 'showRoot' is set to false to checkbox for the root will not show either.
-	checkboxRoot: false,
-
-	// checkboxStrict: Boolean
-	//		If true, a strict parent-child checkbox relation is maintained. For example, if all children
-	//		are checked the parent will automatically be checked or if any of the children are unchecked
-	//		the parent will be unchecked.
-	checkboxStrict: true,
-
-	// checkboxIdent: String
-	//		The attribute name (attribute of the dojo.data.item) that specifies that items checkbox initial
-	//		state. Example:	{ name:'Egypt', type:'country', checkbox: true }
-	//		If a dojo.data.item has no 'checkbox' attribute specified it will depend on the attribute
-	//		'checkboxAll' if one will be created automatically and if so what the initial state will be as
-	//		specified by 'checkboxState'.
-	checkboxIdent: "checkbox",
-
-	updateCheckbox: function(/*dojo.data.Item*/ storeItem, /*Boolean*/ newState ) {
-		// summary:
-		//		Update the checkbox state (true/false) for the item and the associated parent and
-		//		child checkboxes if any.
-		// description:
-		//		Update a single checkbox state (true/false) for the item and the associated parent
-		//		and child checkboxes if any. This function is called from the tree if a user checked
-		//		or unchecked a checkbox on the tree. The parent and child tree nodes are updated to
-		//		maintain consistency if 'checkboxStrict' is set to true.
-		//	storeItem:
-		//		The item in the dojo.data.store whos checkbox state needs updating.
-		//	newState:
-		//		The new state of the checkbox: true or false
-		//	example:
-		//	| model.updateCheckboxState(item, true);
-		//
-
-		this._setCheckboxState( storeItem, newState );
-		//if( this.checkboxStrict ) { I don't need all this 1-1 stuff, only parent -> child (fox)
-			this._updateChildCheckbox( storeItem, newState );
-			//this._updateParentCheckbox( storeItem, newState );
-		//}
-	},
-	setAllChecked: function(checked) {
-		var items = this.store._arrayOfAllItems;
-		this.setCheckboxState(items, checked);
-	},
-	setCheckboxState: function(items, checked) {
-		for (var i = 0; i < items.length; i++) {
-			this._setCheckboxState(items[i], checked);
-		}
-	},
-	getCheckedItems: function() {
-		var items = this.store._arrayOfAllItems;
-		var result = [];
-
-		for (var i = 0; i < items.length; i++) {
-			if (this.store.getValue(items[i], 'checkbox'))
-				result.push(items[i]);
-		}
-
-		return result;
-   },
-
-	getCheckboxState: function(/*dojo.data.Item*/ storeItem) {
-		// summary:
-		//		Get the current checkbox state from the dojo.data.store.
-		// description:
-		//		Get the current checkbox state from the dojo.data store. A checkbox can have three
-		//		different states: true, false or undefined. Undefined in this context means no
-		//		checkbox identifier (checkboxIdent) was found in the dojo.data store. Depending on
-		//		the checkbox attributes as specified above the following will take place:
-		//		a) 	If the current checkbox state is undefined and the checkbox attribute 'checkboxAll' or
-		//			'checkboxRoot' is true one will be created and the default state 'checkboxState' will
-		//			be applied.
-		//		b)	If the current state is undefined and 'checkboxAll' is false the state undefined remains
-		//			unchanged and is returned. This will prevent any tree node from creating a checkbox.
-		//
-		//	storeItem:
-		//		The item in the dojo.data.store whos checkbox state is returned.
-		//	example:
-		//	| var currState = model.getCheckboxState(item);
-		//
-		var currState = undefined;
-
-		// Special handling required for the 'fake' root entry (the root is NOT a dojo.data.item).
-		// this stuff is only relevant for Forest store -fox
-/*		if ( storeItem == this.root ) {
-			if( typeof(storeItem.checkbox) == "undefined" ) {
-				this.root.checkbox = undefined;		// create a new checbox reference as undefined.
-				if( this.checkboxRoot ) {
-					currState = this.root.checkbox = this.checkboxState;
+//dojo.require("dijit.Tree");
+//dojo.require("dijit.form.CheckBox");
+
+require(["dojo/_base/declare", "dijit/tree/TreeStoreModel"], function (declare) {
+
+	return declare( "lib.CheckBoxStoreModel", dijit.tree.TreeStoreModel,
+		{
+			// checkboxAll: Boolean
+			//		If true, every node in the tree will receive a checkbox regardless if the 'checkbox' attribute
+			//		is specified in the dojo.data.
+			checkboxAll: true,
+
+			// checkboxState: Boolean
+			// 		The default state applied to every checkbox unless otherwise specified in the dojo.data.
+			//		(see also: checkboxIdent)
+			checkboxState: false,
+
+			// checkboxRoot: Boolean
+			//		If true, the root node will receive a checkbox eventhough it's not a true entry in the store.
+			//		This attribute is independent of the showRoot attribute of the tree itself. If the tree
+			//		attribute 'showRoot' is set to false to checkbox for the root will not show either.
+			checkboxRoot: false,
+
+			// checkboxStrict: Boolean
+			//		If true, a strict parent-child checkbox relation is maintained. For example, if all children
+			//		are checked the parent will automatically be checked or if any of the children are unchecked
+			//		the parent will be unchecked.
+			checkboxStrict: true,
+
+			// checkboxIdent: String
+			//		The attribute name (attribute of the dojo.data.item) that specifies that items checkbox initial
+			//		state. Example:	{ name:'Egypt', type:'country', checkbox: true }
+			//		If a dojo.data.item has no 'checkbox' attribute specified it will depend on the attribute
+			//		'checkboxAll' if one will be created automatically and if so what the initial state will be as
+			//		specified by 'checkboxState'.
+			checkboxIdent: "checkbox",
+
+			updateCheckbox: function(/*dojo.data.Item*/ storeItem, /*Boolean*/ newState ) {
+				// summary:
+				//		Update the checkbox state (true/false) for the item and the associated parent and
+				//		child checkboxes if any.
+				// description:
+				//		Update a single checkbox state (true/false) for the item and the associated parent
+				//		and child checkboxes if any. This function is called from the tree if a user checked
+				//		or unchecked a checkbox on the tree. The parent and child tree nodes are updated to
+				//		maintain consistency if 'checkboxStrict' is set to true.
+				//	storeItem:
+				//		The item in the dojo.data.store whos checkbox state needs updating.
+				//	newState:
+				//		The new state of the checkbox: true or false
+				//	example:
+				//	| model.updateCheckboxState(item, true);
+				//
+
+				this._setCheckboxState( storeItem, newState );
+				//if( this.checkboxStrict ) { I don't need all this 1-1 stuff, only parent -> child (fox)
+				this._updateChildCheckbox( storeItem, newState );
+				//this._updateParentCheckbox( storeItem, newState );
+				//}
+			},
+			setAllChecked: function(checked) {
+				var items = this.store._arrayOfAllItems;
+				this.setCheckboxState(items, checked);
+			},
+			setCheckboxState: function(items, checked) {
+				for (var i = 0; i < items.length; i++) {
+					this._setCheckboxState(items[i], checked);
 				}
-			} else {
-				currState = this.root.checkbox;
-			}
-		} else {	// a valid dojo.store.item
-			currState = this.store.getValue(storeItem, this.checkboxIdent);
-			if( currState == undefined && this.checkboxAll) {
-				this._setCheckboxState( storeItem, this.checkboxState );
-				currState = this.checkboxState;
-			}
-		} */
-
-		currState = this.store.getValue(storeItem, this.checkboxIdent);
-		if( currState == undefined && this.checkboxAll) {
-			this._setCheckboxState( storeItem, this.checkboxState );
-			currState = this.checkboxState;
-		}
-
-		return currState;  // the current state of the checkbox (true/false or undefined)
-	},
-
-	_setCheckboxState: function(/*dojo.data.Item*/ storeItem, /*Boolean*/ newState ) {
-		// summary:
-		//		Set/update the checkbox state on the dojo.data store.
-		// description:
-		//		Set/update the checkbox state on the dojo.data.store. Retreive the current
-		//		state of the checkbox and validate if an update is required, this will keep
-		//		update events to a minimum. On completion a 'onCheckboxChange' event is
-		//		triggered.
-		//		If the current state is undefined (ie: no checkbox attribute specified for
-		//		this dojo.data.item) the 'checkboxAll' attribute is checked	to see if one
-		//		needs to be created. In case of the root the 'checkboxRoot' attribute is checked.
-		//		NOTE: the store.setValue function will create the 'checkbox' attribute for the
-		//		item if none exists.
-		//	storeItem:
-		//		The item in the dojo.data.store whos checkbox state is updated.
-		//	newState:
-		//		The new state of the checkbox: true or false
-		//	example:
-		//	| model.setCheckboxState(item, true);
-		//
-		var stateChanged = true;
-
-		if( storeItem != this.root ) {
-			var currState = this.store.getValue(storeItem, this.checkboxIdent);
-			if( currState != newState && ( currState !== undefined || this.checkboxAll ) ) {
-				this.store.setValue(storeItem, this.checkboxIdent, newState);
-			} else {
-				stateChanged = false;	// No changes to the checkbox
-			}
-		} else {  // Tree root instance
-			if( this.root.checkbox != newState && ( this.root.checkbox !== undefined || this.checkboxRoot ) ) {
-				this.root.checkbox = newState;
-			} else {
-				stateChanged = false;
-			}
-		}
-		if( stateChanged ) {	// In case of any changes trigger the update event.
-			this.onCheckboxChange(storeItem);
-		}
-		return stateChanged;
-	},
-
-	_updateChildCheckbox: function(/*dojo.data.Item*/ parentItem, /*Boolean*/ newState ) {
-		//	summary:
-		//		Set all child checkboxes to true/false depending on the parent checkbox state.
-		//	description:
-		//		If a parent checkbox changes state, all child and grandchild checkboxes will be
-		//		updated to reflect the change. For example, if the parent state is set to true,
-		//		all child and grandchild checkboxes will receive that same 'true' state.
-		//		If a child checkbox changes state and has multiple parent, all of its parents
-		//		need to be re-evaluated.
-		//	parentItem:
-		//		The parent dojo.data.item whos child/grandchild checkboxes require updating.
-		//	newState:
-		//		The new state of the checkbox: true or false
-		//
-
-		if( this.mayHaveChildren( parentItem )) {
-			this.getChildren( parentItem, dojo.hitch( this,
-				function( children ) {
-					dojo.forEach( children, function(child) {
-						if( this._setCheckboxState(child, newState) ) {
-							var parents = this._getParentsItem(child);
-							if( parents.length > 1 ) {
-								this._updateParentCheckbox( child, newState );
-							}
+			},
+			getCheckedItems: function() {
+				var items = this.store._arrayOfAllItems;
+				var result = [];
+
+				for (var i = 0; i < items.length; i++) {
+					if (this.store.getValue(items[i], 'checkbox'))
+						result.push(items[i]);
+				}
+
+				return result;
+			},
+
+			getCheckboxState: function(/*dojo.data.Item*/ storeItem) {
+				// summary:
+				//		Get the current checkbox state from the dojo.data.store.
+				// description:
+				//		Get the current checkbox state from the dojo.data store. A checkbox can have three
+				//		different states: true, false or undefined. Undefined in this context means no
+				//		checkbox identifier (checkboxIdent) was found in the dojo.data store. Depending on
+				//		the checkbox attributes as specified above the following will take place:
+				//		a) 	If the current checkbox state is undefined and the checkbox attribute 'checkboxAll' or
+				//			'checkboxRoot' is true one will be created and the default state 'checkboxState' will
+				//			be applied.
+				//		b)	If the current state is undefined and 'checkboxAll' is false the state undefined remains
+				//			unchanged and is returned. This will prevent any tree node from creating a checkbox.
+				//
+				//	storeItem:
+				//		The item in the dojo.data.store whos checkbox state is returned.
+				//	example:
+				//	| var currState = model.getCheckboxState(item);
+				//
+				var currState = undefined;
+
+				// Special handling required for the 'fake' root entry (the root is NOT a dojo.data.item).
+				// this stuff is only relevant for Forest store -fox
+				/*		if ( storeItem == this.root ) {
+				 if( typeof(storeItem.checkbox) == "undefined" ) {
+				 this.root.checkbox = undefined;		// create a new checbox reference as undefined.
+				 if( this.checkboxRoot ) {
+				 currState = this.root.checkbox = this.checkboxState;
+				 }
+				 } else {
+				 currState = this.root.checkbox;
+				 }
+				 } else {	// a valid dojo.store.item
+				 currState = this.store.getValue(storeItem, this.checkboxIdent);
+				 if( currState == undefined && this.checkboxAll) {
+				 this._setCheckboxState( storeItem, this.checkboxState );
+				 currState = this.checkboxState;
+				 }
+				 } */
+
+				currState = this.store.getValue(storeItem, this.checkboxIdent);
+				if( currState == undefined && this.checkboxAll) {
+					this._setCheckboxState( storeItem, this.checkboxState );
+					currState = this.checkboxState;
+				}
+
+				return currState;  // the current state of the checkbox (true/false or undefined)
+			},
+
+			_setCheckboxState: function(/*dojo.data.Item*/ storeItem, /*Boolean*/ newState ) {
+				// summary:
+				//		Set/update the checkbox state on the dojo.data store.
+				// description:
+				//		Set/update the checkbox state on the dojo.data.store. Retreive the current
+				//		state of the checkbox and validate if an update is required, this will keep
+				//		update events to a minimum. On completion a 'onCheckboxChange' event is
+				//		triggered.
+				//		If the current state is undefined (ie: no checkbox attribute specified for
+				//		this dojo.data.item) the 'checkboxAll' attribute is checked	to see if one
+				//		needs to be created. In case of the root the 'checkboxRoot' attribute is checked.
+				//		NOTE: the store.setValue function will create the 'checkbox' attribute for the
+				//		item if none exists.
+				//	storeItem:
+				//		The item in the dojo.data.store whos checkbox state is updated.
+				//	newState:
+				//		The new state of the checkbox: true or false
+				//	example:
+				//	| model.setCheckboxState(item, true);
+				//
+				var stateChanged = true;
+
+				if( storeItem != this.root ) {
+					var currState = this.store.getValue(storeItem, this.checkboxIdent);
+					if( currState != newState && ( currState !== undefined || this.checkboxAll ) ) {
+						this.store.setValue(storeItem, this.checkboxIdent, newState);
+					} else {
+						stateChanged = false;	// No changes to the checkbox
+					}
+				} else {  // Tree root instance
+					if( this.root.checkbox != newState && ( this.root.checkbox !== undefined || this.checkboxRoot ) ) {
+						this.root.checkbox = newState;
+					} else {
+						stateChanged = false;
+					}
+				}
+				if( stateChanged ) {	// In case of any changes trigger the update event.
+					this.onCheckboxChange(storeItem);
+				}
+				return stateChanged;
+			},
+
+			_updateChildCheckbox: function(/*dojo.data.Item*/ parentItem, /*Boolean*/ newState ) {
+				//	summary:
+				//		Set all child checkboxes to true/false depending on the parent checkbox state.
+				//	description:
+				//		If a parent checkbox changes state, all child and grandchild checkboxes will be
+				//		updated to reflect the change. For example, if the parent state is set to true,
+				//		all child and grandchild checkboxes will receive that same 'true' state.
+				//		If a child checkbox changes state and has multiple parent, all of its parents
+				//		need to be re-evaluated.
+				//	parentItem:
+				//		The parent dojo.data.item whos child/grandchild checkboxes require updating.
+				//	newState:
+				//		The new state of the checkbox: true or false
+				//
+
+				if( this.mayHaveChildren( parentItem )) {
+					this.getChildren( parentItem, dojo.hitch( this,
+						function( children ) {
+							dojo.forEach( children, function(child) {
+								if( this._setCheckboxState(child, newState) ) {
+									var parents = this._getParentsItem(child);
+									if( parents.length > 1 ) {
+										this._updateParentCheckbox( child, newState );
+									}
+								}
+								if( this.mayHaveChildren( child )) {
+									this._updateChildCheckbox( child, newState );
+								}
+							}, this );
+						}),
+						function(err) {
+							console.error(this, ": updating child checkboxes: ", err);
 						}
-						if( this.mayHaveChildren( child )) {
-							this._updateChildCheckbox( child, newState );
+					);
+				}
+			},
+
+			_updateParentCheckbox: function(/*dojo.data.Item*/ storeItem, /*Boolean*/ newState ) {
+				//	summary:
+				//		Update the parent checkbox state depending on the state of all child checkboxes.
+				//	description:
+				//		Update the parent checkbox state depending on the state of all child checkboxes.
+				//		The parent checkbox automatically changes state if ALL child checkboxes are true
+				//		or false. If, as a result, the parent checkbox changes state, we will check if
+				//		its parent needs to be updated as well all the way upto the root.
+				//	storeItem:
+				//		The dojo.data.item whos parent checkboxes require updating.
+				//	newState:
+				//		The new state of the checkbox: true or false
+				//
+				var parents = this._getParentsItem(storeItem);
+				dojo.forEach( parents, function( parentItem ) {
+					if( newState ) { // new state = true (checked)
+						this.getChildren( parentItem, dojo.hitch( this,
+							function(siblings) {
+								var allChecked  = true;
+								dojo.some( siblings, function(sibling) {
+									siblState = this.getCheckboxState(sibling);
+									if( siblState !== undefined && allChecked )
+										allChecked = siblState;
+									return !(allChecked);
+								}, this );
+								if( allChecked ) {
+									this._setCheckboxState( parentItem, true );
+									this._updateParentCheckbox( parentItem, true );
+								}
+							}),
+							function(err) {
+								console.error(this, ": updating parent checkboxes: ", err);
+							}
+						);
+					} else { 	// new state = false (unchecked)
+						if( this._setCheckboxState( parentItem, false ) ) {
+							this._updateParentCheckbox( parentItem, false );
 						}
-					}, this );
-				}),
-				function(err) {
-					console.error(this, ": updating child checkboxes: ", err);
+					}
+				}, this );
+			},
+
+			_getParentsItem: function(/*dojo.data.Item*/ storeItem ) {
+				// summary:
+				//		Get the parent(s) of a dojo.data item.
+				// description:
+				//		Get the parent(s) of a dojo.data item. The '_reverseRefMap' entry of the item is
+				//		used to identify the parent(s). A child will have a parent reference if the parent
+				//		specified the '_reference' attribute.
+				//		For example: children:[{_reference:'Mexico'}, {_reference:'Canada'}, ...
+				//	storeItem:
+				//		The dojo.data.item whos parent(s) will be returned.
+				//
+				var parents = [];
+
+				if( storeItem != this.root ) {
+					var references = storeItem[this.store._reverseRefMap];
+					for(itemId in references ) {
+						parents.push(this.store._itemsByIdentity[itemId]);
+					}
+					if (!parents.length) {
+						parents.push(this.root);
+					}
 				}
-			);
-		}
-	},
-
-	_updateParentCheckbox: function(/*dojo.data.Item*/ storeItem, /*Boolean*/ newState ) {
-		//	summary:
-		//		Update the parent checkbox state depending on the state of all child checkboxes.
-		//	description:
-		//		Update the parent checkbox state depending on the state of all child checkboxes.
-		//		The parent checkbox automatically changes state if ALL child checkboxes are true
-		//		or false. If, as a result, the parent checkbox changes state, we will check if
-		//		its parent needs to be updated as well all the way upto the root.
-		//	storeItem:
-		//		The dojo.data.item whos parent checkboxes require updating.
-		//	newState:
-		//		The new state of the checkbox: true or false
-		//
-		var parents = this._getParentsItem(storeItem);
-		dojo.forEach( parents, function( parentItem ) {
-			if( newState ) { // new state = true (checked)
-				this.getChildren( parentItem, dojo.hitch( this,
-					function(siblings) {
+				return parents; // parent(s) of a dojo.data.item (Array of dojo.data.items)
+			},
+
+			validateData: function(/*dojo.data.Item*/ storeItem, /*thisObject*/ scope ) {
+				// summary:
+				//		Validate/normalize the parent(s) checkbox data in the dojo.data store.
+				// description:
+				//		Validate/normalize the parent-child checkbox relationship if the attribute
+				//		'checkboxStrict' is set to true. This function is called as part of the post
+				//		creation of the Tree instance. All parent checkboxes are set to the appropriate
+				//		state according to the actual state(s) of their children.
+				//		This will potentionally overwrite whatever was specified for the parent in the
+				//		dojo.data store. This will garantee the tree is in a consistent state after startup.
+				//	storeItem:
+				//		The element to start traversing the dojo.data.store, typically model.root
+				//	scope:
+				//		The scope to use when this method executes.
+				//	example:
+				//	| this.model.validateData(this.model.root, this.model);
+				//
+				if( !scope.checkboxStrict ) {
+					return;
+				}
+				scope.getChildren( storeItem, dojo.hitch( scope,
+					function(children) {
 						var allChecked  = true;
-						dojo.some( siblings, function(sibling) {
-							siblState = this.getCheckboxState(sibling);
-							if( siblState !== undefined && allChecked )
-								allChecked = siblState;
-							return !(allChecked);
-						}, this );
-						if( allChecked ) {
-							this._setCheckboxState( parentItem, true );
-							this._updateParentCheckbox( parentItem, true );
+						var childState;
+						dojo.forEach( children, function( child ) {
+							if( this.mayHaveChildren( child )) {
+								this.validateData( child, this );
+							}
+							childState = this.getCheckboxState( child );
+							if( childState !== undefined && allChecked )
+								allChecked = childState;
+						}, this);
+
+						if ( this._setCheckboxState( storeItem, allChecked) ) {
+							this._updateParentCheckbox( storeItem, allChecked);
 						}
 					}),
 					function(err) {
-						console.error(this, ": updating parent checkboxes: ", err);
+						console.error(this, ": validating checkbox data: ", err);
 					}
 				);
-			} else { 	// new state = false (unchecked)
-				if( this._setCheckboxState( parentItem, false ) ) {
-					this._updateParentCheckbox( parentItem, false );
-				}
-			}
-		}, this );
-	},
-
-	_getParentsItem: function(/*dojo.data.Item*/ storeItem ) {
-		// summary:
-		//		Get the parent(s) of a dojo.data item.
-		// description:
-		//		Get the parent(s) of a dojo.data item. The '_reverseRefMap' entry of the item is
-		//		used to identify the parent(s). A child will have a parent reference if the parent
-		//		specified the '_reference' attribute.
-		//		For example: children:[{_reference:'Mexico'}, {_reference:'Canada'}, ...
-		//	storeItem:
-		//		The dojo.data.item whos parent(s) will be returned.
-		//
-		var parents = [];
-
-		if( storeItem != this.root ) {
-			var references = storeItem[this.store._reverseRefMap];
-			for(itemId in references ) {
-				parents.push(this.store._itemsByIdentity[itemId]);
+			},
+
+			onCheckboxChange: function(/*dojo.data.Item*/ storeItem ) {
+				// summary:
+				//		Callback whenever a checkbox state has changed state, so that
+				//		the Tree can update the checkbox.  This callback is generally
+				//		triggered by the '_setCheckboxState' function.
+				// tags:
+				//		callback
 			}
-			if (!parents.length) {
-				parents.push(this.root);
-			}
-		}
-		return parents; // parent(s) of a dojo.data.item (Array of dojo.data.items)
-	},
-
-	validateData: function(/*dojo.data.Item*/ storeItem, /*thisObject*/ scope ) {
-		// summary:
-		//		Validate/normalize the parent(s) checkbox data in the dojo.data store.
-		// description:
-		//		Validate/normalize the parent-child checkbox relationship if the attribute
-		//		'checkboxStrict' is set to true. This function is called as part of the post
-		//		creation of the Tree instance. All parent checkboxes are set to the appropriate
-		//		state according to the actual state(s) of their children.
-		//		This will potentionally overwrite whatever was specified for the parent in the
-		//		dojo.data store. This will garantee the tree is in a consistent state after startup.
-		//	storeItem:
-		//		The element to start traversing the dojo.data.store, typically model.root
-		//	scope:
-		//		The scope to use when this method executes.
-		//	example:
-		//	| this.model.validateData(this.model.root, this.model);
-		//
-		if( !scope.checkboxStrict ) {
-			return;
-		}
-		scope.getChildren( storeItem, dojo.hitch( scope,
-			function(children) {
-				var allChecked  = true;
-				var childState;
-				dojo.forEach( children, function( child ) {
-					if( this.mayHaveChildren( child )) {
-						this.validateData( child, this );
-					}
-					childState = this.getCheckboxState( child );
-					if( childState !== undefined && allChecked )
-						allChecked = childState;
-				}, this);
 
-				if ( this._setCheckboxState( storeItem, allChecked) ) {
-					this._updateParentCheckbox( storeItem, allChecked);
+		});
+
+});
+
+require(["dojo/_base/declare", "dijit/Tree"], function (declare) {
+
+	return declare("lib._CheckBoxTreeNode", dijit._TreeNode,
+		{
+			// _checkbox: [protected] dojo.doc.element
+			//		Local reference to the dojo.doc.element of type 'checkbox'
+			_checkbox: null,
+
+			_createCheckbox: function () {
+				// summary:
+				//		Create a checkbox on the CheckBoxTreeNode
+				// description:
+				//		Create a checkbox on the CheckBoxTreeNode. The checkbox is ONLY created if a
+				//		valid reference was found in the dojo.data store or the attribute 'checkboxAll'
+				//		is set to true. If the current state is 'undefined' no reference was found and
+				//		'checkboxAll' is set to false.
+				//		Note: the attribute 'checkboxAll' is validated by the getCheckboxState function
+				//		therefore no need to do that here. (see getCheckboxState for details).
+				//
+				var currState = this.tree.model.getCheckboxState(this.item);
+				if (currState !== undefined) {
+					this._checkbox = new dijit.form.CheckBox();
+					//this._checkbox = dojo.doc.createElement('input');
+					this._checkbox.type = 'checkbox';
+					this._checkbox.attr('checked', currState);
+					dojo.place(this._checkbox.domNode, this.expandoNode, 'after');
 				}
-			}),
-			function(err) {
-				console.error(this, ": validating checkbox data: ", err);
+			},
+
+			postCreate: function () {
+				// summary:
+				//		Handle the creation of the checkbox after the CheckBoxTreeNode has been instanciated.
+				// description:
+				//		Handle the creation of the checkbox after the CheckBoxTreeNode has been instanciated.
+				this._createCheckbox();
+				this.inherited(arguments);
 			}
-		);
-	},
-
-	onCheckboxChange: function(/*dojo.data.Item*/ storeItem ) {
-		// summary:
-		//		Callback whenever a checkbox state has changed state, so that
-		//		the Tree can update the checkbox.  This callback is generally
-		//		triggered by the '_setCheckboxState' function.
-		// tags:
-		//		callback
-	}
 
+		});
 });
 
-dojo.declare( "lib._CheckBoxTreeNode", dijit._TreeNode,
-{
-	// _checkbox: [protected] dojo.doc.element
-	//		Local reference to the dojo.doc.element of type 'checkbox'
-	_checkbox: null,
-
-	_createCheckbox: function() {
-		// summary:
-		//		Create a checkbox on the CheckBoxTreeNode
-		// description:
-		//		Create a checkbox on the CheckBoxTreeNode. The checkbox is ONLY created if a
-		//		valid reference was found in the dojo.data store or the attribute 'checkboxAll'
-		//		is set to true. If the current state is 'undefined' no reference was found and
-		//		'checkboxAll' is set to false.
-		//		Note: the attribute 'checkboxAll' is validated by the getCheckboxState function
-		//		therefore no need to do that here. (see getCheckboxState for details).
-		//
-		var	currState = this.tree.model.getCheckboxState( this.item );
-		if( currState !== undefined ) {
-			this._checkbox = new dijit.form.CheckBox();
-			//this._checkbox = dojo.doc.createElement('input');
-			this._checkbox.type    = 'checkbox';
-			this._checkbox.attr('checked', currState);
-			dojo.place(this._checkbox.domNode, this.expandoNode, 'after');
-		}
-	},
-
-	postCreate: function() {
-		// summary:
-		//		Handle the creation of the checkbox after the CheckBoxTreeNode has been instanciated.
-		// description:
-		//		Handle the creation of the checkbox after the CheckBoxTreeNode has been instanciated.
-		this._createCheckbox();
-		this.inherited( arguments );
-	}
+require(["dojo/_base/declare", "dijit/Tree"], function (declare) {
+
+	return declare( "lib.CheckBoxTree", dijit.Tree,
+		{
+
+			onNodeChecked: function(/*dojo.data.Item*/ storeItem, /*treeNode*/ treeNode) {
+				// summary:
+				//		Callback when a checkbox tree node is checked
+				// tags:
+				//		callback
+			},
+
+			onNodeUnchecked: function(/*dojo.data.Item*/ storeItem, /* treeNode */ treeNode) {
+				// summary:
+				//		Callback when a checkbox tree node is unchecked
+				// tags:
+				//		callback
+			},
+
+			_onClick: function(/*TreeNode*/ nodeWidget, /*Event*/ e) {
+				// summary:
+				//		Translates click events into commands for the controller to process
+				// description:
+				//		the _onClick function is called whenever a 'click' is detected. This
+				//		instance of _onClick only handles the click events associated with
+				//		the checkbox whos DOM name is INPUT.
+				//
+				var domElement = e.target;
+
+				// Only handle checkbox clicks here
+				if(domElement.type != 'checkbox') {
+					return this.inherited( arguments );
+				}
 
-});
+				this._publish("execute", { item: nodeWidget.item, node: nodeWidget} );
+				// Go tell the model to update the checkbox state
 
-dojo.declare( "lib.CheckBoxTree", dijit.Tree,
-{
-
-	onNodeChecked: function(/*dojo.data.Item*/ storeItem, /*treeNode*/ treeNode) {
-		// summary:
-		//		Callback when a checkbox tree node is checked
-		// tags:
-		//		callback
-	},
-
-	onNodeUnchecked: function(/*dojo.data.Item*/ storeItem, /* treeNode */ treeNode) {
-		// summary:
-		//		Callback when a checkbox tree node is unchecked
-		// tags:
-		//		callback
-	},
-
-	_onClick: function(/*TreeNode*/ nodeWidget, /*Event*/ e) {
-		// summary:
-		//		Translates click events into commands for the controller to process
-		// description:
-		//		the _onClick function is called whenever a 'click' is detected. This
-		//		instance of _onClick only handles the click events associated with
-		//		the checkbox whos DOM name is INPUT.
-		//
-		var domElement = e.target;
-
-		// Only handle checkbox clicks here
-		if(domElement.type != 'checkbox') {
-			return this.inherited( arguments );
-		}
-
-		this._publish("execute", { item: nodeWidget.item, node: nodeWidget} );
-		// Go tell the model to update the checkbox state
-
-		this.model.updateCheckbox( nodeWidget.item, nodeWidget._checkbox.checked );
-		// Generate some additional events
-		//this.onClick( nodeWidget.item, nodeWidget, e );
-		if(nodeWidget._checkbox.checked) {
-			this.onNodeChecked( nodeWidget.item, nodeWidget);
-		} else {
-			this.onNodeUnchecked( nodeWidget.item, nodeWidget);
-		}
-		this.focusNode(nodeWidget);
-	},
-
-	_onCheckboxChange: function(/*dojo.data.Item*/ storeItem ) {
-		// summary:
-		//		Processes notification of a change to a checkbox state (triggered by the model).
-		// description:
-		//		Whenever the model changes the state of a checkbox in the dojo.data.store it will
-		//		trigger the 'onCheckboxChange' event allowing the Tree to make the same changes
-		//		on the tree Node. There are several conditions why a tree node or checkbox does not
-		//		exists:
-		//		a) 	The node has not been created yet (the user has not expanded the tree node yet).
-		//		b) 	The checkbox may be null if condition (a) exists or no 'checkbox' attribute was
-		//			specified for the associated dojo.data.item and the attribute 'checkboxAll' is
-		//			set to false.
-		// tags:
-		//		callback
-		var model 	 = this.model,
-			identity = model.getIdentity(storeItem),
-			nodes 	 = this._itemNodesMap[identity];
-
-		// As of dijit.Tree 1.4 multiple references (parents) are supported, therefore we may have
-		// to update multiple nodes which are all associated with the same dojo.data.item.
-		if( nodes ) {
-			dojo.forEach( nodes, function(node) {
-				if( node._checkbox != null ) {
-					node._checkbox.attr('checked', this.model.getCheckboxState( storeItem ));
+				this.model.updateCheckbox( nodeWidget.item, nodeWidget._checkbox.checked );
+				// Generate some additional events
+				//this.onClick( nodeWidget.item, nodeWidget, e );
+				if(nodeWidget._checkbox.checked) {
+					this.onNodeChecked( nodeWidget.item, nodeWidget);
+				} else {
+					this.onNodeUnchecked( nodeWidget.item, nodeWidget);
+				}
+				this.focusNode(nodeWidget);
+			},
+
+			_onCheckboxChange: function(/*dojo.data.Item*/ storeItem ) {
+				// summary:
+				//		Processes notification of a change to a checkbox state (triggered by the model).
+				// description:
+				//		Whenever the model changes the state of a checkbox in the dojo.data.store it will
+				//		trigger the 'onCheckboxChange' event allowing the Tree to make the same changes
+				//		on the tree Node. There are several conditions why a tree node or checkbox does not
+				//		exists:
+				//		a) 	The node has not been created yet (the user has not expanded the tree node yet).
+				//		b) 	The checkbox may be null if condition (a) exists or no 'checkbox' attribute was
+				//			specified for the associated dojo.data.item and the attribute 'checkboxAll' is
+				//			set to false.
+				// tags:
+				//		callback
+				var model 	 = this.model,
+					identity = model.getIdentity(storeItem),
+					nodes 	 = this._itemNodesMap[identity];
+
+				// As of dijit.Tree 1.4 multiple references (parents) are supported, therefore we may have
+				// to update multiple nodes which are all associated with the same dojo.data.item.
+				if( nodes ) {
+					dojo.forEach( nodes, function(node) {
+						if( node._checkbox != null ) {
+							node._checkbox.attr('checked', this.model.getCheckboxState( storeItem ));
+						}
+					}, this );
 				}
-			}, this );
-		}
-	},
-
-	postCreate: function() {
-		// summary:
-		//		Handle any specifics related to the tree and model after the instanciation of the Tree.
-		// description:
-		//		Validate if we have a 'write' store first. Subscribe to the 'onCheckboxChange' event
-		//		(triggered by the model) and kickoff the initial checkbox data validation.
-		//
-		var store = this.model.store;
-		if(!store.getFeatures()['dojo.data.api.Write']){
-			throw new Error("lib.CheckboxTree: store must support dojo.data.Write");
-		}
-		this.connect(this.model, "onCheckboxChange", "_onCheckboxChange");
-		this.model.validateData( this.model.root, this.model );
-		this.inherited(arguments);
-	},
-
-	_createTreeNode: function( args ) {
-		// summary:
-		//		Create a new CheckboxTreeNode instance.
-		// description:
-		//		Create a new CheckboxTreeNode instance.
-		return new lib._CheckBoxTreeNode(args);
-	}
+			},
+
+			postCreate: function() {
+				// summary:
+				//		Handle any specifics related to the tree and model after the instanciation of the Tree.
+				// description:
+				//		Validate if we have a 'write' store first. Subscribe to the 'onCheckboxChange' event
+				//		(triggered by the model) and kickoff the initial checkbox data validation.
+				//
+				var store = this.model.store;
+				if(!store.getFeatures()['dojo.data.api.Write']){
+					throw new Error("lib.CheckboxTree: store must support dojo.data.Write");
+				}
+				this.connect(this.model, "onCheckboxChange", "_onCheckboxChange");
+				this.model.validateData( this.model.root, this.model );
+				this.inherited(arguments);
+			},
+
+			_createTreeNode: function( args ) {
+				// summary:
+				//		Create a new CheckboxTreeNode instance.
+				// description:
+				//		Create a new CheckboxTreeNode instance.
+				return new lib._CheckBoxTreeNode(args);
+			}
+
+		});
 
 });
+
-- 
cgit v1.2.3


From 5cbd1fe8e4d9a67b002a681ab6bc2bc3ab60c628 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@madoka.volgo-balt.ru>
Date: Thu, 11 Aug 2016 15:01:01 +0300
Subject: perform housekeeping tasks for plugins loaded in user-context only

---
 include/functions.php |  9 ++++++---
 include/rssfuncs.php  | 20 +++++++++++++++++++-
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/include/functions.php b/include/functions.php
index 3ccc09d75..3902ac45a 100755
--- a/include/functions.php
+++ b/include/functions.php
@@ -833,14 +833,17 @@
 		return $csrf_token == $_SESSION['csrf_token'];
 	}
 
-	function load_user_plugins($owner_uid) {
+	function load_user_plugins($owner_uid, $pluginhost = false) {
+
+		if (!$pluginhost) $pluginhost = PluginHost::getInstance();
+
 		if ($owner_uid && SCHEMA_VERSION >= 100) {
 			$plugins = get_pref("_ENABLED_PLUGINS", $owner_uid);
 
-			PluginHost::getInstance()->load($plugins, PluginHost::KIND_USER, $owner_uid);
+			$pluginhost->load($plugins, PluginHost::KIND_USER, $owner_uid);
 
 			if (get_schema_version() > 100) {
-				PluginHost::getInstance()->load_data();
+				$pluginhost->load_data();
 			}
 		}
 	}
diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 522e4bf22..cbd011e5c 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -179,6 +179,8 @@
 		$nf = 0;
 		$bstarted = microtime(true);
 
+		$batch_owners = array();
+
 		// For each feed, we call the feed update function.
 		foreach ($feeds_to_update as $feed) {
 			if($debug) _debug("Base feed: $feed");
@@ -204,6 +206,9 @@
 				while ($tline = db_fetch_assoc($tmp_result)) {
 					if($debug) _debug(" => " . $tline["last_updated"] . ", " . $tline["id"] . " " . $tline["owner_uid"]);
 
+					if (array_search($tline["owner_uid"], $batch_owners) === FALSE)
+						array_push($batch_owners, $tline["owner_uid"]);
+
 					$fstarted = microtime(true);
 					$rss = update_rss_feed($tline["id"], true, false);
 					_debug_suppress(false);
@@ -220,6 +225,12 @@
 				microtime(true) - $bstarted, (microtime(true) - $bstarted) / $nf));
 		}
 
+		foreach ($batch_owners as $owner_uid) {
+			_debug("Running housekeeping tasks for user $owner_uid...");
+
+			housekeeping_user($owner_uid);
+		}
+
 		require_once "digest.php";
 
 		// Send feed digests by email if needed.
@@ -1502,6 +1513,14 @@
 		_debug("Removed $frows (feeds) $crows (cats) orphaned counter cache entries.");
 	}
 
+	function housekeeping_user($owner_uid) {
+		$tmph = new PluginHost();
+
+		load_user_plugins($owner_uid, $tmph);
+
+		$tmph->run_hooks(PluginHost::HOOK_HOUSE_KEEPING, "hook_house_keeping", "");
+	}
+
 	function housekeeping_common($debug) {
 		expire_cached_files($debug);
 		expire_lock_files($debug);
@@ -1517,6 +1536,5 @@
 		//_debug("Cleaned $rc cached tags.");
 
 		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_HOUSE_KEEPING, "hook_house_keeping", "");
-
 	}
 ?>
-- 
cgit v1.2.3


From 539f6ee6cd09057b779e35fc45c6a3a04f497286 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Wed, 17 Aug 2016 09:43:22 +0300
Subject: update schema 128 to properly set ttrss_feeds.last_updated default
 value to NULL

---
 schema/versions/mysql/128.sql | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/schema/versions/mysql/128.sql b/schema/versions/mysql/128.sql
index 0a4d7ab7c..281379bb0 100644
--- a/schema/versions/mysql/128.sql
+++ b/schema/versions/mysql/128.sql
@@ -1,5 +1,8 @@
 BEGIN;
 
+update ttrss_feeds set last_updated = NULL;
+alter table ttrss_feeds modify column last_updated datetime DEFAULT NULL;
+
 alter table ttrss_feeds add column feed_language varchar(100);
 update ttrss_feeds set feed_language = '';
 alter table ttrss_feeds change feed_language feed_language varchar(100) not null;
-- 
cgit v1.2.3


From a84fb943b4c5a030e215fa819e579ca4646cf617 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Wed, 17 Aug 2016 17:54:27 +0300
Subject: pre-users: disallow renaming admin user

---
 classes/pref/users.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/pref/users.php b/classes/pref/users.php
index a10404d0a..164935b23 100644
--- a/classes/pref/users.php
+++ b/classes/pref/users.php
@@ -37,7 +37,7 @@ class Pref_Users extends Handler_Protected {
 			$access_level = $this->dbh->fetch_result($result, 0, "access_level");
 			$email = $this->dbh->fetch_result($result, 0, "email");
 
-			$sel_disabled = ($id == $_SESSION["uid"]) ? "disabled" : "";
+			$sel_disabled = ($id == $_SESSION["uid"] || $login == "admin") ? "disabled" : "";
 
 			print "<div class=\"dlgSec\">".__("User")."</div>";
 			print "<div class=\"dlgSecCont\">";
-- 
cgit v1.2.3


From 1a322ff3dfb47a73f52f4076b9d73601999c573e Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Fri, 19 Aug 2016 18:14:22 +0300
Subject: import_export: better error message if upload failed

---
 include/functions2.php         | 16 ++++++++++++++++
 plugins/import_export/init.php | 43 +++++++++++++++++++++---------------------
 2 files changed, 38 insertions(+), 21 deletions(-)

diff --git a/include/functions2.php b/include/functions2.php
index dceea507e..7e1171b7d 100644
--- a/include/functions2.php
+++ b/include/functions2.php
@@ -2449,4 +2449,20 @@
 
 		return $tmp;
 	}
+
+	function get_upload_error_message($code) {
+
+		$errors = array(
+			0 => __('There is no error, the file uploaded with success'),
+			1 => __('The uploaded file exceeds the upload_max_filesize directive in php.ini'),
+			2 => __('The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form'),
+			3 => __('The uploaded file was only partially uploaded'),
+			4 => __('No file was uploaded'),
+			6 => __('Missing a temporary folder'),
+			7 => __('Failed to write file to disk.'),
+			8 => __('A PHP extension stopped the file upload.'),
+		);
+
+		return $errors[$code];
+	}
 ?>
diff --git a/plugins/import_export/init.php b/plugins/import_export/init.php
index 7c628909f..491216e06 100644
--- a/plugins/import_export/init.php
+++ b/plugins/import_export/init.php
@@ -425,34 +425,35 @@ class Import_Export extends Plugin implements IHandler {
 		print "<div style='text-align : center'>";
 
 		if ($_FILES['export_file']['error'] != 0) {
-			print_error(T_sprintf("Upload failed with error code %d",
-				$_FILES['export_file']['error']));
-			return;
-		}
+			print_error(T_sprintf("Upload failed with error code %d (%s)",
+				$_FILES['export_file']['error'],
+				get_upload_error_message($_FILES['export_file']['error'])));
+		} else {
 
-		$tmp_file = false;
+			$tmp_file = false;
 
-		if (is_uploaded_file($_FILES['export_file']['tmp_name'])) {
-			$tmp_file = tempnam(CACHE_DIR . '/upload', 'export');
+			if (is_uploaded_file($_FILES['export_file']['tmp_name'])) {
+				$tmp_file = tempnam(CACHE_DIR . '/upload', 'export');
 
-			$result = move_uploaded_file($_FILES['export_file']['tmp_name'],
-				$tmp_file);
+				$result = move_uploaded_file($_FILES['export_file']['tmp_name'],
+					$tmp_file);
 
-			if (!$result) {
-				print_error(__("Unable to move uploaded file."));
+				if (!$result) {
+					print_error(__("Unable to move uploaded file."));
+					return;
+				}
+			} else {
+				print_error(__('Error: please upload OPML file.'));
 				return;
 			}
-		} else {
-			print_error(__('Error: please upload OPML file.'));
-			return;
-		}
 
-		if (is_file($tmp_file)) {
-			$this->perform_data_import($tmp_file, $_SESSION['uid']);
-			unlink($tmp_file);
-		} else {
-			print_error(__('No file uploaded.'));
-			return;
+			if (is_file($tmp_file)) {
+				$this->perform_data_import($tmp_file, $_SESSION['uid']);
+				unlink($tmp_file);
+			} else {
+				print_error(__('No file uploaded.'));
+				return;
+			}
 		}
 
 		print "<button dojoType=\"dijit.form.Button\"
-- 
cgit v1.2.3


From c565a0cc21a6ee3e74ac9bc0cf4bfdde7cc84efd Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Fri, 19 Aug 2016 18:16:36 +0300
Subject: rebase translations

---
 locale/ar_SA/LC_MESSAGES/messages.mo |  Bin 72162 -> 72162 bytes
 locale/ar_SA/LC_MESSAGES/messages.po |  509 ++++++-----
 locale/bg_BG/LC_MESSAGES/messages.mo |  Bin 81872 -> 81872 bytes
 locale/bg_BG/LC_MESSAGES/messages.po |  509 ++++++-----
 locale/ca_CA/LC_MESSAGES/messages.mo |  Bin 22632 -> 22632 bytes
 locale/ca_CA/LC_MESSAGES/messages.po |  509 ++++++-----
 locale/cs_CZ/LC_MESSAGES/messages.mo |  Bin 62292 -> 62292 bytes
 locale/cs_CZ/LC_MESSAGES/messages.po |  509 ++++++-----
 locale/da_DK/LC_MESSAGES/messages.mo |  Bin 28012 -> 28012 bytes
 locale/da_DK/LC_MESSAGES/messages.po |  509 ++++++-----
 locale/de_DE/LC_MESSAGES/messages.mo |  Bin 65131 -> 65131 bytes
 locale/de_DE/LC_MESSAGES/messages.po | 1011 ++++++++++++++-------
 locale/el_GR/LC_MESSAGES/messages.mo |  Bin 38693 -> 38693 bytes
 locale/el_GR/LC_MESSAGES/messages.po |  509 ++++++-----
 locale/es_ES/LC_MESSAGES/messages.mo |  Bin 62076 -> 62076 bytes
 locale/es_ES/LC_MESSAGES/messages.po |  509 ++++++-----
 locale/es_LA/LC_MESSAGES/messages.mo |  Bin 30012 -> 30012 bytes
 locale/es_LA/LC_MESSAGES/messages.po |  509 ++++++-----
 locale/fi_FI/LC_MESSAGES/messages.mo |  Bin 51635 -> 51635 bytes
 locale/fi_FI/LC_MESSAGES/messages.po |  508 ++++++-----
 locale/fr_FR/LC_MESSAGES/messages.mo |  Bin 66773 -> 66773 bytes
 locale/fr_FR/LC_MESSAGES/messages.po |  509 ++++++-----
 locale/hu_HU/LC_MESSAGES/messages.mo |  Bin 61390 -> 61390 bytes
 locale/hu_HU/LC_MESSAGES/messages.po |  509 ++++++-----
 locale/it_IT/LC_MESSAGES/messages.mo |  Bin 65902 -> 65902 bytes
 locale/it_IT/LC_MESSAGES/messages.po | 1623 +++++++++++++++++-----------------
 locale/ja_JP/LC_MESSAGES/messages.mo |  Bin 64658 -> 64658 bytes
 locale/ja_JP/LC_MESSAGES/messages.po |  509 ++++++-----
 locale/ko_KR/LC_MESSAGES/messages.mo |  Bin 43421 -> 43421 bytes
 locale/ko_KR/LC_MESSAGES/messages.po |  509 ++++++-----
 locale/lv_LV/LC_MESSAGES/messages.mo |  Bin 58830 -> 58830 bytes
 locale/lv_LV/LC_MESSAGES/messages.po |  509 ++++++-----
 locale/nb_NO/LC_MESSAGES/messages.mo |  Bin 21464 -> 21464 bytes
 locale/nb_NO/LC_MESSAGES/messages.po |  509 ++++++-----
 locale/nl_NL/LC_MESSAGES/messages.mo |  Bin 56428 -> 56428 bytes
 locale/nl_NL/LC_MESSAGES/messages.po |  509 ++++++-----
 locale/pl_PL/LC_MESSAGES/messages.mo |  Bin 60583 -> 60583 bytes
 locale/pl_PL/LC_MESSAGES/messages.po |  509 ++++++-----
 locale/pt_BR/LC_MESSAGES/messages.mo |  Bin 63874 -> 63874 bytes
 locale/pt_BR/LC_MESSAGES/messages.po |  509 ++++++-----
 locale/pt_PT/LC_MESSAGES/messages.mo |  Bin 54848 -> 54848 bytes
 locale/pt_PT/LC_MESSAGES/messages.po |  509 ++++++-----
 locale/ru_RU/LC_MESSAGES/messages.mo |  Bin 78347 -> 78347 bytes
 locale/ru_RU/LC_MESSAGES/messages.po |  509 ++++++-----
 locale/sv_SE/LC_MESSAGES/messages.mo |  Bin 54777 -> 54777 bytes
 locale/sv_SE/LC_MESSAGES/messages.po |  509 ++++++-----
 locale/tr_TR/LC_MESSAGES/messages.mo |  Bin 57836 -> 57836 bytes
 locale/tr_TR/LC_MESSAGES/messages.po |  509 ++++++-----
 locale/zh_CN/LC_MESSAGES/messages.mo |  Bin 39913 -> 39913 bytes
 locale/zh_CN/LC_MESSAGES/messages.po |  509 ++++++-----
 locale/zh_TW/LC_MESSAGES/messages.mo |  Bin 39732 -> 39732 bytes
 locale/zh_TW/LC_MESSAGES/messages.po |  509 ++++++-----
 messages.pot                         |  427 +++++----
 53 files changed, 8325 insertions(+), 6951 deletions(-)

diff --git a/locale/ar_SA/LC_MESSAGES/messages.mo b/locale/ar_SA/LC_MESSAGES/messages.mo
index 49f8eaf15..1884c9b47 100755
Binary files a/locale/ar_SA/LC_MESSAGES/messages.mo and b/locale/ar_SA/LC_MESSAGES/messages.mo differ
diff --git a/locale/ar_SA/LC_MESSAGES/messages.po b/locale/ar_SA/LC_MESSAGES/messages.po
index 1f56664a8..45ee77ef8 100755
--- a/locale/ar_SA/LC_MESSAGES/messages.po
+++ b/locale/ar_SA/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: TinyTinyRSS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 22:58+0300\n"
+"POT-Creation-Date: 2016-08-19 18:16+0300\n"
 "PO-Revision-Date: 2014-08-13 19:15+0300\n"
 "Last-Translator: عبد الناصر سعيد الثبيتي <abdunnasir@althobaity.com>\n"
 "Language-Team: Arabic <abdunnasir@althobaity.com>\n"
@@ -167,13 +167,13 @@ msgstr "لم أجد الخلاصة."
 msgid "Plugin not found"
 msgstr "مستخدم غير موجود"
 
-#: index.php:133
-#: index.php:149
-#: index.php:267
-#: prefs.php:102
+#: index.php:148
+#: index.php:164
+#: index.php:282
+#: prefs.php:117
 #: classes/backend.php:5
 #: classes/pref/labels.php:282
-#: classes/pref/feeds.php:1405
+#: classes/pref/feeds.php:1409
 #: classes/pref/filters.php:779
 #: js/feedlist.js:159
 #: js/functions.js:1293
@@ -185,7 +185,7 @@ msgstr "مستخدم غير موجود"
 #: js/prefs.js:1781
 #: js/prefs.js:1799
 #: js/tt-rss.js:55
-#: js/tt-rss.js:522
+#: js/tt-rss.js:553
 #: js/viewfeed.js:1298
 #: plugins/import_export/import_export.js:17
 #: js/feedlist.js:484
@@ -198,75 +198,75 @@ msgstr "مستخدم غير موجود"
 #: js/prefs.js:1556
 #: js/prefs.js:1572
 #: js/prefs.js:1592
-#: js/tt-rss.js:539
+#: js/tt-rss.js:570
 #: js/viewfeed.js:830
 msgid "Loading, please wait..."
 msgstr "التحميل جارٍ.  فضلاً انتظر..."
 
-#: index.php:167
+#: index.php:182
 msgid "Collapse feedlist"
 msgstr "طيّ قائمة الخلاصات"
 
-#: index.php:170
+#: index.php:185
 msgid "Show articles"
 msgstr "إعرض البنود"
 
-#: index.php:173
+#: index.php:188
 msgid "Adaptive"
 msgstr "العرض التكيُّفي/الأمثل"
 
-#: index.php:174
+#: index.php:189
 msgid "All Articles"
 msgstr "كل البنود"
 
-#: index.php:175
-#: include/functions2.php:101
+#: index.php:190
+#: include/functions2.php:102
 #: classes/feeds.php:104
 msgid "Starred"
 msgstr "معلَّم بنجمة"
 
-#: index.php:176
-#: include/functions2.php:102
+#: index.php:191
+#: include/functions2.php:103
 #: classes/feeds.php:105
 msgid "Published"
 msgstr "منشور"
 
-#: index.php:177
+#: index.php:192
 #: classes/feeds.php:91
 #: classes/feeds.php:103
 msgid "Unread"
 msgstr "لم يُقرأ"
 
-#: index.php:178
+#: index.php:193
 msgid "With Note"
 msgstr "مع ملاحظة"
 
-#: index.php:179
+#: index.php:194
 msgid "Ignore Scoring"
 msgstr "تجاهل النقاط"
 
-#: index.php:182
+#: index.php:197
 msgid "Sort articles"
 msgstr "رتِّب البنود"
 
-#: index.php:185
+#: index.php:200
 msgid "Default"
 msgstr "الافتراضي"
 
-#: index.php:186
+#: index.php:201
 msgid "Newest first"
 msgstr "الأحدث أولاً"
 
-#: index.php:187
+#: index.php:202
 msgid "Oldest first"
 msgstr "الأقدم أولاً"
 
-#: index.php:188
+#: index.php:203
 msgid "Title"
 msgstr "العنوان"
 
-#: index.php:192
-#: index.php:233
+#: index.php:207
+#: index.php:248
 #: include/functions2.php:90
 #: classes/feeds.php:109
 #: js/FeedTree.js:132
@@ -274,134 +274,134 @@ msgstr "العنوان"
 msgid "Mark as read"
 msgstr "ضع علامة مقروء"
 
-#: index.php:195
+#: index.php:210
 msgid "Older than one day"
 msgstr "أقدم من يوم"
 
-#: index.php:198
+#: index.php:213
 msgid "Older than one week"
 msgstr "أقدم من أسبوع"
 
-#: index.php:201
+#: index.php:216
 msgid "Older than two weeks"
 msgstr "أقدم من أسبوعين"
 
-#: index.php:217
+#: index.php:232
 msgid "Communication problem with server."
 msgstr "مشكلة في الاتصال بالخادم"
 
-#: index.php:223
+#: index.php:238
 msgid "Actions..."
 msgstr "إجراءات..."
 
-#: index.php:225
+#: index.php:240
 msgid "Preferences..."
 msgstr "خيارات..."
 
-#: index.php:226
+#: index.php:241
 msgid "Search..."
 msgstr "بحث..."
 
-#: index.php:227
+#: index.php:242
 msgid "Feed actions:"
 msgstr "إجراءات الخلاصة:"
 
-#: index.php:228
+#: index.php:243
 #: classes/handler/public.php:672
 msgid "Subscribe to feed..."
 msgstr "إشترك في الخلاصة..."
 
-#: index.php:229
+#: index.php:244
 msgid "Edit this feed..."
 msgstr "تحرير هذه الخلاصة..."
 
-#: index.php:230
+#: index.php:245
 msgid "Rescore feed"
 msgstr "إعادة حساب نقاط الخلاصة"
 
-#: index.php:231
-#: classes/pref/feeds.php:783
-#: classes/pref/feeds.php:1360
+#: index.php:246
+#: classes/pref/feeds.php:785
+#: classes/pref/feeds.php:1364
 #: js/PrefFeedTree.js:74
 msgid "Unsubscribe"
 msgstr "إلغاء الاشتراك"
 
-#: index.php:232
+#: index.php:247
 msgid "All feeds:"
 msgstr "كل الخلاصات:"
 
-#: index.php:234
+#: index.php:249
 msgid "(Un)hide read feeds"
 msgstr "إظهار/إخفاء الخلاصات المقروءة"
 
-#: index.php:235
+#: index.php:250
 msgid "Other actions:"
 msgstr "إجراءات أخرى:"
 
-#: index.php:236
+#: index.php:251
 #: include/functions2.php:76
 msgid "Toggle widescreen mode"
 msgstr "بدِّل وضع الشاشة العريضة"
 
-#: index.php:237
+#: index.php:252
 msgid "Create label..."
 msgstr "أنشئ تسميةً..."
 
-#: index.php:238
+#: index.php:253
 msgid "Create filter..."
 msgstr "أنشئ مرشحاً..."
 
-#: index.php:239
+#: index.php:254
 msgid "Keyboard shortcuts help"
 msgstr "مساعدة اختصارات لوحة المفاتيح"
 
-#: index.php:248
+#: index.php:263
 msgid "Logout"
 msgstr "الخروج"
 
-#: index.php:254
+#: index.php:269
 msgid "Updates are available from Git."
 msgstr ""
 
 #: prefs.php:33
-#: prefs.php:120
-#: include/functions2.php:104
+#: prefs.php:135
+#: include/functions2.php:105
 #: classes/pref/prefs.php:435
 msgid "Preferences"
 msgstr "خيارات"
 
-#: prefs.php:111
+#: prefs.php:126
 msgid "Keyboard shortcuts"
 msgstr "اختصارات لوحة المفاتيح"
 
-#: prefs.php:112
+#: prefs.php:127
 msgid "Exit preferences"
 msgstr "أخرج من الخيارات"
 
-#: prefs.php:123
+#: prefs.php:138
 #: classes/pref/feeds.php:112
-#: classes/pref/feeds.php:1300
-#: classes/pref/feeds.php:1349
+#: classes/pref/feeds.php:1304
+#: classes/pref/feeds.php:1353
 msgid "Feeds"
 msgstr "الخلاصات"
 
-#: prefs.php:126
+#: prefs.php:141
 #: classes/pref/filters.php:248
 msgid "Filters"
 msgstr "المرشِّحات"
 
-#: prefs.php:129
-#: include/functions.php:1256
-#: include/functions.php:1909
+#: prefs.php:144
+#: include/functions.php:1287
+#: include/functions.php:1940
 #: classes/pref/labels.php:90
 msgid "Labels"
 msgstr "الأسماء"
 
-#: prefs.php:133
+#: prefs.php:148
 msgid "Users"
 msgstr "المستخدمون"
 
-#: prefs.php:136
+#: prefs.php:151
 msgid "System"
 msgstr "النظام"
 
@@ -483,10 +483,10 @@ msgid "Tiny Tiny RSS data update script."
 msgstr "برنامج تحديث بيانات Tiny Tiny RSS"
 
 #: include/digest.php:109
-#: include/functions.php:1265
-#: include/functions.php:1810
-#: include/functions.php:1895
-#: include/functions.php:1917
+#: include/functions.php:1296
+#: include/functions.php:1841
+#: include/functions.php:1926
+#: include/functions.php:1948
 #: classes/opml.php:421
 #: classes/pref/feeds.php:228
 msgid "Uncategorized"
@@ -503,44 +503,44 @@ msgstr[1] "%d بنود محفوظة"
 msgid "No feeds found."
 msgstr "لم أجد خلاصة."
 
-#: include/functions.php:958
+#: include/functions.php:989
 #, php-format
 msgid "%d min"
 msgstr ""
 
-#: include/functions.php:1254
-#: include/functions.php:1907
+#: include/functions.php:1285
+#: include/functions.php:1938
 msgid "Special"
 msgstr "خاص"
 
-#: include/functions.php:1758
+#: include/functions.php:1789
 #: classes/pref/filters.php:229
 #: classes/pref/filters.php:507
 msgid "All feeds"
 msgstr "كل الخلاصات"
 
-#: include/functions.php:1962
+#: include/functions.php:1993
 msgid "Starred articles"
 msgstr "البنود بنجمة"
 
-#: include/functions.php:1964
+#: include/functions.php:1995
 msgid "Published articles"
 msgstr "البنود المنشورة"
 
-#: include/functions.php:1966
+#: include/functions.php:1997
 msgid "Fresh articles"
 msgstr "البنود الطازجة"
 
-#: include/functions.php:1968
-#: include/functions2.php:99
+#: include/functions.php:1999
+#: include/functions2.php:100
 msgid "All articles"
 msgstr "كل البنود"
 
-#: include/functions.php:1970
+#: include/functions.php:2001
 msgid "Archived articles"
 msgstr "البنود المحفوظة"
 
-#: include/functions.php:1972
+#: include/functions.php:2003
 msgid "Recently read"
 msgstr "قُرِأَت حديثاً"
 
@@ -680,7 +680,7 @@ msgstr "ألغ اختيار الكل"
 
 #: include/functions2.php:85
 #: classes/pref/feeds.php:555
-#: classes/pref/feeds.php:821
+#: classes/pref/feeds.php:823
 msgid "Feed"
 msgstr "الخلاصة"
 
@@ -693,7 +693,7 @@ msgid "Un/hide read feeds"
 msgstr "إعرض/أخفِ الخلاصات المقروءة"
 
 #: include/functions2.php:88
-#: classes/pref/feeds.php:1352
+#: classes/pref/feeds.php:1356
 msgid "Subscribe to feed"
 msgstr "إشترك في خلاصة"
 
@@ -709,140 +709,177 @@ msgid "Reverse headlines"
 msgstr "إقلب العناوين"
 
 #: include/functions2.php:92
+msgid "Toggle headline grouping"
+msgstr ""
+
+#: include/functions2.php:93
 msgid "Debug feed update"
 msgstr "تصحيح أخطاء تحديث الخلاصة"
 
-#: include/functions2.php:93
+#: include/functions2.php:94
 #, fuzzy
 msgid "Debug viewfeed()"
 msgstr "تصحيح أخطاء تحديث الخلاصة"
 
-#: include/functions2.php:94
+#: include/functions2.php:95
 #: js/FeedTree.js:182
 msgid "Mark all feeds as read"
 msgstr "علِّم كل الخلاصات مقروءة"
 
-#: include/functions2.php:95
+#: include/functions2.php:96
 msgid "Un/collapse current category"
 msgstr "طيّ/بسط التصنيف الحالي"
 
-#: include/functions2.php:96
+#: include/functions2.php:97
 msgid "Toggle combined mode"
 msgstr "تبديل وضع التجميع"
 
-#: include/functions2.php:97
+#: include/functions2.php:98
 msgid "Toggle auto expand in combined mode"
 msgstr "إقلب حالة التوسيع التلقائي في وضع التجميع"
 
-#: include/functions2.php:98
+#: include/functions2.php:99
 msgid "Go to"
 msgstr "إذهب إلى"
 
-#: include/functions2.php:100
+#: include/functions2.php:101
 msgid "Fresh"
 msgstr "طازج"
 
-#: include/functions2.php:103
-#: js/tt-rss.js:466
-#: js/tt-rss.js:650
+#: include/functions2.php:104
+#: js/tt-rss.js:497
+#: js/tt-rss.js:673
 msgid "Tag cloud"
 msgstr "سحابة العلامات"
 
-#: include/functions2.php:105
+#: include/functions2.php:106
 msgid "Other"
 msgstr "أخرى"
 
-#: include/functions2.php:106
+#: include/functions2.php:107
 #: classes/pref/labels.php:267
 msgid "Create label"
 msgstr "أنشئ تسمية"
 
-#: include/functions2.php:107
+#: include/functions2.php:108
 #: classes/pref/filters.php:753
 msgid "Create filter"
 msgstr "أنشئ مرشِّح"
 
-#: include/functions2.php:108
+#: include/functions2.php:109
 msgid "Un/collapse sidebar"
 msgstr "طيّ/بَسْط الشريط الجانبي"
 
-#: include/functions2.php:109
+#: include/functions2.php:110
 msgid "Show help dialog"
 msgstr "إعرض نافذة المساعدة"
 
-#: include/functions2.php:663
+#: include/functions2.php:665
 #, php-format
 msgid "Search results: %s"
 msgstr "نتائج البحث: %s"
 
-#: include/functions2.php:1317
+#: include/functions2.php:1330
 #: classes/feeds.php:749
 msgid "comment"
 msgid_plural "comments"
 msgstr[0] "تعليق"
 msgstr[1] "تعليقات"
 
-#: include/functions2.php:1321
+#: include/functions2.php:1334
 #: classes/feeds.php:753
 msgid "comments"
 msgstr "تعليقات"
 
-#: include/functions2.php:1347
+#: include/functions2.php:1360
 msgid " - "
 msgstr " - "
 
-#: include/functions2.php:1380
-#: include/functions2.php:1631
+#: include/functions2.php:1393
+#: include/functions2.php:1644
 #: classes/article.php:311
 msgid "no tags"
 msgstr "لا علامات"
 
-#: include/functions2.php:1390
+#: include/functions2.php:1403
 #: classes/feeds.php:735
 msgid "Edit tags for this article"
 msgstr "حرِّر علامات هذا البند"
 
-#: include/functions2.php:1422
+#: include/functions2.php:1435
 #: classes/feeds.php:682
 msgid "Originally from:"
 msgstr "أصله من:"
 
-#: include/functions2.php:1435
+#: include/functions2.php:1448
 #: classes/pref/feeds.php:574
 #: classes/feeds.php:695
 msgid "Feed URL"
 msgstr "عنوان URL للخلاصة"
 
-#: include/functions2.php:1472
+#: include/functions2.php:1485
 #: classes/backend.php:105
 #: classes/dlg.php:37
 #: classes/dlg.php:60
 #: classes/dlg.php:93
 #: classes/dlg.php:159
 #: classes/dlg.php:186
-#: classes/pref/feeds.php:1654
-#: classes/pref/feeds.php:1720
+#: classes/pref/feeds.php:1658
+#: classes/pref/feeds.php:1724
 #: classes/pref/filters.php:204
 #: classes/pref/prefs.php:1105
 #: plugins/af_psql_trgm/init.php:102
 #: plugins/import_export/init.php:415
-#: plugins/import_export/init.php:460
+#: plugins/import_export/init.php:461
 #: plugins/share/init.php:121
 msgid "Close this window"
 msgstr "أغلق هذه النافذة"
 
-#: include/functions2.php:1669
+#: include/functions2.php:1682
 msgid "(edit note)"
 msgstr "(حرِّر ملاحظة)"
 
-#: include/functions2.php:1924
+#: include/functions2.php:1937
 msgid "unknown type"
 msgstr "نوع غير معروف"
 
-#: include/functions2.php:2001
+#: include/functions2.php:2014
 msgid "Attachments"
 msgstr "مرفقات"
 
+#: include/functions2.php:2456
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: include/functions2.php:2457
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr ""
+
+#: include/functions2.php:2458
+msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
+msgstr ""
+
+#: include/functions2.php:2459
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: include/functions2.php:2460
+#, fuzzy
+msgid "No file was uploaded"
+msgstr "لم يتم تحميل أي ملف."
+
+#: include/functions2.php:2461
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: include/functions2.php:2462
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: include/functions2.php:2463
+msgid "A PHP extension stopped the file upload."
+msgstr ""
+
 #: include/login_form.php:197
 #: classes/handler/public.php:569
 #: classes/handler/public.php:824
@@ -909,8 +946,8 @@ msgstr "العلامات لهذا البند (مفصولة بفواصل)"
 #: classes/article.php:222
 #: classes/pref/labels.php:79
 #: classes/pref/users.php:98
-#: classes/pref/feeds.php:799
-#: classes/pref/feeds.php:939
+#: classes/pref/feeds.php:801
+#: classes/pref/feeds.php:943
 #: classes/pref/filters.php:485
 #: classes/pref/prefs.php:989
 #: plugins/instances/init.php:245
@@ -928,17 +965,17 @@ msgstr "إحفظ"
 #: classes/handler/public.php:580
 #: classes/pref/labels.php:81
 #: classes/pref/users.php:100
-#: classes/pref/feeds.php:800
-#: classes/pref/feeds.php:942
-#: classes/pref/feeds.php:1860
+#: classes/pref/feeds.php:802
+#: classes/pref/feeds.php:946
+#: classes/pref/feeds.php:1865
 #: classes/pref/filters.php:488
 #: classes/pref/filters.php:902
 #: classes/pref/filters.php:983
 #: classes/pref/filters.php:1076
 #: classes/pref/prefs.php:991
-#: classes/feeds.php:1098
-#: classes/feeds.php:1148
-#: classes/feeds.php:1185
+#: classes/feeds.php:1100
+#: classes/feeds.php:1150
+#: classes/feeds.php:1187
 #: plugins/instances/init.php:248
 #: plugins/instances/init.php:436
 #: plugins/note/init.php:53
@@ -994,7 +1031,6 @@ msgid "Processing category: %s"
 msgstr "معالجة التصنيف: %s"
 
 #: classes/opml.php:470
-#: plugins/import_export/init.php:428
 #, php-format
 msgid "Upload failed with error code %d"
 msgstr "فشِل الرفع و ظهر رمز الخطأ %d"
@@ -1212,9 +1248,9 @@ msgstr "تم إنشاء التسمية <b>%s</b>"
 
 #: classes/pref/labels.php:258
 #: classes/pref/users.php:334
-#: classes/pref/feeds.php:1340
-#: classes/pref/feeds.php:1602
-#: classes/pref/feeds.php:1666
+#: classes/pref/feeds.php:1344
+#: classes/pref/feeds.php:1606
+#: classes/pref/feeds.php:1670
 #: classes/pref/filters.php:359
 #: classes/pref/filters.php:407
 #: classes/pref/filters.php:744
@@ -1227,9 +1263,9 @@ msgstr "إختر"
 
 #: classes/pref/labels.php:261
 #: classes/pref/users.php:337
-#: classes/pref/feeds.php:1343
-#: classes/pref/feeds.php:1605
-#: classes/pref/feeds.php:1669
+#: classes/pref/feeds.php:1347
+#: classes/pref/feeds.php:1609
+#: classes/pref/feeds.php:1673
 #: classes/pref/filters.php:362
 #: classes/pref/filters.php:410
 #: classes/pref/filters.php:747
@@ -1243,9 +1279,9 @@ msgstr "الكل"
 
 #: classes/pref/labels.php:263
 #: classes/pref/users.php:339
-#: classes/pref/feeds.php:1345
-#: classes/pref/feeds.php:1607
-#: classes/pref/feeds.php:1671
+#: classes/pref/feeds.php:1349
+#: classes/pref/feeds.php:1611
+#: classes/pref/feeds.php:1675
 #: classes/pref/filters.php:364
 #: classes/pref/filters.php:412
 #: classes/pref/filters.php:749
@@ -1259,10 +1295,10 @@ msgstr "لاشيء"
 
 #: classes/pref/labels.php:270
 #: classes/pref/users.php:348
-#: classes/pref/feeds.php:765
+#: classes/pref/feeds.php:767
 #: classes/pref/filters.php:478
 #: classes/pref/filters.php:766
-#: classes/feeds.php:1147
+#: classes/feeds.php:1149
 #: plugins/instances/init.php:294
 msgid "Remove"
 msgstr "إحذف"
@@ -1284,7 +1320,7 @@ msgstr "تحرير القاعدة"
 
 #: classes/pref/users.php:56
 #: classes/pref/feeds.php:637
-#: classes/pref/feeds.php:876
+#: classes/pref/feeds.php:878
 #: classes/feeds.php:1070
 msgid "Authentication"
 msgstr "الإستيثاق"
@@ -1294,8 +1330,8 @@ msgid "Access level: "
 msgstr "مستوى الوصول:"
 
 #: classes/pref/users.php:77
-#: classes/pref/feeds.php:665
-#: classes/pref/feeds.php:892
+#: classes/pref/feeds.php:667
+#: classes/pref/feeds.php:896
 msgid "Options"
 msgstr "خيارات"
 
@@ -1361,10 +1397,10 @@ msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] إشعار تغيُّر كلمة المرور"
 
 #: classes/pref/users.php:324
-#: classes/pref/feeds.php:1336
+#: classes/pref/feeds.php:1340
 #: classes/pref/filters.php:740
-#: classes/feeds.php:1118
-#: classes/feeds.php:1184
+#: classes/feeds.php:1120
+#: classes/feeds.php:1186
 #: js/tt-rss.js:174
 msgid "Search"
 msgstr "إبحث"
@@ -1381,8 +1417,8 @@ msgstr "حرِّر"
 
 #: classes/pref/users.php:397
 #: classes/pref/feeds.php:643
-#: classes/pref/feeds.php:880
-#: classes/pref/feeds.php:1838
+#: classes/pref/feeds.php:882
+#: classes/pref/feeds.php:1842
 #: classes/feeds.php:1074
 msgid "Login"
 msgstr "الدخول"
@@ -1461,251 +1497,251 @@ msgid "Feed Title"
 msgstr "عنوان الخلاصة"
 
 #: classes/pref/feeds.php:595
-#: classes/pref/feeds.php:828
-#: classes/pref/feeds.php:1824
+#: classes/pref/feeds.php:830
+#: classes/pref/feeds.php:1828
 #: classes/feeds.php:1050
 msgid "Place in category:"
 msgstr "ضعه في التصنيف:"
 
 #: classes/pref/feeds.php:608
-#: classes/pref/feeds.php:842
+#: classes/pref/feeds.php:844
 #, fuzzy
 msgid "Language:"
 msgstr "اللغة"
 
 #: classes/pref/feeds.php:615
-#: classes/pref/feeds.php:851
+#: classes/pref/feeds.php:853
 msgid "Update"
 msgstr "تحديث"
 
 #: classes/pref/feeds.php:630
-#: classes/pref/feeds.php:867
+#: classes/pref/feeds.php:869
 msgid "Article purging:"
 msgstr "تنظيف البند:"
 
-#: classes/pref/feeds.php:656
-#: classes/pref/feeds.php:886
-#: classes/pref/feeds.php:1841
+#: classes/pref/feeds.php:658
+#: classes/pref/feeds.php:890
+#: classes/pref/feeds.php:1845
 #: classes/pref/prefs.php:245
-#: classes/feeds.php:1077
+#: classes/feeds.php:1078
 msgid "Password"
 msgstr "كلمة المرور"
 
-#: classes/pref/feeds.php:660
+#: classes/pref/feeds.php:662
 msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
 msgstr "<b>تلميح:</b> لابد من تعبئة معلومات الدخول إذا كانت الخلاصة المرغوبة تتطلب الاستيثاق ، إلا لخلاصات تويتر."
 
-#: classes/pref/feeds.php:679
-#: classes/pref/feeds.php:896
+#: classes/pref/feeds.php:681
+#: classes/pref/feeds.php:900
 msgid "Hide from Popular feeds"
 msgstr "خبئها من بين الخلاصات الشَّعبية"
 
-#: classes/pref/feeds.php:691
-#: classes/pref/feeds.php:902
+#: classes/pref/feeds.php:693
+#: classes/pref/feeds.php:906
 msgid "Include in e-mail digest"
 msgstr "ضمِّن هذا في رسالة الموجز"
 
-#: classes/pref/feeds.php:704
-#: classes/pref/feeds.php:908
+#: classes/pref/feeds.php:706
+#: classes/pref/feeds.php:912
 msgid "Always display image attachments"
 msgstr "إعرض الصور المرفقة دائماً"
 
-#: classes/pref/feeds.php:717
-#: classes/pref/feeds.php:916
+#: classes/pref/feeds.php:719
+#: classes/pref/feeds.php:920
 msgid "Do not embed images"
 msgstr "لا تضمِّن الصور"
 
-#: classes/pref/feeds.php:730
-#: classes/pref/feeds.php:924
+#: classes/pref/feeds.php:732
+#: classes/pref/feeds.php:928
 msgid "Cache images locally"
 msgstr "خبئ الصور محلياً"
 
-#: classes/pref/feeds.php:742
-#: classes/pref/feeds.php:930
+#: classes/pref/feeds.php:744
+#: classes/pref/feeds.php:934
 msgid "Mark updated articles as unread"
 msgstr "علِّم البنود المحدَّثة بـ غير مقروءة"
 
-#: classes/pref/feeds.php:746
+#: classes/pref/feeds.php:748
 msgid "Icon"
 msgstr "أيقونة"
 
-#: classes/pref/feeds.php:763
+#: classes/pref/feeds.php:765
 msgid "Replace"
 msgstr "إستبدال"
 
-#: classes/pref/feeds.php:770
+#: classes/pref/feeds.php:772
 #: classes/pref/prefs.php:706
 msgid "Plugins"
 msgstr "إضافات"
 
-#: classes/pref/feeds.php:790
+#: classes/pref/feeds.php:792
 msgid "Resubscribe to push updates"
 msgstr "إعادة الإشتراك في تحديثات الدفع"
 
-#: classes/pref/feeds.php:797
+#: classes/pref/feeds.php:799
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr "إعادة تعيين حالة اشتراك PubSubHubbub للخلاصات المُفعَّل دفعها."
 
-#: classes/pref/feeds.php:1203
-#: classes/pref/feeds.php:1256
+#: classes/pref/feeds.php:1207
+#: classes/pref/feeds.php:1260
 msgid "All done."
 msgstr "انتهى العمل."
 
-#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1315
 msgid "Feeds with errors"
 msgstr "الخلاصات ذات الأخطاء"
 
-#: classes/pref/feeds.php:1318
+#: classes/pref/feeds.php:1322
 msgid "Inactive feeds"
 msgstr "الخلاصات الخاملة"
 
-#: classes/pref/feeds.php:1354
+#: classes/pref/feeds.php:1358
 msgid "Edit selected feeds"
 msgstr "حرّر الخلاصات المختارة"
 
-#: classes/pref/feeds.php:1356
-#: classes/pref/feeds.php:1370
+#: classes/pref/feeds.php:1360
+#: classes/pref/feeds.php:1374
 #: classes/pref/filters.php:762
 msgid "Reset sort order"
 msgstr "أعد تعيين ترتيب الفرز"
 
-#: classes/pref/feeds.php:1358
+#: classes/pref/feeds.php:1362
 #: js/prefs.js:1737
 msgid "Batch subscribe"
 msgstr "إشتراك بالجملة"
 
-#: classes/pref/feeds.php:1365
+#: classes/pref/feeds.php:1369
 msgid "Categories"
 msgstr "التصنيفات"
 
-#: classes/pref/feeds.php:1368
+#: classes/pref/feeds.php:1372
 msgid "Add category"
 msgstr "أضف تصنيفاً"
 
-#: classes/pref/feeds.php:1372
+#: classes/pref/feeds.php:1376
 msgid "Remove selected"
 msgstr "إحذف المختارة"
 
-#: classes/pref/feeds.php:1383
+#: classes/pref/feeds.php:1387
 msgid "More actions..."
 msgstr "إجراءات أكثر..."
 
-#: classes/pref/feeds.php:1387
+#: classes/pref/feeds.php:1391
 msgid "Manual purge"
 msgstr "تنظيف يدوي"
 
-#: classes/pref/feeds.php:1391
+#: classes/pref/feeds.php:1395
 msgid "Clear feed data"
 msgstr "مسح بيانات الخلاصة"
 
-#: classes/pref/feeds.php:1392
+#: classes/pref/feeds.php:1396
 #: classes/pref/filters.php:770
 msgid "Rescore articles"
 msgstr "إعادة حساب نقاط البنود"
 
-#: classes/pref/feeds.php:1444
+#: classes/pref/feeds.php:1448
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1446
+#: classes/pref/feeds.php:1450
 msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
 msgstr "باستخدام لغة تأشير معالجة المخططات (OPML) يمكنك تصدير واستيراد خلاصاتك ، مرشحاتك ، أسماءك  وإعدادات Tiny Tiny RSS أيضاً."
 
-#: classes/pref/feeds.php:1447
+#: classes/pref/feeds.php:1451
 msgid "Only main settings profile can be migrated using OPML."
 msgstr "الملف الشخصي الأساسي للإعدادات فقط هو الذي يمكن ترحيله باستخدام OPML."
 
-#: classes/pref/feeds.php:1460
+#: classes/pref/feeds.php:1464
 msgid "Import my OPML"
 msgstr "إستورد OMPL الخاصة بي"
 
-#: classes/pref/feeds.php:1466
+#: classes/pref/feeds.php:1470
 msgid "Filename:"
 msgstr "اسم الملف:"
 
-#: classes/pref/feeds.php:1468
+#: classes/pref/feeds.php:1472
 msgid "Include settings"
 msgstr "ضمِّن الإعدادات"
 
-#: classes/pref/feeds.php:1472
+#: classes/pref/feeds.php:1476
 msgid "Export OPML"
 msgstr "تصدير OPML"
 
-#: classes/pref/feeds.php:1476
+#: classes/pref/feeds.php:1480
 msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
 msgstr "يمكن نشر OPML الخاص بك للعامة ، كما يمكن لأي أحد الإشتراك فيه إذا كان عنوان URL أدناه معروفاً."
 
-#: classes/pref/feeds.php:1480
+#: classes/pref/feeds.php:1484
 msgid "Public OPML URL"
 msgstr "عنوان URL لـ OPML المتاح للعامة "
 
-#: classes/pref/feeds.php:1481
+#: classes/pref/feeds.php:1485
 msgid "Display published OPML URL"
 msgstr "إعرض عنوان URL المنشور لـ OPML"
 
-#: classes/pref/feeds.php:1490
+#: classes/pref/feeds.php:1494
 msgid "Firefox integration"
 msgstr "التكامل مع فيرفوكس"
 
-#: classes/pref/feeds.php:1492
+#: classes/pref/feeds.php:1496
 msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
 msgstr "يمكن استخدام موقع Tiny Tiny RSS هذا في فيرفوكس كقارئ خلاصات بالنقر على الرابط أدناه."
 
-#: classes/pref/feeds.php:1499
+#: classes/pref/feeds.php:1503
 msgid "Click here to register this site as a feed reader."
 msgstr "أنقر هنا لتسجيل هذا الموقع كقارئ خلاصات."
 
-#: classes/pref/feeds.php:1507
+#: classes/pref/feeds.php:1511
 msgid "Published & shared articles / Generated feeds"
 msgstr "البنود المنشورة والمشارَكة / الخلاصات المولَّدة"
 
-#: classes/pref/feeds.php:1509
+#: classes/pref/feeds.php:1513
 msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
 msgstr "البنود المنشورة يتم تصديرها كخلاصة RSS متاحة للعامة يمكن الإشتراك بها لأي أحد يعرف عنوان URL المحدد أدناه."
 
-#: classes/pref/feeds.php:1516
+#: classes/pref/feeds.php:1520
 #: classes/feeds.php:54
 #: classes/feeds.php:134
 msgid "View as RSS"
 msgstr "إعرض كـ RSS"
 
-#: classes/pref/feeds.php:1517
+#: classes/pref/feeds.php:1521
 msgid "Display URL"
 msgstr "إعرض عنوان URL"
 
-#: classes/pref/feeds.php:1520
+#: classes/pref/feeds.php:1524
 msgid "Clear all generated URLs"
 msgstr "مسح كل عناوين URL المولَّدة"
 
-#: classes/pref/feeds.php:1598
+#: classes/pref/feeds.php:1602
 msgid "These feeds have not been updated with new content for 3 months (oldest first):"
 msgstr "هذه الخلاصات لم تحدَّث بمحتوى جديد منذ ٣ أشهر (الأقدم أولاً):"
 
-#: classes/pref/feeds.php:1632
-#: classes/pref/feeds.php:1696
+#: classes/pref/feeds.php:1636
+#: classes/pref/feeds.php:1700
 msgid "Click to edit feed"
 msgstr "أنقر لتحرير الخلاصة"
 
-#: classes/pref/feeds.php:1650
-#: classes/pref/feeds.php:1716
+#: classes/pref/feeds.php:1654
+#: classes/pref/feeds.php:1720
 msgid "Unsubscribe from selected feeds"
 msgstr "إلغاء الإشتراك في الخلاصات المختارة"
 
-#: classes/pref/feeds.php:1821
+#: classes/pref/feeds.php:1825
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr "ضع خلاصة RSS واحدة صحيحة على السطر (لن يجري اكتشاف الخلاصة)"
 
-#: classes/pref/feeds.php:1830
+#: classes/pref/feeds.php:1834
 msgid "Feeds to subscribe, One per line"
 msgstr "الخلاصات المرغوب الاشتراك فيها ، واحدة لكل سطر"
 
-#: classes/pref/feeds.php:1852
+#: classes/pref/feeds.php:1857
 msgid "Feeds require authentication."
 msgstr "الخلاصات تتطلب الاستيثاق."
 
-#: classes/pref/feeds.php:1859
-#: classes/feeds.php:1092
-#: classes/feeds.php:1146
+#: classes/pref/feeds.php:1864
+#: classes/feeds.php:1094
+#: classes/feeds.php:1148
 msgid "Subscribe"
 msgstr "إشترك"
 
@@ -1788,7 +1824,7 @@ msgid "on field"
 msgstr "في الحقل"
 
 #: classes/pref/filters.php:962
-#: js/PrefFilterTree.js:61
+#: js/PrefFilterTree.js:64
 msgid "in"
 msgstr "في"
 
@@ -2381,40 +2417,40 @@ msgstr "عنوان URL للخلاصة أو الموقع"
 msgid "Available feeds"
 msgstr "الخلاصات المتوفّرة"
 
-#: classes/feeds.php:1087
+#: classes/feeds.php:1089
 msgid "This feed requires authentication."
 msgstr "هذه الخلاصة تتطلب الإستيثاق."
 
-#: classes/feeds.php:1095
+#: classes/feeds.php:1097
 msgid "More feeds"
 msgstr "المزيد من الخلاصات"
 
-#: classes/feeds.php:1122
+#: classes/feeds.php:1124
 msgid "Popular feeds"
 msgstr "الخلاصات الشعبيَّة"
 
-#: classes/feeds.php:1123
+#: classes/feeds.php:1125
 msgid "Feed archive"
 msgstr "محفوظات الخلاصة"
 
-#: classes/feeds.php:1126
+#: classes/feeds.php:1128
 msgid "limit:"
 msgstr "حدّ:"
 
-#: classes/feeds.php:1158
+#: classes/feeds.php:1160
 msgid "Look for"
 msgstr "إبحث عن"
 
-#: classes/feeds.php:1166
+#: classes/feeds.php:1168
 #, php-format
 msgid "in %s"
 msgstr ""
 
-#: classes/feeds.php:1171
+#: classes/feeds.php:1173
 msgid "Used for word stemming"
 msgstr ""
 
-#: classes/feeds.php:1180
+#: classes/feeds.php:1182
 msgid "Search syntax"
 msgstr "نحو البحث"
 
@@ -2677,6 +2713,11 @@ msgstr "لم أتمكن من تحميل مستند XML."
 msgid "Prepare data"
 msgstr "جهّز البيانات"
 
+#: plugins/import_export/init.php:428
+#, fuzzy, php-format
+msgid "Upload failed with error code %d (%s)"
+msgstr "فشِل الرفع و ظهر رمز الخطأ %d"
+
 #: plugins/import_export/init.php:454
 msgid "No file uploaded."
 msgstr "لم يتم تحميل أي ملف."
@@ -2786,7 +2827,7 @@ msgstr "حرِّر التصنيف"
 msgid "Remove category"
 msgstr "إحذف التصنيف"
 
-#: js/PrefFilterTree.js:64
+#: js/PrefFilterTree.js:67
 msgid "Inverse"
 msgstr "العكس"
 
@@ -2837,7 +2878,7 @@ msgid "Subscription reset."
 msgstr "إعادة تعيين الإشتراك."
 
 #: js/functions.js:1311
-#: js/tt-rss.js:682
+#: js/tt-rss.js:705
 #, perl-format
 msgid "Unsubscribe from %s?"
 msgstr "إلغاء الإشتراك في %s ؟"
@@ -3067,40 +3108,40 @@ msgstr "أعلّم جميع البنود بـ مقروءة؟"
 msgid "Marking all feeds as read..."
 msgstr "يجري تعليم جميع البنود مقروءة..."
 
-#: js/tt-rss.js:383
+#: js/tt-rss.js:404
 msgid "Please enable mail plugin first."
 msgstr "فضلاً فعِّل إضافة البريد قبل البدء."
 
-#: js/tt-rss.js:431
+#: js/tt-rss.js:452
 #: js/functions.js:1643
-#: js/tt-rss.js:663
+#: js/tt-rss.js:686
 msgid "You can't edit this kind of feed."
 msgstr "لايمكنك تحرير هذا النوع من الخلاصات."
 
-#: js/tt-rss.js:502
+#: js/tt-rss.js:533
 msgid "Please enable embed_original plugin first."
 msgstr "فضلاً فعِّل إضافة تضمين الأصل قبل البدء."
 
-#: js/tt-rss.js:515
-#: js/tt-rss.js:713
+#: js/tt-rss.js:546
+#: js/tt-rss.js:736
 msgid "Widescreen is not available in combined mode."
 msgstr ""
 
-#: js/tt-rss.js:827
+#: js/tt-rss.js:850
 msgid "You can't rescore this kind of feed."
 msgstr "لا يمكنك إعادة حساب نقاط هذا النوع من الخلاصات."
 
-#: js/tt-rss.js:832
-#: js/tt-rss.js:676
+#: js/tt-rss.js:855
+#: js/tt-rss.js:699
 msgid "Please select some feed first."
 msgstr "فضلاً إختر أي خلاصة في البداية."
 
-#: js/tt-rss.js:837
+#: js/tt-rss.js:860
 #, perl-format
 msgid "Rescore articles in %s?"
 msgstr "إعادة حساب نقاط البنود في %s؟"
 
-#: js/tt-rss.js:840
+#: js/tt-rss.js:863
 msgid "Rescoring articles..."
 msgstr "إعادة حساب نقاط البنود..."
 
@@ -3276,7 +3317,7 @@ msgstr "تم حفظ بياناتك الشخصية."
 msgid "Sorry, your browser does not support sandboxed iframes."
 msgstr "آسف، مستعرضك لايدعم إطارات iframe في صندوق الرمل."
 
-#: plugins/shorten_expanded/init.js:37
+#: plugins/shorten_expanded/init.js:39
 msgid "Click to expand article"
 msgstr "أنقر لتوسيع البند"
 
@@ -3524,7 +3565,7 @@ msgstr "تم مسح عناوين الـ URL المولَّدة."
 msgid "Label Editor"
 msgstr "محرر التسميات"
 
-#: js/tt-rss.js:671
+#: js/tt-rss.js:694
 msgid "You can't unsubscribe from the category."
 msgstr "لايمكنك إلغاء الإشتراك من التصنيف."
 
diff --git a/locale/bg_BG/LC_MESSAGES/messages.mo b/locale/bg_BG/LC_MESSAGES/messages.mo
index f05363703..3e7efecd0 100644
Binary files a/locale/bg_BG/LC_MESSAGES/messages.mo and b/locale/bg_BG/LC_MESSAGES/messages.mo differ
diff --git a/locale/bg_BG/LC_MESSAGES/messages.po b/locale/bg_BG/LC_MESSAGES/messages.po
index 7de4e3163..f83d2c27c 100644
--- a/locale/bg_BG/LC_MESSAGES/messages.po
+++ b/locale/bg_BG/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tt-rss git\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 22:58+0300\n"
+"POT-Creation-Date: 2016-08-19 18:16+0300\n"
 "PO-Revision-Date: 2015-03-09 17:43+0200\n"
 "Last-Translator: Neter <neter@moyat.net>\n"
 "Language-Team: Bulgarian <>\n"
@@ -165,13 +165,13 @@ msgstr "Хранилката не е намерена."
 msgid "Plugin not found"
 msgstr "Потребителят не е намерен"
 
-#: index.php:133
-#: index.php:149
-#: index.php:267
-#: prefs.php:102
+#: index.php:148
+#: index.php:164
+#: index.php:282
+#: prefs.php:117
 #: classes/backend.php:5
 #: classes/pref/labels.php:282
-#: classes/pref/feeds.php:1405
+#: classes/pref/feeds.php:1409
 #: classes/pref/filters.php:779
 #: js/feedlist.js:159
 #: js/functions.js:1293
@@ -183,7 +183,7 @@ msgstr "Потребителят не е намерен"
 #: js/prefs.js:1781
 #: js/prefs.js:1799
 #: js/tt-rss.js:55
-#: js/tt-rss.js:522
+#: js/tt-rss.js:553
 #: js/viewfeed.js:1298
 #: plugins/import_export/import_export.js:17
 #: js/feedlist.js:484
@@ -196,75 +196,75 @@ msgstr "Потребителят не е намерен"
 #: js/prefs.js:1556
 #: js/prefs.js:1572
 #: js/prefs.js:1592
-#: js/tt-rss.js:539
+#: js/tt-rss.js:570
 #: js/viewfeed.js:830
 msgid "Loading, please wait..."
 msgstr "Зареждане. Моля, изчакайте..."
 
-#: index.php:167
+#: index.php:182
 msgid "Collapse feedlist"
 msgstr "Свиване на списъка с хранилки"
 
-#: index.php:170
+#: index.php:185
 msgid "Show articles"
 msgstr "Показване на статии"
 
-#: index.php:173
+#: index.php:188
 msgid "Adaptive"
 msgstr "Адаптивно"
 
-#: index.php:174
+#: index.php:189
 msgid "All Articles"
 msgstr "Всички статии"
 
-#: index.php:175
-#: include/functions2.php:101
+#: index.php:190
+#: include/functions2.php:102
 #: classes/feeds.php:104
 msgid "Starred"
 msgstr "Със звезда"
 
-#: index.php:176
-#: include/functions2.php:102
+#: index.php:191
+#: include/functions2.php:103
 #: classes/feeds.php:105
 msgid "Published"
 msgstr "Публикувани"
 
-#: index.php:177
+#: index.php:192
 #: classes/feeds.php:91
 #: classes/feeds.php:103
 msgid "Unread"
 msgstr "Нечетени"
 
-#: index.php:178
+#: index.php:193
 msgid "With Note"
 msgstr "С бележка"
 
-#: index.php:179
+#: index.php:194
 msgid "Ignore Scoring"
 msgstr "Незачитане на точкуване"
 
-#: index.php:182
+#: index.php:197
 msgid "Sort articles"
 msgstr "Подреждане на статии"
 
-#: index.php:185
+#: index.php:200
 msgid "Default"
 msgstr "По подразбиране"
 
-#: index.php:186
+#: index.php:201
 msgid "Newest first"
 msgstr "Новите отгоре"
 
-#: index.php:187
+#: index.php:202
 msgid "Oldest first"
 msgstr "Старите отгоре"
 
-#: index.php:188
+#: index.php:203
 msgid "Title"
 msgstr "По заглавие"
 
-#: index.php:192
-#: index.php:233
+#: index.php:207
+#: index.php:248
 #: include/functions2.php:90
 #: classes/feeds.php:109
 #: js/FeedTree.js:132
@@ -272,134 +272,134 @@ msgstr "По заглавие"
 msgid "Mark as read"
 msgstr "Прочетени"
 
-#: index.php:195
+#: index.php:210
 msgid "Older than one day"
 msgstr "По-старо от 1 ден"
 
-#: index.php:198
+#: index.php:213
 msgid "Older than one week"
 msgstr "По-старо от 1 седмица"
 
-#: index.php:201
+#: index.php:216
 msgid "Older than two weeks"
 msgstr "По-старо от 2 седмици"
 
-#: index.php:217
+#: index.php:232
 msgid "Communication problem with server."
 msgstr "Комуникационен проблем със сървъра."
 
-#: index.php:223
+#: index.php:238
 msgid "Actions..."
 msgstr "Действия..."
 
-#: index.php:225
+#: index.php:240
 msgid "Preferences..."
 msgstr "Предпочитания..."
 
-#: index.php:226
+#: index.php:241
 msgid "Search..."
 msgstr "Търсене..."
 
-#: index.php:227
+#: index.php:242
 msgid "Feed actions:"
 msgstr "Действия с хранилки:"
 
-#: index.php:228
+#: index.php:243
 #: classes/handler/public.php:672
 msgid "Subscribe to feed..."
 msgstr "Абониране за хранилка..."
 
-#: index.php:229
+#: index.php:244
 msgid "Edit this feed..."
 msgstr "Редактиране на тази хранилка..."
 
-#: index.php:230
+#: index.php:245
 msgid "Rescore feed"
 msgstr "Преточкуване на хранилка"
 
-#: index.php:231
-#: classes/pref/feeds.php:783
-#: classes/pref/feeds.php:1360
+#: index.php:246
+#: classes/pref/feeds.php:785
+#: classes/pref/feeds.php:1364
 #: js/PrefFeedTree.js:74
 msgid "Unsubscribe"
 msgstr "Отписване"
 
-#: index.php:232
+#: index.php:247
 msgid "All feeds:"
 msgstr "Всички хранилки:"
 
-#: index.php:234
+#: index.php:249
 msgid "(Un)hide read feeds"
 msgstr "Показване/скриване на прочетените хранилки"
 
-#: index.php:235
+#: index.php:250
 msgid "Other actions:"
 msgstr "Други действия:"
 
-#: index.php:236
+#: index.php:251
 #: include/functions2.php:76
 msgid "Toggle widescreen mode"
 msgstr "Превключване на широкоекранен режим"
 
-#: index.php:237
+#: index.php:252
 msgid "Create label..."
 msgstr "Създаване на етикет..."
 
-#: index.php:238
+#: index.php:253
 msgid "Create filter..."
 msgstr "Създаване на филтър..."
 
-#: index.php:239
+#: index.php:254
 msgid "Keyboard shortcuts help"
 msgstr "Помощ за клавишни препратки"
 
-#: index.php:248
+#: index.php:263
 msgid "Logout"
 msgstr "Изход"
 
-#: index.php:254
+#: index.php:269
 msgid "Updates are available from Git."
 msgstr "Налични са обновления от Git."
 
 #: prefs.php:33
-#: prefs.php:120
-#: include/functions2.php:104
+#: prefs.php:135
+#: include/functions2.php:105
 #: classes/pref/prefs.php:435
 msgid "Preferences"
 msgstr "Предпочитания"
 
-#: prefs.php:111
+#: prefs.php:126
 msgid "Keyboard shortcuts"
 msgstr "Клавишни препратки"
 
-#: prefs.php:112
+#: prefs.php:127
 msgid "Exit preferences"
 msgstr "Изход от предпочитания"
 
-#: prefs.php:123
+#: prefs.php:138
 #: classes/pref/feeds.php:112
-#: classes/pref/feeds.php:1300
-#: classes/pref/feeds.php:1349
+#: classes/pref/feeds.php:1304
+#: classes/pref/feeds.php:1353
 msgid "Feeds"
 msgstr "Хранилки"
 
-#: prefs.php:126
+#: prefs.php:141
 #: classes/pref/filters.php:248
 msgid "Filters"
 msgstr "Филтри"
 
-#: prefs.php:129
-#: include/functions.php:1256
-#: include/functions.php:1909
+#: prefs.php:144
+#: include/functions.php:1287
+#: include/functions.php:1940
 #: classes/pref/labels.php:90
 msgid "Labels"
 msgstr "Етикети"
 
-#: prefs.php:133
+#: prefs.php:148
 msgid "Users"
 msgstr "Потребители"
 
-#: prefs.php:136
+#: prefs.php:151
 msgid "System"
 msgstr "Система"
 
@@ -481,10 +481,10 @@ msgid "Tiny Tiny RSS data update script."
 msgstr "Tiny Tiny RSS скрипт за обновяване на данните."
 
 #: include/digest.php:109
-#: include/functions.php:1265
-#: include/functions.php:1810
-#: include/functions.php:1895
-#: include/functions.php:1917
+#: include/functions.php:1296
+#: include/functions.php:1841
+#: include/functions.php:1926
+#: include/functions.php:1948
 #: classes/opml.php:421
 #: classes/pref/feeds.php:228
 msgid "Uncategorized"
@@ -501,44 +501,44 @@ msgstr[1] "%d архивирани статии"
 msgid "No feeds found."
 msgstr "Няма намерени хранилки."
 
-#: include/functions.php:958
+#: include/functions.php:989
 #, php-format
 msgid "%d min"
 msgstr ""
 
-#: include/functions.php:1254
-#: include/functions.php:1907
+#: include/functions.php:1285
+#: include/functions.php:1938
 msgid "Special"
 msgstr "Специални"
 
-#: include/functions.php:1758
+#: include/functions.php:1789
 #: classes/pref/filters.php:229
 #: classes/pref/filters.php:507
 msgid "All feeds"
 msgstr "Всички хранилки"
 
-#: include/functions.php:1962
+#: include/functions.php:1993
 msgid "Starred articles"
 msgstr "Статии със звезда"
 
-#: include/functions.php:1964
+#: include/functions.php:1995
 msgid "Published articles"
 msgstr "Публикувани статии"
 
-#: include/functions.php:1966
+#: include/functions.php:1997
 msgid "Fresh articles"
 msgstr "Пресни статии"
 
-#: include/functions.php:1968
-#: include/functions2.php:99
+#: include/functions.php:1999
+#: include/functions2.php:100
 msgid "All articles"
 msgstr "Всички статии"
 
-#: include/functions.php:1970
+#: include/functions.php:2001
 msgid "Archived articles"
 msgstr "Архивирани статии"
 
-#: include/functions.php:1972
+#: include/functions.php:2003
 msgid "Recently read"
 msgstr "Наскоро четени"
 
@@ -678,7 +678,7 @@ msgstr "Изчистване на избора"
 
 #: include/functions2.php:85
 #: classes/pref/feeds.php:555
-#: classes/pref/feeds.php:821
+#: classes/pref/feeds.php:823
 msgid "Feed"
 msgstr "Хранилка"
 
@@ -691,7 +691,7 @@ msgid "Un/hide read feeds"
 msgstr "Показване/скриване на прочетените хранилки"
 
 #: include/functions2.php:88
-#: classes/pref/feeds.php:1352
+#: classes/pref/feeds.php:1356
 msgid "Subscribe to feed"
 msgstr "Абониране за хранилка"
 
@@ -707,140 +707,177 @@ msgid "Reverse headlines"
 msgstr "Обръщане на подредбата"
 
 #: include/functions2.php:92
+msgid "Toggle headline grouping"
+msgstr ""
+
+#: include/functions2.php:93
 msgid "Debug feed update"
 msgstr "Дебъгване обновяването на хранилка"
 
-#: include/functions2.php:93
+#: include/functions2.php:94
 #, fuzzy
 msgid "Debug viewfeed()"
 msgstr "Дебъгване обновяването на хранилка"
 
-#: include/functions2.php:94
+#: include/functions2.php:95
 #: js/FeedTree.js:182
 msgid "Mark all feeds as read"
 msgstr "Отбелязване на всички хранилки като прочетени"
 
-#: include/functions2.php:95
+#: include/functions2.php:96
 msgid "Un/collapse current category"
 msgstr "Свиване/разгъване на текущата категория"
 
-#: include/functions2.php:96
+#: include/functions2.php:97
 msgid "Toggle combined mode"
 msgstr "Превключване на комбиниран режим"
 
-#: include/functions2.php:97
+#: include/functions2.php:98
 msgid "Toggle auto expand in combined mode"
 msgstr "Превключване авто разтягане в комбиниран режим"
 
-#: include/functions2.php:98
+#: include/functions2.php:99
 msgid "Go to"
 msgstr "Отиди до"
 
-#: include/functions2.php:100
+#: include/functions2.php:101
 msgid "Fresh"
 msgstr "Опресняване"
 
-#: include/functions2.php:103
-#: js/tt-rss.js:466
-#: js/tt-rss.js:650
+#: include/functions2.php:104
+#: js/tt-rss.js:497
+#: js/tt-rss.js:673
 msgid "Tag cloud"
 msgstr "Облак с тагове"
 
-#: include/functions2.php:105
+#: include/functions2.php:106
 msgid "Other"
 msgstr "Други"
 
-#: include/functions2.php:106
+#: include/functions2.php:107
 #: classes/pref/labels.php:267
 msgid "Create label"
 msgstr "Създаване на етикет"
 
-#: include/functions2.php:107
+#: include/functions2.php:108
 #: classes/pref/filters.php:753
 msgid "Create filter"
 msgstr "Създаване на филтър"
 
-#: include/functions2.php:108
+#: include/functions2.php:109
 msgid "Un/collapse sidebar"
 msgstr "Прибиране/изваждане на страничния панел"
 
-#: include/functions2.php:109
+#: include/functions2.php:110
 msgid "Show help dialog"
 msgstr "Показване на помощен диалог"
 
-#: include/functions2.php:663
+#: include/functions2.php:665
 #, php-format
 msgid "Search results: %s"
 msgstr "Резултати от търсенето: %s"
 
-#: include/functions2.php:1317
+#: include/functions2.php:1330
 #: classes/feeds.php:749
 msgid "comment"
 msgid_plural "comments"
 msgstr[0] "коментар"
 msgstr[1] "коментара"
 
-#: include/functions2.php:1321
+#: include/functions2.php:1334
 #: classes/feeds.php:753
 msgid "comments"
 msgstr "коментари"
 
-#: include/functions2.php:1347
+#: include/functions2.php:1360
 msgid " - "
 msgstr " - "
 
-#: include/functions2.php:1380
-#: include/functions2.php:1631
+#: include/functions2.php:1393
+#: include/functions2.php:1644
 #: classes/article.php:311
 msgid "no tags"
 msgstr "няма тагове"
 
-#: include/functions2.php:1390
+#: include/functions2.php:1403
 #: classes/feeds.php:735
 msgid "Edit tags for this article"
 msgstr "Редактиране на таговете за тази статия"
 
-#: include/functions2.php:1422
+#: include/functions2.php:1435
 #: classes/feeds.php:682
 msgid "Originally from:"
 msgstr "Оригинално от:"
 
-#: include/functions2.php:1435
+#: include/functions2.php:1448
 #: classes/pref/feeds.php:574
 #: classes/feeds.php:695
 msgid "Feed URL"
 msgstr "URL на хранилка"
 
-#: include/functions2.php:1472
+#: include/functions2.php:1485
 #: classes/backend.php:105
 #: classes/dlg.php:37
 #: classes/dlg.php:60
 #: classes/dlg.php:93
 #: classes/dlg.php:159
 #: classes/dlg.php:186
-#: classes/pref/feeds.php:1654
-#: classes/pref/feeds.php:1720
+#: classes/pref/feeds.php:1658
+#: classes/pref/feeds.php:1724
 #: classes/pref/filters.php:204
 #: classes/pref/prefs.php:1105
 #: plugins/af_psql_trgm/init.php:102
 #: plugins/import_export/init.php:415
-#: plugins/import_export/init.php:460
+#: plugins/import_export/init.php:461
 #: plugins/share/init.php:121
 msgid "Close this window"
 msgstr "Затваряне на този прозорец"
 
-#: include/functions2.php:1669
+#: include/functions2.php:1682
 msgid "(edit note)"
 msgstr "(редактиране на бележка)"
 
-#: include/functions2.php:1924
+#: include/functions2.php:1937
 msgid "unknown type"
 msgstr "незнаен вид"
 
-#: include/functions2.php:2001
+#: include/functions2.php:2014
 msgid "Attachments"
 msgstr "Прикачени"
 
+#: include/functions2.php:2456
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: include/functions2.php:2457
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr ""
+
+#: include/functions2.php:2458
+msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
+msgstr ""
+
+#: include/functions2.php:2459
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: include/functions2.php:2460
+#, fuzzy
+msgid "No file was uploaded"
+msgstr "Няма качени файлове."
+
+#: include/functions2.php:2461
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: include/functions2.php:2462
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: include/functions2.php:2463
+msgid "A PHP extension stopped the file upload."
+msgstr ""
+
 #: include/login_form.php:197
 #: classes/handler/public.php:569
 #: classes/handler/public.php:824
@@ -907,8 +944,8 @@ msgstr "Тагове за тази статия (разделени със за
 #: classes/article.php:222
 #: classes/pref/labels.php:79
 #: classes/pref/users.php:98
-#: classes/pref/feeds.php:799
-#: classes/pref/feeds.php:939
+#: classes/pref/feeds.php:801
+#: classes/pref/feeds.php:943
 #: classes/pref/filters.php:485
 #: classes/pref/prefs.php:989
 #: plugins/instances/init.php:245
@@ -926,17 +963,17 @@ msgstr "Запазване"
 #: classes/handler/public.php:580
 #: classes/pref/labels.php:81
 #: classes/pref/users.php:100
-#: classes/pref/feeds.php:800
-#: classes/pref/feeds.php:942
-#: classes/pref/feeds.php:1860
+#: classes/pref/feeds.php:802
+#: classes/pref/feeds.php:946
+#: classes/pref/feeds.php:1865
 #: classes/pref/filters.php:488
 #: classes/pref/filters.php:902
 #: classes/pref/filters.php:983
 #: classes/pref/filters.php:1076
 #: classes/pref/prefs.php:991
-#: classes/feeds.php:1098
-#: classes/feeds.php:1148
-#: classes/feeds.php:1185
+#: classes/feeds.php:1100
+#: classes/feeds.php:1150
+#: classes/feeds.php:1187
 #: plugins/instances/init.php:248
 #: plugins/instances/init.php:436
 #: plugins/note/init.php:53
@@ -992,7 +1029,6 @@ msgid "Processing category: %s"
 msgstr "Обработка на категория: %s"
 
 #: classes/opml.php:470
-#: plugins/import_export/init.php:428
 #, php-format
 msgid "Upload failed with error code %d"
 msgstr "Качването се провали с код за грешка \"%d\""
@@ -1210,9 +1246,9 @@ msgstr "Създаден етикет <b>%s</b>"
 
 #: classes/pref/labels.php:258
 #: classes/pref/users.php:334
-#: classes/pref/feeds.php:1340
-#: classes/pref/feeds.php:1602
-#: classes/pref/feeds.php:1666
+#: classes/pref/feeds.php:1344
+#: classes/pref/feeds.php:1606
+#: classes/pref/feeds.php:1670
 #: classes/pref/filters.php:359
 #: classes/pref/filters.php:407
 #: classes/pref/filters.php:744
@@ -1225,9 +1261,9 @@ msgstr "Избиране"
 
 #: classes/pref/labels.php:261
 #: classes/pref/users.php:337
-#: classes/pref/feeds.php:1343
-#: classes/pref/feeds.php:1605
-#: classes/pref/feeds.php:1669
+#: classes/pref/feeds.php:1347
+#: classes/pref/feeds.php:1609
+#: classes/pref/feeds.php:1673
 #: classes/pref/filters.php:362
 #: classes/pref/filters.php:410
 #: classes/pref/filters.php:747
@@ -1241,9 +1277,9 @@ msgstr "Всички"
 
 #: classes/pref/labels.php:263
 #: classes/pref/users.php:339
-#: classes/pref/feeds.php:1345
-#: classes/pref/feeds.php:1607
-#: classes/pref/feeds.php:1671
+#: classes/pref/feeds.php:1349
+#: classes/pref/feeds.php:1611
+#: classes/pref/feeds.php:1675
 #: classes/pref/filters.php:364
 #: classes/pref/filters.php:412
 #: classes/pref/filters.php:749
@@ -1257,10 +1293,10 @@ msgstr "Нищо"
 
 #: classes/pref/labels.php:270
 #: classes/pref/users.php:348
-#: classes/pref/feeds.php:765
+#: classes/pref/feeds.php:767
 #: classes/pref/filters.php:478
 #: classes/pref/filters.php:766
-#: classes/feeds.php:1147
+#: classes/feeds.php:1149
 #: plugins/instances/init.php:294
 msgid "Remove"
 msgstr "Премахване"
@@ -1282,7 +1318,7 @@ msgstr "Редактиране на правило"
 
 #: classes/pref/users.php:56
 #: classes/pref/feeds.php:637
-#: classes/pref/feeds.php:876
+#: classes/pref/feeds.php:878
 #: classes/feeds.php:1070
 msgid "Authentication"
 msgstr "Автентикация"
@@ -1292,8 +1328,8 @@ msgid "Access level: "
 msgstr "Ниво на достъп:"
 
 #: classes/pref/users.php:77
-#: classes/pref/feeds.php:665
-#: classes/pref/feeds.php:892
+#: classes/pref/feeds.php:667
+#: classes/pref/feeds.php:896
 msgid "Options"
 msgstr "Опции"
 
@@ -1359,10 +1395,10 @@ msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] Известие за смяна на парола"
 
 #: classes/pref/users.php:324
-#: classes/pref/feeds.php:1336
+#: classes/pref/feeds.php:1340
 #: classes/pref/filters.php:740
-#: classes/feeds.php:1118
-#: classes/feeds.php:1184
+#: classes/feeds.php:1120
+#: classes/feeds.php:1186
 #: js/tt-rss.js:174
 msgid "Search"
 msgstr "Търсене"
@@ -1379,8 +1415,8 @@ msgstr "Редактиране"
 
 #: classes/pref/users.php:397
 #: classes/pref/feeds.php:643
-#: classes/pref/feeds.php:880
-#: classes/pref/feeds.php:1838
+#: classes/pref/feeds.php:882
+#: classes/pref/feeds.php:1842
 #: classes/feeds.php:1074
 msgid "Login"
 msgstr "Потребител"
@@ -1459,251 +1495,251 @@ msgid "Feed Title"
 msgstr "Заглавие на хранилка"
 
 #: classes/pref/feeds.php:595
-#: classes/pref/feeds.php:828
-#: classes/pref/feeds.php:1824
+#: classes/pref/feeds.php:830
+#: classes/pref/feeds.php:1828
 #: classes/feeds.php:1050
 msgid "Place in category:"
 msgstr "Поставяне в категория:"
 
 #: classes/pref/feeds.php:608
-#: classes/pref/feeds.php:842
+#: classes/pref/feeds.php:844
 #, fuzzy
 msgid "Language:"
 msgstr "Език"
 
 #: classes/pref/feeds.php:615
-#: classes/pref/feeds.php:851
+#: classes/pref/feeds.php:853
 msgid "Update"
 msgstr "Обновяване"
 
 #: classes/pref/feeds.php:630
-#: classes/pref/feeds.php:867
+#: classes/pref/feeds.php:869
 msgid "Article purging:"
 msgstr "Изтриване на статия:"
 
-#: classes/pref/feeds.php:656
-#: classes/pref/feeds.php:886
-#: classes/pref/feeds.php:1841
+#: classes/pref/feeds.php:658
+#: classes/pref/feeds.php:890
+#: classes/pref/feeds.php:1845
 #: classes/pref/prefs.php:245
-#: classes/feeds.php:1077
+#: classes/feeds.php:1078
 msgid "Password"
 msgstr "Парола"
 
-#: classes/pref/feeds.php:660
+#: classes/pref/feeds.php:662
 msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
 msgstr "<b>Съвет:</b> трябва да попълните информацията Ви за вход, ако хранилката изисква автентикация, с изключение на Twitter хранилките."
 
-#: classes/pref/feeds.php:679
-#: classes/pref/feeds.php:896
+#: classes/pref/feeds.php:681
+#: classes/pref/feeds.php:900
 msgid "Hide from Popular feeds"
 msgstr "Скриване от \"Популярни хранилки\""
 
-#: classes/pref/feeds.php:691
-#: classes/pref/feeds.php:902
+#: classes/pref/feeds.php:693
+#: classes/pref/feeds.php:906
 msgid "Include in e-mail digest"
 msgstr "Включване в e-mail справката"
 
-#: classes/pref/feeds.php:704
-#: classes/pref/feeds.php:908
+#: classes/pref/feeds.php:706
+#: classes/pref/feeds.php:912
 msgid "Always display image attachments"
 msgstr "Винаги да се показват прикачените изображения"
 
-#: classes/pref/feeds.php:717
-#: classes/pref/feeds.php:916
+#: classes/pref/feeds.php:719
+#: classes/pref/feeds.php:920
 msgid "Do not embed images"
 msgstr "Да не се влагат изображения"
 
-#: classes/pref/feeds.php:730
-#: classes/pref/feeds.php:924
+#: classes/pref/feeds.php:732
+#: classes/pref/feeds.php:928
 msgid "Cache images locally"
 msgstr "Локално кеширане на изображенията"
 
-#: classes/pref/feeds.php:742
-#: classes/pref/feeds.php:930
+#: classes/pref/feeds.php:744
+#: classes/pref/feeds.php:934
 msgid "Mark updated articles as unread"
 msgstr "Отбелязване на обновените статии като нечетени"
 
-#: classes/pref/feeds.php:746
+#: classes/pref/feeds.php:748
 msgid "Icon"
 msgstr "Икона"
 
-#: classes/pref/feeds.php:763
+#: classes/pref/feeds.php:765
 msgid "Replace"
 msgstr "Замяна"
 
-#: classes/pref/feeds.php:770
+#: classes/pref/feeds.php:772
 #: classes/pref/prefs.php:706
 msgid "Plugins"
 msgstr "Добавки"
 
-#: classes/pref/feeds.php:790
+#: classes/pref/feeds.php:792
 msgid "Resubscribe to push updates"
 msgstr "Преабониране за прокарване на обновления"
 
-#: classes/pref/feeds.php:797
+#: classes/pref/feeds.php:799
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr "Нулиране статуса на PubSubHubbub абонамента за хранилки с позволено прокарване."
 
-#: classes/pref/feeds.php:1203
-#: classes/pref/feeds.php:1256
+#: classes/pref/feeds.php:1207
+#: classes/pref/feeds.php:1260
 msgid "All done."
 msgstr "Готово."
 
-#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1315
 msgid "Feeds with errors"
 msgstr "Хранилки с грешки"
 
-#: classes/pref/feeds.php:1318
+#: classes/pref/feeds.php:1322
 msgid "Inactive feeds"
 msgstr "Неактивни хранилки"
 
-#: classes/pref/feeds.php:1354
+#: classes/pref/feeds.php:1358
 msgid "Edit selected feeds"
 msgstr "Редактиране на избраните хранилки"
 
-#: classes/pref/feeds.php:1356
-#: classes/pref/feeds.php:1370
+#: classes/pref/feeds.php:1360
+#: classes/pref/feeds.php:1374
 #: classes/pref/filters.php:762
 msgid "Reset sort order"
 msgstr "Нулиране на подредбата"
 
-#: classes/pref/feeds.php:1358
+#: classes/pref/feeds.php:1362
 #: js/prefs.js:1737
 msgid "Batch subscribe"
 msgstr "Партидно абониране"
 
-#: classes/pref/feeds.php:1365
+#: classes/pref/feeds.php:1369
 msgid "Categories"
 msgstr "Категории"
 
-#: classes/pref/feeds.php:1368
+#: classes/pref/feeds.php:1372
 msgid "Add category"
 msgstr "Добавяне на категория"
 
-#: classes/pref/feeds.php:1372
+#: classes/pref/feeds.php:1376
 msgid "Remove selected"
 msgstr "Премахване на избраното"
 
-#: classes/pref/feeds.php:1383
+#: classes/pref/feeds.php:1387
 msgid "More actions..."
 msgstr "Още действия..."
 
-#: classes/pref/feeds.php:1387
+#: classes/pref/feeds.php:1391
 msgid "Manual purge"
 msgstr "Ръчно изтриване"
 
-#: classes/pref/feeds.php:1391
+#: classes/pref/feeds.php:1395
 msgid "Clear feed data"
 msgstr "Изчистване данните на хранилката"
 
-#: classes/pref/feeds.php:1392
+#: classes/pref/feeds.php:1396
 #: classes/pref/filters.php:770
 msgid "Rescore articles"
 msgstr "Преточкуване на статии"
 
-#: classes/pref/feeds.php:1444
+#: classes/pref/feeds.php:1448
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1446
+#: classes/pref/feeds.php:1450
 msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
 msgstr "Чрез OPML можете да изнасяте и внасяте Вашите хранилки, филтри, етикети и Tiny Tiny RSS настройки."
 
-#: classes/pref/feeds.php:1447
+#: classes/pref/feeds.php:1451
 msgid "Only main settings profile can be migrated using OPML."
 msgstr "Само основните настройки на профила могат да се мигрират чрез OPML."
 
-#: classes/pref/feeds.php:1460
+#: classes/pref/feeds.php:1464
 msgid "Import my OPML"
 msgstr "Внасяне на мой OPML"
 
-#: classes/pref/feeds.php:1466
+#: classes/pref/feeds.php:1470
 msgid "Filename:"
 msgstr "Име на файл:"
 
-#: classes/pref/feeds.php:1468
+#: classes/pref/feeds.php:1472
 msgid "Include settings"
 msgstr "Включително настройките"
 
-#: classes/pref/feeds.php:1472
+#: classes/pref/feeds.php:1476
 msgid "Export OPML"
 msgstr "Изнасяне на OPML"
 
-#: classes/pref/feeds.php:1476
+#: classes/pref/feeds.php:1480
 msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
 msgstr "Вашият OPML може да се публикува публично и всеки, който знае долния URL, може да се абонира."
 
-#: classes/pref/feeds.php:1480
+#: classes/pref/feeds.php:1484
 msgid "Public OPML URL"
 msgstr "Публичен OPML URL"
 
-#: classes/pref/feeds.php:1481
+#: classes/pref/feeds.php:1485
 msgid "Display published OPML URL"
 msgstr "Показване на публикувания OPML URL"
 
-#: classes/pref/feeds.php:1490
+#: classes/pref/feeds.php:1494
 msgid "Firefox integration"
 msgstr "Firefox интеграция"
 
-#: classes/pref/feeds.php:1492
+#: classes/pref/feeds.php:1496
 msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
 msgstr "Този Tiny Tiny RSS сайт може да се използва като четец на хранилки във Firefox чрез избиране на връзката по-долу."
 
-#: classes/pref/feeds.php:1499
+#: classes/pref/feeds.php:1503
 msgid "Click here to register this site as a feed reader."
 msgstr "Кликнете тук, за да регистрирате този сайт като четец на хранилки."
 
-#: classes/pref/feeds.php:1507
+#: classes/pref/feeds.php:1511
 msgid "Published & shared articles / Generated feeds"
 msgstr "Публикувани и споделени статии / Генерирани хранилки"
 
-#: classes/pref/feeds.php:1509
+#: classes/pref/feeds.php:1513
 msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
 msgstr "Публикуваните статии са изнесени като публична RSS хранилка и всеки, който знае указания по-долу URL, може да се абонира."
 
-#: classes/pref/feeds.php:1516
+#: classes/pref/feeds.php:1520
 #: classes/feeds.php:54
 #: classes/feeds.php:134
 msgid "View as RSS"
 msgstr "Преглед като RSS"
 
-#: classes/pref/feeds.php:1517
+#: classes/pref/feeds.php:1521
 msgid "Display URL"
 msgstr "Показване на URL"
 
-#: classes/pref/feeds.php:1520
+#: classes/pref/feeds.php:1524
 msgid "Clear all generated URLs"
 msgstr "Изчистване на всички генерирани URL-и"
 
-#: classes/pref/feeds.php:1598
+#: classes/pref/feeds.php:1602
 msgid "These feeds have not been updated with new content for 3 months (oldest first):"
 msgstr "Тези хранилки не са обновявани с ново съдържание от 3 месеца (най-старите отгоре):"
 
-#: classes/pref/feeds.php:1632
-#: classes/pref/feeds.php:1696
+#: classes/pref/feeds.php:1636
+#: classes/pref/feeds.php:1700
 msgid "Click to edit feed"
 msgstr "Клик за редактиране на хранилка"
 
-#: classes/pref/feeds.php:1650
-#: classes/pref/feeds.php:1716
+#: classes/pref/feeds.php:1654
+#: classes/pref/feeds.php:1720
 msgid "Unsubscribe from selected feeds"
 msgstr "Отписване от избраните хранилки"
 
-#: classes/pref/feeds.php:1821
+#: classes/pref/feeds.php:1825
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr "Добавете по една валидна RSS хранилка на ред (не се прави засичане на хранилки)"
 
-#: classes/pref/feeds.php:1830
+#: classes/pref/feeds.php:1834
 msgid "Feeds to subscribe, One per line"
 msgstr "Хранилки за абониране. По една на ред"
 
-#: classes/pref/feeds.php:1852
+#: classes/pref/feeds.php:1857
 msgid "Feeds require authentication."
 msgstr "Хранилките изискват автентикация."
 
-#: classes/pref/feeds.php:1859
-#: classes/feeds.php:1092
-#: classes/feeds.php:1146
+#: classes/pref/feeds.php:1864
+#: classes/feeds.php:1094
+#: classes/feeds.php:1148
 msgid "Subscribe"
 msgstr "Абониране"
 
@@ -1786,7 +1822,7 @@ msgid "on field"
 msgstr "върху поле"
 
 #: classes/pref/filters.php:962
-#: js/PrefFilterTree.js:61
+#: js/PrefFilterTree.js:64
 msgid "in"
 msgstr "в"
 
@@ -2378,40 +2414,40 @@ msgstr "URL на хранилка/сайт"
 msgid "Available feeds"
 msgstr "Налични хранилки"
 
-#: classes/feeds.php:1087
+#: classes/feeds.php:1089
 msgid "This feed requires authentication."
 msgstr "Тази хранилка изисква автентикация."
 
-#: classes/feeds.php:1095
+#: classes/feeds.php:1097
 msgid "More feeds"
 msgstr "Още хранилки"
 
-#: classes/feeds.php:1122
+#: classes/feeds.php:1124
 msgid "Popular feeds"
 msgstr "Популярни хранилки"
 
-#: classes/feeds.php:1123
+#: classes/feeds.php:1125
 msgid "Feed archive"
 msgstr "Архив с хранилки"
 
-#: classes/feeds.php:1126
+#: classes/feeds.php:1128
 msgid "limit:"
 msgstr "лимит"
 
-#: classes/feeds.php:1158
+#: classes/feeds.php:1160
 msgid "Look for"
 msgstr "Търсене за"
 
-#: classes/feeds.php:1166
+#: classes/feeds.php:1168
 #, php-format
 msgid "in %s"
 msgstr ""
 
-#: classes/feeds.php:1171
+#: classes/feeds.php:1173
 msgid "Used for word stemming"
 msgstr ""
 
-#: classes/feeds.php:1180
+#: classes/feeds.php:1182
 msgid "Search syntax"
 msgstr "Синтаксис на търсенето"
 
@@ -2672,6 +2708,11 @@ msgstr "Неуспех при зареждането на XML документ."
 msgid "Prepare data"
 msgstr "Подготовка на данни"
 
+#: plugins/import_export/init.php:428
+#, fuzzy, php-format
+msgid "Upload failed with error code %d (%s)"
+msgstr "Качването се провали с код за грешка \"%d\""
+
 #: plugins/import_export/init.php:454
 msgid "No file uploaded."
 msgstr "Няма качени файлове."
@@ -2781,7 +2822,7 @@ msgstr "Редактиране на категория"
 msgid "Remove category"
 msgstr "Премахване на категория"
 
-#: js/PrefFilterTree.js:64
+#: js/PrefFilterTree.js:67
 msgid "Inverse"
 msgstr "Обръщане"
 
@@ -2832,7 +2873,7 @@ msgid "Subscription reset."
 msgstr "Нулиране на абонамент."
 
 #: js/functions.js:1311
-#: js/tt-rss.js:682
+#: js/tt-rss.js:705
 #, perl-format
 msgid "Unsubscribe from %s?"
 msgstr "Отписване от \"%s\"?"
@@ -3062,40 +3103,40 @@ msgstr "Отбелязване на всички статии като проч
 msgid "Marking all feeds as read..."
 msgstr "Отбелязване на всички хранилки като прочетени..."
 
-#: js/tt-rss.js:383
+#: js/tt-rss.js:404
 msgid "Please enable mail plugin first."
 msgstr "Моля, първо активирайте добавката \"mail\"!"
 
-#: js/tt-rss.js:431
+#: js/tt-rss.js:452
 #: js/functions.js:1643
-#: js/tt-rss.js:663
+#: js/tt-rss.js:686
 msgid "You can't edit this kind of feed."
 msgstr "Не можете да редактирате този вид хранилка."
 
-#: js/tt-rss.js:502
+#: js/tt-rss.js:533
 msgid "Please enable embed_original plugin first."
 msgstr "Моля, първо активирайте добавката \"embed_original\"!"
 
-#: js/tt-rss.js:515
-#: js/tt-rss.js:713
+#: js/tt-rss.js:546
+#: js/tt-rss.js:736
 msgid "Widescreen is not available in combined mode."
 msgstr "Няма широк екран в комбиниран режим."
 
-#: js/tt-rss.js:827
+#: js/tt-rss.js:850
 msgid "You can't rescore this kind of feed."
 msgstr "Не можете да преточкувате този тип хранилка."
 
-#: js/tt-rss.js:832
-#: js/tt-rss.js:676
+#: js/tt-rss.js:855
+#: js/tt-rss.js:699
 msgid "Please select some feed first."
 msgstr "Моля, първо изберете някоя хранилка!"
 
-#: js/tt-rss.js:837
+#: js/tt-rss.js:860
 #, perl-format
 msgid "Rescore articles in %s?"
 msgstr "Преточкуване на статиите в \"%s\"?"
 
-#: js/tt-rss.js:840
+#: js/tt-rss.js:863
 msgid "Rescoring articles..."
 msgstr "Преточкуване на статии..."
 
@@ -3269,7 +3310,7 @@ msgstr "Съобщението Ви е изпратено."
 msgid "Sorry, your browser does not support sandboxed iframes."
 msgstr "Съжалявам, браузърът Ви не поддържа тестови iframe-ове."
 
-#: plugins/shorten_expanded/init.js:37
+#: plugins/shorten_expanded/init.js:39
 msgid "Click to expand article"
 msgstr "Клик за разпъване на статия"
 
@@ -3517,7 +3558,7 @@ msgstr "Генерираните URL-и са изчистени."
 msgid "Label Editor"
 msgstr "Редактор на етикети"
 
-#: js/tt-rss.js:671
+#: js/tt-rss.js:694
 msgid "You can't unsubscribe from the category."
 msgstr "Не можете да се отпишете от тази категория."
 
diff --git a/locale/ca_CA/LC_MESSAGES/messages.mo b/locale/ca_CA/LC_MESSAGES/messages.mo
index ce6c4ad53..13078ce74 100644
Binary files a/locale/ca_CA/LC_MESSAGES/messages.mo and b/locale/ca_CA/LC_MESSAGES/messages.mo differ
diff --git a/locale/ca_CA/LC_MESSAGES/messages.po b/locale/ca_CA/LC_MESSAGES/messages.po
index 973f7722d..8ba83b52e 100644
--- a/locale/ca_CA/LC_MESSAGES/messages.po
+++ b/locale/ca_CA/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 22:58+0300\n"
+"POT-Creation-Date: 2016-08-19 18:16+0300\n"
 "PO-Revision-Date: 2009-11-19 09:40+0100\n"
 "Last-Translator: Alfred Galitó <bratac@bratac.cat>\n"
 "Language-Team: Català <bratac@bratac.cat>\n"
@@ -171,13 +171,13 @@ msgstr "No s'ha trobat el canal."
 msgid "Plugin not found"
 msgstr "No s'ha trobat l'usuari"
 
-#: index.php:133
-#: index.php:149
-#: index.php:267
-#: prefs.php:102
+#: index.php:148
+#: index.php:164
+#: index.php:282
+#: prefs.php:117
 #: classes/backend.php:5
 #: classes/pref/labels.php:282
-#: classes/pref/feeds.php:1405
+#: classes/pref/feeds.php:1409
 #: classes/pref/filters.php:779
 #: js/feedlist.js:159
 #: js/functions.js:1293
@@ -189,7 +189,7 @@ msgstr "No s'ha trobat l'usuari"
 #: js/prefs.js:1781
 #: js/prefs.js:1799
 #: js/tt-rss.js:55
-#: js/tt-rss.js:522
+#: js/tt-rss.js:553
 #: js/viewfeed.js:1298
 #: plugins/import_export/import_export.js:17
 #: js/feedlist.js:484
@@ -202,77 +202,77 @@ msgstr "No s'ha trobat l'usuari"
 #: js/prefs.js:1556
 #: js/prefs.js:1572
 #: js/prefs.js:1592
-#: js/tt-rss.js:539
+#: js/tt-rss.js:570
 #: js/viewfeed.js:830
 msgid "Loading, please wait..."
 msgstr "S'està obrint, preneu paciència..."
 
-#: index.php:167
+#: index.php:182
 msgid "Collapse feedlist"
 msgstr "Redueix la llista de canals"
 
-#: index.php:170
+#: index.php:185
 #, fuzzy
 msgid "Show articles"
 msgstr "Articles mémorisés"
 
-#: index.php:173
+#: index.php:188
 msgid "Adaptive"
 msgstr "Adaptatiu"
 
-#: index.php:174
+#: index.php:189
 msgid "All Articles"
 msgstr "Tots els articles"
 
-#: index.php:175
-#: include/functions2.php:101
+#: index.php:190
+#: include/functions2.php:102
 #: classes/feeds.php:104
 msgid "Starred"
 msgstr "Marcats"
 
-#: index.php:176
-#: include/functions2.php:102
+#: index.php:191
+#: include/functions2.php:103
 #: classes/feeds.php:105
 msgid "Published"
 msgstr "Publicats"
 
-#: index.php:177
+#: index.php:192
 #: classes/feeds.php:91
 #: classes/feeds.php:103
 msgid "Unread"
 msgstr "Per llegir"
 
-#: index.php:178
+#: index.php:193
 msgid "With Note"
 msgstr ""
 
-#: index.php:179
+#: index.php:194
 msgid "Ignore Scoring"
 msgstr "Ignora la puntuació"
 
-#: index.php:182
+#: index.php:197
 #, fuzzy
 msgid "Sort articles"
 msgstr "Articles mémorisés"
 
-#: index.php:185
+#: index.php:200
 msgid "Default"
 msgstr "Per defecte"
 
-#: index.php:186
+#: index.php:201
 msgid "Newest first"
 msgstr ""
 
-#: index.php:187
+#: index.php:202
 msgid "Oldest first"
 msgstr ""
 
-#: index.php:188
+#: index.php:203
 msgid "Title"
 msgstr "Títol"
 
-#: index.php:192
-#: index.php:233
+#: index.php:207
+#: index.php:248
 #: include/functions2.php:90
 #: classes/feeds.php:109
 #: js/FeedTree.js:132
@@ -280,137 +280,137 @@ msgstr "Títol"
 msgid "Mark as read"
 msgstr "Marca'l com a llegit"
 
-#: index.php:195
+#: index.php:210
 msgid "Older than one day"
 msgstr ""
 
-#: index.php:198
+#: index.php:213
 msgid "Older than one week"
 msgstr ""
 
-#: index.php:201
+#: index.php:216
 msgid "Older than two weeks"
 msgstr ""
 
-#: index.php:217
+#: index.php:232
 msgid "Communication problem with server."
 msgstr ""
 
-#: index.php:223
+#: index.php:238
 msgid "Actions..."
 msgstr "Accions..."
 
-#: index.php:225
+#: index.php:240
 #, fuzzy
 msgid "Preferences..."
 msgstr "Preferències"
 
-#: index.php:226
+#: index.php:241
 msgid "Search..."
 msgstr "Cerca..."
 
-#: index.php:227
+#: index.php:242
 msgid "Feed actions:"
 msgstr "Accions sobre els canals:"
 
-#: index.php:228
+#: index.php:243
 #: classes/handler/public.php:672
 msgid "Subscribe to feed..."
 msgstr "Subscriviu-vos al canal"
 
-#: index.php:229
+#: index.php:244
 msgid "Edit this feed..."
 msgstr "Edita aquest canal..."
 
-#: index.php:230
+#: index.php:245
 msgid "Rescore feed"
 msgstr "Canvia la puntuació del canal"
 
-#: index.php:231
-#: classes/pref/feeds.php:783
-#: classes/pref/feeds.php:1360
+#: index.php:246
+#: classes/pref/feeds.php:785
+#: classes/pref/feeds.php:1364
 #: js/PrefFeedTree.js:74
 msgid "Unsubscribe"
 msgstr "Dóna't de baixa"
 
-#: index.php:232
+#: index.php:247
 msgid "All feeds:"
 msgstr "Tots els canals"
 
-#: index.php:234
+#: index.php:249
 msgid "(Un)hide read feeds"
 msgstr "Mostra/amaga els canals llegits"
 
-#: index.php:235
+#: index.php:250
 msgid "Other actions:"
 msgstr "Altres accions:"
 
-#: index.php:236
+#: index.php:251
 #: include/functions2.php:76
 #, fuzzy
 msgid "Toggle widescreen mode"
 msgstr "Canvia al mode de reordenació de categories"
 
-#: index.php:237
+#: index.php:252
 msgid "Create label..."
 msgstr "Crea una etiqueta"
 
-#: index.php:238
+#: index.php:253
 msgid "Create filter..."
 msgstr "Crea un filtre..."
 
-#: index.php:239
+#: index.php:254
 #, fuzzy
 msgid "Keyboard shortcuts help"
 msgstr "Dreceres de teclat"
 
-#: index.php:248
+#: index.php:263
 msgid "Logout"
 msgstr "Surt"
 
-#: index.php:254
+#: index.php:269
 msgid "Updates are available from Git."
 msgstr ""
 
 #: prefs.php:33
-#: prefs.php:120
-#: include/functions2.php:104
+#: prefs.php:135
+#: include/functions2.php:105
 #: classes/pref/prefs.php:435
 msgid "Preferences"
 msgstr "Preferències"
 
-#: prefs.php:111
+#: prefs.php:126
 msgid "Keyboard shortcuts"
 msgstr "Dreceres de teclat"
 
-#: prefs.php:112
+#: prefs.php:127
 msgid "Exit preferences"
 msgstr "Surt de les preferències"
 
-#: prefs.php:123
+#: prefs.php:138
 #: classes/pref/feeds.php:112
-#: classes/pref/feeds.php:1300
-#: classes/pref/feeds.php:1349
+#: classes/pref/feeds.php:1304
+#: classes/pref/feeds.php:1353
 msgid "Feeds"
 msgstr "Canals"
 
-#: prefs.php:126
+#: prefs.php:141
 #: classes/pref/filters.php:248
 msgid "Filters"
 msgstr "Filtres"
 
-#: prefs.php:129
-#: include/functions.php:1256
-#: include/functions.php:1909
+#: prefs.php:144
+#: include/functions.php:1287
+#: include/functions.php:1940
 #: classes/pref/labels.php:90
 msgid "Labels"
 msgstr "Etiquetes"
 
-#: prefs.php:133
+#: prefs.php:148
 msgid "Users"
 msgstr "Usuaris"
 
-#: prefs.php:136
+#: prefs.php:151
 msgid "System"
 msgstr ""
 
@@ -493,10 +493,10 @@ msgid "Tiny Tiny RSS data update script."
 msgstr "La base de dades de Tiny Tiny RSS està actualitzada."
 
 #: include/digest.php:109
-#: include/functions.php:1265
-#: include/functions.php:1810
-#: include/functions.php:1895
-#: include/functions.php:1917
+#: include/functions.php:1296
+#: include/functions.php:1841
+#: include/functions.php:1926
+#: include/functions.php:1948
 #: classes/opml.php:421
 #: classes/pref/feeds.php:228
 msgid "Uncategorized"
@@ -513,45 +513,45 @@ msgstr[1] "Articles marcats"
 msgid "No feeds found."
 msgstr "No s'ha trobat cap canal."
 
-#: include/functions.php:958
+#: include/functions.php:989
 #, php-format
 msgid "%d min"
 msgstr ""
 
-#: include/functions.php:1254
-#: include/functions.php:1907
+#: include/functions.php:1285
+#: include/functions.php:1938
 msgid "Special"
 msgstr "Especial"
 
-#: include/functions.php:1758
+#: include/functions.php:1789
 #: classes/pref/filters.php:229
 #: classes/pref/filters.php:507
 msgid "All feeds"
 msgstr "Tots els canals"
 
-#: include/functions.php:1962
+#: include/functions.php:1993
 msgid "Starred articles"
 msgstr "Articles marcats"
 
-#: include/functions.php:1964
+#: include/functions.php:1995
 msgid "Published articles"
 msgstr "Articles publicats"
 
-#: include/functions.php:1966
+#: include/functions.php:1997
 msgid "Fresh articles"
 msgstr "Articles nous"
 
-#: include/functions.php:1968
-#: include/functions2.php:99
+#: include/functions.php:1999
+#: include/functions2.php:100
 msgid "All articles"
 msgstr "Tots els articles"
 
-#: include/functions.php:1970
+#: include/functions.php:2001
 #, fuzzy
 msgid "Archived articles"
 msgstr "Articles mémorisés"
 
-#: include/functions.php:1972
+#: include/functions.php:2003
 msgid "Recently read"
 msgstr ""
 
@@ -711,7 +711,7 @@ msgstr "Buida els articles"
 
 #: include/functions2.php:85
 #: classes/pref/feeds.php:555
-#: classes/pref/feeds.php:821
+#: classes/pref/feeds.php:823
 msgid "Feed"
 msgstr "Canal"
 
@@ -726,7 +726,7 @@ msgid "Un/hide read feeds"
 msgstr "Mostra/amaga els canals llegits"
 
 #: include/functions2.php:88
-#: classes/pref/feeds.php:1352
+#: classes/pref/feeds.php:1356
 msgid "Subscribe to feed"
 msgstr "Subscriu-te al canal"
 
@@ -743,82 +743,86 @@ msgid "Reverse headlines"
 msgstr "Inverteix l'ordre de les capçaleres (les més antigues les primeres)"
 
 #: include/functions2.php:92
+msgid "Toggle headline grouping"
+msgstr ""
+
+#: include/functions2.php:93
 #, fuzzy
 msgid "Debug feed update"
 msgstr "S'ha acabat l'actualització dels canals."
 
-#: include/functions2.php:93
+#: include/functions2.php:94
 #, fuzzy
 msgid "Debug viewfeed()"
 msgstr "S'ha acabat l'actualització dels canals."
 
-#: include/functions2.php:94
+#: include/functions2.php:95
 #: js/FeedTree.js:182
 msgid "Mark all feeds as read"
 msgstr "Marca tots els canals com a llegits"
 
-#: include/functions2.php:95
+#: include/functions2.php:96
 #, fuzzy
 msgid "Un/collapse current category"
 msgstr "Clica-hi per a reduir la categoria"
 
-#: include/functions2.php:96
+#: include/functions2.php:97
 #, fuzzy
 msgid "Toggle combined mode"
 msgstr "Canvia al mode de reordenació de categories"
 
-#: include/functions2.php:97
+#: include/functions2.php:98
 #, fuzzy
 msgid "Toggle auto expand in combined mode"
 msgstr "Canvia al mode de reordenació de categories"
 
-#: include/functions2.php:98
+#: include/functions2.php:99
 #, fuzzy
 msgid "Go to"
 msgstr "Vés a..."
 
-#: include/functions2.php:100
+#: include/functions2.php:101
 #, fuzzy
 msgid "Fresh"
 msgstr "Actualitza"
 
-#: include/functions2.php:103
-#: js/tt-rss.js:466
-#: js/tt-rss.js:650
+#: include/functions2.php:104
+#: js/tt-rss.js:497
+#: js/tt-rss.js:673
 msgid "Tag cloud"
 msgstr "Núvol d'etiquetes"
 
-#: include/functions2.php:105
+#: include/functions2.php:106
 #, fuzzy
 msgid "Other"
 msgstr "Altres:"
 
-#: include/functions2.php:106
+#: include/functions2.php:107
 #: classes/pref/labels.php:267
 msgid "Create label"
 msgstr "Crea una etiqueta"
 
-#: include/functions2.php:107
+#: include/functions2.php:108
 #: classes/pref/filters.php:753
 msgid "Create filter"
 msgstr "Crea un filtre"
 
-#: include/functions2.php:108
+#: include/functions2.php:109
 #, fuzzy
 msgid "Un/collapse sidebar"
 msgstr "Redueix la barra lateral"
 
-#: include/functions2.php:109
+#: include/functions2.php:110
 #, fuzzy
 msgid "Show help dialog"
 msgstr "Mostra el diàleg de cerca"
 
-#: include/functions2.php:663
+#: include/functions2.php:665
 #, fuzzy, php-format
 msgid "Search results: %s"
 msgstr "Resultats de la cerca"
 
-#: include/functions2.php:1317
+#: include/functions2.php:1330
 #: classes/feeds.php:749
 #, fuzzy
 msgid "comment"
@@ -826,71 +830,104 @@ msgid_plural "comments"
 msgstr[0] "comentaris"
 msgstr[1] "comentaris"
 
-#: include/functions2.php:1321
+#: include/functions2.php:1334
 #: classes/feeds.php:753
 msgid "comments"
 msgstr "comentaris"
 
-#: include/functions2.php:1347
+#: include/functions2.php:1360
 msgid " - "
 msgstr " - "
 
-#: include/functions2.php:1380
-#: include/functions2.php:1631
+#: include/functions2.php:1393
+#: include/functions2.php:1644
 #: classes/article.php:311
 msgid "no tags"
 msgstr "sense etiqueta"
 
-#: include/functions2.php:1390
+#: include/functions2.php:1403
 #: classes/feeds.php:735
 msgid "Edit tags for this article"
 msgstr "Edita les etiquetes d'aquest article"
 
-#: include/functions2.php:1422
+#: include/functions2.php:1435
 #: classes/feeds.php:682
 #, fuzzy
 msgid "Originally from:"
 msgstr "Mostra el contingut original de l'article"
 
-#: include/functions2.php:1435
+#: include/functions2.php:1448
 #: classes/pref/feeds.php:574
 #: classes/feeds.php:695
 #, fuzzy
 msgid "Feed URL"
 msgstr "Canal"
 
-#: include/functions2.php:1472
+#: include/functions2.php:1485
 #: classes/backend.php:105
 #: classes/dlg.php:37
 #: classes/dlg.php:60
 #: classes/dlg.php:93
 #: classes/dlg.php:159
 #: classes/dlg.php:186
-#: classes/pref/feeds.php:1654
-#: classes/pref/feeds.php:1720
+#: classes/pref/feeds.php:1658
+#: classes/pref/feeds.php:1724
 #: classes/pref/filters.php:204
 #: classes/pref/prefs.php:1105
 #: plugins/af_psql_trgm/init.php:102
 #: plugins/import_export/init.php:415
-#: plugins/import_export/init.php:460
+#: plugins/import_export/init.php:461
 #: plugins/share/init.php:121
 msgid "Close this window"
 msgstr "Tanca la finestra"
 
-#: include/functions2.php:1669
+#: include/functions2.php:1682
 #, fuzzy
 msgid "(edit note)"
 msgstr "edita la nota"
 
-#: include/functions2.php:1924
+#: include/functions2.php:1937
 msgid "unknown type"
 msgstr "tipus desconegut"
 
-#: include/functions2.php:2001
+#: include/functions2.php:2014
 #, fuzzy
 msgid "Attachments"
 msgstr "Adjuncions:"
 
+#: include/functions2.php:2456
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: include/functions2.php:2457
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr ""
+
+#: include/functions2.php:2458
+msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
+msgstr ""
+
+#: include/functions2.php:2459
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: include/functions2.php:2460
+#, fuzzy
+msgid "No file was uploaded"
+msgstr "No hi ha cap fitxer OPML per a carregar."
+
+#: include/functions2.php:2461
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: include/functions2.php:2462
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: include/functions2.php:2463
+msgid "A PHP extension stopped the file upload."
+msgstr ""
+
 #: include/login_form.php:197
 #: classes/handler/public.php:569
 #: classes/handler/public.php:824
@@ -964,8 +1001,8 @@ msgstr "Etiquetes per aquest article (separades per comes):"
 #: classes/article.php:222
 #: classes/pref/labels.php:79
 #: classes/pref/users.php:98
-#: classes/pref/feeds.php:799
-#: classes/pref/feeds.php:939
+#: classes/pref/feeds.php:801
+#: classes/pref/feeds.php:943
 #: classes/pref/filters.php:485
 #: classes/pref/prefs.php:989
 #: plugins/instances/init.php:245
@@ -983,17 +1020,17 @@ msgstr "Desa"
 #: classes/handler/public.php:580
 #: classes/pref/labels.php:81
 #: classes/pref/users.php:100
-#: classes/pref/feeds.php:800
-#: classes/pref/feeds.php:942
-#: classes/pref/feeds.php:1860
+#: classes/pref/feeds.php:802
+#: classes/pref/feeds.php:946
+#: classes/pref/feeds.php:1865
 #: classes/pref/filters.php:488
 #: classes/pref/filters.php:902
 #: classes/pref/filters.php:983
 #: classes/pref/filters.php:1076
 #: classes/pref/prefs.php:991
-#: classes/feeds.php:1098
-#: classes/feeds.php:1148
-#: classes/feeds.php:1185
+#: classes/feeds.php:1100
+#: classes/feeds.php:1150
+#: classes/feeds.php:1187
 #: plugins/instances/init.php:248
 #: plugins/instances/init.php:436
 #: plugins/note/init.php:53
@@ -1051,7 +1088,6 @@ msgid "Processing category: %s"
 msgstr "Posa'l a la categoria:"
 
 #: classes/opml.php:470
-#: plugins/import_export/init.php:428
 #, php-format
 msgid "Upload failed with error code %d"
 msgstr ""
@@ -1285,9 +1321,9 @@ msgstr "S'ha creat l'etiqueta <b>%s</b> "
 
 #: classes/pref/labels.php:258
 #: classes/pref/users.php:334
-#: classes/pref/feeds.php:1340
-#: classes/pref/feeds.php:1602
-#: classes/pref/feeds.php:1666
+#: classes/pref/feeds.php:1344
+#: classes/pref/feeds.php:1606
+#: classes/pref/feeds.php:1670
 #: classes/pref/filters.php:359
 #: classes/pref/filters.php:407
 #: classes/pref/filters.php:744
@@ -1301,9 +1337,9 @@ msgstr "Selecciona:"
 
 #: classes/pref/labels.php:261
 #: classes/pref/users.php:337
-#: classes/pref/feeds.php:1343
-#: classes/pref/feeds.php:1605
-#: classes/pref/feeds.php:1669
+#: classes/pref/feeds.php:1347
+#: classes/pref/feeds.php:1609
+#: classes/pref/feeds.php:1673
 #: classes/pref/filters.php:362
 #: classes/pref/filters.php:410
 #: classes/pref/filters.php:747
@@ -1317,9 +1353,9 @@ msgstr "Tot"
 
 #: classes/pref/labels.php:263
 #: classes/pref/users.php:339
-#: classes/pref/feeds.php:1345
-#: classes/pref/feeds.php:1607
-#: classes/pref/feeds.php:1671
+#: classes/pref/feeds.php:1349
+#: classes/pref/feeds.php:1611
+#: classes/pref/feeds.php:1675
 #: classes/pref/filters.php:364
 #: classes/pref/filters.php:412
 #: classes/pref/filters.php:749
@@ -1333,10 +1369,10 @@ msgstr "Cap"
 
 #: classes/pref/labels.php:270
 #: classes/pref/users.php:348
-#: classes/pref/feeds.php:765
+#: classes/pref/feeds.php:767
 #: classes/pref/filters.php:478
 #: classes/pref/filters.php:766
-#: classes/feeds.php:1147
+#: classes/feeds.php:1149
 #: plugins/instances/init.php:294
 msgid "Remove"
 msgstr "Suprimeix"
@@ -1358,7 +1394,7 @@ msgstr "Filtres"
 
 #: classes/pref/users.php:56
 #: classes/pref/feeds.php:637
-#: classes/pref/feeds.php:876
+#: classes/pref/feeds.php:878
 #: classes/feeds.php:1070
 msgid "Authentication"
 msgstr "Autenticació"
@@ -1368,8 +1404,8 @@ msgid "Access level: "
 msgstr "Nivell d'accés:"
 
 #: classes/pref/users.php:77
-#: classes/pref/feeds.php:665
-#: classes/pref/feeds.php:892
+#: classes/pref/feeds.php:667
+#: classes/pref/feeds.php:896
 msgid "Options"
 msgstr "Opcions"
 
@@ -1439,10 +1475,10 @@ msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] Notificació de canvi de contrasenya"
 
 #: classes/pref/users.php:324
-#: classes/pref/feeds.php:1336
+#: classes/pref/feeds.php:1340
 #: classes/pref/filters.php:740
-#: classes/feeds.php:1118
-#: classes/feeds.php:1184
+#: classes/feeds.php:1120
+#: classes/feeds.php:1186
 #: js/tt-rss.js:174
 msgid "Search"
 msgstr "Cerca"
@@ -1459,8 +1495,8 @@ msgstr "Edita"
 
 #: classes/pref/users.php:397
 #: classes/pref/feeds.php:643
-#: classes/pref/feeds.php:880
-#: classes/pref/feeds.php:1838
+#: classes/pref/feeds.php:882
+#: classes/pref/feeds.php:1842
 #: classes/feeds.php:1074
 msgid "Login"
 msgstr "Entra"
@@ -1542,277 +1578,277 @@ msgid "Feed Title"
 msgstr "Títol"
 
 #: classes/pref/feeds.php:595
-#: classes/pref/feeds.php:828
-#: classes/pref/feeds.php:1824
+#: classes/pref/feeds.php:830
+#: classes/pref/feeds.php:1828
 #: classes/feeds.php:1050
 msgid "Place in category:"
 msgstr "Posa'l a la categoria:"
 
 #: classes/pref/feeds.php:608
-#: classes/pref/feeds.php:842
+#: classes/pref/feeds.php:844
 #, fuzzy
 msgid "Language:"
 msgstr "Idioma:"
 
 #: classes/pref/feeds.php:615
-#: classes/pref/feeds.php:851
+#: classes/pref/feeds.php:853
 msgid "Update"
 msgstr "Actualitza"
 
 #: classes/pref/feeds.php:630
-#: classes/pref/feeds.php:867
+#: classes/pref/feeds.php:869
 msgid "Article purging:"
 msgstr "Neteja d'articles:"
 
-#: classes/pref/feeds.php:656
-#: classes/pref/feeds.php:886
-#: classes/pref/feeds.php:1841
+#: classes/pref/feeds.php:658
+#: classes/pref/feeds.php:890
+#: classes/pref/feeds.php:1845
 #: classes/pref/prefs.php:245
-#: classes/feeds.php:1077
+#: classes/feeds.php:1078
 #, fuzzy
 msgid "Password"
 msgstr "Contrasenya:"
 
-#: classes/pref/feeds.php:660
+#: classes/pref/feeds.php:662
 msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
 msgstr ""
 
-#: classes/pref/feeds.php:679
-#: classes/pref/feeds.php:896
+#: classes/pref/feeds.php:681
+#: classes/pref/feeds.php:900
 #, fuzzy
 msgid "Hide from Popular feeds"
 msgstr "Amaga-ho de la llista de canals"
 
-#: classes/pref/feeds.php:691
-#: classes/pref/feeds.php:902
+#: classes/pref/feeds.php:693
+#: classes/pref/feeds.php:906
 msgid "Include in e-mail digest"
 msgstr "Inclou-lo en el resum diari per correu electrònic"
 
-#: classes/pref/feeds.php:704
-#: classes/pref/feeds.php:908
+#: classes/pref/feeds.php:706
+#: classes/pref/feeds.php:912
 msgid "Always display image attachments"
 msgstr "Mostra les imatges adjuntes"
 
-#: classes/pref/feeds.php:717
-#: classes/pref/feeds.php:916
+#: classes/pref/feeds.php:719
+#: classes/pref/feeds.php:920
 msgid "Do not embed images"
 msgstr ""
 
-#: classes/pref/feeds.php:730
-#: classes/pref/feeds.php:924
+#: classes/pref/feeds.php:732
+#: classes/pref/feeds.php:928
 msgid "Cache images locally"
 msgstr "Emmagatzema les imatges localment"
 
-#: classes/pref/feeds.php:742
-#: classes/pref/feeds.php:930
+#: classes/pref/feeds.php:744
+#: classes/pref/feeds.php:934
 #, fuzzy
 msgid "Mark updated articles as unread"
 msgstr "Esteu segur que voleu marcar tots els articles com a llegits?"
 
-#: classes/pref/feeds.php:746
+#: classes/pref/feeds.php:748
 #, fuzzy
 msgid "Icon"
 msgstr "Action"
 
-#: classes/pref/feeds.php:763
+#: classes/pref/feeds.php:765
 msgid "Replace"
 msgstr ""
 
-#: classes/pref/feeds.php:770
+#: classes/pref/feeds.php:772
 #: classes/pref/prefs.php:706
 msgid "Plugins"
 msgstr ""
 
-#: classes/pref/feeds.php:790
+#: classes/pref/feeds.php:792
 #, fuzzy
 msgid "Resubscribe to push updates"
 msgstr "Subscrit als canals:"
 
-#: classes/pref/feeds.php:797
+#: classes/pref/feeds.php:799
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr ""
 
-#: classes/pref/feeds.php:1203
-#: classes/pref/feeds.php:1256
+#: classes/pref/feeds.php:1207
+#: classes/pref/feeds.php:1260
 msgid "All done."
 msgstr "Fet!"
 
-#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1315
 #, fuzzy
 msgid "Feeds with errors"
 msgstr "Editor de canals"
 
-#: classes/pref/feeds.php:1318
+#: classes/pref/feeds.php:1322
 #, fuzzy
 msgid "Inactive feeds"
 msgstr "Tots els canals"
 
-#: classes/pref/feeds.php:1354
+#: classes/pref/feeds.php:1358
 #, fuzzy
 msgid "Edit selected feeds"
 msgstr "S'estan purgant els canals seleccionats..."
 
-#: classes/pref/feeds.php:1356
-#: classes/pref/feeds.php:1370
+#: classes/pref/feeds.php:1360
+#: classes/pref/feeds.php:1374
 #: classes/pref/filters.php:762
 #, fuzzy
 msgid "Reset sort order"
 msgstr "Reinicia la contrasenya"
 
-#: classes/pref/feeds.php:1358
+#: classes/pref/feeds.php:1362
 #: js/prefs.js:1737
 #, fuzzy
 msgid "Batch subscribe"
 msgstr "Dóna't de baixa"
 
-#: classes/pref/feeds.php:1365
+#: classes/pref/feeds.php:1369
 #, fuzzy
 msgid "Categories"
 msgstr "Catégorie&nbsp;:"
 
-#: classes/pref/feeds.php:1368
+#: classes/pref/feeds.php:1372
 #, fuzzy
 msgid "Add category"
 msgstr "S'està afegint la categoria..."
 
-#: classes/pref/feeds.php:1372
+#: classes/pref/feeds.php:1376
 #, fuzzy
 msgid "Remove selected"
 msgstr "Esteu segur que voleu suprimir els filtres seleccionats?"
 
-#: classes/pref/feeds.php:1383
+#: classes/pref/feeds.php:1387
 #, fuzzy
 msgid "More actions..."
 msgstr "Accions..."
 
-#: classes/pref/feeds.php:1387
+#: classes/pref/feeds.php:1391
 msgid "Manual purge"
 msgstr "Purger manuellement"
 
-#: classes/pref/feeds.php:1391
+#: classes/pref/feeds.php:1395
 msgid "Clear feed data"
 msgstr "Esborra les dades del canal"
 
-#: classes/pref/feeds.php:1392
+#: classes/pref/feeds.php:1396
 #: classes/pref/filters.php:770
 msgid "Rescore articles"
 msgstr "Canvia la puntuació dels articles"
 
-#: classes/pref/feeds.php:1444
+#: classes/pref/feeds.php:1448
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1446
+#: classes/pref/feeds.php:1450
 msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
 msgstr ""
 
-#: classes/pref/feeds.php:1447
+#: classes/pref/feeds.php:1451
 msgid "Only main settings profile can be migrated using OPML."
 msgstr ""
 
-#: classes/pref/feeds.php:1460
+#: classes/pref/feeds.php:1464
 #, fuzzy
 msgid "Import my OPML"
 msgstr "S'està important OPML (s'està utilitzant l'extensió DOMXML)..."
 
-#: classes/pref/feeds.php:1466
+#: classes/pref/feeds.php:1470
 msgid "Filename:"
 msgstr ""
 
-#: classes/pref/feeds.php:1468
+#: classes/pref/feeds.php:1472
 #, fuzzy
 msgid "Include settings"
 msgstr "Inclou-lo en el resum diari per correu electrònic"
 
-#: classes/pref/feeds.php:1472
+#: classes/pref/feeds.php:1476
 #, fuzzy
 msgid "Export OPML"
 msgstr "Exporta en format OPML"
 
-#: classes/pref/feeds.php:1476
+#: classes/pref/feeds.php:1480
 #, fuzzy
 msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
 msgstr "Els articles publicats s'exporten en un canal RSS públic al qual s'hi pot subscriure qualsevol que en conegui l'adreça URL."
 
-#: classes/pref/feeds.php:1480
+#: classes/pref/feeds.php:1484
 msgid "Public OPML URL"
 msgstr ""
 
-#: classes/pref/feeds.php:1481
+#: classes/pref/feeds.php:1485
 msgid "Display published OPML URL"
 msgstr ""
 
-#: classes/pref/feeds.php:1490
+#: classes/pref/feeds.php:1494
 #, fuzzy
 msgid "Firefox integration"
 msgstr "Integració al Firefox"
 
-#: classes/pref/feeds.php:1492
+#: classes/pref/feeds.php:1496
 msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
 msgstr "Podeu utilitzar Tiny Tiny RSS  com a lector de canals amb el Firefox fent clic en el següent enllaç."
 
-#: classes/pref/feeds.php:1499
+#: classes/pref/feeds.php:1503
 msgid "Click here to register this site as a feed reader."
 msgstr "Feu clic aquí per a desar aquesta pàgina web com un canal."
 
-#: classes/pref/feeds.php:1507
+#: classes/pref/feeds.php:1511
 #, fuzzy
 msgid "Published & shared articles / Generated feeds"
 msgstr "Esteu segur que voleu canviar la puntuació dels articles en les etiquetes personalitzades?"
 
-#: classes/pref/feeds.php:1509
+#: classes/pref/feeds.php:1513
 msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
 msgstr "Els articles publicats s'exporten en un canal RSS públic al qual s'hi pot subscriure qualsevol que en conegui l'adreça URL."
 
-#: classes/pref/feeds.php:1516
+#: classes/pref/feeds.php:1520
 #: classes/feeds.php:54
 #: classes/feeds.php:134
 #, fuzzy
 msgid "View as RSS"
 msgstr "Visualitza les etiquetes"
 
-#: classes/pref/feeds.php:1517
+#: classes/pref/feeds.php:1521
 #, fuzzy
 msgid "Display URL"
 msgstr "afficher les étiquettes"
 
-#: classes/pref/feeds.php:1520
+#: classes/pref/feeds.php:1524
 msgid "Clear all generated URLs"
 msgstr ""
 
-#: classes/pref/feeds.php:1598
+#: classes/pref/feeds.php:1602
 #, fuzzy
 msgid "These feeds have not been updated with new content for 3 months (oldest first):"
 msgstr "Aquests canals no s'han actualitzat degut als següents errors:"
 
-#: classes/pref/feeds.php:1632
-#: classes/pref/feeds.php:1696
+#: classes/pref/feeds.php:1636
+#: classes/pref/feeds.php:1700
 #, fuzzy
 msgid "Click to edit feed"
 msgstr "Feu clic per editar"
 
-#: classes/pref/feeds.php:1650
-#: classes/pref/feeds.php:1716
+#: classes/pref/feeds.php:1654
+#: classes/pref/feeds.php:1720
 #, fuzzy
 msgid "Unsubscribe from selected feeds"
 msgstr "Us voleu donar de baixa dels canals seleccionats?"
 
-#: classes/pref/feeds.php:1821
+#: classes/pref/feeds.php:1825
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr ""
 
-#: classes/pref/feeds.php:1830
+#: classes/pref/feeds.php:1834
 msgid "Feeds to subscribe, One per line"
 msgstr ""
 
-#: classes/pref/feeds.php:1852
+#: classes/pref/feeds.php:1857
 #, fuzzy
 msgid "Feeds require authentication."
 msgstr "Aquest canal requereix autenticació."
 
-#: classes/pref/feeds.php:1859
-#: classes/feeds.php:1092
-#: classes/feeds.php:1146
+#: classes/pref/feeds.php:1864
+#: classes/feeds.php:1094
+#: classes/feeds.php:1148
 msgid "Subscribe"
 msgstr "Subscriu-t'hi"
 
@@ -1900,7 +1936,7 @@ msgid "on field"
 msgstr "al camp"
 
 #: classes/pref/filters.php:962
-#: js/PrefFilterTree.js:61
+#: js/PrefFilterTree.js:64
 msgid "in"
 msgstr "a"
 
@@ -2550,44 +2586,44 @@ msgstr "Canal"
 msgid "Available feeds"
 msgstr "Tots els canals"
 
-#: classes/feeds.php:1087
+#: classes/feeds.php:1089
 msgid "This feed requires authentication."
 msgstr "Aquest canal requereix autenticació."
 
-#: classes/feeds.php:1095
+#: classes/feeds.php:1097
 #, fuzzy
 msgid "More feeds"
 msgstr "Més canals"
 
-#: classes/feeds.php:1122
+#: classes/feeds.php:1124
 #, fuzzy
 msgid "Popular feeds"
 msgstr "mostra els canals"
 
-#: classes/feeds.php:1123
+#: classes/feeds.php:1125
 #, fuzzy
 msgid "Feed archive"
 msgstr "Accions dels canals"
 
-#: classes/feeds.php:1126
+#: classes/feeds.php:1128
 #, fuzzy
 msgid "limit:"
 msgstr "Límit:"
 
-#: classes/feeds.php:1158
+#: classes/feeds.php:1160
 msgid "Look for"
 msgstr "Mirar-ho per"
 
-#: classes/feeds.php:1166
+#: classes/feeds.php:1168
 #, php-format
 msgid "in %s"
 msgstr ""
 
-#: classes/feeds.php:1171
+#: classes/feeds.php:1173
 msgid "Used for word stemming"
 msgstr ""
 
-#: classes/feeds.php:1180
+#: classes/feeds.php:1182
 #, fuzzy
 msgid "Search syntax"
 msgstr "Convertir en intitulé"
@@ -2865,6 +2901,11 @@ msgstr ""
 msgid "Prepare data"
 msgstr "Desa"
 
+#: plugins/import_export/init.php:428
+#, php-format
+msgid "Upload failed with error code %d (%s)"
+msgstr ""
+
 #: plugins/import_export/init.php:454
 #, fuzzy
 msgid "No file uploaded."
@@ -2988,7 +3029,7 @@ msgstr "Edita les categories"
 msgid "Remove category"
 msgstr "Crea una categoria"
 
-#: js/PrefFilterTree.js:64
+#: js/PrefFilterTree.js:67
 #, fuzzy
 msgid "Inverse"
 msgstr "(Invers)"
@@ -3043,7 +3084,7 @@ msgid "Subscription reset."
 msgstr "Subscriviu-vos al canal"
 
 #: js/functions.js:1311
-#: js/tt-rss.js:682
+#: js/tt-rss.js:705
 #, perl-format
 msgid "Unsubscribe from %s?"
 msgstr "Us voleu donar de baixa de %s ?"
@@ -3288,42 +3329,42 @@ msgstr "Esteu segur que voleu marcar tots els articles com a llegits?"
 msgid "Marking all feeds as read..."
 msgstr "S'estan marcant tots els canals com a llegits..."
 
-#: js/tt-rss.js:383
+#: js/tt-rss.js:404
 #, fuzzy
 msgid "Please enable mail plugin first."
 msgstr "Primerament heu de seleccionar un canal."
 
-#: js/tt-rss.js:431
+#: js/tt-rss.js:452
 #: js/functions.js:1643
-#: js/tt-rss.js:663
+#: js/tt-rss.js:686
 msgid "You can't edit this kind of feed."
 msgstr "No podeu editar aquest tipus de canal."
 
-#: js/tt-rss.js:502
+#: js/tt-rss.js:533
 #, fuzzy
 msgid "Please enable embed_original plugin first."
 msgstr "Primerament heu de seleccionar un canal."
 
-#: js/tt-rss.js:515
-#: js/tt-rss.js:713
+#: js/tt-rss.js:546
+#: js/tt-rss.js:736
 msgid "Widescreen is not available in combined mode."
 msgstr ""
 
-#: js/tt-rss.js:827
+#: js/tt-rss.js:850
 msgid "You can't rescore this kind of feed."
 msgstr "No podeu canviar la puntuació d'aquest tipus de canal."
 
-#: js/tt-rss.js:832
-#: js/tt-rss.js:676
+#: js/tt-rss.js:855
+#: js/tt-rss.js:699
 msgid "Please select some feed first."
 msgstr "Primerament heu de seleccionar un canal."
 
-#: js/tt-rss.js:837
+#: js/tt-rss.js:860
 #, perl-format
 msgid "Rescore articles in %s?"
 msgstr "Esteu segur que voleu canviar la puntuació dels articles a %s?"
 
-#: js/tt-rss.js:840
+#: js/tt-rss.js:863
 msgid "Rescoring articles..."
 msgstr "S'estan canviant la puntuació dels articles"
 
@@ -3519,7 +3560,7 @@ msgstr "S'ha modificat la contrasenya."
 msgid "Sorry, your browser does not support sandboxed iframes."
 msgstr ""
 
-#: plugins/shorten_expanded/init.js:37
+#: plugins/shorten_expanded/init.js:39
 msgid "Click to expand article"
 msgstr "Clica-hi per a veure el cos de l'article"
 
@@ -3804,7 +3845,7 @@ msgstr "Canals generats"
 msgid "Label Editor"
 msgstr "Éditeur d'intitulé"
 
-#: js/tt-rss.js:671
+#: js/tt-rss.js:694
 msgid "You can't unsubscribe from the category."
 msgstr "No us podeu donar de baixa de la categoria."
 
diff --git a/locale/cs_CZ/LC_MESSAGES/messages.mo b/locale/cs_CZ/LC_MESSAGES/messages.mo
index 8f5f1df07..3bbf9e0ce 100644
Binary files a/locale/cs_CZ/LC_MESSAGES/messages.mo and b/locale/cs_CZ/LC_MESSAGES/messages.mo differ
diff --git a/locale/cs_CZ/LC_MESSAGES/messages.po b/locale/cs_CZ/LC_MESSAGES/messages.po
index 6e4a0e8ae..fdc3885da 100644
--- a/locale/cs_CZ/LC_MESSAGES/messages.po
+++ b/locale/cs_CZ/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: TT-RSS CZech\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 22:58+0300\n"
+"POT-Creation-Date: 2016-08-19 18:16+0300\n"
 "PO-Revision-Date: 2014-09-09 08:13+0100\n"
 "Last-Translator: Trottel <trottel09@gmail.com>\n"
 "Language-Team: Czech <kde-i18n-doc@kde.org>\n"
@@ -166,13 +166,13 @@ msgstr "Kanál nenalezen."
 msgid "Plugin not found"
 msgstr "Uživatel nebyl nalezen"
 
-#: index.php:133
-#: index.php:149
-#: index.php:267
-#: prefs.php:102
+#: index.php:148
+#: index.php:164
+#: index.php:282
+#: prefs.php:117
 #: classes/backend.php:5
 #: classes/pref/labels.php:282
-#: classes/pref/feeds.php:1405
+#: classes/pref/feeds.php:1409
 #: classes/pref/filters.php:779
 #: js/feedlist.js:159
 #: js/functions.js:1293
@@ -184,7 +184,7 @@ msgstr "Uživatel nebyl nalezen"
 #: js/prefs.js:1781
 #: js/prefs.js:1799
 #: js/tt-rss.js:55
-#: js/tt-rss.js:522
+#: js/tt-rss.js:553
 #: js/viewfeed.js:1298
 #: plugins/import_export/import_export.js:17
 #: js/feedlist.js:484
@@ -197,75 +197,75 @@ msgstr "Uživatel nebyl nalezen"
 #: js/prefs.js:1556
 #: js/prefs.js:1572
 #: js/prefs.js:1592
-#: js/tt-rss.js:539
+#: js/tt-rss.js:570
 #: js/viewfeed.js:830
 msgid "Loading, please wait..."
 msgstr "Načítání, čekejte..."
 
-#: index.php:167
+#: index.php:182
 msgid "Collapse feedlist"
 msgstr "Sbalit seznam kanálů"
 
-#: index.php:170
+#: index.php:185
 msgid "Show articles"
 msgstr "Zobrazit články"
 
-#: index.php:173
+#: index.php:188
 msgid "Adaptive"
 msgstr "Adaptivní"
 
-#: index.php:174
+#: index.php:189
 msgid "All Articles"
 msgstr "Všechny články"
 
-#: index.php:175
-#: include/functions2.php:101
+#: index.php:190
+#: include/functions2.php:102
 #: classes/feeds.php:104
 msgid "Starred"
 msgstr "Označeno hvězdičkou"
 
-#: index.php:176
-#: include/functions2.php:102
+#: index.php:191
+#: include/functions2.php:103
 #: classes/feeds.php:105
 msgid "Published"
 msgstr "Publikováno"
 
-#: index.php:177
+#: index.php:192
 #: classes/feeds.php:91
 #: classes/feeds.php:103
 msgid "Unread"
 msgstr "Nepřečteno"
 
-#: index.php:178
+#: index.php:193
 msgid "With Note"
 msgstr "S poznámkou"
 
-#: index.php:179
+#: index.php:194
 msgid "Ignore Scoring"
 msgstr "Ignorovat hodnocení"
 
-#: index.php:182
+#: index.php:197
 msgid "Sort articles"
 msgstr "Seřadit články"
 
-#: index.php:185
+#: index.php:200
 msgid "Default"
 msgstr "Výchozí"
 
-#: index.php:186
+#: index.php:201
 msgid "Newest first"
 msgstr "Nejdříve nejnovější"
 
-#: index.php:187
+#: index.php:202
 msgid "Oldest first"
 msgstr "Nejdříve nejstarší"
 
-#: index.php:188
+#: index.php:203
 msgid "Title"
 msgstr "Název"
 
-#: index.php:192
-#: index.php:233
+#: index.php:207
+#: index.php:248
 #: include/functions2.php:90
 #: classes/feeds.php:109
 #: js/FeedTree.js:132
@@ -273,134 +273,134 @@ msgstr "Název"
 msgid "Mark as read"
 msgstr "Označit jako přečtené"
 
-#: index.php:195
+#: index.php:210
 msgid "Older than one day"
 msgstr "Starší než jeden den"
 
-#: index.php:198
+#: index.php:213
 msgid "Older than one week"
 msgstr "Starší než jeden týden"
 
-#: index.php:201
+#: index.php:216
 msgid "Older than two weeks"
 msgstr "Starší než dva týdny"
 
-#: index.php:217
+#: index.php:232
 msgid "Communication problem with server."
 msgstr "Chyba při komunikaci se serverem."
 
-#: index.php:223
+#: index.php:238
 msgid "Actions..."
 msgstr "Akce..."
 
-#: index.php:225
+#: index.php:240
 msgid "Preferences..."
 msgstr "Předvolby..."
 
-#: index.php:226
+#: index.php:241
 msgid "Search..."
 msgstr "Hledat..."
 
-#: index.php:227
+#: index.php:242
 msgid "Feed actions:"
 msgstr "Akce kanálů:"
 
-#: index.php:228
+#: index.php:243
 #: classes/handler/public.php:672
 msgid "Subscribe to feed..."
 msgstr "Přihlásit se k odběru kanálu..."
 
-#: index.php:229
+#: index.php:244
 msgid "Edit this feed..."
 msgstr "Upravit tento kanál..."
 
-#: index.php:230
+#: index.php:245
 msgid "Rescore feed"
 msgstr "Přehodnotit kanál"
 
-#: index.php:231
-#: classes/pref/feeds.php:783
-#: classes/pref/feeds.php:1360
+#: index.php:246
+#: classes/pref/feeds.php:785
+#: classes/pref/feeds.php:1364
 #: js/PrefFeedTree.js:74
 msgid "Unsubscribe"
 msgstr "Odhlásit odběr"
 
-#: index.php:232
+#: index.php:247
 msgid "All feeds:"
 msgstr "Všechny kanály:"
 
-#: index.php:234
+#: index.php:249
 msgid "(Un)hide read feeds"
 msgstr "Zobrazit nebo skrýt přečtené kanály"
 
-#: index.php:235
+#: index.php:250
 msgid "Other actions:"
 msgstr "Ostatní akce:"
 
-#: index.php:236
+#: index.php:251
 #: include/functions2.php:76
 msgid "Toggle widescreen mode"
 msgstr "Přepnout širokoúhlý režim"
 
-#: index.php:237
+#: index.php:252
 msgid "Create label..."
 msgstr "Vytvořit štítek..."
 
-#: index.php:238
+#: index.php:253
 msgid "Create filter..."
 msgstr "Vytvořit filtr..."
 
-#: index.php:239
+#: index.php:254
 msgid "Keyboard shortcuts help"
 msgstr "Nápověda ke klávesovým zkratkám"
 
-#: index.php:248
+#: index.php:263
 msgid "Logout"
 msgstr "Odhlásit se"
 
-#: index.php:254
+#: index.php:269
 msgid "Updates are available from Git."
 msgstr ""
 
 #: prefs.php:33
-#: prefs.php:120
-#: include/functions2.php:104
+#: prefs.php:135
+#: include/functions2.php:105
 #: classes/pref/prefs.php:435
 msgid "Preferences"
 msgstr "Předvolby"
 
-#: prefs.php:111
+#: prefs.php:126
 msgid "Keyboard shortcuts"
 msgstr "Klávesové zkratky"
 
-#: prefs.php:112
+#: prefs.php:127
 msgid "Exit preferences"
 msgstr "Opustit předvolby"
 
-#: prefs.php:123
+#: prefs.php:138
 #: classes/pref/feeds.php:112
-#: classes/pref/feeds.php:1300
-#: classes/pref/feeds.php:1349
+#: classes/pref/feeds.php:1304
+#: classes/pref/feeds.php:1353
 msgid "Feeds"
 msgstr "Kanály"
 
-#: prefs.php:126
+#: prefs.php:141
 #: classes/pref/filters.php:248
 msgid "Filters"
 msgstr "Filtry"
 
-#: prefs.php:129
-#: include/functions.php:1256
-#: include/functions.php:1909
+#: prefs.php:144
+#: include/functions.php:1287
+#: include/functions.php:1940
 #: classes/pref/labels.php:90
 msgid "Labels"
 msgstr "Štítky"
 
-#: prefs.php:133
+#: prefs.php:148
 msgid "Users"
 msgstr "Uživatelé"
 
-#: prefs.php:136
+#: prefs.php:151
 msgid "System"
 msgstr "Systém"
 
@@ -482,10 +482,10 @@ msgid "Tiny Tiny RSS data update script."
 msgstr "Skript aktualizace dat Tiny Tiny RSS."
 
 #: include/digest.php:109
-#: include/functions.php:1265
-#: include/functions.php:1810
-#: include/functions.php:1895
-#: include/functions.php:1917
+#: include/functions.php:1296
+#: include/functions.php:1841
+#: include/functions.php:1926
+#: include/functions.php:1948
 #: classes/opml.php:421
 #: classes/pref/feeds.php:228
 msgid "Uncategorized"
@@ -503,44 +503,44 @@ msgstr[2] "%d archivovaných článků"
 msgid "No feeds found."
 msgstr "Nenalezeny žádné kanály."
 
-#: include/functions.php:958
+#: include/functions.php:989
 #, php-format
 msgid "%d min"
 msgstr ""
 
-#: include/functions.php:1254
-#: include/functions.php:1907
+#: include/functions.php:1285
+#: include/functions.php:1938
 msgid "Special"
 msgstr "Speciální"
 
-#: include/functions.php:1758
+#: include/functions.php:1789
 #: classes/pref/filters.php:229
 #: classes/pref/filters.php:507
 msgid "All feeds"
 msgstr "Všechny kanály"
 
-#: include/functions.php:1962
+#: include/functions.php:1993
 msgid "Starred articles"
 msgstr "Články označené hvězdičkou"
 
-#: include/functions.php:1964
+#: include/functions.php:1995
 msgid "Published articles"
 msgstr "Publikované články"
 
-#: include/functions.php:1966
+#: include/functions.php:1997
 msgid "Fresh articles"
 msgstr "Nové články"
 
-#: include/functions.php:1968
-#: include/functions2.php:99
+#: include/functions.php:1999
+#: include/functions2.php:100
 msgid "All articles"
 msgstr "Všechny články"
 
-#: include/functions.php:1970
+#: include/functions.php:2001
 msgid "Archived articles"
 msgstr "Archivované články"
 
-#: include/functions.php:1972
+#: include/functions.php:2003
 msgid "Recently read"
 msgstr "Nedávno přečtené"
 
@@ -680,7 +680,7 @@ msgstr "Zrušit výběr všeho"
 
 #: include/functions2.php:85
 #: classes/pref/feeds.php:555
-#: classes/pref/feeds.php:821
+#: classes/pref/feeds.php:823
 msgid "Feed"
 msgstr "Kanál"
 
@@ -693,7 +693,7 @@ msgid "Un/hide read feeds"
 msgstr "Zobrazit nebo skrýt přečtené kanály"
 
 #: include/functions2.php:88
-#: classes/pref/feeds.php:1352
+#: classes/pref/feeds.php:1356
 msgid "Subscribe to feed"
 msgstr "Přihlásit se k odběru kanálu"
 
@@ -709,73 +709,77 @@ msgid "Reverse headlines"
 msgstr "Obrácené pořadí nadpisů"
 
 #: include/functions2.php:92
+msgid "Toggle headline grouping"
+msgstr ""
+
+#: include/functions2.php:93
 msgid "Debug feed update"
 msgstr "Ladit aktualizaci kanálů"
 
-#: include/functions2.php:93
+#: include/functions2.php:94
 #, fuzzy
 msgid "Debug viewfeed()"
 msgstr "Ladit aktualizaci kanálů"
 
-#: include/functions2.php:94
+#: include/functions2.php:95
 #: js/FeedTree.js:182
 msgid "Mark all feeds as read"
 msgstr "Označit všechny kanály jako přečtené"
 
-#: include/functions2.php:95
+#: include/functions2.php:96
 msgid "Un/collapse current category"
 msgstr "Rozbalit nebo sbalit aktuální kategorii"
 
-#: include/functions2.php:96
+#: include/functions2.php:97
 msgid "Toggle combined mode"
 msgstr "Přepnout kombinovaný režim"
 
-#: include/functions2.php:97
+#: include/functions2.php:98
 msgid "Toggle auto expand in combined mode"
 msgstr "Přepnout automatické rozbalení v kombinovaném režimu"
 
-#: include/functions2.php:98
+#: include/functions2.php:99
 msgid "Go to"
 msgstr "Přejít na"
 
-#: include/functions2.php:100
+#: include/functions2.php:101
 msgid "Fresh"
 msgstr "Nové"
 
-#: include/functions2.php:103
-#: js/tt-rss.js:466
-#: js/tt-rss.js:650
+#: include/functions2.php:104
+#: js/tt-rss.js:497
+#: js/tt-rss.js:673
 msgid "Tag cloud"
 msgstr "Seznam značek"
 
-#: include/functions2.php:105
+#: include/functions2.php:106
 msgid "Other"
 msgstr "Ostatní"
 
-#: include/functions2.php:106
+#: include/functions2.php:107
 #: classes/pref/labels.php:267
 msgid "Create label"
 msgstr "Vytvořit štítek"
 
-#: include/functions2.php:107
+#: include/functions2.php:108
 #: classes/pref/filters.php:753
 msgid "Create filter"
 msgstr "Vytvořit filtr"
 
-#: include/functions2.php:108
+#: include/functions2.php:109
 msgid "Un/collapse sidebar"
 msgstr "Rozbalit nebo sbalit postranní panel"
 
-#: include/functions2.php:109
+#: include/functions2.php:110
 msgid "Show help dialog"
 msgstr "Zobrazit dialogové okno nápovědy"
 
-#: include/functions2.php:663
+#: include/functions2.php:665
 #, php-format
 msgid "Search results: %s"
 msgstr "Výsledky hledání: %s"
 
-#: include/functions2.php:1317
+#: include/functions2.php:1330
 #: classes/feeds.php:749
 msgid "comment"
 msgid_plural "comments"
@@ -783,67 +787,100 @@ msgstr[0] "komentář"
 msgstr[1] "komentáře"
 msgstr[2] "komentáře"
 
-#: include/functions2.php:1321
+#: include/functions2.php:1334
 #: classes/feeds.php:753
 msgid "comments"
 msgstr "komentáře"
 
-#: include/functions2.php:1347
+#: include/functions2.php:1360
 msgid " - "
 msgstr " - "
 
-#: include/functions2.php:1380
-#: include/functions2.php:1631
+#: include/functions2.php:1393
+#: include/functions2.php:1644
 #: classes/article.php:311
 msgid "no tags"
 msgstr "žádné značky"
 
-#: include/functions2.php:1390
+#: include/functions2.php:1403
 #: classes/feeds.php:735
 msgid "Edit tags for this article"
 msgstr "Upravit značky pro tento článek"
 
-#: include/functions2.php:1422
+#: include/functions2.php:1435
 #: classes/feeds.php:682
 msgid "Originally from:"
 msgstr "Původně z:"
 
-#: include/functions2.php:1435
+#: include/functions2.php:1448
 #: classes/pref/feeds.php:574
 #: classes/feeds.php:695
 msgid "Feed URL"
 msgstr "URL kanálu"
 
-#: include/functions2.php:1472
+#: include/functions2.php:1485
 #: classes/backend.php:105
 #: classes/dlg.php:37
 #: classes/dlg.php:60
 #: classes/dlg.php:93
 #: classes/dlg.php:159
 #: classes/dlg.php:186
-#: classes/pref/feeds.php:1654
-#: classes/pref/feeds.php:1720
+#: classes/pref/feeds.php:1658
+#: classes/pref/feeds.php:1724
 #: classes/pref/filters.php:204
 #: classes/pref/prefs.php:1105
 #: plugins/af_psql_trgm/init.php:102
 #: plugins/import_export/init.php:415
-#: plugins/import_export/init.php:460
+#: plugins/import_export/init.php:461
 #: plugins/share/init.php:121
 msgid "Close this window"
 msgstr "Zavřít toto okno"
 
-#: include/functions2.php:1669
+#: include/functions2.php:1682
 msgid "(edit note)"
 msgstr "(upravit poznámku)"
 
-#: include/functions2.php:1924
+#: include/functions2.php:1937
 msgid "unknown type"
 msgstr "neznámý typ"
 
-#: include/functions2.php:2001
+#: include/functions2.php:2014
 msgid "Attachments"
 msgstr "Přílohy"
 
+#: include/functions2.php:2456
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: include/functions2.php:2457
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr ""
+
+#: include/functions2.php:2458
+msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
+msgstr ""
+
+#: include/functions2.php:2459
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: include/functions2.php:2460
+#, fuzzy
+msgid "No file was uploaded"
+msgstr "Nebyl nahrán žádný soubor."
+
+#: include/functions2.php:2461
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: include/functions2.php:2462
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: include/functions2.php:2463
+msgid "A PHP extension stopped the file upload."
+msgstr ""
+
 #: include/login_form.php:197
 #: classes/handler/public.php:569
 #: classes/handler/public.php:824
@@ -910,8 +947,8 @@ msgstr "Značky pro tento článek (oddělené čárkami):"
 #: classes/article.php:222
 #: classes/pref/labels.php:79
 #: classes/pref/users.php:98
-#: classes/pref/feeds.php:799
-#: classes/pref/feeds.php:939
+#: classes/pref/feeds.php:801
+#: classes/pref/feeds.php:943
 #: classes/pref/filters.php:485
 #: classes/pref/prefs.php:989
 #: plugins/instances/init.php:245
@@ -929,17 +966,17 @@ msgstr "Uložit"
 #: classes/handler/public.php:580
 #: classes/pref/labels.php:81
 #: classes/pref/users.php:100
-#: classes/pref/feeds.php:800
-#: classes/pref/feeds.php:942
-#: classes/pref/feeds.php:1860
+#: classes/pref/feeds.php:802
+#: classes/pref/feeds.php:946
+#: classes/pref/feeds.php:1865
 #: classes/pref/filters.php:488
 #: classes/pref/filters.php:902
 #: classes/pref/filters.php:983
 #: classes/pref/filters.php:1076
 #: classes/pref/prefs.php:991
-#: classes/feeds.php:1098
-#: classes/feeds.php:1148
-#: classes/feeds.php:1185
+#: classes/feeds.php:1100
+#: classes/feeds.php:1150
+#: classes/feeds.php:1187
 #: plugins/instances/init.php:248
 #: plugins/instances/init.php:436
 #: plugins/note/init.php:53
@@ -995,7 +1032,6 @@ msgid "Processing category: %s"
 msgstr "Zpracovávání kategorie: %s"
 
 #: classes/opml.php:470
-#: plugins/import_export/init.php:428
 #, php-format
 msgid "Upload failed with error code %d"
 msgstr "Nahrávání selhalo s kódem chyby %d"
@@ -1213,9 +1249,9 @@ msgstr "Vytvořen štítek <b>%s</b>"
 
 #: classes/pref/labels.php:258
 #: classes/pref/users.php:334
-#: classes/pref/feeds.php:1340
-#: classes/pref/feeds.php:1602
-#: classes/pref/feeds.php:1666
+#: classes/pref/feeds.php:1344
+#: classes/pref/feeds.php:1606
+#: classes/pref/feeds.php:1670
 #: classes/pref/filters.php:359
 #: classes/pref/filters.php:407
 #: classes/pref/filters.php:744
@@ -1228,9 +1264,9 @@ msgstr "Vybrat"
 
 #: classes/pref/labels.php:261
 #: classes/pref/users.php:337
-#: classes/pref/feeds.php:1343
-#: classes/pref/feeds.php:1605
-#: classes/pref/feeds.php:1669
+#: classes/pref/feeds.php:1347
+#: classes/pref/feeds.php:1609
+#: classes/pref/feeds.php:1673
 #: classes/pref/filters.php:362
 #: classes/pref/filters.php:410
 #: classes/pref/filters.php:747
@@ -1244,9 +1280,9 @@ msgstr "Vše"
 
 #: classes/pref/labels.php:263
 #: classes/pref/users.php:339
-#: classes/pref/feeds.php:1345
-#: classes/pref/feeds.php:1607
-#: classes/pref/feeds.php:1671
+#: classes/pref/feeds.php:1349
+#: classes/pref/feeds.php:1611
+#: classes/pref/feeds.php:1675
 #: classes/pref/filters.php:364
 #: classes/pref/filters.php:412
 #: classes/pref/filters.php:749
@@ -1260,10 +1296,10 @@ msgstr "Žádný"
 
 #: classes/pref/labels.php:270
 #: classes/pref/users.php:348
-#: classes/pref/feeds.php:765
+#: classes/pref/feeds.php:767
 #: classes/pref/filters.php:478
 #: classes/pref/filters.php:766
-#: classes/feeds.php:1147
+#: classes/feeds.php:1149
 #: plugins/instances/init.php:294
 msgid "Remove"
 msgstr "Odebrat"
@@ -1285,7 +1321,7 @@ msgstr "Upravit pravidlo"
 
 #: classes/pref/users.php:56
 #: classes/pref/feeds.php:637
-#: classes/pref/feeds.php:876
+#: classes/pref/feeds.php:878
 #: classes/feeds.php:1070
 msgid "Authentication"
 msgstr "Ověření"
@@ -1295,8 +1331,8 @@ msgid "Access level: "
 msgstr "Úroveň přístupu: "
 
 #: classes/pref/users.php:77
-#: classes/pref/feeds.php:665
-#: classes/pref/feeds.php:892
+#: classes/pref/feeds.php:667
+#: classes/pref/feeds.php:896
 msgid "Options"
 msgstr "Volby"
 
@@ -1362,10 +1398,10 @@ msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] Oznámení o změně hesla"
 
 #: classes/pref/users.php:324
-#: classes/pref/feeds.php:1336
+#: classes/pref/feeds.php:1340
 #: classes/pref/filters.php:740
-#: classes/feeds.php:1118
-#: classes/feeds.php:1184
+#: classes/feeds.php:1120
+#: classes/feeds.php:1186
 #: js/tt-rss.js:174
 msgid "Search"
 msgstr "Hledat"
@@ -1382,8 +1418,8 @@ msgstr "Upravit"
 
 #: classes/pref/users.php:397
 #: classes/pref/feeds.php:643
-#: classes/pref/feeds.php:880
-#: classes/pref/feeds.php:1838
+#: classes/pref/feeds.php:882
+#: classes/pref/feeds.php:1842
 #: classes/feeds.php:1074
 msgid "Login"
 msgstr "Přihlášení"
@@ -1463,251 +1499,251 @@ msgid "Feed Title"
 msgstr "Název kanálu"
 
 #: classes/pref/feeds.php:595
-#: classes/pref/feeds.php:828
-#: classes/pref/feeds.php:1824
+#: classes/pref/feeds.php:830
+#: classes/pref/feeds.php:1828
 #: classes/feeds.php:1050
 msgid "Place in category:"
 msgstr "Umístit do kategorie:"
 
 #: classes/pref/feeds.php:608
-#: classes/pref/feeds.php:842
+#: classes/pref/feeds.php:844
 #, fuzzy
 msgid "Language:"
 msgstr "Jazyk"
 
 #: classes/pref/feeds.php:615
-#: classes/pref/feeds.php:851
+#: classes/pref/feeds.php:853
 msgid "Update"
 msgstr "Aktualizovat"
 
 #: classes/pref/feeds.php:630
-#: classes/pref/feeds.php:867
+#: classes/pref/feeds.php:869
 msgid "Article purging:"
 msgstr "Čištění článků:"
 
-#: classes/pref/feeds.php:656
-#: classes/pref/feeds.php:886
-#: classes/pref/feeds.php:1841
+#: classes/pref/feeds.php:658
+#: classes/pref/feeds.php:890
+#: classes/pref/feeds.php:1845
 #: classes/pref/prefs.php:245
-#: classes/feeds.php:1077
+#: classes/feeds.php:1078
 msgid "Password"
 msgstr "Heslo"
 
-#: classes/pref/feeds.php:660
+#: classes/pref/feeds.php:662
 msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
 msgstr "<b>Rada:</b> pokud váš kanál vyžaduje ověření, musíte zadat přihlašovací údaje, s výjimkou pro kanály Twitteru."
 
-#: classes/pref/feeds.php:679
-#: classes/pref/feeds.php:896
+#: classes/pref/feeds.php:681
+#: classes/pref/feeds.php:900
 msgid "Hide from Popular feeds"
 msgstr "Skrýt před oblíbenými kanály"
 
-#: classes/pref/feeds.php:691
-#: classes/pref/feeds.php:902
+#: classes/pref/feeds.php:693
+#: classes/pref/feeds.php:906
 msgid "Include in e-mail digest"
 msgstr "Zahrnout do e-mailového výtahu"
 
-#: classes/pref/feeds.php:704
-#: classes/pref/feeds.php:908
+#: classes/pref/feeds.php:706
+#: classes/pref/feeds.php:912
 msgid "Always display image attachments"
 msgstr "Vždy zobrazovat obrázkové přílohy"
 
-#: classes/pref/feeds.php:717
-#: classes/pref/feeds.php:916
+#: classes/pref/feeds.php:719
+#: classes/pref/feeds.php:920
 msgid "Do not embed images"
 msgstr "Nevkládat obrázky"
 
-#: classes/pref/feeds.php:730
-#: classes/pref/feeds.php:924
+#: classes/pref/feeds.php:732
+#: classes/pref/feeds.php:928
 msgid "Cache images locally"
 msgstr "Ukládat obrázky do mezipaměti místně"
 
-#: classes/pref/feeds.php:742
-#: classes/pref/feeds.php:930
+#: classes/pref/feeds.php:744
+#: classes/pref/feeds.php:934
 msgid "Mark updated articles as unread"
 msgstr "Označit aktualizované články jako nepřečtené"
 
-#: classes/pref/feeds.php:746
+#: classes/pref/feeds.php:748
 msgid "Icon"
 msgstr "Ikona"
 
-#: classes/pref/feeds.php:763
+#: classes/pref/feeds.php:765
 msgid "Replace"
 msgstr "Nahradit"
 
-#: classes/pref/feeds.php:770
+#: classes/pref/feeds.php:772
 #: classes/pref/prefs.php:706
 msgid "Plugins"
 msgstr "Moduly"
 
-#: classes/pref/feeds.php:790
+#: classes/pref/feeds.php:792
 msgid "Resubscribe to push updates"
 msgstr "Znovu se přihlásit k odběru pro aktualizace doručené bez vyžádání"
 
-#: classes/pref/feeds.php:797
+#: classes/pref/feeds.php:799
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr "Obnoví stav odběru PubSubHubbub pro kanály s povoleným doručením bez vyžádání."
 
-#: classes/pref/feeds.php:1203
-#: classes/pref/feeds.php:1256
+#: classes/pref/feeds.php:1207
+#: classes/pref/feeds.php:1260
 msgid "All done."
 msgstr "Vše hotovo."
 
-#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1315
 msgid "Feeds with errors"
 msgstr "Kanály s chybami"
 
-#: classes/pref/feeds.php:1318
+#: classes/pref/feeds.php:1322
 msgid "Inactive feeds"
 msgstr "Neaktivní kanály"
 
-#: classes/pref/feeds.php:1354
+#: classes/pref/feeds.php:1358
 msgid "Edit selected feeds"
 msgstr "Upravit vybrané kanály"
 
-#: classes/pref/feeds.php:1356
-#: classes/pref/feeds.php:1370
+#: classes/pref/feeds.php:1360
+#: classes/pref/feeds.php:1374
 #: classes/pref/filters.php:762
 msgid "Reset sort order"
 msgstr "Obnovit pořadí řazení"
 
-#: classes/pref/feeds.php:1358
+#: classes/pref/feeds.php:1362
 #: js/prefs.js:1737
 msgid "Batch subscribe"
 msgstr "Dávkové přihlášení k odběru"
 
-#: classes/pref/feeds.php:1365
+#: classes/pref/feeds.php:1369
 msgid "Categories"
 msgstr "Kategorie"
 
-#: classes/pref/feeds.php:1368
+#: classes/pref/feeds.php:1372
 msgid "Add category"
 msgstr "Přidat kategorii"
 
-#: classes/pref/feeds.php:1372
+#: classes/pref/feeds.php:1376
 msgid "Remove selected"
 msgstr "Odebrat vybrané"
 
-#: classes/pref/feeds.php:1383
+#: classes/pref/feeds.php:1387
 msgid "More actions..."
 msgstr "Více akcí..."
 
-#: classes/pref/feeds.php:1387
+#: classes/pref/feeds.php:1391
 msgid "Manual purge"
 msgstr "Ruční čištění"
 
-#: classes/pref/feeds.php:1391
+#: classes/pref/feeds.php:1395
 msgid "Clear feed data"
 msgstr "Vymazat data kanálu"
 
-#: classes/pref/feeds.php:1392
+#: classes/pref/feeds.php:1396
 #: classes/pref/filters.php:770
 msgid "Rescore articles"
 msgstr "Přehodnotit články"
 
-#: classes/pref/feeds.php:1444
+#: classes/pref/feeds.php:1448
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1446
+#: classes/pref/feeds.php:1450
 msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
 msgstr "Pomocí OPML můžete exportovat a importovat své kanály, filtry, štítky a nastavení Tiny Tiny RSS."
 
-#: classes/pref/feeds.php:1447
+#: classes/pref/feeds.php:1451
 msgid "Only main settings profile can be migrated using OPML."
 msgstr "Pomocí OPML může být migrován pouze profil hlavního nastavení."
 
-#: classes/pref/feeds.php:1460
+#: classes/pref/feeds.php:1464
 msgid "Import my OPML"
 msgstr "Importovat mé OPML"
 
-#: classes/pref/feeds.php:1466
+#: classes/pref/feeds.php:1470
 msgid "Filename:"
 msgstr "Název souboru:"
 
-#: classes/pref/feeds.php:1468
+#: classes/pref/feeds.php:1472
 msgid "Include settings"
 msgstr "Zahrnout nastavení"
 
-#: classes/pref/feeds.php:1472
+#: classes/pref/feeds.php:1476
 msgid "Export OPML"
 msgstr "Exportovat OPML"
 
-#: classes/pref/feeds.php:1476
+#: classes/pref/feeds.php:1480
 msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
 msgstr "Vaše OPML může být publikováno veřejně a odebíráno kýmkoliv, kdo zná následující URL."
 
-#: classes/pref/feeds.php:1480
+#: classes/pref/feeds.php:1484
 msgid "Public OPML URL"
 msgstr "Veřejná URL OPML"
 
-#: classes/pref/feeds.php:1481
+#: classes/pref/feeds.php:1485
 msgid "Display published OPML URL"
 msgstr "Zobrazit URL publikovaných OPML"
 
-#: classes/pref/feeds.php:1490
+#: classes/pref/feeds.php:1494
 msgid "Firefox integration"
 msgstr "Integrace s Firefoxem"
 
-#: classes/pref/feeds.php:1492
+#: classes/pref/feeds.php:1496
 msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
 msgstr "Tato stránka Tiny Tiny RSS může být použita jako Čtečka kanálů Firefox kliknutím na následující odkaz."
 
-#: classes/pref/feeds.php:1499
+#: classes/pref/feeds.php:1503
 msgid "Click here to register this site as a feed reader."
 msgstr "Klikněte sem pro registraci této stránky jako čtečky kanálů."
 
-#: classes/pref/feeds.php:1507
+#: classes/pref/feeds.php:1511
 msgid "Published & shared articles / Generated feeds"
 msgstr "Publikované a sdílené články / Generované kanály"
 
-#: classes/pref/feeds.php:1509
+#: classes/pref/feeds.php:1513
 msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
 msgstr "Publikované články jsou exportovány jako veřejný kanál RSS, který může odebírat kdokoliv, kdo zná níže zadanou URL."
 
-#: classes/pref/feeds.php:1516
+#: classes/pref/feeds.php:1520
 #: classes/feeds.php:54
 #: classes/feeds.php:134
 msgid "View as RSS"
 msgstr "Zobrazit jako RSS"
 
-#: classes/pref/feeds.php:1517
+#: classes/pref/feeds.php:1521
 msgid "Display URL"
 msgstr "Zobrazit URL"
 
-#: classes/pref/feeds.php:1520
+#: classes/pref/feeds.php:1524
 msgid "Clear all generated URLs"
 msgstr "Vymazat všechny vygenerované URL"
 
-#: classes/pref/feeds.php:1598
+#: classes/pref/feeds.php:1602
 msgid "These feeds have not been updated with new content for 3 months (oldest first):"
 msgstr "Tyto kanály nebyly aktualizovány novým obsahem po tři měsíce (nejdříve nejstarší):"
 
-#: classes/pref/feeds.php:1632
-#: classes/pref/feeds.php:1696
+#: classes/pref/feeds.php:1636
+#: classes/pref/feeds.php:1700
 msgid "Click to edit feed"
 msgstr "Klikněte pro úpravu kanálu"
 
-#: classes/pref/feeds.php:1650
-#: classes/pref/feeds.php:1716
+#: classes/pref/feeds.php:1654
+#: classes/pref/feeds.php:1720
 msgid "Unsubscribe from selected feeds"
 msgstr "Odhlásit odběr vybraných kanálů"
 
-#: classes/pref/feeds.php:1821
+#: classes/pref/feeds.php:1825
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr "Přidávejte jeden platný kanál RSS na řádek (neprobíhá detekce kanálu)"
 
-#: classes/pref/feeds.php:1830
+#: classes/pref/feeds.php:1834
 msgid "Feeds to subscribe, One per line"
 msgstr "Kanály k odebírání, jeden na řádek"
 
-#: classes/pref/feeds.php:1852
+#: classes/pref/feeds.php:1857
 msgid "Feeds require authentication."
 msgstr "Kanály vyžadují ověření."
 
-#: classes/pref/feeds.php:1859
-#: classes/feeds.php:1092
-#: classes/feeds.php:1146
+#: classes/pref/feeds.php:1864
+#: classes/feeds.php:1094
+#: classes/feeds.php:1148
 msgid "Subscribe"
 msgstr "Přihlásit se k odběru"
 
@@ -1790,7 +1826,7 @@ msgid "on field"
 msgstr "pole"
 
 #: classes/pref/filters.php:962
-#: js/PrefFilterTree.js:61
+#: js/PrefFilterTree.js:64
 msgid "in"
 msgstr "v"
 
@@ -2385,40 +2421,40 @@ msgstr "Kanál nebo URL stránky"
 msgid "Available feeds"
 msgstr "Dostupné kanály"
 
-#: classes/feeds.php:1087
+#: classes/feeds.php:1089
 msgid "This feed requires authentication."
 msgstr "Tento kanál vyžaduje ověření."
 
-#: classes/feeds.php:1095
+#: classes/feeds.php:1097
 msgid "More feeds"
 msgstr "Více kanálů"
 
-#: classes/feeds.php:1122
+#: classes/feeds.php:1124
 msgid "Popular feeds"
 msgstr "Oblíbené kanály"
 
-#: classes/feeds.php:1123
+#: classes/feeds.php:1125
 msgid "Feed archive"
 msgstr "Archiv kanálů"
 
-#: classes/feeds.php:1126
+#: classes/feeds.php:1128
 msgid "limit:"
 msgstr "omezení:"
 
-#: classes/feeds.php:1158
+#: classes/feeds.php:1160
 msgid "Look for"
 msgstr "Hledat"
 
-#: classes/feeds.php:1166
+#: classes/feeds.php:1168
 #, php-format
 msgid "in %s"
 msgstr ""
 
-#: classes/feeds.php:1171
+#: classes/feeds.php:1173
 msgid "Used for word stemming"
 msgstr ""
 
-#: classes/feeds.php:1180
+#: classes/feeds.php:1182
 msgid "Search syntax"
 msgstr "Syntaxe hledání"
 
@@ -2684,6 +2720,11 @@ msgstr "Nelze načíst dokument XML."
 msgid "Prepare data"
 msgstr "Připravit data"
 
+#: plugins/import_export/init.php:428
+#, fuzzy, php-format
+msgid "Upload failed with error code %d (%s)"
+msgstr "Nahrávání selhalo s kódem chyby %d"
+
 #: plugins/import_export/init.php:454
 msgid "No file uploaded."
 msgstr "Nebyl nahrán žádný soubor."
@@ -2793,7 +2834,7 @@ msgstr "Upravit kategorii"
 msgid "Remove category"
 msgstr "Odebrat kategorii"
 
-#: js/PrefFilterTree.js:64
+#: js/PrefFilterTree.js:67
 msgid "Inverse"
 msgstr "Inverzní"
 
@@ -2844,7 +2885,7 @@ msgid "Subscription reset."
 msgstr "Odběr obnoven."
 
 #: js/functions.js:1311
-#: js/tt-rss.js:682
+#: js/tt-rss.js:705
 #, perl-format
 msgid "Unsubscribe from %s?"
 msgstr "Odhlásit odběr %s?"
@@ -3074,40 +3115,40 @@ msgstr "Označit všechny články jako přečtené?"
 msgid "Marking all feeds as read..."
 msgstr "Označování všech kanálů jako přečtených..."
 
-#: js/tt-rss.js:383
+#: js/tt-rss.js:404
 msgid "Please enable mail plugin first."
 msgstr "Nejdříve povolte modul odesílání e-mailů."
 
-#: js/tt-rss.js:431
+#: js/tt-rss.js:452
 #: js/functions.js:1643
-#: js/tt-rss.js:663
+#: js/tt-rss.js:686
 msgid "You can't edit this kind of feed."
 msgstr "Nemůžete upravit tento druh kanálu."
 
-#: js/tt-rss.js:502
+#: js/tt-rss.js:533
 msgid "Please enable embed_original plugin first."
 msgstr "Nejdříve povolte modul embed_original."
 
-#: js/tt-rss.js:515
-#: js/tt-rss.js:713
+#: js/tt-rss.js:546
+#: js/tt-rss.js:736
 msgid "Widescreen is not available in combined mode."
 msgstr ""
 
-#: js/tt-rss.js:827
+#: js/tt-rss.js:850
 msgid "You can't rescore this kind of feed."
 msgstr "Nemůžete přehodnotit tento druh kanálu."
 
-#: js/tt-rss.js:832
-#: js/tt-rss.js:676
+#: js/tt-rss.js:855
+#: js/tt-rss.js:699
 msgid "Please select some feed first."
 msgstr "Nejdříve vyberte nějaký kanál."
 
-#: js/tt-rss.js:837
+#: js/tt-rss.js:860
 #, perl-format
 msgid "Rescore articles in %s?"
 msgstr "Přehodnotit články v %s?"
 
-#: js/tt-rss.js:840
+#: js/tt-rss.js:863
 msgid "Rescoring articles..."
 msgstr "Přehodnocování článků..."
 
@@ -3288,7 +3329,7 @@ msgstr "Vaše zpráva byla odeslána."
 msgid "Sorry, your browser does not support sandboxed iframes."
 msgstr "Bohužel, váš prohlížeč nepodporuje vložené rámce v izolovaném prostoru."
 
-#: plugins/shorten_expanded/init.js:37
+#: plugins/shorten_expanded/init.js:39
 msgid "Click to expand article"
 msgstr "Klikněte pro rozbalení článku"
 
@@ -3536,7 +3577,7 @@ msgstr "Generované URL vymazány."
 msgid "Label Editor"
 msgstr "Editor štítků"
 
-#: js/tt-rss.js:671
+#: js/tt-rss.js:694
 msgid "You can't unsubscribe from the category."
 msgstr "Nemůžete odhlásit odběr kategorie."
 
diff --git a/locale/da_DK/LC_MESSAGES/messages.mo b/locale/da_DK/LC_MESSAGES/messages.mo
index b59d56f34..87863e643 100644
Binary files a/locale/da_DK/LC_MESSAGES/messages.mo and b/locale/da_DK/LC_MESSAGES/messages.mo differ
diff --git a/locale/da_DK/LC_MESSAGES/messages.po b/locale/da_DK/LC_MESSAGES/messages.po
index b327db0bd..7a9b80ed2 100644
--- a/locale/da_DK/LC_MESSAGES/messages.po
+++ b/locale/da_DK/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tt-rss git\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 22:58+0300\n"
+"POT-Creation-Date: 2016-08-19 18:16+0300\n"
 "Last-Translator: Brendan <brendan@tucows.com>\n"
 "Language-Team: OpenSRS brendan@tucows.com>\n"
 "Language: da_DK\n"
@@ -160,13 +160,13 @@ msgstr "Feed ikke fundet."
 msgid "Plugin not found"
 msgstr "Bruger ikke fundet"
 
-#: index.php:133
-#: index.php:149
-#: index.php:267
-#: prefs.php:102
+#: index.php:148
+#: index.php:164
+#: index.php:282
+#: prefs.php:117
 #: classes/backend.php:5
 #: classes/pref/labels.php:282
-#: classes/pref/feeds.php:1405
+#: classes/pref/feeds.php:1409
 #: classes/pref/filters.php:779
 #: js/feedlist.js:159
 #: js/functions.js:1293
@@ -178,7 +178,7 @@ msgstr "Bruger ikke fundet"
 #: js/prefs.js:1781
 #: js/prefs.js:1799
 #: js/tt-rss.js:55
-#: js/tt-rss.js:522
+#: js/tt-rss.js:553
 #: js/viewfeed.js:1298
 #: plugins/import_export/import_export.js:17
 #: js/feedlist.js:484
@@ -191,75 +191,75 @@ msgstr "Bruger ikke fundet"
 #: js/prefs.js:1556
 #: js/prefs.js:1572
 #: js/prefs.js:1592
-#: js/tt-rss.js:539
+#: js/tt-rss.js:570
 #: js/viewfeed.js:830
 msgid "Loading, please wait..."
 msgstr "Indlæser, vent venligst ..."
 
-#: index.php:167
+#: index.php:182
 msgid "Collapse feedlist"
 msgstr "Skjul feed-liste"
 
-#: index.php:170
+#: index.php:185
 msgid "Show articles"
 msgstr "Vis artikler"
 
-#: index.php:173
+#: index.php:188
 msgid "Adaptive"
 msgstr "Tilpasset"
 
-#: index.php:174
+#: index.php:189
 msgid "All Articles"
 msgstr "Alle artikler"
 
-#: index.php:175
-#: include/functions2.php:101
+#: index.php:190
+#: include/functions2.php:102
 #: classes/feeds.php:104
 msgid "Starred"
 msgstr "Markeret"
 
-#: index.php:176
-#: include/functions2.php:102
+#: index.php:191
+#: include/functions2.php:103
 #: classes/feeds.php:105
 msgid "Published"
 msgstr "Udgivet"
 
-#: index.php:177
+#: index.php:192
 #: classes/feeds.php:91
 #: classes/feeds.php:103
 msgid "Unread"
 msgstr "Ulæst"
 
-#: index.php:178
+#: index.php:193
 msgid "With Note"
 msgstr "Med note"
 
-#: index.php:179
+#: index.php:194
 msgid "Ignore Scoring"
 msgstr "Ignorer resultat"
 
-#: index.php:182
+#: index.php:197
 msgid "Sort articles"
 msgstr "Sorter artikler"
 
-#: index.php:185
+#: index.php:200
 msgid "Default"
 msgstr "Standard"
 
-#: index.php:186
+#: index.php:201
 msgid "Newest first"
 msgstr "Nyeste først"
 
-#: index.php:187
+#: index.php:202
 msgid "Oldest first"
 msgstr "Ældste først"
 
-#: index.php:188
+#: index.php:203
 msgid "Title"
 msgstr "Overskrift"
 
-#: index.php:192
-#: index.php:233
+#: index.php:207
+#: index.php:248
 #: include/functions2.php:90
 #: classes/feeds.php:109
 #: js/FeedTree.js:132
@@ -267,134 +267,134 @@ msgstr "Overskrift"
 msgid "Mark as read"
 msgstr "Marker som læst"
 
-#: index.php:195
+#: index.php:210
 msgid "Older than one day"
 msgstr "Ældre end en dag"
 
-#: index.php:198
+#: index.php:213
 msgid "Older than one week"
 msgstr "Ældre end en uge"
 
-#: index.php:201
+#: index.php:216
 msgid "Older than two weeks"
 msgstr "Ældre end to uger"
 
-#: index.php:217
+#: index.php:232
 msgid "Communication problem with server."
 msgstr "Kommunikationsproblem med server"
 
-#: index.php:223
+#: index.php:238
 msgid "Actions..."
 msgstr "Handlinger ..."
 
-#: index.php:225
+#: index.php:240
 msgid "Preferences..."
 msgstr "Præferencer ..."
 
-#: index.php:226
+#: index.php:241
 msgid "Search..."
 msgstr "Søg ..."
 
-#: index.php:227
+#: index.php:242
 msgid "Feed actions:"
 msgstr "Feed-handlinger:"
 
-#: index.php:228
+#: index.php:243
 #: classes/handler/public.php:672
 msgid "Subscribe to feed..."
 msgstr "Abonner på feedet ..."
 
-#: index.php:229
+#: index.php:244
 msgid "Edit this feed..."
 msgstr "Rediger dette feed"
 
-#: index.php:230
+#: index.php:245
 msgid "Rescore feed"
 msgstr "Gendan feed"
 
-#: index.php:231
-#: classes/pref/feeds.php:783
-#: classes/pref/feeds.php:1360
+#: index.php:246
+#: classes/pref/feeds.php:785
+#: classes/pref/feeds.php:1364
 #: js/PrefFeedTree.js:74
 msgid "Unsubscribe"
 msgstr "Aflys abonnement"
 
-#: index.php:232
+#: index.php:247
 msgid "All feeds:"
 msgstr "Alle feeds:"
 
-#: index.php:234
+#: index.php:249
 msgid "(Un)hide read feeds"
 msgstr "Vis/skjul læste feeds"
 
-#: index.php:235
+#: index.php:250
 msgid "Other actions:"
 msgstr "Andre handlinger:"
 
-#: index.php:236
+#: index.php:251
 #: include/functions2.php:76
 msgid "Toggle widescreen mode"
 msgstr "Skift til widescreen"
 
-#: index.php:237
+#: index.php:252
 msgid "Create label..."
 msgstr "Opret etiket ..."
 
-#: index.php:238
+#: index.php:253
 msgid "Create filter..."
 msgstr "Opret filter ..."
 
-#: index.php:239
+#: index.php:254
 msgid "Keyboard shortcuts help"
 msgstr "Hjælp til tastaturgenveje"
 
-#: index.php:248
+#: index.php:263
 msgid "Logout"
 msgstr "Log af"
 
-#: index.php:254
+#: index.php:269
 msgid "Updates are available from Git."
 msgstr ""
 
 #: prefs.php:33
-#: prefs.php:120
-#: include/functions2.php:104
+#: prefs.php:135
+#: include/functions2.php:105
 #: classes/pref/prefs.php:435
 msgid "Preferences"
 msgstr "Præferencer"
 
-#: prefs.php:111
+#: prefs.php:126
 msgid "Keyboard shortcuts"
 msgstr "Tastaturgenveje"
 
-#: prefs.php:112
+#: prefs.php:127
 msgid "Exit preferences"
 msgstr "Luk præferencer"
 
-#: prefs.php:123
+#: prefs.php:138
 #: classes/pref/feeds.php:112
-#: classes/pref/feeds.php:1300
-#: classes/pref/feeds.php:1349
+#: classes/pref/feeds.php:1304
+#: classes/pref/feeds.php:1353
 msgid "Feeds"
 msgstr "Feeds"
 
-#: prefs.php:126
+#: prefs.php:141
 #: classes/pref/filters.php:248
 msgid "Filters"
 msgstr "Filtre"
 
-#: prefs.php:129
-#: include/functions.php:1256
-#: include/functions.php:1909
+#: prefs.php:144
+#: include/functions.php:1287
+#: include/functions.php:1940
 #: classes/pref/labels.php:90
 msgid "Labels"
 msgstr "Etiketter"
 
-#: prefs.php:133
+#: prefs.php:148
 msgid "Users"
 msgstr "Brugere"
 
-#: prefs.php:136
+#: prefs.php:151
 msgid "System"
 msgstr "System"
 
@@ -477,10 +477,10 @@ msgid "Tiny Tiny RSS data update script."
 msgstr ""
 
 #: include/digest.php:109
-#: include/functions.php:1265
-#: include/functions.php:1810
-#: include/functions.php:1895
-#: include/functions.php:1917
+#: include/functions.php:1296
+#: include/functions.php:1841
+#: include/functions.php:1926
+#: include/functions.php:1948
 #: classes/opml.php:421
 #: classes/pref/feeds.php:228
 msgid "Uncategorized"
@@ -497,44 +497,44 @@ msgstr[1] "Arkiverede artikler"
 msgid "No feeds found."
 msgstr "Der blev ikke fundet nogen feeds."
 
-#: include/functions.php:958
+#: include/functions.php:989
 #, php-format
 msgid "%d min"
 msgstr ""
 
-#: include/functions.php:1254
-#: include/functions.php:1907
+#: include/functions.php:1285
+#: include/functions.php:1938
 msgid "Special"
 msgstr "Speciel"
 
-#: include/functions.php:1758
+#: include/functions.php:1789
 #: classes/pref/filters.php:229
 #: classes/pref/filters.php:507
 msgid "All feeds"
 msgstr "Alle feeds"
 
-#: include/functions.php:1962
+#: include/functions.php:1993
 msgid "Starred articles"
 msgstr "Markerede artikler"
 
-#: include/functions.php:1964
+#: include/functions.php:1995
 msgid "Published articles"
 msgstr "Udgivne artikler"
 
-#: include/functions.php:1966
+#: include/functions.php:1997
 msgid "Fresh articles"
 msgstr "Nye artikler"
 
-#: include/functions.php:1968
-#: include/functions2.php:99
+#: include/functions.php:1999
+#: include/functions2.php:100
 msgid "All articles"
 msgstr "Alle artikler"
 
-#: include/functions.php:1970
+#: include/functions.php:2001
 msgid "Archived articles"
 msgstr "Arkiverede artikler"
 
-#: include/functions.php:1972
+#: include/functions.php:2003
 msgid "Recently read"
 msgstr "Senest læst"
 
@@ -675,7 +675,7 @@ msgstr "Fravælg alt"
 
 #: include/functions2.php:85
 #: classes/pref/feeds.php:555
-#: classes/pref/feeds.php:821
+#: classes/pref/feeds.php:823
 msgid "Feed"
 msgstr "Feed"
 
@@ -688,7 +688,7 @@ msgid "Un/hide read feeds"
 msgstr "Vis/skjul læste feeds"
 
 #: include/functions2.php:88
-#: classes/pref/feeds.php:1352
+#: classes/pref/feeds.php:1356
 msgid "Subscribe to feed"
 msgstr "Abonner på feedet"
 
@@ -704,75 +704,79 @@ msgid "Reverse headlines"
 msgstr "Reverser overskrifter"
 
 #: include/functions2.php:92
+msgid "Toggle headline grouping"
+msgstr ""
+
+#: include/functions2.php:93
 msgid "Debug feed update"
 msgstr "Udfør fejlfinding i feed-opdatering"
 
-#: include/functions2.php:93
+#: include/functions2.php:94
 #, fuzzy
 msgid "Debug viewfeed()"
 msgstr "Udfør fejlfinding i feed-opdatering"
 
-#: include/functions2.php:94
+#: include/functions2.php:95
 #: js/FeedTree.js:182
 #, fuzzy
 msgid "Mark all feeds as read"
 msgstr "Marker feed som læst"
 
-#: include/functions2.php:95
+#: include/functions2.php:96
 msgid "Un/collapse current category"
 msgstr "Vis/skjul aktuel kategori"
 
-#: include/functions2.php:96
+#: include/functions2.php:97
 msgid "Toggle combined mode"
 msgstr "Skift kombineret modus"
 
-#: include/functions2.php:97
+#: include/functions2.php:98
 #, fuzzy
 msgid "Toggle auto expand in combined mode"
 msgstr "Skift kombineret modus"
 
-#: include/functions2.php:98
+#: include/functions2.php:99
 msgid "Go to"
 msgstr "Gå til"
 
-#: include/functions2.php:100
+#: include/functions2.php:101
 msgid "Fresh"
 msgstr "Ny"
 
-#: include/functions2.php:103
-#: js/tt-rss.js:466
-#: js/tt-rss.js:650
+#: include/functions2.php:104
+#: js/tt-rss.js:497
+#: js/tt-rss.js:673
 msgid "Tag cloud"
 msgstr "Tag Cloud"
 
-#: include/functions2.php:105
+#: include/functions2.php:106
 msgid "Other"
 msgstr "Andet"
 
-#: include/functions2.php:106
+#: include/functions2.php:107
 #: classes/pref/labels.php:267
 msgid "Create label"
 msgstr "Opret etiket"
 
-#: include/functions2.php:107
+#: include/functions2.php:108
 #: classes/pref/filters.php:753
 msgid "Create filter"
 msgstr "Opret filter"
 
-#: include/functions2.php:108
+#: include/functions2.php:109
 msgid "Un/collapse sidebar"
 msgstr "Vis/skjul sidebjælke"
 
-#: include/functions2.php:109
+#: include/functions2.php:110
 msgid "Show help dialog"
 msgstr "Vis hjælpedialog"
 
-#: include/functions2.php:663
+#: include/functions2.php:665
 #, php-format
 msgid "Search results: %s"
 msgstr "Søgeresultater: %s"
 
-#: include/functions2.php:1317
+#: include/functions2.php:1330
 #: classes/feeds.php:749
 #, fuzzy
 msgid "comment"
@@ -780,67 +784,100 @@ msgid_plural "comments"
 msgstr[0] "kommentarer"
 msgstr[1] "kommentarer"
 
-#: include/functions2.php:1321
+#: include/functions2.php:1334
 #: classes/feeds.php:753
 msgid "comments"
 msgstr "kommentarer"
 
-#: include/functions2.php:1347
+#: include/functions2.php:1360
 msgid " - "
 msgstr " - "
 
-#: include/functions2.php:1380
-#: include/functions2.php:1631
+#: include/functions2.php:1393
+#: include/functions2.php:1644
 #: classes/article.php:311
 msgid "no tags"
 msgstr "ingen tags"
 
-#: include/functions2.php:1390
+#: include/functions2.php:1403
 #: classes/feeds.php:735
 msgid "Edit tags for this article"
 msgstr ""
 
-#: include/functions2.php:1422
+#: include/functions2.php:1435
 #: classes/feeds.php:682
 msgid "Originally from:"
 msgstr "Oprindeligt fra:"
 
-#: include/functions2.php:1435
+#: include/functions2.php:1448
 #: classes/pref/feeds.php:574
 #: classes/feeds.php:695
 msgid "Feed URL"
 msgstr "Feedets webadresse"
 
-#: include/functions2.php:1472
+#: include/functions2.php:1485
 #: classes/backend.php:105
 #: classes/dlg.php:37
 #: classes/dlg.php:60
 #: classes/dlg.php:93
 #: classes/dlg.php:159
 #: classes/dlg.php:186
-#: classes/pref/feeds.php:1654
-#: classes/pref/feeds.php:1720
+#: classes/pref/feeds.php:1658
+#: classes/pref/feeds.php:1724
 #: classes/pref/filters.php:204
 #: classes/pref/prefs.php:1105
 #: plugins/af_psql_trgm/init.php:102
 #: plugins/import_export/init.php:415
-#: plugins/import_export/init.php:460
+#: plugins/import_export/init.php:461
 #: plugins/share/init.php:121
 msgid "Close this window"
 msgstr "Luk dette vindue"
 
-#: include/functions2.php:1669
+#: include/functions2.php:1682
 msgid "(edit note)"
 msgstr "(rediger note)"
 
-#: include/functions2.php:1924
+#: include/functions2.php:1937
 msgid "unknown type"
 msgstr "ukendt type"
 
-#: include/functions2.php:2001
+#: include/functions2.php:2014
 msgid "Attachments"
 msgstr "Vedhæftninger"
 
+#: include/functions2.php:2456
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: include/functions2.php:2457
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr ""
+
+#: include/functions2.php:2458
+msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
+msgstr ""
+
+#: include/functions2.php:2459
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: include/functions2.php:2460
+#, fuzzy
+msgid "No file was uploaded"
+msgstr "Der er ikke indlæst nogen fil."
+
+#: include/functions2.php:2461
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: include/functions2.php:2462
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: include/functions2.php:2463
+msgid "A PHP extension stopped the file upload."
+msgstr ""
+
 #: include/login_form.php:197
 #: classes/handler/public.php:569
 #: classes/handler/public.php:824
@@ -907,8 +944,8 @@ msgstr ""
 #: classes/article.php:222
 #: classes/pref/labels.php:79
 #: classes/pref/users.php:98
-#: classes/pref/feeds.php:799
-#: classes/pref/feeds.php:939
+#: classes/pref/feeds.php:801
+#: classes/pref/feeds.php:943
 #: classes/pref/filters.php:485
 #: classes/pref/prefs.php:989
 #: plugins/instances/init.php:245
@@ -926,17 +963,17 @@ msgstr "Gem"
 #: classes/handler/public.php:580
 #: classes/pref/labels.php:81
 #: classes/pref/users.php:100
-#: classes/pref/feeds.php:800
-#: classes/pref/feeds.php:942
-#: classes/pref/feeds.php:1860
+#: classes/pref/feeds.php:802
+#: classes/pref/feeds.php:946
+#: classes/pref/feeds.php:1865
 #: classes/pref/filters.php:488
 #: classes/pref/filters.php:902
 #: classes/pref/filters.php:983
 #: classes/pref/filters.php:1076
 #: classes/pref/prefs.php:991
-#: classes/feeds.php:1098
-#: classes/feeds.php:1148
-#: classes/feeds.php:1185
+#: classes/feeds.php:1100
+#: classes/feeds.php:1150
+#: classes/feeds.php:1187
 #: plugins/instances/init.php:248
 #: plugins/instances/init.php:436
 #: plugins/note/init.php:53
@@ -992,7 +1029,6 @@ msgid "Processing category: %s"
 msgstr "Behandler kategori: %s"
 
 #: classes/opml.php:470
-#: plugins/import_export/init.php:428
 #, php-format
 msgid "Upload failed with error code %d"
 msgstr ""
@@ -1213,9 +1249,9 @@ msgstr "Opret etiket"
 
 #: classes/pref/labels.php:258
 #: classes/pref/users.php:334
-#: classes/pref/feeds.php:1340
-#: classes/pref/feeds.php:1602
-#: classes/pref/feeds.php:1666
+#: classes/pref/feeds.php:1344
+#: classes/pref/feeds.php:1606
+#: classes/pref/feeds.php:1670
 #: classes/pref/filters.php:359
 #: classes/pref/filters.php:407
 #: classes/pref/filters.php:744
@@ -1228,9 +1264,9 @@ msgstr "Vælg"
 
 #: classes/pref/labels.php:261
 #: classes/pref/users.php:337
-#: classes/pref/feeds.php:1343
-#: classes/pref/feeds.php:1605
-#: classes/pref/feeds.php:1669
+#: classes/pref/feeds.php:1347
+#: classes/pref/feeds.php:1609
+#: classes/pref/feeds.php:1673
 #: classes/pref/filters.php:362
 #: classes/pref/filters.php:410
 #: classes/pref/filters.php:747
@@ -1244,9 +1280,9 @@ msgstr "Alle"
 
 #: classes/pref/labels.php:263
 #: classes/pref/users.php:339
-#: classes/pref/feeds.php:1345
-#: classes/pref/feeds.php:1607
-#: classes/pref/feeds.php:1671
+#: classes/pref/feeds.php:1349
+#: classes/pref/feeds.php:1611
+#: classes/pref/feeds.php:1675
 #: classes/pref/filters.php:364
 #: classes/pref/filters.php:412
 #: classes/pref/filters.php:749
@@ -1260,10 +1296,10 @@ msgstr "Ingen"
 
 #: classes/pref/labels.php:270
 #: classes/pref/users.php:348
-#: classes/pref/feeds.php:765
+#: classes/pref/feeds.php:767
 #: classes/pref/filters.php:478
 #: classes/pref/filters.php:766
-#: classes/feeds.php:1147
+#: classes/feeds.php:1149
 #: plugins/instances/init.php:294
 msgid "Remove"
 msgstr "Fjern"
@@ -1285,7 +1321,7 @@ msgstr "Rediger regel"
 
 #: classes/pref/users.php:56
 #: classes/pref/feeds.php:637
-#: classes/pref/feeds.php:876
+#: classes/pref/feeds.php:878
 #: classes/feeds.php:1070
 msgid "Authentication"
 msgstr "Godkendelse"
@@ -1295,8 +1331,8 @@ msgid "Access level: "
 msgstr "Adgangsniveau: "
 
 #: classes/pref/users.php:77
-#: classes/pref/feeds.php:665
-#: classes/pref/feeds.php:892
+#: classes/pref/feeds.php:667
+#: classes/pref/feeds.php:896
 msgid "Options"
 msgstr "Indstillinger"
 
@@ -1362,10 +1398,10 @@ msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] meddelelse om adgangskodeændring"
 
 #: classes/pref/users.php:324
-#: classes/pref/feeds.php:1336
+#: classes/pref/feeds.php:1340
 #: classes/pref/filters.php:740
-#: classes/feeds.php:1118
-#: classes/feeds.php:1184
+#: classes/feeds.php:1120
+#: classes/feeds.php:1186
 #: js/tt-rss.js:174
 msgid "Search"
 msgstr "Søg"
@@ -1382,8 +1418,8 @@ msgstr "Rediger"
 
 #: classes/pref/users.php:397
 #: classes/pref/feeds.php:643
-#: classes/pref/feeds.php:880
-#: classes/pref/feeds.php:1838
+#: classes/pref/feeds.php:882
+#: classes/pref/feeds.php:1842
 #: classes/feeds.php:1074
 msgid "Login"
 msgstr "Logon"
@@ -1462,252 +1498,252 @@ msgid "Feed Title"
 msgstr "Feed-overskrift"
 
 #: classes/pref/feeds.php:595
-#: classes/pref/feeds.php:828
-#: classes/pref/feeds.php:1824
+#: classes/pref/feeds.php:830
+#: classes/pref/feeds.php:1828
 #: classes/feeds.php:1050
 msgid "Place in category:"
 msgstr "Placer i kategori:"
 
 #: classes/pref/feeds.php:608
-#: classes/pref/feeds.php:842
+#: classes/pref/feeds.php:844
 #, fuzzy
 msgid "Language:"
 msgstr "Sprog"
 
 #: classes/pref/feeds.php:615
-#: classes/pref/feeds.php:851
+#: classes/pref/feeds.php:853
 msgid "Update"
 msgstr "Opdater"
 
 #: classes/pref/feeds.php:630
-#: classes/pref/feeds.php:867
+#: classes/pref/feeds.php:869
 msgid "Article purging:"
 msgstr "Artikeltømning:"
 
-#: classes/pref/feeds.php:656
-#: classes/pref/feeds.php:886
-#: classes/pref/feeds.php:1841
+#: classes/pref/feeds.php:658
+#: classes/pref/feeds.php:890
+#: classes/pref/feeds.php:1845
 #: classes/pref/prefs.php:245
-#: classes/feeds.php:1077
+#: classes/feeds.php:1078
 msgid "Password"
 msgstr "Adgangskode"
 
-#: classes/pref/feeds.php:660
+#: classes/pref/feeds.php:662
 msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
 msgstr ""
 
-#: classes/pref/feeds.php:679
-#: classes/pref/feeds.php:896
+#: classes/pref/feeds.php:681
+#: classes/pref/feeds.php:900
 msgid "Hide from Popular feeds"
 msgstr "Skjul fra Populære feeds"
 
-#: classes/pref/feeds.php:691
-#: classes/pref/feeds.php:902
+#: classes/pref/feeds.php:693
+#: classes/pref/feeds.php:906
 msgid "Include in e-mail digest"
 msgstr "Inkluder i e-mail-digest"
 
-#: classes/pref/feeds.php:704
-#: classes/pref/feeds.php:908
+#: classes/pref/feeds.php:706
+#: classes/pref/feeds.php:912
 msgid "Always display image attachments"
 msgstr "Vis altid billedvedhæftninger"
 
-#: classes/pref/feeds.php:717
-#: classes/pref/feeds.php:916
+#: classes/pref/feeds.php:719
+#: classes/pref/feeds.php:920
 msgid "Do not embed images"
 msgstr "Inkorporer ikke billeder"
 
-#: classes/pref/feeds.php:730
-#: classes/pref/feeds.php:924
+#: classes/pref/feeds.php:732
+#: classes/pref/feeds.php:928
 msgid "Cache images locally"
 msgstr "Cache billeder lokalt"
 
-#: classes/pref/feeds.php:742
-#: classes/pref/feeds.php:930
+#: classes/pref/feeds.php:744
+#: classes/pref/feeds.php:934
 #, fuzzy
 msgid "Mark updated articles as unread"
 msgstr "Marker feed som læst"
 
-#: classes/pref/feeds.php:746
+#: classes/pref/feeds.php:748
 msgid "Icon"
 msgstr "Ikon"
 
-#: classes/pref/feeds.php:763
+#: classes/pref/feeds.php:765
 msgid "Replace"
 msgstr "Erstat"
 
-#: classes/pref/feeds.php:770
+#: classes/pref/feeds.php:772
 #: classes/pref/prefs.php:706
 msgid "Plugins"
 msgstr "Plugins"
 
-#: classes/pref/feeds.php:790
+#: classes/pref/feeds.php:792
 msgid "Resubscribe to push updates"
 msgstr "Forny abonnement på push-opdateringer"
 
-#: classes/pref/feeds.php:797
+#: classes/pref/feeds.php:799
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr ""
 
-#: classes/pref/feeds.php:1203
-#: classes/pref/feeds.php:1256
+#: classes/pref/feeds.php:1207
+#: classes/pref/feeds.php:1260
 msgid "All done."
 msgstr "Alt færdigt."
 
-#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1315
 msgid "Feeds with errors"
 msgstr "Feeds med fejl"
 
-#: classes/pref/feeds.php:1318
+#: classes/pref/feeds.php:1322
 msgid "Inactive feeds"
 msgstr "Inaktive feeds"
 
-#: classes/pref/feeds.php:1354
+#: classes/pref/feeds.php:1358
 msgid "Edit selected feeds"
 msgstr "Rediger valgte feeds"
 
-#: classes/pref/feeds.php:1356
-#: classes/pref/feeds.php:1370
+#: classes/pref/feeds.php:1360
+#: classes/pref/feeds.php:1374
 #: classes/pref/filters.php:762
 msgid "Reset sort order"
 msgstr "Nulstil sorteringsrækkefølge"
 
-#: classes/pref/feeds.php:1358
+#: classes/pref/feeds.php:1362
 #: js/prefs.js:1737
 msgid "Batch subscribe"
 msgstr "Batchabonnement"
 
-#: classes/pref/feeds.php:1365
+#: classes/pref/feeds.php:1369
 msgid "Categories"
 msgstr "Kategorier"
 
-#: classes/pref/feeds.php:1368
+#: classes/pref/feeds.php:1372
 msgid "Add category"
 msgstr "Tilføj kategori"
 
-#: classes/pref/feeds.php:1372
+#: classes/pref/feeds.php:1376
 msgid "Remove selected"
 msgstr "Fjern valgte"
 
-#: classes/pref/feeds.php:1383
+#: classes/pref/feeds.php:1387
 msgid "More actions..."
 msgstr "Flere handlinger ..."
 
-#: classes/pref/feeds.php:1387
+#: classes/pref/feeds.php:1391
 msgid "Manual purge"
 msgstr "Manuel tømning"
 
-#: classes/pref/feeds.php:1391
+#: classes/pref/feeds.php:1395
 msgid "Clear feed data"
 msgstr "Ryd feed-data"
 
-#: classes/pref/feeds.php:1392
+#: classes/pref/feeds.php:1396
 #: classes/pref/filters.php:770
 msgid "Rescore articles"
 msgstr "Nulstil artikler"
 
-#: classes/pref/feeds.php:1444
+#: classes/pref/feeds.php:1448
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1446
+#: classes/pref/feeds.php:1450
 msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
 msgstr ""
 
-#: classes/pref/feeds.php:1447
+#: classes/pref/feeds.php:1451
 msgid "Only main settings profile can be migrated using OPML."
 msgstr ""
 
-#: classes/pref/feeds.php:1460
+#: classes/pref/feeds.php:1464
 msgid "Import my OPML"
 msgstr "Importer min OPML"
 
-#: classes/pref/feeds.php:1466
+#: classes/pref/feeds.php:1470
 msgid "Filename:"
 msgstr "Filnavn:"
 
-#: classes/pref/feeds.php:1468
+#: classes/pref/feeds.php:1472
 msgid "Include settings"
 msgstr "Inkluder indstillinger"
 
-#: classes/pref/feeds.php:1472
+#: classes/pref/feeds.php:1476
 msgid "Export OPML"
 msgstr "Eksporter OPML"
 
-#: classes/pref/feeds.php:1476
+#: classes/pref/feeds.php:1480
 msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
 msgstr ""
 
-#: classes/pref/feeds.php:1480
+#: classes/pref/feeds.php:1484
 msgid "Public OPML URL"
 msgstr "Webadresse til offentlig OPML"
 
-#: classes/pref/feeds.php:1481
+#: classes/pref/feeds.php:1485
 msgid "Display published OPML URL"
 msgstr "Vis webadresse på udgivne OPML"
 
-#: classes/pref/feeds.php:1490
+#: classes/pref/feeds.php:1494
 msgid "Firefox integration"
 msgstr "Firefox-integration"
 
-#: classes/pref/feeds.php:1492
+#: classes/pref/feeds.php:1496
 msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
 msgstr ""
 
-#: classes/pref/feeds.php:1499
+#: classes/pref/feeds.php:1503
 msgid "Click here to register this site as a feed reader."
 msgstr ""
 
-#: classes/pref/feeds.php:1507
+#: classes/pref/feeds.php:1511
 msgid "Published & shared articles / Generated feeds"
 msgstr ""
 
-#: classes/pref/feeds.php:1509
+#: classes/pref/feeds.php:1513
 msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
 msgstr ""
 
-#: classes/pref/feeds.php:1516
+#: classes/pref/feeds.php:1520
 #: classes/feeds.php:54
 #: classes/feeds.php:134
 msgid "View as RSS"
 msgstr "Vis som RSS"
 
-#: classes/pref/feeds.php:1517
+#: classes/pref/feeds.php:1521
 msgid "Display URL"
 msgstr "Vis webadresse"
 
-#: classes/pref/feeds.php:1520
+#: classes/pref/feeds.php:1524
 msgid "Clear all generated URLs"
 msgstr "Ryd alle genererede webadresser"
 
-#: classes/pref/feeds.php:1598
+#: classes/pref/feeds.php:1602
 msgid "These feeds have not been updated with new content for 3 months (oldest first):"
 msgstr ""
 
-#: classes/pref/feeds.php:1632
-#: classes/pref/feeds.php:1696
+#: classes/pref/feeds.php:1636
+#: classes/pref/feeds.php:1700
 msgid "Click to edit feed"
 msgstr "Klik for at redigere feed"
 
-#: classes/pref/feeds.php:1650
-#: classes/pref/feeds.php:1716
+#: classes/pref/feeds.php:1654
+#: classes/pref/feeds.php:1720
 msgid "Unsubscribe from selected feeds"
 msgstr "Aflys abonnement for valgte feeds"
 
-#: classes/pref/feeds.php:1821
+#: classes/pref/feeds.php:1825
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr ""
 
-#: classes/pref/feeds.php:1830
+#: classes/pref/feeds.php:1834
 msgid "Feeds to subscribe, One per line"
 msgstr ""
 
-#: classes/pref/feeds.php:1852
+#: classes/pref/feeds.php:1857
 msgid "Feeds require authentication."
 msgstr "Feeds kræver godkendelse."
 
-#: classes/pref/feeds.php:1859
-#: classes/feeds.php:1092
-#: classes/feeds.php:1146
+#: classes/pref/feeds.php:1864
+#: classes/feeds.php:1094
+#: classes/feeds.php:1148
 msgid "Subscribe"
 msgstr "Abonner"
 
@@ -1790,7 +1826,7 @@ msgid "on field"
 msgstr "på feltet"
 
 #: classes/pref/filters.php:962
-#: js/PrefFilterTree.js:61
+#: js/PrefFilterTree.js:64
 msgid "in"
 msgstr "i"
 
@@ -2392,40 +2428,40 @@ msgstr "Webadresse til feed eller webside"
 msgid "Available feeds"
 msgstr "Tilgængelige feeds"
 
-#: classes/feeds.php:1087
+#: classes/feeds.php:1089
 msgid "This feed requires authentication."
 msgstr "Dette feed kræver godkendelse."
 
-#: classes/feeds.php:1095
+#: classes/feeds.php:1097
 msgid "More feeds"
 msgstr "Flere feeds"
 
-#: classes/feeds.php:1122
+#: classes/feeds.php:1124
 msgid "Popular feeds"
 msgstr "Populære feeds"
 
-#: classes/feeds.php:1123
+#: classes/feeds.php:1125
 msgid "Feed archive"
 msgstr "Feed-arkiv"
 
-#: classes/feeds.php:1126
+#: classes/feeds.php:1128
 msgid "limit:"
 msgstr "grænse:"
 
-#: classes/feeds.php:1158
+#: classes/feeds.php:1160
 msgid "Look for"
 msgstr "Led efter"
 
-#: classes/feeds.php:1166
+#: classes/feeds.php:1168
 #, php-format
 msgid "in %s"
 msgstr ""
 
-#: classes/feeds.php:1171
+#: classes/feeds.php:1173
 msgid "Used for word stemming"
 msgstr ""
 
-#: classes/feeds.php:1180
+#: classes/feeds.php:1182
 msgid "Search syntax"
 msgstr "Søgesyntaks"
 
@@ -2689,6 +2725,11 @@ msgstr ""
 msgid "Prepare data"
 msgstr "Forbered data"
 
+#: plugins/import_export/init.php:428
+#, php-format
+msgid "Upload failed with error code %d (%s)"
+msgstr ""
+
 #: plugins/import_export/init.php:454
 msgid "No file uploaded."
 msgstr "Der er ikke indlæst nogen fil."
@@ -2801,7 +2842,7 @@ msgstr "Rediger kategori"
 msgid "Remove category"
 msgstr "Fjern kategori"
 
-#: js/PrefFilterTree.js:64
+#: js/PrefFilterTree.js:67
 msgid "Inverse"
 msgstr "Inverter"
 
@@ -2852,7 +2893,7 @@ msgid "Subscription reset."
 msgstr "Abonnement nulstillet."
 
 #: js/functions.js:1311
-#: js/tt-rss.js:682
+#: js/tt-rss.js:705
 #, perl-format
 msgid "Unsubscribe from %s?"
 msgstr "Aflyse abonnement fra %s?"
@@ -3089,41 +3130,41 @@ msgstr "Marker ovenstående som læst"
 msgid "Marking all feeds as read..."
 msgstr "Marker feed som læst"
 
-#: js/tt-rss.js:383
+#: js/tt-rss.js:404
 msgid "Please enable mail plugin first."
 msgstr ""
 
-#: js/tt-rss.js:431
+#: js/tt-rss.js:452
 #: js/functions.js:1643
-#: js/tt-rss.js:663
+#: js/tt-rss.js:686
 msgid "You can't edit this kind of feed."
 msgstr ""
 
-#: js/tt-rss.js:502
+#: js/tt-rss.js:533
 msgid "Please enable embed_original plugin first."
 msgstr ""
 
-#: js/tt-rss.js:515
-#: js/tt-rss.js:713
+#: js/tt-rss.js:546
+#: js/tt-rss.js:736
 msgid "Widescreen is not available in combined mode."
 msgstr ""
 
-#: js/tt-rss.js:827
+#: js/tt-rss.js:850
 msgid "You can't rescore this kind of feed."
 msgstr ""
 
-#: js/tt-rss.js:832
-#: js/tt-rss.js:676
+#: js/tt-rss.js:855
+#: js/tt-rss.js:699
 #, fuzzy
 msgid "Please select some feed first."
 msgstr "Rydder valgte feed ..."
 
-#: js/tt-rss.js:837
+#: js/tt-rss.js:860
 #, perl-format
 msgid "Rescore articles in %s?"
 msgstr "Ændr resultater af artikler i %s?"
 
-#: js/tt-rss.js:840
+#: js/tt-rss.js:863
 msgid "Rescoring articles..."
 msgstr "Ændrer artikelresultater ..."
 
@@ -3301,7 +3342,7 @@ msgstr ""
 msgid "Sorry, your browser does not support sandboxed iframes."
 msgstr ""
 
-#: plugins/shorten_expanded/init.js:37
+#: plugins/shorten_expanded/init.js:39
 msgid "Click to expand article"
 msgstr "Klik for at udvide artikel"
 
@@ -3558,7 +3599,7 @@ msgstr "Genererede webadresser er ryddet."
 msgid "Label Editor"
 msgstr "Labeleditor"
 
-#: js/tt-rss.js:671
+#: js/tt-rss.js:694
 msgid "You can't unsubscribe from the category."
 msgstr ""
 
diff --git a/locale/de_DE/LC_MESSAGES/messages.mo b/locale/de_DE/LC_MESSAGES/messages.mo
index 3aa1126ec..726c68a6c 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 ca57908ac..ebc7c59d7 100644
--- a/locale/de_DE/LC_MESSAGES/messages.po
+++ b/locale/de_DE/LC_MESSAGES/messages.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tt-rss git\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 22:58+0300\n"
+"POT-Creation-Date: 2016-08-19 18:16+0300\n"
 "PO-Revision-Date: 2016-03-24 08:10+0100\n"
 "Last-Translator: Heiko Adams <heiko.adams@gmail.com>\n"
 "Language-Team: \n"
@@ -55,39 +55,49 @@ msgstr "Nach 3 Monaten"
 msgid "Default interval"
 msgstr "Standard-Intervall"
 
-#: backend.php:83 backend.php:93
+#: backend.php:83
+#: backend.php:93
 msgid "Disable updates"
 msgstr "Nie"
 
-#: backend.php:84 backend.php:94
+#: backend.php:84
+#: backend.php:94
 msgid "15 minutes"
 msgstr "15 Minuten"
 
-#: backend.php:85 backend.php:95
+#: backend.php:85
+#: backend.php:95
 msgid "30 minutes"
 msgstr "30 Minuten"
 
-#: backend.php:86 backend.php:96
+#: backend.php:86
+#: backend.php:96
 msgid "Hourly"
 msgstr "Stündlich"
 
-#: backend.php:87 backend.php:97
+#: backend.php:87
+#: backend.php:97
 msgid "4 hours"
 msgstr "4 Stunden"
 
-#: backend.php:88 backend.php:98
+#: backend.php:88
+#: backend.php:98
 msgid "12 hours"
 msgstr "12 Stunden"
 
-#: backend.php:89 backend.php:99
+#: backend.php:89
+#: backend.php:99
 msgid "Daily"
 msgstr "Täglich"
 
-#: backend.php:90 backend.php:100
+#: backend.php:90
+#: backend.php:100
 msgid "Weekly"
 msgstr "Wöchentlich"
 
-#: backend.php:103 classes/pref/users.php:42 classes/pref/system.php:51
+#: backend.php:103
+#: classes/pref/users.php:42
+#: classes/pref/system.php:51
 msgid "User"
 msgstr "Benutzer"
 
@@ -155,201 +165,246 @@ msgstr "Methode nicht gefunden."
 msgid "Plugin not found"
 msgstr "Plugin nicht gefunden"
 
-#: index.php:133 index.php:149 index.php:267 prefs.php:102
-#: classes/backend.php:5 classes/pref/labels.php:282
-#: classes/pref/feeds.php:1405 classes/pref/filters.php:779 js/feedlist.js:159
-#: js/functions.js:1293 js/functions.js:1427 js/functions.js:1739
-#: js/prefs.js:658 js/prefs.js:859 js/prefs.js:1765 js/prefs.js:1781
-#: js/prefs.js:1799 js/tt-rss.js:55 js/tt-rss.js:522 js/viewfeed.js:1298
-#: plugins/import_export/import_export.js:17 js/feedlist.js:484
-#: js/feedlist.js:534 js/functions.js:449 js/functions.js:772 js/prefs.js:1446
-#: js/prefs.js:1499 js/prefs.js:1539 js/prefs.js:1556 js/prefs.js:1572
-#: js/prefs.js:1592 js/tt-rss.js:539 js/viewfeed.js:830
+#: index.php:148
+#: index.php:164
+#: index.php:282
+#: prefs.php:117
+#: classes/backend.php:5
+#: classes/pref/labels.php:282
+#: classes/pref/feeds.php:1409
+#: classes/pref/filters.php:779
+#: js/feedlist.js:159
+#: js/functions.js:1293
+#: js/functions.js:1427
+#: js/functions.js:1739
+#: js/prefs.js:658
+#: js/prefs.js:859
+#: js/prefs.js:1765
+#: js/prefs.js:1781
+#: js/prefs.js:1799
+#: js/tt-rss.js:55
+#: js/tt-rss.js:553
+#: js/viewfeed.js:1298
+#: plugins/import_export/import_export.js:17
+#: js/feedlist.js:484
+#: js/feedlist.js:534
+#: js/functions.js:449
+#: js/functions.js:772
+#: js/prefs.js:1446
+#: js/prefs.js:1499
+#: js/prefs.js:1539
+#: js/prefs.js:1556
+#: js/prefs.js:1572
+#: js/prefs.js:1592
+#: js/tt-rss.js:570
+#: js/viewfeed.js:830
 msgid "Loading, please wait..."
 msgstr "Ladevorgang, bitte warten..."
 
-#: index.php:167
+#: index.php:182
 msgid "Collapse feedlist"
 msgstr "Feedliste verbergen"
 
-#: index.php:170
+#: index.php:185
 msgid "Show articles"
 msgstr "Artikel anzeigen"
 
-#: index.php:173
+#: index.php:188
 msgid "Adaptive"
 msgstr "Adaptiv"
 
-#: index.php:174
+#: index.php:189
 msgid "All Articles"
 msgstr "Alle Artikel"
 
-#: index.php:175 include/functions2.php:101 classes/feeds.php:104
+#: index.php:190
+#: include/functions2.php:102
+#: classes/feeds.php:104
 msgid "Starred"
 msgstr "Markiert"
 
-#: index.php:176 include/functions2.php:102 classes/feeds.php:105
+#: index.php:191
+#: include/functions2.php:103
+#: classes/feeds.php:105
 msgid "Published"
 msgstr "Veröffentlicht"
 
-#: index.php:177 classes/feeds.php:91 classes/feeds.php:103
+#: index.php:192
+#: classes/feeds.php:91
+#: classes/feeds.php:103
 msgid "Unread"
 msgstr "Ungelesen"
 
-#: index.php:178
+#: index.php:193
 msgid "With Note"
 msgstr "mit Notiz"
 
-#: index.php:179
+#: index.php:194
 msgid "Ignore Scoring"
 msgstr "Bewertung ignorieren"
 
-#: index.php:182
+#: index.php:197
 msgid "Sort articles"
 msgstr "Artikel sortieren"
 
-#: index.php:185
+#: index.php:200
 msgid "Default"
 msgstr "Standard"
 
-#: index.php:186
+#: index.php:201
 msgid "Newest first"
 msgstr "neueste zuerst"
 
-#: index.php:187
+#: index.php:202
 msgid "Oldest first"
 msgstr "älteste zuerst"
 
-#: index.php:188
+#: index.php:203
 msgid "Title"
 msgstr "Titel"
 
-#: index.php:192 index.php:233 include/functions2.php:90 classes/feeds.php:109
-#: js/FeedTree.js:132 js/FeedTree.js:160
+#: index.php:207
+#: index.php:248
+#: include/functions2.php:90
+#: classes/feeds.php:109
+#: js/FeedTree.js:132
+#: js/FeedTree.js:160
 msgid "Mark as read"
 msgstr "Als gelesen markieren"
 
-#: index.php:195
+#: index.php:210
 msgid "Older than one day"
 msgstr "älter als einen Tag"
 
-#: index.php:198
+#: index.php:213
 msgid "Older than one week"
 msgstr "älter als eine Woche"
 
-#: index.php:201
+#: index.php:216
 msgid "Older than two weeks"
 msgstr "älter als 2 Wochen"
 
-#: index.php:217
+#: index.php:232
 msgid "Communication problem with server."
 msgstr "Kommunikationsfehler mit Server"
 
-#: index.php:223
+#: index.php:238
 msgid "Actions..."
 msgstr "Aktionen..."
 
-#: index.php:225
+#: index.php:240
 msgid "Preferences..."
 msgstr "Einstellungen..."
 
-#: index.php:226
+#: index.php:241
 msgid "Search..."
 msgstr "Suchen..."
 
-#: index.php:227
+#: index.php:242
 msgid "Feed actions:"
 msgstr "Feed-Aktionen:"
 
-#: index.php:228 classes/handler/public.php:672
+#: index.php:243
+#: classes/handler/public.php:672
 msgid "Subscribe to feed..."
 msgstr "Feed abonnieren..."
 
-#: index.php:229
+#: index.php:244
 msgid "Edit this feed..."
 msgstr "Feed bearbeiten..."
 
-#: index.php:230
+#: index.php:245
 msgid "Rescore feed"
 msgstr "Feed neu bewerten"
 
-#: index.php:231 classes/pref/feeds.php:783 classes/pref/feeds.php:1360
+#: index.php:246
+#: classes/pref/feeds.php:785
+#: classes/pref/feeds.php:1364
 #: js/PrefFeedTree.js:74
 msgid "Unsubscribe"
 msgstr "Feed abbestellen"
 
-#: index.php:232
+#: index.php:247
 msgid "All feeds:"
 msgstr "Alle Feeds:"
 
-#: index.php:234
+#: index.php:249
 msgid "(Un)hide read feeds"
 msgstr "Gelesene zeigen/verstecken"
 
-#: index.php:235
+#: index.php:250
 msgid "Other actions:"
 msgstr "Andere Aktionen:"
 
-#: index.php:236 include/functions2.php:76
+#: index.php:251
+#: include/functions2.php:76
 msgid "Toggle widescreen mode"
 msgstr "Breitbild-Modus umschalten"
 
-#: index.php:237
+#: index.php:252
 msgid "Create label..."
 msgstr "Label erstellen..."
 
-#: index.php:238
+#: index.php:253
 msgid "Create filter..."
 msgstr "Filter erstellen..."
 
-#: index.php:239
+#: index.php:254
 msgid "Keyboard shortcuts help"
 msgstr "Tastaturkürzel..."
 
-#: index.php:248
+#: index.php:263
 msgid "Logout"
 msgstr "Abmelden"
 
-#: index.php:254
+#: index.php:269
 msgid "Updates are available from Git."
 msgstr "Git-Updates sind verfügbar"
 
-#: prefs.php:33 prefs.php:120 include/functions2.php:104
+#: prefs.php:33
+#: prefs.php:135
+#: include/functions2.php:105
 #: classes/pref/prefs.php:435
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: prefs.php:111
+#: prefs.php:126
 msgid "Keyboard shortcuts"
 msgstr "Tastaturkürzel"
 
-#: prefs.php:112
+#: prefs.php:127
 msgid "Exit preferences"
 msgstr "Einstellungen verlassen"
 
-#: prefs.php:123 classes/pref/feeds.php:112 classes/pref/feeds.php:1300
-#: classes/pref/feeds.php:1349
+#: prefs.php:138
+#: classes/pref/feeds.php:112
+#: classes/pref/feeds.php:1304
+#: classes/pref/feeds.php:1353
 msgid "Feeds"
 msgstr "Feeds"
 
-#: prefs.php:126 classes/pref/filters.php:248
+#: prefs.php:141
+#: classes/pref/filters.php:248
 msgid "Filters"
 msgstr "Filter"
 
-#: prefs.php:129 include/functions.php:1256 include/functions.php:1909
+#: prefs.php:144
+#: include/functions.php:1287
+#: include/functions.php:1940
 #: classes/pref/labels.php:90
 msgid "Labels"
 msgstr "Label"
 
-#: prefs.php:133
+#: prefs.php:148
 msgid "Users"
 msgstr "Benutzer"
 
-#: prefs.php:136
+#: prefs.php:151
 msgid "System"
 msgstr "System"
 
-#: register.php:187 include/login_form.php:252
+#: register.php:187
+#: include/login_form.php:252
 msgid "Create new account"
 msgstr "Neues Konto erstellen"
 
@@ -357,11 +412,20 @@ msgstr "Neues Konto erstellen"
 msgid "New user registrations are administratively disabled."
 msgstr "Die Registrierung für neue Benutzer wurde administrativ deaktiviert."
 
-#: register.php:197 register.php:242 register.php:255 register.php:270
-#: register.php:289 register.php:337 register.php:347 register.php:359
-#: classes/handler/public.php:742 classes/handler/public.php:813
-#: classes/handler/public.php:911 classes/handler/public.php:990
-#: classes/handler/public.php:1004 classes/handler/public.php:1011
+#: register.php:197
+#: register.php:242
+#: register.php:255
+#: register.php:270
+#: register.php:289
+#: register.php:337
+#: register.php:347
+#: register.php:359
+#: classes/handler/public.php:742
+#: classes/handler/public.php:813
+#: classes/handler/public.php:911
+#: classes/handler/public.php:990
+#: classes/handler/public.php:1004
+#: classes/handler/public.php:1011
 #: classes/handler/public.php:1036
 msgid "Return to Tiny Tiny RSS"
 msgstr "Zu Tiny Tiny RSS zurückkehren"
@@ -378,11 +442,13 @@ msgstr "Gewünschter Benutzername:"
 msgid "Check availability"
 msgstr "Verfügbarkeit prüfen"
 
-#: register.php:229 classes/handler/public.php:829
+#: register.php:229
+#: classes/handler/public.php:829
 msgid "Email:"
 msgstr "E-Mail:"
 
-#: register.php:232 classes/handler/public.php:834
+#: register.php:232
+#: classes/handler/public.php:834
 msgid "How much is two plus two:"
 msgstr "Wieviel ist zwei plus zwei:"
 
@@ -414,8 +480,12 @@ msgstr "Registrierung für neue Benutzer ist momentan geschlossen."
 msgid "Tiny Tiny RSS data update script."
 msgstr "Skript zum Updaten von Tiny Tiny RSS."
 
-#: include/digest.php:109 include/functions.php:1265 include/functions.php:1810
-#: include/functions.php:1895 include/functions.php:1917 classes/opml.php:421
+#: include/digest.php:109
+#: include/functions.php:1296
+#: include/functions.php:1841
+#: include/functions.php:1926
+#: include/functions.php:1948
+#: classes/opml.php:421
 #: classes/pref/feeds.php:228
 msgid "Uncategorized"
 msgstr "Unkategorisiert"
@@ -431,41 +501,44 @@ msgstr[1] "%d archivierte Artikel"
 msgid "No feeds found."
 msgstr "Keine Feeds gefunden."
 
-#: include/functions.php:958
+#: include/functions.php:989
 #, php-format
 msgid "%d min"
 msgstr "%d min"
 
-#: include/functions.php:1254 include/functions.php:1907
+#: include/functions.php:1285
+#: include/functions.php:1938
 msgid "Special"
 msgstr "Sonderfeeds"
 
-#: include/functions.php:1758 classes/pref/filters.php:229
+#: include/functions.php:1789
+#: classes/pref/filters.php:229
 #: classes/pref/filters.php:507
 msgid "All feeds"
 msgstr "Alle Feeds"
 
-#: include/functions.php:1962
+#: include/functions.php:1993
 msgid "Starred articles"
 msgstr "Markierte Artikel"
 
-#: include/functions.php:1964
+#: include/functions.php:1995
 msgid "Published articles"
 msgstr "Veröffentlichte Artikel"
 
-#: include/functions.php:1966
+#: include/functions.php:1997
 msgid "Fresh articles"
 msgstr "Neue Artikel"
 
-#: include/functions.php:1968 include/functions2.php:99
+#: include/functions.php:1999
+#: include/functions2.php:100
 msgid "All articles"
 msgstr "Alle Artikel"
 
-#: include/functions.php:1970
+#: include/functions.php:2001
 msgid "Archived articles"
 msgstr "Archivierte Artikel"
 
-#: include/functions.php:1972
+#: include/functions.php:2003
 msgid "Recently read"
 msgstr "Kürzlich gelesen"
 
@@ -513,15 +586,18 @@ msgstr "Suchdialog anzeigen"
 msgid "Article"
 msgstr "Artikel"
 
-#: include/functions2.php:63 js/viewfeed.js:1883
+#: include/functions2.php:63
+#: js/viewfeed.js:1883
 msgid "Toggle starred"
 msgstr "Markierung ein-/ausschalten"
 
-#: include/functions2.php:64 js/viewfeed.js:1894
+#: include/functions2.php:64
+#: js/viewfeed.js:1894
 msgid "Toggle published"
 msgstr "Veröffentlichung ein-/ausschalten"
 
-#: include/functions2.php:65 js/viewfeed.js:1872
+#: include/functions2.php:65
+#: js/viewfeed.js:1872
 msgid "Toggle unread"
 msgstr "Gelesen-Status umschalten"
 
@@ -533,11 +609,13 @@ msgstr "Tags bearbeiten"
 msgid "Open in new window"
 msgstr "In neuem Fenster öffnen"
 
-#: include/functions2.php:68 js/viewfeed.js:1913
+#: include/functions2.php:68
+#: js/viewfeed.js:1913
 msgid "Mark below as read"
 msgstr "Untere als gelesen markieren"
 
-#: include/functions2.php:69 js/viewfeed.js:1907
+#: include/functions2.php:69
+#: js/viewfeed.js:1907
 msgid "Mark above as read"
 msgstr "Obige als gelesen markieren"
 
@@ -565,7 +643,8 @@ msgstr "Artikel schließen/verbergen"
 msgid "Toggle article expansion (combined mode)"
 msgstr "Kombinierte Feed-Anzeige umschalten"
 
-#: include/functions2.php:77 plugins/embed_original/init.php:31
+#: include/functions2.php:77
+#: plugins/embed_original/init.php:31
 msgid "Toggle embed original"
 msgstr "\"Original einbetten\" umschalten"
 
@@ -597,8 +676,9 @@ msgstr "Auswahl umkehren"
 msgid "Deselect everything"
 msgstr "Auswahl aufheben"
 
-#: include/functions2.php:85 classes/pref/feeds.php:555
-#: classes/pref/feeds.php:821
+#: include/functions2.php:85
+#: classes/pref/feeds.php:555
+#: classes/pref/feeds.php:823
 msgid "Feed"
 msgstr "Feed"
 
@@ -610,11 +690,14 @@ msgstr "Aktuellen Feed aktualisieren"
 msgid "Un/hide read feeds"
 msgstr "Gelesene Feeds zeigen/verstecken"
 
-#: include/functions2.php:88 classes/pref/feeds.php:1352
+#: include/functions2.php:88
+#: classes/pref/feeds.php:1356
 msgid "Subscribe to feed"
 msgstr "Feed abonnieren"
 
-#: include/functions2.php:89 js/FeedTree.js:139 js/PrefFeedTree.js:68
+#: include/functions2.php:89
+#: js/FeedTree.js:139
+#: js/PrefFeedTree.js:68
 #: js/viewfeed.js:2080
 msgid "Edit feed"
 msgstr "Feed bearbeiten"
@@ -624,124 +707,184 @@ msgid "Reverse headlines"
 msgstr "Schlagzeilensortierung umkehren"
 
 #: include/functions2.php:92
+msgid "Toggle headline grouping"
+msgstr ""
+
+#: include/functions2.php:93
 msgid "Debug feed update"
 msgstr "Aktualisierung im Diagnose-Modus durchführen"
 
-#: include/functions2.php:93
+#: include/functions2.php:94
 msgid "Debug viewfeed()"
 msgstr "viewfeed() debuggen"
 
-#: include/functions2.php:94 js/FeedTree.js:182
+#: include/functions2.php:95
+#: js/FeedTree.js:182
 msgid "Mark all feeds as read"
 msgstr "Alle Feeds als gelesen markieren"
 
-#: include/functions2.php:95
+#: include/functions2.php:96
 msgid "Un/collapse current category"
 msgstr "Aktuelle Kategorie ein-/ausklappen:"
 
-#: include/functions2.php:96
+#: include/functions2.php:97
 msgid "Toggle combined mode"
 msgstr "Kombinierte Feed-Anzeige umschalten"
 
-#: include/functions2.php:97
+#: include/functions2.php:98
 msgid "Toggle auto expand in combined mode"
 msgstr "Kombinierte Feed-Anzeige umschalten"
 
-#: include/functions2.php:98
+#: include/functions2.php:99
 msgid "Go to"
 msgstr "Gehe zu"
 
-#: include/functions2.php:100
+#: include/functions2.php:101
 msgid "Fresh"
 msgstr "Neu"
 
-#: include/functions2.php:103 js/tt-rss.js:466 js/tt-rss.js:650
+#: include/functions2.php:104
+#: js/tt-rss.js:497
+#: js/tt-rss.js:673
 msgid "Tag cloud"
 msgstr "Tagwolke"
 
-#: include/functions2.php:105
+#: include/functions2.php:106
 msgid "Other"
 msgstr "Sonstiges"
 
-#: include/functions2.php:106 classes/pref/labels.php:267
+#: include/functions2.php:107
+#: classes/pref/labels.php:267
 msgid "Create label"
 msgstr "Label erstellen"
 
-#: include/functions2.php:107 classes/pref/filters.php:753
+#: include/functions2.php:108
+#: classes/pref/filters.php:753
 msgid "Create filter"
 msgstr "Filter erstellen"
 
-#: include/functions2.php:108
+#: include/functions2.php:109
 msgid "Un/collapse sidebar"
 msgstr "Seitenleiste ein-/ausklappen"
 
-#: include/functions2.php:109
+#: include/functions2.php:110
 msgid "Show help dialog"
 msgstr "Hilfe anzeigen"
 
-#: include/functions2.php:663
+#: include/functions2.php:665
 #, php-format
 msgid "Search results: %s"
 msgstr "Suchergebnisse: %s"
 
-#: include/functions2.php:1317 classes/feeds.php:749
+#: include/functions2.php:1330
+#: classes/feeds.php:749
 msgid "comment"
 msgid_plural "comments"
 msgstr[0] "Kommentar"
 msgstr[1] "Kommentare"
 
-#: include/functions2.php:1321 classes/feeds.php:753
+#: include/functions2.php:1334
+#: classes/feeds.php:753
 msgid "comments"
 msgstr "Kommentare"
 
-#: include/functions2.php:1347
+#: include/functions2.php:1360
 msgid " - "
 msgstr " - "
 
-#: include/functions2.php:1380 include/functions2.php:1631
+#: include/functions2.php:1393
+#: include/functions2.php:1644
 #: classes/article.php:311
 msgid "no tags"
 msgstr "Keine Tags"
 
-#: include/functions2.php:1390 classes/feeds.php:735
+#: include/functions2.php:1403
+#: classes/feeds.php:735
 msgid "Edit tags for this article"
 msgstr "Tags für diesen Artikel bearbeiten"
 
-#: include/functions2.php:1422 classes/feeds.php:682
+#: include/functions2.php:1435
+#: classes/feeds.php:682
 msgid "Originally from:"
 msgstr "Original von:"
 
-#: include/functions2.php:1435 classes/pref/feeds.php:574 classes/feeds.php:695
+#: include/functions2.php:1448
+#: classes/pref/feeds.php:574
+#: classes/feeds.php:695
 msgid "Feed URL"
 msgstr "Feed URL"
 
-#: include/functions2.php:1472 classes/backend.php:105 classes/dlg.php:37
-#: classes/dlg.php:60 classes/dlg.php:93 classes/dlg.php:159
-#: classes/dlg.php:186 classes/pref/feeds.php:1654 classes/pref/feeds.php:1720
-#: classes/pref/filters.php:204 classes/pref/prefs.php:1105
-#: plugins/af_psql_trgm/init.php:102 plugins/import_export/init.php:415
-#: plugins/import_export/init.php:460 plugins/share/init.php:121
+#: include/functions2.php:1485
+#: classes/backend.php:105
+#: classes/dlg.php:37
+#: classes/dlg.php:60
+#: classes/dlg.php:93
+#: classes/dlg.php:159
+#: classes/dlg.php:186
+#: classes/pref/feeds.php:1658
+#: classes/pref/feeds.php:1724
+#: classes/pref/filters.php:204
+#: classes/pref/prefs.php:1105
+#: plugins/af_psql_trgm/init.php:102
+#: plugins/import_export/init.php:415
+#: plugins/import_export/init.php:461
+#: plugins/share/init.php:121
 msgid "Close this window"
 msgstr "Fenster schließen"
 
-#: include/functions2.php:1669
+#: include/functions2.php:1682
 msgid "(edit note)"
 msgstr "(Notiz bearbeiten)"
 
-#: include/functions2.php:1924
+#: include/functions2.php:1937
 msgid "unknown type"
 msgstr "unbekannter Typ"
 
-#: include/functions2.php:2001
+#: include/functions2.php:2014
 msgid "Attachments"
 msgstr "Anhänge"
 
-#: include/login_form.php:197 classes/handler/public.php:569
+#: include/functions2.php:2456
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: include/functions2.php:2457
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr ""
+
+#: include/functions2.php:2458
+msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
+msgstr ""
+
+#: include/functions2.php:2459
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: include/functions2.php:2460
+#, fuzzy
+msgid "No file was uploaded"
+msgstr "Es wurde keine Datei hochgeladen."
+
+#: include/functions2.php:2461
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: include/functions2.php:2462
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: include/functions2.php:2463
+msgid "A PHP extension stopped the file upload."
+msgstr ""
+
+#: include/login_form.php:197
+#: classes/handler/public.php:569
 #: classes/handler/public.php:824
 msgid "Login:"
 msgstr "Benutzername:"
 
-#: include/login_form.php:207 classes/handler/public.php:572
+#: include/login_form.php:207
+#: classes/handler/public.php:572
 msgid "Password:"
 msgstr "Passwort:"
 
@@ -753,8 +896,10 @@ msgstr "Ich habe mein Passwort vergessen"
 msgid "Profile:"
 msgstr "Profil:"
 
-#: include/login_form.php:223 classes/handler/public.php:311
-#: classes/pref/prefs.php:1043 classes/rpc.php:63
+#: include/login_form.php:223
+#: classes/handler/public.php:311
+#: classes/pref/prefs.php:1043
+#: classes/rpc.php:63
 msgid "Default profile"
 msgstr "Standardprofil"
 
@@ -770,7 +915,8 @@ msgstr "Zeigt keine Bilder in Artikeln, reduziert die automatischen Aktualisieru
 msgid "Remember me"
 msgstr "Erinnere dich an mich"
 
-#: include/login_form.php:249 classes/handler/public.php:577
+#: include/login_form.php:249
+#: classes/handler/public.php:577
 msgid "Log in"
 msgstr "Anmelden"
 
@@ -794,30 +940,48 @@ msgstr "Artikel nicht gefunden."
 msgid "Tags for this article (separated by commas):"
 msgstr "Tags für diesen Artikel (durch Komma getrennt):"
 
-#: classes/article.php:222 classes/pref/labels.php:79 classes/pref/users.php:98
-#: classes/pref/feeds.php:799 classes/pref/feeds.php:939
-#: classes/pref/filters.php:485 classes/pref/prefs.php:989
-#: plugins/instances/init.php:245 plugins/nsfw/init.php:85
-#: plugins/note/init.php:51 plugins/af_readability/init.php:71
-#: plugins/af_redditimgur/init.php:68 plugins/af_psql_trgm/init.php:184
+#: classes/article.php:222
+#: classes/pref/labels.php:79
+#: classes/pref/users.php:98
+#: classes/pref/feeds.php:801
+#: classes/pref/feeds.php:943
+#: classes/pref/filters.php:485
+#: classes/pref/prefs.php:989
+#: plugins/instances/init.php:245
+#: plugins/nsfw/init.php:85
+#: plugins/note/init.php:51
+#: plugins/af_readability/init.php:71
+#: plugins/af_redditimgur/init.php:68
+#: plugins/af_psql_trgm/init.php:184
 #: plugins/mail/init.php:64
 msgid "Save"
 msgstr "Speichern"
 
-#: classes/article.php:224 classes/handler/public.php:546
-#: classes/handler/public.php:580 classes/pref/labels.php:81
-#: classes/pref/users.php:100 classes/pref/feeds.php:800
-#: classes/pref/feeds.php:942 classes/pref/feeds.php:1860
-#: classes/pref/filters.php:488 classes/pref/filters.php:902
-#: classes/pref/filters.php:983 classes/pref/filters.php:1076
-#: classes/pref/prefs.php:991 classes/feeds.php:1098 classes/feeds.php:1148
-#: classes/feeds.php:1185 plugins/instances/init.php:248
-#: plugins/instances/init.php:436 plugins/note/init.php:53
+#: classes/article.php:224
+#: classes/handler/public.php:546
+#: classes/handler/public.php:580
+#: classes/pref/labels.php:81
+#: classes/pref/users.php:100
+#: classes/pref/feeds.php:802
+#: classes/pref/feeds.php:946
+#: classes/pref/feeds.php:1865
+#: classes/pref/filters.php:488
+#: classes/pref/filters.php:902
+#: classes/pref/filters.php:983
+#: classes/pref/filters.php:1076
+#: classes/pref/prefs.php:991
+#: classes/feeds.php:1100
+#: classes/feeds.php:1150
+#: classes/feeds.php:1187
+#: plugins/instances/init.php:248
+#: plugins/instances/init.php:436
+#: plugins/note/init.php:53
 #: plugins/mail/init.php:172
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: classes/opml.php:28 classes/opml.php:33
+#: classes/opml.php:28
+#: classes/opml.php:33
 msgid "OPML Utility"
 msgstr "OPML Werkzeug"
 
@@ -863,16 +1027,18 @@ msgstr "Füge Filter hinzu..."
 msgid "Processing category: %s"
 msgstr "Verarbeite Kategorie: %s"
 
-#: classes/opml.php:470 plugins/import_export/init.php:428
+#: classes/opml.php:470
 #, php-format
 msgid "Upload failed with error code %d"
 msgstr "Upload schlug fehl. Fehlercode: %d"
 
-#: classes/opml.php:484 plugins/import_export/init.php:442
+#: classes/opml.php:484
+#: plugins/import_export/init.php:442
 msgid "Unable to move uploaded file."
 msgstr "Fehler: konnte die hochgeladene Datei nicht verschieben."
 
-#: classes/opml.php:488 plugins/import_export/init.php:446
+#: classes/opml.php:488
+#: plugins/import_export/init.php:446
 msgid "Error: please upload OPML file."
 msgstr "Fehler: bitte eine OPML-Datei hochladen."
 
@@ -912,7 +1078,9 @@ msgstr "Wenn Label und/oder Filter importiert wurden, müssen die Einstellungen
 msgid "Your Public OPML URL is:"
 msgstr "Ihre öffentliche OPML-URL lautet:"
 
-#: classes/dlg.php:57 classes/dlg.php:183 plugins/share/init.php:118
+#: classes/dlg.php:57
+#: classes/dlg.php:183
+#: plugins/share/init.php:118
 msgid "Generate new URL"
 msgstr "Erzeuge neue URL"
 
@@ -920,7 +1088,8 @@ msgstr "Erzeuge neue URL"
 msgid "Update daemon is enabled in configuration, but daemon process is not running, which prevents all feeds from updating. Please start the daemon process or contact instance owner."
 msgstr "Der Aktualisierungs-Daemon ist in den Einstellungen aktiviert, aber der Daemon Prozess läuft nicht, weshalb keine Feeds aktualisiert werden können. Bitte starten Sie den Prozess des Daemons oder benachrichtigen Sie den Besitzer der Instanz."
 
-#: classes/dlg.php:75 classes/dlg.php:84
+#: classes/dlg.php:75
+#: classes/dlg.php:84
 msgid "Last update:"
 msgstr "Letzte Aktualisierung:"
 
@@ -932,7 +1101,8 @@ msgstr "Der Aktualisierungs Daemon braucht zu lange, um eine Aktualisierung durc
 msgid "You can view this feed as RSS using the following URL:"
 msgstr "Sie finden diesen Feed als RSS unter der folgenden URL:"
 
-#: classes/handler/public.php:510 plugins/bookmarklets/init.php:40
+#: classes/handler/public.php:510
+#: plugins/bookmarklets/init.php:40
 msgid "Share with Tiny Tiny RSS"
 msgstr "Teilen mit Tiny Tiny RSS"
 
@@ -940,8 +1110,10 @@ msgstr "Teilen mit Tiny Tiny RSS"
 msgid "Title:"
 msgstr "Titel:"
 
-#: classes/handler/public.php:520 classes/pref/feeds.php:572
-#: plugins/instances/init.php:212 plugins/instances/init.php:401
+#: classes/handler/public.php:520
+#: classes/pref/feeds.php:572
+#: plugins/instances/init.php:212
+#: plugins/instances/init.php:401
 msgid "URL:"
 msgstr "URL:"
 
@@ -1014,7 +1186,8 @@ msgstr "Passwort-Wiederherstellung"
 msgid "You will need to provide valid account name and email. A password reset link will be sent to your email address."
 msgstr "Sie müssen einen gültigen Benutzernamen und EMail angeben. Das neue Passwort wird an Ihre EMail gesendet."
 
-#: classes/handler/public.php:839 classes/pref/users.php:350
+#: classes/handler/public.php:839
+#: classes/pref/users.php:350
 msgid "Reset password"
 msgstr "Passwort zurücksetzen"
 
@@ -1022,7 +1195,8 @@ msgstr "Passwort zurücksetzen"
 msgid "Some of the required form parameters are missing or incorrect."
 msgstr "Einige der benötigten Eingaben fehlen oder sind falsch."
 
-#: classes/handler/public.php:853 classes/handler/public.php:919
+#: classes/handler/public.php:853
+#: classes/handler/public.php:919
 msgid "Go back"
 msgstr "Zurück"
 
@@ -1046,7 +1220,8 @@ msgstr "Datenbank-Updater"
 msgid "Perform updates"
 msgstr "Aktualisierungen durchführen"
 
-#: classes/pref/labels.php:22 classes/pref/filters.php:348
+#: classes/pref/labels.php:22
+#: classes/pref/filters.php:348
 #: classes/pref/filters.php:823
 msgid "Caption"
 msgstr "Titel"
@@ -1068,38 +1243,59 @@ msgstr "Hintergrund"
 msgid "Created label <b>%s</b>"
 msgstr "Label <b>%s</b> erstellt"
 
-#: classes/pref/labels.php:258 classes/pref/users.php:334
-#: classes/pref/feeds.php:1340 classes/pref/feeds.php:1602
-#: classes/pref/feeds.php:1666 classes/pref/filters.php:359
-#: classes/pref/filters.php:407 classes/pref/filters.php:744
-#: classes/pref/filters.php:832 classes/pref/filters.php:859
-#: classes/pref/prefs.php:1000 plugins/instances/init.php:284
+#: classes/pref/labels.php:258
+#: classes/pref/users.php:334
+#: classes/pref/feeds.php:1344
+#: classes/pref/feeds.php:1606
+#: classes/pref/feeds.php:1670
+#: classes/pref/filters.php:359
+#: classes/pref/filters.php:407
+#: classes/pref/filters.php:744
+#: classes/pref/filters.php:832
+#: classes/pref/filters.php:859
+#: classes/pref/prefs.php:1000
+#: plugins/instances/init.php:284
 msgid "Select"
 msgstr "Auswahl"
 
-#: classes/pref/labels.php:261 classes/pref/users.php:337
-#: classes/pref/feeds.php:1343 classes/pref/feeds.php:1605
-#: classes/pref/feeds.php:1669 classes/pref/filters.php:362
-#: classes/pref/filters.php:410 classes/pref/filters.php:747
-#: classes/pref/filters.php:835 classes/pref/filters.php:862
-#: classes/pref/prefs.php:1003 classes/feeds.php:90
+#: classes/pref/labels.php:261
+#: classes/pref/users.php:337
+#: classes/pref/feeds.php:1347
+#: classes/pref/feeds.php:1609
+#: classes/pref/feeds.php:1673
+#: classes/pref/filters.php:362
+#: classes/pref/filters.php:410
+#: classes/pref/filters.php:747
+#: classes/pref/filters.php:835
+#: classes/pref/filters.php:862
+#: classes/pref/prefs.php:1003
+#: classes/feeds.php:90
 #: plugins/instances/init.php:287
 msgid "All"
 msgstr "Alle"
 
-#: classes/pref/labels.php:263 classes/pref/users.php:339
-#: classes/pref/feeds.php:1345 classes/pref/feeds.php:1607
-#: classes/pref/feeds.php:1671 classes/pref/filters.php:364
-#: classes/pref/filters.php:412 classes/pref/filters.php:749
-#: classes/pref/filters.php:837 classes/pref/filters.php:864
-#: classes/pref/prefs.php:1005 classes/feeds.php:93
+#: classes/pref/labels.php:263
+#: classes/pref/users.php:339
+#: classes/pref/feeds.php:1349
+#: classes/pref/feeds.php:1611
+#: classes/pref/feeds.php:1675
+#: classes/pref/filters.php:364
+#: classes/pref/filters.php:412
+#: classes/pref/filters.php:749
+#: classes/pref/filters.php:837
+#: classes/pref/filters.php:864
+#: classes/pref/prefs.php:1005
+#: classes/feeds.php:93
 #: plugins/instances/init.php:289
 msgid "None"
 msgstr "Keine"
 
-#: classes/pref/labels.php:270 classes/pref/users.php:348
-#: classes/pref/feeds.php:765 classes/pref/filters.php:478
-#: classes/pref/filters.php:766 classes/feeds.php:1147
+#: classes/pref/labels.php:270
+#: classes/pref/users.php:348
+#: classes/pref/feeds.php:767
+#: classes/pref/filters.php:478
+#: classes/pref/filters.php:766
+#: classes/feeds.php:1149
 #: plugins/instances/init.php:294
 msgid "Remove"
 msgstr "Entfernen"
@@ -1108,7 +1304,8 @@ msgstr "Entfernen"
 msgid "Clear colors"
 msgstr "Farben löschen"
 
-#: classes/pref/users.php:6 classes/pref/system.php:8
+#: classes/pref/users.php:6
+#: classes/pref/system.php:8
 #: plugins/instances/init.php:154
 msgid "Your access level is insufficient to open this tab."
 msgstr "Sie haben nicht die benötigten Rechte, um diese Registerkarte zu öffnen."
@@ -1117,8 +1314,10 @@ msgstr "Sie haben nicht die benötigten Rechte, um diese Registerkarte zu öffne
 msgid "Edit user"
 msgstr "Benutzer bearbeiten"
 
-#: classes/pref/users.php:56 classes/pref/feeds.php:637
-#: classes/pref/feeds.php:876 classes/feeds.php:1070
+#: classes/pref/users.php:56
+#: classes/pref/feeds.php:637
+#: classes/pref/feeds.php:878
+#: classes/feeds.php:1070
 msgid "Authentication"
 msgstr "Authentifizierung"
 
@@ -1126,12 +1325,14 @@ msgstr "Authentifizierung"
 msgid "Access level: "
 msgstr "Zugriffsberechtigung: "
 
-#: classes/pref/users.php:77 classes/pref/feeds.php:665
-#: classes/pref/feeds.php:892
+#: classes/pref/users.php:77
+#: classes/pref/feeds.php:667
+#: classes/pref/feeds.php:896
 msgid "Options"
 msgstr "Optionen"
 
-#: classes/pref/users.php:91 js/prefs.js:570
+#: classes/pref/users.php:91
+#: js/prefs.js:570
 msgid "User details"
 msgstr "Benutzerdetails"
 
@@ -1139,7 +1340,8 @@ msgstr "Benutzerdetails"
 msgid "User not found"
 msgstr "Benutzer nicht gefunden"
 
-#: classes/pref/users.php:132 classes/pref/users.php:400
+#: classes/pref/users.php:132
+#: classes/pref/users.php:400
 msgid "Registered"
 msgstr "Registriert"
 
@@ -1155,7 +1357,8 @@ msgstr "Anzahl abonnierter Feeds"
 msgid "Stored articles"
 msgstr "gespeicherte Artikel"
 
-#: classes/pref/users.php:145 classes/pref/users.php:399
+#: classes/pref/users.php:145
+#: classes/pref/users.php:399
 msgid "Subscribed feeds"
 msgstr "Abonnierte Feeds"
 
@@ -1188,8 +1391,11 @@ msgstr "Sende das neue Passwort von Benutzer <b>%s</b> an <b>%s</b>"
 msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] Benachrichtigung: Passwort geändert"
 
-#: classes/pref/users.php:324 classes/pref/feeds.php:1336
-#: classes/pref/filters.php:740 classes/feeds.php:1118 classes/feeds.php:1184
+#: classes/pref/users.php:324
+#: classes/pref/feeds.php:1340
+#: classes/pref/filters.php:740
+#: classes/feeds.php:1120
+#: classes/feeds.php:1186
 #: js/tt-rss.js:174
 msgid "Search"
 msgstr "Suchen"
@@ -1198,13 +1404,16 @@ msgstr "Suchen"
 msgid "Create user"
 msgstr "Benutzer anlegen"
 
-#: classes/pref/users.php:346 classes/pref/filters.php:759
+#: classes/pref/users.php:346
+#: classes/pref/filters.php:759
 #: plugins/instances/init.php:293
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: classes/pref/users.php:397 classes/pref/feeds.php:643
-#: classes/pref/feeds.php:880 classes/pref/feeds.php:1838
+#: classes/pref/users.php:397
+#: classes/pref/feeds.php:643
+#: classes/pref/feeds.php:882
+#: classes/pref/feeds.php:1842
 #: classes/feeds.php:1074
 msgid "Login"
 msgstr "Benutzername"
@@ -1217,7 +1426,8 @@ msgstr "Zugriffsberechtigung"
 msgid "Last login"
 msgstr "Zuletzt angemeldet"
 
-#: classes/pref/users.php:420 plugins/instances/init.php:334
+#: classes/pref/users.php:420
+#: plugins/instances/init.php:334
 msgid "Click to edit"
 msgstr "Zum Bearbeiten klicken"
 
@@ -1261,8 +1471,10 @@ msgstr "Datum"
 msgid "Check to enable field"
 msgstr "Ankreuzen, um das Feld zu aktivieren"
 
-#: classes/pref/feeds.php:65 classes/pref/feeds.php:214
-#: classes/pref/feeds.php:258 classes/pref/feeds.php:264
+#: classes/pref/feeds.php:65
+#: classes/pref/feeds.php:214
+#: classes/pref/feeds.php:258
+#: classes/pref/feeds.php:264
 #: classes/pref/feeds.php:290
 #, php-format
 msgid "(%d feed)"
@@ -1270,7 +1482,8 @@ msgid_plural "(%d feeds)"
 msgstr[0] "(%d Feed)"
 msgstr[1] "(%d Feeds)"
 
-#: classes/pref/feeds.php:537 classes/pref/prefs.php:18
+#: classes/pref/feeds.php:537
+#: classes/pref/prefs.php:18
 msgid "General"
 msgstr "Allgemein"
 
@@ -1278,227 +1491,251 @@ msgstr "Allgemein"
 msgid "Feed Title"
 msgstr "Feed-Titel"
 
-#: classes/pref/feeds.php:595 classes/pref/feeds.php:828
-#: classes/pref/feeds.php:1824 classes/feeds.php:1050
+#: classes/pref/feeds.php:595
+#: classes/pref/feeds.php:830
+#: classes/pref/feeds.php:1828
+#: classes/feeds.php:1050
 msgid "Place in category:"
 msgstr "In Kategorie einordnen:"
 
-#: classes/pref/feeds.php:608 classes/pref/feeds.php:842
+#: classes/pref/feeds.php:608
+#: classes/pref/feeds.php:844
 msgid "Language:"
 msgstr "Sprache:"
 
-#: classes/pref/feeds.php:615 classes/pref/feeds.php:851
+#: classes/pref/feeds.php:615
+#: classes/pref/feeds.php:853
 msgid "Update"
 msgstr "Aktualisieren"
 
-#: classes/pref/feeds.php:630 classes/pref/feeds.php:867
+#: classes/pref/feeds.php:630
+#: classes/pref/feeds.php:869
 msgid "Article purging:"
 msgstr "Artikel löschen:"
 
-#: classes/pref/feeds.php:656 classes/pref/feeds.php:886
-#: classes/pref/feeds.php:1841 classes/pref/prefs.php:245
-#: classes/feeds.php:1077
+#: classes/pref/feeds.php:658
+#: classes/pref/feeds.php:890
+#: classes/pref/feeds.php:1845
+#: classes/pref/prefs.php:245
+#: classes/feeds.php:1078
 msgid "Password"
 msgstr "Passwort"
 
-#: classes/pref/feeds.php:660
+#: classes/pref/feeds.php:662
 msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
 msgstr "<b>Hinweis:</b> Sie müssen Ihre Login-Informationen eingeben, wenn Ihr Feed eine Authentifizierung erfordert (außer Twitter-Feeds)."
 
-#: classes/pref/feeds.php:679 classes/pref/feeds.php:896
+#: classes/pref/feeds.php:681
+#: classes/pref/feeds.php:900
 msgid "Hide from Popular feeds"
 msgstr "Nicht unter beliebten Feeds aufführen"
 
-#: classes/pref/feeds.php:691 classes/pref/feeds.php:902
+#: classes/pref/feeds.php:693
+#: classes/pref/feeds.php:906
 msgid "Include in e-mail digest"
 msgstr "In E-Mail-Zusammenfassung aufnehmen"
 
-#: classes/pref/feeds.php:704 classes/pref/feeds.php:908
+#: classes/pref/feeds.php:706
+#: classes/pref/feeds.php:912
 msgid "Always display image attachments"
 msgstr "Angehängte Bilder immer anzeigen"
 
-#: classes/pref/feeds.php:717 classes/pref/feeds.php:916
+#: classes/pref/feeds.php:719
+#: classes/pref/feeds.php:920
 msgid "Do not embed images"
 msgstr "Bilder nicht einbetten"
 
-#: classes/pref/feeds.php:730 classes/pref/feeds.php:924
+#: classes/pref/feeds.php:732
+#: classes/pref/feeds.php:928
 msgid "Cache images locally"
 msgstr "Bilder lokal zwischenspeichern"
 
-#: classes/pref/feeds.php:742 classes/pref/feeds.php:930
+#: classes/pref/feeds.php:744
+#: classes/pref/feeds.php:934
 msgid "Mark updated articles as unread"
 msgstr "Aktualisierte Artikel als ungelesen markieren"
 
-#: classes/pref/feeds.php:746
+#: classes/pref/feeds.php:748
 msgid "Icon"
 msgstr "Symbol"
 
-#: classes/pref/feeds.php:763
+#: classes/pref/feeds.php:765
 msgid "Replace"
 msgstr "Ersetzen"
 
-#: classes/pref/feeds.php:770 classes/pref/prefs.php:706
+#: classes/pref/feeds.php:772
+#: classes/pref/prefs.php:706
 msgid "Plugins"
 msgstr "Plugins"
 
-#: classes/pref/feeds.php:790
+#: classes/pref/feeds.php:792
 msgid "Resubscribe to push updates"
 msgstr "Abonnierte Feeds:"
 
-#: classes/pref/feeds.php:797
+#: classes/pref/feeds.php:799
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr "PubSubHubbub-Abonnementstatus für Push-fähige Feeds zurücksetzen."
 
-#: classes/pref/feeds.php:1203 classes/pref/feeds.php:1256
+#: classes/pref/feeds.php:1207
+#: classes/pref/feeds.php:1260
 msgid "All done."
 msgstr "Fertig."
 
-#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1315
 msgid "Feeds with errors"
 msgstr "Feeds mit Fehlern"
 
-#: classes/pref/feeds.php:1318
+#: classes/pref/feeds.php:1322
 msgid "Inactive feeds"
 msgstr "Inaktive Feeds"
 
-#: classes/pref/feeds.php:1354
+#: classes/pref/feeds.php:1358
 msgid "Edit selected feeds"
 msgstr "Bearbeite ausgewählte Feeds"
 
-#: classes/pref/feeds.php:1356 classes/pref/feeds.php:1370
+#: classes/pref/feeds.php:1360
+#: classes/pref/feeds.php:1374
 #: classes/pref/filters.php:762
 msgid "Reset sort order"
 msgstr "Sortierreihenfolge zurücksetzen"
 
-#: classes/pref/feeds.php:1358 js/prefs.js:1737
+#: classes/pref/feeds.php:1362
+#: js/prefs.js:1737
 msgid "Batch subscribe"
 msgstr "Mehrere Feeds abonnieren"
 
-#: classes/pref/feeds.php:1365
+#: classes/pref/feeds.php:1369
 msgid "Categories"
 msgstr "Kategorien"
 
-#: classes/pref/feeds.php:1368
+#: classes/pref/feeds.php:1372
 msgid "Add category"
 msgstr "Kategorie anlegen"
 
-#: classes/pref/feeds.php:1372
+#: classes/pref/feeds.php:1376
 msgid "Remove selected"
 msgstr "Ausgewählte Kategorien löschen"
 
-#: classes/pref/feeds.php:1383
+#: classes/pref/feeds.php:1387
 msgid "More actions..."
 msgstr "Mehr Aktionen..."
 
-#: classes/pref/feeds.php:1387
+#: classes/pref/feeds.php:1391
 msgid "Manual purge"
 msgstr "Manuelles Löschen"
 
-#: classes/pref/feeds.php:1391
+#: classes/pref/feeds.php:1395
 msgid "Clear feed data"
 msgstr "Feed-Daten löschen"
 
-#: classes/pref/feeds.php:1392 classes/pref/filters.php:770
+#: classes/pref/feeds.php:1396
+#: classes/pref/filters.php:770
 msgid "Rescore articles"
 msgstr "Artikel neu bewerten"
 
-#: classes/pref/feeds.php:1444
+#: classes/pref/feeds.php:1448
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1446
+#: classes/pref/feeds.php:1450
 msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
 msgstr "Über OPML können Feeds, Filter, Label und Tiny-Tiny-RSS-Einstellungen importiert und exportiert werden."
 
-#: classes/pref/feeds.php:1447
+#: classes/pref/feeds.php:1451
 msgid "Only main settings profile can be migrated using OPML."
 msgstr "Nur das Hauptprofil kann mit OPML gesichert werden."
 
-#: classes/pref/feeds.php:1460
+#: classes/pref/feeds.php:1464
 msgid "Import my OPML"
 msgstr "OPML importieren"
 
-#: classes/pref/feeds.php:1466
+#: classes/pref/feeds.php:1470
 msgid "Filename:"
 msgstr "Dateiname:"
 
-#: classes/pref/feeds.php:1468
+#: classes/pref/feeds.php:1472
 msgid "Include settings"
 msgstr "Inklusive Einstellungen"
 
-#: classes/pref/feeds.php:1472
+#: classes/pref/feeds.php:1476
 msgid "Export OPML"
 msgstr "OPML exportieren"
 
-#: classes/pref/feeds.php:1476
+#: classes/pref/feeds.php:1480
 msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
 msgstr "Ihre OPML können veröffentlicht werden, so dass jeder, der die URL kennt, diese abonnieren kann."
 
-#: classes/pref/feeds.php:1480
+#: classes/pref/feeds.php:1484
 msgid "Public OPML URL"
 msgstr "Öffentliche OPML-URL"
 
-#: classes/pref/feeds.php:1481
+#: classes/pref/feeds.php:1485
 msgid "Display published OPML URL"
 msgstr "Zeige öffentliche OPML-URL"
 
-#: classes/pref/feeds.php:1490
+#: classes/pref/feeds.php:1494
 msgid "Firefox integration"
 msgstr "Firefox-Integration"
 
-#: classes/pref/feeds.php:1492
+#: classes/pref/feeds.php:1496
 msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
 msgstr "Tiny Tiny RSS kann durch den folgenden Link als Feedreader für Firefox verwendet werden."
 
-#: classes/pref/feeds.php:1499
+#: classes/pref/feeds.php:1503
 msgid "Click here to register this site as a feed reader."
 msgstr "Diese Website als Feedreader registrieren."
 
-#: classes/pref/feeds.php:1507
+#: classes/pref/feeds.php:1511
 msgid "Published & shared articles / Generated feeds"
 msgstr "Veröffentlichte & geteilte Artikel / erzeugte Feeds"
 
-#: classes/pref/feeds.php:1509
+#: classes/pref/feeds.php:1513
 msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
 msgstr "Veröffentlichte Artikel werden als öffentlicher RSS-Feed exportiert und können von jedem abonniert werden, der die nachstehende URL kennt."
 
-#: classes/pref/feeds.php:1516 classes/feeds.php:54 classes/feeds.php:134
+#: classes/pref/feeds.php:1520
+#: classes/feeds.php:54
+#: classes/feeds.php:134
 msgid "View as RSS"
 msgstr "Als RSS anzeigen"
 
-#: classes/pref/feeds.php:1517
+#: classes/pref/feeds.php:1521
 msgid "Display URL"
 msgstr "Zeige URL an"
 
-#: classes/pref/feeds.php:1520
+#: classes/pref/feeds.php:1524
 msgid "Clear all generated URLs"
 msgstr "Alle generierten URLs löschen"
 
-#: classes/pref/feeds.php:1598
+#: classes/pref/feeds.php:1602
 msgid "These feeds have not been updated with new content for 3 months (oldest first):"
 msgstr "Folgende Feeds konnten seit 3 Monaten nicht aktualisiert werden (älteste zuerst):"
 
-#: classes/pref/feeds.php:1632 classes/pref/feeds.php:1696
+#: classes/pref/feeds.php:1636
+#: classes/pref/feeds.php:1700
 msgid "Click to edit feed"
 msgstr "Zum Bearbeiten klicken"
 
-#: classes/pref/feeds.php:1650 classes/pref/feeds.php:1716
+#: classes/pref/feeds.php:1654
+#: classes/pref/feeds.php:1720
 msgid "Unsubscribe from selected feeds"
 msgstr "Ausgewählte Feeds abbestellen"
 
-#: classes/pref/feeds.php:1821
+#: classes/pref/feeds.php:1825
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr "Einen gültigen RSS Feed pro Zeile hinzufügen (Es findet keine Feederkennung statt)"
 
-#: classes/pref/feeds.php:1830
+#: classes/pref/feeds.php:1834
 msgid "Feeds to subscribe, One per line"
 msgstr "Zu abonnierende Feeds, Einen pro Zeile"
 
-#: classes/pref/feeds.php:1852
+#: classes/pref/feeds.php:1857
 msgid "Feeds require authentication."
 msgstr "Feeds benötigen Authentifizierung."
 
-#: classes/pref/feeds.php:1859 classes/feeds.php:1092 classes/feeds.php:1146
+#: classes/pref/feeds.php:1864
+#: classes/feeds.php:1094
+#: classes/feeds.php:1148
 msgid "Subscribe"
 msgstr "Abonnieren"
 
@@ -1506,48 +1743,60 @@ msgstr "Abonnieren"
 msgid "Preview article"
 msgstr "Artikel-Vorschau"
 
-#: classes/pref/filters.php:239 classes/pref/filters.php:518
+#: classes/pref/filters.php:239
+#: classes/pref/filters.php:518
 msgid "(inverse)"
 msgstr "Invertiert"
 
-#: classes/pref/filters.php:235 classes/pref/filters.php:517
+#: classes/pref/filters.php:235
+#: classes/pref/filters.php:517
 #, php-format
 msgid "%s on %s in %s %s"
 msgstr "%s innerhalb %s von %s %s"
 
-#: classes/pref/filters.php:354 classes/pref/filters.php:827
+#: classes/pref/filters.php:354
+#: classes/pref/filters.php:827
 #: classes/pref/filters.php:942
 msgid "Match"
 msgstr "Kriterien"
 
-#: classes/pref/filters.php:368 classes/pref/filters.php:416
-#: classes/pref/filters.php:841 classes/pref/filters.php:868
+#: classes/pref/filters.php:368
+#: classes/pref/filters.php:416
+#: classes/pref/filters.php:841
+#: classes/pref/filters.php:868
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: classes/pref/filters.php:371 classes/pref/filters.php:419
-#: classes/pref/filters.php:844 classes/pref/filters.php:871
+#: classes/pref/filters.php:371
+#: classes/pref/filters.php:419
+#: classes/pref/filters.php:844
+#: classes/pref/filters.php:871
 #: classes/feeds.php:116
 msgid "Delete"
 msgstr "Löschen"
 
-#: classes/pref/filters.php:402 classes/pref/filters.php:854
+#: classes/pref/filters.php:402
+#: classes/pref/filters.php:854
 msgid "Apply actions"
 msgstr "Aktionen anwenden"
 
-#: classes/pref/filters.php:452 classes/pref/filters.php:883
+#: classes/pref/filters.php:452
+#: classes/pref/filters.php:883
 msgid "Enabled"
 msgstr "Aktiviert"
 
-#: classes/pref/filters.php:461 classes/pref/filters.php:886
+#: classes/pref/filters.php:461
+#: classes/pref/filters.php:886
 msgid "Match any rule"
 msgstr "Ein erfülltes Kriterium ist ausreichend"
 
-#: classes/pref/filters.php:470 classes/pref/filters.php:889
+#: classes/pref/filters.php:470
+#: classes/pref/filters.php:889
 msgid "Inverse matching"
 msgstr "Invertierte Übereinstimmung"
 
-#: classes/pref/filters.php:482 classes/pref/filters.php:896
+#: classes/pref/filters.php:482
+#: classes/pref/filters.php:896
 msgid "Test"
 msgstr "Test"
 
@@ -1567,7 +1816,8 @@ msgstr "Invertiere reguläre Ausdrücke"
 msgid "on field"
 msgstr "in Feld"
 
-#: classes/pref/filters.php:962 js/PrefFilterTree.js:61
+#: classes/pref/filters.php:962
+#: js/PrefFilterTree.js:64
 msgid "in"
 msgstr "in"
 
@@ -1579,7 +1829,8 @@ msgstr "Wiki:Filter"
 msgid "Save rule"
 msgstr "Regel speichern"
 
-#: classes/pref/filters.php:980 js/functions.js:1012
+#: classes/pref/filters.php:980
+#: js/functions.js:1012
 msgid "Add rule"
 msgstr "Regel hinzufügen"
 
@@ -1595,7 +1846,8 @@ msgstr "keine Aktionen verfügbar"
 msgid "Save action"
 msgstr "Aktion speichern"
 
-#: classes/pref/filters.php:1073 js/functions.js:1038
+#: classes/pref/filters.php:1073
+#: js/functions.js:1038
 msgid "Add action"
 msgstr "Aktion hinzufügen"
 
@@ -1793,7 +2045,8 @@ msgstr "Unsichere Tags aus Artikeln entfernen"
 msgid "Strip all but most common HTML tags when reading articles."
 msgstr "Alle außer den meist verwendeten HTML Tags beim Lesen entfernen."
 
-#: classes/pref/prefs.php:53 js/prefs.js:1692
+#: classes/pref/prefs.php:53
+#: js/prefs.js:1692
 msgid "Customize stylesheet"
 msgstr "Benutzerdefiniertes Stylesheet"
 
@@ -1893,7 +2146,8 @@ msgstr "Einmalpasswörter (OTP) / Authentifikator"
 msgid "One time passwords are currently enabled. Enter your current password below to disable."
 msgstr "Einmalpasswörter sind aktiviert. Gib dein aktuelles Passwort ein, um diese zu deaktivieren."
 
-#: classes/pref/prefs.php:347 classes/pref/prefs.php:398
+#: classes/pref/prefs.php:347
+#: classes/pref/prefs.php:398
 msgid "Enter your password"
 msgstr "Geben Sie Ihr Passwort ein"
 
@@ -1970,27 +2224,33 @@ msgstr "Mehr Plugins im tt-rss.org <a class=\"visibleLink\" target=\"_blank\" hr
 msgid "System plugins"
 msgstr "System-Plugins"
 
-#: classes/pref/prefs.php:744 classes/pref/prefs.php:800
+#: classes/pref/prefs.php:744
+#: classes/pref/prefs.php:800
 msgid "Plugin"
 msgstr "Plugin"
 
-#: classes/pref/prefs.php:745 classes/pref/prefs.php:801
+#: classes/pref/prefs.php:745
+#: classes/pref/prefs.php:801
 msgid "Description"
 msgstr "Beschreibung"
 
-#: classes/pref/prefs.php:746 classes/pref/prefs.php:802
+#: classes/pref/prefs.php:746
+#: classes/pref/prefs.php:802
 msgid "Version"
 msgstr "Version"
 
-#: classes/pref/prefs.php:747 classes/pref/prefs.php:803
+#: classes/pref/prefs.php:747
+#: classes/pref/prefs.php:803
 msgid "Author"
 msgstr "Autor"
 
-#: classes/pref/prefs.php:778 classes/pref/prefs.php:837
+#: classes/pref/prefs.php:778
+#: classes/pref/prefs.php:837
 msgid "more info"
 msgstr "weitere Informationen"
 
-#: classes/pref/prefs.php:787 classes/pref/prefs.php:846
+#: classes/pref/prefs.php:787
+#: classes/pref/prefs.php:846
 msgid "Clear data"
 msgstr "Daten löschen"
 
@@ -2006,7 +2266,8 @@ msgstr "Ausgewählte Plugins aktivieren"
 msgid "Incorrect one time password"
 msgstr "Falsches Einmalpasswort"
 
-#: classes/pref/prefs.php:932 classes/pref/prefs.php:949
+#: classes/pref/prefs.php:932
+#: classes/pref/prefs.php:949
 msgid "Incorrect password"
 msgstr "Falsches Passwort"
 
@@ -2019,7 +2280,8 @@ msgstr "Sie können Farben, Schriftarten und das Layout Ihres aktuell gewählten
 msgid "Create profile"
 msgstr "Profil erstellen"
 
-#: classes/pref/prefs.php:1037 classes/pref/prefs.php:1065
+#: classes/pref/prefs.php:1037
+#: classes/pref/prefs.php:1065
 msgid "(active)"
 msgstr "(aktiv)"
 
@@ -2068,7 +2330,9 @@ msgstr "Archiv"
 msgid "Move back"
 msgstr "Zurückgehen"
 
-#: classes/feeds.php:121 classes/feeds.php:126 plugins/mail/init.php:75
+#: classes/feeds.php:121
+#: classes/feeds.php:126
+#: plugins/mail/init.php:75
 #: plugins/mailto/init.php:25
 msgid "Forward by email"
 msgstr "Per E-Mail weiterleiten"
@@ -2077,7 +2341,8 @@ msgstr "Per E-Mail weiterleiten"
 msgid "Feed:"
 msgstr "Feed:"
 
-#: classes/feeds.php:223 classes/feeds.php:889
+#: classes/feeds.php:223
+#: classes/feeds.php:889
 msgid "Feed not found."
 msgstr "Feed nicht gefunden."
 
@@ -2090,7 +2355,8 @@ msgstr "Niemals"
 msgid "Imported at %s"
 msgstr "Importiert nach %s"
 
-#: classes/feeds.php:466 classes/feeds.php:563
+#: classes/feeds.php:466
+#: classes/feeds.php:563
 msgid "mark feed as read"
 msgstr "Feed als gelesen markieren"
 
@@ -2118,12 +2384,14 @@ msgstr "Keine Artikel zum Anzeigen gefunden. Sie können Artikel zu Labeln manue
 msgid "No articles found to display."
 msgstr "Keine Artikel zum Anzeigen gefunden."
 
-#: classes/feeds.php:815 classes/feeds.php:989
+#: classes/feeds.php:815
+#: classes/feeds.php:989
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "Feeds zuletzt aktualisiert am %s"
 
-#: classes/feeds.php:825 classes/feeds.php:999
+#: classes/feeds.php:825
+#: classes/feeds.php:999
 msgid "Some feeds have update errors (click for details)"
 msgstr "Einige Feeds haben Aktualisierungsfehler (klicken für Details)"
 
@@ -2131,7 +2399,8 @@ msgstr "Einige Feeds haben Aktualisierungsfehler (klicken für Details)"
 msgid "No feed selected."
 msgstr "Keinen Feed ausgewählt."
 
-#: classes/feeds.php:1036 classes/feeds.php:1044
+#: classes/feeds.php:1036
+#: classes/feeds.php:1044
 msgid "Feed or site URL"
 msgstr "URL von Feed oder Seite"
 
@@ -2139,40 +2408,40 @@ msgstr "URL von Feed oder Seite"
 msgid "Available feeds"
 msgstr "Verfügbare Feeds"
 
-#: classes/feeds.php:1087
+#: classes/feeds.php:1089
 msgid "This feed requires authentication."
 msgstr "Dieser Feed erfordert Authentifizierung."
 
-#: classes/feeds.php:1095
+#: classes/feeds.php:1097
 msgid "More feeds"
 msgstr "Weitere Feeds"
 
-#: classes/feeds.php:1122
+#: classes/feeds.php:1124
 msgid "Popular feeds"
 msgstr "Beliebte Feeds"
 
-#: classes/feeds.php:1123
+#: classes/feeds.php:1125
 msgid "Feed archive"
 msgstr "Feed-Archiv"
 
-#: classes/feeds.php:1126
+#: classes/feeds.php:1128
 msgid "limit:"
 msgstr "Grenzwert:"
 
-#: classes/feeds.php:1158
+#: classes/feeds.php:1160
 msgid "Look for"
 msgstr "Suche nach"
 
-#: classes/feeds.php:1166
+#: classes/feeds.php:1168
 #, php-format
 msgid "in %s"
 msgstr "in %s"
 
-#: classes/feeds.php:1171
+#: classes/feeds.php:1173
 msgid "Used for word stemming"
 msgstr "Verwendet für Wortstamm"
 
-#: classes/feeds.php:1180
+#: classes/feeds.php:1182
 msgid "Search syntax"
 msgstr "Such-Syntax"
 
@@ -2180,29 +2449,35 @@ msgstr "Such-Syntax"
 msgid "Linked"
 msgstr "Verbunden"
 
-#: plugins/instances/init.php:204 plugins/instances/init.php:395
+#: plugins/instances/init.php:204
+#: plugins/instances/init.php:395
 msgid "Instance"
 msgstr "Instanz"
 
-#: plugins/instances/init.php:215 plugins/instances/init.php:312
+#: plugins/instances/init.php:215
+#: plugins/instances/init.php:312
 #: plugins/instances/init.php:404
 msgid "Instance URL"
 msgstr "Instanz-URL"
 
-#: plugins/instances/init.php:226 plugins/instances/init.php:414
+#: plugins/instances/init.php:226
+#: plugins/instances/init.php:414
 msgid "Access key:"
 msgstr "Zugriffsberechtigung:"
 
-#: plugins/instances/init.php:229 plugins/instances/init.php:313
+#: plugins/instances/init.php:229
+#: plugins/instances/init.php:313
 #: plugins/instances/init.php:417
 msgid "Access key"
 msgstr "Zugriffsberechtigung"
 
-#: plugins/instances/init.php:233 plugins/instances/init.php:421
+#: plugins/instances/init.php:233
+#: plugins/instances/init.php:421
 msgid "Use one access key for both linked instances."
 msgstr "Benutzen Sie den selben Zugriffschlüssel für beide verbundenen Instanzen."
 
-#: plugins/instances/init.php:241 plugins/instances/init.php:429
+#: plugins/instances/init.php:241
+#: plugins/instances/init.php:429
 msgid "Generate new key"
 msgstr "Neuen Zugriffsschlüssel erzeugen"
 
@@ -2230,7 +2505,8 @@ msgstr "Gespeicherte Feeds"
 msgid "Create link"
 msgstr "Verbindung herstellen"
 
-#: plugins/nsfw/init.php:30 plugins/nsfw/init.php:42
+#: plugins/nsfw/init.php:30
+#: plugins/nsfw/init.php:42
 msgid "Not work safe (click to toggle)"
 msgstr "NSFW (Klicken zum Anzeigen)"
 
@@ -2246,11 +2522,13 @@ msgstr "Liste von NSFW-Tags (kommagetrennt)"
 msgid "Configuration saved."
 msgstr "Die Einstellungen wurden gespeichert."
 
-#: plugins/note/init.php:26 plugins/note/note.js:11
+#: plugins/note/init.php:26
+#: plugins/note/note.js:11
 msgid "Edit article note"
 msgstr "Artikelnotizen bearbeiten"
 
-#: plugins/vf_shared/init.php:16 plugins/vf_shared/init.php:69
+#: plugins/vf_shared/init.php:16
+#: plugins/vf_shared/init.php:69
 msgid "Shared articles"
 msgstr "Geteilte Artikel"
 
@@ -2282,7 +2560,8 @@ msgstr "af_readability Einstellungen"
 msgid "Use Readability for pages shared via bookmarklet."
 msgstr "Verwende Readability für über das Bookmarklet geteilte Seiten."
 
-#: plugins/af_readability/init.php:82 plugins/af_psql_trgm/init.php:195
+#: plugins/af_readability/init.php:82
+#: plugins/af_psql_trgm/init.php:195
 msgid "Currently enabled for (click to edit):"
 msgstr "Zur Zeit aktiviert für (klicken zum Bearbeiten):"
 
@@ -2323,7 +2602,8 @@ msgstr "Daten gespeichert (%s, %d)"
 msgid "Show related articles"
 msgstr "zeige verwandte Artikel"
 
-#: plugins/af_psql_trgm/init.php:118 plugins/af_psql_trgm/init.php:223
+#: plugins/af_psql_trgm/init.php:118
+#: plugins/af_psql_trgm/init.php:223
 msgid "Mark similar articles as read"
 msgstr "markiere ähnliche Artikel als gelesen"
 
@@ -2416,6 +2696,11 @@ msgstr "Konnte XML-Datei nicht laden."
 msgid "Prepare data"
 msgstr "Bereite Daten vor"
 
+#: plugins/import_export/init.php:428
+#, fuzzy, php-format
+msgid "Upload failed with error code %d (%s)"
+msgstr "Upload schlug fehl. Fehlercode: %d"
+
 #: plugins/import_export/init.php:454
 msgid "No file uploaded."
 msgstr "Es wurde keine Datei hochgeladen."
@@ -2432,12 +2717,15 @@ msgstr "Mail-Plugin"
 msgid "You can set predefined email addressed here (comma-separated list):"
 msgstr "Sie können hier Mailadressen vordefinieren (Komma getrennte Liste):"
 
-#: plugins/mail/init.php:112 plugins/mail/init.php:118
-#: plugins/mailto/init.php:49 plugins/mailto/init.php:55
+#: plugins/mail/init.php:112
+#: plugins/mail/init.php:118
+#: plugins/mailto/init.php:49
+#: plugins/mailto/init.php:55
 msgid "[Forwarded]"
 msgstr "[Weitergeleitet]"
 
-#: plugins/mail/init.php:112 plugins/mailto/init.php:49
+#: plugins/mail/init.php:112
+#: plugins/mailto/init.php:49
 msgid "Multiple articles"
 msgstr "Mehrere Artikel"
 
@@ -2522,7 +2810,7 @@ msgstr "Kategorie bearbeiten"
 msgid "Remove category"
 msgstr "Kategorie entfernen"
 
-#: js/PrefFilterTree.js:64
+#: js/PrefFilterTree.js:67
 msgid "Inverse"
 msgstr "Invertiert"
 
@@ -2572,7 +2860,8 @@ msgstr "Abonnement zurücksetzen? Tiny Tiny RSS wird versuchen, sich bei der nä
 msgid "Subscription reset."
 msgstr "Abonnement zurückgesetzt."
 
-#: js/functions.js:1311 js/tt-rss.js:682
+#: js/functions.js:1311
+#: js/tt-rss.js:705
 #, perl-format
 msgid "Unsubscribe from %s?"
 msgstr "%s abbestellen?"
@@ -2589,12 +2878,19 @@ msgstr "Bitte geben Sie den Kategorietitel ein:"
 msgid "Generate new syndication address for this feed?"
 msgstr "Neue Veröffentlichungsadresse für diesen Feed erzeugen?"
 
-#: js/functions.js:1456 js/prefs.js:1223
+#: js/functions.js:1456
+#: js/prefs.js:1223
 msgid "Trying to change address..."
 msgstr "Versuche, die Adresse zu ändern..."
 
-#: js/functions.js:1757 js/functions.js:1867 js/prefs.js:419 js/prefs.js:449
-#: js/prefs.js:481 js/prefs.js:634 js/prefs.js:654 js/prefs.js:1199
+#: js/functions.js:1757
+#: js/functions.js:1867
+#: js/prefs.js:419
+#: js/prefs.js:449
+#: js/prefs.js:481
+#: js/prefs.js:634
+#: js/prefs.js:654
+#: js/prefs.js:1199
 #: js/prefs.js:1344
 msgid "No feeds are selected."
 msgstr "Keine Feeds ausgewählt."
@@ -2607,11 +2903,13 @@ msgstr "Die ausgewählten Feeds aus dem Archiv löschen? Feeds mit gespeicherten
 msgid "Feeds with update errors"
 msgstr "Feeds mit Aktualisierungsfehlern"
 
-#: js/functions.js:1849 js/prefs.js:1181
+#: js/functions.js:1849
+#: js/prefs.js:1181
 msgid "Remove selected feeds?"
 msgstr "Ausgewählte Feeds entfernen?"
 
-#: js/functions.js:1852 js/prefs.js:1184
+#: js/functions.js:1852
+#: js/prefs.js:1184
 msgid "Removing selected feeds..."
 msgstr "Ausgewählte Feeds werden entfernt..."
 
@@ -2631,8 +2929,11 @@ msgstr "Füge Benutzer hinzu..."
 msgid "User Editor"
 msgstr "Benutzereditor"
 
-#: js/prefs.js:112 js/prefs.js:216 js/prefs.js:741
-#: plugins/instances/instances.js:26 plugins/instances/instances.js:89
+#: js/prefs.js:112
+#: js/prefs.js:216
+#: js/prefs.js:741
+#: plugins/instances/instances.js:26
+#: plugins/instances/instances.js:89
 #: js/functions.js:1664
 msgid "Saving data..."
 msgstr "Speichere Daten..."
@@ -2657,7 +2958,8 @@ msgstr "Ausgewählte Label entfernen?"
 msgid "Removing selected labels..."
 msgstr "Ausgewählte Label werden entfernt..."
 
-#: js/prefs.js:317 js/prefs.js:1385
+#: js/prefs.js:317
+#: js/prefs.js:1385
 msgid "No labels are selected."
 msgstr "Keine Label ausgewählt."
 
@@ -2669,7 +2971,10 @@ msgstr "Ausgewählte Benutzer löschen? Weder der Administrator noch Ihr eigenes
 msgid "Removing selected users..."
 msgstr "Ausgewählte Benutzer werden entfernt..."
 
-#: js/prefs.js:348 js/prefs.js:492 js/prefs.js:513 js/prefs.js:552
+#: js/prefs.js:348
+#: js/prefs.js:492
+#: js/prefs.js:513
+#: js/prefs.js:552
 msgid "No users are selected."
 msgstr "Keine Benutzer ausgewählt."
 
@@ -2681,7 +2986,9 @@ msgstr "Ausgewählte Filter entfernen?"
 msgid "Removing selected filters..."
 msgstr "Ausgewählte Filter werden entfernt..."
 
-#: js/prefs.js:381 js/prefs.js:589 js/prefs.js:608
+#: js/prefs.js:381
+#: js/prefs.js:589
+#: js/prefs.js:608
 msgid "No filters are selected."
 msgstr "Keine Filter ausgewählt."
 
@@ -2713,7 +3020,9 @@ msgstr "Artikel für wieviele Tage aufbewahren (0 - Standardwert nutzen)?"
 msgid "Purging selected feed..."
 msgstr "Lösche ausgewählten Feed..."
 
-#: js/prefs.js:497 js/prefs.js:518 js/prefs.js:557
+#: js/prefs.js:497
+#: js/prefs.js:518
+#: js/prefs.js:557
 msgid "Please select only one user."
 msgstr "Bitte nur einen Benutzer auswählen."
 
@@ -2753,7 +3062,8 @@ msgstr "OPML Import"
 msgid "Please choose an OPML file first."
 msgstr "Bitte zuerst eine OPML-Datei auswählen."
 
-#: js/prefs.js:807 plugins/import_export/import_export.js:115
+#: js/prefs.js:807
+#: plugins/import_export/import_export.js:115
 msgid "Importing, please wait..."
 msgstr "Importiere, bitte warten..."
 
@@ -2781,42 +3091,53 @@ msgstr "Alle Artikel als gelesen markieren?"
 msgid "Marking all feeds as read..."
 msgstr "Alle Feeds werden als gelesen markiert..."
 
-#: js/tt-rss.js:383
+#: js/tt-rss.js:404
 msgid "Please enable mail plugin first."
 msgstr "Bitte erst das Mail-Plugin aktivieren."
 
-#: js/tt-rss.js:431 js/functions.js:1643 js/tt-rss.js:663
+#: js/tt-rss.js:452
+#: js/functions.js:1643
+#: js/tt-rss.js:686
 msgid "You can't edit this kind of feed."
 msgstr "Sie können diese Art von Feed nicht bearbeiten."
 
-#: js/tt-rss.js:502
+#: js/tt-rss.js:533
 msgid "Please enable embed_original plugin first."
 msgstr "Bitte erst das \"Original einbetten\" Plugin aktivieren."
 
-#: js/tt-rss.js:515 js/tt-rss.js:713
+#: js/tt-rss.js:546
+#: js/tt-rss.js:736
 msgid "Widescreen is not available in combined mode."
 msgstr "Widescreen ist in der kombinierten Ansicht nicht verfügbar"
 
-#: js/tt-rss.js:827
+#: js/tt-rss.js:850
 msgid "You can't rescore this kind of feed."
 msgstr "Sie können diese Art von Feed nicht neu bewerten."
 
-#: js/tt-rss.js:832 js/tt-rss.js:676
+#: js/tt-rss.js:855
+#: js/tt-rss.js:699
 msgid "Please select some feed first."
 msgstr "Bitte erst einen Feed auswählen."
 
-#: js/tt-rss.js:837
+#: js/tt-rss.js:860
 #, perl-format
 msgid "Rescore articles in %s?"
 msgstr "Artikel in %s neu bewerten?"
 
-#: js/tt-rss.js:840
+#: js/tt-rss.js:863
 msgid "Rescoring articles..."
 msgstr "Artikel werden neu bewertet..."
 
-#: js/viewfeed.js:1011 js/viewfeed.js:1054 js/viewfeed.js:1107
-#: js/viewfeed.js:2166 plugins/mail/mail.js:7 plugins/mailto/init.js:7
-#: js/viewfeed.js:733 js/viewfeed.js:761 js/viewfeed.js:788 js/viewfeed.js:853
+#: js/viewfeed.js:1011
+#: js/viewfeed.js:1054
+#: js/viewfeed.js:1107
+#: js/viewfeed.js:2166
+#: plugins/mail/mail.js:7
+#: plugins/mailto/init.js:7
+#: js/viewfeed.js:733
+#: js/viewfeed.js:761
+#: js/viewfeed.js:788
+#: js/viewfeed.js:853
 #: js/viewfeed.js:887
 msgid "No articles are selected."
 msgstr "Keine Artikel ausgewählt."
@@ -2924,7 +3245,8 @@ msgstr "Ausgewählte Instanzen entfernen?"
 msgid "Removing selected instances..."
 msgstr "Ausgewählte Instanzen werden entfernt..."
 
-#: plugins/instances/instances.js:139 plugins/instances/instances.js:151
+#: plugins/instances/instances.js:139
+#: plugins/instances/instances.js:151
 msgid "No instances are selected."
 msgstr "Keine Instanzen ausgewählt."
 
@@ -2959,7 +3281,8 @@ msgstr "Daten importieren"
 msgid "Please choose the file first."
 msgstr "Bitte zuerst die Datei auswählen."
 
-#: plugins/mail/mail.js:21 plugins/mailto/init.js:21
+#: plugins/mail/mail.js:21
+#: plugins/mailto/init.js:21
 msgid "Forward article by email"
 msgstr "Artikel via E-Mail weiterleiten"
 
@@ -2975,7 +3298,7 @@ msgstr "Ihre Nachricht wurde gesendet"
 msgid "Sorry, your browser does not support sandboxed iframes."
 msgstr "Entschuldigung, dein Browser unterstützt keine \"Sandbox\" für iframes."
 
-#: plugins/shorten_expanded/init.js:37
+#: plugins/shorten_expanded/init.js:39
 msgid "Click to expand article"
 msgstr "Klicken, um den Artikel aufzuklappen."
 
@@ -3003,7 +3326,8 @@ msgstr "Versuche, Teilen rückgängig zu machen..."
 msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr "Alle bisher geteilten Artikel URLs werden ungültig. Fortfahren?"
 
-#: plugins/share/share_prefs.js:6 js/prefs.js:1523
+#: plugins/share/share_prefs.js:6
+#: js/prefs.js:1523
 msgid "Clearing URLs..."
 msgstr "Leere URLs..."
 
@@ -3011,7 +3335,8 @@ msgstr "Leere URLs..."
 msgid "Shared URLs cleared."
 msgstr "Geteilte URLs geleert."
 
-#: js/feedlist.js:446 js/feedlist.js:518
+#: js/feedlist.js:446
+#: js/feedlist.js:518
 msgid "Mark all articles in %s as read?"
 msgstr "Alle Artikel in %s als gelesen markieren?"
 
@@ -3195,11 +3520,13 @@ msgstr "Ausgewählte Profile werden entfernt..."
 msgid "No profiles are selected."
 msgstr "Keine Profile ausgewählt."
 
-#: js/prefs.js:1443 js/prefs.js:1496
+#: js/prefs.js:1443
+#: js/prefs.js:1496
 msgid "Activate selected profile?"
 msgstr "Ausgewählte Profile entfernen?"
 
-#: js/prefs.js:1459 js/prefs.js:1512
+#: js/prefs.js:1459
+#: js/prefs.js:1512
 msgid "Please choose a profile to activate."
 msgstr "Bitte ein Profil zum Aktivieren auswählen."
 
@@ -3219,11 +3546,13 @@ msgstr "Generierte URLs gelöscht."
 msgid "Label Editor"
 msgstr "Label-Editor"
 
-#: js/tt-rss.js:671
+#: js/tt-rss.js:694
 msgid "You can't unsubscribe from the category."
 msgstr "Sie können die Kategorie nicht abbestellen."
 
-#: js/viewfeed.js:128 js/viewfeed.js:178 js/viewfeed.js:195
+#: js/viewfeed.js:128
+#: js/viewfeed.js:178
+#: js/viewfeed.js:195
 msgid "Click to open next unread feed."
 msgstr "Hier klicken, um den nächsten ungelesenen Feed zu öffnen"
 
diff --git a/locale/el_GR/LC_MESSAGES/messages.mo b/locale/el_GR/LC_MESSAGES/messages.mo
index 8ee87faec..ecb17dd95 100644
Binary files a/locale/el_GR/LC_MESSAGES/messages.mo and b/locale/el_GR/LC_MESSAGES/messages.mo differ
diff --git a/locale/el_GR/LC_MESSAGES/messages.po b/locale/el_GR/LC_MESSAGES/messages.po
index 7149ee54f..5fa940302 100644
--- a/locale/el_GR/LC_MESSAGES/messages.po
+++ b/locale/el_GR/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tt-rss git\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 22:58+0300\n"
+"POT-Creation-Date: 2016-08-19 18:16+0300\n"
 "Last-Translator: Brendan <brendan@tucows.com>\n"
 "Language-Team: OpenSRS brendan@tucows.com>\n"
 "Language: el_GR\n"
@@ -160,13 +160,13 @@ msgstr "Η ροή δεν βρέθηκε."
 msgid "Plugin not found"
 msgstr "Ο χρήστης δεν βρέθηκε."
 
-#: index.php:133
-#: index.php:149
-#: index.php:267
-#: prefs.php:102
+#: index.php:148
+#: index.php:164
+#: index.php:282
+#: prefs.php:117
 #: classes/backend.php:5
 #: classes/pref/labels.php:282
-#: classes/pref/feeds.php:1405
+#: classes/pref/feeds.php:1409
 #: classes/pref/filters.php:779
 #: js/feedlist.js:159
 #: js/functions.js:1293
@@ -178,7 +178,7 @@ msgstr "Ο χρήστης δεν βρέθηκε."
 #: js/prefs.js:1781
 #: js/prefs.js:1799
 #: js/tt-rss.js:55
-#: js/tt-rss.js:522
+#: js/tt-rss.js:553
 #: js/viewfeed.js:1298
 #: plugins/import_export/import_export.js:17
 #: js/feedlist.js:484
@@ -191,75 +191,75 @@ msgstr "Ο χρήστης δεν βρέθηκε."
 #: js/prefs.js:1556
 #: js/prefs.js:1572
 #: js/prefs.js:1592
-#: js/tt-rss.js:539
+#: js/tt-rss.js:570
 #: js/viewfeed.js:830
 msgid "Loading, please wait..."
 msgstr "Φόρτωση σε εξέλιξη, παρακαλώ περιμένετε..."
 
-#: index.php:167
+#: index.php:182
 msgid "Collapse feedlist"
 msgstr "Συρρίκνωση λίστας ροών"
 
-#: index.php:170
+#: index.php:185
 msgid "Show articles"
 msgstr "Εμφάνιση άρθρων"
 
-#: index.php:173
+#: index.php:188
 msgid "Adaptive"
 msgstr "Προσαρμόσιμο"
 
-#: index.php:174
+#: index.php:189
 msgid "All Articles"
 msgstr "Όλα τα Άρθρα"
 
-#: index.php:175
-#: include/functions2.php:101
+#: index.php:190
+#: include/functions2.php:102
 #: classes/feeds.php:104
 msgid "Starred"
 msgstr "Με αστέρι"
 
-#: index.php:176
-#: include/functions2.php:102
+#: index.php:191
+#: include/functions2.php:103
 #: classes/feeds.php:105
 msgid "Published"
 msgstr "Δημοσιεύτηκαν"
 
-#: index.php:177
+#: index.php:192
 #: classes/feeds.php:91
 #: classes/feeds.php:103
 msgid "Unread"
 msgstr "Μη αναγνωσμένα"
 
-#: index.php:178
+#: index.php:193
 msgid "With Note"
 msgstr "Με Σημείωση"
 
-#: index.php:179
+#: index.php:194
 msgid "Ignore Scoring"
 msgstr "Παράβλεψη Βαθμολογίας"
 
-#: index.php:182
+#: index.php:197
 msgid "Sort articles"
 msgstr "Ταξινόμηση άρθρων"
 
-#: index.php:185
+#: index.php:200
 msgid "Default"
 msgstr "Προκαθορισμένο"
 
-#: index.php:186
+#: index.php:201
 msgid "Newest first"
 msgstr "Πρώτα το Νεώτερο"
 
-#: index.php:187
+#: index.php:202
 msgid "Oldest first"
 msgstr "Πρώτα το Παλαιότερο"
 
-#: index.php:188
+#: index.php:203
 msgid "Title"
 msgstr "Τίτλος"
 
-#: index.php:192
-#: index.php:233
+#: index.php:207
+#: index.php:248
 #: include/functions2.php:90
 #: classes/feeds.php:109
 #: js/FeedTree.js:132
@@ -267,134 +267,134 @@ msgstr "Τίτλος"
 msgid "Mark as read"
 msgstr "Σήμανση ως αναγνωσμένο"
 
-#: index.php:195
+#: index.php:210
 msgid "Older than one day"
 msgstr "Παλαιότερο της μίας ημέρας"
 
-#: index.php:198
+#: index.php:213
 msgid "Older than one week"
 msgstr "Παλαιότερο της μίας εβδομάδας"
 
-#: index.php:201
+#: index.php:216
 msgid "Older than two weeks"
 msgstr "Παλαιότερο δύο εβδομάδων"
 
-#: index.php:217
+#: index.php:232
 msgid "Communication problem with server."
 msgstr "Πρόβλημα επικοινωνίας με τον εξυπηρετητή."
 
-#: index.php:223
+#: index.php:238
 msgid "Actions..."
 msgstr "Ενέργειες..."
 
-#: index.php:225
+#: index.php:240
 msgid "Preferences..."
 msgstr "Προτιμήσεις...."
 
-#: index.php:226
+#: index.php:241
 msgid "Search..."
 msgstr "Αναζήτηση..."
 
-#: index.php:227
+#: index.php:242
 msgid "Feed actions:"
 msgstr "Ενέργειες ροών:"
 
-#: index.php:228
+#: index.php:243
 #: classes/handler/public.php:672
 msgid "Subscribe to feed..."
 msgstr "Εγγραφή για ροή..."
 
-#: index.php:229
+#: index.php:244
 msgid "Edit this feed..."
 msgstr "Επεξεργασία αυτής της ροής..."
 
-#: index.php:230
+#: index.php:245
 msgid "Rescore feed"
 msgstr "Επανασύνθεση ροών"
 
-#: index.php:231
-#: classes/pref/feeds.php:783
-#: classes/pref/feeds.php:1360
+#: index.php:246
+#: classes/pref/feeds.php:785
+#: classes/pref/feeds.php:1364
 #: js/PrefFeedTree.js:74
 msgid "Unsubscribe"
 msgstr "Κατάργηση εγγραφής"
 
-#: index.php:232
+#: index.php:247
 msgid "All feeds:"
 msgstr "Όλες οι ροές:"
 
-#: index.php:234
+#: index.php:249
 msgid "(Un)hide read feeds"
 msgstr "Επανεμφάνιση/Απόκρυψη ροών ανάγνωσης"
 
-#: index.php:235
+#: index.php:250
 msgid "Other actions:"
 msgstr "Άλλες ενέργειες:"
 
-#: index.php:236
+#: index.php:251
 #: include/functions2.php:76
 msgid "Toggle widescreen mode"
 msgstr "Εναλλαγή λειτουργίας ευρείας οθόνης"
 
-#: index.php:237
+#: index.php:252
 msgid "Create label..."
 msgstr "Δημιουργία ετικέτας..."
 
-#: index.php:238
+#: index.php:253
 msgid "Create filter..."
 msgstr "Δημιουργία φίλτρου..."
 
-#: index.php:239
+#: index.php:254
 msgid "Keyboard shortcuts help"
 msgstr "Βοήθεια συντομεύσεων πληκτρολογίου"
 
-#: index.php:248
+#: index.php:263
 msgid "Logout"
 msgstr "Αποσύνδεση"
 
-#: index.php:254
+#: index.php:269
 msgid "Updates are available from Git."
 msgstr ""
 
 #: prefs.php:33
-#: prefs.php:120
-#: include/functions2.php:104
+#: prefs.php:135
+#: include/functions2.php:105
 #: classes/pref/prefs.php:435
 msgid "Preferences"
 msgstr "Προτιμήσεις"
 
-#: prefs.php:111
+#: prefs.php:126
 msgid "Keyboard shortcuts"
 msgstr "Συντομεύσεις πληκτρολογίου"
 
-#: prefs.php:112
+#: prefs.php:127
 msgid "Exit preferences"
 msgstr "Προτιμήσεις εξόδου"
 
-#: prefs.php:123
+#: prefs.php:138
 #: classes/pref/feeds.php:112
-#: classes/pref/feeds.php:1300
-#: classes/pref/feeds.php:1349
+#: classes/pref/feeds.php:1304
+#: classes/pref/feeds.php:1353
 msgid "Feeds"
 msgstr "Ροές"
 
-#: prefs.php:126
+#: prefs.php:141
 #: classes/pref/filters.php:248
 msgid "Filters"
 msgstr "Φίλτρα"
 
-#: prefs.php:129
-#: include/functions.php:1256
-#: include/functions.php:1909
+#: prefs.php:144
+#: include/functions.php:1287
+#: include/functions.php:1940
 #: classes/pref/labels.php:90
 msgid "Labels"
 msgstr "Ετικέτες"
 
-#: prefs.php:133
+#: prefs.php:148
 msgid "Users"
 msgstr "Χρήστες"
 
-#: prefs.php:136
+#: prefs.php:151
 msgid "System"
 msgstr "Σύστημα"
 
@@ -477,10 +477,10 @@ msgid "Tiny Tiny RSS data update script."
 msgstr ""
 
 #: include/digest.php:109
-#: include/functions.php:1265
-#: include/functions.php:1810
-#: include/functions.php:1895
-#: include/functions.php:1917
+#: include/functions.php:1296
+#: include/functions.php:1841
+#: include/functions.php:1926
+#: include/functions.php:1948
 #: classes/opml.php:421
 #: classes/pref/feeds.php:228
 msgid "Uncategorized"
@@ -497,44 +497,44 @@ msgstr[1] "Αρχειοθετημένα άρθρα"
 msgid "No feeds found."
 msgstr "Δεν βρέθηκαν ροές."
 
-#: include/functions.php:958
+#: include/functions.php:989
 #, php-format
 msgid "%d min"
 msgstr ""
 
-#: include/functions.php:1254
-#: include/functions.php:1907
+#: include/functions.php:1285
+#: include/functions.php:1938
 msgid "Special"
 msgstr "Ειδικό"
 
-#: include/functions.php:1758
+#: include/functions.php:1789
 #: classes/pref/filters.php:229
 #: classes/pref/filters.php:507
 msgid "All feeds"
 msgstr "Όλες οι ροές"
 
-#: include/functions.php:1962
+#: include/functions.php:1993
 msgid "Starred articles"
 msgstr "Άρθρα με αστέρια"
 
-#: include/functions.php:1964
+#: include/functions.php:1995
 msgid "Published articles"
 msgstr "Δημοσιευμένα άρθρα"
 
-#: include/functions.php:1966
+#: include/functions.php:1997
 msgid "Fresh articles"
 msgstr "Καινούργια άρθρα"
 
-#: include/functions.php:1968
-#: include/functions2.php:99
+#: include/functions.php:1999
+#: include/functions2.php:100
 msgid "All articles"
 msgstr "Όλα τα άρθρα"
 
-#: include/functions.php:1970
+#: include/functions.php:2001
 msgid "Archived articles"
 msgstr "Αρχειοθετημένα άρθρα"
 
-#: include/functions.php:1972
+#: include/functions.php:2003
 msgid "Recently read"
 msgstr "Πρόσφατα αναγνωσμένα"
 
@@ -675,7 +675,7 @@ msgstr "Αποεπιλογή όλων"
 
 #: include/functions2.php:85
 #: classes/pref/feeds.php:555
-#: classes/pref/feeds.php:821
+#: classes/pref/feeds.php:823
 msgid "Feed"
 msgstr "Ροή"
 
@@ -688,7 +688,7 @@ msgid "Un/hide read feeds"
 msgstr "Επανεμφάνιση/Απόκρυψη ροών ανάγνωσης"
 
 #: include/functions2.php:88
-#: classes/pref/feeds.php:1352
+#: classes/pref/feeds.php:1356
 msgid "Subscribe to feed"
 msgstr "Εγγραφή για ροή"
 
@@ -704,75 +704,79 @@ msgid "Reverse headlines"
 msgstr "Αναστροφή κεφαλίδων"
 
 #: include/functions2.php:92
+msgid "Toggle headline grouping"
+msgstr ""
+
+#: include/functions2.php:93
 msgid "Debug feed update"
 msgstr "Εκσφαλμάτωση ενημέρωσης ροής"
 
-#: include/functions2.php:93
+#: include/functions2.php:94
 #, fuzzy
 msgid "Debug viewfeed()"
 msgstr "Εκσφαλμάτωση ενημέρωσης ροής"
 
-#: include/functions2.php:94
+#: include/functions2.php:95
 #: js/FeedTree.js:182
 #, fuzzy
 msgid "Mark all feeds as read"
 msgstr "Σήμανση ροής ως αναγνωσμένη"
 
-#: include/functions2.php:95
+#: include/functions2.php:96
 msgid "Un/collapse current category"
 msgstr "Ανάπτυξη/σύμπτηξη τρέχουσας κατηγορίας"
 
-#: include/functions2.php:96
+#: include/functions2.php:97
 msgid "Toggle combined mode"
 msgstr "Εναλλαγή συνδυασμένης λειτουργίας"
 
-#: include/functions2.php:97
+#: include/functions2.php:98
 #, fuzzy
 msgid "Toggle auto expand in combined mode"
 msgstr "Εναλλαγή συνδυασμένης λειτουργίας"
 
-#: include/functions2.php:98
+#: include/functions2.php:99
 msgid "Go to"
 msgstr "Μετάβαση σε"
 
-#: include/functions2.php:100
+#: include/functions2.php:101
 msgid "Fresh"
 msgstr "Φρέσκο"
 
-#: include/functions2.php:103
-#: js/tt-rss.js:466
-#: js/tt-rss.js:650
+#: include/functions2.php:104
+#: js/tt-rss.js:497
+#: js/tt-rss.js:673
 msgid "Tag cloud"
 msgstr "Τοποθέτηση ετικέτας σε νέφος"
 
-#: include/functions2.php:105
+#: include/functions2.php:106
 msgid "Other"
 msgstr "Άλλο"
 
-#: include/functions2.php:106
+#: include/functions2.php:107
 #: classes/pref/labels.php:267
 msgid "Create label"
 msgstr "Δημιουργία ετικέτας"
 
-#: include/functions2.php:107
+#: include/functions2.php:108
 #: classes/pref/filters.php:753
 msgid "Create filter"
 msgstr "Δημιουργία φίλτρου"
 
-#: include/functions2.php:108
+#: include/functions2.php:109
 msgid "Un/collapse sidebar"
 msgstr "Ανάπτυξη/σύμπτυξη πλευρικής μπάρας"
 
-#: include/functions2.php:109
+#: include/functions2.php:110
 msgid "Show help dialog"
 msgstr "Εμφάνιση πλαισίου βοήθειας"
 
-#: include/functions2.php:663
+#: include/functions2.php:665
 #, php-format
 msgid "Search results: %s"
 msgstr "Αποτελέσματα αναζήτησης: %s"
 
-#: include/functions2.php:1317
+#: include/functions2.php:1330
 #: classes/feeds.php:749
 #, fuzzy
 msgid "comment"
@@ -780,67 +784,100 @@ msgid_plural "comments"
 msgstr[0] "σχόλια"
 msgstr[1] "σχόλια"
 
-#: include/functions2.php:1321
+#: include/functions2.php:1334
 #: classes/feeds.php:753
 msgid "comments"
 msgstr "σχόλια"
 
-#: include/functions2.php:1347
+#: include/functions2.php:1360
 msgid " - "
 msgstr " - "
 
-#: include/functions2.php:1380
-#: include/functions2.php:1631
+#: include/functions2.php:1393
+#: include/functions2.php:1644
 #: classes/article.php:311
 msgid "no tags"
 msgstr "χωρίς ετικέτες"
 
-#: include/functions2.php:1390
+#: include/functions2.php:1403
 #: classes/feeds.php:735
 msgid "Edit tags for this article"
 msgstr ""
 
-#: include/functions2.php:1422
+#: include/functions2.php:1435
 #: classes/feeds.php:682
 msgid "Originally from:"
 msgstr "Αρχικά από:"
 
-#: include/functions2.php:1435
+#: include/functions2.php:1448
 #: classes/pref/feeds.php:574
 #: classes/feeds.php:695
 msgid "Feed URL"
 msgstr "URL Ροής"
 
-#: include/functions2.php:1472
+#: include/functions2.php:1485
 #: classes/backend.php:105
 #: classes/dlg.php:37
 #: classes/dlg.php:60
 #: classes/dlg.php:93
 #: classes/dlg.php:159
 #: classes/dlg.php:186
-#: classes/pref/feeds.php:1654
-#: classes/pref/feeds.php:1720
+#: classes/pref/feeds.php:1658
+#: classes/pref/feeds.php:1724
 #: classes/pref/filters.php:204
 #: classes/pref/prefs.php:1105
 #: plugins/af_psql_trgm/init.php:102
 #: plugins/import_export/init.php:415
-#: plugins/import_export/init.php:460
+#: plugins/import_export/init.php:461
 #: plugins/share/init.php:121
 msgid "Close this window"
 msgstr "Κλείστε αυτό το παράθυρο"
 
-#: include/functions2.php:1669
+#: include/functions2.php:1682
 msgid "(edit note)"
 msgstr "(επεξεργασία σημείωσης)"
 
-#: include/functions2.php:1924
+#: include/functions2.php:1937
 msgid "unknown type"
 msgstr "άγνωστος τύπος"
 
-#: include/functions2.php:2001
+#: include/functions2.php:2014
 msgid "Attachments"
 msgstr "Συνημμένα"
 
+#: include/functions2.php:2456
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: include/functions2.php:2457
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr ""
+
+#: include/functions2.php:2458
+msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
+msgstr ""
+
+#: include/functions2.php:2459
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: include/functions2.php:2460
+#, fuzzy
+msgid "No file was uploaded"
+msgstr "Δεν φορτώθηκε αρχείο."
+
+#: include/functions2.php:2461
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: include/functions2.php:2462
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: include/functions2.php:2463
+msgid "A PHP extension stopped the file upload."
+msgstr ""
+
 #: include/login_form.php:197
 #: classes/handler/public.php:569
 #: classes/handler/public.php:824
@@ -907,8 +944,8 @@ msgstr ""
 #: classes/article.php:222
 #: classes/pref/labels.php:79
 #: classes/pref/users.php:98
-#: classes/pref/feeds.php:799
-#: classes/pref/feeds.php:939
+#: classes/pref/feeds.php:801
+#: classes/pref/feeds.php:943
 #: classes/pref/filters.php:485
 #: classes/pref/prefs.php:989
 #: plugins/instances/init.php:245
@@ -926,17 +963,17 @@ msgstr "Αποθήκευση"
 #: classes/handler/public.php:580
 #: classes/pref/labels.php:81
 #: classes/pref/users.php:100
-#: classes/pref/feeds.php:800
-#: classes/pref/feeds.php:942
-#: classes/pref/feeds.php:1860
+#: classes/pref/feeds.php:802
+#: classes/pref/feeds.php:946
+#: classes/pref/feeds.php:1865
 #: classes/pref/filters.php:488
 #: classes/pref/filters.php:902
 #: classes/pref/filters.php:983
 #: classes/pref/filters.php:1076
 #: classes/pref/prefs.php:991
-#: classes/feeds.php:1098
-#: classes/feeds.php:1148
-#: classes/feeds.php:1185
+#: classes/feeds.php:1100
+#: classes/feeds.php:1150
+#: classes/feeds.php:1187
 #: plugins/instances/init.php:248
 #: plugins/instances/init.php:436
 #: plugins/note/init.php:53
@@ -992,7 +1029,6 @@ msgid "Processing category: %s"
 msgstr "Επεξεργασία κατηγορίας: %s"
 
 #: classes/opml.php:470
-#: plugins/import_export/init.php:428
 #, php-format
 msgid "Upload failed with error code %d"
 msgstr ""
@@ -1213,9 +1249,9 @@ msgstr "Δημιουργία ετικέτας"
 
 #: classes/pref/labels.php:258
 #: classes/pref/users.php:334
-#: classes/pref/feeds.php:1340
-#: classes/pref/feeds.php:1602
-#: classes/pref/feeds.php:1666
+#: classes/pref/feeds.php:1344
+#: classes/pref/feeds.php:1606
+#: classes/pref/feeds.php:1670
 #: classes/pref/filters.php:359
 #: classes/pref/filters.php:407
 #: classes/pref/filters.php:744
@@ -1228,9 +1264,9 @@ msgstr "Επιλογή"
 
 #: classes/pref/labels.php:261
 #: classes/pref/users.php:337
-#: classes/pref/feeds.php:1343
-#: classes/pref/feeds.php:1605
-#: classes/pref/feeds.php:1669
+#: classes/pref/feeds.php:1347
+#: classes/pref/feeds.php:1609
+#: classes/pref/feeds.php:1673
 #: classes/pref/filters.php:362
 #: classes/pref/filters.php:410
 #: classes/pref/filters.php:747
@@ -1244,9 +1280,9 @@ msgstr "Όλα"
 
 #: classes/pref/labels.php:263
 #: classes/pref/users.php:339
-#: classes/pref/feeds.php:1345
-#: classes/pref/feeds.php:1607
-#: classes/pref/feeds.php:1671
+#: classes/pref/feeds.php:1349
+#: classes/pref/feeds.php:1611
+#: classes/pref/feeds.php:1675
 #: classes/pref/filters.php:364
 #: classes/pref/filters.php:412
 #: classes/pref/filters.php:749
@@ -1260,10 +1296,10 @@ msgstr "Κανένα"
 
 #: classes/pref/labels.php:270
 #: classes/pref/users.php:348
-#: classes/pref/feeds.php:765
+#: classes/pref/feeds.php:767
 #: classes/pref/filters.php:478
 #: classes/pref/filters.php:766
-#: classes/feeds.php:1147
+#: classes/feeds.php:1149
 #: plugins/instances/init.php:294
 msgid "Remove"
 msgstr "Αφαίρεση"
@@ -1285,7 +1321,7 @@ msgstr "Επεξεργασία κανόνα"
 
 #: classes/pref/users.php:56
 #: classes/pref/feeds.php:637
-#: classes/pref/feeds.php:876
+#: classes/pref/feeds.php:878
 #: classes/feeds.php:1070
 msgid "Authentication"
 msgstr "Πιστοποίηση"
@@ -1295,8 +1331,8 @@ msgid "Access level: "
 msgstr "Επίπεδο πρόσβασης: "
 
 #: classes/pref/users.php:77
-#: classes/pref/feeds.php:665
-#: classes/pref/feeds.php:892
+#: classes/pref/feeds.php:667
+#: classes/pref/feeds.php:896
 msgid "Options"
 msgstr "Επιλογές"
 
@@ -1362,10 +1398,10 @@ msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] Ειδοποίηση αλλαγής κωδικού πρόσβασης"
 
 #: classes/pref/users.php:324
-#: classes/pref/feeds.php:1336
+#: classes/pref/feeds.php:1340
 #: classes/pref/filters.php:740
-#: classes/feeds.php:1118
-#: classes/feeds.php:1184
+#: classes/feeds.php:1120
+#: classes/feeds.php:1186
 #: js/tt-rss.js:174
 msgid "Search"
 msgstr "Αναζήτηση"
@@ -1382,8 +1418,8 @@ msgstr "Επεξεργασία"
 
 #: classes/pref/users.php:397
 #: classes/pref/feeds.php:643
-#: classes/pref/feeds.php:880
-#: classes/pref/feeds.php:1838
+#: classes/pref/feeds.php:882
+#: classes/pref/feeds.php:1842
 #: classes/feeds.php:1074
 msgid "Login"
 msgstr "Σύνδεση"
@@ -1462,252 +1498,252 @@ msgid "Feed Title"
 msgstr "Τίτλος Ροής"
 
 #: classes/pref/feeds.php:595
-#: classes/pref/feeds.php:828
-#: classes/pref/feeds.php:1824
+#: classes/pref/feeds.php:830
+#: classes/pref/feeds.php:1828
 #: classes/feeds.php:1050
 msgid "Place in category:"
 msgstr "Τοποθέτηση σε κατηγορία:"
 
 #: classes/pref/feeds.php:608
-#: classes/pref/feeds.php:842
+#: classes/pref/feeds.php:844
 #, fuzzy
 msgid "Language:"
 msgstr "Γλώσσα"
 
 #: classes/pref/feeds.php:615
-#: classes/pref/feeds.php:851
+#: classes/pref/feeds.php:853
 msgid "Update"
 msgstr "Ενημέρωση"
 
 #: classes/pref/feeds.php:630
-#: classes/pref/feeds.php:867
+#: classes/pref/feeds.php:869
 msgid "Article purging:"
 msgstr "Εκκαθάριση άρθρου:"
 
-#: classes/pref/feeds.php:656
-#: classes/pref/feeds.php:886
-#: classes/pref/feeds.php:1841
+#: classes/pref/feeds.php:658
+#: classes/pref/feeds.php:890
+#: classes/pref/feeds.php:1845
 #: classes/pref/prefs.php:245
-#: classes/feeds.php:1077
+#: classes/feeds.php:1078
 msgid "Password"
 msgstr "Κωδικός Πρόσβασης"
 
-#: classes/pref/feeds.php:660
+#: classes/pref/feeds.php:662
 msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
 msgstr ""
 
-#: classes/pref/feeds.php:679
-#: classes/pref/feeds.php:896
+#: classes/pref/feeds.php:681
+#: classes/pref/feeds.php:900
 msgid "Hide from Popular feeds"
 msgstr "Απόκρυψη από Δημοφιλείς ροές"
 
-#: classes/pref/feeds.php:691
-#: classes/pref/feeds.php:902
+#: classes/pref/feeds.php:693
+#: classes/pref/feeds.php:906
 msgid "Include in e-mail digest"
 msgstr "Συμπεριλάβετε σε σύνοψη e-mail"
 
-#: classes/pref/feeds.php:704
-#: classes/pref/feeds.php:908
+#: classes/pref/feeds.php:706
+#: classes/pref/feeds.php:912
 msgid "Always display image attachments"
 msgstr "Να εμφανίζονται πάντα συνημμένα εικόνας"
 
-#: classes/pref/feeds.php:717
-#: classes/pref/feeds.php:916
+#: classes/pref/feeds.php:719
+#: classes/pref/feeds.php:920
 msgid "Do not embed images"
 msgstr "Μην ενσωματώνετε εικόνες"
 
-#: classes/pref/feeds.php:730
-#: classes/pref/feeds.php:924
+#: classes/pref/feeds.php:732
+#: classes/pref/feeds.php:928
 msgid "Cache images locally"
 msgstr "Αποθήκευση εικόνων τοπικά"
 
-#: classes/pref/feeds.php:742
-#: classes/pref/feeds.php:930
+#: classes/pref/feeds.php:744
+#: classes/pref/feeds.php:934
 #, fuzzy
 msgid "Mark updated articles as unread"
 msgstr "Σήμανση ροής ως αναγνωσμένη"
 
-#: classes/pref/feeds.php:746
+#: classes/pref/feeds.php:748
 msgid "Icon"
 msgstr "Εικονίδιο"
 
-#: classes/pref/feeds.php:763
+#: classes/pref/feeds.php:765
 msgid "Replace"
 msgstr "Αντικατάσταση"
 
-#: classes/pref/feeds.php:770
+#: classes/pref/feeds.php:772
 #: classes/pref/prefs.php:706
 msgid "Plugins"
 msgstr "Πρόσθετα"
 
-#: classes/pref/feeds.php:790
+#: classes/pref/feeds.php:792
 msgid "Resubscribe to push updates"
 msgstr "Επανάληψη εγγραφής για προώθηση ενημερώσεων"
 
-#: classes/pref/feeds.php:797
+#: classes/pref/feeds.php:799
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr ""
 
-#: classes/pref/feeds.php:1203
-#: classes/pref/feeds.php:1256
+#: classes/pref/feeds.php:1207
+#: classes/pref/feeds.php:1260
 msgid "All done."
 msgstr "Όλα έτοιμα."
 
-#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1315
 msgid "Feeds with errors"
 msgstr "Ροές με σφάλματα"
 
-#: classes/pref/feeds.php:1318
+#: classes/pref/feeds.php:1322
 msgid "Inactive feeds"
 msgstr "Αδρανείς ροές"
 
-#: classes/pref/feeds.php:1354
+#: classes/pref/feeds.php:1358
 msgid "Edit selected feeds"
 msgstr "Επεξεργασία επιλεγμένων ροών"
 
-#: classes/pref/feeds.php:1356
-#: classes/pref/feeds.php:1370
+#: classes/pref/feeds.php:1360
+#: classes/pref/feeds.php:1374
 #: classes/pref/filters.php:762
 msgid "Reset sort order"
 msgstr "Επαναφορά σειράς ταξινόμησης"
 
-#: classes/pref/feeds.php:1358
+#: classes/pref/feeds.php:1362
 #: js/prefs.js:1737
 msgid "Batch subscribe"
 msgstr "Εγγραφή παρτίδας"
 
-#: classes/pref/feeds.php:1365
+#: classes/pref/feeds.php:1369
 msgid "Categories"
 msgstr "Κατηγορίες"
 
-#: classes/pref/feeds.php:1368
+#: classes/pref/feeds.php:1372
 msgid "Add category"
 msgstr "Προσθήκη κατηγορίας"
 
-#: classes/pref/feeds.php:1372
+#: classes/pref/feeds.php:1376
 msgid "Remove selected"
 msgstr "Αφαίρεση επιλεγμένων"
 
-#: classes/pref/feeds.php:1383
+#: classes/pref/feeds.php:1387
 msgid "More actions..."
 msgstr "Περισσότερες ενέργειες..."
 
-#: classes/pref/feeds.php:1387
+#: classes/pref/feeds.php:1391
 msgid "Manual purge"
 msgstr "Χειροκίνητη εκκαθάριση"
 
-#: classes/pref/feeds.php:1391
+#: classes/pref/feeds.php:1395
 msgid "Clear feed data"
 msgstr "Απαλοιφή δεδομένων ροής"
 
-#: classes/pref/feeds.php:1392
+#: classes/pref/feeds.php:1396
 #: classes/pref/filters.php:770
 msgid "Rescore articles"
 msgstr "Αναβαθμολόγηση άρθρων"
 
-#: classes/pref/feeds.php:1444
+#: classes/pref/feeds.php:1448
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1446
+#: classes/pref/feeds.php:1450
 msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
 msgstr ""
 
-#: classes/pref/feeds.php:1447
+#: classes/pref/feeds.php:1451
 msgid "Only main settings profile can be migrated using OPML."
 msgstr ""
 
-#: classes/pref/feeds.php:1460
+#: classes/pref/feeds.php:1464
 msgid "Import my OPML"
 msgstr "Εισαγωγή του OPML μου"
 
-#: classes/pref/feeds.php:1466
+#: classes/pref/feeds.php:1470
 msgid "Filename:"
 msgstr "Όνομα αρχείου:"
 
-#: classes/pref/feeds.php:1468
+#: classes/pref/feeds.php:1472
 msgid "Include settings"
 msgstr "Συμπεριλάβετε ρυθμίσεις"
 
-#: classes/pref/feeds.php:1472
+#: classes/pref/feeds.php:1476
 msgid "Export OPML"
 msgstr "Εξαγωγή OPML"
 
-#: classes/pref/feeds.php:1476
+#: classes/pref/feeds.php:1480
 msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
 msgstr ""
 
-#: classes/pref/feeds.php:1480
+#: classes/pref/feeds.php:1484
 msgid "Public OPML URL"
 msgstr "Κοινό OPML URL"
 
-#: classes/pref/feeds.php:1481
+#: classes/pref/feeds.php:1485
 msgid "Display published OPML URL"
 msgstr "Εμφάνιση δημοσιευμένου URL του OPML"
 
-#: classes/pref/feeds.php:1490
+#: classes/pref/feeds.php:1494
 msgid "Firefox integration"
 msgstr "Ένταξη Firefox"
 
-#: classes/pref/feeds.php:1492
+#: classes/pref/feeds.php:1496
 msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
 msgstr ""
 
-#: classes/pref/feeds.php:1499
+#: classes/pref/feeds.php:1503
 msgid "Click here to register this site as a feed reader."
 msgstr ""
 
-#: classes/pref/feeds.php:1507
+#: classes/pref/feeds.php:1511
 msgid "Published & shared articles / Generated feeds"
 msgstr ""
 
-#: classes/pref/feeds.php:1509
+#: classes/pref/feeds.php:1513
 msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
 msgstr ""
 
-#: classes/pref/feeds.php:1516
+#: classes/pref/feeds.php:1520
 #: classes/feeds.php:54
 #: classes/feeds.php:134
 msgid "View as RSS"
 msgstr "Προβολή ως RSS"
 
-#: classes/pref/feeds.php:1517
+#: classes/pref/feeds.php:1521
 msgid "Display URL"
 msgstr "Εμφάνιση URL"
 
-#: classes/pref/feeds.php:1520
+#: classes/pref/feeds.php:1524
 msgid "Clear all generated URLs"
 msgstr "Απαλοιφή όλων των παραχθέντων URLs"
 
-#: classes/pref/feeds.php:1598
+#: classes/pref/feeds.php:1602
 msgid "These feeds have not been updated with new content for 3 months (oldest first):"
 msgstr ""
 
-#: classes/pref/feeds.php:1632
-#: classes/pref/feeds.php:1696
+#: classes/pref/feeds.php:1636
+#: classes/pref/feeds.php:1700
 msgid "Click to edit feed"
 msgstr "Κάντε κλικ για επεξεργασία ροής"
 
-#: classes/pref/feeds.php:1650
-#: classes/pref/feeds.php:1716
+#: classes/pref/feeds.php:1654
+#: classes/pref/feeds.php:1720
 msgid "Unsubscribe from selected feeds"
 msgstr "Κατάργηση εγγραφής από επιλεγμένες ροές"
 
-#: classes/pref/feeds.php:1821
+#: classes/pref/feeds.php:1825
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr ""
 
-#: classes/pref/feeds.php:1830
+#: classes/pref/feeds.php:1834
 msgid "Feeds to subscribe, One per line"
 msgstr ""
 
-#: classes/pref/feeds.php:1852
+#: classes/pref/feeds.php:1857
 msgid "Feeds require authentication."
 msgstr "Οι ροές απαιτούν πιστοποίηση."
 
-#: classes/pref/feeds.php:1859
-#: classes/feeds.php:1092
-#: classes/feeds.php:1146
+#: classes/pref/feeds.php:1864
+#: classes/feeds.php:1094
+#: classes/feeds.php:1148
 msgid "Subscribe"
 msgstr "Εγγραφή"
 
@@ -1790,7 +1826,7 @@ msgid "on field"
 msgstr "επί τόπου"
 
 #: classes/pref/filters.php:962
-#: js/PrefFilterTree.js:61
+#: js/PrefFilterTree.js:64
 msgid "in"
 msgstr "σε"
 
@@ -2392,40 +2428,40 @@ msgstr "URL ροής ή ιστοτόπου"
 msgid "Available feeds"
 msgstr "Διαθέσιμες ροές"
 
-#: classes/feeds.php:1087
+#: classes/feeds.php:1089
 msgid "This feed requires authentication."
 msgstr "Αυτή η ροή απαιτεί πιστοποίηση."
 
-#: classes/feeds.php:1095
+#: classes/feeds.php:1097
 msgid "More feeds"
 msgstr "Περισσότερες ροές"
 
-#: classes/feeds.php:1122
+#: classes/feeds.php:1124
 msgid "Popular feeds"
 msgstr "Δημοφιλείς ροές"
 
-#: classes/feeds.php:1123
+#: classes/feeds.php:1125
 msgid "Feed archive"
 msgstr "Αρχειοθέτηση ροής"
 
-#: classes/feeds.php:1126
+#: classes/feeds.php:1128
 msgid "limit:"
 msgstr "όριο:"
 
-#: classes/feeds.php:1158
+#: classes/feeds.php:1160
 msgid "Look for"
 msgstr "Αναζήτηση"
 
-#: classes/feeds.php:1166
+#: classes/feeds.php:1168
 #, php-format
 msgid "in %s"
 msgstr ""
 
-#: classes/feeds.php:1171
+#: classes/feeds.php:1173
 msgid "Used for word stemming"
 msgstr ""
 
-#: classes/feeds.php:1180
+#: classes/feeds.php:1182
 msgid "Search syntax"
 msgstr "Σύνταξη αναζήτησης"
 
@@ -2689,6 +2725,11 @@ msgstr ""
 msgid "Prepare data"
 msgstr "Προετοιμασία δεδομένων"
 
+#: plugins/import_export/init.php:428
+#, php-format
+msgid "Upload failed with error code %d (%s)"
+msgstr ""
+
 #: plugins/import_export/init.php:454
 msgid "No file uploaded."
 msgstr "Δεν φορτώθηκε αρχείο."
@@ -2801,7 +2842,7 @@ msgstr "Επεξεργασία κατηγορίας"
 msgid "Remove category"
 msgstr "Αφαίρεση κατηγορίας"
 
-#: js/PrefFilterTree.js:64
+#: js/PrefFilterTree.js:67
 msgid "Inverse"
 msgstr "Αναστροφή"
 
@@ -2852,7 +2893,7 @@ msgid "Subscription reset."
 msgstr "Επαναφορά εγγραφής."
 
 #: js/functions.js:1311
-#: js/tt-rss.js:682
+#: js/tt-rss.js:705
 #, perl-format
 msgid "Unsubscribe from %s?"
 msgstr "Κατάργηση εγγραφής από %s;"
@@ -3089,41 +3130,41 @@ msgstr "Σήμανση παραπάνω ως αναγνωσμένα"
 msgid "Marking all feeds as read..."
 msgstr "Σήμανση ροής ως αναγνωσμένη"
 
-#: js/tt-rss.js:383
+#: js/tt-rss.js:404
 msgid "Please enable mail plugin first."
 msgstr ""
 
-#: js/tt-rss.js:431
+#: js/tt-rss.js:452
 #: js/functions.js:1643
-#: js/tt-rss.js:663
+#: js/tt-rss.js:686
 msgid "You can't edit this kind of feed."
 msgstr ""
 
-#: js/tt-rss.js:502
+#: js/tt-rss.js:533
 msgid "Please enable embed_original plugin first."
 msgstr ""
 
-#: js/tt-rss.js:515
-#: js/tt-rss.js:713
+#: js/tt-rss.js:546
+#: js/tt-rss.js:736
 msgid "Widescreen is not available in combined mode."
 msgstr ""
 
-#: js/tt-rss.js:827
+#: js/tt-rss.js:850
 msgid "You can't rescore this kind of feed."
 msgstr ""
 
-#: js/tt-rss.js:832
-#: js/tt-rss.js:676
+#: js/tt-rss.js:855
+#: js/tt-rss.js:699
 #, fuzzy
 msgid "Please select some feed first."
 msgstr "Απαλοιφή επιλεγμένης ροής σε εξέλιξη..."
 
-#: js/tt-rss.js:837
+#: js/tt-rss.js:860
 #, perl-format
 msgid "Rescore articles in %s?"
 msgstr "Αναβαθμολόγηση άρθρων σε %s;"
 
-#: js/tt-rss.js:840
+#: js/tt-rss.js:863
 msgid "Rescoring articles..."
 msgstr "Γίνεται αναβαθμολόγηση άρθρων..."
 
@@ -3301,7 +3342,7 @@ msgstr ""
 msgid "Sorry, your browser does not support sandboxed iframes."
 msgstr ""
 
-#: plugins/shorten_expanded/init.js:37
+#: plugins/shorten_expanded/init.js:39
 msgid "Click to expand article"
 msgstr "Κάντε κλικ για επέκταση άρθρου"
 
@@ -3558,7 +3599,7 @@ msgstr "Έγινε απαλοιφή των URL που παρήχθησαν."
 msgid "Label Editor"
 msgstr "Επεξεργαστής Ετικέτας"
 
-#: js/tt-rss.js:671
+#: js/tt-rss.js:694
 msgid "You can't unsubscribe from the category."
 msgstr ""
 
diff --git a/locale/es_ES/LC_MESSAGES/messages.mo b/locale/es_ES/LC_MESSAGES/messages.mo
index b9bf2162b..2d9919b5a 100644
Binary files a/locale/es_ES/LC_MESSAGES/messages.mo and b/locale/es_ES/LC_MESSAGES/messages.mo differ
diff --git a/locale/es_ES/LC_MESSAGES/messages.po b/locale/es_ES/LC_MESSAGES/messages.po
index 920079b38..1da76627a 100644
--- a/locale/es_ES/LC_MESSAGES/messages.po
+++ b/locale/es_ES/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tt-rss git\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 22:58+0300\n"
+"POT-Creation-Date: 2016-08-19 18:16+0300\n"
 "PO-Revision-Date: 2014-03-10 14:18+0100\n"
 "Last-Translator: DavidM <milarupa@yahoo.es>\n"
 "Language-Team: Español <milarupa@yahoo.es>\n"
@@ -166,13 +166,13 @@ msgstr "Fuente no encontrada."
 msgid "Plugin not found"
 msgstr "Usuario no encontrado"
 
-#: index.php:133
-#: index.php:149
-#: index.php:267
-#: prefs.php:102
+#: index.php:148
+#: index.php:164
+#: index.php:282
+#: prefs.php:117
 #: classes/backend.php:5
 #: classes/pref/labels.php:282
-#: classes/pref/feeds.php:1405
+#: classes/pref/feeds.php:1409
 #: classes/pref/filters.php:779
 #: js/feedlist.js:159
 #: js/functions.js:1293
@@ -184,7 +184,7 @@ msgstr "Usuario no encontrado"
 #: js/prefs.js:1781
 #: js/prefs.js:1799
 #: js/tt-rss.js:55
-#: js/tt-rss.js:522
+#: js/tt-rss.js:553
 #: js/viewfeed.js:1298
 #: plugins/import_export/import_export.js:17
 #: js/feedlist.js:484
@@ -197,75 +197,75 @@ msgstr "Usuario no encontrado"
 #: js/prefs.js:1556
 #: js/prefs.js:1572
 #: js/prefs.js:1592
-#: js/tt-rss.js:539
+#: js/tt-rss.js:570
 #: js/viewfeed.js:830
 msgid "Loading, please wait..."
 msgstr "Cargando. Por favor, espere..."
 
-#: index.php:167
+#: index.php:182
 msgid "Collapse feedlist"
 msgstr "Colapsar la lista de fuentes"
 
-#: index.php:170
+#: index.php:185
 msgid "Show articles"
 msgstr "Mostrar artículos"
 
-#: index.php:173
+#: index.php:188
 msgid "Adaptive"
 msgstr "Adaptable"
 
-#: index.php:174
+#: index.php:189
 msgid "All Articles"
 msgstr "Todos"
 
-#: index.php:175
-#: include/functions2.php:101
+#: index.php:190
+#: include/functions2.php:102
 #: classes/feeds.php:104
 msgid "Starred"
 msgstr "Favoritos"
 
-#: index.php:176
-#: include/functions2.php:102
+#: index.php:191
+#: include/functions2.php:103
 #: classes/feeds.php:105
 msgid "Published"
 msgstr "Publicados"
 
-#: index.php:177
+#: index.php:192
 #: classes/feeds.php:91
 #: classes/feeds.php:103
 msgid "Unread"
 msgstr "Sin leer"
 
-#: index.php:178
+#: index.php:193
 msgid "With Note"
 msgstr "Con anotación"
 
-#: index.php:179
+#: index.php:194
 msgid "Ignore Scoring"
 msgstr "Ignorar la puntuación"
 
-#: index.php:182
+#: index.php:197
 msgid "Sort articles"
 msgstr "Ordenar artículos"
 
-#: index.php:185
+#: index.php:200
 msgid "Default"
 msgstr "Por defecto"
 
-#: index.php:186
+#: index.php:201
 msgid "Newest first"
 msgstr "Recientes primero"
 
-#: index.php:187
+#: index.php:202
 msgid "Oldest first"
 msgstr "Antiguos primero"
 
-#: index.php:188
+#: index.php:203
 msgid "Title"
 msgstr "Título"
 
-#: index.php:192
-#: index.php:233
+#: index.php:207
+#: index.php:248
 #: include/functions2.php:90
 #: classes/feeds.php:109
 #: js/FeedTree.js:132
@@ -273,134 +273,134 @@ msgstr "Título"
 msgid "Mark as read"
 msgstr "Marcar como leído"
 
-#: index.php:195
+#: index.php:210
 msgid "Older than one day"
 msgstr "Más de un día"
 
-#: index.php:198
+#: index.php:213
 msgid "Older than one week"
 msgstr "Más de una semana"
 
-#: index.php:201
+#: index.php:216
 msgid "Older than two weeks"
 msgstr "Más de dos semanas"
 
-#: index.php:217
+#: index.php:232
 msgid "Communication problem with server."
 msgstr "Problema de comunicación con el servidor."
 
-#: index.php:223
+#: index.php:238
 msgid "Actions..."
 msgstr "Acciones..."
 
-#: index.php:225
+#: index.php:240
 msgid "Preferences..."
 msgstr "Preferencias..."
 
-#: index.php:226
+#: index.php:241
 msgid "Search..."
 msgstr "Buscar..."
 
-#: index.php:227
+#: index.php:242
 msgid "Feed actions:"
 msgstr "Acciones de la fuente:"
 
-#: index.php:228
+#: index.php:243
 #: classes/handler/public.php:672
 msgid "Subscribe to feed..."
 msgstr "Suscribirse a una fuente..."
 
-#: index.php:229
+#: index.php:244
 msgid "Edit this feed..."
 msgstr "Editar esta fuente..."
 
-#: index.php:230
+#: index.php:245
 msgid "Rescore feed"
 msgstr "Reiniciar la puntuación"
 
-#: index.php:231
-#: classes/pref/feeds.php:783
-#: classes/pref/feeds.php:1360
+#: index.php:246
+#: classes/pref/feeds.php:785
+#: classes/pref/feeds.php:1364
 #: js/PrefFeedTree.js:74
 msgid "Unsubscribe"
 msgstr "Cancelar la suscripción"
 
-#: index.php:232
+#: index.php:247
 msgid "All feeds:"
 msgstr "Todas las fuentes:"
 
-#: index.php:234
+#: index.php:249
 msgid "(Un)hide read feeds"
 msgstr "Ocultar/Mostrar fuentes leídas"
 
-#: index.php:235
+#: index.php:250
 msgid "Other actions:"
 msgstr "Otras acciones:"
 
-#: index.php:236
+#: index.php:251
 #: include/functions2.php:76
 msgid "Toggle widescreen mode"
 msgstr "Alternar modo de pantalla ancha"
 
-#: index.php:237
+#: index.php:252
 msgid "Create label..."
 msgstr "Crear marcador..."
 
-#: index.php:238
+#: index.php:253
 msgid "Create filter..."
 msgstr "Crear filtro..."
 
-#: index.php:239
+#: index.php:254
 msgid "Keyboard shortcuts help"
 msgstr "Ayuda para atajos de teclado"
 
-#: index.php:248
+#: index.php:263
 msgid "Logout"
 msgstr "Cerrar sesión"
 
-#: index.php:254
+#: index.php:269
 msgid "Updates are available from Git."
 msgstr ""
 
 #: prefs.php:33
-#: prefs.php:120
-#: include/functions2.php:104
+#: prefs.php:135
+#: include/functions2.php:105
 #: classes/pref/prefs.php:435
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: prefs.php:111
+#: prefs.php:126
 msgid "Keyboard shortcuts"
 msgstr "Atajos de teclado"
 
-#: prefs.php:112
+#: prefs.php:127
 msgid "Exit preferences"
 msgstr "Salir de las preferencias"
 
-#: prefs.php:123
+#: prefs.php:138
 #: classes/pref/feeds.php:112
-#: classes/pref/feeds.php:1300
-#: classes/pref/feeds.php:1349
+#: classes/pref/feeds.php:1304
+#: classes/pref/feeds.php:1353
 msgid "Feeds"
 msgstr "Fuentes"
 
-#: prefs.php:126
+#: prefs.php:141
 #: classes/pref/filters.php:248
 msgid "Filters"
 msgstr "Filtros"
 
-#: prefs.php:129
-#: include/functions.php:1256
-#: include/functions.php:1909
+#: prefs.php:144
+#: include/functions.php:1287
+#: include/functions.php:1940
 #: classes/pref/labels.php:90
 msgid "Labels"
 msgstr "Marcadores"
 
-#: prefs.php:133
+#: prefs.php:148
 msgid "Users"
 msgstr "Usuarios"
 
-#: prefs.php:136
+#: prefs.php:151
 msgid "System"
 msgstr "Sistema"
 
@@ -482,10 +482,10 @@ msgid "Tiny Tiny RSS data update script."
 msgstr "Script para actualizar datos de Tiny Tiny RSS."
 
 #: include/digest.php:109
-#: include/functions.php:1265
-#: include/functions.php:1810
-#: include/functions.php:1895
-#: include/functions.php:1917
+#: include/functions.php:1296
+#: include/functions.php:1841
+#: include/functions.php:1926
+#: include/functions.php:1948
 #: classes/opml.php:421
 #: classes/pref/feeds.php:228
 msgid "Uncategorized"
@@ -502,44 +502,44 @@ msgstr[1] "%d artículos archivados"
 msgid "No feeds found."
 msgstr "No se han encontrado fuentes."
 
-#: include/functions.php:958
+#: include/functions.php:989
 #, php-format
 msgid "%d min"
 msgstr ""
 
-#: include/functions.php:1254
-#: include/functions.php:1907
+#: include/functions.php:1285
+#: include/functions.php:1938
 msgid "Special"
 msgstr "Especial"
 
-#: include/functions.php:1758
+#: include/functions.php:1789
 #: classes/pref/filters.php:229
 #: classes/pref/filters.php:507
 msgid "All feeds"
 msgstr "Todas las fuentes"
 
-#: include/functions.php:1962
+#: include/functions.php:1993
 msgid "Starred articles"
 msgstr "Favoritos"
 
-#: include/functions.php:1964
+#: include/functions.php:1995
 msgid "Published articles"
 msgstr "Publicados"
 
-#: include/functions.php:1966
+#: include/functions.php:1997
 msgid "Fresh articles"
 msgstr "Recientes"
 
-#: include/functions.php:1968
-#: include/functions2.php:99
+#: include/functions.php:1999
+#: include/functions2.php:100
 msgid "All articles"
 msgstr "Todos"
 
-#: include/functions.php:1970
+#: include/functions.php:2001
 msgid "Archived articles"
 msgstr "Artículos archivados"
 
-#: include/functions.php:1972
+#: include/functions.php:2003
 msgid "Recently read"
 msgstr "Leídos recientemente"
 
@@ -679,7 +679,7 @@ msgstr "Deseleccionar todo"
 
 #: include/functions2.php:85
 #: classes/pref/feeds.php:555
-#: classes/pref/feeds.php:821
+#: classes/pref/feeds.php:823
 msgid "Feed"
 msgstr "Fuente"
 
@@ -692,7 +692,7 @@ msgid "Un/hide read feeds"
 msgstr "Ocultar/Mostrar fuentes leídas"
 
 #: include/functions2.php:88
-#: classes/pref/feeds.php:1352
+#: classes/pref/feeds.php:1356
 msgid "Subscribe to feed"
 msgstr "Suscribirse a una fuente"
 
@@ -708,140 +708,177 @@ msgid "Reverse headlines"
 msgstr "Invertir orden de titulares"
 
 #: include/functions2.php:92
+msgid "Toggle headline grouping"
+msgstr ""
+
+#: include/functions2.php:93
 msgid "Debug feed update"
 msgstr "Depurar la actualización de fuentes"
 
-#: include/functions2.php:93
+#: include/functions2.php:94
 #, fuzzy
 msgid "Debug viewfeed()"
 msgstr "Depurar la actualización de fuentes"
 
-#: include/functions2.php:94
+#: include/functions2.php:95
 #: js/FeedTree.js:182
 msgid "Mark all feeds as read"
 msgstr "Marcar todas las fuentes como leídas"
 
-#: include/functions2.php:95
+#: include/functions2.php:96
 msgid "Un/collapse current category"
 msgstr "Desplegar/plegar la categoría"
 
-#: include/functions2.php:96
+#: include/functions2.php:97
 msgid "Toggle combined mode"
 msgstr "Alternar modo combinado"
 
-#: include/functions2.php:97
+#: include/functions2.php:98
 msgid "Toggle auto expand in combined mode"
 msgstr "Expandir automáticamente los artículos en el modo combinado"
 
-#: include/functions2.php:98
+#: include/functions2.php:99
 msgid "Go to"
 msgstr "Ir a"
 
-#: include/functions2.php:100
+#: include/functions2.php:101
 msgid "Fresh"
 msgstr "Reciente"
 
-#: include/functions2.php:103
-#: js/tt-rss.js:466
-#: js/tt-rss.js:650
+#: include/functions2.php:104
+#: js/tt-rss.js:497
+#: js/tt-rss.js:673
 msgid "Tag cloud"
 msgstr "Nube de etiquetas"
 
-#: include/functions2.php:105
+#: include/functions2.php:106
 msgid "Other"
 msgstr "Otro"
 
-#: include/functions2.php:106
+#: include/functions2.php:107
 #: classes/pref/labels.php:267
 msgid "Create label"
 msgstr "Crear marcador"
 
-#: include/functions2.php:107
+#: include/functions2.php:108
 #: classes/pref/filters.php:753
 msgid "Create filter"
 msgstr "Crear filtro"
 
-#: include/functions2.php:108
+#: include/functions2.php:109
 msgid "Un/collapse sidebar"
 msgstr "Mostrar/ocultar la barra lateral"
 
-#: include/functions2.php:109
+#: include/functions2.php:110
 msgid "Show help dialog"
 msgstr "Mostrar el diálogo de ayuda"
 
-#: include/functions2.php:663
+#: include/functions2.php:665
 #, php-format
 msgid "Search results: %s"
 msgstr "Resultados de búsqueda: %s"
 
-#: include/functions2.php:1317
+#: include/functions2.php:1330
 #: classes/feeds.php:749
 msgid "comment"
 msgid_plural "comments"
 msgstr[0] "comentario"
 msgstr[1] "comentarios"
 
-#: include/functions2.php:1321
+#: include/functions2.php:1334
 #: classes/feeds.php:753
 msgid "comments"
 msgstr "comentarios"
 
-#: include/functions2.php:1347
+#: include/functions2.php:1360
 msgid " - "
 msgstr " - "
 
-#: include/functions2.php:1380
-#: include/functions2.php:1631
+#: include/functions2.php:1393
+#: include/functions2.php:1644
 #: classes/article.php:311
 msgid "no tags"
 msgstr "sin etiquetas"
 
-#: include/functions2.php:1390
+#: include/functions2.php:1403
 #: classes/feeds.php:735
 msgid "Edit tags for this article"
 msgstr "Editar las etiquetas de este artículo"
 
-#: include/functions2.php:1422
+#: include/functions2.php:1435
 #: classes/feeds.php:682
 msgid "Originally from:"
 msgstr "Original de:"
 
-#: include/functions2.php:1435
+#: include/functions2.php:1448
 #: classes/pref/feeds.php:574
 #: classes/feeds.php:695
 msgid "Feed URL"
 msgstr "URL de la fuente"
 
-#: include/functions2.php:1472
+#: include/functions2.php:1485
 #: classes/backend.php:105
 #: classes/dlg.php:37
 #: classes/dlg.php:60
 #: classes/dlg.php:93
 #: classes/dlg.php:159
 #: classes/dlg.php:186
-#: classes/pref/feeds.php:1654
-#: classes/pref/feeds.php:1720
+#: classes/pref/feeds.php:1658
+#: classes/pref/feeds.php:1724
 #: classes/pref/filters.php:204
 #: classes/pref/prefs.php:1105
 #: plugins/af_psql_trgm/init.php:102
 #: plugins/import_export/init.php:415
-#: plugins/import_export/init.php:460
+#: plugins/import_export/init.php:461
 #: plugins/share/init.php:121
 msgid "Close this window"
 msgstr "Cerrar esta ventana"
 
-#: include/functions2.php:1669
+#: include/functions2.php:1682
 msgid "(edit note)"
 msgstr "(editar nota)"
 
-#: include/functions2.php:1924
+#: include/functions2.php:1937
 msgid "unknown type"
 msgstr "tipo desconocido"
 
-#: include/functions2.php:2001
+#: include/functions2.php:2014
 msgid "Attachments"
 msgstr "Adjuntos"
 
+#: include/functions2.php:2456
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: include/functions2.php:2457
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr ""
+
+#: include/functions2.php:2458
+msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
+msgstr ""
+
+#: include/functions2.php:2459
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: include/functions2.php:2460
+#, fuzzy
+msgid "No file was uploaded"
+msgstr "No se ha cargado ningún archivo."
+
+#: include/functions2.php:2461
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: include/functions2.php:2462
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: include/functions2.php:2463
+msgid "A PHP extension stopped the file upload."
+msgstr ""
+
 #: include/login_form.php:197
 #: classes/handler/public.php:569
 #: classes/handler/public.php:824
@@ -908,8 +945,8 @@ msgstr "Etiquetas para este artículo (separadas por comas):"
 #: classes/article.php:222
 #: classes/pref/labels.php:79
 #: classes/pref/users.php:98
-#: classes/pref/feeds.php:799
-#: classes/pref/feeds.php:939
+#: classes/pref/feeds.php:801
+#: classes/pref/feeds.php:943
 #: classes/pref/filters.php:485
 #: classes/pref/prefs.php:989
 #: plugins/instances/init.php:245
@@ -927,17 +964,17 @@ msgstr "Guardar"
 #: classes/handler/public.php:580
 #: classes/pref/labels.php:81
 #: classes/pref/users.php:100
-#: classes/pref/feeds.php:800
-#: classes/pref/feeds.php:942
-#: classes/pref/feeds.php:1860
+#: classes/pref/feeds.php:802
+#: classes/pref/feeds.php:946
+#: classes/pref/feeds.php:1865
 #: classes/pref/filters.php:488
 #: classes/pref/filters.php:902
 #: classes/pref/filters.php:983
 #: classes/pref/filters.php:1076
 #: classes/pref/prefs.php:991
-#: classes/feeds.php:1098
-#: classes/feeds.php:1148
-#: classes/feeds.php:1185
+#: classes/feeds.php:1100
+#: classes/feeds.php:1150
+#: classes/feeds.php:1187
 #: plugins/instances/init.php:248
 #: plugins/instances/init.php:436
 #: plugins/note/init.php:53
@@ -993,7 +1030,6 @@ msgid "Processing category: %s"
 msgstr "Procesando categoría: %s"
 
 #: classes/opml.php:470
-#: plugins/import_export/init.php:428
 #, php-format
 msgid "Upload failed with error code %d"
 msgstr "La subida falló con el código de error %d"
@@ -1211,9 +1247,9 @@ msgstr "Se ha creado la etiqueta <strong>%s</strong>"
 
 #: classes/pref/labels.php:258
 #: classes/pref/users.php:334
-#: classes/pref/feeds.php:1340
-#: classes/pref/feeds.php:1602
-#: classes/pref/feeds.php:1666
+#: classes/pref/feeds.php:1344
+#: classes/pref/feeds.php:1606
+#: classes/pref/feeds.php:1670
 #: classes/pref/filters.php:359
 #: classes/pref/filters.php:407
 #: classes/pref/filters.php:744
@@ -1226,9 +1262,9 @@ msgstr "Seleccionar"
 
 #: classes/pref/labels.php:261
 #: classes/pref/users.php:337
-#: classes/pref/feeds.php:1343
-#: classes/pref/feeds.php:1605
-#: classes/pref/feeds.php:1669
+#: classes/pref/feeds.php:1347
+#: classes/pref/feeds.php:1609
+#: classes/pref/feeds.php:1673
 #: classes/pref/filters.php:362
 #: classes/pref/filters.php:410
 #: classes/pref/filters.php:747
@@ -1242,9 +1278,9 @@ msgstr "Todo"
 
 #: classes/pref/labels.php:263
 #: classes/pref/users.php:339
-#: classes/pref/feeds.php:1345
-#: classes/pref/feeds.php:1607
-#: classes/pref/feeds.php:1671
+#: classes/pref/feeds.php:1349
+#: classes/pref/feeds.php:1611
+#: classes/pref/feeds.php:1675
 #: classes/pref/filters.php:364
 #: classes/pref/filters.php:412
 #: classes/pref/filters.php:749
@@ -1258,10 +1294,10 @@ msgstr "Nada"
 
 #: classes/pref/labels.php:270
 #: classes/pref/users.php:348
-#: classes/pref/feeds.php:765
+#: classes/pref/feeds.php:767
 #: classes/pref/filters.php:478
 #: classes/pref/filters.php:766
-#: classes/feeds.php:1147
+#: classes/feeds.php:1149
 #: plugins/instances/init.php:294
 msgid "Remove"
 msgstr "Eliminar"
@@ -1283,7 +1319,7 @@ msgstr "Editar regla"
 
 #: classes/pref/users.php:56
 #: classes/pref/feeds.php:637
-#: classes/pref/feeds.php:876
+#: classes/pref/feeds.php:878
 #: classes/feeds.php:1070
 msgid "Authentication"
 msgstr "Autenticación"
@@ -1293,8 +1329,8 @@ msgid "Access level: "
 msgstr "Nivel de acceso:"
 
 #: classes/pref/users.php:77
-#: classes/pref/feeds.php:665
-#: classes/pref/feeds.php:892
+#: classes/pref/feeds.php:667
+#: classes/pref/feeds.php:896
 msgid "Options"
 msgstr "Opciones"
 
@@ -1360,10 +1396,10 @@ msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] Notificación de cambio de contraseña"
 
 #: classes/pref/users.php:324
-#: classes/pref/feeds.php:1336
+#: classes/pref/feeds.php:1340
 #: classes/pref/filters.php:740
-#: classes/feeds.php:1118
-#: classes/feeds.php:1184
+#: classes/feeds.php:1120
+#: classes/feeds.php:1186
 #: js/tt-rss.js:174
 msgid "Search"
 msgstr "Buscar"
@@ -1380,8 +1416,8 @@ msgstr "Editar"
 
 #: classes/pref/users.php:397
 #: classes/pref/feeds.php:643
-#: classes/pref/feeds.php:880
-#: classes/pref/feeds.php:1838
+#: classes/pref/feeds.php:882
+#: classes/pref/feeds.php:1842
 #: classes/feeds.php:1074
 msgid "Login"
 msgstr "Iniciar sesión"
@@ -1460,251 +1496,251 @@ msgid "Feed Title"
 msgstr "Título de la fuente"
 
 #: classes/pref/feeds.php:595
-#: classes/pref/feeds.php:828
-#: classes/pref/feeds.php:1824
+#: classes/pref/feeds.php:830
+#: classes/pref/feeds.php:1828
 #: classes/feeds.php:1050
 msgid "Place in category:"
 msgstr "Categoría:"
 
 #: classes/pref/feeds.php:608
-#: classes/pref/feeds.php:842
+#: classes/pref/feeds.php:844
 #, fuzzy
 msgid "Language:"
 msgstr "Idioma"
 
 #: classes/pref/feeds.php:615
-#: classes/pref/feeds.php:851
+#: classes/pref/feeds.php:853
 msgid "Update"
 msgstr "Actualizar"
 
 #: classes/pref/feeds.php:630
-#: classes/pref/feeds.php:867
+#: classes/pref/feeds.php:869
 msgid "Article purging:"
 msgstr "Purga de artículos"
 
-#: classes/pref/feeds.php:656
-#: classes/pref/feeds.php:886
-#: classes/pref/feeds.php:1841
+#: classes/pref/feeds.php:658
+#: classes/pref/feeds.php:890
+#: classes/pref/feeds.php:1845
 #: classes/pref/prefs.php:245
-#: classes/feeds.php:1077
+#: classes/feeds.php:1078
 msgid "Password"
 msgstr "Contraseña:"
 
-#: classes/pref/feeds.php:660
+#: classes/pref/feeds.php:662
 msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
 msgstr "<b>Pista:</b> necesita rellenar su información de usuario si la fuente requiere autenticación, excepto para las fuentes de Twitter."
 
-#: classes/pref/feeds.php:679
-#: classes/pref/feeds.php:896
+#: classes/pref/feeds.php:681
+#: classes/pref/feeds.php:900
 msgid "Hide from Popular feeds"
 msgstr "No incluir en Fuentes Populares"
 
-#: classes/pref/feeds.php:691
-#: classes/pref/feeds.php:902
+#: classes/pref/feeds.php:693
+#: classes/pref/feeds.php:906
 msgid "Include in e-mail digest"
 msgstr "Incluir en el correo recopilatorio"
 
-#: classes/pref/feeds.php:704
-#: classes/pref/feeds.php:908
+#: classes/pref/feeds.php:706
+#: classes/pref/feeds.php:912
 msgid "Always display image attachments"
 msgstr "Mostrar siempre imágenes adjuntas"
 
-#: classes/pref/feeds.php:717
-#: classes/pref/feeds.php:916
+#: classes/pref/feeds.php:719
+#: classes/pref/feeds.php:920
 msgid "Do not embed images"
 msgstr "No mostrar imágenes"
 
-#: classes/pref/feeds.php:730
-#: classes/pref/feeds.php:924
+#: classes/pref/feeds.php:732
+#: classes/pref/feeds.php:928
 msgid "Cache images locally"
 msgstr "Guardar las imágenes en la memoria caché local"
 
-#: classes/pref/feeds.php:742
-#: classes/pref/feeds.php:930
+#: classes/pref/feeds.php:744
+#: classes/pref/feeds.php:934
 msgid "Mark updated articles as unread"
 msgstr "Marcar los artículos actualizados como sin leer"
 
-#: classes/pref/feeds.php:746
+#: classes/pref/feeds.php:748
 msgid "Icon"
 msgstr "Icono"
 
-#: classes/pref/feeds.php:763
+#: classes/pref/feeds.php:765
 msgid "Replace"
 msgstr "Reemplazar"
 
-#: classes/pref/feeds.php:770
+#: classes/pref/feeds.php:772
 #: classes/pref/prefs.php:706
 msgid "Plugins"
 msgstr "Plugins"
 
-#: classes/pref/feeds.php:790
+#: classes/pref/feeds.php:792
 msgid "Resubscribe to push updates"
 msgstr "Volver a suscribirse a las actualizaciones push"
 
-#: classes/pref/feeds.php:797
+#: classes/pref/feeds.php:799
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr "Reinicia el estatus de suscripción de PubSubHubbub para las fuentes habilitadas para push."
 
-#: classes/pref/feeds.php:1203
-#: classes/pref/feeds.php:1256
+#: classes/pref/feeds.php:1207
+#: classes/pref/feeds.php:1260
 msgid "All done."
 msgstr "Hecho."
 
-#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1315
 msgid "Feeds with errors"
 msgstr "Fuentes con errores"
 
-#: classes/pref/feeds.php:1318
+#: classes/pref/feeds.php:1322
 msgid "Inactive feeds"
 msgstr "Fuentes inactivas"
 
-#: classes/pref/feeds.php:1354
+#: classes/pref/feeds.php:1358
 msgid "Edit selected feeds"
 msgstr "Editar fuentes seleccionadas"
 
-#: classes/pref/feeds.php:1356
-#: classes/pref/feeds.php:1370
+#: classes/pref/feeds.php:1360
+#: classes/pref/feeds.php:1374
 #: classes/pref/filters.php:762
 msgid "Reset sort order"
 msgstr "Reiniciar orden"
 
-#: classes/pref/feeds.php:1358
+#: classes/pref/feeds.php:1362
 #: js/prefs.js:1737
 msgid "Batch subscribe"
 msgstr "Suscripción en lote"
 
-#: classes/pref/feeds.php:1365
+#: classes/pref/feeds.php:1369
 msgid "Categories"
 msgstr "Categorías"
 
-#: classes/pref/feeds.php:1368
+#: classes/pref/feeds.php:1372
 msgid "Add category"
 msgstr "Añadir categoría"
 
-#: classes/pref/feeds.php:1372
+#: classes/pref/feeds.php:1376
 msgid "Remove selected"
 msgstr "Eliminar seleccionadas"
 
-#: classes/pref/feeds.php:1383
+#: classes/pref/feeds.php:1387
 msgid "More actions..."
 msgstr "Más acciones..."
 
-#: classes/pref/feeds.php:1387
+#: classes/pref/feeds.php:1391
 msgid "Manual purge"
 msgstr "Purga manual"
 
-#: classes/pref/feeds.php:1391
+#: classes/pref/feeds.php:1395
 msgid "Clear feed data"
 msgstr "Limpiar los datos de la fuente"
 
-#: classes/pref/feeds.php:1392
+#: classes/pref/feeds.php:1396
 #: classes/pref/filters.php:770
 msgid "Rescore articles"
 msgstr "Reiniciar la puntuación de los artículos"
 
-#: classes/pref/feeds.php:1444
+#: classes/pref/feeds.php:1448
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1446
+#: classes/pref/feeds.php:1450
 msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
 msgstr "Puede usar OPML para importar y exportar sus fuentes, filtros, marcadores y preferencias de Tiny Tiny RSS."
 
-#: classes/pref/feeds.php:1447
+#: classes/pref/feeds.php:1451
 msgid "Only main settings profile can be migrated using OPML."
 msgstr "Sólo el perfil de opciones principal se puede migrar usando OPML."
 
-#: classes/pref/feeds.php:1460
+#: classes/pref/feeds.php:1464
 msgid "Import my OPML"
 msgstr "Importar OPML"
 
-#: classes/pref/feeds.php:1466
+#: classes/pref/feeds.php:1470
 msgid "Filename:"
 msgstr "Nombre de archivo:"
 
-#: classes/pref/feeds.php:1468
+#: classes/pref/feeds.php:1472
 msgid "Include settings"
 msgstr "Incluir preferencias"
 
-#: classes/pref/feeds.php:1472
+#: classes/pref/feeds.php:1476
 msgid "Export OPML"
 msgstr "Exportar OPML"
 
-#: classes/pref/feeds.php:1476
+#: classes/pref/feeds.php:1480
 msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
 msgstr "Puede hacer público su OPML. Cualquiera que conozca la siguiente URL podrá suscribirse al OPML."
 
-#: classes/pref/feeds.php:1480
+#: classes/pref/feeds.php:1484
 msgid "Public OPML URL"
 msgstr "URL del archivo OPML público"
 
-#: classes/pref/feeds.php:1481
+#: classes/pref/feeds.php:1485
 msgid "Display published OPML URL"
 msgstr "Mostrar la URL del OPML público"
 
-#: classes/pref/feeds.php:1490
+#: classes/pref/feeds.php:1494
 msgid "Firefox integration"
 msgstr "Integración con Firefox"
 
-#: classes/pref/feeds.php:1492
+#: classes/pref/feeds.php:1496
 msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
 msgstr "Esta instalación de Tiny tiny RSS puede ser usada como un lector de fuentes de Firefox si pulsa en el enlace de abajo."
 
-#: classes/pref/feeds.php:1499
+#: classes/pref/feeds.php:1503
 msgid "Click here to register this site as a feed reader."
 msgstr "Pulse aquí para registrar este sitio como un lector de fuentes."
 
-#: classes/pref/feeds.php:1507
+#: classes/pref/feeds.php:1511
 msgid "Published & shared articles / Generated feeds"
 msgstr "Artículos publicados y compartidos / Fuentes generadas"
 
-#: classes/pref/feeds.php:1509
+#: classes/pref/feeds.php:1513
 msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
 msgstr "Los artículos publicados son exportados como una fuente RSS pública a la cual podrá suscribirse cualquiera que conozca la URL especificada a continuación."
 
-#: classes/pref/feeds.php:1516
+#: classes/pref/feeds.php:1520
 #: classes/feeds.php:54
 #: classes/feeds.php:134
 msgid "View as RSS"
 msgstr "Ver como RSS"
 
-#: classes/pref/feeds.php:1517
+#: classes/pref/feeds.php:1521
 msgid "Display URL"
 msgstr "Mostrar URL"
 
-#: classes/pref/feeds.php:1520
+#: classes/pref/feeds.php:1524
 msgid "Clear all generated URLs"
 msgstr "Limpiar todas las URLs generadas"
 
-#: classes/pref/feeds.php:1598
+#: classes/pref/feeds.php:1602
 msgid "These feeds have not been updated with new content for 3 months (oldest first):"
 msgstr "Estas fuentes no han publicado contenidos nuevos al menos en 3 meses (más antiguas primero):"
 
-#: classes/pref/feeds.php:1632
-#: classes/pref/feeds.php:1696
+#: classes/pref/feeds.php:1636
+#: classes/pref/feeds.php:1700
 msgid "Click to edit feed"
 msgstr "Pulse para editar fuente"
 
-#: classes/pref/feeds.php:1650
-#: classes/pref/feeds.php:1716
+#: classes/pref/feeds.php:1654
+#: classes/pref/feeds.php:1720
 msgid "Unsubscribe from selected feeds"
 msgstr "Cancelar la suscripción a las fuentes seleccionadas"
 
-#: classes/pref/feeds.php:1821
+#: classes/pref/feeds.php:1825
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr "Añadir una fuente RSS válida en cada línea (no se realizará detección de fuentes)"
 
-#: classes/pref/feeds.php:1830
+#: classes/pref/feeds.php:1834
 msgid "Feeds to subscribe, One per line"
 msgstr "Fuentes para suscribirse, una por línea"
 
-#: classes/pref/feeds.php:1852
+#: classes/pref/feeds.php:1857
 msgid "Feeds require authentication."
 msgstr "Las fuentes requieren autenticación."
 
-#: classes/pref/feeds.php:1859
-#: classes/feeds.php:1092
-#: classes/feeds.php:1146
+#: classes/pref/feeds.php:1864
+#: classes/feeds.php:1094
+#: classes/feeds.php:1148
 msgid "Subscribe"
 msgstr "Suscribir"
 
@@ -1787,7 +1823,7 @@ msgid "on field"
 msgstr "en el campo"
 
 #: classes/pref/filters.php:962
-#: js/PrefFilterTree.js:61
+#: js/PrefFilterTree.js:64
 msgid "in"
 msgstr "en"
 
@@ -2380,40 +2416,40 @@ msgstr "URL de la fuente o del sitio"
 msgid "Available feeds"
 msgstr "Fuentes disponibles"
 
-#: classes/feeds.php:1087
+#: classes/feeds.php:1089
 msgid "This feed requires authentication."
 msgstr "Esta fuente requiere autenticación."
 
-#: classes/feeds.php:1095
+#: classes/feeds.php:1097
 msgid "More feeds"
 msgstr "Más fuentes"
 
-#: classes/feeds.php:1122
+#: classes/feeds.php:1124
 msgid "Popular feeds"
 msgstr "Fuentes populares"
 
-#: classes/feeds.php:1123
+#: classes/feeds.php:1125
 msgid "Feed archive"
 msgstr "Archivo de fuentes"
 
-#: classes/feeds.php:1126
+#: classes/feeds.php:1128
 msgid "limit:"
 msgstr "límite:"
 
-#: classes/feeds.php:1158
+#: classes/feeds.php:1160
 msgid "Look for"
 msgstr "Buscar"
 
-#: classes/feeds.php:1166
+#: classes/feeds.php:1168
 #, php-format
 msgid "in %s"
 msgstr ""
 
-#: classes/feeds.php:1171
+#: classes/feeds.php:1173
 msgid "Used for word stemming"
 msgstr ""
 
-#: classes/feeds.php:1180
+#: classes/feeds.php:1182
 msgid "Search syntax"
 msgstr "Sintaxis de búsqueda"
 
@@ -2676,6 +2712,11 @@ msgstr "No se pudo cargar documento XML."
 msgid "Prepare data"
 msgstr "Preparar datos"
 
+#: plugins/import_export/init.php:428
+#, fuzzy, php-format
+msgid "Upload failed with error code %d (%s)"
+msgstr "La subida falló con el código de error %d"
+
 #: plugins/import_export/init.php:454
 msgid "No file uploaded."
 msgstr "No se ha cargado ningún archivo."
@@ -2786,7 +2827,7 @@ msgstr "Editar categoría"
 msgid "Remove category"
 msgstr "Borrar categoría"
 
-#: js/PrefFilterTree.js:64
+#: js/PrefFilterTree.js:67
 msgid "Inverse"
 msgstr "Inverso"
 
@@ -2839,7 +2880,7 @@ msgid "Subscription reset."
 msgstr "Suscripción reiniciada."
 
 #: js/functions.js:1311
-#: js/tt-rss.js:682
+#: js/tt-rss.js:705
 #, perl-format
 msgid "Unsubscribe from %s?"
 msgstr "¿Cancelar la suscripción a %s?"
@@ -3069,40 +3110,40 @@ msgstr "¿Marcar todos los artículos como leídos?"
 msgid "Marking all feeds as read..."
 msgstr "Marcando todas las fuentes como leídas..."
 
-#: js/tt-rss.js:383
+#: js/tt-rss.js:404
 msgid "Please enable mail plugin first."
 msgstr "Por favor, habilite primero el plugin mail."
 
-#: js/tt-rss.js:431
+#: js/tt-rss.js:452
 #: js/functions.js:1643
-#: js/tt-rss.js:663
+#: js/tt-rss.js:686
 msgid "You can't edit this kind of feed."
 msgstr "No puede editar esta clase de fuente."
 
-#: js/tt-rss.js:502
+#: js/tt-rss.js:533
 msgid "Please enable embed_original plugin first."
 msgstr "Por favor, habilite primero el plugin embed_original."
 
-#: js/tt-rss.js:515
-#: js/tt-rss.js:713
+#: js/tt-rss.js:546
+#: js/tt-rss.js:736
 msgid "Widescreen is not available in combined mode."
 msgstr ""
 
-#: js/tt-rss.js:827
+#: js/tt-rss.js:850
 msgid "You can't rescore this kind of feed."
 msgstr "No puede reiniciar la puntuación de esta clase de fuente."
 
-#: js/tt-rss.js:832
-#: js/tt-rss.js:676
+#: js/tt-rss.js:855
+#: js/tt-rss.js:699
 msgid "Please select some feed first."
 msgstr "Por favor, seleccione primero alguna fuente."
 
-#: js/tt-rss.js:837
+#: js/tt-rss.js:860
 #, perl-format
 msgid "Rescore articles in %s?"
 msgstr "¿Reiniciar la puntuación de los artículos de %s?"
 
-#: js/tt-rss.js:840
+#: js/tt-rss.js:863
 msgid "Rescoring articles..."
 msgstr "Reiniciando la puntuación de los artículos..."
 
@@ -3278,7 +3319,7 @@ msgstr "Sus datos personales han sido guardados."
 msgid "Sorry, your browser does not support sandboxed iframes."
 msgstr "Lo siento, su navegador no soporta iframes aislados (sandbox)."
 
-#: plugins/shorten_expanded/init.js:37
+#: plugins/shorten_expanded/init.js:39
 msgid "Click to expand article"
 msgstr "Desplegar el artículo"
 
@@ -3526,7 +3567,7 @@ msgstr "Borrar todas las URLs generadas"
 msgid "Label Editor"
 msgstr "Editor de marcadores"
 
-#: js/tt-rss.js:671
+#: js/tt-rss.js:694
 msgid "You can't unsubscribe from the category."
 msgstr "No puede cancelar la suscripción a la categoría."
 
diff --git a/locale/es_LA/LC_MESSAGES/messages.mo b/locale/es_LA/LC_MESSAGES/messages.mo
index bb67ac9c9..b4852e64b 100644
Binary files a/locale/es_LA/LC_MESSAGES/messages.mo and b/locale/es_LA/LC_MESSAGES/messages.mo differ
diff --git a/locale/es_LA/LC_MESSAGES/messages.po b/locale/es_LA/LC_MESSAGES/messages.po
index 55940d7ed..0fe1a46e9 100644
--- a/locale/es_LA/LC_MESSAGES/messages.po
+++ b/locale/es_LA/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tt-rss git\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 22:58+0300\n"
+"POT-Creation-Date: 2016-08-19 18:16+0300\n"
 "Last-Translator: Brendan <brendan@tucows.com>\n"
 "Language-Team: OpenSRS brendan@tucows.com>\n"
 "Language: es_LA\n"
@@ -160,13 +160,13 @@ msgstr "Fuente no encontrada."
 msgid "Plugin not found"
 msgstr "Usuario no encontrado"
 
-#: index.php:133
-#: index.php:149
-#: index.php:267
-#: prefs.php:102
+#: index.php:148
+#: index.php:164
+#: index.php:282
+#: prefs.php:117
 #: classes/backend.php:5
 #: classes/pref/labels.php:282
-#: classes/pref/feeds.php:1405
+#: classes/pref/feeds.php:1409
 #: classes/pref/filters.php:779
 #: js/feedlist.js:159
 #: js/functions.js:1293
@@ -178,7 +178,7 @@ msgstr "Usuario no encontrado"
 #: js/prefs.js:1781
 #: js/prefs.js:1799
 #: js/tt-rss.js:55
-#: js/tt-rss.js:522
+#: js/tt-rss.js:553
 #: js/viewfeed.js:1298
 #: plugins/import_export/import_export.js:17
 #: js/feedlist.js:484
@@ -191,75 +191,75 @@ msgstr "Usuario no encontrado"
 #: js/prefs.js:1556
 #: js/prefs.js:1572
 #: js/prefs.js:1592
-#: js/tt-rss.js:539
+#: js/tt-rss.js:570
 #: js/viewfeed.js:830
 msgid "Loading, please wait..."
 msgstr "Cargando. Por favor, espere..."
 
-#: index.php:167
+#: index.php:182
 msgid "Collapse feedlist"
 msgstr "Cerrar la lista de fuentes"
 
-#: index.php:170
+#: index.php:185
 msgid "Show articles"
 msgstr "Mostrar artículos"
 
-#: index.php:173
+#: index.php:188
 msgid "Adaptive"
 msgstr "Adaptable"
 
-#: index.php:174
+#: index.php:189
 msgid "All Articles"
 msgstr "Todos"
 
-#: index.php:175
-#: include/functions2.php:101
+#: index.php:190
+#: include/functions2.php:102
 #: classes/feeds.php:104
 msgid "Starred"
 msgstr "Favoritos"
 
-#: index.php:176
-#: include/functions2.php:102
+#: index.php:191
+#: include/functions2.php:103
 #: classes/feeds.php:105
 msgid "Published"
 msgstr "Publicados"
 
-#: index.php:177
+#: index.php:192
 #: classes/feeds.php:91
 #: classes/feeds.php:103
 msgid "Unread"
 msgstr "Sin leer"
 
-#: index.php:178
+#: index.php:193
 msgid "With Note"
 msgstr "Con anotación"
 
-#: index.php:179
+#: index.php:194
 msgid "Ignore Scoring"
 msgstr "Ignorar la puntuación"
 
-#: index.php:182
+#: index.php:197
 msgid "Sort articles"
 msgstr "Ordenar artículos"
 
-#: index.php:185
+#: index.php:200
 msgid "Default"
 msgstr "Predeterminado"
 
-#: index.php:186
+#: index.php:201
 msgid "Newest first"
 msgstr "Recientes primero"
 
-#: index.php:187
+#: index.php:202
 msgid "Oldest first"
 msgstr "Antiguos primero"
 
-#: index.php:188
+#: index.php:203
 msgid "Title"
 msgstr "Título"
 
-#: index.php:192
-#: index.php:233
+#: index.php:207
+#: index.php:248
 #: include/functions2.php:90
 #: classes/feeds.php:109
 #: js/FeedTree.js:132
@@ -267,134 +267,134 @@ msgstr "Título"
 msgid "Mark as read"
 msgstr "Marcar como leído"
 
-#: index.php:195
+#: index.php:210
 msgid "Older than one day"
 msgstr "Más de un día"
 
-#: index.php:198
+#: index.php:213
 msgid "Older than one week"
 msgstr "Más de una semana"
 
-#: index.php:201
+#: index.php:216
 msgid "Older than two weeks"
 msgstr "Más de dos semanas"
 
-#: index.php:217
+#: index.php:232
 msgid "Communication problem with server."
 msgstr "Problema de comunicación con el servidor."
 
-#: index.php:223
+#: index.php:238
 msgid "Actions..."
 msgstr "Acciones..."
 
-#: index.php:225
+#: index.php:240
 msgid "Preferences..."
 msgstr "Preferencias..."
 
-#: index.php:226
+#: index.php:241
 msgid "Search..."
 msgstr "Buscar..."
 
-#: index.php:227
+#: index.php:242
 msgid "Feed actions:"
 msgstr "Acciones de la fuente:"
 
-#: index.php:228
+#: index.php:243
 #: classes/handler/public.php:672
 msgid "Subscribe to feed..."
 msgstr "Suscribirse a una fuente..."
 
-#: index.php:229
+#: index.php:244
 msgid "Edit this feed..."
 msgstr "Editar esta fuente..."
 
-#: index.php:230
+#: index.php:245
 msgid "Rescore feed"
 msgstr "Reiniciar la puntuación"
 
-#: index.php:231
-#: classes/pref/feeds.php:783
-#: classes/pref/feeds.php:1360
+#: index.php:246
+#: classes/pref/feeds.php:785
+#: classes/pref/feeds.php:1364
 #: js/PrefFeedTree.js:74
 msgid "Unsubscribe"
 msgstr "Cancelar la suscripción"
 
-#: index.php:232
+#: index.php:247
 msgid "All feeds:"
 msgstr "Todas las fuentes:"
 
-#: index.php:234
+#: index.php:249
 msgid "(Un)hide read feeds"
 msgstr "Ocultar/mostrar fuentes leídas"
 
-#: index.php:235
+#: index.php:250
 msgid "Other actions:"
 msgstr "Otras acciones:"
 
-#: index.php:236
+#: index.php:251
 #: include/functions2.php:76
 msgid "Toggle widescreen mode"
 msgstr "Alternar modo de pantalla ancha"
 
-#: index.php:237
+#: index.php:252
 msgid "Create label..."
 msgstr "Crear marcador..."
 
-#: index.php:238
+#: index.php:253
 msgid "Create filter..."
 msgstr "Crear filtro..."
 
-#: index.php:239
+#: index.php:254
 msgid "Keyboard shortcuts help"
 msgstr "Ayuda para atajos de teclado"
 
-#: index.php:248
+#: index.php:263
 msgid "Logout"
 msgstr "Cerrar sesión"
 
-#: index.php:254
+#: index.php:269
 msgid "Updates are available from Git."
 msgstr ""
 
 #: prefs.php:33
-#: prefs.php:120
-#: include/functions2.php:104
+#: prefs.php:135
+#: include/functions2.php:105
 #: classes/pref/prefs.php:435
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: prefs.php:111
+#: prefs.php:126
 msgid "Keyboard shortcuts"
 msgstr "Atajos de teclado"
 
-#: prefs.php:112
+#: prefs.php:127
 msgid "Exit preferences"
 msgstr "Salir de las preferencias"
 
-#: prefs.php:123
+#: prefs.php:138
 #: classes/pref/feeds.php:112
-#: classes/pref/feeds.php:1300
-#: classes/pref/feeds.php:1349
+#: classes/pref/feeds.php:1304
+#: classes/pref/feeds.php:1353
 msgid "Feeds"
 msgstr "Fuentes"
 
-#: prefs.php:126
+#: prefs.php:141
 #: classes/pref/filters.php:248
 msgid "Filters"
 msgstr "Filtros"
 
-#: prefs.php:129
-#: include/functions.php:1256
-#: include/functions.php:1909
+#: prefs.php:144
+#: include/functions.php:1287
+#: include/functions.php:1940
 #: classes/pref/labels.php:90
 msgid "Labels"
 msgstr "Marcadores"
 
-#: prefs.php:133
+#: prefs.php:148
 msgid "Users"
 msgstr "Usuarios"
 
-#: prefs.php:136
+#: prefs.php:151
 msgid "System"
 msgstr "Sistema"
 
@@ -477,10 +477,10 @@ msgid "Tiny Tiny RSS data update script."
 msgstr ""
 
 #: include/digest.php:109
-#: include/functions.php:1265
-#: include/functions.php:1810
-#: include/functions.php:1895
-#: include/functions.php:1917
+#: include/functions.php:1296
+#: include/functions.php:1841
+#: include/functions.php:1926
+#: include/functions.php:1948
 #: classes/opml.php:421
 #: classes/pref/feeds.php:228
 msgid "Uncategorized"
@@ -497,44 +497,44 @@ msgstr[1] "Artículos archivados"
 msgid "No feeds found."
 msgstr "No se han encontrado fuentes."
 
-#: include/functions.php:958
+#: include/functions.php:989
 #, php-format
 msgid "%d min"
 msgstr ""
 
-#: include/functions.php:1254
-#: include/functions.php:1907
+#: include/functions.php:1285
+#: include/functions.php:1938
 msgid "Special"
 msgstr "Especial"
 
-#: include/functions.php:1758
+#: include/functions.php:1789
 #: classes/pref/filters.php:229
 #: classes/pref/filters.php:507
 msgid "All feeds"
 msgstr "Todas las fuentes"
 
-#: include/functions.php:1962
+#: include/functions.php:1993
 msgid "Starred articles"
 msgstr "Favoritos"
 
-#: include/functions.php:1964
+#: include/functions.php:1995
 msgid "Published articles"
 msgstr "Publicados"
 
-#: include/functions.php:1966
+#: include/functions.php:1997
 msgid "Fresh articles"
 msgstr "Recientes"
 
-#: include/functions.php:1968
-#: include/functions2.php:99
+#: include/functions.php:1999
+#: include/functions2.php:100
 msgid "All articles"
 msgstr "Todos"
 
-#: include/functions.php:1970
+#: include/functions.php:2001
 msgid "Archived articles"
 msgstr "Artículos archivados"
 
-#: include/functions.php:1972
+#: include/functions.php:2003
 msgid "Recently read"
 msgstr "Leídos recientemente"
 
@@ -675,7 +675,7 @@ msgstr "Deseleccionar todo"
 
 #: include/functions2.php:85
 #: classes/pref/feeds.php:555
-#: classes/pref/feeds.php:821
+#: classes/pref/feeds.php:823
 msgid "Feed"
 msgstr "Fuente"
 
@@ -688,7 +688,7 @@ msgid "Un/hide read feeds"
 msgstr "Ocultar/mostrar fuentes leídas"
 
 #: include/functions2.php:88
-#: classes/pref/feeds.php:1352
+#: classes/pref/feeds.php:1356
 msgid "Subscribe to feed"
 msgstr "Suscribirse a una fuente"
 
@@ -704,75 +704,79 @@ msgid "Reverse headlines"
 msgstr "Invertir orden de titulares"
 
 #: include/functions2.php:92
+msgid "Toggle headline grouping"
+msgstr ""
+
+#: include/functions2.php:93
 msgid "Debug feed update"
 msgstr "Depurar la actualización de fuentes"
 
-#: include/functions2.php:93
+#: include/functions2.php:94
 #, fuzzy
 msgid "Debug viewfeed()"
 msgstr "Depurar la actualización de fuentes"
 
-#: include/functions2.php:94
+#: include/functions2.php:95
 #: js/FeedTree.js:182
 #, fuzzy
 msgid "Mark all feeds as read"
 msgstr "Marcar fuente como leída"
 
-#: include/functions2.php:95
+#: include/functions2.php:96
 msgid "Un/collapse current category"
 msgstr "Desplegar/plegar la categoría"
 
-#: include/functions2.php:96
+#: include/functions2.php:97
 msgid "Toggle combined mode"
 msgstr "Alternar modo combinado"
 
-#: include/functions2.php:97
+#: include/functions2.php:98
 #, fuzzy
 msgid "Toggle auto expand in combined mode"
 msgstr "Alternar modo combinado"
 
-#: include/functions2.php:98
+#: include/functions2.php:99
 msgid "Go to"
 msgstr "Ir a"
 
-#: include/functions2.php:100
+#: include/functions2.php:101
 msgid "Fresh"
 msgstr "Reciente"
 
-#: include/functions2.php:103
-#: js/tt-rss.js:466
-#: js/tt-rss.js:650
+#: include/functions2.php:104
+#: js/tt-rss.js:497
+#: js/tt-rss.js:673
 msgid "Tag cloud"
 msgstr "Nube de etiquetas"
 
-#: include/functions2.php:105
+#: include/functions2.php:106
 msgid "Other"
 msgstr "Otro"
 
-#: include/functions2.php:106
+#: include/functions2.php:107
 #: classes/pref/labels.php:267
 msgid "Create label"
 msgstr "Crear marcador"
 
-#: include/functions2.php:107
+#: include/functions2.php:108
 #: classes/pref/filters.php:753
 msgid "Create filter"
 msgstr "Crear filtro"
 
-#: include/functions2.php:108
+#: include/functions2.php:109
 msgid "Un/collapse sidebar"
 msgstr "Mostrar/ocultar la barra lateral"
 
-#: include/functions2.php:109
+#: include/functions2.php:110
 msgid "Show help dialog"
 msgstr "Mostrar el diálogo de ayuda"
 
-#: include/functions2.php:663
+#: include/functions2.php:665
 #, php-format
 msgid "Search results: %s"
 msgstr "Resultados de búsqueda: %s"
 
-#: include/functions2.php:1317
+#: include/functions2.php:1330
 #: classes/feeds.php:749
 #, fuzzy
 msgid "comment"
@@ -780,67 +784,100 @@ msgid_plural "comments"
 msgstr[0] "comentarios"
 msgstr[1] "comentarios"
 
-#: include/functions2.php:1321
+#: include/functions2.php:1334
 #: classes/feeds.php:753
 msgid "comments"
 msgstr "comentarios"
 
-#: include/functions2.php:1347
+#: include/functions2.php:1360
 msgid " - "
 msgstr " - "
 
-#: include/functions2.php:1380
-#: include/functions2.php:1631
+#: include/functions2.php:1393
+#: include/functions2.php:1644
 #: classes/article.php:311
 msgid "no tags"
 msgstr "sin etiquetas"
 
-#: include/functions2.php:1390
+#: include/functions2.php:1403
 #: classes/feeds.php:735
 msgid "Edit tags for this article"
 msgstr ""
 
-#: include/functions2.php:1422
+#: include/functions2.php:1435
 #: classes/feeds.php:682
 msgid "Originally from:"
 msgstr "Original de:"
 
-#: include/functions2.php:1435
+#: include/functions2.php:1448
 #: classes/pref/feeds.php:574
 #: classes/feeds.php:695
 msgid "Feed URL"
 msgstr "URL de la fuente"
 
-#: include/functions2.php:1472
+#: include/functions2.php:1485
 #: classes/backend.php:105
 #: classes/dlg.php:37
 #: classes/dlg.php:60
 #: classes/dlg.php:93
 #: classes/dlg.php:159
 #: classes/dlg.php:186
-#: classes/pref/feeds.php:1654
-#: classes/pref/feeds.php:1720
+#: classes/pref/feeds.php:1658
+#: classes/pref/feeds.php:1724
 #: classes/pref/filters.php:204
 #: classes/pref/prefs.php:1105
 #: plugins/af_psql_trgm/init.php:102
 #: plugins/import_export/init.php:415
-#: plugins/import_export/init.php:460
+#: plugins/import_export/init.php:461
 #: plugins/share/init.php:121
 msgid "Close this window"
 msgstr "Cerrar esta ventana"
 
-#: include/functions2.php:1669
+#: include/functions2.php:1682
 msgid "(edit note)"
 msgstr "(editar nota)"
 
-#: include/functions2.php:1924
+#: include/functions2.php:1937
 msgid "unknown type"
 msgstr "tipo desconocido"
 
-#: include/functions2.php:2001
+#: include/functions2.php:2014
 msgid "Attachments"
 msgstr "Adjuntos"
 
+#: include/functions2.php:2456
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: include/functions2.php:2457
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr ""
+
+#: include/functions2.php:2458
+msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
+msgstr ""
+
+#: include/functions2.php:2459
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: include/functions2.php:2460
+#, fuzzy
+msgid "No file was uploaded"
+msgstr "No se ha cargado ningún archivo."
+
+#: include/functions2.php:2461
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: include/functions2.php:2462
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: include/functions2.php:2463
+msgid "A PHP extension stopped the file upload."
+msgstr ""
+
 #: include/login_form.php:197
 #: classes/handler/public.php:569
 #: classes/handler/public.php:824
@@ -907,8 +944,8 @@ msgstr ""
 #: classes/article.php:222
 #: classes/pref/labels.php:79
 #: classes/pref/users.php:98
-#: classes/pref/feeds.php:799
-#: classes/pref/feeds.php:939
+#: classes/pref/feeds.php:801
+#: classes/pref/feeds.php:943
 #: classes/pref/filters.php:485
 #: classes/pref/prefs.php:989
 #: plugins/instances/init.php:245
@@ -926,17 +963,17 @@ msgstr "Guardar"
 #: classes/handler/public.php:580
 #: classes/pref/labels.php:81
 #: classes/pref/users.php:100
-#: classes/pref/feeds.php:800
-#: classes/pref/feeds.php:942
-#: classes/pref/feeds.php:1860
+#: classes/pref/feeds.php:802
+#: classes/pref/feeds.php:946
+#: classes/pref/feeds.php:1865
 #: classes/pref/filters.php:488
 #: classes/pref/filters.php:902
 #: classes/pref/filters.php:983
 #: classes/pref/filters.php:1076
 #: classes/pref/prefs.php:991
-#: classes/feeds.php:1098
-#: classes/feeds.php:1148
-#: classes/feeds.php:1185
+#: classes/feeds.php:1100
+#: classes/feeds.php:1150
+#: classes/feeds.php:1187
 #: plugins/instances/init.php:248
 #: plugins/instances/init.php:436
 #: plugins/note/init.php:53
@@ -992,7 +1029,6 @@ msgid "Processing category: %s"
 msgstr "Procesando categoría: %s"
 
 #: classes/opml.php:470
-#: plugins/import_export/init.php:428
 #, php-format
 msgid "Upload failed with error code %d"
 msgstr ""
@@ -1213,9 +1249,9 @@ msgstr "Crear marcador"
 
 #: classes/pref/labels.php:258
 #: classes/pref/users.php:334
-#: classes/pref/feeds.php:1340
-#: classes/pref/feeds.php:1602
-#: classes/pref/feeds.php:1666
+#: classes/pref/feeds.php:1344
+#: classes/pref/feeds.php:1606
+#: classes/pref/feeds.php:1670
 #: classes/pref/filters.php:359
 #: classes/pref/filters.php:407
 #: classes/pref/filters.php:744
@@ -1228,9 +1264,9 @@ msgstr "Seleccionar"
 
 #: classes/pref/labels.php:261
 #: classes/pref/users.php:337
-#: classes/pref/feeds.php:1343
-#: classes/pref/feeds.php:1605
-#: classes/pref/feeds.php:1669
+#: classes/pref/feeds.php:1347
+#: classes/pref/feeds.php:1609
+#: classes/pref/feeds.php:1673
 #: classes/pref/filters.php:362
 #: classes/pref/filters.php:410
 #: classes/pref/filters.php:747
@@ -1244,9 +1280,9 @@ msgstr "Todos"
 
 #: classes/pref/labels.php:263
 #: classes/pref/users.php:339
-#: classes/pref/feeds.php:1345
-#: classes/pref/feeds.php:1607
-#: classes/pref/feeds.php:1671
+#: classes/pref/feeds.php:1349
+#: classes/pref/feeds.php:1611
+#: classes/pref/feeds.php:1675
 #: classes/pref/filters.php:364
 #: classes/pref/filters.php:412
 #: classes/pref/filters.php:749
@@ -1260,10 +1296,10 @@ msgstr "Ninguno"
 
 #: classes/pref/labels.php:270
 #: classes/pref/users.php:348
-#: classes/pref/feeds.php:765
+#: classes/pref/feeds.php:767
 #: classes/pref/filters.php:478
 #: classes/pref/filters.php:766
-#: classes/feeds.php:1147
+#: classes/feeds.php:1149
 #: plugins/instances/init.php:294
 msgid "Remove"
 msgstr "Eliminar"
@@ -1285,7 +1321,7 @@ msgstr "Editar regla"
 
 #: classes/pref/users.php:56
 #: classes/pref/feeds.php:637
-#: classes/pref/feeds.php:876
+#: classes/pref/feeds.php:878
 #: classes/feeds.php:1070
 msgid "Authentication"
 msgstr "Autenticación"
@@ -1295,8 +1331,8 @@ msgid "Access level: "
 msgstr "Nivel de acceso: "
 
 #: classes/pref/users.php:77
-#: classes/pref/feeds.php:665
-#: classes/pref/feeds.php:892
+#: classes/pref/feeds.php:667
+#: classes/pref/feeds.php:896
 msgid "Options"
 msgstr "Opciones"
 
@@ -1362,10 +1398,10 @@ msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] Notificación de cambio de contraseña"
 
 #: classes/pref/users.php:324
-#: classes/pref/feeds.php:1336
+#: classes/pref/feeds.php:1340
 #: classes/pref/filters.php:740
-#: classes/feeds.php:1118
-#: classes/feeds.php:1184
+#: classes/feeds.php:1120
+#: classes/feeds.php:1186
 #: js/tt-rss.js:174
 msgid "Search"
 msgstr "Buscar"
@@ -1382,8 +1418,8 @@ msgstr "Editar"
 
 #: classes/pref/users.php:397
 #: classes/pref/feeds.php:643
-#: classes/pref/feeds.php:880
-#: classes/pref/feeds.php:1838
+#: classes/pref/feeds.php:882
+#: classes/pref/feeds.php:1842
 #: classes/feeds.php:1074
 msgid "Login"
 msgstr "Iniciar sesión"
@@ -1462,252 +1498,252 @@ msgid "Feed Title"
 msgstr "Título de la fuente"
 
 #: classes/pref/feeds.php:595
-#: classes/pref/feeds.php:828
-#: classes/pref/feeds.php:1824
+#: classes/pref/feeds.php:830
+#: classes/pref/feeds.php:1828
 #: classes/feeds.php:1050
 msgid "Place in category:"
 msgstr "Categoría:"
 
 #: classes/pref/feeds.php:608
-#: classes/pref/feeds.php:842
+#: classes/pref/feeds.php:844
 #, fuzzy
 msgid "Language:"
 msgstr "Idioma"
 
 #: classes/pref/feeds.php:615
-#: classes/pref/feeds.php:851
+#: classes/pref/feeds.php:853
 msgid "Update"
 msgstr "Actualizar"
 
 #: classes/pref/feeds.php:630
-#: classes/pref/feeds.php:867
+#: classes/pref/feeds.php:869
 msgid "Article purging:"
 msgstr "Purga de artículos:"
 
-#: classes/pref/feeds.php:656
-#: classes/pref/feeds.php:886
-#: classes/pref/feeds.php:1841
+#: classes/pref/feeds.php:658
+#: classes/pref/feeds.php:890
+#: classes/pref/feeds.php:1845
 #: classes/pref/prefs.php:245
-#: classes/feeds.php:1077
+#: classes/feeds.php:1078
 msgid "Password"
 msgstr "Contraseña"
 
-#: classes/pref/feeds.php:660
+#: classes/pref/feeds.php:662
 msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
 msgstr ""
 
-#: classes/pref/feeds.php:679
-#: classes/pref/feeds.php:896
+#: classes/pref/feeds.php:681
+#: classes/pref/feeds.php:900
 msgid "Hide from Popular feeds"
 msgstr "No incluir en fuentes populares"
 
-#: classes/pref/feeds.php:691
-#: classes/pref/feeds.php:902
+#: classes/pref/feeds.php:693
+#: classes/pref/feeds.php:906
 msgid "Include in e-mail digest"
 msgstr "Incluir en el correo recopilatorio"
 
-#: classes/pref/feeds.php:704
-#: classes/pref/feeds.php:908
+#: classes/pref/feeds.php:706
+#: classes/pref/feeds.php:912
 msgid "Always display image attachments"
 msgstr "Mostrar siempre imágenes adjuntas"
 
-#: classes/pref/feeds.php:717
-#: classes/pref/feeds.php:916
+#: classes/pref/feeds.php:719
+#: classes/pref/feeds.php:920
 msgid "Do not embed images"
 msgstr "No mostrar imágenes"
 
-#: classes/pref/feeds.php:730
-#: classes/pref/feeds.php:924
+#: classes/pref/feeds.php:732
+#: classes/pref/feeds.php:928
 msgid "Cache images locally"
 msgstr "Guardar las imágenes en la memoria caché local"
 
-#: classes/pref/feeds.php:742
-#: classes/pref/feeds.php:930
+#: classes/pref/feeds.php:744
+#: classes/pref/feeds.php:934
 #, fuzzy
 msgid "Mark updated articles as unread"
 msgstr "Marcar fuente como leída"
 
-#: classes/pref/feeds.php:746
+#: classes/pref/feeds.php:748
 msgid "Icon"
 msgstr "Icono"
 
-#: classes/pref/feeds.php:763
+#: classes/pref/feeds.php:765
 msgid "Replace"
 msgstr "Reemplazar"
 
-#: classes/pref/feeds.php:770
+#: classes/pref/feeds.php:772
 #: classes/pref/prefs.php:706
 msgid "Plugins"
 msgstr "Plugins"
 
-#: classes/pref/feeds.php:790
+#: classes/pref/feeds.php:792
 msgid "Resubscribe to push updates"
 msgstr "Volver a suscribirse a las actualizaciones push"
 
-#: classes/pref/feeds.php:797
+#: classes/pref/feeds.php:799
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr ""
 
-#: classes/pref/feeds.php:1203
-#: classes/pref/feeds.php:1256
+#: classes/pref/feeds.php:1207
+#: classes/pref/feeds.php:1260
 msgid "All done."
 msgstr "Hecho."
 
-#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1315
 msgid "Feeds with errors"
 msgstr "Fuentes con errores"
 
-#: classes/pref/feeds.php:1318
+#: classes/pref/feeds.php:1322
 msgid "Inactive feeds"
 msgstr "Fuentes inactivas"
 
-#: classes/pref/feeds.php:1354
+#: classes/pref/feeds.php:1358
 msgid "Edit selected feeds"
 msgstr "Editar fuentes seleccionadas"
 
-#: classes/pref/feeds.php:1356
-#: classes/pref/feeds.php:1370
+#: classes/pref/feeds.php:1360
+#: classes/pref/feeds.php:1374
 #: classes/pref/filters.php:762
 msgid "Reset sort order"
 msgstr "Reiniciar orden"
 
-#: classes/pref/feeds.php:1358
+#: classes/pref/feeds.php:1362
 #: js/prefs.js:1737
 msgid "Batch subscribe"
 msgstr "Suscripción en lote"
 
-#: classes/pref/feeds.php:1365
+#: classes/pref/feeds.php:1369
 msgid "Categories"
 msgstr "Categorías"
 
-#: classes/pref/feeds.php:1368
+#: classes/pref/feeds.php:1372
 msgid "Add category"
 msgstr "Añadir categoría"
 
-#: classes/pref/feeds.php:1372
+#: classes/pref/feeds.php:1376
 msgid "Remove selected"
 msgstr "Eliminar seleccionadas"
 
-#: classes/pref/feeds.php:1383
+#: classes/pref/feeds.php:1387
 msgid "More actions..."
 msgstr "Más acciones..."
 
-#: classes/pref/feeds.php:1387
+#: classes/pref/feeds.php:1391
 msgid "Manual purge"
 msgstr "Purga manual"
 
-#: classes/pref/feeds.php:1391
+#: classes/pref/feeds.php:1395
 msgid "Clear feed data"
 msgstr "Limpiar los datos de la fuente"
 
-#: classes/pref/feeds.php:1392
+#: classes/pref/feeds.php:1396
 #: classes/pref/filters.php:770
 msgid "Rescore articles"
 msgstr "Reiniciar la puntuación de los artículos"
 
-#: classes/pref/feeds.php:1444
+#: classes/pref/feeds.php:1448
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1446
+#: classes/pref/feeds.php:1450
 msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
 msgstr ""
 
-#: classes/pref/feeds.php:1447
+#: classes/pref/feeds.php:1451
 msgid "Only main settings profile can be migrated using OPML."
 msgstr ""
 
-#: classes/pref/feeds.php:1460
+#: classes/pref/feeds.php:1464
 msgid "Import my OPML"
 msgstr "Importar OPML"
 
-#: classes/pref/feeds.php:1466
+#: classes/pref/feeds.php:1470
 msgid "Filename:"
 msgstr "Nombre de archivo:"
 
-#: classes/pref/feeds.php:1468
+#: classes/pref/feeds.php:1472
 msgid "Include settings"
 msgstr "Incluir preferencias"
 
-#: classes/pref/feeds.php:1472
+#: classes/pref/feeds.php:1476
 msgid "Export OPML"
 msgstr "Exportar OPML"
 
-#: classes/pref/feeds.php:1476
+#: classes/pref/feeds.php:1480
 msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
 msgstr ""
 
-#: classes/pref/feeds.php:1480
+#: classes/pref/feeds.php:1484
 msgid "Public OPML URL"
 msgstr "URL del archivo OPML público"
 
-#: classes/pref/feeds.php:1481
+#: classes/pref/feeds.php:1485
 msgid "Display published OPML URL"
 msgstr "Mostrar la URL del OPML público"
 
-#: classes/pref/feeds.php:1490
+#: classes/pref/feeds.php:1494
 msgid "Firefox integration"
 msgstr "Integración con Firefox"
 
-#: classes/pref/feeds.php:1492
+#: classes/pref/feeds.php:1496
 msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
 msgstr ""
 
-#: classes/pref/feeds.php:1499
+#: classes/pref/feeds.php:1503
 msgid "Click here to register this site as a feed reader."
 msgstr ""
 
-#: classes/pref/feeds.php:1507
+#: classes/pref/feeds.php:1511
 msgid "Published & shared articles / Generated feeds"
 msgstr ""
 
-#: classes/pref/feeds.php:1509
+#: classes/pref/feeds.php:1513
 msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
 msgstr ""
 
-#: classes/pref/feeds.php:1516
+#: classes/pref/feeds.php:1520
 #: classes/feeds.php:54
 #: classes/feeds.php:134
 msgid "View as RSS"
 msgstr "Ver como RSS"
 
-#: classes/pref/feeds.php:1517
+#: classes/pref/feeds.php:1521
 msgid "Display URL"
 msgstr "Mostrar URL"
 
-#: classes/pref/feeds.php:1520
+#: classes/pref/feeds.php:1524
 msgid "Clear all generated URLs"
 msgstr "Limpiar todas las URL generadas"
 
-#: classes/pref/feeds.php:1598
+#: classes/pref/feeds.php:1602
 msgid "These feeds have not been updated with new content for 3 months (oldest first):"
 msgstr ""
 
-#: classes/pref/feeds.php:1632
-#: classes/pref/feeds.php:1696
+#: classes/pref/feeds.php:1636
+#: classes/pref/feeds.php:1700
 msgid "Click to edit feed"
 msgstr "Haga clic para editar fuente"
 
-#: classes/pref/feeds.php:1650
-#: classes/pref/feeds.php:1716
+#: classes/pref/feeds.php:1654
+#: classes/pref/feeds.php:1720
 msgid "Unsubscribe from selected feeds"
 msgstr "Cancelar la suscripción a las fuentes seleccionadas"
 
-#: classes/pref/feeds.php:1821
+#: classes/pref/feeds.php:1825
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr ""
 
-#: classes/pref/feeds.php:1830
+#: classes/pref/feeds.php:1834
 msgid "Feeds to subscribe, One per line"
 msgstr ""
 
-#: classes/pref/feeds.php:1852
+#: classes/pref/feeds.php:1857
 msgid "Feeds require authentication."
 msgstr "Las fuentes requieren autenticación."
 
-#: classes/pref/feeds.php:1859
-#: classes/feeds.php:1092
-#: classes/feeds.php:1146
+#: classes/pref/feeds.php:1864
+#: classes/feeds.php:1094
+#: classes/feeds.php:1148
 msgid "Subscribe"
 msgstr "Suscribir"
 
@@ -1790,7 +1826,7 @@ msgid "on field"
 msgstr "en el campo"
 
 #: classes/pref/filters.php:962
-#: js/PrefFilterTree.js:61
+#: js/PrefFilterTree.js:64
 msgid "in"
 msgstr "en"
 
@@ -2392,40 +2428,40 @@ msgstr "URL de la fuente o del sitio"
 msgid "Available feeds"
 msgstr "Fuentes disponibles"
 
-#: classes/feeds.php:1087
+#: classes/feeds.php:1089
 msgid "This feed requires authentication."
 msgstr "Esta fuente requiere autenticación."
 
-#: classes/feeds.php:1095
+#: classes/feeds.php:1097
 msgid "More feeds"
 msgstr "Más fuentes"
 
-#: classes/feeds.php:1122
+#: classes/feeds.php:1124
 msgid "Popular feeds"
 msgstr "Fuentes populares"
 
-#: classes/feeds.php:1123
+#: classes/feeds.php:1125
 msgid "Feed archive"
 msgstr "Archivo de fuentes"
 
-#: classes/feeds.php:1126
+#: classes/feeds.php:1128
 msgid "limit:"
 msgstr "límite:"
 
-#: classes/feeds.php:1158
+#: classes/feeds.php:1160
 msgid "Look for"
 msgstr "Buscar"
 
-#: classes/feeds.php:1166
+#: classes/feeds.php:1168
 #, php-format
 msgid "in %s"
 msgstr ""
 
-#: classes/feeds.php:1171
+#: classes/feeds.php:1173
 msgid "Used for word stemming"
 msgstr ""
 
-#: classes/feeds.php:1180
+#: classes/feeds.php:1182
 msgid "Search syntax"
 msgstr "Sintaxis de búsqueda"
 
@@ -2689,6 +2725,11 @@ msgstr ""
 msgid "Prepare data"
 msgstr "Preparar datos"
 
+#: plugins/import_export/init.php:428
+#, php-format
+msgid "Upload failed with error code %d (%s)"
+msgstr ""
+
 #: plugins/import_export/init.php:454
 msgid "No file uploaded."
 msgstr "No se ha cargado ningún archivo."
@@ -2801,7 +2842,7 @@ msgstr "Editar categoría"
 msgid "Remove category"
 msgstr "Borrar categoría"
 
-#: js/PrefFilterTree.js:64
+#: js/PrefFilterTree.js:67
 msgid "Inverse"
 msgstr "Inverso"
 
@@ -2852,7 +2893,7 @@ msgid "Subscription reset."
 msgstr "Suscripción reiniciada."
 
 #: js/functions.js:1311
-#: js/tt-rss.js:682
+#: js/tt-rss.js:705
 #, perl-format
 msgid "Unsubscribe from %s?"
 msgstr "¿Cancelar la suscripción a %s?"
@@ -3089,41 +3130,41 @@ msgstr "Marcar artículos anteriores como leídos"
 msgid "Marking all feeds as read..."
 msgstr "Marcar fuente como leída"
 
-#: js/tt-rss.js:383
+#: js/tt-rss.js:404
 msgid "Please enable mail plugin first."
 msgstr ""
 
-#: js/tt-rss.js:431
+#: js/tt-rss.js:452
 #: js/functions.js:1643
-#: js/tt-rss.js:663
+#: js/tt-rss.js:686
 msgid "You can't edit this kind of feed."
 msgstr ""
 
-#: js/tt-rss.js:502
+#: js/tt-rss.js:533
 msgid "Please enable embed_original plugin first."
 msgstr ""
 
-#: js/tt-rss.js:515
-#: js/tt-rss.js:713
+#: js/tt-rss.js:546
+#: js/tt-rss.js:736
 msgid "Widescreen is not available in combined mode."
 msgstr ""
 
-#: js/tt-rss.js:827
+#: js/tt-rss.js:850
 msgid "You can't rescore this kind of feed."
 msgstr ""
 
-#: js/tt-rss.js:832
-#: js/tt-rss.js:676
+#: js/tt-rss.js:855
+#: js/tt-rss.js:699
 #, fuzzy
 msgid "Please select some feed first."
 msgstr "Limpiando las fuentes seleccionadas..."
 
-#: js/tt-rss.js:837
+#: js/tt-rss.js:860
 #, fuzzy, perl-format
 msgid "Rescore articles in %s?"
 msgstr "¿Reiniciar la puntuación de los artículos en %?"
 
-#: js/tt-rss.js:840
+#: js/tt-rss.js:863
 msgid "Rescoring articles..."
 msgstr "Reiniciando la puntuación de los artículos..."
 
@@ -3301,7 +3342,7 @@ msgstr ""
 msgid "Sorry, your browser does not support sandboxed iframes."
 msgstr ""
 
-#: plugins/shorten_expanded/init.js:37
+#: plugins/shorten_expanded/init.js:39
 msgid "Click to expand article"
 msgstr "Desplegar el artículo"
 
@@ -3558,7 +3599,7 @@ msgstr "Las URL generadas han sido borradas."
 msgid "Label Editor"
 msgstr "Editor de marcadores"
 
-#: js/tt-rss.js:671
+#: js/tt-rss.js:694
 msgid "You can't unsubscribe from the category."
 msgstr ""
 
diff --git a/locale/fi_FI/LC_MESSAGES/messages.mo b/locale/fi_FI/LC_MESSAGES/messages.mo
index b092074e7..8c3bdd3f9 100644
Binary files a/locale/fi_FI/LC_MESSAGES/messages.mo and b/locale/fi_FI/LC_MESSAGES/messages.mo differ
diff --git a/locale/fi_FI/LC_MESSAGES/messages.po b/locale/fi_FI/LC_MESSAGES/messages.po
index f529b0724..dbd23eabd 100644
--- a/locale/fi_FI/LC_MESSAGES/messages.po
+++ b/locale/fi_FI/LC_MESSAGES/messages.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tt-rss 1.7.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 22:58+0300\n"
+"POT-Creation-Date: 2016-08-19 18:16+0300\n"
 "PO-Revision-Date: 2015-06-25 22:05+0300\n"
 "Last-Translator: Henrik Ahlgren <pablo@seestieto.com>\n"
 "Language-Team: \n"
@@ -165,13 +165,13 @@ msgstr "Metodia ei löydy"
 msgid "Plugin not found"
 msgstr "Lisäosaa ei löydy"
 
-#: index.php:133
-#: index.php:149
-#: index.php:267
-#: prefs.php:102
+#: index.php:148
+#: index.php:164
+#: index.php:282
+#: prefs.php:117
 #: classes/backend.php:5
 #: classes/pref/labels.php:282
-#: classes/pref/feeds.php:1405
+#: classes/pref/feeds.php:1409
 #: classes/pref/filters.php:779
 #: js/feedlist.js:159
 #: js/functions.js:1293
@@ -183,7 +183,7 @@ msgstr "Lisäosaa ei löydy"
 #: js/prefs.js:1781
 #: js/prefs.js:1799
 #: js/tt-rss.js:55
-#: js/tt-rss.js:522
+#: js/tt-rss.js:553
 #: js/viewfeed.js:1298
 #: plugins/import_export/import_export.js:17
 #: js/feedlist.js:484
@@ -196,75 +196,75 @@ msgstr "Lisäosaa ei löydy"
 #: js/prefs.js:1556
 #: js/prefs.js:1572
 #: js/prefs.js:1592
-#: js/tt-rss.js:539
+#: js/tt-rss.js:570
 #: js/viewfeed.js:830
 msgid "Loading, please wait..."
 msgstr "Ladataan, odota..."
 
-#: index.php:167
+#: index.php:182
 msgid "Collapse feedlist"
 msgstr "Sulje syöteluettelo"
 
-#: index.php:170
+#: index.php:185
 msgid "Show articles"
 msgstr "Näytä artikkelit"
 
-#: index.php:173
+#: index.php:188
 msgid "Adaptive"
 msgstr "Mukautuva"
 
-#: index.php:174
+#: index.php:189
 msgid "All Articles"
 msgstr "Kaikki artikkelit"
 
-#: index.php:175
-#: include/functions2.php:101
+#: index.php:190
+#: include/functions2.php:102
 #: classes/feeds.php:104
 msgid "Starred"
 msgstr "Tähdelliset"
 
-#: index.php:176
-#: include/functions2.php:102
+#: index.php:191
+#: include/functions2.php:103
 #: classes/feeds.php:105
 msgid "Published"
 msgstr "Julkiset"
 
-#: index.php:177
+#: index.php:192
 #: classes/feeds.php:91
 #: classes/feeds.php:103
 msgid "Unread"
 msgstr "Lukemattomat"
 
-#: index.php:178
+#: index.php:193
 msgid "With Note"
 msgstr "Huomattavat"
 
-#: index.php:179
+#: index.php:194
 msgid "Ignore Scoring"
 msgstr "Ohita pisteytys"
 
-#: index.php:182
+#: index.php:197
 msgid "Sort articles"
 msgstr "Järjestä artikkelit"
 
-#: index.php:185
+#: index.php:200
 msgid "Default"
 msgstr "Oletus"
 
-#: index.php:186
+#: index.php:201
 msgid "Newest first"
 msgstr "Uusin ensin"
 
-#: index.php:187
+#: index.php:202
 msgid "Oldest first"
 msgstr "Vanhin ensin"
 
-#: index.php:188
+#: index.php:203
 msgid "Title"
 msgstr "Otsikko"
 
-#: index.php:192
-#: index.php:233
+#: index.php:207
+#: index.php:248
 #: include/functions2.php:90
 #: classes/feeds.php:109
 #: js/FeedTree.js:132
@@ -272,134 +272,134 @@ msgstr "Otsikko"
 msgid "Mark as read"
 msgstr "Merkitse luetuiksi"
 
-#: index.php:195
+#: index.php:210
 msgid "Older than one day"
 msgstr "1 pv vanhemmat"
 
-#: index.php:198
+#: index.php:213
 msgid "Older than one week"
 msgstr "1 vko vanhemmat"
 
-#: index.php:201
+#: index.php:216
 msgid "Older than two weeks"
 msgstr "2 vko vanhemmat"
 
-#: index.php:217
+#: index.php:232
 msgid "Communication problem with server."
 msgstr "Palvelimeen ei saada yhteyttä"
 
-#: index.php:223
+#: index.php:238
 msgid "Actions..."
 msgstr "Toiminnot..."
 
-#: index.php:225
+#: index.php:240
 msgid "Preferences..."
 msgstr "Asetukset"
 
-#: index.php:226
+#: index.php:241
 msgid "Search..."
 msgstr "Etsi..."
 
-#: index.php:227
+#: index.php:242
 msgid "Feed actions:"
 msgstr "Syötetoiminnot:"
 
-#: index.php:228
+#: index.php:243
 #: classes/handler/public.php:672
 msgid "Subscribe to feed..."
 msgstr "Tilaa syöte..."
 
-#: index.php:229
+#: index.php:244
 msgid "Edit this feed..."
 msgstr "Muokkaa tätä syötettä..."
 
-#: index.php:230
+#: index.php:245
 msgid "Rescore feed"
 msgstr "Uudelleenpisteytä syöte"
 
-#: index.php:231
-#: classes/pref/feeds.php:783
-#: classes/pref/feeds.php:1360
+#: index.php:246
+#: classes/pref/feeds.php:785
+#: classes/pref/feeds.php:1364
 #: js/PrefFeedTree.js:74
 msgid "Unsubscribe"
 msgstr "Peru tilaus"
 
-#: index.php:232
+#: index.php:247
 msgid "All feeds:"
 msgstr "Kaikki syötteet:"
 
-#: index.php:234
+#: index.php:249
 msgid "(Un)hide read feeds"
 msgstr "Piilota/näytä luetut syötteet"
 
-#: index.php:235
+#: index.php:250
 msgid "Other actions:"
 msgstr "Muut toiminnot:"
 
-#: index.php:236
+#: index.php:251
 #: include/functions2.php:76
 msgid "Toggle widescreen mode"
 msgstr "Vaihda näkymä"
 
-#: index.php:237
+#: index.php:252
 msgid "Create label..."
 msgstr "Luo tunniste..."
 
-#: index.php:238
+#: index.php:253
 msgid "Create filter..."
 msgstr "Luo suodatin..."
 
-#: index.php:239
+#: index.php:254
 msgid "Keyboard shortcuts help"
 msgstr "Näytä pikanäppäimet"
 
-#: index.php:248
+#: index.php:263
 msgid "Logout"
 msgstr "Kirjaudu ulos"
 
-#: index.php:254
+#: index.php:269
 msgid "Updates are available from Git."
 msgstr "Päivityksiä saatavilla Gitistä."
 
 #: prefs.php:33
-#: prefs.php:120
-#: include/functions2.php:104
+#: prefs.php:135
+#: include/functions2.php:105
 #: classes/pref/prefs.php:435
 msgid "Preferences"
 msgstr "Asetukset"
 
-#: prefs.php:111
+#: prefs.php:126
 msgid "Keyboard shortcuts"
 msgstr "Pikanäppäimet"
 
-#: prefs.php:112
+#: prefs.php:127
 msgid "Exit preferences"
 msgstr "Poistu asetuksista"
 
-#: prefs.php:123
+#: prefs.php:138
 #: classes/pref/feeds.php:112
-#: classes/pref/feeds.php:1300
-#: classes/pref/feeds.php:1349
+#: classes/pref/feeds.php:1304
+#: classes/pref/feeds.php:1353
 msgid "Feeds"
 msgstr "Syötteet"
 
-#: prefs.php:126
+#: prefs.php:141
 #: classes/pref/filters.php:248
 msgid "Filters"
 msgstr "Suodattimet"
 
-#: prefs.php:129
-#: include/functions.php:1256
-#: include/functions.php:1909
+#: prefs.php:144
+#: include/functions.php:1287
+#: include/functions.php:1940
 #: classes/pref/labels.php:90
 msgid "Labels"
 msgstr "Tunnisteet"
 
-#: prefs.php:133
+#: prefs.php:148
 msgid "Users"
 msgstr "Käyttäjät"
 
-#: prefs.php:136
+#: prefs.php:151
 msgid "System"
 msgstr "Järjestelmä"
 
@@ -481,10 +481,10 @@ msgid "Tiny Tiny RSS data update script."
 msgstr "Tiny Tiny RSS:n datapäivitysskripti."
 
 #: include/digest.php:109
-#: include/functions.php:1265
-#: include/functions.php:1810
-#: include/functions.php:1895
-#: include/functions.php:1917
+#: include/functions.php:1296
+#: include/functions.php:1841
+#: include/functions.php:1926
+#: include/functions.php:1948
 #: classes/opml.php:421
 #: classes/pref/feeds.php:228
 msgid "Uncategorized"
@@ -501,44 +501,44 @@ msgstr[1] "%d arkistoitua artikkelia"
 msgid "No feeds found."
 msgstr "Syötteitä ei löytynyt."
 
-#: include/functions.php:958
+#: include/functions.php:989
 #, php-format
 msgid "%d min"
 msgstr ""
 
-#: include/functions.php:1254
-#: include/functions.php:1907
+#: include/functions.php:1285
+#: include/functions.php:1938
 msgid "Special"
 msgstr "Erikoiset"
 
-#: include/functions.php:1758
+#: include/functions.php:1789
 #: classes/pref/filters.php:229
 #: classes/pref/filters.php:507
 msgid "All feeds"
 msgstr "Kaikki syötteet"
 
-#: include/functions.php:1962
+#: include/functions.php:1993
 msgid "Starred articles"
 msgstr "Tähdelliset artikkelit"
 
-#: include/functions.php:1964
+#: include/functions.php:1995
 msgid "Published articles"
 msgstr "Julkiset artikkelit"
 
-#: include/functions.php:1966
+#: include/functions.php:1997
 msgid "Fresh articles"
 msgstr "Tuoreet artikkelit"
 
-#: include/functions.php:1968
-#: include/functions2.php:99
+#: include/functions.php:1999
+#: include/functions2.php:100
 msgid "All articles"
 msgstr "Kaikki artikkelit"
 
-#: include/functions.php:1970
+#: include/functions.php:2001
 msgid "Archived articles"
 msgstr "Arkistoidut artikkelit"
 
-#: include/functions.php:1972
+#: include/functions.php:2003
 msgid "Recently read"
 msgstr "Viimeksi luetut"
 
@@ -679,7 +679,7 @@ msgstr "Poista valinnat"
 
 #: include/functions2.php:85
 #: classes/pref/feeds.php:555
-#: classes/pref/feeds.php:821
+#: classes/pref/feeds.php:823
 msgid "Feed"
 msgstr "Syöte"
 
@@ -692,7 +692,7 @@ msgid "Un/hide read feeds"
 msgstr "Piilota/näytä luetut syötteet"
 
 #: include/functions2.php:88
-#: classes/pref/feeds.php:1352
+#: classes/pref/feeds.php:1356
 msgid "Subscribe to feed"
 msgstr "Tilaa syöte"
 
@@ -708,141 +708,177 @@ msgid "Reverse headlines"
 msgstr "Otsikot käänteisjärjestyksessä"
 
 #: include/functions2.php:92
+msgid "Toggle headline grouping"
+msgstr ""
+
+#: include/functions2.php:93
 msgid "Debug feed update"
 msgstr "Syötepäivityksen vianetsintä"
 
-#: include/functions2.php:93
+#: include/functions2.php:94
 #, fuzzy
 msgid "Debug viewfeed()"
 msgstr "Syötepäivityksen vianetsintä"
 
-#: include/functions2.php:94
+#: include/functions2.php:95
 #: js/FeedTree.js:182
 msgid "Mark all feeds as read"
 msgstr "Merkitse kaikki syötteet luetuiksi"
 
-#: include/functions2.php:95
+#: include/functions2.php:96
 msgid "Un/collapse current category"
 msgstr "Piilota/näytä tämänhetkinen kansio"
 
-#: include/functions2.php:96
+#: include/functions2.php:97
 msgid "Toggle combined mode"
 msgstr "Vaihda yhdistelmänäkymän tila"
 
-#: include/functions2.php:97
+#: include/functions2.php:98
 msgid "Toggle auto expand in combined mode"
 msgstr "Vaihda automaattilaajennuksen tila yhdistelmänäkymässä"
 
-#: include/functions2.php:98
+#: include/functions2.php:99
 msgid "Go to"
 msgstr "Mene"
 
-#: include/functions2.php:100
+#: include/functions2.php:101
 msgid "Fresh"
 msgstr "Päivitä"
 
-#: include/functions2.php:103
-#: js/tt-rss.js:466
-#: js/tt-rss.js:650
+#: include/functions2.php:104
+#: js/tt-rss.js:497
+#: js/tt-rss.js:673
 msgid "Tag cloud"
 msgstr "Avainsanapilvi"
 
-#: include/functions2.php:105
+#: include/functions2.php:106
 msgid "Other"
 msgstr "Muu"
 
-#: include/functions2.php:106
+#: include/functions2.php:107
 #: classes/pref/labels.php:267
 msgid "Create label"
 msgstr "Luo tunniste"
 
-#: include/functions2.php:107
+#: include/functions2.php:108
 #: classes/pref/filters.php:753
 msgid "Create filter"
 msgstr "Luo suodatin"
 
-#: include/functions2.php:108
+#: include/functions2.php:109
 msgid "Un/collapse sidebar"
 msgstr "Piilota/näytä sivupalkki"
 
-#: include/functions2.php:109
+#: include/functions2.php:110
 msgid "Show help dialog"
 msgstr "Näytä ohjeikkuna"
 
-#: include/functions2.php:663
+#: include/functions2.php:665
 #, php-format
 msgid "Search results: %s"
 msgstr "Hakutulokset: %s"
 
-#: include/functions2.php:1317
+#: include/functions2.php:1330
 #: classes/feeds.php:749
 msgid "comment"
 msgid_plural "comments"
 msgstr[0] "kommentti"
 msgstr[1] "kommenttia"
 
-#: include/functions2.php:1321
+#: include/functions2.php:1334
 #: classes/feeds.php:753
 #, fuzzy
 msgid "comments"
 msgstr "Litteet"
 
-#: include/functions2.php:1347
+#: include/functions2.php:1360
 msgid " - "
 msgstr " - "
 
-#: include/functions2.php:1380
-#: include/functions2.php:1631
+#: include/functions2.php:1393
+#: include/functions2.php:1644
 #: classes/article.php:311
 msgid "no tags"
 msgstr "ei avainsanoja"
 
-#: include/functions2.php:1390
+#: include/functions2.php:1403
 #: classes/feeds.php:735
 msgid "Edit tags for this article"
 msgstr "Muokkaa tämän artikkelin avainsanoja"
 
-#: include/functions2.php:1422
+#: include/functions2.php:1435
 #: classes/feeds.php:682
 msgid "Originally from:"
 msgstr ""
 
-#: include/functions2.php:1435
+#: include/functions2.php:1448
 #: classes/pref/feeds.php:574
 #: classes/feeds.php:695
 msgid "Feed URL"
 msgstr "Syötteen osoite"
 
-#: include/functions2.php:1472
+#: include/functions2.php:1485
 #: classes/backend.php:105
 #: classes/dlg.php:37
 #: classes/dlg.php:60
 #: classes/dlg.php:93
 #: classes/dlg.php:159
 #: classes/dlg.php:186
-#: classes/pref/feeds.php:1654
-#: classes/pref/feeds.php:1720
+#: classes/pref/feeds.php:1658
+#: classes/pref/feeds.php:1724
 #: classes/pref/filters.php:204
 #: classes/pref/prefs.php:1105
 #: plugins/af_psql_trgm/init.php:102
 #: plugins/import_export/init.php:415
-#: plugins/import_export/init.php:460
+#: plugins/import_export/init.php:461
 #: plugins/share/init.php:121
 msgid "Close this window"
 msgstr "Sulje ikkuna"
 
-#: include/functions2.php:1669
+#: include/functions2.php:1682
 msgid "(edit note)"
 msgstr "(muokkaa muistiinpanoa)"
 
-#: include/functions2.php:1924
+#: include/functions2.php:1937
 msgid "unknown type"
 msgstr "tuntematon tyyppi"
 
-#: include/functions2.php:2001
+#: include/functions2.php:2014
 msgid "Attachments"
 msgstr "Litteet"
 
+#: include/functions2.php:2456
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: include/functions2.php:2457
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr ""
+
+#: include/functions2.php:2458
+msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
+msgstr ""
+
+#: include/functions2.php:2459
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: include/functions2.php:2460
+msgid "No file was uploaded"
+msgstr ""
+
+#: include/functions2.php:2461
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: include/functions2.php:2462
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: include/functions2.php:2463
+msgid "A PHP extension stopped the file upload."
+msgstr ""
+
 #: include/login_form.php:197
 #: classes/handler/public.php:569
 #: classes/handler/public.php:824
@@ -909,8 +945,8 @@ msgstr "Tämän syötteen avainsanat (pilkulla erotettuina)"
 #: classes/article.php:222
 #: classes/pref/labels.php:79
 #: classes/pref/users.php:98
-#: classes/pref/feeds.php:799
-#: classes/pref/feeds.php:939
+#: classes/pref/feeds.php:801
+#: classes/pref/feeds.php:943
 #: classes/pref/filters.php:485
 #: classes/pref/prefs.php:989
 #: plugins/instances/init.php:245
@@ -928,17 +964,17 @@ msgstr "Tallenna"
 #: classes/handler/public.php:580
 #: classes/pref/labels.php:81
 #: classes/pref/users.php:100
-#: classes/pref/feeds.php:800
-#: classes/pref/feeds.php:942
-#: classes/pref/feeds.php:1860
+#: classes/pref/feeds.php:802
+#: classes/pref/feeds.php:946
+#: classes/pref/feeds.php:1865
 #: classes/pref/filters.php:488
 #: classes/pref/filters.php:902
 #: classes/pref/filters.php:983
 #: classes/pref/filters.php:1076
 #: classes/pref/prefs.php:991
-#: classes/feeds.php:1098
-#: classes/feeds.php:1148
-#: classes/feeds.php:1185
+#: classes/feeds.php:1100
+#: classes/feeds.php:1150
+#: classes/feeds.php:1187
 #: plugins/instances/init.php:248
 #: plugins/instances/init.php:436
 #: plugins/note/init.php:53
@@ -994,7 +1030,6 @@ msgid "Processing category: %s"
 msgstr ""
 
 #: classes/opml.php:470
-#: plugins/import_export/init.php:428
 #, php-format
 msgid "Upload failed with error code %d"
 msgstr "Lähettäminen epäonnistui virhekoodilla %d"
@@ -1216,9 +1251,9 @@ msgstr "Luotiin tunniste <b>%s</b>"
 
 #: classes/pref/labels.php:258
 #: classes/pref/users.php:334
-#: classes/pref/feeds.php:1340
-#: classes/pref/feeds.php:1602
-#: classes/pref/feeds.php:1666
+#: classes/pref/feeds.php:1344
+#: classes/pref/feeds.php:1606
+#: classes/pref/feeds.php:1670
 #: classes/pref/filters.php:359
 #: classes/pref/filters.php:407
 #: classes/pref/filters.php:744
@@ -1231,9 +1266,9 @@ msgstr "Valitse"
 
 #: classes/pref/labels.php:261
 #: classes/pref/users.php:337
-#: classes/pref/feeds.php:1343
-#: classes/pref/feeds.php:1605
-#: classes/pref/feeds.php:1669
+#: classes/pref/feeds.php:1347
+#: classes/pref/feeds.php:1609
+#: classes/pref/feeds.php:1673
 #: classes/pref/filters.php:362
 #: classes/pref/filters.php:410
 #: classes/pref/filters.php:747
@@ -1247,9 +1282,9 @@ msgstr "Kaikki"
 
 #: classes/pref/labels.php:263
 #: classes/pref/users.php:339
-#: classes/pref/feeds.php:1345
-#: classes/pref/feeds.php:1607
-#: classes/pref/feeds.php:1671
+#: classes/pref/feeds.php:1349
+#: classes/pref/feeds.php:1611
+#: classes/pref/feeds.php:1675
 #: classes/pref/filters.php:364
 #: classes/pref/filters.php:412
 #: classes/pref/filters.php:749
@@ -1263,10 +1298,10 @@ msgstr "Ei mikään"
 
 #: classes/pref/labels.php:270
 #: classes/pref/users.php:348
-#: classes/pref/feeds.php:765
+#: classes/pref/feeds.php:767
 #: classes/pref/filters.php:478
 #: classes/pref/filters.php:766
-#: classes/feeds.php:1147
+#: classes/feeds.php:1149
 #: plugins/instances/init.php:294
 msgid "Remove"
 msgstr "Poista"
@@ -1288,7 +1323,7 @@ msgstr "Muokkaa sääntöä"
 
 #: classes/pref/users.php:56
 #: classes/pref/feeds.php:637
-#: classes/pref/feeds.php:876
+#: classes/pref/feeds.php:878
 #: classes/feeds.php:1070
 msgid "Authentication"
 msgstr "Tunnistautuminen"
@@ -1298,8 +1333,8 @@ msgid "Access level: "
 msgstr "Käyttäjäoikeudet:"
 
 #: classes/pref/users.php:77
-#: classes/pref/feeds.php:665
-#: classes/pref/feeds.php:892
+#: classes/pref/feeds.php:667
+#: classes/pref/feeds.php:896
 msgid "Options"
 msgstr "Valinnat"
 
@@ -1365,10 +1400,10 @@ msgid "[tt-rss] Password change notification"
 msgstr ""
 
 #: classes/pref/users.php:324
-#: classes/pref/feeds.php:1336
+#: classes/pref/feeds.php:1340
 #: classes/pref/filters.php:740
-#: classes/feeds.php:1118
-#: classes/feeds.php:1184
+#: classes/feeds.php:1120
+#: classes/feeds.php:1186
 #: js/tt-rss.js:174
 msgid "Search"
 msgstr "Etsi"
@@ -1385,8 +1420,8 @@ msgstr "Muokkaa"
 
 #: classes/pref/users.php:397
 #: classes/pref/feeds.php:643
-#: classes/pref/feeds.php:880
-#: classes/pref/feeds.php:1838
+#: classes/pref/feeds.php:882
+#: classes/pref/feeds.php:1842
 #: classes/feeds.php:1074
 msgid "Login"
 msgstr "Käyttäjätunnus"
@@ -1465,251 +1500,251 @@ msgid "Feed Title"
 msgstr "Syötteen otsikko"
 
 #: classes/pref/feeds.php:595
-#: classes/pref/feeds.php:828
-#: classes/pref/feeds.php:1824
+#: classes/pref/feeds.php:830
+#: classes/pref/feeds.php:1828
 #: classes/feeds.php:1050
 msgid "Place in category:"
 msgstr "Siirrä kansioon:"
 
 #: classes/pref/feeds.php:608
-#: classes/pref/feeds.php:842
+#: classes/pref/feeds.php:844
 #, fuzzy
 msgid "Language:"
 msgstr "Kieli"
 
 #: classes/pref/feeds.php:615
-#: classes/pref/feeds.php:851
+#: classes/pref/feeds.php:853
 msgid "Update"
 msgstr "Päivitä"
 
 #: classes/pref/feeds.php:630
-#: classes/pref/feeds.php:867
+#: classes/pref/feeds.php:869
 msgid "Article purging:"
 msgstr "Artikkeleiden siivous"
 
-#: classes/pref/feeds.php:656
-#: classes/pref/feeds.php:886
-#: classes/pref/feeds.php:1841
+#: classes/pref/feeds.php:658
+#: classes/pref/feeds.php:890
+#: classes/pref/feeds.php:1845
 #: classes/pref/prefs.php:245
-#: classes/feeds.php:1077
+#: classes/feeds.php:1078
 msgid "Password"
 msgstr "Salasana"
 
-#: classes/pref/feeds.php:660
+#: classes/pref/feeds.php:662
 msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
 msgstr "<b>Vinkki:</b> sinun on annettava kirjautumistiedot jos syöte vaatii kirjautumisen, paitsi Twitter-syötteet."
 
-#: classes/pref/feeds.php:679
-#: classes/pref/feeds.php:896
+#: classes/pref/feeds.php:681
+#: classes/pref/feeds.php:900
 msgid "Hide from Popular feeds"
 msgstr "Piilota suosituista syötteistä"
 
-#: classes/pref/feeds.php:691
-#: classes/pref/feeds.php:902
+#: classes/pref/feeds.php:693
+#: classes/pref/feeds.php:906
 msgid "Include in e-mail digest"
 msgstr "Sisällytä sähköpostitiivistelmään"
 
-#: classes/pref/feeds.php:704
-#: classes/pref/feeds.php:908
+#: classes/pref/feeds.php:706
+#: classes/pref/feeds.php:912
 msgid "Always display image attachments"
 msgstr "Näytä aina liitetyt kuvat"
 
-#: classes/pref/feeds.php:717
-#: classes/pref/feeds.php:916
+#: classes/pref/feeds.php:719
+#: classes/pref/feeds.php:920
 msgid "Do not embed images"
 msgstr "Älä näytä kuvia"
 
-#: classes/pref/feeds.php:730
-#: classes/pref/feeds.php:924
+#: classes/pref/feeds.php:732
+#: classes/pref/feeds.php:928
 msgid "Cache images locally"
 msgstr "Tallenna kuvat välimuistiin"
 
-#: classes/pref/feeds.php:742
-#: classes/pref/feeds.php:930
+#: classes/pref/feeds.php:744
+#: classes/pref/feeds.php:934
 msgid "Mark updated articles as unread"
 msgstr "Merkitse päivitetyt artikkelit lukemattomiksi"
 
-#: classes/pref/feeds.php:746
+#: classes/pref/feeds.php:748
 msgid "Icon"
 msgstr "Suosikkikuvake"
 
-#: classes/pref/feeds.php:763
+#: classes/pref/feeds.php:765
 msgid "Replace"
 msgstr "Vaihda"
 
-#: classes/pref/feeds.php:770
+#: classes/pref/feeds.php:772
 #: classes/pref/prefs.php:706
 msgid "Plugins"
 msgstr "Lisäosat"
 
-#: classes/pref/feeds.php:790
+#: classes/pref/feeds.php:792
 msgid "Resubscribe to push updates"
 msgstr ""
 
-#: classes/pref/feeds.php:797
+#: classes/pref/feeds.php:799
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr ""
 
-#: classes/pref/feeds.php:1203
-#: classes/pref/feeds.php:1256
+#: classes/pref/feeds.php:1207
+#: classes/pref/feeds.php:1260
 msgid "All done."
 msgstr "Valmis."
 
-#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1315
 msgid "Feeds with errors"
 msgstr "Virheelliset syötteet"
 
-#: classes/pref/feeds.php:1318
+#: classes/pref/feeds.php:1322
 msgid "Inactive feeds"
 msgstr "Passiiviset syötteet"
 
-#: classes/pref/feeds.php:1354
+#: classes/pref/feeds.php:1358
 msgid "Edit selected feeds"
 msgstr "Muokkaa valittuja syötteitä"
 
-#: classes/pref/feeds.php:1356
-#: classes/pref/feeds.php:1370
+#: classes/pref/feeds.php:1360
+#: classes/pref/feeds.php:1374
 #: classes/pref/filters.php:762
 msgid "Reset sort order"
 msgstr "Järjestä oletuksen mukaisesti"
 
-#: classes/pref/feeds.php:1358
+#: classes/pref/feeds.php:1362
 #: js/prefs.js:1737
 msgid "Batch subscribe"
 msgstr "Tilaa useita"
 
-#: classes/pref/feeds.php:1365
+#: classes/pref/feeds.php:1369
 msgid "Categories"
 msgstr "Kansiot"
 
-#: classes/pref/feeds.php:1368
+#: classes/pref/feeds.php:1372
 msgid "Add category"
 msgstr "Lisää kansio"
 
-#: classes/pref/feeds.php:1372
+#: classes/pref/feeds.php:1376
 msgid "Remove selected"
 msgstr "Poista valittu"
 
-#: classes/pref/feeds.php:1383
+#: classes/pref/feeds.php:1387
 msgid "More actions..."
 msgstr "Lisää toimintoja..."
 
-#: classes/pref/feeds.php:1387
+#: classes/pref/feeds.php:1391
 msgid "Manual purge"
 msgstr "Manuaalinen siivous"
 
-#: classes/pref/feeds.php:1391
+#: classes/pref/feeds.php:1395
 msgid "Clear feed data"
 msgstr "Tyhjennnä syötetiedot"
 
-#: classes/pref/feeds.php:1392
+#: classes/pref/feeds.php:1396
 #: classes/pref/filters.php:770
 msgid "Rescore articles"
 msgstr "Uudelleenpisteytä artikkelit"
 
-#: classes/pref/feeds.php:1444
+#: classes/pref/feeds.php:1448
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1446
+#: classes/pref/feeds.php:1450
 msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
 msgstr "OPML:ää käyttäen voit viedä ja tuoda syötteitä, suodattimia, tunnisteita ja Tiny Tiny RSS:n asetuksia."
 
-#: classes/pref/feeds.php:1447
+#: classes/pref/feeds.php:1451
 msgid "Only main settings profile can be migrated using OPML."
 msgstr "Vain pääasetusprofiili voidaan siirtää OPML:ää käyttäen."
 
-#: classes/pref/feeds.php:1460
+#: classes/pref/feeds.php:1464
 msgid "Import my OPML"
 msgstr "Tuo OPML"
 
-#: classes/pref/feeds.php:1466
+#: classes/pref/feeds.php:1470
 msgid "Filename:"
 msgstr "Tiedosto:"
 
-#: classes/pref/feeds.php:1468
+#: classes/pref/feeds.php:1472
 msgid "Include settings"
 msgstr "Sisältäen asetukset"
 
-#: classes/pref/feeds.php:1472
+#: classes/pref/feeds.php:1476
 msgid "Export OPML"
 msgstr "Vie OMPL"
 
-#: classes/pref/feeds.php:1476
+#: classes/pref/feeds.php:1480
 msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
 msgstr "OPML:si voidaan julkaista ja kuka vain voi tilata ne käyttäen alla olevaa osoitetta."
 
-#: classes/pref/feeds.php:1480
+#: classes/pref/feeds.php:1484
 msgid "Public OPML URL"
 msgstr "Julkinen OPML URL"
 
-#: classes/pref/feeds.php:1481
+#: classes/pref/feeds.php:1485
 msgid "Display published OPML URL"
 msgstr "Näytä julkaistu OPML URL"
 
-#: classes/pref/feeds.php:1490
+#: classes/pref/feeds.php:1494
 msgid "Firefox integration"
 msgstr "Firefox-integraatio"
 
-#: classes/pref/feeds.php:1492
+#: classes/pref/feeds.php:1496
 msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
 msgstr "Tiny Tiny RSS -sivustoa voidaan käyttää Firefoxin syötelukijana klikkaamalla alla olevaa linkkiä"
 
-#: classes/pref/feeds.php:1499
+#: classes/pref/feeds.php:1503
 msgid "Click here to register this site as a feed reader."
 msgstr "Klikkaa tästä rekisteröidäksesi tämän sivuston syötelukijaksi."
 
-#: classes/pref/feeds.php:1507
+#: classes/pref/feeds.php:1511
 msgid "Published & shared articles / Generated feeds"
 msgstr "Julkaistut ja jaetut artikkelit / Luodut syötteet"
 
-#: classes/pref/feeds.php:1509
+#: classes/pref/feeds.php:1513
 msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
 msgstr "Julkistetut artikkelit näkyvät julkisena RSS-syötteenä ja niitä voi lukea ja tilata jokainen, joka tietää alla annetun osoitteen"
 
-#: classes/pref/feeds.php:1516
+#: classes/pref/feeds.php:1520
 #: classes/feeds.php:54
 #: classes/feeds.php:134
 msgid "View as RSS"
 msgstr "Näytä RSS-syötteenä"
 
-#: classes/pref/feeds.php:1517
+#: classes/pref/feeds.php:1521
 msgid "Display URL"
 msgstr "Näytä osoite"
 
-#: classes/pref/feeds.php:1520
+#: classes/pref/feeds.php:1524
 msgid "Clear all generated URLs"
 msgstr "Poista kaikki luodut osoitteet"
 
-#: classes/pref/feeds.php:1598
+#: classes/pref/feeds.php:1602
 msgid "These feeds have not been updated with new content for 3 months (oldest first):"
 msgstr "Näihin syötteisiin ei ole tullut uusia artikkeleita 3 kuukauteen (vanhimmat ensin):"
 
-#: classes/pref/feeds.php:1632
-#: classes/pref/feeds.php:1696
+#: classes/pref/feeds.php:1636
+#: classes/pref/feeds.php:1700
 msgid "Click to edit feed"
 msgstr "Napsauta muokataksesi syötettä"
 
-#: classes/pref/feeds.php:1650
-#: classes/pref/feeds.php:1716
+#: classes/pref/feeds.php:1654
+#: classes/pref/feeds.php:1720
 msgid "Unsubscribe from selected feeds"
 msgstr "Lopeta valittujen syötteiden tilaukset"
 
-#: classes/pref/feeds.php:1821
+#: classes/pref/feeds.php:1825
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr "Lisää RSS-syötteitä riveittäin (syötteitä ei yritetä tunnistaa)"
 
-#: classes/pref/feeds.php:1830
+#: classes/pref/feeds.php:1834
 msgid "Feeds to subscribe, One per line"
 msgstr "Tilattavat syötteet, yksi syöte riviä kohden"
 
-#: classes/pref/feeds.php:1852
+#: classes/pref/feeds.php:1857
 msgid "Feeds require authentication."
 msgstr "Syötteet vaativat kirjautumisen."
 
-#: classes/pref/feeds.php:1859
-#: classes/feeds.php:1092
-#: classes/feeds.php:1146
+#: classes/pref/feeds.php:1864
+#: classes/feeds.php:1094
+#: classes/feeds.php:1148
 msgid "Subscribe"
 msgstr "Tilaa"
 
@@ -1792,7 +1827,7 @@ msgid "on field"
 msgstr "kentässä"
 
 #: classes/pref/filters.php:962
-#: js/PrefFilterTree.js:61
+#: js/PrefFilterTree.js:64
 msgid "in"
 msgstr "kansiossa"
 
@@ -2391,40 +2426,40 @@ msgstr "Syötteen/sivuston osoite"
 msgid "Available feeds"
 msgstr "Saatavilla olevat syötteet"
 
-#: classes/feeds.php:1087
+#: classes/feeds.php:1089
 msgid "This feed requires authentication."
 msgstr "Tämä syöte vaatii kirjautumisen"
 
-#: classes/feeds.php:1095
+#: classes/feeds.php:1097
 msgid "More feeds"
 msgstr "Lisää syötteitä"
 
-#: classes/feeds.php:1122
+#: classes/feeds.php:1124
 msgid "Popular feeds"
 msgstr "Suositut syötteet"
 
-#: classes/feeds.php:1123
+#: classes/feeds.php:1125
 msgid "Feed archive"
 msgstr "Syötearkisto"
 
-#: classes/feeds.php:1126
+#: classes/feeds.php:1128
 msgid "limit:"
 msgstr "raja:"
 
-#: classes/feeds.php:1158
+#: classes/feeds.php:1160
 msgid "Look for"
 msgstr "Etsi"
 
-#: classes/feeds.php:1166
+#: classes/feeds.php:1168
 #, php-format
 msgid "in %s"
 msgstr ""
 
-#: classes/feeds.php:1171
+#: classes/feeds.php:1173
 msgid "Used for word stemming"
 msgstr ""
 
-#: classes/feeds.php:1180
+#: classes/feeds.php:1182
 msgid "Search syntax"
 msgstr "Haun syntaksi"
 
@@ -2686,6 +2721,11 @@ msgstr "XML-dokumentin lataus epäonnistui."
 msgid "Prepare data"
 msgstr ""
 
+#: plugins/import_export/init.php:428
+#, fuzzy, php-format
+msgid "Upload failed with error code %d (%s)"
+msgstr "Lähettäminen epäonnistui virhekoodilla %d"
+
 #: plugins/import_export/init.php:454
 msgid "No file uploaded."
 msgstr ""
@@ -2795,7 +2835,7 @@ msgstr "Muokkaa kansiota"
 msgid "Remove category"
 msgstr "Poista kansio"
 
-#: js/PrefFilterTree.js:64
+#: js/PrefFilterTree.js:67
 msgid "Inverse"
 msgstr "Käänteiset valinnat"
 
@@ -2847,7 +2887,7 @@ msgid "Subscription reset."
 msgstr ""
 
 #: js/functions.js:1311
-#: js/tt-rss.js:682
+#: js/tt-rss.js:705
 #, perl-format
 msgid "Unsubscribe from %s?"
 msgstr "Perutaanko syötteen %s tilaus?"
@@ -3077,40 +3117,40 @@ msgstr "Merkitäänkö kaikki artikkelit luetuksi?"
 msgid "Marking all feeds as read..."
 msgstr "Merkitään kaikki syötteet luetuiksi..."
 
-#: js/tt-rss.js:383
+#: js/tt-rss.js:404
 msgid "Please enable mail plugin first."
 msgstr "Aktivoi ensin email-lisäosa."
 
-#: js/tt-rss.js:431
+#: js/tt-rss.js:452
 #: js/functions.js:1643
-#: js/tt-rss.js:663
+#: js/tt-rss.js:686
 msgid "You can't edit this kind of feed."
 msgstr "Et voi muokata tämäntyyppistä syötettä."
 
-#: js/tt-rss.js:502
+#: js/tt-rss.js:533
 msgid "Please enable embed_original plugin first."
 msgstr ""
 
-#: js/tt-rss.js:515
-#: js/tt-rss.js:713
+#: js/tt-rss.js:546
+#: js/tt-rss.js:736
 msgid "Widescreen is not available in combined mode."
 msgstr "Leveä näyttö ei käytössä yhdistelmätilassa."
 
-#: js/tt-rss.js:827
+#: js/tt-rss.js:850
 msgid "You can't rescore this kind of feed."
 msgstr ""
 
-#: js/tt-rss.js:832
-#: js/tt-rss.js:676
+#: js/tt-rss.js:855
+#: js/tt-rss.js:699
 msgid "Please select some feed first."
 msgstr "Valitse syötteet ensin."
 
-#: js/tt-rss.js:837
+#: js/tt-rss.js:860
 #, perl-format
 msgid "Rescore articles in %s?"
 msgstr "Uudelleenpisteytä artikkelit kansiossa %s?"
 
-#: js/tt-rss.js:840
+#: js/tt-rss.js:863
 msgid "Rescoring articles..."
 msgstr "Uudelleenpisteytetään artikkelit..."
 
@@ -3285,7 +3325,7 @@ msgstr "Viestisi lähetettiin."
 msgid "Sorry, your browser does not support sandboxed iframes."
 msgstr ""
 
-#: plugins/shorten_expanded/init.js:37
+#: plugins/shorten_expanded/init.js:39
 msgid "Click to expand article"
 msgstr "Napsauta nähdäksesi koko artikkelin."
 
@@ -3534,7 +3574,7 @@ msgstr "Luodut osoitteet poistettiin."
 msgid "Label Editor"
 msgstr "Tunnisteiden muokkaus"
 
-#: js/tt-rss.js:671
+#: js/tt-rss.js:694
 msgid "You can't unsubscribe from the category."
 msgstr "Et voi perua tämän kansion tilausta."
 
diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index 2c1794ef2..0ab339979 100644
Binary files a/locale/fr_FR/LC_MESSAGES/messages.mo and b/locale/fr_FR/LC_MESSAGES/messages.mo differ
diff --git a/locale/fr_FR/LC_MESSAGES/messages.po b/locale/fr_FR/LC_MESSAGES/messages.po
index c0e256dac..eb47906d2 100644
--- a/locale/fr_FR/LC_MESSAGES/messages.po
+++ b/locale/fr_FR/LC_MESSAGES/messages.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tiny Tiny RSS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 22:58+0300\n"
+"POT-Creation-Date: 2016-08-19 18:16+0300\n"
 "PO-Revision-Date: 2015-11-30 09:29+0100\n"
 "Last-Translator: Raphael Rochet <raphael@rri.fr>\n"
 "Language-Team: French\n"
@@ -165,13 +165,13 @@ msgstr "Méthode non trouvée"
 msgid "Plugin not found"
 msgstr "Plugin non trouvé"
 
-#: index.php:133
-#: index.php:149
-#: index.php:267
-#: prefs.php:102
+#: index.php:148
+#: index.php:164
+#: index.php:282
+#: prefs.php:117
 #: classes/backend.php:5
 #: classes/pref/labels.php:282
-#: classes/pref/feeds.php:1405
+#: classes/pref/feeds.php:1409
 #: classes/pref/filters.php:779
 #: js/feedlist.js:159
 #: js/functions.js:1293
@@ -183,7 +183,7 @@ msgstr "Plugin non trouvé"
 #: js/prefs.js:1781
 #: js/prefs.js:1799
 #: js/tt-rss.js:55
-#: js/tt-rss.js:522
+#: js/tt-rss.js:553
 #: js/viewfeed.js:1298
 #: plugins/import_export/import_export.js:17
 #: js/feedlist.js:484
@@ -196,75 +196,75 @@ msgstr "Plugin non trouvé"
 #: js/prefs.js:1556
 #: js/prefs.js:1572
 #: js/prefs.js:1592
-#: js/tt-rss.js:539
+#: js/tt-rss.js:570
 #: js/viewfeed.js:830
 msgid "Loading, please wait..."
 msgstr "Chargement en cours, veuillez patienter..."
 
-#: index.php:167
+#: index.php:182
 msgid "Collapse feedlist"
 msgstr "Contracter la liste des flux"
 
-#: index.php:170
+#: index.php:185
 msgid "Show articles"
 msgstr "Afficher les articles"
 
-#: index.php:173
+#: index.php:188
 msgid "Adaptive"
 msgstr "Adaptatif"
 
-#: index.php:174
+#: index.php:189
 msgid "All Articles"
 msgstr "Tous les articles"
 
-#: index.php:175
-#: include/functions2.php:101
+#: index.php:190
+#: include/functions2.php:102
 #: classes/feeds.php:104
 msgid "Starred"
 msgstr "Remarquables"
 
-#: index.php:176
-#: include/functions2.php:102
+#: index.php:191
+#: include/functions2.php:103
 #: classes/feeds.php:105
 msgid "Published"
 msgstr "Publiés"
 
-#: index.php:177
+#: index.php:192
 #: classes/feeds.php:91
 #: classes/feeds.php:103
 msgid "Unread"
 msgstr "Non lus"
 
-#: index.php:178
+#: index.php:193
 msgid "With Note"
 msgstr "Avec annotation"
 
-#: index.php:179
+#: index.php:194
 msgid "Ignore Scoring"
 msgstr "Ignorer le score"
 
-#: index.php:182
+#: index.php:197
 msgid "Sort articles"
 msgstr "Classer les articles"
 
-#: index.php:185
+#: index.php:200
 msgid "Default"
 msgstr "Utiliser la valeur par défaut"
 
-#: index.php:186
+#: index.php:201
 msgid "Newest first"
 msgstr "Les plus récents en premier"
 
-#: index.php:187
+#: index.php:202
 msgid "Oldest first"
 msgstr "Les plus anciens en premier"
 
-#: index.php:188
+#: index.php:203
 msgid "Title"
 msgstr "Titre"
 
-#: index.php:192
-#: index.php:233
+#: index.php:207
+#: index.php:248
 #: include/functions2.php:90
 #: classes/feeds.php:109
 #: js/FeedTree.js:132
@@ -272,134 +272,134 @@ msgstr "Titre"
 msgid "Mark as read"
 msgstr "Marquer comme lu"
 
-#: index.php:195
+#: index.php:210
 msgid "Older than one day"
 msgstr "Âgé d'au moins un jour"
 
-#: index.php:198
+#: index.php:213
 msgid "Older than one week"
 msgstr "Âgé d'au moins une semaine"
 
-#: index.php:201
+#: index.php:216
 msgid "Older than two weeks"
 msgstr "Âgé d'au moins deux semaines"
 
-#: index.php:217
+#: index.php:232
 msgid "Communication problem with server."
 msgstr "Un problème de communication avec le serveur est survenu."
 
-#: index.php:223
+#: index.php:238
 msgid "Actions..."
 msgstr "Actions..."
 
-#: index.php:225
+#: index.php:240
 msgid "Preferences..."
 msgstr "Configuration..."
 
-#: index.php:226
+#: index.php:241
 msgid "Search..."
 msgstr "Rechercher..."
 
-#: index.php:227
+#: index.php:242
 msgid "Feed actions:"
 msgstr "Actions sur ce flux :"
 
-#: index.php:228
+#: index.php:243
 #: classes/handler/public.php:672
 msgid "Subscribe to feed..."
 msgstr "S'abonner au flux..."
 
-#: index.php:229
+#: index.php:244
 msgid "Edit this feed..."
 msgstr "Modifier ce flux..."
 
-#: index.php:230
+#: index.php:245
 msgid "Rescore feed"
 msgstr "Recalculer le score du flux"
 
-#: index.php:231
-#: classes/pref/feeds.php:783
-#: classes/pref/feeds.php:1360
+#: index.php:246
+#: classes/pref/feeds.php:785
+#: classes/pref/feeds.php:1364
 #: js/PrefFeedTree.js:74
 msgid "Unsubscribe"
 msgstr "Se désabonner"
 
-#: index.php:232
+#: index.php:247
 msgid "All feeds:"
 msgstr "Tous les flux :"
 
-#: index.php:234
+#: index.php:249
 msgid "(Un)hide read feeds"
 msgstr "Masquer/afficher les flux lus"
 
-#: index.php:235
+#: index.php:250
 msgid "Other actions:"
 msgstr "Autres actions :"
 
-#: index.php:236
+#: index.php:251
 #: include/functions2.php:76
 msgid "Toggle widescreen mode"
 msgstr "Basculer le mode écran large"
 
-#: index.php:237
+#: index.php:252
 msgid "Create label..."
 msgstr "Créer une étiquette..."
 
-#: index.php:238
+#: index.php:253
 msgid "Create filter..."
 msgstr "Créer un filtre..."
 
-#: index.php:239
+#: index.php:254
 msgid "Keyboard shortcuts help"
 msgstr "Aide sur les raccourcis clavier"
 
-#: index.php:248
+#: index.php:263
 msgid "Logout"
 msgstr "Déconnexion"
 
-#: index.php:254
+#: index.php:269
 msgid "Updates are available from Git."
 msgstr "Des mises à jour sont disponible via Git"
 
 #: prefs.php:33
-#: prefs.php:120
-#: include/functions2.php:104
+#: prefs.php:135
+#: include/functions2.php:105
 #: classes/pref/prefs.php:435
 msgid "Preferences"
 msgstr "Configuration"
 
-#: prefs.php:111
+#: prefs.php:126
 msgid "Keyboard shortcuts"
 msgstr "Raccourcis clavier"
 
-#: prefs.php:112
+#: prefs.php:127
 msgid "Exit preferences"
 msgstr "Quitter la configuration"
 
-#: prefs.php:123
+#: prefs.php:138
 #: classes/pref/feeds.php:112
-#: classes/pref/feeds.php:1300
-#: classes/pref/feeds.php:1349
+#: classes/pref/feeds.php:1304
+#: classes/pref/feeds.php:1353
 msgid "Feeds"
 msgstr "Flux"
 
-#: prefs.php:126
+#: prefs.php:141
 #: classes/pref/filters.php:248
 msgid "Filters"
 msgstr "Filtres"
 
-#: prefs.php:129
-#: include/functions.php:1256
-#: include/functions.php:1909
+#: prefs.php:144
+#: include/functions.php:1287
+#: include/functions.php:1940
 #: classes/pref/labels.php:90
 msgid "Labels"
 msgstr "Etiquettes"
 
-#: prefs.php:133
+#: prefs.php:148
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: prefs.php:136
+#: prefs.php:151
 msgid "System"
 msgstr "Système"
 
@@ -481,10 +481,10 @@ msgid "Tiny Tiny RSS data update script."
 msgstr "Script de mise à jour des données de Tiny Tiny RSS."
 
 #: include/digest.php:109
-#: include/functions.php:1265
-#: include/functions.php:1810
-#: include/functions.php:1895
-#: include/functions.php:1917
+#: include/functions.php:1296
+#: include/functions.php:1841
+#: include/functions.php:1926
+#: include/functions.php:1948
 #: classes/opml.php:421
 #: classes/pref/feeds.php:228
 msgid "Uncategorized"
@@ -501,44 +501,44 @@ msgstr[1] "%d articles archivés"
 msgid "No feeds found."
 msgstr "Aucun flux trouvé."
 
-#: include/functions.php:958
+#: include/functions.php:989
 #, php-format
 msgid "%d min"
 msgstr "%d min"
 
-#: include/functions.php:1254
-#: include/functions.php:1907
+#: include/functions.php:1285
+#: include/functions.php:1938
 msgid "Special"
 msgstr "Spécial"
 
-#: include/functions.php:1758
+#: include/functions.php:1789
 #: classes/pref/filters.php:229
 #: classes/pref/filters.php:507
 msgid "All feeds"
 msgstr "Tous les flux"
 
-#: include/functions.php:1962
+#: include/functions.php:1993
 msgid "Starred articles"
 msgstr "Articles remarquables"
 
-#: include/functions.php:1964
+#: include/functions.php:1995
 msgid "Published articles"
 msgstr "Articles publiés"
 
-#: include/functions.php:1966
+#: include/functions.php:1997
 msgid "Fresh articles"
 msgstr "Nouveaux articles"
 
-#: include/functions.php:1968
-#: include/functions2.php:99
+#: include/functions.php:1999
+#: include/functions2.php:100
 msgid "All articles"
 msgstr "Tous les articles"
 
-#: include/functions.php:1970
+#: include/functions.php:2001
 msgid "Archived articles"
 msgstr "Articles archivés"
 
-#: include/functions.php:1972
+#: include/functions.php:2003
 msgid "Recently read"
 msgstr "Lus récemment"
 
@@ -678,7 +678,7 @@ msgstr "Tout désélectionner"
 
 #: include/functions2.php:85
 #: classes/pref/feeds.php:555
-#: classes/pref/feeds.php:821
+#: classes/pref/feeds.php:823
 msgid "Feed"
 msgstr "Flux"
 
@@ -691,7 +691,7 @@ msgid "Un/hide read feeds"
 msgstr "Masquer/afficher les flux lus"
 
 #: include/functions2.php:88
-#: classes/pref/feeds.php:1352
+#: classes/pref/feeds.php:1356
 msgid "Subscribe to feed"
 msgstr "S'abonner au flux"
 
@@ -707,139 +707,176 @@ msgid "Reverse headlines"
 msgstr "Inverser l'ordre des en-têtes"
 
 #: include/functions2.php:92
+msgid "Toggle headline grouping"
+msgstr ""
+
+#: include/functions2.php:93
 msgid "Debug feed update"
 msgstr "Déboguer les mises à jour"
 
-#: include/functions2.php:93
+#: include/functions2.php:94
 msgid "Debug viewfeed()"
 msgstr "Déboguer viewfeed()"
 
-#: include/functions2.php:94
+#: include/functions2.php:95
 #: js/FeedTree.js:182
 msgid "Mark all feeds as read"
 msgstr "Marquer tous les flux comme lus"
 
-#: include/functions2.php:95
+#: include/functions2.php:96
 msgid "Un/collapse current category"
 msgstr "Étendre/contracter la catégorie"
 
-#: include/functions2.php:96
+#: include/functions2.php:97
 msgid "Toggle combined mode"
 msgstr "Basculer le mode combiné"
 
-#: include/functions2.php:97
+#: include/functions2.php:98
 msgid "Toggle auto expand in combined mode"
 msgstr "Basculer le développement automatique en mode combiné"
 
-#: include/functions2.php:98
+#: include/functions2.php:99
 msgid "Go to"
 msgstr "Aller à"
 
-#: include/functions2.php:100
+#: include/functions2.php:101
 msgid "Fresh"
 msgstr "Nouveaux"
 
-#: include/functions2.php:103
-#: js/tt-rss.js:466
-#: js/tt-rss.js:650
+#: include/functions2.php:104
+#: js/tt-rss.js:497
+#: js/tt-rss.js:673
 msgid "Tag cloud"
 msgstr "Nuage de tags"
 
-#: include/functions2.php:105
+#: include/functions2.php:106
 msgid "Other"
 msgstr "Autre"
 
-#: include/functions2.php:106
+#: include/functions2.php:107
 #: classes/pref/labels.php:267
 msgid "Create label"
 msgstr "Créer une étiquette"
 
-#: include/functions2.php:107
+#: include/functions2.php:108
 #: classes/pref/filters.php:753
 msgid "Create filter"
 msgstr "Créer un filtre"
 
-#: include/functions2.php:108
+#: include/functions2.php:109
 msgid "Un/collapse sidebar"
 msgstr "Ouvrir/fermer la barre latérale"
 
-#: include/functions2.php:109
+#: include/functions2.php:110
 msgid "Show help dialog"
 msgstr "Afficher la fenêtre d'aide"
 
-#: include/functions2.php:663
+#: include/functions2.php:665
 #, php-format
 msgid "Search results: %s"
 msgstr "Résultats de recherche : %s"
 
-#: include/functions2.php:1317
+#: include/functions2.php:1330
 #: classes/feeds.php:749
 msgid "comment"
 msgid_plural "comments"
 msgstr[0] "Commentaire"
 msgstr[1] "Commentaires"
 
-#: include/functions2.php:1321
+#: include/functions2.php:1334
 #: classes/feeds.php:753
 msgid "comments"
 msgstr "Commentaires"
 
-#: include/functions2.php:1347
+#: include/functions2.php:1360
 msgid " - "
 msgstr " - "
 
-#: include/functions2.php:1380
-#: include/functions2.php:1631
+#: include/functions2.php:1393
+#: include/functions2.php:1644
 #: classes/article.php:311
 msgid "no tags"
 msgstr "aucun tag"
 
-#: include/functions2.php:1390
+#: include/functions2.php:1403
 #: classes/feeds.php:735
 msgid "Edit tags for this article"
 msgstr "Modifier les tags pour cet article"
 
-#: include/functions2.php:1422
+#: include/functions2.php:1435
 #: classes/feeds.php:682
 msgid "Originally from:"
 msgstr "Origine :"
 
-#: include/functions2.php:1435
+#: include/functions2.php:1448
 #: classes/pref/feeds.php:574
 #: classes/feeds.php:695
 msgid "Feed URL"
 msgstr "URL du flux"
 
-#: include/functions2.php:1472
+#: include/functions2.php:1485
 #: classes/backend.php:105
 #: classes/dlg.php:37
 #: classes/dlg.php:60
 #: classes/dlg.php:93
 #: classes/dlg.php:159
 #: classes/dlg.php:186
-#: classes/pref/feeds.php:1654
-#: classes/pref/feeds.php:1720
+#: classes/pref/feeds.php:1658
+#: classes/pref/feeds.php:1724
 #: classes/pref/filters.php:204
 #: classes/pref/prefs.php:1105
 #: plugins/af_psql_trgm/init.php:102
 #: plugins/import_export/init.php:415
-#: plugins/import_export/init.php:460
+#: plugins/import_export/init.php:461
 #: plugins/share/init.php:121
 msgid "Close this window"
 msgstr "Fermer cette fenêtre"
 
-#: include/functions2.php:1669
+#: include/functions2.php:1682
 msgid "(edit note)"
 msgstr "(modifier l'annotation)"
 
-#: include/functions2.php:1924
+#: include/functions2.php:1937
 msgid "unknown type"
 msgstr "type inconnu"
 
-#: include/functions2.php:2001
+#: include/functions2.php:2014
 msgid "Attachments"
 msgstr "Fichier attaché"
 
+#: include/functions2.php:2456
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: include/functions2.php:2457
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr ""
+
+#: include/functions2.php:2458
+msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
+msgstr ""
+
+#: include/functions2.php:2459
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: include/functions2.php:2460
+#, fuzzy
+msgid "No file was uploaded"
+msgstr "Aucun fichier envoyé."
+
+#: include/functions2.php:2461
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: include/functions2.php:2462
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: include/functions2.php:2463
+msgid "A PHP extension stopped the file upload."
+msgstr ""
+
 #: include/login_form.php:197
 #: classes/handler/public.php:569
 #: classes/handler/public.php:824
@@ -906,8 +943,8 @@ msgstr "Tags pour cet article (séparés par des virgules) :"
 #: classes/article.php:222
 #: classes/pref/labels.php:79
 #: classes/pref/users.php:98
-#: classes/pref/feeds.php:799
-#: classes/pref/feeds.php:939
+#: classes/pref/feeds.php:801
+#: classes/pref/feeds.php:943
 #: classes/pref/filters.php:485
 #: classes/pref/prefs.php:989
 #: plugins/instances/init.php:245
@@ -925,17 +962,17 @@ msgstr "Enregistrer"
 #: classes/handler/public.php:580
 #: classes/pref/labels.php:81
 #: classes/pref/users.php:100
-#: classes/pref/feeds.php:800
-#: classes/pref/feeds.php:942
-#: classes/pref/feeds.php:1860
+#: classes/pref/feeds.php:802
+#: classes/pref/feeds.php:946
+#: classes/pref/feeds.php:1865
 #: classes/pref/filters.php:488
 #: classes/pref/filters.php:902
 #: classes/pref/filters.php:983
 #: classes/pref/filters.php:1076
 #: classes/pref/prefs.php:991
-#: classes/feeds.php:1098
-#: classes/feeds.php:1148
-#: classes/feeds.php:1185
+#: classes/feeds.php:1100
+#: classes/feeds.php:1150
+#: classes/feeds.php:1187
 #: plugins/instances/init.php:248
 #: plugins/instances/init.php:436
 #: plugins/note/init.php:53
@@ -991,7 +1028,6 @@ msgid "Processing category: %s"
 msgstr "Placer dans la catégorie : %s"
 
 #: classes/opml.php:470
-#: plugins/import_export/init.php:428
 #, php-format
 msgid "Upload failed with error code %d"
 msgstr "Échec de l'envoi, code d'erreur %d"
@@ -1209,9 +1245,9 @@ msgstr "Étiquette <b>%s</b> créé"
 
 #: classes/pref/labels.php:258
 #: classes/pref/users.php:334
-#: classes/pref/feeds.php:1340
-#: classes/pref/feeds.php:1602
-#: classes/pref/feeds.php:1666
+#: classes/pref/feeds.php:1344
+#: classes/pref/feeds.php:1606
+#: classes/pref/feeds.php:1670
 #: classes/pref/filters.php:359
 #: classes/pref/filters.php:407
 #: classes/pref/filters.php:744
@@ -1224,9 +1260,9 @@ msgstr "Sélectionner"
 
 #: classes/pref/labels.php:261
 #: classes/pref/users.php:337
-#: classes/pref/feeds.php:1343
-#: classes/pref/feeds.php:1605
-#: classes/pref/feeds.php:1669
+#: classes/pref/feeds.php:1347
+#: classes/pref/feeds.php:1609
+#: classes/pref/feeds.php:1673
 #: classes/pref/filters.php:362
 #: classes/pref/filters.php:410
 #: classes/pref/filters.php:747
@@ -1240,9 +1276,9 @@ msgstr "Tout"
 
 #: classes/pref/labels.php:263
 #: classes/pref/users.php:339
-#: classes/pref/feeds.php:1345
-#: classes/pref/feeds.php:1607
-#: classes/pref/feeds.php:1671
+#: classes/pref/feeds.php:1349
+#: classes/pref/feeds.php:1611
+#: classes/pref/feeds.php:1675
 #: classes/pref/filters.php:364
 #: classes/pref/filters.php:412
 #: classes/pref/filters.php:749
@@ -1256,10 +1292,10 @@ msgstr "Aucun"
 
 #: classes/pref/labels.php:270
 #: classes/pref/users.php:348
-#: classes/pref/feeds.php:765
+#: classes/pref/feeds.php:767
 #: classes/pref/filters.php:478
 #: classes/pref/filters.php:766
-#: classes/feeds.php:1147
+#: classes/feeds.php:1149
 #: plugins/instances/init.php:294
 msgid "Remove"
 msgstr "Supprimer"
@@ -1280,7 +1316,7 @@ msgstr "Modifier Utilisateur"
 
 #: classes/pref/users.php:56
 #: classes/pref/feeds.php:637
-#: classes/pref/feeds.php:876
+#: classes/pref/feeds.php:878
 #: classes/feeds.php:1070
 msgid "Authentication"
 msgstr "Identification"
@@ -1290,8 +1326,8 @@ msgid "Access level: "
 msgstr "Permissions : "
 
 #: classes/pref/users.php:77
-#: classes/pref/feeds.php:665
-#: classes/pref/feeds.php:892
+#: classes/pref/feeds.php:667
+#: classes/pref/feeds.php:896
 msgid "Options"
 msgstr "Options"
 
@@ -1356,10 +1392,10 @@ msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] Notification de changement de mot de passe"
 
 #: classes/pref/users.php:324
-#: classes/pref/feeds.php:1336
+#: classes/pref/feeds.php:1340
 #: classes/pref/filters.php:740
-#: classes/feeds.php:1118
-#: classes/feeds.php:1184
+#: classes/feeds.php:1120
+#: classes/feeds.php:1186
 #: js/tt-rss.js:174
 msgid "Search"
 msgstr "Rechercher"
@@ -1376,8 +1412,8 @@ msgstr "Modifier"
 
 #: classes/pref/users.php:397
 #: classes/pref/feeds.php:643
-#: classes/pref/feeds.php:880
-#: classes/pref/feeds.php:1838
+#: classes/pref/feeds.php:882
+#: classes/pref/feeds.php:1842
 #: classes/feeds.php:1074
 msgid "Login"
 msgstr "Se connecter"
@@ -1456,250 +1492,250 @@ msgid "Feed Title"
 msgstr "Titre du flux"
 
 #: classes/pref/feeds.php:595
-#: classes/pref/feeds.php:828
-#: classes/pref/feeds.php:1824
+#: classes/pref/feeds.php:830
+#: classes/pref/feeds.php:1828
 #: classes/feeds.php:1050
 msgid "Place in category:"
 msgstr "Placer dans la catégorie :"
 
 #: classes/pref/feeds.php:608
-#: classes/pref/feeds.php:842
+#: classes/pref/feeds.php:844
 msgid "Language:"
 msgstr "Langue:"
 
 #: classes/pref/feeds.php:615
-#: classes/pref/feeds.php:851
+#: classes/pref/feeds.php:853
 msgid "Update"
 msgstr "Mettre à jour"
 
 #: classes/pref/feeds.php:630
-#: classes/pref/feeds.php:867
+#: classes/pref/feeds.php:869
 msgid "Article purging:"
 msgstr "Purge des articles :"
 
-#: classes/pref/feeds.php:656
-#: classes/pref/feeds.php:886
-#: classes/pref/feeds.php:1841
+#: classes/pref/feeds.php:658
+#: classes/pref/feeds.php:890
+#: classes/pref/feeds.php:1845
 #: classes/pref/prefs.php:245
-#: classes/feeds.php:1077
+#: classes/feeds.php:1078
 msgid "Password"
 msgstr "Mot de passe"
 
-#: classes/pref/feeds.php:660
+#: classes/pref/feeds.php:662
 msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
 msgstr "<b>Astuce :</b> vous devez renseigner vos informations d'identification si le flux nécessite une authentification, sauf pour les flux Twitter."
 
-#: classes/pref/feeds.php:679
-#: classes/pref/feeds.php:896
+#: classes/pref/feeds.php:681
+#: classes/pref/feeds.php:900
 msgid "Hide from Popular feeds"
 msgstr "Masquer dans la liste des flux populaires"
 
-#: classes/pref/feeds.php:691
-#: classes/pref/feeds.php:902
+#: classes/pref/feeds.php:693
+#: classes/pref/feeds.php:906
 msgid "Include in e-mail digest"
 msgstr "Inclure dans la synthèse quotidienne par courrier électronique"
 
-#: classes/pref/feeds.php:704
-#: classes/pref/feeds.php:908
+#: classes/pref/feeds.php:706
+#: classes/pref/feeds.php:912
 msgid "Always display image attachments"
 msgstr "Toujours afficher les images jointes"
 
-#: classes/pref/feeds.php:717
-#: classes/pref/feeds.php:916
+#: classes/pref/feeds.php:719
+#: classes/pref/feeds.php:920
 msgid "Do not embed images"
 msgstr "Ne pas intégrer les images"
 
-#: classes/pref/feeds.php:730
-#: classes/pref/feeds.php:924
+#: classes/pref/feeds.php:732
+#: classes/pref/feeds.php:928
 msgid "Cache images locally"
 msgstr "Enregistrer localement les images"
 
-#: classes/pref/feeds.php:742
-#: classes/pref/feeds.php:930
+#: classes/pref/feeds.php:744
+#: classes/pref/feeds.php:934
 msgid "Mark updated articles as unread"
 msgstr "Marquer les article mis à jour comme non lus"
 
-#: classes/pref/feeds.php:746
+#: classes/pref/feeds.php:748
 msgid "Icon"
 msgstr "Icône"
 
-#: classes/pref/feeds.php:763
+#: classes/pref/feeds.php:765
 msgid "Replace"
 msgstr "Remplacer"
 
-#: classes/pref/feeds.php:770
+#: classes/pref/feeds.php:772
 #: classes/pref/prefs.php:706
 msgid "Plugins"
 msgstr "Plugins"
 
-#: classes/pref/feeds.php:790
+#: classes/pref/feeds.php:792
 msgid "Resubscribe to push updates"
 msgstr "Réinscription aux mises à jour en push"
 
-#: classes/pref/feeds.php:797
+#: classes/pref/feeds.php:799
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr "Réinitialiser l'état de l'inscription PubSubHubbub pour les flux en mise à jour push."
 
-#: classes/pref/feeds.php:1203
-#: classes/pref/feeds.php:1256
+#: classes/pref/feeds.php:1207
+#: classes/pref/feeds.php:1260
 msgid "All done."
 msgstr "Tout est terminé."
 
-#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1315
 msgid "Feeds with errors"
 msgstr "Flux avec des erreurs"
 
-#: classes/pref/feeds.php:1318
+#: classes/pref/feeds.php:1322
 msgid "Inactive feeds"
 msgstr "Flux inactifs"
 
-#: classes/pref/feeds.php:1354
+#: classes/pref/feeds.php:1358
 msgid "Edit selected feeds"
 msgstr "Modifier les flux sélectionnés"
 
-#: classes/pref/feeds.php:1356
-#: classes/pref/feeds.php:1370
+#: classes/pref/feeds.php:1360
+#: classes/pref/feeds.php:1374
 #: classes/pref/filters.php:762
 msgid "Reset sort order"
 msgstr "Réinitialiser le critère de tri"
 
-#: classes/pref/feeds.php:1358
+#: classes/pref/feeds.php:1362
 #: js/prefs.js:1737
 msgid "Batch subscribe"
 msgstr "Abonnement par lots"
 
-#: classes/pref/feeds.php:1365
+#: classes/pref/feeds.php:1369
 msgid "Categories"
 msgstr "Catégories"
 
-#: classes/pref/feeds.php:1368
+#: classes/pref/feeds.php:1372
 msgid "Add category"
 msgstr "Ajouter une catégorie"
 
-#: classes/pref/feeds.php:1372
+#: classes/pref/feeds.php:1376
 msgid "Remove selected"
 msgstr "Supprimer les flux sélectionnés"
 
-#: classes/pref/feeds.php:1383
+#: classes/pref/feeds.php:1387
 msgid "More actions..."
 msgstr "Autres actions..."
 
-#: classes/pref/feeds.php:1387
+#: classes/pref/feeds.php:1391
 msgid "Manual purge"
 msgstr "Purger manuellement"
 
-#: classes/pref/feeds.php:1391
+#: classes/pref/feeds.php:1395
 msgid "Clear feed data"
 msgstr "Purger les données de flux"
 
-#: classes/pref/feeds.php:1392
+#: classes/pref/feeds.php:1396
 #: classes/pref/filters.php:770
 msgid "Rescore articles"
 msgstr "Recalculer le score des articles"
 
-#: classes/pref/feeds.php:1444
+#: classes/pref/feeds.php:1448
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1446
+#: classes/pref/feeds.php:1450
 msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
 msgstr "Avec OPML, vous pouvez exporter et importer vos flux, filtres, étiquettes et réglages de Tiny Tiny RSS."
 
-#: classes/pref/feeds.php:1447
+#: classes/pref/feeds.php:1451
 msgid "Only main settings profile can be migrated using OPML."
 msgstr "Seul le profil de réglages principal peut être migré en utilisant OPML."
 
-#: classes/pref/feeds.php:1460
+#: classes/pref/feeds.php:1464
 msgid "Import my OPML"
 msgstr "Importer mon OPML"
 
-#: classes/pref/feeds.php:1466
+#: classes/pref/feeds.php:1470
 msgid "Filename:"
 msgstr "Nom du fichier :"
 
-#: classes/pref/feeds.php:1468
+#: classes/pref/feeds.php:1472
 msgid "Include settings"
 msgstr "Inclure les paramètres"
 
-#: classes/pref/feeds.php:1472
+#: classes/pref/feeds.php:1476
 msgid "Export OPML"
 msgstr "Exporter en OPML"
 
-#: classes/pref/feeds.php:1476
+#: classes/pref/feeds.php:1480
 msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
 msgstr "Votre fichier OPML peut être publié et toute personne qui connaît l'adresse indiquée ci-dessous peut s'y abonner."
 
-#: classes/pref/feeds.php:1480
+#: classes/pref/feeds.php:1484
 msgid "Public OPML URL"
 msgstr "URL OPML publique"
 
-#: classes/pref/feeds.php:1481
+#: classes/pref/feeds.php:1485
 msgid "Display published OPML URL"
 msgstr "Afficher l'URL de l'OPML public"
 
-#: classes/pref/feeds.php:1490
+#: classes/pref/feeds.php:1494
 msgid "Firefox integration"
 msgstr "Intégration à Firefox"
 
-#: classes/pref/feeds.php:1492
+#: classes/pref/feeds.php:1496
 msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
 msgstr "Ce site Tiny Tiny RSS peut être utilisé comme lecteur de flux dans Firefox en cliquant sur le lien ci-dessous."
 
-#: classes/pref/feeds.php:1499
+#: classes/pref/feeds.php:1503
 msgid "Click here to register this site as a feed reader."
 msgstr "Cliquer ici pour enregistrer ce site comme lecteur de flux."
 
-#: classes/pref/feeds.php:1507
+#: classes/pref/feeds.php:1511
 msgid "Published & shared articles / Generated feeds"
 msgstr "Articles publiés et partagés / Flux générés"
 
-#: classes/pref/feeds.php:1509
+#: classes/pref/feeds.php:1513
 msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
 msgstr "Les articles publiés sont exportés comme un flux RSS public et toute personne qui connaît l'adresse indiquée ci-dessous peut s'y abonner."
 
-#: classes/pref/feeds.php:1516
+#: classes/pref/feeds.php:1520
 #: classes/feeds.php:54
 #: classes/feeds.php:134
 msgid "View as RSS"
 msgstr "Voir comme RSS"
 
-#: classes/pref/feeds.php:1517
+#: classes/pref/feeds.php:1521
 msgid "Display URL"
 msgstr "Afficher l'URL"
 
-#: classes/pref/feeds.php:1520
+#: classes/pref/feeds.php:1524
 msgid "Clear all generated URLs"
 msgstr "Supprimer toutes les URL générées"
 
-#: classes/pref/feeds.php:1598
+#: classes/pref/feeds.php:1602
 msgid "These feeds have not been updated with new content for 3 months (oldest first):"
 msgstr "Les flux suivants n'ont pas été mis à jour depuis 3 mois (par âge décroissant) :"
 
-#: classes/pref/feeds.php:1632
-#: classes/pref/feeds.php:1696
+#: classes/pref/feeds.php:1636
+#: classes/pref/feeds.php:1700
 msgid "Click to edit feed"
 msgstr "Cliquez pour modifier le flux"
 
-#: classes/pref/feeds.php:1650
-#: classes/pref/feeds.php:1716
+#: classes/pref/feeds.php:1654
+#: classes/pref/feeds.php:1720
 msgid "Unsubscribe from selected feeds"
 msgstr "Se désabonner des flux sélectionnés"
 
-#: classes/pref/feeds.php:1821
+#: classes/pref/feeds.php:1825
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr "Ajoutez un flux RSS valide par ligne (aucune détection de flux n'est réalisée)"
 
-#: classes/pref/feeds.php:1830
+#: classes/pref/feeds.php:1834
 msgid "Feeds to subscribe, One per line"
 msgstr "Flux auxquels s'abonner, un par ligne"
 
-#: classes/pref/feeds.php:1852
+#: classes/pref/feeds.php:1857
 msgid "Feeds require authentication."
 msgstr "Les flux requièrent une identification."
 
-#: classes/pref/feeds.php:1859
-#: classes/feeds.php:1092
-#: classes/feeds.php:1146
+#: classes/pref/feeds.php:1864
+#: classes/feeds.php:1094
+#: classes/feeds.php:1148
 msgid "Subscribe"
 msgstr "S'abonner"
 
@@ -1781,7 +1817,7 @@ msgid "on field"
 msgstr "sur le champ"
 
 #: classes/pref/filters.php:962
-#: js/PrefFilterTree.js:61
+#: js/PrefFilterTree.js:64
 msgid "in"
 msgstr "dans"
 
@@ -2372,40 +2408,40 @@ msgstr "URL du flux"
 msgid "Available feeds"
 msgstr "Flux disponibles"
 
-#: classes/feeds.php:1087
+#: classes/feeds.php:1089
 msgid "This feed requires authentication."
 msgstr "Ce flux nécessite une identification."
 
-#: classes/feeds.php:1095
+#: classes/feeds.php:1097
 msgid "More feeds"
 msgstr "D'autres flux"
 
-#: classes/feeds.php:1122
+#: classes/feeds.php:1124
 msgid "Popular feeds"
 msgstr "Flux populaires"
 
-#: classes/feeds.php:1123
+#: classes/feeds.php:1125
 msgid "Feed archive"
 msgstr "Archive du flux"
 
-#: classes/feeds.php:1126
+#: classes/feeds.php:1128
 msgid "limit:"
 msgstr "limite :"
 
-#: classes/feeds.php:1158
+#: classes/feeds.php:1160
 msgid "Look for"
 msgstr "Rechercher"
 
-#: classes/feeds.php:1166
+#: classes/feeds.php:1168
 #, php-format
 msgid "in %s"
 msgstr "dans %s"
 
-#: classes/feeds.php:1171
+#: classes/feeds.php:1173
 msgid "Used for word stemming"
 msgstr "Utilisé pour la racinisation des mots"
 
-#: classes/feeds.php:1180
+#: classes/feeds.php:1182
 msgid "Search syntax"
 msgstr "Syntaxe de la recherche"
 
@@ -2661,6 +2697,11 @@ msgstr "Impossible de charger le document XML."
 msgid "Prepare data"
 msgstr "Préparer les données"
 
+#: plugins/import_export/init.php:428
+#, fuzzy, php-format
+msgid "Upload failed with error code %d (%s)"
+msgstr "Échec de l'envoi, code d'erreur %d"
+
 #: plugins/import_export/init.php:454
 msgid "No file uploaded."
 msgstr "Aucun fichier envoyé."
@@ -2770,7 +2811,7 @@ msgstr "Modifier la catégorie"
 msgid "Remove category"
 msgstr "Supprimer la catégorie"
 
-#: js/PrefFilterTree.js:64
+#: js/PrefFilterTree.js:67
 msgid "Inverse"
 msgstr "Inverser"
 
@@ -2821,7 +2862,7 @@ msgid "Subscription reset."
 msgstr "Abonnement réinitialisé."
 
 #: js/functions.js:1311
-#: js/tt-rss.js:682
+#: js/tt-rss.js:705
 #, perl-format
 msgid "Unsubscribe from %s?"
 msgstr "Se désabonner de %s ?"
@@ -3051,40 +3092,40 @@ msgstr "Marquer tous les articles comme lus ?"
 msgid "Marking all feeds as read..."
 msgstr "Marquage de tous les flux comme lus..."
 
-#: js/tt-rss.js:383
+#: js/tt-rss.js:404
 msgid "Please enable mail plugin first."
 msgstr "Veuillez d'abord activer le plugin mail."
 
-#: js/tt-rss.js:431
+#: js/tt-rss.js:452
 #: js/functions.js:1643
-#: js/tt-rss.js:663
+#: js/tt-rss.js:686
 msgid "You can't edit this kind of feed."
 msgstr "Vous ne pouvez pas modifier ce type de flux."
 
-#: js/tt-rss.js:502
+#: js/tt-rss.js:533
 msgid "Please enable embed_original plugin first."
 msgstr "Veuillez d'abord activer le plugin embed_original."
 
-#: js/tt-rss.js:515
-#: js/tt-rss.js:713
+#: js/tt-rss.js:546
+#: js/tt-rss.js:736
 msgid "Widescreen is not available in combined mode."
 msgstr "L'écran large n'est pas disponible en mode combiné."
 
-#: js/tt-rss.js:827
+#: js/tt-rss.js:850
 msgid "You can't rescore this kind of feed."
 msgstr "Vous ne pouvez pas recalculer le score de ce type de flux."
 
-#: js/tt-rss.js:832
-#: js/tt-rss.js:676
+#: js/tt-rss.js:855
+#: js/tt-rss.js:699
 msgid "Please select some feed first."
 msgstr "Veuillez d'abord sélectionner un flux."
 
-#: js/tt-rss.js:837
+#: js/tt-rss.js:860
 #, perl-format
 msgid "Rescore articles in %s?"
 msgstr "Recalculer le score des articles de %s ?"
 
-#: js/tt-rss.js:840
+#: js/tt-rss.js:863
 msgid "Rescoring articles..."
 msgstr "Recalcul des scores des articles..."
 
@@ -3258,7 +3299,7 @@ msgstr "Votre message a été envoyé."
 msgid "Sorry, your browser does not support sandboxed iframes."
 msgstr "Malheureusement, votre navigateur ne supporte pas les iframes sécurisées."
 
-#: plugins/shorten_expanded/init.js:37
+#: plugins/shorten_expanded/init.js:39
 msgid "Click to expand article"
 msgstr "Cliquer pour développer l'article"
 
@@ -3506,7 +3547,7 @@ msgstr "URL générées supprimées."
 msgid "Label Editor"
 msgstr "Éditeur d'étiquette"
 
-#: js/tt-rss.js:671
+#: js/tt-rss.js:694
 msgid "You can't unsubscribe from the category."
 msgstr "Vous ne pouvez pas vous désabonner de la catégorie."
 
diff --git a/locale/hu_HU/LC_MESSAGES/messages.mo b/locale/hu_HU/LC_MESSAGES/messages.mo
index d41611564..526fd0df1 100644
Binary files a/locale/hu_HU/LC_MESSAGES/messages.mo and b/locale/hu_HU/LC_MESSAGES/messages.mo differ
diff --git a/locale/hu_HU/LC_MESSAGES/messages.po b/locale/hu_HU/LC_MESSAGES/messages.po
index a52495ac2..05c3347aa 100644
--- a/locale/hu_HU/LC_MESSAGES/messages.po
+++ b/locale/hu_HU/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tt-rss-hu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 22:58+0300\n"
+"POT-Creation-Date: 2016-08-19 18:16+0300\n"
 "PO-Revision-Date: 2013-05-15 01:19+0100\n"
 "Last-Translator: Faludi Zoltán <zoltan.faludi@gmail.com>\n"
 "Language-Team: HUNGARIAN\n"
@@ -166,13 +166,13 @@ msgstr "Hírcsatorna nem található"
 msgid "Plugin not found"
 msgstr "Felhasználó nem találhat"
 
-#: index.php:133
-#: index.php:149
-#: index.php:267
-#: prefs.php:102
+#: index.php:148
+#: index.php:164
+#: index.php:282
+#: prefs.php:117
 #: classes/backend.php:5
 #: classes/pref/labels.php:282
-#: classes/pref/feeds.php:1405
+#: classes/pref/feeds.php:1409
 #: classes/pref/filters.php:779
 #: js/feedlist.js:159
 #: js/functions.js:1293
@@ -184,7 +184,7 @@ msgstr "Felhasználó nem találhat"
 #: js/prefs.js:1781
 #: js/prefs.js:1799
 #: js/tt-rss.js:55
-#: js/tt-rss.js:522
+#: js/tt-rss.js:553
 #: js/viewfeed.js:1298
 #: plugins/import_export/import_export.js:17
 #: js/feedlist.js:484
@@ -197,75 +197,75 @@ msgstr "Felhasználó nem találhat"
 #: js/prefs.js:1556
 #: js/prefs.js:1572
 #: js/prefs.js:1592
-#: js/tt-rss.js:539
+#: js/tt-rss.js:570
 #: js/viewfeed.js:830
 msgid "Loading, please wait..."
 msgstr "Betöltés, kérem várjon..."
 
-#: index.php:167
+#: index.php:182
 msgid "Collapse feedlist"
 msgstr "Hírcsatornalista összecsukása"
 
-#: index.php:170
+#: index.php:185
 msgid "Show articles"
 msgstr "Hírek megjelenítése"
 
-#: index.php:173
+#: index.php:188
 msgid "Adaptive"
 msgstr "Adaptív"
 
-#: index.php:174
+#: index.php:189
 msgid "All Articles"
 msgstr "Minden hír"
 
-#: index.php:175
-#: include/functions2.php:101
+#: index.php:190
+#: include/functions2.php:102
 #: classes/feeds.php:104
 msgid "Starred"
 msgstr "Csillagozott"
 
-#: index.php:176
-#: include/functions2.php:102
+#: index.php:191
+#: include/functions2.php:103
 #: classes/feeds.php:105
 msgid "Published"
 msgstr "Publikált"
 
-#: index.php:177
+#: index.php:192
 #: classes/feeds.php:91
 #: classes/feeds.php:103
 msgid "Unread"
 msgstr "Olvasatlan"
 
-#: index.php:178
+#: index.php:193
 msgid "With Note"
 msgstr "Megjegyzéssel"
 
-#: index.php:179
+#: index.php:194
 msgid "Ignore Scoring"
 msgstr "Pontozás memmőzése"
 
-#: index.php:182
+#: index.php:197
 msgid "Sort articles"
 msgstr "Hírek rendezése"
 
-#: index.php:185
+#: index.php:200
 msgid "Default"
 msgstr "Alapértelmezett"
 
-#: index.php:186
+#: index.php:201
 msgid "Newest first"
 msgstr "Újak előre"
 
-#: index.php:187
+#: index.php:202
 msgid "Oldest first"
 msgstr "Régiek előre"
 
-#: index.php:188
+#: index.php:203
 msgid "Title"
 msgstr "Cím"
 
-#: index.php:192
-#: index.php:233
+#: index.php:207
+#: index.php:248
 #: include/functions2.php:90
 #: classes/feeds.php:109
 #: js/FeedTree.js:132
@@ -273,134 +273,134 @@ msgstr "Cím"
 msgid "Mark as read"
 msgstr "Megjelölés olvasottként"
 
-#: index.php:195
+#: index.php:210
 msgid "Older than one day"
 msgstr "Egy napnál régebbi"
 
-#: index.php:198
+#: index.php:213
 msgid "Older than one week"
 msgstr "Egy hétnél régebbi"
 
-#: index.php:201
+#: index.php:216
 msgid "Older than two weeks"
 msgstr "Két hétnél régebbi"
 
-#: index.php:217
+#: index.php:232
 msgid "Communication problem with server."
 msgstr "Kommunikációs probléma a szerverrel"
 
-#: index.php:223
+#: index.php:238
 msgid "Actions..."
 msgstr "Műveletek"
 
-#: index.php:225
+#: index.php:240
 msgid "Preferences..."
 msgstr "Beállítások..."
 
-#: index.php:226
+#: index.php:241
 msgid "Search..."
 msgstr "Keresés..."
 
-#: index.php:227
+#: index.php:242
 msgid "Feed actions:"
 msgstr "Műveletek hírcsatornákkal:"
 
-#: index.php:228
+#: index.php:243
 #: classes/handler/public.php:672
 msgid "Subscribe to feed..."
 msgstr "Feliratkozás hírcsatornára..."
 
-#: index.php:229
+#: index.php:244
 msgid "Edit this feed..."
 msgstr "Hírcsatorna szerkesztése..."
 
-#: index.php:230
+#: index.php:245
 msgid "Rescore feed"
 msgstr "Hírcsatorna újrapontozása"
 
-#: index.php:231
-#: classes/pref/feeds.php:783
-#: classes/pref/feeds.php:1360
+#: index.php:246
+#: classes/pref/feeds.php:785
+#: classes/pref/feeds.php:1364
 #: js/PrefFeedTree.js:74
 msgid "Unsubscribe"
 msgstr "Leiratkozás"
 
-#: index.php:232
+#: index.php:247
 msgid "All feeds:"
 msgstr "Az összes hírcsatorna:"
 
-#: index.php:234
+#: index.php:249
 msgid "(Un)hide read feeds"
 msgstr "Olvasottak rejtése/mutatása"
 
-#: index.php:235
+#: index.php:250
 msgid "Other actions:"
 msgstr "Egyéb műveletek:"
 
-#: index.php:236
+#: index.php:251
 #: include/functions2.php:76
 msgid "Toggle widescreen mode"
 msgstr "Szélesvásznú mód váltása"
 
-#: index.php:237
+#: index.php:252
 msgid "Create label..."
 msgstr "Új címke létrehozása..."
 
-#: index.php:238
+#: index.php:253
 msgid "Create filter..."
 msgstr "Szűrő létrehozása..."
 
-#: index.php:239
+#: index.php:254
 msgid "Keyboard shortcuts help"
 msgstr "Billentyűparancsok súgója"
 
-#: index.php:248
+#: index.php:263
 msgid "Logout"
 msgstr "Kijelentkezés"
 
-#: index.php:254
+#: index.php:269
 msgid "Updates are available from Git."
 msgstr ""
 
 #: prefs.php:33
-#: prefs.php:120
-#: include/functions2.php:104
+#: prefs.php:135
+#: include/functions2.php:105
 #: classes/pref/prefs.php:435
 msgid "Preferences"
 msgstr "Beállítások"
 
-#: prefs.php:111
+#: prefs.php:126
 msgid "Keyboard shortcuts"
 msgstr "Billentyűparancsok"
 
-#: prefs.php:112
+#: prefs.php:127
 msgid "Exit preferences"
 msgstr "Kilépés a beállításokból"
 
-#: prefs.php:123
+#: prefs.php:138
 #: classes/pref/feeds.php:112
-#: classes/pref/feeds.php:1300
-#: classes/pref/feeds.php:1349
+#: classes/pref/feeds.php:1304
+#: classes/pref/feeds.php:1353
 msgid "Feeds"
 msgstr "Hírcsatornák"
 
-#: prefs.php:126
+#: prefs.php:141
 #: classes/pref/filters.php:248
 msgid "Filters"
 msgstr "Szűrők"
 
-#: prefs.php:129
-#: include/functions.php:1256
-#: include/functions.php:1909
+#: prefs.php:144
+#: include/functions.php:1287
+#: include/functions.php:1940
 #: classes/pref/labels.php:90
 msgid "Labels"
 msgstr "Címkék"
 
-#: prefs.php:133
+#: prefs.php:148
 msgid "Users"
 msgstr "Felhasználók"
 
-#: prefs.php:136
+#: prefs.php:151
 msgid "System"
 msgstr "Rendszer"
 
@@ -482,10 +482,10 @@ msgid "Tiny Tiny RSS data update script."
 msgstr "A Tiny Tiny RSS adatbázis frissítő szkript."
 
 #: include/digest.php:109
-#: include/functions.php:1265
-#: include/functions.php:1810
-#: include/functions.php:1895
-#: include/functions.php:1917
+#: include/functions.php:1296
+#: include/functions.php:1841
+#: include/functions.php:1926
+#: include/functions.php:1948
 #: classes/opml.php:421
 #: classes/pref/feeds.php:228
 msgid "Uncategorized"
@@ -502,44 +502,44 @@ msgstr[1] "%d archivált hír"
 msgid "No feeds found."
 msgstr "Nem található hírcsatorna."
 
-#: include/functions.php:958
+#: include/functions.php:989
 #, php-format
 msgid "%d min"
 msgstr ""
 
-#: include/functions.php:1254
-#: include/functions.php:1907
+#: include/functions.php:1285
+#: include/functions.php:1938
 msgid "Special"
 msgstr "Kiemelt"
 
-#: include/functions.php:1758
+#: include/functions.php:1789
 #: classes/pref/filters.php:229
 #: classes/pref/filters.php:507
 msgid "All feeds"
 msgstr "Összes hírcsatorna"
 
-#: include/functions.php:1962
+#: include/functions.php:1993
 msgid "Starred articles"
 msgstr "Csillagozott hírek"
 
-#: include/functions.php:1964
+#: include/functions.php:1995
 msgid "Published articles"
 msgstr "Publikált hírek"
 
-#: include/functions.php:1966
+#: include/functions.php:1997
 msgid "Fresh articles"
 msgstr "Friss hírek"
 
-#: include/functions.php:1968
-#: include/functions2.php:99
+#: include/functions.php:1999
+#: include/functions2.php:100
 msgid "All articles"
 msgstr "Az összes hír"
 
-#: include/functions.php:1970
+#: include/functions.php:2001
 msgid "Archived articles"
 msgstr "Archivált hírek"
 
-#: include/functions.php:1972
+#: include/functions.php:2003
 msgid "Recently read"
 msgstr "Legutóbb olvasott"
 
@@ -679,7 +679,7 @@ msgstr "Kijelölés eltávolítása"
 
 #: include/functions2.php:85
 #: classes/pref/feeds.php:555
-#: classes/pref/feeds.php:821
+#: classes/pref/feeds.php:823
 msgid "Feed"
 msgstr "Hírcsatorna"
 
@@ -692,7 +692,7 @@ msgid "Un/hide read feeds"
 msgstr "Olvasott hírcsatornák rejtése/mutatása"
 
 #: include/functions2.php:88
-#: classes/pref/feeds.php:1352
+#: classes/pref/feeds.php:1356
 msgid "Subscribe to feed"
 msgstr "Feliratkozás hírcsatornára"
 
@@ -708,140 +708,177 @@ msgid "Reverse headlines"
 msgstr "Címek fordított sorrendben"
 
 #: include/functions2.php:92
+msgid "Toggle headline grouping"
+msgstr ""
+
+#: include/functions2.php:93
 msgid "Debug feed update"
 msgstr "Hírcsatorna frissítés hibakaresés"
 
-#: include/functions2.php:93
+#: include/functions2.php:94
 #, fuzzy
 msgid "Debug viewfeed()"
 msgstr "Hírcsatorna frissítés hibakaresés"
 
-#: include/functions2.php:94
+#: include/functions2.php:95
 #: js/FeedTree.js:182
 msgid "Mark all feeds as read"
 msgstr "Minden hírcsatornát olvasottként jelöl"
 
-#: include/functions2.php:95
+#: include/functions2.php:96
 msgid "Un/collapse current category"
 msgstr "Kategória kinyitás/összecsukás"
 
-#: include/functions2.php:96
+#: include/functions2.php:97
 msgid "Toggle combined mode"
 msgstr "Váltás kombinált módba"
 
-#: include/functions2.php:97
+#: include/functions2.php:98
 msgid "Toggle auto expand in combined mode"
 msgstr "Automatikus kibontás kombinált módban"
 
-#: include/functions2.php:98
+#: include/functions2.php:99
 msgid "Go to"
 msgstr "Ugrás ide"
 
-#: include/functions2.php:100
+#: include/functions2.php:101
 msgid "Fresh"
 msgstr "Friss"
 
-#: include/functions2.php:103
-#: js/tt-rss.js:466
-#: js/tt-rss.js:650
+#: include/functions2.php:104
+#: js/tt-rss.js:497
+#: js/tt-rss.js:673
 msgid "Tag cloud"
 msgstr "Címkefelhő"
 
-#: include/functions2.php:105
+#: include/functions2.php:106
 msgid "Other"
 msgstr "Egyéb"
 
-#: include/functions2.php:106
+#: include/functions2.php:107
 #: classes/pref/labels.php:267
 msgid "Create label"
 msgstr "Címke létrehozása"
 
-#: include/functions2.php:107
+#: include/functions2.php:108
 #: classes/pref/filters.php:753
 msgid "Create filter"
 msgstr "Szűrő létrehozása"
 
-#: include/functions2.php:108
+#: include/functions2.php:109
 msgid "Un/collapse sidebar"
 msgstr "Oldalsáv megjelenítés/elrejtés"
 
-#: include/functions2.php:109
+#: include/functions2.php:110
 msgid "Show help dialog"
 msgstr "Súgó ablak megjelenítése"
 
-#: include/functions2.php:663
+#: include/functions2.php:665
 #, php-format
 msgid "Search results: %s"
 msgstr "Keresési eredmények: %s"
 
-#: include/functions2.php:1317
+#: include/functions2.php:1330
 #: classes/feeds.php:749
 msgid "comment"
 msgid_plural "comments"
 msgstr[0] "megjegyzés"
 msgstr[1] "megjegyzés"
 
-#: include/functions2.php:1321
+#: include/functions2.php:1334
 #: classes/feeds.php:753
 msgid "comments"
 msgstr "megjegyzések"
 
-#: include/functions2.php:1347
+#: include/functions2.php:1360
 msgid " - "
 msgstr "-"
 
-#: include/functions2.php:1380
-#: include/functions2.php:1631
+#: include/functions2.php:1393
+#: include/functions2.php:1644
 #: classes/article.php:311
 msgid "no tags"
 msgstr "nincs címke"
 
-#: include/functions2.php:1390
+#: include/functions2.php:1403
 #: classes/feeds.php:735
 msgid "Edit tags for this article"
 msgstr "Címkék hozzáadása a hírhez"
 
-#: include/functions2.php:1422
+#: include/functions2.php:1435
 #: classes/feeds.php:682
 msgid "Originally from:"
 msgstr "Eredeti innen:"
 
-#: include/functions2.php:1435
+#: include/functions2.php:1448
 #: classes/pref/feeds.php:574
 #: classes/feeds.php:695
 msgid "Feed URL"
 msgstr "Hírcsatorna URL"
 
-#: include/functions2.php:1472
+#: include/functions2.php:1485
 #: classes/backend.php:105
 #: classes/dlg.php:37
 #: classes/dlg.php:60
 #: classes/dlg.php:93
 #: classes/dlg.php:159
 #: classes/dlg.php:186
-#: classes/pref/feeds.php:1654
-#: classes/pref/feeds.php:1720
+#: classes/pref/feeds.php:1658
+#: classes/pref/feeds.php:1724
 #: classes/pref/filters.php:204
 #: classes/pref/prefs.php:1105
 #: plugins/af_psql_trgm/init.php:102
 #: plugins/import_export/init.php:415
-#: plugins/import_export/init.php:460
+#: plugins/import_export/init.php:461
 #: plugins/share/init.php:121
 msgid "Close this window"
 msgstr "Ablak bezárása"
 
-#: include/functions2.php:1669
+#: include/functions2.php:1682
 msgid "(edit note)"
 msgstr "(jegyzet szerkesztése)"
 
-#: include/functions2.php:1924
+#: include/functions2.php:1937
 msgid "unknown type"
 msgstr "ismeretlen hírcsatornatípus"
 
-#: include/functions2.php:2001
+#: include/functions2.php:2014
 msgid "Attachments"
 msgstr "Csatolmányok:"
 
+#: include/functions2.php:2456
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: include/functions2.php:2457
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr ""
+
+#: include/functions2.php:2458
+msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
+msgstr ""
+
+#: include/functions2.php:2459
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: include/functions2.php:2460
+#, fuzzy
+msgid "No file was uploaded"
+msgstr "Nincs felöltött fájl."
+
+#: include/functions2.php:2461
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: include/functions2.php:2462
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: include/functions2.php:2463
+msgid "A PHP extension stopped the file upload."
+msgstr ""
+
 #: include/login_form.php:197
 #: classes/handler/public.php:569
 #: classes/handler/public.php:824
@@ -908,8 +945,8 @@ msgstr "A hír címkéi (vesszőkkel elválasztva):"
 #: classes/article.php:222
 #: classes/pref/labels.php:79
 #: classes/pref/users.php:98
-#: classes/pref/feeds.php:799
-#: classes/pref/feeds.php:939
+#: classes/pref/feeds.php:801
+#: classes/pref/feeds.php:943
 #: classes/pref/filters.php:485
 #: classes/pref/prefs.php:989
 #: plugins/instances/init.php:245
@@ -927,17 +964,17 @@ msgstr "Mentés"
 #: classes/handler/public.php:580
 #: classes/pref/labels.php:81
 #: classes/pref/users.php:100
-#: classes/pref/feeds.php:800
-#: classes/pref/feeds.php:942
-#: classes/pref/feeds.php:1860
+#: classes/pref/feeds.php:802
+#: classes/pref/feeds.php:946
+#: classes/pref/feeds.php:1865
 #: classes/pref/filters.php:488
 #: classes/pref/filters.php:902
 #: classes/pref/filters.php:983
 #: classes/pref/filters.php:1076
 #: classes/pref/prefs.php:991
-#: classes/feeds.php:1098
-#: classes/feeds.php:1148
-#: classes/feeds.php:1185
+#: classes/feeds.php:1100
+#: classes/feeds.php:1150
+#: classes/feeds.php:1187
 #: plugins/instances/init.php:248
 #: plugins/instances/init.php:436
 #: plugins/note/init.php:53
@@ -993,7 +1030,6 @@ msgid "Processing category: %s"
 msgstr "%s kategória feldolgozása"
 
 #: classes/opml.php:470
-#: plugins/import_export/init.php:428
 #, php-format
 msgid "Upload failed with error code %d"
 msgstr "Feltöltés sikertelen. Hibakód: %d"
@@ -1213,9 +1249,9 @@ msgstr "Címke létrehozva: <b>%s</b>"
 
 #: classes/pref/labels.php:258
 #: classes/pref/users.php:334
-#: classes/pref/feeds.php:1340
-#: classes/pref/feeds.php:1602
-#: classes/pref/feeds.php:1666
+#: classes/pref/feeds.php:1344
+#: classes/pref/feeds.php:1606
+#: classes/pref/feeds.php:1670
 #: classes/pref/filters.php:359
 #: classes/pref/filters.php:407
 #: classes/pref/filters.php:744
@@ -1228,9 +1264,9 @@ msgstr "Kiválasztás"
 
 #: classes/pref/labels.php:261
 #: classes/pref/users.php:337
-#: classes/pref/feeds.php:1343
-#: classes/pref/feeds.php:1605
-#: classes/pref/feeds.php:1669
+#: classes/pref/feeds.php:1347
+#: classes/pref/feeds.php:1609
+#: classes/pref/feeds.php:1673
 #: classes/pref/filters.php:362
 #: classes/pref/filters.php:410
 #: classes/pref/filters.php:747
@@ -1244,9 +1280,9 @@ msgstr "Mind"
 
 #: classes/pref/labels.php:263
 #: classes/pref/users.php:339
-#: classes/pref/feeds.php:1345
-#: classes/pref/feeds.php:1607
-#: classes/pref/feeds.php:1671
+#: classes/pref/feeds.php:1349
+#: classes/pref/feeds.php:1611
+#: classes/pref/feeds.php:1675
 #: classes/pref/filters.php:364
 #: classes/pref/filters.php:412
 #: classes/pref/filters.php:749
@@ -1260,10 +1296,10 @@ msgstr "Kijelölés törlése"
 
 #: classes/pref/labels.php:270
 #: classes/pref/users.php:348
-#: classes/pref/feeds.php:765
+#: classes/pref/feeds.php:767
 #: classes/pref/filters.php:478
 #: classes/pref/filters.php:766
-#: classes/feeds.php:1147
+#: classes/feeds.php:1149
 #: plugins/instances/init.php:294
 msgid "Remove"
 msgstr "Eltávolít"
@@ -1285,7 +1321,7 @@ msgstr "Szabály szerkesztése"
 
 #: classes/pref/users.php:56
 #: classes/pref/feeds.php:637
-#: classes/pref/feeds.php:876
+#: classes/pref/feeds.php:878
 #: classes/feeds.php:1070
 msgid "Authentication"
 msgstr "Azonosítás"
@@ -1295,8 +1331,8 @@ msgid "Access level: "
 msgstr "Hozzáférési szint:"
 
 #: classes/pref/users.php:77
-#: classes/pref/feeds.php:665
-#: classes/pref/feeds.php:892
+#: classes/pref/feeds.php:667
+#: classes/pref/feeds.php:896
 msgid "Options"
 msgstr "Beállítások"
 
@@ -1362,10 +1398,10 @@ msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] Értesítés jelszó megváltoztatásáról."
 
 #: classes/pref/users.php:324
-#: classes/pref/feeds.php:1336
+#: classes/pref/feeds.php:1340
 #: classes/pref/filters.php:740
-#: classes/feeds.php:1118
-#: classes/feeds.php:1184
+#: classes/feeds.php:1120
+#: classes/feeds.php:1186
 #: js/tt-rss.js:174
 msgid "Search"
 msgstr "Keresés"
@@ -1382,8 +1418,8 @@ msgstr "Szerkesztés"
 
 #: classes/pref/users.php:397
 #: classes/pref/feeds.php:643
-#: classes/pref/feeds.php:880
-#: classes/pref/feeds.php:1838
+#: classes/pref/feeds.php:882
+#: classes/pref/feeds.php:1842
 #: classes/feeds.php:1074
 msgid "Login"
 msgstr "Belépés"
@@ -1462,251 +1498,251 @@ msgid "Feed Title"
 msgstr "Hírcsatorna címe"
 
 #: classes/pref/feeds.php:595
-#: classes/pref/feeds.php:828
-#: classes/pref/feeds.php:1824
+#: classes/pref/feeds.php:830
+#: classes/pref/feeds.php:1828
 #: classes/feeds.php:1050
 msgid "Place in category:"
 msgstr "Hozzáadás a következő kategóriához:"
 
 #: classes/pref/feeds.php:608
-#: classes/pref/feeds.php:842
+#: classes/pref/feeds.php:844
 #, fuzzy
 msgid "Language:"
 msgstr "Nyelv"
 
 #: classes/pref/feeds.php:615
-#: classes/pref/feeds.php:851
+#: classes/pref/feeds.php:853
 msgid "Update"
 msgstr "Frissítés"
 
 #: classes/pref/feeds.php:630
-#: classes/pref/feeds.php:867
+#: classes/pref/feeds.php:869
 msgid "Article purging:"
 msgstr "Régi hírek törlése:"
 
-#: classes/pref/feeds.php:656
-#: classes/pref/feeds.php:886
-#: classes/pref/feeds.php:1841
+#: classes/pref/feeds.php:658
+#: classes/pref/feeds.php:890
+#: classes/pref/feeds.php:1845
 #: classes/pref/prefs.php:245
-#: classes/feeds.php:1077
+#: classes/feeds.php:1078
 msgid "Password"
 msgstr "Jelszó"
 
-#: classes/pref/feeds.php:660
+#: classes/pref/feeds.php:662
 msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
 msgstr "<b>Megjegyzés:</b> ha a hírcsatorna megköveteli a hitelesítést (kivéve a Twitter csatornákat), ki kell tölteni a bejelentkezési információkat."
 
-#: classes/pref/feeds.php:679
-#: classes/pref/feeds.php:896
+#: classes/pref/feeds.php:681
+#: classes/pref/feeds.php:900
 msgid "Hide from Popular feeds"
 msgstr "Elrejtés a Népszerű hírcsatornákból"
 
-#: classes/pref/feeds.php:691
-#: classes/pref/feeds.php:902
+#: classes/pref/feeds.php:693
+#: classes/pref/feeds.php:906
 msgid "Include in e-mail digest"
 msgstr "Hozzáadás az e-mail összefoglalóhoz"
 
-#: classes/pref/feeds.php:704
-#: classes/pref/feeds.php:908
+#: classes/pref/feeds.php:706
+#: classes/pref/feeds.php:912
 msgid "Always display image attachments"
 msgstr "Kép csatolmányokat mindig jelenítse meg"
 
-#: classes/pref/feeds.php:717
-#: classes/pref/feeds.php:916
+#: classes/pref/feeds.php:719
+#: classes/pref/feeds.php:920
 msgid "Do not embed images"
 msgstr "Ne ágyazza be a képeket"
 
-#: classes/pref/feeds.php:730
-#: classes/pref/feeds.php:924
+#: classes/pref/feeds.php:732
+#: classes/pref/feeds.php:928
 msgid "Cache images locally"
 msgstr "Képek helyi tárolása"
 
-#: classes/pref/feeds.php:742
-#: classes/pref/feeds.php:930
+#: classes/pref/feeds.php:744
+#: classes/pref/feeds.php:934
 msgid "Mark updated articles as unread"
 msgstr "Frissült hírek megjelölése olvasatlanként"
 
-#: classes/pref/feeds.php:746
+#: classes/pref/feeds.php:748
 msgid "Icon"
 msgstr "Ikon"
 
-#: classes/pref/feeds.php:763
+#: classes/pref/feeds.php:765
 msgid "Replace"
 msgstr "Csere"
 
-#: classes/pref/feeds.php:770
+#: classes/pref/feeds.php:772
 #: classes/pref/prefs.php:706
 msgid "Plugins"
 msgstr "Beépülők"
 
-#: classes/pref/feeds.php:790
+#: classes/pref/feeds.php:792
 msgid "Resubscribe to push updates"
 msgstr "Újra feliratkozás a push frissítésekre"
 
-#: classes/pref/feeds.php:797
+#: classes/pref/feeds.php:799
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr "Visszaállítja a PubSubHubbub feliratkozást a push-engedélyezett hírcsatornákhoz."
 
-#: classes/pref/feeds.php:1203
-#: classes/pref/feeds.php:1256
+#: classes/pref/feeds.php:1207
+#: classes/pref/feeds.php:1260
 msgid "All done."
 msgstr "Kész."
 
-#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1315
 msgid "Feeds with errors"
 msgstr "Hibás hírcsatornák"
 
-#: classes/pref/feeds.php:1318
+#: classes/pref/feeds.php:1322
 msgid "Inactive feeds"
 msgstr "Inaktív hírcsatornák"
 
-#: classes/pref/feeds.php:1354
+#: classes/pref/feeds.php:1358
 msgid "Edit selected feeds"
 msgstr "Kijelölt hírcsatornák szerkeztése"
 
-#: classes/pref/feeds.php:1356
-#: classes/pref/feeds.php:1370
+#: classes/pref/feeds.php:1360
+#: classes/pref/feeds.php:1374
 #: classes/pref/filters.php:762
 msgid "Reset sort order"
 msgstr "Rendezési sorren visszaállítása"
 
-#: classes/pref/feeds.php:1358
+#: classes/pref/feeds.php:1362
 #: js/prefs.js:1737
 msgid "Batch subscribe"
 msgstr "Kötegelt feliratkozás"
 
-#: classes/pref/feeds.php:1365
+#: classes/pref/feeds.php:1369
 msgid "Categories"
 msgstr "Kategóriák"
 
-#: classes/pref/feeds.php:1368
+#: classes/pref/feeds.php:1372
 msgid "Add category"
 msgstr "Kategória hozzáadás"
 
-#: classes/pref/feeds.php:1372
+#: classes/pref/feeds.php:1376
 msgid "Remove selected"
 msgstr "Kijelölt eltávolítása"
 
-#: classes/pref/feeds.php:1383
+#: classes/pref/feeds.php:1387
 msgid "More actions..."
 msgstr "További műveletek..."
 
-#: classes/pref/feeds.php:1387
+#: classes/pref/feeds.php:1391
 msgid "Manual purge"
 msgstr "Kézi takarítás (régi hírek törlése)"
 
-#: classes/pref/feeds.php:1391
+#: classes/pref/feeds.php:1395
 msgid "Clear feed data"
 msgstr "Hírcsatorna-adatok törlése"
 
-#: classes/pref/feeds.php:1392
+#: classes/pref/feeds.php:1396
 #: classes/pref/filters.php:770
 msgid "Rescore articles"
 msgstr "Hírek újrapontszámozása"
 
-#: classes/pref/feeds.php:1444
+#: classes/pref/feeds.php:1448
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1446
+#: classes/pref/feeds.php:1450
 msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
 msgstr "Az OPML használatával hírcsatornákat, szűrőket, címkéket és beállításokat exportálhat, importálhat."
 
-#: classes/pref/feeds.php:1447
+#: classes/pref/feeds.php:1451
 msgid "Only main settings profile can be migrated using OPML."
 msgstr "Csak a fő beállításprofilt lehet OPML használatával költöztetni."
 
-#: classes/pref/feeds.php:1460
+#: classes/pref/feeds.php:1464
 msgid "Import my OPML"
 msgstr "OPML importálása"
 
-#: classes/pref/feeds.php:1466
+#: classes/pref/feeds.php:1470
 msgid "Filename:"
 msgstr "Fájlnév:"
 
-#: classes/pref/feeds.php:1468
+#: classes/pref/feeds.php:1472
 msgid "Include settings"
 msgstr "Beállításokkal együtt"
 
-#: classes/pref/feeds.php:1472
+#: classes/pref/feeds.php:1476
 msgid "Export OPML"
 msgstr "Exportálás OPML-be"
 
-#: classes/pref/feeds.php:1476
+#: classes/pref/feeds.php:1480
 msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
 msgstr "Az OPML nyilvánosságra hozható és bárki feliratkozhat rá, aki ismeri az alábbi URL-t."
 
-#: classes/pref/feeds.php:1480
+#: classes/pref/feeds.php:1484
 msgid "Public OPML URL"
 msgstr "Publikus OPML URL"
 
-#: classes/pref/feeds.php:1481
+#: classes/pref/feeds.php:1485
 msgid "Display published OPML URL"
 msgstr "Publikált OPML URL mejelenítése"
 
-#: classes/pref/feeds.php:1490
+#: classes/pref/feeds.php:1494
 msgid "Firefox integration"
 msgstr "Firefox integráció"
 
-#: classes/pref/feeds.php:1492
+#: classes/pref/feeds.php:1496
 msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
 msgstr "Ez a Tiny Tiny RSS oldal beállítható a Firefox böngésző alapértelmezett hírcsatorna-olvasójaként. Ehhez kattintson az alábbi linkre!"
 
-#: classes/pref/feeds.php:1499
+#: classes/pref/feeds.php:1503
 msgid "Click here to register this site as a feed reader."
 msgstr "Kattintson ide az oldal hírcsatorna-olvasóként való beállításához!"
 
-#: classes/pref/feeds.php:1507
+#: classes/pref/feeds.php:1511
 msgid "Published & shared articles / Generated feeds"
 msgstr "Publikált és megosztott hírek / Generált hírcsatornák"
 
-#: classes/pref/feeds.php:1509
+#: classes/pref/feeds.php:1513
 msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
 msgstr "A program a publikált hírekből egy publikus RSS hírcsatornát készít, amelyre bárki feliratkozhat, aki tudja a lenti címet."
 
-#: classes/pref/feeds.php:1516
+#: classes/pref/feeds.php:1520
 #: classes/feeds.php:54
 #: classes/feeds.php:134
 msgid "View as RSS"
 msgstr "Megtekintés RSS-ként"
 
-#: classes/pref/feeds.php:1517
+#: classes/pref/feeds.php:1521
 msgid "Display URL"
 msgstr "URL megjelenítés"
 
-#: classes/pref/feeds.php:1520
+#: classes/pref/feeds.php:1524
 msgid "Clear all generated URLs"
 msgstr "Minden generált URL törlése"
 
-#: classes/pref/feeds.php:1598
+#: classes/pref/feeds.php:1602
 msgid "These feeds have not been updated with new content for 3 months (oldest first):"
 msgstr "Ezek a hírcsatornák 3 hónapja nem frissültek új tartalommal (régebbiek elöl):"
 
-#: classes/pref/feeds.php:1632
-#: classes/pref/feeds.php:1696
+#: classes/pref/feeds.php:1636
+#: classes/pref/feeds.php:1700
 msgid "Click to edit feed"
 msgstr "Kattintson a hírcsatorna szerkesztéséhez"
 
-#: classes/pref/feeds.php:1650
-#: classes/pref/feeds.php:1716
+#: classes/pref/feeds.php:1654
+#: classes/pref/feeds.php:1720
 msgid "Unsubscribe from selected feeds"
 msgstr "Leiratkozás a kiválasztott hírcsatornákról"
 
-#: classes/pref/feeds.php:1821
+#: classes/pref/feeds.php:1825
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr "Soronként egy érvényes RSS hírcsatornát adjon meg"
 
-#: classes/pref/feeds.php:1830
+#: classes/pref/feeds.php:1834
 msgid "Feeds to subscribe, One per line"
 msgstr "Feliratkozás hírcsatornákra, soronként egy"
 
-#: classes/pref/feeds.php:1852
+#: classes/pref/feeds.php:1857
 msgid "Feeds require authentication."
 msgstr "Ez a hírcsatorna azonosítást igényel."
 
-#: classes/pref/feeds.php:1859
-#: classes/feeds.php:1092
-#: classes/feeds.php:1146
+#: classes/pref/feeds.php:1864
+#: classes/feeds.php:1094
+#: classes/feeds.php:1148
 msgid "Subscribe"
 msgstr "Feliratkozás"
 
@@ -1789,7 +1825,7 @@ msgid "on field"
 msgstr "...szerepeljen ebben a mezőben: "
 
 #: classes/pref/filters.php:962
-#: js/PrefFilterTree.js:61
+#: js/PrefFilterTree.js:64
 msgid "in"
 msgstr "itt"
 
@@ -2384,40 +2420,40 @@ msgstr "Hírcsatorna vagy weboldal URL"
 msgid "Available feeds"
 msgstr "Elérhető hírcsatornák"
 
-#: classes/feeds.php:1087
+#: classes/feeds.php:1089
 msgid "This feed requires authentication."
 msgstr "Ez a hírcsatorna azonosítást igényel."
 
-#: classes/feeds.php:1095
+#: classes/feeds.php:1097
 msgid "More feeds"
 msgstr "További hírcsatornák"
 
-#: classes/feeds.php:1122
+#: classes/feeds.php:1124
 msgid "Popular feeds"
 msgstr "Népszerű hírcsatornák"
 
-#: classes/feeds.php:1123
+#: classes/feeds.php:1125
 msgid "Feed archive"
 msgstr "Hírcsatorna archívum"
 
-#: classes/feeds.php:1126
+#: classes/feeds.php:1128
 msgid "limit:"
 msgstr "határ:"
 
-#: classes/feeds.php:1158
+#: classes/feeds.php:1160
 msgid "Look for"
 msgstr "Keresés"
 
-#: classes/feeds.php:1166
+#: classes/feeds.php:1168
 #, php-format
 msgid "in %s"
 msgstr ""
 
-#: classes/feeds.php:1171
+#: classes/feeds.php:1173
 msgid "Used for word stemming"
 msgstr ""
 
-#: classes/feeds.php:1180
+#: classes/feeds.php:1182
 #, fuzzy
 msgid "Search syntax"
 msgstr "Keresés"
@@ -2681,6 +2717,11 @@ msgstr "Az XML dokumentum nem tölthető be."
 msgid "Prepare data"
 msgstr "Adatok előkészítése"
 
+#: plugins/import_export/init.php:428
+#, fuzzy, php-format
+msgid "Upload failed with error code %d (%s)"
+msgstr "Feltöltés sikertelen. Hibakód: %d"
+
 #: plugins/import_export/init.php:454
 msgid "No file uploaded."
 msgstr "Nincs felöltött fájl."
@@ -2791,7 +2832,7 @@ msgstr "Kategória szerkesztése"
 msgid "Remove category"
 msgstr "Kategória eltávolítása"
 
-#: js/PrefFilterTree.js:64
+#: js/PrefFilterTree.js:67
 msgid "Inverse"
 msgstr "Fordított"
 
@@ -2843,7 +2884,7 @@ msgid "Subscription reset."
 msgstr "Feliratkozás visszaállítás."
 
 #: js/functions.js:1311
-#: js/tt-rss.js:682
+#: js/tt-rss.js:705
 #, perl-format
 msgid "Unsubscribe from %s?"
 msgstr "Leiratkozik innen: %s?"
@@ -3073,40 +3114,40 @@ msgstr "Minden hírt megjelöl olvasottként?"
 msgid "Marking all feeds as read..."
 msgstr "Minden hírcsatornát megjelölése olvasottként..."
 
-#: js/tt-rss.js:383
+#: js/tt-rss.js:404
 msgid "Please enable mail plugin first."
 msgstr "Először engedélyezze a mail beépülőt."
 
-#: js/tt-rss.js:431
+#: js/tt-rss.js:452
 #: js/functions.js:1643
-#: js/tt-rss.js:663
+#: js/tt-rss.js:686
 msgid "You can't edit this kind of feed."
 msgstr "Ezt a hírcsatornatípust nem szerkesztheted."
 
-#: js/tt-rss.js:502
+#: js/tt-rss.js:533
 msgid "Please enable embed_original plugin first."
 msgstr "Először engedélyezze az embed_original beépülőt."
 
-#: js/tt-rss.js:515
-#: js/tt-rss.js:713
+#: js/tt-rss.js:546
+#: js/tt-rss.js:736
 msgid "Widescreen is not available in combined mode."
 msgstr ""
 
-#: js/tt-rss.js:827
+#: js/tt-rss.js:850
 msgid "You can't rescore this kind of feed."
 msgstr "Ez a hírcsatorna típust nem lehet újraponszámozni."
 
-#: js/tt-rss.js:832
-#: js/tt-rss.js:676
+#: js/tt-rss.js:855
+#: js/tt-rss.js:699
 msgid "Please select some feed first."
 msgstr "Válasszon hírcsatorná(ka)t!"
 
-#: js/tt-rss.js:837
+#: js/tt-rss.js:860
 #, perl-format
 msgid "Rescore articles in %s?"
 msgstr "Újrapontszámozza %s híreit?"
 
-#: js/tt-rss.js:840
+#: js/tt-rss.js:863
 msgid "Rescoring articles..."
 msgstr "Hírek újrapontozása..."
 
@@ -3285,7 +3326,7 @@ msgstr "A személyes adatai el lettek mentve."
 msgid "Sorry, your browser does not support sandboxed iframes."
 msgstr "Elnézést, a böngészője nem támogatja sandboxed iframeket."
 
-#: plugins/shorten_expanded/init.js:37
+#: plugins/shorten_expanded/init.js:39
 msgid "Click to expand article"
 msgstr "Kattints a hír kibontásához"
 
@@ -3533,7 +3574,7 @@ msgstr "Generált URL-ek törölve."
 msgid "Label Editor"
 msgstr "Címke Szerkesztő"
 
-#: js/tt-rss.js:671
+#: js/tt-rss.js:694
 msgid "You can't unsubscribe from the category."
 msgstr "Ebből a kategóriából nem ."
 
diff --git a/locale/it_IT/LC_MESSAGES/messages.mo b/locale/it_IT/LC_MESSAGES/messages.mo
index a84755317..3d85cd620 100644
Binary files a/locale/it_IT/LC_MESSAGES/messages.mo and b/locale/it_IT/LC_MESSAGES/messages.mo differ
diff --git a/locale/it_IT/LC_MESSAGES/messages.po b/locale/it_IT/LC_MESSAGES/messages.po
index e0f85b69c..81de85ac5 100644
--- a/locale/it_IT/LC_MESSAGES/messages.po
+++ b/locale/it_IT/LC_MESSAGES/messages.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tiny Tiny RSS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 21:54+0100\n"
+"POT-Creation-Date: 2016-08-19 18:16+0300\n"
 "PO-Revision-Date: 2016-03-23 22:13+0100\n"
 "Last-Translator: dedioste <dedioste@gmail.com>\n"
 "Language-Team: \n"
@@ -52,39 +52,49 @@ msgstr "Vecchi di 3 mesi"
 msgid "Default interval"
 msgstr "Intervallo predefinito"
 
-#: backend.php:83 backend.php:93
+#: backend.php:83
+#: backend.php:93
 msgid "Disable updates"
 msgstr "Disattiva aggiornamenti"
 
-#: backend.php:84 backend.php:94
+#: backend.php:84
+#: backend.php:94
 msgid "15 minutes"
 msgstr "15 minuti"
 
-#: backend.php:85 backend.php:95
+#: backend.php:85
+#: backend.php:95
 msgid "30 minutes"
 msgstr "30 minuti"
 
-#: backend.php:86 backend.php:96
+#: backend.php:86
+#: backend.php:96
 msgid "Hourly"
 msgstr "Ogni ora"
 
-#: backend.php:87 backend.php:97
+#: backend.php:87
+#: backend.php:97
 msgid "4 hours"
 msgstr "4 ore"
 
-#: backend.php:88 backend.php:98
+#: backend.php:88
+#: backend.php:98
 msgid "12 hours"
 msgstr "12 ore"
 
-#: backend.php:89 backend.php:99
+#: backend.php:89
+#: backend.php:99
 msgid "Daily"
 msgstr "Ogni giorno"
 
-#: backend.php:90 backend.php:100
+#: backend.php:90
+#: backend.php:100
 msgid "Weekly"
 msgstr "Ogni settimana"
 
-#: backend.php:103 classes/pref/users.php:42 classes/pref/system.php:51
+#: backend.php:103
+#: classes/pref/users.php:42
+#: classes/pref/system.php:51
 msgid "User"
 msgstr "Utente"
 
@@ -97,20 +107,12 @@ msgid "Administrator"
 msgstr "Amministratore"
 
 #: errors.php:9
-msgid ""
-"This program requires XmlHttpRequest to function properly. Your browser "
-"doesn't seem to support it."
-msgstr ""
-"Questo programma richiede XmlHttpRequest per funzionare correttamente. Il "
-"browser non sembra supportarlo."
+msgid "This program requires XmlHttpRequest to function properly. Your browser doesn't seem to support it."
+msgstr "Questo programma richiede XmlHttpRequest per funzionare correttamente. Il browser non sembra supportarlo."
 
 #: errors.php:12
-msgid ""
-"This program requires cookies to function properly. Your browser doesn't "
-"seem to support them."
-msgstr ""
-"Questo programma richiede i cookie per funzionare correttamente. Il browser "
-"non sembra supportarli."
+msgid "This program requires cookies to function properly. Your browser doesn't seem to support them."
+msgstr "Questo programma richiede i cookie per funzionare correttamente. Il browser non sembra supportarli."
 
 #: errors.php:15
 msgid "Backend sanity check failed."
@@ -121,12 +123,8 @@ msgid "Frontend sanity check failed."
 msgstr "Controllo sul frontend fallito."
 
 #: errors.php:19
-msgid ""
-"Incorrect database schema version. &lt;a href='db-updater.php'&gt;Please "
-"update&lt;/a&gt;."
-msgstr ""
-"Versione dello schema del database non corretta. <a href='db-updater."
-"php'>Aggiornala</a>."
+msgid "Incorrect database schema version. &lt;a href='db-updater.php'&gt;Please update&lt;/a&gt;."
+msgstr "Versione dello schema del database non corretta. <a href='db-updater.php'>Aggiornala</a>."
 
 #: errors.php:21
 msgid "Request not authorized."
@@ -137,35 +135,24 @@ msgid "No operation to perform."
 msgstr "Nessuna operazione da eseguire."
 
 #: errors.php:25
-msgid ""
-"Could not display feed: query failed. Please check label match syntax or "
-"local configuration."
-msgstr ""
-"Impossibile visualizzare il notiziario. Controllare che l'etichetta "
-"corrisponda alla sintassi o la configurazione locale."
+msgid "Could not display feed: query failed. Please check label match syntax or local configuration."
+msgstr "Impossibile visualizzare il notiziario. Controllare che l'etichetta corrisponda alla sintassi o la configurazione locale."
 
 #: errors.php:27
 msgid "Denied. Your access level is insufficient to access this page."
-msgstr ""
-"Negato. Il livello di accesso non è sufficiente per accedere a questa pagina."
+msgstr "Negato. Il livello di accesso non è sufficiente per accedere a questa pagina."
 
 #: errors.php:29
 msgid "Configuration check failed"
 msgstr "Controllo della configurazione fallito"
 
 #: errors.php:31
-msgid ""
-"Your version of MySQL is not currently supported. Please see official site "
-"for more information."
-msgstr ""
-"Questa versione di MySQL non è attualmente supportata. Visitare il sito "
-"ufficiale per maggiori informazioni."
+msgid "Your version of MySQL is not currently supported. Please see official site for more information."
+msgstr "Questa versione di MySQL non è attualmente supportata. Visitare il sito ufficiale per maggiori informazioni."
 
 #: errors.php:35
 msgid "SQL escaping test failed, check your database and PHP configuration"
-msgstr ""
-"Test di sanitizzazione dell'SQL fallito, controllare il database e la "
-"configurazione di PHP"
+msgstr "Test di sanitizzazione dell'SQL fallito, controllare il database e la configurazione di PHP"
 
 #: errors.php:37
 msgid "Method not found"
@@ -175,201 +162,246 @@ msgstr "Metodo non trovato"
 msgid "Plugin not found"
 msgstr "Plugin non trovato"
 
-#: index.php:133 index.php:149 index.php:267 prefs.php:102
-#: classes/backend.php:5 classes/pref/labels.php:282
-#: classes/pref/feeds.php:1405 classes/pref/filters.php:779 js/feedlist.js:159
-#: js/functions.js:1293 js/functions.js:1427 js/functions.js:1739
-#: js/prefs.js:658 js/prefs.js:859 js/prefs.js:1765 js/prefs.js:1781
-#: js/prefs.js:1799 js/tt-rss.js:55 js/tt-rss.js:522 js/viewfeed.js:1298
-#: plugins/import_export/import_export.js:17 js/feedlist.js:484
-#: js/feedlist.js:534 js/functions.js:449 js/functions.js:772 js/prefs.js:1446
-#: js/prefs.js:1499 js/prefs.js:1539 js/prefs.js:1556 js/prefs.js:1572
-#: js/prefs.js:1592 js/tt-rss.js:539 js/viewfeed.js:830
+#: index.php:148
+#: index.php:164
+#: index.php:282
+#: prefs.php:117
+#: classes/backend.php:5
+#: classes/pref/labels.php:282
+#: classes/pref/feeds.php:1409
+#: classes/pref/filters.php:779
+#: js/feedlist.js:159
+#: js/functions.js:1293
+#: js/functions.js:1427
+#: js/functions.js:1739
+#: js/prefs.js:658
+#: js/prefs.js:859
+#: js/prefs.js:1765
+#: js/prefs.js:1781
+#: js/prefs.js:1799
+#: js/tt-rss.js:55
+#: js/tt-rss.js:553
+#: js/viewfeed.js:1298
+#: plugins/import_export/import_export.js:17
+#: js/feedlist.js:484
+#: js/feedlist.js:534
+#: js/functions.js:449
+#: js/functions.js:772
+#: js/prefs.js:1446
+#: js/prefs.js:1499
+#: js/prefs.js:1539
+#: js/prefs.js:1556
+#: js/prefs.js:1572
+#: js/prefs.js:1592
+#: js/tt-rss.js:570
+#: js/viewfeed.js:830
 msgid "Loading, please wait..."
 msgstr "Caricamento, attendere prego..."
 
-#: index.php:167
+#: index.php:182
 msgid "Collapse feedlist"
 msgstr "Riduci elenco notiziari"
 
-#: index.php:170
+#: index.php:185
 msgid "Show articles"
 msgstr "Mostra articoli"
 
-#: index.php:173
+#: index.php:188
 msgid "Adaptive"
 msgstr "Adattivo"
 
-#: index.php:174
+#: index.php:189
 msgid "All Articles"
 msgstr "Tutti gli articoli"
 
-#: index.php:175 include/functions2.php:101 classes/feeds.php:104
+#: index.php:190
+#: include/functions2.php:102
+#: classes/feeds.php:104
 msgid "Starred"
 msgstr "Con stella"
 
-#: index.php:176 include/functions2.php:102 classes/feeds.php:105
+#: index.php:191
+#: include/functions2.php:103
+#: classes/feeds.php:105
 msgid "Published"
 msgstr "Pubblicati"
 
-#: index.php:177 classes/feeds.php:91 classes/feeds.php:103
+#: index.php:192
+#: classes/feeds.php:91
+#: classes/feeds.php:103
 msgid "Unread"
 msgstr "Non letti"
 
-#: index.php:178
+#: index.php:193
 msgid "With Note"
 msgstr "Annotati"
 
-#: index.php:179
+#: index.php:194
 msgid "Ignore Scoring"
 msgstr "Ignora punteggio"
 
-#: index.php:182
+#: index.php:197
 msgid "Sort articles"
 msgstr "Ordina articoli"
 
-#: index.php:185
+#: index.php:200
 msgid "Default"
 msgstr "Predefinito"
 
-#: index.php:186
+#: index.php:201
 msgid "Newest first"
 msgstr "Prima i più nuovi"
 
-#: index.php:187
+#: index.php:202
 msgid "Oldest first"
 msgstr "Prima i più vecchi"
 
-#: index.php:188
+#: index.php:203
 msgid "Title"
 msgstr "Titolo"
 
-#: index.php:192 index.php:233 include/functions2.php:90 classes/feeds.php:109
-#: js/FeedTree.js:132 js/FeedTree.js:160
+#: index.php:207
+#: index.php:248
+#: include/functions2.php:90
+#: classes/feeds.php:109
+#: js/FeedTree.js:132
+#: js/FeedTree.js:160
 msgid "Mark as read"
 msgstr "Segna come letto"
 
-#: index.php:195
+#: index.php:210
 msgid "Older than one day"
 msgstr "Più vecchi di un giorno"
 
-#: index.php:198
+#: index.php:213
 msgid "Older than one week"
 msgstr "Più vecchi di una settimana"
 
-#: index.php:201
+#: index.php:216
 msgid "Older than two weeks"
 msgstr "Più vecchi di due settimane"
 
-#: index.php:217
+#: index.php:232
 msgid "Communication problem with server."
 msgstr "Problema di comunicazione con il server."
 
-#: index.php:223
+#: index.php:238
 msgid "Actions..."
 msgstr "Azioni..."
 
-#: index.php:225
+#: index.php:240
 msgid "Preferences..."
 msgstr "Preferenze..."
 
-#: index.php:226
+#: index.php:241
 msgid "Search..."
 msgstr "Cerca..."
 
-#: index.php:227
+#: index.php:242
 msgid "Feed actions:"
 msgstr "Azioni sul notiziario:"
 
-#: index.php:228 classes/handler/public.php:672
+#: index.php:243
+#: classes/handler/public.php:672
 msgid "Subscribe to feed..."
 msgstr "Sottoscrivi il notiziario..."
 
-#: index.php:229
+#: index.php:244
 msgid "Edit this feed..."
 msgstr "Modifica questo notiziario..."
 
-#: index.php:230
+#: index.php:245
 msgid "Rescore feed"
 msgstr "Cambia punteggio notiziario"
 
-#: index.php:231 classes/pref/feeds.php:783 classes/pref/feeds.php:1360
+#: index.php:246
+#: classes/pref/feeds.php:785
+#: classes/pref/feeds.php:1364
 #: js/PrefFeedTree.js:74
 msgid "Unsubscribe"
 msgstr "Annulla sottoscrizione"
 
-#: index.php:232
+#: index.php:247
 msgid "All feeds:"
 msgstr "Tutti i notiziari:"
 
-#: index.php:234
+#: index.php:249
 msgid "(Un)hide read feeds"
 msgstr "Visualizza/Nascondi notiziari letti"
 
-#: index.php:235
+#: index.php:250
 msgid "Other actions:"
 msgstr "Altre azioni:"
 
-#: index.php:236 include/functions2.php:76
+#: index.php:251
+#: include/functions2.php:76
 msgid "Toggle widescreen mode"
 msgstr "Modalità widescreen"
 
-#: index.php:237
+#: index.php:252
 msgid "Create label..."
 msgstr "Crea etichetta..."
 
-#: index.php:238
+#: index.php:253
 msgid "Create filter..."
 msgstr "Crea filtro..."
 
-#: index.php:239
+#: index.php:254
 msgid "Keyboard shortcuts help"
 msgstr "Aiuto scorciatoie da tastiera"
 
-#: index.php:248
+#: index.php:263
 msgid "Logout"
 msgstr "Esci"
 
-#: index.php:254
+#: index.php:269
 msgid "Updates are available from Git."
 msgstr "Gli aggiornamenti sono disponibili via Git."
 
-#: prefs.php:33 prefs.php:120 include/functions2.php:104
+#: prefs.php:33
+#: prefs.php:135
+#: include/functions2.php:105
 #: classes/pref/prefs.php:435
 msgid "Preferences"
 msgstr "Preferenze"
 
-#: prefs.php:111
+#: prefs.php:126
 msgid "Keyboard shortcuts"
 msgstr "Scorciatoie da tastiera"
 
-#: prefs.php:112
+#: prefs.php:127
 msgid "Exit preferences"
 msgstr "Esci dalle preferenze"
 
-#: prefs.php:123 classes/pref/feeds.php:112 classes/pref/feeds.php:1300
-#: classes/pref/feeds.php:1349
+#: prefs.php:138
+#: classes/pref/feeds.php:112
+#: classes/pref/feeds.php:1304
+#: classes/pref/feeds.php:1353
 msgid "Feeds"
 msgstr "Notiziari"
 
-#: prefs.php:126 classes/pref/filters.php:248
+#: prefs.php:141
+#: classes/pref/filters.php:248
 msgid "Filters"
 msgstr "Filtri"
 
-#: prefs.php:129 include/functions.php:1256 include/functions.php:1909
+#: prefs.php:144
+#: include/functions.php:1287
+#: include/functions.php:1940
 #: classes/pref/labels.php:90
 msgid "Labels"
 msgstr "Etichette"
 
-#: prefs.php:133
+#: prefs.php:148
 msgid "Users"
 msgstr "Utenti"
 
-#: prefs.php:136
+#: prefs.php:151
 msgid "System"
 msgstr "Sistema"
 
-#: register.php:187 include/login_form.php:252
+#: register.php:187
+#: include/login_form.php:252
 msgid "Create new account"
 msgstr "Crea un nuovo account"
 
@@ -377,24 +409,27 @@ msgstr "Crea un nuovo account"
 msgid "New user registrations are administratively disabled."
 msgstr "La registrazione di nuovi utenti è disattivata dall'amministratore."
 
-#: register.php:197 register.php:242 register.php:255 register.php:270
-#: register.php:289 register.php:337 register.php:347 register.php:359
-#: classes/handler/public.php:742 classes/handler/public.php:813
-#: classes/handler/public.php:911 classes/handler/public.php:990
-#: classes/handler/public.php:1004 classes/handler/public.php:1011
+#: register.php:197
+#: register.php:242
+#: register.php:255
+#: register.php:270
+#: register.php:289
+#: register.php:337
+#: register.php:347
+#: register.php:359
+#: classes/handler/public.php:742
+#: classes/handler/public.php:813
+#: classes/handler/public.php:911
+#: classes/handler/public.php:990
+#: classes/handler/public.php:1004
+#: classes/handler/public.php:1011
 #: classes/handler/public.php:1036
 msgid "Return to Tiny Tiny RSS"
 msgstr "Ritorna a Tiny Tiny RSS"
 
 #: register.php:218
-msgid ""
-"Your temporary password will be sent to the specified email. Accounts, which "
-"were not logged in once, are erased automatically 24 hours after temporary "
-"password is sent."
-msgstr ""
-"La password temporanea verrà inviata all'email specificata. Gli utenti che "
-"non eseguono l'accesso almeno una volta vengono cancellati automaticamente "
-"24 ore dopo che la password temporanea è stata inviata."
+msgid "Your temporary password will be sent to the specified email. Accounts, which were not logged in once, are erased automatically 24 hours after temporary password is sent."
+msgstr "La password temporanea verrà inviata all'email specificata. Gli utenti che non eseguono l'accesso almeno una volta vengono cancellati automaticamente 24 ore dopo che la password temporanea è stata inviata."
 
 #: register.php:224
 msgid "Desired login:"
@@ -404,11 +439,13 @@ msgstr "Nome utente desiderato:"
 msgid "Check availability"
 msgstr "Controlla disponibilità"
 
-#: register.php:229 classes/handler/public.php:829
+#: register.php:229
+#: classes/handler/public.php:829
 msgid "Email:"
 msgstr "Email:"
 
-#: register.php:232 classes/handler/public.php:834
+#: register.php:232
+#: classes/handler/public.php:834
 msgid "How much is two plus two:"
 msgstr "Quanto fa due più due:"
 
@@ -440,9 +477,13 @@ msgstr "La registrazione di nuovi utenti è attualmente chiusa."
 msgid "Tiny Tiny RSS data update script."
 msgstr "Script di aggiornamento dei dati di Tiny Tiny RSS."
 
-#: include/digest.php:109 include/functions.php:1265
-#: include/functions.php:1810 include/functions.php:1895
-#: include/functions.php:1917 classes/opml.php:421 classes/pref/feeds.php:228
+#: include/digest.php:109
+#: include/functions.php:1296
+#: include/functions.php:1841
+#: include/functions.php:1926
+#: include/functions.php:1948
+#: classes/opml.php:421
+#: classes/pref/feeds.php:228
 msgid "Uncategorized"
 msgstr "Senza categoria"
 
@@ -457,41 +498,44 @@ msgstr[1] "%d articoli archiviati"
 msgid "No feeds found."
 msgstr "Nessun notiziario trovato."
 
-#: include/functions.php:958
+#: include/functions.php:989
 #, php-format
 msgid "%d min"
 msgstr "%d min"
 
-#: include/functions.php:1254 include/functions.php:1907
+#: include/functions.php:1285
+#: include/functions.php:1938
 msgid "Special"
 msgstr "Speciale"
 
-#: include/functions.php:1758 classes/pref/filters.php:229
+#: include/functions.php:1789
+#: classes/pref/filters.php:229
 #: classes/pref/filters.php:507
 msgid "All feeds"
 msgstr "Tutti i notiziari"
 
-#: include/functions.php:1962
+#: include/functions.php:1993
 msgid "Starred articles"
 msgstr "Articoli con stella"
 
-#: include/functions.php:1964
+#: include/functions.php:1995
 msgid "Published articles"
 msgstr "Articoli pubblicati"
 
-#: include/functions.php:1966
+#: include/functions.php:1997
 msgid "Fresh articles"
 msgstr "Articoli nuovi"
 
-#: include/functions.php:1968 include/functions2.php:99
+#: include/functions.php:1999
+#: include/functions2.php:100
 msgid "All articles"
 msgstr "Tutti gli articoli"
 
-#: include/functions.php:1970
+#: include/functions.php:2001
 msgid "Archived articles"
 msgstr "Articoli archiviati"
 
-#: include/functions.php:1972
+#: include/functions.php:2003
 msgid "Recently read"
 msgstr "Letti di recente"
 
@@ -539,15 +583,18 @@ msgstr "Mostra il campo di ricerca"
 msgid "Article"
 msgstr "Articolo"
 
-#: include/functions2.php:63 js/viewfeed.js:1883
+#: include/functions2.php:63
+#: js/viewfeed.js:1883
 msgid "Toggle starred"
 msgstr "Inverti articoli con stella"
 
-#: include/functions2.php:64 js/viewfeed.js:1894
+#: include/functions2.php:64
+#: js/viewfeed.js:1894
 msgid "Toggle published"
 msgstr "Inverti articoli pubblicati"
 
-#: include/functions2.php:65 js/viewfeed.js:1872
+#: include/functions2.php:65
+#: js/viewfeed.js:1872
 msgid "Toggle unread"
 msgstr "Inverti articoli non letti"
 
@@ -559,11 +606,13 @@ msgstr "Modifica etichette"
 msgid "Open in new window"
 msgstr "Apri in una nuova finestra"
 
-#: include/functions2.php:68 js/viewfeed.js:1913
+#: include/functions2.php:68
+#: js/viewfeed.js:1913
 msgid "Mark below as read"
 msgstr "Segna gli articoli sotto come letti"
 
-#: include/functions2.php:69 js/viewfeed.js:1907
+#: include/functions2.php:69
+#: js/viewfeed.js:1907
 msgid "Mark above as read"
 msgstr "Segna gli articoli sopra come letti"
 
@@ -591,7 +640,8 @@ msgstr "Chiudi / collassa articolo"
 msgid "Toggle article expansion (combined mode)"
 msgstr "Inverti l'espansione degli articoli (modalità combinata)"
 
-#: include/functions2.php:77 plugins/embed_original/init.php:31
+#: include/functions2.php:77
+#: plugins/embed_original/init.php:31
 msgid "Toggle embed original"
 msgstr "Inserire gli originali"
 
@@ -623,8 +673,9 @@ msgstr "Inverti la selezione"
 msgid "Deselect everything"
 msgstr "Deseleziona tutto"
 
-#: include/functions2.php:85 classes/pref/feeds.php:555
-#: classes/pref/feeds.php:821
+#: include/functions2.php:85
+#: classes/pref/feeds.php:555
+#: classes/pref/feeds.php:823
 msgid "Feed"
 msgstr "Notiziario"
 
@@ -636,11 +687,14 @@ msgstr "Aggiorna notiziario attivo"
 msgid "Un/hide read feeds"
 msgstr "Visualizza/Nascondi notiziari letti"
 
-#: include/functions2.php:88 classes/pref/feeds.php:1352
+#: include/functions2.php:88
+#: classes/pref/feeds.php:1356
 msgid "Subscribe to feed"
 msgstr "Sottoscrivi il notiziario"
 
-#: include/functions2.php:89 js/FeedTree.js:139 js/PrefFeedTree.js:68
+#: include/functions2.php:89
+#: js/FeedTree.js:139
+#: js/PrefFeedTree.js:68
 #: js/viewfeed.js:2080
 msgid "Edit feed"
 msgstr "Modifica notiziario"
@@ -650,125 +704,184 @@ msgid "Reverse headlines"
 msgstr "Invertire l'ordine dei sommari"
 
 #: include/functions2.php:92
+msgid "Toggle headline grouping"
+msgstr ""
+
+#: include/functions2.php:93
 msgid "Debug feed update"
 msgstr "Debug aggiornamenti dei feed"
 
-#: include/functions2.php:93
+#: include/functions2.php:94
 msgid "Debug viewfeed()"
 msgstr "Debug vista del feed (viewfeed())"
 
-#: include/functions2.php:94 js/FeedTree.js:182
+#: include/functions2.php:95
+#: js/FeedTree.js:182
 msgid "Mark all feeds as read"
 msgstr "Segna tutti i notiziari come letti"
 
-#: include/functions2.php:95
+#: include/functions2.php:96
 msgid "Un/collapse current category"
 msgstr "Contrai la categoria corrente"
 
-#: include/functions2.php:96
+#: include/functions2.php:97
 msgid "Toggle combined mode"
 msgstr "Attiva modalità combinata"
 
-#: include/functions2.php:97
+#: include/functions2.php:98
 msgid "Toggle auto expand in combined mode"
 msgstr "Attiva espansione automatica in modalità combinata"
 
-#: include/functions2.php:98
+#: include/functions2.php:99
 msgid "Go to"
 msgstr "Vai a"
 
-#: include/functions2.php:100
+#: include/functions2.php:101
 msgid "Fresh"
 msgstr "Recenti"
 
-#: include/functions2.php:103 js/tt-rss.js:466 js/tt-rss.js:650
+#: include/functions2.php:104
+#: js/tt-rss.js:497
+#: js/tt-rss.js:673
 msgid "Tag cloud"
 msgstr "Nuvola etichette"
 
-#: include/functions2.php:105
+#: include/functions2.php:106
 msgid "Other"
 msgstr "Altri"
 
-#: include/functions2.php:106 classes/pref/labels.php:267
+#: include/functions2.php:107
+#: classes/pref/labels.php:267
 msgid "Create label"
 msgstr "Crea etichetta"
 
-#: include/functions2.php:107 classes/pref/filters.php:753
+#: include/functions2.php:108
+#: classes/pref/filters.php:753
 msgid "Create filter"
 msgstr "Crea filtro"
 
-#: include/functions2.php:108
+#: include/functions2.php:109
 msgid "Un/collapse sidebar"
 msgstr "Espandi/Riduci la barra laterale"
 
-#: include/functions2.php:109
+#: include/functions2.php:110
 msgid "Show help dialog"
 msgstr "Mostra la sezione di aiuto"
 
-#: include/functions2.php:663
+#: include/functions2.php:665
 #, php-format
 msgid "Search results: %s"
 msgstr "Risultati di ricerca: %s"
 
-#: include/functions2.php:1317 classes/feeds.php:749
+#: include/functions2.php:1330
+#: classes/feeds.php:749
 msgid "comment"
 msgid_plural "comments"
 msgstr[0] "commento"
 msgstr[1] "commenti"
 
-#: include/functions2.php:1321 classes/feeds.php:753
+#: include/functions2.php:1334
+#: classes/feeds.php:753
 msgid "comments"
 msgstr "commenti"
 
-#: include/functions2.php:1347
+#: include/functions2.php:1360
 msgid " - "
 msgstr " - "
 
-#: include/functions2.php:1380 include/functions2.php:1631
+#: include/functions2.php:1393
+#: include/functions2.php:1644
 #: classes/article.php:311
 msgid "no tags"
 msgstr "nessuna etichetta"
 
-#: include/functions2.php:1390 classes/feeds.php:735
+#: include/functions2.php:1403
+#: classes/feeds.php:735
 msgid "Edit tags for this article"
 msgstr "Modifica le etichette per questo articolo"
 
-#: include/functions2.php:1422 classes/feeds.php:682
+#: include/functions2.php:1435
+#: classes/feeds.php:682
 msgid "Originally from:"
 msgstr "Originariamente da:"
 
-#: include/functions2.php:1435 classes/pref/feeds.php:574
+#: include/functions2.php:1448
+#: classes/pref/feeds.php:574
 #: classes/feeds.php:695
 msgid "Feed URL"
 msgstr "URL del notiziario"
 
-#: include/functions2.php:1472 classes/backend.php:105 classes/dlg.php:37
-#: classes/dlg.php:60 classes/dlg.php:93 classes/dlg.php:159
-#: classes/dlg.php:186 classes/pref/feeds.php:1654 classes/pref/feeds.php:1720
-#: classes/pref/filters.php:204 classes/pref/prefs.php:1105
-#: plugins/af_psql_trgm/init.php:102 plugins/import_export/init.php:415
-#: plugins/import_export/init.php:460 plugins/share/init.php:121
+#: include/functions2.php:1485
+#: classes/backend.php:105
+#: classes/dlg.php:37
+#: classes/dlg.php:60
+#: classes/dlg.php:93
+#: classes/dlg.php:159
+#: classes/dlg.php:186
+#: classes/pref/feeds.php:1658
+#: classes/pref/feeds.php:1724
+#: classes/pref/filters.php:204
+#: classes/pref/prefs.php:1105
+#: plugins/af_psql_trgm/init.php:102
+#: plugins/import_export/init.php:415
+#: plugins/import_export/init.php:461
+#: plugins/share/init.php:121
 msgid "Close this window"
 msgstr "Chiudi questa finestra"
 
-#: include/functions2.php:1669
+#: include/functions2.php:1682
 msgid "(edit note)"
 msgstr "(modifica nota)"
 
-#: include/functions2.php:1924
+#: include/functions2.php:1937
 msgid "unknown type"
 msgstr "tipo sconosciuto"
 
-#: include/functions2.php:2001
+#: include/functions2.php:2014
 msgid "Attachments"
 msgstr "Allegati"
 
-#: include/login_form.php:197 classes/handler/public.php:569
+#: include/functions2.php:2456
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: include/functions2.php:2457
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr ""
+
+#: include/functions2.php:2458
+msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
+msgstr ""
+
+#: include/functions2.php:2459
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: include/functions2.php:2460
+#, fuzzy
+msgid "No file was uploaded"
+msgstr "Nessun file caricato."
+
+#: include/functions2.php:2461
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: include/functions2.php:2462
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: include/functions2.php:2463
+msgid "A PHP extension stopped the file upload."
+msgstr ""
+
+#: include/login_form.php:197
+#: classes/handler/public.php:569
 #: classes/handler/public.php:824
 msgid "Login:"
 msgstr "Nome utente:"
 
-#: include/login_form.php:207 classes/handler/public.php:572
+#: include/login_form.php:207
+#: classes/handler/public.php:572
 msgid "Password:"
 msgstr "Password:"
 
@@ -780,8 +893,10 @@ msgstr "Ho dimenticato la mia password"
 msgid "Profile:"
 msgstr "Profilo:"
 
-#: include/login_form.php:223 classes/handler/public.php:311
-#: classes/pref/prefs.php:1043 classes/rpc.php:63
+#: include/login_form.php:223
+#: classes/handler/public.php:311
+#: classes/pref/prefs.php:1043
+#: classes/rpc.php:63
 msgid "Default profile"
 msgstr "Profilo predefinito"
 
@@ -797,7 +912,8 @@ msgstr "Non mostra le immagini negli articoli, riduce i refresh automatici."
 msgid "Remember me"
 msgstr "Ricordami"
 
-#: include/login_form.php:249 classes/handler/public.php:577
+#: include/login_form.php:249
+#: classes/handler/public.php:577
 msgid "Log in"
 msgstr "Accedi"
 
@@ -821,30 +937,48 @@ msgstr "Articolo non trovato."
 msgid "Tags for this article (separated by commas):"
 msgstr "Etichette per questo articolo (separate da virgole):"
 
-#: classes/article.php:222 classes/pref/labels.php:79
-#: classes/pref/users.php:98 classes/pref/feeds.php:799
-#: classes/pref/feeds.php:939 classes/pref/filters.php:485
-#: classes/pref/prefs.php:989 plugins/instances/init.php:245
-#: plugins/nsfw/init.php:85 plugins/note/init.php:51
-#: plugins/af_readability/init.php:71 plugins/af_redditimgur/init.php:68
-#: plugins/af_psql_trgm/init.php:184 plugins/mail/init.php:64
+#: classes/article.php:222
+#: classes/pref/labels.php:79
+#: classes/pref/users.php:98
+#: classes/pref/feeds.php:801
+#: classes/pref/feeds.php:943
+#: classes/pref/filters.php:485
+#: classes/pref/prefs.php:989
+#: plugins/instances/init.php:245
+#: plugins/nsfw/init.php:85
+#: plugins/note/init.php:51
+#: plugins/af_readability/init.php:71
+#: plugins/af_redditimgur/init.php:68
+#: plugins/af_psql_trgm/init.php:184
+#: plugins/mail/init.php:64
 msgid "Save"
 msgstr "Salva"
 
-#: classes/article.php:224 classes/handler/public.php:546
-#: classes/handler/public.php:580 classes/pref/labels.php:81
-#: classes/pref/users.php:100 classes/pref/feeds.php:800
-#: classes/pref/feeds.php:942 classes/pref/feeds.php:1860
-#: classes/pref/filters.php:488 classes/pref/filters.php:902
-#: classes/pref/filters.php:983 classes/pref/filters.php:1076
-#: classes/pref/prefs.php:991 classes/feeds.php:1098 classes/feeds.php:1148
-#: classes/feeds.php:1185 plugins/instances/init.php:248
-#: plugins/instances/init.php:436 plugins/note/init.php:53
+#: classes/article.php:224
+#: classes/handler/public.php:546
+#: classes/handler/public.php:580
+#: classes/pref/labels.php:81
+#: classes/pref/users.php:100
+#: classes/pref/feeds.php:802
+#: classes/pref/feeds.php:946
+#: classes/pref/feeds.php:1865
+#: classes/pref/filters.php:488
+#: classes/pref/filters.php:902
+#: classes/pref/filters.php:983
+#: classes/pref/filters.php:1076
+#: classes/pref/prefs.php:991
+#: classes/feeds.php:1100
+#: classes/feeds.php:1150
+#: classes/feeds.php:1187
+#: plugins/instances/init.php:248
+#: plugins/instances/init.php:436
+#: plugins/note/init.php:53
 #: plugins/mail/init.php:172
 msgid "Cancel"
 msgstr "Annulla"
 
-#: classes/opml.php:28 classes/opml.php:33
+#: classes/opml.php:28
+#: classes/opml.php:33
 msgid "OPML Utility"
 msgstr "Utility OPML"
 
@@ -890,16 +1024,18 @@ msgstr "Aggiungendo filtro..."
 msgid "Processing category: %s"
 msgstr "Elaborando categoria: %s"
 
-#: classes/opml.php:470 plugins/import_export/init.php:428
+#: classes/opml.php:470
 #, php-format
 msgid "Upload failed with error code %d"
 msgstr "Caricamento fallito con codice errore %d"
 
-#: classes/opml.php:484 plugins/import_export/init.php:442
+#: classes/opml.php:484
+#: plugins/import_export/init.php:442
 msgid "Unable to move uploaded file."
 msgstr "Non è possibile spostare il file caricato."
 
-#: classes/opml.php:488 plugins/import_export/init.php:446
+#: classes/opml.php:488
+#: plugins/import_export/init.php:446
 msgid "Error: please upload OPML file."
 msgstr "Errore: caricare il file OPML."
 
@@ -913,9 +1049,7 @@ msgstr "Errore durante l'analisi del documento."
 
 #: classes/backend.php:33
 msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
-msgstr ""
-"Nel wiki di Tiny Tiny RSS sono disponibili altri suggerimenti per "
-"l'interfaccia."
+msgstr "Nel wiki di Tiny Tiny RSS sono disponibili altri suggerimenti per l'interfaccia."
 
 #: classes/backend.php:38
 msgid "Keyboard Shortcuts"
@@ -934,52 +1068,38 @@ msgid "Help topic not found."
 msgstr "Argomento dell'aiuto non trovato."
 
 #: classes/dlg.php:17
-msgid ""
-"If you have imported labels and/or filters, you might need to reload "
-"preferences to see your new data."
-msgstr ""
-"Se sono stati importati etichette e/o filtri, ricaricare le preferenze per "
-"visualizzare i nuovi dati."
+msgid "If you have imported labels and/or filters, you might need to reload preferences to see your new data."
+msgstr "Se sono stati importati etichette e/o filtri, ricaricare le preferenze per visualizzare i nuovi dati."
 
 #: classes/dlg.php:48
 msgid "Your Public OPML URL is:"
 msgstr "L'URL OPML pubblico è:"
 
-#: classes/dlg.php:57 classes/dlg.php:183 plugins/share/init.php:118
+#: classes/dlg.php:57
+#: classes/dlg.php:183
+#: plugins/share/init.php:118
 msgid "Generate new URL"
 msgstr "Genera nuovo URL"
 
 #: classes/dlg.php:71
-msgid ""
-"Update daemon is enabled in configuration, but daemon process is not "
-"running, which prevents all feeds from updating. Please start the daemon "
-"process or contact instance owner."
-msgstr ""
-"Il demone per l'aggiornamento è attivato nella configurazione, ma il "
-"processo del demone non è in esecuzione; questo impedisce l'aggiornamento di "
-"tutti i notiziari. Avviare il processo del demone o contattare il "
-"proprietario dell'istanza."
+msgid "Update daemon is enabled in configuration, but daemon process is not running, which prevents all feeds from updating. Please start the daemon process or contact instance owner."
+msgstr "Il demone per l'aggiornamento è attivato nella configurazione, ma il processo del demone non è in esecuzione; questo impedisce l'aggiornamento di tutti i notiziari. Avviare il processo del demone o contattare il proprietario dell'istanza."
 
-#: classes/dlg.php:75 classes/dlg.php:84
+#: classes/dlg.php:75
+#: classes/dlg.php:84
 msgid "Last update:"
 msgstr "Ultimo aggiornamento:"
 
 #: classes/dlg.php:80
-msgid ""
-"Update daemon is taking too long to perform a feed update. This could "
-"indicate a problem like crash or a hang. Please check the daemon process or "
-"contact instance owner."
-msgstr ""
-"Il demone di aggiornamento sta impiegando troppo tempo a eseguire "
-"l'aggiornamento del notiziario. Questo potrebbe indicare un problema come un "
-"crash o uno stallo. Controllare il processo del demone o contattare il "
-"proprietario dell'istanza."
+msgid "Update daemon is taking too long to perform a feed update. This could indicate a problem like crash or a hang. Please check the daemon process or contact instance owner."
+msgstr "Il demone di aggiornamento sta impiegando troppo tempo a eseguire l'aggiornamento del notiziario. Questo potrebbe indicare un problema come un crash o uno stallo. Controllare il processo del demone o contattare il proprietario dell'istanza."
 
 #: classes/dlg.php:174
 msgid "You can view this feed as RSS using the following URL:"
 msgstr "È possibile vedere questo notiziario come RSS usando il seguente URL:"
 
-#: classes/handler/public.php:510 plugins/bookmarklets/init.php:40
+#: classes/handler/public.php:510
+#: plugins/bookmarklets/init.php:40
 msgid "Share with Tiny Tiny RSS"
 msgstr "Condividi con Tiny Tiny RSS"
 
@@ -987,8 +1107,10 @@ msgstr "Condividi con Tiny Tiny RSS"
 msgid "Title:"
 msgstr "Titolo:"
 
-#: classes/handler/public.php:520 classes/pref/feeds.php:572
-#: plugins/instances/init.php:212 plugins/instances/init.php:401
+#: classes/handler/public.php:520
+#: classes/pref/feeds.php:572
+#: plugins/instances/init.php:212
+#: plugins/instances/init.php:401
 msgid "URL:"
 msgstr "URL:"
 
@@ -1043,9 +1165,7 @@ msgstr "Trovati più URL di notiziari."
 #: classes/handler/public.php:694
 #, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
-msgstr ""
-"Impossibile sottoscrivere <b>%s</b>.<br>Impossibile scaricare l'URL del "
-"notiziario."
+msgstr "Impossibile sottoscrivere <b>%s</b>.<br>Impossibile scaricare l'URL del notiziario."
 
 #: classes/handler/public.php:712
 msgid "Subscribe to selected feed"
@@ -1060,14 +1180,11 @@ msgid "Password recovery"
 msgstr "Recupera password"
 
 #: classes/handler/public.php:817
-msgid ""
-"You will need to provide valid account name and email. A password reset link "
-"will be sent to your email address."
-msgstr ""
-"Dovrai fornire un nome utente e una email collegata validi. Verrà spedito un "
-"link per resettare la password."
+msgid "You will need to provide valid account name and email. A password reset link will be sent to your email address."
+msgstr "Dovrai fornire un nome utente e una email collegata validi. Verrà spedito un link per resettare la password."
 
-#: classes/handler/public.php:839 classes/pref/users.php:350
+#: classes/handler/public.php:839
+#: classes/pref/users.php:350
 msgid "Reset password"
 msgstr "Reimposta password"
 
@@ -1075,7 +1192,8 @@ msgstr "Reimposta password"
 msgid "Some of the required form parameters are missing or incorrect."
 msgstr "Alcuni dei parametri richiesti sono mancanti o scorretti."
 
-#: classes/handler/public.php:853 classes/handler/public.php:919
+#: classes/handler/public.php:853
+#: classes/handler/public.php:919
 msgid "Go back"
 msgstr "Torna indietro"
 
@@ -1099,7 +1217,8 @@ msgstr "Aggiornatore database"
 msgid "Perform updates"
 msgstr "Effettua gli aggiornamenti"
 
-#: classes/pref/labels.php:22 classes/pref/filters.php:348
+#: classes/pref/labels.php:22
+#: classes/pref/filters.php:348
 #: classes/pref/filters.php:823
 msgid "Caption"
 msgstr "Etichetta"
@@ -1121,38 +1240,59 @@ msgstr "Sfondo:"
 msgid "Created label <b>%s</b>"
 msgstr "Etichetta <b>%s</b> creata"
 
-#: classes/pref/labels.php:258 classes/pref/users.php:334
-#: classes/pref/feeds.php:1340 classes/pref/feeds.php:1602
-#: classes/pref/feeds.php:1666 classes/pref/filters.php:359
-#: classes/pref/filters.php:407 classes/pref/filters.php:744
-#: classes/pref/filters.php:832 classes/pref/filters.php:859
-#: classes/pref/prefs.php:1000 plugins/instances/init.php:284
+#: classes/pref/labels.php:258
+#: classes/pref/users.php:334
+#: classes/pref/feeds.php:1344
+#: classes/pref/feeds.php:1606
+#: classes/pref/feeds.php:1670
+#: classes/pref/filters.php:359
+#: classes/pref/filters.php:407
+#: classes/pref/filters.php:744
+#: classes/pref/filters.php:832
+#: classes/pref/filters.php:859
+#: classes/pref/prefs.php:1000
+#: plugins/instances/init.php:284
 msgid "Select"
 msgstr "Seleziona"
 
-#: classes/pref/labels.php:261 classes/pref/users.php:337
-#: classes/pref/feeds.php:1343 classes/pref/feeds.php:1605
-#: classes/pref/feeds.php:1669 classes/pref/filters.php:362
-#: classes/pref/filters.php:410 classes/pref/filters.php:747
-#: classes/pref/filters.php:835 classes/pref/filters.php:862
-#: classes/pref/prefs.php:1003 classes/feeds.php:90
+#: classes/pref/labels.php:261
+#: classes/pref/users.php:337
+#: classes/pref/feeds.php:1347
+#: classes/pref/feeds.php:1609
+#: classes/pref/feeds.php:1673
+#: classes/pref/filters.php:362
+#: classes/pref/filters.php:410
+#: classes/pref/filters.php:747
+#: classes/pref/filters.php:835
+#: classes/pref/filters.php:862
+#: classes/pref/prefs.php:1003
+#: classes/feeds.php:90
 #: plugins/instances/init.php:287
 msgid "All"
 msgstr "Tutti"
 
-#: classes/pref/labels.php:263 classes/pref/users.php:339
-#: classes/pref/feeds.php:1345 classes/pref/feeds.php:1607
-#: classes/pref/feeds.php:1671 classes/pref/filters.php:364
-#: classes/pref/filters.php:412 classes/pref/filters.php:749
-#: classes/pref/filters.php:837 classes/pref/filters.php:864
-#: classes/pref/prefs.php:1005 classes/feeds.php:93
+#: classes/pref/labels.php:263
+#: classes/pref/users.php:339
+#: classes/pref/feeds.php:1349
+#: classes/pref/feeds.php:1611
+#: classes/pref/feeds.php:1675
+#: classes/pref/filters.php:364
+#: classes/pref/filters.php:412
+#: classes/pref/filters.php:749
+#: classes/pref/filters.php:837
+#: classes/pref/filters.php:864
+#: classes/pref/prefs.php:1005
+#: classes/feeds.php:93
 #: plugins/instances/init.php:289
 msgid "None"
 msgstr "Nessuno"
 
-#: classes/pref/labels.php:270 classes/pref/users.php:348
-#: classes/pref/feeds.php:765 classes/pref/filters.php:478
-#: classes/pref/filters.php:766 classes/feeds.php:1147
+#: classes/pref/labels.php:270
+#: classes/pref/users.php:348
+#: classes/pref/feeds.php:767
+#: classes/pref/filters.php:478
+#: classes/pref/filters.php:766
+#: classes/feeds.php:1149
 #: plugins/instances/init.php:294
 msgid "Remove"
 msgstr "Rimuovi"
@@ -1161,7 +1301,8 @@ msgstr "Rimuovi"
 msgid "Clear colors"
 msgstr "Cancella colori"
 
-#: classes/pref/users.php:6 classes/pref/system.php:8
+#: classes/pref/users.php:6
+#: classes/pref/system.php:8
 #: plugins/instances/init.php:154
 msgid "Your access level is insufficient to open this tab."
 msgstr "Il livello di accesso non è sufficiente per aprire questa scheda."
@@ -1170,8 +1311,10 @@ msgstr "Il livello di accesso non è sufficiente per aprire questa scheda."
 msgid "Edit user"
 msgstr "Modifica utente"
 
-#: classes/pref/users.php:56 classes/pref/feeds.php:637
-#: classes/pref/feeds.php:876 classes/feeds.php:1070
+#: classes/pref/users.php:56
+#: classes/pref/feeds.php:637
+#: classes/pref/feeds.php:878
+#: classes/feeds.php:1070
 msgid "Authentication"
 msgstr "Autenticazione"
 
@@ -1179,12 +1322,14 @@ msgstr "Autenticazione"
 msgid "Access level: "
 msgstr "Livello di accesso: "
 
-#: classes/pref/users.php:77 classes/pref/feeds.php:665
-#: classes/pref/feeds.php:892
+#: classes/pref/users.php:77
+#: classes/pref/feeds.php:667
+#: classes/pref/feeds.php:896
 msgid "Options"
 msgstr "Opzioni"
 
-#: classes/pref/users.php:91 js/prefs.js:570
+#: classes/pref/users.php:91
+#: js/prefs.js:570
 msgid "User details"
 msgstr "Dettagli utente"
 
@@ -1192,7 +1337,8 @@ msgstr "Dettagli utente"
 msgid "User not found"
 msgstr "Utente non trovato"
 
-#: classes/pref/users.php:132 classes/pref/users.php:400
+#: classes/pref/users.php:132
+#: classes/pref/users.php:400
 msgid "Registered"
 msgstr "Registrato"
 
@@ -1208,7 +1354,8 @@ msgstr "Numero notiziari sottoscritti"
 msgid "Stored articles"
 msgstr "Articoli memorizzati"
 
-#: classes/pref/users.php:145 classes/pref/users.php:399
+#: classes/pref/users.php:145
+#: classes/pref/users.php:399
 msgid "Subscribed feeds"
 msgstr "Notiziari sottoscritti"
 
@@ -1241,8 +1388,11 @@ msgstr "Inviata nuova password dell'utente <b>%s</b> a <b>%s</b> "
 msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] Notifica di cambio password"
 
-#: classes/pref/users.php:324 classes/pref/feeds.php:1336
-#: classes/pref/filters.php:740 classes/feeds.php:1118 classes/feeds.php:1184
+#: classes/pref/users.php:324
+#: classes/pref/feeds.php:1340
+#: classes/pref/filters.php:740
+#: classes/feeds.php:1120
+#: classes/feeds.php:1186
 #: js/tt-rss.js:174
 msgid "Search"
 msgstr "Cerca"
@@ -1251,13 +1401,16 @@ msgstr "Cerca"
 msgid "Create user"
 msgstr "Crea utente"
 
-#: classes/pref/users.php:346 classes/pref/filters.php:759
+#: classes/pref/users.php:346
+#: classes/pref/filters.php:759
 #: plugins/instances/init.php:293
 msgid "Edit"
 msgstr "Modifica"
 
-#: classes/pref/users.php:397 classes/pref/feeds.php:643
-#: classes/pref/feeds.php:880 classes/pref/feeds.php:1838
+#: classes/pref/users.php:397
+#: classes/pref/feeds.php:643
+#: classes/pref/feeds.php:882
+#: classes/pref/feeds.php:1842
 #: classes/feeds.php:1074
 msgid "Login"
 msgstr "Nome utente"
@@ -1270,7 +1423,8 @@ msgstr "Livello di accesso"
 msgid "Last login"
 msgstr "Ultimo accesso"
 
-#: classes/pref/users.php:420 plugins/instances/init.php:334
+#: classes/pref/users.php:420
+#: plugins/instances/init.php:334
 msgid "Click to edit"
 msgstr "Fai clic per modificare"
 
@@ -1314,8 +1468,10 @@ msgstr "Data"
 msgid "Check to enable field"
 msgstr "Spuntare per attivare il campo"
 
-#: classes/pref/feeds.php:65 classes/pref/feeds.php:214
-#: classes/pref/feeds.php:258 classes/pref/feeds.php:264
+#: classes/pref/feeds.php:65
+#: classes/pref/feeds.php:214
+#: classes/pref/feeds.php:258
+#: classes/pref/feeds.php:264
 #: classes/pref/feeds.php:290
 #, php-format
 msgid "(%d feed)"
@@ -1323,7 +1479,8 @@ msgid_plural "(%d feeds)"
 msgstr[0] "(%d notiziario)"
 msgstr[1] "(%d notiziari)"
 
-#: classes/pref/feeds.php:537 classes/pref/prefs.php:18
+#: classes/pref/feeds.php:537
+#: classes/pref/prefs.php:18
 msgid "General"
 msgstr "Generale"
 
@@ -1331,256 +1488,251 @@ msgstr "Generale"
 msgid "Feed Title"
 msgstr "Titolo del notiziario"
 
-#: classes/pref/feeds.php:595 classes/pref/feeds.php:828
-#: classes/pref/feeds.php:1824 classes/feeds.php:1050
+#: classes/pref/feeds.php:595
+#: classes/pref/feeds.php:830
+#: classes/pref/feeds.php:1828
+#: classes/feeds.php:1050
 msgid "Place in category:"
 msgstr "Mettere nella categoria:"
 
-#: classes/pref/feeds.php:608 classes/pref/feeds.php:842
+#: classes/pref/feeds.php:608
+#: classes/pref/feeds.php:844
 msgid "Language:"
 msgstr "Lingua:"
 
-#: classes/pref/feeds.php:615 classes/pref/feeds.php:851
+#: classes/pref/feeds.php:615
+#: classes/pref/feeds.php:853
 msgid "Update"
 msgstr "Aggiorna"
 
-#: classes/pref/feeds.php:630 classes/pref/feeds.php:867
+#: classes/pref/feeds.php:630
+#: classes/pref/feeds.php:869
 msgid "Article purging:"
 msgstr "Eliminazione articoli:"
 
-#: classes/pref/feeds.php:656 classes/pref/feeds.php:886
-#: classes/pref/feeds.php:1841 classes/pref/prefs.php:245
-#: classes/feeds.php:1077
+#: classes/pref/feeds.php:658
+#: classes/pref/feeds.php:890
+#: classes/pref/feeds.php:1845
+#: classes/pref/prefs.php:245
+#: classes/feeds.php:1078
 msgid "Password"
 msgstr "Password"
 
-#: classes/pref/feeds.php:660
-msgid ""
-"<b>Hint:</b> you need to fill in your login information if your feed "
-"requires authentication, except for Twitter feeds."
-msgstr ""
-"<b>Suggerimento:</b> occorre fornire le credenziali di accesso se il proprio "
-"notiziario richiede l'autenticazione, eccetto che per i notiziari di Twitter."
+#: classes/pref/feeds.php:662
+msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
+msgstr "<b>Suggerimento:</b> occorre fornire le credenziali di accesso se il proprio notiziario richiede l'autenticazione, eccetto che per i notiziari di Twitter."
 
-#: classes/pref/feeds.php:679 classes/pref/feeds.php:896
+#: classes/pref/feeds.php:681
+#: classes/pref/feeds.php:900
 msgid "Hide from Popular feeds"
 msgstr "Nascondere dai notiziari Popolari"
 
-#: classes/pref/feeds.php:691 classes/pref/feeds.php:902
+#: classes/pref/feeds.php:693
+#: classes/pref/feeds.php:906
 msgid "Include in e-mail digest"
 msgstr "Includere nell'email riassunto"
 
-#: classes/pref/feeds.php:704 classes/pref/feeds.php:908
+#: classes/pref/feeds.php:706
+#: classes/pref/feeds.php:912
 msgid "Always display image attachments"
 msgstr "Mostrare sempre le immagini allegate"
 
-#: classes/pref/feeds.php:717 classes/pref/feeds.php:916
+#: classes/pref/feeds.php:719
+#: classes/pref/feeds.php:920
 msgid "Do not embed images"
 msgstr "Non includere le immagini"
 
-#: classes/pref/feeds.php:730 classes/pref/feeds.php:924
+#: classes/pref/feeds.php:732
+#: classes/pref/feeds.php:928
 msgid "Cache images locally"
 msgstr "Memorizzare le immagini localmente"
 
-#: classes/pref/feeds.php:742 classes/pref/feeds.php:930
+#: classes/pref/feeds.php:744
+#: classes/pref/feeds.php:934
 msgid "Mark updated articles as unread"
 msgstr "Segnare gli articoli aggiornati come non letti"
 
-#: classes/pref/feeds.php:746
+#: classes/pref/feeds.php:748
 msgid "Icon"
 msgstr "Icona"
 
-#: classes/pref/feeds.php:763
+#: classes/pref/feeds.php:765
 msgid "Replace"
 msgstr "Sostituisci"
 
-#: classes/pref/feeds.php:770 classes/pref/prefs.php:706
+#: classes/pref/feeds.php:772
+#: classes/pref/prefs.php:706
 msgid "Plugins"
 msgstr "Plugin"
 
-#: classes/pref/feeds.php:790
+#: classes/pref/feeds.php:792
 msgid "Resubscribe to push updates"
 msgstr "Sottoscrivi di nuovo per inviare aggiornamenti"
 
-#: classes/pref/feeds.php:797
+#: classes/pref/feeds.php:799
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
-msgstr ""
-"Reimposta lo stato di sottoscrizione a PubSubHubbub per i notiziari "
-"abilitati al push."
+msgstr "Reimposta lo stato di sottoscrizione a PubSubHubbub per i notiziari abilitati al push."
 
-#: classes/pref/feeds.php:1203 classes/pref/feeds.php:1256
+#: classes/pref/feeds.php:1207
+#: classes/pref/feeds.php:1260
 msgid "All done."
 msgstr "Tutto fatto."
 
-#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1315
 msgid "Feeds with errors"
 msgstr "Notiziari con errori"
 
-#: classes/pref/feeds.php:1318
+#: classes/pref/feeds.php:1322
 msgid "Inactive feeds"
 msgstr "Notiziari non attivi"
 
-#: classes/pref/feeds.php:1354
+#: classes/pref/feeds.php:1358
 msgid "Edit selected feeds"
 msgstr "Modifica i notiziari selezionati"
 
-#: classes/pref/feeds.php:1356 classes/pref/feeds.php:1370
+#: classes/pref/feeds.php:1360
+#: classes/pref/feeds.php:1374
 #: classes/pref/filters.php:762
 msgid "Reset sort order"
 msgstr "Reimposta ordinamento"
 
-#: classes/pref/feeds.php:1358 js/prefs.js:1737
+#: classes/pref/feeds.php:1362
+#: js/prefs.js:1737
 msgid "Batch subscribe"
 msgstr "Sottoscrivi in gruppo"
 
-#: classes/pref/feeds.php:1365
+#: classes/pref/feeds.php:1369
 msgid "Categories"
 msgstr "Categorie"
 
-#: classes/pref/feeds.php:1368
+#: classes/pref/feeds.php:1372
 msgid "Add category"
 msgstr "Aggiungi categoria"
 
-#: classes/pref/feeds.php:1372
+#: classes/pref/feeds.php:1376
 msgid "Remove selected"
 msgstr "Rimuovere i selezionati"
 
-#: classes/pref/feeds.php:1383
+#: classes/pref/feeds.php:1387
 msgid "More actions..."
 msgstr "Altre azioni..."
 
-#: classes/pref/feeds.php:1387
+#: classes/pref/feeds.php:1391
 msgid "Manual purge"
 msgstr "Eliminazione manuale"
 
-#: classes/pref/feeds.php:1391
+#: classes/pref/feeds.php:1395
 msgid "Clear feed data"
 msgstr "Cancella i dati del notiziario"
 
-#: classes/pref/feeds.php:1392 classes/pref/filters.php:770
+#: classes/pref/feeds.php:1396
+#: classes/pref/filters.php:770
 msgid "Rescore articles"
 msgstr "Cambia punteggio degli articoli"
 
-#: classes/pref/feeds.php:1444
+#: classes/pref/feeds.php:1448
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1446
-msgid ""
-"Using OPML you can export and import your feeds, filters, labels and Tiny "
-"Tiny RSS settings."
-msgstr ""
-"Usando OML puoi esportare e importare i tuoi notiziari, i filtri, le "
-"etichette e le impostazioni di Tiny Tiny RSS."
+#: classes/pref/feeds.php:1450
+msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
+msgstr "Usando OML puoi esportare e importare i tuoi notiziari, i filtri, le etichette e le impostazioni di Tiny Tiny RSS."
 
-#: classes/pref/feeds.php:1447
+#: classes/pref/feeds.php:1451
 msgid "Only main settings profile can be migrated using OPML."
-msgstr ""
-"Puoi migrare con OPML solamente il profilo principale e le sue impostazioni."
+msgstr "Puoi migrare con OPML solamente il profilo principale e le sue impostazioni."
 
-#: classes/pref/feeds.php:1460
+#: classes/pref/feeds.php:1464
 msgid "Import my OPML"
 msgstr "Importa il mio OPML"
 
-#: classes/pref/feeds.php:1466
+#: classes/pref/feeds.php:1470
 msgid "Filename:"
 msgstr "Nome del file:"
 
-#: classes/pref/feeds.php:1468
+#: classes/pref/feeds.php:1472
 msgid "Include settings"
 msgstr "Includi le impostazioni"
 
-#: classes/pref/feeds.php:1472
+#: classes/pref/feeds.php:1476
 msgid "Export OPML"
 msgstr "Esporta OPML"
 
-#: classes/pref/feeds.php:1476
-msgid ""
-"Your OPML can be published publicly and can be subscribed by anyone who "
-"knows the URL below."
-msgstr ""
-"Il tuo OPML può essere reso pubblico e può essere sottoscritto da chiunque "
-"conosca l'URL seguente."
-
 #: classes/pref/feeds.php:1480
+msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
+msgstr "Il tuo OPML può essere reso pubblico e può essere sottoscritto da chiunque conosca l'URL seguente."
+
+#: classes/pref/feeds.php:1484
 msgid "Public OPML URL"
 msgstr "URL OPML pubblico"
 
-#: classes/pref/feeds.php:1481
+#: classes/pref/feeds.php:1485
 msgid "Display published OPML URL"
 msgstr "Mostra URL pubblico dell'OPML"
 
-#: classes/pref/feeds.php:1490
+#: classes/pref/feeds.php:1494
 msgid "Firefox integration"
 msgstr "Integrazione con Firefox"
 
-#: classes/pref/feeds.php:1492
-msgid ""
-"This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
-"link below."
-msgstr ""
-"Questa istanza di Tiny Tiny RSS può essere impostata come lettore di "
-"notiziari in Firefox facendo clic sul collegamento qui sotto."
+#: classes/pref/feeds.php:1496
+msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
+msgstr "Questa istanza di Tiny Tiny RSS può essere impostata come lettore di notiziari in Firefox facendo clic sul collegamento qui sotto."
 
-#: classes/pref/feeds.php:1499
+#: classes/pref/feeds.php:1503
 msgid "Click here to register this site as a feed reader."
 msgstr "Clicca qui per registrare questo sito come lettore di notiziari."
 
-#: classes/pref/feeds.php:1507
+#: classes/pref/feeds.php:1511
 msgid "Published & shared articles / Generated feeds"
 msgstr "Articoli pubblicati e condivisi / Notiziari generati"
 
-#: classes/pref/feeds.php:1509
-msgid ""
-"Published articles are exported as a public RSS feed and can be subscribed "
-"by anyone who knows the URL specified below."
-msgstr ""
-" Gli articoli pubblicati vengono esportati come un notiziario RSS pubblico e "
-"possono essere sottoscritti da chiunque conosca l'URL specificato qui sotto."
+#: classes/pref/feeds.php:1513
+msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
+msgstr " Gli articoli pubblicati vengono esportati come un notiziario RSS pubblico e possono essere sottoscritti da chiunque conosca l'URL specificato qui sotto."
 
-#: classes/pref/feeds.php:1516 classes/feeds.php:54 classes/feeds.php:134
+#: classes/pref/feeds.php:1520
+#: classes/feeds.php:54
+#: classes/feeds.php:134
 msgid "View as RSS"
 msgstr "Visualizza come RSS"
 
-#: classes/pref/feeds.php:1517
+#: classes/pref/feeds.php:1521
 msgid "Display URL"
 msgstr "Visualizza URL"
 
-#: classes/pref/feeds.php:1520
+#: classes/pref/feeds.php:1524
 msgid "Clear all generated URLs"
 msgstr "Cancella tutti gli URL generati"
 
-#: classes/pref/feeds.php:1598
-msgid ""
-"These feeds have not been updated with new content for 3 months (oldest "
-"first):"
-msgstr ""
-"Questi notiziari non sono stati aggiornati con nuovi contenuti da 3 mesi "
-"(prima i più vecchi):"
+#: classes/pref/feeds.php:1602
+msgid "These feeds have not been updated with new content for 3 months (oldest first):"
+msgstr "Questi notiziari non sono stati aggiornati con nuovi contenuti da 3 mesi (prima i più vecchi):"
 
-#: classes/pref/feeds.php:1632 classes/pref/feeds.php:1696
+#: classes/pref/feeds.php:1636
+#: classes/pref/feeds.php:1700
 msgid "Click to edit feed"
 msgstr "Fare clic per modificare il notiziario"
 
-#: classes/pref/feeds.php:1650 classes/pref/feeds.php:1716
+#: classes/pref/feeds.php:1654
+#: classes/pref/feeds.php:1720
 msgid "Unsubscribe from selected feeds"
 msgstr "Annulla la sottoscrizione ai notiziari selezionati"
 
-#: classes/pref/feeds.php:1821
+#: classes/pref/feeds.php:1825
 msgid "Add one valid RSS feed per line (no feed detection is done)"
-msgstr ""
-"Inserisci un indirizzo valido di notiziario per riga (non viene fatta una "
-"ricerca automatica)"
+msgstr "Inserisci un indirizzo valido di notiziario per riga (non viene fatta una ricerca automatica)"
 
-#: classes/pref/feeds.php:1830
+#: classes/pref/feeds.php:1834
 msgid "Feeds to subscribe, One per line"
 msgstr "Notiziari da sottoscrivere, uno per linea"
 
-#: classes/pref/feeds.php:1852
+#: classes/pref/feeds.php:1857
 msgid "Feeds require authentication."
 msgstr "I notiziari richiedono autenticazione."
 
-#: classes/pref/feeds.php:1859 classes/feeds.php:1092 classes/feeds.php:1146
+#: classes/pref/feeds.php:1864
+#: classes/feeds.php:1094
+#: classes/feeds.php:1148
 msgid "Subscribe"
 msgstr "Sottoscrivi"
 
@@ -1588,48 +1740,60 @@ msgstr "Sottoscrivi"
 msgid "Preview article"
 msgstr "Anteprima articolo"
 
-#: classes/pref/filters.php:239 classes/pref/filters.php:518
+#: classes/pref/filters.php:239
+#: classes/pref/filters.php:518
 msgid "(inverse)"
 msgstr "(inverso)"
 
-#: classes/pref/filters.php:235 classes/pref/filters.php:517
+#: classes/pref/filters.php:235
+#: classes/pref/filters.php:517
 #, php-format
 msgid "%s on %s in %s %s"
 msgstr "%s su %s in %s %s"
 
-#: classes/pref/filters.php:354 classes/pref/filters.php:827
+#: classes/pref/filters.php:354
+#: classes/pref/filters.php:827
 #: classes/pref/filters.php:942
 msgid "Match"
 msgstr "Corrisponde"
 
-#: classes/pref/filters.php:368 classes/pref/filters.php:416
-#: classes/pref/filters.php:841 classes/pref/filters.php:868
+#: classes/pref/filters.php:368
+#: classes/pref/filters.php:416
+#: classes/pref/filters.php:841
+#: classes/pref/filters.php:868
 msgid "Add"
 msgstr "Aggiungi"
 
-#: classes/pref/filters.php:371 classes/pref/filters.php:419
-#: classes/pref/filters.php:844 classes/pref/filters.php:871
+#: classes/pref/filters.php:371
+#: classes/pref/filters.php:419
+#: classes/pref/filters.php:844
+#: classes/pref/filters.php:871
 #: classes/feeds.php:116
 msgid "Delete"
 msgstr "Elimina"
 
-#: classes/pref/filters.php:402 classes/pref/filters.php:854
+#: classes/pref/filters.php:402
+#: classes/pref/filters.php:854
 msgid "Apply actions"
 msgstr "Applica azioni"
 
-#: classes/pref/filters.php:452 classes/pref/filters.php:883
+#: classes/pref/filters.php:452
+#: classes/pref/filters.php:883
 msgid "Enabled"
 msgstr "Attivato"
 
-#: classes/pref/filters.php:461 classes/pref/filters.php:886
+#: classes/pref/filters.php:461
+#: classes/pref/filters.php:886
 msgid "Match any rule"
 msgstr "Corrisponde a una qualsiasi regola"
 
-#: classes/pref/filters.php:470 classes/pref/filters.php:889
+#: classes/pref/filters.php:470
+#: classes/pref/filters.php:889
 msgid "Inverse matching"
 msgstr "Corrispondenza inversa"
 
-#: classes/pref/filters.php:482 classes/pref/filters.php:896
+#: classes/pref/filters.php:482
+#: classes/pref/filters.php:896
 msgid "Test"
 msgstr "Prova"
 
@@ -1649,7 +1813,8 @@ msgstr "Corrispondenza inversa delle espressioni regolari"
 msgid "on field"
 msgstr "al campo"
 
-#: classes/pref/filters.php:962 js/PrefFilterTree.js:61
+#: classes/pref/filters.php:962
+#: js/PrefFilterTree.js:64
 msgid "in"
 msgstr "in"
 
@@ -1661,7 +1826,8 @@ msgstr "Wiki: Filtri"
 msgid "Save rule"
 msgstr "Salva regola"
 
-#: classes/pref/filters.php:980 js/functions.js:1012
+#: classes/pref/filters.php:980
+#: js/functions.js:1012
 msgid "Add rule"
 msgstr "Aggiungi regola"
 
@@ -1677,7 +1843,8 @@ msgstr "Nessuna azione disponibile"
 msgid "Save action"
 msgstr "Salva azione"
 
-#: classes/pref/filters.php:1073 js/functions.js:1038
+#: classes/pref/filters.php:1073
+#: js/functions.js:1038
 msgid "Add action"
 msgstr "Aggiungi azione"
 
@@ -1724,24 +1891,16 @@ msgid "Blacklisted tags"
 msgstr "Etichette in lista nera"
 
 #: classes/pref/prefs.php:26
-msgid ""
-"When auto-detecting tags in articles these tags will not be applied (comma-"
-"separated list)."
-msgstr ""
-"Quando è attiva l'individuazione automatica delle etichette negli articoli, "
-"queste etichette non saranno applicate (elenco separato da virgola)."
+msgid "When auto-detecting tags in articles these tags will not be applied (comma-separated list)."
+msgstr "Quando è attiva l'individuazione automatica delle etichette negli articoli, queste etichette non saranno applicate (elenco separato da virgola)."
 
 #: classes/pref/prefs.php:27
 msgid "Automatically mark articles as read"
 msgstr "Segnare automaticamente gli articoli come letti"
 
 #: classes/pref/prefs.php:27
-msgid ""
-"This option enables marking articles as read automatically while you scroll "
-"article list."
-msgstr ""
-"Attivando questa opzione, gli articoli vengono segnati automaticamente come "
-"letti quando si scorre l'elenco articoli."
+msgid "This option enables marking articles as read automatically while you scroll article list."
+msgstr "Attivando questa opzione, gli articoli vengono segnati automaticamente come letti quando si scorre l'elenco articoli."
 
 #: classes/pref/prefs.php:28
 msgid "Automatically expand articles in combined mode"
@@ -1752,12 +1911,8 @@ msgid "Combined feed display"
 msgstr "Visualizzazione combinata di notiziari"
 
 #: classes/pref/prefs.php:29
-msgid ""
-"Display expanded list of feed articles, instead of separate displays for "
-"headlines and article content"
-msgstr ""
-"Visualizza un elenco espanso di articoli di notiziario, invece di "
-"visualizzazioni separate per titolo e contenuto dell'articolo"
+msgid "Display expanded list of feed articles, instead of separate displays for headlines and article content"
+msgstr "Visualizza un elenco espanso di articoli di notiziario, invece di visualizzazioni separate per titolo e contenuto dell'articolo"
 
 #: classes/pref/prefs.php:30
 msgid "Confirm marking feed as read"
@@ -1772,12 +1927,8 @@ msgid "Default feed update interval"
 msgstr "Intervallo predefinito di aggiornamento notiziari"
 
 #: classes/pref/prefs.php:32
-msgid ""
-"Shortest interval at which a feed will be checked for updates regardless of "
-"update method"
-msgstr ""
-"Intevallo più corto in cui i notiziari verranno controllati per "
-"aggiornamenti, indipendentemente dal metodo"
+msgid "Shortest interval at which a feed will be checked for updates regardless of update method"
+msgstr "Intevallo più corto in cui i notiziari verranno controllati per aggiornamenti, indipendentemente dal metodo"
 
 #: classes/pref/prefs.php:33
 msgid "Mark articles in e-mail digest as read"
@@ -1788,12 +1939,8 @@ msgid "Enable e-mail digest"
 msgstr "Attiva e-mail digest"
 
 #: classes/pref/prefs.php:34
-msgid ""
-"This option enables sending daily digest of new (and unread) headlines on "
-"your configured e-mail address"
-msgstr ""
-"Questa opzione attiva l'invio di un digest giornaliero dei sommari nuovi (e "
-"non letti) all'indirizzo email configurato"
+msgid "This option enables sending daily digest of new (and unread) headlines on your configured e-mail address"
+msgstr "Questa opzione attiva l'invio di un digest giornaliero dei sommari nuovi (e non letti) all'indirizzo email configurato"
 
 #: classes/pref/prefs.php:35
 msgid "Try to send digests around specified time"
@@ -1809,8 +1956,7 @@ msgstr "Attiva l'accesso alle API"
 
 #: classes/pref/prefs.php:36
 msgid "Allows external clients to access this account through the API"
-msgstr ""
-"Permetti a client esterni di accedere a questo account attraverso le API"
+msgstr "Permetti a client esterni di accedere a questo account attraverso le API"
 
 #: classes/pref/prefs.php:37
 msgid "Enable feed categories"
@@ -1830,30 +1976,23 @@ msgstr "Nascondere i notiziari senza articoli non letti"
 
 #: classes/pref/prefs.php:41
 msgid "Show special feeds when hiding read feeds"
-msgstr ""
-"Mostrare i notiziari speciali quando vengono nascosti i notiziari letti"
+msgstr "Mostrare i notiziari speciali quando vengono nascosti i notiziari letti"
 
 #: classes/pref/prefs.php:42
 msgid "Long date format"
 msgstr "Formato data lunga"
 
 #: classes/pref/prefs.php:42
-msgid ""
-"The syntax used is identical to the PHP <a href='http://php.net/manual/"
-"function.date.php'>date()</a> function."
-msgstr ""
-"La sintassi usata è identica alla funzione <a href='http://php.net/manual/"
-"function.date.php'>date()</a> di PHP."
+msgid "The syntax used is identical to the PHP <a href='http://php.net/manual/function.date.php'>date()</a> function."
+msgstr "La sintassi usata è identica alla funzione <a href='http://php.net/manual/function.date.php'>date()</a> di PHP."
 
 #: classes/pref/prefs.php:43
 msgid "On catchup show next feed"
 msgstr "Su lettura passare al prossimo notiziario"
 
 #: classes/pref/prefs.php:43
-msgid ""
-"Automatically open next feed with unread articles after marking one as read"
-msgstr ""
-"Apri automaticamente il notiziario successivo quando ne segni uno come letto"
+msgid "Automatically open next feed with unread articles after marking one as read"
+msgstr "Apri automaticamente il notiziario successivo quando ne segni uno come letto"
 
 #: classes/pref/prefs.php:44
 msgid "Purge articles after this number of days (0 - disables)"
@@ -1881,9 +2020,7 @@ msgstr "Ordinare i titoli per data del notiziario"
 
 #: classes/pref/prefs.php:49
 msgid "Use feed-specified date to sort headlines instead of local import date."
-msgstr ""
-"Usare per l'ordinamento dei titoli la data specificata dal notiziario invece "
-"della data di importazione in locale."
+msgstr "Usare per l'ordinamento dei titoli la data specificata dal notiziario invece della data di importazione in locale."
 
 #: classes/pref/prefs.php:50
 msgid "Login with an SSL certificate"
@@ -1905,7 +2042,8 @@ msgstr "Togliere le etichette non sicure dagli articoli"
 msgid "Strip all but most common HTML tags when reading articles."
 msgstr "Toglie le tag HTML meno comuni durante la lettura degli articoli."
 
-#: classes/pref/prefs.php:53 js/prefs.js:1692
+#: classes/pref/prefs.php:53
+#: js/prefs.js:1692
 msgid "Customize stylesheet"
 msgstr "Personalizza il foglio di stile"
 
@@ -1923,9 +2061,7 @@ msgstr "Raggruppare i titoli in notiziari virtuali"
 
 #: classes/pref/prefs.php:55
 msgid "Special feeds, labels, and categories are grouped by originating feeds"
-msgstr ""
-"Notiziari speciali, etichette e categorie sono raccolte in base dal "
-"notiziario da cui provengono"
+msgstr "Notiziari speciali, etichette e categorie sono raccolte in base dal notiziario da cui provengono"
 
 #: classes/pref/prefs.php:56
 msgid "Language"
@@ -1981,8 +2117,7 @@ msgstr "La password è impostata al valore predefinito, cambiala, per favore."
 
 #: classes/pref/prefs.php:289
 msgid "Changing your current password will disable OTP."
-msgstr ""
-"Cambiare la password attuale disabiliterà le password usa e getta (OTP)."
+msgstr "Cambiare la password attuale disabiliterà le password usa e getta (OTP)."
 
 #: classes/pref/prefs.php:294
 msgid "Old password"
@@ -2005,14 +2140,11 @@ msgid "One time passwords / Authenticator"
 msgstr "Password usa e getta(OTP) / Autenticatore"
 
 #: classes/pref/prefs.php:322
-msgid ""
-"One time passwords are currently enabled. Enter your current password below "
-"to disable."
-msgstr ""
-"Le password usa e getta (OTP) sono attualmente attive. Inserisci la password "
-"attuale per disattivarle."
+msgid "One time passwords are currently enabled. Enter your current password below to disable."
+msgstr "Le password usa e getta (OTP) sono attualmente attive. Inserisci la password attuale per disattivarle."
 
-#: classes/pref/prefs.php:347 classes/pref/prefs.php:398
+#: classes/pref/prefs.php:347
+#: classes/pref/prefs.php:398
 msgid "Enter your password"
 msgstr "Inserire la password"
 
@@ -2021,12 +2153,8 @@ msgid "Disable OTP"
 msgstr "Disattivare password usa e getta (OTP)"
 
 #: classes/pref/prefs.php:364
-msgid ""
-"You will need a compatible Authenticator to use this. Changing your password "
-"would automatically disable OTP."
-msgstr ""
-"Avrai bisogno di un Autenticatore compatibile per usare le OTP. Cambiare la "
-"tua password disabiliterà OTP automaticamente."
+msgid "You will need a compatible Authenticator to use this. Changing your password would automatically disable OTP."
+msgstr "Avrai bisogno di un Autenticatore compatibile per usare le OTP. Cambiare la tua password disabiliterà OTP automaticamente."
 
 #: classes/pref/prefs.php:366
 msgid "Scan the following code by the Authenticator application:"
@@ -2082,47 +2210,44 @@ msgid "Reset to defaults"
 msgstr "Reimposta ai valori predefiniti"
 
 #: classes/pref/prefs.php:708
-msgid ""
-"You will need to reload Tiny Tiny RSS for plugin changes to take effect."
+msgid "You will need to reload Tiny Tiny RSS for plugin changes to take effect."
 msgstr "Ricaricare Tiny Tiny Rss per attivare le modifiche ai plugin."
 
 #: classes/pref/prefs.php:710
-msgid ""
-"Download more plugins at tt-rss.org <a class=\"visibleLink\" target=\"_blank"
-"\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forums</a> or <a "
-"target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins"
-"\">wiki</a>."
-msgstr ""
-"Scarica altri plugin dai <a class=\"visibleLink\" target=\"_blank\" href="
-"\"http://tt-rss.org/forum/viewforum.php?f=22\">forum</a> o dalla <a target="
-"\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins"
-"\">wiki</a> di tt-rss.org."
+msgid "Download more plugins at tt-rss.org <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forums</a> or <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a>."
+msgstr "Scarica altri plugin dai <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forum</a> o dalla <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a> di tt-rss.org."
 
 #: classes/pref/prefs.php:740
 msgid "System plugins"
 msgstr "Plugin di sistema"
 
-#: classes/pref/prefs.php:744 classes/pref/prefs.php:800
+#: classes/pref/prefs.php:744
+#: classes/pref/prefs.php:800
 msgid "Plugin"
 msgstr "Plugin"
 
-#: classes/pref/prefs.php:745 classes/pref/prefs.php:801
+#: classes/pref/prefs.php:745
+#: classes/pref/prefs.php:801
 msgid "Description"
 msgstr "Descrizione"
 
-#: classes/pref/prefs.php:746 classes/pref/prefs.php:802
+#: classes/pref/prefs.php:746
+#: classes/pref/prefs.php:802
 msgid "Version"
 msgstr "Versione"
 
-#: classes/pref/prefs.php:747 classes/pref/prefs.php:803
+#: classes/pref/prefs.php:747
+#: classes/pref/prefs.php:803
 msgid "Author"
 msgstr "Autore"
 
-#: classes/pref/prefs.php:778 classes/pref/prefs.php:837
+#: classes/pref/prefs.php:778
+#: classes/pref/prefs.php:837
 msgid "more info"
 msgstr "Ulteriori informazioni"
 
-#: classes/pref/prefs.php:787 classes/pref/prefs.php:846
+#: classes/pref/prefs.php:787
+#: classes/pref/prefs.php:846
 msgid "Clear data"
 msgstr "Cancella i dati"
 
@@ -2138,27 +2263,22 @@ msgstr "Attiva i plugin selezionati"
 msgid "Incorrect one time password"
 msgstr "Password usa e getta sbagliata"
 
-#: classes/pref/prefs.php:932 classes/pref/prefs.php:949
+#: classes/pref/prefs.php:932
+#: classes/pref/prefs.php:949
 msgid "Incorrect password"
 msgstr "Password sbagliata"
 
 #: classes/pref/prefs.php:974
 #, php-format
-msgid ""
-"You can override colors, fonts and layout of your currently selected theme "
-"with custom CSS declarations here. <a target=\"_blank\" class=\"visibleLink"
-"\" href=\"%s\">This file</a> can be used as a baseline."
-msgstr ""
-"Si possono cambiare i colori, i caratteri e la disposizione del tema "
-"correntemente selezionato attraverso le dichiarazioni CSS personalizzate. <a "
-"target=\"_blank\" class=\"visibleLink\" href=\"%s\">Questo file</a> può "
-"essere usato come esempio."
+msgid "You can override colors, fonts and layout of your currently selected theme with custom CSS declarations here. <a target=\"_blank\" class=\"visibleLink\" href=\"%s\">This file</a> can be used as a baseline."
+msgstr "Si possono cambiare i colori, i caratteri e la disposizione del tema correntemente selezionato attraverso le dichiarazioni CSS personalizzate. <a target=\"_blank\" class=\"visibleLink\" href=\"%s\">Questo file</a> può essere usato come esempio."
 
 #: classes/pref/prefs.php:1014
 msgid "Create profile"
 msgstr "Crea profilo"
 
-#: classes/pref/prefs.php:1037 classes/pref/prefs.php:1065
+#: classes/pref/prefs.php:1037
+#: classes/pref/prefs.php:1065
 msgid "(active)"
 msgstr "(attivo)"
 
@@ -2207,7 +2327,9 @@ msgstr "Archivio"
 msgid "Move back"
 msgstr "Sposta indietro"
 
-#: classes/feeds.php:121 classes/feeds.php:126 plugins/mail/init.php:75
+#: classes/feeds.php:121
+#: classes/feeds.php:126
+#: plugins/mail/init.php:75
 #: plugins/mailto/init.php:25
 msgid "Forward by email"
 msgstr "Inoltra per email"
@@ -2216,7 +2338,8 @@ msgstr "Inoltra per email"
 msgid "Feed:"
 msgstr "Notiziario:"
 
-#: classes/feeds.php:223 classes/feeds.php:889
+#: classes/feeds.php:223
+#: classes/feeds.php:889
 msgid "Feed not found."
 msgstr "Notiziario non trovato."
 
@@ -2229,7 +2352,8 @@ msgstr "Mai"
 msgid "Imported at %s"
 msgstr "Importato alle %s"
 
-#: classes/feeds.php:466 classes/feeds.php:563
+#: classes/feeds.php:466
+#: classes/feeds.php:563
 msgid "mark feed as read"
 msgstr "Segna notiziario come letto"
 
@@ -2250,34 +2374,30 @@ msgid "No starred articles found to display."
 msgstr "Nessun articolo con stella trovato da visualizzare."
 
 #: classes/feeds.php:798
-msgid ""
-"No articles found to display. You can assign articles to labels manually "
-"from article header context menu (applies to all selected articles) or use a "
-"filter."
-msgstr ""
-"Nessun articolo trovato da visualizzare. Si possono assegnare manualmente "
-"gli articoli alle etichette (ha effetto su tutti gli articoli selezionati) o "
-"usare un filtro."
+msgid "No articles found to display. You can assign articles to labels manually from article header context menu (applies to all selected articles) or use a filter."
+msgstr "Nessun articolo trovato da visualizzare. Si possono assegnare manualmente gli articoli alle etichette (ha effetto su tutti gli articoli selezionati) o usare un filtro."
 
 #: classes/feeds.php:800
 msgid "No articles found to display."
 msgstr "Nessun articolo trovato da visualizzare."
 
-#: classes/feeds.php:815 classes/feeds.php:989
+#: classes/feeds.php:815
+#: classes/feeds.php:989
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "Ultimo aggiornamento notiziari alle %s"
 
-#: classes/feeds.php:825 classes/feeds.php:999
+#: classes/feeds.php:825
+#: classes/feeds.php:999
 msgid "Some feeds have update errors (click for details)"
-msgstr ""
-"Qualche notiziario ha degli errori di aggiornamento (fare clic per dettagli)"
+msgstr "Qualche notiziario ha degli errori di aggiornamento (fare clic per dettagli)"
 
 #: classes/feeds.php:979
 msgid "No feed selected."
 msgstr "Nessun notiziario selezionato."
 
-#: classes/feeds.php:1036 classes/feeds.php:1044
+#: classes/feeds.php:1036
+#: classes/feeds.php:1044
 msgid "Feed or site URL"
 msgstr "URL del sito o del notiziario"
 
@@ -2285,40 +2405,40 @@ msgstr "URL del sito o del notiziario"
 msgid "Available feeds"
 msgstr "Notiziari disponibili"
 
-#: classes/feeds.php:1087
+#: classes/feeds.php:1089
 msgid "This feed requires authentication."
 msgstr "Questo notiziario richiede l'autenticazione."
 
-#: classes/feeds.php:1095
+#: classes/feeds.php:1097
 msgid "More feeds"
 msgstr "Altri notiziari"
 
-#: classes/feeds.php:1122
+#: classes/feeds.php:1124
 msgid "Popular feeds"
 msgstr "Notiziari popolari"
 
-#: classes/feeds.php:1123
+#: classes/feeds.php:1125
 msgid "Feed archive"
 msgstr "Archivio notiziari"
 
-#: classes/feeds.php:1126
+#: classes/feeds.php:1128
 msgid "limit:"
 msgstr "Limite:"
 
-#: classes/feeds.php:1158
+#: classes/feeds.php:1160
 msgid "Look for"
 msgstr "Cerca"
 
-#: classes/feeds.php:1166
+#: classes/feeds.php:1168
 #, php-format
 msgid "in %s"
 msgstr "in %s"
 
-#: classes/feeds.php:1171
+#: classes/feeds.php:1173
 msgid "Used for word stemming"
 msgstr "Usato per determinare la radice delle parole"
 
-#: classes/feeds.php:1180
+#: classes/feeds.php:1182
 msgid "Search syntax"
 msgstr "Sintassi di ricerca"
 
@@ -2326,29 +2446,35 @@ msgstr "Sintassi di ricerca"
 msgid "Linked"
 msgstr "Collegato"
 
-#: plugins/instances/init.php:204 plugins/instances/init.php:395
+#: plugins/instances/init.php:204
+#: plugins/instances/init.php:395
 msgid "Instance"
 msgstr "Istanza"
 
-#: plugins/instances/init.php:215 plugins/instances/init.php:312
+#: plugins/instances/init.php:215
+#: plugins/instances/init.php:312
 #: plugins/instances/init.php:404
 msgid "Instance URL"
 msgstr "URL dell'istanza"
 
-#: plugins/instances/init.php:226 plugins/instances/init.php:414
+#: plugins/instances/init.php:226
+#: plugins/instances/init.php:414
 msgid "Access key:"
 msgstr "Chiave di accesso:"
 
-#: plugins/instances/init.php:229 plugins/instances/init.php:313
+#: plugins/instances/init.php:229
+#: plugins/instances/init.php:313
 #: plugins/instances/init.php:417
 msgid "Access key"
 msgstr "Chiave di accesso"
 
-#: plugins/instances/init.php:233 plugins/instances/init.php:421
+#: plugins/instances/init.php:233
+#: plugins/instances/init.php:421
 msgid "Use one access key for both linked instances."
 msgstr "Usare una sola chiave di accesso per entrambe le istanze collegate."
 
-#: plugins/instances/init.php:241 plugins/instances/init.php:429
+#: plugins/instances/init.php:241
+#: plugins/instances/init.php:429
 msgid "Generate new key"
 msgstr "Genera nuova chiave"
 
@@ -2357,13 +2483,8 @@ msgid "Link instance"
 msgstr "Collega istanza"
 
 #: plugins/instances/init.php:304
-msgid ""
-"You can connect other instances of Tiny Tiny RSS to this one to share "
-"Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
-msgstr ""
-"E' possibile connettere altre istanze di Tiny Tiny RSS a questa per "
-"condividere i notiziari Popolari. Collegare questa istanza di Tiny Tiny RSS "
-"usando questo URL:"
+msgid "You can connect other instances of Tiny Tiny RSS to this one to share Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
+msgstr "E' possibile connettere altre istanze di Tiny Tiny RSS a questa per condividere i notiziari Popolari. Collegare questa istanza di Tiny Tiny RSS usando questo URL:"
 
 #: plugins/instances/init.php:314
 msgid "Last connected"
@@ -2381,7 +2502,8 @@ msgstr "Notiziari memorizzati"
 msgid "Create link"
 msgstr "Crea collegamento"
 
-#: plugins/nsfw/init.php:30 plugins/nsfw/init.php:42
+#: plugins/nsfw/init.php:30
+#: plugins/nsfw/init.php:42
 msgid "Not work safe (click to toggle)"
 msgstr "Non sicuro per luoghi di lavoro (clicca per attivare)"
 
@@ -2397,11 +2519,13 @@ msgstr "Tag da considerare NSFW (divisi da virgole)"
 msgid "Configuration saved."
 msgstr "La configurazione è stata salvata."
 
-#: plugins/note/init.php:26 plugins/note/note.js:11
+#: plugins/note/init.php:26
+#: plugins/note/note.js:11
 msgid "Edit article note"
 msgstr "Modifica note articolo"
 
-#: plugins/vf_shared/init.php:16 plugins/vf_shared/init.php:69
+#: plugins/vf_shared/init.php:16
+#: plugins/vf_shared/init.php:69
 msgid "Shared articles"
 msgstr "Articoli condivisi"
 
@@ -2433,7 +2557,8 @@ msgstr "Impostazioni di af_readability"
 msgid "Use Readability for pages shared via bookmarklet."
 msgstr "Usa Readability per i contenuti condivisi via bookmarklet."
 
-#: plugins/af_readability/init.php:82 plugins/af_psql_trgm/init.php:195
+#: plugins/af_readability/init.php:82
+#: plugins/af_psql_trgm/init.php:195
 msgid "Currently enabled for (click to edit):"
 msgstr "Attualmente attivo per (clicca per modificare):"
 
@@ -2450,12 +2575,8 @@ msgid "af_redditimgur settings"
 msgstr "Impostazioni di af_redditimgur"
 
 #: plugins/af_redditimgur/init.php:53
-msgid ""
-"Uses Readability (full-text-rss) implementation by <a target='_blank' "
-"href='https://bitbucket.org/fivefilters/'>FiveFilters.org</a>"
-msgstr ""
-"Usa Readability (full-text-rss) nell'implementazione di <a target='_blank' "
-"href='https://bitbucket.org/fivefilters/'>FiveFilters.org</a>"
+msgid "Uses Readability (full-text-rss) implementation by <a target='_blank' href='https://bitbucket.org/fivefilters/'>FiveFilters.org</a>"
+msgstr "Usa Readability (full-text-rss) nell'implementazione di <a target='_blank' href='https://bitbucket.org/fivefilters/'>FiveFilters.org</a>"
 
 #: plugins/af_redditimgur/init.php:59
 msgid "Extract missing content using Readability"
@@ -2478,20 +2599,14 @@ msgstr "Data salvata (%s, %d)"
 msgid "Show related articles"
 msgstr "Mostra articoli collegati"
 
-#: plugins/af_psql_trgm/init.php:118 plugins/af_psql_trgm/init.php:223
+#: plugins/af_psql_trgm/init.php:118
+#: plugins/af_psql_trgm/init.php:223
 msgid "Mark similar articles as read"
 msgstr "Segnare tutti gli articoli simili come letti"
 
 #: plugins/af_psql_trgm/init.php:159
-msgid ""
-"PostgreSQL trigram extension returns string similarity as a floating point "
-"number (0-1). Setting it too low might produce false positives, zero "
-"disables checking."
-msgstr ""
-"L'estensione di PostgreSQL Trigram ritorna la somiglianza di stringhe "
-"espressa come numero a virgola mobile (0-1). Impostare un valore troppo "
-"basso può produrre dei falsi positivi, impostarlo a zero disabilita il "
-"controllo."
+msgid "PostgreSQL trigram extension returns string similarity as a floating point number (0-1). Setting it too low might produce false positives, zero disables checking."
+msgstr "L'estensione di PostgreSQL Trigram ritorna la somiglianza di stringhe espressa come numero a virgola mobile (0-1). Impostare un valore troppo basso può produrre dei falsi positivi, impostarlo a zero disabilita il controllo."
 
 #: plugins/af_psql_trgm/init.php:162
 msgid "Global settings"
@@ -2526,12 +2641,8 @@ msgid "Import and export"
 msgstr "Importa e esporta"
 
 #: plugins/import_export/init.php:60
-msgid ""
-"You can export and import your Starred and Archived articles for safekeeping "
-"or when migrating between tt-rss instances of same version."
-msgstr ""
-"Puoi esportare e importare i tuoi articoli preferiti e archiviati per backup "
-"o per portarli da un'installazione di Tiny Tiny RSS all'altra."
+msgid "You can export and import your Starred and Archived articles for safekeeping or when migrating between tt-rss instances of same version."
+msgstr "Puoi esportare e importare i tuoi articoli preferiti e archiviati per backup o per portarli da un'installazione di Tiny Tiny RSS all'altra."
 
 #: plugins/import_export/init.php:65
 msgid "Export my data"
@@ -2582,6 +2693,11 @@ msgstr "Documento XML non caricato."
 msgid "Prepare data"
 msgstr "Prepara dati"
 
+#: plugins/import_export/init.php:428
+#, fuzzy, php-format
+msgid "Upload failed with error code %d (%s)"
+msgstr "Caricamento fallito con codice errore %d"
+
 #: plugins/import_export/init.php:454
 msgid "No file uploaded."
 msgstr "Nessun file caricato."
@@ -2596,15 +2712,17 @@ msgstr "Plugin Mail"
 
 #: plugins/mail/init.php:36
 msgid "You can set predefined email addressed here (comma-separated list):"
-msgstr ""
-"Puoi inserire gli indirizzi email predefiniti qui (separati da virgole):"
+msgstr "Puoi inserire gli indirizzi email predefiniti qui (separati da virgole):"
 
-#: plugins/mail/init.php:112 plugins/mail/init.php:118
-#: plugins/mailto/init.php:49 plugins/mailto/init.php:55
+#: plugins/mail/init.php:112
+#: plugins/mail/init.php:118
+#: plugins/mailto/init.php:49
+#: plugins/mailto/init.php:55
 msgid "[Forwarded]"
 msgstr "[Inoltrato]"
 
-#: plugins/mail/init.php:112 plugins/mailto/init.php:49
+#: plugins/mail/init.php:112
+#: plugins/mailto/init.php:49
 msgid "Multiple articles"
 msgstr "Articoli multipli"
 
@@ -2629,13 +2747,8 @@ msgid "Bookmarklets"
 msgstr "Bookmarklets"
 
 #: plugins/bookmarklets/init.php:22
-msgid ""
-"Drag the link below to your browser toolbar, open the feed you're interested "
-"in in your browser and click on the link to subscribe to it."
-msgstr ""
-"Trascinare il collegamento seguente nella barra degli strumenti del browser; "
-"aprire il notiziario al quale si è interessati nel browser e fare clic sul "
-"collegamento per sottoscriverlo."
+msgid "Drag the link below to your browser toolbar, open the feed you're interested in in your browser and click on the link to subscribe to it."
+msgstr "Trascinare il collegamento seguente nella barra degli strumenti del browser; aprire il notiziario al quale si è interessati nel browser e fare clic sul collegamento per sottoscriverlo."
 
 #: plugins/bookmarklets/init.php:26
 #, php-format
@@ -2648,8 +2761,7 @@ msgstr "Sottoscrivi in Tiny Tiny RSS"
 
 #: plugins/bookmarklets/init.php:34
 msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
-msgstr ""
-"Usa questo bookmarklet per condividere qualsiasi pagina usando Tiny Tiny RSS"
+msgstr "Usa questo bookmarklet per condividere qualsiasi pagina usando Tiny Tiny RSS"
 
 #: plugins/mailto/init.php:71
 msgid "Clicking the following link to invoke your mail client:"
@@ -2660,8 +2772,7 @@ msgid "Forward selected article(s) by email."
 msgstr "Inoltra l'articolo per email."
 
 #: plugins/mailto/init.php:78
-msgid ""
-"You should be able to edit the message before sending in your mail client."
+msgid "You should be able to edit the message before sending in your mail client."
 msgstr "Puoi modificare l'articolo nel tuo client di posta prima di inviarlo."
 
 #: plugins/mailto/init.php:83
@@ -2696,7 +2807,7 @@ msgstr "Modifica categoria"
 msgid "Remove category"
 msgstr "Rimuovi la categoria"
 
-#: js/PrefFilterTree.js:64
+#: js/PrefFilterTree.js:67
 msgid "Inverse"
 msgstr "Inverso"
 
@@ -2713,14 +2824,8 @@ msgid "Close"
 msgstr "Chiudi"
 
 #: js/functions.js:104
-msgid ""
-"Are you sure to report this exception to tt-rss.org? The report will include "
-"information about your web browser and tt-rss configuration. Your IP will be "
-"saved in the database."
-msgstr ""
-"Si vuole notificare questa eccezione a tt-rss.org? La notifica includerà le "
-"informazioni sul browser e sulla configurazione di tt-rss. L'IP verrà "
-"salvato in un database."
+msgid "Are you sure to report this exception to tt-rss.org? The report will include information about your web browser and tt-rss configuration. Your IP will be saved in the database."
+msgstr "Si vuole notificare questa eccezione a tt-rss.org? La notifica includerà le informazioni sul browser e sulla configurazione di tt-rss. L'IP verrà salvato in un database."
 
 #: js/functions.js:224
 msgid "Click to close"
@@ -2745,18 +2850,15 @@ msgid "Create Filter"
 msgstr "Crea filtro"
 
 #: js/functions.js:1290
-msgid ""
-"Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
-"hub again on next feed update."
-msgstr ""
-"Reimpostare la sottoscrizione? Tiny Tiny RSS proverà ancora al prossimo "
-"aggiornamento del notiziario a sottoscrivere il centro notifiche."
+msgid "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification hub again on next feed update."
+msgstr "Reimpostare la sottoscrizione? Tiny Tiny RSS proverà ancora al prossimo aggiornamento del notiziario a sottoscrivere il centro notifiche."
 
 #: js/functions.js:1301
 msgid "Subscription reset."
 msgstr "Sottoscrizione reimpostata."
 
-#: js/functions.js:1311 js/tt-rss.js:682
+#: js/functions.js:1311
+#: js/tt-rss.js:705
 #, perl-format
 msgid "Unsubscribe from %s?"
 msgstr "Annullare la sottoscrizione a %s?"
@@ -2773,33 +2875,38 @@ msgstr "Inserire il titolo della categoria:"
 msgid "Generate new syndication address for this feed?"
 msgstr "Generare un nuovo indirizzo per questo notiziario?"
 
-#: js/functions.js:1456 js/prefs.js:1223
+#: js/functions.js:1456
+#: js/prefs.js:1223
 msgid "Trying to change address..."
 msgstr "Provo a cambiare indirizzo..."
 
-#: js/functions.js:1757 js/functions.js:1867 js/prefs.js:419 js/prefs.js:449
-#: js/prefs.js:481 js/prefs.js:634 js/prefs.js:654 js/prefs.js:1199
+#: js/functions.js:1757
+#: js/functions.js:1867
+#: js/prefs.js:419
+#: js/prefs.js:449
+#: js/prefs.js:481
+#: js/prefs.js:634
+#: js/prefs.js:654
+#: js/prefs.js:1199
 #: js/prefs.js:1344
 msgid "No feeds are selected."
 msgstr "Nessun notiziario selezionato."
 
 #: js/functions.js:1799
-msgid ""
-"Remove selected feeds from the archive? Feeds with stored articles will not "
-"be removed."
-msgstr ""
-"Rimuovere i notiziari selezionati dall'archivio? I notiziari con articoli "
-"archiviati non saranno rimossi."
+msgid "Remove selected feeds from the archive? Feeds with stored articles will not be removed."
+msgstr "Rimuovere i notiziari selezionati dall'archivio? I notiziari con articoli archiviati non saranno rimossi."
 
 #: js/functions.js:1838
 msgid "Feeds with update errors"
 msgstr "Notiziari con errori di aggiornamento"
 
-#: js/functions.js:1849 js/prefs.js:1181
+#: js/functions.js:1849
+#: js/prefs.js:1181
 msgid "Remove selected feeds?"
 msgstr "Rimuovere i notiziari selezionati?"
 
-#: js/functions.js:1852 js/prefs.js:1184
+#: js/functions.js:1852
+#: js/prefs.js:1184
 msgid "Removing selected feeds..."
 msgstr "Rimuovendo i notiziari selezionati..."
 
@@ -2819,8 +2926,11 @@ msgstr "Creando utente..."
 msgid "User Editor"
 msgstr "Editor utente"
 
-#: js/prefs.js:112 js/prefs.js:216 js/prefs.js:741
-#: plugins/instances/instances.js:26 plugins/instances/instances.js:89
+#: js/prefs.js:112
+#: js/prefs.js:216
+#: js/prefs.js:741
+#: plugins/instances/instances.js:26
+#: plugins/instances/instances.js:89
 #: js/functions.js:1664
 msgid "Saving data..."
 msgstr "Salvando dati..."
@@ -2845,23 +2955,23 @@ msgstr "Rimuovere le etichette selezionate?"
 msgid "Removing selected labels..."
 msgstr "Rimuovendo le etichette selezionate..."
 
-#: js/prefs.js:317 js/prefs.js:1385
+#: js/prefs.js:317
+#: js/prefs.js:1385
 msgid "No labels are selected."
 msgstr "Nessuna etichetta selezionata."
 
 #: js/prefs.js:331
-msgid ""
-"Remove selected users? Neither default admin nor your account will be "
-"removed."
-msgstr ""
-"Rimuovere gli utenti selezionati? Non saranno rimossi l'amministratore "
-"predefinito e il proprio utente."
+msgid "Remove selected users? Neither default admin nor your account will be removed."
+msgstr "Rimuovere gli utenti selezionati? Non saranno rimossi l'amministratore predefinito e il proprio utente."
 
 #: js/prefs.js:334
 msgid "Removing selected users..."
 msgstr "Rimuovendo gli utenti selezionati..."
 
-#: js/prefs.js:348 js/prefs.js:492 js/prefs.js:513 js/prefs.js:552
+#: js/prefs.js:348
+#: js/prefs.js:492
+#: js/prefs.js:513
+#: js/prefs.js:552
 msgid "No users are selected."
 msgstr "Nessun utente selezionato."
 
@@ -2873,7 +2983,9 @@ msgstr "Rimuovere i filtri selezionati?"
 msgid "Removing selected filters..."
 msgstr "Rimuovendo i filtri selezionati..."
 
-#: js/prefs.js:381 js/prefs.js:589 js/prefs.js:608
+#: js/prefs.js:381
+#: js/prefs.js:589
+#: js/prefs.js:608
 msgid "No filters are selected."
 msgstr "Nessun filtro selezionato."
 
@@ -2891,8 +3003,7 @@ msgstr "Selezionare solo un notiziario."
 
 #: js/prefs.js:440
 msgid "Erase all non-starred articles in selected feed?"
-msgstr ""
-"Eliminare tutti gli articoli senza la stella nel notiziario selezionato?"
+msgstr "Eliminare tutti gli articoli senza la stella nel notiziario selezionato?"
 
 #: js/prefs.js:443
 msgid "Clearing selected feed..."
@@ -2900,15 +3011,15 @@ msgstr "Cancellando i notiziari selezionati..."
 
 #: js/prefs.js:462
 msgid "How many days of articles to keep (0 - use default)?"
-msgstr ""
-"Per quanti giorni vuoi conservare gli articoli? (0 - usa il valore "
-"predefinito)?"
+msgstr "Per quanti giorni vuoi conservare gli articoli? (0 - usa il valore predefinito)?"
 
 #: js/prefs.js:465
 msgid "Purging selected feed..."
 msgstr "Pulendo i notiziari selezionati..."
 
-#: js/prefs.js:497 js/prefs.js:518 js/prefs.js:557
+#: js/prefs.js:497
+#: js/prefs.js:518
+#: js/prefs.js:557
 msgid "Please select only one user."
 msgstr "Selezionare un solo utente."
 
@@ -2948,7 +3059,8 @@ msgstr "Importazione OPML"
 msgid "Please choose an OPML file first."
 msgstr "Scegliere prima un file OPML."
 
-#: js/prefs.js:807 plugins/import_export/import_export.js:115
+#: js/prefs.js:807
+#: plugins/import_export/import_export.js:115
 msgid "Importing, please wait..."
 msgstr "Importando, attendere prego..."
 
@@ -2976,42 +3088,53 @@ msgstr "Segnare tutti gli articoli come letti?"
 msgid "Marking all feeds as read..."
 msgstr "Segnando tutti i notiziari come letti..."
 
-#: js/tt-rss.js:383
+#: js/tt-rss.js:404
 msgid "Please enable mail plugin first."
 msgstr "Per favore, prima attiva il plugin email."
 
-#: js/tt-rss.js:431 js/functions.js:1643 js/tt-rss.js:663
+#: js/tt-rss.js:452
+#: js/functions.js:1643
+#: js/tt-rss.js:686
 msgid "You can't edit this kind of feed."
 msgstr "Impossibile modificare questo tipo di notiziario."
 
-#: js/tt-rss.js:502
+#: js/tt-rss.js:533
 msgid "Please enable embed_original plugin first."
 msgstr "Per favore, prima attiva il plugin embed_original."
 
-#: js/tt-rss.js:515 js/tt-rss.js:713
+#: js/tt-rss.js:546
+#: js/tt-rss.js:736
 msgid "Widescreen is not available in combined mode."
 msgstr "Widescreen non disponibile nella modalità combinata."
 
-#: js/tt-rss.js:827
+#: js/tt-rss.js:850
 msgid "You can't rescore this kind of feed."
 msgstr "Impossibile cambiare il punteggio a questo tipo di notiziari."
 
-#: js/tt-rss.js:832 js/tt-rss.js:676
+#: js/tt-rss.js:855
+#: js/tt-rss.js:699
 msgid "Please select some feed first."
 msgstr "Selezionare prima qualche notiziario."
 
-#: js/tt-rss.js:837
+#: js/tt-rss.js:860
 #, perl-format
 msgid "Rescore articles in %s?"
 msgstr "Cambiare il punteggio degli articoli in %s ?"
 
-#: js/tt-rss.js:840
+#: js/tt-rss.js:863
 msgid "Rescoring articles..."
 msgstr "Cambiando punteggio degli articoli..."
 
-#: js/viewfeed.js:1011 js/viewfeed.js:1054 js/viewfeed.js:1107
-#: js/viewfeed.js:2166 plugins/mail/mail.js:7 plugins/mailto/init.js:7
-#: js/viewfeed.js:733 js/viewfeed.js:761 js/viewfeed.js:788 js/viewfeed.js:853
+#: js/viewfeed.js:1011
+#: js/viewfeed.js:1054
+#: js/viewfeed.js:1107
+#: js/viewfeed.js:2166
+#: plugins/mail/mail.js:7
+#: plugins/mailto/init.js:7
+#: js/viewfeed.js:733
+#: js/viewfeed.js:761
+#: js/viewfeed.js:788
+#: js/viewfeed.js:853
 #: js/viewfeed.js:887
 msgid "No articles are selected."
 msgstr "Nessun articolo selezionato."
@@ -3045,11 +3168,8 @@ msgstr[0] "Spostare %d articolo archiviato indietro?"
 msgstr[1] "Spostare %d articoli archiviati indietro?"
 
 #: js/viewfeed.js:1068
-msgid ""
-"Please note that unstarred articles might get purged on next feed update."
-msgstr ""
-"Per favore, considera che gli articoli a cui è stata tolta la stella "
-"potrebbero essere cancellati al prossimo aggiornamento dei notiziari."
+msgid "Please note that unstarred articles might get purged on next feed update."
+msgstr "Per favore, considera che gli articoli a cui è stata tolta la stella potrebbero essere cancellati al prossimo aggiornamento dei notiziari."
 
 #: js/viewfeed.js:1113
 #, perl-format
@@ -3122,7 +3242,8 @@ msgstr "Rimuovere le istanze selezionate?"
 msgid "Removing selected instances..."
 msgstr "Rimuovendo le istanze selezionate..."
 
-#: plugins/instances/instances.js:139 plugins/instances/instances.js:151
+#: plugins/instances/instances.js:139
+#: plugins/instances/instances.js:151
 msgid "No instances are selected."
 msgstr "Nessuna istanza selezionata."
 
@@ -3144,18 +3265,10 @@ msgstr "Esporta dati"
 
 #: plugins/import_export/import_export.js:40
 #, perl-format
-msgid ""
-"Finished, exported %d article. You can download the data <a "
-"class='visibleLink' href='%u'>here</a>."
-msgid_plural ""
-"Finished, exported %d articles. You can download the data <a "
-"class='visibleLink' href='%u'>here</a>."
-msgstr[0] ""
-"Completato, esportato %d articolo. Puoi scaricare i dati <a "
-"class='visibleLink' href='%u'>qui</a>."
-msgstr[1] ""
-"Completato, esportati %d articoli. Puoi scaricare i dati <a "
-"class='visibleLink' href='%u'>qui</a>."
+msgid "Finished, exported %d article. You can download the data <a class='visibleLink' href='%u'>here</a>."
+msgid_plural "Finished, exported %d articles. You can download the data <a class='visibleLink' href='%u'>here</a>."
+msgstr[0] "Completato, esportato %d articolo. Puoi scaricare i dati <a class='visibleLink' href='%u'>qui</a>."
+msgstr[1] "Completato, esportati %d articoli. Puoi scaricare i dati <a class='visibleLink' href='%u'>qui</a>."
 
 #: plugins/import_export/import_export.js:93
 msgid "Data Import"
@@ -3165,7 +3278,8 @@ msgstr "Importa dati"
 msgid "Please choose the file first."
 msgstr "Scegli prima il file, per favore."
 
-#: plugins/mail/mail.js:21 plugins/mailto/init.js:21
+#: plugins/mail/mail.js:21
+#: plugins/mailto/init.js:21
 msgid "Forward article by email"
 msgstr "Inoltra l'articolo per email"
 
@@ -3181,7 +3295,7 @@ msgstr "Il messaggio è stato inviato."
 msgid "Sorry, your browser does not support sandboxed iframes."
 msgstr "Mi dispiace, il browser non supporda gli iframe nella sandbox."
 
-#: plugins/shorten_expanded/init.js:37
+#: plugins/shorten_expanded/init.js:39
 msgid "Click to expand article"
 msgstr "Fare clic per espandere l'articolo."
 
@@ -3207,11 +3321,10 @@ msgstr "Provando a togliere la condivisione..."
 
 #: plugins/share/share_prefs.js:3
 msgid "This will invalidate all previously shared article URLs. Continue?"
-msgstr ""
-"Questo renderà non più accessibili tutti gli URL degli articoli "
-"precedentemente condivisi. Procedere?"
+msgstr "Questo renderà non più accessibili tutti gli URL degli articoli precedentemente condivisi. Procedere?"
 
-#: plugins/share/share_prefs.js:6 js/prefs.js:1523
+#: plugins/share/share_prefs.js:6
+#: js/prefs.js:1523
 msgid "Clearing URLs..."
 msgstr "Cancellando gli URL..."
 
@@ -3219,7 +3332,8 @@ msgstr "Cancellando gli URL..."
 msgid "Shared URLs cleared."
 msgstr "ULR condivisi cancellati."
 
-#: js/feedlist.js:446 js/feedlist.js:518
+#: js/feedlist.js:446
+#: js/feedlist.js:518
 msgid "Mark all articles in %s as read?"
 msgstr "Segnare tutti gli articoli in %s come letti?"
 
@@ -3229,13 +3343,11 @@ msgstr "Segnare tutti gli articoli in %s più vecchi di un giorno come letti?"
 
 #: js/feedlist.js:512
 msgid "Mark all articles in %s older than 1 week as read?"
-msgstr ""
-"Segnare tutti gli articoli in %s più vecchi di una settimana come letti?"
+msgstr "Segnare tutti gli articoli in %s più vecchi di una settimana come letti?"
 
 #: js/feedlist.js:515
 msgid "Mark all articles in %s older than 2 weeks as read?"
-msgstr ""
-"Segnare tutti gli articoli in %s più vecchi di due settimane come letti?"
+msgstr "Segnare tutti gli articoli in %s più vecchi di due settimane come letti?"
 
 #: js/functions.js:600
 msgid "Error explained"
@@ -3282,13 +3394,8 @@ msgid "Subscribe to Feed"
 msgstr "Sottoscrivi il notiziario"
 
 #: js/functions.js:824
-msgid ""
-"Failed to parse output. This can indicate server timeout and/or network "
-"issues. Backend output was logged to browser console."
-msgstr ""
-"Errore nella creazione dell'output. Questo può essere dovuto a un timeout "
-"del server o a altri problemi di rete. Il messaggio del backend è stato "
-"inviato alla console del browser."
+msgid "Failed to parse output. This can indicate server timeout and/or network issues. Backend output was logged to browser console."
+msgstr "Errore nella creazione dell'output. Questo può essere dovuto a un timeout del server o a altri problemi di rete. Il messaggio del backend è stato inviato alla console del browser."
 
 #: js/functions.js:839
 msgid "Subscribed to %s"
@@ -3335,11 +3442,8 @@ msgid "Help"
 msgstr "Aiuto"
 
 #: js/prefs.js:1088
-msgid ""
-"Remove category %s? Any nested feeds would be placed into Uncategorized."
-msgstr ""
-"Rimuovere la categoria %s ? Ogni notiziario incluso verrà inserito in Senza "
-"categoria."
+msgid "Remove category %s? Any nested feeds would be placed into Uncategorized."
+msgstr "Rimuovere la categoria %s ? Ogni notiziario incluso verrà inserito in Senza categoria."
 
 #: js/prefs.js:1094
 msgid "Removing category..."
@@ -3387,9 +3491,7 @@ msgstr "Cambiando il punteggio agli articoli nel notiziario selezionato..."
 
 #: js/prefs.js:1351
 msgid "Rescore all articles? This operation may take a lot of time."
-msgstr ""
-"Cambiare il punteggio a tutti gli articoli? Questa operazione può durare "
-"molto tempo."
+msgstr "Cambiare il punteggio a tutti gli articoli? Questa operazione può durare molto tempo."
 
 #: js/prefs.js:1354
 msgid "Rescoring feeds..."
@@ -3404,11 +3506,8 @@ msgid "Settings Profiles"
 msgstr "Impostazioni dei profili"
 
 #: js/prefs.js:1417
-msgid ""
-"Remove selected profiles? Active and default profiles will not be removed."
-msgstr ""
-"Rimuovere i profili selezionati? Il profilo attivo e quello predefinito non "
-"saranno rimossi."
+msgid "Remove selected profiles? Active and default profiles will not be removed."
+msgstr "Rimuovere i profili selezionati? Il profilo attivo e quello predefinito non saranno rimossi."
 
 #: js/prefs.js:1420
 msgid "Removing selected profiles..."
@@ -3418,11 +3517,13 @@ msgstr "Rimuovendo i profili selezionati..."
 msgid "No profiles are selected."
 msgstr "Nessun profilo selezionato."
 
-#: js/prefs.js:1443 js/prefs.js:1496
+#: js/prefs.js:1443
+#: js/prefs.js:1496
 msgid "Activate selected profile?"
 msgstr "Attivare il profilo selezionato?"
 
-#: js/prefs.js:1459 js/prefs.js:1512
+#: js/prefs.js:1459
+#: js/prefs.js:1512
 msgid "Please choose a profile to activate."
 msgstr "Scegliere un profilo da attivare."
 
@@ -3432,9 +3533,7 @@ msgstr "Creando profilo..."
 
 #: js/prefs.js:1520
 msgid "This will invalidate all previously generated feed URLs. Continue?"
-msgstr ""
-"Questo renderà non più accessibili tutti gli URL dei notiziari generati. "
-"Procedere?"
+msgstr "Questo renderà non più accessibili tutti gli URL dei notiziari generati. Procedere?"
 
 #: js/prefs.js:1530
 msgid "Generated URLs cleared."
@@ -3444,11 +3543,13 @@ msgstr "URL generati cancellati."
 msgid "Label Editor"
 msgstr "Editor etichette"
 
-#: js/tt-rss.js:671
+#: js/tt-rss.js:694
 msgid "You can't unsubscribe from the category."
 msgstr "Impossibile annullare la sottoscrizione alla categoria."
 
-#: js/viewfeed.js:128 js/viewfeed.js:178 js/viewfeed.js:195
+#: js/viewfeed.js:128
+#: js/viewfeed.js:178
+#: js/viewfeed.js:195
 msgid "Click to open next unread feed."
 msgstr "Clicca per passare al prossimo notiziario da leggere."
 
@@ -3508,13 +3609,8 @@ msgstr[1] "Segnare %d articoli come letti?"
 #~ msgid "Details"
 #~ msgstr "Dettagli"
 
-#~ msgid ""
-#~ "Published OPML does not include your Tiny Tiny RSS settings, feeds that "
-#~ "require authentication or feeds hidden from Popular feeds."
-#~ msgstr ""
-#~ "L'OPML pubblicato non contiene le impostazioni di Tiny Tiny RSS, i "
-#~ "notiziari che richiedono l'autenticazione o quelli nascosti dai notiziari "
-#~ "Popolari."
+#~ msgid "Published OPML does not include your Tiny Tiny RSS settings, feeds that require authentication or feeds hidden from Popular feeds."
+#~ msgstr "L'OPML pubblicato non contiene le impostazioni di Tiny Tiny RSS, i notiziari che richiedono l'autenticazione o quelli nascosti dai notiziari Popolari."
 
 #~ msgid "No recent articles matching this filter have been found."
 #~ msgstr "Nessun articolo recente trovato che corrisponde a questo filtro."
@@ -3547,8 +3643,7 @@ msgstr[1] "Segnare %d articoli come letti?"
 #~ msgstr "Statistiche"
 
 #~ msgid "Required UGLY word count for automatic matching: %d"
-#~ msgstr ""
-#~ "Numero di parole UGLY (pessime) richieste per il matching automatico: %d"
+#~ msgstr "Numero di parole UGLY (pessime) richieste per il matching automatico: %d"
 
 #~ msgid "Last matched articles"
 #~ msgstr "Ultimi articoli ordinati"
@@ -3589,13 +3684,8 @@ msgstr[1] "Segnare %d articoli come letti?"
 #~ msgid "This feed"
 #~ msgstr "Questo notiziario"
 
-#~ msgid ""
-#~ "Complex expressions might not give results while testing due to issues "
-#~ "with database server regexp implementation."
-#~ msgstr ""
-#~ "Espressioni complesse potrebbero non mostrare i risultati corretti "
-#~ "durante il test a causa di problemi del server con la gestione delle "
-#~ "espressioni regolari."
+#~ msgid "Complex expressions might not give results while testing due to issues with database server regexp implementation."
+#~ msgstr "Espressioni complesse potrebbero non mostrare i risultati corretti durante il test a causa di problemi del server con la gestione delle espressioni regolari."
 
 #~ msgid "Old password cannot be blank."
 #~ msgstr "La vecchia password non può essere vuota."
@@ -3640,8 +3730,7 @@ msgstr[1] "Segnare %d articoli come letti?"
 
 #, fuzzy
 #~ msgid "Session failed to validate (user agent changed)"
-#~ msgstr ""
-#~ "La validazione della sessione è fallita (user agent del browser cambiato)"
+#~ msgstr "La validazione della sessione è fallita (user agent del browser cambiato)"
 
 #~ msgid "Assign articles to labels automatically"
 #~ msgstr "Assegnare automaticamente etichette agli articoli"
@@ -3649,11 +3738,8 @@ msgstr[1] "Segnare %d articoli come letti?"
 #~ msgid "New version of Tiny Tiny RSS is available (%s)."
 #~ msgstr "È disponibile una nuova versione di Tiny Tiny RSS (%s)."
 
-#~ msgid ""
-#~ "You can update using built-in updater in the Preferences or by using "
-#~ "update.php"
-#~ msgstr ""
-#~ "Si può aggiornare tramite l&apos;updater incluso o tramite update.php"
+#~ msgid "You can update using built-in updater in the Preferences or by using update.php"
+#~ msgstr "Si può aggiornare tramite l&apos;updater incluso o tramite update.php"
 
 #~ msgid "See the release notes"
 #~ msgstr "Leggere le note di rilascio"
@@ -3662,9 +3748,7 @@ msgstr[1] "Segnare %d articoli come letti?"
 #~ msgstr "Scarica"
 
 #~ msgid "Error receiving version information or no new version available."
-#~ msgstr ""
-#~ "Errore nel ricevere le informazioni sulla versione o nessuna nuova "
-#~ "versione disponibile."
+#~ msgstr "Errore nel ricevere le informazioni sulla versione o nessuna nuova versione disponibile."
 
 #, fuzzy
 #~ msgid "Update Tiny Tiny RSS"
@@ -3687,14 +3771,8 @@ msgstr[1] "Segnare %d articoli come letti?"
 #~ msgid "Your database will not be modified."
 #~ msgstr "Il tuo database non sarà modificato"
 
-#~ msgid ""
-#~ "Your current tt-rss installation directory will not be modified. It will "
-#~ "be renamed and left in the parent directory. You will be able to migrate "
-#~ "all your customized files after update finishes."
-#~ msgstr ""
-#~ "La tua attuale installazione di tt-rss non verrà modificata. Verrà "
-#~ "rinominata e lasciate nella directory principale. Potrai migrare i tuoi "
-#~ "file dopi la fine dell'update."
+#~ msgid "Your current tt-rss installation directory will not be modified. It will be renamed and left in the parent directory. You will be able to migrate all your customized files after update finishes."
+#~ msgstr "La tua attuale installazione di tt-rss non verrà modificata. Verrà rinominata e lasciate nella directory principale. Potrai migrare i tuoi file dopi la fine dell'update."
 
 #, fuzzy
 #~ msgid "Ready to update."
@@ -3704,11 +3782,8 @@ msgstr[1] "Segnare %d articoli come letti?"
 #~ msgid "Start update"
 #~ msgstr "Avvia aggiornamento"
 
-#~ msgid ""
-#~ "Backup your tt-rss directory before continuing. Please type 'yes' to "
-#~ "continue."
-#~ msgstr ""
-#~ "Fai il backup della directory di tt-rss. Scrivi 'sì' per continuare."
+#~ msgid "Backup your tt-rss directory before continuing. Please type 'yes' to continue."
+#~ msgstr "Fai il backup della directory di tt-rss. Scrivi 'sì' per continuare."
 
 #~ msgid "From:"
 #~ msgstr "Da:"
@@ -3747,13 +3822,8 @@ msgstr[1] "Segnare %d articoli come letti?"
 #~ msgstr "Questi notiziari non sono stati aggiornati a causa di errori:"
 
 #, fuzzy
-#~ msgid ""
-#~ "Your browser doesn't support Javascript, which is required for this "
-#~ "application to function properly. Please check your browser settings."
-#~ msgstr ""
-#~ "Il browser non supporta Javascript, che è richiesto da questa "
-#~ "applicazione per funzionare correttamente. Controllare le impostazioni "
-#~ "del browser."
+#~ msgid "Your browser doesn't support Javascript, which is required for this application to function properly. Please check your browser settings."
+#~ msgstr "Il browser non supporta Javascript, che è richiesto da questa applicazione per funzionare correttamente. Controllare le impostazioni del browser."
 
 #~ msgid "Hello,"
 #~ msgstr "Salve,"
@@ -3854,12 +3924,8 @@ msgstr[1] "Segnare %d articoli come letti?"
 #~ msgid "Please backup your database before proceeding."
 #~ msgstr "Fare il backup del database prima di procedere."
 
-#~ msgid ""
-#~ "Your Tiny Tiny RSS database needs update to the latest version (<b>%d</b> "
-#~ "to <b>%d</b>)."
-#~ msgstr ""
-#~ "Il database di Tiny Tiny RSS deve essere aggiornato all&apos;ultima "
-#~ "versione (<b>%d</b> a <b>%d</b>)."
+#~ msgid "Your Tiny Tiny RSS database needs update to the latest version (<b>%d</b> to <b>%d</b>)."
+#~ msgstr "Il database di Tiny Tiny RSS deve essere aggiornato all&apos;ultima versione (<b>%d</b> a <b>%d</b>)."
 
 #~ msgid "Performing updates..."
 #~ msgstr "Esecuzione aggiornamenti..."
@@ -3878,38 +3944,24 @@ msgstr[1] "Segnare %d articoli come letti?"
 
 #, fuzzy
 #~ msgid "Finished. Performed <b>%d</b> update up to schema version <b>%d</b>."
-#~ msgid_plural ""
-#~ "Finished. Performed <b>%d</b> updates up to schema version <b>%d</b>."
-#~ msgstr[0] ""
-#~ "Fine. Eseguito/i <b>%d</b> aggiornamento fino allo schema versione <b>%d</"
-#~ "b>."
-#~ msgstr[1] ""
-#~ "Fine. Eseguito/i <b>%d</b> aggiornamenti fino allo schema versione <b>%d</"
-#~ "b>."
+#~ msgid_plural "Finished. Performed <b>%d</b> updates up to schema version <b>%d</b>."
+#~ msgstr[0] "Fine. Eseguito/i <b>%d</b> aggiornamento fino allo schema versione <b>%d</b>."
+#~ msgstr[1] "Fine. Eseguito/i <b>%d</b> aggiornamenti fino allo schema versione <b>%d</b>."
 
 #~ msgid "Your database schema is from a newer version of Tiny Tiny RSS."
-#~ msgstr ""
-#~ "Lo schema del database è di una versione più recente di Tiny Tiny RSS."
+#~ msgstr "Lo schema del database è di una versione più recente di Tiny Tiny RSS."
 
 #~ msgid "Found schema version: <b>%d</b>, required: <b>%d</b>."
 #~ msgstr "Versione dello schema trovata: <b>%d</b>, richiesta: <b>%d</b>."
 
-#~ msgid ""
-#~ "Schema upgrade impossible. Please update Tiny Tiny RSS files to the newer "
-#~ "version and continue."
-#~ msgstr ""
-#~ "Impossibile aggiornare lo schema. Aggiornare i file di Tiny Tiny RSS a "
-#~ "una nuova versione e continuare."
+#~ msgid "Schema upgrade impossible. Please update Tiny Tiny RSS files to the newer version and continue."
+#~ msgstr "Impossibile aggiornare lo schema. Aggiornare i file di Tiny Tiny RSS a una nuova versione e continuare."
 
 #~ msgid "Enable external API"
 #~ msgstr "Attiva API esterna"
 
-#~ msgid ""
-#~ "When this option is enabled, headlines in Special feeds and Labels are "
-#~ "grouped by feeds"
-#~ msgstr ""
-#~ "Quando questa opzione è attivata, i sommari nei notiziari speciali e "
-#~ "nelle etichette vengono raggruppati per notiziario"
+#~ msgid "When this option is enabled, headlines in Special feeds and Labels are grouped by feeds"
+#~ msgstr "Quando questa opzione è attivata, i sommari nei notiziari speciali e nelle etichette vengono raggruppati per notiziario"
 
 #~ msgid "Title or Content"
 #~ msgstr "Titolo o contenuto"
@@ -3929,15 +3981,8 @@ msgstr[1] "Segnare %d articoli come letti?"
 #~ msgid "Assign tags"
 #~ msgstr "Assegna etichette"
 
-#~ msgid ""
-#~ "This option is useful when you are reading several planet-type "
-#~ "aggregators with partially colliding userbase. When disabled, it forces "
-#~ "same posts from different feeds to appear only once."
-#~ msgstr ""
-#~ "Questa opzione è utile quando si stanno leggendo vari aggregatori di tipo "
-#~ "«planet» con utenti che si sovrappongono parzialmente. Quando disattivata "
-#~ "forza articoli identici da notiziari differenti ad apparire una volta "
-#~ "sola."
+#~ msgid "This option is useful when you are reading several planet-type aggregators with partially colliding userbase. When disabled, it forces same posts from different feeds to appear only once."
+#~ msgstr "Questa opzione è utile quando si stanno leggendo vari aggregatori di tipo «planet» con utenti che si sovrappongono parzialmente. Quando disattivata forza articoli identici da notiziari differenti ad apparire una volta sola."
 
 #~ msgid "Date syntax appears to be correct:"
 #~ msgstr "La sintassi della data sembra corretta:"
@@ -3958,8 +4003,7 @@ msgstr[1] "Segnare %d articoli come letti?"
 #~ msgstr "Punteggio"
 
 #~ msgid "New articles available in this feed (click to show)"
-#~ msgstr ""
-#~ "Nuovi articoli disponibili per questo notiziario (fare clic per mostrarli)"
+#~ msgstr "Nuovi articoli disponibili per questo notiziario (fare clic per mostrarli)"
 
 #, fuzzy
 #~ msgid "Share on identi.ca"
@@ -3985,12 +4029,8 @@ msgstr[1] "Segnare %d articoli come letti?"
 #~ msgid "Back to feeds"
 #~ msgstr "Torna ai notiziari"
 
-#~ msgid ""
-#~ "This will clear your stored authentication information for Twitter. "
-#~ "Continue?"
-#~ msgstr ""
-#~ "Questo cancellerà le informazioni di autenticazione memorizzate per "
-#~ "Twitter. Continuare?"
+#~ msgid "This will clear your stored authentication information for Twitter. Continue?"
+#~ msgstr "Questo cancellerà le informazioni di autenticazione memorizzate per Twitter. Continuare?"
 
 #, fuzzy
 #~ msgid "Clearing credentials..."
@@ -4054,12 +4094,8 @@ msgstr[1] "Segnare %d articoli come letti?"
 #~ msgid "Focus search (if present)"
 #~ msgstr "Attiva la ricerca (se presente)"
 
-#~ msgid ""
-#~ "<b>Note:</b> not all actions may be available, depending on Tiny Tiny RSS "
-#~ "configuration and your access level."
-#~ msgstr ""
-#~ "<b>Notare:</b> non tutte le azioni potrebbero essere disponibili, in base "
-#~ "alla configurazione di Tiny Tiny RSS e al proprio livello di accesso."
+#~ msgid "<b>Note:</b> not all actions may be available, depending on Tiny Tiny RSS configuration and your access level."
+#~ msgstr "<b>Notare:</b> non tutte le azioni potrebbero essere disponibili, in base alla configurazione di Tiny Tiny RSS e al proprio livello di accesso."
 
 #~ msgid "Open article in new tab"
 #~ msgstr "Apri articolo in una nuova scheda"
@@ -4127,9 +4163,7 @@ msgstr[1] "Segnare %d articoli come letti?"
 #~ msgstr "Registra su Twitter"
 
 #~ msgid "Could not connect to Twitter. Refresh the page or try again later."
-#~ msgstr ""
-#~ "Impossibile connettersi a Twitter. Aggiornare la pagina o provare più "
-#~ "tardi."
+#~ msgstr "Impossibile connettersi a Twitter. Aggiornare la pagina o provare più tardi."
 
 #~ msgid "Congratulations! You have successfully registered with Twitter."
 #~ msgstr "Registrazione su Twitter effettuata con successo."
@@ -4150,9 +4184,7 @@ msgstr[1] "Segnare %d articoli come letti?"
 #~ msgstr "Nessuna categoria notiziari definita."
 
 #~ msgid "<b>Hint:</b> you can drag feeds and categories around."
-#~ msgstr ""
-#~ "<b>Suggerimento:</b> si possono trascinare in giro i notiziari e le "
-#~ "categorie."
+#~ msgstr "<b>Suggerimento:</b> si possono trascinare in giro i notiziari e le categorie."
 
 #~ msgid "Subscribing using bookmarklet"
 #~ msgstr "Sottoscrizione usando bookmarklet"
@@ -4160,19 +4192,11 @@ msgstr[1] "Segnare %d articoli come letti?"
 #~ msgid "Twitter"
 #~ msgstr "Twitter"
 
-#~ msgid ""
-#~ "Before you can update your Twitter feeds, you must register this instance "
-#~ "of Tiny Tiny RSS with Twitter.com."
-#~ msgstr ""
-#~ "Prima di poter aggiornare i notiziari di Twitter, occorre registrare "
-#~ "questa instanza di Tiny Tiny RSS su Twitter.com."
+#~ msgid "Before you can update your Twitter feeds, you must register this instance of Tiny Tiny RSS with Twitter.com."
+#~ msgstr "Prima di poter aggiornare i notiziari di Twitter, occorre registrare questa instanza di Tiny Tiny RSS su Twitter.com."
 
-#~ msgid ""
-#~ "You have been successfully registered with Twitter.com and should be able "
-#~ "to access your Twitter feeds."
-#~ msgstr ""
-#~ "La registrazione su Twitter.com è avvenuta con successo; adesso si è in "
-#~ "grado di accedere a notiziari di Twitter."
+#~ msgid "You have been successfully registered with Twitter.com and should be able to access your Twitter feeds."
+#~ msgstr "La registrazione su Twitter.com è avvenuta con successo; adesso si è in grado di accedere a notiziari di Twitter."
 
 #~ msgid "Register with Twitter.com"
 #~ msgstr "Registra su Twitter.com"
@@ -4189,10 +4213,5 @@ msgstr[1] "Segnare %d articoli come letti?"
 #~ msgid "Filter Test Results"
 #~ msgstr "Filtra risultati di prova"
 
-#~ msgid ""
-#~ "When \"Mark as read\" button is clicked in toolbar, automatically open "
-#~ "next feed with unread articles."
-#~ msgstr ""
-#~ "Quando viene fatto clic sul pulsante \"Segna come letto\" nella barra "
-#~ "degli strumenti, aprire automaticamente il successvo notiziario con "
-#~ "articoli non letti."
+#~ msgid "When \"Mark as read\" button is clicked in toolbar, automatically open next feed with unread articles."
+#~ msgstr "Quando viene fatto clic sul pulsante \"Segna come letto\" nella barra degli strumenti, aprire automaticamente il successvo notiziario con articoli non letti."
diff --git a/locale/ja_JP/LC_MESSAGES/messages.mo b/locale/ja_JP/LC_MESSAGES/messages.mo
index 1e8b8887c..dbd965fdc 100644
Binary files a/locale/ja_JP/LC_MESSAGES/messages.mo and b/locale/ja_JP/LC_MESSAGES/messages.mo differ
diff --git a/locale/ja_JP/LC_MESSAGES/messages.po b/locale/ja_JP/LC_MESSAGES/messages.po
index 3657ee1de..ebcf629fe 100644
--- a/locale/ja_JP/LC_MESSAGES/messages.po
+++ b/locale/ja_JP/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tt-rss unstable\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 22:58+0300\n"
+"POT-Creation-Date: 2016-08-19 18:16+0300\n"
 "PO-Revision-Date: 2013-07-13 11:05+0900\n"
 "Last-Translator: Yak! <yak_ex@mx.scn.tv>\n"
 "Language-Team: \n"
@@ -165,13 +165,13 @@ msgstr "フィードが見つかりません。"
 msgid "Plugin not found"
 msgstr "ユーザーが見つかりません"
 
-#: index.php:133
-#: index.php:149
-#: index.php:267
-#: prefs.php:102
+#: index.php:148
+#: index.php:164
+#: index.php:282
+#: prefs.php:117
 #: classes/backend.php:5
 #: classes/pref/labels.php:282
-#: classes/pref/feeds.php:1405
+#: classes/pref/feeds.php:1409
 #: classes/pref/filters.php:779
 #: js/feedlist.js:159
 #: js/functions.js:1293
@@ -183,7 +183,7 @@ msgstr "ユーザーが見つかりません"
 #: js/prefs.js:1781
 #: js/prefs.js:1799
 #: js/tt-rss.js:55
-#: js/tt-rss.js:522
+#: js/tt-rss.js:553
 #: js/viewfeed.js:1298
 #: plugins/import_export/import_export.js:17
 #: js/feedlist.js:484
@@ -196,75 +196,75 @@ msgstr "ユーザーが見つかりません"
 #: js/prefs.js:1556
 #: js/prefs.js:1572
 #: js/prefs.js:1592
-#: js/tt-rss.js:539
+#: js/tt-rss.js:570
 #: js/viewfeed.js:830
 msgid "Loading, please wait..."
 msgstr "読み込みんでいます。しばらくお待ちください..."
 
-#: index.php:167
+#: index.php:182
 msgid "Collapse feedlist"
 msgstr "フィード一覧を閉じる"
 
-#: index.php:170
+#: index.php:185
 msgid "Show articles"
 msgstr "記事を表示"
 
-#: index.php:173
+#: index.php:188
 msgid "Adaptive"
 msgstr "適応的"
 
-#: index.php:174
+#: index.php:189
 msgid "All Articles"
 msgstr "すべての記事"
 
-#: index.php:175
-#: include/functions2.php:101
+#: index.php:190
+#: include/functions2.php:102
 #: classes/feeds.php:104
 msgid "Starred"
 msgstr "お気に入り"
 
-#: index.php:176
-#: include/functions2.php:102
+#: index.php:191
+#: include/functions2.php:103
 #: classes/feeds.php:105
 msgid "Published"
 msgstr "公開済み"
 
-#: index.php:177
+#: index.php:192
 #: classes/feeds.php:91
 #: classes/feeds.php:103
 msgid "Unread"
 msgstr "未読"
 
-#: index.php:178
+#: index.php:193
 msgid "With Note"
 msgstr "ノート付き"
 
-#: index.php:179
+#: index.php:194
 msgid "Ignore Scoring"
 msgstr "スコア計算の無効化"
 
-#: index.php:182
+#: index.php:197
 msgid "Sort articles"
 msgstr "記事をソート"
 
-#: index.php:185
+#: index.php:200
 msgid "Default"
 msgstr "標準"
 
-#: index.php:186
+#: index.php:201
 msgid "Newest first"
 msgstr "新しい順"
 
-#: index.php:187
+#: index.php:202
 msgid "Oldest first"
 msgstr "古い順"
 
-#: index.php:188
+#: index.php:203
 msgid "Title"
 msgstr "題名"
 
-#: index.php:192
-#: index.php:233
+#: index.php:207
+#: index.php:248
 #: include/functions2.php:90
 #: classes/feeds.php:109
 #: js/FeedTree.js:132
@@ -272,134 +272,134 @@ msgstr "題名"
 msgid "Mark as read"
 msgstr "既読にする"
 
-#: index.php:195
+#: index.php:210
 msgid "Older than one day"
 msgstr "1日前より古い項目"
 
-#: index.php:198
+#: index.php:213
 msgid "Older than one week"
 msgstr "1週間前より古い項目"
 
-#: index.php:201
+#: index.php:216
 msgid "Older than two weeks"
 msgstr "2週間前より古い項目"
 
-#: index.php:217
+#: index.php:232
 msgid "Communication problem with server."
 msgstr "サーバーとの通信に問題が発生しました。"
 
-#: index.php:223
+#: index.php:238
 msgid "Actions..."
 msgstr "操作..."
 
-#: index.php:225
+#: index.php:240
 msgid "Preferences..."
 msgstr "設定..."
 
-#: index.php:226
+#: index.php:241
 msgid "Search..."
 msgstr "検索..."
 
-#: index.php:227
+#: index.php:242
 msgid "Feed actions:"
 msgstr "フィード操作:"
 
-#: index.php:228
+#: index.php:243
 #: classes/handler/public.php:672
 msgid "Subscribe to feed..."
 msgstr "フィードを購読する..."
 
-#: index.php:229
+#: index.php:244
 msgid "Edit this feed..."
 msgstr "フィードを編集する..."
 
-#: index.php:230
+#: index.php:245
 msgid "Rescore feed"
 msgstr "フィードのスコアを再計算しています..."
 
-#: index.php:231
-#: classes/pref/feeds.php:783
-#: classes/pref/feeds.php:1360
+#: index.php:246
+#: classes/pref/feeds.php:785
+#: classes/pref/feeds.php:1364
 #: js/PrefFeedTree.js:74
 msgid "Unsubscribe"
 msgstr "購読をやめる"
 
-#: index.php:232
+#: index.php:247
 msgid "All feeds:"
 msgstr "すべてのフィード:"
 
-#: index.php:234
+#: index.php:249
 msgid "(Un)hide read feeds"
 msgstr "読んだフィードを隠す/再表示する"
 
-#: index.php:235
+#: index.php:250
 msgid "Other actions:"
 msgstr "その他の操作:"
 
-#: index.php:236
+#: index.php:251
 #: include/functions2.php:76
 msgid "Toggle widescreen mode"
 msgstr "ワイド表示モードの切り替え"
 
-#: index.php:237
+#: index.php:252
 msgid "Create label..."
 msgstr "ラベルを作成する..."
 
-#: index.php:238
+#: index.php:253
 msgid "Create filter..."
 msgstr "フィルターを作成しています..."
 
-#: index.php:239
+#: index.php:254
 msgid "Keyboard shortcuts help"
 msgstr "キーボードショートカット"
 
-#: index.php:248
+#: index.php:263
 msgid "Logout"
 msgstr "ログアウト"
 
-#: index.php:254
+#: index.php:269
 msgid "Updates are available from Git."
 msgstr ""
 
 #: prefs.php:33
-#: prefs.php:120
-#: include/functions2.php:104
+#: prefs.php:135
+#: include/functions2.php:105
 #: classes/pref/prefs.php:435
 msgid "Preferences"
 msgstr "設定"
 
-#: prefs.php:111
+#: prefs.php:126
 msgid "Keyboard shortcuts"
 msgstr "キーボードショートカット"
 
-#: prefs.php:112
+#: prefs.php:127
 msgid "Exit preferences"
 msgstr "設定を終了する"
 
-#: prefs.php:123
+#: prefs.php:138
 #: classes/pref/feeds.php:112
-#: classes/pref/feeds.php:1300
-#: classes/pref/feeds.php:1349
+#: classes/pref/feeds.php:1304
+#: classes/pref/feeds.php:1353
 msgid "Feeds"
 msgstr "フィード"
 
-#: prefs.php:126
+#: prefs.php:141
 #: classes/pref/filters.php:248
 msgid "Filters"
 msgstr "フィルター"
 
-#: prefs.php:129
-#: include/functions.php:1256
-#: include/functions.php:1909
+#: prefs.php:144
+#: include/functions.php:1287
+#: include/functions.php:1940
 #: classes/pref/labels.php:90
 msgid "Labels"
 msgstr "ラベル"
 
-#: prefs.php:133
+#: prefs.php:148
 msgid "Users"
 msgstr "ユーザー"
 
-#: prefs.php:136
+#: prefs.php:151
 msgid "System"
 msgstr "システム"
 
@@ -481,10 +481,10 @@ msgid "Tiny Tiny RSS data update script."
 msgstr "Tiny Tiny RSS データ更新スクリプト。"
 
 #: include/digest.php:109
-#: include/functions.php:1265
-#: include/functions.php:1810
-#: include/functions.php:1895
-#: include/functions.php:1917
+#: include/functions.php:1296
+#: include/functions.php:1841
+#: include/functions.php:1926
+#: include/functions.php:1948
 #: classes/opml.php:421
 #: classes/pref/feeds.php:228
 msgid "Uncategorized"
@@ -500,44 +500,44 @@ msgstr[0] "保管された記事 %d 件"
 msgid "No feeds found."
 msgstr "フィードがありません。"
 
-#: include/functions.php:958
+#: include/functions.php:989
 #, php-format
 msgid "%d min"
 msgstr ""
 
-#: include/functions.php:1254
-#: include/functions.php:1907
+#: include/functions.php:1285
+#: include/functions.php:1938
 msgid "Special"
 msgstr "特別"
 
-#: include/functions.php:1758
+#: include/functions.php:1789
 #: classes/pref/filters.php:229
 #: classes/pref/filters.php:507
 msgid "All feeds"
 msgstr "すべてのフィード"
 
-#: include/functions.php:1962
+#: include/functions.php:1993
 msgid "Starred articles"
 msgstr "お気に入りの記事"
 
-#: include/functions.php:1964
+#: include/functions.php:1995
 msgid "Published articles"
 msgstr "公開済みの記事"
 
-#: include/functions.php:1966
+#: include/functions.php:1997
 msgid "Fresh articles"
 msgstr "新しい記事"
 
-#: include/functions.php:1968
-#: include/functions2.php:99
+#: include/functions.php:1999
+#: include/functions2.php:100
 msgid "All articles"
 msgstr "すべての記事"
 
-#: include/functions.php:1970
+#: include/functions.php:2001
 msgid "Archived articles"
 msgstr "保管された記事"
 
-#: include/functions.php:1972
+#: include/functions.php:2003
 msgid "Recently read"
 msgstr "最近読んだ"
 
@@ -677,7 +677,7 @@ msgstr "選択を全て解除する"
 
 #: include/functions2.php:85
 #: classes/pref/feeds.php:555
-#: classes/pref/feeds.php:821
+#: classes/pref/feeds.php:823
 msgid "Feed"
 msgstr "フィード"
 
@@ -690,7 +690,7 @@ msgid "Un/hide read feeds"
 msgstr "読んだフィードを隠す/再表示する"
 
 #: include/functions2.php:88
-#: classes/pref/feeds.php:1352
+#: classes/pref/feeds.php:1356
 msgid "Subscribe to feed"
 msgstr "フィードを購読する"
 
@@ -706,140 +706,177 @@ msgid "Reverse headlines"
 msgstr "ヘッドラインの順序を逆転する"
 
 #: include/functions2.php:92
+msgid "Toggle headline grouping"
+msgstr ""
+
+#: include/functions2.php:93
 msgid "Debug feed update"
 msgstr "フィードの更新を確認する"
 
-#: include/functions2.php:93
+#: include/functions2.php:94
 #, fuzzy
 msgid "Debug viewfeed()"
 msgstr "フィードの更新を確認する"
 
-#: include/functions2.php:94
+#: include/functions2.php:95
 #: js/FeedTree.js:182
 msgid "Mark all feeds as read"
 msgstr "すべてのフィードを既読に設定する"
 
-#: include/functions2.php:95
+#: include/functions2.php:96
 msgid "Un/collapse current category"
 msgstr "カテゴリーの開閉"
 
-#: include/functions2.php:96
+#: include/functions2.php:97
 msgid "Toggle combined mode"
 msgstr "組み合わせモードの切り替え"
 
-#: include/functions2.php:97
+#: include/functions2.php:98
 msgid "Toggle auto expand in combined mode"
 msgstr "組み合わせモードでの自動展開の切り替え"
 
-#: include/functions2.php:98
+#: include/functions2.php:99
 msgid "Go to"
 msgstr "移動"
 
-#: include/functions2.php:100
+#: include/functions2.php:101
 msgid "Fresh"
 msgstr "新しい記事"
 
-#: include/functions2.php:103
-#: js/tt-rss.js:466
-#: js/tt-rss.js:650
+#: include/functions2.php:104
+#: js/tt-rss.js:497
+#: js/tt-rss.js:673
 msgid "Tag cloud"
 msgstr "タグクラウド"
 
-#: include/functions2.php:105
+#: include/functions2.php:106
 msgid "Other"
 msgstr "その他"
 
-#: include/functions2.php:106
+#: include/functions2.php:107
 #: classes/pref/labels.php:267
 msgid "Create label"
 msgstr "ラベルを作成する"
 
-#: include/functions2.php:107
+#: include/functions2.php:108
 #: classes/pref/filters.php:753
 msgid "Create filter"
 msgstr "フィルターを作成する"
 
-#: include/functions2.php:108
+#: include/functions2.php:109
 msgid "Un/collapse sidebar"
 msgstr "サイドバーを開閉する"
 
-#: include/functions2.php:109
+#: include/functions2.php:110
 msgid "Show help dialog"
 msgstr "ヘルプダイアログを表示する"
 
-#: include/functions2.php:663
+#: include/functions2.php:665
 #, php-format
 msgid "Search results: %s"
 msgstr "検索結果: %s"
 
-#: include/functions2.php:1317
+#: include/functions2.php:1330
 #: classes/feeds.php:749
 msgid "comment"
 msgid_plural "comments"
 msgstr[0] ""
 
-#: include/functions2.php:1321
+#: include/functions2.php:1334
 #: classes/feeds.php:753
 #, fuzzy
 msgid "comments"
 msgstr "添付"
 
-#: include/functions2.php:1347
+#: include/functions2.php:1360
 msgid " - "
 msgstr " - "
 
-#: include/functions2.php:1380
-#: include/functions2.php:1631
+#: include/functions2.php:1393
+#: include/functions2.php:1644
 #: classes/article.php:311
 msgid "no tags"
 msgstr "タグがありません"
 
-#: include/functions2.php:1390
+#: include/functions2.php:1403
 #: classes/feeds.php:735
 msgid "Edit tags for this article"
 msgstr "この記事のタグを編集する"
 
-#: include/functions2.php:1422
+#: include/functions2.php:1435
 #: classes/feeds.php:682
 msgid "Originally from:"
 msgstr "元の記事:"
 
-#: include/functions2.php:1435
+#: include/functions2.php:1448
 #: classes/pref/feeds.php:574
 #: classes/feeds.php:695
 msgid "Feed URL"
 msgstr "フィード URL"
 
-#: include/functions2.php:1472
+#: include/functions2.php:1485
 #: classes/backend.php:105
 #: classes/dlg.php:37
 #: classes/dlg.php:60
 #: classes/dlg.php:93
 #: classes/dlg.php:159
 #: classes/dlg.php:186
-#: classes/pref/feeds.php:1654
-#: classes/pref/feeds.php:1720
+#: classes/pref/feeds.php:1658
+#: classes/pref/feeds.php:1724
 #: classes/pref/filters.php:204
 #: classes/pref/prefs.php:1105
 #: plugins/af_psql_trgm/init.php:102
 #: plugins/import_export/init.php:415
-#: plugins/import_export/init.php:460
+#: plugins/import_export/init.php:461
 #: plugins/share/init.php:121
 msgid "Close this window"
 msgstr "このウィンドウを閉じる"
 
-#: include/functions2.php:1669
+#: include/functions2.php:1682
 msgid "(edit note)"
 msgstr "(ノートの編集)"
 
-#: include/functions2.php:1924
+#: include/functions2.php:1937
 msgid "unknown type"
 msgstr "未知の種類"
 
-#: include/functions2.php:2001
+#: include/functions2.php:2014
 msgid "Attachments"
 msgstr "添付"
 
+#: include/functions2.php:2456
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: include/functions2.php:2457
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr ""
+
+#: include/functions2.php:2458
+msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
+msgstr ""
+
+#: include/functions2.php:2459
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: include/functions2.php:2460
+#, fuzzy
+msgid "No file was uploaded"
+msgstr "ファイルがアップロードされていません。"
+
+#: include/functions2.php:2461
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: include/functions2.php:2462
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: include/functions2.php:2463
+msgid "A PHP extension stopped the file upload."
+msgstr ""
+
 #: include/login_form.php:197
 #: classes/handler/public.php:569
 #: classes/handler/public.php:824
@@ -906,8 +943,8 @@ msgstr "この記事のタグ (カンマで区切ります):"
 #: classes/article.php:222
 #: classes/pref/labels.php:79
 #: classes/pref/users.php:98
-#: classes/pref/feeds.php:799
-#: classes/pref/feeds.php:939
+#: classes/pref/feeds.php:801
+#: classes/pref/feeds.php:943
 #: classes/pref/filters.php:485
 #: classes/pref/prefs.php:989
 #: plugins/instances/init.php:245
@@ -925,17 +962,17 @@ msgstr "保存"
 #: classes/handler/public.php:580
 #: classes/pref/labels.php:81
 #: classes/pref/users.php:100
-#: classes/pref/feeds.php:800
-#: classes/pref/feeds.php:942
-#: classes/pref/feeds.php:1860
+#: classes/pref/feeds.php:802
+#: classes/pref/feeds.php:946
+#: classes/pref/feeds.php:1865
 #: classes/pref/filters.php:488
 #: classes/pref/filters.php:902
 #: classes/pref/filters.php:983
 #: classes/pref/filters.php:1076
 #: classes/pref/prefs.php:991
-#: classes/feeds.php:1098
-#: classes/feeds.php:1148
-#: classes/feeds.php:1185
+#: classes/feeds.php:1100
+#: classes/feeds.php:1150
+#: classes/feeds.php:1187
 #: plugins/instances/init.php:248
 #: plugins/instances/init.php:436
 #: plugins/note/init.php:53
@@ -991,7 +1028,6 @@ msgid "Processing category: %s"
 msgstr "処理中のカテゴリ: %s"
 
 #: classes/opml.php:470
-#: plugins/import_export/init.php:428
 #, php-format
 msgid "Upload failed with error code %d"
 msgstr "エラーコード %d でアップロードが失敗しました"
@@ -1211,9 +1247,9 @@ msgstr "ラベル <b>%s</b> を作成しました"
 
 #: classes/pref/labels.php:258
 #: classes/pref/users.php:334
-#: classes/pref/feeds.php:1340
-#: classes/pref/feeds.php:1602
-#: classes/pref/feeds.php:1666
+#: classes/pref/feeds.php:1344
+#: classes/pref/feeds.php:1606
+#: classes/pref/feeds.php:1670
 #: classes/pref/filters.php:359
 #: classes/pref/filters.php:407
 #: classes/pref/filters.php:744
@@ -1226,9 +1262,9 @@ msgstr "選択"
 
 #: classes/pref/labels.php:261
 #: classes/pref/users.php:337
-#: classes/pref/feeds.php:1343
-#: classes/pref/feeds.php:1605
-#: classes/pref/feeds.php:1669
+#: classes/pref/feeds.php:1347
+#: classes/pref/feeds.php:1609
+#: classes/pref/feeds.php:1673
 #: classes/pref/filters.php:362
 #: classes/pref/filters.php:410
 #: classes/pref/filters.php:747
@@ -1242,9 +1278,9 @@ msgstr "すべて"
 
 #: classes/pref/labels.php:263
 #: classes/pref/users.php:339
-#: classes/pref/feeds.php:1345
-#: classes/pref/feeds.php:1607
-#: classes/pref/feeds.php:1671
+#: classes/pref/feeds.php:1349
+#: classes/pref/feeds.php:1611
+#: classes/pref/feeds.php:1675
 #: classes/pref/filters.php:364
 #: classes/pref/filters.php:412
 #: classes/pref/filters.php:749
@@ -1258,10 +1294,10 @@ msgstr "なし"
 
 #: classes/pref/labels.php:270
 #: classes/pref/users.php:348
-#: classes/pref/feeds.php:765
+#: classes/pref/feeds.php:767
 #: classes/pref/filters.php:478
 #: classes/pref/filters.php:766
-#: classes/feeds.php:1147
+#: classes/feeds.php:1149
 #: plugins/instances/init.php:294
 msgid "Remove"
 msgstr "削除"
@@ -1283,7 +1319,7 @@ msgstr "ルールの編集"
 
 #: classes/pref/users.php:56
 #: classes/pref/feeds.php:637
-#: classes/pref/feeds.php:876
+#: classes/pref/feeds.php:878
 #: classes/feeds.php:1070
 msgid "Authentication"
 msgstr "認証"
@@ -1293,8 +1329,8 @@ msgid "Access level: "
 msgstr "アクセスレベル: "
 
 #: classes/pref/users.php:77
-#: classes/pref/feeds.php:665
-#: classes/pref/feeds.php:892
+#: classes/pref/feeds.php:667
+#: classes/pref/feeds.php:896
 msgid "Options"
 msgstr "オプション"
 
@@ -1360,10 +1396,10 @@ msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] パスワード変更通知"
 
 #: classes/pref/users.php:324
-#: classes/pref/feeds.php:1336
+#: classes/pref/feeds.php:1340
 #: classes/pref/filters.php:740
-#: classes/feeds.php:1118
-#: classes/feeds.php:1184
+#: classes/feeds.php:1120
+#: classes/feeds.php:1186
 #: js/tt-rss.js:174
 msgid "Search"
 msgstr "検索"
@@ -1380,8 +1416,8 @@ msgstr "編集"
 
 #: classes/pref/users.php:397
 #: classes/pref/feeds.php:643
-#: classes/pref/feeds.php:880
-#: classes/pref/feeds.php:1838
+#: classes/pref/feeds.php:882
+#: classes/pref/feeds.php:1842
 #: classes/feeds.php:1074
 msgid "Login"
 msgstr "ログイン"
@@ -1459,251 +1495,251 @@ msgid "Feed Title"
 msgstr "フィードの題名"
 
 #: classes/pref/feeds.php:595
-#: classes/pref/feeds.php:828
-#: classes/pref/feeds.php:1824
+#: classes/pref/feeds.php:830
+#: classes/pref/feeds.php:1828
 #: classes/feeds.php:1050
 msgid "Place in category:"
 msgstr "カテゴリーの場所:"
 
 #: classes/pref/feeds.php:608
-#: classes/pref/feeds.php:842
+#: classes/pref/feeds.php:844
 #, fuzzy
 msgid "Language:"
 msgstr "言語"
 
 #: classes/pref/feeds.php:615
-#: classes/pref/feeds.php:851
+#: classes/pref/feeds.php:853
 msgid "Update"
 msgstr "更新"
 
 #: classes/pref/feeds.php:630
-#: classes/pref/feeds.php:867
+#: classes/pref/feeds.php:869
 msgid "Article purging:"
 msgstr "記事の削除:"
 
-#: classes/pref/feeds.php:656
-#: classes/pref/feeds.php:886
-#: classes/pref/feeds.php:1841
+#: classes/pref/feeds.php:658
+#: classes/pref/feeds.php:890
+#: classes/pref/feeds.php:1845
 #: classes/pref/prefs.php:245
-#: classes/feeds.php:1077
+#: classes/feeds.php:1078
 msgid "Password"
 msgstr "パスワード"
 
-#: classes/pref/feeds.php:660
+#: classes/pref/feeds.php:662
 msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
 msgstr "<b>ヒント:</b> Twitter フィード以外でもしフィードが認証を要求するなら、ログイン情報を入力する必要があります。"
 
-#: classes/pref/feeds.php:679
-#: classes/pref/feeds.php:896
+#: classes/pref/feeds.php:681
+#: classes/pref/feeds.php:900
 msgid "Hide from Popular feeds"
 msgstr "人気のあるフィードから隠す"
 
-#: classes/pref/feeds.php:691
-#: classes/pref/feeds.php:902
+#: classes/pref/feeds.php:693
+#: classes/pref/feeds.php:906
 msgid "Include in e-mail digest"
 msgstr "電子メールダイジェストに含む"
 
-#: classes/pref/feeds.php:704
-#: classes/pref/feeds.php:908
+#: classes/pref/feeds.php:706
+#: classes/pref/feeds.php:912
 msgid "Always display image attachments"
 msgstr "常に添付画像を表示する"
 
-#: classes/pref/feeds.php:717
-#: classes/pref/feeds.php:916
+#: classes/pref/feeds.php:719
+#: classes/pref/feeds.php:920
 msgid "Do not embed images"
 msgstr "画像を埋め込まない"
 
-#: classes/pref/feeds.php:730
-#: classes/pref/feeds.php:924
+#: classes/pref/feeds.php:732
+#: classes/pref/feeds.php:928
 msgid "Cache images locally"
 msgstr "ローカルに画像をキャッシュする"
 
-#: classes/pref/feeds.php:742
-#: classes/pref/feeds.php:930
+#: classes/pref/feeds.php:744
+#: classes/pref/feeds.php:934
 msgid "Mark updated articles as unread"
 msgstr "更新された記事を既読にする"
 
-#: classes/pref/feeds.php:746
+#: classes/pref/feeds.php:748
 msgid "Icon"
 msgstr "アイコン"
 
-#: classes/pref/feeds.php:763
+#: classes/pref/feeds.php:765
 msgid "Replace"
 msgstr "置き換え"
 
-#: classes/pref/feeds.php:770
+#: classes/pref/feeds.php:772
 #: classes/pref/prefs.php:706
 msgid "Plugins"
 msgstr "プラグイン"
 
-#: classes/pref/feeds.php:790
+#: classes/pref/feeds.php:792
 msgid "Resubscribe to push updates"
 msgstr "プッシュ更新の再購読"
 
-#: classes/pref/feeds.php:797
+#: classes/pref/feeds.php:799
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr "プッシュ対応フィードについて PubSubHubbub の購読状態をリセットする。"
 
-#: classes/pref/feeds.php:1203
-#: classes/pref/feeds.php:1256
+#: classes/pref/feeds.php:1207
+#: classes/pref/feeds.php:1260
 msgid "All done."
 msgstr "すべて終了しました。"
 
-#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1315
 msgid "Feeds with errors"
 msgstr "エラーのあったフィード"
 
-#: classes/pref/feeds.php:1318
+#: classes/pref/feeds.php:1322
 msgid "Inactive feeds"
 msgstr "活発でないフィード"
 
-#: classes/pref/feeds.php:1354
+#: classes/pref/feeds.php:1358
 msgid "Edit selected feeds"
 msgstr "選択したフィードを編集"
 
-#: classes/pref/feeds.php:1356
-#: classes/pref/feeds.php:1370
+#: classes/pref/feeds.php:1360
+#: classes/pref/feeds.php:1374
 #: classes/pref/filters.php:762
 msgid "Reset sort order"
 msgstr "ソート順のリセット"
 
-#: classes/pref/feeds.php:1358
+#: classes/pref/feeds.php:1362
 #: js/prefs.js:1737
 msgid "Batch subscribe"
 msgstr "一括購読"
 
-#: classes/pref/feeds.php:1365
+#: classes/pref/feeds.php:1369
 msgid "Categories"
 msgstr "カテゴリー"
 
-#: classes/pref/feeds.php:1368
+#: classes/pref/feeds.php:1372
 msgid "Add category"
 msgstr "カテゴリーを追加"
 
-#: classes/pref/feeds.php:1372
+#: classes/pref/feeds.php:1376
 msgid "Remove selected"
 msgstr "選択したカテゴリーを削除"
 
-#: classes/pref/feeds.php:1383
+#: classes/pref/feeds.php:1387
 msgid "More actions..."
 msgstr "操作..."
 
-#: classes/pref/feeds.php:1387
+#: classes/pref/feeds.php:1391
 msgid "Manual purge"
 msgstr "手動削除"
 
-#: classes/pref/feeds.php:1391
+#: classes/pref/feeds.php:1395
 msgid "Clear feed data"
 msgstr "フィードデータの消去"
 
-#: classes/pref/feeds.php:1392
+#: classes/pref/feeds.php:1396
 #: classes/pref/filters.php:770
 msgid "Rescore articles"
 msgstr "記事のスコアの再集計"
 
-#: classes/pref/feeds.php:1444
+#: classes/pref/feeds.php:1448
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1446
+#: classes/pref/feeds.php:1450
 msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
 msgstr "OPML を使うことで、フィード、フィルター、ラベル、Tiny Tiny RSS の設定をエクスポート、インポートできます。"
 
-#: classes/pref/feeds.php:1447
+#: classes/pref/feeds.php:1451
 msgid "Only main settings profile can be migrated using OPML."
 msgstr "OPML を使って移行できるのはメインの設定プロファイルのみです。"
 
-#: classes/pref/feeds.php:1460
+#: classes/pref/feeds.php:1464
 msgid "Import my OPML"
 msgstr "OPML インポート"
 
-#: classes/pref/feeds.php:1466
+#: classes/pref/feeds.php:1470
 msgid "Filename:"
 msgstr "ファイル名:"
 
-#: classes/pref/feeds.php:1468
+#: classes/pref/feeds.php:1472
 msgid "Include settings"
 msgstr "設定を含める"
 
-#: classes/pref/feeds.php:1472
+#: classes/pref/feeds.php:1476
 msgid "Export OPML"
 msgstr "OPML エクスポート"
 
-#: classes/pref/feeds.php:1476
+#: classes/pref/feeds.php:1480
 msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
 msgstr "あなたの OPML は公に公開でき、以下の URL を知っている人であれば誰でも購読できます。"
 
-#: classes/pref/feeds.php:1480
+#: classes/pref/feeds.php:1484
 msgid "Public OPML URL"
 msgstr "公開 OPML URL"
 
-#: classes/pref/feeds.php:1481
+#: classes/pref/feeds.php:1485
 msgid "Display published OPML URL"
 msgstr "公開 OPML URL を表示"
 
-#: classes/pref/feeds.php:1490
+#: classes/pref/feeds.php:1494
 msgid "Firefox integration"
 msgstr "Firefox 統合"
 
-#: classes/pref/feeds.php:1492
+#: classes/pref/feeds.php:1496
 msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
 msgstr "下のリンクをクリックすることで、Firefox のフィードリーダーとしてこの Tiny Tiny RSS のサイトを使うことができます。"
 
-#: classes/pref/feeds.php:1499
+#: classes/pref/feeds.php:1503
 msgid "Click here to register this site as a feed reader."
 msgstr "クリックするとフィードリーダーとしてこのサイトを登録します。"
 
-#: classes/pref/feeds.php:1507
+#: classes/pref/feeds.php:1511
 msgid "Published & shared articles / Generated feeds"
 msgstr "公開・共有した記事 / 生成したフィード"
 
-#: classes/pref/feeds.php:1509
+#: classes/pref/feeds.php:1513
 msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
 msgstr "公開した記事は公開 RSS フィードとしてエクスポートされ、以下の URL を知っている人であれば誰でも購読できます。"
 
-#: classes/pref/feeds.php:1516
+#: classes/pref/feeds.php:1520
 #: classes/feeds.php:54
 #: classes/feeds.php:134
 msgid "View as RSS"
 msgstr "RSS として閲覧する"
 
-#: classes/pref/feeds.php:1517
+#: classes/pref/feeds.php:1521
 msgid "Display URL"
 msgstr "URL の表示"
 
-#: classes/pref/feeds.php:1520
+#: classes/pref/feeds.php:1524
 msgid "Clear all generated URLs"
 msgstr "生成された URL をすべて消去する"
 
-#: classes/pref/feeds.php:1598
+#: classes/pref/feeds.php:1602
 msgid "These feeds have not been updated with new content for 3 months (oldest first):"
 msgstr "3 ヶ月間更新されていないフィード(古いもの順):"
 
-#: classes/pref/feeds.php:1632
-#: classes/pref/feeds.php:1696
+#: classes/pref/feeds.php:1636
+#: classes/pref/feeds.php:1700
 msgid "Click to edit feed"
 msgstr "編集するにはクリック"
 
-#: classes/pref/feeds.php:1650
-#: classes/pref/feeds.php:1716
+#: classes/pref/feeds.php:1654
+#: classes/pref/feeds.php:1720
 msgid "Unsubscribe from selected feeds"
 msgstr "選択したフィードの購読をやめる"
 
-#: classes/pref/feeds.php:1821
+#: classes/pref/feeds.php:1825
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr "1 行に 1 フィードずつ有効な RSS フィードを追加(フィードの自動検出は行われません)"
 
-#: classes/pref/feeds.php:1830
+#: classes/pref/feeds.php:1834
 msgid "Feeds to subscribe, One per line"
 msgstr "購読するフィード(1 行 1 フィード)"
 
-#: classes/pref/feeds.php:1852
+#: classes/pref/feeds.php:1857
 msgid "Feeds require authentication."
 msgstr "このフィードは認証を要求します。"
 
-#: classes/pref/feeds.php:1859
-#: classes/feeds.php:1092
-#: classes/feeds.php:1146
+#: classes/pref/feeds.php:1864
+#: classes/feeds.php:1094
+#: classes/feeds.php:1148
 msgid "Subscribe"
 msgstr "購読"
 
@@ -1786,7 +1822,7 @@ msgid "on field"
 msgstr "対象項目"
 
 #: classes/pref/filters.php:962
-#: js/PrefFilterTree.js:61
+#: js/PrefFilterTree.js:64
 msgid "in"
 msgstr "フィード"
 
@@ -2379,40 +2415,40 @@ msgstr "フィードかサイトの URL"
 msgid "Available feeds"
 msgstr "利用可能なフィード"
 
-#: classes/feeds.php:1087
+#: classes/feeds.php:1089
 msgid "This feed requires authentication."
 msgstr "このフィードは認証を要求します。"
 
-#: classes/feeds.php:1095
+#: classes/feeds.php:1097
 msgid "More feeds"
 msgstr "さらなるフィード"
 
-#: classes/feeds.php:1122
+#: classes/feeds.php:1124
 msgid "Popular feeds"
 msgstr "人気のあるフィード"
 
-#: classes/feeds.php:1123
+#: classes/feeds.php:1125
 msgid "Feed archive"
 msgstr "フィード保管庫"
 
-#: classes/feeds.php:1126
+#: classes/feeds.php:1128
 msgid "limit:"
 msgstr "制限:"
 
-#: classes/feeds.php:1158
+#: classes/feeds.php:1160
 msgid "Look for"
 msgstr "検索"
 
-#: classes/feeds.php:1166
+#: classes/feeds.php:1168
 #, php-format
 msgid "in %s"
 msgstr ""
 
-#: classes/feeds.php:1171
+#: classes/feeds.php:1173
 msgid "Used for word stemming"
 msgstr ""
 
-#: classes/feeds.php:1180
+#: classes/feeds.php:1182
 #, fuzzy
 msgid "Search syntax"
 msgstr "検索"
@@ -2673,6 +2709,11 @@ msgstr "XML 文書を読み込めません。"
 msgid "Prepare data"
 msgstr "データの準備"
 
+#: plugins/import_export/init.php:428
+#, fuzzy, php-format
+msgid "Upload failed with error code %d (%s)"
+msgstr "エラーコード %d でアップロードが失敗しました"
+
 #: plugins/import_export/init.php:454
 msgid "No file uploaded."
 msgstr "ファイルがアップロードされていません。"
@@ -2783,7 +2824,7 @@ msgstr "カテゴリーの編集"
 msgid "Remove category"
 msgstr "カテゴリーの削除"
 
-#: js/PrefFilterTree.js:64
+#: js/PrefFilterTree.js:67
 msgid "Inverse"
 msgstr "反転"
 
@@ -2835,7 +2876,7 @@ msgid "Subscription reset."
 msgstr "購読がリセットされました。"
 
 #: js/functions.js:1311
-#: js/tt-rss.js:682
+#: js/tt-rss.js:705
 #, perl-format
 msgid "Unsubscribe from %s?"
 msgstr "%s の購読をやめますか?"
@@ -3065,40 +3106,40 @@ msgstr "すべての記事を既読にしますか?"
 msgid "Marking all feeds as read..."
 msgstr "すべてのフィードを既読に設定しています..."
 
-#: js/tt-rss.js:383
+#: js/tt-rss.js:404
 msgid "Please enable mail plugin first."
 msgstr "はじめにメールプラグインを有効にしてください。"
 
-#: js/tt-rss.js:431
+#: js/tt-rss.js:452
 #: js/functions.js:1643
-#: js/tt-rss.js:663
+#: js/tt-rss.js:686
 msgid "You can't edit this kind of feed."
 msgstr "この種類のフィードは編集できません。"
 
-#: js/tt-rss.js:502
+#: js/tt-rss.js:533
 msgid "Please enable embed_original plugin first."
 msgstr "はじめに embed_original プラグインを有効にしてください。"
 
-#: js/tt-rss.js:515
-#: js/tt-rss.js:713
+#: js/tt-rss.js:546
+#: js/tt-rss.js:736
 msgid "Widescreen is not available in combined mode."
 msgstr ""
 
-#: js/tt-rss.js:827
+#: js/tt-rss.js:850
 msgid "You can't rescore this kind of feed."
 msgstr "この種類のフィードはスコアを再計算できません。"
 
-#: js/tt-rss.js:832
-#: js/tt-rss.js:676
+#: js/tt-rss.js:855
+#: js/tt-rss.js:699
 msgid "Please select some feed first."
 msgstr "はじめにいくつかのフィードを選択してください。"
 
-#: js/tt-rss.js:837
+#: js/tt-rss.js:860
 #, perl-format
 msgid "Rescore articles in %s?"
 msgstr "%s の記事のスコアを再計算しますか?"
 
-#: js/tt-rss.js:840
+#: js/tt-rss.js:863
 msgid "Rescoring articles..."
 msgstr "記事のスコアを再計算しています..."
 
@@ -3271,7 +3312,7 @@ msgstr "個人データを変更しました。"
 msgid "Sorry, your browser does not support sandboxed iframes."
 msgstr "あなたのブラウザはサンドボックス化された iframe をサポートしていません。"
 
-#: plugins/shorten_expanded/init.js:37
+#: plugins/shorten_expanded/init.js:39
 #, fuzzy
 msgid "Click to expand article"
 msgstr "編集するにはクリック"
@@ -3520,7 +3561,7 @@ msgstr "生成された URL を消去しました。"
 msgid "Label Editor"
 msgstr "ラベルエディター"
 
-#: js/tt-rss.js:671
+#: js/tt-rss.js:694
 msgid "You can't unsubscribe from the category."
 msgstr "カテゴリーから購読をやめることができません。"
 
diff --git a/locale/ko_KR/LC_MESSAGES/messages.mo b/locale/ko_KR/LC_MESSAGES/messages.mo
index b83879e52..75f7d6ddf 100644
Binary files a/locale/ko_KR/LC_MESSAGES/messages.mo and b/locale/ko_KR/LC_MESSAGES/messages.mo differ
diff --git a/locale/ko_KR/LC_MESSAGES/messages.po b/locale/ko_KR/LC_MESSAGES/messages.po
index 98fa601e2..8af8e4a77 100644
--- a/locale/ko_KR/LC_MESSAGES/messages.po
+++ b/locale/ko_KR/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tt-rss unstable\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 22:58+0300\n"
+"POT-Creation-Date: 2016-08-19 18:16+0300\n"
 "PO-Revision-Date: 2014-11-04 12:05+0900\n"
 "Last-Translator: YoungMin Park <tfympark1@gmail.com>\n"
 "Language-Team: YoungMin Park <tfympark1@gmail.com>\n"
@@ -166,13 +166,13 @@ msgstr "피드가 없습니다."
 msgid "Plugin not found"
 msgstr "사용자를 찾지 못했습니다."
 
-#: index.php:133
-#: index.php:149
-#: index.php:267
-#: prefs.php:102
+#: index.php:148
+#: index.php:164
+#: index.php:282
+#: prefs.php:117
 #: classes/backend.php:5
 #: classes/pref/labels.php:282
-#: classes/pref/feeds.php:1405
+#: classes/pref/feeds.php:1409
 #: classes/pref/filters.php:779
 #: js/feedlist.js:159
 #: js/functions.js:1293
@@ -184,7 +184,7 @@ msgstr "사용자를 찾지 못했습니다."
 #: js/prefs.js:1781
 #: js/prefs.js:1799
 #: js/tt-rss.js:55
-#: js/tt-rss.js:522
+#: js/tt-rss.js:553
 #: js/viewfeed.js:1298
 #: plugins/import_export/import_export.js:17
 #: js/feedlist.js:484
@@ -197,75 +197,75 @@ msgstr "사용자를 찾지 못했습니다."
 #: js/prefs.js:1556
 #: js/prefs.js:1572
 #: js/prefs.js:1592
-#: js/tt-rss.js:539
+#: js/tt-rss.js:570
 #: js/viewfeed.js:830
 msgid "Loading, please wait..."
 msgstr "로딩중입니다. 잠깐의 여유를 갖고 하늘을 바라보아요 ^^"
 
-#: index.php:167
+#: index.php:182
 msgid "Collapse feedlist"
 msgstr "피드목록 접기"
 
-#: index.php:170
+#: index.php:185
 msgid "Show articles"
 msgstr "내용 표시"
 
-#: index.php:173
+#: index.php:188
 msgid "Adaptive"
 msgstr "추린 글"
 
-#: index.php:174
+#: index.php:189
 msgid "All Articles"
 msgstr "전체 내용"
 
-#: index.php:175
-#: include/functions2.php:101
+#: index.php:190
+#: include/functions2.php:102
 #: classes/feeds.php:104
 msgid "Starred"
 msgstr "중요 표시"
 
-#: index.php:176
-#: include/functions2.php:102
+#: index.php:191
+#: include/functions2.php:103
 #: classes/feeds.php:105
 msgid "Published"
 msgstr "공개됨"
 
-#: index.php:177
+#: index.php:192
 #: classes/feeds.php:91
 #: classes/feeds.php:103
 msgid "Unread"
 msgstr "안 읽은 글"
 
-#: index.php:178
+#: index.php:193
 msgid "With Note"
 msgstr "노트가 있는 글"
 
-#: index.php:179
+#: index.php:194
 msgid "Ignore Scoring"
 msgstr "점수 무시"
 
-#: index.php:182
+#: index.php:197
 msgid "Sort articles"
 msgstr "내용 정렬"
 
-#: index.php:185
+#: index.php:200
 msgid "Default"
 msgstr "기본 정렬"
 
-#: index.php:186
+#: index.php:201
 msgid "Newest first"
 msgstr "새 글 먼저"
 
-#: index.php:187
+#: index.php:202
 msgid "Oldest first"
 msgstr "오래된 글 먼저"
 
-#: index.php:188
+#: index.php:203
 msgid "Title"
 msgstr "제목순으로"
 
-#: index.php:192
-#: index.php:233
+#: index.php:207
+#: index.php:248
 #: include/functions2.php:90
 #: classes/feeds.php:109
 #: js/FeedTree.js:132
@@ -273,134 +273,134 @@ msgstr "제목순으로"
 msgid "Mark as read"
 msgstr "읽음 표시"
 
-#: index.php:195
+#: index.php:210
 msgid "Older than one day"
 msgstr "하루 넘게 묵은 내용"
 
-#: index.php:198
+#: index.php:213
 msgid "Older than one week"
 msgstr "1주일 넘게 묵은 내용"
 
-#: index.php:201
+#: index.php:216
 msgid "Older than two weeks"
 msgstr "2주일 넘게 묵은 내용"
 
-#: index.php:217
+#: index.php:232
 msgid "Communication problem with server."
 msgstr "서버와의 통신이 원활하지 않습니다."
 
-#: index.php:223
+#: index.php:238
 msgid "Actions..."
 msgstr "동작..."
 
-#: index.php:225
+#: index.php:240
 msgid "Preferences..."
 msgstr "설정..."
 
-#: index.php:226
+#: index.php:241
 msgid "Search..."
 msgstr "검색..."
 
-#: index.php:227
+#: index.php:242
 msgid "Feed actions:"
 msgstr "피드 동작"
 
-#: index.php:228
+#: index.php:243
 #: classes/handler/public.php:672
 msgid "Subscribe to feed..."
 msgstr "피드 구독..."
 
-#: index.php:229
+#: index.php:244
 msgid "Edit this feed..."
 msgstr "이 피드 수정..."
 
-#: index.php:230
+#: index.php:245
 msgid "Rescore feed"
 msgstr "피드 점수 다시 매기기..."
 
-#: index.php:231
-#: classes/pref/feeds.php:783
-#: classes/pref/feeds.php:1360
+#: index.php:246
+#: classes/pref/feeds.php:785
+#: classes/pref/feeds.php:1364
 #: js/PrefFeedTree.js:74
 msgid "Unsubscribe"
 msgstr "구독 해제"
 
-#: index.php:232
+#: index.php:247
 msgid "All feeds:"
 msgstr "전체 피드:"
 
-#: index.php:234
+#: index.php:249
 msgid "(Un)hide read feeds"
 msgstr "읽은 내용 숨김"
 
-#: index.php:235
+#: index.php:250
 msgid "Other actions:"
 msgstr "기타 동작"
 
-#: index.php:236
+#: index.php:251
 #: include/functions2.php:76
 msgid "Toggle widescreen mode"
 msgstr "와이드스크린 모드 켜기/끄기"
 
-#: index.php:237
+#: index.php:252
 msgid "Create label..."
 msgstr "라벨 만들기..."
 
-#: index.php:238
+#: index.php:253
 msgid "Create filter..."
 msgstr "필터 만들기..."
 
-#: index.php:239
+#: index.php:254
 msgid "Keyboard shortcuts help"
 msgstr "키보드 단축키 도움말"
 
-#: index.php:248
+#: index.php:263
 msgid "Logout"
 msgstr "로그아웃"
 
-#: index.php:254
+#: index.php:269
 msgid "Updates are available from Git."
 msgstr ""
 
 #: prefs.php:33
-#: prefs.php:120
-#: include/functions2.php:104
+#: prefs.php:135
+#: include/functions2.php:105
 #: classes/pref/prefs.php:435
 msgid "Preferences"
 msgstr "설정"
 
-#: prefs.php:111
+#: prefs.php:126
 msgid "Keyboard shortcuts"
 msgstr "키보드 단축키"
 
-#: prefs.php:112
+#: prefs.php:127
 msgid "Exit preferences"
 msgstr "설정 완료"
 
-#: prefs.php:123
+#: prefs.php:138
 #: classes/pref/feeds.php:112
-#: classes/pref/feeds.php:1300
-#: classes/pref/feeds.php:1349
+#: classes/pref/feeds.php:1304
+#: classes/pref/feeds.php:1353
 msgid "Feeds"
 msgstr "피드"
 
-#: prefs.php:126
+#: prefs.php:141
 #: classes/pref/filters.php:248
 msgid "Filters"
 msgstr "필터"
 
-#: prefs.php:129
-#: include/functions.php:1256
-#: include/functions.php:1909
+#: prefs.php:144
+#: include/functions.php:1287
+#: include/functions.php:1940
 #: classes/pref/labels.php:90
 msgid "Labels"
 msgstr "라벨"
 
-#: prefs.php:133
+#: prefs.php:148
 msgid "Users"
 msgstr "사용자"
 
-#: prefs.php:136
+#: prefs.php:151
 msgid "System"
 msgstr "시스템"
 
@@ -482,10 +482,10 @@ msgid "Tiny Tiny RSS data update script."
 msgstr "Tiny Tiny RSS 데이터 업데이트 스크립트."
 
 #: include/digest.php:109
-#: include/functions.php:1265
-#: include/functions.php:1810
-#: include/functions.php:1895
-#: include/functions.php:1917
+#: include/functions.php:1296
+#: include/functions.php:1841
+#: include/functions.php:1926
+#: include/functions.php:1948
 #: classes/opml.php:421
 #: classes/pref/feeds.php:228
 msgid "Uncategorized"
@@ -501,44 +501,44 @@ msgstr[0] "저장된 글(%d개)"
 msgid "No feeds found."
 msgstr "피드가 없습니다."
 
-#: include/functions.php:958
+#: include/functions.php:989
 #, php-format
 msgid "%d min"
 msgstr ""
 
-#: include/functions.php:1254
-#: include/functions.php:1907
+#: include/functions.php:1285
+#: include/functions.php:1938
 msgid "Special"
 msgstr "자동 분류"
 
-#: include/functions.php:1758
+#: include/functions.php:1789
 #: classes/pref/filters.php:229
 #: classes/pref/filters.php:507
 msgid "All feeds"
 msgstr "모든 피드"
 
-#: include/functions.php:1962
+#: include/functions.php:1993
 msgid "Starred articles"
 msgstr "중요 표시된 글"
 
-#: include/functions.php:1964
+#: include/functions.php:1995
 msgid "Published articles"
 msgstr "공개 글"
 
-#: include/functions.php:1966
+#: include/functions.php:1997
 msgid "Fresh articles"
 msgstr "새 글"
 
-#: include/functions.php:1968
-#: include/functions2.php:99
+#: include/functions.php:1999
+#: include/functions2.php:100
 msgid "All articles"
 msgstr "전체 글"
 
-#: include/functions.php:1970
+#: include/functions.php:2001
 msgid "Archived articles"
 msgstr "보관 처리된 글"
 
-#: include/functions.php:1972
+#: include/functions.php:2003
 msgid "Recently read"
 msgstr "최근에 읽은 글"
 
@@ -678,7 +678,7 @@ msgstr "전체 선택 해제"
 
 #: include/functions2.php:85
 #: classes/pref/feeds.php:555
-#: classes/pref/feeds.php:821
+#: classes/pref/feeds.php:823
 msgid "Feed"
 msgstr "피드"
 
@@ -691,7 +691,7 @@ msgid "Un/hide read feeds"
 msgstr "읽은 피드 숨기기/보이기"
 
 #: include/functions2.php:88
-#: classes/pref/feeds.php:1352
+#: classes/pref/feeds.php:1356
 msgid "Subscribe to feed"
 msgstr "피드 구독"
 
@@ -707,139 +707,176 @@ msgid "Reverse headlines"
 msgstr "헤드라인 거꾸로 표시"
 
 #: include/functions2.php:92
+msgid "Toggle headline grouping"
+msgstr ""
+
+#: include/functions2.php:93
 msgid "Debug feed update"
 msgstr "피드 업데이트 디버그"
 
-#: include/functions2.php:93
+#: include/functions2.php:94
 #, fuzzy
 msgid "Debug viewfeed()"
 msgstr "피드 업데이트 디버그"
 
-#: include/functions2.php:94
+#: include/functions2.php:95
 #: js/FeedTree.js:182
 msgid "Mark all feeds as read"
 msgstr "모든 피드를 읽음 표시"
 
-#: include/functions2.php:95
+#: include/functions2.php:96
 msgid "Un/collapse current category"
 msgstr "이 카테고리 접기/펴기"
 
-#: include/functions2.php:96
+#: include/functions2.php:97
 msgid "Toggle combined mode"
 msgstr "통합 모드 켜기/끄기"
 
-#: include/functions2.php:97
+#: include/functions2.php:98
 msgid "Toggle auto expand in combined mode"
 msgstr "통합 모드에서의 자동 펼침 켜기/끄기"
 
-#: include/functions2.php:98
+#: include/functions2.php:99
 msgid "Go to"
 msgstr "이동"
 
-#: include/functions2.php:100
+#: include/functions2.php:101
 msgid "Fresh"
 msgstr "새 글"
 
-#: include/functions2.php:103
-#: js/tt-rss.js:466
-#: js/tt-rss.js:650
+#: include/functions2.php:104
+#: js/tt-rss.js:497
+#: js/tt-rss.js:673
 msgid "Tag cloud"
 msgstr "태그 클라우드"
 
-#: include/functions2.php:105
+#: include/functions2.php:106
 msgid "Other"
 msgstr "기타"
 
-#: include/functions2.php:106
+#: include/functions2.php:107
 #: classes/pref/labels.php:267
 msgid "Create label"
 msgstr "라벨 생성"
 
-#: include/functions2.php:107
+#: include/functions2.php:108
 #: classes/pref/filters.php:753
 msgid "Create filter"
 msgstr "필터 생성"
 
-#: include/functions2.php:108
+#: include/functions2.php:109
 msgid "Un/collapse sidebar"
 msgstr "사이드바 숨김/표시"
 
-#: include/functions2.php:109
+#: include/functions2.php:110
 msgid "Show help dialog"
 msgstr "도움말 보이기"
 
-#: include/functions2.php:663
+#: include/functions2.php:665
 #, php-format
 msgid "Search results: %s"
 msgstr "검색 결과: %s"
 
-#: include/functions2.php:1317
+#: include/functions2.php:1330
 #: classes/feeds.php:749
 msgid "comment"
 msgid_plural "comments"
 msgstr[0] "코멘트"
 
-#: include/functions2.php:1321
+#: include/functions2.php:1334
 #: classes/feeds.php:753
 msgid "comments"
 msgstr "코멘트"
 
-#: include/functions2.php:1347
+#: include/functions2.php:1360
 msgid " - "
 msgstr " - "
 
-#: include/functions2.php:1380
-#: include/functions2.php:1631
+#: include/functions2.php:1393
+#: include/functions2.php:1644
 #: classes/article.php:311
 msgid "no tags"
 msgstr "태그 없음"
 
-#: include/functions2.php:1390
+#: include/functions2.php:1403
 #: classes/feeds.php:735
 msgid "Edit tags for this article"
 msgstr "이 글의 태그 편집"
 
-#: include/functions2.php:1422
+#: include/functions2.php:1435
 #: classes/feeds.php:682
 msgid "Originally from:"
 msgstr "원 출처:"
 
-#: include/functions2.php:1435
+#: include/functions2.php:1448
 #: classes/pref/feeds.php:574
 #: classes/feeds.php:695
 msgid "Feed URL"
 msgstr "피드 주소"
 
-#: include/functions2.php:1472
+#: include/functions2.php:1485
 #: classes/backend.php:105
 #: classes/dlg.php:37
 #: classes/dlg.php:60
 #: classes/dlg.php:93
 #: classes/dlg.php:159
 #: classes/dlg.php:186
-#: classes/pref/feeds.php:1654
-#: classes/pref/feeds.php:1720
+#: classes/pref/feeds.php:1658
+#: classes/pref/feeds.php:1724
 #: classes/pref/filters.php:204
 #: classes/pref/prefs.php:1105
 #: plugins/af_psql_trgm/init.php:102
 #: plugins/import_export/init.php:415
-#: plugins/import_export/init.php:460
+#: plugins/import_export/init.php:461
 #: plugins/share/init.php:121
 msgid "Close this window"
 msgstr "이 창 닫기"
 
-#: include/functions2.php:1669
+#: include/functions2.php:1682
 msgid "(edit note)"
 msgstr "(노트 편집)"
 
-#: include/functions2.php:1924
+#: include/functions2.php:1937
 msgid "unknown type"
 msgstr "알수 없는 종류"
 
-#: include/functions2.php:2001
+#: include/functions2.php:2014
 msgid "Attachments"
 msgstr "첨부"
 
+#: include/functions2.php:2456
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: include/functions2.php:2457
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr ""
+
+#: include/functions2.php:2458
+msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
+msgstr ""
+
+#: include/functions2.php:2459
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: include/functions2.php:2460
+#, fuzzy
+msgid "No file was uploaded"
+msgstr "업로드된 파일 없음."
+
+#: include/functions2.php:2461
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: include/functions2.php:2462
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: include/functions2.php:2463
+msgid "A PHP extension stopped the file upload."
+msgstr ""
+
 #: include/login_form.php:197
 #: classes/handler/public.php:569
 #: classes/handler/public.php:824
@@ -909,8 +946,8 @@ msgstr "이 글의 태그 (쉼표로 구분)"
 #: classes/article.php:222
 #: classes/pref/labels.php:79
 #: classes/pref/users.php:98
-#: classes/pref/feeds.php:799
-#: classes/pref/feeds.php:939
+#: classes/pref/feeds.php:801
+#: classes/pref/feeds.php:943
 #: classes/pref/filters.php:485
 #: classes/pref/prefs.php:989
 #: plugins/instances/init.php:245
@@ -928,17 +965,17 @@ msgstr "저장"
 #: classes/handler/public.php:580
 #: classes/pref/labels.php:81
 #: classes/pref/users.php:100
-#: classes/pref/feeds.php:800
-#: classes/pref/feeds.php:942
-#: classes/pref/feeds.php:1860
+#: classes/pref/feeds.php:802
+#: classes/pref/feeds.php:946
+#: classes/pref/feeds.php:1865
 #: classes/pref/filters.php:488
 #: classes/pref/filters.php:902
 #: classes/pref/filters.php:983
 #: classes/pref/filters.php:1076
 #: classes/pref/prefs.php:991
-#: classes/feeds.php:1098
-#: classes/feeds.php:1148
-#: classes/feeds.php:1185
+#: classes/feeds.php:1100
+#: classes/feeds.php:1150
+#: classes/feeds.php:1187
 #: plugins/instances/init.php:248
 #: plugins/instances/init.php:436
 #: plugins/note/init.php:53
@@ -994,7 +1031,6 @@ msgid "Processing category: %s"
 msgstr "카테고리 처리중: %s"
 
 #: classes/opml.php:470
-#: plugins/import_export/init.php:428
 #, php-format
 msgid "Upload failed with error code %d"
 msgstr ""
@@ -1213,9 +1249,9 @@ msgstr "<b>%s</b> 라벨이 생성되었습니다."
 
 #: classes/pref/labels.php:258
 #: classes/pref/users.php:334
-#: classes/pref/feeds.php:1340
-#: classes/pref/feeds.php:1602
-#: classes/pref/feeds.php:1666
+#: classes/pref/feeds.php:1344
+#: classes/pref/feeds.php:1606
+#: classes/pref/feeds.php:1670
 #: classes/pref/filters.php:359
 #: classes/pref/filters.php:407
 #: classes/pref/filters.php:744
@@ -1228,9 +1264,9 @@ msgstr "선택"
 
 #: classes/pref/labels.php:261
 #: classes/pref/users.php:337
-#: classes/pref/feeds.php:1343
-#: classes/pref/feeds.php:1605
-#: classes/pref/feeds.php:1669
+#: classes/pref/feeds.php:1347
+#: classes/pref/feeds.php:1609
+#: classes/pref/feeds.php:1673
 #: classes/pref/filters.php:362
 #: classes/pref/filters.php:410
 #: classes/pref/filters.php:747
@@ -1244,9 +1280,9 @@ msgstr "전체"
 
 #: classes/pref/labels.php:263
 #: classes/pref/users.php:339
-#: classes/pref/feeds.php:1345
-#: classes/pref/feeds.php:1607
-#: classes/pref/feeds.php:1671
+#: classes/pref/feeds.php:1349
+#: classes/pref/feeds.php:1611
+#: classes/pref/feeds.php:1675
 #: classes/pref/filters.php:364
 #: classes/pref/filters.php:412
 #: classes/pref/filters.php:749
@@ -1260,10 +1296,10 @@ msgstr "선택 안 함"
 
 #: classes/pref/labels.php:270
 #: classes/pref/users.php:348
-#: classes/pref/feeds.php:765
+#: classes/pref/feeds.php:767
 #: classes/pref/filters.php:478
 #: classes/pref/filters.php:766
-#: classes/feeds.php:1147
+#: classes/feeds.php:1149
 #: plugins/instances/init.php:294
 msgid "Remove"
 msgstr "삭제"
@@ -1285,7 +1321,7 @@ msgstr "규칙 편집"
 
 #: classes/pref/users.php:56
 #: classes/pref/feeds.php:637
-#: classes/pref/feeds.php:876
+#: classes/pref/feeds.php:878
 #: classes/feeds.php:1070
 msgid "Authentication"
 msgstr "인증"
@@ -1295,8 +1331,8 @@ msgid "Access level: "
 msgstr "계정 권한:"
 
 #: classes/pref/users.php:77
-#: classes/pref/feeds.php:665
-#: classes/pref/feeds.php:892
+#: classes/pref/feeds.php:667
+#: classes/pref/feeds.php:896
 msgid "Options"
 msgstr "옵션"
 
@@ -1362,10 +1398,10 @@ msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] 암호 변경 안내"
 
 #: classes/pref/users.php:324
-#: classes/pref/feeds.php:1336
+#: classes/pref/feeds.php:1340
 #: classes/pref/filters.php:740
-#: classes/feeds.php:1118
-#: classes/feeds.php:1184
+#: classes/feeds.php:1120
+#: classes/feeds.php:1186
 #: js/tt-rss.js:174
 msgid "Search"
 msgstr "검색"
@@ -1382,8 +1418,8 @@ msgstr "편집"
 
 #: classes/pref/users.php:397
 #: classes/pref/feeds.php:643
-#: classes/pref/feeds.php:880
-#: classes/pref/feeds.php:1838
+#: classes/pref/feeds.php:882
+#: classes/pref/feeds.php:1842
 #: classes/feeds.php:1074
 msgid "Login"
 msgstr "로그인"
@@ -1461,251 +1497,251 @@ msgid "Feed Title"
 msgstr "피드 제목"
 
 #: classes/pref/feeds.php:595
-#: classes/pref/feeds.php:828
-#: classes/pref/feeds.php:1824
+#: classes/pref/feeds.php:830
+#: classes/pref/feeds.php:1828
 #: classes/feeds.php:1050
 msgid "Place in category:"
 msgstr "카테고리 위치:"
 
 #: classes/pref/feeds.php:608
-#: classes/pref/feeds.php:842
+#: classes/pref/feeds.php:844
 #, fuzzy
 msgid "Language:"
 msgstr "언어"
 
 #: classes/pref/feeds.php:615
-#: classes/pref/feeds.php:851
+#: classes/pref/feeds.php:853
 msgid "Update"
 msgstr "업데이트"
 
 #: classes/pref/feeds.php:630
-#: classes/pref/feeds.php:867
+#: classes/pref/feeds.php:869
 msgid "Article purging:"
 msgstr "글을 유지:"
 
-#: classes/pref/feeds.php:656
-#: classes/pref/feeds.php:886
-#: classes/pref/feeds.php:1841
+#: classes/pref/feeds.php:658
+#: classes/pref/feeds.php:890
+#: classes/pref/feeds.php:1845
 #: classes/pref/prefs.php:245
-#: classes/feeds.php:1077
+#: classes/feeds.php:1078
 msgid "Password"
 msgstr "암호"
 
-#: classes/pref/feeds.php:660
+#: classes/pref/feeds.php:662
 msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
 msgstr ""
 
-#: classes/pref/feeds.php:679
-#: classes/pref/feeds.php:896
+#: classes/pref/feeds.php:681
+#: classes/pref/feeds.php:900
 msgid "Hide from Popular feeds"
 msgstr "인기 피드에서 숨김"
 
-#: classes/pref/feeds.php:691
-#: classes/pref/feeds.php:902
+#: classes/pref/feeds.php:693
+#: classes/pref/feeds.php:906
 msgid "Include in e-mail digest"
 msgstr "이메일 요약에 포함"
 
-#: classes/pref/feeds.php:704
-#: classes/pref/feeds.php:908
+#: classes/pref/feeds.php:706
+#: classes/pref/feeds.php:912
 msgid "Always display image attachments"
 msgstr ""
 
-#: classes/pref/feeds.php:717
-#: classes/pref/feeds.php:916
+#: classes/pref/feeds.php:719
+#: classes/pref/feeds.php:920
 msgid "Do not embed images"
 msgstr ""
 
-#: classes/pref/feeds.php:730
-#: classes/pref/feeds.php:924
+#: classes/pref/feeds.php:732
+#: classes/pref/feeds.php:928
 msgid "Cache images locally"
 msgstr "이미지를 로컬에 캐쉬"
 
-#: classes/pref/feeds.php:742
-#: classes/pref/feeds.php:930
+#: classes/pref/feeds.php:744
+#: classes/pref/feeds.php:934
 msgid "Mark updated articles as unread"
 msgstr "업데이트된 글을 읽지 않음 표시"
 
-#: classes/pref/feeds.php:746
+#: classes/pref/feeds.php:748
 msgid "Icon"
 msgstr "아이콘"
 
-#: classes/pref/feeds.php:763
+#: classes/pref/feeds.php:765
 msgid "Replace"
 msgstr ""
 
-#: classes/pref/feeds.php:770
+#: classes/pref/feeds.php:772
 #: classes/pref/prefs.php:706
 msgid "Plugins"
 msgstr "플러그인"
 
-#: classes/pref/feeds.php:790
+#: classes/pref/feeds.php:792
 msgid "Resubscribe to push updates"
 msgstr "업데이트 알림을 위해 다시 구독"
 
-#: classes/pref/feeds.php:797
+#: classes/pref/feeds.php:799
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr ""
 
-#: classes/pref/feeds.php:1203
-#: classes/pref/feeds.php:1256
+#: classes/pref/feeds.php:1207
+#: classes/pref/feeds.php:1260
 msgid "All done."
 msgstr "완료되었습니다."
 
-#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1315
 msgid "Feeds with errors"
 msgstr "오류가 있는 피드"
 
-#: classes/pref/feeds.php:1318
+#: classes/pref/feeds.php:1322
 msgid "Inactive feeds"
 msgstr "피드 비활성화"
 
-#: classes/pref/feeds.php:1354
+#: classes/pref/feeds.php:1358
 msgid "Edit selected feeds"
 msgstr "선택된 피드 편집"
 
-#: classes/pref/feeds.php:1356
-#: classes/pref/feeds.php:1370
+#: classes/pref/feeds.php:1360
+#: classes/pref/feeds.php:1374
 #: classes/pref/filters.php:762
 msgid "Reset sort order"
 msgstr "정렬 순서 초기화"
 
-#: classes/pref/feeds.php:1358
+#: classes/pref/feeds.php:1362
 #: js/prefs.js:1737
 msgid "Batch subscribe"
 msgstr "일괄 구독"
 
-#: classes/pref/feeds.php:1365
+#: classes/pref/feeds.php:1369
 msgid "Categories"
 msgstr "카테고리"
 
-#: classes/pref/feeds.php:1368
+#: classes/pref/feeds.php:1372
 msgid "Add category"
 msgstr "카테고리 추가"
 
-#: classes/pref/feeds.php:1372
+#: classes/pref/feeds.php:1376
 msgid "Remove selected"
 msgstr "선택된 항목 제거"
 
-#: classes/pref/feeds.php:1383
+#: classes/pref/feeds.php:1387
 msgid "More actions..."
 msgstr "기타 동작..."
 
-#: classes/pref/feeds.php:1387
+#: classes/pref/feeds.php:1391
 msgid "Manual purge"
 msgstr "수동 남김"
 
-#: classes/pref/feeds.php:1391
+#: classes/pref/feeds.php:1395
 msgid "Clear feed data"
 msgstr "피드 데이터 정리"
 
-#: classes/pref/feeds.php:1392
+#: classes/pref/feeds.php:1396
 #: classes/pref/filters.php:770
 msgid "Rescore articles"
 msgstr "글 점수 다시 매기기"
 
-#: classes/pref/feeds.php:1444
+#: classes/pref/feeds.php:1448
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1446
+#: classes/pref/feeds.php:1450
 msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
 msgstr "OPML을 사용하면 피드/필터/라벨/설정을 내보내고 불러올 수 있습니다."
 
-#: classes/pref/feeds.php:1447
+#: classes/pref/feeds.php:1451
 msgid "Only main settings profile can be migrated using OPML."
 msgstr ""
 
-#: classes/pref/feeds.php:1460
+#: classes/pref/feeds.php:1464
 msgid "Import my OPML"
 msgstr "내 OPML 불러오기"
 
-#: classes/pref/feeds.php:1466
+#: classes/pref/feeds.php:1470
 msgid "Filename:"
 msgstr ""
 
-#: classes/pref/feeds.php:1468
+#: classes/pref/feeds.php:1472
 msgid "Include settings"
 msgstr "설정 포함"
 
-#: classes/pref/feeds.php:1472
+#: classes/pref/feeds.php:1476
 msgid "Export OPML"
 msgstr "OPML 내보내기"
 
-#: classes/pref/feeds.php:1476
+#: classes/pref/feeds.php:1480
 msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
 msgstr "사용중인 OPML을 공개하면, 누구든 아래 URL만으로 구독할 수 있습니다."
 
-#: classes/pref/feeds.php:1480
+#: classes/pref/feeds.php:1484
 msgid "Public OPML URL"
 msgstr ""
 
-#: classes/pref/feeds.php:1481
+#: classes/pref/feeds.php:1485
 msgid "Display published OPML URL"
 msgstr "공개 OPML URL 표시"
 
-#: classes/pref/feeds.php:1490
+#: classes/pref/feeds.php:1494
 msgid "Firefox integration"
 msgstr "Firefox 연동"
 
-#: classes/pref/feeds.php:1492
+#: classes/pref/feeds.php:1496
 msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
 msgstr "Tiny Tiny RSS를 Firefox Feed Reader로 사용하려면 아래 링크를 클릭하세요."
 
-#: classes/pref/feeds.php:1499
+#: classes/pref/feeds.php:1503
 msgid "Click here to register this site as a feed reader."
 msgstr "이 사이트를 피드 리더로 등록하려면 여기를 클릭하세요"
 
-#: classes/pref/feeds.php:1507
+#: classes/pref/feeds.php:1511
 msgid "Published & shared articles / Generated feeds"
 msgstr "공개, 공유된 글 / 생성된 피드"
 
-#: classes/pref/feeds.php:1509
+#: classes/pref/feeds.php:1513
 msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
 msgstr "공개된 글들은 RSS 피드로 공개되며, 누구든 아래 URL만으로 구독할 수 있습니다."
 
-#: classes/pref/feeds.php:1516
+#: classes/pref/feeds.php:1520
 #: classes/feeds.php:54
 #: classes/feeds.php:134
 msgid "View as RSS"
 msgstr "RSS로 보기"
 
-#: classes/pref/feeds.php:1517
+#: classes/pref/feeds.php:1521
 msgid "Display URL"
 msgstr "URL 표시"
 
-#: classes/pref/feeds.php:1520
+#: classes/pref/feeds.php:1524
 msgid "Clear all generated URLs"
 msgstr "이미 만들어진 URL 제거"
 
-#: classes/pref/feeds.php:1598
+#: classes/pref/feeds.php:1602
 msgid "These feeds have not been updated with new content for 3 months (oldest first):"
 msgstr "3개월 이상 업데이트 되지 않은 피드(오래된 순서):"
 
-#: classes/pref/feeds.php:1632
-#: classes/pref/feeds.php:1696
+#: classes/pref/feeds.php:1636
+#: classes/pref/feeds.php:1700
 msgid "Click to edit feed"
 msgstr "클릭하여 피드 편집"
 
-#: classes/pref/feeds.php:1650
-#: classes/pref/feeds.php:1716
+#: classes/pref/feeds.php:1654
+#: classes/pref/feeds.php:1720
 msgid "Unsubscribe from selected feeds"
 msgstr "선택된 피드 구독 해제 중..."
 
-#: classes/pref/feeds.php:1821
+#: classes/pref/feeds.php:1825
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr ""
 
-#: classes/pref/feeds.php:1830
+#: classes/pref/feeds.php:1834
 msgid "Feeds to subscribe, One per line"
 msgstr ""
 
-#: classes/pref/feeds.php:1852
+#: classes/pref/feeds.php:1857
 msgid "Feeds require authentication."
 msgstr "인증이 필요한 피드"
 
-#: classes/pref/feeds.php:1859
-#: classes/feeds.php:1092
-#: classes/feeds.php:1146
+#: classes/pref/feeds.php:1864
+#: classes/feeds.php:1094
+#: classes/feeds.php:1148
 msgid "Subscribe"
 msgstr "구독"
 
@@ -1788,7 +1824,7 @@ msgid "on field"
 msgstr "필드"
 
 #: classes/pref/filters.php:962
-#: js/PrefFilterTree.js:61
+#: js/PrefFilterTree.js:64
 msgid "in"
 msgstr ""
 
@@ -2380,40 +2416,40 @@ msgstr "피드나 사이트 URL"
 msgid "Available feeds"
 msgstr "사용 가능한 피드"
 
-#: classes/feeds.php:1087
+#: classes/feeds.php:1089
 msgid "This feed requires authentication."
 msgstr "이 피드는 로그인이 필요합니다."
 
-#: classes/feeds.php:1095
+#: classes/feeds.php:1097
 msgid "More feeds"
 msgstr "기타 피드"
 
-#: classes/feeds.php:1122
+#: classes/feeds.php:1124
 msgid "Popular feeds"
 msgstr "인기 피드"
 
-#: classes/feeds.php:1123
+#: classes/feeds.php:1125
 msgid "Feed archive"
 msgstr "피드 보관"
 
-#: classes/feeds.php:1126
+#: classes/feeds.php:1128
 msgid "limit:"
 msgstr "제한:"
 
-#: classes/feeds.php:1158
+#: classes/feeds.php:1160
 msgid "Look for"
 msgstr ""
 
-#: classes/feeds.php:1166
+#: classes/feeds.php:1168
 #, php-format
 msgid "in %s"
 msgstr ""
 
-#: classes/feeds.php:1171
+#: classes/feeds.php:1173
 msgid "Used for word stemming"
 msgstr ""
 
-#: classes/feeds.php:1180
+#: classes/feeds.php:1182
 msgid "Search syntax"
 msgstr "문법 "
 
@@ -2674,6 +2710,11 @@ msgstr ""
 msgid "Prepare data"
 msgstr "데이터 준비"
 
+#: plugins/import_export/init.php:428
+#, php-format
+msgid "Upload failed with error code %d (%s)"
+msgstr ""
+
 #: plugins/import_export/init.php:454
 msgid "No file uploaded."
 msgstr "업로드된 파일 없음."
@@ -2785,7 +2826,7 @@ msgstr "카테고리 편집"
 msgid "Remove category"
 msgstr "카테고리 제거"
 
-#: js/PrefFilterTree.js:64
+#: js/PrefFilterTree.js:67
 msgid "Inverse"
 msgstr "반전"
 
@@ -2836,7 +2877,7 @@ msgid "Subscription reset."
 msgstr "구독이 초기화되었습니다."
 
 #: js/functions.js:1311
-#: js/tt-rss.js:682
+#: js/tt-rss.js:705
 #, perl-format
 msgid "Unsubscribe from %s?"
 msgstr "%s를 구독 해제 할까요?"
@@ -3066,40 +3107,40 @@ msgstr "모든 글을 읽음 표시 할까요?"
 msgid "Marking all feeds as read..."
 msgstr "모든 피드를 읽음 표시중..."
 
-#: js/tt-rss.js:383
+#: js/tt-rss.js:404
 msgid "Please enable mail plugin first."
 msgstr "먼저 메일 플러그인을 켜세요."
 
-#: js/tt-rss.js:431
+#: js/tt-rss.js:452
 #: js/functions.js:1643
-#: js/tt-rss.js:663
+#: js/tt-rss.js:686
 msgid "You can't edit this kind of feed."
 msgstr "이 형식의 피드는 편집할 수 없습니다."
 
-#: js/tt-rss.js:502
+#: js/tt-rss.js:533
 msgid "Please enable embed_original plugin first."
 msgstr "먼저 embed_original 플러그인을 켜세요."
 
-#: js/tt-rss.js:515
-#: js/tt-rss.js:713
+#: js/tt-rss.js:546
+#: js/tt-rss.js:736
 msgid "Widescreen is not available in combined mode."
 msgstr ""
 
-#: js/tt-rss.js:827
+#: js/tt-rss.js:850
 msgid "You can't rescore this kind of feed."
 msgstr "이 형식의 피드는 점수를 새로 매길 수 없습니다."
 
-#: js/tt-rss.js:832
-#: js/tt-rss.js:676
+#: js/tt-rss.js:855
+#: js/tt-rss.js:699
 msgid "Please select some feed first."
 msgstr "피드를 먼저 선택하세요."
 
-#: js/tt-rss.js:837
+#: js/tt-rss.js:860
 #, perl-format
 msgid "Rescore articles in %s?"
 msgstr "%s의 글의 점수를 다시 매길까요?"
 
-#: js/tt-rss.js:840
+#: js/tt-rss.js:863
 msgid "Rescoring articles..."
 msgstr "글 점수 다시 매기는중..."
 
@@ -3272,7 +3313,7 @@ msgstr "개인 정보가 저장되었습니다."
 msgid "Sorry, your browser does not support sandboxed iframes."
 msgstr ""
 
-#: plugins/shorten_expanded/init.js:37
+#: plugins/shorten_expanded/init.js:39
 msgid "Click to expand article"
 msgstr "글을 펼쳐보려면 클릭하세요"
 
@@ -3525,7 +3566,7 @@ msgstr "생성된 URL이 지워졌습니다."
 msgid "Label Editor"
 msgstr "라벨 편집기"
 
-#: js/tt-rss.js:671
+#: js/tt-rss.js:694
 msgid "You can't unsubscribe from the category."
 msgstr "카테고리에서는 구독 해제 할 수 없습니다."
 
diff --git a/locale/lv_LV/LC_MESSAGES/messages.mo b/locale/lv_LV/LC_MESSAGES/messages.mo
index 847c367eb..a4ee4c087 100644
Binary files a/locale/lv_LV/LC_MESSAGES/messages.mo and b/locale/lv_LV/LC_MESSAGES/messages.mo differ
diff --git a/locale/lv_LV/LC_MESSAGES/messages.po b/locale/lv_LV/LC_MESSAGES/messages.po
index eaf42acc1..a9be07c41 100644
--- a/locale/lv_LV/LC_MESSAGES/messages.po
+++ b/locale/lv_LV/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tt-rss git\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 22:58+0300\n"
+"POT-Creation-Date: 2016-08-19 18:16+0300\n"
 "PO-Revision-Date: 2014-11-01 23:36+0300\n"
 "Last-Translator: Valdis Vītoliņš <valdis.vitolins@odo.lv>\n"
 "Language-Team: \n"
@@ -166,13 +166,13 @@ msgstr "Barotne netika atrasta."
 msgid "Plugin not found"
 msgstr "Lietotājs netika atrasts"
 
-#: index.php:133
-#: index.php:149
-#: index.php:267
-#: prefs.php:102
+#: index.php:148
+#: index.php:164
+#: index.php:282
+#: prefs.php:117
 #: classes/backend.php:5
 #: classes/pref/labels.php:282
-#: classes/pref/feeds.php:1405
+#: classes/pref/feeds.php:1409
 #: classes/pref/filters.php:779
 #: js/feedlist.js:159
 #: js/functions.js:1293
@@ -184,7 +184,7 @@ msgstr "Lietotājs netika atrasts"
 #: js/prefs.js:1781
 #: js/prefs.js:1799
 #: js/tt-rss.js:55
-#: js/tt-rss.js:522
+#: js/tt-rss.js:553
 #: js/viewfeed.js:1298
 #: plugins/import_export/import_export.js:17
 #: js/feedlist.js:484
@@ -197,75 +197,75 @@ msgstr "Lietotājs netika atrasts"
 #: js/prefs.js:1556
 #: js/prefs.js:1572
 #: js/prefs.js:1592
-#: js/tt-rss.js:539
+#: js/tt-rss.js:570
 #: js/viewfeed.js:830
 msgid "Loading, please wait..."
 msgstr "Ielādē, lūdzu gaidiet..."
 
-#: index.php:167
+#: index.php:182
 msgid "Collapse feedlist"
 msgstr "Sakļaut barotņu sarakstu"
 
-#: index.php:170
+#: index.php:185
 msgid "Show articles"
 msgstr "Rādīt rakstus"
 
-#: index.php:173
+#: index.php:188
 msgid "Adaptive"
 msgstr "Adaptīvs"
 
-#: index.php:174
+#: index.php:189
 msgid "All Articles"
 msgstr "Visus rakstus"
 
-#: index.php:175
-#: include/functions2.php:101
+#: index.php:190
+#: include/functions2.php:102
 #: classes/feeds.php:104
 msgid "Starred"
 msgstr "Zvaigžņotos"
 
-#: index.php:176
-#: include/functions2.php:102
+#: index.php:191
+#: include/functions2.php:103
 #: classes/feeds.php:105
 msgid "Published"
 msgstr "Publicētos"
 
-#: index.php:177
+#: index.php:192
 #: classes/feeds.php:91
 #: classes/feeds.php:103
 msgid "Unread"
 msgstr "Nelasītos"
 
-#: index.php:178
+#: index.php:193
 msgid "With Note"
 msgstr "Ar piezīmi"
 
-#: index.php:179
+#: index.php:194
 msgid "Ignore Scoring"
 msgstr "Ignorēt novērtējumu"
 
-#: index.php:182
+#: index.php:197
 msgid "Sort articles"
 msgstr "Kārtot rakstus"
 
-#: index.php:185
+#: index.php:200
 msgid "Default"
 msgstr "Noklusētais"
 
-#: index.php:186
+#: index.php:201
 msgid "Newest first"
 msgstr "Jaunāko vispirms"
 
-#: index.php:187
+#: index.php:202
 msgid "Oldest first"
 msgstr "Vecāko vispirms"
 
-#: index.php:188
+#: index.php:203
 msgid "Title"
 msgstr "Virsraksts"
 
-#: index.php:192
-#: index.php:233
+#: index.php:207
+#: index.php:248
 #: include/functions2.php:90
 #: classes/feeds.php:109
 #: js/FeedTree.js:132
@@ -273,134 +273,134 @@ msgstr "Virsraksts"
 msgid "Mark as read"
 msgstr "Atzīmēt kā lasītu"
 
-#: index.php:195
+#: index.php:210
 msgid "Older than one day"
 msgstr "Par dienu vecākus"
 
-#: index.php:198
+#: index.php:213
 msgid "Older than one week"
 msgstr "Par nedēļu vecākus"
 
-#: index.php:201
+#: index.php:216
 msgid "Older than two weeks"
 msgstr "Par divām nedēļām vecākus"
 
-#: index.php:217
+#: index.php:232
 msgid "Communication problem with server."
 msgstr "Saziņas kļūda ar serveri."
 
-#: index.php:223
+#: index.php:238
 msgid "Actions..."
 msgstr "Darbības..."
 
-#: index.php:225
+#: index.php:240
 msgid "Preferences..."
 msgstr "Iestatījumi..."
 
-#: index.php:226
+#: index.php:241
 msgid "Search..."
 msgstr "Meklēt..."
 
-#: index.php:227
+#: index.php:242
 msgid "Feed actions:"
 msgstr "Barotnes darbības"
 
-#: index.php:228
+#: index.php:243
 #: classes/handler/public.php:672
 msgid "Subscribe to feed..."
 msgstr "Abonēt barotni..."
 
-#: index.php:229
+#: index.php:244
 msgid "Edit this feed..."
 msgstr "Mainīt šo barotni..."
 
-#: index.php:230
+#: index.php:245
 msgid "Rescore feed"
 msgstr "Pārvērtēt barotni"
 
-#: index.php:231
-#: classes/pref/feeds.php:783
-#: classes/pref/feeds.php:1360
+#: index.php:246
+#: classes/pref/feeds.php:785
+#: classes/pref/feeds.php:1364
 #: js/PrefFeedTree.js:74
 msgid "Unsubscribe"
 msgstr "Dzēst"
 
-#: index.php:232
+#: index.php:247
 msgid "All feeds:"
 msgstr "Visas barotnes:"
 
-#: index.php:234
+#: index.php:249
 msgid "(Un)hide read feeds"
 msgstr "(Ne)rādīt lasītās barotnes"
 
-#: index.php:235
+#: index.php:250
 msgid "Other actions:"
 msgstr "Citas darbības:"
 
-#: index.php:236
+#: index.php:251
 #: include/functions2.php:76
 msgid "Toggle widescreen mode"
 msgstr "Pārslēgt platekrāna režīmu"
 
-#: index.php:237
+#: index.php:252
 msgid "Create label..."
 msgstr "Izveido iezīmi..."
 
-#: index.php:238
+#: index.php:253
 msgid "Create filter..."
 msgstr "Izveidot filtru..."
 
-#: index.php:239
+#: index.php:254
 msgid "Keyboard shortcuts help"
 msgstr "Isinājumtaustiņu palīdzība"
 
-#: index.php:248
+#: index.php:263
 msgid "Logout"
 msgstr "Atteikties"
 
-#: index.php:254
+#: index.php:269
 msgid "Updates are available from Git."
 msgstr ""
 
 #: prefs.php:33
-#: prefs.php:120
-#: include/functions2.php:104
+#: prefs.php:135
+#: include/functions2.php:105
 #: classes/pref/prefs.php:435
 msgid "Preferences"
 msgstr "Iestatījumi"
 
-#: prefs.php:111
+#: prefs.php:126
 msgid "Keyboard shortcuts"
 msgstr "Īsinājumtaustiņi"
 
-#: prefs.php:112
+#: prefs.php:127
 msgid "Exit preferences"
 msgstr "Iziet no iestatījumiem"
 
-#: prefs.php:123
+#: prefs.php:138
 #: classes/pref/feeds.php:112
-#: classes/pref/feeds.php:1300
-#: classes/pref/feeds.php:1349
+#: classes/pref/feeds.php:1304
+#: classes/pref/feeds.php:1353
 msgid "Feeds"
 msgstr "Barotnes"
 
-#: prefs.php:126
+#: prefs.php:141
 #: classes/pref/filters.php:248
 msgid "Filters"
 msgstr "Filtri"
 
-#: prefs.php:129
-#: include/functions.php:1256
-#: include/functions.php:1909
+#: prefs.php:144
+#: include/functions.php:1287
+#: include/functions.php:1940
 #: classes/pref/labels.php:90
 msgid "Labels"
 msgstr "Iezīmes"
 
-#: prefs.php:133
+#: prefs.php:148
 msgid "Users"
 msgstr "Lietotāji"
 
-#: prefs.php:136
+#: prefs.php:151
 msgid "System"
 msgstr "Sistēma"
 
@@ -482,10 +482,10 @@ msgid "Tiny Tiny RSS data update script."
 msgstr "Tiny Tiny RSS datu atjaunošanas skripts."
 
 #: include/digest.php:109
-#: include/functions.php:1265
-#: include/functions.php:1810
-#: include/functions.php:1895
-#: include/functions.php:1917
+#: include/functions.php:1296
+#: include/functions.php:1841
+#: include/functions.php:1926
+#: include/functions.php:1948
 #: classes/opml.php:421
 #: classes/pref/feeds.php:228
 msgid "Uncategorized"
@@ -502,44 +502,44 @@ msgstr[1] "%d arhivēti raksti"
 msgid "No feeds found."
 msgstr "Neatradu barotnes."
 
-#: include/functions.php:958
+#: include/functions.php:989
 #, php-format
 msgid "%d min"
 msgstr ""
 
-#: include/functions.php:1254
-#: include/functions.php:1907
+#: include/functions.php:1285
+#: include/functions.php:1938
 msgid "Special"
 msgstr "Īpaši"
 
-#: include/functions.php:1758
+#: include/functions.php:1789
 #: classes/pref/filters.php:229
 #: classes/pref/filters.php:507
 msgid "All feeds"
 msgstr "Visas barotnes"
 
-#: include/functions.php:1962
+#: include/functions.php:1993
 msgid "Starred articles"
 msgstr "Zvaigžņotie raksti"
 
-#: include/functions.php:1964
+#: include/functions.php:1995
 msgid "Published articles"
 msgstr "Publicētie raksti"
 
-#: include/functions.php:1966
+#: include/functions.php:1997
 msgid "Fresh articles"
 msgstr "Jaunākie raksti"
 
-#: include/functions.php:1968
-#: include/functions2.php:99
+#: include/functions.php:1999
+#: include/functions2.php:100
 msgid "All articles"
 msgstr "Visi raksti"
 
-#: include/functions.php:1970
+#: include/functions.php:2001
 msgid "Archived articles"
 msgstr "Arhivētie raksti"
 
-#: include/functions.php:1972
+#: include/functions.php:2003
 msgid "Recently read"
 msgstr "Nesen lasītie raksti"
 
@@ -679,7 +679,7 @@ msgstr "Neatzīmēt visu"
 
 #: include/functions2.php:85
 #: classes/pref/feeds.php:555
-#: classes/pref/feeds.php:821
+#: classes/pref/feeds.php:823
 msgid "Feed"
 msgstr "Barotne"
 
@@ -692,7 +692,7 @@ msgid "Un/hide read feeds"
 msgstr "(Ne)rādīt lasītās barotnes"
 
 #: include/functions2.php:88
-#: classes/pref/feeds.php:1352
+#: classes/pref/feeds.php:1356
 msgid "Subscribe to feed"
 msgstr "Abonēt barotni"
 
@@ -708,140 +708,177 @@ msgid "Reverse headlines"
 msgstr "Apvērst virsrakstus"
 
 #: include/functions2.php:92
+msgid "Toggle headline grouping"
+msgstr ""
+
+#: include/functions2.php:93
 msgid "Debug feed update"
 msgstr "Atkļūdot barotņu atjaunojumus"
 
-#: include/functions2.php:93
+#: include/functions2.php:94
 #, fuzzy
 msgid "Debug viewfeed()"
 msgstr "Atkļūdot barotņu atjaunojumus"
 
-#: include/functions2.php:94
+#: include/functions2.php:95
 #: js/FeedTree.js:182
 msgid "Mark all feeds as read"
 msgstr "Atzīmēt visas barotnes kā lasītas"
 
-#: include/functions2.php:95
+#: include/functions2.php:96
 msgid "Un/collapse current category"
 msgstr "Izvērst/sakļaut tekošo kategoriju"
 
-#: include/functions2.php:96
+#: include/functions2.php:97
 msgid "Toggle combined mode"
 msgstr "Pārslēgt kombinēto režīmu"
 
-#: include/functions2.php:97
+#: include/functions2.php:98
 msgid "Toggle auto expand in combined mode"
 msgstr "Pārslēgt autoizvēršanu kombinētajā režīmā"
 
-#: include/functions2.php:98
+#: include/functions2.php:99
 msgid "Go to"
 msgstr "Doties uz"
 
-#: include/functions2.php:100
+#: include/functions2.php:101
 msgid "Fresh"
 msgstr "Svaigs"
 
-#: include/functions2.php:103
-#: js/tt-rss.js:466
-#: js/tt-rss.js:650
+#: include/functions2.php:104
+#: js/tt-rss.js:497
+#: js/tt-rss.js:673
 msgid "Tag cloud"
 msgstr "Iezīmju mākonis"
 
-#: include/functions2.php:105
+#: include/functions2.php:106
 msgid "Other"
 msgstr "Citi"
 
-#: include/functions2.php:106
+#: include/functions2.php:107
 #: classes/pref/labels.php:267
 msgid "Create label"
 msgstr "Izveidot etiķeti"
 
-#: include/functions2.php:107
+#: include/functions2.php:108
 #: classes/pref/filters.php:753
 msgid "Create filter"
 msgstr "Izveidot filtru"
 
-#: include/functions2.php:108
+#: include/functions2.php:109
 msgid "Un/collapse sidebar"
 msgstr "Izvērst/sakļaut sānjoslu"
 
-#: include/functions2.php:109
+#: include/functions2.php:110
 msgid "Show help dialog"
 msgstr "Rādīt palīdzības logu"
 
-#: include/functions2.php:663
+#: include/functions2.php:665
 #, php-format
 msgid "Search results: %s"
 msgstr "Meklēšanas rezultāti: %s"
 
-#: include/functions2.php:1317
+#: include/functions2.php:1330
 #: classes/feeds.php:749
 msgid "comment"
 msgid_plural "comments"
 msgstr[0] "komentārs"
 msgstr[1] "komentāri"
 
-#: include/functions2.php:1321
+#: include/functions2.php:1334
 #: classes/feeds.php:753
 msgid "comments"
 msgstr "komentāri"
 
-#: include/functions2.php:1347
+#: include/functions2.php:1360
 msgid " - "
 msgstr "–"
 
-#: include/functions2.php:1380
-#: include/functions2.php:1631
+#: include/functions2.php:1393
+#: include/functions2.php:1644
 #: classes/article.php:311
 msgid "no tags"
 msgstr "nav iezīmju"
 
-#: include/functions2.php:1390
+#: include/functions2.php:1403
 #: classes/feeds.php:735
 msgid "Edit tags for this article"
 msgstr "Mainīt šī raksta iezīmes"
 
-#: include/functions2.php:1422
+#: include/functions2.php:1435
 #: classes/feeds.php:682
 msgid "Originally from:"
 msgstr "Sākotnējais no:"
 
-#: include/functions2.php:1435
+#: include/functions2.php:1448
 #: classes/pref/feeds.php:574
 #: classes/feeds.php:695
 msgid "Feed URL"
 msgstr "Barotnes URL"
 
-#: include/functions2.php:1472
+#: include/functions2.php:1485
 #: classes/backend.php:105
 #: classes/dlg.php:37
 #: classes/dlg.php:60
 #: classes/dlg.php:93
 #: classes/dlg.php:159
 #: classes/dlg.php:186
-#: classes/pref/feeds.php:1654
-#: classes/pref/feeds.php:1720
+#: classes/pref/feeds.php:1658
+#: classes/pref/feeds.php:1724
 #: classes/pref/filters.php:204
 #: classes/pref/prefs.php:1105
 #: plugins/af_psql_trgm/init.php:102
 #: plugins/import_export/init.php:415
-#: plugins/import_export/init.php:460
+#: plugins/import_export/init.php:461
 #: plugins/share/init.php:121
 msgid "Close this window"
 msgstr "Aizvērt šo logu"
 
-#: include/functions2.php:1669
+#: include/functions2.php:1682
 msgid "(edit note)"
 msgstr "(mainīt piezīmi)"
 
-#: include/functions2.php:1924
+#: include/functions2.php:1937
 msgid "unknown type"
 msgstr "nezināms tips"
 
-#: include/functions2.php:2001
+#: include/functions2.php:2014
 msgid "Attachments"
 msgstr "Pielikumi"
 
+#: include/functions2.php:2456
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: include/functions2.php:2457
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr ""
+
+#: include/functions2.php:2458
+msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
+msgstr ""
+
+#: include/functions2.php:2459
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: include/functions2.php:2460
+#, fuzzy
+msgid "No file was uploaded"
+msgstr "Fails nav augšuplādēts."
+
+#: include/functions2.php:2461
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: include/functions2.php:2462
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: include/functions2.php:2463
+msgid "A PHP extension stopped the file upload."
+msgstr ""
+
 #: include/login_form.php:197
 #: classes/handler/public.php:569
 #: classes/handler/public.php:824
@@ -908,8 +945,8 @@ msgstr "Šī raksta iezīmes (atdalītas ar komatiem):"
 #: classes/article.php:222
 #: classes/pref/labels.php:79
 #: classes/pref/users.php:98
-#: classes/pref/feeds.php:799
-#: classes/pref/feeds.php:939
+#: classes/pref/feeds.php:801
+#: classes/pref/feeds.php:943
 #: classes/pref/filters.php:485
 #: classes/pref/prefs.php:989
 #: plugins/instances/init.php:245
@@ -927,17 +964,17 @@ msgstr "Saglabāt"
 #: classes/handler/public.php:580
 #: classes/pref/labels.php:81
 #: classes/pref/users.php:100
-#: classes/pref/feeds.php:800
-#: classes/pref/feeds.php:942
-#: classes/pref/feeds.php:1860
+#: classes/pref/feeds.php:802
+#: classes/pref/feeds.php:946
+#: classes/pref/feeds.php:1865
 #: classes/pref/filters.php:488
 #: classes/pref/filters.php:902
 #: classes/pref/filters.php:983
 #: classes/pref/filters.php:1076
 #: classes/pref/prefs.php:991
-#: classes/feeds.php:1098
-#: classes/feeds.php:1148
-#: classes/feeds.php:1185
+#: classes/feeds.php:1100
+#: classes/feeds.php:1150
+#: classes/feeds.php:1187
 #: plugins/instances/init.php:248
 #: plugins/instances/init.php:436
 #: plugins/note/init.php:53
@@ -993,7 +1030,6 @@ msgid "Processing category: %s"
 msgstr "Apstrādā kategoriju: %s"
 
 #: classes/opml.php:470
-#: plugins/import_export/init.php:428
 #, php-format
 msgid "Upload failed with error code %d"
 msgstr "Augšuplāde neizdevās ar kļūdas kodu %d"
@@ -1211,9 +1247,9 @@ msgstr "Izveidoju etiķeti <b>%s</b>"
 
 #: classes/pref/labels.php:258
 #: classes/pref/users.php:334
-#: classes/pref/feeds.php:1340
-#: classes/pref/feeds.php:1602
-#: classes/pref/feeds.php:1666
+#: classes/pref/feeds.php:1344
+#: classes/pref/feeds.php:1606
+#: classes/pref/feeds.php:1670
 #: classes/pref/filters.php:359
 #: classes/pref/filters.php:407
 #: classes/pref/filters.php:744
@@ -1226,9 +1262,9 @@ msgstr "Iezīmēt"
 
 #: classes/pref/labels.php:261
 #: classes/pref/users.php:337
-#: classes/pref/feeds.php:1343
-#: classes/pref/feeds.php:1605
-#: classes/pref/feeds.php:1669
+#: classes/pref/feeds.php:1347
+#: classes/pref/feeds.php:1609
+#: classes/pref/feeds.php:1673
 #: classes/pref/filters.php:362
 #: classes/pref/filters.php:410
 #: classes/pref/filters.php:747
@@ -1242,9 +1278,9 @@ msgstr "Visus"
 
 #: classes/pref/labels.php:263
 #: classes/pref/users.php:339
-#: classes/pref/feeds.php:1345
-#: classes/pref/feeds.php:1607
-#: classes/pref/feeds.php:1671
+#: classes/pref/feeds.php:1349
+#: classes/pref/feeds.php:1611
+#: classes/pref/feeds.php:1675
 #: classes/pref/filters.php:364
 #: classes/pref/filters.php:412
 #: classes/pref/filters.php:749
@@ -1258,10 +1294,10 @@ msgstr "Nevienu"
 
 #: classes/pref/labels.php:270
 #: classes/pref/users.php:348
-#: classes/pref/feeds.php:765
+#: classes/pref/feeds.php:767
 #: classes/pref/filters.php:478
 #: classes/pref/filters.php:766
-#: classes/feeds.php:1147
+#: classes/feeds.php:1149
 #: plugins/instances/init.php:294
 msgid "Remove"
 msgstr "Dzēst"
@@ -1283,7 +1319,7 @@ msgstr "Mainīt likumu"
 
 #: classes/pref/users.php:56
 #: classes/pref/feeds.php:637
-#: classes/pref/feeds.php:876
+#: classes/pref/feeds.php:878
 #: classes/feeds.php:1070
 msgid "Authentication"
 msgstr "Autentifikācija"
@@ -1293,8 +1329,8 @@ msgid "Access level: "
 msgstr "Pieejas līmenis:"
 
 #: classes/pref/users.php:77
-#: classes/pref/feeds.php:665
-#: classes/pref/feeds.php:892
+#: classes/pref/feeds.php:667
+#: classes/pref/feeds.php:896
 msgid "Options"
 msgstr "Iespējas"
 
@@ -1360,10 +1396,10 @@ msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] paroles maiņas paziņojums"
 
 #: classes/pref/users.php:324
-#: classes/pref/feeds.php:1336
+#: classes/pref/feeds.php:1340
 #: classes/pref/filters.php:740
-#: classes/feeds.php:1118
-#: classes/feeds.php:1184
+#: classes/feeds.php:1120
+#: classes/feeds.php:1186
 #: js/tt-rss.js:174
 msgid "Search"
 msgstr "Meklēt"
@@ -1380,8 +1416,8 @@ msgstr "Mainīt"
 
 #: classes/pref/users.php:397
 #: classes/pref/feeds.php:643
-#: classes/pref/feeds.php:880
-#: classes/pref/feeds.php:1838
+#: classes/pref/feeds.php:882
+#: classes/pref/feeds.php:1842
 #: classes/feeds.php:1074
 msgid "Login"
 msgstr "Pieteikšanās"
@@ -1460,251 +1496,251 @@ msgid "Feed Title"
 msgstr "Barotnes virsraksts"
 
 #: classes/pref/feeds.php:595
-#: classes/pref/feeds.php:828
-#: classes/pref/feeds.php:1824
+#: classes/pref/feeds.php:830
+#: classes/pref/feeds.php:1828
 #: classes/feeds.php:1050
 msgid "Place in category:"
 msgstr "Ievietot kategorijā:"
 
 #: classes/pref/feeds.php:608
-#: classes/pref/feeds.php:842
+#: classes/pref/feeds.php:844
 #, fuzzy
 msgid "Language:"
 msgstr "Valoda"
 
 #: classes/pref/feeds.php:615
-#: classes/pref/feeds.php:851
+#: classes/pref/feeds.php:853
 msgid "Update"
 msgstr "Atjaunot"
 
 #: classes/pref/feeds.php:630
-#: classes/pref/feeds.php:867
+#: classes/pref/feeds.php:869
 msgid "Article purging:"
 msgstr "Dzēšu rakstu:"
 
-#: classes/pref/feeds.php:656
-#: classes/pref/feeds.php:886
-#: classes/pref/feeds.php:1841
+#: classes/pref/feeds.php:658
+#: classes/pref/feeds.php:890
+#: classes/pref/feeds.php:1845
 #: classes/pref/prefs.php:245
-#: classes/feeds.php:1077
+#: classes/feeds.php:1078
 msgid "Password"
 msgstr "Parole"
 
-#: classes/pref/feeds.php:660
+#: classes/pref/feeds.php:662
 msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
 msgstr "<b>Ieteikums:</b> ja jūsu barotnei ir nepieciešama autentifikācija, jums ir jāievada pieteikšanās informācija. Vienīgais izņēmums ir Twitter barotnes."
 
-#: classes/pref/feeds.php:679
-#: classes/pref/feeds.php:896
+#: classes/pref/feeds.php:681
+#: classes/pref/feeds.php:900
 msgid "Hide from Popular feeds"
 msgstr "Nerādīt populārajās barotnēs"
 
-#: classes/pref/feeds.php:691
-#: classes/pref/feeds.php:902
+#: classes/pref/feeds.php:693
+#: classes/pref/feeds.php:906
 msgid "Include in e-mail digest"
 msgstr "Iekļaut e-pasta īssavilkumu"
 
-#: classes/pref/feeds.php:704
-#: classes/pref/feeds.php:908
+#: classes/pref/feeds.php:706
+#: classes/pref/feeds.php:912
 msgid "Always display image attachments"
 msgstr "Vienmēr rādīt attēlu pielikumus"
 
-#: classes/pref/feeds.php:717
-#: classes/pref/feeds.php:916
+#: classes/pref/feeds.php:719
+#: classes/pref/feeds.php:920
 msgid "Do not embed images"
 msgstr "Neiegult attēlus"
 
-#: classes/pref/feeds.php:730
-#: classes/pref/feeds.php:924
+#: classes/pref/feeds.php:732
+#: classes/pref/feeds.php:928
 msgid "Cache images locally"
 msgstr "Kešot attēlus lokāli"
 
-#: classes/pref/feeds.php:742
-#: classes/pref/feeds.php:930
+#: classes/pref/feeds.php:744
+#: classes/pref/feeds.php:934
 msgid "Mark updated articles as unread"
 msgstr "Atzīmēt atjaunotos rakstus kā nelasītus"
 
-#: classes/pref/feeds.php:746
+#: classes/pref/feeds.php:748
 msgid "Icon"
 msgstr "Ikona"
 
-#: classes/pref/feeds.php:763
+#: classes/pref/feeds.php:765
 msgid "Replace"
 msgstr "Aizvietot"
 
-#: classes/pref/feeds.php:770
+#: classes/pref/feeds.php:772
 #: classes/pref/prefs.php:706
 msgid "Plugins"
 msgstr "Spraudņi"
 
-#: classes/pref/feeds.php:790
+#: classes/pref/feeds.php:792
 msgid "Resubscribe to push updates"
 msgstr "Pārpasūtīt atjaunojumu grūšanu"
 
-#: classes/pref/feeds.php:797
+#: classes/pref/feeds.php:799
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr "Atstata PubSubHubbub pasūtījumu statusu barotnēm ar ieslēgtu atjaunojumu grūšanu."
 
-#: classes/pref/feeds.php:1203
-#: classes/pref/feeds.php:1256
+#: classes/pref/feeds.php:1207
+#: classes/pref/feeds.php:1260
 msgid "All done."
 msgstr "Viss izdarīts."
 
-#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1315
 msgid "Feeds with errors"
 msgstr "Barotnes ar kļūdām"
 
-#: classes/pref/feeds.php:1318
+#: classes/pref/feeds.php:1322
 msgid "Inactive feeds"
 msgstr "Neaktīvās barotnes"
 
-#: classes/pref/feeds.php:1354
+#: classes/pref/feeds.php:1358
 msgid "Edit selected feeds"
 msgstr "Mainīt izvēlētās barotnes"
 
-#: classes/pref/feeds.php:1356
-#: classes/pref/feeds.php:1370
+#: classes/pref/feeds.php:1360
+#: classes/pref/feeds.php:1374
 #: classes/pref/filters.php:762
 msgid "Reset sort order"
 msgstr "Atstatīt kārtošanas secību"
 
-#: classes/pref/feeds.php:1358
+#: classes/pref/feeds.php:1362
 #: js/prefs.js:1737
 msgid "Batch subscribe"
 msgstr "Pasūtījuma pakotne"
 
-#: classes/pref/feeds.php:1365
+#: classes/pref/feeds.php:1369
 msgid "Categories"
 msgstr "Kategorijas"
 
-#: classes/pref/feeds.php:1368
+#: classes/pref/feeds.php:1372
 msgid "Add category"
 msgstr "Pievienot kategoriju"
 
-#: classes/pref/feeds.php:1372
+#: classes/pref/feeds.php:1376
 msgid "Remove selected"
 msgstr "Dzēst izvēlētās"
 
-#: classes/pref/feeds.php:1383
+#: classes/pref/feeds.php:1387
 msgid "More actions..."
 msgstr "Papildu iespējas..."
 
-#: classes/pref/feeds.php:1387
+#: classes/pref/feeds.php:1391
 msgid "Manual purge"
 msgstr "Manuāla dzēšana"
 
-#: classes/pref/feeds.php:1391
+#: classes/pref/feeds.php:1395
 msgid "Clear feed data"
 msgstr "Dzēst barotņu datus"
 
-#: classes/pref/feeds.php:1392
+#: classes/pref/feeds.php:1396
 #: classes/pref/filters.php:770
 msgid "Rescore articles"
 msgstr "Pārvērtēt rakstus"
 
-#: classes/pref/feeds.php:1444
+#: classes/pref/feeds.php:1448
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1446
+#: classes/pref/feeds.php:1450
 msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
 msgstr "Izmantojot OPML jūs varat eksportēt un importēt savas barotnes, filtrus, etiķetes un Tiny Tiny RSS iestatījumus."
 
-#: classes/pref/feeds.php:1447
+#: classes/pref/feeds.php:1451
 msgid "Only main settings profile can be migrated using OPML."
 msgstr "Izmantojot OPML var migrēt tikai galvenos iestatījumus."
 
-#: classes/pref/feeds.php:1460
+#: classes/pref/feeds.php:1464
 msgid "Import my OPML"
 msgstr "Importēt manu OPML"
 
-#: classes/pref/feeds.php:1466
+#: classes/pref/feeds.php:1470
 msgid "Filename:"
 msgstr "Faila nosaukums:"
 
-#: classes/pref/feeds.php:1468
+#: classes/pref/feeds.php:1472
 msgid "Include settings"
 msgstr "Iekļaut iestatījumus"
 
-#: classes/pref/feeds.php:1472
+#: classes/pref/feeds.php:1476
 msgid "Export OPML"
 msgstr "Eksportēt OPML"
 
-#: classes/pref/feeds.php:1476
+#: classes/pref/feeds.php:1480
 msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
 msgstr "Jūsu OPML var publicēt un to var abonēt katrs, kas zin zemāk minēto saiti."
 
-#: classes/pref/feeds.php:1480
+#: classes/pref/feeds.php:1484
 msgid "Public OPML URL"
 msgstr "Publiskā OPML URL (adrese)"
 
-#: classes/pref/feeds.php:1481
+#: classes/pref/feeds.php:1485
 msgid "Display published OPML URL"
 msgstr "Parādīt publicētā OPML URL"
 
-#: classes/pref/feeds.php:1490
+#: classes/pref/feeds.php:1494
 msgid "Firefox integration"
 msgstr "Firefox integrācija"
 
-#: classes/pref/feeds.php:1492
+#: classes/pref/feeds.php:1496
 msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
 msgstr "Šo Tiny Tiny RSS vietni var izmantot kā Firefox Feed Reader, klikšķinot uz zemākās saites."
 
-#: classes/pref/feeds.php:1499
+#: classes/pref/feeds.php:1503
 msgid "Click here to register this site as a feed reader."
 msgstr "Klikšķiniet šeit, lai reģistrētu šo vietni kā barotņu avotu."
 
-#: classes/pref/feeds.php:1507
+#: classes/pref/feeds.php:1511
 msgid "Published & shared articles / Generated feeds"
 msgstr "Publicētie un kopīgotie raksti / sagatavotās barotnes"
 
-#: classes/pref/feeds.php:1509
+#: classes/pref/feeds.php:1513
 msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
 msgstr "Publicētie raksti tiek eksportēti kā publiskas RSS barotnes un tās var izmantot katrs, kas zina zemāk minēto saiti."
 
-#: classes/pref/feeds.php:1516
+#: classes/pref/feeds.php:1520
 #: classes/feeds.php:54
 #: classes/feeds.php:134
 msgid "View as RSS"
 msgstr "Skatīt kā RSS"
 
-#: classes/pref/feeds.php:1517
+#: classes/pref/feeds.php:1521
 msgid "Display URL"
 msgstr "Parādīt URL"
 
-#: classes/pref/feeds.php:1520
+#: classes/pref/feeds.php:1524
 msgid "Clear all generated URLs"
 msgstr "Attīrīt visus ģenerētos URL"
 
-#: classes/pref/feeds.php:1598
+#: classes/pref/feeds.php:1602
 msgid "These feeds have not been updated with new content for 3 months (oldest first):"
 msgstr "Šajās barotnēs nav bijis jauns saturs vairāk kā 3 mēnešus (sākot ar vecākajām):"
 
-#: classes/pref/feeds.php:1632
-#: classes/pref/feeds.php:1696
+#: classes/pref/feeds.php:1636
+#: classes/pref/feeds.php:1700
 msgid "Click to edit feed"
 msgstr "Klikšķiniet, lai mainītu"
 
-#: classes/pref/feeds.php:1650
-#: classes/pref/feeds.php:1716
+#: classes/pref/feeds.php:1654
+#: classes/pref/feeds.php:1720
 msgid "Unsubscribe from selected feeds"
 msgstr "Atcelt izvēlēto barotņu pasūtīšanu"
 
-#: classes/pref/feeds.php:1821
+#: classes/pref/feeds.php:1825
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr "Pievienojiet vienu derīgu RSS barotni vienā rindā (barotnes netiek pārbaudītas)"
 
-#: classes/pref/feeds.php:1830
+#: classes/pref/feeds.php:1834
 msgid "Feeds to subscribe, One per line"
 msgstr "Pasūtāmās barotnes, pa vienai katrā rindā"
 
-#: classes/pref/feeds.php:1852
+#: classes/pref/feeds.php:1857
 msgid "Feeds require authentication."
 msgstr "Barotnēm nepieciešama autentifikācija"
 
-#: classes/pref/feeds.php:1859
-#: classes/feeds.php:1092
-#: classes/feeds.php:1146
+#: classes/pref/feeds.php:1864
+#: classes/feeds.php:1094
+#: classes/feeds.php:1148
 msgid "Subscribe"
 msgstr "Pasūtīt"
 
@@ -1787,7 +1823,7 @@ msgid "on field"
 msgstr "laukā"
 
 #: classes/pref/filters.php:962
-#: js/PrefFilterTree.js:61
+#: js/PrefFilterTree.js:64
 msgid "in"
 msgstr "kur"
 
@@ -2380,40 +2416,40 @@ msgstr "Barotnes vai vietnes URL"
 msgid "Available feeds"
 msgstr "Pieejamās barotnes"
 
-#: classes/feeds.php:1087
+#: classes/feeds.php:1089
 msgid "This feed requires authentication."
 msgstr "Šim laukam ir nepieciešams autentificēties."
 
-#: classes/feeds.php:1095
+#: classes/feeds.php:1097
 msgid "More feeds"
 msgstr "Vairāk barotnes"
 
-#: classes/feeds.php:1122
+#: classes/feeds.php:1124
 msgid "Popular feeds"
 msgstr "Populārās barotnes"
 
-#: classes/feeds.php:1123
+#: classes/feeds.php:1125
 msgid "Feed archive"
 msgstr "Barotņu arhīvs"
 
-#: classes/feeds.php:1126
+#: classes/feeds.php:1128
 msgid "limit:"
 msgstr "ierobežojumi:"
 
-#: classes/feeds.php:1158
+#: classes/feeds.php:1160
 msgid "Look for"
 msgstr "Meklēt"
 
-#: classes/feeds.php:1166
+#: classes/feeds.php:1168
 #, php-format
 msgid "in %s"
 msgstr ""
 
-#: classes/feeds.php:1171
+#: classes/feeds.php:1173
 msgid "Used for word stemming"
 msgstr ""
 
-#: classes/feeds.php:1180
+#: classes/feeds.php:1182
 msgid "Search syntax"
 msgstr "Meklēšanas sintakse"
 
@@ -2676,6 +2712,11 @@ msgstr "Neizdevās ielādēt XML dokumentu."
 msgid "Prepare data"
 msgstr "Sagatavo datus"
 
+#: plugins/import_export/init.php:428
+#, fuzzy, php-format
+msgid "Upload failed with error code %d (%s)"
+msgstr "Augšuplāde neizdevās ar kļūdas kodu %d"
+
 #: plugins/import_export/init.php:454
 msgid "No file uploaded."
 msgstr "Fails nav augšuplādēts."
@@ -2785,7 +2826,7 @@ msgstr "Mainīt kategoriju"
 msgid "Remove category"
 msgstr "Dzēst kategoriju"
 
-#: js/PrefFilterTree.js:64
+#: js/PrefFilterTree.js:67
 msgid "Inverse"
 msgstr "Apgriezt"
 
@@ -2836,7 +2877,7 @@ msgid "Subscription reset."
 msgstr "Barotnes pārstatīšana."
 
 #: js/functions.js:1311
-#: js/tt-rss.js:682
+#: js/tt-rss.js:705
 #, perl-format
 msgid "Unsubscribe from %s?"
 msgstr "Atteikt pasūtījumu %s?"
@@ -3066,40 +3107,40 @@ msgstr "Vai atzīmēt visus rakstus kā lasītus?"
 msgid "Marking all feeds as read..."
 msgstr "Atzīmē visas barotnes kā lasītas..."
 
-#: js/tt-rss.js:383
+#: js/tt-rss.js:404
 msgid "Please enable mail plugin first."
 msgstr "Lūdzu, vispirmi ieslēdziet e-pasta spraudni."
 
-#: js/tt-rss.js:431
+#: js/tt-rss.js:452
 #: js/functions.js:1643
-#: js/tt-rss.js:663
+#: js/tt-rss.js:686
 msgid "You can't edit this kind of feed."
 msgstr "Jūs nevarat mainīt šāda veida barotni."
 
-#: js/tt-rss.js:502
+#: js/tt-rss.js:533
 msgid "Please enable embed_original plugin first."
 msgstr "Lūdzu, vispirms ieslēdziet embeded_original spraudni."
 
-#: js/tt-rss.js:515
-#: js/tt-rss.js:713
+#: js/tt-rss.js:546
+#: js/tt-rss.js:736
 msgid "Widescreen is not available in combined mode."
 msgstr ""
 
-#: js/tt-rss.js:827
+#: js/tt-rss.js:850
 msgid "You can't rescore this kind of feed."
 msgstr "Jūs nevarat pārvērtēt šī veida barotni."
 
-#: js/tt-rss.js:832
-#: js/tt-rss.js:676
+#: js/tt-rss.js:855
+#: js/tt-rss.js:699
 msgid "Please select some feed first."
 msgstr "Lūdzu, vispirms norādiet barotni."
 
-#: js/tt-rss.js:837
+#: js/tt-rss.js:860
 #, perl-format
 msgid "Rescore articles in %s?"
 msgstr "Pārvērtēt rakstus %s?"
 
-#: js/tt-rss.js:840
+#: js/tt-rss.js:863
 msgid "Rescoring articles..."
 msgstr "Pārvērtē rakstus..."
 
@@ -3275,7 +3316,7 @@ msgstr "Jūsu ziņojums ir nosūtīts."
 msgid "Sorry, your browser does not support sandboxed iframes."
 msgstr "Piedodiet, jūsu pārlūkprogramma neatbalsta iegultos rāmjus (iframe) smilšu kastē."
 
-#: plugins/shorten_expanded/init.js:37
+#: plugins/shorten_expanded/init.js:39
 msgid "Click to expand article"
 msgstr "Klikšķiniet, lai izvērstu rakstu"
 
@@ -3539,7 +3580,7 @@ msgstr "Izveidot jaunu URL"
 msgid "Label Editor"
 msgstr "Etiķešu redaktors"
 
-#: js/tt-rss.js:671
+#: js/tt-rss.js:694
 msgid "You can't unsubscribe from the category."
 msgstr "Jūs nevarat atteikties no kategorijas."
 
diff --git a/locale/nb_NO/LC_MESSAGES/messages.mo b/locale/nb_NO/LC_MESSAGES/messages.mo
index c1309819e..1c864c27a 100644
Binary files a/locale/nb_NO/LC_MESSAGES/messages.mo and b/locale/nb_NO/LC_MESSAGES/messages.mo differ
diff --git a/locale/nb_NO/LC_MESSAGES/messages.po b/locale/nb_NO/LC_MESSAGES/messages.po
index cf5a2c9c2..98ae39103 100644
--- a/locale/nb_NO/LC_MESSAGES/messages.po
+++ b/locale/nb_NO/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tiny Tiny RSS 1.3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 22:58+0300\n"
+"POT-Creation-Date: 2016-08-19 18:16+0300\n"
 "PO-Revision-Date: 2009-05-02 00:10+0100\n"
 "Last-Translator: Christian Lomsdalen <christian@vindstille.net>\n"
 "Language-Team: Norwegian Bokmål <christian@vindstille.net>\n"
@@ -170,13 +170,13 @@ msgstr "Nyhetsstrømmen ble ikke funnet"
 msgid "Plugin not found"
 msgstr "Brukeren ble  ikke funnet"
 
-#: index.php:133
-#: index.php:149
-#: index.php:267
-#: prefs.php:102
+#: index.php:148
+#: index.php:164
+#: index.php:282
+#: prefs.php:117
 #: classes/backend.php:5
 #: classes/pref/labels.php:282
-#: classes/pref/feeds.php:1405
+#: classes/pref/feeds.php:1409
 #: classes/pref/filters.php:779
 #: js/feedlist.js:159
 #: js/functions.js:1293
@@ -188,7 +188,7 @@ msgstr "Brukeren ble  ikke funnet"
 #: js/prefs.js:1781
 #: js/prefs.js:1799
 #: js/tt-rss.js:55
-#: js/tt-rss.js:522
+#: js/tt-rss.js:553
 #: js/viewfeed.js:1298
 #: plugins/import_export/import_export.js:17
 #: js/feedlist.js:484
@@ -201,77 +201,77 @@ msgstr "Brukeren ble  ikke funnet"
 #: js/prefs.js:1556
 #: js/prefs.js:1572
 #: js/prefs.js:1592
-#: js/tt-rss.js:539
+#: js/tt-rss.js:570
 #: js/viewfeed.js:830
 msgid "Loading, please wait..."
 msgstr "laster, vennligst vent"
 
-#: index.php:167
+#: index.php:182
 msgid "Collapse feedlist"
 msgstr "Skjul nyhetskanalsslisten"
 
-#: index.php:170
+#: index.php:185
 #, fuzzy
 msgid "Show articles"
 msgstr "Lagrede artikler"
 
-#: index.php:173
+#: index.php:188
 msgid "Adaptive"
 msgstr "Tilpasset"
 
-#: index.php:174
+#: index.php:189
 msgid "All Articles"
 msgstr "Alle artikler"
 
-#: index.php:175
-#: include/functions2.php:101
+#: index.php:190
+#: include/functions2.php:102
 #: classes/feeds.php:104
 msgid "Starred"
 msgstr "Favoritter"
 
-#: index.php:176
-#: include/functions2.php:102
+#: index.php:191
+#: include/functions2.php:103
 #: classes/feeds.php:105
 msgid "Published"
 msgstr "Publisert"
 
-#: index.php:177
+#: index.php:192
 #: classes/feeds.php:91
 #: classes/feeds.php:103
 msgid "Unread"
 msgstr "Ulest"
 
-#: index.php:178
+#: index.php:193
 msgid "With Note"
 msgstr ""
 
-#: index.php:179
+#: index.php:194
 msgid "Ignore Scoring"
 msgstr "Ignorer poenggivning"
 
-#: index.php:182
+#: index.php:197
 #, fuzzy
 msgid "Sort articles"
 msgstr "Lagrede artikler"
 
-#: index.php:185
+#: index.php:200
 msgid "Default"
 msgstr "Standard"
 
-#: index.php:186
+#: index.php:201
 msgid "Newest first"
 msgstr ""
 
-#: index.php:187
+#: index.php:202
 msgid "Oldest first"
 msgstr ""
 
-#: index.php:188
+#: index.php:203
 msgid "Title"
 msgstr "Tittel"
 
-#: index.php:192
-#: index.php:233
+#: index.php:207
+#: index.php:248
 #: include/functions2.php:90
 #: classes/feeds.php:109
 #: js/FeedTree.js:132
@@ -279,137 +279,137 @@ msgstr "Tittel"
 msgid "Mark as read"
 msgstr "Marker som lest"
 
-#: index.php:195
+#: index.php:210
 msgid "Older than one day"
 msgstr ""
 
-#: index.php:198
+#: index.php:213
 msgid "Older than one week"
 msgstr ""
 
-#: index.php:201
+#: index.php:216
 msgid "Older than two weeks"
 msgstr ""
 
-#: index.php:217
+#: index.php:232
 msgid "Communication problem with server."
 msgstr ""
 
-#: index.php:223
+#: index.php:238
 msgid "Actions..."
 msgstr "Handlinger..."
 
-#: index.php:225
+#: index.php:240
 #, fuzzy
 msgid "Preferences..."
 msgstr "Innstillinger"
 
-#: index.php:226
+#: index.php:241
 msgid "Search..."
 msgstr "Søk..."
 
-#: index.php:227
+#: index.php:242
 msgid "Feed actions:"
 msgstr "Nyhetsstrømshandlinger:"
 
-#: index.php:228
+#: index.php:243
 #: classes/handler/public.php:672
 msgid "Subscribe to feed..."
 msgstr "Abonner på nyhetsstrøm..."
 
-#: index.php:229
+#: index.php:244
 msgid "Edit this feed..."
 msgstr "Rediger nyhetsstrømmen..."
 
-#: index.php:230
+#: index.php:245
 msgid "Rescore feed"
 msgstr "Sett poeng på nytt for nyhetskanalene"
 
-#: index.php:231
-#: classes/pref/feeds.php:783
-#: classes/pref/feeds.php:1360
+#: index.php:246
+#: classes/pref/feeds.php:785
+#: classes/pref/feeds.php:1364
 #: js/PrefFeedTree.js:74
 msgid "Unsubscribe"
 msgstr "Avabonner"
 
-#: index.php:232
+#: index.php:247
 msgid "All feeds:"
 msgstr "Alle nyhetsstrømmer:"
 
-#: index.php:234
+#: index.php:249
 msgid "(Un)hide read feeds"
 msgstr "Skjul/vis leste nyhetsstrømmer"
 
-#: index.php:235
+#: index.php:250
 msgid "Other actions:"
 msgstr "Andre handlinger:"
 
-#: index.php:236
+#: index.php:251
 #: include/functions2.php:76
 #, fuzzy
 msgid "Toggle widescreen mode"
 msgstr "Tillatt endringer i kategorirekkefølgen?"
 
-#: index.php:237
+#: index.php:252
 msgid "Create label..."
 msgstr "Lag merkelapp..."
 
-#: index.php:238
+#: index.php:253
 msgid "Create filter..."
 msgstr "Lag filter..."
 
-#: index.php:239
+#: index.php:254
 #, fuzzy
 msgid "Keyboard shortcuts help"
 msgstr "Tastatursnarveier"
 
-#: index.php:248
+#: index.php:263
 msgid "Logout"
 msgstr "Logg ut"
 
-#: index.php:254
+#: index.php:269
 msgid "Updates are available from Git."
 msgstr ""
 
 #: prefs.php:33
-#: prefs.php:120
-#: include/functions2.php:104
+#: prefs.php:135
+#: include/functions2.php:105
 #: classes/pref/prefs.php:435
 msgid "Preferences"
 msgstr "Innstillinger"
 
-#: prefs.php:111
+#: prefs.php:126
 msgid "Keyboard shortcuts"
 msgstr "Tastatursnarveier"
 
-#: prefs.php:112
+#: prefs.php:127
 msgid "Exit preferences"
 msgstr "Forlat innstillinger"
 
-#: prefs.php:123
+#: prefs.php:138
 #: classes/pref/feeds.php:112
-#: classes/pref/feeds.php:1300
-#: classes/pref/feeds.php:1349
+#: classes/pref/feeds.php:1304
+#: classes/pref/feeds.php:1353
 msgid "Feeds"
 msgstr "Nyhetsstrømmer"
 
-#: prefs.php:126
+#: prefs.php:141
 #: classes/pref/filters.php:248
 msgid "Filters"
 msgstr "Filtre"
 
-#: prefs.php:129
-#: include/functions.php:1256
-#: include/functions.php:1909
+#: prefs.php:144
+#: include/functions.php:1287
+#: include/functions.php:1940
 #: classes/pref/labels.php:90
 msgid "Labels"
 msgstr "Merkelapper"
 
-#: prefs.php:133
+#: prefs.php:148
 msgid "Users"
 msgstr "Brukere"
 
-#: prefs.php:136
+#: prefs.php:151
 msgid "System"
 msgstr ""
 
@@ -492,10 +492,10 @@ msgid "Tiny Tiny RSS data update script."
 msgstr "Tiny Tiny RSS-databasen er oppdatert"
 
 #: include/digest.php:109
-#: include/functions.php:1265
-#: include/functions.php:1810
-#: include/functions.php:1895
-#: include/functions.php:1917
+#: include/functions.php:1296
+#: include/functions.php:1841
+#: include/functions.php:1926
+#: include/functions.php:1948
 #: classes/opml.php:421
 #: classes/pref/feeds.php:228
 msgid "Uncategorized"
@@ -512,45 +512,45 @@ msgstr[1] "Favorittartikler"
 msgid "No feeds found."
 msgstr "Ingen nyhetsstrømmer ble funnet."
 
-#: include/functions.php:958
+#: include/functions.php:989
 #, php-format
 msgid "%d min"
 msgstr ""
 
-#: include/functions.php:1254
-#: include/functions.php:1907
+#: include/functions.php:1285
+#: include/functions.php:1938
 msgid "Special"
 msgstr "Snarveier"
 
-#: include/functions.php:1758
+#: include/functions.php:1789
 #: classes/pref/filters.php:229
 #: classes/pref/filters.php:507
 msgid "All feeds"
 msgstr "Alle Nyhetsstrømmer"
 
-#: include/functions.php:1962
+#: include/functions.php:1993
 msgid "Starred articles"
 msgstr "Favorittartikler"
 
-#: include/functions.php:1964
+#: include/functions.php:1995
 msgid "Published articles"
 msgstr "Publiserte artikler"
 
-#: include/functions.php:1966
+#: include/functions.php:1997
 msgid "Fresh articles"
 msgstr "Ferske artikler"
 
-#: include/functions.php:1968
-#: include/functions2.php:99
+#: include/functions.php:1999
+#: include/functions2.php:100
 msgid "All articles"
 msgstr "Alle artikler"
 
-#: include/functions.php:1970
+#: include/functions.php:2001
 #, fuzzy
 msgid "Archived articles"
 msgstr "Lagrede artikler"
 
-#: include/functions.php:1972
+#: include/functions.php:2003
 msgid "Recently read"
 msgstr ""
 
@@ -710,7 +710,7 @@ msgstr "Fjern artikler"
 
 #: include/functions2.php:85
 #: classes/pref/feeds.php:555
-#: classes/pref/feeds.php:821
+#: classes/pref/feeds.php:823
 msgid "Feed"
 msgstr "Nyhetsstrøm"
 
@@ -725,7 +725,7 @@ msgid "Un/hide read feeds"
 msgstr "Skjul/vis leste nyhetsstrømmer"
 
 #: include/functions2.php:88
-#: classes/pref/feeds.php:1352
+#: classes/pref/feeds.php:1356
 msgid "Subscribe to feed"
 msgstr "Abonner på nyhetsstrøm"
 
@@ -742,82 +742,86 @@ msgid "Reverse headlines"
 msgstr "Motsatt titteloversikt (eldste først)"
 
 #: include/functions2.php:92
+msgid "Toggle headline grouping"
+msgstr ""
+
+#: include/functions2.php:93
 #, fuzzy
 msgid "Debug feed update"
 msgstr "Alle nyhetsstrømmer er oppdatert"
 
-#: include/functions2.php:93
+#: include/functions2.php:94
 #, fuzzy
 msgid "Debug viewfeed()"
 msgstr "Alle nyhetsstrømmer er oppdatert"
 
-#: include/functions2.php:94
+#: include/functions2.php:95
 #: js/FeedTree.js:182
 msgid "Mark all feeds as read"
 msgstr "Marker alle nyhetsstrømmer som lest"
 
-#: include/functions2.php:95
+#: include/functions2.php:96
 #, fuzzy
 msgid "Un/collapse current category"
 msgstr "Velg for å slå sammen kategorien"
 
-#: include/functions2.php:96
+#: include/functions2.php:97
 #, fuzzy
 msgid "Toggle combined mode"
 msgstr "Tillatt endringer i kategorirekkefølgen?"
 
-#: include/functions2.php:97
+#: include/functions2.php:98
 #, fuzzy
 msgid "Toggle auto expand in combined mode"
 msgstr "Tillatt endringer i kategorirekkefølgen?"
 
-#: include/functions2.php:98
+#: include/functions2.php:99
 #, fuzzy
 msgid "Go to"
 msgstr "Gå til..."
 
-#: include/functions2.php:100
+#: include/functions2.php:101
 #, fuzzy
 msgid "Fresh"
 msgstr "Oppdater"
 
-#: include/functions2.php:103
-#: js/tt-rss.js:466
-#: js/tt-rss.js:650
+#: include/functions2.php:104
+#: js/tt-rss.js:497
+#: js/tt-rss.js:673
 msgid "Tag cloud"
 msgstr "Tag-sky"
 
-#: include/functions2.php:105
+#: include/functions2.php:106
 #, fuzzy
 msgid "Other"
 msgstr "Andre:"
 
-#: include/functions2.php:106
+#: include/functions2.php:107
 #: classes/pref/labels.php:267
 msgid "Create label"
 msgstr "Lag merkelapp"
 
-#: include/functions2.php:107
+#: include/functions2.php:108
 #: classes/pref/filters.php:753
 msgid "Create filter"
 msgstr "Lag filter"
 
-#: include/functions2.php:108
+#: include/functions2.php:109
 #, fuzzy
 msgid "Un/collapse sidebar"
 msgstr "Skjul nyhetskanalsslisten"
 
-#: include/functions2.php:109
+#: include/functions2.php:110
 #, fuzzy
 msgid "Show help dialog"
 msgstr "Vis søkevinduet"
 
-#: include/functions2.php:663
+#: include/functions2.php:665
 #, fuzzy, php-format
 msgid "Search results: %s"
 msgstr "Søkeresultat"
 
-#: include/functions2.php:1317
+#: include/functions2.php:1330
 #: classes/feeds.php:749
 #, fuzzy
 msgid "comment"
@@ -825,71 +829,104 @@ msgid_plural "comments"
 msgstr[0] "Kommentarer"
 msgstr[1] "Kommentarer"
 
-#: include/functions2.php:1321
+#: include/functions2.php:1334
 #: classes/feeds.php:753
 msgid "comments"
 msgstr "Kommentarer"
 
-#: include/functions2.php:1347
+#: include/functions2.php:1360
 msgid " - "
 msgstr "-"
 
-#: include/functions2.php:1380
-#: include/functions2.php:1631
+#: include/functions2.php:1393
+#: include/functions2.php:1644
 #: classes/article.php:311
 msgid "no tags"
 msgstr "Ingen stikkord"
 
-#: include/functions2.php:1390
+#: include/functions2.php:1403
 #: classes/feeds.php:735
 msgid "Edit tags for this article"
 msgstr "Rediger stikkordene for denne artikkelen"
 
-#: include/functions2.php:1422
+#: include/functions2.php:1435
 #: classes/feeds.php:682
 #, fuzzy
 msgid "Originally from:"
 msgstr "Vis opprinnelig artikkelinnhold"
 
-#: include/functions2.php:1435
+#: include/functions2.php:1448
 #: classes/pref/feeds.php:574
 #: classes/feeds.php:695
 #, fuzzy
 msgid "Feed URL"
 msgstr "Nyhetsstrøm"
 
-#: include/functions2.php:1472
+#: include/functions2.php:1485
 #: classes/backend.php:105
 #: classes/dlg.php:37
 #: classes/dlg.php:60
 #: classes/dlg.php:93
 #: classes/dlg.php:159
 #: classes/dlg.php:186
-#: classes/pref/feeds.php:1654
-#: classes/pref/feeds.php:1720
+#: classes/pref/feeds.php:1658
+#: classes/pref/feeds.php:1724
 #: classes/pref/filters.php:204
 #: classes/pref/prefs.php:1105
 #: plugins/af_psql_trgm/init.php:102
 #: plugins/import_export/init.php:415
-#: plugins/import_export/init.php:460
+#: plugins/import_export/init.php:461
 #: plugins/share/init.php:121
 msgid "Close this window"
 msgstr "Lukk dette vinduet"
 
-#: include/functions2.php:1669
+#: include/functions2.php:1682
 #, fuzzy
 msgid "(edit note)"
 msgstr "Rediger notat"
 
-#: include/functions2.php:1924
+#: include/functions2.php:1937
 msgid "unknown type"
 msgstr "Ukjent type"
 
-#: include/functions2.php:2001
+#: include/functions2.php:2014
 #, fuzzy
 msgid "Attachments"
 msgstr "Vedlegg:"
 
+#: include/functions2.php:2456
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: include/functions2.php:2457
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr ""
+
+#: include/functions2.php:2458
+msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
+msgstr ""
+
+#: include/functions2.php:2459
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: include/functions2.php:2460
+#, fuzzy
+msgid "No file was uploaded"
+msgstr "Ingen OPML-fil til å lastes opp."
+
+#: include/functions2.php:2461
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: include/functions2.php:2462
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: include/functions2.php:2463
+msgid "A PHP extension stopped the file upload."
+msgstr ""
+
 #: include/login_form.php:197
 #: classes/handler/public.php:569
 #: classes/handler/public.php:824
@@ -963,8 +1000,8 @@ msgstr "Denne artikkelens stikkord (separert med kommaer):"
 #: classes/article.php:222
 #: classes/pref/labels.php:79
 #: classes/pref/users.php:98
-#: classes/pref/feeds.php:799
-#: classes/pref/feeds.php:939
+#: classes/pref/feeds.php:801
+#: classes/pref/feeds.php:943
 #: classes/pref/filters.php:485
 #: classes/pref/prefs.php:989
 #: plugins/instances/init.php:245
@@ -982,17 +1019,17 @@ msgstr "Lagre"
 #: classes/handler/public.php:580
 #: classes/pref/labels.php:81
 #: classes/pref/users.php:100
-#: classes/pref/feeds.php:800
-#: classes/pref/feeds.php:942
-#: classes/pref/feeds.php:1860
+#: classes/pref/feeds.php:802
+#: classes/pref/feeds.php:946
+#: classes/pref/feeds.php:1865
 #: classes/pref/filters.php:488
 #: classes/pref/filters.php:902
 #: classes/pref/filters.php:983
 #: classes/pref/filters.php:1076
 #: classes/pref/prefs.php:991
-#: classes/feeds.php:1098
-#: classes/feeds.php:1148
-#: classes/feeds.php:1185
+#: classes/feeds.php:1100
+#: classes/feeds.php:1150
+#: classes/feeds.php:1187
 #: plugins/instances/init.php:248
 #: plugins/instances/init.php:436
 #: plugins/note/init.php:53
@@ -1050,7 +1087,6 @@ msgid "Processing category: %s"
 msgstr "Plasser i kategori..."
 
 #: classes/opml.php:470
-#: plugins/import_export/init.php:428
 #, php-format
 msgid "Upload failed with error code %d"
 msgstr ""
@@ -1284,9 +1320,9 @@ msgstr "Laget merkelappen <b>%s</b>"
 
 #: classes/pref/labels.php:258
 #: classes/pref/users.php:334
-#: classes/pref/feeds.php:1340
-#: classes/pref/feeds.php:1602
-#: classes/pref/feeds.php:1666
+#: classes/pref/feeds.php:1344
+#: classes/pref/feeds.php:1606
+#: classes/pref/feeds.php:1670
 #: classes/pref/filters.php:359
 #: classes/pref/filters.php:407
 #: classes/pref/filters.php:744
@@ -1300,9 +1336,9 @@ msgstr "Velg:"
 
 #: classes/pref/labels.php:261
 #: classes/pref/users.php:337
-#: classes/pref/feeds.php:1343
-#: classes/pref/feeds.php:1605
-#: classes/pref/feeds.php:1669
+#: classes/pref/feeds.php:1347
+#: classes/pref/feeds.php:1609
+#: classes/pref/feeds.php:1673
 #: classes/pref/filters.php:362
 #: classes/pref/filters.php:410
 #: classes/pref/filters.php:747
@@ -1316,9 +1352,9 @@ msgstr "Alle"
 
 #: classes/pref/labels.php:263
 #: classes/pref/users.php:339
-#: classes/pref/feeds.php:1345
-#: classes/pref/feeds.php:1607
-#: classes/pref/feeds.php:1671
+#: classes/pref/feeds.php:1349
+#: classes/pref/feeds.php:1611
+#: classes/pref/feeds.php:1675
 #: classes/pref/filters.php:364
 #: classes/pref/filters.php:412
 #: classes/pref/filters.php:749
@@ -1332,10 +1368,10 @@ msgstr "Ingen"
 
 #: classes/pref/labels.php:270
 #: classes/pref/users.php:348
-#: classes/pref/feeds.php:765
+#: classes/pref/feeds.php:767
 #: classes/pref/filters.php:478
 #: classes/pref/filters.php:766
-#: classes/feeds.php:1147
+#: classes/feeds.php:1149
 #: plugins/instances/init.php:294
 msgid "Remove"
 msgstr "Fjern"
@@ -1357,7 +1393,7 @@ msgstr "Filtre"
 
 #: classes/pref/users.php:56
 #: classes/pref/feeds.php:637
-#: classes/pref/feeds.php:876
+#: classes/pref/feeds.php:878
 #: classes/feeds.php:1070
 msgid "Authentication"
 msgstr "Autentifisering"
@@ -1367,8 +1403,8 @@ msgid "Access level: "
 msgstr "Tilgangsnivå:"
 
 #: classes/pref/users.php:77
-#: classes/pref/feeds.php:665
-#: classes/pref/feeds.php:892
+#: classes/pref/feeds.php:667
+#: classes/pref/feeds.php:896
 msgid "Options"
 msgstr "Alternativer:"
 
@@ -1438,10 +1474,10 @@ msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] Varsel om endring av passord"
 
 #: classes/pref/users.php:324
-#: classes/pref/feeds.php:1336
+#: classes/pref/feeds.php:1340
 #: classes/pref/filters.php:740
-#: classes/feeds.php:1118
-#: classes/feeds.php:1184
+#: classes/feeds.php:1120
+#: classes/feeds.php:1186
 #: js/tt-rss.js:174
 msgid "Search"
 msgstr "Søk"
@@ -1458,8 +1494,8 @@ msgstr "Rediger"
 
 #: classes/pref/users.php:397
 #: classes/pref/feeds.php:643
-#: classes/pref/feeds.php:880
-#: classes/pref/feeds.php:1838
+#: classes/pref/feeds.php:882
+#: classes/pref/feeds.php:1842
 #: classes/feeds.php:1074
 msgid "Login"
 msgstr "Logg inn"
@@ -1541,277 +1577,277 @@ msgid "Feed Title"
 msgstr "Tittel"
 
 #: classes/pref/feeds.php:595
-#: classes/pref/feeds.php:828
-#: classes/pref/feeds.php:1824
+#: classes/pref/feeds.php:830
+#: classes/pref/feeds.php:1828
 #: classes/feeds.php:1050
 msgid "Place in category:"
 msgstr "Plasser i kategori..."
 
 #: classes/pref/feeds.php:608
-#: classes/pref/feeds.php:842
+#: classes/pref/feeds.php:844
 #, fuzzy
 msgid "Language:"
 msgstr "Språk:"
 
 #: classes/pref/feeds.php:615
-#: classes/pref/feeds.php:851
+#: classes/pref/feeds.php:853
 msgid "Update"
 msgstr "Oppdater"
 
 #: classes/pref/feeds.php:630
-#: classes/pref/feeds.php:867
+#: classes/pref/feeds.php:869
 msgid "Article purging:"
 msgstr "Slett artikler:"
 
-#: classes/pref/feeds.php:656
-#: classes/pref/feeds.php:886
-#: classes/pref/feeds.php:1841
+#: classes/pref/feeds.php:658
+#: classes/pref/feeds.php:890
+#: classes/pref/feeds.php:1845
 #: classes/pref/prefs.php:245
-#: classes/feeds.php:1077
+#: classes/feeds.php:1078
 #, fuzzy
 msgid "Password"
 msgstr "Passord:"
 
-#: classes/pref/feeds.php:660
+#: classes/pref/feeds.php:662
 msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
 msgstr ""
 
-#: classes/pref/feeds.php:679
-#: classes/pref/feeds.php:896
+#: classes/pref/feeds.php:681
+#: classes/pref/feeds.php:900
 #, fuzzy
 msgid "Hide from Popular feeds"
 msgstr "Skjul fra min nyhetsstrømslisten"
 
-#: classes/pref/feeds.php:691
-#: classes/pref/feeds.php:902
+#: classes/pref/feeds.php:693
+#: classes/pref/feeds.php:906
 msgid "Include in e-mail digest"
 msgstr "Inkluder i e-postsammendraget"
 
-#: classes/pref/feeds.php:704
-#: classes/pref/feeds.php:908
+#: classes/pref/feeds.php:706
+#: classes/pref/feeds.php:912
 msgid "Always display image attachments"
 msgstr ""
 
-#: classes/pref/feeds.php:717
-#: classes/pref/feeds.php:916
+#: classes/pref/feeds.php:719
+#: classes/pref/feeds.php:920
 msgid "Do not embed images"
 msgstr ""
 
-#: classes/pref/feeds.php:730
-#: classes/pref/feeds.php:924
+#: classes/pref/feeds.php:732
+#: classes/pref/feeds.php:928
 msgid "Cache images locally"
 msgstr "Mellomlagre bilder lokalt på serveren"
 
-#: classes/pref/feeds.php:742
-#: classes/pref/feeds.php:930
+#: classes/pref/feeds.php:744
+#: classes/pref/feeds.php:934
 #, fuzzy
 msgid "Mark updated articles as unread"
 msgstr "Marker alle artikler som leste?"
 
-#: classes/pref/feeds.php:746
+#: classes/pref/feeds.php:748
 #, fuzzy
 msgid "Icon"
 msgstr "Handling"
 
-#: classes/pref/feeds.php:763
+#: classes/pref/feeds.php:765
 msgid "Replace"
 msgstr ""
 
-#: classes/pref/feeds.php:770
+#: classes/pref/feeds.php:772
 #: classes/pref/prefs.php:706
 msgid "Plugins"
 msgstr ""
 
-#: classes/pref/feeds.php:790
+#: classes/pref/feeds.php:792
 #, fuzzy
 msgid "Resubscribe to push updates"
 msgstr "Abonnerer på følgende nyhetsstrømmer:"
 
-#: classes/pref/feeds.php:797
+#: classes/pref/feeds.php:799
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr ""
 
-#: classes/pref/feeds.php:1203
-#: classes/pref/feeds.php:1256
+#: classes/pref/feeds.php:1207
+#: classes/pref/feeds.php:1260
 msgid "All done."
 msgstr "Alt ferdig."
 
-#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1315
 #, fuzzy
 msgid "Feeds with errors"
 msgstr "Nyhetsstrømsredigerer"
 
-#: classes/pref/feeds.php:1318
+#: classes/pref/feeds.php:1322
 #, fuzzy
 msgid "Inactive feeds"
 msgstr "Hele nyhetsstrømmen"
 
-#: classes/pref/feeds.php:1354
+#: classes/pref/feeds.php:1358
 #, fuzzy
 msgid "Edit selected feeds"
 msgstr "Sletter den valgte nyhetsstrømmen..."
 
-#: classes/pref/feeds.php:1356
-#: classes/pref/feeds.php:1370
+#: classes/pref/feeds.php:1360
+#: classes/pref/feeds.php:1374
 #: classes/pref/filters.php:762
 #, fuzzy
 msgid "Reset sort order"
 msgstr "Nullstill passordet"
 
-#: classes/pref/feeds.php:1358
+#: classes/pref/feeds.php:1362
 #: js/prefs.js:1737
 #, fuzzy
 msgid "Batch subscribe"
 msgstr "Avabonner"
 
-#: classes/pref/feeds.php:1365
+#: classes/pref/feeds.php:1369
 #, fuzzy
 msgid "Categories"
 msgstr "Kategori:"
 
-#: classes/pref/feeds.php:1368
+#: classes/pref/feeds.php:1372
 #, fuzzy
 msgid "Add category"
 msgstr "Legger til kategori for nyhetsstrømmer"
 
-#: classes/pref/feeds.php:1372
+#: classes/pref/feeds.php:1376
 #, fuzzy
 msgid "Remove selected"
 msgstr "Fjerne valgte filtre?"
 
-#: classes/pref/feeds.php:1383
+#: classes/pref/feeds.php:1387
 #, fuzzy
 msgid "More actions..."
 msgstr "Handlinger..."
 
-#: classes/pref/feeds.php:1387
+#: classes/pref/feeds.php:1391
 msgid "Manual purge"
 msgstr "Slett manuelt"
 
-#: classes/pref/feeds.php:1391
+#: classes/pref/feeds.php:1395
 msgid "Clear feed data"
 msgstr "Slett nyhetsstrømsdata"
 
-#: classes/pref/feeds.php:1392
+#: classes/pref/feeds.php:1396
 #: classes/pref/filters.php:770
 msgid "Rescore articles"
 msgstr "Tilbakestill poengsummene for artiklene"
 
-#: classes/pref/feeds.php:1444
+#: classes/pref/feeds.php:1448
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1446
+#: classes/pref/feeds.php:1450
 msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
 msgstr ""
 
-#: classes/pref/feeds.php:1447
+#: classes/pref/feeds.php:1451
 msgid "Only main settings profile can be migrated using OPML."
 msgstr ""
 
-#: classes/pref/feeds.php:1460
+#: classes/pref/feeds.php:1464
 #, fuzzy
 msgid "Import my OPML"
 msgstr "Importerer OPML (bruker DOMXML-utvidelsen)..."
 
-#: classes/pref/feeds.php:1466
+#: classes/pref/feeds.php:1470
 msgid "Filename:"
 msgstr ""
 
-#: classes/pref/feeds.php:1468
+#: classes/pref/feeds.php:1472
 #, fuzzy
 msgid "Include settings"
 msgstr "Inkluder i e-postsammendraget"
 
-#: classes/pref/feeds.php:1472
+#: classes/pref/feeds.php:1476
 #, fuzzy
 msgid "Export OPML"
 msgstr "Eksporter OPML"
 
-#: classes/pref/feeds.php:1476
+#: classes/pref/feeds.php:1480
 #, fuzzy
 msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
 msgstr "Publiserte artikler kan bli eksportert som en offentlig RSS-nyhetskanal og kan bli abonnert på av alle som vet adressen som blir spesifisert nedenfor."
 
-#: classes/pref/feeds.php:1480
+#: classes/pref/feeds.php:1484
 msgid "Public OPML URL"
 msgstr ""
 
-#: classes/pref/feeds.php:1481
+#: classes/pref/feeds.php:1485
 msgid "Display published OPML URL"
 msgstr ""
 
-#: classes/pref/feeds.php:1490
+#: classes/pref/feeds.php:1494
 #, fuzzy
 msgid "Firefox integration"
 msgstr "Firefox integrering"
 
-#: classes/pref/feeds.php:1492
+#: classes/pref/feeds.php:1496
 msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
 msgstr "Denne Tiny Tiny RSS siden kan bli brukt som nyhetsstrømsleser for Firefox ved å trykke på lenken nedenfor."
 
-#: classes/pref/feeds.php:1499
+#: classes/pref/feeds.php:1503
 msgid "Click here to register this site as a feed reader."
 msgstr "Trykk her for å registrere denne siden som nyhetsstrømsleser"
 
-#: classes/pref/feeds.php:1507
+#: classes/pref/feeds.php:1511
 #, fuzzy
 msgid "Published & shared articles / Generated feeds"
 msgstr "Sett poeng på nytt for artiklene i de valgte nyhetskanalene?"
 
-#: classes/pref/feeds.php:1509
+#: classes/pref/feeds.php:1513
 msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
 msgstr "Publiserte artikler kan bli eksportert som en offentlig RSS-nyhetskanal og kan bli abonnert på av alle som vet adressen som blir spesifisert nedenfor."
 
-#: classes/pref/feeds.php:1516
+#: classes/pref/feeds.php:1520
 #: classes/feeds.php:54
 #: classes/feeds.php:134
 #, fuzzy
 msgid "View as RSS"
 msgstr "Se stikkord"
 
-#: classes/pref/feeds.php:1517
+#: classes/pref/feeds.php:1521
 #, fuzzy
 msgid "Display URL"
 msgstr "Vis stikkord"
 
-#: classes/pref/feeds.php:1520
+#: classes/pref/feeds.php:1524
 msgid "Clear all generated URLs"
 msgstr ""
 
-#: classes/pref/feeds.php:1598
+#: classes/pref/feeds.php:1602
 #, fuzzy
 msgid "These feeds have not been updated with new content for 3 months (oldest first):"
 msgstr "Disse nyhetsstrømmene kunne ikke oppdateres på grunn av feil:"
 
-#: classes/pref/feeds.php:1632
-#: classes/pref/feeds.php:1696
+#: classes/pref/feeds.php:1636
+#: classes/pref/feeds.php:1700
 #, fuzzy
 msgid "Click to edit feed"
 msgstr "Trykk for å endre"
 
-#: classes/pref/feeds.php:1650
-#: classes/pref/feeds.php:1716
+#: classes/pref/feeds.php:1654
+#: classes/pref/feeds.php:1720
 #, fuzzy
 msgid "Unsubscribe from selected feeds"
 msgstr "Fjern abonnement på valgte nyhetsstrømmer"
 
-#: classes/pref/feeds.php:1821
+#: classes/pref/feeds.php:1825
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr ""
 
-#: classes/pref/feeds.php:1830
+#: classes/pref/feeds.php:1834
 msgid "Feeds to subscribe, One per line"
 msgstr ""
 
-#: classes/pref/feeds.php:1852
+#: classes/pref/feeds.php:1857
 #, fuzzy
 msgid "Feeds require authentication."
 msgstr "Denne nyhetsstrømmen krever autentifisering"
 
-#: classes/pref/feeds.php:1859
-#: classes/feeds.php:1092
-#: classes/feeds.php:1146
+#: classes/pref/feeds.php:1864
+#: classes/feeds.php:1094
+#: classes/feeds.php:1148
 msgid "Subscribe"
 msgstr "Abonner"
 
@@ -1899,7 +1935,7 @@ msgid "on field"
 msgstr "På felt:"
 
 #: classes/pref/filters.php:962
-#: js/PrefFilterTree.js:61
+#: js/PrefFilterTree.js:64
 msgid "in"
 msgstr "i"
 
@@ -2548,44 +2584,44 @@ msgstr "Nyhetsstrøm"
 msgid "Available feeds"
 msgstr "Alle Nyhetsstrømmer"
 
-#: classes/feeds.php:1087
+#: classes/feeds.php:1089
 msgid "This feed requires authentication."
 msgstr "Denne nyhetsstrømmen krever autentifisering"
 
-#: classes/feeds.php:1095
+#: classes/feeds.php:1097
 #, fuzzy
 msgid "More feeds"
 msgstr "Flere nyhetsstrømmer"
 
-#: classes/feeds.php:1122
+#: classes/feeds.php:1124
 #, fuzzy
 msgid "Popular feeds"
 msgstr "Vis nyhetsstrømmer"
 
-#: classes/feeds.php:1123
+#: classes/feeds.php:1125
 #, fuzzy
 msgid "Feed archive"
 msgstr "Nyhetsstrømshandlinger"
 
-#: classes/feeds.php:1126
+#: classes/feeds.php:1128
 #, fuzzy
 msgid "limit:"
 msgstr "Antall:"
 
-#: classes/feeds.php:1158
+#: classes/feeds.php:1160
 msgid "Look for"
 msgstr ""
 
-#: classes/feeds.php:1166
+#: classes/feeds.php:1168
 #, php-format
 msgid "in %s"
 msgstr ""
 
-#: classes/feeds.php:1171
+#: classes/feeds.php:1173
 msgid "Used for word stemming"
 msgstr ""
 
-#: classes/feeds.php:1180
+#: classes/feeds.php:1182
 #, fuzzy
 msgid "Search syntax"
 msgstr "Søk etter merkelapp"
@@ -2863,6 +2899,11 @@ msgstr ""
 msgid "Prepare data"
 msgstr "Lagre"
 
+#: plugins/import_export/init.php:428
+#, php-format
+msgid "Upload failed with error code %d (%s)"
+msgstr ""
+
 #: plugins/import_export/init.php:454
 #, fuzzy
 msgid "No file uploaded."
@@ -2986,7 +3027,7 @@ msgstr "Rediger kategorier"
 msgid "Remove category"
 msgstr "Lag kategori"
 
-#: js/PrefFilterTree.js:64
+#: js/PrefFilterTree.js:67
 #, fuzzy
 msgid "Inverse"
 msgstr "(Motsatt)"
@@ -3041,7 +3082,7 @@ msgid "Subscription reset."
 msgstr "Abonner på nyhetsstrøm..."
 
 #: js/functions.js:1311
-#: js/tt-rss.js:682
+#: js/tt-rss.js:705
 #, perl-format
 msgid "Unsubscribe from %s?"
 msgstr "Fjerne abonnement på %s?"
@@ -3286,42 +3327,42 @@ msgstr "Marker alle artikler som leste?"
 msgid "Marking all feeds as read..."
 msgstr "Marker alle nyhetsstrømmer som lest"
 
-#: js/tt-rss.js:383
+#: js/tt-rss.js:404
 #, fuzzy
 msgid "Please enable mail plugin first."
 msgstr "Vennligst velg en eller flere nyhetsstrømmer først"
 
-#: js/tt-rss.js:431
+#: js/tt-rss.js:452
 #: js/functions.js:1643
-#: js/tt-rss.js:663
+#: js/tt-rss.js:686
 msgid "You can't edit this kind of feed."
 msgstr "Du kan ikke endre denne typen nyhetsstrøm"
 
-#: js/tt-rss.js:502
+#: js/tt-rss.js:533
 #, fuzzy
 msgid "Please enable embed_original plugin first."
 msgstr "Vennligst velg en eller flere nyhetsstrømmer først"
 
-#: js/tt-rss.js:515
-#: js/tt-rss.js:713
+#: js/tt-rss.js:546
+#: js/tt-rss.js:736
 msgid "Widescreen is not available in combined mode."
 msgstr ""
 
-#: js/tt-rss.js:827
+#: js/tt-rss.js:850
 msgid "You can't rescore this kind of feed."
 msgstr "Du kan ikke endre poengsummen for denne typen nyhetskanal"
 
-#: js/tt-rss.js:832
-#: js/tt-rss.js:676
+#: js/tt-rss.js:855
+#: js/tt-rss.js:699
 msgid "Please select some feed first."
 msgstr "Vennligst velg en eller flere nyhetsstrømmer først"
 
-#: js/tt-rss.js:837
+#: js/tt-rss.js:860
 #, perl-format
 msgid "Rescore articles in %s?"
 msgstr "Endre poengene for artiklene i %s?"
 
-#: js/tt-rss.js:840
+#: js/tt-rss.js:863
 msgid "Rescoring articles..."
 msgstr "Endrer poengsummen for artiklene..."
 
@@ -3517,7 +3558,7 @@ msgstr "Passord har blitt endret."
 msgid "Sorry, your browser does not support sandboxed iframes."
 msgstr ""
 
-#: plugins/shorten_expanded/init.js:37
+#: plugins/shorten_expanded/init.js:39
 msgid "Click to expand article"
 msgstr "Trykk for å utvide artikkel"
 
@@ -3801,7 +3842,7 @@ msgstr "Generert nyhetsstrøm"
 msgid "Label Editor"
 msgstr "Merkelappredigerer"
 
-#: js/tt-rss.js:671
+#: js/tt-rss.js:694
 msgid "You can't unsubscribe from the category."
 msgstr "Du kan ikke fjerne abonnement fra kategorien."
 
diff --git a/locale/nl_NL/LC_MESSAGES/messages.mo b/locale/nl_NL/LC_MESSAGES/messages.mo
index 1cfc8d25b..6f493d7e1 100644
Binary files a/locale/nl_NL/LC_MESSAGES/messages.mo and b/locale/nl_NL/LC_MESSAGES/messages.mo differ
diff --git a/locale/nl_NL/LC_MESSAGES/messages.po b/locale/nl_NL/LC_MESSAGES/messages.po
index 9bf5388d8..d548de19c 100644
--- a/locale/nl_NL/LC_MESSAGES/messages.po
+++ b/locale/nl_NL/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tt-rss git\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 22:58+0300\n"
+"POT-Creation-Date: 2016-08-19 18:16+0300\n"
 "PO-Revision-Date: 2013-05-02 13:55+0100\n"
 "Last-Translator: ArmyOfPirates\n"
 "Language-Team: translations <LL@li.org>\n"
@@ -169,13 +169,13 @@ msgstr "Feed niet gevonden."
 msgid "Plugin not found"
 msgstr "Gebruiker niet gevonden"
 
-#: index.php:133
-#: index.php:149
-#: index.php:267
-#: prefs.php:102
+#: index.php:148
+#: index.php:164
+#: index.php:282
+#: prefs.php:117
 #: classes/backend.php:5
 #: classes/pref/labels.php:282
-#: classes/pref/feeds.php:1405
+#: classes/pref/feeds.php:1409
 #: classes/pref/filters.php:779
 #: js/feedlist.js:159
 #: js/functions.js:1293
@@ -187,7 +187,7 @@ msgstr "Gebruiker niet gevonden"
 #: js/prefs.js:1781
 #: js/prefs.js:1799
 #: js/tt-rss.js:55
-#: js/tt-rss.js:522
+#: js/tt-rss.js:553
 #: js/viewfeed.js:1298
 #: plugins/import_export/import_export.js:17
 #: js/feedlist.js:484
@@ -200,75 +200,75 @@ msgstr "Gebruiker niet gevonden"
 #: js/prefs.js:1556
 #: js/prefs.js:1572
 #: js/prefs.js:1592
-#: js/tt-rss.js:539
+#: js/tt-rss.js:570
 #: js/viewfeed.js:830
 msgid "Loading, please wait..."
 msgstr "Aan 't laden, even wachten aub..."
 
-#: index.php:167
+#: index.php:182
 msgid "Collapse feedlist"
 msgstr "Feedlijst inklappen"
 
-#: index.php:170
+#: index.php:185
 msgid "Show articles"
 msgstr "Toon artikelen"
 
-#: index.php:173
+#: index.php:188
 msgid "Adaptive"
 msgstr "Aangepast"
 
-#: index.php:174
+#: index.php:189
 msgid "All Articles"
 msgstr "Alle artikelen"
 
-#: index.php:175
-#: include/functions2.php:101
+#: index.php:190
+#: include/functions2.php:102
 #: classes/feeds.php:104
 msgid "Starred"
 msgstr "Met ster"
 
-#: index.php:176
-#: include/functions2.php:102
+#: index.php:191
+#: include/functions2.php:103
 #: classes/feeds.php:105
 msgid "Published"
 msgstr "Gepubliceerd"
 
-#: index.php:177
+#: index.php:192
 #: classes/feeds.php:91
 #: classes/feeds.php:103
 msgid "Unread"
 msgstr "Ongelezen"
 
-#: index.php:178
+#: index.php:193
 msgid "With Note"
 msgstr "Met notitie"
 
-#: index.php:179
+#: index.php:194
 msgid "Ignore Scoring"
 msgstr "Scores negeren"
 
-#: index.php:182
+#: index.php:197
 msgid "Sort articles"
 msgstr "Artikelen sorteren"
 
-#: index.php:185
+#: index.php:200
 msgid "Default"
 msgstr "Standaard"
 
-#: index.php:186
+#: index.php:201
 msgid "Newest first"
 msgstr "Nieuwste eerst"
 
-#: index.php:187
+#: index.php:202
 msgid "Oldest first"
 msgstr "Oudste eerst"
 
-#: index.php:188
+#: index.php:203
 msgid "Title"
 msgstr "Titel"
 
-#: index.php:192
-#: index.php:233
+#: index.php:207
+#: index.php:248
 #: include/functions2.php:90
 #: classes/feeds.php:109
 #: js/FeedTree.js:132
@@ -276,134 +276,134 @@ msgstr "Titel"
 msgid "Mark as read"
 msgstr "Markeren als gelezen"
 
-#: index.php:195
+#: index.php:210
 msgid "Older than one day"
 msgstr "Ouder dan een dag"
 
-#: index.php:198
+#: index.php:213
 msgid "Older than one week"
 msgstr "Ouder dan een week"
 
-#: index.php:201
+#: index.php:216
 msgid "Older than two weeks"
 msgstr "Ouder dan twee weken"
 
-#: index.php:217
+#: index.php:232
 msgid "Communication problem with server."
 msgstr "Communicatieprobleem met de server."
 
-#: index.php:223
+#: index.php:238
 msgid "Actions..."
 msgstr "Acties..."
 
-#: index.php:225
+#: index.php:240
 msgid "Preferences..."
 msgstr "Voorkeuren…"
 
-#: index.php:226
+#: index.php:241
 msgid "Search..."
 msgstr "Zoeken..."
 
-#: index.php:227
+#: index.php:242
 msgid "Feed actions:"
 msgstr "Feed acties:"
 
-#: index.php:228
+#: index.php:243
 #: classes/handler/public.php:672
 msgid "Subscribe to feed..."
 msgstr "Abonneren op feed..."
 
-#: index.php:229
+#: index.php:244
 msgid "Edit this feed..."
 msgstr "Bewerk deze feed..."
 
-#: index.php:230
+#: index.php:245
 msgid "Rescore feed"
 msgstr "Feed opnieuw score geven"
 
-#: index.php:231
-#: classes/pref/feeds.php:783
-#: classes/pref/feeds.php:1360
+#: index.php:246
+#: classes/pref/feeds.php:785
+#: classes/pref/feeds.php:1364
 #: js/PrefFeedTree.js:74
 msgid "Unsubscribe"
 msgstr "Abonnement opzeggen"
 
-#: index.php:232
+#: index.php:247
 msgid "All feeds:"
 msgstr "Alle feeds:"
 
-#: index.php:234
+#: index.php:249
 msgid "(Un)hide read feeds"
 msgstr "Toon/Verberg gelezen feeds"
 
-#: index.php:235
+#: index.php:250
 msgid "Other actions:"
 msgstr "Andere acties:"
 
-#: index.php:236
+#: index.php:251
 #: include/functions2.php:76
 msgid "Toggle widescreen mode"
 msgstr "Wisselen breedbeeld modus"
 
-#: index.php:237
+#: index.php:252
 msgid "Create label..."
 msgstr "Label aanmaken…"
 
-#: index.php:238
+#: index.php:253
 msgid "Create filter..."
 msgstr "Filter aanmaken…"
 
-#: index.php:239
+#: index.php:254
 msgid "Keyboard shortcuts help"
 msgstr "Hulp bij sneltoetscombinaties"
 
-#: index.php:248
+#: index.php:263
 msgid "Logout"
 msgstr "Afmelden"
 
-#: index.php:254
+#: index.php:269
 msgid "Updates are available from Git."
 msgstr ""
 
 #: prefs.php:33
-#: prefs.php:120
-#: include/functions2.php:104
+#: prefs.php:135
+#: include/functions2.php:105
 #: classes/pref/prefs.php:435
 msgid "Preferences"
 msgstr "Voorkeuren"
 
-#: prefs.php:111
+#: prefs.php:126
 msgid "Keyboard shortcuts"
 msgstr "Sneltoetscombinaties"
 
-#: prefs.php:112
+#: prefs.php:127
 msgid "Exit preferences"
 msgstr "Verlaat voorkeuren"
 
-#: prefs.php:123
+#: prefs.php:138
 #: classes/pref/feeds.php:112
-#: classes/pref/feeds.php:1300
-#: classes/pref/feeds.php:1349
+#: classes/pref/feeds.php:1304
+#: classes/pref/feeds.php:1353
 msgid "Feeds"
 msgstr "Feeds"
 
-#: prefs.php:126
+#: prefs.php:141
 #: classes/pref/filters.php:248
 msgid "Filters"
 msgstr "Filters"
 
-#: prefs.php:129
-#: include/functions.php:1256
-#: include/functions.php:1909
+#: prefs.php:144
+#: include/functions.php:1287
+#: include/functions.php:1940
 #: classes/pref/labels.php:90
 msgid "Labels"
 msgstr "Labels"
 
-#: prefs.php:133
+#: prefs.php:148
 msgid "Users"
 msgstr "Gebruikers"
 
-#: prefs.php:136
+#: prefs.php:151
 msgid "System"
 msgstr "Systeem"
 
@@ -485,10 +485,10 @@ msgid "Tiny Tiny RSS data update script."
 msgstr "Tiny Tiny RSS data update script."
 
 #: include/digest.php:109
-#: include/functions.php:1265
-#: include/functions.php:1810
-#: include/functions.php:1895
-#: include/functions.php:1917
+#: include/functions.php:1296
+#: include/functions.php:1841
+#: include/functions.php:1926
+#: include/functions.php:1948
 #: classes/opml.php:421
 #: classes/pref/feeds.php:228
 msgid "Uncategorized"
@@ -505,44 +505,44 @@ msgstr[1] "%d gearchiveerde artikelen"
 msgid "No feeds found."
 msgstr "Geen feeds gevonden."
 
-#: include/functions.php:958
+#: include/functions.php:989
 #, php-format
 msgid "%d min"
 msgstr ""
 
-#: include/functions.php:1254
-#: include/functions.php:1907
+#: include/functions.php:1285
+#: include/functions.php:1938
 msgid "Special"
 msgstr "Speciaal"
 
-#: include/functions.php:1758
+#: include/functions.php:1789
 #: classes/pref/filters.php:229
 #: classes/pref/filters.php:507
 msgid "All feeds"
 msgstr "Alle feeds"
 
-#: include/functions.php:1962
+#: include/functions.php:1993
 msgid "Starred articles"
 msgstr "Artikelen met ster"
 
-#: include/functions.php:1964
+#: include/functions.php:1995
 msgid "Published articles"
 msgstr "Gepubliceerde artikelen"
 
-#: include/functions.php:1966
+#: include/functions.php:1997
 msgid "Fresh articles"
 msgstr "Nieuwe artikelen"
 
-#: include/functions.php:1968
-#: include/functions2.php:99
+#: include/functions.php:1999
+#: include/functions2.php:100
 msgid "All articles"
 msgstr "Alle artikelen"
 
-#: include/functions.php:1970
+#: include/functions.php:2001
 msgid "Archived articles"
 msgstr "Gearchiveerde artikelen"
 
-#: include/functions.php:1972
+#: include/functions.php:2003
 msgid "Recently read"
 msgstr "Recent gelezen"
 
@@ -682,7 +682,7 @@ msgstr "Deselecteer alles"
 
 #: include/functions2.php:85
 #: classes/pref/feeds.php:555
-#: classes/pref/feeds.php:821
+#: classes/pref/feeds.php:823
 msgid "Feed"
 msgstr "Feed"
 
@@ -695,7 +695,7 @@ msgid "Un/hide read feeds"
 msgstr "Toon/Verberg gelezen feeds"
 
 #: include/functions2.php:88
-#: classes/pref/feeds.php:1352
+#: classes/pref/feeds.php:1356
 msgid "Subscribe to feed"
 msgstr "Abonneer op feed"
 
@@ -711,141 +711,178 @@ msgid "Reverse headlines"
 msgstr "Draai kopteksten om"
 
 #: include/functions2.php:92
+msgid "Toggle headline grouping"
+msgstr ""
+
+#: include/functions2.php:93
 msgid "Debug feed update"
 msgstr "Debug feed update"
 
-#: include/functions2.php:93
+#: include/functions2.php:94
 #, fuzzy
 msgid "Debug viewfeed()"
 msgstr "Debug feed update"
 
-#: include/functions2.php:94
+#: include/functions2.php:95
 #: js/FeedTree.js:182
 msgid "Mark all feeds as read"
 msgstr "Markeer alle feeds als gelezen"
 
-#: include/functions2.php:95
+#: include/functions2.php:96
 msgid "Un/collapse current category"
 msgstr "Uit/Inklappen huidige categorie"
 
-#: include/functions2.php:96
+#: include/functions2.php:97
 msgid "Toggle combined mode"
 msgstr "In/uitschakelen gecombineerde modus"
 
-#: include/functions2.php:97
+#: include/functions2.php:98
 msgid "Toggle auto expand in combined mode"
 msgstr "In/uitschakelen automatisch uitklappen in gecombineerde modus"
 
-#: include/functions2.php:98
+#: include/functions2.php:99
 msgid "Go to"
 msgstr "Ga naar"
 
-#: include/functions2.php:100
+#: include/functions2.php:101
 msgid "Fresh"
 msgstr "Nieuw"
 
-#: include/functions2.php:103
-#: js/tt-rss.js:466
-#: js/tt-rss.js:650
+#: include/functions2.php:104
+#: js/tt-rss.js:497
+#: js/tt-rss.js:673
 msgid "Tag cloud"
 msgstr "Tag wolk"
 
-#: include/functions2.php:105
+#: include/functions2.php:106
 msgid "Other"
 msgstr "Andere"
 
-#: include/functions2.php:106
+#: include/functions2.php:107
 #: classes/pref/labels.php:267
 msgid "Create label"
 msgstr "Maak label"
 
-#: include/functions2.php:107
+#: include/functions2.php:108
 #: classes/pref/filters.php:753
 msgid "Create filter"
 msgstr "Maak filter"
 
-#: include/functions2.php:108
+#: include/functions2.php:109
 msgid "Un/collapse sidebar"
 msgstr "Uit/Inklappen zijbalk"
 
-#: include/functions2.php:109
+#: include/functions2.php:110
 msgid "Show help dialog"
 msgstr "Toon helpdialoogvenster"
 
-#: include/functions2.php:663
+#: include/functions2.php:665
 #, php-format
 msgid "Search results: %s"
 msgstr "Zoekresultaten: %s"
 
-#: include/functions2.php:1317
+#: include/functions2.php:1330
 #: classes/feeds.php:749
 msgid "comment"
 msgid_plural "comments"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/functions2.php:1321
+#: include/functions2.php:1334
 #: classes/feeds.php:753
 #, fuzzy
 msgid "comments"
 msgstr "Bijlagen"
 
-#: include/functions2.php:1347
+#: include/functions2.php:1360
 msgid " - "
 msgstr " - "
 
-#: include/functions2.php:1380
-#: include/functions2.php:1631
+#: include/functions2.php:1393
+#: include/functions2.php:1644
 #: classes/article.php:311
 msgid "no tags"
 msgstr "geen tags"
 
-#: include/functions2.php:1390
+#: include/functions2.php:1403
 #: classes/feeds.php:735
 msgid "Edit tags for this article"
 msgstr "Bewerk tags voor dit artikel"
 
-#: include/functions2.php:1422
+#: include/functions2.php:1435
 #: classes/feeds.php:682
 msgid "Originally from:"
 msgstr "Oorspronkelijk uit:"
 
-#: include/functions2.php:1435
+#: include/functions2.php:1448
 #: classes/pref/feeds.php:574
 #: classes/feeds.php:695
 msgid "Feed URL"
 msgstr "Feed URL"
 
-#: include/functions2.php:1472
+#: include/functions2.php:1485
 #: classes/backend.php:105
 #: classes/dlg.php:37
 #: classes/dlg.php:60
 #: classes/dlg.php:93
 #: classes/dlg.php:159
 #: classes/dlg.php:186
-#: classes/pref/feeds.php:1654
-#: classes/pref/feeds.php:1720
+#: classes/pref/feeds.php:1658
+#: classes/pref/feeds.php:1724
 #: classes/pref/filters.php:204
 #: classes/pref/prefs.php:1105
 #: plugins/af_psql_trgm/init.php:102
 #: plugins/import_export/init.php:415
-#: plugins/import_export/init.php:460
+#: plugins/import_export/init.php:461
 #: plugins/share/init.php:121
 msgid "Close this window"
 msgstr "Sluit dit venster"
 
-#: include/functions2.php:1669
+#: include/functions2.php:1682
 msgid "(edit note)"
 msgstr "(bewerk notitie)"
 
-#: include/functions2.php:1924
+#: include/functions2.php:1937
 msgid "unknown type"
 msgstr "onbekend type"
 
-#: include/functions2.php:2001
+#: include/functions2.php:2014
 msgid "Attachments"
 msgstr "Bijlagen"
 
+#: include/functions2.php:2456
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: include/functions2.php:2457
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr ""
+
+#: include/functions2.php:2458
+msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
+msgstr ""
+
+#: include/functions2.php:2459
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: include/functions2.php:2460
+#, fuzzy
+msgid "No file was uploaded"
+msgstr "Geen bestand geupload."
+
+#: include/functions2.php:2461
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: include/functions2.php:2462
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: include/functions2.php:2463
+msgid "A PHP extension stopped the file upload."
+msgstr ""
+
 #: include/login_form.php:197
 #: classes/handler/public.php:569
 #: classes/handler/public.php:824
@@ -915,8 +952,8 @@ msgstr "Tags voor dit artikel (komma gescheiden):"
 #: classes/article.php:222
 #: classes/pref/labels.php:79
 #: classes/pref/users.php:98
-#: classes/pref/feeds.php:799
-#: classes/pref/feeds.php:939
+#: classes/pref/feeds.php:801
+#: classes/pref/feeds.php:943
 #: classes/pref/filters.php:485
 #: classes/pref/prefs.php:989
 #: plugins/instances/init.php:245
@@ -934,17 +971,17 @@ msgstr "Opslaan"
 #: classes/handler/public.php:580
 #: classes/pref/labels.php:81
 #: classes/pref/users.php:100
-#: classes/pref/feeds.php:800
-#: classes/pref/feeds.php:942
-#: classes/pref/feeds.php:1860
+#: classes/pref/feeds.php:802
+#: classes/pref/feeds.php:946
+#: classes/pref/feeds.php:1865
 #: classes/pref/filters.php:488
 #: classes/pref/filters.php:902
 #: classes/pref/filters.php:983
 #: classes/pref/filters.php:1076
 #: classes/pref/prefs.php:991
-#: classes/feeds.php:1098
-#: classes/feeds.php:1148
-#: classes/feeds.php:1185
+#: classes/feeds.php:1100
+#: classes/feeds.php:1150
+#: classes/feeds.php:1187
 #: plugins/instances/init.php:248
 #: plugins/instances/init.php:436
 #: plugins/note/init.php:53
@@ -1000,7 +1037,6 @@ msgid "Processing category: %s"
 msgstr "Verwerken categorie: %s"
 
 #: classes/opml.php:470
-#: plugins/import_export/init.php:428
 #, php-format
 msgid "Upload failed with error code %d"
 msgstr "Upload mislukt met fout nummer %d"
@@ -1220,9 +1256,9 @@ msgstr "Label <b>%s</b> aangemaakt"
 
 #: classes/pref/labels.php:258
 #: classes/pref/users.php:334
-#: classes/pref/feeds.php:1340
-#: classes/pref/feeds.php:1602
-#: classes/pref/feeds.php:1666
+#: classes/pref/feeds.php:1344
+#: classes/pref/feeds.php:1606
+#: classes/pref/feeds.php:1670
 #: classes/pref/filters.php:359
 #: classes/pref/filters.php:407
 #: classes/pref/filters.php:744
@@ -1235,9 +1271,9 @@ msgstr "Selecteer"
 
 #: classes/pref/labels.php:261
 #: classes/pref/users.php:337
-#: classes/pref/feeds.php:1343
-#: classes/pref/feeds.php:1605
-#: classes/pref/feeds.php:1669
+#: classes/pref/feeds.php:1347
+#: classes/pref/feeds.php:1609
+#: classes/pref/feeds.php:1673
 #: classes/pref/filters.php:362
 #: classes/pref/filters.php:410
 #: classes/pref/filters.php:747
@@ -1251,9 +1287,9 @@ msgstr "Alles"
 
 #: classes/pref/labels.php:263
 #: classes/pref/users.php:339
-#: classes/pref/feeds.php:1345
-#: classes/pref/feeds.php:1607
-#: classes/pref/feeds.php:1671
+#: classes/pref/feeds.php:1349
+#: classes/pref/feeds.php:1611
+#: classes/pref/feeds.php:1675
 #: classes/pref/filters.php:364
 #: classes/pref/filters.php:412
 #: classes/pref/filters.php:749
@@ -1267,10 +1303,10 @@ msgstr "Niets"
 
 #: classes/pref/labels.php:270
 #: classes/pref/users.php:348
-#: classes/pref/feeds.php:765
+#: classes/pref/feeds.php:767
 #: classes/pref/filters.php:478
 #: classes/pref/filters.php:766
-#: classes/feeds.php:1147
+#: classes/feeds.php:1149
 #: plugins/instances/init.php:294
 msgid "Remove"
 msgstr "Verwijderen"
@@ -1292,7 +1328,7 @@ msgstr "Bewerk regel"
 
 #: classes/pref/users.php:56
 #: classes/pref/feeds.php:637
-#: classes/pref/feeds.php:876
+#: classes/pref/feeds.php:878
 #: classes/feeds.php:1070
 msgid "Authentication"
 msgstr "Authenticatie"
@@ -1302,8 +1338,8 @@ msgid "Access level: "
 msgstr "Toegangsniveau:"
 
 #: classes/pref/users.php:77
-#: classes/pref/feeds.php:665
-#: classes/pref/feeds.php:892
+#: classes/pref/feeds.php:667
+#: classes/pref/feeds.php:896
 msgid "Options"
 msgstr "Opties"
 
@@ -1369,10 +1405,10 @@ msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] Melding verandering van wachtwoord"
 
 #: classes/pref/users.php:324
-#: classes/pref/feeds.php:1336
+#: classes/pref/feeds.php:1340
 #: classes/pref/filters.php:740
-#: classes/feeds.php:1118
-#: classes/feeds.php:1184
+#: classes/feeds.php:1120
+#: classes/feeds.php:1186
 #: js/tt-rss.js:174
 msgid "Search"
 msgstr "Zoeken"
@@ -1389,8 +1425,8 @@ msgstr "Bewerken"
 
 #: classes/pref/users.php:397
 #: classes/pref/feeds.php:643
-#: classes/pref/feeds.php:880
-#: classes/pref/feeds.php:1838
+#: classes/pref/feeds.php:882
+#: classes/pref/feeds.php:1842
 #: classes/feeds.php:1074
 msgid "Login"
 msgstr "LoginID"
@@ -1470,251 +1506,251 @@ msgid "Feed Title"
 msgstr "Feed titel"
 
 #: classes/pref/feeds.php:595
-#: classes/pref/feeds.php:828
-#: classes/pref/feeds.php:1824
+#: classes/pref/feeds.php:830
+#: classes/pref/feeds.php:1828
 #: classes/feeds.php:1050
 msgid "Place in category:"
 msgstr "Plaats in categorie:"
 
 #: classes/pref/feeds.php:608
-#: classes/pref/feeds.php:842
+#: classes/pref/feeds.php:844
 #, fuzzy
 msgid "Language:"
 msgstr "Taal"
 
 #: classes/pref/feeds.php:615
-#: classes/pref/feeds.php:851
+#: classes/pref/feeds.php:853
 msgid "Update"
 msgstr "Bijwerken"
 
 #: classes/pref/feeds.php:630
-#: classes/pref/feeds.php:867
+#: classes/pref/feeds.php:869
 msgid "Article purging:"
 msgstr "Artikelopschoning:"
 
-#: classes/pref/feeds.php:656
-#: classes/pref/feeds.php:886
-#: classes/pref/feeds.php:1841
+#: classes/pref/feeds.php:658
+#: classes/pref/feeds.php:890
+#: classes/pref/feeds.php:1845
 #: classes/pref/prefs.php:245
-#: classes/feeds.php:1077
+#: classes/feeds.php:1078
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: classes/pref/feeds.php:660
+#: classes/pref/feeds.php:662
 msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
 msgstr "<b>Hint:</b> U moet uw aanmeld informatie invullen als uw feed authenticatie vereist, behalve voor Twitter feeds."
 
-#: classes/pref/feeds.php:679
-#: classes/pref/feeds.php:896
+#: classes/pref/feeds.php:681
+#: classes/pref/feeds.php:900
 msgid "Hide from Popular feeds"
 msgstr "Verbergen voor populaire feeds"
 
-#: classes/pref/feeds.php:691
-#: classes/pref/feeds.php:902
+#: classes/pref/feeds.php:693
+#: classes/pref/feeds.php:906
 msgid "Include in e-mail digest"
 msgstr "Toevoegen aan e-mail samenvatting"
 
-#: classes/pref/feeds.php:704
-#: classes/pref/feeds.php:908
+#: classes/pref/feeds.php:706
+#: classes/pref/feeds.php:912
 msgid "Always display image attachments"
 msgstr "Altijd afbeeldingsbijlagen weergeven"
 
-#: classes/pref/feeds.php:717
-#: classes/pref/feeds.php:916
+#: classes/pref/feeds.php:719
+#: classes/pref/feeds.php:920
 msgid "Do not embed images"
 msgstr "Afbeeldingen niet insluiten."
 
-#: classes/pref/feeds.php:730
-#: classes/pref/feeds.php:924
+#: classes/pref/feeds.php:732
+#: classes/pref/feeds.php:928
 msgid "Cache images locally"
 msgstr "Afbeelding lokaal in cache plaatsen"
 
-#: classes/pref/feeds.php:742
-#: classes/pref/feeds.php:930
+#: classes/pref/feeds.php:744
+#: classes/pref/feeds.php:934
 msgid "Mark updated articles as unread"
 msgstr "Markeer bijgewerkte artikelen als niet-gelezen"
 
-#: classes/pref/feeds.php:746
+#: classes/pref/feeds.php:748
 msgid "Icon"
 msgstr "Pictogram"
 
-#: classes/pref/feeds.php:763
+#: classes/pref/feeds.php:765
 msgid "Replace"
 msgstr "Vervangen"
 
-#: classes/pref/feeds.php:770
+#: classes/pref/feeds.php:772
 #: classes/pref/prefs.php:706
 msgid "Plugins"
 msgstr "Plug-ins"
 
-#: classes/pref/feeds.php:790
+#: classes/pref/feeds.php:792
 msgid "Resubscribe to push updates"
 msgstr "Herabonneren voor push updates"
 
-#: classes/pref/feeds.php:797
+#: classes/pref/feeds.php:799
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr "Herstelt PubSubHubbub abonnement status voor gepushte feeds."
 
-#: classes/pref/feeds.php:1203
-#: classes/pref/feeds.php:1256
+#: classes/pref/feeds.php:1207
+#: classes/pref/feeds.php:1260
 msgid "All done."
 msgstr "Alles gedaan."
 
-#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1315
 msgid "Feeds with errors"
 msgstr "Feeds met fouten"
 
-#: classes/pref/feeds.php:1318
+#: classes/pref/feeds.php:1322
 msgid "Inactive feeds"
 msgstr "Inactieve feeds"
 
-#: classes/pref/feeds.php:1354
+#: classes/pref/feeds.php:1358
 msgid "Edit selected feeds"
 msgstr "Bewerk geselecteerde feeds"
 
-#: classes/pref/feeds.php:1356
-#: classes/pref/feeds.php:1370
+#: classes/pref/feeds.php:1360
+#: classes/pref/feeds.php:1374
 #: classes/pref/filters.php:762
 msgid "Reset sort order"
 msgstr "Herstel sorteervolgorde"
 
-#: classes/pref/feeds.php:1358
+#: classes/pref/feeds.php:1362
 #: js/prefs.js:1737
 msgid "Batch subscribe"
 msgstr "Batchmatig abonneren"
 
-#: classes/pref/feeds.php:1365
+#: classes/pref/feeds.php:1369
 msgid "Categories"
 msgstr "Categorieën"
 
-#: classes/pref/feeds.php:1368
+#: classes/pref/feeds.php:1372
 msgid "Add category"
 msgstr "Categorie toevoegen"
 
-#: classes/pref/feeds.php:1372
+#: classes/pref/feeds.php:1376
 msgid "Remove selected"
 msgstr "Verwijder geselecteerde"
 
-#: classes/pref/feeds.php:1383
+#: classes/pref/feeds.php:1387
 msgid "More actions..."
 msgstr "Meer acties…"
 
-#: classes/pref/feeds.php:1387
+#: classes/pref/feeds.php:1391
 msgid "Manual purge"
 msgstr "Handmatig opschonen"
 
-#: classes/pref/feeds.php:1391
+#: classes/pref/feeds.php:1395
 msgid "Clear feed data"
 msgstr "Wis feed data"
 
-#: classes/pref/feeds.php:1392
+#: classes/pref/feeds.php:1396
 #: classes/pref/filters.php:770
 msgid "Rescore articles"
 msgstr "Artikelen nieuwe score geven"
 
-#: classes/pref/feeds.php:1444
+#: classes/pref/feeds.php:1448
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1446
+#: classes/pref/feeds.php:1450
 msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
 msgstr "Met OPML kunt u feeds, filters, labels en Tiny Tiny RSS instellingen exporteren en importeren."
 
-#: classes/pref/feeds.php:1447
+#: classes/pref/feeds.php:1451
 msgid "Only main settings profile can be migrated using OPML."
 msgstr "Alleen instellingen van het hoofdprofiel kunnen worden overgebracht met OPML."
 
-#: classes/pref/feeds.php:1460
+#: classes/pref/feeds.php:1464
 msgid "Import my OPML"
 msgstr "Importeer mijn OPML"
 
-#: classes/pref/feeds.php:1466
+#: classes/pref/feeds.php:1470
 msgid "Filename:"
 msgstr "Bestandsnaam:"
 
-#: classes/pref/feeds.php:1468
+#: classes/pref/feeds.php:1472
 msgid "Include settings"
 msgstr "Toevoegingsinstellingen"
 
-#: classes/pref/feeds.php:1472
+#: classes/pref/feeds.php:1476
 msgid "Export OPML"
 msgstr "OPML exporteren"
 
-#: classes/pref/feeds.php:1476
+#: classes/pref/feeds.php:1480
 msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
 msgstr "Uw OPML kan openbaar worden gepubliceerd en er kan op worden geabonneerd door iedereen die de URL hieronder kent."
 
-#: classes/pref/feeds.php:1480
+#: classes/pref/feeds.php:1484
 msgid "Public OPML URL"
 msgstr "Publieke OPML URL"
 
-#: classes/pref/feeds.php:1481
+#: classes/pref/feeds.php:1485
 msgid "Display published OPML URL"
 msgstr "Gepubliceerde OPML URL weergeven"
 
-#: classes/pref/feeds.php:1490
+#: classes/pref/feeds.php:1494
 msgid "Firefox integration"
 msgstr "Firefox integratie"
 
-#: classes/pref/feeds.php:1492
+#: classes/pref/feeds.php:1496
 msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
 msgstr "Deze Tiny Tiny RSS site kan gebruikt worden als een Firefox Feed Reader door op de link hieronder te klikken."
 
-#: classes/pref/feeds.php:1499
+#: classes/pref/feeds.php:1503
 msgid "Click here to register this site as a feed reader."
 msgstr "Klik hier om deze site te registreren als een feed reader."
 
-#: classes/pref/feeds.php:1507
+#: classes/pref/feeds.php:1511
 msgid "Published & shared articles / Generated feeds"
 msgstr "Gepubliceerde & gedeelde artikelen / Gegenereerde feeds"
 
-#: classes/pref/feeds.php:1509
+#: classes/pref/feeds.php:1513
 msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
 msgstr "Gepubliceerde artikelen worden geëxporteerd als publieke RSS-feed en er kan door iedereen die de URL hieronder kent op worden geabonneerd."
 
-#: classes/pref/feeds.php:1516
+#: classes/pref/feeds.php:1520
 #: classes/feeds.php:54
 #: classes/feeds.php:134
 msgid "View as RSS"
 msgstr "Toon als RSS"
 
-#: classes/pref/feeds.php:1517
+#: classes/pref/feeds.php:1521
 msgid "Display URL"
 msgstr "Toon URL"
 
-#: classes/pref/feeds.php:1520
+#: classes/pref/feeds.php:1524
 msgid "Clear all generated URLs"
 msgstr "Wis alle gegenereerde URL's"
 
-#: classes/pref/feeds.php:1598
+#: classes/pref/feeds.php:1602
 msgid "These feeds have not been updated with new content for 3 months (oldest first):"
 msgstr "Deze feeds hebben al 3 maanden geen nieuwe inhoud (oudste eerst):"
 
-#: classes/pref/feeds.php:1632
-#: classes/pref/feeds.php:1696
+#: classes/pref/feeds.php:1636
+#: classes/pref/feeds.php:1700
 msgid "Click to edit feed"
 msgstr "Klik om feed te bewerken"
 
-#: classes/pref/feeds.php:1650
-#: classes/pref/feeds.php:1716
+#: classes/pref/feeds.php:1654
+#: classes/pref/feeds.php:1720
 msgid "Unsubscribe from selected feeds"
 msgstr "Abonnement opzeggen voor geselecteerde feeds"
 
-#: classes/pref/feeds.php:1821
+#: classes/pref/feeds.php:1825
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr "Een geldige RSS feed per regel toevoegen (er wordt geen feed detectie uitgevoerd)"
 
-#: classes/pref/feeds.php:1830
+#: classes/pref/feeds.php:1834
 msgid "Feeds to subscribe, One per line"
 msgstr "Te abonneren feeds: één per regel"
 
-#: classes/pref/feeds.php:1852
+#: classes/pref/feeds.php:1857
 msgid "Feeds require authentication."
 msgstr "Feeds vereisen authenticatie."
 
-#: classes/pref/feeds.php:1859
-#: classes/feeds.php:1092
-#: classes/feeds.php:1146
+#: classes/pref/feeds.php:1864
+#: classes/feeds.php:1094
+#: classes/feeds.php:1148
 msgid "Subscribe"
 msgstr "Abonneren"
 
@@ -1797,7 +1833,7 @@ msgid "on field"
 msgstr "op veld"
 
 #: classes/pref/filters.php:962
-#: js/PrefFilterTree.js:61
+#: js/PrefFilterTree.js:64
 msgid "in"
 msgstr "in"
 
@@ -2392,40 +2428,40 @@ msgstr "Feed of website URL"
 msgid "Available feeds"
 msgstr "Beschikbare feeds"
 
-#: classes/feeds.php:1087
+#: classes/feeds.php:1089
 msgid "This feed requires authentication."
 msgstr "Deze feed vereist authenticatie."
 
-#: classes/feeds.php:1095
+#: classes/feeds.php:1097
 msgid "More feeds"
 msgstr "Meer feeds"
 
-#: classes/feeds.php:1122
+#: classes/feeds.php:1124
 msgid "Popular feeds"
 msgstr "Populaire feeds"
 
-#: classes/feeds.php:1123
+#: classes/feeds.php:1125
 msgid "Feed archive"
 msgstr "Feed archief"
 
-#: classes/feeds.php:1126
+#: classes/feeds.php:1128
 msgid "limit:"
 msgstr "beperking:"
 
-#: classes/feeds.php:1158
+#: classes/feeds.php:1160
 msgid "Look for"
 msgstr "Zoek naar"
 
-#: classes/feeds.php:1166
+#: classes/feeds.php:1168
 #, php-format
 msgid "in %s"
 msgstr ""
 
-#: classes/feeds.php:1171
+#: classes/feeds.php:1173
 msgid "Used for word stemming"
 msgstr ""
 
-#: classes/feeds.php:1180
+#: classes/feeds.php:1182
 #, fuzzy
 msgid "Search syntax"
 msgstr "Zoeken"
@@ -2691,6 +2727,11 @@ msgstr "Kon XML-document niet laden."
 msgid "Prepare data"
 msgstr "Voorbereiden data"
 
+#: plugins/import_export/init.php:428
+#, fuzzy, php-format
+msgid "Upload failed with error code %d (%s)"
+msgstr "Upload mislukt met fout nummer %d"
+
 #: plugins/import_export/init.php:454
 msgid "No file uploaded."
 msgstr "Geen bestand geupload."
@@ -2802,7 +2843,7 @@ msgstr "Bewerk categorie"
 msgid "Remove category"
 msgstr "Categorie verwijderen"
 
-#: js/PrefFilterTree.js:64
+#: js/PrefFilterTree.js:67
 msgid "Inverse"
 msgstr "Omgekeerd"
 
@@ -2854,7 +2895,7 @@ msgid "Subscription reset."
 msgstr "Abonnement hersteld."
 
 #: js/functions.js:1311
-#: js/tt-rss.js:682
+#: js/tt-rss.js:705
 #, perl-format
 msgid "Unsubscribe from %s?"
 msgstr "Abonnement opzeggen voor %s?"
@@ -3084,40 +3125,40 @@ msgstr "Markeer alle artikelen als gelezen?"
 msgid "Marking all feeds as read..."
 msgstr "Alle feeds als gelezen markeren..."
 
-#: js/tt-rss.js:383
+#: js/tt-rss.js:404
 msgid "Please enable mail plugin first."
 msgstr "Eerst de e-mail plug-in inschakelen aub."
 
-#: js/tt-rss.js:431
+#: js/tt-rss.js:452
 #: js/functions.js:1643
-#: js/tt-rss.js:663
+#: js/tt-rss.js:686
 msgid "You can't edit this kind of feed."
 msgstr "U kunt dit type feed niet bewerken."
 
-#: js/tt-rss.js:502
+#: js/tt-rss.js:533
 msgid "Please enable embed_original plugin first."
 msgstr "Eerst embed_original plug-in inschakelen aub."
 
-#: js/tt-rss.js:515
-#: js/tt-rss.js:713
+#: js/tt-rss.js:546
+#: js/tt-rss.js:736
 msgid "Widescreen is not available in combined mode."
 msgstr ""
 
-#: js/tt-rss.js:827
+#: js/tt-rss.js:850
 msgid "You can't rescore this kind of feed."
 msgstr "U kunt dit type feed geen andere score geven."
 
-#: js/tt-rss.js:832
-#: js/tt-rss.js:676
+#: js/tt-rss.js:855
+#: js/tt-rss.js:699
 msgid "Please select some feed first."
 msgstr "Selecteer aub eerst een feed."
 
-#: js/tt-rss.js:837
+#: js/tt-rss.js:860
 #, perl-format
 msgid "Rescore articles in %s?"
 msgstr "Artikelen in %s opnieuw een score geven?"
 
-#: js/tt-rss.js:840
+#: js/tt-rss.js:863
 msgid "Rescoring articles..."
 msgstr "Artikelen nieuwe score geven..."
 
@@ -3296,7 +3337,7 @@ msgstr "Uw persoonlijke gegevens zijn opgeslagen."
 msgid "Sorry, your browser does not support sandboxed iframes."
 msgstr "Sorry, uw browser lijkt iframes in een sandbox niet te ondersteunen."
 
-#: plugins/shorten_expanded/init.js:37
+#: plugins/shorten_expanded/init.js:39
 #, fuzzy
 msgid "Click to expand article"
 msgstr "Klik om artikel uit te klappen."
@@ -3549,7 +3590,7 @@ msgstr "Genereerde URLs gewist."
 msgid "Label Editor"
 msgstr "Label editor"
 
-#: js/tt-rss.js:671
+#: js/tt-rss.js:694
 msgid "You can't unsubscribe from the category."
 msgstr "U kunt het abonnementen niet opzeggen in deze categorie."
 
diff --git a/locale/pl_PL/LC_MESSAGES/messages.mo b/locale/pl_PL/LC_MESSAGES/messages.mo
index 8c247e6c5..ae54599b9 100644
Binary files a/locale/pl_PL/LC_MESSAGES/messages.mo and b/locale/pl_PL/LC_MESSAGES/messages.mo differ
diff --git a/locale/pl_PL/LC_MESSAGES/messages.po b/locale/pl_PL/LC_MESSAGES/messages.po
index 1c9f566fa..6898bb410 100644
--- a/locale/pl_PL/LC_MESSAGES/messages.po
+++ b/locale/pl_PL/LC_MESSAGES/messages.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tiny Tiny RSS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 22:58+0300\n"
+"POT-Creation-Date: 2016-08-19 18:16+0300\n"
 "PO-Revision-Date: 2013-08-02 08:25+0100\n"
 "Last-Translator: Mirosław Lach <m.wordpress@lach.waw.pl>\n"
 "Language-Team: \n"
@@ -167,13 +167,13 @@ msgstr "Kanał nie został odnaleziony."
 msgid "Plugin not found"
 msgstr "Użytkownik nie został odnaleziony"
 
-#: index.php:133
-#: index.php:149
-#: index.php:267
-#: prefs.php:102
+#: index.php:148
+#: index.php:164
+#: index.php:282
+#: prefs.php:117
 #: classes/backend.php:5
 #: classes/pref/labels.php:282
-#: classes/pref/feeds.php:1405
+#: classes/pref/feeds.php:1409
 #: classes/pref/filters.php:779
 #: js/feedlist.js:159
 #: js/functions.js:1293
@@ -185,7 +185,7 @@ msgstr "Użytkownik nie został odnaleziony"
 #: js/prefs.js:1781
 #: js/prefs.js:1799
 #: js/tt-rss.js:55
-#: js/tt-rss.js:522
+#: js/tt-rss.js:553
 #: js/viewfeed.js:1298
 #: plugins/import_export/import_export.js:17
 #: js/feedlist.js:484
@@ -198,75 +198,75 @@ msgstr "Użytkownik nie został odnaleziony"
 #: js/prefs.js:1556
 #: js/prefs.js:1572
 #: js/prefs.js:1592
-#: js/tt-rss.js:539
+#: js/tt-rss.js:570
 #: js/viewfeed.js:830
 msgid "Loading, please wait..."
 msgstr "Trwa ładowanie, proszę czekać..."
 
-#: index.php:167
+#: index.php:182
 msgid "Collapse feedlist"
 msgstr "Rozwiń listę kanałów"
 
-#: index.php:170
+#: index.php:185
 msgid "Show articles"
 msgstr "Pokaż artykuły"
 
-#: index.php:173
+#: index.php:188
 msgid "Adaptive"
 msgstr "Adaptacyjny"
 
-#: index.php:174
+#: index.php:189
 msgid "All Articles"
 msgstr "Wszystkie artykuły"
 
-#: index.php:175
-#: include/functions2.php:101
+#: index.php:190
+#: include/functions2.php:102
 #: classes/feeds.php:104
 msgid "Starred"
 msgstr "Oznaczone gwiazdką"
 
-#: index.php:176
-#: include/functions2.php:102
+#: index.php:191
+#: include/functions2.php:103
 #: classes/feeds.php:105
 msgid "Published"
 msgstr "Opublikowane"
 
-#: index.php:177
+#: index.php:192
 #: classes/feeds.php:91
 #: classes/feeds.php:103
 msgid "Unread"
 msgstr "Nieprzeczytane"
 
-#: index.php:178
+#: index.php:193
 msgid "With Note"
 msgstr "Z adnotacją"
 
-#: index.php:179
+#: index.php:194
 msgid "Ignore Scoring"
 msgstr "Ignoruj punktację"
 
-#: index.php:182
+#: index.php:197
 msgid "Sort articles"
 msgstr "Sortuj artykuły"
 
-#: index.php:185
+#: index.php:200
 msgid "Default"
 msgstr "Domyślne"
 
-#: index.php:186
+#: index.php:201
 msgid "Newest first"
 msgstr "Najpierw najnowsze"
 
-#: index.php:187
+#: index.php:202
 msgid "Oldest first"
 msgstr "Najpierw najstarsze"
 
-#: index.php:188
+#: index.php:203
 msgid "Title"
 msgstr "Tytuł"
 
-#: index.php:192
-#: index.php:233
+#: index.php:207
+#: index.php:248
 #: include/functions2.php:90
 #: classes/feeds.php:109
 #: js/FeedTree.js:132
@@ -274,134 +274,134 @@ msgstr "Tytuł"
 msgid "Mark as read"
 msgstr "Oznacz jako przeczytane"
 
-#: index.php:195
+#: index.php:210
 msgid "Older than one day"
 msgstr "Starsze niż jeden dzień"
 
-#: index.php:198
+#: index.php:213
 msgid "Older than one week"
 msgstr "Starsze niż jeden tydzień"
 
-#: index.php:201
+#: index.php:216
 msgid "Older than two weeks"
 msgstr "Starsze niż dwa tygodnie"
 
-#: index.php:217
+#: index.php:232
 msgid "Communication problem with server."
 msgstr "Problem w komunikacji z serwerem."
 
-#: index.php:223
+#: index.php:238
 msgid "Actions..."
 msgstr "Działania..."
 
-#: index.php:225
+#: index.php:240
 msgid "Preferences..."
 msgstr "Ustawienia..."
 
-#: index.php:226
+#: index.php:241
 msgid "Search..."
 msgstr "Szukaj..."
 
-#: index.php:227
+#: index.php:242
 msgid "Feed actions:"
 msgstr "Działania dla kanałów:"
 
-#: index.php:228
+#: index.php:243
 #: classes/handler/public.php:672
 msgid "Subscribe to feed..."
 msgstr "Prenumeruj kanał..."
 
-#: index.php:229
+#: index.php:244
 msgid "Edit this feed..."
 msgstr "Edytuj ten kanał..."
 
-#: index.php:230
+#: index.php:245
 msgid "Rescore feed"
 msgstr "Przelicz punktację kanału"
 
-#: index.php:231
-#: classes/pref/feeds.php:783
-#: classes/pref/feeds.php:1360
+#: index.php:246
+#: classes/pref/feeds.php:785
+#: classes/pref/feeds.php:1364
 #: js/PrefFeedTree.js:74
 msgid "Unsubscribe"
 msgstr "Wypisz się"
 
-#: index.php:232
+#: index.php:247
 msgid "All feeds:"
 msgstr "Wszystkie kanały:"
 
-#: index.php:234
+#: index.php:249
 msgid "(Un)hide read feeds"
 msgstr "Pokaż/Ukryj przeczytane kanały"
 
-#: index.php:235
+#: index.php:250
 msgid "Other actions:"
 msgstr "Inne działania:"
 
-#: index.php:236
+#: index.php:251
 #: include/functions2.php:76
 msgid "Toggle widescreen mode"
 msgstr "Przełącz tryb szerokoekranowy"
 
-#: index.php:237
+#: index.php:252
 msgid "Create label..."
 msgstr "Utwórz etykietę..."
 
-#: index.php:238
+#: index.php:253
 msgid "Create filter..."
 msgstr "Utwórz filtr..."
 
-#: index.php:239
+#: index.php:254
 msgid "Keyboard shortcuts help"
 msgstr "O skrótach klawiszowych"
 
-#: index.php:248
+#: index.php:263
 msgid "Logout"
 msgstr "Wyloguj"
 
-#: index.php:254
+#: index.php:269
 msgid "Updates are available from Git."
 msgstr ""
 
 #: prefs.php:33
-#: prefs.php:120
-#: include/functions2.php:104
+#: prefs.php:135
+#: include/functions2.php:105
 #: classes/pref/prefs.php:435
 msgid "Preferences"
 msgstr "Ustawienia"
 
-#: prefs.php:111
+#: prefs.php:126
 msgid "Keyboard shortcuts"
 msgstr "Skróty klawiszowe"
 
-#: prefs.php:112
+#: prefs.php:127
 msgid "Exit preferences"
 msgstr "Wyjdź z ustawień"
 
-#: prefs.php:123
+#: prefs.php:138
 #: classes/pref/feeds.php:112
-#: classes/pref/feeds.php:1300
-#: classes/pref/feeds.php:1349
+#: classes/pref/feeds.php:1304
+#: classes/pref/feeds.php:1353
 msgid "Feeds"
 msgstr "Kanały"
 
-#: prefs.php:126
+#: prefs.php:141
 #: classes/pref/filters.php:248
 msgid "Filters"
 msgstr "Filtry"
 
-#: prefs.php:129
-#: include/functions.php:1256
-#: include/functions.php:1909
+#: prefs.php:144
+#: include/functions.php:1287
+#: include/functions.php:1940
 #: classes/pref/labels.php:90
 msgid "Labels"
 msgstr "Etykiety"
 
-#: prefs.php:133
+#: prefs.php:148
 msgid "Users"
 msgstr "Użytkowników"
 
-#: prefs.php:136
+#: prefs.php:151
 msgid "System"
 msgstr "Systemowe"
 
@@ -483,10 +483,10 @@ msgid "Tiny Tiny RSS data update script."
 msgstr "Skrypt aktualizacji danych Tiny Tiny RSS."
 
 #: include/digest.php:109
-#: include/functions.php:1265
-#: include/functions.php:1810
-#: include/functions.php:1895
-#: include/functions.php:1917
+#: include/functions.php:1296
+#: include/functions.php:1841
+#: include/functions.php:1926
+#: include/functions.php:1948
 #: classes/opml.php:421
 #: classes/pref/feeds.php:228
 msgid "Uncategorized"
@@ -504,44 +504,44 @@ msgstr[2] "%d zarchiwizowanych artykułów"
 msgid "No feeds found."
 msgstr "Nie znaleziono kanałów."
 
-#: include/functions.php:958
+#: include/functions.php:989
 #, php-format
 msgid "%d min"
 msgstr ""
 
-#: include/functions.php:1254
-#: include/functions.php:1907
+#: include/functions.php:1285
+#: include/functions.php:1938
 msgid "Special"
 msgstr "Specjalne"
 
-#: include/functions.php:1758
+#: include/functions.php:1789
 #: classes/pref/filters.php:229
 #: classes/pref/filters.php:507
 msgid "All feeds"
 msgstr "Wszystkie kanały"
 
-#: include/functions.php:1962
+#: include/functions.php:1993
 msgid "Starred articles"
 msgstr "Artykuły oznaczone gwiazdką"
 
-#: include/functions.php:1964
+#: include/functions.php:1995
 msgid "Published articles"
 msgstr "Opublikowane artykuły"
 
-#: include/functions.php:1966
+#: include/functions.php:1997
 msgid "Fresh articles"
 msgstr "Świeże artykuły"
 
-#: include/functions.php:1968
-#: include/functions2.php:99
+#: include/functions.php:1999
+#: include/functions2.php:100
 msgid "All articles"
 msgstr "Wszystkie artykuły"
 
-#: include/functions.php:1970
+#: include/functions.php:2001
 msgid "Archived articles"
 msgstr "Zarchiwizowane artykuły"
 
-#: include/functions.php:1972
+#: include/functions.php:2003
 msgid "Recently read"
 msgstr "Ostatnio czytane"
 
@@ -681,7 +681,7 @@ msgstr "Odznacz wszystko"
 
 #: include/functions2.php:85
 #: classes/pref/feeds.php:555
-#: classes/pref/feeds.php:821
+#: classes/pref/feeds.php:823
 msgid "Feed"
 msgstr "Kanał"
 
@@ -694,7 +694,7 @@ msgid "Un/hide read feeds"
 msgstr "Pokaż/Ukryj przeczytane kanały"
 
 #: include/functions2.php:88
-#: classes/pref/feeds.php:1352
+#: classes/pref/feeds.php:1356
 msgid "Subscribe to feed"
 msgstr "Prenumeruj kanał"
 
@@ -710,73 +710,77 @@ msgid "Reverse headlines"
 msgstr "Odwróć kolejność nagłówków"
 
 #: include/functions2.php:92
+msgid "Toggle headline grouping"
+msgstr ""
+
+#: include/functions2.php:93
 msgid "Debug feed update"
 msgstr "Testuj aktualizację kanałów"
 
-#: include/functions2.php:93
+#: include/functions2.php:94
 #, fuzzy
 msgid "Debug viewfeed()"
 msgstr "Testuj aktualizację kanałów"
 
-#: include/functions2.php:94
+#: include/functions2.php:95
 #: js/FeedTree.js:182
 msgid "Mark all feeds as read"
 msgstr "Oznacz wszystkie kanały jako przeczytane"
 
-#: include/functions2.php:95
+#: include/functions2.php:96
 msgid "Un/collapse current category"
 msgstr "Zwiń/rozwiń bieżącą kategorię"
 
-#: include/functions2.php:96
+#: include/functions2.php:97
 msgid "Toggle combined mode"
 msgstr "Przełącz tryb scalony"
 
-#: include/functions2.php:97
+#: include/functions2.php:98
 msgid "Toggle auto expand in combined mode"
 msgstr "Przełącz automatyczne rozszerzanie artykułów w trybie scalonym"
 
-#: include/functions2.php:98
+#: include/functions2.php:99
 msgid "Go to"
 msgstr "Idź do"
 
-#: include/functions2.php:100
+#: include/functions2.php:101
 msgid "Fresh"
 msgstr "Świeży"
 
-#: include/functions2.php:103
-#: js/tt-rss.js:466
-#: js/tt-rss.js:650
+#: include/functions2.php:104
+#: js/tt-rss.js:497
+#: js/tt-rss.js:673
 msgid "Tag cloud"
 msgstr "Chmura tagów"
 
-#: include/functions2.php:105
+#: include/functions2.php:106
 msgid "Other"
 msgstr "Inne"
 
-#: include/functions2.php:106
+#: include/functions2.php:107
 #: classes/pref/labels.php:267
 msgid "Create label"
 msgstr "Utwórz etykietę"
 
-#: include/functions2.php:107
+#: include/functions2.php:108
 #: classes/pref/filters.php:753
 msgid "Create filter"
 msgstr "Utwórz filtr"
 
-#: include/functions2.php:108
+#: include/functions2.php:109
 msgid "Un/collapse sidebar"
 msgstr "Zwin/rozwiń pasek boczny"
 
-#: include/functions2.php:109
+#: include/functions2.php:110
 msgid "Show help dialog"
 msgstr "Otwórz okno pomocy"
 
-#: include/functions2.php:663
+#: include/functions2.php:665
 #, php-format
 msgid "Search results: %s"
 msgstr "Wyniki wyszukiwania: %s"
 
-#: include/functions2.php:1317
+#: include/functions2.php:1330
 #: classes/feeds.php:749
 #, fuzzy
 msgid "comment"
@@ -785,68 +789,101 @@ msgstr[0] "Komentarze?"
 msgstr[1] "Komentarze?"
 msgstr[2] "Komentarze?"
 
-#: include/functions2.php:1321
+#: include/functions2.php:1334
 #: classes/feeds.php:753
 #, fuzzy
 msgid "comments"
 msgstr "Komentarze?"
 
-#: include/functions2.php:1347
+#: include/functions2.php:1360
 msgid " - "
 msgstr " - "
 
-#: include/functions2.php:1380
-#: include/functions2.php:1631
+#: include/functions2.php:1393
+#: include/functions2.php:1644
 #: classes/article.php:311
 msgid "no tags"
 msgstr "brak tagów"
 
-#: include/functions2.php:1390
+#: include/functions2.php:1403
 #: classes/feeds.php:735
 msgid "Edit tags for this article"
 msgstr "Edytuj tagi dla tego artykułu"
 
-#: include/functions2.php:1422
+#: include/functions2.php:1435
 #: classes/feeds.php:682
 msgid "Originally from:"
 msgstr "Oryginał pochodzi z:"
 
-#: include/functions2.php:1435
+#: include/functions2.php:1448
 #: classes/pref/feeds.php:574
 #: classes/feeds.php:695
 msgid "Feed URL"
 msgstr "Adres kanału"
 
-#: include/functions2.php:1472
+#: include/functions2.php:1485
 #: classes/backend.php:105
 #: classes/dlg.php:37
 #: classes/dlg.php:60
 #: classes/dlg.php:93
 #: classes/dlg.php:159
 #: classes/dlg.php:186
-#: classes/pref/feeds.php:1654
-#: classes/pref/feeds.php:1720
+#: classes/pref/feeds.php:1658
+#: classes/pref/feeds.php:1724
 #: classes/pref/filters.php:204
 #: classes/pref/prefs.php:1105
 #: plugins/af_psql_trgm/init.php:102
 #: plugins/import_export/init.php:415
-#: plugins/import_export/init.php:460
+#: plugins/import_export/init.php:461
 #: plugins/share/init.php:121
 msgid "Close this window"
 msgstr "Zamknij to okno"
 
-#: include/functions2.php:1669
+#: include/functions2.php:1682
 msgid "(edit note)"
 msgstr "(edytuj notatkę)"
 
-#: include/functions2.php:1924
+#: include/functions2.php:1937
 msgid "unknown type"
 msgstr "nieznany typ"
 
-#: include/functions2.php:2001
+#: include/functions2.php:2014
 msgid "Attachments"
 msgstr "Załączniki"
 
+#: include/functions2.php:2456
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: include/functions2.php:2457
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr ""
+
+#: include/functions2.php:2458
+msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
+msgstr ""
+
+#: include/functions2.php:2459
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: include/functions2.php:2460
+#, fuzzy
+msgid "No file was uploaded"
+msgstr "Nie przesłano żadnego pliku."
+
+#: include/functions2.php:2461
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: include/functions2.php:2462
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: include/functions2.php:2463
+msgid "A PHP extension stopped the file upload."
+msgstr ""
+
 #: include/login_form.php:197
 #: classes/handler/public.php:569
 #: classes/handler/public.php:824
@@ -913,8 +950,8 @@ msgstr "Tagi dla tego artykułu (oddzielone przecinkami):"
 #: classes/article.php:222
 #: classes/pref/labels.php:79
 #: classes/pref/users.php:98
-#: classes/pref/feeds.php:799
-#: classes/pref/feeds.php:939
+#: classes/pref/feeds.php:801
+#: classes/pref/feeds.php:943
 #: classes/pref/filters.php:485
 #: classes/pref/prefs.php:989
 #: plugins/instances/init.php:245
@@ -932,17 +969,17 @@ msgstr "Zapisz"
 #: classes/handler/public.php:580
 #: classes/pref/labels.php:81
 #: classes/pref/users.php:100
-#: classes/pref/feeds.php:800
-#: classes/pref/feeds.php:942
-#: classes/pref/feeds.php:1860
+#: classes/pref/feeds.php:802
+#: classes/pref/feeds.php:946
+#: classes/pref/feeds.php:1865
 #: classes/pref/filters.php:488
 #: classes/pref/filters.php:902
 #: classes/pref/filters.php:983
 #: classes/pref/filters.php:1076
 #: classes/pref/prefs.php:991
-#: classes/feeds.php:1098
-#: classes/feeds.php:1148
-#: classes/feeds.php:1185
+#: classes/feeds.php:1100
+#: classes/feeds.php:1150
+#: classes/feeds.php:1187
 #: plugins/instances/init.php:248
 #: plugins/instances/init.php:436
 #: plugins/note/init.php:53
@@ -998,7 +1035,6 @@ msgid "Processing category: %s"
 msgstr "Przetwarzam kategorię: %s"
 
 #: classes/opml.php:470
-#: plugins/import_export/init.php:428
 #, php-format
 msgid "Upload failed with error code %d"
 msgstr "Przesyłanie pliku zakończone błędem numer %d"
@@ -1218,9 +1254,9 @@ msgstr "Utworzono etykietę <b>%s</b>"
 
 #: classes/pref/labels.php:258
 #: classes/pref/users.php:334
-#: classes/pref/feeds.php:1340
-#: classes/pref/feeds.php:1602
-#: classes/pref/feeds.php:1666
+#: classes/pref/feeds.php:1344
+#: classes/pref/feeds.php:1606
+#: classes/pref/feeds.php:1670
 #: classes/pref/filters.php:359
 #: classes/pref/filters.php:407
 #: classes/pref/filters.php:744
@@ -1233,9 +1269,9 @@ msgstr "Wybierz"
 
 #: classes/pref/labels.php:261
 #: classes/pref/users.php:337
-#: classes/pref/feeds.php:1343
-#: classes/pref/feeds.php:1605
-#: classes/pref/feeds.php:1669
+#: classes/pref/feeds.php:1347
+#: classes/pref/feeds.php:1609
+#: classes/pref/feeds.php:1673
 #: classes/pref/filters.php:362
 #: classes/pref/filters.php:410
 #: classes/pref/filters.php:747
@@ -1249,9 +1285,9 @@ msgstr "Wszystko"
 
 #: classes/pref/labels.php:263
 #: classes/pref/users.php:339
-#: classes/pref/feeds.php:1345
-#: classes/pref/feeds.php:1607
-#: classes/pref/feeds.php:1671
+#: classes/pref/feeds.php:1349
+#: classes/pref/feeds.php:1611
+#: classes/pref/feeds.php:1675
 #: classes/pref/filters.php:364
 #: classes/pref/filters.php:412
 #: classes/pref/filters.php:749
@@ -1265,10 +1301,10 @@ msgstr "Nic"
 
 #: classes/pref/labels.php:270
 #: classes/pref/users.php:348
-#: classes/pref/feeds.php:765
+#: classes/pref/feeds.php:767
 #: classes/pref/filters.php:478
 #: classes/pref/filters.php:766
-#: classes/feeds.php:1147
+#: classes/feeds.php:1149
 #: plugins/instances/init.php:294
 msgid "Remove"
 msgstr "Usuń"
@@ -1290,7 +1326,7 @@ msgstr "Edytuj regułę"
 
 #: classes/pref/users.php:56
 #: classes/pref/feeds.php:637
-#: classes/pref/feeds.php:876
+#: classes/pref/feeds.php:878
 #: classes/feeds.php:1070
 msgid "Authentication"
 msgstr "Uwierzytelnianie"
@@ -1300,8 +1336,8 @@ msgid "Access level: "
 msgstr "Poziom dostępu: "
 
 #: classes/pref/users.php:77
-#: classes/pref/feeds.php:665
-#: classes/pref/feeds.php:892
+#: classes/pref/feeds.php:667
+#: classes/pref/feeds.php:896
 msgid "Options"
 msgstr "Opcje"
 
@@ -1367,10 +1403,10 @@ msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] Informacja o zmianie hasła"
 
 #: classes/pref/users.php:324
-#: classes/pref/feeds.php:1336
+#: classes/pref/feeds.php:1340
 #: classes/pref/filters.php:740
-#: classes/feeds.php:1118
-#: classes/feeds.php:1184
+#: classes/feeds.php:1120
+#: classes/feeds.php:1186
 #: js/tt-rss.js:174
 msgid "Search"
 msgstr "Szukaj"
@@ -1387,8 +1423,8 @@ msgstr "Edytuj"
 
 #: classes/pref/users.php:397
 #: classes/pref/feeds.php:643
-#: classes/pref/feeds.php:880
-#: classes/pref/feeds.php:1838
+#: classes/pref/feeds.php:882
+#: classes/pref/feeds.php:1842
 #: classes/feeds.php:1074
 msgid "Login"
 msgstr "Nazwa użytkownika"
@@ -1468,251 +1504,251 @@ msgid "Feed Title"
 msgstr "Tytuł kanału"
 
 #: classes/pref/feeds.php:595
-#: classes/pref/feeds.php:828
-#: classes/pref/feeds.php:1824
+#: classes/pref/feeds.php:830
+#: classes/pref/feeds.php:1828
 #: classes/feeds.php:1050
 msgid "Place in category:"
 msgstr "Umieść w kategorii:"
 
 #: classes/pref/feeds.php:608
-#: classes/pref/feeds.php:842
+#: classes/pref/feeds.php:844
 #, fuzzy
 msgid "Language:"
 msgstr "Język"
 
 #: classes/pref/feeds.php:615
-#: classes/pref/feeds.php:851
+#: classes/pref/feeds.php:853
 msgid "Update"
 msgstr "Aktualizuj"
 
 #: classes/pref/feeds.php:630
-#: classes/pref/feeds.php:867
+#: classes/pref/feeds.php:869
 msgid "Article purging:"
 msgstr "Czyszczenie artykułów:"
 
-#: classes/pref/feeds.php:656
-#: classes/pref/feeds.php:886
-#: classes/pref/feeds.php:1841
+#: classes/pref/feeds.php:658
+#: classes/pref/feeds.php:890
+#: classes/pref/feeds.php:1845
 #: classes/pref/prefs.php:245
-#: classes/feeds.php:1077
+#: classes/feeds.php:1078
 msgid "Password"
 msgstr "Hasło"
 
-#: classes/pref/feeds.php:660
+#: classes/pref/feeds.php:662
 msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
 msgstr "<b>Wskazówka:</b> musisz wypełnić dane logowania jeżeli Twój kanał wymaga uwierzytelniania. Nie dotyczy to kanałów z Twittera."
 
-#: classes/pref/feeds.php:679
-#: classes/pref/feeds.php:896
+#: classes/pref/feeds.php:681
+#: classes/pref/feeds.php:900
 msgid "Hide from Popular feeds"
 msgstr "Ukryj przed umieszczeniem w Popularnych kanałach"
 
-#: classes/pref/feeds.php:691
-#: classes/pref/feeds.php:902
+#: classes/pref/feeds.php:693
+#: classes/pref/feeds.php:906
 msgid "Include in e-mail digest"
 msgstr "Umieść w przeglądzie emailowym"
 
-#: classes/pref/feeds.php:704
-#: classes/pref/feeds.php:908
+#: classes/pref/feeds.php:706
+#: classes/pref/feeds.php:912
 msgid "Always display image attachments"
 msgstr "Zawsze wyświetlaj załączniki graficzne"
 
-#: classes/pref/feeds.php:717
-#: classes/pref/feeds.php:916
+#: classes/pref/feeds.php:719
+#: classes/pref/feeds.php:920
 msgid "Do not embed images"
 msgstr "Nie osadzaj obrazków"
 
-#: classes/pref/feeds.php:730
-#: classes/pref/feeds.php:924
+#: classes/pref/feeds.php:732
+#: classes/pref/feeds.php:928
 msgid "Cache images locally"
 msgstr "Przechowuj obrazki lokalnie"
 
-#: classes/pref/feeds.php:742
-#: classes/pref/feeds.php:930
+#: classes/pref/feeds.php:744
+#: classes/pref/feeds.php:934
 msgid "Mark updated articles as unread"
 msgstr "Oznacz zaktualizowane artykuły jako nieprzeczytane"
 
-#: classes/pref/feeds.php:746
+#: classes/pref/feeds.php:748
 msgid "Icon"
 msgstr "Ikona"
 
-#: classes/pref/feeds.php:763
+#: classes/pref/feeds.php:765
 msgid "Replace"
 msgstr "Zamień"
 
-#: classes/pref/feeds.php:770
+#: classes/pref/feeds.php:772
 #: classes/pref/prefs.php:706
 msgid "Plugins"
 msgstr "Wtyczki"
 
-#: classes/pref/feeds.php:790
+#: classes/pref/feeds.php:792
 msgid "Resubscribe to push updates"
 msgstr "Odnów prenumeratę aktualizacji typu PUSH"
 
-#: classes/pref/feeds.php:797
+#: classes/pref/feeds.php:799
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr "Resetuje status prenumerat PubSubHubbub dla kanałów obsługujących PUSH."
 
-#: classes/pref/feeds.php:1203
-#: classes/pref/feeds.php:1256
+#: classes/pref/feeds.php:1207
+#: classes/pref/feeds.php:1260
 msgid "All done."
 msgstr "Zrobione."
 
-#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1315
 msgid "Feeds with errors"
 msgstr "Kanały z błędami"
 
-#: classes/pref/feeds.php:1318
+#: classes/pref/feeds.php:1322
 msgid "Inactive feeds"
 msgstr "Nieaktywne kanały"
 
-#: classes/pref/feeds.php:1354
+#: classes/pref/feeds.php:1358
 msgid "Edit selected feeds"
 msgstr "Edytuj wybrane kanały"
 
-#: classes/pref/feeds.php:1356
-#: classes/pref/feeds.php:1370
+#: classes/pref/feeds.php:1360
+#: classes/pref/feeds.php:1374
 #: classes/pref/filters.php:762
 msgid "Reset sort order"
 msgstr "Zresetuj porządek sortowania"
 
-#: classes/pref/feeds.php:1358
+#: classes/pref/feeds.php:1362
 #: js/prefs.js:1737
 msgid "Batch subscribe"
 msgstr "Prenumerata wsadowa"
 
-#: classes/pref/feeds.php:1365
+#: classes/pref/feeds.php:1369
 msgid "Categories"
 msgstr "Kategorie"
 
-#: classes/pref/feeds.php:1368
+#: classes/pref/feeds.php:1372
 msgid "Add category"
 msgstr "Dodaj kategorię"
 
-#: classes/pref/feeds.php:1372
+#: classes/pref/feeds.php:1376
 msgid "Remove selected"
 msgstr "Usuń wybrane"
 
-#: classes/pref/feeds.php:1383
+#: classes/pref/feeds.php:1387
 msgid "More actions..."
 msgstr "Więcej działań..."
 
-#: classes/pref/feeds.php:1387
+#: classes/pref/feeds.php:1391
 msgid "Manual purge"
 msgstr "Czyszczenie ręczne"
 
-#: classes/pref/feeds.php:1391
+#: classes/pref/feeds.php:1395
 msgid "Clear feed data"
 msgstr "Wyczyść dane kanału"
 
-#: classes/pref/feeds.php:1392
+#: classes/pref/feeds.php:1396
 #: classes/pref/filters.php:770
 msgid "Rescore articles"
 msgstr "Przywróć artykuły"
 
-#: classes/pref/feeds.php:1444
+#: classes/pref/feeds.php:1448
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1446
+#: classes/pref/feeds.php:1450
 msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
 msgstr "Korzystając z OPML możesz eksportować i importować kanały, filtry, etykiety i ustawienia Tiny Tiny RSS."
 
-#: classes/pref/feeds.php:1447
+#: classes/pref/feeds.php:1451
 msgid "Only main settings profile can be migrated using OPML."
 msgstr "Tylko główne ustawienia profilu mogą być migrowane korzystając z OPML."
 
-#: classes/pref/feeds.php:1460
+#: classes/pref/feeds.php:1464
 msgid "Import my OPML"
 msgstr "Importuj mój OPML"
 
-#: classes/pref/feeds.php:1466
+#: classes/pref/feeds.php:1470
 msgid "Filename:"
 msgstr "Nazwa pliku:"
 
-#: classes/pref/feeds.php:1468
+#: classes/pref/feeds.php:1472
 msgid "Include settings"
 msgstr "Załącz ustawienia"
 
-#: classes/pref/feeds.php:1472
+#: classes/pref/feeds.php:1476
 msgid "Export OPML"
 msgstr "Eksportuj OPML"
 
-#: classes/pref/feeds.php:1476
+#: classes/pref/feeds.php:1480
 msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
 msgstr "Twój OPML może zostać opublikowany i być prenumerowany przez każdego kto zna poniższy adres."
 
-#: classes/pref/feeds.php:1480
+#: classes/pref/feeds.php:1484
 msgid "Public OPML URL"
 msgstr "Publiczny adres OPML"
 
-#: classes/pref/feeds.php:1481
+#: classes/pref/feeds.php:1485
 msgid "Display published OPML URL"
 msgstr "Wyświetl opublikowany adres OPML"
 
-#: classes/pref/feeds.php:1490
+#: classes/pref/feeds.php:1494
 msgid "Firefox integration"
 msgstr "Integracja z Firefoxem"
 
-#: classes/pref/feeds.php:1492
+#: classes/pref/feeds.php:1496
 msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
 msgstr "Tiny Tiny RSS może być ustawiona jako domyślny czytnik kanałów w Firefoxie poprzez kliknięcie odnośnika poniżej."
 
-#: classes/pref/feeds.php:1499
+#: classes/pref/feeds.php:1503
 msgid "Click here to register this site as a feed reader."
 msgstr "Kliknij tutaj aby ustawić tę stronę jako czytnik kanałów."
 
-#: classes/pref/feeds.php:1507
+#: classes/pref/feeds.php:1511
 msgid "Published & shared articles / Generated feeds"
 msgstr "Opublikowane i udostępnione artykuły / Wygenerowane kanały"
 
-#: classes/pref/feeds.php:1509
+#: classes/pref/feeds.php:1513
 msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
 msgstr "Opublikowane artykuły są eksportowane jako publiczny kanał RSS i mogą być prenumerowane przez każdego kto zna adres podany poniżej."
 
-#: classes/pref/feeds.php:1516
+#: classes/pref/feeds.php:1520
 #: classes/feeds.php:54
 #: classes/feeds.php:134
 msgid "View as RSS"
 msgstr "Wyświetl jako RSS"
 
-#: classes/pref/feeds.php:1517
+#: classes/pref/feeds.php:1521
 msgid "Display URL"
 msgstr "Wyświetl adres"
 
-#: classes/pref/feeds.php:1520
+#: classes/pref/feeds.php:1524
 msgid "Clear all generated URLs"
 msgstr "Wyczyść wszystkie wygenerowane adresy"
 
-#: classes/pref/feeds.php:1598
+#: classes/pref/feeds.php:1602
 msgid "These feeds have not been updated with new content for 3 months (oldest first):"
 msgstr "Niniejsze kanały nie zostały uaktualnione przez 3 miesiące (najstarsze pierwsze):"
 
-#: classes/pref/feeds.php:1632
-#: classes/pref/feeds.php:1696
+#: classes/pref/feeds.php:1636
+#: classes/pref/feeds.php:1700
 msgid "Click to edit feed"
 msgstr "Kliknij aby edytować kanał"
 
-#: classes/pref/feeds.php:1650
-#: classes/pref/feeds.php:1716
+#: classes/pref/feeds.php:1654
+#: classes/pref/feeds.php:1720
 msgid "Unsubscribe from selected feeds"
 msgstr "Zakończ prenumeratę wybranych kanałów:"
 
-#: classes/pref/feeds.php:1821
+#: classes/pref/feeds.php:1825
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr "Wpisz jeden prawidłowy adres kanału RSS w każdej linii (nie jest przeprowadzana automatyczna detekcja adresu kanału)"
 
-#: classes/pref/feeds.php:1830
+#: classes/pref/feeds.php:1834
 msgid "Feeds to subscribe, One per line"
 msgstr "Kanały do prenumeraty. Każdy w osobnej linii"
 
-#: classes/pref/feeds.php:1852
+#: classes/pref/feeds.php:1857
 msgid "Feeds require authentication."
 msgstr "Kanały wymagają uwierzytelniania."
 
-#: classes/pref/feeds.php:1859
-#: classes/feeds.php:1092
-#: classes/feeds.php:1146
+#: classes/pref/feeds.php:1864
+#: classes/feeds.php:1094
+#: classes/feeds.php:1148
 msgid "Subscribe"
 msgstr "Prenumeruj"
 
@@ -1795,7 +1831,7 @@ msgid "on field"
 msgstr "pole"
 
 #: classes/pref/filters.php:962
-#: js/PrefFilterTree.js:61
+#: js/PrefFilterTree.js:64
 msgid "in"
 msgstr "w"
 
@@ -2392,40 +2428,40 @@ msgstr "Adres kanału lub strony"
 msgid "Available feeds"
 msgstr "Dostępne kanały"
 
-#: classes/feeds.php:1087
+#: classes/feeds.php:1089
 msgid "This feed requires authentication."
 msgstr "Ten kanał wymaga uwierzytelniania."
 
-#: classes/feeds.php:1095
+#: classes/feeds.php:1097
 msgid "More feeds"
 msgstr "Więcej kanałów"
 
-#: classes/feeds.php:1122
+#: classes/feeds.php:1124
 msgid "Popular feeds"
 msgstr "Popularne kanały"
 
-#: classes/feeds.php:1123
+#: classes/feeds.php:1125
 msgid "Feed archive"
 msgstr "Archiwum kanału"
 
-#: classes/feeds.php:1126
+#: classes/feeds.php:1128
 msgid "limit:"
 msgstr "limit:"
 
-#: classes/feeds.php:1158
+#: classes/feeds.php:1160
 msgid "Look for"
 msgstr "Szukaj napisu"
 
-#: classes/feeds.php:1166
+#: classes/feeds.php:1168
 #, php-format
 msgid "in %s"
 msgstr ""
 
-#: classes/feeds.php:1171
+#: classes/feeds.php:1173
 msgid "Used for word stemming"
 msgstr ""
 
-#: classes/feeds.php:1180
+#: classes/feeds.php:1182
 #, fuzzy
 msgid "Search syntax"
 msgstr "Szukaj"
@@ -2692,6 +2728,11 @@ msgstr "Nie udało się wczytać dokumentu XML."
 msgid "Prepare data"
 msgstr "Przygotuj dane"
 
+#: plugins/import_export/init.php:428
+#, fuzzy, php-format
+msgid "Upload failed with error code %d (%s)"
+msgstr "Przesyłanie pliku zakończone błędem numer %d"
+
 #: plugins/import_export/init.php:454
 msgid "No file uploaded."
 msgstr "Nie przesłano żadnego pliku."
@@ -2802,7 +2843,7 @@ msgstr "Edytuj kategorię"
 msgid "Remove category"
 msgstr "Usuń kategorię"
 
-#: js/PrefFilterTree.js:64
+#: js/PrefFilterTree.js:67
 msgid "Inverse"
 msgstr "Odwróć"
 
@@ -2855,7 +2896,7 @@ msgid "Subscription reset."
 msgstr "Zresetowano prenumerate."
 
 #: js/functions.js:1311
-#: js/tt-rss.js:682
+#: js/tt-rss.js:705
 #, perl-format
 msgid "Unsubscribe from %s?"
 msgstr "Zakończyć prenumeratę %s?"
@@ -3085,40 +3126,40 @@ msgstr "Oznaczyć wszystkie artykuły jako przeczytane?"
 msgid "Marking all feeds as read..."
 msgstr "Oznaczam wszystkie kanały jako przeczytane..."
 
-#: js/tt-rss.js:383
+#: js/tt-rss.js:404
 msgid "Please enable mail plugin first."
 msgstr "Włącz najpierw wtyczkę obsługi poczty (mail)."
 
-#: js/tt-rss.js:431
+#: js/tt-rss.js:452
 #: js/functions.js:1643
-#: js/tt-rss.js:663
+#: js/tt-rss.js:686
 msgid "You can't edit this kind of feed."
 msgstr "Nie możesz edytować kanału tego typu."
 
-#: js/tt-rss.js:502
+#: js/tt-rss.js:533
 msgid "Please enable embed_original plugin first."
 msgstr "Włącz najpierw wtyczkę osadzania oryginalnej wiadomości (embed_original)."
 
-#: js/tt-rss.js:515
-#: js/tt-rss.js:713
+#: js/tt-rss.js:546
+#: js/tt-rss.js:736
 msgid "Widescreen is not available in combined mode."
 msgstr ""
 
-#: js/tt-rss.js:827
+#: js/tt-rss.js:850
 msgid "You can't rescore this kind of feed."
 msgstr "Nie możesz przeliczyć punktacji kanału tego rodzaju."
 
-#: js/tt-rss.js:832
-#: js/tt-rss.js:676
+#: js/tt-rss.js:855
+#: js/tt-rss.js:699
 msgid "Please select some feed first."
 msgstr "Wybierz najpierw jakiś kanał."
 
-#: js/tt-rss.js:837
+#: js/tt-rss.js:860
 #, perl-format
 msgid "Rescore articles in %s?"
 msgstr "Przeliczyć punktację artykułów w %s?"
 
-#: js/tt-rss.js:840
+#: js/tt-rss.js:863
 msgid "Rescoring articles..."
 msgstr "Przeliczanie punktacji kanałów..."
 
@@ -3302,7 +3343,7 @@ msgstr "Dwoje dane osobiste zostały zapisane."
 msgid "Sorry, your browser does not support sandboxed iframes."
 msgstr "Przykro mi, Twoja przeglądarka nie wspiera izolowanych obiektów iframe."
 
-#: plugins/shorten_expanded/init.js:37
+#: plugins/shorten_expanded/init.js:39
 #, fuzzy
 msgid "Click to expand article"
 msgstr "Kliknij aby powiększyć artykuł."
@@ -3551,7 +3592,7 @@ msgstr "Wyczyszczono wygenerowane adresy URL."
 msgid "Label Editor"
 msgstr "Edytor etykiet"
 
-#: js/tt-rss.js:671
+#: js/tt-rss.js:694
 msgid "You can't unsubscribe from the category."
 msgstr "Nie możesz zrezygnować z prenumeraty tej kategorii."
 
diff --git a/locale/pt_BR/LC_MESSAGES/messages.mo b/locale/pt_BR/LC_MESSAGES/messages.mo
index fef60ce3f..c271cf9cc 100755
Binary files a/locale/pt_BR/LC_MESSAGES/messages.mo and b/locale/pt_BR/LC_MESSAGES/messages.mo differ
diff --git a/locale/pt_BR/LC_MESSAGES/messages.po b/locale/pt_BR/LC_MESSAGES/messages.po
index 89b172624..3b2040cb7 100644
--- a/locale/pt_BR/LC_MESSAGES/messages.po
+++ b/locale/pt_BR/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tt-rss git\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 22:58+0300\n"
+"POT-Creation-Date: 2016-08-19 18:16+0300\n"
 "PO-Revision-Date: 2016-01-03 15:27-0200\n"
 "Last-Translator: Eduardo Kalinowski <eduardo@kalinowski.com.br>\n"
 "Language-Team: Portuguese/Brazil\n"
@@ -160,13 +160,13 @@ msgstr "Método não encontrado"
 msgid "Plugin not found"
 msgstr "Plugin não encontrado"
 
-#: index.php:133
-#: index.php:149
-#: index.php:267
-#: prefs.php:102
+#: index.php:148
+#: index.php:164
+#: index.php:282
+#: prefs.php:117
 #: classes/backend.php:5
 #: classes/pref/labels.php:282
-#: classes/pref/feeds.php:1405
+#: classes/pref/feeds.php:1409
 #: classes/pref/filters.php:779
 #: js/feedlist.js:159
 #: js/functions.js:1293
@@ -178,7 +178,7 @@ msgstr "Plugin não encontrado"
 #: js/prefs.js:1781
 #: js/prefs.js:1799
 #: js/tt-rss.js:55
-#: js/tt-rss.js:522
+#: js/tt-rss.js:553
 #: js/viewfeed.js:1298
 #: plugins/import_export/import_export.js:17
 #: js/feedlist.js:484
@@ -191,75 +191,75 @@ msgstr "Plugin não encontrado"
 #: js/prefs.js:1556
 #: js/prefs.js:1572
 #: js/prefs.js:1592
-#: js/tt-rss.js:539
+#: js/tt-rss.js:570
 #: js/viewfeed.js:830
 msgid "Loading, please wait..."
 msgstr "Carregando, por favor aguarde..."
 
-#: index.php:167
+#: index.php:182
 msgid "Collapse feedlist"
 msgstr "Contrair lista de feeds"
 
-#: index.php:170
+#: index.php:185
 msgid "Show articles"
 msgstr "Mostrar artigos"
 
-#: index.php:173
+#: index.php:188
 msgid "Adaptive"
 msgstr "Adaptativa"
 
-#: index.php:174
+#: index.php:189
 msgid "All Articles"
 msgstr "Todos os artigos"
 
-#: index.php:175
-#: include/functions2.php:101
+#: index.php:190
+#: include/functions2.php:102
 #: classes/feeds.php:104
 msgid "Starred"
 msgstr "Favoritos"
 
-#: index.php:176
-#: include/functions2.php:102
+#: index.php:191
+#: include/functions2.php:103
 #: classes/feeds.php:105
 msgid "Published"
 msgstr "Publicados"
 
-#: index.php:177
+#: index.php:192
 #: classes/feeds.php:91
 #: classes/feeds.php:103
 msgid "Unread"
 msgstr "Não lidos"
 
-#: index.php:178
+#: index.php:193
 msgid "With Note"
 msgstr "Com anotação"
 
-#: index.php:179
+#: index.php:194
 msgid "Ignore Scoring"
 msgstr "Ignorar pontuação"
 
-#: index.php:182
+#: index.php:197
 msgid "Sort articles"
 msgstr "Ordenar artigos"
 
-#: index.php:185
+#: index.php:200
 msgid "Default"
 msgstr "Padrão"
 
-#: index.php:186
+#: index.php:201
 msgid "Newest first"
 msgstr "Mais novos primeiro"
 
-#: index.php:187
+#: index.php:202
 msgid "Oldest first"
 msgstr "Mais antigos primeiro"
 
-#: index.php:188
+#: index.php:203
 msgid "Title"
 msgstr "Título"
 
-#: index.php:192
-#: index.php:233
+#: index.php:207
+#: index.php:248
 #: include/functions2.php:90
 #: classes/feeds.php:109
 #: js/FeedTree.js:132
@@ -267,134 +267,134 @@ msgstr "Título"
 msgid "Mark as read"
 msgstr "Marcar como lido"
 
-#: index.php:195
+#: index.php:210
 msgid "Older than one day"
 msgstr "Com mais de um dia"
 
-#: index.php:198
+#: index.php:213
 msgid "Older than one week"
 msgstr "Com mais de uma semana"
 
-#: index.php:201
+#: index.php:216
 msgid "Older than two weeks"
 msgstr "Com mais de duas semanas"
 
-#: index.php:217
+#: index.php:232
 msgid "Communication problem with server."
 msgstr "Problemas na comunicação com o servidor."
 
-#: index.php:223
+#: index.php:238
 msgid "Actions..."
 msgstr "Ações..."
 
-#: index.php:225
+#: index.php:240
 msgid "Preferences..."
 msgstr "Preferências..."
 
-#: index.php:226
+#: index.php:241
 msgid "Search..."
 msgstr "Pesquisar..."
 
-#: index.php:227
+#: index.php:242
 msgid "Feed actions:"
 msgstr "Ações do feed:"
 
-#: index.php:228
+#: index.php:243
 #: classes/handler/public.php:672
 msgid "Subscribe to feed..."
 msgstr "Inscrever-se ao feed..."
 
-#: index.php:229
+#: index.php:244
 msgid "Edit this feed..."
 msgstr "Editar esta inscrição..."
 
-#: index.php:230
+#: index.php:245
 msgid "Rescore feed"
 msgstr "Reclassificar feed"
 
-#: index.php:231
-#: classes/pref/feeds.php:783
-#: classes/pref/feeds.php:1360
+#: index.php:246
+#: classes/pref/feeds.php:785
+#: classes/pref/feeds.php:1364
 #: js/PrefFeedTree.js:74
 msgid "Unsubscribe"
 msgstr "Cancelar inscrição"
 
-#: index.php:232
+#: index.php:247
 msgid "All feeds:"
 msgstr "Todos os feeds:"
 
-#: index.php:234
+#: index.php:249
 msgid "(Un)hide read feeds"
 msgstr "Mostrar/Ocultar feeds lidos"
 
-#: index.php:235
+#: index.php:250
 msgid "Other actions:"
 msgstr "Outras ações:"
 
-#: index.php:236
+#: index.php:251
 #: include/functions2.php:76
 msgid "Toggle widescreen mode"
 msgstr "Ativa/Desativa modo tela-cheia"
 
-#: index.php:237
+#: index.php:252
 msgid "Create label..."
 msgstr "Criar marcador..."
 
-#: index.php:238
+#: index.php:253
 msgid "Create filter..."
 msgstr "Criar filtro..."
 
-#: index.php:239
+#: index.php:254
 msgid "Keyboard shortcuts help"
 msgstr "Ajuda para atalhos de teclado"
 
-#: index.php:248
+#: index.php:263
 msgid "Logout"
 msgstr "Sair"
 
-#: index.php:254
+#: index.php:269
 msgid "Updates are available from Git."
 msgstr "Atualizações estão disponíveis via Git."
 
 #: prefs.php:33
-#: prefs.php:120
-#: include/functions2.php:104
+#: prefs.php:135
+#: include/functions2.php:105
 #: classes/pref/prefs.php:435
 msgid "Preferences"
 msgstr "Preferências"
 
-#: prefs.php:111
+#: prefs.php:126
 msgid "Keyboard shortcuts"
 msgstr "Atalhos de teclado"
 
-#: prefs.php:112
+#: prefs.php:127
 msgid "Exit preferences"
 msgstr "Sair das preferências"
 
-#: prefs.php:123
+#: prefs.php:138
 #: classes/pref/feeds.php:112
-#: classes/pref/feeds.php:1300
-#: classes/pref/feeds.php:1349
+#: classes/pref/feeds.php:1304
+#: classes/pref/feeds.php:1353
 msgid "Feeds"
 msgstr "Inscrições"
 
-#: prefs.php:126
+#: prefs.php:141
 #: classes/pref/filters.php:248
 msgid "Filters"
 msgstr "Filtros"
 
-#: prefs.php:129
-#: include/functions.php:1256
-#: include/functions.php:1909
+#: prefs.php:144
+#: include/functions.php:1287
+#: include/functions.php:1940
 #: classes/pref/labels.php:90
 msgid "Labels"
 msgstr "Marcadores"
 
-#: prefs.php:133
+#: prefs.php:148
 msgid "Users"
 msgstr "Usuários"
 
-#: prefs.php:136
+#: prefs.php:151
 msgid "System"
 msgstr "Sistema"
 
@@ -476,10 +476,10 @@ msgid "Tiny Tiny RSS data update script."
 msgstr "Script de atualização do Tiny Tiny RSS."
 
 #: include/digest.php:109
-#: include/functions.php:1265
-#: include/functions.php:1810
-#: include/functions.php:1895
-#: include/functions.php:1917
+#: include/functions.php:1296
+#: include/functions.php:1841
+#: include/functions.php:1926
+#: include/functions.php:1948
 #: classes/opml.php:421
 #: classes/pref/feeds.php:228
 msgid "Uncategorized"
@@ -496,44 +496,44 @@ msgstr[1] "%d artigos arquivados"
 msgid "No feeds found."
 msgstr "Sem feeds para exibir."
 
-#: include/functions.php:958
+#: include/functions.php:989
 #, php-format
 msgid "%d min"
 msgstr "%d min"
 
-#: include/functions.php:1254
-#: include/functions.php:1907
+#: include/functions.php:1285
+#: include/functions.php:1938
 msgid "Special"
 msgstr "Especial"
 
-#: include/functions.php:1758
+#: include/functions.php:1789
 #: classes/pref/filters.php:229
 #: classes/pref/filters.php:507
 msgid "All feeds"
 msgstr "Todos os feeds"
 
-#: include/functions.php:1962
+#: include/functions.php:1993
 msgid "Starred articles"
 msgstr "Artigos com estrela"
 
-#: include/functions.php:1964
+#: include/functions.php:1995
 msgid "Published articles"
 msgstr "Artigos publicados"
 
-#: include/functions.php:1966
+#: include/functions.php:1997
 msgid "Fresh articles"
 msgstr "Recentes"
 
-#: include/functions.php:1968
-#: include/functions2.php:99
+#: include/functions.php:1999
+#: include/functions2.php:100
 msgid "All articles"
 msgstr "Todos os artigos"
 
-#: include/functions.php:1970
+#: include/functions.php:2001
 msgid "Archived articles"
 msgstr "Artigos arquivados"
 
-#: include/functions.php:1972
+#: include/functions.php:2003
 msgid "Recently read"
 msgstr "Lidos recentemente"
 
@@ -673,7 +673,7 @@ msgstr "Desmarcar tudo"
 
 #: include/functions2.php:85
 #: classes/pref/feeds.php:555
-#: classes/pref/feeds.php:821
+#: classes/pref/feeds.php:823
 msgid "Feed"
 msgstr "Feed"
 
@@ -686,7 +686,7 @@ msgid "Un/hide read feeds"
 msgstr "Ocultar/mostrar feeds lidos"
 
 #: include/functions2.php:88
-#: classes/pref/feeds.php:1352
+#: classes/pref/feeds.php:1356
 msgid "Subscribe to feed"
 msgstr "Inscrever-se no feed"
 
@@ -702,139 +702,176 @@ msgid "Reverse headlines"
 msgstr "Reverter títulos"
 
 #: include/functions2.php:92
+msgid "Toggle headline grouping"
+msgstr ""
+
+#: include/functions2.php:93
 msgid "Debug feed update"
 msgstr "Debugar atualização de feeds"
 
-#: include/functions2.php:93
+#: include/functions2.php:94
 msgid "Debug viewfeed()"
 msgstr "Debugar viewfeed()"
 
-#: include/functions2.php:94
+#: include/functions2.php:95
 #: js/FeedTree.js:182
 msgid "Mark all feeds as read"
 msgstr "Marcar todos os feeds como lidos"
 
-#: include/functions2.php:95
+#: include/functions2.php:96
 msgid "Un/collapse current category"
 msgstr "Mostrar/Ocultar categoria atual"
 
-#: include/functions2.php:96
+#: include/functions2.php:97
 msgid "Toggle combined mode"
 msgstr "Ativar/Desativar modo combinado"
 
-#: include/functions2.php:97
+#: include/functions2.php:98
 msgid "Toggle auto expand in combined mode"
 msgstr "Ativar/Desativar expansão automática no modo combinado"
 
-#: include/functions2.php:98
+#: include/functions2.php:99
 msgid "Go to"
 msgstr "Ir para"
 
-#: include/functions2.php:100
+#: include/functions2.php:101
 msgid "Fresh"
 msgstr "Recentes"
 
-#: include/functions2.php:103
-#: js/tt-rss.js:466
-#: js/tt-rss.js:650
+#: include/functions2.php:104
+#: js/tt-rss.js:497
+#: js/tt-rss.js:673
 msgid "Tag cloud"
 msgstr "Núvem de tags"
 
-#: include/functions2.php:105
+#: include/functions2.php:106
 msgid "Other"
 msgstr "Outros"
 
-#: include/functions2.php:106
+#: include/functions2.php:107
 #: classes/pref/labels.php:267
 msgid "Create label"
 msgstr "Criar marcador"
 
-#: include/functions2.php:107
+#: include/functions2.php:108
 #: classes/pref/filters.php:753
 msgid "Create filter"
 msgstr "Criar filtro"
 
-#: include/functions2.php:108
+#: include/functions2.php:109
 msgid "Un/collapse sidebar"
 msgstr "Mostrar/Ocultar barra lateral"
 
-#: include/functions2.php:109
+#: include/functions2.php:110
 msgid "Show help dialog"
 msgstr "Mostrar janela de ajuda"
 
-#: include/functions2.php:663
+#: include/functions2.php:665
 #, php-format
 msgid "Search results: %s"
 msgstr "Resultados da pesquisa: %s"
 
-#: include/functions2.php:1317
+#: include/functions2.php:1330
 #: classes/feeds.php:749
 msgid "comment"
 msgid_plural "comments"
 msgstr[0] "comentário"
 msgstr[1] "comentários"
 
-#: include/functions2.php:1321
+#: include/functions2.php:1334
 #: classes/feeds.php:753
 msgid "comments"
 msgstr "comentários"
 
-#: include/functions2.php:1347
+#: include/functions2.php:1360
 msgid " - "
 msgstr " - "
 
-#: include/functions2.php:1380
-#: include/functions2.php:1631
+#: include/functions2.php:1393
+#: include/functions2.php:1644
 #: classes/article.php:311
 msgid "no tags"
 msgstr "sem tags"
 
-#: include/functions2.php:1390
+#: include/functions2.php:1403
 #: classes/feeds.php:735
 msgid "Edit tags for this article"
 msgstr "Editar tags deste artigo"
 
-#: include/functions2.php:1422
+#: include/functions2.php:1435
 #: classes/feeds.php:682
 msgid "Originally from:"
 msgstr "Originalmente de:"
 
-#: include/functions2.php:1435
+#: include/functions2.php:1448
 #: classes/pref/feeds.php:574
 #: classes/feeds.php:695
 msgid "Feed URL"
 msgstr "URL do feed"
 
-#: include/functions2.php:1472
+#: include/functions2.php:1485
 #: classes/backend.php:105
 #: classes/dlg.php:37
 #: classes/dlg.php:60
 #: classes/dlg.php:93
 #: classes/dlg.php:159
 #: classes/dlg.php:186
-#: classes/pref/feeds.php:1654
-#: classes/pref/feeds.php:1720
+#: classes/pref/feeds.php:1658
+#: classes/pref/feeds.php:1724
 #: classes/pref/filters.php:204
 #: classes/pref/prefs.php:1105
 #: plugins/af_psql_trgm/init.php:102
 #: plugins/import_export/init.php:415
-#: plugins/import_export/init.php:460
+#: plugins/import_export/init.php:461
 #: plugins/share/init.php:121
 msgid "Close this window"
 msgstr "Fechar esta janela"
 
-#: include/functions2.php:1669
+#: include/functions2.php:1682
 msgid "(edit note)"
 msgstr "(editar nota)"
 
-#: include/functions2.php:1924
+#: include/functions2.php:1937
 msgid "unknown type"
 msgstr "tipo desconhecido"
 
-#: include/functions2.php:2001
+#: include/functions2.php:2014
 msgid "Attachments"
 msgstr "Anexos"
 
+#: include/functions2.php:2456
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: include/functions2.php:2457
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr ""
+
+#: include/functions2.php:2458
+msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
+msgstr ""
+
+#: include/functions2.php:2459
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: include/functions2.php:2460
+#, fuzzy
+msgid "No file was uploaded"
+msgstr "Nenhum arquivo enviado."
+
+#: include/functions2.php:2461
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: include/functions2.php:2462
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: include/functions2.php:2463
+msgid "A PHP extension stopped the file upload."
+msgstr ""
+
 #: include/login_form.php:197
 #: classes/handler/public.php:569
 #: classes/handler/public.php:824
@@ -901,8 +938,8 @@ msgstr "Tags para esse artigo (separadas por vírgula):"
 #: classes/article.php:222
 #: classes/pref/labels.php:79
 #: classes/pref/users.php:98
-#: classes/pref/feeds.php:799
-#: classes/pref/feeds.php:939
+#: classes/pref/feeds.php:801
+#: classes/pref/feeds.php:943
 #: classes/pref/filters.php:485
 #: classes/pref/prefs.php:989
 #: plugins/instances/init.php:245
@@ -920,17 +957,17 @@ msgstr "Salvar"
 #: classes/handler/public.php:580
 #: classes/pref/labels.php:81
 #: classes/pref/users.php:100
-#: classes/pref/feeds.php:800
-#: classes/pref/feeds.php:942
-#: classes/pref/feeds.php:1860
+#: classes/pref/feeds.php:802
+#: classes/pref/feeds.php:946
+#: classes/pref/feeds.php:1865
 #: classes/pref/filters.php:488
 #: classes/pref/filters.php:902
 #: classes/pref/filters.php:983
 #: classes/pref/filters.php:1076
 #: classes/pref/prefs.php:991
-#: classes/feeds.php:1098
-#: classes/feeds.php:1148
-#: classes/feeds.php:1185
+#: classes/feeds.php:1100
+#: classes/feeds.php:1150
+#: classes/feeds.php:1187
 #: plugins/instances/init.php:248
 #: plugins/instances/init.php:436
 #: plugins/note/init.php:53
@@ -986,7 +1023,6 @@ msgid "Processing category: %s"
 msgstr "Processando categoria: %s"
 
 #: classes/opml.php:470
-#: plugins/import_export/init.php:428
 #, php-format
 msgid "Upload failed with error code %d"
 msgstr "Envio falhou com o código de erro %d"
@@ -1204,9 +1240,9 @@ msgstr "Marcador <b>%s</b> criado"
 
 #: classes/pref/labels.php:258
 #: classes/pref/users.php:334
-#: classes/pref/feeds.php:1340
-#: classes/pref/feeds.php:1602
-#: classes/pref/feeds.php:1666
+#: classes/pref/feeds.php:1344
+#: classes/pref/feeds.php:1606
+#: classes/pref/feeds.php:1670
 #: classes/pref/filters.php:359
 #: classes/pref/filters.php:407
 #: classes/pref/filters.php:744
@@ -1219,9 +1255,9 @@ msgstr "Selecione"
 
 #: classes/pref/labels.php:261
 #: classes/pref/users.php:337
-#: classes/pref/feeds.php:1343
-#: classes/pref/feeds.php:1605
-#: classes/pref/feeds.php:1669
+#: classes/pref/feeds.php:1347
+#: classes/pref/feeds.php:1609
+#: classes/pref/feeds.php:1673
 #: classes/pref/filters.php:362
 #: classes/pref/filters.php:410
 #: classes/pref/filters.php:747
@@ -1235,9 +1271,9 @@ msgstr "Tudo"
 
 #: classes/pref/labels.php:263
 #: classes/pref/users.php:339
-#: classes/pref/feeds.php:1345
-#: classes/pref/feeds.php:1607
-#: classes/pref/feeds.php:1671
+#: classes/pref/feeds.php:1349
+#: classes/pref/feeds.php:1611
+#: classes/pref/feeds.php:1675
 #: classes/pref/filters.php:364
 #: classes/pref/filters.php:412
 #: classes/pref/filters.php:749
@@ -1251,10 +1287,10 @@ msgstr "Nenhum"
 
 #: classes/pref/labels.php:270
 #: classes/pref/users.php:348
-#: classes/pref/feeds.php:765
+#: classes/pref/feeds.php:767
 #: classes/pref/filters.php:478
 #: classes/pref/filters.php:766
-#: classes/feeds.php:1147
+#: classes/feeds.php:1149
 #: plugins/instances/init.php:294
 msgid "Remove"
 msgstr "Remover"
@@ -1275,7 +1311,7 @@ msgstr "Editar usuário"
 
 #: classes/pref/users.php:56
 #: classes/pref/feeds.php:637
-#: classes/pref/feeds.php:876
+#: classes/pref/feeds.php:878
 #: classes/feeds.php:1070
 msgid "Authentication"
 msgstr "Autenticação"
@@ -1285,8 +1321,8 @@ msgid "Access level: "
 msgstr "Nível de acesso:"
 
 #: classes/pref/users.php:77
-#: classes/pref/feeds.php:665
-#: classes/pref/feeds.php:892
+#: classes/pref/feeds.php:667
+#: classes/pref/feeds.php:896
 msgid "Options"
 msgstr "Opções"
 
@@ -1351,10 +1387,10 @@ msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] Notificação de troca de senha"
 
 #: classes/pref/users.php:324
-#: classes/pref/feeds.php:1336
+#: classes/pref/feeds.php:1340
 #: classes/pref/filters.php:740
-#: classes/feeds.php:1118
-#: classes/feeds.php:1184
+#: classes/feeds.php:1120
+#: classes/feeds.php:1186
 #: js/tt-rss.js:174
 msgid "Search"
 msgstr "Pesquisar"
@@ -1371,8 +1407,8 @@ msgstr "Editar"
 
 #: classes/pref/users.php:397
 #: classes/pref/feeds.php:643
-#: classes/pref/feeds.php:880
-#: classes/pref/feeds.php:1838
+#: classes/pref/feeds.php:882
+#: classes/pref/feeds.php:1842
 #: classes/feeds.php:1074
 msgid "Login"
 msgstr "Nome de usuário"
@@ -1451,250 +1487,250 @@ msgid "Feed Title"
 msgstr "Título do feed"
 
 #: classes/pref/feeds.php:595
-#: classes/pref/feeds.php:828
-#: classes/pref/feeds.php:1824
+#: classes/pref/feeds.php:830
+#: classes/pref/feeds.php:1828
 #: classes/feeds.php:1050
 msgid "Place in category:"
 msgstr "Colocar na categoria:"
 
 #: classes/pref/feeds.php:608
-#: classes/pref/feeds.php:842
+#: classes/pref/feeds.php:844
 msgid "Language:"
 msgstr "Língua:"
 
 #: classes/pref/feeds.php:615
-#: classes/pref/feeds.php:851
+#: classes/pref/feeds.php:853
 msgid "Update"
 msgstr "Atualizar"
 
 #: classes/pref/feeds.php:630
-#: classes/pref/feeds.php:867
+#: classes/pref/feeds.php:869
 msgid "Article purging:"
 msgstr "Remoção de artigos:"
 
-#: classes/pref/feeds.php:656
-#: classes/pref/feeds.php:886
-#: classes/pref/feeds.php:1841
+#: classes/pref/feeds.php:658
+#: classes/pref/feeds.php:890
+#: classes/pref/feeds.php:1845
 #: classes/pref/prefs.php:245
-#: classes/feeds.php:1077
+#: classes/feeds.php:1078
 msgid "Password"
 msgstr "Senha"
 
-#: classes/pref/feeds.php:660
+#: classes/pref/feeds.php:662
 msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
 msgstr "<b>Hint:</b> Você precisa preencher suas informações de conexão se o feed precisa de autenticação, exceto para os feeds do Twitter."
 
-#: classes/pref/feeds.php:679
-#: classes/pref/feeds.php:896
+#: classes/pref/feeds.php:681
+#: classes/pref/feeds.php:900
 msgid "Hide from Popular feeds"
 msgstr "Ocultar do feed populares"
 
-#: classes/pref/feeds.php:691
-#: classes/pref/feeds.php:902
+#: classes/pref/feeds.php:693
+#: classes/pref/feeds.php:906
 msgid "Include in e-mail digest"
 msgstr "Incluir no resumo por e-mail"
 
-#: classes/pref/feeds.php:704
-#: classes/pref/feeds.php:908
+#: classes/pref/feeds.php:706
+#: classes/pref/feeds.php:912
 msgid "Always display image attachments"
 msgstr "Sempre mostrar imagens anexas"
 
-#: classes/pref/feeds.php:717
-#: classes/pref/feeds.php:916
+#: classes/pref/feeds.php:719
+#: classes/pref/feeds.php:920
 msgid "Do not embed images"
 msgstr "Não embutir imagens"
 
-#: classes/pref/feeds.php:730
-#: classes/pref/feeds.php:924
+#: classes/pref/feeds.php:732
+#: classes/pref/feeds.php:928
 msgid "Cache images locally"
 msgstr "Guardar imagens no cache local"
 
-#: classes/pref/feeds.php:742
-#: classes/pref/feeds.php:930
+#: classes/pref/feeds.php:744
+#: classes/pref/feeds.php:934
 msgid "Mark updated articles as unread"
 msgstr "Marcar artigos atualizados como não lidos"
 
-#: classes/pref/feeds.php:746
+#: classes/pref/feeds.php:748
 msgid "Icon"
 msgstr "Ícone"
 
-#: classes/pref/feeds.php:763
+#: classes/pref/feeds.php:765
 msgid "Replace"
 msgstr "Substituir"
 
-#: classes/pref/feeds.php:770
+#: classes/pref/feeds.php:772
 #: classes/pref/prefs.php:706
 msgid "Plugins"
 msgstr "Plugins"
 
-#: classes/pref/feeds.php:790
+#: classes/pref/feeds.php:792
 msgid "Resubscribe to push updates"
 msgstr "Reinscrever-se nas atualizações tipo push"
 
-#: classes/pref/feeds.php:797
+#: classes/pref/feeds.php:799
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr "Reinicia o status da inscrição do PubSubHubbub para feeds com push habilitado."
 
-#: classes/pref/feeds.php:1203
-#: classes/pref/feeds.php:1256
+#: classes/pref/feeds.php:1207
+#: classes/pref/feeds.php:1260
 msgid "All done."
 msgstr "Completo."
 
-#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1315
 msgid "Feeds with errors"
 msgstr "Feeds com erro"
 
-#: classes/pref/feeds.php:1318
+#: classes/pref/feeds.php:1322
 msgid "Inactive feeds"
 msgstr "Feeds inativos"
 
-#: classes/pref/feeds.php:1354
+#: classes/pref/feeds.php:1358
 msgid "Edit selected feeds"
 msgstr "Editar feeds selecionados"
 
-#: classes/pref/feeds.php:1356
-#: classes/pref/feeds.php:1370
+#: classes/pref/feeds.php:1360
+#: classes/pref/feeds.php:1374
 #: classes/pref/filters.php:762
 msgid "Reset sort order"
 msgstr "Reiniciar ordenação"
 
-#: classes/pref/feeds.php:1358
+#: classes/pref/feeds.php:1362
 #: js/prefs.js:1737
 msgid "Batch subscribe"
 msgstr "Inscrição em lote"
 
-#: classes/pref/feeds.php:1365
+#: classes/pref/feeds.php:1369
 msgid "Categories"
 msgstr "Categorias"
 
-#: classes/pref/feeds.php:1368
+#: classes/pref/feeds.php:1372
 msgid "Add category"
 msgstr "Adicionar categoria"
 
-#: classes/pref/feeds.php:1372
+#: classes/pref/feeds.php:1376
 msgid "Remove selected"
 msgstr "Remover selecionados"
 
-#: classes/pref/feeds.php:1383
+#: classes/pref/feeds.php:1387
 msgid "More actions..."
 msgstr "Mais ações..."
 
-#: classes/pref/feeds.php:1387
+#: classes/pref/feeds.php:1391
 msgid "Manual purge"
 msgstr "Remover manualmente"
 
-#: classes/pref/feeds.php:1391
+#: classes/pref/feeds.php:1395
 msgid "Clear feed data"
 msgstr "Limpar dados do feed"
 
-#: classes/pref/feeds.php:1392
+#: classes/pref/feeds.php:1396
 #: classes/pref/filters.php:770
 msgid "Rescore articles"
 msgstr "Reclassificar artigos"
 
-#: classes/pref/feeds.php:1444
+#: classes/pref/feeds.php:1448
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1446
+#: classes/pref/feeds.php:1450
 msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
 msgstr "Usando OPML você pode exportar e importar suas inscrições, filtros, marcadores e configurações do Tiny Tiny RSS."
 
-#: classes/pref/feeds.php:1447
+#: classes/pref/feeds.php:1451
 msgid "Only main settings profile can be migrated using OPML."
 msgstr "Só o perfil de configurações principal pode ser migrado via OPML."
 
-#: classes/pref/feeds.php:1460
+#: classes/pref/feeds.php:1464
 msgid "Import my OPML"
 msgstr "Importar OPML"
 
-#: classes/pref/feeds.php:1466
+#: classes/pref/feeds.php:1470
 msgid "Filename:"
 msgstr "Nome do arquivo:"
 
-#: classes/pref/feeds.php:1468
+#: classes/pref/feeds.php:1472
 msgid "Include settings"
 msgstr "Incluir configurações"
 
-#: classes/pref/feeds.php:1472
+#: classes/pref/feeds.php:1476
 msgid "Export OPML"
 msgstr "Exportar OPML"
 
-#: classes/pref/feeds.php:1476
+#: classes/pref/feeds.php:1480
 msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
 msgstr "Seu OPML pode ser inscrito por qualquer um que conheça a URL abaixo."
 
-#: classes/pref/feeds.php:1480
+#: classes/pref/feeds.php:1484
 msgid "Public OPML URL"
 msgstr "URL OPML pública"
 
-#: classes/pref/feeds.php:1481
+#: classes/pref/feeds.php:1485
 msgid "Display published OPML URL"
 msgstr "Mostrar a URL OPML publicada"
 
-#: classes/pref/feeds.php:1490
+#: classes/pref/feeds.php:1494
 msgid "Firefox integration"
 msgstr "Integração com o Firefox"
 
-#: classes/pref/feeds.php:1492
+#: classes/pref/feeds.php:1496
 msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
 msgstr "Este Tiny Tiny RSS pode ser usado como um leitor de feeds no Firefox clicando no link abaixo."
 
-#: classes/pref/feeds.php:1499
+#: classes/pref/feeds.php:1503
 msgid "Click here to register this site as a feed reader."
 msgstr "Clique aqui para registrar esse site com um leitor de feeds."
 
-#: classes/pref/feeds.php:1507
+#: classes/pref/feeds.php:1511
 msgid "Published & shared articles / Generated feeds"
 msgstr "Artigos publicados e compartilhados / Feeds gerados"
 
-#: classes/pref/feeds.php:1509
+#: classes/pref/feeds.php:1513
 msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
 msgstr "Artigos publicados são exportados como um feed RSS público que pode ser inscrito por qualquer um que saiba a URL abaixo."
 
-#: classes/pref/feeds.php:1516
+#: classes/pref/feeds.php:1520
 #: classes/feeds.php:54
 #: classes/feeds.php:134
 msgid "View as RSS"
 msgstr "Ver como RSS"
 
-#: classes/pref/feeds.php:1517
+#: classes/pref/feeds.php:1521
 msgid "Display URL"
 msgstr "Mostrar URL"
 
-#: classes/pref/feeds.php:1520
+#: classes/pref/feeds.php:1524
 msgid "Clear all generated URLs"
 msgstr "Limpar todas as URLs geradas"
 
-#: classes/pref/feeds.php:1598
+#: classes/pref/feeds.php:1602
 msgid "These feeds have not been updated with new content for 3 months (oldest first):"
 msgstr "Estes feeds não foram atualizados há 3 meses (mais antigo primeiro):"
 
-#: classes/pref/feeds.php:1632
-#: classes/pref/feeds.php:1696
+#: classes/pref/feeds.php:1636
+#: classes/pref/feeds.php:1700
 msgid "Click to edit feed"
 msgstr "Clique para editar a inscrição"
 
-#: classes/pref/feeds.php:1650
-#: classes/pref/feeds.php:1716
+#: classes/pref/feeds.php:1654
+#: classes/pref/feeds.php:1720
 msgid "Unsubscribe from selected feeds"
 msgstr "Cancelar inscrições selecionadas"
 
-#: classes/pref/feeds.php:1821
+#: classes/pref/feeds.php:1825
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr "Inclua um feed RSS por linha (detecção de feeds não será feita)"
 
-#: classes/pref/feeds.php:1830
+#: classes/pref/feeds.php:1834
 msgid "Feeds to subscribe, One per line"
 msgstr "Feeds para se inscrever, um por linha"
 
-#: classes/pref/feeds.php:1852
+#: classes/pref/feeds.php:1857
 msgid "Feeds require authentication."
 msgstr "Feed requer autenticação."
 
-#: classes/pref/feeds.php:1859
-#: classes/feeds.php:1092
-#: classes/feeds.php:1146
+#: classes/pref/feeds.php:1864
+#: classes/feeds.php:1094
+#: classes/feeds.php:1148
 msgid "Subscribe"
 msgstr "Inscrever-se"
 
@@ -1776,7 +1812,7 @@ msgid "on field"
 msgstr "no campo"
 
 #: classes/pref/filters.php:962
-#: js/PrefFilterTree.js:61
+#: js/PrefFilterTree.js:64
 msgid "in"
 msgstr "em"
 
@@ -2367,40 +2403,40 @@ msgstr "URL do site ou feed"
 msgid "Available feeds"
 msgstr "Feeds disponíveis"
 
-#: classes/feeds.php:1087
+#: classes/feeds.php:1089
 msgid "This feed requires authentication."
 msgstr "Este feed requer autenticação."
 
-#: classes/feeds.php:1095
+#: classes/feeds.php:1097
 msgid "More feeds"
 msgstr "Mais feeds"
 
-#: classes/feeds.php:1122
+#: classes/feeds.php:1124
 msgid "Popular feeds"
 msgstr "Feeds populares"
 
-#: classes/feeds.php:1123
+#: classes/feeds.php:1125
 msgid "Feed archive"
 msgstr "Arquivo de feeds"
 
-#: classes/feeds.php:1126
+#: classes/feeds.php:1128
 msgid "limit:"
 msgstr "limite:"
 
-#: classes/feeds.php:1158
+#: classes/feeds.php:1160
 msgid "Look for"
 msgstr "Procurar por"
 
-#: classes/feeds.php:1166
+#: classes/feeds.php:1168
 #, php-format
 msgid "in %s"
 msgstr "em %s"
 
-#: classes/feeds.php:1171
+#: classes/feeds.php:1173
 msgid "Used for word stemming"
 msgstr "Usado para achar as raízes das palavras"
 
-#: classes/feeds.php:1180
+#: classes/feeds.php:1182
 msgid "Search syntax"
 msgstr "Sintaxe da pesquisa"
 
@@ -2656,6 +2692,11 @@ msgstr "Não foi possível ler o documento XML."
 msgid "Prepare data"
 msgstr "Preparar dados"
 
+#: plugins/import_export/init.php:428
+#, fuzzy, php-format
+msgid "Upload failed with error code %d (%s)"
+msgstr "Envio falhou com o código de erro %d"
+
 #: plugins/import_export/init.php:454
 msgid "No file uploaded."
 msgstr "Nenhum arquivo enviado."
@@ -2765,7 +2806,7 @@ msgstr "Editar categoria"
 msgid "Remove category"
 msgstr "Remover categoria"
 
-#: js/PrefFilterTree.js:64
+#: js/PrefFilterTree.js:67
 msgid "Inverse"
 msgstr "Invertido"
 
@@ -2816,7 +2857,7 @@ msgid "Subscription reset."
 msgstr "Inscrição reiniciada."
 
 #: js/functions.js:1311
-#: js/tt-rss.js:682
+#: js/tt-rss.js:705
 #, perl-format
 msgid "Unsubscribe from %s?"
 msgstr "Cancelar inscrição de %s?"
@@ -3046,40 +3087,40 @@ msgstr "Marcar todos os artigos como lidos?"
 msgid "Marking all feeds as read..."
 msgstr "Marcando todos os feeds como lidos..."
 
-#: js/tt-rss.js:383
+#: js/tt-rss.js:404
 msgid "Please enable mail plugin first."
 msgstr "Por favor habilite o plugin de e-mail."
 
-#: js/tt-rss.js:431
+#: js/tt-rss.js:452
 #: js/functions.js:1643
-#: js/tt-rss.js:663
+#: js/tt-rss.js:686
 msgid "You can't edit this kind of feed."
 msgstr "Você não pode editar esse tipo de feed."
 
-#: js/tt-rss.js:502
+#: js/tt-rss.js:533
 msgid "Please enable embed_original plugin first."
 msgstr "Por favor, habilite o plugin \"embed_original\"."
 
-#: js/tt-rss.js:515
-#: js/tt-rss.js:713
+#: js/tt-rss.js:546
+#: js/tt-rss.js:736
 msgid "Widescreen is not available in combined mode."
 msgstr "Tela-cheia não suportado no modo combinado."
 
-#: js/tt-rss.js:827
+#: js/tt-rss.js:850
 msgid "You can't rescore this kind of feed."
 msgstr "Você não pode classificar esse tipo de feed."
 
-#: js/tt-rss.js:832
-#: js/tt-rss.js:676
+#: js/tt-rss.js:855
+#: js/tt-rss.js:699
 msgid "Please select some feed first."
 msgstr "Por favor selecione algum feed."
 
-#: js/tt-rss.js:837
+#: js/tt-rss.js:860
 #, perl-format
 msgid "Rescore articles in %s?"
 msgstr "Reclassificar artigos em %s?"
 
-#: js/tt-rss.js:840
+#: js/tt-rss.js:863
 msgid "Rescoring articles..."
 msgstr "Reclassificando artigos..."
 
@@ -3253,7 +3294,7 @@ msgstr "Sua mensagem foi enviada."
 msgid "Sorry, your browser does not support sandboxed iframes."
 msgstr "Desculpe, seu navegador não suporta sandboxed iframes."
 
-#: plugins/shorten_expanded/init.js:37
+#: plugins/shorten_expanded/init.js:39
 msgid "Click to expand article"
 msgstr "Clique para expandir o artigo"
 
@@ -3501,7 +3542,7 @@ msgstr "URLs geradas apagadas."
 msgid "Label Editor"
 msgstr "Editor de marcador"
 
-#: js/tt-rss.js:671
+#: js/tt-rss.js:694
 msgid "You can't unsubscribe from the category."
 msgstr "Você não pode cancelar a inscrição dessa categoria."
 
diff --git a/locale/pt_PT/LC_MESSAGES/messages.mo b/locale/pt_PT/LC_MESSAGES/messages.mo
index f2f209fb2..34564c2f0 100644
Binary files a/locale/pt_PT/LC_MESSAGES/messages.mo and b/locale/pt_PT/LC_MESSAGES/messages.mo differ
diff --git a/locale/pt_PT/LC_MESSAGES/messages.po b/locale/pt_PT/LC_MESSAGES/messages.po
index a6b516a9c..ef2b75e98 100644
--- a/locale/pt_PT/LC_MESSAGES/messages.po
+++ b/locale/pt_PT/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tt-rss 1.2.14.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 22:58+0300\n"
+"POT-Creation-Date: 2016-08-19 18:16+0300\n"
 "PO-Revision-Date: 2016-01-09 14:25-0200\n"
 "Last-Translator: Duarte Velez Grilo <duartegrilo@gmail.com>\n"
 "Language-Team: Portuguese/Portugal <duartegrilo@gmail.com>\n"
@@ -168,13 +168,13 @@ msgstr "Feed não encontrado."
 msgid "Plugin not found"
 msgstr "Usuário não encontrado"
 
-#: index.php:133
-#: index.php:149
-#: index.php:267
-#: prefs.php:102
+#: index.php:148
+#: index.php:164
+#: index.php:282
+#: prefs.php:117
 #: classes/backend.php:5
 #: classes/pref/labels.php:282
-#: classes/pref/feeds.php:1405
+#: classes/pref/feeds.php:1409
 #: classes/pref/filters.php:779
 #: js/feedlist.js:159
 #: js/functions.js:1293
@@ -186,7 +186,7 @@ msgstr "Usuário não encontrado"
 #: js/prefs.js:1781
 #: js/prefs.js:1799
 #: js/tt-rss.js:55
-#: js/tt-rss.js:522
+#: js/tt-rss.js:553
 #: js/viewfeed.js:1298
 #: plugins/import_export/import_export.js:17
 #: js/feedlist.js:484
@@ -199,76 +199,76 @@ msgstr "Usuário não encontrado"
 #: js/prefs.js:1556
 #: js/prefs.js:1572
 #: js/prefs.js:1592
-#: js/tt-rss.js:539
+#: js/tt-rss.js:570
 #: js/viewfeed.js:830
 msgid "Loading, please wait..."
 msgstr "A carregar, por favor aguarde..."
 
-#: index.php:167
+#: index.php:182
 #, fuzzy
 msgid "Collapse feedlist"
 msgstr "Fechar lista de feeds"
 
-#: index.php:170
+#: index.php:185
 msgid "Show articles"
 msgstr "Mostrar artigos"
 
-#: index.php:173
+#: index.php:188
 msgid "Adaptive"
 msgstr "Adaptativa"
 
-#: index.php:174
+#: index.php:189
 msgid "All Articles"
 msgstr "Todos os artigos"
 
-#: index.php:175
-#: include/functions2.php:101
+#: index.php:190
+#: include/functions2.php:102
 #: classes/feeds.php:104
 msgid "Starred"
 msgstr "Favoritos"
 
-#: index.php:176
-#: include/functions2.php:102
+#: index.php:191
+#: include/functions2.php:103
 #: classes/feeds.php:105
 msgid "Published"
 msgstr "Publicados"
 
-#: index.php:177
+#: index.php:192
 #: classes/feeds.php:91
 #: classes/feeds.php:103
 msgid "Unread"
 msgstr "Não Lidos"
 
-#: index.php:178
+#: index.php:193
 msgid "With Note"
 msgstr "Com Anotação"
 
-#: index.php:179
+#: index.php:194
 msgid "Ignore Scoring"
 msgstr "Ignorar Pontuação"
 
-#: index.php:182
+#: index.php:197
 msgid "Sort articles"
 msgstr "Ordenar artigos"
 
-#: index.php:185
+#: index.php:200
 msgid "Default"
 msgstr "Padrão"
 
-#: index.php:186
+#: index.php:201
 msgid "Newest first"
 msgstr "Mais recentes primeiro"
 
-#: index.php:187
+#: index.php:202
 msgid "Oldest first"
 msgstr "Mais antigos primeiro"
 
-#: index.php:188
+#: index.php:203
 msgid "Title"
 msgstr "Título"
 
-#: index.php:192
-#: index.php:233
+#: index.php:207
+#: index.php:248
 #: include/functions2.php:90
 #: classes/feeds.php:109
 #: js/FeedTree.js:132
@@ -276,134 +276,134 @@ msgstr "Título"
 msgid "Mark as read"
 msgstr "Marcar como lido"
 
-#: index.php:195
+#: index.php:210
 msgid "Older than one day"
 msgstr "Com mais de um dia"
 
-#: index.php:198
+#: index.php:213
 msgid "Older than one week"
 msgstr "Com mais de uma semana"
 
-#: index.php:201
+#: index.php:216
 msgid "Older than two weeks"
 msgstr "Com mais de duas semanas"
 
-#: index.php:217
+#: index.php:232
 msgid "Communication problem with server."
 msgstr "Problemas de comunicação com o servidor"
 
-#: index.php:223
+#: index.php:238
 msgid "Actions..."
 msgstr "Acções..."
 
-#: index.php:225
+#: index.php:240
 msgid "Preferences..."
 msgstr "Preferências"
 
-#: index.php:226
+#: index.php:241
 msgid "Search..."
 msgstr "Pesquisar"
 
-#: index.php:227
+#: index.php:242
 msgid "Feed actions:"
 msgstr "Acções do Feed:"
 
-#: index.php:228
+#: index.php:243
 #: classes/handler/public.php:672
 msgid "Subscribe to feed..."
 msgstr "Assinar feed..."
 
-#: index.php:229
+#: index.php:244
 msgid "Edit this feed..."
 msgstr "Editar assinatura..."
 
-#: index.php:230
+#: index.php:245
 msgid "Rescore feed"
 msgstr "Reclassificar assinatura"
 
-#: index.php:231
-#: classes/pref/feeds.php:783
-#: classes/pref/feeds.php:1360
+#: index.php:246
+#: classes/pref/feeds.php:785
+#: classes/pref/feeds.php:1364
 #: js/PrefFeedTree.js:74
 msgid "Unsubscribe"
 msgstr "Cancelar assinatura"
 
-#: index.php:232
+#: index.php:247
 msgid "All feeds:"
 msgstr "Todos os Feeds:"
 
-#: index.php:234
+#: index.php:249
 msgid "(Un)hide read feeds"
 msgstr "Mostrar/Ocultar feeds lidos"
 
-#: index.php:235
+#: index.php:250
 msgid "Other actions:"
 msgstr "Outras acções:"
 
-#: index.php:236
+#: index.php:251
 #: include/functions2.php:76
 msgid "Toggle widescreen mode"
 msgstr "Activa/Desactiva modo widescreen"
 
-#: index.php:237
+#: index.php:252
 msgid "Create label..."
 msgstr "Criar marcador..."
 
-#: index.php:238
+#: index.php:253
 msgid "Create filter..."
 msgstr "Criar filtro..."
 
-#: index.php:239
+#: index.php:254
 msgid "Keyboard shortcuts help"
 msgstr "Ajuda para atalhos de teclado"
 
-#: index.php:248
+#: index.php:263
 msgid "Logout"
 msgstr "Sair"
 
-#: index.php:254
+#: index.php:269
 msgid "Updates are available from Git."
 msgstr ""
 
 #: prefs.php:33
-#: prefs.php:120
-#: include/functions2.php:104
+#: prefs.php:135
+#: include/functions2.php:105
 #: classes/pref/prefs.php:435
 msgid "Preferences"
 msgstr "Preferências"
 
-#: prefs.php:111
+#: prefs.php:126
 msgid "Keyboard shortcuts"
 msgstr "Atalhos de teclado"
 
-#: prefs.php:112
+#: prefs.php:127
 msgid "Exit preferences"
 msgstr "Sair das preferências"
 
-#: prefs.php:123
+#: prefs.php:138
 #: classes/pref/feeds.php:112
-#: classes/pref/feeds.php:1300
-#: classes/pref/feeds.php:1349
+#: classes/pref/feeds.php:1304
+#: classes/pref/feeds.php:1353
 msgid "Feeds"
 msgstr "Assinaturas"
 
-#: prefs.php:126
+#: prefs.php:141
 #: classes/pref/filters.php:248
 msgid "Filters"
 msgstr "Filtros"
 
-#: prefs.php:129
-#: include/functions.php:1256
-#: include/functions.php:1909
+#: prefs.php:144
+#: include/functions.php:1287
+#: include/functions.php:1940
 #: classes/pref/labels.php:90
 msgid "Labels"
 msgstr "Marcadores"
 
-#: prefs.php:133
+#: prefs.php:148
 msgid "Users"
 msgstr "Utilizadores"
 
-#: prefs.php:136
+#: prefs.php:151
 msgid "System"
 msgstr "Sistema"
 
@@ -485,10 +485,10 @@ msgid "Tiny Tiny RSS data update script."
 msgstr "Script de actualização do Tiny Tiny RSS."
 
 #: include/digest.php:109
-#: include/functions.php:1265
-#: include/functions.php:1810
-#: include/functions.php:1895
-#: include/functions.php:1917
+#: include/functions.php:1296
+#: include/functions.php:1841
+#: include/functions.php:1926
+#: include/functions.php:1948
 #: classes/opml.php:421
 #: classes/pref/feeds.php:228
 msgid "Uncategorized"
@@ -505,44 +505,44 @@ msgstr[1] "%d artigos arquivados"
 msgid "No feeds found."
 msgstr "Sem assinaturas para exibir."
 
-#: include/functions.php:958
+#: include/functions.php:989
 #, php-format
 msgid "%d min"
 msgstr ""
 
-#: include/functions.php:1254
-#: include/functions.php:1907
+#: include/functions.php:1285
+#: include/functions.php:1938
 msgid "Special"
 msgstr "Especial"
 
-#: include/functions.php:1758
+#: include/functions.php:1789
 #: classes/pref/filters.php:229
 #: classes/pref/filters.php:507
 msgid "All feeds"
 msgstr "Todos os feeds"
 
-#: include/functions.php:1962
+#: include/functions.php:1993
 msgid "Starred articles"
 msgstr "Artigos com estrela"
 
-#: include/functions.php:1964
+#: include/functions.php:1995
 msgid "Published articles"
 msgstr "Artigos publicados"
 
-#: include/functions.php:1966
+#: include/functions.php:1997
 msgid "Fresh articles"
 msgstr "Últimas notícias"
 
-#: include/functions.php:1968
-#: include/functions2.php:99
+#: include/functions.php:1999
+#: include/functions2.php:100
 msgid "All articles"
 msgstr "Todas as inscrições"
 
-#: include/functions.php:1970
+#: include/functions.php:2001
 msgid "Archived articles"
 msgstr "Artigos arquivados"
 
-#: include/functions.php:1972
+#: include/functions.php:2003
 msgid "Recently read"
 msgstr "Lidos recentemente"
 
@@ -682,7 +682,7 @@ msgstr "Desmarcar tudo"
 
 #: include/functions2.php:85
 #: classes/pref/feeds.php:555
-#: classes/pref/feeds.php:821
+#: classes/pref/feeds.php:823
 msgid "Feed"
 msgstr "Feed"
 
@@ -695,7 +695,7 @@ msgid "Un/hide read feeds"
 msgstr "Ocultar/mostrar inscrições lidas"
 
 #: include/functions2.php:88
-#: classes/pref/feeds.php:1352
+#: classes/pref/feeds.php:1356
 msgid "Subscribe to feed"
 msgstr "Assinar"
 
@@ -712,73 +712,77 @@ msgid "Reverse headlines"
 msgstr "Remover as categorias selecionadas?"
 
 #: include/functions2.php:92
+msgid "Toggle headline grouping"
+msgstr ""
+
+#: include/functions2.php:93
 msgid "Debug feed update"
 msgstr "Debugar atualização de inscrições"
 
-#: include/functions2.php:93
+#: include/functions2.php:94
 #, fuzzy
 msgid "Debug viewfeed()"
 msgstr "Debugar atualização de inscrições"
 
-#: include/functions2.php:94
+#: include/functions2.php:95
 #: js/FeedTree.js:182
 msgid "Mark all feeds as read"
 msgstr "Marcar todas as inscrições como lidas"
 
-#: include/functions2.php:95
+#: include/functions2.php:96
 msgid "Un/collapse current category"
 msgstr "Mostrar/Ocultar categoria atual"
 
-#: include/functions2.php:96
+#: include/functions2.php:97
 msgid "Toggle combined mode"
 msgstr "Ativar/Desativar modo combinado"
 
-#: include/functions2.php:97
+#: include/functions2.php:98
 msgid "Toggle auto expand in combined mode"
 msgstr "Ativar/Desativar expansão no modo combinado"
 
-#: include/functions2.php:98
+#: include/functions2.php:99
 msgid "Go to"
 msgstr "Ir para"
 
-#: include/functions2.php:100
+#: include/functions2.php:101
 msgid "Fresh"
 msgstr "Recentes"
 
-#: include/functions2.php:103
-#: js/tt-rss.js:466
-#: js/tt-rss.js:650
+#: include/functions2.php:104
+#: js/tt-rss.js:497
+#: js/tt-rss.js:673
 msgid "Tag cloud"
 msgstr "Núvem de tags"
 
-#: include/functions2.php:105
+#: include/functions2.php:106
 msgid "Other"
 msgstr "Outros"
 
-#: include/functions2.php:106
+#: include/functions2.php:107
 #: classes/pref/labels.php:267
 msgid "Create label"
 msgstr "Criar marcador"
 
-#: include/functions2.php:107
+#: include/functions2.php:108
 #: classes/pref/filters.php:753
 msgid "Create filter"
 msgstr "Criar filtro"
 
-#: include/functions2.php:108
+#: include/functions2.php:109
 msgid "Un/collapse sidebar"
 msgstr "Mostrar/Ocultar barra lateral"
 
-#: include/functions2.php:109
+#: include/functions2.php:110
 msgid "Show help dialog"
 msgstr "Mostrar dialogo de ajuda"
 
-#: include/functions2.php:663
+#: include/functions2.php:665
 #, php-format
 msgid "Search results: %s"
 msgstr "Resultados da pesquisa: %s"
 
-#: include/functions2.php:1317
+#: include/functions2.php:1330
 #: classes/feeds.php:749
 #, fuzzy
 msgid "comment"
@@ -786,68 +790,101 @@ msgid_plural "comments"
 msgstr[0] "Conteúdo"
 msgstr[1] "Conteúdo"
 
-#: include/functions2.php:1321
+#: include/functions2.php:1334
 #: classes/feeds.php:753
 #, fuzzy
 msgid "comments"
 msgstr "Conteúdo"
 
-#: include/functions2.php:1347
+#: include/functions2.php:1360
 msgid " - "
 msgstr " - "
 
-#: include/functions2.php:1380
-#: include/functions2.php:1631
+#: include/functions2.php:1393
+#: include/functions2.php:1644
 #: classes/article.php:311
 msgid "no tags"
 msgstr "sem tags"
 
-#: include/functions2.php:1390
+#: include/functions2.php:1403
 #: classes/feeds.php:735
 msgid "Edit tags for this article"
 msgstr "Editar tags deste artigo"
 
-#: include/functions2.php:1422
+#: include/functions2.php:1435
 #: classes/feeds.php:682
 msgid "Originally from:"
 msgstr "Originalmente de:"
 
-#: include/functions2.php:1435
+#: include/functions2.php:1448
 #: classes/pref/feeds.php:574
 #: classes/feeds.php:695
 msgid "Feed URL"
 msgstr "URL da inscrição"
 
-#: include/functions2.php:1472
+#: include/functions2.php:1485
 #: classes/backend.php:105
 #: classes/dlg.php:37
 #: classes/dlg.php:60
 #: classes/dlg.php:93
 #: classes/dlg.php:159
 #: classes/dlg.php:186
-#: classes/pref/feeds.php:1654
-#: classes/pref/feeds.php:1720
+#: classes/pref/feeds.php:1658
+#: classes/pref/feeds.php:1724
 #: classes/pref/filters.php:204
 #: classes/pref/prefs.php:1105
 #: plugins/af_psql_trgm/init.php:102
 #: plugins/import_export/init.php:415
-#: plugins/import_export/init.php:460
+#: plugins/import_export/init.php:461
 #: plugins/share/init.php:121
 msgid "Close this window"
 msgstr "Fechar esta janela"
 
-#: include/functions2.php:1669
+#: include/functions2.php:1682
 msgid "(edit note)"
 msgstr "Editar nota"
 
-#: include/functions2.php:1924
+#: include/functions2.php:1937
 msgid "unknown type"
 msgstr "tipo desconhecido"
 
-#: include/functions2.php:2001
+#: include/functions2.php:2014
 msgid "Attachments"
 msgstr "Anexos"
 
+#: include/functions2.php:2456
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: include/functions2.php:2457
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr ""
+
+#: include/functions2.php:2458
+msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
+msgstr ""
+
+#: include/functions2.php:2459
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: include/functions2.php:2460
+#, fuzzy
+msgid "No file was uploaded"
+msgstr "Nenhum arquivo enviado."
+
+#: include/functions2.php:2461
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: include/functions2.php:2462
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: include/functions2.php:2463
+msgid "A PHP extension stopped the file upload."
+msgstr ""
+
 #: include/login_form.php:197
 #: classes/handler/public.php:569
 #: classes/handler/public.php:824
@@ -914,8 +951,8 @@ msgstr "Tags para esse artigo (separadas por vírgula):"
 #: classes/article.php:222
 #: classes/pref/labels.php:79
 #: classes/pref/users.php:98
-#: classes/pref/feeds.php:799
-#: classes/pref/feeds.php:939
+#: classes/pref/feeds.php:801
+#: classes/pref/feeds.php:943
 #: classes/pref/filters.php:485
 #: classes/pref/prefs.php:989
 #: plugins/instances/init.php:245
@@ -933,17 +970,17 @@ msgstr "Salvar"
 #: classes/handler/public.php:580
 #: classes/pref/labels.php:81
 #: classes/pref/users.php:100
-#: classes/pref/feeds.php:800
-#: classes/pref/feeds.php:942
-#: classes/pref/feeds.php:1860
+#: classes/pref/feeds.php:802
+#: classes/pref/feeds.php:946
+#: classes/pref/feeds.php:1865
 #: classes/pref/filters.php:488
 #: classes/pref/filters.php:902
 #: classes/pref/filters.php:983
 #: classes/pref/filters.php:1076
 #: classes/pref/prefs.php:991
-#: classes/feeds.php:1098
-#: classes/feeds.php:1148
-#: classes/feeds.php:1185
+#: classes/feeds.php:1100
+#: classes/feeds.php:1150
+#: classes/feeds.php:1187
 #: plugins/instances/init.php:248
 #: plugins/instances/init.php:436
 #: plugins/note/init.php:53
@@ -999,7 +1036,6 @@ msgid "Processing category: %s"
 msgstr "Processando categoria: %s"
 
 #: classes/opml.php:470
-#: plugins/import_export/init.php:428
 #, php-format
 msgid "Upload failed with error code %d"
 msgstr "Enviou falhou com o código de erro %d"
@@ -1219,9 +1255,9 @@ msgstr "Marcador <b>%s</b> criado"
 
 #: classes/pref/labels.php:258
 #: classes/pref/users.php:334
-#: classes/pref/feeds.php:1340
-#: classes/pref/feeds.php:1602
-#: classes/pref/feeds.php:1666
+#: classes/pref/feeds.php:1344
+#: classes/pref/feeds.php:1606
+#: classes/pref/feeds.php:1670
 #: classes/pref/filters.php:359
 #: classes/pref/filters.php:407
 #: classes/pref/filters.php:744
@@ -1234,9 +1270,9 @@ msgstr "Selecione"
 
 #: classes/pref/labels.php:261
 #: classes/pref/users.php:337
-#: classes/pref/feeds.php:1343
-#: classes/pref/feeds.php:1605
-#: classes/pref/feeds.php:1669
+#: classes/pref/feeds.php:1347
+#: classes/pref/feeds.php:1609
+#: classes/pref/feeds.php:1673
 #: classes/pref/filters.php:362
 #: classes/pref/filters.php:410
 #: classes/pref/filters.php:747
@@ -1250,9 +1286,9 @@ msgstr "Tudo"
 
 #: classes/pref/labels.php:263
 #: classes/pref/users.php:339
-#: classes/pref/feeds.php:1345
-#: classes/pref/feeds.php:1607
-#: classes/pref/feeds.php:1671
+#: classes/pref/feeds.php:1349
+#: classes/pref/feeds.php:1611
+#: classes/pref/feeds.php:1675
 #: classes/pref/filters.php:364
 #: classes/pref/filters.php:412
 #: classes/pref/filters.php:749
@@ -1266,10 +1302,10 @@ msgstr "Nenhum"
 
 #: classes/pref/labels.php:270
 #: classes/pref/users.php:348
-#: classes/pref/feeds.php:765
+#: classes/pref/feeds.php:767
 #: classes/pref/filters.php:478
 #: classes/pref/filters.php:766
-#: classes/feeds.php:1147
+#: classes/feeds.php:1149
 #: plugins/instances/init.php:294
 msgid "Remove"
 msgstr "Remover"
@@ -1291,7 +1327,7 @@ msgstr "Editar regra"
 
 #: classes/pref/users.php:56
 #: classes/pref/feeds.php:637
-#: classes/pref/feeds.php:876
+#: classes/pref/feeds.php:878
 #: classes/feeds.php:1070
 msgid "Authentication"
 msgstr "Autenticação"
@@ -1301,8 +1337,8 @@ msgid "Access level: "
 msgstr "Nível de acesso:"
 
 #: classes/pref/users.php:77
-#: classes/pref/feeds.php:665
-#: classes/pref/feeds.php:892
+#: classes/pref/feeds.php:667
+#: classes/pref/feeds.php:896
 msgid "Options"
 msgstr "Opções"
 
@@ -1368,10 +1404,10 @@ msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] Notificação de troca de senh"
 
 #: classes/pref/users.php:324
-#: classes/pref/feeds.php:1336
+#: classes/pref/feeds.php:1340
 #: classes/pref/filters.php:740
-#: classes/feeds.php:1118
-#: classes/feeds.php:1184
+#: classes/feeds.php:1120
+#: classes/feeds.php:1186
 #: js/tt-rss.js:174
 msgid "Search"
 msgstr "Pesquisar"
@@ -1388,8 +1424,8 @@ msgstr "Editar"
 
 #: classes/pref/users.php:397
 #: classes/pref/feeds.php:643
-#: classes/pref/feeds.php:880
-#: classes/pref/feeds.php:1838
+#: classes/pref/feeds.php:882
+#: classes/pref/feeds.php:1842
 #: classes/feeds.php:1074
 msgid "Login"
 msgstr "Login"
@@ -1468,251 +1504,251 @@ msgid "Feed Title"
 msgstr "Título da inscrição"
 
 #: classes/pref/feeds.php:595
-#: classes/pref/feeds.php:828
-#: classes/pref/feeds.php:1824
+#: classes/pref/feeds.php:830
+#: classes/pref/feeds.php:1828
 #: classes/feeds.php:1050
 msgid "Place in category:"
 msgstr "Colocar na categoria:"
 
 #: classes/pref/feeds.php:608
-#: classes/pref/feeds.php:842
+#: classes/pref/feeds.php:844
 #, fuzzy
 msgid "Language:"
 msgstr "Língua"
 
 #: classes/pref/feeds.php:615
-#: classes/pref/feeds.php:851
+#: classes/pref/feeds.php:853
 msgid "Update"
 msgstr "Atualizar"
 
 #: classes/pref/feeds.php:630
-#: classes/pref/feeds.php:867
+#: classes/pref/feeds.php:869
 msgid "Article purging:"
 msgstr "Apagando artigo:"
 
-#: classes/pref/feeds.php:656
-#: classes/pref/feeds.php:886
-#: classes/pref/feeds.php:1841
+#: classes/pref/feeds.php:658
+#: classes/pref/feeds.php:890
+#: classes/pref/feeds.php:1845
 #: classes/pref/prefs.php:245
-#: classes/feeds.php:1077
+#: classes/feeds.php:1078
 msgid "Password"
 msgstr "Senha"
 
-#: classes/pref/feeds.php:660
+#: classes/pref/feeds.php:662
 msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
 msgstr "<b>Hint:</b> Você precisa preencher suas informações de login se a assinatura precisa de autenticação, exceto para as assinaturas do Twitter."
 
-#: classes/pref/feeds.php:679
-#: classes/pref/feeds.php:896
+#: classes/pref/feeds.php:681
+#: classes/pref/feeds.php:900
 msgid "Hide from Popular feeds"
 msgstr "Ocultar das inscrições populares"
 
-#: classes/pref/feeds.php:691
-#: classes/pref/feeds.php:902
+#: classes/pref/feeds.php:693
+#: classes/pref/feeds.php:906
 msgid "Include in e-mail digest"
 msgstr "Incluir no resumo por e-mail"
 
-#: classes/pref/feeds.php:704
-#: classes/pref/feeds.php:908
+#: classes/pref/feeds.php:706
+#: classes/pref/feeds.php:912
 msgid "Always display image attachments"
 msgstr "Sempre mostrar imagens anexas"
 
-#: classes/pref/feeds.php:717
-#: classes/pref/feeds.php:916
+#: classes/pref/feeds.php:719
+#: classes/pref/feeds.php:920
 msgid "Do not embed images"
 msgstr "Não embutir imagens"
 
-#: classes/pref/feeds.php:730
-#: classes/pref/feeds.php:924
+#: classes/pref/feeds.php:732
+#: classes/pref/feeds.php:928
 msgid "Cache images locally"
 msgstr "Guardar imagens no cache local"
 
-#: classes/pref/feeds.php:742
-#: classes/pref/feeds.php:930
+#: classes/pref/feeds.php:744
+#: classes/pref/feeds.php:934
 msgid "Mark updated articles as unread"
 msgstr "Marcar artigos atualizados como não lidos"
 
-#: classes/pref/feeds.php:746
+#: classes/pref/feeds.php:748
 msgid "Icon"
 msgstr "Ícone"
 
-#: classes/pref/feeds.php:763
+#: classes/pref/feeds.php:765
 msgid "Replace"
 msgstr "Substituir"
 
-#: classes/pref/feeds.php:770
+#: classes/pref/feeds.php:772
 #: classes/pref/prefs.php:706
 msgid "Plugins"
 msgstr ""
 
-#: classes/pref/feeds.php:790
+#: classes/pref/feeds.php:792
 msgid "Resubscribe to push updates"
 msgstr "Reassine para atualizar"
 
-#: classes/pref/feeds.php:797
+#: classes/pref/feeds.php:799
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr ""
 
-#: classes/pref/feeds.php:1203
-#: classes/pref/feeds.php:1256
+#: classes/pref/feeds.php:1207
+#: classes/pref/feeds.php:1260
 msgid "All done."
 msgstr "Completo."
 
-#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1315
 msgid "Feeds with errors"
 msgstr "Inscrições com erro"
 
-#: classes/pref/feeds.php:1318
+#: classes/pref/feeds.php:1322
 msgid "Inactive feeds"
 msgstr "Inscrições inativas"
 
-#: classes/pref/feeds.php:1354
+#: classes/pref/feeds.php:1358
 msgid "Edit selected feeds"
 msgstr "Editar inscrições selecionadas"
 
-#: classes/pref/feeds.php:1356
-#: classes/pref/feeds.php:1370
+#: classes/pref/feeds.php:1360
+#: classes/pref/feeds.php:1374
 #: classes/pref/filters.php:762
 msgid "Reset sort order"
 msgstr "Reiniciar ordenação"
 
-#: classes/pref/feeds.php:1358
+#: classes/pref/feeds.php:1362
 #: js/prefs.js:1737
 msgid "Batch subscribe"
 msgstr "Assinatura em lote"
 
-#: classes/pref/feeds.php:1365
+#: classes/pref/feeds.php:1369
 msgid "Categories"
 msgstr "Categorias"
 
-#: classes/pref/feeds.php:1368
+#: classes/pref/feeds.php:1372
 msgid "Add category"
 msgstr "Adicionar categoria"
 
-#: classes/pref/feeds.php:1372
+#: classes/pref/feeds.php:1376
 msgid "Remove selected"
 msgstr "Remover selecionados"
 
-#: classes/pref/feeds.php:1383
+#: classes/pref/feeds.php:1387
 msgid "More actions..."
 msgstr "Mais ações..."
 
-#: classes/pref/feeds.php:1387
+#: classes/pref/feeds.php:1391
 msgid "Manual purge"
 msgstr "Apagar manualmente"
 
-#: classes/pref/feeds.php:1391
+#: classes/pref/feeds.php:1395
 msgid "Clear feed data"
 msgstr "Limpar dados da inscrição"
 
-#: classes/pref/feeds.php:1392
+#: classes/pref/feeds.php:1396
 #: classes/pref/filters.php:770
 msgid "Rescore articles"
 msgstr "Reclassificar artigos"
 
-#: classes/pref/feeds.php:1444
+#: classes/pref/feeds.php:1448
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1446
+#: classes/pref/feeds.php:1450
 msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
 msgstr "Usando OPML você pode exportar e importar suas assinaturas, filtros, marcadores e configurações do Tiny Tin RSS."
 
-#: classes/pref/feeds.php:1447
+#: classes/pref/feeds.php:1451
 msgid "Only main settings profile can be migrated using OPML."
 msgstr ""
 
-#: classes/pref/feeds.php:1460
+#: classes/pref/feeds.php:1464
 msgid "Import my OPML"
 msgstr "Importar OPML"
 
-#: classes/pref/feeds.php:1466
+#: classes/pref/feeds.php:1470
 msgid "Filename:"
 msgstr "Nome do arquivo:"
 
-#: classes/pref/feeds.php:1468
+#: classes/pref/feeds.php:1472
 msgid "Include settings"
 msgstr "Incluir configurações"
 
-#: classes/pref/feeds.php:1472
+#: classes/pref/feeds.php:1476
 msgid "Export OPML"
 msgstr "Exportar OPML"
 
-#: classes/pref/feeds.php:1476
+#: classes/pref/feeds.php:1480
 msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
 msgstr "Seu  OPML pode ser publicado e assinado por qualquer um que conheça a URL abaixo."
 
-#: classes/pref/feeds.php:1480
+#: classes/pref/feeds.php:1484
 msgid "Public OPML URL"
 msgstr "URL OPML pública"
 
-#: classes/pref/feeds.php:1481
+#: classes/pref/feeds.php:1485
 msgid "Display published OPML URL"
 msgstr "Mostrar a URL OPML publicada"
 
-#: classes/pref/feeds.php:1490
+#: classes/pref/feeds.php:1494
 msgid "Firefox integration"
 msgstr "Integração com o firefox"
 
-#: classes/pref/feeds.php:1492
+#: classes/pref/feeds.php:1496
 msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
 msgstr "Este Tiny Tiny RSS pode ser usado como um leitor de feeds no firefox clicando no link abaixo."
 
-#: classes/pref/feeds.php:1499
+#: classes/pref/feeds.php:1503
 msgid "Click here to register this site as a feed reader."
 msgstr "Clique aqui para registrar esse site com um leitor de feeds."
 
-#: classes/pref/feeds.php:1507
+#: classes/pref/feeds.php:1511
 msgid "Published & shared articles / Generated feeds"
 msgstr "Artigos publicados & compartilhados / Feeds gerados"
 
-#: classes/pref/feeds.php:1509
+#: classes/pref/feeds.php:1513
 msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
 msgstr ""
 
-#: classes/pref/feeds.php:1516
+#: classes/pref/feeds.php:1520
 #: classes/feeds.php:54
 #: classes/feeds.php:134
 msgid "View as RSS"
 msgstr "Ver como RSS"
 
-#: classes/pref/feeds.php:1517
+#: classes/pref/feeds.php:1521
 msgid "Display URL"
 msgstr "Mostrar URL"
 
-#: classes/pref/feeds.php:1520
+#: classes/pref/feeds.php:1524
 msgid "Clear all generated URLs"
 msgstr "Limpar todas as URLs geradas"
 
-#: classes/pref/feeds.php:1598
+#: classes/pref/feeds.php:1602
 msgid "These feeds have not been updated with new content for 3 months (oldest first):"
 msgstr "Estas assinaturas não foram atualizadas a 3 meses (mais antiga primeiro):"
 
-#: classes/pref/feeds.php:1632
-#: classes/pref/feeds.php:1696
+#: classes/pref/feeds.php:1636
+#: classes/pref/feeds.php:1700
 msgid "Click to edit feed"
 msgstr "Clique para editar inscrição"
 
-#: classes/pref/feeds.php:1650
-#: classes/pref/feeds.php:1716
+#: classes/pref/feeds.php:1654
+#: classes/pref/feeds.php:1720
 msgid "Unsubscribe from selected feeds"
 msgstr "Cancelar inscrições selecionadas"
 
-#: classes/pref/feeds.php:1821
+#: classes/pref/feeds.php:1825
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr "Inclua uma assinatura RSS por linha (detecção de feeds não será feita)"
 
-#: classes/pref/feeds.php:1830
+#: classes/pref/feeds.php:1834
 msgid "Feeds to subscribe, One per line"
 msgstr "Feeds para assinar, um por linha"
 
-#: classes/pref/feeds.php:1852
+#: classes/pref/feeds.php:1857
 msgid "Feeds require authentication."
 msgstr "Inscrição requer autenticação."
 
-#: classes/pref/feeds.php:1859
-#: classes/feeds.php:1092
-#: classes/feeds.php:1146
+#: classes/pref/feeds.php:1864
+#: classes/feeds.php:1094
+#: classes/feeds.php:1148
 msgid "Subscribe"
 msgstr "Assinar"
 
@@ -1797,7 +1833,7 @@ msgid "on field"
 msgstr "no campo"
 
 #: classes/pref/filters.php:962
-#: js/PrefFilterTree.js:61
+#: js/PrefFilterTree.js:64
 msgid "in"
 msgstr "em"
 
@@ -2392,40 +2428,40 @@ msgstr "URL do site ou feed"
 msgid "Available feeds"
 msgstr "Feeds disponíveis"
 
-#: classes/feeds.php:1087
+#: classes/feeds.php:1089
 msgid "This feed requires authentication."
 msgstr "Este feed requer autenticação."
 
-#: classes/feeds.php:1095
+#: classes/feeds.php:1097
 msgid "More feeds"
 msgstr "Mais inscrições"
 
-#: classes/feeds.php:1122
+#: classes/feeds.php:1124
 msgid "Popular feeds"
 msgstr "Inscrições populares"
 
-#: classes/feeds.php:1123
+#: classes/feeds.php:1125
 msgid "Feed archive"
 msgstr "Arquivo de inscrições"
 
-#: classes/feeds.php:1126
+#: classes/feeds.php:1128
 msgid "limit:"
 msgstr "limite:"
 
-#: classes/feeds.php:1158
+#: classes/feeds.php:1160
 msgid "Look for"
 msgstr "Procurar por"
 
-#: classes/feeds.php:1166
+#: classes/feeds.php:1168
 #, php-format
 msgid "in %s"
 msgstr ""
 
-#: classes/feeds.php:1171
+#: classes/feeds.php:1173
 msgid "Used for word stemming"
 msgstr ""
 
-#: classes/feeds.php:1180
+#: classes/feeds.php:1182
 #, fuzzy
 msgid "Search syntax"
 msgstr "Pesquisar"
@@ -2690,6 +2726,11 @@ msgstr "Não foi possível ler o documento XML."
 msgid "Prepare data"
 msgstr "Preparar dados"
 
+#: plugins/import_export/init.php:428
+#, fuzzy, php-format
+msgid "Upload failed with error code %d (%s)"
+msgstr "Enviou falhou com o código de erro %d"
+
 #: plugins/import_export/init.php:454
 msgid "No file uploaded."
 msgstr "Nenhum arquivo enviado."
@@ -2800,7 +2841,7 @@ msgstr "Editar categoria"
 msgid "Remove category"
 msgstr "Remover categoria"
 
-#: js/PrefFilterTree.js:64
+#: js/PrefFilterTree.js:67
 msgid "Inverse"
 msgstr "Invertido"
 
@@ -2852,7 +2893,7 @@ msgid "Subscription reset."
 msgstr "Reiniciar assinatura."
 
 #: js/functions.js:1311
-#: js/tt-rss.js:682
+#: js/tt-rss.js:705
 #, perl-format
 msgid "Unsubscribe from %s?"
 msgstr "Cancelar inscrição de %s?"
@@ -3082,40 +3123,40 @@ msgstr "Marcar todos os artigos como lidos?"
 msgid "Marking all feeds as read..."
 msgstr "Marcando todos os feeds como lidos..."
 
-#: js/tt-rss.js:383
+#: js/tt-rss.js:404
 msgid "Please enable mail plugin first."
 msgstr "Por favor habilite o plugin de e-mail."
 
-#: js/tt-rss.js:431
+#: js/tt-rss.js:452
 #: js/functions.js:1643
-#: js/tt-rss.js:663
+#: js/tt-rss.js:686
 msgid "You can't edit this kind of feed."
 msgstr "Você não pode editar esse tipo de feed."
 
-#: js/tt-rss.js:502
+#: js/tt-rss.js:533
 msgid "Please enable embed_original plugin first."
 msgstr "Por favor, habilite o plugin \"embed_original\"."
 
-#: js/tt-rss.js:515
-#: js/tt-rss.js:713
+#: js/tt-rss.js:546
+#: js/tt-rss.js:736
 msgid "Widescreen is not available in combined mode."
 msgstr ""
 
-#: js/tt-rss.js:827
+#: js/tt-rss.js:850
 msgid "You can't rescore this kind of feed."
 msgstr "Você não pode classificar esse tipo de assinatura."
 
-#: js/tt-rss.js:832
-#: js/tt-rss.js:676
+#: js/tt-rss.js:855
+#: js/tt-rss.js:699
 msgid "Please select some feed first."
 msgstr "Por favor selecione alguma inscrição."
 
-#: js/tt-rss.js:837
+#: js/tt-rss.js:860
 #, perl-format
 msgid "Rescore articles in %s?"
 msgstr "Reclassificar artigos em %s?"
 
-#: js/tt-rss.js:840
+#: js/tt-rss.js:863
 msgid "Rescoring articles..."
 msgstr "Reclassificando artigos..."
 
@@ -3294,7 +3335,7 @@ msgstr "Seus dados pessoais foram salvos."
 msgid "Sorry, your browser does not support sandboxed iframes."
 msgstr ""
 
-#: plugins/shorten_expanded/init.js:37
+#: plugins/shorten_expanded/init.js:39
 #, fuzzy
 msgid "Click to expand article"
 msgstr "Favoritos"
@@ -3544,7 +3585,7 @@ msgstr "URLs automaticas limpas."
 msgid "Label Editor"
 msgstr "Editor de marcador"
 
-#: js/tt-rss.js:671
+#: js/tt-rss.js:694
 msgid "You can't unsubscribe from the category."
 msgstr "Você não pode cancelar a inscrição dessa categoria."
 
diff --git a/locale/ru_RU/LC_MESSAGES/messages.mo b/locale/ru_RU/LC_MESSAGES/messages.mo
index 31a81ab84..d211b511e 100644
Binary files a/locale/ru_RU/LC_MESSAGES/messages.mo and b/locale/ru_RU/LC_MESSAGES/messages.mo differ
diff --git a/locale/ru_RU/LC_MESSAGES/messages.po b/locale/ru_RU/LC_MESSAGES/messages.po
index aefa19cba..b3a7d2299 100644
--- a/locale/ru_RU/LC_MESSAGES/messages.po
+++ b/locale/ru_RU/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tt-rss git\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 22:58+0300\n"
+"POT-Creation-Date: 2016-08-19 18:16+0300\n"
 "PO-Revision-Date: 2013-07-16 23:45+0400\n"
 "Last-Translator: cyberbat <cyberbat83@gmail.com>\n"
 "Language-Team: Russian <>\n"
@@ -168,13 +168,13 @@ msgstr "Канал не найден."
 msgid "Plugin not found"
 msgstr "Пользователь не найден"
 
-#: index.php:133
-#: index.php:149
-#: index.php:267
-#: prefs.php:102
+#: index.php:148
+#: index.php:164
+#: index.php:282
+#: prefs.php:117
 #: classes/backend.php:5
 #: classes/pref/labels.php:282
-#: classes/pref/feeds.php:1405
+#: classes/pref/feeds.php:1409
 #: classes/pref/filters.php:779
 #: js/feedlist.js:159
 #: js/functions.js:1293
@@ -186,7 +186,7 @@ msgstr "Пользователь не найден"
 #: js/prefs.js:1781
 #: js/prefs.js:1799
 #: js/tt-rss.js:55
-#: js/tt-rss.js:522
+#: js/tt-rss.js:553
 #: js/viewfeed.js:1298
 #: plugins/import_export/import_export.js:17
 #: js/feedlist.js:484
@@ -199,75 +199,75 @@ msgstr "Пользователь не найден"
 #: js/prefs.js:1556
 #: js/prefs.js:1572
 #: js/prefs.js:1592
-#: js/tt-rss.js:539
+#: js/tt-rss.js:570
 #: js/viewfeed.js:830
 msgid "Loading, please wait..."
 msgstr "Идет загрузка..."
 
-#: index.php:167
+#: index.php:182
 msgid "Collapse feedlist"
 msgstr "Свернуть список каналов"
 
-#: index.php:170
+#: index.php:185
 msgid "Show articles"
 msgstr "Показать статьи"
 
-#: index.php:173
+#: index.php:188
 msgid "Adaptive"
 msgstr "Адаптивно"
 
-#: index.php:174
+#: index.php:189
 msgid "All Articles"
 msgstr "Все статьи"
 
-#: index.php:175
-#: include/functions2.php:101
+#: index.php:190
+#: include/functions2.php:102
 #: classes/feeds.php:104
 msgid "Starred"
 msgstr "Отмеченные"
 
-#: index.php:176
-#: include/functions2.php:102
+#: index.php:191
+#: include/functions2.php:103
 #: classes/feeds.php:105
 msgid "Published"
 msgstr "Опубликован"
 
-#: index.php:177
+#: index.php:192
 #: classes/feeds.php:91
 #: classes/feeds.php:103
 msgid "Unread"
 msgstr "Новые"
 
-#: index.php:178
+#: index.php:193
 msgid "With Note"
 msgstr "С заметкой"
 
-#: index.php:179
+#: index.php:194
 msgid "Ignore Scoring"
 msgstr "Игнорировать Оценки"
 
-#: index.php:182
+#: index.php:197
 msgid "Sort articles"
 msgstr "Сортировать статьи"
 
-#: index.php:185
+#: index.php:200
 msgid "Default"
 msgstr "По умолчанию"
 
-#: index.php:186
+#: index.php:201
 msgid "Newest first"
 msgstr "Сначала новые"
 
-#: index.php:187
+#: index.php:202
 msgid "Oldest first"
 msgstr "Сначала старые"
 
-#: index.php:188
+#: index.php:203
 msgid "Title"
 msgstr "Заголовок"
 
-#: index.php:192
-#: index.php:233
+#: index.php:207
+#: index.php:248
 #: include/functions2.php:90
 #: classes/feeds.php:109
 #: js/FeedTree.js:132
@@ -275,134 +275,134 @@ msgstr "Заголовок"
 msgid "Mark as read"
 msgstr "Как прочитанные"
 
-#: index.php:195
+#: index.php:210
 msgid "Older than one day"
 msgstr "Старше одного дня"
 
-#: index.php:198
+#: index.php:213
 msgid "Older than one week"
 msgstr "Старше одной недели"
 
-#: index.php:201
+#: index.php:216
 msgid "Older than two weeks"
 msgstr "Старше двух недель"
 
-#: index.php:217
+#: index.php:232
 msgid "Communication problem with server."
 msgstr "Проблема соединения с сервером"
 
-#: index.php:223
+#: index.php:238
 msgid "Actions..."
 msgstr "Действия..."
 
-#: index.php:225
+#: index.php:240
 msgid "Preferences..."
 msgstr "Настройки"
 
-#: index.php:226
+#: index.php:241
 msgid "Search..."
 msgstr "Поиск..."
 
-#: index.php:227
+#: index.php:242
 msgid "Feed actions:"
 msgstr "Действия над каналами:"
 
-#: index.php:228
+#: index.php:243
 #: classes/handler/public.php:672
 msgid "Subscribe to feed..."
 msgstr "Подписаться на канал..."
 
-#: index.php:229
+#: index.php:244
 msgid "Edit this feed..."
 msgstr "Редактировать канал..."
 
-#: index.php:230
+#: index.php:245
 msgid "Rescore feed"
 msgstr "Заново оценить канал"
 
-#: index.php:231
-#: classes/pref/feeds.php:783
-#: classes/pref/feeds.php:1360
+#: index.php:246
+#: classes/pref/feeds.php:785
+#: classes/pref/feeds.php:1364
 #: js/PrefFeedTree.js:74
 msgid "Unsubscribe"
 msgstr "Отписаться"
 
-#: index.php:232
+#: index.php:247
 msgid "All feeds:"
 msgstr "Все каналы:"
 
-#: index.php:234
+#: index.php:249
 msgid "(Un)hide read feeds"
 msgstr "Показать/скрыть прочитанные"
 
-#: index.php:235
+#: index.php:250
 msgid "Other actions:"
 msgstr "Другие действия:"
 
-#: index.php:236
+#: index.php:251
 #: include/functions2.php:76
 msgid "Toggle widescreen mode"
 msgstr "Переключить широкоэкранный режим"
 
-#: index.php:237
+#: index.php:252
 msgid "Create label..."
 msgstr "Создать метку..."
 
-#: index.php:238
+#: index.php:253
 msgid "Create filter..."
 msgstr "Создать фильтр..."
 
-#: index.php:239
+#: index.php:254
 msgid "Keyboard shortcuts help"
 msgstr "Горячие клавиши"
 
-#: index.php:248
+#: index.php:263
 msgid "Logout"
 msgstr "Выход"
 
-#: index.php:254
+#: index.php:269
 msgid "Updates are available from Git."
 msgstr ""
 
 #: prefs.php:33
-#: prefs.php:120
-#: include/functions2.php:104
+#: prefs.php:135
+#: include/functions2.php:105
 #: classes/pref/prefs.php:435
 msgid "Preferences"
 msgstr "Настройки"
 
-#: prefs.php:111
+#: prefs.php:126
 msgid "Keyboard shortcuts"
 msgstr "Горячие Клавиши"
 
-#: prefs.php:112
+#: prefs.php:127
 msgid "Exit preferences"
 msgstr "Закрыть настройки"
 
-#: prefs.php:123
+#: prefs.php:138
 #: classes/pref/feeds.php:112
-#: classes/pref/feeds.php:1300
-#: classes/pref/feeds.php:1349
+#: classes/pref/feeds.php:1304
+#: classes/pref/feeds.php:1353
 msgid "Feeds"
 msgstr "Каналы"
 
-#: prefs.php:126
+#: prefs.php:141
 #: classes/pref/filters.php:248
 msgid "Filters"
 msgstr "Фильтры"
 
-#: prefs.php:129
-#: include/functions.php:1256
-#: include/functions.php:1909
+#: prefs.php:144
+#: include/functions.php:1287
+#: include/functions.php:1940
 #: classes/pref/labels.php:90
 msgid "Labels"
 msgstr "Метки"
 
-#: prefs.php:133
+#: prefs.php:148
 msgid "Users"
 msgstr "Пользователи"
 
-#: prefs.php:136
+#: prefs.php:151
 msgid "System"
 msgstr "Система"
 
@@ -484,10 +484,10 @@ msgid "Tiny Tiny RSS data update script."
 msgstr "Скрипт обновления данных Tiny Tiny RSS"
 
 #: include/digest.php:109
-#: include/functions.php:1265
-#: include/functions.php:1810
-#: include/functions.php:1895
-#: include/functions.php:1917
+#: include/functions.php:1296
+#: include/functions.php:1841
+#: include/functions.php:1926
+#: include/functions.php:1948
 #: classes/opml.php:421
 #: classes/pref/feeds.php:228
 msgid "Uncategorized"
@@ -505,44 +505,44 @@ msgstr[2] "%d архивных статей"
 msgid "No feeds found."
 msgstr "Каналы не найдены."
 
-#: include/functions.php:958
+#: include/functions.php:989
 #, php-format
 msgid "%d min"
 msgstr ""
 
-#: include/functions.php:1254
-#: include/functions.php:1907
+#: include/functions.php:1285
+#: include/functions.php:1938
 msgid "Special"
 msgstr "Особые"
 
-#: include/functions.php:1758
+#: include/functions.php:1789
 #: classes/pref/filters.php:229
 #: classes/pref/filters.php:507
 msgid "All feeds"
 msgstr "Все каналы"
 
-#: include/functions.php:1962
+#: include/functions.php:1993
 msgid "Starred articles"
 msgstr "Отмеченные"
 
-#: include/functions.php:1964
+#: include/functions.php:1995
 msgid "Published articles"
 msgstr "Опубликованные"
 
-#: include/functions.php:1966
+#: include/functions.php:1997
 msgid "Fresh articles"
 msgstr "Свежие"
 
-#: include/functions.php:1968
-#: include/functions2.php:99
+#: include/functions.php:1999
+#: include/functions2.php:100
 msgid "All articles"
 msgstr "Все статьи"
 
-#: include/functions.php:1970
+#: include/functions.php:2001
 msgid "Archived articles"
 msgstr "Архив статей"
 
-#: include/functions.php:1972
+#: include/functions.php:2003
 msgid "Recently read"
 msgstr "Недавно прочитанные"
 
@@ -682,7 +682,7 @@ msgstr "Снять выделение"
 
 #: include/functions2.php:85
 #: classes/pref/feeds.php:555
-#: classes/pref/feeds.php:821
+#: classes/pref/feeds.php:823
 msgid "Feed"
 msgstr "Канал"
 
@@ -695,7 +695,7 @@ msgid "Un/hide read feeds"
 msgstr "Показать/скрыть прочитанные"
 
 #: include/functions2.php:88
-#: classes/pref/feeds.php:1352
+#: classes/pref/feeds.php:1356
 msgid "Subscribe to feed"
 msgstr "Подписаться на канал"
 
@@ -711,73 +711,77 @@ msgid "Reverse headlines"
 msgstr "Обратный порядок заголовков"
 
 #: include/functions2.php:92
+msgid "Toggle headline grouping"
+msgstr ""
+
+#: include/functions2.php:93
 msgid "Debug feed update"
 msgstr "Отлаживать обновление канала"
 
-#: include/functions2.php:93
+#: include/functions2.php:94
 #, fuzzy
 msgid "Debug viewfeed()"
 msgstr "Отлаживать обновление канала"
 
-#: include/functions2.php:94
+#: include/functions2.php:95
 #: js/FeedTree.js:182
 msgid "Mark all feeds as read"
 msgstr "Отметить все каналы как прочитанные"
 
-#: include/functions2.php:95
+#: include/functions2.php:96
 msgid "Un/collapse current category"
 msgstr "Свернуть/развернуть категорию"
 
-#: include/functions2.php:96
+#: include/functions2.php:97
 msgid "Toggle combined mode"
 msgstr "Переключить комбинированный режим"
 
-#: include/functions2.php:97
+#: include/functions2.php:98
 msgid "Toggle auto expand in combined mode"
 msgstr "Переключить автоматическое разворачивание в комбинированном режиме"
 
-#: include/functions2.php:98
+#: include/functions2.php:99
 msgid "Go to"
 msgstr "Перейти к.."
 
-#: include/functions2.php:100
+#: include/functions2.php:101
 msgid "Fresh"
 msgstr "Свежие"
 
-#: include/functions2.php:103
-#: js/tt-rss.js:466
-#: js/tt-rss.js:650
+#: include/functions2.php:104
+#: js/tt-rss.js:497
+#: js/tt-rss.js:673
 msgid "Tag cloud"
 msgstr "Облако тегов"
 
-#: include/functions2.php:105
+#: include/functions2.php:106
 msgid "Other"
 msgstr "Другой"
 
-#: include/functions2.php:106
+#: include/functions2.php:107
 #: classes/pref/labels.php:267
 msgid "Create label"
 msgstr "Создать метку"
 
-#: include/functions2.php:107
+#: include/functions2.php:108
 #: classes/pref/filters.php:753
 msgid "Create filter"
 msgstr "Создать фильтр"
 
-#: include/functions2.php:108
+#: include/functions2.php:109
 msgid "Un/collapse sidebar"
 msgstr "Свернуть/развернуть боковую панель"
 
-#: include/functions2.php:109
+#: include/functions2.php:110
 msgid "Show help dialog"
 msgstr "Показать диалог помощи"
 
-#: include/functions2.php:663
+#: include/functions2.php:665
 #, php-format
 msgid "Search results: %s"
 msgstr "Результаты поиска: %s"
 
-#: include/functions2.php:1317
+#: include/functions2.php:1330
 #: classes/feeds.php:749
 msgid "comment"
 msgid_plural "comments"
@@ -785,67 +789,100 @@ msgstr[0] "комментарий"
 msgstr[1] "комментария"
 msgstr[2] "комментариев"
 
-#: include/functions2.php:1321
+#: include/functions2.php:1334
 #: classes/feeds.php:753
 msgid "comments"
 msgstr "комментарии"
 
-#: include/functions2.php:1347
+#: include/functions2.php:1360
 msgid " - "
 msgstr " - "
 
-#: include/functions2.php:1380
-#: include/functions2.php:1631
+#: include/functions2.php:1393
+#: include/functions2.php:1644
 #: classes/article.php:311
 msgid "no tags"
 msgstr "нет тегов"
 
-#: include/functions2.php:1390
+#: include/functions2.php:1403
 #: classes/feeds.php:735
 msgid "Edit tags for this article"
 msgstr "Редактировать теги статьи"
 
-#: include/functions2.php:1422
+#: include/functions2.php:1435
 #: classes/feeds.php:682
 msgid "Originally from:"
 msgstr "Оригинал:"
 
-#: include/functions2.php:1435
+#: include/functions2.php:1448
 #: classes/pref/feeds.php:574
 #: classes/feeds.php:695
 msgid "Feed URL"
 msgstr "URL канала"
 
-#: include/functions2.php:1472
+#: include/functions2.php:1485
 #: classes/backend.php:105
 #: classes/dlg.php:37
 #: classes/dlg.php:60
 #: classes/dlg.php:93
 #: classes/dlg.php:159
 #: classes/dlg.php:186
-#: classes/pref/feeds.php:1654
-#: classes/pref/feeds.php:1720
+#: classes/pref/feeds.php:1658
+#: classes/pref/feeds.php:1724
 #: classes/pref/filters.php:204
 #: classes/pref/prefs.php:1105
 #: plugins/af_psql_trgm/init.php:102
 #: plugins/import_export/init.php:415
-#: plugins/import_export/init.php:460
+#: plugins/import_export/init.php:461
 #: plugins/share/init.php:121
 msgid "Close this window"
 msgstr "Закрыть это окно"
 
-#: include/functions2.php:1669
+#: include/functions2.php:1682
 msgid "(edit note)"
 msgstr "(править заметку)"
 
-#: include/functions2.php:1924
+#: include/functions2.php:1937
 msgid "unknown type"
 msgstr "неизвестный тип"
 
-#: include/functions2.php:2001
+#: include/functions2.php:2014
 msgid "Attachments"
 msgstr "Вложения"
 
+#: include/functions2.php:2456
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: include/functions2.php:2457
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr ""
+
+#: include/functions2.php:2458
+msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
+msgstr ""
+
+#: include/functions2.php:2459
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: include/functions2.php:2460
+#, fuzzy
+msgid "No file was uploaded"
+msgstr "Ни одного файла не загружено."
+
+#: include/functions2.php:2461
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: include/functions2.php:2462
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: include/functions2.php:2463
+msgid "A PHP extension stopped the file upload."
+msgstr ""
+
 #: include/login_form.php:197
 #: classes/handler/public.php:569
 #: classes/handler/public.php:824
@@ -912,8 +949,8 @@ msgstr "Теги для этой статьи (разделенные запят
 #: classes/article.php:222
 #: classes/pref/labels.php:79
 #: classes/pref/users.php:98
-#: classes/pref/feeds.php:799
-#: classes/pref/feeds.php:939
+#: classes/pref/feeds.php:801
+#: classes/pref/feeds.php:943
 #: classes/pref/filters.php:485
 #: classes/pref/prefs.php:989
 #: plugins/instances/init.php:245
@@ -931,17 +968,17 @@ msgstr "Сохранить"
 #: classes/handler/public.php:580
 #: classes/pref/labels.php:81
 #: classes/pref/users.php:100
-#: classes/pref/feeds.php:800
-#: classes/pref/feeds.php:942
-#: classes/pref/feeds.php:1860
+#: classes/pref/feeds.php:802
+#: classes/pref/feeds.php:946
+#: classes/pref/feeds.php:1865
 #: classes/pref/filters.php:488
 #: classes/pref/filters.php:902
 #: classes/pref/filters.php:983
 #: classes/pref/filters.php:1076
 #: classes/pref/prefs.php:991
-#: classes/feeds.php:1098
-#: classes/feeds.php:1148
-#: classes/feeds.php:1185
+#: classes/feeds.php:1100
+#: classes/feeds.php:1150
+#: classes/feeds.php:1187
 #: plugins/instances/init.php:248
 #: plugins/instances/init.php:436
 #: plugins/note/init.php:53
@@ -997,7 +1034,6 @@ msgid "Processing category: %s"
 msgstr "Обрабатываю категорию: %s"
 
 #: classes/opml.php:470
-#: plugins/import_export/init.php:428
 #, php-format
 msgid "Upload failed with error code %d"
 msgstr "Ошибка загрузки, код ошибки: %d"
@@ -1220,9 +1256,9 @@ msgstr "Добавлена метка <b>%s</b>"
 
 #: classes/pref/labels.php:258
 #: classes/pref/users.php:334
-#: classes/pref/feeds.php:1340
-#: classes/pref/feeds.php:1602
-#: classes/pref/feeds.php:1666
+#: classes/pref/feeds.php:1344
+#: classes/pref/feeds.php:1606
+#: classes/pref/feeds.php:1670
 #: classes/pref/filters.php:359
 #: classes/pref/filters.php:407
 #: classes/pref/filters.php:744
@@ -1235,9 +1271,9 @@ msgstr "Выбрать"
 
 #: classes/pref/labels.php:261
 #: classes/pref/users.php:337
-#: classes/pref/feeds.php:1343
-#: classes/pref/feeds.php:1605
-#: classes/pref/feeds.php:1669
+#: classes/pref/feeds.php:1347
+#: classes/pref/feeds.php:1609
+#: classes/pref/feeds.php:1673
 #: classes/pref/filters.php:362
 #: classes/pref/filters.php:410
 #: classes/pref/filters.php:747
@@ -1251,9 +1287,9 @@ msgstr "Все"
 
 #: classes/pref/labels.php:263
 #: classes/pref/users.php:339
-#: classes/pref/feeds.php:1345
-#: classes/pref/feeds.php:1607
-#: classes/pref/feeds.php:1671
+#: classes/pref/feeds.php:1349
+#: classes/pref/feeds.php:1611
+#: classes/pref/feeds.php:1675
 #: classes/pref/filters.php:364
 #: classes/pref/filters.php:412
 #: classes/pref/filters.php:749
@@ -1267,10 +1303,10 @@ msgstr "Ничего"
 
 #: classes/pref/labels.php:270
 #: classes/pref/users.php:348
-#: classes/pref/feeds.php:765
+#: classes/pref/feeds.php:767
 #: classes/pref/filters.php:478
 #: classes/pref/filters.php:766
-#: classes/feeds.php:1147
+#: classes/feeds.php:1149
 #: plugins/instances/init.php:294
 msgid "Remove"
 msgstr "Удалить"
@@ -1292,7 +1328,7 @@ msgstr "Редактировать правило"
 
 #: classes/pref/users.php:56
 #: classes/pref/feeds.php:637
-#: classes/pref/feeds.php:876
+#: classes/pref/feeds.php:878
 #: classes/feeds.php:1070
 msgid "Authentication"
 msgstr "Авторизация"
@@ -1302,8 +1338,8 @@ msgid "Access level: "
 msgstr "Уровень доступа:"
 
 #: classes/pref/users.php:77
-#: classes/pref/feeds.php:665
-#: classes/pref/feeds.php:892
+#: classes/pref/feeds.php:667
+#: classes/pref/feeds.php:896
 msgid "Options"
 msgstr "Опции:"
 
@@ -1369,10 +1405,10 @@ msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] Уведомление о смене пароля"
 
 #: classes/pref/users.php:324
-#: classes/pref/feeds.php:1336
+#: classes/pref/feeds.php:1340
 #: classes/pref/filters.php:740
-#: classes/feeds.php:1118
-#: classes/feeds.php:1184
+#: classes/feeds.php:1120
+#: classes/feeds.php:1186
 #: js/tt-rss.js:174
 msgid "Search"
 msgstr "Поиск"
@@ -1389,8 +1425,8 @@ msgstr "Редактировать"
 
 #: classes/pref/users.php:397
 #: classes/pref/feeds.php:643
-#: classes/pref/feeds.php:880
-#: classes/pref/feeds.php:1838
+#: classes/pref/feeds.php:882
+#: classes/pref/feeds.php:1842
 #: classes/feeds.php:1074
 msgid "Login"
 msgstr "Пользователь:"
@@ -1470,251 +1506,251 @@ msgid "Feed Title"
 msgstr "Заголовок"
 
 #: classes/pref/feeds.php:595
-#: classes/pref/feeds.php:828
-#: classes/pref/feeds.php:1824
+#: classes/pref/feeds.php:830
+#: classes/pref/feeds.php:1828
 #: classes/feeds.php:1050
 msgid "Place in category:"
 msgstr "Поместить в категорию:"
 
 #: classes/pref/feeds.php:608
-#: classes/pref/feeds.php:842
+#: classes/pref/feeds.php:844
 #, fuzzy
 msgid "Language:"
 msgstr "Язык"
 
 #: classes/pref/feeds.php:615
-#: classes/pref/feeds.php:851
+#: classes/pref/feeds.php:853
 msgid "Update"
 msgstr "Обновить"
 
 #: classes/pref/feeds.php:630
-#: classes/pref/feeds.php:867
+#: classes/pref/feeds.php:869
 msgid "Article purging:"
 msgstr "Удаление сообщений:"
 
-#: classes/pref/feeds.php:656
-#: classes/pref/feeds.php:886
-#: classes/pref/feeds.php:1841
+#: classes/pref/feeds.php:658
+#: classes/pref/feeds.php:890
+#: classes/pref/feeds.php:1845
 #: classes/pref/prefs.php:245
-#: classes/feeds.php:1077
+#: classes/feeds.php:1078
 msgid "Password"
 msgstr "Пароль"
 
-#: classes/pref/feeds.php:660
+#: classes/pref/feeds.php:662
 msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
 msgstr "<b>Подсказка:</b> Вам потребуется задать Ваши учетные данные, если канал требует авторизацию, за исключением каналов в Twitter."
 
-#: classes/pref/feeds.php:679
-#: classes/pref/feeds.php:896
+#: classes/pref/feeds.php:681
+#: classes/pref/feeds.php:900
 msgid "Hide from Popular feeds"
 msgstr "Спрятать из списка популярных каналов"
 
-#: classes/pref/feeds.php:691
-#: classes/pref/feeds.php:902
+#: classes/pref/feeds.php:693
+#: classes/pref/feeds.php:906
 msgid "Include in e-mail digest"
 msgstr "Включить в e-mail дайджест"
 
-#: classes/pref/feeds.php:704
-#: classes/pref/feeds.php:908
+#: classes/pref/feeds.php:706
+#: classes/pref/feeds.php:912
 msgid "Always display image attachments"
 msgstr "Всегда показывать вложенные изображения"
 
-#: classes/pref/feeds.php:717
-#: classes/pref/feeds.php:916
+#: classes/pref/feeds.php:719
+#: classes/pref/feeds.php:920
 msgid "Do not embed images"
 msgstr "Не показывать изображения"
 
-#: classes/pref/feeds.php:730
-#: classes/pref/feeds.php:924
+#: classes/pref/feeds.php:732
+#: classes/pref/feeds.php:928
 msgid "Cache images locally"
 msgstr "Кэшировать изображения локально"
 
-#: classes/pref/feeds.php:742
-#: classes/pref/feeds.php:930
+#: classes/pref/feeds.php:744
+#: classes/pref/feeds.php:934
 msgid "Mark updated articles as unread"
 msgstr "Пометить все статьи как прочитанные?"
 
-#: classes/pref/feeds.php:746
+#: classes/pref/feeds.php:748
 msgid "Icon"
 msgstr "Иконка"
 
-#: classes/pref/feeds.php:763
+#: classes/pref/feeds.php:765
 msgid "Replace"
 msgstr "Заменить"
 
-#: classes/pref/feeds.php:770
+#: classes/pref/feeds.php:772
 #: classes/pref/prefs.php:706
 msgid "Plugins"
 msgstr "Плагины"
 
-#: classes/pref/feeds.php:790
+#: classes/pref/feeds.php:792
 msgid "Resubscribe to push updates"
 msgstr "Переподписаться на PUSH обновления"
 
-#: classes/pref/feeds.php:797
+#: classes/pref/feeds.php:799
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr "Сбрасывает статусподписки с помощью механизма PubSubHubbub"
 
-#: classes/pref/feeds.php:1203
-#: classes/pref/feeds.php:1256
+#: classes/pref/feeds.php:1207
+#: classes/pref/feeds.php:1260
 msgid "All done."
 msgstr "Всё выполнено."
 
-#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1315
 msgid "Feeds with errors"
 msgstr "Каналы с ошибками"
 
-#: classes/pref/feeds.php:1318
+#: classes/pref/feeds.php:1322
 msgid "Inactive feeds"
 msgstr "Неактивные каналы"
 
-#: classes/pref/feeds.php:1354
+#: classes/pref/feeds.php:1358
 msgid "Edit selected feeds"
 msgstr "Редактировать выбранные каналы"
 
-#: classes/pref/feeds.php:1356
-#: classes/pref/feeds.php:1370
+#: classes/pref/feeds.php:1360
+#: classes/pref/feeds.php:1374
 #: classes/pref/filters.php:762
 msgid "Reset sort order"
 msgstr "Сбросить сортировку"
 
-#: classes/pref/feeds.php:1358
+#: classes/pref/feeds.php:1362
 #: js/prefs.js:1737
 msgid "Batch subscribe"
 msgstr "Массовая подписка"
 
-#: classes/pref/feeds.php:1365
+#: classes/pref/feeds.php:1369
 msgid "Categories"
 msgstr "Категории"
 
-#: classes/pref/feeds.php:1368
+#: classes/pref/feeds.php:1372
 msgid "Add category"
 msgstr "Добавить категорию"
 
-#: classes/pref/feeds.php:1372
+#: classes/pref/feeds.php:1376
 msgid "Remove selected"
 msgstr "Удалить выбранное"
 
-#: classes/pref/feeds.php:1383
+#: classes/pref/feeds.php:1387
 msgid "More actions..."
 msgstr "Действия..."
 
-#: classes/pref/feeds.php:1387
+#: classes/pref/feeds.php:1391
 msgid "Manual purge"
 msgstr "Ручная очистка"
 
-#: classes/pref/feeds.php:1391
+#: classes/pref/feeds.php:1395
 msgid "Clear feed data"
 msgstr "Очистить данные канала."
 
-#: classes/pref/feeds.php:1392
+#: classes/pref/feeds.php:1396
 #: classes/pref/filters.php:770
 msgid "Rescore articles"
 msgstr "Заново оценить статьи"
 
-#: classes/pref/feeds.php:1444
+#: classes/pref/feeds.php:1448
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1446
+#: classes/pref/feeds.php:1450
 msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
 msgstr "Используя OPML Вы можете экспортировать и импортировать Ваши каналы, фильтры, метки и настройки Tiny Tiny RSS."
 
-#: classes/pref/feeds.php:1447
+#: classes/pref/feeds.php:1451
 msgid "Only main settings profile can be migrated using OPML."
 msgstr "Только главный профиль настроек будет экспортирован в OPML."
 
-#: classes/pref/feeds.php:1460
+#: classes/pref/feeds.php:1464
 msgid "Import my OPML"
 msgstr "Импортировать мой OPML"
 
-#: classes/pref/feeds.php:1466
+#: classes/pref/feeds.php:1470
 msgid "Filename:"
 msgstr "Имя файла:"
 
-#: classes/pref/feeds.php:1468
+#: classes/pref/feeds.php:1472
 msgid "Include settings"
 msgstr "Включить настройки"
 
-#: classes/pref/feeds.php:1472
+#: classes/pref/feeds.php:1476
 msgid "Export OPML"
 msgstr "Экспортировать OPML"
 
-#: classes/pref/feeds.php:1476
+#: classes/pref/feeds.php:1480
 msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
 msgstr "Ваш OPML может быть опубликован и на него могут подписаться те, кто знает URL, указанный ниже."
 
-#: classes/pref/feeds.php:1480
+#: classes/pref/feeds.php:1484
 msgid "Public OPML URL"
 msgstr "Публичная ссылка на OPML"
 
-#: classes/pref/feeds.php:1481
+#: classes/pref/feeds.php:1485
 msgid "Display published OPML URL"
 msgstr "Отобразить публичный OPML URL"
 
-#: classes/pref/feeds.php:1490
+#: classes/pref/feeds.php:1494
 msgid "Firefox integration"
 msgstr "Интеграция в Firefox"
 
-#: classes/pref/feeds.php:1492
+#: classes/pref/feeds.php:1496
 msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
 msgstr "Этот сайт с Tiny Tiny RSS можно использовать в Firefox как агрегатор RSS. Для этого щёлкните по ссылке ниже."
 
-#: classes/pref/feeds.php:1499
+#: classes/pref/feeds.php:1503
 msgid "Click here to register this site as a feed reader."
 msgstr "Щёлкните здесь для регистрации сайта в роли RSS агрегатора"
 
-#: classes/pref/feeds.php:1507
+#: classes/pref/feeds.php:1511
 msgid "Published & shared articles / Generated feeds"
 msgstr "Опубликованные & общие каналы / Автоматически созданные каналы"
 
-#: classes/pref/feeds.php:1509
+#: classes/pref/feeds.php:1513
 msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
 msgstr "Опубликованные статьи экспортируется в качестве общего RSS канала и могут быть подписаны кем-либо ещё, кто знает URL, указанный ниже."
 
-#: classes/pref/feeds.php:1516
+#: classes/pref/feeds.php:1520
 #: classes/feeds.php:54
 #: classes/feeds.php:134
 msgid "View as RSS"
 msgstr "Показать в формате RSS"
 
-#: classes/pref/feeds.php:1517
+#: classes/pref/feeds.php:1521
 msgid "Display URL"
 msgstr "Показать URL"
 
-#: classes/pref/feeds.php:1520
+#: classes/pref/feeds.php:1524
 msgid "Clear all generated URLs"
 msgstr "Очистить все созданные URL"
 
-#: classes/pref/feeds.php:1598
+#: classes/pref/feeds.php:1602
 msgid "These feeds have not been updated with new content for 3 months (oldest first):"
 msgstr "Эти каналы не были обновлены в течение трех месяцев:"
 
-#: classes/pref/feeds.php:1632
-#: classes/pref/feeds.php:1696
+#: classes/pref/feeds.php:1636
+#: classes/pref/feeds.php:1700
 msgid "Click to edit feed"
 msgstr "Щёлкните для редактирования"
 
-#: classes/pref/feeds.php:1650
-#: classes/pref/feeds.php:1716
+#: classes/pref/feeds.php:1654
+#: classes/pref/feeds.php:1720
 msgid "Unsubscribe from selected feeds"
 msgstr "Отписаться от выбранных каналов?"
 
-#: classes/pref/feeds.php:1821
+#: classes/pref/feeds.php:1825
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr "Впишите по одному действительному RSS каналу на строчку (валидность канала не проверяется)"
 
-#: classes/pref/feeds.php:1830
+#: classes/pref/feeds.php:1834
 msgid "Feeds to subscribe, One per line"
 msgstr "Каналы для подписки. По одному на строчку"
 
-#: classes/pref/feeds.php:1852
+#: classes/pref/feeds.php:1857
 msgid "Feeds require authentication."
 msgstr "Каналы требуют авторизацию."
 
-#: classes/pref/feeds.php:1859
-#: classes/feeds.php:1092
-#: classes/feeds.php:1146
+#: classes/pref/feeds.php:1864
+#: classes/feeds.php:1094
+#: classes/feeds.php:1148
 msgid "Subscribe"
 msgstr "Подписаться"
 
@@ -1797,7 +1833,7 @@ msgid "on field"
 msgstr "по полю:"
 
 #: classes/pref/filters.php:962
-#: js/PrefFilterTree.js:61
+#: js/PrefFilterTree.js:64
 msgid "in"
 msgstr "в"
 
@@ -2392,40 +2428,40 @@ msgstr "Канал или URL сайта"
 msgid "Available feeds"
 msgstr "Доступные каналы"
 
-#: classes/feeds.php:1087
+#: classes/feeds.php:1089
 msgid "This feed requires authentication."
 msgstr "Этот канал требует авторизации."
 
-#: classes/feeds.php:1095
+#: classes/feeds.php:1097
 msgid "More feeds"
 msgstr "Другие каналы"
 
-#: classes/feeds.php:1122
+#: classes/feeds.php:1124
 msgid "Popular feeds"
 msgstr "Популярные каналы"
 
-#: classes/feeds.php:1123
+#: classes/feeds.php:1125
 msgid "Feed archive"
 msgstr "Архив канала"
 
-#: classes/feeds.php:1126
+#: classes/feeds.php:1128
 msgid "limit:"
 msgstr "Ограничение:"
 
-#: classes/feeds.php:1158
+#: classes/feeds.php:1160
 msgid "Look for"
 msgstr "Искать"
 
-#: classes/feeds.php:1166
+#: classes/feeds.php:1168
 #, php-format
 msgid "in %s"
 msgstr ""
 
-#: classes/feeds.php:1171
+#: classes/feeds.php:1173
 msgid "Used for word stemming"
 msgstr ""
 
-#: classes/feeds.php:1180
+#: classes/feeds.php:1182
 msgid "Search syntax"
 msgstr "Искать метку"
 
@@ -2688,6 +2724,11 @@ msgstr "Не могу загрузить XML документ."
 msgid "Prepare data"
 msgstr "Подготовить данные"
 
+#: plugins/import_export/init.php:428
+#, fuzzy, php-format
+msgid "Upload failed with error code %d (%s)"
+msgstr "Ошибка загрузки, код ошибки: %d"
+
 #: plugins/import_export/init.php:454
 msgid "No file uploaded."
 msgstr "Ни одного файла не загружено."
@@ -2797,7 +2838,7 @@ msgstr "Редактировать категорию"
 msgid "Remove category"
 msgstr "Удалить категорию"
 
-#: js/PrefFilterTree.js:64
+#: js/PrefFilterTree.js:67
 msgid "Inverse"
 msgstr "(Инвертировать)"
 
@@ -2848,7 +2889,7 @@ msgid "Subscription reset."
 msgstr "Подписка перезагружена."
 
 #: js/functions.js:1311
-#: js/tt-rss.js:682
+#: js/tt-rss.js:705
 #, perl-format
 msgid "Unsubscribe from %s?"
 msgstr "Отписаться от %s?"
@@ -3078,40 +3119,40 @@ msgstr "Пометить все статьи как прочитанные?"
 msgid "Marking all feeds as read..."
 msgstr "Помечаю все каналы как прочитанные..."
 
-#: js/tt-rss.js:383
+#: js/tt-rss.js:404
 msgid "Please enable mail plugin first."
 msgstr "Пожалуйста, сначала включите плагин mail."
 
-#: js/tt-rss.js:431
+#: js/tt-rss.js:452
 #: js/functions.js:1643
-#: js/tt-rss.js:663
+#: js/tt-rss.js:686
 msgid "You can't edit this kind of feed."
 msgstr "Вы не можете редактировать этот канал."
 
-#: js/tt-rss.js:502
+#: js/tt-rss.js:533
 msgid "Please enable embed_original plugin first."
 msgstr "Пожалуйста, сначала включите плагин embed_original."
 
-#: js/tt-rss.js:515
-#: js/tt-rss.js:713
+#: js/tt-rss.js:546
+#: js/tt-rss.js:736
 msgid "Widescreen is not available in combined mode."
 msgstr ""
 
-#: js/tt-rss.js:827
+#: js/tt-rss.js:850
 msgid "You can't rescore this kind of feed."
 msgstr "Вы не можете снова оценить этот канал."
 
-#: js/tt-rss.js:832
-#: js/tt-rss.js:676
+#: js/tt-rss.js:855
+#: js/tt-rss.js:699
 msgid "Please select some feed first."
 msgstr "Пожалуйста выберите какой-нибудь канал."
 
-#: js/tt-rss.js:837
+#: js/tt-rss.js:860
 #, perl-format
 msgid "Rescore articles in %s?"
 msgstr "Установить оценку статьям в %s?"
 
-#: js/tt-rss.js:840
+#: js/tt-rss.js:863
 msgid "Rescoring articles..."
 msgstr "Переоценка статей..."
 
@@ -3291,7 +3332,7 @@ msgstr "Ваше сообщение было отправлено."
 msgid "Sorry, your browser does not support sandboxed iframes."
 msgstr "Извините, Ваш броузер не поддерживает sandboxed iframes."
 
-#: plugins/shorten_expanded/init.js:37
+#: plugins/shorten_expanded/init.js:39
 msgid "Click to expand article"
 msgstr "Щёлкните чтобы развернуть статью"
 
@@ -3539,7 +3580,7 @@ msgstr "Созданные URL очищены."
 msgid "Label Editor"
 msgstr "Редактор Меток"
 
-#: js/tt-rss.js:671
+#: js/tt-rss.js:694
 msgid "You can't unsubscribe from the category."
 msgstr "Нельзя отписаться от категории."
 
diff --git a/locale/sv_SE/LC_MESSAGES/messages.mo b/locale/sv_SE/LC_MESSAGES/messages.mo
index 6dbe90edb..beb2ddbef 100644
Binary files a/locale/sv_SE/LC_MESSAGES/messages.mo and b/locale/sv_SE/LC_MESSAGES/messages.mo differ
diff --git a/locale/sv_SE/LC_MESSAGES/messages.po b/locale/sv_SE/LC_MESSAGES/messages.po
index e67a71a7c..de17c2f4a 100644
--- a/locale/sv_SE/LC_MESSAGES/messages.po
+++ b/locale/sv_SE/LC_MESSAGES/messages.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tiny Tiny RSS sv_SE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 22:58+0300\n"
+"POT-Creation-Date: 2016-08-19 18:16+0300\n"
 "PO-Revision-Date: 2013-05-24 19:41+0100\n"
 "Last-Translator: Mattias Tengblad <mst@eyesx.com>\n"
 "Language-Team: Mattias Tengblad <mst@eyesx.com>\n"
@@ -171,13 +171,13 @@ msgstr "Kunde inte hitta flöde."
 msgid "Plugin not found"
 msgstr "Hittade inte användaren"
 
-#: index.php:133
-#: index.php:149
-#: index.php:267
-#: prefs.php:102
+#: index.php:148
+#: index.php:164
+#: index.php:282
+#: prefs.php:117
 #: classes/backend.php:5
 #: classes/pref/labels.php:282
-#: classes/pref/feeds.php:1405
+#: classes/pref/feeds.php:1409
 #: classes/pref/filters.php:779
 #: js/feedlist.js:159
 #: js/functions.js:1293
@@ -189,7 +189,7 @@ msgstr "Hittade inte användaren"
 #: js/prefs.js:1781
 #: js/prefs.js:1799
 #: js/tt-rss.js:55
-#: js/tt-rss.js:522
+#: js/tt-rss.js:553
 #: js/viewfeed.js:1298
 #: plugins/import_export/import_export.js:17
 #: js/feedlist.js:484
@@ -202,75 +202,75 @@ msgstr "Hittade inte användaren"
 #: js/prefs.js:1556
 #: js/prefs.js:1572
 #: js/prefs.js:1592
-#: js/tt-rss.js:539
+#: js/tt-rss.js:570
 #: js/viewfeed.js:830
 msgid "Loading, please wait..."
 msgstr "Laddar, vänta..."
 
-#: index.php:167
+#: index.php:182
 msgid "Collapse feedlist"
 msgstr "Visa/dölj flödeslista"
 
-#: index.php:170
+#: index.php:185
 msgid "Show articles"
 msgstr "Visa artiklarna"
 
-#: index.php:173
+#: index.php:188
 msgid "Adaptive"
 msgstr "Adaptivt"
 
-#: index.php:174
+#: index.php:189
 msgid "All Articles"
 msgstr "Alla artiklar"
 
-#: index.php:175
-#: include/functions2.php:101
+#: index.php:190
+#: include/functions2.php:102
 #: classes/feeds.php:104
 msgid "Starred"
 msgstr "Stjärnmärkta"
 
-#: index.php:176
-#: include/functions2.php:102
+#: index.php:191
+#: include/functions2.php:103
 #: classes/feeds.php:105
 msgid "Published"
 msgstr "Publicerade"
 
-#: index.php:177
+#: index.php:192
 #: classes/feeds.php:91
 #: classes/feeds.php:103
 msgid "Unread"
 msgstr "Olästa"
 
-#: index.php:178
+#: index.php:193
 msgid "With Note"
 msgstr "Med notering"
 
-#: index.php:179
+#: index.php:194
 msgid "Ignore Scoring"
 msgstr "Ignorera poängsättningen"
 
-#: index.php:182
+#: index.php:197
 msgid "Sort articles"
 msgstr "Sortera artiklar"
 
-#: index.php:185
+#: index.php:200
 msgid "Default"
 msgstr "Standard"
 
-#: index.php:186
+#: index.php:201
 msgid "Newest first"
 msgstr "Nyast först"
 
-#: index.php:187
+#: index.php:202
 msgid "Oldest first"
 msgstr "Äldst först"
 
-#: index.php:188
+#: index.php:203
 msgid "Title"
 msgstr "Titel"
 
-#: index.php:192
-#: index.php:233
+#: index.php:207
+#: index.php:248
 #: include/functions2.php:90
 #: classes/feeds.php:109
 #: js/FeedTree.js:132
@@ -278,134 +278,134 @@ msgstr "Titel"
 msgid "Mark as read"
 msgstr "Markera som läst"
 
-#: index.php:195
+#: index.php:210
 msgid "Older than one day"
 msgstr "Äldre än en dag"
 
-#: index.php:198
+#: index.php:213
 msgid "Older than one week"
 msgstr "Äldre än en vecka"
 
-#: index.php:201
+#: index.php:216
 msgid "Older than two weeks"
 msgstr "Äldre än två veckor"
 
-#: index.php:217
+#: index.php:232
 msgid "Communication problem with server."
 msgstr "Kommunikationsproblem med servern."
 
-#: index.php:223
+#: index.php:238
 msgid "Actions..."
 msgstr "Åtgärder..."
 
-#: index.php:225
+#: index.php:240
 msgid "Preferences..."
 msgstr "Inställningar..."
 
-#: index.php:226
+#: index.php:241
 msgid "Search..."
 msgstr "Sök..."
 
-#: index.php:227
+#: index.php:242
 msgid "Feed actions:"
 msgstr "Flödesåtgärder:"
 
-#: index.php:228
+#: index.php:243
 #: classes/handler/public.php:672
 msgid "Subscribe to feed..."
 msgstr "Prenumerera på flöde..."
 
-#: index.php:229
+#: index.php:244
 msgid "Edit this feed..."
 msgstr "Redigera detta flöde..."
 
-#: index.php:230
+#: index.php:245
 msgid "Rescore feed"
 msgstr "Beräkna flödets poäng på nytt"
 
-#: index.php:231
-#: classes/pref/feeds.php:783
-#: classes/pref/feeds.php:1360
+#: index.php:246
+#: classes/pref/feeds.php:785
+#: classes/pref/feeds.php:1364
 #: js/PrefFeedTree.js:74
 msgid "Unsubscribe"
 msgstr "Avsluta prenumeration"
 
-#: index.php:232
+#: index.php:247
 msgid "All feeds:"
 msgstr "Alla flöden:"
 
-#: index.php:234
+#: index.php:249
 msgid "(Un)hide read feeds"
 msgstr "Visa/dölj lästa flöden"
 
-#: index.php:235
+#: index.php:250
 msgid "Other actions:"
 msgstr "Andra aktiviteter:"
 
-#: index.php:236
+#: index.php:251
 #: include/functions2.php:76
 msgid "Toggle widescreen mode"
 msgstr "Växla widescreenläge"
 
-#: index.php:237
+#: index.php:252
 msgid "Create label..."
 msgstr "Skapa etikett..."
 
-#: index.php:238
+#: index.php:253
 msgid "Create filter..."
 msgstr "Skapa filter..."
 
-#: index.php:239
+#: index.php:254
 msgid "Keyboard shortcuts help"
 msgstr "Hjälp för kortkommandon..."
 
-#: index.php:248
+#: index.php:263
 msgid "Logout"
 msgstr "Logga ut"
 
-#: index.php:254
+#: index.php:269
 msgid "Updates are available from Git."
 msgstr ""
 
 #: prefs.php:33
-#: prefs.php:120
-#: include/functions2.php:104
+#: prefs.php:135
+#: include/functions2.php:105
 #: classes/pref/prefs.php:435
 msgid "Preferences"
 msgstr "Inställningar"
 
-#: prefs.php:111
+#: prefs.php:126
 msgid "Keyboard shortcuts"
 msgstr "Kortkommandon"
 
-#: prefs.php:112
+#: prefs.php:127
 msgid "Exit preferences"
 msgstr "Lämna inställningarna"
 
-#: prefs.php:123
+#: prefs.php:138
 #: classes/pref/feeds.php:112
-#: classes/pref/feeds.php:1300
-#: classes/pref/feeds.php:1349
+#: classes/pref/feeds.php:1304
+#: classes/pref/feeds.php:1353
 msgid "Feeds"
 msgstr "Flöden"
 
-#: prefs.php:126
+#: prefs.php:141
 #: classes/pref/filters.php:248
 msgid "Filters"
 msgstr "Filter"
 
-#: prefs.php:129
-#: include/functions.php:1256
-#: include/functions.php:1909
+#: prefs.php:144
+#: include/functions.php:1287
+#: include/functions.php:1940
 #: classes/pref/labels.php:90
 msgid "Labels"
 msgstr "Etiketter"
 
-#: prefs.php:133
+#: prefs.php:148
 msgid "Users"
 msgstr "Användare"
 
-#: prefs.php:136
+#: prefs.php:151
 msgid "System"
 msgstr "System"
 
@@ -487,10 +487,10 @@ msgid "Tiny Tiny RSS data update script."
 msgstr "Skript för att uppdatera Tiny Tiny RSS."
 
 #: include/digest.php:109
-#: include/functions.php:1265
-#: include/functions.php:1810
-#: include/functions.php:1895
-#: include/functions.php:1917
+#: include/functions.php:1296
+#: include/functions.php:1841
+#: include/functions.php:1926
+#: include/functions.php:1948
 #: classes/opml.php:421
 #: classes/pref/feeds.php:228
 msgid "Uncategorized"
@@ -507,44 +507,44 @@ msgstr[1] "%d arkiverade artiklar"
 msgid "No feeds found."
 msgstr "Inga flöden funna."
 
-#: include/functions.php:958
+#: include/functions.php:989
 #, php-format
 msgid "%d min"
 msgstr ""
 
-#: include/functions.php:1254
-#: include/functions.php:1907
+#: include/functions.php:1285
+#: include/functions.php:1938
 msgid "Special"
 msgstr "Special"
 
-#: include/functions.php:1758
+#: include/functions.php:1789
 #: classes/pref/filters.php:229
 #: classes/pref/filters.php:507
 msgid "All feeds"
 msgstr "Alla flöden"
 
-#: include/functions.php:1962
+#: include/functions.php:1993
 msgid "Starred articles"
 msgstr "Stjärnmärkta artiklar"
 
-#: include/functions.php:1964
+#: include/functions.php:1995
 msgid "Published articles"
 msgstr "Publicerade artiklar"
 
-#: include/functions.php:1966
+#: include/functions.php:1997
 msgid "Fresh articles"
 msgstr "Nya artiklar"
 
-#: include/functions.php:1968
-#: include/functions2.php:99
+#: include/functions.php:1999
+#: include/functions2.php:100
 msgid "All articles"
 msgstr "Alla artiklar"
 
-#: include/functions.php:1970
+#: include/functions.php:2001
 msgid "Archived articles"
 msgstr "Arkiverade artiklar"
 
-#: include/functions.php:1972
+#: include/functions.php:2003
 msgid "Recently read"
 msgstr "Nyligen lästa"
 
@@ -684,7 +684,7 @@ msgstr "Avmarkera allt"
 
 #: include/functions2.php:85
 #: classes/pref/feeds.php:555
-#: classes/pref/feeds.php:821
+#: classes/pref/feeds.php:823
 msgid "Feed"
 msgstr "Flöde"
 
@@ -697,7 +697,7 @@ msgid "Un/hide read feeds"
 msgstr "Visa/dölj lästa flöden"
 
 #: include/functions2.php:88
-#: classes/pref/feeds.php:1352
+#: classes/pref/feeds.php:1356
 msgid "Subscribe to feed"
 msgstr "Prenumerera på flöde"
 
@@ -713,73 +713,77 @@ msgid "Reverse headlines"
 msgstr "Omvänd sortering på rubrik"
 
 #: include/functions2.php:92
+msgid "Toggle headline grouping"
+msgstr ""
+
+#: include/functions2.php:93
 msgid "Debug feed update"
 msgstr "Felsök flödesuppdatering"
 
-#: include/functions2.php:93
+#: include/functions2.php:94
 #, fuzzy
 msgid "Debug viewfeed()"
 msgstr "Felsök flödesuppdatering"
 
-#: include/functions2.php:94
+#: include/functions2.php:95
 #: js/FeedTree.js:182
 msgid "Mark all feeds as read"
 msgstr "Märk alla flöden som lästa"
 
-#: include/functions2.php:95
+#: include/functions2.php:96
 msgid "Un/collapse current category"
 msgstr "Öppna/stäng aktuell kategori:"
 
-#: include/functions2.php:96
+#: include/functions2.php:97
 msgid "Toggle combined mode"
 msgstr "Växla komboläge"
 
-#: include/functions2.php:97
+#: include/functions2.php:98
 msgid "Toggle auto expand in combined mode"
 msgstr "Aktivera automatisk expandering i kombinerat läge"
 
-#: include/functions2.php:98
+#: include/functions2.php:99
 msgid "Go to"
 msgstr "Gå till"
 
-#: include/functions2.php:100
+#: include/functions2.php:101
 msgid "Fresh"
 msgstr "Nya"
 
-#: include/functions2.php:103
-#: js/tt-rss.js:466
-#: js/tt-rss.js:650
+#: include/functions2.php:104
+#: js/tt-rss.js:497
+#: js/tt-rss.js:673
 msgid "Tag cloud"
 msgstr "Taggmoln"
 
-#: include/functions2.php:105
+#: include/functions2.php:106
 msgid "Other"
 msgstr "Övriga"
 
-#: include/functions2.php:106
+#: include/functions2.php:107
 #: classes/pref/labels.php:267
 msgid "Create label"
 msgstr "Skapa etikett"
 
-#: include/functions2.php:107
+#: include/functions2.php:108
 #: classes/pref/filters.php:753
 msgid "Create filter"
 msgstr "Skapa filter"
 
-#: include/functions2.php:108
+#: include/functions2.php:109
 msgid "Un/collapse sidebar"
 msgstr "Visa/dölj sidofält"
 
-#: include/functions2.php:109
+#: include/functions2.php:110
 msgid "Show help dialog"
 msgstr "Visa hjälpfönster"
 
-#: include/functions2.php:663
+#: include/functions2.php:665
 #, php-format
 msgid "Search results: %s"
 msgstr "Sökresultat: %s"
 
-#: include/functions2.php:1317
+#: include/functions2.php:1330
 #: classes/feeds.php:749
 #, fuzzy
 msgid "comment"
@@ -787,68 +791,101 @@ msgid_plural "comments"
 msgstr[0] "Kommentarer?"
 msgstr[1] "Kommentarer?"
 
-#: include/functions2.php:1321
+#: include/functions2.php:1334
 #: classes/feeds.php:753
 #, fuzzy
 msgid "comments"
 msgstr "Kommentarer?"
 
-#: include/functions2.php:1347
+#: include/functions2.php:1360
 msgid " - "
 msgstr " - "
 
-#: include/functions2.php:1380
-#: include/functions2.php:1631
+#: include/functions2.php:1393
+#: include/functions2.php:1644
 #: classes/article.php:311
 msgid "no tags"
 msgstr "Inga taggar"
 
-#: include/functions2.php:1390
+#: include/functions2.php:1403
 #: classes/feeds.php:735
 msgid "Edit tags for this article"
 msgstr "Redigera taggar för denna artikel"
 
-#: include/functions2.php:1422
+#: include/functions2.php:1435
 #: classes/feeds.php:682
 msgid "Originally from:"
 msgstr "Ursprungligen från:"
 
-#: include/functions2.php:1435
+#: include/functions2.php:1448
 #: classes/pref/feeds.php:574
 #: classes/feeds.php:695
 msgid "Feed URL"
 msgstr "URL för flöde"
 
-#: include/functions2.php:1472
+#: include/functions2.php:1485
 #: classes/backend.php:105
 #: classes/dlg.php:37
 #: classes/dlg.php:60
 #: classes/dlg.php:93
 #: classes/dlg.php:159
 #: classes/dlg.php:186
-#: classes/pref/feeds.php:1654
-#: classes/pref/feeds.php:1720
+#: classes/pref/feeds.php:1658
+#: classes/pref/feeds.php:1724
 #: classes/pref/filters.php:204
 #: classes/pref/prefs.php:1105
 #: plugins/af_psql_trgm/init.php:102
 #: plugins/import_export/init.php:415
-#: plugins/import_export/init.php:460
+#: plugins/import_export/init.php:461
 #: plugins/share/init.php:121
 msgid "Close this window"
 msgstr "Stäng fönstret"
 
-#: include/functions2.php:1669
+#: include/functions2.php:1682
 msgid "(edit note)"
 msgstr "(Redigera notering)"
 
-#: include/functions2.php:1924
+#: include/functions2.php:1937
 msgid "unknown type"
 msgstr "Okänd typ"
 
-#: include/functions2.php:2001
+#: include/functions2.php:2014
 msgid "Attachments"
 msgstr "Bilagor"
 
+#: include/functions2.php:2456
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: include/functions2.php:2457
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr ""
+
+#: include/functions2.php:2458
+msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
+msgstr ""
+
+#: include/functions2.php:2459
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: include/functions2.php:2460
+#, fuzzy
+msgid "No file was uploaded"
+msgstr "Ingen fil uppladdad."
+
+#: include/functions2.php:2461
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: include/functions2.php:2462
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: include/functions2.php:2463
+msgid "A PHP extension stopped the file upload."
+msgstr ""
+
 #: include/login_form.php:197
 #: classes/handler/public.php:569
 #: classes/handler/public.php:824
@@ -918,8 +955,8 @@ msgstr "Taggar för denna artikel (kommaseparerade):"
 #: classes/article.php:222
 #: classes/pref/labels.php:79
 #: classes/pref/users.php:98
-#: classes/pref/feeds.php:799
-#: classes/pref/feeds.php:939
+#: classes/pref/feeds.php:801
+#: classes/pref/feeds.php:943
 #: classes/pref/filters.php:485
 #: classes/pref/prefs.php:989
 #: plugins/instances/init.php:245
@@ -937,17 +974,17 @@ msgstr "Spara"
 #: classes/handler/public.php:580
 #: classes/pref/labels.php:81
 #: classes/pref/users.php:100
-#: classes/pref/feeds.php:800
-#: classes/pref/feeds.php:942
-#: classes/pref/feeds.php:1860
+#: classes/pref/feeds.php:802
+#: classes/pref/feeds.php:946
+#: classes/pref/feeds.php:1865
 #: classes/pref/filters.php:488
 #: classes/pref/filters.php:902
 #: classes/pref/filters.php:983
 #: classes/pref/filters.php:1076
 #: classes/pref/prefs.php:991
-#: classes/feeds.php:1098
-#: classes/feeds.php:1148
-#: classes/feeds.php:1185
+#: classes/feeds.php:1100
+#: classes/feeds.php:1150
+#: classes/feeds.php:1187
 #: plugins/instances/init.php:248
 #: plugins/instances/init.php:436
 #: plugins/note/init.php:53
@@ -1003,7 +1040,6 @@ msgid "Processing category: %s"
 msgstr "Bearbetar kategori: %s"
 
 #: classes/opml.php:470
-#: plugins/import_export/init.php:428
 #, php-format
 msgid "Upload failed with error code %d"
 msgstr "Uppladdningen misslyckades med felkod %d"
@@ -1223,9 +1259,9 @@ msgstr "Skapade etikett <b>%s</b>"
 
 #: classes/pref/labels.php:258
 #: classes/pref/users.php:334
-#: classes/pref/feeds.php:1340
-#: classes/pref/feeds.php:1602
-#: classes/pref/feeds.php:1666
+#: classes/pref/feeds.php:1344
+#: classes/pref/feeds.php:1606
+#: classes/pref/feeds.php:1670
 #: classes/pref/filters.php:359
 #: classes/pref/filters.php:407
 #: classes/pref/filters.php:744
@@ -1238,9 +1274,9 @@ msgstr "Markera"
 
 #: classes/pref/labels.php:261
 #: classes/pref/users.php:337
-#: classes/pref/feeds.php:1343
-#: classes/pref/feeds.php:1605
-#: classes/pref/feeds.php:1669
+#: classes/pref/feeds.php:1347
+#: classes/pref/feeds.php:1609
+#: classes/pref/feeds.php:1673
 #: classes/pref/filters.php:362
 #: classes/pref/filters.php:410
 #: classes/pref/filters.php:747
@@ -1254,9 +1290,9 @@ msgstr "Alla"
 
 #: classes/pref/labels.php:263
 #: classes/pref/users.php:339
-#: classes/pref/feeds.php:1345
-#: classes/pref/feeds.php:1607
-#: classes/pref/feeds.php:1671
+#: classes/pref/feeds.php:1349
+#: classes/pref/feeds.php:1611
+#: classes/pref/feeds.php:1675
 #: classes/pref/filters.php:364
 #: classes/pref/filters.php:412
 #: classes/pref/filters.php:749
@@ -1270,10 +1306,10 @@ msgstr "Ingen"
 
 #: classes/pref/labels.php:270
 #: classes/pref/users.php:348
-#: classes/pref/feeds.php:765
+#: classes/pref/feeds.php:767
 #: classes/pref/filters.php:478
 #: classes/pref/filters.php:766
-#: classes/feeds.php:1147
+#: classes/feeds.php:1149
 #: plugins/instances/init.php:294
 msgid "Remove"
 msgstr "Ta bort"
@@ -1295,7 +1331,7 @@ msgstr "Redigera regel"
 
 #: classes/pref/users.php:56
 #: classes/pref/feeds.php:637
-#: classes/pref/feeds.php:876
+#: classes/pref/feeds.php:878
 #: classes/feeds.php:1070
 msgid "Authentication"
 msgstr "Autentisering"
@@ -1305,8 +1341,8 @@ msgid "Access level: "
 msgstr "Behörighetsnivå: "
 
 #: classes/pref/users.php:77
-#: classes/pref/feeds.php:665
-#: classes/pref/feeds.php:892
+#: classes/pref/feeds.php:667
+#: classes/pref/feeds.php:896
 msgid "Options"
 msgstr "Alternativ"
 
@@ -1372,10 +1408,10 @@ msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] Notifikation för ändring av lösenord"
 
 #: classes/pref/users.php:324
-#: classes/pref/feeds.php:1336
+#: classes/pref/feeds.php:1340
 #: classes/pref/filters.php:740
-#: classes/feeds.php:1118
-#: classes/feeds.php:1184
+#: classes/feeds.php:1120
+#: classes/feeds.php:1186
 #: js/tt-rss.js:174
 msgid "Search"
 msgstr "Sök"
@@ -1392,8 +1428,8 @@ msgstr "Redigera"
 
 #: classes/pref/users.php:397
 #: classes/pref/feeds.php:643
-#: classes/pref/feeds.php:880
-#: classes/pref/feeds.php:1838
+#: classes/pref/feeds.php:882
+#: classes/pref/feeds.php:1842
 #: classes/feeds.php:1074
 msgid "Login"
 msgstr "Användarnamn"
@@ -1473,251 +1509,251 @@ msgid "Feed Title"
 msgstr "Flödestitel"
 
 #: classes/pref/feeds.php:595
-#: classes/pref/feeds.php:828
-#: classes/pref/feeds.php:1824
+#: classes/pref/feeds.php:830
+#: classes/pref/feeds.php:1828
 #: classes/feeds.php:1050
 msgid "Place in category:"
 msgstr "Placera i kategori:"
 
 #: classes/pref/feeds.php:608
-#: classes/pref/feeds.php:842
+#: classes/pref/feeds.php:844
 #, fuzzy
 msgid "Language:"
 msgstr "Språk"
 
 #: classes/pref/feeds.php:615
-#: classes/pref/feeds.php:851
+#: classes/pref/feeds.php:853
 msgid "Update"
 msgstr "Uppdatera"
 
 #: classes/pref/feeds.php:630
-#: classes/pref/feeds.php:867
+#: classes/pref/feeds.php:869
 msgid "Article purging:"
 msgstr "Artikelrensning:"
 
-#: classes/pref/feeds.php:656
-#: classes/pref/feeds.php:886
-#: classes/pref/feeds.php:1841
+#: classes/pref/feeds.php:658
+#: classes/pref/feeds.php:890
+#: classes/pref/feeds.php:1845
 #: classes/pref/prefs.php:245
-#: classes/feeds.php:1077
+#: classes/feeds.php:1078
 msgid "Password"
 msgstr "Lösenord"
 
-#: classes/pref/feeds.php:660
+#: classes/pref/feeds.php:662
 msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
 msgstr "<b>Tips:</b> du måste ange din inloggningsuppgifter om ditt flöde kräver autentisering, dock ej för Twitter-flöden."
 
-#: classes/pref/feeds.php:679
-#: classes/pref/feeds.php:896
+#: classes/pref/feeds.php:681
+#: classes/pref/feeds.php:900
 msgid "Hide from Popular feeds"
 msgstr "Dölj från populära flöden"
 
-#: classes/pref/feeds.php:691
-#: classes/pref/feeds.php:902
+#: classes/pref/feeds.php:693
+#: classes/pref/feeds.php:906
 msgid "Include in e-mail digest"
 msgstr "Inkludera i e-postsammanfattning"
 
-#: classes/pref/feeds.php:704
-#: classes/pref/feeds.php:908
+#: classes/pref/feeds.php:706
+#: classes/pref/feeds.php:912
 msgid "Always display image attachments"
 msgstr "Visa alltid bilder"
 
-#: classes/pref/feeds.php:717
-#: classes/pref/feeds.php:916
+#: classes/pref/feeds.php:719
+#: classes/pref/feeds.php:920
 msgid "Do not embed images"
 msgstr "Bädda inte in bilder"
 
-#: classes/pref/feeds.php:730
-#: classes/pref/feeds.php:924
+#: classes/pref/feeds.php:732
+#: classes/pref/feeds.php:928
 msgid "Cache images locally"
 msgstr "Cacha bilder lokalt"
 
-#: classes/pref/feeds.php:742
-#: classes/pref/feeds.php:930
+#: classes/pref/feeds.php:744
+#: classes/pref/feeds.php:934
 msgid "Mark updated articles as unread"
 msgstr "Makera uppdaterade artiklar som olästa"
 
-#: classes/pref/feeds.php:746
+#: classes/pref/feeds.php:748
 msgid "Icon"
 msgstr "Ikon"
 
-#: classes/pref/feeds.php:763
+#: classes/pref/feeds.php:765
 msgid "Replace"
 msgstr "Ersätt"
 
-#: classes/pref/feeds.php:770
+#: classes/pref/feeds.php:772
 #: classes/pref/prefs.php:706
 msgid "Plugins"
 msgstr "Tillägg"
 
-#: classes/pref/feeds.php:790
+#: classes/pref/feeds.php:792
 msgid "Resubscribe to push updates"
 msgstr "Återprenumerera på push-uppdateringar:"
 
-#: classes/pref/feeds.php:797
+#: classes/pref/feeds.php:799
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr "Återställ PubSubHubbub-prenumerationer för push-uppdaterade feeds."
 
-#: classes/pref/feeds.php:1203
-#: classes/pref/feeds.php:1256
+#: classes/pref/feeds.php:1207
+#: classes/pref/feeds.php:1260
 msgid "All done."
 msgstr "Klart."
 
-#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1315
 msgid "Feeds with errors"
 msgstr "Flöden med fel"
 
-#: classes/pref/feeds.php:1318
+#: classes/pref/feeds.php:1322
 msgid "Inactive feeds"
 msgstr "Inaktiva flöden"
 
-#: classes/pref/feeds.php:1354
+#: classes/pref/feeds.php:1358
 msgid "Edit selected feeds"
 msgstr "Redigera valda flöden"
 
-#: classes/pref/feeds.php:1356
-#: classes/pref/feeds.php:1370
+#: classes/pref/feeds.php:1360
+#: classes/pref/feeds.php:1374
 #: classes/pref/filters.php:762
 msgid "Reset sort order"
 msgstr "Återställ sorteringsordning"
 
-#: classes/pref/feeds.php:1358
+#: classes/pref/feeds.php:1362
 #: js/prefs.js:1737
 msgid "Batch subscribe"
 msgstr "Massprenumerera"
 
-#: classes/pref/feeds.php:1365
+#: classes/pref/feeds.php:1369
 msgid "Categories"
 msgstr "Kategorier"
 
-#: classes/pref/feeds.php:1368
+#: classes/pref/feeds.php:1372
 msgid "Add category"
 msgstr "Lägg till kategori"
 
-#: classes/pref/feeds.php:1372
+#: classes/pref/feeds.php:1376
 msgid "Remove selected"
 msgstr "Ta bort markerade"
 
-#: classes/pref/feeds.php:1383
+#: classes/pref/feeds.php:1387
 msgid "More actions..."
 msgstr "Fler åtgärder..."
 
-#: classes/pref/feeds.php:1387
+#: classes/pref/feeds.php:1391
 msgid "Manual purge"
 msgstr "Manuell rensning"
 
-#: classes/pref/feeds.php:1391
+#: classes/pref/feeds.php:1395
 msgid "Clear feed data"
 msgstr "Rensa flödesdata"
 
-#: classes/pref/feeds.php:1392
+#: classes/pref/feeds.php:1396
 #: classes/pref/filters.php:770
 msgid "Rescore articles"
 msgstr "Poängsätt på nytt"
 
-#: classes/pref/feeds.php:1444
+#: classes/pref/feeds.php:1448
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1446
+#: classes/pref/feeds.php:1450
 msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
 msgstr "Med OPML kan du importera och exportera dina flöden, filter, etiketter och Tin Tiny RSS-inställningar"
 
-#: classes/pref/feeds.php:1447
+#: classes/pref/feeds.php:1451
 msgid "Only main settings profile can be migrated using OPML."
 msgstr "Endast huvudprofilens inställningar kan migreras med OPML."
 
-#: classes/pref/feeds.php:1460
+#: classes/pref/feeds.php:1464
 msgid "Import my OPML"
 msgstr "Importera OPML"
 
-#: classes/pref/feeds.php:1466
+#: classes/pref/feeds.php:1470
 msgid "Filename:"
 msgstr "Filnamn:"
 
-#: classes/pref/feeds.php:1468
+#: classes/pref/feeds.php:1472
 msgid "Include settings"
 msgstr "Inkludera inställningar"
 
-#: classes/pref/feeds.php:1472
+#: classes/pref/feeds.php:1476
 msgid "Export OPML"
 msgstr "Exportera OPML"
 
-#: classes/pref/feeds.php:1476
+#: classes/pref/feeds.php:1480
 msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
 msgstr "Din OPML-fil kan publiceras publikt och den kan bli prenumererad på av alla som känner till URLen nedan"
 
-#: classes/pref/feeds.php:1480
+#: classes/pref/feeds.php:1484
 msgid "Public OPML URL"
 msgstr "Publik OPML-URL"
 
-#: classes/pref/feeds.php:1481
+#: classes/pref/feeds.php:1485
 msgid "Display published OPML URL"
 msgstr "Visa publicerad OPML-URL"
 
-#: classes/pref/feeds.php:1490
+#: classes/pref/feeds.php:1494
 msgid "Firefox integration"
 msgstr "Firefox-integration"
 
-#: classes/pref/feeds.php:1492
+#: classes/pref/feeds.php:1496
 msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
 msgstr "Denna Tiny Tiny RSS-webbplats kan användas som en flödesläsare för Firefox genom att klicka på länken nedan."
 
-#: classes/pref/feeds.php:1499
+#: classes/pref/feeds.php:1503
 msgid "Click here to register this site as a feed reader."
 msgstr "Klicka här för att registrera denna webbplats som en flödesläsare."
 
-#: classes/pref/feeds.php:1507
+#: classes/pref/feeds.php:1511
 msgid "Published & shared articles / Generated feeds"
 msgstr "Publicerade och delade artiklar / Genererade flöden"
 
-#: classes/pref/feeds.php:1509
+#: classes/pref/feeds.php:1513
 msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
 msgstr "Publicerade artiklar exporteras som ett publikt RSS-flöde och kan prenumeras på av alla som har URLen nedan."
 
-#: classes/pref/feeds.php:1516
+#: classes/pref/feeds.php:1520
 #: classes/feeds.php:54
 #: classes/feeds.php:134
 msgid "View as RSS"
 msgstr "Visa som RSS"
 
-#: classes/pref/feeds.php:1517
+#: classes/pref/feeds.php:1521
 msgid "Display URL"
 msgstr "Visa URL"
 
-#: classes/pref/feeds.php:1520
+#: classes/pref/feeds.php:1524
 msgid "Clear all generated URLs"
 msgstr "Rensa alla genererade URLer"
 
-#: classes/pref/feeds.php:1598
+#: classes/pref/feeds.php:1602
 msgid "These feeds have not been updated with new content for 3 months (oldest first):"
 msgstr "Följande flöden har inte uppdaterats med nytt innehåll på 3 månader (äldst först): "
 
-#: classes/pref/feeds.php:1632
-#: classes/pref/feeds.php:1696
+#: classes/pref/feeds.php:1636
+#: classes/pref/feeds.php:1700
 msgid "Click to edit feed"
 msgstr "Klicka för att redigera flöde"
 
-#: classes/pref/feeds.php:1650
-#: classes/pref/feeds.php:1716
+#: classes/pref/feeds.php:1654
+#: classes/pref/feeds.php:1720
 msgid "Unsubscribe from selected feeds"
 msgstr "Ta bort prenumeration för valda flöden"
 
-#: classes/pref/feeds.php:1821
+#: classes/pref/feeds.php:1825
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr "Lägg till ett giltigt RSS-flöde per rad (ingen flödesupptäckt görs)"
 
-#: classes/pref/feeds.php:1830
+#: classes/pref/feeds.php:1834
 msgid "Feeds to subscribe, One per line"
 msgstr "Flöden att prenumerera på, ett per rad"
 
-#: classes/pref/feeds.php:1852
+#: classes/pref/feeds.php:1857
 msgid "Feeds require authentication."
 msgstr "Flödet kräver inloggning."
 
-#: classes/pref/feeds.php:1859
-#: classes/feeds.php:1092
-#: classes/feeds.php:1146
+#: classes/pref/feeds.php:1864
+#: classes/feeds.php:1094
+#: classes/feeds.php:1148
 msgid "Subscribe"
 msgstr "Prenumerera"
 
@@ -1800,7 +1836,7 @@ msgid "on field"
 msgstr "i fält"
 
 #: classes/pref/filters.php:962
-#: js/PrefFilterTree.js:61
+#: js/PrefFilterTree.js:64
 msgid "in"
 msgstr "i"
 
@@ -2395,40 +2431,40 @@ msgstr "URL för flöde eller webbplats"
 msgid "Available feeds"
 msgstr "Tillgängliga flöden"
 
-#: classes/feeds.php:1087
+#: classes/feeds.php:1089
 msgid "This feed requires authentication."
 msgstr "Detta flöde kräver autentisering."
 
-#: classes/feeds.php:1095
+#: classes/feeds.php:1097
 msgid "More feeds"
 msgstr "Fler flöden"
 
-#: classes/feeds.php:1122
+#: classes/feeds.php:1124
 msgid "Popular feeds"
 msgstr "Populära flöden"
 
-#: classes/feeds.php:1123
+#: classes/feeds.php:1125
 msgid "Feed archive"
 msgstr "Flödesarkiv"
 
-#: classes/feeds.php:1126
+#: classes/feeds.php:1128
 msgid "limit:"
 msgstr "gräns:"
 
-#: classes/feeds.php:1158
+#: classes/feeds.php:1160
 msgid "Look for"
 msgstr "Sök efter"
 
-#: classes/feeds.php:1166
+#: classes/feeds.php:1168
 #, php-format
 msgid "in %s"
 msgstr ""
 
-#: classes/feeds.php:1171
+#: classes/feeds.php:1173
 msgid "Used for word stemming"
 msgstr ""
 
-#: classes/feeds.php:1180
+#: classes/feeds.php:1182
 #, fuzzy
 msgid "Search syntax"
 msgstr "Sök"
@@ -2694,6 +2730,11 @@ msgstr "Kunde inte ladda XML-filen."
 msgid "Prepare data"
 msgstr "Förbered data"
 
+#: plugins/import_export/init.php:428
+#, fuzzy, php-format
+msgid "Upload failed with error code %d (%s)"
+msgstr "Uppladdningen misslyckades med felkod %d"
+
 #: plugins/import_export/init.php:454
 msgid "No file uploaded."
 msgstr "Ingen fil uppladdad."
@@ -2805,7 +2846,7 @@ msgstr "Redigera kategori"
 msgid "Remove category"
 msgstr "Ta bort kategori"
 
-#: js/PrefFilterTree.js:64
+#: js/PrefFilterTree.js:67
 msgid "Inverse"
 msgstr "Invertera"
 
@@ -2858,7 +2899,7 @@ msgid "Subscription reset."
 msgstr "Prenumeration återställd."
 
 #: js/functions.js:1311
-#: js/tt-rss.js:682
+#: js/tt-rss.js:705
 #, perl-format
 msgid "Unsubscribe from %s?"
 msgstr "Säg upp prenumeration på %s?"
@@ -3088,40 +3129,40 @@ msgstr "Flagga alla artiklar som lästa?"
 msgid "Marking all feeds as read..."
 msgstr "Markerar alla flöden som lästa..."
 
-#: js/tt-rss.js:383
+#: js/tt-rss.js:404
 msgid "Please enable mail plugin first."
 msgstr "Aktivera e-post-tillägget först."
 
-#: js/tt-rss.js:431
+#: js/tt-rss.js:452
 #: js/functions.js:1643
-#: js/tt-rss.js:663
+#: js/tt-rss.js:686
 msgid "You can't edit this kind of feed."
 msgstr "Detta typ av flöde kan inte redigeras."
 
-#: js/tt-rss.js:502
+#: js/tt-rss.js:533
 msgid "Please enable embed_original plugin first."
 msgstr "Vänligen aktivera tillägget embed_original först."
 
-#: js/tt-rss.js:515
-#: js/tt-rss.js:713
+#: js/tt-rss.js:546
+#: js/tt-rss.js:736
 msgid "Widescreen is not available in combined mode."
 msgstr ""
 
-#: js/tt-rss.js:827
+#: js/tt-rss.js:850
 msgid "You can't rescore this kind of feed."
 msgstr "Den här typen av flöden kan inte poängsättas."
 
-#: js/tt-rss.js:832
-#: js/tt-rss.js:676
+#: js/tt-rss.js:855
+#: js/tt-rss.js:699
 msgid "Please select some feed first."
 msgstr "Välj några flöden först."
 
-#: js/tt-rss.js:837
+#: js/tt-rss.js:860
 #, perl-format
 msgid "Rescore articles in %s?"
 msgstr "Beräkna om poängen för artiklarna i %s?"
 
-#: js/tt-rss.js:840
+#: js/tt-rss.js:863
 msgid "Rescoring articles..."
 msgstr "Räknar om artikelpoäng..."
 
@@ -3299,7 +3340,7 @@ msgstr "Dina personliga data sparas."
 msgid "Sorry, your browser does not support sandboxed iframes."
 msgstr "Din webbläsare stöder inte sandboxade iframes"
 
-#: plugins/shorten_expanded/init.js:37
+#: plugins/shorten_expanded/init.js:39
 #, fuzzy
 msgid "Click to expand article"
 msgstr "Klicka för att expandera artikeln."
@@ -3552,7 +3593,7 @@ msgstr "Genererade URLer rensade."
 msgid "Label Editor"
 msgstr "Etikettseditor"
 
-#: js/tt-rss.js:671
+#: js/tt-rss.js:694
 msgid "You can't unsubscribe from the category."
 msgstr "Du kan inte säga upp prenumeration på kategorin."
 
diff --git a/locale/tr_TR/LC_MESSAGES/messages.mo b/locale/tr_TR/LC_MESSAGES/messages.mo
index 90ca4bf08..909f228c8 100644
Binary files a/locale/tr_TR/LC_MESSAGES/messages.mo and b/locale/tr_TR/LC_MESSAGES/messages.mo differ
diff --git a/locale/tr_TR/LC_MESSAGES/messages.po b/locale/tr_TR/LC_MESSAGES/messages.po
index ce310e194..f1f1acf5f 100644
--- a/locale/tr_TR/LC_MESSAGES/messages.po
+++ b/locale/tr_TR/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tt-rss git\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 22:58+0300\n"
+"POT-Creation-Date: 2016-08-19 18:16+0300\n"
 "PO-Revision-Date: 2013-12-08 20:20+0200\n"
 "Last-Translator: akapar <akapar@gmail.com>\n"
 "Language-Team: TURKISH <akapar@gmail.com>\n"
@@ -166,13 +166,13 @@ msgstr "Özet akışı bulunamadı."
 msgid "Plugin not found"
 msgstr "Kullanıcı bulunamadı"
 
-#: index.php:133
-#: index.php:149
-#: index.php:267
-#: prefs.php:102
+#: index.php:148
+#: index.php:164
+#: index.php:282
+#: prefs.php:117
 #: classes/backend.php:5
 #: classes/pref/labels.php:282
-#: classes/pref/feeds.php:1405
+#: classes/pref/feeds.php:1409
 #: classes/pref/filters.php:779
 #: js/feedlist.js:159
 #: js/functions.js:1293
@@ -184,7 +184,7 @@ msgstr "Kullanıcı bulunamadı"
 #: js/prefs.js:1781
 #: js/prefs.js:1799
 #: js/tt-rss.js:55
-#: js/tt-rss.js:522
+#: js/tt-rss.js:553
 #: js/viewfeed.js:1298
 #: plugins/import_export/import_export.js:17
 #: js/feedlist.js:484
@@ -197,75 +197,75 @@ msgstr "Kullanıcı bulunamadı"
 #: js/prefs.js:1556
 #: js/prefs.js:1572
 #: js/prefs.js:1592
-#: js/tt-rss.js:539
+#: js/tt-rss.js:570
 #: js/viewfeed.js:830
 msgid "Loading, please wait..."
 msgstr "Yükleniyor, lütfen bekleyin..."
 
-#: index.php:167
+#: index.php:182
 msgid "Collapse feedlist"
 msgstr "Özet akışı listesini kapat"
 
-#: index.php:170
+#: index.php:185
 msgid "Show articles"
 msgstr "Yazıları göster"
 
-#: index.php:173
+#: index.php:188
 msgid "Adaptive"
 msgstr "Görüntüle..."
 
-#: index.php:174
+#: index.php:189
 msgid "All Articles"
 msgstr "Tüm yazılar"
 
-#: index.php:175
-#: include/functions2.php:101
+#: index.php:190
+#: include/functions2.php:102
 #: classes/feeds.php:104
 msgid "Starred"
 msgstr "Favoriler"
 
-#: index.php:176
-#: include/functions2.php:102
+#: index.php:191
+#: include/functions2.php:103
 #: classes/feeds.php:105
 msgid "Published"
 msgstr "Yayınladıklarım"
 
-#: index.php:177
+#: index.php:192
 #: classes/feeds.php:91
 #: classes/feeds.php:103
 msgid "Unread"
 msgstr "Okunmamışlar"
 
-#: index.php:178
+#: index.php:193
 msgid "With Note"
 msgstr "Not aldıklarım"
 
-#: index.php:179
+#: index.php:194
 msgid "Ignore Scoring"
 msgstr "Notlandırmayı ihmal et"
 
-#: index.php:182
+#: index.php:197
 msgid "Sort articles"
 msgstr "Yazıları sırala"
 
-#: index.php:185
+#: index.php:200
 msgid "Default"
 msgstr "Varsayılan"
 
-#: index.php:186
+#: index.php:201
 msgid "Newest first"
 msgstr "En yeni en üstte"
 
-#: index.php:187
+#: index.php:202
 msgid "Oldest first"
 msgstr "En eski en üstte"
 
-#: index.php:188
+#: index.php:203
 msgid "Title"
 msgstr "Başlık"
 
-#: index.php:192
-#: index.php:233
+#: index.php:207
+#: index.php:248
 #: include/functions2.php:90
 #: classes/feeds.php:109
 #: js/FeedTree.js:132
@@ -273,134 +273,134 @@ msgstr "Başlık"
 msgid "Mark as read"
 msgstr "Okundu olarak işaretle"
 
-#: index.php:195
+#: index.php:210
 msgid "Older than one day"
 msgstr "1 günden eski"
 
-#: index.php:198
+#: index.php:213
 msgid "Older than one week"
 msgstr "1 haftadan eski"
 
-#: index.php:201
+#: index.php:216
 msgid "Older than two weeks"
 msgstr "2 haftadan eski"
 
-#: index.php:217
+#: index.php:232
 msgid "Communication problem with server."
 msgstr "Sunucu ile iletişimde problem var."
 
-#: index.php:223
+#: index.php:238
 msgid "Actions..."
 msgstr "Daha fazla..."
 
-#: index.php:225
+#: index.php:240
 msgid "Preferences..."
 msgstr "Tercihler"
 
-#: index.php:226
+#: index.php:241
 msgid "Search..."
 msgstr "Ara..."
 
-#: index.php:227
+#: index.php:242
 msgid "Feed actions:"
 msgstr "Özet akışı ile ilgili..."
 
-#: index.php:228
+#: index.php:243
 #: classes/handler/public.php:672
 msgid "Subscribe to feed..."
 msgstr "Özet akışına üye ol"
 
-#: index.php:229
+#: index.php:244
 msgid "Edit this feed..."
 msgstr "Bu özet akışını düzenle..."
 
-#: index.php:230
+#: index.php:245
 msgid "Rescore feed"
 msgstr "Özet akışını yeniden değerlendir..."
 
-#: index.php:231
-#: classes/pref/feeds.php:783
-#: classes/pref/feeds.php:1360
+#: index.php:246
+#: classes/pref/feeds.php:785
+#: classes/pref/feeds.php:1364
 #: js/PrefFeedTree.js:74
 msgid "Unsubscribe"
 msgstr "Üyelikten çık"
 
-#: index.php:232
+#: index.php:247
 msgid "All feeds:"
 msgstr "Tüm özet akışları:"
 
-#: index.php:234
+#: index.php:249
 msgid "(Un)hide read feeds"
 msgstr "Okunmuş özet akışlarını görüntüle(me)"
 
-#: index.php:235
+#: index.php:250
 msgid "Other actions:"
 msgstr "Diğerleri:"
 
-#: index.php:236
+#: index.php:251
 #: include/functions2.php:76
 msgid "Toggle widescreen mode"
 msgstr "Tam ekran görüntüle"
 
-#: index.php:237
+#: index.php:252
 msgid "Create label..."
 msgstr "Arama başlığı tanımla..."
 
-#: index.php:238
+#: index.php:253
 msgid "Create filter..."
 msgstr "Filtre tanımla..."
 
-#: index.php:239
+#: index.php:254
 msgid "Keyboard shortcuts help"
 msgstr "Klavye kısayolları yardım"
 
-#: index.php:248
+#: index.php:263
 msgid "Logout"
 msgstr "Oturumu kapat"
 
-#: index.php:254
+#: index.php:269
 msgid "Updates are available from Git."
 msgstr ""
 
 #: prefs.php:33
-#: prefs.php:120
-#: include/functions2.php:104
+#: prefs.php:135
+#: include/functions2.php:105
 #: classes/pref/prefs.php:435
 msgid "Preferences"
 msgstr "Tercihler"
 
-#: prefs.php:111
+#: prefs.php:126
 msgid "Keyboard shortcuts"
 msgstr "Klavye kısayolları"
 
-#: prefs.php:112
+#: prefs.php:127
 msgid "Exit preferences"
 msgstr "Tercihleri kapat"
 
-#: prefs.php:123
+#: prefs.php:138
 #: classes/pref/feeds.php:112
-#: classes/pref/feeds.php:1300
-#: classes/pref/feeds.php:1349
+#: classes/pref/feeds.php:1304
+#: classes/pref/feeds.php:1353
 msgid "Feeds"
 msgstr "Özet akışları"
 
-#: prefs.php:126
+#: prefs.php:141
 #: classes/pref/filters.php:248
 msgid "Filters"
 msgstr "Filtreler"
 
-#: prefs.php:129
-#: include/functions.php:1256
-#: include/functions.php:1909
+#: prefs.php:144
+#: include/functions.php:1287
+#: include/functions.php:1940
 #: classes/pref/labels.php:90
 msgid "Labels"
 msgstr "Arama başlıkları"
 
-#: prefs.php:133
+#: prefs.php:148
 msgid "Users"
 msgstr "Kullanıcılar"
 
-#: prefs.php:136
+#: prefs.php:151
 msgid "System"
 msgstr "Sistem"
 
@@ -482,10 +482,10 @@ msgid "Tiny Tiny RSS data update script."
 msgstr "Tiny Tiny RSS veri yenileme komut dosyası."
 
 #: include/digest.php:109
-#: include/functions.php:1265
-#: include/functions.php:1810
-#: include/functions.php:1895
-#: include/functions.php:1917
+#: include/functions.php:1296
+#: include/functions.php:1841
+#: include/functions.php:1926
+#: include/functions.php:1948
 #: classes/opml.php:421
 #: classes/pref/feeds.php:228
 msgid "Uncategorized"
@@ -502,44 +502,44 @@ msgstr[1] "%d arşivlenmiş yazılar"
 msgid "No feeds found."
 msgstr "Özet akışı bulunamadı."
 
-#: include/functions.php:958
+#: include/functions.php:989
 #, php-format
 msgid "%d min"
 msgstr ""
 
-#: include/functions.php:1254
-#: include/functions.php:1907
+#: include/functions.php:1285
+#: include/functions.php:1938
 msgid "Special"
 msgstr "Özet"
 
-#: include/functions.php:1758
+#: include/functions.php:1789
 #: classes/pref/filters.php:229
 #: classes/pref/filters.php:507
 msgid "All feeds"
 msgstr "Tüm özet akışları"
 
-#: include/functions.php:1962
+#: include/functions.php:1993
 msgid "Starred articles"
 msgstr "Favori yazılar"
 
-#: include/functions.php:1964
+#: include/functions.php:1995
 msgid "Published articles"
 msgstr "Yayınlanmış yazılar"
 
-#: include/functions.php:1966
+#: include/functions.php:1997
 msgid "Fresh articles"
 msgstr "Tazeler"
 
-#: include/functions.php:1968
-#: include/functions2.php:99
+#: include/functions.php:1999
+#: include/functions2.php:100
 msgid "All articles"
 msgstr "Tüm yazılar"
 
-#: include/functions.php:1970
+#: include/functions.php:2001
 msgid "Archived articles"
 msgstr "Arşivlenmiş yazılar"
 
-#: include/functions.php:1972
+#: include/functions.php:2003
 msgid "Recently read"
 msgstr "Yakın zamanda okunanlar"
 
@@ -679,7 +679,7 @@ msgstr "Hiçbirini seçme"
 
 #: include/functions2.php:85
 #: classes/pref/feeds.php:555
-#: classes/pref/feeds.php:821
+#: classes/pref/feeds.php:823
 msgid "Feed"
 msgstr "Özet akışı"
 
@@ -692,7 +692,7 @@ msgid "Un/hide read feeds"
 msgstr "Okunmuş özet akışlarını gizle(me)"
 
 #: include/functions2.php:88
-#: classes/pref/feeds.php:1352
+#: classes/pref/feeds.php:1356
 msgid "Subscribe to feed"
 msgstr "Özet akışına abone ol"
 
@@ -708,140 +708,177 @@ msgid "Reverse headlines"
 msgstr "Yazı başlıklarını ters diz"
 
 #: include/functions2.php:92
+msgid "Toggle headline grouping"
+msgstr ""
+
+#: include/functions2.php:93
 msgid "Debug feed update"
 msgstr "Özet akışı yenilemesinde hata ayıkla"
 
-#: include/functions2.php:93
+#: include/functions2.php:94
 #, fuzzy
 msgid "Debug viewfeed()"
 msgstr "Özet akışı yenilemesinde hata ayıkla"
 
-#: include/functions2.php:94
+#: include/functions2.php:95
 #: js/FeedTree.js:182
 msgid "Mark all feeds as read"
 msgstr "Tüm özet akışlarını okundu işaretle"
 
-#: include/functions2.php:95
+#: include/functions2.php:96
 msgid "Un/collapse current category"
 msgstr "Bu kategoriyi aç/kapa"
 
-#: include/functions2.php:96
+#: include/functions2.php:97
 msgid "Toggle combined mode"
 msgstr "Birleşik modu değiştir"
 
-#: include/functions2.php:97
+#: include/functions2.php:98
 msgid "Toggle auto expand in combined mode"
 msgstr "Birleşik modda otomatik genişlemeyi değiştir"
 
-#: include/functions2.php:98
+#: include/functions2.php:99
 msgid "Go to"
 msgstr "Git"
 
-#: include/functions2.php:100
+#: include/functions2.php:101
 msgid "Fresh"
 msgstr "Taze"
 
-#: include/functions2.php:103
-#: js/tt-rss.js:466
-#: js/tt-rss.js:650
+#: include/functions2.php:104
+#: js/tt-rss.js:497
+#: js/tt-rss.js:673
 msgid "Tag cloud"
 msgstr "Etiket öbeği"
 
-#: include/functions2.php:105
+#: include/functions2.php:106
 msgid "Other"
 msgstr "Diğer"
 
-#: include/functions2.php:106
+#: include/functions2.php:107
 #: classes/pref/labels.php:267
 msgid "Create label"
 msgstr "Arama başlığı tanımla"
 
-#: include/functions2.php:107
+#: include/functions2.php:108
 #: classes/pref/filters.php:753
 msgid "Create filter"
 msgstr "Filtre tanımla"
 
-#: include/functions2.php:108
+#: include/functions2.php:109
 msgid "Un/collapse sidebar"
 msgstr "Kenar çubuğunu aç/kapa"
 
-#: include/functions2.php:109
+#: include/functions2.php:110
 msgid "Show help dialog"
 msgstr "Yardım diyaloğunu göster"
 
-#: include/functions2.php:663
+#: include/functions2.php:665
 #, php-format
 msgid "Search results: %s"
 msgstr "Arama sonuçları: %s"
 
-#: include/functions2.php:1317
+#: include/functions2.php:1330
 #: classes/feeds.php:749
 msgid "comment"
 msgid_plural "comments"
 msgstr[0] "yorum"
 msgstr[1] "yorumlar"
 
-#: include/functions2.php:1321
+#: include/functions2.php:1334
 #: classes/feeds.php:753
 msgid "comments"
 msgstr "Yorumlar"
 
-#: include/functions2.php:1347
+#: include/functions2.php:1360
 msgid " - "
 msgstr "-"
 
-#: include/functions2.php:1380
-#: include/functions2.php:1631
+#: include/functions2.php:1393
+#: include/functions2.php:1644
 #: classes/article.php:311
 msgid "no tags"
 msgstr "Etiketi yok"
 
-#: include/functions2.php:1390
+#: include/functions2.php:1403
 #: classes/feeds.php:735
 msgid "Edit tags for this article"
 msgstr "Bu yazı için etiketler tanımla"
 
-#: include/functions2.php:1422
+#: include/functions2.php:1435
 #: classes/feeds.php:682
 msgid "Originally from:"
 msgstr "Asıl kaynağı:"
 
-#: include/functions2.php:1435
+#: include/functions2.php:1448
 #: classes/pref/feeds.php:574
 #: classes/feeds.php:695
 msgid "Feed URL"
 msgstr "Özet akışı internet adresi"
 
-#: include/functions2.php:1472
+#: include/functions2.php:1485
 #: classes/backend.php:105
 #: classes/dlg.php:37
 #: classes/dlg.php:60
 #: classes/dlg.php:93
 #: classes/dlg.php:159
 #: classes/dlg.php:186
-#: classes/pref/feeds.php:1654
-#: classes/pref/feeds.php:1720
+#: classes/pref/feeds.php:1658
+#: classes/pref/feeds.php:1724
 #: classes/pref/filters.php:204
 #: classes/pref/prefs.php:1105
 #: plugins/af_psql_trgm/init.php:102
 #: plugins/import_export/init.php:415
-#: plugins/import_export/init.php:460
+#: plugins/import_export/init.php:461
 #: plugins/share/init.php:121
 msgid "Close this window"
 msgstr "Bu pencereyi kapa"
 
-#: include/functions2.php:1669
+#: include/functions2.php:1682
 msgid "(edit note)"
 msgstr "(notu değiştir)"
 
-#: include/functions2.php:1924
+#: include/functions2.php:1937
 msgid "unknown type"
 msgstr "bilinmeyen tür"
 
-#: include/functions2.php:2001
+#: include/functions2.php:2014
 msgid "Attachments"
 msgstr "Ekler"
 
+#: include/functions2.php:2456
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: include/functions2.php:2457
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr ""
+
+#: include/functions2.php:2458
+msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
+msgstr ""
+
+#: include/functions2.php:2459
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: include/functions2.php:2460
+#, fuzzy
+msgid "No file was uploaded"
+msgstr "Dosya yüklenemedi."
+
+#: include/functions2.php:2461
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: include/functions2.php:2462
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: include/functions2.php:2463
+msgid "A PHP extension stopped the file upload."
+msgstr ""
+
 #: include/login_form.php:197
 #: classes/handler/public.php:569
 #: classes/handler/public.php:824
@@ -908,8 +945,8 @@ msgstr "Bu yazı için etiketler (virgülle ayrılmış):"
 #: classes/article.php:222
 #: classes/pref/labels.php:79
 #: classes/pref/users.php:98
-#: classes/pref/feeds.php:799
-#: classes/pref/feeds.php:939
+#: classes/pref/feeds.php:801
+#: classes/pref/feeds.php:943
 #: classes/pref/filters.php:485
 #: classes/pref/prefs.php:989
 #: plugins/instances/init.php:245
@@ -927,17 +964,17 @@ msgstr "Kaydet"
 #: classes/handler/public.php:580
 #: classes/pref/labels.php:81
 #: classes/pref/users.php:100
-#: classes/pref/feeds.php:800
-#: classes/pref/feeds.php:942
-#: classes/pref/feeds.php:1860
+#: classes/pref/feeds.php:802
+#: classes/pref/feeds.php:946
+#: classes/pref/feeds.php:1865
 #: classes/pref/filters.php:488
 #: classes/pref/filters.php:902
 #: classes/pref/filters.php:983
 #: classes/pref/filters.php:1076
 #: classes/pref/prefs.php:991
-#: classes/feeds.php:1098
-#: classes/feeds.php:1148
-#: classes/feeds.php:1185
+#: classes/feeds.php:1100
+#: classes/feeds.php:1150
+#: classes/feeds.php:1187
 #: plugins/instances/init.php:248
 #: plugins/instances/init.php:436
 #: plugins/note/init.php:53
@@ -993,7 +1030,6 @@ msgid "Processing category: %s"
 msgstr "Kategori işleniyor: %s"
 
 #: classes/opml.php:470
-#: plugins/import_export/init.php:428
 #, php-format
 msgid "Upload failed with error code %d"
 msgstr "Yükleme başarısız oldu hata kodu %d"
@@ -1213,9 +1249,9 @@ msgstr "Arama başlığı tanımlandı <b>%s</b>"
 
 #: classes/pref/labels.php:258
 #: classes/pref/users.php:334
-#: classes/pref/feeds.php:1340
-#: classes/pref/feeds.php:1602
-#: classes/pref/feeds.php:1666
+#: classes/pref/feeds.php:1344
+#: classes/pref/feeds.php:1606
+#: classes/pref/feeds.php:1670
 #: classes/pref/filters.php:359
 #: classes/pref/filters.php:407
 #: classes/pref/filters.php:744
@@ -1228,9 +1264,9 @@ msgstr "Seç"
 
 #: classes/pref/labels.php:261
 #: classes/pref/users.php:337
-#: classes/pref/feeds.php:1343
-#: classes/pref/feeds.php:1605
-#: classes/pref/feeds.php:1669
+#: classes/pref/feeds.php:1347
+#: classes/pref/feeds.php:1609
+#: classes/pref/feeds.php:1673
 #: classes/pref/filters.php:362
 #: classes/pref/filters.php:410
 #: classes/pref/filters.php:747
@@ -1244,9 +1280,9 @@ msgstr "Tümü"
 
 #: classes/pref/labels.php:263
 #: classes/pref/users.php:339
-#: classes/pref/feeds.php:1345
-#: classes/pref/feeds.php:1607
-#: classes/pref/feeds.php:1671
+#: classes/pref/feeds.php:1349
+#: classes/pref/feeds.php:1611
+#: classes/pref/feeds.php:1675
 #: classes/pref/filters.php:364
 #: classes/pref/filters.php:412
 #: classes/pref/filters.php:749
@@ -1260,10 +1296,10 @@ msgstr "Hiçbiri"
 
 #: classes/pref/labels.php:270
 #: classes/pref/users.php:348
-#: classes/pref/feeds.php:765
+#: classes/pref/feeds.php:767
 #: classes/pref/filters.php:478
 #: classes/pref/filters.php:766
-#: classes/feeds.php:1147
+#: classes/feeds.php:1149
 #: plugins/instances/init.php:294
 msgid "Remove"
 msgstr "Kaldır"
@@ -1285,7 +1321,7 @@ msgstr "Kuralı düzenle"
 
 #: classes/pref/users.php:56
 #: classes/pref/feeds.php:637
-#: classes/pref/feeds.php:876
+#: classes/pref/feeds.php:878
 #: classes/feeds.php:1070
 msgid "Authentication"
 msgstr "Doğrulama"
@@ -1295,8 +1331,8 @@ msgid "Access level: "
 msgstr "Erişim seviyesi:"
 
 #: classes/pref/users.php:77
-#: classes/pref/feeds.php:665
-#: classes/pref/feeds.php:892
+#: classes/pref/feeds.php:667
+#: classes/pref/feeds.php:896
 msgid "Options"
 msgstr "Opsiyonlar"
 
@@ -1362,10 +1398,10 @@ msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] Şifre değiştirme hatırlatması"
 
 #: classes/pref/users.php:324
-#: classes/pref/feeds.php:1336
+#: classes/pref/feeds.php:1340
 #: classes/pref/filters.php:740
-#: classes/feeds.php:1118
-#: classes/feeds.php:1184
+#: classes/feeds.php:1120
+#: classes/feeds.php:1186
 #: js/tt-rss.js:174
 msgid "Search"
 msgstr "Ara"
@@ -1382,8 +1418,8 @@ msgstr "Düzenle"
 
 #: classes/pref/users.php:397
 #: classes/pref/feeds.php:643
-#: classes/pref/feeds.php:880
-#: classes/pref/feeds.php:1838
+#: classes/pref/feeds.php:882
+#: classes/pref/feeds.php:1842
 #: classes/feeds.php:1074
 msgid "Login"
 msgstr "Oturum aç"
@@ -1462,251 +1498,251 @@ msgid "Feed Title"
 msgstr "Özet akışı başlığı"
 
 #: classes/pref/feeds.php:595
-#: classes/pref/feeds.php:828
-#: classes/pref/feeds.php:1824
+#: classes/pref/feeds.php:830
+#: classes/pref/feeds.php:1828
 #: classes/feeds.php:1050
 msgid "Place in category:"
 msgstr "Kategoriye yerleştir"
 
 #: classes/pref/feeds.php:608
-#: classes/pref/feeds.php:842
+#: classes/pref/feeds.php:844
 #, fuzzy
 msgid "Language:"
 msgstr "Dil"
 
 #: classes/pref/feeds.php:615
-#: classes/pref/feeds.php:851
+#: classes/pref/feeds.php:853
 msgid "Update"
 msgstr "Yenileme"
 
 #: classes/pref/feeds.php:630
-#: classes/pref/feeds.php:867
+#: classes/pref/feeds.php:869
 msgid "Article purging:"
 msgstr "Yazıları temizleme:"
 
-#: classes/pref/feeds.php:656
-#: classes/pref/feeds.php:886
-#: classes/pref/feeds.php:1841
+#: classes/pref/feeds.php:658
+#: classes/pref/feeds.php:890
+#: classes/pref/feeds.php:1845
 #: classes/pref/prefs.php:245
-#: classes/feeds.php:1077
+#: classes/feeds.php:1078
 msgid "Password"
 msgstr "Şifre"
 
-#: classes/pref/feeds.php:660
+#: classes/pref/feeds.php:662
 msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
 msgstr "<b>İpucu:</b> Eğer özet akışınız gerektiriyorsa buraya giriş bilgilerinizi girmelisiniz. Twitter özet akışları için giriş bilgisi gerekli değildir."
 
-#: classes/pref/feeds.php:679
-#: classes/pref/feeds.php:896
+#: classes/pref/feeds.php:681
+#: classes/pref/feeds.php:900
 msgid "Hide from Popular feeds"
 msgstr "Popüler özet akışlarında görünmesin"
 
-#: classes/pref/feeds.php:691
-#: classes/pref/feeds.php:902
+#: classes/pref/feeds.php:693
+#: classes/pref/feeds.php:906
 msgid "Include in e-mail digest"
 msgstr "E-posta özetine ekle"
 
-#: classes/pref/feeds.php:704
-#: classes/pref/feeds.php:908
+#: classes/pref/feeds.php:706
+#: classes/pref/feeds.php:912
 msgid "Always display image attachments"
 msgstr "Daima resimleri göster"
 
-#: classes/pref/feeds.php:717
-#: classes/pref/feeds.php:916
+#: classes/pref/feeds.php:719
+#: classes/pref/feeds.php:920
 msgid "Do not embed images"
 msgstr "Resimleri gösterme"
 
-#: classes/pref/feeds.php:730
-#: classes/pref/feeds.php:924
+#: classes/pref/feeds.php:732
+#: classes/pref/feeds.php:928
 msgid "Cache images locally"
 msgstr "Resimleri sunucuda sakla"
 
-#: classes/pref/feeds.php:742
-#: classes/pref/feeds.php:930
+#: classes/pref/feeds.php:744
+#: classes/pref/feeds.php:934
 msgid "Mark updated articles as unread"
 msgstr "Yenilenen yazıları okunmamış işaretle"
 
-#: classes/pref/feeds.php:746
+#: classes/pref/feeds.php:748
 msgid "Icon"
 msgstr "İkon"
 
-#: classes/pref/feeds.php:763
+#: classes/pref/feeds.php:765
 msgid "Replace"
 msgstr "Değiştir"
 
-#: classes/pref/feeds.php:770
+#: classes/pref/feeds.php:772
 #: classes/pref/prefs.php:706
 msgid "Plugins"
 msgstr "Eklentiler"
 
-#: classes/pref/feeds.php:790
+#: classes/pref/feeds.php:792
 msgid "Resubscribe to push updates"
 msgstr "Push yenilemelere tekrar abone ol"
 
-#: classes/pref/feeds.php:797
+#: classes/pref/feeds.php:799
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr "Push özet akışlarında PubSubHubbub abonelik durumunu tekrar kurar."
 
-#: classes/pref/feeds.php:1203
-#: classes/pref/feeds.php:1256
+#: classes/pref/feeds.php:1207
+#: classes/pref/feeds.php:1260
 msgid "All done."
 msgstr "Bitti."
 
-#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1315
 msgid "Feeds with errors"
 msgstr "Hatalı özet akışları"
 
-#: classes/pref/feeds.php:1318
+#: classes/pref/feeds.php:1322
 msgid "Inactive feeds"
 msgstr "Aktif olmayan özet akışları"
 
-#: classes/pref/feeds.php:1354
+#: classes/pref/feeds.php:1358
 msgid "Edit selected feeds"
 msgstr "Seçili özet akışlarını düzenle"
 
-#: classes/pref/feeds.php:1356
-#: classes/pref/feeds.php:1370
+#: classes/pref/feeds.php:1360
+#: classes/pref/feeds.php:1374
 #: classes/pref/filters.php:762
 msgid "Reset sort order"
 msgstr "Sıralamayı eski haline getir"
 
-#: classes/pref/feeds.php:1358
+#: classes/pref/feeds.php:1362
 #: js/prefs.js:1737
 msgid "Batch subscribe"
 msgstr "Toplu abone ol"
 
-#: classes/pref/feeds.php:1365
+#: classes/pref/feeds.php:1369
 msgid "Categories"
 msgstr "Kategoriler"
 
-#: classes/pref/feeds.php:1368
+#: classes/pref/feeds.php:1372
 msgid "Add category"
 msgstr "Kategori ekle"
 
-#: classes/pref/feeds.php:1372
+#: classes/pref/feeds.php:1376
 msgid "Remove selected"
 msgstr "Seçileni kaldır"
 
-#: classes/pref/feeds.php:1383
+#: classes/pref/feeds.php:1387
 msgid "More actions..."
 msgstr "Daha..."
 
-#: classes/pref/feeds.php:1387
+#: classes/pref/feeds.php:1391
 msgid "Manual purge"
 msgstr "Elle temizleme"
 
-#: classes/pref/feeds.php:1391
+#: classes/pref/feeds.php:1395
 msgid "Clear feed data"
 msgstr "Özet akışı verisini kaldır"
 
-#: classes/pref/feeds.php:1392
+#: classes/pref/feeds.php:1396
 #: classes/pref/filters.php:770
 msgid "Rescore articles"
 msgstr "Yazıları tekrar skorla"
 
-#: classes/pref/feeds.php:1444
+#: classes/pref/feeds.php:1448
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1446
+#: classes/pref/feeds.php:1450
 msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
 msgstr "OPML kullanarak veri akışlarınızı, filtrelerinizi, arama başlıklarınızı ve okuyucu tercihlerinizi dışa taşıyabilirsiniz."
 
-#: classes/pref/feeds.php:1447
+#: classes/pref/feeds.php:1451
 msgid "Only main settings profile can be migrated using OPML."
 msgstr "OPML ile sadece ana tercihler profili nakli yapılabilir. "
 
-#: classes/pref/feeds.php:1460
+#: classes/pref/feeds.php:1464
 msgid "Import my OPML"
 msgstr "OPML'imi içe aktar"
 
-#: classes/pref/feeds.php:1466
+#: classes/pref/feeds.php:1470
 msgid "Filename:"
 msgstr "Dosya adı:"
 
-#: classes/pref/feeds.php:1468
+#: classes/pref/feeds.php:1472
 msgid "Include settings"
 msgstr "Ayarları dahil et"
 
-#: classes/pref/feeds.php:1472
+#: classes/pref/feeds.php:1476
 msgid "Export OPML"
 msgstr "OPML'i dışa aktar"
 
-#: classes/pref/feeds.php:1476
+#: classes/pref/feeds.php:1480
 msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
 msgstr "Aşağıdaki adresi bilen kişiler OPML'inize abone olabilir."
 
-#: classes/pref/feeds.php:1480
+#: classes/pref/feeds.php:1484
 msgid "Public OPML URL"
 msgstr "Herkese açık OPML adresi"
 
-#: classes/pref/feeds.php:1481
+#: classes/pref/feeds.php:1485
 msgid "Display published OPML URL"
 msgstr "Yayınlanan OPML adresini göster"
 
-#: classes/pref/feeds.php:1490
+#: classes/pref/feeds.php:1494
 msgid "Firefox integration"
 msgstr "Firefox bütünleşimi"
 
-#: classes/pref/feeds.php:1492
+#: classes/pref/feeds.php:1496
 msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
 msgstr "Aşağıdaki linke tıklayarak bu site Firefox Feed Reader olarak kullanılabilir."
 
-#: classes/pref/feeds.php:1499
+#: classes/pref/feeds.php:1503
 msgid "Click here to register this site as a feed reader."
 msgstr "Bu siteyi özet akışı okuyucu olarak tanımlamak için buraya tıklayın."
 
-#: classes/pref/feeds.php:1507
+#: classes/pref/feeds.php:1511
 msgid "Published & shared articles / Generated feeds"
 msgstr "Yayınlanmış ve paylaşılmış yazılar / Oluşturulan özet akışları"
 
-#: classes/pref/feeds.php:1509
+#: classes/pref/feeds.php:1513
 msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
 msgstr "Yayınlanmış yazılar herkese açık RSS özet beslemesi olarak dışa aktarılır ve bunun adresini bilen herkes buna abone olabilir."
 
-#: classes/pref/feeds.php:1516
+#: classes/pref/feeds.php:1520
 #: classes/feeds.php:54
 #: classes/feeds.php:134
 msgid "View as RSS"
 msgstr "RSS olarak görüntüle"
 
-#: classes/pref/feeds.php:1517
+#: classes/pref/feeds.php:1521
 msgid "Display URL"
 msgstr "Adresi göster"
 
-#: classes/pref/feeds.php:1520
+#: classes/pref/feeds.php:1524
 msgid "Clear all generated URLs"
 msgstr "Tüm üretilmiş adresleri temizle"
 
-#: classes/pref/feeds.php:1598
+#: classes/pref/feeds.php:1602
 msgid "These feeds have not been updated with new content for 3 months (oldest first):"
 msgstr "Bu özet akışları için 3 aydır yeni içerik yayınlanmadı (en eski en üstte):"
 
-#: classes/pref/feeds.php:1632
-#: classes/pref/feeds.php:1696
+#: classes/pref/feeds.php:1636
+#: classes/pref/feeds.php:1700
 msgid "Click to edit feed"
 msgstr "Özet akışını düzenlemek için tıklayın"
 
-#: classes/pref/feeds.php:1650
-#: classes/pref/feeds.php:1716
+#: classes/pref/feeds.php:1654
+#: classes/pref/feeds.php:1720
 msgid "Unsubscribe from selected feeds"
 msgstr "Seçilen özet akışlarının aboneliğinden ayrıl"
 
-#: classes/pref/feeds.php:1821
+#: classes/pref/feeds.php:1825
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr "Satır başına bir RSS özet akışı ekle (özet akışı belirlemesi yapılmıyor)"
 
-#: classes/pref/feeds.php:1830
+#: classes/pref/feeds.php:1834
 msgid "Feeds to subscribe, One per line"
 msgstr "Abone olunacak özet akışları, satır başına bir tane"
 
-#: classes/pref/feeds.php:1852
+#: classes/pref/feeds.php:1857
 msgid "Feeds require authentication."
 msgstr "Onaylama gereken özet akışları."
 
-#: classes/pref/feeds.php:1859
-#: classes/feeds.php:1092
-#: classes/feeds.php:1146
+#: classes/pref/feeds.php:1864
+#: classes/feeds.php:1094
+#: classes/feeds.php:1148
 msgid "Subscribe"
 msgstr "Abone ol"
 
@@ -1789,7 +1825,7 @@ msgid "on field"
 msgstr "alanda"
 
 #: classes/pref/filters.php:962
-#: js/PrefFilterTree.js:61
+#: js/PrefFilterTree.js:64
 msgid "in"
 msgstr "de"
 
@@ -2384,40 +2420,40 @@ msgstr "Özet akışı ya da site adresi"
 msgid "Available feeds"
 msgstr "Mevcut veri akışları"
 
-#: classes/feeds.php:1087
+#: classes/feeds.php:1089
 msgid "This feed requires authentication."
 msgstr "Bu özet akışı doğrulama gerektiriyor."
 
-#: classes/feeds.php:1095
+#: classes/feeds.php:1097
 msgid "More feeds"
 msgstr "Daha fazla özet akışı"
 
-#: classes/feeds.php:1122
+#: classes/feeds.php:1124
 msgid "Popular feeds"
 msgstr "Popüler özet akışları"
 
-#: classes/feeds.php:1123
+#: classes/feeds.php:1125
 msgid "Feed archive"
 msgstr "Özet akışı arşivi"
 
-#: classes/feeds.php:1126
+#: classes/feeds.php:1128
 msgid "limit:"
 msgstr "limit:"
 
-#: classes/feeds.php:1158
+#: classes/feeds.php:1160
 msgid "Look for"
 msgstr "Arama yap"
 
-#: classes/feeds.php:1166
+#: classes/feeds.php:1168
 #, php-format
 msgid "in %s"
 msgstr ""
 
-#: classes/feeds.php:1171
+#: classes/feeds.php:1173
 msgid "Used for word stemming"
 msgstr ""
 
-#: classes/feeds.php:1180
+#: classes/feeds.php:1182
 #, fuzzy
 msgid "Search syntax"
 msgstr "Ara"
@@ -2681,6 +2717,11 @@ msgstr "XML dokümanı yüklenemedi."
 msgid "Prepare data"
 msgstr "Verileri hazırla"
 
+#: plugins/import_export/init.php:428
+#, fuzzy, php-format
+msgid "Upload failed with error code %d (%s)"
+msgstr "Yükleme başarısız oldu hata kodu %d"
+
 #: plugins/import_export/init.php:454
 msgid "No file uploaded."
 msgstr "Dosya yüklenemedi."
@@ -2791,7 +2832,7 @@ msgstr "Kategoriyi düzenle"
 msgid "Remove category"
 msgstr "Kategoriyi kaldır"
 
-#: js/PrefFilterTree.js:64
+#: js/PrefFilterTree.js:67
 msgid "Inverse"
 msgstr "Seçimi ters çevir"
 
@@ -2843,7 +2884,7 @@ msgid "Subscription reset."
 msgstr "Abonelik tekrar kuruldu."
 
 #: js/functions.js:1311
-#: js/tt-rss.js:682
+#: js/tt-rss.js:705
 #, perl-format
 msgid "Unsubscribe from %s?"
 msgstr "%s abonelikten ayrıl?"
@@ -3073,40 +3114,40 @@ msgstr "Tüm yazıları okundu işaretle?"
 msgid "Marking all feeds as read..."
 msgstr "Tüm yazılar okundu olarak işaretleniyor..."
 
-#: js/tt-rss.js:383
+#: js/tt-rss.js:404
 msgid "Please enable mail plugin first."
 msgstr "Lütfen önce e-posta eklentisini aktif hale getirin."
 
-#: js/tt-rss.js:431
+#: js/tt-rss.js:452
 #: js/functions.js:1643
-#: js/tt-rss.js:663
+#: js/tt-rss.js:686
 msgid "You can't edit this kind of feed."
 msgstr "Bu türde bir özet akışını düzenleyemezsiniz."
 
-#: js/tt-rss.js:502
+#: js/tt-rss.js:533
 msgid "Please enable embed_original plugin first."
 msgstr "Lütfen önce embed_original eklentisini aktif hale getirin."
 
-#: js/tt-rss.js:515
-#: js/tt-rss.js:713
+#: js/tt-rss.js:546
+#: js/tt-rss.js:736
 msgid "Widescreen is not available in combined mode."
 msgstr ""
 
-#: js/tt-rss.js:827
+#: js/tt-rss.js:850
 msgid "You can't rescore this kind of feed."
 msgstr "Bu tipte bir özet akışını tekrar skorlayamazsınız."
 
-#: js/tt-rss.js:832
-#: js/tt-rss.js:676
+#: js/tt-rss.js:855
+#: js/tt-rss.js:699
 msgid "Please select some feed first."
 msgstr "Lütfen önce özet akışı seçin."
 
-#: js/tt-rss.js:837
+#: js/tt-rss.js:860
 #, perl-format
 msgid "Rescore articles in %s?"
 msgstr "%s'deki yazılar tekrar skorlansın mı?"
 
-#: js/tt-rss.js:840
+#: js/tt-rss.js:863
 msgid "Rescoring articles..."
 msgstr "Yazılar tekrar skorlanıyor..."
 
@@ -3285,7 +3326,7 @@ msgstr "Kişisel bilgileriniz kaydedildi."
 msgid "Sorry, your browser does not support sandboxed iframes."
 msgstr "Üzgünüm, tarayıcınız sandboxed iframes'i desteklemiyor"
 
-#: plugins/shorten_expanded/init.js:37
+#: plugins/shorten_expanded/init.js:39
 msgid "Click to expand article"
 msgstr "Yazıyı genişletmek için tıklayın"
 
@@ -3533,7 +3574,7 @@ msgstr "Oluşturulan internet adresleri temizlendi."
 msgid "Label Editor"
 msgstr "Arama başlığı editörü"
 
-#: js/tt-rss.js:671
+#: js/tt-rss.js:694
 msgid "You can't unsubscribe from the category."
 msgstr "Kategori aboneliğinden ayrılamazsınız."
 
diff --git a/locale/zh_CN/LC_MESSAGES/messages.mo b/locale/zh_CN/LC_MESSAGES/messages.mo
index 459a44b42..3e97630a3 100644
Binary files a/locale/zh_CN/LC_MESSAGES/messages.mo and b/locale/zh_CN/LC_MESSAGES/messages.mo differ
diff --git a/locale/zh_CN/LC_MESSAGES/messages.po b/locale/zh_CN/LC_MESSAGES/messages.po
index b2b833fe5..9c28f5f4e 100644
--- a/locale/zh_CN/LC_MESSAGES/messages.po
+++ b/locale/zh_CN/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tiny Tiny RSS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 22:58+0300\n"
+"POT-Creation-Date: 2016-08-19 18:16+0300\n"
 "PO-Revision-Date: 2012-02-14 08:32+0000\n"
 "Last-Translator: Hao Wu\n"
 "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/tt-rss/language/zh_CN/)\n"
@@ -170,13 +170,13 @@ msgstr "找不到信息源。"
 msgid "Plugin not found"
 msgstr "未找到用户"
 
-#: index.php:133
-#: index.php:149
-#: index.php:267
-#: prefs.php:102
+#: index.php:148
+#: index.php:164
+#: index.php:282
+#: prefs.php:117
 #: classes/backend.php:5
 #: classes/pref/labels.php:282
-#: classes/pref/feeds.php:1405
+#: classes/pref/feeds.php:1409
 #: classes/pref/filters.php:779
 #: js/feedlist.js:159
 #: js/functions.js:1293
@@ -188,7 +188,7 @@ msgstr "未找到用户"
 #: js/prefs.js:1781
 #: js/prefs.js:1799
 #: js/tt-rss.js:55
-#: js/tt-rss.js:522
+#: js/tt-rss.js:553
 #: js/viewfeed.js:1298
 #: plugins/import_export/import_export.js:17
 #: js/feedlist.js:484
@@ -201,75 +201,75 @@ msgstr "未找到用户"
 #: js/prefs.js:1556
 #: js/prefs.js:1572
 #: js/prefs.js:1592
-#: js/tt-rss.js:539
+#: js/tt-rss.js:570
 #: js/viewfeed.js:830
 msgid "Loading, please wait..."
 msgstr "读取中，请稍候……"
 
-#: index.php:167
+#: index.php:182
 msgid "Collapse feedlist"
 msgstr "收缩侧边栏"
 
-#: index.php:170
+#: index.php:185
 msgid "Show articles"
 msgstr "显示文章"
 
-#: index.php:173
+#: index.php:188
 msgid "Adaptive"
 msgstr "自动适应"
 
-#: index.php:174
+#: index.php:189
 msgid "All Articles"
 msgstr "全部文章"
 
-#: index.php:175
-#: include/functions2.php:101
+#: index.php:190
+#: include/functions2.php:102
 #: classes/feeds.php:104
 msgid "Starred"
 msgstr "加星标的"
 
-#: index.php:176
-#: include/functions2.php:102
+#: index.php:191
+#: include/functions2.php:103
 #: classes/feeds.php:105
 msgid "Published"
 msgstr "已发布"
 
-#: index.php:177
+#: index.php:192
 #: classes/feeds.php:91
 #: classes/feeds.php:103
 msgid "Unread"
 msgstr "未读"
 
-#: index.php:178
+#: index.php:193
 msgid "With Note"
 msgstr "笔记"
 
-#: index.php:179
+#: index.php:194
 msgid "Ignore Scoring"
 msgstr "忽略评分"
 
-#: index.php:182
+#: index.php:197
 msgid "Sort articles"
 msgstr "排序文章"
 
-#: index.php:185
+#: index.php:200
 msgid "Default"
 msgstr "默认"
 
-#: index.php:186
+#: index.php:201
 msgid "Newest first"
 msgstr "最新优先"
 
-#: index.php:187
+#: index.php:202
 msgid "Oldest first"
 msgstr "最早优先"
 
-#: index.php:188
+#: index.php:203
 msgid "Title"
 msgstr "标题"
 
-#: index.php:192
-#: index.php:233
+#: index.php:207
+#: index.php:248
 #: include/functions2.php:90
 #: classes/feeds.php:109
 #: js/FeedTree.js:132
@@ -277,136 +277,136 @@ msgstr "标题"
 msgid "Mark as read"
 msgstr "标记为已读"
 
-#: index.php:195
+#: index.php:210
 msgid "Older than one day"
 msgstr "一天前"
 
-#: index.php:198
+#: index.php:213
 msgid "Older than one week"
 msgstr "一周前"
 
-#: index.php:201
+#: index.php:216
 msgid "Older than two weeks"
 msgstr "两周前"
 
-#: index.php:217
+#: index.php:232
 msgid "Communication problem with server."
 msgstr "连接服务器出错."
 
-#: index.php:223
+#: index.php:238
 msgid "Actions..."
 msgstr "操作"
 
-#: index.php:225
+#: index.php:240
 #, fuzzy
 msgid "Preferences..."
 msgstr "偏好设置"
 
-#: index.php:226
+#: index.php:241
 msgid "Search..."
 msgstr "搜索"
 
-#: index.php:227
+#: index.php:242
 msgid "Feed actions:"
 msgstr "信息源操作："
 
-#: index.php:228
+#: index.php:243
 #: classes/handler/public.php:672
 msgid "Subscribe to feed..."
 msgstr "订阅信息源"
 
-#: index.php:229
+#: index.php:244
 msgid "Edit this feed..."
 msgstr "编辑信息源"
 
-#: index.php:230
+#: index.php:245
 msgid "Rescore feed"
 msgstr "为信息源重新评分"
 
-#: index.php:231
-#: classes/pref/feeds.php:783
-#: classes/pref/feeds.php:1360
+#: index.php:246
+#: classes/pref/feeds.php:785
+#: classes/pref/feeds.php:1364
 #: js/PrefFeedTree.js:74
 msgid "Unsubscribe"
 msgstr "取消订阅"
 
-#: index.php:232
+#: index.php:247
 msgid "All feeds:"
 msgstr "全部信息源："
 
-#: index.php:234
+#: index.php:249
 msgid "(Un)hide read feeds"
 msgstr "隐藏（显示）已读信息"
 
-#: index.php:235
+#: index.php:250
 msgid "Other actions:"
 msgstr "其他操作："
 
-#: index.php:236
+#: index.php:251
 #: include/functions2.php:76
 #, fuzzy
 msgid "Toggle widescreen mode"
 msgstr "切换宽屏模式"
 
-#: index.php:237
+#: index.php:252
 msgid "Create label..."
 msgstr "创建预定义标签"
 
-#: index.php:238
+#: index.php:253
 msgid "Create filter..."
 msgstr "创建过滤器"
 
-#: index.php:239
+#: index.php:254
 msgid "Keyboard shortcuts help"
 msgstr "快捷键帮助"
 
-#: index.php:248
+#: index.php:263
 msgid "Logout"
 msgstr "注销"
 
-#: index.php:254
+#: index.php:269
 msgid "Updates are available from Git."
 msgstr ""
 
 #: prefs.php:33
-#: prefs.php:120
-#: include/functions2.php:104
+#: prefs.php:135
+#: include/functions2.php:105
 #: classes/pref/prefs.php:435
 msgid "Preferences"
 msgstr "偏好设置"
 
-#: prefs.php:111
+#: prefs.php:126
 msgid "Keyboard shortcuts"
 msgstr "快捷键"
 
-#: prefs.php:112
+#: prefs.php:127
 msgid "Exit preferences"
 msgstr "退出偏好设置"
 
-#: prefs.php:123
+#: prefs.php:138
 #: classes/pref/feeds.php:112
-#: classes/pref/feeds.php:1300
-#: classes/pref/feeds.php:1349
+#: classes/pref/feeds.php:1304
+#: classes/pref/feeds.php:1353
 msgid "Feeds"
 msgstr "信息源"
 
-#: prefs.php:126
+#: prefs.php:141
 #: classes/pref/filters.php:248
 msgid "Filters"
 msgstr "过滤器"
 
-#: prefs.php:129
-#: include/functions.php:1256
-#: include/functions.php:1909
+#: prefs.php:144
+#: include/functions.php:1287
+#: include/functions.php:1940
 #: classes/pref/labels.php:90
 msgid "Labels"
 msgstr "预定义标签"
 
-#: prefs.php:133
+#: prefs.php:148
 msgid "Users"
 msgstr "用户"
 
-#: prefs.php:136
+#: prefs.php:151
 msgid "System"
 msgstr "系统"
 
@@ -489,10 +489,10 @@ msgid "Tiny Tiny RSS data update script."
 msgstr "Tiny Tiny RSS 数据更新脚本。"
 
 #: include/digest.php:109
-#: include/functions.php:1265
-#: include/functions.php:1810
-#: include/functions.php:1895
-#: include/functions.php:1917
+#: include/functions.php:1296
+#: include/functions.php:1841
+#: include/functions.php:1926
+#: include/functions.php:1948
 #: classes/opml.php:421
 #: classes/pref/feeds.php:228
 msgid "Uncategorized"
@@ -508,44 +508,44 @@ msgstr[0] "%d 个存档的文章"
 msgid "No feeds found."
 msgstr "未找到信息源。"
 
-#: include/functions.php:958
+#: include/functions.php:989
 #, php-format
 msgid "%d min"
 msgstr ""
 
-#: include/functions.php:1254
-#: include/functions.php:1907
+#: include/functions.php:1285
+#: include/functions.php:1938
 msgid "Special"
 msgstr "特殊区域"
 
-#: include/functions.php:1758
+#: include/functions.php:1789
 #: classes/pref/filters.php:229
 #: classes/pref/filters.php:507
 msgid "All feeds"
 msgstr "全部信息源"
 
-#: include/functions.php:1962
+#: include/functions.php:1993
 msgid "Starred articles"
 msgstr "加星标文章"
 
-#: include/functions.php:1964
+#: include/functions.php:1995
 msgid "Published articles"
 msgstr "已发布文章"
 
-#: include/functions.php:1966
+#: include/functions.php:1997
 msgid "Fresh articles"
 msgstr "最新更新的文章"
 
-#: include/functions.php:1968
-#: include/functions2.php:99
+#: include/functions.php:1999
+#: include/functions2.php:100
 msgid "All articles"
 msgstr "全部文章"
 
-#: include/functions.php:1970
+#: include/functions.php:2001
 msgid "Archived articles"
 msgstr "存档的文章"
 
-#: include/functions.php:1972
+#: include/functions.php:2003
 msgid "Recently read"
 msgstr "最近的阅读"
 
@@ -701,7 +701,7 @@ msgstr "取消选择所有文章"
 
 #: include/functions2.php:85
 #: classes/pref/feeds.php:555
-#: classes/pref/feeds.php:821
+#: classes/pref/feeds.php:823
 msgid "Feed"
 msgstr "信息源"
 
@@ -716,7 +716,7 @@ msgid "Un/hide read feeds"
 msgstr "显示/隐藏 已读信息"
 
 #: include/functions2.php:88
-#: classes/pref/feeds.php:1352
+#: classes/pref/feeds.php:1356
 msgid "Subscribe to feed"
 msgstr "订阅信息源"
 
@@ -733,150 +733,187 @@ msgid "Reverse headlines"
 msgstr "反向排序"
 
 #: include/functions2.php:92
+msgid "Toggle headline grouping"
+msgstr ""
+
+#: include/functions2.php:93
 #, fuzzy
 msgid "Debug feed update"
 msgstr "调试信息源更新"
 
-#: include/functions2.php:93
+#: include/functions2.php:94
 #, fuzzy
 msgid "Debug viewfeed()"
 msgstr "调试信息源更新"
 
-#: include/functions2.php:94
+#: include/functions2.php:95
 #: js/FeedTree.js:182
 msgid "Mark all feeds as read"
 msgstr "标记所有信息源为已读"
 
-#: include/functions2.php:95
+#: include/functions2.php:96
 #, fuzzy
 msgid "Un/collapse current category"
 msgstr "展开/折叠 当前分类"
 
-#: include/functions2.php:96
+#: include/functions2.php:97
 #, fuzzy
 msgid "Toggle combined mode"
 msgstr "切换连续模式"
 
-#: include/functions2.php:97
+#: include/functions2.php:98
 #, fuzzy
 msgid "Toggle auto expand in combined mode"
 msgstr "切换连续模式中的自动展开功能"
 
-#: include/functions2.php:98
+#: include/functions2.php:99
 #, fuzzy
 msgid "Go to"
 msgstr "跳转至……"
 
-#: include/functions2.php:100
+#: include/functions2.php:101
 msgid "Fresh"
 msgstr "最新的"
 
-#: include/functions2.php:103
-#: js/tt-rss.js:466
-#: js/tt-rss.js:650
+#: include/functions2.php:104
+#: js/tt-rss.js:497
+#: js/tt-rss.js:673
 msgid "Tag cloud"
 msgstr "标签云"
 
-#: include/functions2.php:105
+#: include/functions2.php:106
 #, fuzzy
 msgid "Other"
 msgstr "其他信息源"
 
-#: include/functions2.php:106
+#: include/functions2.php:107
 #: classes/pref/labels.php:267
 msgid "Create label"
 msgstr "创建预定义标签"
 
-#: include/functions2.php:107
+#: include/functions2.php:108
 #: classes/pref/filters.php:753
 msgid "Create filter"
 msgstr "创建过滤器"
 
-#: include/functions2.php:108
+#: include/functions2.php:109
 #, fuzzy
 msgid "Un/collapse sidebar"
 msgstr "收起侧边栏"
 
-#: include/functions2.php:109
+#: include/functions2.php:110
 #, fuzzy
 msgid "Show help dialog"
 msgstr "显示帮助对话框"
 
-#: include/functions2.php:663
+#: include/functions2.php:665
 #, php-format
 msgid "Search results: %s"
 msgstr "搜索结果：%s"
 
-#: include/functions2.php:1317
+#: include/functions2.php:1330
 #: classes/feeds.php:749
 #, fuzzy
 msgid "comment"
 msgid_plural "comments"
 msgstr[0] "评论些什么？"
 
-#: include/functions2.php:1321
+#: include/functions2.php:1334
 #: classes/feeds.php:753
 #, fuzzy
 msgid "comments"
 msgstr "评论些什么？"
 
-#: include/functions2.php:1347
+#: include/functions2.php:1360
 msgid " - "
 msgstr " - "
 
-#: include/functions2.php:1380
-#: include/functions2.php:1631
+#: include/functions2.php:1393
+#: include/functions2.php:1644
 #: classes/article.php:311
 msgid "no tags"
 msgstr "无标签"
 
-#: include/functions2.php:1390
+#: include/functions2.php:1403
 #: classes/feeds.php:735
 msgid "Edit tags for this article"
 msgstr "为本文编辑自定义标签"
 
-#: include/functions2.php:1422
+#: include/functions2.php:1435
 #: classes/feeds.php:682
 msgid "Originally from:"
 msgstr "来源："
 
-#: include/functions2.php:1435
+#: include/functions2.php:1448
 #: classes/pref/feeds.php:574
 #: classes/feeds.php:695
 msgid "Feed URL"
 msgstr "信息源 URL"
 
-#: include/functions2.php:1472
+#: include/functions2.php:1485
 #: classes/backend.php:105
 #: classes/dlg.php:37
 #: classes/dlg.php:60
 #: classes/dlg.php:93
 #: classes/dlg.php:159
 #: classes/dlg.php:186
-#: classes/pref/feeds.php:1654
-#: classes/pref/feeds.php:1720
+#: classes/pref/feeds.php:1658
+#: classes/pref/feeds.php:1724
 #: classes/pref/filters.php:204
 #: classes/pref/prefs.php:1105
 #: plugins/af_psql_trgm/init.php:102
 #: plugins/import_export/init.php:415
-#: plugins/import_export/init.php:460
+#: plugins/import_export/init.php:461
 #: plugins/share/init.php:121
 msgid "Close this window"
 msgstr "关闭本窗口"
 
-#: include/functions2.php:1669
+#: include/functions2.php:1682
 msgid "(edit note)"
 msgstr "（编辑注记）"
 
-#: include/functions2.php:1924
+#: include/functions2.php:1937
 msgid "unknown type"
 msgstr "未知类型"
 
-#: include/functions2.php:2001
+#: include/functions2.php:2014
 #, fuzzy
 msgid "Attachments"
 msgstr "附件："
 
+#: include/functions2.php:2456
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: include/functions2.php:2457
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr ""
+
+#: include/functions2.php:2458
+msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
+msgstr ""
+
+#: include/functions2.php:2459
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: include/functions2.php:2460
+#, fuzzy
+msgid "No file was uploaded"
+msgstr "没有文件上传。"
+
+#: include/functions2.php:2461
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: include/functions2.php:2462
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: include/functions2.php:2463
+msgid "A PHP extension stopped the file upload."
+msgstr ""
+
 #: include/login_form.php:197
 #: classes/handler/public.php:569
 #: classes/handler/public.php:824
@@ -947,8 +984,8 @@ msgstr "本文的标签，请用逗号分开："
 #: classes/article.php:222
 #: classes/pref/labels.php:79
 #: classes/pref/users.php:98
-#: classes/pref/feeds.php:799
-#: classes/pref/feeds.php:939
+#: classes/pref/feeds.php:801
+#: classes/pref/feeds.php:943
 #: classes/pref/filters.php:485
 #: classes/pref/prefs.php:989
 #: plugins/instances/init.php:245
@@ -966,17 +1003,17 @@ msgstr "保存"
 #: classes/handler/public.php:580
 #: classes/pref/labels.php:81
 #: classes/pref/users.php:100
-#: classes/pref/feeds.php:800
-#: classes/pref/feeds.php:942
-#: classes/pref/feeds.php:1860
+#: classes/pref/feeds.php:802
+#: classes/pref/feeds.php:946
+#: classes/pref/feeds.php:1865
 #: classes/pref/filters.php:488
 #: classes/pref/filters.php:902
 #: classes/pref/filters.php:983
 #: classes/pref/filters.php:1076
 #: classes/pref/prefs.php:991
-#: classes/feeds.php:1098
-#: classes/feeds.php:1148
-#: classes/feeds.php:1185
+#: classes/feeds.php:1100
+#: classes/feeds.php:1150
+#: classes/feeds.php:1187
 #: plugins/instances/init.php:248
 #: plugins/instances/init.php:436
 #: plugins/note/init.php:53
@@ -1033,7 +1070,6 @@ msgid "Processing category: %s"
 msgstr "加入到类别："
 
 #: classes/opml.php:470
-#: plugins/import_export/init.php:428
 #, php-format
 msgid "Upload failed with error code %d"
 msgstr "上传错误，错误代码：%d"
@@ -1262,9 +1298,9 @@ msgstr "创建预定义标签 <b>%s</b>"
 
 #: classes/pref/labels.php:258
 #: classes/pref/users.php:334
-#: classes/pref/feeds.php:1340
-#: classes/pref/feeds.php:1602
-#: classes/pref/feeds.php:1666
+#: classes/pref/feeds.php:1344
+#: classes/pref/feeds.php:1606
+#: classes/pref/feeds.php:1670
 #: classes/pref/filters.php:359
 #: classes/pref/filters.php:407
 #: classes/pref/filters.php:744
@@ -1277,9 +1313,9 @@ msgstr "选择"
 
 #: classes/pref/labels.php:261
 #: classes/pref/users.php:337
-#: classes/pref/feeds.php:1343
-#: classes/pref/feeds.php:1605
-#: classes/pref/feeds.php:1669
+#: classes/pref/feeds.php:1347
+#: classes/pref/feeds.php:1609
+#: classes/pref/feeds.php:1673
 #: classes/pref/filters.php:362
 #: classes/pref/filters.php:410
 #: classes/pref/filters.php:747
@@ -1293,9 +1329,9 @@ msgstr "全部"
 
 #: classes/pref/labels.php:263
 #: classes/pref/users.php:339
-#: classes/pref/feeds.php:1345
-#: classes/pref/feeds.php:1607
-#: classes/pref/feeds.php:1671
+#: classes/pref/feeds.php:1349
+#: classes/pref/feeds.php:1611
+#: classes/pref/feeds.php:1675
 #: classes/pref/filters.php:364
 #: classes/pref/filters.php:412
 #: classes/pref/filters.php:749
@@ -1309,10 +1345,10 @@ msgstr "无"
 
 #: classes/pref/labels.php:270
 #: classes/pref/users.php:348
-#: classes/pref/feeds.php:765
+#: classes/pref/feeds.php:767
 #: classes/pref/filters.php:478
 #: classes/pref/filters.php:766
-#: classes/feeds.php:1147
+#: classes/feeds.php:1149
 #: plugins/instances/init.php:294
 msgid "Remove"
 msgstr "移除"
@@ -1334,7 +1370,7 @@ msgstr "编辑过滤器"
 
 #: classes/pref/users.php:56
 #: classes/pref/feeds.php:637
-#: classes/pref/feeds.php:876
+#: classes/pref/feeds.php:878
 #: classes/feeds.php:1070
 msgid "Authentication"
 msgstr "登录认证"
@@ -1344,8 +1380,8 @@ msgid "Access level: "
 msgstr "访问级别："
 
 #: classes/pref/users.php:77
-#: classes/pref/feeds.php:665
-#: classes/pref/feeds.php:892
+#: classes/pref/feeds.php:667
+#: classes/pref/feeds.php:896
 msgid "Options"
 msgstr "选项"
 
@@ -1411,10 +1447,10 @@ msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] 密码更换提醒"
 
 #: classes/pref/users.php:324
-#: classes/pref/feeds.php:1336
+#: classes/pref/feeds.php:1340
 #: classes/pref/filters.php:740
-#: classes/feeds.php:1118
-#: classes/feeds.php:1184
+#: classes/feeds.php:1120
+#: classes/feeds.php:1186
 #: js/tt-rss.js:174
 msgid "Search"
 msgstr "搜索"
@@ -1431,8 +1467,8 @@ msgstr "编辑"
 
 #: classes/pref/users.php:397
 #: classes/pref/feeds.php:643
-#: classes/pref/feeds.php:880
-#: classes/pref/feeds.php:1838
+#: classes/pref/feeds.php:882
+#: classes/pref/feeds.php:1842
 #: classes/feeds.php:1074
 msgid "Login"
 msgstr "登陆"
@@ -1512,259 +1548,259 @@ msgid "Feed Title"
 msgstr "信息源标题"
 
 #: classes/pref/feeds.php:595
-#: classes/pref/feeds.php:828
-#: classes/pref/feeds.php:1824
+#: classes/pref/feeds.php:830
+#: classes/pref/feeds.php:1828
 #: classes/feeds.php:1050
 msgid "Place in category:"
 msgstr "加入到类别："
 
 #: classes/pref/feeds.php:608
-#: classes/pref/feeds.php:842
+#: classes/pref/feeds.php:844
 #, fuzzy
 msgid "Language:"
 msgstr "语言："
 
 #: classes/pref/feeds.php:615
-#: classes/pref/feeds.php:851
+#: classes/pref/feeds.php:853
 msgid "Update"
 msgstr "更新列表"
 
 #: classes/pref/feeds.php:630
-#: classes/pref/feeds.php:867
+#: classes/pref/feeds.php:869
 msgid "Article purging:"
 msgstr "文章清理："
 
-#: classes/pref/feeds.php:656
-#: classes/pref/feeds.php:886
-#: classes/pref/feeds.php:1841
+#: classes/pref/feeds.php:658
+#: classes/pref/feeds.php:890
+#: classes/pref/feeds.php:1845
 #: classes/pref/prefs.php:245
-#: classes/feeds.php:1077
+#: classes/feeds.php:1078
 msgid "Password"
 msgstr "密码"
 
-#: classes/pref/feeds.php:660
+#: classes/pref/feeds.php:662
 msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
 msgstr "<b>提示：</b>如果您的信息源需要验证，那么您需要填写登录信息。Twitter 信息源除外。"
 
-#: classes/pref/feeds.php:679
-#: classes/pref/feeds.php:896
+#: classes/pref/feeds.php:681
+#: classes/pref/feeds.php:900
 msgid "Hide from Popular feeds"
 msgstr "从最受欢迎的信息源中隐藏"
 
-#: classes/pref/feeds.php:691
-#: classes/pref/feeds.php:902
+#: classes/pref/feeds.php:693
+#: classes/pref/feeds.php:906
 msgid "Include in e-mail digest"
 msgstr "包含电子邮件摘要"
 
-#: classes/pref/feeds.php:704
-#: classes/pref/feeds.php:908
+#: classes/pref/feeds.php:706
+#: classes/pref/feeds.php:912
 msgid "Always display image attachments"
 msgstr "始终显示图片附件"
 
-#: classes/pref/feeds.php:717
-#: classes/pref/feeds.php:916
+#: classes/pref/feeds.php:719
+#: classes/pref/feeds.php:920
 msgid "Do not embed images"
 msgstr "不要嵌入图片"
 
-#: classes/pref/feeds.php:730
-#: classes/pref/feeds.php:924
+#: classes/pref/feeds.php:732
+#: classes/pref/feeds.php:928
 msgid "Cache images locally"
 msgstr "本地缓存图片"
 
-#: classes/pref/feeds.php:742
-#: classes/pref/feeds.php:930
+#: classes/pref/feeds.php:744
+#: classes/pref/feeds.php:934
 msgid "Mark updated articles as unread"
 msgstr "将已更新的文章标记为未读"
 
-#: classes/pref/feeds.php:746
+#: classes/pref/feeds.php:748
 msgid "Icon"
 msgstr "图标"
 
-#: classes/pref/feeds.php:763
+#: classes/pref/feeds.php:765
 msgid "Replace"
 msgstr "替换"
 
-#: classes/pref/feeds.php:770
+#: classes/pref/feeds.php:772
 #: classes/pref/prefs.php:706
 msgid "Plugins"
 msgstr "插件"
 
-#: classes/pref/feeds.php:790
+#: classes/pref/feeds.php:792
 msgid "Resubscribe to push updates"
 msgstr "重新订阅以推送更新"
 
-#: classes/pref/feeds.php:797
+#: classes/pref/feeds.php:799
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr "为启用推送的信息源重置 PubSubHubbub 订阅。"
 
-#: classes/pref/feeds.php:1203
-#: classes/pref/feeds.php:1256
+#: classes/pref/feeds.php:1207
+#: classes/pref/feeds.php:1260
 msgid "All done."
 msgstr "全部完成。"
 
-#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1315
 msgid "Feeds with errors"
 msgstr "有错误的信息源"
 
-#: classes/pref/feeds.php:1318
+#: classes/pref/feeds.php:1322
 #, fuzzy
 msgid "Inactive feeds"
 msgstr "刷新活动的信息源"
 
-#: classes/pref/feeds.php:1354
+#: classes/pref/feeds.php:1358
 msgid "Edit selected feeds"
 msgstr "编辑选定的信息源"
 
-#: classes/pref/feeds.php:1356
-#: classes/pref/feeds.php:1370
+#: classes/pref/feeds.php:1360
+#: classes/pref/feeds.php:1374
 #: classes/pref/filters.php:762
 msgid "Reset sort order"
 msgstr "重置排序"
 
-#: classes/pref/feeds.php:1358
+#: classes/pref/feeds.php:1362
 #: js/prefs.js:1737
 msgid "Batch subscribe"
 msgstr "批量订阅"
 
-#: classes/pref/feeds.php:1365
+#: classes/pref/feeds.php:1369
 #, fuzzy
 msgid "Categories"
 msgstr "信息源类别"
 
-#: classes/pref/feeds.php:1368
+#: classes/pref/feeds.php:1372
 #, fuzzy
 msgid "Add category"
 msgstr "编辑类别"
 
-#: classes/pref/feeds.php:1372
+#: classes/pref/feeds.php:1376
 #, fuzzy
 msgid "Remove selected"
 msgstr "移除选中的信息源"
 
-#: classes/pref/feeds.php:1383
+#: classes/pref/feeds.php:1387
 msgid "More actions..."
 msgstr "更多操作"
 
-#: classes/pref/feeds.php:1387
+#: classes/pref/feeds.php:1391
 msgid "Manual purge"
 msgstr "手动清除"
 
-#: classes/pref/feeds.php:1391
+#: classes/pref/feeds.php:1395
 msgid "Clear feed data"
 msgstr "清空信息源数据"
 
-#: classes/pref/feeds.php:1392
+#: classes/pref/feeds.php:1396
 #: classes/pref/filters.php:770
 msgid "Rescore articles"
 msgstr "为文章重新评分"
 
-#: classes/pref/feeds.php:1444
+#: classes/pref/feeds.php:1448
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1446
+#: classes/pref/feeds.php:1450
 msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
 msgstr "使用OPML你可以导出或导入信息源feeds列表、过滤器、标签以及设置。"
 
-#: classes/pref/feeds.php:1447
+#: classes/pref/feeds.php:1451
 msgid "Only main settings profile can be migrated using OPML."
 msgstr "只有主要设置能够通过OPML文件来进行迁移。"
 
-#: classes/pref/feeds.php:1460
+#: classes/pref/feeds.php:1464
 #, fuzzy
 msgid "Import my OPML"
 msgstr "正在导入 OPML ……"
 
-#: classes/pref/feeds.php:1466
+#: classes/pref/feeds.php:1470
 msgid "Filename:"
 msgstr "文件名："
 
-#: classes/pref/feeds.php:1468
+#: classes/pref/feeds.php:1472
 msgid "Include settings"
 msgstr "包含设置"
 
-#: classes/pref/feeds.php:1472
+#: classes/pref/feeds.php:1476
 #, fuzzy
 msgid "Export OPML"
 msgstr "正在导入 OPML ……"
 
-#: classes/pref/feeds.php:1476
+#: classes/pref/feeds.php:1480
 msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
 msgstr "您可以公开发布您的 OPML 。网上的任何人都可以通过如下 URL 订阅该文件。"
 
-#: classes/pref/feeds.php:1480
+#: classes/pref/feeds.php:1484
 msgid "Public OPML URL"
 msgstr "公开的 OPML URL"
 
-#: classes/pref/feeds.php:1481
+#: classes/pref/feeds.php:1485
 #, fuzzy
 msgid "Display published OPML URL"
 msgstr "公开的 OPML URL"
 
-#: classes/pref/feeds.php:1490
+#: classes/pref/feeds.php:1494
 msgid "Firefox integration"
 msgstr "Firefox 集成"
 
-#: classes/pref/feeds.php:1492
+#: classes/pref/feeds.php:1496
 msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
 msgstr "点击如下链接，可以将本 Tiny Tiny RSS 站点作为一个 Firefox 阅读器使用。"
 
-#: classes/pref/feeds.php:1499
+#: classes/pref/feeds.php:1503
 msgid "Click here to register this site as a feed reader."
 msgstr "点击此处将本站注册为信息源阅读器。"
 
-#: classes/pref/feeds.php:1507
+#: classes/pref/feeds.php:1511
 #, fuzzy
 msgid "Published & shared articles / Generated feeds"
 msgstr "已发布的文章和生成的信息源"
 
-#: classes/pref/feeds.php:1509
+#: classes/pref/feeds.php:1513
 msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
 msgstr "已发布的文章将会输出为公开的 RSS 信息源，网上的任何人可以通过如下 URL 进行订阅。"
 
-#: classes/pref/feeds.php:1516
+#: classes/pref/feeds.php:1520
 #: classes/feeds.php:54
 #: classes/feeds.php:134
 msgid "View as RSS"
 msgstr "以 RSS 形式阅读"
 
-#: classes/pref/feeds.php:1517
+#: classes/pref/feeds.php:1521
 msgid "Display URL"
 msgstr "显示 URL"
 
-#: classes/pref/feeds.php:1520
+#: classes/pref/feeds.php:1524
 msgid "Clear all generated URLs"
 msgstr "清空所有生成的 URL"
 
-#: classes/pref/feeds.php:1598
+#: classes/pref/feeds.php:1602
 msgid "These feeds have not been updated with new content for 3 months (oldest first):"
 msgstr "以下信息源已经有三个月没有内容更新了（最旧的在最上）："
 
-#: classes/pref/feeds.php:1632
-#: classes/pref/feeds.php:1696
+#: classes/pref/feeds.php:1636
+#: classes/pref/feeds.php:1700
 msgid "Click to edit feed"
 msgstr "点击以编辑信息源"
 
-#: classes/pref/feeds.php:1650
-#: classes/pref/feeds.php:1716
+#: classes/pref/feeds.php:1654
+#: classes/pref/feeds.php:1720
 msgid "Unsubscribe from selected feeds"
 msgstr "取消订阅选中的信息源"
 
-#: classes/pref/feeds.php:1821
+#: classes/pref/feeds.php:1825
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr "每行添加一条RSS源"
 
-#: classes/pref/feeds.php:1830
+#: classes/pref/feeds.php:1834
 msgid "Feeds to subscribe, One per line"
 msgstr "所有将订阅的Feeds, 每行一条"
 
-#: classes/pref/feeds.php:1852
+#: classes/pref/feeds.php:1857
 msgid "Feeds require authentication."
 msgstr "Feed需要登录认证。"
 
-#: classes/pref/feeds.php:1859
-#: classes/feeds.php:1092
-#: classes/feeds.php:1146
+#: classes/pref/feeds.php:1864
+#: classes/feeds.php:1094
+#: classes/feeds.php:1148
 msgid "Subscribe"
 msgstr "订阅"
 
@@ -1850,7 +1886,7 @@ msgid "on field"
 msgstr "on field"
 
 #: classes/pref/filters.php:962
-#: js/PrefFilterTree.js:61
+#: js/PrefFilterTree.js:64
 msgid "in"
 msgstr "在"
 
@@ -2475,40 +2511,40 @@ msgstr "信息源 URL"
 msgid "Available feeds"
 msgstr "可用的信息源"
 
-#: classes/feeds.php:1087
+#: classes/feeds.php:1089
 msgid "This feed requires authentication."
 msgstr "这个信息源需要认证"
 
-#: classes/feeds.php:1095
+#: classes/feeds.php:1097
 msgid "More feeds"
 msgstr "更多信息源"
 
-#: classes/feeds.php:1122
+#: classes/feeds.php:1124
 msgid "Popular feeds"
 msgstr "最受欢迎的信息源"
 
-#: classes/feeds.php:1123
+#: classes/feeds.php:1125
 msgid "Feed archive"
 msgstr "信息源存档"
 
-#: classes/feeds.php:1126
+#: classes/feeds.php:1128
 msgid "limit:"
 msgstr "限制："
 
-#: classes/feeds.php:1158
+#: classes/feeds.php:1160
 msgid "Look for"
 msgstr "查找"
 
-#: classes/feeds.php:1166
+#: classes/feeds.php:1168
 #, php-format
 msgid "in %s"
 msgstr ""
 
-#: classes/feeds.php:1171
+#: classes/feeds.php:1173
 msgid "Used for word stemming"
 msgstr ""
 
-#: classes/feeds.php:1180
+#: classes/feeds.php:1182
 #, fuzzy
 msgid "Search syntax"
 msgstr "搜索语法"
@@ -2772,6 +2808,11 @@ msgstr "无法加载XML文档。"
 msgid "Prepare data"
 msgstr "准备数据"
 
+#: plugins/import_export/init.php:428
+#, fuzzy, php-format
+msgid "Upload failed with error code %d (%s)"
+msgstr "上传错误，错误代码：%d"
+
 #: plugins/import_export/init.php:454
 msgid "No file uploaded."
 msgstr "没有文件上传。"
@@ -2887,7 +2928,7 @@ msgstr "编辑类别"
 msgid "Remove category"
 msgstr "创建类别"
 
-#: js/PrefFilterTree.js:64
+#: js/PrefFilterTree.js:67
 msgid "Inverse"
 msgstr "反选"
 
@@ -2942,7 +2983,7 @@ msgid "Subscription reset."
 msgstr "订阅信息源"
 
 #: js/functions.js:1311
-#: js/tt-rss.js:682
+#: js/tt-rss.js:705
 #, perl-format
 msgid "Unsubscribe from %s?"
 msgstr "从 %s 取消订阅？"
@@ -3188,42 +3229,42 @@ msgstr "将所有文章标记为已读？"
 msgid "Marking all feeds as read..."
 msgstr "标记所有信息源为已读"
 
-#: js/tt-rss.js:383
+#: js/tt-rss.js:404
 #, fuzzy
 msgid "Please enable mail plugin first."
 msgstr "请先选几个信息源吧。"
 
-#: js/tt-rss.js:431
+#: js/tt-rss.js:452
 #: js/functions.js:1643
-#: js/tt-rss.js:663
+#: js/tt-rss.js:686
 msgid "You can't edit this kind of feed."
 msgstr "您无法编辑这种类型的信息源。"
 
-#: js/tt-rss.js:502
+#: js/tt-rss.js:533
 #, fuzzy
 msgid "Please enable embed_original plugin first."
 msgstr "请先选几个信息源吧。"
 
-#: js/tt-rss.js:515
-#: js/tt-rss.js:713
+#: js/tt-rss.js:546
+#: js/tt-rss.js:736
 msgid "Widescreen is not available in combined mode."
 msgstr ""
 
-#: js/tt-rss.js:827
+#: js/tt-rss.js:850
 msgid "You can't rescore this kind of feed."
 msgstr "无法重置本类信息源的评分。"
 
-#: js/tt-rss.js:832
-#: js/tt-rss.js:676
+#: js/tt-rss.js:855
+#: js/tt-rss.js:699
 msgid "Please select some feed first."
 msgstr "请先选几个信息源吧。"
 
-#: js/tt-rss.js:837
+#: js/tt-rss.js:860
 #, perl-format
 msgid "Rescore articles in %s?"
 msgstr "重置 %s 中文章的评分？"
 
-#: js/tt-rss.js:840
+#: js/tt-rss.js:863
 #, fuzzy
 msgid "Rescoring articles..."
 msgstr "为文章重新评分"
@@ -3403,7 +3444,7 @@ msgstr "您的个人数据已保存。"
 msgid "Sorry, your browser does not support sandboxed iframes."
 msgstr "对不起，你的浏览器不支持沙箱iframe。"
 
-#: plugins/shorten_expanded/init.js:37
+#: plugins/shorten_expanded/init.js:39
 #, fuzzy
 msgid "Click to expand article"
 msgstr "点击以展开文章。"
@@ -3673,7 +3714,7 @@ msgstr "生成一个新的 URL"
 msgid "Label Editor"
 msgstr "编辑预定义标签"
 
-#: js/tt-rss.js:671
+#: js/tt-rss.js:694
 msgid "You can't unsubscribe from the category."
 msgstr "您不能取消订阅一个类别。"
 
diff --git a/locale/zh_TW/LC_MESSAGES/messages.mo b/locale/zh_TW/LC_MESSAGES/messages.mo
index 81f01f393..bf3956d91 100644
Binary files a/locale/zh_TW/LC_MESSAGES/messages.mo and b/locale/zh_TW/LC_MESSAGES/messages.mo differ
diff --git a/locale/zh_TW/LC_MESSAGES/messages.po b/locale/zh_TW/LC_MESSAGES/messages.po
index 12104bc9b..3d3a9689a 100644
--- a/locale/zh_TW/LC_MESSAGES/messages.po
+++ b/locale/zh_TW/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tiny Tiny RSS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 22:58+0300\n"
+"POT-Creation-Date: 2016-08-19 18:16+0300\n"
 "PO-Revision-Date: 2014-02-17 23:12+0800\n"
 "Last-Translator: Yuan Chiu <me@yuaner.tw>\n"
 "Language-Team: Yuan Chiu <me@yuaner.tw>\n"
@@ -168,13 +168,13 @@ msgstr "找不到摘要。"
 msgid "Plugin not found"
 msgstr "未找到使用者"
 
-#: index.php:133
-#: index.php:149
-#: index.php:267
-#: prefs.php:102
+#: index.php:148
+#: index.php:164
+#: index.php:282
+#: prefs.php:117
 #: classes/backend.php:5
 #: classes/pref/labels.php:282
-#: classes/pref/feeds.php:1405
+#: classes/pref/feeds.php:1409
 #: classes/pref/filters.php:779
 #: js/feedlist.js:159
 #: js/functions.js:1293
@@ -186,7 +186,7 @@ msgstr "未找到使用者"
 #: js/prefs.js:1781
 #: js/prefs.js:1799
 #: js/tt-rss.js:55
-#: js/tt-rss.js:522
+#: js/tt-rss.js:553
 #: js/viewfeed.js:1298
 #: plugins/import_export/import_export.js:17
 #: js/feedlist.js:484
@@ -199,75 +199,75 @@ msgstr "未找到使用者"
 #: js/prefs.js:1556
 #: js/prefs.js:1572
 #: js/prefs.js:1592
-#: js/tt-rss.js:539
+#: js/tt-rss.js:570
 #: js/viewfeed.js:830
 msgid "Loading, please wait..."
 msgstr "載入中，請稍候……"
 
-#: index.php:167
+#: index.php:182
 msgid "Collapse feedlist"
 msgstr "收縮側邊欄"
 
-#: index.php:170
+#: index.php:185
 msgid "Show articles"
 msgstr "顯示文章"
 
-#: index.php:173
+#: index.php:188
 msgid "Adaptive"
 msgstr "自動調整"
 
-#: index.php:174
+#: index.php:189
 msgid "All Articles"
 msgstr "全部文章"
 
-#: index.php:175
-#: include/functions2.php:101
+#: index.php:190
+#: include/functions2.php:102
 #: classes/feeds.php:104
 msgid "Starred"
 msgstr "星標"
 
-#: index.php:176
-#: include/functions2.php:102
+#: index.php:191
+#: include/functions2.php:103
 #: classes/feeds.php:105
 msgid "Published"
 msgstr "已發布"
 
-#: index.php:177
+#: index.php:192
 #: classes/feeds.php:91
 #: classes/feeds.php:103
 msgid "Unread"
 msgstr "未讀"
 
-#: index.php:178
+#: index.php:193
 msgid "With Note"
 msgstr ""
 
-#: index.php:179
+#: index.php:194
 msgid "Ignore Scoring"
 msgstr "忽略評分"
 
-#: index.php:182
+#: index.php:197
 msgid "Sort articles"
 msgstr "排序文章"
 
-#: index.php:185
+#: index.php:200
 msgid "Default"
 msgstr "預設"
 
-#: index.php:186
+#: index.php:201
 msgid "Newest first"
 msgstr "最新的優先"
 
-#: index.php:187
+#: index.php:202
 msgid "Oldest first"
 msgstr "最舊的優先"
 
-#: index.php:188
+#: index.php:203
 msgid "Title"
 msgstr "標題"
 
-#: index.php:192
-#: index.php:233
+#: index.php:207
+#: index.php:248
 #: include/functions2.php:90
 #: classes/feeds.php:109
 #: js/FeedTree.js:132
@@ -275,134 +275,134 @@ msgstr "標題"
 msgid "Mark as read"
 msgstr "標記為已讀"
 
-#: index.php:195
+#: index.php:210
 msgid "Older than one day"
 msgstr "一天以前"
 
-#: index.php:198
+#: index.php:213
 msgid "Older than one week"
 msgstr "一個禮拜以前"
 
-#: index.php:201
+#: index.php:216
 msgid "Older than two weeks"
 msgstr "兩個禮拜以前"
 
-#: index.php:217
+#: index.php:232
 msgid "Communication problem with server."
 msgstr "無法連接到伺服器"
 
-#: index.php:223
+#: index.php:238
 msgid "Actions..."
 msgstr "動作"
 
-#: index.php:225
+#: index.php:240
 msgid "Preferences..."
 msgstr "偏好設定"
 
-#: index.php:226
+#: index.php:241
 msgid "Search..."
 msgstr "搜尋"
 
-#: index.php:227
+#: index.php:242
 msgid "Feed actions:"
 msgstr "摘要操作："
 
-#: index.php:228
+#: index.php:243
 #: classes/handler/public.php:672
 msgid "Subscribe to feed..."
 msgstr "訂閱摘要"
 
-#: index.php:229
+#: index.php:244
 msgid "Edit this feed..."
 msgstr "編輯摘要"
 
-#: index.php:230
+#: index.php:245
 msgid "Rescore feed"
 msgstr "為摘要重新評分"
 
-#: index.php:231
-#: classes/pref/feeds.php:783
-#: classes/pref/feeds.php:1360
+#: index.php:246
+#: classes/pref/feeds.php:785
+#: classes/pref/feeds.php:1364
 #: js/PrefFeedTree.js:74
 msgid "Unsubscribe"
 msgstr "取消訂閱"
 
-#: index.php:232
+#: index.php:247
 msgid "All feeds:"
 msgstr "全部摘要："
 
-#: index.php:234
+#: index.php:249
 msgid "(Un)hide read feeds"
 msgstr "隱藏（顯示）已讀信息"
 
-#: index.php:235
+#: index.php:250
 msgid "Other actions:"
 msgstr "其他操作："
 
-#: index.php:236
+#: index.php:251
 #: include/functions2.php:76
 msgid "Toggle widescreen mode"
 msgstr "切換版面顯示"
 
-#: index.php:237
+#: index.php:252
 msgid "Create label..."
 msgstr "建立標籤"
 
-#: index.php:238
+#: index.php:253
 msgid "Create filter..."
 msgstr "建立過濾器"
 
-#: index.php:239
+#: index.php:254
 msgid "Keyboard shortcuts help"
 msgstr "快捷鍵說明"
 
-#: index.php:248
+#: index.php:263
 msgid "Logout"
 msgstr "登出"
 
-#: index.php:254
+#: index.php:269
 msgid "Updates are available from Git."
 msgstr ""
 
 #: prefs.php:33
-#: prefs.php:120
-#: include/functions2.php:104
+#: prefs.php:135
+#: include/functions2.php:105
 #: classes/pref/prefs.php:435
 msgid "Preferences"
 msgstr "偏好設定"
 
-#: prefs.php:111
+#: prefs.php:126
 msgid "Keyboard shortcuts"
 msgstr "快捷鍵"
 
-#: prefs.php:112
+#: prefs.php:127
 msgid "Exit preferences"
 msgstr "退出偏好設定"
 
-#: prefs.php:123
+#: prefs.php:138
 #: classes/pref/feeds.php:112
-#: classes/pref/feeds.php:1300
-#: classes/pref/feeds.php:1349
+#: classes/pref/feeds.php:1304
+#: classes/pref/feeds.php:1353
 msgid "Feeds"
 msgstr "摘要"
 
-#: prefs.php:126
+#: prefs.php:141
 #: classes/pref/filters.php:248
 msgid "Filters"
 msgstr "過濾器"
 
-#: prefs.php:129
-#: include/functions.php:1256
-#: include/functions.php:1909
+#: prefs.php:144
+#: include/functions.php:1287
+#: include/functions.php:1940
 #: classes/pref/labels.php:90
 msgid "Labels"
 msgstr "預定義標籤"
 
-#: prefs.php:133
+#: prefs.php:148
 msgid "Users"
 msgstr "使用者"
 
-#: prefs.php:136
+#: prefs.php:151
 msgid "System"
 msgstr "系統"
 
@@ -484,10 +484,10 @@ msgid "Tiny Tiny RSS data update script."
 msgstr "Tiny Tiny RSS 資料庫是最新版。"
 
 #: include/digest.php:109
-#: include/functions.php:1265
-#: include/functions.php:1810
-#: include/functions.php:1895
-#: include/functions.php:1917
+#: include/functions.php:1296
+#: include/functions.php:1841
+#: include/functions.php:1926
+#: include/functions.php:1948
 #: classes/opml.php:421
 #: classes/pref/feeds.php:228
 msgid "Uncategorized"
@@ -503,44 +503,44 @@ msgstr[0] "%d 個存檔的文章"
 msgid "No feeds found."
 msgstr "未找到摘要。"
 
-#: include/functions.php:958
+#: include/functions.php:989
 #, php-format
 msgid "%d min"
 msgstr ""
 
-#: include/functions.php:1254
-#: include/functions.php:1907
+#: include/functions.php:1285
+#: include/functions.php:1938
 msgid "Special"
 msgstr "特殊區域"
 
-#: include/functions.php:1758
+#: include/functions.php:1789
 #: classes/pref/filters.php:229
 #: classes/pref/filters.php:507
 msgid "All feeds"
 msgstr "全部摘要"
 
-#: include/functions.php:1962
+#: include/functions.php:1993
 msgid "Starred articles"
 msgstr "加星標文章"
 
-#: include/functions.php:1964
+#: include/functions.php:1995
 msgid "Published articles"
 msgstr "已發布文章"
 
-#: include/functions.php:1966
+#: include/functions.php:1997
 msgid "Fresh articles"
 msgstr "最新更新的文章"
 
-#: include/functions.php:1968
-#: include/functions2.php:99
+#: include/functions.php:1999
+#: include/functions2.php:100
 msgid "All articles"
 msgstr "全部文章"
 
-#: include/functions.php:1970
+#: include/functions.php:2001
 msgid "Archived articles"
 msgstr "已儲存的文章"
 
-#: include/functions.php:1972
+#: include/functions.php:2003
 msgid "Recently read"
 msgstr "閱讀紀錄"
 
@@ -684,7 +684,7 @@ msgstr "取消選擇所有文章"
 
 #: include/functions2.php:85
 #: classes/pref/feeds.php:555
-#: classes/pref/feeds.php:821
+#: classes/pref/feeds.php:823
 msgid "Feed"
 msgstr "摘要"
 
@@ -697,7 +697,7 @@ msgid "Un/hide read feeds"
 msgstr "隱藏（顯示）已讀信息"
 
 #: include/functions2.php:88
-#: classes/pref/feeds.php:1352
+#: classes/pref/feeds.php:1356
 msgid "Subscribe to feed"
 msgstr "訂閱摘要"
 
@@ -714,145 +714,182 @@ msgid "Reverse headlines"
 msgstr "反向排序"
 
 #: include/functions2.php:92
+msgid "Toggle headline grouping"
+msgstr ""
+
+#: include/functions2.php:93
 #, fuzzy
 msgid "Debug feed update"
 msgstr "禁用更新"
 
-#: include/functions2.php:93
+#: include/functions2.php:94
 #, fuzzy
 msgid "Debug viewfeed()"
 msgstr "禁用更新"
 
-#: include/functions2.php:94
+#: include/functions2.php:95
 #: js/FeedTree.js:182
 msgid "Mark all feeds as read"
 msgstr "標記所有摘要為已讀"
 
-#: include/functions2.php:95
+#: include/functions2.php:96
 #, fuzzy
 msgid "Un/collapse current category"
 msgstr "加入到類別："
 
-#: include/functions2.php:96
+#: include/functions2.php:97
 #, fuzzy
 msgid "Toggle combined mode"
 msgstr "鎖定發布的項"
 
-#: include/functions2.php:97
+#: include/functions2.php:98
 #, fuzzy
 msgid "Toggle auto expand in combined mode"
 msgstr "鎖定發布的項"
 
-#: include/functions2.php:98
+#: include/functions2.php:99
 msgid "Go to"
 msgstr "跳到……"
 
-#: include/functions2.php:100
+#: include/functions2.php:101
 msgid "Fresh"
 msgstr ""
 
-#: include/functions2.php:103
-#: js/tt-rss.js:466
-#: js/tt-rss.js:650
+#: include/functions2.php:104
+#: js/tt-rss.js:497
+#: js/tt-rss.js:673
 msgid "Tag cloud"
 msgstr "標籤雲"
 
-#: include/functions2.php:105
+#: include/functions2.php:106
 msgid "Other"
 msgstr "其他"
 
-#: include/functions2.php:106
+#: include/functions2.php:107
 #: classes/pref/labels.php:267
 msgid "Create label"
 msgstr "建立預定義標籤"
 
-#: include/functions2.php:107
+#: include/functions2.php:108
 #: classes/pref/filters.php:753
 msgid "Create filter"
 msgstr "建立過濾器"
 
-#: include/functions2.php:108
+#: include/functions2.php:109
 #, fuzzy
 msgid "Un/collapse sidebar"
 msgstr "折疊側邊欄"
 
-#: include/functions2.php:109
+#: include/functions2.php:110
 #, fuzzy
 msgid "Show help dialog"
 msgstr "顯示搜尋對話框"
 
-#: include/functions2.php:663
+#: include/functions2.php:665
 #, php-format
 msgid "Search results: %s"
 msgstr "搜尋結果： %s"
 
-#: include/functions2.php:1317
+#: include/functions2.php:1330
 #: classes/feeds.php:749
 msgid "comment"
 msgid_plural "comments"
 msgstr[0] "回應"
 
-#: include/functions2.php:1321
+#: include/functions2.php:1334
 #: classes/feeds.php:753
 msgid "comments"
 msgstr "回應"
 
-#: include/functions2.php:1347
+#: include/functions2.php:1360
 msgid " - "
 msgstr " - "
 
-#: include/functions2.php:1380
-#: include/functions2.php:1631
+#: include/functions2.php:1393
+#: include/functions2.php:1644
 #: classes/article.php:311
 msgid "no tags"
 msgstr "無標籤"
 
-#: include/functions2.php:1390
+#: include/functions2.php:1403
 #: classes/feeds.php:735
 msgid "Edit tags for this article"
 msgstr "為本文編輯自訂標籤"
 
-#: include/functions2.php:1422
+#: include/functions2.php:1435
 #: classes/feeds.php:682
 msgid "Originally from:"
 msgstr "來源："
 
-#: include/functions2.php:1435
+#: include/functions2.php:1448
 #: classes/pref/feeds.php:574
 #: classes/feeds.php:695
 msgid "Feed URL"
 msgstr "摘要 URL"
 
-#: include/functions2.php:1472
+#: include/functions2.php:1485
 #: classes/backend.php:105
 #: classes/dlg.php:37
 #: classes/dlg.php:60
 #: classes/dlg.php:93
 #: classes/dlg.php:159
 #: classes/dlg.php:186
-#: classes/pref/feeds.php:1654
-#: classes/pref/feeds.php:1720
+#: classes/pref/feeds.php:1658
+#: classes/pref/feeds.php:1724
 #: classes/pref/filters.php:204
 #: classes/pref/prefs.php:1105
 #: plugins/af_psql_trgm/init.php:102
 #: plugins/import_export/init.php:415
-#: plugins/import_export/init.php:460
+#: plugins/import_export/init.php:461
 #: plugins/share/init.php:121
 msgid "Close this window"
 msgstr "關閉本視窗"
 
-#: include/functions2.php:1669
+#: include/functions2.php:1682
 msgid "(edit note)"
 msgstr "（編輯註記）"
 
-#: include/functions2.php:1924
+#: include/functions2.php:1937
 msgid "unknown type"
 msgstr "未知類型"
 
-#: include/functions2.php:2001
+#: include/functions2.php:2014
 msgid "Attachments"
 msgstr "附件："
 
+#: include/functions2.php:2456
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: include/functions2.php:2457
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr ""
+
+#: include/functions2.php:2458
+msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
+msgstr ""
+
+#: include/functions2.php:2459
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: include/functions2.php:2460
+#, fuzzy
+msgid "No file was uploaded"
+msgstr "沒有上傳檔案"
+
+#: include/functions2.php:2461
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: include/functions2.php:2462
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: include/functions2.php:2463
+msgid "A PHP extension stopped the file upload."
+msgstr ""
+
 #: include/login_form.php:197
 #: classes/handler/public.php:569
 #: classes/handler/public.php:824
@@ -921,8 +958,8 @@ msgstr "本文的標籤，請用逗號分開："
 #: classes/article.php:222
 #: classes/pref/labels.php:79
 #: classes/pref/users.php:98
-#: classes/pref/feeds.php:799
-#: classes/pref/feeds.php:939
+#: classes/pref/feeds.php:801
+#: classes/pref/feeds.php:943
 #: classes/pref/filters.php:485
 #: classes/pref/prefs.php:989
 #: plugins/instances/init.php:245
@@ -940,17 +977,17 @@ msgstr "儲存"
 #: classes/handler/public.php:580
 #: classes/pref/labels.php:81
 #: classes/pref/users.php:100
-#: classes/pref/feeds.php:800
-#: classes/pref/feeds.php:942
-#: classes/pref/feeds.php:1860
+#: classes/pref/feeds.php:802
+#: classes/pref/feeds.php:946
+#: classes/pref/feeds.php:1865
 #: classes/pref/filters.php:488
 #: classes/pref/filters.php:902
 #: classes/pref/filters.php:983
 #: classes/pref/filters.php:1076
 #: classes/pref/prefs.php:991
-#: classes/feeds.php:1098
-#: classes/feeds.php:1148
-#: classes/feeds.php:1185
+#: classes/feeds.php:1100
+#: classes/feeds.php:1150
+#: classes/feeds.php:1187
 #: plugins/instances/init.php:248
 #: plugins/instances/init.php:436
 #: plugins/note/init.php:53
@@ -1006,7 +1043,6 @@ msgid "Processing category: %s"
 msgstr "加入到類別："
 
 #: classes/opml.php:470
-#: plugins/import_export/init.php:428
 #, php-format
 msgid "Upload failed with error code %d"
 msgstr "上傳失敗，失敗碼 %d"
@@ -1229,9 +1265,9 @@ msgstr "建立預定義標籤 <b>%s</b>"
 
 #: classes/pref/labels.php:258
 #: classes/pref/users.php:334
-#: classes/pref/feeds.php:1340
-#: classes/pref/feeds.php:1602
-#: classes/pref/feeds.php:1666
+#: classes/pref/feeds.php:1344
+#: classes/pref/feeds.php:1606
+#: classes/pref/feeds.php:1670
 #: classes/pref/filters.php:359
 #: classes/pref/filters.php:407
 #: classes/pref/filters.php:744
@@ -1244,9 +1280,9 @@ msgstr "選擇"
 
 #: classes/pref/labels.php:261
 #: classes/pref/users.php:337
-#: classes/pref/feeds.php:1343
-#: classes/pref/feeds.php:1605
-#: classes/pref/feeds.php:1669
+#: classes/pref/feeds.php:1347
+#: classes/pref/feeds.php:1609
+#: classes/pref/feeds.php:1673
 #: classes/pref/filters.php:362
 #: classes/pref/filters.php:410
 #: classes/pref/filters.php:747
@@ -1260,9 +1296,9 @@ msgstr "全部"
 
 #: classes/pref/labels.php:263
 #: classes/pref/users.php:339
-#: classes/pref/feeds.php:1345
-#: classes/pref/feeds.php:1607
-#: classes/pref/feeds.php:1671
+#: classes/pref/feeds.php:1349
+#: classes/pref/feeds.php:1611
+#: classes/pref/feeds.php:1675
 #: classes/pref/filters.php:364
 #: classes/pref/filters.php:412
 #: classes/pref/filters.php:749
@@ -1276,10 +1312,10 @@ msgstr "無"
 
 #: classes/pref/labels.php:270
 #: classes/pref/users.php:348
-#: classes/pref/feeds.php:765
+#: classes/pref/feeds.php:767
 #: classes/pref/filters.php:478
 #: classes/pref/filters.php:766
-#: classes/feeds.php:1147
+#: classes/feeds.php:1149
 #: plugins/instances/init.php:294
 msgid "Remove"
 msgstr "移除"
@@ -1301,7 +1337,7 @@ msgstr "編輯過濾器"
 
 #: classes/pref/users.php:56
 #: classes/pref/feeds.php:637
-#: classes/pref/feeds.php:876
+#: classes/pref/feeds.php:878
 #: classes/feeds.php:1070
 msgid "Authentication"
 msgstr "登入驗證"
@@ -1311,8 +1347,8 @@ msgid "Access level: "
 msgstr "帳號等級："
 
 #: classes/pref/users.php:77
-#: classes/pref/feeds.php:665
-#: classes/pref/feeds.php:892
+#: classes/pref/feeds.php:667
+#: classes/pref/feeds.php:896
 msgid "Options"
 msgstr "選項"
 
@@ -1378,10 +1414,10 @@ msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] 密碼更換提醒"
 
 #: classes/pref/users.php:324
-#: classes/pref/feeds.php:1336
+#: classes/pref/feeds.php:1340
 #: classes/pref/filters.php:740
-#: classes/feeds.php:1118
-#: classes/feeds.php:1184
+#: classes/feeds.php:1120
+#: classes/feeds.php:1186
 #: js/tt-rss.js:174
 msgid "Search"
 msgstr "搜尋"
@@ -1398,8 +1434,8 @@ msgstr "編輯"
 
 #: classes/pref/users.php:397
 #: classes/pref/feeds.php:643
-#: classes/pref/feeds.php:880
-#: classes/pref/feeds.php:1838
+#: classes/pref/feeds.php:882
+#: classes/pref/feeds.php:1842
 #: classes/feeds.php:1074
 msgid "Login"
 msgstr "登入"
@@ -1477,255 +1513,255 @@ msgid "Feed Title"
 msgstr "摘要標題"
 
 #: classes/pref/feeds.php:595
-#: classes/pref/feeds.php:828
-#: classes/pref/feeds.php:1824
+#: classes/pref/feeds.php:830
+#: classes/pref/feeds.php:1828
 #: classes/feeds.php:1050
 msgid "Place in category:"
 msgstr "加入到類別："
 
 #: classes/pref/feeds.php:608
-#: classes/pref/feeds.php:842
+#: classes/pref/feeds.php:844
 #, fuzzy
 msgid "Language:"
 msgstr "語言："
 
 #: classes/pref/feeds.php:615
-#: classes/pref/feeds.php:851
+#: classes/pref/feeds.php:853
 msgid "Update"
 msgstr "更新列表"
 
 #: classes/pref/feeds.php:630
-#: classes/pref/feeds.php:867
+#: classes/pref/feeds.php:869
 msgid "Article purging:"
 msgstr "文章清理："
 
-#: classes/pref/feeds.php:656
-#: classes/pref/feeds.php:886
-#: classes/pref/feeds.php:1841
+#: classes/pref/feeds.php:658
+#: classes/pref/feeds.php:890
+#: classes/pref/feeds.php:1845
 #: classes/pref/prefs.php:245
-#: classes/feeds.php:1077
+#: classes/feeds.php:1078
 msgid "Password"
 msgstr "密碼"
 
-#: classes/pref/feeds.php:660
+#: classes/pref/feeds.php:662
 msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
 msgstr "<b>提示：</b>如果您的摘要需要驗證，那麼您需要填寫登入資料。Twitter 摘要除外。"
 
-#: classes/pref/feeds.php:679
-#: classes/pref/feeds.php:896
+#: classes/pref/feeds.php:681
+#: classes/pref/feeds.php:900
 msgid "Hide from Popular feeds"
 msgstr "從最受歡迎的摘要中隱藏"
 
-#: classes/pref/feeds.php:691
-#: classes/pref/feeds.php:902
+#: classes/pref/feeds.php:693
+#: classes/pref/feeds.php:906
 msgid "Include in e-mail digest"
 msgstr "包含電子郵件摘要"
 
-#: classes/pref/feeds.php:704
-#: classes/pref/feeds.php:908
+#: classes/pref/feeds.php:706
+#: classes/pref/feeds.php:912
 msgid "Always display image attachments"
 msgstr "始終顯示圖片附件"
 
-#: classes/pref/feeds.php:717
-#: classes/pref/feeds.php:916
+#: classes/pref/feeds.php:719
+#: classes/pref/feeds.php:920
 msgid "Do not embed images"
 msgstr "不要包含圖片"
 
-#: classes/pref/feeds.php:730
-#: classes/pref/feeds.php:924
+#: classes/pref/feeds.php:732
+#: classes/pref/feeds.php:928
 msgid "Cache images locally"
 msgstr "本地快取圖片"
 
-#: classes/pref/feeds.php:742
-#: classes/pref/feeds.php:930
+#: classes/pref/feeds.php:744
+#: classes/pref/feeds.php:934
 msgid "Mark updated articles as unread"
 msgstr "將已更新的文章標記為未讀"
 
-#: classes/pref/feeds.php:746
+#: classes/pref/feeds.php:748
 msgid "Icon"
 msgstr "圖示"
 
-#: classes/pref/feeds.php:763
+#: classes/pref/feeds.php:765
 msgid "Replace"
 msgstr "替換"
 
-#: classes/pref/feeds.php:770
+#: classes/pref/feeds.php:772
 #: classes/pref/prefs.php:706
 msgid "Plugins"
 msgstr "擴充套件"
 
-#: classes/pref/feeds.php:790
+#: classes/pref/feeds.php:792
 msgid "Resubscribe to push updates"
 msgstr "重新訂閱以推送更新"
 
-#: classes/pref/feeds.php:797
+#: classes/pref/feeds.php:799
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr "為啟用推送的摘要重置 PubSubHubbub 訂閱。"
 
-#: classes/pref/feeds.php:1203
-#: classes/pref/feeds.php:1256
+#: classes/pref/feeds.php:1207
+#: classes/pref/feeds.php:1260
 msgid "All done."
 msgstr "全部完成。"
 
-#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1315
 msgid "Feeds with errors"
 msgstr "有錯誤的摘要"
 
-#: classes/pref/feeds.php:1318
+#: classes/pref/feeds.php:1322
 msgid "Inactive feeds"
 msgstr "不活躍的摘要"
 
-#: classes/pref/feeds.php:1354
+#: classes/pref/feeds.php:1358
 msgid "Edit selected feeds"
 msgstr "編輯選定的摘要"
 
-#: classes/pref/feeds.php:1356
-#: classes/pref/feeds.php:1370
+#: classes/pref/feeds.php:1360
+#: classes/pref/feeds.php:1374
 #: classes/pref/filters.php:762
 msgid "Reset sort order"
 msgstr "重新排序"
 
-#: classes/pref/feeds.php:1358
+#: classes/pref/feeds.php:1362
 #: js/prefs.js:1737
 msgid "Batch subscribe"
 msgstr ""
 
-#: classes/pref/feeds.php:1365
+#: classes/pref/feeds.php:1369
 msgid "Categories"
 msgstr "類別"
 
-#: classes/pref/feeds.php:1368
+#: classes/pref/feeds.php:1372
 msgid "Add category"
 msgstr "新增類別"
 
-#: classes/pref/feeds.php:1372
+#: classes/pref/feeds.php:1376
 msgid "Remove selected"
 msgstr "移除所選擇的"
 
-#: classes/pref/feeds.php:1383
+#: classes/pref/feeds.php:1387
 msgid "More actions..."
 msgstr "更多動作"
 
-#: classes/pref/feeds.php:1387
+#: classes/pref/feeds.php:1391
 msgid "Manual purge"
 msgstr "手動清除"
 
-#: classes/pref/feeds.php:1391
+#: classes/pref/feeds.php:1395
 msgid "Clear feed data"
 msgstr "清空摘要數據"
 
-#: classes/pref/feeds.php:1392
+#: classes/pref/feeds.php:1396
 #: classes/pref/filters.php:770
 msgid "Rescore articles"
 msgstr "為文章重新評分"
 
-#: classes/pref/feeds.php:1444
+#: classes/pref/feeds.php:1448
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1446
+#: classes/pref/feeds.php:1450
 msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
 msgstr ""
 
-#: classes/pref/feeds.php:1447
+#: classes/pref/feeds.php:1451
 msgid "Only main settings profile can be migrated using OPML."
 msgstr ""
 
-#: classes/pref/feeds.php:1460
+#: classes/pref/feeds.php:1464
 #, fuzzy
 msgid "Import my OPML"
 msgstr "正在匯入 OPML ……"
 
-#: classes/pref/feeds.php:1466
+#: classes/pref/feeds.php:1470
 msgid "Filename:"
 msgstr "文件名："
 
-#: classes/pref/feeds.php:1468
+#: classes/pref/feeds.php:1472
 msgid "Include settings"
 msgstr "包含設定"
 
-#: classes/pref/feeds.php:1472
+#: classes/pref/feeds.php:1476
 #, fuzzy
 msgid "Export OPML"
 msgstr "正在匯入 OPML ……"
 
-#: classes/pref/feeds.php:1476
+#: classes/pref/feeds.php:1480
 msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
 msgstr "您可以公開發布您的 OPML 。網上的任何人都可以透過如下 URL 訂閱該文件。"
 
-#: classes/pref/feeds.php:1480
+#: classes/pref/feeds.php:1484
 msgid "Public OPML URL"
 msgstr "公開的 OPML URL"
 
-#: classes/pref/feeds.php:1481
+#: classes/pref/feeds.php:1485
 #, fuzzy
 msgid "Display published OPML URL"
 msgstr "公開的 OPML URL"
 
-#: classes/pref/feeds.php:1490
+#: classes/pref/feeds.php:1494
 msgid "Firefox integration"
 msgstr "Firefox 整合"
 
-#: classes/pref/feeds.php:1492
+#: classes/pref/feeds.php:1496
 msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
 msgstr "按下以下連結，可以將本 Tiny Tiny RSS 站作為一個 Firefox 閱讀器使用。"
 
-#: classes/pref/feeds.php:1499
+#: classes/pref/feeds.php:1503
 msgid "Click here to register this site as a feed reader."
 msgstr "點擊此處將本站註冊為摘要閱讀器。"
 
-#: classes/pref/feeds.php:1507
+#: classes/pref/feeds.php:1511
 #, fuzzy
 msgid "Published & shared articles / Generated feeds"
 msgstr "已發布的文章和產生的摘要"
 
-#: classes/pref/feeds.php:1509
+#: classes/pref/feeds.php:1513
 msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
 msgstr "已發布的文章將會輸出為公開的 RSS 摘要，網上的任何人可以透過如下 URL 進行訂閱。"
 
-#: classes/pref/feeds.php:1516
+#: classes/pref/feeds.php:1520
 #: classes/feeds.php:54
 #: classes/feeds.php:134
 msgid "View as RSS"
 msgstr "以 RSS 形式閱讀"
 
-#: classes/pref/feeds.php:1517
+#: classes/pref/feeds.php:1521
 msgid "Display URL"
 msgstr "顯示 URL"
 
-#: classes/pref/feeds.php:1520
+#: classes/pref/feeds.php:1524
 msgid "Clear all generated URLs"
 msgstr "清空所有產生的 URL"
 
-#: classes/pref/feeds.php:1598
+#: classes/pref/feeds.php:1602
 msgid "These feeds have not been updated with new content for 3 months (oldest first):"
 msgstr "以下摘要已經有三個月沒有內容更新了（最舊的在最上）："
 
-#: classes/pref/feeds.php:1632
-#: classes/pref/feeds.php:1696
+#: classes/pref/feeds.php:1636
+#: classes/pref/feeds.php:1700
 msgid "Click to edit feed"
 msgstr "點擊以編輯摘要"
 
-#: classes/pref/feeds.php:1650
-#: classes/pref/feeds.php:1716
+#: classes/pref/feeds.php:1654
+#: classes/pref/feeds.php:1720
 msgid "Unsubscribe from selected feeds"
 msgstr "取消訂閱選取的摘要"
 
-#: classes/pref/feeds.php:1821
+#: classes/pref/feeds.php:1825
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr ""
 
-#: classes/pref/feeds.php:1830
+#: classes/pref/feeds.php:1834
 msgid "Feeds to subscribe, One per line"
 msgstr ""
 
-#: classes/pref/feeds.php:1852
+#: classes/pref/feeds.php:1857
 msgid "Feeds require authentication."
 msgstr ""
 
-#: classes/pref/feeds.php:1859
-#: classes/feeds.php:1092
-#: classes/feeds.php:1146
+#: classes/pref/feeds.php:1864
+#: classes/feeds.php:1094
+#: classes/feeds.php:1148
 msgid "Subscribe"
 msgstr "訂閱"
 
@@ -1810,7 +1846,7 @@ msgid "on field"
 msgstr "on field"
 
 #: classes/pref/filters.php:962
-#: js/PrefFilterTree.js:61
+#: js/PrefFilterTree.js:64
 msgid "in"
 msgstr "在"
 
@@ -2415,40 +2451,40 @@ msgstr "摘要 URL"
 msgid "Available feeds"
 msgstr "可用的摘要"
 
-#: classes/feeds.php:1087
+#: classes/feeds.php:1089
 msgid "This feed requires authentication."
 msgstr "這個摘要需要認證"
 
-#: classes/feeds.php:1095
+#: classes/feeds.php:1097
 msgid "More feeds"
 msgstr "更多摘要"
 
-#: classes/feeds.php:1122
+#: classes/feeds.php:1124
 msgid "Popular feeds"
 msgstr "最受歡迎的摘要"
 
-#: classes/feeds.php:1123
+#: classes/feeds.php:1125
 msgid "Feed archive"
 msgstr "摘要存檔"
 
-#: classes/feeds.php:1126
+#: classes/feeds.php:1128
 msgid "limit:"
 msgstr "限制："
 
-#: classes/feeds.php:1158
+#: classes/feeds.php:1160
 msgid "Look for"
 msgstr "查找"
 
-#: classes/feeds.php:1166
+#: classes/feeds.php:1168
 #, php-format
 msgid "in %s"
 msgstr ""
 
-#: classes/feeds.php:1171
+#: classes/feeds.php:1173
 msgid "Used for word stemming"
 msgstr ""
 
-#: classes/feeds.php:1180
+#: classes/feeds.php:1182
 #, fuzzy
 msgid "Search syntax"
 msgstr "搜尋"
@@ -2710,6 +2746,11 @@ msgstr ""
 msgid "Prepare data"
 msgstr ""
 
+#: plugins/import_export/init.php:428
+#, fuzzy, php-format
+msgid "Upload failed with error code %d (%s)"
+msgstr "上傳失敗，失敗碼 %d"
+
 #: plugins/import_export/init.php:454
 msgid "No file uploaded."
 msgstr "沒有上傳檔案"
@@ -2821,7 +2862,7 @@ msgstr "編輯類別"
 msgid "Remove category"
 msgstr "移除類別"
 
-#: js/PrefFilterTree.js:64
+#: js/PrefFilterTree.js:67
 msgid "Inverse"
 msgstr "反向選取"
 
@@ -2876,7 +2917,7 @@ msgid "Subscription reset."
 msgstr "訂閱摘要"
 
 #: js/functions.js:1311
-#: js/tt-rss.js:682
+#: js/tt-rss.js:705
 #, perl-format
 msgid "Unsubscribe from %s?"
 msgstr "從 %s 取消訂閱？"
@@ -3118,42 +3159,42 @@ msgstr "將所有文章標記為已讀？"
 msgid "Marking all feeds as read..."
 msgstr "標記所有摘要為已讀"
 
-#: js/tt-rss.js:383
+#: js/tt-rss.js:404
 #, fuzzy
 msgid "Please enable mail plugin first."
 msgstr "請先選几個摘要吧。"
 
-#: js/tt-rss.js:431
+#: js/tt-rss.js:452
 #: js/functions.js:1643
-#: js/tt-rss.js:663
+#: js/tt-rss.js:686
 msgid "You can't edit this kind of feed."
 msgstr "您無法編輯這種類型的摘要。"
 
-#: js/tt-rss.js:502
+#: js/tt-rss.js:533
 #, fuzzy
 msgid "Please enable embed_original plugin first."
 msgstr "請先選几個摘要吧。"
 
-#: js/tt-rss.js:515
-#: js/tt-rss.js:713
+#: js/tt-rss.js:546
+#: js/tt-rss.js:736
 msgid "Widescreen is not available in combined mode."
 msgstr ""
 
-#: js/tt-rss.js:827
+#: js/tt-rss.js:850
 msgid "You can't rescore this kind of feed."
 msgstr "無法重置此分類的摘要的評分。"
 
-#: js/tt-rss.js:832
-#: js/tt-rss.js:676
+#: js/tt-rss.js:855
+#: js/tt-rss.js:699
 msgid "Please select some feed first."
 msgstr "請先選幾個摘要吧。"
 
-#: js/tt-rss.js:837
+#: js/tt-rss.js:860
 #, perl-format
 msgid "Rescore articles in %s?"
 msgstr "重置 %s 中文章的評分？"
 
-#: js/tt-rss.js:840
+#: js/tt-rss.js:863
 #, fuzzy
 msgid "Rescoring articles..."
 msgstr "為文章重新評分"
@@ -3331,7 +3372,7 @@ msgstr "您的個人數據已儲存。"
 msgid "Sorry, your browser does not support sandboxed iframes."
 msgstr ""
 
-#: plugins/shorten_expanded/init.js:37
+#: plugins/shorten_expanded/init.js:39
 #, fuzzy
 msgid "Click to expand article"
 msgstr "點擊以展開文章。"
@@ -3595,7 +3636,7 @@ msgstr "產生一個新的 URL"
 msgid "Label Editor"
 msgstr "編輯預定義標籤"
 
-#: js/tt-rss.js:671
+#: js/tt-rss.js:694
 msgid "You can't unsubscribe from the category."
 msgstr "您不能取消訂閱一個類別。"
 
diff --git a/messages.pot b/messages.pot
index 5aa847ec0..eccd2e8c0 100644
--- a/messages.pot
+++ b/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 22:58+0300\n"
+"POT-Creation-Date: 2016-08-19 18:16+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -160,197 +160,197 @@ msgstr ""
 msgid "Plugin not found"
 msgstr ""
 
-#: index.php:133 index.php:149 index.php:267 prefs.php:102
+#: index.php:148 index.php:164 index.php:282 prefs.php:117
 #: classes/backend.php:5 classes/pref/labels.php:282
-#: classes/pref/feeds.php:1405 classes/pref/filters.php:779 js/feedlist.js:159
+#: classes/pref/feeds.php:1409 classes/pref/filters.php:779 js/feedlist.js:159
 #: js/functions.js:1293 js/functions.js:1427 js/functions.js:1739
 #: js/prefs.js:658 js/prefs.js:859 js/prefs.js:1765 js/prefs.js:1781
-#: js/prefs.js:1799 js/tt-rss.js:55 js/tt-rss.js:522 js/viewfeed.js:1298
+#: js/prefs.js:1799 js/tt-rss.js:55 js/tt-rss.js:553 js/viewfeed.js:1298
 #: plugins/import_export/import_export.js:17 js/feedlist.js:484
 #: js/feedlist.js:534 js/functions.js:449 js/functions.js:772 js/prefs.js:1446
 #: js/prefs.js:1499 js/prefs.js:1539 js/prefs.js:1556 js/prefs.js:1572
-#: js/prefs.js:1592 js/tt-rss.js:539 js/viewfeed.js:830
+#: js/prefs.js:1592 js/tt-rss.js:570 js/viewfeed.js:830
 msgid "Loading, please wait..."
 msgstr ""
 
-#: index.php:167
+#: index.php:182
 msgid "Collapse feedlist"
 msgstr ""
 
-#: index.php:170
+#: index.php:185
 msgid "Show articles"
 msgstr ""
 
-#: index.php:173
+#: index.php:188
 msgid "Adaptive"
 msgstr ""
 
-#: index.php:174
+#: index.php:189
 msgid "All Articles"
 msgstr ""
 
-#: index.php:175 include/functions2.php:101 classes/feeds.php:104
+#: index.php:190 include/functions2.php:102 classes/feeds.php:104
 msgid "Starred"
 msgstr ""
 
-#: index.php:176 include/functions2.php:102 classes/feeds.php:105
+#: index.php:191 include/functions2.php:103 classes/feeds.php:105
 msgid "Published"
 msgstr ""
 
-#: index.php:177 classes/feeds.php:91 classes/feeds.php:103
+#: index.php:192 classes/feeds.php:91 classes/feeds.php:103
 msgid "Unread"
 msgstr ""
 
-#: index.php:178
+#: index.php:193
 msgid "With Note"
 msgstr ""
 
-#: index.php:179
+#: index.php:194
 msgid "Ignore Scoring"
 msgstr ""
 
-#: index.php:182
+#: index.php:197
 msgid "Sort articles"
 msgstr ""
 
-#: index.php:185
+#: index.php:200
 msgid "Default"
 msgstr ""
 
-#: index.php:186
+#: index.php:201
 msgid "Newest first"
 msgstr ""
 
-#: index.php:187
+#: index.php:202
 msgid "Oldest first"
 msgstr ""
 
-#: index.php:188
+#: index.php:203
 msgid "Title"
 msgstr ""
 
-#: index.php:192 index.php:233 include/functions2.php:90 classes/feeds.php:109
+#: index.php:207 index.php:248 include/functions2.php:90 classes/feeds.php:109
 #: js/FeedTree.js:132 js/FeedTree.js:160
 msgid "Mark as read"
 msgstr ""
 
-#: index.php:195
+#: index.php:210
 msgid "Older than one day"
 msgstr ""
 
-#: index.php:198
+#: index.php:213
 msgid "Older than one week"
 msgstr ""
 
-#: index.php:201
+#: index.php:216
 msgid "Older than two weeks"
 msgstr ""
 
-#: index.php:217
+#: index.php:232
 msgid "Communication problem with server."
 msgstr ""
 
-#: index.php:223
+#: index.php:238
 msgid "Actions..."
 msgstr ""
 
-#: index.php:225
+#: index.php:240
 msgid "Preferences..."
 msgstr ""
 
-#: index.php:226
+#: index.php:241
 msgid "Search..."
 msgstr ""
 
-#: index.php:227
+#: index.php:242
 msgid "Feed actions:"
 msgstr ""
 
-#: index.php:228 classes/handler/public.php:672
+#: index.php:243 classes/handler/public.php:672
 msgid "Subscribe to feed..."
 msgstr ""
 
-#: index.php:229
+#: index.php:244
 msgid "Edit this feed..."
 msgstr ""
 
-#: index.php:230
+#: index.php:245
 msgid "Rescore feed"
 msgstr ""
 
-#: index.php:231 classes/pref/feeds.php:783 classes/pref/feeds.php:1360
+#: index.php:246 classes/pref/feeds.php:785 classes/pref/feeds.php:1364
 #: js/PrefFeedTree.js:74
 msgid "Unsubscribe"
 msgstr ""
 
-#: index.php:232
+#: index.php:247
 msgid "All feeds:"
 msgstr ""
 
-#: index.php:234
+#: index.php:249
 msgid "(Un)hide read feeds"
 msgstr ""
 
-#: index.php:235
+#: index.php:250
 msgid "Other actions:"
 msgstr ""
 
-#: index.php:236 include/functions2.php:76
+#: index.php:251 include/functions2.php:76
 msgid "Toggle widescreen mode"
 msgstr ""
 
-#: index.php:237
+#: index.php:252
 msgid "Create label..."
 msgstr ""
 
-#: index.php:238
+#: index.php:253
 msgid "Create filter..."
 msgstr ""
 
-#: index.php:239
+#: index.php:254
 msgid "Keyboard shortcuts help"
 msgstr ""
 
-#: index.php:248
+#: index.php:263
 msgid "Logout"
 msgstr ""
 
-#: index.php:254
+#: index.php:269
 msgid "Updates are available from Git."
 msgstr ""
 
-#: prefs.php:33 prefs.php:120 include/functions2.php:104
+#: prefs.php:33 prefs.php:135 include/functions2.php:105
 #: classes/pref/prefs.php:435
 msgid "Preferences"
 msgstr ""
 
-#: prefs.php:111
+#: prefs.php:126
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: prefs.php:112
+#: prefs.php:127
 msgid "Exit preferences"
 msgstr ""
 
-#: prefs.php:123 classes/pref/feeds.php:112 classes/pref/feeds.php:1300
-#: classes/pref/feeds.php:1349
+#: prefs.php:138 classes/pref/feeds.php:112 classes/pref/feeds.php:1304
+#: classes/pref/feeds.php:1353
 msgid "Feeds"
 msgstr ""
 
-#: prefs.php:126 classes/pref/filters.php:248
+#: prefs.php:141 classes/pref/filters.php:248
 msgid "Filters"
 msgstr ""
 
-#: prefs.php:129 include/functions.php:1256 include/functions.php:1909
+#: prefs.php:144 include/functions.php:1287 include/functions.php:1940
 #: classes/pref/labels.php:90
 msgid "Labels"
 msgstr ""
 
-#: prefs.php:133
+#: prefs.php:148
 msgid "Users"
 msgstr ""
 
-#: prefs.php:136
+#: prefs.php:151
 msgid "System"
 msgstr ""
 
@@ -422,9 +422,9 @@ msgstr ""
 msgid "Tiny Tiny RSS data update script."
 msgstr ""
 
-#: include/digest.php:109 include/functions.php:1265
-#: include/functions.php:1810 include/functions.php:1895
-#: include/functions.php:1917 classes/opml.php:421 classes/pref/feeds.php:228
+#: include/digest.php:109 include/functions.php:1296
+#: include/functions.php:1841 include/functions.php:1926
+#: include/functions.php:1948 classes/opml.php:421 classes/pref/feeds.php:228
 msgid "Uncategorized"
 msgstr ""
 
@@ -439,41 +439,41 @@ msgstr[1] ""
 msgid "No feeds found."
 msgstr ""
 
-#: include/functions.php:958
+#: include/functions.php:989
 #, php-format
 msgid "%d min"
 msgstr ""
 
-#: include/functions.php:1254 include/functions.php:1907
+#: include/functions.php:1285 include/functions.php:1938
 msgid "Special"
 msgstr ""
 
-#: include/functions.php:1758 classes/pref/filters.php:229
+#: include/functions.php:1789 classes/pref/filters.php:229
 #: classes/pref/filters.php:507
 msgid "All feeds"
 msgstr ""
 
-#: include/functions.php:1962
+#: include/functions.php:1993
 msgid "Starred articles"
 msgstr ""
 
-#: include/functions.php:1964
+#: include/functions.php:1995
 msgid "Published articles"
 msgstr ""
 
-#: include/functions.php:1966
+#: include/functions.php:1997
 msgid "Fresh articles"
 msgstr ""
 
-#: include/functions.php:1968 include/functions2.php:99
+#: include/functions.php:1999 include/functions2.php:100
 msgid "All articles"
 msgstr ""
 
-#: include/functions.php:1970
+#: include/functions.php:2001
 msgid "Archived articles"
 msgstr ""
 
-#: include/functions.php:1972
+#: include/functions.php:2003
 msgid "Recently read"
 msgstr ""
 
@@ -606,7 +606,7 @@ msgid "Deselect everything"
 msgstr ""
 
 #: include/functions2.php:85 classes/pref/feeds.php:555
-#: classes/pref/feeds.php:821
+#: classes/pref/feeds.php:823
 msgid "Feed"
 msgstr ""
 
@@ -618,7 +618,7 @@ msgstr ""
 msgid "Un/hide read feeds"
 msgstr ""
 
-#: include/functions2.php:88 classes/pref/feeds.php:1352
+#: include/functions2.php:88 classes/pref/feeds.php:1356
 msgid "Subscribe to feed"
 msgstr ""
 
@@ -632,119 +632,157 @@ msgid "Reverse headlines"
 msgstr ""
 
 #: include/functions2.php:92
-msgid "Debug feed update"
+msgid "Toggle headline grouping"
 msgstr ""
 
 #: include/functions2.php:93
+msgid "Debug feed update"
+msgstr ""
+
+#: include/functions2.php:94
 msgid "Debug viewfeed()"
 msgstr ""
 
-#: include/functions2.php:94 js/FeedTree.js:182
+#: include/functions2.php:95 js/FeedTree.js:182
 msgid "Mark all feeds as read"
 msgstr ""
 
-#: include/functions2.php:95
+#: include/functions2.php:96
 msgid "Un/collapse current category"
 msgstr ""
 
-#: include/functions2.php:96
+#: include/functions2.php:97
 msgid "Toggle combined mode"
 msgstr ""
 
-#: include/functions2.php:97
+#: include/functions2.php:98
 msgid "Toggle auto expand in combined mode"
 msgstr ""
 
-#: include/functions2.php:98
+#: include/functions2.php:99
 msgid "Go to"
 msgstr ""
 
-#: include/functions2.php:100
+#: include/functions2.php:101
 msgid "Fresh"
 msgstr ""
 
-#: include/functions2.php:103 js/tt-rss.js:466 js/tt-rss.js:650
+#: include/functions2.php:104 js/tt-rss.js:497 js/tt-rss.js:673
 msgid "Tag cloud"
 msgstr ""
 
-#: include/functions2.php:105
+#: include/functions2.php:106
 msgid "Other"
 msgstr ""
 
-#: include/functions2.php:106 classes/pref/labels.php:267
+#: include/functions2.php:107 classes/pref/labels.php:267
 msgid "Create label"
 msgstr ""
 
-#: include/functions2.php:107 classes/pref/filters.php:753
+#: include/functions2.php:108 classes/pref/filters.php:753
 msgid "Create filter"
 msgstr ""
 
-#: include/functions2.php:108
+#: include/functions2.php:109
 msgid "Un/collapse sidebar"
 msgstr ""
 
-#: include/functions2.php:109
+#: include/functions2.php:110
 msgid "Show help dialog"
 msgstr ""
 
-#: include/functions2.php:663
+#: include/functions2.php:665
 #, php-format
 msgid "Search results: %s"
 msgstr ""
 
-#: include/functions2.php:1317 classes/feeds.php:749
+#: include/functions2.php:1330 classes/feeds.php:749
 msgid "comment"
 msgid_plural "comments"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/functions2.php:1321 classes/feeds.php:753
+#: include/functions2.php:1334 classes/feeds.php:753
 msgid "comments"
 msgstr ""
 
-#: include/functions2.php:1347
+#: include/functions2.php:1360
 msgid " - "
 msgstr ""
 
-#: include/functions2.php:1380 include/functions2.php:1631
+#: include/functions2.php:1393 include/functions2.php:1644
 #: classes/article.php:311
 msgid "no tags"
 msgstr ""
 
-#: include/functions2.php:1390 classes/feeds.php:735
+#: include/functions2.php:1403 classes/feeds.php:735
 msgid "Edit tags for this article"
 msgstr ""
 
-#: include/functions2.php:1422 classes/feeds.php:682
+#: include/functions2.php:1435 classes/feeds.php:682
 msgid "Originally from:"
 msgstr ""
 
-#: include/functions2.php:1435 classes/pref/feeds.php:574
+#: include/functions2.php:1448 classes/pref/feeds.php:574
 #: classes/feeds.php:695
 msgid "Feed URL"
 msgstr ""
 
-#: include/functions2.php:1472 classes/backend.php:105 classes/dlg.php:37
+#: include/functions2.php:1485 classes/backend.php:105 classes/dlg.php:37
 #: classes/dlg.php:60 classes/dlg.php:93 classes/dlg.php:159
-#: classes/dlg.php:186 classes/pref/feeds.php:1654 classes/pref/feeds.php:1720
+#: classes/dlg.php:186 classes/pref/feeds.php:1658 classes/pref/feeds.php:1724
 #: classes/pref/filters.php:204 classes/pref/prefs.php:1105
 #: plugins/af_psql_trgm/init.php:102 plugins/import_export/init.php:415
-#: plugins/import_export/init.php:460 plugins/share/init.php:121
+#: plugins/import_export/init.php:461 plugins/share/init.php:121
 msgid "Close this window"
 msgstr ""
 
-#: include/functions2.php:1669
+#: include/functions2.php:1682
 msgid "(edit note)"
 msgstr ""
 
-#: include/functions2.php:1924
+#: include/functions2.php:1937
 msgid "unknown type"
 msgstr ""
 
-#: include/functions2.php:2001
+#: include/functions2.php:2014
 msgid "Attachments"
 msgstr ""
 
+#: include/functions2.php:2456
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: include/functions2.php:2457
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr ""
+
+#: include/functions2.php:2458
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr ""
+
+#: include/functions2.php:2459
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: include/functions2.php:2460
+msgid "No file was uploaded"
+msgstr ""
+
+#: include/functions2.php:2461
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: include/functions2.php:2462
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: include/functions2.php:2463
+msgid "A PHP extension stopped the file upload."
+msgstr ""
+
 #: include/login_form.php:197 classes/handler/public.php:569
 #: classes/handler/public.php:824
 msgid "Login:"
@@ -804,8 +842,8 @@ msgid "Tags for this article (separated by commas):"
 msgstr ""
 
 #: classes/article.php:222 classes/pref/labels.php:79
-#: classes/pref/users.php:98 classes/pref/feeds.php:799
-#: classes/pref/feeds.php:939 classes/pref/filters.php:485
+#: classes/pref/users.php:98 classes/pref/feeds.php:801
+#: classes/pref/feeds.php:943 classes/pref/filters.php:485
 #: classes/pref/prefs.php:989 plugins/instances/init.php:245
 #: plugins/nsfw/init.php:85 plugins/note/init.php:51
 #: plugins/af_readability/init.php:71 plugins/af_redditimgur/init.php:68
@@ -815,12 +853,12 @@ msgstr ""
 
 #: classes/article.php:224 classes/handler/public.php:546
 #: classes/handler/public.php:580 classes/pref/labels.php:81
-#: classes/pref/users.php:100 classes/pref/feeds.php:800
-#: classes/pref/feeds.php:942 classes/pref/feeds.php:1860
+#: classes/pref/users.php:100 classes/pref/feeds.php:802
+#: classes/pref/feeds.php:946 classes/pref/feeds.php:1865
 #: classes/pref/filters.php:488 classes/pref/filters.php:902
 #: classes/pref/filters.php:983 classes/pref/filters.php:1076
-#: classes/pref/prefs.php:991 classes/feeds.php:1098 classes/feeds.php:1148
-#: classes/feeds.php:1185 plugins/instances/init.php:248
+#: classes/pref/prefs.php:991 classes/feeds.php:1100 classes/feeds.php:1150
+#: classes/feeds.php:1187 plugins/instances/init.php:248
 #: plugins/instances/init.php:436 plugins/note/init.php:53
 #: plugins/mail/init.php:172
 msgid "Cancel"
@@ -872,7 +910,7 @@ msgstr ""
 msgid "Processing category: %s"
 msgstr ""
 
-#: classes/opml.php:470 plugins/import_export/init.php:428
+#: classes/opml.php:470
 #, php-format
 msgid "Upload failed with error code %d"
 msgstr ""
@@ -1088,8 +1126,8 @@ msgid "Created label <b>%s</b>"
 msgstr ""
 
 #: classes/pref/labels.php:258 classes/pref/users.php:334
-#: classes/pref/feeds.php:1340 classes/pref/feeds.php:1602
-#: classes/pref/feeds.php:1666 classes/pref/filters.php:359
+#: classes/pref/feeds.php:1344 classes/pref/feeds.php:1606
+#: classes/pref/feeds.php:1670 classes/pref/filters.php:359
 #: classes/pref/filters.php:407 classes/pref/filters.php:744
 #: classes/pref/filters.php:832 classes/pref/filters.php:859
 #: classes/pref/prefs.php:1000 plugins/instances/init.php:284
@@ -1097,8 +1135,8 @@ msgid "Select"
 msgstr ""
 
 #: classes/pref/labels.php:261 classes/pref/users.php:337
-#: classes/pref/feeds.php:1343 classes/pref/feeds.php:1605
-#: classes/pref/feeds.php:1669 classes/pref/filters.php:362
+#: classes/pref/feeds.php:1347 classes/pref/feeds.php:1609
+#: classes/pref/feeds.php:1673 classes/pref/filters.php:362
 #: classes/pref/filters.php:410 classes/pref/filters.php:747
 #: classes/pref/filters.php:835 classes/pref/filters.php:862
 #: classes/pref/prefs.php:1003 classes/feeds.php:90
@@ -1107,8 +1145,8 @@ msgid "All"
 msgstr ""
 
 #: classes/pref/labels.php:263 classes/pref/users.php:339
-#: classes/pref/feeds.php:1345 classes/pref/feeds.php:1607
-#: classes/pref/feeds.php:1671 classes/pref/filters.php:364
+#: classes/pref/feeds.php:1349 classes/pref/feeds.php:1611
+#: classes/pref/feeds.php:1675 classes/pref/filters.php:364
 #: classes/pref/filters.php:412 classes/pref/filters.php:749
 #: classes/pref/filters.php:837 classes/pref/filters.php:864
 #: classes/pref/prefs.php:1005 classes/feeds.php:93
@@ -1117,8 +1155,8 @@ msgid "None"
 msgstr ""
 
 #: classes/pref/labels.php:270 classes/pref/users.php:348
-#: classes/pref/feeds.php:765 classes/pref/filters.php:478
-#: classes/pref/filters.php:766 classes/feeds.php:1147
+#: classes/pref/feeds.php:767 classes/pref/filters.php:478
+#: classes/pref/filters.php:766 classes/feeds.php:1149
 #: plugins/instances/init.php:294
 msgid "Remove"
 msgstr ""
@@ -1137,7 +1175,7 @@ msgid "Edit user"
 msgstr ""
 
 #: classes/pref/users.php:56 classes/pref/feeds.php:637
-#: classes/pref/feeds.php:876 classes/feeds.php:1070
+#: classes/pref/feeds.php:878 classes/feeds.php:1070
 msgid "Authentication"
 msgstr ""
 
@@ -1145,8 +1183,8 @@ msgstr ""
 msgid "Access level: "
 msgstr ""
 
-#: classes/pref/users.php:77 classes/pref/feeds.php:665
-#: classes/pref/feeds.php:892
+#: classes/pref/users.php:77 classes/pref/feeds.php:667
+#: classes/pref/feeds.php:896
 msgid "Options"
 msgstr ""
 
@@ -1207,8 +1245,8 @@ msgstr ""
 msgid "[tt-rss] Password change notification"
 msgstr ""
 
-#: classes/pref/users.php:324 classes/pref/feeds.php:1336
-#: classes/pref/filters.php:740 classes/feeds.php:1118 classes/feeds.php:1184
+#: classes/pref/users.php:324 classes/pref/feeds.php:1340
+#: classes/pref/filters.php:740 classes/feeds.php:1120 classes/feeds.php:1186
 #: js/tt-rss.js:174
 msgid "Search"
 msgstr ""
@@ -1223,7 +1261,7 @@ msgid "Edit"
 msgstr ""
 
 #: classes/pref/users.php:397 classes/pref/feeds.php:643
-#: classes/pref/feeds.php:880 classes/pref/feeds.php:1838
+#: classes/pref/feeds.php:882 classes/pref/feeds.php:1842
 #: classes/feeds.php:1074
 msgid "Login"
 msgstr ""
@@ -1297,239 +1335,239 @@ msgstr ""
 msgid "Feed Title"
 msgstr ""
 
-#: classes/pref/feeds.php:595 classes/pref/feeds.php:828
-#: classes/pref/feeds.php:1824 classes/feeds.php:1050
+#: classes/pref/feeds.php:595 classes/pref/feeds.php:830
+#: classes/pref/feeds.php:1828 classes/feeds.php:1050
 msgid "Place in category:"
 msgstr ""
 
-#: classes/pref/feeds.php:608 classes/pref/feeds.php:842
+#: classes/pref/feeds.php:608 classes/pref/feeds.php:844
 msgid "Language:"
 msgstr ""
 
-#: classes/pref/feeds.php:615 classes/pref/feeds.php:851
+#: classes/pref/feeds.php:615 classes/pref/feeds.php:853
 msgid "Update"
 msgstr ""
 
-#: classes/pref/feeds.php:630 classes/pref/feeds.php:867
+#: classes/pref/feeds.php:630 classes/pref/feeds.php:869
 msgid "Article purging:"
 msgstr ""
 
-#: classes/pref/feeds.php:656 classes/pref/feeds.php:886
-#: classes/pref/feeds.php:1841 classes/pref/prefs.php:245
-#: classes/feeds.php:1077
+#: classes/pref/feeds.php:658 classes/pref/feeds.php:890
+#: classes/pref/feeds.php:1845 classes/pref/prefs.php:245
+#: classes/feeds.php:1078
 msgid "Password"
 msgstr ""
 
-#: classes/pref/feeds.php:660
+#: classes/pref/feeds.php:662
 msgid ""
 "<b>Hint:</b> you need to fill in your login information if your feed "
 "requires authentication, except for Twitter feeds."
 msgstr ""
 
-#: classes/pref/feeds.php:679 classes/pref/feeds.php:896
+#: classes/pref/feeds.php:681 classes/pref/feeds.php:900
 msgid "Hide from Popular feeds"
 msgstr ""
 
-#: classes/pref/feeds.php:691 classes/pref/feeds.php:902
+#: classes/pref/feeds.php:693 classes/pref/feeds.php:906
 msgid "Include in e-mail digest"
 msgstr ""
 
-#: classes/pref/feeds.php:704 classes/pref/feeds.php:908
+#: classes/pref/feeds.php:706 classes/pref/feeds.php:912
 msgid "Always display image attachments"
 msgstr ""
 
-#: classes/pref/feeds.php:717 classes/pref/feeds.php:916
+#: classes/pref/feeds.php:719 classes/pref/feeds.php:920
 msgid "Do not embed images"
 msgstr ""
 
-#: classes/pref/feeds.php:730 classes/pref/feeds.php:924
+#: classes/pref/feeds.php:732 classes/pref/feeds.php:928
 msgid "Cache images locally"
 msgstr ""
 
-#: classes/pref/feeds.php:742 classes/pref/feeds.php:930
+#: classes/pref/feeds.php:744 classes/pref/feeds.php:934
 msgid "Mark updated articles as unread"
 msgstr ""
 
-#: classes/pref/feeds.php:746
+#: classes/pref/feeds.php:748
 msgid "Icon"
 msgstr ""
 
-#: classes/pref/feeds.php:763
+#: classes/pref/feeds.php:765
 msgid "Replace"
 msgstr ""
 
-#: classes/pref/feeds.php:770 classes/pref/prefs.php:706
+#: classes/pref/feeds.php:772 classes/pref/prefs.php:706
 msgid "Plugins"
 msgstr ""
 
-#: classes/pref/feeds.php:790
+#: classes/pref/feeds.php:792
 msgid "Resubscribe to push updates"
 msgstr ""
 
-#: classes/pref/feeds.php:797
+#: classes/pref/feeds.php:799
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr ""
 
-#: classes/pref/feeds.php:1203 classes/pref/feeds.php:1256
+#: classes/pref/feeds.php:1207 classes/pref/feeds.php:1260
 msgid "All done."
 msgstr ""
 
-#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1315
 msgid "Feeds with errors"
 msgstr ""
 
-#: classes/pref/feeds.php:1318
+#: classes/pref/feeds.php:1322
 msgid "Inactive feeds"
 msgstr ""
 
-#: classes/pref/feeds.php:1354
+#: classes/pref/feeds.php:1358
 msgid "Edit selected feeds"
 msgstr ""
 
-#: classes/pref/feeds.php:1356 classes/pref/feeds.php:1370
+#: classes/pref/feeds.php:1360 classes/pref/feeds.php:1374
 #: classes/pref/filters.php:762
 msgid "Reset sort order"
 msgstr ""
 
-#: classes/pref/feeds.php:1358 js/prefs.js:1737
+#: classes/pref/feeds.php:1362 js/prefs.js:1737
 msgid "Batch subscribe"
 msgstr ""
 
-#: classes/pref/feeds.php:1365
+#: classes/pref/feeds.php:1369
 msgid "Categories"
 msgstr ""
 
-#: classes/pref/feeds.php:1368
+#: classes/pref/feeds.php:1372
 msgid "Add category"
 msgstr ""
 
-#: classes/pref/feeds.php:1372
+#: classes/pref/feeds.php:1376
 msgid "Remove selected"
 msgstr ""
 
-#: classes/pref/feeds.php:1383
+#: classes/pref/feeds.php:1387
 msgid "More actions..."
 msgstr ""
 
-#: classes/pref/feeds.php:1387
+#: classes/pref/feeds.php:1391
 msgid "Manual purge"
 msgstr ""
 
-#: classes/pref/feeds.php:1391
+#: classes/pref/feeds.php:1395
 msgid "Clear feed data"
 msgstr ""
 
-#: classes/pref/feeds.php:1392 classes/pref/filters.php:770
+#: classes/pref/feeds.php:1396 classes/pref/filters.php:770
 msgid "Rescore articles"
 msgstr ""
 
-#: classes/pref/feeds.php:1444
+#: classes/pref/feeds.php:1448
 msgid "OPML"
 msgstr ""
 
-#: classes/pref/feeds.php:1446
+#: classes/pref/feeds.php:1450
 msgid ""
 "Using OPML you can export and import your feeds, filters, labels and Tiny "
 "Tiny RSS settings."
 msgstr ""
 
-#: classes/pref/feeds.php:1447
+#: classes/pref/feeds.php:1451
 msgid "Only main settings profile can be migrated using OPML."
 msgstr ""
 
-#: classes/pref/feeds.php:1460
+#: classes/pref/feeds.php:1464
 msgid "Import my OPML"
 msgstr ""
 
-#: classes/pref/feeds.php:1466
+#: classes/pref/feeds.php:1470
 msgid "Filename:"
 msgstr ""
 
-#: classes/pref/feeds.php:1468
+#: classes/pref/feeds.php:1472
 msgid "Include settings"
 msgstr ""
 
-#: classes/pref/feeds.php:1472
+#: classes/pref/feeds.php:1476
 msgid "Export OPML"
 msgstr ""
 
-#: classes/pref/feeds.php:1476
+#: classes/pref/feeds.php:1480
 msgid ""
 "Your OPML can be published publicly and can be subscribed by anyone who "
 "knows the URL below."
 msgstr ""
 
-#: classes/pref/feeds.php:1480
+#: classes/pref/feeds.php:1484
 msgid "Public OPML URL"
 msgstr ""
 
-#: classes/pref/feeds.php:1481
+#: classes/pref/feeds.php:1485
 msgid "Display published OPML URL"
 msgstr ""
 
-#: classes/pref/feeds.php:1490
+#: classes/pref/feeds.php:1494
 msgid "Firefox integration"
 msgstr ""
 
-#: classes/pref/feeds.php:1492
+#: classes/pref/feeds.php:1496
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
 msgstr ""
 
-#: classes/pref/feeds.php:1499
+#: classes/pref/feeds.php:1503
 msgid "Click here to register this site as a feed reader."
 msgstr ""
 
-#: classes/pref/feeds.php:1507
+#: classes/pref/feeds.php:1511
 msgid "Published & shared articles / Generated feeds"
 msgstr ""
 
-#: classes/pref/feeds.php:1509
+#: classes/pref/feeds.php:1513
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the URL specified below."
 msgstr ""
 
-#: classes/pref/feeds.php:1516 classes/feeds.php:54 classes/feeds.php:134
+#: classes/pref/feeds.php:1520 classes/feeds.php:54 classes/feeds.php:134
 msgid "View as RSS"
 msgstr ""
 
-#: classes/pref/feeds.php:1517
+#: classes/pref/feeds.php:1521
 msgid "Display URL"
 msgstr ""
 
-#: classes/pref/feeds.php:1520
+#: classes/pref/feeds.php:1524
 msgid "Clear all generated URLs"
 msgstr ""
 
-#: classes/pref/feeds.php:1598
+#: classes/pref/feeds.php:1602
 msgid ""
 "These feeds have not been updated with new content for 3 months (oldest "
 "first):"
 msgstr ""
 
-#: classes/pref/feeds.php:1632 classes/pref/feeds.php:1696
+#: classes/pref/feeds.php:1636 classes/pref/feeds.php:1700
 msgid "Click to edit feed"
 msgstr ""
 
-#: classes/pref/feeds.php:1650 classes/pref/feeds.php:1716
+#: classes/pref/feeds.php:1654 classes/pref/feeds.php:1720
 msgid "Unsubscribe from selected feeds"
 msgstr ""
 
-#: classes/pref/feeds.php:1821
+#: classes/pref/feeds.php:1825
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr ""
 
-#: classes/pref/feeds.php:1830
+#: classes/pref/feeds.php:1834
 msgid "Feeds to subscribe, One per line"
 msgstr ""
 
-#: classes/pref/feeds.php:1852
+#: classes/pref/feeds.php:1857
 msgid "Feeds require authentication."
 msgstr ""
 
-#: classes/pref/feeds.php:1859 classes/feeds.php:1092 classes/feeds.php:1146
+#: classes/pref/feeds.php:1864 classes/feeds.php:1094 classes/feeds.php:1148
 msgid "Subscribe"
 msgstr ""
 
@@ -1598,7 +1636,7 @@ msgstr ""
 msgid "on field"
 msgstr ""
 
-#: classes/pref/filters.php:962 js/PrefFilterTree.js:61
+#: classes/pref/filters.php:962 js/PrefFilterTree.js:64
 msgid "in"
 msgstr ""
 
@@ -2198,40 +2236,40 @@ msgstr ""
 msgid "Available feeds"
 msgstr ""
 
-#: classes/feeds.php:1087
+#: classes/feeds.php:1089
 msgid "This feed requires authentication."
 msgstr ""
 
-#: classes/feeds.php:1095
+#: classes/feeds.php:1097
 msgid "More feeds"
 msgstr ""
 
-#: classes/feeds.php:1122
+#: classes/feeds.php:1124
 msgid "Popular feeds"
 msgstr ""
 
-#: classes/feeds.php:1123
+#: classes/feeds.php:1125
 msgid "Feed archive"
 msgstr ""
 
-#: classes/feeds.php:1126
+#: classes/feeds.php:1128
 msgid "limit:"
 msgstr ""
 
-#: classes/feeds.php:1158
+#: classes/feeds.php:1160
 msgid "Look for"
 msgstr ""
 
-#: classes/feeds.php:1166
+#: classes/feeds.php:1168
 #, php-format
 msgid "in %s"
 msgstr ""
 
-#: classes/feeds.php:1171
+#: classes/feeds.php:1173
 msgid "Used for word stemming"
 msgstr ""
 
-#: classes/feeds.php:1180
+#: classes/feeds.php:1182
 msgid "Search syntax"
 msgstr ""
 
@@ -2484,6 +2522,11 @@ msgstr ""
 msgid "Prepare data"
 msgstr ""
 
+#: plugins/import_export/init.php:428
+#, php-format
+msgid "Upload failed with error code %d (%s)"
+msgstr ""
+
 #: plugins/import_export/init.php:454
 msgid "No file uploaded."
 msgstr ""
@@ -2593,7 +2636,7 @@ msgstr ""
 msgid "Remove category"
 msgstr ""
 
-#: js/PrefFilterTree.js:64
+#: js/PrefFilterTree.js:67
 msgid "Inverse"
 msgstr ""
 
@@ -2648,7 +2691,7 @@ msgstr ""
 msgid "Subscription reset."
 msgstr ""
 
-#: js/functions.js:1311 js/tt-rss.js:682
+#: js/functions.js:1311 js/tt-rss.js:705
 #, perl-format
 msgid "Unsubscribe from %s?"
 msgstr ""
@@ -2861,36 +2904,36 @@ msgstr ""
 msgid "Marking all feeds as read..."
 msgstr ""
 
-#: js/tt-rss.js:383
+#: js/tt-rss.js:404
 msgid "Please enable mail plugin first."
 msgstr ""
 
-#: js/tt-rss.js:431 js/functions.js:1643 js/tt-rss.js:663
+#: js/tt-rss.js:452 js/functions.js:1643 js/tt-rss.js:686
 msgid "You can't edit this kind of feed."
 msgstr ""
 
-#: js/tt-rss.js:502
+#: js/tt-rss.js:533
 msgid "Please enable embed_original plugin first."
 msgstr ""
 
-#: js/tt-rss.js:515 js/tt-rss.js:713
+#: js/tt-rss.js:546 js/tt-rss.js:736
 msgid "Widescreen is not available in combined mode."
 msgstr ""
 
-#: js/tt-rss.js:827
+#: js/tt-rss.js:850
 msgid "You can't rescore this kind of feed."
 msgstr ""
 
-#: js/tt-rss.js:832 js/tt-rss.js:676
+#: js/tt-rss.js:855 js/tt-rss.js:699
 msgid "Please select some feed first."
 msgstr ""
 
-#: js/tt-rss.js:837
+#: js/tt-rss.js:860
 #, perl-format
 msgid "Rescore articles in %s?"
 msgstr ""
 
-#: js/tt-rss.js:840
+#: js/tt-rss.js:863
 msgid "Rescoring articles..."
 msgstr ""
 
@@ -3060,7 +3103,7 @@ msgstr ""
 msgid "Sorry, your browser does not support sandboxed iframes."
 msgstr ""
 
-#: plugins/shorten_expanded/init.js:37
+#: plugins/shorten_expanded/init.js:39
 msgid "Click to expand article"
 msgstr ""
 
@@ -3308,7 +3351,7 @@ msgstr ""
 msgid "Label Editor"
 msgstr ""
 
-#: js/tt-rss.js:671
+#: js/tt-rss.js:694
 msgid "You can't unsubscribe from the category."
 msgstr ""
 
-- 
cgit v1.2.3