diff --git a/cdm.css b/cdm.css
index 6838a4cef..bcba40538 100644
--- a/cdm.css
+++ b/cdm.css
@@ -76,7 +76,8 @@ div.cdmFooter {
 }
 
 .Selected div.cdmFooter {
-	background : #FFF2BF;
+	background-color : #FFE587;
+	background-image : url("images/cdm_footer_selected.png");
 }
 
 span.cdmExcerpt {
@@ -100,6 +101,19 @@ div.cdmFeedTitle {
 	background-repeat : repeat-x;
 }
 
+div.cdmFeedTitle a.title {
+	color : gray;
+	font-style : italic;
+	font-weight : bold;
+}
+div.cdmFeedTitle a {
+	color : gray;
+}
+
+div.cdmFeedTitle a:hover {
+	color : #4684ff;
+}
+
 div.articleNote {
 	border-style : dashed none dashed none;
 }
@@ -119,7 +133,7 @@ div.Unread div.cdmHeader {
 }
 
 div.Unread.Selected div.cdmHeader, div.Selected div.cdmHeader {
-	background : #FFF2BF;
+	background : #FFEA9E;
 }
 
 div.cdm.even.Unread, div.cdm.odd.Unread {
@@ -127,7 +141,7 @@ div.cdm.even.Unread, div.cdm.odd.Unread {
 }
 
 div.cdm.even, div.cdm.odd {
-	background : #f0f0f0;
+	background : #f9f9f9;
 }
 
 div.cdmHeader div.hlFeed, div.cdmHeader div.hlFeed a {
diff --git a/classes/backend.php b/classes/backend.php
index 5473c5c79..7848b0714 100644
--- a/classes/backend.php
+++ b/classes/backend.php
@@ -45,6 +45,28 @@ class Backend extends Handler {
 							$sequence = substr($sequence,
 								strpos($sequence, "|")+1,
 								strlen($sequence));
+						} else {
+							$keys = explode(" ", $sequence);
+
+							for ($i = 0; $i < count($keys); $i++) {
+								if (strlen($keys[$i]) > 1) {
+									$tmp = '';
+									foreach (str_split($keys[$i]) as $c) {
+										switch ($c) {
+										case '*':
+											$tmp .= __('Shift') . '+';
+											break;
+										case '^':
+											$tmp .= __('Ctrl') . '+';
+											break;
+										default:
+											$tmp .= $c;
+										}
+									}
+									$keys[$i] = $tmp;
+								}
+							}
+							$sequence = join(" ", $keys);
 						}
 
 						print "<li>";
diff --git a/classes/feeds.php b/classes/feeds.php
index d6cd2a255..d598a9e4f 100644
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -126,6 +126,11 @@ class Feeds extends Handler_Protected {
 				"</option>";
 		}
 
+		if ($pluginhost->get_plugin("mailto")) {
+			$reply .= "<option value=\"mailtoArticle(false)\">".__('Forward by email').
+				"</option>";
+		}
+
 		$reply .= "<option value=\"0\" disabled=\"1\">".__('Feed:')."</option>";
 
 		$reply .= "<option value=\"catchupPage()\">".__('Mark as read')."</option>";
@@ -400,11 +405,11 @@ class Feeds extends Handler_Protected {
 
 							$cur_feed_title = htmlspecialchars($cur_feed_title);
 
-							$vf_catchup_link = "(<a onclick='catchupFeedInGroup($feed_id);' href='#'>".__('mark as read')."</a>)";
+							$vf_catchup_link = "(<a class='catchup' onclick='catchupFeedInGroup($feed_id);' href='#'>".__('Mark as read')."</a>)";
 
 							$reply['content'] .= "<div class='cdmFeedTitle'>".
 								"<div style=\"float : right\">$feed_icon_img</div>".
-								"<a href=\"#\" onclick=\"viewfeed($feed_id)\">".
+								"<a class='title' href=\"#\" onclick=\"viewfeed($feed_id)\">".
 								$line["feed_title"]."</a> $vf_catchup_link</div>";
 
 						}
@@ -490,7 +495,7 @@ class Feeds extends Handler_Protected {
 
 							$cur_feed_title = htmlspecialchars($cur_feed_title);
 
-							$vf_catchup_link = "(<a onclick='javascript:catchupFeedInGroup($feed_id);' href='#'>".__('mark as read')."</a>)";
+							$vf_catchup_link = "(<a class='catchup' onclick='javascript:catchupFeedInGroup($feed_id);' href='#'>".__('mark as read')."</a>)";
 
 							$has_feed_icon = feed_has_icon($feed_id);
 
@@ -502,7 +507,7 @@ class Feeds extends Handler_Protected {
 
 							$reply['content'] .= "<div class='cdmFeedTitle'>".
 								"<div style=\"float : right\">$feed_icon_img</div>".
-								"<a href=\"#\" onclick=\"viewfeed($feed_id)\">".
+								"<a href=\"#\" class='title' onclick=\"viewfeed($feed_id)\">".
 								$line["feed_title"]."</a> $vf_catchup_link</div>";
 						}
 					}
@@ -539,7 +544,7 @@ class Feeds extends Handler_Protected {
 						target=\"_blank\" href=\"".
 						htmlspecialchars($line["link"])."\">".
 						$line["title"] .
-						" $entry_author</a>";
+						" <span class=\"author\">$entry_author</span></a>";
 
 					$reply['content'] .= $labels_str;
 
diff --git a/classes/opml.php b/classes/opml.php
index b91e395d1..34067e017 100644
--- a/classes/opml.php
+++ b/classes/opml.php
@@ -462,7 +462,8 @@ class Opml extends Handler_Protected {
 #		if ($debug) $doc = DOMDocument::load("/tmp/test.opml");
 
 		if (is_file($_FILES['opml_file']['tmp_name'])) {
-			$doc = DOMDocument::load($_FILES['opml_file']['tmp_name']);
+			$doc = new DOMDocument();
+			$doc->load($_FILES['opml_file']['tmp_name']);
 		} else if (!$doc) {
 			print_error(__('Error: please upload OPML file.'));
 			return;
diff --git a/classes/pluginhost.php b/classes/pluginhost.php
index 592629881..79544b01b 100644
--- a/classes/pluginhost.php
+++ b/classes/pluginhost.php
@@ -21,6 +21,7 @@ class PluginHost {
 	const HOOK_RENDER_ARTICLE = 10;
 	const HOOK_RENDER_ARTICLE_CDM = 11;
 	const HOOK_FEED_FETCHED = 12;
+	const HOOK_SANITIZE = 13;
 
 	const KIND_ALL = 1;
 	const KIND_SYSTEM = 2;
diff --git a/classes/rpc.php b/classes/rpc.php
index 5d77b1ae8..b297bbade 100644
--- a/classes/rpc.php
+++ b/classes/rpc.php
@@ -285,6 +285,7 @@ class RPC extends Handler_Protected {
 
 	function sanityCheck() {
 		$_SESSION["hasAudio"] = $_REQUEST["hasAudio"] === "true";
+		$_SESSION["hasSandbox"] = $_REQUEST["hasSandbox"] === "true";
 
 		$reply = array();
 
diff --git a/image.php b/image.php
index 91490ea22..cccda64b7 100644
--- a/image.php
+++ b/image.php
@@ -4,14 +4,35 @@
 
 	require_once "config.php";
 
-	$url = base64_decode($_GET['url']);
+	// backwards compatible wrapper for old-style image caching
+	/* if (isset($_GET['url'])) {
+		$url = base64_decode($_GET['url']);
 
-	$filename = CACHE_DIR . '/images/' . sha1($url) . '.png';
+		$filename = CACHE_DIR . '/images/' . sha1($url) . '.png';
 
-	if (file_exists($filename)) {
-		header("Content-type: image/png");
-		echo file_get_contents($filename);
-	} else {
-		header("Location: $url");
+		if (file_exists($filename)) {
+			header("Content-type: image/png");
+			echo file_get_contents($filename);
+		} else {
+			header("Location: $url");
+		}
+
+		return;
+	} */
+
+	@$hash = basename($_GET['hash']);
+
+	if ($hash) {
+
+		$filename = CACHE_DIR . '/images/' . $hash . '.png';
+
+		if (file_exists($filename)) {
+			header("Content-type: image/png");
+			echo file_get_contents($filename);
+		} else {
+			header($_SERVER["SERVER_PROTOCOL"]." 404 Not Found");
+			echo "File not found.";
+		}
 	}
+
 ?>
diff --git a/images/cdm_footer_selected.png b/images/cdm_footer_selected.png
new file mode 100644
index 000000000..def21426b
Binary files /dev/null and b/images/cdm_footer_selected.png differ
diff --git a/include/functions.php b/include/functions.php
index 8c2ced801..affd4d4dc 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -51,6 +51,7 @@
 					"hu_HU" => "Magyar (Hungarian)",
 					"it_IT" => "Italiano",
 					"ja_JP" => "日本語 (Japanese)",
+					"lv_LV" => "Latviešu",
 					"nb_NO" => "Norwegian bokmål",
 					"pl_PL" => "Polski",
 					"ru_RU" => "Русский",
@@ -109,7 +110,6 @@
 	ini_set('user_agent', SELF_USER_AGENT);
 
 	require_once 'lib/pubsubhubbub/publisher.php';
-	require_once 'lib/htmLawed.php';
 
 	$tz_offset = -1;
 	$utc_tz = new DateTimeZone('UTC');
@@ -286,11 +286,12 @@
 		global $fetch_last_error;
 
 		if (function_exists('curl_init') && !ini_get("open_basedir")) {
-			$ch = curl_init($url);
+			//$ch = curl_init($url);
+			$ch = curl_init(geturl($url));
 
 			curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $timeout ? $timeout : 15);
 			curl_setopt($ch, CURLOPT_TIMEOUT, $timeout ? $timeout : 45);
-			curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
+			//curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
 			curl_setopt($ch, CURLOPT_MAXREDIRS, 20);
 			curl_setopt($ch, CURLOPT_BINARYTRANSFER, true);
 			curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
@@ -350,6 +351,9 @@
 
 			$data = @file_get_contents($url);
 
+			$gzdecoded = gzdecode($data);
+			if ($gzdecoded) $data = $gzdecoded;
+
 			if (!$data && function_exists('error_get_last')) {
 				$error = error_get_last();
 				$fetch_last_error = $error["message"];
@@ -459,6 +463,8 @@
 			 else
 			 	$sel = "";
 
+			$v = trim($v);
+
 			print "<option value=\"$v\" $sel>$v</option>";
 		}
 		print "</select>";
@@ -472,6 +478,8 @@
 			 else
 			 	$sel = "";
 
+			$v = trim($v);
+
 			print "<option $sel value=\"$v\">".$values[$v]."</option>";
 		}
 
@@ -1928,23 +1936,25 @@
 				"(191)|/" => "search_dialog",
 //			"article" => array(
 				"s" => "toggle_mark",
-				"S" => "toggle_publ",
+				"*s" => "toggle_publ",
 				"u" => "toggle_unread",
-				"T" => "edit_tags",
-				"D" => "dismiss_selected",
-				"X" => "dismiss_read",
+				"*t" => "edit_tags",
+				"*d" => "dismiss_selected",
+				"*x" => "dismiss_read",
 				"o" => "open_in_new_window",
 				"c p" => "catchup_below",
 				"c n" => "catchup_above",
-				"N" => "article_scroll_down",
-				"P" => "article_scroll_up",
-				"a W" => "toggle_widescreen",
+				"*n" => "article_scroll_down",
+				"*p" => "article_scroll_up",
+				"*(38)|Shift+up" => "article_scroll_up",
+				"*(40)|Shift+down" => "article_scroll_down",
+				"a *w" => "toggle_widescreen",
 				"e" => "email_article",
 				"a q" => "close_article",
 //			"article_selection" => array(
 				"a a" => "select_all",
 				"a u" => "select_unread",
-				"a U" => "select_marked",
+				"a *u" => "select_marked",
 				"a p" => "select_published",
 				"a i" => "select_invert",
 				"a n" => "select_none",
@@ -1955,9 +1965,9 @@
 				"f e" => "feed_edit",
 				"f q" => "feed_catchup",
 				"f x" => "feed_reverse",
-				"f D" => "feed_debug_update",
-				"f C" => "toggle_combined_mode",
-				"Q" => "catchup_all",
+				"f *d" => "feed_debug_update",
+				"f *c" => "toggle_combined_mode",
+				"*q" => "catchup_all",
 				"x" => "cat_toggle_collapse",
 //			"goto" => array(
 				"g a" => "goto_all",
@@ -1965,7 +1975,7 @@
 				"g s" => "goto_marked",
 				"g p" => "goto_published",
 				"g t" => "goto_tagcloud",
-				"g P" => "goto_prefs",
+				"g *p" => "goto_prefs",
 //			"other" => array(
 				"(9)|Tab" => "select_article_cursor", // tab
 				"c l" => "create_label",
@@ -2584,10 +2594,17 @@
 					$entry->setAttribute('href',
 						rewrite_relative_url($site_url, $entry->getAttribute('href')));
 
-				if ($entry->hasAttribute('src'))
-					if (preg_match('/^image.php\?i=[a-z0-9]+$/', $entry->getAttribute('src')) == 0)
-						$entry->setAttribute('src',
-							rewrite_relative_url($site_url, $entry->getAttribute('src')));
+				if ($entry->hasAttribute('src')) {
+					$src = rewrite_relative_url($site_url, $entry->getAttribute('src'));
+
+					$cached_filename = CACHE_DIR . '/images/' . sha1($src) . '.png';
+
+					if (file_exists($cached_filename)) {
+						$src = SELF_URL_PATH . '/image.php?hash=' . sha1($src);
+					}
+
+					$entry->setAttribute('src', $src);
+				}
 			}
 
 			if (strtolower($entry->nodeName) == "a") {
@@ -2595,18 +2612,64 @@
 			}
 		}
 
-		//$node = $doc->getElementsByTagName('body')->item(0);
+		$entries = $xpath->query('//iframe');
+		foreach ($entries as $entry) {
+			$entry->setAttribute('sandbox', true);
+		}
+
+		global $pluginhost;
+
+		if (isset($pluginhost)) {
+			foreach ($pluginhost->get_hooks($pluginhost::HOOK_SANITIZE) as $plugin) {
+				$doc = $plugin->hook_sanitize($doc, $site_url);
+			}
+		}
 
 		$doc->removeChild($doc->firstChild); //remove doctype
+		$doc = strip_harmful_tags($doc);
 		$res = $doc->saveHTML();
-
-		$config = array('safe' => 1, 'deny_attribute' => 'style, width, height, class, id', 'comment' => 1, 'cdata' => 1, 'balance' => 0);
-		$spec = 'img=width,height';
-		$res = htmLawed($res, $config, $spec);
-
 		return $res;
 	}
 
+	function strip_harmful_tags($doc) {
+		$entries = $doc->getElementsByTagName("*");
+
+		$allowed_elements = array('a', 'address', 'audio', 'article',
+			'b', 'big', 'blockquote', 'body', 'br', 'cite',
+			'code', 'dd', 'del', 'details', 'div', 'dl',
+			'dt', 'em', 'footer', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6',
+			'header', 'html', 'i', 'img', 'ins', 'kbd',
+			'li', 'nav', 'ol', 'p', 'pre', 'q', 's','small',
+			'source', 'span', 'strike', 'strong', 'sub', 'summary',
+			'sup', 'table', 'tbody', 'td', 'tfoot', 'th', 'thead',
+			'tr', 'track', 'tt', 'u', 'ul', 'var', 'wbr', 'video' );
+
+		if ($_SESSION['hasSandbox']) array_push($allowed_elements, 'iframe');
+
+		$disallowed_attributes = array('id', 'style', 'class');
+
+		foreach ($entries as $entry) {
+			if (!in_array($entry->nodeName, $allowed_elements)) {
+				$entry->parentNode->removeChild($entry);
+			}
+
+			if ($entry->hasAttributes()) {
+				foreach (iterator_to_array($entry->attributes) as $attr) {
+
+					if (strpos($attr->nodeName, 'on') === 0) {
+						$entry->removeAttributeNode($attr);
+					}
+
+					if (in_array($attr->nodeName, $disallowed_attributes)) {
+						$entry->removeAttributeNode($attr);
+					}
+				}
+			}
+		}
+
+		return $doc;
+	}
+
 	function check_for_update($link) {
 		if (CHECK_FOR_NEW_VERSION && $_SESSION['access_level'] >= 10) {
 			$version_url = "http://tt-rss.org/version.php?ver=" . VERSION .
@@ -3907,6 +3970,55 @@
 		return in_array($interface, class_implements($class));
 	}
 
+	function geturl($url){
+
+		(function_exists('curl_init')) ? '' : die('cURL Must be installed for geturl function to work. Ask your host to enable it or uncomment extension=php_curl.dll in php.ini');
+
+		$curl = curl_init();
+		$header[0] = "Accept: text/xml,application/xml,application/xhtml+xml,";
+		$header[0] .= "text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5";
+		$header[] = "Cache-Control: max-age=0";
+		$header[] = "Connection: keep-alive";
+		$header[] = "Keep-Alive: 300";
+		$header[] = "Accept-Charset: ISO-8859-1,utf-8;q=0.7,*;q=0.7";
+		$header[] = "Accept-Language: en-us,en;q=0.5";
+		$header[] = "Pragma: ";
+
+		curl_setopt($curl, CURLOPT_URL, $url);
+		curl_setopt($curl, CURLOPT_USERAGENT, 'Mozilla/5.0 (Windows NT 5.1; rv:5.0) Gecko/20100101 Firefox/5.0 Firefox/5.0');
+		curl_setopt($curl, CURLOPT_HTTPHEADER, $header);
+		curl_setopt($curl, CURLOPT_HEADER, true);
+		curl_setopt($curl, CURLOPT_REFERER, $url);
+		curl_setopt($curl, CURLOPT_ENCODING, 'gzip,deflate');
+		curl_setopt($curl, CURLOPT_AUTOREFERER, true);
+		curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
+		//curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true); //CURLOPT_FOLLOWLOCATION Disabled...
+		curl_setopt($curl, CURLOPT_TIMEOUT, 60);
+
+		$html = curl_exec($curl);
+
+		$status = curl_getinfo($curl);
+		curl_close($curl);
+
+		if($status['http_code']!=200){
+			if($status['http_code'] == 301 || $status['http_code'] == 302) {
+				list($header) = explode("\r\n\r\n", $html, 2);
+				$matches = array();
+				preg_match("/(Location:|URI:)[^(\n)]*/", $header, $matches);
+				$url = trim(str_replace($matches[1],"",$matches[0]));
+				$url_parsed = parse_url($url);
+				return (isset($url_parsed))? geturl($url, $referer):'';
+			}
+			$oline='';
+			foreach($status as $key=>$eline){$oline.='['.$key.']'.$eline.' ';}
+			$line =$oline." \r\n ".$url."\r\n-----------------\r\n";
+			$handle = @fopen('./curl.error.log', 'a');
+			fwrite($handle, $line);
+			return FALSE;
+		}
+		return $url;
+	}
+
 	function get_minified_js($files) {
 		require_once 'lib/jshrink/Minifier.php';
 
diff --git a/include/localized_schema.php b/include/localized_schema.php
index 0aecc45c9..f5acae99c 100644
--- a/include/localized_schema.php
+++ b/include/localized_schema.php
@@ -1,4 +1,4 @@
-<?php # This file has been generated at:  Sun Mar 17 19:37:50 MSK 2013
+<?php # This file has been generated at:  Tue Mar 19 10:14:58 MSK 2013
 
 __("Title");
 __("Title or Content");
diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index a95280a31..df1d16986 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -573,15 +573,17 @@
 				$entry_author = db_escape_string($article["author"]);
 				$entry_link = db_escape_string($article["link"]);
 				$entry_plugin_data = db_escape_string($article["plugin_data"]);
+				$entry_content = $article["content"]; // escaped below
+
 
 				if ($debug_enabled) {
 					_debug("update_rss_feed: plugin data: $entry_plugin_data");
 				}
 
 				if ($cache_images && is_writable(CACHE_DIR . '/images'))
-					$entry_content = cache_images($entry_content, $site_url, $debug_enabled);
+					cache_images($entry_content, $site_url, $debug_enabled);
 
-				$entry_content = db_escape_string($article["content"], false);
+				$entry_content = db_escape_string($entry_content, false);
 
 				$content_hash = "SHA1:" . sha1($entry_content);
 
diff --git a/include/sanity_check.php b/include/sanity_check.php
index 4925486a3..0373196b3 100644
--- a/include/sanity_check.php
+++ b/include/sanity_check.php
@@ -125,9 +125,9 @@
 				array_push($errors, "PHP support for iconv is required to handle multiple charsets.");
 			}
 
-			if (ini_get("safe_mode")) {
+			/* if (ini_get("safe_mode")) {
 				array_push($errors, "PHP safe mode setting is not supported.");
-			}
+			} */
 
 			if ((PUBSUBHUBBUB_HUB || PUBSUBHUBBUB_ENABLED) && !function_exists("curl_init")) {
 				array_push($errors, "PHP support for CURL is required for PubSubHubbub.");
diff --git a/js/FeedTree.js b/js/FeedTree.js
index 2cb6346e4..b02d8ad7c 100644
--- a/js/FeedTree.js
+++ b/js/FeedTree.js
@@ -162,6 +162,13 @@ dojo.declare("fox.FeedTree", dijit.Tree, {
 			tnode._menu = menu;
 		}
 
+		if (id.match("CAT:")) {
+			loading = dojo.doc.createElement('img');
+			loading.className = 'loadingNode';
+			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;
@@ -243,8 +250,15 @@ dojo.declare("fox.FeedTree", dijit.Tree, {
 
 		if (treeNode) {
 			treeNode = treeNode[0];
-			treeNode.expandoNode.src = src;
-			return true;
+			if (is_cat) {
+				if (treeNode.loadingNode) {
+					treeNode.loadingNode.src = src;
+					return true;
+				}
+			} else {
+				treeNode.expandoNode.src = src;
+				return true;
+			}
 		}
 
 		return false;
@@ -309,7 +323,7 @@ dojo.declare("fox.FeedTree", dijit.Tree, {
 				var node = tree._itemNodesMap[id];
 
 				if (node) {
-					if (hide && unread == 0 && (bare_id > 0 || !show_special)) {
+					if (hide && unread == 0 && (bare_id > 0 || bare_id < -10 || !show_special)) {
 						Effect.Fade(node[0].rowNode, {duration : 0.3,
 							queue: { position: 'end', scope: 'FFADE-' + id, limit: 1 }});
 					} else {
diff --git a/js/feedlist.js b/js/feedlist.js
index e227c9386..ae4c3a2fb 100644
--- a/js/feedlist.js
+++ b/js/feedlist.js
@@ -125,13 +125,11 @@ function viewfeed(feed, method, is_cat, offset, background, infscroll_req) {
 
 			Form.enable("main_toolbar_form");
 
-			if (!offset)
-				if (!is_cat) {
-					if (!setFeedExpandoIcon(feed, is_cat, 'images/indicator_white.gif'))
-						notify_progress("Loading, please wait...", true);
-				} else {
+			if (!offset) {
+				if (!setFeedExpandoIcon(feed, is_cat,
+							(is_cat) ? 'images/indicator_tiny.gif' : 'images/indicator_white.gif'))
 					notify_progress("Loading, please wait...", true);
-				}
+			}
 		}
 
 		query += "&cat=" + is_cat;
@@ -154,7 +152,6 @@ function feedlist_init() {
 	try {
 		console.log("in feedlist init");
 
-		hideOrShowFeeds(getInitParam("hide_read_feeds") == 1);
 		document.onkeydown = hotkey_handler;
 		setTimeout("hotkey_prefix_timeout()", 5*1000);
 
diff --git a/js/tt-rss.js b/js/tt-rss.js
index 5d6e1d81e..3b96566f9 100644
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -248,9 +248,11 @@ function init() {
 		loading_set_progress(20);
 
 		var hasAudio = !!((myAudioTag = document.createElement('audio')).canPlayType);
+		var hasSandbox = "sandbox" in document.createElement("iframe");
 
 		new Ajax.Request("backend.php",	{
-			parameters: {op: "rpc", method: "sanityCheck", hasAudio: hasAudio},
+			parameters: {op: "rpc", method: "sanityCheck", hasAudio: hasAudio,
+				hasSandbox: hasSandbox},
 			onComplete: function(transport) {
 					backend_sanity_check_callback(transport);
 				} });
@@ -560,7 +562,7 @@ function hotkey_handler(e) {
 		if (keycode == 16) return; // ignore lone shift
 		if (keycode == 17) return; // ignore lone ctrl
 
-		if (!shift_key) keychar = keychar.toLowerCase();
+		keychar = keychar.toLowerCase();
 
 		var hotkeys = getInitParam("hotkeys");
 
@@ -581,7 +583,11 @@ function hotkey_handler(e) {
 		Element.hide(cmdline);
 
 		var hotkey = keychar.search(/[a-zA-Z0-9]/) != -1 ? keychar : "(" + keycode + ")";
+
+		// ensure ^*char notation
+		if (shift_key) hotkey = "*" + hotkey;
 		if (ctrl_key) hotkey = "^" + hotkey;
+
 		hotkey = hotkey_prefix ? hotkey_prefix + " " + hotkey : hotkey;
 		hotkey_prefix = false;
 
@@ -657,10 +663,14 @@ function hotkey_handler(e) {
 			catchupRelativeToArticle(0);
 			return false;
 		case "article_scroll_down":
-			scrollArticle(50);
+			var ctr = $("content_insert") ? $("content_insert") : $("headlines-frame");
+
+			scrollArticle(ctr.offsetHeight/3);
 			return false;
 		case "article_scroll_up":
-			scrollArticle(-50);
+			var ctr = $("content_insert") ? $("content_insert") : $("headlines-frame");
+
+			scrollArticle(-ctr.offsetHeight/3);
 			return false;
 		case "close_article":
 			closeArticlePanel();
@@ -668,6 +678,8 @@ function hotkey_handler(e) {
 		case "email_article":
 			if (typeof emailArticle != "undefined") {
 				emailArticle();
+			} else if (typeof mailtoArticle != "undefined") {
+				mailtoArticle();
 			} else {
 				alert(__("Please enable mail plugin first."));
 			}
@@ -893,8 +905,6 @@ function handle_rpc_json(transport, scheduled_call) {
 			if (runtime_info)
 				parse_runtime_info(runtime_info);
 
-			hideOrShowFeeds(getInitParam("hide_read_feeds") == 1);
-
 			Element.hide(dijit.byId("net-alert").domNode);
 
 		} else {
diff --git a/js/viewfeed.js b/js/viewfeed.js
index 622a8109f..9a16befff 100644
--- a/js/viewfeed.js
+++ b/js/viewfeed.js
@@ -560,11 +560,11 @@ function moveToPost(mode, noscroll) {
 					var ctr = $("headlines-frame");
 
 					if (!noscroll && article && article.offsetTop < ctr.scrollTop) {
-						scrollArticle(-ctr.offsetHeight/2);
+						scrollArticle(-ctr.offsetHeight/3);
 					} else if (!noscroll && prev_article &&
 							prev_article.offsetTop < ctr.scrollTop) {
 						cdmExpandArticle(prev_id);
-						scrollArticle(-ctr.offsetHeight/2);
+						scrollArticle(-ctr.offsetHeight/3);
 					} else if (prev_id) {
 						cdmExpandArticle(prev_id);
 						cdmScrollToArticleId(prev_id, noscroll);
diff --git a/lib/htmLawed.php b/lib/htmLawed.php
deleted file mode 100644
index 3ef5a971e..000000000
--- a/lib/htmLawed.php
+++ /dev/null
@@ -1,723 +0,0 @@
-<?php
-
-/*
-htmLawed 1.1.14, 8 August 2012
-Copyright Santosh Patnaik
-Dual licensed with LGPL 3 and GPL 2+
-A PHP Labware internal utility; www.bioinformatics.org/phplabware/internal_utilities/htmLawed
-
-See htmLawed_README.txt/htm
-*/
-
-function htmLawed($t, $C=1, $S=array()){
-$C = is_array($C) ? $C : array();
-if(!empty($C['valid_xhtml'])){
- $C['elements'] = empty($C['elements']) ? '*-center-dir-font-isindex-menu-s-strike-u' : $C['elements'];
- $C['make_tag_strict'] = isset($C['make_tag_strict']) ? $C['make_tag_strict'] : 2;
- $C['xml:lang'] = isset($C['xml:lang']) ? $C['xml:lang'] : 2;
-}
-// config eles
-$e = array('a'=>1, 'abbr'=>1, 'acronym'=>1, 'address'=>1, 'applet'=>1, 'area'=>1, 'b'=>1, 'bdo'=>1, 'big'=>1, 'blockquote'=>1, 'br'=>1, 'button'=>1, 'caption'=>1, 'center'=>1, 'cite'=>1, 'code'=>1, 'col'=>1, 'colgroup'=>1, 'dd'=>1, 'del'=>1, 'dfn'=>1, 'dir'=>1, 'div'=>1, 'dl'=>1, 'dt'=>1, 'em'=>1, 'embed'=>1, 'fieldset'=>1, 'font'=>1, 'form'=>1, 'h1'=>1, 'h2'=>1, 'h3'=>1, 'h4'=>1, 'h5'=>1, 'h6'=>1, 'hr'=>1, 'i'=>1, 'iframe'=>1, 'img'=>1, 'input'=>1, 'ins'=>1, 'isindex'=>1, 'kbd'=>1, 'label'=>1, 'legend'=>1, 'li'=>1, 'map'=>1, 'menu'=>1, 'noscript'=>1, 'object'=>1, 'ol'=>1, 'optgroup'=>1, 'option'=>1, 'p'=>1, 'param'=>1, 'pre'=>1, 'q'=>1, 'rb'=>1, 'rbc'=>1, 'rp'=>1, 'rt'=>1, 'rtc'=>1, 'ruby'=>1, 's'=>1, 'samp'=>1, 'script'=>1, 'select'=>1, 'small'=>1, 'span'=>1, 'strike'=>1, 'strong'=>1, 'sub'=>1, 'sup'=>1, 'table'=>1, 'tbody'=>1, 'td'=>1, 'textarea'=>1, 'tfoot'=>1, 'th'=>1, 'thead'=>1, 'tr'=>1, 'tt'=>1, 'u'=>1, 'ul'=>1, 'var'=>1); // 86/deprecated+embed+ruby
-if(!empty($C['safe'])){
- unset($e['applet'], $e['embed'], $e['iframe'], $e['object'], $e['script']);
-}
-$x = !empty($C['elements']) ? str_replace(array("\n", "\r", "\t", ' '), '', $C['elements']) : '*';
-if($x == '-*'){$e = array();}
-elseif(strpos($x, '*') === false){$e = array_flip(explode(',', $x));}
-else{
- if(isset($x[1])){
-  preg_match_all('`(?:^|-|\+)[^\-+]+?(?=-|\+|$)`', $x, $m, PREG_SET_ORDER);
-  for($i=count($m); --$i>=0;){$m[$i] = $m[$i][0];}
-  foreach($m as $v){
-   if($v[0] == '+'){$e[substr($v, 1)] = 1;}
-   if($v[0] == '-' && isset($e[($v = substr($v, 1))]) && !in_array('+'. $v, $m)){unset($e[$v]);}
-  }
- }
-}
-$C['elements'] =& $e;
-// config attrs
-$x = !empty($C['deny_attribute']) ? str_replace(array("\n", "\r", "\t", ' '), '', $C['deny_attribute']) : '';
-$x = array_flip((isset($x[0]) && $x[0] == '*') ? explode('-', $x) : explode(',', $x. (!empty($C['safe']) ? ',on*' : '')));
-if(isset($x['on*'])){
- unset($x['on*']);
- $x += array('onblur'=>1, 'onchange'=>1, 'onclick'=>1, 'ondblclick'=>1, 'onfocus'=>1, 'onkeydown'=>1, 'onkeypress'=>1, 'onkeyup'=>1, 'onmousedown'=>1, 'onmousemove'=>1, 'onmouseout'=>1, 'onmouseover'=>1, 'onmouseup'=>1, 'onreset'=>1, 'onselect'=>1, 'onsubmit'=>1);
-}
-$C['deny_attribute'] = $x;
-// config URL
-$x = (isset($C['schemes'][2]) && strpos($C['schemes'], ':')) ? strtolower($C['schemes']) : 'href: aim, feed, file, ftp, gopher, http, https, irc, mailto, news, nntp, sftp, ssh, telnet; *:file, http, https';
-$C['schemes'] = array();
-foreach(explode(';', str_replace(array(' ', "\t", "\r", "\n"), '', $x)) as $v){
- $x = $x2 = null; list($x, $x2) = explode(':', $v, 2);
- if($x2){$C['schemes'][$x] = array_flip(explode(',', $x2));}
-}
-if(!isset($C['schemes']['*'])){$C['schemes']['*'] = array('file'=>1, 'http'=>1, 'https'=>1,);}
-if(!empty($C['safe']) && empty($C['schemes']['style'])){$C['schemes']['style'] = array('!'=>1);}
-$C['abs_url'] = isset($C['abs_url']) ? $C['abs_url'] : 0;
-if(!isset($C['base_url']) or !preg_match('`^[a-zA-Z\d.+\-]+://[^/]+/(.+?/)?$`', $C['base_url'])){
- $C['base_url'] = $C['abs_url'] = 0;
-}
-// config rest
-$C['and_mark'] = empty($C['and_mark']) ? 0 : 1;
-$C['anti_link_spam'] = (isset($C['anti_link_spam']) && is_array($C['anti_link_spam']) && count($C['anti_link_spam']) == 2 && (empty($C['anti_link_spam'][0]) or hl_regex($C['anti_link_spam'][0])) && (empty($C['anti_link_spam'][1]) or hl_regex($C['anti_link_spam'][1]))) ? $C['anti_link_spam'] : 0;
-$C['anti_mail_spam'] = isset($C['anti_mail_spam']) ? $C['anti_mail_spam'] : 0;
-$C['balance'] = isset($C['balance']) ? (bool)$C['balance'] : 1;
-$C['cdata'] = isset($C['cdata']) ? $C['cdata'] : (empty($C['safe']) ? 3 : 0);
-$C['clean_ms_char'] = empty($C['clean_ms_char']) ? 0 : $C['clean_ms_char'];
-$C['comment'] = isset($C['comment']) ? $C['comment'] : (empty($C['safe']) ? 3 : 0);
-$C['css_expression'] = empty($C['css_expression']) ? 0 : 1;
-$C['direct_list_nest'] = empty($C['direct_list_nest']) ? 0 : 1;
-$C['hexdec_entity'] = isset($C['hexdec_entity']) ? $C['hexdec_entity'] : 1;
-$C['hook'] = (!empty($C['hook']) && function_exists($C['hook'])) ? $C['hook'] : 0;
-$C['hook_tag'] = (!empty($C['hook_tag']) && function_exists($C['hook_tag'])) ? $C['hook_tag'] : 0;
-$C['keep_bad'] = isset($C['keep_bad']) ? $C['keep_bad'] : 6;
-$C['lc_std_val'] = isset($C['lc_std_val']) ? (bool)$C['lc_std_val'] : 1;
-$C['make_tag_strict'] = isset($C['make_tag_strict']) ? $C['make_tag_strict'] : 1;
-$C['named_entity'] = isset($C['named_entity']) ? (bool)$C['named_entity'] : 1;
-$C['no_deprecated_attr'] = isset($C['no_deprecated_attr']) ? $C['no_deprecated_attr'] : 1;
-$C['parent'] = isset($C['parent'][0]) ? strtolower($C['parent']) : 'body';
-$C['show_setting'] = !empty($C['show_setting']) ? $C['show_setting'] : 0;
-$C['style_pass'] = empty($C['style_pass']) ? 0 : 1;
-$C['tidy'] = empty($C['tidy']) ? 0 : $C['tidy'];
-$C['unique_ids'] = isset($C['unique_ids']) ? $C['unique_ids'] : 1;
-$C['xml:lang'] = isset($C['xml:lang']) ? $C['xml:lang'] : 0;
-
-if(isset($GLOBALS['C'])){$reC = $GLOBALS['C'];}
-$GLOBALS['C'] = $C;
-$S = is_array($S) ? $S : hl_spec($S);
-if(isset($GLOBALS['S'])){$reS = $GLOBALS['S'];}
-$GLOBALS['S'] = $S;
-
-$t = preg_replace('`[\x00-\x08\x0b-\x0c\x0e-\x1f]`', '', $t);
-if($C['clean_ms_char']){
- $x = array("\x7f"=>'', "\x80"=>'&#8364;', "\x81"=>'', "\x83"=>'&#402;', "\x85"=>'&#8230;', "\x86"=>'&#8224;', "\x87"=>'&#8225;', "\x88"=>'&#710;', "\x89"=>'&#8240;', "\x8a"=>'&#352;', "\x8b"=>'&#8249;', "\x8c"=>'&#338;', "\x8d"=>'', "\x8e"=>'&#381;', "\x8f"=>'', "\x90"=>'', "\x95"=>'&#8226;', "\x96"=>'&#8211;', "\x97"=>'&#8212;', "\x98"=>'&#732;', "\x99"=>'&#8482;', "\x9a"=>'&#353;', "\x9b"=>'&#8250;', "\x9c"=>'&#339;', "\x9d"=>'', "\x9e"=>'&#382;', "\x9f"=>'&#376;');
- $x = $x + ($C['clean_ms_char'] == 1 ? array("\x82"=>'&#8218;', "\x84"=>'&#8222;', "\x91"=>'&#8216;', "\x92"=>'&#8217;', "\x93"=>'&#8220;', "\x94"=>'&#8221;') : array("\x82"=>'\'', "\x84"=>'"', "\x91"=>'\'', "\x92"=>'\'', "\x93"=>'"', "\x94"=>'"'));
- $t = strtr($t, $x);
-}
-if($C['cdata'] or $C['comment']){$t = preg_replace_callback('`<!(?:(?:--.*?--)|(?:\[CDATA\[.*?\]\]))>`sm', 'hl_cmtcd', $t);}
-$t = preg_replace_callback('`&amp;([A-Za-z][A-Za-z0-9]{1,30}|#(?:[0-9]{1,8}|[Xx][0-9A-Fa-f]{1,7}));`', 'hl_ent', str_replace('&', '&amp;', $t));
-if($C['unique_ids'] && !isset($GLOBALS['hl_Ids'])){$GLOBALS['hl_Ids'] = array();}
-if($C['hook']){$t = $C['hook']($t, $C, $S);}
-if($C['show_setting'] && preg_match('`^[a-z][a-z0-9_]*$`i', $C['show_setting'])){
- $GLOBALS[$C['show_setting']] = array('config'=>$C, 'spec'=>$S, 'time'=>microtime());
-}
-// main
-$t = preg_replace_callback('`<(?:(?:\s|$)|(?:[^>]*(?:>|$)))|>`m', 'hl_tag', $t);
-$t = $C['balance'] ? hl_bal($t, $C['keep_bad'], $C['parent']) : $t;
-$t = (($C['cdata'] or $C['comment']) && strpos($t, "\x01") !== false) ? str_replace(array("\x01", "\x02", "\x03", "\x04", "\x05"), array('', '', '&', '<', '>'), $t) : $t;
-$t = $C['tidy'] ? hl_tidy($t, $C['tidy'], $C['parent']) : $t;
-unset($C, $e);
-if(isset($reC)){$GLOBALS['C'] = $reC;}
-if(isset($reS)){$GLOBALS['S'] = $reS;}
-return $t;
-// eof
-}
-
-function hl_attrval($t, $p){
-// check attr val against $S
-$o = 1; $l = strlen($t);
-foreach($p as $k=>$v){
- switch($k){
-  case 'maxlen':if($l > $v){$o = 0;}
-  break; case 'minlen': if($l < $v){$o = 0;}
-  break; case 'maxval': if((float)($t) > $v){$o = 0;}
-  break; case 'minval': if((float)($t) < $v){$o = 0;}
-  break; case 'match': if(!preg_match($v, $t)){$o = 0;}
-  break; case 'nomatch': if(preg_match($v, $t)){$o = 0;}
-  break; case 'oneof':
-   $m = 0;
-   foreach(explode('|', $v) as $n){if($t == $n){$m = 1; break;}}
-   $o = $m;
-  break; case 'noneof':
-   $m = 1;
-   foreach(explode('|', $v) as $n){if($t == $n){$m = 0; break;}}
-   $o = $m;
-  break; default:
-  break;
- }
- if(!$o){break;}
-}
-return ($o ? $t : (isset($p['default']) ? $p['default'] : 0));
-// eof
-}
-
-function hl_bal($t, $do=1, $in='div'){
-// balance tags
-// by content
-$cB = array('blockquote'=>1, 'form'=>1, 'map'=>1, 'noscript'=>1); // Block
-$cE = array('area'=>1, 'br'=>1, 'col'=>1, 'embed'=>1, 'hr'=>1, 'img'=>1, 'input'=>1, 'isindex'=>1, 'param'=>1); // Empty
-$cF = array('button'=>1, 'del'=>1, 'div'=>1, 'dd'=>1, 'fieldset'=>1, 'iframe'=>1, 'ins'=>1, 'li'=>1, 'noscript'=>1, 'object'=>1, 'td'=>1, 'th'=>1); // Flow; later context-wise dynamic move of ins & del to $cI
-$cI = array('a'=>1, 'abbr'=>1, 'acronym'=>1, 'address'=>1, 'b'=>1, 'bdo'=>1, 'big'=>1, 'caption'=>1, 'cite'=>1, 'code'=>1, 'dfn'=>1, 'dt'=>1, 'em'=>1, 'font'=>1, 'h1'=>1, 'h2'=>1, 'h3'=>1, 'h4'=>1, 'h5'=>1, 'h6'=>1, 'i'=>1, 'kbd'=>1, 'label'=>1, 'legend'=>1, 'p'=>1, 'pre'=>1, 'q'=>1, 'rb'=>1, 'rt'=>1, 's'=>1, 'samp'=>1, 'small'=>1, 'span'=>1, 'strike'=>1, 'strong'=>1, 'sub'=>1, 'sup'=>1, 'tt'=>1, 'u'=>1, 'var'=>1); // Inline
-$cN = array('a'=>array('a'=>1), 'button'=>array('a'=>1, 'button'=>1, 'fieldset'=>1, 'form'=>1, 'iframe'=>1, 'input'=>1, 'label'=>1, 'select'=>1, 'textarea'=>1), 'fieldset'=>array('fieldset'=>1), 'form'=>array('form'=>1), 'label'=>array('label'=>1), 'noscript'=>array('script'=>1), 'pre'=>array('big'=>1, 'font'=>1, 'img'=>1, 'object'=>1, 'script'=>1, 'small'=>1, 'sub'=>1, 'sup'=>1), 'rb'=>array('ruby'=>1), 'rt'=>array('ruby'=>1)); // Illegal
-$cN2 = array_keys($cN);
-$cR = array('blockquote'=>1, 'dir'=>1, 'dl'=>1, 'form'=>1, 'map'=>1, 'menu'=>1, 'noscript'=>1, 'ol'=>1, 'optgroup'=>1, 'rbc'=>1, 'rtc'=>1, 'ruby'=>1, 'select'=>1, 'table'=>1, 'tbody'=>1, 'tfoot'=>1, 'thead'=>1, 'tr'=>1, 'ul'=>1);
-$cS = array('colgroup'=>array('col'=>1), 'dir'=>array('li'=>1), 'dl'=>array('dd'=>1, 'dt'=>1), 'menu'=>array('li'=>1), 'ol'=>array('li'=>1), 'optgroup'=>array('option'=>1), 'option'=>array('#pcdata'=>1), 'rbc'=>array('rb'=>1), 'rp'=>array('#pcdata'=>1), 'rtc'=>array('rt'=>1), 'ruby'=>array('rb'=>1, 'rbc'=>1, 'rp'=>1, 'rt'=>1, 'rtc'=>1), 'select'=>array('optgroup'=>1, 'option'=>1), 'script'=>array('#pcdata'=>1), 'table'=>array('caption'=>1, 'col'=>1, 'colgroup'=>1, 'tfoot'=>1, 'tbody'=>1, 'tr'=>1, 'thead'=>1), 'tbody'=>array('tr'=>1), 'tfoot'=>array('tr'=>1), 'textarea'=>array('#pcdata'=>1), 'thead'=>array('tr'=>1), 'tr'=>array('td'=>1, 'th'=>1), 'ul'=>array('li'=>1)); // Specific - immediate parent-child
-if($GLOBALS['C']['direct_list_nest']){$cS['ol'] = $cS['ul'] += array('ol'=>1, 'ul'=>1);}
-$cO = array('address'=>array('p'=>1), 'applet'=>array('param'=>1), 'blockquote'=>array('script'=>1), 'fieldset'=>array('legend'=>1, '#pcdata'=>1), 'form'=>array('script'=>1), 'map'=>array('area'=>1), 'object'=>array('param'=>1, 'embed'=>1)); // Other
-$cT = array('colgroup'=>1, 'dd'=>1, 'dt'=>1, 'li'=>1, 'option'=>1, 'p'=>1, 'td'=>1, 'tfoot'=>1, 'th'=>1, 'thead'=>1, 'tr'=>1); // Omitable closing
-// block/inline type; ins & del both type; #pcdata: text
-$eB = array('address'=>1, 'blockquote'=>1, 'center'=>1, 'del'=>1, 'dir'=>1, 'dl'=>1, 'div'=>1, 'fieldset'=>1, 'form'=>1, 'ins'=>1, 'h1'=>1, 'h2'=>1, 'h3'=>1, 'h4'=>1, 'h5'=>1, 'h6'=>1, 'hr'=>1, 'isindex'=>1, 'menu'=>1, 'noscript'=>1, 'ol'=>1, 'p'=>1, 'pre'=>1, 'table'=>1, 'ul'=>1);
-$eI = array('#pcdata'=>1, 'a'=>1, 'abbr'=>1, 'acronym'=>1, 'applet'=>1, 'b'=>1, 'bdo'=>1, 'big'=>1, 'br'=>1, 'button'=>1, 'cite'=>1, 'code'=>1, 'del'=>1, 'dfn'=>1, 'em'=>1, 'embed'=>1, 'font'=>1, 'i'=>1, 'iframe'=>1, 'img'=>1, 'input'=>1, 'ins'=>1, 'kbd'=>1, 'label'=>1, 'map'=>1, 'object'=>1, 'q'=>1, 'ruby'=>1, 's'=>1, 'samp'=>1, 'select'=>1, 'script'=>1, 'small'=>1, 'span'=>1, 'strike'=>1, 'strong'=>1, 'sub'=>1, 'sup'=>1, 'textarea'=>1, 'tt'=>1, 'u'=>1, 'var'=>1);
-$eN = array('a'=>1, 'big'=>1, 'button'=>1, 'fieldset'=>1, 'font'=>1, 'form'=>1, 'iframe'=>1, 'img'=>1, 'input'=>1, 'label'=>1, 'object'=>1, 'ruby'=>1, 'script'=>1, 'select'=>1, 'small'=>1, 'sub'=>1, 'sup'=>1, 'textarea'=>1); // Exclude from specific ele; $cN values
-$eO = array('area'=>1, 'caption'=>1, 'col'=>1, 'colgroup'=>1, 'dd'=>1, 'dt'=>1, 'legend'=>1, 'li'=>1, 'optgroup'=>1, 'option'=>1, 'param'=>1, 'rb'=>1, 'rbc'=>1, 'rp'=>1, 'rt'=>1, 'rtc'=>1, 'script'=>1, 'tbody'=>1, 'td'=>1, 'tfoot'=>1, 'thead'=>1, 'th'=>1, 'tr'=>1); // Missing in $eB & $eI
-$eF = $eB + $eI;
-
-// $in sets allowed child
-$in = ((isset($eF[$in]) && $in != '#pcdata') or isset($eO[$in])) ? $in : 'div';
-if(isset($cE[$in])){
- return (!$do ? '' : str_replace(array('<', '>'), array('&lt;', '&gt;'), $t));
-}
-if(isset($cS[$in])){$inOk = $cS[$in];}
-elseif(isset($cI[$in])){$inOk = $eI; $cI['del'] = 1; $cI['ins'] = 1;}
-elseif(isset($cF[$in])){$inOk = $eF; unset($cI['del'], $cI['ins']);}
-elseif(isset($cB[$in])){$inOk = $eB; unset($cI['del'], $cI['ins']);}
-if(isset($cO[$in])){$inOk = $inOk + $cO[$in];}
-if(isset($cN[$in])){$inOk = array_diff_assoc($inOk, $cN[$in]);}
-
-$t = explode('<', $t);
-$ok = $q = array(); // $q seq list of open non-empty ele
-ob_start();
-
-for($i=-1, $ci=count($t); ++$i<$ci;){
- // allowed $ok in parent $p
- if($ql = count($q)){
-  $p = array_pop($q);
-  $q[] = $p;
-  if(isset($cS[$p])){$ok = $cS[$p];}
-  elseif(isset($cI[$p])){$ok = $eI; $cI['del'] = 1; $cI['ins'] = 1;}
-  elseif(isset($cF[$p])){$ok = $eF; unset($cI['del'], $cI['ins']);}
-  elseif(isset($cB[$p])){$ok = $eB; unset($cI['del'], $cI['ins']);}
-  if(isset($cO[$p])){$ok = $ok + $cO[$p];}
-  if(isset($cN[$p])){$ok = array_diff_assoc($ok, $cN[$p]);}
- }else{$ok = $inOk; unset($cI['del'], $cI['ins']);}
- // bad tags, & ele content
- if(isset($e) && ($do == 1 or (isset($ok['#pcdata']) && ($do == 3 or $do == 5)))){
-  echo '&lt;', $s, $e, $a, '&gt;';
- }
- if(isset($x[0])){
-  if(strlen(trim($x)) && (($ql && isset($cB[$p])) or (isset($cB[$in]) && !$ql))){
-   echo '<div>', $x, '</div>';
-  }
-  elseif($do < 3 or isset($ok['#pcdata'])){echo $x;}
-  elseif(strpos($x, "\x02\x04")){
-   foreach(preg_split('`(\x01\x02[^\x01\x02]+\x02\x01)`', $x, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY) as $v){
-    echo (substr($v, 0, 2) == "\x01\x02" ? $v : ($do > 4 ? preg_replace('`\S`', '', $v) : ''));
-   }
-  }elseif($do > 4){echo preg_replace('`\S`', '', $x);}
- }
- // get markup
- if(!preg_match('`^(/?)([a-z1-6]+)([^>]*)>(.*)`sm', $t[$i], $r)){$x = $t[$i]; continue;}
- $s = null; $e = null; $a = null; $x = null; list($all, $s, $e, $a, $x) = $r;
- // close tag
- if($s){
-  if(isset($cE[$e]) or !in_array($e, $q)){continue;} // Empty/unopen
-  if($p == $e){array_pop($q); echo '</', $e, '>'; unset($e); continue;} // Last open
-  $add = ''; // Nesting - close open tags that need to be
-  for($j=-1, $cj=count($q); ++$j<$cj;){  
-   if(($d = array_pop($q)) == $e){break;}
-   else{$add .= "</{$d}>";}
-  }
-  echo $add, '</', $e, '>'; unset($e); continue;
- }
- // open tag
- // $cB ele needs $eB ele as child
- if(isset($cB[$e]) && strlen(trim($x))){
-  $t[$i] = "{$e}{$a}>";
-  array_splice($t, $i+1, 0, 'div>'. $x); unset($e, $x); ++$ci; --$i; continue;
- }
- if((($ql && isset($cB[$p])) or (isset($cB[$in]) && !$ql)) && !isset($eB[$e]) && !isset($ok[$e])){
-  array_splice($t, $i, 0, 'div>'); unset($e, $x); ++$ci; --$i; continue;
- }
- // if no open ele, $in = parent; mostly immediate parent-child relation should hold
- if(!$ql or !isset($eN[$e]) or !array_intersect($q, $cN2)){
-  if(!isset($ok[$e])){
-   if($ql && isset($cT[$p])){echo '</', array_pop($q), '>'; unset($e, $x); --$i;}
-   continue;
-  }
-  if(!isset($cE[$e])){$q[] = $e;}
-  echo '<', $e, $a, '>'; unset($e); continue;
- }
- // specific parent-child
- if(isset($cS[$p][$e])){
-  if(!isset($cE[$e])){$q[] = $e;}
-  echo '<', $e, $a, '>'; unset($e); continue;
- }
- // nesting
- $add = '';
- $q2 = array();
- for($k=-1, $kc=count($q); ++$k<$kc;){
-  $d = $q[$k];
-  $ok2 = array();
-  if(isset($cS[$d])){$q2[] = $d; continue;}
-  $ok2 = isset($cI[$d]) ? $eI : $eF;
-  if(isset($cO[$d])){$ok2 = $ok2 + $cO[$d];}
-  if(isset($cN[$d])){$ok2 = array_diff_assoc($ok2, $cN[$d]);}
-  if(!isset($ok2[$e])){
-   if(!$k && !isset($inOk[$e])){continue 2;}
-   $add = "</{$d}>";
-   for(;++$k<$kc;){$add = "</{$q[$k]}>{$add}";}
-   break;
-  }
-  else{$q2[] = $d;}
- }
- $q = $q2;
- if(!isset($cE[$e])){$q[] = $e;}
- echo $add, '<', $e, $a, '>'; unset($e); continue;
-}
-
-// end
-if($ql = count($q)){
- $p = array_pop($q);
- $q[] = $p;
- if(isset($cS[$p])){$ok = $cS[$p];}
- elseif(isset($cI[$p])){$ok = $eI; $cI['del'] = 1; $cI['ins'] = 1;}
- elseif(isset($cF[$p])){$ok = $eF; unset($cI['del'], $cI['ins']);}
- elseif(isset($cB[$p])){$ok = $eB; unset($cI['del'], $cI['ins']);}
- if(isset($cO[$p])){$ok = $ok + $cO[$p];}
- if(isset($cN[$p])){$ok = array_diff_assoc($ok, $cN[$p]);}
-}else{$ok = $inOk; unset($cI['del'], $cI['ins']);}
-if(isset($e) && ($do == 1 or (isset($ok['#pcdata']) && ($do == 3 or $do == 5)))){
- echo '&lt;', $s, $e, $a, '&gt;';
-}
-if(isset($x[0])){
- if(strlen(trim($x)) && (($ql && isset($cB[$p])) or (isset($cB[$in]) && !$ql))){
-  echo '<div>', $x, '</div>';
- }
- elseif($do < 3 or isset($ok['#pcdata'])){echo $x;}
- elseif(strpos($x, "\x02\x04")){
-  foreach(preg_split('`(\x01\x02[^\x01\x02]+\x02\x01)`', $x, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY) as $v){
-   echo (substr($v, 0, 2) == "\x01\x02" ? $v : ($do > 4 ? preg_replace('`\S`', '', $v) : ''));
-  }
- }elseif($do > 4){echo preg_replace('`\S`', '', $x);}
-}
-while(!empty($q) && ($e = array_pop($q))){echo '</', $e, '>';}
-$o = ob_get_contents();
-ob_end_clean();
-return $o;
-// eof
-}
-
-function hl_cmtcd($t){
-// comment/CDATA sec handler
-$t = $t[0];
-global $C;
-if(!($v = $C[$n = $t[3] == '-' ? 'comment' : 'cdata'])){return $t;}
-if($v == 1){return '';}
-if($n == 'comment'){
- if(substr(($t = preg_replace('`--+`', '-', substr($t, 4, -3))), -1) != ' '){$t .= ' ';}
-}
-else{$t = substr($t, 1, -1);}
-$t = $v == 2 ? str_replace(array('&', '<', '>'), array('&amp;', '&lt;', '&gt;'), $t) : $t;
-return str_replace(array('&', '<', '>'), array("\x03", "\x04", "\x05"), ($n == 'comment' ? "\x01\x02\x04!--$t--\x05\x02\x01" : "\x01\x01\x04$t\x05\x01\x01"));
-// eof
-}
-
-function hl_ent($t){
-// entitity handler
-global $C;
-$t = $t[1];
-static $U = array('quot'=>1,'amp'=>1,'lt'=>1,'gt'=>1);
-static $N = array('fnof'=>'402', 'Alpha'=>'913', 'Beta'=>'914', 'Gamma'=>'915', 'Delta'=>'916', 'Epsilon'=>'917', 'Zeta'=>'918', 'Eta'=>'919', 'Theta'=>'920', 'Iota'=>'921', 'Kappa'=>'922', 'Lambda'=>'923', 'Mu'=>'924', 'Nu'=>'925', 'Xi'=>'926', 'Omicron'=>'927', 'Pi'=>'928', 'Rho'=>'929', 'Sigma'=>'931', 'Tau'=>'932', 'Upsilon'=>'933', 'Phi'=>'934', 'Chi'=>'935', 'Psi'=>'936', 'Omega'=>'937', 'alpha'=>'945', 'beta'=>'946', 'gamma'=>'947', 'delta'=>'948', 'epsilon'=>'949', 'zeta'=>'950', 'eta'=>'951', 'theta'=>'952', 'iota'=>'953', 'kappa'=>'954', 'lambda'=>'955', 'mu'=>'956', 'nu'=>'957', 'xi'=>'958', 'omicron'=>'959', 'pi'=>'960', 'rho'=>'961', 'sigmaf'=>'962', 'sigma'=>'963', 'tau'=>'964', 'upsilon'=>'965', 'phi'=>'966', 'chi'=>'967', 'psi'=>'968', 'omega'=>'969', 'thetasym'=>'977', 'upsih'=>'978', 'piv'=>'982', 'bull'=>'8226', 'hellip'=>'8230', 'prime'=>'8242', 'Prime'=>'8243', 'oline'=>'8254', 'frasl'=>'8260', 'weierp'=>'8472', 'image'=>'8465', 'real'=>'8476', 'trade'=>'8482', 'alefsym'=>'8501', 'larr'=>'8592', 'uarr'=>'8593', 'rarr'=>'8594', 'darr'=>'8595', 'harr'=>'8596', 'crarr'=>'8629', 'lArr'=>'8656', 'uArr'=>'8657', 'rArr'=>'8658', 'dArr'=>'8659', 'hArr'=>'8660', 'forall'=>'8704', 'part'=>'8706', 'exist'=>'8707', 'empty'=>'8709', 'nabla'=>'8711', 'isin'=>'8712', 'notin'=>'8713', 'ni'=>'8715', 'prod'=>'8719', 'sum'=>'8721', 'minus'=>'8722', 'lowast'=>'8727', 'radic'=>'8730', 'prop'=>'8733', 'infin'=>'8734', 'ang'=>'8736', 'and'=>'8743', 'or'=>'8744', 'cap'=>'8745', 'cup'=>'8746', 'int'=>'8747', 'there4'=>'8756', 'sim'=>'8764', 'cong'=>'8773', 'asymp'=>'8776', 'ne'=>'8800', 'equiv'=>'8801', 'le'=>'8804', 'ge'=>'8805', 'sub'=>'8834', 'sup'=>'8835', 'nsub'=>'8836', 'sube'=>'8838', 'supe'=>'8839', 'oplus'=>'8853', 'otimes'=>'8855', 'perp'=>'8869', 'sdot'=>'8901', 'lceil'=>'8968', 'rceil'=>'8969', 'lfloor'=>'8970', 'rfloor'=>'8971', 'lang'=>'9001', 'rang'=>'9002', 'loz'=>'9674', 'spades'=>'9824', 'clubs'=>'9827', 'hearts'=>'9829', 'diams'=>'9830', 'apos'=>'39',  'OElig'=>'338', 'oelig'=>'339', 'Scaron'=>'352', 'scaron'=>'353', 'Yuml'=>'376', 'circ'=>'710', 'tilde'=>'732', 'ensp'=>'8194', 'emsp'=>'8195', 'thinsp'=>'8201', 'zwnj'=>'8204', 'zwj'=>'8205', 'lrm'=>'8206', 'rlm'=>'8207', 'ndash'=>'8211', 'mdash'=>'8212', 'lsquo'=>'8216', 'rsquo'=>'8217', 'sbquo'=>'8218', 'ldquo'=>'8220', 'rdquo'=>'8221', 'bdquo'=>'8222', 'dagger'=>'8224', 'Dagger'=>'8225', 'permil'=>'8240', 'lsaquo'=>'8249', 'rsaquo'=>'8250', 'euro'=>'8364', 'nbsp'=>'160', 'iexcl'=>'161', 'cent'=>'162', 'pound'=>'163', 'curren'=>'164', 'yen'=>'165', 'brvbar'=>'166', 'sect'=>'167', 'uml'=>'168', 'copy'=>'169', 'ordf'=>'170', 'laquo'=>'171', 'not'=>'172', 'shy'=>'173', 'reg'=>'174', 'macr'=>'175', 'deg'=>'176', 'plusmn'=>'177', 'sup2'=>'178', 'sup3'=>'179', 'acute'=>'180', 'micro'=>'181', 'para'=>'182', 'middot'=>'183', 'cedil'=>'184', 'sup1'=>'185', 'ordm'=>'186', 'raquo'=>'187', 'frac14'=>'188', 'frac12'=>'189', 'frac34'=>'190', 'iquest'=>'191', 'Agrave'=>'192', 'Aacute'=>'193', 'Acirc'=>'194', 'Atilde'=>'195', 'Auml'=>'196', 'Aring'=>'197', 'AElig'=>'198', 'Ccedil'=>'199', 'Egrave'=>'200', 'Eacute'=>'201', 'Ecirc'=>'202', 'Euml'=>'203', 'Igrave'=>'204', 'Iacute'=>'205', 'Icirc'=>'206', 'Iuml'=>'207', 'ETH'=>'208', 'Ntilde'=>'209', 'Ograve'=>'210', 'Oacute'=>'211', 'Ocirc'=>'212', 'Otilde'=>'213', 'Ouml'=>'214', 'times'=>'215', 'Oslash'=>'216', 'Ugrave'=>'217', 'Uacute'=>'218', 'Ucirc'=>'219', 'Uuml'=>'220', 'Yacute'=>'221', 'THORN'=>'222', 'szlig'=>'223', 'agrave'=>'224', 'aacute'=>'225', 'acirc'=>'226', 'atilde'=>'227', 'auml'=>'228', 'aring'=>'229', 'aelig'=>'230', 'ccedil'=>'231', 'egrave'=>'232', 'eacute'=>'233', 'ecirc'=>'234', 'euml'=>'235', 'igrave'=>'236', 'iacute'=>'237', 'icirc'=>'238', 'iuml'=>'239', 'eth'=>'240', 'ntilde'=>'241', 'ograve'=>'242', 'oacute'=>'243', 'ocirc'=>'244', 'otilde'=>'245', 'ouml'=>'246', 'divide'=>'247', 'oslash'=>'248', 'ugrave'=>'249', 'uacute'=>'250', 'ucirc'=>'251', 'uuml'=>'252', 'yacute'=>'253', 'thorn'=>'254', 'yuml'=>'255');
-if($t[0] != '#'){
- return ($C['and_mark'] ? "\x06" : '&'). (isset($U[$t]) ? $t : (isset($N[$t]) ? (!$C['named_entity'] ? '#'. ($C['hexdec_entity'] > 1 ? 'x'. dechex($N[$t]) : $N[$t]) : $t) : 'amp;'. $t)). ';';
-}
-if(($n = ctype_digit($t = substr($t, 1)) ? intval($t) : hexdec(substr($t, 1))) < 9 or ($n > 13 && $n < 32) or $n == 11 or $n == 12 or ($n > 126 && $n < 160 && $n != 133) or ($n > 55295 && ($n < 57344 or ($n > 64975 && $n < 64992) or $n == 65534 or $n == 65535 or $n > 1114111))){
- return ($C['and_mark'] ? "\x06" : '&'). "amp;#{$t};";
-}
-return ($C['and_mark'] ? "\x06" : '&'). '#'. (((ctype_digit($t) && $C['hexdec_entity'] < 2) or !$C['hexdec_entity']) ? $n : 'x'. dechex($n)). ';';
-// eof
-}
-
-function hl_prot($p, $c=null){
-// check URL scheme
-global $C;
-$b = $a = '';
-if($c == null){$c = 'style'; $b = $p[1]; $a = $p[3]; $p = trim($p[2]);}
-$c = isset($C['schemes'][$c]) ? $C['schemes'][$c] : $C['schemes']['*'];
-static $d = 'denied:';
-if(isset($c['!']) && substr($p, 0, 7) != $d){$p = "$d$p";}
-if(isset($c['*']) or !strcspn($p, '#?;') or (substr($p, 0, 7) == $d)){return "{$b}{$p}{$a}";} // All ok, frag, query, param
-if(preg_match('`^([a-z\d\-+.&#; ]+?)(:|&#(58|x3a);|%3a|\\\\0{0,4}3a).`i', $p, $m) && !isset($c[strtolower($m[1])])){ // Denied prot
- return "{$b}{$d}{$p}{$a}";
-}
-if($C['abs_url']){
- if($C['abs_url'] == -1 && strpos($p, $C['base_url']) === 0){ // Make url rel
-  $p = substr($p, strlen($C['base_url']));
- }elseif(empty($m[1])){ // Make URL abs
-  if(substr($p, 0, 2) == '//'){$p = substr($C['base_url'], 0, strpos($C['base_url'], ':')+1). $p;}
-  elseif($p[0] == '/'){$p = preg_replace('`(^.+?://[^/]+)(.*)`', '$1', $C['base_url']). $p;}
-  elseif(strcspn($p, './')){$p = $C['base_url']. $p;}
-  else{
-   preg_match('`^([a-zA-Z\d\-+.]+://[^/]+)(.*)`', $C['base_url'], $m);
-   $p = preg_replace('`(?<=/)\./`', '', $m[2]. $p);
-   while(preg_match('`(?<=/)([^/]{3,}|[^/.]+?|\.[^/.]|[^/.]\.)/\.\./`', $p)){
-    $p = preg_replace('`(?<=/)([^/]{3,}|[^/.]+?|\.[^/.]|[^/.]\.)/\.\./`', '', $p);
-   }
-   $p = $m[1]. $p;
-  }
- }
-}
-return "{$b}{$p}{$a}";
-// eof
-}
-
-function hl_regex($p){
-// ?regex
-if(empty($p)){return 0;}
-if($t = ini_get('track_errors')){$o = isset($php_errormsg) ? $php_errormsg : null;}
-else{ini_set('track_errors', 1);}
-unset($php_errormsg);
-if(($d = ini_get('display_errors'))){ini_set('display_errors', 0);}
-preg_match($p, '');
-if($d){ini_set('display_errors', 1);}
-$r = isset($php_errormsg) ? 0 : 1;
-if($t){$php_errormsg = isset($o) ? $o : null;}
-else{ini_set('track_errors', 0);}
-return $r;
-// eof
-}
-
-function hl_spec($t){
-// final $spec
-$s = array();
-$t = str_replace(array("\t", "\r", "\n", ' '), '', preg_replace('/"(?>(`.|[^"])*)"/sme', 'substr(str_replace(array(";", "|", "~", " ", ",", "/", "(", ")", \'`"\'), array("\x01", "\x02", "\x03", "\x04", "\x05", "\x06", "\x07", "\x08", "\""), "$0"), 1, -1)', trim($t))); 
-for($i = count(($t = explode(';', $t))); --$i>=0;){
- $w = $t[$i];
- if(empty($w) or ($e = strpos($w, '=')) === false or !strlen(($a =  substr($w, $e+1)))){continue;}
- $y = $n = array();
- foreach(explode(',', $a) as $v){
-  if(!preg_match('`^([a-z:\-\*]+)(?:\((.*?)\))?`i', $v, $m)){continue;}
-  if(($x = strtolower($m[1])) == '-*'){$n['*'] = 1; continue;}
-  if($x[0] == '-'){$n[substr($x, 1)] = 1; continue;}
-  if(!isset($m[2])){$y[$x] = 1; continue;}
-  foreach(explode('/', $m[2]) as $m){
-   if(empty($m) or ($p = strpos($m, '=')) == 0 or $p < 5){$y[$x] = 1; continue;}
-   $y[$x][strtolower(substr($m, 0, $p))] = str_replace(array("\x01", "\x02", "\x03", "\x04", "\x05", "\x06", "\x07", "\x08"), array(";", "|", "~", " ", ",", "/", "(", ")"), substr($m, $p+1));
-  }
-  if(isset($y[$x]['match']) && !hl_regex($y[$x]['match'])){unset($y[$x]['match']);}
-  if(isset($y[$x]['nomatch']) && !hl_regex($y[$x]['nomatch'])){unset($y[$x]['nomatch']);}
- }
- if(!count($y) && !count($n)){continue;}
- foreach(explode(',', substr($w, 0, $e)) as $v){
-  if(!strlen(($v = strtolower($v)))){continue;}
-  if(count($y)){$s[$v] = $y;}
-  if(count($n)){$s[$v]['n'] = $n;}
- }
-}
-return $s;
-// eof
-}
-
-function hl_tag($t){
-// tag/attribute handler
-global $C;
-$t = $t[0];
-// invalid < >
-if($t == '< '){return '&lt; ';}
-if($t == '>'){return '&gt;';}
-if(!preg_match('`^<(/?)([a-zA-Z][a-zA-Z1-6]*)([^>]*?)\s?>$`m', $t, $m)){
- return str_replace(array('<', '>'), array('&lt;', '&gt;'), $t);
-}elseif(!isset($C['elements'][($e = strtolower($m[2]))])){
- return (($C['keep_bad']%2) ? str_replace(array('<', '>'), array('&lt;', '&gt;'), $t) : '');
-}
-// attr string
-$a = str_replace(array("\n", "\r", "\t"), ' ', trim($m[3]));
-// tag transform
-static $eD = array('applet'=>1, 'center'=>1, 'dir'=>1, 'embed'=>1, 'font'=>1, 'isindex'=>1, 'menu'=>1, 's'=>1, 'strike'=>1, 'u'=>1); // Deprecated
-if($C['make_tag_strict'] && isset($eD[$e])){
- $trt = hl_tag2($e, $a, $C['make_tag_strict']);
- if(!$e){return (($C['keep_bad']%2) ? str_replace(array('<', '>'), array('&lt;', '&gt;'), $t) : '');}
-}
-// close tag
-static $eE = array('area'=>1, 'br'=>1, 'col'=>1, 'embed'=>1, 'hr'=>1, 'img'=>1, 'input'=>1, 'isindex'=>1, 'param'=>1); // Empty ele
-if(!empty($m[1])){
- return (!isset($eE[$e]) ? (empty($C['hook_tag']) ? "</$e>" : $C['hook_tag']($e)) : (($C['keep_bad'])%2 ? str_replace(array('<', '>'), array('&lt;', '&gt;'), $t) : ''));
-}
-
-// open tag & attr
-static $aN = array('abbr'=>array('td'=>1, 'th'=>1), 'accept-charset'=>array('form'=>1), 'accept'=>array('form'=>1, 'input'=>1), 'accesskey'=>array('a'=>1, 'area'=>1, 'button'=>1, 'input'=>1, 'label'=>1, 'legend'=>1, 'textarea'=>1), 'action'=>array('form'=>1), 'align'=>array('caption'=>1, 'embed'=>1, 'applet'=>1, 'iframe'=>1, 'img'=>1, 'input'=>1, 'object'=>1, 'legend'=>1, 'table'=>1, 'hr'=>1, 'div'=>1, 'h1'=>1, 'h2'=>1, 'h3'=>1, 'h4'=>1, 'h5'=>1, 'h6'=>1, 'p'=>1, 'col'=>1, 'colgroup'=>1, 'tbody'=>1, 'td'=>1, 'tfoot'=>1, 'th'=>1, 'thead'=>1, 'tr'=>1), 'alt'=>array('applet'=>1, 'area'=>1, 'img'=>1, 'input'=>1), 'archive'=>array('applet'=>1, 'object'=>1), 'axis'=>array('td'=>1, 'th'=>1), 'bgcolor'=>array('embed'=>1, 'table'=>1, 'tr'=>1, 'td'=>1, 'th'=>1), 'border'=>array('table'=>1, 'img'=>1, 'object'=>1), 'bordercolor'=>array('table'=>1, 'td'=>1, 'tr'=>1), 'cellpadding'=>array('table'=>1), 'cellspacing'=>array('table'=>1), 'char'=>array('col'=>1, 'colgroup'=>1, 'tbody'=>1, 'td'=>1, 'tfoot'=>1, 'th'=>1, 'thead'=>1, 'tr'=>1), 'charoff'=>array('col'=>1, 'colgroup'=>1, 'tbody'=>1, 'td'=>1, 'tfoot'=>1, 'th'=>1, 'thead'=>1, 'tr'=>1), 'charset'=>array('a'=>1, 'script'=>1), 'checked'=>array('input'=>1), 'cite'=>array('blockquote'=>1, 'q'=>1, 'del'=>1, 'ins'=>1), 'classid'=>array('object'=>1), 'clear'=>array('br'=>1), 'code'=>array('applet'=>1), 'codebase'=>array('object'=>1, 'applet'=>1), 'codetype'=>array('object'=>1), 'color'=>array('font'=>1), 'cols'=>array('textarea'=>1), 'colspan'=>array('td'=>1, 'th'=>1), 'compact'=>array('dir'=>1, 'dl'=>1, 'menu'=>1, 'ol'=>1, 'ul'=>1), 'coords'=>array('area'=>1, 'a'=>1), 'data'=>array('object'=>1), 'datetime'=>array('del'=>1, 'ins'=>1), 'declare'=>array('object'=>1), 'defer'=>array('script'=>1), 'dir'=>array('bdo'=>1), 'disabled'=>array('button'=>1, 'input'=>1, 'optgroup'=>1, 'option'=>1, 'select'=>1, 'textarea'=>1), 'enctype'=>array('form'=>1), 'face'=>array('font'=>1), 'flashvars'=>array('embed'=>1), 'for'=>array('label'=>1), 'frame'=>array('table'=>1), 'frameborder'=>array('iframe'=>1), 'headers'=>array('td'=>1, 'th'=>1), 'height'=>array('embed'=>1, 'iframe'=>1, 'td'=>1, 'th'=>1, 'img'=>1, 'object'=>1, 'applet'=>1), 'href'=>array('a'=>1, 'area'=>1), 'hreflang'=>array('a'=>1), 'hspace'=>array('applet'=>1, 'img'=>1, 'object'=>1), 'ismap'=>array('img'=>1, 'input'=>1), 'label'=>array('option'=>1, 'optgroup'=>1), 'language'=>array('script'=>1), 'longdesc'=>array('img'=>1, 'iframe'=>1), 'marginheight'=>array('iframe'=>1), 'marginwidth'=>array('iframe'=>1), 'maxlength'=>array('input'=>1), 'method'=>array('form'=>1), 'model'=>array('embed'=>1), 'multiple'=>array('select'=>1), 'name'=>array('button'=>1, 'embed'=>1, 'textarea'=>1, 'applet'=>1, 'select'=>1, 'form'=>1, 'iframe'=>1, 'img'=>1, 'a'=>1, 'input'=>1, 'object'=>1, 'map'=>1, 'param'=>1), 'nohref'=>array('area'=>1), 'noshade'=>array('hr'=>1), 'nowrap'=>array('td'=>1, 'th'=>1), 'object'=>array('applet'=>1), 'onblur'=>array('a'=>1, 'area'=>1, 'button'=>1, 'input'=>1, 'label'=>1, 'select'=>1, 'textarea'=>1), 'onchange'=>array('input'=>1, 'select'=>1, 'textarea'=>1), 'onfocus'=>array('a'=>1, 'area'=>1, 'button'=>1, 'input'=>1, 'label'=>1, 'select'=>1, 'textarea'=>1), 'onreset'=>array('form'=>1), 'onselect'=>array('input'=>1, 'textarea'=>1), 'onsubmit'=>array('form'=>1), 'pluginspage'=>array('embed'=>1), 'pluginurl'=>array('embed'=>1), 'prompt'=>array('isindex'=>1), 'readonly'=>array('textarea'=>1, 'input'=>1), 'rel'=>array('a'=>1), 'rev'=>array('a'=>1), 'rows'=>array('textarea'=>1), 'rowspan'=>array('td'=>1, 'th'=>1), 'rules'=>array('table'=>1), 'scope'=>array('td'=>1, 'th'=>1), 'scrolling'=>array('iframe'=>1), 'selected'=>array('option'=>1), 'shape'=>array('area'=>1, 'a'=>1), 'size'=>array('hr'=>1, 'font'=>1, 'input'=>1, 'select'=>1), 'span'=>array('col'=>1, 'colgroup'=>1), 'src'=>array('embed'=>1, 'script'=>1, 'input'=>1, 'iframe'=>1, 'img'=>1), 'standby'=>array('object'=>1), 'start'=>array('ol'=>1), 'summary'=>array('table'=>1), 'tabindex'=>array('a'=>1, 'area'=>1, 'button'=>1, 'input'=>1, 'object'=>1, 'select'=>1, 'textarea'=>1), 'target'=>array('a'=>1, 'area'=>1, 'form'=>1), 'type'=>array('a'=>1, 'embed'=>1, 'object'=>1, 'param'=>1, 'script'=>1, 'input'=>1, 'li'=>1, 'ol'=>1, 'ul'=>1, 'button'=>1), 'usemap'=>array('img'=>1, 'input'=>1, 'object'=>1), 'valign'=>array('col'=>1, 'colgroup'=>1, 'tbody'=>1, 'td'=>1, 'tfoot'=>1, 'th'=>1, 'thead'=>1, 'tr'=>1), 'value'=>array('input'=>1, 'option'=>1, 'param'=>1, 'button'=>1, 'li'=>1), 'valuetype'=>array('param'=>1), 'vspace'=>array('applet'=>1, 'img'=>1, 'object'=>1), 'width'=>array('embed'=>1, 'hr'=>1, 'iframe'=>1, 'img'=>1, 'object'=>1, 'table'=>1, 'td'=>1, 'th'=>1, 'applet'=>1, 'col'=>1, 'colgroup'=>1, 'pre'=>1), 'wmode'=>array('embed'=>1), 'xml:space'=>array('pre'=>1, 'script'=>1, 'style'=>1)); // Ele-specific
-static $aNE = array('checked'=>1, 'compact'=>1, 'declare'=>1, 'defer'=>1, 'disabled'=>1, 'ismap'=>1, 'multiple'=>1, 'nohref'=>1, 'noresize'=>1, 'noshade'=>1, 'nowrap'=>1, 'readonly'=>1, 'selected'=>1); // Empty
-static $aNP = array('action'=>1, 'cite'=>1, 'classid'=>1, 'codebase'=>1, 'data'=>1, 'href'=>1, 'longdesc'=>1, 'model'=>1, 'pluginspage'=>1, 'pluginurl'=>1, 'usemap'=>1); // Need scheme check; excludes style, on* & src
-static $aNU = array('class'=>array('param'=>1, 'script'=>1), 'dir'=>array('applet'=>1, 'bdo'=>1, 'br'=>1, 'iframe'=>1, 'param'=>1, 'script'=>1), 'id'=>array('script'=>1), 'lang'=>array('applet'=>1, 'br'=>1, 'iframe'=>1, 'param'=>1, 'script'=>1), 'xml:lang'=>array('applet'=>1, 'br'=>1, 'iframe'=>1, 'param'=>1, 'script'=>1), 'onclick'=>array('applet'=>1, 'bdo'=>1, 'br'=>1, 'font'=>1, 'iframe'=>1, 'isindex'=>1, 'param'=>1, 'script'=>1), 'ondblclick'=>array('applet'=>1, 'bdo'=>1, 'br'=>1, 'font'=>1, 'iframe'=>1, 'isindex'=>1, 'param'=>1, 'script'=>1), 'onkeydown'=>array('applet'=>1, 'bdo'=>1, 'br'=>1, 'font'=>1, 'iframe'=>1, 'isindex'=>1, 'param'=>1, 'script'=>1), 'onkeypress'=>array('applet'=>1, 'bdo'=>1, 'br'=>1, 'font'=>1, 'iframe'=>1, 'isindex'=>1, 'param'=>1, 'script'=>1), 'onkeyup'=>array('applet'=>1, 'bdo'=>1, 'br'=>1, 'font'=>1, 'iframe'=>1, 'isindex'=>1, 'param'=>1, 'script'=>1), 'onmousedown'=>array('applet'=>1, 'bdo'=>1, 'br'=>1, 'font'=>1, 'iframe'=>1, 'isindex'=>1, 'param'=>1, 'script'=>1), 'onmousemove'=>array('applet'=>1, 'bdo'=>1, 'br'=>1, 'font'=>1, 'iframe'=>1, 'isindex'=>1, 'param'=>1, 'script'=>1), 'onmouseout'=>array('applet'=>1, 'bdo'=>1, 'br'=>1, 'font'=>1, 'iframe'=>1, 'isindex'=>1, 'param'=>1, 'script'=>1), 'onmouseover'=>array('applet'=>1, 'bdo'=>1, 'br'=>1, 'font'=>1, 'iframe'=>1, 'isindex'=>1, 'param'=>1, 'script'=>1), 'onmouseup'=>array('applet'=>1, 'bdo'=>1, 'br'=>1, 'font'=>1, 'iframe'=>1, 'isindex'=>1, 'param'=>1, 'script'=>1), 'style'=>array('param'=>1, 'script'=>1), 'title'=>array('param'=>1, 'script'=>1)); // Univ & exceptions
-
-if($C['lc_std_val']){
- // predef attr vals for $eAL & $aNE ele
- static $aNL = array('all'=>1, 'baseline'=>1, 'bottom'=>1, 'button'=>1, 'center'=>1, 'char'=>1, 'checkbox'=>1, 'circle'=>1, 'col'=>1, 'colgroup'=>1, 'cols'=>1, 'data'=>1, 'default'=>1, 'file'=>1, 'get'=>1, 'groups'=>1, 'hidden'=>1, 'image'=>1, 'justify'=>1, 'left'=>1, 'ltr'=>1, 'middle'=>1, 'none'=>1, 'object'=>1, 'password'=>1, 'poly'=>1, 'post'=>1, 'preserve'=>1, 'radio'=>1, 'rect'=>1, 'ref'=>1, 'reset'=>1, 'right'=>1, 'row'=>1, 'rowgroup'=>1, 'rows'=>1, 'rtl'=>1, 'submit'=>1, 'text'=>1, 'top'=>1);
- static $eAL = array('a'=>1, 'area'=>1, 'bdo'=>1, 'button'=>1, 'col'=>1, 'form'=>1, 'img'=>1, 'input'=>1, 'object'=>1, 'optgroup'=>1, 'option'=>1, 'param'=>1, 'script'=>1, 'select'=>1, 'table'=>1, 'td'=>1, 'tfoot'=>1, 'th'=>1, 'thead'=>1, 'tr'=>1, 'xml:space'=>1);
- $lcase = isset($eAL[$e]) ? 1 : 0;
-}
-
-$depTr = 0;
-if($C['no_deprecated_attr']){
- // dep attr:applicable ele
- static $aND = array('align'=>array('caption'=>1, 'div'=>1, 'h1'=>1, 'h2'=>1, 'h3'=>1, 'h4'=>1, 'h5'=>1, 'h6'=>1, 'hr'=>1, 'img'=>1, 'input'=>1, 'legend'=>1, 'object'=>1, 'p'=>1, 'table'=>1), 'bgcolor'=>array('table'=>1, 'td'=>1, 'th'=>1, 'tr'=>1), 'border'=>array('img'=>1, 'object'=>1), 'bordercolor'=>array('table'=>1, 'td'=>1, 'tr'=>1), 'clear'=>array('br'=>1), 'compact'=>array('dl'=>1, 'ol'=>1, 'ul'=>1), 'height'=>array('td'=>1, 'th'=>1), 'hspace'=>array('img'=>1, 'object'=>1), 'language'=>array('script'=>1), 'name'=>array('a'=>1, 'form'=>1, 'iframe'=>1, 'img'=>1, 'map'=>1), 'noshade'=>array('hr'=>1), 'nowrap'=>array('td'=>1, 'th'=>1), 'size'=>array('hr'=>1), 'start'=>array('ol'=>1), 'type'=>array('li'=>1, 'ol'=>1, 'ul'=>1), 'value'=>array('li'=>1), 'vspace'=>array('img'=>1, 'object'=>1), 'width'=>array('hr'=>1, 'pre'=>1, 'td'=>1, 'th'=>1));
- static $eAD = array('a'=>1, 'br'=>1, 'caption'=>1, 'div'=>1, 'dl'=>1, 'form'=>1, 'h1'=>1, 'h2'=>1, 'h3'=>1, 'h4'=>1, 'h5'=>1, 'h6'=>1, 'hr'=>1, 'iframe'=>1, 'img'=>1, 'input'=>1, 'legend'=>1, 'li'=>1, 'map'=>1, 'object'=>1, 'ol'=>1, 'p'=>1, 'pre'=>1, 'script'=>1, 'table'=>1, 'td'=>1, 'th'=>1, 'tr'=>1, 'ul'=>1);
- $depTr = isset($eAD[$e]) ? 1 : 0;
-}
-
-// attr name-vals
-if(strpos($a, "\x01") !== false){$a = preg_replace('`\x01[^\x01]*\x01`', '', $a);} // No comment/CDATA sec
-$mode = 0; $a = trim($a, ' /'); $aA = array();
-while(strlen($a)){
- $w = 0;
- switch($mode){
-  case 0: // Name
-   if(preg_match('`^[a-zA-Z][\-a-zA-Z:]+`', $a, $m)){
-    $nm = strtolower($m[0]);
-    $w = $mode = 1; $a = ltrim(substr_replace($a, '', 0, strlen($m[0])));
-   }
-  break; case 1:
-   if($a[0] == '='){ // =
-    $w = 1; $mode = 2; $a = ltrim($a, '= ');
-   }else{ // No val
-    $w = 1; $mode = 0; $a = ltrim($a);
-    $aA[$nm] = '';
-   }
-  break; case 2: // Val
-   if(preg_match('`^((?:"[^"]*")|(?:\'[^\']*\')|(?:\s*[^\s"\']+))(.*)`', $a, $m)){
-    $a = ltrim($m[2]); $m = $m[1]; $w = 1; $mode = 0;
-    $aA[$nm] = trim(($m[0] == '"' or $m[0] == '\'') ? substr($m, 1, -1) : $m);
-   }
-  break;
- }
- if($w == 0){ // Parse errs, deal with space, " & '
-  $a = preg_replace('`^(?:"[^"]*("|$)|\'[^\']*(\'|$)|\S)*\s*`', '', $a);
-  $mode = 0;
- }
-}
-if($mode == 1){$aA[$nm] = '';}
-
-// clean attrs
-global $S;
-$rl = isset($S[$e]) ? $S[$e] : array();
-$a = array(); $nfr = 0;
-foreach($aA as $k=>$v){
-  if(((isset($C['deny_attribute']['*']) ? isset($C['deny_attribute'][$k]) : !isset($C['deny_attribute'][$k])) && (isset($aN[$k][$e]) or (isset($aNU[$k]) && !isset($aNU[$k][$e]))) && !isset($rl['n'][$k]) && !isset($rl['n']['*'])) or isset($rl[$k])){
-  if(isset($aNE[$k])){$v = $k;}
-  elseif(!empty($lcase) && (($e != 'button' or $e != 'input') or $k == 'type')){ // Rather loose but ?not cause issues
-   $v = (isset($aNL[($v2 = strtolower($v))])) ? $v2 : $v;
-  }
-  if($k == 'style' && !$C['style_pass']){
-   if(false !== strpos($v, '&#')){
-    static $sC = array('&#x20;'=>' ', '&#32;'=>' ', '&#x45;'=>'e', '&#69;'=>'e', '&#x65;'=>'e', '&#101;'=>'e', '&#x58;'=>'x', '&#88;'=>'x', '&#x78;'=>'x', '&#120;'=>'x', '&#x50;'=>'p', '&#80;'=>'p', '&#x70;'=>'p', '&#112;'=>'p', '&#x53;'=>'s', '&#83;'=>'s', '&#x73;'=>'s', '&#115;'=>'s', '&#x49;'=>'i', '&#73;'=>'i', '&#x69;'=>'i', '&#105;'=>'i', '&#x4f;'=>'o', '&#79;'=>'o', '&#x6f;'=>'o', '&#111;'=>'o', '&#x4e;'=>'n', '&#78;'=>'n', '&#x6e;'=>'n', '&#110;'=>'n', '&#x55;'=>'u', '&#85;'=>'u', '&#x75;'=>'u', '&#117;'=>'u', '&#x52;'=>'r', '&#82;'=>'r', '&#x72;'=>'r', '&#114;'=>'r', '&#x4c;'=>'l', '&#76;'=>'l', '&#x6c;'=>'l', '&#108;'=>'l', '&#x28;'=>'(', '&#40;'=>'(', '&#x29;'=>')', '&#41;'=>')', '&#x20;'=>':', '&#32;'=>':', '&#x22;'=>'"', '&#34;'=>'"', '&#x27;'=>"'", '&#39;'=>"'", '&#x2f;'=>'/', '&#47;'=>'/', '&#x2a;'=>'*', '&#42;'=>'*', '&#x5c;'=>'\\', '&#92;'=>'\\');
-    $v = strtr($v, $sC);
-   }
-   $v = preg_replace_callback('`(url(?:\()(?: )*(?:\'|"|&(?:quot|apos);)?)(.+?)((?:\'|"|&(?:quot|apos);)?(?: )*(?:\)))`iS', 'hl_prot', $v);
-   $v = !$C['css_expression'] ? preg_replace('`expression`i', ' ', preg_replace('`\\\\\S|(/|(%2f))(\*|(%2a))`i', ' ', $v)) : $v;
-  }elseif(isset($aNP[$k]) or strpos($k, 'src') !== false or $k[0] == 'o'){
-   $v = str_replace("\xad", ' ', (strpos($v, '&') !== false ? str_replace(array('&#xad;', '&#173;', '&shy;'), ' ', $v) : $v));
-   $v = hl_prot($v, $k);
-   if($k == 'href'){ // X-spam
-    if($C['anti_mail_spam'] && strpos($v, 'mailto:') === 0){
-     $v = str_replace('@', htmlspecialchars($C['anti_mail_spam']), $v);
-    }elseif($C['anti_link_spam']){
-     $r1 = $C['anti_link_spam'][1];
-     if(!empty($r1) && preg_match($r1, $v)){continue;}
-     $r0 = $C['anti_link_spam'][0];
-     if(!empty($r0) && preg_match($r0, $v)){
-      if(isset($a['rel'])){
-       if(!preg_match('`\bnofollow\b`i', $a['rel'])){$a['rel'] .= ' nofollow';}
-      }elseif(isset($aA['rel'])){
-       if(!preg_match('`\bnofollow\b`i', $aA['rel'])){$nfr = 1;}
-      }else{$a['rel'] = 'nofollow';}
-     }
-    }
-   }
-  }
-  if(isset($rl[$k]) && is_array($rl[$k]) && ($v = hl_attrval($v, $rl[$k])) === 0){continue;}
-  $a[$k] = str_replace('"', '&quot;', $v);
- }
-}
-if($nfr){$a['rel'] = isset($a['rel']) ? $a['rel']. ' nofollow' : 'nofollow';}
-
-// rqd attr
-static $eAR = array('area'=>array('alt'=>'area'), 'bdo'=>array('dir'=>'ltr'), 'form'=>array('action'=>''), 'img'=>array('src'=>'', 'alt'=>'image'), 'map'=>array('name'=>''), 'optgroup'=>array('label'=>''), 'param'=>array('name'=>''), 'script'=>array('type'=>'text/javascript'), 'textarea'=>array('rows'=>'10', 'cols'=>'50'));
-if(isset($eAR[$e])){
- foreach($eAR[$e] as $k=>$v){
-  if(!isset($a[$k])){$a[$k] = isset($v[0]) ? $v : $k;}
- }
-}
-
-// depr attrs
-if($depTr){
- $c = array();
- foreach($a as $k=>$v){
-  if($k == 'style' or !isset($aND[$k][$e])){continue;}
-  if($k == 'align'){
-   unset($a['align']);
-   if($e == 'img' && ($v == 'left' or $v == 'right')){$c[] = 'float: '. $v;}
-   elseif(($e == 'div' or $e == 'table') && $v == 'center'){$c[] = 'margin: auto';}
-   else{$c[] = 'text-align: '. $v;}
-  }elseif($k == 'bgcolor'){
-   unset($a['bgcolor']);
-   $c[] = 'background-color: '. $v;
-  }elseif($k == 'border'){
-   unset($a['border']); $c[] = "border: {$v}px";
-  }elseif($k == 'bordercolor'){
-   unset($a['bordercolor']); $c[] = 'border-color: '. $v;
-  }elseif($k == 'clear'){
-   unset($a['clear']); $c[] = 'clear: '. ($v != 'all' ? $v : 'both');
-  }elseif($k == 'compact'){
-   unset($a['compact']); $c[] = 'font-size: 85%';
-  }elseif($k == 'height' or $k == 'width'){
-   unset($a[$k]); $c[] = $k. ': '. ($v[0] != '*' ? $v. (ctype_digit($v) ? 'px' : '') : 'auto');
-  }elseif($k == 'hspace'){
-   unset($a['hspace']); $c[] = "margin-left: {$v}px; margin-right: {$v}px";
-  }elseif($k == 'language' && !isset($a['type'])){
-   unset($a['language']);
-   $a['type'] = 'text/'. strtolower($v);
-  }elseif($k == 'name'){
-   if($C['no_deprecated_attr'] == 2 or ($e != 'a' && $e != 'map')){unset($a['name']);}
-   if(!isset($a['id']) && preg_match('`[a-zA-Z][a-zA-Z\d.:_\-]*`', $v)){$a['id'] = $v;}
-  }elseif($k == 'noshade'){
-   unset($a['noshade']); $c[] = 'border-style: none; border: 0; background-color: gray; color: gray';
-  }elseif($k == 'nowrap'){
-   unset($a['nowrap']); $c[] = 'white-space: nowrap';
-  }elseif($k == 'size'){
-   unset($a['size']); $c[] = 'size: '. $v. 'px';
-  }elseif($k == 'start' or $k == 'value'){
-   unset($a[$k]);
-  }elseif($k == 'type'){
-   unset($a['type']);
-   static $ol_type = array('i'=>'lower-roman', 'I'=>'upper-roman', 'a'=>'lower-latin', 'A'=>'upper-latin', '1'=>'decimal');
-   $c[] = 'list-style-type: '. (isset($ol_type[$v]) ? $ol_type[$v] : 'decimal');
-  }elseif($k == 'vspace'){
-   unset($a['vspace']); $c[] = "margin-top: {$v}px; margin-bottom: {$v}px";
-  }
- }
- if(count($c)){
-  $c = implode('; ', $c);
-  $a['style'] = isset($a['style']) ? rtrim($a['style'], ' ;'). '; '. $c. ';': $c. ';';
- }
-}
-// unique ID
-if($C['unique_ids'] && isset($a['id'])){
- if(!preg_match('`^[A-Za-z][A-Za-z0-9_\-.:]*$`', ($id = $a['id'])) or (isset($GLOBALS['hl_Ids'][$id]) && $C['unique_ids'] == 1)){unset($a['id']);
- }else{
-  while(isset($GLOBALS['hl_Ids'][$id])){$id = $C['unique_ids']. $id;}
-  $GLOBALS['hl_Ids'][($a['id'] = $id)] = 1;
- }
-}
-// xml:lang
-if($C['xml:lang'] && isset($a['lang'])){
- $a['xml:lang'] = isset($a['xml:lang']) ? $a['xml:lang'] : $a['lang'];
- if($C['xml:lang'] == 2){unset($a['lang']);}
-}
-// for transformed tag
-if(!empty($trt)){
- $a['style'] = isset($a['style']) ? rtrim($a['style'], ' ;'). '; '. $trt : $trt;
-}
-// return with empty ele /
-if(empty($C['hook_tag'])){
- $aA = '';
- foreach($a as $k=>$v){$aA .= " {$k}=\"{$v}\"";}
- return "<{$e}{$aA}". (isset($eE[$e]) ? ' /' : ''). '>';
-}
-else{return $C['hook_tag']($e, $a);}
-// eof
-}
-
-function hl_tag2(&$e, &$a, $t=1){
-// transform tag
-if($e == 'center'){$e = 'div'; return 'text-align: center;';}
-if($e == 'dir' or $e == 'menu'){$e = 'ul'; return '';}
-if($e == 's' or $e == 'strike'){$e = 'span'; return 'text-decoration: line-through;';}
-if($e == 'u'){$e = 'span'; return 'text-decoration: underline;';}
-static $fs = array('0'=>'xx-small', '1'=>'xx-small', '2'=>'small', '3'=>'medium', '4'=>'large', '5'=>'x-large', '6'=>'xx-large', '7'=>'300%', '-1'=>'smaller', '-2'=>'60%', '+1'=>'larger', '+2'=>'150%', '+3'=>'200%', '+4'=>'300%');
-if($e == 'font'){
- $a2 = '';
- if(preg_match('`face\s*=\s*(\'|")([^=]+?)\\1`i', $a, $m) or preg_match('`face\s*=(\s*)(\S+)`i', $a, $m)){
-  $a2 .= ' font-family: '. str_replace('"', '\'', trim($m[2])). ';';
- }
- if(preg_match('`color\s*=\s*(\'|")?(.+?)(\\1|\s|$)`i', $a, $m)){
-  $a2 .= ' color: '. trim($m[2]). ';';
- }
- if(preg_match('`size\s*=\s*(\'|")?(.+?)(\\1|\s|$)`i', $a, $m) && isset($fs[($m = trim($m[2]))])){
-  $a2 .= ' font-size: '. $fs[$m]. ';';
- }
- $e = 'span'; return ltrim($a2);
-}
-if($t == 2){$e = 0; return 0;}
-return '';
-// eof
-}
-
-function hl_tidy($t, $w, $p){
-// Tidy/compact HTM
-if(strpos(' pre,script,textarea', "$p,")){return $t;}
-$t = str_replace(' </', '</', preg_replace(array('`(<\w[^>]*(?<!/)>)\s+`', '`\s+`', '`(<\w[^>]*(?<!/)>) `'), array(' $1', ' ', '$1'), preg_replace_callback(array('`(<(!\[CDATA\[))(.+?)(\]\]>)`sm', '`(<(!--))(.+?)(-->)`sm', '`(<(pre|script|textarea)[^>]*?>)(.+?)(</\2>)`sm'), create_function('$m', 'return $m[1]. str_replace(array("<", ">", "\n", "\r", "\t", " "), array("\x01", "\x02", "\x03", "\x04", "\x05", "\x07"), $m[3]). $m[4];'), $t)));
-if(($w = strtolower($w)) == -1){
- return str_replace(array("\x01", "\x02", "\x03", "\x04", "\x05", "\x07"), array('<', '>', "\n", "\r", "\t", ' '), $t);
-}
-$s = strpos(" $w", 't') ? "\t" : ' ';
-$s = preg_match('`\d`', $w, $m) ? str_repeat($s, $m[0]) : str_repeat($s, ($s == "\t" ? 1 : 2));
-$N = preg_match('`[ts]([1-9])`', $w, $m) ? $m[1] : 0;
-$a = array('br'=>1);
-$b = array('button'=>1, 'input'=>1, 'option'=>1);
-$c = array('caption'=>1, 'dd'=>1, 'dt'=>1, 'h1'=>1, 'h2'=>1, 'h3'=>1, 'h4'=>1, 'h5'=>1, 'h6'=>1, 'isindex'=>1, 'label'=>1, 'legend'=>1, 'li'=>1, 'object'=>1, 'p'=>1, 'pre'=>1, 'td'=>1, 'textarea'=>1, 'th'=>1);
-$d = array('address'=>1, 'blockquote'=>1, 'center'=>1, 'colgroup'=>1, 'dir'=>1, 'div'=>1, 'dl'=>1, 'fieldset'=>1, 'form'=>1, 'hr'=>1, 'iframe'=>1, 'map'=>1, 'menu'=>1, 'noscript'=>1, 'ol'=>1, 'optgroup'=>1, 'rbc'=>1, 'rtc'=>1, 'ruby'=>1, 'script'=>1, 'select'=>1, 'table'=>1, 'tbody'=>1, 'tfoot'=>1, 'thead'=>1, 'tr'=>1, 'ul'=>1);
-$T = explode('<', $t);
-$X = 1;
-while($X){
- $n = $N;
- $t = $T;
- ob_start();
- if(isset($d[$p])){echo str_repeat($s, ++$n);}
- echo ltrim(array_shift($t));
- for($i=-1, $j=count($t); ++$i<$j;){
-  $r = ''; list($e, $r) = explode('>', $t[$i]);
-  $x = $e[0] == '/' ? 0 : (substr($e, -1) == '/' ? 1 : ($e[0] != '!' ? 2 : -1));
-  $y = !$x ? ltrim($e, '/') : ($x > 0 ? substr($e, 0, strcspn($e, ' ')) : 0);
-  $e = "<$e>"; 
-  if(isset($d[$y])){
-   if(!$x){
-    if($n){echo "\n", str_repeat($s, --$n), "$e\n", str_repeat($s, $n);}
-    else{++$N; ob_end_clean(); continue 2;}
-   }
-   else{echo "\n", str_repeat($s, $n), "$e\n", str_repeat($s, ($x != 1 ? ++$n : $n));}
-   echo ltrim($r); continue;
-  }
-  $f = "\n". str_repeat($s, $n);
-  if(isset($c[$y])){
-   if(!$x){echo $e, $f, ltrim($r);}
-   else{echo $f, $e, $r;}
-  }elseif(isset($b[$y])){echo $f, $e, $r;
-  }elseif(isset($a[$y])){echo $e, $f, ltrim($r);
-  }elseif(!$y){echo $f, $e, $f, ltrim($r);
-  }else{echo $e, $r;}
- }
- $X = 0;
-}
-$t = preg_replace('`[\n]\s*?[\n]+`', "\n", ob_get_contents());
-ob_end_clean();
-if(($l = strpos(" $w", 'r') ? (strpos(" $w", 'n') ? "\r\n" : "\r") : 0)){
- $t = str_replace("\n", $l, $t);
-}
-return str_replace(array("\x01", "\x02", "\x03", "\x04", "\x05", "\x07"), array('<', '>', "\n", "\r", "\t", ' '), $t);
-// eof
-}
-
-function hl_version(){
-// rel
-return '1.1.14';
-// eof
-}
-
-function kses($t, $h, $p=array('http', 'https', 'ftp', 'news', 'nntp', 'telnet', 'gopher', 'mailto')){
-// kses compat
-foreach($h as $k=>$v){
- $h[$k]['n']['*'] = 1;
-}
-$C['cdata'] = $C['comment'] = $C['make_tag_strict'] = $C['no_deprecated_attr'] = $C['unique_ids'] = 0;
-$C['keep_bad'] = 1;
-$C['elements'] = count($h) ? strtolower(implode(',', array_keys($h))) : '-*';
-$C['hook'] = 'kses_hook';
-$C['schemes'] = '*:'. implode(',', $p);
-return htmLawed($t, $C, $h);
-// eof
-}
-
-function kses_hook($t, &$C, &$S){
-// kses compat
-return $t;
-// eof
-}
\ No newline at end of file
diff --git a/locale/ca_CA/LC_MESSAGES/messages.mo b/locale/ca_CA/LC_MESSAGES/messages.mo
index 94355a84b..70dce2e19 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 e8a7ab099..53a7403cd 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: 2013-03-17 19:37+0400\n"
+"POT-Creation-Date: 2013-03-19 10:14+0400\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"
@@ -17,79 +17,79 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "X-Poedit-Language: Catalan\n"
 
-#: backend.php:67
+#: backend.php:71
 msgid "Use default"
 msgstr "Valors per defecte"
 
-#: backend.php:68
+#: backend.php:72
 msgid "Never purge"
 msgstr "No ho purguis mai"
 
-#: backend.php:69
+#: backend.php:73
 msgid "1 week old"
 msgstr "Al cap d'1 setmana"
 
-#: backend.php:70
+#: backend.php:74
 msgid "2 weeks old"
 msgstr "Al cap de 2 setmanes"
 
-#: backend.php:71
+#: backend.php:75
 msgid "1 month old"
 msgstr "Al cap d'1 mes"
 
-#: backend.php:72
+#: backend.php:76
 msgid "2 months old"
 msgstr "Al cap de 2 mesos"
 
-#: backend.php:73
+#: backend.php:77
 msgid "3 months old"
 msgstr "Al cap de 3 mesos"
 
-#: backend.php:76
+#: backend.php:80
 msgid "Default interval"
 msgstr "Interval per defecte"
 
-#: backend.php:77 backend.php:87
+#: backend.php:81 backend.php:91
 msgid "Disable updates"
 msgstr "Deshabilita les actualitzacions"
 
-#: backend.php:78 backend.php:88
+#: backend.php:82 backend.php:92
 msgid "Each 15 minutes"
 msgstr "Cada 15 minuts"
 
-#: backend.php:79 backend.php:89
+#: backend.php:83 backend.php:93
 msgid "Each 30 minutes"
 msgstr "cada  30 minuts"
 
-#: backend.php:80 backend.php:90
+#: backend.php:84 backend.php:94
 msgid "Hourly"
 msgstr "Cada hora"
 
-#: backend.php:81 backend.php:91
+#: backend.php:85 backend.php:95
 msgid "Each 4 hours"
 msgstr "Cada 4 hores"
 
-#: backend.php:82 backend.php:92
+#: backend.php:86 backend.php:96
 msgid "Each 12 hours"
 msgstr "Cada 12 hores"
 
-#: backend.php:83 backend.php:93
+#: backend.php:87 backend.php:97
 msgid "Daily"
 msgstr "Diàriament"
 
-#: backend.php:84 backend.php:94
+#: backend.php:88 backend.php:98
 msgid "Weekly"
 msgstr "Setmanalment"
 
-#: backend.php:97 classes/pref/users.php:139
+#: backend.php:101 classes/pref/users.php:139
 msgid "User"
 msgstr "Usuari"
 
-#: backend.php:98
+#: backend.php:102
 msgid "Power User"
 msgstr "Súper usuari"
 
-#: backend.php:99
+#: backend.php:103
 msgid "Administrator"
 msgstr "Administrador"
 
@@ -121,7 +121,7 @@ msgstr "La base de dades de Tiny Tiny RSS està actualitzada."
 #: db-updater.php:94 db-updater.php:163 db-updater.php:176 register.php:194
 #: register.php:239 register.php:252 register.php:267 register.php:286
 #: register.php:371 register.php:381 register.php:393
-#: classes/handler/public.php:637 classes/handler/public.php:725
+#: classes/handler/public.php:611 classes/handler/public.php:699
 msgid "Return to Tiny Tiny RSS"
 msgstr "Torna a Tiny Tiny RSS"
 
@@ -259,199 +259,199 @@ msgstr ""
 "Ha fallat la sortida de prova de SQL, reviseu la base configuració de la "
 "bases de dades i de PHP"
 
-#: index.php:108 index.php:150 index.php:236 prefs.php:86
-#: classes/backend.php:6 classes/pref/labels.php:296
-#: classes/pref/filters.php:602 classes/pref/feeds.php:1342
-#: plugins/digest/digest_body.php:45 js/viewfeed.js:1169 js/viewfeed.js:1158
-#: js/viewfeed.js:1164 js/viewfeed.js:1174
+#: index.php:117 index.php:147 index.php:252 prefs.php:79
+#: classes/backend.php:5 classes/pref/labels.php:296
+#: classes/pref/filters.php:609 classes/pref/feeds.php:1270
+#: plugins/digest/digest_body.php:45 js/viewfeed.js:1174
 msgid "Loading, please wait..."
 msgstr "S'està obrint, preneu paciència..."
 
-#: index.php:118 plugins/digest/digest_body.php:56
-msgid "Hello,"
-msgstr "Hola, "
+#: index.php:127 index.php:198
+msgid "Communication problem with server."
+msgstr ""
 
-#: index.php:120 prefs.php:29 prefs.php:108 help/main.php:73 help/prefs.php:8
-#: classes/pref/prefs.php:371
-msgid "Preferences"
-msgstr "Preferències"
-
-#: index.php:124
-msgid "Comments?"
-msgstr "Comentaris?"
-
-#: index.php:128 mobile/mobile-functions.php:69
-#: mobile/mobile-functions.php:244 plugins/digest/digest_body.php:59
-msgid "Logout"
-msgstr "Surt"
-
-#: index.php:134
+#: index.php:133 index.php:206
 msgid "New version of Tiny Tiny RSS is available!"
 msgstr "Hi ha una nova versió de Tiny Tiny RSS!"
 
-#: index.php:157
-msgid "News"
-msgstr ""
-
-#: index.php:166
+#: index.php:161
 msgid "Collapse feedlist"
 msgstr "Redueix la llista de canals"
 
-#: index.php:169
+#: index.php:164
 #, fuzzy
 msgid "Show articles"
 msgstr "Articles mémorisés"
 
-#: index.php:172
+#: index.php:167
 msgid "Adaptive"
 msgstr "Adaptatiu"
 
-#: index.php:173
+#: index.php:168
 msgid "All Articles"
 msgstr "Tots els articles"
 
-#: index.php:174 classes/feeds.php:106
+#: index.php:169 include/functions.php:1912 classes/feeds.php:106
 msgid "Starred"
 msgstr "Marcats"
 
-#: index.php:175 classes/feeds.php:107
+#: index.php:170 include/functions.php:1913 classes/feeds.php:107
 msgid "Published"
 msgstr "Publicats"
 
-#: index.php:176 classes/feeds.php:93 classes/feeds.php:105
+#: index.php:171 classes/feeds.php:93 classes/feeds.php:105
 msgid "Unread"
 msgstr "Per llegir"
 
-#: index.php:177
+#: index.php:172
 msgid "Ignore Scoring"
 msgstr "Ignora la puntuació"
 
-#: index.php:178
+#: index.php:173
 msgid "Updated"
 msgstr "Actualitzat"
 
-#: index.php:181
+#: index.php:176
 #, fuzzy
 msgid "Sort articles"
 msgstr "Articles mémorisés"
 
-#: index.php:184 classes/pref/prefs.php:462
+#: index.php:179
 msgid "Default"
 msgstr "Per defecte"
 
-#: index.php:185
+#: index.php:180
 msgid "Date"
 msgstr "Data"
 
-#: index.php:186 include/localized_schema.php:3
+#: index.php:181 include/localized_schema.php:3
 msgid "Title"
 msgstr "Títol"
 
-#: index.php:187
+#: index.php:182
 msgid "Score"
 msgstr "Puntuació"
 
-#: index.php:192 classes/pref/feeds.php:539 classes/pref/feeds.php:786
+#: index.php:187 classes/pref/feeds.php:535 classes/pref/feeds.php:746
 msgid "Update"
 msgstr "Actualitza"
 
-#: index.php:196 index.php:211 include/localized_schema.php:10
-#: classes/feeds.php:111 classes/feeds.php:127 js/FeedTree.js:128
-#: js/FeedTree.js:156 plugins/digest/digest.js:630
+#: index.php:191 index.php:221 include/functions.php:1903
+#: include/localized_schema.php:10 classes/feeds.php:111 classes/feeds.php:131
+#: js/FeedTree.js:128 js/FeedTree.js:156 plugins/digest/digest.js:630
 msgid "Mark as read"
 msgstr "Marca'l com a llegit"
 
-#: index.php:202 classes/feeds.php:101
+#: index.php:211
 msgid "Actions..."
 msgstr "Accions..."
 
-#: index.php:204
+#: index.php:213
+#, fuzzy
+msgid "Preferences..."
+msgstr "Preferències"
+
+#: index.php:214
 msgid "Search..."
 msgstr "Cerca..."
 
-#: index.php:205
+#: index.php:215
 msgid "Feed actions:"
 msgstr "Accions sobre els canals:"
 
-#: index.php:206 classes/handler/public.php:567
+#: index.php:216 classes/handler/public.php:541
 msgid "Subscribe to feed..."
 msgstr "Subscriviu-vos al canal"
 
-#: index.php:207
+#: index.php:217
 msgid "Edit this feed..."
 msgstr "Edita aquest canal..."
 
-#: index.php:208
+#: index.php:218
 msgid "Rescore feed"
 msgstr "Canvia la puntuació del canal"
 
-#: index.php:209 classes/pref/feeds.php:712 classes/pref/feeds.php:1315
+#: index.php:219 classes/pref/feeds.php:672 classes/pref/feeds.php:1243
 #: js/PrefFeedTree.js:73
 msgid "Unsubscribe"
 msgstr "Dóna't de baixa"
 
-#: index.php:210
+#: index.php:220
 msgid "All feeds:"
 msgstr "Tots els canals"
 
-#: index.php:212 help/main.php:56
+#: index.php:222
 msgid "(Un)hide read feeds"
 msgstr "Mostra/amaga els canals llegits"
 
-#: index.php:213
+#: index.php:223
 msgid "Other actions:"
 msgstr "Altres accions:"
 
-#: index.php:215
+#: index.php:225
 msgid "Switch to digest..."
 msgstr ""
 
-#: index.php:217
+#: index.php:227
 #, fuzzy
 msgid "Show tag cloud..."
 msgstr "Núvol d'etiquetes"
 
-#: index.php:218
+#: index.php:229 include/functions.php:1890
+#, fuzzy
+msgid "Toggle widescreen mode"
+msgstr "Canvia al mode de reordenació de categories"
+
+#: index.php:231
 msgid "Select by tags..."
 msgstr ""
 
-#: index.php:219
+#: index.php:232
 msgid "Create label..."
 msgstr "Crea una etiqueta"
 
-#: index.php:220
+#: index.php:233
 msgid "Create filter..."
 msgstr "Crea un filtre..."
 
-#: index.php:221
+#: index.php:234
 #, fuzzy
 msgid "Keyboard shortcuts help"
 msgstr "Dreceres de teclat"
 
-#: prefs.php:99
+#: index.php:236 mobile/mobile-functions.php:69
+#: mobile/mobile-functions.php:244 plugins/digest/digest_body.php:59
+msgid "Logout"
+msgstr "Surt"
+
+#: prefs.php:28 prefs.php:99 include/functions.php:1915
+#: classes/pref/prefs.php:371
+msgid "Preferences"
+msgstr "Preferències"
+
+#: prefs.php:90
 msgid "Keyboard shortcuts"
 msgstr "Dreceres de teclat"
 
-#: prefs.php:100 help/prefs.php:14
+#: prefs.php:91
 msgid "Exit preferences"
 msgstr "Surt de les preferències"
 
-#: prefs.php:111 classes/pref/feeds.php:101 classes/pref/feeds.php:1220
-#: classes/pref/feeds.php:1283
+#: prefs.php:102 classes/pref/feeds.php:100 classes/pref/feeds.php:1148
+#: classes/pref/feeds.php:1211
 msgid "Feeds"
 msgstr "Canals"
 
-#: prefs.php:114 help/prefs.php:11 classes/pref/filters.php:110
+#: prefs.php:105 classes/pref/filters.php:117
 msgid "Filters"
 msgstr "Filtres"
 
-#: prefs.php:117 help/prefs.php:12 mobile/mobile-functions.php:205
-#: include/functions.php:1189 include/functions.php:1836
-#: classes/pref/labels.php:90
+#: prefs.php:108 mobile/mobile-functions.php:205 include/functions.php:1118
+#: include/functions.php:1739 classes/pref/labels.php:90
 msgid "Labels"
 msgstr "Etiquetes"
 
-#: prefs.php:121 help/prefs.php:13
+#: prefs.php:112
 msgid "Users"
 msgstr "Usuaris"
 
@@ -513,252 +513,23 @@ msgstr "S'ha creat el compte."
 msgid "New user registrations are currently closed."
 msgstr "Actualment no es permet el registre de nous usuaris."
 
-#: update.php:38
+#: update.php:37
 #, fuzzy
 msgid "Tiny Tiny RSS data update script."
 msgstr "La base de dades de Tiny Tiny RSS està actualitzada."
 
-#: help/main.php:1 help/prefs.php:1
-msgid "Keyboard Shortcuts"
-msgstr "Dreceres de teclat"
-
-#: help/main.php:5
-msgid "Navigation"
-msgstr "Navegació"
-
-#: help/main.php:8
-msgid "Move between feeds"
-msgstr "Mou entre canals"
-
-#: help/main.php:9
-msgid "Move between articles"
-msgstr "Mou entre articles"
-
-#: help/main.php:10
-msgid "Show search dialog"
-msgstr "Mostra el diàleg de cerca"
-
-#: help/main.php:13
-msgid "Active article actions"
-msgstr "Accions actives de l'article"
-
-#: help/main.php:16
-msgid "Toggle starred"
-msgstr "Commuta els marcats"
-
-#: help/main.php:17
-msgid "Toggle published"
-msgstr "Commuta els publicats"
-
-#: help/main.php:18
-msgid "Toggle unread"
-msgstr "Commuta els no llegits"
-
-#: help/main.php:19
-msgid "Edit tags"
-msgstr "Edita les etiquetes"
-
-#: help/main.php:20
-#, fuzzy
-msgid "Dismiss selected articles"
-msgstr ""
-"Esteu segur que voleu eliminar els articles seleccionats de l'etiqueta?"
-
-#: help/main.php:21
-#, fuzzy
-msgid "Dismiss read articles"
-msgstr "Amaga els articles llegits."
-
-#: help/main.php:22
-msgid "Open article in new window"
-msgstr "Obre l'article en una finestra nova"
-
-#: help/main.php:23
-msgid "Mark articles below/above active one as read"
-msgstr "Marca els articles de sobre/sota de l'actiu com a llegits."
-
-#: help/main.php:24
-msgid "Scroll article content"
-msgstr "Desplaça el contingut de l'article"
-
-#: help/main.php:25
-#, fuzzy
-msgid "Email article"
-msgstr "Tots els articles"
-
-#: help/main.php:29 help/prefs.php:30
-msgid "Other actions"
-msgstr "Altres accions"
-
-#: help/main.php:32
-msgid "Select article under mouse cursor"
-msgstr "Seleccioneu un article mitjançant el ratolí."
-
-#: help/main.php:33 help/prefs.php:26 classes/pref/labels.php:281
-msgid "Create label"
-msgstr "Crea una etiqueta"
-
-#: help/main.php:34 help/prefs.php:25 classes/pref/filters.php:580
-msgid "Create filter"
-msgstr "Crea un filtre"
-
-#: help/main.php:35
-msgid "Collapse sidebar"
-msgstr "Redueix la barra lateral"
-
-#: help/main.php:36 help/prefs.php:34
-msgid "Display this help dialog"
-msgstr "Mostra aquest quadre d'ajuda"
-
-#: help/main.php:41
-#, fuzzy
-msgid "Multiple articles actions"
-msgstr "Tots els articles"
-
-#: help/main.php:44
-#, fuzzy
-msgid "Select all articles"
-msgstr "Buida els articles"
-
-#: help/main.php:45
-#, fuzzy
-msgid "Select unread articles"
-msgstr "Purga els articles per llegir"
-
-#: help/main.php:46
-#, fuzzy
-msgid "Select starred articles"
-msgstr "Purga els articles per llegir"
-
-#: help/main.php:47
-#, fuzzy
-msgid "Select published articles"
-msgstr "Purga els articles per llegir"
-
-#: help/main.php:48
-#, fuzzy
-msgid "Invert article selection"
-msgstr "Accions actives de l'article"
-
-#: help/main.php:49
-#, fuzzy
-msgid "Deselect all articles"
-msgstr "Buida els articles"
-
-#: help/main.php:52
-msgid "Feed actions"
-msgstr "Accions dels canals"
-
-#: help/main.php:55
-#, fuzzy
-msgid "Refresh active feed"
-msgstr "Actualitza els canals actius"
-
-#: help/main.php:57 help/prefs.php:22 classes/pref/feeds.php:1286
-msgid "Subscribe to feed"
-msgstr "Subscriu-te al canal"
-
-#: help/main.php:58 js/FeedTree.js:135 js/PrefFeedTree.js:67
-msgid "Edit feed"
-msgstr "Edita el canal"
-
-#: help/main.php:59
-msgid "Mark feed as read"
-msgstr "Marca el canal com a llegit"
-
-#: help/main.php:60
-#, fuzzy
-msgid "Reverse headlines order"
-msgstr "Inverteix l'ordre de les capçaleres (les més antigues les primeres)"
-
-#: help/main.php:61 js/FeedTree.js:170
-msgid "Mark all feeds as read"
-msgstr "Marca tots els canals com a llegits"
-
-#: help/main.php:62
-msgid "If viewing category, (un)collapse it"
-msgstr "Si esteu veient les categories reduir-les/ampliar-les"
-
-#: help/main.php:65 help/prefs.php:5
-msgid "Go to..."
-msgstr "Vés a..."
-
-#: help/main.php:68 include/functions.php:1893
-msgid "All articles"
-msgstr "Tots els articles"
-
-#: help/main.php:69 include/functions.php:1891
-msgid "Fresh articles"
-msgstr "Articles nous"
-
-#: help/main.php:70 include/functions.php:1887
-msgid "Starred articles"
-msgstr "Articles marcats"
-
-#: help/main.php:71 include/functions.php:1889
-msgid "Published articles"
-msgstr "Articles publicats"
-
-#: help/main.php:72
-msgid "Tag cloud"
-msgstr "Núvol d'etiquetes"
-
-#: help/main.php:79
-msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
-msgstr ""
-
-#: help/main.php:81 help/prefs.php:41
-msgid "Press any key to close this window."
-msgstr "Premeu qualsevol tecla per a tancar aquesta finestra."
-
-#: help/prefs.php:9
-msgid "My Feeds"
-msgstr "Els meus canals"
-
-#: help/prefs.php:10
-msgid "Other Feeds"
-msgstr "Altres canals"
-
-#: help/prefs.php:19
-msgid "Panel actions"
-msgstr "Quadre d'accions"
-
-#: help/prefs.php:23
-msgid "Top 25 feeds"
-msgstr "Els 25 més llegits"
-
-#: help/prefs.php:24
-msgid "Edit feed categories"
-msgstr "Edita les categories dels canals"
-
-#: help/prefs.php:27 classes/pref/users.php:386
-msgid "Create user"
-msgstr "Crea un usuari"
-
-#: help/prefs.php:33
-msgid "Focus search (if present)"
-msgstr "Concreta la cerca (si n'hi ha)"
-
-#: help/prefs.php:39
-msgid ""
-"<b>Note:</b> not all actions may be available, depending on Tiny Tiny RSS "
-"configuration and your access level."
-msgstr ""
-"<b>Nota:</b> L'accés a les accions depèn de la configuració del Tiny Tiny "
-"RSS o del nivell d'accés del teu usuari."
-
 #: mobile/login_form.php:28 include/login_form.php:209
-#: classes/handler/public.php:495
+#: classes/handler/public.php:469
 msgid "Log in"
 msgstr "Registreu-vos"
 
 #: mobile/login_form.php:40 include/login_form.php:169
-#: classes/handler/public.php:479
+#: classes/handler/public.php:453
 msgid "Login:"
 msgstr "Usuari:"
 
 #: mobile/login_form.php:45 include/login_form.php:178
-#: classes/handler/public.php:482
+#: classes/handler/public.php:456
 msgid "Password:"
 msgstr "Contrasenya:"
 
@@ -773,8 +544,8 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
-#: mobile/mobile-functions.php:178 include/functions.php:1187
-#: include/functions.php:1834
+#: mobile/mobile-functions.php:178 include/functions.php:1116
+#: include/functions.php:1737
 msgid "Special"
 msgstr "Especial"
 
@@ -788,12 +559,12 @@ msgid "Enable categories"
 msgstr "Utiliser les catégories de flux"
 
 #: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36
-#: mobile/prefs.php:41 mobile/prefs.php:46
+#: mobile/prefs.php:41 mobile/prefs.php:46 mobile/prefs.php:51
 msgid "ON"
 msgstr ""
 
 #: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36
-#: mobile/prefs.php:41 mobile/prefs.php:46
+#: mobile/prefs.php:41 mobile/prefs.php:46 mobile/prefs.php:51
 msgid "OFF"
 msgstr ""
 
@@ -817,158 +588,348 @@ msgstr "Mostra/amaga els canals llegits"
 msgid "Sort feeds by unread count"
 msgstr "Ordena els canals per articles no llegits"
 
-#: include/functions.php:564
-#, php-format
-msgid "Fatal: authentication module %s not found."
-msgstr ""
+#: mobile/prefs.php:50 include/localized_schema.php:45
+msgid "Reverse headline order (oldest first)"
+msgstr "Inverteix l'ordre de les capçaleres (les més antigues les primeres)"
 
-#: include/functions.php:682
-msgid "Session failed to validate (incorrect IP)"
-msgstr "No s'ha pogut validar la sessió (IP incorrecta)"
-
-#: include/functions.php:1198 include/functions.php:1737
-#: include/functions.php:1822 include/functions.php:1844
-#: include/functions.php:2699 classes/opml.php:416 classes/pref/feeds.php:193
+#: include/digest.php:131 include/functions.php:1127
+#: include/functions.php:1640 include/functions.php:1725
+#: include/functions.php:1747 classes/opml.php:416 classes/pref/feeds.php:188
 msgid "Uncategorized"
 msgstr "Sense categoria"
 
-#: include/functions.php:1686 classes/dlg.php:387 classes/pref/filters.php:361
-msgid "All feeds"
-msgstr "Tots els canals"
-
-#: include/functions.php:1895
-#, fuzzy
-msgid "Archived articles"
-msgstr "Articles mémorisés"
-
-#: include/functions.php:1897
-msgid "Recently read"
-msgstr ""
-
-#: include/functions.php:2346
-#, fuzzy, php-format
-msgid "Search results: %s"
-msgstr "Resultats de la cerca"
-
-#: include/functions.php:3067 js/viewfeed.js:1998 js/viewfeed.js:1971
-#: js/viewfeed.js:1835 js/viewfeed.js:1845
-#, fuzzy
-msgid "Click to play"
-msgstr "Feu clic per editar"
-
-#: include/functions.php:3068 js/viewfeed.js:1997 js/viewfeed.js:1970
-#: js/viewfeed.js:1834 js/viewfeed.js:1844
-msgid "Play"
-msgstr ""
-
-#: include/functions.php:3203
-msgid " - "
-msgstr " - "
-
-#: include/functions.php:3232 include/functions.php:4028 classes/rpc.php:414
-msgid "no tags"
-msgstr "sense etiqueta"
-
-#: include/functions.php:3242 classes/feeds.php:680
-msgid "Edit tags for this article"
-msgstr "Edita les etiquetes d'aquest article"
-
-#: include/functions.php:3252 classes/feeds.php:707
-#, fuzzy
-msgid "Open article in new tab"
-msgstr "Obre l'article en una finestra nova"
-
-#: include/functions.php:3263 classes/feeds.php:718
-#, fuzzy
-msgid "Close article"
-msgstr "Buida els articles"
-
-#: include/functions.php:3280 classes/feeds.php:616
-#, fuzzy
-msgid "Originally from:"
-msgstr "Mostra el contingut original de l'article"
-
-#: include/functions.php:3293 classes/feeds.php:629 classes/pref/feeds.php:511
-#, fuzzy
-msgid "Feed URL"
-msgstr "Canal"
-
-#: include/functions.php:3308 classes/feeds.php:68
-#, fuzzy
-msgid "Visit the website"
-msgstr "Visiteu el web oficial"
-
-#: include/functions.php:3327
-msgid "Related"
-msgstr ""
-
-#: include/functions.php:3361 classes/dlg.php:30 classes/dlg.php:61
-#: classes/dlg.php:180 classes/dlg.php:203 classes/dlg.php:240
-#: classes/dlg.php:524 classes/dlg.php:559 classes/dlg.php:590
-#: classes/dlg.php:623 classes/dlg.php:724 classes/pref/users.php:106
-#: classes/pref/filters.php:101 classes/pref/feeds.php:1638
-#: classes/pref/feeds.php:1709 plugins/share/share.php:61
-#: plugins/updater/updater.php:301 plugins/updater/init.php:323
-msgid "Close this window"
-msgstr "Tanca la finestra"
-
-#: include/functions.php:4053
-#, fuzzy
-msgid "(edit note)"
-msgstr "edita la nota"
-
-#: include/functions.php:4525
-msgid "No feed selected."
-msgstr "No heu seleccionat cap canal."
-
-#: include/functions.php:4535 classes/feeds.php:766
-#, fuzzy, php-format
-msgid "Feeds last updated at %s"
-msgstr "Erreurs de mise à jour"
-
-#: include/functions.php:4545 classes/feeds.php:776
-msgid "Some feeds have update errors (click for details)"
-msgstr ""
-"S'han detectat errors en alguns canals (feu clic aquí per veure'n els "
-"detalls)"
-
-#: include/functions.php:4689
-msgid "unknown type"
-msgstr "tipus desconegut"
-
-#: include/functions.php:4731
-#, fuzzy
-msgid "Attachments"
-msgstr "Adjuncions:"
-
-#: include/functions.php:5191
+#: include/feedbrowser.php:83
 #, fuzzy, php-format
 msgid "%d archived articles"
 msgstr "Articles marcats"
 
-#: include/functions.php:5215
+#: include/feedbrowser.php:107
 msgid "No feeds found."
 msgstr "No s'ha trobat cap canal."
 
-#: include/functions.php:5261 plugins/import_export/init.php:221
+#: include/functions.php:698
+msgid "Session failed to validate (incorrect IP)"
+msgstr "No s'ha pogut validar la sessió (IP incorrecta)"
+
+#: include/functions.php:1589 classes/dlg.php:371 classes/pref/filters.php:368
+msgid "All feeds"
+msgstr "Tots els canals"
+
+#: include/functions.php:1790
+msgid "Starred articles"
+msgstr "Articles marcats"
+
+#: include/functions.php:1792
+msgid "Published articles"
+msgstr "Articles publicats"
+
+#: include/functions.php:1794
+msgid "Fresh articles"
+msgstr "Articles nous"
+
+#: include/functions.php:1796 include/functions.php:1910
+msgid "All articles"
+msgstr "Tots els articles"
+
+#: include/functions.php:1798
 #, fuzzy
-msgid "Could not import: incorrect schema version."
-msgstr ""
-"No s'ha pogut trobar el fitxer d'esquema necessari, es necessita la versió:"
+msgid "Archived articles"
+msgstr "Articles mémorisés"
 
-#: include/functions.php:5266 plugins/import_export/init.php:226
-msgid "Could not import: unrecognized document format."
+#: include/functions.php:1800
+msgid "Recently read"
 msgstr ""
 
-#: include/functions.php:5425
-#, php-format
-msgid "Finished: %d articles processed, %d imported, %d feeds created."
+#: include/functions.php:1867
+msgid "Navigation"
+msgstr "Navegació"
+
+#: include/functions.php:1868
+#, fuzzy
+msgid "Open next feed"
+msgstr "Canals generats"
+
+#: include/functions.php:1869
+msgid "Open previous feed"
 msgstr ""
 
-#: include/functions.php:5431 plugins/import_export/init.php:391
-msgid "Could not load XML document."
+#: include/functions.php:1870
+#, fuzzy
+msgid "Open next article"
+msgstr "Mostra el contingut original de l'article"
+
+#: include/functions.php:1871
+#, fuzzy
+msgid "Open previous article"
+msgstr "Mostra el contingut original de l'article"
+
+#: include/functions.php:1872
+msgid "Open next article (don't scroll long articles)"
 msgstr ""
 
+#: include/functions.php:1873
+msgid "Open previous article (don't scroll long articles)"
+msgstr ""
+
+#: include/functions.php:1874
+msgid "Show search dialog"
+msgstr "Mostra el diàleg de cerca"
+
+#: include/functions.php:1875
+#, fuzzy
+msgid "Article"
+msgstr "Tots els articles"
+
+#: include/functions.php:1876
+msgid "Toggle starred"
+msgstr "Commuta els marcats"
+
+#: include/functions.php:1877
+msgid "Toggle published"
+msgstr "Commuta els publicats"
+
+#: include/functions.php:1878
+msgid "Toggle unread"
+msgstr "Commuta els no llegits"
+
+#: include/functions.php:1879
+msgid "Edit tags"
+msgstr "Edita les etiquetes"
+
+#: include/functions.php:1880
+#, fuzzy
+msgid "Dismiss selected"
+msgstr ""
+"Esteu segur que voleu eliminar els articles seleccionats de l'etiqueta?"
+
+#: include/functions.php:1881
+#, fuzzy
+msgid "Dismiss read"
+msgstr "Publica l'article"
+
+#: include/functions.php:1882
+#, fuzzy
+msgid "Open in new window"
+msgstr "Obre l'article en una finestra nova"
+
+#: include/functions.php:1883 js/viewfeed.js:1758
+#, fuzzy
+msgid "Mark below as read"
+msgstr "Marca'l com a llegit"
+
+#: include/functions.php:1884 js/viewfeed.js:1752
+#, fuzzy
+msgid "Mark above as read"
+msgstr "Marca'l com a llegit"
+
+#: include/functions.php:1885
+#, fuzzy
+msgid "Scroll down"
+msgstr "Fet!"
+
+#: include/functions.php:1886
+msgid "Scroll up"
+msgstr ""
+
+#: include/functions.php:1887
+#, fuzzy
+msgid "Select article under cursor"
+msgstr "Seleccioneu un article mitjançant el ratolí."
+
+#: include/functions.php:1888
+#, fuzzy
+msgid "Email article"
+msgstr "Tots els articles"
+
+#: include/functions.php:1889 plugins/close_button/init.php:24
+#, fuzzy
+msgid "Close article"
+msgstr "Buida els articles"
+
+#: include/functions.php:1891
+#, fuzzy
+msgid "Article selection"
+msgstr "Accions actives de l'article"
+
+#: include/functions.php:1892
+#, fuzzy
+msgid "Select all articles"
+msgstr "Buida els articles"
+
+#: include/functions.php:1893
+#, fuzzy
+msgid "Select unread"
+msgstr "Purga els articles per llegir"
+
+#: include/functions.php:1894
+#, fuzzy
+msgid "Select starred"
+msgstr "Marca'l com a destacat"
+
+#: include/functions.php:1895
+#, fuzzy
+msgid "Select published"
+msgstr "Purga els articles per llegir"
+
+#: include/functions.php:1896
+#, fuzzy
+msgid "Invert selection"
+msgstr "Accions actives de l'article"
+
+#: include/functions.php:1897
+#, fuzzy
+msgid "Deselect everything"
+msgstr "Buida els articles"
+
+#: include/functions.php:1898 classes/pref/feeds.php:488
+#: classes/pref/feeds.php:707
+msgid "Feed"
+msgstr "Canal"
+
+#: include/functions.php:1899
+#, fuzzy
+msgid "Refresh current feed"
+msgstr "Actualitza els canals actius"
+
+#: include/functions.php:1900
+#, fuzzy
+msgid "Un/hide read feeds"
+msgstr "Mostra/amaga els canals llegits"
+
+#: include/functions.php:1901 classes/pref/feeds.php:1214
+msgid "Subscribe to feed"
+msgstr "Subscriu-te al canal"
+
+#: include/functions.php:1902 js/FeedTree.js:135 js/PrefFeedTree.js:67
+msgid "Edit feed"
+msgstr "Edita el canal"
+
+#: include/functions.php:1904
+#, fuzzy
+msgid "Reverse headlines"
+msgstr "Inverteix l'ordre de les capçaleres (les més antigues les primeres)"
+
+#: include/functions.php:1905
+#, fuzzy
+msgid "Debug feed update"
+msgstr "S'ha acabat l'actualització dels canals."
+
+#: include/functions.php:1906 js/FeedTree.js:170
+msgid "Mark all feeds as read"
+msgstr "Marca tots els canals com a llegits"
+
+#: include/functions.php:1907
+#, fuzzy
+msgid "Un/collapse current category"
+msgstr "Clica-hi per a reduir la categoria"
+
+#: include/functions.php:1908
+#, fuzzy
+msgid "Toggle combined mode"
+msgstr "Canvia al mode de reordenació de categories"
+
+#: include/functions.php:1909
+#, fuzzy
+msgid "Go to"
+msgstr "Vés a..."
+
+#: include/functions.php:1911
+#, fuzzy
+msgid "Fresh"
+msgstr "Actualitza"
+
+#: include/functions.php:1914
+msgid "Tag cloud"
+msgstr "Núvol d'etiquetes"
+
+#: include/functions.php:1916
+#, fuzzy
+msgid "Other"
+msgstr "Altres:"
+
+#: include/functions.php:1917 classes/pref/labels.php:281
+msgid "Create label"
+msgstr "Crea una etiqueta"
+
+#: include/functions.php:1918 classes/pref/filters.php:587
+msgid "Create filter"
+msgstr "Crea un filtre"
+
+#: include/functions.php:1919
+#, fuzzy
+msgid "Un/collapse sidebar"
+msgstr "Redueix la barra lateral"
+
+#: include/functions.php:1920
+#, fuzzy
+msgid "Show help dialog"
+msgstr "Mostra el diàleg de cerca"
+
+#: include/functions.php:2400
+#, fuzzy, php-format
+msgid "Search results: %s"
+msgstr "Resultats de la cerca"
+
+#: include/functions.php:2824 js/viewfeed.js:1845
+#, fuzzy
+msgid "Click to play"
+msgstr "Feu clic per editar"
+
+#: include/functions.php:2825 js/viewfeed.js:1844
+msgid "Play"
+msgstr ""
+
+#: include/functions.php:2945
+msgid " - "
+msgstr " - "
+
+#: include/functions.php:2967 include/functions.php:3284 classes/rpc.php:359
+msgid "no tags"
+msgstr "sense etiqueta"
+
+#: include/functions.php:2977 classes/feeds.php:645
+msgid "Edit tags for this article"
+msgstr "Edita les etiquetes d'aquest article"
+
+#: include/functions.php:3006 classes/feeds.php:600
+#, fuzzy
+msgid "Originally from:"
+msgstr "Mostra el contingut original de l'article"
+
+#: include/functions.php:3019 classes/feeds.php:613 classes/pref/feeds.php:507
+#, fuzzy
+msgid "Feed URL"
+msgstr "Canal"
+
+#: include/functions.php:3048
+msgid "Related"
+msgstr ""
+
+#: include/functions.php:3075 classes/dlg.php:43 classes/dlg.php:162
+#: classes/dlg.php:185 classes/dlg.php:222 classes/dlg.php:508
+#: classes/dlg.php:543 classes/dlg.php:574 classes/dlg.php:608
+#: classes/dlg.php:620 classes/backend.php:105 classes/pref/users.php:106
+#: classes/pref/filters.php:108 classes/pref/feeds.php:1527
+#: classes/pref/feeds.php:1598 plugins/import_export/init.php:407
+#: plugins/import_export/init.php:431 plugins/share/init.php:67
+#: plugins/updater/init.php:329
+msgid "Close this window"
+msgstr "Tanca la finestra"
+
+#: include/functions.php:3309
+#, fuzzy
+msgid "(edit note)"
+msgstr "edita la nota"
+
+#: include/functions.php:3542
+msgid "unknown type"
+msgstr "tipus desconegut"
+
+#: include/functions.php:3592
+#, fuzzy
+msgid "Attachments"
+msgstr "Adjuncions:"
+
 #: include/localized_schema.php:4
 msgid "Title or Content"
 msgstr "Títol o contingut"
@@ -994,9 +955,8 @@ msgstr "Buida els articles"
 msgid "Set starred"
 msgstr "Marca'l com a destacat"
 
-#: include/localized_schema.php:12 js/viewfeed.js:501 js/viewfeed.js:490
-#: js/viewfeed.js:496 js/viewfeed.js:478 plugins/digest/digest.js:264
-#: plugins/digest/digest.js:736
+#: include/localized_schema.php:12 js/viewfeed.js:478
+#: plugins/digest/digest.js:264 plugins/digest/digest.js:736
 msgid "Publish article"
 msgstr "Publica l'article"
 
@@ -1004,8 +964,7 @@ msgstr "Publica l'article"
 msgid "Assign tags"
 msgstr "Assigna etiquetes"
 
-#: include/localized_schema.php:14 js/viewfeed.js:1962 js/viewfeed.js:1935
-#: js/viewfeed.js:1799 js/viewfeed.js:1809
+#: include/localized_schema.php:14 js/viewfeed.js:1809
 msgid "Assign label"
 msgstr "Assigna-li l'etiqueta"
 
@@ -1156,10 +1115,6 @@ msgstr "Salta automàticament al canal següent"
 msgid "Sort feeds by unread articles count"
 msgstr "Ordena els canals per articles no llegits"
 
-#: include/localized_schema.php:45
-msgid "Reverse headline order (oldest first)"
-msgstr "Inverteix l'ordre de les capçaleres (les més antigues les primeres)"
-
 #: include/localized_schema.php:46
 msgid "Enable e-mail digest"
 msgstr "Habilita el resum diari de capçaleres per correu electrònic."
@@ -1208,7 +1163,8 @@ msgid "Group headlines in virtual feeds"
 msgstr "Agrupa les capçaleres en canals virtuals"
 
 #: include/localized_schema.php:57
-msgid "Do not show images in articles"
+#, fuzzy
+msgid "Hide images in articles"
 msgstr "No mostris imatges en els articles"
 
 #: include/localized_schema.php:58
@@ -1219,8 +1175,7 @@ msgstr ""
 msgid "User timezone"
 msgstr ""
 
-#: include/localized_schema.php:60 js/prefs.js:1856 js/prefs.js:1743
-#: js/prefs.js:1733
+#: include/localized_schema.php:60 js/prefs.js:1733
 #, fuzzy
 msgid "Customize stylesheet"
 msgstr "URL de la fulla d'estils personalitzada."
@@ -1243,7 +1198,7 @@ msgstr ""
 msgid "Assign articles to labels automatically"
 msgstr "Marca els articles com a llegits automàticament."
 
-#: include/login_form.php:185 classes/handler/public.php:485
+#: include/login_form.php:185 classes/handler/public.php:459
 msgid "Language:"
 msgstr "Idioma:"
 
@@ -1252,8 +1207,8 @@ msgstr "Idioma:"
 msgid "Profile:"
 msgstr "Fitxer:"
 
-#: include/login_form.php:197 classes/handler/public.php:208
-#: classes/rpc.php:147 classes/dlg.php:116
+#: include/login_form.php:197 classes/handler/public.php:212
+#: classes/rpc.php:64 classes/dlg.php:98
 #, fuzzy
 msgid "Default profile"
 msgstr "Nombre maximal d'articles par défaut"
@@ -1267,190 +1222,172 @@ msgstr ""
 msgid "Article not found."
 msgstr "No s'ha trobat el canal."
 
-#: classes/handler/public.php:420 classes/pref/feeds.php:1480
+#: classes/handler/public.php:394 plugins/bookmarklets/init.php:38
 #, fuzzy
 msgid "Share with Tiny Tiny RSS"
 msgstr "Torna a Tiny Tiny RSS"
 
-#: classes/handler/public.php:428
+#: classes/handler/public.php:402
 msgid "Title:"
 msgstr "Titre&nbsp;:"
 
-#: classes/handler/public.php:430 classes/dlg.php:667
-#: classes/pref/feeds.php:509 classes/pref/feeds.php:762
-#: plugins/instances/instances.php:100 plugins/instances/init.php:215
+#: classes/handler/public.php:404 classes/dlg.php:667
+#: classes/pref/feeds.php:505 classes/pref/feeds.php:722
+#: plugins/instances/init.php:215
 msgid "URL:"
 msgstr "URL:"
 
-#: classes/handler/public.php:432
+#: classes/handler/public.php:406
 #, fuzzy
 msgid "Content:"
 msgstr "Contingut"
 
-#: classes/handler/public.php:434
+#: classes/handler/public.php:408
 #, fuzzy
 msgid "Labels:"
 msgstr "Etiquetes"
 
-#: classes/handler/public.php:453
+#: classes/handler/public.php:427
 msgid "Shared article will appear in the Published feed."
 msgstr ""
 
-#: classes/handler/public.php:455
+#: classes/handler/public.php:429
 msgid "Share"
 msgstr ""
 
-#: classes/handler/public.php:456 classes/handler/public.php:498
-#: classes/dlg.php:315 classes/dlg.php:366 classes/dlg.php:426
-#: classes/dlg.php:457 classes/dlg.php:652 classes/dlg.php:702
-#: classes/dlg.php:774 classes/pref/users.php:194 classes/pref/labels.php:81
-#: classes/pref/filters.php:342 classes/pref/filters.php:722
-#: classes/pref/filters.php:791 classes/pref/filters.php:858
-#: classes/pref/feeds.php:729 classes/pref/feeds.php:880
-#: plugins/mail/mail.php:126 plugins/note/note.php:49
-#: plugins/instances/instances.php:136
+#: classes/handler/public.php:430 classes/handler/public.php:472
+#: classes/dlg.php:297 classes/dlg.php:350 classes/dlg.php:410
+#: classes/dlg.php:441 classes/dlg.php:652 classes/dlg.php:702
+#: classes/dlg.php:751 classes/pref/users.php:194 classes/pref/labels.php:81
+#: classes/pref/filters.php:349 classes/pref/filters.php:729
+#: classes/pref/filters.php:798 classes/pref/filters.php:865
+#: classes/pref/feeds.php:689 classes/pref/feeds.php:829
+#: plugins/mail/init.php:132 plugins/note/init.php:55
+#: plugins/instances/init.php:251
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#: classes/handler/public.php:477
+#: classes/handler/public.php:451
 #, fuzzy
 msgid "Not logged in"
 msgstr "Última connexió el"
 
-#: classes/handler/public.php:537
+#: classes/handler/public.php:511
 msgid "Incorrect username or password"
 msgstr "El nom d'usuari o la contrasenya és incorrecte"
 
-#: classes/handler/public.php:573 classes/handler/public.php:670
+#: classes/handler/public.php:547 classes/handler/public.php:644
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "Ja esteu subscrit a <b>%s</b>."
 
-#: classes/handler/public.php:576 classes/handler/public.php:661
+#: classes/handler/public.php:550 classes/handler/public.php:635
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "Subscrit a <b>%s</b>."
 
-#: classes/handler/public.php:579 classes/handler/public.php:664
+#: classes/handler/public.php:553 classes/handler/public.php:638
 #, fuzzy, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "Ja esteu subscrit a <b>%s</b>."
 
-#: classes/handler/public.php:582 classes/handler/public.php:667
+#: classes/handler/public.php:556 classes/handler/public.php:641
 #, fuzzy, php-format
 msgid "No feeds found in <b>%s</b>."
 msgstr "No s'ha trobat cap canal."
 
-#: classes/handler/public.php:585 classes/handler/public.php:673
+#: classes/handler/public.php:559 classes/handler/public.php:647
 #, fuzzy
 msgid "Multiple feed URLs found."
 msgstr "L'adreça URL del canal ha canviat."
 
-#: classes/handler/public.php:589 classes/handler/public.php:678
+#: classes/handler/public.php:563 classes/handler/public.php:652
 #, fuzzy, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr "Ja esteu subscrit a <b>%s</b>."
 
-#: classes/handler/public.php:607 classes/handler/public.php:696
+#: classes/handler/public.php:581 classes/handler/public.php:670
 #, fuzzy
 msgid "Subscribe to selected feed"
 msgstr "Us voleu donar de baixa dels canals seleccionats?"
 
-#: classes/handler/public.php:632 classes/handler/public.php:720
+#: classes/handler/public.php:606 classes/handler/public.php:694
 msgid "Edit subscription options"
 msgstr "Edita les opcions de les subscripcions"
 
-#: classes/auth/internal.php:45 plugins/auth_internal/init.php:62
-#, fuzzy
-msgid "Please enter your one time password:"
-msgstr "Si us plau, escriviu una nota per aquest article:"
-
-#: classes/auth/internal.php:168 plugins/auth_internal/init.php:185
-msgid "Password has been changed."
-msgstr "S'ha modificat la contrasenya."
-
-#: classes/auth/internal.php:170
-msgid "Old password is incorrect."
-msgstr "La contrasenya antiga és incorrecta."
-
-#: classes/dlg.php:26
-#, fuzzy
-msgid "Prepare data"
-msgstr "Desa"
-
-#: classes/dlg.php:40
+#: classes/dlg.php:22
 msgid ""
 "If you have imported labels and/or filters, you might need to reload "
 "preferences to see your new data."
 msgstr ""
 
-#: classes/dlg.php:73 classes/pref/users.php:378 classes/pref/labels.php:272
-#: classes/pref/filters.php:223 classes/pref/filters.php:270
-#: classes/pref/filters.php:571 classes/pref/filters.php:650
-#: classes/pref/filters.php:677 classes/pref/feeds.php:1274
-#: classes/pref/feeds.php:1583 classes/pref/feeds.php:1652
-#: plugins/instances/instances.php:172
+#: classes/dlg.php:55 classes/pref/users.php:378 classes/pref/labels.php:272
+#: classes/pref/filters.php:230 classes/pref/filters.php:277
+#: classes/pref/filters.php:578 classes/pref/filters.php:657
+#: classes/pref/filters.php:684 classes/pref/feeds.php:1202
+#: classes/pref/feeds.php:1472 classes/pref/feeds.php:1541
+#: plugins/instances/init.php:287
 #, fuzzy
 msgid "Select"
 msgstr "Selecciona:"
 
-#: classes/dlg.php:76 classes/feeds.php:92 classes/pref/users.php:381
-#: classes/pref/labels.php:275 classes/pref/filters.php:226
-#: classes/pref/filters.php:273 classes/pref/filters.php:574
-#: classes/pref/filters.php:653 classes/pref/filters.php:680
-#: classes/pref/feeds.php:1277 classes/pref/feeds.php:1586
-#: classes/pref/feeds.php:1655 plugins/instances/instances.php:175
+#: classes/dlg.php:58 classes/feeds.php:92 classes/pref/users.php:381
+#: classes/pref/labels.php:275 classes/pref/filters.php:233
+#: classes/pref/filters.php:280 classes/pref/filters.php:581
+#: classes/pref/filters.php:660 classes/pref/filters.php:687
+#: classes/pref/feeds.php:1205 classes/pref/feeds.php:1475
+#: classes/pref/feeds.php:1544 plugins/instances/init.php:290
 msgid "All"
 msgstr "Tot"
 
-#: classes/dlg.php:78 classes/feeds.php:95 classes/pref/users.php:383
-#: classes/pref/labels.php:277 classes/pref/filters.php:228
-#: classes/pref/filters.php:275 classes/pref/filters.php:576
-#: classes/pref/filters.php:655 classes/pref/filters.php:682
-#: classes/pref/feeds.php:1279 classes/pref/feeds.php:1588
-#: classes/pref/feeds.php:1657 plugins/instances/instances.php:177
+#: classes/dlg.php:60 classes/feeds.php:95 classes/pref/users.php:383
+#: classes/pref/labels.php:277 classes/pref/filters.php:235
+#: classes/pref/filters.php:282 classes/pref/filters.php:583
+#: classes/pref/filters.php:662 classes/pref/filters.php:689
+#: classes/pref/feeds.php:1207 classes/pref/feeds.php:1477
+#: classes/pref/feeds.php:1546 plugins/instances/init.php:292
 msgid "None"
 msgstr "Cap"
 
-#: classes/dlg.php:87
+#: classes/dlg.php:69
 #, fuzzy
 msgid "Create profile"
 msgstr "Crea un filtre"
 
-#: classes/dlg.php:110 classes/dlg.php:140
+#: classes/dlg.php:92 classes/dlg.php:122
 #, fuzzy
 msgid "(active)"
 msgstr "Adaptatiu"
 
-#: classes/dlg.php:174
+#: classes/dlg.php:156
 #, fuzzy
 msgid "Remove selected profiles"
 msgstr "Esteu segur que voleu suprimir els filtres seleccionats?"
 
-#: classes/dlg.php:176
+#: classes/dlg.php:158
 #, fuzzy
 msgid "Activate profile"
 msgstr "Esteu segur que voleu suprimir els filtres seleccionats?"
 
-#: classes/dlg.php:186
+#: classes/dlg.php:168
 msgid "Public OPML URL"
 msgstr ""
 
-#: classes/dlg.php:191
+#: classes/dlg.php:173
 #, fuzzy
 msgid "Your Public OPML URL is:"
 msgstr "Enllaç als articles publicats del canal."
 
-#: classes/dlg.php:200 classes/dlg.php:587
+#: classes/dlg.php:182 classes/dlg.php:571
 #, fuzzy
 msgid "Generate new URL"
 msgstr "Canals generats"
 
-#: classes/dlg.php:212
+#: classes/dlg.php:194
 msgid "Notice"
 msgstr "Avís"
 
-#: classes/dlg.php:218
+#: classes/dlg.php:200
 msgid ""
 "Update daemon is enabled in configuration, but daemon process is not "
 "running, which prevents all feeds from updating. Please start the daemon "
@@ -1461,11 +1398,11 @@ msgstr ""
 "us plau, engegueu el procés del daemon o contacteu amb el responsable "
 "pertinent."
 
-#: classes/dlg.php:222 classes/dlg.php:231
+#: classes/dlg.php:204 classes/dlg.php:213
 msgid "Last update:"
 msgstr "Última actualització:"
 
-#: classes/dlg.php:227
+#: classes/dlg.php:209
 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 "
@@ -1475,161 +1412,164 @@ msgstr ""
 "un problema com la caiguda. Si us plau, reviseu dels processos del daemon o "
 "contacteu amb el seu propietari."
 
-#: classes/dlg.php:252 classes/dlg.php:261
+#: classes/dlg.php:234 classes/dlg.php:243
 #, fuzzy
 msgid "Feed or site URL"
 msgstr "Canal"
 
-#: classes/dlg.php:267 classes/dlg.php:738 classes/pref/feeds.php:531
-#: classes/pref/feeds.php:775
+#: classes/dlg.php:249 classes/dlg.php:715 classes/pref/feeds.php:527
+#: classes/pref/feeds.php:735
 msgid "Place in category:"
 msgstr "Posa'l a la categoria:"
 
-#: classes/dlg.php:275
+#: classes/dlg.php:257
 #, fuzzy
 msgid "Available feeds"
 msgstr "Tots els canals"
 
-#: classes/dlg.php:287 classes/pref/users.php:155 classes/pref/feeds.php:561
-#: classes/pref/feeds.php:811
+#: classes/dlg.php:269 classes/pref/users.php:155 classes/pref/feeds.php:557
+#: classes/pref/feeds.php:771
 msgid "Authentication"
 msgstr "Autenticació"
 
-#: classes/dlg.php:291 classes/dlg.php:752 classes/pref/users.php:438
-#: classes/pref/feeds.php:567 classes/pref/feeds.php:815
+#: classes/dlg.php:273 classes/dlg.php:729 classes/pref/users.php:438
+#: classes/pref/feeds.php:563 classes/pref/feeds.php:775
 msgid "Login"
 msgstr "Entra"
 
-#: classes/dlg.php:294 classes/dlg.php:755 classes/pref/prefs.php:200
-#: classes/pref/feeds.php:573 classes/pref/feeds.php:821
+#: classes/dlg.php:276 classes/dlg.php:732 classes/pref/prefs.php:196
+#: classes/pref/feeds.php:569 classes/pref/feeds.php:781
 #, fuzzy
 msgid "Password"
 msgstr "Contrasenya:"
 
-#: classes/dlg.php:304
+#: classes/dlg.php:286
 msgid "This feed requires authentication."
 msgstr "Aquest canal requereix autenticació."
 
-#: classes/dlg.php:309 classes/dlg.php:364 classes/dlg.php:773
+#: classes/dlg.php:291 classes/dlg.php:348 classes/dlg.php:750
 msgid "Subscribe"
 msgstr "Subscriu-t'hi"
 
-#: classes/dlg.php:312
+#: classes/dlg.php:294
 #, fuzzy
 msgid "More feeds"
 msgstr "Més canals"
 
-#: classes/dlg.php:336 classes/dlg.php:425 classes/pref/users.php:368
-#: classes/pref/filters.php:567 classes/pref/feeds.php:1270 js/tt-rss.js:234
-#: js/tt-rss.js:187 js/tt-rss.js:166
+#: classes/dlg.php:318 classes/dlg.php:409 classes/pref/users.php:368
+#: classes/pref/filters.php:574 classes/pref/feeds.php:1198 js/tt-rss.js:166
 msgid "Search"
 msgstr "Cerca"
 
-#: classes/dlg.php:340
+#: classes/dlg.php:322
 #, fuzzy
 msgid "Popular feeds"
 msgstr "mostra els canals"
 
-#: classes/dlg.php:341
+#: classes/dlg.php:323
 #, fuzzy
 msgid "Feed archive"
 msgstr "Accions dels canals"
 
-#: classes/dlg.php:344
+#: classes/dlg.php:326
 #, fuzzy
 msgid "limit:"
 msgstr "Límit:"
 
-#: classes/dlg.php:365 classes/pref/users.php:394 classes/pref/labels.php:284
-#: classes/pref/filters.php:332 classes/pref/filters.php:589
-#: classes/pref/feeds.php:702 plugins/instances/instances.php:182
+#: classes/dlg.php:349 classes/pref/users.php:394 classes/pref/labels.php:284
+#: classes/pref/filters.php:339 classes/pref/filters.php:596
+#: classes/pref/feeds.php:662 plugins/instances/init.php:297
 msgid "Remove"
 msgstr "Suprimeix"
 
-#: classes/dlg.php:376
+#: classes/dlg.php:360
 msgid "Look for"
 msgstr "Mirar-ho per"
 
-#: classes/dlg.php:384
+#: classes/dlg.php:368
 msgid "Limit search to:"
 msgstr "Limita la cerca a:"
 
-#: classes/dlg.php:400
+#: classes/dlg.php:384
 msgid "This feed"
 msgstr "Aquest canal"
 
-#: classes/dlg.php:432
+#: classes/dlg.php:416
 msgid "Tags for this article (separated by commas):"
 msgstr "Etiquetes per aquest article (separades per comes):"
 
-#: classes/dlg.php:455 classes/dlg.php:650 classes/pref/users.php:192
-#: classes/pref/labels.php:79 classes/pref/filters.php:339
-#: classes/pref/feeds.php:728 classes/pref/feeds.php:877
-#: plugins/note/note.php:47 plugins/instances/instances.php:133
-#: plugins/nsfw/init.php:86 plugins/owncloud/init.php:62
+#: classes/dlg.php:439 classes/dlg.php:650 classes/pref/users.php:192
+#: classes/pref/labels.php:79 classes/pref/filters.php:346
+#: classes/pref/feeds.php:688 classes/pref/feeds.php:826
+#: plugins/nsfw/init.php:86 plugins/note/init.php:53
+#: plugins/owncloud/init.php:62 plugins/instances/init.php:248
 msgid "Save"
 msgstr "Desa"
 
-#: classes/dlg.php:463
+#: classes/dlg.php:447
 #, fuzzy
 msgid "Tag Cloud"
 msgstr "Núvol d'etiquetes"
 
-#: classes/dlg.php:532
+#: classes/dlg.php:516
 msgid "Select item(s) by tags"
 msgstr ""
 
-#: classes/dlg.php:535
+#: classes/dlg.php:519
 msgid "Match:"
 msgstr "Correspondance&nbsp;:"
 
-#: classes/dlg.php:537
+#: classes/dlg.php:521
 msgid "Any"
 msgstr ""
 
-#: classes/dlg.php:540
+#: classes/dlg.php:524
 #, fuzzy
 msgid "All tags."
 msgstr "sense etiqueta"
 
-#: classes/dlg.php:542
+#: classes/dlg.php:526
 msgid "Which Tags?"
 msgstr ""
 
-#: classes/dlg.php:555
+#: classes/dlg.php:539
 #, fuzzy
 msgid "Display entries"
 msgstr "mostra els canals"
 
-#: classes/dlg.php:567 classes/feeds.php:129
+#: classes/dlg.php:551 classes/feeds.php:133
 #, fuzzy
 msgid "View as RSS"
 msgstr "Visualitza les etiquetes"
 
-#: classes/dlg.php:578
+#: classes/dlg.php:562
 msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 
-#: classes/dlg.php:606 plugins/updater/updater.php:276
+#: classes/dlg.php:591 plugins/updater/init.php:303
 #, fuzzy, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "Hi ha una nova versió de Tiny Tiny RSS!"
 
-#: classes/dlg.php:614
+#: classes/dlg.php:599
 msgid ""
 "You can update using built-in updater in the Preferences or by using update."
 "php"
 msgstr ""
 
-#: classes/dlg.php:618 classes/pref/users.php:390
+#: classes/dlg.php:603 classes/pref/users.php:390
 #, fuzzy
 msgid "Details"
 msgstr "Diàriament"
 
-#: classes/dlg.php:620
+#: classes/dlg.php:605
 msgid "Download"
 msgstr ""
 
+#: classes/dlg.php:613
+msgid "Error receiving version information or no new version available."
+msgstr ""
+
 #: classes/dlg.php:634
 #, php-format
 msgid ""
@@ -1638,34 +1578,31 @@ msgid ""
 "\" href=\"%s\">This file</a> can be used as a baseline."
 msgstr ""
 
-#: classes/dlg.php:661 plugins/instances/instances.php:92
-#: plugins/instances/init.php:207
+#: classes/dlg.php:661 plugins/instances/init.php:207
 msgid "Instance"
 msgstr ""
 
-#: classes/dlg.php:670 plugins/instances/instances.php:103
-#: plugins/instances/instances.php:200 plugins/instances/init.php:218
+#: classes/dlg.php:670 plugins/instances/init.php:218
+#: plugins/instances/init.php:315
 msgid "Instance URL"
 msgstr ""
 
-#: classes/dlg.php:680 plugins/instances/instances.php:114
-#: plugins/instances/init.php:229
+#: classes/dlg.php:680 plugins/instances/init.php:229
 #, fuzzy
 msgid "Access key:"
 msgstr "Nivell d'accés:"
 
-#: classes/dlg.php:683 plugins/instances/instances.php:117
-#: plugins/instances/instances.php:201 plugins/instances/init.php:232
+#: classes/dlg.php:683 plugins/instances/init.php:232
+#: plugins/instances/init.php:316
 #, fuzzy
 msgid "Access key"
 msgstr "Nivell d'accés"
 
-#: classes/dlg.php:687 plugins/instances/instances.php:121
-#: plugins/instances/init.php:236
+#: classes/dlg.php:687 plugins/instances/init.php:236
 msgid "Use one access key for both linked instances."
 msgstr ""
 
-#: classes/dlg.php:695 plugins/instances/instances.php:129
+#: classes/dlg.php:695 plugins/instances/init.php:244
 #, fuzzy
 msgid "Generate new key"
 msgstr "Canals generats"
@@ -1675,26 +1612,24 @@ msgstr "Canals generats"
 msgid "Create link"
 msgstr "Crea"
 
-#: classes/dlg.php:717
-#, php-format
-msgid ""
-"Could not upload file. You might need to adjust upload_max_filesize\n"
-"\t\t\t\tin PHP.ini (current value = %s)"
-msgstr ""
-
-#: classes/dlg.php:735
+#: classes/dlg.php:712
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr ""
 
-#: classes/dlg.php:744
+#: classes/dlg.php:721
 msgid "Feeds to subscribe, One per line"
 msgstr ""
 
-#: classes/dlg.php:766
+#: classes/dlg.php:743
 #, fuzzy
 msgid "Feeds require authentication."
 msgstr "Aquest canal requereix autenticació."
 
+#: classes/feeds.php:68
+#, fuzzy
+msgid "Visit the website"
+msgstr "Visiteu el web oficial"
+
 #: classes/feeds.php:83
 #, fuzzy
 msgid "View as RSS feed"
@@ -1708,6 +1643,11 @@ msgstr "Selecciona:"
 msgid "Invert"
 msgstr "Inverteix"
 
+#: classes/feeds.php:101
+#, fuzzy
+msgid "More..."
+msgstr "Ouverture de l'aide..."
+
 #: classes/feeds.php:103
 msgid "Selection toggle:"
 msgstr "Commuta la selecció"
@@ -1731,43 +1671,43 @@ msgstr "Data de l'article"
 msgid "Move back"
 msgstr "Vés enrere"
 
-#: classes/feeds.php:118 classes/pref/filters.php:235
-#: classes/pref/filters.php:282 classes/pref/filters.php:662
-#: classes/pref/filters.php:689
+#: classes/feeds.php:118 classes/pref/filters.php:242
+#: classes/pref/filters.php:289 classes/pref/filters.php:669
+#: classes/pref/filters.php:696
 #, fuzzy
 msgid "Delete"
 msgstr "Per defecte"
 
-#: classes/feeds.php:122 plugins/mail/mail.php:22
+#: classes/feeds.php:125 plugins/mail/init.php:28
 #, fuzzy
 msgid "Forward by email"
 msgstr "Marca l'article"
 
-#: classes/feeds.php:125
+#: classes/feeds.php:129
 msgid "Feed:"
 msgstr "Flux&nbsp;:"
 
-#: classes/feeds.php:190 classes/feeds.php:844
+#: classes/feeds.php:196 classes/feeds.php:790
 msgid "Feed not found."
 msgstr "No s'ha trobat el canal."
 
-#: classes/feeds.php:434 classes/feeds.php:516
+#: classes/feeds.php:403 classes/feeds.php:493
 msgid "mark as read"
 msgstr "Marca'l com a llegit"
 
-#: classes/feeds.php:739
+#: classes/feeds.php:691
 msgid "No unread articles found to display."
 msgstr "No es poden mostrar els articles no llegits perquè no n'hi ha."
 
-#: classes/feeds.php:742
+#: classes/feeds.php:694
 msgid "No updated articles found to display."
 msgstr "No hi ha cap article actualitzat."
 
-#: classes/feeds.php:745
+#: classes/feeds.php:697
 msgid "No starred articles found to display."
 msgstr "No hi ha articles marcats per mostrar."
 
-#: classes/feeds.php:749
+#: classes/feeds.php:701
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
@@ -1775,11 +1715,42 @@ msgstr ""
 "No s'han trobat articles per a mostrar. Podeu assignar articles a etiquetes "
 "manualment (mireu el menú Accions) o utilitzeu un filtre."
 
-#: classes/feeds.php:751
+#: classes/feeds.php:703
 msgid "No articles found to display."
 msgstr "No s'han trobat articles per a mostrar."
 
-#: classes/backend.php:26
+#: classes/feeds.php:718 classes/feeds.php:899
+#, fuzzy, php-format
+msgid "Feeds last updated at %s"
+msgstr "Erreurs de mise à jour"
+
+#: classes/feeds.php:728 classes/feeds.php:909
+msgid "Some feeds have update errors (click for details)"
+msgstr ""
+"S'han detectat errors en alguns canals (feu clic aquí per veure'n els "
+"detalls)"
+
+#: classes/feeds.php:889
+msgid "No feed selected."
+msgstr "No heu seleccionat cap canal."
+
+#: classes/backend.php:34
+msgid "Keyboard Shortcuts"
+msgstr "Dreceres de teclat"
+
+#: classes/backend.php:57
+msgid "Shift"
+msgstr ""
+
+#: classes/backend.php:60
+msgid "Ctrl"
+msgstr ""
+
+#: classes/backend.php:84
+msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
+msgstr ""
+
+#: classes/backend.php:99
 msgid "Help topic not found."
 msgstr "No s'ha trobat el tema a l'ajuda."
 
@@ -1831,16 +1802,15 @@ msgstr "S'està afegint el canal..."
 msgid "Processing category: %s"
 msgstr "Posa'l a la categoria:"
 
-#: classes/opml.php:467
+#: classes/opml.php:468
 msgid "Error: please upload OPML file."
 msgstr "Error: si us plau carregueu el fitxer OPML."
 
-#: classes/opml.php:474
+#: classes/opml.php:475
 msgid "Error while parsing document."
 msgstr "Error mentre s'analitza el document."
 
-#: classes/pref/users.php:6 plugins/instances/instances.php:42
-#: plugins/instances/init.php:157
+#: classes/pref/users.php:6 plugins/instances/init.php:157
 msgid "Your access level is insufficient to open this tab."
 msgstr "No teniu  permisos per a obrir aquesta pestanya."
 
@@ -1880,8 +1850,8 @@ msgstr "Nivell d'accés:"
 msgid "Change password to"
 msgstr "Nova contrasenya"
 
-#: classes/pref/users.php:177 classes/pref/feeds.php:581
-#: classes/pref/feeds.php:827
+#: classes/pref/users.php:177 classes/pref/feeds.php:577
+#: classes/pref/feeds.php:787
 msgid "Options"
 msgstr "Opcions"
 
@@ -1922,8 +1892,12 @@ msgstr "S'està notificant <b>%s</b>."
 msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] Notificació de canvi de contrasenya"
 
-#: classes/pref/users.php:392 classes/pref/filters.php:586
-#: plugins/instances/instances.php:181
+#: classes/pref/users.php:386
+msgid "Create user"
+msgstr "Crea un usuari"
+
+#: classes/pref/users.php:392 classes/pref/filters.php:593
+#: plugins/instances/init.php:296
 msgid "Edit"
 msgstr "Edita"
 
@@ -1939,15 +1913,15 @@ msgstr "Permisos"
 msgid "Last login"
 msgstr "Última connexió"
 
-#: classes/pref/users.php:461 plugins/instances/instances.php:222
+#: classes/pref/users.php:462 plugins/instances/init.php:337
 msgid "Click to edit"
 msgstr "Feu clic per editar"
 
-#: classes/pref/users.php:481
+#: classes/pref/users.php:482
 msgid "No users defined."
 msgstr "No s'han definit els usuaris."
 
-#: classes/pref/users.php:483
+#: classes/pref/users.php:484
 msgid "No matching users found."
 msgstr "No s'ha trobat cap usuari que coinicideixi. "
 
@@ -1989,86 +1963,90 @@ msgstr "No s'ha trobat cap fitxer que coincideixi."
 msgid "No recent articles matching this filter have been found."
 msgstr "No s'ha trobat cap fitxer que coincideixi."
 
-#: classes/pref/filters.php:218 classes/pref/filters.php:645
-#: classes/pref/filters.php:760
+#: classes/pref/filters.php:98
+msgid ""
+"Complex expressions might not give results while testing due to issues with "
+"database server regexp implementation."
+msgstr ""
+
+#: classes/pref/filters.php:225 classes/pref/filters.php:652
+#: classes/pref/filters.php:767
 msgid "Match"
 msgstr "Coincidència"
 
-#: classes/pref/filters.php:232 classes/pref/filters.php:279
-#: classes/pref/filters.php:659 classes/pref/filters.php:686
+#: classes/pref/filters.php:239 classes/pref/filters.php:286
+#: classes/pref/filters.php:666 classes/pref/filters.php:693
 msgid "Add"
 msgstr ""
 
-#: classes/pref/filters.php:265 classes/pref/filters.php:672
+#: classes/pref/filters.php:272 classes/pref/filters.php:679
 #, fuzzy
 msgid "Apply actions"
 msgstr "Accions dels canals"
 
-#: classes/pref/filters.php:315 classes/pref/filters.php:701
+#: classes/pref/filters.php:322 classes/pref/filters.php:708
 msgid "Enabled"
 msgstr "Activat"
 
-#: classes/pref/filters.php:324 classes/pref/filters.php:704
+#: classes/pref/filters.php:331 classes/pref/filters.php:711
 #, fuzzy
 msgid "Match any rule"
 msgstr "Basat en:"
 
-#: classes/pref/filters.php:336 classes/pref/filters.php:716
+#: classes/pref/filters.php:343 classes/pref/filters.php:723
 msgid "Test"
 msgstr "Tester"
 
-#: classes/pref/filters.php:368
+#: classes/pref/filters.php:375
 #, php-format
 msgid "%s on %s in %s"
 msgstr ""
 
-#: classes/pref/filters.php:583
+#: classes/pref/filters.php:590
 msgid "Combine"
 msgstr ""
 
-#: classes/pref/filters.php:593 classes/pref/feeds.php:1329
+#: classes/pref/filters.php:600 classes/pref/feeds.php:1257
 msgid "Rescore articles"
 msgstr "Canvia la puntuació dels articles"
 
-#: classes/pref/filters.php:719
+#: classes/pref/filters.php:726
 msgid "Create"
 msgstr "Crea"
 
-#: classes/pref/filters.php:769
+#: classes/pref/filters.php:776
 msgid "on field"
 msgstr "al camp"
 
-#: classes/pref/filters.php:775 js/PrefFilterTree.js:29
+#: classes/pref/filters.php:782 js/PrefFilterTree.js:29
 #: plugins/digest/digest.js:241
 msgid "in"
 msgstr "a"
 
-#: classes/pref/filters.php:788
+#: classes/pref/filters.php:795
 #, fuzzy
 msgid "Save rule"
 msgstr "Desa"
 
-#: classes/pref/filters.php:788 js/functions.js:1067 js/functions.js:1063
-#: js/functions.js:1071 js/functions.js:1073
+#: classes/pref/filters.php:795 js/functions.js:1078
 #, fuzzy
 msgid "Add rule"
 msgstr "S'està afegint la categoria..."
 
-#: classes/pref/filters.php:811
+#: classes/pref/filters.php:818
 msgid "Perform Action"
 msgstr "Acció a realitzar:"
 
-#: classes/pref/filters.php:837
+#: classes/pref/filters.php:844
 msgid "with parameters:"
 msgstr "amb els paràmetres:"
 
-#: classes/pref/filters.php:855
+#: classes/pref/filters.php:862
 #, fuzzy
 msgid "Save action"
 msgstr "Quadre d'accions"
 
-#: classes/pref/filters.php:855 js/functions.js:1093 js/functions.js:1089
-#: js/functions.js:1097 js/functions.js:1099
+#: classes/pref/filters.php:862 js/functions.js:1104
 #, fuzzy
 msgid "Add action"
 msgstr "Accions dels canals"
@@ -2089,153 +2067,188 @@ msgstr "Les contrasenyes no coincideixen."
 msgid "Function not supported by authentication module."
 msgstr ""
 
-#: classes/pref/prefs.php:68
+#: classes/pref/prefs.php:63
 msgid "The configuration was saved."
 msgstr "S'ha desat la configuració"
 
-#: classes/pref/prefs.php:83
+#: classes/pref/prefs.php:77
 #, php-format
 msgid "Unknown option: %s"
 msgstr "Es desconeix l'opció %s"
 
-#: classes/pref/prefs.php:97
+#: classes/pref/prefs.php:91
 #, fuzzy
 msgid "Your personal data has been saved."
 msgstr "S'ha modificat la contrasenya."
 
-#: classes/pref/prefs.php:137
+#: classes/pref/prefs.php:131
 #, fuzzy
 msgid "Personal data / Authentication"
 msgstr "Autenticació"
 
-#: classes/pref/prefs.php:157
+#: classes/pref/prefs.php:151
 msgid "Personal data"
 msgstr "Dades personals"
 
-#: classes/pref/prefs.php:167
+#: classes/pref/prefs.php:161
 msgid "Full name"
 msgstr ""
 
-#: classes/pref/prefs.php:171
+#: classes/pref/prefs.php:165
 msgid "E-mail"
 msgstr "Adreça electrònica"
 
-#: classes/pref/prefs.php:177
+#: classes/pref/prefs.php:171
 msgid "Access level"
 msgstr "Nivell d'accés"
 
-#: classes/pref/prefs.php:187
+#: classes/pref/prefs.php:181
 #, fuzzy
 msgid "Save data"
 msgstr "Desa"
 
-#: classes/pref/prefs.php:207
+#: classes/pref/prefs.php:203
 #, fuzzy
 msgid "Your password is at default value, please change it."
 msgstr ""
 "La contrasenya actual és la predeterminada,\n"
 "\t\t\t\t\t\t penseu en modificar-la."
 
-#: classes/pref/prefs.php:239
+#: classes/pref/prefs.php:235
 msgid "Old password"
 msgstr "Contrasenya antiga"
 
-#: classes/pref/prefs.php:242
+#: classes/pref/prefs.php:238
 msgid "New password"
 msgstr "Nova contrasenya"
 
-#: classes/pref/prefs.php:247
+#: classes/pref/prefs.php:243
 msgid "Confirm password"
 msgstr "Confirmeu la contrasenya"
 
-#: classes/pref/prefs.php:257
+#: classes/pref/prefs.php:253
 msgid "Change password"
 msgstr "Canvia la contrasenya"
 
-#: classes/pref/prefs.php:263
+#: classes/pref/prefs.php:259
 msgid "One time passwords / Authenticator"
 msgstr ""
 
-#: classes/pref/prefs.php:292 classes/pref/prefs.php:343
+#: classes/pref/prefs.php:288 classes/pref/prefs.php:339
 #, fuzzy
 msgid "Enter your password"
 msgstr "El nom d'usuari o la contrasenya és incorrecte"
 
-#: classes/pref/prefs.php:303
+#: classes/pref/prefs.php:299
 #, fuzzy
 msgid "Disable OTP"
 msgstr "(Desactivat)"
 
-#: classes/pref/prefs.php:309
+#: classes/pref/prefs.php:305
 msgid ""
 "You will need a compatible Authenticator to use this. Changing your password "
 "would automatically disable OTP."
 msgstr ""
 
-#: classes/pref/prefs.php:311
+#: classes/pref/prefs.php:307
 msgid "Scan the following code by the Authenticator application:"
 msgstr ""
 
-#: classes/pref/prefs.php:352
+#: classes/pref/prefs.php:348
 msgid "I have scanned the code and would like to enable OTP"
 msgstr ""
 
-#: classes/pref/prefs.php:360
+#: classes/pref/prefs.php:356
 #, fuzzy
 msgid "Enable OTP"
 msgstr "Activat"
 
-#: classes/pref/prefs.php:456
-msgid "Select theme"
-msgstr "Seleccioneu una interfície"
-
-#: classes/pref/prefs.php:508
+#: classes/pref/prefs.php:482
 #, fuzzy
 msgid "Customize"
 msgstr "URL de la fulla d'estils personalitzada."
 
-#: classes/pref/prefs.php:527 classes/pref/prefs.php:534
-#: classes/pref/prefs.php:539
+#: classes/pref/prefs.php:501 classes/pref/prefs.php:508
+#: classes/pref/prefs.php:513
 msgid "Yes"
 msgstr "Sí"
 
-#: classes/pref/prefs.php:529 classes/pref/prefs.php:539
+#: classes/pref/prefs.php:503 classes/pref/prefs.php:513
 msgid "No"
 msgstr "No"
 
-#: classes/pref/prefs.php:569
+#: classes/pref/prefs.php:543
 #, fuzzy
 msgid "Register"
 msgstr "Registrat"
 
-#: classes/pref/prefs.php:573
+#: classes/pref/prefs.php:547
 msgid "Clear"
 msgstr ""
 
-#: classes/pref/prefs.php:579
+#: classes/pref/prefs.php:553
 #, php-format
 msgid "Current server time: %s (UTC)"
 msgstr ""
 
-#: classes/pref/prefs.php:604
+#: classes/pref/prefs.php:582
 msgid "Save configuration"
 msgstr "Desa la configuració"
 
-#: classes/pref/prefs.php:607
+#: classes/pref/prefs.php:585
 #, fuzzy
 msgid "Manage profiles"
 msgstr "Crea un filtre"
 
-#: classes/pref/prefs.php:610
+#: classes/pref/prefs.php:588
 msgid "Reset to defaults"
 msgstr "Torna als paràmetres per defecte"
 
-#: classes/pref/prefs.php:622
+#: classes/pref/prefs.php:600
 #, fuzzy
 msgid "Show additional preferences"
 msgstr "Surt de les preferències"
 
-#: classes/pref/prefs.php:679 classes/pref/prefs.php:697
+#: classes/pref/prefs.php:612 classes/pref/prefs.php:614
+msgid "Plugins"
+msgstr ""
+
+#: classes/pref/prefs.php:642
+msgid "System plugins"
+msgstr ""
+
+#: classes/pref/prefs.php:646 classes/pref/prefs.php:695
+msgid "Plugin"
+msgstr ""
+
+#: classes/pref/prefs.php:647 classes/pref/prefs.php:696
+#, fuzzy
+msgid "Description"
+msgstr "description"
+
+#: classes/pref/prefs.php:648 classes/pref/prefs.php:697
+msgid "Version"
+msgstr ""
+
+#: classes/pref/prefs.php:649 classes/pref/prefs.php:698
+msgid "Author"
+msgstr ""
+
+#: classes/pref/prefs.php:682 classes/pref/prefs.php:733
+#, fuzzy
+msgid "Clear data"
+msgstr "Esborra les dades del canal"
+
+#: classes/pref/prefs.php:691
+msgid "User plugins"
+msgstr ""
+
+#: classes/pref/prefs.php:748
+#, fuzzy
+msgid "Enable selected plugins"
+msgstr "Habilita les icones dels canals."
+
+#: classes/pref/prefs.php:803 classes/pref/prefs.php:821
 #, fuzzy
 msgid "Incorrect password"
 msgstr "El nom d'usuari o la contrasenya és incorrecte"
@@ -2244,190 +2257,168 @@ msgstr "El nom d'usuari o la contrasenya és incorrecte"
 msgid "Check to enable field"
 msgstr "Seleccioneu-ho per activar els camps"
 
-#: classes/pref/feeds.php:59 classes/pref/feeds.php:180
-#: classes/pref/feeds.php:223 classes/pref/feeds.php:229
-#: classes/pref/feeds.php:254
+#: classes/pref/feeds.php:58 classes/pref/feeds.php:175
+#: classes/pref/feeds.php:217 classes/pref/feeds.php:223
+#: classes/pref/feeds.php:248
 #, fuzzy, php-format
 msgid "(%d feeds)"
 msgstr "Edita el canal"
 
-#: classes/pref/feeds.php:492 classes/pref/feeds.php:747
-msgid "Feed"
-msgstr "Canal"
-
-#: classes/pref/feeds.php:498
+#: classes/pref/feeds.php:494
 #, fuzzy
 msgid "Feed Title"
 msgstr "Títol"
 
-#: classes/pref/feeds.php:554 classes/pref/feeds.php:802
+#: classes/pref/feeds.php:550 classes/pref/feeds.php:762
 msgid "Article purging:"
 msgstr "Neteja d'articles:"
 
-#: classes/pref/feeds.php:577
+#: classes/pref/feeds.php:573
 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:593 classes/pref/feeds.php:831
+#: classes/pref/feeds.php:589 classes/pref/feeds.php:791
 #, fuzzy
 msgid "Hide from Popular feeds"
 msgstr "Amaga-ho de la llista de canals"
 
-#: classes/pref/feeds.php:604 classes/pref/feeds.php:836
-msgid "Right-to-left content"
-msgstr "Contingut escrit de dreta a esquerra"
-
-#: classes/pref/feeds.php:616 classes/pref/feeds.php:842
+#: classes/pref/feeds.php:601 classes/pref/feeds.php:797
 msgid "Include in e-mail digest"
 msgstr "Inclou-lo en el resum diari per correu electrònic"
 
-#: classes/pref/feeds.php:629 classes/pref/feeds.php:848
+#: classes/pref/feeds.php:614 classes/pref/feeds.php:803
 msgid "Always display image attachments"
 msgstr "Mostra les imatges adjuntes"
 
-#: classes/pref/feeds.php:643 classes/pref/feeds.php:856
+#: classes/pref/feeds.php:628 classes/pref/feeds.php:811
 msgid "Cache images locally"
 msgstr "Emmagatzema les imatges localment"
 
-#: classes/pref/feeds.php:656
-#, fuzzy
-msgid "Cache content locally"
-msgstr "Emmagatzema les imatges localment"
-
-#: classes/pref/feeds.php:668 classes/pref/feeds.php:862
+#: classes/pref/feeds.php:640 classes/pref/feeds.php:817
 #, fuzzy
 msgid "Mark updated articles as unread"
 msgstr "Esteu segur que voleu marcar tots els articles com a llegits?"
 
-#: classes/pref/feeds.php:680 classes/pref/feeds.php:868
-msgid "Mark posts as updated on content change"
-msgstr ""
-
-#: classes/pref/feeds.php:686
+#: classes/pref/feeds.php:646
 #, fuzzy
 msgid "Icon"
 msgstr "Action"
 
-#: classes/pref/feeds.php:700
+#: classes/pref/feeds.php:660
 msgid "Replace"
 msgstr ""
 
-#: classes/pref/feeds.php:719
+#: classes/pref/feeds.php:679
 #, fuzzy
 msgid "Resubscribe to push updates"
 msgstr "Subscrit als canals:"
 
-#: classes/pref/feeds.php:726
+#: classes/pref/feeds.php:686
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr ""
 
-#: classes/pref/feeds.php:741
+#: classes/pref/feeds.php:701
 msgid "Enable the options you wish to apply using checkboxes on the right:"
 msgstr ""
 
-#: classes/pref/feeds.php:1123 classes/pref/feeds.php:1176
+#: classes/pref/feeds.php:1051 classes/pref/feeds.php:1104
 msgid "All done."
 msgstr "Fet!"
 
-#: classes/pref/feeds.php:1231
+#: classes/pref/feeds.php:1159
 #, fuzzy
 msgid "Feeds with errors"
 msgstr "Editor de canals"
 
-#: classes/pref/feeds.php:1251
+#: classes/pref/feeds.php:1179
 #, fuzzy
 msgid "Inactive feeds"
 msgstr "Tots els canals"
 
-#: classes/pref/feeds.php:1288
+#: classes/pref/feeds.php:1216
 #, fuzzy
 msgid "Edit selected feeds"
 msgstr "S'estan purgant els canals seleccionats..."
 
-#: classes/pref/feeds.php:1290 classes/pref/feeds.php:1304
+#: classes/pref/feeds.php:1218 classes/pref/feeds.php:1232
 #, fuzzy
 msgid "Reset sort order"
 msgstr "Reinicia la contrasenya"
 
-#: classes/pref/feeds.php:1292 js/prefs.js:2021 js/prefs.js:1788
-#: js/prefs.js:1778
+#: classes/pref/feeds.php:1220 js/prefs.js:1778
 #, fuzzy
 msgid "Batch subscribe"
 msgstr "Dóna't de baixa"
 
-#: classes/pref/feeds.php:1297
+#: classes/pref/feeds.php:1225
 #, fuzzy
 msgid "Categories"
 msgstr "Catégorie&nbsp;:"
 
-#: classes/pref/feeds.php:1300
+#: classes/pref/feeds.php:1228
 #, fuzzy
 msgid "Add category"
 msgstr "S'està afegint la categoria..."
 
-#: classes/pref/feeds.php:1302
+#: classes/pref/feeds.php:1230
 #, fuzzy
 msgid "(Un)hide empty categories"
 msgstr "Edita les categories"
 
-#: classes/pref/feeds.php:1306
+#: classes/pref/feeds.php:1234
 #, fuzzy
 msgid "Remove selected"
 msgstr "Esteu segur que voleu suprimir els filtres seleccionats?"
 
-#: classes/pref/feeds.php:1320
+#: classes/pref/feeds.php:1248
 #, fuzzy
 msgid "More actions..."
 msgstr "Accions..."
 
-#: classes/pref/feeds.php:1324
+#: classes/pref/feeds.php:1252
 msgid "Manual purge"
 msgstr "Purger manuellement"
 
-#: classes/pref/feeds.php:1328
+#: classes/pref/feeds.php:1256
 msgid "Clear feed data"
 msgstr "Esborra les dades del canal"
 
-#: classes/pref/feeds.php:1379
-msgid "Import and export"
-msgstr ""
-
-#: classes/pref/feeds.php:1381
+#: classes/pref/feeds.php:1307
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1383
+#: classes/pref/feeds.php:1309
 msgid ""
 "Using OPML you can export and import your feeds, filters, labels and Tiny "
 "Tiny RSS settings."
 msgstr ""
 
-#: classes/pref/feeds.php:1385
+#: classes/pref/feeds.php:1311
 msgid "Only main settings profile can be migrated using OPML."
 msgstr ""
 
-#: classes/pref/feeds.php:1398
+#: classes/pref/feeds.php:1324
 #, fuzzy
 msgid "Import my OPML"
 msgstr "S'està important OPML (s'està utilitzant l'extensió DOMXML)..."
 
-#: classes/pref/feeds.php:1402
+#: classes/pref/feeds.php:1328
 msgid "Filename:"
 msgstr ""
 
-#: classes/pref/feeds.php:1404
+#: classes/pref/feeds.php:1330
 #, fuzzy
 msgid "Include settings"
 msgstr "Inclou-lo en el resum diari per correu electrònic"
 
-#: classes/pref/feeds.php:1408
+#: classes/pref/feeds.php:1334
 #, fuzzy
 msgid "Export OPML"
 msgstr "Exporta en format OPML"
 
-#: classes/pref/feeds.php:1412
+#: classes/pref/feeds.php:1338
 #, fuzzy
 msgid ""
 "Your OPML can be published publicly and can be subscribed by anyone who "
@@ -2436,42 +2427,22 @@ 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:1414
+#: classes/pref/feeds.php:1340
 msgid ""
 "Published OPML does not include your Tiny Tiny RSS settings, feeds that "
 "require authentication or feeds hidden from Popular feeds."
 msgstr ""
 
-#: classes/pref/feeds.php:1417
+#: classes/pref/feeds.php:1343
 msgid "Display published OPML URL"
 msgstr ""
 
-#: classes/pref/feeds.php:1420 plugins/import_export/init.php:66
-#, fuzzy
-msgid "Article archive"
-msgstr "Data de l'article"
-
-#: classes/pref/feeds.php:1422 plugins/import_export/init.php:68
-msgid ""
-"You can export and import your Starred and Archived articles for safekeeping "
-"or when migrating between tt-rss instances."
-msgstr ""
-
-#: classes/pref/feeds.php:1425
-#, fuzzy
-msgid "Export my data"
-msgstr "Exporta en format OPML"
-
-#: classes/pref/feeds.php:1440
-msgid "Import"
-msgstr "Importeu"
-
-#: classes/pref/feeds.php:1447
+#: classes/pref/feeds.php:1353
 #, fuzzy
 msgid "Firefox integration"
 msgstr "Integració al Firefox"
 
-#: classes/pref/feeds.php:1449
+#: classes/pref/feeds.php:1355
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
@@ -2479,49 +2450,25 @@ 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:1456
+#: classes/pref/feeds.php:1362
 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:1464
-msgid "Bookmarklets"
-msgstr ""
-
-#: classes/pref/feeds.php:1466 plugins/bookmarklets/init.php:24
-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 ""
-
-#: classes/pref/feeds.php:1470
-#, fuzzy, php-format
-msgid "Subscribe to %s in Tiny Tiny RSS?"
-msgstr "Torna a Tiny Tiny RSS"
-
-#: classes/pref/feeds.php:1474
-#, fuzzy
-msgid "Subscribe in Tiny Tiny RSS"
-msgstr "Torna a Tiny Tiny RSS"
-
-#: classes/pref/feeds.php:1476 plugins/bookmarklets/init.php:34
-msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
-msgstr ""
-
-#: classes/pref/feeds.php:1484
+#: classes/pref/feeds.php:1370
 #, 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:1486
+#: classes/pref/feeds.php:1372
 #, fuzzy
 msgid "Published articles and generated feeds"
 msgstr ""
 "Esteu segur que voleu canviar la puntuació dels articles en les etiquetes "
 "personalitzades?"
 
-#: classes/pref/feeds.php:1488
+#: classes/pref/feeds.php:1374
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the URL specified below."
@@ -2529,51 +2476,51 @@ 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:1494
+#: classes/pref/feeds.php:1380
 #, fuzzy
 msgid "Display URL"
 msgstr "afficher les étiquettes"
 
-#: classes/pref/feeds.php:1497
+#: classes/pref/feeds.php:1383
 msgid "Clear all generated URLs"
 msgstr ""
 
-#: classes/pref/feeds.php:1499
+#: classes/pref/feeds.php:1385
 #, fuzzy
 msgid "Articles shared by URL"
 msgstr "Marca l'article"
 
-#: classes/pref/feeds.php:1501
+#: classes/pref/feeds.php:1387
 msgid "You can disable all articles shared by unique URLs here."
 msgstr ""
 
-#: classes/pref/feeds.php:1504
+#: classes/pref/feeds.php:1390
 #, fuzzy
 msgid "Unshare all articles"
 msgstr "Articles mémorisés"
 
-#: classes/pref/feeds.php:1579
+#: classes/pref/feeds.php:1468
 #, 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:1616 classes/pref/feeds.php:1685
+#: classes/pref/feeds.php:1505 classes/pref/feeds.php:1574
 #, fuzzy
 msgid "Click to edit feed"
 msgstr "Feu clic per editar"
 
-#: classes/pref/feeds.php:1634 classes/pref/feeds.php:1705
+#: classes/pref/feeds.php:1523 classes/pref/feeds.php:1594
 #, fuzzy
 msgid "Unsubscribe from selected feeds"
 msgstr "Us voleu donar de baixa dels canals seleccionats?"
 
-#: classes/pref/feeds.php:1645
+#: classes/pref/feeds.php:1534
 msgid "These feeds have not been updated because of errors:"
 msgstr "Aquests canals no s'han actualitzat degut als següents errors:"
 
-#: plugins/pocket/pocket.php:24
+#: plugins/pocket/init.php:30
 msgid "Pocket"
 msgstr ""
 
@@ -2594,148 +2541,275 @@ msgstr ""
 msgid "Back to feeds"
 msgstr "Torna a la llista de canals."
 
+#: plugins/digest/digest_body.php:56
+msgid "Hello,"
+msgstr "Hola, "
+
 #: plugins/digest/digest_body.php:62
 msgid "Regular version"
 msgstr ""
 
-#: plugins/pinterest/pinterest.php:23
+#: plugins/nsfw/init.php:32 plugins/nsfw/init.php:43
+msgid "Not work safe (click to toggle)"
+msgstr ""
+
+#: plugins/nsfw/init.php:53
+msgid "NSFW Plugin"
+msgstr ""
+
+#: plugins/nsfw/init.php:80
+msgid "Tags to consider NSFW (comma-separated)"
+msgstr ""
+
+#: plugins/nsfw/init.php:101
+#, fuzzy
+msgid "Configuration saved."
+msgstr "S'ha desat la configuració"
+
+#: plugins/pinterest/init.php:29
 msgid "Pinterest"
 msgstr ""
 
-#: plugins/mail/mail.php:66 plugins/mail/mail.php:72 plugins/mail/init.php:72
-#: plugins/mail/init.php:78
+#: plugins/auth_internal/init.php:62
+#, fuzzy
+msgid "Please enter your one time password:"
+msgstr "Si us plau, escriviu una nota per aquest article:"
+
+#: plugins/auth_internal/init.php:185
+msgid "Password has been changed."
+msgstr "S'ha modificat la contrasenya."
+
+#: plugins/auth_internal/init.php:187
+msgid "Old password is incorrect."
+msgstr "La contrasenya antiga és incorrecta."
+
+#: plugins/bookmarklets/init.php:22
+msgid "Bookmarklets"
+msgstr ""
+
+#: plugins/bookmarklets/init.php:24
+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 ""
+
+#: plugins/bookmarklets/init.php:28
+#, fuzzy, php-format
+msgid "Subscribe to %s in Tiny Tiny RSS?"
+msgstr "Torna a Tiny Tiny RSS"
+
+#: plugins/bookmarklets/init.php:32
+#, fuzzy
+msgid "Subscribe in Tiny Tiny RSS"
+msgstr "Torna a Tiny Tiny RSS"
+
+#: plugins/bookmarklets/init.php:34
+msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
+msgstr ""
+
+#: plugins/import_export/init.php:64
+msgid "Import and export"
+msgstr ""
+
+#: plugins/import_export/init.php:66
+#, fuzzy
+msgid "Article archive"
+msgstr "Data de l'article"
+
+#: plugins/import_export/init.php:68
+msgid ""
+"You can export and import your Starred and Archived articles for safekeeping "
+"or when migrating between tt-rss instances."
+msgstr ""
+
+#: plugins/import_export/init.php:71
+#, fuzzy
+msgid "Export my data"
+msgstr "Exporta en format OPML"
+
+#: plugins/import_export/init.php:87
+msgid "Import"
+msgstr "Importeu"
+
+#: plugins/import_export/init.php:221
+#, fuzzy
+msgid "Could not import: incorrect schema version."
+msgstr ""
+"No s'ha pogut trobar el fitxer d'esquema necessari, es necessita la versió:"
+
+#: plugins/import_export/init.php:226
+msgid "Could not import: unrecognized document format."
+msgstr ""
+
+#: plugins/import_export/init.php:385
+#, php-format
+msgid "Finished: %d articles processed, %d imported, %d feeds created."
+msgstr ""
+
+#: plugins/import_export/init.php:391
+msgid "Could not load XML document."
+msgstr ""
+
+#: plugins/import_export/init.php:403
+#, fuzzy
+msgid "Prepare data"
+msgstr "Desa"
+
+#: plugins/import_export/init.php:424
+#, php-format
+msgid ""
+"Could not upload file. You might need to adjust upload_max_filesize\n"
+"\t\t\t\tin PHP.ini (current value = %s)"
+msgstr ""
+
+#: plugins/mail/init.php:72 plugins/mail/init.php:78
 msgid "[Forwarded]"
 msgstr ""
 
-#: plugins/mail/mail.php:66 plugins/mail/init.php:72
+#: plugins/mail/init.php:72
 #, fuzzy
 msgid "Multiple articles"
 msgstr "Tots els articles"
 
-#: plugins/mail/mail.php:87
+#: plugins/mail/init.php:93
 msgid "From:"
 msgstr ""
 
-#: plugins/mail/mail.php:96
+#: plugins/mail/init.php:102
 #, fuzzy
 msgid "To:"
 msgstr "Dalt"
 
-#: plugins/mail/mail.php:109
+#: plugins/mail/init.php:115
 #, fuzzy
 msgid "Subject:"
 msgstr "Selecciona:"
 
-#: plugins/mail/mail.php:125
+#: plugins/mail/init.php:131
 #, fuzzy
 msgid "Send e-mail"
 msgstr "Canvieu l'adreça electrònica"
 
-#: plugins/note/note.php:22 plugins/note/note.js:11
+#: plugins/note/init.php:28 plugins/note/note.js:11
 #, fuzzy
 msgid "Edit article note"
 msgstr "Edita les etiquetes"
 
-#: plugins/example/example.php:29 plugins/example/init.php:38
+#: plugins/example/init.php:38
 msgid "Example Pane"
 msgstr ""
 
-#: plugins/example/example.php:53 plugins/example/init.php:69
+#: plugins/example/init.php:69
 msgid "Sample value"
 msgstr ""
 
-#: plugins/example/example.php:59 plugins/example/init.php:75
+#: plugins/example/init.php:75
 #, fuzzy
 msgid "Set value"
 msgstr "Marca'l com a destacat"
 
-#: plugins/identica/identica.php:23
+#: plugins/identica/init.php:29
 #, fuzzy
 msgid "Share on identi.ca"
 msgstr "Títol"
 
-#: plugins/instances/instances.php:29
+#: plugins/owncloud/init.php:35
+msgid "Owncloud"
+msgstr ""
+
+#: plugins/owncloud/init.php:59
+msgid "Owncloud url"
+msgstr ""
+
+#: plugins/owncloud/init.php:74
+msgid "Bookmark on OwnCloud "
+msgstr ""
+
+#: plugins/instances/init.php:144
 #, fuzzy
 msgid "Linked"
 msgstr "Enllaç"
 
-#: plugins/instances/instances.php:180
+#: plugins/instances/init.php:295
 #, fuzzy
 msgid "Link instance"
 msgstr "Edita les etiquetes"
 
-#: plugins/instances/instances.php:192 plugins/instances/init.php:307
+#: plugins/instances/init.php:307
 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 ""
 
-#: plugins/instances/instances.php:202
+#: plugins/instances/init.php:317
 msgid "Last connected"
 msgstr ""
 
-#: plugins/instances/instances.php:203
+#: plugins/instances/init.php:318
 msgid "Status"
 msgstr ""
 
-#: plugins/instances/instances.php:204
+#: plugins/instances/init.php:319
 #, fuzzy
 msgid "Stored feeds"
 msgstr "Més canals"
 
-#: plugins/share/share.php:21
+#: plugins/share/init.php:27
 #, fuzzy
 msgid "Share by URL"
 msgstr "Marca l'article"
 
-#: plugins/share/share.php:43 plugins/share/init.php:49
+#: plugins/share/init.php:49
 msgid "You can share this article by the following unique URL:"
 msgstr ""
 
-#: plugins/flattr/flattr.php:37
+#: plugins/flattr/init.php:30
 #, fuzzy
-msgid "Flattr article"
+msgid "Flattr this article."
 msgstr "Marca l'article"
 
-#: plugins/googleplus/googleplus.php:23
+#: plugins/googleplus/init.php:29
 #, fuzzy
 msgid "Share on Google+"
 msgstr "Títol"
 
-#: plugins/updater/updater.php:267 plugins/updater/updater.php:279
+#: plugins/updater/init.php:294 plugins/updater/init.php:306
 #: plugins/updater/updater.js:10
 #, fuzzy
 msgid "Update Tiny Tiny RSS"
 msgstr "Torna a Tiny Tiny RSS"
 
-#: plugins/updater/updater.php:282 plugins/updater/init.php:303
+#: plugins/updater/init.php:309
 #, fuzzy
 msgid "Your Tiny Tiny RSS installation is up to date."
 msgstr "La base de dades de Tiny Tiny RSS està actualitzada."
 
-#: plugins/updater/updater.php:291 plugins/updater/init.php:313
+#: plugins/updater/init.php:319
 msgid ""
 "Do not close this dialog until updating is finished. Backup your tt-rss "
 "directory before continuing."
 msgstr ""
 
-#: plugins/updater/updater.php:294 plugins/updater/init.php:316
+#: plugins/updater/init.php:322
 #, fuzzy
 msgid "Ready to update."
 msgstr "Última actualització:"
 
-#: plugins/updater/updater.php:299 plugins/updater/init.php:321
+#: plugins/updater/init.php:327
 #, fuzzy
 msgid "Start update"
 msgstr "Última actualització:"
 
-#: js/feedlist.js:283 js/feedlist.js:282 js/feedlist.js:265 js/feedlist.js:218
+#: plugins/tweet/init.php:29
+#, fuzzy
+msgid "Share on Twitter"
+msgstr "Títol"
+
+#: js/feedlist.js:218
 msgid "New articles available in this feed (click to show)"
 msgstr ""
 
-#: js/feedlist.js:490 js/feedlist.js:505 js/feedlist.js:489 js/feedlist.js:504
-#: js/feedlist.js:469 js/feedlist.js:484 js/feedlist.js:420 js/feedlist.js:435
-#: plugins/digest/digest.js:25
+#: js/feedlist.js:420 js/feedlist.js:435 plugins/digest/digest.js:25
 msgid "Mark all articles in %s as read?"
 msgstr "Esteu segur que voleu marcar tots els articles de %s com a llegits?"
 
@@ -2745,151 +2819,138 @@ msgid ""
 "your browser information. Your IP would be saved in the database."
 msgstr ""
 
-#: js/functions.js:618 js/functions.js:614 js/functions.js:622
+#: js/functions.js:627
 #, fuzzy
 msgid "Date syntax appears to be correct:"
 msgstr "La contrasenya antiga és incorrecta."
 
-#: js/functions.js:621 js/functions.js:617 js/functions.js:625
+#: js/functions.js:630
 #, fuzzy
 msgid "Date syntax is incorrect."
 msgstr "La contrasenya antiga és incorrecta."
 
-#: js/functions.js:748 js/functions.js:744 js/functions.js:752
+#: js/functions.js:757
 #, fuzzy
 msgid "Remove stored feed icon?"
 msgstr "Elimina les dades emmagatzemades"
 
-#: js/functions.js:780 js/functions.js:776 js/functions.js:784
+#: js/functions.js:789
 #, fuzzy
 msgid "Please select an image file to upload."
 msgstr "Si us plau, seleccioneu un canal."
 
-#: js/functions.js:782 js/functions.js:778 js/functions.js:786
+#: js/functions.js:791
 msgid "Upload new icon for this feed?"
 msgstr ""
 
-#: js/functions.js:799 js/functions.js:795 js/functions.js:803
+#: js/functions.js:808
 msgid "Please enter label caption:"
 msgstr "Si us plau, escriviu un títol per a l'etiqueta:"
 
-#: js/functions.js:804 js/functions.js:800 js/functions.js:808
+#: js/functions.js:813
 msgid "Can't create label: missing caption."
 msgstr "No s'ha pogut crear l'etiqueta: Títol desconegut."
 
-#: js/functions.js:847 js/functions.js:843 js/functions.js:851
+#: js/functions.js:856
 msgid "Subscribe to Feed"
 msgstr "Subscriviu-vos al canal"
 
-#: js/functions.js:874 js/functions.js:870 js/functions.js:878
+#: js/functions.js:883
 #, fuzzy
 msgid "Subscribed to %s"
 msgstr "Subscrit als canals:"
 
-#: js/functions.js:879 js/functions.js:875 js/functions.js:883
+#: js/functions.js:888
 msgid "Specified URL seems to be invalid."
 msgstr ""
 
-#: js/functions.js:882 js/functions.js:878 js/functions.js:886
+#: js/functions.js:891
 msgid "Specified URL doesn't seem to contain any feeds."
 msgstr ""
 
-#: js/functions.js:935 js/functions.js:931 js/functions.js:939
+#: js/functions.js:944
 #, fuzzy
 msgid "Couldn't download the specified URL: %s"
 msgstr "No s'ha pogut subscriure: no s'ha especificat la URL del canal."
 
-#: js/functions.js:939 js/functions.js:935 js/functions.js:943
+#: js/functions.js:948
 #, fuzzy
 msgid "You are already subscribed to this feed."
 msgstr "No esteu subscrit a cap canal."
 
-#: js/functions.js:1067 js/functions.js:1063 js/functions.js:1071
-#: js/functions.js:1073
+#: js/functions.js:1078
 #, fuzzy
 msgid "Edit rule"
 msgstr "Filtres"
 
-#: js/functions.js:1093 js/functions.js:1089 js/functions.js:1097
-#: js/functions.js:1099
+#: js/functions.js:1104
 #, fuzzy
 msgid "Edit action"
 msgstr "Accions dels canals"
 
-#: js/functions.js:1130 js/functions.js:1126 js/functions.js:1134
-#: js/functions.js:1136
+#: js/functions.js:1141
 msgid "Create Filter"
 msgstr "Crea un filtre"
 
-#: js/functions.js:1234 js/functions.js:1230 js/functions.js:1238
-#: js/functions.js:1240
+#: js/functions.js:1245
 msgid ""
 "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
 "hub again on next feed update."
 msgstr ""
 
-#: js/functions.js:1255 js/tt-rss.js:421 js/functions.js:1251 js/tt-rss.js:381
-#: js/functions.js:1259 js/tt-rss.js:367 js/functions.js:1261
+#: js/functions.js:1266 js/tt-rss.js:367
 msgid "Unsubscribe from %s?"
 msgstr "Us voleu donar de baixa de %s ?"
 
-#: js/functions.js:1362 js/functions.js:1358 js/functions.js:1368
-#: js/functions.js:1370
+#: js/functions.js:1375
 #, fuzzy
 msgid "Please enter category title:"
 msgstr "Si us plau, escriviu una nota per aquest article:"
 
-#: js/functions.js:1393 js/functions.js:1389 js/functions.js:1399
-#: js/functions.js:1401
+#: js/functions.js:1406
 msgid "Generate new syndication address for this feed?"
 msgstr ""
 
-#: js/functions.js:1584 js/tt-rss.js:400 js/tt-rss.js:903 js/functions.js:1580
-#: js/tt-rss.js:782 js/tt-rss.js:362 js/tt-rss.js:717 js/functions.js:1590
-#: js/tt-rss.js:348 js/tt-rss.js:709 js/functions.js:1592
+#: js/functions.js:1597 js/tt-rss.js:348 js/tt-rss.js:713
 msgid "You can't edit this kind of feed."
 msgstr "No podeu editar aquest tipus de canal."
 
-#: js/functions.js:1599 js/functions.js:1595 js/functions.js:1605
-#: js/functions.js:1607
+#: js/functions.js:1612
 #, fuzzy
 msgid "Edit Feed"
 msgstr "Edita el canal"
 
-#: js/functions.js:1637 js/functions.js:1633 js/functions.js:1643
-#: js/functions.js:1645
+#: js/functions.js:1650
 #, fuzzy
 msgid "More Feeds"
 msgstr "Més canals"
 
-#: js/functions.js:1698 js/functions.js:1808 js/prefs.js:408 js/prefs.js:438
-#: js/prefs.js:470 js/prefs.js:653 js/prefs.js:673 js/prefs.js:1326
-#: js/prefs.js:1471 js/functions.js:1694 js/functions.js:1804 js/prefs.js:397
-#: js/prefs.js:427 js/prefs.js:459 js/prefs.js:642 js/prefs.js:662
-#: js/prefs.js:1213 js/prefs.js:1358 js/functions.js:1704 js/functions.js:1814
-#: js/prefs.js:1203 js/prefs.js:1348 js/functions.js:1706 js/functions.js:1816
+#: js/functions.js:1711 js/functions.js:1821 js/prefs.js:397 js/prefs.js:427
+#: js/prefs.js:459 js/prefs.js:642 js/prefs.js:662 js/prefs.js:1203
+#: js/prefs.js:1348
 msgid "No feeds are selected."
 msgstr "No heu seleccionat cap canal."
 
-#: js/functions.js:1740 js/functions.js:1736 js/functions.js:1746
-#: js/functions.js:1748
+#: js/functions.js:1753
 msgid ""
 "Remove selected feeds from the archive? Feeds with stored articles will not "
 "be removed."
 msgstr ""
 
-#: js/functions.js:1779 js/functions.js:1775 js/functions.js:1785
-#: js/functions.js:1787
+#: js/functions.js:1792
 #, fuzzy
 msgid "Feeds with update errors"
 msgstr "Erreurs de mise à jour"
 
-#: js/functions.js:1790 js/prefs.js:1308 js/functions.js:1786 js/prefs.js:1195
-#: js/functions.js:1796 js/prefs.js:1185 js/functions.js:1798
+#: js/functions.js:1803 js/prefs.js:1185
 #, fuzzy
 msgid "Remove selected feeds?"
 msgstr "Esteu segur que voleu suprimir els filtres seleccionats?"
 
+#: js/functions.js:1904
+msgid "Help"
+msgstr "Ajuda"
+
 #: js/PrefFeedTree.js:47
 #, fuzzy
 msgid "Edit category"
@@ -2913,303 +2974,275 @@ msgstr "Si us plau, introduïu la vostra identificació (login)"
 msgid "Can't create user: no login specified."
 msgstr "No s'ha pogut crear l'usuari: no hi ha cap nom especificat."
 
-#: js/prefs.js:128 js/prefs.js:117
+#: js/prefs.js:117
 #, fuzzy
 msgid "Edit Filter"
 msgstr "Filtres"
 
-#: js/prefs.js:175 js/prefs.js:164
+#: js/prefs.js:164
 #, fuzzy
 msgid "Remove filter?"
 msgstr "Esteu segur que voleu suprimir el filtre %s?"
 
-#: js/prefs.js:290 js/prefs.js:279
+#: js/prefs.js:279
 msgid "Remove selected labels?"
 msgstr "Esteu segur que voleu suprimir les etiquetes seleccionades?"
 
-#: js/prefs.js:306 js/prefs.js:1512 js/prefs.js:295 js/prefs.js:1399
-#: js/prefs.js:1389
+#: js/prefs.js:295 js/prefs.js:1389
 msgid "No labels are selected."
 msgstr "No heu seleccionat cap etiqueta."
 
-#: js/prefs.js:320 js/prefs.js:309
+#: js/prefs.js:309
 msgid ""
 "Remove selected users? Neither default admin nor your account will be "
 "removed."
 msgstr ""
 
-#: js/prefs.js:337 js/prefs.js:518 js/prefs.js:539 js/prefs.js:578
 #: js/prefs.js:326 js/prefs.js:507 js/prefs.js:528 js/prefs.js:567
 msgid "No users are selected."
 msgstr "No heu seleccionat cap usuari."
 
-#: js/prefs.js:355 js/prefs.js:344
+#: js/prefs.js:344
 msgid "Remove selected filters?"
 msgstr "Esteu segur que voleu suprimir els filtres seleccionats?"
 
-#: js/prefs.js:370 js/prefs.js:608 js/prefs.js:627 js/prefs.js:359
-#: js/prefs.js:597 js/prefs.js:616
+#: js/prefs.js:359 js/prefs.js:597 js/prefs.js:616
 msgid "No filters are selected."
 msgstr "No heu seleccionat cap filtre."
 
-#: js/prefs.js:389 js/prefs.js:378
+#: js/prefs.js:378
 msgid "Unsubscribe from selected feeds?"
 msgstr "Us voleu donar de baixa dels canals seleccionats?"
 
-#: js/prefs.js:423 js/prefs.js:412
+#: js/prefs.js:412
 msgid "Please select only one feed."
 msgstr "Si us plau, seleccioneu només un canal."
 
-#: js/prefs.js:429 js/prefs.js:418
+#: js/prefs.js:418
 msgid "Erase all non-starred articles in selected feed?"
 msgstr ""
 "Esteu segur que voleu suprimir tots els articles que no estan marcats als "
 "canals seleccionats?"
 
-#: js/prefs.js:451 js/prefs.js:440
+#: js/prefs.js:440
 msgid "How many days of articles to keep (0 - use default)?"
 msgstr "Quants dies voleu mantenir els articles (0 - per defecte)?"
 
-#: js/prefs.js:489 js/prefs.js:478
+#: js/prefs.js:478
 msgid "Login field cannot be blank."
 msgstr "El nom del camp no es pot deixar en blanc."
 
-#: js/prefs.js:523 js/prefs.js:544 js/prefs.js:583 js/prefs.js:512
-#: js/prefs.js:533 js/prefs.js:572
+#: js/prefs.js:512 js/prefs.js:533 js/prefs.js:572
 msgid "Please select only one user."
 msgstr "Si us plau, seleccioneu només un usuari."
 
-#: js/prefs.js:548 js/prefs.js:537
+#: js/prefs.js:537
 msgid "Reset password of selected user?"
 msgstr "Voleu reiniciar la contrasenya de l'usuari seleccionat?"
 
-#: js/prefs.js:613 js/prefs.js:602
+#: js/prefs.js:602
 msgid "Please select only one filter."
 msgstr "Si us plau, seleccioneu només un filtre."
 
-#: js/prefs.js:631 js/prefs.js:620
+#: js/prefs.js:620
 #, fuzzy
 msgid "Combine selected filters?"
 msgstr "Esteu segur que voleu suprimir els filtres seleccionats?"
 
-#: js/prefs.js:695 js/prefs.js:684
+#: js/prefs.js:684
 #, fuzzy
 msgid "Edit Multiple Feeds"
 msgstr "Editor múltiple de canals"
 
-#: js/prefs.js:719 js/prefs.js:708
+#: js/prefs.js:708
 msgid "Save changes to selected feeds?"
 msgstr "Esteu segur que voleu desar els canvis als canals seleccionats?"
 
-#: js/prefs.js:811 js/prefs.js:800 js/prefs.js:790
+#: js/prefs.js:790
 #, fuzzy
 msgid "OPML Import"
 msgstr "Importeu"
 
-#: js/prefs.js:838 js/prefs.js:827 js/prefs.js:817
+#: js/prefs.js:817
 #, fuzzy
 msgid "Please choose an OPML file first."
 msgstr "Primerament heu de seleccionar un canal."
 
-#: js/prefs.js:854 plugins/import_export/import_export.js:112
-#, fuzzy
-msgid "Please choose the file first."
-msgstr "Primerament heu de seleccionar un canal."
-
-#: js/prefs.js:1010 js/prefs.js:983 js/prefs.js:973
+#: js/prefs.js:973
 msgid "Reset to defaults?"
 msgstr "Esteu segur que voleu establir els valors per defecte?"
 
-#: js/prefs.js:1215 js/prefs.js:1102 js/prefs.js:1092
+#: js/prefs.js:1092
 msgid ""
 "Remove category %s? Any nested feeds would be placed into Uncategorized."
 msgstr ""
 
-#: js/prefs.js:1242 js/prefs.js:1129 js/prefs.js:1119
+#: js/prefs.js:1119
 msgid "Remove selected categories?"
 msgstr "Esteu segur que voleu suprimir les categories seleccionades?"
 
-#: js/prefs.js:1258 js/prefs.js:1145 js/prefs.js:1135
+#: js/prefs.js:1135
 msgid "No categories are selected."
 msgstr "No heu seleccionat cap categoria."
 
-#: js/prefs.js:1266 js/prefs.js:1153 js/prefs.js:1143
+#: js/prefs.js:1143
 #, fuzzy
 msgid "Category title:"
 msgstr "Edita les categories"
 
-#: js/prefs.js:1297 js/prefs.js:1184 js/prefs.js:1174
+#: js/prefs.js:1174
 #, fuzzy
 msgid "Feeds without recent updates"
 msgstr "Erreurs de mise à jour"
 
-#: js/prefs.js:1346 js/prefs.js:1233 js/prefs.js:1223
+#: js/prefs.js:1223
 #, fuzzy
 msgid "Replace current OPML publishing address with a new one?"
 msgstr "Voleu canviar l'adreça de publicació per una de nova?"
 
-#: js/prefs.js:1455 js/prefs.js:1342 js/prefs.js:1332
+#: js/prefs.js:1332
 msgid "Rescore articles in selected feeds?"
 msgstr ""
 "Esteu segur que voleu canviar la puntuació dels articles en les etiquetes "
 "personalitzades?"
 
-#: js/prefs.js:1478 js/prefs.js:1365 js/prefs.js:1355
+#: js/prefs.js:1355
 msgid "Rescore all articles? This operation may take a lot of time."
 msgstr ""
 "Esteu segur que voleu recuperar tots els articles? Aquesta operació pot "
 "durar molt temps."
 
-#: js/prefs.js:1498 js/prefs.js:1385 js/prefs.js:1375
+#: js/prefs.js:1375
 #, fuzzy
 msgid "Reset selected labels to default colors?"
 msgstr ""
 "Esteu segur que voleu canviar els colors de les etiquetes pels colors per "
 "defecte?"
 
-#: js/prefs.js:1535 js/prefs.js:1422 js/prefs.js:1412
+#: js/prefs.js:1412
 msgid "Settings Profiles"
 msgstr ""
 
-#: js/prefs.js:1544 js/prefs.js:1431 js/prefs.js:1421
+#: js/prefs.js:1421
 msgid ""
 "Remove selected profiles? Active and default profiles will not be removed."
 msgstr ""
 
-#: js/prefs.js:1562 js/prefs.js:1449 js/prefs.js:1439
+#: js/prefs.js:1439
 #, fuzzy
 msgid "No profiles are selected."
 msgstr "No hi ha cap article seleccionat."
 
-#: js/prefs.js:1570 js/prefs.js:1623 js/prefs.js:1457 js/prefs.js:1510
 #: js/prefs.js:1447 js/prefs.js:1500
 #, fuzzy
 msgid "Activate selected profile?"
 msgstr "Esteu segur que voleu suprimir els filtres seleccionats?"
 
-#: js/prefs.js:1586 js/prefs.js:1639 js/prefs.js:1473 js/prefs.js:1526
 #: js/prefs.js:1463 js/prefs.js:1516
 #, fuzzy
 msgid "Please choose a profile to activate."
 msgstr "Primerament heu de seleccionar un canal."
 
-#: js/prefs.js:1647 js/prefs.js:1534 js/prefs.js:1524
+#: js/prefs.js:1524
 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr ""
 
-#: js/prefs.js:1666 js/prefs.js:1553 js/prefs.js:1543
+#: js/prefs.js:1543
 msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr ""
 
-#: js/prefs.js:1764 js/prefs.js:1651 js/prefs.js:1641
+#: js/prefs.js:1641
 msgid "Label Editor"
 msgstr "Éditeur d'intitulé"
 
-#: js/prefs.js:1827 js/prefs.js:1714 js/prefs.js:1704
+#: js/prefs.js:1704
 msgid ""
 "This will clear your stored authentication information for Twitter. Continue?"
 msgstr ""
 
-#: js/prefs.js:1911 plugins/import_export/import_export.js:13
-#, fuzzy
-msgid "Export Data"
-msgstr "Exporta en format OPML"
-
-#: js/prefs.js:1938 plugins/import_export/import_export.js:40
-msgid ""
-"Finished, exported %d articles. You can download the data <a "
-"class='visibleLink' href='%u'>here</a>."
-msgstr ""
-
-#: js/prefs.js:1991 plugins/import_export/import_export.js:93
-#, fuzzy
-msgid "Data Import"
-msgstr "Importeu"
-
-#: js/prefs.js:2027 js/prefs.js:1794 js/prefs.js:1784
+#: js/prefs.js:1784
 #, fuzzy
 msgid "Subscribing to feeds..."
 msgstr "S'està subscrivint a un canal..."
 
-#: js/tt-rss.js:147 js/tt-rss.js:141 js/tt-rss.js:120
+#: js/prefs.js:1821
+msgid "Clear stored data for this plugin?"
+msgstr ""
+
+#: js/tt-rss.js:120
 msgid "Mark all articles as read?"
 msgstr "Esteu segur que voleu marcar tots els articles com a llegits?"
 
-#: js/tt-rss.js:410 js/tt-rss.js:370 js/tt-rss.js:356
+#: js/tt-rss.js:356
 msgid "You can't unsubscribe from the category."
 msgstr "No us podeu donar de baixa de la categoria."
 
-#: js/tt-rss.js:415 js/tt-rss.js:596 js/tt-rss.js:591 js/tt-rss.js:375
-#: js/tt-rss.js:525 js/tt-rss.js:361 js/tt-rss.js:511
+#: js/tt-rss.js:361 js/tt-rss.js:511
 msgid "Please select some feed first."
 msgstr "Primerament heu de seleccionar un canal."
 
-#: js/tt-rss.js:591 js/tt-rss.js:586 js/tt-rss.js:520 js/tt-rss.js:506
+#: js/tt-rss.js:506
 msgid "You can't rescore this kind of feed."
 msgstr "No podeu canviar la puntuació d'aquest tipus de canal."
 
-#: js/tt-rss.js:601 js/tt-rss.js:596 js/tt-rss.js:530 js/tt-rss.js:516
+#: js/tt-rss.js:516
 msgid "Rescore articles in %s?"
 msgstr "Esteu segur que voleu canviar la puntuació dels articles a %s?"
 
-#: js/tt-rss.js:1062 js/tt-rss.js:883 js/tt-rss.js:825 js/tt-rss.js:830
+#: js/tt-rss.js:672
+#, fuzzy
+msgid "Please enable mail plugin first."
+msgstr "Primerament heu de seleccionar un canal."
+
+#: js/tt-rss.js:834
 #, fuzzy
 msgid "New version available!"
 msgstr "Hi ha una nova versió de Tiny Tiny RSS!"
 
-#: js/viewfeed.js:108 js/viewfeed.js:104
+#: js/viewfeed.js:104
 #, fuzzy
 msgid "Cancel search"
 msgstr "Cancel·la"
 
-#: js/viewfeed.js:456 js/viewfeed.js:445 js/viewfeed.js:451 js/viewfeed.js:435
-#: plugins/digest/digest.js:257 plugins/digest/digest.js:696
+#: js/viewfeed.js:435 plugins/digest/digest.js:257
+#: plugins/digest/digest.js:696
 msgid "Unstar article"
 msgstr "Treu la marca de l'article"
 
-#: js/viewfeed.js:461 js/viewfeed.js:450 js/viewfeed.js:456 js/viewfeed.js:440
-#: plugins/digest/digest.js:259 plugins/digest/digest.js:700
+#: js/viewfeed.js:440 plugins/digest/digest.js:259
+#: plugins/digest/digest.js:700
 msgid "Star article"
 msgstr "Marca l'article"
 
-#: js/viewfeed.js:496 js/viewfeed.js:485 js/viewfeed.js:491 js/viewfeed.js:473
-#: plugins/digest/digest.js:262 plugins/digest/digest.js:731
+#: js/viewfeed.js:473 plugins/digest/digest.js:262
+#: plugins/digest/digest.js:731
 msgid "Unpublish article"
 msgstr "Deixa de publicar l'article"
 
-#: js/viewfeed.js:676 js/viewfeed.js:704 js/viewfeed.js:731 js/viewfeed.js:793
-#: js/viewfeed.js:825 js/viewfeed.js:962 js/viewfeed.js:1005
-#: js/viewfeed.js:1055 js/viewfeed.js:2181 js/viewfeed.js:665
-#: js/viewfeed.js:693 js/viewfeed.js:720 js/viewfeed.js:782 js/viewfeed.js:814
-#: js/viewfeed.js:951 js/viewfeed.js:994 js/viewfeed.js:1044
-#: js/viewfeed.js:2154 js/viewfeed.js:671 js/viewfeed.js:699
-#: js/viewfeed.js:726 js/viewfeed.js:788 js/viewfeed.js:820 js/viewfeed.js:957
-#: js/viewfeed.js:1000 js/viewfeed.js:1050 js/viewfeed.js:2018
 #: js/viewfeed.js:674 js/viewfeed.js:702 js/viewfeed.js:729 js/viewfeed.js:791
 #: js/viewfeed.js:823 js/viewfeed.js:960 js/viewfeed.js:1003
 #: js/viewfeed.js:1053 js/viewfeed.js:1927 plugins/mail/mail.js:7
 msgid "No articles are selected."
 msgstr "No hi ha cap article seleccionat."
 
-#: js/viewfeed.js:942 js/viewfeed.js:931 js/viewfeed.js:937 js/viewfeed.js:940
+#: js/viewfeed.js:940
 msgid "Mark all visible articles in %s as read?"
 msgstr ""
 "Esteu segur que voleu marcar tots els articles visibles de %s com a llegits ?"
 
-#: js/viewfeed.js:970 js/viewfeed.js:959 js/viewfeed.js:965 js/viewfeed.js:968
+#: js/viewfeed.js:968
 #, fuzzy
 msgid "Delete %d selected articles in %s?"
 msgstr ""
 "Esteu segur que voleu marcar els %d articles seleccionats de %s com a "
 "llegits?"
 
-#: js/viewfeed.js:972 js/viewfeed.js:961 js/viewfeed.js:967 js/viewfeed.js:970
+#: js/viewfeed.js:970
 #, fuzzy
 msgid "Delete %d selected articles?"
 msgstr ""
 "Esteu segur que voleu eliminar els articles seleccionats de l'etiqueta?"
 
-#: js/viewfeed.js:1014 js/viewfeed.js:1003 js/viewfeed.js:1009
 #: js/viewfeed.js:1012
 #, fuzzy
 msgid "Archive %d selected articles in %s?"
@@ -3217,141 +3250,64 @@ msgstr ""
 "Esteu segur que voleu marcar els %d articles seleccionats de %s com a "
 "llegits?"
 
-#: js/viewfeed.js:1017 js/viewfeed.js:1006 js/viewfeed.js:1012
 #: js/viewfeed.js:1015
 #, fuzzy
 msgid "Move %d archived articles back?"
 msgstr "Articles marcats"
 
-#: js/viewfeed.js:1061 js/viewfeed.js:1050 js/viewfeed.js:1056
 #: js/viewfeed.js:1059
 msgid "Mark %d selected articles in %s as read?"
 msgstr ""
 "Esteu segur que voleu marcar els %d articles seleccionats de %s com a "
 "llegits?"
 
-#: js/viewfeed.js:1085 js/viewfeed.js:1074 js/viewfeed.js:1080
 #: js/viewfeed.js:1083
 #, fuzzy
 msgid "Edit article Tags"
 msgstr "Edita les etiquetes"
 
-#: js/viewfeed.js:1247 js/viewfeed.js:1236 js/viewfeed.js:1242
 #: js/viewfeed.js:1252
 msgid "No article is selected."
 msgstr "No hi ha cap article seleccionat."
 
-#: js/viewfeed.js:1282 js/viewfeed.js:1271 js/viewfeed.js:1277
 #: js/viewfeed.js:1287
 msgid "No articles found to mark"
 msgstr "No s'han trobat articles per a marcar."
 
-#: js/viewfeed.js:1284 js/viewfeed.js:1273 js/viewfeed.js:1279
 #: js/viewfeed.js:1289
 msgid "Mark %d article(s) as read?"
 msgstr "Esteu segur que voleu marcar  %d article(s) com a llegit(s) ?"
 
-#: js/viewfeed.js:1402 js/viewfeed.js:1383
-#, fuzzy
-msgid "Loading..."
-msgstr "S'està carregant la llista de canals..."
-
-#: js/viewfeed.js:1891 js/viewfeed.js:1864 js/viewfeed.js:1734
 #: js/viewfeed.js:1744
 #, fuzzy
 msgid "Open original article"
 msgstr "Mostra el contingut original de l'article"
 
-#: js/viewfeed.js:1897 js/viewfeed.js:1870
-#, fuzzy
-msgid "View in a tt-rss tab"
-msgstr "Obre l'article en una finestra nova"
-
-#: js/viewfeed.js:1905 js/viewfeed.js:1878 js/viewfeed.js:1742
-#: js/viewfeed.js:1752
-#, fuzzy
-msgid "Mark above as read"
-msgstr "Marca'l com a llegit"
-
-#: js/viewfeed.js:1911 js/viewfeed.js:1884 js/viewfeed.js:1748
-#: js/viewfeed.js:1758
-#, fuzzy
-msgid "Mark below as read"
-msgstr "Marca'l com a llegit"
-
-#: js/viewfeed.js:1967 js/viewfeed.js:1940 js/viewfeed.js:1804
 #: js/viewfeed.js:1814
 #, fuzzy
 msgid "Remove label"
 msgstr "Esteu segur que voleu suprimir les etiquetes seleccionades?"
 
-#: js/viewfeed.js:1991 js/viewfeed.js:1964 js/viewfeed.js:1828
 #: js/viewfeed.js:1838
 #, fuzzy
 msgid "Playing..."
 msgstr "S'està carregant la llista de canals..."
 
-#: js/viewfeed.js:1992 js/viewfeed.js:1965 js/viewfeed.js:1829
 #: js/viewfeed.js:1839
 #, fuzzy
 msgid "Click to pause"
 msgstr "Feu clic per editar"
 
-#: js/viewfeed.js:2150 js/viewfeed.js:2123 js/viewfeed.js:1987
 #: js/viewfeed.js:1896
 #, fuzzy
 msgid "Please enter new score for selected articles:"
 msgstr "Si us plau, escriviu una nota per aquest article:"
 
-#: js/viewfeed.js:2192 js/viewfeed.js:2165 js/viewfeed.js:2029
 #: js/viewfeed.js:1938
 #, fuzzy
 msgid "Please enter new score for this article:"
 msgstr "Si us plau, escriviu una nota per aquest article:"
 
-#: js/functions.js:1887 js/functions.js:1891 js/functions.js:1897
-#: js/functions.js:1899
-msgid "Help"
-msgstr "Ajuda"
-
-#: js/prefs.js:1831 js/prefs.js:1821
-msgid "Clear stored data for this plugin?"
-msgstr ""
-
-#: js/tt-rss.js:741 js/tt-rss.js:676 js/tt-rss.js:668
-#, fuzzy
-msgid "Please enable mail plugin first."
-msgstr "Primerament heu de seleccionar un canal."
-
-#: plugins/digest/digest_body.php:39
-msgid "Your browser doesn't support Javascript, which is required"
-msgstr ""
-
-#: plugins/nsfw/init.php:32 plugins/nsfw/init.php:43
-msgid "Not work safe (click to toggle)"
-msgstr ""
-
-#: plugins/nsfw/init.php:53
-msgid "NSFW Plugin"
-msgstr ""
-
-#: plugins/nsfw/init.php:80
-msgid "Tags to consider NSFW (comma-separated)"
-msgstr ""
-
-#: plugins/nsfw/init.php:101
-#, fuzzy
-msgid "Configuration saved."
-msgstr "S'ha desat la configuració"
-
-#: plugins/owncloud/init.php:35
-msgid "Owncloud"
-msgstr ""
-
-#: plugins/owncloud/init.php:59
-msgid "Owncloud url"
-msgstr ""
-
 #: plugins/digest/digest.js:71
 #, fuzzy
 msgid "Mark %d displayed articles as read?"
@@ -3382,6 +3338,27 @@ msgstr "Mostra/amaga els canals llegits"
 msgid "Load more..."
 msgstr "Ouverture de l'aide..."
 
+#: plugins/import_export/import_export.js:13
+#, fuzzy
+msgid "Export Data"
+msgstr "Exporta en format OPML"
+
+#: plugins/import_export/import_export.js:40
+msgid ""
+"Finished, exported %d articles. You can download the data <a "
+"class='visibleLink' href='%u'>here</a>."
+msgstr ""
+
+#: plugins/import_export/import_export.js:93
+#, fuzzy
+msgid "Data Import"
+msgstr "Importeu"
+
+#: plugins/import_export/import_export.js:112
+#, fuzzy
+msgid "Please choose the file first."
+msgstr "Primerament heu de seleccionar un canal."
+
 #: plugins/mail/mail.js:21
 #, fuzzy
 msgid "Forward article by email"
@@ -3423,6 +3400,101 @@ msgid ""
 "before continuing. Please type 'yes' to continue."
 msgstr ""
 
+#~ msgid "Comments?"
+#~ msgstr "Comentaris?"
+
+#~ msgid "Move between feeds"
+#~ msgstr "Mou entre canals"
+
+#~ msgid "Move between articles"
+#~ msgstr "Mou entre articles"
+
+#~ msgid "Active article actions"
+#~ msgstr "Accions actives de l'article"
+
+#, fuzzy
+#~ msgid "Dismiss read articles"
+#~ msgstr "Amaga els articles llegits."
+
+#~ msgid "Mark articles below/above active one as read"
+#~ msgstr "Marca els articles de sobre/sota de l'actiu com a llegits."
+
+#~ msgid "Scroll article content"
+#~ msgstr "Desplaça el contingut de l'article"
+
+#~ msgid "Other actions"
+#~ msgstr "Altres accions"
+
+#~ msgid "Display this help dialog"
+#~ msgstr "Mostra aquest quadre d'ajuda"
+
+#, fuzzy
+#~ msgid "Multiple articles actions"
+#~ msgstr "Tots els articles"
+
+#, fuzzy
+#~ msgid "Select starred articles"
+#~ msgstr "Purga els articles per llegir"
+
+#~ msgid "Feed actions"
+#~ msgstr "Accions dels canals"
+
+#~ msgid "Mark feed as read"
+#~ msgstr "Marca el canal com a llegit"
+
+#~ msgid "If viewing category, (un)collapse it"
+#~ msgstr "Si esteu veient les categories reduir-les/ampliar-les"
+
+#~ msgid "Press any key to close this window."
+#~ msgstr "Premeu qualsevol tecla per a tancar aquesta finestra."
+
+#~ msgid "My Feeds"
+#~ msgstr "Els meus canals"
+
+#~ msgid "Other Feeds"
+#~ msgstr "Altres canals"
+
+#~ msgid "Panel actions"
+#~ msgstr "Quadre d'accions"
+
+#~ msgid "Top 25 feeds"
+#~ msgstr "Els 25 més llegits"
+
+#~ msgid "Edit feed categories"
+#~ msgstr "Edita les categories dels canals"
+
+#~ msgid "Focus search (if present)"
+#~ msgstr "Concreta la cerca (si n'hi ha)"
+
+#~ msgid ""
+#~ "<b>Note:</b> not all actions may be available, depending on Tiny Tiny RSS "
+#~ "configuration and your access level."
+#~ msgstr ""
+#~ "<b>Nota:</b> L'accés a les accions depèn de la configuració del Tiny Tiny "
+#~ "RSS o del nivell d'accés del teu usuari."
+
+#, fuzzy
+#~ msgid "Open article in new tab"
+#~ msgstr "Obre l'article en una finestra nova"
+
+#~ msgid "Select theme"
+#~ msgstr "Seleccioneu una interfície"
+
+#~ msgid "Right-to-left content"
+#~ msgstr "Contingut escrit de dreta a esquerra"
+
+#, fuzzy
+#~ msgid "Cache content locally"
+#~ msgstr "Emmagatzema les imatges localment"
+
+#, fuzzy
+#~ msgid "Loading..."
+#~ msgstr "S'està carregant la llista de canals..."
+
+#, fuzzy
+#~ msgid "View in a tt-rss tab"
+#~ msgstr "Obre l'article en una finestra nova"
+
 #~ msgid "Magpie"
 #~ msgstr "Magpie"
 
@@ -3586,13 +3658,6 @@ msgstr ""
 #~ msgid "See also:"
 #~ msgstr "Veieu també:"
 
-#~ msgid "description"
-#~ msgstr "description"
-
-#, fuzzy
-#~ msgid "Dismiss article"
-#~ msgstr "Publica l'article"
-
 #, fuzzy
 #~ msgid "Remove:"
 #~ msgstr "Suprimeix"
@@ -3722,9 +3787,6 @@ msgstr ""
 #~ "Aquesta opció amaga la llista de canals i permet canviar-ho ràpidament, "
 #~ "pràctica per a pantalles petites."
 
-#~ msgid "Enable feed icons"
-#~ msgstr "Habilita les icones dels canals."
-
 #~ msgid "Enable labels"
 #~ msgstr "Habilita les etiquetes"
 
@@ -3852,9 +3914,6 @@ msgstr ""
 #~ msgid "Saved filter <b>%s</b>"
 #~ msgstr "S'ha desat el filtre <b>%s</b>"
 
-#~ msgid "Click to collapse category"
-#~ msgstr "Clica-hi per a reduir la categoria"
-
 #~ msgid "Tags"
 #~ msgstr "Etiqueta"
 
@@ -3885,10 +3944,6 @@ msgstr ""
 #~ msgid "Go online"
 #~ msgstr "Posa't en línia"
 
-#, fuzzy
-#~ msgid "Toggle reordering mode"
-#~ msgstr "Canvia al mode de reordenació de categories"
-
 #~ msgid "Reset UI layout"
 #~ msgstr "Reinicia la capa de la interfície"
 
@@ -3973,9 +4028,6 @@ msgstr ""
 #~ msgid "Reset category order?"
 #~ msgstr "Esteu segur que voleu eliminar l'ordre de les categories?"
 
-#~ msgid "Generated feed"
-#~ msgstr "Canals generats"
-
 #~ msgid "No feeds to display."
 #~ msgstr "No hi ha canals per a mostrar."
 
@@ -4144,9 +4196,6 @@ msgstr ""
 #~ "No podeu accedir a la versió fora de línia de Tiny Tiny RSS fins que no "
 #~ "canvieu, de nou, a mode fora de línia. Voleu connectar-vos?"
 
-#~ msgid "All feeds updated."
-#~ msgstr "S'ha acabat l'actualització dels canals."
-
 #~ msgid "Can't open article: received invalid XML"
 #~ msgstr "No es pot obrir l'article: l'XML rebut no és vàlid"
 
@@ -4230,9 +4279,6 @@ msgstr ""
 #~ msgid "Recategorize"
 #~ msgstr "Canvia de categoria"
 
-#~ msgid "Other:"
-#~ msgstr "Altres:"
-
 #~ msgid "Generate another link"
 #~ msgstr "Crea un altre enllaç"
 
@@ -4242,9 +4288,6 @@ msgstr ""
 #~ msgid "View:"
 #~ msgstr "Visualització:"
 
-#~ msgid "Refresh"
-#~ msgstr "Actualitza"
-
 #~ msgid "Page"
 #~ msgstr "Pàgina"
 
diff --git a/locale/de_DE/LC_MESSAGES/messages.mo b/locale/de_DE/LC_MESSAGES/messages.mo
index 5fb88c006..59b22c260 100755
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 398315942..a835f5a5d 100755
--- 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: Tiny Tiny RSS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-17 19:37+0400\n"
+"POT-Creation-Date: 2013-03-19 10:14+0400\n"
 "PO-Revision-Date: 2013-03-21 18:57+0100\n"
 "Last-Translator: Walter Weiss <walter_white@fastmail.fm>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/tt-rss/language/"
@@ -22,79 +22,79 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: backend.php:67
+#: backend.php:71
 msgid "Use default"
 msgstr "Standard verwenden"
 
-#: backend.php:68
+#: backend.php:72
 msgid "Never purge"
 msgstr "Niemals löschen"
 
-#: backend.php:69
+#: backend.php:73
 msgid "1 week old"
 msgstr "Nach 1 Woche"
 
-#: backend.php:70
+#: backend.php:74
 msgid "2 weeks old"
 msgstr "Nach 2 Wochen"
 
-#: backend.php:71
+#: backend.php:75
 msgid "1 month old"
 msgstr "Nach 1 Monat"
 
-#: backend.php:72
+#: backend.php:76
 msgid "2 months old"
 msgstr "Nach 2 Monaten"
 
-#: backend.php:73
+#: backend.php:77
 msgid "3 months old"
 msgstr "Nach 3 Monaten"
 
-#: backend.php:76
+#: backend.php:80
 msgid "Default interval"
 msgstr "Standard-Intervall"
 
-#: backend.php:77 backend.php:87
+#: backend.php:81 backend.php:91
 msgid "Disable updates"
 msgstr "Nie"
 
-#: backend.php:78 backend.php:88
+#: backend.php:82 backend.php:92
 msgid "Each 15 minutes"
 msgstr "Alle 15 Minuten"
 
-#: backend.php:79 backend.php:89
+#: backend.php:83 backend.php:93
 msgid "Each 30 minutes"
 msgstr "Alle 30 Minuten"
 
-#: backend.php:80 backend.php:90
+#: backend.php:84 backend.php:94
 msgid "Hourly"
 msgstr "Stündlich"
 
-#: backend.php:81 backend.php:91
+#: backend.php:85 backend.php:95
 msgid "Each 4 hours"
 msgstr "Alle 4 Stunden"
 
-#: backend.php:82 backend.php:92
+#: backend.php:86 backend.php:96
 msgid "Each 12 hours"
 msgstr "Alle 12 Stunden"
 
-#: backend.php:83 backend.php:93
+#: backend.php:87 backend.php:97
 msgid "Daily"
 msgstr "Täglich"
 
-#: backend.php:84 backend.php:94
+#: backend.php:88 backend.php:98
 msgid "Weekly"
 msgstr "Wöchentlich"
 
-#: backend.php:97 classes/pref/users.php:139
+#: backend.php:101 classes/pref/users.php:139
 msgid "User"
 msgstr "Benutzer"
 
-#: backend.php:98
+#: backend.php:102
 msgid "Power User"
 msgstr "Erfahrener Benutzer"
 
-#: backend.php:99
+#: backend.php:103
 msgid "Administrator"
 msgstr "Administrator"
 
@@ -125,7 +125,7 @@ msgstr "Tiny Tiny RSS Datenbank ist auf dem neusten Stand."
 #: db-updater.php:94 db-updater.php:163 db-updater.php:176 register.php:194
 #: register.php:239 register.php:252 register.php:267 register.php:286
 #: register.php:371 register.php:381 register.php:393
-#: classes/handler/public.php:637 classes/handler/public.php:725
+#: classes/handler/public.php:611 classes/handler/public.php:699
 msgid "Return to Tiny Tiny RSS"
 msgstr "Zu Tiny Tiny RSS zurückkehren"
 
@@ -266,195 +266,193 @@ msgstr ""
 "SQL Escaping Test fehlgeschlagen, überprüfen Sie Ihre Datenbank und PHP "
 "Konfiguration"
 
-#: index.php:108 index.php:150 index.php:236 prefs.php:86
-#: classes/backend.php:6 classes/pref/labels.php:296
-#: classes/pref/filters.php:602 classes/pref/feeds.php:1342
-#: plugins/digest/digest_body.php:45 js/viewfeed.js:1169 js/viewfeed.js:1158
-#: js/viewfeed.js:1164 js/viewfeed.js:1174
+#: index.php:117 index.php:147 index.php:252 prefs.php:79
+#: classes/backend.php:5 classes/pref/labels.php:296
+#: classes/pref/filters.php:609 classes/pref/feeds.php:1270
+#: plugins/digest/digest_body.php:45 js/viewfeed.js:1174
 msgid "Loading, please wait..."
 msgstr "Ladevorgang, bitte warten..."
 
-#: index.php:118 plugins/digest/digest_body.php:56
-msgid "Hello,"
-msgstr "Hallo,"
+#: index.php:127 index.php:198
+msgid "Communication problem with server."
+msgstr "Kommunikationsfehler mit Server"
 
-#: index.php:120 prefs.php:29 prefs.php:108 help/main.php:73 help/prefs.php:8
-#: classes/pref/prefs.php:371
-msgid "Preferences"
-msgstr "Einstellungen"
-
-#: index.php:124
-msgid "Comments?"
-msgstr "Kommentare?"
-
-#: index.php:128 mobile/mobile-functions.php:69
-#: mobile/mobile-functions.php:244 plugins/digest/digest_body.php:59
-msgid "Logout"
-msgstr "Abmelden"
-
-#: index.php:134
+#: index.php:133 index.php:206
 msgid "New version of Tiny Tiny RSS is available!"
 msgstr "Neue Version von Tiny Tiny RSS verfügbar!"
 
-#: index.php:157
-msgid "News"
-msgstr "Neuigkeiten"
-
-#: index.php:166
+#: index.php:161
 msgid "Collapse feedlist"
 msgstr "Feedliste verbergen"
 
-#: index.php:169
+#: index.php:164
 msgid "Show articles"
 msgstr "Neue Artikel"
 
-#: index.php:172
+#: index.php:167
 msgid "Adaptive"
 msgstr "Adaptiv"
 
-#: index.php:173
+#: index.php:168
 msgid "All Articles"
 msgstr "Alle Artikel"
 
-#: index.php:174 classes/feeds.php:106
+#: index.php:169 include/functions.php:1912 classes/feeds.php:106
 msgid "Starred"
 msgstr "Markiert"
 
-#: index.php:175 classes/feeds.php:107
+#: index.php:170 include/functions.php:1913 classes/feeds.php:107
 msgid "Published"
 msgstr "Veröffentlicht"
 
-#: index.php:176 classes/feeds.php:93 classes/feeds.php:105
+#: index.php:171 classes/feeds.php:93 classes/feeds.php:105
 msgid "Unread"
 msgstr "Ungelesen"
 
-#: index.php:177
+#: index.php:172
 msgid "Ignore Scoring"
 msgstr "Bewertung ignorieren"
 
-#: index.php:178
+#: index.php:173
 msgid "Updated"
 msgstr "Aktualisiert"
 
-#: index.php:181
+#: index.php:176
 msgid "Sort articles"
 msgstr "Artikel sortieren"
 
-#: index.php:184 classes/pref/prefs.php:462
+#: index.php:179
 msgid "Default"
 msgstr "Standard"
 
-#: index.php:185
+#: index.php:180
 msgid "Date"
 msgstr "Datum"
 
-#: index.php:186 include/localized_schema.php:3
+#: index.php:181 include/localized_schema.php:3
 msgid "Title"
 msgstr "Titel"
 
-#: index.php:187
+#: index.php:182
 msgid "Score"
 msgstr "Bewertung"
 
-#: index.php:192 classes/pref/feeds.php:539 classes/pref/feeds.php:786
+#: index.php:187 classes/pref/feeds.php:535 classes/pref/feeds.php:746
 msgid "Update"
 msgstr "Aktualisieren"
 
-#: index.php:196 index.php:211 include/localized_schema.php:10
-#: classes/feeds.php:111 classes/feeds.php:127 js/FeedTree.js:128
-#: js/FeedTree.js:156 plugins/digest/digest.js:630
+#: index.php:191 index.php:221 include/functions.php:1903
+#: include/localized_schema.php:10 classes/feeds.php:111 classes/feeds.php:131
+#: js/FeedTree.js:128 js/FeedTree.js:156 plugins/digest/digest.js:630
 msgid "Mark as read"
 msgstr "Als gelesen markieren"
 
-#: index.php:202 classes/feeds.php:101
+#: index.php:211
 msgid "Actions..."
 msgstr "Aktionen..."
 
-#: index.php:204
+#: index.php:213
+msgid "Preferences..."
+msgstr "Einstellungen..."
+
+#: index.php:214
 msgid "Search..."
 msgstr "Suchen..."
 
-#: index.php:205
+#: index.php:215
 msgid "Feed actions:"
 msgstr "Feed-Aktionen:"
 
-#: index.php:206 classes/handler/public.php:567
+#: index.php:216 classes/handler/public.php:541
 msgid "Subscribe to feed..."
 msgstr "Feed abonnieren..."
 
-#: index.php:207
+#: index.php:217
 msgid "Edit this feed..."
 msgstr "Feed bearbeiten..."
 
-#: index.php:208
+#: index.php:218
 msgid "Rescore feed"
 msgstr "Feed neu bewerten"
 
-#: index.php:209 classes/pref/feeds.php:712 classes/pref/feeds.php:1315
+#: index.php:219 classes/pref/feeds.php:672 classes/pref/feeds.php:1243
 #: js/PrefFeedTree.js:73
 msgid "Unsubscribe"
 msgstr "Feed abbestellen"
 
-#: index.php:210
+#: index.php:220
 msgid "All feeds:"
 msgstr "Alle Feeds:"
 
-#: index.php:212 help/main.php:56
+#: index.php:222
 msgid "(Un)hide read feeds"
 msgstr "Gelesene zeigen/verstecken"
 
-#: index.php:213
+#: index.php:223
 msgid "Other actions:"
 msgstr "Andere Aktionen:"
 
-#: index.php:215
+#: index.php:225
 msgid "Switch to digest..."
 msgstr "Zur Zusammenfassung wechseln..."
 
-#: index.php:217
+#: index.php:227
 msgid "Show tag cloud..."
 msgstr "Tagwolke anzeigen..."
 
-#: index.php:218
+#: index.php:229 include/functions.php:1890
+msgid "Toggle widescreen mode"
+msgstr "Breitbild-Modus umschalten"
+
+#: index.php:231
 msgid "Select by tags..."
 msgstr "Artikel nach Tag filtern.."
 
-#: index.php:219
+#: index.php:232
 msgid "Create label..."
 msgstr "Label erstellen..."
 
-#: index.php:220
+#: index.php:233
 msgid "Create filter..."
 msgstr "Filter erstellen..."
 
-#: index.php:221
+#: index.php:234
 msgid "Keyboard shortcuts help"
 msgstr "Tastaturkürzel..."
 
-#: prefs.php:99
+#: index.php:236 mobile/mobile-functions.php:69
+#: mobile/mobile-functions.php:244 plugins/digest/digest_body.php:59
+msgid "Logout"
+msgstr "Abmelden"
+
+#: prefs.php:28 prefs.php:99 include/functions.php:1915
+#: classes/pref/prefs.php:371
+msgid "Preferences"
+msgstr "Einstellungen"
+
+#: prefs.php:90
 msgid "Keyboard shortcuts"
 msgstr "Tastaturkürzel"
 
-#: prefs.php:100 help/prefs.php:14
+#: prefs.php:91
 msgid "Exit preferences"
 msgstr "Einstellungen verlassen"
 
-#: prefs.php:111 classes/pref/feeds.php:101 classes/pref/feeds.php:1220
-#: classes/pref/feeds.php:1283
+#: prefs.php:102 classes/pref/feeds.php:100 classes/pref/feeds.php:1148
+#: classes/pref/feeds.php:1211
 msgid "Feeds"
 msgstr "Feeds"
 
-#: prefs.php:114 help/prefs.php:11 classes/pref/filters.php:110
+#: prefs.php:105 classes/pref/filters.php:117
 msgid "Filters"
 msgstr "Filter"
 
-#: prefs.php:117 help/prefs.php:12 mobile/mobile-functions.php:205
-#: include/functions.php:1189 include/functions.php:1836
-#: classes/pref/labels.php:90
+#: prefs.php:108 mobile/mobile-functions.php:205 include/functions.php:1118
+#: include/functions.php:1739 classes/pref/labels.php:90
 msgid "Labels"
 msgstr "Label"
 
-#: prefs.php:121 help/prefs.php:13
+#: prefs.php:112
 msgid "Users"
 msgstr "Benutzer"
 
@@ -516,251 +514,22 @@ msgstr "Konto erfolgreich erstellt."
 msgid "New user registrations are currently closed."
 msgstr "Registrierung für neue Benutzer ist momentan geschlossen."
 
-#: update.php:38
+#: update.php:37
 msgid "Tiny Tiny RSS data update script."
 msgstr "Skript zum Updaten von Tiny Tiny RSS."
 
-#: help/main.php:1 help/prefs.php:1
-msgid "Keyboard Shortcuts"
-msgstr "Tastaturkürzel"
-
-#: help/main.php:5
-msgid "Navigation"
-msgstr "Navigation"
-
-#: help/main.php:8
-msgid "Move between feeds"
-msgstr "Zwischen Feeds wechseln"
-
-#: help/main.php:9
-msgid "Move between articles"
-msgstr "Zwischen Artikeln wechseln"
-
-#: help/main.php:10
-msgid "Show search dialog"
-msgstr "Suchdialog anzeigen"
-
-#: help/main.php:13
-msgid "Active article actions"
-msgstr "Aktionen für aktiven Artikel"
-
-#: help/main.php:16
-msgid "Toggle starred"
-msgstr "Markierung umschalten"
-
-#: help/main.php:17
-msgid "Toggle published"
-msgstr "Veröffentlicht umschalten"
-
-#: help/main.php:18
-msgid "Toggle unread"
-msgstr "Gelesen umschalten"
-
-#: help/main.php:19
-msgid "Edit tags"
-msgstr "Tags bearbeiten"
-
-#: help/main.php:20
-#, fuzzy
-msgid "Dismiss selected articles"
-msgstr "Ausgewählte Artikel verbergen"
-
-#: help/main.php:21
-#, fuzzy
-msgid "Dismiss read articles"
-msgstr "Gelesene Artikel verbergen"
-
-#: help/main.php:22
-#, fuzzy
-msgid "Open article in new window"
-msgstr "In neuem Fenster öffnen"
-
-#: help/main.php:23
-msgid "Mark articles below/above active one as read"
-msgstr "Markiere vorhergehende/nachfolgende Artikel als gelesen"
-
-#: help/main.php:24
-msgid "Scroll article content"
-msgstr "Artikelinhalt scrollen"
-
-#: help/main.php:25
-msgid "Email article"
-msgstr "Artikel per E-Mail versenden"
-
-#: help/main.php:29 help/prefs.php:30
-msgid "Other actions"
-msgstr "Andere Aktionen"
-
-#: help/main.php:32
-#, fuzzy
-msgid "Select article under mouse cursor"
-msgstr "Artikel unter Mauszeiger auswählen"
-
-#: help/main.php:33 help/prefs.php:26 classes/pref/labels.php:281
-msgid "Create label"
-msgstr "Label erstellen"
-
-#: help/main.php:34 help/prefs.php:25 classes/pref/filters.php:580
-msgid "Create filter"
-msgstr "Filter erstellen"
-
-#: help/main.php:35
-#, fuzzy
-msgid "Collapse sidebar"
-msgstr "Seitenleiste ein-/ausklappen"
-
-#: help/main.php:36 help/prefs.php:34
-msgid "Display this help dialog"
-msgstr "Diesen Hilfe-Dialog anzeigen"
-
-#: help/main.php:41
-msgid "Multiple articles actions"
-msgstr "Mehrere Artikeloptionen"
-
-#: help/main.php:44
-msgid "Select all articles"
-msgstr "Alle Artikel auswählen"
-
-#: help/main.php:45
-#, fuzzy
-msgid "Select unread articles"
-msgstr "Markierte Artikel auswählen"
-
-#: help/main.php:46
-msgid "Select starred articles"
-msgstr "Markierte Artikel auswählen"
-
-#: help/main.php:47
-#, fuzzy
-msgid "Select published articles"
-msgstr "Markierte Artikel auswählen"
-
-#: help/main.php:48
-#, fuzzy
-msgid "Invert article selection"
-msgstr "Artikelauswahl umkehren"
-
-#: help/main.php:49
-#, fuzzy
-msgid "Deselect all articles"
-msgstr "Alle Artikel auswählen"
-
-#: help/main.php:52
-msgid "Feed actions"
-msgstr "Feed-Aktionen"
-
-#: help/main.php:55
-#, fuzzy
-msgid "Refresh active feed"
-msgstr "Feed aktualisieren"
-
-#: help/main.php:57 help/prefs.php:22 classes/pref/feeds.php:1286
-msgid "Subscribe to feed"
-msgstr "Feed abonnieren"
-
-#: help/main.php:58 js/FeedTree.js:135 js/PrefFeedTree.js:67
-msgid "Edit feed"
-msgstr "Feed bearbeiten"
-
-#: help/main.php:59
-msgid "Mark feed as read"
-msgstr "Feed als gelesen markieren"
-
-#: help/main.php:60
-#, fuzzy
-msgid "Reverse headlines order"
-msgstr "Schlagzeilensortierung umkehren"
-
-#: help/main.php:61 js/FeedTree.js:170
-msgid "Mark all feeds as read"
-msgstr "Alle Feeds als gelesen markieren"
-
-#: help/main.php:62
-msgid "If viewing category, (un)collapse it"
-msgstr "Gewählte Kategorie auf-/zuklappen"
-
-#: help/main.php:65 help/prefs.php:5
-#, fuzzy
-msgid "Go to..."
-msgstr "Gehe zu..."
-
-#: help/main.php:68 include/functions.php:1893
-msgid "All articles"
-msgstr "Alle Artikel"
-
-#: help/main.php:69 include/functions.php:1891
-msgid "Fresh articles"
-msgstr "Neue Artikel"
-
-#: help/main.php:70 include/functions.php:1887
-msgid "Starred articles"
-msgstr "Markierte Artikel"
-
-#: help/main.php:71 include/functions.php:1889
-msgid "Published articles"
-msgstr "Veröffentlichte Artikel"
-
-#: help/main.php:72
-msgid "Tag cloud"
-msgstr "Tagwolke"
-
-#: help/main.php:79
-msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
-msgstr "Im Wiki von Tiny Tiny RSS finden Sie weitere Tipps."
-
-#: help/main.php:81 help/prefs.php:41
-msgid "Press any key to close this window."
-msgstr "Drücken Sie eine beliebige Taste um dieses Fenster zu schließen."
-
-#: help/prefs.php:9
-msgid "My Feeds"
-msgstr "Meine Feeds"
-
-#: help/prefs.php:10
-#, fuzzy
-msgid "Other Feeds"
-msgstr "Weitere Feeds"
-
-#: help/prefs.php:19
-msgid "Panel actions"
-msgstr "Panel Aktionen"
-
-#: help/prefs.php:23
-msgid "Top 25 feeds"
-msgstr "Top 25 Feeds"
-
-#: help/prefs.php:24
-msgid "Edit feed categories"
-msgstr "Feedkategorien bearbeiten"
-
-#: help/prefs.php:27 classes/pref/users.php:386
-msgid "Create user"
-msgstr "Benutzer anlegen"
-
-#: help/prefs.php:33
-msgid "Focus search (if present)"
-msgstr "Fokussierte Suche (wenn gewählt)"
-
-#: help/prefs.php:39
-msgid ""
-"<b>Note:</b> not all actions may be available, depending on Tiny Tiny RSS "
-"configuration and your access level."
-msgstr ""
-"<b>Anmerkung:</b> Abhängig von Ihren Tiny-Tiny-RSS-Einstellungen und "
-"Zugriffsrechten könnten nicht alle Aktionen verfügbar sein."
-
 #: mobile/login_form.php:28 include/login_form.php:209
-#: classes/handler/public.php:495
+#: classes/handler/public.php:469
 msgid "Log in"
 msgstr "Anmelden"
 
 #: mobile/login_form.php:40 include/login_form.php:169
-#: classes/handler/public.php:479
+#: classes/handler/public.php:453
 msgid "Login:"
 msgstr "Benutzername:"
 
 #: mobile/login_form.php:45 include/login_form.php:178
-#: classes/handler/public.php:482
+#: classes/handler/public.php:456
 msgid "Password:"
 msgstr "Passwort:"
 
@@ -775,8 +544,8 @@ msgstr "Reguläre Version öffnen"
 msgid "Home"
 msgstr "Startseite"
 
-#: mobile/mobile-functions.php:178 include/functions.php:1187
-#: include/functions.php:1834
+#: mobile/mobile-functions.php:178 include/functions.php:1116
+#: include/functions.php:1737
 msgid "Special"
 msgstr "Sonderfeeds"
 
@@ -789,12 +558,12 @@ msgid "Enable categories"
 msgstr "Feedkategorien aktivieren"
 
 #: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36
-#: mobile/prefs.php:41 mobile/prefs.php:46
+#: mobile/prefs.php:41 mobile/prefs.php:46 mobile/prefs.php:51
 msgid "ON"
 msgstr "AN"
 
 #: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36
-#: mobile/prefs.php:41 mobile/prefs.php:46
+#: mobile/prefs.php:41 mobile/prefs.php:46 mobile/prefs.php:51
 msgid "OFF"
 msgstr "AUS"
 
@@ -814,144 +583,318 @@ msgstr "Gelesene Artikel und Feeds nicht anzeigen"
 msgid "Sort feeds by unread count"
 msgstr "Feeds nach Anzahl der ungelesenen Artikel sortieren"
 
-#: include/functions.php:564
-#, php-format
-msgid "Fatal: authentication module %s not found."
-msgstr ""
+#: mobile/prefs.php:50 include/localized_schema.php:45
+msgid "Reverse headline order (oldest first)"
+msgstr "Schlagzeilensortierung umkehren (älteste zuerst)"
 
-#: include/functions.php:682
-msgid "Session failed to validate (incorrect IP)"
-msgstr "Session konnte nicht validiert werden (falsche IP)"
-
-#: include/functions.php:1198 include/functions.php:1737
-#: include/functions.php:1822 include/functions.php:1844
-#: include/functions.php:2699 classes/opml.php:416 classes/pref/feeds.php:193
+#: include/digest.php:131 include/functions.php:1127
+#: include/functions.php:1640 include/functions.php:1725
+#: include/functions.php:1747 classes/opml.php:416 classes/pref/feeds.php:188
 msgid "Uncategorized"
 msgstr "Unkategorisiert"
 
-#: include/functions.php:1686 classes/dlg.php:387 classes/pref/filters.php:361
-msgid "All feeds"
-msgstr "Alle Feeds"
-
-#: include/functions.php:1895
-msgid "Archived articles"
-msgstr "Archivierte Artikel"
-
-#: include/functions.php:1897
-msgid "Recently read"
-msgstr "Kürzlich gelesen"
-
-#: include/functions.php:2346
-#, php-format
-msgid "Search results: %s"
-msgstr "Suchergebnisse: %s"
-
-#: include/functions.php:3067 js/viewfeed.js:1998 js/viewfeed.js:1971
-#: js/viewfeed.js:1835 js/viewfeed.js:1845
-msgid "Click to play"
-msgstr "Zum Abspielen klicken"
-
-#: include/functions.php:3068 js/viewfeed.js:1997 js/viewfeed.js:1970
-#: js/viewfeed.js:1834 js/viewfeed.js:1844
-msgid "Play"
-msgstr "Abspielen"
-
-#: include/functions.php:3203
-msgid " - "
-msgstr " - "
-
-#: include/functions.php:3232 include/functions.php:4028 classes/rpc.php:414
-msgid "no tags"
-msgstr "Keine Tags"
-
-#: include/functions.php:3242 classes/feeds.php:680
-msgid "Edit tags for this article"
-msgstr "Tags für diesen Artikel bearbeiten"
-
-#: include/functions.php:3252 classes/feeds.php:707
-msgid "Open article in new tab"
-msgstr "Artikel in neuem Reiter öffnen"
-
-#: include/functions.php:3263 classes/feeds.php:718
-msgid "Close article"
-msgstr "Artikel schließen"
-
-#: include/functions.php:3280 classes/feeds.php:616
-msgid "Originally from:"
-msgstr "Original von:"
-
-#: include/functions.php:3293 classes/feeds.php:629 classes/pref/feeds.php:511
-msgid "Feed URL"
-msgstr "Feed URL"
-
-#: include/functions.php:3308 classes/feeds.php:68
-msgid "Visit the website"
-msgstr "Offizielle Website besuchen"
-
-#: include/functions.php:3327
-msgid "Related"
-msgstr "Ähnlich"
-
-#: include/functions.php:3361 classes/dlg.php:30 classes/dlg.php:61
-#: classes/dlg.php:180 classes/dlg.php:203 classes/dlg.php:240
-#: classes/dlg.php:524 classes/dlg.php:559 classes/dlg.php:590
-#: classes/dlg.php:623 classes/dlg.php:724 classes/pref/users.php:106
-#: classes/pref/filters.php:101 classes/pref/feeds.php:1638
-#: classes/pref/feeds.php:1709 plugins/share/share.php:61
-#: plugins/updater/updater.php:301 plugins/updater/init.php:323
-msgid "Close this window"
-msgstr "Fenster schließen"
-
-#: include/functions.php:4053
-msgid "(edit note)"
-msgstr "(Notiz bearbeiten)"
-
-#: include/functions.php:4525
-msgid "No feed selected."
-msgstr "Kein Feed ausgewählt."
-
-#: include/functions.php:4535 classes/feeds.php:766
-#, php-format
-msgid "Feeds last updated at %s"
-msgstr "Feeds zuletzt aktualisiert am %s"
-
-#: include/functions.php:4545 classes/feeds.php:776
-msgid "Some feeds have update errors (click for details)"
-msgstr "Einige Feeds haben Aktualisierungsfehler (klicken für Details)"
-
-#: include/functions.php:4689
-msgid "unknown type"
-msgstr "unbekannter Typ"
-
-#: include/functions.php:4731
-msgid "Attachments"
-msgstr "Anhänge:"
-
-#: include/functions.php:5191
+#: include/feedbrowser.php:83
 #, php-format
 msgid "%d archived articles"
 msgstr "%d archivierte Artikel"
 
-#: include/functions.php:5215
+#: include/feedbrowser.php:107
 msgid "No feeds found."
 msgstr "Keine Feeds gefunden."
 
-#: include/functions.php:5261 plugins/import_export/init.php:221
-msgid "Could not import: incorrect schema version."
-msgstr "Import fehlgeschlagen: Falsche Schemaversion"
+#: include/functions.php:698
+msgid "Session failed to validate (incorrect IP)"
+msgstr "Session konnte nicht validiert werden (falsche IP)"
 
-#: include/functions.php:5266 plugins/import_export/init.php:226
-msgid "Could not import: unrecognized document format."
-msgstr "Import fehlgeschlagen: Unbekanntes Format"
+#: include/functions.php:1589 classes/dlg.php:371 classes/pref/filters.php:368
+msgid "All feeds"
+msgstr "Alle Feeds"
 
-#: include/functions.php:5425
+#: include/functions.php:1790
+msgid "Starred articles"
+msgstr "Markierte Artikel"
+
+#: include/functions.php:1792
+msgid "Published articles"
+msgstr "Veröffentlichte Artikel"
+
+#: include/functions.php:1794
+msgid "Fresh articles"
+msgstr "Neue Artikel"
+
+#: include/functions.php:1796 include/functions.php:1910
+msgid "All articles"
+msgstr "Alle Artikel"
+
+#: include/functions.php:1798
+msgid "Archived articles"
+msgstr "Archivierte Artikel"
+
+#: include/functions.php:1800
+msgid "Recently read"
+msgstr "Kürzlich gelesen"
+
+#: include/functions.php:1867
+msgid "Navigation"
+msgstr "Navigation"
+
+#: include/functions.php:1868
+msgid "Open next feed"
+msgstr "Nächsten Feed öffnen"
+
+#: include/functions.php:1869
+msgid "Open previous feed"
+msgstr "Vorherigen Feed öffnen"
+
+#: include/functions.php:1870
+msgid "Open next article"
+msgstr "Nächsten Artikel öffnen"
+
+#: include/functions.php:1871
+msgid "Open previous article"
+msgstr "Vorherigen Artikel öffnen"
+
+#: include/functions.php:1872
+msgid "Open next article (don't scroll long articles)"
+msgstr ""
+
+#: include/functions.php:1873
+msgid "Open previous article (don't scroll long articles)"
+msgstr ""
+
+#: include/functions.php:1874
+msgid "Show search dialog"
+msgstr "Suchdialog anzeigen"
+
+#: include/functions.php:1875
+msgid "Article"
+msgstr "Artikel"
+
+#: include/functions.php:1876
+msgid "Toggle starred"
+msgstr "Markierung umschalten"
+
+#: include/functions.php:1877
+msgid "Toggle published"
+msgstr "Veröffentlicht umschalten"
+
+#: include/functions.php:1878
+msgid "Toggle unread"
+msgstr "Gelesen umschalten"
+
+#: include/functions.php:1879
+msgid "Edit tags"
+msgstr "Tags bearbeiten"
+
+#: include/functions.php:1880
+#, fuzzy
+msgid "Dismiss selected"
+msgstr "Ausgewählte Artikel verbergen"
+
+#: include/functions.php:1881
+#, fuzzy
+msgid "Dismiss read"
+msgstr "Gelesene Artikel verbergen"
+
+#: include/functions.php:1882
+#, fuzzy
+msgid "Open in new window"
+msgstr "In neuem Fenster öffnen"
+
+#: include/functions.php:1883 js/viewfeed.js:1758
+msgid "Mark below as read"
+msgstr "Untere als gelesen markieren"
+
+#: include/functions.php:1884 js/viewfeed.js:1752
+msgid "Mark above as read"
+msgstr "Obige als gelesen markieren"
+
+#: include/functions.php:1885
+msgid "Scroll down"
+msgstr "Nach unten scrollen"
+
+#: include/functions.php:1886
+msgid "Scroll up"
+msgstr "Nach oben scrollen"
+
+#: include/functions.php:1887
+#, fuzzy
+msgid "Select article under cursor"
+msgstr "Artikel unter Mauszeiger auswählen"
+
+#: include/functions.php:1888
+msgid "Email article"
+msgstr "Artikel per E-Mail versenden"
+
+#: include/functions.php:1889 plugins/close_button/init.php:24
+msgid "Close article"
+msgstr "Artikel schließen"
+
+#: include/functions.php:1891
+msgid "Article selection"
+msgstr "Artikelauswahl"
+
+#: include/functions.php:1892
+msgid "Select all articles"
+msgstr "Alle Artikel auswählen"
+
+#: include/functions.php:1893
+msgid "Select unread"
+msgstr "Ungelesene Artikel auswählen"
+
+#: include/functions.php:1894
+msgid "Select starred"
+msgstr "Markierte Artikel auswählen"
+
+#: include/functions.php:1895
+msgid "Select published"
+msgstr "Veröffentlichte Artikel auswählen"
+
+#: include/functions.php:1896
+#, fuzzy
+msgid "Invert selection"
+msgstr "Artikelauswahl umkehren"
+
+#: include/functions.php:1897
+msgid "Deselect everything"
+msgstr "Auswahl aufheben"
+
+#: include/functions.php:1898 classes/pref/feeds.php:488
+#: classes/pref/feeds.php:707
+msgid "Feed"
+msgstr "Feed"
+
+#: include/functions.php:1899
+#, fuzzy
+msgid "Refresh current feed"
+msgstr "Feed aktualisieren"
+
+#: include/functions.php:1900
+msgid "Un/hide read feeds"
+msgstr "Gelesene zeigen/verstecken"
+
+#: include/functions.php:1901 classes/pref/feeds.php:1214
+msgid "Subscribe to feed"
+msgstr "Feed abonnieren"
+
+#: include/functions.php:1902 js/FeedTree.js:135 js/PrefFeedTree.js:67
+msgid "Edit feed"
+msgstr "Feed bearbeiten"
+
+#: include/functions.php:1904
+#, fuzzy
+msgid "Reverse headlines"
+msgstr "Schlagzeilensortierung umkehren"
+
+#: include/functions.php:1905
+msgid "Debug feed update"
+msgstr "Aktualisierung im Diagnose-Modus durchführen"
+
+#: include/functions.php:1906 js/FeedTree.js:170
+msgid "Mark all feeds as read"
+msgstr "Alle Feeds als gelesen markieren"
+
+#: include/functions.php:1907
+msgid "Un/collapse current category"
+msgstr "Aktuelle Kategorie ein-/ausklappen:"
+
+#: include/functions.php:1908
+msgid "Toggle combined mode"
+msgstr "Kombinierte Feed-Anzeige umschalten"
+
+#: include/functions.php:1909
+#, fuzzy
+msgid "Go to"
+msgstr "Gehe zu..."
+
+#: include/functions.php:1911
+msgid "Fresh"
+msgstr "Neu"
+
+#: include/functions.php:1914
+msgid "Tag cloud"
+msgstr "Tagwolke"
+
+#: include/functions.php:1916
+msgid "Other"
+msgstr "Sonstiges"
+
+#: include/functions.php:1917 classes/pref/labels.php:281
+msgid "Create label"
+msgstr "Label erstellen"
+
+#: include/functions.php:1918 classes/pref/filters.php:587
+msgid "Create filter"
+msgstr "Filter erstellen"
+
+#: include/functions.php:1919
+#, fuzzy
+msgid "Un/collapse sidebar"
+msgstr "Seitenleiste ein-/ausklappen"
+
+#: include/functions.php:1920
+msgid "Show help dialog"
+msgstr "Hilfe anzeigen"
+
+#: include/functions.php:2400
 #, php-format
-msgid "Finished: %d articles processed, %d imported, %d feeds created."
-msgstr "Fertig: %d Artikel bearbeitet, %d importiert, %d Feeds erstellt."
+msgid "Search results: %s"
+msgstr "Suchergebnisse: %s"
 
-#: include/functions.php:5431 plugins/import_export/init.php:391
-msgid "Could not load XML document."
-msgstr "Konnte XML-Datei nicht laden."
+#: include/functions.php:2824 js/viewfeed.js:1845
+msgid "Click to play"
+msgstr "Zum Abspielen klicken"
+
+#: include/functions.php:2825 js/viewfeed.js:1844
+msgid "Play"
+msgstr "Abspielen"
+
+#: include/functions.php:2945
+msgid " - "
+msgstr " - "
+
+#: include/functions.php:2967 include/functions.php:3284 classes/rpc.php:359
+msgid "no tags"
+msgstr "Keine Tags"
+
+#: include/functions.php:2977 classes/feeds.php:645
+msgid "Edit tags for this article"
+msgstr "Tags für diesen Artikel bearbeiten"
+
+#: include/functions.php:3006 classes/feeds.php:600
+msgid "Originally from:"
+msgstr "Original von:"
+
+#: include/functions.php:3019 classes/feeds.php:613 classes/pref/feeds.php:507
+msgid "Feed URL"
+msgstr "Feed URL"
+
+#: include/functions.php:3048
+msgid "Related"
+msgstr "Ähnlich"
+
+#: include/functions.php:3075 classes/dlg.php:43 classes/dlg.php:162
+#: classes/dlg.php:185 classes/dlg.php:222 classes/dlg.php:508
+#: classes/dlg.php:543 classes/dlg.php:574 classes/dlg.php:608
+#: classes/dlg.php:620 classes/backend.php:105 classes/pref/users.php:106
+#: classes/pref/filters.php:108 classes/pref/feeds.php:1527
+#: classes/pref/feeds.php:1598 plugins/import_export/init.php:407
+#: plugins/import_export/init.php:431 plugins/share/init.php:67
+#: plugins/updater/init.php:329
+msgid "Close this window"
+msgstr "Fenster schließen"
+
+#: include/functions.php:3309
+msgid "(edit note)"
+msgstr "(Notiz bearbeiten)"
+
+#: include/functions.php:3542
+msgid "unknown type"
+msgstr "unbekannter Typ"
+
+#: include/functions.php:3592
+msgid "Attachments"
+msgstr "Anhänge:"
 
 #: include/localized_schema.php:4
 msgid "Title or Content"
@@ -977,9 +920,8 @@ msgstr "Artikel löschen"
 msgid "Set starred"
 msgstr "Markierung setzen"
 
-#: include/localized_schema.php:12 js/viewfeed.js:501 js/viewfeed.js:490
-#: js/viewfeed.js:496 js/viewfeed.js:478 plugins/digest/digest.js:264
-#: plugins/digest/digest.js:736
+#: include/localized_schema.php:12 js/viewfeed.js:478
+#: plugins/digest/digest.js:264 plugins/digest/digest.js:736
 msgid "Publish article"
 msgstr "Artikel veröffentlichen"
 
@@ -987,8 +929,7 @@ msgstr "Artikel veröffentlichen"
 msgid "Assign tags"
 msgstr "Tags zuweisen"
 
-#: include/localized_schema.php:14 js/viewfeed.js:1962 js/viewfeed.js:1935
-#: js/viewfeed.js:1799 js/viewfeed.js:1809
+#: include/localized_schema.php:14 js/viewfeed.js:1809
 msgid "Assign label"
 msgstr "Label zuweisen"
 
@@ -1134,10 +1075,6 @@ msgstr "Den nächsten Feed anzeigen"
 msgid "Sort feeds by unread articles count"
 msgstr "Feeds nach Anzahl der ungelesenen Artikel sortieren"
 
-#: include/localized_schema.php:45
-msgid "Reverse headline order (oldest first)"
-msgstr "Schlagzeilensortierung umkehren (älteste zuerst)"
-
 #: include/localized_schema.php:46
 msgid "Enable e-mail digest"
 msgstr "Aktiviere E-Mail-Zusammenfassung"
@@ -1184,7 +1121,7 @@ msgstr "Schlagzeilen in virtuellen Feeds gruppieren"
 
 #: include/localized_schema.php:57
 #, fuzzy
-msgid "Do not show images in articles"
+msgid "Hide images in articles"
 msgstr "Keine Bilder in Artikeln anzeigen"
 
 #: include/localized_schema.php:58
@@ -1195,8 +1132,7 @@ msgstr "Externe API aktivieren"
 msgid "User timezone"
 msgstr "Zeitzone des Benutzers"
 
-#: include/localized_schema.php:60 js/prefs.js:1856 js/prefs.js:1743
-#: js/prefs.js:1733
+#: include/localized_schema.php:60 js/prefs.js:1733
 msgid "Customize stylesheet"
 msgstr "Benutzer Stylesheet"
 
@@ -1216,7 +1152,7 @@ msgstr "Zusammenfassungen zu einer bestimmten Uhrzeit zu senden"
 msgid "Assign articles to labels automatically"
 msgstr ""
 
-#: include/login_form.php:185 classes/handler/public.php:485
+#: include/login_form.php:185 classes/handler/public.php:459
 msgid "Language:"
 msgstr "Sprache:"
 
@@ -1224,8 +1160,8 @@ msgstr "Sprache:"
 msgid "Profile:"
 msgstr "Profil:"
 
-#: include/login_form.php:197 classes/handler/public.php:208
-#: classes/rpc.php:147 classes/dlg.php:116
+#: include/login_form.php:197 classes/handler/public.php:212
+#: classes/rpc.php:64 classes/dlg.php:98
 msgid "Default profile"
 msgstr "Standardprofil"
 
@@ -1237,112 +1173,96 @@ msgstr "Weniger Datenverkehr nutzen"
 msgid "Article not found."
 msgstr "Artikel nicht gefunden."
 
-#: classes/handler/public.php:420 classes/pref/feeds.php:1480
+#: classes/handler/public.php:394 plugins/bookmarklets/init.php:38
 msgid "Share with Tiny Tiny RSS"
 msgstr "Teilen mit Tiny Tiny RSS"
 
-#: classes/handler/public.php:428
+#: classes/handler/public.php:402
 msgid "Title:"
 msgstr "Titel:"
 
-#: classes/handler/public.php:430 classes/dlg.php:667
-#: classes/pref/feeds.php:509 classes/pref/feeds.php:762
-#: plugins/instances/instances.php:100 plugins/instances/init.php:215
+#: classes/handler/public.php:404 classes/dlg.php:667
+#: classes/pref/feeds.php:505 classes/pref/feeds.php:722
+#: plugins/instances/init.php:215
 msgid "URL:"
 msgstr "URL:"
 
-#: classes/handler/public.php:432
+#: classes/handler/public.php:406
 msgid "Content:"
 msgstr "Inhalt"
 
-#: classes/handler/public.php:434
+#: classes/handler/public.php:408
 msgid "Labels:"
 msgstr "Label"
 
-#: classes/handler/public.php:453
+#: classes/handler/public.php:427
 msgid "Shared article will appear in the Published feed."
 msgstr "Weiterempfohlene Artikel erscheinen unter 'Veröffentlichte Artikel'."
 
-#: classes/handler/public.php:455
+#: classes/handler/public.php:429
 msgid "Share"
 msgstr "Teilen"
 
-#: classes/handler/public.php:456 classes/handler/public.php:498
-#: classes/dlg.php:315 classes/dlg.php:366 classes/dlg.php:426
-#: classes/dlg.php:457 classes/dlg.php:652 classes/dlg.php:702
-#: classes/dlg.php:774 classes/pref/users.php:194 classes/pref/labels.php:81
-#: classes/pref/filters.php:342 classes/pref/filters.php:722
-#: classes/pref/filters.php:791 classes/pref/filters.php:858
-#: classes/pref/feeds.php:729 classes/pref/feeds.php:880
-#: plugins/mail/mail.php:126 plugins/note/note.php:49
-#: plugins/instances/instances.php:136
+#: classes/handler/public.php:430 classes/handler/public.php:472
+#: classes/dlg.php:297 classes/dlg.php:350 classes/dlg.php:410
+#: classes/dlg.php:441 classes/dlg.php:652 classes/dlg.php:702
+#: classes/dlg.php:751 classes/pref/users.php:194 classes/pref/labels.php:81
+#: classes/pref/filters.php:349 classes/pref/filters.php:729
+#: classes/pref/filters.php:798 classes/pref/filters.php:865
+#: classes/pref/feeds.php:689 classes/pref/feeds.php:829
+#: plugins/mail/init.php:132 plugins/note/init.php:55
+#: plugins/instances/init.php:251
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: classes/handler/public.php:477
+#: classes/handler/public.php:451
 msgid "Not logged in"
 msgstr "Nicht angemeldet"
 
-#: classes/handler/public.php:537
+#: classes/handler/public.php:511
 msgid "Incorrect username or password"
 msgstr "Benutzername oder Passwort falsch"
 
-#: classes/handler/public.php:573 classes/handler/public.php:670
+#: classes/handler/public.php:547 classes/handler/public.php:644
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "<b>%s</b> bereits abonniert."
 
-#: classes/handler/public.php:576 classes/handler/public.php:661
+#: classes/handler/public.php:550 classes/handler/public.php:635
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "<b>%s</b> abonniert."
 
-#: classes/handler/public.php:579 classes/handler/public.php:664
+#: classes/handler/public.php:553 classes/handler/public.php:638
 #, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "<b>%s</b> bereits abonniert."
 
-#: classes/handler/public.php:582 classes/handler/public.php:667
+#: classes/handler/public.php:556 classes/handler/public.php:641
 #, php-format
 msgid "No feeds found in <b>%s</b>."
 msgstr "Keine Feeds in <b>%s</b> gefunden."
 
-#: classes/handler/public.php:585 classes/handler/public.php:673
+#: classes/handler/public.php:559 classes/handler/public.php:647
 msgid "Multiple feed URLs found."
 msgstr "Mehrere Feed-URLs gefunden."
 
-#: classes/handler/public.php:589 classes/handler/public.php:678
+#: classes/handler/public.php:563 classes/handler/public.php:652
 #, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr ""
 "Das Abonnieren von <b>%s</b> ist fehlgeschlagen.<br>Der Feed konnte nicht "
 "heruntergeladen werden."
 
-#: classes/handler/public.php:607 classes/handler/public.php:696
+#: classes/handler/public.php:581 classes/handler/public.php:670
 msgid "Subscribe to selected feed"
 msgstr "Ausgewählte Feeds abonnieren"
 
-#: classes/handler/public.php:632 classes/handler/public.php:720
+#: classes/handler/public.php:606 classes/handler/public.php:694
 msgid "Edit subscription options"
 msgstr "Abonnementoptionen bearbeiten"
 
-#: classes/auth/internal.php:45 plugins/auth_internal/init.php:62
-msgid "Please enter your one time password:"
-msgstr "Bitte geben Sie Einmalpasswort ein:"
-
-#: classes/auth/internal.php:168 plugins/auth_internal/init.php:185
-msgid "Password has been changed."
-msgstr "Passwort wurde geändert."
-
-#: classes/auth/internal.php:170
-msgid "Old password is incorrect."
-msgstr "Altes Passwort ist falsch."
-
-#: classes/dlg.php:26
-msgid "Prepare data"
-msgstr "Bereite Daten vor"
-
-#: classes/dlg.php:40
+#: classes/dlg.php:22
 msgid ""
 "If you have imported labels and/or filters, you might need to reload "
 "preferences to see your new data."
@@ -1350,66 +1270,66 @@ msgstr ""
 "Wenn Label und/oder Filter importiert wurden, müssen die Einstellungen "
 "erneut geladen werden um alle neuen Einstellungen zu sehen."
 
-#: classes/dlg.php:73 classes/pref/users.php:378 classes/pref/labels.php:272
-#: classes/pref/filters.php:223 classes/pref/filters.php:270
-#: classes/pref/filters.php:571 classes/pref/filters.php:650
-#: classes/pref/filters.php:677 classes/pref/feeds.php:1274
-#: classes/pref/feeds.php:1583 classes/pref/feeds.php:1652
-#: plugins/instances/instances.php:172
+#: classes/dlg.php:55 classes/pref/users.php:378 classes/pref/labels.php:272
+#: classes/pref/filters.php:230 classes/pref/filters.php:277
+#: classes/pref/filters.php:578 classes/pref/filters.php:657
+#: classes/pref/filters.php:684 classes/pref/feeds.php:1202
+#: classes/pref/feeds.php:1472 classes/pref/feeds.php:1541
+#: plugins/instances/init.php:287
 msgid "Select"
 msgstr "Auswahl"
 
-#: classes/dlg.php:76 classes/feeds.php:92 classes/pref/users.php:381
-#: classes/pref/labels.php:275 classes/pref/filters.php:226
-#: classes/pref/filters.php:273 classes/pref/filters.php:574
-#: classes/pref/filters.php:653 classes/pref/filters.php:680
-#: classes/pref/feeds.php:1277 classes/pref/feeds.php:1586
-#: classes/pref/feeds.php:1655 plugins/instances/instances.php:175
+#: classes/dlg.php:58 classes/feeds.php:92 classes/pref/users.php:381
+#: classes/pref/labels.php:275 classes/pref/filters.php:233
+#: classes/pref/filters.php:280 classes/pref/filters.php:581
+#: classes/pref/filters.php:660 classes/pref/filters.php:687
+#: classes/pref/feeds.php:1205 classes/pref/feeds.php:1475
+#: classes/pref/feeds.php:1544 plugins/instances/init.php:290
 msgid "All"
 msgstr "Alle"
 
-#: classes/dlg.php:78 classes/feeds.php:95 classes/pref/users.php:383
-#: classes/pref/labels.php:277 classes/pref/filters.php:228
-#: classes/pref/filters.php:275 classes/pref/filters.php:576
-#: classes/pref/filters.php:655 classes/pref/filters.php:682
-#: classes/pref/feeds.php:1279 classes/pref/feeds.php:1588
-#: classes/pref/feeds.php:1657 plugins/instances/instances.php:177
+#: classes/dlg.php:60 classes/feeds.php:95 classes/pref/users.php:383
+#: classes/pref/labels.php:277 classes/pref/filters.php:235
+#: classes/pref/filters.php:282 classes/pref/filters.php:583
+#: classes/pref/filters.php:662 classes/pref/filters.php:689
+#: classes/pref/feeds.php:1207 classes/pref/feeds.php:1477
+#: classes/pref/feeds.php:1546 plugins/instances/init.php:292
 msgid "None"
 msgstr "Keine"
 
-#: classes/dlg.php:87
+#: classes/dlg.php:69
 msgid "Create profile"
 msgstr "Profil erstellen"
 
-#: classes/dlg.php:110 classes/dlg.php:140
+#: classes/dlg.php:92 classes/dlg.php:122
 msgid "(active)"
 msgstr "(aktiv)"
 
-#: classes/dlg.php:174
+#: classes/dlg.php:156
 msgid "Remove selected profiles"
 msgstr "Ausgewählte Profile entfernen"
 
-#: classes/dlg.php:176
+#: classes/dlg.php:158
 msgid "Activate profile"
 msgstr "Aktives Profil"
 
-#: classes/dlg.php:186
+#: classes/dlg.php:168
 msgid "Public OPML URL"
 msgstr "Öffentliche OPML-URL"
 
-#: classes/dlg.php:191
+#: classes/dlg.php:173
 msgid "Your Public OPML URL is:"
 msgstr "Ihre öffentliche OPML-URL lautet:"
 
-#: classes/dlg.php:200 classes/dlg.php:587
+#: classes/dlg.php:182 classes/dlg.php:571
 msgid "Generate new URL"
 msgstr "Erzeuge neue URL"
 
-#: classes/dlg.php:212
+#: classes/dlg.php:194
 msgid "Notice"
 msgstr "Anmerkung"
 
-#: classes/dlg.php:218
+#: classes/dlg.php:200
 msgid ""
 "Update daemon is enabled in configuration, but daemon process is not "
 "running, which prevents all feeds from updating. Please start the daemon "
@@ -1420,11 +1340,11 @@ msgstr ""
 "Bitte starten Sie den Prozess des Daemons oder benachrichtigen Sie den "
 "Besitzer der Instanz."
 
-#: classes/dlg.php:222 classes/dlg.php:231
+#: classes/dlg.php:204 classes/dlg.php:213
 msgid "Last update:"
 msgstr "Letzte Aktualisierung:"
 
-#: classes/dlg.php:227
+#: classes/dlg.php:209
 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 "
@@ -1435,149 +1355,152 @@ msgstr ""
 "Blockierung hinweisen. Bitte überprüfen Sie den Prozess des Daemons oder "
 "benachrichtigen Sie den Besitzer des Instanz."
 
-#: classes/dlg.php:252 classes/dlg.php:261
+#: classes/dlg.php:234 classes/dlg.php:243
 msgid "Feed or site URL"
 msgstr "URL von Feed oder Site"
 
-#: classes/dlg.php:267 classes/dlg.php:738 classes/pref/feeds.php:531
-#: classes/pref/feeds.php:775
+#: classes/dlg.php:249 classes/dlg.php:715 classes/pref/feeds.php:527
+#: classes/pref/feeds.php:735
 msgid "Place in category:"
 msgstr "In Kategorie einordnen:"
 
-#: classes/dlg.php:275
+#: classes/dlg.php:257
 msgid "Available feeds"
 msgstr "Verfügbare Feeds"
 
-#: classes/dlg.php:287 classes/pref/users.php:155 classes/pref/feeds.php:561
-#: classes/pref/feeds.php:811
+#: classes/dlg.php:269 classes/pref/users.php:155 classes/pref/feeds.php:557
+#: classes/pref/feeds.php:771
 msgid "Authentication"
 msgstr "Authentifizierung"
 
-#: classes/dlg.php:291 classes/dlg.php:752 classes/pref/users.php:438
-#: classes/pref/feeds.php:567 classes/pref/feeds.php:815
+#: classes/dlg.php:273 classes/dlg.php:729 classes/pref/users.php:438
+#: classes/pref/feeds.php:563 classes/pref/feeds.php:775
 msgid "Login"
 msgstr "Benutzername"
 
-#: classes/dlg.php:294 classes/dlg.php:755 classes/pref/prefs.php:200
-#: classes/pref/feeds.php:573 classes/pref/feeds.php:821
+#: classes/dlg.php:276 classes/dlg.php:732 classes/pref/prefs.php:196
+#: classes/pref/feeds.php:569 classes/pref/feeds.php:781
 msgid "Password"
 msgstr "Passwort"
 
-#: classes/dlg.php:304
+#: classes/dlg.php:286
 msgid "This feed requires authentication."
 msgstr "Dieser Feed erfordert Authentifizierung."
 
-#: classes/dlg.php:309 classes/dlg.php:364 classes/dlg.php:773
+#: classes/dlg.php:291 classes/dlg.php:348 classes/dlg.php:750
 msgid "Subscribe"
 msgstr "Abonnieren"
 
-#: classes/dlg.php:312
+#: classes/dlg.php:294
 msgid "More feeds"
 msgstr "Weitere Feeds"
 
-#: classes/dlg.php:336 classes/dlg.php:425 classes/pref/users.php:368
-#: classes/pref/filters.php:567 classes/pref/feeds.php:1270 js/tt-rss.js:234
-#: js/tt-rss.js:187 js/tt-rss.js:166
+#: classes/dlg.php:318 classes/dlg.php:409 classes/pref/users.php:368
+#: classes/pref/filters.php:574 classes/pref/feeds.php:1198 js/tt-rss.js:166
 msgid "Search"
 msgstr "Suchen"
 
-#: classes/dlg.php:340
+#: classes/dlg.php:322
 msgid "Popular feeds"
 msgstr "Beliebte Feeds"
 
-#: classes/dlg.php:341
+#: classes/dlg.php:323
 msgid "Feed archive"
 msgstr "Feed-Archiv"
 
-#: classes/dlg.php:344
+#: classes/dlg.php:326
 msgid "limit:"
 msgstr "Grenzwert:"
 
-#: classes/dlg.php:365 classes/pref/users.php:394 classes/pref/labels.php:284
-#: classes/pref/filters.php:332 classes/pref/filters.php:589
-#: classes/pref/feeds.php:702 plugins/instances/instances.php:182
+#: classes/dlg.php:349 classes/pref/users.php:394 classes/pref/labels.php:284
+#: classes/pref/filters.php:339 classes/pref/filters.php:596
+#: classes/pref/feeds.php:662 plugins/instances/init.php:297
 msgid "Remove"
 msgstr "Entfernen"
 
-#: classes/dlg.php:376
+#: classes/dlg.php:360
 msgid "Look for"
 msgstr "Suche nach"
 
-#: classes/dlg.php:384
+#: classes/dlg.php:368
 msgid "Limit search to:"
 msgstr "Suche begrenzen auf:"
 
-#: classes/dlg.php:400
+#: classes/dlg.php:384
 msgid "This feed"
 msgstr "Diesen Feed"
 
-#: classes/dlg.php:432
+#: classes/dlg.php:416
 msgid "Tags for this article (separated by commas):"
 msgstr "Tags für diesen Artikel (kommagetrennt)"
 
-#: classes/dlg.php:455 classes/dlg.php:650 classes/pref/users.php:192
-#: classes/pref/labels.php:79 classes/pref/filters.php:339
-#: classes/pref/feeds.php:728 classes/pref/feeds.php:877
-#: plugins/note/note.php:47 plugins/instances/instances.php:133
-#: plugins/nsfw/init.php:86 plugins/owncloud/init.php:62
+#: classes/dlg.php:439 classes/dlg.php:650 classes/pref/users.php:192
+#: classes/pref/labels.php:79 classes/pref/filters.php:346
+#: classes/pref/feeds.php:688 classes/pref/feeds.php:826
+#: plugins/nsfw/init.php:86 plugins/note/init.php:53
+#: plugins/owncloud/init.php:62 plugins/instances/init.php:248
 msgid "Save"
 msgstr "Speichern"
 
-#: classes/dlg.php:463
+#: classes/dlg.php:447
 msgid "Tag Cloud"
 msgstr "Tagwolke"
 
-#: classes/dlg.php:532
+#: classes/dlg.php:516
 msgid "Select item(s) by tags"
 msgstr "Artikel nach Tag auswählen"
 
-#: classes/dlg.php:535
+#: classes/dlg.php:519
 msgid "Match:"
 msgstr "Suche: "
 
-#: classes/dlg.php:537
+#: classes/dlg.php:521
 msgid "Any"
 msgstr "Beliebig"
 
-#: classes/dlg.php:540
+#: classes/dlg.php:524
 msgid "All tags."
 msgstr "Alle Tags."
 
-#: classes/dlg.php:542
+#: classes/dlg.php:526
 msgid "Which Tags?"
 msgstr "Welche Tags?"
 
-#: classes/dlg.php:555
+#: classes/dlg.php:539
 msgid "Display entries"
 msgstr "Einträge anzeigen"
 
-#: classes/dlg.php:567 classes/feeds.php:129
+#: classes/dlg.php:551 classes/feeds.php:133
 msgid "View as RSS"
 msgstr "Als RSS anzeigen"
 
-#: classes/dlg.php:578
+#: classes/dlg.php:562
 msgid "You can view this feed as RSS using the following URL:"
 msgstr "Sie finden diesen Feed als RSS unter der folgenden URL:"
 
-#: classes/dlg.php:606 plugins/updater/updater.php:276
+#: classes/dlg.php:591 plugins/updater/init.php:303
 #, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "Neue Version von Tiny Tiny RSS verfügbar (%s)."
 
-#: classes/dlg.php:614
+#: classes/dlg.php:599
 msgid ""
 "You can update using built-in updater in the Preferences or by using update."
 "php"
 msgstr ""
 
-#: classes/dlg.php:618 classes/pref/users.php:390
+#: classes/dlg.php:603 classes/pref/users.php:390
 msgid "Details"
 msgstr "Details"
 
-#: classes/dlg.php:620
+#: classes/dlg.php:605
 msgid "Download"
 msgstr "Download"
 
+#: classes/dlg.php:613
+msgid "Error receiving version information or no new version available."
+msgstr "Das Abrufen von Update-Informationen ist fehlgeschlagen."
+
 #: classes/dlg.php:634
 #, php-format
 msgid ""
@@ -1590,33 +1513,30 @@ msgstr ""
 "class=\"visibleLink\" href=\"%s\">Diese Datei</a> kann als Basis benutzt "
 "werden."
 
-#: classes/dlg.php:661 plugins/instances/instances.php:92
-#: plugins/instances/init.php:207
+#: classes/dlg.php:661 plugins/instances/init.php:207
 msgid "Instance"
 msgstr "Instanz"
 
-#: classes/dlg.php:670 plugins/instances/instances.php:103
-#: plugins/instances/instances.php:200 plugins/instances/init.php:218
+#: classes/dlg.php:670 plugins/instances/init.php:218
+#: plugins/instances/init.php:315
 msgid "Instance URL"
 msgstr "Instanz-URL"
 
-#: classes/dlg.php:680 plugins/instances/instances.php:114
-#: plugins/instances/init.php:229
+#: classes/dlg.php:680 plugins/instances/init.php:229
 msgid "Access key:"
 msgstr "Zugriffsberechtigung:"
 
-#: classes/dlg.php:683 plugins/instances/instances.php:117
-#: plugins/instances/instances.php:201 plugins/instances/init.php:232
+#: classes/dlg.php:683 plugins/instances/init.php:232
+#: plugins/instances/init.php:316
 msgid "Access key"
 msgstr "Zugriffsberechtigung"
 
-#: classes/dlg.php:687 plugins/instances/instances.php:121
-#: plugins/instances/init.php:236
+#: classes/dlg.php:687 plugins/instances/init.php:236
 msgid "Use one access key for both linked instances."
 msgstr ""
 "Benutzen Sie den selben Zugriffschlüssel für beide verbundenen Instanzen."
 
-#: classes/dlg.php:695 plugins/instances/instances.php:129
+#: classes/dlg.php:695 plugins/instances/init.php:244
 msgid "Generate new key"
 msgstr "Neuen Zugriffsschlüssel erzeugen"
 
@@ -1624,27 +1544,22 @@ msgstr "Neuen Zugriffsschlüssel erzeugen"
 msgid "Create link"
 msgstr "Verbindung herstellen"
 
-#: classes/dlg.php:717
-#, fuzzy, php-format
-msgid ""
-"Could not upload file. You might need to adjust upload_max_filesize\n"
-"\t\t\t\tin PHP.ini (current value = %s)"
-msgstr ""
-"Datei konnte nicht hochgeladen werden. Bitte upload_max_filesize \n"
-"in PHP.ini anpassen. (Aktueller Wert = %s)"
-
-#: classes/dlg.php:735
+#: classes/dlg.php:712
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr "Einen gültigen RSS Feed pro Zeile hinzufügen (Keine Feederkennung)"
 
-#: classes/dlg.php:744
+#: classes/dlg.php:721
 msgid "Feeds to subscribe, One per line"
 msgstr "Zu abonierende Feeds, Einen pro Zeile"
 
-#: classes/dlg.php:766
+#: classes/dlg.php:743
 msgid "Feeds require authentication."
 msgstr "Feeds benötigen Anmeldung."
 
+#: classes/feeds.php:68
+msgid "Visit the website"
+msgstr "Offizielle Website besuchen"
+
 #: classes/feeds.php:83
 msgid "View as RSS feed"
 msgstr "Als RSS-Feed anzeigen"
@@ -1657,6 +1572,10 @@ msgstr "Auswahl:"
 msgid "Invert"
 msgstr "Umkehren"
 
+#: classes/feeds.php:101
+msgid "More..."
+msgstr "Mehr.."
+
 #: classes/feeds.php:103
 msgid "Selection toggle:"
 msgstr "Auswahl umschalten:"
@@ -1677,41 +1596,41 @@ msgstr "Archiv"
 msgid "Move back"
 msgstr "Zurückgehen"
 
-#: classes/feeds.php:118 classes/pref/filters.php:235
-#: classes/pref/filters.php:282 classes/pref/filters.php:662
-#: classes/pref/filters.php:689
+#: classes/feeds.php:118 classes/pref/filters.php:242
+#: classes/pref/filters.php:289 classes/pref/filters.php:669
+#: classes/pref/filters.php:696
 msgid "Delete"
 msgstr "Löschen"
 
-#: classes/feeds.php:122 plugins/mail/mail.php:22
+#: classes/feeds.php:125 plugins/mail/init.php:28
 msgid "Forward by email"
 msgstr "Per E-Mail weiterleiten"
 
-#: classes/feeds.php:125
+#: classes/feeds.php:129
 msgid "Feed:"
 msgstr "Feed:"
 
-#: classes/feeds.php:190 classes/feeds.php:844
+#: classes/feeds.php:196 classes/feeds.php:790
 msgid "Feed not found."
 msgstr "Feed nicht gefunden."
 
-#: classes/feeds.php:434 classes/feeds.php:516
+#: classes/feeds.php:403 classes/feeds.php:493
 msgid "mark as read"
 msgstr "als gelesen markieren"
 
-#: classes/feeds.php:739
+#: classes/feeds.php:691
 msgid "No unread articles found to display."
 msgstr "Keine ungelesenen Artikel zum Anzeigen gefunden."
 
-#: classes/feeds.php:742
+#: classes/feeds.php:694
 msgid "No updated articles found to display."
 msgstr "Keine aktualisierten Artikel zum Anzeigen gefunden."
 
-#: classes/feeds.php:745
+#: classes/feeds.php:697
 msgid "No starred articles found to display."
 msgstr "Keine markierten Artikel zum Anzeigen gefunden."
 
-#: classes/feeds.php:749
+#: classes/feeds.php:701
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
@@ -1719,11 +1638,40 @@ msgstr ""
 "Keine Artikel zum Anzeigen gefunden. Sie können Artikel zu Labeln manuell "
 "hinzufügen (siehe obiges Aktionsmenü) oder einen Filter benutzen."
 
-#: classes/feeds.php:751
+#: classes/feeds.php:703
 msgid "No articles found to display."
 msgstr "Keine Artikel zum Anzeigen gefunden."
 
-#: classes/backend.php:26
+#: classes/feeds.php:718 classes/feeds.php:899
+#, php-format
+msgid "Feeds last updated at %s"
+msgstr "Feeds zuletzt aktualisiert am %s"
+
+#: classes/feeds.php:728 classes/feeds.php:909
+msgid "Some feeds have update errors (click for details)"
+msgstr "Einige Feeds haben Aktualisierungsfehler (klicken für Details)"
+
+#: classes/feeds.php:889
+msgid "No feed selected."
+msgstr "Kein Feed ausgewählt."
+
+#: classes/backend.php:34
+msgid "Keyboard Shortcuts"
+msgstr "Tastaturkürzel"
+
+#: classes/backend.php:57
+msgid "Shift"
+msgstr ""
+
+#: classes/backend.php:60
+msgid "Ctrl"
+msgstr ""
+
+#: classes/backend.php:84
+msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
+msgstr "Im Wiki von Tiny Tiny RSS finden Sie weitere Tipps."
+
+#: classes/backend.php:99
 msgid "Help topic not found."
 msgstr "Hilfethema nicht gefunden."
 
@@ -1773,16 +1721,15 @@ msgstr "Füge Filter hinzu..."
 msgid "Processing category: %s"
 msgstr "Bearbeite Kategorie: %s"
 
-#: classes/opml.php:467
+#: classes/opml.php:468
 msgid "Error: please upload OPML file."
 msgstr "Fehler: bitte eine OPML-Datei hochladen."
 
-#: classes/opml.php:474
+#: classes/opml.php:475
 msgid "Error while parsing document."
 msgstr "Fehler beim Parsen des Dokuments."
 
-#: classes/pref/users.php:6 plugins/instances/instances.php:42
-#: plugins/instances/init.php:157
+#: classes/pref/users.php:6 plugins/instances/init.php:157
 msgid "Your access level is insufficient to open this tab."
 msgstr ""
 "Sie haben nicht die benötigten Rechte um diese Registerkarte zu öffnen."
@@ -1823,8 +1770,8 @@ msgstr "Zugriffsberechtigung: "
 msgid "Change password to"
 msgstr "Passwort ändern in"
 
-#: classes/pref/users.php:177 classes/pref/feeds.php:581
-#: classes/pref/feeds.php:827
+#: classes/pref/users.php:177 classes/pref/feeds.php:577
+#: classes/pref/feeds.php:787
 msgid "Options"
 msgstr "Optionen"
 
@@ -1863,8 +1810,12 @@ msgstr "Benachrichtige <b>%s</b>."
 msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] Benachrichtigung: Passwort geändert"
 
-#: classes/pref/users.php:392 classes/pref/filters.php:586
-#: plugins/instances/instances.php:181
+#: classes/pref/users.php:386
+msgid "Create user"
+msgstr "Benutzer anlegen"
+
+#: classes/pref/users.php:392 classes/pref/filters.php:593
+#: plugins/instances/init.php:296
 msgid "Edit"
 msgstr "Bearbeiten"
 
@@ -1880,15 +1831,15 @@ msgstr "Zugriffsberechtigung"
 msgid "Last login"
 msgstr "Zuletzt angemeldet"
 
-#: classes/pref/users.php:461 plugins/instances/instances.php:222
+#: classes/pref/users.php:462 plugins/instances/init.php:337
 msgid "Click to edit"
 msgstr "Zum Bearbeiten klicken"
 
-#: classes/pref/users.php:481
+#: classes/pref/users.php:482
 msgid "No users defined."
 msgstr "Keine Benutzer definiert."
 
-#: classes/pref/users.php:483
+#: classes/pref/users.php:484
 msgid "No matching users found."
 msgstr "Keine zugehörigen Benutzer gefunden."
 
@@ -1926,81 +1877,87 @@ msgid "No recent articles matching this filter have been found."
 msgstr ""
 "Keine kürzlich erschienenen Artikel gefunden, die auf diesen Filter passen."
 
-#: classes/pref/filters.php:218 classes/pref/filters.php:645
-#: classes/pref/filters.php:760
+#: classes/pref/filters.php:98
+msgid ""
+"Complex expressions might not give results while testing due to issues with "
+"database server regexp implementation."
+msgstr ""
+"Komplexe Filter liefern im Testmodus möglichweise keine Ergebnisse, da es "
+"Probleme mit der RegExp-Implementierung des Datenbankservers gibt."
+
+#: classes/pref/filters.php:225 classes/pref/filters.php:652
+#: classes/pref/filters.php:767
 msgid "Match"
 msgstr "Übereinstimmung"
 
-#: classes/pref/filters.php:232 classes/pref/filters.php:279
-#: classes/pref/filters.php:659 classes/pref/filters.php:686
+#: classes/pref/filters.php:239 classes/pref/filters.php:286
+#: classes/pref/filters.php:666 classes/pref/filters.php:693
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: classes/pref/filters.php:265 classes/pref/filters.php:672
+#: classes/pref/filters.php:272 classes/pref/filters.php:679
 msgid "Apply actions"
 msgstr "Aktionen anwenden"
 
-#: classes/pref/filters.php:315 classes/pref/filters.php:701
+#: classes/pref/filters.php:322 classes/pref/filters.php:708
 msgid "Enabled"
 msgstr "Aktiviert"
 
-#: classes/pref/filters.php:324 classes/pref/filters.php:704
+#: classes/pref/filters.php:331 classes/pref/filters.php:711
 msgid "Match any rule"
 msgstr "Einzelne Übereinstimmung ist ausreichend"
 
-#: classes/pref/filters.php:336 classes/pref/filters.php:716
+#: classes/pref/filters.php:343 classes/pref/filters.php:723
 msgid "Test"
 msgstr "Test"
 
-#: classes/pref/filters.php:368
+#: classes/pref/filters.php:375
 #, php-format
 msgid "%s on %s in %s"
 msgstr "%s innerhalb %s von %s"
 
-#: classes/pref/filters.php:583
+#: classes/pref/filters.php:590
 msgid "Combine"
 msgstr "Zusammenfügen"
 
-#: classes/pref/filters.php:593 classes/pref/feeds.php:1329
+#: classes/pref/filters.php:600 classes/pref/feeds.php:1257
 msgid "Rescore articles"
 msgstr "Artikel neu bewerten"
 
-#: classes/pref/filters.php:719
+#: classes/pref/filters.php:726
 msgid "Create"
 msgstr "Erstellen"
 
-#: classes/pref/filters.php:769
+#: classes/pref/filters.php:776
 msgid "on field"
 msgstr "in Feld"
 
-#: classes/pref/filters.php:775 js/PrefFilterTree.js:29
+#: classes/pref/filters.php:782 js/PrefFilterTree.js:29
 #: plugins/digest/digest.js:241
 msgid "in"
 msgstr "in"
 
-#: classes/pref/filters.php:788
+#: classes/pref/filters.php:795
 msgid "Save rule"
 msgstr "Regel speichern"
 
-#: classes/pref/filters.php:788 js/functions.js:1067 js/functions.js:1063
-#: js/functions.js:1071 js/functions.js:1073
+#: classes/pref/filters.php:795 js/functions.js:1078
 msgid "Add rule"
 msgstr "Regel hinzufügen"
 
-#: classes/pref/filters.php:811
+#: classes/pref/filters.php:818
 msgid "Perform Action"
 msgstr "Aktion ausführen"
 
-#: classes/pref/filters.php:837
+#: classes/pref/filters.php:844
 msgid "with parameters:"
 msgstr "mit Parametern:"
 
-#: classes/pref/filters.php:855
+#: classes/pref/filters.php:862
 msgid "Save action"
 msgstr "Aktion speichern"
 
-#: classes/pref/filters.php:855 js/functions.js:1093 js/functions.js:1089
-#: js/functions.js:1097 js/functions.js:1099
+#: classes/pref/filters.php:862 js/functions.js:1104
 msgid "Add action"
 msgstr "Aktion hinzufügen"
 
@@ -2020,76 +1977,76 @@ msgstr "Die eingegebenen Passwörter stimmen nicht überein."
 msgid "Function not supported by authentication module."
 msgstr ""
 
-#: classes/pref/prefs.php:68
+#: classes/pref/prefs.php:63
 msgid "The configuration was saved."
 msgstr "Die Einstellungen wurden gespeichert."
 
-#: classes/pref/prefs.php:83
+#: classes/pref/prefs.php:77
 #, php-format
 msgid "Unknown option: %s"
 msgstr "Unbekannte Option: %s"
 
-#: classes/pref/prefs.php:97
+#: classes/pref/prefs.php:91
 msgid "Your personal data has been saved."
 msgstr "Ihre persönlichen Daten wurden gespeichert."
 
-#: classes/pref/prefs.php:137
+#: classes/pref/prefs.php:131
 msgid "Personal data / Authentication"
 msgstr "Persönliche Daten / Anmeldung"
 
-#: classes/pref/prefs.php:157
+#: classes/pref/prefs.php:151
 msgid "Personal data"
 msgstr "Persönliche Daten"
 
-#: classes/pref/prefs.php:167
+#: classes/pref/prefs.php:161
 msgid "Full name"
 msgstr "Vollständiger Name"
 
-#: classes/pref/prefs.php:171
+#: classes/pref/prefs.php:165
 msgid "E-mail"
 msgstr "E-Mail"
 
-#: classes/pref/prefs.php:177
+#: classes/pref/prefs.php:171
 msgid "Access level"
 msgstr "Zugriffsberechtigung"
 
-#: classes/pref/prefs.php:187
+#: classes/pref/prefs.php:181
 msgid "Save data"
 msgstr "Speichern"
 
-#: classes/pref/prefs.php:207
+#: classes/pref/prefs.php:203
 msgid "Your password is at default value, please change it."
 msgstr "Sie nutzen das Standard Passwort, bitte ändern Sie es."
 
-#: classes/pref/prefs.php:239
+#: classes/pref/prefs.php:235
 msgid "Old password"
 msgstr "Altes Passwort"
 
-#: classes/pref/prefs.php:242
+#: classes/pref/prefs.php:238
 msgid "New password"
 msgstr "Neues Passwort"
 
-#: classes/pref/prefs.php:247
+#: classes/pref/prefs.php:243
 msgid "Confirm password"
 msgstr "Passwort bestätigen"
 
-#: classes/pref/prefs.php:257
+#: classes/pref/prefs.php:253
 msgid "Change password"
 msgstr "Passwort ändern"
 
-#: classes/pref/prefs.php:263
+#: classes/pref/prefs.php:259
 msgid "One time passwords / Authenticator"
 msgstr "Einmalpasswörter (OTP) / Authentifikator"
 
-#: classes/pref/prefs.php:292 classes/pref/prefs.php:343
+#: classes/pref/prefs.php:288 classes/pref/prefs.php:339
 msgid "Enter your password"
 msgstr "Geben Sie Ihr Passwort ein"
 
-#: classes/pref/prefs.php:303
+#: classes/pref/prefs.php:299
 msgid "Disable OTP"
 msgstr "Einmalpasswörter ausschalten"
 
-#: classes/pref/prefs.php:309
+#: classes/pref/prefs.php:305
 msgid ""
 "You will need a compatible Authenticator to use this. Changing your password "
 "would automatically disable OTP."
@@ -2097,67 +2054,101 @@ msgstr ""
 "Sie benötigen einen kompatiblen Authentifikator. Sollten Sie Ihr Passwort "
 "ändern, wird diese Funktion automatisch ausgeschaltet."
 
-#: classes/pref/prefs.php:311
+#: classes/pref/prefs.php:307
 msgid "Scan the following code by the Authenticator application:"
 msgstr "Scannen Sie den folgenden Code mit Ihrem Authentifikator:"
 
-#: classes/pref/prefs.php:352
+#: classes/pref/prefs.php:348
 msgid "I have scanned the code and would like to enable OTP"
 msgstr ""
 "Ich habe den Code gescannt und möchte die Anmeldung mit Einmalpasswörtern "
 "jetzt aktivieren"
 
-#: classes/pref/prefs.php:360
+#: classes/pref/prefs.php:356
 msgid "Enable OTP"
 msgstr "Einmalpasswörter einschalten"
 
-#: classes/pref/prefs.php:456
-msgid "Select theme"
-msgstr "Thema auswählen"
-
-#: classes/pref/prefs.php:508
+#: classes/pref/prefs.php:482
 msgid "Customize"
 msgstr "Anpassen"
 
-#: classes/pref/prefs.php:527 classes/pref/prefs.php:534
-#: classes/pref/prefs.php:539
+#: classes/pref/prefs.php:501 classes/pref/prefs.php:508
+#: classes/pref/prefs.php:513
 msgid "Yes"
 msgstr "Ja"
 
-#: classes/pref/prefs.php:529 classes/pref/prefs.php:539
+#: classes/pref/prefs.php:503 classes/pref/prefs.php:513
 msgid "No"
 msgstr "Nein"
 
-#: classes/pref/prefs.php:569
+#: classes/pref/prefs.php:543
 msgid "Register"
 msgstr "Registrieren"
 
-#: classes/pref/prefs.php:573
+#: classes/pref/prefs.php:547
 msgid "Clear"
 msgstr "Löschen"
 
-#: classes/pref/prefs.php:579
+#: classes/pref/prefs.php:553
 #, php-format
 msgid "Current server time: %s (UTC)"
 msgstr "Aktuelle Serverzeit: %s (UTC)"
 
-#: classes/pref/prefs.php:604
+#: classes/pref/prefs.php:582
 msgid "Save configuration"
 msgstr "Einstellungen speichern"
 
-#: classes/pref/prefs.php:607
+#: classes/pref/prefs.php:585
 msgid "Manage profiles"
 msgstr "Profile verwalten"
 
-#: classes/pref/prefs.php:610
+#: classes/pref/prefs.php:588
 msgid "Reset to defaults"
 msgstr "Auf Standardwerte zurücksetzen"
 
-#: classes/pref/prefs.php:622
+#: classes/pref/prefs.php:600
 msgid "Show additional preferences"
 msgstr "Erweiterte Einstellungen zeigen"
 
-#: classes/pref/prefs.php:679 classes/pref/prefs.php:697
+#: classes/pref/prefs.php:612 classes/pref/prefs.php:614
+#, fuzzy
+msgid "Plugins"
+msgstr "Benutzer-Plugins"
+
+#: classes/pref/prefs.php:642
+#, fuzzy
+msgid "System plugins"
+msgstr "Benutzer-Plugins"
+
+#: classes/pref/prefs.php:646 classes/pref/prefs.php:695
+msgid "Plugin"
+msgstr ""
+
+#: classes/pref/prefs.php:647 classes/pref/prefs.php:696
+msgid "Description"
+msgstr ""
+
+#: classes/pref/prefs.php:648 classes/pref/prefs.php:697
+msgid "Version"
+msgstr ""
+
+#: classes/pref/prefs.php:649 classes/pref/prefs.php:698
+msgid "Author"
+msgstr "Autor"
+
+#: classes/pref/prefs.php:682 classes/pref/prefs.php:733
+msgid "Clear data"
+msgstr "Feed-Daten löschen"
+
+#: classes/pref/prefs.php:691
+msgid "User plugins"
+msgstr "Benutzer-Plugins"
+
+#: classes/pref/prefs.php:748
+msgid "Enable selected plugins"
+msgstr "Ausgewählte Plugins aktivieren"
+
+#: classes/pref/prefs.php:803 classes/pref/prefs.php:821
 msgid "Incorrect password"
 msgstr "Falsches Passwort"
 
@@ -2165,26 +2156,22 @@ msgstr "Falsches Passwort"
 msgid "Check to enable field"
 msgstr "Ankreuzen um das Feld zu aktivieren"
 
-#: classes/pref/feeds.php:59 classes/pref/feeds.php:180
-#: classes/pref/feeds.php:223 classes/pref/feeds.php:229
-#: classes/pref/feeds.php:254
+#: classes/pref/feeds.php:58 classes/pref/feeds.php:175
+#: classes/pref/feeds.php:217 classes/pref/feeds.php:223
+#: classes/pref/feeds.php:248
 #, php-format
 msgid "(%d feeds)"
 msgstr "(%d) Feeds"
 
-#: classes/pref/feeds.php:492 classes/pref/feeds.php:747
-msgid "Feed"
-msgstr "Feed"
-
-#: classes/pref/feeds.php:498
+#: classes/pref/feeds.php:494
 msgid "Feed Title"
 msgstr "Feed-Titel"
 
-#: classes/pref/feeds.php:554 classes/pref/feeds.php:802
+#: classes/pref/feeds.php:550 classes/pref/feeds.php:762
 msgid "Article purging:"
 msgstr "Artikel löschen:"
 
-#: classes/pref/feeds.php:577
+#: classes/pref/feeds.php:573
 msgid ""
 "<b>Hint:</b> you need to fill in your login information if your feed "
 "requires authentication, except for Twitter feeds."
@@ -2192,122 +2179,105 @@ msgstr ""
 "<b>Hinweise:</b> Sie müssen Ihre Login-Informationen eingeben, wenn Ihr Feed "
 "eine Authentifizierung erfordert (außer Twitter-Feeds)."
 
-#: classes/pref/feeds.php:593 classes/pref/feeds.php:831
+#: classes/pref/feeds.php:589 classes/pref/feeds.php:791
 msgid "Hide from Popular feeds"
 msgstr "Auf meiner Feedliste verbergen"
 
-#: classes/pref/feeds.php:604 classes/pref/feeds.php:836
-msgid "Right-to-left content"
-msgstr "Rechts-nach-links Inhalt"
-
-#: classes/pref/feeds.php:616 classes/pref/feeds.php:842
+#: classes/pref/feeds.php:601 classes/pref/feeds.php:797
 msgid "Include in e-mail digest"
 msgstr "In E-Mail-Zusammenfassung aufnehmen"
 
-#: classes/pref/feeds.php:629 classes/pref/feeds.php:848
+#: classes/pref/feeds.php:614 classes/pref/feeds.php:803
 msgid "Always display image attachments"
 msgstr "Angehängte Bilder immer anzeigen"
 
-#: classes/pref/feeds.php:643 classes/pref/feeds.php:856
+#: classes/pref/feeds.php:628 classes/pref/feeds.php:811
 msgid "Cache images locally"
 msgstr "Bilder lokal zwischenspeichern"
 
-#: classes/pref/feeds.php:656
-msgid "Cache content locally"
-msgstr "Inhalte lokal zwischenspeichern"
-
-#: classes/pref/feeds.php:668 classes/pref/feeds.php:862
+#: classes/pref/feeds.php:640 classes/pref/feeds.php:817
 msgid "Mark updated articles as unread"
 msgstr "Alle Artikel als ungelesen markieren"
 
-#: classes/pref/feeds.php:680 classes/pref/feeds.php:868
-msgid "Mark posts as updated on content change"
-msgstr "Artikel als aktualisiert markieren bei Inhaltsänderung"
-
-#: classes/pref/feeds.php:686
+#: classes/pref/feeds.php:646
 msgid "Icon"
 msgstr "Symbol"
 
-#: classes/pref/feeds.php:700
+#: classes/pref/feeds.php:660
 msgid "Replace"
 msgstr "Ersetzen"
 
-#: classes/pref/feeds.php:719
+#: classes/pref/feeds.php:679
 msgid "Resubscribe to push updates"
 msgstr "Abonnierte Feeds:"
 
-#: classes/pref/feeds.php:726
+#: classes/pref/feeds.php:686
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr "PubSubHubbub-Abonnementstatus für push-enabled Feeds zurücksetzen"
 
-#: classes/pref/feeds.php:741
+#: classes/pref/feeds.php:701
 msgid "Enable the options you wish to apply using checkboxes on the right:"
 msgstr ""
 "Benutzen Sie die Auswahlkästchen auf der rechten Seite um die gewünschen "
 "Optionen anzuwenden:"
 
-#: classes/pref/feeds.php:1123 classes/pref/feeds.php:1176
+#: classes/pref/feeds.php:1051 classes/pref/feeds.php:1104
 msgid "All done."
 msgstr "Alle fertig."
 
-#: classes/pref/feeds.php:1231
+#: classes/pref/feeds.php:1159
 msgid "Feeds with errors"
 msgstr "Feeds mit Fehlern"
 
-#: classes/pref/feeds.php:1251
+#: classes/pref/feeds.php:1179
 msgid "Inactive feeds"
 msgstr "Inaktive Feeds"
 
-#: classes/pref/feeds.php:1288
+#: classes/pref/feeds.php:1216
 msgid "Edit selected feeds"
 msgstr "Bearbeite gewählten Feed..."
 
-#: classes/pref/feeds.php:1290 classes/pref/feeds.php:1304
+#: classes/pref/feeds.php:1218 classes/pref/feeds.php:1232
 msgid "Reset sort order"
 msgstr "Sortierreihenfolge zurücksetzen"
 
-#: classes/pref/feeds.php:1292 js/prefs.js:2021 js/prefs.js:1788
-#: js/prefs.js:1778
+#: classes/pref/feeds.php:1220 js/prefs.js:1778
 msgid "Batch subscribe"
 msgstr "Mehrere Feeds abonnieren"
 
-#: classes/pref/feeds.php:1297
+#: classes/pref/feeds.php:1225
 msgid "Categories"
 msgstr "Kategorien"
 
-#: classes/pref/feeds.php:1300
+#: classes/pref/feeds.php:1228
 msgid "Add category"
 msgstr "Kategorie anlegen"
 
-#: classes/pref/feeds.php:1302
+#: classes/pref/feeds.php:1230
 msgid "(Un)hide empty categories"
 msgstr "Zeige/Verstecke leere Kategorien"
 
-#: classes/pref/feeds.php:1306
+#: classes/pref/feeds.php:1234
 msgid "Remove selected"
 msgstr "Ausgewählte Kategorien löschen"
 
-#: classes/pref/feeds.php:1320
+#: classes/pref/feeds.php:1248
 msgid "More actions..."
 msgstr "Mehr Aktionen..."
 
-#: classes/pref/feeds.php:1324
+#: classes/pref/feeds.php:1252
 msgid "Manual purge"
 msgstr "Manuelle Säuberung"
 
-#: classes/pref/feeds.php:1328
+#: classes/pref/feeds.php:1256
 msgid "Clear feed data"
 msgstr "Feed-Daten löschen"
 
-#: classes/pref/feeds.php:1379
-msgid "Import and export"
-msgstr "Import und Export"
-
-#: classes/pref/feeds.php:1381
+#: classes/pref/feeds.php:1307
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1383
+#: classes/pref/feeds.php:1309
 msgid ""
 "Using OPML you can export and import your feeds, filters, labels and Tiny "
 "Tiny RSS settings."
@@ -2315,27 +2285,27 @@ msgstr ""
 "Über OPML können Feeds, Filter, Label und Tiny-Tiny-RSS-Einstellungen "
 "importiert und export werden."
 
-#: classes/pref/feeds.php:1385
+#: classes/pref/feeds.php:1311
 msgid "Only main settings profile can be migrated using OPML."
 msgstr "Nur das Hauptprofil kann mit OPML gesichert werden."
 
-#: classes/pref/feeds.php:1398
+#: classes/pref/feeds.php:1324
 msgid "Import my OPML"
 msgstr "OPML importieren"
 
-#: classes/pref/feeds.php:1402
+#: classes/pref/feeds.php:1328
 msgid "Filename:"
 msgstr "Dateiname"
 
-#: classes/pref/feeds.php:1404
+#: classes/pref/feeds.php:1330
 msgid "Include settings"
 msgstr "Einstellungen hinzufügen"
 
-#: classes/pref/feeds.php:1408
+#: classes/pref/feeds.php:1334
 msgid "Export OPML"
 msgstr "OPML exportieren"
 
-#: classes/pref/feeds.php:1412
+#: classes/pref/feeds.php:1338
 msgid ""
 "Your OPML can be published publicly and can be subscribed by anyone who "
 "knows the URL below."
@@ -2343,7 +2313,7 @@ msgstr ""
 "Veröffentlichte Artikel werden als öffentlicher RSS-Feed exportiert und "
 "können von jedem abonniert werden, der die folgende URL kennt."
 
-#: classes/pref/feeds.php:1414
+#: classes/pref/feeds.php:1340
 msgid ""
 "Published OPML does not include your Tiny Tiny RSS settings, feeds that "
 "require authentication or feeds hidden from Popular feeds."
@@ -2352,33 +2322,15 @@ msgstr ""
 "passwortgeschützte Feeds oder Feeds, die nicht in den Favoriten enthalten "
 "sind."
 
-#: classes/pref/feeds.php:1417
+#: classes/pref/feeds.php:1343
 msgid "Display published OPML URL"
 msgstr "Zeige öffentliche OPML-URL"
 
-#: classes/pref/feeds.php:1420 plugins/import_export/init.php:66
-msgid "Article archive"
-msgstr "Artikelarchiv"
-
-#: classes/pref/feeds.php:1422 plugins/import_export/init.php:68
-msgid ""
-"You can export and import your Starred and Archived articles for safekeeping "
-"or when migrating between tt-rss instances."
-msgstr "Die markierten und archivierten Artikel können exportiert werden."
-
-#: classes/pref/feeds.php:1425
-msgid "Export my data"
-msgstr "Meine Daten exportieren"
-
-#: classes/pref/feeds.php:1440
-msgid "Import"
-msgstr "Importieren"
-
-#: classes/pref/feeds.php:1447
+#: classes/pref/feeds.php:1353
 msgid "Firefox integration"
 msgstr "Firefox-Integration"
 
-#: classes/pref/feeds.php:1449
+#: classes/pref/feeds.php:1355
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
@@ -2386,45 +2338,19 @@ msgstr ""
 "Tiny Tiny RSS kann durch den folgenden Link als Feedreader für Firefox "
 "verwendet werden."
 
-#: classes/pref/feeds.php:1456
+#: classes/pref/feeds.php:1362
 msgid "Click here to register this site as a feed reader."
 msgstr "Diese Website als Feedreader registrieren."
 
-#: classes/pref/feeds.php:1464
-msgid "Bookmarklets"
-msgstr ""
-
-#: classes/pref/feeds.php:1466 plugins/bookmarklets/init.php:24
-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 ""
-"Ziehen Sie den folgenden Link in Ihre Browser-Toolbar, öffnen den Feed, an "
-"dem Sie interessiert sind in Ihren Browser und klicken auf den Link, um ihn "
-"zu abonnieren."
-
-#: classes/pref/feeds.php:1470
-#, php-format
-msgid "Subscribe to %s in Tiny Tiny RSS?"
-msgstr "%s in Tiny Tiny RSS abonnieren?"
-
-#: classes/pref/feeds.php:1474
-msgid "Subscribe in Tiny Tiny RSS"
-msgstr "Abonnieren in Tiny Tiny RSS"
-
-#: classes/pref/feeds.php:1476 plugins/bookmarklets/init.php:34
-msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
-msgstr ""
-
-#: classes/pref/feeds.php:1484
+#: classes/pref/feeds.php:1370
 msgid "Published & shared articles / Generated feeds"
 msgstr "Veröffentlichte & gesendete Artikel / erzeugte Feeds"
 
-#: classes/pref/feeds.php:1486
+#: classes/pref/feeds.php:1372
 msgid "Published articles and generated feeds"
 msgstr "Veröffentlichte Artikel und erzeugte Feeds"
 
-#: classes/pref/feeds.php:1488
+#: classes/pref/feeds.php:1374
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the URL specified below."
@@ -2432,27 +2358,27 @@ 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:1494
+#: classes/pref/feeds.php:1380
 msgid "Display URL"
 msgstr "Zeige URL an"
 
-#: classes/pref/feeds.php:1497
+#: classes/pref/feeds.php:1383
 msgid "Clear all generated URLs"
 msgstr "Alle generierten URLs löschen"
 
-#: classes/pref/feeds.php:1499
+#: classes/pref/feeds.php:1385
 msgid "Articles shared by URL"
 msgstr "Per URL geteilte Artikel"
 
-#: classes/pref/feeds.php:1501
+#: classes/pref/feeds.php:1387
 msgid "You can disable all articles shared by unique URLs here."
 msgstr "Sie können alle durch URLs geteilten Artikel hier deaktivieren."
 
-#: classes/pref/feeds.php:1504
+#: classes/pref/feeds.php:1390
 msgid "Unshare all articles"
 msgstr "Alle veröffentlichten Artikel zurückziehen"
 
-#: classes/pref/feeds.php:1579
+#: classes/pref/feeds.php:1468
 msgid ""
 "These feeds have not been updated with new content for 3 months (oldest "
 "first):"
@@ -2460,19 +2386,19 @@ msgstr ""
 "Folgende Feeds konnten seit 3 Monaten nicht aktualisiert werden (älteste "
 "zuerst):"
 
-#: classes/pref/feeds.php:1616 classes/pref/feeds.php:1685
+#: classes/pref/feeds.php:1505 classes/pref/feeds.php:1574
 msgid "Click to edit feed"
 msgstr "Zum Bearbeiten klicken"
 
-#: classes/pref/feeds.php:1634 classes/pref/feeds.php:1705
+#: classes/pref/feeds.php:1523 classes/pref/feeds.php:1594
 msgid "Unsubscribe from selected feeds"
 msgstr "Ausgewählte Feeds abbestellen"
 
-#: classes/pref/feeds.php:1645
+#: classes/pref/feeds.php:1534
 msgid "These feeds have not been updated because of errors:"
 msgstr "Folgende Feeds konnten aufgrund von Fehlern nicht aktualisiert werden:"
 
-#: plugins/pocket/pocket.php:24
+#: plugins/pocket/init.php:30
 msgid "Pocket"
 msgstr ""
 
@@ -2490,68 +2416,189 @@ msgstr ""
 msgid "Back to feeds"
 msgstr "Zurück zu den Feeds"
 
+#: plugins/digest/digest_body.php:56
+msgid "Hello,"
+msgstr "Hallo,"
+
 #: plugins/digest/digest_body.php:62
 msgid "Regular version"
 msgstr "Reguläre Version"
 
-#: plugins/pinterest/pinterest.php:23
+#: plugins/nsfw/init.php:32 plugins/nsfw/init.php:43
+msgid "Not work safe (click to toggle)"
+msgstr ""
+
+#: plugins/nsfw/init.php:53
+msgid "NSFW Plugin"
+msgstr ""
+
+#: plugins/nsfw/init.php:80
+msgid "Tags to consider NSFW (comma-separated)"
+msgstr "Liste von NSFW-Tags (kommagetrennt)"
+
+#: plugins/nsfw/init.php:101
+msgid "Configuration saved."
+msgstr "Die Einstellungen wurden gespeichert."
+
+#: plugins/pinterest/init.php:29
 msgid "Pinterest"
 msgstr ""
 
-#: plugins/mail/mail.php:66 plugins/mail/mail.php:72 plugins/mail/init.php:72
-#: plugins/mail/init.php:78
+#: plugins/auth_internal/init.php:62
+msgid "Please enter your one time password:"
+msgstr "Bitte geben Sie Einmalpasswort ein:"
+
+#: plugins/auth_internal/init.php:185
+msgid "Password has been changed."
+msgstr "Passwort wurde geändert."
+
+#: plugins/auth_internal/init.php:187
+msgid "Old password is incorrect."
+msgstr "Altes Passwort ist falsch."
+
+#: plugins/bookmarklets/init.php:22
+msgid "Bookmarklets"
+msgstr ""
+
+#: plugins/bookmarklets/init.php:24
+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 ""
+"Ziehen Sie den folgenden Link in Ihre Browser-Toolbar, öffnen den Feed, an "
+"dem Sie interessiert sind in Ihren Browser und klicken auf den Link, um ihn "
+"zu abonnieren."
+
+#: plugins/bookmarklets/init.php:28
+#, php-format
+msgid "Subscribe to %s in Tiny Tiny RSS?"
+msgstr "%s in Tiny Tiny RSS abonnieren?"
+
+#: plugins/bookmarklets/init.php:32
+msgid "Subscribe in Tiny Tiny RSS"
+msgstr "Abonnieren in Tiny Tiny RSS"
+
+#: plugins/bookmarklets/init.php:34
+msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
+msgstr ""
+
+#: plugins/import_export/init.php:64
+msgid "Import and export"
+msgstr "Import und Export"
+
+#: plugins/import_export/init.php:66
+msgid "Article archive"
+msgstr "Artikelarchiv"
+
+#: plugins/import_export/init.php:68
+msgid ""
+"You can export and import your Starred and Archived articles for safekeeping "
+"or when migrating between tt-rss instances."
+msgstr "Die markierten und archivierten Artikel können exportiert werden."
+
+#: plugins/import_export/init.php:71
+msgid "Export my data"
+msgstr "Meine Daten exportieren"
+
+#: plugins/import_export/init.php:87
+msgid "Import"
+msgstr "Importieren"
+
+#: plugins/import_export/init.php:221
+msgid "Could not import: incorrect schema version."
+msgstr "Import fehlgeschlagen: Falsche Schemaversion"
+
+#: plugins/import_export/init.php:226
+msgid "Could not import: unrecognized document format."
+msgstr "Import fehlgeschlagen: Unbekanntes Format"
+
+#: plugins/import_export/init.php:385
+#, php-format
+msgid "Finished: %d articles processed, %d imported, %d feeds created."
+msgstr "Fertig: %d Artikel bearbeitet, %d importiert, %d Feeds erstellt."
+
+#: plugins/import_export/init.php:391
+msgid "Could not load XML document."
+msgstr "Konnte XML-Datei nicht laden."
+
+#: plugins/import_export/init.php:403
+msgid "Prepare data"
+msgstr "Bereite Daten vor"
+
+#: plugins/import_export/init.php:424
+#, fuzzy, php-format
+msgid ""
+"Could not upload file. You might need to adjust upload_max_filesize\n"
+"\t\t\t\tin PHP.ini (current value = %s)"
+msgstr ""
+"Datei konnte nicht hochgeladen werden. Bitte upload_max_filesize \n"
+"in PHP.ini anpassen. (Aktueller Wert = %s)"
+
+#: plugins/mail/init.php:72 plugins/mail/init.php:78
 msgid "[Forwarded]"
 msgstr "[Weitergeleitet]"
 
-#: plugins/mail/mail.php:66 plugins/mail/init.php:72
+#: plugins/mail/init.php:72
 msgid "Multiple articles"
 msgstr "Mehrere Artikel"
 
-#: plugins/mail/mail.php:87
+#: plugins/mail/init.php:93
 msgid "From:"
 msgstr "Absender:"
 
-#: plugins/mail/mail.php:96
+#: plugins/mail/init.php:102
 msgid "To:"
 msgstr "Empfänger:"
 
-#: plugins/mail/mail.php:109
+#: plugins/mail/init.php:115
 msgid "Subject:"
 msgstr "Betreff:"
 
-#: plugins/mail/mail.php:125
+#: plugins/mail/init.php:131
 msgid "Send e-mail"
 msgstr "E-Mail versenden"
 
-#: plugins/note/note.php:22 plugins/note/note.js:11
+#: plugins/note/init.php:28 plugins/note/note.js:11
 msgid "Edit article note"
 msgstr "Artikelnotizen bearbeiten"
 
-#: plugins/example/example.php:29 plugins/example/init.php:38
+#: plugins/example/init.php:38
 msgid "Example Pane"
 msgstr ""
 
-#: plugins/example/example.php:53 plugins/example/init.php:69
+#: plugins/example/init.php:69
 msgid "Sample value"
 msgstr "Beispielwert"
 
-#: plugins/example/example.php:59 plugins/example/init.php:75
+#: plugins/example/init.php:75
 msgid "Set value"
 msgstr "Wert setzen"
 
-#: plugins/identica/identica.php:23
+#: plugins/identica/init.php:29
 msgid "Share on identi.ca"
 msgstr "Auf identi.ca teilen"
 
-#: plugins/instances/instances.php:29
+#: plugins/owncloud/init.php:35
+msgid "Owncloud"
+msgstr ""
+
+#: plugins/owncloud/init.php:59
+msgid "Owncloud url"
+msgstr ""
+
+#: plugins/owncloud/init.php:74
+msgid "Bookmark on OwnCloud "
+msgstr ""
+
+#: plugins/instances/init.php:144
 msgid "Linked"
 msgstr "Link"
 
-#: plugins/instances/instances.php:180
+#: plugins/instances/init.php:295
 msgid "Link instance"
 msgstr "Instanz verbinden"
 
-#: plugins/instances/instances.php:192 plugins/instances/init.php:307
+#: plugins/instances/init.php:307
 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:"
@@ -2560,65 +2607,67 @@ msgstr ""
 "beliebte Feeds zu teilen. Verbinden Sie diese Instanz von Tiny Tiny RSS mit "
 "folgender URL:"
 
-#: plugins/instances/instances.php:202
+#: plugins/instances/init.php:317
 msgid "Last connected"
 msgstr "Zuletzt verbunden"
 
-#: plugins/instances/instances.php:203
+#: plugins/instances/init.php:318
 msgid "Status"
 msgstr ""
 
-#: plugins/instances/instances.php:204
+#: plugins/instances/init.php:319
 msgid "Stored feeds"
 msgstr "Gespeicherte Feeds"
 
-#: plugins/share/share.php:21
+#: plugins/share/init.php:27
 msgid "Share by URL"
 msgstr "Per URL teilen"
 
-#: plugins/share/share.php:43 plugins/share/init.php:49
+#: plugins/share/init.php:49
 msgid "You can share this article by the following unique URL:"
 msgstr "Sie können diesen Artikel über folgende URL teilen:"
 
-#: plugins/flattr/flattr.php:37
+#: plugins/flattr/init.php:30
 #, fuzzy
-msgid "Flattr article"
+msgid "Flattr this article."
 msgstr "Artikel flattrn"
 
-#: plugins/googleplus/googleplus.php:23
+#: plugins/googleplus/init.php:29
 msgid "Share on Google+"
 msgstr "Auf Google+ teilen"
 
-#: plugins/updater/updater.php:267 plugins/updater/updater.php:279
+#: plugins/updater/init.php:294 plugins/updater/init.php:306
 #: plugins/updater/updater.js:10
 msgid "Update Tiny Tiny RSS"
 msgstr "Tiny Tiny RSS updaten"
 
-#: plugins/updater/updater.php:282 plugins/updater/init.php:303
+#: plugins/updater/init.php:309
 msgid "Your Tiny Tiny RSS installation is up to date."
 msgstr "Tiny Tiny RSS ist auf dem neuesten Stand."
 
-#: plugins/updater/updater.php:291 plugins/updater/init.php:313
+#: plugins/updater/init.php:319
 msgid ""
 "Do not close this dialog until updating is finished. Backup your tt-rss "
 "directory before continuing."
 msgstr ""
 
-#: plugins/updater/updater.php:294 plugins/updater/init.php:316
+#: plugins/updater/init.php:322
 msgid "Ready to update."
 msgstr "Bereit zum Updaten."
 
-#: plugins/updater/updater.php:299 plugins/updater/init.php:321
+#: plugins/updater/init.php:327
 msgid "Start update"
 msgstr "Starte Iüdate"
 
-#: js/feedlist.js:283 js/feedlist.js:282 js/feedlist.js:265 js/feedlist.js:218
+#: plugins/tweet/init.php:29
+msgid "Share on Twitter"
+msgstr "Auf Twitter teilen"
+
+#: js/feedlist.js:218
 msgid "New articles available in this feed (click to show)"
 msgstr "Neue Artikel verfügbar (klicken zum anzeigen)"
 
-#: js/feedlist.js:490 js/feedlist.js:505 js/feedlist.js:489 js/feedlist.js:504
-#: js/feedlist.js:469 js/feedlist.js:484 js/feedlist.js:420 js/feedlist.js:435
-#: plugins/digest/digest.js:25
+#: js/feedlist.js:420 js/feedlist.js:435 plugins/digest/digest.js:25
 msgid "Mark all articles in %s as read?"
 msgstr "Alle Artikel in %s als gelesen markieren?"
 
@@ -2631,75 +2680,71 @@ msgstr ""
 "Bericht enthält Ihre Browser-Informationen. Ihre IP-Adresse würde in der "
 "Datenbank gespeichert werden."
 
-#: js/functions.js:618 js/functions.js:614 js/functions.js:622
+#: js/functions.js:627
 msgid "Date syntax appears to be correct:"
 msgstr "Die Datumssyntax scheint korrekt zu sein:"
 
-#: js/functions.js:621 js/functions.js:617 js/functions.js:625
+#: js/functions.js:630
 msgid "Date syntax is incorrect."
 msgstr "Die Datumssyntax ist falsch."
 
-#: js/functions.js:748 js/functions.js:744 js/functions.js:752
+#: js/functions.js:757
 msgid "Remove stored feed icon?"
 msgstr "Gespeicherte Feed-Icons entfernen"
 
-#: js/functions.js:780 js/functions.js:776 js/functions.js:784
+#: js/functions.js:789
 msgid "Please select an image file to upload."
 msgstr "Bitte eine Bilddatei zum Hochladen auswählen."
 
-#: js/functions.js:782 js/functions.js:778 js/functions.js:786
+#: js/functions.js:791
 msgid "Upload new icon for this feed?"
 msgstr "Neues Icon für diesen Feed hochladen"
 
-#: js/functions.js:799 js/functions.js:795 js/functions.js:803
+#: js/functions.js:808
 msgid "Please enter label caption:"
 msgstr "Bitte einen Label-Titel eingeben:"
 
-#: js/functions.js:804 js/functions.js:800 js/functions.js:808
+#: js/functions.js:813
 msgid "Can't create label: missing caption."
 msgstr "Kann das Label nicht hinzufügen: fehlender Titel."
 
-#: js/functions.js:847 js/functions.js:843 js/functions.js:851
+#: js/functions.js:856
 msgid "Subscribe to Feed"
 msgstr "Feed abonnieren"
 
-#: js/functions.js:874 js/functions.js:870 js/functions.js:878
+#: js/functions.js:883
 msgid "Subscribed to %s"
 msgstr "%s abonniert"
 
-#: js/functions.js:879 js/functions.js:875 js/functions.js:883
+#: js/functions.js:888
 msgid "Specified URL seems to be invalid."
 msgstr "Die angegebene URL scheint ungültig zu sein"
 
-#: js/functions.js:882 js/functions.js:878 js/functions.js:886
+#: js/functions.js:891
 msgid "Specified URL doesn't seem to contain any feeds."
 msgstr "Die angegebene URL scheint keine Feeds zu enthalten."
 
-#: js/functions.js:935 js/functions.js:931 js/functions.js:939
+#: js/functions.js:944
 msgid "Couldn't download the specified URL: %s"
 msgstr "Die angegebene Feed-URL konnte nicht heruntergeladen werden: %s"
 
-#: js/functions.js:939 js/functions.js:935 js/functions.js:943
+#: js/functions.js:948
 msgid "You are already subscribed to this feed."
 msgstr "Sie haben diesen Feed bereits abonniert."
 
-#: js/functions.js:1067 js/functions.js:1063 js/functions.js:1071
-#: js/functions.js:1073
+#: js/functions.js:1078
 msgid "Edit rule"
 msgstr "Filter bearbeiten"
 
-#: js/functions.js:1093 js/functions.js:1089 js/functions.js:1097
-#: js/functions.js:1099
+#: js/functions.js:1104
 msgid "Edit action"
 msgstr "Aktion bearbeiten"
 
-#: js/functions.js:1130 js/functions.js:1126 js/functions.js:1134
-#: js/functions.js:1136
+#: js/functions.js:1141
 msgid "Create Filter"
 msgstr "Filter erstellen"
 
-#: js/functions.js:1234 js/functions.js:1230 js/functions.js:1238
-#: js/functions.js:1240
+#: js/functions.js:1245
 msgid ""
 "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
 "hub again on next feed update."
@@ -2707,48 +2752,37 @@ msgstr ""
 "Abonnement zurücksetzen? Tiny Tiny RSS wird versuchen, sich bei der nächsten "
 "Feed-Aktualisierung erneut beim Benachrichtigungs-Hub anzumelden."
 
-#: js/functions.js:1255 js/tt-rss.js:421 js/functions.js:1251 js/tt-rss.js:381
-#: js/functions.js:1259 js/tt-rss.js:367 js/functions.js:1261
+#: js/functions.js:1266 js/tt-rss.js:367
 msgid "Unsubscribe from %s?"
 msgstr "%s abbestellen?"
 
-#: js/functions.js:1362 js/functions.js:1358 js/functions.js:1368
-#: js/functions.js:1370
+#: js/functions.js:1375
 msgid "Please enter category title:"
 msgstr "Bitte geben Sie den Kategorietitel ein:"
 
-#: js/functions.js:1393 js/functions.js:1389 js/functions.js:1399
-#: js/functions.js:1401
+#: js/functions.js:1406
 msgid "Generate new syndication address for this feed?"
 msgstr "Neue Veröffentlichungsadresse für diesen Feed erzeugen?"
 
-#: js/functions.js:1584 js/tt-rss.js:400 js/tt-rss.js:903 js/functions.js:1580
-#: js/tt-rss.js:782 js/tt-rss.js:362 js/tt-rss.js:717 js/functions.js:1590
-#: js/tt-rss.js:348 js/tt-rss.js:709 js/functions.js:1592
+#: js/functions.js:1597 js/tt-rss.js:348 js/tt-rss.js:713
 msgid "You can't edit this kind of feed."
 msgstr "Sie können diese Art von Feed nicht bearbeiten."
 
-#: js/functions.js:1599 js/functions.js:1595 js/functions.js:1605
-#: js/functions.js:1607
+#: js/functions.js:1612
 msgid "Edit Feed"
 msgstr "Feed bearbeiten"
 
-#: js/functions.js:1637 js/functions.js:1633 js/functions.js:1643
-#: js/functions.js:1645
+#: js/functions.js:1650
 msgid "More Feeds"
 msgstr "Weitere Feeds"
 
-#: js/functions.js:1698 js/functions.js:1808 js/prefs.js:408 js/prefs.js:438
-#: js/prefs.js:470 js/prefs.js:653 js/prefs.js:673 js/prefs.js:1326
-#: js/prefs.js:1471 js/functions.js:1694 js/functions.js:1804 js/prefs.js:397
-#: js/prefs.js:427 js/prefs.js:459 js/prefs.js:642 js/prefs.js:662
-#: js/prefs.js:1213 js/prefs.js:1358 js/functions.js:1704 js/functions.js:1814
-#: js/prefs.js:1203 js/prefs.js:1348 js/functions.js:1706 js/functions.js:1816
+#: js/functions.js:1711 js/functions.js:1821 js/prefs.js:397 js/prefs.js:427
+#: js/prefs.js:459 js/prefs.js:642 js/prefs.js:662 js/prefs.js:1203
+#: js/prefs.js:1348
 msgid "No feeds are selected."
 msgstr "Keine Feeds ausgewählt."
 
-#: js/functions.js:1740 js/functions.js:1736 js/functions.js:1746
-#: js/functions.js:1748
+#: js/functions.js:1753
 msgid ""
 "Remove selected feeds from the archive? Feeds with stored articles will not "
 "be removed."
@@ -2756,16 +2790,18 @@ msgstr ""
 "Die ausgewählten Feeds aus dem Archiv löschen? Feeds mit gespeicherten "
 "Artikeln werden nicht gelöscht"
 
-#: js/functions.js:1779 js/functions.js:1775 js/functions.js:1785
-#: js/functions.js:1787
+#: js/functions.js:1792
 msgid "Feeds with update errors"
 msgstr "Feeds mit Aktualisierungsfehlern"
 
-#: js/functions.js:1790 js/prefs.js:1308 js/functions.js:1786 js/prefs.js:1195
-#: js/functions.js:1796 js/prefs.js:1185 js/functions.js:1798
+#: js/functions.js:1803 js/prefs.js:1185
 msgid "Remove selected feeds?"
 msgstr "Ausgewählte Feeds entfernen?"
 
+#: js/functions.js:1904
+msgid "Help"
+msgstr "Hilfe"
+
 #: js/PrefFeedTree.js:47
 msgid "Edit category"
 msgstr "Kategorie bearbeiten"
@@ -2786,24 +2822,23 @@ msgstr "Bitte Benutzernamen eingeben:"
 msgid "Can't create user: no login specified."
 msgstr "Kann den Benutzer nicht hinzufügen: kein Login angegeben."
 
-#: js/prefs.js:128 js/prefs.js:117
+#: js/prefs.js:117
 msgid "Edit Filter"
 msgstr "Filter bearbeiten"
 
-#: js/prefs.js:175 js/prefs.js:164
+#: js/prefs.js:164
 msgid "Remove filter?"
 msgstr "Filter entfernen?"
 
-#: js/prefs.js:290 js/prefs.js:279
+#: js/prefs.js:279
 msgid "Remove selected labels?"
 msgstr "Ausgewählte Labels entfernen?"
 
-#: js/prefs.js:306 js/prefs.js:1512 js/prefs.js:295 js/prefs.js:1399
-#: js/prefs.js:1389
+#: js/prefs.js:295 js/prefs.js:1389
 msgid "No labels are selected."
 msgstr "Keine Labels ausgewählt."
 
-#: js/prefs.js:320 js/prefs.js:309
+#: js/prefs.js:309
 msgid ""
 "Remove selected users? Neither default admin nor your account will be "
 "removed."
@@ -2811,377 +2846,279 @@ msgstr ""
 "Ausgewählte Benutzer löschen? Weder der Administrator noch Ihr eigenes Konto "
 "werden gelöscht."
 
-#: js/prefs.js:337 js/prefs.js:518 js/prefs.js:539 js/prefs.js:578
 #: js/prefs.js:326 js/prefs.js:507 js/prefs.js:528 js/prefs.js:567
 msgid "No users are selected."
 msgstr "Keine Benutzer ausgewählt."
 
-#: js/prefs.js:355 js/prefs.js:344
+#: js/prefs.js:344
 msgid "Remove selected filters?"
 msgstr "Ausgewählte Filter entfernen?"
 
-#: js/prefs.js:370 js/prefs.js:608 js/prefs.js:627 js/prefs.js:359
-#: js/prefs.js:597 js/prefs.js:616
+#: js/prefs.js:359 js/prefs.js:597 js/prefs.js:616
 msgid "No filters are selected."
 msgstr "Keine Filter ausgewählt."
 
-#: js/prefs.js:389 js/prefs.js:378
+#: js/prefs.js:378
 msgid "Unsubscribe from selected feeds?"
 msgstr "Ausgewählte Feeds abbestellen?"
 
-#: js/prefs.js:423 js/prefs.js:412
+#: js/prefs.js:412
 msgid "Please select only one feed."
 msgstr "Bitte nur einen Feed auswählen."
 
-#: js/prefs.js:429 js/prefs.js:418
+#: js/prefs.js:418
 msgid "Erase all non-starred articles in selected feed?"
 msgstr "Alle nicht markierten Artikel im ausgewählten Feed löschen?"
 
-#: js/prefs.js:451 js/prefs.js:440
+#: js/prefs.js:440
 msgid "How many days of articles to keep (0 - use default)?"
 msgstr "Artikel für wieviele Tage aufbewahren (0 - Standardwert nutzen)?"
 
-#: js/prefs.js:489 js/prefs.js:478
+#: js/prefs.js:478
 msgid "Login field cannot be blank."
 msgstr "Feld für Benutzername darf nicht leer sein."
 
-#: js/prefs.js:523 js/prefs.js:544 js/prefs.js:583 js/prefs.js:512
-#: js/prefs.js:533 js/prefs.js:572
+#: js/prefs.js:512 js/prefs.js:533 js/prefs.js:572
 msgid "Please select only one user."
 msgstr "Bitte nur einen Benutzer auswählen."
 
-#: js/prefs.js:548 js/prefs.js:537
+#: js/prefs.js:537
 msgid "Reset password of selected user?"
 msgstr "Passwort des ausgewählten Benutzers zurücksetzen?"
 
-#: js/prefs.js:613 js/prefs.js:602
+#: js/prefs.js:602
 msgid "Please select only one filter."
 msgstr "Bitte nur einen Filter auswählen."
 
-#: js/prefs.js:631 js/prefs.js:620
+#: js/prefs.js:620
 msgid "Combine selected filters?"
 msgstr "Ausgewählte Filter zusammenfügen?"
 
-#: js/prefs.js:695 js/prefs.js:684
+#: js/prefs.js:684
 msgid "Edit Multiple Feeds"
 msgstr "Mehrere Feeds bearbeiten"
 
-#: js/prefs.js:719 js/prefs.js:708
+#: js/prefs.js:708
 msgid "Save changes to selected feeds?"
 msgstr "Änderungen an den gewählten Feeds speichern?"
 
-#: js/prefs.js:811 js/prefs.js:800 js/prefs.js:790
+#: js/prefs.js:790
 msgid "OPML Import"
 msgstr "OPML Import"
 
-#: js/prefs.js:838 js/prefs.js:827 js/prefs.js:817
+#: js/prefs.js:817
 msgid "Please choose an OPML file first."
 msgstr "Bitte zuerst eine OPML-Datei auswählen."
 
-#: js/prefs.js:854 plugins/import_export/import_export.js:112
-msgid "Please choose the file first."
-msgstr "Bitte zuerst die Datei auswählen."
-
-#: js/prefs.js:1010 js/prefs.js:983 js/prefs.js:973
+#: js/prefs.js:973
 msgid "Reset to defaults?"
 msgstr "Auf Standardwerte zurücksetzen?"
 
-#: js/prefs.js:1215 js/prefs.js:1102 js/prefs.js:1092
+#: js/prefs.js:1092
 msgid ""
 "Remove category %s? Any nested feeds would be placed into Uncategorized."
 msgstr ""
 
-#: js/prefs.js:1242 js/prefs.js:1129 js/prefs.js:1119
+#: js/prefs.js:1119
 msgid "Remove selected categories?"
 msgstr "Ausgewählte Kategorien entfernen?"
 
-#: js/prefs.js:1258 js/prefs.js:1145 js/prefs.js:1135
+#: js/prefs.js:1135
 msgid "No categories are selected."
 msgstr "Keine Kategorien ausgewählt."
 
-#: js/prefs.js:1266 js/prefs.js:1153 js/prefs.js:1143
+#: js/prefs.js:1143
 msgid "Category title:"
 msgstr "Titel der Kategorie:"
 
-#: js/prefs.js:1297 js/prefs.js:1184 js/prefs.js:1174
+#: js/prefs.js:1174
 msgid "Feeds without recent updates"
 msgstr "Feeds ohne kürzliche Aktualisierungen"
 
-#: js/prefs.js:1346 js/prefs.js:1233 js/prefs.js:1223
+#: js/prefs.js:1223
 msgid "Replace current OPML publishing address with a new one?"
 msgstr "Aktuelle Veröffentlichungsadresse durch eine Neue ersetzen?"
 
-#: js/prefs.js:1455 js/prefs.js:1342 js/prefs.js:1332
+#: js/prefs.js:1332
 msgid "Rescore articles in selected feeds?"
 msgstr "Artikel in gewählten Feeds neu bewerten?"
 
-#: js/prefs.js:1478 js/prefs.js:1365 js/prefs.js:1355
+#: js/prefs.js:1355
 msgid "Rescore all articles? This operation may take a lot of time."
 msgstr ""
 "Alle Artikel neu bewerten? Dieser Vorgang kann viel Zeit in Anspruch nehmen."
 
-#: js/prefs.js:1498 js/prefs.js:1385 js/prefs.js:1375
+#: js/prefs.js:1375
 msgid "Reset selected labels to default colors?"
 msgstr "Label-Farben auf Standardwerte zurücksetzen?"
 
-#: js/prefs.js:1535 js/prefs.js:1422 js/prefs.js:1412
+#: js/prefs.js:1412
 msgid "Settings Profiles"
 msgstr "Einstellungsprofile"
 
-#: js/prefs.js:1544 js/prefs.js:1431 js/prefs.js:1421
+#: js/prefs.js:1421
 msgid ""
 "Remove selected profiles? Active and default profiles will not be removed."
 msgstr ""
 "Ausgewählte Profile löschen? Das aktive und das Standardprofil werden nicht "
 "gelöscht"
 
-#: js/prefs.js:1562 js/prefs.js:1449 js/prefs.js:1439
+#: js/prefs.js:1439
 msgid "No profiles are selected."
 msgstr "Keine Profile ausgewählt."
 
-#: js/prefs.js:1570 js/prefs.js:1623 js/prefs.js:1457 js/prefs.js:1510
 #: js/prefs.js:1447 js/prefs.js:1500
 msgid "Activate selected profile?"
 msgstr "Ausgewählte Profile entfernen?"
 
-#: js/prefs.js:1586 js/prefs.js:1639 js/prefs.js:1473 js/prefs.js:1526
 #: js/prefs.js:1463 js/prefs.js:1516
 msgid "Please choose a profile to activate."
 msgstr "Bitte ein Profil zum aktivieren auswählen"
 
-#: js/prefs.js:1647 js/prefs.js:1534 js/prefs.js:1524
+#: js/prefs.js:1524
 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr "Dies wird alle zuvor erstellten Feed-URLs ungültig machen. Fortfahren?"
 
-#: js/prefs.js:1666 js/prefs.js:1553 js/prefs.js:1543
+#: js/prefs.js:1543
 msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr "Alle bisher geteilten Artikel URLs werden ungültig Weiter?"
 
-#: js/prefs.js:1764 js/prefs.js:1651 js/prefs.js:1641
+#: js/prefs.js:1641
 msgid "Label Editor"
 msgstr "Label-Editor"
 
-#: js/prefs.js:1827 js/prefs.js:1714 js/prefs.js:1704
+#: js/prefs.js:1704
 msgid ""
 "This will clear your stored authentication information for Twitter. Continue?"
 msgstr ""
 "Dies wird Ihre gespeicherten Authentifizierungsinformationen für Twitter "
 "löschen. Fortfahren?"
 
-#: js/prefs.js:1911 plugins/import_export/import_export.js:13
-msgid "Export Data"
-msgstr "Daten exportieren"
-
-#: js/prefs.js:1938 plugins/import_export/import_export.js:40
-msgid ""
-"Finished, exported %d articles. You can download the data <a "
-"class='visibleLink' href='%u'>here</a>."
-msgstr ""
-"Fertig, %d Artikel exportiert. <a class='visibleLink' href='%u'>Hier</a> "
-"herunterladen."
-
-#: js/prefs.js:1991 plugins/import_export/import_export.js:93
-msgid "Data Import"
-msgstr "Daten importieren"
-
-#: js/prefs.js:2027 js/prefs.js:1794 js/prefs.js:1784
+#: js/prefs.js:1784
 msgid "Subscribing to feeds..."
 msgstr "Abonniere Feeds..."
 
-#: js/tt-rss.js:147 js/tt-rss.js:141 js/tt-rss.js:120
+#: js/prefs.js:1821
+msgid "Clear stored data for this plugin?"
+msgstr ""
+
+#: js/tt-rss.js:120
 msgid "Mark all articles as read?"
 msgstr "Alle Artikel als gelesen markieren?"
 
-#: js/tt-rss.js:410 js/tt-rss.js:370 js/tt-rss.js:356
+#: js/tt-rss.js:356
 msgid "You can't unsubscribe from the category."
 msgstr "Sie können die Kategorie nicht abbestellen."
 
-#: js/tt-rss.js:415 js/tt-rss.js:596 js/tt-rss.js:591 js/tt-rss.js:375
-#: js/tt-rss.js:525 js/tt-rss.js:361 js/tt-rss.js:511
+#: js/tt-rss.js:361 js/tt-rss.js:511
 msgid "Please select some feed first."
 msgstr "Bitte erst einen Feed auswählen."
 
-#: js/tt-rss.js:591 js/tt-rss.js:586 js/tt-rss.js:520 js/tt-rss.js:506
+#: js/tt-rss.js:506
 msgid "You can't rescore this kind of feed."
 msgstr "Sie können diese Art von Feed nicht neu bewerten."
 
-#: js/tt-rss.js:601 js/tt-rss.js:596 js/tt-rss.js:530 js/tt-rss.js:516
+#: js/tt-rss.js:516
 msgid "Rescore articles in %s?"
 msgstr "Artikel in %s neu bewerten?"
 
-#: js/tt-rss.js:1062 js/tt-rss.js:883 js/tt-rss.js:825 js/tt-rss.js:830
+#: js/tt-rss.js:672
+msgid "Please enable mail plugin first."
+msgstr "Bitte erst das Mail-Plugin aktivieren."
+
+#: js/tt-rss.js:834
 msgid "New version available!"
 msgstr "Neue Version verfügbar!"
 
-#: js/viewfeed.js:108 js/viewfeed.js:104
+#: js/viewfeed.js:104
 msgid "Cancel search"
 msgstr "Suche abbrechen"
 
-#: js/viewfeed.js:456 js/viewfeed.js:445 js/viewfeed.js:451 js/viewfeed.js:435
-#: plugins/digest/digest.js:257 plugins/digest/digest.js:696
+#: js/viewfeed.js:435 plugins/digest/digest.js:257
+#: plugins/digest/digest.js:696
 msgid "Unstar article"
 msgstr "Artikelbewertung zurücknehmen"
 
-#: js/viewfeed.js:461 js/viewfeed.js:450 js/viewfeed.js:456 js/viewfeed.js:440
-#: plugins/digest/digest.js:259 plugins/digest/digest.js:700
+#: js/viewfeed.js:440 plugins/digest/digest.js:259
+#: plugins/digest/digest.js:700
 msgid "Star article"
 msgstr "Artikel bewerten"
 
-#: js/viewfeed.js:496 js/viewfeed.js:485 js/viewfeed.js:491 js/viewfeed.js:473
-#: plugins/digest/digest.js:262 plugins/digest/digest.js:731
+#: js/viewfeed.js:473 plugins/digest/digest.js:262
+#: plugins/digest/digest.js:731
 msgid "Unpublish article"
 msgstr "Artikelveröffentlichung widerrufen"
 
-#: js/viewfeed.js:676 js/viewfeed.js:704 js/viewfeed.js:731 js/viewfeed.js:793
-#: js/viewfeed.js:825 js/viewfeed.js:962 js/viewfeed.js:1005
-#: js/viewfeed.js:1055 js/viewfeed.js:2181 js/viewfeed.js:665
-#: js/viewfeed.js:693 js/viewfeed.js:720 js/viewfeed.js:782 js/viewfeed.js:814
-#: js/viewfeed.js:951 js/viewfeed.js:994 js/viewfeed.js:1044
-#: js/viewfeed.js:2154 js/viewfeed.js:671 js/viewfeed.js:699
-#: js/viewfeed.js:726 js/viewfeed.js:788 js/viewfeed.js:820 js/viewfeed.js:957
-#: js/viewfeed.js:1000 js/viewfeed.js:1050 js/viewfeed.js:2018
 #: js/viewfeed.js:674 js/viewfeed.js:702 js/viewfeed.js:729 js/viewfeed.js:791
 #: js/viewfeed.js:823 js/viewfeed.js:960 js/viewfeed.js:1003
 #: js/viewfeed.js:1053 js/viewfeed.js:1927 plugins/mail/mail.js:7
 msgid "No articles are selected."
 msgstr "Keine Artikel ausgewählt."
 
-#: js/viewfeed.js:942 js/viewfeed.js:931 js/viewfeed.js:937 js/viewfeed.js:940
+#: js/viewfeed.js:940
 msgid "Mark all visible articles in %s as read?"
 msgstr "Alle sichtbaren Artikel in %s als gelesen markieren?"
 
-#: js/viewfeed.js:970 js/viewfeed.js:959 js/viewfeed.js:965 js/viewfeed.js:968
+#: js/viewfeed.js:968
 msgid "Delete %d selected articles in %s?"
 msgstr "%d ausgewählte Artikel in %s löschen?"
 
-#: js/viewfeed.js:972 js/viewfeed.js:961 js/viewfeed.js:967 js/viewfeed.js:970
+#: js/viewfeed.js:970
 msgid "Delete %d selected articles?"
 msgstr "%d ausgewählte Artikel löschen?"
 
-#: js/viewfeed.js:1014 js/viewfeed.js:1003 js/viewfeed.js:1009
 #: js/viewfeed.js:1012
 msgid "Archive %d selected articles in %s?"
 msgstr "%d ausgewählte Artikel in %s archivieren?"
 
-#: js/viewfeed.js:1017 js/viewfeed.js:1006 js/viewfeed.js:1012
 #: js/viewfeed.js:1015
 msgid "Move %d archived articles back?"
 msgstr "%d archivierte Artikel zurück verschieben"
 
-#: js/viewfeed.js:1061 js/viewfeed.js:1050 js/viewfeed.js:1056
 #: js/viewfeed.js:1059
 msgid "Mark %d selected articles in %s as read?"
 msgstr "%d ausgewählte Artikel in %s als gelesen markieren?"
 
-#: js/viewfeed.js:1085 js/viewfeed.js:1074 js/viewfeed.js:1080
 #: js/viewfeed.js:1083
 msgid "Edit article Tags"
 msgstr "Artikel-Tags bearbeiten"
 
-#: js/viewfeed.js:1247 js/viewfeed.js:1236 js/viewfeed.js:1242
 #: js/viewfeed.js:1252
 msgid "No article is selected."
 msgstr "Kein Artikel ausgewählt."
 
-#: js/viewfeed.js:1282 js/viewfeed.js:1271 js/viewfeed.js:1277
 #: js/viewfeed.js:1287
 msgid "No articles found to mark"
 msgstr "Keine Artikel zum markieren gefunden."
 
-#: js/viewfeed.js:1284 js/viewfeed.js:1273 js/viewfeed.js:1279
 #: js/viewfeed.js:1289
 msgid "Mark %d article(s) as read?"
 msgstr "%d Artikel als gelesen markieren?"
 
-#: js/viewfeed.js:1402 js/viewfeed.js:1383
-msgid "Loading..."
-msgstr "Lade..."
-
-#: js/viewfeed.js:1891 js/viewfeed.js:1864 js/viewfeed.js:1734
 #: js/viewfeed.js:1744
 msgid "Open original article"
 msgstr "Originalartikel öffnen"
 
-#: js/viewfeed.js:1897 js/viewfeed.js:1870
-msgid "View in a tt-rss tab"
-msgstr "Artikel in neuem Reiter öffnen"
-
-#: js/viewfeed.js:1905 js/viewfeed.js:1878 js/viewfeed.js:1742
-#: js/viewfeed.js:1752
-msgid "Mark above as read"
-msgstr "Obige als gelesen markieren"
-
-#: js/viewfeed.js:1911 js/viewfeed.js:1884 js/viewfeed.js:1748
-#: js/viewfeed.js:1758
-msgid "Mark below as read"
-msgstr "Untere als gelesen markieren"
-
-#: js/viewfeed.js:1967 js/viewfeed.js:1940 js/viewfeed.js:1804
 #: js/viewfeed.js:1814
 msgid "Remove label"
 msgstr "Ausgewähltes Label entfernen?"
 
-#: js/viewfeed.js:1991 js/viewfeed.js:1964 js/viewfeed.js:1828
 #: js/viewfeed.js:1838
 msgid "Playing..."
 msgstr "Abspielen..."
 
-#: js/viewfeed.js:1992 js/viewfeed.js:1965 js/viewfeed.js:1829
 #: js/viewfeed.js:1839
 msgid "Click to pause"
 msgstr "Zum Pausieren klicken"
 
-#: js/viewfeed.js:2150 js/viewfeed.js:2123 js/viewfeed.js:1987
 #: js/viewfeed.js:1896
 msgid "Please enter new score for selected articles:"
 msgstr "Bitte geben Sie eine Bewertung für den ausgewählten Artikel ab:"
 
-#: js/viewfeed.js:2192 js/viewfeed.js:2165 js/viewfeed.js:2029
 #: js/viewfeed.js:1938
 msgid "Please enter new score for this article:"
 msgstr "Bitte geben Sie eine Bewertung für diesen Artikel ab:"
 
-#: js/functions.js:1887 js/functions.js:1891 js/functions.js:1897
-#: js/functions.js:1899
-msgid "Help"
-msgstr "Hilfe"
-
-#: js/prefs.js:1831 js/prefs.js:1821
-msgid "Clear stored data for this plugin?"
-msgstr ""
-
-#: js/tt-rss.js:741 js/tt-rss.js:676 js/tt-rss.js:668
-msgid "Please enable mail plugin first."
-msgstr "Bitte erst das Mail-Plugin aktivieren."
-
-#: plugins/digest/digest_body.php:39
-msgid "Your browser doesn't support Javascript, which is required"
-msgstr ""
-
-#: plugins/nsfw/init.php:32 plugins/nsfw/init.php:43
-msgid "Not work safe (click to toggle)"
-msgstr ""
-
-#: plugins/nsfw/init.php:53
-msgid "NSFW Plugin"
-msgstr ""
-
-#: plugins/nsfw/init.php:80
-msgid "Tags to consider NSFW (comma-separated)"
-msgstr "Liste von NSFW-Tags (kommagetrennt)"
-
-#: plugins/nsfw/init.php:101
-msgid "Configuration saved."
-msgstr "Die Einstellungen wurden gespeichert."
-
-#: plugins/owncloud/init.php:35
-msgid "Owncloud"
-msgstr ""
-
-#: plugins/owncloud/init.php:59
-msgid "Owncloud url"
-msgstr ""
-
 #: plugins/digest/digest.js:71
 msgid "Mark %d displayed articles as read?"
 msgstr "%d Artikel als gelesen markieren?"
@@ -3207,6 +3144,26 @@ msgstr "Gelesene ein-/ausblenden"
 msgid "Load more..."
 msgstr "Gehe zu..."
 
+#: plugins/import_export/import_export.js:13
+msgid "Export Data"
+msgstr "Daten exportieren"
+
+#: plugins/import_export/import_export.js:40
+msgid ""
+"Finished, exported %d articles. You can download the data <a "
+"class='visibleLink' href='%u'>here</a>."
+msgstr ""
+"Fertig, %d Artikel exportiert. <a class='visibleLink' href='%u'>Hier</a> "
+"herunterladen."
+
+#: plugins/import_export/import_export.js:93
+msgid "Data Import"
+msgstr "Daten importieren"
+
+#: plugins/import_export/import_export.js:112
+msgid "Please choose the file first."
+msgstr "Bitte zuerst die Datei auswählen."
+
 #: plugins/mail/mail.js:21
 msgid "Forward article by email"
 msgstr "Artikel via E-Mail weiterleiten"
@@ -3241,99 +3198,109 @@ msgid ""
 "before continuing. Please type 'yes' to continue."
 msgstr ""
 
-#~ msgid "Communication problem with server."
-#~ msgstr "Kommunikationsfehler mit Server"
+#~ msgid "Comments?"
+#~ msgstr "Kommentare?"
 
-#~ msgid "Preferences..."
-#~ msgstr "Einstellungen..."
+#~ msgid "News"
+#~ msgstr "Neuigkeiten"
 
-#~ msgid "Toggle widescreen mode"
-#~ msgstr "Breitbild-Modus umschalten"
+#~ msgid "Move between feeds"
+#~ msgstr "Zwischen Feeds wechseln"
 
-#~ msgid "Open next feed"
-#~ msgstr "Nächsten Feed öffnen"
+#~ msgid "Move between articles"
+#~ msgstr "Zwischen Artikeln wechseln"
 
-#~ msgid "Open previous feed"
-#~ msgstr "Vorherigen Feed öffnen"
+#~ msgid "Active article actions"
+#~ msgstr "Aktionen für aktiven Artikel"
 
-#~ msgid "Open next article"
-#~ msgstr "Nächsten Artikel öffnen"
+#~ msgid "Mark articles below/above active one as read"
+#~ msgstr "Markiere vorhergehende/nachfolgende Artikel als gelesen"
 
-#~ msgid "Open previous article"
-#~ msgstr "Vorherigen Artikel öffnen"
+#~ msgid "Scroll article content"
+#~ msgstr "Artikelinhalt scrollen"
 
-#~ msgid "Article"
-#~ msgstr "Artikel"
+#~ msgid "Other actions"
+#~ msgstr "Andere Aktionen"
 
-#~ msgid "Scroll down"
-#~ msgstr "Nach unten scrollen"
+#~ msgid "Display this help dialog"
+#~ msgstr "Diesen Hilfe-Dialog anzeigen"
 
-#~ msgid "Scroll up"
-#~ msgstr "Nach oben scrollen"
+#~ msgid "Multiple articles actions"
+#~ msgstr "Mehrere Artikeloptionen"
 
-#~ msgid "Article selection"
-#~ msgstr "Artikelauswahl"
-
-#~ msgid "Select unread"
-#~ msgstr "Ungelesene Artikel auswählen"
-
-#~ msgid "Select starred"
+#, fuzzy
+#~ msgid "Select unread articles"
 #~ msgstr "Markierte Artikel auswählen"
 
-#~ msgid "Select published"
-#~ msgstr "Veröffentlichte Artikel auswählen"
+#~ msgid "Select starred articles"
+#~ msgstr "Markierte Artikel auswählen"
 
-#~ msgid "Deselect everything"
-#~ msgstr "Auswahl aufheben"
+#, fuzzy
+#~ msgid "Select published articles"
+#~ msgstr "Markierte Artikel auswählen"
 
-#~ msgid "Un/hide read feeds"
-#~ msgstr "Gelesene zeigen/verstecken"
+#, fuzzy
+#~ msgid "Deselect all articles"
+#~ msgstr "Alle Artikel auswählen"
 
-#~ msgid "Debug feed update"
-#~ msgstr "Aktualisierung im Diagnose-Modus durchführen"
+#~ msgid "Feed actions"
+#~ msgstr "Feed-Aktionen"
 
-#~ msgid "Un/collapse current category"
-#~ msgstr "Aktuelle Kategorie ein-/ausklappen:"
+#~ msgid "Mark feed as read"
+#~ msgstr "Feed als gelesen markieren"
 
-#~ msgid "Toggle combined mode"
-#~ msgstr "Kombinierte Feed-Anzeige umschalten"
+#~ msgid "If viewing category, (un)collapse it"
+#~ msgstr "Gewählte Kategorie auf-/zuklappen"
 
-#~ msgid "Fresh"
-#~ msgstr "Neu"
+#~ msgid "Press any key to close this window."
+#~ msgstr "Drücken Sie eine beliebige Taste um dieses Fenster zu schließen."
 
-#~ msgid "Other"
-#~ msgstr "Sonstiges"
+#~ msgid "My Feeds"
+#~ msgstr "Meine Feeds"
 
-#~ msgid "Show help dialog"
-#~ msgstr "Hilfe anzeigen"
+#, fuzzy
+#~ msgid "Other Feeds"
+#~ msgstr "Weitere Feeds"
 
-#~ msgid "Error receiving version information or no new version available."
-#~ msgstr "Das Abrufen von Update-Informationen ist fehlgeschlagen."
+#~ msgid "Panel actions"
+#~ msgstr "Panel Aktionen"
 
-#~ msgid "More..."
-#~ msgstr "Mehr.."
+#~ msgid "Top 25 feeds"
+#~ msgstr "Top 25 Feeds"
+
+#~ msgid "Edit feed categories"
+#~ msgstr "Feedkategorien bearbeiten"
+
+#~ msgid "Focus search (if present)"
+#~ msgstr "Fokussierte Suche (wenn gewählt)"
 
 #~ msgid ""
-#~ "Complex expressions might not give results while testing due to issues "
-#~ "with database server regexp implementation."
+#~ "<b>Note:</b> not all actions may be available, depending on Tiny Tiny RSS "
+#~ "configuration and your access level."
 #~ msgstr ""
-#~ "Komplexe Filter liefern im Testmodus möglichweise keine Ergebnisse, da es "
-#~ "Probleme mit der RegExp-Implementierung des Datenbankservers gibt."
+#~ "<b>Anmerkung:</b> Abhängig von Ihren Tiny-Tiny-RSS-Einstellungen und "
+#~ "Zugriffsrechten könnten nicht alle Aktionen verfügbar sein."
 
-#~ msgid "Author"
-#~ msgstr "Autor"
+#~ msgid "Open article in new tab"
+#~ msgstr "Artikel in neuem Reiter öffnen"
 
-#~ msgid "Clear data"
-#~ msgstr "Feed-Daten löschen"
+#~ msgid "Select theme"
+#~ msgstr "Thema auswählen"
 
-#~ msgid "User plugins"
-#~ msgstr "Benutzer-Plugins"
+#~ msgid "Right-to-left content"
+#~ msgstr "Rechts-nach-links Inhalt"
 
-#~ msgid "Enable selected plugins"
-#~ msgstr "Ausgewählte Plugins aktivieren"
+#~ msgid "Cache content locally"
+#~ msgstr "Inhalte lokal zwischenspeichern"
 
-#~ msgid "Share on Twitter"
-#~ msgstr "Auf Twitter teilen"
+#~ msgid "Mark posts as updated on content change"
+#~ msgstr "Artikel als aktualisiert markieren bei Inhaltsänderung"
+
+#~ msgid "Loading..."
+#~ msgstr "Lade..."
+
+#~ msgid "View in a tt-rss tab"
+#~ msgstr "Artikel in neuem Reiter öffnen"
 
 #~ msgid "Magpie"
 #~ msgstr "Magpie"
diff --git a/locale/es_ES/LC_MESSAGES/messages.mo b/locale/es_ES/LC_MESSAGES/messages.mo
index 586c67a4e..a174246a3 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 c81ed2bec..c6b7974b0 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: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-17 19:37+0400\n"
+"POT-Creation-Date: 2013-03-19 10:14+0400\n"
 "PO-Revision-Date: 2012-10-25 00:12+0100\n"
 "Last-Translator: DavidM <milarupa@yahoo.es>\n"
 "Language-Team: Español <milarupa@yahoo.es>\n"
@@ -16,79 +16,79 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backend.php:67
+#: backend.php:71
 msgid "Use default"
 msgstr "Usar configuración por defecto"
 
-#: backend.php:68
+#: backend.php:72
 msgid "Never purge"
 msgstr "Nunca purgar"
 
-#: backend.php:69
+#: backend.php:73
 msgid "1 week old"
 msgstr "1 semana de antigüedad"
 
-#: backend.php:70
+#: backend.php:74
 msgid "2 weeks old"
 msgstr "2 semanas de antigüedad"
 
-#: backend.php:71
+#: backend.php:75
 msgid "1 month old"
 msgstr "1 mes de antigüedad"
 
-#: backend.php:72
+#: backend.php:76
 msgid "2 months old"
 msgstr "2 meses de antigüedad"
 
-#: backend.php:73
+#: backend.php:77
 msgid "3 months old"
 msgstr "3 meses de antigüedad"
 
-#: backend.php:76
+#: backend.php:80
 msgid "Default interval"
 msgstr "Intervalo por defecto"
 
-#: backend.php:77 backend.php:87
+#: backend.php:81 backend.php:91
 msgid "Disable updates"
 msgstr "Desactivar actualizaciones"
 
-#: backend.php:78 backend.php:88
+#: backend.php:82 backend.php:92
 msgid "Each 15 minutes"
 msgstr "Cada 15 minutos"
 
-#: backend.php:79 backend.php:89
+#: backend.php:83 backend.php:93
 msgid "Each 30 minutes"
 msgstr "Cada 30 minutos"
 
-#: backend.php:80 backend.php:90
+#: backend.php:84 backend.php:94
 msgid "Hourly"
 msgstr "Cada hora"
 
-#: backend.php:81 backend.php:91
+#: backend.php:85 backend.php:95
 msgid "Each 4 hours"
 msgstr "Cada 4 horas"
 
-#: backend.php:82 backend.php:92
+#: backend.php:86 backend.php:96
 msgid "Each 12 hours"
 msgstr "Cada 12 horas"
 
-#: backend.php:83 backend.php:93
+#: backend.php:87 backend.php:97
 msgid "Daily"
 msgstr "Diariamente"
 
-#: backend.php:84 backend.php:94
+#: backend.php:88 backend.php:98
 msgid "Weekly"
 msgstr "Semanalmente"
 
-#: backend.php:97 classes/pref/users.php:139
+#: backend.php:101 classes/pref/users.php:139
 msgid "User"
 msgstr "Usuario"
 
-#: backend.php:98
+#: backend.php:102
 msgid "Power User"
 msgstr "Usuario con poder"
 
-#: backend.php:99
+#: backend.php:103
 msgid "Administrator"
 msgstr "Administrador"
 
@@ -120,7 +120,7 @@ msgstr "La base de datos de Tiny Tiny RSS está actualizada."
 #: db-updater.php:94 db-updater.php:163 db-updater.php:176 register.php:194
 #: register.php:239 register.php:252 register.php:267 register.php:286
 #: register.php:371 register.php:381 register.php:393
-#: classes/handler/public.php:637 classes/handler/public.php:725
+#: classes/handler/public.php:611 classes/handler/public.php:699
 msgid "Return to Tiny Tiny RSS"
 msgstr "Volver a Tiny Tiny RSS"
 
@@ -263,195 +263,195 @@ msgstr ""
 "La prueba de escape SQL ha fallado. Por favor, revise la configuración de su "
 "base de datos y PHP."
 
-#: index.php:108 index.php:150 index.php:236 prefs.php:86
-#: classes/backend.php:6 classes/pref/labels.php:296
-#: classes/pref/filters.php:602 classes/pref/feeds.php:1342
-#: plugins/digest/digest_body.php:45 js/viewfeed.js:1169 js/viewfeed.js:1158
-#: js/viewfeed.js:1164 js/viewfeed.js:1174
+#: index.php:117 index.php:147 index.php:252 prefs.php:79
+#: classes/backend.php:5 classes/pref/labels.php:296
+#: classes/pref/filters.php:609 classes/pref/feeds.php:1270
+#: plugins/digest/digest_body.php:45 js/viewfeed.js:1174
 msgid "Loading, please wait..."
 msgstr "Cargando. Por favor, espere..."
 
-#: index.php:118 plugins/digest/digest_body.php:56
-msgid "Hello,"
-msgstr "Hola,"
+#: index.php:127 index.php:198
+msgid "Communication problem with server."
+msgstr ""
 
-#: index.php:120 prefs.php:29 prefs.php:108 help/main.php:73 help/prefs.php:8
-#: classes/pref/prefs.php:371
-msgid "Preferences"
-msgstr "Preferencias"
-
-#: index.php:124
-msgid "Comments?"
-msgstr "¿Comentarios?"
-
-#: index.php:128 mobile/mobile-functions.php:69
-#: mobile/mobile-functions.php:244 plugins/digest/digest_body.php:59
-msgid "Logout"
-msgstr "Cerrar sesión"
-
-#: index.php:134
+#: index.php:133 index.php:206
 msgid "New version of Tiny Tiny RSS is available!"
 msgstr "¡Nueva versión de Tiny Tiny RSS disponible!"
 
-#: index.php:157
-msgid "News"
-msgstr "Noticias"
-
-#: index.php:166
+#: index.php:161
 msgid "Collapse feedlist"
 msgstr "Colapsar la lista de fuentes"
 
-#: index.php:169
+#: index.php:164
 msgid "Show articles"
 msgstr "Mostrar artículos"
 
-#: index.php:172
+#: index.php:167
 msgid "Adaptive"
 msgstr "Adaptable"
 
-#: index.php:173
+#: index.php:168
 msgid "All Articles"
 msgstr "Todos"
 
-#: index.php:174 classes/feeds.php:106
+#: index.php:169 include/functions.php:1912 classes/feeds.php:106
 msgid "Starred"
 msgstr "Favoritos"
 
-#: index.php:175 classes/feeds.php:107
+#: index.php:170 include/functions.php:1913 classes/feeds.php:107
 msgid "Published"
 msgstr "Publicados"
 
-#: index.php:176 classes/feeds.php:93 classes/feeds.php:105
+#: index.php:171 classes/feeds.php:93 classes/feeds.php:105
 msgid "Unread"
 msgstr "Sin leer"
 
-#: index.php:177
+#: index.php:172
 msgid "Ignore Scoring"
 msgstr "Ignorar la puntuación"
 
-#: index.php:178
+#: index.php:173
 msgid "Updated"
 msgstr "Actualizados"
 
-#: index.php:181
+#: index.php:176
 msgid "Sort articles"
 msgstr "Ordenar artículos"
 
-#: index.php:184 classes/pref/prefs.php:462
+#: index.php:179
 msgid "Default"
 msgstr "Por defecto"
 
-#: index.php:185
+#: index.php:180
 msgid "Date"
 msgstr "Fecha"
 
-#: index.php:186 include/localized_schema.php:3
+#: index.php:181 include/localized_schema.php:3
 msgid "Title"
 msgstr "Título"
 
-#: index.php:187
+#: index.php:182
 msgid "Score"
 msgstr "Puntuación"
 
-#: index.php:192 classes/pref/feeds.php:539 classes/pref/feeds.php:786
+#: index.php:187 classes/pref/feeds.php:535 classes/pref/feeds.php:746
 msgid "Update"
 msgstr "Actualizar"
 
-#: index.php:196 index.php:211 include/localized_schema.php:10
-#: classes/feeds.php:111 classes/feeds.php:127 js/FeedTree.js:128
-#: js/FeedTree.js:156 plugins/digest/digest.js:630
+#: index.php:191 index.php:221 include/functions.php:1903
+#: include/localized_schema.php:10 classes/feeds.php:111 classes/feeds.php:131
+#: js/FeedTree.js:128 js/FeedTree.js:156 plugins/digest/digest.js:630
 msgid "Mark as read"
 msgstr "Marcar como leído"
 
-#: index.php:202 classes/feeds.php:101
+#: index.php:211
 msgid "Actions..."
 msgstr "Acciones..."
 
-#: index.php:204
+#: index.php:213
+#, fuzzy
+msgid "Preferences..."
+msgstr "Preferencias"
+
+#: index.php:214
 msgid "Search..."
 msgstr "Buscar..."
 
-#: index.php:205
+#: index.php:215
 msgid "Feed actions:"
 msgstr "Acciones de la fuente:"
 
-#: index.php:206 classes/handler/public.php:567
+#: index.php:216 classes/handler/public.php:541
 msgid "Subscribe to feed..."
 msgstr "Suscribirse a una fuente..."
 
-#: index.php:207
+#: index.php:217
 msgid "Edit this feed..."
 msgstr "Editar esta fuente..."
 
-#: index.php:208
+#: index.php:218
 msgid "Rescore feed"
 msgstr "Reiniciar la puntuación"
 
-#: index.php:209 classes/pref/feeds.php:712 classes/pref/feeds.php:1315
+#: index.php:219 classes/pref/feeds.php:672 classes/pref/feeds.php:1243
 #: js/PrefFeedTree.js:73
 msgid "Unsubscribe"
 msgstr "Cancelar la suscripción"
 
-#: index.php:210
+#: index.php:220
 msgid "All feeds:"
 msgstr "Todas las fuentes:"
 
-#: index.php:212 help/main.php:56
+#: index.php:222
 msgid "(Un)hide read feeds"
 msgstr "Ocultar/Mostrar fuentes leídas"
 
-#: index.php:213
+#: index.php:223
 msgid "Other actions:"
 msgstr "Otras acciones:"
 
-#: index.php:215
+#: index.php:225
 msgid "Switch to digest..."
 msgstr "Modo resumen..."
 
-#: index.php:217
+#: index.php:227
 msgid "Show tag cloud..."
 msgstr "Nube de etiquetas..."
 
-#: index.php:218
+#: index.php:229 include/functions.php:1890
+#, fuzzy
+msgid "Toggle widescreen mode"
+msgstr "Cambiar a modo de reordenación de categorías"
+
+#: index.php:231
 msgid "Select by tags..."
 msgstr "Seleccionar por etiquetas..."
 
-#: index.php:219
+#: index.php:232
 msgid "Create label..."
 msgstr "Crear marcador..."
 
-#: index.php:220
+#: index.php:233
 msgid "Create filter..."
 msgstr "Crear filtro..."
 
-#: index.php:221
+#: index.php:234
 msgid "Keyboard shortcuts help"
 msgstr "Ayuda para atajos de teclado"
 
-#: prefs.php:99
+#: index.php:236 mobile/mobile-functions.php:69
+#: mobile/mobile-functions.php:244 plugins/digest/digest_body.php:59
+msgid "Logout"
+msgstr "Cerrar sesión"
+
+#: prefs.php:28 prefs.php:99 include/functions.php:1915
+#: classes/pref/prefs.php:371
+msgid "Preferences"
+msgstr "Preferencias"
+
+#: prefs.php:90
 msgid "Keyboard shortcuts"
 msgstr "Atajos de teclado"
 
-#: prefs.php:100 help/prefs.php:14
+#: prefs.php:91
 msgid "Exit preferences"
 msgstr "Salir de las preferencias"
 
-#: prefs.php:111 classes/pref/feeds.php:101 classes/pref/feeds.php:1220
-#: classes/pref/feeds.php:1283
+#: prefs.php:102 classes/pref/feeds.php:100 classes/pref/feeds.php:1148
+#: classes/pref/feeds.php:1211
 msgid "Feeds"
 msgstr "Fuentes"
 
-#: prefs.php:114 help/prefs.php:11 classes/pref/filters.php:110
+#: prefs.php:105 classes/pref/filters.php:117
 msgid "Filters"
 msgstr "Filtros"
 
-#: prefs.php:117 help/prefs.php:12 mobile/mobile-functions.php:205
-#: include/functions.php:1189 include/functions.php:1836
-#: classes/pref/labels.php:90
+#: prefs.php:108 mobile/mobile-functions.php:205 include/functions.php:1118
+#: include/functions.php:1739 classes/pref/labels.php:90
 msgid "Labels"
 msgstr "Marcadores"
 
-#: prefs.php:121 help/prefs.php:13
+#: prefs.php:112
 msgid "Users"
 msgstr "Usuarios"
 
@@ -514,239 +514,23 @@ msgstr "Cuenta creada correctamente."
 msgid "New user registrations are currently closed."
 msgstr "El registro de nuevos usuarios está cerrado en estos momentos."
 
-#: update.php:38
+#: update.php:37
 #, fuzzy
 msgid "Tiny Tiny RSS data update script."
 msgstr "La base de datos de Tiny Tiny RSS está actualizada."
 
-#: help/main.php:1 help/prefs.php:1
-msgid "Keyboard Shortcuts"
-msgstr "Atajos de teclado"
-
-#: help/main.php:5
-msgid "Navigation"
-msgstr "Navegación"
-
-#: help/main.php:8
-msgid "Move between feeds"
-msgstr "Moverse entre fuentes"
-
-#: help/main.php:9
-msgid "Move between articles"
-msgstr "Moverse entre artículos"
-
-#: help/main.php:10
-msgid "Show search dialog"
-msgstr "Mostrar el diálogo de búsqueda"
-
-#: help/main.php:13
-msgid "Active article actions"
-msgstr "Activar acciones de los artículos"
-
-#: help/main.php:16
-msgid "Toggle starred"
-msgstr "Alternar favoritos"
-
-#: help/main.php:17
-msgid "Toggle published"
-msgstr "Alternar publicados"
-
-#: help/main.php:18
-msgid "Toggle unread"
-msgstr "Alternar no leídos"
-
-#: help/main.php:19
-msgid "Edit tags"
-msgstr "Editar etiquetas"
-
-#: help/main.php:20
-msgid "Dismiss selected articles"
-msgstr "Descartar artículos seleccionados"
-
-#: help/main.php:21
-msgid "Dismiss read articles"
-msgstr "Descartar artículos leídos"
-
-#: help/main.php:22
-msgid "Open article in new window"
-msgstr "Abrir el artículo en una nueva pestaña o ventana"
-
-#: help/main.php:23
-msgid "Mark articles below/above active one as read"
-msgstr "Marcar como leídos los artículos por debajo o por encima de éste"
-
-#: help/main.php:24
-msgid "Scroll article content"
-msgstr "Desplazar el contenido del artículo"
-
-#: help/main.php:25
-msgid "Email article"
-msgstr "Enviar artículo por correo"
-
-#: help/main.php:29 help/prefs.php:30
-msgid "Other actions"
-msgstr "Otras acciones"
-
-#: help/main.php:32
-msgid "Select article under mouse cursor"
-msgstr "Seleccionar el artículo que esté bajo el cursor del ratón"
-
-#: help/main.php:33 help/prefs.php:26 classes/pref/labels.php:281
-msgid "Create label"
-msgstr "Crear marcador"
-
-#: help/main.php:34 help/prefs.php:25 classes/pref/filters.php:580
-msgid "Create filter"
-msgstr "Crear filtro"
-
-#: help/main.php:35
-msgid "Collapse sidebar"
-msgstr "Colapsar la barra lateral"
-
-#: help/main.php:36 help/prefs.php:34
-msgid "Display this help dialog"
-msgstr "Mostrar este cuadro de ayuda"
-
-#: help/main.php:41
-msgid "Multiple articles actions"
-msgstr "Acciones para artículos múltiples"
-
-#: help/main.php:44
-msgid "Select all articles"
-msgstr "Seleccionar todos los artículos"
-
-#: help/main.php:45
-msgid "Select unread articles"
-msgstr "Seleccionar artículos sin leer"
-
-#: help/main.php:46
-msgid "Select starred articles"
-msgstr "Seleccionar artículos favoritos"
-
-#: help/main.php:47
-msgid "Select published articles"
-msgstr "Seleccionar artículos publicados"
-
-#: help/main.php:48
-msgid "Invert article selection"
-msgstr "Invertir selección de artículos"
-
-#: help/main.php:49
-msgid "Deselect all articles"
-msgstr "Deseleccionar todos los artículos"
-
-#: help/main.php:52
-msgid "Feed actions"
-msgstr "Acciones para las fuentes"
-
-#: help/main.php:55
-msgid "Refresh active feed"
-msgstr "Actualizar la fuente activa"
-
-#: help/main.php:57 help/prefs.php:22 classes/pref/feeds.php:1286
-msgid "Subscribe to feed"
-msgstr "Suscribirse a una fuente"
-
-#: help/main.php:58 js/FeedTree.js:135 js/PrefFeedTree.js:67
-msgid "Edit feed"
-msgstr "Editar fuente"
-
-#: help/main.php:59
-msgid "Mark feed as read"
-msgstr "Marcar fuente como leída"
-
-#: help/main.php:60
-msgid "Reverse headlines order"
-msgstr "Invertir orden de titulares"
-
-#: help/main.php:61 js/FeedTree.js:170
-msgid "Mark all feeds as read"
-msgstr "Marcar todas las fuentes como leídas"
-
-#: help/main.php:62
-msgid "If viewing category, (un)collapse it"
-msgstr "Si se está viendo la categoría, (des)pliéguela"
-
-#: help/main.php:65 help/prefs.php:5
-msgid "Go to..."
-msgstr "Ir a..."
-
-#: help/main.php:68 include/functions.php:1893
-msgid "All articles"
-msgstr "Todos"
-
-#: help/main.php:69 include/functions.php:1891
-msgid "Fresh articles"
-msgstr "Recientes"
-
-#: help/main.php:70 include/functions.php:1887
-msgid "Starred articles"
-msgstr "Favoritos"
-
-#: help/main.php:71 include/functions.php:1889
-msgid "Published articles"
-msgstr "Publicados"
-
-#: help/main.php:72
-msgid "Tag cloud"
-msgstr "Nube de etiquetas"
-
-#: help/main.php:79
-msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
-msgstr "Otros trucos están disponibles en el wiki de Tiny Tiny RSS."
-
-#: help/main.php:81 help/prefs.php:41
-msgid "Press any key to close this window."
-msgstr "Pulse cualquier tecla para cerrar esta ventana."
-
-#: help/prefs.php:9
-msgid "My Feeds"
-msgstr "Mis fuentes"
-
-#: help/prefs.php:10
-msgid "Other Feeds"
-msgstr "Otras fuentes"
-
-#: help/prefs.php:19
-msgid "Panel actions"
-msgstr "Acciones del panel"
-
-#: help/prefs.php:23
-msgid "Top 25 feeds"
-msgstr "25 primeras fuentes"
-
-#: help/prefs.php:24
-msgid "Edit feed categories"
-msgstr "Editar las categorías de fuentes"
-
-#: help/prefs.php:27 classes/pref/users.php:386
-msgid "Create user"
-msgstr "Crear usuario"
-
-#: help/prefs.php:33
-msgid "Focus search (if present)"
-msgstr "Búsqueda enfocada (si está presente)"
-
-#: help/prefs.php:39
-msgid ""
-"<b>Note:</b> not all actions may be available, depending on Tiny Tiny RSS "
-"configuration and your access level."
-msgstr ""
-"<strong>Nota:</strong> la disponibilidad de las acciones dependerá de la "
-"configuración de Tiny Tiny RSS y de su nivel de acceso."
-
 #: mobile/login_form.php:28 include/login_form.php:209
-#: classes/handler/public.php:495
+#: classes/handler/public.php:469
 msgid "Log in"
 msgstr "Iniciar sesión"
 
 #: mobile/login_form.php:40 include/login_form.php:169
-#: classes/handler/public.php:479
+#: classes/handler/public.php:453
 msgid "Login:"
 msgstr "Nombre de usuario:"
 
 #: mobile/login_form.php:45 include/login_form.php:178
-#: classes/handler/public.php:482
+#: classes/handler/public.php:456
 msgid "Password:"
 msgstr "Contraseña:"
 
@@ -761,8 +545,8 @@ msgstr "Abrir versión estándar"
 msgid "Home"
 msgstr "Página principal"
 
-#: mobile/mobile-functions.php:178 include/functions.php:1187
-#: include/functions.php:1834
+#: mobile/mobile-functions.php:178 include/functions.php:1116
+#: include/functions.php:1737
 msgid "Special"
 msgstr "Especial"
 
@@ -775,12 +559,12 @@ msgid "Enable categories"
 msgstr "Habilitar categorías"
 
 #: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36
-#: mobile/prefs.php:41 mobile/prefs.php:46
+#: mobile/prefs.php:41 mobile/prefs.php:46 mobile/prefs.php:51
 msgid "ON"
 msgstr "ON"
 
 #: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36
-#: mobile/prefs.php:41 mobile/prefs.php:46
+#: mobile/prefs.php:41 mobile/prefs.php:46 mobile/prefs.php:51
 msgid "OFF"
 msgstr "OFF"
 
@@ -800,146 +584,335 @@ msgstr "Ocultar artículos y fuentes leídos"
 msgid "Sort feeds by unread count"
 msgstr "Ordenar fuentes por número de artículos sin leer"
 
-#: include/functions.php:564
-#, php-format
-msgid "Fatal: authentication module %s not found."
-msgstr "Error fatal: no se encuentra el módulo de autenticación %s."
+#: mobile/prefs.php:50 include/localized_schema.php:45
+msgid "Reverse headline order (oldest first)"
+msgstr "Invertir el orden de los titulares (los más antiguos primero)"
 
-#: include/functions.php:682
-msgid "Session failed to validate (incorrect IP)"
-msgstr "No se pudo validar la sesión (IP incorrecta)"
-
-#: include/functions.php:1198 include/functions.php:1737
-#: include/functions.php:1822 include/functions.php:1844
-#: include/functions.php:2699 classes/opml.php:416 classes/pref/feeds.php:193
+#: include/digest.php:131 include/functions.php:1127
+#: include/functions.php:1640 include/functions.php:1725
+#: include/functions.php:1747 classes/opml.php:416 classes/pref/feeds.php:188
 msgid "Uncategorized"
 msgstr "Sin clasificar"
 
-#: include/functions.php:1686 classes/dlg.php:387 classes/pref/filters.php:361
-msgid "All feeds"
-msgstr "Todas las fuentes"
-
-#: include/functions.php:1895
-msgid "Archived articles"
-msgstr "Artículos archivados"
-
-#: include/functions.php:1897
-msgid "Recently read"
-msgstr "Leídos recientemente"
-
-#: include/functions.php:2346
-#, php-format
-msgid "Search results: %s"
-msgstr "Resultados de búsqueda: %s"
-
-#: include/functions.php:3067 js/viewfeed.js:1998 js/viewfeed.js:1971
-#: js/viewfeed.js:1835 js/viewfeed.js:1845
-msgid "Click to play"
-msgstr "Clic para reproducir"
-
-#: include/functions.php:3068 js/viewfeed.js:1997 js/viewfeed.js:1970
-#: js/viewfeed.js:1834 js/viewfeed.js:1844
-msgid "Play"
-msgstr "Reproducir"
-
-#: include/functions.php:3203
-msgid " - "
-msgstr " - "
-
-#: include/functions.php:3232 include/functions.php:4028 classes/rpc.php:414
-msgid "no tags"
-msgstr "sin etiquetas"
-
-#: include/functions.php:3242 classes/feeds.php:680
-msgid "Edit tags for this article"
-msgstr "Editar las etiquetas de este artículo"
-
-#: include/functions.php:3252 classes/feeds.php:707
-msgid "Open article in new tab"
-msgstr "Abrir artículo en una nueva pestaña"
-
-#: include/functions.php:3263 classes/feeds.php:718
-msgid "Close article"
-msgstr "Cerrar artículo"
-
-#: include/functions.php:3280 classes/feeds.php:616
-msgid "Originally from:"
-msgstr "Original de:"
-
-#: include/functions.php:3293 classes/feeds.php:629 classes/pref/feeds.php:511
-msgid "Feed URL"
-msgstr "URL de la fuente"
-
-#: include/functions.php:3308 classes/feeds.php:68
-msgid "Visit the website"
-msgstr "Visitar el sitio oficial"
-
-#: include/functions.php:3327
-msgid "Related"
-msgstr "Relacionado"
-
-#: include/functions.php:3361 classes/dlg.php:30 classes/dlg.php:61
-#: classes/dlg.php:180 classes/dlg.php:203 classes/dlg.php:240
-#: classes/dlg.php:524 classes/dlg.php:559 classes/dlg.php:590
-#: classes/dlg.php:623 classes/dlg.php:724 classes/pref/users.php:106
-#: classes/pref/filters.php:101 classes/pref/feeds.php:1638
-#: classes/pref/feeds.php:1709 plugins/share/share.php:61
-#: plugins/updater/updater.php:301 plugins/updater/init.php:323
-msgid "Close this window"
-msgstr "Cerrar esta ventana"
-
-#: include/functions.php:4053
-msgid "(edit note)"
-msgstr "(editar nota)"
-
-#: include/functions.php:4525
-msgid "No feed selected."
-msgstr "No se ha seleccionado ninguna fuente."
-
-#: include/functions.php:4535 classes/feeds.php:766
-#, php-format
-msgid "Feeds last updated at %s"
-msgstr "Última actualización de las fuentes: %s"
-
-#: include/functions.php:4545 classes/feeds.php:776
-msgid "Some feeds have update errors (click for details)"
-msgstr ""
-"Error al actualizar algunas fuentes (pulse aquí para obtener los detalles)"
-
-#: include/functions.php:4689
-msgid "unknown type"
-msgstr "tipo desconocido"
-
-#: include/functions.php:4731
-msgid "Attachments"
-msgstr "Adjuntos"
-
-#: include/functions.php:5191
+#: include/feedbrowser.php:83
 #, php-format
 msgid "%d archived articles"
 msgstr "%d artículos archivados"
 
-#: include/functions.php:5215
+#: include/feedbrowser.php:107
 msgid "No feeds found."
 msgstr "No se han encontrado fuentes."
 
-#: include/functions.php:5261 plugins/import_export/init.php:221
-msgid "Could not import: incorrect schema version."
-msgstr "Fallo de la importación: la versión del esquema es incorrecta."
+#: include/functions.php:698
+msgid "Session failed to validate (incorrect IP)"
+msgstr "No se pudo validar la sesión (IP incorrecta)"
 
-#: include/functions.php:5266 plugins/import_export/init.php:226
-msgid "Could not import: unrecognized document format."
-msgstr "Fallo de la importación: no se reconoce el formato del documento."
+#: include/functions.php:1589 classes/dlg.php:371 classes/pref/filters.php:368
+msgid "All feeds"
+msgstr "Todas las fuentes"
 
-#: include/functions.php:5425
-#, php-format
-msgid "Finished: %d articles processed, %d imported, %d feeds created."
+#: include/functions.php:1790
+msgid "Starred articles"
+msgstr "Favoritos"
+
+#: include/functions.php:1792
+msgid "Published articles"
+msgstr "Publicados"
+
+#: include/functions.php:1794
+msgid "Fresh articles"
+msgstr "Recientes"
+
+#: include/functions.php:1796 include/functions.php:1910
+msgid "All articles"
+msgstr "Todos"
+
+#: include/functions.php:1798
+msgid "Archived articles"
+msgstr "Artículos archivados"
+
+#: include/functions.php:1800
+msgid "Recently read"
+msgstr "Leídos recientemente"
+
+#: include/functions.php:1867
+msgid "Navigation"
+msgstr "Navegación"
+
+#: include/functions.php:1868
+#, fuzzy
+msgid "Open next feed"
+msgstr "Fuente generada"
+
+#: include/functions.php:1869
+msgid "Open previous feed"
 msgstr ""
-"Finalizado: %d artículos procesados, %d importados, %d fuentes creadas."
 
-#: include/functions.php:5431 plugins/import_export/init.php:391
-msgid "Could not load XML document."
-msgstr "No se pudo cargar documento XML."
+#: include/functions.php:1870
+#, fuzzy
+msgid "Open next article"
+msgstr "Abrir artículo original"
+
+#: include/functions.php:1871
+#, fuzzy
+msgid "Open previous article"
+msgstr "Abrir artículo original"
+
+#: include/functions.php:1872
+msgid "Open next article (don't scroll long articles)"
+msgstr ""
+
+#: include/functions.php:1873
+msgid "Open previous article (don't scroll long articles)"
+msgstr ""
+
+#: include/functions.php:1874
+msgid "Show search dialog"
+msgstr "Mostrar el diálogo de búsqueda"
+
+#: include/functions.php:1875
+#, fuzzy
+msgid "Article"
+msgstr "Todos"
+
+#: include/functions.php:1876
+msgid "Toggle starred"
+msgstr "Alternar favoritos"
+
+#: include/functions.php:1877
+msgid "Toggle published"
+msgstr "Alternar publicados"
+
+#: include/functions.php:1878
+msgid "Toggle unread"
+msgstr "Alternar no leídos"
+
+#: include/functions.php:1879
+msgid "Edit tags"
+msgstr "Editar etiquetas"
+
+#: include/functions.php:1880
+#, fuzzy
+msgid "Dismiss selected"
+msgstr "Descartar artículos seleccionados"
+
+#: include/functions.php:1881
+#, fuzzy
+msgid "Dismiss read"
+msgstr "Publicar artículo"
+
+#: include/functions.php:1882
+#, fuzzy
+msgid "Open in new window"
+msgstr "Abrir el artículo en una nueva pestaña o ventana"
+
+#: include/functions.php:1883 js/viewfeed.js:1758
+msgid "Mark below as read"
+msgstr "Marcar artículos posteriores como leídos"
+
+#: include/functions.php:1884 js/viewfeed.js:1752
+msgid "Mark above as read"
+msgstr "Marcar artículos anteriores como leídos"
+
+#: include/functions.php:1885
+#, fuzzy
+msgid "Scroll down"
+msgstr "Hecho."
+
+#: include/functions.php:1886
+msgid "Scroll up"
+msgstr ""
+
+#: include/functions.php:1887
+#, fuzzy
+msgid "Select article under cursor"
+msgstr "Seleccionar el artículo que esté bajo el cursor del ratón"
+
+#: include/functions.php:1888
+msgid "Email article"
+msgstr "Enviar artículo por correo"
+
+#: include/functions.php:1889 plugins/close_button/init.php:24
+msgid "Close article"
+msgstr "Cerrar artículo"
+
+#: include/functions.php:1891
+#, fuzzy
+msgid "Article selection"
+msgstr "Invertir selección de artículos"
+
+#: include/functions.php:1892
+msgid "Select all articles"
+msgstr "Seleccionar todos los artículos"
+
+#: include/functions.php:1893
+#, fuzzy
+msgid "Select unread"
+msgstr "Seleccionar artículos sin leer"
+
+#: include/functions.php:1894
+#, fuzzy
+msgid "Select starred"
+msgstr "Marcar como favorito"
+
+#: include/functions.php:1895
+#, fuzzy
+msgid "Select published"
+msgstr "Seleccionar artículos publicados"
+
+#: include/functions.php:1896
+#, fuzzy
+msgid "Invert selection"
+msgstr "Invertir selección de artículos"
+
+#: include/functions.php:1897
+#, fuzzy
+msgid "Deselect everything"
+msgstr "Deseleccionar todos los artículos"
+
+#: include/functions.php:1898 classes/pref/feeds.php:488
+#: classes/pref/feeds.php:707
+msgid "Feed"
+msgstr "Fuente"
+
+#: include/functions.php:1899
+#, fuzzy
+msgid "Refresh current feed"
+msgstr "Actualizar la fuente activa"
+
+#: include/functions.php:1900
+#, fuzzy
+msgid "Un/hide read feeds"
+msgstr "Ocultar/Mostrar fuentes leídas"
+
+#: include/functions.php:1901 classes/pref/feeds.php:1214
+msgid "Subscribe to feed"
+msgstr "Suscribirse a una fuente"
+
+#: include/functions.php:1902 js/FeedTree.js:135 js/PrefFeedTree.js:67
+msgid "Edit feed"
+msgstr "Editar fuente"
+
+#: include/functions.php:1904
+#, fuzzy
+msgid "Reverse headlines"
+msgstr "Invertir orden de titulares"
+
+#: include/functions.php:1905
+#, fuzzy
+msgid "Debug feed update"
+msgstr "Se han actualizado todas las fuentes."
+
+#: include/functions.php:1906 js/FeedTree.js:170
+msgid "Mark all feeds as read"
+msgstr "Marcar todas las fuentes como leídas"
+
+#: include/functions.php:1907
+#, fuzzy
+msgid "Un/collapse current category"
+msgstr "Plegar la categoría"
+
+#: include/functions.php:1908
+#, fuzzy
+msgid "Toggle combined mode"
+msgstr "Cambiar a modo de reordenación de categorías"
+
+#: include/functions.php:1909
+#, fuzzy
+msgid "Go to"
+msgstr "Ir a..."
+
+#: include/functions.php:1911
+#, fuzzy
+msgid "Fresh"
+msgstr "Refrescar"
+
+#: include/functions.php:1914
+msgid "Tag cloud"
+msgstr "Nube de etiquetas"
+
+#: include/functions.php:1916
+#, fuzzy
+msgid "Other"
+msgstr "Otro:"
+
+#: include/functions.php:1917 classes/pref/labels.php:281
+msgid "Create label"
+msgstr "Crear marcador"
+
+#: include/functions.php:1918 classes/pref/filters.php:587
+msgid "Create filter"
+msgstr "Crear filtro"
+
+#: include/functions.php:1919
+#, fuzzy
+msgid "Un/collapse sidebar"
+msgstr "Colapsar la barra lateral"
+
+#: include/functions.php:1920
+#, fuzzy
+msgid "Show help dialog"
+msgstr "Mostrar el diálogo de búsqueda"
+
+#: include/functions.php:2400
+#, php-format
+msgid "Search results: %s"
+msgstr "Resultados de búsqueda: %s"
+
+#: include/functions.php:2824 js/viewfeed.js:1845
+msgid "Click to play"
+msgstr "Clic para reproducir"
+
+#: include/functions.php:2825 js/viewfeed.js:1844
+msgid "Play"
+msgstr "Reproducir"
+
+#: include/functions.php:2945
+msgid " - "
+msgstr " - "
+
+#: include/functions.php:2967 include/functions.php:3284 classes/rpc.php:359
+msgid "no tags"
+msgstr "sin etiquetas"
+
+#: include/functions.php:2977 classes/feeds.php:645
+msgid "Edit tags for this article"
+msgstr "Editar las etiquetas de este artículo"
+
+#: include/functions.php:3006 classes/feeds.php:600
+msgid "Originally from:"
+msgstr "Original de:"
+
+#: include/functions.php:3019 classes/feeds.php:613 classes/pref/feeds.php:507
+msgid "Feed URL"
+msgstr "URL de la fuente"
+
+#: include/functions.php:3048
+msgid "Related"
+msgstr "Relacionado"
+
+#: include/functions.php:3075 classes/dlg.php:43 classes/dlg.php:162
+#: classes/dlg.php:185 classes/dlg.php:222 classes/dlg.php:508
+#: classes/dlg.php:543 classes/dlg.php:574 classes/dlg.php:608
+#: classes/dlg.php:620 classes/backend.php:105 classes/pref/users.php:106
+#: classes/pref/filters.php:108 classes/pref/feeds.php:1527
+#: classes/pref/feeds.php:1598 plugins/import_export/init.php:407
+#: plugins/import_export/init.php:431 plugins/share/init.php:67
+#: plugins/updater/init.php:329
+msgid "Close this window"
+msgstr "Cerrar esta ventana"
+
+#: include/functions.php:3309
+msgid "(edit note)"
+msgstr "(editar nota)"
+
+#: include/functions.php:3542
+msgid "unknown type"
+msgstr "tipo desconocido"
+
+#: include/functions.php:3592
+msgid "Attachments"
+msgstr "Adjuntos"
 
 #: include/localized_schema.php:4
 msgid "Title or Content"
@@ -965,9 +938,8 @@ msgstr "Borrar artículo"
 msgid "Set starred"
 msgstr "Marcar como favorito"
 
-#: include/localized_schema.php:12 js/viewfeed.js:501 js/viewfeed.js:490
-#: js/viewfeed.js:496 js/viewfeed.js:478 plugins/digest/digest.js:264
-#: plugins/digest/digest.js:736
+#: include/localized_schema.php:12 js/viewfeed.js:478
+#: plugins/digest/digest.js:264 plugins/digest/digest.js:736
 msgid "Publish article"
 msgstr "Publicar artículo"
 
@@ -975,8 +947,7 @@ msgstr "Publicar artículo"
 msgid "Assign tags"
 msgstr "Asignar etiquetas"
 
-#: include/localized_schema.php:14 js/viewfeed.js:1962 js/viewfeed.js:1935
-#: js/viewfeed.js:1799 js/viewfeed.js:1809
+#: include/localized_schema.php:14 js/viewfeed.js:1809
 msgid "Assign label"
 msgstr "Asignar marcador"
 
@@ -1127,10 +1098,6 @@ msgstr "Al ponerse al corriente, mostrar la siguiente fuente"
 msgid "Sort feeds by unread articles count"
 msgstr "Ordenar las fuentes por número de artículos sin leer"
 
-#: include/localized_schema.php:45
-msgid "Reverse headline order (oldest first)"
-msgstr "Invertir el orden de los titulares (los más antiguos primero)"
-
 #: include/localized_schema.php:46
 msgid "Enable e-mail digest"
 msgstr "Activar los correos recopilatorios"
@@ -1176,7 +1143,8 @@ msgid "Group headlines in virtual feeds"
 msgstr "Agrupar los titulares en fuentes virtuales"
 
 #: include/localized_schema.php:57
-msgid "Do not show images in articles"
+#, fuzzy
+msgid "Hide images in articles"
 msgstr "No mostrar imágenes en los artículos"
 
 #: include/localized_schema.php:58
@@ -1187,8 +1155,7 @@ msgstr "Habilitar API externa"
 msgid "User timezone"
 msgstr "Zona horaria del usuario"
 
-#: include/localized_schema.php:60 js/prefs.js:1856 js/prefs.js:1743
-#: js/prefs.js:1733
+#: include/localized_schema.php:60 js/prefs.js:1733
 msgid "Customize stylesheet"
 msgstr "Personalizar hoja de estilo"
 
@@ -1209,7 +1176,7 @@ msgstr "Intentar enviar resúmenes alrededor de la hora seleccionada"
 msgid "Assign articles to labels automatically"
 msgstr "Marcar los artículos como leídos automáticamente"
 
-#: include/login_form.php:185 classes/handler/public.php:485
+#: include/login_form.php:185 classes/handler/public.php:459
 msgid "Language:"
 msgstr "Idioma:"
 
@@ -1217,8 +1184,8 @@ msgstr "Idioma:"
 msgid "Profile:"
 msgstr "Perfil:"
 
-#: include/login_form.php:197 classes/handler/public.php:208
-#: classes/rpc.php:147 classes/dlg.php:116
+#: include/login_form.php:197 classes/handler/public.php:212
+#: classes/rpc.php:64 classes/dlg.php:98
 msgid "Default profile"
 msgstr "Perfil por defecto"
 
@@ -1230,118 +1197,101 @@ msgstr "Usar menos tráfico"
 msgid "Article not found."
 msgstr "Artículo no encontrado."
 
-#: classes/handler/public.php:420 classes/pref/feeds.php:1480
+#: classes/handler/public.php:394 plugins/bookmarklets/init.php:38
 #, fuzzy
 msgid "Share with Tiny Tiny RSS"
 msgstr "Volver a Tiny Tiny RSS"
 
-#: classes/handler/public.php:428
+#: classes/handler/public.php:402
 #, fuzzy
 msgid "Title:"
 msgstr "Título"
 
-#: classes/handler/public.php:430 classes/dlg.php:667
-#: classes/pref/feeds.php:509 classes/pref/feeds.php:762
-#: plugins/instances/instances.php:100 plugins/instances/init.php:215
+#: classes/handler/public.php:404 classes/dlg.php:667
+#: classes/pref/feeds.php:505 classes/pref/feeds.php:722
+#: plugins/instances/init.php:215
 msgid "URL:"
 msgstr "URL:"
 
-#: classes/handler/public.php:432
+#: classes/handler/public.php:406
 #, fuzzy
 msgid "Content:"
 msgstr "Contenido"
 
-#: classes/handler/public.php:434
+#: classes/handler/public.php:408
 #, fuzzy
 msgid "Labels:"
 msgstr "Marcadores"
 
-#: classes/handler/public.php:453
+#: classes/handler/public.php:427
 msgid "Shared article will appear in the Published feed."
 msgstr ""
 
-#: classes/handler/public.php:455
+#: classes/handler/public.php:429
 msgid "Share"
 msgstr ""
 
-#: classes/handler/public.php:456 classes/handler/public.php:498
-#: classes/dlg.php:315 classes/dlg.php:366 classes/dlg.php:426
-#: classes/dlg.php:457 classes/dlg.php:652 classes/dlg.php:702
-#: classes/dlg.php:774 classes/pref/users.php:194 classes/pref/labels.php:81
-#: classes/pref/filters.php:342 classes/pref/filters.php:722
-#: classes/pref/filters.php:791 classes/pref/filters.php:858
-#: classes/pref/feeds.php:729 classes/pref/feeds.php:880
-#: plugins/mail/mail.php:126 plugins/note/note.php:49
-#: plugins/instances/instances.php:136
+#: classes/handler/public.php:430 classes/handler/public.php:472
+#: classes/dlg.php:297 classes/dlg.php:350 classes/dlg.php:410
+#: classes/dlg.php:441 classes/dlg.php:652 classes/dlg.php:702
+#: classes/dlg.php:751 classes/pref/users.php:194 classes/pref/labels.php:81
+#: classes/pref/filters.php:349 classes/pref/filters.php:729
+#: classes/pref/filters.php:798 classes/pref/filters.php:865
+#: classes/pref/feeds.php:689 classes/pref/feeds.php:829
+#: plugins/mail/init.php:132 plugins/note/init.php:55
+#: plugins/instances/init.php:251
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: classes/handler/public.php:477
+#: classes/handler/public.php:451
 #, fuzzy
 msgid "Not logged in"
 msgstr "Última sesión el"
 
-#: classes/handler/public.php:537
+#: classes/handler/public.php:511
 msgid "Incorrect username or password"
 msgstr "Nombre de usuario o contraseña incorrecta"
 
-#: classes/handler/public.php:573 classes/handler/public.php:670
+#: classes/handler/public.php:547 classes/handler/public.php:644
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "Ya está suscrito a <strong>%s</strong>."
 
-#: classes/handler/public.php:576 classes/handler/public.php:661
+#: classes/handler/public.php:550 classes/handler/public.php:635
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "Suscrito a <strong>%s</strong>."
 
-#: classes/handler/public.php:579 classes/handler/public.php:664
+#: classes/handler/public.php:553 classes/handler/public.php:638
 #, fuzzy, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "Ya está suscrito a <strong>%s</strong>."
 
-#: classes/handler/public.php:582 classes/handler/public.php:667
+#: classes/handler/public.php:556 classes/handler/public.php:641
 #, fuzzy, php-format
 msgid "No feeds found in <b>%s</b>."
 msgstr "No se han encontrado fuentes."
 
-#: classes/handler/public.php:585 classes/handler/public.php:673
+#: classes/handler/public.php:559 classes/handler/public.php:647
 #, fuzzy
 msgid "Multiple feed URLs found."
 msgstr "La URL de la fuente publicada ha sido cambiada."
 
-#: classes/handler/public.php:589 classes/handler/public.php:678
+#: classes/handler/public.php:563 classes/handler/public.php:652
 #, fuzzy, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr "Ya está suscrito a <strong>%s</strong>."
 
-#: classes/handler/public.php:607 classes/handler/public.php:696
+#: classes/handler/public.php:581 classes/handler/public.php:670
 #, fuzzy
 msgid "Subscribe to selected feed"
 msgstr "¿Cancelar la suscripción a las fuentes seleccionadas?"
 
-#: classes/handler/public.php:632 classes/handler/public.php:720
+#: classes/handler/public.php:606 classes/handler/public.php:694
 msgid "Edit subscription options"
 msgstr "Editar las opciones de suscripción"
 
-#: classes/auth/internal.php:45 plugins/auth_internal/init.php:62
-#, fuzzy
-msgid "Please enter your one time password:"
-msgstr "Por favor, introduzca una nota para este artículo:"
-
-#: classes/auth/internal.php:168 plugins/auth_internal/init.php:185
-msgid "Password has been changed."
-msgstr "La contraseña ha sido cambiada."
-
-#: classes/auth/internal.php:170
-msgid "Old password is incorrect."
-msgstr "La contraseña antigua es incorrecta."
-
-#: classes/dlg.php:26
-msgid "Prepare data"
-msgstr "Preparar datos"
-
-#: classes/dlg.php:40
+#: classes/dlg.php:22
 msgid ""
 "If you have imported labels and/or filters, you might need to reload "
 "preferences to see your new data."
@@ -1349,66 +1299,66 @@ msgstr ""
 "Si ha importado marcadores y/o filtros, puede ser necesario recargar las "
 "preferencia para ver sus nuevos datos."
 
-#: classes/dlg.php:73 classes/pref/users.php:378 classes/pref/labels.php:272
-#: classes/pref/filters.php:223 classes/pref/filters.php:270
-#: classes/pref/filters.php:571 classes/pref/filters.php:650
-#: classes/pref/filters.php:677 classes/pref/feeds.php:1274
-#: classes/pref/feeds.php:1583 classes/pref/feeds.php:1652
-#: plugins/instances/instances.php:172
+#: classes/dlg.php:55 classes/pref/users.php:378 classes/pref/labels.php:272
+#: classes/pref/filters.php:230 classes/pref/filters.php:277
+#: classes/pref/filters.php:578 classes/pref/filters.php:657
+#: classes/pref/filters.php:684 classes/pref/feeds.php:1202
+#: classes/pref/feeds.php:1472 classes/pref/feeds.php:1541
+#: plugins/instances/init.php:287
 msgid "Select"
 msgstr "Seleccionar"
 
-#: classes/dlg.php:76 classes/feeds.php:92 classes/pref/users.php:381
-#: classes/pref/labels.php:275 classes/pref/filters.php:226
-#: classes/pref/filters.php:273 classes/pref/filters.php:574
-#: classes/pref/filters.php:653 classes/pref/filters.php:680
-#: classes/pref/feeds.php:1277 classes/pref/feeds.php:1586
-#: classes/pref/feeds.php:1655 plugins/instances/instances.php:175
+#: classes/dlg.php:58 classes/feeds.php:92 classes/pref/users.php:381
+#: classes/pref/labels.php:275 classes/pref/filters.php:233
+#: classes/pref/filters.php:280 classes/pref/filters.php:581
+#: classes/pref/filters.php:660 classes/pref/filters.php:687
+#: classes/pref/feeds.php:1205 classes/pref/feeds.php:1475
+#: classes/pref/feeds.php:1544 plugins/instances/init.php:290
 msgid "All"
 msgstr "Todo"
 
-#: classes/dlg.php:78 classes/feeds.php:95 classes/pref/users.php:383
-#: classes/pref/labels.php:277 classes/pref/filters.php:228
-#: classes/pref/filters.php:275 classes/pref/filters.php:576
-#: classes/pref/filters.php:655 classes/pref/filters.php:682
-#: classes/pref/feeds.php:1279 classes/pref/feeds.php:1588
-#: classes/pref/feeds.php:1657 plugins/instances/instances.php:177
+#: classes/dlg.php:60 classes/feeds.php:95 classes/pref/users.php:383
+#: classes/pref/labels.php:277 classes/pref/filters.php:235
+#: classes/pref/filters.php:282 classes/pref/filters.php:583
+#: classes/pref/filters.php:662 classes/pref/filters.php:689
+#: classes/pref/feeds.php:1207 classes/pref/feeds.php:1477
+#: classes/pref/feeds.php:1546 plugins/instances/init.php:292
 msgid "None"
 msgstr "Nada"
 
-#: classes/dlg.php:87
+#: classes/dlg.php:69
 msgid "Create profile"
 msgstr "Crear perfil"
 
-#: classes/dlg.php:110 classes/dlg.php:140
+#: classes/dlg.php:92 classes/dlg.php:122
 msgid "(active)"
 msgstr "(activo)"
 
-#: classes/dlg.php:174
+#: classes/dlg.php:156
 msgid "Remove selected profiles"
 msgstr "Borrar los perfiles seleccionados"
 
-#: classes/dlg.php:176
+#: classes/dlg.php:158
 msgid "Activate profile"
 msgstr "Activar perfil"
 
-#: classes/dlg.php:186
+#: classes/dlg.php:168
 msgid "Public OPML URL"
 msgstr "URL del archivo OPML público"
 
-#: classes/dlg.php:191
+#: classes/dlg.php:173
 msgid "Your Public OPML URL is:"
 msgstr "La URL de su archivo OPML público es:"
 
-#: classes/dlg.php:200 classes/dlg.php:587
+#: classes/dlg.php:182 classes/dlg.php:571
 msgid "Generate new URL"
 msgstr "Generar URL nueva"
 
-#: classes/dlg.php:212
+#: classes/dlg.php:194
 msgid "Notice"
 msgstr "Aviso"
 
-#: classes/dlg.php:218
+#: classes/dlg.php:200
 msgid ""
 "Update daemon is enabled in configuration, but daemon process is not "
 "running, which prevents all feeds from updating. Please start the daemon "
@@ -1419,11 +1369,11 @@ msgstr ""
 "actualización de todas las fuentes. Por favor, inicie el proceso del demonio "
 "o solicítelo al propietario de la instancia."
 
-#: classes/dlg.php:222 classes/dlg.php:231
+#: classes/dlg.php:204 classes/dlg.php:213
 msgid "Last update:"
 msgstr "Última actualización:"
 
-#: classes/dlg.php:227
+#: classes/dlg.php:209
 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 "
@@ -1434,138 +1384,137 @@ msgstr ""
 "(rotura, cuelgue,...). Por favor, compruebe el proceso del demonio o avise "
 "al propietario de la instancia."
 
-#: classes/dlg.php:252 classes/dlg.php:261
+#: classes/dlg.php:234 classes/dlg.php:243
 #, fuzzy
 msgid "Feed or site URL"
 msgstr "URL de la fuente"
 
-#: classes/dlg.php:267 classes/dlg.php:738 classes/pref/feeds.php:531
-#: classes/pref/feeds.php:775
+#: classes/dlg.php:249 classes/dlg.php:715 classes/pref/feeds.php:527
+#: classes/pref/feeds.php:735
 msgid "Place in category:"
 msgstr "Colocar en la categoría:"
 
-#: classes/dlg.php:275
+#: classes/dlg.php:257
 msgid "Available feeds"
 msgstr "Fuentes disponibles"
 
-#: classes/dlg.php:287 classes/pref/users.php:155 classes/pref/feeds.php:561
-#: classes/pref/feeds.php:811
+#: classes/dlg.php:269 classes/pref/users.php:155 classes/pref/feeds.php:557
+#: classes/pref/feeds.php:771
 msgid "Authentication"
 msgstr "Autenticación"
 
-#: classes/dlg.php:291 classes/dlg.php:752 classes/pref/users.php:438
-#: classes/pref/feeds.php:567 classes/pref/feeds.php:815
+#: classes/dlg.php:273 classes/dlg.php:729 classes/pref/users.php:438
+#: classes/pref/feeds.php:563 classes/pref/feeds.php:775
 msgid "Login"
 msgstr "Iniciar sesión"
 
-#: classes/dlg.php:294 classes/dlg.php:755 classes/pref/prefs.php:200
-#: classes/pref/feeds.php:573 classes/pref/feeds.php:821
+#: classes/dlg.php:276 classes/dlg.php:732 classes/pref/prefs.php:196
+#: classes/pref/feeds.php:569 classes/pref/feeds.php:781
 msgid "Password"
 msgstr "Contraseña:"
 
-#: classes/dlg.php:304
+#: classes/dlg.php:286
 msgid "This feed requires authentication."
 msgstr "Esta fuente requiere autenticación."
 
-#: classes/dlg.php:309 classes/dlg.php:364 classes/dlg.php:773
+#: classes/dlg.php:291 classes/dlg.php:348 classes/dlg.php:750
 msgid "Subscribe"
 msgstr "Suscribir"
 
-#: classes/dlg.php:312
+#: classes/dlg.php:294
 msgid "More feeds"
 msgstr "Más fuentes"
 
-#: classes/dlg.php:336 classes/dlg.php:425 classes/pref/users.php:368
-#: classes/pref/filters.php:567 classes/pref/feeds.php:1270 js/tt-rss.js:234
-#: js/tt-rss.js:187 js/tt-rss.js:166
+#: classes/dlg.php:318 classes/dlg.php:409 classes/pref/users.php:368
+#: classes/pref/filters.php:574 classes/pref/feeds.php:1198 js/tt-rss.js:166
 msgid "Search"
 msgstr "Buscar"
 
-#: classes/dlg.php:340
+#: classes/dlg.php:322
 msgid "Popular feeds"
 msgstr "Fuentes populares"
 
-#: classes/dlg.php:341
+#: classes/dlg.php:323
 msgid "Feed archive"
 msgstr "Archivo de fuentes"
 
-#: classes/dlg.php:344
+#: classes/dlg.php:326
 msgid "limit:"
 msgstr "límite:"
 
-#: classes/dlg.php:365 classes/pref/users.php:394 classes/pref/labels.php:284
-#: classes/pref/filters.php:332 classes/pref/filters.php:589
-#: classes/pref/feeds.php:702 plugins/instances/instances.php:182
+#: classes/dlg.php:349 classes/pref/users.php:394 classes/pref/labels.php:284
+#: classes/pref/filters.php:339 classes/pref/filters.php:596
+#: classes/pref/feeds.php:662 plugins/instances/init.php:297
 msgid "Remove"
 msgstr "Eliminar"
 
-#: classes/dlg.php:376
+#: classes/dlg.php:360
 msgid "Look for"
 msgstr "Buscar"
 
-#: classes/dlg.php:384
+#: classes/dlg.php:368
 msgid "Limit search to:"
 msgstr "Limitar la búsqueda a:"
 
-#: classes/dlg.php:400
+#: classes/dlg.php:384
 msgid "This feed"
 msgstr "Esta fuente"
 
-#: classes/dlg.php:432
+#: classes/dlg.php:416
 msgid "Tags for this article (separated by commas):"
 msgstr "Etiquetas para este artículo (separadas por comas):"
 
-#: classes/dlg.php:455 classes/dlg.php:650 classes/pref/users.php:192
-#: classes/pref/labels.php:79 classes/pref/filters.php:339
-#: classes/pref/feeds.php:728 classes/pref/feeds.php:877
-#: plugins/note/note.php:47 plugins/instances/instances.php:133
-#: plugins/nsfw/init.php:86 plugins/owncloud/init.php:62
+#: classes/dlg.php:439 classes/dlg.php:650 classes/pref/users.php:192
+#: classes/pref/labels.php:79 classes/pref/filters.php:346
+#: classes/pref/feeds.php:688 classes/pref/feeds.php:826
+#: plugins/nsfw/init.php:86 plugins/note/init.php:53
+#: plugins/owncloud/init.php:62 plugins/instances/init.php:248
 msgid "Save"
 msgstr "Guardar"
 
-#: classes/dlg.php:463
+#: classes/dlg.php:447
 msgid "Tag Cloud"
 msgstr "Nube de etiquetas"
 
-#: classes/dlg.php:532
+#: classes/dlg.php:516
 msgid "Select item(s) by tags"
 msgstr "Seleccionar artículo(s) por etiquetas"
 
-#: classes/dlg.php:535
+#: classes/dlg.php:519
 msgid "Match:"
 msgstr "Coincidir:"
 
-#: classes/dlg.php:537
+#: classes/dlg.php:521
 msgid "Any"
 msgstr ""
 
-#: classes/dlg.php:540
+#: classes/dlg.php:524
 #, fuzzy
 msgid "All tags."
 msgstr "sin etiquetas"
 
-#: classes/dlg.php:542
+#: classes/dlg.php:526
 msgid "Which Tags?"
 msgstr "¿Cuáles etiquetas?"
 
-#: classes/dlg.php:555
+#: classes/dlg.php:539
 msgid "Display entries"
 msgstr "Mostrar artículos"
 
-#: classes/dlg.php:567 classes/feeds.php:129
+#: classes/dlg.php:551 classes/feeds.php:133
 msgid "View as RSS"
 msgstr "Ver como RSS"
 
-#: classes/dlg.php:578
+#: classes/dlg.php:562
 msgid "You can view this feed as RSS using the following URL:"
 msgstr "Puede ver esta fuente en formato RSS en la siguiente URL:"
 
-#: classes/dlg.php:606 plugins/updater/updater.php:276
+#: classes/dlg.php:591 plugins/updater/init.php:303
 #, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "Nueva versión de Tiny Tiny RSS disponible (%s)."
 
-#: classes/dlg.php:614
+#: classes/dlg.php:599
 msgid ""
 "You can update using built-in updater in the Preferences or by using update."
 "php"
@@ -1573,14 +1522,18 @@ msgstr ""
 "Puede actualizar usando el gestor de actualización en las preferenciaso "
 "utilizando update.php"
 
-#: classes/dlg.php:618 classes/pref/users.php:390
+#: classes/dlg.php:603 classes/pref/users.php:390
 msgid "Details"
 msgstr "Detalles"
 
-#: classes/dlg.php:620
+#: classes/dlg.php:605
 msgid "Download"
 msgstr "Descargar"
 
+#: classes/dlg.php:613
+msgid "Error receiving version information or no new version available."
+msgstr ""
+
 #: classes/dlg.php:634
 #, php-format
 msgid ""
@@ -1592,32 +1545,29 @@ msgstr ""
 "código CSS. Puede utilizar  <a target=\"_blank\" class=\"visibleLink\" href="
 "\"%s\">este archivo</a> como referencia."
 
-#: classes/dlg.php:661 plugins/instances/instances.php:92
-#: plugins/instances/init.php:207
+#: classes/dlg.php:661 plugins/instances/init.php:207
 msgid "Instance"
 msgstr "Instancia"
 
-#: classes/dlg.php:670 plugins/instances/instances.php:103
-#: plugins/instances/instances.php:200 plugins/instances/init.php:218
+#: classes/dlg.php:670 plugins/instances/init.php:218
+#: plugins/instances/init.php:315
 msgid "Instance URL"
 msgstr "URL de la instancia"
 
-#: classes/dlg.php:680 plugins/instances/instances.php:114
-#: plugins/instances/init.php:229
+#: classes/dlg.php:680 plugins/instances/init.php:229
 msgid "Access key:"
 msgstr "Clave de acceso:"
 
-#: classes/dlg.php:683 plugins/instances/instances.php:117
-#: plugins/instances/instances.php:201 plugins/instances/init.php:232
+#: classes/dlg.php:683 plugins/instances/init.php:232
+#: plugins/instances/init.php:316
 msgid "Access key"
 msgstr "Clave de acceso"
 
-#: classes/dlg.php:687 plugins/instances/instances.php:121
-#: plugins/instances/init.php:236
+#: classes/dlg.php:687 plugins/instances/init.php:236
 msgid "Use one access key for both linked instances."
 msgstr "Usar una clave de acceso para ambas instancias enlazadas."
 
-#: classes/dlg.php:695 plugins/instances/instances.php:129
+#: classes/dlg.php:695 plugins/instances/init.php:244
 msgid "Generate new key"
 msgstr "Generar nueva clave"
 
@@ -1625,29 +1575,24 @@ msgstr "Generar nueva clave"
 msgid "Create link"
 msgstr "Crear enlace"
 
-#: classes/dlg.php:717
-#, php-format
-msgid ""
-"Could not upload file. You might need to adjust upload_max_filesize\n"
-"\t\t\t\tin PHP.ini (current value = %s)"
-msgstr ""
-"No se puedo cargar el archivo. Puede ser necesario ajustar el parámetro "
-"upload_max_filesize en PHP.ini (valor actual = %s)"
-
-#: classes/dlg.php:735
+#: classes/dlg.php:712
 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/dlg.php:744
+#: classes/dlg.php:721
 msgid "Feeds to subscribe, One per line"
 msgstr "Fuentes para suscribirse, una por línea"
 
-#: classes/dlg.php:766
+#: classes/dlg.php:743
 msgid "Feeds require authentication."
 msgstr "Las fuentes requieren autenticación."
 
+#: classes/feeds.php:68
+msgid "Visit the website"
+msgstr "Visitar el sitio oficial"
+
 #: classes/feeds.php:83
 msgid "View as RSS feed"
 msgstr "Ver como fuente RSS"
@@ -1660,6 +1605,11 @@ msgstr "Seleccionar:"
 msgid "Invert"
 msgstr "Invertir"
 
+#: classes/feeds.php:101
+#, fuzzy
+msgid "More..."
+msgstr "%d más..."
+
 #: classes/feeds.php:103
 msgid "Selection toggle:"
 msgstr "Alternar la selección:"
@@ -1681,41 +1631,41 @@ msgstr "Archivar"
 msgid "Move back"
 msgstr "Mover a la fuente original"
 
-#: classes/feeds.php:118 classes/pref/filters.php:235
-#: classes/pref/filters.php:282 classes/pref/filters.php:662
-#: classes/pref/filters.php:689
+#: classes/feeds.php:118 classes/pref/filters.php:242
+#: classes/pref/filters.php:289 classes/pref/filters.php:669
+#: classes/pref/filters.php:696
 msgid "Delete"
 msgstr "Borrar"
 
-#: classes/feeds.php:122 plugins/mail/mail.php:22
+#: classes/feeds.php:125 plugins/mail/init.php:28
 msgid "Forward by email"
 msgstr "Enviar por correo electrónico"
 
-#: classes/feeds.php:125
+#: classes/feeds.php:129
 msgid "Feed:"
 msgstr "Fuente:"
 
-#: classes/feeds.php:190 classes/feeds.php:844
+#: classes/feeds.php:196 classes/feeds.php:790
 msgid "Feed not found."
 msgstr "Fuente no encontrada."
 
-#: classes/feeds.php:434 classes/feeds.php:516
+#: classes/feeds.php:403 classes/feeds.php:493
 msgid "mark as read"
 msgstr "marcar como leído"
 
-#: classes/feeds.php:739
+#: classes/feeds.php:691
 msgid "No unread articles found to display."
 msgstr "No se han encontrado artículos sin leer."
 
-#: classes/feeds.php:742
+#: classes/feeds.php:694
 msgid "No updated articles found to display."
 msgstr "No se han encontrado artículos actualizados."
 
-#: classes/feeds.php:745
+#: classes/feeds.php:697
 msgid "No starred articles found to display."
 msgstr "No se han encontrado artículos favoritos."
 
-#: classes/feeds.php:749
+#: classes/feeds.php:701
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
@@ -1724,11 +1674,41 @@ msgstr ""
 "artículos a los marcadores manualmente (ver arriba el menú Acciones) o usar "
 "un filtro."
 
-#: classes/feeds.php:751
+#: classes/feeds.php:703
 msgid "No articles found to display."
 msgstr "No se han encontrado artículos que mostrar."
 
-#: classes/backend.php:26
+#: classes/feeds.php:718 classes/feeds.php:899
+#, php-format
+msgid "Feeds last updated at %s"
+msgstr "Última actualización de las fuentes: %s"
+
+#: classes/feeds.php:728 classes/feeds.php:909
+msgid "Some feeds have update errors (click for details)"
+msgstr ""
+"Error al actualizar algunas fuentes (pulse aquí para obtener los detalles)"
+
+#: classes/feeds.php:889
+msgid "No feed selected."
+msgstr "No se ha seleccionado ninguna fuente."
+
+#: classes/backend.php:34
+msgid "Keyboard Shortcuts"
+msgstr "Atajos de teclado"
+
+#: classes/backend.php:57
+msgid "Shift"
+msgstr ""
+
+#: classes/backend.php:60
+msgid "Ctrl"
+msgstr ""
+
+#: classes/backend.php:84
+msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
+msgstr "Otros trucos están disponibles en el wiki de Tiny Tiny RSS."
+
+#: classes/backend.php:99
 msgid "Help topic not found."
 msgstr "Tema de ayuda no encontrado."
 
@@ -1778,16 +1758,15 @@ msgstr "Añadiendo filtro..."
 msgid "Processing category: %s"
 msgstr "Procesando categoría: %s"
 
-#: classes/opml.php:467
+#: classes/opml.php:468
 msgid "Error: please upload OPML file."
 msgstr "Error: por favor, suba un fichero OPML."
 
-#: classes/opml.php:474
+#: classes/opml.php:475
 msgid "Error while parsing document."
 msgstr "Error mientras se analizaba el documento."
 
-#: classes/pref/users.php:6 plugins/instances/instances.php:42
-#: plugins/instances/init.php:157
+#: classes/pref/users.php:6 plugins/instances/init.php:157
 msgid "Your access level is insufficient to open this tab."
 msgstr "Su nivel de acceso es insuficiente para abrir esta pestaña."
 
@@ -1827,8 +1806,8 @@ msgstr "Nivel de acceso:"
 msgid "Change password to"
 msgstr "Cambiar la contraseña a"
 
-#: classes/pref/users.php:177 classes/pref/feeds.php:581
-#: classes/pref/feeds.php:827
+#: classes/pref/users.php:177 classes/pref/feeds.php:577
+#: classes/pref/feeds.php:787
 msgid "Options"
 msgstr "Opciones"
 
@@ -1871,8 +1850,12 @@ msgstr "Notificando a <strong>%s</strong>."
 msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] Notificación de cambio de contraseña"
 
-#: classes/pref/users.php:392 classes/pref/filters.php:586
-#: plugins/instances/instances.php:181
+#: classes/pref/users.php:386
+msgid "Create user"
+msgstr "Crear usuario"
+
+#: classes/pref/users.php:392 classes/pref/filters.php:593
+#: plugins/instances/init.php:296
 msgid "Edit"
 msgstr "Editar"
 
@@ -1888,15 +1871,15 @@ msgstr "Nivel de acceso"
 msgid "Last login"
 msgstr "Última sesión"
 
-#: classes/pref/users.php:461 plugins/instances/instances.php:222
+#: classes/pref/users.php:462 plugins/instances/init.php:337
 msgid "Click to edit"
 msgstr "Pulse aquí para editar"
 
-#: classes/pref/users.php:481
+#: classes/pref/users.php:482
 msgid "No users defined."
 msgstr "No se han definido usuarios."
 
-#: classes/pref/users.php:483
+#: classes/pref/users.php:484
 msgid "No matching users found."
 msgstr "No se han encontrado usuarios coincidentes."
 
@@ -1939,85 +1922,89 @@ msgstr "No se han encontrado filtros coincidentes."
 msgid "No recent articles matching this filter have been found."
 msgstr "No se han encontrado filtros coincidentes."
 
-#: classes/pref/filters.php:218 classes/pref/filters.php:645
-#: classes/pref/filters.php:760
+#: classes/pref/filters.php:98
+msgid ""
+"Complex expressions might not give results while testing due to issues with "
+"database server regexp implementation."
+msgstr ""
+
+#: classes/pref/filters.php:225 classes/pref/filters.php:652
+#: classes/pref/filters.php:767
 msgid "Match"
 msgstr "Coincidir"
 
-#: classes/pref/filters.php:232 classes/pref/filters.php:279
-#: classes/pref/filters.php:659 classes/pref/filters.php:686
+#: classes/pref/filters.php:239 classes/pref/filters.php:286
+#: classes/pref/filters.php:666 classes/pref/filters.php:693
 msgid "Add"
 msgstr ""
 
-#: classes/pref/filters.php:265 classes/pref/filters.php:672
+#: classes/pref/filters.php:272 classes/pref/filters.php:679
 #, fuzzy
 msgid "Apply actions"
 msgstr "Añadir acción"
 
-#: classes/pref/filters.php:315 classes/pref/filters.php:701
+#: classes/pref/filters.php:322 classes/pref/filters.php:708
 msgid "Enabled"
 msgstr "Habilitado"
 
-#: classes/pref/filters.php:324 classes/pref/filters.php:704
+#: classes/pref/filters.php:331 classes/pref/filters.php:711
 #, fuzzy
 msgid "Match any rule"
 msgstr "Coincidencia en:"
 
-#: classes/pref/filters.php:336 classes/pref/filters.php:716
+#: classes/pref/filters.php:343 classes/pref/filters.php:723
 msgid "Test"
 msgstr ""
 
-#: classes/pref/filters.php:368
+#: classes/pref/filters.php:375
 #, php-format
 msgid "%s on %s in %s"
 msgstr ""
 
-#: classes/pref/filters.php:583
+#: classes/pref/filters.php:590
 msgid "Combine"
 msgstr ""
 
-#: classes/pref/filters.php:593 classes/pref/feeds.php:1329
+#: classes/pref/filters.php:600 classes/pref/feeds.php:1257
 msgid "Rescore articles"
 msgstr "Reiniciar la puntuación de los artículos"
 
-#: classes/pref/filters.php:719
+#: classes/pref/filters.php:726
 msgid "Create"
 msgstr "Crear"
 
-#: classes/pref/filters.php:769
+#: classes/pref/filters.php:776
 msgid "on field"
 msgstr "en el campo"
 
-#: classes/pref/filters.php:775 js/PrefFilterTree.js:29
+#: classes/pref/filters.php:782 js/PrefFilterTree.js:29
 #: plugins/digest/digest.js:241
 msgid "in"
 msgstr "en"
 
-#: classes/pref/filters.php:788
+#: classes/pref/filters.php:795
 #, fuzzy
 msgid "Save rule"
 msgstr "Guardar"
 
-#: classes/pref/filters.php:788 js/functions.js:1067 js/functions.js:1063
-#: js/functions.js:1071 js/functions.js:1073
+#: classes/pref/filters.php:795 js/functions.js:1078
 msgid "Add rule"
 msgstr "Añadir regla"
 
-#: classes/pref/filters.php:811
+#: classes/pref/filters.php:818
 msgid "Perform Action"
 msgstr "Realizar la acción"
 
-#: classes/pref/filters.php:837
+#: classes/pref/filters.php:844
 msgid "with parameters:"
 msgstr "con los parámetros:"
 
-#: classes/pref/filters.php:855
+#: classes/pref/filters.php:862
 #, fuzzy
 msgid "Save action"
 msgstr "Acciones del panel"
 
-#: classes/pref/filters.php:855 js/functions.js:1093 js/functions.js:1089
-#: js/functions.js:1097 js/functions.js:1099
+#: classes/pref/filters.php:862 js/functions.js:1104
 msgid "Add action"
 msgstr "Añadir acción"
 
@@ -2037,151 +2024,186 @@ msgstr "Las contraseñas introducidas no coinciden."
 msgid "Function not supported by authentication module."
 msgstr ""
 
-#: classes/pref/prefs.php:68
+#: classes/pref/prefs.php:63
 msgid "The configuration was saved."
 msgstr "La configuración ha sido guardada."
 
-#: classes/pref/prefs.php:83
+#: classes/pref/prefs.php:77
 #, php-format
 msgid "Unknown option: %s"
 msgstr "Opción desconocida: %s"
 
-#: classes/pref/prefs.php:97
+#: classes/pref/prefs.php:91
 #, fuzzy
 msgid "Your personal data has been saved."
 msgstr "Se ha programado la actualización de la categoría."
 
-#: classes/pref/prefs.php:137
+#: classes/pref/prefs.php:131
 #, fuzzy
 msgid "Personal data / Authentication"
 msgstr "Autenticación"
 
-#: classes/pref/prefs.php:157
+#: classes/pref/prefs.php:151
 msgid "Personal data"
 msgstr "Datos personales"
 
-#: classes/pref/prefs.php:167
+#: classes/pref/prefs.php:161
 msgid "Full name"
 msgstr ""
 
-#: classes/pref/prefs.php:171
+#: classes/pref/prefs.php:165
 msgid "E-mail"
 msgstr "Correo electrónico"
 
-#: classes/pref/prefs.php:177
+#: classes/pref/prefs.php:171
 msgid "Access level"
 msgstr "Nivel de acceso"
 
-#: classes/pref/prefs.php:187
+#: classes/pref/prefs.php:181
 #, fuzzy
 msgid "Save data"
 msgstr "Guardar"
 
-#: classes/pref/prefs.php:207
+#: classes/pref/prefs.php:203
 #, fuzzy
 msgid "Your password is at default value, please change it."
 msgstr "Su contraseña tiene el valor por defecto. Por favor, modifíquela."
 
-#: classes/pref/prefs.php:239
+#: classes/pref/prefs.php:235
 msgid "Old password"
 msgstr "Antigua contraseña"
 
-#: classes/pref/prefs.php:242
+#: classes/pref/prefs.php:238
 msgid "New password"
 msgstr "Nueva contraseña"
 
-#: classes/pref/prefs.php:247
+#: classes/pref/prefs.php:243
 msgid "Confirm password"
 msgstr "Confirme la nueva contraseña"
 
-#: classes/pref/prefs.php:257
+#: classes/pref/prefs.php:253
 msgid "Change password"
 msgstr "Cambiar contraseña"
 
-#: classes/pref/prefs.php:263
+#: classes/pref/prefs.php:259
 msgid "One time passwords / Authenticator"
 msgstr ""
 
-#: classes/pref/prefs.php:292 classes/pref/prefs.php:343
+#: classes/pref/prefs.php:288 classes/pref/prefs.php:339
 #, fuzzy
 msgid "Enter your password"
 msgstr "Nombre de usuario o contraseña incorrecta"
 
-#: classes/pref/prefs.php:303
+#: classes/pref/prefs.php:299
 #, fuzzy
 msgid "Disable OTP"
 msgstr "(desactivado)"
 
-#: classes/pref/prefs.php:309
+#: classes/pref/prefs.php:305
 msgid ""
 "You will need a compatible Authenticator to use this. Changing your password "
 "would automatically disable OTP."
 msgstr ""
 
-#: classes/pref/prefs.php:311
+#: classes/pref/prefs.php:307
 msgid "Scan the following code by the Authenticator application:"
 msgstr ""
 
-#: classes/pref/prefs.php:352
+#: classes/pref/prefs.php:348
 msgid "I have scanned the code and would like to enable OTP"
 msgstr ""
 
-#: classes/pref/prefs.php:360
+#: classes/pref/prefs.php:356
 #, fuzzy
 msgid "Enable OTP"
 msgstr "Habilitado"
 
-#: classes/pref/prefs.php:456
-msgid "Select theme"
-msgstr "Seleccionar plantilla"
-
-#: classes/pref/prefs.php:508
+#: classes/pref/prefs.php:482
 #, fuzzy
 msgid "Customize"
 msgstr "Personalizar hoja de estilo"
 
-#: classes/pref/prefs.php:527 classes/pref/prefs.php:534
-#: classes/pref/prefs.php:539
+#: classes/pref/prefs.php:501 classes/pref/prefs.php:508
+#: classes/pref/prefs.php:513
 msgid "Yes"
 msgstr "Sí"
 
-#: classes/pref/prefs.php:529 classes/pref/prefs.php:539
+#: classes/pref/prefs.php:503 classes/pref/prefs.php:513
 msgid "No"
 msgstr "No"
 
-#: classes/pref/prefs.php:569
+#: classes/pref/prefs.php:543
 #, fuzzy
 msgid "Register"
 msgstr "Registrado"
 
-#: classes/pref/prefs.php:573
+#: classes/pref/prefs.php:547
 msgid "Clear"
 msgstr ""
 
-#: classes/pref/prefs.php:579
+#: classes/pref/prefs.php:553
 #, php-format
 msgid "Current server time: %s (UTC)"
 msgstr ""
 
-#: classes/pref/prefs.php:604
+#: classes/pref/prefs.php:582
 msgid "Save configuration"
 msgstr "Guardar la configuración"
 
-#: classes/pref/prefs.php:607
+#: classes/pref/prefs.php:585
 #, fuzzy
 msgid "Manage profiles"
 msgstr "Crear perfil"
 
-#: classes/pref/prefs.php:610
+#: classes/pref/prefs.php:588
 msgid "Reset to defaults"
 msgstr "Opciones por defecto"
 
-#: classes/pref/prefs.php:622
+#: classes/pref/prefs.php:600
 #, fuzzy
 msgid "Show additional preferences"
 msgstr "Salir de las preferencias"
 
-#: classes/pref/prefs.php:679 classes/pref/prefs.php:697
+#: classes/pref/prefs.php:612 classes/pref/prefs.php:614
+msgid "Plugins"
+msgstr ""
+
+#: classes/pref/prefs.php:642
+msgid "System plugins"
+msgstr ""
+
+#: classes/pref/prefs.php:646 classes/pref/prefs.php:695
+msgid "Plugin"
+msgstr ""
+
+#: classes/pref/prefs.php:647 classes/pref/prefs.php:696
+#, fuzzy
+msgid "Description"
+msgstr "Selección"
+
+#: classes/pref/prefs.php:648 classes/pref/prefs.php:697
+msgid "Version"
+msgstr ""
+
+#: classes/pref/prefs.php:649 classes/pref/prefs.php:698
+msgid "Author"
+msgstr ""
+
+#: classes/pref/prefs.php:682 classes/pref/prefs.php:733
+#, fuzzy
+msgid "Clear data"
+msgstr "Limpiar los datos de la fuente"
+
+#: classes/pref/prefs.php:691
+msgid "User plugins"
+msgstr ""
+
+#: classes/pref/prefs.php:748
+#, fuzzy
+msgid "Enable selected plugins"
+msgstr "Habilitar los iconos de la fuente"
+
+#: classes/pref/prefs.php:803 classes/pref/prefs.php:821
 #, fuzzy
 msgid "Incorrect password"
 msgstr "Nombre de usuario o contraseña incorrecta"
@@ -2190,188 +2212,166 @@ msgstr "Nombre de usuario o contraseña incorrecta"
 msgid "Check to enable field"
 msgstr "Marcar para habilitar el campo"
 
-#: classes/pref/feeds.php:59 classes/pref/feeds.php:180
-#: classes/pref/feeds.php:223 classes/pref/feeds.php:229
-#: classes/pref/feeds.php:254
+#: classes/pref/feeds.php:58 classes/pref/feeds.php:175
+#: classes/pref/feeds.php:217 classes/pref/feeds.php:223
+#: classes/pref/feeds.php:248
 #, fuzzy, php-format
 msgid "(%d feeds)"
 msgstr "Editar la fuente"
 
-#: classes/pref/feeds.php:492 classes/pref/feeds.php:747
-msgid "Feed"
-msgstr "Fuente"
-
-#: classes/pref/feeds.php:498
+#: classes/pref/feeds.php:494
 #, fuzzy
 msgid "Feed Title"
 msgstr "Título"
 
-#: classes/pref/feeds.php:554 classes/pref/feeds.php:802
+#: classes/pref/feeds.php:550 classes/pref/feeds.php:762
 msgid "Article purging:"
 msgstr "Purgando el artículo"
 
-#: classes/pref/feeds.php:577
+#: classes/pref/feeds.php:573
 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:593 classes/pref/feeds.php:831
+#: classes/pref/feeds.php:589 classes/pref/feeds.php:791
 #, fuzzy
 msgid "Hide from Popular feeds"
 msgstr "Ocultar en mi lista de fuentes"
 
-#: classes/pref/feeds.php:604 classes/pref/feeds.php:836
-msgid "Right-to-left content"
-msgstr "Contenido de derecha a izquierda"
-
-#: classes/pref/feeds.php:616 classes/pref/feeds.php:842
+#: classes/pref/feeds.php:601 classes/pref/feeds.php:797
 msgid "Include in e-mail digest"
 msgstr "Incluir en el correo recopilatorio"
 
-#: classes/pref/feeds.php:629 classes/pref/feeds.php:848
+#: classes/pref/feeds.php:614 classes/pref/feeds.php:803
 msgid "Always display image attachments"
 msgstr "Desplegar siempre las imágenes adjuntas"
 
-#: classes/pref/feeds.php:643 classes/pref/feeds.php:856
+#: classes/pref/feeds.php:628 classes/pref/feeds.php:811
 msgid "Cache images locally"
 msgstr "Guardar las imágenes en la memoria caché local"
 
-#: classes/pref/feeds.php:656
-#, fuzzy
-msgid "Cache content locally"
-msgstr "Guardar las imágenes en la memoria caché local"
-
-#: classes/pref/feeds.php:668 classes/pref/feeds.php:862
+#: classes/pref/feeds.php:640 classes/pref/feeds.php:817
 #, fuzzy
 msgid "Mark updated articles as unread"
 msgstr "¿Marcar todos los artículos como leídos?"
 
-#: classes/pref/feeds.php:680 classes/pref/feeds.php:868
-msgid "Mark posts as updated on content change"
-msgstr ""
-
-#: classes/pref/feeds.php:686
+#: classes/pref/feeds.php:646
 msgid "Icon"
 msgstr ""
 
-#: classes/pref/feeds.php:700
+#: classes/pref/feeds.php:660
 msgid "Replace"
 msgstr ""
 
-#: classes/pref/feeds.php:719
+#: classes/pref/feeds.php:679
 #, fuzzy
 msgid "Resubscribe to push updates"
 msgstr "Suscrito a las fuentes:"
 
-#: classes/pref/feeds.php:726
+#: classes/pref/feeds.php:686
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr ""
 
-#: classes/pref/feeds.php:741
+#: classes/pref/feeds.php:701
 msgid "Enable the options you wish to apply using checkboxes on the right:"
 msgstr ""
 
-#: classes/pref/feeds.php:1123 classes/pref/feeds.php:1176
+#: classes/pref/feeds.php:1051 classes/pref/feeds.php:1104
 msgid "All done."
 msgstr "Hecho."
 
-#: classes/pref/feeds.php:1231
+#: classes/pref/feeds.php:1159
 #, fuzzy
 msgid "Feeds with errors"
 msgstr "Editor de fuente"
 
-#: classes/pref/feeds.php:1251
+#: classes/pref/feeds.php:1179
 #, fuzzy
 msgid "Inactive feeds"
 msgstr "Fuente completa"
 
-#: classes/pref/feeds.php:1288
+#: classes/pref/feeds.php:1216
 #, fuzzy
 msgid "Edit selected feeds"
 msgstr "Purgando la fuente seleccionada..."
 
-#: classes/pref/feeds.php:1290 classes/pref/feeds.php:1304
+#: classes/pref/feeds.php:1218 classes/pref/feeds.php:1232
 #, fuzzy
 msgid "Reset sort order"
 msgstr "Redefinir contraseña"
 
-#: classes/pref/feeds.php:1292 js/prefs.js:2021 js/prefs.js:1788
-#: js/prefs.js:1778
+#: classes/pref/feeds.php:1220 js/prefs.js:1778
 msgid "Batch subscribe"
 msgstr "Suscripción en lote"
 
-#: classes/pref/feeds.php:1297
+#: classes/pref/feeds.php:1225
 #, fuzzy
 msgid "Categories"
 msgstr "Volver a categorizar"
 
-#: classes/pref/feeds.php:1300
+#: classes/pref/feeds.php:1228
 #, fuzzy
 msgid "Add category"
 msgstr "Añadiendo categoría de fuentes..."
 
-#: classes/pref/feeds.php:1302
+#: classes/pref/feeds.php:1230
 #, fuzzy
 msgid "(Un)hide empty categories"
 msgstr "Editar categorías"
 
-#: classes/pref/feeds.php:1306
+#: classes/pref/feeds.php:1234
 #, fuzzy
 msgid "Remove selected"
 msgstr "¿Borrar fuentes seleccionadas?"
 
-#: classes/pref/feeds.php:1320
+#: classes/pref/feeds.php:1248
 #, fuzzy
 msgid "More actions..."
 msgstr "Acciones..."
 
-#: classes/pref/feeds.php:1324
+#: classes/pref/feeds.php:1252
 msgid "Manual purge"
 msgstr "Purga manual"
 
-#: classes/pref/feeds.php:1328
+#: classes/pref/feeds.php:1256
 msgid "Clear feed data"
 msgstr "Limpiar los datos de la fuente"
 
-#: classes/pref/feeds.php:1379
-msgid "Import and export"
-msgstr ""
-
-#: classes/pref/feeds.php:1381
+#: classes/pref/feeds.php:1307
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1383
+#: classes/pref/feeds.php:1309
 msgid ""
 "Using OPML you can export and import your feeds, filters, labels and Tiny "
 "Tiny RSS settings."
 msgstr ""
 
-#: classes/pref/feeds.php:1385
+#: classes/pref/feeds.php:1311
 msgid "Only main settings profile can be migrated using OPML."
 msgstr ""
 
-#: classes/pref/feeds.php:1398
+#: classes/pref/feeds.php:1324
 #, fuzzy
 msgid "Import my OPML"
 msgstr "Importando OPML (usando la extensión DOMXML)..."
 
-#: classes/pref/feeds.php:1402
+#: classes/pref/feeds.php:1328
 msgid "Filename:"
 msgstr ""
 
-#: classes/pref/feeds.php:1404
+#: classes/pref/feeds.php:1330
 #, fuzzy
 msgid "Include settings"
 msgstr "Incluir en el correo recopilatorio"
 
-#: classes/pref/feeds.php:1408
+#: classes/pref/feeds.php:1334
 #, fuzzy
 msgid "Export OPML"
 msgstr "Exportar OPML"
 
-#: classes/pref/feeds.php:1412
+#: classes/pref/feeds.php:1338
 #, fuzzy
 msgid ""
 "Your OPML can be published publicly and can be subscribed by anyone who "
@@ -2381,43 +2381,23 @@ msgstr ""
 "cual podrá suscribirse cualquiera que conozca la URL especificada a "
 "continuación."
 
-#: classes/pref/feeds.php:1414
+#: classes/pref/feeds.php:1340
 msgid ""
 "Published OPML does not include your Tiny Tiny RSS settings, feeds that "
 "require authentication or feeds hidden from Popular feeds."
 msgstr ""
 
-#: classes/pref/feeds.php:1417
+#: classes/pref/feeds.php:1343
 #, fuzzy
 msgid "Display published OPML URL"
 msgstr "URL del archivo OPML público"
 
-#: classes/pref/feeds.php:1420 plugins/import_export/init.php:66
-#, fuzzy
-msgid "Article archive"
-msgstr "Fecha del artículo"
-
-#: classes/pref/feeds.php:1422 plugins/import_export/init.php:68
-msgid ""
-"You can export and import your Starred and Archived articles for safekeeping "
-"or when migrating between tt-rss instances."
-msgstr ""
-
-#: classes/pref/feeds.php:1425
-#, fuzzy
-msgid "Export my data"
-msgstr "Exportar OPML"
-
-#: classes/pref/feeds.php:1440
-msgid "Import"
-msgstr "Importar"
-
-#: classes/pref/feeds.php:1447
+#: classes/pref/feeds.php:1353
 #, fuzzy
 msgid "Firefox integration"
 msgstr "Integración con Firefox"
 
-#: classes/pref/feeds.php:1449
+#: classes/pref/feeds.php:1355
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
@@ -2425,47 +2405,23 @@ msgstr ""
 "Este sitio Tiny tiny RSS puede ser usado como un lector de fuentes de "
 "Firefox si pulsa en el enlace de abajo."
 
-#: classes/pref/feeds.php:1456
+#: classes/pref/feeds.php:1362
 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:1464
-msgid "Bookmarklets"
-msgstr ""
-
-#: classes/pref/feeds.php:1466 plugins/bookmarklets/init.php:24
-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 ""
-
-#: classes/pref/feeds.php:1470
-#, fuzzy, php-format
-msgid "Subscribe to %s in Tiny Tiny RSS?"
-msgstr "Volver a Tiny Tiny RSS"
-
-#: classes/pref/feeds.php:1474
-#, fuzzy
-msgid "Subscribe in Tiny Tiny RSS"
-msgstr "Volver a Tiny Tiny RSS"
-
-#: classes/pref/feeds.php:1476 plugins/bookmarklets/init.php:34
-msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
-msgstr ""
-
-#: classes/pref/feeds.php:1484
+#: classes/pref/feeds.php:1370
 #, fuzzy
 msgid "Published & shared articles / Generated feeds"
 msgstr ""
 "¿Reiniciar la puntuación de los artículos de las fuentes seleccionadas?"
 
-#: classes/pref/feeds.php:1486
+#: classes/pref/feeds.php:1372
 #, fuzzy
 msgid "Published articles and generated feeds"
 msgstr ""
 "¿Reiniciar la puntuación de los artículos de las fuentes seleccionadas?"
 
-#: classes/pref/feeds.php:1488
+#: classes/pref/feeds.php:1374
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the URL specified below."
@@ -2474,30 +2430,30 @@ msgstr ""
 "cual podrá suscribirse cualquiera que conozca la URL especificada a "
 "continuación."
 
-#: classes/pref/feeds.php:1494
+#: classes/pref/feeds.php:1380
 #, fuzzy
 msgid "Display URL"
 msgstr "Mostrar artículos"
 
-#: classes/pref/feeds.php:1497
+#: classes/pref/feeds.php:1383
 msgid "Clear all generated URLs"
 msgstr ""
 
-#: classes/pref/feeds.php:1499
+#: classes/pref/feeds.php:1385
 #, fuzzy
 msgid "Articles shared by URL"
 msgstr "Marcar el artículo como favorito"
 
-#: classes/pref/feeds.php:1501
+#: classes/pref/feeds.php:1387
 msgid "You can disable all articles shared by unique URLs here."
 msgstr ""
 
-#: classes/pref/feeds.php:1504
+#: classes/pref/feeds.php:1390
 #, fuzzy
 msgid "Unshare all articles"
 msgstr "Quitar el artículo de los favoritos"
 
-#: classes/pref/feeds.php:1579
+#: classes/pref/feeds.php:1468
 #, fuzzy
 msgid ""
 "These feeds have not been updated with new content for 3 months (oldest "
@@ -2505,22 +2461,22 @@ msgid ""
 msgstr ""
 "Estas fuentes no han sido actualizadas debido a los siguientes errores:"
 
-#: classes/pref/feeds.php:1616 classes/pref/feeds.php:1685
+#: classes/pref/feeds.php:1505 classes/pref/feeds.php:1574
 #, fuzzy
 msgid "Click to edit feed"
 msgstr "Pulse aquí para editar"
 
-#: classes/pref/feeds.php:1634 classes/pref/feeds.php:1705
+#: classes/pref/feeds.php:1523 classes/pref/feeds.php:1594
 #, fuzzy
 msgid "Unsubscribe from selected feeds"
 msgstr "¿Cancelar la suscripción a las fuentes seleccionadas?"
 
-#: classes/pref/feeds.php:1645
+#: classes/pref/feeds.php:1534
 msgid "These feeds have not been updated because of errors:"
 msgstr ""
 "Estas fuentes no han sido actualizadas debido a los siguientes errores:"
 
-#: plugins/pocket/pocket.php:24
+#: plugins/pocket/init.php:30
 msgid "Pocket"
 msgstr ""
 
@@ -2539,124 +2495,248 @@ msgstr ""
 msgid "Back to feeds"
 msgstr "Volver a la lista de fuentes"
 
+#: plugins/digest/digest_body.php:56
+msgid "Hello,"
+msgstr "Hola,"
+
 #: plugins/digest/digest_body.php:62
 msgid "Regular version"
 msgstr "Versión estándar"
 
-#: plugins/pinterest/pinterest.php:23
+#: plugins/nsfw/init.php:32 plugins/nsfw/init.php:43
+msgid "Not work safe (click to toggle)"
+msgstr ""
+
+#: plugins/nsfw/init.php:53
+msgid "NSFW Plugin"
+msgstr ""
+
+#: plugins/nsfw/init.php:80
+msgid "Tags to consider NSFW (comma-separated)"
+msgstr ""
+
+#: plugins/nsfw/init.php:101
+#, fuzzy
+msgid "Configuration saved."
+msgstr "La configuración ha sido guardada."
+
+#: plugins/pinterest/init.php:29
 msgid "Pinterest"
 msgstr ""
 
-#: plugins/mail/mail.php:66 plugins/mail/mail.php:72 plugins/mail/init.php:72
-#: plugins/mail/init.php:78
+#: plugins/auth_internal/init.php:62
+#, fuzzy
+msgid "Please enter your one time password:"
+msgstr "Por favor, introduzca una nota para este artículo:"
+
+#: plugins/auth_internal/init.php:185
+msgid "Password has been changed."
+msgstr "La contraseña ha sido cambiada."
+
+#: plugins/auth_internal/init.php:187
+msgid "Old password is incorrect."
+msgstr "La contraseña antigua es incorrecta."
+
+#: plugins/bookmarklets/init.php:22
+msgid "Bookmarklets"
+msgstr ""
+
+#: plugins/bookmarklets/init.php:24
+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 ""
+
+#: plugins/bookmarklets/init.php:28
+#, fuzzy, php-format
+msgid "Subscribe to %s in Tiny Tiny RSS?"
+msgstr "Volver a Tiny Tiny RSS"
+
+#: plugins/bookmarklets/init.php:32
+#, fuzzy
+msgid "Subscribe in Tiny Tiny RSS"
+msgstr "Volver a Tiny Tiny RSS"
+
+#: plugins/bookmarklets/init.php:34
+msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
+msgstr ""
+
+#: plugins/import_export/init.php:64
+msgid "Import and export"
+msgstr ""
+
+#: plugins/import_export/init.php:66
+#, fuzzy
+msgid "Article archive"
+msgstr "Fecha del artículo"
+
+#: plugins/import_export/init.php:68
+msgid ""
+"You can export and import your Starred and Archived articles for safekeeping "
+"or when migrating between tt-rss instances."
+msgstr ""
+
+#: plugins/import_export/init.php:71
+#, fuzzy
+msgid "Export my data"
+msgstr "Exportar OPML"
+
+#: plugins/import_export/init.php:87
+msgid "Import"
+msgstr "Importar"
+
+#: plugins/import_export/init.php:221
+msgid "Could not import: incorrect schema version."
+msgstr "Fallo de la importación: la versión del esquema es incorrecta."
+
+#: plugins/import_export/init.php:226
+msgid "Could not import: unrecognized document format."
+msgstr "Fallo de la importación: no se reconoce el formato del documento."
+
+#: plugins/import_export/init.php:385
+#, php-format
+msgid "Finished: %d articles processed, %d imported, %d feeds created."
+msgstr ""
+"Finalizado: %d artículos procesados, %d importados, %d fuentes creadas."
+
+#: plugins/import_export/init.php:391
+msgid "Could not load XML document."
+msgstr "No se pudo cargar documento XML."
+
+#: plugins/import_export/init.php:403
+msgid "Prepare data"
+msgstr "Preparar datos"
+
+#: plugins/import_export/init.php:424
+#, php-format
+msgid ""
+"Could not upload file. You might need to adjust upload_max_filesize\n"
+"\t\t\t\tin PHP.ini (current value = %s)"
+msgstr ""
+"No se puedo cargar el archivo. Puede ser necesario ajustar el parámetro "
+"upload_max_filesize en PHP.ini (valor actual = %s)"
+
+#: plugins/mail/init.php:72 plugins/mail/init.php:78
 msgid "[Forwarded]"
 msgstr ""
 
-#: plugins/mail/mail.php:66 plugins/mail/init.php:72
+#: plugins/mail/init.php:72
 #, fuzzy
 msgid "Multiple articles"
 msgstr "Todos"
 
-#: plugins/mail/mail.php:87
+#: plugins/mail/init.php:93
 msgid "From:"
 msgstr ""
 
-#: plugins/mail/mail.php:96
+#: plugins/mail/init.php:102
 #, fuzzy
 msgid "To:"
 msgstr "Arriba"
 
-#: plugins/mail/mail.php:109
+#: plugins/mail/init.php:115
 #, fuzzy
 msgid "Subject:"
 msgstr "Seleccione:"
 
-#: plugins/mail/mail.php:125
+#: plugins/mail/init.php:131
 #, fuzzy
 msgid "Send e-mail"
 msgstr "Cambiar el correo electrónico"
 
-#: plugins/note/note.php:22 plugins/note/note.js:11
+#: plugins/note/init.php:28 plugins/note/note.js:11
 msgid "Edit article note"
 msgstr "Editar nota del artículo"
 
-#: plugins/example/example.php:29 plugins/example/init.php:38
+#: plugins/example/init.php:38
 msgid "Example Pane"
 msgstr ""
 
-#: plugins/example/example.php:53 plugins/example/init.php:69
+#: plugins/example/init.php:69
 msgid "Sample value"
 msgstr ""
 
-#: plugins/example/example.php:59 plugins/example/init.php:75
+#: plugins/example/init.php:75
 #, fuzzy
 msgid "Set value"
 msgstr "Marcar como favorito"
 
-#: plugins/identica/identica.php:23
+#: plugins/identica/init.php:29
 #, fuzzy
 msgid "Share on identi.ca"
 msgstr "Título"
 
-#: plugins/instances/instances.php:29
+#: plugins/owncloud/init.php:35
+msgid "Owncloud"
+msgstr ""
+
+#: plugins/owncloud/init.php:59
+msgid "Owncloud url"
+msgstr ""
+
+#: plugins/owncloud/init.php:74
+msgid "Bookmark on OwnCloud "
+msgstr ""
+
+#: plugins/instances/init.php:144
 msgid "Linked"
 msgstr "Enlazado"
 
-#: plugins/instances/instances.php:180
+#: plugins/instances/init.php:295
 #, fuzzy
 msgid "Link instance"
 msgstr "Enlazar instancia"
 
-#: plugins/instances/instances.php:192 plugins/instances/init.php:307
+#: plugins/instances/init.php:307
 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 ""
 
-#: plugins/instances/instances.php:202
+#: plugins/instances/init.php:317
 msgid "Last connected"
 msgstr ""
 
-#: plugins/instances/instances.php:203
+#: plugins/instances/init.php:318
 msgid "Status"
 msgstr ""
 
-#: plugins/instances/instances.php:204
+#: plugins/instances/init.php:319
 #, fuzzy
 msgid "Stored feeds"
 msgstr "Más fuentes"
 
-#: plugins/share/share.php:21
+#: plugins/share/init.php:27
 #, fuzzy
 msgid "Share by URL"
 msgstr "Marcar el artículo como favorito"
 
-#: plugins/share/share.php:43 plugins/share/init.php:49
+#: plugins/share/init.php:49
 #, fuzzy
 msgid "You can share this article by the following unique URL:"
 msgstr "Puede ver esta fuente en formato RSS en la siguiente URL:"
 
-#: plugins/flattr/flattr.php:37
+#: plugins/flattr/init.php:30
 #, fuzzy
-msgid "Flattr article"
+msgid "Flattr this article."
 msgstr "Marcar el artículo como favorito"
 
-#: plugins/googleplus/googleplus.php:23
+#: plugins/googleplus/init.php:29
 #, fuzzy
 msgid "Share on Google+"
 msgstr "Título"
 
-#: plugins/updater/updater.php:267 plugins/updater/updater.php:279
+#: plugins/updater/init.php:294 plugins/updater/init.php:306
 #: plugins/updater/updater.js:10
 msgid "Update Tiny Tiny RSS"
 msgstr "Actualizar Tiny Tiny RSS"
 
-#: plugins/updater/updater.php:282 plugins/updater/init.php:303
+#: plugins/updater/init.php:309
 #, fuzzy
 msgid "Your Tiny Tiny RSS installation is up to date."
 msgstr "La base de datos de Tiny Tiny RSS está actualizada."
 
-#: plugins/updater/updater.php:291 plugins/updater/init.php:313
+#: plugins/updater/init.php:319
 #, fuzzy
 msgid ""
 "Do not close this dialog until updating is finished. Backup your tt-rss "
@@ -2666,23 +2746,26 @@ msgstr ""
 "de seguridad de la carpeta de tt-rss antes de continuar. Escriba 'yes' para "
 "continuar."
 
-#: plugins/updater/updater.php:294 plugins/updater/init.php:316
+#: plugins/updater/init.php:322
 #, fuzzy
 msgid "Ready to update."
 msgstr "Última actualización:"
 
-#: plugins/updater/updater.php:299 plugins/updater/init.php:321
+#: plugins/updater/init.php:327
 #, fuzzy
 msgid "Start update"
 msgstr "Última actualización:"
 
-#: js/feedlist.js:283 js/feedlist.js:282 js/feedlist.js:265 js/feedlist.js:218
+#: plugins/tweet/init.php:29
+#, fuzzy
+msgid "Share on Twitter"
+msgstr "Título"
+
+#: js/feedlist.js:218
 msgid "New articles available in this feed (click to show)"
 msgstr "Nuevos artículos disponibles en esta fuente (clic para mostrar)"
 
-#: js/feedlist.js:490 js/feedlist.js:505 js/feedlist.js:489 js/feedlist.js:504
-#: js/feedlist.js:469 js/feedlist.js:484 js/feedlist.js:420 js/feedlist.js:435
-#: plugins/digest/digest.js:25
+#: js/feedlist.js:420 js/feedlist.js:435 plugins/digest/digest.js:25
 msgid "Mark all articles in %s as read?"
 msgstr "¿Marcar todos los artículos de %s como leídos?"
 
@@ -2694,75 +2777,71 @@ msgstr ""
 "¿Está seguro de que quiere reportar esta excepción a tt-rss.org? El informe "
 "incluirá los datos de su navegador. Su dirección IP quedará guardada."
 
-#: js/functions.js:618 js/functions.js:614 js/functions.js:622
+#: js/functions.js:627
 msgid "Date syntax appears to be correct:"
 msgstr "Sintaxis de fecha parece correcta:"
 
-#: js/functions.js:621 js/functions.js:617 js/functions.js:625
+#: js/functions.js:630
 msgid "Date syntax is incorrect."
 msgstr "Sintaxis de fecha es incorrecta."
 
-#: js/functions.js:748 js/functions.js:744 js/functions.js:752
+#: js/functions.js:757
 msgid "Remove stored feed icon?"
 msgstr "¿Borrar el icono de la fuente?"
 
-#: js/functions.js:780 js/functions.js:776 js/functions.js:784
+#: js/functions.js:789
 msgid "Please select an image file to upload."
 msgstr "Seleccione un archivo de imagen para cargar."
 
-#: js/functions.js:782 js/functions.js:778 js/functions.js:786
+#: js/functions.js:791
 msgid "Upload new icon for this feed?"
 msgstr "¿Cargar un nuevo icono para esta fuente?"
 
-#: js/functions.js:799 js/functions.js:795 js/functions.js:803
+#: js/functions.js:808
 msgid "Please enter label caption:"
 msgstr "Por favor, introduzca el nombre del marcador:"
 
-#: js/functions.js:804 js/functions.js:800 js/functions.js:808
+#: js/functions.js:813
 msgid "Can't create label: missing caption."
 msgstr "No se puede crear el marcador: falta nombre."
 
-#: js/functions.js:847 js/functions.js:843 js/functions.js:851
+#: js/functions.js:856
 msgid "Subscribe to Feed"
 msgstr "Suscribirse a fuente"
 
-#: js/functions.js:874 js/functions.js:870 js/functions.js:878
+#: js/functions.js:883
 msgid "Subscribed to %s"
 msgstr "Se ha suscrito a %s"
 
-#: js/functions.js:879 js/functions.js:875 js/functions.js:883
+#: js/functions.js:888
 msgid "Specified URL seems to be invalid."
 msgstr "La URL especificada parece ser inválida."
 
-#: js/functions.js:882 js/functions.js:878 js/functions.js:886
+#: js/functions.js:891
 msgid "Specified URL doesn't seem to contain any feeds."
 msgstr "La URL especificada no parece contener fuentes."
 
-#: js/functions.js:935 js/functions.js:931 js/functions.js:939
+#: js/functions.js:944
 msgid "Couldn't download the specified URL: %s"
 msgstr "No se pudo cargar la URL especificada: %s"
 
-#: js/functions.js:939 js/functions.js:935 js/functions.js:943
+#: js/functions.js:948
 msgid "You are already subscribed to this feed."
 msgstr "Ya está suscrito a esta fuente."
 
-#: js/functions.js:1067 js/functions.js:1063 js/functions.js:1071
-#: js/functions.js:1073
+#: js/functions.js:1078
 msgid "Edit rule"
 msgstr "Editar regla"
 
-#: js/functions.js:1093 js/functions.js:1089 js/functions.js:1097
-#: js/functions.js:1099
+#: js/functions.js:1104
 msgid "Edit action"
 msgstr "Editar acción"
 
-#: js/functions.js:1130 js/functions.js:1126 js/functions.js:1134
-#: js/functions.js:1136
+#: js/functions.js:1141
 msgid "Create Filter"
 msgstr "Crear filtro"
 
-#: js/functions.js:1234 js/functions.js:1230 js/functions.js:1238
-#: js/functions.js:1240
+#: js/functions.js:1245
 msgid ""
 "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
 "hub again on next feed update."
@@ -2770,48 +2849,37 @@ msgstr ""
 "¿Restaurar suscripción? Tiny Tiny RSS volverá a intentar suscribirse al hub "
 "de notificaciones en la siguiente actualización de fuentes."
 
-#: js/functions.js:1255 js/tt-rss.js:421 js/functions.js:1251 js/tt-rss.js:381
-#: js/functions.js:1259 js/tt-rss.js:367 js/functions.js:1261
+#: js/functions.js:1266 js/tt-rss.js:367
 msgid "Unsubscribe from %s?"
 msgstr "¿Cancelar la suscripción a %s?"
 
-#: js/functions.js:1362 js/functions.js:1358 js/functions.js:1368
-#: js/functions.js:1370
+#: js/functions.js:1375
 msgid "Please enter category title:"
 msgstr "Introduzca el nombre de la categoría:"
 
-#: js/functions.js:1393 js/functions.js:1389 js/functions.js:1399
-#: js/functions.js:1401
+#: js/functions.js:1406
 msgid "Generate new syndication address for this feed?"
 msgstr "¿Generar nueva dirección de sindicación para esta fuente?"
 
-#: js/functions.js:1584 js/tt-rss.js:400 js/tt-rss.js:903 js/functions.js:1580
-#: js/tt-rss.js:782 js/tt-rss.js:362 js/tt-rss.js:717 js/functions.js:1590
-#: js/tt-rss.js:348 js/tt-rss.js:709 js/functions.js:1592
+#: js/functions.js:1597 js/tt-rss.js:348 js/tt-rss.js:713
 msgid "You can't edit this kind of feed."
 msgstr "No puede editar esta clase de fuente."
 
-#: js/functions.js:1599 js/functions.js:1595 js/functions.js:1605
-#: js/functions.js:1607
+#: js/functions.js:1612
 msgid "Edit Feed"
 msgstr "Editar fuente"
 
-#: js/functions.js:1637 js/functions.js:1633 js/functions.js:1643
-#: js/functions.js:1645
+#: js/functions.js:1650
 msgid "More Feeds"
 msgstr "Más fuentes"
 
-#: js/functions.js:1698 js/functions.js:1808 js/prefs.js:408 js/prefs.js:438
-#: js/prefs.js:470 js/prefs.js:653 js/prefs.js:673 js/prefs.js:1326
-#: js/prefs.js:1471 js/functions.js:1694 js/functions.js:1804 js/prefs.js:397
-#: js/prefs.js:427 js/prefs.js:459 js/prefs.js:642 js/prefs.js:662
-#: js/prefs.js:1213 js/prefs.js:1358 js/functions.js:1704 js/functions.js:1814
-#: js/prefs.js:1203 js/prefs.js:1348 js/functions.js:1706 js/functions.js:1816
+#: js/functions.js:1711 js/functions.js:1821 js/prefs.js:397 js/prefs.js:427
+#: js/prefs.js:459 js/prefs.js:642 js/prefs.js:662 js/prefs.js:1203
+#: js/prefs.js:1348
 msgid "No feeds are selected."
 msgstr "No se han seleccionado fuentes."
 
-#: js/functions.js:1740 js/functions.js:1736 js/functions.js:1746
-#: js/functions.js:1748
+#: js/functions.js:1753
 msgid ""
 "Remove selected feeds from the archive? Feeds with stored articles will not "
 "be removed."
@@ -2819,16 +2887,18 @@ msgstr ""
 "¿Eliminar las fuentes seleccionadas del archivo? Las fuentes con artículos "
 "archivados no serán eliminadas."
 
-#: js/functions.js:1779 js/functions.js:1775 js/functions.js:1785
-#: js/functions.js:1787
+#: js/functions.js:1792
 msgid "Feeds with update errors"
 msgstr "Fuentes con errores de actualización"
 
-#: js/functions.js:1790 js/prefs.js:1308 js/functions.js:1786 js/prefs.js:1195
-#: js/functions.js:1796 js/prefs.js:1185 js/functions.js:1798
+#: js/functions.js:1803 js/prefs.js:1185
 msgid "Remove selected feeds?"
 msgstr "¿Borrar fuentes seleccionadas?"
 
+#: js/functions.js:1904
+msgid "Help"
+msgstr "Ayuda"
+
 #: js/PrefFeedTree.js:47
 msgid "Edit category"
 msgstr "Editar categoría"
@@ -2850,24 +2920,23 @@ msgid "Can't create user: no login specified."
 msgstr ""
 "No se puede crear el usuario: no se ha especificado el nombre de usuario."
 
-#: js/prefs.js:128 js/prefs.js:117
+#: js/prefs.js:117
 msgid "Edit Filter"
 msgstr "Editar filtro"
 
-#: js/prefs.js:175 js/prefs.js:164
+#: js/prefs.js:164
 msgid "Remove filter?"
 msgstr "¿Borrar el filtro?"
 
-#: js/prefs.js:290 js/prefs.js:279
+#: js/prefs.js:279
 msgid "Remove selected labels?"
 msgstr "¿Borrar los marcadores seleccionados?"
 
-#: js/prefs.js:306 js/prefs.js:1512 js/prefs.js:295 js/prefs.js:1399
-#: js/prefs.js:1389
+#: js/prefs.js:295 js/prefs.js:1389
 msgid "No labels are selected."
 msgstr "No se han seleccionado marcadores."
 
-#: js/prefs.js:320 js/prefs.js:309
+#: js/prefs.js:309
 msgid ""
 "Remove selected users? Neither default admin nor your account will be "
 "removed."
@@ -2875,388 +2944,289 @@ msgstr ""
 "¿Borrar los usuarios seleccionados? Su cuenta y la cuenta del administrador "
 "por defecto no serán borradas."
 
-#: js/prefs.js:337 js/prefs.js:518 js/prefs.js:539 js/prefs.js:578
 #: js/prefs.js:326 js/prefs.js:507 js/prefs.js:528 js/prefs.js:567
 msgid "No users are selected."
 msgstr "No se han seleccionado usuarios."
 
-#: js/prefs.js:355 js/prefs.js:344
+#: js/prefs.js:344
 msgid "Remove selected filters?"
 msgstr "¿Eliminar los filtros seleccionados?"
 
-#: js/prefs.js:370 js/prefs.js:608 js/prefs.js:627 js/prefs.js:359
-#: js/prefs.js:597 js/prefs.js:616
+#: js/prefs.js:359 js/prefs.js:597 js/prefs.js:616
 msgid "No filters are selected."
 msgstr "No se han seleccionado filtros."
 
-#: js/prefs.js:389 js/prefs.js:378
+#: js/prefs.js:378
 msgid "Unsubscribe from selected feeds?"
 msgstr "¿Cancelar la suscripción a las fuentes seleccionadas?"
 
-#: js/prefs.js:423 js/prefs.js:412
+#: js/prefs.js:412
 msgid "Please select only one feed."
 msgstr "Por favor, seleccione una sola fuente."
 
-#: js/prefs.js:429 js/prefs.js:418
+#: js/prefs.js:418
 msgid "Erase all non-starred articles in selected feed?"
 msgstr "¿Borrar todos los artículos no favoritos de la fuente seleccionada?"
 
-#: js/prefs.js:451 js/prefs.js:440
+#: js/prefs.js:440
 msgid "How many days of articles to keep (0 - use default)?"
 msgstr ""
 "¿Cuántos días desea guardar los artículos? (0 = configuración por defecto)"
 
-#: js/prefs.js:489 js/prefs.js:478
+#: js/prefs.js:478
 msgid "Login field cannot be blank."
 msgstr "El campo de nombre de usuario no puede dejarse en blanco."
 
-#: js/prefs.js:523 js/prefs.js:544 js/prefs.js:583 js/prefs.js:512
-#: js/prefs.js:533 js/prefs.js:572
+#: js/prefs.js:512 js/prefs.js:533 js/prefs.js:572
 msgid "Please select only one user."
 msgstr "Por favor, seleccione un solo usuario."
 
-#: js/prefs.js:548 js/prefs.js:537
+#: js/prefs.js:537
 msgid "Reset password of selected user?"
 msgstr "¿Restaurar la contraseña del usuario seleccionado?"
 
-#: js/prefs.js:613 js/prefs.js:602
+#: js/prefs.js:602
 msgid "Please select only one filter."
 msgstr "Por favor, seleccione un solo filtro."
 
-#: js/prefs.js:631 js/prefs.js:620
+#: js/prefs.js:620
 msgid "Combine selected filters?"
 msgstr "¿Combinar los filtros seleccionados?"
 
-#: js/prefs.js:695 js/prefs.js:684
+#: js/prefs.js:684
 msgid "Edit Multiple Feeds"
 msgstr "Editar múltiples fuentes"
 
-#: js/prefs.js:719 js/prefs.js:708
+#: js/prefs.js:708
 msgid "Save changes to selected feeds?"
 msgstr "¿Guardar los cambios de las fuentes seleccionadas?"
 
-#: js/prefs.js:811 js/prefs.js:800 js/prefs.js:790
+#: js/prefs.js:790
 msgid "OPML Import"
 msgstr "Importar OPML"
 
-#: js/prefs.js:838 js/prefs.js:827 js/prefs.js:817
+#: js/prefs.js:817
 msgid "Please choose an OPML file first."
 msgstr "Por favor, seleccione un archivo OPML."
 
-#: js/prefs.js:854 plugins/import_export/import_export.js:112
-msgid "Please choose the file first."
-msgstr "Por favor, seleccione un archivo."
-
-#: js/prefs.js:1010 js/prefs.js:983 js/prefs.js:973
+#: js/prefs.js:973
 msgid "Reset to defaults?"
 msgstr "¿Restaurar las opciones por defecto?"
 
-#: js/prefs.js:1215 js/prefs.js:1102 js/prefs.js:1092
+#: js/prefs.js:1092
 msgid ""
 "Remove category %s? Any nested feeds would be placed into Uncategorized."
 msgstr ""
 "¿Borrar la categoría %s? Cualquier subcategoría será movida a Sin Categoría."
 
-#: js/prefs.js:1242 js/prefs.js:1129 js/prefs.js:1119
+#: js/prefs.js:1119
 msgid "Remove selected categories?"
 msgstr "¿Eliminar las categorías seleccionadas?"
 
-#: js/prefs.js:1258 js/prefs.js:1145 js/prefs.js:1135
+#: js/prefs.js:1135
 msgid "No categories are selected."
 msgstr "No se han seleccionado categorías."
 
-#: js/prefs.js:1266 js/prefs.js:1153 js/prefs.js:1143
+#: js/prefs.js:1143
 msgid "Category title:"
 msgstr "Nombre de la categoría:"
 
-#: js/prefs.js:1297 js/prefs.js:1184 js/prefs.js:1174
+#: js/prefs.js:1174
 msgid "Feeds without recent updates"
 msgstr "Fuentes sin actualizaciones recientes"
 
-#: js/prefs.js:1346 js/prefs.js:1233 js/prefs.js:1223
+#: js/prefs.js:1223
 msgid "Replace current OPML publishing address with a new one?"
 msgstr ""
 "¿Reemplazar la dirección actual de publicación del OPML por una dirección "
 "nueva?"
 
-#: js/prefs.js:1455 js/prefs.js:1342 js/prefs.js:1332
+#: js/prefs.js:1332
 msgid "Rescore articles in selected feeds?"
 msgstr ""
 "¿Reiniciar la puntuación de los artículos de las fuentes seleccionadas?"
 
-#: js/prefs.js:1478 js/prefs.js:1365 js/prefs.js:1355
+#: js/prefs.js:1355
 msgid "Rescore all articles? This operation may take a lot of time."
 msgstr ""
 "¿Reiniciar la puntuación de todos los artículos? Esta operación puede llevar "
 "cierto tiempo."
 
-#: js/prefs.js:1498 js/prefs.js:1385 js/prefs.js:1375
+#: js/prefs.js:1375
 msgid "Reset selected labels to default colors?"
 msgstr "¿Restaurar color por defecto en los marcadores seleccionados?"
 
-#: js/prefs.js:1535 js/prefs.js:1422 js/prefs.js:1412
+#: js/prefs.js:1412
 msgid "Settings Profiles"
 msgstr "Perfiles de preferencias"
 
-#: js/prefs.js:1544 js/prefs.js:1431 js/prefs.js:1421
+#: js/prefs.js:1421
 msgid ""
 "Remove selected profiles? Active and default profiles will not be removed."
 msgstr ""
 "¿Borrar los perfiles seleccionados? El perfil activo y el perfil por defecto "
 "no serán borrados."
 
-#: js/prefs.js:1562 js/prefs.js:1449 js/prefs.js:1439
+#: js/prefs.js:1439
 msgid "No profiles are selected."
 msgstr "No se ha seleccionado ningún perfil."
 
-#: js/prefs.js:1570 js/prefs.js:1623 js/prefs.js:1457 js/prefs.js:1510
 #: js/prefs.js:1447 js/prefs.js:1500
 msgid "Activate selected profile?"
 msgstr "¿Activar el perfil seleccionado?"
 
-#: js/prefs.js:1586 js/prefs.js:1639 js/prefs.js:1473 js/prefs.js:1526
 #: js/prefs.js:1463 js/prefs.js:1516
 msgid "Please choose a profile to activate."
 msgstr "Seleccione un perfil para activar."
 
-#: js/prefs.js:1647 js/prefs.js:1534 js/prefs.js:1524
+#: js/prefs.js:1524
 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr "Se invalidarán todas las URLs generadas previamente. ¿Continuar?"
 
-#: js/prefs.js:1666 js/prefs.js:1553 js/prefs.js:1543
+#: js/prefs.js:1543
 msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr "Se invalidarán todas las URLs de artículos compartidos. ¿Continuar?"
 
-#: js/prefs.js:1764 js/prefs.js:1651 js/prefs.js:1641
+#: js/prefs.js:1641
 msgid "Label Editor"
 msgstr "Editor de marcadores"
 
-#: js/prefs.js:1827 js/prefs.js:1714 js/prefs.js:1704
+#: js/prefs.js:1704
 msgid ""
 "This will clear your stored authentication information for Twitter. Continue?"
 msgstr ""
 "Esto borrará la su información de autenticación en Twitter almacenada. "
 "¿Continuar?"
 
-#: js/prefs.js:1911 plugins/import_export/import_export.js:13
-msgid "Export Data"
-msgstr "Exportar datos"
-
-#: js/prefs.js:1938 plugins/import_export/import_export.js:40
-msgid ""
-"Finished, exported %d articles. You can download the data <a "
-"class='visibleLink' href='%u'>here</a>."
-msgstr ""
-"Terminado, %d artículos exportados. Puede descargar los datos <a "
-"class='visibleLink' href='%u'>aquí</a>."
-
-#: js/prefs.js:1991 plugins/import_export/import_export.js:93
-msgid "Data Import"
-msgstr "Importación de datos"
-
-#: js/prefs.js:2027 js/prefs.js:1794 js/prefs.js:1784
+#: js/prefs.js:1784
 msgid "Subscribing to feeds..."
 msgstr "Suscribiéndose a las fuentes..."
 
-#: js/tt-rss.js:147 js/tt-rss.js:141 js/tt-rss.js:120
+#: js/prefs.js:1821
+msgid "Clear stored data for this plugin?"
+msgstr ""
+
+#: js/tt-rss.js:120
 msgid "Mark all articles as read?"
 msgstr "¿Marcar todos los artículos como leídos?"
 
-#: js/tt-rss.js:410 js/tt-rss.js:370 js/tt-rss.js:356
+#: js/tt-rss.js:356
 msgid "You can't unsubscribe from the category."
 msgstr "No puede cancelar la suscripción a la categoría."
 
-#: js/tt-rss.js:415 js/tt-rss.js:596 js/tt-rss.js:591 js/tt-rss.js:375
-#: js/tt-rss.js:525 js/tt-rss.js:361 js/tt-rss.js:511
+#: js/tt-rss.js:361 js/tt-rss.js:511
 msgid "Please select some feed first."
 msgstr "Por favor, seleccione primero alguna fuente."
 
-#: js/tt-rss.js:591 js/tt-rss.js:586 js/tt-rss.js:520 js/tt-rss.js:506
+#: js/tt-rss.js:506
 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:601 js/tt-rss.js:596 js/tt-rss.js:530 js/tt-rss.js:516
+#: js/tt-rss.js:516
 msgid "Rescore articles in %s?"
 msgstr "¿Reiniciar la puntuación de los artículos de %s?"
 
-#: js/tt-rss.js:1062 js/tt-rss.js:883 js/tt-rss.js:825 js/tt-rss.js:830
+#: js/tt-rss.js:672
+#, fuzzy
+msgid "Please enable mail plugin first."
+msgstr "Por favor, seleccione primero alguna fuente."
+
+#: js/tt-rss.js:834
 msgid "New version available!"
 msgstr "¡Nueva versión disponible!"
 
-#: js/viewfeed.js:108 js/viewfeed.js:104
+#: js/viewfeed.js:104
 #, fuzzy
 msgid "Cancel search"
 msgstr "Cancelar"
 
-#: js/viewfeed.js:456 js/viewfeed.js:445 js/viewfeed.js:451 js/viewfeed.js:435
-#: plugins/digest/digest.js:257 plugins/digest/digest.js:696
+#: js/viewfeed.js:435 plugins/digest/digest.js:257
+#: plugins/digest/digest.js:696
 msgid "Unstar article"
 msgstr "Quitar el artículo de los favoritos"
 
-#: js/viewfeed.js:461 js/viewfeed.js:450 js/viewfeed.js:456 js/viewfeed.js:440
-#: plugins/digest/digest.js:259 plugins/digest/digest.js:700
+#: js/viewfeed.js:440 plugins/digest/digest.js:259
+#: plugins/digest/digest.js:700
 msgid "Star article"
 msgstr "Marcar el artículo como favorito"
 
-#: js/viewfeed.js:496 js/viewfeed.js:485 js/viewfeed.js:491 js/viewfeed.js:473
-#: plugins/digest/digest.js:262 plugins/digest/digest.js:731
+#: js/viewfeed.js:473 plugins/digest/digest.js:262
+#: plugins/digest/digest.js:731
 msgid "Unpublish article"
 msgstr "Despublicar artículo"
 
-#: js/viewfeed.js:676 js/viewfeed.js:704 js/viewfeed.js:731 js/viewfeed.js:793
-#: js/viewfeed.js:825 js/viewfeed.js:962 js/viewfeed.js:1005
-#: js/viewfeed.js:1055 js/viewfeed.js:2181 js/viewfeed.js:665
-#: js/viewfeed.js:693 js/viewfeed.js:720 js/viewfeed.js:782 js/viewfeed.js:814
-#: js/viewfeed.js:951 js/viewfeed.js:994 js/viewfeed.js:1044
-#: js/viewfeed.js:2154 js/viewfeed.js:671 js/viewfeed.js:699
-#: js/viewfeed.js:726 js/viewfeed.js:788 js/viewfeed.js:820 js/viewfeed.js:957
-#: js/viewfeed.js:1000 js/viewfeed.js:1050 js/viewfeed.js:2018
 #: js/viewfeed.js:674 js/viewfeed.js:702 js/viewfeed.js:729 js/viewfeed.js:791
 #: js/viewfeed.js:823 js/viewfeed.js:960 js/viewfeed.js:1003
 #: js/viewfeed.js:1053 js/viewfeed.js:1927 plugins/mail/mail.js:7
 msgid "No articles are selected."
 msgstr "No se han seleccionado artículos."
 
-#: js/viewfeed.js:942 js/viewfeed.js:931 js/viewfeed.js:937 js/viewfeed.js:940
+#: js/viewfeed.js:940
 msgid "Mark all visible articles in %s as read?"
 msgstr "¿Marcar todos los artículos visibles de %s como leídos?"
 
-#: js/viewfeed.js:970 js/viewfeed.js:959 js/viewfeed.js:965 js/viewfeed.js:968
+#: js/viewfeed.js:968
 msgid "Delete %d selected articles in %s?"
 msgstr "¿Borrar %d artículos seleccionados en %s?"
 
-#: js/viewfeed.js:972 js/viewfeed.js:961 js/viewfeed.js:967 js/viewfeed.js:970
+#: js/viewfeed.js:970
 msgid "Delete %d selected articles?"
 msgstr "¿Borrar %d artículos seleccionados?"
 
-#: js/viewfeed.js:1014 js/viewfeed.js:1003 js/viewfeed.js:1009
 #: js/viewfeed.js:1012
 msgid "Archive %d selected articles in %s?"
 msgstr "¿Archivar %d artículos seleccionados en %s?"
 
-#: js/viewfeed.js:1017 js/viewfeed.js:1006 js/viewfeed.js:1012
 #: js/viewfeed.js:1015
 msgid "Move %d archived articles back?"
 msgstr "¿Mover %d artículos archivados a su fuente original?"
 
-#: js/viewfeed.js:1061 js/viewfeed.js:1050 js/viewfeed.js:1056
 #: js/viewfeed.js:1059
 msgid "Mark %d selected articles in %s as read?"
 msgstr "¿Marcar %d artículos seleccionados de %s como leídos?"
 
-#: js/viewfeed.js:1085 js/viewfeed.js:1074 js/viewfeed.js:1080
 #: js/viewfeed.js:1083
 msgid "Edit article Tags"
 msgstr "Editar las etiquetas del artículo"
 
-#: js/viewfeed.js:1247 js/viewfeed.js:1236 js/viewfeed.js:1242
 #: js/viewfeed.js:1252
 msgid "No article is selected."
 msgstr "No se ha seleccionado ningún artículo."
 
-#: js/viewfeed.js:1282 js/viewfeed.js:1271 js/viewfeed.js:1277
 #: js/viewfeed.js:1287
 msgid "No articles found to mark"
 msgstr "No se han encontrado artículos que marcar"
 
-#: js/viewfeed.js:1284 js/viewfeed.js:1273 js/viewfeed.js:1279
 #: js/viewfeed.js:1289
 msgid "Mark %d article(s) as read?"
 msgstr "¿Marcar %d artículo(s) como leído(s)?"
 
-#: js/viewfeed.js:1402 js/viewfeed.js:1383
-msgid "Loading..."
-msgstr "Cargando..."
-
-#: js/viewfeed.js:1891 js/viewfeed.js:1864 js/viewfeed.js:1734
 #: js/viewfeed.js:1744
 msgid "Open original article"
 msgstr "Abrir artículo original"
 
-#: js/viewfeed.js:1897 js/viewfeed.js:1870
-msgid "View in a tt-rss tab"
-msgstr "Ver en una pestaña de tt-rss"
-
-#: js/viewfeed.js:1905 js/viewfeed.js:1878 js/viewfeed.js:1742
-#: js/viewfeed.js:1752
-msgid "Mark above as read"
-msgstr "Marcar artículos anteriores como leídos"
-
-#: js/viewfeed.js:1911 js/viewfeed.js:1884 js/viewfeed.js:1748
-#: js/viewfeed.js:1758
-msgid "Mark below as read"
-msgstr "Marcar artículos posteriores como leídos"
-
-#: js/viewfeed.js:1967 js/viewfeed.js:1940 js/viewfeed.js:1804
 #: js/viewfeed.js:1814
 msgid "Remove label"
 msgstr "Borrar marcador"
 
-#: js/viewfeed.js:1991 js/viewfeed.js:1964 js/viewfeed.js:1828
 #: js/viewfeed.js:1838
 msgid "Playing..."
 msgstr "Reproduciendo..."
 
-#: js/viewfeed.js:1992 js/viewfeed.js:1965 js/viewfeed.js:1829
 #: js/viewfeed.js:1839
 msgid "Click to pause"
 msgstr "Clic para pausar"
 
-#: js/viewfeed.js:2150 js/viewfeed.js:2123 js/viewfeed.js:1987
 #: js/viewfeed.js:1896
 #, fuzzy
 msgid "Please enter new score for selected articles:"
 msgstr "Por favor, introduzca una nota para este artículo:"
 
-#: js/viewfeed.js:2192 js/viewfeed.js:2165 js/viewfeed.js:2029
 #: js/viewfeed.js:1938
 #, fuzzy
 msgid "Please enter new score for this article:"
 msgstr "Por favor, introduzca una nota para este artículo:"
 
-#: js/functions.js:1887 js/functions.js:1891 js/functions.js:1897
-#: js/functions.js:1899
-msgid "Help"
-msgstr "Ayuda"
-
-#: js/prefs.js:1831 js/prefs.js:1821
-msgid "Clear stored data for this plugin?"
-msgstr ""
-
-#: js/tt-rss.js:741 js/tt-rss.js:676 js/tt-rss.js:668
-#, fuzzy
-msgid "Please enable mail plugin first."
-msgstr "Por favor, seleccione primero alguna fuente."
-
-#: plugins/digest/digest_body.php:39
-msgid "Your browser doesn't support Javascript, which is required"
-msgstr ""
-
-#: plugins/nsfw/init.php:32 plugins/nsfw/init.php:43
-msgid "Not work safe (click to toggle)"
-msgstr ""
-
-#: plugins/nsfw/init.php:53
-msgid "NSFW Plugin"
-msgstr ""
-
-#: plugins/nsfw/init.php:80
-msgid "Tags to consider NSFW (comma-separated)"
-msgstr ""
-
-#: plugins/nsfw/init.php:101
-#, fuzzy
-msgid "Configuration saved."
-msgstr "La configuración ha sido guardada."
-
-#: plugins/owncloud/init.php:35
-msgid "Owncloud"
-msgstr ""
-
-#: plugins/owncloud/init.php:59
-msgid "Owncloud url"
-msgstr ""
-
 #: plugins/digest/digest.js:71
 msgid "Mark %d displayed articles as read?"
 msgstr "¿Marcar %d artículos como leídos?"
@@ -3281,6 +3251,26 @@ msgstr "No hay fuentes sin leer."
 msgid "Load more..."
 msgstr "Cargar más..."
 
+#: plugins/import_export/import_export.js:13
+msgid "Export Data"
+msgstr "Exportar datos"
+
+#: plugins/import_export/import_export.js:40
+msgid ""
+"Finished, exported %d articles. You can download the data <a "
+"class='visibleLink' href='%u'>here</a>."
+msgstr ""
+"Terminado, %d artículos exportados. Puede descargar los datos <a "
+"class='visibleLink' href='%u'>aquí</a>."
+
+#: plugins/import_export/import_export.js:93
+msgid "Data Import"
+msgstr "Importación de datos"
+
+#: plugins/import_export/import_export.js:112
+msgid "Please choose the file first."
+msgstr "Por favor, seleccione un archivo."
+
 #: plugins/mail/mail.js:21
 msgid "Forward article by email"
 msgstr "Enviar artículo por correo"
@@ -3318,6 +3308,101 @@ msgstr ""
 "de seguridad de la carpeta de tt-rss antes de continuar. Escriba 'yes' para "
 "continuar."
 
+#~ msgid "Comments?"
+#~ msgstr "¿Comentarios?"
+
+#~ msgid "News"
+#~ msgstr "Noticias"
+
+#~ msgid "Move between feeds"
+#~ msgstr "Moverse entre fuentes"
+
+#~ msgid "Move between articles"
+#~ msgstr "Moverse entre artículos"
+
+#~ msgid "Active article actions"
+#~ msgstr "Activar acciones de los artículos"
+
+#~ msgid "Dismiss read articles"
+#~ msgstr "Descartar artículos leídos"
+
+#~ msgid "Mark articles below/above active one as read"
+#~ msgstr "Marcar como leídos los artículos por debajo o por encima de éste"
+
+#~ msgid "Scroll article content"
+#~ msgstr "Desplazar el contenido del artículo"
+
+#~ msgid "Other actions"
+#~ msgstr "Otras acciones"
+
+#~ msgid "Display this help dialog"
+#~ msgstr "Mostrar este cuadro de ayuda"
+
+#~ msgid "Multiple articles actions"
+#~ msgstr "Acciones para artículos múltiples"
+
+#~ msgid "Select starred articles"
+#~ msgstr "Seleccionar artículos favoritos"
+
+#~ msgid "Feed actions"
+#~ msgstr "Acciones para las fuentes"
+
+#~ msgid "Mark feed as read"
+#~ msgstr "Marcar fuente como leída"
+
+#~ msgid "If viewing category, (un)collapse it"
+#~ msgstr "Si se está viendo la categoría, (des)pliéguela"
+
+#~ msgid "Press any key to close this window."
+#~ msgstr "Pulse cualquier tecla para cerrar esta ventana."
+
+#~ msgid "My Feeds"
+#~ msgstr "Mis fuentes"
+
+#~ msgid "Other Feeds"
+#~ msgstr "Otras fuentes"
+
+#~ msgid "Panel actions"
+#~ msgstr "Acciones del panel"
+
+#~ msgid "Top 25 feeds"
+#~ msgstr "25 primeras fuentes"
+
+#~ msgid "Edit feed categories"
+#~ msgstr "Editar las categorías de fuentes"
+
+#~ msgid "Focus search (if present)"
+#~ msgstr "Búsqueda enfocada (si está presente)"
+
+#~ msgid ""
+#~ "<b>Note:</b> not all actions may be available, depending on Tiny Tiny RSS "
+#~ "configuration and your access level."
+#~ msgstr ""
+#~ "<strong>Nota:</strong> la disponibilidad de las acciones dependerá de la "
+#~ "configuración de Tiny Tiny RSS y de su nivel de acceso."
+
+#~ msgid "Fatal: authentication module %s not found."
+#~ msgstr "Error fatal: no se encuentra el módulo de autenticación %s."
+
+#~ msgid "Open article in new tab"
+#~ msgstr "Abrir artículo en una nueva pestaña"
+
+#~ msgid "Select theme"
+#~ msgstr "Seleccionar plantilla"
+
+#~ msgid "Right-to-left content"
+#~ msgstr "Contenido de derecha a izquierda"
+
+#, fuzzy
+#~ msgid "Cache content locally"
+#~ msgstr "Guardar las imágenes en la memoria caché local"
+
+#~ msgid "Loading..."
+#~ msgstr "Cargando..."
+
+#~ msgid "View in a tt-rss tab"
+#~ msgstr "Ver en una pestaña de tt-rss"
+
 #~ msgid "Magpie"
 #~ msgstr "Magpie"
 
@@ -3494,14 +3579,6 @@ msgstr ""
 #~ msgid "See also:"
 #~ msgstr "Ver también:"
 
-#, fuzzy
-#~ msgid "description"
-#~ msgstr "Selección"
-
-#, fuzzy
-#~ msgid "Dismiss article"
-#~ msgstr "Publicar artículo"
-
 #, fuzzy
 #~ msgid "Remove:"
 #~ msgstr "Eliminar"
@@ -3623,9 +3700,6 @@ msgstr ""
 #~ "Esta opción oculta la lista de fuentes y le permite ser cambiada al vuelo "
 #~ "(útil para pequeñas pantallas)."
 
-#~ msgid "Enable feed icons"
-#~ msgstr "Habilitar los iconos de la fuente"
-
 #~ msgid "Enable labels"
 #~ msgstr "Habilitar las etiquetas"
 
@@ -3753,9 +3827,6 @@ msgstr ""
 #~ msgid "Saved filter <b>%s</b>"
 #~ msgstr "Se ha guardado el filtro <strong>%s</strong>"
 
-#~ msgid "Click to collapse category"
-#~ msgstr "Plegar la categoría"
-
 #~ msgid "Tags"
 #~ msgstr "Etiquetas"
 
@@ -3786,10 +3857,6 @@ msgstr ""
 #~ msgid "Go online"
 #~ msgstr "Poner en línea"
 
-#, fuzzy
-#~ msgid "Toggle reordering mode"
-#~ msgstr "Cambiar a modo de reordenación de categorías"
-
 #~ msgid "Reset UI layout"
 #~ msgstr "Reajustar la interfaz"
 
@@ -3875,9 +3942,6 @@ msgstr ""
 #~ msgid "Reset category order?"
 #~ msgstr "¿Reajustar el orden de la categoría?"
 
-#~ msgid "Generated feed"
-#~ msgstr "Fuente generada"
-
 #~ msgid "No feeds to display."
 #~ msgstr "No hay fuentes que mostrar."
 
@@ -4039,9 +4103,6 @@ msgstr ""
 #~ "No podrá acceder a la versión fuera de línea de Tiny Tiny RSS hasta que "
 #~ "lo haya puesto de nuevo en modo fuera de línea. ¿Ponerlo en línea?"
 
-#~ msgid "All feeds updated."
-#~ msgstr "Se han actualizado todas las fuentes."
-
 #~ msgid "Can't open article: received invalid XML"
 #~ msgstr "No se puede abrir el artículo: el XML recibido no es válido."
 
@@ -4119,9 +4180,6 @@ msgstr ""
 #~ msgid "(Hidden)"
 #~ msgstr "(oculto)"
 
-#~ msgid "Other:"
-#~ msgstr "Otro:"
-
 #~ msgid "Generate another link"
 #~ msgstr "Generar un nuevo enlace"
 
@@ -4131,9 +4189,6 @@ msgstr ""
 #~ msgid "View:"
 #~ msgstr "Ver:"
 
-#~ msgid "Refresh"
-#~ msgstr "Refrescar"
-
 #~ msgid "Page"
 #~ msgstr "Página"
 
diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index 24abdab62..30164b18a 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 e4e865378..6bb335719 100644
--- a/locale/fr_FR/LC_MESSAGES/messages.po
+++ b/locale/fr_FR/LC_MESSAGES/messages.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tiny Tiny RSS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-17 19:37+0400\n"
+"POT-Creation-Date: 2013-03-19 10:14+0400\n"
 "PO-Revision-Date: 2012-02-14 08:32+0000\n"
 "Last-Translator: Thomas Jost <schnouki@schnouki.net>\n"
 "Language-Team: French (France) (http://www.transifex.net/projects/p/tt-rss/"
@@ -21,79 +21,79 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: backend.php:67
+#: backend.php:71
 msgid "Use default"
 msgstr "Utiliser la valeur par défaut"
 
-#: backend.php:68
+#: backend.php:72
 msgid "Never purge"
 msgstr "Ne jamais purger"
 
-#: backend.php:69
+#: backend.php:73
 msgid "1 week old"
 msgstr "Au bout d'une semaine"
 
-#: backend.php:70
+#: backend.php:74
 msgid "2 weeks old"
 msgstr "Au bout de 2 semaines"
 
-#: backend.php:71
+#: backend.php:75
 msgid "1 month old"
 msgstr "Au bout d'un mois"
 
-#: backend.php:72
+#: backend.php:76
 msgid "2 months old"
 msgstr "Au bout de 2 mois"
 
-#: backend.php:73
+#: backend.php:77
 msgid "3 months old"
 msgstr "Au bout de 3 mois"
 
-#: backend.php:76
+#: backend.php:80
 msgid "Default interval"
 msgstr "Fréquence de mise à jour par défaut"
 
-#: backend.php:77 backend.php:87
+#: backend.php:81 backend.php:91
 msgid "Disable updates"
 msgstr "Désactiver les mises à jour"
 
-#: backend.php:78 backend.php:88
+#: backend.php:82 backend.php:92
 msgid "Each 15 minutes"
 msgstr "Toutes les 15 minutes"
 
-#: backend.php:79 backend.php:89
+#: backend.php:83 backend.php:93
 msgid "Each 30 minutes"
 msgstr "Toutes les 30 minutes"
 
-#: backend.php:80 backend.php:90
+#: backend.php:84 backend.php:94
 msgid "Hourly"
 msgstr "Toutes les heures"
 
-#: backend.php:81 backend.php:91
+#: backend.php:85 backend.php:95
 msgid "Each 4 hours"
 msgstr "Toutes les 4 heures"
 
-#: backend.php:82 backend.php:92
+#: backend.php:86 backend.php:96
 msgid "Each 12 hours"
 msgstr "Toutes les 12 heures"
 
-#: backend.php:83 backend.php:93
+#: backend.php:87 backend.php:97
 msgid "Daily"
 msgstr "Une fois par jour"
 
-#: backend.php:84 backend.php:94
+#: backend.php:88 backend.php:98
 msgid "Weekly"
 msgstr "Une fois par semaine"
 
-#: backend.php:97 classes/pref/users.php:139
+#: backend.php:101 classes/pref/users.php:139
 msgid "User"
 msgstr "Utilisateur"
 
-#: backend.php:98
+#: backend.php:102
 msgid "Power User"
 msgstr "Utilisateur avancé"
 
-#: backend.php:99
+#: backend.php:103
 msgid "Administrator"
 msgstr "Administrateur"
 
@@ -124,7 +124,7 @@ msgstr "La base de données de Tiny Tiny RSS est à jour."
 #: db-updater.php:94 db-updater.php:163 db-updater.php:176 register.php:194
 #: register.php:239 register.php:252 register.php:267 register.php:286
 #: register.php:371 register.php:381 register.php:393
-#: classes/handler/public.php:637 classes/handler/public.php:725
+#: classes/handler/public.php:611 classes/handler/public.php:699
 msgid "Return to Tiny Tiny RSS"
 msgstr "Revenir à Tiny Tiny RSS"
 
@@ -266,195 +266,195 @@ msgstr ""
 "Le test d'échappement SQL a échoué, vérifiez votre base de donnée et votre "
 "configuration de PHP."
 
-#: index.php:108 index.php:150 index.php:236 prefs.php:86
-#: classes/backend.php:6 classes/pref/labels.php:296
-#: classes/pref/filters.php:602 classes/pref/feeds.php:1342
-#: plugins/digest/digest_body.php:45 js/viewfeed.js:1169 js/viewfeed.js:1158
-#: js/viewfeed.js:1164 js/viewfeed.js:1174
+#: index.php:117 index.php:147 index.php:252 prefs.php:79
+#: classes/backend.php:5 classes/pref/labels.php:296
+#: classes/pref/filters.php:609 classes/pref/feeds.php:1270
+#: plugins/digest/digest_body.php:45 js/viewfeed.js:1174
 msgid "Loading, please wait..."
 msgstr "Chargement en cours, veuillez patienter..."
 
-#: index.php:118 plugins/digest/digest_body.php:56
-msgid "Hello,"
-msgstr "Bonjour,"
+#: index.php:127 index.php:198
+msgid "Communication problem with server."
+msgstr ""
 
-#: index.php:120 prefs.php:29 prefs.php:108 help/main.php:73 help/prefs.php:8
-#: classes/pref/prefs.php:371
-msgid "Preferences"
-msgstr "Configuration"
-
-#: index.php:124
-msgid "Comments?"
-msgstr "Commentaires ?"
-
-#: index.php:128 mobile/mobile-functions.php:69
-#: mobile/mobile-functions.php:244 plugins/digest/digest_body.php:59
-msgid "Logout"
-msgstr "Déconnexion"
-
-#: index.php:134
+#: index.php:133 index.php:206
 msgid "New version of Tiny Tiny RSS is available!"
 msgstr "Une nouvelle version de Tiny Tiny RSS est disponible !"
 
-#: index.php:157
-msgid "News"
-msgstr "Actualités"
-
-#: index.php:166
+#: index.php:161
 msgid "Collapse feedlist"
 msgstr "Contracter la liste des flux"
 
-#: index.php:169
+#: index.php:164
 msgid "Show articles"
 msgstr "Afficher les articles"
 
-#: index.php:172
+#: index.php:167
 msgid "Adaptive"
 msgstr "Adaptatif"
 
-#: index.php:173
+#: index.php:168
 msgid "All Articles"
 msgstr "Tous les articles"
 
-#: index.php:174 classes/feeds.php:106
+#: index.php:169 include/functions.php:1912 classes/feeds.php:106
 msgid "Starred"
 msgstr "Remarquables"
 
-#: index.php:175 classes/feeds.php:107
+#: index.php:170 include/functions.php:1913 classes/feeds.php:107
 msgid "Published"
 msgstr "Publiés"
 
-#: index.php:176 classes/feeds.php:93 classes/feeds.php:105
+#: index.php:171 classes/feeds.php:93 classes/feeds.php:105
 msgid "Unread"
 msgstr "Non lus"
 
-#: index.php:177
+#: index.php:172
 msgid "Ignore Scoring"
 msgstr "Ignorer le score"
 
-#: index.php:178
+#: index.php:173
 msgid "Updated"
 msgstr "Mis à jour"
 
-#: index.php:181
+#: index.php:176
 msgid "Sort articles"
 msgstr "Classer les articles"
 
-#: index.php:184 classes/pref/prefs.php:462
+#: index.php:179
 msgid "Default"
 msgstr "Utiliser la valeur par défaut"
 
-#: index.php:185
+#: index.php:180
 msgid "Date"
 msgstr "Date"
 
-#: index.php:186 include/localized_schema.php:3
+#: index.php:181 include/localized_schema.php:3
 msgid "Title"
 msgstr "Titre"
 
-#: index.php:187
+#: index.php:182
 msgid "Score"
 msgstr "Score"
 
-#: index.php:192 classes/pref/feeds.php:539 classes/pref/feeds.php:786
+#: index.php:187 classes/pref/feeds.php:535 classes/pref/feeds.php:746
 msgid "Update"
 msgstr "Mettre à jour"
 
-#: index.php:196 index.php:211 include/localized_schema.php:10
-#: classes/feeds.php:111 classes/feeds.php:127 js/FeedTree.js:128
-#: js/FeedTree.js:156 plugins/digest/digest.js:630
+#: index.php:191 index.php:221 include/functions.php:1903
+#: include/localized_schema.php:10 classes/feeds.php:111 classes/feeds.php:131
+#: js/FeedTree.js:128 js/FeedTree.js:156 plugins/digest/digest.js:630
 msgid "Mark as read"
 msgstr "Marquer comme lu"
 
-#: index.php:202 classes/feeds.php:101
+#: index.php:211
 msgid "Actions..."
 msgstr "Actions..."
 
-#: index.php:204
+#: index.php:213
+#, fuzzy
+msgid "Preferences..."
+msgstr "Configuration"
+
+#: index.php:214
 msgid "Search..."
 msgstr "Rechercher..."
 
-#: index.php:205
+#: index.php:215
 msgid "Feed actions:"
 msgstr "Actions sur ce flux :"
 
-#: index.php:206 classes/handler/public.php:567
+#: index.php:216 classes/handler/public.php:541
 msgid "Subscribe to feed..."
 msgstr "S'abonner au flux..."
 
-#: index.php:207
+#: index.php:217
 msgid "Edit this feed..."
 msgstr "Modifier ce flux..."
 
-#: index.php:208
+#: index.php:218
 msgid "Rescore feed"
 msgstr "Recalculer le score du flux"
 
-#: index.php:209 classes/pref/feeds.php:712 classes/pref/feeds.php:1315
+#: index.php:219 classes/pref/feeds.php:672 classes/pref/feeds.php:1243
 #: js/PrefFeedTree.js:73
 msgid "Unsubscribe"
 msgstr "Se désabonner"
 
-#: index.php:210
+#: index.php:220
 msgid "All feeds:"
 msgstr "Tous les flux :"
 
-#: index.php:212 help/main.php:56
+#: index.php:222
 msgid "(Un)hide read feeds"
 msgstr "(Dé)Masquer les flux lus"
 
-#: index.php:213
+#: index.php:223
 msgid "Other actions:"
 msgstr "Autres actions :"
 
-#: index.php:215
+#: index.php:225
 msgid "Switch to digest..."
 msgstr "Basculer en mode résumé..."
 
-#: index.php:217
+#: index.php:227
 msgid "Show tag cloud..."
 msgstr "Afficher le nuage d'étiquettes"
 
-#: index.php:218
+#: index.php:229 include/functions.php:1890
+#, fuzzy
+msgid "Toggle widescreen mode"
+msgstr "Marquer comme remarquable"
+
+#: index.php:231
 msgid "Select by tags..."
 msgstr "Sélectionner par tags..."
 
-#: index.php:219
+#: index.php:232
 msgid "Create label..."
 msgstr "Créer une étiquette..."
 
-#: index.php:220
+#: index.php:233
 msgid "Create filter..."
 msgstr "Créer un filtre..."
 
-#: index.php:221
+#: index.php:234
 msgid "Keyboard shortcuts help"
 msgstr "Aide sur les raccourcis clavier"
 
-#: prefs.php:99
+#: index.php:236 mobile/mobile-functions.php:69
+#: mobile/mobile-functions.php:244 plugins/digest/digest_body.php:59
+msgid "Logout"
+msgstr "Déconnexion"
+
+#: prefs.php:28 prefs.php:99 include/functions.php:1915
+#: classes/pref/prefs.php:371
+msgid "Preferences"
+msgstr "Configuration"
+
+#: prefs.php:90
 msgid "Keyboard shortcuts"
 msgstr "Raccourcis clavier"
 
-#: prefs.php:100 help/prefs.php:14
+#: prefs.php:91
 msgid "Exit preferences"
 msgstr "Quitter la configuration"
 
-#: prefs.php:111 classes/pref/feeds.php:101 classes/pref/feeds.php:1220
-#: classes/pref/feeds.php:1283
+#: prefs.php:102 classes/pref/feeds.php:100 classes/pref/feeds.php:1148
+#: classes/pref/feeds.php:1211
 msgid "Feeds"
 msgstr "Flux"
 
-#: prefs.php:114 help/prefs.php:11 classes/pref/filters.php:110
+#: prefs.php:105 classes/pref/filters.php:117
 msgid "Filters"
 msgstr "Filtres"
 
-#: prefs.php:117 help/prefs.php:12 mobile/mobile-functions.php:205
-#: include/functions.php:1189 include/functions.php:1836
-#: classes/pref/labels.php:90
+#: prefs.php:108 mobile/mobile-functions.php:205 include/functions.php:1118
+#: include/functions.php:1739 classes/pref/labels.php:90
 msgid "Labels"
 msgstr "Etiquettes"
 
-#: prefs.php:121 help/prefs.php:13
+#: prefs.php:112
 msgid "Users"
 msgstr "Utilisateurs"
 
@@ -517,243 +517,23 @@ msgstr "Compte créé avec succès."
 msgid "New user registrations are currently closed."
 msgstr "L'inscription de nouveaux utilisateurs est actuellement fermée."
 
-#: update.php:38
+#: update.php:37
 #, fuzzy
 msgid "Tiny Tiny RSS data update script."
 msgstr "La base de données de Tiny Tiny RSS est à jour."
 
-#: help/main.php:1 help/prefs.php:1
-msgid "Keyboard Shortcuts"
-msgstr "Raccourcis clavier"
-
-#: help/main.php:5
-msgid "Navigation"
-msgstr "Navigation"
-
-#: help/main.php:8
-msgid "Move between feeds"
-msgstr "Naviguer dans les flux"
-
-#: help/main.php:9
-msgid "Move between articles"
-msgstr "Naviguer dans les articles"
-
-#: help/main.php:10
-msgid "Show search dialog"
-msgstr "Afficher la fenêtre de recherche"
-
-#: help/main.php:13
-msgid "Active article actions"
-msgstr "Activer les actions de l'article"
-
-#: help/main.php:16
-msgid "Toggle starred"
-msgstr "Marquer comme remarquable"
-
-#: help/main.php:17
-msgid "Toggle published"
-msgstr "Marquer comme publié"
-
-#: help/main.php:18
-msgid "Toggle unread"
-msgstr "Marquages comme non-lu"
-
-#: help/main.php:19
-msgid "Edit tags"
-msgstr "Modifier les tags"
-
-#: help/main.php:20
-msgid "Dismiss selected articles"
-msgstr "Exclure les articles sélectionnés"
-
-#: help/main.php:21
-msgid "Dismiss read articles"
-msgstr "Exclure les articles lus"
-
-#: help/main.php:22
-msgid "Open article in new window"
-msgstr "Ouvrir les articles dans une nouvelle fenêtre"
-
-#: help/main.php:23
-msgid "Mark articles below/above active one as read"
-msgstr "Marquer les articles au-dessous/au-dessus de l'article actif comme lus"
-
-#: help/main.php:24
-msgid "Scroll article content"
-msgstr "Faire déflier le contenu de l'article"
-
-#: help/main.php:25
-msgid "Email article"
-msgstr "Envoyer l'article par e-mail"
-
-#: help/main.php:29 help/prefs.php:30
-msgid "Other actions"
-msgstr "Autres actions"
-
-#: help/main.php:32
-msgid "Select article under mouse cursor"
-msgstr "Selectionner l'article sous le curseur de la souris"
-
-#: help/main.php:33 help/prefs.php:26 classes/pref/labels.php:281
-msgid "Create label"
-msgstr "Créer une étiquette"
-
-#: help/main.php:34 help/prefs.php:25 classes/pref/filters.php:580
-msgid "Create filter"
-msgstr "Créer un filtre"
-
-#: help/main.php:35
-msgid "Collapse sidebar"
-msgstr "Contracter le menu"
-
-#: help/main.php:36 help/prefs.php:34
-msgid "Display this help dialog"
-msgstr "Afficher cette aide"
-
-#: help/main.php:41
-msgid "Multiple articles actions"
-msgstr "Actions sur plusieurs articles"
-
-#: help/main.php:44
-msgid "Select all articles"
-msgstr "Sélectionner tous les articles"
-
-#: help/main.php:45
-msgid "Select unread articles"
-msgstr "Sélectionner les articles non lus"
-
-#: help/main.php:46
-#, fuzzy
-msgid "Select starred articles"
-msgstr "Sélectionner les articles non lus"
-
-#: help/main.php:47
-#, fuzzy
-msgid "Select published articles"
-msgstr "Sélectionner les articles non lus"
-
-#: help/main.php:48
-msgid "Invert article selection"
-msgstr "Inverser la sélection"
-
-#: help/main.php:49
-msgid "Deselect all articles"
-msgstr "Tout déselectionner"
-
-#: help/main.php:52
-msgid "Feed actions"
-msgstr "Actions sur ce flux"
-
-#: help/main.php:55
-msgid "Refresh active feed"
-msgstr "Mettre à jour le flux actif"
-
-#: help/main.php:57 help/prefs.php:22 classes/pref/feeds.php:1286
-msgid "Subscribe to feed"
-msgstr "S'abonner au flux"
-
-#: help/main.php:58 js/FeedTree.js:135 js/PrefFeedTree.js:67
-msgid "Edit feed"
-msgstr "Modifier le flux"
-
-#: help/main.php:59
-msgid "Mark feed as read"
-msgstr "Marquer le flux comme lu"
-
-#: help/main.php:60
-msgid "Reverse headlines order"
-msgstr "Inverser l'ordre des titres"
-
-#: help/main.php:61 js/FeedTree.js:170
-msgid "Mark all feeds as read"
-msgstr "Marquer tous les flux comme lus"
-
-#: help/main.php:62
-msgid "If viewing category, (un)collapse it"
-msgstr "Déployer/Contracter lors de la consultation des catégories"
-
-#: help/main.php:65 help/prefs.php:5
-msgid "Go to..."
-msgstr "Aller à..."
-
-#: help/main.php:68 include/functions.php:1893
-msgid "All articles"
-msgstr "Tous les articles"
-
-#: help/main.php:69 include/functions.php:1891
-msgid "Fresh articles"
-msgstr "Nouveaux articles"
-
-#: help/main.php:70 include/functions.php:1887
-msgid "Starred articles"
-msgstr "Articles remarquables"
-
-#: help/main.php:71 include/functions.php:1889
-msgid "Published articles"
-msgstr "Articles publiés"
-
-#: help/main.php:72
-msgid "Tag cloud"
-msgstr "Nuage de tags"
-
-#: help/main.php:79
-msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
-msgstr ""
-"D'autres astuces sur l'interface sont disponibles sur le wiki de Tiny Tiny "
-"RSS."
-
-#: help/main.php:81 help/prefs.php:41
-msgid "Press any key to close this window."
-msgstr "Appuyer sur une touche pour fermer cette fenêtre"
-
-#: help/prefs.php:9
-msgid "My Feeds"
-msgstr "Mes flux"
-
-#: help/prefs.php:10
-msgid "Other Feeds"
-msgstr "Autres flux"
-
-#: help/prefs.php:19
-msgid "Panel actions"
-msgstr "Actions du panneau :"
-
-#: help/prefs.php:23
-msgid "Top 25 feeds"
-msgstr "Top 25 des flux"
-
-#: help/prefs.php:24
-msgid "Edit feed categories"
-msgstr "Modifier les catégories des flux"
-
-#: help/prefs.php:27 classes/pref/users.php:386
-msgid "Create user"
-msgstr "Créer l'utilisateur"
-
-#: help/prefs.php:33
-msgid "Focus search (if present)"
-msgstr "Focus sur la recherche (si affichée)"
-
-#: help/prefs.php:39
-msgid ""
-"<b>Note:</b> not all actions may be available, depending on Tiny Tiny RSS "
-"configuration and your access level."
-msgstr ""
-"<b>Note :</b> certaines actions peuvent ne pas être disponibles, selon la "
-"configuration de Tiny Tiny RSS et vos permissions."
-
 #: mobile/login_form.php:28 include/login_form.php:209
-#: classes/handler/public.php:495
+#: classes/handler/public.php:469
 msgid "Log in"
 msgstr "Se connecter"
 
 #: mobile/login_form.php:40 include/login_form.php:169
-#: classes/handler/public.php:479
+#: classes/handler/public.php:453
 msgid "Login:"
 msgstr "Login :"
 
 #: mobile/login_form.php:45 include/login_form.php:178
-#: classes/handler/public.php:482
+#: classes/handler/public.php:456
 msgid "Password:"
 msgstr "Mot de passe :"
 
@@ -768,8 +548,8 @@ msgstr ""
 msgid "Home"
 msgstr "Accueil"
 
-#: mobile/mobile-functions.php:178 include/functions.php:1187
-#: include/functions.php:1834
+#: mobile/mobile-functions.php:178 include/functions.php:1116
+#: include/functions.php:1737
 msgid "Special"
 msgstr "Spécial"
 
@@ -782,12 +562,12 @@ msgid "Enable categories"
 msgstr "Utiliser les catégories de flux"
 
 #: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36
-#: mobile/prefs.php:41 mobile/prefs.php:46
+#: mobile/prefs.php:41 mobile/prefs.php:46 mobile/prefs.php:51
 msgid "ON"
 msgstr "Marche"
 
 #: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36
-#: mobile/prefs.php:41 mobile/prefs.php:46
+#: mobile/prefs.php:41 mobile/prefs.php:46 mobile/prefs.php:51
 msgid "OFF"
 msgstr "Arrêt"
 
@@ -807,148 +587,336 @@ msgstr "Cacher les articles et flux lus"
 msgid "Sort feeds by unread count"
 msgstr "Trier les flux par nombre d'articles non lus"
 
-#: include/functions.php:564
-#, php-format
-msgid "Fatal: authentication module %s not found."
-msgstr ""
+#: mobile/prefs.php:50 include/localized_schema.php:45
+msgid "Reverse headline order (oldest first)"
+msgstr "Inverser l'order des en-têtes (les plus anciens en premier)"
 
-#: include/functions.php:682
-msgid "Session failed to validate (incorrect IP)"
-msgstr "Echec de la validation de la session (adresse ip incorrecte)"
-
-#: include/functions.php:1198 include/functions.php:1737
-#: include/functions.php:1822 include/functions.php:1844
-#: include/functions.php:2699 classes/opml.php:416 classes/pref/feeds.php:193
+#: include/digest.php:131 include/functions.php:1127
+#: include/functions.php:1640 include/functions.php:1725
+#: include/functions.php:1747 classes/opml.php:416 classes/pref/feeds.php:188
 msgid "Uncategorized"
 msgstr "Sans catégorie"
 
-#: include/functions.php:1686 classes/dlg.php:387 classes/pref/filters.php:361
-msgid "All feeds"
-msgstr "Tous les flux"
-
-#: include/functions.php:1895
-msgid "Archived articles"
-msgstr "Articles archivés"
-
-#: include/functions.php:1897
-msgid "Recently read"
-msgstr ""
-
-#: include/functions.php:2346
-#, php-format
-msgid "Search results: %s"
-msgstr ""
-
-#: include/functions.php:3067 js/viewfeed.js:1998 js/viewfeed.js:1971
-#: js/viewfeed.js:1835 js/viewfeed.js:1845
-msgid "Click to play"
-msgstr "Cliquez pour lancer la lecture"
-
-#: include/functions.php:3068 js/viewfeed.js:1997 js/viewfeed.js:1970
-#: js/viewfeed.js:1834 js/viewfeed.js:1844
-msgid "Play"
-msgstr "Lecture"
-
-#: include/functions.php:3203
-msgid " - "
-msgstr " - "
-
-#: include/functions.php:3232 include/functions.php:4028 classes/rpc.php:414
-msgid "no tags"
-msgstr "aucun tag"
-
-#: include/functions.php:3242 classes/feeds.php:680
-msgid "Edit tags for this article"
-msgstr "Modifier les tags pour cet article"
-
-#: include/functions.php:3252 classes/feeds.php:707
-msgid "Open article in new tab"
-msgstr "Ouvrir les articles dans un nouvel onglet"
-
-#: include/functions.php:3263 classes/feeds.php:718
-msgid "Close article"
-msgstr "Fermer l'article"
-
-#: include/functions.php:3280 classes/feeds.php:616
-msgid "Originally from:"
-msgstr "Origine :"
-
-#: include/functions.php:3293 classes/feeds.php:629 classes/pref/feeds.php:511
-msgid "Feed URL"
-msgstr "URL du flux"
-
-#: include/functions.php:3308 classes/feeds.php:68
-msgid "Visit the website"
-msgstr "Visiter le site web"
-
-#: include/functions.php:3327
-#, fuzzy
-msgid "Related"
-msgstr "Lire plus tard"
-
-#: include/functions.php:3361 classes/dlg.php:30 classes/dlg.php:61
-#: classes/dlg.php:180 classes/dlg.php:203 classes/dlg.php:240
-#: classes/dlg.php:524 classes/dlg.php:559 classes/dlg.php:590
-#: classes/dlg.php:623 classes/dlg.php:724 classes/pref/users.php:106
-#: classes/pref/filters.php:101 classes/pref/feeds.php:1638
-#: classes/pref/feeds.php:1709 plugins/share/share.php:61
-#: plugins/updater/updater.php:301 plugins/updater/init.php:323
-msgid "Close this window"
-msgstr "Fermer cette fenêtre"
-
-#: include/functions.php:4053
-msgid "(edit note)"
-msgstr "(modifier l'annotation)"
-
-#: include/functions.php:4525
-msgid "No feed selected."
-msgstr "Aucun flux sélectionné."
-
-#: include/functions.php:4535 classes/feeds.php:766
-#, php-format
-msgid "Feeds last updated at %s"
-msgstr "Flux mis à jour à %s"
-
-#: include/functions.php:4545 classes/feeds.php:776
-msgid "Some feeds have update errors (click for details)"
-msgstr ""
-"Des erreurs sont survenues pendant la mise à jour de certains flux (cliquer "
-"ici pour les détails)"
-
-#: include/functions.php:4689
-msgid "unknown type"
-msgstr "type inconnu"
-
-#: include/functions.php:4731
-#, fuzzy
-msgid "Attachments"
-msgstr "Fichiers attachés :"
-
-#: include/functions.php:5191
+#: include/feedbrowser.php:83
 #, php-format
 msgid "%d archived articles"
 msgstr "%d articles archivés"
 
-#: include/functions.php:5215
+#: include/feedbrowser.php:107
 msgid "No feeds found."
 msgstr "Aucun flux trouvé."
 
-#: include/functions.php:5261 plugins/import_export/init.php:221
-msgid "Could not import: incorrect schema version."
-msgstr "Importation impossible : version du schéma incorrecte."
+#: include/functions.php:698
+msgid "Session failed to validate (incorrect IP)"
+msgstr "Echec de la validation de la session (adresse ip incorrecte)"
 
-#: include/functions.php:5266 plugins/import_export/init.php:226
-msgid "Could not import: unrecognized document format."
-msgstr "Importation impossible : format de document non reconnu."
+#: include/functions.php:1589 classes/dlg.php:371 classes/pref/filters.php:368
+msgid "All feeds"
+msgstr "Tous les flux"
 
-#: include/functions.php:5425
+#: include/functions.php:1790
+msgid "Starred articles"
+msgstr "Articles remarquables"
+
+#: include/functions.php:1792
+msgid "Published articles"
+msgstr "Articles publiés"
+
+#: include/functions.php:1794
+msgid "Fresh articles"
+msgstr "Nouveaux articles"
+
+#: include/functions.php:1796 include/functions.php:1910
+msgid "All articles"
+msgstr "Tous les articles"
+
+#: include/functions.php:1798
+msgid "Archived articles"
+msgstr "Articles archivés"
+
+#: include/functions.php:1800
+msgid "Recently read"
+msgstr ""
+
+#: include/functions.php:1867
+msgid "Navigation"
+msgstr "Navigation"
+
+#: include/functions.php:1868
+#, fuzzy
+msgid "Open next feed"
+msgstr "Sauter automatiquement au flux suivant"
+
+#: include/functions.php:1869
+msgid "Open previous feed"
+msgstr ""
+
+#: include/functions.php:1870
+#, fuzzy
+msgid "Open next article"
+msgstr "Ouvrir l'article original"
+
+#: include/functions.php:1871
+#, fuzzy
+msgid "Open previous article"
+msgstr "Ouvrir l'article original"
+
+#: include/functions.php:1872
+msgid "Open next article (don't scroll long articles)"
+msgstr ""
+
+#: include/functions.php:1873
+msgid "Open previous article (don't scroll long articles)"
+msgstr ""
+
+#: include/functions.php:1874
+msgid "Show search dialog"
+msgstr "Afficher la fenêtre de recherche"
+
+#: include/functions.php:1875
+#, fuzzy
+msgid "Article"
+msgstr "Tous les articles"
+
+#: include/functions.php:1876
+msgid "Toggle starred"
+msgstr "Marquer comme remarquable"
+
+#: include/functions.php:1877
+msgid "Toggle published"
+msgstr "Marquer comme publié"
+
+#: include/functions.php:1878
+msgid "Toggle unread"
+msgstr "Marquages comme non-lu"
+
+#: include/functions.php:1879
+msgid "Edit tags"
+msgstr "Modifier les tags"
+
+#: include/functions.php:1880
+#, fuzzy
+msgid "Dismiss selected"
+msgstr "Exclure les articles sélectionnés"
+
+#: include/functions.php:1881
+#, fuzzy
+msgid "Dismiss read"
+msgstr "Exclure les articles lus"
+
+#: include/functions.php:1882
+#, fuzzy
+msgid "Open in new window"
+msgstr "Ouvrir les articles dans une nouvelle fenêtre"
+
+#: include/functions.php:1883 js/viewfeed.js:1758
+msgid "Mark below as read"
+msgstr "Marquer les articles en-dessous comme lus"
+
+#: include/functions.php:1884 js/viewfeed.js:1752
+msgid "Mark above as read"
+msgstr "Marquer les articles au-dessus comme lus"
+
+#: include/functions.php:1885
+#, fuzzy
+msgid "Scroll down"
+msgstr "Tout est terminé."
+
+#: include/functions.php:1886
+msgid "Scroll up"
+msgstr ""
+
+#: include/functions.php:1887
+#, fuzzy
+msgid "Select article under cursor"
+msgstr "Selectionner l'article sous le curseur de la souris"
+
+#: include/functions.php:1888
+msgid "Email article"
+msgstr "Envoyer l'article par e-mail"
+
+#: include/functions.php:1889 plugins/close_button/init.php:24
+msgid "Close article"
+msgstr "Fermer l'article"
+
+#: include/functions.php:1891
+#, fuzzy
+msgid "Article selection"
+msgstr "Inverser la sélection"
+
+#: include/functions.php:1892
+msgid "Select all articles"
+msgstr "Sélectionner tous les articles"
+
+#: include/functions.php:1893
+#, fuzzy
+msgid "Select unread"
+msgstr "Sélectionner les articles non lus"
+
+#: include/functions.php:1894
+#, fuzzy
+msgid "Select starred"
+msgstr "Marquer comme remarquable"
+
+#: include/functions.php:1895
+#, fuzzy
+msgid "Select published"
+msgstr "Sélectionner les articles non lus"
+
+#: include/functions.php:1896
+#, fuzzy
+msgid "Invert selection"
+msgstr "Inverser la sélection"
+
+#: include/functions.php:1897
+#, fuzzy
+msgid "Deselect everything"
+msgstr "Tout déselectionner"
+
+#: include/functions.php:1898 classes/pref/feeds.php:488
+#: classes/pref/feeds.php:707
+msgid "Feed"
+msgstr "Flux"
+
+#: include/functions.php:1899
+#, fuzzy
+msgid "Refresh current feed"
+msgstr "Mettre à jour le flux actif"
+
+#: include/functions.php:1900
+#, fuzzy
+msgid "Un/hide read feeds"
+msgstr "(Dé)Masquer les flux lus"
+
+#: include/functions.php:1901 classes/pref/feeds.php:1214
+msgid "Subscribe to feed"
+msgstr "S'abonner au flux"
+
+#: include/functions.php:1902 js/FeedTree.js:135 js/PrefFeedTree.js:67
+msgid "Edit feed"
+msgstr "Modifier le flux"
+
+#: include/functions.php:1904
+#, fuzzy
+msgid "Reverse headlines"
+msgstr "Inverser l'ordre des titres"
+
+#: include/functions.php:1905
+#, fuzzy
+msgid "Debug feed update"
+msgstr "Désactiver les mises à jour"
+
+#: include/functions.php:1906 js/FeedTree.js:170
+msgid "Mark all feeds as read"
+msgstr "Marquer tous les flux comme lus"
+
+#: include/functions.php:1907
+#, fuzzy
+msgid "Un/collapse current category"
+msgstr "Placer dans la catégorie :"
+
+#: include/functions.php:1908
+#, fuzzy
+msgid "Toggle combined mode"
+msgstr "Marquer comme publié"
+
+#: include/functions.php:1909
+#, fuzzy
+msgid "Go to"
+msgstr "Aller à..."
+
+#: include/functions.php:1911
+msgid "Fresh"
+msgstr ""
+
+#: include/functions.php:1914
+msgid "Tag cloud"
+msgstr "Nuage de tags"
+
+#: include/functions.php:1916
+#, fuzzy
+msgid "Other"
+msgstr "Autres flux"
+
+#: include/functions.php:1917 classes/pref/labels.php:281
+msgid "Create label"
+msgstr "Créer une étiquette"
+
+#: include/functions.php:1918 classes/pref/filters.php:587
+msgid "Create filter"
+msgstr "Créer un filtre"
+
+#: include/functions.php:1919
+#, fuzzy
+msgid "Un/collapse sidebar"
+msgstr "Contracter le menu"
+
+#: include/functions.php:1920
+#, fuzzy
+msgid "Show help dialog"
+msgstr "Afficher la fenêtre de recherche"
+
+#: include/functions.php:2400
 #, php-format
-msgid "Finished: %d articles processed, %d imported, %d feeds created."
-msgstr "Terminé : %d articles traités, %d importés, %d flux créés."
+msgid "Search results: %s"
+msgstr ""
 
-#: include/functions.php:5431 plugins/import_export/init.php:391
-msgid "Could not load XML document."
-msgstr "Impossible de charger le document XML."
+#: include/functions.php:2824 js/viewfeed.js:1845
+msgid "Click to play"
+msgstr "Cliquez pour lancer la lecture"
+
+#: include/functions.php:2825 js/viewfeed.js:1844
+msgid "Play"
+msgstr "Lecture"
+
+#: include/functions.php:2945
+msgid " - "
+msgstr " - "
+
+#: include/functions.php:2967 include/functions.php:3284 classes/rpc.php:359
+msgid "no tags"
+msgstr "aucun tag"
+
+#: include/functions.php:2977 classes/feeds.php:645
+msgid "Edit tags for this article"
+msgstr "Modifier les tags pour cet article"
+
+#: include/functions.php:3006 classes/feeds.php:600
+msgid "Originally from:"
+msgstr "Origine :"
+
+#: include/functions.php:3019 classes/feeds.php:613 classes/pref/feeds.php:507
+msgid "Feed URL"
+msgstr "URL du flux"
+
+#: include/functions.php:3048
+#, fuzzy
+msgid "Related"
+msgstr "Lire plus tard"
+
+#: include/functions.php:3075 classes/dlg.php:43 classes/dlg.php:162
+#: classes/dlg.php:185 classes/dlg.php:222 classes/dlg.php:508
+#: classes/dlg.php:543 classes/dlg.php:574 classes/dlg.php:608
+#: classes/dlg.php:620 classes/backend.php:105 classes/pref/users.php:106
+#: classes/pref/filters.php:108 classes/pref/feeds.php:1527
+#: classes/pref/feeds.php:1598 plugins/import_export/init.php:407
+#: plugins/import_export/init.php:431 plugins/share/init.php:67
+#: plugins/updater/init.php:329
+msgid "Close this window"
+msgstr "Fermer cette fenêtre"
+
+#: include/functions.php:3309
+msgid "(edit note)"
+msgstr "(modifier l'annotation)"
+
+#: include/functions.php:3542
+msgid "unknown type"
+msgstr "type inconnu"
+
+#: include/functions.php:3592
+#, fuzzy
+msgid "Attachments"
+msgstr "Fichiers attachés :"
 
 #: include/localized_schema.php:4
 msgid "Title or Content"
@@ -974,9 +942,8 @@ msgstr "Supprimer l'article"
 msgid "Set starred"
 msgstr "Marquer comme remarquable"
 
-#: include/localized_schema.php:12 js/viewfeed.js:501 js/viewfeed.js:490
-#: js/viewfeed.js:496 js/viewfeed.js:478 plugins/digest/digest.js:264
-#: plugins/digest/digest.js:736
+#: include/localized_schema.php:12 js/viewfeed.js:478
+#: plugins/digest/digest.js:264 plugins/digest/digest.js:736
 msgid "Publish article"
 msgstr "Publier l'article"
 
@@ -984,8 +951,7 @@ msgstr "Publier l'article"
 msgid "Assign tags"
 msgstr "Assigner des tags"
 
-#: include/localized_schema.php:14 js/viewfeed.js:1962 js/viewfeed.js:1935
-#: js/viewfeed.js:1799 js/viewfeed.js:1809
+#: include/localized_schema.php:14 js/viewfeed.js:1809
 msgid "Assign label"
 msgstr "Assigner l'étiquette"
 
@@ -1137,10 +1103,6 @@ msgstr "Sauter automatiquement au flux suivant"
 msgid "Sort feeds by unread articles count"
 msgstr "Trier les flux par nombre d'articles non lus"
 
-#: include/localized_schema.php:45
-msgid "Reverse headline order (oldest first)"
-msgstr "Inverser l'order des en-têtes (les plus anciens en premier)"
-
 #: include/localized_schema.php:46
 msgid "Enable e-mail digest"
 msgstr "Activer la synthèse quotidienne par courrier électronique"
@@ -1186,7 +1148,8 @@ msgid "Group headlines in virtual feeds"
 msgstr "Regrouper les entêtes dans des flux virtuels"
 
 #: include/localized_schema.php:57
-msgid "Do not show images in articles"
+#, fuzzy
+msgid "Hide images in articles"
 msgstr "Ne pas afficher les images dans les articles"
 
 #: include/localized_schema.php:58
@@ -1197,8 +1160,7 @@ msgstr "Activer les API externes"
 msgid "User timezone"
 msgstr "Fuseau horaire de l'utilisateur"
 
-#: include/localized_schema.php:60 js/prefs.js:1856 js/prefs.js:1743
-#: js/prefs.js:1733
+#: include/localized_schema.php:60 js/prefs.js:1733
 msgid "Customize stylesheet"
 msgstr "Personnaliser la feuille de style"
 
@@ -1218,7 +1180,7 @@ msgstr ""
 msgid "Assign articles to labels automatically"
 msgstr ""
 
-#: include/login_form.php:185 classes/handler/public.php:485
+#: include/login_form.php:185 classes/handler/public.php:459
 msgid "Language:"
 msgstr "Langue :"
 
@@ -1226,8 +1188,8 @@ msgstr "Langue :"
 msgid "Profile:"
 msgstr "Profil :"
 
-#: include/login_form.php:197 classes/handler/public.php:208
-#: classes/rpc.php:147 classes/dlg.php:116
+#: include/login_form.php:197 classes/handler/public.php:212
+#: classes/rpc.php:64 classes/dlg.php:98
 msgid "Default profile"
 msgstr "Profil par défaut"
 
@@ -1239,119 +1201,102 @@ msgstr "Minimiser l'usage du trafic"
 msgid "Article not found."
 msgstr "Article non trouvé."
 
-#: classes/handler/public.php:420 classes/pref/feeds.php:1480
+#: classes/handler/public.php:394 plugins/bookmarklets/init.php:38
 #, fuzzy
 msgid "Share with Tiny Tiny RSS"
 msgstr "S'abonner dans Tiny Tiny RSS"
 
-#: classes/handler/public.php:428
+#: classes/handler/public.php:402
 #, fuzzy
 msgid "Title:"
 msgstr "Titre"
 
-#: classes/handler/public.php:430 classes/dlg.php:667
-#: classes/pref/feeds.php:509 classes/pref/feeds.php:762
-#: plugins/instances/instances.php:100 plugins/instances/init.php:215
+#: classes/handler/public.php:404 classes/dlg.php:667
+#: classes/pref/feeds.php:505 classes/pref/feeds.php:722
+#: plugins/instances/init.php:215
 msgid "URL:"
 msgstr "URL du flux :"
 
-#: classes/handler/public.php:432
+#: classes/handler/public.php:406
 #, fuzzy
 msgid "Content:"
 msgstr "Contenu"
 
-#: classes/handler/public.php:434
+#: classes/handler/public.php:408
 #, fuzzy
 msgid "Labels:"
 msgstr "Etiquettes"
 
-#: classes/handler/public.php:453
+#: classes/handler/public.php:427
 msgid "Shared article will appear in the Published feed."
 msgstr ""
 
-#: classes/handler/public.php:455
+#: classes/handler/public.php:429
 msgid "Share"
 msgstr ""
 
-#: classes/handler/public.php:456 classes/handler/public.php:498
-#: classes/dlg.php:315 classes/dlg.php:366 classes/dlg.php:426
-#: classes/dlg.php:457 classes/dlg.php:652 classes/dlg.php:702
-#: classes/dlg.php:774 classes/pref/users.php:194 classes/pref/labels.php:81
-#: classes/pref/filters.php:342 classes/pref/filters.php:722
-#: classes/pref/filters.php:791 classes/pref/filters.php:858
-#: classes/pref/feeds.php:729 classes/pref/feeds.php:880
-#: plugins/mail/mail.php:126 plugins/note/note.php:49
-#: plugins/instances/instances.php:136
+#: classes/handler/public.php:430 classes/handler/public.php:472
+#: classes/dlg.php:297 classes/dlg.php:350 classes/dlg.php:410
+#: classes/dlg.php:441 classes/dlg.php:652 classes/dlg.php:702
+#: classes/dlg.php:751 classes/pref/users.php:194 classes/pref/labels.php:81
+#: classes/pref/filters.php:349 classes/pref/filters.php:729
+#: classes/pref/filters.php:798 classes/pref/filters.php:865
+#: classes/pref/feeds.php:689 classes/pref/feeds.php:829
+#: plugins/mail/init.php:132 plugins/note/init.php:55
+#: plugins/instances/init.php:251
 msgid "Cancel"
 msgstr "Annuler"
 
-#: classes/handler/public.php:477
+#: classes/handler/public.php:451
 #, fuzzy
 msgid "Not logged in"
 msgstr "Dernière connexion"
 
-#: classes/handler/public.php:537
+#: classes/handler/public.php:511
 msgid "Incorrect username or password"
 msgstr "Login ou mot de passe incorrect"
 
-#: classes/handler/public.php:573 classes/handler/public.php:670
+#: classes/handler/public.php:547 classes/handler/public.php:644
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "Déjà abonné à <b>%s</b>."
 
-#: classes/handler/public.php:576 classes/handler/public.php:661
+#: classes/handler/public.php:550 classes/handler/public.php:635
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "Abonné à <b>%s</b>."
 
-#: classes/handler/public.php:579 classes/handler/public.php:664
+#: classes/handler/public.php:553 classes/handler/public.php:638
 #, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "Impossible de s'abonner à <b>%s</b>."
 
-#: classes/handler/public.php:582 classes/handler/public.php:667
+#: classes/handler/public.php:556 classes/handler/public.php:641
 #, php-format
 msgid "No feeds found in <b>%s</b>."
 msgstr "Aucun flux trouvé dans <b>%s</b>."
 
-#: classes/handler/public.php:585 classes/handler/public.php:673
+#: classes/handler/public.php:559 classes/handler/public.php:647
 #, fuzzy
 msgid "Multiple feed URLs found."
 msgstr "Aucun flux trouvé."
 
-#: classes/handler/public.php:589 classes/handler/public.php:678
+#: classes/handler/public.php:563 classes/handler/public.php:652
 #, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr ""
 "Impossible de s'abonner à <b>%s</b>.<br>Impossible de télécharger l'URL du "
 "flux."
 
-#: classes/handler/public.php:607 classes/handler/public.php:696
+#: classes/handler/public.php:581 classes/handler/public.php:670
 msgid "Subscribe to selected feed"
 msgstr "S'abonner au flux sélectionné"
 
-#: classes/handler/public.php:632 classes/handler/public.php:720
+#: classes/handler/public.php:606 classes/handler/public.php:694
 msgid "Edit subscription options"
 msgstr "Modifier les options d'abonnement"
 
-#: classes/auth/internal.php:45 plugins/auth_internal/init.php:62
-#, fuzzy
-msgid "Please enter your one time password:"
-msgstr "Veuillez saisir un titre pour cette catégorie :"
-
-#: classes/auth/internal.php:168 plugins/auth_internal/init.php:185
-msgid "Password has been changed."
-msgstr "Le mot de passe a été modifié."
-
-#: classes/auth/internal.php:170
-msgid "Old password is incorrect."
-msgstr "L'ancien mot de passe n'est pas correct."
-
-#: classes/dlg.php:26
-msgid "Prepare data"
-msgstr ""
-
-#: classes/dlg.php:40
+#: classes/dlg.php:22
 msgid ""
 "If you have imported labels and/or filters, you might need to reload "
 "preferences to see your new data."
@@ -1359,66 +1304,66 @@ msgstr ""
 "Si vous avez importé des étiquettes et/ou des filtres, vous devrez peut-être "
 "recharger les préférences pour voir les nouvelles données."
 
-#: classes/dlg.php:73 classes/pref/users.php:378 classes/pref/labels.php:272
-#: classes/pref/filters.php:223 classes/pref/filters.php:270
-#: classes/pref/filters.php:571 classes/pref/filters.php:650
-#: classes/pref/filters.php:677 classes/pref/feeds.php:1274
-#: classes/pref/feeds.php:1583 classes/pref/feeds.php:1652
-#: plugins/instances/instances.php:172
+#: classes/dlg.php:55 classes/pref/users.php:378 classes/pref/labels.php:272
+#: classes/pref/filters.php:230 classes/pref/filters.php:277
+#: classes/pref/filters.php:578 classes/pref/filters.php:657
+#: classes/pref/filters.php:684 classes/pref/feeds.php:1202
+#: classes/pref/feeds.php:1472 classes/pref/feeds.php:1541
+#: plugins/instances/init.php:287
 msgid "Select"
 msgstr "Sélectionner"
 
-#: classes/dlg.php:76 classes/feeds.php:92 classes/pref/users.php:381
-#: classes/pref/labels.php:275 classes/pref/filters.php:226
-#: classes/pref/filters.php:273 classes/pref/filters.php:574
-#: classes/pref/filters.php:653 classes/pref/filters.php:680
-#: classes/pref/feeds.php:1277 classes/pref/feeds.php:1586
-#: classes/pref/feeds.php:1655 plugins/instances/instances.php:175
+#: classes/dlg.php:58 classes/feeds.php:92 classes/pref/users.php:381
+#: classes/pref/labels.php:275 classes/pref/filters.php:233
+#: classes/pref/filters.php:280 classes/pref/filters.php:581
+#: classes/pref/filters.php:660 classes/pref/filters.php:687
+#: classes/pref/feeds.php:1205 classes/pref/feeds.php:1475
+#: classes/pref/feeds.php:1544 plugins/instances/init.php:290
 msgid "All"
 msgstr "Tout"
 
-#: classes/dlg.php:78 classes/feeds.php:95 classes/pref/users.php:383
-#: classes/pref/labels.php:277 classes/pref/filters.php:228
-#: classes/pref/filters.php:275 classes/pref/filters.php:576
-#: classes/pref/filters.php:655 classes/pref/filters.php:682
-#: classes/pref/feeds.php:1279 classes/pref/feeds.php:1588
-#: classes/pref/feeds.php:1657 plugins/instances/instances.php:177
+#: classes/dlg.php:60 classes/feeds.php:95 classes/pref/users.php:383
+#: classes/pref/labels.php:277 classes/pref/filters.php:235
+#: classes/pref/filters.php:282 classes/pref/filters.php:583
+#: classes/pref/filters.php:662 classes/pref/filters.php:689
+#: classes/pref/feeds.php:1207 classes/pref/feeds.php:1477
+#: classes/pref/feeds.php:1546 plugins/instances/init.php:292
 msgid "None"
 msgstr "Aucun"
 
-#: classes/dlg.php:87
+#: classes/dlg.php:69
 msgid "Create profile"
 msgstr "Création d'un profil"
 
-#: classes/dlg.php:110 classes/dlg.php:140
+#: classes/dlg.php:92 classes/dlg.php:122
 msgid "(active)"
 msgstr "(actif)"
 
-#: classes/dlg.php:174
+#: classes/dlg.php:156
 msgid "Remove selected profiles"
 msgstr "Supprimer les filtres sélectionnés"
 
-#: classes/dlg.php:176
+#: classes/dlg.php:158
 msgid "Activate profile"
 msgstr "Activer le profil"
 
-#: classes/dlg.php:186
+#: classes/dlg.php:168
 msgid "Public OPML URL"
 msgstr "URL OPML publique"
 
-#: classes/dlg.php:191
+#: classes/dlg.php:173
 msgid "Your Public OPML URL is:"
 msgstr "Votre URL OPML publique est :"
 
-#: classes/dlg.php:200 classes/dlg.php:587
+#: classes/dlg.php:182 classes/dlg.php:571
 msgid "Generate new URL"
 msgstr "Générer une nouvelle URL"
 
-#: classes/dlg.php:212
+#: classes/dlg.php:194
 msgid "Notice"
 msgstr "Avertissement"
 
-#: classes/dlg.php:218
+#: classes/dlg.php:200
 msgid ""
 "Update daemon is enabled in configuration, but daemon process is not "
 "running, which prevents all feeds from updating. Please start the daemon "
@@ -1428,11 +1373,11 @@ msgstr ""
 "n'est pas lancé et les flux ne sont donc pas mis à jour. Veuillez le "
 "démarrer ou contacter l'administrateur."
 
-#: classes/dlg.php:222 classes/dlg.php:231
+#: classes/dlg.php:204 classes/dlg.php:213
 msgid "Last update:"
 msgstr "Dernière mise à jour :"
 
-#: classes/dlg.php:227
+#: classes/dlg.php:209
 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 "
@@ -1442,151 +1387,154 @@ msgstr ""
 "de flux. Cela peut indiquer un problème comme un crash ou un suspension du "
 "processus. Veuillez vérifier son état ou bien contacter l'administrateur."
 
-#: classes/dlg.php:252 classes/dlg.php:261
+#: classes/dlg.php:234 classes/dlg.php:243
 #, fuzzy
 msgid "Feed or site URL"
 msgstr "URL du flux"
 
-#: classes/dlg.php:267 classes/dlg.php:738 classes/pref/feeds.php:531
-#: classes/pref/feeds.php:775
+#: classes/dlg.php:249 classes/dlg.php:715 classes/pref/feeds.php:527
+#: classes/pref/feeds.php:735
 msgid "Place in category:"
 msgstr "Placer dans la catégorie :"
 
-#: classes/dlg.php:275
+#: classes/dlg.php:257
 msgid "Available feeds"
 msgstr "Flux disponibles"
 
-#: classes/dlg.php:287 classes/pref/users.php:155 classes/pref/feeds.php:561
-#: classes/pref/feeds.php:811
+#: classes/dlg.php:269 classes/pref/users.php:155 classes/pref/feeds.php:557
+#: classes/pref/feeds.php:771
 msgid "Authentication"
 msgstr "Identification"
 
-#: classes/dlg.php:291 classes/dlg.php:752 classes/pref/users.php:438
-#: classes/pref/feeds.php:567 classes/pref/feeds.php:815
+#: classes/dlg.php:273 classes/dlg.php:729 classes/pref/users.php:438
+#: classes/pref/feeds.php:563 classes/pref/feeds.php:775
 msgid "Login"
 msgstr "Se connecter"
 
-#: classes/dlg.php:294 classes/dlg.php:755 classes/pref/prefs.php:200
-#: classes/pref/feeds.php:573 classes/pref/feeds.php:821
+#: classes/dlg.php:276 classes/dlg.php:732 classes/pref/prefs.php:196
+#: classes/pref/feeds.php:569 classes/pref/feeds.php:781
 msgid "Password"
 msgstr "Mot de passe"
 
-#: classes/dlg.php:304
+#: classes/dlg.php:286
 msgid "This feed requires authentication."
 msgstr "Ce flux nécessite une identification."
 
-#: classes/dlg.php:309 classes/dlg.php:364 classes/dlg.php:773
+#: classes/dlg.php:291 classes/dlg.php:348 classes/dlg.php:750
 msgid "Subscribe"
 msgstr "S'abonner"
 
-#: classes/dlg.php:312
+#: classes/dlg.php:294
 msgid "More feeds"
 msgstr "D'autres flux"
 
-#: classes/dlg.php:336 classes/dlg.php:425 classes/pref/users.php:368
-#: classes/pref/filters.php:567 classes/pref/feeds.php:1270 js/tt-rss.js:234
-#: js/tt-rss.js:187 js/tt-rss.js:166
+#: classes/dlg.php:318 classes/dlg.php:409 classes/pref/users.php:368
+#: classes/pref/filters.php:574 classes/pref/feeds.php:1198 js/tt-rss.js:166
 msgid "Search"
 msgstr "Rechercher"
 
-#: classes/dlg.php:340
+#: classes/dlg.php:322
 msgid "Popular feeds"
 msgstr "Flux populaires"
 
-#: classes/dlg.php:341
+#: classes/dlg.php:323
 msgid "Feed archive"
 msgstr "Archive du flux"
 
-#: classes/dlg.php:344
+#: classes/dlg.php:326
 msgid "limit:"
 msgstr "limite :"
 
-#: classes/dlg.php:365 classes/pref/users.php:394 classes/pref/labels.php:284
-#: classes/pref/filters.php:332 classes/pref/filters.php:589
-#: classes/pref/feeds.php:702 plugins/instances/instances.php:182
+#: classes/dlg.php:349 classes/pref/users.php:394 classes/pref/labels.php:284
+#: classes/pref/filters.php:339 classes/pref/filters.php:596
+#: classes/pref/feeds.php:662 plugins/instances/init.php:297
 msgid "Remove"
 msgstr "Supprimer"
 
-#: classes/dlg.php:376
+#: classes/dlg.php:360
 msgid "Look for"
 msgstr "Rechercher"
 
-#: classes/dlg.php:384
+#: classes/dlg.php:368
 msgid "Limit search to:"
 msgstr "Restreindre la recherche à :"
 
-#: classes/dlg.php:400
+#: classes/dlg.php:384
 msgid "This feed"
 msgstr "Ce flux"
 
-#: classes/dlg.php:432
+#: classes/dlg.php:416
 msgid "Tags for this article (separated by commas):"
 msgstr "Tags pour cet article (séparés par des virgules) :"
 
-#: classes/dlg.php:455 classes/dlg.php:650 classes/pref/users.php:192
-#: classes/pref/labels.php:79 classes/pref/filters.php:339
-#: classes/pref/feeds.php:728 classes/pref/feeds.php:877
-#: plugins/note/note.php:47 plugins/instances/instances.php:133
-#: plugins/nsfw/init.php:86 plugins/owncloud/init.php:62
+#: classes/dlg.php:439 classes/dlg.php:650 classes/pref/users.php:192
+#: classes/pref/labels.php:79 classes/pref/filters.php:346
+#: classes/pref/feeds.php:688 classes/pref/feeds.php:826
+#: plugins/nsfw/init.php:86 plugins/note/init.php:53
+#: plugins/owncloud/init.php:62 plugins/instances/init.php:248
 msgid "Save"
 msgstr "Enregistrer"
 
-#: classes/dlg.php:463
+#: classes/dlg.php:447
 msgid "Tag Cloud"
 msgstr "Nuage d'étiquettes"
 
-#: classes/dlg.php:532
+#: classes/dlg.php:516
 msgid "Select item(s) by tags"
 msgstr "Sélectionner des éléments par tags"
 
-#: classes/dlg.php:535
+#: classes/dlg.php:519
 msgid "Match:"
 msgstr "Correspondance :"
 
-#: classes/dlg.php:537
+#: classes/dlg.php:521
 msgid "Any"
 msgstr ""
 
-#: classes/dlg.php:540
+#: classes/dlg.php:524
 #, fuzzy
 msgid "All tags."
 msgstr "aucun tag"
 
-#: classes/dlg.php:542
+#: classes/dlg.php:526
 msgid "Which Tags?"
 msgstr "Quels tags ?"
 
-#: classes/dlg.php:555
+#: classes/dlg.php:539
 msgid "Display entries"
 msgstr "Afficher les entrées"
 
-#: classes/dlg.php:567 classes/feeds.php:129
+#: classes/dlg.php:551 classes/feeds.php:133
 msgid "View as RSS"
 msgstr "Voir comme RSS"
 
-#: classes/dlg.php:578
+#: classes/dlg.php:562
 msgid "You can view this feed as RSS using the following URL:"
 msgstr "Vous pouvez consulter ce flux comme RSS en utilisant l'URL suivante :"
 
-#: classes/dlg.php:606 plugins/updater/updater.php:276
+#: classes/dlg.php:591 plugins/updater/init.php:303
 #, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "Une nouvelle version de Tiny Tiny RSS est disponible (%s)."
 
-#: classes/dlg.php:614
+#: classes/dlg.php:599
 msgid ""
 "You can update using built-in updater in the Preferences or by using update."
 "php"
 msgstr ""
 
-#: classes/dlg.php:618 classes/pref/users.php:390
+#: classes/dlg.php:603 classes/pref/users.php:390
 msgid "Details"
 msgstr "Détails"
 
-#: classes/dlg.php:620
+#: classes/dlg.php:605
 msgid "Download"
 msgstr "Télécharger"
 
+#: classes/dlg.php:613
+msgid "Error receiving version information or no new version available."
+msgstr ""
+
 #: classes/dlg.php:634
 #, php-format
 msgid ""
@@ -1599,32 +1547,29 @@ msgstr ""
 "target=\"_blank\" class=\"visibleLink\" href=\"%s\">Ce fichier</a> peut être "
 "utilisé comme base de départ."
 
-#: classes/dlg.php:661 plugins/instances/instances.php:92
-#: plugins/instances/init.php:207
+#: classes/dlg.php:661 plugins/instances/init.php:207
 msgid "Instance"
 msgstr "Instance"
 
-#: classes/dlg.php:670 plugins/instances/instances.php:103
-#: plugins/instances/instances.php:200 plugins/instances/init.php:218
+#: classes/dlg.php:670 plugins/instances/init.php:218
+#: plugins/instances/init.php:315
 msgid "Instance URL"
 msgstr "URL de l'instance"
 
-#: classes/dlg.php:680 plugins/instances/instances.php:114
-#: plugins/instances/init.php:229
+#: classes/dlg.php:680 plugins/instances/init.php:229
 msgid "Access key:"
 msgstr "Clef d'accès :"
 
-#: classes/dlg.php:683 plugins/instances/instances.php:117
-#: plugins/instances/instances.php:201 plugins/instances/init.php:232
+#: classes/dlg.php:683 plugins/instances/init.php:232
+#: plugins/instances/init.php:316
 msgid "Access key"
 msgstr "Clef d'accès"
 
-#: classes/dlg.php:687 plugins/instances/instances.php:121
-#: plugins/instances/init.php:236
+#: classes/dlg.php:687 plugins/instances/init.php:236
 msgid "Use one access key for both linked instances."
 msgstr "Utilisez une clef d'accès pour les deux instances liées."
 
-#: classes/dlg.php:695 plugins/instances/instances.php:129
+#: classes/dlg.php:695 plugins/instances/init.php:244
 msgid "Generate new key"
 msgstr "Générer une nouvelle clef"
 
@@ -1632,29 +1577,24 @@ msgstr "Générer une nouvelle clef"
 msgid "Create link"
 msgstr "Créer un lien"
 
-#: classes/dlg.php:717
-#, php-format
-msgid ""
-"Could not upload file. You might need to adjust upload_max_filesize\n"
-"\t\t\t\tin PHP.ini (current value = %s)"
-msgstr ""
-"Envoi du fichier impossible. Vous devriez peut-être modifier la valeur de "
-"upload_max_filesize dans PHP.ini (valeur courante : %s)"
-
-#: classes/dlg.php:735
+#: classes/dlg.php:712
 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/dlg.php:744
+#: classes/dlg.php:721
 msgid "Feeds to subscribe, One per line"
 msgstr "Flux auxquels s'abonner, un par ligne"
 
-#: classes/dlg.php:766
+#: classes/dlg.php:743
 msgid "Feeds require authentication."
 msgstr ""
 
+#: classes/feeds.php:68
+msgid "Visit the website"
+msgstr "Visiter le site web"
+
 #: classes/feeds.php:83
 msgid "View as RSS feed"
 msgstr "Voir comme flux RSS"
@@ -1667,6 +1607,11 @@ msgstr "Sélectionner :"
 msgid "Invert"
 msgstr "Inverse"
 
+#: classes/feeds.php:101
+#, fuzzy
+msgid "More..."
+msgstr "%d de plus..."
+
 #: classes/feeds.php:103
 msgid "Selection toggle:"
 msgstr "Sélectionner :"
@@ -1688,41 +1633,41 @@ msgstr "Archive"
 msgid "Move back"
 msgstr "Revenir"
 
-#: classes/feeds.php:118 classes/pref/filters.php:235
-#: classes/pref/filters.php:282 classes/pref/filters.php:662
-#: classes/pref/filters.php:689
+#: classes/feeds.php:118 classes/pref/filters.php:242
+#: classes/pref/filters.php:289 classes/pref/filters.php:669
+#: classes/pref/filters.php:696
 msgid "Delete"
 msgstr "Supprimer"
 
-#: classes/feeds.php:122 plugins/mail/mail.php:22
+#: classes/feeds.php:125 plugins/mail/init.php:28
 msgid "Forward by email"
 msgstr "Transférer par email"
 
-#: classes/feeds.php:125
+#: classes/feeds.php:129
 msgid "Feed:"
 msgstr "Flux :"
 
-#: classes/feeds.php:190 classes/feeds.php:844
+#: classes/feeds.php:196 classes/feeds.php:790
 msgid "Feed not found."
 msgstr "Flux non trouvé."
 
-#: classes/feeds.php:434 classes/feeds.php:516
+#: classes/feeds.php:403 classes/feeds.php:493
 msgid "mark as read"
 msgstr "marquer comme lu"
 
-#: classes/feeds.php:739
+#: classes/feeds.php:691
 msgid "No unread articles found to display."
 msgstr "Aucun article non-lu à afficher"
 
-#: classes/feeds.php:742
+#: classes/feeds.php:694
 msgid "No updated articles found to display."
 msgstr "Aucun article mis à jour à afficher"
 
-#: classes/feeds.php:745
+#: classes/feeds.php:697
 msgid "No starred articles found to display."
 msgstr "Aucun article remarquable à afficher"
 
-#: classes/feeds.php:749
+#: classes/feeds.php:701
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
@@ -1730,11 +1675,44 @@ msgstr ""
 "Aucun article à afficher. Vous pouvez assigner des étiquettes aux articles "
 "manuellement (voir les actions du menu ci-dessus) ou utiliser un filtre."
 
-#: classes/feeds.php:751
+#: classes/feeds.php:703
 msgid "No articles found to display."
 msgstr "Aucun article à afficher"
 
-#: classes/backend.php:26
+#: classes/feeds.php:718 classes/feeds.php:899
+#, php-format
+msgid "Feeds last updated at %s"
+msgstr "Flux mis à jour à %s"
+
+#: classes/feeds.php:728 classes/feeds.php:909
+msgid "Some feeds have update errors (click for details)"
+msgstr ""
+"Des erreurs sont survenues pendant la mise à jour de certains flux (cliquer "
+"ici pour les détails)"
+
+#: classes/feeds.php:889
+msgid "No feed selected."
+msgstr "Aucun flux sélectionné."
+
+#: classes/backend.php:34
+msgid "Keyboard Shortcuts"
+msgstr "Raccourcis clavier"
+
+#: classes/backend.php:57
+msgid "Shift"
+msgstr ""
+
+#: classes/backend.php:60
+msgid "Ctrl"
+msgstr ""
+
+#: classes/backend.php:84
+msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
+msgstr ""
+"D'autres astuces sur l'interface sont disponibles sur le wiki de Tiny Tiny "
+"RSS."
+
+#: classes/backend.php:99
 msgid "Help topic not found."
 msgstr "Sujet non trouvé dans l'aide."
 
@@ -1785,16 +1763,15 @@ msgstr "Ajout du filtre %s"
 msgid "Processing category: %s"
 msgstr "Placer dans la catégorie :"
 
-#: classes/opml.php:467
+#: classes/opml.php:468
 msgid "Error: please upload OPML file."
 msgstr "Erreur : veuillez envoyer un document OPML."
 
-#: classes/opml.php:474
+#: classes/opml.php:475
 msgid "Error while parsing document."
 msgstr "Erreur lors de l'analyse du document."
 
-#: classes/pref/users.php:6 plugins/instances/instances.php:42
-#: plugins/instances/init.php:157
+#: classes/pref/users.php:6 plugins/instances/init.php:157
 msgid "Your access level is insufficient to open this tab."
 msgstr "Vous n'avez pas les permissions nécessaires pour ouvrir cet onglet."
 
@@ -1834,8 +1811,8 @@ msgstr "Permissions :"
 msgid "Change password to"
 msgstr "Nouveau mot de passe"
 
-#: classes/pref/users.php:177 classes/pref/feeds.php:581
-#: classes/pref/feeds.php:827
+#: classes/pref/users.php:177 classes/pref/feeds.php:577
+#: classes/pref/feeds.php:787
 msgid "Options"
 msgstr "Options"
 
@@ -1874,8 +1851,12 @@ msgstr "Notification <b>%s</b>."
 msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] Notification de changement de mot passe"
 
-#: classes/pref/users.php:392 classes/pref/filters.php:586
-#: plugins/instances/instances.php:181
+#: classes/pref/users.php:386
+msgid "Create user"
+msgstr "Créer l'utilisateur"
+
+#: classes/pref/users.php:392 classes/pref/filters.php:593
+#: plugins/instances/init.php:296
 msgid "Edit"
 msgstr "Modifier"
 
@@ -1891,15 +1872,15 @@ msgstr "Permissions"
 msgid "Last login"
 msgstr "Dernière connexion"
 
-#: classes/pref/users.php:461 plugins/instances/instances.php:222
+#: classes/pref/users.php:462 plugins/instances/init.php:337
 msgid "Click to edit"
 msgstr "Cliquer pour modifier"
 
-#: classes/pref/users.php:481
+#: classes/pref/users.php:482
 msgid "No users defined."
 msgstr "Aucun utilisateur défini."
 
-#: classes/pref/users.php:483
+#: classes/pref/users.php:484
 msgid "No matching users found."
 msgstr "Aucun utilisateur correspondant trouvé."
 
@@ -1937,84 +1918,88 @@ msgstr "Articles correspondant à ce filtre :"
 msgid "No recent articles matching this filter have been found."
 msgstr "Aucun article correspondant à ce filtre n'a été trouvé."
 
-#: classes/pref/filters.php:218 classes/pref/filters.php:645
-#: classes/pref/filters.php:760
+#: classes/pref/filters.php:98
+msgid ""
+"Complex expressions might not give results while testing due to issues with "
+"database server regexp implementation."
+msgstr ""
+
+#: classes/pref/filters.php:225 classes/pref/filters.php:652
+#: classes/pref/filters.php:767
 msgid "Match"
 msgstr "Correspondance"
 
-#: classes/pref/filters.php:232 classes/pref/filters.php:279
-#: classes/pref/filters.php:659 classes/pref/filters.php:686
+#: classes/pref/filters.php:239 classes/pref/filters.php:286
+#: classes/pref/filters.php:666 classes/pref/filters.php:693
 msgid "Add"
 msgstr ""
 
-#: classes/pref/filters.php:265 classes/pref/filters.php:672
+#: classes/pref/filters.php:272 classes/pref/filters.php:679
 #, fuzzy
 msgid "Apply actions"
 msgstr "Actions sur ce flux"
 
-#: classes/pref/filters.php:315 classes/pref/filters.php:701
+#: classes/pref/filters.php:322 classes/pref/filters.php:708
 msgid "Enabled"
 msgstr "Activé"
 
-#: classes/pref/filters.php:324 classes/pref/filters.php:704
+#: classes/pref/filters.php:331 classes/pref/filters.php:711
 msgid "Match any rule"
 msgstr ""
 
-#: classes/pref/filters.php:336 classes/pref/filters.php:716
+#: classes/pref/filters.php:343 classes/pref/filters.php:723
 msgid "Test"
 msgstr "Test"
 
-#: classes/pref/filters.php:368
+#: classes/pref/filters.php:375
 #, php-format
 msgid "%s on %s in %s"
 msgstr ""
 
-#: classes/pref/filters.php:583
+#: classes/pref/filters.php:590
 msgid "Combine"
 msgstr ""
 
-#: classes/pref/filters.php:593 classes/pref/feeds.php:1329
+#: classes/pref/filters.php:600 classes/pref/feeds.php:1257
 msgid "Rescore articles"
 msgstr "Recalculer le score des articles"
 
-#: classes/pref/filters.php:719
+#: classes/pref/filters.php:726
 msgid "Create"
 msgstr "Créer"
 
-#: classes/pref/filters.php:769
+#: classes/pref/filters.php:776
 msgid "on field"
 msgstr "sur le champ"
 
-#: classes/pref/filters.php:775 js/PrefFilterTree.js:29
+#: classes/pref/filters.php:782 js/PrefFilterTree.js:29
 #: plugins/digest/digest.js:241
 msgid "in"
 msgstr "dans"
 
-#: classes/pref/filters.php:788
+#: classes/pref/filters.php:795
 #, fuzzy
 msgid "Save rule"
 msgstr "Enregistrer"
 
-#: classes/pref/filters.php:788 js/functions.js:1067 js/functions.js:1063
-#: js/functions.js:1071 js/functions.js:1073
+#: classes/pref/filters.php:795 js/functions.js:1078
 msgid "Add rule"
 msgstr ""
 
-#: classes/pref/filters.php:811
+#: classes/pref/filters.php:818
 msgid "Perform Action"
 msgstr "Exécuter l'action"
 
-#: classes/pref/filters.php:837
+#: classes/pref/filters.php:844
 msgid "with parameters:"
 msgstr "avec les paramètres :"
 
-#: classes/pref/filters.php:855
+#: classes/pref/filters.php:862
 #, fuzzy
 msgid "Save action"
 msgstr "Actions du panneau :"
 
-#: classes/pref/filters.php:855 js/functions.js:1093 js/functions.js:1089
-#: js/functions.js:1097 js/functions.js:1099
+#: classes/pref/filters.php:862 js/functions.js:1104
 #, fuzzy
 msgid "Add action"
 msgstr "Actions sur ce flux"
@@ -2035,145 +2020,179 @@ msgstr "Les mots de passe saisie ne sont pas identiques."
 msgid "Function not supported by authentication module."
 msgstr ""
 
-#: classes/pref/prefs.php:68
+#: classes/pref/prefs.php:63
 msgid "The configuration was saved."
 msgstr "La configuration a été enregistrée."
 
-#: classes/pref/prefs.php:83
+#: classes/pref/prefs.php:77
 #, php-format
 msgid "Unknown option: %s"
 msgstr "Option inconnue : %s"
 
-#: classes/pref/prefs.php:97
+#: classes/pref/prefs.php:91
 msgid "Your personal data has been saved."
 msgstr "Vos données personnelles ont été sauvegardées."
 
-#: classes/pref/prefs.php:137
+#: classes/pref/prefs.php:131
 msgid "Personal data / Authentication"
 msgstr "Données personnelles / Authentification"
 
-#: classes/pref/prefs.php:157
+#: classes/pref/prefs.php:151
 #, fuzzy
 msgid "Personal data"
 msgstr "Données personnelles / Authentification"
 
-#: classes/pref/prefs.php:167
+#: classes/pref/prefs.php:161
 msgid "Full name"
 msgstr "Nom"
 
-#: classes/pref/prefs.php:171
+#: classes/pref/prefs.php:165
 msgid "E-mail"
 msgstr "Adresse électronique"
 
-#: classes/pref/prefs.php:177
+#: classes/pref/prefs.php:171
 msgid "Access level"
 msgstr "Permissions"
 
-#: classes/pref/prefs.php:187
+#: classes/pref/prefs.php:181
 msgid "Save data"
 msgstr "Enregistrer les données"
 
-#: classes/pref/prefs.php:207
+#: classes/pref/prefs.php:203
 msgid "Your password is at default value, please change it."
 msgstr "Votre mot de passe est celui par défaut, veuillez le modifier."
 
-#: classes/pref/prefs.php:239
+#: classes/pref/prefs.php:235
 msgid "Old password"
 msgstr "Ancien mot de passe"
 
-#: classes/pref/prefs.php:242
+#: classes/pref/prefs.php:238
 msgid "New password"
 msgstr "Nouveau mot de passe"
 
-#: classes/pref/prefs.php:247
+#: classes/pref/prefs.php:243
 msgid "Confirm password"
 msgstr "Confirmation du mot de passe"
 
-#: classes/pref/prefs.php:257
+#: classes/pref/prefs.php:253
 msgid "Change password"
 msgstr "Modifier le mot de passe"
 
-#: classes/pref/prefs.php:263
+#: classes/pref/prefs.php:259
 msgid "One time passwords / Authenticator"
 msgstr ""
 
-#: classes/pref/prefs.php:292 classes/pref/prefs.php:343
+#: classes/pref/prefs.php:288 classes/pref/prefs.php:339
 #, fuzzy
 msgid "Enter your password"
 msgstr "Login ou mot de passe incorrect"
 
-#: classes/pref/prefs.php:303
+#: classes/pref/prefs.php:299
 #, fuzzy
 msgid "Disable OTP"
 msgstr "Désactiver les mises à jour"
 
-#: classes/pref/prefs.php:309
+#: classes/pref/prefs.php:305
 msgid ""
 "You will need a compatible Authenticator to use this. Changing your password "
 "would automatically disable OTP."
 msgstr ""
 
-#: classes/pref/prefs.php:311
+#: classes/pref/prefs.php:307
 msgid "Scan the following code by the Authenticator application:"
 msgstr ""
 
-#: classes/pref/prefs.php:352
+#: classes/pref/prefs.php:348
 msgid "I have scanned the code and would like to enable OTP"
 msgstr ""
 
-#: classes/pref/prefs.php:360
+#: classes/pref/prefs.php:356
 #, fuzzy
 msgid "Enable OTP"
 msgstr "Activé"
 
-#: classes/pref/prefs.php:456
-msgid "Select theme"
-msgstr "Sélectionner un thème"
-
-#: classes/pref/prefs.php:508
+#: classes/pref/prefs.php:482
 msgid "Customize"
 msgstr "Personnaliser"
 
-#: classes/pref/prefs.php:527 classes/pref/prefs.php:534
-#: classes/pref/prefs.php:539
+#: classes/pref/prefs.php:501 classes/pref/prefs.php:508
+#: classes/pref/prefs.php:513
 msgid "Yes"
 msgstr "Oui"
 
-#: classes/pref/prefs.php:529 classes/pref/prefs.php:539
+#: classes/pref/prefs.php:503 classes/pref/prefs.php:513
 msgid "No"
 msgstr "Non"
 
-#: classes/pref/prefs.php:569
+#: classes/pref/prefs.php:543
 msgid "Register"
 msgstr "S'inscrire"
 
-#: classes/pref/prefs.php:573
+#: classes/pref/prefs.php:547
 msgid "Clear"
 msgstr "Effacer"
 
-#: classes/pref/prefs.php:579
+#: classes/pref/prefs.php:553
 #, fuzzy, php-format
 msgid "Current server time: %s (UTC)"
 msgstr "Heure actuelle du serveur : %s"
 
-#: classes/pref/prefs.php:604
+#: classes/pref/prefs.php:582
 msgid "Save configuration"
 msgstr "Enregistrer la configuration"
 
-#: classes/pref/prefs.php:607
+#: classes/pref/prefs.php:585
 msgid "Manage profiles"
 msgstr "Gérer les profils"
 
-#: classes/pref/prefs.php:610
+#: classes/pref/prefs.php:588
 msgid "Reset to defaults"
 msgstr "Revenir aux valeurs par défaut"
 
-#: classes/pref/prefs.php:622
+#: classes/pref/prefs.php:600
 #, fuzzy
 msgid "Show additional preferences"
 msgstr "Quitter la configuration"
 
-#: classes/pref/prefs.php:679 classes/pref/prefs.php:697
+#: classes/pref/prefs.php:612 classes/pref/prefs.php:614
+msgid "Plugins"
+msgstr ""
+
+#: classes/pref/prefs.php:642
+msgid "System plugins"
+msgstr ""
+
+#: classes/pref/prefs.php:646 classes/pref/prefs.php:695
+msgid "Plugin"
+msgstr ""
+
+#: classes/pref/prefs.php:647 classes/pref/prefs.php:696
+msgid "Description"
+msgstr ""
+
+#: classes/pref/prefs.php:648 classes/pref/prefs.php:697
+msgid "Version"
+msgstr ""
+
+#: classes/pref/prefs.php:649 classes/pref/prefs.php:698
+msgid "Author"
+msgstr ""
+
+#: classes/pref/prefs.php:682 classes/pref/prefs.php:733
+#, fuzzy
+msgid "Clear data"
+msgstr "Purger les données de flux"
+
+#: classes/pref/prefs.php:691
+msgid "User plugins"
+msgstr ""
+
+#: classes/pref/prefs.php:748
+#, fuzzy
+msgid "Enable selected plugins"
+msgstr "Utiliser les catégories de flux"
+
+#: classes/pref/prefs.php:803 classes/pref/prefs.php:821
 #, fuzzy
 msgid "Incorrect password"
 msgstr "Login ou mot de passe incorrect"
@@ -2182,26 +2201,22 @@ msgstr "Login ou mot de passe incorrect"
 msgid "Check to enable field"
 msgstr "Cocher pour activer le champ"
 
-#: classes/pref/feeds.php:59 classes/pref/feeds.php:180
-#: classes/pref/feeds.php:223 classes/pref/feeds.php:229
-#: classes/pref/feeds.php:254
+#: classes/pref/feeds.php:58 classes/pref/feeds.php:175
+#: classes/pref/feeds.php:217 classes/pref/feeds.php:223
+#: classes/pref/feeds.php:248
 #, php-format
 msgid "(%d feeds)"
 msgstr "(%d flux)"
 
-#: classes/pref/feeds.php:492 classes/pref/feeds.php:747
-msgid "Feed"
-msgstr "Flux"
-
-#: classes/pref/feeds.php:498
+#: classes/pref/feeds.php:494
 msgid "Feed Title"
 msgstr "Titre du flux"
 
-#: classes/pref/feeds.php:554 classes/pref/feeds.php:802
+#: classes/pref/feeds.php:550 classes/pref/feeds.php:762
 msgid "Article purging:"
 msgstr "Purge des articles :"
 
-#: classes/pref/feeds.php:577
+#: classes/pref/feeds.php:573
 msgid ""
 "<b>Hint:</b> you need to fill in your login information if your feed "
 "requires authentication, except for Twitter feeds."
@@ -2209,128 +2224,110 @@ 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:593 classes/pref/feeds.php:831
+#: classes/pref/feeds.php:589 classes/pref/feeds.php:791
 msgid "Hide from Popular feeds"
 msgstr "Masquer dans la liste des flux populaires"
 
-#: classes/pref/feeds.php:604 classes/pref/feeds.php:836
-msgid "Right-to-left content"
-msgstr "Contenu écrit de droite à gauche"
-
-#: classes/pref/feeds.php:616 classes/pref/feeds.php:842
+#: classes/pref/feeds.php:601 classes/pref/feeds.php:797
 msgid "Include in e-mail digest"
 msgstr "Inclure dans la synthèse quotidienne par courrier électronique"
 
-#: classes/pref/feeds.php:629 classes/pref/feeds.php:848
+#: classes/pref/feeds.php:614 classes/pref/feeds.php:803
 msgid "Always display image attachments"
 msgstr "Toujours afficher les images jointes"
 
-#: classes/pref/feeds.php:643 classes/pref/feeds.php:856
+#: classes/pref/feeds.php:628 classes/pref/feeds.php:811
 msgid "Cache images locally"
 msgstr "Enregistrer localement les images"
 
-#: classes/pref/feeds.php:656
-#, fuzzy
-msgid "Cache content locally"
-msgstr "Enregistrer localement les images"
-
-#: classes/pref/feeds.php:668 classes/pref/feeds.php:862
+#: classes/pref/feeds.php:640 classes/pref/feeds.php:817
 msgid "Mark updated articles as unread"
 msgstr "Marquer les article mis à jour comme non lus"
 
-#: classes/pref/feeds.php:680 classes/pref/feeds.php:868
-msgid "Mark posts as updated on content change"
-msgstr "Marquer les articles comme mis à jour quand leur contenu change"
-
-#: classes/pref/feeds.php:686
+#: classes/pref/feeds.php:646
 msgid "Icon"
 msgstr "Icône"
 
-#: classes/pref/feeds.php:700
+#: classes/pref/feeds.php:660
 msgid "Replace"
 msgstr "Remplacer"
 
-#: classes/pref/feeds.php:719
+#: classes/pref/feeds.php:679
 msgid "Resubscribe to push updates"
 msgstr "Réinscription aux mises à jour en push"
 
-#: classes/pref/feeds.php:726
+#: classes/pref/feeds.php:686
 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:741
+#: classes/pref/feeds.php:701
 msgid "Enable the options you wish to apply using checkboxes on the right:"
 msgstr ""
 
-#: classes/pref/feeds.php:1123 classes/pref/feeds.php:1176
+#: classes/pref/feeds.php:1051 classes/pref/feeds.php:1104
 msgid "All done."
 msgstr "Tout est terminé."
 
-#: classes/pref/feeds.php:1231
+#: classes/pref/feeds.php:1159
 msgid "Feeds with errors"
 msgstr "Flux avec des erreurs"
 
-#: classes/pref/feeds.php:1251
+#: classes/pref/feeds.php:1179
 #, fuzzy
 msgid "Inactive feeds"
 msgstr "Mettre à jour le flux actif"
 
-#: classes/pref/feeds.php:1288
+#: classes/pref/feeds.php:1216
 msgid "Edit selected feeds"
 msgstr "Modifier les flux sélectionnés"
 
-#: classes/pref/feeds.php:1290 classes/pref/feeds.php:1304
+#: classes/pref/feeds.php:1218 classes/pref/feeds.php:1232
 msgid "Reset sort order"
 msgstr "Réinitialiser le critère de tri"
 
-#: classes/pref/feeds.php:1292 js/prefs.js:2021 js/prefs.js:1788
-#: js/prefs.js:1778
+#: classes/pref/feeds.php:1220 js/prefs.js:1778
 msgid "Batch subscribe"
 msgstr "Abonnement par lots"
 
-#: classes/pref/feeds.php:1297
+#: classes/pref/feeds.php:1225
 #, fuzzy
 msgid "Categories"
 msgstr "Catégories de flux"
 
-#: classes/pref/feeds.php:1300
+#: classes/pref/feeds.php:1228
 #, fuzzy
 msgid "Add category"
 msgstr "Modifier les catégories"
 
-#: classes/pref/feeds.php:1302
+#: classes/pref/feeds.php:1230
 #, fuzzy
 msgid "(Un)hide empty categories"
 msgstr "Modifier les catégories"
 
-#: classes/pref/feeds.php:1306
+#: classes/pref/feeds.php:1234
 #, fuzzy
 msgid "Remove selected"
 msgstr "Supprimer les flux sélectionnés ?"
 
-#: classes/pref/feeds.php:1320
+#: classes/pref/feeds.php:1248
 msgid "More actions..."
 msgstr "Autres actions..."
 
-#: classes/pref/feeds.php:1324
+#: classes/pref/feeds.php:1252
 msgid "Manual purge"
 msgstr "Purger manuellement"
 
-#: classes/pref/feeds.php:1328
+#: classes/pref/feeds.php:1256
 msgid "Clear feed data"
 msgstr "Purger les données de flux"
 
-#: classes/pref/feeds.php:1379
-msgid "Import and export"
-msgstr "Importer et exporter"
-
-#: classes/pref/feeds.php:1381
+#: classes/pref/feeds.php:1307
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1383
+#: classes/pref/feeds.php:1309
 msgid ""
 "Using OPML you can export and import your feeds, filters, labels and Tiny "
 "Tiny RSS settings."
@@ -2338,28 +2335,28 @@ msgstr ""
 "Avec OPML, vous pouvez exporter et importer vos flux, filtrer, étiquettes et "
 "réglages de Tiny Tiny RSS."
 
-#: classes/pref/feeds.php:1385
+#: classes/pref/feeds.php:1311
 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:1398
+#: classes/pref/feeds.php:1324
 msgid "Import my OPML"
 msgstr "Importer mon OPML"
 
-#: classes/pref/feeds.php:1402
+#: classes/pref/feeds.php:1328
 msgid "Filename:"
 msgstr "Nom du fichier :"
 
-#: classes/pref/feeds.php:1404
+#: classes/pref/feeds.php:1330
 msgid "Include settings"
 msgstr "Inclure les paramètres"
 
-#: classes/pref/feeds.php:1408
+#: classes/pref/feeds.php:1334
 msgid "Export OPML"
 msgstr "Exporter en OPML"
 
-#: classes/pref/feeds.php:1412
+#: classes/pref/feeds.php:1338
 msgid ""
 "Your OPML can be published publicly and can be subscribed by anyone who "
 "knows the URL below."
@@ -2367,7 +2364,7 @@ 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:1414
+#: classes/pref/feeds.php:1340
 msgid ""
 "Published OPML does not include your Tiny Tiny RSS settings, feeds that "
 "require authentication or feeds hidden from Popular feeds."
@@ -2375,34 +2372,15 @@ msgstr ""
 "Les OPML publiés n'incluent pas vos réglages de Tiny Tiny RSS, les flux qui "
 "nécessitent une authentification, ou les flux cachés des Flux Populaires."
 
-#: classes/pref/feeds.php:1417
+#: classes/pref/feeds.php:1343
 msgid "Display published OPML URL"
 msgstr "Afficher l'URL de l'OPML public"
 
-#: classes/pref/feeds.php:1420 plugins/import_export/init.php:66
-#, fuzzy
-msgid "Article archive"
-msgstr "Date de l'article"
-
-#: classes/pref/feeds.php:1422 plugins/import_export/init.php:68
-msgid ""
-"You can export and import your Starred and Archived articles for safekeeping "
-"or when migrating between tt-rss instances."
-msgstr ""
-
-#: classes/pref/feeds.php:1425
-msgid "Export my data"
-msgstr "Exporter mes données"
-
-#: classes/pref/feeds.php:1440
-msgid "Import"
-msgstr "Importer"
-
-#: classes/pref/feeds.php:1447
+#: classes/pref/feeds.php:1353
 msgid "Firefox integration"
 msgstr "Intégration à Firefox"
 
-#: classes/pref/feeds.php:1449
+#: classes/pref/feeds.php:1355
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
@@ -2410,45 +2388,19 @@ 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:1456
+#: classes/pref/feeds.php:1362
 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:1464
-msgid "Bookmarklets"
-msgstr ""
-
-#: classes/pref/feeds.php:1466 plugins/bookmarklets/init.php:24
-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 ""
-"Glissez le lien ci-dessous dans la barre d'outil de votre navigateur, ouvrez "
-"le flux qui vous intéresse et cliquez sur le lien pour vous abonner à ce "
-"flux."
-
-#: classes/pref/feeds.php:1470
-#, php-format
-msgid "Subscribe to %s in Tiny Tiny RSS?"
-msgstr "S'abonner à %s dans Tiny Tiny RSS ?"
-
-#: classes/pref/feeds.php:1474
-msgid "Subscribe in Tiny Tiny RSS"
-msgstr "S'abonner dans Tiny Tiny RSS"
-
-#: classes/pref/feeds.php:1476 plugins/bookmarklets/init.php:34
-msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
-msgstr ""
-
-#: classes/pref/feeds.php:1484
+#: classes/pref/feeds.php:1370
 msgid "Published & shared articles / Generated feeds"
 msgstr "Articles publiés et partagés / Flux générés"
 
-#: classes/pref/feeds.php:1486
+#: classes/pref/feeds.php:1372
 msgid "Published articles and generated feeds"
 msgstr "Articles publiés et flux générés"
 
-#: classes/pref/feeds.php:1488
+#: classes/pref/feeds.php:1374
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the URL specified below."
@@ -2456,27 +2408,27 @@ 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:1494
+#: classes/pref/feeds.php:1380
 msgid "Display URL"
 msgstr "Afficher l'URL"
 
-#: classes/pref/feeds.php:1497
+#: classes/pref/feeds.php:1383
 msgid "Clear all generated URLs"
 msgstr "Supprimer toutes les URL générées"
 
-#: classes/pref/feeds.php:1499
+#: classes/pref/feeds.php:1385
 msgid "Articles shared by URL"
 msgstr "Articles publiés par URL"
 
-#: classes/pref/feeds.php:1501
+#: classes/pref/feeds.php:1387
 msgid "You can disable all articles shared by unique URLs here."
 msgstr "Vous pouvez désactiver tous les articles partagés par URL unique ici."
 
-#: classes/pref/feeds.php:1504
+#: classes/pref/feeds.php:1390
 msgid "Unshare all articles"
 msgstr "Départager tous les articles"
 
-#: classes/pref/feeds.php:1579
+#: classes/pref/feeds.php:1468
 msgid ""
 "These feeds have not been updated with new content for 3 months (oldest "
 "first):"
@@ -2484,19 +2436,19 @@ msgstr ""
 "Les flux suivants n'ont pas été mis à jour depuis 3 mois (par âge "
 "décroissant) :"
 
-#: classes/pref/feeds.php:1616 classes/pref/feeds.php:1685
+#: classes/pref/feeds.php:1505 classes/pref/feeds.php:1574
 msgid "Click to edit feed"
 msgstr "Cliquez pour modifier le flux"
 
-#: classes/pref/feeds.php:1634 classes/pref/feeds.php:1705
+#: classes/pref/feeds.php:1523 classes/pref/feeds.php:1594
 msgid "Unsubscribe from selected feeds"
 msgstr "Se désabonner des flux sélectionnés"
 
-#: classes/pref/feeds.php:1645
+#: classes/pref/feeds.php:1534
 msgid "These feeds have not been updated because of errors:"
 msgstr "Ces flux n'ont pas été mis à jour à cause d'erreurs :"
 
-#: plugins/pocket/pocket.php:24
+#: plugins/pocket/init.php:30
 msgid "Pocket"
 msgstr ""
 
@@ -2515,70 +2467,194 @@ msgstr ""
 msgid "Back to feeds"
 msgstr "Flux inactifs"
 
+#: plugins/digest/digest_body.php:56
+msgid "Hello,"
+msgstr "Bonjour,"
+
 #: plugins/digest/digest_body.php:62
 msgid "Regular version"
 msgstr ""
 
-#: plugins/pinterest/pinterest.php:23
+#: plugins/nsfw/init.php:32 plugins/nsfw/init.php:43
+msgid "Not work safe (click to toggle)"
+msgstr ""
+
+#: plugins/nsfw/init.php:53
+msgid "NSFW Plugin"
+msgstr ""
+
+#: plugins/nsfw/init.php:80
+msgid "Tags to consider NSFW (comma-separated)"
+msgstr ""
+
+#: plugins/nsfw/init.php:101
+#, fuzzy
+msgid "Configuration saved."
+msgstr "La configuration a été enregistrée."
+
+#: plugins/pinterest/init.php:29
 msgid "Pinterest"
 msgstr ""
 
-#: plugins/mail/mail.php:66 plugins/mail/mail.php:72 plugins/mail/init.php:72
-#: plugins/mail/init.php:78
+#: plugins/auth_internal/init.php:62
+#, fuzzy
+msgid "Please enter your one time password:"
+msgstr "Veuillez saisir un titre pour cette catégorie :"
+
+#: plugins/auth_internal/init.php:185
+msgid "Password has been changed."
+msgstr "Le mot de passe a été modifié."
+
+#: plugins/auth_internal/init.php:187
+msgid "Old password is incorrect."
+msgstr "L'ancien mot de passe n'est pas correct."
+
+#: plugins/bookmarklets/init.php:22
+msgid "Bookmarklets"
+msgstr ""
+
+#: plugins/bookmarklets/init.php:24
+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 ""
+"Glissez le lien ci-dessous dans la barre d'outil de votre navigateur, ouvrez "
+"le flux qui vous intéresse et cliquez sur le lien pour vous abonner à ce "
+"flux."
+
+#: plugins/bookmarklets/init.php:28
+#, php-format
+msgid "Subscribe to %s in Tiny Tiny RSS?"
+msgstr "S'abonner à %s dans Tiny Tiny RSS ?"
+
+#: plugins/bookmarklets/init.php:32
+msgid "Subscribe in Tiny Tiny RSS"
+msgstr "S'abonner dans Tiny Tiny RSS"
+
+#: plugins/bookmarklets/init.php:34
+msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
+msgstr ""
+
+#: plugins/import_export/init.php:64
+msgid "Import and export"
+msgstr "Importer et exporter"
+
+#: plugins/import_export/init.php:66
+#, fuzzy
+msgid "Article archive"
+msgstr "Date de l'article"
+
+#: plugins/import_export/init.php:68
+msgid ""
+"You can export and import your Starred and Archived articles for safekeeping "
+"or when migrating between tt-rss instances."
+msgstr ""
+
+#: plugins/import_export/init.php:71
+msgid "Export my data"
+msgstr "Exporter mes données"
+
+#: plugins/import_export/init.php:87
+msgid "Import"
+msgstr "Importer"
+
+#: plugins/import_export/init.php:221
+msgid "Could not import: incorrect schema version."
+msgstr "Importation impossible : version du schéma incorrecte."
+
+#: plugins/import_export/init.php:226
+msgid "Could not import: unrecognized document format."
+msgstr "Importation impossible : format de document non reconnu."
+
+#: plugins/import_export/init.php:385
+#, php-format
+msgid "Finished: %d articles processed, %d imported, %d feeds created."
+msgstr "Terminé : %d articles traités, %d importés, %d flux créés."
+
+#: plugins/import_export/init.php:391
+msgid "Could not load XML document."
+msgstr "Impossible de charger le document XML."
+
+#: plugins/import_export/init.php:403
+msgid "Prepare data"
+msgstr ""
+
+#: plugins/import_export/init.php:424
+#, php-format
+msgid ""
+"Could not upload file. You might need to adjust upload_max_filesize\n"
+"\t\t\t\tin PHP.ini (current value = %s)"
+msgstr ""
+"Envoi du fichier impossible. Vous devriez peut-être modifier la valeur de "
+"upload_max_filesize dans PHP.ini (valeur courante : %s)"
+
+#: plugins/mail/init.php:72 plugins/mail/init.php:78
 msgid "[Forwarded]"
 msgstr "[Transféré]"
 
-#: plugins/mail/mail.php:66 plugins/mail/init.php:72
+#: plugins/mail/init.php:72
 msgid "Multiple articles"
 msgstr "Articles multiples"
 
-#: plugins/mail/mail.php:87
+#: plugins/mail/init.php:93
 msgid "From:"
 msgstr "De :"
 
-#: plugins/mail/mail.php:96
+#: plugins/mail/init.php:102
 msgid "To:"
 msgstr "A :"
 
-#: plugins/mail/mail.php:109
+#: plugins/mail/init.php:115
 msgid "Subject:"
 msgstr "Sujet :"
 
-#: plugins/mail/mail.php:125
+#: plugins/mail/init.php:131
 msgid "Send e-mail"
 msgstr "Envoyer l'email"
 
-#: plugins/note/note.php:22 plugins/note/note.js:11
+#: plugins/note/init.php:28 plugins/note/note.js:11
 msgid "Edit article note"
 msgstr "Modifier l'annotation de l'article"
 
-#: plugins/example/example.php:29 plugins/example/init.php:38
+#: plugins/example/init.php:38
 msgid "Example Pane"
 msgstr ""
 
-#: plugins/example/example.php:53 plugins/example/init.php:69
+#: plugins/example/init.php:69
 msgid "Sample value"
 msgstr ""
 
-#: plugins/example/example.php:59 plugins/example/init.php:75
+#: plugins/example/init.php:75
 #, fuzzy
 msgid "Set value"
 msgstr "Marquer comme remarquable"
 
-#: plugins/identica/identica.php:23
+#: plugins/identica/init.php:29
 #, fuzzy
 msgid "Share on identi.ca"
 msgstr "Partager sur Twitter"
 
-#: plugins/instances/instances.php:29
+#: plugins/owncloud/init.php:35
+msgid "Owncloud"
+msgstr ""
+
+#: plugins/owncloud/init.php:59
+msgid "Owncloud url"
+msgstr ""
+
+#: plugins/owncloud/init.php:74
+msgid "Bookmark on OwnCloud "
+msgstr ""
+
+#: plugins/instances/init.php:144
 msgid "Linked"
 msgstr "Instances liées"
 
-#: plugins/instances/instances.php:180
+#: plugins/instances/init.php:295
 msgid "Link instance"
 msgstr "Lier une instance"
 
-#: plugins/instances/instances.php:192 plugins/instances/init.php:307
+#: plugins/instances/init.php:307
 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:"
@@ -2586,70 +2662,73 @@ msgstr ""
 "Vous pouvez connecter d'autres instances de Tiny Tiny RSS à celle-ci pour "
 "partager les Flux Populaires. Pour cela utilisez l'URL suivante :"
 
-#: plugins/instances/instances.php:202
+#: plugins/instances/init.php:317
 msgid "Last connected"
 msgstr "Dernière connexion"
 
-#: plugins/instances/instances.php:203
+#: plugins/instances/init.php:318
 msgid "Status"
 msgstr ""
 
-#: plugins/instances/instances.php:204
+#: plugins/instances/init.php:319
 msgid "Stored feeds"
 msgstr "Flux stockés"
 
-#: plugins/share/share.php:21
+#: plugins/share/init.php:27
 msgid "Share by URL"
 msgstr "Partager par URL"
 
-#: plugins/share/share.php:43 plugins/share/init.php:49
+#: plugins/share/init.php:49
 msgid "You can share this article by the following unique URL:"
 msgstr "Vous pouvez partager cet article avec l'URL unique suivante :"
 
-#: plugins/flattr/flattr.php:37
+#: plugins/flattr/init.php:30
 #, fuzzy
-msgid "Flattr article"
+msgid "Flattr this article."
 msgstr "Marquer comme remarquable"
 
-#: plugins/googleplus/googleplus.php:23
+#: plugins/googleplus/init.php:29
 #, fuzzy
 msgid "Share on Google+"
 msgstr "Partager sur Twitter"
 
-#: plugins/updater/updater.php:267 plugins/updater/updater.php:279
+#: plugins/updater/init.php:294 plugins/updater/init.php:306
 #: plugins/updater/updater.js:10
 #, fuzzy
 msgid "Update Tiny Tiny RSS"
 msgstr "Revenir à Tiny Tiny RSS"
 
-#: plugins/updater/updater.php:282 plugins/updater/init.php:303
+#: plugins/updater/init.php:309
 #, fuzzy
 msgid "Your Tiny Tiny RSS installation is up to date."
 msgstr "La base de données de Tiny Tiny RSS est à jour."
 
-#: plugins/updater/updater.php:291 plugins/updater/init.php:313
+#: plugins/updater/init.php:319
 msgid ""
 "Do not close this dialog until updating is finished. Backup your tt-rss "
 "directory before continuing."
 msgstr ""
 
-#: plugins/updater/updater.php:294 plugins/updater/init.php:316
+#: plugins/updater/init.php:322
 #, fuzzy
 msgid "Ready to update."
 msgstr "Dernière mise à jour :"
 
-#: plugins/updater/updater.php:299 plugins/updater/init.php:321
+#: plugins/updater/init.php:327
 #, fuzzy
 msgid "Start update"
 msgstr "Dernière mise à jour :"
 
-#: js/feedlist.js:283 js/feedlist.js:282 js/feedlist.js:265 js/feedlist.js:218
+#: plugins/tweet/init.php:29
+#, fuzzy
+msgid "Share on Twitter"
+msgstr "Partager sur Twitter"
+
+#: js/feedlist.js:218
 msgid "New articles available in this feed (click to show)"
 msgstr "Nouveaux articles disponible dans ce flux (cliquer pour les afficher)"
 
-#: js/feedlist.js:490 js/feedlist.js:505 js/feedlist.js:489 js/feedlist.js:504
-#: js/feedlist.js:469 js/feedlist.js:484 js/feedlist.js:420 js/feedlist.js:435
-#: plugins/digest/digest.js:25
+#: js/feedlist.js:420 js/feedlist.js:435 plugins/digest/digest.js:25
 msgid "Mark all articles in %s as read?"
 msgstr "Marquer tous les articles de %s comme lus ?"
 
@@ -2662,78 +2741,74 @@ msgstr ""
 "incluera des informations sur votre navigateur. Votre adresse IP sera "
 "sauvegardée dans la base de données."
 
-#: js/functions.js:618 js/functions.js:614 js/functions.js:622
+#: js/functions.js:627
 msgid "Date syntax appears to be correct:"
 msgstr "La syntaxe des dates semble être correcte :"
 
-#: js/functions.js:621 js/functions.js:617 js/functions.js:625
+#: js/functions.js:630
 msgid "Date syntax is incorrect."
 msgstr "La syntaxe des dates est incorrecte."
 
-#: js/functions.js:748 js/functions.js:744 js/functions.js:752
+#: js/functions.js:757
 msgid "Remove stored feed icon?"
 msgstr "Supprimer les données stockées ?"
 
-#: js/functions.js:780 js/functions.js:776 js/functions.js:784
+#: js/functions.js:789
 msgid "Please select an image file to upload."
 msgstr "Veuillez sélectionner une image à envoyer."
 
-#: js/functions.js:782 js/functions.js:778 js/functions.js:786
+#: js/functions.js:791
 msgid "Upload new icon for this feed?"
 msgstr "Envoyer une nouvelle icône pour ce flux ?"
 
-#: js/functions.js:799 js/functions.js:795 js/functions.js:803
+#: js/functions.js:808
 msgid "Please enter label caption:"
 msgstr "Veuillez saisir le libellé de l'étiquette :"
 
-#: js/functions.js:804 js/functions.js:800 js/functions.js:808
+#: js/functions.js:813
 msgid "Can't create label: missing caption."
 msgstr "Impossible de créer une étiquette : libellé manquant."
 
-#: js/functions.js:847 js/functions.js:843 js/functions.js:851
+#: js/functions.js:856
 msgid "Subscribe to Feed"
 msgstr "S'abonner au flux"
 
-#: js/functions.js:874 js/functions.js:870 js/functions.js:878
+#: js/functions.js:883
 msgid "Subscribed to %s"
 msgstr "Abonné à %s"
 
-#: js/functions.js:879 js/functions.js:875 js/functions.js:883
+#: js/functions.js:888
 msgid "Specified URL seems to be invalid."
 msgstr "L'URL spécifiée semble invalide."
 
-#: js/functions.js:882 js/functions.js:878 js/functions.js:886
+#: js/functions.js:891
 msgid "Specified URL doesn't seem to contain any feeds."
 msgstr "L'URL spécifiée ne semble pas correspondre à un flux."
 
-#: js/functions.js:935 js/functions.js:931 js/functions.js:939
+#: js/functions.js:944
 #, fuzzy
 msgid "Couldn't download the specified URL: %s"
 msgstr "Impossible de télécharger l'URL spécifiée."
 
-#: js/functions.js:939 js/functions.js:935 js/functions.js:943
+#: js/functions.js:948
 msgid "You are already subscribed to this feed."
 msgstr "Vous êtes déjà abonné à ce flux."
 
-#: js/functions.js:1067 js/functions.js:1063 js/functions.js:1071
-#: js/functions.js:1073
+#: js/functions.js:1078
 #, fuzzy
 msgid "Edit rule"
 msgstr "Modifier le filtre"
 
-#: js/functions.js:1093 js/functions.js:1089 js/functions.js:1097
-#: js/functions.js:1099
+#: js/functions.js:1104
 #, fuzzy
 msgid "Edit action"
 msgstr "Actions sur ce flux"
 
-#: js/functions.js:1130 js/functions.js:1126 js/functions.js:1134
-#: js/functions.js:1136
+#: js/functions.js:1141
 msgid "Create Filter"
 msgstr "Créer un filtre"
 
-#: js/functions.js:1234 js/functions.js:1230 js/functions.js:1238
-#: js/functions.js:1240
+#: js/functions.js:1245
 msgid ""
 "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
 "hub again on next feed update."
@@ -2741,48 +2816,37 @@ msgstr ""
 "Réinitialiser l'inscription ? Tiny Tiny RSS essayera de se réinscrire au hub "
 "de notification lors de la prochaine mise à jour du flux."
 
-#: js/functions.js:1255 js/tt-rss.js:421 js/functions.js:1251 js/tt-rss.js:381
-#: js/functions.js:1259 js/tt-rss.js:367 js/functions.js:1261
+#: js/functions.js:1266 js/tt-rss.js:367
 msgid "Unsubscribe from %s?"
 msgstr "Se désabonner de %s ?"
 
-#: js/functions.js:1362 js/functions.js:1358 js/functions.js:1368
-#: js/functions.js:1370
+#: js/functions.js:1375
 msgid "Please enter category title:"
 msgstr "Veuillez saisir un titre pour cette catégorie :"
 
-#: js/functions.js:1393 js/functions.js:1389 js/functions.js:1399
-#: js/functions.js:1401
+#: js/functions.js:1406
 msgid "Generate new syndication address for this feed?"
 msgstr "Générer une nouvelle adresse d'abonnement pour ce flux ?"
 
-#: js/functions.js:1584 js/tt-rss.js:400 js/tt-rss.js:903 js/functions.js:1580
-#: js/tt-rss.js:782 js/tt-rss.js:362 js/tt-rss.js:717 js/functions.js:1590
-#: js/tt-rss.js:348 js/tt-rss.js:709 js/functions.js:1592
+#: js/functions.js:1597 js/tt-rss.js:348 js/tt-rss.js:713
 msgid "You can't edit this kind of feed."
 msgstr "Vous ne pouvez pas modifier ce type de flux."
 
-#: js/functions.js:1599 js/functions.js:1595 js/functions.js:1605
-#: js/functions.js:1607
+#: js/functions.js:1612
 msgid "Edit Feed"
 msgstr "Modifier le flux"
 
-#: js/functions.js:1637 js/functions.js:1633 js/functions.js:1643
-#: js/functions.js:1645
+#: js/functions.js:1650
 msgid "More Feeds"
 msgstr "D'autres flux"
 
-#: js/functions.js:1698 js/functions.js:1808 js/prefs.js:408 js/prefs.js:438
-#: js/prefs.js:470 js/prefs.js:653 js/prefs.js:673 js/prefs.js:1326
-#: js/prefs.js:1471 js/functions.js:1694 js/functions.js:1804 js/prefs.js:397
-#: js/prefs.js:427 js/prefs.js:459 js/prefs.js:642 js/prefs.js:662
-#: js/prefs.js:1213 js/prefs.js:1358 js/functions.js:1704 js/functions.js:1814
-#: js/prefs.js:1203 js/prefs.js:1348 js/functions.js:1706 js/functions.js:1816
+#: js/functions.js:1711 js/functions.js:1821 js/prefs.js:397 js/prefs.js:427
+#: js/prefs.js:459 js/prefs.js:642 js/prefs.js:662 js/prefs.js:1203
+#: js/prefs.js:1348
 msgid "No feeds are selected."
 msgstr "Aucun flux sélectionné."
 
-#: js/functions.js:1740 js/functions.js:1736 js/functions.js:1746
-#: js/functions.js:1748
+#: js/functions.js:1753
 msgid ""
 "Remove selected feeds from the archive? Feeds with stored articles will not "
 "be removed."
@@ -2790,16 +2854,18 @@ msgstr ""
 "Supprimer les flux sélectionnés de l'archive ? Les flux contenant des "
 "articles stockés ne seront pas supprimés."
 
-#: js/functions.js:1779 js/functions.js:1775 js/functions.js:1785
-#: js/functions.js:1787
+#: js/functions.js:1792
 msgid "Feeds with update errors"
 msgstr "Flux avec des erreurs de mise à jour"
 
-#: js/functions.js:1790 js/prefs.js:1308 js/functions.js:1786 js/prefs.js:1195
-#: js/functions.js:1796 js/prefs.js:1185 js/functions.js:1798
+#: js/functions.js:1803 js/prefs.js:1185
 msgid "Remove selected feeds?"
 msgstr "Supprimer les flux sélectionnés ?"
 
+#: js/functions.js:1904
+msgid "Help"
+msgstr ""
+
 #: js/PrefFeedTree.js:47
 #, fuzzy
 msgid "Edit category"
@@ -2822,25 +2888,24 @@ msgstr "Veuillez saisir le login :"
 msgid "Can't create user: no login specified."
 msgstr "Impossible de créer l'utilisateur : aucun login spécifié."
 
-#: js/prefs.js:128 js/prefs.js:117
+#: js/prefs.js:117
 msgid "Edit Filter"
 msgstr "Modifier le filtre"
 
-#: js/prefs.js:175 js/prefs.js:164
+#: js/prefs.js:164
 #, fuzzy
 msgid "Remove filter?"
 msgstr "Supprimer le filtre %s ?"
 
-#: js/prefs.js:290 js/prefs.js:279
+#: js/prefs.js:279
 msgid "Remove selected labels?"
 msgstr "Supprimer les étiquettes sélectionnées ?"
 
-#: js/prefs.js:306 js/prefs.js:1512 js/prefs.js:295 js/prefs.js:1399
-#: js/prefs.js:1389
+#: js/prefs.js:295 js/prefs.js:1389
 msgid "No labels are selected."
 msgstr "Aucune étiquette sélectionnée."
 
-#: js/prefs.js:320 js/prefs.js:309
+#: js/prefs.js:309
 msgid ""
 "Remove selected users? Neither default admin nor your account will be "
 "removed."
@@ -2848,392 +2913,293 @@ msgstr ""
 "Supprimer les utilisateurs sélectionnés ? l'administrateur par défaut et "
 "votre compte utilisateur ne seront pas supprimés."
 
-#: js/prefs.js:337 js/prefs.js:518 js/prefs.js:539 js/prefs.js:578
 #: js/prefs.js:326 js/prefs.js:507 js/prefs.js:528 js/prefs.js:567
 msgid "No users are selected."
 msgstr "Aucun utilisateur sélectionné."
 
-#: js/prefs.js:355 js/prefs.js:344
+#: js/prefs.js:344
 msgid "Remove selected filters?"
 msgstr "Supprimer les filtres sélectionnés ?"
 
-#: js/prefs.js:370 js/prefs.js:608 js/prefs.js:627 js/prefs.js:359
-#: js/prefs.js:597 js/prefs.js:616
+#: js/prefs.js:359 js/prefs.js:597 js/prefs.js:616
 msgid "No filters are selected."
 msgstr "Aucun filtre sélectionné."
 
-#: js/prefs.js:389 js/prefs.js:378
+#: js/prefs.js:378
 msgid "Unsubscribe from selected feeds?"
 msgstr "Se désabonner des flux sélectionnés ?"
 
-#: js/prefs.js:423 js/prefs.js:412
+#: js/prefs.js:412
 msgid "Please select only one feed."
 msgstr "Veuillez sélectionner un seul flux."
 
-#: js/prefs.js:429 js/prefs.js:418
+#: js/prefs.js:418
 msgid "Erase all non-starred articles in selected feed?"
 msgstr ""
 "Supprimer tous les articles non-remarquables dans le flux sélectionné ?"
 
-#: js/prefs.js:451 js/prefs.js:440
+#: js/prefs.js:440
 msgid "How many days of articles to keep (0 - use default)?"
 msgstr ""
 "Combien de jour faut-il conserver l'article (entrer 0 pour utiliser la "
 "valeur par défaut)"
 
-#: js/prefs.js:489 js/prefs.js:478
+#: js/prefs.js:478
 msgid "Login field cannot be blank."
 msgstr "Le nom ne peut pas être vide."
 
-#: js/prefs.js:523 js/prefs.js:544 js/prefs.js:583 js/prefs.js:512
-#: js/prefs.js:533 js/prefs.js:572
+#: js/prefs.js:512 js/prefs.js:533 js/prefs.js:572
 msgid "Please select only one user."
 msgstr "Veuillez sélectionner un seul utilisateur."
 
-#: js/prefs.js:548 js/prefs.js:537
+#: js/prefs.js:537
 msgid "Reset password of selected user?"
 msgstr "Ré-initialiser le mot de passe de l'utilisateur sélectionné ?"
 
-#: js/prefs.js:613 js/prefs.js:602
+#: js/prefs.js:602
 msgid "Please select only one filter."
 msgstr "Veuillez sélectionner un seul filtre."
 
-#: js/prefs.js:631 js/prefs.js:620
+#: js/prefs.js:620
 #, fuzzy
 msgid "Combine selected filters?"
 msgstr "Supprimer les filtres sélectionnés ?"
 
-#: js/prefs.js:695 js/prefs.js:684
+#: js/prefs.js:684
 msgid "Edit Multiple Feeds"
 msgstr "Modifier plusieurs flux"
 
-#: js/prefs.js:719 js/prefs.js:708
+#: js/prefs.js:708
 msgid "Save changes to selected feeds?"
 msgstr "Enregistrer les modifications aux flux sélectionnés ?"
 
-#: js/prefs.js:811 js/prefs.js:800 js/prefs.js:790
+#: js/prefs.js:790
 msgid "OPML Import"
 msgstr "Import OPML"
 
-#: js/prefs.js:838 js/prefs.js:827 js/prefs.js:817
+#: js/prefs.js:817
 msgid "Please choose an OPML file first."
 msgstr "Veuillez d'abord sélectionner un fichier OPML."
 
-#: js/prefs.js:854 plugins/import_export/import_export.js:112
-msgid "Please choose the file first."
-msgstr "Veuillez d'abord choisir le fichier."
-
-#: js/prefs.js:1010 js/prefs.js:983 js/prefs.js:973
+#: js/prefs.js:973
 msgid "Reset to defaults?"
 msgstr "Revenir aux valeurs par défaut ?"
 
-#: js/prefs.js:1215 js/prefs.js:1102 js/prefs.js:1092
+#: js/prefs.js:1092
 msgid ""
 "Remove category %s? Any nested feeds would be placed into Uncategorized."
 msgstr ""
 
-#: js/prefs.js:1242 js/prefs.js:1129 js/prefs.js:1119
+#: js/prefs.js:1119
 msgid "Remove selected categories?"
 msgstr "Supprimer les catégories sélectionnées ?"
 
-#: js/prefs.js:1258 js/prefs.js:1145 js/prefs.js:1135
+#: js/prefs.js:1135
 msgid "No categories are selected."
 msgstr "Aucune catégorie sélectionnée."
 
-#: js/prefs.js:1266 js/prefs.js:1153 js/prefs.js:1143
+#: js/prefs.js:1143
 #, fuzzy
 msgid "Category title:"
 msgstr "Catégories"
 
-#: js/prefs.js:1297 js/prefs.js:1184 js/prefs.js:1174
+#: js/prefs.js:1174
 msgid "Feeds without recent updates"
 msgstr "Flux sans mise à jour récente"
 
-#: js/prefs.js:1346 js/prefs.js:1233 js/prefs.js:1223
+#: js/prefs.js:1223
 msgid "Replace current OPML publishing address with a new one?"
 msgstr "Remplacer l'adresse de publication OPML actuelle par une nouvelle ?"
 
-#: js/prefs.js:1455 js/prefs.js:1342 js/prefs.js:1332
+#: js/prefs.js:1332
 msgid "Rescore articles in selected feeds?"
 msgstr "Recalculer le score des articles des flux sélectionnés ?"
 
-#: js/prefs.js:1478 js/prefs.js:1365 js/prefs.js:1355
+#: js/prefs.js:1355
 msgid "Rescore all articles? This operation may take a lot of time."
 msgstr ""
 "Recalculer le score de tous les articles ? Cette opération peut prendre "
 "beaucoup de temps."
 
-#: js/prefs.js:1498 js/prefs.js:1385 js/prefs.js:1375
+#: js/prefs.js:1375
 msgid "Reset selected labels to default colors?"
 msgstr "Ré-initialiser les couleurs des étiquettes aux couleurs par défaut ?"
 
-#: js/prefs.js:1535 js/prefs.js:1422 js/prefs.js:1412
+#: js/prefs.js:1412
 msgid "Settings Profiles"
 msgstr "Paramètres des profils"
 
-#: js/prefs.js:1544 js/prefs.js:1431 js/prefs.js:1421
+#: js/prefs.js:1421
 msgid ""
 "Remove selected profiles? Active and default profiles will not be removed."
 msgstr ""
 "Supprimer les profils sélectionnés ? Les profils actifs et par défaut ne "
 "seront pas supprimés."
 
-#: js/prefs.js:1562 js/prefs.js:1449 js/prefs.js:1439
+#: js/prefs.js:1439
 msgid "No profiles are selected."
 msgstr "Aucun profil sélectionné."
 
-#: js/prefs.js:1570 js/prefs.js:1623 js/prefs.js:1457 js/prefs.js:1510
 #: js/prefs.js:1447 js/prefs.js:1500
 msgid "Activate selected profile?"
 msgstr "Activer le profil selectionné ?"
 
-#: js/prefs.js:1586 js/prefs.js:1639 js/prefs.js:1473 js/prefs.js:1526
 #: js/prefs.js:1463 js/prefs.js:1516
 msgid "Please choose a profile to activate."
 msgstr "Veuillez sélectionner un profil à activer"
 
-#: js/prefs.js:1647 js/prefs.js:1534 js/prefs.js:1524
+#: js/prefs.js:1524
 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr ""
 "Ceci va invalider toutes les URL de flux générées auparavant. Souhaitez-vous "
 "continuer ?"
 
-#: js/prefs.js:1666 js/prefs.js:1553 js/prefs.js:1543
+#: js/prefs.js:1543
 msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr ""
 "Ceci va invalider tous les articles partagés par URL. Souhaitez-vous "
 "continuer ?"
 
-#: js/prefs.js:1764 js/prefs.js:1651 js/prefs.js:1641
+#: js/prefs.js:1641
 msgid "Label Editor"
 msgstr "Editeur d'étiquette"
 
-#: js/prefs.js:1827 js/prefs.js:1714 js/prefs.js:1704
+#: js/prefs.js:1704
 msgid ""
 "This will clear your stored authentication information for Twitter. Continue?"
 msgstr ""
 "Cela va effacer les informations d'authentification pour Twitter. Voulez-"
 "vous continuer ?"
 
-#: js/prefs.js:1911 plugins/import_export/import_export.js:13
-msgid "Export Data"
-msgstr "Exporer les données"
-
-#: js/prefs.js:1938 plugins/import_export/import_export.js:40
-msgid ""
-"Finished, exported %d articles. You can download the data <a "
-"class='visibleLink' href='%u'>here</a>."
-msgstr ""
-"Terminé, %d articles exportés. Vous pouvez télécharger les données <a class="
-"\"visibleLink\" href=\"%u\">ici</a>."
-
-#: js/prefs.js:1991 plugins/import_export/import_export.js:93
-msgid "Data Import"
-msgstr ""
-
-#: js/prefs.js:2027 js/prefs.js:1794 js/prefs.js:1784
+#: js/prefs.js:1784
 msgid "Subscribing to feeds..."
 msgstr "Abonnement aux flux..."
 
-#: js/tt-rss.js:147 js/tt-rss.js:141 js/tt-rss.js:120
+#: js/prefs.js:1821
+msgid "Clear stored data for this plugin?"
+msgstr ""
+
+#: js/tt-rss.js:120
 msgid "Mark all articles as read?"
 msgstr "Marquer tous les articles comme lus ?"
 
-#: js/tt-rss.js:410 js/tt-rss.js:370 js/tt-rss.js:356
+#: js/tt-rss.js:356
 msgid "You can't unsubscribe from the category."
 msgstr "Vous ne pouvez pas vous désabonner de la catégorie."
 
-#: js/tt-rss.js:415 js/tt-rss.js:596 js/tt-rss.js:591 js/tt-rss.js:375
-#: js/tt-rss.js:525 js/tt-rss.js:361 js/tt-rss.js:511
+#: js/tt-rss.js:361 js/tt-rss.js:511
 msgid "Please select some feed first."
 msgstr "Veuillez d'abord sélectionner un flux."
 
-#: js/tt-rss.js:591 js/tt-rss.js:586 js/tt-rss.js:520 js/tt-rss.js:506
+#: js/tt-rss.js:506
 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:601 js/tt-rss.js:596 js/tt-rss.js:530 js/tt-rss.js:516
+#: js/tt-rss.js:516
 msgid "Rescore articles in %s?"
 msgstr "Recalculer le score des articles de %s ?"
 
-#: js/tt-rss.js:1062 js/tt-rss.js:883 js/tt-rss.js:825 js/tt-rss.js:830
+#: js/tt-rss.js:672
+#, fuzzy
+msgid "Please enable mail plugin first."
+msgstr "Veuillez d'abord sélectionner un flux."
+
+#: js/tt-rss.js:834
 msgid "New version available!"
 msgstr "Une nouvelle version est disponible !"
 
-#: js/viewfeed.js:108 js/viewfeed.js:104
+#: js/viewfeed.js:104
 #, fuzzy
 msgid "Cancel search"
 msgstr "Annuler"
 
-#: js/viewfeed.js:456 js/viewfeed.js:445 js/viewfeed.js:451 js/viewfeed.js:435
-#: plugins/digest/digest.js:257 plugins/digest/digest.js:696
+#: js/viewfeed.js:435 plugins/digest/digest.js:257
+#: plugins/digest/digest.js:696
 msgid "Unstar article"
 msgstr "Ne plus marquer comme remarquable"
 
-#: js/viewfeed.js:461 js/viewfeed.js:450 js/viewfeed.js:456 js/viewfeed.js:440
-#: plugins/digest/digest.js:259 plugins/digest/digest.js:700
+#: js/viewfeed.js:440 plugins/digest/digest.js:259
+#: plugins/digest/digest.js:700
 msgid "Star article"
 msgstr "Marquer comme remarquable"
 
-#: js/viewfeed.js:496 js/viewfeed.js:485 js/viewfeed.js:491 js/viewfeed.js:473
-#: plugins/digest/digest.js:262 plugins/digest/digest.js:731
+#: js/viewfeed.js:473 plugins/digest/digest.js:262
+#: plugins/digest/digest.js:731
 msgid "Unpublish article"
 msgstr "Ne plus publier l'article"
 
-#: js/viewfeed.js:676 js/viewfeed.js:704 js/viewfeed.js:731 js/viewfeed.js:793
-#: js/viewfeed.js:825 js/viewfeed.js:962 js/viewfeed.js:1005
-#: js/viewfeed.js:1055 js/viewfeed.js:2181 js/viewfeed.js:665
-#: js/viewfeed.js:693 js/viewfeed.js:720 js/viewfeed.js:782 js/viewfeed.js:814
-#: js/viewfeed.js:951 js/viewfeed.js:994 js/viewfeed.js:1044
-#: js/viewfeed.js:2154 js/viewfeed.js:671 js/viewfeed.js:699
-#: js/viewfeed.js:726 js/viewfeed.js:788 js/viewfeed.js:820 js/viewfeed.js:957
-#: js/viewfeed.js:1000 js/viewfeed.js:1050 js/viewfeed.js:2018
 #: js/viewfeed.js:674 js/viewfeed.js:702 js/viewfeed.js:729 js/viewfeed.js:791
 #: js/viewfeed.js:823 js/viewfeed.js:960 js/viewfeed.js:1003
 #: js/viewfeed.js:1053 js/viewfeed.js:1927 plugins/mail/mail.js:7
 msgid "No articles are selected."
 msgstr "Aucun article sélectionné."
 
-#: js/viewfeed.js:942 js/viewfeed.js:931 js/viewfeed.js:937 js/viewfeed.js:940
+#: js/viewfeed.js:940
 msgid "Mark all visible articles in %s as read?"
 msgstr "Marquer tous les articles visibles de %s comme lus ?"
 
-#: js/viewfeed.js:970 js/viewfeed.js:959 js/viewfeed.js:965 js/viewfeed.js:968
+#: js/viewfeed.js:968
 msgid "Delete %d selected articles in %s?"
 msgstr "Supprimer les %d articles sélectionnés de %s ?"
 
-#: js/viewfeed.js:972 js/viewfeed.js:961 js/viewfeed.js:967 js/viewfeed.js:970
+#: js/viewfeed.js:970
 msgid "Delete %d selected articles?"
 msgstr "Supprimer les %d articles sélectionnés ?"
 
-#: js/viewfeed.js:1014 js/viewfeed.js:1003 js/viewfeed.js:1009
 #: js/viewfeed.js:1012
 msgid "Archive %d selected articles in %s?"
 msgstr "Archiver les %d articles sélectionnés de %s ?"
 
-#: js/viewfeed.js:1017 js/viewfeed.js:1006 js/viewfeed.js:1012
 #: js/viewfeed.js:1015
 msgid "Move %d archived articles back?"
 msgstr "Restaurer les articles archivés ?"
 
-#: js/viewfeed.js:1061 js/viewfeed.js:1050 js/viewfeed.js:1056
 #: js/viewfeed.js:1059
 msgid "Mark %d selected articles in %s as read?"
 msgstr "Marquer %d articles sélectionnés de %s comme lus ?"
 
-#: js/viewfeed.js:1085 js/viewfeed.js:1074 js/viewfeed.js:1080
 #: js/viewfeed.js:1083
 msgid "Edit article Tags"
 msgstr "Modifier les étiquettes de l'article"
 
-#: js/viewfeed.js:1247 js/viewfeed.js:1236 js/viewfeed.js:1242
 #: js/viewfeed.js:1252
 msgid "No article is selected."
 msgstr "Aucun article sélectionné."
 
-#: js/viewfeed.js:1282 js/viewfeed.js:1271 js/viewfeed.js:1277
 #: js/viewfeed.js:1287
 msgid "No articles found to mark"
 msgstr "Aucun article à marquer"
 
-#: js/viewfeed.js:1284 js/viewfeed.js:1273 js/viewfeed.js:1279
 #: js/viewfeed.js:1289
 msgid "Mark %d article(s) as read?"
 msgstr "Marquer %d article(s) comme lu(s) ?"
 
-#: js/viewfeed.js:1402 js/viewfeed.js:1383
-msgid "Loading..."
-msgstr "Chargement en cours..."
-
-#: js/viewfeed.js:1891 js/viewfeed.js:1864 js/viewfeed.js:1734
 #: js/viewfeed.js:1744
 msgid "Open original article"
 msgstr "Ouvrir l'article original"
 
-#: js/viewfeed.js:1897 js/viewfeed.js:1870
-msgid "View in a tt-rss tab"
-msgstr "Voir dans un onglet de tt-rss"
-
-#: js/viewfeed.js:1905 js/viewfeed.js:1878 js/viewfeed.js:1742
-#: js/viewfeed.js:1752
-msgid "Mark above as read"
-msgstr "Marquer les articles au-dessus comme lus"
-
-#: js/viewfeed.js:1911 js/viewfeed.js:1884 js/viewfeed.js:1748
-#: js/viewfeed.js:1758
-msgid "Mark below as read"
-msgstr "Marquer les articles en-dessous comme lus"
-
-#: js/viewfeed.js:1967 js/viewfeed.js:1940 js/viewfeed.js:1804
 #: js/viewfeed.js:1814
 msgid "Remove label"
 msgstr "Supprimer l'étiquette"
 
-#: js/viewfeed.js:1991 js/viewfeed.js:1964 js/viewfeed.js:1828
 #: js/viewfeed.js:1838
 msgid "Playing..."
 msgstr "Lecture..."
 
-#: js/viewfeed.js:1992 js/viewfeed.js:1965 js/viewfeed.js:1829
 #: js/viewfeed.js:1839
 msgid "Click to pause"
 msgstr "Cliquez pour mettre en pause"
 
-#: js/viewfeed.js:2150 js/viewfeed.js:2123 js/viewfeed.js:1987
 #: js/viewfeed.js:1896
 #, fuzzy
 msgid "Please enter new score for selected articles:"
 msgstr "Supprimer les %d articles sélectionnés ?"
 
-#: js/viewfeed.js:2192 js/viewfeed.js:2165 js/viewfeed.js:2029
 #: js/viewfeed.js:1938
 #, fuzzy
 msgid "Please enter new score for this article:"
 msgstr "Veuillez saisir un titre pour cette catégorie :"
 
-#: js/functions.js:1887 js/functions.js:1891 js/functions.js:1897
-#: js/functions.js:1899
-msgid "Help"
-msgstr ""
-
-#: js/prefs.js:1831 js/prefs.js:1821
-msgid "Clear stored data for this plugin?"
-msgstr ""
-
-#: js/tt-rss.js:741 js/tt-rss.js:676 js/tt-rss.js:668
-#, fuzzy
-msgid "Please enable mail plugin first."
-msgstr "Veuillez d'abord sélectionner un flux."
-
-#: plugins/digest/digest_body.php:39
-msgid "Your browser doesn't support Javascript, which is required"
-msgstr ""
-
-#: plugins/nsfw/init.php:32 plugins/nsfw/init.php:43
-msgid "Not work safe (click to toggle)"
-msgstr ""
-
-#: plugins/nsfw/init.php:53
-msgid "NSFW Plugin"
-msgstr ""
-
-#: plugins/nsfw/init.php:80
-msgid "Tags to consider NSFW (comma-separated)"
-msgstr ""
-
-#: plugins/nsfw/init.php:101
-#, fuzzy
-msgid "Configuration saved."
-msgstr "La configuration a été enregistrée."
-
-#: plugins/owncloud/init.php:35
-msgid "Owncloud"
-msgstr ""
-
-#: plugins/owncloud/init.php:59
-msgid "Owncloud url"
-msgstr ""
-
 #: plugins/digest/digest.js:71
 msgid "Mark %d displayed articles as read?"
 msgstr "Marquer les %d articles affichés comme lus ?"
@@ -3258,6 +3224,26 @@ msgstr "Aucun flux non lu."
 msgid "Load more..."
 msgstr "Charger plus..."
 
+#: plugins/import_export/import_export.js:13
+msgid "Export Data"
+msgstr "Exporer les données"
+
+#: plugins/import_export/import_export.js:40
+msgid ""
+"Finished, exported %d articles. You can download the data <a "
+"class='visibleLink' href='%u'>here</a>."
+msgstr ""
+"Terminé, %d articles exportés. Vous pouvez télécharger les données <a class="
+"\"visibleLink\" href=\"%u\">ici</a>."
+
+#: plugins/import_export/import_export.js:93
+msgid "Data Import"
+msgstr ""
+
+#: plugins/import_export/import_export.js:112
+msgid "Please choose the file first."
+msgstr "Veuillez d'abord choisir le fichier."
+
 #: plugins/mail/mail.js:21
 msgid "Forward article by email"
 msgstr "Transférer l'article par email"
@@ -3292,6 +3278,97 @@ msgid ""
 "before continuing. Please type 'yes' to continue."
 msgstr ""
 
+#~ msgid "Comments?"
+#~ msgstr "Commentaires ?"
+
+#~ msgid "News"
+#~ msgstr "Actualités"
+
+#~ msgid "Move between feeds"
+#~ msgstr "Naviguer dans les flux"
+
+#~ msgid "Move between articles"
+#~ msgstr "Naviguer dans les articles"
+
+#~ msgid "Active article actions"
+#~ msgstr "Activer les actions de l'article"
+
+#~ msgid "Mark articles below/above active one as read"
+#~ msgstr ""
+#~ "Marquer les articles au-dessous/au-dessus de l'article actif comme lus"
+
+#~ msgid "Scroll article content"
+#~ msgstr "Faire déflier le contenu de l'article"
+
+#~ msgid "Other actions"
+#~ msgstr "Autres actions"
+
+#~ msgid "Display this help dialog"
+#~ msgstr "Afficher cette aide"
+
+#~ msgid "Multiple articles actions"
+#~ msgstr "Actions sur plusieurs articles"
+
+#, fuzzy
+#~ msgid "Select starred articles"
+#~ msgstr "Sélectionner les articles non lus"
+
+#~ msgid "Feed actions"
+#~ msgstr "Actions sur ce flux"
+
+#~ msgid "Mark feed as read"
+#~ msgstr "Marquer le flux comme lu"
+
+#~ msgid "If viewing category, (un)collapse it"
+#~ msgstr "Déployer/Contracter lors de la consultation des catégories"
+
+#~ msgid "Press any key to close this window."
+#~ msgstr "Appuyer sur une touche pour fermer cette fenêtre"
+
+#~ msgid "My Feeds"
+#~ msgstr "Mes flux"
+
+#~ msgid "Panel actions"
+#~ msgstr "Actions du panneau :"
+
+#~ msgid "Top 25 feeds"
+#~ msgstr "Top 25 des flux"
+
+#~ msgid "Edit feed categories"
+#~ msgstr "Modifier les catégories des flux"
+
+#~ msgid "Focus search (if present)"
+#~ msgstr "Focus sur la recherche (si affichée)"
+
+#~ msgid ""
+#~ "<b>Note:</b> not all actions may be available, depending on Tiny Tiny RSS "
+#~ "configuration and your access level."
+#~ msgstr ""
+#~ "<b>Note :</b> certaines actions peuvent ne pas être disponibles, selon la "
+#~ "configuration de Tiny Tiny RSS et vos permissions."
+
+#~ msgid "Open article in new tab"
+#~ msgstr "Ouvrir les articles dans un nouvel onglet"
+
+#~ msgid "Select theme"
+#~ msgstr "Sélectionner un thème"
+
+#~ msgid "Right-to-left content"
+#~ msgstr "Contenu écrit de droite à gauche"
+
+#, fuzzy
+#~ msgid "Cache content locally"
+#~ msgstr "Enregistrer localement les images"
+
+#~ msgid "Mark posts as updated on content change"
+#~ msgstr "Marquer les articles comme mis à jour quand leur contenu change"
+
+#~ msgid "Loading..."
+#~ msgstr "Chargement en cours..."
+
+#~ msgid "View in a tt-rss tab"
+#~ msgstr "Voir dans un onglet de tt-rss"
+
 #~ msgid "Magpie"
 #~ msgstr "Magpie"
 
diff --git a/locale/hu_HU/LC_MESSAGES/messages.mo b/locale/hu_HU/LC_MESSAGES/messages.mo
index 27a510929..7330db5f4 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 af55aea43..007a81343 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: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-17 19:37+0400\n"
+"POT-Creation-Date: 2013-03-19 10:14+0400\n"
 "PO-Revision-Date: 2013-03-16 22:33+0100\n"
 "Last-Translator: Zoltan Faludi <zoltan.faludi@gmail.com>\n"
 "Language-Team: HUNGARIAN\n"
@@ -18,79 +18,79 @@ msgstr ""
 "X-Poedit-Language: Hungarian\n"
 "X-Poedit-Country: HUNGARY\n"
 
-#: backend.php:67
+#: backend.php:71
 msgid "Use default"
 msgstr "Alapértelmezett beállítás"
 
-#: backend.php:68
+#: backend.php:72
 msgid "Never purge"
 msgstr "Sose töröld a régi híreket"
 
-#: backend.php:69
+#: backend.php:73
 msgid "1 week old"
 msgstr "1 hetes"
 
-#: backend.php:70
+#: backend.php:74
 msgid "2 weeks old"
 msgstr "2 hetes"
 
-#: backend.php:71
+#: backend.php:75
 msgid "1 month old"
 msgstr "1 hónapos"
 
-#: backend.php:72
+#: backend.php:76
 msgid "2 months old"
 msgstr "2 hónapos"
 
-#: backend.php:73
+#: backend.php:77
 msgid "3 months old"
 msgstr "3 hónapos"
 
-#: backend.php:76
+#: backend.php:80
 msgid "Default interval"
 msgstr "Frissítési intervallum:"
 
-#: backend.php:77 backend.php:87
+#: backend.php:81 backend.php:91
 msgid "Disable updates"
 msgstr "Frissítések kikapcsolása"
 
-#: backend.php:78 backend.php:88
+#: backend.php:82 backend.php:92
 msgid "Each 15 minutes"
 msgstr "Minden 15 percben"
 
-#: backend.php:79 backend.php:89
+#: backend.php:83 backend.php:93
 msgid "Each 30 minutes"
 msgstr "Minden 30 percben"
 
-#: backend.php:80 backend.php:90
+#: backend.php:84 backend.php:94
 msgid "Hourly"
 msgstr "Óránként"
 
-#: backend.php:81 backend.php:91
+#: backend.php:85 backend.php:95
 msgid "Each 4 hours"
 msgstr "Minden 4 órában"
 
-#: backend.php:82 backend.php:92
+#: backend.php:86 backend.php:96
 msgid "Each 12 hours"
 msgstr "Minden 12 órában"
 
-#: backend.php:83 backend.php:93
+#: backend.php:87 backend.php:97
 msgid "Daily"
 msgstr "Napi"
 
-#: backend.php:84 backend.php:94
+#: backend.php:88 backend.php:98
 msgid "Weekly"
 msgstr "Heti"
 
-#: backend.php:97 classes/pref/users.php:139
+#: backend.php:101 classes/pref/users.php:139
 msgid "User"
 msgstr "Felhasználó"
 
-#: backend.php:98
+#: backend.php:102
 msgid "Power User"
 msgstr "Kiemelt felhasználó"
 
-#: backend.php:99
+#: backend.php:103
 msgid "Administrator"
 msgstr "Adminisztrátor"
 
@@ -121,7 +121,7 @@ msgstr "A Tiny Tiny RSS adatbázis friss."
 #: db-updater.php:94 db-updater.php:163 db-updater.php:176 register.php:194
 #: register.php:239 register.php:252 register.php:267 register.php:286
 #: register.php:371 register.php:381 register.php:393
-#: classes/handler/public.php:637 classes/handler/public.php:725
+#: classes/handler/public.php:611 classes/handler/public.php:699
 msgid "Return to Tiny Tiny RSS"
 msgstr "Vissza az RSS-olvasóhoz"
 
@@ -259,195 +259,195 @@ msgstr ""
 "SQL eszképelési teszt sikertelen, ellenőrizze az adatbázis és a PHP "
 "bállításokat"
 
-#: index.php:108 index.php:150 index.php:236 prefs.php:86
-#: classes/backend.php:6 classes/pref/labels.php:296
-#: classes/pref/filters.php:602 classes/pref/feeds.php:1342
-#: plugins/digest/digest_body.php:45 js/viewfeed.js:1169 js/viewfeed.js:1158
-#: js/viewfeed.js:1164 js/viewfeed.js:1174
+#: index.php:117 index.php:147 index.php:252 prefs.php:79
+#: classes/backend.php:5 classes/pref/labels.php:296
+#: classes/pref/filters.php:609 classes/pref/feeds.php:1270
+#: plugins/digest/digest_body.php:45 js/viewfeed.js:1174
 msgid "Loading, please wait..."
 msgstr "Betöltés, kérem várjon..."
 
-#: index.php:118 plugins/digest/digest_body.php:56
-msgid "Hello,"
-msgstr "Üdv,"
+#: index.php:127 index.php:198
+msgid "Communication problem with server."
+msgstr ""
 
-#: index.php:120 prefs.php:29 prefs.php:108 help/main.php:73 help/prefs.php:8
-#: classes/pref/prefs.php:371
-msgid "Preferences"
-msgstr "Beállítások"
-
-#: index.php:124
-msgid "Comments?"
-msgstr "Hozzászólások?"
-
-#: index.php:128 mobile/mobile-functions.php:69
-#: mobile/mobile-functions.php:244 plugins/digest/digest_body.php:59
-msgid "Logout"
-msgstr "Kijelentkezés"
-
-#: index.php:134
+#: index.php:133 index.php:206
 msgid "New version of Tiny Tiny RSS is available!"
 msgstr "A Tiny Tiny RSS-nek elérhető egy újabb verziója!"
 
-#: index.php:157
-msgid "News"
-msgstr "Hírek"
-
-#: index.php:166
+#: index.php:161
 msgid "Collapse feedlist"
 msgstr "Hírcsatornalista összecsukása"
 
-#: index.php:169
+#: index.php:164
 msgid "Show articles"
 msgstr "Hírek megjelenítése"
 
-#: index.php:172
+#: index.php:167
 msgid "Adaptive"
 msgstr "Adaptív"
 
-#: index.php:173
+#: index.php:168
 msgid "All Articles"
 msgstr "Minden hír"
 
-#: index.php:174 classes/feeds.php:106
+#: index.php:169 include/functions.php:1912 classes/feeds.php:106
 msgid "Starred"
 msgstr "Csillagozott"
 
-#: index.php:175 classes/feeds.php:107
+#: index.php:170 include/functions.php:1913 classes/feeds.php:107
 msgid "Published"
 msgstr "Publikált"
 
-#: index.php:176 classes/feeds.php:93 classes/feeds.php:105
+#: index.php:171 classes/feeds.php:93 classes/feeds.php:105
 msgid "Unread"
 msgstr "Olvasatlan"
 
-#: index.php:177
+#: index.php:172
 msgid "Ignore Scoring"
 msgstr "Pontozás memmőzése"
 
-#: index.php:178
+#: index.php:173
 msgid "Updated"
 msgstr "Frissített"
 
-#: index.php:181
+#: index.php:176
 msgid "Sort articles"
 msgstr "Hírek rendezése"
 
-#: index.php:184 classes/pref/prefs.php:462
+#: index.php:179
 msgid "Default"
 msgstr "Alapértelmezett"
 
-#: index.php:185
+#: index.php:180
 msgid "Date"
 msgstr "Dátum"
 
-#: index.php:186 include/localized_schema.php:3
+#: index.php:181 include/localized_schema.php:3
 msgid "Title"
 msgstr "Cím"
 
-#: index.php:187
+#: index.php:182
 msgid "Score"
 msgstr "Pontszám"
 
-#: index.php:192 classes/pref/feeds.php:539 classes/pref/feeds.php:786
+#: index.php:187 classes/pref/feeds.php:535 classes/pref/feeds.php:746
 msgid "Update"
 msgstr "Frissítés"
 
-#: index.php:196 index.php:211 include/localized_schema.php:10
-#: classes/feeds.php:111 classes/feeds.php:127 js/FeedTree.js:128
-#: js/FeedTree.js:156 plugins/digest/digest.js:630
+#: index.php:191 index.php:221 include/functions.php:1903
+#: include/localized_schema.php:10 classes/feeds.php:111 classes/feeds.php:131
+#: js/FeedTree.js:128 js/FeedTree.js:156 plugins/digest/digest.js:630
 msgid "Mark as read"
 msgstr "Megjelölés olvasottként"
 
-#: index.php:202 classes/feeds.php:101
+#: index.php:211
 msgid "Actions..."
 msgstr "Műveletek"
 
-#: index.php:204
+#: index.php:213
+#, fuzzy
+msgid "Preferences..."
+msgstr "Beállítások"
+
+#: index.php:214
 msgid "Search..."
 msgstr "Keresés..."
 
-#: index.php:205
+#: index.php:215
 msgid "Feed actions:"
 msgstr "Műveletek hírcsatornákkal:"
 
-#: index.php:206 classes/handler/public.php:567
+#: index.php:216 classes/handler/public.php:541
 msgid "Subscribe to feed..."
 msgstr "Feliratkozás hírcsatornára..."
 
-#: index.php:207
+#: index.php:217
 msgid "Edit this feed..."
 msgstr "Hírcsatorna szerkesztése..."
 
-#: index.php:208
+#: index.php:218
 msgid "Rescore feed"
 msgstr "Hírcsatorna újrapontozása"
 
-#: index.php:209 classes/pref/feeds.php:712 classes/pref/feeds.php:1315
+#: index.php:219 classes/pref/feeds.php:672 classes/pref/feeds.php:1243
 #: js/PrefFeedTree.js:73
 msgid "Unsubscribe"
 msgstr "Leiratkozás"
 
-#: index.php:210
+#: index.php:220
 msgid "All feeds:"
 msgstr "Az összes hírcsatorna:"
 
-#: index.php:212 help/main.php:56
+#: index.php:222
 msgid "(Un)hide read feeds"
 msgstr "Olvasottak rejtése/mutatása"
 
-#: index.php:213
+#: index.php:223
 msgid "Other actions:"
 msgstr "Egyéb műveletek:"
 
-#: index.php:215
+#: index.php:225
 msgid "Switch to digest..."
 msgstr "Váltás áttekintő módba..."
 
-#: index.php:217
+#: index.php:227
 msgid "Show tag cloud..."
 msgstr "Címkefelhő megjelenítése..."
 
-#: index.php:218
+#: index.php:229 include/functions.php:1890
+#, fuzzy
+msgid "Toggle widescreen mode"
+msgstr "Csillagoz"
+
+#: index.php:231
 msgid "Select by tags..."
 msgstr "Kijelölés címkék alapján"
 
-#: index.php:219
+#: index.php:232
 msgid "Create label..."
 msgstr "Új címke létrehozása..."
 
-#: index.php:220
+#: index.php:233
 msgid "Create filter..."
 msgstr "Szűrő létrehozása..."
 
-#: index.php:221
+#: index.php:234
 msgid "Keyboard shortcuts help"
 msgstr "Billentyűparancsok súgója"
 
-#: prefs.php:99
+#: index.php:236 mobile/mobile-functions.php:69
+#: mobile/mobile-functions.php:244 plugins/digest/digest_body.php:59
+msgid "Logout"
+msgstr "Kijelentkezés"
+
+#: prefs.php:28 prefs.php:99 include/functions.php:1915
+#: classes/pref/prefs.php:371
+msgid "Preferences"
+msgstr "Beállítások"
+
+#: prefs.php:90
 msgid "Keyboard shortcuts"
 msgstr "Billentyűparancsok"
 
-#: prefs.php:100 help/prefs.php:14
+#: prefs.php:91
 msgid "Exit preferences"
 msgstr "Kilépés a beállításokból"
 
-#: prefs.php:111 classes/pref/feeds.php:101 classes/pref/feeds.php:1220
-#: classes/pref/feeds.php:1283
+#: prefs.php:102 classes/pref/feeds.php:100 classes/pref/feeds.php:1148
+#: classes/pref/feeds.php:1211
 msgid "Feeds"
 msgstr "Hírcsatornák"
 
-#: prefs.php:114 help/prefs.php:11 classes/pref/filters.php:110
+#: prefs.php:105 classes/pref/filters.php:117
 msgid "Filters"
 msgstr "Szűrők"
 
-#: prefs.php:117 help/prefs.php:12 mobile/mobile-functions.php:205
-#: include/functions.php:1189 include/functions.php:1836
-#: classes/pref/labels.php:90
+#: prefs.php:108 mobile/mobile-functions.php:205 include/functions.php:1118
+#: include/functions.php:1739 classes/pref/labels.php:90
 msgid "Labels"
 msgstr "Címkék"
 
-#: prefs.php:121 help/prefs.php:13
+#: prefs.php:112
 msgid "Users"
 msgstr "Felhasználók"
 
@@ -509,242 +509,22 @@ msgstr "Felhasználói fiók sikeresen létrehozva"
 msgid "New user registrations are currently closed."
 msgstr "Új felhasználók regisztrációja jelenleg nem engedélyezett."
 
-#: update.php:38
+#: update.php:37
 msgid "Tiny Tiny RSS data update script."
 msgstr "A Tiny Tiny RSS adatbázis frissítő szkript."
 
-#: help/main.php:1 help/prefs.php:1
-msgid "Keyboard Shortcuts"
-msgstr "Billentyűparancsok"
-
-#: help/main.php:5
-msgid "Navigation"
-msgstr "Navigáció"
-
-#: help/main.php:8
-msgid "Move between feeds"
-msgstr "Hírcsatornák közötti mozgás"
-
-#: help/main.php:9
-msgid "Move between articles"
-msgstr "Mozgás hírek között"
-
-#: help/main.php:10
-msgid "Show search dialog"
-msgstr "Keresőmező megjelenítése"
-
-#: help/main.php:13
-msgid "Active article actions"
-msgstr "Aktív hírre vonatkozó műveletek"
-
-#: help/main.php:16
-msgid "Toggle starred"
-msgstr "Csillagoz"
-
-#: help/main.php:17
-msgid "Toggle published"
-msgstr "Publikált"
-
-#: help/main.php:18
-msgid "Toggle unread"
-msgstr "Olvasatlannak jelöl"
-
-#: help/main.php:19
-msgid "Edit tags"
-msgstr "Címkék szerkesztése"
-
-#: help/main.php:20
-#, fuzzy
-msgid "Dismiss selected articles"
-msgstr "Eltávolítja a kijelölt híreket a címke alól?"
-
-#: help/main.php:21
-#, fuzzy
-msgid "Dismiss read articles"
-msgstr "Látható olvasott hírek elrejtése"
-
-#: help/main.php:22
-msgid "Open article in new window"
-msgstr "Hír megnyitása új ablakban"
-
-#: help/main.php:23
-msgid "Mark articles below/above active one as read"
-msgstr "Az aktív hír fölöttit/alattit olvasottnak jelöli"
-
-#: help/main.php:24
-msgid "Scroll article content"
-msgstr "Hírtartalom görgetése"
-
-#: help/main.php:25
-msgid "Email article"
-msgstr "Hír küldése emailben"
-
-#: help/main.php:29 help/prefs.php:30
-msgid "Other actions"
-msgstr "Egyéb műveletek"
-
-#: help/main.php:32
-msgid "Select article under mouse cursor"
-msgstr "Az egérkurzor alatti hír kiválasztása"
-
-#: help/main.php:33 help/prefs.php:26 classes/pref/labels.php:281
-msgid "Create label"
-msgstr "Címke létrehozása"
-
-#: help/main.php:34 help/prefs.php:25 classes/pref/filters.php:580
-msgid "Create filter"
-msgstr "Szűrő létrehozása"
-
-#: help/main.php:35
-msgid "Collapse sidebar"
-msgstr "Oldalablak összecsukása"
-
-#: help/main.php:36 help/prefs.php:34
-msgid "Display this help dialog"
-msgstr "A jelenlegi súgóablak megjelenítése"
-
-#: help/main.php:41
-#, fuzzy
-msgid "Multiple articles actions"
-msgstr "Az összes hír"
-
-#: help/main.php:44
-msgid "Select all articles"
-msgstr "Minden hír kijelölése"
-
-#: help/main.php:45
-msgid "Select unread articles"
-msgstr "Olvasatlan hírek kijelölése"
-
-#: help/main.php:46
-msgid "Select starred articles"
-msgstr "Csillagozott hírek kijelölése"
-
-#: help/main.php:47
-msgid "Select published articles"
-msgstr "Publikált hírek kijlölése"
-
-#: help/main.php:48
-msgid "Invert article selection"
-msgstr "Fordított kijelölés"
-
-#: help/main.php:49
-msgid "Deselect all articles"
-msgstr "Kijelölés eltávolítása"
-
-#: help/main.php:52
-msgid "Feed actions"
-msgstr "Hírcsatorna-műveletek"
-
-#: help/main.php:55
-msgid "Refresh active feed"
-msgstr "Aktív hírcsatorna frissítése"
-
-#: help/main.php:57 help/prefs.php:22 classes/pref/feeds.php:1286
-msgid "Subscribe to feed"
-msgstr "Feliratkozás hírcsatornára"
-
-#: help/main.php:58 js/FeedTree.js:135 js/PrefFeedTree.js:67
-msgid "Edit feed"
-msgstr "Hírcsatorna szerkesztése"
-
-#: help/main.php:59
-msgid "Mark feed as read"
-msgstr "Hírcsatorna megjelölése olvasottként"
-
-#: help/main.php:60
-msgid "Reverse headlines order"
-msgstr "Fordított cím sorrend"
-
-#: help/main.php:61 js/FeedTree.js:170
-msgid "Mark all feeds as read"
-msgstr "Minden hírcsatornát olvasottként jelöl"
-
-#: help/main.php:62
-msgid "If viewing category, (un)collapse it"
-msgstr "Ha kategóriát böngész, csukja össze/nyissa szét"
-
-#: help/main.php:65 help/prefs.php:5
-msgid "Go to..."
-msgstr "Ugrás ide..."
-
-#: help/main.php:68 include/functions.php:1893
-msgid "All articles"
-msgstr "Az összes hír"
-
-#: help/main.php:69 include/functions.php:1891
-msgid "Fresh articles"
-msgstr "Friss hírek"
-
-#: help/main.php:70 include/functions.php:1887
-msgid "Starred articles"
-msgstr "Csillagozott hírek"
-
-#: help/main.php:71 include/functions.php:1889
-msgid "Published articles"
-msgstr "Publikált hírek"
-
-#: help/main.php:72
-msgid "Tag cloud"
-msgstr "Címkefelhő"
-
-#: help/main.php:79
-msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
-msgstr ""
-"További tippek a felhasználói felülethez elérhetők a Tiny Tiny RSS wikiben."
-
-#: help/main.php:81 help/prefs.php:41
-msgid "Press any key to close this window."
-msgstr "Az ablak bezárásához nyomjon meg egy billentyűt!"
-
-#: help/prefs.php:9
-msgid "My Feeds"
-msgstr "Saját hírcsatornák"
-
-#: help/prefs.php:10
-msgid "Other Feeds"
-msgstr "Egyéb hírcsatornák"
-
-#: help/prefs.php:19
-msgid "Panel actions"
-msgstr "Panelműveletek"
-
-#: help/prefs.php:23
-msgid "Top 25 feeds"
-msgstr "A legfelső 25 hírcsatorna"
-
-#: help/prefs.php:24
-msgid "Edit feed categories"
-msgstr "Kategóriák szerkesztése"
-
-#: help/prefs.php:27 classes/pref/users.php:386
-msgid "Create user"
-msgstr "Felhasználó létrehozás"
-
-#: help/prefs.php:33
-msgid "Focus search (if present)"
-msgstr ""
-
-#: help/prefs.php:39
-msgid ""
-"<b>Note:</b> not all actions may be available, depending on Tiny Tiny RSS "
-"configuration and your access level."
-msgstr ""
-"<b>Megjegyzés:</b> a Tiny Tiny RSS beállításaitól és a hozzáférési szinttől "
-"függően nem minden művelet lesz elérhető."
-
 #: mobile/login_form.php:28 include/login_form.php:209
-#: classes/handler/public.php:495
+#: classes/handler/public.php:469
 msgid "Log in"
 msgstr "Belépés"
 
 #: mobile/login_form.php:40 include/login_form.php:169
-#: classes/handler/public.php:479
+#: classes/handler/public.php:453
 msgid "Login:"
 msgstr "Felhasználó:"
 
 #: mobile/login_form.php:45 include/login_form.php:178
-#: classes/handler/public.php:482
+#: classes/handler/public.php:456
 msgid "Password:"
 msgstr "Jelszó:"
 
@@ -759,8 +539,8 @@ msgstr "Szokásos verzió használata"
 msgid "Home"
 msgstr "Kezdőlap"
 
-#: mobile/mobile-functions.php:178 include/functions.php:1187
-#: include/functions.php:1834
+#: mobile/mobile-functions.php:178 include/functions.php:1116
+#: include/functions.php:1737
 msgid "Special"
 msgstr "Kiemelt"
 
@@ -773,12 +553,12 @@ msgid "Enable categories"
 msgstr "Kategóriák engedélyezése"
 
 #: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36
-#: mobile/prefs.php:41 mobile/prefs.php:46
+#: mobile/prefs.php:41 mobile/prefs.php:46 mobile/prefs.php:51
 msgid "ON"
 msgstr "BE"
 
 #: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36
-#: mobile/prefs.php:41 mobile/prefs.php:46
+#: mobile/prefs.php:41 mobile/prefs.php:46 mobile/prefs.php:51
 msgid "OFF"
 msgstr "KI"
 
@@ -798,146 +578,334 @@ msgstr "Olvasott hírek és hírcsatornák elrejtése"
 msgid "Sort feeds by unread count"
 msgstr "Hírcsatornák rendezése olvasatlan hírek száma szerint"
 
-#: include/functions.php:564
-#, php-format
-msgid "Fatal: authentication module %s not found."
-msgstr "Hiba: %s hitelesítési modul nem található."
+#: mobile/prefs.php:50 include/localized_schema.php:45
+msgid "Reverse headline order (oldest first)"
+msgstr "Fordított hírcím-sorrend (régiebbiek előbb)"
 
-#: include/functions.php:682
-msgid "Session failed to validate (incorrect IP)"
-msgstr "Nem sikerült érvényesíteni a munkamenetet (érvénytelen IP)"
-
-#: include/functions.php:1198 include/functions.php:1737
-#: include/functions.php:1822 include/functions.php:1844
-#: include/functions.php:2699 classes/opml.php:416 classes/pref/feeds.php:193
+#: include/digest.php:131 include/functions.php:1127
+#: include/functions.php:1640 include/functions.php:1725
+#: include/functions.php:1747 classes/opml.php:416 classes/pref/feeds.php:188
 msgid "Uncategorized"
 msgstr "Kategorizálatlan"
 
-#: include/functions.php:1686 classes/dlg.php:387 classes/pref/filters.php:361
-msgid "All feeds"
-msgstr "Összes hírcsatorna"
-
-#: include/functions.php:1895
-msgid "Archived articles"
-msgstr "Archivált hírek"
-
-#: include/functions.php:1897
-msgid "Recently read"
-msgstr "Legutóbb olvasott"
-
-#: include/functions.php:2346
-#, php-format
-msgid "Search results: %s"
-msgstr "Keresési eredmények: %s"
-
-#: include/functions.php:3067 js/viewfeed.js:1998 js/viewfeed.js:1971
-#: js/viewfeed.js:1835 js/viewfeed.js:1845
-msgid "Click to play"
-msgstr "Kattintson a lejátszáshoz"
-
-#: include/functions.php:3068 js/viewfeed.js:1997 js/viewfeed.js:1970
-#: js/viewfeed.js:1834 js/viewfeed.js:1844
-msgid "Play"
-msgstr "Lejátszás"
-
-#: include/functions.php:3203
-msgid " - "
-msgstr "-"
-
-#: include/functions.php:3232 include/functions.php:4028 classes/rpc.php:414
-msgid "no tags"
-msgstr "nincs címke"
-
-#: include/functions.php:3242 classes/feeds.php:680
-msgid "Edit tags for this article"
-msgstr "Címkék hozzáadása a hírhez"
-
-#: include/functions.php:3252 classes/feeds.php:707
-msgid "Open article in new tab"
-msgstr "Hír megnyitása új fülön"
-
-#: include/functions.php:3263 classes/feeds.php:718
-msgid "Close article"
-msgstr "Hír bezárása"
-
-#: include/functions.php:3280 classes/feeds.php:616
-msgid "Originally from:"
-msgstr "Eredeti innen:"
-
-#: include/functions.php:3293 classes/feeds.php:629 classes/pref/feeds.php:511
-msgid "Feed URL"
-msgstr "Hírcsatorna URL"
-
-#: include/functions.php:3308 classes/feeds.php:68
-msgid "Visit the website"
-msgstr "Weboldal megtekintése"
-
-#: include/functions.php:3327
-msgid "Related"
-msgstr "Kapcsolódik"
-
-#: include/functions.php:3361 classes/dlg.php:30 classes/dlg.php:61
-#: classes/dlg.php:180 classes/dlg.php:203 classes/dlg.php:240
-#: classes/dlg.php:524 classes/dlg.php:559 classes/dlg.php:590
-#: classes/dlg.php:623 classes/dlg.php:724 classes/pref/users.php:106
-#: classes/pref/filters.php:101 classes/pref/feeds.php:1638
-#: classes/pref/feeds.php:1709 plugins/share/share.php:61
-#: plugins/updater/updater.php:301 plugins/updater/init.php:323
-msgid "Close this window"
-msgstr "Ablak bezárása"
-
-#: include/functions.php:4053
-msgid "(edit note)"
-msgstr "(jegyzet szerkesztése)"
-
-#: include/functions.php:4525
-msgid "No feed selected."
-msgstr "Nincs kiválasztott hírcsatorna."
-
-#: include/functions.php:4535 classes/feeds.php:766
-#, php-format
-msgid "Feeds last updated at %s"
-msgstr "Hírcsatornák utolsó frissítése: %s"
-
-#: include/functions.php:4545 classes/feeds.php:776
-msgid "Some feeds have update errors (click for details)"
-msgstr ""
-"Néhány hírcsatorna frissítésével gond akadt. (Kattints ide a részletekhez!)"
-
-#: include/functions.php:4689
-msgid "unknown type"
-msgstr "ismeretlen hírcsatornatípus"
-
-#: include/functions.php:4731
-msgid "Attachments"
-msgstr "Csatolmányok:"
-
-#: include/functions.php:5191
+#: include/feedbrowser.php:83
 #, php-format
 msgid "%d archived articles"
 msgstr "%d archivált hír"
 
-#: include/functions.php:5215
+#: include/feedbrowser.php:107
 msgid "No feeds found."
 msgstr "Nem található hírcsatorna."
 
-#: include/functions.php:5261 plugins/import_export/init.php:221
-msgid "Could not import: incorrect schema version."
-msgstr "Nem sikerült az importálás: érvénytelen séma verzió."
+#: include/functions.php:698
+msgid "Session failed to validate (incorrect IP)"
+msgstr "Nem sikerült érvényesíteni a munkamenetet (érvénytelen IP)"
 
-#: include/functions.php:5266 plugins/import_export/init.php:226
-msgid "Could not import: unrecognized document format."
-msgstr "Nem sikerült az importálás: ismeretlen dokumentum formátum."
+#: include/functions.php:1589 classes/dlg.php:371 classes/pref/filters.php:368
+msgid "All feeds"
+msgstr "Összes hírcsatorna"
 
-#: include/functions.php:5425
-#, php-format
-msgid "Finished: %d articles processed, %d imported, %d feeds created."
+#: include/functions.php:1790
+msgid "Starred articles"
+msgstr "Csillagozott hírek"
+
+#: include/functions.php:1792
+msgid "Published articles"
+msgstr "Publikált hírek"
+
+#: include/functions.php:1794
+msgid "Fresh articles"
+msgstr "Friss hírek"
+
+#: include/functions.php:1796 include/functions.php:1910
+msgid "All articles"
+msgstr "Az összes hír"
+
+#: include/functions.php:1798
+msgid "Archived articles"
+msgstr "Archivált hírek"
+
+#: include/functions.php:1800
+msgid "Recently read"
+msgstr "Legutóbb olvasott"
+
+#: include/functions.php:1867
+msgid "Navigation"
+msgstr "Navigáció"
+
+#: include/functions.php:1868
+#, fuzzy
+msgid "Open next feed"
+msgstr "Hírcsatorna végén mutassa a következő hírcsatornát"
+
+#: include/functions.php:1869
+msgid "Open previous feed"
 msgstr ""
-"Elkészült: %d hír feldolgozva, %d importálva, %d hírcsatorna létrehozva."
 
-#: include/functions.php:5431 plugins/import_export/init.php:391
-msgid "Could not load XML document."
-msgstr "Az XML dokumentum nem tölthető be."
+#: include/functions.php:1870
+#, fuzzy
+msgid "Open next article"
+msgstr "Eredeti hír megjelenítése"
+
+#: include/functions.php:1871
+#, fuzzy
+msgid "Open previous article"
+msgstr "Eredeti hír megjelenítése"
+
+#: include/functions.php:1872
+msgid "Open next article (don't scroll long articles)"
+msgstr ""
+
+#: include/functions.php:1873
+msgid "Open previous article (don't scroll long articles)"
+msgstr ""
+
+#: include/functions.php:1874
+msgid "Show search dialog"
+msgstr "Keresőmező megjelenítése"
+
+#: include/functions.php:1875
+#, fuzzy
+msgid "Article"
+msgstr "Minden hír"
+
+#: include/functions.php:1876
+msgid "Toggle starred"
+msgstr "Csillagoz"
+
+#: include/functions.php:1877
+msgid "Toggle published"
+msgstr "Publikált"
+
+#: include/functions.php:1878
+msgid "Toggle unread"
+msgstr "Olvasatlannak jelöl"
+
+#: include/functions.php:1879
+msgid "Edit tags"
+msgstr "Címkék szerkesztése"
+
+#: include/functions.php:1880
+#, fuzzy
+msgid "Dismiss selected"
+msgstr "Eltávolítja a kijelölt híreket a címke alól?"
+
+#: include/functions.php:1881
+#, fuzzy
+msgid "Dismiss read"
+msgstr "Látható olvasott hírek elrejtése"
+
+#: include/functions.php:1882
+#, fuzzy
+msgid "Open in new window"
+msgstr "Hír megnyitása új ablakban"
+
+#: include/functions.php:1883 js/viewfeed.js:1758
+msgid "Mark below as read"
+msgstr "Olvasottnak jel ez alatt"
+
+#: include/functions.php:1884 js/viewfeed.js:1752
+msgid "Mark above as read"
+msgstr "Olvasottnak jel ez fölött"
+
+#: include/functions.php:1885
+#, fuzzy
+msgid "Scroll down"
+msgstr "Kész."
+
+#: include/functions.php:1886
+msgid "Scroll up"
+msgstr ""
+
+#: include/functions.php:1887
+#, fuzzy
+msgid "Select article under cursor"
+msgstr "Az egérkurzor alatti hír kiválasztása"
+
+#: include/functions.php:1888
+msgid "Email article"
+msgstr "Hír küldése emailben"
+
+#: include/functions.php:1889 plugins/close_button/init.php:24
+msgid "Close article"
+msgstr "Hír bezárása"
+
+#: include/functions.php:1891
+#, fuzzy
+msgid "Article selection"
+msgstr "Fordított kijelölés"
+
+#: include/functions.php:1892
+msgid "Select all articles"
+msgstr "Minden hír kijelölése"
+
+#: include/functions.php:1893
+#, fuzzy
+msgid "Select unread"
+msgstr "Olvasatlan hírek kijelölése"
+
+#: include/functions.php:1894
+#, fuzzy
+msgid "Select starred"
+msgstr "Csillagoz"
+
+#: include/functions.php:1895
+#, fuzzy
+msgid "Select published"
+msgstr "Publikált hírek kijlölése"
+
+#: include/functions.php:1896
+#, fuzzy
+msgid "Invert selection"
+msgstr "Fordított kijelölés"
+
+#: include/functions.php:1897
+#, fuzzy
+msgid "Deselect everything"
+msgstr "Kijelölés eltávolítása"
+
+#: include/functions.php:1898 classes/pref/feeds.php:488
+#: classes/pref/feeds.php:707
+msgid "Feed"
+msgstr "Hírcsatorna"
+
+#: include/functions.php:1899
+#, fuzzy
+msgid "Refresh current feed"
+msgstr "Aktív hírcsatorna frissítése"
+
+#: include/functions.php:1900
+#, fuzzy
+msgid "Un/hide read feeds"
+msgstr "Olvasottak rejtése/mutatása"
+
+#: include/functions.php:1901 classes/pref/feeds.php:1214
+msgid "Subscribe to feed"
+msgstr "Feliratkozás hírcsatornára"
+
+#: include/functions.php:1902 js/FeedTree.js:135 js/PrefFeedTree.js:67
+msgid "Edit feed"
+msgstr "Hírcsatorna szerkesztése"
+
+#: include/functions.php:1904
+#, fuzzy
+msgid "Reverse headlines"
+msgstr "Fordított cím sorrend"
+
+#: include/functions.php:1905
+#, fuzzy
+msgid "Debug feed update"
+msgstr "Frissítések kikapcsolása"
+
+#: include/functions.php:1906 js/FeedTree.js:170
+msgid "Mark all feeds as read"
+msgstr "Minden hírcsatornát olvasottként jelöl"
+
+#: include/functions.php:1907
+#, fuzzy
+msgid "Un/collapse current category"
+msgstr "Hozzáadás a következő kategóriához:"
+
+#: include/functions.php:1908
+#, fuzzy
+msgid "Toggle combined mode"
+msgstr "Publikált"
+
+#: include/functions.php:1909
+#, fuzzy
+msgid "Go to"
+msgstr "Ugrás ide..."
+
+#: include/functions.php:1911
+msgid "Fresh"
+msgstr ""
+
+#: include/functions.php:1914
+msgid "Tag cloud"
+msgstr "Címkefelhő"
+
+#: include/functions.php:1916
+#, fuzzy
+msgid "Other"
+msgstr "Egyéb hírcsatornák"
+
+#: include/functions.php:1917 classes/pref/labels.php:281
+msgid "Create label"
+msgstr "Címke létrehozása"
+
+#: include/functions.php:1918 classes/pref/filters.php:587
+msgid "Create filter"
+msgstr "Szűrő létrehozása"
+
+#: include/functions.php:1919
+#, fuzzy
+msgid "Un/collapse sidebar"
+msgstr "Oldalablak összecsukása"
+
+#: include/functions.php:1920
+#, fuzzy
+msgid "Show help dialog"
+msgstr "Keresőmező megjelenítése"
+
+#: include/functions.php:2400
+#, php-format
+msgid "Search results: %s"
+msgstr "Keresési eredmények: %s"
+
+#: include/functions.php:2824 js/viewfeed.js:1845
+msgid "Click to play"
+msgstr "Kattintson a lejátszáshoz"
+
+#: include/functions.php:2825 js/viewfeed.js:1844
+msgid "Play"
+msgstr "Lejátszás"
+
+#: include/functions.php:2945
+msgid " - "
+msgstr "-"
+
+#: include/functions.php:2967 include/functions.php:3284 classes/rpc.php:359
+msgid "no tags"
+msgstr "nincs címke"
+
+#: include/functions.php:2977 classes/feeds.php:645
+msgid "Edit tags for this article"
+msgstr "Címkék hozzáadása a hírhez"
+
+#: include/functions.php:3006 classes/feeds.php:600
+msgid "Originally from:"
+msgstr "Eredeti innen:"
+
+#: include/functions.php:3019 classes/feeds.php:613 classes/pref/feeds.php:507
+msgid "Feed URL"
+msgstr "Hírcsatorna URL"
+
+#: include/functions.php:3048
+msgid "Related"
+msgstr "Kapcsolódik"
+
+#: include/functions.php:3075 classes/dlg.php:43 classes/dlg.php:162
+#: classes/dlg.php:185 classes/dlg.php:222 classes/dlg.php:508
+#: classes/dlg.php:543 classes/dlg.php:574 classes/dlg.php:608
+#: classes/dlg.php:620 classes/backend.php:105 classes/pref/users.php:106
+#: classes/pref/filters.php:108 classes/pref/feeds.php:1527
+#: classes/pref/feeds.php:1598 plugins/import_export/init.php:407
+#: plugins/import_export/init.php:431 plugins/share/init.php:67
+#: plugins/updater/init.php:329
+msgid "Close this window"
+msgstr "Ablak bezárása"
+
+#: include/functions.php:3309
+msgid "(edit note)"
+msgstr "(jegyzet szerkesztése)"
+
+#: include/functions.php:3542
+msgid "unknown type"
+msgstr "ismeretlen hírcsatornatípus"
+
+#: include/functions.php:3592
+msgid "Attachments"
+msgstr "Csatolmányok:"
 
 #: include/localized_schema.php:4
 msgid "Title or Content"
@@ -963,9 +931,8 @@ msgstr "Hír törlése"
 msgid "Set starred"
 msgstr "Csillagoz"
 
-#: include/localized_schema.php:12 js/viewfeed.js:501 js/viewfeed.js:490
-#: js/viewfeed.js:496 js/viewfeed.js:478 plugins/digest/digest.js:264
-#: plugins/digest/digest.js:736
+#: include/localized_schema.php:12 js/viewfeed.js:478
+#: plugins/digest/digest.js:264 plugins/digest/digest.js:736
 msgid "Publish article"
 msgstr "Hír publikálása"
 
@@ -973,8 +940,7 @@ msgstr "Hír publikálása"
 msgid "Assign tags"
 msgstr "Címke hozzáadása"
 
-#: include/localized_schema.php:14 js/viewfeed.js:1962 js/viewfeed.js:1935
-#: js/viewfeed.js:1799 js/viewfeed.js:1809
+#: include/localized_schema.php:14 js/viewfeed.js:1809
 msgid "Assign label"
 msgstr "Címke hozzáadása"
 
@@ -1123,10 +1089,6 @@ msgstr "Hírcsatorna végén mutassa a következő hírcsatornát"
 msgid "Sort feeds by unread articles count"
 msgstr "Hírcsatornák rendezése olvasatlan hírek száma alapján"
 
-#: include/localized_schema.php:45
-msgid "Reverse headline order (oldest first)"
-msgstr "Fordított hírcím-sorrend (régiebbiek előbb)"
-
 #: include/localized_schema.php:46
 msgid "Enable e-mail digest"
 msgstr "Hírösszefoglaló e-mail elküldésének engedélyezése"
@@ -1173,7 +1135,8 @@ msgid "Group headlines in virtual feeds"
 msgstr "Hírcímek csoportosítása virtuális hírcsatornákba"
 
 #: include/localized_schema.php:57
-msgid "Do not show images in articles"
+#, fuzzy
+msgid "Hide images in articles"
 msgstr "Képek rejtése a hírekben"
 
 #: include/localized_schema.php:58
@@ -1184,8 +1147,7 @@ msgstr "Külső API engedélyezése"
 msgid "User timezone"
 msgstr "Felhasználó időzónája"
 
-#: include/localized_schema.php:60 js/prefs.js:1856 js/prefs.js:1743
-#: js/prefs.js:1733
+#: include/localized_schema.php:60 js/prefs.js:1733
 msgid "Customize stylesheet"
 msgstr "Stíluslap testreszabása"
 
@@ -1205,7 +1167,7 @@ msgstr "A kivonatot megpróbálja a megadott időben elküldeni"
 msgid "Assign articles to labels automatically"
 msgstr "Címkék automatikus hozzárendelése a hírekhez"
 
-#: include/login_form.php:185 classes/handler/public.php:485
+#: include/login_form.php:185 classes/handler/public.php:459
 msgid "Language:"
 msgstr "Nyelv:"
 
@@ -1213,8 +1175,8 @@ msgstr "Nyelv:"
 msgid "Profile:"
 msgstr "Profil:"
 
-#: include/login_form.php:197 classes/handler/public.php:208
-#: classes/rpc.php:147 classes/dlg.php:116
+#: include/login_form.php:197 classes/handler/public.php:212
+#: classes/rpc.php:64 classes/dlg.php:98
 msgid "Default profile"
 msgstr "Alapértelmezett profil"
 
@@ -1226,112 +1188,96 @@ msgstr "Kisebb adatforgalom"
 msgid "Article not found."
 msgstr "Hír nem található."
 
-#: classes/handler/public.php:420 classes/pref/feeds.php:1480
+#: classes/handler/public.php:394 plugins/bookmarklets/init.php:38
 msgid "Share with Tiny Tiny RSS"
 msgstr "Megosztás Tiny Tiny RSS-el"
 
-#: classes/handler/public.php:428
+#: classes/handler/public.php:402
 msgid "Title:"
 msgstr "Cím:"
 
-#: classes/handler/public.php:430 classes/dlg.php:667
-#: classes/pref/feeds.php:509 classes/pref/feeds.php:762
-#: plugins/instances/instances.php:100 plugins/instances/init.php:215
+#: classes/handler/public.php:404 classes/dlg.php:667
+#: classes/pref/feeds.php:505 classes/pref/feeds.php:722
+#: plugins/instances/init.php:215
 msgid "URL:"
 msgstr "Hírcsatorna URL:"
 
-#: classes/handler/public.php:432
+#: classes/handler/public.php:406
 msgid "Content:"
 msgstr "Tartalom:"
 
-#: classes/handler/public.php:434
+#: classes/handler/public.php:408
 msgid "Labels:"
 msgstr "Címkék:"
 
-#: classes/handler/public.php:453
+#: classes/handler/public.php:427
 msgid "Shared article will appear in the Published feed."
 msgstr "A megosztott hír a Publikált hírek között fog megjelenni."
 
-#: classes/handler/public.php:455
+#: classes/handler/public.php:429
 msgid "Share"
 msgstr "Megosztás"
 
-#: classes/handler/public.php:456 classes/handler/public.php:498
-#: classes/dlg.php:315 classes/dlg.php:366 classes/dlg.php:426
-#: classes/dlg.php:457 classes/dlg.php:652 classes/dlg.php:702
-#: classes/dlg.php:774 classes/pref/users.php:194 classes/pref/labels.php:81
-#: classes/pref/filters.php:342 classes/pref/filters.php:722
-#: classes/pref/filters.php:791 classes/pref/filters.php:858
-#: classes/pref/feeds.php:729 classes/pref/feeds.php:880
-#: plugins/mail/mail.php:126 plugins/note/note.php:49
-#: plugins/instances/instances.php:136
+#: classes/handler/public.php:430 classes/handler/public.php:472
+#: classes/dlg.php:297 classes/dlg.php:350 classes/dlg.php:410
+#: classes/dlg.php:441 classes/dlg.php:652 classes/dlg.php:702
+#: classes/dlg.php:751 classes/pref/users.php:194 classes/pref/labels.php:81
+#: classes/pref/filters.php:349 classes/pref/filters.php:729
+#: classes/pref/filters.php:798 classes/pref/filters.php:865
+#: classes/pref/feeds.php:689 classes/pref/feeds.php:829
+#: plugins/mail/init.php:132 plugins/note/init.php:55
+#: plugins/instances/init.php:251
 msgid "Cancel"
 msgstr "Mégse"
 
-#: classes/handler/public.php:477
+#: classes/handler/public.php:451
 msgid "Not logged in"
 msgstr "Nincs belépve"
 
-#: classes/handler/public.php:537
+#: classes/handler/public.php:511
 msgid "Incorrect username or password"
 msgstr "Hibás felhasználói név vagy jelszó"
 
-#: classes/handler/public.php:573 classes/handler/public.php:670
+#: classes/handler/public.php:547 classes/handler/public.php:644
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "Már fel van iratkozva erre a hírcsatornára: <b>%s</b>."
 
-#: classes/handler/public.php:576 classes/handler/public.php:661
+#: classes/handler/public.php:550 classes/handler/public.php:635
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "Feliratkozva erre a hírcsatornára: <b>%s</b>."
 
-#: classes/handler/public.php:579 classes/handler/public.php:664
+#: classes/handler/public.php:553 classes/handler/public.php:638
 #, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "Nem lehet feliratkozni ide: <b>%s</b>."
 
-#: classes/handler/public.php:582 classes/handler/public.php:667
+#: classes/handler/public.php:556 classes/handler/public.php:641
 #, php-format
 msgid "No feeds found in <b>%s</b>."
 msgstr "Nem található hírcsatorna itt: <b>%s</b>."
 
-#: classes/handler/public.php:585 classes/handler/public.php:673
+#: classes/handler/public.php:559 classes/handler/public.php:647
 msgid "Multiple feed URLs found."
 msgstr "Több hírcsatorna URL-t találtam."
 
-#: classes/handler/public.php:589 classes/handler/public.php:678
+#: classes/handler/public.php:563 classes/handler/public.php:652
 #, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr ""
 "Nem lehet feliratkozni ide: <b>%s</b>.<br>Nem lehet betölteni a hícsatorna "
 "URL-t."
 
-#: classes/handler/public.php:607 classes/handler/public.php:696
+#: classes/handler/public.php:581 classes/handler/public.php:670
 msgid "Subscribe to selected feed"
 msgstr "Feliratkozás a kiválasztott hírcsatornára"
 
-#: classes/handler/public.php:632 classes/handler/public.php:720
+#: classes/handler/public.php:606 classes/handler/public.php:694
 msgid "Edit subscription options"
 msgstr "Feliratkozási beállítások szerkesztése"
 
-#: classes/auth/internal.php:45 plugins/auth_internal/init.php:62
-msgid "Please enter your one time password:"
-msgstr "Adja meg az egyszer használatos jelszót:"
-
-#: classes/auth/internal.php:168 plugins/auth_internal/init.php:185
-msgid "Password has been changed."
-msgstr "A jelszó megváltoztatva."
-
-#: classes/auth/internal.php:170
-msgid "Old password is incorrect."
-msgstr "A régi jelszó helytelen."
-
-#: classes/dlg.php:26
-msgid "Prepare data"
-msgstr "Adatok előkészítése"
-
-#: classes/dlg.php:40
+#: classes/dlg.php:22
 msgid ""
 "If you have imported labels and/or filters, you might need to reload "
 "preferences to see your new data."
@@ -1339,66 +1285,66 @@ msgstr ""
 "Ha címkéket és szűrőket is importált, akkor szükség lehet a beállításokat "
 "újra kell tölteni."
 
-#: classes/dlg.php:73 classes/pref/users.php:378 classes/pref/labels.php:272
-#: classes/pref/filters.php:223 classes/pref/filters.php:270
-#: classes/pref/filters.php:571 classes/pref/filters.php:650
-#: classes/pref/filters.php:677 classes/pref/feeds.php:1274
-#: classes/pref/feeds.php:1583 classes/pref/feeds.php:1652
-#: plugins/instances/instances.php:172
+#: classes/dlg.php:55 classes/pref/users.php:378 classes/pref/labels.php:272
+#: classes/pref/filters.php:230 classes/pref/filters.php:277
+#: classes/pref/filters.php:578 classes/pref/filters.php:657
+#: classes/pref/filters.php:684 classes/pref/feeds.php:1202
+#: classes/pref/feeds.php:1472 classes/pref/feeds.php:1541
+#: plugins/instances/init.php:287
 msgid "Select"
 msgstr "Kiválasztás"
 
-#: classes/dlg.php:76 classes/feeds.php:92 classes/pref/users.php:381
-#: classes/pref/labels.php:275 classes/pref/filters.php:226
-#: classes/pref/filters.php:273 classes/pref/filters.php:574
-#: classes/pref/filters.php:653 classes/pref/filters.php:680
-#: classes/pref/feeds.php:1277 classes/pref/feeds.php:1586
-#: classes/pref/feeds.php:1655 plugins/instances/instances.php:175
+#: classes/dlg.php:58 classes/feeds.php:92 classes/pref/users.php:381
+#: classes/pref/labels.php:275 classes/pref/filters.php:233
+#: classes/pref/filters.php:280 classes/pref/filters.php:581
+#: classes/pref/filters.php:660 classes/pref/filters.php:687
+#: classes/pref/feeds.php:1205 classes/pref/feeds.php:1475
+#: classes/pref/feeds.php:1544 plugins/instances/init.php:290
 msgid "All"
 msgstr "Mind"
 
-#: classes/dlg.php:78 classes/feeds.php:95 classes/pref/users.php:383
-#: classes/pref/labels.php:277 classes/pref/filters.php:228
-#: classes/pref/filters.php:275 classes/pref/filters.php:576
-#: classes/pref/filters.php:655 classes/pref/filters.php:682
-#: classes/pref/feeds.php:1279 classes/pref/feeds.php:1588
-#: classes/pref/feeds.php:1657 plugins/instances/instances.php:177
+#: classes/dlg.php:60 classes/feeds.php:95 classes/pref/users.php:383
+#: classes/pref/labels.php:277 classes/pref/filters.php:235
+#: classes/pref/filters.php:282 classes/pref/filters.php:583
+#: classes/pref/filters.php:662 classes/pref/filters.php:689
+#: classes/pref/feeds.php:1207 classes/pref/feeds.php:1477
+#: classes/pref/feeds.php:1546 plugins/instances/init.php:292
 msgid "None"
 msgstr "Kijelölés törlése"
 
-#: classes/dlg.php:87
+#: classes/dlg.php:69
 msgid "Create profile"
 msgstr "Profil létrehozás"
 
-#: classes/dlg.php:110 classes/dlg.php:140
+#: classes/dlg.php:92 classes/dlg.php:122
 msgid "(active)"
 msgstr "(aktív)"
 
-#: classes/dlg.php:174
+#: classes/dlg.php:156
 msgid "Remove selected profiles"
 msgstr "Eltávolítja a kiválasztott profilokat?"
 
-#: classes/dlg.php:176
+#: classes/dlg.php:158
 msgid "Activate profile"
 msgstr "Profil aktiválás"
 
-#: classes/dlg.php:186
+#: classes/dlg.php:168
 msgid "Public OPML URL"
 msgstr "Publikus OPML URL"
 
-#: classes/dlg.php:191
+#: classes/dlg.php:173
 msgid "Your Public OPML URL is:"
 msgstr "A publikus OPML URL címe:"
 
-#: classes/dlg.php:200 classes/dlg.php:587
+#: classes/dlg.php:182 classes/dlg.php:571
 msgid "Generate new URL"
 msgstr "Új URL generálás"
 
-#: classes/dlg.php:212
+#: classes/dlg.php:194
 msgid "Notice"
 msgstr "Értesítés"
 
-#: classes/dlg.php:218
+#: classes/dlg.php:200
 msgid ""
 "Update daemon is enabled in configuration, but daemon process is not "
 "running, which prevents all feeds from updating. Please start the daemon "
@@ -1408,11 +1354,11 @@ msgstr ""
 "nem fut, így a hírcsatornák nem tudnak frissülni. Kérem indítsa el a daemon "
 "folyamatot, vagy lépjen kapcsolatba az oldal/szerver tulajdonosával."
 
-#: classes/dlg.php:222 classes/dlg.php:231
+#: classes/dlg.php:204 classes/dlg.php:213
 msgid "Last update:"
 msgstr "Legutóbbi frissítés:"
 
-#: classes/dlg.php:227
+#: classes/dlg.php:209
 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 "
@@ -1422,136 +1368,135 @@ msgstr ""
 "összeomlás vagy hiba jele is lehet, kérem lépjen kapcsolatba az oldal/"
 "szerver tulajdonosával!"
 
-#: classes/dlg.php:252 classes/dlg.php:261
+#: classes/dlg.php:234 classes/dlg.php:243
 msgid "Feed or site URL"
 msgstr "Hírcsatorna vagy weboldal URL"
 
-#: classes/dlg.php:267 classes/dlg.php:738 classes/pref/feeds.php:531
-#: classes/pref/feeds.php:775
+#: classes/dlg.php:249 classes/dlg.php:715 classes/pref/feeds.php:527
+#: classes/pref/feeds.php:735
 msgid "Place in category:"
 msgstr "Hozzáadás a következő kategóriához:"
 
-#: classes/dlg.php:275
+#: classes/dlg.php:257
 msgid "Available feeds"
 msgstr "Elérhető hírcsatornák"
 
-#: classes/dlg.php:287 classes/pref/users.php:155 classes/pref/feeds.php:561
-#: classes/pref/feeds.php:811
+#: classes/dlg.php:269 classes/pref/users.php:155 classes/pref/feeds.php:557
+#: classes/pref/feeds.php:771
 msgid "Authentication"
 msgstr "Azonosítás"
 
-#: classes/dlg.php:291 classes/dlg.php:752 classes/pref/users.php:438
-#: classes/pref/feeds.php:567 classes/pref/feeds.php:815
+#: classes/dlg.php:273 classes/dlg.php:729 classes/pref/users.php:438
+#: classes/pref/feeds.php:563 classes/pref/feeds.php:775
 msgid "Login"
 msgstr "Belépés"
 
-#: classes/dlg.php:294 classes/dlg.php:755 classes/pref/prefs.php:200
-#: classes/pref/feeds.php:573 classes/pref/feeds.php:821
+#: classes/dlg.php:276 classes/dlg.php:732 classes/pref/prefs.php:196
+#: classes/pref/feeds.php:569 classes/pref/feeds.php:781
 msgid "Password"
 msgstr "Jelszó"
 
-#: classes/dlg.php:304
+#: classes/dlg.php:286
 msgid "This feed requires authentication."
 msgstr "Ez a hírcsatorna azonosítást igényel."
 
-#: classes/dlg.php:309 classes/dlg.php:364 classes/dlg.php:773
+#: classes/dlg.php:291 classes/dlg.php:348 classes/dlg.php:750
 msgid "Subscribe"
 msgstr "Feliratkozás"
 
-#: classes/dlg.php:312
+#: classes/dlg.php:294
 msgid "More feeds"
 msgstr "További hírcsatornák"
 
-#: classes/dlg.php:336 classes/dlg.php:425 classes/pref/users.php:368
-#: classes/pref/filters.php:567 classes/pref/feeds.php:1270 js/tt-rss.js:234
-#: js/tt-rss.js:187 js/tt-rss.js:166
+#: classes/dlg.php:318 classes/dlg.php:409 classes/pref/users.php:368
+#: classes/pref/filters.php:574 classes/pref/feeds.php:1198 js/tt-rss.js:166
 msgid "Search"
 msgstr "Keresés"
 
-#: classes/dlg.php:340
+#: classes/dlg.php:322
 msgid "Popular feeds"
 msgstr "Népszerű hírcsatornák"
 
-#: classes/dlg.php:341
+#: classes/dlg.php:323
 msgid "Feed archive"
 msgstr "Hírcsatorna archívum"
 
-#: classes/dlg.php:344
+#: classes/dlg.php:326
 msgid "limit:"
 msgstr "határ:"
 
-#: classes/dlg.php:365 classes/pref/users.php:394 classes/pref/labels.php:284
-#: classes/pref/filters.php:332 classes/pref/filters.php:589
-#: classes/pref/feeds.php:702 plugins/instances/instances.php:182
+#: classes/dlg.php:349 classes/pref/users.php:394 classes/pref/labels.php:284
+#: classes/pref/filters.php:339 classes/pref/filters.php:596
+#: classes/pref/feeds.php:662 plugins/instances/init.php:297
 msgid "Remove"
 msgstr "Eltávolít"
 
-#: classes/dlg.php:376
+#: classes/dlg.php:360
 msgid "Look for"
 msgstr "Keresés"
 
-#: classes/dlg.php:384
+#: classes/dlg.php:368
 msgid "Limit search to:"
 msgstr "Keresés korlátozása ezekre:"
 
-#: classes/dlg.php:400
+#: classes/dlg.php:384
 msgid "This feed"
 msgstr "Ez a hírcsatorna"
 
-#: classes/dlg.php:432
+#: classes/dlg.php:416
 msgid "Tags for this article (separated by commas):"
 msgstr "A hír címkéi (vesszőkkel elválasztva):"
 
-#: classes/dlg.php:455 classes/dlg.php:650 classes/pref/users.php:192
-#: classes/pref/labels.php:79 classes/pref/filters.php:339
-#: classes/pref/feeds.php:728 classes/pref/feeds.php:877
-#: plugins/note/note.php:47 plugins/instances/instances.php:133
-#: plugins/nsfw/init.php:86 plugins/owncloud/init.php:62
+#: classes/dlg.php:439 classes/dlg.php:650 classes/pref/users.php:192
+#: classes/pref/labels.php:79 classes/pref/filters.php:346
+#: classes/pref/feeds.php:688 classes/pref/feeds.php:826
+#: plugins/nsfw/init.php:86 plugins/note/init.php:53
+#: plugins/owncloud/init.php:62 plugins/instances/init.php:248
 msgid "Save"
 msgstr "Mentés"
 
-#: classes/dlg.php:463
+#: classes/dlg.php:447
 msgid "Tag Cloud"
 msgstr "Címkefelhő"
 
-#: classes/dlg.php:532
+#: classes/dlg.php:516
 msgid "Select item(s) by tags"
 msgstr "Elemek kijelölése címkék szerint"
 
-#: classes/dlg.php:535
+#: classes/dlg.php:519
 msgid "Match:"
 msgstr "Egyezés:"
 
-#: classes/dlg.php:537
+#: classes/dlg.php:521
 msgid "Any"
 msgstr "Mind"
 
-#: classes/dlg.php:540
+#: classes/dlg.php:524
 msgid "All tags."
 msgstr "Minden címke."
 
-#: classes/dlg.php:542
+#: classes/dlg.php:526
 msgid "Which Tags?"
 msgstr "Melyik címkék?"
 
-#: classes/dlg.php:555
+#: classes/dlg.php:539
 msgid "Display entries"
 msgstr "Bejegyzések megejenítése"
 
-#: classes/dlg.php:567 classes/feeds.php:129
+#: classes/dlg.php:551 classes/feeds.php:133
 msgid "View as RSS"
 msgstr "Megtekintés RSS-ként"
 
-#: classes/dlg.php:578
+#: classes/dlg.php:562
 msgid "You can view this feed as RSS using the following URL:"
 msgstr "Ezt a hírcsatornát megtekintheti RSS-ként a következő URL-en:"
 
-#: classes/dlg.php:606 plugins/updater/updater.php:276
+#: classes/dlg.php:591 plugins/updater/init.php:303
 #, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "Új Tiny Tiny RSS verzió érhető el (%s)."
 
-#: classes/dlg.php:614
+#: classes/dlg.php:599
 msgid ""
 "You can update using built-in updater in the Preferences or by using update."
 "php"
@@ -1559,14 +1504,18 @@ msgstr ""
 "Frissíthet a beépített frissítővel a Beállításokban, vagy az update.php "
 "használatával"
 
-#: classes/dlg.php:618 classes/pref/users.php:390
+#: classes/dlg.php:603 classes/pref/users.php:390
 msgid "Details"
 msgstr "Részletek"
 
-#: classes/dlg.php:620
+#: classes/dlg.php:605
 msgid "Download"
 msgstr "Letöltés"
 
+#: classes/dlg.php:613
+msgid "Error receiving version information or no new version available."
+msgstr ""
+
 #: classes/dlg.php:634
 #, php-format
 msgid ""
@@ -1578,32 +1527,29 @@ msgstr ""
 "betűtípusait és elrendezését. <a target=\"_blank\" class=\"visibleLink\" "
 "href=\"%s\">Ez a fájl</a> használható kiindulásként."
 
-#: classes/dlg.php:661 plugins/instances/instances.php:92
-#: plugins/instances/init.php:207
+#: classes/dlg.php:661 plugins/instances/init.php:207
 msgid "Instance"
 msgstr "Pédány"
 
-#: classes/dlg.php:670 plugins/instances/instances.php:103
-#: plugins/instances/instances.php:200 plugins/instances/init.php:218
+#: classes/dlg.php:670 plugins/instances/init.php:218
+#: plugins/instances/init.php:315
 msgid "Instance URL"
 msgstr "Példány URL"
 
-#: classes/dlg.php:680 plugins/instances/instances.php:114
-#: plugins/instances/init.php:229
+#: classes/dlg.php:680 plugins/instances/init.php:229
 msgid "Access key:"
 msgstr "Hozzáférési kulcs:"
 
-#: classes/dlg.php:683 plugins/instances/instances.php:117
-#: plugins/instances/instances.php:201 plugins/instances/init.php:232
+#: classes/dlg.php:683 plugins/instances/init.php:232
+#: plugins/instances/init.php:316
 msgid "Access key"
 msgstr "Hozzáférési kulcs"
 
-#: classes/dlg.php:687 plugins/instances/instances.php:121
-#: plugins/instances/init.php:236
+#: classes/dlg.php:687 plugins/instances/init.php:236
 msgid "Use one access key for both linked instances."
 msgstr "Egy hozzáférési kulcs használata minden linkelt példányhoz."
 
-#: classes/dlg.php:695 plugins/instances/instances.php:129
+#: classes/dlg.php:695 plugins/instances/init.php:244
 msgid "Generate new key"
 msgstr "Új kulcs generálása"
 
@@ -1611,28 +1557,22 @@ msgstr "Új kulcs generálása"
 msgid "Create link"
 msgstr "Link létrehozás"
 
-#: classes/dlg.php:717
-#, php-format
-msgid ""
-"Could not upload file. You might need to adjust upload_max_filesize\n"
-"\t\t\t\tin PHP.ini (current value = %s)"
-msgstr ""
-"Nem lehet feltölteni a fájlt. A php.ini fájlban be kell állítani az "
-"upload_max_filesize értékét\n"
-"\t\t\t\t jelenlegi érték = %s"
-
-#: classes/dlg.php:735
+#: classes/dlg.php:712
 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/dlg.php:744
+#: classes/dlg.php:721
 msgid "Feeds to subscribe, One per line"
 msgstr "Feliratkozás hírcsatornákra, soronként egy"
 
-#: classes/dlg.php:766
+#: classes/dlg.php:743
 msgid "Feeds require authentication."
 msgstr "Ez a hírcsatorna azonosítást igényel."
 
+#: classes/feeds.php:68
+msgid "Visit the website"
+msgstr "Weboldal megtekintése"
+
 #: classes/feeds.php:83
 msgid "View as RSS feed"
 msgstr "Megtekintés RSS feedként"
@@ -1645,6 +1585,11 @@ msgstr "Kiválasztás:"
 msgid "Invert"
 msgstr "Fordított"
 
+#: classes/feeds.php:101
+#, fuzzy
+msgid "More..."
+msgstr "További műveletek..."
+
 #: classes/feeds.php:103
 msgid "Selection toggle:"
 msgstr "Kiválasztott legyen:"
@@ -1665,41 +1610,41 @@ msgstr "Archivál"
 msgid "Move back"
 msgstr "Visszalépés"
 
-#: classes/feeds.php:118 classes/pref/filters.php:235
-#: classes/pref/filters.php:282 classes/pref/filters.php:662
-#: classes/pref/filters.php:689
+#: classes/feeds.php:118 classes/pref/filters.php:242
+#: classes/pref/filters.php:289 classes/pref/filters.php:669
+#: classes/pref/filters.php:696
 msgid "Delete"
 msgstr "Törlés"
 
-#: classes/feeds.php:122 plugins/mail/mail.php:22
+#: classes/feeds.php:125 plugins/mail/init.php:28
 msgid "Forward by email"
 msgstr "Továbbítás emaiben"
 
-#: classes/feeds.php:125
+#: classes/feeds.php:129
 msgid "Feed:"
 msgstr "Hírcsatorna:"
 
-#: classes/feeds.php:190 classes/feeds.php:844
+#: classes/feeds.php:196 classes/feeds.php:790
 msgid "Feed not found."
 msgstr "Hírcsatorna nem található"
 
-#: classes/feeds.php:434 classes/feeds.php:516
+#: classes/feeds.php:403 classes/feeds.php:493
 msgid "mark as read"
 msgstr "olvasottként jelöl"
 
-#: classes/feeds.php:739
+#: classes/feeds.php:691
 msgid "No unread articles found to display."
 msgstr "Nincs megjeleníthető olvasatlan hír."
 
-#: classes/feeds.php:742
+#: classes/feeds.php:694
 msgid "No updated articles found to display."
 msgstr "Nincs megjeleníthető friss hír."
 
-#: classes/feeds.php:745
+#: classes/feeds.php:697
 msgid "No starred articles found to display."
 msgstr "Nincs megjeleníthető csillagozott hír."
 
-#: classes/feeds.php:749
+#: classes/feeds.php:701
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
@@ -1708,11 +1653,42 @@ msgstr ""
 "Címkék alá híreket besorolhat manuálisan (lásd a fenti Műveletek menüt) vagy "
 "a besoroláshoz használhat Szűrőket."
 
-#: classes/feeds.php:751
+#: classes/feeds.php:703
 msgid "No articles found to display."
 msgstr "Nincs megjeleníthető hír."
 
-#: classes/backend.php:26
+#: classes/feeds.php:718 classes/feeds.php:899
+#, php-format
+msgid "Feeds last updated at %s"
+msgstr "Hírcsatornák utolsó frissítése: %s"
+
+#: classes/feeds.php:728 classes/feeds.php:909
+msgid "Some feeds have update errors (click for details)"
+msgstr ""
+"Néhány hírcsatorna frissítésével gond akadt. (Kattints ide a részletekhez!)"
+
+#: classes/feeds.php:889
+msgid "No feed selected."
+msgstr "Nincs kiválasztott hírcsatorna."
+
+#: classes/backend.php:34
+msgid "Keyboard Shortcuts"
+msgstr "Billentyűparancsok"
+
+#: classes/backend.php:57
+msgid "Shift"
+msgstr ""
+
+#: classes/backend.php:60
+msgid "Ctrl"
+msgstr ""
+
+#: classes/backend.php:84
+msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
+msgstr ""
+"További tippek a felhasználói felülethez elérhetők a Tiny Tiny RSS wikiben."
+
+#: classes/backend.php:99
 msgid "Help topic not found."
 msgstr "Súgótéma nem tlálható."
 
@@ -1762,16 +1738,15 @@ msgstr "Szűrő hozzáadása..."
 msgid "Processing category: %s"
 msgstr "%s kategória feldolgozása"
 
-#: classes/opml.php:467
+#: classes/opml.php:468
 msgid "Error: please upload OPML file."
 msgstr "Hiba: kérem töltse fel az OPML fájlt!"
 
-#: classes/opml.php:474
+#: classes/opml.php:475
 msgid "Error while parsing document."
 msgstr "Hiba történt a dokuementum feldoglozása közben"
 
-#: classes/pref/users.php:6 plugins/instances/instances.php:42
-#: plugins/instances/init.php:157
+#: classes/pref/users.php:6 plugins/instances/init.php:157
 msgid "Your access level is insufficient to open this tab."
 msgstr "Hozzáférési szintje elégtelen ehhez a művelethez."
 
@@ -1811,8 +1786,8 @@ msgstr "Hozzáférési szint:"
 msgid "Change password to"
 msgstr "Jelszó megváltoztatása"
 
-#: classes/pref/users.php:177 classes/pref/feeds.php:581
-#: classes/pref/feeds.php:827
+#: classes/pref/users.php:177 classes/pref/feeds.php:577
+#: classes/pref/feeds.php:787
 msgid "Options"
 msgstr "Beállítások"
 
@@ -1854,8 +1829,12 @@ msgstr "<b>%s</b> értesítése."
 msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] Értesítés jelszó megváltoztatásáról."
 
-#: classes/pref/users.php:392 classes/pref/filters.php:586
-#: plugins/instances/instances.php:181
+#: classes/pref/users.php:386
+msgid "Create user"
+msgstr "Felhasználó létrehozás"
+
+#: classes/pref/users.php:392 classes/pref/filters.php:593
+#: plugins/instances/init.php:296
 msgid "Edit"
 msgstr "Szerkesztés"
 
@@ -1871,15 +1850,15 @@ msgstr "Hozzáférési szint"
 msgid "Last login"
 msgstr "Utolsó belépés"
 
-#: classes/pref/users.php:461 plugins/instances/instances.php:222
+#: classes/pref/users.php:462 plugins/instances/init.php:337
 msgid "Click to edit"
 msgstr "Kattintson ide a szerkesztéshez"
 
-#: classes/pref/users.php:481
+#: classes/pref/users.php:482
 msgid "No users defined."
 msgstr "Nincs megadva felhasználó."
 
-#: classes/pref/users.php:483
+#: classes/pref/users.php:484
 msgid "No matching users found."
 msgstr "Nem található a feltételeknek megfelelő felhasználó."
 
@@ -1916,81 +1895,85 @@ msgstr "A szűrőnek megfelelő hírek:"
 msgid "No recent articles matching this filter have been found."
 msgstr "Nem található a feltételeknek megfelelő hír."
 
-#: classes/pref/filters.php:218 classes/pref/filters.php:645
-#: classes/pref/filters.php:760
+#: classes/pref/filters.php:98
+msgid ""
+"Complex expressions might not give results while testing due to issues with "
+"database server regexp implementation."
+msgstr ""
+
+#: classes/pref/filters.php:225 classes/pref/filters.php:652
+#: classes/pref/filters.php:767
 msgid "Match"
 msgstr "Szabály"
 
-#: classes/pref/filters.php:232 classes/pref/filters.php:279
-#: classes/pref/filters.php:659 classes/pref/filters.php:686
+#: classes/pref/filters.php:239 classes/pref/filters.php:286
+#: classes/pref/filters.php:666 classes/pref/filters.php:693
 msgid "Add"
 msgstr "Hozzáad"
 
-#: classes/pref/filters.php:265 classes/pref/filters.php:672
+#: classes/pref/filters.php:272 classes/pref/filters.php:679
 msgid "Apply actions"
 msgstr "Műveletek alkalmazása"
 
-#: classes/pref/filters.php:315 classes/pref/filters.php:701
+#: classes/pref/filters.php:322 classes/pref/filters.php:708
 msgid "Enabled"
 msgstr "Engedélyezve"
 
-#: classes/pref/filters.php:324 classes/pref/filters.php:704
+#: classes/pref/filters.php:331 classes/pref/filters.php:711
 msgid "Match any rule"
 msgstr "Minden szabálynak megfeleljen"
 
-#: classes/pref/filters.php:336 classes/pref/filters.php:716
+#: classes/pref/filters.php:343 classes/pref/filters.php:723
 msgid "Test"
 msgstr "Teszt"
 
-#: classes/pref/filters.php:368
+#: classes/pref/filters.php:375
 #, php-format
 msgid "%s on %s in %s"
 msgstr ""
 
-#: classes/pref/filters.php:583
+#: classes/pref/filters.php:590
 msgid "Combine"
 msgstr "Egyesít"
 
-#: classes/pref/filters.php:593 classes/pref/feeds.php:1329
+#: classes/pref/filters.php:600 classes/pref/feeds.php:1257
 msgid "Rescore articles"
 msgstr "Hírek újrapontszámozása"
 
-#: classes/pref/filters.php:719
+#: classes/pref/filters.php:726
 msgid "Create"
 msgstr "Létrehoz"
 
-#: classes/pref/filters.php:769
+#: classes/pref/filters.php:776
 msgid "on field"
 msgstr "...szerepeljen ebben a mezőben: "
 
-#: classes/pref/filters.php:775 js/PrefFilterTree.js:29
+#: classes/pref/filters.php:782 js/PrefFilterTree.js:29
 #: plugins/digest/digest.js:241
 msgid "in"
 msgstr "itt"
 
-#: classes/pref/filters.php:788
+#: classes/pref/filters.php:795
 msgid "Save rule"
 msgstr "Szabály mentés"
 
-#: classes/pref/filters.php:788 js/functions.js:1067 js/functions.js:1063
-#: js/functions.js:1071 js/functions.js:1073
+#: classes/pref/filters.php:795 js/functions.js:1078
 msgid "Add rule"
 msgstr "Szabály hozzáadás"
 
-#: classes/pref/filters.php:811
+#: classes/pref/filters.php:818
 msgid "Perform Action"
 msgstr "Műveletek"
 
-#: classes/pref/filters.php:837
+#: classes/pref/filters.php:844
 msgid "with parameters:"
 msgstr "Beállítás:"
 
-#: classes/pref/filters.php:855
+#: classes/pref/filters.php:862
 msgid "Save action"
 msgstr "Művelet mentés"
 
-#: classes/pref/filters.php:855 js/functions.js:1093 js/functions.js:1089
-#: js/functions.js:1097 js/functions.js:1099
+#: classes/pref/filters.php:862 js/functions.js:1104
 msgid "Add action"
 msgstr "Művelet hozzáadás"
 
@@ -2010,76 +1993,76 @@ msgstr "A megadott jelszavak nem egyeznek."
 msgid "Function not supported by authentication module."
 msgstr "A hitelesítési modul nem támogatja ezt a funkciót."
 
-#: classes/pref/prefs.php:68
+#: classes/pref/prefs.php:63
 msgid "The configuration was saved."
 msgstr "Beállítások elmentve."
 
-#: classes/pref/prefs.php:83
+#: classes/pref/prefs.php:77
 #, php-format
 msgid "Unknown option: %s"
 msgstr "Ismeretlen beállítás: %s"
 
-#: classes/pref/prefs.php:97
+#: classes/pref/prefs.php:91
 msgid "Your personal data has been saved."
 msgstr "A személyes adatai el lettek mentve."
 
-#: classes/pref/prefs.php:137
+#: classes/pref/prefs.php:131
 msgid "Personal data / Authentication"
 msgstr "Személyes adatok / Azonosítás"
 
-#: classes/pref/prefs.php:157
+#: classes/pref/prefs.php:151
 msgid "Personal data"
 msgstr "Személyes adatok"
 
-#: classes/pref/prefs.php:167
+#: classes/pref/prefs.php:161
 msgid "Full name"
 msgstr "Teljes név"
 
-#: classes/pref/prefs.php:171
+#: classes/pref/prefs.php:165
 msgid "E-mail"
 msgstr "E-mail"
 
-#: classes/pref/prefs.php:177
+#: classes/pref/prefs.php:171
 msgid "Access level"
 msgstr "Hozzáférési szint"
 
-#: classes/pref/prefs.php:187
+#: classes/pref/prefs.php:181
 msgid "Save data"
 msgstr "Adatok mentése"
 
-#: classes/pref/prefs.php:207
+#: classes/pref/prefs.php:203
 msgid "Your password is at default value, please change it."
 msgstr "A jelszava még az alapértelmezett, kérem változtassa meg."
 
-#: classes/pref/prefs.php:239
+#: classes/pref/prefs.php:235
 msgid "Old password"
 msgstr "Régi jelszó"
 
-#: classes/pref/prefs.php:242
+#: classes/pref/prefs.php:238
 msgid "New password"
 msgstr "Új jelszó"
 
-#: classes/pref/prefs.php:247
+#: classes/pref/prefs.php:243
 msgid "Confirm password"
 msgstr "Jelszó még egyszer"
 
-#: classes/pref/prefs.php:257
+#: classes/pref/prefs.php:253
 msgid "Change password"
 msgstr "Jelszó megváltoztatása"
 
-#: classes/pref/prefs.php:263
+#: classes/pref/prefs.php:259
 msgid "One time passwords / Authenticator"
 msgstr "Egyszer használatos jelszavak / Hitelesítő"
 
-#: classes/pref/prefs.php:292 classes/pref/prefs.php:343
+#: classes/pref/prefs.php:288 classes/pref/prefs.php:339
 msgid "Enter your password"
 msgstr "Adja meg a jelszavát"
 
-#: classes/pref/prefs.php:303
+#: classes/pref/prefs.php:299
 msgid "Disable OTP"
 msgstr "OTP letiltása"
 
-#: classes/pref/prefs.php:309
+#: classes/pref/prefs.php:305
 msgid ""
 "You will need a compatible Authenticator to use this. Changing your password "
 "would automatically disable OTP."
@@ -2087,65 +2070,99 @@ msgstr ""
 "Ennek a használatához egy kompatibilis Hitelesítőre van szükség. A jelszó "
 "módosítása automatikusan letiltja az OTP-t."
 
-#: classes/pref/prefs.php:311
+#: classes/pref/prefs.php:307
 msgid "Scan the following code by the Authenticator application:"
 msgstr "Szkennelje be a következő kódot a Hitelesítő alkalmazással:"
 
-#: classes/pref/prefs.php:352
+#: classes/pref/prefs.php:348
 msgid "I have scanned the code and would like to enable OTP"
 msgstr "Beszkenneltem a kódot és be szeretném kapcsolni az OTP-t"
 
-#: classes/pref/prefs.php:360
+#: classes/pref/prefs.php:356
 msgid "Enable OTP"
 msgstr "OTP engedélyezése"
 
-#: classes/pref/prefs.php:456
-msgid "Select theme"
-msgstr "Stílusválasztó"
-
-#: classes/pref/prefs.php:508
+#: classes/pref/prefs.php:482
 msgid "Customize"
 msgstr "Testreszabás"
 
-#: classes/pref/prefs.php:527 classes/pref/prefs.php:534
-#: classes/pref/prefs.php:539
+#: classes/pref/prefs.php:501 classes/pref/prefs.php:508
+#: classes/pref/prefs.php:513
 msgid "Yes"
 msgstr "Igen"
 
-#: classes/pref/prefs.php:529 classes/pref/prefs.php:539
+#: classes/pref/prefs.php:503 classes/pref/prefs.php:513
 msgid "No"
 msgstr "Nem"
 
-#: classes/pref/prefs.php:569
+#: classes/pref/prefs.php:543
 msgid "Register"
 msgstr "Regisztráció"
 
-#: classes/pref/prefs.php:573
+#: classes/pref/prefs.php:547
 msgid "Clear"
 msgstr "Töröl"
 
-#: classes/pref/prefs.php:579
+#: classes/pref/prefs.php:553
 #, php-format
 msgid "Current server time: %s (UTC)"
 msgstr "Aktuális szerveridő: %s (UTC)"
 
-#: classes/pref/prefs.php:604
+#: classes/pref/prefs.php:582
 msgid "Save configuration"
 msgstr "Beállítások mentése"
 
-#: classes/pref/prefs.php:607
+#: classes/pref/prefs.php:585
 msgid "Manage profiles"
 msgstr "Profilok kezelése"
 
-#: classes/pref/prefs.php:610
+#: classes/pref/prefs.php:588
 msgid "Reset to defaults"
 msgstr "Alapértelmezett beállítások"
 
-#: classes/pref/prefs.php:622
+#: classes/pref/prefs.php:600
 msgid "Show additional preferences"
 msgstr "További beállítások megjelenítése"
 
-#: classes/pref/prefs.php:679 classes/pref/prefs.php:697
+#: classes/pref/prefs.php:612 classes/pref/prefs.php:614
+msgid "Plugins"
+msgstr ""
+
+#: classes/pref/prefs.php:642
+msgid "System plugins"
+msgstr ""
+
+#: classes/pref/prefs.php:646 classes/pref/prefs.php:695
+msgid "Plugin"
+msgstr ""
+
+#: classes/pref/prefs.php:647 classes/pref/prefs.php:696
+msgid "Description"
+msgstr ""
+
+#: classes/pref/prefs.php:648 classes/pref/prefs.php:697
+msgid "Version"
+msgstr ""
+
+#: classes/pref/prefs.php:649 classes/pref/prefs.php:698
+msgid "Author"
+msgstr ""
+
+#: classes/pref/prefs.php:682 classes/pref/prefs.php:733
+#, fuzzy
+msgid "Clear data"
+msgstr "Hírcsatorna-adatok törlése"
+
+#: classes/pref/prefs.php:691
+msgid "User plugins"
+msgstr ""
+
+#: classes/pref/prefs.php:748
+#, fuzzy
+msgid "Enable selected plugins"
+msgstr "Hírcsatornák kategorizálásának engedélyezése"
+
+#: classes/pref/prefs.php:803 classes/pref/prefs.php:821
 msgid "Incorrect password"
 msgstr "Érvénytelen jelszó"
 
@@ -2153,26 +2170,22 @@ msgstr "Érvénytelen jelszó"
 msgid "Check to enable field"
 msgstr "Jelölje be a mező engedélyezéséhez"
 
-#: classes/pref/feeds.php:59 classes/pref/feeds.php:180
-#: classes/pref/feeds.php:223 classes/pref/feeds.php:229
-#: classes/pref/feeds.php:254
+#: classes/pref/feeds.php:58 classes/pref/feeds.php:175
+#: classes/pref/feeds.php:217 classes/pref/feeds.php:223
+#: classes/pref/feeds.php:248
 #, php-format
 msgid "(%d feeds)"
 msgstr "(%d hírcsatorna)"
 
-#: classes/pref/feeds.php:492 classes/pref/feeds.php:747
-msgid "Feed"
-msgstr "Hírcsatorna"
-
-#: classes/pref/feeds.php:498
+#: classes/pref/feeds.php:494
 msgid "Feed Title"
 msgstr "Hírcsatorna címe"
 
-#: classes/pref/feeds.php:554 classes/pref/feeds.php:802
+#: classes/pref/feeds.php:550 classes/pref/feeds.php:762
 msgid "Article purging:"
 msgstr "Régi hírek törlése:"
 
-#: classes/pref/feeds.php:577
+#: classes/pref/feeds.php:573
 msgid ""
 "<b>Hint:</b> you need to fill in your login information if your feed "
 "requires authentication, except for Twitter feeds."
@@ -2180,123 +2193,106 @@ 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:593 classes/pref/feeds.php:831
+#: classes/pref/feeds.php:589 classes/pref/feeds.php:791
 msgid "Hide from Popular feeds"
 msgstr "Elrejtés a Népszerű hírcsatornákból"
 
-#: classes/pref/feeds.php:604 classes/pref/feeds.php:836
-msgid "Right-to-left content"
-msgstr "Jobbról balra tartó tartalom"
-
-#: classes/pref/feeds.php:616 classes/pref/feeds.php:842
+#: classes/pref/feeds.php:601 classes/pref/feeds.php:797
 msgid "Include in e-mail digest"
 msgstr "Hozzáadás az e-mail összefoglalóhoz"
 
-#: classes/pref/feeds.php:629 classes/pref/feeds.php:848
+#: classes/pref/feeds.php:614 classes/pref/feeds.php:803
 msgid "Always display image attachments"
 msgstr "Kép csatolmányokat mindig jelenítse meg"
 
-#: classes/pref/feeds.php:643 classes/pref/feeds.php:856
+#: classes/pref/feeds.php:628 classes/pref/feeds.php:811
 msgid "Cache images locally"
 msgstr "Képek helyi tárolása"
 
-#: classes/pref/feeds.php:656
-msgid "Cache content locally"
-msgstr "Tartalom helyi gyorstárazása"
-
-#: classes/pref/feeds.php:668 classes/pref/feeds.php:862
+#: classes/pref/feeds.php:640 classes/pref/feeds.php:817
 msgid "Mark updated articles as unread"
 msgstr "Frissült hírek megjelölése olvasatlanként"
 
-#: classes/pref/feeds.php:680 classes/pref/feeds.php:868
-msgid "Mark posts as updated on content change"
-msgstr "Tartalom megváltozásakor jelölje a postokat frissítettként"
-
-#: classes/pref/feeds.php:686
+#: classes/pref/feeds.php:646
 msgid "Icon"
 msgstr "Ikon"
 
-#: classes/pref/feeds.php:700
+#: classes/pref/feeds.php:660
 msgid "Replace"
 msgstr "Csere"
 
-#: classes/pref/feeds.php:719
+#: classes/pref/feeds.php:679
 #, fuzzy
 msgid "Resubscribe to push updates"
 msgstr "Újra feliratkozás az push frissítésekre"
 
-#: classes/pref/feeds.php:726
+#: classes/pref/feeds.php:686
 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:741
+#: classes/pref/feeds.php:701
 msgid "Enable the options you wish to apply using checkboxes on the right:"
 msgstr "A jobb oldali jelölőnégyzetek segítségével engedélyezheti az opciókat:"
 
-#: classes/pref/feeds.php:1123 classes/pref/feeds.php:1176
+#: classes/pref/feeds.php:1051 classes/pref/feeds.php:1104
 msgid "All done."
 msgstr "Kész."
 
-#: classes/pref/feeds.php:1231
+#: classes/pref/feeds.php:1159
 msgid "Feeds with errors"
 msgstr "Hibás hírcsatornák"
 
-#: classes/pref/feeds.php:1251
+#: classes/pref/feeds.php:1179
 msgid "Inactive feeds"
 msgstr "Inaktív hírcsatornák"
 
-#: classes/pref/feeds.php:1288
+#: classes/pref/feeds.php:1216
 msgid "Edit selected feeds"
 msgstr "Kijelölt hírcsatornák szerkeztése"
 
-#: classes/pref/feeds.php:1290 classes/pref/feeds.php:1304
+#: classes/pref/feeds.php:1218 classes/pref/feeds.php:1232
 msgid "Reset sort order"
 msgstr "Rendezési sorren visszaállítása"
 
-#: classes/pref/feeds.php:1292 js/prefs.js:2021 js/prefs.js:1788
-#: js/prefs.js:1778
+#: classes/pref/feeds.php:1220 js/prefs.js:1778
 msgid "Batch subscribe"
 msgstr "Kötegelt feliratkozás"
 
-#: classes/pref/feeds.php:1297
+#: classes/pref/feeds.php:1225
 msgid "Categories"
 msgstr "Kategóriák"
 
-#: classes/pref/feeds.php:1300
+#: classes/pref/feeds.php:1228
 msgid "Add category"
 msgstr "Kategória hozzáadás"
 
-#: classes/pref/feeds.php:1302
+#: classes/pref/feeds.php:1230
 msgid "(Un)hide empty categories"
 msgstr "Üres kategóriák elrejtése/megjelenítése"
 
-#: classes/pref/feeds.php:1306
+#: classes/pref/feeds.php:1234
 msgid "Remove selected"
 msgstr "Kijelölt eltávolítása"
 
-#: classes/pref/feeds.php:1320
+#: classes/pref/feeds.php:1248
 msgid "More actions..."
 msgstr "További műveletek..."
 
-#: classes/pref/feeds.php:1324
+#: classes/pref/feeds.php:1252
 msgid "Manual purge"
 msgstr "Kézi takarítás (régi hírek törlése)"
 
-#: classes/pref/feeds.php:1328
+#: classes/pref/feeds.php:1256
 msgid "Clear feed data"
 msgstr "Hírcsatorna-adatok törlése"
 
-#: classes/pref/feeds.php:1379
-msgid "Import and export"
-msgstr "Import és export"
-
-#: classes/pref/feeds.php:1381
+#: classes/pref/feeds.php:1307
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1383
+#: classes/pref/feeds.php:1309
 msgid ""
 "Using OPML you can export and import your feeds, filters, labels and Tiny "
 "Tiny RSS settings."
@@ -2304,27 +2300,27 @@ 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:1385
+#: classes/pref/feeds.php:1311
 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:1398
+#: classes/pref/feeds.php:1324
 msgid "Import my OPML"
 msgstr "OPML importálása"
 
-#: classes/pref/feeds.php:1402
+#: classes/pref/feeds.php:1328
 msgid "Filename:"
 msgstr "Fájlnév:"
 
-#: classes/pref/feeds.php:1404
+#: classes/pref/feeds.php:1330
 msgid "Include settings"
 msgstr "Beállításokkal együtt"
 
-#: classes/pref/feeds.php:1408
+#: classes/pref/feeds.php:1334
 msgid "Export OPML"
 msgstr "Exportálás OPML-be"
 
-#: classes/pref/feeds.php:1412
+#: classes/pref/feeds.php:1338
 msgid ""
 "Your OPML can be published publicly and can be subscribed by anyone who "
 "knows the URL below."
@@ -2332,7 +2328,7 @@ msgstr ""
 "Az OPML nyilvánosságra hozható és bárki feliratkozhat rá, aki ismeri az "
 "alábbi URL-t."
 
-#: classes/pref/feeds.php:1414
+#: classes/pref/feeds.php:1340
 msgid ""
 "Published OPML does not include your Tiny Tiny RSS settings, feeds that "
 "require authentication or feeds hidden from Popular feeds."
@@ -2340,35 +2336,15 @@ msgstr ""
 "A publikált OPML nem tartalmazza a beállításokat, az azonosítást igénylő "
 "hírcsatornákat és az Népszerű hírcsatornákból elrejtetteket."
 
-#: classes/pref/feeds.php:1417
+#: classes/pref/feeds.php:1343
 msgid "Display published OPML URL"
 msgstr "Publikált OPML URL mejelenítése"
 
-#: classes/pref/feeds.php:1420 plugins/import_export/init.php:66
-msgid "Article archive"
-msgstr "Hír archívum"
-
-#: classes/pref/feeds.php:1422 plugins/import_export/init.php:68
-msgid ""
-"You can export and import your Starred and Archived articles for safekeeping "
-"or when migrating between tt-rss instances."
-msgstr ""
-"A biztonság kedvéért exportálhatja és importálhatja a csillagozott és az "
-"archivált híreket a tt-rss költözések között."
-
-#: classes/pref/feeds.php:1425
-msgid "Export my data"
-msgstr "Adataim expotálása"
-
-#: classes/pref/feeds.php:1440
-msgid "Import"
-msgstr "Importálás"
-
-#: classes/pref/feeds.php:1447
+#: classes/pref/feeds.php:1353
 msgid "Firefox integration"
 msgstr "Firefox integráció"
 
-#: classes/pref/feeds.php:1449
+#: classes/pref/feeds.php:1355
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
@@ -2376,44 +2352,19 @@ 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:1456
+#: classes/pref/feeds.php:1362
 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:1464
-msgid "Bookmarklets"
-msgstr ""
-
-#: classes/pref/feeds.php:1466 plugins/bookmarklets/init.php:24
-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 ""
-"Húzza a linket a böngésző eszköztára alá, nyissa meg a böngészőjében a "
-"hírcsatornát és kattintson a linkre a feliratkozáshoz."
-
-#: classes/pref/feeds.php:1470
-#, php-format
-msgid "Subscribe to %s in Tiny Tiny RSS?"
-msgstr "Feliratkozás %s hírcsatornára a Tiny Tiny RSS-ben?"
-
-#: classes/pref/feeds.php:1474
-msgid "Subscribe in Tiny Tiny RSS"
-msgstr "Feliratkozás a Tiny Tiny RSS-ben?"
-
-#: classes/pref/feeds.php:1476 plugins/bookmarklets/init.php:34
-msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
-msgstr ""
-
-#: classes/pref/feeds.php:1484
+#: classes/pref/feeds.php:1370
 msgid "Published & shared articles / Generated feeds"
 msgstr "Publikált és megosztott hírek / Generált hírcsatornák"
 
-#: classes/pref/feeds.php:1486
+#: classes/pref/feeds.php:1372
 msgid "Published articles and generated feeds"
 msgstr "Publikált hírek és generált hírcsatornák"
 
-#: classes/pref/feeds.php:1488
+#: classes/pref/feeds.php:1374
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the URL specified below."
@@ -2421,46 +2372,46 @@ 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:1494
+#: classes/pref/feeds.php:1380
 msgid "Display URL"
 msgstr "URL megjelenítés"
 
-#: classes/pref/feeds.php:1497
+#: classes/pref/feeds.php:1383
 msgid "Clear all generated URLs"
 msgstr "Minden generált URL törlése"
 
-#: classes/pref/feeds.php:1499
+#: classes/pref/feeds.php:1385
 msgid "Articles shared by URL"
 msgstr "URL alapján megosztott hírek"
 
-#: classes/pref/feeds.php:1501
+#: classes/pref/feeds.php:1387
 msgid "You can disable all articles shared by unique URLs here."
 msgstr "Itt minden egyedi URL-el megosztott hírt le lehet tiltani."
 
-#: classes/pref/feeds.php:1504
+#: classes/pref/feeds.php:1390
 msgid "Unshare all articles"
 msgstr "Minden hír megosztásának visszavonása"
 
-#: classes/pref/feeds.php:1579
+#: classes/pref/feeds.php:1468
 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:1616 classes/pref/feeds.php:1685
+#: classes/pref/feeds.php:1505 classes/pref/feeds.php:1574
 msgid "Click to edit feed"
 msgstr "Kattintson a hírcsatorna szerkesztéséhez"
 
-#: classes/pref/feeds.php:1634 classes/pref/feeds.php:1705
+#: classes/pref/feeds.php:1523 classes/pref/feeds.php:1594
 msgid "Unsubscribe from selected feeds"
 msgstr "Leiratkozás a kiválasztott hírcsatornákról"
 
-#: classes/pref/feeds.php:1645
+#: classes/pref/feeds.php:1534
 msgid "These feeds have not been updated because of errors:"
 msgstr "Váratlan hibák miatt ezek a hírcsatornák nem frissültek:"
 
-#: plugins/pocket/pocket.php:24
+#: plugins/pocket/init.php:30
 msgid "Pocket"
 msgstr "Pocket"
 
@@ -2478,68 +2429,193 @@ msgstr ""
 msgid "Back to feeds"
 msgstr "Vissza a hírcsatornákhoz"
 
+#: plugins/digest/digest_body.php:56
+msgid "Hello,"
+msgstr "Üdv,"
+
 #: plugins/digest/digest_body.php:62
 msgid "Regular version"
 msgstr "Alap változat"
 
-#: plugins/pinterest/pinterest.php:23
+#: plugins/nsfw/init.php:32 plugins/nsfw/init.php:43
+msgid "Not work safe (click to toggle)"
+msgstr ""
+
+#: plugins/nsfw/init.php:53
+msgid "NSFW Plugin"
+msgstr ""
+
+#: plugins/nsfw/init.php:80
+msgid "Tags to consider NSFW (comma-separated)"
+msgstr ""
+
+#: plugins/nsfw/init.php:101
+#, fuzzy
+msgid "Configuration saved."
+msgstr "Beállítások elmentve."
+
+#: plugins/pinterest/init.php:29
 msgid "Pinterest"
 msgstr "Pinterest"
 
-#: plugins/mail/mail.php:66 plugins/mail/mail.php:72 plugins/mail/init.php:72
-#: plugins/mail/init.php:78
+#: plugins/auth_internal/init.php:62
+msgid "Please enter your one time password:"
+msgstr "Adja meg az egyszer használatos jelszót:"
+
+#: plugins/auth_internal/init.php:185
+msgid "Password has been changed."
+msgstr "A jelszó megváltoztatva."
+
+#: plugins/auth_internal/init.php:187
+msgid "Old password is incorrect."
+msgstr "A régi jelszó helytelen."
+
+#: plugins/bookmarklets/init.php:22
+msgid "Bookmarklets"
+msgstr ""
+
+#: plugins/bookmarklets/init.php:24
+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 ""
+"Húzza a linket a böngésző eszköztára alá, nyissa meg a böngészőjében a "
+"hírcsatornát és kattintson a linkre a feliratkozáshoz."
+
+#: plugins/bookmarklets/init.php:28
+#, php-format
+msgid "Subscribe to %s in Tiny Tiny RSS?"
+msgstr "Feliratkozás %s hírcsatornára a Tiny Tiny RSS-ben?"
+
+#: plugins/bookmarklets/init.php:32
+msgid "Subscribe in Tiny Tiny RSS"
+msgstr "Feliratkozás a Tiny Tiny RSS-ben?"
+
+#: plugins/bookmarklets/init.php:34
+msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
+msgstr ""
+
+#: plugins/import_export/init.php:64
+msgid "Import and export"
+msgstr "Import és export"
+
+#: plugins/import_export/init.php:66
+msgid "Article archive"
+msgstr "Hír archívum"
+
+#: plugins/import_export/init.php:68
+msgid ""
+"You can export and import your Starred and Archived articles for safekeeping "
+"or when migrating between tt-rss instances."
+msgstr ""
+"A biztonság kedvéért exportálhatja és importálhatja a csillagozott és az "
+"archivált híreket a tt-rss költözések között."
+
+#: plugins/import_export/init.php:71
+msgid "Export my data"
+msgstr "Adataim expotálása"
+
+#: plugins/import_export/init.php:87
+msgid "Import"
+msgstr "Importálás"
+
+#: plugins/import_export/init.php:221
+msgid "Could not import: incorrect schema version."
+msgstr "Nem sikerült az importálás: érvénytelen séma verzió."
+
+#: plugins/import_export/init.php:226
+msgid "Could not import: unrecognized document format."
+msgstr "Nem sikerült az importálás: ismeretlen dokumentum formátum."
+
+#: plugins/import_export/init.php:385
+#, php-format
+msgid "Finished: %d articles processed, %d imported, %d feeds created."
+msgstr ""
+"Elkészült: %d hír feldolgozva, %d importálva, %d hírcsatorna létrehozva."
+
+#: plugins/import_export/init.php:391
+msgid "Could not load XML document."
+msgstr "Az XML dokumentum nem tölthető be."
+
+#: plugins/import_export/init.php:403
+msgid "Prepare data"
+msgstr "Adatok előkészítése"
+
+#: plugins/import_export/init.php:424
+#, php-format
+msgid ""
+"Could not upload file. You might need to adjust upload_max_filesize\n"
+"\t\t\t\tin PHP.ini (current value = %s)"
+msgstr ""
+"Nem lehet feltölteni a fájlt. A php.ini fájlban be kell állítani az "
+"upload_max_filesize értékét\n"
+"\t\t\t\t jelenlegi érték = %s"
+
+#: plugins/mail/init.php:72 plugins/mail/init.php:78
 msgid "[Forwarded]"
 msgstr "[Továbbítva]"
 
-#: plugins/mail/mail.php:66 plugins/mail/init.php:72
+#: plugins/mail/init.php:72
 msgid "Multiple articles"
 msgstr "Többszörös hírek"
 
-#: plugins/mail/mail.php:87
+#: plugins/mail/init.php:93
 msgid "From:"
 msgstr "Feladó:"
 
-#: plugins/mail/mail.php:96
+#: plugins/mail/init.php:102
 msgid "To:"
 msgstr "Címzett:"
 
-#: plugins/mail/mail.php:109
+#: plugins/mail/init.php:115
 msgid "Subject:"
 msgstr "Tárgy:"
 
-#: plugins/mail/mail.php:125
+#: plugins/mail/init.php:131
 msgid "Send e-mail"
 msgstr "Email küldés"
 
-#: plugins/note/note.php:22 plugins/note/note.js:11
+#: plugins/note/init.php:28 plugins/note/note.js:11
 msgid "Edit article note"
 msgstr "Megjegyzés"
 
-#: plugins/example/example.php:29 plugins/example/init.php:38
+#: plugins/example/init.php:38
 msgid "Example Pane"
 msgstr "Példa ablak"
 
-#: plugins/example/example.php:53 plugins/example/init.php:69
+#: plugins/example/init.php:69
 msgid "Sample value"
 msgstr "Példa érték"
 
-#: plugins/example/example.php:59 plugins/example/init.php:75
+#: plugins/example/init.php:75
 msgid "Set value"
 msgstr "Érték megadás"
 
-#: plugins/identica/identica.php:23
+#: plugins/identica/init.php:29
 msgid "Share on identi.ca"
 msgstr "Megosztás az identi.ca-n"
 
-#: plugins/instances/instances.php:29
+#: plugins/owncloud/init.php:35
+msgid "Owncloud"
+msgstr ""
+
+#: plugins/owncloud/init.php:59
+msgid "Owncloud url"
+msgstr ""
+
+#: plugins/owncloud/init.php:74
+msgid "Bookmark on OwnCloud "
+msgstr ""
+
+#: plugins/instances/init.php:144
 msgid "Linked"
 msgstr "Linkelt"
 
-#: plugins/instances/instances.php:180
+#: plugins/instances/init.php:295
 msgid "Link instance"
 msgstr "Link példány"
 
-#: plugins/instances/instances.php:192 plugins/instances/init.php:307
+#: plugins/instances/init.php:307
 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:"
@@ -2548,45 +2624,45 @@ msgstr ""
 "példányokat ehhez. A Tiny Tiny RSS ezen példányához való kapcsolódáshoz ez "
 "az URL használható:"
 
-#: plugins/instances/instances.php:202
+#: plugins/instances/init.php:317
 msgid "Last connected"
 msgstr "Utoljára belépve"
 
-#: plugins/instances/instances.php:203
+#: plugins/instances/init.php:318
 msgid "Status"
 msgstr "Állapot"
 
-#: plugins/instances/instances.php:204
+#: plugins/instances/init.php:319
 msgid "Stored feeds"
 msgstr "Tárolt hírcsatornák"
 
-#: plugins/share/share.php:21
+#: plugins/share/init.php:27
 msgid "Share by URL"
 msgstr "Megosztás URL-el"
 
-#: plugins/share/share.php:43 plugins/share/init.php:49
+#: plugins/share/init.php:49
 msgid "You can share this article by the following unique URL:"
 msgstr "Ezt a hírt megoszthatja a következő egyedi URL segítségével:"
 
-#: plugins/flattr/flattr.php:37
+#: plugins/flattr/init.php:30
 #, fuzzy
-msgid "Flattr article"
+msgid "Flattr this article."
 msgstr "Hír csillagozása"
 
-#: plugins/googleplus/googleplus.php:23
+#: plugins/googleplus/init.php:29
 msgid "Share on Google+"
 msgstr "Megosztás Google+ -on"
 
-#: plugins/updater/updater.php:267 plugins/updater/updater.php:279
+#: plugins/updater/init.php:294 plugins/updater/init.php:306
 #: plugins/updater/updater.js:10
 msgid "Update Tiny Tiny RSS"
 msgstr "Tiny Tiny RSS frissítése"
 
-#: plugins/updater/updater.php:282 plugins/updater/init.php:303
+#: plugins/updater/init.php:309
 msgid "Your Tiny Tiny RSS installation is up to date."
 msgstr "A Tiny Tiny RSS telepítés naprakész."
 
-#: plugins/updater/updater.php:291 plugins/updater/init.php:313
+#: plugins/updater/init.php:319
 msgid ""
 "Do not close this dialog until updating is finished. Backup your tt-rss "
 "directory before continuing."
@@ -2594,22 +2670,25 @@ msgstr ""
 "Ne zárja be amíg a frissítés be nem fejeződik. A folytatás előtt mentse el a "
 "tt-rss könyvtárának tartalmát."
 
-#: plugins/updater/updater.php:294 plugins/updater/init.php:316
+#: plugins/updater/init.php:322
 msgid "Ready to update."
 msgstr "Frissítésre kész."
 
-#: plugins/updater/updater.php:299 plugins/updater/init.php:321
+#: plugins/updater/init.php:327
 msgid "Start update"
 msgstr "Frissítés indtása"
 
-#: js/feedlist.js:283 js/feedlist.js:282 js/feedlist.js:265 js/feedlist.js:218
+#: plugins/tweet/init.php:29
+#, fuzzy
+msgid "Share on Twitter"
+msgstr "Megosztás az identi.ca-n"
+
+#: js/feedlist.js:218
 msgid "New articles available in this feed (click to show)"
 msgstr ""
 "Új hírek érhetők el ebben a csatornában (kattintson a megjelenítésükhöz)"
 
-#: js/feedlist.js:490 js/feedlist.js:505 js/feedlist.js:489 js/feedlist.js:504
-#: js/feedlist.js:469 js/feedlist.js:484 js/feedlist.js:420 js/feedlist.js:435
-#: plugins/digest/digest.js:25
+#: js/feedlist.js:420 js/feedlist.js:435 plugins/digest/digest.js:25
 msgid "Mark all articles in %s as read?"
 msgstr "Minden hírt megjelöl olvasottként itt: %s?"
 
@@ -2622,75 +2701,71 @@ msgstr ""
 "jelentés tartalmazni a fogja a böngésző információit. Az IP címe el lesz "
 "tárolva az adatbázisban."
 
-#: js/functions.js:618 js/functions.js:614 js/functions.js:622
+#: js/functions.js:627
 msgid "Date syntax appears to be correct:"
 msgstr "A dátum szintaxisa helyesnek tűnik:"
 
-#: js/functions.js:621 js/functions.js:617 js/functions.js:625
+#: js/functions.js:630
 msgid "Date syntax is incorrect."
 msgstr "A dátum szintaxisa helytelen."
 
-#: js/functions.js:748 js/functions.js:744 js/functions.js:752
+#: js/functions.js:757
 msgid "Remove stored feed icon?"
 msgstr "Eltávolítja a hírcsatorna tárolt ikonját?"
 
-#: js/functions.js:780 js/functions.js:776 js/functions.js:784
+#: js/functions.js:789
 msgid "Please select an image file to upload."
 msgstr "Kérem válasszon egy feltöltendő képet."
 
-#: js/functions.js:782 js/functions.js:778 js/functions.js:786
+#: js/functions.js:791
 msgid "Upload new icon for this feed?"
 msgstr "Új ikon tölt fel ehhez a hírcsatornához?"
 
-#: js/functions.js:799 js/functions.js:795 js/functions.js:803
+#: js/functions.js:808
 msgid "Please enter label caption:"
 msgstr "Adja meg  címke nevét:"
 
-#: js/functions.js:804 js/functions.js:800 js/functions.js:808
+#: js/functions.js:813
 msgid "Can't create label: missing caption."
 msgstr "Címke létrehozása sikertelen: nincs megadva név."
 
-#: js/functions.js:847 js/functions.js:843 js/functions.js:851
+#: js/functions.js:856
 msgid "Subscribe to Feed"
 msgstr "Feliratkozás hírcsatornára"
 
-#: js/functions.js:874 js/functions.js:870 js/functions.js:878
+#: js/functions.js:883
 msgid "Subscribed to %s"
 msgstr "Feliratkozva ide: %s"
 
-#: js/functions.js:879 js/functions.js:875 js/functions.js:883
+#: js/functions.js:888
 msgid "Specified URL seems to be invalid."
 msgstr "A megadott URL érvénytelennek tűnik."
 
-#: js/functions.js:882 js/functions.js:878 js/functions.js:886
+#: js/functions.js:891
 msgid "Specified URL doesn't seem to contain any feeds."
 msgstr "A megadott URL nem tartalmaz hírcsatornákat."
 
-#: js/functions.js:935 js/functions.js:931 js/functions.js:939
+#: js/functions.js:944
 msgid "Couldn't download the specified URL: %s"
 msgstr "A megadott URL nem tölthető be: %s"
 
-#: js/functions.js:939 js/functions.js:935 js/functions.js:943
+#: js/functions.js:948
 msgid "You are already subscribed to this feed."
 msgstr "Már feliratkozott erre a hírcsatornára."
 
-#: js/functions.js:1067 js/functions.js:1063 js/functions.js:1071
-#: js/functions.js:1073
+#: js/functions.js:1078
 msgid "Edit rule"
 msgstr "Szabály szerkesztése"
 
-#: js/functions.js:1093 js/functions.js:1089 js/functions.js:1097
-#: js/functions.js:1099
+#: js/functions.js:1104
 msgid "Edit action"
 msgstr "Művelet szerkesztése"
 
-#: js/functions.js:1130 js/functions.js:1126 js/functions.js:1134
-#: js/functions.js:1136
+#: js/functions.js:1141
 msgid "Create Filter"
 msgstr "Szűrő létrehozás"
 
-#: js/functions.js:1234 js/functions.js:1230 js/functions.js:1238
-#: js/functions.js:1240
+#: js/functions.js:1245
 msgid ""
 "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
 "hub again on next feed update."
@@ -2698,48 +2773,37 @@ msgstr ""
 "Feliratkozás visszaállítása? a következő frissítéskor Tiny Tiny RSS "
 "megpróbál automatikusan újra feliratkozni."
 
-#: js/functions.js:1255 js/tt-rss.js:421 js/functions.js:1251 js/tt-rss.js:381
-#: js/functions.js:1259 js/tt-rss.js:367 js/functions.js:1261
+#: js/functions.js:1266 js/tt-rss.js:367
 msgid "Unsubscribe from %s?"
 msgstr "Leiratkozik innen: %s?"
 
-#: js/functions.js:1362 js/functions.js:1358 js/functions.js:1368
-#: js/functions.js:1370
+#: js/functions.js:1375
 msgid "Please enter category title:"
 msgstr "Adja meg a kategória címét:"
 
-#: js/functions.js:1393 js/functions.js:1389 js/functions.js:1399
-#: js/functions.js:1401
+#: js/functions.js:1406
 msgid "Generate new syndication address for this feed?"
 msgstr "Új hírszolgáltatási cím generálásása ehhez a hírcsatornához?"
 
-#: js/functions.js:1584 js/tt-rss.js:400 js/tt-rss.js:903 js/functions.js:1580
-#: js/tt-rss.js:782 js/tt-rss.js:362 js/tt-rss.js:717 js/functions.js:1590
-#: js/tt-rss.js:348 js/tt-rss.js:709 js/functions.js:1592
+#: js/functions.js:1597 js/tt-rss.js:348 js/tt-rss.js:713
 msgid "You can't edit this kind of feed."
 msgstr "Ezt a hírcsatornatípust nem szerkesztheted."
 
-#: js/functions.js:1599 js/functions.js:1595 js/functions.js:1605
-#: js/functions.js:1607
+#: js/functions.js:1612
 msgid "Edit Feed"
 msgstr "Hírcsatorna szerkesztése"
 
-#: js/functions.js:1637 js/functions.js:1633 js/functions.js:1643
-#: js/functions.js:1645
+#: js/functions.js:1650
 msgid "More Feeds"
 msgstr "További hírcsatornák"
 
-#: js/functions.js:1698 js/functions.js:1808 js/prefs.js:408 js/prefs.js:438
-#: js/prefs.js:470 js/prefs.js:653 js/prefs.js:673 js/prefs.js:1326
-#: js/prefs.js:1471 js/functions.js:1694 js/functions.js:1804 js/prefs.js:397
-#: js/prefs.js:427 js/prefs.js:459 js/prefs.js:642 js/prefs.js:662
-#: js/prefs.js:1213 js/prefs.js:1358 js/functions.js:1704 js/functions.js:1814
-#: js/prefs.js:1203 js/prefs.js:1348 js/functions.js:1706 js/functions.js:1816
+#: js/functions.js:1711 js/functions.js:1821 js/prefs.js:397 js/prefs.js:427
+#: js/prefs.js:459 js/prefs.js:642 js/prefs.js:662 js/prefs.js:1203
+#: js/prefs.js:1348
 msgid "No feeds are selected."
 msgstr "Nincs kiválasztott hírcsatorna."
 
-#: js/functions.js:1740 js/functions.js:1736 js/functions.js:1746
-#: js/functions.js:1748
+#: js/functions.js:1753
 msgid ""
 "Remove selected feeds from the archive? Feeds with stored articles will not "
 "be removed."
@@ -2747,16 +2811,18 @@ msgstr ""
 "Eltávolítja a kijelölt hírcsatornákat az archívumból? A tárolt hírekkel "
 "rendelkező hírcsatornák nem lesznek törölve."
 
-#: js/functions.js:1779 js/functions.js:1775 js/functions.js:1785
-#: js/functions.js:1787
+#: js/functions.js:1792
 msgid "Feeds with update errors"
 msgstr "Hírcsatornák frissítési hibával"
 
-#: js/functions.js:1790 js/prefs.js:1308 js/functions.js:1786 js/prefs.js:1195
-#: js/functions.js:1796 js/prefs.js:1185 js/functions.js:1798
+#: js/functions.js:1803 js/prefs.js:1185
 msgid "Remove selected feeds?"
 msgstr "Eltávolítja a kiválasztott hírcsatornákat?"
 
+#: js/functions.js:1904
+msgid "Help"
+msgstr "Súgó"
+
 #: js/PrefFeedTree.js:47
 msgid "Edit category"
 msgstr "Kategória szerkesztése"
@@ -2777,24 +2843,23 @@ msgstr "Kérem adja meg a felhasználói nevét:"
 msgid "Can't create user: no login specified."
 msgstr "Felhasználó létrehozása sikertelen, nincs megadva felhasználói név."
 
-#: js/prefs.js:128 js/prefs.js:117
+#: js/prefs.js:117
 msgid "Edit Filter"
 msgstr "Szűrő szerkesztése"
 
-#: js/prefs.js:175 js/prefs.js:164
+#: js/prefs.js:164
 msgid "Remove filter?"
 msgstr "Eltávolítja szűrőt?"
 
-#: js/prefs.js:290 js/prefs.js:279
+#: js/prefs.js:279
 msgid "Remove selected labels?"
 msgstr "Eltávolítja a kiválasztott címkéket?"
 
-#: js/prefs.js:306 js/prefs.js:1512 js/prefs.js:295 js/prefs.js:1399
-#: js/prefs.js:1389
+#: js/prefs.js:295 js/prefs.js:1389
 msgid "No labels are selected."
 msgstr "Nincs kiválasztott címke."
 
-#: js/prefs.js:320 js/prefs.js:309
+#: js/prefs.js:309
 msgid ""
 "Remove selected users? Neither default admin nor your account will be "
 "removed."
@@ -2802,382 +2867,283 @@ msgstr ""
 "Eltávolítja a kijelölt felhasználókat? Az alapértelmezett admin és az ön "
 "fiókja nem lesz törölve."
 
-#: js/prefs.js:337 js/prefs.js:518 js/prefs.js:539 js/prefs.js:578
 #: js/prefs.js:326 js/prefs.js:507 js/prefs.js:528 js/prefs.js:567
 msgid "No users are selected."
 msgstr "Nincs kijelölt felhasználó."
 
-#: js/prefs.js:355 js/prefs.js:344
+#: js/prefs.js:344
 msgid "Remove selected filters?"
 msgstr "Eltávolítja a kiválasztott szűrőket?"
 
-#: js/prefs.js:370 js/prefs.js:608 js/prefs.js:627 js/prefs.js:359
-#: js/prefs.js:597 js/prefs.js:616
+#: js/prefs.js:359 js/prefs.js:597 js/prefs.js:616
 msgid "No filters are selected."
 msgstr "Nincs kiválasztott szűrő."
 
-#: js/prefs.js:389 js/prefs.js:378
+#: js/prefs.js:378
 msgid "Unsubscribe from selected feeds?"
 msgstr "Leiratkozik a kiválasztott hírcsatornákról?"
 
-#: js/prefs.js:423 js/prefs.js:412
+#: js/prefs.js:412
 msgid "Please select only one feed."
 msgstr "Kérem csak egy hírcsatornát jelöljön meg!"
 
-#: js/prefs.js:429 js/prefs.js:418
+#: js/prefs.js:418
 msgid "Erase all non-starred articles in selected feed?"
 msgstr "Eltávolítja az összes csillag nélküli hírt a kijelölt hírcsatornából?"
 
-#: js/prefs.js:451 js/prefs.js:440
+#: js/prefs.js:440
 msgid "How many days of articles to keep (0 - use default)?"
 msgstr ""
 "Milyen régi híreket szeretne megtartani  (napokban; 0 - alapértelmezett)?"
 
-#: js/prefs.js:489 js/prefs.js:478
+#: js/prefs.js:478
 msgid "Login field cannot be blank."
 msgstr "A felhasználói név nem maradhat üresen."
 
-#: js/prefs.js:523 js/prefs.js:544 js/prefs.js:583 js/prefs.js:512
-#: js/prefs.js:533 js/prefs.js:572
+#: js/prefs.js:512 js/prefs.js:533 js/prefs.js:572
 msgid "Please select only one user."
 msgstr "Kérem csak egy felhasználót jelöljön meg!"
 
-#: js/prefs.js:548 js/prefs.js:537
+#: js/prefs.js:537
 msgid "Reset password of selected user?"
 msgstr "Visszaállítja  akiválasztott felhasználók jelszavakit?"
 
-#: js/prefs.js:613 js/prefs.js:602
+#: js/prefs.js:602
 msgid "Please select only one filter."
 msgstr "Kérem csak egy szűrőt jelöljön meg!"
 
-#: js/prefs.js:631 js/prefs.js:620
+#: js/prefs.js:620
 msgid "Combine selected filters?"
 msgstr "Egyesíti a kiválasztott szűrőket?"
 
-#: js/prefs.js:695 js/prefs.js:684
+#: js/prefs.js:684
 msgid "Edit Multiple Feeds"
 msgstr "Több hírcsatorna szerkesztése"
 
-#: js/prefs.js:719 js/prefs.js:708
+#: js/prefs.js:708
 msgid "Save changes to selected feeds?"
 msgstr "Leiratkozik a kiválasztott hírcsatornákról?"
 
-#: js/prefs.js:811 js/prefs.js:800 js/prefs.js:790
+#: js/prefs.js:790
 msgid "OPML Import"
 msgstr "OPML importálás"
 
-#: js/prefs.js:838 js/prefs.js:827 js/prefs.js:817
+#: js/prefs.js:817
 msgid "Please choose an OPML file first."
 msgstr "Először válasszon egy OPML fjlt."
 
-#: js/prefs.js:854 plugins/import_export/import_export.js:112
-msgid "Please choose the file first."
-msgstr "Először válassza ki a fájlt."
-
-#: js/prefs.js:1010 js/prefs.js:983 js/prefs.js:973
+#: js/prefs.js:973
 msgid "Reset to defaults?"
 msgstr "Visszaállítja a gyári beállításokat?"
 
-#: js/prefs.js:1215 js/prefs.js:1102 js/prefs.js:1092
+#: js/prefs.js:1092
 msgid ""
 "Remove category %s? Any nested feeds would be placed into Uncategorized."
 msgstr ""
 "Eltávolítja %s kategóriát? Minden tartalmazott hírcsatorna a "
 "Kategorizálatlanba fog kerülni."
 
-#: js/prefs.js:1242 js/prefs.js:1129 js/prefs.js:1119
+#: js/prefs.js:1119
 msgid "Remove selected categories?"
 msgstr "Kiválasztott kategóriák eltávolítása?"
 
-#: js/prefs.js:1258 js/prefs.js:1145 js/prefs.js:1135
+#: js/prefs.js:1135
 msgid "No categories are selected."
 msgstr "Nincs kategória kiválaszta."
 
-#: js/prefs.js:1266 js/prefs.js:1153 js/prefs.js:1143
+#: js/prefs.js:1143
 msgid "Category title:"
 msgstr "Kategória címe:"
 
-#: js/prefs.js:1297 js/prefs.js:1184 js/prefs.js:1174
+#: js/prefs.js:1174
 msgid "Feeds without recent updates"
 msgstr "Hírcsatornák frissítések nélkül"
 
-#: js/prefs.js:1346 js/prefs.js:1233 js/prefs.js:1223
+#: js/prefs.js:1223
 msgid "Replace current OPML publishing address with a new one?"
 msgstr "Lecseréli a jelenlegi OPML hírcsatornája címét egy újra?"
 
-#: js/prefs.js:1455 js/prefs.js:1342 js/prefs.js:1332
+#: js/prefs.js:1332
 msgid "Rescore articles in selected feeds?"
 msgstr "Újrapontszámozza a híreket a kijelölt hírcsatornákban?"
 
-#: js/prefs.js:1478 js/prefs.js:1365 js/prefs.js:1355
+#: js/prefs.js:1355
 msgid "Rescore all articles? This operation may take a lot of time."
 msgstr "Újrapontoz minden cíkket? Ez a művelet hosszú ideig is eltarthat."
 
-#: js/prefs.js:1498 js/prefs.js:1385 js/prefs.js:1375
+#: js/prefs.js:1375
 msgid "Reset selected labels to default colors?"
 msgstr "Visszaállítja a kijelölt címkék színét az alapértelmezettre?"
 
-#: js/prefs.js:1535 js/prefs.js:1422 js/prefs.js:1412
+#: js/prefs.js:1412
 msgid "Settings Profiles"
 msgstr "Beállítási profilok"
 
-#: js/prefs.js:1544 js/prefs.js:1431 js/prefs.js:1421
+#: js/prefs.js:1421
 msgid ""
 "Remove selected profiles? Active and default profiles will not be removed."
 msgstr ""
 "Eltávolítja a kijelölt profilokat? Az aktív és az alapértelmezett profil nem "
 "lesz törölve."
 
-#: js/prefs.js:1562 js/prefs.js:1449 js/prefs.js:1439
+#: js/prefs.js:1439
 msgid "No profiles are selected."
 msgstr "Nincsenek kiválasztott profilok."
 
-#: js/prefs.js:1570 js/prefs.js:1623 js/prefs.js:1457 js/prefs.js:1510
 #: js/prefs.js:1447 js/prefs.js:1500
 msgid "Activate selected profile?"
 msgstr "Aktiválja a kiválasztott profilt?"
 
-#: js/prefs.js:1586 js/prefs.js:1639 js/prefs.js:1473 js/prefs.js:1526
 #: js/prefs.js:1463 js/prefs.js:1516
 msgid "Please choose a profile to activate."
 msgstr "Válasszon egy aktiválandó profilt."
 
-#: js/prefs.js:1647 js/prefs.js:1534 js/prefs.js:1524
+#: js/prefs.js:1524
 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr ""
 "Ez érvényteleníteni fog minden korábban generált hírcsatorna URL-t. "
 "Folytatja?"
 
-#: js/prefs.js:1666 js/prefs.js:1553 js/prefs.js:1543
+#: js/prefs.js:1543
 msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr ""
 "Ez érvényteleníteni fog minden korábban megosztott hír URL-t. Folytatja?"
 
-#: js/prefs.js:1764 js/prefs.js:1651 js/prefs.js:1641
+#: js/prefs.js:1641
 msgid "Label Editor"
 msgstr "Címke Szerkesztő"
 
-#: js/prefs.js:1827 js/prefs.js:1714 js/prefs.js:1704
+#: js/prefs.js:1704
 msgid ""
 "This will clear your stored authentication information for Twitter. Continue?"
 msgstr ""
 "Ez törölni fogja a Twitter tárolt hitelesítési információit. Folytatja?"
 
-#: js/prefs.js:1911 plugins/import_export/import_export.js:13
-msgid "Export Data"
-msgstr "Adatok exportálása"
-
-#: js/prefs.js:1938 plugins/import_export/import_export.js:40
-msgid ""
-"Finished, exported %d articles. You can download the data <a "
-"class='visibleLink' href='%u'>here</a>."
-msgstr ""
-"%d hír exportálása befejezve. Az adatokat <a class='visibleLink' "
-"href='%u'>innen</a> letöltheti."
-
-#: js/prefs.js:1991 plugins/import_export/import_export.js:93
-msgid "Data Import"
-msgstr "Adatok importálása"
-
-#: js/prefs.js:2027 js/prefs.js:1794 js/prefs.js:1784
+#: js/prefs.js:1784
 msgid "Subscribing to feeds..."
 msgstr "Feliratkozás a hírcsatornákra..."
 
-#: js/tt-rss.js:147 js/tt-rss.js:141 js/tt-rss.js:120
+#: js/prefs.js:1821
+msgid "Clear stored data for this plugin?"
+msgstr "Törli a plugin tárolt adatait?"
+
+#: js/tt-rss.js:120
 msgid "Mark all articles as read?"
 msgstr "Minden hírt megjelöl olvasottként?"
 
-#: js/tt-rss.js:410 js/tt-rss.js:370 js/tt-rss.js:356
+#: js/tt-rss.js:356
 msgid "You can't unsubscribe from the category."
 msgstr "Ebből a kategóriából nem ."
 
-#: js/tt-rss.js:415 js/tt-rss.js:596 js/tt-rss.js:591 js/tt-rss.js:375
-#: js/tt-rss.js:525 js/tt-rss.js:361 js/tt-rss.js:511
+#: js/tt-rss.js:361 js/tt-rss.js:511
 msgid "Please select some feed first."
 msgstr "Válasszon hírcsatorná(ka)t!"
 
-#: js/tt-rss.js:591 js/tt-rss.js:586 js/tt-rss.js:520 js/tt-rss.js:506
+#: js/tt-rss.js:506
 msgid "You can't rescore this kind of feed."
 msgstr "Ez a hírcsatorna típust nem lehet újraponszámozni."
 
-#: js/tt-rss.js:601 js/tt-rss.js:596 js/tt-rss.js:530 js/tt-rss.js:516
+#: js/tt-rss.js:516
 msgid "Rescore articles in %s?"
 msgstr "Újrapontszámozza %s híreit?"
 
-#: js/tt-rss.js:1062 js/tt-rss.js:883 js/tt-rss.js:825 js/tt-rss.js:830
+#: js/tt-rss.js:672
+msgid "Please enable mail plugin first."
+msgstr "Először engedélyezze a mail plugint."
+
+#: js/tt-rss.js:834
 msgid "New version available!"
 msgstr "Új verzió érhető el."
 
-#: js/viewfeed.js:108 js/viewfeed.js:104
+#: js/viewfeed.js:104
 msgid "Cancel search"
 msgstr "Keresés megszakítása"
 
-#: js/viewfeed.js:456 js/viewfeed.js:445 js/viewfeed.js:451 js/viewfeed.js:435
-#: plugins/digest/digest.js:257 plugins/digest/digest.js:696
+#: js/viewfeed.js:435 plugins/digest/digest.js:257
+#: plugins/digest/digest.js:696
 msgid "Unstar article"
 msgstr "Csillagot levesz a hírről"
 
-#: js/viewfeed.js:461 js/viewfeed.js:450 js/viewfeed.js:456 js/viewfeed.js:440
-#: plugins/digest/digest.js:259 plugins/digest/digest.js:700
+#: js/viewfeed.js:440 plugins/digest/digest.js:259
+#: plugins/digest/digest.js:700
 msgid "Star article"
 msgstr "Hír csillagozása"
 
-#: js/viewfeed.js:496 js/viewfeed.js:485 js/viewfeed.js:491 js/viewfeed.js:473
-#: plugins/digest/digest.js:262 plugins/digest/digest.js:731
+#: js/viewfeed.js:473 plugins/digest/digest.js:262
+#: plugins/digest/digest.js:731
 msgid "Unpublish article"
 msgstr "Publikálás visszavonása"
 
-#: js/viewfeed.js:676 js/viewfeed.js:704 js/viewfeed.js:731 js/viewfeed.js:793
-#: js/viewfeed.js:825 js/viewfeed.js:962 js/viewfeed.js:1005
-#: js/viewfeed.js:1055 js/viewfeed.js:2181 js/viewfeed.js:665
-#: js/viewfeed.js:693 js/viewfeed.js:720 js/viewfeed.js:782 js/viewfeed.js:814
-#: js/viewfeed.js:951 js/viewfeed.js:994 js/viewfeed.js:1044
-#: js/viewfeed.js:2154 js/viewfeed.js:671 js/viewfeed.js:699
-#: js/viewfeed.js:726 js/viewfeed.js:788 js/viewfeed.js:820 js/viewfeed.js:957
-#: js/viewfeed.js:1000 js/viewfeed.js:1050 js/viewfeed.js:2018
 #: js/viewfeed.js:674 js/viewfeed.js:702 js/viewfeed.js:729 js/viewfeed.js:791
 #: js/viewfeed.js:823 js/viewfeed.js:960 js/viewfeed.js:1003
 #: js/viewfeed.js:1053 js/viewfeed.js:1927 plugins/mail/mail.js:7
 msgid "No articles are selected."
 msgstr "Nincsen kiválasztott hír."
 
-#: js/viewfeed.js:942 js/viewfeed.js:931 js/viewfeed.js:937 js/viewfeed.js:940
+#: js/viewfeed.js:940
 msgid "Mark all visible articles in %s as read?"
 msgstr "Minden látható hírt megjelöl olvasottként itt: %s?"
 
-#: js/viewfeed.js:970 js/viewfeed.js:959 js/viewfeed.js:965 js/viewfeed.js:968
+#: js/viewfeed.js:968
 msgid "Delete %d selected articles in %s?"
 msgstr "%d kijelölt hír törlése innen: %s?"
 
-#: js/viewfeed.js:972 js/viewfeed.js:961 js/viewfeed.js:967 js/viewfeed.js:970
+#: js/viewfeed.js:970
 msgid "Delete %d selected articles?"
 msgstr "Törli a %d kijelölt hírt?"
 
-#: js/viewfeed.js:1014 js/viewfeed.js:1003 js/viewfeed.js:1009
 #: js/viewfeed.js:1012
 msgid "Archive %d selected articles in %s?"
 msgstr "%d kijelölt hír archiválása inne: %s?"
 
-#: js/viewfeed.js:1017 js/viewfeed.js:1006 js/viewfeed.js:1012
 #: js/viewfeed.js:1015
 msgid "Move %d archived articles back?"
 msgstr "%d archivált hír visszaállítása?"
 
-#: js/viewfeed.js:1061 js/viewfeed.js:1050 js/viewfeed.js:1056
 #: js/viewfeed.js:1059
 msgid "Mark %d selected articles in %s as read?"
 msgstr "%d kijelölt hír megjelölése olvasottként itt: %s?"
 
-#: js/viewfeed.js:1085 js/viewfeed.js:1074 js/viewfeed.js:1080
 #: js/viewfeed.js:1083
 msgid "Edit article Tags"
 msgstr "Hír címkéinek szerkesztése"
 
-#: js/viewfeed.js:1247 js/viewfeed.js:1236 js/viewfeed.js:1242
 #: js/viewfeed.js:1252
 msgid "No article is selected."
 msgstr "Nincs kiválasztott hír."
 
-#: js/viewfeed.js:1282 js/viewfeed.js:1271 js/viewfeed.js:1277
 #: js/viewfeed.js:1287
 msgid "No articles found to mark"
 msgstr "Nincs megjelölendő hír."
 
-#: js/viewfeed.js:1284 js/viewfeed.js:1273 js/viewfeed.js:1279
 #: js/viewfeed.js:1289
 msgid "Mark %d article(s) as read?"
 msgstr "%d hír megjelölése olvasottként?"
 
-#: js/viewfeed.js:1402 js/viewfeed.js:1383
-msgid "Loading..."
-msgstr "Betöltés..."
-
-#: js/viewfeed.js:1891 js/viewfeed.js:1864 js/viewfeed.js:1734
 #: js/viewfeed.js:1744
 msgid "Open original article"
 msgstr "Eredeti hír megjelenítése"
 
-#: js/viewfeed.js:1897 js/viewfeed.js:1870
-msgid "View in a tt-rss tab"
-msgstr "Megtekintés egy tt-rss fülön"
-
-#: js/viewfeed.js:1905 js/viewfeed.js:1878 js/viewfeed.js:1742
-#: js/viewfeed.js:1752
-msgid "Mark above as read"
-msgstr "Olvasottnak jel ez fölött"
-
-#: js/viewfeed.js:1911 js/viewfeed.js:1884 js/viewfeed.js:1748
-#: js/viewfeed.js:1758
-msgid "Mark below as read"
-msgstr "Olvasottnak jel ez alatt"
-
-#: js/viewfeed.js:1967 js/viewfeed.js:1940 js/viewfeed.js:1804
 #: js/viewfeed.js:1814
 msgid "Remove label"
 msgstr "Címke eltávolítás"
 
-#: js/viewfeed.js:1991 js/viewfeed.js:1964 js/viewfeed.js:1828
 #: js/viewfeed.js:1838
 msgid "Playing..."
 msgstr "Lejátszás..."
 
-#: js/viewfeed.js:1992 js/viewfeed.js:1965 js/viewfeed.js:1829
 #: js/viewfeed.js:1839
 msgid "Click to pause"
 msgstr "Kattintson a megállításhoz"
 
-#: js/viewfeed.js:2150 js/viewfeed.js:2123 js/viewfeed.js:1987
 #: js/viewfeed.js:1896
 msgid "Please enter new score for selected articles:"
 msgstr "Adjon meg egy új pontszámot a kijelölt hírekhez:"
 
-#: js/viewfeed.js:2192 js/viewfeed.js:2165 js/viewfeed.js:2029
 #: js/viewfeed.js:1938
 msgid "Please enter new score for this article:"
 msgstr "Adjon meg egy új pontszámot a hírhez:"
 
-#: js/functions.js:1887 js/functions.js:1891 js/functions.js:1897
-#: js/functions.js:1899
-msgid "Help"
-msgstr "Súgó"
-
-#: js/prefs.js:1831 js/prefs.js:1821
-msgid "Clear stored data for this plugin?"
-msgstr "Törli a plugin tárolt adatait?"
-
-#: js/tt-rss.js:741 js/tt-rss.js:676 js/tt-rss.js:668
-msgid "Please enable mail plugin first."
-msgstr "Először engedélyezze a mail plugint."
-
-#: plugins/digest/digest_body.php:39
-msgid "Your browser doesn't support Javascript, which is required"
-msgstr ""
-
-#: plugins/nsfw/init.php:32 plugins/nsfw/init.php:43
-msgid "Not work safe (click to toggle)"
-msgstr ""
-
-#: plugins/nsfw/init.php:53
-msgid "NSFW Plugin"
-msgstr ""
-
-#: plugins/nsfw/init.php:80
-msgid "Tags to consider NSFW (comma-separated)"
-msgstr ""
-
-#: plugins/nsfw/init.php:101
-#, fuzzy
-msgid "Configuration saved."
-msgstr "Beállítások elmentve."
-
-#: plugins/owncloud/init.php:35
-msgid "Owncloud"
-msgstr ""
-
-#: plugins/owncloud/init.php:59
-msgid "Owncloud url"
-msgstr ""
-
 #: plugins/digest/digest.js:71
 #, fuzzy
 msgid "Mark %d displayed articles as read?"
@@ -3207,6 +3173,26 @@ msgstr "Tárolt hírcsatornák"
 msgid "Load more..."
 msgstr "Betöltés..."
 
+#: plugins/import_export/import_export.js:13
+msgid "Export Data"
+msgstr "Adatok exportálása"
+
+#: plugins/import_export/import_export.js:40
+msgid ""
+"Finished, exported %d articles. You can download the data <a "
+"class='visibleLink' href='%u'>here</a>."
+msgstr ""
+"%d hír exportálása befejezve. Az adatokat <a class='visibleLink' "
+"href='%u'>innen</a> letöltheti."
+
+#: plugins/import_export/import_export.js:93
+msgid "Data Import"
+msgstr "Adatok importálása"
+
+#: plugins/import_export/import_export.js:112
+msgid "Please choose the file first."
+msgstr "Először válassza ki a fájlt."
+
 #: plugins/mail/mail.js:21
 #, fuzzy
 msgid "Forward article by email"
@@ -3250,3 +3236,92 @@ msgid ""
 msgstr ""
 "Ne zárja be amíg a frissítés be nem fejeződik. A folytatás előtt mentse el a "
 "tt-rss könyvtárának tartalmát."
+
+#~ msgid "Comments?"
+#~ msgstr "Hozzászólások?"
+
+#~ msgid "News"
+#~ msgstr "Hírek"
+
+#~ msgid "Move between feeds"
+#~ msgstr "Hírcsatornák közötti mozgás"
+
+#~ msgid "Move between articles"
+#~ msgstr "Mozgás hírek között"
+
+#~ msgid "Active article actions"
+#~ msgstr "Aktív hírre vonatkozó műveletek"
+
+#~ msgid "Mark articles below/above active one as read"
+#~ msgstr "Az aktív hír fölöttit/alattit olvasottnak jelöli"
+
+#~ msgid "Scroll article content"
+#~ msgstr "Hírtartalom görgetése"
+
+#~ msgid "Other actions"
+#~ msgstr "Egyéb műveletek"
+
+#~ msgid "Display this help dialog"
+#~ msgstr "A jelenlegi súgóablak megjelenítése"
+
+#, fuzzy
+#~ msgid "Multiple articles actions"
+#~ msgstr "Az összes hír"
+
+#~ msgid "Select starred articles"
+#~ msgstr "Csillagozott hírek kijelölése"
+
+#~ msgid "Feed actions"
+#~ msgstr "Hírcsatorna-műveletek"
+
+#~ msgid "Mark feed as read"
+#~ msgstr "Hírcsatorna megjelölése olvasottként"
+
+#~ msgid "If viewing category, (un)collapse it"
+#~ msgstr "Ha kategóriát böngész, csukja össze/nyissa szét"
+
+#~ msgid "Press any key to close this window."
+#~ msgstr "Az ablak bezárásához nyomjon meg egy billentyűt!"
+
+#~ msgid "My Feeds"
+#~ msgstr "Saját hírcsatornák"
+
+#~ msgid "Panel actions"
+#~ msgstr "Panelműveletek"
+
+#~ msgid "Top 25 feeds"
+#~ msgstr "A legfelső 25 hírcsatorna"
+
+#~ msgid "Edit feed categories"
+#~ msgstr "Kategóriák szerkesztése"
+
+#~ msgid ""
+#~ "<b>Note:</b> not all actions may be available, depending on Tiny Tiny RSS "
+#~ "configuration and your access level."
+#~ msgstr ""
+#~ "<b>Megjegyzés:</b> a Tiny Tiny RSS beállításaitól és a hozzáférési "
+#~ "szinttől függően nem minden művelet lesz elérhető."
+
+#~ msgid "Fatal: authentication module %s not found."
+#~ msgstr "Hiba: %s hitelesítési modul nem található."
+
+#~ msgid "Open article in new tab"
+#~ msgstr "Hír megnyitása új fülön"
+
+#~ msgid "Select theme"
+#~ msgstr "Stílusválasztó"
+
+#~ msgid "Right-to-left content"
+#~ msgstr "Jobbról balra tartó tartalom"
+
+#~ msgid "Cache content locally"
+#~ msgstr "Tartalom helyi gyorstárazása"
+
+#~ msgid "Mark posts as updated on content change"
+#~ msgstr "Tartalom megváltozásakor jelölje a postokat frissítettként"
+
+#~ msgid "Loading..."
+#~ msgstr "Betöltés..."
+
+#~ msgid "View in a tt-rss tab"
+#~ msgstr "Megtekintés egy tt-rss fülön"
diff --git a/locale/it_IT/LC_MESSAGES/messages.mo b/locale/it_IT/LC_MESSAGES/messages.mo
index 053f4e60d..bd550eb4e 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 71304652d..f69bcf39d 100644
--- a/locale/it_IT/LC_MESSAGES/messages.po
+++ b/locale/it_IT/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: 2013-03-17 19:37+0400\n"
+"POT-Creation-Date: 2013-03-19 10:14+0400\n"
 "PO-Revision-Date: 2012-02-14 08:31+0000\n"
 "Last-Translator: gothfox <cthulhoo@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,79 +18,79 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: backend.php:67
+#: backend.php:71
 msgid "Use default"
 msgstr "Utilizza predefiniti"
 
-#: backend.php:68
+#: backend.php:72
 msgid "Never purge"
 msgstr "Non pulire mai"
 
-#: backend.php:69
+#: backend.php:73
 msgid "1 week old"
 msgstr "Vecchi di 1 settimana"
 
-#: backend.php:70
+#: backend.php:74
 msgid "2 weeks old"
 msgstr "Vecchi di 2 settimane"
 
-#: backend.php:71
+#: backend.php:75
 msgid "1 month old"
 msgstr "Vecchi di 1 mese"
 
-#: backend.php:72
+#: backend.php:76
 msgid "2 months old"
 msgstr "Vecchi di 2 mesi"
 
-#: backend.php:73
+#: backend.php:77
 msgid "3 months old"
 msgstr "Vecchi di 3 mesi"
 
-#: backend.php:76
+#: backend.php:80
 msgid "Default interval"
 msgstr "Intervallo predefinito"
 
-#: backend.php:77 backend.php:87
+#: backend.php:81 backend.php:91
 msgid "Disable updates"
 msgstr "Disabilitare aggiornamenti"
 
-#: backend.php:78 backend.php:88
+#: backend.php:82 backend.php:92
 msgid "Each 15 minutes"
 msgstr "Ogni 15 minuti"
 
-#: backend.php:79 backend.php:89
+#: backend.php:83 backend.php:93
 msgid "Each 30 minutes"
 msgstr "Ogni 30 minuti"
 
-#: backend.php:80 backend.php:90
+#: backend.php:84 backend.php:94
 msgid "Hourly"
 msgstr "A ogni ora"
 
-#: backend.php:81 backend.php:91
+#: backend.php:85 backend.php:95
 msgid "Each 4 hours"
 msgstr "Ogni 4 ore"
 
-#: backend.php:82 backend.php:92
+#: backend.php:86 backend.php:96
 msgid "Each 12 hours"
 msgstr "Ogni 12 ore"
 
-#: backend.php:83 backend.php:93
+#: backend.php:87 backend.php:97
 msgid "Daily"
 msgstr "Giornalmente"
 
-#: backend.php:84 backend.php:94
+#: backend.php:88 backend.php:98
 msgid "Weekly"
 msgstr "Settimanalmente"
 
-#: backend.php:97 classes/pref/users.php:139
+#: backend.php:101 classes/pref/users.php:139
 msgid "User"
 msgstr "Utente"
 
-#: backend.php:98
+#: backend.php:102
 msgid "Power User"
 msgstr "Utente con più autorizzazioni"
 
-#: backend.php:99
+#: backend.php:103
 msgid "Administrator"
 msgstr "Amministratore"
 
@@ -121,7 +121,7 @@ msgstr "Il database di Tiny Tiny RSS è aggiornato."
 #: db-updater.php:94 db-updater.php:163 db-updater.php:176 register.php:194
 #: register.php:239 register.php:252 register.php:267 register.php:286
 #: register.php:371 register.php:381 register.php:393
-#: classes/handler/public.php:637 classes/handler/public.php:725
+#: classes/handler/public.php:611 classes/handler/public.php:699
 msgid "Return to Tiny Tiny RSS"
 msgstr "Ritorna a Tiny Tiny RSS"
 
@@ -260,195 +260,195 @@ msgstr ""
 "Test di sanitizzazione dell&apos;SQL fallito; controllare il database e la "
 "configurazione del PHP"
 
-#: index.php:108 index.php:150 index.php:236 prefs.php:86
-#: classes/backend.php:6 classes/pref/labels.php:296
-#: classes/pref/filters.php:602 classes/pref/feeds.php:1342
-#: plugins/digest/digest_body.php:45 js/viewfeed.js:1169 js/viewfeed.js:1158
-#: js/viewfeed.js:1164 js/viewfeed.js:1174
+#: index.php:117 index.php:147 index.php:252 prefs.php:79
+#: classes/backend.php:5 classes/pref/labels.php:296
+#: classes/pref/filters.php:609 classes/pref/feeds.php:1270
+#: plugins/digest/digest_body.php:45 js/viewfeed.js:1174
 msgid "Loading, please wait..."
 msgstr "Caricamento, attendere prego..."
 
-#: index.php:118 plugins/digest/digest_body.php:56
-msgid "Hello,"
-msgstr "Salve,"
+#: index.php:127 index.php:198
+msgid "Communication problem with server."
+msgstr ""
 
-#: index.php:120 prefs.php:29 prefs.php:108 help/main.php:73 help/prefs.php:8
-#: classes/pref/prefs.php:371
-msgid "Preferences"
-msgstr "Preferenze"
-
-#: index.php:124
-msgid "Comments?"
-msgstr "Commenti?"
-
-#: index.php:128 mobile/mobile-functions.php:69
-#: mobile/mobile-functions.php:244 plugins/digest/digest_body.php:59
-msgid "Logout"
-msgstr "Esci"
-
-#: index.php:134
+#: index.php:133 index.php:206
 msgid "New version of Tiny Tiny RSS is available!"
 msgstr "È disponibile la nuova versione di Tiny Tiny RSS."
 
-#: index.php:157
-msgid "News"
-msgstr "Notizie"
-
-#: index.php:166
+#: index.php:161
 msgid "Collapse feedlist"
 msgstr "Contrai elenco notiziari"
 
-#: index.php:169
+#: index.php:164
 msgid "Show articles"
 msgstr "Mostra articoli"
 
-#: index.php:172
+#: index.php:167
 msgid "Adaptive"
 msgstr "Adattivo"
 
-#: index.php:173
+#: index.php:168
 msgid "All Articles"
 msgstr "Tutti gli articoli"
 
-#: index.php:174 classes/feeds.php:106
+#: index.php:169 include/functions.php:1912 classes/feeds.php:106
 msgid "Starred"
 msgstr "Con stella"
 
-#: index.php:175 classes/feeds.php:107
+#: index.php:170 include/functions.php:1913 classes/feeds.php:107
 msgid "Published"
 msgstr "Pubblicati"
 
-#: index.php:176 classes/feeds.php:93 classes/feeds.php:105
+#: index.php:171 classes/feeds.php:93 classes/feeds.php:105
 msgid "Unread"
 msgstr "Non letti"
 
-#: index.php:177
+#: index.php:172
 msgid "Ignore Scoring"
 msgstr "Ignora punteggio"
 
-#: index.php:178
+#: index.php:173
 msgid "Updated"
 msgstr "Aggiornato"
 
-#: index.php:181
+#: index.php:176
 msgid "Sort articles"
 msgstr "Ordina articoli"
 
-#: index.php:184 classes/pref/prefs.php:462
+#: index.php:179
 msgid "Default"
 msgstr "Predefinito"
 
-#: index.php:185
+#: index.php:180
 msgid "Date"
 msgstr "Data"
 
-#: index.php:186 include/localized_schema.php:3
+#: index.php:181 include/localized_schema.php:3
 msgid "Title"
 msgstr "Titolo"
 
-#: index.php:187
+#: index.php:182
 msgid "Score"
 msgstr "Punteggio"
 
-#: index.php:192 classes/pref/feeds.php:539 classes/pref/feeds.php:786
+#: index.php:187 classes/pref/feeds.php:535 classes/pref/feeds.php:746
 msgid "Update"
 msgstr "Aggiorna"
 
-#: index.php:196 index.php:211 include/localized_schema.php:10
-#: classes/feeds.php:111 classes/feeds.php:127 js/FeedTree.js:128
-#: js/FeedTree.js:156 plugins/digest/digest.js:630
+#: index.php:191 index.php:221 include/functions.php:1903
+#: include/localized_schema.php:10 classes/feeds.php:111 classes/feeds.php:131
+#: js/FeedTree.js:128 js/FeedTree.js:156 plugins/digest/digest.js:630
 msgid "Mark as read"
 msgstr "Segna come letto"
 
-#: index.php:202 classes/feeds.php:101
+#: index.php:211
 msgid "Actions..."
 msgstr "Azioni..."
 
-#: index.php:204
+#: index.php:213
+#, fuzzy
+msgid "Preferences..."
+msgstr "Preferenze"
+
+#: index.php:214
 msgid "Search..."
 msgstr "Cerca..."
 
-#: index.php:205
+#: index.php:215
 msgid "Feed actions:"
 msgstr "Azioni notiziari:"
 
-#: index.php:206 classes/handler/public.php:567
+#: index.php:216 classes/handler/public.php:541
 msgid "Subscribe to feed..."
 msgstr "Sottoscrivi il notiziario..."
 
-#: index.php:207
+#: index.php:217
 msgid "Edit this feed..."
 msgstr "Modifica questo notiziario..."
 
-#: index.php:208
+#: index.php:218
 msgid "Rescore feed"
 msgstr "Cambia punteggio notiziario"
 
-#: index.php:209 classes/pref/feeds.php:712 classes/pref/feeds.php:1315
+#: index.php:219 classes/pref/feeds.php:672 classes/pref/feeds.php:1243
 #: js/PrefFeedTree.js:73
 msgid "Unsubscribe"
 msgstr "Annulla sottoscrizione"
 
-#: index.php:210
+#: index.php:220
 msgid "All feeds:"
 msgstr "Tutti i notiziari:"
 
-#: index.php:212 help/main.php:56
+#: index.php:222
 msgid "(Un)hide read feeds"
 msgstr "Visualizza/Nascondi notiziari letti"
 
-#: index.php:213
+#: index.php:223
 msgid "Other actions:"
 msgstr "Altre azioni:"
 
-#: index.php:215
+#: index.php:225
 msgid "Switch to digest..."
 msgstr "Passa al sommario..."
 
-#: index.php:217
+#: index.php:227
 msgid "Show tag cloud..."
 msgstr "Mostra nuvola etichette..."
 
-#: index.php:218
+#: index.php:229 include/functions.php:1890
+#, fuzzy
+msgid "Toggle widescreen mode"
+msgstr "Inverti con stella"
+
+#: index.php:231
 msgid "Select by tags..."
 msgstr ""
 
-#: index.php:219
+#: index.php:232
 msgid "Create label..."
 msgstr "Crea etichetta..."
 
-#: index.php:220
+#: index.php:233
 msgid "Create filter..."
 msgstr "Crea filtro..."
 
-#: index.php:221
+#: index.php:234
 msgid "Keyboard shortcuts help"
 msgstr "Aiuto scorciatoie da tastiera"
 
-#: prefs.php:99
+#: index.php:236 mobile/mobile-functions.php:69
+#: mobile/mobile-functions.php:244 plugins/digest/digest_body.php:59
+msgid "Logout"
+msgstr "Esci"
+
+#: prefs.php:28 prefs.php:99 include/functions.php:1915
+#: classes/pref/prefs.php:371
+msgid "Preferences"
+msgstr "Preferenze"
+
+#: prefs.php:90
 msgid "Keyboard shortcuts"
 msgstr "Scorciatoie da tastiera"
 
-#: prefs.php:100 help/prefs.php:14
+#: prefs.php:91
 msgid "Exit preferences"
 msgstr "Esci dalle preferenze"
 
-#: prefs.php:111 classes/pref/feeds.php:101 classes/pref/feeds.php:1220
-#: classes/pref/feeds.php:1283
+#: prefs.php:102 classes/pref/feeds.php:100 classes/pref/feeds.php:1148
+#: classes/pref/feeds.php:1211
 msgid "Feeds"
 msgstr "Notiziari"
 
-#: prefs.php:114 help/prefs.php:11 classes/pref/filters.php:110
+#: prefs.php:105 classes/pref/filters.php:117
 msgid "Filters"
 msgstr "Filtri"
 
-#: prefs.php:117 help/prefs.php:12 mobile/mobile-functions.php:205
-#: include/functions.php:1189 include/functions.php:1836
-#: classes/pref/labels.php:90
+#: prefs.php:108 mobile/mobile-functions.php:205 include/functions.php:1118
+#: include/functions.php:1739 classes/pref/labels.php:90
 msgid "Labels"
 msgstr "Etichette"
 
-#: prefs.php:121 help/prefs.php:13
+#: prefs.php:112
 msgid "Users"
 msgstr "Utenti"
 
@@ -511,243 +511,23 @@ msgstr "Utente creato con successo."
 msgid "New user registrations are currently closed."
 msgstr "La registrazione di nuovi utenti è attualmente chiusa."
 
-#: update.php:38
+#: update.php:37
 #, fuzzy
 msgid "Tiny Tiny RSS data update script."
 msgstr "Il database di Tiny Tiny RSS è aggiornato."
 
-#: help/main.php:1 help/prefs.php:1
-msgid "Keyboard Shortcuts"
-msgstr "Scorciatoie da tastiera"
-
-#: help/main.php:5
-msgid "Navigation"
-msgstr "Navigazione"
-
-#: help/main.php:8
-msgid "Move between feeds"
-msgstr "Sposta tra notiziari"
-
-#: help/main.php:9
-msgid "Move between articles"
-msgstr "Sposta tra articoli"
-
-#: help/main.php:10
-msgid "Show search dialog"
-msgstr "Mostra il dialogo di ricerca"
-
-#: help/main.php:13
-msgid "Active article actions"
-msgstr "Azioni sull&apos;articolo attivo"
-
-#: help/main.php:16
-msgid "Toggle starred"
-msgstr "Inverti con stella"
-
-#: help/main.php:17
-msgid "Toggle published"
-msgstr "Inverti pubblicati"
-
-#: help/main.php:18
-msgid "Toggle unread"
-msgstr "Inverti non letti"
-
-#: help/main.php:19
-msgid "Edit tags"
-msgstr "Modifica etichette"
-
-#: help/main.php:20
-msgid "Dismiss selected articles"
-msgstr "Rimuovi gli articoli selezionati"
-
-#: help/main.php:21
-msgid "Dismiss read articles"
-msgstr "Rimuovi articoli letti"
-
-#: help/main.php:22
-msgid "Open article in new window"
-msgstr "Aprire gli articoli in una nuova finestra"
-
-#: help/main.php:23
-msgid "Mark articles below/above active one as read"
-msgstr "Segnare gli articoli sopra e sotto quello attivo come letti"
-
-#: help/main.php:24
-msgid "Scroll article content"
-msgstr "Scorri il contenuto dell&apos;articolo"
-
-#: help/main.php:25
-msgid "Email article"
-msgstr ""
-
-#: help/main.php:29 help/prefs.php:30
-msgid "Other actions"
-msgstr "Altre azioni"
-
-#: help/main.php:32
-msgid "Select article under mouse cursor"
-msgstr "Seleziona l&apos;articolo sotto il cursore del mouse"
-
-#: help/main.php:33 help/prefs.php:26 classes/pref/labels.php:281
-msgid "Create label"
-msgstr "Crea etichetta"
-
-#: help/main.php:34 help/prefs.php:25 classes/pref/filters.php:580
-msgid "Create filter"
-msgstr "Crea filtro"
-
-#: help/main.php:35
-msgid "Collapse sidebar"
-msgstr "Contrai la barra laterale"
-
-#: help/main.php:36 help/prefs.php:34
-msgid "Display this help dialog"
-msgstr "Visualizza questo dialogo di aiuto"
-
-#: help/main.php:41
-msgid "Multiple articles actions"
-msgstr ""
-
-#: help/main.php:44
-msgid "Select all articles"
-msgstr ""
-
-#: help/main.php:45
-msgid "Select unread articles"
-msgstr ""
-
-#: help/main.php:46
-#, fuzzy
-msgid "Select starred articles"
-msgstr "Articoli con stella"
-
-#: help/main.php:47
-#, fuzzy
-msgid "Select published articles"
-msgstr "Articoli pubblicati"
-
-#: help/main.php:48
-msgid "Invert article selection"
-msgstr ""
-
-#: help/main.php:49
-msgid "Deselect all articles"
-msgstr ""
-
-#: help/main.php:52
-msgid "Feed actions"
-msgstr "Azioni notiziari"
-
-#: help/main.php:55
-msgid "Refresh active feed"
-msgstr "Aggiorna notiziario attivo"
-
-#: help/main.php:57 help/prefs.php:22 classes/pref/feeds.php:1286
-msgid "Subscribe to feed"
-msgstr "Sottoscrivi il notiziario"
-
-#: help/main.php:58 js/FeedTree.js:135 js/PrefFeedTree.js:67
-msgid "Edit feed"
-msgstr "Modifica notiziario"
-
-#: help/main.php:59
-msgid "Mark feed as read"
-msgstr "Segna notiziario come letto"
-
-#: help/main.php:60
-msgid "Reverse headlines order"
-msgstr "Invertire l&apos;ordine dei sommari"
-
-#: help/main.php:61 js/FeedTree.js:170
-msgid "Mark all feeds as read"
-msgstr "Segna tutti i notiziari come letti"
-
-#: help/main.php:62
-msgid "If viewing category, (un)collapse it"
-msgstr "Se in visualizzazione categoria, contraila/espandila"
-
-#: help/main.php:65 help/prefs.php:5
-msgid "Go to..."
-msgstr "Vai a..."
-
-#: help/main.php:68 include/functions.php:1893
-msgid "All articles"
-msgstr "Tutti gli articoli"
-
-#: help/main.php:69 include/functions.php:1891
-msgid "Fresh articles"
-msgstr "Articoli nuovi"
-
-#: help/main.php:70 include/functions.php:1887
-msgid "Starred articles"
-msgstr "Articoli con stella"
-
-#: help/main.php:71 include/functions.php:1889
-msgid "Published articles"
-msgstr "Articoli pubblicati"
-
-#: help/main.php:72
-msgid "Tag cloud"
-msgstr "Nuvola etichette"
-
-#: help/main.php:79
-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."
-
-#: help/main.php:81 help/prefs.php:41
-msgid "Press any key to close this window."
-msgstr "Premere qualsiasi tasto per chiudere questa finestra."
-
-#: help/prefs.php:9
-msgid "My Feeds"
-msgstr "Notiziari"
-
-#: help/prefs.php:10
-msgid "Other Feeds"
-msgstr "Altri notiziari"
-
-#: help/prefs.php:19
-msgid "Panel actions"
-msgstr "Riquadro azioni"
-
-#: help/prefs.php:23
-msgid "Top 25 feeds"
-msgstr "Primi 25 notiziari"
-
-#: help/prefs.php:24
-msgid "Edit feed categories"
-msgstr "Modifica categorie notiziari"
-
-#: help/prefs.php:27 classes/pref/users.php:386
-msgid "Create user"
-msgstr "Crea utente"
-
-#: help/prefs.php:33
-msgid "Focus search (if present)"
-msgstr "Attiva la ricerca (se presente)"
-
-#: help/prefs.php:39
-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."
-
 #: mobile/login_form.php:28 include/login_form.php:209
-#: classes/handler/public.php:495
+#: classes/handler/public.php:469
 msgid "Log in"
 msgstr "Accedi"
 
 #: mobile/login_form.php:40 include/login_form.php:169
-#: classes/handler/public.php:479
+#: classes/handler/public.php:453
 msgid "Login:"
 msgstr "Accesso:"
 
 #: mobile/login_form.php:45 include/login_form.php:178
-#: classes/handler/public.php:482
+#: classes/handler/public.php:456
 msgid "Password:"
 msgstr "Password:"
 
@@ -762,8 +542,8 @@ msgstr ""
 msgid "Home"
 msgstr "Casa"
 
-#: mobile/mobile-functions.php:178 include/functions.php:1187
-#: include/functions.php:1834
+#: mobile/mobile-functions.php:178 include/functions.php:1116
+#: include/functions.php:1737
 msgid "Special"
 msgstr "Speciale"
 
@@ -776,12 +556,12 @@ msgid "Enable categories"
 msgstr "Abilitare le categorie"
 
 #: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36
-#: mobile/prefs.php:41 mobile/prefs.php:46
+#: mobile/prefs.php:41 mobile/prefs.php:46 mobile/prefs.php:51
 msgid "ON"
 msgstr "Acceso"
 
 #: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36
-#: mobile/prefs.php:41 mobile/prefs.php:46
+#: mobile/prefs.php:41 mobile/prefs.php:46 mobile/prefs.php:51
 msgid "OFF"
 msgstr "Spento"
 
@@ -801,147 +581,335 @@ msgstr ""
 msgid "Sort feeds by unread count"
 msgstr "Ordinare i notiziari per numero di non letti"
 
-#: include/functions.php:564
-#, php-format
-msgid "Fatal: authentication module %s not found."
-msgstr ""
+#: mobile/prefs.php:50 include/localized_schema.php:45
+msgid "Reverse headline order (oldest first)"
+msgstr "Invertire l&apos;ordine del sommario (prima i più vecchi)"
 
-#: include/functions.php:682
-msgid "Session failed to validate (incorrect IP)"
-msgstr "La validazione della sessione è fallita (IP non corretto)"
-
-#: include/functions.php:1198 include/functions.php:1737
-#: include/functions.php:1822 include/functions.php:1844
-#: include/functions.php:2699 classes/opml.php:416 classes/pref/feeds.php:193
+#: include/digest.php:131 include/functions.php:1127
+#: include/functions.php:1640 include/functions.php:1725
+#: include/functions.php:1747 classes/opml.php:416 classes/pref/feeds.php:188
 msgid "Uncategorized"
 msgstr "Senza categoria"
 
-#: include/functions.php:1686 classes/dlg.php:387 classes/pref/filters.php:361
-msgid "All feeds"
-msgstr "Tutti i notiziari"
-
-#: include/functions.php:1895
-msgid "Archived articles"
-msgstr "Articoli archiviati"
-
-#: include/functions.php:1897
-msgid "Recently read"
-msgstr ""
-
-#: include/functions.php:2346
-#, php-format
-msgid "Search results: %s"
-msgstr ""
-
-#: include/functions.php:3067 js/viewfeed.js:1998 js/viewfeed.js:1971
-#: js/viewfeed.js:1835 js/viewfeed.js:1845
-msgid "Click to play"
-msgstr "Fare clic per riprodurre"
-
-#: include/functions.php:3068 js/viewfeed.js:1997 js/viewfeed.js:1970
-#: js/viewfeed.js:1834 js/viewfeed.js:1844
-msgid "Play"
-msgstr "Riproduci"
-
-#: include/functions.php:3203
-msgid " - "
-msgstr " - "
-
-#: include/functions.php:3232 include/functions.php:4028 classes/rpc.php:414
-msgid "no tags"
-msgstr "nessuna etichetta"
-
-#: include/functions.php:3242 classes/feeds.php:680
-msgid "Edit tags for this article"
-msgstr "Modifica le etichette per questo articolo"
-
-#: include/functions.php:3252 classes/feeds.php:707
-msgid "Open article in new tab"
-msgstr "Apri articolo in una nuova scheda"
-
-#: include/functions.php:3263 classes/feeds.php:718
-msgid "Close article"
-msgstr ""
-
-#: include/functions.php:3280 classes/feeds.php:616
-msgid "Originally from:"
-msgstr "Originariamente da:"
-
-#: include/functions.php:3293 classes/feeds.php:629 classes/pref/feeds.php:511
-msgid "Feed URL"
-msgstr "URL del notiziario"
-
-#: include/functions.php:3308 classes/feeds.php:68
-msgid "Visit the website"
-msgstr "Visita il sito web"
-
-#: include/functions.php:3327
-msgid "Related"
-msgstr ""
-
-#: include/functions.php:3361 classes/dlg.php:30 classes/dlg.php:61
-#: classes/dlg.php:180 classes/dlg.php:203 classes/dlg.php:240
-#: classes/dlg.php:524 classes/dlg.php:559 classes/dlg.php:590
-#: classes/dlg.php:623 classes/dlg.php:724 classes/pref/users.php:106
-#: classes/pref/filters.php:101 classes/pref/feeds.php:1638
-#: classes/pref/feeds.php:1709 plugins/share/share.php:61
-#: plugins/updater/updater.php:301 plugins/updater/init.php:323
-msgid "Close this window"
-msgstr "Chiudi questa finestra"
-
-#: include/functions.php:4053
-msgid "(edit note)"
-msgstr "(modifica note)"
-
-#: include/functions.php:4525
-msgid "No feed selected."
-msgstr "Nessun notiziario selezionato."
-
-#: include/functions.php:4535 classes/feeds.php:766
-#, php-format
-msgid "Feeds last updated at %s"
-msgstr "Ultimo aggiornamento notiziari alle %s"
-
-#: include/functions.php:4545 classes/feeds.php:776
-msgid "Some feeds have update errors (click for details)"
-msgstr ""
-"Qualche notiziario ha degli errori di aggiornamento (fare clic per dettagli)"
-
-#: include/functions.php:4689
-msgid "unknown type"
-msgstr "tipo sconosciuto"
-
-#: include/functions.php:4731
-#, fuzzy
-msgid "Attachments"
-msgstr "Allegati:"
-
-#: include/functions.php:5191
+#: include/feedbrowser.php:83
 #, php-format
 msgid "%d archived articles"
 msgstr "%d articoli archiviati"
 
-#: include/functions.php:5215
+#: include/feedbrowser.php:107
 msgid "No feeds found."
 msgstr "Nessun notiziario trovato."
 
-#: include/functions.php:5261 plugins/import_export/init.php:221
-msgid "Could not import: incorrect schema version."
+#: include/functions.php:698
+msgid "Session failed to validate (incorrect IP)"
+msgstr "La validazione della sessione è fallita (IP non corretto)"
+
+#: include/functions.php:1589 classes/dlg.php:371 classes/pref/filters.php:368
+msgid "All feeds"
+msgstr "Tutti i notiziari"
+
+#: include/functions.php:1790
+msgid "Starred articles"
+msgstr "Articoli con stella"
+
+#: include/functions.php:1792
+msgid "Published articles"
+msgstr "Articoli pubblicati"
+
+#: include/functions.php:1794
+msgid "Fresh articles"
+msgstr "Articoli nuovi"
+
+#: include/functions.php:1796 include/functions.php:1910
+msgid "All articles"
+msgstr "Tutti gli articoli"
+
+#: include/functions.php:1798
+msgid "Archived articles"
+msgstr "Articoli archiviati"
+
+#: include/functions.php:1800
+msgid "Recently read"
 msgstr ""
 
-#: include/functions.php:5266 plugins/import_export/init.php:226
-msgid "Could not import: unrecognized document format."
+#: include/functions.php:1867
+msgid "Navigation"
+msgstr "Navigazione"
+
+#: include/functions.php:1868
+#, fuzzy
+msgid "Open next feed"
+msgstr "Su lettura passare al prossimo notiziario"
+
+#: include/functions.php:1869
+msgid "Open previous feed"
 msgstr ""
 
-#: include/functions.php:5425
+#: include/functions.php:1870
+#, fuzzy
+msgid "Open next article"
+msgstr "Apri articolo di origine"
+
+#: include/functions.php:1871
+#, fuzzy
+msgid "Open previous article"
+msgstr "Apri articolo di origine"
+
+#: include/functions.php:1872
+msgid "Open next article (don't scroll long articles)"
+msgstr ""
+
+#: include/functions.php:1873
+msgid "Open previous article (don't scroll long articles)"
+msgstr ""
+
+#: include/functions.php:1874
+msgid "Show search dialog"
+msgstr "Mostra il dialogo di ricerca"
+
+#: include/functions.php:1875
+#, fuzzy
+msgid "Article"
+msgstr "Tutti gli articoli"
+
+#: include/functions.php:1876
+msgid "Toggle starred"
+msgstr "Inverti con stella"
+
+#: include/functions.php:1877
+msgid "Toggle published"
+msgstr "Inverti pubblicati"
+
+#: include/functions.php:1878
+msgid "Toggle unread"
+msgstr "Inverti non letti"
+
+#: include/functions.php:1879
+msgid "Edit tags"
+msgstr "Modifica etichette"
+
+#: include/functions.php:1880
+#, fuzzy
+msgid "Dismiss selected"
+msgstr "Rimuovi gli articoli selezionati"
+
+#: include/functions.php:1881
+#, fuzzy
+msgid "Dismiss read"
+msgstr "Rimuovi articoli letti"
+
+#: include/functions.php:1882
+#, fuzzy
+msgid "Open in new window"
+msgstr "Aprire gli articoli in una nuova finestra"
+
+#: include/functions.php:1883 js/viewfeed.js:1758
+msgid "Mark below as read"
+msgstr ""
+
+#: include/functions.php:1884 js/viewfeed.js:1752
+msgid "Mark above as read"
+msgstr ""
+
+#: include/functions.php:1885
+#, fuzzy
+msgid "Scroll down"
+msgstr "Fatto tutto."
+
+#: include/functions.php:1886
+msgid "Scroll up"
+msgstr ""
+
+#: include/functions.php:1887
+#, fuzzy
+msgid "Select article under cursor"
+msgstr "Seleziona l&apos;articolo sotto il cursore del mouse"
+
+#: include/functions.php:1888
+msgid "Email article"
+msgstr ""
+
+#: include/functions.php:1889 plugins/close_button/init.php:24
+msgid "Close article"
+msgstr ""
+
+#: include/functions.php:1891
+#, fuzzy
+msgid "Article selection"
+msgstr "Azioni sull&apos;articolo attivo"
+
+#: include/functions.php:1892
+msgid "Select all articles"
+msgstr ""
+
+#: include/functions.php:1893
+#, fuzzy
+msgid "Select unread"
+msgstr "Inverti non letti"
+
+#: include/functions.php:1894
+#, fuzzy
+msgid "Select starred"
+msgstr "Imposta con stella"
+
+#: include/functions.php:1895
+#, fuzzy
+msgid "Select published"
+msgstr "Articoli pubblicati"
+
+#: include/functions.php:1896
+#, fuzzy
+msgid "Invert selection"
+msgstr "Selezione:"
+
+#: include/functions.php:1897
+msgid "Deselect everything"
+msgstr ""
+
+#: include/functions.php:1898 classes/pref/feeds.php:488
+#: classes/pref/feeds.php:707
+msgid "Feed"
+msgstr "Notiziario"
+
+#: include/functions.php:1899
+#, fuzzy
+msgid "Refresh current feed"
+msgstr "Aggiorna notiziario attivo"
+
+#: include/functions.php:1900
+#, fuzzy
+msgid "Un/hide read feeds"
+msgstr "Visualizza/Nascondi notiziari letti"
+
+#: include/functions.php:1901 classes/pref/feeds.php:1214
+msgid "Subscribe to feed"
+msgstr "Sottoscrivi il notiziario"
+
+#: include/functions.php:1902 js/FeedTree.js:135 js/PrefFeedTree.js:67
+msgid "Edit feed"
+msgstr "Modifica notiziario"
+
+#: include/functions.php:1904
+#, fuzzy
+msgid "Reverse headlines"
+msgstr "Invertire l&apos;ordine dei sommari"
+
+#: include/functions.php:1905
+#, fuzzy
+msgid "Debug feed update"
+msgstr "Disabilitare aggiornamenti"
+
+#: include/functions.php:1906 js/FeedTree.js:170
+msgid "Mark all feeds as read"
+msgstr "Segna tutti i notiziari come letti"
+
+#: include/functions.php:1907
+#, fuzzy
+msgid "Un/collapse current category"
+msgstr "Mettere nella categoria:"
+
+#: include/functions.php:1908
+#, fuzzy
+msgid "Toggle combined mode"
+msgstr "Inverti pubblicati"
+
+#: include/functions.php:1909
+#, fuzzy
+msgid "Go to"
+msgstr "Vai a..."
+
+#: include/functions.php:1911
+msgid "Fresh"
+msgstr ""
+
+#: include/functions.php:1914
+msgid "Tag cloud"
+msgstr "Nuvola etichette"
+
+#: include/functions.php:1916
+#, fuzzy
+msgid "Other"
+msgstr "Altri notiziari"
+
+#: include/functions.php:1917 classes/pref/labels.php:281
+msgid "Create label"
+msgstr "Crea etichetta"
+
+#: include/functions.php:1918 classes/pref/filters.php:587
+msgid "Create filter"
+msgstr "Crea filtro"
+
+#: include/functions.php:1919
+#, fuzzy
+msgid "Un/collapse sidebar"
+msgstr "Contrai la barra laterale"
+
+#: include/functions.php:1920
+#, fuzzy
+msgid "Show help dialog"
+msgstr "Mostra il dialogo di ricerca"
+
+#: include/functions.php:2400
 #, php-format
-msgid "Finished: %d articles processed, %d imported, %d feeds created."
+msgid "Search results: %s"
 msgstr ""
 
-#: include/functions.php:5431 plugins/import_export/init.php:391
-msgid "Could not load XML document."
+#: include/functions.php:2824 js/viewfeed.js:1845
+msgid "Click to play"
+msgstr "Fare clic per riprodurre"
+
+#: include/functions.php:2825 js/viewfeed.js:1844
+msgid "Play"
+msgstr "Riproduci"
+
+#: include/functions.php:2945
+msgid " - "
+msgstr " - "
+
+#: include/functions.php:2967 include/functions.php:3284 classes/rpc.php:359
+msgid "no tags"
+msgstr "nessuna etichetta"
+
+#: include/functions.php:2977 classes/feeds.php:645
+msgid "Edit tags for this article"
+msgstr "Modifica le etichette per questo articolo"
+
+#: include/functions.php:3006 classes/feeds.php:600
+msgid "Originally from:"
+msgstr "Originariamente da:"
+
+#: include/functions.php:3019 classes/feeds.php:613 classes/pref/feeds.php:507
+msgid "Feed URL"
+msgstr "URL del notiziario"
+
+#: include/functions.php:3048
+msgid "Related"
 msgstr ""
 
+#: include/functions.php:3075 classes/dlg.php:43 classes/dlg.php:162
+#: classes/dlg.php:185 classes/dlg.php:222 classes/dlg.php:508
+#: classes/dlg.php:543 classes/dlg.php:574 classes/dlg.php:608
+#: classes/dlg.php:620 classes/backend.php:105 classes/pref/users.php:106
+#: classes/pref/filters.php:108 classes/pref/feeds.php:1527
+#: classes/pref/feeds.php:1598 plugins/import_export/init.php:407
+#: plugins/import_export/init.php:431 plugins/share/init.php:67
+#: plugins/updater/init.php:329
+msgid "Close this window"
+msgstr "Chiudi questa finestra"
+
+#: include/functions.php:3309
+msgid "(edit note)"
+msgstr "(modifica note)"
+
+#: include/functions.php:3542
+msgid "unknown type"
+msgstr "tipo sconosciuto"
+
+#: include/functions.php:3592
+#, fuzzy
+msgid "Attachments"
+msgstr "Allegati:"
+
 #: include/localized_schema.php:4
 msgid "Title or Content"
 msgstr "Titolo o contenuto"
@@ -966,9 +934,8 @@ msgstr "Elimina articolo"
 msgid "Set starred"
 msgstr "Imposta con stella"
 
-#: include/localized_schema.php:12 js/viewfeed.js:501 js/viewfeed.js:490
-#: js/viewfeed.js:496 js/viewfeed.js:478 plugins/digest/digest.js:264
-#: plugins/digest/digest.js:736
+#: include/localized_schema.php:12 js/viewfeed.js:478
+#: plugins/digest/digest.js:264 plugins/digest/digest.js:736
 msgid "Publish article"
 msgstr "Pubblica articolo"
 
@@ -976,8 +943,7 @@ msgstr "Pubblica articolo"
 msgid "Assign tags"
 msgstr "Assegna etichette"
 
-#: include/localized_schema.php:14 js/viewfeed.js:1962 js/viewfeed.js:1935
-#: js/viewfeed.js:1799 js/viewfeed.js:1809
+#: include/localized_schema.php:14 js/viewfeed.js:1809
 msgid "Assign label"
 msgstr "Assegna etichetta"
 
@@ -1127,10 +1093,6 @@ msgstr "Su lettura passare al prossimo notiziario"
 msgid "Sort feeds by unread articles count"
 msgstr "Ordinare i notiziari per numero di articoli non letti"
 
-#: include/localized_schema.php:45
-msgid "Reverse headline order (oldest first)"
-msgstr "Invertire l&apos;ordine del sommario (prima i più vecchi)"
-
 #: include/localized_schema.php:46
 msgid "Enable e-mail digest"
 msgstr "Abilitare email riassunto"
@@ -1177,7 +1139,8 @@ msgid "Group headlines in virtual feeds"
 msgstr "Raggruppare i sommari in notiziari virtuali"
 
 #: include/localized_schema.php:57
-msgid "Do not show images in articles"
+#, fuzzy
+msgid "Hide images in articles"
 msgstr "Non mostrare le immagini negli articoli"
 
 #: include/localized_schema.php:58
@@ -1188,8 +1151,7 @@ msgstr "Abilita API esterna"
 msgid "User timezone"
 msgstr "Fuso orario dell'utente"
 
-#: include/localized_schema.php:60 js/prefs.js:1856 js/prefs.js:1743
-#: js/prefs.js:1733
+#: include/localized_schema.php:60 js/prefs.js:1733
 msgid "Customize stylesheet"
 msgstr "Personalizza il foglio di stile"
 
@@ -1209,7 +1171,7 @@ msgstr ""
 msgid "Assign articles to labels automatically"
 msgstr ""
 
-#: include/login_form.php:185 classes/handler/public.php:485
+#: include/login_form.php:185 classes/handler/public.php:459
 msgid "Language:"
 msgstr "Lingua:"
 
@@ -1217,8 +1179,8 @@ msgstr "Lingua:"
 msgid "Profile:"
 msgstr "Profilo:"
 
-#: include/login_form.php:197 classes/handler/public.php:208
-#: classes/rpc.php:147 classes/dlg.php:116
+#: include/login_form.php:197 classes/handler/public.php:212
+#: classes/rpc.php:64 classes/dlg.php:98
 msgid "Default profile"
 msgstr "Profilo predefinito"
 
@@ -1230,184 +1192,167 @@ msgstr "Utilizzare minor traffico"
 msgid "Article not found."
 msgstr "Articolo non trovato."
 
-#: classes/handler/public.php:420 classes/pref/feeds.php:1480
+#: classes/handler/public.php:394 plugins/bookmarklets/init.php:38
 #, fuzzy
 msgid "Share with Tiny Tiny RSS"
 msgstr "Sottoscrive in Tiny Tiny RSS"
 
-#: classes/handler/public.php:428
+#: classes/handler/public.php:402
 #, fuzzy
 msgid "Title:"
 msgstr "Titolo"
 
-#: classes/handler/public.php:430 classes/dlg.php:667
-#: classes/pref/feeds.php:509 classes/pref/feeds.php:762
-#: plugins/instances/instances.php:100 plugins/instances/init.php:215
+#: classes/handler/public.php:404 classes/dlg.php:667
+#: classes/pref/feeds.php:505 classes/pref/feeds.php:722
+#: plugins/instances/init.php:215
 msgid "URL:"
 msgstr "URL:"
 
-#: classes/handler/public.php:432
+#: classes/handler/public.php:406
 #, fuzzy
 msgid "Content:"
 msgstr "Contenuto"
 
-#: classes/handler/public.php:434
+#: classes/handler/public.php:408
 #, fuzzy
 msgid "Labels:"
 msgstr "Etichette"
 
-#: classes/handler/public.php:453
+#: classes/handler/public.php:427
 msgid "Shared article will appear in the Published feed."
 msgstr ""
 
-#: classes/handler/public.php:455
+#: classes/handler/public.php:429
 msgid "Share"
 msgstr ""
 
-#: classes/handler/public.php:456 classes/handler/public.php:498
-#: classes/dlg.php:315 classes/dlg.php:366 classes/dlg.php:426
-#: classes/dlg.php:457 classes/dlg.php:652 classes/dlg.php:702
-#: classes/dlg.php:774 classes/pref/users.php:194 classes/pref/labels.php:81
-#: classes/pref/filters.php:342 classes/pref/filters.php:722
-#: classes/pref/filters.php:791 classes/pref/filters.php:858
-#: classes/pref/feeds.php:729 classes/pref/feeds.php:880
-#: plugins/mail/mail.php:126 plugins/note/note.php:49
-#: plugins/instances/instances.php:136
+#: classes/handler/public.php:430 classes/handler/public.php:472
+#: classes/dlg.php:297 classes/dlg.php:350 classes/dlg.php:410
+#: classes/dlg.php:441 classes/dlg.php:652 classes/dlg.php:702
+#: classes/dlg.php:751 classes/pref/users.php:194 classes/pref/labels.php:81
+#: classes/pref/filters.php:349 classes/pref/filters.php:729
+#: classes/pref/filters.php:798 classes/pref/filters.php:865
+#: classes/pref/feeds.php:689 classes/pref/feeds.php:829
+#: plugins/mail/init.php:132 plugins/note/init.php:55
+#: plugins/instances/init.php:251
 msgid "Cancel"
 msgstr "Annulla"
 
-#: classes/handler/public.php:477
+#: classes/handler/public.php:451
 #, fuzzy
 msgid "Not logged in"
 msgstr "Ultimo accesso"
 
-#: classes/handler/public.php:537
+#: classes/handler/public.php:511
 msgid "Incorrect username or password"
 msgstr "Nome utente o password sbagliati"
 
-#: classes/handler/public.php:573 classes/handler/public.php:670
+#: classes/handler/public.php:547 classes/handler/public.php:644
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "Si ha già una sottoscrizione a <b>%s</b>."
 
-#: classes/handler/public.php:576 classes/handler/public.php:661
+#: classes/handler/public.php:550 classes/handler/public.php:635
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "Sottoscrizione avvenuta a <b>%s</b>."
 
-#: classes/handler/public.php:579 classes/handler/public.php:664
+#: classes/handler/public.php:553 classes/handler/public.php:638
 #, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "Impossibile sottoscrivere <b>%s</b>."
 
-#: classes/handler/public.php:582 classes/handler/public.php:667
+#: classes/handler/public.php:556 classes/handler/public.php:641
 #, fuzzy, php-format
 msgid "No feeds found in <b>%s</b>."
 msgstr "Nessun notiziario trovato."
 
-#: classes/handler/public.php:585 classes/handler/public.php:673
+#: classes/handler/public.php:559 classes/handler/public.php:647
 #, fuzzy
 msgid "Multiple feed URLs found."
 msgstr "Nessun notiziario trovato."
 
-#: classes/handler/public.php:589 classes/handler/public.php:678
+#: classes/handler/public.php:563 classes/handler/public.php:652
 #, 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."
 
-#: classes/handler/public.php:607 classes/handler/public.php:696
+#: classes/handler/public.php:581 classes/handler/public.php:670
 msgid "Subscribe to selected feed"
 msgstr "Sottoscrivi il notiziario selezionato"
 
-#: classes/handler/public.php:632 classes/handler/public.php:720
+#: classes/handler/public.php:606 classes/handler/public.php:694
 msgid "Edit subscription options"
 msgstr "Modifica opzioni di sottoscrizione"
 
-#: classes/auth/internal.php:45 plugins/auth_internal/init.php:62
-#, fuzzy
-msgid "Please enter your one time password:"
-msgstr "Inserire il titolo della categoria:"
-
-#: classes/auth/internal.php:168 plugins/auth_internal/init.php:185
-msgid "Password has been changed."
-msgstr "La password è stata cambiata"
-
-#: classes/auth/internal.php:170
-msgid "Old password is incorrect."
-msgstr "La vecchia password non è corretta."
-
-#: classes/dlg.php:26
-msgid "Prepare data"
-msgstr ""
-
-#: classes/dlg.php:40
+#: classes/dlg.php:22
 msgid ""
 "If you have imported labels and/or filters, you might need to reload "
 "preferences to see your new data."
 msgstr ""
 
-#: classes/dlg.php:73 classes/pref/users.php:378 classes/pref/labels.php:272
-#: classes/pref/filters.php:223 classes/pref/filters.php:270
-#: classes/pref/filters.php:571 classes/pref/filters.php:650
-#: classes/pref/filters.php:677 classes/pref/feeds.php:1274
-#: classes/pref/feeds.php:1583 classes/pref/feeds.php:1652
-#: plugins/instances/instances.php:172
+#: classes/dlg.php:55 classes/pref/users.php:378 classes/pref/labels.php:272
+#: classes/pref/filters.php:230 classes/pref/filters.php:277
+#: classes/pref/filters.php:578 classes/pref/filters.php:657
+#: classes/pref/filters.php:684 classes/pref/feeds.php:1202
+#: classes/pref/feeds.php:1472 classes/pref/feeds.php:1541
+#: plugins/instances/init.php:287
 msgid "Select"
 msgstr "Seleziona"
 
-#: classes/dlg.php:76 classes/feeds.php:92 classes/pref/users.php:381
-#: classes/pref/labels.php:275 classes/pref/filters.php:226
-#: classes/pref/filters.php:273 classes/pref/filters.php:574
-#: classes/pref/filters.php:653 classes/pref/filters.php:680
-#: classes/pref/feeds.php:1277 classes/pref/feeds.php:1586
-#: classes/pref/feeds.php:1655 plugins/instances/instances.php:175
+#: classes/dlg.php:58 classes/feeds.php:92 classes/pref/users.php:381
+#: classes/pref/labels.php:275 classes/pref/filters.php:233
+#: classes/pref/filters.php:280 classes/pref/filters.php:581
+#: classes/pref/filters.php:660 classes/pref/filters.php:687
+#: classes/pref/feeds.php:1205 classes/pref/feeds.php:1475
+#: classes/pref/feeds.php:1544 plugins/instances/init.php:290
 msgid "All"
 msgstr "Tutti"
 
-#: classes/dlg.php:78 classes/feeds.php:95 classes/pref/users.php:383
-#: classes/pref/labels.php:277 classes/pref/filters.php:228
-#: classes/pref/filters.php:275 classes/pref/filters.php:576
-#: classes/pref/filters.php:655 classes/pref/filters.php:682
-#: classes/pref/feeds.php:1279 classes/pref/feeds.php:1588
-#: classes/pref/feeds.php:1657 plugins/instances/instances.php:177
+#: classes/dlg.php:60 classes/feeds.php:95 classes/pref/users.php:383
+#: classes/pref/labels.php:277 classes/pref/filters.php:235
+#: classes/pref/filters.php:282 classes/pref/filters.php:583
+#: classes/pref/filters.php:662 classes/pref/filters.php:689
+#: classes/pref/feeds.php:1207 classes/pref/feeds.php:1477
+#: classes/pref/feeds.php:1546 plugins/instances/init.php:292
 msgid "None"
 msgstr "Nessuno"
 
-#: classes/dlg.php:87
+#: classes/dlg.php:69
 msgid "Create profile"
 msgstr "Crea profilo"
 
-#: classes/dlg.php:110 classes/dlg.php:140
+#: classes/dlg.php:92 classes/dlg.php:122
 msgid "(active)"
 msgstr "(attivo)"
 
-#: classes/dlg.php:174
+#: classes/dlg.php:156
 msgid "Remove selected profiles"
 msgstr "Rimuovi i profili selezionati"
 
-#: classes/dlg.php:176
+#: classes/dlg.php:158
 msgid "Activate profile"
 msgstr "Attiva profilo"
 
-#: classes/dlg.php:186
+#: classes/dlg.php:168
 msgid "Public OPML URL"
 msgstr "URL OPML pubblico"
 
-#: classes/dlg.php:191
+#: classes/dlg.php:173
 msgid "Your Public OPML URL is:"
 msgstr "L'URL OPML pubblico è:"
 
-#: classes/dlg.php:200 classes/dlg.php:587
+#: classes/dlg.php:182 classes/dlg.php:571
 msgid "Generate new URL"
 msgstr "Genera nuovo URL"
 
-#: classes/dlg.php:212
+#: classes/dlg.php:194
 msgid "Notice"
 msgstr "Notifica"
 
-#: classes/dlg.php:218
+#: classes/dlg.php:200
 msgid ""
 "Update daemon is enabled in configuration, but daemon process is not "
 "running, which prevents all feeds from updating. Please start the daemon "
@@ -1418,11 +1363,11 @@ msgstr ""
 "aggiornameto di tutti i notiziari. Avviare il processo del demone o "
 "contattare il proprietario dell&apos;istanza."
 
-#: classes/dlg.php:222 classes/dlg.php:231
+#: classes/dlg.php:204 classes/dlg.php:213
 msgid "Last update:"
 msgstr "Ultimo aggiornamento:"
 
-#: classes/dlg.php:227
+#: classes/dlg.php:209
 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 "
@@ -1433,152 +1378,155 @@ msgstr ""
 "crash o uno stallo. Controllare il processo del demone o contattare il "
 "proprietario dell&apos;istanza."
 
-#: classes/dlg.php:252 classes/dlg.php:261
+#: classes/dlg.php:234 classes/dlg.php:243
 #, fuzzy
 msgid "Feed or site URL"
 msgstr "URL del notiziario"
 
-#: classes/dlg.php:267 classes/dlg.php:738 classes/pref/feeds.php:531
-#: classes/pref/feeds.php:775
+#: classes/dlg.php:249 classes/dlg.php:715 classes/pref/feeds.php:527
+#: classes/pref/feeds.php:735
 msgid "Place in category:"
 msgstr "Mettere nella categoria:"
 
-#: classes/dlg.php:275
+#: classes/dlg.php:257
 msgid "Available feeds"
 msgstr "Notiziari disponibili"
 
-#: classes/dlg.php:287 classes/pref/users.php:155 classes/pref/feeds.php:561
-#: classes/pref/feeds.php:811
+#: classes/dlg.php:269 classes/pref/users.php:155 classes/pref/feeds.php:557
+#: classes/pref/feeds.php:771
 msgid "Authentication"
 msgstr "Autenticazione"
 
-#: classes/dlg.php:291 classes/dlg.php:752 classes/pref/users.php:438
-#: classes/pref/feeds.php:567 classes/pref/feeds.php:815
+#: classes/dlg.php:273 classes/dlg.php:729 classes/pref/users.php:438
+#: classes/pref/feeds.php:563 classes/pref/feeds.php:775
 msgid "Login"
 msgstr "Accesso"
 
-#: classes/dlg.php:294 classes/dlg.php:755 classes/pref/prefs.php:200
-#: classes/pref/feeds.php:573 classes/pref/feeds.php:821
+#: classes/dlg.php:276 classes/dlg.php:732 classes/pref/prefs.php:196
+#: classes/pref/feeds.php:569 classes/pref/feeds.php:781
 msgid "Password"
 msgstr "Password"
 
-#: classes/dlg.php:304
+#: classes/dlg.php:286
 msgid "This feed requires authentication."
 msgstr "Questo notiziario richiede l&apos;autenticazione"
 
-#: classes/dlg.php:309 classes/dlg.php:364 classes/dlg.php:773
+#: classes/dlg.php:291 classes/dlg.php:348 classes/dlg.php:750
 msgid "Subscribe"
 msgstr "Sottoscrivi"
 
-#: classes/dlg.php:312
+#: classes/dlg.php:294
 msgid "More feeds"
 msgstr "Altri notiziari"
 
-#: classes/dlg.php:336 classes/dlg.php:425 classes/pref/users.php:368
-#: classes/pref/filters.php:567 classes/pref/feeds.php:1270 js/tt-rss.js:234
-#: js/tt-rss.js:187 js/tt-rss.js:166
+#: classes/dlg.php:318 classes/dlg.php:409 classes/pref/users.php:368
+#: classes/pref/filters.php:574 classes/pref/feeds.php:1198 js/tt-rss.js:166
 msgid "Search"
 msgstr "Cerca"
 
-#: classes/dlg.php:340
+#: classes/dlg.php:322
 msgid "Popular feeds"
 msgstr "Notiziari popolari"
 
-#: classes/dlg.php:341
+#: classes/dlg.php:323
 msgid "Feed archive"
 msgstr "Archivio notiziari"
 
-#: classes/dlg.php:344
+#: classes/dlg.php:326
 msgid "limit:"
 msgstr "limite:"
 
-#: classes/dlg.php:365 classes/pref/users.php:394 classes/pref/labels.php:284
-#: classes/pref/filters.php:332 classes/pref/filters.php:589
-#: classes/pref/feeds.php:702 plugins/instances/instances.php:182
+#: classes/dlg.php:349 classes/pref/users.php:394 classes/pref/labels.php:284
+#: classes/pref/filters.php:339 classes/pref/filters.php:596
+#: classes/pref/feeds.php:662 plugins/instances/init.php:297
 msgid "Remove"
 msgstr "Rimuovi"
 
-#: classes/dlg.php:376
+#: classes/dlg.php:360
 msgid "Look for"
 msgstr "Cerca"
 
-#: classes/dlg.php:384
+#: classes/dlg.php:368
 msgid "Limit search to:"
 msgstr "Limitare la ricerca a:"
 
-#: classes/dlg.php:400
+#: classes/dlg.php:384
 msgid "This feed"
 msgstr "Questo notiziario"
 
-#: classes/dlg.php:432
+#: classes/dlg.php:416
 msgid "Tags for this article (separated by commas):"
 msgstr "Etichette per questo articolo (separate da virgole):"
 
-#: classes/dlg.php:455 classes/dlg.php:650 classes/pref/users.php:192
-#: classes/pref/labels.php:79 classes/pref/filters.php:339
-#: classes/pref/feeds.php:728 classes/pref/feeds.php:877
-#: plugins/note/note.php:47 plugins/instances/instances.php:133
-#: plugins/nsfw/init.php:86 plugins/owncloud/init.php:62
+#: classes/dlg.php:439 classes/dlg.php:650 classes/pref/users.php:192
+#: classes/pref/labels.php:79 classes/pref/filters.php:346
+#: classes/pref/feeds.php:688 classes/pref/feeds.php:826
+#: plugins/nsfw/init.php:86 plugins/note/init.php:53
+#: plugins/owncloud/init.php:62 plugins/instances/init.php:248
 msgid "Save"
 msgstr "Salva"
 
-#: classes/dlg.php:463
+#: classes/dlg.php:447
 msgid "Tag Cloud"
 msgstr "Nuvola etichette"
 
-#: classes/dlg.php:532
+#: classes/dlg.php:516
 msgid "Select item(s) by tags"
 msgstr ""
 
-#: classes/dlg.php:535
+#: classes/dlg.php:519
 msgid "Match:"
 msgstr ""
 
-#: classes/dlg.php:537
+#: classes/dlg.php:521
 msgid "Any"
 msgstr ""
 
-#: classes/dlg.php:540
+#: classes/dlg.php:524
 #, fuzzy
 msgid "All tags."
 msgstr "nessuna etichetta"
 
-#: classes/dlg.php:542
+#: classes/dlg.php:526
 msgid "Which Tags?"
 msgstr ""
 
-#: classes/dlg.php:555
+#: classes/dlg.php:539
 msgid "Display entries"
 msgstr ""
 
-#: classes/dlg.php:567 classes/feeds.php:129
+#: classes/dlg.php:551 classes/feeds.php:133
 msgid "View as RSS"
 msgstr "Visualizza come RSS"
 
-#: classes/dlg.php:578
+#: classes/dlg.php:562
 msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 "È possibile vedere questo notiziario come RSS utilizzando il seguente URL:"
 
-#: classes/dlg.php:606 plugins/updater/updater.php:276
+#: classes/dlg.php:591 plugins/updater/init.php:303
 #, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "È disponibile una nuova versione di Tiny Tiny RSS (%s)."
 
-#: classes/dlg.php:614
+#: classes/dlg.php:599
 msgid ""
 "You can update using built-in updater in the Preferences or by using update."
 "php"
 msgstr ""
 
-#: classes/dlg.php:618 classes/pref/users.php:390
+#: classes/dlg.php:603 classes/pref/users.php:390
 msgid "Details"
 msgstr "Dettagli"
 
-#: classes/dlg.php:620
+#: classes/dlg.php:605
 msgid "Download"
 msgstr "Scarica"
 
+#: classes/dlg.php:613
+msgid "Error receiving version information or no new version available."
+msgstr ""
+
 #: classes/dlg.php:634
 #, php-format
 msgid ""
@@ -1591,32 +1539,29 @@ msgstr ""
 "target=\"_blank\" class=\"visibleLink\" href=\"%s\">Questo file</a> può "
 "essere utilizzato come base."
 
-#: classes/dlg.php:661 plugins/instances/instances.php:92
-#: plugins/instances/init.php:207
+#: classes/dlg.php:661 plugins/instances/init.php:207
 msgid "Instance"
 msgstr "Istanza"
 
-#: classes/dlg.php:670 plugins/instances/instances.php:103
-#: plugins/instances/instances.php:200 plugins/instances/init.php:218
+#: classes/dlg.php:670 plugins/instances/init.php:218
+#: plugins/instances/init.php:315
 msgid "Instance URL"
 msgstr "URL dell'istanza"
 
-#: classes/dlg.php:680 plugins/instances/instances.php:114
-#: plugins/instances/init.php:229
+#: classes/dlg.php:680 plugins/instances/init.php:229
 msgid "Access key:"
 msgstr "Chiave di accesso:"
 
-#: classes/dlg.php:683 plugins/instances/instances.php:117
-#: plugins/instances/instances.php:201 plugins/instances/init.php:232
+#: classes/dlg.php:683 plugins/instances/init.php:232
+#: plugins/instances/init.php:316
 msgid "Access key"
 msgstr "Chiave di accesso"
 
-#: classes/dlg.php:687 plugins/instances/instances.php:121
-#: plugins/instances/init.php:236
+#: classes/dlg.php:687 plugins/instances/init.php:236
 msgid "Use one access key for both linked instances."
 msgstr "Utilizzare una chiave di accesso per entrambe le istanze collegate."
 
-#: classes/dlg.php:695 plugins/instances/instances.php:129
+#: classes/dlg.php:695 plugins/instances/init.php:244
 msgid "Generate new key"
 msgstr "Genera nuova chiave"
 
@@ -1624,25 +1569,22 @@ msgstr "Genera nuova chiave"
 msgid "Create link"
 msgstr "Crea collegamento"
 
-#: classes/dlg.php:717
-#, php-format
-msgid ""
-"Could not upload file. You might need to adjust upload_max_filesize\n"
-"\t\t\t\tin PHP.ini (current value = %s)"
-msgstr ""
-
-#: classes/dlg.php:735
+#: classes/dlg.php:712
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr ""
 
-#: classes/dlg.php:744
+#: classes/dlg.php:721
 msgid "Feeds to subscribe, One per line"
 msgstr ""
 
-#: classes/dlg.php:766
+#: classes/dlg.php:743
 msgid "Feeds require authentication."
 msgstr ""
 
+#: classes/feeds.php:68
+msgid "Visit the website"
+msgstr "Visita il sito web"
+
 #: classes/feeds.php:83
 msgid "View as RSS feed"
 msgstr "Visualizza come RSS del notiziario"
@@ -1655,6 +1597,11 @@ msgstr "Seleziona:"
 msgid "Invert"
 msgstr "Inverti"
 
+#: classes/feeds.php:101
+#, fuzzy
+msgid "More..."
+msgstr "%d altri..."
+
 #: classes/feeds.php:103
 msgid "Selection toggle:"
 msgstr "Inverti selezione:"
@@ -1676,41 +1623,41 @@ msgstr "Archivio"
 msgid "Move back"
 msgstr "Sposta indietro"
 
-#: classes/feeds.php:118 classes/pref/filters.php:235
-#: classes/pref/filters.php:282 classes/pref/filters.php:662
-#: classes/pref/filters.php:689
+#: classes/feeds.php:118 classes/pref/filters.php:242
+#: classes/pref/filters.php:289 classes/pref/filters.php:669
+#: classes/pref/filters.php:696
 msgid "Delete"
 msgstr "Elimina"
 
-#: classes/feeds.php:122 plugins/mail/mail.php:22
+#: classes/feeds.php:125 plugins/mail/init.php:28
 msgid "Forward by email"
 msgstr "Inoltra per email"
 
-#: classes/feeds.php:125
+#: classes/feeds.php:129
 msgid "Feed:"
 msgstr "Notiziario:"
 
-#: classes/feeds.php:190 classes/feeds.php:844
+#: classes/feeds.php:196 classes/feeds.php:790
 msgid "Feed not found."
 msgstr "Notiziario non trovato."
 
-#: classes/feeds.php:434 classes/feeds.php:516
+#: classes/feeds.php:403 classes/feeds.php:493
 msgid "mark as read"
 msgstr "segna come letto"
 
-#: classes/feeds.php:739
+#: classes/feeds.php:691
 msgid "No unread articles found to display."
 msgstr "Nessun articolo non letto trovato da visualizzare."
 
-#: classes/feeds.php:742
+#: classes/feeds.php:694
 msgid "No updated articles found to display."
 msgstr "Nessun articolo non aggiornato trovato da visualizzare."
 
-#: classes/feeds.php:745
+#: classes/feeds.php:697
 msgid "No starred articles found to display."
 msgstr "Nessun articolo con stella trovato da visualizzare."
 
-#: classes/feeds.php:749
+#: classes/feeds.php:701
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
@@ -1719,11 +1666,43 @@ msgstr ""
 "gli articoli alle etichette (vedere il menù «Azioni» sopra) o utilizzare un "
 "filtro."
 
-#: classes/feeds.php:751
+#: classes/feeds.php:703
 msgid "No articles found to display."
 msgstr "Nessun articolo trovato da visualizzare."
 
-#: classes/backend.php:26
+#: classes/feeds.php:718 classes/feeds.php:899
+#, php-format
+msgid "Feeds last updated at %s"
+msgstr "Ultimo aggiornamento notiziari alle %s"
+
+#: classes/feeds.php:728 classes/feeds.php:909
+msgid "Some feeds have update errors (click for details)"
+msgstr ""
+"Qualche notiziario ha degli errori di aggiornamento (fare clic per dettagli)"
+
+#: classes/feeds.php:889
+msgid "No feed selected."
+msgstr "Nessun notiziario selezionato."
+
+#: classes/backend.php:34
+msgid "Keyboard Shortcuts"
+msgstr "Scorciatoie da tastiera"
+
+#: classes/backend.php:57
+msgid "Shift"
+msgstr ""
+
+#: classes/backend.php:60
+msgid "Ctrl"
+msgstr ""
+
+#: classes/backend.php:84
+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."
+
+#: classes/backend.php:99
 msgid "Help topic not found."
 msgstr "Argomento dell&apos;aiuto non trovato."
 
@@ -1774,16 +1753,15 @@ msgstr "Crea filtro..."
 msgid "Processing category: %s"
 msgstr "Mettere nella categoria:"
 
-#: classes/opml.php:467
+#: classes/opml.php:468
 msgid "Error: please upload OPML file."
 msgstr "Errore: caricare il file OPML."
 
-#: classes/opml.php:474
+#: classes/opml.php:475
 msgid "Error while parsing document."
 msgstr "Errore durante l&apos;analisi del documento."
 
-#: classes/pref/users.php:6 plugins/instances/instances.php:42
-#: plugins/instances/init.php:157
+#: classes/pref/users.php:6 plugins/instances/init.php:157
 msgid "Your access level is insufficient to open this tab."
 msgstr "Il livello di accesso non è sufficiente per aprire questa scheda."
 
@@ -1823,8 +1801,8 @@ msgstr "Livello di accesso: "
 msgid "Change password to"
 msgstr "Cambiare la password a"
 
-#: classes/pref/users.php:177 classes/pref/feeds.php:581
-#: classes/pref/feeds.php:827
+#: classes/pref/users.php:177 classes/pref/feeds.php:577
+#: classes/pref/feeds.php:787
 msgid "Options"
 msgstr "Opzioni"
 
@@ -1863,8 +1841,12 @@ msgstr "Notifica a <b>%s</b>"
 msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] Notifica di cambio password"
 
-#: classes/pref/users.php:392 classes/pref/filters.php:586
-#: plugins/instances/instances.php:181
+#: classes/pref/users.php:386
+msgid "Create user"
+msgstr "Crea utente"
+
+#: classes/pref/users.php:392 classes/pref/filters.php:593
+#: plugins/instances/init.php:296
 msgid "Edit"
 msgstr "Modifica"
 
@@ -1880,15 +1862,15 @@ msgstr "Livello di accesso"
 msgid "Last login"
 msgstr "Ultimo accesso"
 
-#: classes/pref/users.php:461 plugins/instances/instances.php:222
+#: classes/pref/users.php:462 plugins/instances/init.php:337
 msgid "Click to edit"
 msgstr "Fare clic per modificare"
 
-#: classes/pref/users.php:481
+#: classes/pref/users.php:482
 msgid "No users defined."
 msgstr "Nessun utente definito."
 
-#: classes/pref/users.php:483
+#: classes/pref/users.php:484
 msgid "No matching users found."
 msgstr "Nessun utente corrispondente trovato."
 
@@ -1926,84 +1908,88 @@ msgstr "Articoli che corrispondono a questo filtro:"
 msgid "No recent articles matching this filter have been found."
 msgstr "Nessun articolo trovato che corrisponde a questo filtro."
 
-#: classes/pref/filters.php:218 classes/pref/filters.php:645
-#: classes/pref/filters.php:760
+#: classes/pref/filters.php:98
+msgid ""
+"Complex expressions might not give results while testing due to issues with "
+"database server regexp implementation."
+msgstr ""
+
+#: classes/pref/filters.php:225 classes/pref/filters.php:652
+#: classes/pref/filters.php:767
 msgid "Match"
 msgstr "Corrisponde"
 
-#: classes/pref/filters.php:232 classes/pref/filters.php:279
-#: classes/pref/filters.php:659 classes/pref/filters.php:686
+#: classes/pref/filters.php:239 classes/pref/filters.php:286
+#: classes/pref/filters.php:666 classes/pref/filters.php:693
 msgid "Add"
 msgstr ""
 
-#: classes/pref/filters.php:265 classes/pref/filters.php:672
+#: classes/pref/filters.php:272 classes/pref/filters.php:679
 #, fuzzy
 msgid "Apply actions"
 msgstr "Azioni notiziari"
 
-#: classes/pref/filters.php:315 classes/pref/filters.php:701
+#: classes/pref/filters.php:322 classes/pref/filters.php:708
 msgid "Enabled"
 msgstr "Abilitato"
 
-#: classes/pref/filters.php:324 classes/pref/filters.php:704
+#: classes/pref/filters.php:331 classes/pref/filters.php:711
 msgid "Match any rule"
 msgstr ""
 
-#: classes/pref/filters.php:336 classes/pref/filters.php:716
+#: classes/pref/filters.php:343 classes/pref/filters.php:723
 msgid "Test"
 msgstr "Prova"
 
-#: classes/pref/filters.php:368
+#: classes/pref/filters.php:375
 #, php-format
 msgid "%s on %s in %s"
 msgstr ""
 
-#: classes/pref/filters.php:583
+#: classes/pref/filters.php:590
 msgid "Combine"
 msgstr ""
 
-#: classes/pref/filters.php:593 classes/pref/feeds.php:1329
+#: classes/pref/filters.php:600 classes/pref/feeds.php:1257
 msgid "Rescore articles"
 msgstr "Cambio punteggio degli articoli"
 
-#: classes/pref/filters.php:719
+#: classes/pref/filters.php:726
 msgid "Create"
 msgstr "Crea"
 
-#: classes/pref/filters.php:769
+#: classes/pref/filters.php:776
 msgid "on field"
 msgstr "al campo"
 
-#: classes/pref/filters.php:775 js/PrefFilterTree.js:29
+#: classes/pref/filters.php:782 js/PrefFilterTree.js:29
 #: plugins/digest/digest.js:241
 msgid "in"
 msgstr "in"
 
-#: classes/pref/filters.php:788
+#: classes/pref/filters.php:795
 #, fuzzy
 msgid "Save rule"
 msgstr "Salva"
 
-#: classes/pref/filters.php:788 js/functions.js:1067 js/functions.js:1063
-#: js/functions.js:1071 js/functions.js:1073
+#: classes/pref/filters.php:795 js/functions.js:1078
 msgid "Add rule"
 msgstr ""
 
-#: classes/pref/filters.php:811
+#: classes/pref/filters.php:818
 msgid "Perform Action"
 msgstr "Esegui azione"
 
-#: classes/pref/filters.php:837
+#: classes/pref/filters.php:844
 msgid "with parameters:"
 msgstr "con parametri:"
 
-#: classes/pref/filters.php:855
+#: classes/pref/filters.php:862
 #, fuzzy
 msgid "Save action"
 msgstr "Riquadro azioni"
 
-#: classes/pref/filters.php:855 js/functions.js:1093 js/functions.js:1089
-#: js/functions.js:1097 js/functions.js:1099
+#: classes/pref/filters.php:862 js/functions.js:1104
 #, fuzzy
 msgid "Add action"
 msgstr "Azioni notiziari"
@@ -2024,145 +2010,179 @@ msgstr "Le password inserite non corrispondono."
 msgid "Function not supported by authentication module."
 msgstr ""
 
-#: classes/pref/prefs.php:68
+#: classes/pref/prefs.php:63
 msgid "The configuration was saved."
 msgstr "La configurazione è stata salvata."
 
-#: classes/pref/prefs.php:83
+#: classes/pref/prefs.php:77
 #, php-format
 msgid "Unknown option: %s"
 msgstr "Opzione sconosciuta: %s"
 
-#: classes/pref/prefs.php:97
+#: classes/pref/prefs.php:91
 msgid "Your personal data has been saved."
 msgstr "I dati personali sono stati salvati."
 
-#: classes/pref/prefs.php:137
+#: classes/pref/prefs.php:131
 #, fuzzy
 msgid "Personal data / Authentication"
 msgstr "Autenticazione"
 
-#: classes/pref/prefs.php:157
+#: classes/pref/prefs.php:151
 msgid "Personal data"
 msgstr ""
 
-#: classes/pref/prefs.php:167
+#: classes/pref/prefs.php:161
 msgid "Full name"
 msgstr "Nome completo"
 
-#: classes/pref/prefs.php:171
+#: classes/pref/prefs.php:165
 msgid "E-mail"
 msgstr "Email"
 
-#: classes/pref/prefs.php:177
+#: classes/pref/prefs.php:171
 msgid "Access level"
 msgstr "Livello di accesso"
 
-#: classes/pref/prefs.php:187
+#: classes/pref/prefs.php:181
 msgid "Save data"
 msgstr "Salva dati"
 
-#: classes/pref/prefs.php:207
+#: classes/pref/prefs.php:203
 msgid "Your password is at default value, please change it."
 msgstr "La password è impostata al valore predefinito: cambiarla."
 
-#: classes/pref/prefs.php:239
+#: classes/pref/prefs.php:235
 msgid "Old password"
 msgstr "Vecchia password"
 
-#: classes/pref/prefs.php:242
+#: classes/pref/prefs.php:238
 msgid "New password"
 msgstr "Nuova password"
 
-#: classes/pref/prefs.php:247
+#: classes/pref/prefs.php:243
 msgid "Confirm password"
 msgstr "Conferma password"
 
-#: classes/pref/prefs.php:257
+#: classes/pref/prefs.php:253
 msgid "Change password"
 msgstr "Cambia password"
 
-#: classes/pref/prefs.php:263
+#: classes/pref/prefs.php:259
 msgid "One time passwords / Authenticator"
 msgstr ""
 
-#: classes/pref/prefs.php:292 classes/pref/prefs.php:343
+#: classes/pref/prefs.php:288 classes/pref/prefs.php:339
 #, fuzzy
 msgid "Enter your password"
 msgstr "Nome utente o password sbagliati"
 
-#: classes/pref/prefs.php:303
+#: classes/pref/prefs.php:299
 #, fuzzy
 msgid "Disable OTP"
 msgstr "Disabilitare aggiornamenti"
 
-#: classes/pref/prefs.php:309
+#: classes/pref/prefs.php:305
 msgid ""
 "You will need a compatible Authenticator to use this. Changing your password "
 "would automatically disable OTP."
 msgstr ""
 
-#: classes/pref/prefs.php:311
+#: classes/pref/prefs.php:307
 msgid "Scan the following code by the Authenticator application:"
 msgstr ""
 
-#: classes/pref/prefs.php:352
+#: classes/pref/prefs.php:348
 msgid "I have scanned the code and would like to enable OTP"
 msgstr ""
 
-#: classes/pref/prefs.php:360
+#: classes/pref/prefs.php:356
 #, fuzzy
 msgid "Enable OTP"
 msgstr "Abilitato"
 
-#: classes/pref/prefs.php:456
-msgid "Select theme"
-msgstr "Seleziona tema"
-
-#: classes/pref/prefs.php:508
+#: classes/pref/prefs.php:482
 msgid "Customize"
 msgstr "Personalizza"
 
-#: classes/pref/prefs.php:527 classes/pref/prefs.php:534
-#: classes/pref/prefs.php:539
+#: classes/pref/prefs.php:501 classes/pref/prefs.php:508
+#: classes/pref/prefs.php:513
 msgid "Yes"
 msgstr "Sì"
 
-#: classes/pref/prefs.php:529 classes/pref/prefs.php:539
+#: classes/pref/prefs.php:503 classes/pref/prefs.php:513
 msgid "No"
 msgstr "No"
 
-#: classes/pref/prefs.php:569
+#: classes/pref/prefs.php:543
 msgid "Register"
 msgstr "Registro"
 
-#: classes/pref/prefs.php:573
+#: classes/pref/prefs.php:547
 msgid "Clear"
 msgstr "Pulisci"
 
-#: classes/pref/prefs.php:579
+#: classes/pref/prefs.php:553
 #, php-format
 msgid "Current server time: %s (UTC)"
 msgstr ""
 
-#: classes/pref/prefs.php:604
+#: classes/pref/prefs.php:582
 msgid "Save configuration"
 msgstr "Salva configurazione"
 
-#: classes/pref/prefs.php:607
+#: classes/pref/prefs.php:585
 msgid "Manage profiles"
 msgstr "Gestisci profili"
 
-#: classes/pref/prefs.php:610
+#: classes/pref/prefs.php:588
 msgid "Reset to defaults"
 msgstr "Reimposta ai valori predefiniti"
 
-#: classes/pref/prefs.php:622
+#: classes/pref/prefs.php:600
 #, fuzzy
 msgid "Show additional preferences"
 msgstr "Esci dalle preferenze"
 
-#: classes/pref/prefs.php:679 classes/pref/prefs.php:697
+#: classes/pref/prefs.php:612 classes/pref/prefs.php:614
+msgid "Plugins"
+msgstr ""
+
+#: classes/pref/prefs.php:642
+msgid "System plugins"
+msgstr ""
+
+#: classes/pref/prefs.php:646 classes/pref/prefs.php:695
+msgid "Plugin"
+msgstr ""
+
+#: classes/pref/prefs.php:647 classes/pref/prefs.php:696
+msgid "Description"
+msgstr ""
+
+#: classes/pref/prefs.php:648 classes/pref/prefs.php:697
+msgid "Version"
+msgstr ""
+
+#: classes/pref/prefs.php:649 classes/pref/prefs.php:698
+msgid "Author"
+msgstr ""
+
+#: classes/pref/prefs.php:682 classes/pref/prefs.php:733
+#, fuzzy
+msgid "Clear data"
+msgstr "Pulisci i dati del notiziario"
+
+#: classes/pref/prefs.php:691
+msgid "User plugins"
+msgstr ""
+
+#: classes/pref/prefs.php:748
+#, fuzzy
+msgid "Enable selected plugins"
+msgstr "Abilitare le categorie dei notiziari"
+
+#: classes/pref/prefs.php:803 classes/pref/prefs.php:821
 #, fuzzy
 msgid "Incorrect password"
 msgstr "Nome utente o password sbagliati"
@@ -2171,26 +2191,22 @@ msgstr "Nome utente o password sbagliati"
 msgid "Check to enable field"
 msgstr "Spuntare per abilitare il campo"
 
-#: classes/pref/feeds.php:59 classes/pref/feeds.php:180
-#: classes/pref/feeds.php:223 classes/pref/feeds.php:229
-#: classes/pref/feeds.php:254
+#: classes/pref/feeds.php:58 classes/pref/feeds.php:175
+#: classes/pref/feeds.php:217 classes/pref/feeds.php:223
+#: classes/pref/feeds.php:248
 #, fuzzy, php-format
 msgid "(%d feeds)"
 msgstr "Notiziari memorizzati"
 
-#: classes/pref/feeds.php:492 classes/pref/feeds.php:747
-msgid "Feed"
-msgstr "Notiziario"
-
-#: classes/pref/feeds.php:498
+#: classes/pref/feeds.php:494
 msgid "Feed Title"
 msgstr "Titolo notiziario"
 
-#: classes/pref/feeds.php:554 classes/pref/feeds.php:802
+#: classes/pref/feeds.php:550 classes/pref/feeds.php:762
 msgid "Article purging:"
 msgstr "Eliminazione articoli:"
 
-#: classes/pref/feeds.php:577
+#: classes/pref/feeds.php:573
 msgid ""
 "<b>Hint:</b> you need to fill in your login information if your feed "
 "requires authentication, except for Twitter feeds."
@@ -2199,158 +2215,140 @@ msgstr ""
 "proprio notiziario richiede l'autenticazione, eccetto per i notiziari di "
 "Twitter."
 
-#: classes/pref/feeds.php:593 classes/pref/feeds.php:831
+#: classes/pref/feeds.php:589 classes/pref/feeds.php:791
 msgid "Hide from Popular feeds"
 msgstr "Nascondere nei notiziari popolari"
 
-#: classes/pref/feeds.php:604 classes/pref/feeds.php:836
-msgid "Right-to-left content"
-msgstr "Contenuto da destra a sinistra"
-
-#: classes/pref/feeds.php:616 classes/pref/feeds.php:842
+#: classes/pref/feeds.php:601 classes/pref/feeds.php:797
 msgid "Include in e-mail digest"
 msgstr "Includere nell&apos;email riassunto"
 
-#: classes/pref/feeds.php:629 classes/pref/feeds.php:848
+#: classes/pref/feeds.php:614 classes/pref/feeds.php:803
 msgid "Always display image attachments"
 msgstr "Mostrare sempre le immagini allegate"
 
-#: classes/pref/feeds.php:643 classes/pref/feeds.php:856
+#: classes/pref/feeds.php:628 classes/pref/feeds.php:811
 msgid "Cache images locally"
 msgstr "Memorizzare le immagini localmente"
 
-#: classes/pref/feeds.php:656
-#, fuzzy
-msgid "Cache content locally"
-msgstr "Memorizzare le immagini localmente"
-
-#: classes/pref/feeds.php:668 classes/pref/feeds.php:862
+#: classes/pref/feeds.php:640 classes/pref/feeds.php:817
 msgid "Mark updated articles as unread"
 msgstr "Segnare gli articoli aggiornati come non letti"
 
-#: classes/pref/feeds.php:680 classes/pref/feeds.php:868
-msgid "Mark posts as updated on content change"
-msgstr "Segnare gli articoli come aggiornati al cambiamento del contenuto"
-
-#: classes/pref/feeds.php:686
+#: classes/pref/feeds.php:646
 msgid "Icon"
 msgstr "Icona"
 
-#: classes/pref/feeds.php:700
+#: classes/pref/feeds.php:660
 msgid "Replace"
 msgstr "Sostituisci"
 
-#: classes/pref/feeds.php:719
+#: classes/pref/feeds.php:679
 msgid "Resubscribe to push updates"
 msgstr "Sottoscrivi per inviare aggiornamenti"
 
-#: classes/pref/feeds.php:726
+#: classes/pref/feeds.php:686
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr ""
 "Reimposta lo stato di sottoscrizione a PubSubHubbub per notiziari abilitati "
 "all'invio."
 
-#: classes/pref/feeds.php:741
+#: classes/pref/feeds.php:701
 msgid "Enable the options you wish to apply using checkboxes on the right:"
 msgstr ""
 
-#: classes/pref/feeds.php:1123 classes/pref/feeds.php:1176
+#: classes/pref/feeds.php:1051 classes/pref/feeds.php:1104
 msgid "All done."
 msgstr "Fatto tutto."
 
-#: classes/pref/feeds.php:1231
+#: classes/pref/feeds.php:1159
 msgid "Feeds with errors"
 msgstr "Notiziari con errori"
 
-#: classes/pref/feeds.php:1251
+#: classes/pref/feeds.php:1179
 #, fuzzy
 msgid "Inactive feeds"
 msgstr "Aggiorna notiziario attivo"
 
-#: classes/pref/feeds.php:1288
+#: classes/pref/feeds.php:1216
 msgid "Edit selected feeds"
 msgstr "Modifica i notiziari selezionati"
 
-#: classes/pref/feeds.php:1290 classes/pref/feeds.php:1304
+#: classes/pref/feeds.php:1218 classes/pref/feeds.php:1232
 msgid "Reset sort order"
 msgstr "Reimposta ordinamento"
 
-#: classes/pref/feeds.php:1292 js/prefs.js:2021 js/prefs.js:1788
-#: js/prefs.js:1778
+#: classes/pref/feeds.php:1220 js/prefs.js:1778
 msgid "Batch subscribe"
 msgstr ""
 
-#: classes/pref/feeds.php:1297
+#: classes/pref/feeds.php:1225
 #, fuzzy
 msgid "Categories"
 msgstr "Categorie notiziario"
 
-#: classes/pref/feeds.php:1300
+#: classes/pref/feeds.php:1228
 #, fuzzy
 msgid "Add category"
 msgstr "Modifica categorie"
 
-#: classes/pref/feeds.php:1302
+#: classes/pref/feeds.php:1230
 #, fuzzy
 msgid "(Un)hide empty categories"
 msgstr "Modifica categorie"
 
-#: classes/pref/feeds.php:1306
+#: classes/pref/feeds.php:1234
 #, fuzzy
 msgid "Remove selected"
 msgstr "Rimuovere i notiziari selezionati?"
 
-#: classes/pref/feeds.php:1320
+#: classes/pref/feeds.php:1248
 msgid "More actions..."
 msgstr "Altre azioni..."
 
-#: classes/pref/feeds.php:1324
+#: classes/pref/feeds.php:1252
 msgid "Manual purge"
 msgstr "Eliminazione manuale"
 
-#: classes/pref/feeds.php:1328
+#: classes/pref/feeds.php:1256
 msgid "Clear feed data"
 msgstr "Pulisci i dati del notiziario"
 
-#: classes/pref/feeds.php:1379
-msgid "Import and export"
-msgstr ""
-
-#: classes/pref/feeds.php:1381
+#: classes/pref/feeds.php:1307
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1383
+#: classes/pref/feeds.php:1309
 msgid ""
 "Using OPML you can export and import your feeds, filters, labels and Tiny "
 "Tiny RSS settings."
 msgstr ""
 
-#: classes/pref/feeds.php:1385
+#: classes/pref/feeds.php:1311
 msgid "Only main settings profile can be migrated using OPML."
 msgstr ""
 
-#: classes/pref/feeds.php:1398
+#: classes/pref/feeds.php:1324
 #, fuzzy
 msgid "Import my OPML"
 msgstr "Importazione OPML..."
 
-#: classes/pref/feeds.php:1402
+#: classes/pref/feeds.php:1328
 #, fuzzy
 msgid "Filename:"
 msgstr "Nome completo"
 
-#: classes/pref/feeds.php:1404
+#: classes/pref/feeds.php:1330
 #, fuzzy
 msgid "Include settings"
 msgstr "Includere nell&apos;email riassunto"
 
-#: classes/pref/feeds.php:1408
+#: classes/pref/feeds.php:1334
 #, fuzzy
 msgid "Export OPML"
 msgstr "Importazione OPML..."
 
-#: classes/pref/feeds.php:1412
+#: classes/pref/feeds.php:1338
 msgid ""
 "Your OPML can be published publicly and can be subscribed by anyone who "
 "knows the URL below."
@@ -2358,41 +2356,22 @@ msgstr ""
 "OPML può essere pubblicato e può essere sottoscritto da chiunque conosca "
 "l&apos;URL seguente."
 
-#: classes/pref/feeds.php:1414
+#: classes/pref/feeds.php:1340
 msgid ""
 "Published OPML does not include your Tiny Tiny RSS settings, feeds that "
 "require authentication or feeds hidden from Popular feeds."
 msgstr ""
 
-#: classes/pref/feeds.php:1417
+#: classes/pref/feeds.php:1343
 #, fuzzy
 msgid "Display published OPML URL"
 msgstr "URL OPML pubblico"
 
-#: classes/pref/feeds.php:1420 plugins/import_export/init.php:66
-#, fuzzy
-msgid "Article archive"
-msgstr "Data dell&apos;articolo"
-
-#: classes/pref/feeds.php:1422 plugins/import_export/init.php:68
-msgid ""
-"You can export and import your Starred and Archived articles for safekeeping "
-"or when migrating between tt-rss instances."
-msgstr ""
-
-#: classes/pref/feeds.php:1425
-msgid "Export my data"
-msgstr ""
-
-#: classes/pref/feeds.php:1440
-msgid "Import"
-msgstr "Importa"
-
-#: classes/pref/feeds.php:1447
+#: classes/pref/feeds.php:1353
 msgid "Firefox integration"
 msgstr "Integrazione con Firefox"
 
-#: classes/pref/feeds.php:1449
+#: classes/pref/feeds.php:1355
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
@@ -2400,46 +2379,20 @@ msgstr ""
 "Questo sito di Tiny Tiny RSS può essere utilizzato come lettore di notiziari "
 "di Firefox facendo clic sul collegamento qui sotto."
 
-#: classes/pref/feeds.php:1456
+#: classes/pref/feeds.php:1362
 msgid "Click here to register this site as a feed reader."
 msgstr "Fare clic qui per registrare questo sito come lettore di notiziari."
 
-#: classes/pref/feeds.php:1464
-msgid "Bookmarklets"
-msgstr ""
-
-#: classes/pref/feeds.php:1466 plugins/bookmarklets/init.php:24
-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 a fare clic sul "
-"collegamento per sottoscriverlo."
-
-#: classes/pref/feeds.php:1470
-#, php-format
-msgid "Subscribe to %s in Tiny Tiny RSS?"
-msgstr "Sottoscrivere %s in Tiny Tiny RSS?"
-
-#: classes/pref/feeds.php:1474
-msgid "Subscribe in Tiny Tiny RSS"
-msgstr "Sottoscrive in Tiny Tiny RSS"
-
-#: classes/pref/feeds.php:1476 plugins/bookmarklets/init.php:34
-msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
-msgstr ""
-
-#: classes/pref/feeds.php:1484
+#: classes/pref/feeds.php:1370
 #, fuzzy
 msgid "Published & shared articles / Generated feeds"
 msgstr "Articoli pubblicati e notiziari generati"
 
-#: classes/pref/feeds.php:1486
+#: classes/pref/feeds.php:1372
 msgid "Published articles and generated feeds"
 msgstr "Articoli pubblicati e notiziari generati"
 
-#: classes/pref/feeds.php:1488
+#: classes/pref/feeds.php:1374
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the URL specified below."
@@ -2448,28 +2401,28 @@ msgstr ""
 "possono essere sottoscritti da chiunque conosca l&apos;URL specificato qui "
 "sotto."
 
-#: classes/pref/feeds.php:1494
+#: classes/pref/feeds.php:1380
 msgid "Display URL"
 msgstr "Visualizza URL"
 
-#: classes/pref/feeds.php:1497
+#: classes/pref/feeds.php:1383
 msgid "Clear all generated URLs"
 msgstr "Pulisci tutti gli URL generati"
 
-#: classes/pref/feeds.php:1499
+#: classes/pref/feeds.php:1385
 msgid "Articles shared by URL"
 msgstr ""
 
-#: classes/pref/feeds.php:1501
+#: classes/pref/feeds.php:1387
 msgid "You can disable all articles shared by unique URLs here."
 msgstr ""
 
-#: classes/pref/feeds.php:1504
+#: classes/pref/feeds.php:1390
 #, fuzzy
 msgid "Unshare all articles"
 msgstr "Togli la stella all&apos;articolo"
 
-#: classes/pref/feeds.php:1579
+#: classes/pref/feeds.php:1468
 msgid ""
 "These feeds have not been updated with new content for 3 months (oldest "
 "first):"
@@ -2477,19 +2430,19 @@ msgstr ""
 "Questi notiziari non sono stati aggiornati con nuovi contenuti da 3 mesi "
 "(più vecchi prima):"
 
-#: classes/pref/feeds.php:1616 classes/pref/feeds.php:1685
+#: classes/pref/feeds.php:1505 classes/pref/feeds.php:1574
 msgid "Click to edit feed"
 msgstr "Fare clic per modificare il notiziario"
 
-#: classes/pref/feeds.php:1634 classes/pref/feeds.php:1705
+#: classes/pref/feeds.php:1523 classes/pref/feeds.php:1594
 msgid "Unsubscribe from selected feeds"
 msgstr "Annulla la sottoscrizione ai notiziari selezionati"
 
-#: classes/pref/feeds.php:1645
+#: classes/pref/feeds.php:1534
 msgid "These feeds have not been updated because of errors:"
 msgstr "Questi notiziari non sono stati aggiornati a causa di errori:"
 
-#: plugins/pocket/pocket.php:24
+#: plugins/pocket/init.php:30
 msgid "Pocket"
 msgstr ""
 
@@ -2508,70 +2461,192 @@ msgstr ""
 msgid "Back to feeds"
 msgstr "Notiziari non attivi"
 
+#: plugins/digest/digest_body.php:56
+msgid "Hello,"
+msgstr "Salve,"
+
 #: plugins/digest/digest_body.php:62
 msgid "Regular version"
 msgstr ""
 
-#: plugins/pinterest/pinterest.php:23
+#: plugins/nsfw/init.php:32 plugins/nsfw/init.php:43
+msgid "Not work safe (click to toggle)"
+msgstr ""
+
+#: plugins/nsfw/init.php:53
+msgid "NSFW Plugin"
+msgstr ""
+
+#: plugins/nsfw/init.php:80
+msgid "Tags to consider NSFW (comma-separated)"
+msgstr ""
+
+#: plugins/nsfw/init.php:101
+#, fuzzy
+msgid "Configuration saved."
+msgstr "La configurazione è stata salvata."
+
+#: plugins/pinterest/init.php:29
 msgid "Pinterest"
 msgstr ""
 
-#: plugins/mail/mail.php:66 plugins/mail/mail.php:72 plugins/mail/init.php:72
-#: plugins/mail/init.php:78
+#: plugins/auth_internal/init.php:62
+#, fuzzy
+msgid "Please enter your one time password:"
+msgstr "Inserire il titolo della categoria:"
+
+#: plugins/auth_internal/init.php:185
+msgid "Password has been changed."
+msgstr "La password è stata cambiata"
+
+#: plugins/auth_internal/init.php:187
+msgid "Old password is incorrect."
+msgstr "La vecchia password non è corretta."
+
+#: plugins/bookmarklets/init.php:22
+msgid "Bookmarklets"
+msgstr ""
+
+#: plugins/bookmarklets/init.php:24
+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 a fare clic sul "
+"collegamento per sottoscriverlo."
+
+#: plugins/bookmarklets/init.php:28
+#, php-format
+msgid "Subscribe to %s in Tiny Tiny RSS?"
+msgstr "Sottoscrivere %s in Tiny Tiny RSS?"
+
+#: plugins/bookmarklets/init.php:32
+msgid "Subscribe in Tiny Tiny RSS"
+msgstr "Sottoscrive in Tiny Tiny RSS"
+
+#: plugins/bookmarklets/init.php:34
+msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
+msgstr ""
+
+#: plugins/import_export/init.php:64
+msgid "Import and export"
+msgstr ""
+
+#: plugins/import_export/init.php:66
+#, fuzzy
+msgid "Article archive"
+msgstr "Data dell&apos;articolo"
+
+#: plugins/import_export/init.php:68
+msgid ""
+"You can export and import your Starred and Archived articles for safekeeping "
+"or when migrating between tt-rss instances."
+msgstr ""
+
+#: plugins/import_export/init.php:71
+msgid "Export my data"
+msgstr ""
+
+#: plugins/import_export/init.php:87
+msgid "Import"
+msgstr "Importa"
+
+#: plugins/import_export/init.php:221
+msgid "Could not import: incorrect schema version."
+msgstr ""
+
+#: plugins/import_export/init.php:226
+msgid "Could not import: unrecognized document format."
+msgstr ""
+
+#: plugins/import_export/init.php:385
+#, php-format
+msgid "Finished: %d articles processed, %d imported, %d feeds created."
+msgstr ""
+
+#: plugins/import_export/init.php:391
+msgid "Could not load XML document."
+msgstr ""
+
+#: plugins/import_export/init.php:403
+msgid "Prepare data"
+msgstr ""
+
+#: plugins/import_export/init.php:424
+#, php-format
+msgid ""
+"Could not upload file. You might need to adjust upload_max_filesize\n"
+"\t\t\t\tin PHP.ini (current value = %s)"
+msgstr ""
+
+#: plugins/mail/init.php:72 plugins/mail/init.php:78
 msgid "[Forwarded]"
 msgstr "[Inoltrato]"
 
-#: plugins/mail/mail.php:66 plugins/mail/init.php:72
+#: plugins/mail/init.php:72
 msgid "Multiple articles"
 msgstr "Articoli multipli"
 
-#: plugins/mail/mail.php:87
+#: plugins/mail/init.php:93
 msgid "From:"
 msgstr "Da:"
 
-#: plugins/mail/mail.php:96
+#: plugins/mail/init.php:102
 msgid "To:"
 msgstr "A:"
 
-#: plugins/mail/mail.php:109
+#: plugins/mail/init.php:115
 msgid "Subject:"
 msgstr "Oggetto:"
 
-#: plugins/mail/mail.php:125
+#: plugins/mail/init.php:131
 msgid "Send e-mail"
 msgstr "Invia email"
 
-#: plugins/note/note.php:22 plugins/note/note.js:11
+#: plugins/note/init.php:28 plugins/note/note.js:11
 msgid "Edit article note"
 msgstr "Modifica note articolo"
 
-#: plugins/example/example.php:29 plugins/example/init.php:38
+#: plugins/example/init.php:38
 msgid "Example Pane"
 msgstr ""
 
-#: plugins/example/example.php:53 plugins/example/init.php:69
+#: plugins/example/init.php:69
 msgid "Sample value"
 msgstr ""
 
-#: plugins/example/example.php:59 plugins/example/init.php:75
+#: plugins/example/init.php:75
 #, fuzzy
 msgid "Set value"
 msgstr "Imposta con stella"
 
-#: plugins/identica/identica.php:23
+#: plugins/identica/init.php:29
 #, fuzzy
 msgid "Share on identi.ca"
 msgstr "Condividi su Twitter"
 
-#: plugins/instances/instances.php:29
+#: plugins/owncloud/init.php:35
+msgid "Owncloud"
+msgstr ""
+
+#: plugins/owncloud/init.php:59
+msgid "Owncloud url"
+msgstr ""
+
+#: plugins/owncloud/init.php:74
+msgid "Bookmark on OwnCloud "
+msgstr ""
+
+#: plugins/instances/init.php:144
 msgid "Linked"
 msgstr "Collegato"
 
-#: plugins/instances/instances.php:180
+#: plugins/instances/init.php:295
 msgid "Link instance"
 msgstr "Collega istanza"
 
-#: plugins/instances/instances.php:192 plugins/instances/init.php:307
+#: plugins/instances/init.php:307
 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:"
@@ -2580,73 +2655,76 @@ msgstr ""
 "condividere i notiziari popolari. Collegare questa istanza di Tiny Tiny RSS "
 "utilizzando questo URL:"
 
-#: plugins/instances/instances.php:202
+#: plugins/instances/init.php:317
 msgid "Last connected"
 msgstr "Ultimo connesso"
 
-#: plugins/instances/instances.php:203
+#: plugins/instances/init.php:318
 msgid "Status"
 msgstr ""
 
-#: plugins/instances/instances.php:204
+#: plugins/instances/init.php:319
 msgid "Stored feeds"
 msgstr "Notiziari memorizzati"
 
-#: plugins/share/share.php:21
+#: plugins/share/init.php:27
 msgid "Share by URL"
 msgstr ""
 
-#: plugins/share/share.php:43 plugins/share/init.php:49
+#: plugins/share/init.php:49
 #, fuzzy
 msgid "You can share this article by the following unique URL:"
 msgstr ""
 "È possibile vedere questo notiziario come RSS utilizzando il seguente URL:"
 
-#: plugins/flattr/flattr.php:37
+#: plugins/flattr/init.php:30
 #, fuzzy
-msgid "Flattr article"
+msgid "Flattr this article."
 msgstr "Metti la stella all&apos;articolo"
 
-#: plugins/googleplus/googleplus.php:23
+#: plugins/googleplus/init.php:29
 #, fuzzy
 msgid "Share on Google+"
 msgstr "Condividi su Twitter"
 
-#: plugins/updater/updater.php:267 plugins/updater/updater.php:279
+#: plugins/updater/init.php:294 plugins/updater/init.php:306
 #: plugins/updater/updater.js:10
 #, fuzzy
 msgid "Update Tiny Tiny RSS"
 msgstr "Ritorna a Tiny Tiny RSS"
 
-#: plugins/updater/updater.php:282 plugins/updater/init.php:303
+#: plugins/updater/init.php:309
 #, fuzzy
 msgid "Your Tiny Tiny RSS installation is up to date."
 msgstr "Il database di Tiny Tiny RSS è aggiornato."
 
-#: plugins/updater/updater.php:291 plugins/updater/init.php:313
+#: plugins/updater/init.php:319
 msgid ""
 "Do not close this dialog until updating is finished. Backup your tt-rss "
 "directory before continuing."
 msgstr ""
 
-#: plugins/updater/updater.php:294 plugins/updater/init.php:316
+#: plugins/updater/init.php:322
 #, fuzzy
 msgid "Ready to update."
 msgstr "Ultimo aggiornamento:"
 
-#: plugins/updater/updater.php:299 plugins/updater/init.php:321
+#: plugins/updater/init.php:327
 #, fuzzy
 msgid "Start update"
 msgstr "Ultimo aggiornamento:"
 
-#: js/feedlist.js:283 js/feedlist.js:282 js/feedlist.js:265 js/feedlist.js:218
+#: plugins/tweet/init.php:29
+#, fuzzy
+msgid "Share on Twitter"
+msgstr "Condividi su Twitter"
+
+#: js/feedlist.js:218
 msgid "New articles available in this feed (click to show)"
 msgstr ""
 "Nuovi articoli disponibili per questo notiziario (fare clic per mostrarli)"
 
-#: js/feedlist.js:490 js/feedlist.js:505 js/feedlist.js:489 js/feedlist.js:504
-#: js/feedlist.js:469 js/feedlist.js:484 js/feedlist.js:420 js/feedlist.js:435
-#: plugins/digest/digest.js:25
+#: js/feedlist.js:420 js/feedlist.js:435 plugins/digest/digest.js:25
 msgid "Mark all articles in %s as read?"
 msgstr "Segnare tutti gli articoli in «%s» come letti?"
 
@@ -2658,78 +2736,74 @@ msgstr ""
 "Si vuole notificare questa eccezione a tt-rss.org? La notifica includerà le "
 "informazioni sul browser. L'IP verrà salvato in un database."
 
-#: js/functions.js:618 js/functions.js:614 js/functions.js:622
+#: js/functions.js:627
 msgid "Date syntax appears to be correct:"
 msgstr "La sintassi della data appare con corretta:"
 
-#: js/functions.js:621 js/functions.js:617 js/functions.js:625
+#: js/functions.js:630
 msgid "Date syntax is incorrect."
 msgstr "La sintassi della data non è corretta."
 
-#: js/functions.js:748 js/functions.js:744 js/functions.js:752
+#: js/functions.js:757
 msgid "Remove stored feed icon?"
 msgstr "Rimuovi le icone salvate dei notiziari?"
 
-#: js/functions.js:780 js/functions.js:776 js/functions.js:784
+#: js/functions.js:789
 msgid "Please select an image file to upload."
 msgstr "Selezionare un file immagine da caricare."
 
-#: js/functions.js:782 js/functions.js:778 js/functions.js:786
+#: js/functions.js:791
 msgid "Upload new icon for this feed?"
 msgstr "Caricare una nuova icona per questo notiziario?"
 
-#: js/functions.js:799 js/functions.js:795 js/functions.js:803
+#: js/functions.js:808
 msgid "Please enter label caption:"
 msgstr "Inserire l'intestazione dell'etichetta:"
 
-#: js/functions.js:804 js/functions.js:800 js/functions.js:808
+#: js/functions.js:813
 msgid "Can't create label: missing caption."
 msgstr "Impossibile creare l'etichetta: intestazione mancante."
 
-#: js/functions.js:847 js/functions.js:843 js/functions.js:851
+#: js/functions.js:856
 msgid "Subscribe to Feed"
 msgstr "Sottoscrivi il notiziario"
 
-#: js/functions.js:874 js/functions.js:870 js/functions.js:878
+#: js/functions.js:883
 msgid "Subscribed to %s"
 msgstr "Sottoscrizione effettuata a «%s»"
 
-#: js/functions.js:879 js/functions.js:875 js/functions.js:883
+#: js/functions.js:888
 msgid "Specified URL seems to be invalid."
 msgstr "L'URL specifica sembra essere non valido."
 
-#: js/functions.js:882 js/functions.js:878 js/functions.js:886
+#: js/functions.js:891
 msgid "Specified URL doesn't seem to contain any feeds."
 msgstr "L'URL specificato non sembra contenere alcun notiziario."
 
-#: js/functions.js:935 js/functions.js:931 js/functions.js:939
+#: js/functions.js:944
 #, fuzzy
 msgid "Couldn't download the specified URL: %s"
 msgstr "Impossibile scaricare l'URL specificato."
 
-#: js/functions.js:939 js/functions.js:935 js/functions.js:943
+#: js/functions.js:948
 msgid "You are already subscribed to this feed."
 msgstr "La sottoscrizione a questo notiziario è già stata effettuata."
 
-#: js/functions.js:1067 js/functions.js:1063 js/functions.js:1071
-#: js/functions.js:1073
+#: js/functions.js:1078
 #, fuzzy
 msgid "Edit rule"
 msgstr "Modifica filtro"
 
-#: js/functions.js:1093 js/functions.js:1089 js/functions.js:1097
-#: js/functions.js:1099
+#: js/functions.js:1104
 #, fuzzy
 msgid "Edit action"
 msgstr "Azioni notiziari"
 
-#: js/functions.js:1130 js/functions.js:1126 js/functions.js:1134
-#: js/functions.js:1136
+#: js/functions.js:1141
 msgid "Create Filter"
 msgstr "Crea filtro"
 
-#: js/functions.js:1234 js/functions.js:1230 js/functions.js:1238
-#: js/functions.js:1240
+#: js/functions.js:1245
 msgid ""
 "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
 "hub again on next feed update."
@@ -2737,48 +2811,37 @@ msgstr ""
 "Reimpostare la sottoscrizione? Tiny Tiny RSS proverà ancora al prossimo "
 "aggiornamento del notiziario a sottoscrivere il centro notifiche."
 
-#: js/functions.js:1255 js/tt-rss.js:421 js/functions.js:1251 js/tt-rss.js:381
-#: js/functions.js:1259 js/tt-rss.js:367 js/functions.js:1261
+#: js/functions.js:1266 js/tt-rss.js:367
 msgid "Unsubscribe from %s?"
 msgstr "Annullare la sottoscrizione a «%s»?"
 
-#: js/functions.js:1362 js/functions.js:1358 js/functions.js:1368
-#: js/functions.js:1370
+#: js/functions.js:1375
 msgid "Please enter category title:"
 msgstr "Inserire il titolo della categoria:"
 
-#: js/functions.js:1393 js/functions.js:1389 js/functions.js:1399
-#: js/functions.js:1401
+#: js/functions.js:1406
 msgid "Generate new syndication address for this feed?"
 msgstr "Generare un nuovo indirizzo per questo notiziario?"
 
-#: js/functions.js:1584 js/tt-rss.js:400 js/tt-rss.js:903 js/functions.js:1580
-#: js/tt-rss.js:782 js/tt-rss.js:362 js/tt-rss.js:717 js/functions.js:1590
-#: js/tt-rss.js:348 js/tt-rss.js:709 js/functions.js:1592
+#: js/functions.js:1597 js/tt-rss.js:348 js/tt-rss.js:713
 msgid "You can't edit this kind of feed."
 msgstr "Impossibile modificare questo tipo di notiziario."
 
-#: js/functions.js:1599 js/functions.js:1595 js/functions.js:1605
-#: js/functions.js:1607
+#: js/functions.js:1612
 msgid "Edit Feed"
 msgstr "Modifica notiziario"
 
-#: js/functions.js:1637 js/functions.js:1633 js/functions.js:1643
-#: js/functions.js:1645
+#: js/functions.js:1650
 msgid "More Feeds"
 msgstr "Altri notiziari"
 
-#: js/functions.js:1698 js/functions.js:1808 js/prefs.js:408 js/prefs.js:438
-#: js/prefs.js:470 js/prefs.js:653 js/prefs.js:673 js/prefs.js:1326
-#: js/prefs.js:1471 js/functions.js:1694 js/functions.js:1804 js/prefs.js:397
-#: js/prefs.js:427 js/prefs.js:459 js/prefs.js:642 js/prefs.js:662
-#: js/prefs.js:1213 js/prefs.js:1358 js/functions.js:1704 js/functions.js:1814
-#: js/prefs.js:1203 js/prefs.js:1348 js/functions.js:1706 js/functions.js:1816
+#: js/functions.js:1711 js/functions.js:1821 js/prefs.js:397 js/prefs.js:427
+#: js/prefs.js:459 js/prefs.js:642 js/prefs.js:662 js/prefs.js:1203
+#: js/prefs.js:1348
 msgid "No feeds are selected."
 msgstr "Nessun notiziario selezionato."
 
-#: js/functions.js:1740 js/functions.js:1736 js/functions.js:1746
-#: js/functions.js:1748
+#: js/functions.js:1753
 msgid ""
 "Remove selected feeds from the archive? Feeds with stored articles will not "
 "be removed."
@@ -2786,16 +2849,18 @@ msgstr ""
 "Rimuovere i notiziari selezionati dall'archivio? I notiziari con articoli "
 "archiviati non saranno rimossi."
 
-#: js/functions.js:1779 js/functions.js:1775 js/functions.js:1785
-#: js/functions.js:1787
+#: js/functions.js:1792
 msgid "Feeds with update errors"
 msgstr "Notiziari con errori di aggiornamento"
 
-#: js/functions.js:1790 js/prefs.js:1308 js/functions.js:1786 js/prefs.js:1195
-#: js/functions.js:1796 js/prefs.js:1185 js/functions.js:1798
+#: js/functions.js:1803 js/prefs.js:1185
 msgid "Remove selected feeds?"
 msgstr "Rimuovere i notiziari selezionati?"
 
+#: js/functions.js:1904
+msgid "Help"
+msgstr ""
+
 #: js/PrefFeedTree.js:47
 #, fuzzy
 msgid "Edit category"
@@ -2818,25 +2883,24 @@ msgstr "Inserire l'accesso:"
 msgid "Can't create user: no login specified."
 msgstr "Impossibile creare l'utente: nessun accesso specificato."
 
-#: js/prefs.js:128 js/prefs.js:117
+#: js/prefs.js:117
 msgid "Edit Filter"
 msgstr "Modifica filtro"
 
-#: js/prefs.js:175 js/prefs.js:164
+#: js/prefs.js:164
 #, fuzzy
 msgid "Remove filter?"
 msgstr "Rimuovere il filtro «%s»?"
 
-#: js/prefs.js:290 js/prefs.js:279
+#: js/prefs.js:279
 msgid "Remove selected labels?"
 msgstr "Rimuovere le etichette selezionate?"
 
-#: js/prefs.js:306 js/prefs.js:1512 js/prefs.js:295 js/prefs.js:1399
-#: js/prefs.js:1389
+#: js/prefs.js:295 js/prefs.js:1389
 msgid "No labels are selected."
 msgstr "Nessuna etichetta selezionata."
 
-#: js/prefs.js:320 js/prefs.js:309
+#: js/prefs.js:309
 msgid ""
 "Remove selected users? Neither default admin nor your account will be "
 "removed."
@@ -2844,387 +2908,290 @@ msgstr ""
 "Rimuovere gli utenti selezionati? Non saranno rimossi l'amministratore "
 "predefinito e il proprio utente."
 
-#: js/prefs.js:337 js/prefs.js:518 js/prefs.js:539 js/prefs.js:578
 #: js/prefs.js:326 js/prefs.js:507 js/prefs.js:528 js/prefs.js:567
 msgid "No users are selected."
 msgstr "Nessun utente selezionato."
 
-#: js/prefs.js:355 js/prefs.js:344
+#: js/prefs.js:344
 msgid "Remove selected filters?"
 msgstr "Rimuovere i filtri selezionati?"
 
-#: js/prefs.js:370 js/prefs.js:608 js/prefs.js:627 js/prefs.js:359
-#: js/prefs.js:597 js/prefs.js:616
+#: js/prefs.js:359 js/prefs.js:597 js/prefs.js:616
 msgid "No filters are selected."
 msgstr "Nessun filtro selezionato."
 
-#: js/prefs.js:389 js/prefs.js:378
+#: js/prefs.js:378
 msgid "Unsubscribe from selected feeds?"
 msgstr "Annullare la sottoscrizione ai notiziari selezionati?"
 
-#: js/prefs.js:423 js/prefs.js:412
+#: js/prefs.js:412
 msgid "Please select only one feed."
 msgstr "Selezionare solo un notiziario."
 
-#: js/prefs.js:429 js/prefs.js:418
+#: js/prefs.js:418
 msgid "Erase all non-starred articles in selected feed?"
 msgstr ""
 "Eliminare tutti gli articoli senza la stella nel notiziario selezionato?"
 
-#: js/prefs.js:451 js/prefs.js:440
+#: js/prefs.js:440
 msgid "How many days of articles to keep (0 - use default)?"
 msgstr "Quanti giorni di articoli tenere (0 - utilizza il valore predefinito)?"
 
-#: js/prefs.js:489 js/prefs.js:478
+#: js/prefs.js:478
 msgid "Login field cannot be blank."
 msgstr "Il campo accesso non può essere vuoto."
 
-#: js/prefs.js:523 js/prefs.js:544 js/prefs.js:583 js/prefs.js:512
-#: js/prefs.js:533 js/prefs.js:572
+#: js/prefs.js:512 js/prefs.js:533 js/prefs.js:572
 msgid "Please select only one user."
 msgstr "Selezionare un solo utente."
 
-#: js/prefs.js:548 js/prefs.js:537
+#: js/prefs.js:537
 msgid "Reset password of selected user?"
 msgstr "Reimpostare la password per l&apos;utente selezionato?"
 
-#: js/prefs.js:613 js/prefs.js:602
+#: js/prefs.js:602
 msgid "Please select only one filter."
 msgstr "Selezionare solo un filtro."
 
-#: js/prefs.js:631 js/prefs.js:620
+#: js/prefs.js:620
 #, fuzzy
 msgid "Combine selected filters?"
 msgstr "Rimuovere i filtri selezionati?"
 
-#: js/prefs.js:695 js/prefs.js:684
+#: js/prefs.js:684
 msgid "Edit Multiple Feeds"
 msgstr "Modifica notiziari multipli"
 
-#: js/prefs.js:719 js/prefs.js:708
+#: js/prefs.js:708
 msgid "Save changes to selected feeds?"
 msgstr "Salvare i cambiamenti ai notiziari selezionati?"
 
-#: js/prefs.js:811 js/prefs.js:800 js/prefs.js:790
+#: js/prefs.js:790
 msgid "OPML Import"
 msgstr "Importazione OPML"
 
-#: js/prefs.js:838 js/prefs.js:827 js/prefs.js:817
+#: js/prefs.js:817
 msgid "Please choose an OPML file first."
 msgstr "Scegliere prima un file OPML."
 
-#: js/prefs.js:854 plugins/import_export/import_export.js:112
-msgid "Please choose the file first."
-msgstr ""
-
-#: js/prefs.js:1010 js/prefs.js:983 js/prefs.js:973
+#: js/prefs.js:973
 msgid "Reset to defaults?"
 msgstr "Reimpostare ai valori predefiniti?"
 
-#: js/prefs.js:1215 js/prefs.js:1102 js/prefs.js:1092
+#: js/prefs.js:1092
 msgid ""
 "Remove category %s? Any nested feeds would be placed into Uncategorized."
 msgstr ""
 
-#: js/prefs.js:1242 js/prefs.js:1129 js/prefs.js:1119
+#: js/prefs.js:1119
 msgid "Remove selected categories?"
 msgstr "Rimuovere le categorie selezionate?"
 
-#: js/prefs.js:1258 js/prefs.js:1145 js/prefs.js:1135
+#: js/prefs.js:1135
 msgid "No categories are selected."
 msgstr "Nessuna categoria selezionata."
 
-#: js/prefs.js:1266 js/prefs.js:1153 js/prefs.js:1143
+#: js/prefs.js:1143
 #, fuzzy
 msgid "Category title:"
 msgstr "Categorie"
 
-#: js/prefs.js:1297 js/prefs.js:1184 js/prefs.js:1174
+#: js/prefs.js:1174
 msgid "Feeds without recent updates"
 msgstr "Notiziari senza aggiornamenti recenti"
 
-#: js/prefs.js:1346 js/prefs.js:1233 js/prefs.js:1223
+#: js/prefs.js:1223
 msgid "Replace current OPML publishing address with a new one?"
 msgstr ""
 "Sostituire l&apos;indirizzo di pubblicazione OPML attuale con uno nuovo?"
 
-#: js/prefs.js:1455 js/prefs.js:1342 js/prefs.js:1332
+#: js/prefs.js:1332
 msgid "Rescore articles in selected feeds?"
 msgstr "Cambiare il punteggio agli articoli nel notiziario selezionato?"
 
-#: js/prefs.js:1478 js/prefs.js:1365 js/prefs.js:1355
+#: js/prefs.js:1355
 msgid "Rescore all articles? This operation may take a lot of time."
 msgstr ""
 "Cambiare il punteggio a tutti i notiziari? Questa operazione può durare "
 "molto tempo."
 
-#: js/prefs.js:1498 js/prefs.js:1385 js/prefs.js:1375
+#: js/prefs.js:1375
 msgid "Reset selected labels to default colors?"
 msgstr "Reimpostare le etichette selezionate ai colori predefiniti?"
 
-#: js/prefs.js:1535 js/prefs.js:1422 js/prefs.js:1412
+#: js/prefs.js:1412
 msgid "Settings Profiles"
 msgstr "Impostazioni dei profili"
 
-#: js/prefs.js:1544 js/prefs.js:1431 js/prefs.js:1421
+#: js/prefs.js:1421
 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:1562 js/prefs.js:1449 js/prefs.js:1439
+#: js/prefs.js:1439
 msgid "No profiles are selected."
 msgstr "Nessun profilo selezionato."
 
-#: js/prefs.js:1570 js/prefs.js:1623 js/prefs.js:1457 js/prefs.js:1510
 #: js/prefs.js:1447 js/prefs.js:1500
 msgid "Activate selected profile?"
 msgstr "Attivare il profilo selezionato?"
 
-#: js/prefs.js:1586 js/prefs.js:1639 js/prefs.js:1473 js/prefs.js:1526
 #: js/prefs.js:1463 js/prefs.js:1516
 msgid "Please choose a profile to activate."
 msgstr "Scegliere un profilo da attivare"
 
-#: js/prefs.js:1647 js/prefs.js:1534 js/prefs.js:1524
+#: js/prefs.js:1524
 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr ""
 "Questo invaliderà tutti gli URL di notiziari generati precedentemente. "
 "Continuare?"
 
-#: js/prefs.js:1666 js/prefs.js:1553 js/prefs.js:1543
+#: js/prefs.js:1543
 msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr ""
 
-#: js/prefs.js:1764 js/prefs.js:1651 js/prefs.js:1641
+#: js/prefs.js:1641
 msgid "Label Editor"
 msgstr "Editor etichette"
 
-#: js/prefs.js:1827 js/prefs.js:1714 js/prefs.js:1704
+#: js/prefs.js:1704
 msgid ""
 "This will clear your stored authentication information for Twitter. Continue?"
 msgstr ""
 "Questo pulirà le informazioni di autenticazione memorizzate per Twitter. "
 "Continuare?"
 
-#: js/prefs.js:1911 plugins/import_export/import_export.js:13
-msgid "Export Data"
-msgstr ""
-
-#: js/prefs.js:1938 plugins/import_export/import_export.js:40
-msgid ""
-"Finished, exported %d articles. You can download the data <a "
-"class='visibleLink' href='%u'>here</a>."
-msgstr ""
-
-#: js/prefs.js:1991 plugins/import_export/import_export.js:93
-msgid "Data Import"
-msgstr ""
-
-#: js/prefs.js:2027 js/prefs.js:1794 js/prefs.js:1784
+#: js/prefs.js:1784
 msgid "Subscribing to feeds..."
 msgstr ""
 
-#: js/tt-rss.js:147 js/tt-rss.js:141 js/tt-rss.js:120
+#: js/prefs.js:1821
+msgid "Clear stored data for this plugin?"
+msgstr ""
+
+#: js/tt-rss.js:120
 msgid "Mark all articles as read?"
 msgstr "Segnare tutti gli articoli come letti?"
 
-#: js/tt-rss.js:410 js/tt-rss.js:370 js/tt-rss.js:356
+#: js/tt-rss.js:356
 msgid "You can't unsubscribe from the category."
 msgstr "Impossibile annullare la sottoscrizione alla categoria."
 
-#: js/tt-rss.js:415 js/tt-rss.js:596 js/tt-rss.js:591 js/tt-rss.js:375
-#: js/tt-rss.js:525 js/tt-rss.js:361 js/tt-rss.js:511
+#: js/tt-rss.js:361 js/tt-rss.js:511
 msgid "Please select some feed first."
 msgstr "Selezionare prima qualche notiziario."
 
-#: js/tt-rss.js:591 js/tt-rss.js:586 js/tt-rss.js:520 js/tt-rss.js:506
+#: js/tt-rss.js:506
 msgid "You can't rescore this kind of feed."
 msgstr "Impossibile cambiare il punteggio a questo tipo di notiziari."
 
-#: js/tt-rss.js:601 js/tt-rss.js:596 js/tt-rss.js:530 js/tt-rss.js:516
+#: js/tt-rss.js:516
 msgid "Rescore articles in %s?"
 msgstr "Cambiare il punteggio degli articoli in «%s»?"
 
-#: js/tt-rss.js:1062 js/tt-rss.js:883 js/tt-rss.js:825 js/tt-rss.js:830
+#: js/tt-rss.js:672
+#, fuzzy
+msgid "Please enable mail plugin first."
+msgstr "Selezionare prima qualche notiziario."
+
+#: js/tt-rss.js:834
 msgid "New version available!"
 msgstr "Nuova versione disponibile."
 
-#: js/viewfeed.js:108 js/viewfeed.js:104
+#: js/viewfeed.js:104
 #, fuzzy
 msgid "Cancel search"
 msgstr "Annulla"
 
-#: js/viewfeed.js:456 js/viewfeed.js:445 js/viewfeed.js:451 js/viewfeed.js:435
-#: plugins/digest/digest.js:257 plugins/digest/digest.js:696
+#: js/viewfeed.js:435 plugins/digest/digest.js:257
+#: plugins/digest/digest.js:696
 msgid "Unstar article"
 msgstr "Togli la stella all&apos;articolo"
 
-#: js/viewfeed.js:461 js/viewfeed.js:450 js/viewfeed.js:456 js/viewfeed.js:440
-#: plugins/digest/digest.js:259 plugins/digest/digest.js:700
+#: js/viewfeed.js:440 plugins/digest/digest.js:259
+#: plugins/digest/digest.js:700
 msgid "Star article"
 msgstr "Metti la stella all&apos;articolo"
 
-#: js/viewfeed.js:496 js/viewfeed.js:485 js/viewfeed.js:491 js/viewfeed.js:473
-#: plugins/digest/digest.js:262 plugins/digest/digest.js:731
+#: js/viewfeed.js:473 plugins/digest/digest.js:262
+#: plugins/digest/digest.js:731
 msgid "Unpublish article"
 msgstr "Non pubblicare articolo"
 
-#: js/viewfeed.js:676 js/viewfeed.js:704 js/viewfeed.js:731 js/viewfeed.js:793
-#: js/viewfeed.js:825 js/viewfeed.js:962 js/viewfeed.js:1005
-#: js/viewfeed.js:1055 js/viewfeed.js:2181 js/viewfeed.js:665
-#: js/viewfeed.js:693 js/viewfeed.js:720 js/viewfeed.js:782 js/viewfeed.js:814
-#: js/viewfeed.js:951 js/viewfeed.js:994 js/viewfeed.js:1044
-#: js/viewfeed.js:2154 js/viewfeed.js:671 js/viewfeed.js:699
-#: js/viewfeed.js:726 js/viewfeed.js:788 js/viewfeed.js:820 js/viewfeed.js:957
-#: js/viewfeed.js:1000 js/viewfeed.js:1050 js/viewfeed.js:2018
 #: js/viewfeed.js:674 js/viewfeed.js:702 js/viewfeed.js:729 js/viewfeed.js:791
 #: js/viewfeed.js:823 js/viewfeed.js:960 js/viewfeed.js:1003
 #: js/viewfeed.js:1053 js/viewfeed.js:1927 plugins/mail/mail.js:7
 msgid "No articles are selected."
 msgstr "Nessun articolo selezionato."
 
-#: js/viewfeed.js:942 js/viewfeed.js:931 js/viewfeed.js:937 js/viewfeed.js:940
+#: js/viewfeed.js:940
 msgid "Mark all visible articles in %s as read?"
 msgstr "Segnare tutti gli articoli visibili in «%s» come letti?"
 
-#: js/viewfeed.js:970 js/viewfeed.js:959 js/viewfeed.js:965 js/viewfeed.js:968
+#: js/viewfeed.js:968
 msgid "Delete %d selected articles in %s?"
 msgstr "Eliminare i %d articoli selezionati in «%s»?"
 
-#: js/viewfeed.js:972 js/viewfeed.js:961 js/viewfeed.js:967 js/viewfeed.js:970
+#: js/viewfeed.js:970
 msgid "Delete %d selected articles?"
 msgstr "Eliminare i %d articoli selezionati?"
 
-#: js/viewfeed.js:1014 js/viewfeed.js:1003 js/viewfeed.js:1009
 #: js/viewfeed.js:1012
 msgid "Archive %d selected articles in %s?"
 msgstr "Archiviare i %d articoli selezionati in «%s»?"
 
-#: js/viewfeed.js:1017 js/viewfeed.js:1006 js/viewfeed.js:1012
 #: js/viewfeed.js:1015
 msgid "Move %d archived articles back?"
 msgstr "Spostare %d articoli archiviati indietro?"
 
-#: js/viewfeed.js:1061 js/viewfeed.js:1050 js/viewfeed.js:1056
 #: js/viewfeed.js:1059
 msgid "Mark %d selected articles in %s as read?"
 msgstr "Segnare %d articoli selezionati in «%s» come letti?"
 
-#: js/viewfeed.js:1085 js/viewfeed.js:1074 js/viewfeed.js:1080
 #: js/viewfeed.js:1083
 msgid "Edit article Tags"
 msgstr "Modifica etichette articolo"
 
-#: js/viewfeed.js:1247 js/viewfeed.js:1236 js/viewfeed.js:1242
 #: js/viewfeed.js:1252
 msgid "No article is selected."
 msgstr "Nessun articolo selezionato."
 
-#: js/viewfeed.js:1282 js/viewfeed.js:1271 js/viewfeed.js:1277
 #: js/viewfeed.js:1287
 msgid "No articles found to mark"
 msgstr "Nessun articolo trovato da segnare"
 
-#: js/viewfeed.js:1284 js/viewfeed.js:1273 js/viewfeed.js:1279
 #: js/viewfeed.js:1289
 msgid "Mark %d article(s) as read?"
 msgstr "Segnare %d articolo/i come letto/i?"
 
-#: js/viewfeed.js:1402 js/viewfeed.js:1383
-msgid "Loading..."
-msgstr "Caricamento..."
-
-#: js/viewfeed.js:1891 js/viewfeed.js:1864 js/viewfeed.js:1734
 #: js/viewfeed.js:1744
 msgid "Open original article"
 msgstr "Apri articolo di origine"
 
-#: js/viewfeed.js:1897 js/viewfeed.js:1870
-msgid "View in a tt-rss tab"
-msgstr "Visualizza in una scheda tt-rss"
-
-#: js/viewfeed.js:1905 js/viewfeed.js:1878 js/viewfeed.js:1742
-#: js/viewfeed.js:1752
-msgid "Mark above as read"
-msgstr ""
-
-#: js/viewfeed.js:1911 js/viewfeed.js:1884 js/viewfeed.js:1748
-#: js/viewfeed.js:1758
-msgid "Mark below as read"
-msgstr ""
-
-#: js/viewfeed.js:1967 js/viewfeed.js:1940 js/viewfeed.js:1804
 #: js/viewfeed.js:1814
 msgid "Remove label"
 msgstr "Rimuovi etichetta"
 
-#: js/viewfeed.js:1991 js/viewfeed.js:1964 js/viewfeed.js:1828
 #: js/viewfeed.js:1838
 msgid "Playing..."
 msgstr "In riproduzione..."
 
-#: js/viewfeed.js:1992 js/viewfeed.js:1965 js/viewfeed.js:1829
 #: js/viewfeed.js:1839
 msgid "Click to pause"
 msgstr "Fare clic per mettere in pausa"
 
-#: js/viewfeed.js:2150 js/viewfeed.js:2123 js/viewfeed.js:1987
 #: js/viewfeed.js:1896
 #, fuzzy
 msgid "Please enter new score for selected articles:"
 msgstr "Eliminare i %d articoli selezionati?"
 
-#: js/viewfeed.js:2192 js/viewfeed.js:2165 js/viewfeed.js:2029
 #: js/viewfeed.js:1938
 #, fuzzy
 msgid "Please enter new score for this article:"
 msgstr "Inserire il titolo della categoria:"
 
-#: js/functions.js:1887 js/functions.js:1891 js/functions.js:1897
-#: js/functions.js:1899
-msgid "Help"
-msgstr ""
-
-#: js/prefs.js:1831 js/prefs.js:1821
-msgid "Clear stored data for this plugin?"
-msgstr ""
-
-#: js/tt-rss.js:741 js/tt-rss.js:676 js/tt-rss.js:668
-#, fuzzy
-msgid "Please enable mail plugin first."
-msgstr "Selezionare prima qualche notiziario."
-
-#: plugins/digest/digest_body.php:39
-msgid "Your browser doesn't support Javascript, which is required"
-msgstr ""
-
-#: plugins/nsfw/init.php:32 plugins/nsfw/init.php:43
-msgid "Not work safe (click to toggle)"
-msgstr ""
-
-#: plugins/nsfw/init.php:53
-msgid "NSFW Plugin"
-msgstr ""
-
-#: plugins/nsfw/init.php:80
-msgid "Tags to consider NSFW (comma-separated)"
-msgstr ""
-
-#: plugins/nsfw/init.php:101
-#, fuzzy
-msgid "Configuration saved."
-msgstr "La configurazione è stata salvata."
-
-#: plugins/owncloud/init.php:35
-msgid "Owncloud"
-msgstr ""
-
-#: plugins/owncloud/init.php:59
-msgid "Owncloud url"
-msgstr ""
-
 #: plugins/digest/digest.js:71
 msgid "Mark %d displayed articles as read?"
 msgstr "Segnare %d articolo/i visualizzato/i come letto/i?"
@@ -3249,6 +3216,24 @@ msgstr "Nessun notiziario non letto."
 msgid "Load more..."
 msgstr "Carica altri..."
 
+#: plugins/import_export/import_export.js:13
+msgid "Export Data"
+msgstr ""
+
+#: plugins/import_export/import_export.js:40
+msgid ""
+"Finished, exported %d articles. You can download the data <a "
+"class='visibleLink' href='%u'>here</a>."
+msgstr ""
+
+#: plugins/import_export/import_export.js:93
+msgid "Data Import"
+msgstr ""
+
+#: plugins/import_export/import_export.js:112
+msgid "Please choose the file first."
+msgstr ""
+
 #: plugins/mail/mail.js:21
 msgid "Forward article by email"
 msgstr "Inoltra l'articolo per email"
@@ -3284,6 +3269,90 @@ msgid ""
 "before continuing. Please type 'yes' to continue."
 msgstr ""
 
+#~ msgid "Comments?"
+#~ msgstr "Commenti?"
+
+#~ msgid "News"
+#~ msgstr "Notizie"
+
+#~ msgid "Move between feeds"
+#~ msgstr "Sposta tra notiziari"
+
+#~ msgid "Move between articles"
+#~ msgstr "Sposta tra articoli"
+
+#~ msgid "Mark articles below/above active one as read"
+#~ msgstr "Segnare gli articoli sopra e sotto quello attivo come letti"
+
+#~ msgid "Scroll article content"
+#~ msgstr "Scorri il contenuto dell&apos;articolo"
+
+#~ msgid "Other actions"
+#~ msgstr "Altre azioni"
+
+#~ msgid "Display this help dialog"
+#~ msgstr "Visualizza questo dialogo di aiuto"
+
+#, fuzzy
+#~ msgid "Select starred articles"
+#~ msgstr "Articoli con stella"
+
+#~ msgid "Feed actions"
+#~ msgstr "Azioni notiziari"
+
+#~ msgid "Mark feed as read"
+#~ msgstr "Segna notiziario come letto"
+
+#~ msgid "If viewing category, (un)collapse it"
+#~ msgstr "Se in visualizzazione categoria, contraila/espandila"
+
+#~ msgid "Press any key to close this window."
+#~ msgstr "Premere qualsiasi tasto per chiudere questa finestra."
+
+#~ msgid "My Feeds"
+#~ msgstr "Notiziari"
+
+#~ msgid "Panel actions"
+#~ msgstr "Riquadro azioni"
+
+#~ msgid "Top 25 feeds"
+#~ msgstr "Primi 25 notiziari"
+
+#~ msgid "Edit feed categories"
+#~ msgstr "Modifica categorie notiziari"
+
+#~ 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 "Open article in new tab"
+#~ msgstr "Apri articolo in una nuova scheda"
+
+#~ msgid "Select theme"
+#~ msgstr "Seleziona tema"
+
+#~ msgid "Right-to-left content"
+#~ msgstr "Contenuto da destra a sinistra"
+
+#, fuzzy
+#~ msgid "Cache content locally"
+#~ msgstr "Memorizzare le immagini localmente"
+
+#~ msgid "Mark posts as updated on content change"
+#~ msgstr "Segnare gli articoli come aggiornati al cambiamento del contenuto"
+
+#~ msgid "Loading..."
+#~ msgstr "Caricamento..."
+
+#~ msgid "View in a tt-rss tab"
+#~ msgstr "Visualizza in una scheda tt-rss"
+
 #~ msgid "Magpie"
 #~ msgstr "Magpie"
 
diff --git a/locale/ja_JP/LC_MESSAGES/messages.mo b/locale/ja_JP/LC_MESSAGES/messages.mo
index a448c2b7d..767141f0c 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 8b142494b..6093478e8 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: 2013-03-17 19:37+0400\n"
+"POT-Creation-Date: 2013-03-19 10:14+0400\n"
 "PO-Revision-Date: 2009-05-12 03:25+0900\n"
 "Last-Translator: Tadashi Jokagi <elf2000@users.sourceforge.net>\n"
 "Language-Team: Japanese <http://oss.poyo.jp/>\n"
@@ -16,79 +16,79 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backend.php:67
+#: backend.php:71
 msgid "Use default"
 msgstr "標準を使用する"
 
-#: backend.php:68
+#: backend.php:72
 msgid "Never purge"
 msgstr "ずっと削除しない"
 
-#: backend.php:69
+#: backend.php:73
 msgid "1 week old"
 msgstr "1 週間前"
 
-#: backend.php:70
+#: backend.php:74
 msgid "2 weeks old"
 msgstr "2 週間前"
 
-#: backend.php:71
+#: backend.php:75
 msgid "1 month old"
 msgstr "1 ヶ月前"
 
-#: backend.php:72
+#: backend.php:76
 msgid "2 months old"
 msgstr "2 日月前"
 
-#: backend.php:73
+#: backend.php:77
 msgid "3 months old"
 msgstr "3 ヶ月前"
 
-#: backend.php:76
+#: backend.php:80
 msgid "Default interval"
 msgstr "更新の間隔"
 
-#: backend.php:77 backend.php:87
+#: backend.php:81 backend.php:91
 msgid "Disable updates"
 msgstr "更新を無効にする"
 
-#: backend.php:78 backend.php:88
+#: backend.php:82 backend.php:92
 msgid "Each 15 minutes"
 msgstr "各 15 分"
 
-#: backend.php:79 backend.php:89
+#: backend.php:83 backend.php:93
 msgid "Each 30 minutes"
 msgstr "各 30 分"
 
-#: backend.php:80 backend.php:90
+#: backend.php:84 backend.php:94
 msgid "Hourly"
 msgstr "毎時"
 
-#: backend.php:81 backend.php:91
+#: backend.php:85 backend.php:95
 msgid "Each 4 hours"
 msgstr "各 4 時間"
 
-#: backend.php:82 backend.php:92
+#: backend.php:86 backend.php:96
 msgid "Each 12 hours"
 msgstr "各 12 時間"
 
-#: backend.php:83 backend.php:93
+#: backend.php:87 backend.php:97
 msgid "Daily"
 msgstr "毎日"
 
-#: backend.php:84 backend.php:94
+#: backend.php:88 backend.php:98
 msgid "Weekly"
 msgstr "毎週"
 
-#: backend.php:97 classes/pref/users.php:139
+#: backend.php:101 classes/pref/users.php:139
 msgid "User"
 msgstr "ユーザー"
 
-#: backend.php:98
+#: backend.php:102
 msgid "Power User"
 msgstr "パワーユーザー"
 
-#: backend.php:99
+#: backend.php:103
 msgid "Administrator"
 msgstr "管理者"
 
@@ -120,7 +120,7 @@ msgstr "Tiny Tiny RSS のデータベースを更新しました。"
 #: db-updater.php:94 db-updater.php:163 db-updater.php:176 register.php:194
 #: register.php:239 register.php:252 register.php:267 register.php:286
 #: register.php:371 register.php:381 register.php:393
-#: classes/handler/public.php:637 classes/handler/public.php:725
+#: classes/handler/public.php:611 classes/handler/public.php:699
 msgid "Return to Tiny Tiny RSS"
 msgstr "Tiny Tiny RSS に戻る"
 
@@ -259,199 +259,199 @@ msgstr ""
 "SQL のエスケープ処理のテストに失敗しました。データベースの設定と PHP の設定を"
 "確認してください。"
 
-#: index.php:108 index.php:150 index.php:236 prefs.php:86
-#: classes/backend.php:6 classes/pref/labels.php:296
-#: classes/pref/filters.php:602 classes/pref/feeds.php:1342
-#: plugins/digest/digest_body.php:45 js/viewfeed.js:1169 js/viewfeed.js:1158
-#: js/viewfeed.js:1164 js/viewfeed.js:1174
+#: index.php:117 index.php:147 index.php:252 prefs.php:79
+#: classes/backend.php:5 classes/pref/labels.php:296
+#: classes/pref/filters.php:609 classes/pref/feeds.php:1270
+#: plugins/digest/digest_body.php:45 js/viewfeed.js:1174
 msgid "Loading, please wait..."
 msgstr "読み込みんでいます。しばらくお待ちください..."
 
-#: index.php:118 plugins/digest/digest_body.php:56
-msgid "Hello,"
-msgstr "ようこそ、"
+#: index.php:127 index.php:198
+msgid "Communication problem with server."
+msgstr ""
 
-#: index.php:120 prefs.php:29 prefs.php:108 help/main.php:73 help/prefs.php:8
-#: classes/pref/prefs.php:371
-msgid "Preferences"
-msgstr "設定"
-
-#: index.php:124
-msgid "Comments?"
-msgstr "コメントしますか?"
-
-#: index.php:128 mobile/mobile-functions.php:69
-#: mobile/mobile-functions.php:244 plugins/digest/digest_body.php:59
-msgid "Logout"
-msgstr "ログアウト"
-
-#: index.php:134
+#: index.php:133 index.php:206
 msgid "New version of Tiny Tiny RSS is available!"
 msgstr "Tiny Tiny RSS の新しいバージョンが利用できます!"
 
-#: index.php:157
-msgid "News"
-msgstr ""
-
-#: index.php:166
+#: index.php:161
 msgid "Collapse feedlist"
 msgstr "フィード一覧を閉じる"
 
-#: index.php:169
+#: index.php:164
 #, fuzzy
 msgid "Show articles"
 msgstr "記事を保管しました"
 
-#: index.php:172
+#: index.php:167
 msgid "Adaptive"
 msgstr ""
 
-#: index.php:173
+#: index.php:168
 msgid "All Articles"
 msgstr "すべての記事"
 
-#: index.php:174 classes/feeds.php:106
+#: index.php:169 include/functions.php:1912 classes/feeds.php:106
 msgid "Starred"
 msgstr "お気に入り"
 
-#: index.php:175 classes/feeds.php:107
+#: index.php:170 include/functions.php:1913 classes/feeds.php:107
 msgid "Published"
 msgstr "公開済み"
 
-#: index.php:176 classes/feeds.php:93 classes/feeds.php:105
+#: index.php:171 classes/feeds.php:93 classes/feeds.php:105
 msgid "Unread"
 msgstr "未読"
 
-#: index.php:177
+#: index.php:172
 msgid "Ignore Scoring"
 msgstr "スコア計算の無効化"
 
-#: index.php:178
+#: index.php:173
 msgid "Updated"
 msgstr "更新日時"
 
-#: index.php:181
+#: index.php:176
 #, fuzzy
 msgid "Sort articles"
 msgstr "記事を保管しました"
 
-#: index.php:184 classes/pref/prefs.php:462
+#: index.php:179
 msgid "Default"
 msgstr "標準"
 
-#: index.php:185
+#: index.php:180
 msgid "Date"
 msgstr "日付"
 
-#: index.php:186 include/localized_schema.php:3
+#: index.php:181 include/localized_schema.php:3
 msgid "Title"
 msgstr "題名"
 
-#: index.php:187
+#: index.php:182
 msgid "Score"
 msgstr "スコア"
 
-#: index.php:192 classes/pref/feeds.php:539 classes/pref/feeds.php:786
+#: index.php:187 classes/pref/feeds.php:535 classes/pref/feeds.php:746
 msgid "Update"
 msgstr "更新"
 
-#: index.php:196 index.php:211 include/localized_schema.php:10
-#: classes/feeds.php:111 classes/feeds.php:127 js/FeedTree.js:128
-#: js/FeedTree.js:156 plugins/digest/digest.js:630
+#: index.php:191 index.php:221 include/functions.php:1903
+#: include/localized_schema.php:10 classes/feeds.php:111 classes/feeds.php:131
+#: js/FeedTree.js:128 js/FeedTree.js:156 plugins/digest/digest.js:630
 msgid "Mark as read"
 msgstr "既読にする"
 
-#: index.php:202 classes/feeds.php:101
+#: index.php:211
 msgid "Actions..."
 msgstr "操作..."
 
-#: index.php:204
+#: index.php:213
+#, fuzzy
+msgid "Preferences..."
+msgstr "設定"
+
+#: index.php:214
 msgid "Search..."
 msgstr "検索..."
 
-#: index.php:205
+#: index.php:215
 msgid "Feed actions:"
 msgstr "フィード操作"
 
-#: index.php:206 classes/handler/public.php:567
+#: index.php:216 classes/handler/public.php:541
 msgid "Subscribe to feed..."
 msgstr "フィードを購読する..."
 
-#: index.php:207
+#: index.php:217
 msgid "Edit this feed..."
 msgstr "フィードを編集する..."
 
-#: index.php:208
+#: index.php:218
 msgid "Rescore feed"
 msgstr "フィードのスコアを再計算しています..."
 
-#: index.php:209 classes/pref/feeds.php:712 classes/pref/feeds.php:1315
+#: index.php:219 classes/pref/feeds.php:672 classes/pref/feeds.php:1243
 #: js/PrefFeedTree.js:73
 msgid "Unsubscribe"
 msgstr "購読をやめる"
 
-#: index.php:210
+#: index.php:220
 msgid "All feeds:"
 msgstr "すべてのフィード:"
 
-#: index.php:212 help/main.php:56
+#: index.php:222
 msgid "(Un)hide read feeds"
 msgstr "読んだフィードを隠す/再表示する"
 
-#: index.php:213
+#: index.php:223
 msgid "Other actions:"
 msgstr "その他の操作:"
 
-#: index.php:215
+#: index.php:225
 msgid "Switch to digest..."
 msgstr ""
 
-#: index.php:217
+#: index.php:227
 #, fuzzy
 msgid "Show tag cloud..."
 msgstr "タグクラウド"
 
-#: index.php:218
+#: index.php:229 include/functions.php:1890
+#, fuzzy
+msgid "Toggle widescreen mode"
+msgstr "カテゴリーの並び替えモードの切り替え"
+
+#: index.php:231
 msgid "Select by tags..."
 msgstr ""
 
-#: index.php:219
+#: index.php:232
 msgid "Create label..."
 msgstr "ラベルを作成する..."
 
-#: index.php:220
+#: index.php:233
 msgid "Create filter..."
 msgstr "フィルターを作成しています..."
 
-#: index.php:221
+#: index.php:234
 #, fuzzy
 msgid "Keyboard shortcuts help"
 msgstr "キーボードショートカット"
 
-#: prefs.php:99
+#: index.php:236 mobile/mobile-functions.php:69
+#: mobile/mobile-functions.php:244 plugins/digest/digest_body.php:59
+msgid "Logout"
+msgstr "ログアウト"
+
+#: prefs.php:28 prefs.php:99 include/functions.php:1915
+#: classes/pref/prefs.php:371
+msgid "Preferences"
+msgstr "設定"
+
+#: prefs.php:90
 msgid "Keyboard shortcuts"
 msgstr "キーボードショートカット"
 
-#: prefs.php:100 help/prefs.php:14
+#: prefs.php:91
 msgid "Exit preferences"
 msgstr "設定を終了する"
 
-#: prefs.php:111 classes/pref/feeds.php:101 classes/pref/feeds.php:1220
-#: classes/pref/feeds.php:1283
+#: prefs.php:102 classes/pref/feeds.php:100 classes/pref/feeds.php:1148
+#: classes/pref/feeds.php:1211
 msgid "Feeds"
 msgstr "フィード"
 
-#: prefs.php:114 help/prefs.php:11 classes/pref/filters.php:110
+#: prefs.php:105 classes/pref/filters.php:117
 msgid "Filters"
 msgstr "フィルター"
 
-#: prefs.php:117 help/prefs.php:12 mobile/mobile-functions.php:205
-#: include/functions.php:1189 include/functions.php:1836
-#: classes/pref/labels.php:90
+#: prefs.php:108 mobile/mobile-functions.php:205 include/functions.php:1118
+#: include/functions.php:1739 classes/pref/labels.php:90
 msgid "Labels"
 msgstr "ラベル"
 
-#: prefs.php:121 help/prefs.php:13
+#: prefs.php:112
 msgid "Users"
 msgstr "ユーザー"
 
@@ -510,249 +510,23 @@ msgstr "アカウントの作成に成功しました。"
 msgid "New user registrations are currently closed."
 msgstr "新規ユーザーの登録は現在行っていません。"
 
-#: update.php:38
+#: update.php:37
 #, fuzzy
 msgid "Tiny Tiny RSS data update script."
 msgstr "Tiny Tiny RSS のデータベースを更新しました。"
 
-#: help/main.php:1 help/prefs.php:1
-msgid "Keyboard Shortcuts"
-msgstr "キーボードショートカット"
-
-#: help/main.php:5
-msgid "Navigation"
-msgstr "ナビゲーション"
-
-#: help/main.php:8
-msgid "Move between feeds"
-msgstr "フィード間で移動する"
-
-#: help/main.php:9
-msgid "Move between articles"
-msgstr "記事間で移動する"
-
-#: help/main.php:10
-msgid "Show search dialog"
-msgstr "検索ダイアログを表示する"
-
-#: help/main.php:13
-msgid "Active article actions"
-msgstr "有効な記事の操作"
-
-#: help/main.php:16
-msgid "Toggle starred"
-msgstr "お気に入りを切り替える"
-
-#: help/main.php:17
-msgid "Toggle published"
-msgstr "公開を切り替える"
-
-#: help/main.php:18
-msgid "Toggle unread"
-msgstr "未読に切り替える"
-
-#: help/main.php:19
-msgid "Edit tags"
-msgstr "タグを編集する"
-
-#: help/main.php:20
-#, fuzzy
-msgid "Dismiss selected articles"
-msgstr "ラベルから選択した記事を削除しますか?"
-
-#: help/main.php:21
-#, fuzzy
-msgid "Dismiss read articles"
-msgstr "読んだ記事が見えないように隠す"
-
-#: help/main.php:22
-msgid "Open article in new window"
-msgstr "新しいウィンドウで記事を開く"
-
-#: help/main.php:23
-msgid "Mark articles below/above active one as read"
-msgstr ""
-
-#: help/main.php:24
-msgid "Scroll article content"
-msgstr "記事の内容をスクロールする"
-
-#: help/main.php:25
-#, fuzzy
-msgid "Email article"
-msgstr "すべての記事"
-
-#: help/main.php:29 help/prefs.php:30
-msgid "Other actions"
-msgstr "その他の操作"
-
-#: help/main.php:32
-msgid "Select article under mouse cursor"
-msgstr "マウスカーソルの下の記事を選択する"
-
-#: help/main.php:33 help/prefs.php:26 classes/pref/labels.php:281
-msgid "Create label"
-msgstr "ラベルを作成する"
-
-#: help/main.php:34 help/prefs.php:25 classes/pref/filters.php:580
-msgid "Create filter"
-msgstr "フィルターを作成する"
-
-#: help/main.php:35
-msgid "Collapse sidebar"
-msgstr "サイドバーを縮小する"
-
-#: help/main.php:36 help/prefs.php:34
-msgid "Display this help dialog"
-msgstr "このヘルプダイアログの表示"
-
-#: help/main.php:41
-#, fuzzy
-msgid "Multiple articles actions"
-msgstr "すべての記事"
-
-#: help/main.php:44
-#, fuzzy
-msgid "Select all articles"
-msgstr "記事を消去する"
-
-#: help/main.php:45
-#, fuzzy
-msgid "Select unread articles"
-msgstr "未読記事を削除する"
-
-#: help/main.php:46
-#, fuzzy
-msgid "Select starred articles"
-msgstr "未読記事を削除する"
-
-#: help/main.php:47
-#, fuzzy
-msgid "Select published articles"
-msgstr "未読記事を削除する"
-
-#: help/main.php:48
-#, fuzzy
-msgid "Invert article selection"
-msgstr "有効な記事の操作"
-
-#: help/main.php:49
-#, fuzzy
-msgid "Deselect all articles"
-msgstr "記事を消去する"
-
-#: help/main.php:52
-msgid "Feed actions"
-msgstr "フィード操作"
-
-#: help/main.php:55
-#, fuzzy
-msgid "Refresh active feed"
-msgstr "有効なフィードの更新"
-
-#: help/main.php:57 help/prefs.php:22 classes/pref/feeds.php:1286
-msgid "Subscribe to feed"
-msgstr "フィードを購読する"
-
-#: help/main.php:58 js/FeedTree.js:135 js/PrefFeedTree.js:67
-msgid "Edit feed"
-msgstr "フィードを編集する"
-
-#: help/main.php:59
-msgid "Mark feed as read"
-msgstr "マークしたフィードを既読にする"
-
-#: help/main.php:60
-#, fuzzy
-msgid "Reverse headlines order"
-msgstr "ヘッドラインの逆順 (古いものがはじめに)"
-
-#: help/main.php:61 js/FeedTree.js:170
-msgid "Mark all feeds as read"
-msgstr "すべてのフィードを既読に設定する"
-
-#: help/main.php:62
-msgid "If viewing category, (un)collapse it"
-msgstr ""
-
-#: help/main.php:65 help/prefs.php:5
-msgid "Go to..."
-msgstr "移動..."
-
-#: help/main.php:68 include/functions.php:1893
-msgid "All articles"
-msgstr "すべての記事"
-
-#: help/main.php:69 include/functions.php:1891
-msgid "Fresh articles"
-msgstr "新しい記事"
-
-#: help/main.php:70 include/functions.php:1887
-msgid "Starred articles"
-msgstr "お気に入りの記事"
-
-#: help/main.php:71 include/functions.php:1889
-msgid "Published articles"
-msgstr "公開済みの記事"
-
-#: help/main.php:72
-msgid "Tag cloud"
-msgstr "タグクラウド"
-
-#: help/main.php:79
-msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
-msgstr ""
-
-#: help/main.php:81 help/prefs.php:41
-msgid "Press any key to close this window."
-msgstr "何かキーを押して、このウィンドウを閉じてください。"
-
-#: help/prefs.php:9
-msgid "My Feeds"
-msgstr "自分のフィード"
-
-#: help/prefs.php:10
-msgid "Other Feeds"
-msgstr "その他のフィード"
-
-#: help/prefs.php:19
-msgid "Panel actions"
-msgstr "パネル操作"
-
-#: help/prefs.php:23
-msgid "Top 25 feeds"
-msgstr "トップ 25 フィード"
-
-#: help/prefs.php:24
-msgid "Edit feed categories"
-msgstr "フィードカテゴリーを編集する"
-
-#: help/prefs.php:27 classes/pref/users.php:386
-msgid "Create user"
-msgstr "ユーザーの作成"
-
-#: help/prefs.php:33
-msgid "Focus search (if present)"
-msgstr ""
-
-#: help/prefs.php:39
-msgid ""
-"<b>Note:</b> not all actions may be available, depending on Tiny Tiny RSS "
-"configuration and your access level."
-msgstr ""
-
 #: mobile/login_form.php:28 include/login_form.php:209
-#: classes/handler/public.php:495
+#: classes/handler/public.php:469
 msgid "Log in"
 msgstr "ログイン"
 
 #: mobile/login_form.php:40 include/login_form.php:169
-#: classes/handler/public.php:479
+#: classes/handler/public.php:453
 msgid "Login:"
 msgstr "ログイン:"
 
 #: mobile/login_form.php:45 include/login_form.php:178
-#: classes/handler/public.php:482
+#: classes/handler/public.php:456
 msgid "Password:"
 msgstr "パスワード:"
 
@@ -767,8 +541,8 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
-#: mobile/mobile-functions.php:178 include/functions.php:1187
-#: include/functions.php:1834
+#: mobile/mobile-functions.php:178 include/functions.php:1116
+#: include/functions.php:1737
 msgid "Special"
 msgstr "特別"
 
@@ -782,12 +556,12 @@ msgid "Enable categories"
 msgstr "フィードカテゴリーを有効にする"
 
 #: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36
-#: mobile/prefs.php:41 mobile/prefs.php:46
+#: mobile/prefs.php:41 mobile/prefs.php:46 mobile/prefs.php:51
 msgid "ON"
 msgstr ""
 
 #: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36
-#: mobile/prefs.php:41 mobile/prefs.php:46
+#: mobile/prefs.php:41 mobile/prefs.php:46 mobile/prefs.php:51
 msgid "OFF"
 msgstr ""
 
@@ -811,156 +585,347 @@ msgstr "読んだフィードを隠す/再表示する"
 msgid "Sort feeds by unread count"
 msgstr "未読記事数によるフィードの並び替え"
 
-#: include/functions.php:564
-#, php-format
-msgid "Fatal: authentication module %s not found."
-msgstr ""
+#: mobile/prefs.php:50 include/localized_schema.php:45
+msgid "Reverse headline order (oldest first)"
+msgstr "ヘッドラインの逆順 (古いものがはじめに)"
 
-#: include/functions.php:682
-msgid "Session failed to validate (incorrect IP)"
-msgstr "セッションの検査に失敗しました (IP が正しくない)"
-
-#: include/functions.php:1198 include/functions.php:1737
-#: include/functions.php:1822 include/functions.php:1844
-#: include/functions.php:2699 classes/opml.php:416 classes/pref/feeds.php:193
+#: include/digest.php:131 include/functions.php:1127
+#: include/functions.php:1640 include/functions.php:1725
+#: include/functions.php:1747 classes/opml.php:416 classes/pref/feeds.php:188
 msgid "Uncategorized"
 msgstr "カテゴリー割り当てなし"
 
-#: include/functions.php:1686 classes/dlg.php:387 classes/pref/filters.php:361
-msgid "All feeds"
-msgstr "すべてのフィード"
-
-#: include/functions.php:1895
-#, fuzzy
-msgid "Archived articles"
-msgstr "未読記事"
-
-#: include/functions.php:1897
-msgid "Recently read"
-msgstr ""
-
-#: include/functions.php:2346
-#, fuzzy, php-format
-msgid "Search results: %s"
-msgstr "検索結果"
-
-#: include/functions.php:3067 js/viewfeed.js:1998 js/viewfeed.js:1971
-#: js/viewfeed.js:1835 js/viewfeed.js:1845
-#, fuzzy
-msgid "Click to play"
-msgstr "編集するにはクリック"
-
-#: include/functions.php:3068 js/viewfeed.js:1997 js/viewfeed.js:1970
-#: js/viewfeed.js:1834 js/viewfeed.js:1844
-msgid "Play"
-msgstr ""
-
-#: include/functions.php:3203
-msgid " - "
-msgstr " - "
-
-#: include/functions.php:3232 include/functions.php:4028 classes/rpc.php:414
-msgid "no tags"
-msgstr "タグがありません"
-
-#: include/functions.php:3242 classes/feeds.php:680
-msgid "Edit tags for this article"
-msgstr "この記事のタグを編集する"
-
-#: include/functions.php:3252 classes/feeds.php:707
-#, fuzzy
-msgid "Open article in new tab"
-msgstr "新しいウィンドウで記事を開く"
-
-#: include/functions.php:3263 classes/feeds.php:718
-#, fuzzy
-msgid "Close article"
-msgstr "記事を消去する"
-
-#: include/functions.php:3280 classes/feeds.php:616
-#, fuzzy
-msgid "Originally from:"
-msgstr "元の記事内容を表示する"
-
-#: include/functions.php:3293 classes/feeds.php:629 classes/pref/feeds.php:511
-#, fuzzy
-msgid "Feed URL"
-msgstr "フィード"
-
-#: include/functions.php:3308 classes/feeds.php:68
-#, fuzzy
-msgid "Visit the website"
-msgstr "オフィシャルサイトに訪問する"
-
-#: include/functions.php:3327
-msgid "Related"
-msgstr ""
-
-#: include/functions.php:3361 classes/dlg.php:30 classes/dlg.php:61
-#: classes/dlg.php:180 classes/dlg.php:203 classes/dlg.php:240
-#: classes/dlg.php:524 classes/dlg.php:559 classes/dlg.php:590
-#: classes/dlg.php:623 classes/dlg.php:724 classes/pref/users.php:106
-#: classes/pref/filters.php:101 classes/pref/feeds.php:1638
-#: classes/pref/feeds.php:1709 plugins/share/share.php:61
-#: plugins/updater/updater.php:301 plugins/updater/init.php:323
-msgid "Close this window"
-msgstr "このウィンドウを閉じる"
-
-#: include/functions.php:4053
-#, fuzzy
-msgid "(edit note)"
-msgstr "ノートの編集"
-
-#: include/functions.php:4525
-msgid "No feed selected."
-msgstr "フィードは選択されていません。"
-
-#: include/functions.php:4535 classes/feeds.php:766
-#, php-format
-msgid "Feeds last updated at %s"
-msgstr ""
-
-#: include/functions.php:4545 classes/feeds.php:776
-msgid "Some feeds have update errors (click for details)"
-msgstr "いくつかのフィードの更新エラーです (詳細はクリックしてください)"
-
-#: include/functions.php:4689
-msgid "unknown type"
-msgstr "未知の種類"
-
-#: include/functions.php:4731
-#, fuzzy
-msgid "Attachments"
-msgstr "添付:"
-
-#: include/functions.php:5191
+#: include/feedbrowser.php:83
 #, fuzzy, php-format
 msgid "%d archived articles"
 msgstr "お気に入りの記事"
 
-#: include/functions.php:5215
+#: include/feedbrowser.php:107
 msgid "No feeds found."
 msgstr "フィードがありません。"
 
-#: include/functions.php:5261 plugins/import_export/init.php:221
+#: include/functions.php:698
+msgid "Session failed to validate (incorrect IP)"
+msgstr "セッションの検査に失敗しました (IP が正しくない)"
+
+#: include/functions.php:1589 classes/dlg.php:371 classes/pref/filters.php:368
+msgid "All feeds"
+msgstr "すべてのフィード"
+
+#: include/functions.php:1790
+msgid "Starred articles"
+msgstr "お気に入りの記事"
+
+#: include/functions.php:1792
+msgid "Published articles"
+msgstr "公開済みの記事"
+
+#: include/functions.php:1794
+msgid "Fresh articles"
+msgstr "新しい記事"
+
+#: include/functions.php:1796 include/functions.php:1910
+msgid "All articles"
+msgstr "すべての記事"
+
+#: include/functions.php:1798
 #, fuzzy
-msgid "Could not import: incorrect schema version."
-msgstr ""
-"必要なスキーマファイルを見つけられませんでした。次のバージョンが必要です:"
+msgid "Archived articles"
+msgstr "未読記事"
 
-#: include/functions.php:5266 plugins/import_export/init.php:226
-msgid "Could not import: unrecognized document format."
+#: include/functions.php:1800
+msgid "Recently read"
 msgstr ""
 
-#: include/functions.php:5425
-#, php-format
-msgid "Finished: %d articles processed, %d imported, %d feeds created."
+#: include/functions.php:1867
+msgid "Navigation"
+msgstr "ナビゲーション"
+
+#: include/functions.php:1868
+#, fuzzy
+msgid "Open next feed"
+msgstr "生成したフィード"
+
+#: include/functions.php:1869
+msgid "Open previous feed"
 msgstr ""
 
-#: include/functions.php:5431 plugins/import_export/init.php:391
-msgid "Could not load XML document."
+#: include/functions.php:1870
+#, fuzzy
+msgid "Open next article"
+msgstr "元の記事内容を表示する"
+
+#: include/functions.php:1871
+#, fuzzy
+msgid "Open previous article"
+msgstr "元の記事内容を表示する"
+
+#: include/functions.php:1872
+msgid "Open next article (don't scroll long articles)"
 msgstr ""
 
+#: include/functions.php:1873
+msgid "Open previous article (don't scroll long articles)"
+msgstr ""
+
+#: include/functions.php:1874
+msgid "Show search dialog"
+msgstr "検索ダイアログを表示する"
+
+#: include/functions.php:1875
+#, fuzzy
+msgid "Article"
+msgstr "すべての記事"
+
+#: include/functions.php:1876
+msgid "Toggle starred"
+msgstr "お気に入りを切り替える"
+
+#: include/functions.php:1877
+msgid "Toggle published"
+msgstr "公開を切り替える"
+
+#: include/functions.php:1878
+msgid "Toggle unread"
+msgstr "未読に切り替える"
+
+#: include/functions.php:1879
+msgid "Edit tags"
+msgstr "タグを編集する"
+
+#: include/functions.php:1880
+#, fuzzy
+msgid "Dismiss selected"
+msgstr "ラベルから選択した記事を削除しますか?"
+
+#: include/functions.php:1881
+#, fuzzy
+msgid "Dismiss read"
+msgstr "公開記事"
+
+#: include/functions.php:1882
+#, fuzzy
+msgid "Open in new window"
+msgstr "新しいウィンドウで記事を開く"
+
+#: include/functions.php:1883 js/viewfeed.js:1758
+#, fuzzy
+msgid "Mark below as read"
+msgstr "既読にする"
+
+#: include/functions.php:1884 js/viewfeed.js:1752
+#, fuzzy
+msgid "Mark above as read"
+msgstr "既読にする"
+
+#: include/functions.php:1885
+#, fuzzy
+msgid "Scroll down"
+msgstr "すべて終了しました。"
+
+#: include/functions.php:1886
+msgid "Scroll up"
+msgstr ""
+
+#: include/functions.php:1887
+#, fuzzy
+msgid "Select article under cursor"
+msgstr "マウスカーソルの下の記事を選択する"
+
+#: include/functions.php:1888
+#, fuzzy
+msgid "Email article"
+msgstr "すべての記事"
+
+#: include/functions.php:1889 plugins/close_button/init.php:24
+#, fuzzy
+msgid "Close article"
+msgstr "記事を消去する"
+
+#: include/functions.php:1891
+#, fuzzy
+msgid "Article selection"
+msgstr "有効な記事の操作"
+
+#: include/functions.php:1892
+#, fuzzy
+msgid "Select all articles"
+msgstr "記事を消去する"
+
+#: include/functions.php:1893
+#, fuzzy
+msgid "Select unread"
+msgstr "未読記事を削除する"
+
+#: include/functions.php:1894
+#, fuzzy
+msgid "Select starred"
+msgstr "お気に入りに設定する"
+
+#: include/functions.php:1895
+#, fuzzy
+msgid "Select published"
+msgstr "未読記事を削除する"
+
+#: include/functions.php:1896
+#, fuzzy
+msgid "Invert selection"
+msgstr "有効な記事の操作"
+
+#: include/functions.php:1897
+#, fuzzy
+msgid "Deselect everything"
+msgstr "記事を消去する"
+
+#: include/functions.php:1898 classes/pref/feeds.php:488
+#: classes/pref/feeds.php:707
+msgid "Feed"
+msgstr "フィード"
+
+#: include/functions.php:1899
+#, fuzzy
+msgid "Refresh current feed"
+msgstr "有効なフィードの更新"
+
+#: include/functions.php:1900
+#, fuzzy
+msgid "Un/hide read feeds"
+msgstr "読んだフィードを隠す/再表示する"
+
+#: include/functions.php:1901 classes/pref/feeds.php:1214
+msgid "Subscribe to feed"
+msgstr "フィードを購読する"
+
+#: include/functions.php:1902 js/FeedTree.js:135 js/PrefFeedTree.js:67
+msgid "Edit feed"
+msgstr "フィードを編集する"
+
+#: include/functions.php:1904
+#, fuzzy
+msgid "Reverse headlines"
+msgstr "ヘッドラインの逆順 (古いものがはじめに)"
+
+#: include/functions.php:1905
+#, fuzzy
+msgid "Debug feed update"
+msgstr "すべてのフィードを更新しました。"
+
+#: include/functions.php:1906 js/FeedTree.js:170
+msgid "Mark all feeds as read"
+msgstr "すべてのフィードを既読に設定する"
+
+#: include/functions.php:1907
+#, fuzzy
+msgid "Un/collapse current category"
+msgstr "閉じたカテゴリーのクリック"
+
+#: include/functions.php:1908
+#, fuzzy
+msgid "Toggle combined mode"
+msgstr "カテゴリーの並び替えモードの切り替え"
+
+#: include/functions.php:1909
+#, fuzzy
+msgid "Go to"
+msgstr "移動..."
+
+#: include/functions.php:1911
+#, fuzzy
+msgid "Fresh"
+msgstr "再描画"
+
+#: include/functions.php:1914
+msgid "Tag cloud"
+msgstr "タグクラウド"
+
+#: include/functions.php:1916
+#, fuzzy
+msgid "Other"
+msgstr "その他:"
+
+#: include/functions.php:1917 classes/pref/labels.php:281
+msgid "Create label"
+msgstr "ラベルを作成する"
+
+#: include/functions.php:1918 classes/pref/filters.php:587
+msgid "Create filter"
+msgstr "フィルターを作成する"
+
+#: include/functions.php:1919
+#, fuzzy
+msgid "Un/collapse sidebar"
+msgstr "サイドバーを縮小する"
+
+#: include/functions.php:1920
+#, fuzzy
+msgid "Show help dialog"
+msgstr "検索ダイアログを表示する"
+
+#: include/functions.php:2400
+#, fuzzy, php-format
+msgid "Search results: %s"
+msgstr "検索結果"
+
+#: include/functions.php:2824 js/viewfeed.js:1845
+#, fuzzy
+msgid "Click to play"
+msgstr "編集するにはクリック"
+
+#: include/functions.php:2825 js/viewfeed.js:1844
+msgid "Play"
+msgstr ""
+
+#: include/functions.php:2945
+msgid " - "
+msgstr " - "
+
+#: include/functions.php:2967 include/functions.php:3284 classes/rpc.php:359
+msgid "no tags"
+msgstr "タグがありません"
+
+#: include/functions.php:2977 classes/feeds.php:645
+msgid "Edit tags for this article"
+msgstr "この記事のタグを編集する"
+
+#: include/functions.php:3006 classes/feeds.php:600
+#, fuzzy
+msgid "Originally from:"
+msgstr "元の記事内容を表示する"
+
+#: include/functions.php:3019 classes/feeds.php:613 classes/pref/feeds.php:507
+#, fuzzy
+msgid "Feed URL"
+msgstr "フィード"
+
+#: include/functions.php:3048
+msgid "Related"
+msgstr ""
+
+#: include/functions.php:3075 classes/dlg.php:43 classes/dlg.php:162
+#: classes/dlg.php:185 classes/dlg.php:222 classes/dlg.php:508
+#: classes/dlg.php:543 classes/dlg.php:574 classes/dlg.php:608
+#: classes/dlg.php:620 classes/backend.php:105 classes/pref/users.php:106
+#: classes/pref/filters.php:108 classes/pref/feeds.php:1527
+#: classes/pref/feeds.php:1598 plugins/import_export/init.php:407
+#: plugins/import_export/init.php:431 plugins/share/init.php:67
+#: plugins/updater/init.php:329
+msgid "Close this window"
+msgstr "このウィンドウを閉じる"
+
+#: include/functions.php:3309
+#, fuzzy
+msgid "(edit note)"
+msgstr "ノートの編集"
+
+#: include/functions.php:3542
+msgid "unknown type"
+msgstr "未知の種類"
+
+#: include/functions.php:3592
+#, fuzzy
+msgid "Attachments"
+msgstr "添付:"
+
 #: include/localized_schema.php:4
 msgid "Title or Content"
 msgstr "題名か内容"
@@ -986,9 +951,8 @@ msgstr "記事を消去する"
 msgid "Set starred"
 msgstr "お気に入りに設定する"
 
-#: include/localized_schema.php:12 js/viewfeed.js:501 js/viewfeed.js:490
-#: js/viewfeed.js:496 js/viewfeed.js:478 plugins/digest/digest.js:264
-#: plugins/digest/digest.js:736
+#: include/localized_schema.php:12 js/viewfeed.js:478
+#: plugins/digest/digest.js:264 plugins/digest/digest.js:736
 msgid "Publish article"
 msgstr "公開記事"
 
@@ -996,8 +960,7 @@ msgstr "公開記事"
 msgid "Assign tags"
 msgstr "タグの割り当て"
 
-#: include/localized_schema.php:14 js/viewfeed.js:1962 js/viewfeed.js:1935
-#: js/viewfeed.js:1799 js/viewfeed.js:1809
+#: include/localized_schema.php:14 js/viewfeed.js:1809
 msgid "Assign label"
 msgstr "ラベルの割り当て"
 
@@ -1130,10 +1093,6 @@ msgstr "次のフィードの表示をキャッチアップする"
 msgid "Sort feeds by unread articles count"
 msgstr "未読記事数によるフィードの並び替え"
 
-#: include/localized_schema.php:45
-msgid "Reverse headline order (oldest first)"
-msgstr "ヘッドラインの逆順 (古いものがはじめに)"
-
 #: include/localized_schema.php:46
 msgid "Enable e-mail digest"
 msgstr "電子メールでのダイジェストを有効にする"
@@ -1180,7 +1139,8 @@ msgid "Group headlines in virtual feeds"
 msgstr "仮想フィードのグループヘッドライン"
 
 #: include/localized_schema.php:57
-msgid "Do not show images in articles"
+#, fuzzy
+msgid "Hide images in articles"
 msgstr "記事内に画像を表示しない"
 
 #: include/localized_schema.php:58
@@ -1191,8 +1151,7 @@ msgstr ""
 msgid "User timezone"
 msgstr ""
 
-#: include/localized_schema.php:60 js/prefs.js:1856 js/prefs.js:1743
-#: js/prefs.js:1733
+#: include/localized_schema.php:60 js/prefs.js:1733
 #, fuzzy
 msgid "Customize stylesheet"
 msgstr "ユーザースタイルシートの URL"
@@ -1215,7 +1174,7 @@ msgstr ""
 msgid "Assign articles to labels automatically"
 msgstr "自動的に既読として記事をマークする"
 
-#: include/login_form.php:185 classes/handler/public.php:485
+#: include/login_form.php:185 classes/handler/public.php:459
 msgid "Language:"
 msgstr "言語:"
 
@@ -1224,8 +1183,8 @@ msgstr "言語:"
 msgid "Profile:"
 msgstr "ファイル:"
 
-#: include/login_form.php:197 classes/handler/public.php:208
-#: classes/rpc.php:147 classes/dlg.php:116
+#: include/login_form.php:197 classes/handler/public.php:212
+#: classes/rpc.php:64 classes/dlg.php:98
 #, fuzzy
 msgid "Default profile"
 msgstr "標準の記事制限"
@@ -1239,362 +1198,347 @@ msgstr ""
 msgid "Article not found."
 msgstr "フィードが見つかりません。"
 
-#: classes/handler/public.php:420 classes/pref/feeds.php:1480
+#: classes/handler/public.php:394 plugins/bookmarklets/init.php:38
 #, fuzzy
 msgid "Share with Tiny Tiny RSS"
 msgstr "Tiny Tiny RSS に戻る"
 
-#: classes/handler/public.php:428
+#: classes/handler/public.php:402
 msgid "Title:"
 msgstr "題名:"
 
-#: classes/handler/public.php:430 classes/dlg.php:667
-#: classes/pref/feeds.php:509 classes/pref/feeds.php:762
-#: plugins/instances/instances.php:100 plugins/instances/init.php:215
+#: classes/handler/public.php:404 classes/dlg.php:667
+#: classes/pref/feeds.php:505 classes/pref/feeds.php:722
+#: plugins/instances/init.php:215
 msgid "URL:"
 msgstr "URL:"
 
-#: classes/handler/public.php:432
+#: classes/handler/public.php:406
 #, fuzzy
 msgid "Content:"
 msgstr "内容"
 
-#: classes/handler/public.php:434
+#: classes/handler/public.php:408
 #, fuzzy
 msgid "Labels:"
 msgstr "ラベル"
 
-#: classes/handler/public.php:453
+#: classes/handler/public.php:427
 msgid "Shared article will appear in the Published feed."
 msgstr ""
 
-#: classes/handler/public.php:455
+#: classes/handler/public.php:429
 msgid "Share"
 msgstr ""
 
-#: classes/handler/public.php:456 classes/handler/public.php:498
-#: classes/dlg.php:315 classes/dlg.php:366 classes/dlg.php:426
-#: classes/dlg.php:457 classes/dlg.php:652 classes/dlg.php:702
-#: classes/dlg.php:774 classes/pref/users.php:194 classes/pref/labels.php:81
-#: classes/pref/filters.php:342 classes/pref/filters.php:722
-#: classes/pref/filters.php:791 classes/pref/filters.php:858
-#: classes/pref/feeds.php:729 classes/pref/feeds.php:880
-#: plugins/mail/mail.php:126 plugins/note/note.php:49
-#: plugins/instances/instances.php:136
+#: classes/handler/public.php:430 classes/handler/public.php:472
+#: classes/dlg.php:297 classes/dlg.php:350 classes/dlg.php:410
+#: classes/dlg.php:441 classes/dlg.php:652 classes/dlg.php:702
+#: classes/dlg.php:751 classes/pref/users.php:194 classes/pref/labels.php:81
+#: classes/pref/filters.php:349 classes/pref/filters.php:729
+#: classes/pref/filters.php:798 classes/pref/filters.php:865
+#: classes/pref/feeds.php:689 classes/pref/feeds.php:829
+#: plugins/mail/init.php:132 plugins/note/init.php:55
+#: plugins/instances/init.php:251
 msgid "Cancel"
 msgstr "取り消し"
 
-#: classes/handler/public.php:477
+#: classes/handler/public.php:451
 #, fuzzy
 msgid "Not logged in"
 msgstr "最終ログイン"
 
-#: classes/handler/public.php:537
+#: classes/handler/public.php:511
 msgid "Incorrect username or password"
 msgstr "ユーザー名かパスワードが正しくありません"
 
-#: classes/handler/public.php:573 classes/handler/public.php:670
+#: classes/handler/public.php:547 classes/handler/public.php:644
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "<b>%s</b> は既に購読しています。"
 
-#: classes/handler/public.php:576 classes/handler/public.php:661
+#: classes/handler/public.php:550 classes/handler/public.php:635
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "<b>%s</b> を購読しました。"
 
-#: classes/handler/public.php:579 classes/handler/public.php:664
+#: classes/handler/public.php:553 classes/handler/public.php:638
 #, fuzzy, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "<b>%s</b> は既に購読しています。"
 
-#: classes/handler/public.php:582 classes/handler/public.php:667
+#: classes/handler/public.php:556 classes/handler/public.php:641
 #, fuzzy, php-format
 msgid "No feeds found in <b>%s</b>."
 msgstr "フィードがありません。"
 
-#: classes/handler/public.php:585 classes/handler/public.php:673
+#: classes/handler/public.php:559 classes/handler/public.php:647
 #, fuzzy
 msgid "Multiple feed URLs found."
 msgstr "公開フィードの URL を変更しました。"
 
-#: classes/handler/public.php:589 classes/handler/public.php:678
+#: classes/handler/public.php:563 classes/handler/public.php:652
 #, fuzzy, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr "<b>%s</b> は既に購読しています。"
 
-#: classes/handler/public.php:607 classes/handler/public.php:696
+#: classes/handler/public.php:581 classes/handler/public.php:670
 #, fuzzy
 msgid "Subscribe to selected feed"
 msgstr "選択されたフィードの購読をやめますか?"
 
-#: classes/handler/public.php:632 classes/handler/public.php:720
+#: classes/handler/public.php:606 classes/handler/public.php:694
 msgid "Edit subscription options"
 msgstr "購読オプションの編集"
 
-#: classes/auth/internal.php:45 plugins/auth_internal/init.php:62
-#, fuzzy
-msgid "Please enter your one time password:"
-msgstr "このアーティクルのノートを入力してください:"
-
-#: classes/auth/internal.php:168 plugins/auth_internal/init.php:185
-msgid "Password has been changed."
-msgstr "パスワードを変更しました。"
-
-#: classes/auth/internal.php:170
-msgid "Old password is incorrect."
-msgstr "古いパスワードが不正確です。"
-
-#: classes/dlg.php:26
-#, fuzzy
-msgid "Prepare data"
-msgstr "保存"
-
-#: classes/dlg.php:40
+#: classes/dlg.php:22
 msgid ""
 "If you have imported labels and/or filters, you might need to reload "
 "preferences to see your new data."
 msgstr ""
 
-#: classes/dlg.php:73 classes/pref/users.php:378 classes/pref/labels.php:272
-#: classes/pref/filters.php:223 classes/pref/filters.php:270
-#: classes/pref/filters.php:571 classes/pref/filters.php:650
-#: classes/pref/filters.php:677 classes/pref/feeds.php:1274
-#: classes/pref/feeds.php:1583 classes/pref/feeds.php:1652
-#: plugins/instances/instances.php:172
+#: classes/dlg.php:55 classes/pref/users.php:378 classes/pref/labels.php:272
+#: classes/pref/filters.php:230 classes/pref/filters.php:277
+#: classes/pref/filters.php:578 classes/pref/filters.php:657
+#: classes/pref/filters.php:684 classes/pref/feeds.php:1202
+#: classes/pref/feeds.php:1472 classes/pref/feeds.php:1541
+#: plugins/instances/init.php:287
 #, fuzzy
 msgid "Select"
 msgstr "選択:"
 
-#: classes/dlg.php:76 classes/feeds.php:92 classes/pref/users.php:381
-#: classes/pref/labels.php:275 classes/pref/filters.php:226
-#: classes/pref/filters.php:273 classes/pref/filters.php:574
-#: classes/pref/filters.php:653 classes/pref/filters.php:680
-#: classes/pref/feeds.php:1277 classes/pref/feeds.php:1586
-#: classes/pref/feeds.php:1655 plugins/instances/instances.php:175
+#: classes/dlg.php:58 classes/feeds.php:92 classes/pref/users.php:381
+#: classes/pref/labels.php:275 classes/pref/filters.php:233
+#: classes/pref/filters.php:280 classes/pref/filters.php:581
+#: classes/pref/filters.php:660 classes/pref/filters.php:687
+#: classes/pref/feeds.php:1205 classes/pref/feeds.php:1475
+#: classes/pref/feeds.php:1544 plugins/instances/init.php:290
 msgid "All"
 msgstr "すべて"
 
-#: classes/dlg.php:78 classes/feeds.php:95 classes/pref/users.php:383
-#: classes/pref/labels.php:277 classes/pref/filters.php:228
-#: classes/pref/filters.php:275 classes/pref/filters.php:576
-#: classes/pref/filters.php:655 classes/pref/filters.php:682
-#: classes/pref/feeds.php:1279 classes/pref/feeds.php:1588
-#: classes/pref/feeds.php:1657 plugins/instances/instances.php:177
+#: classes/dlg.php:60 classes/feeds.php:95 classes/pref/users.php:383
+#: classes/pref/labels.php:277 classes/pref/filters.php:235
+#: classes/pref/filters.php:282 classes/pref/filters.php:583
+#: classes/pref/filters.php:662 classes/pref/filters.php:689
+#: classes/pref/feeds.php:1207 classes/pref/feeds.php:1477
+#: classes/pref/feeds.php:1546 plugins/instances/init.php:292
 msgid "None"
 msgstr "なし"
 
-#: classes/dlg.php:87
+#: classes/dlg.php:69
 #, fuzzy
 msgid "Create profile"
 msgstr "フィルターを作成する"
 
-#: classes/dlg.php:110 classes/dlg.php:140
+#: classes/dlg.php:92 classes/dlg.php:122
 msgid "(active)"
 msgstr ""
 
-#: classes/dlg.php:174
+#: classes/dlg.php:156
 #, fuzzy
 msgid "Remove selected profiles"
 msgstr "選択されたフィルターを削除しますか?"
 
-#: classes/dlg.php:176
+#: classes/dlg.php:158
 #, fuzzy
 msgid "Activate profile"
 msgstr "選択されたフィルターを削除しますか?"
 
-#: classes/dlg.php:186
+#: classes/dlg.php:168
 msgid "Public OPML URL"
 msgstr ""
 
-#: classes/dlg.php:191
+#: classes/dlg.php:173
 #, fuzzy
 msgid "Your Public OPML URL is:"
 msgstr "公開記事フィードへのリンクです。"
 
-#: classes/dlg.php:200 classes/dlg.php:587
+#: classes/dlg.php:182 classes/dlg.php:571
 #, fuzzy
 msgid "Generate new URL"
 msgstr "生成したフィード"
 
-#: classes/dlg.php:212
+#: classes/dlg.php:194
 msgid "Notice"
 msgstr "通知"
 
-#: classes/dlg.php:218
+#: classes/dlg.php:200
 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 ""
 
-#: classes/dlg.php:222 classes/dlg.php:231
+#: classes/dlg.php:204 classes/dlg.php:213
 msgid "Last update:"
 msgstr "最終更新:"
 
-#: classes/dlg.php:227
+#: classes/dlg.php:209
 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 ""
 
-#: classes/dlg.php:252 classes/dlg.php:261
+#: classes/dlg.php:234 classes/dlg.php:243
 #, fuzzy
 msgid "Feed or site URL"
 msgstr "フィード"
 
-#: classes/dlg.php:267 classes/dlg.php:738 classes/pref/feeds.php:531
-#: classes/pref/feeds.php:775
+#: classes/dlg.php:249 classes/dlg.php:715 classes/pref/feeds.php:527
+#: classes/pref/feeds.php:735
 msgid "Place in category:"
 msgstr "カテゴリーの場所:"
 
-#: classes/dlg.php:275
+#: classes/dlg.php:257
 #, fuzzy
 msgid "Available feeds"
 msgstr "すべてのフィード"
 
-#: classes/dlg.php:287 classes/pref/users.php:155 classes/pref/feeds.php:561
-#: classes/pref/feeds.php:811
+#: classes/dlg.php:269 classes/pref/users.php:155 classes/pref/feeds.php:557
+#: classes/pref/feeds.php:771
 msgid "Authentication"
 msgstr "認証"
 
-#: classes/dlg.php:291 classes/dlg.php:752 classes/pref/users.php:438
-#: classes/pref/feeds.php:567 classes/pref/feeds.php:815
+#: classes/dlg.php:273 classes/dlg.php:729 classes/pref/users.php:438
+#: classes/pref/feeds.php:563 classes/pref/feeds.php:775
 msgid "Login"
 msgstr "ログイン"
 
-#: classes/dlg.php:294 classes/dlg.php:755 classes/pref/prefs.php:200
-#: classes/pref/feeds.php:573 classes/pref/feeds.php:821
+#: classes/dlg.php:276 classes/dlg.php:732 classes/pref/prefs.php:196
+#: classes/pref/feeds.php:569 classes/pref/feeds.php:781
 #, fuzzy
 msgid "Password"
 msgstr "パスワード:"
 
-#: classes/dlg.php:304
+#: classes/dlg.php:286
 msgid "This feed requires authentication."
 msgstr "このフィードは認証を要求します。"
 
-#: classes/dlg.php:309 classes/dlg.php:364 classes/dlg.php:773
+#: classes/dlg.php:291 classes/dlg.php:348 classes/dlg.php:750
 msgid "Subscribe"
 msgstr "購読"
 
-#: classes/dlg.php:312
+#: classes/dlg.php:294
 #, fuzzy
 msgid "More feeds"
 msgstr "さらなるフィード"
 
-#: classes/dlg.php:336 classes/dlg.php:425 classes/pref/users.php:368
-#: classes/pref/filters.php:567 classes/pref/feeds.php:1270 js/tt-rss.js:234
-#: js/tt-rss.js:187 js/tt-rss.js:166
+#: classes/dlg.php:318 classes/dlg.php:409 classes/pref/users.php:368
+#: classes/pref/filters.php:574 classes/pref/feeds.php:1198 js/tt-rss.js:166
 msgid "Search"
 msgstr "検索"
 
-#: classes/dlg.php:340
+#: classes/dlg.php:322
 #, fuzzy
 msgid "Popular feeds"
 msgstr "フィードの表示"
 
-#: classes/dlg.php:341
+#: classes/dlg.php:323
 #, fuzzy
 msgid "Feed archive"
 msgstr "フィード操作"
 
-#: classes/dlg.php:344
+#: classes/dlg.php:326
 #, fuzzy
 msgid "limit:"
 msgstr "制限:"
 
-#: classes/dlg.php:365 classes/pref/users.php:394 classes/pref/labels.php:284
-#: classes/pref/filters.php:332 classes/pref/filters.php:589
-#: classes/pref/feeds.php:702 plugins/instances/instances.php:182
+#: classes/dlg.php:349 classes/pref/users.php:394 classes/pref/labels.php:284
+#: classes/pref/filters.php:339 classes/pref/filters.php:596
+#: classes/pref/feeds.php:662 plugins/instances/init.php:297
 msgid "Remove"
 msgstr "削除"
 
-#: classes/dlg.php:376
+#: classes/dlg.php:360
 msgid "Look for"
 msgstr ""
 
-#: classes/dlg.php:384
+#: classes/dlg.php:368
 msgid "Limit search to:"
 msgstr "対象範囲"
 
-#: classes/dlg.php:400
+#: classes/dlg.php:384
 msgid "This feed"
 msgstr "このフィード"
 
-#: classes/dlg.php:432
+#: classes/dlg.php:416
 msgid "Tags for this article (separated by commas):"
 msgstr "この記事のタグ (カンマで区切ります):"
 
-#: classes/dlg.php:455 classes/dlg.php:650 classes/pref/users.php:192
-#: classes/pref/labels.php:79 classes/pref/filters.php:339
-#: classes/pref/feeds.php:728 classes/pref/feeds.php:877
-#: plugins/note/note.php:47 plugins/instances/instances.php:133
-#: plugins/nsfw/init.php:86 plugins/owncloud/init.php:62
+#: classes/dlg.php:439 classes/dlg.php:650 classes/pref/users.php:192
+#: classes/pref/labels.php:79 classes/pref/filters.php:346
+#: classes/pref/feeds.php:688 classes/pref/feeds.php:826
+#: plugins/nsfw/init.php:86 plugins/note/init.php:53
+#: plugins/owncloud/init.php:62 plugins/instances/init.php:248
 msgid "Save"
 msgstr "保存"
 
-#: classes/dlg.php:463
+#: classes/dlg.php:447
 #, fuzzy
 msgid "Tag Cloud"
 msgstr "タグクラウド"
 
-#: classes/dlg.php:532
+#: classes/dlg.php:516
 msgid "Select item(s) by tags"
 msgstr ""
 
-#: classes/dlg.php:535
+#: classes/dlg.php:519
 #, fuzzy
 msgid "Match:"
 msgstr "一致"
 
-#: classes/dlg.php:537
+#: classes/dlg.php:521
 msgid "Any"
 msgstr ""
 
-#: classes/dlg.php:540
+#: classes/dlg.php:524
 #, fuzzy
 msgid "All tags."
 msgstr "タグがありません"
 
-#: classes/dlg.php:542
+#: classes/dlg.php:526
 msgid "Which Tags?"
 msgstr ""
 
-#: classes/dlg.php:555
+#: classes/dlg.php:539
 #, fuzzy
 msgid "Display entries"
 msgstr "フィードの表示"
 
-#: classes/dlg.php:567 classes/feeds.php:129
+#: classes/dlg.php:551 classes/feeds.php:133
 #, fuzzy
 msgid "View as RSS"
 msgstr "タグを閲覧する"
 
-#: classes/dlg.php:578
+#: classes/dlg.php:562
 msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 
-#: classes/dlg.php:606 plugins/updater/updater.php:276
+#: classes/dlg.php:591 plugins/updater/init.php:303
 #, fuzzy, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "Tiny Tiny RSS の新しいバージョンが利用できます!"
 
-#: classes/dlg.php:614
+#: classes/dlg.php:599
 msgid ""
 "You can update using built-in updater in the Preferences or by using update."
 "php"
 msgstr ""
 
-#: classes/dlg.php:618 classes/pref/users.php:390
+#: classes/dlg.php:603 classes/pref/users.php:390
 #, fuzzy
 msgid "Details"
 msgstr "毎日"
 
-#: classes/dlg.php:620
+#: classes/dlg.php:605
 msgid "Download"
 msgstr ""
 
+#: classes/dlg.php:613
+msgid "Error receiving version information or no new version available."
+msgstr ""
+
 #: classes/dlg.php:634
 #, php-format
 msgid ""
@@ -1603,34 +1547,31 @@ msgid ""
 "\" href=\"%s\">This file</a> can be used as a baseline."
 msgstr ""
 
-#: classes/dlg.php:661 plugins/instances/instances.php:92
-#: plugins/instances/init.php:207
+#: classes/dlg.php:661 plugins/instances/init.php:207
 msgid "Instance"
 msgstr ""
 
-#: classes/dlg.php:670 plugins/instances/instances.php:103
-#: plugins/instances/instances.php:200 plugins/instances/init.php:218
+#: classes/dlg.php:670 plugins/instances/init.php:218
+#: plugins/instances/init.php:315
 msgid "Instance URL"
 msgstr ""
 
-#: classes/dlg.php:680 plugins/instances/instances.php:114
-#: plugins/instances/init.php:229
+#: classes/dlg.php:680 plugins/instances/init.php:229
 #, fuzzy
 msgid "Access key:"
 msgstr "アクセスレベル: "
 
-#: classes/dlg.php:683 plugins/instances/instances.php:117
-#: plugins/instances/instances.php:201 plugins/instances/init.php:232
+#: classes/dlg.php:683 plugins/instances/init.php:232
+#: plugins/instances/init.php:316
 #, fuzzy
 msgid "Access key"
 msgstr "アクセスレベル"
 
-#: classes/dlg.php:687 plugins/instances/instances.php:121
-#: plugins/instances/init.php:236
+#: classes/dlg.php:687 plugins/instances/init.php:236
 msgid "Use one access key for both linked instances."
 msgstr ""
 
-#: classes/dlg.php:695 plugins/instances/instances.php:129
+#: classes/dlg.php:695 plugins/instances/init.php:244
 #, fuzzy
 msgid "Generate new key"
 msgstr "生成したフィード"
@@ -1640,26 +1581,24 @@ msgstr "生成したフィード"
 msgid "Create link"
 msgstr "作成"
 
-#: classes/dlg.php:717
-#, php-format
-msgid ""
-"Could not upload file. You might need to adjust upload_max_filesize\n"
-"\t\t\t\tin PHP.ini (current value = %s)"
-msgstr ""
-
-#: classes/dlg.php:735
+#: classes/dlg.php:712
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr ""
 
-#: classes/dlg.php:744
+#: classes/dlg.php:721
 msgid "Feeds to subscribe, One per line"
 msgstr ""
 
-#: classes/dlg.php:766
+#: classes/dlg.php:743
 #, fuzzy
 msgid "Feeds require authentication."
 msgstr "このフィードは認証を要求します。"
 
+#: classes/feeds.php:68
+#, fuzzy
+msgid "Visit the website"
+msgstr "オフィシャルサイトに訪問する"
+
 #: classes/feeds.php:83
 #, fuzzy
 msgid "View as RSS feed"
@@ -1673,6 +1612,11 @@ msgstr "選択:"
 msgid "Invert"
 msgstr "反転"
 
+#: classes/feeds.php:101
+#, fuzzy
+msgid "More..."
+msgstr "ヘルプを読み込んでいます..."
+
 #: classes/feeds.php:103
 msgid "Selection toggle:"
 msgstr "選択の切り替え:"
@@ -1696,43 +1640,43 @@ msgstr "記事の日付"
 msgid "Move back"
 msgstr "戻る"
 
-#: classes/feeds.php:118 classes/pref/filters.php:235
-#: classes/pref/filters.php:282 classes/pref/filters.php:662
-#: classes/pref/filters.php:689
+#: classes/feeds.php:118 classes/pref/filters.php:242
+#: classes/pref/filters.php:289 classes/pref/filters.php:669
+#: classes/pref/filters.php:696
 #, fuzzy
 msgid "Delete"
 msgstr "標準"
 
-#: classes/feeds.php:122 plugins/mail/mail.php:22
+#: classes/feeds.php:125 plugins/mail/init.php:28
 #, fuzzy
 msgid "Forward by email"
 msgstr "記事をお気に入りにする"
 
-#: classes/feeds.php:125
+#: classes/feeds.php:129
 msgid "Feed:"
 msgstr "フィード:"
 
-#: classes/feeds.php:190 classes/feeds.php:844
+#: classes/feeds.php:196 classes/feeds.php:790
 msgid "Feed not found."
 msgstr "フィードが見つかりません。"
 
-#: classes/feeds.php:434 classes/feeds.php:516
+#: classes/feeds.php:403 classes/feeds.php:493
 msgid "mark as read"
 msgstr "既読にする"
 
-#: classes/feeds.php:739
+#: classes/feeds.php:691
 msgid "No unread articles found to display."
 msgstr "表示する未読記事が見つかりませんでした。"
 
-#: classes/feeds.php:742
+#: classes/feeds.php:694
 msgid "No updated articles found to display."
 msgstr "表示する更新された記事が見つかりませんでした。"
 
-#: classes/feeds.php:745
+#: classes/feeds.php:697
 msgid "No starred articles found to display."
 msgstr "表示するお気に入りの記事が見つかりませんでした。"
 
-#: classes/feeds.php:749
+#: classes/feeds.php:701
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
@@ -1740,11 +1684,40 @@ msgstr ""
 "表示する記事が見つかりません。手動でラベルに記事を割り当てるか(上の操作メ"
 "ニューを参照します)、フィルターを使うことができます。"
 
-#: classes/feeds.php:751
+#: classes/feeds.php:703
 msgid "No articles found to display."
 msgstr "表示する記事が見つかりません。"
 
-#: classes/backend.php:26
+#: classes/feeds.php:718 classes/feeds.php:899
+#, php-format
+msgid "Feeds last updated at %s"
+msgstr ""
+
+#: classes/feeds.php:728 classes/feeds.php:909
+msgid "Some feeds have update errors (click for details)"
+msgstr "いくつかのフィードの更新エラーです (詳細はクリックしてください)"
+
+#: classes/feeds.php:889
+msgid "No feed selected."
+msgstr "フィードは選択されていません。"
+
+#: classes/backend.php:34
+msgid "Keyboard Shortcuts"
+msgstr "キーボードショートカット"
+
+#: classes/backend.php:57
+msgid "Shift"
+msgstr ""
+
+#: classes/backend.php:60
+msgid "Ctrl"
+msgstr ""
+
+#: classes/backend.php:84
+msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
+msgstr ""
+
+#: classes/backend.php:99
 msgid "Help topic not found."
 msgstr "ヘルプのトピックが見つかりません。"
 
@@ -1796,16 +1769,15 @@ msgstr "フィードを追加しています..."
 msgid "Processing category: %s"
 msgstr "カテゴリーの場所:"
 
-#: classes/opml.php:467
+#: classes/opml.php:468
 msgid "Error: please upload OPML file."
 msgstr "エラー: OPML ファイルをアップロードしてください。"
 
-#: classes/opml.php:474
+#: classes/opml.php:475
 msgid "Error while parsing document."
 msgstr "ドキュメントの解析中のエラーです。"
 
-#: classes/pref/users.php:6 plugins/instances/instances.php:42
-#: plugins/instances/init.php:157
+#: classes/pref/users.php:6 plugins/instances/init.php:157
 msgid "Your access level is insufficient to open this tab."
 msgstr "このタブを開くにはアクセスレベルが不十分です。"
 
@@ -1845,8 +1817,8 @@ msgstr "アクセスレベル: "
 msgid "Change password to"
 msgstr "次のパスワードに変更する:"
 
-#: classes/pref/users.php:177 classes/pref/feeds.php:581
-#: classes/pref/feeds.php:827
+#: classes/pref/users.php:177 classes/pref/feeds.php:577
+#: classes/pref/feeds.php:787
 msgid "Options"
 msgstr "オプション"
 
@@ -1887,8 +1859,12 @@ msgstr "<b>%s</b> の通知中です。"
 msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] パスワード変更通知"
 
-#: classes/pref/users.php:392 classes/pref/filters.php:586
-#: plugins/instances/instances.php:181
+#: classes/pref/users.php:386
+msgid "Create user"
+msgstr "ユーザーの作成"
+
+#: classes/pref/users.php:392 classes/pref/filters.php:593
+#: plugins/instances/init.php:296
 msgid "Edit"
 msgstr "編集"
 
@@ -1904,15 +1880,15 @@ msgstr "アクセスレベル"
 msgid "Last login"
 msgstr "最終ログイン"
 
-#: classes/pref/users.php:461 plugins/instances/instances.php:222
+#: classes/pref/users.php:462 plugins/instances/init.php:337
 msgid "Click to edit"
 msgstr "編集するにはクリック"
 
-#: classes/pref/users.php:481
+#: classes/pref/users.php:482
 msgid "No users defined."
 msgstr "ユーザーが定義されていません。"
 
-#: classes/pref/users.php:483
+#: classes/pref/users.php:484
 msgid "No matching users found."
 msgstr "ユーザーが見つかりません。"
 
@@ -1954,87 +1930,91 @@ msgstr "一致するフィルターが見つかりません。"
 msgid "No recent articles matching this filter have been found."
 msgstr "一致するフィルターが見つかりません。"
 
-#: classes/pref/filters.php:218 classes/pref/filters.php:645
-#: classes/pref/filters.php:760
+#: classes/pref/filters.php:98
+msgid ""
+"Complex expressions might not give results while testing due to issues with "
+"database server regexp implementation."
+msgstr ""
+
+#: classes/pref/filters.php:225 classes/pref/filters.php:652
+#: classes/pref/filters.php:767
 msgid "Match"
 msgstr "一致"
 
-#: classes/pref/filters.php:232 classes/pref/filters.php:279
-#: classes/pref/filters.php:659 classes/pref/filters.php:686
+#: classes/pref/filters.php:239 classes/pref/filters.php:286
+#: classes/pref/filters.php:666 classes/pref/filters.php:693
 msgid "Add"
 msgstr "追加"
 
-#: classes/pref/filters.php:265 classes/pref/filters.php:672
+#: classes/pref/filters.php:272 classes/pref/filters.php:679
 #, fuzzy
 msgid "Apply actions"
 msgstr "フィード操作"
 
-#: classes/pref/filters.php:315 classes/pref/filters.php:701
+#: classes/pref/filters.php:322 classes/pref/filters.php:708
 msgid "Enabled"
 msgstr "有効にする"
 
-#: classes/pref/filters.php:324 classes/pref/filters.php:704
+#: classes/pref/filters.php:331 classes/pref/filters.php:711
 #, fuzzy
 msgid "Match any rule"
 msgstr "一致したすべての未読記事:"
 
-#: classes/pref/filters.php:336 classes/pref/filters.php:716
+#: classes/pref/filters.php:343 classes/pref/filters.php:723
 msgid "Test"
 msgstr "テスト"
 
-#: classes/pref/filters.php:368
+#: classes/pref/filters.php:375
 #, php-format
 msgid "%s on %s in %s"
 msgstr ""
 
-#: classes/pref/filters.php:583
+#: classes/pref/filters.php:590
 msgid "Combine"
 msgstr ""
 
-#: classes/pref/filters.php:593 classes/pref/feeds.php:1329
+#: classes/pref/filters.php:600 classes/pref/feeds.php:1257
 msgid "Rescore articles"
 msgstr "記事のスコアの再集計"
 
-#: classes/pref/filters.php:719
+#: classes/pref/filters.php:726
 msgid "Create"
 msgstr "作成"
 
-#: classes/pref/filters.php:769
+#: classes/pref/filters.php:776
 #, fuzzy
 msgid "on field"
 msgstr "項目"
 
-#: classes/pref/filters.php:775 js/PrefFilterTree.js:29
+#: classes/pref/filters.php:782 js/PrefFilterTree.js:29
 #: plugins/digest/digest.js:241
 msgid "in"
 msgstr ""
 
-#: classes/pref/filters.php:788
+#: classes/pref/filters.php:795
 #, fuzzy
 msgid "Save rule"
 msgstr "保存"
 
-#: classes/pref/filters.php:788 js/functions.js:1067 js/functions.js:1063
-#: js/functions.js:1071 js/functions.js:1073
+#: classes/pref/filters.php:795 js/functions.js:1078
 #, fuzzy
 msgid "Add rule"
 msgstr "フィードカテゴリーを追加しています..."
 
-#: classes/pref/filters.php:811
+#: classes/pref/filters.php:818
 msgid "Perform Action"
 msgstr "操作の実行"
 
-#: classes/pref/filters.php:837
+#: classes/pref/filters.php:844
 msgid "with parameters:"
 msgstr "パラメーター:"
 
-#: classes/pref/filters.php:855
+#: classes/pref/filters.php:862
 #, fuzzy
 msgid "Save action"
 msgstr "パネル操作"
 
-#: classes/pref/filters.php:855 js/functions.js:1093 js/functions.js:1089
-#: js/functions.js:1097 js/functions.js:1099
+#: classes/pref/filters.php:862 js/functions.js:1104
 #, fuzzy
 msgid "Add action"
 msgstr "フィード操作"
@@ -2055,153 +2035,188 @@ msgstr "パスワードが一致しません。"
 msgid "Function not supported by authentication module."
 msgstr ""
 
-#: classes/pref/prefs.php:68
+#: classes/pref/prefs.php:63
 msgid "The configuration was saved."
 msgstr "設定を保存しました。"
 
-#: classes/pref/prefs.php:83
+#: classes/pref/prefs.php:77
 #, php-format
 msgid "Unknown option: %s"
 msgstr "不明なオプション: %s"
 
-#: classes/pref/prefs.php:97
+#: classes/pref/prefs.php:91
 #, fuzzy
 msgid "Your personal data has been saved."
 msgstr "パスワードを変更しました。"
 
-#: classes/pref/prefs.php:137
+#: classes/pref/prefs.php:131
 #, fuzzy
 msgid "Personal data / Authentication"
 msgstr "認証"
 
-#: classes/pref/prefs.php:157
+#: classes/pref/prefs.php:151
 msgid "Personal data"
 msgstr "個人データ"
 
-#: classes/pref/prefs.php:167
+#: classes/pref/prefs.php:161
 msgid "Full name"
 msgstr ""
 
-#: classes/pref/prefs.php:171
+#: classes/pref/prefs.php:165
 msgid "E-mail"
 msgstr "電子メール"
 
-#: classes/pref/prefs.php:177
+#: classes/pref/prefs.php:171
 msgid "Access level"
 msgstr "アクセスレベル"
 
-#: classes/pref/prefs.php:187
+#: classes/pref/prefs.php:181
 #, fuzzy
 msgid "Save data"
 msgstr "保存"
 
-#: classes/pref/prefs.php:207
+#: classes/pref/prefs.php:203
 #, fuzzy
 msgid "Your password is at default value, please change it."
 msgstr ""
 "パスワードが標準のままです。\n"
 "                                                変更してください。"
 
-#: classes/pref/prefs.php:239
+#: classes/pref/prefs.php:235
 msgid "Old password"
 msgstr "現在のパスワード"
 
-#: classes/pref/prefs.php:242
+#: classes/pref/prefs.php:238
 msgid "New password"
 msgstr "新しいパスワード"
 
-#: classes/pref/prefs.php:247
+#: classes/pref/prefs.php:243
 msgid "Confirm password"
 msgstr "新しいパスワード(確認)"
 
-#: classes/pref/prefs.php:257
+#: classes/pref/prefs.php:253
 msgid "Change password"
 msgstr "パスワードを変更する"
 
-#: classes/pref/prefs.php:263
+#: classes/pref/prefs.php:259
 msgid "One time passwords / Authenticator"
 msgstr ""
 
-#: classes/pref/prefs.php:292 classes/pref/prefs.php:343
+#: classes/pref/prefs.php:288 classes/pref/prefs.php:339
 #, fuzzy
 msgid "Enter your password"
 msgstr "ユーザー名かパスワードが正しくありません"
 
-#: classes/pref/prefs.php:303
+#: classes/pref/prefs.php:299
 #, fuzzy
 msgid "Disable OTP"
 msgstr "(無効です)"
 
-#: classes/pref/prefs.php:309
+#: classes/pref/prefs.php:305
 msgid ""
 "You will need a compatible Authenticator to use this. Changing your password "
 "would automatically disable OTP."
 msgstr ""
 
-#: classes/pref/prefs.php:311
+#: classes/pref/prefs.php:307
 msgid "Scan the following code by the Authenticator application:"
 msgstr ""
 
-#: classes/pref/prefs.php:352
+#: classes/pref/prefs.php:348
 msgid "I have scanned the code and would like to enable OTP"
 msgstr ""
 
-#: classes/pref/prefs.php:360
+#: classes/pref/prefs.php:356
 #, fuzzy
 msgid "Enable OTP"
 msgstr "有効にする"
 
-#: classes/pref/prefs.php:456
-msgid "Select theme"
-msgstr "テーマを選択する"
-
-#: classes/pref/prefs.php:508
+#: classes/pref/prefs.php:482
 #, fuzzy
 msgid "Customize"
 msgstr "ユーザースタイルシートの URL"
 
-#: classes/pref/prefs.php:527 classes/pref/prefs.php:534
-#: classes/pref/prefs.php:539
+#: classes/pref/prefs.php:501 classes/pref/prefs.php:508
+#: classes/pref/prefs.php:513
 msgid "Yes"
 msgstr "はい"
 
-#: classes/pref/prefs.php:529 classes/pref/prefs.php:539
+#: classes/pref/prefs.php:503 classes/pref/prefs.php:513
 msgid "No"
 msgstr "いいえ"
 
-#: classes/pref/prefs.php:569
+#: classes/pref/prefs.php:543
 #, fuzzy
 msgid "Register"
 msgstr "登録済み"
 
-#: classes/pref/prefs.php:573
+#: classes/pref/prefs.php:547
 msgid "Clear"
 msgstr ""
 
-#: classes/pref/prefs.php:579
+#: classes/pref/prefs.php:553
 #, php-format
 msgid "Current server time: %s (UTC)"
 msgstr ""
 
-#: classes/pref/prefs.php:604
+#: classes/pref/prefs.php:582
 msgid "Save configuration"
 msgstr "設定を保存する"
 
-#: classes/pref/prefs.php:607
+#: classes/pref/prefs.php:585
 #, fuzzy
 msgid "Manage profiles"
 msgstr "フィルターを作成する"
 
-#: classes/pref/prefs.php:610
+#: classes/pref/prefs.php:588
 msgid "Reset to defaults"
 msgstr "標準に戻す"
 
-#: classes/pref/prefs.php:622
+#: classes/pref/prefs.php:600
 #, fuzzy
 msgid "Show additional preferences"
 msgstr "設定を終了する"
 
-#: classes/pref/prefs.php:679 classes/pref/prefs.php:697
+#: classes/pref/prefs.php:612 classes/pref/prefs.php:614
+msgid "Plugins"
+msgstr ""
+
+#: classes/pref/prefs.php:642
+msgid "System plugins"
+msgstr ""
+
+#: classes/pref/prefs.php:646 classes/pref/prefs.php:695
+msgid "Plugin"
+msgstr ""
+
+#: classes/pref/prefs.php:647 classes/pref/prefs.php:696
+#, fuzzy
+msgid "Description"
+msgstr "説明"
+
+#: classes/pref/prefs.php:648 classes/pref/prefs.php:697
+msgid "Version"
+msgstr ""
+
+#: classes/pref/prefs.php:649 classes/pref/prefs.php:698
+msgid "Author"
+msgstr ""
+
+#: classes/pref/prefs.php:682 classes/pref/prefs.php:733
+#, fuzzy
+msgid "Clear data"
+msgstr "フィードデータの消去"
+
+#: classes/pref/prefs.php:691
+msgid "User plugins"
+msgstr ""
+
+#: classes/pref/prefs.php:748
+#, fuzzy
+msgid "Enable selected plugins"
+msgstr "フィードアイコンを有効にする"
+
+#: classes/pref/prefs.php:803 classes/pref/prefs.php:821
 #, fuzzy
 msgid "Incorrect password"
 msgstr "ユーザー名かパスワードが正しくありません"
@@ -2211,231 +2226,189 @@ msgstr "ユーザー名かパスワードが正しくありません"
 msgid "Check to enable field"
 msgstr "編集するにはクリック"
 
-#: classes/pref/feeds.php:59 classes/pref/feeds.php:180
-#: classes/pref/feeds.php:223 classes/pref/feeds.php:229
-#: classes/pref/feeds.php:254
+#: classes/pref/feeds.php:58 classes/pref/feeds.php:175
+#: classes/pref/feeds.php:217 classes/pref/feeds.php:223
+#: classes/pref/feeds.php:248
 #, fuzzy, php-format
 msgid "(%d feeds)"
 msgstr "フィードを編集する"
 
-#: classes/pref/feeds.php:492 classes/pref/feeds.php:747
-msgid "Feed"
-msgstr "フィード"
-
-#: classes/pref/feeds.php:498
+#: classes/pref/feeds.php:494
 #, fuzzy
 msgid "Feed Title"
 msgstr "題名"
 
-#: classes/pref/feeds.php:554 classes/pref/feeds.php:802
+#: classes/pref/feeds.php:550 classes/pref/feeds.php:762
 msgid "Article purging:"
 msgstr "記事の削除:"
 
-#: classes/pref/feeds.php:577
+#: classes/pref/feeds.php:573
 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:593 classes/pref/feeds.php:831
+#: classes/pref/feeds.php:589 classes/pref/feeds.php:791
 #, fuzzy
 msgid "Hide from Popular feeds"
 msgstr "自分のフィード一覧から隠す"
 
-#: classes/pref/feeds.php:604 classes/pref/feeds.php:836
-msgid "Right-to-left content"
-msgstr "右から左のコンテンツ"
-
-#: classes/pref/feeds.php:616 classes/pref/feeds.php:842
+#: classes/pref/feeds.php:601 classes/pref/feeds.php:797
 msgid "Include in e-mail digest"
 msgstr "電子メールダイジェストに含む"
 
-#: classes/pref/feeds.php:629 classes/pref/feeds.php:848
+#: classes/pref/feeds.php:614 classes/pref/feeds.php:803
 msgid "Always display image attachments"
 msgstr ""
 
-#: classes/pref/feeds.php:643 classes/pref/feeds.php:856
+#: classes/pref/feeds.php:628 classes/pref/feeds.php:811
 msgid "Cache images locally"
 msgstr "ローカルに画像をキャッシュする"
 
-#: classes/pref/feeds.php:656
-#, fuzzy
-msgid "Cache content locally"
-msgstr "ローカルに画像をキャッシュする"
-
-#: classes/pref/feeds.php:668 classes/pref/feeds.php:862
+#: classes/pref/feeds.php:640 classes/pref/feeds.php:817
 #, fuzzy
 msgid "Mark updated articles as unread"
 msgstr "すべての記事を既読にしますか?"
 
-#: classes/pref/feeds.php:680 classes/pref/feeds.php:868
-msgid "Mark posts as updated on content change"
-msgstr ""
-
-#: classes/pref/feeds.php:686
+#: classes/pref/feeds.php:646
 #, fuzzy
 msgid "Icon"
 msgstr "操作"
 
-#: classes/pref/feeds.php:700
+#: classes/pref/feeds.php:660
 msgid "Replace"
 msgstr ""
 
-#: classes/pref/feeds.php:719
+#: classes/pref/feeds.php:679
 #, fuzzy
 msgid "Resubscribe to push updates"
 msgstr "フィードを購読する:"
 
-#: classes/pref/feeds.php:726
+#: classes/pref/feeds.php:686
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr ""
 
-#: classes/pref/feeds.php:741
+#: classes/pref/feeds.php:701
 msgid "Enable the options you wish to apply using checkboxes on the right:"
 msgstr ""
 
-#: classes/pref/feeds.php:1123 classes/pref/feeds.php:1176
+#: classes/pref/feeds.php:1051 classes/pref/feeds.php:1104
 msgid "All done."
 msgstr "すべて終了しました。"
 
-#: classes/pref/feeds.php:1231
+#: classes/pref/feeds.php:1159
 #, fuzzy
 msgid "Feeds with errors"
 msgstr "フィードエディター"
 
-#: classes/pref/feeds.php:1251
+#: classes/pref/feeds.php:1179
 #, fuzzy
 msgid "Inactive feeds"
 msgstr "元のフィード"
 
-#: classes/pref/feeds.php:1288
+#: classes/pref/feeds.php:1216
 #, fuzzy
 msgid "Edit selected feeds"
 msgstr "選択したフィードを削除しています..."
 
-#: classes/pref/feeds.php:1290 classes/pref/feeds.php:1304
+#: classes/pref/feeds.php:1218 classes/pref/feeds.php:1232
 #, fuzzy
 msgid "Reset sort order"
 msgstr "パスワードのリセット"
 
-#: classes/pref/feeds.php:1292 js/prefs.js:2021 js/prefs.js:1788
-#: js/prefs.js:1778
+#: classes/pref/feeds.php:1220 js/prefs.js:1778
 #, fuzzy
 msgid "Batch subscribe"
 msgstr "購読をやめる"
 
-#: classes/pref/feeds.php:1297
+#: classes/pref/feeds.php:1225
 #, fuzzy
 msgid "Categories"
 msgstr "カテゴリー:"
 
-#: classes/pref/feeds.php:1300
+#: classes/pref/feeds.php:1228
 #, fuzzy
 msgid "Add category"
 msgstr "フィードカテゴリーを追加しています..."
 
-#: classes/pref/feeds.php:1302
+#: classes/pref/feeds.php:1230
 #, fuzzy
 msgid "(Un)hide empty categories"
 msgstr "カテゴリーの編集"
 
-#: classes/pref/feeds.php:1306
+#: classes/pref/feeds.php:1234
 #, fuzzy
 msgid "Remove selected"
 msgstr "選択されたフィルターを削除しますか?"
 
-#: classes/pref/feeds.php:1320
+#: classes/pref/feeds.php:1248
 #, fuzzy
 msgid "More actions..."
 msgstr "操作..."
 
-#: classes/pref/feeds.php:1324
+#: classes/pref/feeds.php:1252
 msgid "Manual purge"
 msgstr "手動削除"
 
-#: classes/pref/feeds.php:1328
+#: classes/pref/feeds.php:1256
 msgid "Clear feed data"
 msgstr "フィードデータの消去"
 
-#: classes/pref/feeds.php:1379
-msgid "Import and export"
-msgstr ""
-
-#: classes/pref/feeds.php:1381
+#: classes/pref/feeds.php:1307
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1383
+#: classes/pref/feeds.php:1309
 msgid ""
 "Using OPML you can export and import your feeds, filters, labels and Tiny "
 "Tiny RSS settings."
 msgstr ""
 
-#: classes/pref/feeds.php:1385
+#: classes/pref/feeds.php:1311
 msgid "Only main settings profile can be migrated using OPML."
 msgstr ""
 
-#: classes/pref/feeds.php:1398
+#: classes/pref/feeds.php:1324
 #, fuzzy
 msgid "Import my OPML"
 msgstr "OPML のインポート中 (DOMXML 機能拡張を用いて)..."
 
-#: classes/pref/feeds.php:1402
+#: classes/pref/feeds.php:1328
 msgid "Filename:"
 msgstr ""
 
-#: classes/pref/feeds.php:1404
+#: classes/pref/feeds.php:1330
 #, fuzzy
 msgid "Include settings"
 msgstr "電子メールダイジェストに含む"
 
-#: classes/pref/feeds.php:1408
+#: classes/pref/feeds.php:1334
 #, fuzzy
 msgid "Export OPML"
 msgstr "OPML エクスポート"
 
-#: classes/pref/feeds.php:1412
+#: classes/pref/feeds.php:1338
 msgid ""
 "Your OPML can be published publicly and can be subscribed by anyone who "
 "knows the URL below."
 msgstr ""
 
-#: classes/pref/feeds.php:1414
+#: classes/pref/feeds.php:1340
 msgid ""
 "Published OPML does not include your Tiny Tiny RSS settings, feeds that "
 "require authentication or feeds hidden from Popular feeds."
 msgstr ""
 
-#: classes/pref/feeds.php:1417
+#: classes/pref/feeds.php:1343
 msgid "Display published OPML URL"
 msgstr ""
 
-#: classes/pref/feeds.php:1420 plugins/import_export/init.php:66
-#, fuzzy
-msgid "Article archive"
-msgstr "記事の日付"
-
-#: classes/pref/feeds.php:1422 plugins/import_export/init.php:68
-msgid ""
-"You can export and import your Starred and Archived articles for safekeeping "
-"or when migrating between tt-rss instances."
-msgstr ""
-
-#: classes/pref/feeds.php:1425
-#, fuzzy
-msgid "Export my data"
-msgstr "OPML エクスポート"
-
-#: classes/pref/feeds.php:1440
-msgid "Import"
-msgstr "インポート"
-
-#: classes/pref/feeds.php:1447
+#: classes/pref/feeds.php:1353
 #, fuzzy
 msgid "Firefox integration"
 msgstr "Firefox 統合"
 
-#: classes/pref/feeds.php:1449
+#: classes/pref/feeds.php:1355
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
@@ -2443,95 +2416,71 @@ msgstr ""
 "下のリンクをクリックすることで、Firefox のフィードリーダーとしてこの Tiny "
 "Tiny RSS のサイトを使うことができます。"
 
-#: classes/pref/feeds.php:1456
+#: classes/pref/feeds.php:1362
 msgid "Click here to register this site as a feed reader."
 msgstr "クリックするとフィードリーダーとしてこのサイトを登録します。"
 
-#: classes/pref/feeds.php:1464
-msgid "Bookmarklets"
-msgstr ""
-
-#: classes/pref/feeds.php:1466 plugins/bookmarklets/init.php:24
-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 ""
-
-#: classes/pref/feeds.php:1470
-#, fuzzy, php-format
-msgid "Subscribe to %s in Tiny Tiny RSS?"
-msgstr "Tiny Tiny RSS に戻る"
-
-#: classes/pref/feeds.php:1474
-#, fuzzy
-msgid "Subscribe in Tiny Tiny RSS"
-msgstr "Tiny Tiny RSS に戻る"
-
-#: classes/pref/feeds.php:1476 plugins/bookmarklets/init.php:34
-msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
-msgstr ""
-
-#: classes/pref/feeds.php:1484
+#: classes/pref/feeds.php:1370
 #, fuzzy
 msgid "Published & shared articles / Generated feeds"
 msgstr "選択したフィードの記事のスコアを再計算しますか?"
 
-#: classes/pref/feeds.php:1486
+#: classes/pref/feeds.php:1372
 #, fuzzy
 msgid "Published articles and generated feeds"
 msgstr "選択したフィードの記事のスコアを再計算しますか?"
 
-#: classes/pref/feeds.php:1488
+#: classes/pref/feeds.php:1374
 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:1494
+#: classes/pref/feeds.php:1380
 #, fuzzy
 msgid "Display URL"
 msgstr "タグの表示"
 
-#: classes/pref/feeds.php:1497
+#: classes/pref/feeds.php:1383
 msgid "Clear all generated URLs"
 msgstr ""
 
-#: classes/pref/feeds.php:1499
+#: classes/pref/feeds.php:1385
 #, fuzzy
 msgid "Articles shared by URL"
 msgstr "記事をお気に入りにする"
 
-#: classes/pref/feeds.php:1501
+#: classes/pref/feeds.php:1387
 msgid "You can disable all articles shared by unique URLs here."
 msgstr ""
 
-#: classes/pref/feeds.php:1504
+#: classes/pref/feeds.php:1390
 #, fuzzy
 msgid "Unshare all articles"
 msgstr "記事のお気に入りを解除する"
 
-#: classes/pref/feeds.php:1579
+#: classes/pref/feeds.php:1468
 #, fuzzy
 msgid ""
 "These feeds have not been updated with new content for 3 months (oldest "
 "first):"
 msgstr "エラーのため、フィードは更新されませんでした:"
 
-#: classes/pref/feeds.php:1616 classes/pref/feeds.php:1685
+#: classes/pref/feeds.php:1505 classes/pref/feeds.php:1574
 #, fuzzy
 msgid "Click to edit feed"
 msgstr "編集するにはクリック"
 
-#: classes/pref/feeds.php:1634 classes/pref/feeds.php:1705
+#: classes/pref/feeds.php:1523 classes/pref/feeds.php:1594
 #, fuzzy
 msgid "Unsubscribe from selected feeds"
 msgstr "選択されたフィードの購読をやめますか?"
 
-#: classes/pref/feeds.php:1645
+#: classes/pref/feeds.php:1534
 msgid "These feeds have not been updated because of errors:"
 msgstr "エラーのため、フィードは更新されませんでした:"
 
-#: plugins/pocket/pocket.php:24
+#: plugins/pocket/init.php:30
 msgid "Pocket"
 msgstr ""
 
@@ -2547,149 +2496,276 @@ msgstr ""
 msgid "Back to feeds"
 msgstr "編集するにはクリック"
 
+#: plugins/digest/digest_body.php:56
+msgid "Hello,"
+msgstr "ようこそ、"
+
 #: plugins/digest/digest_body.php:62
 msgid "Regular version"
 msgstr ""
 
-#: plugins/pinterest/pinterest.php:23
+#: plugins/nsfw/init.php:32 plugins/nsfw/init.php:43
+msgid "Not work safe (click to toggle)"
+msgstr ""
+
+#: plugins/nsfw/init.php:53
+msgid "NSFW Plugin"
+msgstr ""
+
+#: plugins/nsfw/init.php:80
+msgid "Tags to consider NSFW (comma-separated)"
+msgstr ""
+
+#: plugins/nsfw/init.php:101
+#, fuzzy
+msgid "Configuration saved."
+msgstr "設定を保存しました。"
+
+#: plugins/pinterest/init.php:29
 msgid "Pinterest"
 msgstr ""
 
-#: plugins/mail/mail.php:66 plugins/mail/mail.php:72 plugins/mail/init.php:72
-#: plugins/mail/init.php:78
+#: plugins/auth_internal/init.php:62
+#, fuzzy
+msgid "Please enter your one time password:"
+msgstr "このアーティクルのノートを入力してください:"
+
+#: plugins/auth_internal/init.php:185
+msgid "Password has been changed."
+msgstr "パスワードを変更しました。"
+
+#: plugins/auth_internal/init.php:187
+msgid "Old password is incorrect."
+msgstr "古いパスワードが不正確です。"
+
+#: plugins/bookmarklets/init.php:22
+msgid "Bookmarklets"
+msgstr ""
+
+#: plugins/bookmarklets/init.php:24
+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 ""
+
+#: plugins/bookmarklets/init.php:28
+#, fuzzy, php-format
+msgid "Subscribe to %s in Tiny Tiny RSS?"
+msgstr "Tiny Tiny RSS に戻る"
+
+#: plugins/bookmarklets/init.php:32
+#, fuzzy
+msgid "Subscribe in Tiny Tiny RSS"
+msgstr "Tiny Tiny RSS に戻る"
+
+#: plugins/bookmarklets/init.php:34
+msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
+msgstr ""
+
+#: plugins/import_export/init.php:64
+msgid "Import and export"
+msgstr ""
+
+#: plugins/import_export/init.php:66
+#, fuzzy
+msgid "Article archive"
+msgstr "記事の日付"
+
+#: plugins/import_export/init.php:68
+msgid ""
+"You can export and import your Starred and Archived articles for safekeeping "
+"or when migrating between tt-rss instances."
+msgstr ""
+
+#: plugins/import_export/init.php:71
+#, fuzzy
+msgid "Export my data"
+msgstr "OPML エクスポート"
+
+#: plugins/import_export/init.php:87
+msgid "Import"
+msgstr "インポート"
+
+#: plugins/import_export/init.php:221
+#, fuzzy
+msgid "Could not import: incorrect schema version."
+msgstr ""
+"必要なスキーマファイルを見つけられませんでした。次のバージョンが必要です:"
+
+#: plugins/import_export/init.php:226
+msgid "Could not import: unrecognized document format."
+msgstr ""
+
+#: plugins/import_export/init.php:385
+#, php-format
+msgid "Finished: %d articles processed, %d imported, %d feeds created."
+msgstr ""
+
+#: plugins/import_export/init.php:391
+msgid "Could not load XML document."
+msgstr ""
+
+#: plugins/import_export/init.php:403
+#, fuzzy
+msgid "Prepare data"
+msgstr "保存"
+
+#: plugins/import_export/init.php:424
+#, php-format
+msgid ""
+"Could not upload file. You might need to adjust upload_max_filesize\n"
+"\t\t\t\tin PHP.ini (current value = %s)"
+msgstr ""
+
+#: plugins/mail/init.php:72 plugins/mail/init.php:78
 msgid "[Forwarded]"
 msgstr ""
 
-#: plugins/mail/mail.php:66 plugins/mail/init.php:72
+#: plugins/mail/init.php:72
 #, fuzzy
 msgid "Multiple articles"
 msgstr "すべての記事"
 
-#: plugins/mail/mail.php:87
+#: plugins/mail/init.php:93
 msgid "From:"
 msgstr ""
 
-#: plugins/mail/mail.php:96
+#: plugins/mail/init.php:102
 #, fuzzy
 msgid "To:"
 msgstr "トップ"
 
-#: plugins/mail/mail.php:109
+#: plugins/mail/init.php:115
 #, fuzzy
 msgid "Subject:"
 msgstr "選択:"
 
-#: plugins/mail/mail.php:125
+#: plugins/mail/init.php:131
 #, fuzzy
 msgid "Send e-mail"
 msgstr "電子メールを変更する"
 
-#: plugins/note/note.php:22 plugins/note/note.js:11
+#: plugins/note/init.php:28 plugins/note/note.js:11
 #, fuzzy
 msgid "Edit article note"
 msgstr "タグを編集する"
 
-#: plugins/example/example.php:29 plugins/example/init.php:38
+#: plugins/example/init.php:38
 #, fuzzy
 msgid "Example Pane"
 msgstr "例"
 
-#: plugins/example/example.php:53 plugins/example/init.php:69
+#: plugins/example/init.php:69
 msgid "Sample value"
 msgstr ""
 
-#: plugins/example/example.php:59 plugins/example/init.php:75
+#: plugins/example/init.php:75
 #, fuzzy
 msgid "Set value"
 msgstr "お気に入りに設定する"
 
-#: plugins/identica/identica.php:23
+#: plugins/identica/init.php:29
 #, fuzzy
 msgid "Share on identi.ca"
 msgstr "題名"
 
-#: plugins/instances/instances.php:29
+#: plugins/owncloud/init.php:35
+msgid "Owncloud"
+msgstr ""
+
+#: plugins/owncloud/init.php:59
+msgid "Owncloud url"
+msgstr ""
+
+#: plugins/owncloud/init.php:74
+msgid "Bookmark on OwnCloud "
+msgstr ""
+
+#: plugins/instances/init.php:144
 #, fuzzy
 msgid "Linked"
 msgstr "リンク"
 
-#: plugins/instances/instances.php:180
+#: plugins/instances/init.php:295
 #, fuzzy
 msgid "Link instance"
 msgstr "タグを編集する"
 
-#: plugins/instances/instances.php:192 plugins/instances/init.php:307
+#: plugins/instances/init.php:307
 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 ""
 
-#: plugins/instances/instances.php:202
+#: plugins/instances/init.php:317
 msgid "Last connected"
 msgstr ""
 
-#: plugins/instances/instances.php:203
+#: plugins/instances/init.php:318
 msgid "Status"
 msgstr ""
 
-#: plugins/instances/instances.php:204
+#: plugins/instances/init.php:319
 #, fuzzy
 msgid "Stored feeds"
 msgstr "さらなるフィード"
 
-#: plugins/share/share.php:21
+#: plugins/share/init.php:27
 #, fuzzy
 msgid "Share by URL"
 msgstr "記事をお気に入りにする"
 
-#: plugins/share/share.php:43 plugins/share/init.php:49
+#: plugins/share/init.php:49
 msgid "You can share this article by the following unique URL:"
 msgstr ""
 
-#: plugins/flattr/flattr.php:37
+#: plugins/flattr/init.php:30
 #, fuzzy
-msgid "Flattr article"
+msgid "Flattr this article."
 msgstr "記事をお気に入りにする"
 
-#: plugins/googleplus/googleplus.php:23
+#: plugins/googleplus/init.php:29
 #, fuzzy
 msgid "Share on Google+"
 msgstr "題名"
 
-#: plugins/updater/updater.php:267 plugins/updater/updater.php:279
+#: plugins/updater/init.php:294 plugins/updater/init.php:306
 #: plugins/updater/updater.js:10
 #, fuzzy
 msgid "Update Tiny Tiny RSS"
 msgstr "Tiny Tiny RSS に戻る"
 
-#: plugins/updater/updater.php:282 plugins/updater/init.php:303
+#: plugins/updater/init.php:309
 #, fuzzy
 msgid "Your Tiny Tiny RSS installation is up to date."
 msgstr "Tiny Tiny RSS のデータベースを更新しました。"
 
-#: plugins/updater/updater.php:291 plugins/updater/init.php:313
+#: plugins/updater/init.php:319
 msgid ""
 "Do not close this dialog until updating is finished. Backup your tt-rss "
 "directory before continuing."
 msgstr ""
 
-#: plugins/updater/updater.php:294 plugins/updater/init.php:316
+#: plugins/updater/init.php:322
 #, fuzzy
 msgid "Ready to update."
 msgstr "最終更新:"
 
-#: plugins/updater/updater.php:299 plugins/updater/init.php:321
+#: plugins/updater/init.php:327
 #, fuzzy
 msgid "Start update"
 msgstr "最終更新:"
 
-#: js/feedlist.js:283 js/feedlist.js:282 js/feedlist.js:265 js/feedlist.js:218
+#: plugins/tweet/init.php:29
+#, fuzzy
+msgid "Share on Twitter"
+msgstr "題名"
+
+#: js/feedlist.js:218
 msgid "New articles available in this feed (click to show)"
 msgstr ""
 
-#: js/feedlist.js:490 js/feedlist.js:505 js/feedlist.js:489 js/feedlist.js:504
-#: js/feedlist.js:469 js/feedlist.js:484 js/feedlist.js:420 js/feedlist.js:435
-#: plugins/digest/digest.js:25
+#: js/feedlist.js:420 js/feedlist.js:435 plugins/digest/digest.js:25
 msgid "Mark all articles in %s as read?"
 msgstr "「%s」のすべての記事を既読に設定しますか?"
 
@@ -2699,152 +2775,139 @@ msgid ""
 "your browser information. Your IP would be saved in the database."
 msgstr ""
 
-#: js/functions.js:618 js/functions.js:614 js/functions.js:622
+#: js/functions.js:627
 #, fuzzy
 msgid "Date syntax appears to be correct:"
 msgstr "古いパスワードが不正確です。"
 
-#: js/functions.js:621 js/functions.js:617 js/functions.js:625
+#: js/functions.js:630
 #, fuzzy
 msgid "Date syntax is incorrect."
 msgstr "古いパスワードが不正確です。"
 
-#: js/functions.js:748 js/functions.js:744 js/functions.js:752
+#: js/functions.js:757
 #, fuzzy
 msgid "Remove stored feed icon?"
 msgstr "保存したデータを削除する"
 
-#: js/functions.js:780 js/functions.js:776 js/functions.js:784
+#: js/functions.js:789
 #, fuzzy
 msgid "Please select an image file to upload."
 msgstr "フィードをひとつ選択してください"
 
-#: js/functions.js:782 js/functions.js:778 js/functions.js:786
+#: js/functions.js:791
 msgid "Upload new icon for this feed?"
 msgstr ""
 
-#: js/functions.js:799 js/functions.js:795 js/functions.js:803
+#: js/functions.js:808
 msgid "Please enter label caption:"
 msgstr "ラベルのキャプションを入力してください:"
 
-#: js/functions.js:804 js/functions.js:800 js/functions.js:808
+#: js/functions.js:813
 msgid "Can't create label: missing caption."
 msgstr "ラベルが作成できません: キャプションが見当たりません。"
 
-#: js/functions.js:847 js/functions.js:843 js/functions.js:851
+#: js/functions.js:856
 msgid "Subscribe to Feed"
 msgstr "フィードを購読する"
 
-#: js/functions.js:874 js/functions.js:870 js/functions.js:878
+#: js/functions.js:883
 #, fuzzy
 msgid "Subscribed to %s"
 msgstr "フィードを購読する:"
 
-#: js/functions.js:879 js/functions.js:875 js/functions.js:883
+#: js/functions.js:888
 msgid "Specified URL seems to be invalid."
 msgstr ""
 
-#: js/functions.js:882 js/functions.js:878 js/functions.js:886
+#: js/functions.js:891
 msgid "Specified URL doesn't seem to contain any feeds."
 msgstr ""
 
-#: js/functions.js:935 js/functions.js:931 js/functions.js:939
+#: js/functions.js:944
 #, fuzzy
 msgid "Couldn't download the specified URL: %s"
 msgstr "購読できません: フィード URL が入力されていません。"
 
-#: js/functions.js:939 js/functions.js:935 js/functions.js:943
+#: js/functions.js:948
 #, fuzzy
 msgid "You are already subscribed to this feed."
 msgstr "カテゴリーから購読をやめることができません。"
 
-#: js/functions.js:1067 js/functions.js:1063 js/functions.js:1071
-#: js/functions.js:1073
+#: js/functions.js:1078
 #, fuzzy
 msgid "Edit rule"
 msgstr "フィルター"
 
-#: js/functions.js:1093 js/functions.js:1089 js/functions.js:1097
-#: js/functions.js:1099
+#: js/functions.js:1104
 #, fuzzy
 msgid "Edit action"
 msgstr "フィード操作"
 
-#: js/functions.js:1130 js/functions.js:1126 js/functions.js:1134
-#: js/functions.js:1136
+#: js/functions.js:1141
 msgid "Create Filter"
 msgstr "フィルターを作成する"
 
-#: js/functions.js:1234 js/functions.js:1230 js/functions.js:1238
-#: js/functions.js:1240
+#: js/functions.js:1245
 msgid ""
 "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
 "hub again on next feed update."
 msgstr ""
 
-#: js/functions.js:1255 js/tt-rss.js:421 js/functions.js:1251 js/tt-rss.js:381
-#: js/functions.js:1259 js/tt-rss.js:367 js/functions.js:1261
+#: js/functions.js:1266 js/tt-rss.js:367
 msgid "Unsubscribe from %s?"
 msgstr "%s の購読をやめますか?"
 
-#: js/functions.js:1362 js/functions.js:1358 js/functions.js:1368
-#: js/functions.js:1370
+#: js/functions.js:1375
 #, fuzzy
 msgid "Please enter category title:"
 msgstr "このアーティクルのノートを入力してください:"
 
-#: js/functions.js:1393 js/functions.js:1389 js/functions.js:1399
-#: js/functions.js:1401
+#: js/functions.js:1406
 msgid "Generate new syndication address for this feed?"
 msgstr ""
 
-#: js/functions.js:1584 js/tt-rss.js:400 js/tt-rss.js:903 js/functions.js:1580
-#: js/tt-rss.js:782 js/tt-rss.js:362 js/tt-rss.js:717 js/functions.js:1590
-#: js/tt-rss.js:348 js/tt-rss.js:709 js/functions.js:1592
+#: js/functions.js:1597 js/tt-rss.js:348 js/tt-rss.js:713
 #, fuzzy
 msgid "You can't edit this kind of feed."
 msgstr "フィードのこの種類を消去できません。"
 
-#: js/functions.js:1599 js/functions.js:1595 js/functions.js:1605
-#: js/functions.js:1607
+#: js/functions.js:1612
 #, fuzzy
 msgid "Edit Feed"
 msgstr "フィードを編集する"
 
-#: js/functions.js:1637 js/functions.js:1633 js/functions.js:1643
-#: js/functions.js:1645
+#: js/functions.js:1650
 #, fuzzy
 msgid "More Feeds"
 msgstr "さらなるフィード"
 
-#: js/functions.js:1698 js/functions.js:1808 js/prefs.js:408 js/prefs.js:438
-#: js/prefs.js:470 js/prefs.js:653 js/prefs.js:673 js/prefs.js:1326
-#: js/prefs.js:1471 js/functions.js:1694 js/functions.js:1804 js/prefs.js:397
-#: js/prefs.js:427 js/prefs.js:459 js/prefs.js:642 js/prefs.js:662
-#: js/prefs.js:1213 js/prefs.js:1358 js/functions.js:1704 js/functions.js:1814
-#: js/prefs.js:1203 js/prefs.js:1348 js/functions.js:1706 js/functions.js:1816
+#: js/functions.js:1711 js/functions.js:1821 js/prefs.js:397 js/prefs.js:427
+#: js/prefs.js:459 js/prefs.js:642 js/prefs.js:662 js/prefs.js:1203
+#: js/prefs.js:1348
 msgid "No feeds are selected."
 msgstr "選択されたフィードはありません。"
 
-#: js/functions.js:1740 js/functions.js:1736 js/functions.js:1746
-#: js/functions.js:1748
+#: js/functions.js:1753
 msgid ""
 "Remove selected feeds from the archive? Feeds with stored articles will not "
 "be removed."
 msgstr ""
 
-#: js/functions.js:1779 js/functions.js:1775 js/functions.js:1785
-#: js/functions.js:1787
+#: js/functions.js:1792
 #, fuzzy
 msgid "Feeds with update errors"
 msgstr "フィードエディター"
 
-#: js/functions.js:1790 js/prefs.js:1308 js/functions.js:1786 js/prefs.js:1195
-#: js/functions.js:1796 js/prefs.js:1185 js/functions.js:1798
+#: js/functions.js:1803 js/prefs.js:1185
 #, fuzzy
 msgid "Remove selected feeds?"
 msgstr "選択されたフィルターを削除しますか?"
 
+#: js/functions.js:1904
+msgid "Help"
+msgstr "ヘルプ"
+
 #: js/PrefFeedTree.js:47
 #, fuzzy
 msgid "Edit category"
@@ -2868,431 +2931,326 @@ msgstr "ログイン名を入力してください:"
 msgid "Can't create user: no login specified."
 msgstr "ユーザーが追加できません: ログイン名が指定されていません。"
 
-#: js/prefs.js:128 js/prefs.js:117
+#: js/prefs.js:117
 #, fuzzy
 msgid "Edit Filter"
 msgstr "フィルター"
 
-#: js/prefs.js:175 js/prefs.js:164
+#: js/prefs.js:164
 #, fuzzy
 msgid "Remove filter?"
 msgstr "フィルター %s を削除しますか?"
 
-#: js/prefs.js:290 js/prefs.js:279
+#: js/prefs.js:279
 msgid "Remove selected labels?"
 msgstr "選択したラベルを削除しますか?"
 
-#: js/prefs.js:306 js/prefs.js:1512 js/prefs.js:295 js/prefs.js:1399
-#: js/prefs.js:1389
+#: js/prefs.js:295 js/prefs.js:1389
 msgid "No labels are selected."
 msgstr "選択されたラベルはありません。"
 
-#: js/prefs.js:320 js/prefs.js:309
+#: js/prefs.js:309
 msgid ""
 "Remove selected users? Neither default admin nor your account will be "
 "removed."
 msgstr ""
 
-#: js/prefs.js:337 js/prefs.js:518 js/prefs.js:539 js/prefs.js:578
 #: js/prefs.js:326 js/prefs.js:507 js/prefs.js:528 js/prefs.js:567
 msgid "No users are selected."
 msgstr "選択されたユーザーはありません。"
 
-#: js/prefs.js:355 js/prefs.js:344
+#: js/prefs.js:344
 msgid "Remove selected filters?"
 msgstr "選択されたフィルターを削除しますか?"
 
-#: js/prefs.js:370 js/prefs.js:608 js/prefs.js:627 js/prefs.js:359
-#: js/prefs.js:597 js/prefs.js:616
+#: js/prefs.js:359 js/prefs.js:597 js/prefs.js:616
 msgid "No filters are selected."
 msgstr "選択されたフィルターはありません。"
 
-#: js/prefs.js:389 js/prefs.js:378
+#: js/prefs.js:378
 msgid "Unsubscribe from selected feeds?"
 msgstr "選択されたフィードの購読をやめますか?"
 
-#: js/prefs.js:423 js/prefs.js:412
+#: js/prefs.js:412
 msgid "Please select only one feed."
 msgstr "フィードをひとつだけ選択してください。"
 
-#: js/prefs.js:429 js/prefs.js:418
+#: js/prefs.js:418
 msgid "Erase all non-starred articles in selected feed?"
 msgstr ""
 "選択したフィード内のすべてのお気に入りしていない記事をすべて削除しますか?"
 
-#: js/prefs.js:451 js/prefs.js:440
+#: js/prefs.js:440
 msgid "How many days of articles to keep (0 - use default)?"
 msgstr "記事を維持したい日数は? (0: 標準を使う)"
 
-#: js/prefs.js:489 js/prefs.js:478
+#: js/prefs.js:478
 msgid "Login field cannot be blank."
 msgstr "ログイン名の項目は空にできません。"
 
-#: js/prefs.js:523 js/prefs.js:544 js/prefs.js:583 js/prefs.js:512
-#: js/prefs.js:533 js/prefs.js:572
+#: js/prefs.js:512 js/prefs.js:533 js/prefs.js:572
 msgid "Please select only one user."
 msgstr "ひとつだけユーザーを選択してください。"
 
-#: js/prefs.js:548 js/prefs.js:537
+#: js/prefs.js:537
 msgid "Reset password of selected user?"
 msgstr "選択したユーザーのパスワードをリセットしますか?"
 
-#: js/prefs.js:613 js/prefs.js:602
+#: js/prefs.js:602
 msgid "Please select only one filter."
 msgstr "フィルターをひとつだけ選択してください。"
 
-#: js/prefs.js:631 js/prefs.js:620
+#: js/prefs.js:620
 #, fuzzy
 msgid "Combine selected filters?"
 msgstr "選択されたフィルターを削除しますか?"
 
-#: js/prefs.js:695 js/prefs.js:684
+#: js/prefs.js:684
 #, fuzzy
 msgid "Edit Multiple Feeds"
 msgstr "複数フィードエディター"
 
-#: js/prefs.js:719 js/prefs.js:708
+#: js/prefs.js:708
 msgid "Save changes to selected feeds?"
 msgstr "選択したフィードの変更を保存しますか?"
 
-#: js/prefs.js:811 js/prefs.js:800 js/prefs.js:790
+#: js/prefs.js:790
 #, fuzzy
 msgid "OPML Import"
 msgstr "インポート"
 
-#: js/prefs.js:838 js/prefs.js:827 js/prefs.js:817
+#: js/prefs.js:817
 #, fuzzy
 msgid "Please choose an OPML file first."
 msgstr "はじめにいくつかのフィードを選択してください。"
 
-#: js/prefs.js:854 plugins/import_export/import_export.js:112
-#, fuzzy
-msgid "Please choose the file first."
-msgstr "はじめにいくつかのフィードを選択してください。"
-
-#: js/prefs.js:1010 js/prefs.js:983 js/prefs.js:973
+#: js/prefs.js:973
 msgid "Reset to defaults?"
 msgstr "標準に戻しますか?"
 
-#: js/prefs.js:1215 js/prefs.js:1102 js/prefs.js:1092
+#: js/prefs.js:1092
 msgid ""
 "Remove category %s? Any nested feeds would be placed into Uncategorized."
 msgstr ""
 
-#: js/prefs.js:1242 js/prefs.js:1129 js/prefs.js:1119
+#: js/prefs.js:1119
 msgid "Remove selected categories?"
 msgstr "選択されたカテゴリーを削除しますか?"
 
-#: js/prefs.js:1258 js/prefs.js:1145 js/prefs.js:1135
+#: js/prefs.js:1135
 msgid "No categories are selected."
 msgstr "選択されたカテゴリーはありません。"
 
-#: js/prefs.js:1266 js/prefs.js:1153 js/prefs.js:1143
+#: js/prefs.js:1143
 #, fuzzy
 msgid "Category title:"
 msgstr "カテゴリーエディター"
 
-#: js/prefs.js:1297 js/prefs.js:1184 js/prefs.js:1174
+#: js/prefs.js:1174
 msgid "Feeds without recent updates"
 msgstr ""
 
-#: js/prefs.js:1346 js/prefs.js:1233 js/prefs.js:1223
+#: js/prefs.js:1223
 #, fuzzy
 msgid "Replace current OPML publishing address with a new one?"
 msgstr "新しいもので現在の公開アドレスを置き換えますか?"
 
-#: js/prefs.js:1455 js/prefs.js:1342 js/prefs.js:1332
+#: js/prefs.js:1332
 msgid "Rescore articles in selected feeds?"
 msgstr "選択したフィードの記事のスコアを再計算しますか?"
 
-#: js/prefs.js:1478 js/prefs.js:1365 js/prefs.js:1355
+#: js/prefs.js:1355
 msgid "Rescore all articles? This operation may take a lot of time."
 msgstr ""
 "すべての記事のスコアを再計算しますか? この操作は大量の時間を使うでしょう。"
 
-#: js/prefs.js:1498 js/prefs.js:1385 js/prefs.js:1375
+#: js/prefs.js:1375
 #, fuzzy
 msgid "Reset selected labels to default colors?"
 msgstr "ラベルの色を標準にリセットしますか?"
 
-#: js/prefs.js:1535 js/prefs.js:1422 js/prefs.js:1412
+#: js/prefs.js:1412
 msgid "Settings Profiles"
 msgstr ""
 
-#: js/prefs.js:1544 js/prefs.js:1431 js/prefs.js:1421
+#: js/prefs.js:1421
 msgid ""
 "Remove selected profiles? Active and default profiles will not be removed."
 msgstr ""
 
-#: js/prefs.js:1562 js/prefs.js:1449 js/prefs.js:1439
+#: js/prefs.js:1439
 #, fuzzy
 msgid "No profiles are selected."
 msgstr "選択された記事はありません。"
 
-#: js/prefs.js:1570 js/prefs.js:1623 js/prefs.js:1457 js/prefs.js:1510
 #: js/prefs.js:1447 js/prefs.js:1500
 #, fuzzy
 msgid "Activate selected profile?"
 msgstr "選択されたフィルターを削除しますか?"
 
-#: js/prefs.js:1586 js/prefs.js:1639 js/prefs.js:1473 js/prefs.js:1526
 #: js/prefs.js:1463 js/prefs.js:1516
 #, fuzzy
 msgid "Please choose a profile to activate."
 msgstr "はじめにいくつかのフィードを選択してください。"
 
-#: js/prefs.js:1647 js/prefs.js:1534 js/prefs.js:1524
+#: js/prefs.js:1524
 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr ""
 
-#: js/prefs.js:1666 js/prefs.js:1553 js/prefs.js:1543
+#: js/prefs.js:1543
 msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr ""
 
-#: js/prefs.js:1764 js/prefs.js:1651 js/prefs.js:1641
+#: js/prefs.js:1641
 msgid "Label Editor"
 msgstr "ラベルエディター"
 
-#: js/prefs.js:1827 js/prefs.js:1714 js/prefs.js:1704
+#: js/prefs.js:1704
 msgid ""
 "This will clear your stored authentication information for Twitter. Continue?"
 msgstr ""
 
-#: js/prefs.js:1911 plugins/import_export/import_export.js:13
-#, fuzzy
-msgid "Export Data"
-msgstr "OPML エクスポート"
-
-#: js/prefs.js:1938 plugins/import_export/import_export.js:40
-msgid ""
-"Finished, exported %d articles. You can download the data <a "
-"class='visibleLink' href='%u'>here</a>."
-msgstr ""
-
-#: js/prefs.js:1991 plugins/import_export/import_export.js:93
-#, fuzzy
-msgid "Data Import"
-msgstr "インポート"
-
-#: js/prefs.js:2027 js/prefs.js:1794 js/prefs.js:1784
+#: js/prefs.js:1784
 #, fuzzy
 msgid "Subscribing to feeds..."
 msgstr "フィードを購読しています..."
 
-#: js/tt-rss.js:147 js/tt-rss.js:141 js/tt-rss.js:120
+#: js/prefs.js:1821
+msgid "Clear stored data for this plugin?"
+msgstr ""
+
+#: js/tt-rss.js:120
 msgid "Mark all articles as read?"
 msgstr "すべての記事を既読にしますか?"
 
-#: js/tt-rss.js:410 js/tt-rss.js:370 js/tt-rss.js:356
+#: js/tt-rss.js:356
 msgid "You can't unsubscribe from the category."
 msgstr "カテゴリーから購読をやめることができません。"
 
-#: js/tt-rss.js:415 js/tt-rss.js:596 js/tt-rss.js:591 js/tt-rss.js:375
-#: js/tt-rss.js:525 js/tt-rss.js:361 js/tt-rss.js:511
+#: js/tt-rss.js:361 js/tt-rss.js:511
 msgid "Please select some feed first."
 msgstr "はじめにいくつかのフィードを選択してください。"
 
-#: js/tt-rss.js:591 js/tt-rss.js:586 js/tt-rss.js:520 js/tt-rss.js:506
+#: js/tt-rss.js:506
 #, fuzzy
 msgid "You can't rescore this kind of feed."
 msgstr "フィードのこの種類を消去できません。"
 
-#: js/tt-rss.js:601 js/tt-rss.js:596 js/tt-rss.js:530 js/tt-rss.js:516
+#: js/tt-rss.js:516
 msgid "Rescore articles in %s?"
 msgstr "%s の記事のスコアを再計算しますか?"
 
-#: js/tt-rss.js:1062 js/tt-rss.js:883 js/tt-rss.js:825 js/tt-rss.js:830
+#: js/tt-rss.js:672
+#, fuzzy
+msgid "Please enable mail plugin first."
+msgstr "はじめにいくつかのフィードを選択してください。"
+
+#: js/tt-rss.js:834
 #, fuzzy
 msgid "New version available!"
 msgstr "Tiny Tiny RSS の新しいバージョンが利用できます!"
 
-#: js/viewfeed.js:108 js/viewfeed.js:104
+#: js/viewfeed.js:104
 #, fuzzy
 msgid "Cancel search"
 msgstr "取り消し"
 
-#: js/viewfeed.js:456 js/viewfeed.js:445 js/viewfeed.js:451 js/viewfeed.js:435
-#: plugins/digest/digest.js:257 plugins/digest/digest.js:696
+#: js/viewfeed.js:435 plugins/digest/digest.js:257
+#: plugins/digest/digest.js:696
 msgid "Unstar article"
 msgstr "記事のお気に入りを解除する"
 
-#: js/viewfeed.js:461 js/viewfeed.js:450 js/viewfeed.js:456 js/viewfeed.js:440
-#: plugins/digest/digest.js:259 plugins/digest/digest.js:700
+#: js/viewfeed.js:440 plugins/digest/digest.js:259
+#: plugins/digest/digest.js:700
 msgid "Star article"
 msgstr "記事をお気に入りにする"
 
-#: js/viewfeed.js:496 js/viewfeed.js:485 js/viewfeed.js:491 js/viewfeed.js:473
-#: plugins/digest/digest.js:262 plugins/digest/digest.js:731
+#: js/viewfeed.js:473 plugins/digest/digest.js:262
+#: plugins/digest/digest.js:731
 msgid "Unpublish article"
 msgstr "非公開記事"
 
-#: js/viewfeed.js:676 js/viewfeed.js:704 js/viewfeed.js:731 js/viewfeed.js:793
-#: js/viewfeed.js:825 js/viewfeed.js:962 js/viewfeed.js:1005
-#: js/viewfeed.js:1055 js/viewfeed.js:2181 js/viewfeed.js:665
-#: js/viewfeed.js:693 js/viewfeed.js:720 js/viewfeed.js:782 js/viewfeed.js:814
-#: js/viewfeed.js:951 js/viewfeed.js:994 js/viewfeed.js:1044
-#: js/viewfeed.js:2154 js/viewfeed.js:671 js/viewfeed.js:699
-#: js/viewfeed.js:726 js/viewfeed.js:788 js/viewfeed.js:820 js/viewfeed.js:957
-#: js/viewfeed.js:1000 js/viewfeed.js:1050 js/viewfeed.js:2018
 #: js/viewfeed.js:674 js/viewfeed.js:702 js/viewfeed.js:729 js/viewfeed.js:791
 #: js/viewfeed.js:823 js/viewfeed.js:960 js/viewfeed.js:1003
 #: js/viewfeed.js:1053 js/viewfeed.js:1927 plugins/mail/mail.js:7
 msgid "No articles are selected."
 msgstr "記事は選択されていません。"
 
-#: js/viewfeed.js:942 js/viewfeed.js:931 js/viewfeed.js:937 js/viewfeed.js:940
+#: js/viewfeed.js:940
 msgid "Mark all visible articles in %s as read?"
 msgstr "「%s」のすべての可視記事を既読に設定しますか?"
 
-#: js/viewfeed.js:970 js/viewfeed.js:959 js/viewfeed.js:965 js/viewfeed.js:968
+#: js/viewfeed.js:968
 #, fuzzy
 msgid "Delete %d selected articles in %s?"
 msgstr "選択した %d 件の記事を「%s」に設定しますか?"
 
-#: js/viewfeed.js:972 js/viewfeed.js:961 js/viewfeed.js:967 js/viewfeed.js:970
+#: js/viewfeed.js:970
 #, fuzzy
 msgid "Delete %d selected articles?"
 msgstr "ラベルから選択した記事を削除しますか?"
 
-#: js/viewfeed.js:1014 js/viewfeed.js:1003 js/viewfeed.js:1009
 #: js/viewfeed.js:1012
 #, fuzzy
 msgid "Archive %d selected articles in %s?"
 msgstr "選択した %d 件の記事を「%s」に設定しますか?"
 
-#: js/viewfeed.js:1017 js/viewfeed.js:1006 js/viewfeed.js:1012
 #: js/viewfeed.js:1015
 #, fuzzy
 msgid "Move %d archived articles back?"
 msgstr "お気に入りの記事"
 
-#: js/viewfeed.js:1061 js/viewfeed.js:1050 js/viewfeed.js:1056
 #: js/viewfeed.js:1059
 msgid "Mark %d selected articles in %s as read?"
 msgstr "選択した %d 件の記事を「%s」に設定しますか?"
 
-#: js/viewfeed.js:1085 js/viewfeed.js:1074 js/viewfeed.js:1080
 #: js/viewfeed.js:1083
 #, fuzzy
 msgid "Edit article Tags"
 msgstr "タグを編集する"
 
-#: js/viewfeed.js:1247 js/viewfeed.js:1236 js/viewfeed.js:1242
 #: js/viewfeed.js:1252
 msgid "No article is selected."
 msgstr "選択された記事はありません。"
 
-#: js/viewfeed.js:1282 js/viewfeed.js:1271 js/viewfeed.js:1277
 #: js/viewfeed.js:1287
 msgid "No articles found to mark"
 msgstr "マークした記事が見つかりません"
 
-#: js/viewfeed.js:1284 js/viewfeed.js:1273 js/viewfeed.js:1279
 #: js/viewfeed.js:1289
 msgid "Mark %d article(s) as read?"
 msgstr "%d 件のマークした記事を既読として設定しますか?"
 
-#: js/viewfeed.js:1402 js/viewfeed.js:1383
-#, fuzzy
-msgid "Loading..."
-msgstr "フィード一覧を読み込んでいます..."
-
-#: js/viewfeed.js:1891 js/viewfeed.js:1864 js/viewfeed.js:1734
 #: js/viewfeed.js:1744
 #, fuzzy
 msgid "Open original article"
 msgstr "元の記事内容を表示する"
 
-#: js/viewfeed.js:1897 js/viewfeed.js:1870
-#, fuzzy
-msgid "View in a tt-rss tab"
-msgstr "新しいウィンドウで記事を開く"
-
-#: js/viewfeed.js:1905 js/viewfeed.js:1878 js/viewfeed.js:1742
-#: js/viewfeed.js:1752
-#, fuzzy
-msgid "Mark above as read"
-msgstr "既読にする"
-
-#: js/viewfeed.js:1911 js/viewfeed.js:1884 js/viewfeed.js:1748
-#: js/viewfeed.js:1758
-#, fuzzy
-msgid "Mark below as read"
-msgstr "既読にする"
-
-#: js/viewfeed.js:1967 js/viewfeed.js:1940 js/viewfeed.js:1804
 #: js/viewfeed.js:1814
 #, fuzzy
 msgid "Remove label"
 msgstr "選択したラベルを削除しますか?"
 
-#: js/viewfeed.js:1991 js/viewfeed.js:1964 js/viewfeed.js:1828
 #: js/viewfeed.js:1838
 #, fuzzy
 msgid "Playing..."
 msgstr "フィード一覧を読み込んでいます..."
 
-#: js/viewfeed.js:1992 js/viewfeed.js:1965 js/viewfeed.js:1829
 #: js/viewfeed.js:1839
 #, fuzzy
 msgid "Click to pause"
 msgstr "編集するにはクリック"
 
-#: js/viewfeed.js:2150 js/viewfeed.js:2123 js/viewfeed.js:1987
 #: js/viewfeed.js:1896
 #, fuzzy
 msgid "Please enter new score for selected articles:"
 msgstr "このアーティクルのノートを入力してください:"
 
-#: js/viewfeed.js:2192 js/viewfeed.js:2165 js/viewfeed.js:2029
 #: js/viewfeed.js:1938
 #, fuzzy
 msgid "Please enter new score for this article:"
 msgstr "このアーティクルのノートを入力してください:"
 
-#: js/functions.js:1887 js/functions.js:1891 js/functions.js:1897
-#: js/functions.js:1899
-msgid "Help"
-msgstr "ヘルプ"
-
-#: js/prefs.js:1831 js/prefs.js:1821
-msgid "Clear stored data for this plugin?"
-msgstr ""
-
-#: js/tt-rss.js:741 js/tt-rss.js:676 js/tt-rss.js:668
-#, fuzzy
-msgid "Please enable mail plugin first."
-msgstr "はじめにいくつかのフィードを選択してください。"
-
-#: plugins/digest/digest_body.php:39
-msgid "Your browser doesn't support Javascript, which is required"
-msgstr ""
-
-#: plugins/nsfw/init.php:32 plugins/nsfw/init.php:43
-msgid "Not work safe (click to toggle)"
-msgstr ""
-
-#: plugins/nsfw/init.php:53
-msgid "NSFW Plugin"
-msgstr ""
-
-#: plugins/nsfw/init.php:80
-msgid "Tags to consider NSFW (comma-separated)"
-msgstr ""
-
-#: plugins/nsfw/init.php:101
-#, fuzzy
-msgid "Configuration saved."
-msgstr "設定を保存しました。"
-
-#: plugins/owncloud/init.php:35
-msgid "Owncloud"
-msgstr ""
-
-#: plugins/owncloud/init.php:59
-msgid "Owncloud url"
-msgstr ""
-
 #: plugins/digest/digest.js:71
 #, fuzzy
 msgid "Mark %d displayed articles as read?"
@@ -3323,6 +3281,27 @@ msgstr "読んだフィードを隠す/再表示する"
 msgid "Load more..."
 msgstr "ヘルプを読み込んでいます..."
 
+#: plugins/import_export/import_export.js:13
+#, fuzzy
+msgid "Export Data"
+msgstr "OPML エクスポート"
+
+#: plugins/import_export/import_export.js:40
+msgid ""
+"Finished, exported %d articles. You can download the data <a "
+"class='visibleLink' href='%u'>here</a>."
+msgstr ""
+
+#: plugins/import_export/import_export.js:93
+#, fuzzy
+msgid "Data Import"
+msgstr "インポート"
+
+#: plugins/import_export/import_export.js:112
+#, fuzzy
+msgid "Please choose the file first."
+msgstr "はじめにいくつかのフィードを選択してください。"
+
 #: plugins/mail/mail.js:21
 #, fuzzy
 msgid "Forward article by email"
@@ -3364,6 +3343,85 @@ msgid ""
 "before continuing. Please type 'yes' to continue."
 msgstr ""
 
+#~ msgid "Comments?"
+#~ msgstr "コメントしますか?"
+
+#~ msgid "Move between feeds"
+#~ msgstr "フィード間で移動する"
+
+#~ msgid "Move between articles"
+#~ msgstr "記事間で移動する"
+
+#~ msgid "Active article actions"
+#~ msgstr "有効な記事の操作"
+
+#, fuzzy
+#~ msgid "Dismiss read articles"
+#~ msgstr "読んだ記事が見えないように隠す"
+
+#~ msgid "Scroll article content"
+#~ msgstr "記事の内容をスクロールする"
+
+#~ msgid "Other actions"
+#~ msgstr "その他の操作"
+
+#~ msgid "Display this help dialog"
+#~ msgstr "このヘルプダイアログの表示"
+
+#, fuzzy
+#~ msgid "Multiple articles actions"
+#~ msgstr "すべての記事"
+
+#, fuzzy
+#~ msgid "Select starred articles"
+#~ msgstr "未読記事を削除する"
+
+#~ msgid "Feed actions"
+#~ msgstr "フィード操作"
+
+#~ msgid "Mark feed as read"
+#~ msgstr "マークしたフィードを既読にする"
+
+#~ msgid "Press any key to close this window."
+#~ msgstr "何かキーを押して、このウィンドウを閉じてください。"
+
+#~ msgid "My Feeds"
+#~ msgstr "自分のフィード"
+
+#~ msgid "Other Feeds"
+#~ msgstr "その他のフィード"
+
+#~ msgid "Panel actions"
+#~ msgstr "パネル操作"
+
+#~ msgid "Top 25 feeds"
+#~ msgstr "トップ 25 フィード"
+
+#~ msgid "Edit feed categories"
+#~ msgstr "フィードカテゴリーを編集する"
+
+#, fuzzy
+#~ msgid "Open article in new tab"
+#~ msgstr "新しいウィンドウで記事を開く"
+
+#~ msgid "Select theme"
+#~ msgstr "テーマを選択する"
+
+#~ msgid "Right-to-left content"
+#~ msgstr "右から左のコンテンツ"
+
+#, fuzzy
+#~ msgid "Cache content locally"
+#~ msgstr "ローカルに画像をキャッシュする"
+
+#, fuzzy
+#~ msgid "Loading..."
+#~ msgstr "フィード一覧を読み込んでいます..."
+
+#, fuzzy
+#~ msgid "View in a tt-rss tab"
+#~ msgstr "新しいウィンドウで記事を開く"
+
 #~ msgid "Magpie"
 #~ msgstr "Magpie"
 
@@ -3498,13 +3556,6 @@ msgstr ""
 #~ msgid "See also:"
 #~ msgstr "参考:"
 
-#~ msgid "description"
-#~ msgstr "説明"
-
-#, fuzzy
-#~ msgid "Dismiss article"
-#~ msgstr "公開記事"
-
 #, fuzzy
 #~ msgid "Remove:"
 #~ msgstr "削除"
@@ -3611,9 +3662,6 @@ msgstr ""
 #~ msgid "Hide feedlist"
 #~ msgstr "フィード一覧を隠す"
 
-#~ msgid "Enable feed icons"
-#~ msgstr "フィードアイコンを有効にする"
-
 #~ msgid "Enable labels"
 #~ msgstr "ラベルを有効にする"
 
@@ -3702,9 +3750,6 @@ msgstr ""
 #~ msgid "Saved filter <b>%s</b>"
 #~ msgstr "フィルター <b>%s</b> を保存しました"
 
-#~ msgid "Click to collapse category"
-#~ msgstr "閉じたカテゴリーのクリック"
-
 #~ msgid "Tags"
 #~ msgstr "タグ"
 
@@ -3735,10 +3780,6 @@ msgstr ""
 #~ msgid "Go online"
 #~ msgstr "オンラインに移行する"
 
-#, fuzzy
-#~ msgid "Toggle reordering mode"
-#~ msgstr "カテゴリーの並び替えモードの切り替え"
-
 #~ msgid "Reset UI layout"
 #~ msgstr "UI レイアウトをリセットする"
 
@@ -3824,9 +3865,6 @@ msgstr ""
 #~ msgid "Reset category order?"
 #~ msgstr "選択したカテゴリーの順序をリセットしますか?"
 
-#~ msgid "Generated feed"
-#~ msgstr "生成したフィード"
-
 #~ msgid "No feeds to display."
 #~ msgstr "表示するフィードがありません。"
 
@@ -3984,9 +4022,6 @@ msgstr ""
 #~ "You have to synchronize some articles before going into offline mode."
 #~ msgstr "Google Gears を用いたオフライン処理の新規記事を同期します。"
 
-#~ msgid "All feeds updated."
-#~ msgstr "すべてのフィードを更新しました。"
-
 #~ msgid "Can't open article: received invalid XML"
 #~ msgstr "記事を開けません: 無効な XML を受信しました"
 
@@ -4058,18 +4093,12 @@ msgstr ""
 #~ msgid "Recategorize"
 #~ msgstr "カテゴリー再設定"
 
-#~ msgid "Other:"
-#~ msgstr "その他:"
-
 #~ msgid "Generate another link"
 #~ msgstr "別のリンクを生成する"
 
 #~ msgid "Back"
 #~ msgstr "戻る"
 
-#~ msgid "Refresh"
-#~ msgstr "再描画"
-
 #~ msgid "Page"
 #~ msgstr "ページ"
 
diff --git a/locale/lv_LV/LC_MESSAGES/messages.mo b/locale/lv_LV/LC_MESSAGES/messages.mo
new file mode 100644
index 000000000..9feafce31
Binary files /dev/null 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
new file mode 100644
index 000000000..f47df4979
--- /dev/null
+++ b/locale/lv_LV/LC_MESSAGES/messages.po
@@ -0,0 +1,3311 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: 1.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-03-19 10:14+0400\n"
+"PO-Revision-Date: 2013-03-18 22:55+0300\n"
+"Last-Translator: Valdis Vītoliņš <valdis.vitolins@odo.lv>\n"
+"Language-Team: \n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: backend.php:71
+msgid "Use default"
+msgstr "Lietot noklusēto"
+
+#: backend.php:72
+msgid "Never purge"
+msgstr "Nekad nedzēst"
+
+#: backend.php:73
+msgid "1 week old"
+msgstr "1 nedēļu vecs"
+
+#: backend.php:74
+msgid "2 weeks old"
+msgstr "2 nedēļas vecs"
+
+#: backend.php:75
+msgid "1 month old"
+msgstr "1 mēnesi vecs"
+
+#: backend.php:76
+msgid "2 months old"
+msgstr "2 mēnešus vecs"
+
+#: backend.php:77
+msgid "3 months old"
+msgstr "3 mēnešus vecs"
+
+#: backend.php:80
+msgid "Default interval"
+msgstr "Noklusētais intervāls"
+
+#: backend.php:81 backend.php:91
+msgid "Disable updates"
+msgstr "Atslēgt atjaunojumus"
+
+#: backend.php:82 backend.php:92
+msgid "Each 15 minutes"
+msgstr "Katras 15 minūtes"
+
+#: backend.php:83 backend.php:93
+msgid "Each 30 minutes"
+msgstr "Katras 30 minūtes"
+
+#: backend.php:84 backend.php:94
+msgid "Hourly"
+msgstr "Ik stundu"
+
+#: backend.php:85 backend.php:95
+msgid "Each 4 hours"
+msgstr "Katras 4 stundas"
+
+#: backend.php:86 backend.php:96
+msgid "Each 12 hours"
+msgstr "Katras 12 stundas"
+
+#: backend.php:87 backend.php:97
+msgid "Daily"
+msgstr "Ik dienas"
+
+#: backend.php:88 backend.php:98
+msgid "Weekly"
+msgstr "Ik nedēļu"
+
+#: backend.php:101 classes/pref/users.php:139
+msgid "User"
+msgstr "Lietotājs"
+
+#: backend.php:102
+msgid "Power User"
+msgstr "Superlietotājs"
+
+#: backend.php:103
+msgid "Administrator"
+msgstr "Administrators"
+
+#: db-updater.php:19
+msgid "Your access level is insufficient to run this script."
+msgstr "Jums nav nepieciešamo skripta palaišanas tiesību. "
+
+#: db-updater.php:44
+msgid "Database Updater"
+msgstr "Datu bāzes atjaunotājs"
+
+#: db-updater.php:85
+msgid "Could not update database"
+msgstr "Neizdevās atjaunot datu bāzi"
+
+#: db-updater.php:88
+msgid "Could not find necessary schema file, need version:"
+msgstr "Neizdevās atrast nepieciešamo shēmas failu, nepieciešama versija:"
+
+#: db-updater.php:89
+msgid ", found: "
+msgstr ", atradu:"
+
+#: db-updater.php:92
+msgid "Tiny Tiny RSS database is up to date."
+msgstr "Tiny Tiny RSS datubāze ir aktuāla."
+
+#: db-updater.php:94 db-updater.php:163 db-updater.php:176 register.php:194
+#: register.php:239 register.php:252 register.php:267 register.php:286
+#: register.php:371 register.php:381 register.php:393
+#: classes/handler/public.php:611 classes/handler/public.php:699
+msgid "Return to Tiny Tiny RSS"
+msgstr "Atgriezties uz Tiny Tiny RSS"
+
+#: db-updater.php:100
+msgid "Please backup your database before proceeding."
+msgstr "Lūdzu pirms turpināšanas atjaunojiet datu bāzi."
+
+#: db-updater.php:102
+#, php-format
+msgid ""
+"Your Tiny Tiny RSS database needs update to the latest version (<b>%d</b> to "
+"<b>%d</b>)."
+msgstr ""
+"Jūsu Tiny Tiny RSS datubāzi ir nepieciešams atjaunot uz jaunāko versiju (no "
+"<b>%d</b> uz <b>%d</b>)."
+
+#: db-updater.php:116
+msgid "Perform updates"
+msgstr "Izpildīt atjaunojumus"
+
+#: db-updater.php:121
+msgid "Performing updates..."
+msgstr "Izpildu atjaunojumus..."
+
+#: db-updater.php:127
+#, php-format
+msgid "Updating to version %d..."
+msgstr "Atjaunoju uz versiju %d..."
+
+#: db-updater.php:142
+msgid "Checking version... "
+msgstr "Pārbaudu versiju..."
+
+#: db-updater.php:148
+msgid "OK!"
+msgstr "Kārtībā!"
+
+#: db-updater.php:150
+msgid "ERROR!"
+msgstr "Kļūda!"
+
+#: db-updater.php:158
+#, php-format
+msgid ""
+"Finished. Performed <b>%d</b> update(s) up to schema\n"
+"\t\t\tversion <b>%d</b>."
+msgstr ""
+"Pabeigts. Izpildīju <b>%d</b> shēmas atjaunojumu(s)\n"
+"\t\t\tversija <b>%d</b>."
+
+#: db-updater.php:168
+msgid "Your database schema is from a newer version of Tiny Tiny RSS."
+msgstr "Jūsu datu bāzes shēma ir no jaunākas Tiny Tiny RSS versijas."
+
+#: db-updater.php:170
+#, php-format
+msgid "Found schema version: <b>%d</b>, required: <b>%d</b>."
+msgstr "Atradu shēmu ar versiju: <b>%d</b>, nepieciešama: <b>%d</b>."
+
+#: db-updater.php:172
+msgid ""
+"Schema upgrade impossible. Please update Tiny Tiny RSS files to the newer "
+"version and continue."
+msgstr ""
+"Nav iespējams veikt shēmas atjaunošanu. Lūdzu, pirms turpiniet, atjaunojiet "
+"Tiny Tiny RSS failus uz jaunāku versiju."
+
+#: errors.php:9
+msgid ""
+"This program requires XmlHttpRequest to function properly. Your browser "
+"doesn't seem to support it."
+msgstr ""
+"Lai šī programma strādātu pareizi, ir nepieciešams XmlHttpRequest atbalsts. "
+"Šķiet, ka jūsu pārlūkprogramma to neatbalsta."
+
+#: errors.php:12
+msgid ""
+"This program requires cookies to function properly. Your browser doesn't "
+"seem to support them."
+msgstr ""
+"Lai šī programma strādātu pareizi, ir nepieciešams sīkfailu atbalsts. Šķiet, "
+"ka jūsu pārlūkprogramma tos neatbalsta."
+
+#: errors.php:15
+msgid "Backend sanity check failed"
+msgstr "Neizdevās aizmugures pareizības pārbaude"
+
+#: errors.php:17
+msgid "Frontend sanity check failed."
+msgstr "Neizdevās priekšpuses pareizības pārbaude."
+
+#: errors.php:19
+msgid ""
+"Incorrect database schema version. &lt;a href='db-updater.php'&gt;Please "
+"update&lt;/a&gt;."
+msgstr ""
+"Nepareiza datu bāzes shēmas versija. &lt;a href='db-updater.php'&gt;Lūdzu "
+"atjaunojiet&lt;/a&gt;."
+
+#: errors.php:21
+msgid "Request not authorized."
+msgstr "Neautorizēts pieprasījums."
+
+#: errors.php:23
+msgid "No operation to perform."
+msgstr "Nav veicamās darbības."
+
+#: errors.php:25
+msgid ""
+"Could not display feed: query failed. Please check label match syntax or "
+"local configuration."
+msgstr ""
+"Pieprasījums neizdevās un neizdevās parādīt barotni. Lūdzu pārbaudiet "
+"iezīmes sintaksi vai arī lokālos iestatījumus."
+
+#: errors.php:27
+msgid "Denied. Your access level is insufficient to access this page."
+msgstr "Jums nav nepieciešamo tiesību šīs lapas aplūkošanai."
+
+#: errors.php:29
+msgid "Configuration check failed"
+msgstr "Neizdevās iestatījumu pārbaude."
+
+#: errors.php:31
+msgid ""
+"Your version of MySQL is not currently supported. Please see\n"
+"\t\tofficial site for more information."
+msgstr ""
+"Jūsu izmantotā MySQL versija netiek atbalstīta. Lūdzu skatiet\n"
+"\t\tpapildu informāciju oficiālajā vietnē."
+
+#: errors.php:36
+msgid "SQL escaping test failed, check your database and PHP configuration"
+msgstr ""
+"Neizdevās SQL izņēmumu tests, pārbaudiet jūsu datu bāzes un PHP iestatījumus"
+
+#: index.php:117 index.php:147 index.php:252 prefs.php:79
+#: classes/backend.php:5 classes/pref/labels.php:296
+#: classes/pref/filters.php:609 classes/pref/feeds.php:1270
+#: plugins/digest/digest_body.php:45 js/viewfeed.js:1174
+msgid "Loading, please wait..."
+msgstr "Ielādē, lūdzu gaidiet..."
+
+#: index.php:127 index.php:198
+msgid "Communication problem with server."
+msgstr ""
+
+#: index.php:133 index.php:206
+msgid "New version of Tiny Tiny RSS is available!"
+msgstr "Ir pieejama jauna Tiny Tiny RSS versija!"
+
+#: index.php:161
+msgid "Collapse feedlist"
+msgstr "Sakļaut barotņu sarakstu"
+
+#: index.php:164
+msgid "Show articles"
+msgstr "Rādīt rakstus"
+
+#: index.php:167
+msgid "Adaptive"
+msgstr "Adaptīvs"
+
+#: index.php:168
+msgid "All Articles"
+msgstr "Visus rakstus"
+
+#: index.php:169 include/functions.php:1912 classes/feeds.php:106
+msgid "Starred"
+msgstr "Zvaigžņotos"
+
+#: index.php:170 include/functions.php:1913 classes/feeds.php:107
+msgid "Published"
+msgstr "Publicētos"
+
+#: index.php:171 classes/feeds.php:93 classes/feeds.php:105
+msgid "Unread"
+msgstr "Nelasītos"
+
+#: index.php:172
+msgid "Ignore Scoring"
+msgstr "Ignorēt novērtējumu"
+
+#: index.php:173
+msgid "Updated"
+msgstr "Atjaunotos"
+
+#: index.php:176
+msgid "Sort articles"
+msgstr "Kārtot rakstus"
+
+#: index.php:179
+msgid "Default"
+msgstr "Noklusētais"
+
+#: index.php:180
+msgid "Date"
+msgstr "Datums"
+
+#: index.php:181 include/localized_schema.php:3
+msgid "Title"
+msgstr "Virsraksts"
+
+#: index.php:182
+msgid "Score"
+msgstr "Novērtējums"
+
+#: index.php:187 classes/pref/feeds.php:535 classes/pref/feeds.php:746
+msgid "Update"
+msgstr "Atjaunot"
+
+#: index.php:191 index.php:221 include/functions.php:1903
+#: include/localized_schema.php:10 classes/feeds.php:111 classes/feeds.php:131
+#: js/FeedTree.js:128 js/FeedTree.js:156 plugins/digest/digest.js:630
+msgid "Mark as read"
+msgstr "Atzīmēt kā lasītu"
+
+#: index.php:211
+msgid "Actions..."
+msgstr "Darbības"
+
+#: index.php:213
+#, fuzzy
+msgid "Preferences..."
+msgstr "Iestatījumi"
+
+#: index.php:214
+msgid "Search..."
+msgstr "Meklēt"
+
+#: index.php:215
+msgid "Feed actions:"
+msgstr "Barotnes darbības"
+
+#: index.php:216 classes/handler/public.php:541
+msgid "Subscribe to feed..."
+msgstr "Abonēt barotni..."
+
+#: index.php:217
+msgid "Edit this feed..."
+msgstr "Rediģēt šo barotni..."
+
+#: index.php:218
+msgid "Rescore feed"
+msgstr "Pārvērtēt barotni"
+
+#: index.php:219 classes/pref/feeds.php:672 classes/pref/feeds.php:1243
+#: js/PrefFeedTree.js:73
+msgid "Unsubscribe"
+msgstr "Atteikties"
+
+#: index.php:220
+msgid "All feeds:"
+msgstr "Visas barotnes:"
+
+#: index.php:222
+msgid "(Un)hide read feeds"
+msgstr "(Ne)rādīt lasītās barotnes"
+
+#: index.php:223
+msgid "Other actions:"
+msgstr "Citas darbības:"
+
+#: index.php:225
+msgid "Switch to digest..."
+msgstr "Pārslēgties uz īssavilkumu..."
+
+#: index.php:227
+msgid "Show tag cloud..."
+msgstr "Radīt birku mākoni..."
+
+#: index.php:229 include/functions.php:1890
+#, fuzzy
+msgid "Toggle widescreen mode"
+msgstr "Pārslēgt zvaigžņošanu"
+
+#: index.php:231
+msgid "Select by tags..."
+msgstr "Atlasīt pēc iezīmēm..."
+
+#: index.php:232
+msgid "Create label..."
+msgstr "Izveidot iezīmi"
+
+#: index.php:233
+msgid "Create filter..."
+msgstr "Izveidot filtru..."
+
+#: index.php:234
+msgid "Keyboard shortcuts help"
+msgstr "Isinājumtaustiņu palīdzība"
+
+#: index.php:236 mobile/mobile-functions.php:69
+#: mobile/mobile-functions.php:244 plugins/digest/digest_body.php:59
+msgid "Logout"
+msgstr "Atteikties"
+
+#: prefs.php:28 prefs.php:99 include/functions.php:1915
+#: classes/pref/prefs.php:371
+msgid "Preferences"
+msgstr "Iestatījumi"
+
+#: prefs.php:90
+msgid "Keyboard shortcuts"
+msgstr "Īsinājumtaustiņi"
+
+#: prefs.php:91
+msgid "Exit preferences"
+msgstr "Iziet no iestatījumiem"
+
+#: prefs.php:102 classes/pref/feeds.php:100 classes/pref/feeds.php:1148
+#: classes/pref/feeds.php:1211
+msgid "Feeds"
+msgstr "Barotnes"
+
+#: prefs.php:105 classes/pref/filters.php:117
+msgid "Filters"
+msgstr "Filtri"
+
+#: prefs.php:108 mobile/mobile-functions.php:205 include/functions.php:1118
+#: include/functions.php:1739 classes/pref/labels.php:90
+msgid "Labels"
+msgstr "Iezīmes"
+
+#: prefs.php:112
+msgid "Users"
+msgstr "Lietotāji"
+
+#: register.php:186 include/login_form.php:212
+msgid "Create new account"
+msgstr "Izveidot jaunu kontu"
+
+#: register.php:190
+msgid "New user registrations are administratively disabled."
+msgstr "Jaunu lietotāju reģistrēšana ir administratīvi atcelta."
+
+#: register.php:215
+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 ""
+"Jūsu īslaicīgā parole tiks nosūtīta uz norādīto e-pastu. Konti, kuros ne "
+"neviens nav pieteicies, tiek automātiski izdzēsti 24 stundu laikā pēc "
+"īslaicīgās paroles nosūtīšanas."
+
+#: register.php:221
+msgid "Desired login:"
+msgstr "Vēlamais pieteikšanās vārds:"
+
+#: register.php:224
+msgid "Check availability"
+msgstr "Pārbaudīt pieejamību"
+
+#: register.php:226
+msgid "Email:"
+msgstr "E-pasts:"
+
+#: register.php:229
+msgid "How much is two plus two:"
+msgstr "Cik ir divi un divi:"
+
+#: register.php:232
+msgid "Submit registration"
+msgstr "Iesniegt reģistrāciju"
+
+#: register.php:250
+msgid "Your registration information is incomplete."
+msgstr "Jūsu reģistrācija ir nepilnīga."
+
+#: register.php:265
+msgid "Sorry, this username is already taken."
+msgstr "Piedodiet, lietotāja vārds jau tiek izmantots."
+
+#: register.php:284
+msgid "Registration failed."
+msgstr "Reģistrācija neizdevās."
+
+#: register.php:368
+msgid "Account created successfully."
+msgstr "Konts ir veiksmīgi izveidots."
+
+#: register.php:390
+msgid "New user registrations are currently closed."
+msgstr "Jaunu lietotāju reģistrācija šobrīd ir slēgta."
+
+#: update.php:37
+msgid "Tiny Tiny RSS data update script."
+msgstr "Tiny Tiny RSS datu atjaunošanas skripts."
+
+#: mobile/login_form.php:28 include/login_form.php:209
+#: classes/handler/public.php:469
+msgid "Log in"
+msgstr "Pieteikties"
+
+#: mobile/login_form.php:40 include/login_form.php:169
+#: classes/handler/public.php:453
+msgid "Login:"
+msgstr "Pieteikties:"
+
+#: mobile/login_form.php:45 include/login_form.php:178
+#: classes/handler/public.php:456
+msgid "Password:"
+msgstr "Parole:"
+
+#: mobile/login_form.php:52
+msgid "Open regular version"
+msgstr "Atvērt parasto versiju"
+
+#: mobile/mobile-functions.php:68 mobile/mobile-functions.php:144
+#: mobile/mobile-functions.php:180 mobile/mobile-functions.php:207
+#: mobile/mobile-functions.php:243 mobile/mobile-functions.php:382
+#: mobile/prefs.php:19
+msgid "Home"
+msgstr "Mājas"
+
+#: mobile/mobile-functions.php:178 include/functions.php:1116
+#: include/functions.php:1737
+msgid "Special"
+msgstr "Īpaši"
+
+#: mobile/mobile-functions.php:418
+msgid "Nothing found (click to reload feed)."
+msgstr "Nekas netika atrasts (klikšķiniet, lai pārlādētu barotni)."
+
+#: mobile/prefs.php:24
+msgid "Enable categories"
+msgstr "Iespējot kategorijas"
+
+#: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36
+#: mobile/prefs.php:41 mobile/prefs.php:46 mobile/prefs.php:51
+msgid "ON"
+msgstr "IESL."
+
+#: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36
+#: mobile/prefs.php:41 mobile/prefs.php:46 mobile/prefs.php:51
+msgid "OFF"
+msgstr "Izsl."
+
+#: mobile/prefs.php:29
+msgid "Browse categories like folders"
+msgstr "Pārlūkt kategorijas kā mapes."
+
+#: mobile/prefs.php:35
+msgid "Show images in posts"
+msgstr "Rādīt ziņās attēlus."
+
+#: mobile/prefs.php:40
+msgid "Hide read articles and feeds"
+msgstr "Nerādīt lasītos rakstus barotnēs"
+
+#: mobile/prefs.php:45
+msgid "Sort feeds by unread count"
+msgstr "Kārtot barotnes pēc nelasīto skaita"
+
+#: mobile/prefs.php:50 include/localized_schema.php:45
+msgid "Reverse headline order (oldest first)"
+msgstr "Apgriezt virsrakstu secību (vecākos vispirms)"
+
+#: include/digest.php:131 include/functions.php:1127
+#: include/functions.php:1640 include/functions.php:1725
+#: include/functions.php:1747 classes/opml.php:416 classes/pref/feeds.php:188
+msgid "Uncategorized"
+msgstr "Nekategorizēts"
+
+#: include/feedbrowser.php:83
+#, php-format
+msgid "%d archived articles"
+msgstr "%d arhivēti raksti"
+
+#: include/feedbrowser.php:107
+msgid "No feeds found."
+msgstr "Neatradu barotnes."
+
+#: include/functions.php:698
+msgid "Session failed to validate (incorrect IP)"
+msgstr "Neizdevās validēt sesiju (mainījusies IP adrese)"
+
+#: include/functions.php:1589 classes/dlg.php:371 classes/pref/filters.php:368
+msgid "All feeds"
+msgstr "Visas barotnes"
+
+#: include/functions.php:1790
+msgid "Starred articles"
+msgstr "Zvaigžņotie raksti"
+
+#: include/functions.php:1792
+msgid "Published articles"
+msgstr "Publicētie raksti"
+
+#: include/functions.php:1794
+msgid "Fresh articles"
+msgstr "Jaunākie raksti"
+
+#: include/functions.php:1796 include/functions.php:1910
+msgid "All articles"
+msgstr "Visi raksti"
+
+#: include/functions.php:1798
+msgid "Archived articles"
+msgstr "Arhivētie raksti"
+
+#: include/functions.php:1800
+msgid "Recently read"
+msgstr "Nesen lasītie raksti"
+
+#: include/functions.php:1867
+msgid "Navigation"
+msgstr "Navigācija"
+
+#: include/functions.php:1868
+#, fuzzy
+msgid "Open next feed"
+msgstr "Pēc noķeršanas rādīt nākamo barotni"
+
+#: include/functions.php:1869
+msgid "Open previous feed"
+msgstr ""
+
+#: include/functions.php:1870
+#, fuzzy
+msgid "Open next article"
+msgstr "Atvērt sākotnējo rakstu"
+
+#: include/functions.php:1871
+#, fuzzy
+msgid "Open previous article"
+msgstr "Atvērt sākotnējo rakstu"
+
+#: include/functions.php:1872
+msgid "Open next article (don't scroll long articles)"
+msgstr ""
+
+#: include/functions.php:1873
+msgid "Open previous article (don't scroll long articles)"
+msgstr ""
+
+#: include/functions.php:1874
+msgid "Show search dialog"
+msgstr "Rādīt meklēšanas logu"
+
+#: include/functions.php:1875
+#, fuzzy
+msgid "Article"
+msgstr "Visus rakstus"
+
+#: include/functions.php:1876
+msgid "Toggle starred"
+msgstr "Pārslēgt zvaigžņošanu"
+
+#: include/functions.php:1877
+msgid "Toggle published"
+msgstr "Pārslēgt publicēšanu"
+
+#: include/functions.php:1878
+msgid "Toggle unread"
+msgstr "Pārslēgt nelasītu"
+
+#: include/functions.php:1879
+msgid "Edit tags"
+msgstr "Rediģēt iezīmes"
+
+#: include/functions.php:1880
+#, fuzzy
+msgid "Dismiss selected"
+msgstr "Atmest atlasītos rakstus"
+
+#: include/functions.php:1881
+#, fuzzy
+msgid "Dismiss read"
+msgstr "Atmest lasītos rakstus"
+
+#: include/functions.php:1882
+#, fuzzy
+msgid "Open in new window"
+msgstr "Atvērt rakstu jaunā logā"
+
+#: include/functions.php:1883 js/viewfeed.js:1758
+msgid "Mark below as read"
+msgstr "Iezīmēt lejup kā lasītus"
+
+#: include/functions.php:1884 js/viewfeed.js:1752
+msgid "Mark above as read"
+msgstr "Iezīmēt augšup kā lasītus"
+
+#: include/functions.php:1885
+#, fuzzy
+msgid "Scroll down"
+msgstr "Viss izdarīts."
+
+#: include/functions.php:1886
+msgid "Scroll up"
+msgstr ""
+
+#: include/functions.php:1887
+#, fuzzy
+msgid "Select article under cursor"
+msgstr "Iezīmēt rakstu zem peles kursora"
+
+#: include/functions.php:1888
+msgid "Email article"
+msgstr "Nosūtīt rakstu uz e-pastu"
+
+#: include/functions.php:1889 plugins/close_button/init.php:24
+msgid "Close article"
+msgstr "Aizvērt rakstu"
+
+#: include/functions.php:1891
+#, fuzzy
+msgid "Article selection"
+msgstr "Apgriezt rakstu iezīmēšanu"
+
+#: include/functions.php:1892
+msgid "Select all articles"
+msgstr "Iezīmēt visus rakstus"
+
+#: include/functions.php:1893
+#, fuzzy
+msgid "Select unread"
+msgstr "Iezīmēt nelasītos rakstus"
+
+#: include/functions.php:1894
+#, fuzzy
+msgid "Select starred"
+msgstr "Uzlikt zvaigzni"
+
+#: include/functions.php:1895
+#, fuzzy
+msgid "Select published"
+msgstr "Iezīmēt publicētos rakstus"
+
+#: include/functions.php:1896
+#, fuzzy
+msgid "Invert selection"
+msgstr "Apgriezt rakstu iezīmēšanu"
+
+#: include/functions.php:1897
+#, fuzzy
+msgid "Deselect everything"
+msgstr "Neatzīmēt rakstus"
+
+#: include/functions.php:1898 classes/pref/feeds.php:488
+#: classes/pref/feeds.php:707
+msgid "Feed"
+msgstr "Barotne"
+
+#: include/functions.php:1899
+#, fuzzy
+msgid "Refresh current feed"
+msgstr "Atjaunot aktīvo barotni"
+
+#: include/functions.php:1900
+#, fuzzy
+msgid "Un/hide read feeds"
+msgstr "(Ne)rādīt lasītās barotnes"
+
+#: include/functions.php:1901 classes/pref/feeds.php:1214
+msgid "Subscribe to feed"
+msgstr "Abonēt barotni"
+
+#: include/functions.php:1902 js/FeedTree.js:135 js/PrefFeedTree.js:67
+msgid "Edit feed"
+msgstr "Rediģēt barotni"
+
+#: include/functions.php:1904
+#, fuzzy
+msgid "Reverse headlines"
+msgstr "Apgriezt virsrakstu secību"
+
+#: include/functions.php:1905
+#, fuzzy
+msgid "Debug feed update"
+msgstr "Atslēgt atjaunojumus"
+
+#: include/functions.php:1906 js/FeedTree.js:170
+msgid "Mark all feeds as read"
+msgstr "Atzīmēt visas barotnes kā lasītas"
+
+#: include/functions.php:1907
+#, fuzzy
+msgid "Un/collapse current category"
+msgstr "Ievietot kategorijā:"
+
+#: include/functions.php:1908
+#, fuzzy
+msgid "Toggle combined mode"
+msgstr "Pārslēgt publicēšanu"
+
+#: include/functions.php:1909
+#, fuzzy
+msgid "Go to"
+msgstr "Doties uz..."
+
+#: include/functions.php:1911
+msgid "Fresh"
+msgstr ""
+
+#: include/functions.php:1914
+msgid "Tag cloud"
+msgstr "Iezīmju mākonis"
+
+#: include/functions.php:1916
+#, fuzzy
+msgid "Other"
+msgstr "Citas barotnes"
+
+#: include/functions.php:1917 classes/pref/labels.php:281
+msgid "Create label"
+msgstr "Izveidot etiķeti"
+
+#: include/functions.php:1918 classes/pref/filters.php:587
+msgid "Create filter"
+msgstr "Izveidot filtru"
+
+#: include/functions.php:1919
+#, fuzzy
+msgid "Un/collapse sidebar"
+msgstr "Sakļaut sānjoslu"
+
+#: include/functions.php:1920
+#, fuzzy
+msgid "Show help dialog"
+msgstr "Rādīt meklēšanas logu"
+
+#: include/functions.php:2400
+#, php-format
+msgid "Search results: %s"
+msgstr "Meklēšanas rezultāti: %s"
+
+#: include/functions.php:2824 js/viewfeed.js:1845
+msgid "Click to play"
+msgstr "Klikšķiniet, lai atskaņotu"
+
+#: include/functions.php:2825 js/viewfeed.js:1844
+msgid "Play"
+msgstr "Atskaņot"
+
+#: include/functions.php:2945
+msgid " - "
+msgstr "–"
+
+#: include/functions.php:2967 include/functions.php:3284 classes/rpc.php:359
+msgid "no tags"
+msgstr "nav iezīmju"
+
+#: include/functions.php:2977 classes/feeds.php:645
+msgid "Edit tags for this article"
+msgstr "Rediģēt šī raksta iezīmes"
+
+#: include/functions.php:3006 classes/feeds.php:600
+msgid "Originally from:"
+msgstr "Sākotnējais no:"
+
+#: include/functions.php:3019 classes/feeds.php:613 classes/pref/feeds.php:507
+msgid "Feed URL"
+msgstr "Barotnes URL"
+
+#: include/functions.php:3048
+msgid "Related"
+msgstr "Saistīts"
+
+#: include/functions.php:3075 classes/dlg.php:43 classes/dlg.php:162
+#: classes/dlg.php:185 classes/dlg.php:222 classes/dlg.php:508
+#: classes/dlg.php:543 classes/dlg.php:574 classes/dlg.php:608
+#: classes/dlg.php:620 classes/backend.php:105 classes/pref/users.php:106
+#: classes/pref/filters.php:108 classes/pref/feeds.php:1527
+#: classes/pref/feeds.php:1598 plugins/import_export/init.php:407
+#: plugins/import_export/init.php:431 plugins/share/init.php:67
+#: plugins/updater/init.php:329
+msgid "Close this window"
+msgstr "Aizvērt šo logu"
+
+#: include/functions.php:3309
+msgid "(edit note)"
+msgstr "(rediģēt piezīmi)"
+
+#: include/functions.php:3542
+msgid "unknown type"
+msgstr "nezināms tips"
+
+#: include/functions.php:3592
+msgid "Attachments"
+msgstr "Pielikumi"
+
+#: include/localized_schema.php:4
+msgid "Title or Content"
+msgstr "Virsraksts vai saturs"
+
+#: include/localized_schema.php:5
+msgid "Link"
+msgstr "Saite"
+
+#: include/localized_schema.php:6
+msgid "Content"
+msgstr "Saturs"
+
+#: include/localized_schema.php:7
+msgid "Article Date"
+msgstr "Raksta datums"
+
+#: include/localized_schema.php:9
+msgid "Delete article"
+msgstr "Dzēst rakstu"
+
+#: include/localized_schema.php:11
+msgid "Set starred"
+msgstr "Uzlikt zvaigzni"
+
+#: include/localized_schema.php:12 js/viewfeed.js:478
+#: plugins/digest/digest.js:264 plugins/digest/digest.js:736
+msgid "Publish article"
+msgstr "Publicēt rakstu"
+
+#: include/localized_schema.php:13
+msgid "Assign tags"
+msgstr "Pievienot iezīmi"
+
+#: include/localized_schema.php:14 js/viewfeed.js:1809
+msgid "Assign label"
+msgstr "Pievienot etiķeti"
+
+#: include/localized_schema.php:15
+msgid "Modify score"
+msgstr "Mainīt novērtējumu"
+
+#: include/localized_schema.php:17
+msgid "General"
+msgstr "Vispārīgi"
+
+#: include/localized_schema.php:18
+msgid "Interface"
+msgstr "Saskarne"
+
+#: include/localized_schema.php:19
+msgid "Advanced"
+msgstr "Paplašināti"
+
+#: include/localized_schema.php:21
+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 ""
+"Šī ir vērtīga iespēja, ja izmantojat planētas tipa agregatorus ar "
+"parklājošiem datiem. Kad tas ir atslēgts, tas no visām līdzīgām barotnēm "
+"parāda tikai vienu unikālu rakstu."
+
+#: include/localized_schema.php:22
+msgid ""
+"Display expanded list of feed articles, instead of separate displays for "
+"headlines and article content"
+msgstr ""
+"Atsevišķa virsraksta un satura vietā parāda paplašinātu barotnes rakstu "
+"sarakstu"
+
+#: include/localized_schema.php:23
+msgid ""
+"Automatically open next feed with unread articles after marking one as read"
+msgstr ""
+"Automātiski atver nākamo barotni, kad vienā visi raksti ir atzīmēti kā lasīti"
+
+#: include/localized_schema.php:24
+msgid ""
+"This option enables sending daily digest of new (and unread) headlines on "
+"your configured e-mail address"
+msgstr ""
+"Šī iespēja ļauj nosūtīt ikdienas jauno (vai nelasīto) rakstu īssavilkumu uz "
+"norādīto e-pasta adresi"
+
+#: include/localized_schema.php:25
+msgid ""
+"This option enables marking articles as read automatically while you scroll "
+"article list."
+msgstr ""
+"Šī iespēja ļauj automātiski atzīmēt rakstu kā lasītu, kad jūs pārtinat tā "
+"saturu."
+
+#: include/localized_schema.php:26
+msgid "Strip all but most common HTML tags when reading articles."
+msgstr "Lasot rakstus, atmest visus, izņemot pašus svarīgākos HTML tagus."
+
+#: include/localized_schema.php:27
+msgid ""
+"When auto-detecting tags in articles these tags will not be applied (comma-"
+"separated list)."
+msgstr ""
+"Kad tiek automātiski noteikti rakstu tagi, šie tagi netiks piemēroti (ar "
+"komatu atdalīts saraksts)."
+
+#: include/localized_schema.php:28
+msgid ""
+"When this option is enabled, headlines in Special feeds and Labels are "
+"grouped by feeds"
+msgstr ""
+"Ja šī iespēja ir ieslēgta, īpašo barotņu un iezīmju virsraksti tiek grupēti "
+"pēc barotnēm"
+
+#: include/localized_schema.php:29
+msgid "Customize CSS stylesheet to your liking"
+msgstr "Pielāgot CSS stilu lapu"
+
+#: include/localized_schema.php:30
+msgid "Use feed-specified date to sort headlines instead of local import date."
+msgstr ""
+"Kārtošanai izmantot barotnē norādīto raksta laiku nevis tā importēšanas laiku"
+
+#: include/localized_schema.php:31
+msgid "Click to register your SSL client certificate with tt-rss"
+msgstr "Klikšķiniet, lai reģistrētu jūsu klienta SSL sertifikātu tt-rss"
+
+#: include/localized_schema.php:32
+msgid "Uses UTC timezone"
+msgstr "Izmanto UTC laika zonu"
+
+#: include/localized_schema.php:33
+msgid "Purge articles after this number of days (0 - disables)"
+msgstr "Dzēst rakstus pēc norādītā dienu skaita (0 – atceļ)"
+
+#: include/localized_schema.php:34
+msgid "Default interval between feed updates"
+msgstr "Noklusētais barotņu atjaunošanas intervāls "
+
+#: include/localized_schema.php:35
+msgid "Amount of articles to display at once"
+msgstr "Vienlaicīgi parādīto rakstu skaits"
+
+#: include/localized_schema.php:36
+msgid "Allow duplicate posts"
+msgstr "Atļaut dublētus ziņojumus"
+
+#: include/localized_schema.php:37
+msgid "Enable feed categories"
+msgstr "Iespējot barotņu kategorijas"
+
+#: include/localized_schema.php:38
+msgid "Show content preview in headlines list"
+msgstr "Rādīt virsrakstu sarakstā satura priekšskatījumu"
+
+#: include/localized_schema.php:39
+msgid "Short date format"
+msgstr "Īsais datumu formāts"
+
+#: include/localized_schema.php:40
+msgid "Long date format"
+msgstr "Garais datumu formāts"
+
+#: include/localized_schema.php:41
+msgid "Combined feed display"
+msgstr "Kombinēts barotņu skatījums"
+
+#: include/localized_schema.php:42
+msgid "Hide feeds with no unread messages"
+msgstr "Slēpt barotnes ar izlasītiem ziņojumiem"
+
+#: include/localized_schema.php:43
+msgid "On catchup show next feed"
+msgstr "Pēc noķeršanas rādīt nākamo barotni"
+
+#: include/localized_schema.php:44
+msgid "Sort feeds by unread articles count"
+msgstr "Kārtot barotnes pēc nelasīto ziņu skaita"
+
+#: include/localized_schema.php:46
+msgid "Enable e-mail digest"
+msgstr "Iespējot īssavilkuma sūtīšanu pa e-pastu"
+
+#: include/localized_schema.php:47
+msgid "Confirm marking feed as read"
+msgstr "Apstiprināt barotnes atzīmēšanu kā izlasītu"
+
+#: include/localized_schema.php:48
+msgid "Automatically mark articles as read"
+msgstr "Automātiski atzīmēt rakstus kā izlasītus"
+
+#: include/localized_schema.php:49
+msgid "Strip unsafe tags from articles"
+msgstr "Izdzrest nedrošos tagus no rakstiem"
+
+#: include/localized_schema.php:50
+msgid "Blacklisted tags"
+msgstr "Tagu melnais saraksts"
+
+#: include/localized_schema.php:51
+msgid "Maximum age of fresh articles (in hours)"
+msgstr "Maksimālais svaigo rakstu laiks (stundās)"
+
+#: include/localized_schema.php:52
+msgid "Mark articles in e-mail digest as read"
+msgstr "Atzīmēt īssavilkuma rakstus e-pastā kā lasītus"
+
+#: include/localized_schema.php:53
+msgid "Automatically expand articles in combined mode"
+msgstr "Automātiski rādīt rakstus kombinētajā režīmā"
+
+#: include/localized_schema.php:54
+msgid "Purge unread articles"
+msgstr "Dzēst nelasītos rakstus"
+
+#: include/localized_schema.php:55
+msgid "Show special feeds when hiding read feeds"
+msgstr "Rādīt īpašās barotnes kad tiek slēptas izlasītās"
+
+#: include/localized_schema.php:56
+msgid "Group headlines in virtual feeds"
+msgstr "Apvienot virsrakstus virtuālās barotnēs"
+
+#: include/localized_schema.php:57
+#, fuzzy
+msgid "Hide images in articles"
+msgstr "Nerādīt rakstos attēlus"
+
+#: include/localized_schema.php:58
+msgid "Enable external API"
+msgstr "Iespējot ārēju API"
+
+#: include/localized_schema.php:59
+msgid "User timezone"
+msgstr "Lietotāja laika zona"
+
+#: include/localized_schema.php:60 js/prefs.js:1733
+msgid "Customize stylesheet"
+msgstr "Pielāgot stilu lapu"
+
+#: include/localized_schema.php:61
+msgid "Sort headlines by feed date"
+msgstr "Kārtot virsrakstus pēc barotnes laika"
+
+#: include/localized_schema.php:62
+msgid "Login with an SSL certificate"
+msgstr "Pieteikties ar SSL sertifikātu"
+
+#: include/localized_schema.php:63
+msgid "Try to send digests around specified time"
+msgstr "Censties nosūtīt īssavilkumus ap norādīto laiku"
+
+#: include/localized_schema.php:64
+msgid "Assign articles to labels automatically"
+msgstr "Pievienot rakstu iezīmes automātiski"
+
+#: include/login_form.php:185 classes/handler/public.php:459
+msgid "Language:"
+msgstr "Valoda:"
+
+#: include/login_form.php:193
+msgid "Profile:"
+msgstr "Profils:"
+
+#: include/login_form.php:197 classes/handler/public.php:212
+#: classes/rpc.php:64 classes/dlg.php:98
+msgid "Default profile"
+msgstr "Noklusētais profils"
+
+#: include/login_form.php:205
+msgid "Use less traffic"
+msgstr "Saspiest datu plūsmu"
+
+#: classes/article.php:25
+msgid "Article not found."
+msgstr "Raksts netika atrasts."
+
+#: classes/handler/public.php:394 plugins/bookmarklets/init.php:38
+msgid "Share with Tiny Tiny RSS"
+msgstr "Kopīgot ar Tiny Tiny RSS"
+
+#: classes/handler/public.php:402
+msgid "Title:"
+msgstr "Virsraksts:"
+
+#: classes/handler/public.php:404 classes/dlg.php:667
+#: classes/pref/feeds.php:505 classes/pref/feeds.php:722
+#: plugins/instances/init.php:215
+msgid "URL:"
+msgstr "URL:"
+
+#: classes/handler/public.php:406
+msgid "Content:"
+msgstr "Saturs:"
+
+#: classes/handler/public.php:408
+msgid "Labels:"
+msgstr "Etiķetes:"
+
+#: classes/handler/public.php:427
+msgid "Shared article will appear in the Published feed."
+msgstr "Kopīgotais raksts parādīsies Publicēts barotnē"
+
+#: classes/handler/public.php:429
+msgid "Share"
+msgstr "Kopīgot"
+
+#: classes/handler/public.php:430 classes/handler/public.php:472
+#: classes/dlg.php:297 classes/dlg.php:350 classes/dlg.php:410
+#: classes/dlg.php:441 classes/dlg.php:652 classes/dlg.php:702
+#: classes/dlg.php:751 classes/pref/users.php:194 classes/pref/labels.php:81
+#: classes/pref/filters.php:349 classes/pref/filters.php:729
+#: classes/pref/filters.php:798 classes/pref/filters.php:865
+#: classes/pref/feeds.php:689 classes/pref/feeds.php:829
+#: plugins/mail/init.php:132 plugins/note/init.php:55
+#: plugins/instances/init.php:251
+msgid "Cancel"
+msgstr "Atcelt"
+
+#: classes/handler/public.php:451
+msgid "Not logged in"
+msgstr "Nav pieteicies"
+
+#: classes/handler/public.php:511
+msgid "Incorrect username or password"
+msgstr "Nepareizs lietotāja vārds vai parole"
+
+#: classes/handler/public.php:547 classes/handler/public.php:644
+#, php-format
+msgid "Already subscribed to <b>%s</b>."
+msgstr "Jau ir pasūtījis <b>%s</b>."
+
+#: classes/handler/public.php:550 classes/handler/public.php:635
+#, php-format
+msgid "Subscribed to <b>%s</b>."
+msgstr "Pasūtījis <b>%s</b>."
+
+#: classes/handler/public.php:553 classes/handler/public.php:638
+#, php-format
+msgid "Could not subscribe to <b>%s</b>."
+msgstr "Neizdevās pasūtīt <b>%s</b>."
+
+#: classes/handler/public.php:556 classes/handler/public.php:641
+#, php-format
+msgid "No feeds found in <b>%s</b>."
+msgstr "<b>%s</b> barotne netika atrasta."
+
+#: classes/handler/public.php:559 classes/handler/public.php:647
+msgid "Multiple feed URLs found."
+msgstr "Atradu vairākus barotņu URLus."
+
+#: classes/handler/public.php:563 classes/handler/public.php:652
+#, php-format
+msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
+msgstr "Neizdevās pasūtīt <b>%s</b>.<br>Nevarēju lejuplādēt barotnes URL."
+
+#: classes/handler/public.php:581 classes/handler/public.php:670
+msgid "Subscribe to selected feed"
+msgstr "Pasūtīt norādīto barotni"
+
+#: classes/handler/public.php:606 classes/handler/public.php:694
+msgid "Edit subscription options"
+msgstr "Rediģēt barotnes iestatījumus"
+
+#: classes/dlg.php:22
+msgid ""
+"If you have imported labels and/or filters, you might need to reload "
+"preferences to see your new data."
+msgstr ""
+"Ja esat importējis etiķetus vai filtrus, iespējams, ka jums nepieciešams "
+"pārlādēt iestatījumus, lai redzētu jaunos datus."
+
+#: classes/dlg.php:55 classes/pref/users.php:378 classes/pref/labels.php:272
+#: classes/pref/filters.php:230 classes/pref/filters.php:277
+#: classes/pref/filters.php:578 classes/pref/filters.php:657
+#: classes/pref/filters.php:684 classes/pref/feeds.php:1202
+#: classes/pref/feeds.php:1472 classes/pref/feeds.php:1541
+#: plugins/instances/init.php:287
+msgid "Select"
+msgstr "Iezīmēt"
+
+#: classes/dlg.php:58 classes/feeds.php:92 classes/pref/users.php:381
+#: classes/pref/labels.php:275 classes/pref/filters.php:233
+#: classes/pref/filters.php:280 classes/pref/filters.php:581
+#: classes/pref/filters.php:660 classes/pref/filters.php:687
+#: classes/pref/feeds.php:1205 classes/pref/feeds.php:1475
+#: classes/pref/feeds.php:1544 plugins/instances/init.php:290
+msgid "All"
+msgstr "Visus"
+
+#: classes/dlg.php:60 classes/feeds.php:95 classes/pref/users.php:383
+#: classes/pref/labels.php:277 classes/pref/filters.php:235
+#: classes/pref/filters.php:282 classes/pref/filters.php:583
+#: classes/pref/filters.php:662 classes/pref/filters.php:689
+#: classes/pref/feeds.php:1207 classes/pref/feeds.php:1477
+#: classes/pref/feeds.php:1546 plugins/instances/init.php:292
+msgid "None"
+msgstr "Nevienu"
+
+#: classes/dlg.php:69
+msgid "Create profile"
+msgstr "Izveidot profilu"
+
+#: classes/dlg.php:92 classes/dlg.php:122
+msgid "(active)"
+msgstr "(aktīvs)"
+
+#: classes/dlg.php:156
+msgid "Remove selected profiles"
+msgstr "Dzēst iezīmētos profilus"
+
+#: classes/dlg.php:158
+msgid "Activate profile"
+msgstr "Aktivizēt profilu"
+
+#: classes/dlg.php:168
+msgid "Public OPML URL"
+msgstr "Publiskā OPML URL (adrese)"
+
+#: classes/dlg.php:173
+msgid "Your Public OPML URL is:"
+msgstr "Jūsu publiskais OPML URL ir:"
+
+#: classes/dlg.php:182 classes/dlg.php:571
+msgid "Generate new URL"
+msgstr "Izveidot jaunu URL"
+
+#: classes/dlg.php:194
+msgid "Notice"
+msgstr "Piezīme"
+
+#: classes/dlg.php:200
+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 ""
+"Atjaunošanas process iestatījumos ir iespējots, bet tas nedarbojas, tāpēc "
+"barotnes neatjaunojas. Lūdzu palaidiet atjaunošanas procesu vai arī "
+"sazinieties ar servera īpašnieku."
+
+#: classes/dlg.php:204 classes/dlg.php:213
+msgid "Last update:"
+msgstr "Pēdējais atjaunojums:"
+
+#: classes/dlg.php:209
+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 ""
+"Atjaunošanas process aizņem pārāk ilgu laiku. Iespējams, ka tas ir tāpēc, ka "
+"process ir \"uzkāries\". Lūdzu pārbaudiet atjaunošanas procesu vai arī "
+"sazinieties ar servera īpašnieku."
+
+#: classes/dlg.php:234 classes/dlg.php:243
+msgid "Feed or site URL"
+msgstr "Barotnes vai vietnes URL"
+
+#: classes/dlg.php:249 classes/dlg.php:715 classes/pref/feeds.php:527
+#: classes/pref/feeds.php:735
+msgid "Place in category:"
+msgstr "Ievietot kategorijā:"
+
+#: classes/dlg.php:257
+msgid "Available feeds"
+msgstr "Pieejamās barotnes"
+
+#: classes/dlg.php:269 classes/pref/users.php:155 classes/pref/feeds.php:557
+#: classes/pref/feeds.php:771
+msgid "Authentication"
+msgstr "Autentifikācija"
+
+#: classes/dlg.php:273 classes/dlg.php:729 classes/pref/users.php:438
+#: classes/pref/feeds.php:563 classes/pref/feeds.php:775
+msgid "Login"
+msgstr "Pieteikšanās"
+
+#: classes/dlg.php:276 classes/dlg.php:732 classes/pref/prefs.php:196
+#: classes/pref/feeds.php:569 classes/pref/feeds.php:781
+msgid "Password"
+msgstr "Parole"
+
+#: classes/dlg.php:286
+msgid "This feed requires authentication."
+msgstr "Šim laukam ir nepieciešams autentificēties."
+
+#: classes/dlg.php:291 classes/dlg.php:348 classes/dlg.php:750
+msgid "Subscribe"
+msgstr "Pasūtīt"
+
+#: classes/dlg.php:294
+msgid "More feeds"
+msgstr "Vairāk barotnes"
+
+#: classes/dlg.php:318 classes/dlg.php:409 classes/pref/users.php:368
+#: classes/pref/filters.php:574 classes/pref/feeds.php:1198 js/tt-rss.js:166
+msgid "Search"
+msgstr "Meklēt"
+
+#: classes/dlg.php:322
+msgid "Popular feeds"
+msgstr "Populārās barotnes"
+
+#: classes/dlg.php:323
+msgid "Feed archive"
+msgstr "Barotņu arhīvs"
+
+#: classes/dlg.php:326
+msgid "limit:"
+msgstr "ierobežojumi:"
+
+#: classes/dlg.php:349 classes/pref/users.php:394 classes/pref/labels.php:284
+#: classes/pref/filters.php:339 classes/pref/filters.php:596
+#: classes/pref/feeds.php:662 plugins/instances/init.php:297
+msgid "Remove"
+msgstr "Novākt"
+
+#: classes/dlg.php:360
+msgid "Look for"
+msgstr "Meklēt"
+
+#: classes/dlg.php:368
+msgid "Limit search to:"
+msgstr "Ierobežot meklēšanu:"
+
+#: classes/dlg.php:384
+msgid "This feed"
+msgstr "Šajā barotnē"
+
+#: classes/dlg.php:416
+msgid "Tags for this article (separated by commas):"
+msgstr "Šī raksta iezīmes (atdalītas ar komatiem):"
+
+#: classes/dlg.php:439 classes/dlg.php:650 classes/pref/users.php:192
+#: classes/pref/labels.php:79 classes/pref/filters.php:346
+#: classes/pref/feeds.php:688 classes/pref/feeds.php:826
+#: plugins/nsfw/init.php:86 plugins/note/init.php:53
+#: plugins/owncloud/init.php:62 plugins/instances/init.php:248
+msgid "Save"
+msgstr "Saglabāt"
+
+#: classes/dlg.php:447
+msgid "Tag Cloud"
+msgstr "Iezīmju mākonis"
+
+#: classes/dlg.php:516
+msgid "Select item(s) by tags"
+msgstr "Atlasīt vienumus pēc iezīmēm"
+
+#: classes/dlg.php:519
+msgid "Match:"
+msgstr "Atbilstība:"
+
+#: classes/dlg.php:521
+msgid "Any"
+msgstr "Jebkurš"
+
+#: classes/dlg.php:524
+msgid "All tags."
+msgstr "Visas iezīmes."
+
+#: classes/dlg.php:526
+msgid "Which Tags?"
+msgstr "Kuras iezīmes?"
+
+#: classes/dlg.php:539
+msgid "Display entries"
+msgstr "Rādīt ierakstus"
+
+#: classes/dlg.php:551 classes/feeds.php:133
+msgid "View as RSS"
+msgstr "Skatīt kā RSS"
+
+#: classes/dlg.php:562
+msgid "You can view this feed as RSS using the following URL:"
+msgstr "Jūs varat skatīt so baronti kā RSS ar sekojošu URL:"
+
+#: classes/dlg.php:591 plugins/updater/init.php:303
+#, php-format
+msgid "New version of Tiny Tiny RSS is available (%s)."
+msgstr "Ir pieejama jauna Tiny Tiny RSS versija (%s)."
+
+#: classes/dlg.php:599
+msgid ""
+"You can update using built-in updater in the Preferences or by using update."
+"php"
+msgstr ""
+"Jūs varat veikt atjaunojumus, izmantojot iestatījumos norādīto atjaunošanas "
+"procesu, vai arī atverot update.php lapu"
+
+#: classes/dlg.php:603 classes/pref/users.php:390
+msgid "Details"
+msgstr "Detaļas"
+
+#: classes/dlg.php:605
+msgid "Download"
+msgstr "Lejuplādēt"
+
+#: classes/dlg.php:613
+msgid "Error receiving version information or no new version available."
+msgstr ""
+
+#: classes/dlg.php:634
+#, 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 ""
+"Jūs varat aizstāt krāsas, fontus un izklājumu, šobrīd izmantotā CSS vietā "
+"izmantojot savus pielāgojumus. Paraugu varat ņemt no <a target=\"_blank\" "
+"class=\"visibleLink\" href=\"%s\">šī faila</a>."
+
+#: classes/dlg.php:661 plugins/instances/init.php:207
+msgid "Instance"
+msgstr "Instance"
+
+#: classes/dlg.php:670 plugins/instances/init.php:218
+#: plugins/instances/init.php:315
+msgid "Instance URL"
+msgstr "Instances URL"
+
+#: classes/dlg.php:680 plugins/instances/init.php:229
+msgid "Access key:"
+msgstr "Pieejas atslēga:"
+
+#: classes/dlg.php:683 plugins/instances/init.php:232
+#: plugins/instances/init.php:316
+msgid "Access key"
+msgstr "Pieejas aslēga"
+
+#: classes/dlg.php:687 plugins/instances/init.php:236
+msgid "Use one access key for both linked instances."
+msgstr "Izmantot to pašu pieejas aslēgu abām saistītajām instancēm."
+
+#: classes/dlg.php:695 plugins/instances/init.php:244
+msgid "Generate new key"
+msgstr "Ģenerēt jaunu atslēgu"
+
+#: classes/dlg.php:699
+msgid "Create link"
+msgstr "Izveidot saiti"
+
+#: classes/dlg.php:712
+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/dlg.php:721
+msgid "Feeds to subscribe, One per line"
+msgstr "Pasūtāmās barotnes, pa vienai katrā rindā"
+
+#: classes/dlg.php:743
+msgid "Feeds require authentication."
+msgstr "Barotnēm nepieciešama autentifikācija"
+
+#: classes/feeds.php:68
+msgid "Visit the website"
+msgstr "Apmeklēt vietni"
+
+#: classes/feeds.php:83
+msgid "View as RSS feed"
+msgstr "Skatīt RSS barotni"
+
+#: classes/feeds.php:91
+msgid "Select:"
+msgstr "Iezīmēt:"
+
+#: classes/feeds.php:94
+msgid "Invert"
+msgstr "Apgriezt"
+
+#: classes/feeds.php:101
+#, fuzzy
+msgid "More..."
+msgstr "Papildu iespējas..."
+
+#: classes/feeds.php:103
+msgid "Selection toggle:"
+msgstr "Izvēles pārslēgšana:"
+
+#: classes/feeds.php:109
+msgid "Selection:"
+msgstr "Izvēle:"
+
+#: classes/feeds.php:112
+msgid "Set score"
+msgstr "Iestatīr vērtējumu"
+
+#: classes/feeds.php:115
+msgid "Archive"
+msgstr "Arhivēt"
+
+#: classes/feeds.php:117
+msgid "Move back"
+msgstr "Pārvietot atpakaļ"
+
+#: classes/feeds.php:118 classes/pref/filters.php:242
+#: classes/pref/filters.php:289 classes/pref/filters.php:669
+#: classes/pref/filters.php:696
+msgid "Delete"
+msgstr "Dzēst"
+
+#: classes/feeds.php:125 plugins/mail/init.php:28
+msgid "Forward by email"
+msgstr "Pārsūtīt e-pastā"
+
+#: classes/feeds.php:129
+msgid "Feed:"
+msgstr "Barotne:"
+
+#: classes/feeds.php:196 classes/feeds.php:790
+msgid "Feed not found."
+msgstr "Barotne netika atrasta."
+
+#: classes/feeds.php:403 classes/feeds.php:493
+msgid "mark as read"
+msgstr "iezīmēt kā lasītu"
+
+#: classes/feeds.php:691
+msgid "No unread articles found to display."
+msgstr "Nav neizlasītu rakstu, ko rādīt."
+
+#: classes/feeds.php:694
+msgid "No updated articles found to display."
+msgstr "Nav atjaunotu rakstu, ko rādīt."
+
+#: classes/feeds.php:697
+msgid "No starred articles found to display."
+msgstr "Nav zvaigžņotu rakstu, ko rādīt."
+
+#: classes/feeds.php:701
+msgid ""
+"No articles found to display. You can assign articles to labels manually "
+"(see the Actions menu above) or use a filter."
+msgstr ""
+"Netika atrasti parādāmi raksti. Jūs varat pievienot rakstus etiķetēm manuāli "
+"(skatiet darbību izvēlni), vai arī ar filtru."
+
+#: classes/feeds.php:703
+msgid "No articles found to display."
+msgstr "Netika atrasti raksti, ko rādīt."
+
+#: classes/feeds.php:718 classes/feeds.php:899
+#, php-format
+msgid "Feeds last updated at %s"
+msgstr "Barotnes pēdējo reizi atjaunotas %s."
+
+#: classes/feeds.php:728 classes/feeds.php:909
+msgid "Some feeds have update errors (click for details)"
+msgstr ""
+"Dažas barotnes ir atjaunotas ar kļūdām (klikšķiniet lai skatītu vairāk)"
+
+#: classes/feeds.php:889
+msgid "No feed selected."
+msgstr "Nav izvēlēta barotne."
+
+#: classes/backend.php:34
+msgid "Keyboard Shortcuts"
+msgstr "Īsinājumtaustiņi"
+
+#: classes/backend.php:57
+msgid "Shift"
+msgstr ""
+
+#: classes/backend.php:60
+msgid "Ctrl"
+msgstr ""
+
+#: classes/backend.php:84
+msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
+msgstr "Citi saskarnes padomi ir pieejami Tiny Tiny RSS viki vietnē."
+
+#: classes/backend.php:99
+msgid "Help topic not found."
+msgstr "Palīdzības tēma netika atrasta."
+
+#: classes/opml.php:28 classes/opml.php:33
+msgid "OPML Utility"
+msgstr "OPML rīks"
+
+#: classes/opml.php:37
+msgid "Importing OPML..."
+msgstr "Importē OPML..."
+
+#: classes/opml.php:41
+msgid "Return to preferences"
+msgstr "Atgriezties uz iestatījumiem"
+
+#: classes/opml.php:270
+#, php-format
+msgid "Adding feed: %s"
+msgstr "Pievieno barotni: %s"
+
+#: classes/opml.php:281
+#, php-format
+msgid "Duplicate feed: %s"
+msgstr "Dublēta barotne: %s"
+
+#: classes/opml.php:295
+#, php-format
+msgid "Adding label %s"
+msgstr "Pievieno etiķeti %s"
+
+#: classes/opml.php:298
+#, php-format
+msgid "Duplicate label: %s"
+msgstr "Dublēta etiķete: %s"
+
+#: classes/opml.php:310
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr "Saglabā iestatījumu atslēgu %s līdz %s"
+
+#: classes/opml.php:339
+msgid "Adding filter..."
+msgstr "Pievieno filtru..."
+
+#: classes/opml.php:416
+#, php-format
+msgid "Processing category: %s"
+msgstr "Apstrādā kategoriju: %s"
+
+#: classes/opml.php:468
+msgid "Error: please upload OPML file."
+msgstr "Kļūda: lūdzu augšuplādējiet OPML failu."
+
+#: classes/opml.php:475
+msgid "Error while parsing document."
+msgstr "Dokumenta apstrādes kļūda."
+
+#: classes/pref/users.php:6 plugins/instances/init.php:157
+msgid "Your access level is insufficient to open this tab."
+msgstr "Jums nav pietiekamas pieejas tiesības, lai atvērtu šo cilni."
+
+#: classes/pref/users.php:27
+msgid "User details"
+msgstr "Lietotāja detaļas"
+
+#: classes/pref/users.php:41
+msgid "User not found"
+msgstr "Lietotājs netika atrasts"
+
+#: classes/pref/users.php:60 classes/pref/users.php:440
+msgid "Registered"
+msgstr "Reģistrēts"
+
+#: classes/pref/users.php:61
+msgid "Last logged in"
+msgstr "Pēdējo reizi pieteicies"
+
+#: classes/pref/users.php:68
+msgid "Subscribed feeds count"
+msgstr "Pasūtīto barotņu skaits"
+
+#: classes/pref/users.php:72
+msgid "Subscribed feeds"
+msgstr "Pasūtītās barotnes"
+
+#: classes/pref/users.php:122
+msgid "User Editor"
+msgstr "Lietotāja redaktors"
+
+#: classes/pref/users.php:158
+msgid "Access level: "
+msgstr "Pieejas līmenis:"
+
+#: classes/pref/users.php:171
+msgid "Change password to"
+msgstr "Nomainīt paroli uz"
+
+#: classes/pref/users.php:177 classes/pref/feeds.php:577
+#: classes/pref/feeds.php:787
+msgid "Options"
+msgstr "Iespējas"
+
+#: classes/pref/users.php:180
+msgid "E-mail: "
+msgstr "E-pasts:"
+
+#: classes/pref/users.php:258
+#, php-format
+msgid "Added user <b>%s</b> with password <b>%s</b>"
+msgstr "Pievienoja lietotāju <b>%s</b> ar paroli <b>%s</b>"
+
+#: classes/pref/users.php:265
+#, php-format
+msgid "Could not create user <b>%s</b>"
+msgstr "Neizdevās izveidot lietotāju <b>%s</b>"
+
+#: classes/pref/users.php:269
+#, php-format
+msgid "User <b>%s</b> already exists."
+msgstr "Lietotājs <b>%s</b> jau pastāv."
+
+#: classes/pref/users.php:292
+#, php-format
+msgid ""
+"Changed password of user <b>%s</b>\n"
+"\t\t\t\t to <b>%s</b>"
+msgstr ""
+"Nomainīja lietotāja <b>%s</b> paroli\n"
+"\t\t\t\t uz <b>%s</b>"
+
+#: classes/pref/users.php:299
+#, php-format
+msgid "Notifying <b>%s</b>."
+msgstr "Ziņoju <b>%s</b>."
+
+#: classes/pref/users.php:336
+msgid "[tt-rss] Password change notification"
+msgstr "[tt-rss] paroles maiņas paziņojums"
+
+#: classes/pref/users.php:386
+msgid "Create user"
+msgstr "Izveidot lietotāju"
+
+#: classes/pref/users.php:392 classes/pref/filters.php:593
+#: plugins/instances/init.php:296
+msgid "Edit"
+msgstr "Rediģēt"
+
+#: classes/pref/users.php:396
+msgid "Reset password"
+msgstr "Atstatīt paroli"
+
+#: classes/pref/users.php:439
+msgid "Access Level"
+msgstr "Pieejas līmenis"
+
+#: classes/pref/users.php:441
+msgid "Last login"
+msgstr "Pēdējā pieteikšanās"
+
+#: classes/pref/users.php:462 plugins/instances/init.php:337
+msgid "Click to edit"
+msgstr "Klikšķiniet, lai rediģētu"
+
+#: classes/pref/users.php:482
+msgid "No users defined."
+msgstr "Nav definēti lietotāji."
+
+#: classes/pref/users.php:484
+msgid "No matching users found."
+msgstr "Neatradu atbilstošus lietotājus."
+
+#: classes/pref/labels.php:22
+msgid "Caption"
+msgstr "Uzraksts"
+
+#: classes/pref/labels.php:37
+msgid "Colors"
+msgstr "Krāsas"
+
+#: classes/pref/labels.php:42
+msgid "Foreground:"
+msgstr "Pamats:"
+
+#: classes/pref/labels.php:42
+msgid "Background:"
+msgstr "Virspuse:"
+
+#: classes/pref/labels.php:232
+#, php-format
+msgid "Created label <b>%s</b>"
+msgstr "Izveidoju etiķeti <b>%s</b>"
+
+#: classes/pref/labels.php:287
+msgid "Clear colors"
+msgstr "Attīrīt krāsas"
+
+#: classes/pref/filters.php:57
+msgid "Articles matching this filter:"
+msgstr "Raksti, kas atbilst šim filtram:"
+
+#: classes/pref/filters.php:94
+msgid "No recent articles matching this filter have been found."
+msgstr "Neseni raksti ar šādiem atlases nosacījumiem netika atrasti"
+
+#: classes/pref/filters.php:98
+msgid ""
+"Complex expressions might not give results while testing due to issues with "
+"database server regexp implementation."
+msgstr ""
+
+#: classes/pref/filters.php:225 classes/pref/filters.php:652
+#: classes/pref/filters.php:767
+msgid "Match"
+msgstr "Atbilstība"
+
+#: classes/pref/filters.php:239 classes/pref/filters.php:286
+#: classes/pref/filters.php:666 classes/pref/filters.php:693
+msgid "Add"
+msgstr "Pievienot"
+
+#: classes/pref/filters.php:272 classes/pref/filters.php:679
+msgid "Apply actions"
+msgstr "Pielietot darbības"
+
+#: classes/pref/filters.php:322 classes/pref/filters.php:708
+msgid "Enabled"
+msgstr "Iespējots"
+
+#: classes/pref/filters.php:331 classes/pref/filters.php:711
+msgid "Match any rule"
+msgstr "Atbilst jebkuram likumam"
+
+#: classes/pref/filters.php:343 classes/pref/filters.php:723
+msgid "Test"
+msgstr "Pārbaudīt"
+
+#: classes/pref/filters.php:375
+#, php-format
+msgid "%s on %s in %s"
+msgstr "%s kad %s kur %s"
+
+#: classes/pref/filters.php:590
+msgid "Combine"
+msgstr "Apvienot"
+
+#: classes/pref/filters.php:600 classes/pref/feeds.php:1257
+msgid "Rescore articles"
+msgstr "Pārvērtēt rakstus"
+
+#: classes/pref/filters.php:726
+msgid "Create"
+msgstr "Izveidot"
+
+#: classes/pref/filters.php:776
+msgid "on field"
+msgstr "laukā"
+
+#: classes/pref/filters.php:782 js/PrefFilterTree.js:29
+#: plugins/digest/digest.js:241
+msgid "in"
+msgstr "kur"
+
+#: classes/pref/filters.php:795
+msgid "Save rule"
+msgstr "Saglabāt likumu"
+
+#: classes/pref/filters.php:795 js/functions.js:1078
+msgid "Add rule"
+msgstr "Pievienot likumu"
+
+#: classes/pref/filters.php:818
+msgid "Perform Action"
+msgstr "Pielietot darbību"
+
+#: classes/pref/filters.php:844
+msgid "with parameters:"
+msgstr "ar parametriem:"
+
+#: classes/pref/filters.php:862
+msgid "Save action"
+msgstr "Saglabāt darbību"
+
+#: classes/pref/filters.php:862 js/functions.js:1104
+msgid "Add action"
+msgstr "Pievienot darbību"
+
+#: classes/pref/prefs.php:17
+msgid "Old password cannot be blank."
+msgstr "Vecā parole nedrīkst būt tukša"
+
+#: classes/pref/prefs.php:22
+msgid "New password cannot be blank."
+msgstr "Jaunā parole nedrīkst būt tukša"
+
+#: classes/pref/prefs.php:27
+msgid "Entered passwords do not match."
+msgstr "Ievadītās paroles nav vienādas."
+
+#: classes/pref/prefs.php:37
+msgid "Function not supported by authentication module."
+msgstr "Funkiju neatbalsta autentifikācijas modulis."
+
+#: classes/pref/prefs.php:63
+msgid "The configuration was saved."
+msgstr "Iestatījumi ir saglabāti."
+
+#: classes/pref/prefs.php:77
+#, php-format
+msgid "Unknown option: %s"
+msgstr "Nezināma iespēja %s."
+
+#: classes/pref/prefs.php:91
+msgid "Your personal data has been saved."
+msgstr "Jūsu personīgie dati ir saglabāti."
+
+#: classes/pref/prefs.php:131
+msgid "Personal data / Authentication"
+msgstr "Personīgie dati/autentifikācija"
+
+#: classes/pref/prefs.php:151
+msgid "Personal data"
+msgstr "Personīgie dati"
+
+#: classes/pref/prefs.php:161
+msgid "Full name"
+msgstr "Vārds un uzvārds"
+
+#: classes/pref/prefs.php:165
+msgid "E-mail"
+msgstr "E-pasts"
+
+#: classes/pref/prefs.php:171
+msgid "Access level"
+msgstr "Pieejas līmenis"
+
+#: classes/pref/prefs.php:181
+msgid "Save data"
+msgstr "Saglabāt datus"
+
+#: classes/pref/prefs.php:203
+msgid "Your password is at default value, please change it."
+msgstr "Jums ir norādīta noklusētā parole, lūdzu nomainiet to."
+
+#: classes/pref/prefs.php:235
+msgid "Old password"
+msgstr "Vecā parole"
+
+#: classes/pref/prefs.php:238
+msgid "New password"
+msgstr "Jaunā parole"
+
+#: classes/pref/prefs.php:243
+msgid "Confirm password"
+msgstr "Apstipriniet paroli"
+
+#: classes/pref/prefs.php:253
+msgid "Change password"
+msgstr "Nomainīt paroli"
+
+#: classes/pref/prefs.php:259
+msgid "One time passwords / Authenticator"
+msgstr "Vienreizlietojamā parole/autentifikācija"
+
+#: classes/pref/prefs.php:288 classes/pref/prefs.php:339
+msgid "Enter your password"
+msgstr "Ievadiet savu paroli"
+
+#: classes/pref/prefs.php:299
+msgid "Disable OTP"
+msgstr "Atslēgt vienreizlietojamo paroli"
+
+#: classes/pref/prefs.php:305
+msgid ""
+"You will need a compatible Authenticator to use this. Changing your password "
+"would automatically disable OTP."
+msgstr ""
+"Lai to lietotu, jums būs nepieciešams savietojams autentifikators. Jūsu "
+"paroles maiņa automātiski atslēgs vienreizlietojamo paroli."
+
+#: classes/pref/prefs.php:307
+msgid "Scan the following code by the Authenticator application:"
+msgstr "Ar autentifikācijas moduli noskenējiet sekojošo kodu:"
+
+#: classes/pref/prefs.php:348
+msgid "I have scanned the code and would like to enable OTP"
+msgstr "Esmu noskenējis šo kodu un vēlos iespējot vienreizlietojamo paroli"
+
+#: classes/pref/prefs.php:356
+msgid "Enable OTP"
+msgstr "Iespējot vienreizlietojamo paroli"
+
+#: classes/pref/prefs.php:482
+msgid "Customize"
+msgstr "Pielāgot"
+
+#: classes/pref/prefs.php:501 classes/pref/prefs.php:508
+#: classes/pref/prefs.php:513
+msgid "Yes"
+msgstr "Jā"
+
+#: classes/pref/prefs.php:503 classes/pref/prefs.php:513
+msgid "No"
+msgstr "Nē"
+
+#: classes/pref/prefs.php:543
+msgid "Register"
+msgstr "Reģistrēt"
+
+#: classes/pref/prefs.php:547
+msgid "Clear"
+msgstr "Attīrīt"
+
+#: classes/pref/prefs.php:553
+#, php-format
+msgid "Current server time: %s (UTC)"
+msgstr "Tekošā laika zona ir: %s (UTC)"
+
+#: classes/pref/prefs.php:582
+msgid "Save configuration"
+msgstr "Saglabāt iestatījumus"
+
+#: classes/pref/prefs.php:585
+msgid "Manage profiles"
+msgstr "Pārvaldīt profilus"
+
+#: classes/pref/prefs.php:588
+msgid "Reset to defaults"
+msgstr "Atstatīt uz noklusētajiem"
+
+#: classes/pref/prefs.php:600
+msgid "Show additional preferences"
+msgstr "Rādīt papildu iestatījumus"
+
+#: classes/pref/prefs.php:612 classes/pref/prefs.php:614
+msgid "Plugins"
+msgstr ""
+
+#: classes/pref/prefs.php:642
+msgid "System plugins"
+msgstr ""
+
+#: classes/pref/prefs.php:646 classes/pref/prefs.php:695
+msgid "Plugin"
+msgstr ""
+
+#: classes/pref/prefs.php:647 classes/pref/prefs.php:696
+msgid "Description"
+msgstr ""
+
+#: classes/pref/prefs.php:648 classes/pref/prefs.php:697
+msgid "Version"
+msgstr ""
+
+#: classes/pref/prefs.php:649 classes/pref/prefs.php:698
+msgid "Author"
+msgstr ""
+
+#: classes/pref/prefs.php:682 classes/pref/prefs.php:733
+#, fuzzy
+msgid "Clear data"
+msgstr "Dzēst barotņu datus"
+
+#: classes/pref/prefs.php:691
+msgid "User plugins"
+msgstr ""
+
+#: classes/pref/prefs.php:748
+#, fuzzy
+msgid "Enable selected plugins"
+msgstr "Iespējot barotņu kategorijas"
+
+#: classes/pref/prefs.php:803 classes/pref/prefs.php:821
+msgid "Incorrect password"
+msgstr "Nepareiza parole"
+
+#: classes/pref/feeds.php:12
+msgid "Check to enable field"
+msgstr "Iezīmējiet, lai iespējotu"
+
+#: classes/pref/feeds.php:58 classes/pref/feeds.php:175
+#: classes/pref/feeds.php:217 classes/pref/feeds.php:223
+#: classes/pref/feeds.php:248
+#, php-format
+msgid "(%d feeds)"
+msgstr "(%d barotnes)"
+
+#: classes/pref/feeds.php:494
+msgid "Feed Title"
+msgstr "Barotnes virsraksts"
+
+#: classes/pref/feeds.php:550 classes/pref/feeds.php:762
+msgid "Article purging:"
+msgstr "Dzēšu rakstu:"
+
+#: classes/pref/feeds.php:573
+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:589 classes/pref/feeds.php:791
+msgid "Hide from Popular feeds"
+msgstr "Nerādīt populārajās barotnēs"
+
+#: classes/pref/feeds.php:601 classes/pref/feeds.php:797
+msgid "Include in e-mail digest"
+msgstr "Iekļaut e-pasta īssavilkumu"
+
+#: classes/pref/feeds.php:614 classes/pref/feeds.php:803
+msgid "Always display image attachments"
+msgstr "Vienmēr rādīt attēlu pielikumus"
+
+#: classes/pref/feeds.php:628 classes/pref/feeds.php:811
+msgid "Cache images locally"
+msgstr "Kešot attēlus lokāli"
+
+#: classes/pref/feeds.php:640 classes/pref/feeds.php:817
+msgid "Mark updated articles as unread"
+msgstr "Atzīmēt atjaunotos rakstus kā nelasītus"
+
+#: classes/pref/feeds.php:646
+msgid "Icon"
+msgstr "Ikona"
+
+#: classes/pref/feeds.php:660
+msgid "Replace"
+msgstr "Aizvietot"
+
+#: classes/pref/feeds.php:679
+msgid "Resubscribe to push updates"
+msgstr "Pārpasūtīt atjaunojumu grūšanu"
+
+#: classes/pref/feeds.php:686
+msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
+msgstr ""
+"Atstata PubSubHubbub pasūtījumu statusu barotnēm ar iespējotu atjaunojumu "
+"grūšanu."
+
+#: classes/pref/feeds.php:701
+msgid "Enable the options you wish to apply using checkboxes on the right:"
+msgstr "Iespējojiet iespējas, iezīmējot izvēles rūtiņas labajā pusē:"
+
+#: classes/pref/feeds.php:1051 classes/pref/feeds.php:1104
+msgid "All done."
+msgstr "Viss izdarīts."
+
+#: classes/pref/feeds.php:1159
+msgid "Feeds with errors"
+msgstr "Barotnes ar kļūdām"
+
+#: classes/pref/feeds.php:1179
+msgid "Inactive feeds"
+msgstr "Neaktīvās barotnes"
+
+#: classes/pref/feeds.php:1216
+msgid "Edit selected feeds"
+msgstr "Rediģēt izvēlētās barotnes"
+
+#: classes/pref/feeds.php:1218 classes/pref/feeds.php:1232
+msgid "Reset sort order"
+msgstr "Atstatīt kārtošanas secību"
+
+#: classes/pref/feeds.php:1220 js/prefs.js:1778
+msgid "Batch subscribe"
+msgstr "Pasūtījuma pakotne"
+
+#: classes/pref/feeds.php:1225
+msgid "Categories"
+msgstr "Kategorijas"
+
+#: classes/pref/feeds.php:1228
+msgid "Add category"
+msgstr "Pievienot kategoriju"
+
+#: classes/pref/feeds.php:1230
+msgid "(Un)hide empty categories"
+msgstr "(Ne)slēpt tukšās kategorijas"
+
+#: classes/pref/feeds.php:1234
+msgid "Remove selected"
+msgstr "Dzēst izvēlētās"
+
+#: classes/pref/feeds.php:1248
+msgid "More actions..."
+msgstr "Papildu iespējas..."
+
+#: classes/pref/feeds.php:1252
+msgid "Manual purge"
+msgstr "Manuāla dzēšana"
+
+#: classes/pref/feeds.php:1256
+msgid "Clear feed data"
+msgstr "Dzēst barotņu datus"
+
+#: classes/pref/feeds.php:1307
+msgid "OPML"
+msgstr "OPML"
+
+#: classes/pref/feeds.php:1309
+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:1311
+msgid "Only main settings profile can be migrated using OPML."
+msgstr "Izmantojot OPML var migrēt tikai galvenos iestatījumus."
+
+#: classes/pref/feeds.php:1324
+msgid "Import my OPML"
+msgstr "Importēt manu OPML"
+
+#: classes/pref/feeds.php:1328
+msgid "Filename:"
+msgstr "Faila nosaukums:"
+
+#: classes/pref/feeds.php:1330
+msgid "Include settings"
+msgstr "Iekļaut iestatījumus"
+
+#: classes/pref/feeds.php:1334
+msgid "Export OPML"
+msgstr "Eksportēt OPML"
+
+#: classes/pref/feeds.php:1338
+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:1340
+msgid ""
+"Published OPML does not include your Tiny Tiny RSS settings, feeds that "
+"require authentication or feeds hidden from Popular feeds."
+msgstr ""
+"Publicētajā OPML nav iekļauti: jūsu Tiny Tiny RSS iestatījumi, barotnes, "
+"kurās nepieciešams autentificēties un arī barotnes, kas ir paslēptas no "
+"populārajām barotnēm."
+
+#: classes/pref/feeds.php:1343
+msgid "Display published OPML URL"
+msgstr "Parādīt publicētā OPML URL"
+
+#: classes/pref/feeds.php:1353
+msgid "Firefox integration"
+msgstr "Firefox integrācija"
+
+#: classes/pref/feeds.php:1355
+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:1362
+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:1370
+msgid "Published & shared articles / Generated feeds"
+msgstr "Publicētie un kopīgotie raksti / sagatavotās barotnes"
+
+#: classes/pref/feeds.php:1372
+msgid "Published articles and generated feeds"
+msgstr "Publicētie raksti un sagatavotās barotnes"
+
+#: classes/pref/feeds.php:1374
+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:1380
+msgid "Display URL"
+msgstr "Parādīt URL"
+
+#: classes/pref/feeds.php:1383
+msgid "Clear all generated URLs"
+msgstr "Attīrīt visus ģenerētos URL"
+
+#: classes/pref/feeds.php:1385
+msgid "Articles shared by URL"
+msgstr "Raksti, kas kopīgoti ar URL"
+
+#: classes/pref/feeds.php:1387
+msgid "You can disable all articles shared by unique URLs here."
+msgstr "Jūs varat atcelt ar šo URL kopīgotos rakstus šeit."
+
+#: classes/pref/feeds.php:1390
+msgid "Unshare all articles"
+msgstr "Atcelt visu rakstu kopīgošanu"
+
+#: classes/pref/feeds.php:1468
+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:1505 classes/pref/feeds.php:1574
+msgid "Click to edit feed"
+msgstr "Klikšķiniet, lai rediģētu"
+
+#: classes/pref/feeds.php:1523 classes/pref/feeds.php:1594
+msgid "Unsubscribe from selected feeds"
+msgstr "Atcelt izvēlēto barotņu pasūtīšanu"
+
+#: classes/pref/feeds.php:1534
+msgid "These feeds have not been updated because of errors:"
+msgstr "Šīs barotnes netika atjaunotas sekojošu kļūdu dēļ:"
+
+#: plugins/pocket/init.php:30
+msgid "Pocket"
+msgstr "Kabata"
+
+#: plugins/digest/digest_body.php:39
+msgid ""
+"Your browser doesn't support Javascript, which is required\n"
+"\t\t\tfor this application to function properly. Please check your\n"
+"\t\t\tbrowser settings."
+msgstr ""
+"Jūsu pārlūkprogramma neatbalsta Javascript, kas ir nepieciešams\n"
+"\t\t\tlai šī programma strādātu pareizi. Lūdzu pārbaudiet savas\n"
+"\t\t\tpārlūkprogrammas iestatījumus."
+
+#: plugins/digest/digest_body.php:51
+msgid "Back to feeds"
+msgstr "Atpakaļ uz barotnēm"
+
+#: plugins/digest/digest_body.php:56
+msgid "Hello,"
+msgstr "Sveicināti,"
+
+#: plugins/digest/digest_body.php:62
+msgid "Regular version"
+msgstr "Regulārā versija"
+
+#: plugins/nsfw/init.php:32 plugins/nsfw/init.php:43
+msgid "Not work safe (click to toggle)"
+msgstr ""
+
+#: plugins/nsfw/init.php:53
+msgid "NSFW Plugin"
+msgstr ""
+
+#: plugins/nsfw/init.php:80
+msgid "Tags to consider NSFW (comma-separated)"
+msgstr ""
+
+#: plugins/nsfw/init.php:101
+#, fuzzy
+msgid "Configuration saved."
+msgstr "Iestatījumi ir saglabāti."
+
+#: plugins/pinterest/init.php:29
+msgid "Pinterest"
+msgstr "Pinterest"
+
+#: plugins/auth_internal/init.php:62
+msgid "Please enter your one time password:"
+msgstr "Lūdzu ievadiet vienreizlietojamo paroli:"
+
+#: plugins/auth_internal/init.php:185
+msgid "Password has been changed."
+msgstr "Parole ir nomainīta."
+
+#: plugins/auth_internal/init.php:187
+msgid "Old password is incorrect."
+msgstr "Vecā parole nav pareiza."
+
+#: plugins/bookmarklets/init.php:22
+msgid "Bookmarklets"
+msgstr "Grāmatzīmes"
+
+#: plugins/bookmarklets/init.php:24
+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 ""
+"Velciet zemāk minēto saiti uz jūsu pārlūkprogrammas rīku joslu, tad atveriet "
+"jūs interesējošo saiti un klikšķiniet uz tās, lai pasūtītu tās jaunumus"
+
+#: plugins/bookmarklets/init.php:28
+#, php-format
+msgid "Subscribe to %s in Tiny Tiny RSS?"
+msgstr "Pasūtīt %s Tiny Tiny RSS?"
+
+#: plugins/bookmarklets/init.php:32
+msgid "Subscribe in Tiny Tiny RSS"
+msgstr "Pasūtīt Tiny Tiny RSS"
+
+#: plugins/bookmarklets/init.php:34
+msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
+msgstr "Izmantojiet grāmatzīmes lai publicētu izvēlētās lapas Tiny Tiny RSS"
+
+#: plugins/import_export/init.php:64
+msgid "Import and export"
+msgstr "Imports un eksports"
+
+#: plugins/import_export/init.php:66
+msgid "Article archive"
+msgstr "Raksta arhīvs"
+
+#: plugins/import_export/init.php:68
+msgid ""
+"You can export and import your Starred and Archived articles for safekeeping "
+"or when migrating between tt-rss instances."
+msgstr ""
+"Jūs varat eksportēt un importēt jūsu zvaigžņotos un arhivētos rakstus, lai "
+"saglabātu tos pārejot uz citu tt-rss instanci."
+
+#: plugins/import_export/init.php:71
+msgid "Export my data"
+msgstr "Eksportēt manus datus"
+
+#: plugins/import_export/init.php:87
+msgid "Import"
+msgstr "Imports"
+
+#: plugins/import_export/init.php:221
+msgid "Could not import: incorrect schema version."
+msgstr "Neizdevās importēt: nepareiza shēmas versija."
+
+#: plugins/import_export/init.php:226
+msgid "Could not import: unrecognized document format."
+msgstr "Neizdevās importēt: neatpazīts dokumenta formāts."
+
+#: plugins/import_export/init.php:385
+#, php-format
+msgid "Finished: %d articles processed, %d imported, %d feeds created."
+msgstr "Pabeigts: %d apstrādāti raksti, %d importēti, %d izveidotas barotnes."
+
+#: plugins/import_export/init.php:391
+msgid "Could not load XML document."
+msgstr "Neizdevās ielādēt XML dokumentu."
+
+#: plugins/import_export/init.php:403
+msgid "Prepare data"
+msgstr "Sagatavo datus"
+
+#: plugins/import_export/init.php:424
+#, php-format
+msgid ""
+"Could not upload file. You might need to adjust upload_max_filesize\n"
+"\t\t\t\tin PHP.ini (current value = %s)"
+msgstr ""
+"Neizdevās augšuplādēt failu. Iespējams, jums ir jāpielāgo "
+"upload_max_filesize iestatījums\n"
+"\t\t\t\tPHP.ini failā (tekošā vērtība = %s)"
+
+#: plugins/mail/init.php:72 plugins/mail/init.php:78
+msgid "[Forwarded]"
+msgstr "[Pārsūtīts]"
+
+#: plugins/mail/init.php:72
+msgid "Multiple articles"
+msgstr "Vairāki raksti"
+
+#: plugins/mail/init.php:93
+msgid "From:"
+msgstr "No:"
+
+#: plugins/mail/init.php:102
+msgid "To:"
+msgstr "Uz:"
+
+#: plugins/mail/init.php:115
+msgid "Subject:"
+msgstr "Temats:"
+
+#: plugins/mail/init.php:131
+msgid "Send e-mail"
+msgstr "Nosūtīt e-pastu"
+
+#: plugins/note/init.php:28 plugins/note/note.js:11
+msgid "Edit article note"
+msgstr "Rediģēt raksta piezīmes"
+
+#: plugins/example/init.php:38
+msgid "Example Pane"
+msgstr "Piemēra panelis"
+
+#: plugins/example/init.php:69
+msgid "Sample value"
+msgstr "Piemēra vērtība"
+
+#: plugins/example/init.php:75
+msgid "Set value"
+msgstr "Iestatīt vērtību"
+
+#: plugins/identica/init.php:29
+msgid "Share on identi.ca"
+msgstr "Kopīgot identi.ca"
+
+#: plugins/owncloud/init.php:35
+msgid "Owncloud"
+msgstr ""
+
+#: plugins/owncloud/init.php:59
+msgid "Owncloud url"
+msgstr ""
+
+#: plugins/owncloud/init.php:74
+msgid "Bookmark on OwnCloud "
+msgstr ""
+
+#: plugins/instances/init.php:144
+msgid "Linked"
+msgstr "Saistīts"
+
+#: plugins/instances/init.php:295
+msgid "Link instance"
+msgstr "Saites instance"
+
+#: plugins/instances/init.php:307
+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 ""
+"Jūs varat pievienot kopīgot populārās barotnes un pieslēgt tai citas Tiny "
+"Tiny RSS instances. Pievienoties šai Tiny Tiny RSS instancei var, izmantojot "
+"šo saiti:"
+
+#: plugins/instances/init.php:317
+msgid "Last connected"
+msgstr "Pēdējo reizi pieteicies"
+
+#: plugins/instances/init.php:318
+msgid "Status"
+msgstr "Statuss"
+
+#: plugins/instances/init.php:319
+msgid "Stored feeds"
+msgstr "Saglabātās barotnes"
+
+#: plugins/share/init.php:27
+msgid "Share by URL"
+msgstr "Kopīgot ar URL"
+
+#: plugins/share/init.php:49
+msgid "You can share this article by the following unique URL:"
+msgstr "Jūs varat kopīgot šo rakstu ar sekojošu unikālu URL:"
+
+#: plugins/flattr/init.php:30
+#, fuzzy
+msgid "Flattr this article."
+msgstr "Flattr raksts"
+
+#: plugins/googleplus/init.php:29
+msgid "Share on Google+"
+msgstr "Kopīgot Google+"
+
+#: plugins/updater/init.php:294 plugins/updater/init.php:306
+#: plugins/updater/updater.js:10
+msgid "Update Tiny Tiny RSS"
+msgstr "Atjaunot Tiny Tiny RSS"
+
+#: plugins/updater/init.php:309
+msgid "Your Tiny Tiny RSS installation is up to date."
+msgstr "Jūsu Tiny Tiny RSS ir aktuāls."
+
+#: plugins/updater/init.php:319
+msgid ""
+"Do not close this dialog until updating is finished. Backup your tt-rss "
+"directory before continuing."
+msgstr ""
+"Lūdzu neaizveriet logu līdz ir pabeigta atjaunošana. Pirms turpināt, "
+"izveidojiet jūsu tt-rss mapes rezerves kopiju."
+
+#: plugins/updater/init.php:322
+msgid "Ready to update."
+msgstr "Gatavs atjaunošanai."
+
+#: plugins/updater/init.php:327
+msgid "Start update"
+msgstr "Sākt atjaunošanu"
+
+#: plugins/tweet/init.php:29
+#, fuzzy
+msgid "Share on Twitter"
+msgstr "Kopīgot identi.ca"
+
+#: js/feedlist.js:218
+msgid "New articles available in this feed (click to show)"
+msgstr "Šajā barotnē pieejami jauni raksti (klikšķiniet, lai parādītu)"
+
+#: js/feedlist.js:420 js/feedlist.js:435 plugins/digest/digest.js:25
+msgid "Mark all articles in %s as read?"
+msgstr "Vai atzīmēt visus rakstus %s kā lasītus?"
+
+#: js/functions.js:91
+msgid ""
+"Are you sure to report this exception to tt-rss.org? The report will include "
+"your browser information. Your IP would be saved in the database."
+msgstr ""
+"Vai tiešām vēlaties ziņot par šo izņēmumu tt-rss.org? Ziņojumā tiks iekļauta "
+"informācija par jūsu pārlūkprogrammu, un jūsu IP adrese tiks saglabāta datu "
+"bāzē."
+
+#: js/functions.js:627
+msgid "Date syntax appears to be correct:"
+msgstr "Datuma sintakse ir pareiza:"
+
+#: js/functions.js:630
+msgid "Date syntax is incorrect."
+msgstr "Datuma sintakse ir nepareiza."
+
+#: js/functions.js:757
+msgid "Remove stored feed icon?"
+msgstr "Dzēst saglabāto barotnes ikonu?"
+
+#: js/functions.js:789
+msgid "Please select an image file to upload."
+msgstr "Lūdzu norādiet augšuplādējamo attēla failu."
+
+#: js/functions.js:791
+msgid "Upload new icon for this feed?"
+msgstr "Augšuplādēt šai barotnei jaunu ikonu?"
+
+#: js/functions.js:808
+msgid "Please enter label caption:"
+msgstr "Lūdzu ievadiet etiķetes uzrakstu:"
+
+#: js/functions.js:813
+msgid "Can't create label: missing caption."
+msgstr "Neizdevās izveidot etiķeti: nav uzraksta."
+
+#: js/functions.js:856
+msgid "Subscribe to Feed"
+msgstr "Pasūtīt barotni"
+
+#: js/functions.js:883
+msgid "Subscribed to %s"
+msgstr "Pasūtīta barotne %s"
+
+#: js/functions.js:888
+msgid "Specified URL seems to be invalid."
+msgstr "Norādītais URL ir nepareizs."
+
+#: js/functions.js:891
+msgid "Specified URL doesn't seem to contain any feeds."
+msgstr "Norādītajā URL nav nevienas barotnes."
+
+#: js/functions.js:944
+msgid "Couldn't download the specified URL: %s"
+msgstr "Neizdevās lejuplādēt norādīto URL: %s"
+
+#: js/functions.js:948
+msgid "You are already subscribed to this feed."
+msgstr "Jūs jau esat pasūtījis šo barotni."
+
+#: js/functions.js:1078
+msgid "Edit rule"
+msgstr "Rediģēt likumu"
+
+#: js/functions.js:1104
+msgid "Edit action"
+msgstr "Rediģēt darbību"
+
+#: js/functions.js:1141
+msgid "Create Filter"
+msgstr "Izveidot filtru"
+
+#: js/functions.js:1245
+msgid ""
+"Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
+"hub again on next feed update."
+msgstr ""
+"Atstatīt pasūtīšanu? Tiny Tiny RSS mēģinās savākt informāciju no šīs "
+"barotnes kārtējā atjaunojuma laikā."
+
+#: js/functions.js:1266 js/tt-rss.js:367
+msgid "Unsubscribe from %s?"
+msgstr "Atteikt pasūtījumu %s?"
+
+#: js/functions.js:1375
+msgid "Please enter category title:"
+msgstr "Lūdzu ievadiet kategorijas virsrakstu:"
+
+#: js/functions.js:1406
+msgid "Generate new syndication address for this feed?"
+msgstr "Izveidot jaunu šīs barotnes sindikācijas adresi?"
+
+#: js/functions.js:1597 js/tt-rss.js:348 js/tt-rss.js:713
+msgid "You can't edit this kind of feed."
+msgstr "Jūs nevarat rediģēt šāda veida barotni."
+
+#: js/functions.js:1612
+msgid "Edit Feed"
+msgstr "Rediģēt barotni"
+
+#: js/functions.js:1650
+msgid "More Feeds"
+msgstr "Vairāk barotnes"
+
+#: js/functions.js:1711 js/functions.js:1821 js/prefs.js:397 js/prefs.js:427
+#: js/prefs.js:459 js/prefs.js:642 js/prefs.js:662 js/prefs.js:1203
+#: js/prefs.js:1348
+msgid "No feeds are selected."
+msgstr "Nav izvēlēta barotne"
+
+#: js/functions.js:1753
+msgid ""
+"Remove selected feeds from the archive? Feeds with stored articles will not "
+"be removed."
+msgstr ""
+"Dzēst izvēlētās barotnes no arhīva? Barotnes, kurās ir raksti, netiks "
+"dzēstas."
+
+#: js/functions.js:1792
+msgid "Feeds with update errors"
+msgstr "Barotnes ar atjaunošanas kļūdām"
+
+#: js/functions.js:1803 js/prefs.js:1185
+msgid "Remove selected feeds?"
+msgstr "Dzēst izvēlētās barotnes?"
+
+#: js/functions.js:1904
+msgid "Help"
+msgstr "Palīdzība"
+
+#: js/PrefFeedTree.js:47
+msgid "Edit category"
+msgstr "Rediģēt kategoriju"
+
+#: js/PrefFeedTree.js:54
+msgid "Remove category"
+msgstr "Dzēst kategoriju"
+
+#: js/PrefFilterTree.js:32
+msgid "Inverse"
+msgstr "Apgriezt"
+
+#: js/prefs.js:55
+msgid "Please enter login:"
+msgstr "Lūdzu ievadiet pieteikšanās vārdu:"
+
+#: js/prefs.js:62
+msgid "Can't create user: no login specified."
+msgstr "Neizdevās izveidot lietotāju: netika norādīts pieteikšanās vārds."
+
+#: js/prefs.js:117
+msgid "Edit Filter"
+msgstr "Rediģēt filtru"
+
+#: js/prefs.js:164
+msgid "Remove filter?"
+msgstr "Dzēst filtru?"
+
+#: js/prefs.js:279
+msgid "Remove selected labels?"
+msgstr "Dzēst izvēlētās etiķetes?"
+
+#: js/prefs.js:295 js/prefs.js:1389
+msgid "No labels are selected."
+msgstr "Nav izvēlēta etiķete."
+
+#: js/prefs.js:309
+msgid ""
+"Remove selected users? Neither default admin nor your account will be "
+"removed."
+msgstr ""
+"Dzēst izvēlētos lietotājus? Netiks dzēsts ne jūsu konts, ne arī noklusētais "
+"administratora konts."
+
+#: js/prefs.js:326 js/prefs.js:507 js/prefs.js:528 js/prefs.js:567
+msgid "No users are selected."
+msgstr "Nav izvēlēts lietotājs."
+
+#: js/prefs.js:344
+msgid "Remove selected filters?"
+msgstr "Dzēst izvēlētos filtrus?"
+
+#: js/prefs.js:359 js/prefs.js:597 js/prefs.js:616
+msgid "No filters are selected."
+msgstr "Nav izvēlēts filtrs."
+
+#: js/prefs.js:378
+msgid "Unsubscribe from selected feeds?"
+msgstr "Atteikties no izvēlētajām barotnēm?"
+
+#: js/prefs.js:412
+msgid "Please select only one feed."
+msgstr "Lūdzu norādiet tikai vienu barotni."
+
+#: js/prefs.js:418
+msgid "Erase all non-starred articles in selected feed?"
+msgstr "Dzēst visus nezvaigžņotos rakstus norādītajā barotnē?"
+
+#: js/prefs.js:440
+msgid "How many days of articles to keep (0 - use default)?"
+msgstr "Cik dienas saglabāt rakstus (0 – noklusētais laiks)?"
+
+#: js/prefs.js:478
+msgid "Login field cannot be blank."
+msgstr "Pieteikšanās lauks nevar būt tukšs."
+
+#: js/prefs.js:512 js/prefs.js:533 js/prefs.js:572
+msgid "Please select only one user."
+msgstr "Lūdzu izvēlieties tikai vienu lietotāju."
+
+#: js/prefs.js:537
+msgid "Reset password of selected user?"
+msgstr "Atstatīt izvēlētā lietotāja paroli?"
+
+#: js/prefs.js:602
+msgid "Please select only one filter."
+msgstr "Lūdzu izvēlieties tikai vienu filtru."
+
+#: js/prefs.js:620
+msgid "Combine selected filters?"
+msgstr "Apvienot izvēlētos filtrus?"
+
+#: js/prefs.js:684
+msgid "Edit Multiple Feeds"
+msgstr "Rediģēt vairākus filtrus"
+
+#: js/prefs.js:708
+msgid "Save changes to selected feeds?"
+msgstr "Saglabāt izvēlēto barotņu izmaiņas?"
+
+#: js/prefs.js:790
+msgid "OPML Import"
+msgstr "OPML imports"
+
+#: js/prefs.js:817
+msgid "Please choose an OPML file first."
+msgstr "Lūdzu vispirms norādiet OPML failu."
+
+#: js/prefs.js:973
+msgid "Reset to defaults?"
+msgstr "Atsatīt uz noklusēto?"
+
+#: js/prefs.js:1092
+msgid ""
+"Remove category %s? Any nested feeds would be placed into Uncategorized."
+msgstr ""
+"Dzēst kategoriju %s? Visas iekļautās barotnes tiks pārvietotas uz "
+"Nekategorizēts kategoriju."
+
+#: js/prefs.js:1119
+msgid "Remove selected categories?"
+msgstr "Dzēst izvēlētās kategorijas?"
+
+#: js/prefs.js:1135
+msgid "No categories are selected."
+msgstr "Nav izvēlēta kategorija."
+
+#: js/prefs.js:1143
+msgid "Category title:"
+msgstr "Kategorijas virsraksts:"
+
+#: js/prefs.js:1174
+msgid "Feeds without recent updates"
+msgstr "Barotnes bez neseniem jaunumiem"
+
+#: js/prefs.js:1223
+msgid "Replace current OPML publishing address with a new one?"
+msgstr "Aizvietot esošo OPML publicēto adresi ar jauno vērtību?"
+
+#: js/prefs.js:1332
+msgid "Rescore articles in selected feeds?"
+msgstr "Atjaunot rakstus izvēlētajās barotnēs?"
+
+#: js/prefs.js:1355
+msgid "Rescore all articles? This operation may take a lot of time."
+msgstr "Pārvērtēt visus rakstus? Tas var prasīt ilgu laiku."
+
+#: js/prefs.js:1375
+msgid "Reset selected labels to default colors?"
+msgstr "Atstatīt iezīmētās etiķetes uz noklusētajām krāsām?"
+
+#: js/prefs.js:1412
+msgid "Settings Profiles"
+msgstr "Profilu iestatījumi"
+
+#: js/prefs.js:1421
+msgid ""
+"Remove selected profiles? Active and default profiles will not be removed."
+msgstr "Dzēst izvēlētos profilus? Aktīvie un noklusētie profili netiks dzēsti."
+
+#: js/prefs.js:1439
+msgid "No profiles are selected."
+msgstr "Nav izvēlēts profils."
+
+#: js/prefs.js:1447 js/prefs.js:1500
+msgid "Activate selected profile?"
+msgstr "Aktivizēt izvēlēto profilu?"
+
+#: js/prefs.js:1463 js/prefs.js:1516
+msgid "Please choose a profile to activate."
+msgstr "Lūdzu norādiet aktivizējamo profilu."
+
+#: js/prefs.js:1524
+msgid "This will invalidate all previously generated feed URLs. Continue?"
+msgstr "Tas padarīs nederīgus visu iepriekš izveidoto barotņu URLus. Turpināt?"
+
+#: js/prefs.js:1543
+msgid "This will invalidate all previously shared article URLs. Continue?"
+msgstr ""
+"Tas padarīs nederīgus visu iepriekš izveidoto kopīgoto rakstu URLus. "
+"Turpināt?"
+
+#: js/prefs.js:1641
+msgid "Label Editor"
+msgstr "Etiķešu redaktors"
+
+#: js/prefs.js:1704
+msgid ""
+"This will clear your stored authentication information for Twitter. Continue?"
+msgstr "Tas izdēsīs jūsu Twitter autentifikācijas informāciju. Turpināt?"
+
+#: js/prefs.js:1784
+msgid "Subscribing to feeds..."
+msgstr "Barotņu pasūtīšana"
+
+#: js/prefs.js:1821
+msgid "Clear stored data for this plugin?"
+msgstr "Attīrīt šī spraudņa saglabātos datus?"
+
+#: js/tt-rss.js:120
+msgid "Mark all articles as read?"
+msgstr "Vai atzīmēt visus rakstus kā lasītus?"
+
+#: js/tt-rss.js:356
+msgid "You can't unsubscribe from the category."
+msgstr "Jūs nevarat atteikties no kategorijas."
+
+#: js/tt-rss.js:361 js/tt-rss.js:511
+msgid "Please select some feed first."
+msgstr "Lūdzu, vispirms norādiet barotni."
+
+#: js/tt-rss.js:506
+msgid "You can't rescore this kind of feed."
+msgstr "Jūs nevarat pārvērtēt šī veida barotni."
+
+#: js/tt-rss.js:516
+msgid "Rescore articles in %s?"
+msgstr "Pārvērtēt rakstus %s?"
+
+#: js/tt-rss.js:672
+msgid "Please enable mail plugin first."
+msgstr "Lūdzu, vispirmi iespējojiet e-pasta spraudni."
+
+#: js/tt-rss.js:834
+msgid "New version available!"
+msgstr "Ir pieejama jauna versija!"
+
+#: js/viewfeed.js:104
+msgid "Cancel search"
+msgstr "Atcelt meklēšanu"
+
+#: js/viewfeed.js:435 plugins/digest/digest.js:257
+#: plugins/digest/digest.js:696
+msgid "Unstar article"
+msgstr "Atzvaigžņot rakstu"
+
+#: js/viewfeed.js:440 plugins/digest/digest.js:259
+#: plugins/digest/digest.js:700
+msgid "Star article"
+msgstr "Zvaigžņot rakstu"
+
+#: js/viewfeed.js:473 plugins/digest/digest.js:262
+#: plugins/digest/digest.js:731
+msgid "Unpublish article"
+msgstr "Atpublicēt rakstu"
+
+#: js/viewfeed.js:674 js/viewfeed.js:702 js/viewfeed.js:729 js/viewfeed.js:791
+#: js/viewfeed.js:823 js/viewfeed.js:960 js/viewfeed.js:1003
+#: js/viewfeed.js:1053 js/viewfeed.js:1927 plugins/mail/mail.js:7
+msgid "No articles are selected."
+msgstr "Nav norādīts raksts."
+
+#: js/viewfeed.js:940
+msgid "Mark all visible articles in %s as read?"
+msgstr "Vai atzīmēt redzamos rakstus %s kā lasītus?"
+
+#: js/viewfeed.js:968
+msgid "Delete %d selected articles in %s?"
+msgstr "Dzēst %d izvēlētos rakstus %s?"
+
+#: js/viewfeed.js:970
+msgid "Delete %d selected articles?"
+msgstr "Dzēst %d izvēlētos rakstus?"
+
+#: js/viewfeed.js:1012
+msgid "Archive %d selected articles in %s?"
+msgstr "Arhivēt %d izvēlētos rakstus %s?"
+
+#: js/viewfeed.js:1015
+msgid "Move %d archived articles back?"
+msgstr "Pārvietot %d arhivētos rakstus atpakaļ?"
+
+#: js/viewfeed.js:1059
+msgid "Mark %d selected articles in %s as read?"
+msgstr "Atzīmēt %d izvēlētos rakstus %s kā lasītus?"
+
+#: js/viewfeed.js:1083
+msgid "Edit article Tags"
+msgstr "Rediģēt rakstu iezīmes"
+
+#: js/viewfeed.js:1252
+msgid "No article is selected."
+msgstr "Nav izvēlēts raksts."
+
+#: js/viewfeed.js:1287
+msgid "No articles found to mark"
+msgstr "Nav atrasti iezīmējamie raksti"
+
+#: js/viewfeed.js:1289
+msgid "Mark %d article(s) as read?"
+msgstr "Iezīmēt %d rakstus kā lasītus?"
+
+#: js/viewfeed.js:1744
+msgid "Open original article"
+msgstr "Atvērt sākotnējo rakstu"
+
+#: js/viewfeed.js:1814
+msgid "Remove label"
+msgstr "Dzēst etiķeti"
+
+#: js/viewfeed.js:1838
+msgid "Playing..."
+msgstr "Atskaņo..."
+
+#: js/viewfeed.js:1839
+msgid "Click to pause"
+msgstr "Klikšķiniet, lai apturētu"
+
+#: js/viewfeed.js:1896
+msgid "Please enter new score for selected articles:"
+msgstr "Ievadiet jauno vērtējumu izvēlētajiem rakstiem:"
+
+#: js/viewfeed.js:1938
+msgid "Please enter new score for this article:"
+msgstr "Ievadiet jaunu vērtējumu šim rakstam:"
+
+#: plugins/digest/digest.js:71
+#, fuzzy
+msgid "Mark %d displayed articles as read?"
+msgstr "Iezīmēt %d rakstus kā lasītus?"
+
+#: plugins/digest/digest.js:289
+#, fuzzy
+msgid "Error: unable to load article."
+msgstr "Kļūda: lūdzu augšuplādējiet OPML failu."
+
+#: plugins/digest/digest.js:447
+#, fuzzy
+msgid "Click to expand article."
+msgstr "Iezīmēt nelasītos rakstus"
+
+#: plugins/digest/digest.js:518
+msgid "%d more..."
+msgstr ""
+
+#: plugins/digest/digest.js:525
+#, fuzzy
+msgid "No unread feeds."
+msgstr "Saglabātās barotnes"
+
+#: plugins/digest/digest.js:632
+#, fuzzy
+msgid "Load more..."
+msgstr "Ielādē..."
+
+#: plugins/import_export/import_export.js:13
+msgid "Export Data"
+msgstr "Eksportēt datus"
+
+#: plugins/import_export/import_export.js:40
+msgid ""
+"Finished, exported %d articles. You can download the data <a "
+"class='visibleLink' href='%u'>here</a>."
+msgstr ""
+"Pabeigts. Eksportēti %d raksti. Jūs varat lejuplādēt datus <a "
+"class='visibleLink' href='%u'>šeit</a>."
+
+#: plugins/import_export/import_export.js:93
+msgid "Data Import"
+msgstr "Datu imports"
+
+#: plugins/import_export/import_export.js:112
+msgid "Please choose the file first."
+msgstr "Lūdzu vispirms norādiet failu."
+
+#: plugins/mail/mail.js:21
+#, fuzzy
+msgid "Forward article by email"
+msgstr "Pārsūtīt e-pastā"
+
+#: plugins/instances/instances.js:10
+#, fuzzy
+msgid "Link Instance"
+msgstr "Saites instance"
+
+#: plugins/instances/instances.js:73
+#, fuzzy
+msgid "Edit Instance"
+msgstr "Instance"
+
+#: plugins/instances/instances.js:122
+#, fuzzy
+msgid "Remove selected instances?"
+msgstr "Dzēst izvēlētos filtrus?"
+
+#: plugins/instances/instances.js:139 plugins/instances/instances.js:151
+#, fuzzy
+msgid "No instances are selected."
+msgstr "Nav izvēlēts filtrs."
+
+#: plugins/instances/instances.js:156
+#, fuzzy
+msgid "Please select only one instance."
+msgstr "Lūdzu izvēlieties tikai vienu filtru."
+
+#: plugins/share/share.js:10
+#, fuzzy
+msgid "Share article by URL"
+msgstr "Kopīgot ar URL"
+
+#: plugins/updater/updater.js:58
+#, fuzzy
+msgid ""
+"Live updating is considered experimental. Backup your tt-rss directory "
+"before continuing. Please type 'yes' to continue."
+msgstr ""
+"Lūdzu neaizveriet logu līdz ir pabeigta atjaunošana. Pirms turpināt, "
+"izveidojiet jūsu tt-rss mapes rezerves kopiju."
+
+#~ msgid "Comments?"
+#~ msgstr "Komentāri?"
+
+#~ msgid "News"
+#~ msgstr "Jaunumi"
+
+#~ msgid "Move between feeds"
+#~ msgstr "Pārvietoties starp barotnēm"
+
+#~ msgid "Move between articles"
+#~ msgstr "Pārvietoties starp rakstiem"
+
+#~ msgid "Active article actions"
+#~ msgstr "Aktīvā raksta darbības"
+
+#~ msgid "Mark articles below/above active one as read"
+#~ msgstr "Atzīmēt rakstus virs/zem aktīvā kā lasītus"
+
+#~ msgid "Scroll article content"
+#~ msgstr "Pārtīt raksta saturu"
+
+#~ msgid "Other actions"
+#~ msgstr "Citas darbības"
+
+#~ msgid "Display this help dialog"
+#~ msgstr "Parādīt palīdzības logu"
+
+#~ msgid "Multiple articles actions"
+#~ msgstr "Vairāku rakstu darbības"
+
+#~ msgid "Select starred articles"
+#~ msgstr "Iezīmēt zvaigžņotos rakstus"
+
+#~ msgid "Feed actions"
+#~ msgstr "Barotnes darbības"
+
+#~ msgid "Mark feed as read"
+#~ msgstr "Atzīmēt barotni kā lasītu"
+
+#~ msgid "If viewing category, (un)collapse it"
+#~ msgstr "Skatot kategoriju (at/sa)kļaut to"
+
+#~ msgid "Press any key to close this window."
+#~ msgstr "Spiediet jebkuru taustiņu, lai aizvērtu logu"
+
+#~ msgid "My Feeds"
+#~ msgstr "Manas barotnes"
+
+#~ msgid "Panel actions"
+#~ msgstr "Paneļa darbības"
+
+#~ msgid "Top 25 feeds"
+#~ msgstr "25 barotņu tops"
+
+#~ msgid "Edit feed categories"
+#~ msgstr "Rediģēt barotņu kategorijas"
+
+#~ msgid "Focus search (if present)"
+#~ msgstr "Fokusēt meklēšanu (ja ir)"
+
+#~ msgid ""
+#~ "<b>Note:</b> not all actions may be available, depending on Tiny Tiny RSS "
+#~ "configuration and your access level."
+#~ msgstr ""
+#~ "<b>Piezīme:</b> iespējams, ka visas darbības nav pieejamas, atkarībā no "
+#~ "Tiny Tiny RSS iestatījumiem un jūsu pieejas tiesībām."
+
+#~ msgid "Fatal: authentication module %s not found."
+#~ msgstr "Fatāla kļūda: netika atrasts autentifikācijas modulis %s."
+
+#~ msgid "Open article in new tab"
+#~ msgstr "Atvērt jaunā cilnē"
+
+#~ msgid "Select theme"
+#~ msgstr "Izvēlieties tēmu"
+
+#~ msgid "Right-to-left content"
+#~ msgstr "Saturs no labās uz kreiso pusi"
+
+#~ msgid "Cache content locally"
+#~ msgstr "Kešot attēlus lokāli"
+
+#~ msgid "Mark posts as updated on content change"
+#~ msgstr "Atzīmēt rakstus ar mainītu saturu kā nelasītus"
+
+#~ msgid "Loading..."
+#~ msgstr "Ielādē..."
+
+#~ msgid "View in a tt-rss tab"
+#~ msgstr "Skatīt tt-rss cilnē"
diff --git a/locale/nb_NO/LC_MESSAGES/messages.mo b/locale/nb_NO/LC_MESSAGES/messages.mo
index 5c4544827..2417da55f 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 9529167c5..743852ea1 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: 2013-03-17 19:37+0400\n"
+"POT-Creation-Date: 2013-03-19 10:14+0400\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"
@@ -16,79 +16,79 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backend.php:67
+#: backend.php:71
 msgid "Use default"
 msgstr "Bruk standard"
 
-#: backend.php:68
+#: backend.php:72
 msgid "Never purge"
 msgstr "Slett aldri"
 
-#: backend.php:69
+#: backend.php:73
 msgid "1 week old"
 msgstr "1 uke gammel"
 
-#: backend.php:70
+#: backend.php:74
 msgid "2 weeks old"
 msgstr "2 uker gammel"
 
-#: backend.php:71
+#: backend.php:75
 msgid "1 month old"
 msgstr "1 måned gammel"
 
-#: backend.php:72
+#: backend.php:76
 msgid "2 months old"
 msgstr "2 måneder gammel"
 
-#: backend.php:73
+#: backend.php:77
 msgid "3 months old"
 msgstr "3 måneder gammel"
 
-#: backend.php:76
+#: backend.php:80
 msgid "Default interval"
 msgstr "Standard intervall:"
 
-#: backend.php:77 backend.php:87
+#: backend.php:81 backend.php:91
 msgid "Disable updates"
 msgstr "Slå av oppdateringer"
 
-#: backend.php:78 backend.php:88
+#: backend.php:82 backend.php:92
 msgid "Each 15 minutes"
 msgstr "Hvert 15. minutt"
 
-#: backend.php:79 backend.php:89
+#: backend.php:83 backend.php:93
 msgid "Each 30 minutes"
 msgstr "Hvert 30. minutt"
 
-#: backend.php:80 backend.php:90
+#: backend.php:84 backend.php:94
 msgid "Hourly"
 msgstr "På timen"
 
-#: backend.php:81 backend.php:91
+#: backend.php:85 backend.php:95
 msgid "Each 4 hours"
 msgstr "Hver 4. time"
 
-#: backend.php:82 backend.php:92
+#: backend.php:86 backend.php:96
 msgid "Each 12 hours"
 msgstr "Hver 12. time"
 
-#: backend.php:83 backend.php:93
+#: backend.php:87 backend.php:97
 msgid "Daily"
 msgstr "Daglig"
 
-#: backend.php:84 backend.php:94
+#: backend.php:88 backend.php:98
 msgid "Weekly"
 msgstr "Ukentlig"
 
-#: backend.php:97 classes/pref/users.php:139
+#: backend.php:101 classes/pref/users.php:139
 msgid "User"
 msgstr "Bruker"
 
-#: backend.php:98
+#: backend.php:102
 msgid "Power User"
 msgstr "Superbruker"
 
-#: backend.php:99
+#: backend.php:103
 msgid "Administrator"
 msgstr "Administrator"
 
@@ -119,7 +119,7 @@ msgstr "Tiny Tiny RSS-databasen er oppdatert"
 #: db-updater.php:94 db-updater.php:163 db-updater.php:176 register.php:194
 #: register.php:239 register.php:252 register.php:267 register.php:286
 #: register.php:371 register.php:381 register.php:393
-#: classes/handler/public.php:637 classes/handler/public.php:725
+#: classes/handler/public.php:611 classes/handler/public.php:699
 msgid "Return to Tiny Tiny RSS"
 msgstr "Returner til Tiny Tiny RSS"
 
@@ -257,199 +257,199 @@ msgid "SQL escaping test failed, check your database and PHP configuration"
 msgstr ""
 "SQL escaping testen feilen, sjekk database og PHP konfigurasjonene dine."
 
-#: index.php:108 index.php:150 index.php:236 prefs.php:86
-#: classes/backend.php:6 classes/pref/labels.php:296
-#: classes/pref/filters.php:602 classes/pref/feeds.php:1342
-#: plugins/digest/digest_body.php:45 js/viewfeed.js:1169 js/viewfeed.js:1158
-#: js/viewfeed.js:1164 js/viewfeed.js:1174
+#: index.php:117 index.php:147 index.php:252 prefs.php:79
+#: classes/backend.php:5 classes/pref/labels.php:296
+#: classes/pref/filters.php:609 classes/pref/feeds.php:1270
+#: plugins/digest/digest_body.php:45 js/viewfeed.js:1174
 msgid "Loading, please wait..."
 msgstr "laster, vennligst vent"
 
-#: index.php:118 plugins/digest/digest_body.php:56
-msgid "Hello,"
-msgstr "Hei, "
+#: index.php:127 index.php:198
+msgid "Communication problem with server."
+msgstr ""
 
-#: index.php:120 prefs.php:29 prefs.php:108 help/main.php:73 help/prefs.php:8
-#: classes/pref/prefs.php:371
-msgid "Preferences"
-msgstr "Innstillinger"
-
-#: index.php:124
-msgid "Comments?"
-msgstr "Kommentarer?"
-
-#: index.php:128 mobile/mobile-functions.php:69
-#: mobile/mobile-functions.php:244 plugins/digest/digest_body.php:59
-msgid "Logout"
-msgstr "Logg ut"
-
-#: index.php:134
+#: index.php:133 index.php:206
 msgid "New version of Tiny Tiny RSS is available!"
 msgstr "Ny versjon av Tiny Tiny Rss er tilgjengelig!"
 
-#: index.php:157
-msgid "News"
-msgstr ""
-
-#: index.php:166
+#: index.php:161
 msgid "Collapse feedlist"
 msgstr "Skjul nyhetskanalsslisten"
 
-#: index.php:169
+#: index.php:164
 #, fuzzy
 msgid "Show articles"
 msgstr "Lagrede artikler"
 
-#: index.php:172
+#: index.php:167
 msgid "Adaptive"
 msgstr "Tilpasset"
 
-#: index.php:173
+#: index.php:168
 msgid "All Articles"
 msgstr "Alle artikler"
 
-#: index.php:174 classes/feeds.php:106
+#: index.php:169 include/functions.php:1912 classes/feeds.php:106
 msgid "Starred"
 msgstr "Favoritter"
 
-#: index.php:175 classes/feeds.php:107
+#: index.php:170 include/functions.php:1913 classes/feeds.php:107
 msgid "Published"
 msgstr "Publisert"
 
-#: index.php:176 classes/feeds.php:93 classes/feeds.php:105
+#: index.php:171 classes/feeds.php:93 classes/feeds.php:105
 msgid "Unread"
 msgstr "Ulest"
 
-#: index.php:177
+#: index.php:172
 msgid "Ignore Scoring"
 msgstr "Ignorer poenggivning"
 
-#: index.php:178
+#: index.php:173
 msgid "Updated"
 msgstr "Oppdatert"
 
-#: index.php:181
+#: index.php:176
 #, fuzzy
 msgid "Sort articles"
 msgstr "Lagrede artikler"
 
-#: index.php:184 classes/pref/prefs.php:462
+#: index.php:179
 msgid "Default"
 msgstr "Standard"
 
-#: index.php:185
+#: index.php:180
 msgid "Date"
 msgstr "Dato"
 
-#: index.php:186 include/localized_schema.php:3
+#: index.php:181 include/localized_schema.php:3
 msgid "Title"
 msgstr "Tittel"
 
-#: index.php:187
+#: index.php:182
 msgid "Score"
 msgstr "Poeng"
 
-#: index.php:192 classes/pref/feeds.php:539 classes/pref/feeds.php:786
+#: index.php:187 classes/pref/feeds.php:535 classes/pref/feeds.php:746
 msgid "Update"
 msgstr "Oppdater"
 
-#: index.php:196 index.php:211 include/localized_schema.php:10
-#: classes/feeds.php:111 classes/feeds.php:127 js/FeedTree.js:128
-#: js/FeedTree.js:156 plugins/digest/digest.js:630
+#: index.php:191 index.php:221 include/functions.php:1903
+#: include/localized_schema.php:10 classes/feeds.php:111 classes/feeds.php:131
+#: js/FeedTree.js:128 js/FeedTree.js:156 plugins/digest/digest.js:630
 msgid "Mark as read"
 msgstr "Marker som lest"
 
-#: index.php:202 classes/feeds.php:101
+#: index.php:211
 msgid "Actions..."
 msgstr "Handlinger..."
 
-#: index.php:204
+#: index.php:213
+#, fuzzy
+msgid "Preferences..."
+msgstr "Innstillinger"
+
+#: index.php:214
 msgid "Search..."
 msgstr "Søk..."
 
-#: index.php:205
+#: index.php:215
 msgid "Feed actions:"
 msgstr "Nyhetsstrømshandlinger:"
 
-#: index.php:206 classes/handler/public.php:567
+#: index.php:216 classes/handler/public.php:541
 msgid "Subscribe to feed..."
 msgstr "Abonner på nyhetsstrøm..."
 
-#: index.php:207
+#: index.php:217
 msgid "Edit this feed..."
 msgstr "Rediger nyhetsstrømmen..."
 
-#: index.php:208
+#: index.php:218
 msgid "Rescore feed"
 msgstr "Sett poeng på nytt for nyhetskanalene"
 
-#: index.php:209 classes/pref/feeds.php:712 classes/pref/feeds.php:1315
+#: index.php:219 classes/pref/feeds.php:672 classes/pref/feeds.php:1243
 #: js/PrefFeedTree.js:73
 msgid "Unsubscribe"
 msgstr "Avabonner"
 
-#: index.php:210
+#: index.php:220
 msgid "All feeds:"
 msgstr "Alle nyhetsstrømmer:"
 
-#: index.php:212 help/main.php:56
+#: index.php:222
 msgid "(Un)hide read feeds"
 msgstr "Skjul/vis leste nyhetsstrømmer"
 
-#: index.php:213
+#: index.php:223
 msgid "Other actions:"
 msgstr "Andre handlinger:"
 
-#: index.php:215
+#: index.php:225
 msgid "Switch to digest..."
 msgstr ""
 
-#: index.php:217
+#: index.php:227
 #, fuzzy
 msgid "Show tag cloud..."
 msgstr "Tag-sky"
 
-#: index.php:218
+#: index.php:229 include/functions.php:1890
+#, fuzzy
+msgid "Toggle widescreen mode"
+msgstr "Tillatt endringer i kategorirekkefølgen?"
+
+#: index.php:231
 msgid "Select by tags..."
 msgstr ""
 
-#: index.php:219
+#: index.php:232
 msgid "Create label..."
 msgstr "Lag merkelapp..."
 
-#: index.php:220
+#: index.php:233
 msgid "Create filter..."
 msgstr "Lag filter..."
 
-#: index.php:221
+#: index.php:234
 #, fuzzy
 msgid "Keyboard shortcuts help"
 msgstr "Tastatursnarveier"
 
-#: prefs.php:99
+#: index.php:236 mobile/mobile-functions.php:69
+#: mobile/mobile-functions.php:244 plugins/digest/digest_body.php:59
+msgid "Logout"
+msgstr "Logg ut"
+
+#: prefs.php:28 prefs.php:99 include/functions.php:1915
+#: classes/pref/prefs.php:371
+msgid "Preferences"
+msgstr "Innstillinger"
+
+#: prefs.php:90
 msgid "Keyboard shortcuts"
 msgstr "Tastatursnarveier"
 
-#: prefs.php:100 help/prefs.php:14
+#: prefs.php:91
 msgid "Exit preferences"
 msgstr "Forlat innstillinger"
 
-#: prefs.php:111 classes/pref/feeds.php:101 classes/pref/feeds.php:1220
-#: classes/pref/feeds.php:1283
+#: prefs.php:102 classes/pref/feeds.php:100 classes/pref/feeds.php:1148
+#: classes/pref/feeds.php:1211
 msgid "Feeds"
 msgstr "Nyhetsstrømmer"
 
-#: prefs.php:114 help/prefs.php:11 classes/pref/filters.php:110
+#: prefs.php:105 classes/pref/filters.php:117
 msgid "Filters"
 msgstr "Filtre"
 
-#: prefs.php:117 help/prefs.php:12 mobile/mobile-functions.php:205
-#: include/functions.php:1189 include/functions.php:1836
-#: classes/pref/labels.php:90
+#: prefs.php:108 mobile/mobile-functions.php:205 include/functions.php:1118
+#: include/functions.php:1739 classes/pref/labels.php:90
 msgid "Labels"
 msgstr "Merkelapper"
 
-#: prefs.php:121 help/prefs.php:13
+#: prefs.php:112
 msgid "Users"
 msgstr "Brukere"
 
@@ -511,251 +511,23 @@ msgstr "Kontoen ble opprettet med suksess."
 msgid "New user registrations are currently closed."
 msgstr "Registrering av nye brukere er stengt."
 
-#: update.php:38
+#: update.php:37
 #, fuzzy
 msgid "Tiny Tiny RSS data update script."
 msgstr "Tiny Tiny RSS-databasen er oppdatert"
 
-#: help/main.php:1 help/prefs.php:1
-msgid "Keyboard Shortcuts"
-msgstr "Tastatursnarveier"
-
-#: help/main.php:5
-msgid "Navigation"
-msgstr "Navigasjon"
-
-#: help/main.php:8
-msgid "Move between feeds"
-msgstr "Beveg deg mellom nyhetsstrømmene"
-
-#: help/main.php:9
-msgid "Move between articles"
-msgstr "Beveg deg mellom artikler"
-
-#: help/main.php:10
-msgid "Show search dialog"
-msgstr "Vis søkevinduet"
-
-#: help/main.php:13
-msgid "Active article actions"
-msgstr "Handlinger for aktive artikler"
-
-#: help/main.php:16
-msgid "Toggle starred"
-msgstr "Sett som favoritt"
-
-#: help/main.php:17
-msgid "Toggle published"
-msgstr "Sett som publisert"
-
-#: help/main.php:18
-msgid "Toggle unread"
-msgstr "Sett som ulest"
-
-#: help/main.php:19
-msgid "Edit tags"
-msgstr "Endre stikkord"
-
-#: help/main.php:20
-#, fuzzy
-msgid "Dismiss selected articles"
-msgstr "Fjerne merkede artikler fra merkelappen?"
-
-#: help/main.php:21
-#, fuzzy
-msgid "Dismiss read articles"
-msgstr "Skjul synlige leste artikler"
-
-#: help/main.php:22
-msgid "Open article in new window"
-msgstr "Åpne artikkel i nytt nettleservindu"
-
-#: help/main.php:23
-msgid "Mark articles below/above active one as read"
-msgstr "Marker alle artikler under/over den aktive som lest"
-
-#: help/main.php:24
-msgid "Scroll article content"
-msgstr "Rullevisning av artkkelens innhold"
-
-#: help/main.php:25
-#, fuzzy
-msgid "Email article"
-msgstr "Alle artikler"
-
-#: help/main.php:29 help/prefs.php:30
-msgid "Other actions"
-msgstr "Andre handlinger"
-
-#: help/main.php:32
-msgid "Select article under mouse cursor"
-msgstr "Velg artikkelen under musepekeren"
-
-#: help/main.php:33 help/prefs.php:26 classes/pref/labels.php:281
-msgid "Create label"
-msgstr "Lag merkelapp"
-
-#: help/main.php:34 help/prefs.php:25 classes/pref/filters.php:580
-msgid "Create filter"
-msgstr "Lag filter"
-
-#: help/main.php:35
-msgid "Collapse sidebar"
-msgstr "Skjul nyhetskanalsslisten"
-
-#: help/main.php:36 help/prefs.php:34
-msgid "Display this help dialog"
-msgstr "Vis denne hjelpdialogen"
-
-#: help/main.php:41
-#, fuzzy
-msgid "Multiple articles actions"
-msgstr "Alle artikler"
-
-#: help/main.php:44
-#, fuzzy
-msgid "Select all articles"
-msgstr "Fjern artikler"
-
-#: help/main.php:45
-#, fuzzy
-msgid "Select unread articles"
-msgstr "Slett uleste artikler"
-
-#: help/main.php:46
-#, fuzzy
-msgid "Select starred articles"
-msgstr "Slett uleste artikler"
-
-#: help/main.php:47
-#, fuzzy
-msgid "Select published articles"
-msgstr "Slett uleste artikler"
-
-#: help/main.php:48
-#, fuzzy
-msgid "Invert article selection"
-msgstr "Handlinger for aktive artikler"
-
-#: help/main.php:49
-#, fuzzy
-msgid "Deselect all articles"
-msgstr "Fjern artikler"
-
-#: help/main.php:52
-msgid "Feed actions"
-msgstr "Nyhetsstrømshandlinger"
-
-#: help/main.php:55
-#, fuzzy
-msgid "Refresh active feed"
-msgstr "Oppdater aktive nyhetsstrømmer"
-
-#: help/main.php:57 help/prefs.php:22 classes/pref/feeds.php:1286
-msgid "Subscribe to feed"
-msgstr "Abonner på nyhetsstrøm"
-
-#: help/main.php:58 js/FeedTree.js:135 js/PrefFeedTree.js:67
-msgid "Edit feed"
-msgstr "Rediger nyhetsstrømmen"
-
-#: help/main.php:59
-msgid "Mark feed as read"
-msgstr "Marker nyhetsstrøm som lest"
-
-#: help/main.php:60
-#, fuzzy
-msgid "Reverse headlines order"
-msgstr "Motsatt titteloversikt (eldste først)"
-
-#: help/main.php:61 js/FeedTree.js:170
-msgid "Mark all feeds as read"
-msgstr "Marker alle nyhetsstrømmer som lest"
-
-#: help/main.php:62
-msgid "If viewing category, (un)collapse it"
-msgstr "Hvis kategorien vises, brett ut/klapp den sammen."
-
-#: help/main.php:65 help/prefs.php:5
-msgid "Go to..."
-msgstr "Gå til..."
-
-#: help/main.php:68 include/functions.php:1893
-msgid "All articles"
-msgstr "Alle artikler"
-
-#: help/main.php:69 include/functions.php:1891
-msgid "Fresh articles"
-msgstr "Ferske artikler"
-
-#: help/main.php:70 include/functions.php:1887
-msgid "Starred articles"
-msgstr "Favorittartikler"
-
-#: help/main.php:71 include/functions.php:1889
-msgid "Published articles"
-msgstr "Publiserte artikler"
-
-#: help/main.php:72
-msgid "Tag cloud"
-msgstr "Tag-sky"
-
-#: help/main.php:79
-msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
-msgstr ""
-
-#: help/main.php:81 help/prefs.php:41
-msgid "Press any key to close this window."
-msgstr "Trykk på en knapp for å lukk dette vinduet"
-
-#: help/prefs.php:9
-msgid "My Feeds"
-msgstr "Mine nyhetsstrømmer"
-
-#: help/prefs.php:10
-msgid "Other Feeds"
-msgstr "Andres nyhetsstrømmer"
-
-#: help/prefs.php:19
-msgid "Panel actions"
-msgstr "Panelhandlinger"
-
-#: help/prefs.php:23
-msgid "Top 25 feeds"
-msgstr "Topp 25 nyhetsstrømmer"
-
-#: help/prefs.php:24
-msgid "Edit feed categories"
-msgstr "Rediger nyyhetsstrømskategorier"
-
-#: help/prefs.php:27 classes/pref/users.php:386
-msgid "Create user"
-msgstr "Lag bruker"
-
-#: help/prefs.php:33
-msgid "Focus search (if present)"
-msgstr "Fokuser søk (hvis mulig)"
-
-#: help/prefs.php:39
-msgid ""
-"<b>Note:</b> not all actions may be available, depending on Tiny Tiny RSS "
-"configuration and your access level."
-msgstr ""
-"<b>Advarsel:</b> ikke alle handlinger er nødvendigvis tilgjengelig, det "
-"avhenger av konfigureringen av Tiny Tiny RSS og ditt tilgangsnivå."
-
 #: mobile/login_form.php:28 include/login_form.php:209
-#: classes/handler/public.php:495
+#: classes/handler/public.php:469
 msgid "Log in"
 msgstr "Logg inn"
 
 #: mobile/login_form.php:40 include/login_form.php:169
-#: classes/handler/public.php:479
+#: classes/handler/public.php:453
 msgid "Login:"
 msgstr "Brukernavn:"
 
 #: mobile/login_form.php:45 include/login_form.php:178
-#: classes/handler/public.php:482
+#: classes/handler/public.php:456
 msgid "Password:"
 msgstr "Passord:"
 
@@ -770,8 +542,8 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
-#: mobile/mobile-functions.php:178 include/functions.php:1187
-#: include/functions.php:1834
+#: mobile/mobile-functions.php:178 include/functions.php:1116
+#: include/functions.php:1737
 msgid "Special"
 msgstr "Snarveier"
 
@@ -785,12 +557,12 @@ msgid "Enable categories"
 msgstr "Tillatt kategorisering av nyhetsstrømmer"
 
 #: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36
-#: mobile/prefs.php:41 mobile/prefs.php:46
+#: mobile/prefs.php:41 mobile/prefs.php:46 mobile/prefs.php:51
 msgid "ON"
 msgstr ""
 
 #: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36
-#: mobile/prefs.php:41 mobile/prefs.php:46
+#: mobile/prefs.php:41 mobile/prefs.php:46 mobile/prefs.php:51
 msgid "OFF"
 msgstr ""
 
@@ -814,155 +586,347 @@ msgstr "Skjul/vis leste nyhetsstrømmer"
 msgid "Sort feeds by unread count"
 msgstr "Sorter nyhetsstrømer ut i fra antall uleste artikler"
 
-#: include/functions.php:564
-#, php-format
-msgid "Fatal: authentication module %s not found."
-msgstr ""
+#: mobile/prefs.php:50 include/localized_schema.php:45
+msgid "Reverse headline order (oldest first)"
+msgstr "Motsatt titteloversikt (eldste først)"
 
-#: include/functions.php:682
-msgid "Session failed to validate (incorrect IP)"
-msgstr "Sesjonen kunne ikke valideres (feil IP)"
-
-#: include/functions.php:1198 include/functions.php:1737
-#: include/functions.php:1822 include/functions.php:1844
-#: include/functions.php:2699 classes/opml.php:416 classes/pref/feeds.php:193
+#: include/digest.php:131 include/functions.php:1127
+#: include/functions.php:1640 include/functions.php:1725
+#: include/functions.php:1747 classes/opml.php:416 classes/pref/feeds.php:188
 msgid "Uncategorized"
 msgstr "Ukategorisert"
 
-#: include/functions.php:1686 classes/dlg.php:387 classes/pref/filters.php:361
-msgid "All feeds"
-msgstr "Alle Nyhetsstrømmer"
-
-#: include/functions.php:1895
-#, fuzzy
-msgid "Archived articles"
-msgstr "Lagrede artikler"
-
-#: include/functions.php:1897
-msgid "Recently read"
-msgstr ""
-
-#: include/functions.php:2346
-#, fuzzy, php-format
-msgid "Search results: %s"
-msgstr "Søkeresultat"
-
-#: include/functions.php:3067 js/viewfeed.js:1998 js/viewfeed.js:1971
-#: js/viewfeed.js:1835 js/viewfeed.js:1845
-#, fuzzy
-msgid "Click to play"
-msgstr "Trykk for å endre"
-
-#: include/functions.php:3068 js/viewfeed.js:1997 js/viewfeed.js:1970
-#: js/viewfeed.js:1834 js/viewfeed.js:1844
-msgid "Play"
-msgstr ""
-
-#: include/functions.php:3203
-msgid " - "
-msgstr "-"
-
-#: include/functions.php:3232 include/functions.php:4028 classes/rpc.php:414
-msgid "no tags"
-msgstr "Ingen stikkord"
-
-#: include/functions.php:3242 classes/feeds.php:680
-msgid "Edit tags for this article"
-msgstr "Rediger stikkordene for denne artikkelen"
-
-#: include/functions.php:3252 classes/feeds.php:707
-#, fuzzy
-msgid "Open article in new tab"
-msgstr "Åpne artikkel i nytt nettleservindu"
-
-#: include/functions.php:3263 classes/feeds.php:718
-#, fuzzy
-msgid "Close article"
-msgstr "Fjern artikler"
-
-#: include/functions.php:3280 classes/feeds.php:616
-#, fuzzy
-msgid "Originally from:"
-msgstr "Vis opprinnelig artikkelinnhold"
-
-#: include/functions.php:3293 classes/feeds.php:629 classes/pref/feeds.php:511
-#, fuzzy
-msgid "Feed URL"
-msgstr "Nyhetsstrøm"
-
-#: include/functions.php:3308 classes/feeds.php:68
-#, fuzzy
-msgid "Visit the website"
-msgstr "Besøk den offisielle siden"
-
-#: include/functions.php:3327
-msgid "Related"
-msgstr ""
-
-#: include/functions.php:3361 classes/dlg.php:30 classes/dlg.php:61
-#: classes/dlg.php:180 classes/dlg.php:203 classes/dlg.php:240
-#: classes/dlg.php:524 classes/dlg.php:559 classes/dlg.php:590
-#: classes/dlg.php:623 classes/dlg.php:724 classes/pref/users.php:106
-#: classes/pref/filters.php:101 classes/pref/feeds.php:1638
-#: classes/pref/feeds.php:1709 plugins/share/share.php:61
-#: plugins/updater/updater.php:301 plugins/updater/init.php:323
-msgid "Close this window"
-msgstr "Lukk dette vinduet"
-
-#: include/functions.php:4053
-#, fuzzy
-msgid "(edit note)"
-msgstr "Rediger notat"
-
-#: include/functions.php:4525
-msgid "No feed selected."
-msgstr "Ingen valgt nyhetsstrøm"
-
-#: include/functions.php:4535 classes/feeds.php:766
-#, fuzzy, php-format
-msgid "Feeds last updated at %s"
-msgstr "Oppdateringsfeil"
-
-#: include/functions.php:4545 classes/feeds.php:776
-msgid "Some feeds have update errors (click for details)"
-msgstr "Noen nyhetsstrømmer har oppdateringsfeil (trykk for detaljer)"
-
-#: include/functions.php:4689
-msgid "unknown type"
-msgstr "Ukjent type"
-
-#: include/functions.php:4731
-#, fuzzy
-msgid "Attachments"
-msgstr "Vedlegg:"
-
-#: include/functions.php:5191
+#: include/feedbrowser.php:83
 #, fuzzy, php-format
 msgid "%d archived articles"
 msgstr "Favorittartikler"
 
-#: include/functions.php:5215
+#: include/feedbrowser.php:107
 msgid "No feeds found."
 msgstr "Ingen nyhetsstrømmer ble funnet."
 
-#: include/functions.php:5261 plugins/import_export/init.php:221
+#: include/functions.php:698
+msgid "Session failed to validate (incorrect IP)"
+msgstr "Sesjonen kunne ikke valideres (feil IP)"
+
+#: include/functions.php:1589 classes/dlg.php:371 classes/pref/filters.php:368
+msgid "All feeds"
+msgstr "Alle Nyhetsstrømmer"
+
+#: include/functions.php:1790
+msgid "Starred articles"
+msgstr "Favorittartikler"
+
+#: include/functions.php:1792
+msgid "Published articles"
+msgstr "Publiserte artikler"
+
+#: include/functions.php:1794
+msgid "Fresh articles"
+msgstr "Ferske artikler"
+
+#: include/functions.php:1796 include/functions.php:1910
+msgid "All articles"
+msgstr "Alle artikler"
+
+#: include/functions.php:1798
 #, fuzzy
-msgid "Could not import: incorrect schema version."
-msgstr "Kunne ikke finne den nødvendige skjemafilen, nødvendig versjon:"
+msgid "Archived articles"
+msgstr "Lagrede artikler"
 
-#: include/functions.php:5266 plugins/import_export/init.php:226
-msgid "Could not import: unrecognized document format."
+#: include/functions.php:1800
+msgid "Recently read"
 msgstr ""
 
-#: include/functions.php:5425
-#, php-format
-msgid "Finished: %d articles processed, %d imported, %d feeds created."
+#: include/functions.php:1867
+msgid "Navigation"
+msgstr "Navigasjon"
+
+#: include/functions.php:1868
+#, fuzzy
+msgid "Open next feed"
+msgstr "Generert nyhetsstrøm"
+
+#: include/functions.php:1869
+msgid "Open previous feed"
 msgstr ""
 
-#: include/functions.php:5431 plugins/import_export/init.php:391
-msgid "Could not load XML document."
+#: include/functions.php:1870
+#, fuzzy
+msgid "Open next article"
+msgstr "Vis opprinnelig artikkelinnhold"
+
+#: include/functions.php:1871
+#, fuzzy
+msgid "Open previous article"
+msgstr "Vis opprinnelig artikkelinnhold"
+
+#: include/functions.php:1872
+msgid "Open next article (don't scroll long articles)"
 msgstr ""
 
+#: include/functions.php:1873
+msgid "Open previous article (don't scroll long articles)"
+msgstr ""
+
+#: include/functions.php:1874
+msgid "Show search dialog"
+msgstr "Vis søkevinduet"
+
+#: include/functions.php:1875
+#, fuzzy
+msgid "Article"
+msgstr "Alle artikler"
+
+#: include/functions.php:1876
+msgid "Toggle starred"
+msgstr "Sett som favoritt"
+
+#: include/functions.php:1877
+msgid "Toggle published"
+msgstr "Sett som publisert"
+
+#: include/functions.php:1878
+msgid "Toggle unread"
+msgstr "Sett som ulest"
+
+#: include/functions.php:1879
+msgid "Edit tags"
+msgstr "Endre stikkord"
+
+#: include/functions.php:1880
+#, fuzzy
+msgid "Dismiss selected"
+msgstr "Fjerne merkede artikler fra merkelappen?"
+
+#: include/functions.php:1881
+#, fuzzy
+msgid "Dismiss read"
+msgstr "Publiser artiklen"
+
+#: include/functions.php:1882
+#, fuzzy
+msgid "Open in new window"
+msgstr "Åpne artikkel i nytt nettleservindu"
+
+#: include/functions.php:1883 js/viewfeed.js:1758
+#, fuzzy
+msgid "Mark below as read"
+msgstr "Marker som lest"
+
+#: include/functions.php:1884 js/viewfeed.js:1752
+#, fuzzy
+msgid "Mark above as read"
+msgstr "Marker som lest"
+
+#: include/functions.php:1885
+#, fuzzy
+msgid "Scroll down"
+msgstr "Alt ferdig."
+
+#: include/functions.php:1886
+msgid "Scroll up"
+msgstr ""
+
+#: include/functions.php:1887
+#, fuzzy
+msgid "Select article under cursor"
+msgstr "Velg artikkelen under musepekeren"
+
+#: include/functions.php:1888
+#, fuzzy
+msgid "Email article"
+msgstr "Alle artikler"
+
+#: include/functions.php:1889 plugins/close_button/init.php:24
+#, fuzzy
+msgid "Close article"
+msgstr "Fjern artikler"
+
+#: include/functions.php:1891
+#, fuzzy
+msgid "Article selection"
+msgstr "Handlinger for aktive artikler"
+
+#: include/functions.php:1892
+#, fuzzy
+msgid "Select all articles"
+msgstr "Fjern artikler"
+
+#: include/functions.php:1893
+#, fuzzy
+msgid "Select unread"
+msgstr "Slett uleste artikler"
+
+#: include/functions.php:1894
+#, fuzzy
+msgid "Select starred"
+msgstr "Sett som favorittartikkel"
+
+#: include/functions.php:1895
+#, fuzzy
+msgid "Select published"
+msgstr "Slett uleste artikler"
+
+#: include/functions.php:1896
+#, fuzzy
+msgid "Invert selection"
+msgstr "Handlinger for aktive artikler"
+
+#: include/functions.php:1897
+#, fuzzy
+msgid "Deselect everything"
+msgstr "Fjern artikler"
+
+#: include/functions.php:1898 classes/pref/feeds.php:488
+#: classes/pref/feeds.php:707
+msgid "Feed"
+msgstr "Nyhetsstrøm"
+
+#: include/functions.php:1899
+#, fuzzy
+msgid "Refresh current feed"
+msgstr "Oppdater aktive nyhetsstrømmer"
+
+#: include/functions.php:1900
+#, fuzzy
+msgid "Un/hide read feeds"
+msgstr "Skjul/vis leste nyhetsstrømmer"
+
+#: include/functions.php:1901 classes/pref/feeds.php:1214
+msgid "Subscribe to feed"
+msgstr "Abonner på nyhetsstrøm"
+
+#: include/functions.php:1902 js/FeedTree.js:135 js/PrefFeedTree.js:67
+msgid "Edit feed"
+msgstr "Rediger nyhetsstrømmen"
+
+#: include/functions.php:1904
+#, fuzzy
+msgid "Reverse headlines"
+msgstr "Motsatt titteloversikt (eldste først)"
+
+#: include/functions.php:1905
+#, fuzzy
+msgid "Debug feed update"
+msgstr "Alle nyhetsstrømmer er oppdatert"
+
+#: include/functions.php:1906 js/FeedTree.js:170
+msgid "Mark all feeds as read"
+msgstr "Marker alle nyhetsstrømmer som lest"
+
+#: include/functions.php:1907
+#, fuzzy
+msgid "Un/collapse current category"
+msgstr "Velg for å slå sammen kategorien"
+
+#: include/functions.php:1908
+#, fuzzy
+msgid "Toggle combined mode"
+msgstr "Tillatt endringer i kategorirekkefølgen?"
+
+#: include/functions.php:1909
+#, fuzzy
+msgid "Go to"
+msgstr "Gå til..."
+
+#: include/functions.php:1911
+#, fuzzy
+msgid "Fresh"
+msgstr "Oppdater"
+
+#: include/functions.php:1914
+msgid "Tag cloud"
+msgstr "Tag-sky"
+
+#: include/functions.php:1916
+#, fuzzy
+msgid "Other"
+msgstr "Andre:"
+
+#: include/functions.php:1917 classes/pref/labels.php:281
+msgid "Create label"
+msgstr "Lag merkelapp"
+
+#: include/functions.php:1918 classes/pref/filters.php:587
+msgid "Create filter"
+msgstr "Lag filter"
+
+#: include/functions.php:1919
+#, fuzzy
+msgid "Un/collapse sidebar"
+msgstr "Skjul nyhetskanalsslisten"
+
+#: include/functions.php:1920
+#, fuzzy
+msgid "Show help dialog"
+msgstr "Vis søkevinduet"
+
+#: include/functions.php:2400
+#, fuzzy, php-format
+msgid "Search results: %s"
+msgstr "Søkeresultat"
+
+#: include/functions.php:2824 js/viewfeed.js:1845
+#, fuzzy
+msgid "Click to play"
+msgstr "Trykk for å endre"
+
+#: include/functions.php:2825 js/viewfeed.js:1844
+msgid "Play"
+msgstr ""
+
+#: include/functions.php:2945
+msgid " - "
+msgstr "-"
+
+#: include/functions.php:2967 include/functions.php:3284 classes/rpc.php:359
+msgid "no tags"
+msgstr "Ingen stikkord"
+
+#: include/functions.php:2977 classes/feeds.php:645
+msgid "Edit tags for this article"
+msgstr "Rediger stikkordene for denne artikkelen"
+
+#: include/functions.php:3006 classes/feeds.php:600
+#, fuzzy
+msgid "Originally from:"
+msgstr "Vis opprinnelig artikkelinnhold"
+
+#: include/functions.php:3019 classes/feeds.php:613 classes/pref/feeds.php:507
+#, fuzzy
+msgid "Feed URL"
+msgstr "Nyhetsstrøm"
+
+#: include/functions.php:3048
+msgid "Related"
+msgstr ""
+
+#: include/functions.php:3075 classes/dlg.php:43 classes/dlg.php:162
+#: classes/dlg.php:185 classes/dlg.php:222 classes/dlg.php:508
+#: classes/dlg.php:543 classes/dlg.php:574 classes/dlg.php:608
+#: classes/dlg.php:620 classes/backend.php:105 classes/pref/users.php:106
+#: classes/pref/filters.php:108 classes/pref/feeds.php:1527
+#: classes/pref/feeds.php:1598 plugins/import_export/init.php:407
+#: plugins/import_export/init.php:431 plugins/share/init.php:67
+#: plugins/updater/init.php:329
+msgid "Close this window"
+msgstr "Lukk dette vinduet"
+
+#: include/functions.php:3309
+#, fuzzy
+msgid "(edit note)"
+msgstr "Rediger notat"
+
+#: include/functions.php:3542
+msgid "unknown type"
+msgstr "Ukjent type"
+
+#: include/functions.php:3592
+#, fuzzy
+msgid "Attachments"
+msgstr "Vedlegg:"
+
 #: include/localized_schema.php:4
 msgid "Title or Content"
 msgstr "Tittel eller innhold"
@@ -988,9 +952,8 @@ msgstr "Fjern artikler"
 msgid "Set starred"
 msgstr "Sett som favorittartikkel"
 
-#: include/localized_schema.php:12 js/viewfeed.js:501 js/viewfeed.js:490
-#: js/viewfeed.js:496 js/viewfeed.js:478 plugins/digest/digest.js:264
-#: plugins/digest/digest.js:736
+#: include/localized_schema.php:12 js/viewfeed.js:478
+#: plugins/digest/digest.js:264 plugins/digest/digest.js:736
 msgid "Publish article"
 msgstr "Publiser artiklen"
 
@@ -998,8 +961,7 @@ msgstr "Publiser artiklen"
 msgid "Assign tags"
 msgstr "Tildel stikkord"
 
-#: include/localized_schema.php:14 js/viewfeed.js:1962 js/viewfeed.js:1935
-#: js/viewfeed.js:1799 js/viewfeed.js:1809
+#: include/localized_schema.php:14 js/viewfeed.js:1809
 msgid "Assign label"
 msgstr "Tildel stikkord"
 
@@ -1148,10 +1110,6 @@ msgstr "Ved oppdatering vis neste nyhetsstrøm"
 msgid "Sort feeds by unread articles count"
 msgstr "Sorter nyhetsstrømer ut i fra antall uleste artikler"
 
-#: include/localized_schema.php:45
-msgid "Reverse headline order (oldest first)"
-msgstr "Motsatt titteloversikt (eldste først)"
-
 #: include/localized_schema.php:46
 msgid "Enable e-mail digest"
 msgstr "Tillatt e-postsammendrag"
@@ -1198,7 +1156,8 @@ msgid "Group headlines in virtual feeds"
 msgstr "Grupper overskriftene i virtuelle nyhetskanaler"
 
 #: include/localized_schema.php:57
-msgid "Do not show images in articles"
+#, fuzzy
+msgid "Hide images in articles"
 msgstr "Ikke vis bilder i artiklene"
 
 #: include/localized_schema.php:58
@@ -1209,8 +1168,7 @@ msgstr ""
 msgid "User timezone"
 msgstr ""
 
-#: include/localized_schema.php:60 js/prefs.js:1856 js/prefs.js:1743
-#: js/prefs.js:1733
+#: include/localized_schema.php:60 js/prefs.js:1733
 #, fuzzy
 msgid "Customize stylesheet"
 msgstr "URL til brukerbestemt utseendemal (CSS)"
@@ -1233,7 +1191,7 @@ msgstr ""
 msgid "Assign articles to labels automatically"
 msgstr "Marker artikler som leste automatisk"
 
-#: include/login_form.php:185 classes/handler/public.php:485
+#: include/login_form.php:185 classes/handler/public.php:459
 msgid "Language:"
 msgstr "Språk:"
 
@@ -1242,8 +1200,8 @@ msgstr "Språk:"
 msgid "Profile:"
 msgstr "Fil:"
 
-#: include/login_form.php:197 classes/handler/public.php:208
-#: classes/rpc.php:147 classes/dlg.php:116
+#: include/login_form.php:197 classes/handler/public.php:212
+#: classes/rpc.php:64 classes/dlg.php:98
 #, fuzzy
 msgid "Default profile"
 msgstr "Standard artikkelbegrensning"
@@ -1257,190 +1215,172 @@ msgstr ""
 msgid "Article not found."
 msgstr "Nyhetsstrømmen ble ikke funnet"
 
-#: classes/handler/public.php:420 classes/pref/feeds.php:1480
+#: classes/handler/public.php:394 plugins/bookmarklets/init.php:38
 #, fuzzy
 msgid "Share with Tiny Tiny RSS"
 msgstr "Returner til Tiny Tiny RSS"
 
-#: classes/handler/public.php:428
+#: classes/handler/public.php:402
 msgid "Title:"
 msgstr "Tittel:"
 
-#: classes/handler/public.php:430 classes/dlg.php:667
-#: classes/pref/feeds.php:509 classes/pref/feeds.php:762
-#: plugins/instances/instances.php:100 plugins/instances/init.php:215
+#: classes/handler/public.php:404 classes/dlg.php:667
+#: classes/pref/feeds.php:505 classes/pref/feeds.php:722
+#: plugins/instances/init.php:215
 msgid "URL:"
 msgstr "Nettadresse:"
 
-#: classes/handler/public.php:432
+#: classes/handler/public.php:406
 #, fuzzy
 msgid "Content:"
 msgstr "Innhold"
 
-#: classes/handler/public.php:434
+#: classes/handler/public.php:408
 #, fuzzy
 msgid "Labels:"
 msgstr "Merkelapper"
 
-#: classes/handler/public.php:453
+#: classes/handler/public.php:427
 msgid "Shared article will appear in the Published feed."
 msgstr ""
 
-#: classes/handler/public.php:455
+#: classes/handler/public.php:429
 msgid "Share"
 msgstr ""
 
-#: classes/handler/public.php:456 classes/handler/public.php:498
-#: classes/dlg.php:315 classes/dlg.php:366 classes/dlg.php:426
-#: classes/dlg.php:457 classes/dlg.php:652 classes/dlg.php:702
-#: classes/dlg.php:774 classes/pref/users.php:194 classes/pref/labels.php:81
-#: classes/pref/filters.php:342 classes/pref/filters.php:722
-#: classes/pref/filters.php:791 classes/pref/filters.php:858
-#: classes/pref/feeds.php:729 classes/pref/feeds.php:880
-#: plugins/mail/mail.php:126 plugins/note/note.php:49
-#: plugins/instances/instances.php:136
+#: classes/handler/public.php:430 classes/handler/public.php:472
+#: classes/dlg.php:297 classes/dlg.php:350 classes/dlg.php:410
+#: classes/dlg.php:441 classes/dlg.php:652 classes/dlg.php:702
+#: classes/dlg.php:751 classes/pref/users.php:194 classes/pref/labels.php:81
+#: classes/pref/filters.php:349 classes/pref/filters.php:729
+#: classes/pref/filters.php:798 classes/pref/filters.php:865
+#: classes/pref/feeds.php:689 classes/pref/feeds.php:829
+#: plugins/mail/init.php:132 plugins/note/init.php:55
+#: plugins/instances/init.php:251
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: classes/handler/public.php:477
+#: classes/handler/public.php:451
 #, fuzzy
 msgid "Not logged in"
 msgstr "Sist innlogget"
 
-#: classes/handler/public.php:537
+#: classes/handler/public.php:511
 msgid "Incorrect username or password"
 msgstr "Feil brukernavn og/eller passord"
 
-#: classes/handler/public.php:573 classes/handler/public.php:670
+#: classes/handler/public.php:547 classes/handler/public.php:644
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "Abonnerer allerede på <b>%s</b>"
 
-#: classes/handler/public.php:576 classes/handler/public.php:661
+#: classes/handler/public.php:550 classes/handler/public.php:635
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "Abonnerer på <b>%s</b>"
 
-#: classes/handler/public.php:579 classes/handler/public.php:664
+#: classes/handler/public.php:553 classes/handler/public.php:638
 #, fuzzy, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "Abonnerer allerede på <b>%s</b>"
 
-#: classes/handler/public.php:582 classes/handler/public.php:667
+#: classes/handler/public.php:556 classes/handler/public.php:641
 #, fuzzy, php-format
 msgid "No feeds found in <b>%s</b>."
 msgstr "Ingen nyhetsstrømmer ble funnet."
 
-#: classes/handler/public.php:585 classes/handler/public.php:673
+#: classes/handler/public.php:559 classes/handler/public.php:647
 #, fuzzy
 msgid "Multiple feed URLs found."
 msgstr "Adresse for nyhetsstrømmen for offentliggjorte innlegg har endret seg."
 
-#: classes/handler/public.php:589 classes/handler/public.php:678
+#: classes/handler/public.php:563 classes/handler/public.php:652
 #, fuzzy, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr "Abonnerer allerede på <b>%s</b>"
 
-#: classes/handler/public.php:607 classes/handler/public.php:696
+#: classes/handler/public.php:581 classes/handler/public.php:670
 #, fuzzy
 msgid "Subscribe to selected feed"
 msgstr "Fjern abonnement på valgte nyhetsstrømmer"
 
-#: classes/handler/public.php:632 classes/handler/public.php:720
+#: classes/handler/public.php:606 classes/handler/public.php:694
 msgid "Edit subscription options"
 msgstr "Rediger abonnementsalternativer"
 
-#: classes/auth/internal.php:45 plugins/auth_internal/init.php:62
-#, fuzzy
-msgid "Please enter your one time password:"
-msgstr "Vennligst skriv inn et notat for denne artikkelen:"
-
-#: classes/auth/internal.php:168 plugins/auth_internal/init.php:185
-msgid "Password has been changed."
-msgstr "Passord har blitt endret."
-
-#: classes/auth/internal.php:170
-msgid "Old password is incorrect."
-msgstr "Gammelt passord er feil"
-
-#: classes/dlg.php:26
-#, fuzzy
-msgid "Prepare data"
-msgstr "Lagre"
-
-#: classes/dlg.php:40
+#: classes/dlg.php:22
 msgid ""
 "If you have imported labels and/or filters, you might need to reload "
 "preferences to see your new data."
 msgstr ""
 
-#: classes/dlg.php:73 classes/pref/users.php:378 classes/pref/labels.php:272
-#: classes/pref/filters.php:223 classes/pref/filters.php:270
-#: classes/pref/filters.php:571 classes/pref/filters.php:650
-#: classes/pref/filters.php:677 classes/pref/feeds.php:1274
-#: classes/pref/feeds.php:1583 classes/pref/feeds.php:1652
-#: plugins/instances/instances.php:172
+#: classes/dlg.php:55 classes/pref/users.php:378 classes/pref/labels.php:272
+#: classes/pref/filters.php:230 classes/pref/filters.php:277
+#: classes/pref/filters.php:578 classes/pref/filters.php:657
+#: classes/pref/filters.php:684 classes/pref/feeds.php:1202
+#: classes/pref/feeds.php:1472 classes/pref/feeds.php:1541
+#: plugins/instances/init.php:287
 #, fuzzy
 msgid "Select"
 msgstr "Velg:"
 
-#: classes/dlg.php:76 classes/feeds.php:92 classes/pref/users.php:381
-#: classes/pref/labels.php:275 classes/pref/filters.php:226
-#: classes/pref/filters.php:273 classes/pref/filters.php:574
-#: classes/pref/filters.php:653 classes/pref/filters.php:680
-#: classes/pref/feeds.php:1277 classes/pref/feeds.php:1586
-#: classes/pref/feeds.php:1655 plugins/instances/instances.php:175
+#: classes/dlg.php:58 classes/feeds.php:92 classes/pref/users.php:381
+#: classes/pref/labels.php:275 classes/pref/filters.php:233
+#: classes/pref/filters.php:280 classes/pref/filters.php:581
+#: classes/pref/filters.php:660 classes/pref/filters.php:687
+#: classes/pref/feeds.php:1205 classes/pref/feeds.php:1475
+#: classes/pref/feeds.php:1544 plugins/instances/init.php:290
 msgid "All"
 msgstr "Alle"
 
-#: classes/dlg.php:78 classes/feeds.php:95 classes/pref/users.php:383
-#: classes/pref/labels.php:277 classes/pref/filters.php:228
-#: classes/pref/filters.php:275 classes/pref/filters.php:576
-#: classes/pref/filters.php:655 classes/pref/filters.php:682
-#: classes/pref/feeds.php:1279 classes/pref/feeds.php:1588
-#: classes/pref/feeds.php:1657 plugins/instances/instances.php:177
+#: classes/dlg.php:60 classes/feeds.php:95 classes/pref/users.php:383
+#: classes/pref/labels.php:277 classes/pref/filters.php:235
+#: classes/pref/filters.php:282 classes/pref/filters.php:583
+#: classes/pref/filters.php:662 classes/pref/filters.php:689
+#: classes/pref/feeds.php:1207 classes/pref/feeds.php:1477
+#: classes/pref/feeds.php:1546 plugins/instances/init.php:292
 msgid "None"
 msgstr "Ingen"
 
-#: classes/dlg.php:87
+#: classes/dlg.php:69
 #, fuzzy
 msgid "Create profile"
 msgstr "Lag filter"
 
-#: classes/dlg.php:110 classes/dlg.php:140
+#: classes/dlg.php:92 classes/dlg.php:122
 #, fuzzy
 msgid "(active)"
 msgstr "Tilpasset"
 
-#: classes/dlg.php:174
+#: classes/dlg.php:156
 #, fuzzy
 msgid "Remove selected profiles"
 msgstr "Fjerne valgte filtre?"
 
-#: classes/dlg.php:176
+#: classes/dlg.php:158
 #, fuzzy
 msgid "Activate profile"
 msgstr "Fjerne valgte filtre?"
 
-#: classes/dlg.php:186
+#: classes/dlg.php:168
 msgid "Public OPML URL"
 msgstr ""
 
-#: classes/dlg.php:191
+#: classes/dlg.php:173
 #, fuzzy
 msgid "Your Public OPML URL is:"
 msgstr "Lenke til nyhetsstrøm for publiserte artikler"
 
-#: classes/dlg.php:200 classes/dlg.php:587
+#: classes/dlg.php:182 classes/dlg.php:571
 #, fuzzy
 msgid "Generate new URL"
 msgstr "Generert nyhetsstrøm"
 
-#: classes/dlg.php:212
+#: classes/dlg.php:194
 msgid "Notice"
 msgstr "Notis"
 
-#: classes/dlg.php:218
+#: classes/dlg.php:200
 msgid ""
 "Update daemon is enabled in configuration, but daemon process is not "
 "running, which prevents all feeds from updating. Please start the daemon "
@@ -1450,11 +1390,11 @@ msgstr ""
 "ikke kjørt, noe som gjør at ingen nyhetsstrømmer blir oppdatert. Vennligst "
 "start prosessen eller konakt administratoren."
 
-#: classes/dlg.php:222 classes/dlg.php:231
+#: classes/dlg.php:204 classes/dlg.php:213
 msgid "Last update:"
 msgstr "Siste oppdatering:"
 
-#: classes/dlg.php:227
+#: classes/dlg.php:209
 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 "
@@ -1465,161 +1405,164 @@ msgstr ""
 "sjekk oppdateringsprosessen eller kontakt vedkommende som innehar "
 "nyhetsstrømmen."
 
-#: classes/dlg.php:252 classes/dlg.php:261
+#: classes/dlg.php:234 classes/dlg.php:243
 #, fuzzy
 msgid "Feed or site URL"
 msgstr "Nyhetsstrøm"
 
-#: classes/dlg.php:267 classes/dlg.php:738 classes/pref/feeds.php:531
-#: classes/pref/feeds.php:775
+#: classes/dlg.php:249 classes/dlg.php:715 classes/pref/feeds.php:527
+#: classes/pref/feeds.php:735
 msgid "Place in category:"
 msgstr "Plasser i kategori..."
 
-#: classes/dlg.php:275
+#: classes/dlg.php:257
 #, fuzzy
 msgid "Available feeds"
 msgstr "Alle Nyhetsstrømmer"
 
-#: classes/dlg.php:287 classes/pref/users.php:155 classes/pref/feeds.php:561
-#: classes/pref/feeds.php:811
+#: classes/dlg.php:269 classes/pref/users.php:155 classes/pref/feeds.php:557
+#: classes/pref/feeds.php:771
 msgid "Authentication"
 msgstr "Autentifisering"
 
-#: classes/dlg.php:291 classes/dlg.php:752 classes/pref/users.php:438
-#: classes/pref/feeds.php:567 classes/pref/feeds.php:815
+#: classes/dlg.php:273 classes/dlg.php:729 classes/pref/users.php:438
+#: classes/pref/feeds.php:563 classes/pref/feeds.php:775
 msgid "Login"
 msgstr "Logg inn"
 
-#: classes/dlg.php:294 classes/dlg.php:755 classes/pref/prefs.php:200
-#: classes/pref/feeds.php:573 classes/pref/feeds.php:821
+#: classes/dlg.php:276 classes/dlg.php:732 classes/pref/prefs.php:196
+#: classes/pref/feeds.php:569 classes/pref/feeds.php:781
 #, fuzzy
 msgid "Password"
 msgstr "Passord:"
 
-#: classes/dlg.php:304
+#: classes/dlg.php:286
 msgid "This feed requires authentication."
 msgstr "Denne nyhetsstrømmen krever autentifisering"
 
-#: classes/dlg.php:309 classes/dlg.php:364 classes/dlg.php:773
+#: classes/dlg.php:291 classes/dlg.php:348 classes/dlg.php:750
 msgid "Subscribe"
 msgstr "Abonner"
 
-#: classes/dlg.php:312
+#: classes/dlg.php:294
 #, fuzzy
 msgid "More feeds"
 msgstr "Flere nyhetsstrømmer"
 
-#: classes/dlg.php:336 classes/dlg.php:425 classes/pref/users.php:368
-#: classes/pref/filters.php:567 classes/pref/feeds.php:1270 js/tt-rss.js:234
-#: js/tt-rss.js:187 js/tt-rss.js:166
+#: classes/dlg.php:318 classes/dlg.php:409 classes/pref/users.php:368
+#: classes/pref/filters.php:574 classes/pref/feeds.php:1198 js/tt-rss.js:166
 msgid "Search"
 msgstr "Søk"
 
-#: classes/dlg.php:340
+#: classes/dlg.php:322
 #, fuzzy
 msgid "Popular feeds"
 msgstr "Vis nyhetsstrømmer"
 
-#: classes/dlg.php:341
+#: classes/dlg.php:323
 #, fuzzy
 msgid "Feed archive"
 msgstr "Nyhetsstrømshandlinger"
 
-#: classes/dlg.php:344
+#: classes/dlg.php:326
 #, fuzzy
 msgid "limit:"
 msgstr "Antall:"
 
-#: classes/dlg.php:365 classes/pref/users.php:394 classes/pref/labels.php:284
-#: classes/pref/filters.php:332 classes/pref/filters.php:589
-#: classes/pref/feeds.php:702 plugins/instances/instances.php:182
+#: classes/dlg.php:349 classes/pref/users.php:394 classes/pref/labels.php:284
+#: classes/pref/filters.php:339 classes/pref/filters.php:596
+#: classes/pref/feeds.php:662 plugins/instances/init.php:297
 msgid "Remove"
 msgstr "Fjern"
 
-#: classes/dlg.php:376
+#: classes/dlg.php:360
 msgid "Look for"
 msgstr ""
 
-#: classes/dlg.php:384
+#: classes/dlg.php:368
 msgid "Limit search to:"
 msgstr "Begrens søket til:"
 
-#: classes/dlg.php:400
+#: classes/dlg.php:384
 msgid "This feed"
 msgstr "Denne nyhetsstrømmen"
 
-#: classes/dlg.php:432
+#: classes/dlg.php:416
 msgid "Tags for this article (separated by commas):"
 msgstr "Denne artikkelens stikkord (separert med kommaer):"
 
-#: classes/dlg.php:455 classes/dlg.php:650 classes/pref/users.php:192
-#: classes/pref/labels.php:79 classes/pref/filters.php:339
-#: classes/pref/feeds.php:728 classes/pref/feeds.php:877
-#: plugins/note/note.php:47 plugins/instances/instances.php:133
-#: plugins/nsfw/init.php:86 plugins/owncloud/init.php:62
+#: classes/dlg.php:439 classes/dlg.php:650 classes/pref/users.php:192
+#: classes/pref/labels.php:79 classes/pref/filters.php:346
+#: classes/pref/feeds.php:688 classes/pref/feeds.php:826
+#: plugins/nsfw/init.php:86 plugins/note/init.php:53
+#: plugins/owncloud/init.php:62 plugins/instances/init.php:248
 msgid "Save"
 msgstr "Lagre"
 
-#: classes/dlg.php:463
+#: classes/dlg.php:447
 #, fuzzy
 msgid "Tag Cloud"
 msgstr "Tag-sky"
 
-#: classes/dlg.php:532
+#: classes/dlg.php:516
 msgid "Select item(s) by tags"
 msgstr ""
 
-#: classes/dlg.php:535
+#: classes/dlg.php:519
 msgid "Match:"
 msgstr "Matcher:"
 
-#: classes/dlg.php:537
+#: classes/dlg.php:521
 msgid "Any"
 msgstr ""
 
-#: classes/dlg.php:540
+#: classes/dlg.php:524
 #, fuzzy
 msgid "All tags."
 msgstr "Ingen stikkord"
 
-#: classes/dlg.php:542
+#: classes/dlg.php:526
 msgid "Which Tags?"
 msgstr ""
 
-#: classes/dlg.php:555
+#: classes/dlg.php:539
 #, fuzzy
 msgid "Display entries"
 msgstr "Vis nyhetsstrømmer"
 
-#: classes/dlg.php:567 classes/feeds.php:129
+#: classes/dlg.php:551 classes/feeds.php:133
 #, fuzzy
 msgid "View as RSS"
 msgstr "Se stikkord"
 
-#: classes/dlg.php:578
+#: classes/dlg.php:562
 msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 
-#: classes/dlg.php:606 plugins/updater/updater.php:276
+#: classes/dlg.php:591 plugins/updater/init.php:303
 #, fuzzy, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "Ny versjon av Tiny Tiny Rss er tilgjengelig!"
 
-#: classes/dlg.php:614
+#: classes/dlg.php:599
 msgid ""
 "You can update using built-in updater in the Preferences or by using update."
 "php"
 msgstr ""
 
-#: classes/dlg.php:618 classes/pref/users.php:390
+#: classes/dlg.php:603 classes/pref/users.php:390
 #, fuzzy
 msgid "Details"
 msgstr "Daglig"
 
-#: classes/dlg.php:620
+#: classes/dlg.php:605
 msgid "Download"
 msgstr ""
 
+#: classes/dlg.php:613
+msgid "Error receiving version information or no new version available."
+msgstr ""
+
 #: classes/dlg.php:634
 #, php-format
 msgid ""
@@ -1628,34 +1571,31 @@ msgid ""
 "\" href=\"%s\">This file</a> can be used as a baseline."
 msgstr ""
 
-#: classes/dlg.php:661 plugins/instances/instances.php:92
-#: plugins/instances/init.php:207
+#: classes/dlg.php:661 plugins/instances/init.php:207
 msgid "Instance"
 msgstr ""
 
-#: classes/dlg.php:670 plugins/instances/instances.php:103
-#: plugins/instances/instances.php:200 plugins/instances/init.php:218
+#: classes/dlg.php:670 plugins/instances/init.php:218
+#: plugins/instances/init.php:315
 msgid "Instance URL"
 msgstr ""
 
-#: classes/dlg.php:680 plugins/instances/instances.php:114
-#: plugins/instances/init.php:229
+#: classes/dlg.php:680 plugins/instances/init.php:229
 #, fuzzy
 msgid "Access key:"
 msgstr "Tilgangsnivå:"
 
-#: classes/dlg.php:683 plugins/instances/instances.php:117
-#: plugins/instances/instances.php:201 plugins/instances/init.php:232
+#: classes/dlg.php:683 plugins/instances/init.php:232
+#: plugins/instances/init.php:316
 #, fuzzy
 msgid "Access key"
 msgstr "Tilgangsnivå"
 
-#: classes/dlg.php:687 plugins/instances/instances.php:121
-#: plugins/instances/init.php:236
+#: classes/dlg.php:687 plugins/instances/init.php:236
 msgid "Use one access key for both linked instances."
 msgstr ""
 
-#: classes/dlg.php:695 plugins/instances/instances.php:129
+#: classes/dlg.php:695 plugins/instances/init.php:244
 #, fuzzy
 msgid "Generate new key"
 msgstr "Generert nyhetsstrøm"
@@ -1665,26 +1605,24 @@ msgstr "Generert nyhetsstrøm"
 msgid "Create link"
 msgstr "Lag"
 
-#: classes/dlg.php:717
-#, php-format
-msgid ""
-"Could not upload file. You might need to adjust upload_max_filesize\n"
-"\t\t\t\tin PHP.ini (current value = %s)"
-msgstr ""
-
-#: classes/dlg.php:735
+#: classes/dlg.php:712
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr ""
 
-#: classes/dlg.php:744
+#: classes/dlg.php:721
 msgid "Feeds to subscribe, One per line"
 msgstr ""
 
-#: classes/dlg.php:766
+#: classes/dlg.php:743
 #, fuzzy
 msgid "Feeds require authentication."
 msgstr "Denne nyhetsstrømmen krever autentifisering"
 
+#: classes/feeds.php:68
+#, fuzzy
+msgid "Visit the website"
+msgstr "Besøk den offisielle siden"
+
 #: classes/feeds.php:83
 #, fuzzy
 msgid "View as RSS feed"
@@ -1698,6 +1636,11 @@ msgstr "Velg:"
 msgid "Invert"
 msgstr "Motsatt"
 
+#: classes/feeds.php:101
+#, fuzzy
+msgid "More..."
+msgstr "Laster hjelp..."
+
 #: classes/feeds.php:103
 msgid "Selection toggle:"
 msgstr "Marker utvalg:"
@@ -1721,43 +1664,43 @@ msgstr "Artikkeldato"
 msgid "Move back"
 msgstr "Gå tilbake"
 
-#: classes/feeds.php:118 classes/pref/filters.php:235
-#: classes/pref/filters.php:282 classes/pref/filters.php:662
-#: classes/pref/filters.php:689
+#: classes/feeds.php:118 classes/pref/filters.php:242
+#: classes/pref/filters.php:289 classes/pref/filters.php:669
+#: classes/pref/filters.php:696
 #, fuzzy
 msgid "Delete"
 msgstr "Standard"
 
-#: classes/feeds.php:122 plugins/mail/mail.php:22
+#: classes/feeds.php:125 plugins/mail/init.php:28
 #, fuzzy
 msgid "Forward by email"
 msgstr "Marker artikkel som favoritt"
 
-#: classes/feeds.php:125
+#: classes/feeds.php:129
 msgid "Feed:"
 msgstr "Nyhetsstrøm:"
 
-#: classes/feeds.php:190 classes/feeds.php:844
+#: classes/feeds.php:196 classes/feeds.php:790
 msgid "Feed not found."
 msgstr "Nyhetsstrømmen ble ikke funnet"
 
-#: classes/feeds.php:434 classes/feeds.php:516
+#: classes/feeds.php:403 classes/feeds.php:493
 msgid "mark as read"
 msgstr "marker som lest"
 
-#: classes/feeds.php:739
+#: classes/feeds.php:691
 msgid "No unread articles found to display."
 msgstr "Ingen uleste artikler funnet som kunne vises"
 
-#: classes/feeds.php:742
+#: classes/feeds.php:694
 msgid "No updated articles found to display."
 msgstr "Ingen oppdaterte artikler funnet som kunne vises"
 
-#: classes/feeds.php:745
+#: classes/feeds.php:697
 msgid "No starred articles found to display."
 msgstr "Ingen markerte artikler som kan vises"
 
-#: classes/feeds.php:749
+#: classes/feeds.php:701
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
@@ -1765,11 +1708,40 @@ msgstr ""
 "Ingen artikler ble funnet. Du kan gi artikler merkelapper manuelt (se aksjon-"
 "menyen ovenfor) eller bruke et filter."
 
-#: classes/feeds.php:751
+#: classes/feeds.php:703
 msgid "No articles found to display."
 msgstr "Ingen artikler funnet som kan vises"
 
-#: classes/backend.php:26
+#: classes/feeds.php:718 classes/feeds.php:899
+#, fuzzy, php-format
+msgid "Feeds last updated at %s"
+msgstr "Oppdateringsfeil"
+
+#: classes/feeds.php:728 classes/feeds.php:909
+msgid "Some feeds have update errors (click for details)"
+msgstr "Noen nyhetsstrømmer har oppdateringsfeil (trykk for detaljer)"
+
+#: classes/feeds.php:889
+msgid "No feed selected."
+msgstr "Ingen valgt nyhetsstrøm"
+
+#: classes/backend.php:34
+msgid "Keyboard Shortcuts"
+msgstr "Tastatursnarveier"
+
+#: classes/backend.php:57
+msgid "Shift"
+msgstr ""
+
+#: classes/backend.php:60
+msgid "Ctrl"
+msgstr ""
+
+#: classes/backend.php:84
+msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
+msgstr ""
+
+#: classes/backend.php:99
 msgid "Help topic not found."
 msgstr "Hjelp-emne kunne ikke bli funnet"
 
@@ -1821,16 +1793,15 @@ msgstr "Legger til nyhetsstrøm..."
 msgid "Processing category: %s"
 msgstr "Plasser i kategori..."
 
-#: classes/opml.php:467
+#: classes/opml.php:468
 msgid "Error: please upload OPML file."
 msgstr "Feil: Kan ikke laste opp OPMLfil"
 
-#: classes/opml.php:474
+#: classes/opml.php:475
 msgid "Error while parsing document."
 msgstr "Feil under behandling av dokumentet"
 
-#: classes/pref/users.php:6 plugins/instances/instances.php:42
-#: plugins/instances/init.php:157
+#: classes/pref/users.php:6 plugins/instances/init.php:157
 msgid "Your access level is insufficient to open this tab."
 msgstr "Adgangsnivået ditt er for lavt for å åpne denne siden."
 
@@ -1870,8 +1841,8 @@ msgstr "Tilgangsnivå:"
 msgid "Change password to"
 msgstr "Endre passordet til"
 
-#: classes/pref/users.php:177 classes/pref/feeds.php:581
-#: classes/pref/feeds.php:827
+#: classes/pref/users.php:177 classes/pref/feeds.php:577
+#: classes/pref/feeds.php:787
 msgid "Options"
 msgstr "Alternativer:"
 
@@ -1912,8 +1883,12 @@ msgstr "Gir beskjed til <b>%s</b>"
 msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] Varsel om endring av passord"
 
-#: classes/pref/users.php:392 classes/pref/filters.php:586
-#: plugins/instances/instances.php:181
+#: classes/pref/users.php:386
+msgid "Create user"
+msgstr "Lag bruker"
+
+#: classes/pref/users.php:392 classes/pref/filters.php:593
+#: plugins/instances/init.php:296
 msgid "Edit"
 msgstr "Rediger"
 
@@ -1929,15 +1904,15 @@ msgstr "Tilgangsnivå"
 msgid "Last login"
 msgstr "Siste innlogging"
 
-#: classes/pref/users.php:461 plugins/instances/instances.php:222
+#: classes/pref/users.php:462 plugins/instances/init.php:337
 msgid "Click to edit"
 msgstr "Trykk for å endre"
 
-#: classes/pref/users.php:481
+#: classes/pref/users.php:482
 msgid "No users defined."
 msgstr "Ingen brukere er valgt"
 
-#: classes/pref/users.php:483
+#: classes/pref/users.php:484
 msgid "No matching users found."
 msgstr "Ingen matchende brukere ble funnet"
 
@@ -1979,86 +1954,90 @@ msgstr "Ingen filtre ble funnet."
 msgid "No recent articles matching this filter have been found."
 msgstr "Ingen filtre ble funnet."
 
-#: classes/pref/filters.php:218 classes/pref/filters.php:645
-#: classes/pref/filters.php:760
+#: classes/pref/filters.php:98
+msgid ""
+"Complex expressions might not give results while testing due to issues with "
+"database server regexp implementation."
+msgstr ""
+
+#: classes/pref/filters.php:225 classes/pref/filters.php:652
+#: classes/pref/filters.php:767
 msgid "Match"
 msgstr "Match"
 
-#: classes/pref/filters.php:232 classes/pref/filters.php:279
-#: classes/pref/filters.php:659 classes/pref/filters.php:686
+#: classes/pref/filters.php:239 classes/pref/filters.php:286
+#: classes/pref/filters.php:666 classes/pref/filters.php:693
 msgid "Add"
 msgstr "Legg til"
 
-#: classes/pref/filters.php:265 classes/pref/filters.php:672
+#: classes/pref/filters.php:272 classes/pref/filters.php:679
 #, fuzzy
 msgid "Apply actions"
 msgstr "Nyhetsstrømshandlinger"
 
-#: classes/pref/filters.php:315 classes/pref/filters.php:701
+#: classes/pref/filters.php:322 classes/pref/filters.php:708
 msgid "Enabled"
 msgstr "Tillatt"
 
-#: classes/pref/filters.php:324 classes/pref/filters.php:704
+#: classes/pref/filters.php:331 classes/pref/filters.php:711
 #, fuzzy
 msgid "Match any rule"
 msgstr "Match på:"
 
-#: classes/pref/filters.php:336 classes/pref/filters.php:716
+#: classes/pref/filters.php:343 classes/pref/filters.php:723
 msgid "Test"
 msgstr "Test"
 
-#: classes/pref/filters.php:368
+#: classes/pref/filters.php:375
 #, php-format
 msgid "%s on %s in %s"
 msgstr ""
 
-#: classes/pref/filters.php:583
+#: classes/pref/filters.php:590
 msgid "Combine"
 msgstr ""
 
-#: classes/pref/filters.php:593 classes/pref/feeds.php:1329
+#: classes/pref/filters.php:600 classes/pref/feeds.php:1257
 msgid "Rescore articles"
 msgstr "Tilbakestill poengsummene for artiklene"
 
-#: classes/pref/filters.php:719
+#: classes/pref/filters.php:726
 msgid "Create"
 msgstr "Lag"
 
-#: classes/pref/filters.php:769
+#: classes/pref/filters.php:776
 msgid "on field"
 msgstr "På felt:"
 
-#: classes/pref/filters.php:775 js/PrefFilterTree.js:29
+#: classes/pref/filters.php:782 js/PrefFilterTree.js:29
 #: plugins/digest/digest.js:241
 msgid "in"
 msgstr "i"
 
-#: classes/pref/filters.php:788
+#: classes/pref/filters.php:795
 #, fuzzy
 msgid "Save rule"
 msgstr "Lagre"
 
-#: classes/pref/filters.php:788 js/functions.js:1067 js/functions.js:1063
-#: js/functions.js:1071 js/functions.js:1073
+#: classes/pref/filters.php:795 js/functions.js:1078
 #, fuzzy
 msgid "Add rule"
 msgstr "Legger til kategori for nyhetsstrømmer"
 
-#: classes/pref/filters.php:811
+#: classes/pref/filters.php:818
 msgid "Perform Action"
 msgstr "Utfør handlingen"
 
-#: classes/pref/filters.php:837
+#: classes/pref/filters.php:844
 msgid "with parameters:"
 msgstr "med parametrene:"
 
-#: classes/pref/filters.php:855
+#: classes/pref/filters.php:862
 #, fuzzy
 msgid "Save action"
 msgstr "Panelhandlinger"
 
-#: classes/pref/filters.php:855 js/functions.js:1093 js/functions.js:1089
-#: js/functions.js:1097 js/functions.js:1099
+#: classes/pref/filters.php:862 js/functions.js:1104
 #, fuzzy
 msgid "Add action"
 msgstr "Nyhetsstrømshandlinger"
@@ -2079,153 +2058,188 @@ msgstr "Innskrivne passord matcher ikke."
 msgid "Function not supported by authentication module."
 msgstr ""
 
-#: classes/pref/prefs.php:68
+#: classes/pref/prefs.php:63
 msgid "The configuration was saved."
 msgstr "Konfigurasjonen er lagret."
 
-#: classes/pref/prefs.php:83
+#: classes/pref/prefs.php:77
 #, php-format
 msgid "Unknown option: %s"
 msgstr "Ukjent valg: %s"
 
-#: classes/pref/prefs.php:97
+#: classes/pref/prefs.php:91
 #, fuzzy
 msgid "Your personal data has been saved."
 msgstr "Passord har blitt endret."
 
-#: classes/pref/prefs.php:137
+#: classes/pref/prefs.php:131
 #, fuzzy
 msgid "Personal data / Authentication"
 msgstr "Autentifisering"
 
-#: classes/pref/prefs.php:157
+#: classes/pref/prefs.php:151
 msgid "Personal data"
 msgstr "Personlig informasjon"
 
-#: classes/pref/prefs.php:167
+#: classes/pref/prefs.php:161
 msgid "Full name"
 msgstr ""
 
-#: classes/pref/prefs.php:171
+#: classes/pref/prefs.php:165
 msgid "E-mail"
 msgstr "E-post"
 
-#: classes/pref/prefs.php:177
+#: classes/pref/prefs.php:171
 msgid "Access level"
 msgstr "Tilgangsnivå"
 
-#: classes/pref/prefs.php:187
+#: classes/pref/prefs.php:181
 #, fuzzy
 msgid "Save data"
 msgstr "Lagre"
 
-#: classes/pref/prefs.php:207
+#: classes/pref/prefs.php:203
 #, fuzzy
 msgid "Your password is at default value, please change it."
 msgstr ""
 "Passordet ditt er et standardpassord, \n"
 "\t\t\t\t\t\tVennligst bytt."
 
-#: classes/pref/prefs.php:239
+#: classes/pref/prefs.php:235
 msgid "Old password"
 msgstr "Gammelt passord"
 
-#: classes/pref/prefs.php:242
+#: classes/pref/prefs.php:238
 msgid "New password"
 msgstr "Nytt passord"
 
-#: classes/pref/prefs.php:247
+#: classes/pref/prefs.php:243
 msgid "Confirm password"
 msgstr "Bekreft passord"
 
-#: classes/pref/prefs.php:257
+#: classes/pref/prefs.php:253
 msgid "Change password"
 msgstr "Endre passord"
 
-#: classes/pref/prefs.php:263
+#: classes/pref/prefs.php:259
 msgid "One time passwords / Authenticator"
 msgstr ""
 
-#: classes/pref/prefs.php:292 classes/pref/prefs.php:343
+#: classes/pref/prefs.php:288 classes/pref/prefs.php:339
 #, fuzzy
 msgid "Enter your password"
 msgstr "Feil brukernavn og/eller passord"
 
-#: classes/pref/prefs.php:303
+#: classes/pref/prefs.php:299
 #, fuzzy
 msgid "Disable OTP"
 msgstr "(Avskrudd)"
 
-#: classes/pref/prefs.php:309
+#: classes/pref/prefs.php:305
 msgid ""
 "You will need a compatible Authenticator to use this. Changing your password "
 "would automatically disable OTP."
 msgstr ""
 
-#: classes/pref/prefs.php:311
+#: classes/pref/prefs.php:307
 msgid "Scan the following code by the Authenticator application:"
 msgstr ""
 
-#: classes/pref/prefs.php:352
+#: classes/pref/prefs.php:348
 msgid "I have scanned the code and would like to enable OTP"
 msgstr ""
 
-#: classes/pref/prefs.php:360
+#: classes/pref/prefs.php:356
 #, fuzzy
 msgid "Enable OTP"
 msgstr "Tillatt"
 
-#: classes/pref/prefs.php:456
-msgid "Select theme"
-msgstr "Velg utseende"
-
-#: classes/pref/prefs.php:508
+#: classes/pref/prefs.php:482
 #, fuzzy
 msgid "Customize"
 msgstr "URL til brukerbestemt utseendemal (CSS)"
 
-#: classes/pref/prefs.php:527 classes/pref/prefs.php:534
-#: classes/pref/prefs.php:539
+#: classes/pref/prefs.php:501 classes/pref/prefs.php:508
+#: classes/pref/prefs.php:513
 msgid "Yes"
 msgstr "Ja"
 
-#: classes/pref/prefs.php:529 classes/pref/prefs.php:539
+#: classes/pref/prefs.php:503 classes/pref/prefs.php:513
 msgid "No"
 msgstr "Nei"
 
-#: classes/pref/prefs.php:569
+#: classes/pref/prefs.php:543
 #, fuzzy
 msgid "Register"
 msgstr "Registrert"
 
-#: classes/pref/prefs.php:573
+#: classes/pref/prefs.php:547
 msgid "Clear"
 msgstr ""
 
-#: classes/pref/prefs.php:579
+#: classes/pref/prefs.php:553
 #, php-format
 msgid "Current server time: %s (UTC)"
 msgstr ""
 
-#: classes/pref/prefs.php:604
+#: classes/pref/prefs.php:582
 msgid "Save configuration"
 msgstr "Lagre konfigurasjonen"
 
-#: classes/pref/prefs.php:607
+#: classes/pref/prefs.php:585
 #, fuzzy
 msgid "Manage profiles"
 msgstr "Lag filter"
 
-#: classes/pref/prefs.php:610
+#: classes/pref/prefs.php:588
 msgid "Reset to defaults"
 msgstr "Tilbake til standard"
 
-#: classes/pref/prefs.php:622
+#: classes/pref/prefs.php:600
 #, fuzzy
 msgid "Show additional preferences"
 msgstr "Forlat innstillinger"
 
-#: classes/pref/prefs.php:679 classes/pref/prefs.php:697
+#: classes/pref/prefs.php:612 classes/pref/prefs.php:614
+msgid "Plugins"
+msgstr ""
+
+#: classes/pref/prefs.php:642
+msgid "System plugins"
+msgstr ""
+
+#: classes/pref/prefs.php:646 classes/pref/prefs.php:695
+msgid "Plugin"
+msgstr ""
+
+#: classes/pref/prefs.php:647 classes/pref/prefs.php:696
+#, fuzzy
+msgid "Description"
+msgstr "beskrivelse"
+
+#: classes/pref/prefs.php:648 classes/pref/prefs.php:697
+msgid "Version"
+msgstr ""
+
+#: classes/pref/prefs.php:649 classes/pref/prefs.php:698
+msgid "Author"
+msgstr ""
+
+#: classes/pref/prefs.php:682 classes/pref/prefs.php:733
+#, fuzzy
+msgid "Clear data"
+msgstr "Slett nyhetsstrømsdata"
+
+#: classes/pref/prefs.php:691
+msgid "User plugins"
+msgstr ""
+
+#: classes/pref/prefs.php:748
+#, fuzzy
+msgid "Enable selected plugins"
+msgstr "Bruk nyhetsstrømsikoner"
+
+#: classes/pref/prefs.php:803 classes/pref/prefs.php:821
 #, fuzzy
 msgid "Incorrect password"
 msgstr "Feil brukernavn og/eller passord"
@@ -2234,190 +2248,168 @@ msgstr "Feil brukernavn og/eller passord"
 msgid "Check to enable field"
 msgstr "Marker for å tillate felt"
 
-#: classes/pref/feeds.php:59 classes/pref/feeds.php:180
-#: classes/pref/feeds.php:223 classes/pref/feeds.php:229
-#: classes/pref/feeds.php:254
+#: classes/pref/feeds.php:58 classes/pref/feeds.php:175
+#: classes/pref/feeds.php:217 classes/pref/feeds.php:223
+#: classes/pref/feeds.php:248
 #, fuzzy, php-format
 msgid "(%d feeds)"
 msgstr "Rediger nyhetsstrømmen"
 
-#: classes/pref/feeds.php:492 classes/pref/feeds.php:747
-msgid "Feed"
-msgstr "Nyhetsstrøm"
-
-#: classes/pref/feeds.php:498
+#: classes/pref/feeds.php:494
 #, fuzzy
 msgid "Feed Title"
 msgstr "Tittel"
 
-#: classes/pref/feeds.php:554 classes/pref/feeds.php:802
+#: classes/pref/feeds.php:550 classes/pref/feeds.php:762
 msgid "Article purging:"
 msgstr "Slett artikler:"
 
-#: classes/pref/feeds.php:577
+#: classes/pref/feeds.php:573
 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:593 classes/pref/feeds.php:831
+#: classes/pref/feeds.php:589 classes/pref/feeds.php:791
 #, fuzzy
 msgid "Hide from Popular feeds"
 msgstr "Skjul fra min nyhetsstrømslisten"
 
-#: classes/pref/feeds.php:604 classes/pref/feeds.php:836
-msgid "Right-to-left content"
-msgstr "Innhold som vises fra høyre til venstre"
-
-#: classes/pref/feeds.php:616 classes/pref/feeds.php:842
+#: classes/pref/feeds.php:601 classes/pref/feeds.php:797
 msgid "Include in e-mail digest"
 msgstr "Inkluder i e-postsammendraget"
 
-#: classes/pref/feeds.php:629 classes/pref/feeds.php:848
+#: classes/pref/feeds.php:614 classes/pref/feeds.php:803
 msgid "Always display image attachments"
 msgstr ""
 
-#: classes/pref/feeds.php:643 classes/pref/feeds.php:856
+#: classes/pref/feeds.php:628 classes/pref/feeds.php:811
 msgid "Cache images locally"
 msgstr "Mellomlagre bilder lokalt på serveren"
 
-#: classes/pref/feeds.php:656
-#, fuzzy
-msgid "Cache content locally"
-msgstr "Mellomlagre bilder lokalt på serveren"
-
-#: classes/pref/feeds.php:668 classes/pref/feeds.php:862
+#: classes/pref/feeds.php:640 classes/pref/feeds.php:817
 #, fuzzy
 msgid "Mark updated articles as unread"
 msgstr "Marker alle artikler som leste?"
 
-#: classes/pref/feeds.php:680 classes/pref/feeds.php:868
-msgid "Mark posts as updated on content change"
-msgstr ""
-
-#: classes/pref/feeds.php:686
+#: classes/pref/feeds.php:646
 #, fuzzy
 msgid "Icon"
 msgstr "Handling"
 
-#: classes/pref/feeds.php:700
+#: classes/pref/feeds.php:660
 msgid "Replace"
 msgstr ""
 
-#: classes/pref/feeds.php:719
+#: classes/pref/feeds.php:679
 #, fuzzy
 msgid "Resubscribe to push updates"
 msgstr "Abonnerer på følgende nyhetsstrømmer:"
 
-#: classes/pref/feeds.php:726
+#: classes/pref/feeds.php:686
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr ""
 
-#: classes/pref/feeds.php:741
+#: classes/pref/feeds.php:701
 msgid "Enable the options you wish to apply using checkboxes on the right:"
 msgstr ""
 
-#: classes/pref/feeds.php:1123 classes/pref/feeds.php:1176
+#: classes/pref/feeds.php:1051 classes/pref/feeds.php:1104
 msgid "All done."
 msgstr "Alt ferdig."
 
-#: classes/pref/feeds.php:1231
+#: classes/pref/feeds.php:1159
 #, fuzzy
 msgid "Feeds with errors"
 msgstr "Nyhetsstrømsredigerer"
 
-#: classes/pref/feeds.php:1251
+#: classes/pref/feeds.php:1179
 #, fuzzy
 msgid "Inactive feeds"
 msgstr "Hele nyhetsstrømmen"
 
-#: classes/pref/feeds.php:1288
+#: classes/pref/feeds.php:1216
 #, fuzzy
 msgid "Edit selected feeds"
 msgstr "Sletter den valgte nyhetsstrømmen..."
 
-#: classes/pref/feeds.php:1290 classes/pref/feeds.php:1304
+#: classes/pref/feeds.php:1218 classes/pref/feeds.php:1232
 #, fuzzy
 msgid "Reset sort order"
 msgstr "Nullstill passordet"
 
-#: classes/pref/feeds.php:1292 js/prefs.js:2021 js/prefs.js:1788
-#: js/prefs.js:1778
+#: classes/pref/feeds.php:1220 js/prefs.js:1778
 #, fuzzy
 msgid "Batch subscribe"
 msgstr "Avabonner"
 
-#: classes/pref/feeds.php:1297
+#: classes/pref/feeds.php:1225
 #, fuzzy
 msgid "Categories"
 msgstr "Kategori:"
 
-#: classes/pref/feeds.php:1300
+#: classes/pref/feeds.php:1228
 #, fuzzy
 msgid "Add category"
 msgstr "Legger til kategori for nyhetsstrømmer"
 
-#: classes/pref/feeds.php:1302
+#: classes/pref/feeds.php:1230
 #, fuzzy
 msgid "(Un)hide empty categories"
 msgstr "Rediger kategorier"
 
-#: classes/pref/feeds.php:1306
+#: classes/pref/feeds.php:1234
 #, fuzzy
 msgid "Remove selected"
 msgstr "Fjerne valgte filtre?"
 
-#: classes/pref/feeds.php:1320
+#: classes/pref/feeds.php:1248
 #, fuzzy
 msgid "More actions..."
 msgstr "Handlinger..."
 
-#: classes/pref/feeds.php:1324
+#: classes/pref/feeds.php:1252
 msgid "Manual purge"
 msgstr "Slett manuelt"
 
-#: classes/pref/feeds.php:1328
+#: classes/pref/feeds.php:1256
 msgid "Clear feed data"
 msgstr "Slett nyhetsstrømsdata"
 
-#: classes/pref/feeds.php:1379
-msgid "Import and export"
-msgstr ""
-
-#: classes/pref/feeds.php:1381
+#: classes/pref/feeds.php:1307
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1383
+#: classes/pref/feeds.php:1309
 msgid ""
 "Using OPML you can export and import your feeds, filters, labels and Tiny "
 "Tiny RSS settings."
 msgstr ""
 
-#: classes/pref/feeds.php:1385
+#: classes/pref/feeds.php:1311
 msgid "Only main settings profile can be migrated using OPML."
 msgstr ""
 
-#: classes/pref/feeds.php:1398
+#: classes/pref/feeds.php:1324
 #, fuzzy
 msgid "Import my OPML"
 msgstr "Importerer OPML (bruker DOMXML-utvidelsen)..."
 
-#: classes/pref/feeds.php:1402
+#: classes/pref/feeds.php:1328
 msgid "Filename:"
 msgstr ""
 
-#: classes/pref/feeds.php:1404
+#: classes/pref/feeds.php:1330
 #, fuzzy
 msgid "Include settings"
 msgstr "Inkluder i e-postsammendraget"
 
-#: classes/pref/feeds.php:1408
+#: classes/pref/feeds.php:1334
 #, fuzzy
 msgid "Export OPML"
 msgstr "Eksporter OPML"
 
-#: classes/pref/feeds.php:1412
+#: classes/pref/feeds.php:1338
 #, fuzzy
 msgid ""
 "Your OPML can be published publicly and can be subscribed by anyone who "
@@ -2426,42 +2418,22 @@ 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:1414
+#: classes/pref/feeds.php:1340
 msgid ""
 "Published OPML does not include your Tiny Tiny RSS settings, feeds that "
 "require authentication or feeds hidden from Popular feeds."
 msgstr ""
 
-#: classes/pref/feeds.php:1417
+#: classes/pref/feeds.php:1343
 msgid "Display published OPML URL"
 msgstr ""
 
-#: classes/pref/feeds.php:1420 plugins/import_export/init.php:66
-#, fuzzy
-msgid "Article archive"
-msgstr "Artikkeldato"
-
-#: classes/pref/feeds.php:1422 plugins/import_export/init.php:68
-msgid ""
-"You can export and import your Starred and Archived articles for safekeeping "
-"or when migrating between tt-rss instances."
-msgstr ""
-
-#: classes/pref/feeds.php:1425
-#, fuzzy
-msgid "Export my data"
-msgstr "Eksporter OPML"
-
-#: classes/pref/feeds.php:1440
-msgid "Import"
-msgstr "Importer"
-
-#: classes/pref/feeds.php:1447
+#: classes/pref/feeds.php:1353
 #, fuzzy
 msgid "Firefox integration"
 msgstr "Firefox integrering"
 
-#: classes/pref/feeds.php:1449
+#: classes/pref/feeds.php:1355
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
@@ -2469,45 +2441,21 @@ msgstr ""
 "Denne Tiny Tiny RSS siden kan bli brukt som nyhetsstrømsleser for Firefox "
 "ved å trykke på lenken nedenfor."
 
-#: classes/pref/feeds.php:1456
+#: classes/pref/feeds.php:1362
 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:1464
-msgid "Bookmarklets"
-msgstr ""
-
-#: classes/pref/feeds.php:1466 plugins/bookmarklets/init.php:24
-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 ""
-
-#: classes/pref/feeds.php:1470
-#, fuzzy, php-format
-msgid "Subscribe to %s in Tiny Tiny RSS?"
-msgstr "Returner til Tiny Tiny RSS"
-
-#: classes/pref/feeds.php:1474
-#, fuzzy
-msgid "Subscribe in Tiny Tiny RSS"
-msgstr "Returner til Tiny Tiny RSS"
-
-#: classes/pref/feeds.php:1476 plugins/bookmarklets/init.php:34
-msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
-msgstr ""
-
-#: classes/pref/feeds.php:1484
+#: classes/pref/feeds.php:1370
 #, fuzzy
 msgid "Published & shared articles / Generated feeds"
 msgstr "Sett poeng på nytt for artiklene i de valgte nyhetskanalene?"
 
-#: classes/pref/feeds.php:1486
+#: classes/pref/feeds.php:1372
 #, fuzzy
 msgid "Published articles and generated feeds"
 msgstr "Sett poeng på nytt for artiklene i de valgte nyhetskanalene?"
 
-#: classes/pref/feeds.php:1488
+#: classes/pref/feeds.php:1374
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the URL specified below."
@@ -2515,51 +2463,51 @@ 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:1494
+#: classes/pref/feeds.php:1380
 #, fuzzy
 msgid "Display URL"
 msgstr "Vis stikkord"
 
-#: classes/pref/feeds.php:1497
+#: classes/pref/feeds.php:1383
 msgid "Clear all generated URLs"
 msgstr ""
 
-#: classes/pref/feeds.php:1499
+#: classes/pref/feeds.php:1385
 #, fuzzy
 msgid "Articles shared by URL"
 msgstr "Marker artikkel som favoritt"
 
-#: classes/pref/feeds.php:1501
+#: classes/pref/feeds.php:1387
 msgid "You can disable all articles shared by unique URLs here."
 msgstr ""
 
-#: classes/pref/feeds.php:1504
+#: classes/pref/feeds.php:1390
 #, fuzzy
 msgid "Unshare all articles"
 msgstr "Uleste artikler"
 
-#: classes/pref/feeds.php:1579
+#: classes/pref/feeds.php:1468
 #, 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:1616 classes/pref/feeds.php:1685
+#: classes/pref/feeds.php:1505 classes/pref/feeds.php:1574
 #, fuzzy
 msgid "Click to edit feed"
 msgstr "Trykk for å endre"
 
-#: classes/pref/feeds.php:1634 classes/pref/feeds.php:1705
+#: classes/pref/feeds.php:1523 classes/pref/feeds.php:1594
 #, fuzzy
 msgid "Unsubscribe from selected feeds"
 msgstr "Fjern abonnement på valgte nyhetsstrømmer"
 
-#: classes/pref/feeds.php:1645
+#: classes/pref/feeds.php:1534
 msgid "These feeds have not been updated because of errors:"
 msgstr "Disse nyhetsstrømmene kunne ikke oppdateres på grunn av feil:"
 
-#: plugins/pocket/pocket.php:24
+#: plugins/pocket/init.php:30
 msgid "Pocket"
 msgstr ""
 
@@ -2579,149 +2527,275 @@ msgstr ""
 msgid "Back to feeds"
 msgstr "Trykk for å endre"
 
+#: plugins/digest/digest_body.php:56
+msgid "Hello,"
+msgstr "Hei, "
+
 #: plugins/digest/digest_body.php:62
 msgid "Regular version"
 msgstr ""
 
-#: plugins/pinterest/pinterest.php:23
+#: plugins/nsfw/init.php:32 plugins/nsfw/init.php:43
+msgid "Not work safe (click to toggle)"
+msgstr ""
+
+#: plugins/nsfw/init.php:53
+msgid "NSFW Plugin"
+msgstr ""
+
+#: plugins/nsfw/init.php:80
+msgid "Tags to consider NSFW (comma-separated)"
+msgstr ""
+
+#: plugins/nsfw/init.php:101
+#, fuzzy
+msgid "Configuration saved."
+msgstr "Konfigurasjonen er lagret."
+
+#: plugins/pinterest/init.php:29
 msgid "Pinterest"
 msgstr ""
 
-#: plugins/mail/mail.php:66 plugins/mail/mail.php:72 plugins/mail/init.php:72
-#: plugins/mail/init.php:78
+#: plugins/auth_internal/init.php:62
+#, fuzzy
+msgid "Please enter your one time password:"
+msgstr "Vennligst skriv inn et notat for denne artikkelen:"
+
+#: plugins/auth_internal/init.php:185
+msgid "Password has been changed."
+msgstr "Passord har blitt endret."
+
+#: plugins/auth_internal/init.php:187
+msgid "Old password is incorrect."
+msgstr "Gammelt passord er feil"
+
+#: plugins/bookmarklets/init.php:22
+msgid "Bookmarklets"
+msgstr ""
+
+#: plugins/bookmarklets/init.php:24
+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 ""
+
+#: plugins/bookmarklets/init.php:28
+#, fuzzy, php-format
+msgid "Subscribe to %s in Tiny Tiny RSS?"
+msgstr "Returner til Tiny Tiny RSS"
+
+#: plugins/bookmarklets/init.php:32
+#, fuzzy
+msgid "Subscribe in Tiny Tiny RSS"
+msgstr "Returner til Tiny Tiny RSS"
+
+#: plugins/bookmarklets/init.php:34
+msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
+msgstr ""
+
+#: plugins/import_export/init.php:64
+msgid "Import and export"
+msgstr ""
+
+#: plugins/import_export/init.php:66
+#, fuzzy
+msgid "Article archive"
+msgstr "Artikkeldato"
+
+#: plugins/import_export/init.php:68
+msgid ""
+"You can export and import your Starred and Archived articles for safekeeping "
+"or when migrating between tt-rss instances."
+msgstr ""
+
+#: plugins/import_export/init.php:71
+#, fuzzy
+msgid "Export my data"
+msgstr "Eksporter OPML"
+
+#: plugins/import_export/init.php:87
+msgid "Import"
+msgstr "Importer"
+
+#: plugins/import_export/init.php:221
+#, fuzzy
+msgid "Could not import: incorrect schema version."
+msgstr "Kunne ikke finne den nødvendige skjemafilen, nødvendig versjon:"
+
+#: plugins/import_export/init.php:226
+msgid "Could not import: unrecognized document format."
+msgstr ""
+
+#: plugins/import_export/init.php:385
+#, php-format
+msgid "Finished: %d articles processed, %d imported, %d feeds created."
+msgstr ""
+
+#: plugins/import_export/init.php:391
+msgid "Could not load XML document."
+msgstr ""
+
+#: plugins/import_export/init.php:403
+#, fuzzy
+msgid "Prepare data"
+msgstr "Lagre"
+
+#: plugins/import_export/init.php:424
+#, php-format
+msgid ""
+"Could not upload file. You might need to adjust upload_max_filesize\n"
+"\t\t\t\tin PHP.ini (current value = %s)"
+msgstr ""
+
+#: plugins/mail/init.php:72 plugins/mail/init.php:78
 msgid "[Forwarded]"
 msgstr ""
 
-#: plugins/mail/mail.php:66 plugins/mail/init.php:72
+#: plugins/mail/init.php:72
 #, fuzzy
 msgid "Multiple articles"
 msgstr "Alle artikler"
 
-#: plugins/mail/mail.php:87
+#: plugins/mail/init.php:93
 msgid "From:"
 msgstr ""
 
-#: plugins/mail/mail.php:96
+#: plugins/mail/init.php:102
 #, fuzzy
 msgid "To:"
 msgstr "Topp"
 
-#: plugins/mail/mail.php:109
+#: plugins/mail/init.php:115
 #, fuzzy
 msgid "Subject:"
 msgstr "Velg:"
 
-#: plugins/mail/mail.php:125
+#: plugins/mail/init.php:131
 #, fuzzy
 msgid "Send e-mail"
 msgstr "Skift e-post"
 
-#: plugins/note/note.php:22 plugins/note/note.js:11
+#: plugins/note/init.php:28 plugins/note/note.js:11
 #, fuzzy
 msgid "Edit article note"
 msgstr "Endre Stikkord"
 
-#: plugins/example/example.php:29 plugins/example/init.php:38
+#: plugins/example/init.php:38
 #, fuzzy
 msgid "Example Pane"
 msgstr "Eksempler"
 
-#: plugins/example/example.php:53 plugins/example/init.php:69
+#: plugins/example/init.php:69
 msgid "Sample value"
 msgstr ""
 
-#: plugins/example/example.php:59 plugins/example/init.php:75
+#: plugins/example/init.php:75
 #, fuzzy
 msgid "Set value"
 msgstr "Sett som favorittartikkel"
 
-#: plugins/identica/identica.php:23
+#: plugins/identica/init.php:29
 #, fuzzy
 msgid "Share on identi.ca"
 msgstr "Tittel"
 
-#: plugins/instances/instances.php:29
+#: plugins/owncloud/init.php:35
+msgid "Owncloud"
+msgstr ""
+
+#: plugins/owncloud/init.php:59
+msgid "Owncloud url"
+msgstr ""
+
+#: plugins/owncloud/init.php:74
+msgid "Bookmark on OwnCloud "
+msgstr ""
+
+#: plugins/instances/init.php:144
 #, fuzzy
 msgid "Linked"
 msgstr "Lenke"
 
-#: plugins/instances/instances.php:180
+#: plugins/instances/init.php:295
 #, fuzzy
 msgid "Link instance"
 msgstr "Endre stikkord"
 
-#: plugins/instances/instances.php:192 plugins/instances/init.php:307
+#: plugins/instances/init.php:307
 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 ""
 
-#: plugins/instances/instances.php:202
+#: plugins/instances/init.php:317
 msgid "Last connected"
 msgstr ""
 
-#: plugins/instances/instances.php:203
+#: plugins/instances/init.php:318
 msgid "Status"
 msgstr ""
 
-#: plugins/instances/instances.php:204
+#: plugins/instances/init.php:319
 #, fuzzy
 msgid "Stored feeds"
 msgstr "Flere nyhetsstrømmer"
 
-#: plugins/share/share.php:21
+#: plugins/share/init.php:27
 #, fuzzy
 msgid "Share by URL"
 msgstr "Marker artikkel som favoritt"
 
-#: plugins/share/share.php:43 plugins/share/init.php:49
+#: plugins/share/init.php:49
 msgid "You can share this article by the following unique URL:"
 msgstr ""
 
-#: plugins/flattr/flattr.php:37
+#: plugins/flattr/init.php:30
 #, fuzzy
-msgid "Flattr article"
+msgid "Flattr this article."
 msgstr "Marker artikkel som favoritt"
 
-#: plugins/googleplus/googleplus.php:23
+#: plugins/googleplus/init.php:29
 #, fuzzy
 msgid "Share on Google+"
 msgstr "Tittel"
 
-#: plugins/updater/updater.php:267 plugins/updater/updater.php:279
+#: plugins/updater/init.php:294 plugins/updater/init.php:306
 #: plugins/updater/updater.js:10
 #, fuzzy
 msgid "Update Tiny Tiny RSS"
 msgstr "Returner til Tiny Tiny RSS"
 
-#: plugins/updater/updater.php:282 plugins/updater/init.php:303
+#: plugins/updater/init.php:309
 #, fuzzy
 msgid "Your Tiny Tiny RSS installation is up to date."
 msgstr "Tiny Tiny RSS-databasen er oppdatert"
 
-#: plugins/updater/updater.php:291 plugins/updater/init.php:313
+#: plugins/updater/init.php:319
 msgid ""
 "Do not close this dialog until updating is finished. Backup your tt-rss "
 "directory before continuing."
 msgstr ""
 
-#: plugins/updater/updater.php:294 plugins/updater/init.php:316
+#: plugins/updater/init.php:322
 #, fuzzy
 msgid "Ready to update."
 msgstr "Siste oppdatering:"
 
-#: plugins/updater/updater.php:299 plugins/updater/init.php:321
+#: plugins/updater/init.php:327
 #, fuzzy
 msgid "Start update"
 msgstr "Siste oppdatering:"
 
-#: js/feedlist.js:283 js/feedlist.js:282 js/feedlist.js:265 js/feedlist.js:218
+#: plugins/tweet/init.php:29
+#, fuzzy
+msgid "Share on Twitter"
+msgstr "Tittel"
+
+#: js/feedlist.js:218
 msgid "New articles available in this feed (click to show)"
 msgstr ""
 
-#: js/feedlist.js:490 js/feedlist.js:505 js/feedlist.js:489 js/feedlist.js:504
-#: js/feedlist.js:469 js/feedlist.js:484 js/feedlist.js:420 js/feedlist.js:435
-#: plugins/digest/digest.js:25
+#: js/feedlist.js:420 js/feedlist.js:435 plugins/digest/digest.js:25
 msgid "Mark all articles in %s as read?"
 msgstr "Marker alle artikler i %s som leste?"
 
@@ -2731,151 +2805,138 @@ msgid ""
 "your browser information. Your IP would be saved in the database."
 msgstr ""
 
-#: js/functions.js:618 js/functions.js:614 js/functions.js:622
+#: js/functions.js:627
 #, fuzzy
 msgid "Date syntax appears to be correct:"
 msgstr "Gammelt passord er feil"
 
-#: js/functions.js:621 js/functions.js:617 js/functions.js:625
+#: js/functions.js:630
 #, fuzzy
 msgid "Date syntax is incorrect."
 msgstr "Gammelt passord er feil"
 
-#: js/functions.js:748 js/functions.js:744 js/functions.js:752
+#: js/functions.js:757
 #, fuzzy
 msgid "Remove stored feed icon?"
 msgstr "Fjern lagrede data"
 
-#: js/functions.js:780 js/functions.js:776 js/functions.js:784
+#: js/functions.js:789
 #, fuzzy
 msgid "Please select an image file to upload."
 msgstr "Vennligst velg en nyhetsstrøm"
 
-#: js/functions.js:782 js/functions.js:778 js/functions.js:786
+#: js/functions.js:791
 msgid "Upload new icon for this feed?"
 msgstr ""
 
-#: js/functions.js:799 js/functions.js:795 js/functions.js:803
+#: js/functions.js:808
 msgid "Please enter label caption:"
 msgstr "Vennligst skriv inn merkelappstekst:"
 
-#: js/functions.js:804 js/functions.js:800 js/functions.js:808
+#: js/functions.js:813
 msgid "Can't create label: missing caption."
 msgstr "Kan ikke skape merkelapp, mangler overskrift."
 
-#: js/functions.js:847 js/functions.js:843 js/functions.js:851
+#: js/functions.js:856
 msgid "Subscribe to Feed"
 msgstr "Abonner på nyhetsstrøm"
 
-#: js/functions.js:874 js/functions.js:870 js/functions.js:878
+#: js/functions.js:883
 #, fuzzy
 msgid "Subscribed to %s"
 msgstr "Abonnerer på følgende nyhetsstrømmer:"
 
-#: js/functions.js:879 js/functions.js:875 js/functions.js:883
+#: js/functions.js:888
 msgid "Specified URL seems to be invalid."
 msgstr ""
 
-#: js/functions.js:882 js/functions.js:878 js/functions.js:886
+#: js/functions.js:891
 msgid "Specified URL doesn't seem to contain any feeds."
 msgstr ""
 
-#: js/functions.js:935 js/functions.js:931 js/functions.js:939
+#: js/functions.js:944
 #, fuzzy
 msgid "Couldn't download the specified URL: %s"
 msgstr "Kan ikke abonnere: Ingen nyhetsstrømsadresse er blitt gitt"
 
-#: js/functions.js:939 js/functions.js:935 js/functions.js:943
+#: js/functions.js:948
 #, fuzzy
 msgid "You are already subscribed to this feed."
 msgstr "Du kan ikke fjerne abonnement fra kategorien."
 
-#: js/functions.js:1067 js/functions.js:1063 js/functions.js:1071
-#: js/functions.js:1073
+#: js/functions.js:1078
 #, fuzzy
 msgid "Edit rule"
 msgstr "Filtre"
 
-#: js/functions.js:1093 js/functions.js:1089 js/functions.js:1097
-#: js/functions.js:1099
+#: js/functions.js:1104
 #, fuzzy
 msgid "Edit action"
 msgstr "Nyhetsstrømshandlinger"
 
-#: js/functions.js:1130 js/functions.js:1126 js/functions.js:1134
-#: js/functions.js:1136
+#: js/functions.js:1141
 msgid "Create Filter"
 msgstr "Lag filter"
 
-#: js/functions.js:1234 js/functions.js:1230 js/functions.js:1238
-#: js/functions.js:1240
+#: js/functions.js:1245
 msgid ""
 "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
 "hub again on next feed update."
 msgstr ""
 
-#: js/functions.js:1255 js/tt-rss.js:421 js/functions.js:1251 js/tt-rss.js:381
-#: js/functions.js:1259 js/tt-rss.js:367 js/functions.js:1261
+#: js/functions.js:1266 js/tt-rss.js:367
 msgid "Unsubscribe from %s?"
 msgstr "Fjerne abonnement på %s?"
 
-#: js/functions.js:1362 js/functions.js:1358 js/functions.js:1368
-#: js/functions.js:1370
+#: js/functions.js:1375
 #, fuzzy
 msgid "Please enter category title:"
 msgstr "Vennligst skriv inn et notat for denne artikkelen:"
 
-#: js/functions.js:1393 js/functions.js:1389 js/functions.js:1399
-#: js/functions.js:1401
+#: js/functions.js:1406
 msgid "Generate new syndication address for this feed?"
 msgstr ""
 
-#: js/functions.js:1584 js/tt-rss.js:400 js/tt-rss.js:903 js/functions.js:1580
-#: js/tt-rss.js:782 js/tt-rss.js:362 js/tt-rss.js:717 js/functions.js:1590
-#: js/tt-rss.js:348 js/tt-rss.js:709 js/functions.js:1592
+#: js/functions.js:1597 js/tt-rss.js:348 js/tt-rss.js:713
 msgid "You can't edit this kind of feed."
 msgstr "Du kan ikke endre denne typen nyhetsstrøm"
 
-#: js/functions.js:1599 js/functions.js:1595 js/functions.js:1605
-#: js/functions.js:1607
+#: js/functions.js:1612
 #, fuzzy
 msgid "Edit Feed"
 msgstr "Rediger nyhetsstrømmen"
 
-#: js/functions.js:1637 js/functions.js:1633 js/functions.js:1643
-#: js/functions.js:1645
+#: js/functions.js:1650
 #, fuzzy
 msgid "More Feeds"
 msgstr "Flere nyhetsstrømmer"
 
-#: js/functions.js:1698 js/functions.js:1808 js/prefs.js:408 js/prefs.js:438
-#: js/prefs.js:470 js/prefs.js:653 js/prefs.js:673 js/prefs.js:1326
-#: js/prefs.js:1471 js/functions.js:1694 js/functions.js:1804 js/prefs.js:397
-#: js/prefs.js:427 js/prefs.js:459 js/prefs.js:642 js/prefs.js:662
-#: js/prefs.js:1213 js/prefs.js:1358 js/functions.js:1704 js/functions.js:1814
-#: js/prefs.js:1203 js/prefs.js:1348 js/functions.js:1706 js/functions.js:1816
+#: js/functions.js:1711 js/functions.js:1821 js/prefs.js:397 js/prefs.js:427
+#: js/prefs.js:459 js/prefs.js:642 js/prefs.js:662 js/prefs.js:1203
+#: js/prefs.js:1348
 msgid "No feeds are selected."
 msgstr "Ingen nyhetsstrømmer er valgt"
 
-#: js/functions.js:1740 js/functions.js:1736 js/functions.js:1746
-#: js/functions.js:1748
+#: js/functions.js:1753
 msgid ""
 "Remove selected feeds from the archive? Feeds with stored articles will not "
 "be removed."
 msgstr ""
 
-#: js/functions.js:1779 js/functions.js:1775 js/functions.js:1785
-#: js/functions.js:1787
+#: js/functions.js:1792
 #, fuzzy
 msgid "Feeds with update errors"
 msgstr "Oppdateringsfeil"
 
-#: js/functions.js:1790 js/prefs.js:1308 js/functions.js:1786 js/prefs.js:1195
-#: js/functions.js:1796 js/prefs.js:1185 js/functions.js:1798
+#: js/functions.js:1803 js/prefs.js:1185
 #, fuzzy
 msgid "Remove selected feeds?"
 msgstr "Fjerne valgte filtre?"
 
+#: js/functions.js:1904
+msgid "Help"
+msgstr "Hjelp"
+
 #: js/PrefFeedTree.js:47
 #, fuzzy
 msgid "Edit category"
@@ -2899,429 +2960,324 @@ msgstr "Vennligst skriv inn brukernavn:"
 msgid "Can't create user: no login specified."
 msgstr "Kan ikke legge til bruker: brukernavn mangler."
 
-#: js/prefs.js:128 js/prefs.js:117
+#: js/prefs.js:117
 #, fuzzy
 msgid "Edit Filter"
 msgstr "Filtre"
 
-#: js/prefs.js:175 js/prefs.js:164
+#: js/prefs.js:164
 #, fuzzy
 msgid "Remove filter?"
 msgstr "Fjerne %s filteret?"
 
-#: js/prefs.js:290 js/prefs.js:279
+#: js/prefs.js:279
 msgid "Remove selected labels?"
 msgstr "Fjerne merkede merkelapper?"
 
-#: js/prefs.js:306 js/prefs.js:1512 js/prefs.js:295 js/prefs.js:1399
-#: js/prefs.js:1389
+#: js/prefs.js:295 js/prefs.js:1389
 msgid "No labels are selected."
 msgstr "Ingen merkelapper er markert"
 
-#: js/prefs.js:320 js/prefs.js:309
+#: js/prefs.js:309
 msgid ""
 "Remove selected users? Neither default admin nor your account will be "
 "removed."
 msgstr ""
 
-#: js/prefs.js:337 js/prefs.js:518 js/prefs.js:539 js/prefs.js:578
 #: js/prefs.js:326 js/prefs.js:507 js/prefs.js:528 js/prefs.js:567
 msgid "No users are selected."
 msgstr "Ingen bruker er markert"
 
-#: js/prefs.js:355 js/prefs.js:344
+#: js/prefs.js:344
 msgid "Remove selected filters?"
 msgstr "Fjerne valgte filtre?"
 
-#: js/prefs.js:370 js/prefs.js:608 js/prefs.js:627 js/prefs.js:359
-#: js/prefs.js:597 js/prefs.js:616
+#: js/prefs.js:359 js/prefs.js:597 js/prefs.js:616
 msgid "No filters are selected."
 msgstr "Ingen filtre er valgt"
 
-#: js/prefs.js:389 js/prefs.js:378
+#: js/prefs.js:378
 msgid "Unsubscribe from selected feeds?"
 msgstr "Fjern abonnement på valgte nyhetsstrømmer"
 
-#: js/prefs.js:423 js/prefs.js:412
+#: js/prefs.js:412
 msgid "Please select only one feed."
 msgstr "Vennligst velg kun en nyhetsstrøm"
 
-#: js/prefs.js:429 js/prefs.js:418
+#: js/prefs.js:418
 msgid "Erase all non-starred articles in selected feed?"
 msgstr "Fjern alle ikke-favoriserte artikler i den valgte nyhetsstrømmen?"
 
-#: js/prefs.js:451 js/prefs.js:440
+#: js/prefs.js:440
 msgid "How many days of articles to keep (0 - use default)?"
 msgstr "Hvor mange dager med artikler skal beholdes (0 - bruk standard)?"
 
-#: js/prefs.js:489 js/prefs.js:478
+#: js/prefs.js:478
 msgid "Login field cannot be blank."
 msgstr "Brukernavn kan ikke være blankt"
 
-#: js/prefs.js:523 js/prefs.js:544 js/prefs.js:583 js/prefs.js:512
-#: js/prefs.js:533 js/prefs.js:572
+#: js/prefs.js:512 js/prefs.js:533 js/prefs.js:572
 msgid "Please select only one user."
 msgstr "Vennligst velg kun en bruker"
 
-#: js/prefs.js:548 js/prefs.js:537
+#: js/prefs.js:537
 msgid "Reset password of selected user?"
 msgstr "Nullstill passordet til utvalgte bruker?"
 
-#: js/prefs.js:613 js/prefs.js:602
+#: js/prefs.js:602
 msgid "Please select only one filter."
 msgstr "Vennligst velg kun et filter"
 
-#: js/prefs.js:631 js/prefs.js:620
+#: js/prefs.js:620
 #, fuzzy
 msgid "Combine selected filters?"
 msgstr "Fjerne valgte filtre?"
 
-#: js/prefs.js:695 js/prefs.js:684
+#: js/prefs.js:684
 #, fuzzy
 msgid "Edit Multiple Feeds"
 msgstr "Nyhetsstrømsredigerer"
 
-#: js/prefs.js:719 js/prefs.js:708
+#: js/prefs.js:708
 msgid "Save changes to selected feeds?"
 msgstr "Lagre endringer til de valgte nyhetsstrømmene?"
 
-#: js/prefs.js:811 js/prefs.js:800 js/prefs.js:790
+#: js/prefs.js:790
 #, fuzzy
 msgid "OPML Import"
 msgstr "Importer"
 
-#: js/prefs.js:838 js/prefs.js:827 js/prefs.js:817
+#: js/prefs.js:817
 #, fuzzy
 msgid "Please choose an OPML file first."
 msgstr "Vennligst velg en eller flere nyhetsstrømmer først"
 
-#: js/prefs.js:854 plugins/import_export/import_export.js:112
-#, fuzzy
-msgid "Please choose the file first."
-msgstr "Vennligst velg en eller flere nyhetsstrømmer først"
-
-#: js/prefs.js:1010 js/prefs.js:983 js/prefs.js:973
+#: js/prefs.js:973
 msgid "Reset to defaults?"
 msgstr "Tilbakefør til standardinnstillingene"
 
-#: js/prefs.js:1215 js/prefs.js:1102 js/prefs.js:1092
+#: js/prefs.js:1092
 msgid ""
 "Remove category %s? Any nested feeds would be placed into Uncategorized."
 msgstr ""
 
-#: js/prefs.js:1242 js/prefs.js:1129 js/prefs.js:1119
+#: js/prefs.js:1119
 msgid "Remove selected categories?"
 msgstr "Fjerne valgte kategorier?"
 
-#: js/prefs.js:1258 js/prefs.js:1145 js/prefs.js:1135
+#: js/prefs.js:1135
 msgid "No categories are selected."
 msgstr "Ingen kategorier er valgt."
 
-#: js/prefs.js:1266 js/prefs.js:1153 js/prefs.js:1143
+#: js/prefs.js:1143
 #, fuzzy
 msgid "Category title:"
 msgstr "Kategoriredigerer"
 
-#: js/prefs.js:1297 js/prefs.js:1184 js/prefs.js:1174
+#: js/prefs.js:1174
 #, fuzzy
 msgid "Feeds without recent updates"
 msgstr "Oppdateringsfeil"
 
-#: js/prefs.js:1346 js/prefs.js:1233 js/prefs.js:1223
+#: js/prefs.js:1223
 #, fuzzy
 msgid "Replace current OPML publishing address with a new one?"
 msgstr "Bytt ut nåværende publiseringsadresse med en ny?"
 
-#: js/prefs.js:1455 js/prefs.js:1342 js/prefs.js:1332
+#: js/prefs.js:1332
 msgid "Rescore articles in selected feeds?"
 msgstr "Sett poeng på nytt for artiklene i de valgte nyhetskanalene?"
 
-#: js/prefs.js:1478 js/prefs.js:1365 js/prefs.js:1355
+#: js/prefs.js:1355
 msgid "Rescore all articles? This operation may take a lot of time."
 msgstr "Endre poengene til artiklene? Dette kan ta lang tid."
 
-#: js/prefs.js:1498 js/prefs.js:1385 js/prefs.js:1375
+#: js/prefs.js:1375
 #, fuzzy
 msgid "Reset selected labels to default colors?"
 msgstr "Sett merkelappsfargene til standard?"
 
-#: js/prefs.js:1535 js/prefs.js:1422 js/prefs.js:1412
+#: js/prefs.js:1412
 msgid "Settings Profiles"
 msgstr ""
 
-#: js/prefs.js:1544 js/prefs.js:1431 js/prefs.js:1421
+#: js/prefs.js:1421
 msgid ""
 "Remove selected profiles? Active and default profiles will not be removed."
 msgstr ""
 
-#: js/prefs.js:1562 js/prefs.js:1449 js/prefs.js:1439
+#: js/prefs.js:1439
 #, fuzzy
 msgid "No profiles are selected."
 msgstr "Ingen artikkel er valgt."
 
-#: js/prefs.js:1570 js/prefs.js:1623 js/prefs.js:1457 js/prefs.js:1510
 #: js/prefs.js:1447 js/prefs.js:1500
 #, fuzzy
 msgid "Activate selected profile?"
 msgstr "Fjerne valgte filtre?"
 
-#: js/prefs.js:1586 js/prefs.js:1639 js/prefs.js:1473 js/prefs.js:1526
 #: js/prefs.js:1463 js/prefs.js:1516
 #, fuzzy
 msgid "Please choose a profile to activate."
 msgstr "Vennligst velg en eller flere nyhetsstrømmer først"
 
-#: js/prefs.js:1647 js/prefs.js:1534 js/prefs.js:1524
+#: js/prefs.js:1524
 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr ""
 
-#: js/prefs.js:1666 js/prefs.js:1553 js/prefs.js:1543
+#: js/prefs.js:1543
 msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr ""
 
-#: js/prefs.js:1764 js/prefs.js:1651 js/prefs.js:1641
+#: js/prefs.js:1641
 msgid "Label Editor"
 msgstr "Merkelappredigerer"
 
-#: js/prefs.js:1827 js/prefs.js:1714 js/prefs.js:1704
+#: js/prefs.js:1704
 msgid ""
 "This will clear your stored authentication information for Twitter. Continue?"
 msgstr ""
 
-#: js/prefs.js:1911 plugins/import_export/import_export.js:13
-#, fuzzy
-msgid "Export Data"
-msgstr "Eksporter OPML"
-
-#: js/prefs.js:1938 plugins/import_export/import_export.js:40
-msgid ""
-"Finished, exported %d articles. You can download the data <a "
-"class='visibleLink' href='%u'>here</a>."
-msgstr ""
-
-#: js/prefs.js:1991 plugins/import_export/import_export.js:93
-#, fuzzy
-msgid "Data Import"
-msgstr "Importer"
-
-#: js/prefs.js:2027 js/prefs.js:1794 js/prefs.js:1784
+#: js/prefs.js:1784
 #, fuzzy
 msgid "Subscribing to feeds..."
 msgstr "Abonnerer på nyhetsstrømmen..."
 
-#: js/tt-rss.js:147 js/tt-rss.js:141 js/tt-rss.js:120
+#: js/prefs.js:1821
+msgid "Clear stored data for this plugin?"
+msgstr ""
+
+#: js/tt-rss.js:120
 msgid "Mark all articles as read?"
 msgstr "Marker alle artikler som leste?"
 
-#: js/tt-rss.js:410 js/tt-rss.js:370 js/tt-rss.js:356
+#: js/tt-rss.js:356
 msgid "You can't unsubscribe from the category."
 msgstr "Du kan ikke fjerne abonnement fra kategorien."
 
-#: js/tt-rss.js:415 js/tt-rss.js:596 js/tt-rss.js:591 js/tt-rss.js:375
-#: js/tt-rss.js:525 js/tt-rss.js:361 js/tt-rss.js:511
+#: js/tt-rss.js:361 js/tt-rss.js:511
 msgid "Please select some feed first."
 msgstr "Vennligst velg en eller flere nyhetsstrømmer først"
 
-#: js/tt-rss.js:591 js/tt-rss.js:586 js/tt-rss.js:520 js/tt-rss.js:506
+#: js/tt-rss.js:506
 msgid "You can't rescore this kind of feed."
 msgstr "Du kan ikke endre poengsummen for denne typen nyhetskanal"
 
-#: js/tt-rss.js:601 js/tt-rss.js:596 js/tt-rss.js:530 js/tt-rss.js:516
+#: js/tt-rss.js:516
 msgid "Rescore articles in %s?"
 msgstr "Endre poengene for artiklene i %s?"
 
-#: js/tt-rss.js:1062 js/tt-rss.js:883 js/tt-rss.js:825 js/tt-rss.js:830
+#: js/tt-rss.js:672
+#, fuzzy
+msgid "Please enable mail plugin first."
+msgstr "Vennligst velg en eller flere nyhetsstrømmer først"
+
+#: js/tt-rss.js:834
 #, fuzzy
 msgid "New version available!"
 msgstr "Ny versjon av Tiny Tiny Rss er tilgjengelig!"
 
-#: js/viewfeed.js:108 js/viewfeed.js:104
+#: js/viewfeed.js:104
 #, fuzzy
 msgid "Cancel search"
 msgstr "Avbryt"
 
-#: js/viewfeed.js:456 js/viewfeed.js:445 js/viewfeed.js:451 js/viewfeed.js:435
-#: plugins/digest/digest.js:257 plugins/digest/digest.js:696
+#: js/viewfeed.js:435 plugins/digest/digest.js:257
+#: plugins/digest/digest.js:696
 msgid "Unstar article"
 msgstr "Fjern favorittmerkingen fra artiklen"
 
-#: js/viewfeed.js:461 js/viewfeed.js:450 js/viewfeed.js:456 js/viewfeed.js:440
-#: plugins/digest/digest.js:259 plugins/digest/digest.js:700
+#: js/viewfeed.js:440 plugins/digest/digest.js:259
+#: plugins/digest/digest.js:700
 msgid "Star article"
 msgstr "Marker artikkel som favoritt"
 
-#: js/viewfeed.js:496 js/viewfeed.js:485 js/viewfeed.js:491 js/viewfeed.js:473
-#: plugins/digest/digest.js:262 plugins/digest/digest.js:731
+#: js/viewfeed.js:473 plugins/digest/digest.js:262
+#: plugins/digest/digest.js:731
 msgid "Unpublish article"
 msgstr "Fjern publiseringen av artikkelen."
 
-#: js/viewfeed.js:676 js/viewfeed.js:704 js/viewfeed.js:731 js/viewfeed.js:793
-#: js/viewfeed.js:825 js/viewfeed.js:962 js/viewfeed.js:1005
-#: js/viewfeed.js:1055 js/viewfeed.js:2181 js/viewfeed.js:665
-#: js/viewfeed.js:693 js/viewfeed.js:720 js/viewfeed.js:782 js/viewfeed.js:814
-#: js/viewfeed.js:951 js/viewfeed.js:994 js/viewfeed.js:1044
-#: js/viewfeed.js:2154 js/viewfeed.js:671 js/viewfeed.js:699
-#: js/viewfeed.js:726 js/viewfeed.js:788 js/viewfeed.js:820 js/viewfeed.js:957
-#: js/viewfeed.js:1000 js/viewfeed.js:1050 js/viewfeed.js:2018
 #: js/viewfeed.js:674 js/viewfeed.js:702 js/viewfeed.js:729 js/viewfeed.js:791
 #: js/viewfeed.js:823 js/viewfeed.js:960 js/viewfeed.js:1003
 #: js/viewfeed.js:1053 js/viewfeed.js:1927 plugins/mail/mail.js:7
 msgid "No articles are selected."
 msgstr "Ingen artikler er valgt."
 
-#: js/viewfeed.js:942 js/viewfeed.js:931 js/viewfeed.js:937 js/viewfeed.js:940
+#: js/viewfeed.js:940
 msgid "Mark all visible articles in %s as read?"
 msgstr "Marker alle synlige artikler i %s som leste?"
 
-#: js/viewfeed.js:970 js/viewfeed.js:959 js/viewfeed.js:965 js/viewfeed.js:968
+#: js/viewfeed.js:968
 #, fuzzy
 msgid "Delete %d selected articles in %s?"
 msgstr "Marker %d valgte artikler i %s som leste?"
 
-#: js/viewfeed.js:972 js/viewfeed.js:961 js/viewfeed.js:967 js/viewfeed.js:970
+#: js/viewfeed.js:970
 #, fuzzy
 msgid "Delete %d selected articles?"
 msgstr "Fjerne merkede artikler fra merkelappen?"
 
-#: js/viewfeed.js:1014 js/viewfeed.js:1003 js/viewfeed.js:1009
 #: js/viewfeed.js:1012
 #, fuzzy
 msgid "Archive %d selected articles in %s?"
 msgstr "Marker %d valgte artikler i %s som leste?"
 
-#: js/viewfeed.js:1017 js/viewfeed.js:1006 js/viewfeed.js:1012
 #: js/viewfeed.js:1015
 #, fuzzy
 msgid "Move %d archived articles back?"
 msgstr "Favorittartikler"
 
-#: js/viewfeed.js:1061 js/viewfeed.js:1050 js/viewfeed.js:1056
 #: js/viewfeed.js:1059
 msgid "Mark %d selected articles in %s as read?"
 msgstr "Marker %d valgte artikler i %s som leste?"
 
-#: js/viewfeed.js:1085 js/viewfeed.js:1074 js/viewfeed.js:1080
 #: js/viewfeed.js:1083
 #, fuzzy
 msgid "Edit article Tags"
 msgstr "Endre Stikkord"
 
-#: js/viewfeed.js:1247 js/viewfeed.js:1236 js/viewfeed.js:1242
 #: js/viewfeed.js:1252
 msgid "No article is selected."
 msgstr "Ingen artikkel er valgt."
 
-#: js/viewfeed.js:1282 js/viewfeed.js:1271 js/viewfeed.js:1277
 #: js/viewfeed.js:1287
 msgid "No articles found to mark"
 msgstr "Ingen artikler funnet som kan markeres"
 
-#: js/viewfeed.js:1284 js/viewfeed.js:1273 js/viewfeed.js:1279
 #: js/viewfeed.js:1289
 msgid "Mark %d article(s) as read?"
 msgstr "Marker %d artikkel/artikler som leste?"
 
-#: js/viewfeed.js:1402 js/viewfeed.js:1383
-#, fuzzy
-msgid "Loading..."
-msgstr "Laster nyhetsstrømmer..."
-
-#: js/viewfeed.js:1891 js/viewfeed.js:1864 js/viewfeed.js:1734
 #: js/viewfeed.js:1744
 #, fuzzy
 msgid "Open original article"
 msgstr "Vis opprinnelig artikkelinnhold"
 
-#: js/viewfeed.js:1897 js/viewfeed.js:1870
-#, fuzzy
-msgid "View in a tt-rss tab"
-msgstr "Åpne artikkel i nytt nettleservindu"
-
-#: js/viewfeed.js:1905 js/viewfeed.js:1878 js/viewfeed.js:1742
-#: js/viewfeed.js:1752
-#, fuzzy
-msgid "Mark above as read"
-msgstr "Marker som lest"
-
-#: js/viewfeed.js:1911 js/viewfeed.js:1884 js/viewfeed.js:1748
-#: js/viewfeed.js:1758
-#, fuzzy
-msgid "Mark below as read"
-msgstr "Marker som lest"
-
-#: js/viewfeed.js:1967 js/viewfeed.js:1940 js/viewfeed.js:1804
 #: js/viewfeed.js:1814
 #, fuzzy
 msgid "Remove label"
 msgstr "Fjerne merkede merkelapper?"
 
-#: js/viewfeed.js:1991 js/viewfeed.js:1964 js/viewfeed.js:1828
 #: js/viewfeed.js:1838
 #, fuzzy
 msgid "Playing..."
 msgstr "Laster nyhetsstrømmer..."
 
-#: js/viewfeed.js:1992 js/viewfeed.js:1965 js/viewfeed.js:1829
 #: js/viewfeed.js:1839
 #, fuzzy
 msgid "Click to pause"
 msgstr "Trykk for å endre"
 
-#: js/viewfeed.js:2150 js/viewfeed.js:2123 js/viewfeed.js:1987
 #: js/viewfeed.js:1896
 #, fuzzy
 msgid "Please enter new score for selected articles:"
 msgstr "Vennligst skriv inn et notat for denne artikkelen:"
 
-#: js/viewfeed.js:2192 js/viewfeed.js:2165 js/viewfeed.js:2029
 #: js/viewfeed.js:1938
 #, fuzzy
 msgid "Please enter new score for this article:"
 msgstr "Vennligst skriv inn et notat for denne artikkelen:"
 
-#: js/functions.js:1887 js/functions.js:1891 js/functions.js:1897
-#: js/functions.js:1899
-msgid "Help"
-msgstr "Hjelp"
-
-#: js/prefs.js:1831 js/prefs.js:1821
-msgid "Clear stored data for this plugin?"
-msgstr ""
-
-#: js/tt-rss.js:741 js/tt-rss.js:676 js/tt-rss.js:668
-#, fuzzy
-msgid "Please enable mail plugin first."
-msgstr "Vennligst velg en eller flere nyhetsstrømmer først"
-
-#: plugins/digest/digest_body.php:39
-msgid "Your browser doesn't support Javascript, which is required"
-msgstr ""
-
-#: plugins/nsfw/init.php:32 plugins/nsfw/init.php:43
-msgid "Not work safe (click to toggle)"
-msgstr ""
-
-#: plugins/nsfw/init.php:53
-msgid "NSFW Plugin"
-msgstr ""
-
-#: plugins/nsfw/init.php:80
-msgid "Tags to consider NSFW (comma-separated)"
-msgstr ""
-
-#: plugins/nsfw/init.php:101
-#, fuzzy
-msgid "Configuration saved."
-msgstr "Konfigurasjonen er lagret."
-
-#: plugins/owncloud/init.php:35
-msgid "Owncloud"
-msgstr ""
-
-#: plugins/owncloud/init.php:59
-msgid "Owncloud url"
-msgstr ""
-
 #: plugins/digest/digest.js:71
 #, fuzzy
 msgid "Mark %d displayed articles as read?"
@@ -3352,6 +3308,27 @@ msgstr "Skjul/vis leste nyhetsstrømmer"
 msgid "Load more..."
 msgstr "Laster hjelp..."
 
+#: plugins/import_export/import_export.js:13
+#, fuzzy
+msgid "Export Data"
+msgstr "Eksporter OPML"
+
+#: plugins/import_export/import_export.js:40
+msgid ""
+"Finished, exported %d articles. You can download the data <a "
+"class='visibleLink' href='%u'>here</a>."
+msgstr ""
+
+#: plugins/import_export/import_export.js:93
+#, fuzzy
+msgid "Data Import"
+msgstr "Importer"
+
+#: plugins/import_export/import_export.js:112
+#, fuzzy
+msgid "Please choose the file first."
+msgstr "Vennligst velg en eller flere nyhetsstrømmer først"
+
 #: plugins/mail/mail.js:21
 #, fuzzy
 msgid "Forward article by email"
@@ -3393,6 +3370,101 @@ msgid ""
 "before continuing. Please type 'yes' to continue."
 msgstr ""
 
+#~ msgid "Comments?"
+#~ msgstr "Kommentarer?"
+
+#~ msgid "Move between feeds"
+#~ msgstr "Beveg deg mellom nyhetsstrømmene"
+
+#~ msgid "Move between articles"
+#~ msgstr "Beveg deg mellom artikler"
+
+#~ msgid "Active article actions"
+#~ msgstr "Handlinger for aktive artikler"
+
+#, fuzzy
+#~ msgid "Dismiss read articles"
+#~ msgstr "Skjul synlige leste artikler"
+
+#~ msgid "Mark articles below/above active one as read"
+#~ msgstr "Marker alle artikler under/over den aktive som lest"
+
+#~ msgid "Scroll article content"
+#~ msgstr "Rullevisning av artkkelens innhold"
+
+#~ msgid "Other actions"
+#~ msgstr "Andre handlinger"
+
+#~ msgid "Display this help dialog"
+#~ msgstr "Vis denne hjelpdialogen"
+
+#, fuzzy
+#~ msgid "Multiple articles actions"
+#~ msgstr "Alle artikler"
+
+#, fuzzy
+#~ msgid "Select starred articles"
+#~ msgstr "Slett uleste artikler"
+
+#~ msgid "Feed actions"
+#~ msgstr "Nyhetsstrømshandlinger"
+
+#~ msgid "Mark feed as read"
+#~ msgstr "Marker nyhetsstrøm som lest"
+
+#~ msgid "If viewing category, (un)collapse it"
+#~ msgstr "Hvis kategorien vises, brett ut/klapp den sammen."
+
+#~ msgid "Press any key to close this window."
+#~ msgstr "Trykk på en knapp for å lukk dette vinduet"
+
+#~ msgid "My Feeds"
+#~ msgstr "Mine nyhetsstrømmer"
+
+#~ msgid "Other Feeds"
+#~ msgstr "Andres nyhetsstrømmer"
+
+#~ msgid "Panel actions"
+#~ msgstr "Panelhandlinger"
+
+#~ msgid "Top 25 feeds"
+#~ msgstr "Topp 25 nyhetsstrømmer"
+
+#~ msgid "Edit feed categories"
+#~ msgstr "Rediger nyyhetsstrømskategorier"
+
+#~ msgid "Focus search (if present)"
+#~ msgstr "Fokuser søk (hvis mulig)"
+
+#~ msgid ""
+#~ "<b>Note:</b> not all actions may be available, depending on Tiny Tiny RSS "
+#~ "configuration and your access level."
+#~ msgstr ""
+#~ "<b>Advarsel:</b> ikke alle handlinger er nødvendigvis tilgjengelig, det "
+#~ "avhenger av konfigureringen av Tiny Tiny RSS og ditt tilgangsnivå."
+
+#, fuzzy
+#~ msgid "Open article in new tab"
+#~ msgstr "Åpne artikkel i nytt nettleservindu"
+
+#~ msgid "Select theme"
+#~ msgstr "Velg utseende"
+
+#~ msgid "Right-to-left content"
+#~ msgstr "Innhold som vises fra høyre til venstre"
+
+#, fuzzy
+#~ msgid "Cache content locally"
+#~ msgstr "Mellomlagre bilder lokalt på serveren"
+
+#, fuzzy
+#~ msgid "Loading..."
+#~ msgstr "Laster nyhetsstrømmer..."
+
+#, fuzzy
+#~ msgid "View in a tt-rss tab"
+#~ msgstr "Åpne artikkel i nytt nettleservindu"
+
 #~ msgid "Magpie"
 #~ msgstr "Magpie"
 
@@ -3571,16 +3643,9 @@ msgstr ""
 #~ msgid "See also:"
 #~ msgstr "Se også:"
 
-#~ msgid "description"
-#~ msgstr "beskrivelse"
-
 #~ msgid "short_desc"
 #~ msgstr "kort beskrivelse"
 
-#, fuzzy
-#~ msgid "Dismiss article"
-#~ msgstr "Publiser artiklen"
-
 #, fuzzy
 #~ msgid "Remove:"
 #~ msgstr "Fjern"
@@ -3707,9 +3772,6 @@ msgstr ""
 #~ "Dette valget skjuler kanallisten og tillater at den vises etter ønske, "
 #~ "brukbart for små skjermer."
 
-#~ msgid "Enable feed icons"
-#~ msgstr "Bruk nyhetsstrømsikoner"
-
 #~ msgid "Enable labels"
 #~ msgstr "Tillat merkelapper"
 
@@ -3837,9 +3899,6 @@ msgstr ""
 #~ msgid "Saved filter <b>%s</b>"
 #~ msgstr "Lagret filter <b>%s</b>"
 
-#~ msgid "Click to collapse category"
-#~ msgstr "Velg for å slå sammen kategorien"
-
 #~ msgid "Tags"
 #~ msgstr "Stikkord"
 
@@ -3870,10 +3929,6 @@ msgstr ""
 #~ msgid "Go online"
 #~ msgstr "Benytt modus for lesning med internett-tilgang"
 
-#, fuzzy
-#~ msgid "Toggle reordering mode"
-#~ msgstr "Tillatt endringer i kategorirekkefølgen?"
-
 #~ msgid "Reset UI layout"
 #~ msgstr "Tilbakestill de grafiske instillingene"
 
@@ -3960,9 +4015,6 @@ msgstr ""
 #~ msgid "Reset category order?"
 #~ msgstr "Tilbakestill kategorirekkefølgen?"
 
-#~ msgid "Generated feed"
-#~ msgstr "Generert nyhetsstrøm"
-
 #~ msgid "No feeds to display."
 #~ msgstr "Ingen nyhetstrømmer å vise"
 
@@ -4129,9 +4181,6 @@ msgstr ""
 #~ "Du kan ikke benytte tilgang til lesning uten internett-tilgang før du "
 #~ "bytter til denne modusen neste gang. Les med internett-tilgang?"
 
-#~ msgid "All feeds updated."
-#~ msgstr "Alle nyhetsstrømmer er oppdatert"
-
 #~ msgid "Can't open article: received invalid XML"
 #~ msgstr "Kan ikke åpne artikkelen: mottok uriktig XML"
 
@@ -4212,9 +4261,6 @@ msgstr ""
 #~ msgid "Recategorize"
 #~ msgstr "Rekategoriser"
 
-#~ msgid "Other:"
-#~ msgstr "Andre:"
-
 #~ msgid "Generate another link"
 #~ msgstr "Genererer en ny adresse"
 
@@ -4224,9 +4270,6 @@ msgstr ""
 #~ msgid "View:"
 #~ msgstr "Vis:"
 
-#~ msgid "Refresh"
-#~ msgstr "Oppdater"
-
 #~ msgid "Page"
 #~ msgstr "Side"
 
diff --git a/locale/pl_PL/LC_MESSAGES/messages.mo b/locale/pl_PL/LC_MESSAGES/messages.mo
index 6eddda6e6..c968188bc 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 7cacfd40c..4ab8bcf22 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: 2013-03-17 19:37+0400\n"
+"POT-Creation-Date: 2013-03-19 10:14+0400\n"
 "PO-Revision-Date: 2012-10-06 16:54+0100\n"
 "Last-Translator: Mirosław Lach <m.wordpress@lach.waw.pl>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/tt-rss/language/"
@@ -21,79 +21,79 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
-#: backend.php:67
+#: backend.php:71
 msgid "Use default"
 msgstr "Użyj domyślnych"
 
-#: backend.php:68
+#: backend.php:72
 msgid "Never purge"
 msgstr "Nigdy nie usuwaj"
 
-#: backend.php:69
+#: backend.php:73
 msgid "1 week old"
 msgstr "Jednotygodniowe"
 
-#: backend.php:70
+#: backend.php:74
 msgid "2 weeks old"
 msgstr "Dwutygodniowe"
 
-#: backend.php:71
+#: backend.php:75
 msgid "1 month old"
 msgstr "Miesięczne"
 
-#: backend.php:72
+#: backend.php:76
 msgid "2 months old"
 msgstr "Dwumiesięczne"
 
-#: backend.php:73
+#: backend.php:77
 msgid "3 months old"
 msgstr "Trzymiesięczne"
 
-#: backend.php:76
+#: backend.php:80
 msgid "Default interval"
 msgstr "Domyślna częstotliwość"
 
-#: backend.php:77 backend.php:87
+#: backend.php:81 backend.php:91
 msgid "Disable updates"
 msgstr "Wyłącz aktualizacje"
 
-#: backend.php:78 backend.php:88
+#: backend.php:82 backend.php:92
 msgid "Each 15 minutes"
 msgstr "Co 15 minut"
 
-#: backend.php:79 backend.php:89
+#: backend.php:83 backend.php:93
 msgid "Each 30 minutes"
 msgstr "Co 30 minut"
 
-#: backend.php:80 backend.php:90
+#: backend.php:84 backend.php:94
 msgid "Hourly"
 msgstr "Co godzinę"
 
-#: backend.php:81 backend.php:91
+#: backend.php:85 backend.php:95
 msgid "Each 4 hours"
 msgstr "Co 4 godziny"
 
-#: backend.php:82 backend.php:92
+#: backend.php:86 backend.php:96
 msgid "Each 12 hours"
 msgstr "Co 12 godzin"
 
-#: backend.php:83 backend.php:93
+#: backend.php:87 backend.php:97
 msgid "Daily"
 msgstr "Codziennie"
 
-#: backend.php:84 backend.php:94
+#: backend.php:88 backend.php:98
 msgid "Weekly"
 msgstr "Cotygodniowo"
 
-#: backend.php:97 classes/pref/users.php:139
+#: backend.php:101 classes/pref/users.php:139
 msgid "User"
 msgstr "Użytkownik"
 
-#: backend.php:98
+#: backend.php:102
 msgid "Power User"
 msgstr "Zaawansowany użytkownik"
 
-#: backend.php:99
+#: backend.php:103
 msgid "Administrator"
 msgstr "Administrator"
 
@@ -125,7 +125,7 @@ msgstr "Schemat bazy danych Tiny Tiny RSS jest aktualny."
 #: db-updater.php:94 db-updater.php:163 db-updater.php:176 register.php:194
 #: register.php:239 register.php:252 register.php:267 register.php:286
 #: register.php:371 register.php:381 register.php:393
-#: classes/handler/public.php:637 classes/handler/public.php:725
+#: classes/handler/public.php:611 classes/handler/public.php:699
 msgid "Return to Tiny Tiny RSS"
 msgstr "Wróć do Tiny Tiny RSS"
 
@@ -266,195 +266,195 @@ msgstr ""
 "Test escape'owania SQL nie powiódł się. Sprawdź konfigurację swojej bazy "
 "danych i PHP."
 
-#: index.php:108 index.php:150 index.php:236 prefs.php:86
-#: classes/backend.php:6 classes/pref/labels.php:296
-#: classes/pref/filters.php:602 classes/pref/feeds.php:1342
-#: plugins/digest/digest_body.php:45 js/viewfeed.js:1169 js/viewfeed.js:1158
-#: js/viewfeed.js:1164 js/viewfeed.js:1174
+#: index.php:117 index.php:147 index.php:252 prefs.php:79
+#: classes/backend.php:5 classes/pref/labels.php:296
+#: classes/pref/filters.php:609 classes/pref/feeds.php:1270
+#: plugins/digest/digest_body.php:45 js/viewfeed.js:1174
 msgid "Loading, please wait..."
 msgstr "Trwa ładowanie, proszę czekać..."
 
-#: index.php:118 plugins/digest/digest_body.php:56
-msgid "Hello,"
-msgstr "Cześć,"
+#: index.php:127 index.php:198
+msgid "Communication problem with server."
+msgstr ""
 
-#: index.php:120 prefs.php:29 prefs.php:108 help/main.php:73 help/prefs.php:8
-#: classes/pref/prefs.php:371
-msgid "Preferences"
-msgstr "Ustawienia"
-
-#: index.php:124
-msgid "Comments?"
-msgstr "Komentarze?"
-
-#: index.php:128 mobile/mobile-functions.php:69
-#: mobile/mobile-functions.php:244 plugins/digest/digest_body.php:59
-msgid "Logout"
-msgstr "Wyloguj"
-
-#: index.php:134
+#: index.php:133 index.php:206
 msgid "New version of Tiny Tiny RSS is available!"
 msgstr "Dostępna jest nowa wersja Tiny Tiny RSS!"
 
-#: index.php:157
-msgid "News"
-msgstr "Nowości"
-
-#: index.php:166
+#: index.php:161
 msgid "Collapse feedlist"
 msgstr "Rozwiń listę kanałów"
 
-#: index.php:169
+#: index.php:164
 msgid "Show articles"
 msgstr "Pokaż artykuły"
 
-#: index.php:172
+#: index.php:167
 msgid "Adaptive"
 msgstr "Adaptacyjny"
 
-#: index.php:173
+#: index.php:168
 msgid "All Articles"
 msgstr "Wszystkie artykuły"
 
-#: index.php:174 classes/feeds.php:106
+#: index.php:169 include/functions.php:1912 classes/feeds.php:106
 msgid "Starred"
 msgstr "Oznaczone gwiazdką"
 
-#: index.php:175 classes/feeds.php:107
+#: index.php:170 include/functions.php:1913 classes/feeds.php:107
 msgid "Published"
 msgstr "Opublikowane"
 
-#: index.php:176 classes/feeds.php:93 classes/feeds.php:105
+#: index.php:171 classes/feeds.php:93 classes/feeds.php:105
 msgid "Unread"
 msgstr "Nieprzeczytane"
 
-#: index.php:177
+#: index.php:172
 msgid "Ignore Scoring"
 msgstr "Ignoruj punktację"
 
-#: index.php:178
+#: index.php:173
 msgid "Updated"
 msgstr "Zaktualizowany"
 
-#: index.php:181
+#: index.php:176
 msgid "Sort articles"
 msgstr "Sortuj artykuły"
 
-#: index.php:184 classes/pref/prefs.php:462
+#: index.php:179
 msgid "Default"
 msgstr "Domyślne"
 
-#: index.php:185
+#: index.php:180
 msgid "Date"
 msgstr "Data"
 
-#: index.php:186 include/localized_schema.php:3
+#: index.php:181 include/localized_schema.php:3
 msgid "Title"
 msgstr "Tytuł"
 
-#: index.php:187
+#: index.php:182
 msgid "Score"
 msgstr "Punktacja"
 
-#: index.php:192 classes/pref/feeds.php:539 classes/pref/feeds.php:786
+#: index.php:187 classes/pref/feeds.php:535 classes/pref/feeds.php:746
 msgid "Update"
 msgstr "Aktualizuj"
 
-#: index.php:196 index.php:211 include/localized_schema.php:10
-#: classes/feeds.php:111 classes/feeds.php:127 js/FeedTree.js:128
-#: js/FeedTree.js:156 plugins/digest/digest.js:630
+#: index.php:191 index.php:221 include/functions.php:1903
+#: include/localized_schema.php:10 classes/feeds.php:111 classes/feeds.php:131
+#: js/FeedTree.js:128 js/FeedTree.js:156 plugins/digest/digest.js:630
 msgid "Mark as read"
 msgstr "Oznacz jako przeczytane"
 
-#: index.php:202 classes/feeds.php:101
+#: index.php:211
 msgid "Actions..."
 msgstr "Działania..."
 
-#: index.php:204
+#: index.php:213
+#, fuzzy
+msgid "Preferences..."
+msgstr "Ustawienia"
+
+#: index.php:214
 msgid "Search..."
 msgstr "Szukaj..."
 
-#: index.php:205
+#: index.php:215
 msgid "Feed actions:"
 msgstr "Działania dla kanałów:"
 
-#: index.php:206 classes/handler/public.php:567
+#: index.php:216 classes/handler/public.php:541
 msgid "Subscribe to feed..."
 msgstr "Prenumeruj kanał..."
 
-#: index.php:207
+#: index.php:217
 msgid "Edit this feed..."
 msgstr "Edytuj ten kanał..."
 
-#: index.php:208
+#: index.php:218
 msgid "Rescore feed"
 msgstr "Przelicz punktację kanału"
 
-#: index.php:209 classes/pref/feeds.php:712 classes/pref/feeds.php:1315
+#: index.php:219 classes/pref/feeds.php:672 classes/pref/feeds.php:1243
 #: js/PrefFeedTree.js:73
 msgid "Unsubscribe"
 msgstr "Wypisz się"
 
-#: index.php:210
+#: index.php:220
 msgid "All feeds:"
 msgstr "Wszystkie kanały:"
 
-#: index.php:212 help/main.php:56
+#: index.php:222
 msgid "(Un)hide read feeds"
 msgstr "Pokaż/Ukryj przeczytane kanały"
 
-#: index.php:213
+#: index.php:223
 msgid "Other actions:"
 msgstr "Inne działania:"
 
-#: index.php:215
+#: index.php:225
 msgid "Switch to digest..."
 msgstr "Przełącz na przegląd..."
 
-#: index.php:217
+#: index.php:227
 msgid "Show tag cloud..."
 msgstr "Pokaż chmurę tagów..."
 
-#: index.php:218
+#: index.php:229 include/functions.php:1890
+#, fuzzy
+msgid "Toggle widescreen mode"
+msgstr "Przełącz oznaczenie gwiazdką"
+
+#: index.php:231
 msgid "Select by tags..."
 msgstr "Wybierz używając tagów..."
 
-#: index.php:219
+#: index.php:232
 msgid "Create label..."
 msgstr "Utwórz etykietę..."
 
-#: index.php:220
+#: index.php:233
 msgid "Create filter..."
 msgstr "Utwórz filtr..."
 
-#: index.php:221
+#: index.php:234
 msgid "Keyboard shortcuts help"
 msgstr "O skrótach klawiszowych"
 
-#: prefs.php:99
+#: index.php:236 mobile/mobile-functions.php:69
+#: mobile/mobile-functions.php:244 plugins/digest/digest_body.php:59
+msgid "Logout"
+msgstr "Wyloguj"
+
+#: prefs.php:28 prefs.php:99 include/functions.php:1915
+#: classes/pref/prefs.php:371
+msgid "Preferences"
+msgstr "Ustawienia"
+
+#: prefs.php:90
 msgid "Keyboard shortcuts"
 msgstr "Skróty klawiszowe"
 
-#: prefs.php:100 help/prefs.php:14
+#: prefs.php:91
 msgid "Exit preferences"
 msgstr "Wyjdź z ustawień"
 
-#: prefs.php:111 classes/pref/feeds.php:101 classes/pref/feeds.php:1220
-#: classes/pref/feeds.php:1283
+#: prefs.php:102 classes/pref/feeds.php:100 classes/pref/feeds.php:1148
+#: classes/pref/feeds.php:1211
 msgid "Feeds"
 msgstr "Kanały"
 
-#: prefs.php:114 help/prefs.php:11 classes/pref/filters.php:110
+#: prefs.php:105 classes/pref/filters.php:117
 msgid "Filters"
 msgstr "Filtry"
 
-#: prefs.php:117 help/prefs.php:12 mobile/mobile-functions.php:205
-#: include/functions.php:1189 include/functions.php:1836
-#: classes/pref/labels.php:90
+#: prefs.php:108 mobile/mobile-functions.php:205 include/functions.php:1118
+#: include/functions.php:1739 classes/pref/labels.php:90
 msgid "Labels"
 msgstr "Etykiety"
 
-#: prefs.php:121 help/prefs.php:13
+#: prefs.php:112
 msgid "Users"
 msgstr "Użytkownicy"
 
@@ -517,241 +517,23 @@ msgstr "Konto zostało założone."
 msgid "New user registrations are currently closed."
 msgstr "Możliwość rejestracji jest obecnie wyłączona."
 
-#: update.php:38
+#: update.php:37
 #, fuzzy
 msgid "Tiny Tiny RSS data update script."
 msgstr "Schemat bazy danych Tiny Tiny RSS jest aktualny."
 
-#: help/main.php:1 help/prefs.php:1
-msgid "Keyboard Shortcuts"
-msgstr "Skróty klawiszowe"
-
-#: help/main.php:5
-msgid "Navigation"
-msgstr "Nawigacja"
-
-#: help/main.php:8
-msgid "Move between feeds"
-msgstr "Przechodzenie pomiędzy kanałami"
-
-#: help/main.php:9
-msgid "Move between articles"
-msgstr "Przechodzenie pomiędzy artykułami"
-
-#: help/main.php:10
-msgid "Show search dialog"
-msgstr "Otwórz okno wyszukiwania"
-
-#: help/main.php:13
-msgid "Active article actions"
-msgstr "Działania dla bieżącego artykułu"
-
-#: help/main.php:16
-msgid "Toggle starred"
-msgstr "Przełącz oznaczenie gwiazdką"
-
-#: help/main.php:17
-msgid "Toggle published"
-msgstr "Przełącz flagę publikacji"
-
-#: help/main.php:18
-msgid "Toggle unread"
-msgstr "Przełącz flagę \"przeczytano\""
-
-#: help/main.php:19
-msgid "Edit tags"
-msgstr "Edytuj tagi"
-
-#: help/main.php:20
-msgid "Dismiss selected articles"
-msgstr "Odwołaj wybrane artykuły"
-
-#: help/main.php:21
-msgid "Dismiss read articles"
-msgstr "Odwołaj przeczytane artykuły"
-
-#: help/main.php:22
-msgid "Open article in new window"
-msgstr "Otwórz artykuł w nowym oknie"
-
-#: help/main.php:23
-msgid "Mark articles below/above active one as read"
-msgstr "Oznacz artykuły poniżej/powyżej bieżącego jako przeczytane"
-
-#: help/main.php:24
-msgid "Scroll article content"
-msgstr "Przewijanie treści artykułu"
-
-#: help/main.php:25
-msgid "Email article"
-msgstr "Prześlij artykuł emailem"
-
-#: help/main.php:29 help/prefs.php:30
-msgid "Other actions"
-msgstr "Inne działania"
-
-#: help/main.php:32
-msgid "Select article under mouse cursor"
-msgstr "Wybierz artykuł pod kursorem myszy"
-
-#: help/main.php:33 help/prefs.php:26 classes/pref/labels.php:281
-msgid "Create label"
-msgstr "Utwórz etykietę"
-
-#: help/main.php:34 help/prefs.php:25 classes/pref/filters.php:580
-msgid "Create filter"
-msgstr "Utwórz filtr"
-
-#: help/main.php:35
-msgid "Collapse sidebar"
-msgstr "Rozwiń pasek boczny"
-
-#: help/main.php:36 help/prefs.php:34
-msgid "Display this help dialog"
-msgstr "Wyświetl to okno pomocy"
-
-#: help/main.php:41
-msgid "Multiple articles actions"
-msgstr "Działania na wielu artykułach"
-
-#: help/main.php:44
-msgid "Select all articles"
-msgstr "Wybierz wszystkie artykuły"
-
-#: help/main.php:45
-msgid "Select unread articles"
-msgstr "Wybierz nieprzeczytane artykuły"
-
-#: help/main.php:46
-#, fuzzy
-msgid "Select starred articles"
-msgstr "Wybierz nieprzeczytane artykuły"
-
-#: help/main.php:47
-#, fuzzy
-msgid "Select published articles"
-msgstr "Wybierz nieprzeczytane artykuły"
-
-#: help/main.php:48
-msgid "Invert article selection"
-msgstr "Odwróć zaznaczenie artykułów"
-
-#: help/main.php:49
-msgid "Deselect all articles"
-msgstr "Odznacz wszystkie artykuły"
-
-#: help/main.php:52
-msgid "Feed actions"
-msgstr "Działania na kanałach"
-
-#: help/main.php:55
-msgid "Refresh active feed"
-msgstr "Odśwież aktywny kanał"
-
-#: help/main.php:57 help/prefs.php:22 classes/pref/feeds.php:1286
-msgid "Subscribe to feed"
-msgstr "Prenumeruj kanał"
-
-#: help/main.php:58 js/FeedTree.js:135 js/PrefFeedTree.js:67
-msgid "Edit feed"
-msgstr "Edytuj kanał"
-
-#: help/main.php:59
-msgid "Mark feed as read"
-msgstr "Oznacz kanał jako przeczytany"
-
-#: help/main.php:60
-msgid "Reverse headlines order"
-msgstr "Odwróć kolejność nagłówków"
-
-#: help/main.php:61 js/FeedTree.js:170
-msgid "Mark all feeds as read"
-msgstr "Oznacz wszystkie kanały jako przeczytane"
-
-#: help/main.php:62
-msgid "If viewing category, (un)collapse it"
-msgstr "W trybie kategorii, rozwiń/zwiń"
-
-#: help/main.php:65 help/prefs.php:5
-msgid "Go to..."
-msgstr "Idź do..."
-
-#: help/main.php:68 include/functions.php:1893
-msgid "All articles"
-msgstr "Wszystkie artykuły"
-
-#: help/main.php:69 include/functions.php:1891
-msgid "Fresh articles"
-msgstr "Świeże artykuły"
-
-#: help/main.php:70 include/functions.php:1887
-msgid "Starred articles"
-msgstr "Artykuły oznaczone gwiazdką"
-
-#: help/main.php:71 include/functions.php:1889
-msgid "Published articles"
-msgstr "Opublikowane artykuły"
-
-#: help/main.php:72
-msgid "Tag cloud"
-msgstr "Chmura tagów"
-
-#: help/main.php:79
-msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
-msgstr "Inne wskazówki dotyczące interfejsu znajdziesz na wiki Tiny Tiny RSS."
-
-#: help/main.php:81 help/prefs.php:41
-msgid "Press any key to close this window."
-msgstr "Wciśnij dowolny klawisz aby zamknąć to okno."
-
-#: help/prefs.php:9
-msgid "My Feeds"
-msgstr "Moje kanały"
-
-#: help/prefs.php:10
-msgid "Other Feeds"
-msgstr "Inne kanały"
-
-#: help/prefs.php:19
-msgid "Panel actions"
-msgstr "Działania na panelach"
-
-#: help/prefs.php:23
-msgid "Top 25 feeds"
-msgstr "Top 25 kanałów"
-
-#: help/prefs.php:24
-msgid "Edit feed categories"
-msgstr "Edytuj kategorie kanału"
-
-#: help/prefs.php:27 classes/pref/users.php:386
-msgid "Create user"
-msgstr "Utwórz użytkownika"
-
-#: help/prefs.php:33
-msgid "Focus search (if present)"
-msgstr "Aktywuj pole wyszukiwarki (jeżeli jest)"
-
-#: help/prefs.php:39
-msgid ""
-"<b>Note:</b> not all actions may be available, depending on Tiny Tiny RSS "
-"configuration and your access level."
-msgstr ""
-"<b>Uwaga:</b> nie wszystkie działania mogą być dostępne, zależnie od "
-"konfiguracji Tiny Tiny RSS i Twojego poziomu uprawnień."
-
 #: mobile/login_form.php:28 include/login_form.php:209
-#: classes/handler/public.php:495
+#: classes/handler/public.php:469
 msgid "Log in"
 msgstr "Zaloguj"
 
 #: mobile/login_form.php:40 include/login_form.php:169
-#: classes/handler/public.php:479
+#: classes/handler/public.php:453
 msgid "Login:"
 msgstr "Nazwa użytkownika:"
 
 #: mobile/login_form.php:45 include/login_form.php:178
-#: classes/handler/public.php:482
+#: classes/handler/public.php:456
 msgid "Password:"
 msgstr "Hasło:"
 
@@ -766,8 +548,8 @@ msgstr "Otwórz standardową wersję"
 msgid "Home"
 msgstr "Stron główna"
 
-#: mobile/mobile-functions.php:178 include/functions.php:1187
-#: include/functions.php:1834
+#: mobile/mobile-functions.php:178 include/functions.php:1116
+#: include/functions.php:1737
 msgid "Special"
 msgstr "Specjalne"
 
@@ -780,12 +562,12 @@ msgid "Enable categories"
 msgstr "Włącz kategorie"
 
 #: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36
-#: mobile/prefs.php:41 mobile/prefs.php:46
+#: mobile/prefs.php:41 mobile/prefs.php:46 mobile/prefs.php:51
 msgid "ON"
 msgstr "WŁĄCZONE"
 
 #: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36
-#: mobile/prefs.php:41 mobile/prefs.php:46
+#: mobile/prefs.php:41 mobile/prefs.php:46 mobile/prefs.php:51
 msgid "OFF"
 msgstr "WYŁĄCZONE"
 
@@ -805,148 +587,335 @@ msgstr "Ukryj przeczytane artykuły i kanały"
 msgid "Sort feeds by unread count"
 msgstr "Sortuj kanały według liczby nieprzeczytanych"
 
-#: include/functions.php:564
-#, php-format
-msgid "Fatal: authentication module %s not found."
-msgstr "Błąd fatalny: moduł uwierzytelniania %s nie został odnaleziony."
+#: mobile/prefs.php:50 include/localized_schema.php:45
+msgid "Reverse headline order (oldest first)"
+msgstr "Odwrotny porządek nagłówków (najstarsze pierwsze)"
 
-#: include/functions.php:682
-msgid "Session failed to validate (incorrect IP)"
-msgstr "Nie powiodła się weryfikacja sesji (nieprawidłowy adres IP)"
-
-#: include/functions.php:1198 include/functions.php:1737
-#: include/functions.php:1822 include/functions.php:1844
-#: include/functions.php:2699 classes/opml.php:416 classes/pref/feeds.php:193
+#: include/digest.php:131 include/functions.php:1127
+#: include/functions.php:1640 include/functions.php:1725
+#: include/functions.php:1747 classes/opml.php:416 classes/pref/feeds.php:188
 msgid "Uncategorized"
 msgstr "Bez kategorii"
 
-#: include/functions.php:1686 classes/dlg.php:387 classes/pref/filters.php:361
-msgid "All feeds"
-msgstr "Wszystkie kanały"
-
-#: include/functions.php:1895
-msgid "Archived articles"
-msgstr "Zarchiwizowane artykuły"
-
-#: include/functions.php:1897
-msgid "Recently read"
-msgstr "Ostatnio czytane"
-
-#: include/functions.php:2346
-#, php-format
-msgid "Search results: %s"
-msgstr "Wyniki wyszukiwania: %s"
-
-#: include/functions.php:3067 js/viewfeed.js:1998 js/viewfeed.js:1971
-#: js/viewfeed.js:1835 js/viewfeed.js:1845
-msgid "Click to play"
-msgstr "Wciśnij aby odtworzyć"
-
-#: include/functions.php:3068 js/viewfeed.js:1997 js/viewfeed.js:1970
-#: js/viewfeed.js:1834 js/viewfeed.js:1844
-msgid "Play"
-msgstr "Odtwórz"
-
-#: include/functions.php:3203
-msgid " - "
-msgstr " - "
-
-#: include/functions.php:3232 include/functions.php:4028 classes/rpc.php:414
-msgid "no tags"
-msgstr "brak tagów"
-
-#: include/functions.php:3242 classes/feeds.php:680
-msgid "Edit tags for this article"
-msgstr "Edytuj tagi dla tego artykułu"
-
-#: include/functions.php:3252 classes/feeds.php:707
-msgid "Open article in new tab"
-msgstr "Otwórz artykuł w nowej zakładce"
-
-#: include/functions.php:3263 classes/feeds.php:718
-msgid "Close article"
-msgstr "Zamknij artykuł"
-
-#: include/functions.php:3280 classes/feeds.php:616
-msgid "Originally from:"
-msgstr "Oryginał pochodzi z:"
-
-#: include/functions.php:3293 classes/feeds.php:629 classes/pref/feeds.php:511
-msgid "Feed URL"
-msgstr "Adres kanału"
-
-#: include/functions.php:3308 classes/feeds.php:68
-msgid "Visit the website"
-msgstr "Odwiedź stronę internetową"
-
-#: include/functions.php:3327
-msgid "Related"
-msgstr "Pokrewne"
-
-#: include/functions.php:3361 classes/dlg.php:30 classes/dlg.php:61
-#: classes/dlg.php:180 classes/dlg.php:203 classes/dlg.php:240
-#: classes/dlg.php:524 classes/dlg.php:559 classes/dlg.php:590
-#: classes/dlg.php:623 classes/dlg.php:724 classes/pref/users.php:106
-#: classes/pref/filters.php:101 classes/pref/feeds.php:1638
-#: classes/pref/feeds.php:1709 plugins/share/share.php:61
-#: plugins/updater/updater.php:301 plugins/updater/init.php:323
-msgid "Close this window"
-msgstr "Zamknij to okno"
-
-#: include/functions.php:4053
-msgid "(edit note)"
-msgstr "(edytuj notatkę)"
-
-#: include/functions.php:4525
-msgid "No feed selected."
-msgstr "Nie wybrano kanału."
-
-#: include/functions.php:4535 classes/feeds.php:766
-#, php-format
-msgid "Feeds last updated at %s"
-msgstr "Kanały ostatnio uaktualnione o %s"
-
-#: include/functions.php:4545 classes/feeds.php:776
-msgid "Some feeds have update errors (click for details)"
-msgstr ""
-"Wystąpiły błędy aktualizacji niektórych kanałów (kliknij aby zobaczyć "
-"szczegóły)"
-
-#: include/functions.php:4689
-msgid "unknown type"
-msgstr "nieznany typ"
-
-#: include/functions.php:4731
-msgid "Attachments"
-msgstr "Załączniki"
-
-#: include/functions.php:5191
+#: include/feedbrowser.php:83
 #, php-format
 msgid "%d archived articles"
 msgstr "%d zarchiwizowanych artykułów"
 
-#: include/functions.php:5215
+#: include/feedbrowser.php:107
 msgid "No feeds found."
 msgstr "Nie znaleziono kanałów."
 
-#: include/functions.php:5261 plugins/import_export/init.php:221
-msgid "Could not import: incorrect schema version."
-msgstr "Nieudany import: nieprawidłowa wersja schematu."
+#: include/functions.php:698
+msgid "Session failed to validate (incorrect IP)"
+msgstr "Nie powiodła się weryfikacja sesji (nieprawidłowy adres IP)"
 
-#: include/functions.php:5266 plugins/import_export/init.php:226
-msgid "Could not import: unrecognized document format."
-msgstr "Nieudany import: nierozpoznany typ dokumentu."
+#: include/functions.php:1589 classes/dlg.php:371 classes/pref/filters.php:368
+msgid "All feeds"
+msgstr "Wszystkie kanały"
 
-#: include/functions.php:5425
-#, php-format
-msgid "Finished: %d articles processed, %d imported, %d feeds created."
+#: include/functions.php:1790
+msgid "Starred articles"
+msgstr "Artykuły oznaczone gwiazdką"
+
+#: include/functions.php:1792
+msgid "Published articles"
+msgstr "Opublikowane artykuły"
+
+#: include/functions.php:1794
+msgid "Fresh articles"
+msgstr "Świeże artykuły"
+
+#: include/functions.php:1796 include/functions.php:1910
+msgid "All articles"
+msgstr "Wszystkie artykuły"
+
+#: include/functions.php:1798
+msgid "Archived articles"
+msgstr "Zarchiwizowane artykuły"
+
+#: include/functions.php:1800
+msgid "Recently read"
+msgstr "Ostatnio czytane"
+
+#: include/functions.php:1867
+msgid "Navigation"
+msgstr "Nawigacja"
+
+#: include/functions.php:1868
+#, fuzzy
+msgid "Open next feed"
 msgstr ""
-"Zakończono: %d przetworzonych artykułów, %d zaimportowanych, %d kanałów "
-"utworzonych."
+"Przejdź do następnego kanału po zakończeniu lektury ostatniego artykułu"
 
-#: include/functions.php:5431 plugins/import_export/init.php:391
-msgid "Could not load XML document."
-msgstr "Nie udało się wczytać dokumentu XML."
+#: include/functions.php:1869
+msgid "Open previous feed"
+msgstr ""
+
+#: include/functions.php:1870
+#, fuzzy
+msgid "Open next article"
+msgstr "Otwórz oryginalny artykuł"
+
+#: include/functions.php:1871
+#, fuzzy
+msgid "Open previous article"
+msgstr "Otwórz oryginalny artykuł"
+
+#: include/functions.php:1872
+msgid "Open next article (don't scroll long articles)"
+msgstr ""
+
+#: include/functions.php:1873
+msgid "Open previous article (don't scroll long articles)"
+msgstr ""
+
+#: include/functions.php:1874
+msgid "Show search dialog"
+msgstr "Otwórz okno wyszukiwania"
+
+#: include/functions.php:1875
+#, fuzzy
+msgid "Article"
+msgstr "Wszystkie artykuły"
+
+#: include/functions.php:1876
+msgid "Toggle starred"
+msgstr "Przełącz oznaczenie gwiazdką"
+
+#: include/functions.php:1877
+msgid "Toggle published"
+msgstr "Przełącz flagę publikacji"
+
+#: include/functions.php:1878
+msgid "Toggle unread"
+msgstr "Przełącz flagę \"przeczytano\""
+
+#: include/functions.php:1879
+msgid "Edit tags"
+msgstr "Edytuj tagi"
+
+#: include/functions.php:1880
+#, fuzzy
+msgid "Dismiss selected"
+msgstr "Odwołaj wybrane artykuły"
+
+#: include/functions.php:1881
+#, fuzzy
+msgid "Dismiss read"
+msgstr "Odwołaj przeczytane artykuły"
+
+#: include/functions.php:1882
+#, fuzzy
+msgid "Open in new window"
+msgstr "Otwórz artykuł w nowym oknie"
+
+#: include/functions.php:1883 js/viewfeed.js:1758
+msgid "Mark below as read"
+msgstr "Oznacz poniższe jako przeczytane"
+
+#: include/functions.php:1884 js/viewfeed.js:1752
+msgid "Mark above as read"
+msgstr "Oznacz powyższe jako przeczytane"
+
+#: include/functions.php:1885
+#, fuzzy
+msgid "Scroll down"
+msgstr "Zrobione."
+
+#: include/functions.php:1886
+msgid "Scroll up"
+msgstr ""
+
+#: include/functions.php:1887
+#, fuzzy
+msgid "Select article under cursor"
+msgstr "Wybierz artykuł pod kursorem myszy"
+
+#: include/functions.php:1888
+msgid "Email article"
+msgstr "Prześlij artykuł emailem"
+
+#: include/functions.php:1889 plugins/close_button/init.php:24
+msgid "Close article"
+msgstr "Zamknij artykuł"
+
+#: include/functions.php:1891
+#, fuzzy
+msgid "Article selection"
+msgstr "Odwróć zaznaczenie artykułów"
+
+#: include/functions.php:1892
+msgid "Select all articles"
+msgstr "Wybierz wszystkie artykuły"
+
+#: include/functions.php:1893
+#, fuzzy
+msgid "Select unread"
+msgstr "Wybierz nieprzeczytane artykuły"
+
+#: include/functions.php:1894
+#, fuzzy
+msgid "Select starred"
+msgstr "Oznacz gwiazdką"
+
+#: include/functions.php:1895
+#, fuzzy
+msgid "Select published"
+msgstr "Wybierz nieprzeczytane artykuły"
+
+#: include/functions.php:1896
+#, fuzzy
+msgid "Invert selection"
+msgstr "Odwróć zaznaczenie artykułów"
+
+#: include/functions.php:1897
+#, fuzzy
+msgid "Deselect everything"
+msgstr "Odznacz wszystkie artykuły"
+
+#: include/functions.php:1898 classes/pref/feeds.php:488
+#: classes/pref/feeds.php:707
+msgid "Feed"
+msgstr "Kanał"
+
+#: include/functions.php:1899
+#, fuzzy
+msgid "Refresh current feed"
+msgstr "Odśwież aktywny kanał"
+
+#: include/functions.php:1900
+#, fuzzy
+msgid "Un/hide read feeds"
+msgstr "Pokaż/Ukryj przeczytane kanały"
+
+#: include/functions.php:1901 classes/pref/feeds.php:1214
+msgid "Subscribe to feed"
+msgstr "Prenumeruj kanał"
+
+#: include/functions.php:1902 js/FeedTree.js:135 js/PrefFeedTree.js:67
+msgid "Edit feed"
+msgstr "Edytuj kanał"
+
+#: include/functions.php:1904
+#, fuzzy
+msgid "Reverse headlines"
+msgstr "Odwróć kolejność nagłówków"
+
+#: include/functions.php:1905
+#, fuzzy
+msgid "Debug feed update"
+msgstr "Wyłącz aktualizacje"
+
+#: include/functions.php:1906 js/FeedTree.js:170
+msgid "Mark all feeds as read"
+msgstr "Oznacz wszystkie kanały jako przeczytane"
+
+#: include/functions.php:1907
+#, fuzzy
+msgid "Un/collapse current category"
+msgstr "Umieść w kategorii:"
+
+#: include/functions.php:1908
+#, fuzzy
+msgid "Toggle combined mode"
+msgstr "Przełącz flagę publikacji"
+
+#: include/functions.php:1909
+#, fuzzy
+msgid "Go to"
+msgstr "Idź do..."
+
+#: include/functions.php:1911
+msgid "Fresh"
+msgstr ""
+
+#: include/functions.php:1914
+msgid "Tag cloud"
+msgstr "Chmura tagów"
+
+#: include/functions.php:1916
+#, fuzzy
+msgid "Other"
+msgstr "Inne kanały"
+
+#: include/functions.php:1917 classes/pref/labels.php:281
+msgid "Create label"
+msgstr "Utwórz etykietę"
+
+#: include/functions.php:1918 classes/pref/filters.php:587
+msgid "Create filter"
+msgstr "Utwórz filtr"
+
+#: include/functions.php:1919
+#, fuzzy
+msgid "Un/collapse sidebar"
+msgstr "Rozwiń pasek boczny"
+
+#: include/functions.php:1920
+#, fuzzy
+msgid "Show help dialog"
+msgstr "Otwórz okno wyszukiwania"
+
+#: include/functions.php:2400
+#, php-format
+msgid "Search results: %s"
+msgstr "Wyniki wyszukiwania: %s"
+
+#: include/functions.php:2824 js/viewfeed.js:1845
+msgid "Click to play"
+msgstr "Wciśnij aby odtworzyć"
+
+#: include/functions.php:2825 js/viewfeed.js:1844
+msgid "Play"
+msgstr "Odtwórz"
+
+#: include/functions.php:2945
+msgid " - "
+msgstr " - "
+
+#: include/functions.php:2967 include/functions.php:3284 classes/rpc.php:359
+msgid "no tags"
+msgstr "brak tagów"
+
+#: include/functions.php:2977 classes/feeds.php:645
+msgid "Edit tags for this article"
+msgstr "Edytuj tagi dla tego artykułu"
+
+#: include/functions.php:3006 classes/feeds.php:600
+msgid "Originally from:"
+msgstr "Oryginał pochodzi z:"
+
+#: include/functions.php:3019 classes/feeds.php:613 classes/pref/feeds.php:507
+msgid "Feed URL"
+msgstr "Adres kanału"
+
+#: include/functions.php:3048
+msgid "Related"
+msgstr "Pokrewne"
+
+#: include/functions.php:3075 classes/dlg.php:43 classes/dlg.php:162
+#: classes/dlg.php:185 classes/dlg.php:222 classes/dlg.php:508
+#: classes/dlg.php:543 classes/dlg.php:574 classes/dlg.php:608
+#: classes/dlg.php:620 classes/backend.php:105 classes/pref/users.php:106
+#: classes/pref/filters.php:108 classes/pref/feeds.php:1527
+#: classes/pref/feeds.php:1598 plugins/import_export/init.php:407
+#: plugins/import_export/init.php:431 plugins/share/init.php:67
+#: plugins/updater/init.php:329
+msgid "Close this window"
+msgstr "Zamknij to okno"
+
+#: include/functions.php:3309
+msgid "(edit note)"
+msgstr "(edytuj notatkę)"
+
+#: include/functions.php:3542
+msgid "unknown type"
+msgstr "nieznany typ"
+
+#: include/functions.php:3592
+msgid "Attachments"
+msgstr "Załączniki"
 
 #: include/localized_schema.php:4
 msgid "Title or Content"
@@ -972,9 +941,8 @@ msgstr "Usuń artykuł"
 msgid "Set starred"
 msgstr "Oznacz gwiazdką"
 
-#: include/localized_schema.php:12 js/viewfeed.js:501 js/viewfeed.js:490
-#: js/viewfeed.js:496 js/viewfeed.js:478 plugins/digest/digest.js:264
-#: plugins/digest/digest.js:736
+#: include/localized_schema.php:12 js/viewfeed.js:478
+#: plugins/digest/digest.js:264 plugins/digest/digest.js:736
 msgid "Publish article"
 msgstr "Opublikuj"
 
@@ -982,8 +950,7 @@ msgstr "Opublikuj"
 msgid "Assign tags"
 msgstr "Przypisz tagi"
 
-#: include/localized_schema.php:14 js/viewfeed.js:1962 js/viewfeed.js:1935
-#: js/viewfeed.js:1799 js/viewfeed.js:1809
+#: include/localized_schema.php:14 js/viewfeed.js:1809
 msgid "Assign label"
 msgstr "Przypisz etykietę"
 
@@ -1134,10 +1101,6 @@ msgstr ""
 msgid "Sort feeds by unread articles count"
 msgstr "Sortuj kanały według liczby nieprzeczytanych artykułów"
 
-#: include/localized_schema.php:45
-msgid "Reverse headline order (oldest first)"
-msgstr "Odwrotny porządek nagłówków (najstarsze pierwsze)"
-
 #: include/localized_schema.php:46
 msgid "Enable e-mail digest"
 msgstr "Włącz przegląd artykułów wysyłany emailem"
@@ -1183,7 +1146,8 @@ msgid "Group headlines in virtual feeds"
 msgstr "Grupuj nagłówki w wirtualnych kanałach"
 
 #: include/localized_schema.php:57
-msgid "Do not show images in articles"
+#, fuzzy
+msgid "Hide images in articles"
 msgstr "Nie pokazuj obrazków w artykułach"
 
 #: include/localized_schema.php:58
@@ -1194,8 +1158,7 @@ msgstr "Włącz zewnętrzne API"
 msgid "User timezone"
 msgstr "Strefa czasowa użytkownika"
 
-#: include/localized_schema.php:60 js/prefs.js:1856 js/prefs.js:1743
-#: js/prefs.js:1733
+#: include/localized_schema.php:60 js/prefs.js:1733
 msgid "Customize stylesheet"
 msgstr "Dostosuj arkusz styli"
 
@@ -1215,7 +1178,7 @@ msgstr "Spróbuj wysłać podsumowanie w pobliżu wskazanej godziny"
 msgid "Assign articles to labels automatically"
 msgstr ""
 
-#: include/login_form.php:185 classes/handler/public.php:485
+#: include/login_form.php:185 classes/handler/public.php:459
 msgid "Language:"
 msgstr "Język:"
 
@@ -1223,8 +1186,8 @@ msgstr "Język:"
 msgid "Profile:"
 msgstr "Profil:"
 
-#: include/login_form.php:197 classes/handler/public.php:208
-#: classes/rpc.php:147 classes/dlg.php:116
+#: include/login_form.php:197 classes/handler/public.php:212
+#: classes/rpc.php:64 classes/dlg.php:98
 msgid "Default profile"
 msgstr "Domyślny profil"
 
@@ -1236,116 +1199,99 @@ msgstr "Wersja lekka"
 msgid "Article not found."
 msgstr "Artykuł nie został znaleziony."
 
-#: classes/handler/public.php:420 classes/pref/feeds.php:1480
+#: classes/handler/public.php:394 plugins/bookmarklets/init.php:38
 #, fuzzy
 msgid "Share with Tiny Tiny RSS"
 msgstr "Prenumeruj w Tiny Tiny RSS"
 
-#: classes/handler/public.php:428
+#: classes/handler/public.php:402
 #, fuzzy
 msgid "Title:"
 msgstr "Tytuł"
 
-#: classes/handler/public.php:430 classes/dlg.php:667
-#: classes/pref/feeds.php:509 classes/pref/feeds.php:762
-#: plugins/instances/instances.php:100 plugins/instances/init.php:215
+#: classes/handler/public.php:404 classes/dlg.php:667
+#: classes/pref/feeds.php:505 classes/pref/feeds.php:722
+#: plugins/instances/init.php:215
 msgid "URL:"
 msgstr "Adres:"
 
-#: classes/handler/public.php:432
+#: classes/handler/public.php:406
 #, fuzzy
 msgid "Content:"
 msgstr "Treść"
 
-#: classes/handler/public.php:434
+#: classes/handler/public.php:408
 #, fuzzy
 msgid "Labels:"
 msgstr "Etykiety"
 
-#: classes/handler/public.php:453
+#: classes/handler/public.php:427
 msgid "Shared article will appear in the Published feed."
 msgstr ""
 
-#: classes/handler/public.php:455
+#: classes/handler/public.php:429
 msgid "Share"
 msgstr ""
 
-#: classes/handler/public.php:456 classes/handler/public.php:498
-#: classes/dlg.php:315 classes/dlg.php:366 classes/dlg.php:426
-#: classes/dlg.php:457 classes/dlg.php:652 classes/dlg.php:702
-#: classes/dlg.php:774 classes/pref/users.php:194 classes/pref/labels.php:81
-#: classes/pref/filters.php:342 classes/pref/filters.php:722
-#: classes/pref/filters.php:791 classes/pref/filters.php:858
-#: classes/pref/feeds.php:729 classes/pref/feeds.php:880
-#: plugins/mail/mail.php:126 plugins/note/note.php:49
-#: plugins/instances/instances.php:136
+#: classes/handler/public.php:430 classes/handler/public.php:472
+#: classes/dlg.php:297 classes/dlg.php:350 classes/dlg.php:410
+#: classes/dlg.php:441 classes/dlg.php:652 classes/dlg.php:702
+#: classes/dlg.php:751 classes/pref/users.php:194 classes/pref/labels.php:81
+#: classes/pref/filters.php:349 classes/pref/filters.php:729
+#: classes/pref/filters.php:798 classes/pref/filters.php:865
+#: classes/pref/feeds.php:689 classes/pref/feeds.php:829
+#: plugins/mail/init.php:132 plugins/note/init.php:55
+#: plugins/instances/init.php:251
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: classes/handler/public.php:477
+#: classes/handler/public.php:451
 #, fuzzy
 msgid "Not logged in"
 msgstr "Ostatnio zalogowany"
 
-#: classes/handler/public.php:537
+#: classes/handler/public.php:511
 msgid "Incorrect username or password"
 msgstr "Nieprawidłowa nazwa użytkownika lub hasło"
 
-#: classes/handler/public.php:573 classes/handler/public.php:670
+#: classes/handler/public.php:547 classes/handler/public.php:644
 #, fuzzy, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "Prenumerujesz już ten kanał."
 
-#: classes/handler/public.php:576 classes/handler/public.php:661
+#: classes/handler/public.php:550 classes/handler/public.php:635
 #, fuzzy, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "Zaprenumerowano kanał %s"
 
-#: classes/handler/public.php:579 classes/handler/public.php:664
+#: classes/handler/public.php:553 classes/handler/public.php:638
 #, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr ""
 
-#: classes/handler/public.php:582 classes/handler/public.php:667
+#: classes/handler/public.php:556 classes/handler/public.php:641
 #, fuzzy, php-format
 msgid "No feeds found in <b>%s</b>."
 msgstr "Nie znaleziono kanałów."
 
-#: classes/handler/public.php:585 classes/handler/public.php:673
+#: classes/handler/public.php:559 classes/handler/public.php:647
 msgid "Multiple feed URLs found."
 msgstr "Znaleziono wiele adresów kanałów."
 
-#: classes/handler/public.php:589 classes/handler/public.php:678
+#: classes/handler/public.php:563 classes/handler/public.php:652
 #, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr ""
 
-#: classes/handler/public.php:607 classes/handler/public.php:696
+#: classes/handler/public.php:581 classes/handler/public.php:670
 msgid "Subscribe to selected feed"
 msgstr "Prenumeruj wybrany kanał"
 
-#: classes/handler/public.php:632 classes/handler/public.php:720
+#: classes/handler/public.php:606 classes/handler/public.php:694
 msgid "Edit subscription options"
 msgstr "Edytuj opcje prenumeraty"
 
-#: classes/auth/internal.php:45 plugins/auth_internal/init.php:62
-#, fuzzy
-msgid "Please enter your one time password:"
-msgstr "Wprowadź tytuł kategorii:"
-
-#: classes/auth/internal.php:168 plugins/auth_internal/init.php:185
-msgid "Password has been changed."
-msgstr "Hasło zostało zmienione."
-
-#: classes/auth/internal.php:170
-msgid "Old password is incorrect."
-msgstr "Nieprawidłowe stare hasło."
-
-#: classes/dlg.php:26
-msgid "Prepare data"
-msgstr "Przygotuj dane"
-
-#: classes/dlg.php:40
+#: classes/dlg.php:22
 msgid ""
 "If you have imported labels and/or filters, you might need to reload "
 "preferences to see your new data."
@@ -1353,66 +1299,66 @@ msgstr ""
 "Jeżeli posiadasz zaimportowane etykiety i/lub filtry, aby zobaczyć nowe dane "
 "możesz musieć przeładować ustawienia."
 
-#: classes/dlg.php:73 classes/pref/users.php:378 classes/pref/labels.php:272
-#: classes/pref/filters.php:223 classes/pref/filters.php:270
-#: classes/pref/filters.php:571 classes/pref/filters.php:650
-#: classes/pref/filters.php:677 classes/pref/feeds.php:1274
-#: classes/pref/feeds.php:1583 classes/pref/feeds.php:1652
-#: plugins/instances/instances.php:172
+#: classes/dlg.php:55 classes/pref/users.php:378 classes/pref/labels.php:272
+#: classes/pref/filters.php:230 classes/pref/filters.php:277
+#: classes/pref/filters.php:578 classes/pref/filters.php:657
+#: classes/pref/filters.php:684 classes/pref/feeds.php:1202
+#: classes/pref/feeds.php:1472 classes/pref/feeds.php:1541
+#: plugins/instances/init.php:287
 msgid "Select"
 msgstr "Wybierz"
 
-#: classes/dlg.php:76 classes/feeds.php:92 classes/pref/users.php:381
-#: classes/pref/labels.php:275 classes/pref/filters.php:226
-#: classes/pref/filters.php:273 classes/pref/filters.php:574
-#: classes/pref/filters.php:653 classes/pref/filters.php:680
-#: classes/pref/feeds.php:1277 classes/pref/feeds.php:1586
-#: classes/pref/feeds.php:1655 plugins/instances/instances.php:175
+#: classes/dlg.php:58 classes/feeds.php:92 classes/pref/users.php:381
+#: classes/pref/labels.php:275 classes/pref/filters.php:233
+#: classes/pref/filters.php:280 classes/pref/filters.php:581
+#: classes/pref/filters.php:660 classes/pref/filters.php:687
+#: classes/pref/feeds.php:1205 classes/pref/feeds.php:1475
+#: classes/pref/feeds.php:1544 plugins/instances/init.php:290
 msgid "All"
 msgstr "Wszystko"
 
-#: classes/dlg.php:78 classes/feeds.php:95 classes/pref/users.php:383
-#: classes/pref/labels.php:277 classes/pref/filters.php:228
-#: classes/pref/filters.php:275 classes/pref/filters.php:576
-#: classes/pref/filters.php:655 classes/pref/filters.php:682
-#: classes/pref/feeds.php:1279 classes/pref/feeds.php:1588
-#: classes/pref/feeds.php:1657 plugins/instances/instances.php:177
+#: classes/dlg.php:60 classes/feeds.php:95 classes/pref/users.php:383
+#: classes/pref/labels.php:277 classes/pref/filters.php:235
+#: classes/pref/filters.php:282 classes/pref/filters.php:583
+#: classes/pref/filters.php:662 classes/pref/filters.php:689
+#: classes/pref/feeds.php:1207 classes/pref/feeds.php:1477
+#: classes/pref/feeds.php:1546 plugins/instances/init.php:292
 msgid "None"
 msgstr "Nic"
 
-#: classes/dlg.php:87
+#: classes/dlg.php:69
 msgid "Create profile"
 msgstr "Utwórz profil"
 
-#: classes/dlg.php:110 classes/dlg.php:140
+#: classes/dlg.php:92 classes/dlg.php:122
 msgid "(active)"
 msgstr "(aktywny)"
 
-#: classes/dlg.php:174
+#: classes/dlg.php:156
 msgid "Remove selected profiles"
 msgstr "Usuń wybrane profile"
 
-#: classes/dlg.php:176
+#: classes/dlg.php:158
 msgid "Activate profile"
 msgstr "Aktywuj profil"
 
-#: classes/dlg.php:186
+#: classes/dlg.php:168
 msgid "Public OPML URL"
 msgstr "Publiczny adres OPML"
 
-#: classes/dlg.php:191
+#: classes/dlg.php:173
 msgid "Your Public OPML URL is:"
 msgstr "Twój publiczny adres OPML to:"
 
-#: classes/dlg.php:200 classes/dlg.php:587
+#: classes/dlg.php:182 classes/dlg.php:571
 msgid "Generate new URL"
 msgstr "Wygeneruj nowy adres"
 
-#: classes/dlg.php:212
+#: classes/dlg.php:194
 msgid "Notice"
 msgstr "Uwaga"
 
-#: classes/dlg.php:218
+#: classes/dlg.php:200
 msgid ""
 "Update daemon is enabled in configuration, but daemon process is not "
 "running, which prevents all feeds from updating. Please start the daemon "
@@ -1423,11 +1369,11 @@ msgstr ""
 "Proszę uruchomić zewnętrzny proces aktualizacji lub skontaktować się z "
 "właścicielem tej instalacji."
 
-#: classes/dlg.php:222 classes/dlg.php:231
+#: classes/dlg.php:204 classes/dlg.php:213
 msgid "Last update:"
 msgstr "Ostatnia aktualizacja:"
 
-#: classes/dlg.php:227
+#: classes/dlg.php:209
 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 "
@@ -1438,138 +1384,137 @@ msgstr ""
 "zawieszenie. Sprawdź poprawność działania zewnętrznego procesu aktualizacji "
 "lub skontaktuj się z właścicielem tej instalacji."
 
-#: classes/dlg.php:252 classes/dlg.php:261
+#: classes/dlg.php:234 classes/dlg.php:243
 #, fuzzy
 msgid "Feed or site URL"
 msgstr "Adres kanału"
 
-#: classes/dlg.php:267 classes/dlg.php:738 classes/pref/feeds.php:531
-#: classes/pref/feeds.php:775
+#: classes/dlg.php:249 classes/dlg.php:715 classes/pref/feeds.php:527
+#: classes/pref/feeds.php:735
 msgid "Place in category:"
 msgstr "Umieść w kategorii:"
 
-#: classes/dlg.php:275
+#: classes/dlg.php:257
 msgid "Available feeds"
 msgstr "Dostępne kanały"
 
-#: classes/dlg.php:287 classes/pref/users.php:155 classes/pref/feeds.php:561
-#: classes/pref/feeds.php:811
+#: classes/dlg.php:269 classes/pref/users.php:155 classes/pref/feeds.php:557
+#: classes/pref/feeds.php:771
 msgid "Authentication"
 msgstr "Uwierzytelnianie"
 
-#: classes/dlg.php:291 classes/dlg.php:752 classes/pref/users.php:438
-#: classes/pref/feeds.php:567 classes/pref/feeds.php:815
+#: classes/dlg.php:273 classes/dlg.php:729 classes/pref/users.php:438
+#: classes/pref/feeds.php:563 classes/pref/feeds.php:775
 msgid "Login"
 msgstr "Nazwa użytkownika"
 
-#: classes/dlg.php:294 classes/dlg.php:755 classes/pref/prefs.php:200
-#: classes/pref/feeds.php:573 classes/pref/feeds.php:821
+#: classes/dlg.php:276 classes/dlg.php:732 classes/pref/prefs.php:196
+#: classes/pref/feeds.php:569 classes/pref/feeds.php:781
 msgid "Password"
 msgstr "Hasło"
 
-#: classes/dlg.php:304
+#: classes/dlg.php:286
 msgid "This feed requires authentication."
 msgstr "Ten kanał wymaga uwierzytelniania."
 
-#: classes/dlg.php:309 classes/dlg.php:364 classes/dlg.php:773
+#: classes/dlg.php:291 classes/dlg.php:348 classes/dlg.php:750
 msgid "Subscribe"
 msgstr "Prenumeruj"
 
-#: classes/dlg.php:312
+#: classes/dlg.php:294
 msgid "More feeds"
 msgstr "Więcej kanałów"
 
-#: classes/dlg.php:336 classes/dlg.php:425 classes/pref/users.php:368
-#: classes/pref/filters.php:567 classes/pref/feeds.php:1270 js/tt-rss.js:234
-#: js/tt-rss.js:187 js/tt-rss.js:166
+#: classes/dlg.php:318 classes/dlg.php:409 classes/pref/users.php:368
+#: classes/pref/filters.php:574 classes/pref/feeds.php:1198 js/tt-rss.js:166
 msgid "Search"
 msgstr "Szukaj"
 
-#: classes/dlg.php:340
+#: classes/dlg.php:322
 msgid "Popular feeds"
 msgstr "Popularne kanały"
 
-#: classes/dlg.php:341
+#: classes/dlg.php:323
 msgid "Feed archive"
 msgstr "Archiwum kanału"
 
-#: classes/dlg.php:344
+#: classes/dlg.php:326
 msgid "limit:"
 msgstr "limit:"
 
-#: classes/dlg.php:365 classes/pref/users.php:394 classes/pref/labels.php:284
-#: classes/pref/filters.php:332 classes/pref/filters.php:589
-#: classes/pref/feeds.php:702 plugins/instances/instances.php:182
+#: classes/dlg.php:349 classes/pref/users.php:394 classes/pref/labels.php:284
+#: classes/pref/filters.php:339 classes/pref/filters.php:596
+#: classes/pref/feeds.php:662 plugins/instances/init.php:297
 msgid "Remove"
 msgstr "Usuń"
 
-#: classes/dlg.php:376
+#: classes/dlg.php:360
 msgid "Look for"
 msgstr "Szukaj napisu"
 
-#: classes/dlg.php:384
+#: classes/dlg.php:368
 msgid "Limit search to:"
 msgstr "Ogranicz wyszukiwanie do:"
 
-#: classes/dlg.php:400
+#: classes/dlg.php:384
 msgid "This feed"
 msgstr "Ten kanał"
 
-#: classes/dlg.php:432
+#: classes/dlg.php:416
 msgid "Tags for this article (separated by commas):"
 msgstr "Tagi dla tego artykułu (oddzielone przecinkami):"
 
-#: classes/dlg.php:455 classes/dlg.php:650 classes/pref/users.php:192
-#: classes/pref/labels.php:79 classes/pref/filters.php:339
-#: classes/pref/feeds.php:728 classes/pref/feeds.php:877
-#: plugins/note/note.php:47 plugins/instances/instances.php:133
-#: plugins/nsfw/init.php:86 plugins/owncloud/init.php:62
+#: classes/dlg.php:439 classes/dlg.php:650 classes/pref/users.php:192
+#: classes/pref/labels.php:79 classes/pref/filters.php:346
+#: classes/pref/feeds.php:688 classes/pref/feeds.php:826
+#: plugins/nsfw/init.php:86 plugins/note/init.php:53
+#: plugins/owncloud/init.php:62 plugins/instances/init.php:248
 msgid "Save"
 msgstr "Zapisz"
 
-#: classes/dlg.php:463
+#: classes/dlg.php:447
 msgid "Tag Cloud"
 msgstr "Chmura tagów"
 
-#: classes/dlg.php:532
+#: classes/dlg.php:516
 msgid "Select item(s) by tags"
 msgstr "Wybierz element(y) przy użyciu tagów"
 
-#: classes/dlg.php:535
+#: classes/dlg.php:519
 msgid "Match:"
 msgstr "Dopasuj:"
 
-#: classes/dlg.php:537
+#: classes/dlg.php:521
 msgid "Any"
 msgstr ""
 
-#: classes/dlg.php:540
+#: classes/dlg.php:524
 #, fuzzy
 msgid "All tags."
 msgstr "brak tagów"
 
-#: classes/dlg.php:542
+#: classes/dlg.php:526
 msgid "Which Tags?"
 msgstr "Które tagi?"
 
-#: classes/dlg.php:555
+#: classes/dlg.php:539
 msgid "Display entries"
 msgstr "Wyświetl wpisy"
 
-#: classes/dlg.php:567 classes/feeds.php:129
+#: classes/dlg.php:551 classes/feeds.php:133
 msgid "View as RSS"
 msgstr "Wyświetl jako RSS"
 
-#: classes/dlg.php:578
+#: classes/dlg.php:562
 msgid "You can view this feed as RSS using the following URL:"
 msgstr "Możesz obejrzeć ten kanał jako RSS korzystając z adresu:"
 
-#: classes/dlg.php:606 plugins/updater/updater.php:276
+#: classes/dlg.php:591 plugins/updater/init.php:303
 #, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "Dostępna jest nowa wersja Tiny Tiny RSS (%s)."
 
-#: classes/dlg.php:614
+#: classes/dlg.php:599
 msgid ""
 "You can update using built-in updater in the Preferences or by using update."
 "php"
@@ -1577,14 +1522,18 @@ msgstr ""
 "Możesz przeprowadzić aktualizację wykorzystując wbudowany aktualizator "
 "dostępny w Ustawieniach lub korzystając z update.php"
 
-#: classes/dlg.php:618 classes/pref/users.php:390
+#: classes/dlg.php:603 classes/pref/users.php:390
 msgid "Details"
 msgstr "Szczegóły"
 
-#: classes/dlg.php:620
+#: classes/dlg.php:605
 msgid "Download"
 msgstr "Pobierz"
 
+#: classes/dlg.php:613
+msgid "Error receiving version information or no new version available."
+msgstr ""
+
 #: classes/dlg.php:634
 #, php-format
 msgid ""
@@ -1596,32 +1545,29 @@ msgstr ""
 "użyciu własnych deklaracji CSS. <a target=\"_blank\" class=\"visibleLink\" "
 "href=\"%s\">Ten plik</a> może posłużyć jako przykład."
 
-#: classes/dlg.php:661 plugins/instances/instances.php:92
-#: plugins/instances/init.php:207
+#: classes/dlg.php:661 plugins/instances/init.php:207
 msgid "Instance"
 msgstr "Instancja"
 
-#: classes/dlg.php:670 plugins/instances/instances.php:103
-#: plugins/instances/instances.php:200 plugins/instances/init.php:218
+#: classes/dlg.php:670 plugins/instances/init.php:218
+#: plugins/instances/init.php:315
 msgid "Instance URL"
 msgstr "Adres instancji:"
 
-#: classes/dlg.php:680 plugins/instances/instances.php:114
-#: plugins/instances/init.php:229
+#: classes/dlg.php:680 plugins/instances/init.php:229
 msgid "Access key:"
 msgstr "Klucz dostępu:"
 
-#: classes/dlg.php:683 plugins/instances/instances.php:117
-#: plugins/instances/instances.php:201 plugins/instances/init.php:232
+#: classes/dlg.php:683 plugins/instances/init.php:232
+#: plugins/instances/init.php:316
 msgid "Access key"
 msgstr "Klucz dostępu"
 
-#: classes/dlg.php:687 plugins/instances/instances.php:121
-#: plugins/instances/init.php:236
+#: classes/dlg.php:687 plugins/instances/init.php:236
 msgid "Use one access key for both linked instances."
 msgstr "Użyj jednego klucza dostępu dla obydwóch połączonych instancji."
 
-#: classes/dlg.php:695 plugins/instances/instances.php:129
+#: classes/dlg.php:695 plugins/instances/init.php:244
 msgid "Generate new key"
 msgstr "Wygeneruj nowy klucz"
 
@@ -1629,30 +1575,24 @@ msgstr "Wygeneruj nowy klucz"
 msgid "Create link"
 msgstr "Utwórz łącze"
 
-#: classes/dlg.php:717
-#, php-format
-msgid ""
-"Could not upload file. You might need to adjust upload_max_filesize\n"
-"\t\t\t\tin PHP.ini (current value = %s)"
-msgstr ""
-"Nie udało się wgrać pliku. Możliwe, że będziesz musiał dostosować wartość "
-"parametru upload_max_filesize\n"
-"(maksymalny rozmiar przesyłanego pliku) w PHP.ini (obecna wartość = %s)"
-
-#: classes/dlg.php:735
+#: classes/dlg.php:712
 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/dlg.php:744
+#: classes/dlg.php:721
 msgid "Feeds to subscribe, One per line"
 msgstr "Kanały do prenumeraty. Każdy w osobnej linii"
 
-#: classes/dlg.php:766
+#: classes/dlg.php:743
 msgid "Feeds require authentication."
 msgstr "Kanały wymagają uwierzytelniania."
 
+#: classes/feeds.php:68
+msgid "Visit the website"
+msgstr "Odwiedź stronę internetową"
+
 #: classes/feeds.php:83
 msgid "View as RSS feed"
 msgstr "Zobacz jako kanał RSS"
@@ -1665,6 +1605,11 @@ msgstr "Wybierz: "
 msgid "Invert"
 msgstr "Odwróć"
 
+#: classes/feeds.php:101
+#, fuzzy
+msgid "More..."
+msgstr "%d więcej..."
+
 #: classes/feeds.php:103
 msgid "Selection toggle:"
 msgstr "Przełącz zaznaczenie:"
@@ -1686,41 +1631,41 @@ msgstr "Archiwizuj"
 msgid "Move back"
 msgstr "Cofnij"
 
-#: classes/feeds.php:118 classes/pref/filters.php:235
-#: classes/pref/filters.php:282 classes/pref/filters.php:662
-#: classes/pref/filters.php:689
+#: classes/feeds.php:118 classes/pref/filters.php:242
+#: classes/pref/filters.php:289 classes/pref/filters.php:669
+#: classes/pref/filters.php:696
 msgid "Delete"
 msgstr "Usuń"
 
-#: classes/feeds.php:122 plugins/mail/mail.php:22
+#: classes/feeds.php:125 plugins/mail/init.php:28
 msgid "Forward by email"
 msgstr "Przekaż za pomocą emaila"
 
-#: classes/feeds.php:125
+#: classes/feeds.php:129
 msgid "Feed:"
 msgstr "Kanał:"
 
-#: classes/feeds.php:190 classes/feeds.php:844
+#: classes/feeds.php:196 classes/feeds.php:790
 msgid "Feed not found."
 msgstr "Kanał nie został odnaleziony."
 
-#: classes/feeds.php:434 classes/feeds.php:516
+#: classes/feeds.php:403 classes/feeds.php:493
 msgid "mark as read"
 msgstr "oznacz jako przeczytane"
 
-#: classes/feeds.php:739
+#: classes/feeds.php:691
 msgid "No unread articles found to display."
 msgstr "Nie znaleziono nieprzeczytanych artykułów."
 
-#: classes/feeds.php:742
+#: classes/feeds.php:694
 msgid "No updated articles found to display."
 msgstr "Nie znaleziono uaktualnionych artykułów."
 
-#: classes/feeds.php:745
+#: classes/feeds.php:697
 msgid "No starred articles found to display."
 msgstr "Nie znaleziono artykułów oznaczonych gwiazdką."
 
-#: classes/feeds.php:749
+#: classes/feeds.php:701
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
@@ -1728,11 +1673,42 @@ msgstr ""
 "Nie znaleziono artykułów. Możesz ręcznie przypisać artykuły do etykiet "
 "(zobacz menu Akcje powyżej) lub wykorzystać do tego celu filtry."
 
-#: classes/feeds.php:751
+#: classes/feeds.php:703
 msgid "No articles found to display."
 msgstr "Nie znaleziono artykułów."
 
-#: classes/backend.php:26
+#: classes/feeds.php:718 classes/feeds.php:899
+#, php-format
+msgid "Feeds last updated at %s"
+msgstr "Kanały ostatnio uaktualnione o %s"
+
+#: classes/feeds.php:728 classes/feeds.php:909
+msgid "Some feeds have update errors (click for details)"
+msgstr ""
+"Wystąpiły błędy aktualizacji niektórych kanałów (kliknij aby zobaczyć "
+"szczegóły)"
+
+#: classes/feeds.php:889
+msgid "No feed selected."
+msgstr "Nie wybrano kanału."
+
+#: classes/backend.php:34
+msgid "Keyboard Shortcuts"
+msgstr "Skróty klawiszowe"
+
+#: classes/backend.php:57
+msgid "Shift"
+msgstr ""
+
+#: classes/backend.php:60
+msgid "Ctrl"
+msgstr ""
+
+#: classes/backend.php:84
+msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
+msgstr "Inne wskazówki dotyczące interfejsu znajdziesz na wiki Tiny Tiny RSS."
+
+#: classes/backend.php:99
 msgid "Help topic not found."
 msgstr "Temat pomocy nie został znaleziony."
 
@@ -1782,16 +1758,15 @@ msgstr "Dodaję filtr..."
 msgid "Processing category: %s"
 msgstr "Przetwarzam kategorię: %s"
 
-#: classes/opml.php:467
+#: classes/opml.php:468
 msgid "Error: please upload OPML file."
 msgstr "Błąd: proszę wgrać plik OPML."
 
-#: classes/opml.php:474
+#: classes/opml.php:475
 msgid "Error while parsing document."
 msgstr "Błąd przetwarzania dokumentu."
 
-#: classes/pref/users.php:6 plugins/instances/instances.php:42
-#: plugins/instances/init.php:157
+#: classes/pref/users.php:6 plugins/instances/init.php:157
 msgid "Your access level is insufficient to open this tab."
 msgstr "Twój poziom uprawnień jest niewystarczający aby otworzyć tę zakładkę."
 
@@ -1831,8 +1806,8 @@ msgstr "Poziom dostępu: "
 msgid "Change password to"
 msgstr "Zmień hasło na"
 
-#: classes/pref/users.php:177 classes/pref/feeds.php:581
-#: classes/pref/feeds.php:827
+#: classes/pref/users.php:177 classes/pref/feeds.php:577
+#: classes/pref/feeds.php:787
 msgid "Options"
 msgstr "Opcje"
 
@@ -1871,8 +1846,12 @@ msgstr ""
 msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] Informacja o zmianie hasła"
 
-#: classes/pref/users.php:392 classes/pref/filters.php:586
-#: plugins/instances/instances.php:181
+#: classes/pref/users.php:386
+msgid "Create user"
+msgstr "Utwórz użytkownika"
+
+#: classes/pref/users.php:392 classes/pref/filters.php:593
+#: plugins/instances/init.php:296
 msgid "Edit"
 msgstr "Edytuj"
 
@@ -1888,15 +1867,15 @@ msgstr "Poziom dostępu"
 msgid "Last login"
 msgstr "Ostatnie logowanie"
 
-#: classes/pref/users.php:461 plugins/instances/instances.php:222
+#: classes/pref/users.php:462 plugins/instances/init.php:337
 msgid "Click to edit"
 msgstr "Kliknij aby edytować"
 
-#: classes/pref/users.php:481
+#: classes/pref/users.php:482
 msgid "No users defined."
 msgstr "Nie zdefiniowano żadnego użytkownika."
 
-#: classes/pref/users.php:483
+#: classes/pref/users.php:484
 msgid "No matching users found."
 msgstr "Nie odnaleziono pasującego użytkownika."
 
@@ -1934,84 +1913,88 @@ msgstr "Artykuły pasujące do filtra:"
 msgid "No recent articles matching this filter have been found."
 msgstr "Nie znaleziono żadnych artykułów pasujących do filtra."
 
-#: classes/pref/filters.php:218 classes/pref/filters.php:645
-#: classes/pref/filters.php:760
+#: classes/pref/filters.php:98
+msgid ""
+"Complex expressions might not give results while testing due to issues with "
+"database server regexp implementation."
+msgstr ""
+
+#: classes/pref/filters.php:225 classes/pref/filters.php:652
+#: classes/pref/filters.php:767
 msgid "Match"
 msgstr "Dopasuj"
 
-#: classes/pref/filters.php:232 classes/pref/filters.php:279
-#: classes/pref/filters.php:659 classes/pref/filters.php:686
+#: classes/pref/filters.php:239 classes/pref/filters.php:286
+#: classes/pref/filters.php:666 classes/pref/filters.php:693
 msgid "Add"
 msgstr ""
 
-#: classes/pref/filters.php:265 classes/pref/filters.php:672
+#: classes/pref/filters.php:272 classes/pref/filters.php:679
 #, fuzzy
 msgid "Apply actions"
 msgstr "Dodaj działania"
 
-#: classes/pref/filters.php:315 classes/pref/filters.php:701
+#: classes/pref/filters.php:322 classes/pref/filters.php:708
 msgid "Enabled"
 msgstr "Włączone"
 
-#: classes/pref/filters.php:324 classes/pref/filters.php:704
+#: classes/pref/filters.php:331 classes/pref/filters.php:711
 msgid "Match any rule"
 msgstr ""
 
-#: classes/pref/filters.php:336 classes/pref/filters.php:716
+#: classes/pref/filters.php:343 classes/pref/filters.php:723
 msgid "Test"
 msgstr "Testuj"
 
-#: classes/pref/filters.php:368
+#: classes/pref/filters.php:375
 #, php-format
 msgid "%s on %s in %s"
 msgstr ""
 
-#: classes/pref/filters.php:583
+#: classes/pref/filters.php:590
 msgid "Combine"
 msgstr ""
 
-#: classes/pref/filters.php:593 classes/pref/feeds.php:1329
+#: classes/pref/filters.php:600 classes/pref/feeds.php:1257
 msgid "Rescore articles"
 msgstr "Przywróć artykuły"
 
-#: classes/pref/filters.php:719
+#: classes/pref/filters.php:726
 msgid "Create"
 msgstr "Utwórz"
 
-#: classes/pref/filters.php:769
+#: classes/pref/filters.php:776
 msgid "on field"
 msgstr "pole"
 
-#: classes/pref/filters.php:775 js/PrefFilterTree.js:29
+#: classes/pref/filters.php:782 js/PrefFilterTree.js:29
 #: plugins/digest/digest.js:241
 msgid "in"
 msgstr "w"
 
-#: classes/pref/filters.php:788
+#: classes/pref/filters.php:795
 #, fuzzy
 msgid "Save rule"
 msgstr "Zapisz"
 
-#: classes/pref/filters.php:788 js/functions.js:1067 js/functions.js:1063
-#: js/functions.js:1071 js/functions.js:1073
+#: classes/pref/filters.php:795 js/functions.js:1078
 msgid "Add rule"
 msgstr "Dodaj regułę"
 
-#: classes/pref/filters.php:811
+#: classes/pref/filters.php:818
 msgid "Perform Action"
 msgstr "Wykonaj operację"
 
-#: classes/pref/filters.php:837
+#: classes/pref/filters.php:844
 msgid "with parameters:"
 msgstr "z parametrami:"
 
-#: classes/pref/filters.php:855
+#: classes/pref/filters.php:862
 #, fuzzy
 msgid "Save action"
 msgstr "Działania na panelach"
 
-#: classes/pref/filters.php:855 js/functions.js:1093 js/functions.js:1089
-#: js/functions.js:1097 js/functions.js:1099
+#: classes/pref/filters.php:862 js/functions.js:1104
 msgid "Add action"
 msgstr "Dodaj działania"
 
@@ -2031,145 +2014,179 @@ msgstr "Wprowadzone hasła są różne."
 msgid "Function not supported by authentication module."
 msgstr ""
 
-#: classes/pref/prefs.php:68
+#: classes/pref/prefs.php:63
 msgid "The configuration was saved."
 msgstr "Konfiguracja została zapisana."
 
-#: classes/pref/prefs.php:83
+#: classes/pref/prefs.php:77
 #, php-format
 msgid "Unknown option: %s"
 msgstr "Nieznana opcja: %s"
 
-#: classes/pref/prefs.php:97
+#: classes/pref/prefs.php:91
 msgid "Your personal data has been saved."
 msgstr "Dwoje dane osobiste zostały zapisane."
 
-#: classes/pref/prefs.php:137
+#: classes/pref/prefs.php:131
 msgid "Personal data / Authentication"
 msgstr "Dane osobiste / Uwierzytelnianie"
 
-#: classes/pref/prefs.php:157
+#: classes/pref/prefs.php:151
 #, fuzzy
 msgid "Personal data"
 msgstr "Przygotuj dane"
 
-#: classes/pref/prefs.php:167
+#: classes/pref/prefs.php:161
 msgid "Full name"
 msgstr "Nazwa"
 
-#: classes/pref/prefs.php:171
+#: classes/pref/prefs.php:165
 msgid "E-mail"
 msgstr "E-mail"
 
-#: classes/pref/prefs.php:177
+#: classes/pref/prefs.php:171
 msgid "Access level"
 msgstr "Poziom dostępu"
 
-#: classes/pref/prefs.php:187
+#: classes/pref/prefs.php:181
 msgid "Save data"
 msgstr "Zapisz dane"
 
-#: classes/pref/prefs.php:207
+#: classes/pref/prefs.php:203
 msgid "Your password is at default value, please change it."
 msgstr "Używasz domyślnego hasła, zmień je proszę."
 
-#: classes/pref/prefs.php:239
+#: classes/pref/prefs.php:235
 msgid "Old password"
 msgstr "Stare hasło"
 
-#: classes/pref/prefs.php:242
+#: classes/pref/prefs.php:238
 msgid "New password"
 msgstr "Nowe hasło"
 
-#: classes/pref/prefs.php:247
+#: classes/pref/prefs.php:243
 msgid "Confirm password"
 msgstr "Potwierdź hasło"
 
-#: classes/pref/prefs.php:257
+#: classes/pref/prefs.php:253
 msgid "Change password"
 msgstr "Zmień hasło"
 
-#: classes/pref/prefs.php:263
+#: classes/pref/prefs.php:259
 msgid "One time passwords / Authenticator"
 msgstr ""
 
-#: classes/pref/prefs.php:292 classes/pref/prefs.php:343
+#: classes/pref/prefs.php:288 classes/pref/prefs.php:339
 #, fuzzy
 msgid "Enter your password"
 msgstr "Nieprawidłowa nazwa użytkownika lub hasło"
 
-#: classes/pref/prefs.php:303
+#: classes/pref/prefs.php:299
 #, fuzzy
 msgid "Disable OTP"
 msgstr "Wyłącz aktualizacje"
 
-#: classes/pref/prefs.php:309
+#: classes/pref/prefs.php:305
 msgid ""
 "You will need a compatible Authenticator to use this. Changing your password "
 "would automatically disable OTP."
 msgstr ""
 
-#: classes/pref/prefs.php:311
+#: classes/pref/prefs.php:307
 msgid "Scan the following code by the Authenticator application:"
 msgstr ""
 
-#: classes/pref/prefs.php:352
+#: classes/pref/prefs.php:348
 msgid "I have scanned the code and would like to enable OTP"
 msgstr ""
 
-#: classes/pref/prefs.php:360
+#: classes/pref/prefs.php:356
 #, fuzzy
 msgid "Enable OTP"
 msgstr "Włączone"
 
-#: classes/pref/prefs.php:456
-msgid "Select theme"
-msgstr "Wybierz styl"
-
-#: classes/pref/prefs.php:508
+#: classes/pref/prefs.php:482
 msgid "Customize"
 msgstr "Dostosuj"
 
-#: classes/pref/prefs.php:527 classes/pref/prefs.php:534
-#: classes/pref/prefs.php:539
+#: classes/pref/prefs.php:501 classes/pref/prefs.php:508
+#: classes/pref/prefs.php:513
 msgid "Yes"
 msgstr "Tak"
 
-#: classes/pref/prefs.php:529 classes/pref/prefs.php:539
+#: classes/pref/prefs.php:503 classes/pref/prefs.php:513
 msgid "No"
 msgstr "Nie"
 
-#: classes/pref/prefs.php:569
+#: classes/pref/prefs.php:543
 msgid "Register"
 msgstr "Zarejestruj"
 
-#: classes/pref/prefs.php:573
+#: classes/pref/prefs.php:547
 msgid "Clear"
 msgstr "Wyczyść"
 
-#: classes/pref/prefs.php:579
+#: classes/pref/prefs.php:553
 #, php-format
 msgid "Current server time: %s (UTC)"
 msgstr ""
 
-#: classes/pref/prefs.php:604
+#: classes/pref/prefs.php:582
 msgid "Save configuration"
 msgstr "Zapisz konfigurację"
 
-#: classes/pref/prefs.php:607
+#: classes/pref/prefs.php:585
 msgid "Manage profiles"
 msgstr "Zarządzaj profilami"
 
-#: classes/pref/prefs.php:610
+#: classes/pref/prefs.php:588
 msgid "Reset to defaults"
 msgstr "Przywróć domyślne"
 
-#: classes/pref/prefs.php:622
+#: classes/pref/prefs.php:600
 #, fuzzy
 msgid "Show additional preferences"
 msgstr "Wyjdź z ustawień"
 
-#: classes/pref/prefs.php:679 classes/pref/prefs.php:697
+#: classes/pref/prefs.php:612 classes/pref/prefs.php:614
+msgid "Plugins"
+msgstr ""
+
+#: classes/pref/prefs.php:642
+msgid "System plugins"
+msgstr ""
+
+#: classes/pref/prefs.php:646 classes/pref/prefs.php:695
+msgid "Plugin"
+msgstr ""
+
+#: classes/pref/prefs.php:647 classes/pref/prefs.php:696
+msgid "Description"
+msgstr ""
+
+#: classes/pref/prefs.php:648 classes/pref/prefs.php:697
+msgid "Version"
+msgstr ""
+
+#: classes/pref/prefs.php:649 classes/pref/prefs.php:698
+msgid "Author"
+msgstr ""
+
+#: classes/pref/prefs.php:682 classes/pref/prefs.php:733
+#, fuzzy
+msgid "Clear data"
+msgstr "Wyczyść dane kanału"
+
+#: classes/pref/prefs.php:691
+msgid "User plugins"
+msgstr ""
+
+#: classes/pref/prefs.php:748
+#, fuzzy
+msgid "Enable selected plugins"
+msgstr "Włącz kategorie kanałów"
+
+#: classes/pref/prefs.php:803 classes/pref/prefs.php:821
 #, fuzzy
 msgid "Incorrect password"
 msgstr "Nieprawidłowa nazwa użytkownika lub hasło"
@@ -2178,26 +2195,22 @@ msgstr "Nieprawidłowa nazwa użytkownika lub hasło"
 msgid "Check to enable field"
 msgstr "Zaznacz aby uaktywnić pole"
 
-#: classes/pref/feeds.php:59 classes/pref/feeds.php:180
-#: classes/pref/feeds.php:223 classes/pref/feeds.php:229
-#: classes/pref/feeds.php:254
+#: classes/pref/feeds.php:58 classes/pref/feeds.php:175
+#: classes/pref/feeds.php:217 classes/pref/feeds.php:223
+#: classes/pref/feeds.php:248
 #, fuzzy, php-format
 msgid "(%d feeds)"
 msgstr "Zapisane kanały"
 
-#: classes/pref/feeds.php:492 classes/pref/feeds.php:747
-msgid "Feed"
-msgstr "Kanał"
-
-#: classes/pref/feeds.php:498
+#: classes/pref/feeds.php:494
 msgid "Feed Title"
 msgstr "Tytuł kanału"
 
-#: classes/pref/feeds.php:554 classes/pref/feeds.php:802
+#: classes/pref/feeds.php:550 classes/pref/feeds.php:762
 msgid "Article purging:"
 msgstr "Czyszczenie artykułów:"
 
-#: classes/pref/feeds.php:577
+#: classes/pref/feeds.php:573
 msgid ""
 "<b>Hint:</b> you need to fill in your login information if your feed "
 "requires authentication, except for Twitter feeds."
@@ -2205,125 +2218,107 @@ 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:593 classes/pref/feeds.php:831
+#: classes/pref/feeds.php:589 classes/pref/feeds.php:791
 msgid "Hide from Popular feeds"
 msgstr "Ukryj przed umieszczeniem w Popularnych kanałach"
 
-#: classes/pref/feeds.php:604 classes/pref/feeds.php:836
-msgid "Right-to-left content"
-msgstr "Treść czytana od prawej do lewej"
-
-#: classes/pref/feeds.php:616 classes/pref/feeds.php:842
+#: classes/pref/feeds.php:601 classes/pref/feeds.php:797
 msgid "Include in e-mail digest"
 msgstr "Umieść w przeglądzie emailowym"
 
-#: classes/pref/feeds.php:629 classes/pref/feeds.php:848
+#: classes/pref/feeds.php:614 classes/pref/feeds.php:803
 msgid "Always display image attachments"
 msgstr "Zawsze wyświetlaj załączniki graficzne"
 
-#: classes/pref/feeds.php:643 classes/pref/feeds.php:856
+#: classes/pref/feeds.php:628 classes/pref/feeds.php:811
 msgid "Cache images locally"
 msgstr "Przechowuj obrazki lokalnie"
 
-#: classes/pref/feeds.php:656
-#, fuzzy
-msgid "Cache content locally"
-msgstr "Przechowuj obrazki lokalnie"
-
-#: classes/pref/feeds.php:668 classes/pref/feeds.php:862
+#: classes/pref/feeds.php:640 classes/pref/feeds.php:817
 msgid "Mark updated articles as unread"
 msgstr "Oznacz zaktualizowane artykuły jako nieprzeczytane"
 
-#: classes/pref/feeds.php:680 classes/pref/feeds.php:868
-msgid "Mark posts as updated on content change"
-msgstr "Oznacz artykuły jako zaktualizowane gdy zmieni się ich treść"
-
-#: classes/pref/feeds.php:686
+#: classes/pref/feeds.php:646
 msgid "Icon"
 msgstr "Ikona"
 
-#: classes/pref/feeds.php:700
+#: classes/pref/feeds.php:660
 msgid "Replace"
 msgstr "Zamień"
 
-#: classes/pref/feeds.php:719
+#: classes/pref/feeds.php:679
 msgid "Resubscribe to push updates"
 msgstr "Odnów prenumeratę aktualizacji typu PUSH"
 
-#: classes/pref/feeds.php:726
+#: classes/pref/feeds.php:686
 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:741
+#: classes/pref/feeds.php:701
 msgid "Enable the options you wish to apply using checkboxes on the right:"
 msgstr ""
 
-#: classes/pref/feeds.php:1123 classes/pref/feeds.php:1176
+#: classes/pref/feeds.php:1051 classes/pref/feeds.php:1104
 msgid "All done."
 msgstr "Zrobione."
 
-#: classes/pref/feeds.php:1231
+#: classes/pref/feeds.php:1159
 msgid "Feeds with errors"
 msgstr "Kanały z błędami"
 
-#: classes/pref/feeds.php:1251
+#: classes/pref/feeds.php:1179
 #, fuzzy
 msgid "Inactive feeds"
 msgstr "Odśwież aktywny kanał"
 
-#: classes/pref/feeds.php:1288
+#: classes/pref/feeds.php:1216
 msgid "Edit selected feeds"
 msgstr "Edytuj wybrane kanały"
 
-#: classes/pref/feeds.php:1290 classes/pref/feeds.php:1304
+#: classes/pref/feeds.php:1218 classes/pref/feeds.php:1232
 msgid "Reset sort order"
 msgstr "Zresetuj porządek sortowania"
 
-#: classes/pref/feeds.php:1292 js/prefs.js:2021 js/prefs.js:1788
-#: js/prefs.js:1778
+#: classes/pref/feeds.php:1220 js/prefs.js:1778
 msgid "Batch subscribe"
 msgstr "Prenumerata wsadowa"
 
-#: classes/pref/feeds.php:1297
+#: classes/pref/feeds.php:1225
 msgid "Categories"
 msgstr "Kategorie"
 
-#: classes/pref/feeds.php:1300
+#: classes/pref/feeds.php:1228
 #, fuzzy
 msgid "Add category"
 msgstr "Edytuj kategorię"
 
-#: classes/pref/feeds.php:1302
+#: classes/pref/feeds.php:1230
 msgid "(Un)hide empty categories"
 msgstr "Pokaż/Ukryj puste kategorie"
 
-#: classes/pref/feeds.php:1306
+#: classes/pref/feeds.php:1234
 #, fuzzy
 msgid "Remove selected"
 msgstr "Usunąć wybrane kanały?"
 
-#: classes/pref/feeds.php:1320
+#: classes/pref/feeds.php:1248
 msgid "More actions..."
 msgstr "Więcej działań..."
 
-#: classes/pref/feeds.php:1324
+#: classes/pref/feeds.php:1252
 msgid "Manual purge"
 msgstr "Czyszczenie ręczne"
 
-#: classes/pref/feeds.php:1328
+#: classes/pref/feeds.php:1256
 msgid "Clear feed data"
 msgstr "Wyczyść dane kanału"
 
-#: classes/pref/feeds.php:1379
-msgid "Import and export"
-msgstr "Import i eksport"
-
-#: classes/pref/feeds.php:1381
+#: classes/pref/feeds.php:1307
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1383
+#: classes/pref/feeds.php:1309
 msgid ""
 "Using OPML you can export and import your feeds, filters, labels and Tiny "
 "Tiny RSS settings."
@@ -2331,27 +2326,27 @@ msgstr ""
 "Korzystając z OPML możesz eksportować i importować kanały, filtry, etykiety "
 "i ustawienia Tiny Tiny RSS."
 
-#: classes/pref/feeds.php:1385
+#: classes/pref/feeds.php:1311
 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:1398
+#: classes/pref/feeds.php:1324
 msgid "Import my OPML"
 msgstr "Importuj mój OPML"
 
-#: classes/pref/feeds.php:1402
+#: classes/pref/feeds.php:1328
 msgid "Filename:"
 msgstr "Nazwa pliku:"
 
-#: classes/pref/feeds.php:1404
+#: classes/pref/feeds.php:1330
 msgid "Include settings"
 msgstr "Załącz ustawienia"
 
-#: classes/pref/feeds.php:1408
+#: classes/pref/feeds.php:1334
 msgid "Export OPML"
 msgstr "Eksportuj OPML"
 
-#: classes/pref/feeds.php:1412
+#: classes/pref/feeds.php:1338
 msgid ""
 "Your OPML can be published publicly and can be subscribed by anyone who "
 "knows the URL below."
@@ -2359,7 +2354,7 @@ msgstr ""
 "Twój OPML może zostać opublikowany i być prenumerowany przez każdego kto zna "
 "poniższy adres."
 
-#: classes/pref/feeds.php:1414
+#: classes/pref/feeds.php:1340
 msgid ""
 "Published OPML does not include your Tiny Tiny RSS settings, feeds that "
 "require authentication or feeds hidden from Popular feeds."
@@ -2368,36 +2363,15 @@ msgstr ""
 "wymagających uwierzytelniania i kanałów ukrytych przed umieszczeniem w "
 "Popularnych kanałach."
 
-#: classes/pref/feeds.php:1417
+#: classes/pref/feeds.php:1343
 msgid "Display published OPML URL"
 msgstr "Wyświetl opublikowany adres OPML"
 
-#: classes/pref/feeds.php:1420 plugins/import_export/init.php:66
-msgid "Article archive"
-msgstr "Archiwum artykułów"
-
-#: classes/pref/feeds.php:1422 plugins/import_export/init.php:68
-msgid ""
-"You can export and import your Starred and Archived articles for safekeeping "
-"or when migrating between tt-rss instances."
-msgstr ""
-"Możesz eksportować i importować artykuły oznaczone gwiazdką oraz "
-"zarchiwizowane dla zachowania lub na czas migracji pomiędzy instalacjami tt-"
-"rss."
-
-#: classes/pref/feeds.php:1425
-msgid "Export my data"
-msgstr "Eksportuj moje dane"
-
-#: classes/pref/feeds.php:1440
-msgid "Import"
-msgstr "Importuj"
-
-#: classes/pref/feeds.php:1447
+#: classes/pref/feeds.php:1353
 msgid "Firefox integration"
 msgstr "Integracja z Firefoxem"
 
-#: classes/pref/feeds.php:1449
+#: classes/pref/feeds.php:1355
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
@@ -2405,45 +2379,19 @@ 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:1456
+#: classes/pref/feeds.php:1362
 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:1464
-msgid "Bookmarklets"
-msgstr ""
-
-#: classes/pref/feeds.php:1466 plugins/bookmarklets/init.php:24
-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 ""
-"Przeciągnij poniższy odnośnik na pasek zakładek Twojej przeglądarki, otwórz "
-"kanał który Cie interesuje w przeglądarce i kliknij na utworzonym odnośniku "
-"aby zaprenumerować kanał."
-
-#: classes/pref/feeds.php:1470
-#, php-format
-msgid "Subscribe to %s in Tiny Tiny RSS?"
-msgstr "Prenumerować %s w Tiny Tiny RSS?"
-
-#: classes/pref/feeds.php:1474
-msgid "Subscribe in Tiny Tiny RSS"
-msgstr "Prenumeruj w Tiny Tiny RSS"
-
-#: classes/pref/feeds.php:1476 plugins/bookmarklets/init.php:34
-msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
-msgstr ""
-
-#: classes/pref/feeds.php:1484
+#: classes/pref/feeds.php:1370
 msgid "Published & shared articles / Generated feeds"
 msgstr "Opublikowane i udostępnione artykuły / Wygenerowane kanały"
 
-#: classes/pref/feeds.php:1486
+#: classes/pref/feeds.php:1372
 msgid "Published articles and generated feeds"
 msgstr "Opublikowane artykuły i wygenerowane kanały"
 
-#: classes/pref/feeds.php:1488
+#: classes/pref/feeds.php:1374
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the URL specified below."
@@ -2451,29 +2399,29 @@ 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:1494
+#: classes/pref/feeds.php:1380
 msgid "Display URL"
 msgstr "Wyświetl adres"
 
-#: classes/pref/feeds.php:1497
+#: classes/pref/feeds.php:1383
 msgid "Clear all generated URLs"
 msgstr "Wyczyść wszystkie wygenerowane adresy"
 
-#: classes/pref/feeds.php:1499
+#: classes/pref/feeds.php:1385
 msgid "Articles shared by URL"
 msgstr "Wszystkie artykuły udostępnione przez adresy"
 
-#: classes/pref/feeds.php:1501
+#: classes/pref/feeds.php:1387
 msgid "You can disable all articles shared by unique URLs here."
 msgstr ""
 "Możesz wyłączyć wszystkie unikalne adresy prowadzące do udostępnionych "
 "artykułów."
 
-#: classes/pref/feeds.php:1504
+#: classes/pref/feeds.php:1390
 msgid "Unshare all articles"
 msgstr "Zakończ udostępnianie wszystkich artykułów"
 
-#: classes/pref/feeds.php:1579
+#: classes/pref/feeds.php:1468
 msgid ""
 "These feeds have not been updated with new content for 3 months (oldest "
 "first):"
@@ -2481,19 +2429,19 @@ msgstr ""
 "Niniejsze kanały nie zostały uaktualnione przez 3 miesiące (najstarsze "
 "pierwsze):"
 
-#: classes/pref/feeds.php:1616 classes/pref/feeds.php:1685
+#: classes/pref/feeds.php:1505 classes/pref/feeds.php:1574
 msgid "Click to edit feed"
 msgstr "Kliknij aby edytować kanał"
 
-#: classes/pref/feeds.php:1634 classes/pref/feeds.php:1705
+#: classes/pref/feeds.php:1523 classes/pref/feeds.php:1594
 msgid "Unsubscribe from selected feeds"
 msgstr "Zakończ prenumeratę wybranych kanałów:"
 
-#: classes/pref/feeds.php:1645
+#: classes/pref/feeds.php:1534
 msgid "These feeds have not been updated because of errors:"
 msgstr "Te kanały nie zostały uaktualnione ponieważ wystąpiły błędy:"
 
-#: plugins/pocket/pocket.php:24
+#: plugins/pocket/init.php:30
 msgid "Pocket"
 msgstr ""
 
@@ -2512,70 +2460,199 @@ msgstr ""
 msgid "Back to feeds"
 msgstr "Nieaktywne kanały"
 
+#: plugins/digest/digest_body.php:56
+msgid "Hello,"
+msgstr "Cześć,"
+
 #: plugins/digest/digest_body.php:62
 msgid "Regular version"
 msgstr "Wersja standardowa"
 
-#: plugins/pinterest/pinterest.php:23
+#: plugins/nsfw/init.php:32 plugins/nsfw/init.php:43
+msgid "Not work safe (click to toggle)"
+msgstr ""
+
+#: plugins/nsfw/init.php:53
+msgid "NSFW Plugin"
+msgstr ""
+
+#: plugins/nsfw/init.php:80
+msgid "Tags to consider NSFW (comma-separated)"
+msgstr ""
+
+#: plugins/nsfw/init.php:101
+#, fuzzy
+msgid "Configuration saved."
+msgstr "Konfiguracja została zapisana."
+
+#: plugins/pinterest/init.php:29
 msgid "Pinterest"
 msgstr ""
 
-#: plugins/mail/mail.php:66 plugins/mail/mail.php:72 plugins/mail/init.php:72
-#: plugins/mail/init.php:78
+#: plugins/auth_internal/init.php:62
+#, fuzzy
+msgid "Please enter your one time password:"
+msgstr "Wprowadź tytuł kategorii:"
+
+#: plugins/auth_internal/init.php:185
+msgid "Password has been changed."
+msgstr "Hasło zostało zmienione."
+
+#: plugins/auth_internal/init.php:187
+msgid "Old password is incorrect."
+msgstr "Nieprawidłowe stare hasło."
+
+#: plugins/bookmarklets/init.php:22
+msgid "Bookmarklets"
+msgstr ""
+
+#: plugins/bookmarklets/init.php:24
+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 ""
+"Przeciągnij poniższy odnośnik na pasek zakładek Twojej przeglądarki, otwórz "
+"kanał który Cie interesuje w przeglądarce i kliknij na utworzonym odnośniku "
+"aby zaprenumerować kanał."
+
+#: plugins/bookmarklets/init.php:28
+#, php-format
+msgid "Subscribe to %s in Tiny Tiny RSS?"
+msgstr "Prenumerować %s w Tiny Tiny RSS?"
+
+#: plugins/bookmarklets/init.php:32
+msgid "Subscribe in Tiny Tiny RSS"
+msgstr "Prenumeruj w Tiny Tiny RSS"
+
+#: plugins/bookmarklets/init.php:34
+msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
+msgstr ""
+
+#: plugins/import_export/init.php:64
+msgid "Import and export"
+msgstr "Import i eksport"
+
+#: plugins/import_export/init.php:66
+msgid "Article archive"
+msgstr "Archiwum artykułów"
+
+#: plugins/import_export/init.php:68
+msgid ""
+"You can export and import your Starred and Archived articles for safekeeping "
+"or when migrating between tt-rss instances."
+msgstr ""
+"Możesz eksportować i importować artykuły oznaczone gwiazdką oraz "
+"zarchiwizowane dla zachowania lub na czas migracji pomiędzy instalacjami tt-"
+"rss."
+
+#: plugins/import_export/init.php:71
+msgid "Export my data"
+msgstr "Eksportuj moje dane"
+
+#: plugins/import_export/init.php:87
+msgid "Import"
+msgstr "Importuj"
+
+#: plugins/import_export/init.php:221
+msgid "Could not import: incorrect schema version."
+msgstr "Nieudany import: nieprawidłowa wersja schematu."
+
+#: plugins/import_export/init.php:226
+msgid "Could not import: unrecognized document format."
+msgstr "Nieudany import: nierozpoznany typ dokumentu."
+
+#: plugins/import_export/init.php:385
+#, php-format
+msgid "Finished: %d articles processed, %d imported, %d feeds created."
+msgstr ""
+"Zakończono: %d przetworzonych artykułów, %d zaimportowanych, %d kanałów "
+"utworzonych."
+
+#: plugins/import_export/init.php:391
+msgid "Could not load XML document."
+msgstr "Nie udało się wczytać dokumentu XML."
+
+#: plugins/import_export/init.php:403
+msgid "Prepare data"
+msgstr "Przygotuj dane"
+
+#: plugins/import_export/init.php:424
+#, php-format
+msgid ""
+"Could not upload file. You might need to adjust upload_max_filesize\n"
+"\t\t\t\tin PHP.ini (current value = %s)"
+msgstr ""
+"Nie udało się wgrać pliku. Możliwe, że będziesz musiał dostosować wartość "
+"parametru upload_max_filesize\n"
+"(maksymalny rozmiar przesyłanego pliku) w PHP.ini (obecna wartość = %s)"
+
+#: plugins/mail/init.php:72 plugins/mail/init.php:78
 msgid "[Forwarded]"
 msgstr "[Przekazane]"
 
-#: plugins/mail/mail.php:66 plugins/mail/init.php:72
+#: plugins/mail/init.php:72
 msgid "Multiple articles"
 msgstr "Wiele artykułów"
 
-#: plugins/mail/mail.php:87
+#: plugins/mail/init.php:93
 msgid "From:"
 msgstr "Od:"
 
-#: plugins/mail/mail.php:96
+#: plugins/mail/init.php:102
 msgid "To:"
 msgstr "Do:"
 
-#: plugins/mail/mail.php:109
+#: plugins/mail/init.php:115
 msgid "Subject:"
 msgstr "Temat:"
 
-#: plugins/mail/mail.php:125
+#: plugins/mail/init.php:131
 msgid "Send e-mail"
 msgstr "Wyślij email"
 
-#: plugins/note/note.php:22 plugins/note/note.js:11
+#: plugins/note/init.php:28 plugins/note/note.js:11
 msgid "Edit article note"
 msgstr "Edytuj notatkę do artykułu"
 
-#: plugins/example/example.php:29 plugins/example/init.php:38
+#: plugins/example/init.php:38
 msgid "Example Pane"
 msgstr ""
 
-#: plugins/example/example.php:53 plugins/example/init.php:69
+#: plugins/example/init.php:69
 msgid "Sample value"
 msgstr ""
 
-#: plugins/example/example.php:59 plugins/example/init.php:75
+#: plugins/example/init.php:75
 #, fuzzy
 msgid "Set value"
 msgstr "Oznacz gwiazdką"
 
-#: plugins/identica/identica.php:23
+#: plugins/identica/init.php:29
 #, fuzzy
 msgid "Share on identi.ca"
 msgstr "Udostępnij na Twitterze"
 
-#: plugins/instances/instances.php:29
+#: plugins/owncloud/init.php:35
+msgid "Owncloud"
+msgstr ""
+
+#: plugins/owncloud/init.php:59
+msgid "Owncloud url"
+msgstr ""
+
+#: plugins/owncloud/init.php:74
+msgid "Bookmark on OwnCloud "
+msgstr ""
+
+#: plugins/instances/init.php:144
 msgid "Linked"
 msgstr "Połączone instancje"
 
-#: plugins/instances/instances.php:180
+#: plugins/instances/init.php:295
 msgid "Link instance"
 msgstr "Połącz instalację"
 
-#: plugins/instances/instances.php:192 plugins/instances/init.php:307
+#: plugins/instances/init.php:307
 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:"
@@ -2584,47 +2661,47 @@ msgstr ""
 "informacje o Popularnych kanałach. Połącz z tą instancją Tiny Tiny RSS "
 "używając tego adresu:"
 
-#: plugins/instances/instances.php:202
+#: plugins/instances/init.php:317
 msgid "Last connected"
 msgstr "Ostatnio połączony"
 
-#: plugins/instances/instances.php:203
+#: plugins/instances/init.php:318
 msgid "Status"
 msgstr ""
 
-#: plugins/instances/instances.php:204
+#: plugins/instances/init.php:319
 msgid "Stored feeds"
 msgstr "Zapisane kanały"
 
-#: plugins/share/share.php:21
+#: plugins/share/init.php:27
 msgid "Share by URL"
 msgstr "Udostępnij adres"
 
-#: plugins/share/share.php:43 plugins/share/init.php:49
+#: plugins/share/init.php:49
 msgid "You can share this article by the following unique URL:"
 msgstr "Możesz udostępnić ten artykuł korzystając z tego unikalnego adresu:"
 
-#: plugins/flattr/flattr.php:37
+#: plugins/flattr/init.php:30
 #, fuzzy
-msgid "Flattr article"
+msgid "Flattr this article."
 msgstr "Oznacz artykuł gwiazdką"
 
-#: plugins/googleplus/googleplus.php:23
+#: plugins/googleplus/init.php:29
 #, fuzzy
 msgid "Share on Google+"
 msgstr "Udostępnij na Twitterze"
 
-#: plugins/updater/updater.php:267 plugins/updater/updater.php:279
+#: plugins/updater/init.php:294 plugins/updater/init.php:306
 #: plugins/updater/updater.js:10
 msgid "Update Tiny Tiny RSS"
 msgstr "Aktualizuj Tiny Tiny RSS"
 
-#: plugins/updater/updater.php:282 plugins/updater/init.php:303
+#: plugins/updater/init.php:309
 #, fuzzy
 msgid "Your Tiny Tiny RSS installation is up to date."
 msgstr "Schemat bazy danych Tiny Tiny RSS jest aktualny."
 
-#: plugins/updater/updater.php:291 plugins/updater/init.php:313
+#: plugins/updater/init.php:319
 #, fuzzy
 msgid ""
 "Do not close this dialog until updating is finished. Backup your tt-rss "
@@ -2634,23 +2711,26 @@ msgstr ""
 "kopię swojego katalogu tt-rss przed kontynuowaniem. Wpisz 'yes' aby "
 "kontynuować."
 
-#: plugins/updater/updater.php:294 plugins/updater/init.php:316
+#: plugins/updater/init.php:322
 #, fuzzy
 msgid "Ready to update."
 msgstr "Ostatnia aktualizacja:"
 
-#: plugins/updater/updater.php:299 plugins/updater/init.php:321
+#: plugins/updater/init.php:327
 #, fuzzy
 msgid "Start update"
 msgstr "Ostatnia aktualizacja:"
 
-#: js/feedlist.js:283 js/feedlist.js:282 js/feedlist.js:265 js/feedlist.js:218
+#: plugins/tweet/init.php:29
+#, fuzzy
+msgid "Share on Twitter"
+msgstr "Udostępnij na Twitterze"
+
+#: js/feedlist.js:218
 msgid "New articles available in this feed (click to show)"
 msgstr "Nowe artykuły dostępne na tym kanale (kliknij aby wyświetlić)"
 
-#: js/feedlist.js:490 js/feedlist.js:505 js/feedlist.js:489 js/feedlist.js:504
-#: js/feedlist.js:469 js/feedlist.js:484 js/feedlist.js:420 js/feedlist.js:435
-#: plugins/digest/digest.js:25
+#: js/feedlist.js:420 js/feedlist.js:435 plugins/digest/digest.js:25
 msgid "Mark all articles in %s as read?"
 msgstr "Oznaczyć wszystkie artykuły w %s jako przeczytane?"
 
@@ -2663,75 +2743,71 @@ msgstr ""
 "będzie zawierało  informacje o Twojej przeglądarce. Twój adres IP zostanie "
 "zapisany w naszej bazie danych."
 
-#: js/functions.js:618 js/functions.js:614 js/functions.js:622
+#: js/functions.js:627
 msgid "Date syntax appears to be correct:"
 msgstr "Format daty wygląda na poprawną:"
 
-#: js/functions.js:621 js/functions.js:617 js/functions.js:625
+#: js/functions.js:630
 msgid "Date syntax is incorrect."
 msgstr "Format daty jest niepoprawny."
 
-#: js/functions.js:748 js/functions.js:744 js/functions.js:752
+#: js/functions.js:757
 msgid "Remove stored feed icon?"
 msgstr "Usuń zapisaną ikonę kanału."
 
-#: js/functions.js:780 js/functions.js:776 js/functions.js:784
+#: js/functions.js:789
 msgid "Please select an image file to upload."
 msgstr "Wybierz obrazek do wysłania."
 
-#: js/functions.js:782 js/functions.js:778 js/functions.js:786
+#: js/functions.js:791
 msgid "Upload new icon for this feed?"
 msgstr "Wgrać nową ikonę dla tego kanału?"
 
-#: js/functions.js:799 js/functions.js:795 js/functions.js:803
+#: js/functions.js:808
 msgid "Please enter label caption:"
 msgstr "Proszę wprowadzić opis etykiety:"
 
-#: js/functions.js:804 js/functions.js:800 js/functions.js:808
+#: js/functions.js:813
 msgid "Can't create label: missing caption."
 msgstr "Nie udało się utworzyć etykiety: brak opisu."
 
-#: js/functions.js:847 js/functions.js:843 js/functions.js:851
+#: js/functions.js:856
 msgid "Subscribe to Feed"
 msgstr "Prenumeruj kanał"
 
-#: js/functions.js:874 js/functions.js:870 js/functions.js:878
+#: js/functions.js:883
 msgid "Subscribed to %s"
 msgstr "Zaprenumerowano kanał %s"
 
-#: js/functions.js:879 js/functions.js:875 js/functions.js:883
+#: js/functions.js:888
 msgid "Specified URL seems to be invalid."
 msgstr "Wprowadzony adres jest niepoprawny."
 
-#: js/functions.js:882 js/functions.js:878 js/functions.js:886
+#: js/functions.js:891
 msgid "Specified URL doesn't seem to contain any feeds."
 msgstr "Wprowadzony adres nie zawiera żadnych kanałów."
 
-#: js/functions.js:935 js/functions.js:931 js/functions.js:939
+#: js/functions.js:944
 msgid "Couldn't download the specified URL: %s"
 msgstr "Nie udało się pobrać wprowadzonego adresu: %s"
 
-#: js/functions.js:939 js/functions.js:935 js/functions.js:943
+#: js/functions.js:948
 msgid "You are already subscribed to this feed."
 msgstr "Prenumerujesz już ten kanał."
 
-#: js/functions.js:1067 js/functions.js:1063 js/functions.js:1071
-#: js/functions.js:1073
+#: js/functions.js:1078
 msgid "Edit rule"
 msgstr "Edytuj regułę"
 
-#: js/functions.js:1093 js/functions.js:1089 js/functions.js:1097
-#: js/functions.js:1099
+#: js/functions.js:1104
 msgid "Edit action"
 msgstr "Edytuj działanie"
 
-#: js/functions.js:1130 js/functions.js:1126 js/functions.js:1134
-#: js/functions.js:1136
+#: js/functions.js:1141
 msgid "Create Filter"
 msgstr "Utwórz filtr"
 
-#: js/functions.js:1234 js/functions.js:1230 js/functions.js:1238
-#: js/functions.js:1240
+#: js/functions.js:1245
 msgid ""
 "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
 "hub again on next feed update."
@@ -2739,48 +2815,37 @@ msgstr ""
 "Zresetować prenumeraty? Tiny Tiny RSS spróbuje zaprenumerować powiadomienia "
 "przy następnej aktualizacji."
 
-#: js/functions.js:1255 js/tt-rss.js:421 js/functions.js:1251 js/tt-rss.js:381
-#: js/functions.js:1259 js/tt-rss.js:367 js/functions.js:1261
+#: js/functions.js:1266 js/tt-rss.js:367
 msgid "Unsubscribe from %s?"
 msgstr "Zakończyć prenumeratę %s?"
 
-#: js/functions.js:1362 js/functions.js:1358 js/functions.js:1368
-#: js/functions.js:1370
+#: js/functions.js:1375
 msgid "Please enter category title:"
 msgstr "Wprowadź tytuł kategorii:"
 
-#: js/functions.js:1393 js/functions.js:1389 js/functions.js:1399
-#: js/functions.js:1401
+#: js/functions.js:1406
 msgid "Generate new syndication address for this feed?"
 msgstr "Wygenerowań nowy adres do dzielenia się tym kanałem?"
 
-#: js/functions.js:1584 js/tt-rss.js:400 js/tt-rss.js:903 js/functions.js:1580
-#: js/tt-rss.js:782 js/tt-rss.js:362 js/tt-rss.js:717 js/functions.js:1590
-#: js/tt-rss.js:348 js/tt-rss.js:709 js/functions.js:1592
+#: js/functions.js:1597 js/tt-rss.js:348 js/tt-rss.js:713
 msgid "You can't edit this kind of feed."
 msgstr "Nie możesz edytować kanału tego typu."
 
-#: js/functions.js:1599 js/functions.js:1595 js/functions.js:1605
-#: js/functions.js:1607
+#: js/functions.js:1612
 msgid "Edit Feed"
 msgstr "Edytuj kanał"
 
-#: js/functions.js:1637 js/functions.js:1633 js/functions.js:1643
-#: js/functions.js:1645
+#: js/functions.js:1650
 msgid "More Feeds"
 msgstr "Więcej kanałów"
 
-#: js/functions.js:1698 js/functions.js:1808 js/prefs.js:408 js/prefs.js:438
-#: js/prefs.js:470 js/prefs.js:653 js/prefs.js:673 js/prefs.js:1326
-#: js/prefs.js:1471 js/functions.js:1694 js/functions.js:1804 js/prefs.js:397
-#: js/prefs.js:427 js/prefs.js:459 js/prefs.js:642 js/prefs.js:662
-#: js/prefs.js:1213 js/prefs.js:1358 js/functions.js:1704 js/functions.js:1814
-#: js/prefs.js:1203 js/prefs.js:1348 js/functions.js:1706 js/functions.js:1816
+#: js/functions.js:1711 js/functions.js:1821 js/prefs.js:397 js/prefs.js:427
+#: js/prefs.js:459 js/prefs.js:642 js/prefs.js:662 js/prefs.js:1203
+#: js/prefs.js:1348
 msgid "No feeds are selected."
 msgstr "Nie wybrano żadnego kanału."
 
-#: js/functions.js:1740 js/functions.js:1736 js/functions.js:1746
-#: js/functions.js:1748
+#: js/functions.js:1753
 msgid ""
 "Remove selected feeds from the archive? Feeds with stored articles will not "
 "be removed."
@@ -2788,16 +2853,18 @@ msgstr ""
 "Usunąć wybrane kanały z archiwum? Kanały z zachowanymi artykułami nie "
 "zostaną usunięte."
 
-#: js/functions.js:1779 js/functions.js:1775 js/functions.js:1785
-#: js/functions.js:1787
+#: js/functions.js:1792
 msgid "Feeds with update errors"
 msgstr "Kanały z błędami aktualizacji"
 
-#: js/functions.js:1790 js/prefs.js:1308 js/functions.js:1786 js/prefs.js:1195
-#: js/functions.js:1796 js/prefs.js:1185 js/functions.js:1798
+#: js/functions.js:1803 js/prefs.js:1185
 msgid "Remove selected feeds?"
 msgstr "Usunąć wybrane kanały?"
 
+#: js/functions.js:1904
+msgid "Help"
+msgstr ""
+
 #: js/PrefFeedTree.js:47
 msgid "Edit category"
 msgstr "Edytuj kategorię"
@@ -2818,24 +2885,23 @@ msgstr "Wprowadź nazwę użytkownika:"
 msgid "Can't create user: no login specified."
 msgstr "Nie stworzono użytkownika: nie wprowadzono nazwy użytkownika."
 
-#: js/prefs.js:128 js/prefs.js:117
+#: js/prefs.js:117
 msgid "Edit Filter"
 msgstr "Edytuj filtr"
 
-#: js/prefs.js:175 js/prefs.js:164
+#: js/prefs.js:164
 msgid "Remove filter?"
 msgstr "Usunąć filtr?"
 
-#: js/prefs.js:290 js/prefs.js:279
+#: js/prefs.js:279
 msgid "Remove selected labels?"
 msgstr "Usunąć wybrane etykiety?"
 
-#: js/prefs.js:306 js/prefs.js:1512 js/prefs.js:295 js/prefs.js:1399
-#: js/prefs.js:1389
+#: js/prefs.js:295 js/prefs.js:1389
 msgid "No labels are selected."
 msgstr "Nie wybrano żadnych etykiet."
 
-#: js/prefs.js:320 js/prefs.js:309
+#: js/prefs.js:309
 msgid ""
 "Remove selected users? Neither default admin nor your account will be "
 "removed."
@@ -2843,389 +2909,290 @@ msgstr ""
 "Usunąć wybranych użytkowników? Domyślny administrator ani Twoje konto nie "
 "zostaną skasowane."
 
-#: js/prefs.js:337 js/prefs.js:518 js/prefs.js:539 js/prefs.js:578
 #: js/prefs.js:326 js/prefs.js:507 js/prefs.js:528 js/prefs.js:567
 msgid "No users are selected."
 msgstr "Nie wybrano użytkowników."
 
-#: js/prefs.js:355 js/prefs.js:344
+#: js/prefs.js:344
 msgid "Remove selected filters?"
 msgstr "Usunąć wybrane filtry?"
 
-#: js/prefs.js:370 js/prefs.js:608 js/prefs.js:627 js/prefs.js:359
-#: js/prefs.js:597 js/prefs.js:616
+#: js/prefs.js:359 js/prefs.js:597 js/prefs.js:616
 msgid "No filters are selected."
 msgstr "Żadne filtry nie zostały wybrane."
 
-#: js/prefs.js:389 js/prefs.js:378
+#: js/prefs.js:378
 msgid "Unsubscribe from selected feeds?"
 msgstr "Zakończyć prenumeratę wybranych kanałów?"
 
-#: js/prefs.js:423 js/prefs.js:412
+#: js/prefs.js:412
 msgid "Please select only one feed."
 msgstr "Wybierz tylko jeden kanał."
 
-#: js/prefs.js:429 js/prefs.js:418
+#: js/prefs.js:418
 msgid "Erase all non-starred articles in selected feed?"
 msgstr ""
 "Usunąć z tego kanału wszystkie artykuły, które nie zostały oznaczone "
 "gwiazdką?"
 
-#: js/prefs.js:451 js/prefs.js:440
+#: js/prefs.js:440
 msgid "How many days of articles to keep (0 - use default)?"
 msgstr "Ile dni przechowywać artykuły (0 - użyj wartości domyślnej)?"
 
-#: js/prefs.js:489 js/prefs.js:478
+#: js/prefs.js:478
 msgid "Login field cannot be blank."
 msgstr "Pole nazwa użytkownika nie może być puste."
 
-#: js/prefs.js:523 js/prefs.js:544 js/prefs.js:583 js/prefs.js:512
-#: js/prefs.js:533 js/prefs.js:572
+#: js/prefs.js:512 js/prefs.js:533 js/prefs.js:572
 msgid "Please select only one user."
 msgstr "Wybierz tylko jednego użytkownika."
 
-#: js/prefs.js:548 js/prefs.js:537
+#: js/prefs.js:537
 msgid "Reset password of selected user?"
 msgstr "Zresetować hasło wybranego użytkownika?"
 
-#: js/prefs.js:613 js/prefs.js:602
+#: js/prefs.js:602
 msgid "Please select only one filter."
 msgstr "Wybierz tylko jeden filtr."
 
-#: js/prefs.js:631 js/prefs.js:620
+#: js/prefs.js:620
 msgid "Combine selected filters?"
 msgstr "Połączyć wybrane filtry?"
 
-#: js/prefs.js:695 js/prefs.js:684
+#: js/prefs.js:684
 msgid "Edit Multiple Feeds"
 msgstr "Edytuj wiele kanałów"
 
-#: js/prefs.js:719 js/prefs.js:708
+#: js/prefs.js:708
 msgid "Save changes to selected feeds?"
 msgstr "Zapisać zmiany w wybranych kanałach?"
 
-#: js/prefs.js:811 js/prefs.js:800 js/prefs.js:790
+#: js/prefs.js:790
 msgid "OPML Import"
 msgstr "Import OPML"
 
-#: js/prefs.js:838 js/prefs.js:827 js/prefs.js:817
+#: js/prefs.js:817
 msgid "Please choose an OPML file first."
 msgstr "Najpierw wybierz plik OPML."
 
-#: js/prefs.js:854 plugins/import_export/import_export.js:112
-msgid "Please choose the file first."
-msgstr "Najpierw wybierz plik."
-
-#: js/prefs.js:1010 js/prefs.js:983 js/prefs.js:973
+#: js/prefs.js:973
 msgid "Reset to defaults?"
 msgstr "Przywrócić ustawienia domyślne?"
 
-#: js/prefs.js:1215 js/prefs.js:1102 js/prefs.js:1092
+#: js/prefs.js:1092
 msgid ""
 "Remove category %s? Any nested feeds would be placed into Uncategorized."
 msgstr ""
 "Usunąć kategorię %s? Wszystkie zagnieżdżone kanały zostaną umieszczone w Bez "
 "kategorii."
 
-#: js/prefs.js:1242 js/prefs.js:1129 js/prefs.js:1119
+#: js/prefs.js:1119
 msgid "Remove selected categories?"
 msgstr "Usunąć wybrane kategorię?"
 
-#: js/prefs.js:1258 js/prefs.js:1145 js/prefs.js:1135
+#: js/prefs.js:1135
 msgid "No categories are selected."
 msgstr "Nie wybrano żadnej kategorii."
 
-#: js/prefs.js:1266 js/prefs.js:1153 js/prefs.js:1143
+#: js/prefs.js:1143
 msgid "Category title:"
 msgstr "Tytuł kategorii:"
 
-#: js/prefs.js:1297 js/prefs.js:1184 js/prefs.js:1174
+#: js/prefs.js:1174
 msgid "Feeds without recent updates"
 msgstr "Kanały nieaktualizowane ostatnio"
 
-#: js/prefs.js:1346 js/prefs.js:1233 js/prefs.js:1223
+#: js/prefs.js:1223
 msgid "Replace current OPML publishing address with a new one?"
 msgstr "Zastąpić obecny adres publikacji OPML nowym adresem?"
 
-#: js/prefs.js:1455 js/prefs.js:1342 js/prefs.js:1332
+#: js/prefs.js:1332
 msgid "Rescore articles in selected feeds?"
 msgstr "Przeliczyć punktację w wybranych kanałach?"
 
-#: js/prefs.js:1478 js/prefs.js:1365 js/prefs.js:1355
+#: js/prefs.js:1355
 msgid "Rescore all articles? This operation may take a lot of time."
 msgstr ""
 "Przeliczyć punktację wszystkich artykułów? Ta czynność może zająć dużo czasu."
 
-#: js/prefs.js:1498 js/prefs.js:1385 js/prefs.js:1375
+#: js/prefs.js:1375
 msgid "Reset selected labels to default colors?"
 msgstr "Przywrócić domyślne kolory wybranym etykietom?"
 
-#: js/prefs.js:1535 js/prefs.js:1422 js/prefs.js:1412
+#: js/prefs.js:1412
 msgid "Settings Profiles"
 msgstr "Profile ustawień"
 
-#: js/prefs.js:1544 js/prefs.js:1431 js/prefs.js:1421
+#: js/prefs.js:1421
 msgid ""
 "Remove selected profiles? Active and default profiles will not be removed."
 msgstr ""
 "Usunąć wybrane profile? Aktywne i domyślne profile nie zostaną usunięte."
 
-#: js/prefs.js:1562 js/prefs.js:1449 js/prefs.js:1439
+#: js/prefs.js:1439
 msgid "No profiles are selected."
 msgstr "Nie wybrano żadnych profili."
 
-#: js/prefs.js:1570 js/prefs.js:1623 js/prefs.js:1457 js/prefs.js:1510
 #: js/prefs.js:1447 js/prefs.js:1500
 msgid "Activate selected profile?"
 msgstr "Uaktywnić wybrany profil?"
 
-#: js/prefs.js:1586 js/prefs.js:1639 js/prefs.js:1473 js/prefs.js:1526
 #: js/prefs.js:1463 js/prefs.js:1516
 msgid "Please choose a profile to activate."
 msgstr "Wybierz profil do uaktywnienia."
 
-#: js/prefs.js:1647 js/prefs.js:1534 js/prefs.js:1524
+#: js/prefs.js:1524
 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr ""
 "Operacja spowoduje unieważnienie wszystkich poprzednio wygenerowanych "
 "adresów kanałów. Kontynuować?"
 
-#: js/prefs.js:1666 js/prefs.js:1553 js/prefs.js:1543
+#: js/prefs.js:1543
 msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr ""
 "Operacja spowoduje unieważnienie adresów wszystkich poprzednio "
 "udostępnionych artykułów. Kontynuować?"
 
-#: js/prefs.js:1764 js/prefs.js:1651 js/prefs.js:1641
+#: js/prefs.js:1641
 msgid "Label Editor"
 msgstr "Edytor etykiet"
 
-#: js/prefs.js:1827 js/prefs.js:1714 js/prefs.js:1704
+#: js/prefs.js:1704
 msgid ""
 "This will clear your stored authentication information for Twitter. Continue?"
 msgstr ""
 "Operacja spowoduje usunięcie zapisanych danych uwierzytelniania w usłudze "
 "Twitter. Kontynuować?"
 
-#: js/prefs.js:1911 plugins/import_export/import_export.js:13
-msgid "Export Data"
-msgstr "Eksportuj dane"
-
-#: js/prefs.js:1938 plugins/import_export/import_export.js:40
-msgid ""
-"Finished, exported %d articles. You can download the data <a "
-"class='visibleLink' href='%u'>here</a>."
-msgstr ""
-"Zakończono, wyeksportowano %d artykułów. Możesz pobrać dane <a "
-"class='visibleLink' href='%u'>tutaj</a>."
-
-#: js/prefs.js:1991 plugins/import_export/import_export.js:93
-msgid "Data Import"
-msgstr "Importuj dane"
-
-#: js/prefs.js:2027 js/prefs.js:1794 js/prefs.js:1784
+#: js/prefs.js:1784
 msgid "Subscribing to feeds..."
 msgstr "Prenumerowanie kanałów..."
 
-#: js/tt-rss.js:147 js/tt-rss.js:141 js/tt-rss.js:120
+#: js/prefs.js:1821
+msgid "Clear stored data for this plugin?"
+msgstr ""
+
+#: js/tt-rss.js:120
 msgid "Mark all articles as read?"
 msgstr "Oznaczyć wszystkie artykuły jako przeczytane?"
 
-#: js/tt-rss.js:410 js/tt-rss.js:370 js/tt-rss.js:356
+#: js/tt-rss.js:356
 msgid "You can't unsubscribe from the category."
 msgstr "Nie możesz zrezygnować z prenumeraty tej kategorii."
 
-#: js/tt-rss.js:415 js/tt-rss.js:596 js/tt-rss.js:591 js/tt-rss.js:375
-#: js/tt-rss.js:525 js/tt-rss.js:361 js/tt-rss.js:511
+#: js/tt-rss.js:361 js/tt-rss.js:511
 msgid "Please select some feed first."
 msgstr "Wybierz najpierw jakiś kanał."
 
-#: js/tt-rss.js:591 js/tt-rss.js:586 js/tt-rss.js:520 js/tt-rss.js:506
+#: js/tt-rss.js:506
 msgid "You can't rescore this kind of feed."
 msgstr "Nie możesz przeliczyć punktacji kanału tego rodzaju."
 
-#: js/tt-rss.js:601 js/tt-rss.js:596 js/tt-rss.js:530 js/tt-rss.js:516
+#: js/tt-rss.js:516
 msgid "Rescore articles in %s?"
 msgstr "Przeliczyć punktację artykułów w %s?"
 
-#: js/tt-rss.js:1062 js/tt-rss.js:883 js/tt-rss.js:825 js/tt-rss.js:830
+#: js/tt-rss.js:672
+#, fuzzy
+msgid "Please enable mail plugin first."
+msgstr "Wybierz najpierw jakiś kanał."
+
+#: js/tt-rss.js:834
 msgid "New version available!"
 msgstr "Dostępna jest nowa wersja!"
 
-#: js/viewfeed.js:108 js/viewfeed.js:104
+#: js/viewfeed.js:104
 #, fuzzy
 msgid "Cancel search"
 msgstr "Anuluj"
 
-#: js/viewfeed.js:456 js/viewfeed.js:445 js/viewfeed.js:451 js/viewfeed.js:435
-#: plugins/digest/digest.js:257 plugins/digest/digest.js:696
+#: js/viewfeed.js:435 plugins/digest/digest.js:257
+#: plugins/digest/digest.js:696
 msgid "Unstar article"
 msgstr "Usuń oznaczenie gwiazdką"
 
-#: js/viewfeed.js:461 js/viewfeed.js:450 js/viewfeed.js:456 js/viewfeed.js:440
-#: plugins/digest/digest.js:259 plugins/digest/digest.js:700
+#: js/viewfeed.js:440 plugins/digest/digest.js:259
+#: plugins/digest/digest.js:700
 msgid "Star article"
 msgstr "Oznacz artykuł gwiazdką"
 
-#: js/viewfeed.js:496 js/viewfeed.js:485 js/viewfeed.js:491 js/viewfeed.js:473
-#: plugins/digest/digest.js:262 plugins/digest/digest.js:731
+#: js/viewfeed.js:473 plugins/digest/digest.js:262
+#: plugins/digest/digest.js:731
 msgid "Unpublish article"
 msgstr "Anuluj publikacje artykułu"
 
-#: js/viewfeed.js:676 js/viewfeed.js:704 js/viewfeed.js:731 js/viewfeed.js:793
-#: js/viewfeed.js:825 js/viewfeed.js:962 js/viewfeed.js:1005
-#: js/viewfeed.js:1055 js/viewfeed.js:2181 js/viewfeed.js:665
-#: js/viewfeed.js:693 js/viewfeed.js:720 js/viewfeed.js:782 js/viewfeed.js:814
-#: js/viewfeed.js:951 js/viewfeed.js:994 js/viewfeed.js:1044
-#: js/viewfeed.js:2154 js/viewfeed.js:671 js/viewfeed.js:699
-#: js/viewfeed.js:726 js/viewfeed.js:788 js/viewfeed.js:820 js/viewfeed.js:957
-#: js/viewfeed.js:1000 js/viewfeed.js:1050 js/viewfeed.js:2018
 #: js/viewfeed.js:674 js/viewfeed.js:702 js/viewfeed.js:729 js/viewfeed.js:791
 #: js/viewfeed.js:823 js/viewfeed.js:960 js/viewfeed.js:1003
 #: js/viewfeed.js:1053 js/viewfeed.js:1927 plugins/mail/mail.js:7
 msgid "No articles are selected."
 msgstr "Nie wybrano żadnych artykułów"
 
-#: js/viewfeed.js:942 js/viewfeed.js:931 js/viewfeed.js:937 js/viewfeed.js:940
+#: js/viewfeed.js:940
 msgid "Mark all visible articles in %s as read?"
 msgstr "Oznaczyć wszystkie widoczne artykuły z %s jako przeczytane?"
 
-#: js/viewfeed.js:970 js/viewfeed.js:959 js/viewfeed.js:965 js/viewfeed.js:968
+#: js/viewfeed.js:968
 msgid "Delete %d selected articles in %s?"
 msgstr "Usunąć %d zaznaczonych artykułów z %s?"
 
-#: js/viewfeed.js:972 js/viewfeed.js:961 js/viewfeed.js:967 js/viewfeed.js:970
+#: js/viewfeed.js:970
 msgid "Delete %d selected articles?"
 msgstr "Usunąć %d zaznaczonych artykułów?"
 
-#: js/viewfeed.js:1014 js/viewfeed.js:1003 js/viewfeed.js:1009
 #: js/viewfeed.js:1012
 msgid "Archive %d selected articles in %s?"
 msgstr "Zarchiwizować %d zaznaczonych artykułów z %s?"
 
-#: js/viewfeed.js:1017 js/viewfeed.js:1006 js/viewfeed.js:1012
 #: js/viewfeed.js:1015
 msgid "Move %d archived articles back?"
 msgstr "Przywrócić %d zarchiwizowanych artykułów?"
 
-#: js/viewfeed.js:1061 js/viewfeed.js:1050 js/viewfeed.js:1056
 #: js/viewfeed.js:1059
 msgid "Mark %d selected articles in %s as read?"
 msgstr "Oznaczyć %d wybranych artykułów z %s jako przeczytane?"
 
-#: js/viewfeed.js:1085 js/viewfeed.js:1074 js/viewfeed.js:1080
 #: js/viewfeed.js:1083
 msgid "Edit article Tags"
 msgstr "Edytuj tagi artykułu"
 
-#: js/viewfeed.js:1247 js/viewfeed.js:1236 js/viewfeed.js:1242
 #: js/viewfeed.js:1252
 msgid "No article is selected."
 msgstr "Nie wybrano żadnego artykułu."
 
-#: js/viewfeed.js:1282 js/viewfeed.js:1271 js/viewfeed.js:1277
 #: js/viewfeed.js:1287
 msgid "No articles found to mark"
 msgstr "Nie znaleziono artykułów do oznaczenia"
 
-#: js/viewfeed.js:1284 js/viewfeed.js:1273 js/viewfeed.js:1279
 #: js/viewfeed.js:1289
 msgid "Mark %d article(s) as read?"
 msgstr "Oznaczyć %d artykuły(ów) jako przeczytane?"
 
-#: js/viewfeed.js:1402 js/viewfeed.js:1383
-msgid "Loading..."
-msgstr "Wczytywanie..."
-
-#: js/viewfeed.js:1891 js/viewfeed.js:1864 js/viewfeed.js:1734
 #: js/viewfeed.js:1744
 msgid "Open original article"
 msgstr "Otwórz oryginalny artykuł"
 
-#: js/viewfeed.js:1897 js/viewfeed.js:1870
-msgid "View in a tt-rss tab"
-msgstr "Otwórz w zakładce tt-rss"
-
-#: js/viewfeed.js:1905 js/viewfeed.js:1878 js/viewfeed.js:1742
-#: js/viewfeed.js:1752
-msgid "Mark above as read"
-msgstr "Oznacz powyższe jako przeczytane"
-
-#: js/viewfeed.js:1911 js/viewfeed.js:1884 js/viewfeed.js:1748
-#: js/viewfeed.js:1758
-msgid "Mark below as read"
-msgstr "Oznacz poniższe jako przeczytane"
-
-#: js/viewfeed.js:1967 js/viewfeed.js:1940 js/viewfeed.js:1804
 #: js/viewfeed.js:1814
 msgid "Remove label"
 msgstr "Usuń etykietę"
 
-#: js/viewfeed.js:1991 js/viewfeed.js:1964 js/viewfeed.js:1828
 #: js/viewfeed.js:1838
 msgid "Playing..."
 msgstr "Odtwarzam..."
 
-#: js/viewfeed.js:1992 js/viewfeed.js:1965 js/viewfeed.js:1829
 #: js/viewfeed.js:1839
 msgid "Click to pause"
 msgstr "Kliknij aby zapauzować"
 
-#: js/viewfeed.js:2150 js/viewfeed.js:2123 js/viewfeed.js:1987
 #: js/viewfeed.js:1896
 #, fuzzy
 msgid "Please enter new score for selected articles:"
 msgstr "Usunąć %d zaznaczonych artykułów?"
 
-#: js/viewfeed.js:2192 js/viewfeed.js:2165 js/viewfeed.js:2029
 #: js/viewfeed.js:1938
 #, fuzzy
 msgid "Please enter new score for this article:"
 msgstr "Wprowadź tytuł kategorii:"
 
-#: js/functions.js:1887 js/functions.js:1891 js/functions.js:1897
-#: js/functions.js:1899
-msgid "Help"
-msgstr ""
-
-#: js/prefs.js:1831 js/prefs.js:1821
-msgid "Clear stored data for this plugin?"
-msgstr ""
-
-#: js/tt-rss.js:741 js/tt-rss.js:676 js/tt-rss.js:668
-#, fuzzy
-msgid "Please enable mail plugin first."
-msgstr "Wybierz najpierw jakiś kanał."
-
-#: plugins/digest/digest_body.php:39
-msgid "Your browser doesn't support Javascript, which is required"
-msgstr ""
-
-#: plugins/nsfw/init.php:32 plugins/nsfw/init.php:43
-msgid "Not work safe (click to toggle)"
-msgstr ""
-
-#: plugins/nsfw/init.php:53
-msgid "NSFW Plugin"
-msgstr ""
-
-#: plugins/nsfw/init.php:80
-msgid "Tags to consider NSFW (comma-separated)"
-msgstr ""
-
-#: plugins/nsfw/init.php:101
-#, fuzzy
-msgid "Configuration saved."
-msgstr "Konfiguracja została zapisana."
-
-#: plugins/owncloud/init.php:35
-msgid "Owncloud"
-msgstr ""
-
-#: plugins/owncloud/init.php:59
-msgid "Owncloud url"
-msgstr ""
-
 #: plugins/digest/digest.js:71
 msgid "Mark %d displayed articles as read?"
 msgstr "Oznaczyć %d wyświetlonych artykułów jako przeczytane?"
@@ -3250,6 +3217,26 @@ msgstr "Brak nieprzeczytanych kanałów."
 msgid "Load more..."
 msgstr "Wczytaj więcej..."
 
+#: plugins/import_export/import_export.js:13
+msgid "Export Data"
+msgstr "Eksportuj dane"
+
+#: plugins/import_export/import_export.js:40
+msgid ""
+"Finished, exported %d articles. You can download the data <a "
+"class='visibleLink' href='%u'>here</a>."
+msgstr ""
+"Zakończono, wyeksportowano %d artykułów. Możesz pobrać dane <a "
+"class='visibleLink' href='%u'>tutaj</a>."
+
+#: plugins/import_export/import_export.js:93
+msgid "Data Import"
+msgstr "Importuj dane"
+
+#: plugins/import_export/import_export.js:112
+msgid "Please choose the file first."
+msgstr "Najpierw wybierz plik."
+
 #: plugins/mail/mail.js:21
 msgid "Forward article by email"
 msgstr "Prześlij artykuł emailem"
@@ -3287,6 +3274,99 @@ msgstr ""
 "kopię swojego katalogu tt-rss przed kontynuowaniem. Wpisz 'yes' aby "
 "kontynuować."
 
+#~ msgid "Comments?"
+#~ msgstr "Komentarze?"
+
+#~ msgid "News"
+#~ msgstr "Nowości"
+
+#~ msgid "Move between feeds"
+#~ msgstr "Przechodzenie pomiędzy kanałami"
+
+#~ msgid "Move between articles"
+#~ msgstr "Przechodzenie pomiędzy artykułami"
+
+#~ msgid "Active article actions"
+#~ msgstr "Działania dla bieżącego artykułu"
+
+#~ msgid "Mark articles below/above active one as read"
+#~ msgstr "Oznacz artykuły poniżej/powyżej bieżącego jako przeczytane"
+
+#~ msgid "Scroll article content"
+#~ msgstr "Przewijanie treści artykułu"
+
+#~ msgid "Other actions"
+#~ msgstr "Inne działania"
+
+#~ msgid "Display this help dialog"
+#~ msgstr "Wyświetl to okno pomocy"
+
+#~ msgid "Multiple articles actions"
+#~ msgstr "Działania na wielu artykułach"
+
+#, fuzzy
+#~ msgid "Select starred articles"
+#~ msgstr "Wybierz nieprzeczytane artykuły"
+
+#~ msgid "Feed actions"
+#~ msgstr "Działania na kanałach"
+
+#~ msgid "Mark feed as read"
+#~ msgstr "Oznacz kanał jako przeczytany"
+
+#~ msgid "If viewing category, (un)collapse it"
+#~ msgstr "W trybie kategorii, rozwiń/zwiń"
+
+#~ msgid "Press any key to close this window."
+#~ msgstr "Wciśnij dowolny klawisz aby zamknąć to okno."
+
+#~ msgid "My Feeds"
+#~ msgstr "Moje kanały"
+
+#~ msgid "Panel actions"
+#~ msgstr "Działania na panelach"
+
+#~ msgid "Top 25 feeds"
+#~ msgstr "Top 25 kanałów"
+
+#~ msgid "Edit feed categories"
+#~ msgstr "Edytuj kategorie kanału"
+
+#~ msgid "Focus search (if present)"
+#~ msgstr "Aktywuj pole wyszukiwarki (jeżeli jest)"
+
+#~ msgid ""
+#~ "<b>Note:</b> not all actions may be available, depending on Tiny Tiny RSS "
+#~ "configuration and your access level."
+#~ msgstr ""
+#~ "<b>Uwaga:</b> nie wszystkie działania mogą być dostępne, zależnie od "
+#~ "konfiguracji Tiny Tiny RSS i Twojego poziomu uprawnień."
+
+#~ msgid "Fatal: authentication module %s not found."
+#~ msgstr "Błąd fatalny: moduł uwierzytelniania %s nie został odnaleziony."
+
+#~ msgid "Open article in new tab"
+#~ msgstr "Otwórz artykuł w nowej zakładce"
+
+#~ msgid "Select theme"
+#~ msgstr "Wybierz styl"
+
+#~ msgid "Right-to-left content"
+#~ msgstr "Treść czytana od prawej do lewej"
+
+#, fuzzy
+#~ msgid "Cache content locally"
+#~ msgstr "Przechowuj obrazki lokalnie"
+
+#~ msgid "Mark posts as updated on content change"
+#~ msgstr "Oznacz artykuły jako zaktualizowane gdy zmieni się ich treść"
+
+#~ msgid "Loading..."
+#~ msgstr "Wczytywanie..."
+
+#~ msgid "View in a tt-rss tab"
+#~ msgstr "Otwórz w zakładce tt-rss"
+
 #~ msgid "Magpie"
 #~ msgstr "Magpie"
 
diff --git a/locale/pt_BR/LC_MESSAGES/messages.mo b/locale/pt_BR/LC_MESSAGES/messages.mo
index bbe7c6d44..558917645 100644
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 724c2e09d..0eaea095d 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 1.2.14.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-17 19:37+0400\n"
+"POT-Creation-Date: 2013-03-19 10:14+0400\n"
 "PO-Revision-Date: 2007-10-24 00:47-0200\n"
 "Last-Translator: Marcelo Jorge VIeira (metal) <metal@alucinados.com>\n"
 "Language-Team: Portuguese/Brazil\n"
@@ -17,80 +17,80 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backend.php:67
+#: backend.php:71
 msgid "Use default"
 msgstr "Usar o padrão"
 
-#: backend.php:68
+#: backend.php:72
 msgid "Never purge"
 msgstr "Nunca remover"
 
-#: backend.php:69
+#: backend.php:73
 msgid "1 week old"
 msgstr "1 semana atrás"
 
-#: backend.php:70
+#: backend.php:74
 msgid "2 weeks old"
 msgstr "2 semanas atrás"
 
-#: backend.php:71
+#: backend.php:75
 msgid "1 month old"
 msgstr "1 mês atrás"
 
-#: backend.php:72
+#: backend.php:76
 msgid "2 months old"
 msgstr "2 meses atrás"
 
-#: backend.php:73
+#: backend.php:77
 msgid "3 months old"
 msgstr "3 meses atrás"
 
-#: backend.php:76
+#: backend.php:80
 #, fuzzy
 msgid "Default interval"
 msgstr "Padrão"
 
-#: backend.php:77 backend.php:87
+#: backend.php:81 backend.php:91
 msgid "Disable updates"
 msgstr "Desabilitar updates"
 
-#: backend.php:78 backend.php:88
+#: backend.php:82 backend.php:92
 msgid "Each 15 minutes"
 msgstr "Cada 15 minutos"
 
-#: backend.php:79 backend.php:89
+#: backend.php:83 backend.php:93
 msgid "Each 30 minutes"
 msgstr "Cada 30 minutos"
 
-#: backend.php:80 backend.php:90
+#: backend.php:84 backend.php:94
 msgid "Hourly"
 msgstr "Toda hora"
 
-#: backend.php:81 backend.php:91
+#: backend.php:85 backend.php:95
 msgid "Each 4 hours"
 msgstr "Cada 4 horas"
 
-#: backend.php:82 backend.php:92
+#: backend.php:86 backend.php:96
 msgid "Each 12 hours"
 msgstr "Cada 12 horas"
 
-#: backend.php:83 backend.php:93
+#: backend.php:87 backend.php:97
 msgid "Daily"
 msgstr "Diariamente"
 
-#: backend.php:84 backend.php:94
+#: backend.php:88 backend.php:98
 msgid "Weekly"
 msgstr "Semanalmente"
 
-#: backend.php:97 classes/pref/users.php:139
+#: backend.php:101 classes/pref/users.php:139
 msgid "User"
 msgstr "Usuário"
 
-#: backend.php:98
+#: backend.php:102
 msgid "Power User"
 msgstr ""
 
-#: backend.php:99
+#: backend.php:103
 msgid "Administrator"
 msgstr "Administrador"
 
@@ -121,7 +121,7 @@ msgstr ""
 #: db-updater.php:94 db-updater.php:163 db-updater.php:176 register.php:194
 #: register.php:239 register.php:252 register.php:267 register.php:286
 #: register.php:371 register.php:381 register.php:393
-#: classes/handler/public.php:637 classes/handler/public.php:725
+#: classes/handler/public.php:611 classes/handler/public.php:699
 msgid "Return to Tiny Tiny RSS"
 msgstr ""
 
@@ -244,210 +244,209 @@ msgstr ""
 msgid "SQL escaping test failed, check your database and PHP configuration"
 msgstr ""
 
-#: index.php:108 index.php:150 index.php:236 prefs.php:86
-#: classes/backend.php:6 classes/pref/labels.php:296
-#: classes/pref/filters.php:602 classes/pref/feeds.php:1342
-#: plugins/digest/digest_body.php:45 js/viewfeed.js:1169 js/viewfeed.js:1158
-#: js/viewfeed.js:1164 js/viewfeed.js:1174
+#: index.php:117 index.php:147 index.php:252 prefs.php:79
+#: classes/backend.php:5 classes/pref/labels.php:296
+#: classes/pref/filters.php:609 classes/pref/feeds.php:1270
+#: plugins/digest/digest_body.php:45 js/viewfeed.js:1174
 msgid "Loading, please wait..."
 msgstr ""
 
-#: index.php:118 plugins/digest/digest_body.php:56
-msgid "Hello,"
-msgstr "Olá,"
+#: index.php:127 index.php:198
+msgid "Communication problem with server."
+msgstr ""
 
-#: index.php:120 prefs.php:29 prefs.php:108 help/main.php:73 help/prefs.php:8
-#: classes/pref/prefs.php:371
-msgid "Preferences"
-msgstr "Preferências"
-
-#: index.php:124
-#, fuzzy
-msgid "Comments?"
-msgstr "Conteúdo"
-
-#: index.php:128 mobile/mobile-functions.php:69
-#: mobile/mobile-functions.php:244 plugins/digest/digest_body.php:59
-msgid "Logout"
-msgstr "Sair"
-
-#: index.php:134
+#: index.php:133 index.php:206
 msgid "New version of Tiny Tiny RSS is available!"
 msgstr ""
 
-#: index.php:157
-msgid "News"
-msgstr ""
-
-#: index.php:166
+#: index.php:161
 #, fuzzy
 msgid "Collapse feedlist"
 msgstr "Todos os feeds"
 
-#: index.php:169
+#: index.php:164
 #, fuzzy
 msgid "Show articles"
 msgstr "Favoritos"
 
-#: index.php:172
+#: index.php:167
 msgid "Adaptive"
 msgstr ""
 
-#: index.php:173
+#: index.php:168
 msgid "All Articles"
 msgstr ""
 
-#: index.php:174 classes/feeds.php:106
+#: index.php:169 include/functions.php:1912 classes/feeds.php:106
 msgid "Starred"
 msgstr "Favoritos"
 
-#: index.php:175 classes/feeds.php:107
+#: index.php:170 include/functions.php:1913 classes/feeds.php:107
 msgid "Published"
 msgstr "Publicado"
 
-#: index.php:176 classes/feeds.php:93 classes/feeds.php:105
+#: index.php:171 classes/feeds.php:93 classes/feeds.php:105
 msgid "Unread"
 msgstr "Não Lido"
 
-#: index.php:177
+#: index.php:172
 msgid "Ignore Scoring"
 msgstr ""
 
-#: index.php:178
+#: index.php:173
 msgid "Updated"
 msgstr "Atualizado"
 
-#: index.php:181
+#: index.php:176
 #, fuzzy
 msgid "Sort articles"
 msgstr "Favoritos"
 
-#: index.php:184 classes/pref/prefs.php:462
+#: index.php:179
 msgid "Default"
 msgstr "Padrão"
 
-#: index.php:185
+#: index.php:180
 #, fuzzy
 msgid "Date"
 msgstr "Atualizar"
 
-#: index.php:186 include/localized_schema.php:3
+#: index.php:181 include/localized_schema.php:3
 msgid "Title"
 msgstr "Título"
 
-#: index.php:187
+#: index.php:182
 msgid "Score"
 msgstr ""
 
-#: index.php:192 classes/pref/feeds.php:539 classes/pref/feeds.php:786
+#: index.php:187 classes/pref/feeds.php:535 classes/pref/feeds.php:746
 msgid "Update"
 msgstr "Atualizar"
 
-#: index.php:196 index.php:211 include/localized_schema.php:10
-#: classes/feeds.php:111 classes/feeds.php:127 js/FeedTree.js:128
-#: js/FeedTree.js:156 plugins/digest/digest.js:630
+#: index.php:191 index.php:221 include/functions.php:1903
+#: include/localized_schema.php:10 classes/feeds.php:111 classes/feeds.php:131
+#: js/FeedTree.js:128 js/FeedTree.js:156 plugins/digest/digest.js:630
 msgid "Mark as read"
 msgstr "Marcar como lido"
 
-#: index.php:202 classes/feeds.php:101
+#: index.php:211
 msgid "Actions..."
 msgstr "Ações..."
 
-#: index.php:204
+#: index.php:213
+#, fuzzy
+msgid "Preferences..."
+msgstr "Preferências"
+
+#: index.php:214
 msgid "Search..."
 msgstr ""
 
-#: index.php:205
+#: index.php:215
 msgid "Feed actions:"
 msgstr "Ações do Feed:"
 
-#: index.php:206 classes/handler/public.php:567
+#: index.php:216 classes/handler/public.php:541
 #, fuzzy
 msgid "Subscribe to feed..."
 msgstr "Removendo o Feed..."
 
-#: index.php:207
+#: index.php:217
 #, fuzzy
 msgid "Edit this feed..."
 msgstr "Editar"
 
-#: index.php:208
+#: index.php:218
 #, fuzzy
 msgid "Rescore feed"
 msgstr "Removendo o Feed..."
 
-#: index.php:209 classes/pref/feeds.php:712 classes/pref/feeds.php:1315
+#: index.php:219 classes/pref/feeds.php:672 classes/pref/feeds.php:1243
 #: js/PrefFeedTree.js:73
 msgid "Unsubscribe"
 msgstr ""
 
-#: index.php:210
+#: index.php:220
 msgid "All feeds:"
 msgstr "Todos os Feeds:"
 
-#: index.php:212 help/main.php:56
+#: index.php:222
 msgid "(Un)hide read feeds"
 msgstr ""
 
-#: index.php:213
+#: index.php:223
 msgid "Other actions:"
 msgstr "Outras ações:"
 
-#: index.php:215
+#: index.php:225
 msgid "Switch to digest..."
 msgstr ""
 
-#: index.php:217
+#: index.php:227
 #, fuzzy
 msgid "Show tag cloud..."
 msgstr "núvem de tags"
 
-#: index.php:218
+#: index.php:229 include/functions.php:1890
+#, fuzzy
+msgid "Toggle widescreen mode"
+msgstr "Remover as categorias selecionadas?"
+
+#: index.php:231
 msgid "Select by tags..."
 msgstr ""
 
-#: index.php:219
+#: index.php:232
 #, fuzzy
 msgid "Create label..."
 msgstr "Criar um usuário"
 
-#: index.php:220
+#: index.php:233
 #, fuzzy
 msgid "Create filter..."
 msgstr "Criar um usuário"
 
-#: index.php:221
+#: index.php:234
 #, fuzzy
 msgid "Keyboard shortcuts help"
 msgstr "&nbsp;&nbsp;Criar filtro"
 
-#: prefs.php:99
+#: index.php:236 mobile/mobile-functions.php:69
+#: mobile/mobile-functions.php:244 plugins/digest/digest_body.php:59
+msgid "Logout"
+msgstr "Sair"
+
+#: prefs.php:28 prefs.php:99 include/functions.php:1915
+#: classes/pref/prefs.php:371
+msgid "Preferences"
+msgstr "Preferências"
+
+#: prefs.php:90
 #, fuzzy
 msgid "Keyboard shortcuts"
 msgstr "&nbsp;&nbsp;Criar filtro"
 
-#: prefs.php:100 help/prefs.php:14
+#: prefs.php:91
 msgid "Exit preferences"
 msgstr "Sair das preferências"
 
-#: prefs.php:111 classes/pref/feeds.php:101 classes/pref/feeds.php:1220
-#: classes/pref/feeds.php:1283
+#: prefs.php:102 classes/pref/feeds.php:100 classes/pref/feeds.php:1148
+#: classes/pref/feeds.php:1211
 #, fuzzy
 msgid "Feeds"
 msgstr "Feed"
 
-#: prefs.php:114 help/prefs.php:11 classes/pref/filters.php:110
+#: prefs.php:105 classes/pref/filters.php:117
 #, fuzzy
 msgid "Filters"
 msgstr "Arquivo:"
 
-#: prefs.php:117 help/prefs.php:12 mobile/mobile-functions.php:205
-#: include/functions.php:1189 include/functions.php:1836
-#: classes/pref/labels.php:90
+#: prefs.php:108 mobile/mobile-functions.php:205 include/functions.php:1118
+#: include/functions.php:1739 classes/pref/labels.php:90
 msgid "Labels"
 msgstr ""
 
-#: prefs.php:121 help/prefs.php:13
+#: prefs.php:112
 #, fuzzy
 msgid "Users"
 msgstr "Usuário"
@@ -509,268 +508,23 @@ msgstr ""
 msgid "New user registrations are currently closed."
 msgstr ""
 
-#: update.php:38
+#: update.php:37
 msgid "Tiny Tiny RSS data update script."
 msgstr ""
 
-#: help/main.php:1 help/prefs.php:1
-#, fuzzy
-msgid "Keyboard Shortcuts"
-msgstr "&nbsp;&nbsp;Criar filtro"
-
-#: help/main.php:5
-#, fuzzy
-msgid "Navigation"
-msgstr "Salvar configuração"
-
-#: help/main.php:8
-msgid "Move between feeds"
-msgstr ""
-
-#: help/main.php:9
-#, fuzzy
-msgid "Move between articles"
-msgstr "Favoritos"
-
-#: help/main.php:10
-#, fuzzy
-msgid "Show search dialog"
-msgstr "Favoritos"
-
-#: help/main.php:13
-#, fuzzy
-msgid "Active article actions"
-msgstr "Favoritos"
-
-#: help/main.php:16
-#, fuzzy
-msgid "Toggle starred"
-msgstr "Marcar como favorito"
-
-#: help/main.php:17
-#, fuzzy
-msgid "Toggle published"
-msgstr "Publicado"
-
-#: help/main.php:18
-msgid "Toggle unread"
-msgstr ""
-
-#: help/main.php:19
-#, fuzzy
-msgid "Edit tags"
-msgstr "Editar Tags"
-
-#: help/main.php:20
-#, fuzzy
-msgid "Dismiss selected articles"
-msgstr "Remover os filtros selecionados?"
-
-#: help/main.php:21
-#, fuzzy
-msgid "Dismiss read articles"
-msgstr "Favoritos"
-
-#: help/main.php:22
-msgid "Open article in new window"
-msgstr ""
-
-#: help/main.php:23
-#, fuzzy
-msgid "Mark articles below/above active one as read"
-msgstr "Marcando todos os feeds como lidos..."
-
-#: help/main.php:24
-msgid "Scroll article content"
-msgstr ""
-
-#: help/main.php:25
-#, fuzzy
-msgid "Email article"
-msgstr "Favoritos"
-
-#: help/main.php:29 help/prefs.php:30
-#, fuzzy
-msgid "Other actions"
-msgstr "Outras ações:"
-
-#: help/main.php:32
-msgid "Select article under mouse cursor"
-msgstr ""
-
-#: help/main.php:33 help/prefs.php:26 classes/pref/labels.php:281
-msgid "Create label"
-msgstr ""
-
-#: help/main.php:34 help/prefs.php:25 classes/pref/filters.php:580
-msgid "Create filter"
-msgstr ""
-
-#: help/main.php:35
-#, fuzzy
-msgid "Collapse sidebar"
-msgstr "Todos os feeds"
-
-#: help/main.php:36 help/prefs.php:34
-msgid "Display this help dialog"
-msgstr ""
-
-#: help/main.php:41
-#, fuzzy
-msgid "Multiple articles actions"
-msgstr "Favoritos"
-
-#: help/main.php:44
-#, fuzzy
-msgid "Select all articles"
-msgstr "Favoritos"
-
-#: help/main.php:45
-#, fuzzy
-msgid "Select unread articles"
-msgstr "Favoritos"
-
-#: help/main.php:46
-#, fuzzy
-msgid "Select starred articles"
-msgstr "Favoritos"
-
-#: help/main.php:47
-#, fuzzy
-msgid "Select published articles"
-msgstr "Favoritos"
-
-#: help/main.php:48
-#, fuzzy
-msgid "Invert article selection"
-msgstr "Favoritos"
-
-#: help/main.php:49
-#, fuzzy
-msgid "Deselect all articles"
-msgstr "Favoritos"
-
-#: help/main.php:52
-#, fuzzy
-msgid "Feed actions"
-msgstr "Ações do Feed:"
-
-#: help/main.php:55
-#, fuzzy
-msgid "Refresh active feed"
-msgstr "Favoritos"
-
-#: help/main.php:57 help/prefs.php:22 classes/pref/feeds.php:1286
-msgid "Subscribe to feed"
-msgstr ""
-
-#: help/main.php:58 js/FeedTree.js:135 js/PrefFeedTree.js:67
-#, fuzzy
-msgid "Edit feed"
-msgstr "Editar"
-
-#: help/main.php:59
-#, fuzzy
-msgid "Mark feed as read"
-msgstr "Marcar como lido"
-
-#: help/main.php:60
-#, fuzzy
-msgid "Reverse headlines order"
-msgstr "Remover as categorias selecionadas?"
-
-#: help/main.php:61 js/FeedTree.js:170
-#, fuzzy
-msgid "Mark all feeds as read"
-msgstr "Marcando todos os feeds como lidos..."
-
-#: help/main.php:62
-msgid "If viewing category, (un)collapse it"
-msgstr ""
-
-#: help/main.php:65 help/prefs.php:5
-msgid "Go to..."
-msgstr ""
-
-#: help/main.php:68 include/functions.php:1893
-#, fuzzy
-msgid "All articles"
-msgstr "Favoritos"
-
-#: help/main.php:69 include/functions.php:1891
-msgid "Fresh articles"
-msgstr ""
-
-#: help/main.php:70 include/functions.php:1887
-msgid "Starred articles"
-msgstr ""
-
-#: help/main.php:71 include/functions.php:1889
-msgid "Published articles"
-msgstr ""
-
-#: help/main.php:72
-msgid "Tag cloud"
-msgstr "Núvem de tags"
-
-#: help/main.php:79
-msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
-msgstr ""
-
-#: help/main.php:81 help/prefs.php:41
-#, fuzzy
-msgid "Press any key to close this window."
-msgstr "Fechar esta janela"
-
-#: help/prefs.php:9
-msgid "My Feeds"
-msgstr "Meus Feeds"
-
-#: help/prefs.php:10
-msgid "Other Feeds"
-msgstr "Outros Feeds"
-
-#: help/prefs.php:19
-#, fuzzy
-msgid "Panel actions"
-msgstr "Ações do Feed:"
-
-#: help/prefs.php:23
-msgid "Top 25 feeds"
-msgstr ""
-
-#: help/prefs.php:24
-#, fuzzy
-msgid "Edit feed categories"
-msgstr "Editar categorias"
-
-#: help/prefs.php:27 classes/pref/users.php:386
-msgid "Create user"
-msgstr "Criar um usuário"
-
-#: help/prefs.php:33
-msgid "Focus search (if present)"
-msgstr ""
-
-#: help/prefs.php:39
-msgid ""
-"<b>Note:</b> not all actions may be available, depending on Tiny Tiny RSS "
-"configuration and your access level."
-msgstr ""
-
 #: mobile/login_form.php:28 include/login_form.php:209
-#: classes/handler/public.php:495
+#: classes/handler/public.php:469
 #, fuzzy
 msgid "Log in"
 msgstr "Login"
 
 #: mobile/login_form.php:40 include/login_form.php:169
-#: classes/handler/public.php:479
+#: classes/handler/public.php:453
 msgid "Login:"
 msgstr "Login:"
 
 #: mobile/login_form.php:45 include/login_form.php:178
-#: classes/handler/public.php:482
+#: classes/handler/public.php:456
 msgid "Password:"
 msgstr "Senha:"
 
@@ -785,8 +539,8 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
-#: mobile/mobile-functions.php:178 include/functions.php:1187
-#: include/functions.php:1834
+#: mobile/mobile-functions.php:178 include/functions.php:1116
+#: include/functions.php:1737
 msgid "Special"
 msgstr "Especial"
 
@@ -800,12 +554,12 @@ msgid "Enable categories"
 msgstr "Editar categorias"
 
 #: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36
-#: mobile/prefs.php:41 mobile/prefs.php:46
+#: mobile/prefs.php:41 mobile/prefs.php:46 mobile/prefs.php:51
 msgid "ON"
 msgstr ""
 
 #: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36
-#: mobile/prefs.php:41 mobile/prefs.php:46
+#: mobile/prefs.php:41 mobile/prefs.php:46 mobile/prefs.php:51
 msgid "OFF"
 msgstr ""
 
@@ -826,155 +580,353 @@ msgstr "Favoritos"
 msgid "Sort feeds by unread count"
 msgstr ""
 
-#: include/functions.php:564
-#, php-format
-msgid "Fatal: authentication module %s not found."
+#: mobile/prefs.php:50 include/localized_schema.php:45
+msgid "Reverse headline order (oldest first)"
 msgstr ""
 
-#: include/functions.php:682
-msgid "Session failed to validate (incorrect IP)"
-msgstr ""
-
-#: include/functions.php:1198 include/functions.php:1737
-#: include/functions.php:1822 include/functions.php:1844
-#: include/functions.php:2699 classes/opml.php:416 classes/pref/feeds.php:193
+#: include/digest.php:131 include/functions.php:1127
+#: include/functions.php:1640 include/functions.php:1725
+#: include/functions.php:1747 classes/opml.php:416 classes/pref/feeds.php:188
 msgid "Uncategorized"
 msgstr "Não Categorizado"
 
-#: include/functions.php:1686 classes/dlg.php:387 classes/pref/filters.php:361
-msgid "All feeds"
-msgstr "Todos os feeds"
-
-#: include/functions.php:1895
-#, fuzzy
-msgid "Archived articles"
-msgstr "Favoritos"
-
-#: include/functions.php:1897
-msgid "Recently read"
-msgstr ""
-
-#: include/functions.php:2346
-#, php-format
-msgid "Search results: %s"
-msgstr ""
-
-#: include/functions.php:3067 js/viewfeed.js:1998 js/viewfeed.js:1971
-#: js/viewfeed.js:1835 js/viewfeed.js:1845
-#, fuzzy
-msgid "Click to play"
-msgstr "Favoritos"
-
-#: include/functions.php:3068 js/viewfeed.js:1997 js/viewfeed.js:1970
-#: js/viewfeed.js:1834 js/viewfeed.js:1844
-msgid "Play"
-msgstr ""
-
-#: include/functions.php:3203
-#, fuzzy
-msgid " - "
-msgstr " - por "
-
-#: include/functions.php:3232 include/functions.php:4028 classes/rpc.php:414
-msgid "no tags"
-msgstr "sem tags"
-
-#: include/functions.php:3242 classes/feeds.php:680
-#, fuzzy
-msgid "Edit tags for this article"
-msgstr "Favoritos"
-
-#: include/functions.php:3252 classes/feeds.php:707
-msgid "Open article in new tab"
-msgstr ""
-
-#: include/functions.php:3263 classes/feeds.php:718
-#, fuzzy
-msgid "Close article"
-msgstr "Favoritos"
-
-#: include/functions.php:3280 classes/feeds.php:616
-#, fuzzy
-msgid "Originally from:"
-msgstr "Favoritos"
-
-#: include/functions.php:3293 classes/feeds.php:629 classes/pref/feeds.php:511
-#, fuzzy
-msgid "Feed URL"
-msgstr "Feed"
-
-#: include/functions.php:3308 classes/feeds.php:68
-msgid "Visit the website"
-msgstr ""
-
-#: include/functions.php:3327
-msgid "Related"
-msgstr ""
-
-#: include/functions.php:3361 classes/dlg.php:30 classes/dlg.php:61
-#: classes/dlg.php:180 classes/dlg.php:203 classes/dlg.php:240
-#: classes/dlg.php:524 classes/dlg.php:559 classes/dlg.php:590
-#: classes/dlg.php:623 classes/dlg.php:724 classes/pref/users.php:106
-#: classes/pref/filters.php:101 classes/pref/feeds.php:1638
-#: classes/pref/feeds.php:1709 plugins/share/share.php:61
-#: plugins/updater/updater.php:301 plugins/updater/init.php:323
-msgid "Close this window"
-msgstr "Fechar esta janela"
-
-#: include/functions.php:4053
-msgid "(edit note)"
-msgstr ""
-
-#: include/functions.php:4525
-msgid "No feed selected."
-msgstr "Nenhum feed foi selecionado."
-
-#: include/functions.php:4535 classes/feeds.php:766
-#, fuzzy, php-format
-msgid "Feeds last updated at %s"
-msgstr "Atualizar"
-
-#: include/functions.php:4545 classes/feeds.php:776
-msgid "Some feeds have update errors (click for details)"
-msgstr "Alguns feeds estão com erros (clique aqui para detalhes)"
-
-#: include/functions.php:4689
-#, fuzzy
-msgid "unknown type"
-msgstr "Erro desconhecido"
-
-#: include/functions.php:4731
-#, fuzzy
-msgid "Attachments"
-msgstr "Conteúdo"
-
-#: include/functions.php:5191
+#: include/feedbrowser.php:83
 #, fuzzy, php-format
 msgid "%d archived articles"
 msgstr "Favoritos"
 
-#: include/functions.php:5215
+#: include/feedbrowser.php:107
 #, fuzzy
 msgid "No feeds found."
 msgstr "Sem Feeds para exibir."
 
-#: include/functions.php:5261 plugins/import_export/init.php:221
-msgid "Could not import: incorrect schema version."
+#: include/functions.php:698
+msgid "Session failed to validate (incorrect IP)"
 msgstr ""
 
-#: include/functions.php:5266 plugins/import_export/init.php:226
-msgid "Could not import: unrecognized document format."
+#: include/functions.php:1589 classes/dlg.php:371 classes/pref/filters.php:368
+msgid "All feeds"
+msgstr "Todos os feeds"
+
+#: include/functions.php:1790
+msgid "Starred articles"
 msgstr ""
 
-#: include/functions.php:5425
+#: include/functions.php:1792
+msgid "Published articles"
+msgstr ""
+
+#: include/functions.php:1794
+msgid "Fresh articles"
+msgstr ""
+
+#: include/functions.php:1796 include/functions.php:1910
+#, fuzzy
+msgid "All articles"
+msgstr "Favoritos"
+
+#: include/functions.php:1798
+#, fuzzy
+msgid "Archived articles"
+msgstr "Favoritos"
+
+#: include/functions.php:1800
+msgid "Recently read"
+msgstr ""
+
+#: include/functions.php:1867
+#, fuzzy
+msgid "Navigation"
+msgstr "Salvar configuração"
+
+#: include/functions.php:1868
+msgid "Open next feed"
+msgstr ""
+
+#: include/functions.php:1869
+msgid "Open previous feed"
+msgstr ""
+
+#: include/functions.php:1870
+#, fuzzy
+msgid "Open next article"
+msgstr "Favoritos"
+
+#: include/functions.php:1871
+#, fuzzy
+msgid "Open previous article"
+msgstr "Favoritos"
+
+#: include/functions.php:1872
+msgid "Open next article (don't scroll long articles)"
+msgstr ""
+
+#: include/functions.php:1873
+msgid "Open previous article (don't scroll long articles)"
+msgstr ""
+
+#: include/functions.php:1874
+#, fuzzy
+msgid "Show search dialog"
+msgstr "Favoritos"
+
+#: include/functions.php:1875
+#, fuzzy
+msgid "Article"
+msgstr "Feed não encontrado."
+
+#: include/functions.php:1876
+#, fuzzy
+msgid "Toggle starred"
+msgstr "Marcar como favorito"
+
+#: include/functions.php:1877
+#, fuzzy
+msgid "Toggle published"
+msgstr "Publicado"
+
+#: include/functions.php:1878
+msgid "Toggle unread"
+msgstr ""
+
+#: include/functions.php:1879
+#, fuzzy
+msgid "Edit tags"
+msgstr "Editar Tags"
+
+#: include/functions.php:1880
+#, fuzzy
+msgid "Dismiss selected"
+msgstr "Remover os filtros selecionados?"
+
+#: include/functions.php:1881
+#, fuzzy
+msgid "Dismiss read"
+msgstr "Favoritos"
+
+#: include/functions.php:1882
+msgid "Open in new window"
+msgstr ""
+
+#: include/functions.php:1883 js/viewfeed.js:1758
+#, fuzzy
+msgid "Mark below as read"
+msgstr "Marcar como lido"
+
+#: include/functions.php:1884 js/viewfeed.js:1752
+#, fuzzy
+msgid "Mark above as read"
+msgstr "Marcar como lido"
+
+#: include/functions.php:1885
+msgid "Scroll down"
+msgstr ""
+
+#: include/functions.php:1886
+msgid "Scroll up"
+msgstr ""
+
+#: include/functions.php:1887
+#, fuzzy
+msgid "Select article under cursor"
+msgstr "Favoritos"
+
+#: include/functions.php:1888
+#, fuzzy
+msgid "Email article"
+msgstr "Favoritos"
+
+#: include/functions.php:1889 plugins/close_button/init.php:24
+#, fuzzy
+msgid "Close article"
+msgstr "Favoritos"
+
+#: include/functions.php:1891
+#, fuzzy
+msgid "Article selection"
+msgstr "Favoritos"
+
+#: include/functions.php:1892
+#, fuzzy
+msgid "Select all articles"
+msgstr "Favoritos"
+
+#: include/functions.php:1893
+#, fuzzy
+msgid "Select unread"
+msgstr "Favoritos"
+
+#: include/functions.php:1894
+#, fuzzy
+msgid "Select starred"
+msgstr "Marcar como favorito"
+
+#: include/functions.php:1895
+#, fuzzy
+msgid "Select published"
+msgstr "Favoritos"
+
+#: include/functions.php:1896
+#, fuzzy
+msgid "Invert selection"
+msgstr "Favoritos"
+
+#: include/functions.php:1897
+#, fuzzy
+msgid "Deselect everything"
+msgstr "Favoritos"
+
+#: include/functions.php:1898 classes/pref/feeds.php:488
+#: classes/pref/feeds.php:707
+msgid "Feed"
+msgstr "Feed"
+
+#: include/functions.php:1899
+#, fuzzy
+msgid "Refresh current feed"
+msgstr "Favoritos"
+
+#: include/functions.php:1900
+#, fuzzy
+msgid "Un/hide read feeds"
+msgstr "Favoritos"
+
+#: include/functions.php:1901 classes/pref/feeds.php:1214
+msgid "Subscribe to feed"
+msgstr ""
+
+#: include/functions.php:1902 js/FeedTree.js:135 js/PrefFeedTree.js:67
+#, fuzzy
+msgid "Edit feed"
+msgstr "Editar"
+
+#: include/functions.php:1904
+#, fuzzy
+msgid "Reverse headlines"
+msgstr "Remover as categorias selecionadas?"
+
+#: include/functions.php:1905
+#, fuzzy
+msgid "Debug feed update"
+msgstr "Desabilitar updates"
+
+#: include/functions.php:1906 js/FeedTree.js:170
+#, fuzzy
+msgid "Mark all feeds as read"
+msgstr "Marcando todos os feeds como lidos..."
+
+#: include/functions.php:1907
+#, fuzzy
+msgid "Un/collapse current category"
+msgstr "Salvando categoria..."
+
+#: include/functions.php:1908
+#, fuzzy
+msgid "Toggle combined mode"
+msgstr "Remover as categorias selecionadas?"
+
+#: include/functions.php:1909
+msgid "Go to"
+msgstr ""
+
+#: include/functions.php:1911
+msgid "Fresh"
+msgstr ""
+
+#: include/functions.php:1914
+msgid "Tag cloud"
+msgstr "Núvem de tags"
+
+#: include/functions.php:1916
+#, fuzzy
+msgid "Other"
+msgstr "Onde:"
+
+#: include/functions.php:1917 classes/pref/labels.php:281
+msgid "Create label"
+msgstr ""
+
+#: include/functions.php:1918 classes/pref/filters.php:587
+msgid "Create filter"
+msgstr ""
+
+#: include/functions.php:1919
+#, fuzzy
+msgid "Un/collapse sidebar"
+msgstr "Todos os feeds"
+
+#: include/functions.php:1920
+#, fuzzy
+msgid "Show help dialog"
+msgstr "Favoritos"
+
+#: include/functions.php:2400
 #, php-format
-msgid "Finished: %d articles processed, %d imported, %d feeds created."
+msgid "Search results: %s"
 msgstr ""
 
-#: include/functions.php:5431 plugins/import_export/init.php:391
-msgid "Could not load XML document."
+#: include/functions.php:2824 js/viewfeed.js:1845
+#, fuzzy
+msgid "Click to play"
+msgstr "Favoritos"
+
+#: include/functions.php:2825 js/viewfeed.js:1844
+msgid "Play"
 msgstr ""
 
+#: include/functions.php:2945
+#, fuzzy
+msgid " - "
+msgstr " - por "
+
+#: include/functions.php:2967 include/functions.php:3284 classes/rpc.php:359
+msgid "no tags"
+msgstr "sem tags"
+
+#: include/functions.php:2977 classes/feeds.php:645
+#, fuzzy
+msgid "Edit tags for this article"
+msgstr "Favoritos"
+
+#: include/functions.php:3006 classes/feeds.php:600
+#, fuzzy
+msgid "Originally from:"
+msgstr "Favoritos"
+
+#: include/functions.php:3019 classes/feeds.php:613 classes/pref/feeds.php:507
+#, fuzzy
+msgid "Feed URL"
+msgstr "Feed"
+
+#: include/functions.php:3048
+msgid "Related"
+msgstr ""
+
+#: include/functions.php:3075 classes/dlg.php:43 classes/dlg.php:162
+#: classes/dlg.php:185 classes/dlg.php:222 classes/dlg.php:508
+#: classes/dlg.php:543 classes/dlg.php:574 classes/dlg.php:608
+#: classes/dlg.php:620 classes/backend.php:105 classes/pref/users.php:106
+#: classes/pref/filters.php:108 classes/pref/feeds.php:1527
+#: classes/pref/feeds.php:1598 plugins/import_export/init.php:407
+#: plugins/import_export/init.php:431 plugins/share/init.php:67
+#: plugins/updater/init.php:329
+msgid "Close this window"
+msgstr "Fechar esta janela"
+
+#: include/functions.php:3309
+msgid "(edit note)"
+msgstr ""
+
+#: include/functions.php:3542
+#, fuzzy
+msgid "unknown type"
+msgstr "Erro desconhecido"
+
+#: include/functions.php:3592
+#, fuzzy
+msgid "Attachments"
+msgstr "Conteúdo"
+
 #: include/localized_schema.php:4
 msgid "Title or Content"
 msgstr "Título ou Conteúdo"
@@ -1001,9 +953,8 @@ msgstr "Favoritos"
 msgid "Set starred"
 msgstr "Marcar como favorito"
 
-#: include/localized_schema.php:12 js/viewfeed.js:501 js/viewfeed.js:490
-#: js/viewfeed.js:496 js/viewfeed.js:478 plugins/digest/digest.js:264
-#: plugins/digest/digest.js:736
+#: include/localized_schema.php:12 js/viewfeed.js:478
+#: plugins/digest/digest.js:264 plugins/digest/digest.js:736
 msgid "Publish article"
 msgstr ""
 
@@ -1012,8 +963,7 @@ msgstr ""
 msgid "Assign tags"
 msgstr "sem tags"
 
-#: include/localized_schema.php:14 js/viewfeed.js:1962 js/viewfeed.js:1935
-#: js/viewfeed.js:1799 js/viewfeed.js:1809
+#: include/localized_schema.php:14 js/viewfeed.js:1809
 msgid "Assign label"
 msgstr ""
 
@@ -1145,10 +1095,6 @@ msgstr ""
 msgid "Sort feeds by unread articles count"
 msgstr ""
 
-#: include/localized_schema.php:45
-msgid "Reverse headline order (oldest first)"
-msgstr ""
-
 #: include/localized_schema.php:46
 msgid "Enable e-mail digest"
 msgstr ""
@@ -1196,8 +1142,9 @@ msgid "Group headlines in virtual feeds"
 msgstr ""
 
 #: include/localized_schema.php:57
-msgid "Do not show images in articles"
-msgstr ""
+#, fuzzy
+msgid "Hide images in articles"
+msgstr "Favoritos"
 
 #: include/localized_schema.php:58
 msgid "Enable external API"
@@ -1207,8 +1154,7 @@ msgstr ""
 msgid "User timezone"
 msgstr ""
 
-#: include/localized_schema.php:60 js/prefs.js:1856 js/prefs.js:1743
-#: js/prefs.js:1733
+#: include/localized_schema.php:60 js/prefs.js:1733
 msgid "Customize stylesheet"
 msgstr ""
 
@@ -1229,7 +1175,7 @@ msgstr ""
 msgid "Assign articles to labels automatically"
 msgstr "Remover os filtros selecionados?"
 
-#: include/login_form.php:185 classes/handler/public.php:485
+#: include/login_form.php:185 classes/handler/public.php:459
 msgid "Language:"
 msgstr "Língua:"
 
@@ -1238,8 +1184,8 @@ msgstr "Língua:"
 msgid "Profile:"
 msgstr "Arquivo:"
 
-#: include/login_form.php:197 classes/handler/public.php:208
-#: classes/rpc.php:147 classes/dlg.php:116
+#: include/login_form.php:197 classes/handler/public.php:212
+#: classes/rpc.php:64 classes/dlg.php:98
 #, fuzzy
 msgid "Default profile"
 msgstr "Padrão"
@@ -1253,361 +1199,345 @@ msgstr ""
 msgid "Article not found."
 msgstr "Feed não encontrado."
 
-#: classes/handler/public.php:420 classes/pref/feeds.php:1480
+#: classes/handler/public.php:394 plugins/bookmarklets/init.php:38
 #, fuzzy
 msgid "Share with Tiny Tiny RSS"
 msgstr "Removendo o Feed..."
 
-#: classes/handler/public.php:428
+#: classes/handler/public.php:402
 msgid "Title:"
 msgstr "Título"
 
-#: classes/handler/public.php:430 classes/dlg.php:667
-#: classes/pref/feeds.php:509 classes/pref/feeds.php:762
-#: plugins/instances/instances.php:100 plugins/instances/init.php:215
+#: classes/handler/public.php:404 classes/dlg.php:667
+#: classes/pref/feeds.php:505 classes/pref/feeds.php:722
+#: plugins/instances/init.php:215
 #, fuzzy
 msgid "URL:"
 msgstr "Feed URL:"
 
-#: classes/handler/public.php:432
+#: classes/handler/public.php:406
 #, fuzzy
 msgid "Content:"
 msgstr "Conteúdo"
 
-#: classes/handler/public.php:434
+#: classes/handler/public.php:408
 msgid "Labels:"
 msgstr ""
 
-#: classes/handler/public.php:453
+#: classes/handler/public.php:427
 msgid "Shared article will appear in the Published feed."
 msgstr ""
 
-#: classes/handler/public.php:455
+#: classes/handler/public.php:429
 msgid "Share"
 msgstr ""
 
-#: classes/handler/public.php:456 classes/handler/public.php:498
-#: classes/dlg.php:315 classes/dlg.php:366 classes/dlg.php:426
-#: classes/dlg.php:457 classes/dlg.php:652 classes/dlg.php:702
-#: classes/dlg.php:774 classes/pref/users.php:194 classes/pref/labels.php:81
-#: classes/pref/filters.php:342 classes/pref/filters.php:722
-#: classes/pref/filters.php:791 classes/pref/filters.php:858
-#: classes/pref/feeds.php:729 classes/pref/feeds.php:880
-#: plugins/mail/mail.php:126 plugins/note/note.php:49
-#: plugins/instances/instances.php:136
+#: classes/handler/public.php:430 classes/handler/public.php:472
+#: classes/dlg.php:297 classes/dlg.php:350 classes/dlg.php:410
+#: classes/dlg.php:441 classes/dlg.php:652 classes/dlg.php:702
+#: classes/dlg.php:751 classes/pref/users.php:194 classes/pref/labels.php:81
+#: classes/pref/filters.php:349 classes/pref/filters.php:729
+#: classes/pref/filters.php:798 classes/pref/filters.php:865
+#: classes/pref/feeds.php:689 classes/pref/feeds.php:829
+#: plugins/mail/init.php:132 plugins/note/init.php:55
+#: plugins/instances/init.php:251
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: classes/handler/public.php:477
+#: classes/handler/public.php:451
 #, fuzzy
 msgid "Not logged in"
 msgstr "Último Login"
 
-#: classes/handler/public.php:537
+#: classes/handler/public.php:511
 msgid "Incorrect username or password"
 msgstr ""
 
-#: classes/handler/public.php:573 classes/handler/public.php:670
+#: classes/handler/public.php:547 classes/handler/public.php:644
 #, fuzzy, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "Não pode criar o usuário <b>%s</b>"
 
-#: classes/handler/public.php:576 classes/handler/public.php:661
+#: classes/handler/public.php:550 classes/handler/public.php:635
 #, fuzzy, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "Removendo o Feed..."
 
-#: classes/handler/public.php:579 classes/handler/public.php:664
+#: classes/handler/public.php:553 classes/handler/public.php:638
 #, fuzzy, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "Não pode criar o usuário <b>%s</b>"
 
-#: classes/handler/public.php:582 classes/handler/public.php:667
+#: classes/handler/public.php:556 classes/handler/public.php:641
 #, fuzzy, php-format
 msgid "No feeds found in <b>%s</b>."
 msgstr "Sem Feeds para exibir."
 
-#: classes/handler/public.php:585 classes/handler/public.php:673
+#: classes/handler/public.php:559 classes/handler/public.php:647
 #, fuzzy
 msgid "Multiple feed URLs found."
 msgstr "Sem Feeds para exibir."
 
-#: classes/handler/public.php:589 classes/handler/public.php:678
+#: classes/handler/public.php:563 classes/handler/public.php:652
 #, fuzzy, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr "Não pode criar o usuário <b>%s</b>"
 
-#: classes/handler/public.php:607 classes/handler/public.php:696
+#: classes/handler/public.php:581 classes/handler/public.php:670
 #, fuzzy
 msgid "Subscribe to selected feed"
 msgstr "Removendo o Feed..."
 
-#: classes/handler/public.php:632 classes/handler/public.php:720
+#: classes/handler/public.php:606 classes/handler/public.php:694
 msgid "Edit subscription options"
 msgstr ""
 
-#: classes/auth/internal.php:45 plugins/auth_internal/init.php:62
-#, fuzzy
-msgid "Please enter your one time password:"
-msgstr "Salvando categoria..."
-
-#: classes/auth/internal.php:168 plugins/auth_internal/init.php:185
-#, fuzzy
-msgid "Password has been changed."
-msgstr "E-mail alterado."
-
-#: classes/auth/internal.php:170
-msgid "Old password is incorrect."
-msgstr "Senha antiga incorreta"
-
-#: classes/dlg.php:26
-#, fuzzy
-msgid "Prepare data"
-msgstr "Salvar"
-
-#: classes/dlg.php:40
+#: classes/dlg.php:22
 msgid ""
 "If you have imported labels and/or filters, you might need to reload "
 "preferences to see your new data."
 msgstr ""
 
-#: classes/dlg.php:73 classes/pref/users.php:378 classes/pref/labels.php:272
-#: classes/pref/filters.php:223 classes/pref/filters.php:270
-#: classes/pref/filters.php:571 classes/pref/filters.php:650
-#: classes/pref/filters.php:677 classes/pref/feeds.php:1274
-#: classes/pref/feeds.php:1583 classes/pref/feeds.php:1652
-#: plugins/instances/instances.php:172
+#: classes/dlg.php:55 classes/pref/users.php:378 classes/pref/labels.php:272
+#: classes/pref/filters.php:230 classes/pref/filters.php:277
+#: classes/pref/filters.php:578 classes/pref/filters.php:657
+#: classes/pref/filters.php:684 classes/pref/feeds.php:1202
+#: classes/pref/feeds.php:1472 classes/pref/feeds.php:1541
+#: plugins/instances/init.php:287
 #, fuzzy
 msgid "Select"
 msgstr "Selecione:"
 
-#: classes/dlg.php:76 classes/feeds.php:92 classes/pref/users.php:381
-#: classes/pref/labels.php:275 classes/pref/filters.php:226
-#: classes/pref/filters.php:273 classes/pref/filters.php:574
-#: classes/pref/filters.php:653 classes/pref/filters.php:680
-#: classes/pref/feeds.php:1277 classes/pref/feeds.php:1586
-#: classes/pref/feeds.php:1655 plugins/instances/instances.php:175
+#: classes/dlg.php:58 classes/feeds.php:92 classes/pref/users.php:381
+#: classes/pref/labels.php:275 classes/pref/filters.php:233
+#: classes/pref/filters.php:280 classes/pref/filters.php:581
+#: classes/pref/filters.php:660 classes/pref/filters.php:687
+#: classes/pref/feeds.php:1205 classes/pref/feeds.php:1475
+#: classes/pref/feeds.php:1544 plugins/instances/init.php:290
 msgid "All"
 msgstr "Todos"
 
-#: classes/dlg.php:78 classes/feeds.php:95 classes/pref/users.php:383
-#: classes/pref/labels.php:277 classes/pref/filters.php:228
-#: classes/pref/filters.php:275 classes/pref/filters.php:576
-#: classes/pref/filters.php:655 classes/pref/filters.php:682
-#: classes/pref/feeds.php:1279 classes/pref/feeds.php:1588
-#: classes/pref/feeds.php:1657 plugins/instances/instances.php:177
+#: classes/dlg.php:60 classes/feeds.php:95 classes/pref/users.php:383
+#: classes/pref/labels.php:277 classes/pref/filters.php:235
+#: classes/pref/filters.php:282 classes/pref/filters.php:583
+#: classes/pref/filters.php:662 classes/pref/filters.php:689
+#: classes/pref/feeds.php:1207 classes/pref/feeds.php:1477
+#: classes/pref/feeds.php:1546 plugins/instances/init.php:292
 msgid "None"
 msgstr "Nenhum"
 
-#: classes/dlg.php:87
+#: classes/dlg.php:69
 #, fuzzy
 msgid "Create profile"
 msgstr "Criar um usuário"
 
-#: classes/dlg.php:110 classes/dlg.php:140
+#: classes/dlg.php:92 classes/dlg.php:122
 msgid "(active)"
 msgstr ""
 
-#: classes/dlg.php:174
+#: classes/dlg.php:156
 #, fuzzy
 msgid "Remove selected profiles"
 msgstr "Remover os filtros selecionados?"
 
-#: classes/dlg.php:176
+#: classes/dlg.php:158
 #, fuzzy
 msgid "Activate profile"
 msgstr "Remover os filtros selecionados?"
 
-#: classes/dlg.php:186
+#: classes/dlg.php:168
 msgid "Public OPML URL"
 msgstr ""
 
-#: classes/dlg.php:191
+#: classes/dlg.php:173
 msgid "Your Public OPML URL is:"
 msgstr ""
 
-#: classes/dlg.php:200 classes/dlg.php:587
+#: classes/dlg.php:182 classes/dlg.php:571
 #, fuzzy
 msgid "Generate new URL"
 msgstr "Gerar um outro endereço"
 
-#: classes/dlg.php:212
+#: classes/dlg.php:194
 msgid "Notice"
 msgstr ""
 
-#: classes/dlg.php:218
+#: classes/dlg.php:200
 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 ""
 
-#: classes/dlg.php:222 classes/dlg.php:231
+#: classes/dlg.php:204 classes/dlg.php:213
 msgid "Last update:"
 msgstr ""
 
-#: classes/dlg.php:227
+#: classes/dlg.php:209
 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 ""
 
-#: classes/dlg.php:252 classes/dlg.php:261
+#: classes/dlg.php:234 classes/dlg.php:243
 #, fuzzy
 msgid "Feed or site URL"
 msgstr "Feed"
 
-#: classes/dlg.php:267 classes/dlg.php:738 classes/pref/feeds.php:531
-#: classes/pref/feeds.php:775
+#: classes/dlg.php:249 classes/dlg.php:715 classes/pref/feeds.php:527
+#: classes/pref/feeds.php:735
 #, fuzzy
 msgid "Place in category:"
 msgstr "Salvando categoria..."
 
-#: classes/dlg.php:275
+#: classes/dlg.php:257
 #, fuzzy
 msgid "Available feeds"
 msgstr "Todos os feeds"
 
-#: classes/dlg.php:287 classes/pref/users.php:155 classes/pref/feeds.php:561
-#: classes/pref/feeds.php:811
+#: classes/dlg.php:269 classes/pref/users.php:155 classes/pref/feeds.php:557
+#: classes/pref/feeds.php:771
 msgid "Authentication"
 msgstr ""
 
-#: classes/dlg.php:291 classes/dlg.php:752 classes/pref/users.php:438
-#: classes/pref/feeds.php:567 classes/pref/feeds.php:815
+#: classes/dlg.php:273 classes/dlg.php:729 classes/pref/users.php:438
+#: classes/pref/feeds.php:563 classes/pref/feeds.php:775
 msgid "Login"
 msgstr "Login"
 
-#: classes/dlg.php:294 classes/dlg.php:755 classes/pref/prefs.php:200
-#: classes/pref/feeds.php:573 classes/pref/feeds.php:821
+#: classes/dlg.php:276 classes/dlg.php:732 classes/pref/prefs.php:196
+#: classes/pref/feeds.php:569 classes/pref/feeds.php:781
 #, fuzzy
 msgid "Password"
 msgstr "Senha:"
 
-#: classes/dlg.php:304
+#: classes/dlg.php:286
 msgid "This feed requires authentication."
 msgstr "Este feed requer autenticação."
 
-#: classes/dlg.php:309 classes/dlg.php:364 classes/dlg.php:773
+#: classes/dlg.php:291 classes/dlg.php:348 classes/dlg.php:750
 msgid "Subscribe"
 msgstr ""
 
-#: classes/dlg.php:312
+#: classes/dlg.php:294
 #, fuzzy
 msgid "More feeds"
 msgstr "Removendo o Feed..."
 
-#: classes/dlg.php:336 classes/dlg.php:425 classes/pref/users.php:368
-#: classes/pref/filters.php:567 classes/pref/feeds.php:1270 js/tt-rss.js:234
-#: js/tt-rss.js:187 js/tt-rss.js:166
+#: classes/dlg.php:318 classes/dlg.php:409 classes/pref/users.php:368
+#: classes/pref/filters.php:574 classes/pref/feeds.php:1198 js/tt-rss.js:166
 msgid "Search"
 msgstr ""
 
-#: classes/dlg.php:340
+#: classes/dlg.php:322
 #, fuzzy
 msgid "Popular feeds"
 msgstr "Todos os feeds"
 
-#: classes/dlg.php:341
+#: classes/dlg.php:323
 #, fuzzy
 msgid "Feed archive"
 msgstr "Ações do Feed:"
 
-#: classes/dlg.php:344
+#: classes/dlg.php:326
 #, fuzzy
 msgid "limit:"
 msgstr "Limite:"
 
-#: classes/dlg.php:365 classes/pref/users.php:394 classes/pref/labels.php:284
-#: classes/pref/filters.php:332 classes/pref/filters.php:589
-#: classes/pref/feeds.php:702 plugins/instances/instances.php:182
+#: classes/dlg.php:349 classes/pref/users.php:394 classes/pref/labels.php:284
+#: classes/pref/filters.php:339 classes/pref/filters.php:596
+#: classes/pref/feeds.php:662 plugins/instances/init.php:297
 msgid "Remove"
 msgstr "Remover"
 
-#: classes/dlg.php:376
+#: classes/dlg.php:360
 msgid "Look for"
 msgstr ""
 
-#: classes/dlg.php:384
+#: classes/dlg.php:368
 msgid "Limit search to:"
 msgstr ""
 
-#: classes/dlg.php:400
+#: classes/dlg.php:384
 msgid "This feed"
 msgstr ""
 
-#: classes/dlg.php:432
+#: classes/dlg.php:416
 msgid "Tags for this article (separated by commas):"
 msgstr ""
 
-#: classes/dlg.php:455 classes/dlg.php:650 classes/pref/users.php:192
-#: classes/pref/labels.php:79 classes/pref/filters.php:339
-#: classes/pref/feeds.php:728 classes/pref/feeds.php:877
-#: plugins/note/note.php:47 plugins/instances/instances.php:133
-#: plugins/nsfw/init.php:86 plugins/owncloud/init.php:62
+#: classes/dlg.php:439 classes/dlg.php:650 classes/pref/users.php:192
+#: classes/pref/labels.php:79 classes/pref/filters.php:346
+#: classes/pref/feeds.php:688 classes/pref/feeds.php:826
+#: plugins/nsfw/init.php:86 plugins/note/init.php:53
+#: plugins/owncloud/init.php:62 plugins/instances/init.php:248
 msgid "Save"
 msgstr "Salvar"
 
-#: classes/dlg.php:463
+#: classes/dlg.php:447
 #, fuzzy
 msgid "Tag Cloud"
 msgstr "Núvem de tags"
 
-#: classes/dlg.php:532
+#: classes/dlg.php:516
 msgid "Select item(s) by tags"
 msgstr ""
 
-#: classes/dlg.php:535
+#: classes/dlg.php:519
 msgid "Match:"
 msgstr ""
 
-#: classes/dlg.php:537
+#: classes/dlg.php:521
 msgid "Any"
 msgstr ""
 
-#: classes/dlg.php:540
+#: classes/dlg.php:524
 #, fuzzy
 msgid "All tags."
 msgstr "sem tags"
 
-#: classes/dlg.php:542
+#: classes/dlg.php:526
 msgid "Which Tags?"
 msgstr ""
 
-#: classes/dlg.php:555
+#: classes/dlg.php:539
 msgid "Display entries"
 msgstr ""
 
-#: classes/dlg.php:567 classes/feeds.php:129
+#: classes/dlg.php:551 classes/feeds.php:133
 #, fuzzy
 msgid "View as RSS"
 msgstr "Editar Tags"
 
-#: classes/dlg.php:578
+#: classes/dlg.php:562
 msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 
-#: classes/dlg.php:606 plugins/updater/updater.php:276
+#: classes/dlg.php:591 plugins/updater/init.php:303
 #, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr ""
 
-#: classes/dlg.php:614
+#: classes/dlg.php:599
 msgid ""
 "You can update using built-in updater in the Preferences or by using update."
 "php"
 msgstr ""
 
-#: classes/dlg.php:618 classes/pref/users.php:390
+#: classes/dlg.php:603 classes/pref/users.php:390
 #, fuzzy
 msgid "Details"
 msgstr "Diariamente"
 
-#: classes/dlg.php:620
+#: classes/dlg.php:605
 msgid "Download"
 msgstr ""
 
+#: classes/dlg.php:613
+msgid "Error receiving version information or no new version available."
+msgstr ""
+
 #: classes/dlg.php:634
 #, php-format
 msgid ""
@@ -1616,34 +1546,31 @@ msgid ""
 "\" href=\"%s\">This file</a> can be used as a baseline."
 msgstr ""
 
-#: classes/dlg.php:661 plugins/instances/instances.php:92
-#: plugins/instances/init.php:207
+#: classes/dlg.php:661 plugins/instances/init.php:207
 msgid "Instance"
 msgstr ""
 
-#: classes/dlg.php:670 plugins/instances/instances.php:103
-#: plugins/instances/instances.php:200 plugins/instances/init.php:218
+#: classes/dlg.php:670 plugins/instances/init.php:218
+#: plugins/instances/init.php:315
 msgid "Instance URL"
 msgstr ""
 
-#: classes/dlg.php:680 plugins/instances/instances.php:114
-#: plugins/instances/init.php:229
+#: classes/dlg.php:680 plugins/instances/init.php:229
 #, fuzzy
 msgid "Access key:"
 msgstr "Nível de acesso:"
 
-#: classes/dlg.php:683 plugins/instances/instances.php:117
-#: plugins/instances/instances.php:201 plugins/instances/init.php:232
+#: classes/dlg.php:683 plugins/instances/init.php:232
+#: plugins/instances/init.php:316
 #, fuzzy
 msgid "Access key"
 msgstr "Nível de acesso:"
 
-#: classes/dlg.php:687 plugins/instances/instances.php:121
-#: plugins/instances/init.php:236
+#: classes/dlg.php:687 plugins/instances/init.php:236
 msgid "Use one access key for both linked instances."
 msgstr ""
 
-#: classes/dlg.php:695 plugins/instances/instances.php:129
+#: classes/dlg.php:695 plugins/instances/init.php:244
 #, fuzzy
 msgid "Generate new key"
 msgstr "Gerar um outro endereço"
@@ -1653,26 +1580,23 @@ msgstr "Gerar um outro endereço"
 msgid "Create link"
 msgstr "Criar"
 
-#: classes/dlg.php:717
-#, php-format
-msgid ""
-"Could not upload file. You might need to adjust upload_max_filesize\n"
-"\t\t\t\tin PHP.ini (current value = %s)"
-msgstr ""
-
-#: classes/dlg.php:735
+#: classes/dlg.php:712
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr ""
 
-#: classes/dlg.php:744
+#: classes/dlg.php:721
 msgid "Feeds to subscribe, One per line"
 msgstr ""
 
-#: classes/dlg.php:766
+#: classes/dlg.php:743
 #, fuzzy
 msgid "Feeds require authentication."
 msgstr "Este feed requer autenticação."
 
+#: classes/feeds.php:68
+msgid "Visit the website"
+msgstr ""
+
 #: classes/feeds.php:83
 #, fuzzy
 msgid "View as RSS feed"
@@ -1687,6 +1611,11 @@ msgstr "Selecione:"
 msgid "Invert"
 msgstr "(Inverso)"
 
+#: classes/feeds.php:101
+#, fuzzy
+msgid "More..."
+msgstr "Salvando o Feed..."
+
 #: classes/feeds.php:103
 #, fuzzy
 msgid "Selection toggle:"
@@ -1711,58 +1640,88 @@ msgstr "Feed não encontrado."
 msgid "Move back"
 msgstr ""
 
-#: classes/feeds.php:118 classes/pref/filters.php:235
-#: classes/pref/filters.php:282 classes/pref/filters.php:662
-#: classes/pref/filters.php:689
+#: classes/feeds.php:118 classes/pref/filters.php:242
+#: classes/pref/filters.php:289 classes/pref/filters.php:669
+#: classes/pref/filters.php:696
 #, fuzzy
 msgid "Delete"
 msgstr "Padrão"
 
-#: classes/feeds.php:122 plugins/mail/mail.php:22
+#: classes/feeds.php:125 plugins/mail/init.php:28
 #, fuzzy
 msgid "Forward by email"
 msgstr "Favoritos"
 
-#: classes/feeds.php:125
+#: classes/feeds.php:129
 msgid "Feed:"
 msgstr "Feed:"
 
-#: classes/feeds.php:190 classes/feeds.php:844
+#: classes/feeds.php:196 classes/feeds.php:790
 msgid "Feed not found."
 msgstr "Feed não encontrado."
 
-#: classes/feeds.php:434 classes/feeds.php:516
+#: classes/feeds.php:403 classes/feeds.php:493
 #, fuzzy
 msgid "mark as read"
 msgstr "Marcar como lido"
 
-#: classes/feeds.php:739
+#: classes/feeds.php:691
 #, fuzzy
 msgid "No unread articles found to display."
 msgstr "Sem Feeds para exibir."
 
-#: classes/feeds.php:742
+#: classes/feeds.php:694
 #, fuzzy
 msgid "No updated articles found to display."
 msgstr "Sem Feeds para exibir."
 
-#: classes/feeds.php:745
+#: classes/feeds.php:697
 #, fuzzy
 msgid "No starred articles found to display."
 msgstr "Sem Feeds para exibir."
 
-#: classes/feeds.php:749
+#: classes/feeds.php:701
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
 msgstr ""
 
-#: classes/feeds.php:751
+#: classes/feeds.php:703
 #, fuzzy
 msgid "No articles found to display."
 msgstr "Sem Feeds para exibir."
 
-#: classes/backend.php:26
+#: classes/feeds.php:718 classes/feeds.php:899
+#, fuzzy, php-format
+msgid "Feeds last updated at %s"
+msgstr "Atualizar"
+
+#: classes/feeds.php:728 classes/feeds.php:909
+msgid "Some feeds have update errors (click for details)"
+msgstr "Alguns feeds estão com erros (clique aqui para detalhes)"
+
+#: classes/feeds.php:889
+msgid "No feed selected."
+msgstr "Nenhum feed foi selecionado."
+
+#: classes/backend.php:34
+#, fuzzy
+msgid "Keyboard Shortcuts"
+msgstr "&nbsp;&nbsp;Criar filtro"
+
+#: classes/backend.php:57
+msgid "Shift"
+msgstr ""
+
+#: classes/backend.php:60
+msgid "Ctrl"
+msgstr ""
+
+#: classes/backend.php:84
+msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
+msgstr ""
+
+#: classes/backend.php:99
 msgid "Help topic not found."
 msgstr "Tópico de ajuda não encontrado."
 
@@ -1814,16 +1773,15 @@ msgstr "Adicionando o Feed..."
 msgid "Processing category: %s"
 msgstr "Salvando categoria..."
 
-#: classes/opml.php:467
+#: classes/opml.php:468
 msgid "Error: please upload OPML file."
 msgstr ""
 
-#: classes/opml.php:474
+#: classes/opml.php:475
 msgid "Error while parsing document."
 msgstr ""
 
-#: classes/pref/users.php:6 plugins/instances/instances.php:42
-#: plugins/instances/init.php:157
+#: classes/pref/users.php:6 plugins/instances/init.php:157
 #, fuzzy
 msgid "Your access level is insufficient to open this tab."
 msgstr "Seu nível de acesso é insuficiente para executar esse script."
@@ -1872,8 +1830,8 @@ msgstr "Nível de acesso:"
 msgid "Change password to"
 msgstr "Mudar senha"
 
-#: classes/pref/users.php:177 classes/pref/feeds.php:581
-#: classes/pref/feeds.php:827
+#: classes/pref/users.php:177 classes/pref/feeds.php:577
+#: classes/pref/feeds.php:787
 #, fuzzy
 msgid "Options"
 msgstr "Opções:"
@@ -1916,8 +1874,12 @@ msgstr "Adicionando a categoria <b>%s</b>."
 msgid "[tt-rss] Password change notification"
 msgstr ""
 
-#: classes/pref/users.php:392 classes/pref/filters.php:586
-#: plugins/instances/instances.php:181
+#: classes/pref/users.php:386
+msgid "Create user"
+msgstr "Criar um usuário"
+
+#: classes/pref/users.php:392 classes/pref/filters.php:593
+#: plugins/instances/init.php:296
 msgid "Edit"
 msgstr "Editar"
 
@@ -1934,17 +1896,17 @@ msgstr "Nível de acesso"
 msgid "Last login"
 msgstr "Último Login"
 
-#: classes/pref/users.php:461 plugins/instances/instances.php:222
+#: classes/pref/users.php:462 plugins/instances/init.php:337
 #, fuzzy
 msgid "Click to edit"
 msgstr "Favoritos"
 
-#: classes/pref/users.php:481
+#: classes/pref/users.php:482
 #, fuzzy
 msgid "No users defined."
 msgstr "Nenhum usuário foi selecionado."
 
-#: classes/pref/users.php:483
+#: classes/pref/users.php:484
 #, fuzzy
 msgid "No matching users found."
 msgstr "Sem Feeds para exibir."
@@ -1987,89 +1949,93 @@ msgstr "Sem Feeds para exibir."
 msgid "No recent articles matching this filter have been found."
 msgstr "Sem Feeds para exibir."
 
-#: classes/pref/filters.php:218 classes/pref/filters.php:645
-#: classes/pref/filters.php:760
+#: classes/pref/filters.php:98
+msgid ""
+"Complex expressions might not give results while testing due to issues with "
+"database server regexp implementation."
+msgstr ""
+
+#: classes/pref/filters.php:225 classes/pref/filters.php:652
+#: classes/pref/filters.php:767
 msgid "Match"
 msgstr ""
 
-#: classes/pref/filters.php:232 classes/pref/filters.php:279
-#: classes/pref/filters.php:659 classes/pref/filters.php:686
+#: classes/pref/filters.php:239 classes/pref/filters.php:286
+#: classes/pref/filters.php:666 classes/pref/filters.php:693
 msgid "Add"
 msgstr ""
 
-#: classes/pref/filters.php:265 classes/pref/filters.php:672
+#: classes/pref/filters.php:272 classes/pref/filters.php:679
 #, fuzzy
 msgid "Apply actions"
 msgstr "Ações do Feed:"
 
-#: classes/pref/filters.php:315 classes/pref/filters.php:701
+#: classes/pref/filters.php:322 classes/pref/filters.php:708
 msgid "Enabled"
 msgstr "Ativado"
 
-#: classes/pref/filters.php:324 classes/pref/filters.php:704
+#: classes/pref/filters.php:331 classes/pref/filters.php:711
 #, fuzzy
 msgid "Match any rule"
 msgstr "Favoritos"
 
-#: classes/pref/filters.php:336 classes/pref/filters.php:716
+#: classes/pref/filters.php:343 classes/pref/filters.php:723
 msgid "Test"
 msgstr "Teste"
 
-#: classes/pref/filters.php:368
+#: classes/pref/filters.php:375
 #, php-format
 msgid "%s on %s in %s"
 msgstr ""
 
-#: classes/pref/filters.php:583
+#: classes/pref/filters.php:590
 msgid "Combine"
 msgstr ""
 
-#: classes/pref/filters.php:593 classes/pref/feeds.php:1329
+#: classes/pref/filters.php:600 classes/pref/feeds.php:1257
 #, fuzzy
 msgid "Rescore articles"
 msgstr "Favoritos"
 
-#: classes/pref/filters.php:719
+#: classes/pref/filters.php:726
 msgid "Create"
 msgstr "Criar"
 
-#: classes/pref/filters.php:769
+#: classes/pref/filters.php:776
 #, fuzzy
 msgid "on field"
 msgstr "Feed"
 
-#: classes/pref/filters.php:775 js/PrefFilterTree.js:29
+#: classes/pref/filters.php:782 js/PrefFilterTree.js:29
 #: plugins/digest/digest.js:241
 #, fuzzy
 msgid "in"
 msgstr "Link"
 
-#: classes/pref/filters.php:788
+#: classes/pref/filters.php:795
 #, fuzzy
 msgid "Save rule"
 msgstr "Salvar"
 
-#: classes/pref/filters.php:788 js/functions.js:1067 js/functions.js:1063
-#: js/functions.js:1071 js/functions.js:1073
+#: classes/pref/filters.php:795 js/functions.js:1078
 msgid "Add rule"
 msgstr ""
 
-#: classes/pref/filters.php:811
+#: classes/pref/filters.php:818
 #, fuzzy
 msgid "Perform Action"
 msgstr "Ação"
 
-#: classes/pref/filters.php:837
+#: classes/pref/filters.php:844
 msgid "with parameters:"
 msgstr ""
 
-#: classes/pref/filters.php:855
+#: classes/pref/filters.php:862
 #, fuzzy
 msgid "Save action"
 msgstr "Ações do Feed:"
 
-#: classes/pref/filters.php:855 js/functions.js:1093 js/functions.js:1089
-#: js/functions.js:1097 js/functions.js:1099
+#: classes/pref/filters.php:862 js/functions.js:1104
 #, fuzzy
 msgid "Add action"
 msgstr "Ações do Feed:"
@@ -2090,154 +2056,189 @@ msgstr "As senhas informadas não conferem."
 msgid "Function not supported by authentication module."
 msgstr ""
 
-#: classes/pref/prefs.php:68
+#: classes/pref/prefs.php:63
 #, fuzzy
 msgid "The configuration was saved."
 msgstr "Salvar configuração"
 
-#: classes/pref/prefs.php:83
+#: classes/pref/prefs.php:77
 #, php-format
 msgid "Unknown option: %s"
 msgstr ""
 
-#: classes/pref/prefs.php:97
+#: classes/pref/prefs.php:91
 msgid "Your personal data has been saved."
 msgstr ""
 
-#: classes/pref/prefs.php:137
+#: classes/pref/prefs.php:131
 msgid "Personal data / Authentication"
 msgstr ""
 
-#: classes/pref/prefs.php:157
+#: classes/pref/prefs.php:151
 #, fuzzy
 msgid "Personal data"
 msgstr "Salvar"
 
-#: classes/pref/prefs.php:167
+#: classes/pref/prefs.php:161
 msgid "Full name"
 msgstr ""
 
-#: classes/pref/prefs.php:171
+#: classes/pref/prefs.php:165
 msgid "E-mail"
 msgstr "E-mail"
 
-#: classes/pref/prefs.php:177
+#: classes/pref/prefs.php:171
 #, fuzzy
 msgid "Access level"
 msgstr "Nível de acesso:"
 
-#: classes/pref/prefs.php:187
+#: classes/pref/prefs.php:181
 #, fuzzy
 msgid "Save data"
 msgstr "Salvar"
 
-#: classes/pref/prefs.php:207
+#: classes/pref/prefs.php:203
 #, fuzzy
 msgid "Your password is at default value, please change it."
 msgstr ""
 "Sua senha é a padrão, \n"
 "\t\t\t\t\t\tvocê deve mudá-la."
 
-#: classes/pref/prefs.php:239
+#: classes/pref/prefs.php:235
 msgid "Old password"
 msgstr "Senha antiga"
 
-#: classes/pref/prefs.php:242
+#: classes/pref/prefs.php:238
 msgid "New password"
 msgstr "Senha nova"
 
-#: classes/pref/prefs.php:247
+#: classes/pref/prefs.php:243
 msgid "Confirm password"
 msgstr "Confirmar senha"
 
-#: classes/pref/prefs.php:257
+#: classes/pref/prefs.php:253
 msgid "Change password"
 msgstr "Mudar senha"
 
-#: classes/pref/prefs.php:263
+#: classes/pref/prefs.php:259
 msgid "One time passwords / Authenticator"
 msgstr ""
 
-#: classes/pref/prefs.php:292 classes/pref/prefs.php:343
+#: classes/pref/prefs.php:288 classes/pref/prefs.php:339
 #, fuzzy
 msgid "Enter your password"
 msgstr "Mudar senha"
 
-#: classes/pref/prefs.php:303
+#: classes/pref/prefs.php:299
 #, fuzzy
 msgid "Disable OTP"
 msgstr "(Desativado)"
 
-#: classes/pref/prefs.php:309
+#: classes/pref/prefs.php:305
 msgid ""
 "You will need a compatible Authenticator to use this. Changing your password "
 "would automatically disable OTP."
 msgstr ""
 
-#: classes/pref/prefs.php:311
+#: classes/pref/prefs.php:307
 msgid "Scan the following code by the Authenticator application:"
 msgstr ""
 
-#: classes/pref/prefs.php:352
+#: classes/pref/prefs.php:348
 msgid "I have scanned the code and would like to enable OTP"
 msgstr ""
 
-#: classes/pref/prefs.php:360
+#: classes/pref/prefs.php:356
 #, fuzzy
 msgid "Enable OTP"
 msgstr "Ativado"
 
-#: classes/pref/prefs.php:456
-msgid "Select theme"
-msgstr "Selecionar o tema"
-
-#: classes/pref/prefs.php:508
+#: classes/pref/prefs.php:482
 msgid "Customize"
 msgstr ""
 
-#: classes/pref/prefs.php:527 classes/pref/prefs.php:534
-#: classes/pref/prefs.php:539
+#: classes/pref/prefs.php:501 classes/pref/prefs.php:508
+#: classes/pref/prefs.php:513
 msgid "Yes"
 msgstr "Sim"
 
-#: classes/pref/prefs.php:529 classes/pref/prefs.php:539
+#: classes/pref/prefs.php:503 classes/pref/prefs.php:513
 msgid "No"
 msgstr "Não"
 
-#: classes/pref/prefs.php:569
+#: classes/pref/prefs.php:543
 #, fuzzy
 msgid "Register"
 msgstr "Remover as categorias selecionadas?"
 
-#: classes/pref/prefs.php:573
+#: classes/pref/prefs.php:547
 msgid "Clear"
 msgstr ""
 
-#: classes/pref/prefs.php:579
+#: classes/pref/prefs.php:553
 #, php-format
 msgid "Current server time: %s (UTC)"
 msgstr ""
 
-#: classes/pref/prefs.php:604
+#: classes/pref/prefs.php:582
 msgid "Save configuration"
 msgstr "Salvar configuração"
 
-#: classes/pref/prefs.php:607
+#: classes/pref/prefs.php:585
 #, fuzzy
 msgid "Manage profiles"
 msgstr "Criar um usuário"
 
-#: classes/pref/prefs.php:610
+#: classes/pref/prefs.php:588
 #, fuzzy
 msgid "Reset to defaults"
 msgstr "Usar o padrão"
 
-#: classes/pref/prefs.php:622
+#: classes/pref/prefs.php:600
 #, fuzzy
 msgid "Show additional preferences"
 msgstr "Sair das preferências"
 
-#: classes/pref/prefs.php:679 classes/pref/prefs.php:697
+#: classes/pref/prefs.php:612 classes/pref/prefs.php:614
+msgid "Plugins"
+msgstr ""
+
+#: classes/pref/prefs.php:642
+msgid "System plugins"
+msgstr ""
+
+#: classes/pref/prefs.php:646 classes/pref/prefs.php:695
+msgid "Plugin"
+msgstr ""
+
+#: classes/pref/prefs.php:647 classes/pref/prefs.php:696
+#, fuzzy
+msgid "Description"
+msgstr "descrição"
+
+#: classes/pref/prefs.php:648 classes/pref/prefs.php:697
+msgid "Version"
+msgstr ""
+
+#: classes/pref/prefs.php:649 classes/pref/prefs.php:698
+msgid "Author"
+msgstr ""
+
+#: classes/pref/prefs.php:682 classes/pref/prefs.php:733
+#, fuzzy
+msgid "Clear data"
+msgstr "Salvando o Feed..."
+
+#: classes/pref/prefs.php:691
+msgid "User plugins"
+msgstr ""
+
+#: classes/pref/prefs.php:748
+#, fuzzy
+msgid "Enable selected plugins"
+msgstr "Editar categorias"
+
+#: classes/pref/prefs.php:803 classes/pref/prefs.php:821
 #, fuzzy
 msgid "Incorrect password"
 msgstr "Senha nova"
@@ -2247,324 +2248,258 @@ msgstr "Senha nova"
 msgid "Check to enable field"
 msgstr "Favoritos"
 
-#: classes/pref/feeds.php:59 classes/pref/feeds.php:180
-#: classes/pref/feeds.php:223 classes/pref/feeds.php:229
-#: classes/pref/feeds.php:254
+#: classes/pref/feeds.php:58 classes/pref/feeds.php:175
+#: classes/pref/feeds.php:217 classes/pref/feeds.php:223
+#: classes/pref/feeds.php:248
 #, fuzzy, php-format
 msgid "(%d feeds)"
 msgstr "Editar"
 
-#: classes/pref/feeds.php:492 classes/pref/feeds.php:747
-msgid "Feed"
-msgstr "Feed"
-
-#: classes/pref/feeds.php:498
+#: classes/pref/feeds.php:494
 #, fuzzy
 msgid "Feed Title"
 msgstr "Título"
 
-#: classes/pref/feeds.php:554 classes/pref/feeds.php:802
+#: classes/pref/feeds.php:550 classes/pref/feeds.php:762
 #, fuzzy
 msgid "Article purging:"
 msgstr "Feed não encontrado."
 
-#: classes/pref/feeds.php:577
+#: classes/pref/feeds.php:573
 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:593 classes/pref/feeds.php:831
+#: classes/pref/feeds.php:589 classes/pref/feeds.php:791
 #, fuzzy
 msgid "Hide from Popular feeds"
 msgstr "Todos os feeds"
 
-#: classes/pref/feeds.php:604 classes/pref/feeds.php:836
-#, fuzzy
-msgid "Right-to-left content"
-msgstr "Título ou conteúdo"
-
-#: classes/pref/feeds.php:616 classes/pref/feeds.php:842
+#: classes/pref/feeds.php:601 classes/pref/feeds.php:797
 #, fuzzy
 msgid "Include in e-mail digest"
 msgstr "Marcando todos os feeds como lidos..."
 
-#: classes/pref/feeds.php:629 classes/pref/feeds.php:848
+#: classes/pref/feeds.php:614 classes/pref/feeds.php:803
 msgid "Always display image attachments"
 msgstr ""
 
-#: classes/pref/feeds.php:643 classes/pref/feeds.php:856
+#: classes/pref/feeds.php:628 classes/pref/feeds.php:811
 msgid "Cache images locally"
 msgstr ""
 
-#: classes/pref/feeds.php:656
-msgid "Cache content locally"
-msgstr ""
-
-#: classes/pref/feeds.php:668 classes/pref/feeds.php:862
+#: classes/pref/feeds.php:640 classes/pref/feeds.php:817
 #, fuzzy
 msgid "Mark updated articles as unread"
 msgstr "Marcando todos os feeds como lidos..."
 
-#: classes/pref/feeds.php:680 classes/pref/feeds.php:868
-msgid "Mark posts as updated on content change"
-msgstr ""
-
-#: classes/pref/feeds.php:686
+#: classes/pref/feeds.php:646
 #, fuzzy
 msgid "Icon"
 msgstr "Ação"
 
-#: classes/pref/feeds.php:700
+#: classes/pref/feeds.php:660
 msgid "Replace"
 msgstr ""
 
-#: classes/pref/feeds.php:719
+#: classes/pref/feeds.php:679
 #, fuzzy
 msgid "Resubscribe to push updates"
 msgstr "Removendo o Feed..."
 
-#: classes/pref/feeds.php:726
+#: classes/pref/feeds.php:686
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr ""
 
-#: classes/pref/feeds.php:741
+#: classes/pref/feeds.php:701
 msgid "Enable the options you wish to apply using checkboxes on the right:"
 msgstr ""
 
-#: classes/pref/feeds.php:1123 classes/pref/feeds.php:1176
+#: classes/pref/feeds.php:1051 classes/pref/feeds.php:1104
 msgid "All done."
 msgstr ""
 
-#: classes/pref/feeds.php:1231
+#: classes/pref/feeds.php:1159
 #, fuzzy
 msgid "Feeds with errors"
 msgstr "Editor de Feed"
 
-#: classes/pref/feeds.php:1251
+#: classes/pref/feeds.php:1179
 #, fuzzy
 msgid "Inactive feeds"
 msgstr "Editar"
 
-#: classes/pref/feeds.php:1288
+#: classes/pref/feeds.php:1216
 #, fuzzy
 msgid "Edit selected feeds"
 msgstr "Removendo filtros selecionados…"
 
-#: classes/pref/feeds.php:1290 classes/pref/feeds.php:1304
+#: classes/pref/feeds.php:1218 classes/pref/feeds.php:1232
 #, fuzzy
 msgid "Reset sort order"
 msgstr "Remover as categorias selecionadas?"
 
-#: classes/pref/feeds.php:1292 js/prefs.js:2021 js/prefs.js:1788
-#: js/prefs.js:1778
+#: classes/pref/feeds.php:1220 js/prefs.js:1778
 msgid "Batch subscribe"
 msgstr ""
 
-#: classes/pref/feeds.php:1297
+#: classes/pref/feeds.php:1225
 #, fuzzy
 msgid "Categories"
 msgstr "Categoria:"
 
-#: classes/pref/feeds.php:1300
+#: classes/pref/feeds.php:1228
 #, fuzzy
 msgid "Add category"
 msgstr "Adicionando o Feed..."
 
-#: classes/pref/feeds.php:1302
+#: classes/pref/feeds.php:1230
 #, fuzzy
 msgid "(Un)hide empty categories"
 msgstr "Editar categorias"
 
-#: classes/pref/feeds.php:1306
+#: classes/pref/feeds.php:1234
 #, fuzzy
 msgid "Remove selected"
 msgstr "Remover os filtros selecionados?"
 
-#: classes/pref/feeds.php:1320
+#: classes/pref/feeds.php:1248
 #, fuzzy
 msgid "More actions..."
 msgstr "Ações..."
 
-#: classes/pref/feeds.php:1324
+#: classes/pref/feeds.php:1252
 msgid "Manual purge"
 msgstr ""
 
-#: classes/pref/feeds.php:1328
+#: classes/pref/feeds.php:1256
 #, fuzzy
 msgid "Clear feed data"
 msgstr "Salvando o Feed..."
 
-#: classes/pref/feeds.php:1379
-msgid "Import and export"
-msgstr ""
-
-#: classes/pref/feeds.php:1381
+#: classes/pref/feeds.php:1307
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1383
+#: classes/pref/feeds.php:1309
 msgid ""
 "Using OPML you can export and import your feeds, filters, labels and Tiny "
 "Tiny RSS settings."
 msgstr ""
 
-#: classes/pref/feeds.php:1385
+#: classes/pref/feeds.php:1311
 msgid "Only main settings profile can be migrated using OPML."
 msgstr ""
 
-#: classes/pref/feeds.php:1398
+#: classes/pref/feeds.php:1324
 #, fuzzy
 msgid "Import my OPML"
 msgstr "Importando OPML (usando a extensão DOMXML)..."
 
-#: classes/pref/feeds.php:1402
+#: classes/pref/feeds.php:1328
 msgid "Filename:"
 msgstr ""
 
-#: classes/pref/feeds.php:1404
+#: classes/pref/feeds.php:1330
 msgid "Include settings"
 msgstr ""
 
-#: classes/pref/feeds.php:1408
+#: classes/pref/feeds.php:1334
 #, fuzzy
 msgid "Export OPML"
 msgstr "Exportar OPML"
 
-#: classes/pref/feeds.php:1412
+#: classes/pref/feeds.php:1338
 msgid ""
 "Your OPML can be published publicly and can be subscribed by anyone who "
 "knows the URL below."
 msgstr ""
 
-#: classes/pref/feeds.php:1414
+#: classes/pref/feeds.php:1340
 msgid ""
 "Published OPML does not include your Tiny Tiny RSS settings, feeds that "
 "require authentication or feeds hidden from Popular feeds."
 msgstr ""
 
-#: classes/pref/feeds.php:1417
+#: classes/pref/feeds.php:1343
 msgid "Display published OPML URL"
 msgstr ""
 
-#: classes/pref/feeds.php:1420 plugins/import_export/init.php:66
-#, fuzzy
-msgid "Article archive"
-msgstr "Feed não encontrado."
-
-#: classes/pref/feeds.php:1422 plugins/import_export/init.php:68
-msgid ""
-"You can export and import your Starred and Archived articles for safekeeping "
-"or when migrating between tt-rss instances."
-msgstr ""
-
-#: classes/pref/feeds.php:1425
-#, fuzzy
-msgid "Export my data"
-msgstr "Exportar OPML"
-
-#: classes/pref/feeds.php:1440
-msgid "Import"
-msgstr "Importar"
-
-#: classes/pref/feeds.php:1447
+#: classes/pref/feeds.php:1353
 #, fuzzy
 msgid "Firefox integration"
 msgstr "Informações do Feed:"
 
-#: classes/pref/feeds.php:1449
+#: classes/pref/feeds.php:1355
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
 msgstr ""
 
-#: classes/pref/feeds.php:1456
+#: classes/pref/feeds.php:1362
 msgid "Click here to register this site as a feed reader."
 msgstr ""
 
-#: classes/pref/feeds.php:1464
-msgid "Bookmarklets"
-msgstr ""
-
-#: classes/pref/feeds.php:1466 plugins/bookmarklets/init.php:24
-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 ""
-
-#: classes/pref/feeds.php:1470
-#, fuzzy, php-format
-msgid "Subscribe to %s in Tiny Tiny RSS?"
-msgstr "Removendo o Feed..."
-
-#: classes/pref/feeds.php:1474
-#, fuzzy
-msgid "Subscribe in Tiny Tiny RSS"
-msgstr "Removendo o Feed..."
-
-#: classes/pref/feeds.php:1476 plugins/bookmarklets/init.php:34
-msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
-msgstr ""
-
-#: classes/pref/feeds.php:1484
+#: classes/pref/feeds.php:1370
 #, fuzzy
 msgid "Published & shared articles / Generated feeds"
 msgstr "Remover os filtros selecionados?"
 
-#: classes/pref/feeds.php:1486
+#: classes/pref/feeds.php:1372
 #, fuzzy
 msgid "Published articles and generated feeds"
 msgstr "Remover os filtros selecionados?"
 
-#: classes/pref/feeds.php:1488
+#: classes/pref/feeds.php:1374
 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:1494
+#: classes/pref/feeds.php:1380
 msgid "Display URL"
 msgstr ""
 
-#: classes/pref/feeds.php:1497
+#: classes/pref/feeds.php:1383
 msgid "Clear all generated URLs"
 msgstr ""
 
-#: classes/pref/feeds.php:1499
+#: classes/pref/feeds.php:1385
 #, fuzzy
 msgid "Articles shared by URL"
 msgstr "Favoritos"
 
-#: classes/pref/feeds.php:1501
+#: classes/pref/feeds.php:1387
 msgid "You can disable all articles shared by unique URLs here."
 msgstr ""
 
-#: classes/pref/feeds.php:1504
+#: classes/pref/feeds.php:1390
 #, fuzzy
 msgid "Unshare all articles"
 msgstr "Favoritos"
 
-#: classes/pref/feeds.php:1579
+#: classes/pref/feeds.php:1468
 msgid ""
 "These feeds have not been updated with new content for 3 months (oldest "
 "first):"
 msgstr ""
 
-#: classes/pref/feeds.php:1616 classes/pref/feeds.php:1685
+#: classes/pref/feeds.php:1505 classes/pref/feeds.php:1574
 #, fuzzy
 msgid "Click to edit feed"
 msgstr "Favoritos"
 
-#: classes/pref/feeds.php:1634 classes/pref/feeds.php:1705
+#: classes/pref/feeds.php:1523 classes/pref/feeds.php:1594
 #, fuzzy
 msgid "Unsubscribe from selected feeds"
 msgstr "Removendo o Feed..."
 
-#: classes/pref/feeds.php:1645
+#: classes/pref/feeds.php:1534
 msgid "These feeds have not been updated because of errors:"
 msgstr ""
 
-#: plugins/pocket/pocket.php:24
+#: plugins/pocket/init.php:30
 msgid "Pocket"
 msgstr ""
 
@@ -2580,146 +2515,272 @@ msgstr ""
 msgid "Back to feeds"
 msgstr "Todos os feeds"
 
+#: plugins/digest/digest_body.php:56
+msgid "Hello,"
+msgstr "Olá,"
+
 #: plugins/digest/digest_body.php:62
 msgid "Regular version"
 msgstr ""
 
-#: plugins/pinterest/pinterest.php:23
+#: plugins/nsfw/init.php:32 plugins/nsfw/init.php:43
+msgid "Not work safe (click to toggle)"
+msgstr ""
+
+#: plugins/nsfw/init.php:53
+msgid "NSFW Plugin"
+msgstr ""
+
+#: plugins/nsfw/init.php:80
+msgid "Tags to consider NSFW (comma-separated)"
+msgstr ""
+
+#: plugins/nsfw/init.php:101
+#, fuzzy
+msgid "Configuration saved."
+msgstr "Salvar configuração"
+
+#: plugins/pinterest/init.php:29
 msgid "Pinterest"
 msgstr ""
 
-#: plugins/mail/mail.php:66 plugins/mail/mail.php:72 plugins/mail/init.php:72
-#: plugins/mail/init.php:78
+#: plugins/auth_internal/init.php:62
+#, fuzzy
+msgid "Please enter your one time password:"
+msgstr "Salvando categoria..."
+
+#: plugins/auth_internal/init.php:185
+#, fuzzy
+msgid "Password has been changed."
+msgstr "E-mail alterado."
+
+#: plugins/auth_internal/init.php:187
+msgid "Old password is incorrect."
+msgstr "Senha antiga incorreta"
+
+#: plugins/bookmarklets/init.php:22
+msgid "Bookmarklets"
+msgstr ""
+
+#: plugins/bookmarklets/init.php:24
+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 ""
+
+#: plugins/bookmarklets/init.php:28
+#, fuzzy, php-format
+msgid "Subscribe to %s in Tiny Tiny RSS?"
+msgstr "Removendo o Feed..."
+
+#: plugins/bookmarklets/init.php:32
+#, fuzzy
+msgid "Subscribe in Tiny Tiny RSS"
+msgstr "Removendo o Feed..."
+
+#: plugins/bookmarklets/init.php:34
+msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
+msgstr ""
+
+#: plugins/import_export/init.php:64
+msgid "Import and export"
+msgstr ""
+
+#: plugins/import_export/init.php:66
+#, fuzzy
+msgid "Article archive"
+msgstr "Feed não encontrado."
+
+#: plugins/import_export/init.php:68
+msgid ""
+"You can export and import your Starred and Archived articles for safekeeping "
+"or when migrating between tt-rss instances."
+msgstr ""
+
+#: plugins/import_export/init.php:71
+#, fuzzy
+msgid "Export my data"
+msgstr "Exportar OPML"
+
+#: plugins/import_export/init.php:87
+msgid "Import"
+msgstr "Importar"
+
+#: plugins/import_export/init.php:221
+msgid "Could not import: incorrect schema version."
+msgstr ""
+
+#: plugins/import_export/init.php:226
+msgid "Could not import: unrecognized document format."
+msgstr ""
+
+#: plugins/import_export/init.php:385
+#, php-format
+msgid "Finished: %d articles processed, %d imported, %d feeds created."
+msgstr ""
+
+#: plugins/import_export/init.php:391
+msgid "Could not load XML document."
+msgstr ""
+
+#: plugins/import_export/init.php:403
+#, fuzzy
+msgid "Prepare data"
+msgstr "Salvar"
+
+#: plugins/import_export/init.php:424
+#, php-format
+msgid ""
+"Could not upload file. You might need to adjust upload_max_filesize\n"
+"\t\t\t\tin PHP.ini (current value = %s)"
+msgstr ""
+
+#: plugins/mail/init.php:72 plugins/mail/init.php:78
 msgid "[Forwarded]"
 msgstr ""
 
-#: plugins/mail/mail.php:66 plugins/mail/init.php:72
+#: plugins/mail/init.php:72
 #, fuzzy
 msgid "Multiple articles"
 msgstr "Favoritos"
 
-#: plugins/mail/mail.php:87
+#: plugins/mail/init.php:93
 msgid "From:"
 msgstr ""
 
-#: plugins/mail/mail.php:96
+#: plugins/mail/init.php:102
 msgid "To:"
 msgstr ""
 
-#: plugins/mail/mail.php:109
+#: plugins/mail/init.php:115
 #, fuzzy
 msgid "Subject:"
 msgstr "Selecione:"
 
-#: plugins/mail/mail.php:125
+#: plugins/mail/init.php:131
 #, fuzzy
 msgid "Send e-mail"
 msgstr "Mudar E-mail"
 
-#: plugins/note/note.php:22 plugins/note/note.js:11
+#: plugins/note/init.php:28 plugins/note/note.js:11
 #, fuzzy
 msgid "Edit article note"
 msgstr "Editar Tags"
 
-#: plugins/example/example.php:29 plugins/example/init.php:38
+#: plugins/example/init.php:38
 msgid "Example Pane"
 msgstr ""
 
-#: plugins/example/example.php:53 plugins/example/init.php:69
+#: plugins/example/init.php:69
 msgid "Sample value"
 msgstr ""
 
-#: plugins/example/example.php:59 plugins/example/init.php:75
+#: plugins/example/init.php:75
 #, fuzzy
 msgid "Set value"
 msgstr "Marcar como favorito"
 
-#: plugins/identica/identica.php:23
+#: plugins/identica/init.php:29
 #, fuzzy
 msgid "Share on identi.ca"
 msgstr "Título"
 
-#: plugins/instances/instances.php:29
+#: plugins/owncloud/init.php:35
+msgid "Owncloud"
+msgstr ""
+
+#: plugins/owncloud/init.php:59
+msgid "Owncloud url"
+msgstr ""
+
+#: plugins/owncloud/init.php:74
+msgid "Bookmark on OwnCloud "
+msgstr ""
+
+#: plugins/instances/init.php:144
 #, fuzzy
 msgid "Linked"
 msgstr "Link"
 
-#: plugins/instances/instances.php:180
+#: plugins/instances/init.php:295
 #, fuzzy
 msgid "Link instance"
 msgstr "Editar Tags"
 
-#: plugins/instances/instances.php:192 plugins/instances/init.php:307
+#: plugins/instances/init.php:307
 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 ""
 
-#: plugins/instances/instances.php:202
+#: plugins/instances/init.php:317
 msgid "Last connected"
 msgstr ""
 
-#: plugins/instances/instances.php:203
+#: plugins/instances/init.php:318
 msgid "Status"
 msgstr ""
 
-#: plugins/instances/instances.php:204
+#: plugins/instances/init.php:319
 #, fuzzy
 msgid "Stored feeds"
 msgstr "Removendo o Feed..."
 
-#: plugins/share/share.php:21
+#: plugins/share/init.php:27
 #, fuzzy
 msgid "Share by URL"
 msgstr "Favoritos"
 
-#: plugins/share/share.php:43 plugins/share/init.php:49
+#: plugins/share/init.php:49
 msgid "You can share this article by the following unique URL:"
 msgstr ""
 
-#: plugins/flattr/flattr.php:37
+#: plugins/flattr/init.php:30
 #, fuzzy
-msgid "Flattr article"
+msgid "Flattr this article."
 msgstr "Favoritos"
 
-#: plugins/googleplus/googleplus.php:23
+#: plugins/googleplus/init.php:29
 #, fuzzy
 msgid "Share on Google+"
 msgstr "Título"
 
-#: plugins/updater/updater.php:267 plugins/updater/updater.php:279
+#: plugins/updater/init.php:294 plugins/updater/init.php:306
 #: plugins/updater/updater.js:10
 msgid "Update Tiny Tiny RSS"
 msgstr ""
 
-#: plugins/updater/updater.php:282 plugins/updater/init.php:303
+#: plugins/updater/init.php:309
 #, fuzzy
 msgid "Your Tiny Tiny RSS installation is up to date."
 msgstr "A checagem da configuração falhou"
 
-#: plugins/updater/updater.php:291 plugins/updater/init.php:313
+#: plugins/updater/init.php:319
 msgid ""
 "Do not close this dialog until updating is finished. Backup your tt-rss "
 "directory before continuing."
 msgstr ""
 
-#: plugins/updater/updater.php:294 plugins/updater/init.php:316
+#: plugins/updater/init.php:322
 #, fuzzy
 msgid "Ready to update."
 msgstr "Atualizado"
 
-#: plugins/updater/updater.php:299 plugins/updater/init.php:321
+#: plugins/updater/init.php:327
 #, fuzzy
 msgid "Start update"
 msgstr "Atualizado"
 
-#: js/feedlist.js:283 js/feedlist.js:282 js/feedlist.js:265 js/feedlist.js:218
+#: plugins/tweet/init.php:29
+#, fuzzy
+msgid "Share on Twitter"
+msgstr "Título"
+
+#: js/feedlist.js:218
 msgid "New articles available in this feed (click to show)"
 msgstr ""
 
-#: js/feedlist.js:490 js/feedlist.js:505 js/feedlist.js:489 js/feedlist.js:504
-#: js/feedlist.js:469 js/feedlist.js:484 js/feedlist.js:420 js/feedlist.js:435
-#: plugins/digest/digest.js:25
+#: js/feedlist.js:420 js/feedlist.js:435 plugins/digest/digest.js:25
 #, fuzzy
 msgid "Mark all articles in %s as read?"
 msgstr "Marcando todos os feeds como lidos..."
@@ -2730,153 +2791,141 @@ msgid ""
 "your browser information. Your IP would be saved in the database."
 msgstr ""
 
-#: js/functions.js:618 js/functions.js:614 js/functions.js:622
+#: js/functions.js:627
 #, fuzzy
 msgid "Date syntax appears to be correct:"
 msgstr "Senha antiga incorreta"
 
-#: js/functions.js:621 js/functions.js:617 js/functions.js:625
+#: js/functions.js:630
 #, fuzzy
 msgid "Date syntax is incorrect."
 msgstr "Senha antiga incorreta"
 
-#: js/functions.js:748 js/functions.js:744 js/functions.js:752
+#: js/functions.js:757
 #, fuzzy
 msgid "Remove stored feed icon?"
 msgstr "Remover as categorias selecionadas?"
 
-#: js/functions.js:780 js/functions.js:776 js/functions.js:784
+#: js/functions.js:789
 #, fuzzy
 msgid "Please select an image file to upload."
 msgstr "Por favor selecione  um feed."
 
-#: js/functions.js:782 js/functions.js:778 js/functions.js:786
+#: js/functions.js:791
 msgid "Upload new icon for this feed?"
 msgstr ""
 
-#: js/functions.js:799 js/functions.js:795 js/functions.js:803
+#: js/functions.js:808
 #, fuzzy
 msgid "Please enter label caption:"
 msgstr "Último Login"
 
-#: js/functions.js:804 js/functions.js:800 js/functions.js:808
+#: js/functions.js:813
 msgid "Can't create label: missing caption."
 msgstr ""
 
-#: js/functions.js:847 js/functions.js:843 js/functions.js:851
+#: js/functions.js:856
 #, fuzzy
 msgid "Subscribe to Feed"
 msgstr "Removendo o Feed..."
 
-#: js/functions.js:874 js/functions.js:870 js/functions.js:878
+#: js/functions.js:883
 #, fuzzy
 msgid "Subscribed to %s"
 msgstr "Removendo o Feed..."
 
-#: js/functions.js:879 js/functions.js:875 js/functions.js:883
+#: js/functions.js:888
 msgid "Specified URL seems to be invalid."
 msgstr ""
 
-#: js/functions.js:882 js/functions.js:878 js/functions.js:886
+#: js/functions.js:891
 msgid "Specified URL doesn't seem to contain any feeds."
 msgstr ""
 
-#: js/functions.js:935 js/functions.js:931 js/functions.js:939
+#: js/functions.js:944
 msgid "Couldn't download the specified URL: %s"
 msgstr ""
 
-#: js/functions.js:939 js/functions.js:935 js/functions.js:943
+#: js/functions.js:948
 msgid "You are already subscribed to this feed."
 msgstr ""
 
-#: js/functions.js:1067 js/functions.js:1063 js/functions.js:1071
-#: js/functions.js:1073
+#: js/functions.js:1078
 #, fuzzy
 msgid "Edit rule"
 msgstr "Arquivo:"
 
-#: js/functions.js:1093 js/functions.js:1089 js/functions.js:1097
-#: js/functions.js:1099
+#: js/functions.js:1104
 #, fuzzy
 msgid "Edit action"
 msgstr "Ações do Feed:"
 
-#: js/functions.js:1130 js/functions.js:1126 js/functions.js:1134
-#: js/functions.js:1136
+#: js/functions.js:1141
 #, fuzzy
 msgid "Create Filter"
 msgstr "Criar um usuário"
 
-#: js/functions.js:1234 js/functions.js:1230 js/functions.js:1238
-#: js/functions.js:1240
+#: js/functions.js:1245
 msgid ""
 "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
 "hub again on next feed update."
 msgstr ""
 
-#: js/functions.js:1255 js/tt-rss.js:421 js/functions.js:1251 js/tt-rss.js:381
-#: js/functions.js:1259 js/tt-rss.js:367 js/functions.js:1261
+#: js/functions.js:1266 js/tt-rss.js:367
 #, fuzzy
 msgid "Unsubscribe from %s?"
 msgstr "Removendo o Feed..."
 
-#: js/functions.js:1362 js/functions.js:1358 js/functions.js:1368
-#: js/functions.js:1370
+#: js/functions.js:1375
 #, fuzzy
 msgid "Please enter category title:"
 msgstr "Salvando categoria..."
 
-#: js/functions.js:1393 js/functions.js:1389 js/functions.js:1399
-#: js/functions.js:1401
+#: js/functions.js:1406
 msgid "Generate new syndication address for this feed?"
 msgstr ""
 
-#: js/functions.js:1584 js/tt-rss.js:400 js/tt-rss.js:903 js/functions.js:1580
-#: js/tt-rss.js:782 js/tt-rss.js:362 js/tt-rss.js:717 js/functions.js:1590
-#: js/tt-rss.js:348 js/tt-rss.js:709 js/functions.js:1592
+#: js/functions.js:1597 js/tt-rss.js:348 js/tt-rss.js:713
 msgid "You can't edit this kind of feed."
 msgstr ""
 
-#: js/functions.js:1599 js/functions.js:1595 js/functions.js:1605
-#: js/functions.js:1607
+#: js/functions.js:1612
 #, fuzzy
 msgid "Edit Feed"
 msgstr "Editar"
 
-#: js/functions.js:1637 js/functions.js:1633 js/functions.js:1643
-#: js/functions.js:1645
+#: js/functions.js:1650
 #, fuzzy
 msgid "More Feeds"
 msgstr "Removendo o Feed..."
 
-#: js/functions.js:1698 js/functions.js:1808 js/prefs.js:408 js/prefs.js:438
-#: js/prefs.js:470 js/prefs.js:653 js/prefs.js:673 js/prefs.js:1326
-#: js/prefs.js:1471 js/functions.js:1694 js/functions.js:1804 js/prefs.js:397
-#: js/prefs.js:427 js/prefs.js:459 js/prefs.js:642 js/prefs.js:662
-#: js/prefs.js:1213 js/prefs.js:1358 js/functions.js:1704 js/functions.js:1814
-#: js/prefs.js:1203 js/prefs.js:1348 js/functions.js:1706 js/functions.js:1816
+#: js/functions.js:1711 js/functions.js:1821 js/prefs.js:397 js/prefs.js:427
+#: js/prefs.js:459 js/prefs.js:642 js/prefs.js:662 js/prefs.js:1203
+#: js/prefs.js:1348
 msgid "No feeds are selected."
 msgstr "Nenhum feed foi selecionado."
 
-#: js/functions.js:1740 js/functions.js:1736 js/functions.js:1746
-#: js/functions.js:1748
+#: js/functions.js:1753
 msgid ""
 "Remove selected feeds from the archive? Feeds with stored articles will not "
 "be removed."
 msgstr ""
 
-#: js/functions.js:1779 js/functions.js:1775 js/functions.js:1785
-#: js/functions.js:1787
+#: js/functions.js:1792
 #, fuzzy
 msgid "Feeds with update errors"
 msgstr "Atualizar"
 
-#: js/functions.js:1790 js/prefs.js:1308 js/functions.js:1786 js/prefs.js:1195
-#: js/functions.js:1796 js/prefs.js:1185 js/functions.js:1798
+#: js/functions.js:1803 js/prefs.js:1185
 #, fuzzy
 msgid "Remove selected feeds?"
 msgstr "Remover os filtros selecionados?"
 
+#: js/functions.js:1904
+#, fuzzy
+msgid "Help"
+msgstr "Olá,"
+
 #: js/PrefFeedTree.js:47
 #, fuzzy
 msgid "Edit category"
@@ -2901,282 +2950,255 @@ msgstr "Último Login"
 msgid "Can't create user: no login specified."
 msgstr ""
 
-#: js/prefs.js:128 js/prefs.js:117
+#: js/prefs.js:117
 #, fuzzy
 msgid "Edit Filter"
 msgstr "Arquivo:"
 
-#: js/prefs.js:175 js/prefs.js:164
+#: js/prefs.js:164
 #, fuzzy
 msgid "Remove filter?"
 msgstr "Remover os filtros selecionados?"
 
-#: js/prefs.js:290 js/prefs.js:279
+#: js/prefs.js:279
 #, fuzzy
 msgid "Remove selected labels?"
 msgstr "Remover os filtros selecionados?"
 
-#: js/prefs.js:306 js/prefs.js:1512 js/prefs.js:295 js/prefs.js:1399
-#: js/prefs.js:1389
+#: js/prefs.js:295 js/prefs.js:1389
 #, fuzzy
 msgid "No labels are selected."
 msgstr "Nenhum filtro foi selecionado."
 
-#: js/prefs.js:320 js/prefs.js:309
+#: js/prefs.js:309
 msgid ""
 "Remove selected users? Neither default admin nor your account will be "
 "removed."
 msgstr ""
 
-#: js/prefs.js:337 js/prefs.js:518 js/prefs.js:539 js/prefs.js:578
 #: js/prefs.js:326 js/prefs.js:507 js/prefs.js:528 js/prefs.js:567
 msgid "No users are selected."
 msgstr "Nenhum usuário foi selecionado."
 
-#: js/prefs.js:355 js/prefs.js:344
+#: js/prefs.js:344
 msgid "Remove selected filters?"
 msgstr "Remover os filtros selecionados?"
 
-#: js/prefs.js:370 js/prefs.js:608 js/prefs.js:627 js/prefs.js:359
-#: js/prefs.js:597 js/prefs.js:616
+#: js/prefs.js:359 js/prefs.js:597 js/prefs.js:616
 msgid "No filters are selected."
 msgstr "Nenhum filtro foi selecionado."
 
-#: js/prefs.js:389 js/prefs.js:378
+#: js/prefs.js:378
 #, fuzzy
 msgid "Unsubscribe from selected feeds?"
 msgstr "Removendo o Feed..."
 
-#: js/prefs.js:423 js/prefs.js:412
+#: js/prefs.js:412
 msgid "Please select only one feed."
 msgstr "Por favor selecione somente um feed"
 
-#: js/prefs.js:429 js/prefs.js:418
+#: js/prefs.js:418
 #, fuzzy
 msgid "Erase all non-starred articles in selected feed?"
 msgstr "Remover os filtros selecionados?"
 
-#: js/prefs.js:451 js/prefs.js:440
+#: js/prefs.js:440
 msgid "How many days of articles to keep (0 - use default)?"
 msgstr ""
 
-#: js/prefs.js:489 js/prefs.js:478
+#: js/prefs.js:478
 msgid "Login field cannot be blank."
 msgstr "O campo de Login não pode ser vazio."
 
-#: js/prefs.js:523 js/prefs.js:544 js/prefs.js:583 js/prefs.js:512
-#: js/prefs.js:533 js/prefs.js:572
+#: js/prefs.js:512 js/prefs.js:533 js/prefs.js:572
 msgid "Please select only one user."
 msgstr "Por favor selecione somente um usuário."
 
-#: js/prefs.js:548 js/prefs.js:537
+#: js/prefs.js:537
 #, fuzzy
 msgid "Reset password of selected user?"
 msgstr "Removendo usuários selecionados…"
 
-#: js/prefs.js:613 js/prefs.js:602
+#: js/prefs.js:602
 msgid "Please select only one filter."
 msgstr "Por favor selecione somente um filtro."
 
-#: js/prefs.js:631 js/prefs.js:620
+#: js/prefs.js:620
 #, fuzzy
 msgid "Combine selected filters?"
 msgstr "Remover os filtros selecionados?"
 
-#: js/prefs.js:695 js/prefs.js:684
+#: js/prefs.js:684
 #, fuzzy
 msgid "Edit Multiple Feeds"
 msgstr "Editor de Feed"
 
-#: js/prefs.js:719 js/prefs.js:708
+#: js/prefs.js:708
 #, fuzzy
 msgid "Save changes to selected feeds?"
 msgstr "Remover os filtros selecionados?"
 
-#: js/prefs.js:811 js/prefs.js:800 js/prefs.js:790
+#: js/prefs.js:790
 #, fuzzy
 msgid "OPML Import"
 msgstr "Importar"
 
-#: js/prefs.js:838 js/prefs.js:827 js/prefs.js:817
+#: js/prefs.js:817
 #, fuzzy
 msgid "Please choose an OPML file first."
 msgstr "Por favor selecione somente um filtro."
 
-#: js/prefs.js:854 plugins/import_export/import_export.js:112
-#, fuzzy
-msgid "Please choose the file first."
-msgstr "Por favor selecione somente um filtro."
-
-#: js/prefs.js:1010 js/prefs.js:983 js/prefs.js:973
+#: js/prefs.js:973
 #, fuzzy
 msgid "Reset to defaults?"
 msgstr "Usar o padrão"
 
-#: js/prefs.js:1215 js/prefs.js:1102 js/prefs.js:1092
+#: js/prefs.js:1092
 msgid ""
 "Remove category %s? Any nested feeds would be placed into Uncategorized."
 msgstr ""
 
-#: js/prefs.js:1242 js/prefs.js:1129 js/prefs.js:1119
+#: js/prefs.js:1119
 msgid "Remove selected categories?"
 msgstr "Remover as categorias selecionadas?"
 
-#: js/prefs.js:1258 js/prefs.js:1145 js/prefs.js:1135
+#: js/prefs.js:1135
 msgid "No categories are selected."
 msgstr "Nenhuma categoria foi selecionada."
 
-#: js/prefs.js:1266 js/prefs.js:1153 js/prefs.js:1143
+#: js/prefs.js:1143
 #, fuzzy
 msgid "Category title:"
 msgstr "Editor de Categoria"
 
-#: js/prefs.js:1297 js/prefs.js:1184 js/prefs.js:1174
+#: js/prefs.js:1174
 #, fuzzy
 msgid "Feeds without recent updates"
 msgstr "Atualizar"
 
-#: js/prefs.js:1346 js/prefs.js:1233 js/prefs.js:1223
+#: js/prefs.js:1223
 msgid "Replace current OPML publishing address with a new one?"
 msgstr ""
 
-#: js/prefs.js:1455 js/prefs.js:1342 js/prefs.js:1332
+#: js/prefs.js:1332
 #, fuzzy
 msgid "Rescore articles in selected feeds?"
 msgstr "Remover os filtros selecionados?"
 
-#: js/prefs.js:1478 js/prefs.js:1365 js/prefs.js:1355
+#: js/prefs.js:1355
 msgid "Rescore all articles? This operation may take a lot of time."
 msgstr ""
 
-#: js/prefs.js:1498 js/prefs.js:1385 js/prefs.js:1375
+#: js/prefs.js:1375
 msgid "Reset selected labels to default colors?"
 msgstr ""
 
-#: js/prefs.js:1535 js/prefs.js:1422 js/prefs.js:1412
+#: js/prefs.js:1412
 msgid "Settings Profiles"
 msgstr ""
 
-#: js/prefs.js:1544 js/prefs.js:1431 js/prefs.js:1421
+#: js/prefs.js:1421
 msgid ""
 "Remove selected profiles? Active and default profiles will not be removed."
 msgstr ""
 
-#: js/prefs.js:1562 js/prefs.js:1449 js/prefs.js:1439
+#: js/prefs.js:1439
 #, fuzzy
 msgid "No profiles are selected."
 msgstr "Nenhum filtro foi selecionado."
 
-#: js/prefs.js:1570 js/prefs.js:1623 js/prefs.js:1457 js/prefs.js:1510
 #: js/prefs.js:1447 js/prefs.js:1500
 #, fuzzy
 msgid "Activate selected profile?"
 msgstr "Remover os filtros selecionados?"
 
-#: js/prefs.js:1586 js/prefs.js:1639 js/prefs.js:1473 js/prefs.js:1526
 #: js/prefs.js:1463 js/prefs.js:1516
 #, fuzzy
 msgid "Please choose a profile to activate."
 msgstr "Por favor selecione somente um filtro."
 
-#: js/prefs.js:1647 js/prefs.js:1534 js/prefs.js:1524
+#: js/prefs.js:1524
 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr ""
 
-#: js/prefs.js:1666 js/prefs.js:1553 js/prefs.js:1543
+#: js/prefs.js:1543
 msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr ""
 
-#: js/prefs.js:1764 js/prefs.js:1651 js/prefs.js:1641
+#: js/prefs.js:1641
 #, fuzzy
 msgid "Label Editor"
 msgstr "Editor de Feed"
 
-#: js/prefs.js:1827 js/prefs.js:1714 js/prefs.js:1704
+#: js/prefs.js:1704
 msgid ""
 "This will clear your stored authentication information for Twitter. Continue?"
 msgstr ""
 
-#: js/prefs.js:1911 plugins/import_export/import_export.js:13
-#, fuzzy
-msgid "Export Data"
-msgstr "Exportar OPML"
-
-#: js/prefs.js:1938 plugins/import_export/import_export.js:40
-msgid ""
-"Finished, exported %d articles. You can download the data <a "
-"class='visibleLink' href='%u'>here</a>."
-msgstr ""
-
-#: js/prefs.js:1991 plugins/import_export/import_export.js:93
-#, fuzzy
-msgid "Data Import"
-msgstr "Importar"
-
-#: js/prefs.js:2027 js/prefs.js:1794 js/prefs.js:1784
+#: js/prefs.js:1784
 #, fuzzy
 msgid "Subscribing to feeds..."
 msgstr "Removendo o Feed..."
 
-#: js/tt-rss.js:147 js/tt-rss.js:141 js/tt-rss.js:120
+#: js/prefs.js:1821
+msgid "Clear stored data for this plugin?"
+msgstr ""
+
+#: js/tt-rss.js:120
 #, fuzzy
 msgid "Mark all articles as read?"
 msgstr "Marcando todos os feeds como lidos..."
 
-#: js/tt-rss.js:410 js/tt-rss.js:370 js/tt-rss.js:356
+#: js/tt-rss.js:356
 msgid "You can't unsubscribe from the category."
 msgstr ""
 
-#: js/tt-rss.js:415 js/tt-rss.js:596 js/tt-rss.js:591 js/tt-rss.js:375
-#: js/tt-rss.js:525 js/tt-rss.js:361 js/tt-rss.js:511
+#: js/tt-rss.js:361 js/tt-rss.js:511
 #, fuzzy
 msgid "Please select some feed first."
 msgstr "Por favor selecione somente um feed"
 
-#: js/tt-rss.js:591 js/tt-rss.js:586 js/tt-rss.js:520 js/tt-rss.js:506
+#: js/tt-rss.js:506
 msgid "You can't rescore this kind of feed."
 msgstr ""
 
-#: js/tt-rss.js:601 js/tt-rss.js:596 js/tt-rss.js:530 js/tt-rss.js:516
+#: js/tt-rss.js:516
 #, fuzzy
 msgid "Rescore articles in %s?"
 msgstr "Favoritos"
 
-#: js/tt-rss.js:1062 js/tt-rss.js:883 js/tt-rss.js:825 js/tt-rss.js:830
+#: js/tt-rss.js:672
+#, fuzzy
+msgid "Please enable mail plugin first."
+msgstr "Por favor selecione somente um feed"
+
+#: js/tt-rss.js:834
 msgid "New version available!"
 msgstr ""
 
-#: js/viewfeed.js:108 js/viewfeed.js:104
+#: js/viewfeed.js:104
 #, fuzzy
 msgid "Cancel search"
 msgstr "Cancelar"
 
-#: js/viewfeed.js:456 js/viewfeed.js:445 js/viewfeed.js:451 js/viewfeed.js:435
-#: plugins/digest/digest.js:257 plugins/digest/digest.js:696
+#: js/viewfeed.js:435 plugins/digest/digest.js:257
+#: plugins/digest/digest.js:696
 #, fuzzy
 msgid "Unstar article"
 msgstr "Favoritos"
 
-#: js/viewfeed.js:461 js/viewfeed.js:450 js/viewfeed.js:456 js/viewfeed.js:440
-#: plugins/digest/digest.js:259 plugins/digest/digest.js:700
+#: js/viewfeed.js:440 plugins/digest/digest.js:259
+#: plugins/digest/digest.js:700
 #, fuzzy
 msgid "Star article"
 msgstr "Favoritos"
 
-#: js/viewfeed.js:496 js/viewfeed.js:485 js/viewfeed.js:491 js/viewfeed.js:473
-#: plugins/digest/digest.js:262 plugins/digest/digest.js:731
+#: js/viewfeed.js:473 plugins/digest/digest.js:262
+#: plugins/digest/digest.js:731
 #, fuzzy
 msgid "Unpublish article"
 msgstr "Publicado"
 
-#: js/viewfeed.js:676 js/viewfeed.js:704 js/viewfeed.js:731 js/viewfeed.js:793
-#: js/viewfeed.js:825 js/viewfeed.js:962 js/viewfeed.js:1005
-#: js/viewfeed.js:1055 js/viewfeed.js:2181 js/viewfeed.js:665
-#: js/viewfeed.js:693 js/viewfeed.js:720 js/viewfeed.js:782 js/viewfeed.js:814
-#: js/viewfeed.js:951 js/viewfeed.js:994 js/viewfeed.js:1044
-#: js/viewfeed.js:2154 js/viewfeed.js:671 js/viewfeed.js:699
-#: js/viewfeed.js:726 js/viewfeed.js:788 js/viewfeed.js:820 js/viewfeed.js:957
-#: js/viewfeed.js:1000 js/viewfeed.js:1050 js/viewfeed.js:2018
 #: js/viewfeed.js:674 js/viewfeed.js:702 js/viewfeed.js:729 js/viewfeed.js:791
 #: js/viewfeed.js:823 js/viewfeed.js:960 js/viewfeed.js:1003
 #: js/viewfeed.js:1053 js/viewfeed.js:1927 plugins/mail/mail.js:7
@@ -3184,164 +3206,86 @@ msgstr "Publicado"
 msgid "No articles are selected."
 msgstr "Nenhum filtro foi selecionado."
 
-#: js/viewfeed.js:942 js/viewfeed.js:931 js/viewfeed.js:937 js/viewfeed.js:940
+#: js/viewfeed.js:940
 #, fuzzy
 msgid "Mark all visible articles in %s as read?"
 msgstr "Marcando todos os feeds como lidos..."
 
-#: js/viewfeed.js:970 js/viewfeed.js:959 js/viewfeed.js:965 js/viewfeed.js:968
+#: js/viewfeed.js:968
 #, fuzzy
 msgid "Delete %d selected articles in %s?"
 msgstr "Favoritos"
 
-#: js/viewfeed.js:972 js/viewfeed.js:961 js/viewfeed.js:967 js/viewfeed.js:970
+#: js/viewfeed.js:970
 #, fuzzy
 msgid "Delete %d selected articles?"
 msgstr "Remover os filtros selecionados?"
 
-#: js/viewfeed.js:1014 js/viewfeed.js:1003 js/viewfeed.js:1009
 #: js/viewfeed.js:1012
 #, fuzzy
 msgid "Archive %d selected articles in %s?"
 msgstr "Favoritos"
 
-#: js/viewfeed.js:1017 js/viewfeed.js:1006 js/viewfeed.js:1012
 #: js/viewfeed.js:1015
 #, fuzzy
 msgid "Move %d archived articles back?"
 msgstr "Favoritos"
 
-#: js/viewfeed.js:1061 js/viewfeed.js:1050 js/viewfeed.js:1056
 #: js/viewfeed.js:1059
 #, fuzzy
 msgid "Mark %d selected articles in %s as read?"
 msgstr "Marcando todos os feeds como lidos..."
 
-#: js/viewfeed.js:1085 js/viewfeed.js:1074 js/viewfeed.js:1080
 #: js/viewfeed.js:1083
 #, fuzzy
 msgid "Edit article Tags"
 msgstr "Editar Tags"
 
-#: js/viewfeed.js:1247 js/viewfeed.js:1236 js/viewfeed.js:1242
 #: js/viewfeed.js:1252
 #, fuzzy
 msgid "No article is selected."
 msgstr "Nenhum filtro foi selecionado."
 
-#: js/viewfeed.js:1282 js/viewfeed.js:1271 js/viewfeed.js:1277
 #: js/viewfeed.js:1287
 #, fuzzy
 msgid "No articles found to mark"
 msgstr "Sem Feeds para exibir."
 
-#: js/viewfeed.js:1284 js/viewfeed.js:1273 js/viewfeed.js:1279
 #: js/viewfeed.js:1289
 #, fuzzy
 msgid "Mark %d article(s) as read?"
 msgstr "Marcando todos os feeds como lidos..."
 
-#: js/viewfeed.js:1402 js/viewfeed.js:1383
-#, fuzzy
-msgid "Loading..."
-msgstr "Salvando o Feed..."
-
-#: js/viewfeed.js:1891 js/viewfeed.js:1864 js/viewfeed.js:1734
 #: js/viewfeed.js:1744
 #, fuzzy
 msgid "Open original article"
 msgstr "Favoritos"
 
-#: js/viewfeed.js:1897 js/viewfeed.js:1870
-msgid "View in a tt-rss tab"
-msgstr ""
-
-#: js/viewfeed.js:1905 js/viewfeed.js:1878 js/viewfeed.js:1742
-#: js/viewfeed.js:1752
-#, fuzzy
-msgid "Mark above as read"
-msgstr "Marcar como lido"
-
-#: js/viewfeed.js:1911 js/viewfeed.js:1884 js/viewfeed.js:1748
-#: js/viewfeed.js:1758
-#, fuzzy
-msgid "Mark below as read"
-msgstr "Marcar como lido"
-
-#: js/viewfeed.js:1967 js/viewfeed.js:1940 js/viewfeed.js:1804
 #: js/viewfeed.js:1814
 #, fuzzy
 msgid "Remove label"
 msgstr "Remover"
 
-#: js/viewfeed.js:1991 js/viewfeed.js:1964 js/viewfeed.js:1828
 #: js/viewfeed.js:1838
 #, fuzzy
 msgid "Playing..."
 msgstr "Salvando o Feed..."
 
-#: js/viewfeed.js:1992 js/viewfeed.js:1965 js/viewfeed.js:1829
 #: js/viewfeed.js:1839
 #, fuzzy
 msgid "Click to pause"
 msgstr "Favoritos"
 
-#: js/viewfeed.js:2150 js/viewfeed.js:2123 js/viewfeed.js:1987
 #: js/viewfeed.js:1896
 #, fuzzy
 msgid "Please enter new score for selected articles:"
 msgstr "Remover os filtros selecionados?"
 
-#: js/viewfeed.js:2192 js/viewfeed.js:2165 js/viewfeed.js:2029
 #: js/viewfeed.js:1938
 #, fuzzy
 msgid "Please enter new score for this article:"
 msgstr "Salvando categoria..."
 
-#: js/functions.js:1887 js/functions.js:1891 js/functions.js:1897
-#: js/functions.js:1899
-#, fuzzy
-msgid "Help"
-msgstr "Olá,"
-
-#: js/prefs.js:1831 js/prefs.js:1821
-msgid "Clear stored data for this plugin?"
-msgstr ""
-
-#: js/tt-rss.js:741 js/tt-rss.js:676 js/tt-rss.js:668
-#, fuzzy
-msgid "Please enable mail plugin first."
-msgstr "Por favor selecione somente um feed"
-
-#: plugins/digest/digest_body.php:39
-msgid "Your browser doesn't support Javascript, which is required"
-msgstr ""
-
-#: plugins/nsfw/init.php:32 plugins/nsfw/init.php:43
-msgid "Not work safe (click to toggle)"
-msgstr ""
-
-#: plugins/nsfw/init.php:53
-msgid "NSFW Plugin"
-msgstr ""
-
-#: plugins/nsfw/init.php:80
-msgid "Tags to consider NSFW (comma-separated)"
-msgstr ""
-
-#: plugins/nsfw/init.php:101
-#, fuzzy
-msgid "Configuration saved."
-msgstr "Salvar configuração"
-
-#: plugins/owncloud/init.php:35
-msgid "Owncloud"
-msgstr ""
-
-#: plugins/owncloud/init.php:59
-msgid "Owncloud url"
-msgstr ""
-
 #: plugins/digest/digest.js:71
 #, fuzzy
 msgid "Mark %d displayed articles as read?"
@@ -3372,6 +3316,27 @@ msgstr "Favoritos"
 msgid "Load more..."
 msgstr "Salvando o Feed..."
 
+#: plugins/import_export/import_export.js:13
+#, fuzzy
+msgid "Export Data"
+msgstr "Exportar OPML"
+
+#: plugins/import_export/import_export.js:40
+msgid ""
+"Finished, exported %d articles. You can download the data <a "
+"class='visibleLink' href='%u'>here</a>."
+msgstr ""
+
+#: plugins/import_export/import_export.js:93
+#, fuzzy
+msgid "Data Import"
+msgstr "Importar"
+
+#: plugins/import_export/import_export.js:112
+#, fuzzy
+msgid "Please choose the file first."
+msgstr "Por favor selecione somente um filtro."
+
 #: plugins/mail/mail.js:21
 #, fuzzy
 msgid "Forward article by email"
@@ -3413,6 +3378,71 @@ msgid ""
 "before continuing. Please type 'yes' to continue."
 msgstr ""
 
+#, fuzzy
+#~ msgid "Comments?"
+#~ msgstr "Conteúdo"
+
+#, fuzzy
+#~ msgid "Move between articles"
+#~ msgstr "Favoritos"
+
+#, fuzzy
+#~ msgid "Active article actions"
+#~ msgstr "Favoritos"
+
+#, fuzzy
+#~ msgid "Mark articles below/above active one as read"
+#~ msgstr "Marcando todos os feeds como lidos..."
+
+#, fuzzy
+#~ msgid "Other actions"
+#~ msgstr "Outras ações:"
+
+#, fuzzy
+#~ msgid "Multiple articles actions"
+#~ msgstr "Favoritos"
+
+#, fuzzy
+#~ msgid "Select starred articles"
+#~ msgstr "Favoritos"
+
+#, fuzzy
+#~ msgid "Feed actions"
+#~ msgstr "Ações do Feed:"
+
+#, fuzzy
+#~ msgid "Mark feed as read"
+#~ msgstr "Marcar como lido"
+
+#, fuzzy
+#~ msgid "Press any key to close this window."
+#~ msgstr "Fechar esta janela"
+
+#~ msgid "My Feeds"
+#~ msgstr "Meus Feeds"
+
+#~ msgid "Other Feeds"
+#~ msgstr "Outros Feeds"
+
+#, fuzzy
+#~ msgid "Panel actions"
+#~ msgstr "Ações do Feed:"
+
+#, fuzzy
+#~ msgid "Edit feed categories"
+#~ msgstr "Editar categorias"
+
+#~ msgid "Select theme"
+#~ msgstr "Selecionar o tema"
+
+#, fuzzy
+#~ msgid "Right-to-left content"
+#~ msgstr "Título ou conteúdo"
+
+#, fuzzy
+#~ msgid "Loading..."
+#~ msgstr "Salvando o Feed..."
+
 #, fuzzy
 #~ msgid "Magpie"
 #~ msgstr "Página"
@@ -3497,9 +3527,6 @@ msgstr ""
 #~ msgid "Content filtering"
 #~ msgstr "Filtrando o conteúdo"
 
-#~ msgid "description"
-#~ msgstr "descrição"
-
 #~ msgid "short_desc"
 #~ msgstr "short_desc"
 
@@ -3577,10 +3604,6 @@ msgstr ""
 #~ msgid "Remove stored data"
 #~ msgstr "Remover as categorias selecionadas?"
 
-#, fuzzy
-#~ msgid "Toggle reordering mode"
-#~ msgstr "Remover as categorias selecionadas?"
-
 #, fuzzy
 #~ msgid "Reset UI layout"
 #~ msgstr "&nbsp;&nbsp;Editar esse Feed"
@@ -3751,10 +3774,6 @@ msgstr ""
 #~ msgid "Order:"
 #~ msgstr "Onde:"
 
-#, fuzzy
-#~ msgid "Other:"
-#~ msgstr "Onde:"
-
 #, fuzzy
 #~ msgid "View:"
 #~ msgstr "Título"
diff --git a/locale/ru_RU/LC_MESSAGES/messages.mo b/locale/ru_RU/LC_MESSAGES/messages.mo
index dbfcba0a7..72ddb2ee6 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 d518c68fc..4104a0a54 100644
--- a/locale/ru_RU/LC_MESSAGES/messages.po
+++ b/locale/ru_RU/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-17 19:37+0400\n"
+"POT-Creation-Date: 2013-03-19 10:14+0400\n"
 "PO-Revision-Date: 2009-05-29 14:38+0300\n"
 "Last-Translator: Max Kamashev <max.kamashev@floscoeli.com>\n"
 "Language-Team: Русский <ru@li.org>\n"
@@ -22,79 +22,79 @@ msgstr ""
 "X-Poedit-Country: RUSSIAN FEDERATION\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: backend.php:67
+#: backend.php:71
 msgid "Use default"
 msgstr "По умолчанию"
 
-#: backend.php:68
+#: backend.php:72
 msgid "Never purge"
 msgstr "Никогда"
 
-#: backend.php:69
+#: backend.php:73
 msgid "1 week old"
 msgstr "Неделя"
 
-#: backend.php:70
+#: backend.php:74
 msgid "2 weeks old"
 msgstr "Две недели"
 
-#: backend.php:71
+#: backend.php:75
 msgid "1 month old"
 msgstr "Один месяц"
 
-#: backend.php:72
+#: backend.php:76
 msgid "2 months old"
 msgstr "Два месяца"
 
-#: backend.php:73
+#: backend.php:77
 msgid "3 months old"
 msgstr "Три месяца"
 
-#: backend.php:76
+#: backend.php:80
 msgid "Default interval"
 msgstr "Интервал обновления:"
 
-#: backend.php:77 backend.php:87
+#: backend.php:81 backend.php:91
 msgid "Disable updates"
 msgstr "Не обновлять"
 
-#: backend.php:78 backend.php:88
+#: backend.php:82 backend.php:92
 msgid "Each 15 minutes"
 msgstr "Каждые 15 минут"
 
-#: backend.php:79 backend.php:89
+#: backend.php:83 backend.php:93
 msgid "Each 30 minutes"
 msgstr "Каждые 30 минут"
 
-#: backend.php:80 backend.php:90
+#: backend.php:84 backend.php:94
 msgid "Hourly"
 msgstr "Каждый час"
 
-#: backend.php:81 backend.php:91
+#: backend.php:85 backend.php:95
 msgid "Each 4 hours"
 msgstr "Каждые 4 часа"
 
-#: backend.php:82 backend.php:92
+#: backend.php:86 backend.php:96
 msgid "Each 12 hours"
 msgstr "Каждые 12 часов"
 
-#: backend.php:83 backend.php:93
+#: backend.php:87 backend.php:97
 msgid "Daily"
 msgstr "Раз в день"
 
-#: backend.php:84 backend.php:94
+#: backend.php:88 backend.php:98
 msgid "Weekly"
 msgstr "Раз в неделю"
 
-#: backend.php:97 classes/pref/users.php:139
+#: backend.php:101 classes/pref/users.php:139
 msgid "User"
 msgstr "Пользователь"
 
-#: backend.php:98
+#: backend.php:102
 msgid "Power User"
 msgstr "Активный пользователь"
 
-#: backend.php:99
+#: backend.php:103
 msgid "Administrator"
 msgstr "Администратор"
 
@@ -125,7 +125,7 @@ msgstr "Tiny Tiny RSS база данных обновлена."
 #: db-updater.php:94 db-updater.php:163 db-updater.php:176 register.php:194
 #: register.php:239 register.php:252 register.php:267 register.php:286
 #: register.php:371 register.php:381 register.php:393
-#: classes/handler/public.php:637 classes/handler/public.php:725
+#: classes/handler/public.php:611 classes/handler/public.php:699
 msgid "Return to Tiny Tiny RSS"
 msgstr "Вернуться к Tiny Tiny RSS"
 
@@ -259,195 +259,195 @@ msgstr ""
 "неудавшийся тест экранирования SQL, проверьте вашу базу данных и "
 "конфигурацию PHP"
 
-#: index.php:108 index.php:150 index.php:236 prefs.php:86
-#: classes/backend.php:6 classes/pref/labels.php:296
-#: classes/pref/filters.php:602 classes/pref/feeds.php:1342
-#: plugins/digest/digest_body.php:45 js/viewfeed.js:1169 js/viewfeed.js:1158
-#: js/viewfeed.js:1164 js/viewfeed.js:1174
+#: index.php:117 index.php:147 index.php:252 prefs.php:79
+#: classes/backend.php:5 classes/pref/labels.php:296
+#: classes/pref/filters.php:609 classes/pref/feeds.php:1270
+#: plugins/digest/digest_body.php:45 js/viewfeed.js:1174
 msgid "Loading, please wait..."
 msgstr "Идет загрузка..."
 
-#: index.php:118 plugins/digest/digest_body.php:56
-msgid "Hello,"
-msgstr "Привет,"
+#: index.php:127 index.php:198
+msgid "Communication problem with server."
+msgstr ""
 
-#: index.php:120 prefs.php:29 prefs.php:108 help/main.php:73 help/prefs.php:8
-#: classes/pref/prefs.php:371
-msgid "Preferences"
-msgstr "Настройки"
-
-#: index.php:124
-msgid "Comments?"
-msgstr "Комментарии?"
-
-#: index.php:128 mobile/mobile-functions.php:69
-#: mobile/mobile-functions.php:244 plugins/digest/digest_body.php:59
-msgid "Logout"
-msgstr "Выход"
-
-#: index.php:134
+#: index.php:133 index.php:206
 msgid "New version of Tiny Tiny RSS is available!"
 msgstr "Доступная новая версия Tiny Tiny RSS!"
 
-#: index.php:157
-msgid "News"
-msgstr ""
-
-#: index.php:166
+#: index.php:161
 msgid "Collapse feedlist"
 msgstr "Свернуть список каналов"
 
-#: index.php:169
+#: index.php:164
 msgid "Show articles"
 msgstr "Показать статьи"
 
-#: index.php:172
+#: index.php:167
 msgid "Adaptive"
 msgstr "Адаптивно"
 
-#: index.php:173
+#: index.php:168
 msgid "All Articles"
 msgstr "Все статьи"
 
-#: index.php:174 classes/feeds.php:106
+#: index.php:169 include/functions.php:1912 classes/feeds.php:106
 msgid "Starred"
 msgstr "Отмеченные"
 
-#: index.php:175 classes/feeds.php:107
+#: index.php:170 include/functions.php:1913 classes/feeds.php:107
 msgid "Published"
 msgstr "Опубликован"
 
-#: index.php:176 classes/feeds.php:93 classes/feeds.php:105
+#: index.php:171 classes/feeds.php:93 classes/feeds.php:105
 msgid "Unread"
 msgstr "Новые"
 
-#: index.php:177
+#: index.php:172
 msgid "Ignore Scoring"
 msgstr "Игнорировать Оценки"
 
-#: index.php:178
+#: index.php:173
 msgid "Updated"
 msgstr "Обновлено"
 
-#: index.php:181
+#: index.php:176
 msgid "Sort articles"
 msgstr "Сортировать статьи"
 
-#: index.php:184 classes/pref/prefs.php:462
+#: index.php:179
 msgid "Default"
 msgstr "По умолчанию"
 
-#: index.php:185
+#: index.php:180
 msgid "Date"
 msgstr "Дата"
 
-#: index.php:186 include/localized_schema.php:3
+#: index.php:181 include/localized_schema.php:3
 msgid "Title"
 msgstr "Заголовок"
 
-#: index.php:187
+#: index.php:182
 msgid "Score"
 msgstr "Оценка"
 
-#: index.php:192 classes/pref/feeds.php:539 classes/pref/feeds.php:786
+#: index.php:187 classes/pref/feeds.php:535 classes/pref/feeds.php:746
 msgid "Update"
 msgstr "Обновить"
 
-#: index.php:196 index.php:211 include/localized_schema.php:10
-#: classes/feeds.php:111 classes/feeds.php:127 js/FeedTree.js:128
-#: js/FeedTree.js:156 plugins/digest/digest.js:630
+#: index.php:191 index.php:221 include/functions.php:1903
+#: include/localized_schema.php:10 classes/feeds.php:111 classes/feeds.php:131
+#: js/FeedTree.js:128 js/FeedTree.js:156 plugins/digest/digest.js:630
 msgid "Mark as read"
 msgstr "Как прочитанные"
 
-#: index.php:202 classes/feeds.php:101
+#: index.php:211
 msgid "Actions..."
 msgstr "Действия..."
 
-#: index.php:204
+#: index.php:213
+#, fuzzy
+msgid "Preferences..."
+msgstr "Настройки"
+
+#: index.php:214
 msgid "Search..."
 msgstr "Поиск..."
 
-#: index.php:205
+#: index.php:215
 msgid "Feed actions:"
 msgstr "Действия над каналами:"
 
-#: index.php:206 classes/handler/public.php:567
+#: index.php:216 classes/handler/public.php:541
 msgid "Subscribe to feed..."
 msgstr "Подписаться на канал..."
 
-#: index.php:207
+#: index.php:217
 msgid "Edit this feed..."
 msgstr "Редактировать канал..."
 
-#: index.php:208
+#: index.php:218
 msgid "Rescore feed"
 msgstr "Заново оценить канал"
 
-#: index.php:209 classes/pref/feeds.php:712 classes/pref/feeds.php:1315
+#: index.php:219 classes/pref/feeds.php:672 classes/pref/feeds.php:1243
 #: js/PrefFeedTree.js:73
 msgid "Unsubscribe"
 msgstr "Отписаться"
 
-#: index.php:210
+#: index.php:220
 msgid "All feeds:"
 msgstr "Все каналы:"
 
-#: index.php:212 help/main.php:56
+#: index.php:222
 msgid "(Un)hide read feeds"
 msgstr "Показать/скрыть прочитанные"
 
-#: index.php:213
+#: index.php:223
 msgid "Other actions:"
 msgstr "Другие действия:"
 
-#: index.php:215
+#: index.php:225
 msgid "Switch to digest..."
 msgstr "Перейти в дайджест..."
 
-#: index.php:217
+#: index.php:227
 msgid "Show tag cloud..."
 msgstr "Показать облако тегов..."
 
-#: index.php:218
+#: index.php:229 include/functions.php:1890
+#, fuzzy
+msgid "Toggle widescreen mode"
+msgstr "Переключить изменение режима категории"
+
+#: index.php:231
 msgid "Select by tags..."
 msgstr "Выбрать по тегам..."
 
-#: index.php:219
+#: index.php:232
 msgid "Create label..."
 msgstr "Создать метку..."
 
-#: index.php:220
+#: index.php:233
 msgid "Create filter..."
 msgstr "Создать фильтр..."
 
-#: index.php:221
+#: index.php:234
 msgid "Keyboard shortcuts help"
 msgstr "Горячие клавиши"
 
-#: prefs.php:99
+#: index.php:236 mobile/mobile-functions.php:69
+#: mobile/mobile-functions.php:244 plugins/digest/digest_body.php:59
+msgid "Logout"
+msgstr "Выход"
+
+#: prefs.php:28 prefs.php:99 include/functions.php:1915
+#: classes/pref/prefs.php:371
+msgid "Preferences"
+msgstr "Настройки"
+
+#: prefs.php:90
 msgid "Keyboard shortcuts"
 msgstr "Горячие Клавиши"
 
-#: prefs.php:100 help/prefs.php:14
+#: prefs.php:91
 msgid "Exit preferences"
 msgstr "Закрыть настройки"
 
-#: prefs.php:111 classes/pref/feeds.php:101 classes/pref/feeds.php:1220
-#: classes/pref/feeds.php:1283
+#: prefs.php:102 classes/pref/feeds.php:100 classes/pref/feeds.php:1148
+#: classes/pref/feeds.php:1211
 msgid "Feeds"
 msgstr "Каналы"
 
-#: prefs.php:114 help/prefs.php:11 classes/pref/filters.php:110
+#: prefs.php:105 classes/pref/filters.php:117
 msgid "Filters"
 msgstr "Фильтры"
 
-#: prefs.php:117 help/prefs.php:12 mobile/mobile-functions.php:205
-#: include/functions.php:1189 include/functions.php:1836
-#: classes/pref/labels.php:90
+#: prefs.php:108 mobile/mobile-functions.php:205 include/functions.php:1118
+#: include/functions.php:1739 classes/pref/labels.php:90
 msgid "Labels"
 msgstr "Метки"
 
-#: prefs.php:121 help/prefs.php:13
+#: prefs.php:112
 msgid "Users"
 msgstr "Пользователи"
 
@@ -508,241 +508,23 @@ msgstr "Аккаунт успешно создан."
 msgid "New user registrations are currently closed."
 msgstr "Регистрация новых пользователей временно закрыта."
 
-#: update.php:38
+#: update.php:37
 #, fuzzy
 msgid "Tiny Tiny RSS data update script."
 msgstr "Tiny Tiny RSS база данных обновлена."
 
-#: help/main.php:1 help/prefs.php:1
-msgid "Keyboard Shortcuts"
-msgstr "Горячие Клавиши"
-
-#: help/main.php:5
-msgid "Navigation"
-msgstr "Навигация"
-
-#: help/main.php:8
-msgid "Move between feeds"
-msgstr "Перемещаться между каналами"
-
-#: help/main.php:9
-msgid "Move between articles"
-msgstr "Перемещаться между статьями"
-
-#: help/main.php:10
-msgid "Show search dialog"
-msgstr "Показать диалог поиска"
-
-#: help/main.php:13
-msgid "Active article actions"
-msgstr "Действия над текущей статьёй"
-
-#: help/main.php:16
-msgid "Toggle starred"
-msgstr "Изм. отмеченное"
-
-#: help/main.php:17
-msgid "Toggle published"
-msgstr "Отметить / снять отметку"
-
-#: help/main.php:18
-msgid "Toggle unread"
-msgstr "Прочитано / не прочитано"
-
-#: help/main.php:19
-msgid "Edit tags"
-msgstr "Редактировать теги"
-
-#: help/main.php:20
-msgid "Dismiss selected articles"
-msgstr "Скрыть выбранные статьи"
-
-#: help/main.php:21
-msgid "Dismiss read articles"
-msgstr "Скрыть прочитанные статьи"
-
-#: help/main.php:22
-msgid "Open article in new window"
-msgstr "Открыть статью в новом окне"
-
-#: help/main.php:23
-msgid "Mark articles below/above active one as read"
-msgstr "Отметить статью выше/ниже текущей, как прочитанную"
-
-#: help/main.php:24
-msgid "Scroll article content"
-msgstr "Прокрутить содержимое статьи"
-
-#: help/main.php:25
-msgid "Email article"
-msgstr "Отправить по почте"
-
-#: help/main.php:29 help/prefs.php:30
-msgid "Other actions"
-msgstr "Другие действия:"
-
-#: help/main.php:32
-msgid "Select article under mouse cursor"
-msgstr "Выбрать статью под курсором мыши"
-
-#: help/main.php:33 help/prefs.php:26 classes/pref/labels.php:281
-msgid "Create label"
-msgstr "Создать метку"
-
-#: help/main.php:34 help/prefs.php:25 classes/pref/filters.php:580
-msgid "Create filter"
-msgstr "Создать фильтр"
-
-#: help/main.php:35
-msgid "Collapse sidebar"
-msgstr "Развернуть боковую панель"
-
-#: help/main.php:36 help/prefs.php:34
-msgid "Display this help dialog"
-msgstr "Показать этот диалог помощи"
-
-#: help/main.php:41
-msgid "Multiple articles actions"
-msgstr "Действия над несколькими статьями"
-
-#: help/main.php:44
-msgid "Select all articles"
-msgstr "Выбрать все статьи"
-
-#: help/main.php:45
-msgid "Select unread articles"
-msgstr "Выбрать непрочитанные статьи"
-
-#: help/main.php:46
-#, fuzzy
-msgid "Select starred articles"
-msgstr "Выбрать непрочитанные статьи"
-
-#: help/main.php:47
-#, fuzzy
-msgid "Select published articles"
-msgstr "Выбрать непрочитанные статьи"
-
-#: help/main.php:48
-msgid "Invert article selection"
-msgstr "Инвертировать выделение"
-
-#: help/main.php:49
-msgid "Deselect all articles"
-msgstr "Очистить выделение статей"
-
-#: help/main.php:52
-msgid "Feed actions"
-msgstr "Действия над каналом"
-
-#: help/main.php:55
-msgid "Refresh active feed"
-msgstr "Обновить активный канал"
-
-#: help/main.php:57 help/prefs.php:22 classes/pref/feeds.php:1286
-msgid "Subscribe to feed"
-msgstr "Подписаться на канал"
-
-#: help/main.php:58 js/FeedTree.js:135 js/PrefFeedTree.js:67
-msgid "Edit feed"
-msgstr "Редактировать канал"
-
-#: help/main.php:59
-msgid "Mark feed as read"
-msgstr "Отметить канал как прочитанный"
-
-#: help/main.php:60
-msgid "Reverse headlines order"
-msgstr "Обратный порядок заголовков"
-
-#: help/main.php:61 js/FeedTree.js:170
-msgid "Mark all feeds as read"
-msgstr "Отметить все каналы как прочитанные"
-
-#: help/main.php:62
-msgid "If viewing category, (un)collapse it"
-msgstr "Если котегория видна, (раз)свернуть её"
-
-#: help/main.php:65 help/prefs.php:5
-msgid "Go to..."
-msgstr "Перейти к.."
-
-#: help/main.php:68 include/functions.php:1893
-msgid "All articles"
-msgstr "Все статьи"
-
-#: help/main.php:69 include/functions.php:1891
-msgid "Fresh articles"
-msgstr "Свежие"
-
-#: help/main.php:70 include/functions.php:1887
-msgid "Starred articles"
-msgstr "Отмеченные"
-
-#: help/main.php:71 include/functions.php:1889
-msgid "Published articles"
-msgstr "Опубликованные"
-
-#: help/main.php:72
-msgid "Tag cloud"
-msgstr "Облако тегов"
-
-#: help/main.php:79
-msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
-msgstr ""
-
-#: help/main.php:81 help/prefs.php:41
-msgid "Press any key to close this window."
-msgstr "Нажмите любую клавишу для закрытия этого окна"
-
-#: help/prefs.php:9
-msgid "My Feeds"
-msgstr "Мои каналы"
-
-#: help/prefs.php:10
-msgid "Other Feeds"
-msgstr "Другие каналы"
-
-#: help/prefs.php:19
-msgid "Panel actions"
-msgstr "Действия над каналами"
-
-#: help/prefs.php:23
-msgid "Top 25 feeds"
-msgstr "Лучшие 25 каналов"
-
-#: help/prefs.php:24
-msgid "Edit feed categories"
-msgstr "Редактировать категории канала"
-
-#: help/prefs.php:27 classes/pref/users.php:386
-msgid "Create user"
-msgstr "Добавить пользователя"
-
-#: help/prefs.php:33
-msgid "Focus search (if present)"
-msgstr "Фокус на поиск (если поиск показан)"
-
-#: help/prefs.php:39
-msgid ""
-"<b>Note:</b> not all actions may be available, depending on Tiny Tiny RSS "
-"configuration and your access level."
-msgstr ""
-"<b>Замечание:</b> не все действия могут быть доступны. Это зависит от "
-"конфигурации Tiny Tiny RSS и вашего уровня доступа."
-
 #: mobile/login_form.php:28 include/login_form.php:209
-#: classes/handler/public.php:495
+#: classes/handler/public.php:469
 msgid "Log in"
 msgstr "Войти"
 
 #: mobile/login_form.php:40 include/login_form.php:169
-#: classes/handler/public.php:479
+#: classes/handler/public.php:453
 msgid "Login:"
 msgstr "Логин:"
 
 #: mobile/login_form.php:45 include/login_form.php:178
-#: classes/handler/public.php:482
+#: classes/handler/public.php:456
 msgid "Password:"
 msgstr "Пароль:"
 
@@ -757,8 +539,8 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
-#: mobile/mobile-functions.php:178 include/functions.php:1187
-#: include/functions.php:1834
+#: mobile/mobile-functions.php:178 include/functions.php:1116
+#: include/functions.php:1737
 msgid "Special"
 msgstr "Особые"
 
@@ -772,12 +554,12 @@ msgid "Enable categories"
 msgstr "Включить категории каналов"
 
 #: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36
-#: mobile/prefs.php:41 mobile/prefs.php:46
+#: mobile/prefs.php:41 mobile/prefs.php:46 mobile/prefs.php:51
 msgid "ON"
 msgstr ""
 
 #: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36
-#: mobile/prefs.php:41 mobile/prefs.php:46
+#: mobile/prefs.php:41 mobile/prefs.php:46 mobile/prefs.php:51
 msgid "OFF"
 msgstr ""
 
@@ -801,147 +583,338 @@ msgstr "&nbsp;&nbsp;Показать/скрыть прочитанные"
 msgid "Sort feeds by unread count"
 msgstr "Сортировать каналы по количеству непрочитанных статей"
 
-#: include/functions.php:564
-#, php-format
-msgid "Fatal: authentication module %s not found."
-msgstr ""
+#: mobile/prefs.php:50 include/localized_schema.php:45
+msgid "Reverse headline order (oldest first)"
+msgstr "Обратный порядок заголовков (старые впереди)"
 
-#: include/functions.php:682
-msgid "Session failed to validate (incorrect IP)"
-msgstr "Ошибка проверки сессии (некорректный IP)"
-
-#: include/functions.php:1198 include/functions.php:1737
-#: include/functions.php:1822 include/functions.php:1844
-#: include/functions.php:2699 classes/opml.php:416 classes/pref/feeds.php:193
+#: include/digest.php:131 include/functions.php:1127
+#: include/functions.php:1640 include/functions.php:1725
+#: include/functions.php:1747 classes/opml.php:416 classes/pref/feeds.php:188
 msgid "Uncategorized"
 msgstr "Нет категории"
 
-#: include/functions.php:1686 classes/dlg.php:387 classes/pref/filters.php:361
-msgid "All feeds"
-msgstr "Все каналы"
-
-#: include/functions.php:1895
-msgid "Archived articles"
-msgstr "Архив статей"
-
-#: include/functions.php:1897
-msgid "Recently read"
-msgstr ""
-
-#: include/functions.php:2346
-#, fuzzy, php-format
-msgid "Search results: %s"
-msgstr "Результаты поиска"
-
-#: include/functions.php:3067 js/viewfeed.js:1998 js/viewfeed.js:1971
-#: js/viewfeed.js:1835 js/viewfeed.js:1845
-msgid "Click to play"
-msgstr "Щёлкните для проигрывания"
-
-#: include/functions.php:3068 js/viewfeed.js:1997 js/viewfeed.js:1970
-#: js/viewfeed.js:1834 js/viewfeed.js:1844
-msgid "Play"
-msgstr "Играть"
-
-#: include/functions.php:3203
-msgid " - "
-msgstr " - "
-
-#: include/functions.php:3232 include/functions.php:4028 classes/rpc.php:414
-msgid "no tags"
-msgstr "нет тегов"
-
-#: include/functions.php:3242 classes/feeds.php:680
-msgid "Edit tags for this article"
-msgstr "Редактировать теги статьи"
-
-#: include/functions.php:3252 classes/feeds.php:707
-msgid "Open article in new tab"
-msgstr "Открыть статью в новом табе"
-
-#: include/functions.php:3263 classes/feeds.php:718
-msgid "Close article"
-msgstr "Закрыть статью"
-
-#: include/functions.php:3280 classes/feeds.php:616
-msgid "Originally from:"
-msgstr "Оригинал:"
-
-#: include/functions.php:3293 classes/feeds.php:629 classes/pref/feeds.php:511
-#, fuzzy
-msgid "Feed URL"
-msgstr "Канал"
-
-#: include/functions.php:3308 classes/feeds.php:68
-msgid "Visit the website"
-msgstr "Посетить официальный сайт"
-
-#: include/functions.php:3327
-msgid "Related"
-msgstr ""
-
-#: include/functions.php:3361 classes/dlg.php:30 classes/dlg.php:61
-#: classes/dlg.php:180 classes/dlg.php:203 classes/dlg.php:240
-#: classes/dlg.php:524 classes/dlg.php:559 classes/dlg.php:590
-#: classes/dlg.php:623 classes/dlg.php:724 classes/pref/users.php:106
-#: classes/pref/filters.php:101 classes/pref/feeds.php:1638
-#: classes/pref/feeds.php:1709 plugins/share/share.php:61
-#: plugins/updater/updater.php:301 plugins/updater/init.php:323
-msgid "Close this window"
-msgstr "Закрыть это окно"
-
-#: include/functions.php:4053
-#, fuzzy
-msgid "(edit note)"
-msgstr "править заметку"
-
-#: include/functions.php:4525
-msgid "No feed selected."
-msgstr "Канал не выбран."
-
-#: include/functions.php:4535 classes/feeds.php:766
-#, php-format
-msgid "Feeds last updated at %s"
-msgstr "Последнее обновление в %s"
-
-#: include/functions.php:4545 classes/feeds.php:776
-msgid "Some feeds have update errors (click for details)"
-msgstr "Некоторые каналы не могут быть обновлены (щёлкните для подробностей)"
-
-#: include/functions.php:4689
-msgid "unknown type"
-msgstr "неизвестный тип"
-
-#: include/functions.php:4731
-#, fuzzy
-msgid "Attachments"
-msgstr "Вложения:"
-
-#: include/functions.php:5191
+#: include/feedbrowser.php:83
 #, fuzzy, php-format
 msgid "%d archived articles"
 msgstr "Отмеченные"
 
-#: include/functions.php:5215
+#: include/feedbrowser.php:107
 msgid "No feeds found."
 msgstr "Каналы не найдены."
 
-#: include/functions.php:5261 plugins/import_export/init.php:221
-msgid "Could not import: incorrect schema version."
-msgstr "Не могу импортировать данные: некорректная версия схемы."
+#: include/functions.php:698
+msgid "Session failed to validate (incorrect IP)"
+msgstr "Ошибка проверки сессии (некорректный IP)"
 
-#: include/functions.php:5266 plugins/import_export/init.php:226
-msgid "Could not import: unrecognized document format."
-msgstr "Не могу импортировать данные: неизвестынй формат данных."
+#: include/functions.php:1589 classes/dlg.php:371 classes/pref/filters.php:368
+msgid "All feeds"
+msgstr "Все каналы"
 
-#: include/functions.php:5425
-#, php-format
-msgid "Finished: %d articles processed, %d imported, %d feeds created."
+#: include/functions.php:1790
+msgid "Starred articles"
+msgstr "Отмеченные"
+
+#: include/functions.php:1792
+msgid "Published articles"
+msgstr "Опубликованные"
+
+#: include/functions.php:1794
+msgid "Fresh articles"
+msgstr "Свежие"
+
+#: include/functions.php:1796 include/functions.php:1910
+msgid "All articles"
+msgstr "Все статьи"
+
+#: include/functions.php:1798
+msgid "Archived articles"
+msgstr "Архив статей"
+
+#: include/functions.php:1800
+msgid "Recently read"
 msgstr ""
 
-#: include/functions.php:5431 plugins/import_export/init.php:391
-msgid "Could not load XML document."
-msgstr "Не могу загрузить XML документ."
+#: include/functions.php:1867
+msgid "Navigation"
+msgstr "Навигация"
+
+#: include/functions.php:1868
+#, fuzzy
+msgid "Open next feed"
+msgstr "Генерировать канал"
+
+#: include/functions.php:1869
+msgid "Open previous feed"
+msgstr ""
+
+#: include/functions.php:1870
+#, fuzzy
+msgid "Open next article"
+msgstr "Показать оригинальное содержимое статьи"
+
+#: include/functions.php:1871
+#, fuzzy
+msgid "Open previous article"
+msgstr "Показать оригинальное содержимое статьи"
+
+#: include/functions.php:1872
+msgid "Open next article (don't scroll long articles)"
+msgstr ""
+
+#: include/functions.php:1873
+msgid "Open previous article (don't scroll long articles)"
+msgstr ""
+
+#: include/functions.php:1874
+msgid "Show search dialog"
+msgstr "Показать диалог поиска"
+
+#: include/functions.php:1875
+#, fuzzy
+msgid "Article"
+msgstr "Все статьи"
+
+#: include/functions.php:1876
+msgid "Toggle starred"
+msgstr "Изм. отмеченное"
+
+#: include/functions.php:1877
+msgid "Toggle published"
+msgstr "Отметить / снять отметку"
+
+#: include/functions.php:1878
+msgid "Toggle unread"
+msgstr "Прочитано / не прочитано"
+
+#: include/functions.php:1879
+msgid "Edit tags"
+msgstr "Редактировать теги"
+
+#: include/functions.php:1880
+#, fuzzy
+msgid "Dismiss selected"
+msgstr "Скрыть выбранные статьи"
+
+#: include/functions.php:1881
+#, fuzzy
+msgid "Dismiss read"
+msgstr "Опубликовать"
+
+#: include/functions.php:1882
+#, fuzzy
+msgid "Open in new window"
+msgstr "Открыть статью в новом окне"
+
+#: include/functions.php:1883 js/viewfeed.js:1758
+msgid "Mark below as read"
+msgstr "Отметить статьи ниже как прочитанные"
+
+#: include/functions.php:1884 js/viewfeed.js:1752
+msgid "Mark above as read"
+msgstr "Отметить статьи выше как прочитанные"
+
+#: include/functions.php:1885
+#, fuzzy
+msgid "Scroll down"
+msgstr "Всё выполнено."
+
+#: include/functions.php:1886
+msgid "Scroll up"
+msgstr ""
+
+#: include/functions.php:1887
+#, fuzzy
+msgid "Select article under cursor"
+msgstr "Выбрать статью под курсором мыши"
+
+#: include/functions.php:1888
+msgid "Email article"
+msgstr "Отправить по почте"
+
+#: include/functions.php:1889 plugins/close_button/init.php:24
+msgid "Close article"
+msgstr "Закрыть статью"
+
+#: include/functions.php:1891
+#, fuzzy
+msgid "Article selection"
+msgstr "Инвертировать выделение"
+
+#: include/functions.php:1892
+msgid "Select all articles"
+msgstr "Выбрать все статьи"
+
+#: include/functions.php:1893
+#, fuzzy
+msgid "Select unread"
+msgstr "Выбрать непрочитанные статьи"
+
+#: include/functions.php:1894
+#, fuzzy
+msgid "Select starred"
+msgstr "Отметить"
+
+#: include/functions.php:1895
+#, fuzzy
+msgid "Select published"
+msgstr "Выбрать непрочитанные статьи"
+
+#: include/functions.php:1896
+#, fuzzy
+msgid "Invert selection"
+msgstr "Инвертировать выделение"
+
+#: include/functions.php:1897
+#, fuzzy
+msgid "Deselect everything"
+msgstr "Очистить выделение статей"
+
+#: include/functions.php:1898 classes/pref/feeds.php:488
+#: classes/pref/feeds.php:707
+msgid "Feed"
+msgstr "Канал"
+
+#: include/functions.php:1899
+#, fuzzy
+msgid "Refresh current feed"
+msgstr "Обновить активный канал"
+
+#: include/functions.php:1900
+#, fuzzy
+msgid "Un/hide read feeds"
+msgstr "Показать/скрыть прочитанные"
+
+#: include/functions.php:1901 classes/pref/feeds.php:1214
+msgid "Subscribe to feed"
+msgstr "Подписаться на канал"
+
+#: include/functions.php:1902 js/FeedTree.js:135 js/PrefFeedTree.js:67
+msgid "Edit feed"
+msgstr "Редактировать канал"
+
+#: include/functions.php:1904
+#, fuzzy
+msgid "Reverse headlines"
+msgstr "Обратный порядок заголовков"
+
+#: include/functions.php:1905
+#, fuzzy
+msgid "Debug feed update"
+msgstr "Все каналы обновлены."
+
+#: include/functions.php:1906 js/FeedTree.js:170
+msgid "Mark all feeds as read"
+msgstr "Отметить все каналы как прочитанные"
+
+#: include/functions.php:1907
+#, fuzzy
+msgid "Un/collapse current category"
+msgstr "Щёлкните, чтобы развернуть категорию"
+
+#: include/functions.php:1908
+#, fuzzy
+msgid "Toggle combined mode"
+msgstr "Переключить изменение режима категории"
+
+#: include/functions.php:1909
+#, fuzzy
+msgid "Go to"
+msgstr "Перейти к.."
+
+#: include/functions.php:1911
+#, fuzzy
+msgid "Fresh"
+msgstr "Обновить"
+
+#: include/functions.php:1914
+msgid "Tag cloud"
+msgstr "Облако тегов"
+
+#: include/functions.php:1916
+#, fuzzy
+msgid "Other"
+msgstr "Другой:"
+
+#: include/functions.php:1917 classes/pref/labels.php:281
+msgid "Create label"
+msgstr "Создать метку"
+
+#: include/functions.php:1918 classes/pref/filters.php:587
+msgid "Create filter"
+msgstr "Создать фильтр"
+
+#: include/functions.php:1919
+#, fuzzy
+msgid "Un/collapse sidebar"
+msgstr "Развернуть боковую панель"
+
+#: include/functions.php:1920
+#, fuzzy
+msgid "Show help dialog"
+msgstr "Показать диалог поиска"
+
+#: include/functions.php:2400
+#, fuzzy, php-format
+msgid "Search results: %s"
+msgstr "Результаты поиска"
+
+#: include/functions.php:2824 js/viewfeed.js:1845
+msgid "Click to play"
+msgstr "Щёлкните для проигрывания"
+
+#: include/functions.php:2825 js/viewfeed.js:1844
+msgid "Play"
+msgstr "Играть"
+
+#: include/functions.php:2945
+msgid " - "
+msgstr " - "
+
+#: include/functions.php:2967 include/functions.php:3284 classes/rpc.php:359
+msgid "no tags"
+msgstr "нет тегов"
+
+#: include/functions.php:2977 classes/feeds.php:645
+msgid "Edit tags for this article"
+msgstr "Редактировать теги статьи"
+
+#: include/functions.php:3006 classes/feeds.php:600
+msgid "Originally from:"
+msgstr "Оригинал:"
+
+#: include/functions.php:3019 classes/feeds.php:613 classes/pref/feeds.php:507
+#, fuzzy
+msgid "Feed URL"
+msgstr "Канал"
+
+#: include/functions.php:3048
+msgid "Related"
+msgstr ""
+
+#: include/functions.php:3075 classes/dlg.php:43 classes/dlg.php:162
+#: classes/dlg.php:185 classes/dlg.php:222 classes/dlg.php:508
+#: classes/dlg.php:543 classes/dlg.php:574 classes/dlg.php:608
+#: classes/dlg.php:620 classes/backend.php:105 classes/pref/users.php:106
+#: classes/pref/filters.php:108 classes/pref/feeds.php:1527
+#: classes/pref/feeds.php:1598 plugins/import_export/init.php:407
+#: plugins/import_export/init.php:431 plugins/share/init.php:67
+#: plugins/updater/init.php:329
+msgid "Close this window"
+msgstr "Закрыть это окно"
+
+#: include/functions.php:3309
+#, fuzzy
+msgid "(edit note)"
+msgstr "править заметку"
+
+#: include/functions.php:3542
+msgid "unknown type"
+msgstr "неизвестный тип"
+
+#: include/functions.php:3592
+#, fuzzy
+msgid "Attachments"
+msgstr "Вложения:"
 
 #: include/localized_schema.php:4
 msgid "Title or Content"
@@ -967,9 +940,8 @@ msgstr "Удалить статью"
 msgid "Set starred"
 msgstr "Отметить"
 
-#: include/localized_schema.php:12 js/viewfeed.js:501 js/viewfeed.js:490
-#: js/viewfeed.js:496 js/viewfeed.js:478 plugins/digest/digest.js:264
-#: plugins/digest/digest.js:736
+#: include/localized_schema.php:12 js/viewfeed.js:478
+#: plugins/digest/digest.js:264 plugins/digest/digest.js:736
 msgid "Publish article"
 msgstr "Опубликовать"
 
@@ -977,8 +949,7 @@ msgstr "Опубликовать"
 msgid "Assign tags"
 msgstr "Применить теги"
 
-#: include/localized_schema.php:14 js/viewfeed.js:1962 js/viewfeed.js:1935
-#: js/viewfeed.js:1799 js/viewfeed.js:1809
+#: include/localized_schema.php:14 js/viewfeed.js:1809
 msgid "Assign label"
 msgstr "Применить метку"
 
@@ -1124,10 +1095,6 @@ msgstr "Показывать следующий канал при отметке
 msgid "Sort feeds by unread articles count"
 msgstr "Сортировать каналы по количеству непрочитанных статей"
 
-#: include/localized_schema.php:45
-msgid "Reverse headline order (oldest first)"
-msgstr "Обратный порядок заголовков (старые впереди)"
-
 #: include/localized_schema.php:46
 msgid "Enable e-mail digest"
 msgstr "Включить почтовый дайджест"
@@ -1173,7 +1140,8 @@ msgid "Group headlines in virtual feeds"
 msgstr "Группировать заголовки в виртуальные каналы"
 
 #: include/localized_schema.php:57
-msgid "Do not show images in articles"
+#, fuzzy
+msgid "Hide images in articles"
 msgstr "Не показывать изображения в статьях"
 
 #: include/localized_schema.php:58
@@ -1184,8 +1152,7 @@ msgstr ""
 msgid "User timezone"
 msgstr "Часовой пояс"
 
-#: include/localized_schema.php:60 js/prefs.js:1856 js/prefs.js:1743
-#: js/prefs.js:1733
+#: include/localized_schema.php:60 js/prefs.js:1733
 msgid "Customize stylesheet"
 msgstr "Изменить пользовательские стили"
 
@@ -1206,7 +1173,7 @@ msgstr ""
 msgid "Assign articles to labels automatically"
 msgstr "Отмечать статьи как прочитанные автоматически"
 
-#: include/login_form.php:185 classes/handler/public.php:485
+#: include/login_form.php:185 classes/handler/public.php:459
 msgid "Language:"
 msgstr "Язык:"
 
@@ -1214,8 +1181,8 @@ msgstr "Язык:"
 msgid "Profile:"
 msgstr "Профиль:"
 
-#: include/login_form.php:197 classes/handler/public.php:208
-#: classes/rpc.php:147 classes/dlg.php:116
+#: include/login_form.php:197 classes/handler/public.php:212
+#: classes/rpc.php:64 classes/dlg.php:98
 msgid "Default profile"
 msgstr "Профиль по умолчанию"
 
@@ -1227,118 +1194,100 @@ msgstr "Использовать меньше трафика"
 msgid "Article not found."
 msgstr "Статья не найдена"
 
-#: classes/handler/public.php:420 classes/pref/feeds.php:1480
+#: classes/handler/public.php:394 plugins/bookmarklets/init.php:38
 #, fuzzy
 msgid "Share with Tiny Tiny RSS"
 msgstr "Вернуться к Tiny Tiny RSS"
 
-#: classes/handler/public.php:428
+#: classes/handler/public.php:402
 msgid "Title:"
 msgstr "Заголовок:"
 
-#: classes/handler/public.php:430 classes/dlg.php:667
-#: classes/pref/feeds.php:509 classes/pref/feeds.php:762
-#: plugins/instances/instances.php:100 plugins/instances/init.php:215
+#: classes/handler/public.php:404 classes/dlg.php:667
+#: classes/pref/feeds.php:505 classes/pref/feeds.php:722
+#: plugins/instances/init.php:215
 msgid "URL:"
 msgstr "URL:"
 
-#: classes/handler/public.php:432
+#: classes/handler/public.php:406
 #, fuzzy
 msgid "Content:"
 msgstr "Содержимое"
 
-#: classes/handler/public.php:434
+#: classes/handler/public.php:408
 #, fuzzy
 msgid "Labels:"
 msgstr "Метки"
 
-#: classes/handler/public.php:453
+#: classes/handler/public.php:427
 msgid "Shared article will appear in the Published feed."
 msgstr ""
 
-#: classes/handler/public.php:455
+#: classes/handler/public.php:429
 msgid "Share"
 msgstr ""
 
-#: classes/handler/public.php:456 classes/handler/public.php:498
-#: classes/dlg.php:315 classes/dlg.php:366 classes/dlg.php:426
-#: classes/dlg.php:457 classes/dlg.php:652 classes/dlg.php:702
-#: classes/dlg.php:774 classes/pref/users.php:194 classes/pref/labels.php:81
-#: classes/pref/filters.php:342 classes/pref/filters.php:722
-#: classes/pref/filters.php:791 classes/pref/filters.php:858
-#: classes/pref/feeds.php:729 classes/pref/feeds.php:880
-#: plugins/mail/mail.php:126 plugins/note/note.php:49
-#: plugins/instances/instances.php:136
+#: classes/handler/public.php:430 classes/handler/public.php:472
+#: classes/dlg.php:297 classes/dlg.php:350 classes/dlg.php:410
+#: classes/dlg.php:441 classes/dlg.php:652 classes/dlg.php:702
+#: classes/dlg.php:751 classes/pref/users.php:194 classes/pref/labels.php:81
+#: classes/pref/filters.php:349 classes/pref/filters.php:729
+#: classes/pref/filters.php:798 classes/pref/filters.php:865
+#: classes/pref/feeds.php:689 classes/pref/feeds.php:829
+#: plugins/mail/init.php:132 plugins/note/init.php:55
+#: plugins/instances/init.php:251
 msgid "Cancel"
 msgstr "Отмена"
 
-#: classes/handler/public.php:477
+#: classes/handler/public.php:451
 #, fuzzy
 msgid "Not logged in"
 msgstr "Последний вход"
 
-#: classes/handler/public.php:537
+#: classes/handler/public.php:511
 msgid "Incorrect username or password"
 msgstr "Некорректное имя пользователя или пароль"
 
-#: classes/handler/public.php:573 classes/handler/public.php:670
+#: classes/handler/public.php:547 classes/handler/public.php:644
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "Канал <b>%s</b> уже подписан."
 
-#: classes/handler/public.php:576 classes/handler/public.php:661
+#: classes/handler/public.php:550 classes/handler/public.php:635
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "Добавлена подписка на <b>%s</b>."
 
-#: classes/handler/public.php:579 classes/handler/public.php:664
+#: classes/handler/public.php:553 classes/handler/public.php:638
 #, fuzzy, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "Канал <b>%s</b> уже подписан."
 
-#: classes/handler/public.php:582 classes/handler/public.php:667
+#: classes/handler/public.php:556 classes/handler/public.php:641
 #, fuzzy, php-format
 msgid "No feeds found in <b>%s</b>."
 msgstr "Каналы не найдены."
 
-#: classes/handler/public.php:585 classes/handler/public.php:673
+#: classes/handler/public.php:559 classes/handler/public.php:647
 #, fuzzy
 msgid "Multiple feed URLs found."
 msgstr "Опубликованный URL канала изменён."
 
-#: classes/handler/public.php:589 classes/handler/public.php:678
+#: classes/handler/public.php:563 classes/handler/public.php:652
 #, fuzzy, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr "Канал <b>%s</b> уже подписан."
 
-#: classes/handler/public.php:607 classes/handler/public.php:696
+#: classes/handler/public.php:581 classes/handler/public.php:670
 #, fuzzy
 msgid "Subscribe to selected feed"
 msgstr "Отписаться от выбранных каналов?"
 
-#: classes/handler/public.php:632 classes/handler/public.php:720
+#: classes/handler/public.php:606 classes/handler/public.php:694
 msgid "Edit subscription options"
 msgstr "Редактировать опции  подписки"
 
-#: classes/auth/internal.php:45 plugins/auth_internal/init.php:62
-#, fuzzy
-msgid "Please enter your one time password:"
-msgstr "Пожалуйста, укажите заметку для статьи:"
-
-#: classes/auth/internal.php:168 plugins/auth_internal/init.php:185
-msgid "Password has been changed."
-msgstr "Пароль был изменен."
-
-#: classes/auth/internal.php:170
-msgid "Old password is incorrect."
-msgstr "Старый пароль неправилен."
-
-#: classes/dlg.php:26
-#, fuzzy
-msgid "Prepare data"
-msgstr "Сохранить"
-
-#: classes/dlg.php:40
+#: classes/dlg.php:22
 msgid ""
 "If you have imported labels and/or filters, you might need to reload "
 "preferences to see your new data."
@@ -1346,67 +1295,67 @@ msgstr ""
 "Если вы импортировали метки или фильтры, вам возможно придется перезагрузить "
 "настройки чтобы увидеть новые данные."
 
-#: classes/dlg.php:73 classes/pref/users.php:378 classes/pref/labels.php:272
-#: classes/pref/filters.php:223 classes/pref/filters.php:270
-#: classes/pref/filters.php:571 classes/pref/filters.php:650
-#: classes/pref/filters.php:677 classes/pref/feeds.php:1274
-#: classes/pref/feeds.php:1583 classes/pref/feeds.php:1652
-#: plugins/instances/instances.php:172
+#: classes/dlg.php:55 classes/pref/users.php:378 classes/pref/labels.php:272
+#: classes/pref/filters.php:230 classes/pref/filters.php:277
+#: classes/pref/filters.php:578 classes/pref/filters.php:657
+#: classes/pref/filters.php:684 classes/pref/feeds.php:1202
+#: classes/pref/feeds.php:1472 classes/pref/feeds.php:1541
+#: plugins/instances/init.php:287
 msgid "Select"
 msgstr "Выбрать"
 
-#: classes/dlg.php:76 classes/feeds.php:92 classes/pref/users.php:381
-#: classes/pref/labels.php:275 classes/pref/filters.php:226
-#: classes/pref/filters.php:273 classes/pref/filters.php:574
-#: classes/pref/filters.php:653 classes/pref/filters.php:680
-#: classes/pref/feeds.php:1277 classes/pref/feeds.php:1586
-#: classes/pref/feeds.php:1655 plugins/instances/instances.php:175
+#: classes/dlg.php:58 classes/feeds.php:92 classes/pref/users.php:381
+#: classes/pref/labels.php:275 classes/pref/filters.php:233
+#: classes/pref/filters.php:280 classes/pref/filters.php:581
+#: classes/pref/filters.php:660 classes/pref/filters.php:687
+#: classes/pref/feeds.php:1205 classes/pref/feeds.php:1475
+#: classes/pref/feeds.php:1544 plugins/instances/init.php:290
 msgid "All"
 msgstr "Все"
 
-#: classes/dlg.php:78 classes/feeds.php:95 classes/pref/users.php:383
-#: classes/pref/labels.php:277 classes/pref/filters.php:228
-#: classes/pref/filters.php:275 classes/pref/filters.php:576
-#: classes/pref/filters.php:655 classes/pref/filters.php:682
-#: classes/pref/feeds.php:1279 classes/pref/feeds.php:1588
-#: classes/pref/feeds.php:1657 plugins/instances/instances.php:177
+#: classes/dlg.php:60 classes/feeds.php:95 classes/pref/users.php:383
+#: classes/pref/labels.php:277 classes/pref/filters.php:235
+#: classes/pref/filters.php:282 classes/pref/filters.php:583
+#: classes/pref/filters.php:662 classes/pref/filters.php:689
+#: classes/pref/feeds.php:1207 classes/pref/feeds.php:1477
+#: classes/pref/feeds.php:1546 plugins/instances/init.php:292
 msgid "None"
 msgstr "Ничего"
 
-#: classes/dlg.php:87
+#: classes/dlg.php:69
 msgid "Create profile"
 msgstr "Создать профиль"
 
-#: classes/dlg.php:110 classes/dlg.php:140
+#: classes/dlg.php:92 classes/dlg.php:122
 #, fuzzy
 msgid "(active)"
 msgstr "Адаптивно"
 
-#: classes/dlg.php:174
+#: classes/dlg.php:156
 msgid "Remove selected profiles"
 msgstr "Удалить выбранные профили?"
 
-#: classes/dlg.php:176
+#: classes/dlg.php:158
 msgid "Activate profile"
 msgstr "Активировать профиль"
 
-#: classes/dlg.php:186
+#: classes/dlg.php:168
 msgid "Public OPML URL"
 msgstr "Публичная ссылка на OPML"
 
-#: classes/dlg.php:191
+#: classes/dlg.php:173
 msgid "Your Public OPML URL is:"
 msgstr "Ссылка на ваш опубликованный OPML:"
 
-#: classes/dlg.php:200 classes/dlg.php:587
+#: classes/dlg.php:182 classes/dlg.php:571
 msgid "Generate new URL"
 msgstr "Создать новую ссылку"
 
-#: classes/dlg.php:212
+#: classes/dlg.php:194
 msgid "Notice"
 msgstr "Сообщение"
 
-#: classes/dlg.php:218
+#: classes/dlg.php:200
 msgid ""
 "Update daemon is enabled in configuration, but daemon process is not "
 "running, which prevents all feeds from updating. Please start the daemon "
@@ -1416,11 +1365,11 @@ msgstr ""
 "запущен. Он необходим для обновления всех каналов.\n"
 "Пожалуйста, запустите демон обновлений или сообщите администратору."
 
-#: classes/dlg.php:222 classes/dlg.php:231
+#: classes/dlg.php:204 classes/dlg.php:213
 msgid "Last update:"
 msgstr "Последнее обновление:"
 
-#: classes/dlg.php:227
+#: classes/dlg.php:209
 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 "
@@ -1430,156 +1379,159 @@ msgstr ""
 "Это обозначает что существует проблема подобная краху или зависанию демона.\n"
 "Пожалуйста проверьте процесс демона или сообщите администратору."
 
-#: classes/dlg.php:252 classes/dlg.php:261
+#: classes/dlg.php:234 classes/dlg.php:243
 #, fuzzy
 msgid "Feed or site URL"
 msgstr "Канал"
 
-#: classes/dlg.php:267 classes/dlg.php:738 classes/pref/feeds.php:531
-#: classes/pref/feeds.php:775
+#: classes/dlg.php:249 classes/dlg.php:715 classes/pref/feeds.php:527
+#: classes/pref/feeds.php:735
 msgid "Place in category:"
 msgstr "Поместить в категорию:"
 
-#: classes/dlg.php:275
+#: classes/dlg.php:257
 msgid "Available feeds"
 msgstr "Доступные каналы"
 
-#: classes/dlg.php:287 classes/pref/users.php:155 classes/pref/feeds.php:561
-#: classes/pref/feeds.php:811
+#: classes/dlg.php:269 classes/pref/users.php:155 classes/pref/feeds.php:557
+#: classes/pref/feeds.php:771
 msgid "Authentication"
 msgstr "Авторизация"
 
-#: classes/dlg.php:291 classes/dlg.php:752 classes/pref/users.php:438
-#: classes/pref/feeds.php:567 classes/pref/feeds.php:815
+#: classes/dlg.php:273 classes/dlg.php:729 classes/pref/users.php:438
+#: classes/pref/feeds.php:563 classes/pref/feeds.php:775
 msgid "Login"
 msgstr "Пользователь:"
 
-#: classes/dlg.php:294 classes/dlg.php:755 classes/pref/prefs.php:200
-#: classes/pref/feeds.php:573 classes/pref/feeds.php:821
+#: classes/dlg.php:276 classes/dlg.php:732 classes/pref/prefs.php:196
+#: classes/pref/feeds.php:569 classes/pref/feeds.php:781
 msgid "Password"
 msgstr "Пароль"
 
-#: classes/dlg.php:304
+#: classes/dlg.php:286
 msgid "This feed requires authentication."
 msgstr "Этот канал требует авторизации."
 
-#: classes/dlg.php:309 classes/dlg.php:364 classes/dlg.php:773
+#: classes/dlg.php:291 classes/dlg.php:348 classes/dlg.php:750
 msgid "Subscribe"
 msgstr "Подписаться"
 
-#: classes/dlg.php:312
+#: classes/dlg.php:294
 msgid "More feeds"
 msgstr "Другие каналы"
 
-#: classes/dlg.php:336 classes/dlg.php:425 classes/pref/users.php:368
-#: classes/pref/filters.php:567 classes/pref/feeds.php:1270 js/tt-rss.js:234
-#: js/tt-rss.js:187 js/tt-rss.js:166
+#: classes/dlg.php:318 classes/dlg.php:409 classes/pref/users.php:368
+#: classes/pref/filters.php:574 classes/pref/feeds.php:1198 js/tt-rss.js:166
 msgid "Search"
 msgstr "Поиск"
 
-#: classes/dlg.php:340
+#: classes/dlg.php:322
 #, fuzzy
 msgid "Popular feeds"
 msgstr "показать каналы"
 
-#: classes/dlg.php:341
+#: classes/dlg.php:323
 #, fuzzy
 msgid "Feed archive"
 msgstr "Действия над каналом:"
 
-#: classes/dlg.php:344
+#: classes/dlg.php:326
 #, fuzzy
 msgid "limit:"
 msgstr "Сколько:"
 
-#: classes/dlg.php:365 classes/pref/users.php:394 classes/pref/labels.php:284
-#: classes/pref/filters.php:332 classes/pref/filters.php:589
-#: classes/pref/feeds.php:702 plugins/instances/instances.php:182
+#: classes/dlg.php:349 classes/pref/users.php:394 classes/pref/labels.php:284
+#: classes/pref/filters.php:339 classes/pref/filters.php:596
+#: classes/pref/feeds.php:662 plugins/instances/init.php:297
 msgid "Remove"
 msgstr "Удалить"
 
-#: classes/dlg.php:376
+#: classes/dlg.php:360
 msgid "Look for"
 msgstr ""
 
-#: classes/dlg.php:384
+#: classes/dlg.php:368
 msgid "Limit search to:"
 msgstr "Ограничить поиск:"
 
-#: classes/dlg.php:400
+#: classes/dlg.php:384
 msgid "This feed"
 msgstr "Этот канал"
 
-#: classes/dlg.php:432
+#: classes/dlg.php:416
 msgid "Tags for this article (separated by commas):"
 msgstr "Теги для этой статьи (разделенные запятыми):"
 
-#: classes/dlg.php:455 classes/dlg.php:650 classes/pref/users.php:192
-#: classes/pref/labels.php:79 classes/pref/filters.php:339
-#: classes/pref/feeds.php:728 classes/pref/feeds.php:877
-#: plugins/note/note.php:47 plugins/instances/instances.php:133
-#: plugins/nsfw/init.php:86 plugins/owncloud/init.php:62
+#: classes/dlg.php:439 classes/dlg.php:650 classes/pref/users.php:192
+#: classes/pref/labels.php:79 classes/pref/filters.php:346
+#: classes/pref/feeds.php:688 classes/pref/feeds.php:826
+#: plugins/nsfw/init.php:86 plugins/note/init.php:53
+#: plugins/owncloud/init.php:62 plugins/instances/init.php:248
 msgid "Save"
 msgstr "Сохранить"
 
-#: classes/dlg.php:463
+#: classes/dlg.php:447
 #, fuzzy
 msgid "Tag Cloud"
 msgstr "Облако тегов"
 
-#: classes/dlg.php:532
+#: classes/dlg.php:516
 msgid "Select item(s) by tags"
 msgstr ""
 
-#: classes/dlg.php:535
+#: classes/dlg.php:519
 msgid "Match:"
 msgstr "Поиск:"
 
-#: classes/dlg.php:537
+#: classes/dlg.php:521
 msgid "Any"
 msgstr ""
 
-#: classes/dlg.php:540
+#: classes/dlg.php:524
 #, fuzzy
 msgid "All tags."
 msgstr "нет тегов"
 
-#: classes/dlg.php:542
+#: classes/dlg.php:526
 msgid "Which Tags?"
 msgstr ""
 
-#: classes/dlg.php:555
+#: classes/dlg.php:539
 #, fuzzy
 msgid "Display entries"
 msgstr "показать каналы"
 
-#: classes/dlg.php:567 classes/feeds.php:129
+#: classes/dlg.php:551 classes/feeds.php:133
 msgid "View as RSS"
 msgstr "Показать в формате RSS"
 
-#: classes/dlg.php:578
+#: classes/dlg.php:562
 msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 
-#: classes/dlg.php:606 plugins/updater/updater.php:276
+#: classes/dlg.php:591 plugins/updater/init.php:303
 #, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "Доступна новая версия Tiny Tiny RSS (%s)."
 
-#: classes/dlg.php:614
+#: classes/dlg.php:599
 msgid ""
 "You can update using built-in updater in the Preferences or by using update."
 "php"
 msgstr ""
 
-#: classes/dlg.php:618 classes/pref/users.php:390
+#: classes/dlg.php:603 classes/pref/users.php:390
 msgid "Details"
 msgstr "Подробнее"
 
-#: classes/dlg.php:620
+#: classes/dlg.php:605
 msgid "Download"
 msgstr "Скачать"
 
+#: classes/dlg.php:613
+msgid "Error receiving version information or no new version available."
+msgstr ""
+
 #: classes/dlg.php:634
 #, php-format
 msgid ""
@@ -1588,34 +1540,31 @@ msgid ""
 "\" href=\"%s\">This file</a> can be used as a baseline."
 msgstr ""
 
-#: classes/dlg.php:661 plugins/instances/instances.php:92
-#: plugins/instances/init.php:207
+#: classes/dlg.php:661 plugins/instances/init.php:207
 msgid "Instance"
 msgstr "Инсталляция"
 
-#: classes/dlg.php:670 plugins/instances/instances.php:103
-#: plugins/instances/instances.php:200 plugins/instances/init.php:218
+#: classes/dlg.php:670 plugins/instances/init.php:218
+#: plugins/instances/init.php:315
 msgid "Instance URL"
 msgstr "URL инсталляции"
 
-#: classes/dlg.php:680 plugins/instances/instances.php:114
-#: plugins/instances/init.php:229
+#: classes/dlg.php:680 plugins/instances/init.php:229
 #, fuzzy
 msgid "Access key:"
 msgstr "Уровень доступа:"
 
-#: classes/dlg.php:683 plugins/instances/instances.php:117
-#: plugins/instances/instances.php:201 plugins/instances/init.php:232
+#: classes/dlg.php:683 plugins/instances/init.php:232
+#: plugins/instances/init.php:316
 #, fuzzy
 msgid "Access key"
 msgstr "Уровень доступа:"
 
-#: classes/dlg.php:687 plugins/instances/instances.php:121
-#: plugins/instances/init.php:236
+#: classes/dlg.php:687 plugins/instances/init.php:236
 msgid "Use one access key for both linked instances."
 msgstr "Используйте один ключ доступа для обоих инсталляций"
 
-#: classes/dlg.php:695 plugins/instances/instances.php:129
+#: classes/dlg.php:695 plugins/instances/init.php:244
 #, fuzzy
 msgid "Generate new key"
 msgstr "Генерировать канал"
@@ -1624,26 +1573,23 @@ msgstr "Генерировать канал"
 msgid "Create link"
 msgstr "Создать ссылку"
 
-#: classes/dlg.php:717
-#, php-format
-msgid ""
-"Could not upload file. You might need to adjust upload_max_filesize\n"
-"\t\t\t\tin PHP.ini (current value = %s)"
-msgstr ""
-
-#: classes/dlg.php:735
+#: classes/dlg.php:712
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr ""
 
-#: classes/dlg.php:744
+#: classes/dlg.php:721
 msgid "Feeds to subscribe, One per line"
 msgstr ""
 
-#: classes/dlg.php:766
+#: classes/dlg.php:743
 #, fuzzy
 msgid "Feeds require authentication."
 msgstr "Этот канал требует авторизации."
 
+#: classes/feeds.php:68
+msgid "Visit the website"
+msgstr "Посетить официальный сайт"
+
 #: classes/feeds.php:83
 msgid "View as RSS feed"
 msgstr "Показать в формате RSS"
@@ -1656,6 +1602,11 @@ msgstr "Выбрать:"
 msgid "Invert"
 msgstr "Инвертировать"
 
+#: classes/feeds.php:101
+#, fuzzy
+msgid "More..."
+msgstr "Идет загрузка помощи..."
+
 #: classes/feeds.php:103
 msgid "Selection toggle:"
 msgstr "Переключить выбранное:"
@@ -1677,41 +1628,41 @@ msgstr "Архивировать"
 msgid "Move back"
 msgstr "Переместить назад"
 
-#: classes/feeds.php:118 classes/pref/filters.php:235
-#: classes/pref/filters.php:282 classes/pref/filters.php:662
-#: classes/pref/filters.php:689
+#: classes/feeds.php:118 classes/pref/filters.php:242
+#: classes/pref/filters.php:289 classes/pref/filters.php:669
+#: classes/pref/filters.php:696
 msgid "Delete"
 msgstr "Удалить"
 
-#: classes/feeds.php:122 plugins/mail/mail.php:22
+#: classes/feeds.php:125 plugins/mail/init.php:28
 msgid "Forward by email"
 msgstr "Отправить по почте"
 
-#: classes/feeds.php:125
+#: classes/feeds.php:129
 msgid "Feed:"
 msgstr "Канал:"
 
-#: classes/feeds.php:190 classes/feeds.php:844
+#: classes/feeds.php:196 classes/feeds.php:790
 msgid "Feed not found."
 msgstr "Канал не найден."
 
-#: classes/feeds.php:434 classes/feeds.php:516
+#: classes/feeds.php:403 classes/feeds.php:493
 msgid "mark as read"
 msgstr "Отметить как прочитанные"
 
-#: classes/feeds.php:739
+#: classes/feeds.php:691
 msgid "No unread articles found to display."
 msgstr "Не найдено не прочитанных статей"
 
-#: classes/feeds.php:742
+#: classes/feeds.php:694
 msgid "No updated articles found to display."
 msgstr "Не найдено не прочитанных статей."
 
-#: classes/feeds.php:745
+#: classes/feeds.php:697
 msgid "No starred articles found to display."
 msgstr "Не найдено отмеченных статей"
 
-#: classes/feeds.php:749
+#: classes/feeds.php:701
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
@@ -1719,11 +1670,40 @@ msgstr ""
 "Нет статей для показа. Вы можете присвоить метку вручную (смотрите выше меню "
 "Действия) или используйте фильтр."
 
-#: classes/feeds.php:751
+#: classes/feeds.php:703
 msgid "No articles found to display."
 msgstr "Статей не найдено."
 
-#: classes/backend.php:26
+#: classes/feeds.php:718 classes/feeds.php:899
+#, php-format
+msgid "Feeds last updated at %s"
+msgstr "Последнее обновление в %s"
+
+#: classes/feeds.php:728 classes/feeds.php:909
+msgid "Some feeds have update errors (click for details)"
+msgstr "Некоторые каналы не могут быть обновлены (щёлкните для подробностей)"
+
+#: classes/feeds.php:889
+msgid "No feed selected."
+msgstr "Канал не выбран."
+
+#: classes/backend.php:34
+msgid "Keyboard Shortcuts"
+msgstr "Горячие Клавиши"
+
+#: classes/backend.php:57
+msgid "Shift"
+msgstr ""
+
+#: classes/backend.php:60
+msgid "Ctrl"
+msgstr ""
+
+#: classes/backend.php:84
+msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
+msgstr ""
+
+#: classes/backend.php:99
 msgid "Help topic not found."
 msgstr "Раздел помощи не найден."
 
@@ -1774,16 +1754,15 @@ msgstr "Добавляю фильтр %s"
 msgid "Processing category: %s"
 msgstr "Поместить в категорию:"
 
-#: classes/opml.php:467
+#: classes/opml.php:468
 msgid "Error: please upload OPML file."
 msgstr "Ошибка: пожалуйста загрузите OPML файл."
 
-#: classes/opml.php:474
+#: classes/opml.php:475
 msgid "Error while parsing document."
 msgstr "Ошибка при разборе документа."
 
-#: classes/pref/users.php:6 plugins/instances/instances.php:42
-#: plugins/instances/init.php:157
+#: classes/pref/users.php:6 plugins/instances/init.php:157
 msgid "Your access level is insufficient to open this tab."
 msgstr "Вашего уровня доступа недостаточно для открытия этой вкладки."
 
@@ -1823,8 +1802,8 @@ msgstr "Уровень доступа:"
 msgid "Change password to"
 msgstr "Изменить пароль на"
 
-#: classes/pref/users.php:177 classes/pref/feeds.php:581
-#: classes/pref/feeds.php:827
+#: classes/pref/users.php:177 classes/pref/feeds.php:577
+#: classes/pref/feeds.php:787
 msgid "Options"
 msgstr "Опции:"
 
@@ -1863,8 +1842,12 @@ msgstr "Уведомление <b>%s</b>."
 msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] Уведомление о смене пароля"
 
-#: classes/pref/users.php:392 classes/pref/filters.php:586
-#: plugins/instances/instances.php:181
+#: classes/pref/users.php:386
+msgid "Create user"
+msgstr "Добавить пользователя"
+
+#: classes/pref/users.php:392 classes/pref/filters.php:593
+#: plugins/instances/init.php:296
 msgid "Edit"
 msgstr "Редактировать"
 
@@ -1880,15 +1863,15 @@ msgstr "Уровень доступа:"
 msgid "Last login"
 msgstr "Последний вход"
 
-#: classes/pref/users.php:461 plugins/instances/instances.php:222
+#: classes/pref/users.php:462 plugins/instances/init.php:337
 msgid "Click to edit"
 msgstr "Щёлкните для редактирования"
 
-#: classes/pref/users.php:481
+#: classes/pref/users.php:482
 msgid "No users defined."
 msgstr "Пользователи не определены."
 
-#: classes/pref/users.php:483
+#: classes/pref/users.php:484
 msgid "No matching users found."
 msgstr "Подходящих пользователей не найдено."
 
@@ -1927,86 +1910,90 @@ msgstr "Не найдено совпадений с фильтром."
 msgid "No recent articles matching this filter have been found."
 msgstr "Не найдено совпадений с фильтром."
 
-#: classes/pref/filters.php:218 classes/pref/filters.php:645
-#: classes/pref/filters.php:760
+#: classes/pref/filters.php:98
+msgid ""
+"Complex expressions might not give results while testing due to issues with "
+"database server regexp implementation."
+msgstr ""
+
+#: classes/pref/filters.php:225 classes/pref/filters.php:652
+#: classes/pref/filters.php:767
 msgid "Match"
 msgstr "Искать"
 
-#: classes/pref/filters.php:232 classes/pref/filters.php:279
-#: classes/pref/filters.php:659 classes/pref/filters.php:686
+#: classes/pref/filters.php:239 classes/pref/filters.php:286
+#: classes/pref/filters.php:666 classes/pref/filters.php:693
 msgid "Add"
 msgstr "Добавить"
 
-#: classes/pref/filters.php:265 classes/pref/filters.php:672
+#: classes/pref/filters.php:272 classes/pref/filters.php:679
 #, fuzzy
 msgid "Apply actions"
 msgstr "Действия над каналом"
 
-#: classes/pref/filters.php:315 classes/pref/filters.php:701
+#: classes/pref/filters.php:322 classes/pref/filters.php:708
 msgid "Enabled"
 msgstr "Включен"
 
-#: classes/pref/filters.php:324 classes/pref/filters.php:704
+#: classes/pref/filters.php:331 classes/pref/filters.php:711
 #, fuzzy
 msgid "Match any rule"
 msgstr "Соответствие:"
 
-#: classes/pref/filters.php:336 classes/pref/filters.php:716
+#: classes/pref/filters.php:343 classes/pref/filters.php:723
 msgid "Test"
 msgstr "Проверить"
 
-#: classes/pref/filters.php:368
+#: classes/pref/filters.php:375
 #, php-format
 msgid "%s on %s in %s"
 msgstr ""
 
-#: classes/pref/filters.php:583
+#: classes/pref/filters.php:590
 msgid "Combine"
 msgstr ""
 
-#: classes/pref/filters.php:593 classes/pref/feeds.php:1329
+#: classes/pref/filters.php:600 classes/pref/feeds.php:1257
 msgid "Rescore articles"
 msgstr "Заново оценить статьи"
 
-#: classes/pref/filters.php:719
+#: classes/pref/filters.php:726
 msgid "Create"
 msgstr "Создать"
 
-#: classes/pref/filters.php:769
+#: classes/pref/filters.php:776
 msgid "on field"
 msgstr "по полю:"
 
-#: classes/pref/filters.php:775 js/PrefFilterTree.js:29
+#: classes/pref/filters.php:782 js/PrefFilterTree.js:29
 #: plugins/digest/digest.js:241
 msgid "in"
 msgstr "в"
 
-#: classes/pref/filters.php:788
+#: classes/pref/filters.php:795
 #, fuzzy
 msgid "Save rule"
 msgstr "Сохранить"
 
-#: classes/pref/filters.php:788 js/functions.js:1067 js/functions.js:1063
-#: js/functions.js:1071 js/functions.js:1073
+#: classes/pref/filters.php:795 js/functions.js:1078
 #, fuzzy
 msgid "Add rule"
 msgstr "Добавить метку..."
 
-#: classes/pref/filters.php:811
+#: classes/pref/filters.php:818
 msgid "Perform Action"
 msgstr "Выполнить действия"
 
-#: classes/pref/filters.php:837
+#: classes/pref/filters.php:844
 msgid "with parameters:"
 msgstr "с параметрами:"
 
-#: classes/pref/filters.php:855
+#: classes/pref/filters.php:862
 #, fuzzy
 msgid "Save action"
 msgstr "Действия над каналами"
 
-#: classes/pref/filters.php:855 js/functions.js:1093 js/functions.js:1089
-#: js/functions.js:1097 js/functions.js:1099
+#: classes/pref/filters.php:862 js/functions.js:1104
 #, fuzzy
 msgid "Add action"
 msgstr "Действия над каналом"
@@ -2027,147 +2014,182 @@ msgstr "Пароли не совпадают."
 msgid "Function not supported by authentication module."
 msgstr ""
 
-#: classes/pref/prefs.php:68
+#: classes/pref/prefs.php:63
 msgid "The configuration was saved."
 msgstr "Конфигурация сохранена."
 
-#: classes/pref/prefs.php:83
+#: classes/pref/prefs.php:77
 #, php-format
 msgid "Unknown option: %s"
 msgstr "Неизвестная опция: %s"
 
-#: classes/pref/prefs.php:97
+#: classes/pref/prefs.php:91
 #, fuzzy
 msgid "Your personal data has been saved."
 msgstr "Пароль был изменен."
 
-#: classes/pref/prefs.php:137
+#: classes/pref/prefs.php:131
 #, fuzzy
 msgid "Personal data / Authentication"
 msgstr "Авторизация"
 
-#: classes/pref/prefs.php:157
+#: classes/pref/prefs.php:151
 msgid "Personal data"
 msgstr "Личные данные"
 
-#: classes/pref/prefs.php:167
+#: classes/pref/prefs.php:161
 msgid "Full name"
 msgstr "Полное имя"
 
-#: classes/pref/prefs.php:171
+#: classes/pref/prefs.php:165
 msgid "E-mail"
 msgstr "E-mail"
 
-#: classes/pref/prefs.php:177
+#: classes/pref/prefs.php:171
 msgid "Access level"
 msgstr "Уровень доступа:"
 
-#: classes/pref/prefs.php:187
+#: classes/pref/prefs.php:181
 msgid "Save data"
 msgstr "Сохранить"
 
-#: classes/pref/prefs.php:207
+#: classes/pref/prefs.php:203
 msgid "Your password is at default value, please change it."
 msgstr "Используется пароль по умолчанию, пожалуйста, измените его."
 
-#: classes/pref/prefs.php:239
+#: classes/pref/prefs.php:235
 msgid "Old password"
 msgstr "Старый пароль"
 
-#: classes/pref/prefs.php:242
+#: classes/pref/prefs.php:238
 msgid "New password"
 msgstr "Новый пароль"
 
-#: classes/pref/prefs.php:247
+#: classes/pref/prefs.php:243
 msgid "Confirm password"
 msgstr "Подтверждение пароля"
 
-#: classes/pref/prefs.php:257
+#: classes/pref/prefs.php:253
 msgid "Change password"
 msgstr "Изменить пароль"
 
-#: classes/pref/prefs.php:263
+#: classes/pref/prefs.php:259
 msgid "One time passwords / Authenticator"
 msgstr ""
 
-#: classes/pref/prefs.php:292 classes/pref/prefs.php:343
+#: classes/pref/prefs.php:288 classes/pref/prefs.php:339
 #, fuzzy
 msgid "Enter your password"
 msgstr "Некорректное имя пользователя или пароль"
 
-#: classes/pref/prefs.php:303
+#: classes/pref/prefs.php:299
 #, fuzzy
 msgid "Disable OTP"
 msgstr "(Отключен)"
 
-#: classes/pref/prefs.php:309
+#: classes/pref/prefs.php:305
 msgid ""
 "You will need a compatible Authenticator to use this. Changing your password "
 "would automatically disable OTP."
 msgstr ""
 
-#: classes/pref/prefs.php:311
+#: classes/pref/prefs.php:307
 msgid "Scan the following code by the Authenticator application:"
 msgstr ""
 
-#: classes/pref/prefs.php:352
+#: classes/pref/prefs.php:348
 msgid "I have scanned the code and would like to enable OTP"
 msgstr ""
 
-#: classes/pref/prefs.php:360
+#: classes/pref/prefs.php:356
 #, fuzzy
 msgid "Enable OTP"
 msgstr "Включен"
 
-#: classes/pref/prefs.php:456
-msgid "Select theme"
-msgstr "Выбор темы"
-
-#: classes/pref/prefs.php:508
+#: classes/pref/prefs.php:482
 #, fuzzy
 msgid "Customize"
 msgstr "Изменить пользовательские стили"
 
-#: classes/pref/prefs.php:527 classes/pref/prefs.php:534
-#: classes/pref/prefs.php:539
+#: classes/pref/prefs.php:501 classes/pref/prefs.php:508
+#: classes/pref/prefs.php:513
 msgid "Yes"
 msgstr "Да"
 
-#: classes/pref/prefs.php:529 classes/pref/prefs.php:539
+#: classes/pref/prefs.php:503 classes/pref/prefs.php:513
 msgid "No"
 msgstr "Нет"
 
-#: classes/pref/prefs.php:569
+#: classes/pref/prefs.php:543
 msgid "Register"
 msgstr "Регистрация"
 
-#: classes/pref/prefs.php:573
+#: classes/pref/prefs.php:547
 msgid "Clear"
 msgstr ""
 
-#: classes/pref/prefs.php:579
+#: classes/pref/prefs.php:553
 #, php-format
 msgid "Current server time: %s (UTC)"
 msgstr ""
 
-#: classes/pref/prefs.php:604
+#: classes/pref/prefs.php:582
 msgid "Save configuration"
 msgstr "Сохранить конфигурацию"
 
-#: classes/pref/prefs.php:607
+#: classes/pref/prefs.php:585
 msgid "Manage profiles"
 msgstr "Управление профилями"
 
-#: classes/pref/prefs.php:610
+#: classes/pref/prefs.php:588
 msgid "Reset to defaults"
 msgstr "Сбросить настройки"
 
-#: classes/pref/prefs.php:622
+#: classes/pref/prefs.php:600
 #, fuzzy
 msgid "Show additional preferences"
 msgstr "Закрыть настройки"
 
-#: classes/pref/prefs.php:679 classes/pref/prefs.php:697
+#: classes/pref/prefs.php:612 classes/pref/prefs.php:614
+msgid "Plugins"
+msgstr ""
+
+#: classes/pref/prefs.php:642
+msgid "System plugins"
+msgstr ""
+
+#: classes/pref/prefs.php:646 classes/pref/prefs.php:695
+msgid "Plugin"
+msgstr ""
+
+#: classes/pref/prefs.php:647 classes/pref/prefs.php:696
+#, fuzzy
+msgid "Description"
+msgstr "описание"
+
+#: classes/pref/prefs.php:648 classes/pref/prefs.php:697
+msgid "Version"
+msgstr ""
+
+#: classes/pref/prefs.php:649 classes/pref/prefs.php:698
+msgid "Author"
+msgstr ""
+
+#: classes/pref/prefs.php:682 classes/pref/prefs.php:733
+#, fuzzy
+msgid "Clear data"
+msgstr "Очистить данные канала."
+
+#: classes/pref/prefs.php:691
+msgid "User plugins"
+msgstr ""
+
+#: classes/pref/prefs.php:748
+#, fuzzy
+msgid "Enable selected plugins"
+msgstr "Разрешить иконки каналов"
+
+#: classes/pref/prefs.php:803 classes/pref/prefs.php:821
 #, fuzzy
 msgid "Incorrect password"
 msgstr "Некорректное имя пользователя или пароль"
@@ -2176,180 +2198,158 @@ msgstr "Некорректное имя пользователя или паро
 msgid "Check to enable field"
 msgstr "Проверить доступность поля"
 
-#: classes/pref/feeds.php:59 classes/pref/feeds.php:180
-#: classes/pref/feeds.php:223 classes/pref/feeds.php:229
-#: classes/pref/feeds.php:254
+#: classes/pref/feeds.php:58 classes/pref/feeds.php:175
+#: classes/pref/feeds.php:217 classes/pref/feeds.php:223
+#: classes/pref/feeds.php:248
 #, php-format
 msgid "(%d feeds)"
 msgstr "(%d каналов)"
 
-#: classes/pref/feeds.php:492 classes/pref/feeds.php:747
-msgid "Feed"
-msgstr "Канал"
-
-#: classes/pref/feeds.php:498
+#: classes/pref/feeds.php:494
 msgid "Feed Title"
 msgstr "Заголовок"
 
-#: classes/pref/feeds.php:554 classes/pref/feeds.php:802
+#: classes/pref/feeds.php:550 classes/pref/feeds.php:762
 msgid "Article purging:"
 msgstr "Удаление сообщений:"
 
-#: classes/pref/feeds.php:577
+#: classes/pref/feeds.php:573
 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:593 classes/pref/feeds.php:831
+#: classes/pref/feeds.php:589 classes/pref/feeds.php:791
 msgid "Hide from Popular feeds"
 msgstr "Спрятать из списка популярных каналов"
 
-#: classes/pref/feeds.php:604 classes/pref/feeds.php:836
-msgid "Right-to-left content"
-msgstr "Язык канала пишется справа налево"
-
-#: classes/pref/feeds.php:616 classes/pref/feeds.php:842
+#: classes/pref/feeds.php:601 classes/pref/feeds.php:797
 msgid "Include in e-mail digest"
 msgstr "Включить в e-mail дайджест"
 
-#: classes/pref/feeds.php:629 classes/pref/feeds.php:848
+#: classes/pref/feeds.php:614 classes/pref/feeds.php:803
 msgid "Always display image attachments"
 msgstr "Всегда показывать вложенные изображения"
 
-#: classes/pref/feeds.php:643 classes/pref/feeds.php:856
+#: classes/pref/feeds.php:628 classes/pref/feeds.php:811
 msgid "Cache images locally"
 msgstr "Кэшировать изображения локально"
 
-#: classes/pref/feeds.php:656
-#, fuzzy
-msgid "Cache content locally"
-msgstr "Кэшировать изображения локально"
-
-#: classes/pref/feeds.php:668 classes/pref/feeds.php:862
+#: classes/pref/feeds.php:640 classes/pref/feeds.php:817
 msgid "Mark updated articles as unread"
 msgstr "Пометить все статьи как прочитанные?"
 
-#: classes/pref/feeds.php:680 classes/pref/feeds.php:868
-msgid "Mark posts as updated on content change"
-msgstr "При изменении текста статьи, помечать ее как обновленную"
-
-#: classes/pref/feeds.php:686
+#: classes/pref/feeds.php:646
 msgid "Icon"
 msgstr "Иконка"
 
-#: classes/pref/feeds.php:700
+#: classes/pref/feeds.php:660
 msgid "Replace"
 msgstr "Заменить"
 
-#: classes/pref/feeds.php:719
+#: classes/pref/feeds.php:679
 msgid "Resubscribe to push updates"
 msgstr "Переподписаться на PUSH обновления"
 
-#: classes/pref/feeds.php:726
+#: classes/pref/feeds.php:686
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr "Сбрасывает статусподписки с помощью механизма PubSubHubbub"
 
-#: classes/pref/feeds.php:741
+#: classes/pref/feeds.php:701
 msgid "Enable the options you wish to apply using checkboxes on the right:"
 msgstr ""
 
-#: classes/pref/feeds.php:1123 classes/pref/feeds.php:1176
+#: classes/pref/feeds.php:1051 classes/pref/feeds.php:1104
 msgid "All done."
 msgstr "Всё выполнено."
 
-#: classes/pref/feeds.php:1231
+#: classes/pref/feeds.php:1159
 msgid "Feeds with errors"
 msgstr "Каналы с ошибками"
 
-#: classes/pref/feeds.php:1251
+#: classes/pref/feeds.php:1179
 msgid "Inactive feeds"
 msgstr "Неактивные каналы"
 
-#: classes/pref/feeds.php:1288
+#: classes/pref/feeds.php:1216
 msgid "Edit selected feeds"
 msgstr "Редактировать выбранные каналы"
 
-#: classes/pref/feeds.php:1290 classes/pref/feeds.php:1304
+#: classes/pref/feeds.php:1218 classes/pref/feeds.php:1232
 msgid "Reset sort order"
 msgstr "Сбросить сортировку"
 
-#: classes/pref/feeds.php:1292 js/prefs.js:2021 js/prefs.js:1788
-#: js/prefs.js:1778
+#: classes/pref/feeds.php:1220 js/prefs.js:1778
 #, fuzzy
 msgid "Batch subscribe"
 msgstr "Отписаться"
 
-#: classes/pref/feeds.php:1297
+#: classes/pref/feeds.php:1225
 msgid "Categories"
 msgstr "Категории"
 
-#: classes/pref/feeds.php:1300
+#: classes/pref/feeds.php:1228
 #, fuzzy
 msgid "Add category"
 msgstr "Добавить категорию..."
 
-#: classes/pref/feeds.php:1302
+#: classes/pref/feeds.php:1230
 #, fuzzy
 msgid "(Un)hide empty categories"
 msgstr "Редактировать категории"
 
-#: classes/pref/feeds.php:1306
+#: classes/pref/feeds.php:1234
 #, fuzzy
 msgid "Remove selected"
 msgstr "Удалить выбранные фильтры?"
 
-#: classes/pref/feeds.php:1320
+#: classes/pref/feeds.php:1248
 msgid "More actions..."
 msgstr "Действия..."
 
-#: classes/pref/feeds.php:1324
+#: classes/pref/feeds.php:1252
 msgid "Manual purge"
 msgstr "Ручная очистка"
 
-#: classes/pref/feeds.php:1328
+#: classes/pref/feeds.php:1256
 msgid "Clear feed data"
 msgstr "Очистить данные канала."
 
-#: classes/pref/feeds.php:1379
-msgid "Import and export"
-msgstr ""
-
-#: classes/pref/feeds.php:1381
+#: classes/pref/feeds.php:1307
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1383
+#: classes/pref/feeds.php:1309
 msgid ""
 "Using OPML you can export and import your feeds, filters, labels and Tiny "
 "Tiny RSS settings."
 msgstr ""
 
-#: classes/pref/feeds.php:1385
+#: classes/pref/feeds.php:1311
 msgid "Only main settings profile can be migrated using OPML."
 msgstr "Только главный профиль настроек будет экспортирован в OPML."
 
-#: classes/pref/feeds.php:1398
+#: classes/pref/feeds.php:1324
 #, fuzzy
 msgid "Import my OPML"
 msgstr "Импортирую OPML..."
 
-#: classes/pref/feeds.php:1402
+#: classes/pref/feeds.php:1328
 #, fuzzy
 msgid "Filename:"
 msgstr "Полное имя"
 
-#: classes/pref/feeds.php:1404
+#: classes/pref/feeds.php:1330
 #, fuzzy
 msgid "Include settings"
 msgstr "Включить в e-mail дайджест"
 
-#: classes/pref/feeds.php:1408
+#: classes/pref/feeds.php:1334
 #, fuzzy
 msgid "Export OPML"
 msgstr "Экспортировать OPML"
 
-#: classes/pref/feeds.php:1412
+#: classes/pref/feeds.php:1338
 #, fuzzy
 msgid ""
 "Your OPML can be published publicly and can be subscribed by anyone who "
@@ -2358,42 +2358,23 @@ msgstr ""
 "Опубликованные статьи экспортируется в качестве общего RSS канала и могут "
 "быть подписаны кем-либо ещё, кто знает URL, указанный ниже."
 
-#: classes/pref/feeds.php:1414
+#: classes/pref/feeds.php:1340
 msgid ""
 "Published OPML does not include your Tiny Tiny RSS settings, feeds that "
 "require authentication or feeds hidden from Popular feeds."
 msgstr ""
 
-#: classes/pref/feeds.php:1417
+#: classes/pref/feeds.php:1343
 #, fuzzy
 msgid "Display published OPML URL"
 msgstr "Публичная ссылка на OPML"
 
-#: classes/pref/feeds.php:1420 plugins/import_export/init.php:66
-msgid "Article archive"
-msgstr "Архив статей"
-
-#: classes/pref/feeds.php:1422 plugins/import_export/init.php:68
-msgid ""
-"You can export and import your Starred and Archived articles for safekeeping "
-"or when migrating between tt-rss instances."
-msgstr ""
-
-#: classes/pref/feeds.php:1425
-#, fuzzy
-msgid "Export my data"
-msgstr "Экспортировать данные"
-
-#: classes/pref/feeds.php:1440
-msgid "Import"
-msgstr "Импортировать"
-
-#: classes/pref/feeds.php:1447
+#: classes/pref/feeds.php:1353
 #, fuzzy
 msgid "Firefox integration"
 msgstr "Интеграция в Firefox"
 
-#: classes/pref/feeds.php:1449
+#: classes/pref/feeds.php:1355
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
@@ -2401,45 +2382,21 @@ msgstr ""
 "Этот сайт с Tiny Tiny RSS можно использовать в Firefox как агрегатор RSS. "
 "Для этого щёлкните по ссылке ниже."
 
-#: classes/pref/feeds.php:1456
+#: classes/pref/feeds.php:1362
 msgid "Click here to register this site as a feed reader."
 msgstr "Щёлкните здесь для регистрации сайта в роли RSS агрегатора"
 
-#: classes/pref/feeds.php:1464
-msgid "Bookmarklets"
-msgstr ""
-
-#: classes/pref/feeds.php:1466 plugins/bookmarklets/init.php:24
-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 ""
-
-#: classes/pref/feeds.php:1470
-#, fuzzy, php-format
-msgid "Subscribe to %s in Tiny Tiny RSS?"
-msgstr "Вернуться к Tiny Tiny RSS"
-
-#: classes/pref/feeds.php:1474
-#, fuzzy
-msgid "Subscribe in Tiny Tiny RSS"
-msgstr "Вернуться к Tiny Tiny RSS"
-
-#: classes/pref/feeds.php:1476 plugins/bookmarklets/init.php:34
-msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
-msgstr ""
-
-#: classes/pref/feeds.php:1484
+#: classes/pref/feeds.php:1370
 #, fuzzy
 msgid "Published & shared articles / Generated feeds"
 msgstr "Заново оценить статьи в выбранных каналах?"
 
-#: classes/pref/feeds.php:1486
+#: classes/pref/feeds.php:1372
 #, fuzzy
 msgid "Published articles and generated feeds"
 msgstr "Заново оценить статьи в выбранных каналах?"
 
-#: classes/pref/feeds.php:1488
+#: classes/pref/feeds.php:1374
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the URL specified below."
@@ -2447,48 +2404,48 @@ msgstr ""
 "Опубликованные статьи экспортируется в качестве общего RSS канала и могут "
 "быть подписаны кем-либо ещё, кто знает URL, указанный ниже."
 
-#: classes/pref/feeds.php:1494
+#: classes/pref/feeds.php:1380
 #, fuzzy
 msgid "Display URL"
 msgstr "показать теги"
 
-#: classes/pref/feeds.php:1497
+#: classes/pref/feeds.php:1383
 msgid "Clear all generated URLs"
 msgstr ""
 
-#: classes/pref/feeds.php:1499
+#: classes/pref/feeds.php:1385
 #, fuzzy
 msgid "Articles shared by URL"
 msgstr "Расшарить статью по ссылке"
 
-#: classes/pref/feeds.php:1501
+#: classes/pref/feeds.php:1387
 msgid "You can disable all articles shared by unique URLs here."
 msgstr ""
 
-#: classes/pref/feeds.php:1504
+#: classes/pref/feeds.php:1390
 #, fuzzy
 msgid "Unshare all articles"
 msgstr "Отмеченные"
 
-#: classes/pref/feeds.php:1579
+#: classes/pref/feeds.php:1468
 msgid ""
 "These feeds have not been updated with new content for 3 months (oldest "
 "first):"
 msgstr "Эти каналы не были обновлены в течение трех месяцев:"
 
-#: classes/pref/feeds.php:1616 classes/pref/feeds.php:1685
+#: classes/pref/feeds.php:1505 classes/pref/feeds.php:1574
 msgid "Click to edit feed"
 msgstr "Щёлкните для редактирования"
 
-#: classes/pref/feeds.php:1634 classes/pref/feeds.php:1705
+#: classes/pref/feeds.php:1523 classes/pref/feeds.php:1594
 msgid "Unsubscribe from selected feeds"
 msgstr "Отписаться от выбранных каналов?"
 
-#: classes/pref/feeds.php:1645
+#: classes/pref/feeds.php:1534
 msgid "These feeds have not been updated because of errors:"
 msgstr "Эти каналы не были обновлены из-за ошибок:"
 
-#: plugins/pocket/pocket.php:24
+#: plugins/pocket/init.php:30
 msgid "Pocket"
 msgstr ""
 
@@ -2507,143 +2464,267 @@ msgstr ""
 msgid "Back to feeds"
 msgstr "Щёлкните для редактирования"
 
+#: plugins/digest/digest_body.php:56
+msgid "Hello,"
+msgstr "Привет,"
+
 #: plugins/digest/digest_body.php:62
 msgid "Regular version"
 msgstr ""
 
-#: plugins/pinterest/pinterest.php:23
+#: plugins/nsfw/init.php:32 plugins/nsfw/init.php:43
+msgid "Not work safe (click to toggle)"
+msgstr ""
+
+#: plugins/nsfw/init.php:53
+msgid "NSFW Plugin"
+msgstr ""
+
+#: plugins/nsfw/init.php:80
+msgid "Tags to consider NSFW (comma-separated)"
+msgstr ""
+
+#: plugins/nsfw/init.php:101
+#, fuzzy
+msgid "Configuration saved."
+msgstr "Конфигурация сохранена."
+
+#: plugins/pinterest/init.php:29
 msgid "Pinterest"
 msgstr ""
 
-#: plugins/mail/mail.php:66 plugins/mail/mail.php:72 plugins/mail/init.php:72
-#: plugins/mail/init.php:78
+#: plugins/auth_internal/init.php:62
+#, fuzzy
+msgid "Please enter your one time password:"
+msgstr "Пожалуйста, укажите заметку для статьи:"
+
+#: plugins/auth_internal/init.php:185
+msgid "Password has been changed."
+msgstr "Пароль был изменен."
+
+#: plugins/auth_internal/init.php:187
+msgid "Old password is incorrect."
+msgstr "Старый пароль неправилен."
+
+#: plugins/bookmarklets/init.php:22
+msgid "Bookmarklets"
+msgstr ""
+
+#: plugins/bookmarklets/init.php:24
+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 ""
+
+#: plugins/bookmarklets/init.php:28
+#, fuzzy, php-format
+msgid "Subscribe to %s in Tiny Tiny RSS?"
+msgstr "Вернуться к Tiny Tiny RSS"
+
+#: plugins/bookmarklets/init.php:32
+#, fuzzy
+msgid "Subscribe in Tiny Tiny RSS"
+msgstr "Вернуться к Tiny Tiny RSS"
+
+#: plugins/bookmarklets/init.php:34
+msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
+msgstr ""
+
+#: plugins/import_export/init.php:64
+msgid "Import and export"
+msgstr ""
+
+#: plugins/import_export/init.php:66
+msgid "Article archive"
+msgstr "Архив статей"
+
+#: plugins/import_export/init.php:68
+msgid ""
+"You can export and import your Starred and Archived articles for safekeeping "
+"or when migrating between tt-rss instances."
+msgstr ""
+
+#: plugins/import_export/init.php:71
+#, fuzzy
+msgid "Export my data"
+msgstr "Экспортировать данные"
+
+#: plugins/import_export/init.php:87
+msgid "Import"
+msgstr "Импортировать"
+
+#: plugins/import_export/init.php:221
+msgid "Could not import: incorrect schema version."
+msgstr "Не могу импортировать данные: некорректная версия схемы."
+
+#: plugins/import_export/init.php:226
+msgid "Could not import: unrecognized document format."
+msgstr "Не могу импортировать данные: неизвестынй формат данных."
+
+#: plugins/import_export/init.php:385
+#, php-format
+msgid "Finished: %d articles processed, %d imported, %d feeds created."
+msgstr ""
+
+#: plugins/import_export/init.php:391
+msgid "Could not load XML document."
+msgstr "Не могу загрузить XML документ."
+
+#: plugins/import_export/init.php:403
+#, fuzzy
+msgid "Prepare data"
+msgstr "Сохранить"
+
+#: plugins/import_export/init.php:424
+#, php-format
+msgid ""
+"Could not upload file. You might need to adjust upload_max_filesize\n"
+"\t\t\t\tin PHP.ini (current value = %s)"
+msgstr ""
+
+#: plugins/mail/init.php:72 plugins/mail/init.php:78
 msgid "[Forwarded]"
 msgstr ""
 
-#: plugins/mail/mail.php:66 plugins/mail/init.php:72
+#: plugins/mail/init.php:72
 msgid "Multiple articles"
 msgstr "Все статьи"
 
-#: plugins/mail/mail.php:87
+#: plugins/mail/init.php:93
 msgid "From:"
 msgstr "От:"
 
-#: plugins/mail/mail.php:96
+#: plugins/mail/init.php:102
 msgid "To:"
 msgstr "Кому:"
 
-#: plugins/mail/mail.php:109
+#: plugins/mail/init.php:115
 msgid "Subject:"
 msgstr "Заголовок:"
 
-#: plugins/mail/mail.php:125
+#: plugins/mail/init.php:131
 msgid "Send e-mail"
 msgstr "Отправить письмо"
 
-#: plugins/note/note.php:22 plugins/note/note.js:11
+#: plugins/note/init.php:28 plugins/note/note.js:11
 msgid "Edit article note"
 msgstr "Редактировать заметку"
 
-#: plugins/example/example.php:29 plugins/example/init.php:38
+#: plugins/example/init.php:38
 #, fuzzy
 msgid "Example Pane"
 msgstr "Примеры"
 
-#: plugins/example/example.php:53 plugins/example/init.php:69
+#: plugins/example/init.php:69
 msgid "Sample value"
 msgstr ""
 
-#: plugins/example/example.php:59 plugins/example/init.php:75
+#: plugins/example/init.php:75
 #, fuzzy
 msgid "Set value"
 msgstr "Отметить"
 
-#: plugins/identica/identica.php:23
+#: plugins/identica/init.php:29
 #, fuzzy
 msgid "Share on identi.ca"
 msgstr "Заголовок"
 
-#: plugins/instances/instances.php:29
+#: plugins/owncloud/init.php:35
+msgid "Owncloud"
+msgstr ""
+
+#: plugins/owncloud/init.php:59
+msgid "Owncloud url"
+msgstr ""
+
+#: plugins/owncloud/init.php:74
+msgid "Bookmark on OwnCloud "
+msgstr ""
+
+#: plugins/instances/init.php:144
 msgid "Linked"
 msgstr "Связанные"
 
-#: plugins/instances/instances.php:180
+#: plugins/instances/init.php:295
 #, fuzzy
 msgid "Link instance"
 msgstr "Редактировать теги"
 
-#: plugins/instances/instances.php:192 plugins/instances/init.php:307
+#: plugins/instances/init.php:307
 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 ""
 
-#: plugins/instances/instances.php:202
+#: plugins/instances/init.php:317
 msgid "Last connected"
 msgstr ""
 
-#: plugins/instances/instances.php:203
+#: plugins/instances/init.php:318
 msgid "Status"
 msgstr ""
 
-#: plugins/instances/instances.php:204
+#: plugins/instances/init.php:319
 #, fuzzy
 msgid "Stored feeds"
 msgstr "Больше каналов"
 
-#: plugins/share/share.php:21
+#: plugins/share/init.php:27
 #, fuzzy
 msgid "Share by URL"
 msgstr "Расшарить статью по ссылке"
 
-#: plugins/share/share.php:43 plugins/share/init.php:49
+#: plugins/share/init.php:49
 msgid "You can share this article by the following unique URL:"
 msgstr ""
 
-#: plugins/flattr/flattr.php:37
+#: plugins/flattr/init.php:30
 #, fuzzy
-msgid "Flattr article"
+msgid "Flattr this article."
 msgstr "Отмеченные"
 
-#: plugins/googleplus/googleplus.php:23
+#: plugins/googleplus/init.php:29
 #, fuzzy
 msgid "Share on Google+"
 msgstr "Заголовок"
 
-#: plugins/updater/updater.php:267 plugins/updater/updater.php:279
+#: plugins/updater/init.php:294 plugins/updater/init.php:306
 #: plugins/updater/updater.js:10
 #, fuzzy
 msgid "Update Tiny Tiny RSS"
 msgstr "Вернуться к Tiny Tiny RSS"
 
-#: plugins/updater/updater.php:282 plugins/updater/init.php:303
+#: plugins/updater/init.php:309
 #, fuzzy
 msgid "Your Tiny Tiny RSS installation is up to date."
 msgstr "Tiny Tiny RSS база данных обновлена."
 
-#: plugins/updater/updater.php:291 plugins/updater/init.php:313
+#: plugins/updater/init.php:319
 msgid ""
 "Do not close this dialog until updating is finished. Backup your tt-rss "
 "directory before continuing."
 msgstr ""
 
-#: plugins/updater/updater.php:294 plugins/updater/init.php:316
+#: plugins/updater/init.php:322
 #, fuzzy
 msgid "Ready to update."
 msgstr "Последнее обновление:"
 
-#: plugins/updater/updater.php:299 plugins/updater/init.php:321
+#: plugins/updater/init.php:327
 #, fuzzy
 msgid "Start update"
 msgstr "Последнее обновление:"
 
-#: js/feedlist.js:283 js/feedlist.js:282 js/feedlist.js:265 js/feedlist.js:218
+#: plugins/tweet/init.php:29
+#, fuzzy
+msgid "Share on Twitter"
+msgstr "Заголовок"
+
+#: js/feedlist.js:218
 msgid "New articles available in this feed (click to show)"
 msgstr ""
 
-#: js/feedlist.js:490 js/feedlist.js:505 js/feedlist.js:489 js/feedlist.js:504
-#: js/feedlist.js:469 js/feedlist.js:484 js/feedlist.js:420 js/feedlist.js:435
-#: plugins/digest/digest.js:25
+#: js/feedlist.js:420 js/feedlist.js:435 plugins/digest/digest.js:25
 msgid "Mark all articles in %s as read?"
 msgstr "Отметить все статьи в %s как прочитанные?"
 
@@ -2653,151 +2734,138 @@ msgid ""
 "your browser information. Your IP would be saved in the database."
 msgstr ""
 
-#: js/functions.js:618 js/functions.js:614 js/functions.js:622
+#: js/functions.js:627
 #, fuzzy
 msgid "Date syntax appears to be correct:"
 msgstr "Старый пароль неправилен."
 
-#: js/functions.js:621 js/functions.js:617 js/functions.js:625
+#: js/functions.js:630
 #, fuzzy
 msgid "Date syntax is incorrect."
 msgstr "Старый пароль неправилен."
 
-#: js/functions.js:748 js/functions.js:744 js/functions.js:752
+#: js/functions.js:757
 #, fuzzy
 msgid "Remove stored feed icon?"
 msgstr "Удалить сохранённые данные"
 
-#: js/functions.js:780 js/functions.js:776 js/functions.js:784
+#: js/functions.js:789
 #, fuzzy
 msgid "Please select an image file to upload."
 msgstr "Пожалуйста выберите только один канал."
 
-#: js/functions.js:782 js/functions.js:778 js/functions.js:786
+#: js/functions.js:791
 msgid "Upload new icon for this feed?"
 msgstr ""
 
-#: js/functions.js:799 js/functions.js:795 js/functions.js:803
+#: js/functions.js:808
 msgid "Please enter label caption:"
 msgstr "Пожалуйста, введите заголовок метки:"
 
-#: js/functions.js:804 js/functions.js:800 js/functions.js:808
+#: js/functions.js:813
 msgid "Can't create label: missing caption."
 msgstr "Не могу создать метку: отсутствует заголовок."
 
-#: js/functions.js:847 js/functions.js:843 js/functions.js:851
+#: js/functions.js:856
 msgid "Subscribe to Feed"
 msgstr "Подписаться на канал"
 
-#: js/functions.js:874 js/functions.js:870 js/functions.js:878
+#: js/functions.js:883
 #, fuzzy
 msgid "Subscribed to %s"
 msgstr "Подписаны каналы:"
 
-#: js/functions.js:879 js/functions.js:875 js/functions.js:883
+#: js/functions.js:888
 msgid "Specified URL seems to be invalid."
 msgstr ""
 
-#: js/functions.js:882 js/functions.js:878 js/functions.js:886
+#: js/functions.js:891
 msgid "Specified URL doesn't seem to contain any feeds."
 msgstr ""
 
-#: js/functions.js:935 js/functions.js:931 js/functions.js:939
+#: js/functions.js:944
 #, fuzzy
 msgid "Couldn't download the specified URL: %s"
 msgstr "Не могу подписаться: нет URL"
 
-#: js/functions.js:939 js/functions.js:935 js/functions.js:943
+#: js/functions.js:948
 #, fuzzy
 msgid "You are already subscribed to this feed."
 msgstr "Нельзя отписаться от категории."
 
-#: js/functions.js:1067 js/functions.js:1063 js/functions.js:1071
-#: js/functions.js:1073
+#: js/functions.js:1078
 #, fuzzy
 msgid "Edit rule"
 msgstr "Фильтры"
 
-#: js/functions.js:1093 js/functions.js:1089 js/functions.js:1097
-#: js/functions.js:1099
+#: js/functions.js:1104
 #, fuzzy
 msgid "Edit action"
 msgstr "Действия над каналом"
 
-#: js/functions.js:1130 js/functions.js:1126 js/functions.js:1134
-#: js/functions.js:1136
+#: js/functions.js:1141
 msgid "Create Filter"
 msgstr "Создать фильтр"
 
-#: js/functions.js:1234 js/functions.js:1230 js/functions.js:1238
-#: js/functions.js:1240
+#: js/functions.js:1245
 msgid ""
 "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
 "hub again on next feed update."
 msgstr ""
 
-#: js/functions.js:1255 js/tt-rss.js:421 js/functions.js:1251 js/tt-rss.js:381
-#: js/functions.js:1259 js/tt-rss.js:367 js/functions.js:1261
+#: js/functions.js:1266 js/tt-rss.js:367
 msgid "Unsubscribe from %s?"
 msgstr "Отписаться от %s?"
 
-#: js/functions.js:1362 js/functions.js:1358 js/functions.js:1368
-#: js/functions.js:1370
+#: js/functions.js:1375
 #, fuzzy
 msgid "Please enter category title:"
 msgstr "Пожалуйста, укажите заметку для статьи:"
 
-#: js/functions.js:1393 js/functions.js:1389 js/functions.js:1399
-#: js/functions.js:1401
+#: js/functions.js:1406
 msgid "Generate new syndication address for this feed?"
 msgstr ""
 
-#: js/functions.js:1584 js/tt-rss.js:400 js/tt-rss.js:903 js/functions.js:1580
-#: js/tt-rss.js:782 js/tt-rss.js:362 js/tt-rss.js:717 js/functions.js:1590
-#: js/tt-rss.js:348 js/tt-rss.js:709 js/functions.js:1592
+#: js/functions.js:1597 js/tt-rss.js:348 js/tt-rss.js:713
 msgid "You can't edit this kind of feed."
 msgstr "Вы не можете редактировать этот канал."
 
-#: js/functions.js:1599 js/functions.js:1595 js/functions.js:1605
-#: js/functions.js:1607
+#: js/functions.js:1612
 #, fuzzy
 msgid "Edit Feed"
 msgstr "Редактировать канал"
 
-#: js/functions.js:1637 js/functions.js:1633 js/functions.js:1643
-#: js/functions.js:1645
+#: js/functions.js:1650
 #, fuzzy
 msgid "More Feeds"
 msgstr "Больше каналов"
 
-#: js/functions.js:1698 js/functions.js:1808 js/prefs.js:408 js/prefs.js:438
-#: js/prefs.js:470 js/prefs.js:653 js/prefs.js:673 js/prefs.js:1326
-#: js/prefs.js:1471 js/functions.js:1694 js/functions.js:1804 js/prefs.js:397
-#: js/prefs.js:427 js/prefs.js:459 js/prefs.js:642 js/prefs.js:662
-#: js/prefs.js:1213 js/prefs.js:1358 js/functions.js:1704 js/functions.js:1814
-#: js/prefs.js:1203 js/prefs.js:1348 js/functions.js:1706 js/functions.js:1816
+#: js/functions.js:1711 js/functions.js:1821 js/prefs.js:397 js/prefs.js:427
+#: js/prefs.js:459 js/prefs.js:642 js/prefs.js:662 js/prefs.js:1203
+#: js/prefs.js:1348
 msgid "No feeds are selected."
 msgstr "Нет выбранных каналов."
 
-#: js/functions.js:1740 js/functions.js:1736 js/functions.js:1746
-#: js/functions.js:1748
+#: js/functions.js:1753
 msgid ""
 "Remove selected feeds from the archive? Feeds with stored articles will not "
 "be removed."
 msgstr ""
 
-#: js/functions.js:1779 js/functions.js:1775 js/functions.js:1785
-#: js/functions.js:1787
+#: js/functions.js:1792
 #, fuzzy
 msgid "Feeds with update errors"
 msgstr "Ошибки обновления"
 
-#: js/functions.js:1790 js/prefs.js:1308 js/functions.js:1786 js/prefs.js:1195
-#: js/functions.js:1796 js/prefs.js:1185 js/functions.js:1798
+#: js/functions.js:1803 js/prefs.js:1185
 #, fuzzy
 msgid "Remove selected feeds?"
 msgstr "Удалить выбранные фильтры?"
 
+#: js/functions.js:1904
+msgid "Help"
+msgstr "Помощь"
+
 #: js/PrefFeedTree.js:47
 #, fuzzy
 msgid "Edit category"
@@ -2821,408 +2889,310 @@ msgstr "Пожалуйста, введите логин:"
 msgid "Can't create user: no login specified."
 msgstr "Не могу добавить пользователя: не указан логин."
 
-#: js/prefs.js:128 js/prefs.js:117
+#: js/prefs.js:117
 #, fuzzy
 msgid "Edit Filter"
 msgstr "Фильтры"
 
-#: js/prefs.js:175 js/prefs.js:164
+#: js/prefs.js:164
 #, fuzzy
 msgid "Remove filter?"
 msgstr "Удалить фильтр %s?"
 
-#: js/prefs.js:290 js/prefs.js:279
+#: js/prefs.js:279
 msgid "Remove selected labels?"
 msgstr "Удалить выбранные метки?"
 
-#: js/prefs.js:306 js/prefs.js:1512 js/prefs.js:295 js/prefs.js:1399
-#: js/prefs.js:1389
+#: js/prefs.js:295 js/prefs.js:1389
 msgid "No labels are selected."
 msgstr "Нет выбранных меток."
 
-#: js/prefs.js:320 js/prefs.js:309
+#: js/prefs.js:309
 msgid ""
 "Remove selected users? Neither default admin nor your account will be "
 "removed."
 msgstr ""
 
-#: js/prefs.js:337 js/prefs.js:518 js/prefs.js:539 js/prefs.js:578
 #: js/prefs.js:326 js/prefs.js:507 js/prefs.js:528 js/prefs.js:567
 msgid "No users are selected."
 msgstr "Нет выбранных пользователей."
 
-#: js/prefs.js:355 js/prefs.js:344
+#: js/prefs.js:344
 msgid "Remove selected filters?"
 msgstr "Удалить выбранные фильтры?"
 
-#: js/prefs.js:370 js/prefs.js:608 js/prefs.js:627 js/prefs.js:359
-#: js/prefs.js:597 js/prefs.js:616
+#: js/prefs.js:359 js/prefs.js:597 js/prefs.js:616
 msgid "No filters are selected."
 msgstr "Нет выбранных фильтров."
 
-#: js/prefs.js:389 js/prefs.js:378
+#: js/prefs.js:378
 msgid "Unsubscribe from selected feeds?"
 msgstr "Отписаться от выбранных каналов?"
 
-#: js/prefs.js:423 js/prefs.js:412
+#: js/prefs.js:412
 msgid "Please select only one feed."
 msgstr "Пожалуйста выберите только один канал."
 
-#: js/prefs.js:429 js/prefs.js:418
+#: js/prefs.js:418
 msgid "Erase all non-starred articles in selected feed?"
 msgstr "Стереть все не отмеченные статьи в выбранном канале?"
 
-#: js/prefs.js:451 js/prefs.js:440
+#: js/prefs.js:440
 msgid "How many days of articles to keep (0 - use default)?"
 msgstr "Сколько дней хранить статьи (0 - по умолчанию)?"
 
-#: js/prefs.js:489 js/prefs.js:478
+#: js/prefs.js:478
 msgid "Login field cannot be blank."
 msgstr "Поле логина не может быть пустым."
 
-#: js/prefs.js:523 js/prefs.js:544 js/prefs.js:583 js/prefs.js:512
-#: js/prefs.js:533 js/prefs.js:572
+#: js/prefs.js:512 js/prefs.js:533 js/prefs.js:572
 msgid "Please select only one user."
 msgstr "Пожалуйста выберите только одного пользователя."
 
-#: js/prefs.js:548 js/prefs.js:537
+#: js/prefs.js:537
 msgid "Reset password of selected user?"
 msgstr "Сбросить пароль выбранного пользователя?"
 
-#: js/prefs.js:613 js/prefs.js:602
+#: js/prefs.js:602
 msgid "Please select only one filter."
 msgstr "Пожалуйста выберите только один фильтр."
 
-#: js/prefs.js:631 js/prefs.js:620
+#: js/prefs.js:620
 #, fuzzy
 msgid "Combine selected filters?"
 msgstr "Удалить выбранные фильтры?"
 
-#: js/prefs.js:695 js/prefs.js:684
+#: js/prefs.js:684
 #, fuzzy
 msgid "Edit Multiple Feeds"
 msgstr "Редактор канала"
 
-#: js/prefs.js:719 js/prefs.js:708
+#: js/prefs.js:708
 msgid "Save changes to selected feeds?"
 msgstr "Сохранить изменения выбранных каналов?"
 
-#: js/prefs.js:811 js/prefs.js:800 js/prefs.js:790
+#: js/prefs.js:790
 msgid "OPML Import"
 msgstr "Импорт OPML"
 
-#: js/prefs.js:838 js/prefs.js:827 js/prefs.js:817
+#: js/prefs.js:817
 msgid "Please choose an OPML file first."
 msgstr "Пожалуйста выберите файл OPML."
 
-#: js/prefs.js:854 plugins/import_export/import_export.js:112
-msgid "Please choose the file first."
-msgstr "Пожалуйста выберите файл."
-
-#: js/prefs.js:1010 js/prefs.js:983 js/prefs.js:973
+#: js/prefs.js:973
 msgid "Reset to defaults?"
 msgstr "Сбросить настройки?"
 
-#: js/prefs.js:1215 js/prefs.js:1102 js/prefs.js:1092
+#: js/prefs.js:1092
 msgid ""
 "Remove category %s? Any nested feeds would be placed into Uncategorized."
 msgstr ""
 
-#: js/prefs.js:1242 js/prefs.js:1129 js/prefs.js:1119
+#: js/prefs.js:1119
 msgid "Remove selected categories?"
 msgstr "Удалить выбранные категории?"
 
-#: js/prefs.js:1258 js/prefs.js:1145 js/prefs.js:1135
+#: js/prefs.js:1135
 msgid "No categories are selected."
 msgstr "Нет выбранных категорий."
 
-#: js/prefs.js:1266 js/prefs.js:1153 js/prefs.js:1143
+#: js/prefs.js:1143
 #, fuzzy
 msgid "Category title:"
 msgstr "Редактор категорий"
 
-#: js/prefs.js:1297 js/prefs.js:1184 js/prefs.js:1174
+#: js/prefs.js:1174
 msgid "Feeds without recent updates"
 msgstr "Давно не обновлявшиеся каналы"
 
-#: js/prefs.js:1346 js/prefs.js:1233 js/prefs.js:1223
+#: js/prefs.js:1223
 msgid "Replace current OPML publishing address with a new one?"
 msgstr "Изменить текущий адрес публикации OPML на новый?"
 
-#: js/prefs.js:1455 js/prefs.js:1342 js/prefs.js:1332
+#: js/prefs.js:1332
 msgid "Rescore articles in selected feeds?"
 msgstr "Заново оценить статьи в выбранных каналах?"
 
-#: js/prefs.js:1478 js/prefs.js:1365 js/prefs.js:1355
+#: js/prefs.js:1355
 msgid "Rescore all articles? This operation may take a lot of time."
 msgstr ""
 "Оценить заново все статьи? Эта операция может продолжаться длительное время."
 
-#: js/prefs.js:1498 js/prefs.js:1385 js/prefs.js:1375
+#: js/prefs.js:1375
 #, fuzzy
 msgid "Reset selected labels to default colors?"
 msgstr "Сбросить метку цветов, на цвета по умолчанию?"
 
-#: js/prefs.js:1535 js/prefs.js:1422 js/prefs.js:1412
+#: js/prefs.js:1412
 msgid "Settings Profiles"
 msgstr "Профили настроек"
 
-#: js/prefs.js:1544 js/prefs.js:1431 js/prefs.js:1421
+#: js/prefs.js:1421
 msgid ""
 "Remove selected profiles? Active and default profiles will not be removed."
 msgstr ""
 
-#: js/prefs.js:1562 js/prefs.js:1449 js/prefs.js:1439
+#: js/prefs.js:1439
 msgid "No profiles are selected."
 msgstr "Профиль не выбран"
 
-#: js/prefs.js:1570 js/prefs.js:1623 js/prefs.js:1457 js/prefs.js:1510
 #: js/prefs.js:1447 js/prefs.js:1500
 msgid "Activate selected profile?"
 msgstr "Активировать выбранный профиль?"
 
-#: js/prefs.js:1586 js/prefs.js:1639 js/prefs.js:1473 js/prefs.js:1526
 #: js/prefs.js:1463 js/prefs.js:1516
 msgid "Please choose a profile to activate."
 msgstr "Пожалуйста выберите какой-нибудь профиль."
 
-#: js/prefs.js:1647 js/prefs.js:1534 js/prefs.js:1524
+#: js/prefs.js:1524
 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr ""
 
-#: js/prefs.js:1666 js/prefs.js:1553 js/prefs.js:1543
+#: js/prefs.js:1543
 msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr ""
 
-#: js/prefs.js:1764 js/prefs.js:1651 js/prefs.js:1641
+#: js/prefs.js:1641
 msgid "Label Editor"
 msgstr "Редактор Меток"
 
-#: js/prefs.js:1827 js/prefs.js:1714 js/prefs.js:1704
+#: js/prefs.js:1704
 msgid ""
 "This will clear your stored authentication information for Twitter. Continue?"
 msgstr ""
 
-#: js/prefs.js:1911 plugins/import_export/import_export.js:13
-msgid "Export Data"
-msgstr "Экспортировать данные"
-
-#: js/prefs.js:1938 plugins/import_export/import_export.js:40
-msgid ""
-"Finished, exported %d articles. You can download the data <a "
-"class='visibleLink' href='%u'>here</a>."
-msgstr ""
-
-#: js/prefs.js:1991 plugins/import_export/import_export.js:93
-msgid "Data Import"
-msgstr "Импортировать данные"
-
-#: js/prefs.js:2027 js/prefs.js:1794 js/prefs.js:1784
+#: js/prefs.js:1784
 #, fuzzy
 msgid "Subscribing to feeds..."
 msgstr "Подписаться на канал..."
 
-#: js/tt-rss.js:147 js/tt-rss.js:141 js/tt-rss.js:120
+#: js/prefs.js:1821
+msgid "Clear stored data for this plugin?"
+msgstr ""
+
+#: js/tt-rss.js:120
 msgid "Mark all articles as read?"
 msgstr "Пометить все статьи как прочитанные?"
 
-#: js/tt-rss.js:410 js/tt-rss.js:370 js/tt-rss.js:356
+#: js/tt-rss.js:356
 msgid "You can't unsubscribe from the category."
 msgstr "Нельзя отписаться от категории."
 
-#: js/tt-rss.js:415 js/tt-rss.js:596 js/tt-rss.js:591 js/tt-rss.js:375
-#: js/tt-rss.js:525 js/tt-rss.js:361 js/tt-rss.js:511
+#: js/tt-rss.js:361 js/tt-rss.js:511
 msgid "Please select some feed first."
 msgstr "Пожалуйста выберите какой-нибудь канал."
 
-#: js/tt-rss.js:591 js/tt-rss.js:586 js/tt-rss.js:520 js/tt-rss.js:506
+#: js/tt-rss.js:506
 msgid "You can't rescore this kind of feed."
 msgstr "Вы не можете снова оценить этот канал."
 
-#: js/tt-rss.js:601 js/tt-rss.js:596 js/tt-rss.js:530 js/tt-rss.js:516
+#: js/tt-rss.js:516
 msgid "Rescore articles in %s?"
 msgstr "Установить оценку статьям в %s?"
 
-#: js/tt-rss.js:1062 js/tt-rss.js:883 js/tt-rss.js:825 js/tt-rss.js:830
+#: js/tt-rss.js:672
+#, fuzzy
+msgid "Please enable mail plugin first."
+msgstr "Пожалуйста выберите какой-нибудь канал."
+
+#: js/tt-rss.js:834
 #, fuzzy
 msgid "New version available!"
 msgstr "Доступная новая версия Tiny Tiny RSS!"
 
-#: js/viewfeed.js:108 js/viewfeed.js:104
+#: js/viewfeed.js:104
 #, fuzzy
 msgid "Cancel search"
 msgstr "Отмена"
 
-#: js/viewfeed.js:456 js/viewfeed.js:445 js/viewfeed.js:451 js/viewfeed.js:435
-#: plugins/digest/digest.js:257 plugins/digest/digest.js:696
+#: js/viewfeed.js:435 plugins/digest/digest.js:257
+#: plugins/digest/digest.js:696
 msgid "Unstar article"
 msgstr "Не отмеченные"
 
-#: js/viewfeed.js:461 js/viewfeed.js:450 js/viewfeed.js:456 js/viewfeed.js:440
-#: plugins/digest/digest.js:259 plugins/digest/digest.js:700
+#: js/viewfeed.js:440 plugins/digest/digest.js:259
+#: plugins/digest/digest.js:700
 msgid "Star article"
 msgstr "Отмеченные"
 
-#: js/viewfeed.js:496 js/viewfeed.js:485 js/viewfeed.js:491 js/viewfeed.js:473
-#: plugins/digest/digest.js:262 plugins/digest/digest.js:731
+#: js/viewfeed.js:473 plugins/digest/digest.js:262
+#: plugins/digest/digest.js:731
 msgid "Unpublish article"
 msgstr "Не публиковать"
 
-#: js/viewfeed.js:676 js/viewfeed.js:704 js/viewfeed.js:731 js/viewfeed.js:793
-#: js/viewfeed.js:825 js/viewfeed.js:962 js/viewfeed.js:1005
-#: js/viewfeed.js:1055 js/viewfeed.js:2181 js/viewfeed.js:665
-#: js/viewfeed.js:693 js/viewfeed.js:720 js/viewfeed.js:782 js/viewfeed.js:814
-#: js/viewfeed.js:951 js/viewfeed.js:994 js/viewfeed.js:1044
-#: js/viewfeed.js:2154 js/viewfeed.js:671 js/viewfeed.js:699
-#: js/viewfeed.js:726 js/viewfeed.js:788 js/viewfeed.js:820 js/viewfeed.js:957
-#: js/viewfeed.js:1000 js/viewfeed.js:1050 js/viewfeed.js:2018
 #: js/viewfeed.js:674 js/viewfeed.js:702 js/viewfeed.js:729 js/viewfeed.js:791
 #: js/viewfeed.js:823 js/viewfeed.js:960 js/viewfeed.js:1003
 #: js/viewfeed.js:1053 js/viewfeed.js:1927 plugins/mail/mail.js:7
 msgid "No articles are selected."
 msgstr "Нет выбранных статей."
 
-#: js/viewfeed.js:942 js/viewfeed.js:931 js/viewfeed.js:937 js/viewfeed.js:940
+#: js/viewfeed.js:940
 msgid "Mark all visible articles in %s as read?"
 msgstr "Отметить все видимые статьи в %s как прочитанные?"
 
-#: js/viewfeed.js:970 js/viewfeed.js:959 js/viewfeed.js:965 js/viewfeed.js:968
+#: js/viewfeed.js:968
 #, fuzzy
 msgid "Delete %d selected articles in %s?"
 msgstr "Отметить %d выбранные статьи в %s как прочитанные?"
 
-#: js/viewfeed.js:972 js/viewfeed.js:961 js/viewfeed.js:967 js/viewfeed.js:970
+#: js/viewfeed.js:970
 msgid "Delete %d selected articles?"
 msgstr "Удалить %d выбранных статей?"
 
-#: js/viewfeed.js:1014 js/viewfeed.js:1003 js/viewfeed.js:1009
 #: js/viewfeed.js:1012
 msgid "Archive %d selected articles in %s?"
 msgstr "Архивировать %d выбранных статей в %s?"
 
-#: js/viewfeed.js:1017 js/viewfeed.js:1006 js/viewfeed.js:1012
 #: js/viewfeed.js:1015
 msgid "Move %d archived articles back?"
 msgstr "Переместить %d архивированных статей назад?"
 
-#: js/viewfeed.js:1061 js/viewfeed.js:1050 js/viewfeed.js:1056
 #: js/viewfeed.js:1059
 msgid "Mark %d selected articles in %s as read?"
 msgstr "Отметить %d выбранные статьи в %s как прочитанные?"
 
-#: js/viewfeed.js:1085 js/viewfeed.js:1074 js/viewfeed.js:1080
 #: js/viewfeed.js:1083
 msgid "Edit article Tags"
 msgstr "Редактировать теги"
 
-#: js/viewfeed.js:1247 js/viewfeed.js:1236 js/viewfeed.js:1242
 #: js/viewfeed.js:1252
 msgid "No article is selected."
 msgstr "Статья не выбрана"
 
-#: js/viewfeed.js:1282 js/viewfeed.js:1271 js/viewfeed.js:1277
 #: js/viewfeed.js:1287
 msgid "No articles found to mark"
 msgstr "Статей для отметки не найдено."
 
-#: js/viewfeed.js:1284 js/viewfeed.js:1273 js/viewfeed.js:1279
 #: js/viewfeed.js:1289
 msgid "Mark %d article(s) as read?"
 msgstr "Отметить %d статью(ей) как прочитанные?"
 
-#: js/viewfeed.js:1402 js/viewfeed.js:1383
-msgid "Loading..."
-msgstr "Идет загрузка..."
-
-#: js/viewfeed.js:1891 js/viewfeed.js:1864 js/viewfeed.js:1734
 #: js/viewfeed.js:1744
 msgid "Open original article"
 msgstr "Показать оригинальное содержимое статьи"
 
-#: js/viewfeed.js:1897 js/viewfeed.js:1870
-msgid "View in a tt-rss tab"
-msgstr "Открыть статью в новой закладке tt-rss"
-
-#: js/viewfeed.js:1905 js/viewfeed.js:1878 js/viewfeed.js:1742
-#: js/viewfeed.js:1752
-msgid "Mark above as read"
-msgstr "Отметить статьи выше как прочитанные"
-
-#: js/viewfeed.js:1911 js/viewfeed.js:1884 js/viewfeed.js:1748
-#: js/viewfeed.js:1758
-msgid "Mark below as read"
-msgstr "Отметить статьи ниже как прочитанные"
-
-#: js/viewfeed.js:1967 js/viewfeed.js:1940 js/viewfeed.js:1804
 #: js/viewfeed.js:1814
 msgid "Remove label"
 msgstr "Удалить метку"
 
-#: js/viewfeed.js:1991 js/viewfeed.js:1964 js/viewfeed.js:1828
 #: js/viewfeed.js:1838
 msgid "Playing..."
 msgstr "Проигрываю..."
 
-#: js/viewfeed.js:1992 js/viewfeed.js:1965 js/viewfeed.js:1829
 #: js/viewfeed.js:1839
 msgid "Click to pause"
 msgstr "Пауза"
 
-#: js/viewfeed.js:2150 js/viewfeed.js:2123 js/viewfeed.js:1987
 #: js/viewfeed.js:1896
 #, fuzzy
 msgid "Please enter new score for selected articles:"
 msgstr "Пожалуйста, укажите заметку для статьи:"
 
-#: js/viewfeed.js:2192 js/viewfeed.js:2165 js/viewfeed.js:2029
 #: js/viewfeed.js:1938
 #, fuzzy
 msgid "Please enter new score for this article:"
 msgstr "Пожалуйста, укажите заметку для статьи:"
 
-#: js/functions.js:1887 js/functions.js:1891 js/functions.js:1897
-#: js/functions.js:1899
-msgid "Help"
-msgstr "Помощь"
-
-#: js/prefs.js:1831 js/prefs.js:1821
-msgid "Clear stored data for this plugin?"
-msgstr ""
-
-#: js/tt-rss.js:741 js/tt-rss.js:676 js/tt-rss.js:668
-#, fuzzy
-msgid "Please enable mail plugin first."
-msgstr "Пожалуйста выберите какой-нибудь канал."
-
-#: plugins/digest/digest_body.php:39
-msgid "Your browser doesn't support Javascript, which is required"
-msgstr ""
-
-#: plugins/nsfw/init.php:32 plugins/nsfw/init.php:43
-msgid "Not work safe (click to toggle)"
-msgstr ""
-
-#: plugins/nsfw/init.php:53
-msgid "NSFW Plugin"
-msgstr ""
-
-#: plugins/nsfw/init.php:80
-msgid "Tags to consider NSFW (comma-separated)"
-msgstr ""
-
-#: plugins/nsfw/init.php:101
-#, fuzzy
-msgid "Configuration saved."
-msgstr "Конфигурация сохранена."
-
-#: plugins/owncloud/init.php:35
-msgid "Owncloud"
-msgstr ""
-
-#: plugins/owncloud/init.php:59
-msgid "Owncloud url"
-msgstr ""
-
 #: plugins/digest/digest.js:71
 #, fuzzy
 msgid "Mark %d displayed articles as read?"
@@ -3253,6 +3223,24 @@ msgstr "&nbsp;&nbsp;Показать/скрыть прочитанные"
 msgid "Load more..."
 msgstr "Идет загрузка помощи..."
 
+#: plugins/import_export/import_export.js:13
+msgid "Export Data"
+msgstr "Экспортировать данные"
+
+#: plugins/import_export/import_export.js:40
+msgid ""
+"Finished, exported %d articles. You can download the data <a "
+"class='visibleLink' href='%u'>here</a>."
+msgstr ""
+
+#: plugins/import_export/import_export.js:93
+msgid "Data Import"
+msgstr "Импортировать данные"
+
+#: plugins/import_export/import_export.js:112
+msgid "Please choose the file first."
+msgstr "Пожалуйста выберите файл."
+
 #: plugins/mail/mail.js:21
 #, fuzzy
 msgid "Forward article by email"
@@ -3293,6 +3281,99 @@ msgid ""
 "before continuing. Please type 'yes' to continue."
 msgstr ""
 
+#~ msgid "Comments?"
+#~ msgstr "Комментарии?"
+
+#~ msgid "Move between feeds"
+#~ msgstr "Перемещаться между каналами"
+
+#~ msgid "Move between articles"
+#~ msgstr "Перемещаться между статьями"
+
+#~ msgid "Active article actions"
+#~ msgstr "Действия над текущей статьёй"
+
+#~ msgid "Dismiss read articles"
+#~ msgstr "Скрыть прочитанные статьи"
+
+#~ msgid "Mark articles below/above active one as read"
+#~ msgstr "Отметить статью выше/ниже текущей, как прочитанную"
+
+#~ msgid "Scroll article content"
+#~ msgstr "Прокрутить содержимое статьи"
+
+#~ msgid "Other actions"
+#~ msgstr "Другие действия:"
+
+#~ msgid "Display this help dialog"
+#~ msgstr "Показать этот диалог помощи"
+
+#~ msgid "Multiple articles actions"
+#~ msgstr "Действия над несколькими статьями"
+
+#, fuzzy
+#~ msgid "Select starred articles"
+#~ msgstr "Выбрать непрочитанные статьи"
+
+#~ msgid "Feed actions"
+#~ msgstr "Действия над каналом"
+
+#~ msgid "Mark feed as read"
+#~ msgstr "Отметить канал как прочитанный"
+
+#~ msgid "If viewing category, (un)collapse it"
+#~ msgstr "Если котегория видна, (раз)свернуть её"
+
+#~ msgid "Press any key to close this window."
+#~ msgstr "Нажмите любую клавишу для закрытия этого окна"
+
+#~ msgid "My Feeds"
+#~ msgstr "Мои каналы"
+
+#~ msgid "Other Feeds"
+#~ msgstr "Другие каналы"
+
+#~ msgid "Panel actions"
+#~ msgstr "Действия над каналами"
+
+#~ msgid "Top 25 feeds"
+#~ msgstr "Лучшие 25 каналов"
+
+#~ msgid "Edit feed categories"
+#~ msgstr "Редактировать категории канала"
+
+#~ msgid "Focus search (if present)"
+#~ msgstr "Фокус на поиск (если поиск показан)"
+
+#~ msgid ""
+#~ "<b>Note:</b> not all actions may be available, depending on Tiny Tiny RSS "
+#~ "configuration and your access level."
+#~ msgstr ""
+#~ "<b>Замечание:</b> не все действия могут быть доступны. Это зависит от "
+#~ "конфигурации Tiny Tiny RSS и вашего уровня доступа."
+
+#~ msgid "Open article in new tab"
+#~ msgstr "Открыть статью в новом табе"
+
+#~ msgid "Select theme"
+#~ msgstr "Выбор темы"
+
+#~ msgid "Right-to-left content"
+#~ msgstr "Язык канала пишется справа налево"
+
+#, fuzzy
+#~ msgid "Cache content locally"
+#~ msgstr "Кэшировать изображения локально"
+
+#~ msgid "Mark posts as updated on content change"
+#~ msgstr "При изменении текста статьи, помечать ее как обновленную"
+
+#~ msgid "Loading..."
+#~ msgstr "Идет загрузка..."
+
+#~ msgid "View in a tt-rss tab"
+#~ msgstr "Открыть статью в новой закладке tt-rss"
+
 #~ msgid "Magpie"
 #~ msgstr "Magpie"
 
@@ -3479,16 +3560,9 @@ msgstr ""
 #~ msgid "See also:"
 #~ msgstr "Смотри также:"
 
-#~ msgid "description"
-#~ msgstr "описание"
-
 #~ msgid "short_desc"
 #~ msgstr "краткое описание"
 
-#, fuzzy
-#~ msgid "Dismiss article"
-#~ msgstr "Опубликовать"
-
 #, fuzzy
 #~ msgid "Remove:"
 #~ msgstr "Удалить"
@@ -3614,9 +3688,6 @@ msgstr ""
 #~ "Эта опция скрывает список каналов и позволяет его переключать на лету, "
 #~ "удобно для маленьких экранов"
 
-#~ msgid "Enable feed icons"
-#~ msgstr "Разрешить иконки каналов"
-
 #~ msgid "Enable labels"
 #~ msgstr "Включить метки"
 
@@ -3742,9 +3813,6 @@ msgstr ""
 #~ msgid "Saved filter <b>%s</b>"
 #~ msgstr "Фильтр <b>%s</b> сохранен"
 
-#~ msgid "Click to collapse category"
-#~ msgstr "Щёлкните, чтобы развернуть категорию"
-
 #~ msgid "Tags"
 #~ msgstr "Теги"
 
@@ -3775,10 +3843,6 @@ msgstr ""
 #~ msgid "Go online"
 #~ msgstr "Перейти в онлайн"
 
-#, fuzzy
-#~ msgid "Toggle reordering mode"
-#~ msgstr "Переключить изменение режима категории"
-
 #~ msgid "Reset UI layout"
 #~ msgstr "Сбросить панели"
 
@@ -3862,9 +3926,6 @@ msgstr ""
 #~ msgid "Reset category order?"
 #~ msgstr "Сбросить порядок категорий?"
 
-#~ msgid "Generated feed"
-#~ msgstr "Генерировать канал"
-
 #~ msgid "No feeds to display."
 #~ msgstr "Нет каналов для отображения."
 
@@ -4029,9 +4090,6 @@ msgstr ""
 #~ "Вы не сможете перейти в оффлайн режим Tiny Tiny RSS до тех пор, пока не "
 #~ "переключитесь в оффлайн снова. Выходим в онлайн?"
 
-#~ msgid "All feeds updated."
-#~ msgstr "Все каналы обновлены."
-
 #~ msgid "Can't open article: received invalid XML"
 #~ msgstr "Не могу открыть статью: получен неверный XML"
 
@@ -4112,9 +4170,6 @@ msgstr ""
 #~ msgid "Recategorize"
 #~ msgstr "Изменить категорию"
 
-#~ msgid "Other:"
-#~ msgstr "Другой:"
-
 #~ msgid "Generate another link"
 #~ msgstr "Создать другую ссылку"
 
@@ -4124,9 +4179,6 @@ msgstr ""
 #~ msgid "View:"
 #~ msgstr "Показать:"
 
-#~ msgid "Refresh"
-#~ msgstr "Обновить"
-
 #~ msgid "Page"
 #~ msgstr "Страница"
 
diff --git a/locale/zh_CN/LC_MESSAGES/messages.mo b/locale/zh_CN/LC_MESSAGES/messages.mo
index a04747740..eaa7154a8 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 d9c7dbb89..c189fdf72 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: 2013-03-17 19:37+0400\n"
+"POT-Creation-Date: 2013-03-19 10:14+0400\n"
 "PO-Revision-Date: 2012-02-14 08:32+0000\n"
 "Last-Translator: Sai <lazycai.ffsky@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/tt-rss/"
@@ -19,79 +19,79 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: backend.php:67
+#: backend.php:71
 msgid "Use default"
 msgstr "使用默认"
 
-#: backend.php:68
+#: backend.php:72
 msgid "Never purge"
 msgstr "从不清理"
 
-#: backend.php:69
+#: backend.php:73
 msgid "1 week old"
 msgstr "1周前"
 
-#: backend.php:70
+#: backend.php:74
 msgid "2 weeks old"
 msgstr "2周前"
 
-#: backend.php:71
+#: backend.php:75
 msgid "1 month old"
 msgstr "1个月前"
 
-#: backend.php:72
+#: backend.php:76
 msgid "2 months old"
 msgstr "2个月前"
 
-#: backend.php:73
+#: backend.php:77
 msgid "3 months old"
 msgstr "3个月前"
 
-#: backend.php:76
+#: backend.php:80
 msgid "Default interval"
 msgstr "默认间隔"
 
-#: backend.php:77 backend.php:87
+#: backend.php:81 backend.php:91
 msgid "Disable updates"
 msgstr "禁用更新"
 
-#: backend.php:78 backend.php:88
+#: backend.php:82 backend.php:92
 msgid "Each 15 minutes"
 msgstr "每15分钟"
 
-#: backend.php:79 backend.php:89
+#: backend.php:83 backend.php:93
 msgid "Each 30 minutes"
 msgstr "每30分钟"
 
-#: backend.php:80 backend.php:90
+#: backend.php:84 backend.php:94
 msgid "Hourly"
 msgstr "每小时"
 
-#: backend.php:81 backend.php:91
+#: backend.php:85 backend.php:95
 msgid "Each 4 hours"
 msgstr "每4小时"
 
-#: backend.php:82 backend.php:92
+#: backend.php:86 backend.php:96
 msgid "Each 12 hours"
 msgstr "每12小时"
 
-#: backend.php:83 backend.php:93
+#: backend.php:87 backend.php:97
 msgid "Daily"
 msgstr "每天"
 
-#: backend.php:84 backend.php:94
+#: backend.php:88 backend.php:98
 msgid "Weekly"
 msgstr "每周"
 
-#: backend.php:97 classes/pref/users.php:139
+#: backend.php:101 classes/pref/users.php:139
 msgid "User"
 msgstr "用户"
 
-#: backend.php:98
+#: backend.php:102
 msgid "Power User"
 msgstr "Power User"
 
-#: backend.php:99
+#: backend.php:103
 msgid "Administrator"
 msgstr "管理员"
 
@@ -122,7 +122,7 @@ msgstr "Tiny Tiny RSS 数据库是最新版。"
 #: db-updater.php:94 db-updater.php:163 db-updater.php:176 register.php:194
 #: register.php:239 register.php:252 register.php:267 register.php:286
 #: register.php:371 register.php:381 register.php:393
-#: classes/handler/public.php:637 classes/handler/public.php:725
+#: classes/handler/public.php:611 classes/handler/public.php:699
 msgid "Return to Tiny Tiny RSS"
 msgstr "返回 Tiny Tiny RSS"
 
@@ -247,195 +247,195 @@ msgstr ""
 msgid "SQL escaping test failed, check your database and PHP configuration"
 msgstr "SQL 脱出测试失败，请检查您的数据库和 PHP 设置。"
 
-#: index.php:108 index.php:150 index.php:236 prefs.php:86
-#: classes/backend.php:6 classes/pref/labels.php:296
-#: classes/pref/filters.php:602 classes/pref/feeds.php:1342
-#: plugins/digest/digest_body.php:45 js/viewfeed.js:1169 js/viewfeed.js:1158
-#: js/viewfeed.js:1164 js/viewfeed.js:1174
+#: index.php:117 index.php:147 index.php:252 prefs.php:79
+#: classes/backend.php:5 classes/pref/labels.php:296
+#: classes/pref/filters.php:609 classes/pref/feeds.php:1270
+#: plugins/digest/digest_body.php:45 js/viewfeed.js:1174
 msgid "Loading, please wait..."
 msgstr "读取中，请稍候……"
 
-#: index.php:118 plugins/digest/digest_body.php:56
-msgid "Hello,"
-msgstr "您好，"
+#: index.php:127 index.php:198
+msgid "Communication problem with server."
+msgstr ""
 
-#: index.php:120 prefs.php:29 prefs.php:108 help/main.php:73 help/prefs.php:8
-#: classes/pref/prefs.php:371
-msgid "Preferences"
-msgstr "偏好设置"
-
-#: index.php:124
-msgid "Comments?"
-msgstr "评论些什么？"
-
-#: index.php:128 mobile/mobile-functions.php:69
-#: mobile/mobile-functions.php:244 plugins/digest/digest_body.php:59
-msgid "Logout"
-msgstr "注销"
-
-#: index.php:134
+#: index.php:133 index.php:206
 msgid "New version of Tiny Tiny RSS is available!"
 msgstr "Tiny Tiny RSS 有新版本啦！"
 
-#: index.php:157
-msgid "News"
-msgstr "新闻"
-
-#: index.php:166
+#: index.php:161
 msgid "Collapse feedlist"
 msgstr "收缩侧边栏"
 
-#: index.php:169
+#: index.php:164
 msgid "Show articles"
 msgstr "显示文章"
 
-#: index.php:172
+#: index.php:167
 msgid "Adaptive"
 msgstr "自动适应"
 
-#: index.php:173
+#: index.php:168
 msgid "All Articles"
 msgstr "全部文章"
 
-#: index.php:174 classes/feeds.php:106
+#: index.php:169 include/functions.php:1912 classes/feeds.php:106
 msgid "Starred"
 msgstr "加星标的"
 
-#: index.php:175 classes/feeds.php:107
+#: index.php:170 include/functions.php:1913 classes/feeds.php:107
 msgid "Published"
 msgstr "已发布"
 
-#: index.php:176 classes/feeds.php:93 classes/feeds.php:105
+#: index.php:171 classes/feeds.php:93 classes/feeds.php:105
 msgid "Unread"
 msgstr "未读"
 
-#: index.php:177
+#: index.php:172
 msgid "Ignore Scoring"
 msgstr "忽略评分"
 
-#: index.php:178
+#: index.php:173
 msgid "Updated"
 msgstr "有更新的"
 
-#: index.php:181
+#: index.php:176
 msgid "Sort articles"
 msgstr "排序文章"
 
-#: index.php:184 classes/pref/prefs.php:462
+#: index.php:179
 msgid "Default"
 msgstr "默认"
 
-#: index.php:185
+#: index.php:180
 msgid "Date"
 msgstr "日期"
 
-#: index.php:186 include/localized_schema.php:3
+#: index.php:181 include/localized_schema.php:3
 msgid "Title"
 msgstr "标题"
 
-#: index.php:187
+#: index.php:182
 msgid "Score"
 msgstr "评分"
 
-#: index.php:192 classes/pref/feeds.php:539 classes/pref/feeds.php:786
+#: index.php:187 classes/pref/feeds.php:535 classes/pref/feeds.php:746
 msgid "Update"
 msgstr "更新列表"
 
-#: index.php:196 index.php:211 include/localized_schema.php:10
-#: classes/feeds.php:111 classes/feeds.php:127 js/FeedTree.js:128
-#: js/FeedTree.js:156 plugins/digest/digest.js:630
+#: index.php:191 index.php:221 include/functions.php:1903
+#: include/localized_schema.php:10 classes/feeds.php:111 classes/feeds.php:131
+#: js/FeedTree.js:128 js/FeedTree.js:156 plugins/digest/digest.js:630
 msgid "Mark as read"
 msgstr "标记为已读"
 
-#: index.php:202 classes/feeds.php:101
+#: index.php:211
 msgid "Actions..."
 msgstr "动作"
 
-#: index.php:204
+#: index.php:213
+#, fuzzy
+msgid "Preferences..."
+msgstr "偏好设置"
+
+#: index.php:214
 msgid "Search..."
 msgstr "搜索"
 
-#: index.php:205
+#: index.php:215
 msgid "Feed actions:"
 msgstr "信息源操作："
 
-#: index.php:206 classes/handler/public.php:567
+#: index.php:216 classes/handler/public.php:541
 msgid "Subscribe to feed..."
 msgstr "订阅信息源"
 
-#: index.php:207
+#: index.php:217
 msgid "Edit this feed..."
 msgstr "编辑信息源"
 
-#: index.php:208
+#: index.php:218
 msgid "Rescore feed"
 msgstr "为信息源重新评分"
 
-#: index.php:209 classes/pref/feeds.php:712 classes/pref/feeds.php:1315
+#: index.php:219 classes/pref/feeds.php:672 classes/pref/feeds.php:1243
 #: js/PrefFeedTree.js:73
 msgid "Unsubscribe"
 msgstr "取消订阅"
 
-#: index.php:210
+#: index.php:220
 msgid "All feeds:"
 msgstr "全部信息源："
 
-#: index.php:212 help/main.php:56
+#: index.php:222
 msgid "(Un)hide read feeds"
 msgstr "隐藏（显示）已读信息"
 
-#: index.php:213
+#: index.php:223
 msgid "Other actions:"
 msgstr "其他操作："
 
-#: index.php:215
+#: index.php:225
 msgid "Switch to digest..."
 msgstr "切换至摘要模式"
 
-#: index.php:217
+#: index.php:227
 msgid "Show tag cloud..."
 msgstr "显示标签云"
 
-#: index.php:218
+#: index.php:229 include/functions.php:1890
+#, fuzzy
+msgid "Toggle widescreen mode"
+msgstr "锁定加星标的项"
+
+#: index.php:231
 msgid "Select by tags..."
 msgstr "通过自定义标签选择"
 
-#: index.php:219
+#: index.php:232
 msgid "Create label..."
 msgstr "创建预定义标签"
 
-#: index.php:220
+#: index.php:233
 msgid "Create filter..."
 msgstr "创建过滤器"
 
-#: index.php:221
+#: index.php:234
 msgid "Keyboard shortcuts help"
 msgstr "快捷键帮助"
 
-#: prefs.php:99
+#: index.php:236 mobile/mobile-functions.php:69
+#: mobile/mobile-functions.php:244 plugins/digest/digest_body.php:59
+msgid "Logout"
+msgstr "注销"
+
+#: prefs.php:28 prefs.php:99 include/functions.php:1915
+#: classes/pref/prefs.php:371
+msgid "Preferences"
+msgstr "偏好设置"
+
+#: prefs.php:90
 msgid "Keyboard shortcuts"
 msgstr "快捷键"
 
-#: prefs.php:100 help/prefs.php:14
+#: prefs.php:91
 msgid "Exit preferences"
 msgstr "退出偏好设置"
 
-#: prefs.php:111 classes/pref/feeds.php:101 classes/pref/feeds.php:1220
-#: classes/pref/feeds.php:1283
+#: prefs.php:102 classes/pref/feeds.php:100 classes/pref/feeds.php:1148
+#: classes/pref/feeds.php:1211
 msgid "Feeds"
 msgstr "信息源"
 
-#: prefs.php:114 help/prefs.php:11 classes/pref/filters.php:110
+#: prefs.php:105 classes/pref/filters.php:117
 msgid "Filters"
 msgstr "过滤器"
 
-#: prefs.php:117 help/prefs.php:12 mobile/mobile-functions.php:205
-#: include/functions.php:1189 include/functions.php:1836
-#: classes/pref/labels.php:90
+#: prefs.php:108 mobile/mobile-functions.php:205 include/functions.php:1118
+#: include/functions.php:1739 classes/pref/labels.php:90
 msgid "Labels"
 msgstr "预定义标签"
 
-#: prefs.php:121 help/prefs.php:13
+#: prefs.php:112
 msgid "Users"
 msgstr "用户"
 
@@ -494,241 +494,23 @@ msgstr "帐号创建成功。"
 msgid "New user registrations are currently closed."
 msgstr "用户注册功能目前没有启用。"
 
-#: update.php:38
+#: update.php:37
 #, fuzzy
 msgid "Tiny Tiny RSS data update script."
 msgstr "Tiny Tiny RSS 数据库是最新版。"
 
-#: help/main.php:1 help/prefs.php:1
-msgid "Keyboard Shortcuts"
-msgstr "快捷键"
-
-#: help/main.php:5
-msgid "Navigation"
-msgstr "导航"
-
-#: help/main.php:8
-msgid "Move between feeds"
-msgstr "在信息源之间移动"
-
-#: help/main.php:9
-msgid "Move between articles"
-msgstr "在文章之间移动"
-
-#: help/main.php:10
-msgid "Show search dialog"
-msgstr "显示搜索对话框"
-
-#: help/main.php:13
-msgid "Active article actions"
-msgstr "启用文章动作"
-
-#: help/main.php:16
-msgid "Toggle starred"
-msgstr "锁定加星标的项"
-
-#: help/main.php:17
-msgid "Toggle published"
-msgstr "锁定发布的项"
-
-#: help/main.php:18
-msgid "Toggle unread"
-msgstr "锁定未读项"
-
-#: help/main.php:19
-msgid "Edit tags"
-msgstr "编辑自定义标签"
-
-#: help/main.php:20
-msgid "Dismiss selected articles"
-msgstr "不再显示所选的文章"
-
-#: help/main.php:21
-msgid "Dismiss read articles"
-msgstr "不再显示已读文章"
-
-#: help/main.php:22
-msgid "Open article in new window"
-msgstr "在新窗口打开文章"
-
-#: help/main.php:23
-msgid "Mark articles below/above active one as read"
-msgstr "将当前项以下/以上的文章标记为已读"
-
-#: help/main.php:24
-msgid "Scroll article content"
-msgstr "滚动文章内容"
-
-#: help/main.php:25
-msgid "Email article"
-msgstr "通过邮件发送文章"
-
-#: help/main.php:29 help/prefs.php:30
-msgid "Other actions"
-msgstr "其他动作"
-
-#: help/main.php:32
-msgid "Select article under mouse cursor"
-msgstr "选择鼠标指向的文章"
-
-#: help/main.php:33 help/prefs.php:26 classes/pref/labels.php:281
-msgid "Create label"
-msgstr "创建预定义标签"
-
-#: help/main.php:34 help/prefs.php:25 classes/pref/filters.php:580
-msgid "Create filter"
-msgstr "创建过滤器"
-
-#: help/main.php:35
-msgid "Collapse sidebar"
-msgstr "折叠侧边栏"
-
-#: help/main.php:36 help/prefs.php:34
-msgid "Display this help dialog"
-msgstr "显示本帮助对话框"
-
-#: help/main.php:41
-msgid "Multiple articles actions"
-msgstr "多文章动作"
-
-#: help/main.php:44
-msgid "Select all articles"
-msgstr "选择所有文章"
-
-#: help/main.php:45
-msgid "Select unread articles"
-msgstr "选择未读文章"
-
-#: help/main.php:46
-#, fuzzy
-msgid "Select starred articles"
-msgstr "选择未读文章"
-
-#: help/main.php:47
-#, fuzzy
-msgid "Select published articles"
-msgstr "选择未读文章"
-
-#: help/main.php:48
-msgid "Invert article selection"
-msgstr "反选文章"
-
-#: help/main.php:49
-msgid "Deselect all articles"
-msgstr "取消选择所有文章"
-
-#: help/main.php:52
-msgid "Feed actions"
-msgstr "信息源动作"
-
-#: help/main.php:55
-msgid "Refresh active feed"
-msgstr "刷新活动的信息源"
-
-#: help/main.php:57 help/prefs.php:22 classes/pref/feeds.php:1286
-msgid "Subscribe to feed"
-msgstr "订阅信息源"
-
-#: help/main.php:58 js/FeedTree.js:135 js/PrefFeedTree.js:67
-msgid "Edit feed"
-msgstr "编辑信息源"
-
-#: help/main.php:59
-msgid "Mark feed as read"
-msgstr "标记信息源为已读"
-
-#: help/main.php:60
-msgid "Reverse headlines order"
-msgstr "反向排序"
-
-#: help/main.php:61 js/FeedTree.js:170
-msgid "Mark all feeds as read"
-msgstr "标记所有信息源为已读"
-
-#: help/main.php:62
-msgid "If viewing category, (un)collapse it"
-msgstr "查看类别时将其折叠/展开"
-
-#: help/main.php:65 help/prefs.php:5
-msgid "Go to..."
-msgstr "跳转至……"
-
-#: help/main.php:68 include/functions.php:1893
-msgid "All articles"
-msgstr "全部文章"
-
-#: help/main.php:69 include/functions.php:1891
-msgid "Fresh articles"
-msgstr "最新更新的文章"
-
-#: help/main.php:70 include/functions.php:1887
-msgid "Starred articles"
-msgstr "加星标文章"
-
-#: help/main.php:71 include/functions.php:1889
-msgid "Published articles"
-msgstr "已发布文章"
-
-#: help/main.php:72
-msgid "Tag cloud"
-msgstr "标签云"
-
-#: help/main.php:79
-msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
-msgstr "在 Tiny Tiny RSS 的维基上可以找到其他界面技巧。"
-
-#: help/main.php:81 help/prefs.php:41
-msgid "Press any key to close this window."
-msgstr "按任意键关闭本窗口。"
-
-#: help/prefs.php:9
-msgid "My Feeds"
-msgstr "我的信息源"
-
-#: help/prefs.php:10
-msgid "Other Feeds"
-msgstr "其他信息源"
-
-#: help/prefs.php:19
-msgid "Panel actions"
-msgstr "版面动作"
-
-#: help/prefs.php:23
-msgid "Top 25 feeds"
-msgstr "前25位的信息源"
-
-#: help/prefs.php:24
-msgid "Edit feed categories"
-msgstr "编辑信息源类别"
-
-#: help/prefs.php:27 classes/pref/users.php:386
-msgid "Create user"
-msgstr "创建用户"
-
-#: help/prefs.php:33
-msgid "Focus search (if present)"
-msgstr "进入搜索框（页面中存在的情况）"
-
-#: help/prefs.php:39
-msgid ""
-"<b>Note:</b> not all actions may be available, depending on Tiny Tiny RSS "
-"configuration and your access level."
-msgstr ""
-"<b>提醒：</b>根据 Tiny Tiny RSS 的配置和你的访问级别不同，并非所有的动作都可"
-"以执行。"
-
 #: mobile/login_form.php:28 include/login_form.php:209
-#: classes/handler/public.php:495
+#: classes/handler/public.php:469
 msgid "Log in"
 msgstr "登录"
 
 #: mobile/login_form.php:40 include/login_form.php:169
-#: classes/handler/public.php:479
+#: classes/handler/public.php:453
 msgid "Login:"
 msgstr "登陆："
 
 #: mobile/login_form.php:45 include/login_form.php:178
-#: classes/handler/public.php:482
+#: classes/handler/public.php:456
 msgid "Password:"
 msgstr "密码："
 
@@ -743,8 +525,8 @@ msgstr ""
 msgid "Home"
 msgstr "主页"
 
-#: mobile/mobile-functions.php:178 include/functions.php:1187
-#: include/functions.php:1834
+#: mobile/mobile-functions.php:178 include/functions.php:1116
+#: include/functions.php:1737
 msgid "Special"
 msgstr "特殊区域"
 
@@ -757,12 +539,12 @@ msgid "Enable categories"
 msgstr "启用类别"
 
 #: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36
-#: mobile/prefs.php:41 mobile/prefs.php:46
+#: mobile/prefs.php:41 mobile/prefs.php:46 mobile/prefs.php:51
 msgid "ON"
 msgstr "ON"
 
 #: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36
-#: mobile/prefs.php:41 mobile/prefs.php:46
+#: mobile/prefs.php:41 mobile/prefs.php:46 mobile/prefs.php:51
 msgid "OFF"
 msgstr "OFF"
 
@@ -782,146 +564,336 @@ msgstr "隐藏已读的文章和信息源"
 msgid "Sort feeds by unread count"
 msgstr "以未读文章数量排列信息源"
 
-#: include/functions.php:564
-#, php-format
-msgid "Fatal: authentication module %s not found."
-msgstr ""
+#: mobile/prefs.php:50 include/localized_schema.php:45
+msgid "Reverse headline order (oldest first)"
+msgstr "反转标题列表顺序（最旧的在上面）"
 
-#: include/functions.php:682
-msgid "Session failed to validate (incorrect IP)"
-msgstr "无法验证会话（IP 错误）"
-
-#: include/functions.php:1198 include/functions.php:1737
-#: include/functions.php:1822 include/functions.php:1844
-#: include/functions.php:2699 classes/opml.php:416 classes/pref/feeds.php:193
+#: include/digest.php:131 include/functions.php:1127
+#: include/functions.php:1640 include/functions.php:1725
+#: include/functions.php:1747 classes/opml.php:416 classes/pref/feeds.php:188
 msgid "Uncategorized"
 msgstr "未分类"
 
-#: include/functions.php:1686 classes/dlg.php:387 classes/pref/filters.php:361
-msgid "All feeds"
-msgstr "全部信息源"
-
-#: include/functions.php:1895
-msgid "Archived articles"
-msgstr "存档的文章"
-
-#: include/functions.php:1897
-msgid "Recently read"
-msgstr ""
-
-#: include/functions.php:2346
-#, php-format
-msgid "Search results: %s"
-msgstr ""
-
-#: include/functions.php:3067 js/viewfeed.js:1998 js/viewfeed.js:1971
-#: js/viewfeed.js:1835 js/viewfeed.js:1845
-msgid "Click to play"
-msgstr "点击播放"
-
-#: include/functions.php:3068 js/viewfeed.js:1997 js/viewfeed.js:1970
-#: js/viewfeed.js:1834 js/viewfeed.js:1844
-msgid "Play"
-msgstr "播放"
-
-#: include/functions.php:3203
-msgid " - "
-msgstr " - "
-
-#: include/functions.php:3232 include/functions.php:4028 classes/rpc.php:414
-msgid "no tags"
-msgstr "无标签"
-
-#: include/functions.php:3242 classes/feeds.php:680
-msgid "Edit tags for this article"
-msgstr "为本文编辑自定义标签"
-
-#: include/functions.php:3252 classes/feeds.php:707
-msgid "Open article in new tab"
-msgstr "在新标签页中打开文章"
-
-#: include/functions.php:3263 classes/feeds.php:718
-msgid "Close article"
-msgstr ""
-
-#: include/functions.php:3280 classes/feeds.php:616
-msgid "Originally from:"
-msgstr "来源："
-
-#: include/functions.php:3293 classes/feeds.php:629 classes/pref/feeds.php:511
-msgid "Feed URL"
-msgstr "信息源 URL"
-
-#: include/functions.php:3308 classes/feeds.php:68
-msgid "Visit the website"
-msgstr "访问网站"
-
-#: include/functions.php:3327
-msgid "Related"
-msgstr ""
-
-#: include/functions.php:3361 classes/dlg.php:30 classes/dlg.php:61
-#: classes/dlg.php:180 classes/dlg.php:203 classes/dlg.php:240
-#: classes/dlg.php:524 classes/dlg.php:559 classes/dlg.php:590
-#: classes/dlg.php:623 classes/dlg.php:724 classes/pref/users.php:106
-#: classes/pref/filters.php:101 classes/pref/feeds.php:1638
-#: classes/pref/feeds.php:1709 plugins/share/share.php:61
-#: plugins/updater/updater.php:301 plugins/updater/init.php:323
-msgid "Close this window"
-msgstr "关闭本窗口"
-
-#: include/functions.php:4053
-msgid "(edit note)"
-msgstr "（编辑注记）"
-
-#: include/functions.php:4525
-msgid "No feed selected."
-msgstr "没有选中的信息源。"
-
-#: include/functions.php:4535 classes/feeds.php:766
-#, php-format
-msgid "Feeds last updated at %s"
-msgstr "上次信息源更新时间：%s"
-
-#: include/functions.php:4545 classes/feeds.php:776
-msgid "Some feeds have update errors (click for details)"
-msgstr "部分信息源更新错误（点击了解详情）"
-
-#: include/functions.php:4689
-msgid "unknown type"
-msgstr "未知类型"
-
-#: include/functions.php:4731
-#, fuzzy
-msgid "Attachments"
-msgstr "附件："
-
-#: include/functions.php:5191
+#: include/feedbrowser.php:83
 #, php-format
 msgid "%d archived articles"
 msgstr "%d 个存档的文章"
 
-#: include/functions.php:5215
+#: include/feedbrowser.php:107
 msgid "No feeds found."
 msgstr "未找到信息源。"
 
-#: include/functions.php:5261 plugins/import_export/init.php:221
-msgid "Could not import: incorrect schema version."
+#: include/functions.php:698
+msgid "Session failed to validate (incorrect IP)"
+msgstr "无法验证会话（IP 错误）"
+
+#: include/functions.php:1589 classes/dlg.php:371 classes/pref/filters.php:368
+msgid "All feeds"
+msgstr "全部信息源"
+
+#: include/functions.php:1790
+msgid "Starred articles"
+msgstr "加星标文章"
+
+#: include/functions.php:1792
+msgid "Published articles"
+msgstr "已发布文章"
+
+#: include/functions.php:1794
+msgid "Fresh articles"
+msgstr "最新更新的文章"
+
+#: include/functions.php:1796 include/functions.php:1910
+msgid "All articles"
+msgstr "全部文章"
+
+#: include/functions.php:1798
+msgid "Archived articles"
+msgstr "存档的文章"
+
+#: include/functions.php:1800
+msgid "Recently read"
 msgstr ""
 
-#: include/functions.php:5266 plugins/import_export/init.php:226
-msgid "Could not import: unrecognized document format."
+#: include/functions.php:1867
+msgid "Navigation"
+msgstr "导航"
+
+#: include/functions.php:1868
+#, fuzzy
+msgid "Open next feed"
+msgstr "自动显示下一个信息源"
+
+#: include/functions.php:1869
+msgid "Open previous feed"
 msgstr ""
 
-#: include/functions.php:5425
+#: include/functions.php:1870
+#, fuzzy
+msgid "Open next article"
+msgstr "打开原文"
+
+#: include/functions.php:1871
+#, fuzzy
+msgid "Open previous article"
+msgstr "打开原文"
+
+#: include/functions.php:1872
+msgid "Open next article (don't scroll long articles)"
+msgstr ""
+
+#: include/functions.php:1873
+msgid "Open previous article (don't scroll long articles)"
+msgstr ""
+
+#: include/functions.php:1874
+msgid "Show search dialog"
+msgstr "显示搜索对话框"
+
+#: include/functions.php:1875
+#, fuzzy
+msgid "Article"
+msgstr "全部文章"
+
+#: include/functions.php:1876
+msgid "Toggle starred"
+msgstr "锁定加星标的项"
+
+#: include/functions.php:1877
+msgid "Toggle published"
+msgstr "锁定发布的项"
+
+#: include/functions.php:1878
+msgid "Toggle unread"
+msgstr "锁定未读项"
+
+#: include/functions.php:1879
+msgid "Edit tags"
+msgstr "编辑自定义标签"
+
+#: include/functions.php:1880
+#, fuzzy
+msgid "Dismiss selected"
+msgstr "不再显示所选的文章"
+
+#: include/functions.php:1881
+#, fuzzy
+msgid "Dismiss read"
+msgstr "不再显示已读文章"
+
+#: include/functions.php:1882
+#, fuzzy
+msgid "Open in new window"
+msgstr "在新窗口打开文章"
+
+#: include/functions.php:1883 js/viewfeed.js:1758
+msgid "Mark below as read"
+msgstr ""
+
+#: include/functions.php:1884 js/viewfeed.js:1752
+msgid "Mark above as read"
+msgstr ""
+
+#: include/functions.php:1885
+#, fuzzy
+msgid "Scroll down"
+msgstr "全部完成。"
+
+#: include/functions.php:1886
+msgid "Scroll up"
+msgstr ""
+
+#: include/functions.php:1887
+#, fuzzy
+msgid "Select article under cursor"
+msgstr "选择鼠标指向的文章"
+
+#: include/functions.php:1888
+msgid "Email article"
+msgstr "通过邮件发送文章"
+
+#: include/functions.php:1889 plugins/close_button/init.php:24
+msgid "Close article"
+msgstr ""
+
+#: include/functions.php:1891
+#, fuzzy
+msgid "Article selection"
+msgstr "反选文章"
+
+#: include/functions.php:1892
+msgid "Select all articles"
+msgstr "选择所有文章"
+
+#: include/functions.php:1893
+#, fuzzy
+msgid "Select unread"
+msgstr "选择未读文章"
+
+#: include/functions.php:1894
+#, fuzzy
+msgid "Select starred"
+msgstr "加星标"
+
+#: include/functions.php:1895
+#, fuzzy
+msgid "Select published"
+msgstr "选择未读文章"
+
+#: include/functions.php:1896
+#, fuzzy
+msgid "Invert selection"
+msgstr "反选文章"
+
+#: include/functions.php:1897
+#, fuzzy
+msgid "Deselect everything"
+msgstr "取消选择所有文章"
+
+#: include/functions.php:1898 classes/pref/feeds.php:488
+#: classes/pref/feeds.php:707
+msgid "Feed"
+msgstr "信息源"
+
+#: include/functions.php:1899
+#, fuzzy
+msgid "Refresh current feed"
+msgstr "刷新活动的信息源"
+
+#: include/functions.php:1900
+#, fuzzy
+msgid "Un/hide read feeds"
+msgstr "隐藏（显示）已读信息"
+
+#: include/functions.php:1901 classes/pref/feeds.php:1214
+msgid "Subscribe to feed"
+msgstr "订阅信息源"
+
+#: include/functions.php:1902 js/FeedTree.js:135 js/PrefFeedTree.js:67
+msgid "Edit feed"
+msgstr "编辑信息源"
+
+#: include/functions.php:1904
+#, fuzzy
+msgid "Reverse headlines"
+msgstr "反向排序"
+
+#: include/functions.php:1905
+#, fuzzy
+msgid "Debug feed update"
+msgstr "禁用更新"
+
+#: include/functions.php:1906 js/FeedTree.js:170
+msgid "Mark all feeds as read"
+msgstr "标记所有信息源为已读"
+
+#: include/functions.php:1907
+#, fuzzy
+msgid "Un/collapse current category"
+msgstr "加入到类别："
+
+#: include/functions.php:1908
+#, fuzzy
+msgid "Toggle combined mode"
+msgstr "锁定发布的项"
+
+#: include/functions.php:1909
+#, fuzzy
+msgid "Go to"
+msgstr "跳转至……"
+
+#: include/functions.php:1911
+msgid "Fresh"
+msgstr ""
+
+#: include/functions.php:1914
+msgid "Tag cloud"
+msgstr "标签云"
+
+#: include/functions.php:1916
+#, fuzzy
+msgid "Other"
+msgstr "其他信息源"
+
+#: include/functions.php:1917 classes/pref/labels.php:281
+msgid "Create label"
+msgstr "创建预定义标签"
+
+#: include/functions.php:1918 classes/pref/filters.php:587
+msgid "Create filter"
+msgstr "创建过滤器"
+
+#: include/functions.php:1919
+#, fuzzy
+msgid "Un/collapse sidebar"
+msgstr "折叠侧边栏"
+
+#: include/functions.php:1920
+#, fuzzy
+msgid "Show help dialog"
+msgstr "显示搜索对话框"
+
+#: include/functions.php:2400
 #, php-format
-msgid "Finished: %d articles processed, %d imported, %d feeds created."
+msgid "Search results: %s"
 msgstr ""
 
-#: include/functions.php:5431 plugins/import_export/init.php:391
-msgid "Could not load XML document."
+#: include/functions.php:2824 js/viewfeed.js:1845
+msgid "Click to play"
+msgstr "点击播放"
+
+#: include/functions.php:2825 js/viewfeed.js:1844
+msgid "Play"
+msgstr "播放"
+
+#: include/functions.php:2945
+msgid " - "
+msgstr " - "
+
+#: include/functions.php:2967 include/functions.php:3284 classes/rpc.php:359
+msgid "no tags"
+msgstr "无标签"
+
+#: include/functions.php:2977 classes/feeds.php:645
+msgid "Edit tags for this article"
+msgstr "为本文编辑自定义标签"
+
+#: include/functions.php:3006 classes/feeds.php:600
+msgid "Originally from:"
+msgstr "来源："
+
+#: include/functions.php:3019 classes/feeds.php:613 classes/pref/feeds.php:507
+msgid "Feed URL"
+msgstr "信息源 URL"
+
+#: include/functions.php:3048
+msgid "Related"
 msgstr ""
 
+#: include/functions.php:3075 classes/dlg.php:43 classes/dlg.php:162
+#: classes/dlg.php:185 classes/dlg.php:222 classes/dlg.php:508
+#: classes/dlg.php:543 classes/dlg.php:574 classes/dlg.php:608
+#: classes/dlg.php:620 classes/backend.php:105 classes/pref/users.php:106
+#: classes/pref/filters.php:108 classes/pref/feeds.php:1527
+#: classes/pref/feeds.php:1598 plugins/import_export/init.php:407
+#: plugins/import_export/init.php:431 plugins/share/init.php:67
+#: plugins/updater/init.php:329
+msgid "Close this window"
+msgstr "关闭本窗口"
+
+#: include/functions.php:3309
+msgid "(edit note)"
+msgstr "（编辑注记）"
+
+#: include/functions.php:3542
+msgid "unknown type"
+msgstr "未知类型"
+
+#: include/functions.php:3592
+#, fuzzy
+msgid "Attachments"
+msgstr "附件："
+
 #: include/localized_schema.php:4
 msgid "Title or Content"
 msgstr "标题或内容"
@@ -946,9 +918,8 @@ msgstr "删除文章"
 msgid "Set starred"
 msgstr "加星标"
 
-#: include/localized_schema.php:12 js/viewfeed.js:501 js/viewfeed.js:490
-#: js/viewfeed.js:496 js/viewfeed.js:478 plugins/digest/digest.js:264
-#: plugins/digest/digest.js:736
+#: include/localized_schema.php:12 js/viewfeed.js:478
+#: plugins/digest/digest.js:264 plugins/digest/digest.js:736
 msgid "Publish article"
 msgstr "发布文章"
 
@@ -956,8 +927,7 @@ msgstr "发布文章"
 msgid "Assign tags"
 msgstr "添加自定义标签"
 
-#: include/localized_schema.php:14 js/viewfeed.js:1962 js/viewfeed.js:1935
-#: js/viewfeed.js:1799 js/viewfeed.js:1809
+#: include/localized_schema.php:14 js/viewfeed.js:1809
 msgid "Assign label"
 msgstr "添加预定义标签"
 
@@ -1091,10 +1061,6 @@ msgstr "自动显示下一个信息源"
 msgid "Sort feeds by unread articles count"
 msgstr "以未读文章数量排序信息源"
 
-#: include/localized_schema.php:45
-msgid "Reverse headline order (oldest first)"
-msgstr "反转标题列表顺序（最旧的在上面）"
-
 #: include/localized_schema.php:46
 msgid "Enable e-mail digest"
 msgstr "启用电子邮件摘要"
@@ -1140,7 +1106,8 @@ msgid "Group headlines in virtual feeds"
 msgstr "对虚拟源中的文章按源分组"
 
 #: include/localized_schema.php:57
-msgid "Do not show images in articles"
+#, fuzzy
+msgid "Hide images in articles"
 msgstr "不要显示文章中的图片"
 
 #: include/localized_schema.php:58
@@ -1151,8 +1118,7 @@ msgstr "允许使用外部 API"
 msgid "User timezone"
 msgstr "用户所在时区"
 
-#: include/localized_schema.php:60 js/prefs.js:1856 js/prefs.js:1743
-#: js/prefs.js:1733
+#: include/localized_schema.php:60 js/prefs.js:1733
 msgid "Customize stylesheet"
 msgstr "自定义样式"
 
@@ -1172,7 +1138,7 @@ msgstr ""
 msgid "Assign articles to labels automatically"
 msgstr ""
 
-#: include/login_form.php:185 classes/handler/public.php:485
+#: include/login_form.php:185 classes/handler/public.php:459
 msgid "Language:"
 msgstr "语言："
 
@@ -1180,8 +1146,8 @@ msgstr "语言："
 msgid "Profile:"
 msgstr "偏好："
 
-#: include/login_form.php:197 classes/handler/public.php:208
-#: classes/rpc.php:147 classes/dlg.php:116
+#: include/login_form.php:197 classes/handler/public.php:212
+#: classes/rpc.php:64 classes/dlg.php:98
 msgid "Default profile"
 msgstr "默认偏好设置"
 
@@ -1193,182 +1159,165 @@ msgstr "使用较少流量"
 msgid "Article not found."
 msgstr "找不到文章。"
 
-#: classes/handler/public.php:420 classes/pref/feeds.php:1480
+#: classes/handler/public.php:394 plugins/bookmarklets/init.php:38
 #, fuzzy
 msgid "Share with Tiny Tiny RSS"
 msgstr "在 Tiny Tiny RSS 中订阅"
 
-#: classes/handler/public.php:428
+#: classes/handler/public.php:402
 #, fuzzy
 msgid "Title:"
 msgstr "标题"
 
-#: classes/handler/public.php:430 classes/dlg.php:667
-#: classes/pref/feeds.php:509 classes/pref/feeds.php:762
-#: plugins/instances/instances.php:100 plugins/instances/init.php:215
+#: classes/handler/public.php:404 classes/dlg.php:667
+#: classes/pref/feeds.php:505 classes/pref/feeds.php:722
+#: plugins/instances/init.php:215
 msgid "URL:"
 msgstr "URL："
 
-#: classes/handler/public.php:432
+#: classes/handler/public.php:406
 #, fuzzy
 msgid "Content:"
 msgstr "内容"
 
-#: classes/handler/public.php:434
+#: classes/handler/public.php:408
 #, fuzzy
 msgid "Labels:"
 msgstr "预定义标签"
 
-#: classes/handler/public.php:453
+#: classes/handler/public.php:427
 msgid "Shared article will appear in the Published feed."
 msgstr ""
 
-#: classes/handler/public.php:455
+#: classes/handler/public.php:429
 msgid "Share"
 msgstr ""
 
-#: classes/handler/public.php:456 classes/handler/public.php:498
-#: classes/dlg.php:315 classes/dlg.php:366 classes/dlg.php:426
-#: classes/dlg.php:457 classes/dlg.php:652 classes/dlg.php:702
-#: classes/dlg.php:774 classes/pref/users.php:194 classes/pref/labels.php:81
-#: classes/pref/filters.php:342 classes/pref/filters.php:722
-#: classes/pref/filters.php:791 classes/pref/filters.php:858
-#: classes/pref/feeds.php:729 classes/pref/feeds.php:880
-#: plugins/mail/mail.php:126 plugins/note/note.php:49
-#: plugins/instances/instances.php:136
+#: classes/handler/public.php:430 classes/handler/public.php:472
+#: classes/dlg.php:297 classes/dlg.php:350 classes/dlg.php:410
+#: classes/dlg.php:441 classes/dlg.php:652 classes/dlg.php:702
+#: classes/dlg.php:751 classes/pref/users.php:194 classes/pref/labels.php:81
+#: classes/pref/filters.php:349 classes/pref/filters.php:729
+#: classes/pref/filters.php:798 classes/pref/filters.php:865
+#: classes/pref/feeds.php:689 classes/pref/feeds.php:829
+#: plugins/mail/init.php:132 plugins/note/init.php:55
+#: plugins/instances/init.php:251
 msgid "Cancel"
 msgstr "取消"
 
-#: classes/handler/public.php:477
+#: classes/handler/public.php:451
 #, fuzzy
 msgid "Not logged in"
 msgstr "上次登录"
 
-#: classes/handler/public.php:537
+#: classes/handler/public.php:511
 msgid "Incorrect username or password"
 msgstr "用户名或密码错误"
 
-#: classes/handler/public.php:573 classes/handler/public.php:670
+#: classes/handler/public.php:547 classes/handler/public.php:644
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "已经订阅到 <b>%s</b>."
 
-#: classes/handler/public.php:576 classes/handler/public.php:661
+#: classes/handler/public.php:550 classes/handler/public.php:635
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "订阅到 <b>%s</b>."
 
-#: classes/handler/public.php:579 classes/handler/public.php:664
+#: classes/handler/public.php:553 classes/handler/public.php:638
 #, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "无法订阅 <b>%s</b>。"
 
-#: classes/handler/public.php:582 classes/handler/public.php:667
+#: classes/handler/public.php:556 classes/handler/public.php:641
 #, php-format
 msgid "No feeds found in <b>%s</b>."
 msgstr "在 <b>%s</b> 中没有找到信息源。"
 
-#: classes/handler/public.php:585 classes/handler/public.php:673
+#: classes/handler/public.php:559 classes/handler/public.php:647
 #, fuzzy
 msgid "Multiple feed URLs found."
 msgstr "未找到信息源。"
 
-#: classes/handler/public.php:589 classes/handler/public.php:678
+#: classes/handler/public.php:563 classes/handler/public.php:652
 #, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr "无法订阅 <b>%s</b>。<br>无法下载信息源的 URL。"
 
-#: classes/handler/public.php:607 classes/handler/public.php:696
+#: classes/handler/public.php:581 classes/handler/public.php:670
 msgid "Subscribe to selected feed"
 msgstr "订阅选中的信息源"
 
-#: classes/handler/public.php:632 classes/handler/public.php:720
+#: classes/handler/public.php:606 classes/handler/public.php:694
 msgid "Edit subscription options"
 msgstr "编辑订阅选项"
 
-#: classes/auth/internal.php:45 plugins/auth_internal/init.php:62
-#, fuzzy
-msgid "Please enter your one time password:"
-msgstr "请填写类别名称："
-
-#: classes/auth/internal.php:168 plugins/auth_internal/init.php:185
-msgid "Password has been changed."
-msgstr "密码更改成功。"
-
-#: classes/auth/internal.php:170
-msgid "Old password is incorrect."
-msgstr "原密码输入错误。"
-
-#: classes/dlg.php:26
-msgid "Prepare data"
-msgstr ""
-
-#: classes/dlg.php:40
+#: classes/dlg.php:22
 msgid ""
 "If you have imported labels and/or filters, you might need to reload "
 "preferences to see your new data."
 msgstr ""
 
-#: classes/dlg.php:73 classes/pref/users.php:378 classes/pref/labels.php:272
-#: classes/pref/filters.php:223 classes/pref/filters.php:270
-#: classes/pref/filters.php:571 classes/pref/filters.php:650
-#: classes/pref/filters.php:677 classes/pref/feeds.php:1274
-#: classes/pref/feeds.php:1583 classes/pref/feeds.php:1652
-#: plugins/instances/instances.php:172
+#: classes/dlg.php:55 classes/pref/users.php:378 classes/pref/labels.php:272
+#: classes/pref/filters.php:230 classes/pref/filters.php:277
+#: classes/pref/filters.php:578 classes/pref/filters.php:657
+#: classes/pref/filters.php:684 classes/pref/feeds.php:1202
+#: classes/pref/feeds.php:1472 classes/pref/feeds.php:1541
+#: plugins/instances/init.php:287
 msgid "Select"
 msgstr "选择"
 
-#: classes/dlg.php:76 classes/feeds.php:92 classes/pref/users.php:381
-#: classes/pref/labels.php:275 classes/pref/filters.php:226
-#: classes/pref/filters.php:273 classes/pref/filters.php:574
-#: classes/pref/filters.php:653 classes/pref/filters.php:680
-#: classes/pref/feeds.php:1277 classes/pref/feeds.php:1586
-#: classes/pref/feeds.php:1655 plugins/instances/instances.php:175
+#: classes/dlg.php:58 classes/feeds.php:92 classes/pref/users.php:381
+#: classes/pref/labels.php:275 classes/pref/filters.php:233
+#: classes/pref/filters.php:280 classes/pref/filters.php:581
+#: classes/pref/filters.php:660 classes/pref/filters.php:687
+#: classes/pref/feeds.php:1205 classes/pref/feeds.php:1475
+#: classes/pref/feeds.php:1544 plugins/instances/init.php:290
 msgid "All"
 msgstr "全部"
 
-#: classes/dlg.php:78 classes/feeds.php:95 classes/pref/users.php:383
-#: classes/pref/labels.php:277 classes/pref/filters.php:228
-#: classes/pref/filters.php:275 classes/pref/filters.php:576
-#: classes/pref/filters.php:655 classes/pref/filters.php:682
-#: classes/pref/feeds.php:1279 classes/pref/feeds.php:1588
-#: classes/pref/feeds.php:1657 plugins/instances/instances.php:177
+#: classes/dlg.php:60 classes/feeds.php:95 classes/pref/users.php:383
+#: classes/pref/labels.php:277 classes/pref/filters.php:235
+#: classes/pref/filters.php:282 classes/pref/filters.php:583
+#: classes/pref/filters.php:662 classes/pref/filters.php:689
+#: classes/pref/feeds.php:1207 classes/pref/feeds.php:1477
+#: classes/pref/feeds.php:1546 plugins/instances/init.php:292
 msgid "None"
 msgstr "无"
 
-#: classes/dlg.php:87
+#: classes/dlg.php:69
 msgid "Create profile"
 msgstr "创建偏好文件"
 
-#: classes/dlg.php:110 classes/dlg.php:140
+#: classes/dlg.php:92 classes/dlg.php:122
 msgid "(active)"
 msgstr "（当前使用的）"
 
-#: classes/dlg.php:174
+#: classes/dlg.php:156
 msgid "Remove selected profiles"
 msgstr "移除选中的偏好文件"
 
-#: classes/dlg.php:176
+#: classes/dlg.php:158
 msgid "Activate profile"
 msgstr "启用偏好文件"
 
-#: classes/dlg.php:186
+#: classes/dlg.php:168
 msgid "Public OPML URL"
 msgstr "公开的 OPML URL"
 
-#: classes/dlg.php:191
+#: classes/dlg.php:173
 msgid "Your Public OPML URL is:"
 msgstr "你的公共 OPML URL 是："
 
-#: classes/dlg.php:200 classes/dlg.php:587
+#: classes/dlg.php:182 classes/dlg.php:571
 msgid "Generate new URL"
 msgstr "生成一个新的 URL"
 
-#: classes/dlg.php:212
+#: classes/dlg.php:194
 msgid "Notice"
 msgstr "提示"
 
-#: classes/dlg.php:218
+#: classes/dlg.php:200
 msgid ""
 "Update daemon is enabled in configuration, but daemon process is not "
 "running, which prevents all feeds from updating. Please start the daemon "
@@ -1377,11 +1326,11 @@ msgstr ""
 "更新进程已在配置中启用，但守护进程没有运行，无法抓取信息。请启动守护进程，或"
 "联系管理员。"
 
-#: classes/dlg.php:222 classes/dlg.php:231
+#: classes/dlg.php:204 classes/dlg.php:213
 msgid "Last update:"
 msgstr "上次更新："
 
-#: classes/dlg.php:227
+#: classes/dlg.php:209
 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 "
@@ -1390,151 +1339,154 @@ msgstr ""
 "更新进程在抓取信息更新时花费了太长时间，可能已经崩溃。请检查守护进程或联系管"
 "理员。"
 
-#: classes/dlg.php:252 classes/dlg.php:261
+#: classes/dlg.php:234 classes/dlg.php:243
 #, fuzzy
 msgid "Feed or site URL"
 msgstr "信息源 URL"
 
-#: classes/dlg.php:267 classes/dlg.php:738 classes/pref/feeds.php:531
-#: classes/pref/feeds.php:775
+#: classes/dlg.php:249 classes/dlg.php:715 classes/pref/feeds.php:527
+#: classes/pref/feeds.php:735
 msgid "Place in category:"
 msgstr "加入到类别："
 
-#: classes/dlg.php:275
+#: classes/dlg.php:257
 msgid "Available feeds"
 msgstr "可用的信息源"
 
-#: classes/dlg.php:287 classes/pref/users.php:155 classes/pref/feeds.php:561
-#: classes/pref/feeds.php:811
+#: classes/dlg.php:269 classes/pref/users.php:155 classes/pref/feeds.php:557
+#: classes/pref/feeds.php:771
 msgid "Authentication"
 msgstr "登录密码"
 
-#: classes/dlg.php:291 classes/dlg.php:752 classes/pref/users.php:438
-#: classes/pref/feeds.php:567 classes/pref/feeds.php:815
+#: classes/dlg.php:273 classes/dlg.php:729 classes/pref/users.php:438
+#: classes/pref/feeds.php:563 classes/pref/feeds.php:775
 msgid "Login"
 msgstr "登陆"
 
-#: classes/dlg.php:294 classes/dlg.php:755 classes/pref/prefs.php:200
-#: classes/pref/feeds.php:573 classes/pref/feeds.php:821
+#: classes/dlg.php:276 classes/dlg.php:732 classes/pref/prefs.php:196
+#: classes/pref/feeds.php:569 classes/pref/feeds.php:781
 msgid "Password"
 msgstr "密码"
 
-#: classes/dlg.php:304
+#: classes/dlg.php:286
 msgid "This feed requires authentication."
 msgstr "这个信息源需要认证"
 
-#: classes/dlg.php:309 classes/dlg.php:364 classes/dlg.php:773
+#: classes/dlg.php:291 classes/dlg.php:348 classes/dlg.php:750
 msgid "Subscribe"
 msgstr "订阅"
 
-#: classes/dlg.php:312
+#: classes/dlg.php:294
 msgid "More feeds"
 msgstr "更多信息源"
 
-#: classes/dlg.php:336 classes/dlg.php:425 classes/pref/users.php:368
-#: classes/pref/filters.php:567 classes/pref/feeds.php:1270 js/tt-rss.js:234
-#: js/tt-rss.js:187 js/tt-rss.js:166
+#: classes/dlg.php:318 classes/dlg.php:409 classes/pref/users.php:368
+#: classes/pref/filters.php:574 classes/pref/feeds.php:1198 js/tt-rss.js:166
 msgid "Search"
 msgstr "搜索"
 
-#: classes/dlg.php:340
+#: classes/dlg.php:322
 msgid "Popular feeds"
 msgstr "最受欢迎的信息源"
 
-#: classes/dlg.php:341
+#: classes/dlg.php:323
 msgid "Feed archive"
 msgstr "信息源存档"
 
-#: classes/dlg.php:344
+#: classes/dlg.php:326
 msgid "limit:"
 msgstr "限制："
 
-#: classes/dlg.php:365 classes/pref/users.php:394 classes/pref/labels.php:284
-#: classes/pref/filters.php:332 classes/pref/filters.php:589
-#: classes/pref/feeds.php:702 plugins/instances/instances.php:182
+#: classes/dlg.php:349 classes/pref/users.php:394 classes/pref/labels.php:284
+#: classes/pref/filters.php:339 classes/pref/filters.php:596
+#: classes/pref/feeds.php:662 plugins/instances/init.php:297
 msgid "Remove"
 msgstr "移除"
 
-#: classes/dlg.php:376
+#: classes/dlg.php:360
 msgid "Look for"
 msgstr "查找"
 
-#: classes/dlg.php:384
+#: classes/dlg.php:368
 msgid "Limit search to:"
 msgstr "限制搜索条件："
 
-#: classes/dlg.php:400
+#: classes/dlg.php:384
 msgid "This feed"
 msgstr "本信息源"
 
-#: classes/dlg.php:432
+#: classes/dlg.php:416
 msgid "Tags for this article (separated by commas):"
 msgstr "本文的标签，请用逗号分开："
 
-#: classes/dlg.php:455 classes/dlg.php:650 classes/pref/users.php:192
-#: classes/pref/labels.php:79 classes/pref/filters.php:339
-#: classes/pref/feeds.php:728 classes/pref/feeds.php:877
-#: plugins/note/note.php:47 plugins/instances/instances.php:133
-#: plugins/nsfw/init.php:86 plugins/owncloud/init.php:62
+#: classes/dlg.php:439 classes/dlg.php:650 classes/pref/users.php:192
+#: classes/pref/labels.php:79 classes/pref/filters.php:346
+#: classes/pref/feeds.php:688 classes/pref/feeds.php:826
+#: plugins/nsfw/init.php:86 plugins/note/init.php:53
+#: plugins/owncloud/init.php:62 plugins/instances/init.php:248
 msgid "Save"
 msgstr "保存"
 
-#: classes/dlg.php:463
+#: classes/dlg.php:447
 msgid "Tag Cloud"
 msgstr "标签云"
 
-#: classes/dlg.php:532
+#: classes/dlg.php:516
 msgid "Select item(s) by tags"
 msgstr "通过自定义标签选择"
 
-#: classes/dlg.php:535
+#: classes/dlg.php:519
 msgid "Match:"
 msgstr "匹配："
 
-#: classes/dlg.php:537
+#: classes/dlg.php:521
 msgid "Any"
 msgstr ""
 
-#: classes/dlg.php:540
+#: classes/dlg.php:524
 #, fuzzy
 msgid "All tags."
 msgstr "无标签"
 
-#: classes/dlg.php:542
+#: classes/dlg.php:526
 msgid "Which Tags?"
 msgstr "哪些标签？"
 
-#: classes/dlg.php:555
+#: classes/dlg.php:539
 msgid "Display entries"
 msgstr "显示条目"
 
-#: classes/dlg.php:567 classes/feeds.php:129
+#: classes/dlg.php:551 classes/feeds.php:133
 msgid "View as RSS"
 msgstr "以 RSS 形式阅读"
 
-#: classes/dlg.php:578
+#: classes/dlg.php:562
 msgid "You can view this feed as RSS using the following URL:"
 msgstr "您可以通过如下 URL 以 RSS 方式查看本信息源："
 
-#: classes/dlg.php:606 plugins/updater/updater.php:276
+#: classes/dlg.php:591 plugins/updater/init.php:303
 #, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "Tiny Tiny RSS 有可用的新版本 (%s)。"
 
-#: classes/dlg.php:614
+#: classes/dlg.php:599
 msgid ""
 "You can update using built-in updater in the Preferences or by using update."
 "php"
 msgstr ""
 
-#: classes/dlg.php:618 classes/pref/users.php:390
+#: classes/dlg.php:603 classes/pref/users.php:390
 msgid "Details"
 msgstr "详细"
 
-#: classes/dlg.php:620
+#: classes/dlg.php:605
 msgid "Download"
 msgstr "下载"
 
+#: classes/dlg.php:613
+msgid "Error receiving version information or no new version available."
+msgstr ""
+
 #: classes/dlg.php:634
 #, php-format
 msgid ""
@@ -1545,32 +1497,29 @@ msgstr ""
 "您可以通过自定义 CSS 来更改颜色，字体和版式。具体可参考 <a target=\"_blank\" "
 "class=\"visibleLink\" href=\"%s\">本文件</a>。"
 
-#: classes/dlg.php:661 plugins/instances/instances.php:92
-#: plugins/instances/init.php:207
+#: classes/dlg.php:661 plugins/instances/init.php:207
 msgid "Instance"
 msgstr "实例"
 
-#: classes/dlg.php:670 plugins/instances/instances.php:103
-#: plugins/instances/instances.php:200 plugins/instances/init.php:218
+#: classes/dlg.php:670 plugins/instances/init.php:218
+#: plugins/instances/init.php:315
 msgid "Instance URL"
 msgstr "实例 URL："
 
-#: classes/dlg.php:680 plugins/instances/instances.php:114
-#: plugins/instances/init.php:229
+#: classes/dlg.php:680 plugins/instances/init.php:229
 msgid "Access key:"
 msgstr "访问密钥："
 
-#: classes/dlg.php:683 plugins/instances/instances.php:117
-#: plugins/instances/instances.php:201 plugins/instances/init.php:232
+#: classes/dlg.php:683 plugins/instances/init.php:232
+#: plugins/instances/init.php:316
 msgid "Access key"
 msgstr "访问密钥"
 
-#: classes/dlg.php:687 plugins/instances/instances.php:121
-#: plugins/instances/init.php:236
+#: classes/dlg.php:687 plugins/instances/init.php:236
 msgid "Use one access key for both linked instances."
 msgstr "为两个相联的实例使用一个访问密钥。"
 
-#: classes/dlg.php:695 plugins/instances/instances.php:129
+#: classes/dlg.php:695 plugins/instances/init.php:244
 msgid "Generate new key"
 msgstr "生成新的密钥"
 
@@ -1578,25 +1527,22 @@ msgstr "生成新的密钥"
 msgid "Create link"
 msgstr "创建链接"
 
-#: classes/dlg.php:717
-#, php-format
-msgid ""
-"Could not upload file. You might need to adjust upload_max_filesize\n"
-"\t\t\t\tin PHP.ini (current value = %s)"
-msgstr ""
-
-#: classes/dlg.php:735
+#: classes/dlg.php:712
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr ""
 
-#: classes/dlg.php:744
+#: classes/dlg.php:721
 msgid "Feeds to subscribe, One per line"
 msgstr ""
 
-#: classes/dlg.php:766
+#: classes/dlg.php:743
 msgid "Feeds require authentication."
 msgstr ""
 
+#: classes/feeds.php:68
+msgid "Visit the website"
+msgstr "访问网站"
+
 #: classes/feeds.php:83
 msgid "View as RSS feed"
 msgstr "以RSS信息源方式阅读"
@@ -1609,6 +1555,11 @@ msgstr "选择："
 msgid "Invert"
 msgstr "反选"
 
+#: classes/feeds.php:101
+#, fuzzy
+msgid "More..."
+msgstr "下面的 %d 篇……"
+
 #: classes/feeds.php:103
 msgid "Selection toggle:"
 msgstr "锁定选择："
@@ -1630,41 +1581,41 @@ msgstr "存档"
 msgid "Move back"
 msgstr "移回原位"
 
-#: classes/feeds.php:118 classes/pref/filters.php:235
-#: classes/pref/filters.php:282 classes/pref/filters.php:662
-#: classes/pref/filters.php:689
+#: classes/feeds.php:118 classes/pref/filters.php:242
+#: classes/pref/filters.php:289 classes/pref/filters.php:669
+#: classes/pref/filters.php:696
 msgid "Delete"
 msgstr "删除"
 
-#: classes/feeds.php:122 plugins/mail/mail.php:22
+#: classes/feeds.php:125 plugins/mail/init.php:28
 msgid "Forward by email"
 msgstr "通过邮件转发"
 
-#: classes/feeds.php:125
+#: classes/feeds.php:129
 msgid "Feed:"
 msgstr "信息源："
 
-#: classes/feeds.php:190 classes/feeds.php:844
+#: classes/feeds.php:196 classes/feeds.php:790
 msgid "Feed not found."
 msgstr "找不到信息源。"
 
-#: classes/feeds.php:434 classes/feeds.php:516
+#: classes/feeds.php:403 classes/feeds.php:493
 msgid "mark as read"
 msgstr "标记为已读"
 
-#: classes/feeds.php:739
+#: classes/feeds.php:691
 msgid "No unread articles found to display."
 msgstr "没有未读文章。"
 
-#: classes/feeds.php:742
+#: classes/feeds.php:694
 msgid "No updated articles found to display."
 msgstr "没有最新更新的文章。"
 
-#: classes/feeds.php:745
+#: classes/feeds.php:697
 msgid "No starred articles found to display."
 msgstr "没有加星标的文章。"
 
-#: classes/feeds.php:749
+#: classes/feeds.php:701
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
@@ -1672,11 +1623,40 @@ msgstr ""
 "本标签下没有文章。你可以通过手动或过滤器的方式为文章添加预定义标签（参考上方"
 "动作菜单）。"
 
-#: classes/feeds.php:751
+#: classes/feeds.php:703
 msgid "No articles found to display."
 msgstr "暂时没有文章。"
 
-#: classes/backend.php:26
+#: classes/feeds.php:718 classes/feeds.php:899
+#, php-format
+msgid "Feeds last updated at %s"
+msgstr "上次信息源更新时间：%s"
+
+#: classes/feeds.php:728 classes/feeds.php:909
+msgid "Some feeds have update errors (click for details)"
+msgstr "部分信息源更新错误（点击了解详情）"
+
+#: classes/feeds.php:889
+msgid "No feed selected."
+msgstr "没有选中的信息源。"
+
+#: classes/backend.php:34
+msgid "Keyboard Shortcuts"
+msgstr "快捷键"
+
+#: classes/backend.php:57
+msgid "Shift"
+msgstr ""
+
+#: classes/backend.php:60
+msgid "Ctrl"
+msgstr ""
+
+#: classes/backend.php:84
+msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
+msgstr "在 Tiny Tiny RSS 的维基上可以找到其他界面技巧。"
+
+#: classes/backend.php:99
 msgid "Help topic not found."
 msgstr "未找到帮助主题。"
 
@@ -1727,16 +1707,15 @@ msgstr "创建过滤器"
 msgid "Processing category: %s"
 msgstr "加入到类别："
 
-#: classes/opml.php:467
+#: classes/opml.php:468
 msgid "Error: please upload OPML file."
 msgstr "错误：请上传 OPML 文件。"
 
-#: classes/opml.php:474
+#: classes/opml.php:475
 msgid "Error while parsing document."
 msgstr "解析文档时发生错误。"
 
-#: classes/pref/users.php:6 plugins/instances/instances.php:42
-#: plugins/instances/init.php:157
+#: classes/pref/users.php:6 plugins/instances/init.php:157
 msgid "Your access level is insufficient to open this tab."
 msgstr "您的访问级别不够，无法打开这个舌签。"
 
@@ -1776,8 +1755,8 @@ msgstr "访问级别："
 msgid "Change password to"
 msgstr "更改密码为："
 
-#: classes/pref/users.php:177 classes/pref/feeds.php:581
-#: classes/pref/feeds.php:827
+#: classes/pref/users.php:177 classes/pref/feeds.php:577
+#: classes/pref/feeds.php:787
 msgid "Options"
 msgstr "选项"
 
@@ -1816,8 +1795,12 @@ msgstr "提醒 <b>%s</b>。"
 msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] 密码更换提醒"
 
-#: classes/pref/users.php:392 classes/pref/filters.php:586
-#: plugins/instances/instances.php:181
+#: classes/pref/users.php:386
+msgid "Create user"
+msgstr "创建用户"
+
+#: classes/pref/users.php:392 classes/pref/filters.php:593
+#: plugins/instances/init.php:296
 msgid "Edit"
 msgstr "编辑"
 
@@ -1833,15 +1816,15 @@ msgstr "访问级别"
 msgid "Last login"
 msgstr "最后登陆"
 
-#: classes/pref/users.php:461 plugins/instances/instances.php:222
+#: classes/pref/users.php:462 plugins/instances/init.php:337
 msgid "Click to edit"
 msgstr "点击进行编辑"
 
-#: classes/pref/users.php:481
+#: classes/pref/users.php:482
 msgid "No users defined."
 msgstr "没有定义用户。"
 
-#: classes/pref/users.php:483
+#: classes/pref/users.php:484
 msgid "No matching users found."
 msgstr "没有匹配的用户。"
 
@@ -1879,84 +1862,88 @@ msgstr "符合本过滤器条件的文章："
 msgid "No recent articles matching this filter have been found."
 msgstr "本过滤器下没有匹配到文章。"
 
-#: classes/pref/filters.php:218 classes/pref/filters.php:645
-#: classes/pref/filters.php:760
+#: classes/pref/filters.php:98
+msgid ""
+"Complex expressions might not give results while testing due to issues with "
+"database server regexp implementation."
+msgstr ""
+
+#: classes/pref/filters.php:225 classes/pref/filters.php:652
+#: classes/pref/filters.php:767
 msgid "Match"
 msgstr "匹配"
 
-#: classes/pref/filters.php:232 classes/pref/filters.php:279
-#: classes/pref/filters.php:659 classes/pref/filters.php:686
+#: classes/pref/filters.php:239 classes/pref/filters.php:286
+#: classes/pref/filters.php:666 classes/pref/filters.php:693
 msgid "Add"
 msgstr ""
 
-#: classes/pref/filters.php:265 classes/pref/filters.php:672
+#: classes/pref/filters.php:272 classes/pref/filters.php:679
 #, fuzzy
 msgid "Apply actions"
 msgstr "信息源动作"
 
-#: classes/pref/filters.php:315 classes/pref/filters.php:701
+#: classes/pref/filters.php:322 classes/pref/filters.php:708
 msgid "Enabled"
 msgstr "已启用"
 
-#: classes/pref/filters.php:324 classes/pref/filters.php:704
+#: classes/pref/filters.php:331 classes/pref/filters.php:711
 msgid "Match any rule"
 msgstr ""
 
-#: classes/pref/filters.php:336 classes/pref/filters.php:716
+#: classes/pref/filters.php:343 classes/pref/filters.php:723
 msgid "Test"
 msgstr "测试"
 
-#: classes/pref/filters.php:368
+#: classes/pref/filters.php:375
 #, php-format
 msgid "%s on %s in %s"
 msgstr ""
 
-#: classes/pref/filters.php:583
+#: classes/pref/filters.php:590
 msgid "Combine"
 msgstr ""
 
-#: classes/pref/filters.php:593 classes/pref/feeds.php:1329
+#: classes/pref/filters.php:600 classes/pref/feeds.php:1257
 msgid "Rescore articles"
 msgstr "为文章重新评分"
 
-#: classes/pref/filters.php:719
+#: classes/pref/filters.php:726
 msgid "Create"
 msgstr "创建"
 
-#: classes/pref/filters.php:769
+#: classes/pref/filters.php:776
 msgid "on field"
 msgstr "on field"
 
-#: classes/pref/filters.php:775 js/PrefFilterTree.js:29
+#: classes/pref/filters.php:782 js/PrefFilterTree.js:29
 #: plugins/digest/digest.js:241
 msgid "in"
 msgstr "在"
 
-#: classes/pref/filters.php:788
+#: classes/pref/filters.php:795
 #, fuzzy
 msgid "Save rule"
 msgstr "保存"
 
-#: classes/pref/filters.php:788 js/functions.js:1067 js/functions.js:1063
-#: js/functions.js:1071 js/functions.js:1073
+#: classes/pref/filters.php:795 js/functions.js:1078
 msgid "Add rule"
 msgstr ""
 
-#: classes/pref/filters.php:811
+#: classes/pref/filters.php:818
 msgid "Perform Action"
 msgstr "执行动作"
 
-#: classes/pref/filters.php:837
+#: classes/pref/filters.php:844
 msgid "with parameters:"
 msgstr "指定参数："
 
-#: classes/pref/filters.php:855
+#: classes/pref/filters.php:862
 #, fuzzy
 msgid "Save action"
 msgstr "版面动作"
 
-#: classes/pref/filters.php:855 js/functions.js:1093 js/functions.js:1089
-#: js/functions.js:1097 js/functions.js:1099
+#: classes/pref/filters.php:862 js/functions.js:1104
 #, fuzzy
 msgid "Add action"
 msgstr "信息源动作"
@@ -1977,145 +1964,179 @@ msgstr "两次输入的密码不一致。"
 msgid "Function not supported by authentication module."
 msgstr ""
 
-#: classes/pref/prefs.php:68
+#: classes/pref/prefs.php:63
 msgid "The configuration was saved."
 msgstr "设置已保存。"
 
-#: classes/pref/prefs.php:83
+#: classes/pref/prefs.php:77
 #, php-format
 msgid "Unknown option: %s"
 msgstr "未知选项： %s"
 
-#: classes/pref/prefs.php:97
+#: classes/pref/prefs.php:91
 msgid "Your personal data has been saved."
 msgstr "您的个人数据已保存。"
 
-#: classes/pref/prefs.php:137
+#: classes/pref/prefs.php:131
 #, fuzzy
 msgid "Personal data / Authentication"
 msgstr "登录密码"
 
-#: classes/pref/prefs.php:157
+#: classes/pref/prefs.php:151
 msgid "Personal data"
 msgstr ""
 
-#: classes/pref/prefs.php:167
+#: classes/pref/prefs.php:161
 msgid "Full name"
 msgstr "姓名"
 
-#: classes/pref/prefs.php:171
+#: classes/pref/prefs.php:165
 msgid "E-mail"
 msgstr "电子邮件"
 
-#: classes/pref/prefs.php:177
+#: classes/pref/prefs.php:171
 msgid "Access level"
 msgstr "访问级别"
 
-#: classes/pref/prefs.php:187
+#: classes/pref/prefs.php:181
 msgid "Save data"
 msgstr "保存信息"
 
-#: classes/pref/prefs.php:207
+#: classes/pref/prefs.php:203
 msgid "Your password is at default value, please change it."
 msgstr "您还在使用系统默认的密码，请修改。"
 
-#: classes/pref/prefs.php:239
+#: classes/pref/prefs.php:235
 msgid "Old password"
 msgstr "原密码"
 
-#: classes/pref/prefs.php:242
+#: classes/pref/prefs.php:238
 msgid "New password"
 msgstr "新密码"
 
-#: classes/pref/prefs.php:247
+#: classes/pref/prefs.php:243
 msgid "Confirm password"
 msgstr "确认密码"
 
-#: classes/pref/prefs.php:257
+#: classes/pref/prefs.php:253
 msgid "Change password"
 msgstr "更改密码"
 
-#: classes/pref/prefs.php:263
+#: classes/pref/prefs.php:259
 msgid "One time passwords / Authenticator"
 msgstr ""
 
-#: classes/pref/prefs.php:292 classes/pref/prefs.php:343
+#: classes/pref/prefs.php:288 classes/pref/prefs.php:339
 #, fuzzy
 msgid "Enter your password"
 msgstr "用户名或密码错误"
 
-#: classes/pref/prefs.php:303
+#: classes/pref/prefs.php:299
 #, fuzzy
 msgid "Disable OTP"
 msgstr "禁用更新"
 
-#: classes/pref/prefs.php:309
+#: classes/pref/prefs.php:305
 msgid ""
 "You will need a compatible Authenticator to use this. Changing your password "
 "would automatically disable OTP."
 msgstr ""
 
-#: classes/pref/prefs.php:311
+#: classes/pref/prefs.php:307
 msgid "Scan the following code by the Authenticator application:"
 msgstr ""
 
-#: classes/pref/prefs.php:352
+#: classes/pref/prefs.php:348
 msgid "I have scanned the code and would like to enable OTP"
 msgstr ""
 
-#: classes/pref/prefs.php:360
+#: classes/pref/prefs.php:356
 #, fuzzy
 msgid "Enable OTP"
 msgstr "已启用"
 
-#: classes/pref/prefs.php:456
-msgid "Select theme"
-msgstr "选择主题"
-
-#: classes/pref/prefs.php:508
+#: classes/pref/prefs.php:482
 msgid "Customize"
 msgstr "自定义"
 
-#: classes/pref/prefs.php:527 classes/pref/prefs.php:534
-#: classes/pref/prefs.php:539
+#: classes/pref/prefs.php:501 classes/pref/prefs.php:508
+#: classes/pref/prefs.php:513
 msgid "Yes"
 msgstr "是"
 
-#: classes/pref/prefs.php:529 classes/pref/prefs.php:539
+#: classes/pref/prefs.php:503 classes/pref/prefs.php:513
 msgid "No"
 msgstr "否"
 
-#: classes/pref/prefs.php:569
+#: classes/pref/prefs.php:543
 msgid "Register"
 msgstr "注册"
 
-#: classes/pref/prefs.php:573
+#: classes/pref/prefs.php:547
 msgid "Clear"
 msgstr "清空"
 
-#: classes/pref/prefs.php:579
+#: classes/pref/prefs.php:553
 #, php-format
 msgid "Current server time: %s (UTC)"
 msgstr ""
 
-#: classes/pref/prefs.php:604
+#: classes/pref/prefs.php:582
 msgid "Save configuration"
 msgstr "保存设置"
 
-#: classes/pref/prefs.php:607
+#: classes/pref/prefs.php:585
 msgid "Manage profiles"
 msgstr "管理偏好文件"
 
-#: classes/pref/prefs.php:610
+#: classes/pref/prefs.php:588
 msgid "Reset to defaults"
 msgstr "恢复到默认"
 
-#: classes/pref/prefs.php:622
+#: classes/pref/prefs.php:600
 #, fuzzy
 msgid "Show additional preferences"
 msgstr "退出偏好设置"
 
-#: classes/pref/prefs.php:679 classes/pref/prefs.php:697
+#: classes/pref/prefs.php:612 classes/pref/prefs.php:614
+msgid "Plugins"
+msgstr ""
+
+#: classes/pref/prefs.php:642
+msgid "System plugins"
+msgstr ""
+
+#: classes/pref/prefs.php:646 classes/pref/prefs.php:695
+msgid "Plugin"
+msgstr ""
+
+#: classes/pref/prefs.php:647 classes/pref/prefs.php:696
+msgid "Description"
+msgstr ""
+
+#: classes/pref/prefs.php:648 classes/pref/prefs.php:697
+msgid "Version"
+msgstr ""
+
+#: classes/pref/prefs.php:649 classes/pref/prefs.php:698
+msgid "Author"
+msgstr ""
+
+#: classes/pref/prefs.php:682 classes/pref/prefs.php:733
+#, fuzzy
+msgid "Clear data"
+msgstr "清空信息源数据"
+
+#: classes/pref/prefs.php:691
+msgid "User plugins"
+msgstr ""
+
+#: classes/pref/prefs.php:748
+#, fuzzy
+msgid "Enable selected plugins"
+msgstr "启用信息源分类"
+
+#: classes/pref/prefs.php:803 classes/pref/prefs.php:821
 #, fuzzy
 msgid "Incorrect password"
 msgstr "用户名或密码错误"
@@ -2124,26 +2145,22 @@ msgstr "用户名或密码错误"
 msgid "Check to enable field"
 msgstr "勾选以启用"
 
-#: classes/pref/feeds.php:59 classes/pref/feeds.php:180
-#: classes/pref/feeds.php:223 classes/pref/feeds.php:229
-#: classes/pref/feeds.php:254
+#: classes/pref/feeds.php:58 classes/pref/feeds.php:175
+#: classes/pref/feeds.php:217 classes/pref/feeds.php:223
+#: classes/pref/feeds.php:248
 #, php-format
 msgid "(%d feeds)"
 msgstr "(%d 个信息源)"
 
-#: classes/pref/feeds.php:492 classes/pref/feeds.php:747
-msgid "Feed"
-msgstr "信息源"
-
-#: classes/pref/feeds.php:498
+#: classes/pref/feeds.php:494
 msgid "Feed Title"
 msgstr "信息源标题"
 
-#: classes/pref/feeds.php:554 classes/pref/feeds.php:802
+#: classes/pref/feeds.php:550 classes/pref/feeds.php:762
 msgid "Article purging:"
 msgstr "文章清理："
 
-#: classes/pref/feeds.php:577
+#: classes/pref/feeds.php:573
 msgid ""
 "<b>Hint:</b> you need to fill in your login information if your feed "
 "requires authentication, except for Twitter feeds."
@@ -2151,238 +2168,176 @@ msgstr ""
 "<b>提示：</b>如果您的信息源需要验证，那么您需要填写登录信息。Twitter 信息源除"
 "外。"
 
-#: classes/pref/feeds.php:593 classes/pref/feeds.php:831
+#: classes/pref/feeds.php:589 classes/pref/feeds.php:791
 msgid "Hide from Popular feeds"
 msgstr "从最受欢迎的信息源中隐藏"
 
-#: classes/pref/feeds.php:604 classes/pref/feeds.php:836
-msgid "Right-to-left content"
-msgstr "右至左的内容"
-
-#: classes/pref/feeds.php:616 classes/pref/feeds.php:842
+#: classes/pref/feeds.php:601 classes/pref/feeds.php:797
 msgid "Include in e-mail digest"
 msgstr "包含电子邮件摘要"
 
-#: classes/pref/feeds.php:629 classes/pref/feeds.php:848
+#: classes/pref/feeds.php:614 classes/pref/feeds.php:803
 msgid "Always display image attachments"
 msgstr "始终显示图片附件"
 
-#: classes/pref/feeds.php:643 classes/pref/feeds.php:856
+#: classes/pref/feeds.php:628 classes/pref/feeds.php:811
 msgid "Cache images locally"
 msgstr "本地缓存图片"
 
-#: classes/pref/feeds.php:656
-#, fuzzy
-msgid "Cache content locally"
-msgstr "本地缓存图片"
-
-#: classes/pref/feeds.php:668 classes/pref/feeds.php:862
+#: classes/pref/feeds.php:640 classes/pref/feeds.php:817
 msgid "Mark updated articles as unread"
 msgstr "将已更新的文章标记为未读"
 
-#: classes/pref/feeds.php:680 classes/pref/feeds.php:868
-msgid "Mark posts as updated on content change"
-msgstr "将内容更改过的文章标记为已更新状态"
-
-#: classes/pref/feeds.php:686
+#: classes/pref/feeds.php:646
 msgid "Icon"
 msgstr "图标"
 
-#: classes/pref/feeds.php:700
+#: classes/pref/feeds.php:660
 msgid "Replace"
 msgstr "替换"
 
-#: classes/pref/feeds.php:719
+#: classes/pref/feeds.php:679
 msgid "Resubscribe to push updates"
 msgstr "重新订阅以推送更新"
 
-#: classes/pref/feeds.php:726
+#: classes/pref/feeds.php:686
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr "为启用推送的信息源重置 PubSubHubbub 订阅。"
 
-#: classes/pref/feeds.php:741
+#: classes/pref/feeds.php:701
 msgid "Enable the options you wish to apply using checkboxes on the right:"
 msgstr ""
 
-#: classes/pref/feeds.php:1123 classes/pref/feeds.php:1176
+#: classes/pref/feeds.php:1051 classes/pref/feeds.php:1104
 msgid "All done."
 msgstr "全部完成。"
 
-#: classes/pref/feeds.php:1231
+#: classes/pref/feeds.php:1159
 msgid "Feeds with errors"
 msgstr "有错误的信息源"
 
-#: classes/pref/feeds.php:1251
+#: classes/pref/feeds.php:1179
 #, fuzzy
 msgid "Inactive feeds"
 msgstr "刷新活动的信息源"
 
-#: classes/pref/feeds.php:1288
+#: classes/pref/feeds.php:1216
 msgid "Edit selected feeds"
 msgstr "编辑选定的信息源"
 
-#: classes/pref/feeds.php:1290 classes/pref/feeds.php:1304
+#: classes/pref/feeds.php:1218 classes/pref/feeds.php:1232
 msgid "Reset sort order"
 msgstr "重置排序"
 
-#: classes/pref/feeds.php:1292 js/prefs.js:2021 js/prefs.js:1788
-#: js/prefs.js:1778
+#: classes/pref/feeds.php:1220 js/prefs.js:1778
 msgid "Batch subscribe"
 msgstr ""
 
-#: classes/pref/feeds.php:1297
+#: classes/pref/feeds.php:1225
 #, fuzzy
 msgid "Categories"
 msgstr "信息源类别"
 
-#: classes/pref/feeds.php:1300
+#: classes/pref/feeds.php:1228
 #, fuzzy
 msgid "Add category"
 msgstr "编辑类别"
 
-#: classes/pref/feeds.php:1302
+#: classes/pref/feeds.php:1230
 #, fuzzy
 msgid "(Un)hide empty categories"
 msgstr "编辑类别"
 
-#: classes/pref/feeds.php:1306
+#: classes/pref/feeds.php:1234
 #, fuzzy
 msgid "Remove selected"
 msgstr "移除选中的信息源？"
 
-#: classes/pref/feeds.php:1320
+#: classes/pref/feeds.php:1248
 msgid "More actions..."
 msgstr "更多动作"
 
-#: classes/pref/feeds.php:1324
+#: classes/pref/feeds.php:1252
 msgid "Manual purge"
 msgstr "手动清除"
 
-#: classes/pref/feeds.php:1328
+#: classes/pref/feeds.php:1256
 msgid "Clear feed data"
 msgstr "清空信息源数据"
 
-#: classes/pref/feeds.php:1379
-msgid "Import and export"
-msgstr ""
-
-#: classes/pref/feeds.php:1381
+#: classes/pref/feeds.php:1307
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1383
+#: classes/pref/feeds.php:1309
 msgid ""
 "Using OPML you can export and import your feeds, filters, labels and Tiny "
 "Tiny RSS settings."
 msgstr ""
 
-#: classes/pref/feeds.php:1385
+#: classes/pref/feeds.php:1311
 msgid "Only main settings profile can be migrated using OPML."
 msgstr ""
 
-#: classes/pref/feeds.php:1398
+#: classes/pref/feeds.php:1324
 #, fuzzy
 msgid "Import my OPML"
 msgstr "正在导入 OPML ……"
 
-#: classes/pref/feeds.php:1402
+#: classes/pref/feeds.php:1328
 msgid "Filename:"
 msgstr "文件名："
 
-#: classes/pref/feeds.php:1404
+#: classes/pref/feeds.php:1330
 msgid "Include settings"
 msgstr "包含设置"
 
-#: classes/pref/feeds.php:1408
+#: classes/pref/feeds.php:1334
 #, fuzzy
 msgid "Export OPML"
 msgstr "正在导入 OPML ……"
 
-#: classes/pref/feeds.php:1412
+#: classes/pref/feeds.php:1338
 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:1414
+#: classes/pref/feeds.php:1340
 msgid ""
 "Published OPML does not include your Tiny Tiny RSS settings, feeds that "
 "require authentication or feeds hidden from Popular feeds."
 msgstr ""
 
-#: classes/pref/feeds.php:1417
+#: classes/pref/feeds.php:1343
 #, fuzzy
 msgid "Display published OPML URL"
 msgstr "公开的 OPML URL"
 
-#: classes/pref/feeds.php:1420 plugins/import_export/init.php:66
-#, fuzzy
-msgid "Article archive"
-msgstr "文章发布时间"
-
-#: classes/pref/feeds.php:1422 plugins/import_export/init.php:68
-msgid ""
-"You can export and import your Starred and Archived articles for safekeeping "
-"or when migrating between tt-rss instances."
-msgstr ""
-
-#: classes/pref/feeds.php:1425
-msgid "Export my data"
-msgstr ""
-
-#: classes/pref/feeds.php:1440
-msgid "Import"
-msgstr "导入"
-
-#: classes/pref/feeds.php:1447
+#: classes/pref/feeds.php:1353
 msgid "Firefox integration"
 msgstr "Firefox 集成"
 
-#: classes/pref/feeds.php:1449
+#: classes/pref/feeds.php:1355
 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:1456
+#: classes/pref/feeds.php:1362
 msgid "Click here to register this site as a feed reader."
 msgstr "点击此处将本站注册为信息源阅读器。"
 
-#: classes/pref/feeds.php:1464
-msgid "Bookmarklets"
-msgstr ""
-
-#: classes/pref/feeds.php:1466 plugins/bookmarklets/init.php:24
-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 ""
-"将以下链接拖拽至您的浏览器工具条，在浏览器中打开您想看的信息源，然后点击链接"
-"以订阅。"
-
-#: classes/pref/feeds.php:1470
-#, php-format
-msgid "Subscribe to %s in Tiny Tiny RSS?"
-msgstr "在 Tiny Tiny RSS 中订阅 %s ？"
-
-#: classes/pref/feeds.php:1474
-msgid "Subscribe in Tiny Tiny RSS"
-msgstr "在 Tiny Tiny RSS 中订阅"
-
-#: classes/pref/feeds.php:1476 plugins/bookmarklets/init.php:34
-msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
-msgstr ""
-
-#: classes/pref/feeds.php:1484
+#: classes/pref/feeds.php:1370
 #, fuzzy
 msgid "Published & shared articles / Generated feeds"
 msgstr "已发布的文章和生成的信息源"
 
-#: classes/pref/feeds.php:1486
+#: classes/pref/feeds.php:1372
 msgid "Published articles and generated feeds"
 msgstr "已发布的文章和生成的信息源"
 
-#: classes/pref/feeds.php:1488
+#: classes/pref/feeds.php:1374
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the URL specified below."
@@ -2390,45 +2345,45 @@ msgstr ""
 "已发布的文章将会输出为公开的 RSS 信息源，网上的任何人可以通过如下 URL 进行订"
 "阅。"
 
-#: classes/pref/feeds.php:1494
+#: classes/pref/feeds.php:1380
 msgid "Display URL"
 msgstr "显示 URL"
 
-#: classes/pref/feeds.php:1497
+#: classes/pref/feeds.php:1383
 msgid "Clear all generated URLs"
 msgstr "清空所有生成的 URL"
 
-#: classes/pref/feeds.php:1499
+#: classes/pref/feeds.php:1385
 msgid "Articles shared by URL"
 msgstr "通过 URL 分享的文章"
 
-#: classes/pref/feeds.php:1501
+#: classes/pref/feeds.php:1387
 msgid "You can disable all articles shared by unique URLs here."
 msgstr "您可以取消所有通过 URL 分享的文章。"
 
-#: classes/pref/feeds.php:1504
+#: classes/pref/feeds.php:1390
 msgid "Unshare all articles"
 msgstr "取消所有分享"
 
-#: classes/pref/feeds.php:1579
+#: classes/pref/feeds.php:1468
 msgid ""
 "These feeds have not been updated with new content for 3 months (oldest "
 "first):"
 msgstr "以下信息源已经有三个月没有内容更新了（最旧的在最上）："
 
-#: classes/pref/feeds.php:1616 classes/pref/feeds.php:1685
+#: classes/pref/feeds.php:1505 classes/pref/feeds.php:1574
 msgid "Click to edit feed"
 msgstr "点击以编辑信息源"
 
-#: classes/pref/feeds.php:1634 classes/pref/feeds.php:1705
+#: classes/pref/feeds.php:1523 classes/pref/feeds.php:1594
 msgid "Unsubscribe from selected feeds"
 msgstr "取消订阅选中的信息源"
 
-#: classes/pref/feeds.php:1645
+#: classes/pref/feeds.php:1534
 msgid "These feeds have not been updated because of errors:"
 msgstr "信息源因为如下错误未能更新："
 
-#: plugins/pocket/pocket.php:24
+#: plugins/pocket/init.php:30
 msgid "Pocket"
 msgstr ""
 
@@ -2446,70 +2401,191 @@ msgstr ""
 msgid "Back to feeds"
 msgstr "很久不活跃的信息源"
 
+#: plugins/digest/digest_body.php:56
+msgid "Hello,"
+msgstr "您好，"
+
 #: plugins/digest/digest_body.php:62
 msgid "Regular version"
 msgstr ""
 
-#: plugins/pinterest/pinterest.php:23
+#: plugins/nsfw/init.php:32 plugins/nsfw/init.php:43
+msgid "Not work safe (click to toggle)"
+msgstr ""
+
+#: plugins/nsfw/init.php:53
+msgid "NSFW Plugin"
+msgstr ""
+
+#: plugins/nsfw/init.php:80
+msgid "Tags to consider NSFW (comma-separated)"
+msgstr ""
+
+#: plugins/nsfw/init.php:101
+#, fuzzy
+msgid "Configuration saved."
+msgstr "设置已保存。"
+
+#: plugins/pinterest/init.php:29
 msgid "Pinterest"
 msgstr ""
 
-#: plugins/mail/mail.php:66 plugins/mail/mail.php:72 plugins/mail/init.php:72
-#: plugins/mail/init.php:78
+#: plugins/auth_internal/init.php:62
+#, fuzzy
+msgid "Please enter your one time password:"
+msgstr "请填写类别名称："
+
+#: plugins/auth_internal/init.php:185
+msgid "Password has been changed."
+msgstr "密码更改成功。"
+
+#: plugins/auth_internal/init.php:187
+msgid "Old password is incorrect."
+msgstr "原密码输入错误。"
+
+#: plugins/bookmarklets/init.php:22
+msgid "Bookmarklets"
+msgstr ""
+
+#: plugins/bookmarklets/init.php:24
+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 ""
+"将以下链接拖拽至您的浏览器工具条，在浏览器中打开您想看的信息源，然后点击链接"
+"以订阅。"
+
+#: plugins/bookmarklets/init.php:28
+#, php-format
+msgid "Subscribe to %s in Tiny Tiny RSS?"
+msgstr "在 Tiny Tiny RSS 中订阅 %s ？"
+
+#: plugins/bookmarklets/init.php:32
+msgid "Subscribe in Tiny Tiny RSS"
+msgstr "在 Tiny Tiny RSS 中订阅"
+
+#: plugins/bookmarklets/init.php:34
+msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
+msgstr ""
+
+#: plugins/import_export/init.php:64
+msgid "Import and export"
+msgstr ""
+
+#: plugins/import_export/init.php:66
+#, fuzzy
+msgid "Article archive"
+msgstr "文章发布时间"
+
+#: plugins/import_export/init.php:68
+msgid ""
+"You can export and import your Starred and Archived articles for safekeeping "
+"or when migrating between tt-rss instances."
+msgstr ""
+
+#: plugins/import_export/init.php:71
+msgid "Export my data"
+msgstr ""
+
+#: plugins/import_export/init.php:87
+msgid "Import"
+msgstr "导入"
+
+#: plugins/import_export/init.php:221
+msgid "Could not import: incorrect schema version."
+msgstr ""
+
+#: plugins/import_export/init.php:226
+msgid "Could not import: unrecognized document format."
+msgstr ""
+
+#: plugins/import_export/init.php:385
+#, php-format
+msgid "Finished: %d articles processed, %d imported, %d feeds created."
+msgstr ""
+
+#: plugins/import_export/init.php:391
+msgid "Could not load XML document."
+msgstr ""
+
+#: plugins/import_export/init.php:403
+msgid "Prepare data"
+msgstr ""
+
+#: plugins/import_export/init.php:424
+#, php-format
+msgid ""
+"Could not upload file. You might need to adjust upload_max_filesize\n"
+"\t\t\t\tin PHP.ini (current value = %s)"
+msgstr ""
+
+#: plugins/mail/init.php:72 plugins/mail/init.php:78
 msgid "[Forwarded]"
 msgstr "[已转发]"
 
-#: plugins/mail/mail.php:66 plugins/mail/init.php:72
+#: plugins/mail/init.php:72
 msgid "Multiple articles"
 msgstr "多个文章"
 
-#: plugins/mail/mail.php:87
+#: plugins/mail/init.php:93
 msgid "From:"
 msgstr "发信人："
 
-#: plugins/mail/mail.php:96
+#: plugins/mail/init.php:102
 msgid "To:"
 msgstr "收信人："
 
-#: plugins/mail/mail.php:109
+#: plugins/mail/init.php:115
 msgid "Subject:"
 msgstr "主题："
 
-#: plugins/mail/mail.php:125
+#: plugins/mail/init.php:131
 msgid "Send e-mail"
 msgstr "发送邮件"
 
-#: plugins/note/note.php:22 plugins/note/note.js:11
+#: plugins/note/init.php:28 plugins/note/note.js:11
 msgid "Edit article note"
 msgstr "编辑文章注记"
 
-#: plugins/example/example.php:29 plugins/example/init.php:38
+#: plugins/example/init.php:38
 msgid "Example Pane"
 msgstr ""
 
-#: plugins/example/example.php:53 plugins/example/init.php:69
+#: plugins/example/init.php:69
 msgid "Sample value"
 msgstr ""
 
-#: plugins/example/example.php:59 plugins/example/init.php:75
+#: plugins/example/init.php:75
 #, fuzzy
 msgid "Set value"
 msgstr "加星标"
 
-#: plugins/identica/identica.php:23
+#: plugins/identica/init.php:29
 #, fuzzy
 msgid "Share on identi.ca"
 msgstr "在 Twitter 上分享"
 
-#: plugins/instances/instances.php:29
+#: plugins/owncloud/init.php:35
+msgid "Owncloud"
+msgstr ""
+
+#: plugins/owncloud/init.php:59
+msgid "Owncloud url"
+msgstr ""
+
+#: plugins/owncloud/init.php:74
+msgid "Bookmark on OwnCloud "
+msgstr ""
+
+#: plugins/instances/init.php:144
 msgid "Linked"
 msgstr "链接"
 
-#: plugins/instances/instances.php:180
+#: plugins/instances/init.php:295
 msgid "Link instance"
 msgstr "链接实例"
 
-#: plugins/instances/instances.php:192 plugins/instances/init.php:307
+#: plugins/instances/init.php:307
 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:"
@@ -2517,70 +2593,73 @@ msgstr ""
 "您可以与其他的 Tiny Tiny RSS 实例相联，以共享最受欢迎的信息源列表。通过这个 "
 "URL 为本实例建立链接："
 
-#: plugins/instances/instances.php:202
+#: plugins/instances/init.php:317
 msgid "Last connected"
 msgstr "上次连接"
 
-#: plugins/instances/instances.php:203
+#: plugins/instances/init.php:318
 msgid "Status"
 msgstr ""
 
-#: plugins/instances/instances.php:204
+#: plugins/instances/init.php:319
 msgid "Stored feeds"
 msgstr "保存的信息源"
 
-#: plugins/share/share.php:21
+#: plugins/share/init.php:27
 msgid "Share by URL"
 msgstr "通过 URL 分享"
 
-#: plugins/share/share.php:43 plugins/share/init.php:49
+#: plugins/share/init.php:49
 msgid "You can share this article by the following unique URL:"
 msgstr "您可以通过以下唯一 URL 分享本文："
 
-#: plugins/flattr/flattr.php:37
+#: plugins/flattr/init.php:30
 #, fuzzy
-msgid "Flattr article"
+msgid "Flattr this article."
 msgstr "加星标"
 
-#: plugins/googleplus/googleplus.php:23
+#: plugins/googleplus/init.php:29
 #, fuzzy
 msgid "Share on Google+"
 msgstr "在 Twitter 上分享"
 
-#: plugins/updater/updater.php:267 plugins/updater/updater.php:279
+#: plugins/updater/init.php:294 plugins/updater/init.php:306
 #: plugins/updater/updater.js:10
 #, fuzzy
 msgid "Update Tiny Tiny RSS"
 msgstr "返回 Tiny Tiny RSS"
 
-#: plugins/updater/updater.php:282 plugins/updater/init.php:303
+#: plugins/updater/init.php:309
 #, fuzzy
 msgid "Your Tiny Tiny RSS installation is up to date."
 msgstr "Tiny Tiny RSS 数据库是最新版。"
 
-#: plugins/updater/updater.php:291 plugins/updater/init.php:313
+#: plugins/updater/init.php:319
 msgid ""
 "Do not close this dialog until updating is finished. Backup your tt-rss "
 "directory before continuing."
 msgstr ""
 
-#: plugins/updater/updater.php:294 plugins/updater/init.php:316
+#: plugins/updater/init.php:322
 #, fuzzy
 msgid "Ready to update."
 msgstr "上次更新："
 
-#: plugins/updater/updater.php:299 plugins/updater/init.php:321
+#: plugins/updater/init.php:327
 #, fuzzy
 msgid "Start update"
 msgstr "上次更新："
 
-#: js/feedlist.js:283 js/feedlist.js:282 js/feedlist.js:265 js/feedlist.js:218
+#: plugins/tweet/init.php:29
+#, fuzzy
+msgid "Share on Twitter"
+msgstr "在 Twitter 上分享"
+
+#: js/feedlist.js:218
 msgid "New articles available in this feed (click to show)"
 msgstr "本信息源中的最新文章（点击显示）"
 
-#: js/feedlist.js:490 js/feedlist.js:505 js/feedlist.js:489 js/feedlist.js:504
-#: js/feedlist.js:469 js/feedlist.js:484 js/feedlist.js:420 js/feedlist.js:435
-#: plugins/digest/digest.js:25
+#: js/feedlist.js:420 js/feedlist.js:435 plugins/digest/digest.js:25
 msgid "Mark all articles in %s as read?"
 msgstr "将 %s 中的全部文章标记为已读？"
 
@@ -2592,141 +2671,128 @@ msgstr ""
 "您确认将该异常报告至 tt-rss.org ？报告将包含您的浏览器信息。您的IP将被存入数"
 "据库。"
 
-#: js/functions.js:618 js/functions.js:614 js/functions.js:622
+#: js/functions.js:627
 msgid "Date syntax appears to be correct:"
 msgstr "日期的语法正确："
 
-#: js/functions.js:621 js/functions.js:617 js/functions.js:625
+#: js/functions.js:630
 msgid "Date syntax is incorrect."
 msgstr "日期的语法错误。"
 
-#: js/functions.js:748 js/functions.js:744 js/functions.js:752
+#: js/functions.js:757
 msgid "Remove stored feed icon?"
 msgstr "移除已保存的信息源图标？"
 
-#: js/functions.js:780 js/functions.js:776 js/functions.js:784
+#: js/functions.js:789
 msgid "Please select an image file to upload."
 msgstr "请选择图片文件上传。"
 
-#: js/functions.js:782 js/functions.js:778 js/functions.js:786
+#: js/functions.js:791
 msgid "Upload new icon for this feed?"
 msgstr "为本信息源上传一个新的图标？"
 
-#: js/functions.js:799 js/functions.js:795 js/functions.js:803
+#: js/functions.js:808
 msgid "Please enter label caption:"
 msgstr "请填写预定义标签的说明："
 
-#: js/functions.js:804 js/functions.js:800 js/functions.js:808
+#: js/functions.js:813
 msgid "Can't create label: missing caption."
 msgstr "创建标签失败：没有标题。"
 
-#: js/functions.js:847 js/functions.js:843 js/functions.js:851
+#: js/functions.js:856
 msgid "Subscribe to Feed"
 msgstr "订阅信息源"
 
-#: js/functions.js:874 js/functions.js:870 js/functions.js:878
+#: js/functions.js:883
 msgid "Subscribed to %s"
 msgstr "已订阅至 %s"
 
-#: js/functions.js:879 js/functions.js:875 js/functions.js:883
+#: js/functions.js:888
 msgid "Specified URL seems to be invalid."
 msgstr "指定的 URL 无效。"
 
-#: js/functions.js:882 js/functions.js:878 js/functions.js:886
+#: js/functions.js:891
 msgid "Specified URL doesn't seem to contain any feeds."
 msgstr "指定的 URL 没有包含任何信息源。"
 
-#: js/functions.js:935 js/functions.js:931 js/functions.js:939
+#: js/functions.js:944
 #, fuzzy
 msgid "Couldn't download the specified URL: %s"
 msgstr "无法下载指定的 URL 。"
 
-#: js/functions.js:939 js/functions.js:935 js/functions.js:943
+#: js/functions.js:948
 msgid "You are already subscribed to this feed."
 msgstr "您已经订阅过这个信息源啦。"
 
-#: js/functions.js:1067 js/functions.js:1063 js/functions.js:1071
-#: js/functions.js:1073
+#: js/functions.js:1078
 #, fuzzy
 msgid "Edit rule"
 msgstr "编辑过滤器"
 
-#: js/functions.js:1093 js/functions.js:1089 js/functions.js:1097
-#: js/functions.js:1099
+#: js/functions.js:1104
 #, fuzzy
 msgid "Edit action"
 msgstr "信息源动作"
 
-#: js/functions.js:1130 js/functions.js:1126 js/functions.js:1134
-#: js/functions.js:1136
+#: js/functions.js:1141
 msgid "Create Filter"
 msgstr "创建过滤器"
 
-#: js/functions.js:1234 js/functions.js:1230 js/functions.js:1238
-#: js/functions.js:1240
+#: js/functions.js:1245
 msgid ""
 "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
 "hub again on next feed update."
 msgstr ""
 "重置订阅？ Tiny Tiny RSS 将会在下次信息源更新的时候尝试再次订阅信息提醒中心。"
 
-#: js/functions.js:1255 js/tt-rss.js:421 js/functions.js:1251 js/tt-rss.js:381
-#: js/functions.js:1259 js/tt-rss.js:367 js/functions.js:1261
+#: js/functions.js:1266 js/tt-rss.js:367
 msgid "Unsubscribe from %s?"
 msgstr "从 %s 取消订阅？"
 
-#: js/functions.js:1362 js/functions.js:1358 js/functions.js:1368
-#: js/functions.js:1370
+#: js/functions.js:1375
 msgid "Please enter category title:"
 msgstr "请填写类别名称："
 
-#: js/functions.js:1393 js/functions.js:1389 js/functions.js:1399
-#: js/functions.js:1401
+#: js/functions.js:1406
 msgid "Generate new syndication address for this feed?"
 msgstr "为本信息源生成新的群地址？"
 
-#: js/functions.js:1584 js/tt-rss.js:400 js/tt-rss.js:903 js/functions.js:1580
-#: js/tt-rss.js:782 js/tt-rss.js:362 js/tt-rss.js:717 js/functions.js:1590
-#: js/tt-rss.js:348 js/tt-rss.js:709 js/functions.js:1592
+#: js/functions.js:1597 js/tt-rss.js:348 js/tt-rss.js:713
 msgid "You can't edit this kind of feed."
 msgstr "您无法编辑这种类型的信息源。"
 
-#: js/functions.js:1599 js/functions.js:1595 js/functions.js:1605
-#: js/functions.js:1607
+#: js/functions.js:1612
 msgid "Edit Feed"
 msgstr "编辑信息源"
 
-#: js/functions.js:1637 js/functions.js:1633 js/functions.js:1643
-#: js/functions.js:1645
+#: js/functions.js:1650
 msgid "More Feeds"
 msgstr "更多信息源"
 
-#: js/functions.js:1698 js/functions.js:1808 js/prefs.js:408 js/prefs.js:438
-#: js/prefs.js:470 js/prefs.js:653 js/prefs.js:673 js/prefs.js:1326
-#: js/prefs.js:1471 js/functions.js:1694 js/functions.js:1804 js/prefs.js:397
-#: js/prefs.js:427 js/prefs.js:459 js/prefs.js:642 js/prefs.js:662
-#: js/prefs.js:1213 js/prefs.js:1358 js/functions.js:1704 js/functions.js:1814
-#: js/prefs.js:1203 js/prefs.js:1348 js/functions.js:1706 js/functions.js:1816
+#: js/functions.js:1711 js/functions.js:1821 js/prefs.js:397 js/prefs.js:427
+#: js/prefs.js:459 js/prefs.js:642 js/prefs.js:662 js/prefs.js:1203
+#: js/prefs.js:1348
 msgid "No feeds are selected."
 msgstr "没有选择任何信息源。"
 
-#: js/functions.js:1740 js/functions.js:1736 js/functions.js:1746
-#: js/functions.js:1748
+#: js/functions.js:1753
 msgid ""
 "Remove selected feeds from the archive? Feeds with stored articles will not "
 "be removed."
 msgstr "将选中的信息源从存档中移除？包含已保存文章的信息源不会被移除。"
 
-#: js/functions.js:1779 js/functions.js:1775 js/functions.js:1785
-#: js/functions.js:1787
+#: js/functions.js:1792
 msgid "Feeds with update errors"
 msgstr "更新错误的信息源"
 
-#: js/functions.js:1790 js/prefs.js:1308 js/functions.js:1786 js/prefs.js:1195
-#: js/functions.js:1796 js/prefs.js:1185 js/functions.js:1798
+#: js/functions.js:1803 js/prefs.js:1185
 msgid "Remove selected feeds?"
 msgstr "移除选中的信息源？"
 
+#: js/functions.js:1904
+msgid "Help"
+msgstr ""
+
 #: js/PrefFeedTree.js:47
 #, fuzzy
 msgid "Edit category"
@@ -2749,401 +2815,303 @@ msgstr "请输入登录名："
 msgid "Can't create user: no login specified."
 msgstr "无法创建用户：没有指定登录名。"
 
-#: js/prefs.js:128 js/prefs.js:117
+#: js/prefs.js:117
 msgid "Edit Filter"
 msgstr "编辑过滤器"
 
-#: js/prefs.js:175 js/prefs.js:164
+#: js/prefs.js:164
 #, fuzzy
 msgid "Remove filter?"
 msgstr "移除这个过滤器： %s ？"
 
-#: js/prefs.js:290 js/prefs.js:279
+#: js/prefs.js:279
 msgid "Remove selected labels?"
 msgstr "移除选中的预定义标签？"
 
-#: js/prefs.js:306 js/prefs.js:1512 js/prefs.js:295 js/prefs.js:1399
-#: js/prefs.js:1389
+#: js/prefs.js:295 js/prefs.js:1389
 msgid "No labels are selected."
 msgstr "没有选择任何预定义标签。"
 
-#: js/prefs.js:320 js/prefs.js:309
+#: js/prefs.js:309
 msgid ""
 "Remove selected users? Neither default admin nor your account will be "
 "removed."
 msgstr "移除选中的用户？默认管理员和您的帐户不会被移除。"
 
-#: js/prefs.js:337 js/prefs.js:518 js/prefs.js:539 js/prefs.js:578
 #: js/prefs.js:326 js/prefs.js:507 js/prefs.js:528 js/prefs.js:567
 msgid "No users are selected."
 msgstr "没有选中任何用户。"
 
-#: js/prefs.js:355 js/prefs.js:344
+#: js/prefs.js:344
 msgid "Remove selected filters?"
 msgstr "移除选定的过滤器？"
 
-#: js/prefs.js:370 js/prefs.js:608 js/prefs.js:627 js/prefs.js:359
-#: js/prefs.js:597 js/prefs.js:616
+#: js/prefs.js:359 js/prefs.js:597 js/prefs.js:616
 msgid "No filters are selected."
 msgstr "没有选中的过滤器。"
 
-#: js/prefs.js:389 js/prefs.js:378
+#: js/prefs.js:378
 msgid "Unsubscribe from selected feeds?"
 msgstr "从选中的信息源取消订阅？"
 
-#: js/prefs.js:423 js/prefs.js:412
+#: js/prefs.js:412
 msgid "Please select only one feed."
 msgstr "请仅选择一个信息源。"
 
-#: js/prefs.js:429 js/prefs.js:418
+#: js/prefs.js:418
 msgid "Erase all non-starred articles in selected feed?"
 msgstr "清空选中的信息源当中所有未加星标的文章？"
 
-#: js/prefs.js:451 js/prefs.js:440
+#: js/prefs.js:440
 msgid "How many days of articles to keep (0 - use default)?"
 msgstr "文章保存几天？（填写0则采用默认设置）"
 
-#: js/prefs.js:489 js/prefs.js:478
+#: js/prefs.js:478
 msgid "Login field cannot be blank."
 msgstr "请填写登录信息。"
 
-#: js/prefs.js:523 js/prefs.js:544 js/prefs.js:583 js/prefs.js:512
-#: js/prefs.js:533 js/prefs.js:572
+#: js/prefs.js:512 js/prefs.js:533 js/prefs.js:572
 msgid "Please select only one user."
 msgstr "请仅选择一个用户。"
 
-#: js/prefs.js:548 js/prefs.js:537
+#: js/prefs.js:537
 msgid "Reset password of selected user?"
 msgstr "重置选定用户的密码？"
 
-#: js/prefs.js:613 js/prefs.js:602
+#: js/prefs.js:602
 msgid "Please select only one filter."
 msgstr "请仅选择一个过滤器。"
 
-#: js/prefs.js:631 js/prefs.js:620
+#: js/prefs.js:620
 #, fuzzy
 msgid "Combine selected filters?"
 msgstr "移除选定的过滤器？"
 
-#: js/prefs.js:695 js/prefs.js:684
+#: js/prefs.js:684
 msgid "Edit Multiple Feeds"
 msgstr "编辑多个信息源"
 
-#: js/prefs.js:719 js/prefs.js:708
+#: js/prefs.js:708
 msgid "Save changes to selected feeds?"
 msgstr "保存对信息源的更改？"
 
-#: js/prefs.js:811 js/prefs.js:800 js/prefs.js:790
+#: js/prefs.js:790
 msgid "OPML Import"
 msgstr "OPML 导入"
 
-#: js/prefs.js:838 js/prefs.js:827 js/prefs.js:817
+#: js/prefs.js:817
 msgid "Please choose an OPML file first."
 msgstr "请先选择一个 OPML 文件。"
 
-#: js/prefs.js:854 plugins/import_export/import_export.js:112
-msgid "Please choose the file first."
-msgstr ""
-
-#: js/prefs.js:1010 js/prefs.js:983 js/prefs.js:973
+#: js/prefs.js:973
 msgid "Reset to defaults?"
 msgstr "重置为默认状态？"
 
-#: js/prefs.js:1215 js/prefs.js:1102 js/prefs.js:1092
+#: js/prefs.js:1092
 msgid ""
 "Remove category %s? Any nested feeds would be placed into Uncategorized."
 msgstr ""
 
-#: js/prefs.js:1242 js/prefs.js:1129 js/prefs.js:1119
+#: js/prefs.js:1119
 msgid "Remove selected categories?"
 msgstr "移除选中的类别？"
 
-#: js/prefs.js:1258 js/prefs.js:1145 js/prefs.js:1135
+#: js/prefs.js:1135
 msgid "No categories are selected."
 msgstr "没有选中任何类别。"
 
-#: js/prefs.js:1266 js/prefs.js:1153 js/prefs.js:1143
+#: js/prefs.js:1143
 #, fuzzy
 msgid "Category title:"
 msgstr "类别"
 
-#: js/prefs.js:1297 js/prefs.js:1184 js/prefs.js:1174
+#: js/prefs.js:1174
 msgid "Feeds without recent updates"
 msgstr "最近没更新的信息源"
 
-#: js/prefs.js:1346 js/prefs.js:1233 js/prefs.js:1223
+#: js/prefs.js:1223
 msgid "Replace current OPML publishing address with a new one?"
 msgstr "将当前的 OPML 发布地址更改替换为新地址？"
 
-#: js/prefs.js:1455 js/prefs.js:1342 js/prefs.js:1332
+#: js/prefs.js:1332
 msgid "Rescore articles in selected feeds?"
 msgstr "为选中信息源中的文章重置评分？"
 
-#: js/prefs.js:1478 js/prefs.js:1365 js/prefs.js:1355
+#: js/prefs.js:1355
 msgid "Rescore all articles? This operation may take a lot of time."
 msgstr "重置所有文章的评分？这可能将花费很长时间。"
 
-#: js/prefs.js:1498 js/prefs.js:1385 js/prefs.js:1375
+#: js/prefs.js:1375
 msgid "Reset selected labels to default colors?"
 msgstr "将选中的可选标签重置为默认颜色？"
 
-#: js/prefs.js:1535 js/prefs.js:1422 js/prefs.js:1412
+#: js/prefs.js:1412
 msgid "Settings Profiles"
 msgstr "偏好文件的设置"
 
-#: js/prefs.js:1544 js/prefs.js:1431 js/prefs.js:1421
+#: js/prefs.js:1421
 msgid ""
 "Remove selected profiles? Active and default profiles will not be removed."
 msgstr "移除选中的偏好文件？当前偏好与默认偏好不会被移除。"
 
-#: js/prefs.js:1562 js/prefs.js:1449 js/prefs.js:1439
+#: js/prefs.js:1439
 msgid "No profiles are selected."
 msgstr "未选择偏好文件。"
 
-#: js/prefs.js:1570 js/prefs.js:1623 js/prefs.js:1457 js/prefs.js:1510
 #: js/prefs.js:1447 js/prefs.js:1500
 msgid "Activate selected profile?"
 msgstr "启用选中的偏好文件？"
 
-#: js/prefs.js:1586 js/prefs.js:1639 js/prefs.js:1473 js/prefs.js:1526
 #: js/prefs.js:1463 js/prefs.js:1516
 msgid "Please choose a profile to activate."
 msgstr "请选择希望启用的偏好文件。"
 
-#: js/prefs.js:1647 js/prefs.js:1534 js/prefs.js:1524
+#: js/prefs.js:1524
 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr "之前生成的信息源 URL 将会回到未认证状态。是否继续？"
 
-#: js/prefs.js:1666 js/prefs.js:1553 js/prefs.js:1543
+#: js/prefs.js:1543
 msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr "之前共享文章的 URL 将会回到未认证状态。是否继续？"
 
-#: js/prefs.js:1764 js/prefs.js:1651 js/prefs.js:1641
+#: js/prefs.js:1641
 msgid "Label Editor"
 msgstr "编辑预定义标签"
 
-#: js/prefs.js:1827 js/prefs.js:1714 js/prefs.js:1704
+#: js/prefs.js:1704
 msgid ""
 "This will clear your stored authentication information for Twitter. Continue?"
 msgstr "这将会清空所有保存过的 Twitter 认证信息。是否继续？"
 
-#: js/prefs.js:1911 plugins/import_export/import_export.js:13
-msgid "Export Data"
-msgstr ""
-
-#: js/prefs.js:1938 plugins/import_export/import_export.js:40
-msgid ""
-"Finished, exported %d articles. You can download the data <a "
-"class='visibleLink' href='%u'>here</a>."
-msgstr ""
-
-#: js/prefs.js:1991 plugins/import_export/import_export.js:93
-msgid "Data Import"
-msgstr ""
-
-#: js/prefs.js:2027 js/prefs.js:1794 js/prefs.js:1784
+#: js/prefs.js:1784
 msgid "Subscribing to feeds..."
 msgstr ""
 
-#: js/tt-rss.js:147 js/tt-rss.js:141 js/tt-rss.js:120
+#: js/prefs.js:1821
+msgid "Clear stored data for this plugin?"
+msgstr ""
+
+#: js/tt-rss.js:120
 msgid "Mark all articles as read?"
 msgstr "将所有文章标记为已读？"
 
-#: js/tt-rss.js:410 js/tt-rss.js:370 js/tt-rss.js:356
+#: js/tt-rss.js:356
 msgid "You can't unsubscribe from the category."
 msgstr "您不能取消订阅一个类别。"
 
-#: js/tt-rss.js:415 js/tt-rss.js:596 js/tt-rss.js:591 js/tt-rss.js:375
-#: js/tt-rss.js:525 js/tt-rss.js:361 js/tt-rss.js:511
+#: js/tt-rss.js:361 js/tt-rss.js:511
 msgid "Please select some feed first."
 msgstr "请先选几个信息源吧。"
 
-#: js/tt-rss.js:591 js/tt-rss.js:586 js/tt-rss.js:520 js/tt-rss.js:506
+#: js/tt-rss.js:506
 msgid "You can't rescore this kind of feed."
 msgstr "无法重置本类信息源的评分。"
 
-#: js/tt-rss.js:601 js/tt-rss.js:596 js/tt-rss.js:530 js/tt-rss.js:516
+#: js/tt-rss.js:516
 msgid "Rescore articles in %s?"
 msgstr "重置 %s 中文章的评分？"
 
-#: js/tt-rss.js:1062 js/tt-rss.js:883 js/tt-rss.js:825 js/tt-rss.js:830
+#: js/tt-rss.js:672
+#, fuzzy
+msgid "Please enable mail plugin first."
+msgstr "请先选几个信息源吧。"
+
+#: js/tt-rss.js:834
 msgid "New version available!"
 msgstr "有可用的新版本啦！"
 
-#: js/viewfeed.js:108 js/viewfeed.js:104
+#: js/viewfeed.js:104
 #, fuzzy
 msgid "Cancel search"
 msgstr "取消"
 
-#: js/viewfeed.js:456 js/viewfeed.js:445 js/viewfeed.js:451 js/viewfeed.js:435
-#: plugins/digest/digest.js:257 plugins/digest/digest.js:696
+#: js/viewfeed.js:435 plugins/digest/digest.js:257
+#: plugins/digest/digest.js:696
 msgid "Unstar article"
 msgstr "取消星标"
 
-#: js/viewfeed.js:461 js/viewfeed.js:450 js/viewfeed.js:456 js/viewfeed.js:440
-#: plugins/digest/digest.js:259 plugins/digest/digest.js:700
+#: js/viewfeed.js:440 plugins/digest/digest.js:259
+#: plugins/digest/digest.js:700
 msgid "Star article"
 msgstr "加星标"
 
-#: js/viewfeed.js:496 js/viewfeed.js:485 js/viewfeed.js:491 js/viewfeed.js:473
-#: plugins/digest/digest.js:262 plugins/digest/digest.js:731
+#: js/viewfeed.js:473 plugins/digest/digest.js:262
+#: plugins/digest/digest.js:731
 msgid "Unpublish article"
 msgstr "取消发布文章"
 
-#: js/viewfeed.js:676 js/viewfeed.js:704 js/viewfeed.js:731 js/viewfeed.js:793
-#: js/viewfeed.js:825 js/viewfeed.js:962 js/viewfeed.js:1005
-#: js/viewfeed.js:1055 js/viewfeed.js:2181 js/viewfeed.js:665
-#: js/viewfeed.js:693 js/viewfeed.js:720 js/viewfeed.js:782 js/viewfeed.js:814
-#: js/viewfeed.js:951 js/viewfeed.js:994 js/viewfeed.js:1044
-#: js/viewfeed.js:2154 js/viewfeed.js:671 js/viewfeed.js:699
-#: js/viewfeed.js:726 js/viewfeed.js:788 js/viewfeed.js:820 js/viewfeed.js:957
-#: js/viewfeed.js:1000 js/viewfeed.js:1050 js/viewfeed.js:2018
 #: js/viewfeed.js:674 js/viewfeed.js:702 js/viewfeed.js:729 js/viewfeed.js:791
 #: js/viewfeed.js:823 js/viewfeed.js:960 js/viewfeed.js:1003
 #: js/viewfeed.js:1053 js/viewfeed.js:1927 plugins/mail/mail.js:7
 msgid "No articles are selected."
 msgstr "没有选中任何文章。"
 
-#: js/viewfeed.js:942 js/viewfeed.js:931 js/viewfeed.js:937 js/viewfeed.js:940
+#: js/viewfeed.js:940
 msgid "Mark all visible articles in %s as read?"
 msgstr "标记 %s 中所有可见的文章为已读？"
 
-#: js/viewfeed.js:970 js/viewfeed.js:959 js/viewfeed.js:965 js/viewfeed.js:968
+#: js/viewfeed.js:968
 msgid "Delete %d selected articles in %s?"
 msgstr "删除 %s 中选择的 %d 篇文章？"
 
-#: js/viewfeed.js:972 js/viewfeed.js:961 js/viewfeed.js:967 js/viewfeed.js:970
+#: js/viewfeed.js:970
 msgid "Delete %d selected articles?"
 msgstr "删除选中的 %d 篇文章？"
 
-#: js/viewfeed.js:1014 js/viewfeed.js:1003 js/viewfeed.js:1009
 #: js/viewfeed.js:1012
 msgid "Archive %d selected articles in %s?"
 msgstr "将 %s 中的 %d 篇选中的文章存档？"
 
-#: js/viewfeed.js:1017 js/viewfeed.js:1006 js/viewfeed.js:1012
 #: js/viewfeed.js:1015
 msgid "Move %d archived articles back?"
 msgstr "将存档的 %d 篇文章移回原处？"
 
-#: js/viewfeed.js:1061 js/viewfeed.js:1050 js/viewfeed.js:1056
 #: js/viewfeed.js:1059
 msgid "Mark %d selected articles in %s as read?"
 msgstr "将 %s 中选中的 %d 篇文章标记为已读？"
 
-#: js/viewfeed.js:1085 js/viewfeed.js:1074 js/viewfeed.js:1080
 #: js/viewfeed.js:1083
 msgid "Edit article Tags"
 msgstr "编辑文章的自定义标签"
 
-#: js/viewfeed.js:1247 js/viewfeed.js:1236 js/viewfeed.js:1242
 #: js/viewfeed.js:1252
 msgid "No article is selected."
 msgstr "未选中任何文章。"
 
-#: js/viewfeed.js:1282 js/viewfeed.js:1271 js/viewfeed.js:1277
 #: js/viewfeed.js:1287
 msgid "No articles found to mark"
 msgstr "未找到需要标记的文章"
 
-#: js/viewfeed.js:1284 js/viewfeed.js:1273 js/viewfeed.js:1279
 #: js/viewfeed.js:1289
 msgid "Mark %d article(s) as read?"
 msgstr "将 %d 篇文章标记为已读？"
 
-#: js/viewfeed.js:1402 js/viewfeed.js:1383
-msgid "Loading..."
-msgstr "加载中……"
-
-#: js/viewfeed.js:1891 js/viewfeed.js:1864 js/viewfeed.js:1734
 #: js/viewfeed.js:1744
 msgid "Open original article"
 msgstr "打开原文"
 
-#: js/viewfeed.js:1897 js/viewfeed.js:1870
-msgid "View in a tt-rss tab"
-msgstr "在 tt-rss 舌签中查看"
-
-#: js/viewfeed.js:1905 js/viewfeed.js:1878 js/viewfeed.js:1742
-#: js/viewfeed.js:1752
-msgid "Mark above as read"
-msgstr ""
-
-#: js/viewfeed.js:1911 js/viewfeed.js:1884 js/viewfeed.js:1748
-#: js/viewfeed.js:1758
-msgid "Mark below as read"
-msgstr ""
-
-#: js/viewfeed.js:1967 js/viewfeed.js:1940 js/viewfeed.js:1804
 #: js/viewfeed.js:1814
 msgid "Remove label"
 msgstr "移除预定义标签"
 
-#: js/viewfeed.js:1991 js/viewfeed.js:1964 js/viewfeed.js:1828
 #: js/viewfeed.js:1838
 msgid "Playing..."
 msgstr "播放中……"
 
-#: js/viewfeed.js:1992 js/viewfeed.js:1965 js/viewfeed.js:1829
 #: js/viewfeed.js:1839
 msgid "Click to pause"
 msgstr "点击暂停"
 
-#: js/viewfeed.js:2150 js/viewfeed.js:2123 js/viewfeed.js:1987
 #: js/viewfeed.js:1896
 #, fuzzy
 msgid "Please enter new score for selected articles:"
 msgstr "删除选中的 %d 篇文章？"
 
-#: js/viewfeed.js:2192 js/viewfeed.js:2165 js/viewfeed.js:2029
 #: js/viewfeed.js:1938
 #, fuzzy
 msgid "Please enter new score for this article:"
 msgstr "请填写类别名称："
 
-#: js/functions.js:1887 js/functions.js:1891 js/functions.js:1897
-#: js/functions.js:1899
-msgid "Help"
-msgstr ""
-
-#: js/prefs.js:1831 js/prefs.js:1821
-msgid "Clear stored data for this plugin?"
-msgstr ""
-
-#: js/tt-rss.js:741 js/tt-rss.js:676 js/tt-rss.js:668
-#, fuzzy
-msgid "Please enable mail plugin first."
-msgstr "请先选几个信息源吧。"
-
-#: plugins/digest/digest_body.php:39
-msgid "Your browser doesn't support Javascript, which is required"
-msgstr ""
-
-#: plugins/nsfw/init.php:32 plugins/nsfw/init.php:43
-msgid "Not work safe (click to toggle)"
-msgstr ""
-
-#: plugins/nsfw/init.php:53
-msgid "NSFW Plugin"
-msgstr ""
-
-#: plugins/nsfw/init.php:80
-msgid "Tags to consider NSFW (comma-separated)"
-msgstr ""
-
-#: plugins/nsfw/init.php:101
-#, fuzzy
-msgid "Configuration saved."
-msgstr "设置已保存。"
-
-#: plugins/owncloud/init.php:35
-msgid "Owncloud"
-msgstr ""
-
-#: plugins/owncloud/init.php:59
-msgid "Owncloud url"
-msgstr ""
-
 #: plugins/digest/digest.js:71
 msgid "Mark %d displayed articles as read?"
 msgstr "将显示的 %d 篇文章标记为已读？"
@@ -3168,6 +3136,24 @@ msgstr "没有未读的信息源。"
 msgid "Load more..."
 msgstr "加载更多……"
 
+#: plugins/import_export/import_export.js:13
+msgid "Export Data"
+msgstr ""
+
+#: plugins/import_export/import_export.js:40
+msgid ""
+"Finished, exported %d articles. You can download the data <a "
+"class='visibleLink' href='%u'>here</a>."
+msgstr ""
+
+#: plugins/import_export/import_export.js:93
+msgid "Data Import"
+msgstr ""
+
+#: plugins/import_export/import_export.js:112
+msgid "Please choose the file first."
+msgstr ""
+
 #: plugins/mail/mail.js:21
 msgid "Forward article by email"
 msgstr "用邮件转发文章"
@@ -3202,6 +3188,96 @@ msgid ""
 "before continuing. Please type 'yes' to continue."
 msgstr ""
 
+#~ msgid "Comments?"
+#~ msgstr "评论些什么？"
+
+#~ msgid "News"
+#~ msgstr "新闻"
+
+#~ msgid "Move between feeds"
+#~ msgstr "在信息源之间移动"
+
+#~ msgid "Move between articles"
+#~ msgstr "在文章之间移动"
+
+#~ msgid "Active article actions"
+#~ msgstr "启用文章动作"
+
+#~ msgid "Mark articles below/above active one as read"
+#~ msgstr "将当前项以下/以上的文章标记为已读"
+
+#~ msgid "Scroll article content"
+#~ msgstr "滚动文章内容"
+
+#~ msgid "Other actions"
+#~ msgstr "其他动作"
+
+#~ msgid "Display this help dialog"
+#~ msgstr "显示本帮助对话框"
+
+#~ msgid "Multiple articles actions"
+#~ msgstr "多文章动作"
+
+#, fuzzy
+#~ msgid "Select starred articles"
+#~ msgstr "选择未读文章"
+
+#~ msgid "Feed actions"
+#~ msgstr "信息源动作"
+
+#~ msgid "Mark feed as read"
+#~ msgstr "标记信息源为已读"
+
+#~ msgid "If viewing category, (un)collapse it"
+#~ msgstr "查看类别时将其折叠/展开"
+
+#~ msgid "Press any key to close this window."
+#~ msgstr "按任意键关闭本窗口。"
+
+#~ msgid "My Feeds"
+#~ msgstr "我的信息源"
+
+#~ msgid "Panel actions"
+#~ msgstr "版面动作"
+
+#~ msgid "Top 25 feeds"
+#~ msgstr "前25位的信息源"
+
+#~ msgid "Edit feed categories"
+#~ msgstr "编辑信息源类别"
+
+#~ msgid "Focus search (if present)"
+#~ msgstr "进入搜索框（页面中存在的情况）"
+
+#~ msgid ""
+#~ "<b>Note:</b> not all actions may be available, depending on Tiny Tiny RSS "
+#~ "configuration and your access level."
+#~ msgstr ""
+#~ "<b>提醒：</b>根据 Tiny Tiny RSS 的配置和你的访问级别不同，并非所有的动作都"
+#~ "可以执行。"
+
+#~ msgid "Open article in new tab"
+#~ msgstr "在新标签页中打开文章"
+
+#~ msgid "Select theme"
+#~ msgstr "选择主题"
+
+#~ msgid "Right-to-left content"
+#~ msgstr "右至左的内容"
+
+#, fuzzy
+#~ msgid "Cache content locally"
+#~ msgstr "本地缓存图片"
+
+#~ msgid "Mark posts as updated on content change"
+#~ msgstr "将内容更改过的文章标记为已更新状态"
+
+#~ msgid "Loading..."
+#~ msgstr "加载中……"
+
+#~ msgid "View in a tt-rss tab"
+#~ msgstr "在 tt-rss 舌签中查看"
+
 #~ msgid "Magpie"
 #~ msgstr "Magpie"
 
diff --git a/messages.pot b/messages.pot
index dddf97a73..258d3fe25 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: 2013-03-17 19:37+0400\n"
+"POT-Creation-Date: 2013-03-19 10:14+0400\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"
@@ -17,79 +17,79 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backend.php:67
+#: backend.php:71
 msgid "Use default"
 msgstr ""
 
-#: backend.php:68
+#: backend.php:72
 msgid "Never purge"
 msgstr ""
 
-#: backend.php:69
+#: backend.php:73
 msgid "1 week old"
 msgstr ""
 
-#: backend.php:70
+#: backend.php:74
 msgid "2 weeks old"
 msgstr ""
 
-#: backend.php:71
+#: backend.php:75
 msgid "1 month old"
 msgstr ""
 
-#: backend.php:72
+#: backend.php:76
 msgid "2 months old"
 msgstr ""
 
-#: backend.php:73
+#: backend.php:77
 msgid "3 months old"
 msgstr ""
 
-#: backend.php:76
+#: backend.php:80
 msgid "Default interval"
 msgstr ""
 
-#: backend.php:77 backend.php:87
+#: backend.php:81 backend.php:91
 msgid "Disable updates"
 msgstr ""
 
-#: backend.php:78 backend.php:88
+#: backend.php:82 backend.php:92
 msgid "Each 15 minutes"
 msgstr ""
 
-#: backend.php:79 backend.php:89
+#: backend.php:83 backend.php:93
 msgid "Each 30 minutes"
 msgstr ""
 
-#: backend.php:80 backend.php:90
+#: backend.php:84 backend.php:94
 msgid "Hourly"
 msgstr ""
 
-#: backend.php:81 backend.php:91
+#: backend.php:85 backend.php:95
 msgid "Each 4 hours"
 msgstr ""
 
-#: backend.php:82 backend.php:92
+#: backend.php:86 backend.php:96
 msgid "Each 12 hours"
 msgstr ""
 
-#: backend.php:83 backend.php:93
+#: backend.php:87 backend.php:97
 msgid "Daily"
 msgstr ""
 
-#: backend.php:84 backend.php:94
+#: backend.php:88 backend.php:98
 msgid "Weekly"
 msgstr ""
 
-#: backend.php:97 classes/pref/users.php:139
+#: backend.php:101 classes/pref/users.php:139
 msgid "User"
 msgstr ""
 
-#: backend.php:98
+#: backend.php:102
 msgid "Power User"
 msgstr ""
 
-#: backend.php:99
+#: backend.php:103
 msgid "Administrator"
 msgstr ""
 
@@ -120,7 +120,7 @@ msgstr ""
 #: db-updater.php:94 db-updater.php:163 db-updater.php:176 register.php:194
 #: register.php:239 register.php:252 register.php:267 register.php:286
 #: register.php:371 register.php:381 register.php:393
-#: classes/handler/public.php:637 classes/handler/public.php:725
+#: classes/handler/public.php:611 classes/handler/public.php:699
 msgid "Return to Tiny Tiny RSS"
 msgstr ""
 
@@ -240,195 +240,193 @@ msgstr ""
 msgid "SQL escaping test failed, check your database and PHP configuration"
 msgstr ""
 
-#: index.php:108 index.php:150 index.php:236 prefs.php:86
-#: classes/backend.php:6 classes/pref/labels.php:296
-#: classes/pref/filters.php:602 classes/pref/feeds.php:1342
-#: plugins/digest/digest_body.php:45 js/viewfeed.js:1169 js/viewfeed.js:1158
-#: js/viewfeed.js:1164 js/viewfeed.js:1174
+#: index.php:117 index.php:147 index.php:252 prefs.php:79
+#: classes/backend.php:5 classes/pref/labels.php:296
+#: classes/pref/filters.php:609 classes/pref/feeds.php:1270
+#: plugins/digest/digest_body.php:45 js/viewfeed.js:1174
 msgid "Loading, please wait..."
 msgstr ""
 
-#: index.php:118 plugins/digest/digest_body.php:56
-msgid "Hello,"
+#: index.php:127 index.php:198
+msgid "Communication problem with server."
 msgstr ""
 
-#: index.php:120 prefs.php:29 prefs.php:108 help/main.php:73 help/prefs.php:8
-#: classes/pref/prefs.php:371
-msgid "Preferences"
-msgstr ""
-
-#: index.php:124
-msgid "Comments?"
-msgstr ""
-
-#: index.php:128 mobile/mobile-functions.php:69
-#: mobile/mobile-functions.php:244 plugins/digest/digest_body.php:59
-msgid "Logout"
-msgstr ""
-
-#: index.php:134
+#: index.php:133 index.php:206
 msgid "New version of Tiny Tiny RSS is available!"
 msgstr ""
 
-#: index.php:157
-msgid "News"
-msgstr ""
-
-#: index.php:166
+#: index.php:161
 msgid "Collapse feedlist"
 msgstr ""
 
-#: index.php:169
+#: index.php:164
 msgid "Show articles"
 msgstr ""
 
-#: index.php:172
+#: index.php:167
 msgid "Adaptive"
 msgstr ""
 
-#: index.php:173
+#: index.php:168
 msgid "All Articles"
 msgstr ""
 
-#: index.php:174 classes/feeds.php:106
+#: index.php:169 include/functions.php:1912 classes/feeds.php:106
 msgid "Starred"
 msgstr ""
 
-#: index.php:175 classes/feeds.php:107
+#: index.php:170 include/functions.php:1913 classes/feeds.php:107
 msgid "Published"
 msgstr ""
 
-#: index.php:176 classes/feeds.php:93 classes/feeds.php:105
+#: index.php:171 classes/feeds.php:93 classes/feeds.php:105
 msgid "Unread"
 msgstr ""
 
-#: index.php:177
+#: index.php:172
 msgid "Ignore Scoring"
 msgstr ""
 
-#: index.php:178
+#: index.php:173
 msgid "Updated"
 msgstr ""
 
-#: index.php:181
+#: index.php:176
 msgid "Sort articles"
 msgstr ""
 
-#: index.php:184 classes/pref/prefs.php:462
+#: index.php:179
 msgid "Default"
 msgstr ""
 
-#: index.php:185
+#: index.php:180
 msgid "Date"
 msgstr ""
 
-#: index.php:186 include/localized_schema.php:3
+#: index.php:181 include/localized_schema.php:3
 msgid "Title"
 msgstr ""
 
-#: index.php:187
+#: index.php:182
 msgid "Score"
 msgstr ""
 
-#: index.php:192 classes/pref/feeds.php:539 classes/pref/feeds.php:786
+#: index.php:187 classes/pref/feeds.php:535 classes/pref/feeds.php:746
 msgid "Update"
 msgstr ""
 
-#: index.php:196 index.php:211 include/localized_schema.php:10
-#: classes/feeds.php:111 classes/feeds.php:127 js/FeedTree.js:128
-#: js/FeedTree.js:156 plugins/digest/digest.js:630
+#: index.php:191 index.php:221 include/functions.php:1903
+#: include/localized_schema.php:10 classes/feeds.php:111 classes/feeds.php:131
+#: js/FeedTree.js:128 js/FeedTree.js:156 plugins/digest/digest.js:630
 msgid "Mark as read"
 msgstr ""
 
-#: index.php:202 classes/feeds.php:101
+#: index.php:211
 msgid "Actions..."
 msgstr ""
 
-#: index.php:204
+#: index.php:213
+msgid "Preferences..."
+msgstr ""
+
+#: index.php:214
 msgid "Search..."
 msgstr ""
 
-#: index.php:205
+#: index.php:215
 msgid "Feed actions:"
 msgstr ""
 
-#: index.php:206 classes/handler/public.php:567
+#: index.php:216 classes/handler/public.php:541
 msgid "Subscribe to feed..."
 msgstr ""
 
-#: index.php:207
+#: index.php:217
 msgid "Edit this feed..."
 msgstr ""
 
-#: index.php:208
+#: index.php:218
 msgid "Rescore feed"
 msgstr ""
 
-#: index.php:209 classes/pref/feeds.php:712 classes/pref/feeds.php:1315
+#: index.php:219 classes/pref/feeds.php:672 classes/pref/feeds.php:1243
 #: js/PrefFeedTree.js:73
 msgid "Unsubscribe"
 msgstr ""
 
-#: index.php:210
+#: index.php:220
 msgid "All feeds:"
 msgstr ""
 
-#: index.php:212 help/main.php:56
+#: index.php:222
 msgid "(Un)hide read feeds"
 msgstr ""
 
-#: index.php:213
+#: index.php:223
 msgid "Other actions:"
 msgstr ""
 
-#: index.php:215
+#: index.php:225
 msgid "Switch to digest..."
 msgstr ""
 
-#: index.php:217
+#: index.php:227
 msgid "Show tag cloud..."
 msgstr ""
 
-#: index.php:218
+#: index.php:229 include/functions.php:1890
+msgid "Toggle widescreen mode"
+msgstr ""
+
+#: index.php:231
 msgid "Select by tags..."
 msgstr ""
 
-#: index.php:219
+#: index.php:232
 msgid "Create label..."
 msgstr ""
 
-#: index.php:220
+#: index.php:233
 msgid "Create filter..."
 msgstr ""
 
-#: index.php:221
+#: index.php:234
 msgid "Keyboard shortcuts help"
 msgstr ""
 
-#: prefs.php:99
+#: index.php:236 mobile/mobile-functions.php:69
+#: mobile/mobile-functions.php:244 plugins/digest/digest_body.php:59
+msgid "Logout"
+msgstr ""
+
+#: prefs.php:28 prefs.php:99 include/functions.php:1915
+#: classes/pref/prefs.php:371
+msgid "Preferences"
+msgstr ""
+
+#: prefs.php:90
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: prefs.php:100 help/prefs.php:14
+#: prefs.php:91
 msgid "Exit preferences"
 msgstr ""
 
-#: prefs.php:111 classes/pref/feeds.php:101 classes/pref/feeds.php:1220
-#: classes/pref/feeds.php:1283
+#: prefs.php:102 classes/pref/feeds.php:100 classes/pref/feeds.php:1148
+#: classes/pref/feeds.php:1211
 msgid "Feeds"
 msgstr ""
 
-#: prefs.php:114 help/prefs.php:11 classes/pref/filters.php:110
+#: prefs.php:105 classes/pref/filters.php:117
 msgid "Filters"
 msgstr ""
 
-#: prefs.php:117 help/prefs.php:12 mobile/mobile-functions.php:205
-#: include/functions.php:1189 include/functions.php:1836
-#: classes/pref/labels.php:90
+#: prefs.php:108 mobile/mobile-functions.php:205 include/functions.php:1118
+#: include/functions.php:1739 classes/pref/labels.php:90
 msgid "Labels"
 msgstr ""
 
-#: prefs.php:121 help/prefs.php:13
+#: prefs.php:112
 msgid "Users"
 msgstr ""
 
@@ -487,236 +485,22 @@ msgstr ""
 msgid "New user registrations are currently closed."
 msgstr ""
 
-#: update.php:38
+#: update.php:37
 msgid "Tiny Tiny RSS data update script."
 msgstr ""
 
-#: help/main.php:1 help/prefs.php:1
-msgid "Keyboard Shortcuts"
-msgstr ""
-
-#: help/main.php:5
-msgid "Navigation"
-msgstr ""
-
-#: help/main.php:8
-msgid "Move between feeds"
-msgstr ""
-
-#: help/main.php:9
-msgid "Move between articles"
-msgstr ""
-
-#: help/main.php:10
-msgid "Show search dialog"
-msgstr ""
-
-#: help/main.php:13
-msgid "Active article actions"
-msgstr ""
-
-#: help/main.php:16
-msgid "Toggle starred"
-msgstr ""
-
-#: help/main.php:17
-msgid "Toggle published"
-msgstr ""
-
-#: help/main.php:18
-msgid "Toggle unread"
-msgstr ""
-
-#: help/main.php:19
-msgid "Edit tags"
-msgstr ""
-
-#: help/main.php:20
-msgid "Dismiss selected articles"
-msgstr ""
-
-#: help/main.php:21
-msgid "Dismiss read articles"
-msgstr ""
-
-#: help/main.php:22
-msgid "Open article in new window"
-msgstr ""
-
-#: help/main.php:23
-msgid "Mark articles below/above active one as read"
-msgstr ""
-
-#: help/main.php:24
-msgid "Scroll article content"
-msgstr ""
-
-#: help/main.php:25
-msgid "Email article"
-msgstr ""
-
-#: help/main.php:29 help/prefs.php:30
-msgid "Other actions"
-msgstr ""
-
-#: help/main.php:32
-msgid "Select article under mouse cursor"
-msgstr ""
-
-#: help/main.php:33 help/prefs.php:26 classes/pref/labels.php:281
-msgid "Create label"
-msgstr ""
-
-#: help/main.php:34 help/prefs.php:25 classes/pref/filters.php:580
-msgid "Create filter"
-msgstr ""
-
-#: help/main.php:35
-msgid "Collapse sidebar"
-msgstr ""
-
-#: help/main.php:36 help/prefs.php:34
-msgid "Display this help dialog"
-msgstr ""
-
-#: help/main.php:41
-msgid "Multiple articles actions"
-msgstr ""
-
-#: help/main.php:44
-msgid "Select all articles"
-msgstr ""
-
-#: help/main.php:45
-msgid "Select unread articles"
-msgstr ""
-
-#: help/main.php:46
-msgid "Select starred articles"
-msgstr ""
-
-#: help/main.php:47
-msgid "Select published articles"
-msgstr ""
-
-#: help/main.php:48
-msgid "Invert article selection"
-msgstr ""
-
-#: help/main.php:49
-msgid "Deselect all articles"
-msgstr ""
-
-#: help/main.php:52
-msgid "Feed actions"
-msgstr ""
-
-#: help/main.php:55
-msgid "Refresh active feed"
-msgstr ""
-
-#: help/main.php:57 help/prefs.php:22 classes/pref/feeds.php:1286
-msgid "Subscribe to feed"
-msgstr ""
-
-#: help/main.php:58 js/FeedTree.js:135 js/PrefFeedTree.js:67
-msgid "Edit feed"
-msgstr ""
-
-#: help/main.php:59
-msgid "Mark feed as read"
-msgstr ""
-
-#: help/main.php:60
-msgid "Reverse headlines order"
-msgstr ""
-
-#: help/main.php:61 js/FeedTree.js:170
-msgid "Mark all feeds as read"
-msgstr ""
-
-#: help/main.php:62
-msgid "If viewing category, (un)collapse it"
-msgstr ""
-
-#: help/main.php:65 help/prefs.php:5
-msgid "Go to..."
-msgstr ""
-
-#: help/main.php:68 include/functions.php:1893
-msgid "All articles"
-msgstr ""
-
-#: help/main.php:69 include/functions.php:1891
-msgid "Fresh articles"
-msgstr ""
-
-#: help/main.php:70 include/functions.php:1887
-msgid "Starred articles"
-msgstr ""
-
-#: help/main.php:71 include/functions.php:1889
-msgid "Published articles"
-msgstr ""
-
-#: help/main.php:72
-msgid "Tag cloud"
-msgstr ""
-
-#: help/main.php:79
-msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
-msgstr ""
-
-#: help/main.php:81 help/prefs.php:41
-msgid "Press any key to close this window."
-msgstr ""
-
-#: help/prefs.php:9
-msgid "My Feeds"
-msgstr ""
-
-#: help/prefs.php:10
-msgid "Other Feeds"
-msgstr ""
-
-#: help/prefs.php:19
-msgid "Panel actions"
-msgstr ""
-
-#: help/prefs.php:23
-msgid "Top 25 feeds"
-msgstr ""
-
-#: help/prefs.php:24
-msgid "Edit feed categories"
-msgstr ""
-
-#: help/prefs.php:27 classes/pref/users.php:386
-msgid "Create user"
-msgstr ""
-
-#: help/prefs.php:33
-msgid "Focus search (if present)"
-msgstr ""
-
-#: help/prefs.php:39
-msgid ""
-"<b>Note:</b> not all actions may be available, depending on Tiny Tiny RSS "
-"configuration and your access level."
-msgstr ""
-
 #: mobile/login_form.php:28 include/login_form.php:209
-#: classes/handler/public.php:495
+#: classes/handler/public.php:469
 msgid "Log in"
 msgstr ""
 
 #: mobile/login_form.php:40 include/login_form.php:169
-#: classes/handler/public.php:479
+#: classes/handler/public.php:453
 msgid "Login:"
 msgstr ""
 
 #: mobile/login_form.php:45 include/login_form.php:178
-#: classes/handler/public.php:482
+#: classes/handler/public.php:456
 msgid "Password:"
 msgstr ""
 
@@ -731,8 +515,8 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
-#: mobile/mobile-functions.php:178 include/functions.php:1187
-#: include/functions.php:1834
+#: mobile/mobile-functions.php:178 include/functions.php:1116
+#: include/functions.php:1737
 msgid "Special"
 msgstr ""
 
@@ -745,12 +529,12 @@ msgid "Enable categories"
 msgstr ""
 
 #: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36
-#: mobile/prefs.php:41 mobile/prefs.php:46
+#: mobile/prefs.php:41 mobile/prefs.php:46 mobile/prefs.php:51
 msgid "ON"
 msgstr ""
 
 #: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36
-#: mobile/prefs.php:41 mobile/prefs.php:46
+#: mobile/prefs.php:41 mobile/prefs.php:46 mobile/prefs.php:51
 msgid "OFF"
 msgstr ""
 
@@ -770,143 +554,308 @@ msgstr ""
 msgid "Sort feeds by unread count"
 msgstr ""
 
-#: include/functions.php:564
-#, php-format
-msgid "Fatal: authentication module %s not found."
+#: mobile/prefs.php:50 include/localized_schema.php:45
+msgid "Reverse headline order (oldest first)"
 msgstr ""
 
-#: include/functions.php:682
-msgid "Session failed to validate (incorrect IP)"
-msgstr ""
-
-#: include/functions.php:1198 include/functions.php:1737
-#: include/functions.php:1822 include/functions.php:1844
-#: include/functions.php:2699 classes/opml.php:416 classes/pref/feeds.php:193
+#: include/digest.php:131 include/functions.php:1127
+#: include/functions.php:1640 include/functions.php:1725
+#: include/functions.php:1747 classes/opml.php:416 classes/pref/feeds.php:188
 msgid "Uncategorized"
 msgstr ""
 
-#: include/functions.php:1686 classes/dlg.php:387 classes/pref/filters.php:361
-msgid "All feeds"
-msgstr ""
-
-#: include/functions.php:1895
-msgid "Archived articles"
-msgstr ""
-
-#: include/functions.php:1897
-msgid "Recently read"
-msgstr ""
-
-#: include/functions.php:2346
-#, php-format
-msgid "Search results: %s"
-msgstr ""
-
-#: include/functions.php:3067 js/viewfeed.js:1998 js/viewfeed.js:1971
-#: js/viewfeed.js:1835 js/viewfeed.js:1845
-msgid "Click to play"
-msgstr ""
-
-#: include/functions.php:3068 js/viewfeed.js:1997 js/viewfeed.js:1970
-#: js/viewfeed.js:1834 js/viewfeed.js:1844
-msgid "Play"
-msgstr ""
-
-#: include/functions.php:3203
-msgid " - "
-msgstr ""
-
-#: include/functions.php:3232 include/functions.php:4028 classes/rpc.php:414
-msgid "no tags"
-msgstr ""
-
-#: include/functions.php:3242 classes/feeds.php:680
-msgid "Edit tags for this article"
-msgstr ""
-
-#: include/functions.php:3252 classes/feeds.php:707
-msgid "Open article in new tab"
-msgstr ""
-
-#: include/functions.php:3263 classes/feeds.php:718
-msgid "Close article"
-msgstr ""
-
-#: include/functions.php:3280 classes/feeds.php:616
-msgid "Originally from:"
-msgstr ""
-
-#: include/functions.php:3293 classes/feeds.php:629 classes/pref/feeds.php:511
-msgid "Feed URL"
-msgstr ""
-
-#: include/functions.php:3308 classes/feeds.php:68
-msgid "Visit the website"
-msgstr ""
-
-#: include/functions.php:3327
-msgid "Related"
-msgstr ""
-
-#: include/functions.php:3361 classes/dlg.php:30 classes/dlg.php:61
-#: classes/dlg.php:180 classes/dlg.php:203 classes/dlg.php:240
-#: classes/dlg.php:524 classes/dlg.php:559 classes/dlg.php:590
-#: classes/dlg.php:623 classes/dlg.php:724 classes/pref/users.php:106
-#: classes/pref/filters.php:101 classes/pref/feeds.php:1638
-#: classes/pref/feeds.php:1709 plugins/share/share.php:61
-#: plugins/updater/updater.php:301 plugins/updater/init.php:323
-msgid "Close this window"
-msgstr ""
-
-#: include/functions.php:4053
-msgid "(edit note)"
-msgstr ""
-
-#: include/functions.php:4525
-msgid "No feed selected."
-msgstr ""
-
-#: include/functions.php:4535 classes/feeds.php:766
-#, php-format
-msgid "Feeds last updated at %s"
-msgstr ""
-
-#: include/functions.php:4545 classes/feeds.php:776
-msgid "Some feeds have update errors (click for details)"
-msgstr ""
-
-#: include/functions.php:4689
-msgid "unknown type"
-msgstr ""
-
-#: include/functions.php:4731
-msgid "Attachments"
-msgstr ""
-
-#: include/functions.php:5191
+#: include/feedbrowser.php:83
 #, php-format
 msgid "%d archived articles"
 msgstr ""
 
-#: include/functions.php:5215
+#: include/feedbrowser.php:107
 msgid "No feeds found."
 msgstr ""
 
-#: include/functions.php:5261 plugins/import_export/init.php:221
-msgid "Could not import: incorrect schema version."
+#: include/functions.php:698
+msgid "Session failed to validate (incorrect IP)"
 msgstr ""
 
-#: include/functions.php:5266 plugins/import_export/init.php:226
-msgid "Could not import: unrecognized document format."
+#: include/functions.php:1589 classes/dlg.php:371 classes/pref/filters.php:368
+msgid "All feeds"
 msgstr ""
 
-#: include/functions.php:5425
+#: include/functions.php:1790
+msgid "Starred articles"
+msgstr ""
+
+#: include/functions.php:1792
+msgid "Published articles"
+msgstr ""
+
+#: include/functions.php:1794
+msgid "Fresh articles"
+msgstr ""
+
+#: include/functions.php:1796 include/functions.php:1910
+msgid "All articles"
+msgstr ""
+
+#: include/functions.php:1798
+msgid "Archived articles"
+msgstr ""
+
+#: include/functions.php:1800
+msgid "Recently read"
+msgstr ""
+
+#: include/functions.php:1867
+msgid "Navigation"
+msgstr ""
+
+#: include/functions.php:1868
+msgid "Open next feed"
+msgstr ""
+
+#: include/functions.php:1869
+msgid "Open previous feed"
+msgstr ""
+
+#: include/functions.php:1870
+msgid "Open next article"
+msgstr ""
+
+#: include/functions.php:1871
+msgid "Open previous article"
+msgstr ""
+
+#: include/functions.php:1872
+msgid "Open next article (don't scroll long articles)"
+msgstr ""
+
+#: include/functions.php:1873
+msgid "Open previous article (don't scroll long articles)"
+msgstr ""
+
+#: include/functions.php:1874
+msgid "Show search dialog"
+msgstr ""
+
+#: include/functions.php:1875
+msgid "Article"
+msgstr ""
+
+#: include/functions.php:1876
+msgid "Toggle starred"
+msgstr ""
+
+#: include/functions.php:1877
+msgid "Toggle published"
+msgstr ""
+
+#: include/functions.php:1878
+msgid "Toggle unread"
+msgstr ""
+
+#: include/functions.php:1879
+msgid "Edit tags"
+msgstr ""
+
+#: include/functions.php:1880
+msgid "Dismiss selected"
+msgstr ""
+
+#: include/functions.php:1881
+msgid "Dismiss read"
+msgstr ""
+
+#: include/functions.php:1882
+msgid "Open in new window"
+msgstr ""
+
+#: include/functions.php:1883 js/viewfeed.js:1758
+msgid "Mark below as read"
+msgstr ""
+
+#: include/functions.php:1884 js/viewfeed.js:1752
+msgid "Mark above as read"
+msgstr ""
+
+#: include/functions.php:1885
+msgid "Scroll down"
+msgstr ""
+
+#: include/functions.php:1886
+msgid "Scroll up"
+msgstr ""
+
+#: include/functions.php:1887
+msgid "Select article under cursor"
+msgstr ""
+
+#: include/functions.php:1888
+msgid "Email article"
+msgstr ""
+
+#: include/functions.php:1889 plugins/close_button/init.php:24
+msgid "Close article"
+msgstr ""
+
+#: include/functions.php:1891
+msgid "Article selection"
+msgstr ""
+
+#: include/functions.php:1892
+msgid "Select all articles"
+msgstr ""
+
+#: include/functions.php:1893
+msgid "Select unread"
+msgstr ""
+
+#: include/functions.php:1894
+msgid "Select starred"
+msgstr ""
+
+#: include/functions.php:1895
+msgid "Select published"
+msgstr ""
+
+#: include/functions.php:1896
+msgid "Invert selection"
+msgstr ""
+
+#: include/functions.php:1897
+msgid "Deselect everything"
+msgstr ""
+
+#: include/functions.php:1898 classes/pref/feeds.php:488
+#: classes/pref/feeds.php:707
+msgid "Feed"
+msgstr ""
+
+#: include/functions.php:1899
+msgid "Refresh current feed"
+msgstr ""
+
+#: include/functions.php:1900
+msgid "Un/hide read feeds"
+msgstr ""
+
+#: include/functions.php:1901 classes/pref/feeds.php:1214
+msgid "Subscribe to feed"
+msgstr ""
+
+#: include/functions.php:1902 js/FeedTree.js:135 js/PrefFeedTree.js:67
+msgid "Edit feed"
+msgstr ""
+
+#: include/functions.php:1904
+msgid "Reverse headlines"
+msgstr ""
+
+#: include/functions.php:1905
+msgid "Debug feed update"
+msgstr ""
+
+#: include/functions.php:1906 js/FeedTree.js:170
+msgid "Mark all feeds as read"
+msgstr ""
+
+#: include/functions.php:1907
+msgid "Un/collapse current category"
+msgstr ""
+
+#: include/functions.php:1908
+msgid "Toggle combined mode"
+msgstr ""
+
+#: include/functions.php:1909
+msgid "Go to"
+msgstr ""
+
+#: include/functions.php:1911
+msgid "Fresh"
+msgstr ""
+
+#: include/functions.php:1914
+msgid "Tag cloud"
+msgstr ""
+
+#: include/functions.php:1916
+msgid "Other"
+msgstr ""
+
+#: include/functions.php:1917 classes/pref/labels.php:281
+msgid "Create label"
+msgstr ""
+
+#: include/functions.php:1918 classes/pref/filters.php:587
+msgid "Create filter"
+msgstr ""
+
+#: include/functions.php:1919
+msgid "Un/collapse sidebar"
+msgstr ""
+
+#: include/functions.php:1920
+msgid "Show help dialog"
+msgstr ""
+
+#: include/functions.php:2400
 #, php-format
-msgid "Finished: %d articles processed, %d imported, %d feeds created."
+msgid "Search results: %s"
 msgstr ""
 
-#: include/functions.php:5431 plugins/import_export/init.php:391
-msgid "Could not load XML document."
+#: include/functions.php:2824 js/viewfeed.js:1845
+msgid "Click to play"
+msgstr ""
+
+#: include/functions.php:2825 js/viewfeed.js:1844
+msgid "Play"
+msgstr ""
+
+#: include/functions.php:2945
+msgid " - "
+msgstr ""
+
+#: include/functions.php:2967 include/functions.php:3284 classes/rpc.php:359
+msgid "no tags"
+msgstr ""
+
+#: include/functions.php:2977 classes/feeds.php:645
+msgid "Edit tags for this article"
+msgstr ""
+
+#: include/functions.php:3006 classes/feeds.php:600
+msgid "Originally from:"
+msgstr ""
+
+#: include/functions.php:3019 classes/feeds.php:613 classes/pref/feeds.php:507
+msgid "Feed URL"
+msgstr ""
+
+#: include/functions.php:3048
+msgid "Related"
+msgstr ""
+
+#: include/functions.php:3075 classes/dlg.php:43 classes/dlg.php:162
+#: classes/dlg.php:185 classes/dlg.php:222 classes/dlg.php:508
+#: classes/dlg.php:543 classes/dlg.php:574 classes/dlg.php:608
+#: classes/dlg.php:620 classes/backend.php:105 classes/pref/users.php:106
+#: classes/pref/filters.php:108 classes/pref/feeds.php:1527
+#: classes/pref/feeds.php:1598 plugins/import_export/init.php:407
+#: plugins/import_export/init.php:431 plugins/share/init.php:67
+#: plugins/updater/init.php:329
+msgid "Close this window"
+msgstr ""
+
+#: include/functions.php:3309
+msgid "(edit note)"
+msgstr ""
+
+#: include/functions.php:3542
+msgid "unknown type"
+msgstr ""
+
+#: include/functions.php:3592
+msgid "Attachments"
 msgstr ""
 
 #: include/localized_schema.php:4
@@ -933,9 +882,8 @@ msgstr ""
 msgid "Set starred"
 msgstr ""
 
-#: include/localized_schema.php:12 js/viewfeed.js:501 js/viewfeed.js:490
-#: js/viewfeed.js:496 js/viewfeed.js:478 plugins/digest/digest.js:264
-#: plugins/digest/digest.js:736
+#: include/localized_schema.php:12 js/viewfeed.js:478
+#: plugins/digest/digest.js:264 plugins/digest/digest.js:736
 msgid "Publish article"
 msgstr ""
 
@@ -943,8 +891,7 @@ msgstr ""
 msgid "Assign tags"
 msgstr ""
 
-#: include/localized_schema.php:14 js/viewfeed.js:1962 js/viewfeed.js:1935
-#: js/viewfeed.js:1799 js/viewfeed.js:1809
+#: include/localized_schema.php:14 js/viewfeed.js:1809
 msgid "Assign label"
 msgstr ""
 
@@ -1074,10 +1021,6 @@ msgstr ""
 msgid "Sort feeds by unread articles count"
 msgstr ""
 
-#: include/localized_schema.php:45
-msgid "Reverse headline order (oldest first)"
-msgstr ""
-
 #: include/localized_schema.php:46
 msgid "Enable e-mail digest"
 msgstr ""
@@ -1123,7 +1066,7 @@ msgid "Group headlines in virtual feeds"
 msgstr ""
 
 #: include/localized_schema.php:57
-msgid "Do not show images in articles"
+msgid "Hide images in articles"
 msgstr ""
 
 #: include/localized_schema.php:58
@@ -1134,8 +1077,7 @@ msgstr ""
 msgid "User timezone"
 msgstr ""
 
-#: include/localized_schema.php:60 js/prefs.js:1856 js/prefs.js:1743
-#: js/prefs.js:1733
+#: include/localized_schema.php:60 js/prefs.js:1733
 msgid "Customize stylesheet"
 msgstr ""
 
@@ -1155,7 +1097,7 @@ msgstr ""
 msgid "Assign articles to labels automatically"
 msgstr ""
 
-#: include/login_form.php:185 classes/handler/public.php:485
+#: include/login_form.php:185 classes/handler/public.php:459
 msgid "Language:"
 msgstr ""
 
@@ -1163,8 +1105,8 @@ msgstr ""
 msgid "Profile:"
 msgstr ""
 
-#: include/login_form.php:197 classes/handler/public.php:208
-#: classes/rpc.php:147 classes/dlg.php:116
+#: include/login_form.php:197 classes/handler/public.php:212
+#: classes/rpc.php:64 classes/dlg.php:98
 msgid "Default profile"
 msgstr ""
 
@@ -1176,335 +1118,322 @@ msgstr ""
 msgid "Article not found."
 msgstr ""
 
-#: classes/handler/public.php:420 classes/pref/feeds.php:1480
+#: classes/handler/public.php:394 plugins/bookmarklets/init.php:38
 msgid "Share with Tiny Tiny RSS"
 msgstr ""
 
-#: classes/handler/public.php:428
+#: classes/handler/public.php:402
 msgid "Title:"
 msgstr ""
 
-#: classes/handler/public.php:430 classes/dlg.php:667
-#: classes/pref/feeds.php:509 classes/pref/feeds.php:762
-#: plugins/instances/instances.php:100 plugins/instances/init.php:215
+#: classes/handler/public.php:404 classes/dlg.php:667
+#: classes/pref/feeds.php:505 classes/pref/feeds.php:722
+#: plugins/instances/init.php:215
 msgid "URL:"
 msgstr ""
 
-#: classes/handler/public.php:432
+#: classes/handler/public.php:406
 msgid "Content:"
 msgstr ""
 
-#: classes/handler/public.php:434
+#: classes/handler/public.php:408
 msgid "Labels:"
 msgstr ""
 
-#: classes/handler/public.php:453
+#: classes/handler/public.php:427
 msgid "Shared article will appear in the Published feed."
 msgstr ""
 
-#: classes/handler/public.php:455
+#: classes/handler/public.php:429
 msgid "Share"
 msgstr ""
 
-#: classes/handler/public.php:456 classes/handler/public.php:498
-#: classes/dlg.php:315 classes/dlg.php:366 classes/dlg.php:426
-#: classes/dlg.php:457 classes/dlg.php:652 classes/dlg.php:702
-#: classes/dlg.php:774 classes/pref/users.php:194 classes/pref/labels.php:81
-#: classes/pref/filters.php:342 classes/pref/filters.php:722
-#: classes/pref/filters.php:791 classes/pref/filters.php:858
-#: classes/pref/feeds.php:729 classes/pref/feeds.php:880
-#: plugins/mail/mail.php:126 plugins/note/note.php:49
-#: plugins/instances/instances.php:136
+#: classes/handler/public.php:430 classes/handler/public.php:472
+#: classes/dlg.php:297 classes/dlg.php:350 classes/dlg.php:410
+#: classes/dlg.php:441 classes/dlg.php:652 classes/dlg.php:702
+#: classes/dlg.php:751 classes/pref/users.php:194 classes/pref/labels.php:81
+#: classes/pref/filters.php:349 classes/pref/filters.php:729
+#: classes/pref/filters.php:798 classes/pref/filters.php:865
+#: classes/pref/feeds.php:689 classes/pref/feeds.php:829
+#: plugins/mail/init.php:132 plugins/note/init.php:55
+#: plugins/instances/init.php:251
 msgid "Cancel"
 msgstr ""
 
-#: classes/handler/public.php:477
+#: classes/handler/public.php:451
 msgid "Not logged in"
 msgstr ""
 
-#: classes/handler/public.php:537
+#: classes/handler/public.php:511
 msgid "Incorrect username or password"
 msgstr ""
 
-#: classes/handler/public.php:573 classes/handler/public.php:670
+#: classes/handler/public.php:547 classes/handler/public.php:644
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr ""
 
-#: classes/handler/public.php:576 classes/handler/public.php:661
+#: classes/handler/public.php:550 classes/handler/public.php:635
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr ""
 
-#: classes/handler/public.php:579 classes/handler/public.php:664
+#: classes/handler/public.php:553 classes/handler/public.php:638
 #, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr ""
 
-#: classes/handler/public.php:582 classes/handler/public.php:667
+#: classes/handler/public.php:556 classes/handler/public.php:641
 #, php-format
 msgid "No feeds found in <b>%s</b>."
 msgstr ""
 
-#: classes/handler/public.php:585 classes/handler/public.php:673
+#: classes/handler/public.php:559 classes/handler/public.php:647
 msgid "Multiple feed URLs found."
 msgstr ""
 
-#: classes/handler/public.php:589 classes/handler/public.php:678
+#: classes/handler/public.php:563 classes/handler/public.php:652
 #, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr ""
 
-#: classes/handler/public.php:607 classes/handler/public.php:696
+#: classes/handler/public.php:581 classes/handler/public.php:670
 msgid "Subscribe to selected feed"
 msgstr ""
 
-#: classes/handler/public.php:632 classes/handler/public.php:720
+#: classes/handler/public.php:606 classes/handler/public.php:694
 msgid "Edit subscription options"
 msgstr ""
 
-#: classes/auth/internal.php:45 plugins/auth_internal/init.php:62
-msgid "Please enter your one time password:"
-msgstr ""
-
-#: classes/auth/internal.php:168 plugins/auth_internal/init.php:185
-msgid "Password has been changed."
-msgstr ""
-
-#: classes/auth/internal.php:170
-msgid "Old password is incorrect."
-msgstr ""
-
-#: classes/dlg.php:26
-msgid "Prepare data"
-msgstr ""
-
-#: classes/dlg.php:40
+#: classes/dlg.php:22
 msgid ""
 "If you have imported labels and/or filters, you might need to reload "
 "preferences to see your new data."
 msgstr ""
 
-#: classes/dlg.php:73 classes/pref/users.php:378 classes/pref/labels.php:272
-#: classes/pref/filters.php:223 classes/pref/filters.php:270
-#: classes/pref/filters.php:571 classes/pref/filters.php:650
-#: classes/pref/filters.php:677 classes/pref/feeds.php:1274
-#: classes/pref/feeds.php:1583 classes/pref/feeds.php:1652
-#: plugins/instances/instances.php:172
+#: classes/dlg.php:55 classes/pref/users.php:378 classes/pref/labels.php:272
+#: classes/pref/filters.php:230 classes/pref/filters.php:277
+#: classes/pref/filters.php:578 classes/pref/filters.php:657
+#: classes/pref/filters.php:684 classes/pref/feeds.php:1202
+#: classes/pref/feeds.php:1472 classes/pref/feeds.php:1541
+#: plugins/instances/init.php:287
 msgid "Select"
 msgstr ""
 
-#: classes/dlg.php:76 classes/feeds.php:92 classes/pref/users.php:381
-#: classes/pref/labels.php:275 classes/pref/filters.php:226
-#: classes/pref/filters.php:273 classes/pref/filters.php:574
-#: classes/pref/filters.php:653 classes/pref/filters.php:680
-#: classes/pref/feeds.php:1277 classes/pref/feeds.php:1586
-#: classes/pref/feeds.php:1655 plugins/instances/instances.php:175
+#: classes/dlg.php:58 classes/feeds.php:92 classes/pref/users.php:381
+#: classes/pref/labels.php:275 classes/pref/filters.php:233
+#: classes/pref/filters.php:280 classes/pref/filters.php:581
+#: classes/pref/filters.php:660 classes/pref/filters.php:687
+#: classes/pref/feeds.php:1205 classes/pref/feeds.php:1475
+#: classes/pref/feeds.php:1544 plugins/instances/init.php:290
 msgid "All"
 msgstr ""
 
-#: classes/dlg.php:78 classes/feeds.php:95 classes/pref/users.php:383
-#: classes/pref/labels.php:277 classes/pref/filters.php:228
-#: classes/pref/filters.php:275 classes/pref/filters.php:576
-#: classes/pref/filters.php:655 classes/pref/filters.php:682
-#: classes/pref/feeds.php:1279 classes/pref/feeds.php:1588
-#: classes/pref/feeds.php:1657 plugins/instances/instances.php:177
+#: classes/dlg.php:60 classes/feeds.php:95 classes/pref/users.php:383
+#: classes/pref/labels.php:277 classes/pref/filters.php:235
+#: classes/pref/filters.php:282 classes/pref/filters.php:583
+#: classes/pref/filters.php:662 classes/pref/filters.php:689
+#: classes/pref/feeds.php:1207 classes/pref/feeds.php:1477
+#: classes/pref/feeds.php:1546 plugins/instances/init.php:292
 msgid "None"
 msgstr ""
 
-#: classes/dlg.php:87
+#: classes/dlg.php:69
 msgid "Create profile"
 msgstr ""
 
-#: classes/dlg.php:110 classes/dlg.php:140
+#: classes/dlg.php:92 classes/dlg.php:122
 msgid "(active)"
 msgstr ""
 
-#: classes/dlg.php:174
+#: classes/dlg.php:156
 msgid "Remove selected profiles"
 msgstr ""
 
-#: classes/dlg.php:176
+#: classes/dlg.php:158
 msgid "Activate profile"
 msgstr ""
 
-#: classes/dlg.php:186
+#: classes/dlg.php:168
 msgid "Public OPML URL"
 msgstr ""
 
-#: classes/dlg.php:191
+#: classes/dlg.php:173
 msgid "Your Public OPML URL is:"
 msgstr ""
 
-#: classes/dlg.php:200 classes/dlg.php:587
+#: classes/dlg.php:182 classes/dlg.php:571
 msgid "Generate new URL"
 msgstr ""
 
-#: classes/dlg.php:212
+#: classes/dlg.php:194
 msgid "Notice"
 msgstr ""
 
-#: classes/dlg.php:218
+#: classes/dlg.php:200
 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 ""
 
-#: classes/dlg.php:222 classes/dlg.php:231
+#: classes/dlg.php:204 classes/dlg.php:213
 msgid "Last update:"
 msgstr ""
 
-#: classes/dlg.php:227
+#: classes/dlg.php:209
 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 ""
 
-#: classes/dlg.php:252 classes/dlg.php:261
+#: classes/dlg.php:234 classes/dlg.php:243
 msgid "Feed or site URL"
 msgstr ""
 
-#: classes/dlg.php:267 classes/dlg.php:738 classes/pref/feeds.php:531
-#: classes/pref/feeds.php:775
+#: classes/dlg.php:249 classes/dlg.php:715 classes/pref/feeds.php:527
+#: classes/pref/feeds.php:735
 msgid "Place in category:"
 msgstr ""
 
-#: classes/dlg.php:275
+#: classes/dlg.php:257
 msgid "Available feeds"
 msgstr ""
 
-#: classes/dlg.php:287 classes/pref/users.php:155 classes/pref/feeds.php:561
-#: classes/pref/feeds.php:811
+#: classes/dlg.php:269 classes/pref/users.php:155 classes/pref/feeds.php:557
+#: classes/pref/feeds.php:771
 msgid "Authentication"
 msgstr ""
 
-#: classes/dlg.php:291 classes/dlg.php:752 classes/pref/users.php:438
-#: classes/pref/feeds.php:567 classes/pref/feeds.php:815
+#: classes/dlg.php:273 classes/dlg.php:729 classes/pref/users.php:438
+#: classes/pref/feeds.php:563 classes/pref/feeds.php:775
 msgid "Login"
 msgstr ""
 
-#: classes/dlg.php:294 classes/dlg.php:755 classes/pref/prefs.php:200
-#: classes/pref/feeds.php:573 classes/pref/feeds.php:821
+#: classes/dlg.php:276 classes/dlg.php:732 classes/pref/prefs.php:196
+#: classes/pref/feeds.php:569 classes/pref/feeds.php:781
 msgid "Password"
 msgstr ""
 
-#: classes/dlg.php:304
+#: classes/dlg.php:286
 msgid "This feed requires authentication."
 msgstr ""
 
-#: classes/dlg.php:309 classes/dlg.php:364 classes/dlg.php:773
+#: classes/dlg.php:291 classes/dlg.php:348 classes/dlg.php:750
 msgid "Subscribe"
 msgstr ""
 
-#: classes/dlg.php:312
+#: classes/dlg.php:294
 msgid "More feeds"
 msgstr ""
 
-#: classes/dlg.php:336 classes/dlg.php:425 classes/pref/users.php:368
-#: classes/pref/filters.php:567 classes/pref/feeds.php:1270 js/tt-rss.js:234
-#: js/tt-rss.js:187 js/tt-rss.js:166
+#: classes/dlg.php:318 classes/dlg.php:409 classes/pref/users.php:368
+#: classes/pref/filters.php:574 classes/pref/feeds.php:1198 js/tt-rss.js:166
 msgid "Search"
 msgstr ""
 
-#: classes/dlg.php:340
+#: classes/dlg.php:322
 msgid "Popular feeds"
 msgstr ""
 
-#: classes/dlg.php:341
+#: classes/dlg.php:323
 msgid "Feed archive"
 msgstr ""
 
-#: classes/dlg.php:344
+#: classes/dlg.php:326
 msgid "limit:"
 msgstr ""
 
-#: classes/dlg.php:365 classes/pref/users.php:394 classes/pref/labels.php:284
-#: classes/pref/filters.php:332 classes/pref/filters.php:589
-#: classes/pref/feeds.php:702 plugins/instances/instances.php:182
+#: classes/dlg.php:349 classes/pref/users.php:394 classes/pref/labels.php:284
+#: classes/pref/filters.php:339 classes/pref/filters.php:596
+#: classes/pref/feeds.php:662 plugins/instances/init.php:297
 msgid "Remove"
 msgstr ""
 
-#: classes/dlg.php:376
+#: classes/dlg.php:360
 msgid "Look for"
 msgstr ""
 
-#: classes/dlg.php:384
+#: classes/dlg.php:368
 msgid "Limit search to:"
 msgstr ""
 
-#: classes/dlg.php:400
+#: classes/dlg.php:384
 msgid "This feed"
 msgstr ""
 
-#: classes/dlg.php:432
+#: classes/dlg.php:416
 msgid "Tags for this article (separated by commas):"
 msgstr ""
 
-#: classes/dlg.php:455 classes/dlg.php:650 classes/pref/users.php:192
-#: classes/pref/labels.php:79 classes/pref/filters.php:339
-#: classes/pref/feeds.php:728 classes/pref/feeds.php:877
-#: plugins/note/note.php:47 plugins/instances/instances.php:133
-#: plugins/nsfw/init.php:86 plugins/owncloud/init.php:62
+#: classes/dlg.php:439 classes/dlg.php:650 classes/pref/users.php:192
+#: classes/pref/labels.php:79 classes/pref/filters.php:346
+#: classes/pref/feeds.php:688 classes/pref/feeds.php:826
+#: plugins/nsfw/init.php:86 plugins/note/init.php:53
+#: plugins/owncloud/init.php:62 plugins/instances/init.php:248
 msgid "Save"
 msgstr ""
 
-#: classes/dlg.php:463
+#: classes/dlg.php:447
 msgid "Tag Cloud"
 msgstr ""
 
-#: classes/dlg.php:532
+#: classes/dlg.php:516
 msgid "Select item(s) by tags"
 msgstr ""
 
-#: classes/dlg.php:535
+#: classes/dlg.php:519
 msgid "Match:"
 msgstr ""
 
-#: classes/dlg.php:537
+#: classes/dlg.php:521
 msgid "Any"
 msgstr ""
 
-#: classes/dlg.php:540
+#: classes/dlg.php:524
 msgid "All tags."
 msgstr ""
 
-#: classes/dlg.php:542
+#: classes/dlg.php:526
 msgid "Which Tags?"
 msgstr ""
 
-#: classes/dlg.php:555
+#: classes/dlg.php:539
 msgid "Display entries"
 msgstr ""
 
-#: classes/dlg.php:567 classes/feeds.php:129
+#: classes/dlg.php:551 classes/feeds.php:133
 msgid "View as RSS"
 msgstr ""
 
-#: classes/dlg.php:578
+#: classes/dlg.php:562
 msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 
-#: classes/dlg.php:606 plugins/updater/updater.php:276
+#: classes/dlg.php:591 plugins/updater/init.php:303
 #, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr ""
 
-#: classes/dlg.php:614
+#: classes/dlg.php:599
 msgid ""
 "You can update using built-in updater in the Preferences or by using update."
 "php"
 msgstr ""
 
-#: classes/dlg.php:618 classes/pref/users.php:390
+#: classes/dlg.php:603 classes/pref/users.php:390
 msgid "Details"
 msgstr ""
 
-#: classes/dlg.php:620
+#: classes/dlg.php:605
 msgid "Download"
 msgstr ""
 
+#: classes/dlg.php:613
+msgid "Error receiving version information or no new version available."
+msgstr ""
+
 #: classes/dlg.php:634
 #, php-format
 msgid ""
@@ -1513,32 +1442,29 @@ msgid ""
 "\" href=\"%s\">This file</a> can be used as a baseline."
 msgstr ""
 
-#: classes/dlg.php:661 plugins/instances/instances.php:92
-#: plugins/instances/init.php:207
+#: classes/dlg.php:661 plugins/instances/init.php:207
 msgid "Instance"
 msgstr ""
 
-#: classes/dlg.php:670 plugins/instances/instances.php:103
-#: plugins/instances/instances.php:200 plugins/instances/init.php:218
+#: classes/dlg.php:670 plugins/instances/init.php:218
+#: plugins/instances/init.php:315
 msgid "Instance URL"
 msgstr ""
 
-#: classes/dlg.php:680 plugins/instances/instances.php:114
-#: plugins/instances/init.php:229
+#: classes/dlg.php:680 plugins/instances/init.php:229
 msgid "Access key:"
 msgstr ""
 
-#: classes/dlg.php:683 plugins/instances/instances.php:117
-#: plugins/instances/instances.php:201 plugins/instances/init.php:232
+#: classes/dlg.php:683 plugins/instances/init.php:232
+#: plugins/instances/init.php:316
 msgid "Access key"
 msgstr ""
 
-#: classes/dlg.php:687 plugins/instances/instances.php:121
-#: plugins/instances/init.php:236
+#: classes/dlg.php:687 plugins/instances/init.php:236
 msgid "Use one access key for both linked instances."
 msgstr ""
 
-#: classes/dlg.php:695 plugins/instances/instances.php:129
+#: classes/dlg.php:695 plugins/instances/init.php:244
 msgid "Generate new key"
 msgstr ""
 
@@ -1546,25 +1472,22 @@ msgstr ""
 msgid "Create link"
 msgstr ""
 
-#: classes/dlg.php:717
-#, php-format
-msgid ""
-"Could not upload file. You might need to adjust upload_max_filesize\n"
-"\t\t\t\tin PHP.ini (current value = %s)"
-msgstr ""
-
-#: classes/dlg.php:735
+#: classes/dlg.php:712
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr ""
 
-#: classes/dlg.php:744
+#: classes/dlg.php:721
 msgid "Feeds to subscribe, One per line"
 msgstr ""
 
-#: classes/dlg.php:766
+#: classes/dlg.php:743
 msgid "Feeds require authentication."
 msgstr ""
 
+#: classes/feeds.php:68
+msgid "Visit the website"
+msgstr ""
+
 #: classes/feeds.php:83
 msgid "View as RSS feed"
 msgstr ""
@@ -1577,6 +1500,10 @@ msgstr ""
 msgid "Invert"
 msgstr ""
 
+#: classes/feeds.php:101
+msgid "More..."
+msgstr ""
+
 #: classes/feeds.php:103
 msgid "Selection toggle:"
 msgstr ""
@@ -1597,51 +1524,80 @@ msgstr ""
 msgid "Move back"
 msgstr ""
 
-#: classes/feeds.php:118 classes/pref/filters.php:235
-#: classes/pref/filters.php:282 classes/pref/filters.php:662
-#: classes/pref/filters.php:689
+#: classes/feeds.php:118 classes/pref/filters.php:242
+#: classes/pref/filters.php:289 classes/pref/filters.php:669
+#: classes/pref/filters.php:696
 msgid "Delete"
 msgstr ""
 
-#: classes/feeds.php:122 plugins/mail/mail.php:22
+#: classes/feeds.php:125 plugins/mail/init.php:28
 msgid "Forward by email"
 msgstr ""
 
-#: classes/feeds.php:125
+#: classes/feeds.php:129
 msgid "Feed:"
 msgstr ""
 
-#: classes/feeds.php:190 classes/feeds.php:844
+#: classes/feeds.php:196 classes/feeds.php:790
 msgid "Feed not found."
 msgstr ""
 
-#: classes/feeds.php:434 classes/feeds.php:516
+#: classes/feeds.php:403 classes/feeds.php:493
 msgid "mark as read"
 msgstr ""
 
-#: classes/feeds.php:739
+#: classes/feeds.php:691
 msgid "No unread articles found to display."
 msgstr ""
 
-#: classes/feeds.php:742
+#: classes/feeds.php:694
 msgid "No updated articles found to display."
 msgstr ""
 
-#: classes/feeds.php:745
+#: classes/feeds.php:697
 msgid "No starred articles found to display."
 msgstr ""
 
-#: classes/feeds.php:749
+#: classes/feeds.php:701
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
 msgstr ""
 
-#: classes/feeds.php:751
+#: classes/feeds.php:703
 msgid "No articles found to display."
 msgstr ""
 
-#: classes/backend.php:26
+#: classes/feeds.php:718 classes/feeds.php:899
+#, php-format
+msgid "Feeds last updated at %s"
+msgstr ""
+
+#: classes/feeds.php:728 classes/feeds.php:909
+msgid "Some feeds have update errors (click for details)"
+msgstr ""
+
+#: classes/feeds.php:889
+msgid "No feed selected."
+msgstr ""
+
+#: classes/backend.php:34
+msgid "Keyboard Shortcuts"
+msgstr ""
+
+#: classes/backend.php:57
+msgid "Shift"
+msgstr ""
+
+#: classes/backend.php:60
+msgid "Ctrl"
+msgstr ""
+
+#: classes/backend.php:84
+msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
+msgstr ""
+
+#: classes/backend.php:99
 msgid "Help topic not found."
 msgstr ""
 
@@ -1691,16 +1647,15 @@ msgstr ""
 msgid "Processing category: %s"
 msgstr ""
 
-#: classes/opml.php:467
+#: classes/opml.php:468
 msgid "Error: please upload OPML file."
 msgstr ""
 
-#: classes/opml.php:474
+#: classes/opml.php:475
 msgid "Error while parsing document."
 msgstr ""
 
-#: classes/pref/users.php:6 plugins/instances/instances.php:42
-#: plugins/instances/init.php:157
+#: classes/pref/users.php:6 plugins/instances/init.php:157
 msgid "Your access level is insufficient to open this tab."
 msgstr ""
 
@@ -1740,8 +1695,8 @@ msgstr ""
 msgid "Change password to"
 msgstr ""
 
-#: classes/pref/users.php:177 classes/pref/feeds.php:581
-#: classes/pref/feeds.php:827
+#: classes/pref/users.php:177 classes/pref/feeds.php:577
+#: classes/pref/feeds.php:787
 msgid "Options"
 msgstr ""
 
@@ -1780,8 +1735,12 @@ msgstr ""
 msgid "[tt-rss] Password change notification"
 msgstr ""
 
-#: classes/pref/users.php:392 classes/pref/filters.php:586
-#: plugins/instances/instances.php:181
+#: classes/pref/users.php:386
+msgid "Create user"
+msgstr ""
+
+#: classes/pref/users.php:392 classes/pref/filters.php:593
+#: plugins/instances/init.php:296
 msgid "Edit"
 msgstr ""
 
@@ -1797,15 +1756,15 @@ msgstr ""
 msgid "Last login"
 msgstr ""
 
-#: classes/pref/users.php:461 plugins/instances/instances.php:222
+#: classes/pref/users.php:462 plugins/instances/init.php:337
 msgid "Click to edit"
 msgstr ""
 
-#: classes/pref/users.php:481
+#: classes/pref/users.php:482
 msgid "No users defined."
 msgstr ""
 
-#: classes/pref/users.php:483
+#: classes/pref/users.php:484
 msgid "No matching users found."
 msgstr ""
 
@@ -1842,81 +1801,85 @@ msgstr ""
 msgid "No recent articles matching this filter have been found."
 msgstr ""
 
-#: classes/pref/filters.php:218 classes/pref/filters.php:645
-#: classes/pref/filters.php:760
+#: classes/pref/filters.php:98
+msgid ""
+"Complex expressions might not give results while testing due to issues with "
+"database server regexp implementation."
+msgstr ""
+
+#: classes/pref/filters.php:225 classes/pref/filters.php:652
+#: classes/pref/filters.php:767
 msgid "Match"
 msgstr ""
 
-#: classes/pref/filters.php:232 classes/pref/filters.php:279
-#: classes/pref/filters.php:659 classes/pref/filters.php:686
+#: classes/pref/filters.php:239 classes/pref/filters.php:286
+#: classes/pref/filters.php:666 classes/pref/filters.php:693
 msgid "Add"
 msgstr ""
 
-#: classes/pref/filters.php:265 classes/pref/filters.php:672
+#: classes/pref/filters.php:272 classes/pref/filters.php:679
 msgid "Apply actions"
 msgstr ""
 
-#: classes/pref/filters.php:315 classes/pref/filters.php:701
+#: classes/pref/filters.php:322 classes/pref/filters.php:708
 msgid "Enabled"
 msgstr ""
 
-#: classes/pref/filters.php:324 classes/pref/filters.php:704
+#: classes/pref/filters.php:331 classes/pref/filters.php:711
 msgid "Match any rule"
 msgstr ""
 
-#: classes/pref/filters.php:336 classes/pref/filters.php:716
+#: classes/pref/filters.php:343 classes/pref/filters.php:723
 msgid "Test"
 msgstr ""
 
-#: classes/pref/filters.php:368
+#: classes/pref/filters.php:375
 #, php-format
 msgid "%s on %s in %s"
 msgstr ""
 
-#: classes/pref/filters.php:583
+#: classes/pref/filters.php:590
 msgid "Combine"
 msgstr ""
 
-#: classes/pref/filters.php:593 classes/pref/feeds.php:1329
+#: classes/pref/filters.php:600 classes/pref/feeds.php:1257
 msgid "Rescore articles"
 msgstr ""
 
-#: classes/pref/filters.php:719
+#: classes/pref/filters.php:726
 msgid "Create"
 msgstr ""
 
-#: classes/pref/filters.php:769
+#: classes/pref/filters.php:776
 msgid "on field"
 msgstr ""
 
-#: classes/pref/filters.php:775 js/PrefFilterTree.js:29
+#: classes/pref/filters.php:782 js/PrefFilterTree.js:29
 #: plugins/digest/digest.js:241
 msgid "in"
 msgstr ""
 
-#: classes/pref/filters.php:788
+#: classes/pref/filters.php:795
 msgid "Save rule"
 msgstr ""
 
-#: classes/pref/filters.php:788 js/functions.js:1067 js/functions.js:1063
-#: js/functions.js:1071 js/functions.js:1073
+#: classes/pref/filters.php:795 js/functions.js:1078
 msgid "Add rule"
 msgstr ""
 
-#: classes/pref/filters.php:811
+#: classes/pref/filters.php:818
 msgid "Perform Action"
 msgstr ""
 
-#: classes/pref/filters.php:837
+#: classes/pref/filters.php:844
 msgid "with parameters:"
 msgstr ""
 
-#: classes/pref/filters.php:855
+#: classes/pref/filters.php:862
 msgid "Save action"
 msgstr ""
 
-#: classes/pref/filters.php:855 js/functions.js:1093 js/functions.js:1089
-#: js/functions.js:1097 js/functions.js:1099
+#: classes/pref/filters.php:862 js/functions.js:1104
 msgid "Add action"
 msgstr ""
 
@@ -1936,140 +1899,172 @@ msgstr ""
 msgid "Function not supported by authentication module."
 msgstr ""
 
-#: classes/pref/prefs.php:68
+#: classes/pref/prefs.php:63
 msgid "The configuration was saved."
 msgstr ""
 
-#: classes/pref/prefs.php:83
+#: classes/pref/prefs.php:77
 #, php-format
 msgid "Unknown option: %s"
 msgstr ""
 
-#: classes/pref/prefs.php:97
+#: classes/pref/prefs.php:91
 msgid "Your personal data has been saved."
 msgstr ""
 
-#: classes/pref/prefs.php:137
+#: classes/pref/prefs.php:131
 msgid "Personal data / Authentication"
 msgstr ""
 
-#: classes/pref/prefs.php:157
+#: classes/pref/prefs.php:151
 msgid "Personal data"
 msgstr ""
 
-#: classes/pref/prefs.php:167
+#: classes/pref/prefs.php:161
 msgid "Full name"
 msgstr ""
 
-#: classes/pref/prefs.php:171
+#: classes/pref/prefs.php:165
 msgid "E-mail"
 msgstr ""
 
-#: classes/pref/prefs.php:177
+#: classes/pref/prefs.php:171
 msgid "Access level"
 msgstr ""
 
-#: classes/pref/prefs.php:187
+#: classes/pref/prefs.php:181
 msgid "Save data"
 msgstr ""
 
-#: classes/pref/prefs.php:207
+#: classes/pref/prefs.php:203
 msgid "Your password is at default value, please change it."
 msgstr ""
 
-#: classes/pref/prefs.php:239
+#: classes/pref/prefs.php:235
 msgid "Old password"
 msgstr ""
 
-#: classes/pref/prefs.php:242
+#: classes/pref/prefs.php:238
 msgid "New password"
 msgstr ""
 
-#: classes/pref/prefs.php:247
+#: classes/pref/prefs.php:243
 msgid "Confirm password"
 msgstr ""
 
-#: classes/pref/prefs.php:257
+#: classes/pref/prefs.php:253
 msgid "Change password"
 msgstr ""
 
-#: classes/pref/prefs.php:263
+#: classes/pref/prefs.php:259
 msgid "One time passwords / Authenticator"
 msgstr ""
 
-#: classes/pref/prefs.php:292 classes/pref/prefs.php:343
+#: classes/pref/prefs.php:288 classes/pref/prefs.php:339
 msgid "Enter your password"
 msgstr ""
 
-#: classes/pref/prefs.php:303
+#: classes/pref/prefs.php:299
 msgid "Disable OTP"
 msgstr ""
 
-#: classes/pref/prefs.php:309
+#: classes/pref/prefs.php:305
 msgid ""
 "You will need a compatible Authenticator to use this. Changing your password "
 "would automatically disable OTP."
 msgstr ""
 
-#: classes/pref/prefs.php:311
+#: classes/pref/prefs.php:307
 msgid "Scan the following code by the Authenticator application:"
 msgstr ""
 
-#: classes/pref/prefs.php:352
+#: classes/pref/prefs.php:348
 msgid "I have scanned the code and would like to enable OTP"
 msgstr ""
 
-#: classes/pref/prefs.php:360
+#: classes/pref/prefs.php:356
 msgid "Enable OTP"
 msgstr ""
 
-#: classes/pref/prefs.php:456
-msgid "Select theme"
-msgstr ""
-
-#: classes/pref/prefs.php:508
+#: classes/pref/prefs.php:482
 msgid "Customize"
 msgstr ""
 
-#: classes/pref/prefs.php:527 classes/pref/prefs.php:534
-#: classes/pref/prefs.php:539
+#: classes/pref/prefs.php:501 classes/pref/prefs.php:508
+#: classes/pref/prefs.php:513
 msgid "Yes"
 msgstr ""
 
-#: classes/pref/prefs.php:529 classes/pref/prefs.php:539
+#: classes/pref/prefs.php:503 classes/pref/prefs.php:513
 msgid "No"
 msgstr ""
 
-#: classes/pref/prefs.php:569
+#: classes/pref/prefs.php:543
 msgid "Register"
 msgstr ""
 
-#: classes/pref/prefs.php:573
+#: classes/pref/prefs.php:547
 msgid "Clear"
 msgstr ""
 
-#: classes/pref/prefs.php:579
+#: classes/pref/prefs.php:553
 #, php-format
 msgid "Current server time: %s (UTC)"
 msgstr ""
 
-#: classes/pref/prefs.php:604
+#: classes/pref/prefs.php:582
 msgid "Save configuration"
 msgstr ""
 
-#: classes/pref/prefs.php:607
+#: classes/pref/prefs.php:585
 msgid "Manage profiles"
 msgstr ""
 
-#: classes/pref/prefs.php:610
+#: classes/pref/prefs.php:588
 msgid "Reset to defaults"
 msgstr ""
 
-#: classes/pref/prefs.php:622
+#: classes/pref/prefs.php:600
 msgid "Show additional preferences"
 msgstr ""
 
-#: classes/pref/prefs.php:679 classes/pref/prefs.php:697
+#: classes/pref/prefs.php:612 classes/pref/prefs.php:614
+msgid "Plugins"
+msgstr ""
+
+#: classes/pref/prefs.php:642
+msgid "System plugins"
+msgstr ""
+
+#: classes/pref/prefs.php:646 classes/pref/prefs.php:695
+msgid "Plugin"
+msgstr ""
+
+#: classes/pref/prefs.php:647 classes/pref/prefs.php:696
+msgid "Description"
+msgstr ""
+
+#: classes/pref/prefs.php:648 classes/pref/prefs.php:697
+msgid "Version"
+msgstr ""
+
+#: classes/pref/prefs.php:649 classes/pref/prefs.php:698
+msgid "Author"
+msgstr ""
+
+#: classes/pref/prefs.php:682 classes/pref/prefs.php:733
+msgid "Clear data"
+msgstr ""
+
+#: classes/pref/prefs.php:691
+msgid "User plugins"
+msgstr ""
+
+#: classes/pref/prefs.php:748
+msgid "Enable selected plugins"
+msgstr ""
+
+#: classes/pref/prefs.php:803 classes/pref/prefs.php:821
 msgid "Incorrect password"
 msgstr ""
 
@@ -2077,294 +2072,232 @@ msgstr ""
 msgid "Check to enable field"
 msgstr ""
 
-#: classes/pref/feeds.php:59 classes/pref/feeds.php:180
-#: classes/pref/feeds.php:223 classes/pref/feeds.php:229
-#: classes/pref/feeds.php:254
+#: classes/pref/feeds.php:58 classes/pref/feeds.php:175
+#: classes/pref/feeds.php:217 classes/pref/feeds.php:223
+#: classes/pref/feeds.php:248
 #, php-format
 msgid "(%d feeds)"
 msgstr ""
 
-#: classes/pref/feeds.php:492 classes/pref/feeds.php:747
-msgid "Feed"
-msgstr ""
-
-#: classes/pref/feeds.php:498
+#: classes/pref/feeds.php:494
 msgid "Feed Title"
 msgstr ""
 
-#: classes/pref/feeds.php:554 classes/pref/feeds.php:802
+#: classes/pref/feeds.php:550 classes/pref/feeds.php:762
 msgid "Article purging:"
 msgstr ""
 
-#: classes/pref/feeds.php:577
+#: classes/pref/feeds.php:573
 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:593 classes/pref/feeds.php:831
+#: classes/pref/feeds.php:589 classes/pref/feeds.php:791
 msgid "Hide from Popular feeds"
 msgstr ""
 
-#: classes/pref/feeds.php:604 classes/pref/feeds.php:836
-msgid "Right-to-left content"
-msgstr ""
-
-#: classes/pref/feeds.php:616 classes/pref/feeds.php:842
+#: classes/pref/feeds.php:601 classes/pref/feeds.php:797
 msgid "Include in e-mail digest"
 msgstr ""
 
-#: classes/pref/feeds.php:629 classes/pref/feeds.php:848
+#: classes/pref/feeds.php:614 classes/pref/feeds.php:803
 msgid "Always display image attachments"
 msgstr ""
 
-#: classes/pref/feeds.php:643 classes/pref/feeds.php:856
+#: classes/pref/feeds.php:628 classes/pref/feeds.php:811
 msgid "Cache images locally"
 msgstr ""
 
-#: classes/pref/feeds.php:656
-msgid "Cache content locally"
-msgstr ""
-
-#: classes/pref/feeds.php:668 classes/pref/feeds.php:862
+#: classes/pref/feeds.php:640 classes/pref/feeds.php:817
 msgid "Mark updated articles as unread"
 msgstr ""
 
-#: classes/pref/feeds.php:680 classes/pref/feeds.php:868
-msgid "Mark posts as updated on content change"
-msgstr ""
-
-#: classes/pref/feeds.php:686
+#: classes/pref/feeds.php:646
 msgid "Icon"
 msgstr ""
 
-#: classes/pref/feeds.php:700
+#: classes/pref/feeds.php:660
 msgid "Replace"
 msgstr ""
 
-#: classes/pref/feeds.php:719
+#: classes/pref/feeds.php:679
 msgid "Resubscribe to push updates"
 msgstr ""
 
-#: classes/pref/feeds.php:726
+#: classes/pref/feeds.php:686
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr ""
 
-#: classes/pref/feeds.php:741
+#: classes/pref/feeds.php:701
 msgid "Enable the options you wish to apply using checkboxes on the right:"
 msgstr ""
 
-#: classes/pref/feeds.php:1123 classes/pref/feeds.php:1176
+#: classes/pref/feeds.php:1051 classes/pref/feeds.php:1104
 msgid "All done."
 msgstr ""
 
-#: classes/pref/feeds.php:1231
+#: classes/pref/feeds.php:1159
 msgid "Feeds with errors"
 msgstr ""
 
-#: classes/pref/feeds.php:1251
+#: classes/pref/feeds.php:1179
 msgid "Inactive feeds"
 msgstr ""
 
-#: classes/pref/feeds.php:1288
+#: classes/pref/feeds.php:1216
 msgid "Edit selected feeds"
 msgstr ""
 
-#: classes/pref/feeds.php:1290 classes/pref/feeds.php:1304
+#: classes/pref/feeds.php:1218 classes/pref/feeds.php:1232
 msgid "Reset sort order"
 msgstr ""
 
-#: classes/pref/feeds.php:1292 js/prefs.js:2021 js/prefs.js:1788
-#: js/prefs.js:1778
+#: classes/pref/feeds.php:1220 js/prefs.js:1778
 msgid "Batch subscribe"
 msgstr ""
 
-#: classes/pref/feeds.php:1297
+#: classes/pref/feeds.php:1225
 msgid "Categories"
 msgstr ""
 
-#: classes/pref/feeds.php:1300
+#: classes/pref/feeds.php:1228
 msgid "Add category"
 msgstr ""
 
-#: classes/pref/feeds.php:1302
+#: classes/pref/feeds.php:1230
 msgid "(Un)hide empty categories"
 msgstr ""
 
-#: classes/pref/feeds.php:1306
+#: classes/pref/feeds.php:1234
 msgid "Remove selected"
 msgstr ""
 
-#: classes/pref/feeds.php:1320
+#: classes/pref/feeds.php:1248
 msgid "More actions..."
 msgstr ""
 
-#: classes/pref/feeds.php:1324
+#: classes/pref/feeds.php:1252
 msgid "Manual purge"
 msgstr ""
 
-#: classes/pref/feeds.php:1328
+#: classes/pref/feeds.php:1256
 msgid "Clear feed data"
 msgstr ""
 
-#: classes/pref/feeds.php:1379
-msgid "Import and export"
-msgstr ""
-
-#: classes/pref/feeds.php:1381
+#: classes/pref/feeds.php:1307
 msgid "OPML"
 msgstr ""
 
-#: classes/pref/feeds.php:1383
+#: classes/pref/feeds.php:1309
 msgid ""
 "Using OPML you can export and import your feeds, filters, labels and Tiny "
 "Tiny RSS settings."
 msgstr ""
 
-#: classes/pref/feeds.php:1385
+#: classes/pref/feeds.php:1311
 msgid "Only main settings profile can be migrated using OPML."
 msgstr ""
 
-#: classes/pref/feeds.php:1398
+#: classes/pref/feeds.php:1324
 msgid "Import my OPML"
 msgstr ""
 
-#: classes/pref/feeds.php:1402
+#: classes/pref/feeds.php:1328
 msgid "Filename:"
 msgstr ""
 
-#: classes/pref/feeds.php:1404
+#: classes/pref/feeds.php:1330
 msgid "Include settings"
 msgstr ""
 
-#: classes/pref/feeds.php:1408
+#: classes/pref/feeds.php:1334
 msgid "Export OPML"
 msgstr ""
 
-#: classes/pref/feeds.php:1412
+#: classes/pref/feeds.php:1338
 msgid ""
 "Your OPML can be published publicly and can be subscribed by anyone who "
 "knows the URL below."
 msgstr ""
 
-#: classes/pref/feeds.php:1414
+#: classes/pref/feeds.php:1340
 msgid ""
 "Published OPML does not include your Tiny Tiny RSS settings, feeds that "
 "require authentication or feeds hidden from Popular feeds."
 msgstr ""
 
-#: classes/pref/feeds.php:1417
+#: classes/pref/feeds.php:1343
 msgid "Display published OPML URL"
 msgstr ""
 
-#: classes/pref/feeds.php:1420 plugins/import_export/init.php:66
-msgid "Article archive"
-msgstr ""
-
-#: classes/pref/feeds.php:1422 plugins/import_export/init.php:68
-msgid ""
-"You can export and import your Starred and Archived articles for safekeeping "
-"or when migrating between tt-rss instances."
-msgstr ""
-
-#: classes/pref/feeds.php:1425
-msgid "Export my data"
-msgstr ""
-
-#: classes/pref/feeds.php:1440
-msgid "Import"
-msgstr ""
-
-#: classes/pref/feeds.php:1447
+#: classes/pref/feeds.php:1353
 msgid "Firefox integration"
 msgstr ""
 
-#: classes/pref/feeds.php:1449
+#: classes/pref/feeds.php:1355
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
 msgstr ""
 
-#: classes/pref/feeds.php:1456
+#: classes/pref/feeds.php:1362
 msgid "Click here to register this site as a feed reader."
 msgstr ""
 
-#: classes/pref/feeds.php:1464
-msgid "Bookmarklets"
-msgstr ""
-
-#: classes/pref/feeds.php:1466 plugins/bookmarklets/init.php:24
-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 ""
-
-#: classes/pref/feeds.php:1470
-#, php-format
-msgid "Subscribe to %s in Tiny Tiny RSS?"
-msgstr ""
-
-#: classes/pref/feeds.php:1474
-msgid "Subscribe in Tiny Tiny RSS"
-msgstr ""
-
-#: classes/pref/feeds.php:1476 plugins/bookmarklets/init.php:34
-msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
-msgstr ""
-
-#: classes/pref/feeds.php:1484
+#: classes/pref/feeds.php:1370
 msgid "Published & shared articles / Generated feeds"
 msgstr ""
 
-#: classes/pref/feeds.php:1486
+#: classes/pref/feeds.php:1372
 msgid "Published articles and generated feeds"
 msgstr ""
 
-#: classes/pref/feeds.php:1488
+#: classes/pref/feeds.php:1374
 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:1494
+#: classes/pref/feeds.php:1380
 msgid "Display URL"
 msgstr ""
 
-#: classes/pref/feeds.php:1497
+#: classes/pref/feeds.php:1383
 msgid "Clear all generated URLs"
 msgstr ""
 
-#: classes/pref/feeds.php:1499
+#: classes/pref/feeds.php:1385
 msgid "Articles shared by URL"
 msgstr ""
 
-#: classes/pref/feeds.php:1501
+#: classes/pref/feeds.php:1387
 msgid "You can disable all articles shared by unique URLs here."
 msgstr ""
 
-#: classes/pref/feeds.php:1504
+#: classes/pref/feeds.php:1390
 msgid "Unshare all articles"
 msgstr ""
 
-#: classes/pref/feeds.php:1579
+#: classes/pref/feeds.php:1468
 msgid ""
 "These feeds have not been updated with new content for 3 months (oldest "
 "first):"
 msgstr ""
 
-#: classes/pref/feeds.php:1616 classes/pref/feeds.php:1685
+#: classes/pref/feeds.php:1505 classes/pref/feeds.php:1574
 msgid "Click to edit feed"
 msgstr ""
 
-#: classes/pref/feeds.php:1634 classes/pref/feeds.php:1705
+#: classes/pref/feeds.php:1523 classes/pref/feeds.php:1594
 msgid "Unsubscribe from selected feeds"
 msgstr ""
 
-#: classes/pref/feeds.php:1645
+#: classes/pref/feeds.php:1534
 msgid "These feeds have not been updated because of errors:"
 msgstr ""
 
-#: plugins/pocket/pocket.php:24
+#: plugins/pocket/init.php:30
 msgid "Pocket"
 msgstr ""
 
@@ -2379,131 +2312,249 @@ msgstr ""
 msgid "Back to feeds"
 msgstr ""
 
+#: plugins/digest/digest_body.php:56
+msgid "Hello,"
+msgstr ""
+
 #: plugins/digest/digest_body.php:62
 msgid "Regular version"
 msgstr ""
 
-#: plugins/pinterest/pinterest.php:23
+#: plugins/nsfw/init.php:32 plugins/nsfw/init.php:43
+msgid "Not work safe (click to toggle)"
+msgstr ""
+
+#: plugins/nsfw/init.php:53
+msgid "NSFW Plugin"
+msgstr ""
+
+#: plugins/nsfw/init.php:80
+msgid "Tags to consider NSFW (comma-separated)"
+msgstr ""
+
+#: plugins/nsfw/init.php:101
+msgid "Configuration saved."
+msgstr ""
+
+#: plugins/pinterest/init.php:29
 msgid "Pinterest"
 msgstr ""
 
-#: plugins/mail/mail.php:66 plugins/mail/mail.php:72 plugins/mail/init.php:72
-#: plugins/mail/init.php:78
+#: plugins/auth_internal/init.php:62
+msgid "Please enter your one time password:"
+msgstr ""
+
+#: plugins/auth_internal/init.php:185
+msgid "Password has been changed."
+msgstr ""
+
+#: plugins/auth_internal/init.php:187
+msgid "Old password is incorrect."
+msgstr ""
+
+#: plugins/bookmarklets/init.php:22
+msgid "Bookmarklets"
+msgstr ""
+
+#: plugins/bookmarklets/init.php:24
+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 ""
+
+#: plugins/bookmarklets/init.php:28
+#, php-format
+msgid "Subscribe to %s in Tiny Tiny RSS?"
+msgstr ""
+
+#: plugins/bookmarklets/init.php:32
+msgid "Subscribe in Tiny Tiny RSS"
+msgstr ""
+
+#: plugins/bookmarklets/init.php:34
+msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
+msgstr ""
+
+#: plugins/import_export/init.php:64
+msgid "Import and export"
+msgstr ""
+
+#: plugins/import_export/init.php:66
+msgid "Article archive"
+msgstr ""
+
+#: plugins/import_export/init.php:68
+msgid ""
+"You can export and import your Starred and Archived articles for safekeeping "
+"or when migrating between tt-rss instances."
+msgstr ""
+
+#: plugins/import_export/init.php:71
+msgid "Export my data"
+msgstr ""
+
+#: plugins/import_export/init.php:87
+msgid "Import"
+msgstr ""
+
+#: plugins/import_export/init.php:221
+msgid "Could not import: incorrect schema version."
+msgstr ""
+
+#: plugins/import_export/init.php:226
+msgid "Could not import: unrecognized document format."
+msgstr ""
+
+#: plugins/import_export/init.php:385
+#, php-format
+msgid "Finished: %d articles processed, %d imported, %d feeds created."
+msgstr ""
+
+#: plugins/import_export/init.php:391
+msgid "Could not load XML document."
+msgstr ""
+
+#: plugins/import_export/init.php:403
+msgid "Prepare data"
+msgstr ""
+
+#: plugins/import_export/init.php:424
+#, php-format
+msgid ""
+"Could not upload file. You might need to adjust upload_max_filesize\n"
+"\t\t\t\tin PHP.ini (current value = %s)"
+msgstr ""
+
+#: plugins/mail/init.php:72 plugins/mail/init.php:78
 msgid "[Forwarded]"
 msgstr ""
 
-#: plugins/mail/mail.php:66 plugins/mail/init.php:72
+#: plugins/mail/init.php:72
 msgid "Multiple articles"
 msgstr ""
 
-#: plugins/mail/mail.php:87
+#: plugins/mail/init.php:93
 msgid "From:"
 msgstr ""
 
-#: plugins/mail/mail.php:96
+#: plugins/mail/init.php:102
 msgid "To:"
 msgstr ""
 
-#: plugins/mail/mail.php:109
+#: plugins/mail/init.php:115
 msgid "Subject:"
 msgstr ""
 
-#: plugins/mail/mail.php:125
+#: plugins/mail/init.php:131
 msgid "Send e-mail"
 msgstr ""
 
-#: plugins/note/note.php:22 plugins/note/note.js:11
+#: plugins/note/init.php:28 plugins/note/note.js:11
 msgid "Edit article note"
 msgstr ""
 
-#: plugins/example/example.php:29 plugins/example/init.php:38
+#: plugins/example/init.php:38
 msgid "Example Pane"
 msgstr ""
 
-#: plugins/example/example.php:53 plugins/example/init.php:69
+#: plugins/example/init.php:69
 msgid "Sample value"
 msgstr ""
 
-#: plugins/example/example.php:59 plugins/example/init.php:75
+#: plugins/example/init.php:75
 msgid "Set value"
 msgstr ""
 
-#: plugins/identica/identica.php:23
+#: plugins/identica/init.php:29
 msgid "Share on identi.ca"
 msgstr ""
 
-#: plugins/instances/instances.php:29
+#: plugins/owncloud/init.php:35
+msgid "Owncloud"
+msgstr ""
+
+#: plugins/owncloud/init.php:59
+msgid "Owncloud url"
+msgstr ""
+
+#: plugins/owncloud/init.php:74
+msgid "Bookmark on OwnCloud "
+msgstr ""
+
+#: plugins/instances/init.php:144
 msgid "Linked"
 msgstr ""
 
-#: plugins/instances/instances.php:180
+#: plugins/instances/init.php:295
 msgid "Link instance"
 msgstr ""
 
-#: plugins/instances/instances.php:192 plugins/instances/init.php:307
+#: plugins/instances/init.php:307
 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 ""
 
-#: plugins/instances/instances.php:202
+#: plugins/instances/init.php:317
 msgid "Last connected"
 msgstr ""
 
-#: plugins/instances/instances.php:203
+#: plugins/instances/init.php:318
 msgid "Status"
 msgstr ""
 
-#: plugins/instances/instances.php:204
+#: plugins/instances/init.php:319
 msgid "Stored feeds"
 msgstr ""
 
-#: plugins/share/share.php:21
+#: plugins/share/init.php:27
 msgid "Share by URL"
 msgstr ""
 
-#: plugins/share/share.php:43 plugins/share/init.php:49
+#: plugins/share/init.php:49
 msgid "You can share this article by the following unique URL:"
 msgstr ""
 
-#: plugins/flattr/flattr.php:37
-msgid "Flattr article"
+#: plugins/flattr/init.php:30
+msgid "Flattr this article."
 msgstr ""
 
-#: plugins/googleplus/googleplus.php:23
+#: plugins/googleplus/init.php:29
 msgid "Share on Google+"
 msgstr ""
 
-#: plugins/updater/updater.php:267 plugins/updater/updater.php:279
+#: plugins/updater/init.php:294 plugins/updater/init.php:306
 #: plugins/updater/updater.js:10
 msgid "Update Tiny Tiny RSS"
 msgstr ""
 
-#: plugins/updater/updater.php:282 plugins/updater/init.php:303
+#: plugins/updater/init.php:309
 msgid "Your Tiny Tiny RSS installation is up to date."
 msgstr ""
 
-#: plugins/updater/updater.php:291 plugins/updater/init.php:313
+#: plugins/updater/init.php:319
 msgid ""
 "Do not close this dialog until updating is finished. Backup your tt-rss "
 "directory before continuing."
 msgstr ""
 
-#: plugins/updater/updater.php:294 plugins/updater/init.php:316
+#: plugins/updater/init.php:322
 msgid "Ready to update."
 msgstr ""
 
-#: plugins/updater/updater.php:299 plugins/updater/init.php:321
+#: plugins/updater/init.php:327
 msgid "Start update"
 msgstr ""
 
-#: js/feedlist.js:283 js/feedlist.js:282 js/feedlist.js:265 js/feedlist.js:218
+#: plugins/tweet/init.php:29
+msgid "Share on Twitter"
+msgstr ""
+
+#: js/feedlist.js:218
 msgid "New articles available in this feed (click to show)"
 msgstr ""
 
-#: js/feedlist.js:490 js/feedlist.js:505 js/feedlist.js:489 js/feedlist.js:504
-#: js/feedlist.js:469 js/feedlist.js:484 js/feedlist.js:420 js/feedlist.js:435
-#: plugins/digest/digest.js:25
+#: js/feedlist.js:420 js/feedlist.js:435 plugins/digest/digest.js:25
 msgid "Mark all articles in %s as read?"
 msgstr ""
 
@@ -2513,137 +2564,124 @@ msgid ""
 "your browser information. Your IP would be saved in the database."
 msgstr ""
 
-#: js/functions.js:618 js/functions.js:614 js/functions.js:622
+#: js/functions.js:627
 msgid "Date syntax appears to be correct:"
 msgstr ""
 
-#: js/functions.js:621 js/functions.js:617 js/functions.js:625
+#: js/functions.js:630
 msgid "Date syntax is incorrect."
 msgstr ""
 
-#: js/functions.js:748 js/functions.js:744 js/functions.js:752
+#: js/functions.js:757
 msgid "Remove stored feed icon?"
 msgstr ""
 
-#: js/functions.js:780 js/functions.js:776 js/functions.js:784
+#: js/functions.js:789
 msgid "Please select an image file to upload."
 msgstr ""
 
-#: js/functions.js:782 js/functions.js:778 js/functions.js:786
+#: js/functions.js:791
 msgid "Upload new icon for this feed?"
 msgstr ""
 
-#: js/functions.js:799 js/functions.js:795 js/functions.js:803
+#: js/functions.js:808
 msgid "Please enter label caption:"
 msgstr ""
 
-#: js/functions.js:804 js/functions.js:800 js/functions.js:808
+#: js/functions.js:813
 msgid "Can't create label: missing caption."
 msgstr ""
 
-#: js/functions.js:847 js/functions.js:843 js/functions.js:851
+#: js/functions.js:856
 msgid "Subscribe to Feed"
 msgstr ""
 
-#: js/functions.js:874 js/functions.js:870 js/functions.js:878
+#: js/functions.js:883
 msgid "Subscribed to %s"
 msgstr ""
 
-#: js/functions.js:879 js/functions.js:875 js/functions.js:883
+#: js/functions.js:888
 msgid "Specified URL seems to be invalid."
 msgstr ""
 
-#: js/functions.js:882 js/functions.js:878 js/functions.js:886
+#: js/functions.js:891
 msgid "Specified URL doesn't seem to contain any feeds."
 msgstr ""
 
-#: js/functions.js:935 js/functions.js:931 js/functions.js:939
+#: js/functions.js:944
 msgid "Couldn't download the specified URL: %s"
 msgstr ""
 
-#: js/functions.js:939 js/functions.js:935 js/functions.js:943
+#: js/functions.js:948
 msgid "You are already subscribed to this feed."
 msgstr ""
 
-#: js/functions.js:1067 js/functions.js:1063 js/functions.js:1071
-#: js/functions.js:1073
+#: js/functions.js:1078
 msgid "Edit rule"
 msgstr ""
 
-#: js/functions.js:1093 js/functions.js:1089 js/functions.js:1097
-#: js/functions.js:1099
+#: js/functions.js:1104
 msgid "Edit action"
 msgstr ""
 
-#: js/functions.js:1130 js/functions.js:1126 js/functions.js:1134
-#: js/functions.js:1136
+#: js/functions.js:1141
 msgid "Create Filter"
 msgstr ""
 
-#: js/functions.js:1234 js/functions.js:1230 js/functions.js:1238
-#: js/functions.js:1240
+#: js/functions.js:1245
 msgid ""
 "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
 "hub again on next feed update."
 msgstr ""
 
-#: js/functions.js:1255 js/tt-rss.js:421 js/functions.js:1251 js/tt-rss.js:381
-#: js/functions.js:1259 js/tt-rss.js:367 js/functions.js:1261
+#: js/functions.js:1266 js/tt-rss.js:367
 msgid "Unsubscribe from %s?"
 msgstr ""
 
-#: js/functions.js:1362 js/functions.js:1358 js/functions.js:1368
-#: js/functions.js:1370
+#: js/functions.js:1375
 msgid "Please enter category title:"
 msgstr ""
 
-#: js/functions.js:1393 js/functions.js:1389 js/functions.js:1399
-#: js/functions.js:1401
+#: js/functions.js:1406
 msgid "Generate new syndication address for this feed?"
 msgstr ""
 
-#: js/functions.js:1584 js/tt-rss.js:400 js/tt-rss.js:903 js/functions.js:1580
-#: js/tt-rss.js:782 js/tt-rss.js:362 js/tt-rss.js:717 js/functions.js:1590
-#: js/tt-rss.js:348 js/tt-rss.js:709 js/functions.js:1592
+#: js/functions.js:1597 js/tt-rss.js:348 js/tt-rss.js:713
 msgid "You can't edit this kind of feed."
 msgstr ""
 
-#: js/functions.js:1599 js/functions.js:1595 js/functions.js:1605
-#: js/functions.js:1607
+#: js/functions.js:1612
 msgid "Edit Feed"
 msgstr ""
 
-#: js/functions.js:1637 js/functions.js:1633 js/functions.js:1643
-#: js/functions.js:1645
+#: js/functions.js:1650
 msgid "More Feeds"
 msgstr ""
 
-#: js/functions.js:1698 js/functions.js:1808 js/prefs.js:408 js/prefs.js:438
-#: js/prefs.js:470 js/prefs.js:653 js/prefs.js:673 js/prefs.js:1326
-#: js/prefs.js:1471 js/functions.js:1694 js/functions.js:1804 js/prefs.js:397
-#: js/prefs.js:427 js/prefs.js:459 js/prefs.js:642 js/prefs.js:662
-#: js/prefs.js:1213 js/prefs.js:1358 js/functions.js:1704 js/functions.js:1814
-#: js/prefs.js:1203 js/prefs.js:1348 js/functions.js:1706 js/functions.js:1816
+#: js/functions.js:1711 js/functions.js:1821 js/prefs.js:397 js/prefs.js:427
+#: js/prefs.js:459 js/prefs.js:642 js/prefs.js:662 js/prefs.js:1203
+#: js/prefs.js:1348
 msgid "No feeds are selected."
 msgstr ""
 
-#: js/functions.js:1740 js/functions.js:1736 js/functions.js:1746
-#: js/functions.js:1748
+#: js/functions.js:1753
 msgid ""
 "Remove selected feeds from the archive? Feeds with stored articles will not "
 "be removed."
 msgstr ""
 
-#: js/functions.js:1779 js/functions.js:1775 js/functions.js:1785
-#: js/functions.js:1787
+#: js/functions.js:1792
 msgid "Feeds with update errors"
 msgstr ""
 
-#: js/functions.js:1790 js/prefs.js:1308 js/functions.js:1786 js/prefs.js:1195
-#: js/functions.js:1796 js/prefs.js:1185 js/functions.js:1798
+#: js/functions.js:1803 js/prefs.js:1185
 msgid "Remove selected feeds?"
 msgstr ""
 
+#: js/functions.js:1904
+msgid "Help"
+msgstr ""
+
 #: js/PrefFeedTree.js:47
 msgid "Edit category"
 msgstr ""
@@ -2664,393 +2702,296 @@ msgstr ""
 msgid "Can't create user: no login specified."
 msgstr ""
 
-#: js/prefs.js:128 js/prefs.js:117
+#: js/prefs.js:117
 msgid "Edit Filter"
 msgstr ""
 
-#: js/prefs.js:175 js/prefs.js:164
+#: js/prefs.js:164
 msgid "Remove filter?"
 msgstr ""
 
-#: js/prefs.js:290 js/prefs.js:279
+#: js/prefs.js:279
 msgid "Remove selected labels?"
 msgstr ""
 
-#: js/prefs.js:306 js/prefs.js:1512 js/prefs.js:295 js/prefs.js:1399
-#: js/prefs.js:1389
+#: js/prefs.js:295 js/prefs.js:1389
 msgid "No labels are selected."
 msgstr ""
 
-#: js/prefs.js:320 js/prefs.js:309
+#: js/prefs.js:309
 msgid ""
 "Remove selected users? Neither default admin nor your account will be "
 "removed."
 msgstr ""
 
-#: js/prefs.js:337 js/prefs.js:518 js/prefs.js:539 js/prefs.js:578
 #: js/prefs.js:326 js/prefs.js:507 js/prefs.js:528 js/prefs.js:567
 msgid "No users are selected."
 msgstr ""
 
-#: js/prefs.js:355 js/prefs.js:344
+#: js/prefs.js:344
 msgid "Remove selected filters?"
 msgstr ""
 
-#: js/prefs.js:370 js/prefs.js:608 js/prefs.js:627 js/prefs.js:359
-#: js/prefs.js:597 js/prefs.js:616
+#: js/prefs.js:359 js/prefs.js:597 js/prefs.js:616
 msgid "No filters are selected."
 msgstr ""
 
-#: js/prefs.js:389 js/prefs.js:378
+#: js/prefs.js:378
 msgid "Unsubscribe from selected feeds?"
 msgstr ""
 
-#: js/prefs.js:423 js/prefs.js:412
+#: js/prefs.js:412
 msgid "Please select only one feed."
 msgstr ""
 
-#: js/prefs.js:429 js/prefs.js:418
+#: js/prefs.js:418
 msgid "Erase all non-starred articles in selected feed?"
 msgstr ""
 
-#: js/prefs.js:451 js/prefs.js:440
+#: js/prefs.js:440
 msgid "How many days of articles to keep (0 - use default)?"
 msgstr ""
 
-#: js/prefs.js:489 js/prefs.js:478
+#: js/prefs.js:478
 msgid "Login field cannot be blank."
 msgstr ""
 
-#: js/prefs.js:523 js/prefs.js:544 js/prefs.js:583 js/prefs.js:512
-#: js/prefs.js:533 js/prefs.js:572
+#: js/prefs.js:512 js/prefs.js:533 js/prefs.js:572
 msgid "Please select only one user."
 msgstr ""
 
-#: js/prefs.js:548 js/prefs.js:537
+#: js/prefs.js:537
 msgid "Reset password of selected user?"
 msgstr ""
 
-#: js/prefs.js:613 js/prefs.js:602
+#: js/prefs.js:602
 msgid "Please select only one filter."
 msgstr ""
 
-#: js/prefs.js:631 js/prefs.js:620
+#: js/prefs.js:620
 msgid "Combine selected filters?"
 msgstr ""
 
-#: js/prefs.js:695 js/prefs.js:684
+#: js/prefs.js:684
 msgid "Edit Multiple Feeds"
 msgstr ""
 
-#: js/prefs.js:719 js/prefs.js:708
+#: js/prefs.js:708
 msgid "Save changes to selected feeds?"
 msgstr ""
 
-#: js/prefs.js:811 js/prefs.js:800 js/prefs.js:790
+#: js/prefs.js:790
 msgid "OPML Import"
 msgstr ""
 
-#: js/prefs.js:838 js/prefs.js:827 js/prefs.js:817
+#: js/prefs.js:817
 msgid "Please choose an OPML file first."
 msgstr ""
 
-#: js/prefs.js:854 plugins/import_export/import_export.js:112
-msgid "Please choose the file first."
-msgstr ""
-
-#: js/prefs.js:1010 js/prefs.js:983 js/prefs.js:973
+#: js/prefs.js:973
 msgid "Reset to defaults?"
 msgstr ""
 
-#: js/prefs.js:1215 js/prefs.js:1102 js/prefs.js:1092
+#: js/prefs.js:1092
 msgid ""
 "Remove category %s? Any nested feeds would be placed into Uncategorized."
 msgstr ""
 
-#: js/prefs.js:1242 js/prefs.js:1129 js/prefs.js:1119
+#: js/prefs.js:1119
 msgid "Remove selected categories?"
 msgstr ""
 
-#: js/prefs.js:1258 js/prefs.js:1145 js/prefs.js:1135
+#: js/prefs.js:1135
 msgid "No categories are selected."
 msgstr ""
 
-#: js/prefs.js:1266 js/prefs.js:1153 js/prefs.js:1143
+#: js/prefs.js:1143
 msgid "Category title:"
 msgstr ""
 
-#: js/prefs.js:1297 js/prefs.js:1184 js/prefs.js:1174
+#: js/prefs.js:1174
 msgid "Feeds without recent updates"
 msgstr ""
 
-#: js/prefs.js:1346 js/prefs.js:1233 js/prefs.js:1223
+#: js/prefs.js:1223
 msgid "Replace current OPML publishing address with a new one?"
 msgstr ""
 
-#: js/prefs.js:1455 js/prefs.js:1342 js/prefs.js:1332
+#: js/prefs.js:1332
 msgid "Rescore articles in selected feeds?"
 msgstr ""
 
-#: js/prefs.js:1478 js/prefs.js:1365 js/prefs.js:1355
+#: js/prefs.js:1355
 msgid "Rescore all articles? This operation may take a lot of time."
 msgstr ""
 
-#: js/prefs.js:1498 js/prefs.js:1385 js/prefs.js:1375
+#: js/prefs.js:1375
 msgid "Reset selected labels to default colors?"
 msgstr ""
 
-#: js/prefs.js:1535 js/prefs.js:1422 js/prefs.js:1412
+#: js/prefs.js:1412
 msgid "Settings Profiles"
 msgstr ""
 
-#: js/prefs.js:1544 js/prefs.js:1431 js/prefs.js:1421
+#: js/prefs.js:1421
 msgid ""
 "Remove selected profiles? Active and default profiles will not be removed."
 msgstr ""
 
-#: js/prefs.js:1562 js/prefs.js:1449 js/prefs.js:1439
+#: js/prefs.js:1439
 msgid "No profiles are selected."
 msgstr ""
 
-#: js/prefs.js:1570 js/prefs.js:1623 js/prefs.js:1457 js/prefs.js:1510
 #: js/prefs.js:1447 js/prefs.js:1500
 msgid "Activate selected profile?"
 msgstr ""
 
-#: js/prefs.js:1586 js/prefs.js:1639 js/prefs.js:1473 js/prefs.js:1526
 #: js/prefs.js:1463 js/prefs.js:1516
 msgid "Please choose a profile to activate."
 msgstr ""
 
-#: js/prefs.js:1647 js/prefs.js:1534 js/prefs.js:1524
+#: js/prefs.js:1524
 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr ""
 
-#: js/prefs.js:1666 js/prefs.js:1553 js/prefs.js:1543
+#: js/prefs.js:1543
 msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr ""
 
-#: js/prefs.js:1764 js/prefs.js:1651 js/prefs.js:1641
+#: js/prefs.js:1641
 msgid "Label Editor"
 msgstr ""
 
-#: js/prefs.js:1827 js/prefs.js:1714 js/prefs.js:1704
+#: js/prefs.js:1704
 msgid ""
 "This will clear your stored authentication information for Twitter. Continue?"
 msgstr ""
 
-#: js/prefs.js:1911 plugins/import_export/import_export.js:13
-msgid "Export Data"
-msgstr ""
-
-#: js/prefs.js:1938 plugins/import_export/import_export.js:40
-msgid ""
-"Finished, exported %d articles. You can download the data <a "
-"class='visibleLink' href='%u'>here</a>."
-msgstr ""
-
-#: js/prefs.js:1991 plugins/import_export/import_export.js:93
-msgid "Data Import"
-msgstr ""
-
-#: js/prefs.js:2027 js/prefs.js:1794 js/prefs.js:1784
+#: js/prefs.js:1784
 msgid "Subscribing to feeds..."
 msgstr ""
 
-#: js/tt-rss.js:147 js/tt-rss.js:141 js/tt-rss.js:120
+#: js/prefs.js:1821
+msgid "Clear stored data for this plugin?"
+msgstr ""
+
+#: js/tt-rss.js:120
 msgid "Mark all articles as read?"
 msgstr ""
 
-#: js/tt-rss.js:410 js/tt-rss.js:370 js/tt-rss.js:356
+#: js/tt-rss.js:356
 msgid "You can't unsubscribe from the category."
 msgstr ""
 
-#: js/tt-rss.js:415 js/tt-rss.js:596 js/tt-rss.js:591 js/tt-rss.js:375
-#: js/tt-rss.js:525 js/tt-rss.js:361 js/tt-rss.js:511
+#: js/tt-rss.js:361 js/tt-rss.js:511
 msgid "Please select some feed first."
 msgstr ""
 
-#: js/tt-rss.js:591 js/tt-rss.js:586 js/tt-rss.js:520 js/tt-rss.js:506
+#: js/tt-rss.js:506
 msgid "You can't rescore this kind of feed."
 msgstr ""
 
-#: js/tt-rss.js:601 js/tt-rss.js:596 js/tt-rss.js:530 js/tt-rss.js:516
+#: js/tt-rss.js:516
 msgid "Rescore articles in %s?"
 msgstr ""
 
-#: js/tt-rss.js:1062 js/tt-rss.js:883 js/tt-rss.js:825 js/tt-rss.js:830
+#: js/tt-rss.js:672
+msgid "Please enable mail plugin first."
+msgstr ""
+
+#: js/tt-rss.js:834
 msgid "New version available!"
 msgstr ""
 
-#: js/viewfeed.js:108 js/viewfeed.js:104
+#: js/viewfeed.js:104
 msgid "Cancel search"
 msgstr ""
 
-#: js/viewfeed.js:456 js/viewfeed.js:445 js/viewfeed.js:451 js/viewfeed.js:435
-#: plugins/digest/digest.js:257 plugins/digest/digest.js:696
+#: js/viewfeed.js:435 plugins/digest/digest.js:257
+#: plugins/digest/digest.js:696
 msgid "Unstar article"
 msgstr ""
 
-#: js/viewfeed.js:461 js/viewfeed.js:450 js/viewfeed.js:456 js/viewfeed.js:440
-#: plugins/digest/digest.js:259 plugins/digest/digest.js:700
+#: js/viewfeed.js:440 plugins/digest/digest.js:259
+#: plugins/digest/digest.js:700
 msgid "Star article"
 msgstr ""
 
-#: js/viewfeed.js:496 js/viewfeed.js:485 js/viewfeed.js:491 js/viewfeed.js:473
-#: plugins/digest/digest.js:262 plugins/digest/digest.js:731
+#: js/viewfeed.js:473 plugins/digest/digest.js:262
+#: plugins/digest/digest.js:731
 msgid "Unpublish article"
 msgstr ""
 
-#: js/viewfeed.js:676 js/viewfeed.js:704 js/viewfeed.js:731 js/viewfeed.js:793
-#: js/viewfeed.js:825 js/viewfeed.js:962 js/viewfeed.js:1005
-#: js/viewfeed.js:1055 js/viewfeed.js:2181 js/viewfeed.js:665
-#: js/viewfeed.js:693 js/viewfeed.js:720 js/viewfeed.js:782 js/viewfeed.js:814
-#: js/viewfeed.js:951 js/viewfeed.js:994 js/viewfeed.js:1044
-#: js/viewfeed.js:2154 js/viewfeed.js:671 js/viewfeed.js:699
-#: js/viewfeed.js:726 js/viewfeed.js:788 js/viewfeed.js:820 js/viewfeed.js:957
-#: js/viewfeed.js:1000 js/viewfeed.js:1050 js/viewfeed.js:2018
 #: js/viewfeed.js:674 js/viewfeed.js:702 js/viewfeed.js:729 js/viewfeed.js:791
 #: js/viewfeed.js:823 js/viewfeed.js:960 js/viewfeed.js:1003
 #: js/viewfeed.js:1053 js/viewfeed.js:1927 plugins/mail/mail.js:7
 msgid "No articles are selected."
 msgstr ""
 
-#: js/viewfeed.js:942 js/viewfeed.js:931 js/viewfeed.js:937 js/viewfeed.js:940
+#: js/viewfeed.js:940
 msgid "Mark all visible articles in %s as read?"
 msgstr ""
 
-#: js/viewfeed.js:970 js/viewfeed.js:959 js/viewfeed.js:965 js/viewfeed.js:968
+#: js/viewfeed.js:968
 msgid "Delete %d selected articles in %s?"
 msgstr ""
 
-#: js/viewfeed.js:972 js/viewfeed.js:961 js/viewfeed.js:967 js/viewfeed.js:970
+#: js/viewfeed.js:970
 msgid "Delete %d selected articles?"
 msgstr ""
 
-#: js/viewfeed.js:1014 js/viewfeed.js:1003 js/viewfeed.js:1009
 #: js/viewfeed.js:1012
 msgid "Archive %d selected articles in %s?"
 msgstr ""
 
-#: js/viewfeed.js:1017 js/viewfeed.js:1006 js/viewfeed.js:1012
 #: js/viewfeed.js:1015
 msgid "Move %d archived articles back?"
 msgstr ""
 
-#: js/viewfeed.js:1061 js/viewfeed.js:1050 js/viewfeed.js:1056
 #: js/viewfeed.js:1059
 msgid "Mark %d selected articles in %s as read?"
 msgstr ""
 
-#: js/viewfeed.js:1085 js/viewfeed.js:1074 js/viewfeed.js:1080
 #: js/viewfeed.js:1083
 msgid "Edit article Tags"
 msgstr ""
 
-#: js/viewfeed.js:1247 js/viewfeed.js:1236 js/viewfeed.js:1242
 #: js/viewfeed.js:1252
 msgid "No article is selected."
 msgstr ""
 
-#: js/viewfeed.js:1282 js/viewfeed.js:1271 js/viewfeed.js:1277
 #: js/viewfeed.js:1287
 msgid "No articles found to mark"
 msgstr ""
 
-#: js/viewfeed.js:1284 js/viewfeed.js:1273 js/viewfeed.js:1279
 #: js/viewfeed.js:1289
 msgid "Mark %d article(s) as read?"
 msgstr ""
 
-#: js/viewfeed.js:1402 js/viewfeed.js:1383
-msgid "Loading..."
-msgstr ""
-
-#: js/viewfeed.js:1891 js/viewfeed.js:1864 js/viewfeed.js:1734
 #: js/viewfeed.js:1744
 msgid "Open original article"
 msgstr ""
 
-#: js/viewfeed.js:1897 js/viewfeed.js:1870
-msgid "View in a tt-rss tab"
-msgstr ""
-
-#: js/viewfeed.js:1905 js/viewfeed.js:1878 js/viewfeed.js:1742
-#: js/viewfeed.js:1752
-msgid "Mark above as read"
-msgstr ""
-
-#: js/viewfeed.js:1911 js/viewfeed.js:1884 js/viewfeed.js:1748
-#: js/viewfeed.js:1758
-msgid "Mark below as read"
-msgstr ""
-
-#: js/viewfeed.js:1967 js/viewfeed.js:1940 js/viewfeed.js:1804
 #: js/viewfeed.js:1814
 msgid "Remove label"
 msgstr ""
 
-#: js/viewfeed.js:1991 js/viewfeed.js:1964 js/viewfeed.js:1828
 #: js/viewfeed.js:1838
 msgid "Playing..."
 msgstr ""
 
-#: js/viewfeed.js:1992 js/viewfeed.js:1965 js/viewfeed.js:1829
 #: js/viewfeed.js:1839
 msgid "Click to pause"
 msgstr ""
 
-#: js/viewfeed.js:2150 js/viewfeed.js:2123 js/viewfeed.js:1987
 #: js/viewfeed.js:1896
 msgid "Please enter new score for selected articles:"
 msgstr ""
 
-#: js/viewfeed.js:2192 js/viewfeed.js:2165 js/viewfeed.js:2029
 #: js/viewfeed.js:1938
 msgid "Please enter new score for this article:"
 msgstr ""
 
-#: js/functions.js:1887 js/functions.js:1891 js/functions.js:1897
-#: js/functions.js:1899
-msgid "Help"
-msgstr ""
-
-#: js/prefs.js:1831 js/prefs.js:1821
-msgid "Clear stored data for this plugin?"
-msgstr ""
-
-#: js/tt-rss.js:741 js/tt-rss.js:676 js/tt-rss.js:668
-msgid "Please enable mail plugin first."
-msgstr ""
-
-#: plugins/digest/digest_body.php:39
-msgid "Your browser doesn't support Javascript, which is required"
-msgstr ""
-
-#: plugins/nsfw/init.php:32 plugins/nsfw/init.php:43
-msgid "Not work safe (click to toggle)"
-msgstr ""
-
-#: plugins/nsfw/init.php:53
-msgid "NSFW Plugin"
-msgstr ""
-
-#: plugins/nsfw/init.php:80
-msgid "Tags to consider NSFW (comma-separated)"
-msgstr ""
-
-#: plugins/nsfw/init.php:101
-msgid "Configuration saved."
-msgstr ""
-
-#: plugins/owncloud/init.php:35
-msgid "Owncloud"
-msgstr ""
-
-#: plugins/owncloud/init.php:59
-msgid "Owncloud url"
-msgstr ""
-
 #: plugins/digest/digest.js:71
 msgid "Mark %d displayed articles as read?"
 msgstr ""
@@ -3075,6 +3016,24 @@ msgstr ""
 msgid "Load more..."
 msgstr ""
 
+#: plugins/import_export/import_export.js:13
+msgid "Export Data"
+msgstr ""
+
+#: plugins/import_export/import_export.js:40
+msgid ""
+"Finished, exported %d articles. You can download the data <a "
+"class='visibleLink' href='%u'>here</a>."
+msgstr ""
+
+#: plugins/import_export/import_export.js:93
+msgid "Data Import"
+msgstr ""
+
+#: plugins/import_export/import_export.js:112
+msgid "Please choose the file first."
+msgstr ""
+
 #: plugins/mail/mail.js:21
 msgid "Forward article by email"
 msgstr ""
diff --git a/plugins/af_unburn/init.php b/plugins/af_unburn/init.php
index b68796fb4..a0c51c97e 100644
--- a/plugins/af_unburn/init.php
+++ b/plugins/af_unburn/init.php
@@ -29,11 +29,11 @@ class Af_Unburn extends Plugin {
 
 			if (strpos($article["plugin_data"], "unburn,$owner_uid:") === FALSE) {
 
-				$ch = curl_init($article["link"]);
+				$ch = curl_init(geturl($article["link"]));
 				curl_setopt($ch, CURLOPT_TIMEOUT, 5);
 				curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
 				curl_setopt($ch, CURLOPT_HEADER, true);
-				curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
+				//curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
 				curl_setopt($ch, CURLOPT_USERAGENT, SELF_USER_AGENT);
 
 				$contents = @curl_exec($ch);
@@ -74,5 +74,54 @@ class Af_Unburn extends Plugin {
 
 		return $article;
 	}
+	
+		function geturl($url){
+
+		(function_exists('curl_init')) ? '' : die('cURL Must be installed for geturl function to work. Ask your host to enable it or uncomment extension=php_curl.dll in php.ini');
+
+		$curl = curl_init();
+		$header[0] = "Accept: text/xml,application/xml,application/xhtml+xml,";
+		$header[0] .= "text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5";
+		$header[] = "Cache-Control: max-age=0";
+		$header[] = "Connection: keep-alive";
+		$header[] = "Keep-Alive: 300";
+		$header[] = "Accept-Charset: ISO-8859-1,utf-8;q=0.7,*;q=0.7";
+		$header[] = "Accept-Language: en-us,en;q=0.5";
+		$header[] = "Pragma: ";
+
+		curl_setopt($curl, CURLOPT_URL, $url);
+		curl_setopt($curl, CURLOPT_USERAGENT, 'Mozilla/5.0 (Windows NT 5.1; rv:5.0) Gecko/20100101 Firefox/5.0 Firefox/5.0');
+		curl_setopt($curl, CURLOPT_HTTPHEADER, $header);
+		curl_setopt($curl, CURLOPT_HEADER, true);
+		curl_setopt($curl, CURLOPT_REFERER, $url);
+		curl_setopt($curl, CURLOPT_ENCODING, 'gzip,deflate');
+		curl_setopt($curl, CURLOPT_AUTOREFERER, true);
+		curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
+		//curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true); //CURLOPT_FOLLOWLOCATION Disabled...
+		curl_setopt($curl, CURLOPT_TIMEOUT, 60);
+
+		$html = curl_exec($curl);
+
+		$status = curl_getinfo($curl);
+		curl_close($curl);
+
+		if($status['http_code']!=200){
+			if($status['http_code'] == 301 || $status['http_code'] == 302) {
+				list($header) = explode("\r\n\r\n", $html, 2);
+				$matches = array();
+				preg_match("/(Location:|URI:)[^(\n)]*/", $header, $matches);
+				$url = trim(str_replace($matches[1],"",$matches[0]));
+				$url_parsed = parse_url($url);
+				return (isset($url_parsed))? geturl($url, $referer):'';
+			}
+			$oline='';
+			foreach($status as $key=>$eline){$oline.='['.$key.']'.$eline.' ';}
+			$line =$oline." \r\n ".$url."\r\n-----------------\r\n";
+			$handle = @fopen('./curl.error.log', 'a');
+			fwrite($handle, $line);
+			return FALSE;
+		}
+		return $url;
+	}
 }
 ?>
diff --git a/plugins/auth_ldap/init.php b/plugins/auth_ldap/init.php
new file mode 100644
index 000000000..e1a4c49f1
--- /dev/null
+++ b/plugins/auth_ldap/init.php
@@ -0,0 +1,135 @@
+<?php
+/** 
+ * Tiny Tiny RSS plugin for LDAP authentication 
+ * @author hydrian (ben.tyger@tygerclan.net)
+ * @copyright GPL2
+ *  Requires php-ldap and PEAR Net::LDAP2
+ */
+
+/**
+ *  Configuration
+ *  Put the following options in config.php and customize them for your environment
+ *
+ * 	define('LDAP_AUTH_SERVER_URI, 'ldaps://LDAPServerHostname:port/');
+ *	define('LDAP_AUTH_USETLS, FALSE); // Enable TLS Support for ldaps://
+ *	define('LDAP_AUTH_ALLOW_UNTRUSTED_CERT', TRUE); // Allows untrusted certificate
+ *	define('LDAP_AUTH_BINDDN', 'cn=serviceaccount,dc=example,dc=com');
+ *	define('LDAP_AUTH_BINDPW', 'ServiceAccountsPassword');
+ *	define('LDAP_AUTH_BASEDN', 'dc=example,dc=com');
+ *	// ??? will be replaced with the entered username(escaped) at login 
+ *	define('LDAP_AUTH_SEARCHFILTER', '(&(objectClass=person)(uid=???))');
+ */
+
+/**
+ *	Notes -
+ *	LDAP search does not support follow ldap referals. Referals are disabled to 
+ *	allow proper login.  This is particular to Active Directory.  
+ * 
+ *	Also group membership can be supported if the user object contains the
+ *	the group membership via attributes.  The following LDAP servers can 
+ *	support this.   
+ * 	 * Active Directory
+ *   * OpenLDAP support with MemberOf Overlay
+ *
+ */
+class Auth_Ldap extends Plugin implements IAuthModule {
+
+	private $link;
+	private $host;
+	private $base;
+
+	function about() {
+		return array(0.01,
+			"Authenticates against an LDAP server (configured in config.php)",
+			"hydrian",
+			true);
+	}
+
+	function init($host) {
+		$this->link = $host->get_link();
+		$this->host = $host;
+		$this->base = new Auth_Base($this->link);
+
+		$host->add_hook($host::HOOK_AUTH_USER, $this);
+	}
+	
+	private function _log($msg) {
+		trigger_error($msg, E_USER_WARN);
+	}
+
+	function authenticate($login, $password) {
+		if ($login && $password) {
+			if (!function_exists('ldap_connect')) {
+				trigger_error('auth_ldap requires PHP\'s PECL LDAP package installed.');
+				return FALSE;
+			}
+			if (!require_once('Net/LDAP2.php')) { 
+				trigger_error('auth_ldap requires the PEAR package Net::LDAP2');
+				return FALSE;
+			}
+			$parsedURI=parse_url(LDAP_AUTH_SERVER_URI);
+			if ($parsedURI === FALSE) {
+				$this->_log('Could not parse LDAP_AUTH_SERVER_URI in config.php');
+				return FALSE;
+			}
+			$ldapConnParams=array(
+				'host'=>$parsedURI['scheme'].'://'.$parsedURI['host'],
+				'basedn'=>LDAP_AUTH_BASEDN,
+				'options' => array('LDAP_OPT_REFERRALS' => 0)
+			);
+			$ldapConnParams['starttls']= defined('LDAP_AUTH_USETLS') ?
+				LDAP_AUTH_USETLS : FALSE;
+					
+			if (is_int($parsedURI['port'])) {
+				$ldapConnParams['port']=$parsedURI['port'];
+			}
+			// Making connection to LDAP server
+			if (LDAP_AUTH_ALLOW_UNTRUSTED_CERT === TRUE) {
+				putenv('LDAPTLS_REQCERT=never');
+			}
+			$ldapConn = Net_LDAP2::connect($ldapConnParams);
+			if (Net_LDAP2::isError($ldapConn)) {
+				$this->_log('Could not connect to LDAP Server: '.$ldapConn->getMessage());
+				return FALSE;
+			}
+			// Bind with service account
+			$binding=$ldapConn->bind(LDAP_AUTH_BINDDN, LDAP_AUTH_BINDPW);
+			if (Net_LDAP2::isError($binding)) {
+				$this->_log('Cound not bind service account: '.$binding->getMessage());
+				return FALSE;
+			} 
+			//Searching for user
+			$completedSearchFiler=str_replace('???',$login,LDAP_AUTH_SEARCHFILTER);
+			$filterObj=Net_LDAP2_Filter::parse($completedSearchFiler);
+			$searchResults=$ldapConn->search(LDAP_AUTH_BASEDN, $filterObj);
+			if (Net_LDAP2::isError($searchResults)) {
+				$this->_log('LDAP Search Failed: '.$searchResults->getMessage());
+				return FALSE;
+			} elseif ($searchResults->count() === 0) {
+				return FALSE;
+			} elseif ($searchResults->count() > 1 ) {
+				$this->_log('Multiple DNs found for username '.$login);
+				return FALSE;
+			}
+			//Getting user's DN from search
+			$userEntry=$searchResults->shiftEntry();
+			$userDN=$userEntry->dn();
+			//Binding with user's DN. 
+			$loginAttempt=$ldapConn->bind($userDN, $password);
+			$ldapConn->disconnect();
+			if ($loginAttempt === TRUE) {
+				return $this->base->auto_create_user($login);
+			} elseif ($loginAttempt->getCode() == 49) {
+				return FALSE;
+			} else {
+				$this->_log('Unknown Error: Code: '.$loginAttempt->getCode().
+					' Message: '.$loginAttempt->getMessage());
+				return FALSE;
+			}
+		}
+		return false;
+	}
+
+}
+
+?>
diff --git a/plugins/auth_remote/init.php b/plugins/auth_remote/init.php
index 65f188b8f..7c8d835f8 100644
--- a/plugins/auth_remote/init.php
+++ b/plugins/auth_remote/init.php
@@ -40,6 +40,9 @@ class Auth_Remote extends Plugin implements IAuthModule {
 	function authenticate($login, $password) {
 		$try_login = db_escape_string($_SERVER["REMOTE_USER"]);
 
+		// php-cgi
+		if (!$try_login) $try_login = db_escape_string($_SERVER["REDIRECT_REMOTE_USER"]);
+
 		if (!$try_login) $try_login = $this->get_login_by_ssl_certificate();
 #	  	if (!$try_login) $try_login = "test_qqq";
 
diff --git a/plugins/googlereaderkeys/init.php b/plugins/googlereaderkeys/init.php
index 97133d305..92bf626e6 100644
--- a/plugins/googlereaderkeys/init.php
+++ b/plugins/googlereaderkeys/init.php
@@ -21,8 +21,8 @@ class GoogleReaderKeys extends Plugin {
 
 		$hotkeys["j"]		= "next_article_noscroll";
 		$hotkeys["k"]		= "prev_article_noscroll";
-		$hotkeys["N"]		= "next_feed";
-		$hotkeys["P"]		= "prev_feed";
+		$hotkeys["*n"]		= "next_feed";
+		$hotkeys["*p"]		= "prev_feed";
 		$hotkeys["v"]		= "open_in_new_window";
 		$hotkeys["r"]		= "feed_refresh";
 		$hotkeys["(32)|space"]	= "next_article";
diff --git a/plugins/mail/init.php b/plugins/mail/init.php
index 2e972cf61..84fd5d3b2 100644
--- a/plugins/mail/init.php
+++ b/plugins/mail/init.php
@@ -59,10 +59,9 @@ class Mail extends Plugin {
 
 		$tpl->readTemplateFromFile("templates/email_article_template.txt");
 
-		$tpl->setVariable('USER_NAME', $_SESSION["name"]);
-		$tpl->setVariable('USER_EMAIL', $user_email);
-		$tpl->setVariable('TTRSS_HOST', $_SERVER["HTTP_HOST"]);
-
+		$tpl->setVariable('USER_NAME', $_SESSION["name"], true);
+		$tpl->setVariable('USER_EMAIL', $user_email, true);
+		$tpl->setVariable('TTRSS_HOST', $_SERVER["HTTP_HOST"], true);
 
 		$result = db_query($this->link, "SELECT link, content, title
 			FROM ttrss_user_entries, ttrss_entries WHERE id = ref_id AND
diff --git a/plugins/mailto/init.js b/plugins/mailto/init.js
new file mode 100644
index 000000000..8f7656a07
--- /dev/null
+++ b/plugins/mailto/init.js
@@ -0,0 +1,32 @@
+function mailtoArticle(id) {
+	try {
+		if (!id) {
+			var ids = getSelectedArticleIds2();
+
+			if (ids.length == 0) {
+				alert(__("No articles are selected."));
+				return;
+			}
+
+			id = ids.toString();
+		}
+
+		if (dijit.byId("emailArticleDlg"))
+			dijit.byId("emailArticleDlg").destroyRecursive();
+
+		var query = "backend.php?op=pluginhandler&plugin=mailto&method=emailArticle&param=" + param_escape(id);
+
+		dialog = new dijit.Dialog({
+			id: "emailArticleDlg",
+			title: __("Forward article by email"),
+			style: "width: 600px",
+			href: query});
+
+		dialog.show();
+
+	} catch (e) {
+		exception_error("emailArticle", e);
+	}
+}
+
+
diff --git a/plugins/mailto/init.php b/plugins/mailto/init.php
new file mode 100644
index 000000000..bbc0dffa4
--- /dev/null
+++ b/plugins/mailto/init.php
@@ -0,0 +1,93 @@
+<?php
+class MailTo extends Plugin {
+
+	private $link;
+	private $host;
+
+	function about() {
+		return array(1.0,
+			"Share article via email (using mailto: links, invoking your mail client)",
+			"fox");
+	}
+
+	function init($host) {
+		$this->link = $host->get_link();
+		$this->host = $host;
+
+		$host->add_hook($host::HOOK_ARTICLE_BUTTON, $this);
+	}
+
+	function get_js() {
+		return file_get_contents(dirname(__FILE__) . "/init.js");
+	}
+
+	function hook_article_button($line) {
+		return "<img src=\"".theme_image($link, 'plugins/mailto/mail.png')."\"
+					class='tagsPic' style=\"cursor : pointer\"
+					onclick=\"mailtoArticle(".$line["id"].")\"
+					alt='Zoom' title='".__('Forward by email')."'>";
+	}
+
+	function emailArticle() {
+
+		$param = db_escape_string($_REQUEST['param']);
+
+		require_once "lib/MiniTemplator.class.php";
+
+		$tpl = new MiniTemplator;
+		$tpl_t = new MiniTemplator;
+
+		$tpl->readTemplateFromFile("templates/email_article_template.txt");
+
+		$tpl->setVariable('USER_NAME', $_SESSION["name"], true);
+		$tpl->setVariable('USER_EMAIL', $user_email, true);
+		$tpl->setVariable('TTRSS_HOST', $_SERVER["HTTP_HOST"], true);
+
+
+		$result = db_query($this->link, "SELECT link, content, title
+			FROM ttrss_user_entries, ttrss_entries WHERE id = ref_id AND
+			id IN ($param) AND owner_uid = " . $_SESSION["uid"]);
+
+		if (db_num_rows($result) > 1) {
+			$subject = __("[Forwarded]") . " " . __("Multiple articles");
+		}
+
+		while ($line = db_fetch_assoc($result)) {
+
+			if (!$subject)
+				$subject = __("[Forwarded]") . " " . htmlspecialchars($line["title"]);
+
+			$tpl->setVariable('ARTICLE_TITLE', strip_tags($line["title"]));
+			$tpl->setVariable('ARTICLE_URL', strip_tags($line["link"]));
+
+			$tpl->addBlock('article');
+		}
+
+		$tpl->addBlock('email');
+
+		$content = "";
+		$tpl->generateOutputToString($content);
+
+		$mailto_link = htmlspecialchars("mailto: ?subject=".urlencode($subject).
+			"&body=".urlencode($content));
+
+		print __("Clicking the following link to invoke your mail client:");
+
+		print "<div class=\"tagCloudContainer\">";
+		print "<a target=\"_blank\" href=\"$mailto_link\">".
+			__("Forward selected article(s) by email.")."</a>";
+		print "</div>";
+
+		print __("You should be able to edit the message before sending in your mail client.");
+
+		print "<p>";
+
+		print "<div style='text-align : center'>";
+		print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('emailArticleDlg').hide()\">".__('Close this dialog')."</button>";
+		print "</div>";
+
+		//return;
+	}
+
+}
+?>
diff --git a/plugins/mailto/mail.png b/plugins/mailto/mail.png
new file mode 100644
index 000000000..4d3fe7751
Binary files /dev/null and b/plugins/mailto/mail.png differ
diff --git a/plugins/updater/init.php b/plugins/updater/init.php
index d940aefeb..4f9ee86bd 100644
--- a/plugins/updater/init.php
+++ b/plugins/updater/init.php
@@ -79,7 +79,6 @@ class Updater extends Plugin {
 					$stop = true; break;
 				}
 
-
 				array_push($log, "Checking for latest version...");
 
 				$version_info = json_decode(fetch_file_contents("http://tt-rss.org/version.php"),
@@ -91,7 +90,7 @@ class Updater extends Plugin {
 				}
 
 				$target_version = $version_info["version"];
-				$target_dir = "$parent_dir/tt-rss-$target_version";
+				$target_dir = "$parent_dir/Tiny-Tiny-RSS-$target_version";
 
 				array_push($log, "Target version: $target_version");
 				$params["target_version"] = $target_version;
@@ -110,7 +109,7 @@ class Updater extends Plugin {
 			case 1:
 				$target_version = $params["target_version"];
 
-				array_push($log, "Downloading checksums...");
+/*				array_push($log, "Downloading checksums...");
 				$md5sum_data = fetch_file_contents("http://tt-rss.org/download/md5sum.txt");
 
 				if (!$md5sum_data) {
@@ -134,16 +133,18 @@ class Updater extends Plugin {
 					$stop = true; break;
 				}
 
-				$params["target_md5sum"] = $target_md5sum;
+				$params["target_md5sum"] = $target_md5sum; */
+
+				array_push($log, "Proceeding to download...");
 
 				break;
 			case 2:
 				$target_version = $params["target_version"];
-				$target_md5sum = $params["target_md5sum"];
+				// $target_md5sum = $params["target_md5sum"];
 
 				array_push($log, "Downloading distribution tarball...");
 
-				$tarball_url = "http://tt-rss.org/download/tt-rss-$target_version.tar.gz";
+				$tarball_url = "https://github.com/gothfox/Tiny-Tiny-RSS/archive/$target_version.tar.gz";
 				$data = fetch_file_contents($tarball_url);
 
 				if (!$data) {
@@ -151,14 +152,14 @@ class Updater extends Plugin {
 					$stop = true; break;
 				}
 
-				array_push($log, "Verifying tarball checksum...");
+				/* array_push($log, "Verifying tarball checksum...");
 
 				$test_md5sum = md5($data);
 
 				if ($test_md5sum != $target_md5sum) {
 					array_push($log, "Downloaded checksum doesn't match (got $test_md5sum, expected $target_md5sum).");
 					$stop = true; break;
-				}
+				} */
 
 				$tmp_file = tempnam(sys_get_temp_dir(), 'tt-rss');
 				array_push($log, "Saving download to $tmp_file");
@@ -180,14 +181,6 @@ class Updater extends Plugin {
 					$stop = true; break;
 				}
 
-				$old_dir = tmpdirname($parent_dir, "tt-rss-old");
-
-				array_push($log, "Renaming tt-rss directory to ".basename($old_dir));
-				if (!rename($work_dir, $old_dir)) {
-					array_push($log, "Unable to rename tt-rss directory.");
-					$stop = true; break;
-				}
-
 				array_push($log, "Extracting tarball...");
 				system("tar zxf $tmp_file", $system_rc);
 
@@ -196,7 +189,20 @@ class Updater extends Plugin {
 					$stop = true; break;
 				}
 
-				$target_dir = "$parent_dir/tt-rss-$target_version";
+				$target_dir = "$parent_dir/Tiny-Tiny-RSS-$target_version";
+
+				if (!is_dir($target_dir)) {
+					array_push($log, "Target directory ($target_dir) not found.");
+					$stop = true; break;
+				}
+
+				$old_dir = tmpdirname($parent_dir, "tt-rss-old");
+
+				array_push($log, "Renaming tt-rss directory to ".basename($old_dir));
+				if (!rename($work_dir, $old_dir)) {
+					array_push($log, "Unable to rename tt-rss directory.");
+					$stop = true; break;
+				}
 
 				array_push($log, "Renaming target directory...");
 				if (!rename($target_dir, $work_dir)) {
diff --git a/templates/email_article_template.txt b/templates/email_article_template.txt
index 0d151d18c..5cf2b2750 100644
--- a/templates/email_article_template.txt
+++ b/templates/email_article_template.txt
@@ -6,8 +6,6 @@ I've been reading this and thought it might interest you:
 * ${ARTICLE_TITLE}
   ${ARTICLE_URL}
 <!-- $EndBlock article -->
-Sincerely yours, 
-	${USER_NAME} <${USER_EMAIL}>.
 
 -- 
 This message has been sent by Tiny Tiny RSS installation at ${TTRSS_HOST}.
diff --git a/tt-rss.css b/tt-rss.css
index 6c8659e07..72e73e0d3 100644
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -178,11 +178,11 @@ a:hover {
 	cursor : pointer;
 }
 
-.Selected, .Selected td {
+.Selected, .Selected {
 	background-color : #fff7d5 ! important;
 }
 
-.even.Unread.Selected, .even.Unread.Selected td {
+.even.Unread.Selected {
 	background : #fff7d5 ! important;
 	font-weight : bold;
 	border-width : 0px 0px 1px 0px;
@@ -190,7 +190,7 @@ a:hover {
 	border-color : #e7d796;
 }
 
-.odd.Unread.Selected, .odd.Unread.Selected td {
+.odd.Unread.Selected {
 	background : #fff7d5 ! important;
 	font-weight : bold;
 	border-width : 0px 0px 1px 0px;
@@ -198,7 +198,7 @@ a:hover {
 	border-color : #e7d796;
 }
 
-.even.Selected, .even.Selected td {
+.even.Selected {
 	background : #fff7d5 ! important;
 	border-width : 0px 0px 1px 0px;
 	border-style : solid;
@@ -206,7 +206,7 @@ a:hover {
 	border-collapse : collapse;
 }
 
-.odd.Selected, .odd.Selected td {
+.odd.Selected {
 	background : #fff7d5 ! important;
 	border-width : 0px 0px 1px 0px;
 	border-style : solid;
@@ -214,7 +214,7 @@ a:hover {
 	border-collapse : collapse;
 }
 
-.even.Grayed, .even.Grayed td {
+.even.Grayed {
 	background : #f0f0f0;
 	color : #909090;
 	border-width : 0px 0px 1px 0px;
@@ -227,7 +227,7 @@ a:hover {
 	color : #909090;
 }
 
-.even, .even td {
+.even {
 	border-width : 0px 0px 1px 0px;
 	border-style : solid;
 	border-color : #c0c0c0;
@@ -235,14 +235,14 @@ a:hover {
 	border-collapse : collapse;
 }
 
-.odd, .odd td {
+.odd {
 	border-width : 0px 0px 1px 0px;
 	border-style : solid;
 	border-color : #c0c0c0;
 	border-collapse : collapse;
 }
 
-.even.Unread, .even.Unread td {
+.even.Unread {
 	background : #f0f0f0;
 	font-weight : bold;
 	border-width : 0px 0px 1px 0px;
@@ -251,7 +251,7 @@ a:hover {
 	border-collapse : collapse;
 }
 
-.odd.Unread, .odd.Unread td {
+.odd.Unread {
 	font-weight : bold;
 	border-width : 0px 0px 1px 0px;
 	border-style : solid;
@@ -264,14 +264,6 @@ a:hover {
 
 /* preferences */
 
-/* table.prefPrefsList tr:hover td.prefValue {
-	color : #88b0f0;
-}
-
-table.prefPrefsList tr:hover td.prefValue input {
-	color : #88b0f0;
-} */
-
 table.prefPrefsList h3 {
 	margin-top : 0.5em;
 	margin-bottom : 0px;
@@ -292,80 +284,6 @@ tr.title td a:hover {
 	color : black;
 }
 
-table.prefFeedList td.feedEditCat {
-	font-weight : bold;
-	border-width : 0px 0px 1px 0px;
-	border-style : solid;
-	border-color : #88b0f0;
-	padding-top : 0.5em;
-}
-
-table.prefFilterList td.filterEditCat {
-	font-weight : bold;
-	border-width : 0px 0px 1px 0px;
-	border-style : solid;
-	border-color : #88b0f0;
-	padding-top : 0.5em;
-}
-
-/* oh for the love of... */
-
-table.prefFilterList tr.even,
-table.prefFilterList tr.odd,
-table.prefFilterList tr.evenSelected,
-table.prefFilterList tr.oddSelected,
-table.prefLabelList tr.even,
-table.prefLabelList tr.odd,
-table.prefLabelList tr.evenSelected,
-table.prefLabelList tr.oddSelected,
-table.prefUserList tr.even,
-table.prefUserList tr.odd,
-table.prefUserList tr.evenSelected,
-table.prefUserList tr.oddSelected,
-table.prefFeedList tr.even,
-table.prefFeedList tr.odd,
-table.prefFeedList tr.evenSelected,
-table.prefFeedList tr.oddSelected,
-table.prefInstanceList tr.even,
-table.prefInstanceList tr.odd,
-table.prefInstanceList tr.evenSelected,
-table.prefInstanceList tr.oddSelected
-{	
-	cursor : pointer;
-}
-
-table.prefFilterList tr.even:hover td, 
-table.prefFilterList tr.odd:hover td,
-table.prefFilterList tr.evenSelected:hover td, 
-table.prefFilterList tr.oddSelected:hover td 
-table.prefLabelList tr.even:hover td, 
-table.prefLabelList tr.odd:hover td,
-table.prefLabelList tr.evenSelected:hover td, 
-table.prefLabelList tr.oddSelected:hover td,
-table.prefUserList tr.even:hover td, 
-table.prefUserList tr.odd:hover td,
-table.prefUserList tr.evenSelected:hover td, 
-table.prefUserList tr.oddSelected:hover td,
-table.prefFeedList tr.even:hover td, 
-table.prefFeedList tr.odd:hover td,
-table.prefFeedList tr.evenSelected:hover td, 
-table.prefFeedList tr.oddSelected:hover td,
-table.prefInstanceList tr.even:hover td, 
-table.prefInstanceList tr.odd:hover td,
-table.prefInstanceList tr.evenSelected:hover td, 
-table.prefInstanceList tr.oddSelected:hover td
-{
-	color : #88b0f0;
-}
-
-table.prefFeedList td.feedIcon {
-	text-align : center;
-}
-
-table.prefFeedList td.feedSelect {
-	text-align : center;
-}
-
 div.prefFeedCatHolder, div.prefFeedOPMLHolder, div.inactiveFeedHolder, div.filterTestHolder {
 	height : 300px;
 	overflow : auto;
@@ -399,16 +317,9 @@ a.helpLink:hover {
 }
 
 #content-insert code, #headlines-frame code, .dijitContentPane code {
-	margin : 5px 0px 5px 0px;
-	padding : 10px;
 	color : #009900;
 	font-family : monospace;
 	font-size : 12px;
-	border-width : 0px;
-	border-color : #c0e0c0;
-	border-style : solid;
-	background : #fafafa;
-	display : block;
 }
 
 #content-insert pre, #headlines-frame pre, .dijitContentPane pre {
@@ -465,7 +376,7 @@ ul.nomarks {
 	padding : 10px; 
 }
 
-div.prefHelp, td.prefHelp {
+div.prefHelp {
 	color : gray;
 	padding : 5px;
 }
@@ -490,16 +401,6 @@ span.feed_error {
 	font-size : 11px;
 }
 
-table.innerFeedTable td {
-	margin : 0px;
-	padding : 0px;
-}
-
-td.selectPrompt {
-	font-size : 12px;
-	color : gray;
-}
-
 div#headlines-toolbar {
 	border-width : 0px 0px 1px 0px;
 	background-color : #f0f0f0;
@@ -778,11 +679,6 @@ div.return a:hover {
 	color : black;
 }
 
-#header .logo {
-	float : right;
-	margin-left : 10px;
-}
-
 #header a {
 	color : #4684ff;	
 }
@@ -796,11 +692,6 @@ div.return a:hover {
 	cursor : pointer;
 }
 
-a.helpLinkPic img {
-	border-width : 0px;
-	vertical-align : middle;
-}
-
 div.autocomplete {
 	position : absolute;
 	width : 250px;
@@ -829,10 +720,6 @@ div.autocomplete ul li {
 	cursor : pointer;
 }
 
-#feedOpToolbar {
-	float : right;
-}
-
 #header a.feedback {
 	color : #009900;
 }
@@ -1298,3 +1185,7 @@ ul.helpKbList span.hksequence {
 ul.helpKbList h2 {
 	margin-top : 0px;
 }
+
+.dijitTreeNode .loadingNode {
+	margin-left : 3px;
+}
diff --git a/utils/update-translations.sh b/utils/update-translations.sh
index 6a777d7f7..25e0e7568 100755
--- a/utils/update-translations.sh
+++ b/utils/update-translations.sh
@@ -3,7 +3,7 @@ TEMPLATE=messages.pot
 
 ./utils/update-schema-translations.sh
 
-xgettext -kT_js_decl -kT_sprintf -kT_ngettext:1,2 -k__ -L PHP -o $TEMPLATE *.php help/*.php mobile/*.php include/*.php `find classes -iname '*.php'` `find plugins -iname '*.php'`
+xgettext -kT_js_decl -kT_sprintf -kT_ngettext:1,2 -k__ -L PHP -o $TEMPLATE *.php mobile/*.php include/*.php `find classes -iname '*.php'` `find plugins -iname '*.php'`
 
 xgettext --from-code utf-8 -k__ -L Java -j -o $TEMPLATE js/*.js `find plugins -iname '*.js'`