diff --git a/cdm.css b/cdm.css
index bcba40538..7d02bc645 100644
--- a/cdm.css
+++ b/cdm.css
@@ -124,23 +124,23 @@ div.cdmHeader span.hlFeed {
 	font-style : italic;
 }
 
-div.cdmHeader {
+div.cdm.expanded .cdmHeader {
 	background : #EEF6FD;
 }
 
-div.Unread div.cdmHeader {
+div.cdm.expanded.Unread div.cdmHeader {
 	background : #DCECFB;
 }
 
-div.Unread.Selected div.cdmHeader, div.Selected div.cdmHeader {
+div.cdm.expanded.Unread.Selected div.cdmHeader, div.cdm.expanded.Selected div.cdmHeader {
 	background : #FFEA9E;
 }
 
-div.cdm.even.Unread, div.cdm.odd.Unread {
+div.cdm.expanded.even.Unread, div.cdm.expanded.odd.Unread {
 	background : white;
 }
 
-div.cdm.even, div.cdm.odd {
+div.cdm.expanded.even, div.cdm.expanded.odd {
 	background : #f9f9f9;
 }
 
@@ -151,3 +151,7 @@ div.cdmHeader div.hlFeed, div.cdmHeader div.hlFeed a {
 	font-style : italic;
 	font-size : 11px;
 }
+
+div.cdmContentInner p {
+	max-width : 650px;
+}
diff --git a/classes/feeds.php b/classes/feeds.php
index 297cad300..c464303c1 100644
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -517,7 +517,9 @@ class Feeds extends Handler_Protected {
 					$mouseover_attrs = "onmouseover='postMouseIn($id)'
 						onmouseout='postMouseOut($id)'";
 
-					$reply['content'] .= "<div class=\"cdm $class\"
+					$expanded_class = $expand_cdm ? "expanded" : "";
+
+					$reply['content'] .= "<div class=\"cdm $expanded_class $class\"
 						id=\"RROW-$id\" $mouseover_attrs'>";
 
 					$reply['content'] .= "<div class=\"cdmHeader\">";
@@ -548,6 +550,10 @@ class Feeds extends Handler_Protected {
 
 					$reply['content'] .= $labels_str;
 
+					$reply['content'] .= "<span class='collapseBtn' style='display : none'>
+						<img src=\"images/collapse.png\" onclick=\"cdmCollapseArticle(event, $id)\"
+						title=\"".__("Collapse article")."\"/></span>";
+
 					if (!$expand_cdm)
 						$content_hidden = "style=\"display : none\"";
 					else
@@ -555,7 +561,6 @@ class Feeds extends Handler_Protected {
 
 					$reply['content'] .= "<span $excerpt_hidden
 						id=\"CEXC-$id\" class=\"cdmExcerpt\"> - $content_preview</span>";
-
 					$reply['content'] .= "</span>";
 
 					if (!get_pref($this->link, 'VFEED_GROUP_BY_FEED')) {
diff --git a/images/collapse.png b/images/collapse.png
new file mode 100644
index 000000000..5adbd5e1c
Binary files /dev/null and b/images/collapse.png differ
diff --git a/include/functions.php b/include/functions.php
index 1feedcbf0..62699e175 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -286,8 +286,12 @@
 		global $fetch_last_error;
 
 		if (function_exists('curl_init') && !ini_get("open_basedir")) {
-			//$ch = curl_init($url);
-			$ch = curl_init(geturl($url));
+
+			if (ini_get("safe_mode")) {
+				$ch = curl_init(geturl($url));
+			} else {
+				$ch = curl_init($url);
+			}
 
 			curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $timeout ? $timeout : 15);
 			curl_setopt($ch, CURLOPT_TIMEOUT, $timeout ? $timeout : 45);
@@ -1885,7 +1889,7 @@
 				"article_scroll_up" => __("Scroll up"),
 				"select_article_cursor" => __("Select article under cursor"),
 				"email_article" => __("Email article"),
-				"close_article" => __("Close article"),
+				"close_article" => __("Close/collapse article"),
 				"toggle_widescreen" => __("Toggle widescreen mode")),
 			__("Article selection") => array(
 				"select_all" => __("Select all articles"),
@@ -2870,6 +2874,8 @@
 
 		$entry = "";
 
+		$url = htmlspecialchars($url);
+
 		if (strpos($ctype, "audio/") === 0) {
 
 			if ($_SESSION["hasAudio"] && (strpos($ctype, "ogg") !== false ||
@@ -2896,7 +2902,8 @@
 					</object>";
 			}
 
-			if ($entry) $entry .= "&nbsp;" . basename($url);
+			if ($entry) $entry .= "&nbsp; <a target=\"_blank\"
+				href=\"$url\">" . basename($url) . "</a>";
 
 			return $entry;
 
@@ -4027,8 +4034,8 @@
 			$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);
+#			$handle = @fopen('./curl.error.log', 'a');
+#			fwrite($handle, $line);
 			return FALSE;
 		}
 		return $url;
diff --git a/include/localized_schema.php b/include/localized_schema.php
index cf09930d3..71436d96a 100644
--- a/include/localized_schema.php
+++ b/include/localized_schema.php
@@ -1,4 +1,4 @@
-<?php # This file has been generated at:  Tue Mar 19 22:42:44 MSK 2013
+<?php # This file has been generated at:  Wed Mar 20 10:24:45 MSK 2013
 
 __("Title");
 __("Title or Content");
diff --git a/js/tt-rss.js b/js/tt-rss.js
index 3b96566f9..c80e8737d 100644
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -673,7 +673,15 @@ function hotkey_handler(e) {
 			scrollArticle(-ctr.offsetHeight/3);
 			return false;
 		case "close_article":
-			closeArticlePanel();
+			if (isCdmMode()) {
+				if (!getInitParam("cdm_expanded")) {
+					cdmCollapseArticle(false, getActiveArticleId());
+				} else {
+					dismissArticle(getActiveArticleId());
+				}
+			} else {
+				closeArticlePanel();
+			}
 			return false;
 		case "email_article":
 			if (typeof emailArticle != "undefined") {
diff --git a/js/viewfeed.js b/js/viewfeed.js
index 9a16befff..2555215ce 100644
--- a/js/viewfeed.js
+++ b/js/viewfeed.js
@@ -1312,9 +1312,38 @@ function catchupRelativeToArticle(below, id) {
 	}
 }
 
+function cdmCollapseArticle(event, id) {
+	try {
+		var row = $("RROW-" + id);
+		var elem = $("CICD-" + id);
+
+		if (elem && row) {
+			var collapse = $$("div#RROW-" + id +
+				" span[class='collapseBtn']")[0];
+
+		  	Element.hide(elem);
+			Element.show("CEXC-" + id);
+			Element.hide(collapse);
+
+			markHeadline(id, false);
+
+			if (id == getActiveArticleId()) {
+				setActiveArticleId(0);
+			}
+
+			if (event) Event.stop(event);
+		}
+
+	} catch (e) {
+		exception_error("cdmCollapseArticle", e);
+	}
+}
+
 function cdmExpandArticle(id) {
 	try {
 
+		console.log("cdmExpandArticle " + id);
+
 		hideAuxDlg();
 
 		var elem = $("CICD-" + getActiveArticleId());
@@ -1327,17 +1356,25 @@ function cdmExpandArticle(id) {
 		var old_offset = $("RROW-" + id).offsetTop;
 
 		if (getActiveArticleId() && elem && !getInitParam("cdm_expanded")) {
+			var collapse = $$("div#RROW-" + getActiveArticleId() +
+				" span[class='collapseBtn']")[0];
+
 		  	Element.hide(elem);
 			Element.show("CEXC-" + getActiveArticleId());
+			Element.hide(collapse);
 		}
 
 		setActiveArticleId(id);
 
 		elem = $("CICD-" + id);
 
+		var collapse = $$("div#RROW-" + id +
+				" span[class='collapseBtn']")[0];
+
 		if (!Element.visible(elem)) {
 			Element.show(elem);
 			Element.hide("CEXC-" + id);
+			Element.show(collapse);
 		}
 
 		/* var new_offset = $("RROW-" + id).offsetTop;
@@ -1609,16 +1646,21 @@ function isCdmMode() {
 	return getInitParam("combined_display_mode");
 }
 
-function markHeadline(id) {
+function markHeadline(id, marked) {
+	if (marked == undefined) marked = true;
+
 	var row = $("RROW-" + id);
 	if (row) {
 		var check = dijit.byId("RCHK-" + id);
 
 		if (check) {
-			check.attr("checked", true);
+			check.attr("checked", marked);
 		}
 
-		row.addClassName("Selected");
+		if (marked)
+			row.addClassName("Selected");
+		else
+			row.removeClassName("Selected");
 	}
 }
 
diff --git a/locale/ca_CA/LC_MESSAGES/messages.mo b/locale/ca_CA/LC_MESSAGES/messages.mo
index 8da702867..540235508 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 0a7d447b4..f11bfc081 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-19 22:42+0400\n"
+"POT-Creation-Date: 2013-03-20 10:24+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"
@@ -291,11 +291,11 @@ msgstr "Adaptatiu"
 msgid "All Articles"
 msgstr "Tots els articles"
 
-#: index.php:169 include/functions.php:1911 classes/feeds.php:106
+#: index.php:169 include/functions.php:1915 classes/feeds.php:106
 msgid "Starred"
 msgstr "Marcats"
 
-#: index.php:170 include/functions.php:1912 classes/feeds.php:107
+#: index.php:170 include/functions.php:1916 classes/feeds.php:107
 msgid "Published"
 msgstr "Publicats"
 
@@ -336,7 +336,7 @@ msgstr "Puntuació"
 msgid "Update"
 msgstr "Actualitza"
 
-#: index.php:191 index.php:221 include/functions.php:1902
+#: index.php:191 index.php:221 include/functions.php:1906
 #: include/localized_schema.php:10 classes/feeds.php:111 classes/feeds.php:136
 #: classes/feeds.php:408 js/FeedTree.js:128 js/FeedTree.js:156
 #: plugins/digest/digest.js:630
@@ -398,7 +398,7 @@ msgstr ""
 msgid "Show tag cloud..."
 msgstr "Núvol d'etiquetes"
 
-#: index.php:229 include/functions.php:1889
+#: index.php:229 include/functions.php:1893
 #, fuzzy
 msgid "Toggle widescreen mode"
 msgstr "Canvia al mode de reordenació de categories"
@@ -425,8 +425,8 @@ msgstr "Dreceres de teclat"
 msgid "Logout"
 msgstr "Surt"
 
-#: prefs.php:28 prefs.php:99 include/functions.php:1914
-#: classes/pref/prefs.php:371
+#: prefs.php:28 prefs.php:99 include/functions.php:1918
+#: classes/pref/prefs.php:377
 msgid "Preferences"
 msgstr "Preferències"
 
@@ -447,8 +447,8 @@ msgstr "Canals"
 msgid "Filters"
 msgstr "Filtres"
 
-#: prefs.php:108 mobile/mobile-functions.php:205 include/functions.php:1117
-#: include/functions.php:1738 classes/pref/labels.php:90
+#: prefs.php:108 mobile/mobile-functions.php:205 include/functions.php:1121
+#: include/functions.php:1742 classes/pref/labels.php:90
 msgid "Labels"
 msgstr "Etiquetes"
 
@@ -545,8 +545,8 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
-#: mobile/mobile-functions.php:178 include/functions.php:1115
-#: include/functions.php:1736
+#: mobile/mobile-functions.php:178 include/functions.php:1119
+#: include/functions.php:1740
 msgid "Special"
 msgstr "Especial"
 
@@ -593,9 +593,9 @@ msgstr "Ordena els canals per articles no llegits"
 msgid "Reverse headline order (oldest first)"
 msgstr "Inverteix l'ordre de les capçaleres (les més antigues les primeres)"
 
-#: include/digest.php:131 include/functions.php:1126
-#: include/functions.php:1639 include/functions.php:1724
-#: include/functions.php:1746 classes/opml.php:416 classes/pref/feeds.php:188
+#: include/digest.php:131 include/functions.php:1130
+#: include/functions.php:1643 include/functions.php:1728
+#: include/functions.php:1750 classes/opml.php:416 classes/pref/feeds.php:188
 msgid "Uncategorized"
 msgstr "Sense categoria"
 
@@ -608,325 +608,325 @@ msgstr "Articles marcats"
 msgid "No feeds found."
 msgstr "No s'ha trobat cap canal."
 
-#: include/functions.php:697
+#: include/functions.php:701
 msgid "Session failed to validate (incorrect IP)"
 msgstr "No s'ha pogut validar la sessió (IP incorrecta)"
 
-#: include/functions.php:1588 classes/dlg.php:371 classes/pref/filters.php:368
+#: include/functions.php:1592 classes/dlg.php:371 classes/pref/filters.php:368
 msgid "All feeds"
 msgstr "Tots els canals"
 
-#: include/functions.php:1789
+#: include/functions.php:1793
 msgid "Starred articles"
 msgstr "Articles marcats"
 
-#: include/functions.php:1791
+#: include/functions.php:1795
 msgid "Published articles"
 msgstr "Articles publicats"
 
-#: include/functions.php:1793
+#: include/functions.php:1797
 msgid "Fresh articles"
 msgstr "Articles nous"
 
-#: include/functions.php:1795 include/functions.php:1909
+#: include/functions.php:1799 include/functions.php:1913
 msgid "All articles"
 msgstr "Tots els articles"
 
-#: include/functions.php:1797
+#: include/functions.php:1801
 #, fuzzy
 msgid "Archived articles"
 msgstr "Articles mémorisés"
 
-#: include/functions.php:1799
+#: include/functions.php:1803
 msgid "Recently read"
 msgstr ""
 
-#: include/functions.php:1866
+#: include/functions.php:1870
 msgid "Navigation"
 msgstr "Navegació"
 
-#: include/functions.php:1867
+#: include/functions.php:1871
 #, fuzzy
 msgid "Open next feed"
 msgstr "Canals generats"
 
-#: include/functions.php:1868
+#: include/functions.php:1872
 msgid "Open previous feed"
 msgstr ""
 
-#: include/functions.php:1869
+#: include/functions.php:1873
 #, fuzzy
 msgid "Open next article"
 msgstr "Mostra el contingut original de l'article"
 
-#: include/functions.php:1870
+#: include/functions.php:1874
 #, fuzzy
 msgid "Open previous article"
 msgstr "Mostra el contingut original de l'article"
 
-#: include/functions.php:1871
+#: include/functions.php:1875
 msgid "Open next article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1872
+#: include/functions.php:1876
 msgid "Open previous article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1873
+#: include/functions.php:1877
 msgid "Show search dialog"
 msgstr "Mostra el diàleg de cerca"
 
-#: include/functions.php:1874
+#: include/functions.php:1878
 #, fuzzy
 msgid "Article"
 msgstr "Tots els articles"
 
-#: include/functions.php:1875
+#: include/functions.php:1879
 msgid "Toggle starred"
 msgstr "Commuta els marcats"
 
-#: include/functions.php:1876
+#: include/functions.php:1880
 msgid "Toggle published"
 msgstr "Commuta els publicats"
 
-#: include/functions.php:1877
+#: include/functions.php:1881
 msgid "Toggle unread"
 msgstr "Commuta els no llegits"
 
-#: include/functions.php:1878
+#: include/functions.php:1882
 msgid "Edit tags"
 msgstr "Edita les etiquetes"
 
-#: include/functions.php:1879
+#: include/functions.php:1883
 #, fuzzy
 msgid "Dismiss selected"
 msgstr ""
 "Esteu segur que voleu eliminar els articles seleccionats de l'etiqueta?"
 
-#: include/functions.php:1880
+#: include/functions.php:1884
 #, fuzzy
 msgid "Dismiss read"
 msgstr "Publica l'article"
 
-#: include/functions.php:1881
+#: include/functions.php:1885
 #, fuzzy
 msgid "Open in new window"
 msgstr "Obre l'article en una finestra nova"
 
-#: include/functions.php:1882 js/viewfeed.js:1758
+#: include/functions.php:1886 js/viewfeed.js:1798
 #, fuzzy
 msgid "Mark below as read"
 msgstr "Marca'l com a llegit"
 
-#: include/functions.php:1883 js/viewfeed.js:1752
+#: include/functions.php:1887 js/viewfeed.js:1792
 #, fuzzy
 msgid "Mark above as read"
 msgstr "Marca'l com a llegit"
 
-#: include/functions.php:1884
+#: include/functions.php:1888
 #, fuzzy
 msgid "Scroll down"
 msgstr "Fet!"
 
-#: include/functions.php:1885
+#: include/functions.php:1889
 msgid "Scroll up"
 msgstr ""
 
-#: include/functions.php:1886
+#: include/functions.php:1890
 #, fuzzy
 msgid "Select article under cursor"
 msgstr "Seleccioneu un article mitjançant el ratolí."
 
-#: include/functions.php:1887
+#: include/functions.php:1891
 #, fuzzy
 msgid "Email article"
 msgstr "Tots els articles"
 
-#: include/functions.php:1888 plugins/close_button/init.php:24
+#: include/functions.php:1892
 #, fuzzy
-msgid "Close article"
+msgid "Close/collapse article"
 msgstr "Buida els articles"
 
-#: include/functions.php:1890
+#: include/functions.php:1894
 #, fuzzy
 msgid "Article selection"
 msgstr "Accions actives de l'article"
 
-#: include/functions.php:1891
+#: include/functions.php:1895
 #, fuzzy
 msgid "Select all articles"
 msgstr "Buida els articles"
 
-#: include/functions.php:1892
+#: include/functions.php:1896
 #, fuzzy
 msgid "Select unread"
 msgstr "Purga els articles per llegir"
 
-#: include/functions.php:1893
+#: include/functions.php:1897
 #, fuzzy
 msgid "Select starred"
 msgstr "Marca'l com a destacat"
 
-#: include/functions.php:1894
+#: include/functions.php:1898
 #, fuzzy
 msgid "Select published"
 msgstr "Purga els articles per llegir"
 
-#: include/functions.php:1895
+#: include/functions.php:1899
 #, fuzzy
 msgid "Invert selection"
 msgstr "Accions actives de l'article"
 
-#: include/functions.php:1896
+#: include/functions.php:1900
 #, fuzzy
 msgid "Deselect everything"
 msgstr "Buida els articles"
 
-#: include/functions.php:1897 classes/pref/feeds.php:488
+#: include/functions.php:1901 classes/pref/feeds.php:488
 #: classes/pref/feeds.php:719
 msgid "Feed"
 msgstr "Canal"
 
-#: include/functions.php:1898
+#: include/functions.php:1902
 #, fuzzy
 msgid "Refresh current feed"
 msgstr "Actualitza els canals actius"
 
-#: include/functions.php:1899
+#: include/functions.php:1903
 #, fuzzy
 msgid "Un/hide read feeds"
 msgstr "Mostra/amaga els canals llegits"
 
-#: include/functions.php:1900 classes/pref/feeds.php:1240
+#: include/functions.php:1904 classes/pref/feeds.php:1240
 msgid "Subscribe to feed"
 msgstr "Subscriu-te al canal"
 
-#: include/functions.php:1901 js/FeedTree.js:135 js/PrefFeedTree.js:67
+#: include/functions.php:1905 js/FeedTree.js:135 js/PrefFeedTree.js:67
 msgid "Edit feed"
 msgstr "Edita el canal"
 
-#: include/functions.php:1903
+#: include/functions.php:1907
 #, fuzzy
 msgid "Reverse headlines"
 msgstr "Inverteix l'ordre de les capçaleres (les més antigues les primeres)"
 
-#: include/functions.php:1904
+#: include/functions.php:1908
 #, fuzzy
 msgid "Debug feed update"
 msgstr "S'ha acabat l'actualització dels canals."
 
-#: include/functions.php:1905 js/FeedTree.js:177
+#: include/functions.php:1909 js/FeedTree.js:177
 msgid "Mark all feeds as read"
 msgstr "Marca tots els canals com a llegits"
 
-#: include/functions.php:1906
+#: include/functions.php:1910
 #, fuzzy
 msgid "Un/collapse current category"
 msgstr "Clica-hi per a reduir la categoria"
 
-#: include/functions.php:1907
+#: include/functions.php:1911
 #, fuzzy
 msgid "Toggle combined mode"
 msgstr "Canvia al mode de reordenació de categories"
 
-#: include/functions.php:1908
+#: include/functions.php:1912
 #, fuzzy
 msgid "Go to"
 msgstr "Vés a..."
 
-#: include/functions.php:1910
+#: include/functions.php:1914
 #, fuzzy
 msgid "Fresh"
 msgstr "Actualitza"
 
-#: include/functions.php:1913
+#: include/functions.php:1917
 msgid "Tag cloud"
 msgstr "Núvol d'etiquetes"
 
-#: include/functions.php:1915
+#: include/functions.php:1919
 #, fuzzy
 msgid "Other"
 msgstr "Altres:"
 
-#: include/functions.php:1916 classes/pref/labels.php:281
+#: include/functions.php:1920 classes/pref/labels.php:281
 msgid "Create label"
 msgstr "Crea una etiqueta"
 
-#: include/functions.php:1917 classes/pref/filters.php:587
+#: include/functions.php:1921 classes/pref/filters.php:587
 msgid "Create filter"
 msgstr "Crea un filtre"
 
-#: include/functions.php:1918
+#: include/functions.php:1922
 #, fuzzy
 msgid "Un/collapse sidebar"
 msgstr "Redueix la barra lateral"
 
-#: include/functions.php:1919
+#: include/functions.php:1923
 #, fuzzy
 msgid "Show help dialog"
 msgstr "Mostra el diàleg de cerca"
 
-#: include/functions.php:2401
+#: include/functions.php:2405
 #, fuzzy, php-format
 msgid "Search results: %s"
 msgstr "Resultats de la cerca"
 
-#: include/functions.php:2886 js/viewfeed.js:1845
+#: include/functions.php:2892 js/viewfeed.js:1885
 #, fuzzy
 msgid "Click to play"
 msgstr "Feu clic per editar"
 
-#: include/functions.php:2887 js/viewfeed.js:1844
+#: include/functions.php:2893 js/viewfeed.js:1884
 msgid "Play"
 msgstr ""
 
-#: include/functions.php:3007
+#: include/functions.php:3014
 msgid " - "
 msgstr " - "
 
-#: include/functions.php:3029 include/functions.php:3346 classes/rpc.php:360
+#: include/functions.php:3036 include/functions.php:3353 classes/rpc.php:360
 msgid "no tags"
 msgstr "sense etiqueta"
 
-#: include/functions.php:3039 classes/feeds.php:650
+#: include/functions.php:3046 classes/feeds.php:653
 msgid "Edit tags for this article"
 msgstr "Edita les etiquetes d'aquest article"
 
-#: include/functions.php:3068 classes/feeds.php:605
+#: include/functions.php:3075 classes/feeds.php:608
 #, fuzzy
 msgid "Originally from:"
 msgstr "Mostra el contingut original de l'article"
 
-#: include/functions.php:3081 classes/feeds.php:618 classes/pref/feeds.php:507
+#: include/functions.php:3088 classes/feeds.php:621 classes/pref/feeds.php:507
 #, fuzzy
 msgid "Feed URL"
 msgstr "Canal"
 
-#: include/functions.php:3110
+#: include/functions.php:3117
 msgid "Related"
 msgstr ""
 
-#: include/functions.php:3137 classes/dlg.php:43 classes/dlg.php:162
+#: include/functions.php:3144 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:1553
 #: classes/pref/feeds.php:1624 plugins/import_export/init.php:407
 #: plugins/import_export/init.php:431 plugins/share/init.php:67
-#: plugins/updater/init.php:329
+#: plugins/updater/init.php:330
 msgid "Close this window"
 msgstr "Tanca la finestra"
 
-#: include/functions.php:3371
+#: include/functions.php:3378
 #, fuzzy
 msgid "(edit note)"
 msgstr "edita la nota"
 
-#: include/functions.php:3604
+#: include/functions.php:3611
 msgid "unknown type"
 msgstr "tipus desconegut"
 
-#: include/functions.php:3654
+#: include/functions.php:3661
 #, fuzzy
 msgid "Attachments"
 msgstr "Adjuncions:"
@@ -965,7 +965,7 @@ msgstr "Publica l'article"
 msgid "Assign tags"
 msgstr "Assigna etiquetes"
 
-#: include/localized_schema.php:14 js/viewfeed.js:1809
+#: include/localized_schema.php:14 js/viewfeed.js:1849
 msgid "Assign label"
 msgstr "Assigna-li l'etiqueta"
 
@@ -1438,7 +1438,7 @@ msgstr "Autenticació"
 msgid "Login"
 msgstr "Entra"
 
-#: classes/dlg.php:276 classes/dlg.php:732 classes/pref/prefs.php:196
+#: classes/dlg.php:276 classes/dlg.php:732 classes/pref/prefs.php:202
 #: classes/pref/feeds.php:569 classes/pref/feeds.php:793
 #, fuzzy
 msgid "Password"
@@ -1547,7 +1547,7 @@ msgstr "Visualitza les etiquetes"
 msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 
-#: classes/dlg.php:591 plugins/updater/init.php:303
+#: classes/dlg.php:591 plugins/updater/init.php:304
 #, fuzzy, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "Hi ha una nova versió de Tiny Tiny RSS!"
@@ -1689,7 +1689,7 @@ msgstr "Marca l'article"
 msgid "Feed:"
 msgstr "Flux&nbsp;:"
 
-#: classes/feeds.php:201 classes/feeds.php:795
+#: classes/feeds.php:201 classes/feeds.php:798
 msgid "Feed not found."
 msgstr "No s'ha trobat el canal."
 
@@ -1697,19 +1697,24 @@ msgstr "No s'ha trobat el canal."
 msgid "mark as read"
 msgstr "Marca'l com a llegit"
 
-#: classes/feeds.php:696
+#: classes/feeds.php:553
+#, fuzzy
+msgid "Collapse article"
+msgstr "Buida els articles"
+
+#: classes/feeds.php:699
 msgid "No unread articles found to display."
 msgstr "No es poden mostrar els articles no llegits perquè no n'hi ha."
 
-#: classes/feeds.php:699
+#: classes/feeds.php:702
 msgid "No updated articles found to display."
 msgstr "No hi ha cap article actualitzat."
 
-#: classes/feeds.php:702
+#: classes/feeds.php:705
 msgid "No starred articles found to display."
 msgstr "No hi ha articles marcats per mostrar."
 
-#: classes/feeds.php:706
+#: classes/feeds.php:709
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
@@ -1717,22 +1722,22 @@ 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:708
+#: classes/feeds.php:711
 msgid "No articles found to display."
 msgstr "No s'han trobat articles per a mostrar."
 
-#: classes/feeds.php:723 classes/feeds.php:904
+#: classes/feeds.php:726 classes/feeds.php:907
 #, fuzzy, php-format
 msgid "Feeds last updated at %s"
 msgstr "Erreurs de mise à jour"
 
-#: classes/feeds.php:733 classes/feeds.php:914
+#: classes/feeds.php:736 classes/feeds.php:917
 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:894
+#: classes/feeds.php:897
 msgid "No feed selected."
 msgstr "No heu seleccionat cap canal."
 
@@ -2069,188 +2074,179 @@ msgstr "Les contrasenyes no coincideixen."
 msgid "Function not supported by authentication module."
 msgstr ""
 
-#: classes/pref/prefs.php:63
+#: classes/pref/prefs.php:69
 msgid "The configuration was saved."
 msgstr "S'ha desat la configuració"
 
-#: classes/pref/prefs.php:77
+#: classes/pref/prefs.php:83
 #, php-format
 msgid "Unknown option: %s"
 msgstr "Es desconeix l'opció %s"
 
-#: classes/pref/prefs.php:91
+#: classes/pref/prefs.php:97
 #, fuzzy
 msgid "Your personal data has been saved."
 msgstr "S'ha modificat la contrasenya."
 
-#: classes/pref/prefs.php:131
+#: classes/pref/prefs.php:137
 #, fuzzy
 msgid "Personal data / Authentication"
 msgstr "Autenticació"
 
-#: classes/pref/prefs.php:151
+#: classes/pref/prefs.php:157
 msgid "Personal data"
 msgstr "Dades personals"
 
-#: classes/pref/prefs.php:161
+#: classes/pref/prefs.php:167
 msgid "Full name"
 msgstr ""
 
-#: classes/pref/prefs.php:165
+#: classes/pref/prefs.php:171
 msgid "E-mail"
 msgstr "Adreça electrònica"
 
-#: classes/pref/prefs.php:171
+#: classes/pref/prefs.php:177
 msgid "Access level"
 msgstr "Nivell d'accés"
 
-#: classes/pref/prefs.php:181
+#: classes/pref/prefs.php:187
 #, fuzzy
 msgid "Save data"
 msgstr "Desa"
 
-#: classes/pref/prefs.php:203
+#: classes/pref/prefs.php:209
 #, 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:235
+#: classes/pref/prefs.php:241
 msgid "Old password"
 msgstr "Contrasenya antiga"
 
-#: classes/pref/prefs.php:238
+#: classes/pref/prefs.php:244
 msgid "New password"
 msgstr "Nova contrasenya"
 
-#: classes/pref/prefs.php:243
+#: classes/pref/prefs.php:249
 msgid "Confirm password"
 msgstr "Confirmeu la contrasenya"
 
-#: classes/pref/prefs.php:253
+#: classes/pref/prefs.php:259
 msgid "Change password"
 msgstr "Canvia la contrasenya"
 
-#: classes/pref/prefs.php:259
+#: classes/pref/prefs.php:265
 msgid "One time passwords / Authenticator"
 msgstr ""
 
-#: classes/pref/prefs.php:288 classes/pref/prefs.php:339
+#: classes/pref/prefs.php:294 classes/pref/prefs.php:345
 #, fuzzy
 msgid "Enter your password"
 msgstr "El nom d'usuari o la contrasenya és incorrecte"
 
-#: classes/pref/prefs.php:299
+#: classes/pref/prefs.php:305
 #, fuzzy
 msgid "Disable OTP"
 msgstr "(Desactivat)"
 
-#: classes/pref/prefs.php:305
+#: classes/pref/prefs.php:311
 msgid ""
 "You will need a compatible Authenticator to use this. Changing your password "
 "would automatically disable OTP."
 msgstr ""
 
-#: classes/pref/prefs.php:307
+#: classes/pref/prefs.php:313
 msgid "Scan the following code by the Authenticator application:"
 msgstr ""
 
-#: classes/pref/prefs.php:348
+#: classes/pref/prefs.php:354
 msgid "I have scanned the code and would like to enable OTP"
 msgstr ""
 
-#: classes/pref/prefs.php:356
+#: classes/pref/prefs.php:362
 #, fuzzy
 msgid "Enable OTP"
 msgstr "Activat"
 
-#: classes/pref/prefs.php:482
+#: classes/pref/prefs.php:493
 #, fuzzy
 msgid "Customize"
 msgstr "URL de la fulla d'estils personalitzada."
 
-#: classes/pref/prefs.php:501 classes/pref/prefs.php:508
-#: classes/pref/prefs.php:513
-msgid "Yes"
-msgstr "Sí"
-
-#: classes/pref/prefs.php:503 classes/pref/prefs.php:513
-msgid "No"
-msgstr "No"
-
-#: classes/pref/prefs.php:543
+#: classes/pref/prefs.php:552
 #, fuzzy
 msgid "Register"
 msgstr "Registrat"
 
-#: classes/pref/prefs.php:547
+#: classes/pref/prefs.php:556
 msgid "Clear"
 msgstr ""
 
-#: classes/pref/prefs.php:553
+#: classes/pref/prefs.php:562
 #, php-format
 msgid "Current server time: %s (UTC)"
 msgstr ""
 
-#: classes/pref/prefs.php:582
+#: classes/pref/prefs.php:595
 msgid "Save configuration"
 msgstr "Desa la configuració"
 
-#: classes/pref/prefs.php:585
+#: classes/pref/prefs.php:598
 #, fuzzy
 msgid "Manage profiles"
 msgstr "Crea un filtre"
 
-#: classes/pref/prefs.php:588
+#: classes/pref/prefs.php:601
 msgid "Reset to defaults"
 msgstr "Torna als paràmetres per defecte"
 
-#: classes/pref/prefs.php:600
+#: classes/pref/prefs.php:613
 #, fuzzy
 msgid "Show additional preferences"
 msgstr "Surt de les preferències"
 
-#: classes/pref/prefs.php:612 classes/pref/prefs.php:614
+#: classes/pref/prefs.php:625 classes/pref/prefs.php:627
 msgid "Plugins"
 msgstr ""
 
-#: classes/pref/prefs.php:642
+#: classes/pref/prefs.php:655
 msgid "System plugins"
 msgstr ""
 
-#: classes/pref/prefs.php:646 classes/pref/prefs.php:695
+#: classes/pref/prefs.php:659 classes/pref/prefs.php:708
 msgid "Plugin"
 msgstr ""
 
-#: classes/pref/prefs.php:647 classes/pref/prefs.php:696
+#: classes/pref/prefs.php:660 classes/pref/prefs.php:709
 #, fuzzy
 msgid "Description"
 msgstr "description"
 
-#: classes/pref/prefs.php:648 classes/pref/prefs.php:697
+#: classes/pref/prefs.php:661 classes/pref/prefs.php:710
 msgid "Version"
 msgstr ""
 
-#: classes/pref/prefs.php:649 classes/pref/prefs.php:698
+#: classes/pref/prefs.php:662 classes/pref/prefs.php:711
 msgid "Author"
 msgstr ""
 
-#: classes/pref/prefs.php:682 classes/pref/prefs.php:733
+#: classes/pref/prefs.php:695 classes/pref/prefs.php:746
 #, fuzzy
 msgid "Clear data"
 msgstr "Esborra les dades del canal"
 
-#: classes/pref/prefs.php:691
+#: classes/pref/prefs.php:704
 msgid "User plugins"
 msgstr ""
 
-#: classes/pref/prefs.php:748
+#: classes/pref/prefs.php:761
 #, fuzzy
 msgid "Enable selected plugins"
 msgstr "Habilita les icones dels canals."
 
-#: classes/pref/prefs.php:803 classes/pref/prefs.php:821
+#: classes/pref/prefs.php:816 classes/pref/prefs.php:834
 #, fuzzy
 msgid "Incorrect password"
 msgstr "El nom d'usuari o la contrasenya és incorrecte"
@@ -2555,6 +2551,11 @@ msgstr "Hola, "
 msgid "Regular version"
 msgstr ""
 
+#: plugins/close_button/init.php:24
+#, fuzzy
+msgid "Close article"
+msgstr "Buida els articles"
+
 #: plugins/nsfw/init.php:32 plugins/nsfw/init.php:43
 msgid "Not work safe (click to toggle)"
 msgstr ""
@@ -2799,29 +2800,29 @@ msgstr "Marca l'article"
 msgid "Share on Google+"
 msgstr "Títol"
 
-#: plugins/updater/init.php:294 plugins/updater/init.php:306
+#: plugins/updater/init.php:295 plugins/updater/init.php:307
 #: plugins/updater/updater.js:10
 #, fuzzy
 msgid "Update Tiny Tiny RSS"
 msgstr "Torna a Tiny Tiny RSS"
 
-#: plugins/updater/init.php:309
+#: plugins/updater/init.php:310
 #, fuzzy
 msgid "Your Tiny Tiny RSS installation is up to date."
 msgstr "La base de dades de Tiny Tiny RSS està actualitzada."
 
-#: plugins/updater/init.php:319
+#: plugins/updater/init.php:320
 msgid ""
 "Do not close this dialog until updating is finished. Backup your tt-rss "
 "directory before continuing."
 msgstr ""
 
-#: plugins/updater/init.php:322
+#: plugins/updater/init.php:323
 #, fuzzy
 msgid "Ready to update."
 msgstr "Última actualització:"
 
-#: plugins/updater/init.php:327
+#: plugins/updater/init.php:328
 #, fuzzy
 msgid "Start update"
 msgstr "Última actualització:"
@@ -2937,7 +2938,7 @@ msgstr "Si us plau, escriviu una nota per aquest article:"
 msgid "Generate new syndication address for this feed?"
 msgstr ""
 
-#: js/functions.js:1597 js/tt-rss.js:350 js/tt-rss.js:721
+#: js/functions.js:1597 js/tt-rss.js:350 js/tt-rss.js:729
 msgid "You can't edit this kind of feed."
 msgstr "No podeu editar aquest tipus de canal."
 
@@ -3215,12 +3216,12 @@ msgstr "No podeu canviar la puntuació d'aquest tipus de canal."
 msgid "Rescore articles in %s?"
 msgstr "Esteu segur que voleu canviar la puntuació dels articles a %s?"
 
-#: js/tt-rss.js:680
+#: js/tt-rss.js:688
 #, fuzzy
 msgid "Please enable mail plugin first."
 msgstr "Primerament heu de seleccionar un canal."
 
-#: js/tt-rss.js:842
+#: js/tt-rss.js:850
 #, fuzzy
 msgid "New version available!"
 msgstr "Hi ha una nova versió de Tiny Tiny RSS!"
@@ -3247,7 +3248,7 @@ msgstr "Deixa de publicar l'article"
 
 #: 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/mailto/init.js:7
+#: js/viewfeed.js:1053 js/viewfeed.js:1967 plugins/mailto/init.js:7
 #: plugins/mail/mail.js:7
 msgid "No articles are selected."
 msgstr "No hi ha cap article seleccionat."
@@ -3305,32 +3306,32 @@ msgstr "No s'han trobat articles per a marcar."
 msgid "Mark %d article(s) as read?"
 msgstr "Esteu segur que voleu marcar  %d article(s) com a llegit(s) ?"
 
-#: js/viewfeed.js:1744
+#: js/viewfeed.js:1784
 #, fuzzy
 msgid "Open original article"
 msgstr "Mostra el contingut original de l'article"
 
-#: js/viewfeed.js:1814
+#: js/viewfeed.js:1854
 #, fuzzy
 msgid "Remove label"
 msgstr "Esteu segur que voleu suprimir les etiquetes seleccionades?"
 
-#: js/viewfeed.js:1838
+#: js/viewfeed.js:1878
 #, fuzzy
 msgid "Playing..."
 msgstr "S'està carregant la llista de canals..."
 
-#: js/viewfeed.js:1839
+#: js/viewfeed.js:1879
 #, fuzzy
 msgid "Click to pause"
 msgstr "Feu clic per editar"
 
-#: js/viewfeed.js:1896
+#: js/viewfeed.js:1936
 #, fuzzy
 msgid "Please enter new score for selected articles:"
 msgstr "Si us plau, escriviu una nota per aquest article:"
 
-#: js/viewfeed.js:1938
+#: js/viewfeed.js:1978
 #, fuzzy
 msgid "Please enter new score for this article:"
 msgstr "Si us plau, escriviu una nota per aquest article:"
@@ -3427,6 +3428,12 @@ msgid ""
 "before continuing. Please type 'yes' to continue."
 msgstr ""
 
+#~ msgid "Yes"
+#~ msgstr "Sí"
+
+#~ msgid "No"
+#~ msgstr "No"
+
 #~ msgid "Comments?"
 #~ msgstr "Comentaris?"
 
diff --git a/locale/de_DE/LC_MESSAGES/messages.mo b/locale/de_DE/LC_MESSAGES/messages.mo
index 2f6e77f69..5102b9b65 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 39b0c40d9..01092860c 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-19 22:42+0400\n"
+"POT-Creation-Date: 2013-03-20 10:24+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/"
@@ -297,11 +297,11 @@ msgstr "Adaptiv"
 msgid "All Articles"
 msgstr "Alle Artikel"
 
-#: index.php:169 include/functions.php:1911 classes/feeds.php:106
+#: index.php:169 include/functions.php:1915 classes/feeds.php:106
 msgid "Starred"
 msgstr "Markiert"
 
-#: index.php:170 include/functions.php:1912 classes/feeds.php:107
+#: index.php:170 include/functions.php:1916 classes/feeds.php:107
 msgid "Published"
 msgstr "Veröffentlicht"
 
@@ -341,7 +341,7 @@ msgstr "Bewertung"
 msgid "Update"
 msgstr "Aktualisieren"
 
-#: index.php:191 index.php:221 include/functions.php:1902
+#: index.php:191 index.php:221 include/functions.php:1906
 #: include/localized_schema.php:10 classes/feeds.php:111 classes/feeds.php:136
 #: classes/feeds.php:408 js/FeedTree.js:128 js/FeedTree.js:156
 #: plugins/digest/digest.js:630
@@ -401,7 +401,7 @@ msgstr "Zur Zusammenfassung wechseln..."
 msgid "Show tag cloud..."
 msgstr "Tagwolke anzeigen..."
 
-#: index.php:229 include/functions.php:1889
+#: index.php:229 include/functions.php:1893
 msgid "Toggle widescreen mode"
 msgstr "Breitbild-Modus umschalten"
 
@@ -426,8 +426,8 @@ msgstr "Tastaturkürzel..."
 msgid "Logout"
 msgstr "Abmelden"
 
-#: prefs.php:28 prefs.php:99 include/functions.php:1914
-#: classes/pref/prefs.php:371
+#: prefs.php:28 prefs.php:99 include/functions.php:1918
+#: classes/pref/prefs.php:377
 msgid "Preferences"
 msgstr "Einstellungen"
 
@@ -448,8 +448,8 @@ msgstr "Feeds"
 msgid "Filters"
 msgstr "Filter"
 
-#: prefs.php:108 mobile/mobile-functions.php:205 include/functions.php:1117
-#: include/functions.php:1738 classes/pref/labels.php:90
+#: prefs.php:108 mobile/mobile-functions.php:205 include/functions.php:1121
+#: include/functions.php:1742 classes/pref/labels.php:90
 msgid "Labels"
 msgstr "Label"
 
@@ -545,8 +545,8 @@ msgstr "Reguläre Version öffnen"
 msgid "Home"
 msgstr "Startseite"
 
-#: mobile/mobile-functions.php:178 include/functions.php:1115
-#: include/functions.php:1736
+#: mobile/mobile-functions.php:178 include/functions.php:1119
+#: include/functions.php:1740
 msgid "Special"
 msgstr "Sonderfeeds"
 
@@ -588,9 +588,9 @@ msgstr "Feeds nach Anzahl der ungelesenen Artikel sortieren"
 msgid "Reverse headline order (oldest first)"
 msgstr "Schlagzeilensortierung umkehren (älteste zuerst)"
 
-#: include/digest.php:131 include/functions.php:1126
-#: include/functions.php:1639 include/functions.php:1724
-#: include/functions.php:1746 classes/opml.php:416 classes/pref/feeds.php:188
+#: include/digest.php:131 include/functions.php:1130
+#: include/functions.php:1643 include/functions.php:1728
+#: include/functions.php:1750 classes/opml.php:416 classes/pref/feeds.php:188
 msgid "Uncategorized"
 msgstr "Unkategorisiert"
 
@@ -603,297 +603,298 @@ msgstr "%d archivierte Artikel"
 msgid "No feeds found."
 msgstr "Keine Feeds gefunden."
 
-#: include/functions.php:697
+#: include/functions.php:701
 msgid "Session failed to validate (incorrect IP)"
 msgstr "Session konnte nicht validiert werden (falsche IP)"
 
-#: include/functions.php:1588 classes/dlg.php:371 classes/pref/filters.php:368
+#: include/functions.php:1592 classes/dlg.php:371 classes/pref/filters.php:368
 msgid "All feeds"
 msgstr "Alle Feeds"
 
-#: include/functions.php:1789
+#: include/functions.php:1793
 msgid "Starred articles"
 msgstr "Markierte Artikel"
 
-#: include/functions.php:1791
+#: include/functions.php:1795
 msgid "Published articles"
 msgstr "Veröffentlichte Artikel"
 
-#: include/functions.php:1793
+#: include/functions.php:1797
 msgid "Fresh articles"
 msgstr "Neue Artikel"
 
-#: include/functions.php:1795 include/functions.php:1909
+#: include/functions.php:1799 include/functions.php:1913
 msgid "All articles"
 msgstr "Alle Artikel"
 
-#: include/functions.php:1797
+#: include/functions.php:1801
 msgid "Archived articles"
 msgstr "Archivierte Artikel"
 
-#: include/functions.php:1799
+#: include/functions.php:1803
 msgid "Recently read"
 msgstr "Kürzlich gelesen"
 
-#: include/functions.php:1866
+#: include/functions.php:1870
 msgid "Navigation"
 msgstr "Navigation"
 
-#: include/functions.php:1867
+#: include/functions.php:1871
 msgid "Open next feed"
 msgstr "Nächsten Feed öffnen"
 
-#: include/functions.php:1868
+#: include/functions.php:1872
 msgid "Open previous feed"
 msgstr "Vorherigen Feed öffnen"
 
-#: include/functions.php:1869
+#: include/functions.php:1873
 msgid "Open next article"
 msgstr "Nächsten Artikel öffnen"
 
-#: include/functions.php:1870
+#: include/functions.php:1874
 msgid "Open previous article"
 msgstr "Vorherigen Artikel öffnen"
 
-#: include/functions.php:1871
+#: include/functions.php:1875
 msgid "Open next article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1872
+#: include/functions.php:1876
 msgid "Open previous article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1873
+#: include/functions.php:1877
 msgid "Show search dialog"
 msgstr "Suchdialog anzeigen"
 
-#: include/functions.php:1874
+#: include/functions.php:1878
 msgid "Article"
 msgstr "Artikel"
 
-#: include/functions.php:1875
+#: include/functions.php:1879
 msgid "Toggle starred"
 msgstr "Markierung umschalten"
 
-#: include/functions.php:1876
+#: include/functions.php:1880
 msgid "Toggle published"
 msgstr "Veröffentlicht umschalten"
 
-#: include/functions.php:1877
+#: include/functions.php:1881
 msgid "Toggle unread"
 msgstr "Gelesen umschalten"
 
-#: include/functions.php:1878
+#: include/functions.php:1882
 msgid "Edit tags"
 msgstr "Tags bearbeiten"
 
-#: include/functions.php:1879
+#: include/functions.php:1883
 #, fuzzy
 msgid "Dismiss selected"
 msgstr "Ausgewählte Artikel verbergen"
 
-#: include/functions.php:1880
+#: include/functions.php:1884
 #, fuzzy
 msgid "Dismiss read"
 msgstr "Gelesene Artikel verbergen"
 
-#: include/functions.php:1881
+#: include/functions.php:1885
 #, fuzzy
 msgid "Open in new window"
 msgstr "In neuem Fenster öffnen"
 
-#: include/functions.php:1882 js/viewfeed.js:1758
+#: include/functions.php:1886 js/viewfeed.js:1798
 msgid "Mark below as read"
 msgstr "Untere als gelesen markieren"
 
-#: include/functions.php:1883 js/viewfeed.js:1752
+#: include/functions.php:1887 js/viewfeed.js:1792
 msgid "Mark above as read"
 msgstr "Obige als gelesen markieren"
 
-#: include/functions.php:1884
+#: include/functions.php:1888
 msgid "Scroll down"
 msgstr "Nach unten scrollen"
 
-#: include/functions.php:1885
+#: include/functions.php:1889
 msgid "Scroll up"
 msgstr "Nach oben scrollen"
 
-#: include/functions.php:1886
+#: include/functions.php:1890
 #, fuzzy
 msgid "Select article under cursor"
 msgstr "Artikel unter Mauszeiger auswählen"
 
-#: include/functions.php:1887
+#: include/functions.php:1891
 msgid "Email article"
 msgstr "Artikel per E-Mail versenden"
 
-#: include/functions.php:1888 plugins/close_button/init.php:24
-msgid "Close article"
+#: include/functions.php:1892
+#, fuzzy
+msgid "Close/collapse article"
 msgstr "Artikel schließen"
 
-#: include/functions.php:1890
+#: include/functions.php:1894
 msgid "Article selection"
 msgstr "Artikelauswahl"
 
-#: include/functions.php:1891
+#: include/functions.php:1895
 msgid "Select all articles"
 msgstr "Alle Artikel auswählen"
 
-#: include/functions.php:1892
+#: include/functions.php:1896
 msgid "Select unread"
 msgstr "Ungelesene Artikel auswählen"
 
-#: include/functions.php:1893
+#: include/functions.php:1897
 msgid "Select starred"
 msgstr "Markierte Artikel auswählen"
 
-#: include/functions.php:1894
+#: include/functions.php:1898
 msgid "Select published"
 msgstr "Veröffentlichte Artikel auswählen"
 
-#: include/functions.php:1895
+#: include/functions.php:1899
 #, fuzzy
 msgid "Invert selection"
 msgstr "Artikelauswahl umkehren"
 
-#: include/functions.php:1896
+#: include/functions.php:1900
 msgid "Deselect everything"
 msgstr "Auswahl aufheben"
 
-#: include/functions.php:1897 classes/pref/feeds.php:488
+#: include/functions.php:1901 classes/pref/feeds.php:488
 #: classes/pref/feeds.php:719
 msgid "Feed"
 msgstr "Feed"
 
-#: include/functions.php:1898
+#: include/functions.php:1902
 #, fuzzy
 msgid "Refresh current feed"
 msgstr "Feed aktualisieren"
 
-#: include/functions.php:1899
+#: include/functions.php:1903
 msgid "Un/hide read feeds"
 msgstr "Gelesene zeigen/verstecken"
 
-#: include/functions.php:1900 classes/pref/feeds.php:1240
+#: include/functions.php:1904 classes/pref/feeds.php:1240
 msgid "Subscribe to feed"
 msgstr "Feed abonnieren"
 
-#: include/functions.php:1901 js/FeedTree.js:135 js/PrefFeedTree.js:67
+#: include/functions.php:1905 js/FeedTree.js:135 js/PrefFeedTree.js:67
 msgid "Edit feed"
 msgstr "Feed bearbeiten"
 
-#: include/functions.php:1903
+#: include/functions.php:1907
 #, fuzzy
 msgid "Reverse headlines"
 msgstr "Schlagzeilensortierung umkehren"
 
-#: include/functions.php:1904
+#: include/functions.php:1908
 msgid "Debug feed update"
 msgstr "Aktualisierung im Diagnose-Modus durchführen"
 
-#: include/functions.php:1905 js/FeedTree.js:177
+#: include/functions.php:1909 js/FeedTree.js:177
 msgid "Mark all feeds as read"
 msgstr "Alle Feeds als gelesen markieren"
 
-#: include/functions.php:1906
+#: include/functions.php:1910
 msgid "Un/collapse current category"
 msgstr "Aktuelle Kategorie ein-/ausklappen:"
 
-#: include/functions.php:1907
+#: include/functions.php:1911
 msgid "Toggle combined mode"
 msgstr "Kombinierte Feed-Anzeige umschalten"
 
-#: include/functions.php:1908
+#: include/functions.php:1912
 #, fuzzy
 msgid "Go to"
 msgstr "Gehe zu..."
 
-#: include/functions.php:1910
+#: include/functions.php:1914
 msgid "Fresh"
 msgstr "Neu"
 
-#: include/functions.php:1913
+#: include/functions.php:1917
 msgid "Tag cloud"
 msgstr "Tagwolke"
 
-#: include/functions.php:1915
+#: include/functions.php:1919
 msgid "Other"
 msgstr "Sonstiges"
 
-#: include/functions.php:1916 classes/pref/labels.php:281
+#: include/functions.php:1920 classes/pref/labels.php:281
 msgid "Create label"
 msgstr "Label erstellen"
 
-#: include/functions.php:1917 classes/pref/filters.php:587
+#: include/functions.php:1921 classes/pref/filters.php:587
 msgid "Create filter"
 msgstr "Filter erstellen"
 
-#: include/functions.php:1918
+#: include/functions.php:1922
 #, fuzzy
 msgid "Un/collapse sidebar"
 msgstr "Seitenleiste ein-/ausklappen"
 
-#: include/functions.php:1919
+#: include/functions.php:1923
 msgid "Show help dialog"
 msgstr "Hilfe anzeigen"
 
-#: include/functions.php:2401
+#: include/functions.php:2405
 #, php-format
 msgid "Search results: %s"
 msgstr "Suchergebnisse: %s"
 
-#: include/functions.php:2886 js/viewfeed.js:1845
+#: include/functions.php:2892 js/viewfeed.js:1885
 msgid "Click to play"
 msgstr "Zum Abspielen klicken"
 
-#: include/functions.php:2887 js/viewfeed.js:1844
+#: include/functions.php:2893 js/viewfeed.js:1884
 msgid "Play"
 msgstr "Abspielen"
 
-#: include/functions.php:3007
+#: include/functions.php:3014
 msgid " - "
 msgstr " - "
 
-#: include/functions.php:3029 include/functions.php:3346 classes/rpc.php:360
+#: include/functions.php:3036 include/functions.php:3353 classes/rpc.php:360
 msgid "no tags"
 msgstr "Keine Tags"
 
-#: include/functions.php:3039 classes/feeds.php:650
+#: include/functions.php:3046 classes/feeds.php:653
 msgid "Edit tags for this article"
 msgstr "Tags für diesen Artikel bearbeiten"
 
-#: include/functions.php:3068 classes/feeds.php:605
+#: include/functions.php:3075 classes/feeds.php:608
 msgid "Originally from:"
 msgstr "Original von:"
 
-#: include/functions.php:3081 classes/feeds.php:618 classes/pref/feeds.php:507
+#: include/functions.php:3088 classes/feeds.php:621 classes/pref/feeds.php:507
 msgid "Feed URL"
 msgstr "Feed URL"
 
-#: include/functions.php:3110
+#: include/functions.php:3117
 msgid "Related"
 msgstr "Ähnlich"
 
-#: include/functions.php:3137 classes/dlg.php:43 classes/dlg.php:162
+#: include/functions.php:3144 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:1553
 #: classes/pref/feeds.php:1624 plugins/import_export/init.php:407
 #: plugins/import_export/init.php:431 plugins/share/init.php:67
-#: plugins/updater/init.php:329
+#: plugins/updater/init.php:330
 msgid "Close this window"
 msgstr "Fenster schließen"
 
-#: include/functions.php:3371
+#: include/functions.php:3378
 msgid "(edit note)"
 msgstr "(Notiz bearbeiten)"
 
-#: include/functions.php:3604
+#: include/functions.php:3611
 msgid "unknown type"
 msgstr "unbekannter Typ"
 
-#: include/functions.php:3654
+#: include/functions.php:3661
 msgid "Attachments"
 msgstr "Anhänge:"
 
@@ -930,7 +931,7 @@ msgstr "Artikel veröffentlichen"
 msgid "Assign tags"
 msgstr "Tags zuweisen"
 
-#: include/localized_schema.php:14 js/viewfeed.js:1809
+#: include/localized_schema.php:14 js/viewfeed.js:1849
 msgid "Assign label"
 msgstr "Label zuweisen"
 
@@ -1379,7 +1380,7 @@ msgstr "Authentifizierung"
 msgid "Login"
 msgstr "Benutzername"
 
-#: classes/dlg.php:276 classes/dlg.php:732 classes/pref/prefs.php:196
+#: classes/dlg.php:276 classes/dlg.php:732 classes/pref/prefs.php:202
 #: classes/pref/feeds.php:569 classes/pref/feeds.php:793
 msgid "Password"
 msgstr "Passwort"
@@ -1479,7 +1480,7 @@ msgstr "Als RSS anzeigen"
 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:591 plugins/updater/init.php:303
+#: classes/dlg.php:591 plugins/updater/init.php:304
 #, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "Neue Version von Tiny Tiny RSS verfügbar (%s)."
@@ -1612,7 +1613,7 @@ msgstr "Per E-Mail weiterleiten"
 msgid "Feed:"
 msgstr "Feed:"
 
-#: classes/feeds.php:201 classes/feeds.php:795
+#: classes/feeds.php:201 classes/feeds.php:798
 msgid "Feed not found."
 msgstr "Feed nicht gefunden."
 
@@ -1620,19 +1621,24 @@ msgstr "Feed nicht gefunden."
 msgid "mark as read"
 msgstr "als gelesen markieren"
 
-#: classes/feeds.php:696
+#: classes/feeds.php:553
+#, fuzzy
+msgid "Collapse article"
+msgstr "Artikel schließen"
+
+#: classes/feeds.php:699
 msgid "No unread articles found to display."
 msgstr "Keine ungelesenen Artikel zum Anzeigen gefunden."
 
-#: classes/feeds.php:699
+#: classes/feeds.php:702
 msgid "No updated articles found to display."
 msgstr "Keine aktualisierten Artikel zum Anzeigen gefunden."
 
-#: classes/feeds.php:702
+#: classes/feeds.php:705
 msgid "No starred articles found to display."
 msgstr "Keine markierten Artikel zum Anzeigen gefunden."
 
-#: classes/feeds.php:706
+#: classes/feeds.php:709
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
@@ -1640,20 +1646,20 @@ 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:708
+#: classes/feeds.php:711
 msgid "No articles found to display."
 msgstr "Keine Artikel zum Anzeigen gefunden."
 
-#: classes/feeds.php:723 classes/feeds.php:904
+#: classes/feeds.php:726 classes/feeds.php:907
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "Feeds zuletzt aktualisiert am %s"
 
-#: classes/feeds.php:733 classes/feeds.php:914
+#: classes/feeds.php:736 classes/feeds.php:917
 msgid "Some feeds have update errors (click for details)"
 msgstr "Einige Feeds haben Aktualisierungsfehler (klicken für Details)"
 
-#: classes/feeds.php:894
+#: classes/feeds.php:897
 msgid "No feed selected."
 msgstr "Kein Feed ausgewählt."
 
@@ -1979,76 +1985,76 @@ msgstr "Die eingegebenen Passwörter stimmen nicht überein."
 msgid "Function not supported by authentication module."
 msgstr ""
 
-#: classes/pref/prefs.php:63
+#: classes/pref/prefs.php:69
 msgid "The configuration was saved."
 msgstr "Die Einstellungen wurden gespeichert."
 
-#: classes/pref/prefs.php:77
+#: classes/pref/prefs.php:83
 #, php-format
 msgid "Unknown option: %s"
 msgstr "Unbekannte Option: %s"
 
-#: classes/pref/prefs.php:91
+#: classes/pref/prefs.php:97
 msgid "Your personal data has been saved."
 msgstr "Ihre persönlichen Daten wurden gespeichert."
 
-#: classes/pref/prefs.php:131
+#: classes/pref/prefs.php:137
 msgid "Personal data / Authentication"
 msgstr "Persönliche Daten / Anmeldung"
 
-#: classes/pref/prefs.php:151
+#: classes/pref/prefs.php:157
 msgid "Personal data"
 msgstr "Persönliche Daten"
 
-#: classes/pref/prefs.php:161
+#: classes/pref/prefs.php:167
 msgid "Full name"
 msgstr "Vollständiger Name"
 
-#: classes/pref/prefs.php:165
+#: classes/pref/prefs.php:171
 msgid "E-mail"
 msgstr "E-Mail"
 
-#: classes/pref/prefs.php:171
+#: classes/pref/prefs.php:177
 msgid "Access level"
 msgstr "Zugriffsberechtigung"
 
-#: classes/pref/prefs.php:181
+#: classes/pref/prefs.php:187
 msgid "Save data"
 msgstr "Speichern"
 
-#: classes/pref/prefs.php:203
+#: classes/pref/prefs.php:209
 msgid "Your password is at default value, please change it."
 msgstr "Sie nutzen das Standard Passwort, bitte ändern Sie es."
 
-#: classes/pref/prefs.php:235
+#: classes/pref/prefs.php:241
 msgid "Old password"
 msgstr "Altes Passwort"
 
-#: classes/pref/prefs.php:238
+#: classes/pref/prefs.php:244
 msgid "New password"
 msgstr "Neues Passwort"
 
-#: classes/pref/prefs.php:243
+#: classes/pref/prefs.php:249
 msgid "Confirm password"
 msgstr "Passwort bestätigen"
 
-#: classes/pref/prefs.php:253
+#: classes/pref/prefs.php:259
 msgid "Change password"
 msgstr "Passwort ändern"
 
-#: classes/pref/prefs.php:259
+#: classes/pref/prefs.php:265
 msgid "One time passwords / Authenticator"
 msgstr "Einmalpasswörter (OTP) / Authentifikator"
 
-#: classes/pref/prefs.php:288 classes/pref/prefs.php:339
+#: classes/pref/prefs.php:294 classes/pref/prefs.php:345
 msgid "Enter your password"
 msgstr "Geben Sie Ihr Passwort ein"
 
-#: classes/pref/prefs.php:299
+#: classes/pref/prefs.php:305
 msgid "Disable OTP"
 msgstr "Einmalpasswörter ausschalten"
 
-#: classes/pref/prefs.php:305
+#: classes/pref/prefs.php:311
 msgid ""
 "You will need a compatible Authenticator to use this. Changing your password "
 "would automatically disable OTP."
@@ -2056,101 +2062,92 @@ msgstr ""
 "Sie benötigen einen kompatiblen Authentifikator. Sollten Sie Ihr Passwort "
 "ändern, wird diese Funktion automatisch ausgeschaltet."
 
-#: classes/pref/prefs.php:307
+#: classes/pref/prefs.php:313
 msgid "Scan the following code by the Authenticator application:"
 msgstr "Scannen Sie den folgenden Code mit Ihrem Authentifikator:"
 
-#: classes/pref/prefs.php:348
+#: classes/pref/prefs.php:354
 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:356
+#: classes/pref/prefs.php:362
 msgid "Enable OTP"
 msgstr "Einmalpasswörter einschalten"
 
-#: classes/pref/prefs.php:482
+#: classes/pref/prefs.php:493
 msgid "Customize"
 msgstr "Anpassen"
 
-#: classes/pref/prefs.php:501 classes/pref/prefs.php:508
-#: classes/pref/prefs.php:513
-msgid "Yes"
-msgstr "Ja"
-
-#: classes/pref/prefs.php:503 classes/pref/prefs.php:513
-msgid "No"
-msgstr "Nein"
-
-#: classes/pref/prefs.php:543
+#: classes/pref/prefs.php:552
 msgid "Register"
 msgstr "Registrieren"
 
-#: classes/pref/prefs.php:547
+#: classes/pref/prefs.php:556
 msgid "Clear"
 msgstr "Löschen"
 
-#: classes/pref/prefs.php:553
+#: classes/pref/prefs.php:562
 #, php-format
 msgid "Current server time: %s (UTC)"
 msgstr "Aktuelle Serverzeit: %s (UTC)"
 
-#: classes/pref/prefs.php:582
+#: classes/pref/prefs.php:595
 msgid "Save configuration"
 msgstr "Einstellungen speichern"
 
-#: classes/pref/prefs.php:585
+#: classes/pref/prefs.php:598
 msgid "Manage profiles"
 msgstr "Profile verwalten"
 
-#: classes/pref/prefs.php:588
+#: classes/pref/prefs.php:601
 msgid "Reset to defaults"
 msgstr "Auf Standardwerte zurücksetzen"
 
-#: classes/pref/prefs.php:600
+#: classes/pref/prefs.php:613
 msgid "Show additional preferences"
 msgstr "Erweiterte Einstellungen zeigen"
 
-#: classes/pref/prefs.php:612 classes/pref/prefs.php:614
+#: classes/pref/prefs.php:625 classes/pref/prefs.php:627
 #, fuzzy
 msgid "Plugins"
 msgstr "Benutzer-Plugins"
 
-#: classes/pref/prefs.php:642
+#: classes/pref/prefs.php:655
 #, fuzzy
 msgid "System plugins"
 msgstr "Benutzer-Plugins"
 
-#: classes/pref/prefs.php:646 classes/pref/prefs.php:695
+#: classes/pref/prefs.php:659 classes/pref/prefs.php:708
 msgid "Plugin"
 msgstr ""
 
-#: classes/pref/prefs.php:647 classes/pref/prefs.php:696
+#: classes/pref/prefs.php:660 classes/pref/prefs.php:709
 msgid "Description"
 msgstr ""
 
-#: classes/pref/prefs.php:648 classes/pref/prefs.php:697
+#: classes/pref/prefs.php:661 classes/pref/prefs.php:710
 msgid "Version"
 msgstr ""
 
-#: classes/pref/prefs.php:649 classes/pref/prefs.php:698
+#: classes/pref/prefs.php:662 classes/pref/prefs.php:711
 msgid "Author"
 msgstr "Autor"
 
-#: classes/pref/prefs.php:682 classes/pref/prefs.php:733
+#: classes/pref/prefs.php:695 classes/pref/prefs.php:746
 msgid "Clear data"
 msgstr "Feed-Daten löschen"
 
-#: classes/pref/prefs.php:691
+#: classes/pref/prefs.php:704
 msgid "User plugins"
 msgstr "Benutzer-Plugins"
 
-#: classes/pref/prefs.php:748
+#: classes/pref/prefs.php:761
 msgid "Enable selected plugins"
 msgstr "Ausgewählte Plugins aktivieren"
 
-#: classes/pref/prefs.php:803 classes/pref/prefs.php:821
+#: classes/pref/prefs.php:816 classes/pref/prefs.php:834
 msgid "Incorrect password"
 msgstr "Falsches Passwort"
 
@@ -2430,6 +2427,10 @@ msgstr "Hallo,"
 msgid "Regular version"
 msgstr "Reguläre Version"
 
+#: plugins/close_button/init.php:24
+msgid "Close article"
+msgstr "Artikel schließen"
+
 #: plugins/nsfw/init.php:32 plugins/nsfw/init.php:43
 msgid "Not work safe (click to toggle)"
 msgstr ""
@@ -2662,26 +2663,26 @@ msgstr "Artikel flattrn"
 msgid "Share on Google+"
 msgstr "Auf Google+ teilen"
 
-#: plugins/updater/init.php:294 plugins/updater/init.php:306
+#: plugins/updater/init.php:295 plugins/updater/init.php:307
 #: plugins/updater/updater.js:10
 msgid "Update Tiny Tiny RSS"
 msgstr "Tiny Tiny RSS updaten"
 
-#: plugins/updater/init.php:309
+#: plugins/updater/init.php:310
 msgid "Your Tiny Tiny RSS installation is up to date."
 msgstr "Tiny Tiny RSS ist auf dem neuesten Stand."
 
-#: plugins/updater/init.php:319
+#: plugins/updater/init.php:320
 msgid ""
 "Do not close this dialog until updating is finished. Backup your tt-rss "
 "directory before continuing."
 msgstr ""
 
-#: plugins/updater/init.php:322
+#: plugins/updater/init.php:323
 msgid "Ready to update."
 msgstr "Bereit zum Updaten."
 
-#: plugins/updater/init.php:327
+#: plugins/updater/init.php:328
 msgid "Start update"
 msgstr "Starte Iüdate"
 
@@ -2790,7 +2791,7 @@ msgstr "Bitte geben Sie den Kategorietitel ein:"
 msgid "Generate new syndication address for this feed?"
 msgstr "Neue Veröffentlichungsadresse für diesen Feed erzeugen?"
 
-#: js/functions.js:1597 js/tt-rss.js:350 js/tt-rss.js:721
+#: js/functions.js:1597 js/tt-rss.js:350 js/tt-rss.js:729
 msgid "You can't edit this kind of feed."
 msgstr "Sie können diese Art von Feed nicht bearbeiten."
 
@@ -3048,11 +3049,11 @@ msgstr "Sie können diese Art von Feed nicht neu bewerten."
 msgid "Rescore articles in %s?"
 msgstr "Artikel in %s neu bewerten?"
 
-#: js/tt-rss.js:680
+#: js/tt-rss.js:688
 msgid "Please enable mail plugin first."
 msgstr "Bitte erst das Mail-Plugin aktivieren."
 
-#: js/tt-rss.js:842
+#: js/tt-rss.js:850
 msgid "New version available!"
 msgstr "Neue Version verfügbar!"
 
@@ -3077,7 +3078,7 @@ msgstr "Artikelveröffentlichung widerrufen"
 
 #: 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/mailto/init.js:7
+#: js/viewfeed.js:1053 js/viewfeed.js:1967 plugins/mailto/init.js:7
 #: plugins/mail/mail.js:7
 msgid "No articles are selected."
 msgstr "Keine Artikel ausgewählt."
@@ -3122,27 +3123,27 @@ msgstr "Keine Artikel zum markieren gefunden."
 msgid "Mark %d article(s) as read?"
 msgstr "%d Artikel als gelesen markieren?"
 
-#: js/viewfeed.js:1744
+#: js/viewfeed.js:1784
 msgid "Open original article"
 msgstr "Originalartikel öffnen"
 
-#: js/viewfeed.js:1814
+#: js/viewfeed.js:1854
 msgid "Remove label"
 msgstr "Ausgewähltes Label entfernen?"
 
-#: js/viewfeed.js:1838
+#: js/viewfeed.js:1878
 msgid "Playing..."
 msgstr "Abspielen..."
 
-#: js/viewfeed.js:1839
+#: js/viewfeed.js:1879
 msgid "Click to pause"
 msgstr "Zum Pausieren klicken"
 
-#: js/viewfeed.js:1896
+#: js/viewfeed.js:1936
 msgid "Please enter new score for selected articles:"
 msgstr "Bitte geben Sie eine Bewertung für den ausgewählten Artikel ab:"
 
-#: js/viewfeed.js:1938
+#: js/viewfeed.js:1978
 msgid "Please enter new score for this article:"
 msgstr "Bitte geben Sie eine Bewertung für diesen Artikel ab:"
 
@@ -3225,6 +3226,12 @@ msgid ""
 "before continuing. Please type 'yes' to continue."
 msgstr ""
 
+#~ msgid "Yes"
+#~ msgstr "Ja"
+
+#~ msgid "No"
+#~ msgstr "Nein"
+
 #~ msgid "Comments?"
 #~ msgstr "Kommentare?"
 
diff --git a/locale/es_ES/LC_MESSAGES/messages.mo b/locale/es_ES/LC_MESSAGES/messages.mo
index fc80e9210..b31384c42 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 124c2e7ee..1f91eb1f5 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-19 22:42+0400\n"
+"POT-Creation-Date: 2013-03-20 10:24+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"
@@ -294,11 +294,11 @@ msgstr "Adaptable"
 msgid "All Articles"
 msgstr "Todos"
 
-#: index.php:169 include/functions.php:1911 classes/feeds.php:106
+#: index.php:169 include/functions.php:1915 classes/feeds.php:106
 msgid "Starred"
 msgstr "Favoritos"
 
-#: index.php:170 include/functions.php:1912 classes/feeds.php:107
+#: index.php:170 include/functions.php:1916 classes/feeds.php:107
 msgid "Published"
 msgstr "Publicados"
 
@@ -338,7 +338,7 @@ msgstr "Puntuación"
 msgid "Update"
 msgstr "Actualizar"
 
-#: index.php:191 index.php:221 include/functions.php:1902
+#: index.php:191 index.php:221 include/functions.php:1906
 #: include/localized_schema.php:10 classes/feeds.php:111 classes/feeds.php:136
 #: classes/feeds.php:408 js/FeedTree.js:128 js/FeedTree.js:156
 #: plugins/digest/digest.js:630
@@ -399,7 +399,7 @@ msgstr "Modo resumen..."
 msgid "Show tag cloud..."
 msgstr "Nube de etiquetas..."
 
-#: index.php:229 include/functions.php:1889
+#: index.php:229 include/functions.php:1893
 #, fuzzy
 msgid "Toggle widescreen mode"
 msgstr "Cambiar a modo de reordenación de categorías"
@@ -425,8 +425,8 @@ msgstr "Ayuda para atajos de teclado"
 msgid "Logout"
 msgstr "Cerrar sesión"
 
-#: prefs.php:28 prefs.php:99 include/functions.php:1914
-#: classes/pref/prefs.php:371
+#: prefs.php:28 prefs.php:99 include/functions.php:1918
+#: classes/pref/prefs.php:377
 msgid "Preferences"
 msgstr "Preferencias"
 
@@ -447,8 +447,8 @@ msgstr "Fuentes"
 msgid "Filters"
 msgstr "Filtros"
 
-#: prefs.php:108 mobile/mobile-functions.php:205 include/functions.php:1117
-#: include/functions.php:1738 classes/pref/labels.php:90
+#: prefs.php:108 mobile/mobile-functions.php:205 include/functions.php:1121
+#: include/functions.php:1742 classes/pref/labels.php:90
 msgid "Labels"
 msgstr "Marcadores"
 
@@ -546,8 +546,8 @@ msgstr "Abrir versión estándar"
 msgid "Home"
 msgstr "Página principal"
 
-#: mobile/mobile-functions.php:178 include/functions.php:1115
-#: include/functions.php:1736
+#: mobile/mobile-functions.php:178 include/functions.php:1119
+#: include/functions.php:1740
 msgid "Special"
 msgstr "Especial"
 
@@ -589,9 +589,9 @@ msgstr "Ordenar fuentes por número de artículos sin leer"
 msgid "Reverse headline order (oldest first)"
 msgstr "Invertir el orden de los titulares (los más antiguos primero)"
 
-#: include/digest.php:131 include/functions.php:1126
-#: include/functions.php:1639 include/functions.php:1724
-#: include/functions.php:1746 classes/opml.php:416 classes/pref/feeds.php:188
+#: include/digest.php:131 include/functions.php:1130
+#: include/functions.php:1643 include/functions.php:1728
+#: include/functions.php:1750 classes/opml.php:416 classes/pref/feeds.php:188
 msgid "Uncategorized"
 msgstr "Sin clasificar"
 
@@ -604,314 +604,315 @@ msgstr "%d artículos archivados"
 msgid "No feeds found."
 msgstr "No se han encontrado fuentes."
 
-#: include/functions.php:697
+#: include/functions.php:701
 msgid "Session failed to validate (incorrect IP)"
 msgstr "No se pudo validar la sesión (IP incorrecta)"
 
-#: include/functions.php:1588 classes/dlg.php:371 classes/pref/filters.php:368
+#: include/functions.php:1592 classes/dlg.php:371 classes/pref/filters.php:368
 msgid "All feeds"
 msgstr "Todas las fuentes"
 
-#: include/functions.php:1789
+#: include/functions.php:1793
 msgid "Starred articles"
 msgstr "Favoritos"
 
-#: include/functions.php:1791
+#: include/functions.php:1795
 msgid "Published articles"
 msgstr "Publicados"
 
-#: include/functions.php:1793
+#: include/functions.php:1797
 msgid "Fresh articles"
 msgstr "Recientes"
 
-#: include/functions.php:1795 include/functions.php:1909
+#: include/functions.php:1799 include/functions.php:1913
 msgid "All articles"
 msgstr "Todos"
 
-#: include/functions.php:1797
+#: include/functions.php:1801
 msgid "Archived articles"
 msgstr "Artículos archivados"
 
-#: include/functions.php:1799
+#: include/functions.php:1803
 msgid "Recently read"
 msgstr "Leídos recientemente"
 
-#: include/functions.php:1866
+#: include/functions.php:1870
 msgid "Navigation"
 msgstr "Navegación"
 
-#: include/functions.php:1867
+#: include/functions.php:1871
 #, fuzzy
 msgid "Open next feed"
 msgstr "Fuente generada"
 
-#: include/functions.php:1868
+#: include/functions.php:1872
 msgid "Open previous feed"
 msgstr ""
 
-#: include/functions.php:1869
+#: include/functions.php:1873
 #, fuzzy
 msgid "Open next article"
 msgstr "Abrir artículo original"
 
-#: include/functions.php:1870
+#: include/functions.php:1874
 #, fuzzy
 msgid "Open previous article"
 msgstr "Abrir artículo original"
 
-#: include/functions.php:1871
+#: include/functions.php:1875
 msgid "Open next article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1872
+#: include/functions.php:1876
 msgid "Open previous article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1873
+#: include/functions.php:1877
 msgid "Show search dialog"
 msgstr "Mostrar el diálogo de búsqueda"
 
-#: include/functions.php:1874
+#: include/functions.php:1878
 #, fuzzy
 msgid "Article"
 msgstr "Todos"
 
-#: include/functions.php:1875
+#: include/functions.php:1879
 msgid "Toggle starred"
 msgstr "Alternar favoritos"
 
-#: include/functions.php:1876
+#: include/functions.php:1880
 msgid "Toggle published"
 msgstr "Alternar publicados"
 
-#: include/functions.php:1877
+#: include/functions.php:1881
 msgid "Toggle unread"
 msgstr "Alternar no leídos"
 
-#: include/functions.php:1878
+#: include/functions.php:1882
 msgid "Edit tags"
 msgstr "Editar etiquetas"
 
-#: include/functions.php:1879
+#: include/functions.php:1883
 #, fuzzy
 msgid "Dismiss selected"
 msgstr "Descartar artículos seleccionados"
 
-#: include/functions.php:1880
+#: include/functions.php:1884
 #, fuzzy
 msgid "Dismiss read"
 msgstr "Publicar artículo"
 
-#: include/functions.php:1881
+#: include/functions.php:1885
 #, fuzzy
 msgid "Open in new window"
 msgstr "Abrir el artículo en una nueva pestaña o ventana"
 
-#: include/functions.php:1882 js/viewfeed.js:1758
+#: include/functions.php:1886 js/viewfeed.js:1798
 msgid "Mark below as read"
 msgstr "Marcar artículos posteriores como leídos"
 
-#: include/functions.php:1883 js/viewfeed.js:1752
+#: include/functions.php:1887 js/viewfeed.js:1792
 msgid "Mark above as read"
 msgstr "Marcar artículos anteriores como leídos"
 
-#: include/functions.php:1884
+#: include/functions.php:1888
 #, fuzzy
 msgid "Scroll down"
 msgstr "Hecho."
 
-#: include/functions.php:1885
+#: include/functions.php:1889
 msgid "Scroll up"
 msgstr ""
 
-#: include/functions.php:1886
+#: include/functions.php:1890
 #, fuzzy
 msgid "Select article under cursor"
 msgstr "Seleccionar el artículo que esté bajo el cursor del ratón"
 
-#: include/functions.php:1887
+#: include/functions.php:1891
 msgid "Email article"
 msgstr "Enviar artículo por correo"
 
-#: include/functions.php:1888 plugins/close_button/init.php:24
-msgid "Close article"
+#: include/functions.php:1892
+#, fuzzy
+msgid "Close/collapse article"
 msgstr "Cerrar artículo"
 
-#: include/functions.php:1890
+#: include/functions.php:1894
 #, fuzzy
 msgid "Article selection"
 msgstr "Invertir selección de artículos"
 
-#: include/functions.php:1891
+#: include/functions.php:1895
 msgid "Select all articles"
 msgstr "Seleccionar todos los artículos"
 
-#: include/functions.php:1892
+#: include/functions.php:1896
 #, fuzzy
 msgid "Select unread"
 msgstr "Seleccionar artículos sin leer"
 
-#: include/functions.php:1893
+#: include/functions.php:1897
 #, fuzzy
 msgid "Select starred"
 msgstr "Marcar como favorito"
 
-#: include/functions.php:1894
+#: include/functions.php:1898
 #, fuzzy
 msgid "Select published"
 msgstr "Seleccionar artículos publicados"
 
-#: include/functions.php:1895
+#: include/functions.php:1899
 #, fuzzy
 msgid "Invert selection"
 msgstr "Invertir selección de artículos"
 
-#: include/functions.php:1896
+#: include/functions.php:1900
 #, fuzzy
 msgid "Deselect everything"
 msgstr "Deseleccionar todos los artículos"
 
-#: include/functions.php:1897 classes/pref/feeds.php:488
+#: include/functions.php:1901 classes/pref/feeds.php:488
 #: classes/pref/feeds.php:719
 msgid "Feed"
 msgstr "Fuente"
 
-#: include/functions.php:1898
+#: include/functions.php:1902
 #, fuzzy
 msgid "Refresh current feed"
 msgstr "Actualizar la fuente activa"
 
-#: include/functions.php:1899
+#: include/functions.php:1903
 #, fuzzy
 msgid "Un/hide read feeds"
 msgstr "Ocultar/Mostrar fuentes leídas"
 
-#: include/functions.php:1900 classes/pref/feeds.php:1240
+#: include/functions.php:1904 classes/pref/feeds.php:1240
 msgid "Subscribe to feed"
 msgstr "Suscribirse a una fuente"
 
-#: include/functions.php:1901 js/FeedTree.js:135 js/PrefFeedTree.js:67
+#: include/functions.php:1905 js/FeedTree.js:135 js/PrefFeedTree.js:67
 msgid "Edit feed"
 msgstr "Editar fuente"
 
-#: include/functions.php:1903
+#: include/functions.php:1907
 #, fuzzy
 msgid "Reverse headlines"
 msgstr "Invertir orden de titulares"
 
-#: include/functions.php:1904
+#: include/functions.php:1908
 #, fuzzy
 msgid "Debug feed update"
 msgstr "Se han actualizado todas las fuentes."
 
-#: include/functions.php:1905 js/FeedTree.js:177
+#: include/functions.php:1909 js/FeedTree.js:177
 msgid "Mark all feeds as read"
 msgstr "Marcar todas las fuentes como leídas"
 
-#: include/functions.php:1906
+#: include/functions.php:1910
 #, fuzzy
 msgid "Un/collapse current category"
 msgstr "Plegar la categoría"
 
-#: include/functions.php:1907
+#: include/functions.php:1911
 #, fuzzy
 msgid "Toggle combined mode"
 msgstr "Cambiar a modo de reordenación de categorías"
 
-#: include/functions.php:1908
+#: include/functions.php:1912
 #, fuzzy
 msgid "Go to"
 msgstr "Ir a..."
 
-#: include/functions.php:1910
+#: include/functions.php:1914
 #, fuzzy
 msgid "Fresh"
 msgstr "Refrescar"
 
-#: include/functions.php:1913
+#: include/functions.php:1917
 msgid "Tag cloud"
 msgstr "Nube de etiquetas"
 
-#: include/functions.php:1915
+#: include/functions.php:1919
 #, fuzzy
 msgid "Other"
 msgstr "Otro:"
 
-#: include/functions.php:1916 classes/pref/labels.php:281
+#: include/functions.php:1920 classes/pref/labels.php:281
 msgid "Create label"
 msgstr "Crear marcador"
 
-#: include/functions.php:1917 classes/pref/filters.php:587
+#: include/functions.php:1921 classes/pref/filters.php:587
 msgid "Create filter"
 msgstr "Crear filtro"
 
-#: include/functions.php:1918
+#: include/functions.php:1922
 #, fuzzy
 msgid "Un/collapse sidebar"
 msgstr "Colapsar la barra lateral"
 
-#: include/functions.php:1919
+#: include/functions.php:1923
 #, fuzzy
 msgid "Show help dialog"
 msgstr "Mostrar el diálogo de búsqueda"
 
-#: include/functions.php:2401
+#: include/functions.php:2405
 #, php-format
 msgid "Search results: %s"
 msgstr "Resultados de búsqueda: %s"
 
-#: include/functions.php:2886 js/viewfeed.js:1845
+#: include/functions.php:2892 js/viewfeed.js:1885
 msgid "Click to play"
 msgstr "Clic para reproducir"
 
-#: include/functions.php:2887 js/viewfeed.js:1844
+#: include/functions.php:2893 js/viewfeed.js:1884
 msgid "Play"
 msgstr "Reproducir"
 
-#: include/functions.php:3007
+#: include/functions.php:3014
 msgid " - "
 msgstr " - "
 
-#: include/functions.php:3029 include/functions.php:3346 classes/rpc.php:360
+#: include/functions.php:3036 include/functions.php:3353 classes/rpc.php:360
 msgid "no tags"
 msgstr "sin etiquetas"
 
-#: include/functions.php:3039 classes/feeds.php:650
+#: include/functions.php:3046 classes/feeds.php:653
 msgid "Edit tags for this article"
 msgstr "Editar las etiquetas de este artículo"
 
-#: include/functions.php:3068 classes/feeds.php:605
+#: include/functions.php:3075 classes/feeds.php:608
 msgid "Originally from:"
 msgstr "Original de:"
 
-#: include/functions.php:3081 classes/feeds.php:618 classes/pref/feeds.php:507
+#: include/functions.php:3088 classes/feeds.php:621 classes/pref/feeds.php:507
 msgid "Feed URL"
 msgstr "URL de la fuente"
 
-#: include/functions.php:3110
+#: include/functions.php:3117
 msgid "Related"
 msgstr "Relacionado"
 
-#: include/functions.php:3137 classes/dlg.php:43 classes/dlg.php:162
+#: include/functions.php:3144 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:1553
 #: classes/pref/feeds.php:1624 plugins/import_export/init.php:407
 #: plugins/import_export/init.php:431 plugins/share/init.php:67
-#: plugins/updater/init.php:329
+#: plugins/updater/init.php:330
 msgid "Close this window"
 msgstr "Cerrar esta ventana"
 
-#: include/functions.php:3371
+#: include/functions.php:3378
 msgid "(edit note)"
 msgstr "(editar nota)"
 
-#: include/functions.php:3604
+#: include/functions.php:3611
 msgid "unknown type"
 msgstr "tipo desconocido"
 
-#: include/functions.php:3654
+#: include/functions.php:3661
 msgid "Attachments"
 msgstr "Adjuntos"
 
@@ -948,7 +949,7 @@ msgstr "Publicar artículo"
 msgid "Assign tags"
 msgstr "Asignar etiquetas"
 
-#: include/localized_schema.php:14 js/viewfeed.js:1809
+#: include/localized_schema.php:14 js/viewfeed.js:1849
 msgid "Assign label"
 msgstr "Asignar marcador"
 
@@ -1409,7 +1410,7 @@ msgstr "Autenticación"
 msgid "Login"
 msgstr "Iniciar sesión"
 
-#: classes/dlg.php:276 classes/dlg.php:732 classes/pref/prefs.php:196
+#: classes/dlg.php:276 classes/dlg.php:732 classes/pref/prefs.php:202
 #: classes/pref/feeds.php:569 classes/pref/feeds.php:793
 msgid "Password"
 msgstr "Contraseña:"
@@ -1510,7 +1511,7 @@ msgstr "Ver como RSS"
 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:591 plugins/updater/init.php:303
+#: classes/dlg.php:591 plugins/updater/init.php:304
 #, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "Nueva versión de Tiny Tiny RSS disponible (%s)."
@@ -1647,7 +1648,7 @@ msgstr "Enviar por correo electrónico"
 msgid "Feed:"
 msgstr "Fuente:"
 
-#: classes/feeds.php:201 classes/feeds.php:795
+#: classes/feeds.php:201 classes/feeds.php:798
 msgid "Feed not found."
 msgstr "Fuente no encontrada."
 
@@ -1655,19 +1656,24 @@ msgstr "Fuente no encontrada."
 msgid "mark as read"
 msgstr "marcar como leído"
 
-#: classes/feeds.php:696
+#: classes/feeds.php:553
+#, fuzzy
+msgid "Collapse article"
+msgstr "Cerrar artículo"
+
+#: classes/feeds.php:699
 msgid "No unread articles found to display."
 msgstr "No se han encontrado artículos sin leer."
 
-#: classes/feeds.php:699
+#: classes/feeds.php:702
 msgid "No updated articles found to display."
 msgstr "No se han encontrado artículos actualizados."
 
-#: classes/feeds.php:702
+#: classes/feeds.php:705
 msgid "No starred articles found to display."
 msgstr "No se han encontrado artículos favoritos."
 
-#: classes/feeds.php:706
+#: classes/feeds.php:709
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
@@ -1676,21 +1682,21 @@ msgstr ""
 "artículos a los marcadores manualmente (ver arriba el menú Acciones) o usar "
 "un filtro."
 
-#: classes/feeds.php:708
+#: classes/feeds.php:711
 msgid "No articles found to display."
 msgstr "No se han encontrado artículos que mostrar."
 
-#: classes/feeds.php:723 classes/feeds.php:904
+#: classes/feeds.php:726 classes/feeds.php:907
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "Última actualización de las fuentes: %s"
 
-#: classes/feeds.php:733 classes/feeds.php:914
+#: classes/feeds.php:736 classes/feeds.php:917
 msgid "Some feeds have update errors (click for details)"
 msgstr ""
 "Error al actualizar algunas fuentes (pulse aquí para obtener los detalles)"
 
-#: classes/feeds.php:894
+#: classes/feeds.php:897
 msgid "No feed selected."
 msgstr "No se ha seleccionado ninguna fuente."
 
@@ -2026,186 +2032,177 @@ msgstr "Las contraseñas introducidas no coinciden."
 msgid "Function not supported by authentication module."
 msgstr ""
 
-#: classes/pref/prefs.php:63
+#: classes/pref/prefs.php:69
 msgid "The configuration was saved."
 msgstr "La configuración ha sido guardada."
 
-#: classes/pref/prefs.php:77
+#: classes/pref/prefs.php:83
 #, php-format
 msgid "Unknown option: %s"
 msgstr "Opción desconocida: %s"
 
-#: classes/pref/prefs.php:91
+#: classes/pref/prefs.php:97
 #, fuzzy
 msgid "Your personal data has been saved."
 msgstr "Se ha programado la actualización de la categoría."
 
-#: classes/pref/prefs.php:131
+#: classes/pref/prefs.php:137
 #, fuzzy
 msgid "Personal data / Authentication"
 msgstr "Autenticación"
 
-#: classes/pref/prefs.php:151
+#: classes/pref/prefs.php:157
 msgid "Personal data"
 msgstr "Datos personales"
 
-#: classes/pref/prefs.php:161
+#: classes/pref/prefs.php:167
 msgid "Full name"
 msgstr ""
 
-#: classes/pref/prefs.php:165
+#: classes/pref/prefs.php:171
 msgid "E-mail"
 msgstr "Correo electrónico"
 
-#: classes/pref/prefs.php:171
+#: classes/pref/prefs.php:177
 msgid "Access level"
 msgstr "Nivel de acceso"
 
-#: classes/pref/prefs.php:181
+#: classes/pref/prefs.php:187
 #, fuzzy
 msgid "Save data"
 msgstr "Guardar"
 
-#: classes/pref/prefs.php:203
+#: classes/pref/prefs.php:209
 #, 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:235
+#: classes/pref/prefs.php:241
 msgid "Old password"
 msgstr "Antigua contraseña"
 
-#: classes/pref/prefs.php:238
+#: classes/pref/prefs.php:244
 msgid "New password"
 msgstr "Nueva contraseña"
 
-#: classes/pref/prefs.php:243
+#: classes/pref/prefs.php:249
 msgid "Confirm password"
 msgstr "Confirme la nueva contraseña"
 
-#: classes/pref/prefs.php:253
+#: classes/pref/prefs.php:259
 msgid "Change password"
 msgstr "Cambiar contraseña"
 
-#: classes/pref/prefs.php:259
+#: classes/pref/prefs.php:265
 msgid "One time passwords / Authenticator"
 msgstr ""
 
-#: classes/pref/prefs.php:288 classes/pref/prefs.php:339
+#: classes/pref/prefs.php:294 classes/pref/prefs.php:345
 #, fuzzy
 msgid "Enter your password"
 msgstr "Nombre de usuario o contraseña incorrecta"
 
-#: classes/pref/prefs.php:299
+#: classes/pref/prefs.php:305
 #, fuzzy
 msgid "Disable OTP"
 msgstr "(desactivado)"
 
-#: classes/pref/prefs.php:305
+#: classes/pref/prefs.php:311
 msgid ""
 "You will need a compatible Authenticator to use this. Changing your password "
 "would automatically disable OTP."
 msgstr ""
 
-#: classes/pref/prefs.php:307
+#: classes/pref/prefs.php:313
 msgid "Scan the following code by the Authenticator application:"
 msgstr ""
 
-#: classes/pref/prefs.php:348
+#: classes/pref/prefs.php:354
 msgid "I have scanned the code and would like to enable OTP"
 msgstr ""
 
-#: classes/pref/prefs.php:356
+#: classes/pref/prefs.php:362
 #, fuzzy
 msgid "Enable OTP"
 msgstr "Habilitado"
 
-#: classes/pref/prefs.php:482
+#: classes/pref/prefs.php:493
 #, fuzzy
 msgid "Customize"
 msgstr "Personalizar hoja de estilo"
 
-#: classes/pref/prefs.php:501 classes/pref/prefs.php:508
-#: classes/pref/prefs.php:513
-msgid "Yes"
-msgstr "Sí"
-
-#: classes/pref/prefs.php:503 classes/pref/prefs.php:513
-msgid "No"
-msgstr "No"
-
-#: classes/pref/prefs.php:543
+#: classes/pref/prefs.php:552
 #, fuzzy
 msgid "Register"
 msgstr "Registrado"
 
-#: classes/pref/prefs.php:547
+#: classes/pref/prefs.php:556
 msgid "Clear"
 msgstr ""
 
-#: classes/pref/prefs.php:553
+#: classes/pref/prefs.php:562
 #, php-format
 msgid "Current server time: %s (UTC)"
 msgstr ""
 
-#: classes/pref/prefs.php:582
+#: classes/pref/prefs.php:595
 msgid "Save configuration"
 msgstr "Guardar la configuración"
 
-#: classes/pref/prefs.php:585
+#: classes/pref/prefs.php:598
 #, fuzzy
 msgid "Manage profiles"
 msgstr "Crear perfil"
 
-#: classes/pref/prefs.php:588
+#: classes/pref/prefs.php:601
 msgid "Reset to defaults"
 msgstr "Opciones por defecto"
 
-#: classes/pref/prefs.php:600
+#: classes/pref/prefs.php:613
 #, fuzzy
 msgid "Show additional preferences"
 msgstr "Salir de las preferencias"
 
-#: classes/pref/prefs.php:612 classes/pref/prefs.php:614
+#: classes/pref/prefs.php:625 classes/pref/prefs.php:627
 msgid "Plugins"
 msgstr ""
 
-#: classes/pref/prefs.php:642
+#: classes/pref/prefs.php:655
 msgid "System plugins"
 msgstr ""
 
-#: classes/pref/prefs.php:646 classes/pref/prefs.php:695
+#: classes/pref/prefs.php:659 classes/pref/prefs.php:708
 msgid "Plugin"
 msgstr ""
 
-#: classes/pref/prefs.php:647 classes/pref/prefs.php:696
+#: classes/pref/prefs.php:660 classes/pref/prefs.php:709
 #, fuzzy
 msgid "Description"
 msgstr "Selección"
 
-#: classes/pref/prefs.php:648 classes/pref/prefs.php:697
+#: classes/pref/prefs.php:661 classes/pref/prefs.php:710
 msgid "Version"
 msgstr ""
 
-#: classes/pref/prefs.php:649 classes/pref/prefs.php:698
+#: classes/pref/prefs.php:662 classes/pref/prefs.php:711
 msgid "Author"
 msgstr ""
 
-#: classes/pref/prefs.php:682 classes/pref/prefs.php:733
+#: classes/pref/prefs.php:695 classes/pref/prefs.php:746
 #, fuzzy
 msgid "Clear data"
 msgstr "Limpiar los datos de la fuente"
 
-#: classes/pref/prefs.php:691
+#: classes/pref/prefs.php:704
 msgid "User plugins"
 msgstr ""
 
-#: classes/pref/prefs.php:748
+#: classes/pref/prefs.php:761
 #, fuzzy
 msgid "Enable selected plugins"
 msgstr "Habilitar los iconos de la fuente"
 
-#: classes/pref/prefs.php:803 classes/pref/prefs.php:821
+#: classes/pref/prefs.php:816 classes/pref/prefs.php:834
 #, fuzzy
 msgid "Incorrect password"
 msgstr "Nombre de usuario o contraseña incorrecta"
@@ -2509,6 +2506,10 @@ msgstr "Hola,"
 msgid "Regular version"
 msgstr "Versión estándar"
 
+#: plugins/close_button/init.php:24
+msgid "Close article"
+msgstr "Cerrar artículo"
+
 #: plugins/nsfw/init.php:32 plugins/nsfw/init.php:43
 msgid "Not work safe (click to toggle)"
 msgstr ""
@@ -2752,17 +2753,17 @@ msgstr "Marcar el artículo como favorito"
 msgid "Share on Google+"
 msgstr "Título"
 
-#: plugins/updater/init.php:294 plugins/updater/init.php:306
+#: plugins/updater/init.php:295 plugins/updater/init.php:307
 #: plugins/updater/updater.js:10
 msgid "Update Tiny Tiny RSS"
 msgstr "Actualizar Tiny Tiny RSS"
 
-#: plugins/updater/init.php:309
+#: plugins/updater/init.php:310
 #, fuzzy
 msgid "Your Tiny Tiny RSS installation is up to date."
 msgstr "La base de datos de Tiny Tiny RSS está actualizada."
 
-#: plugins/updater/init.php:319
+#: plugins/updater/init.php:320
 #, fuzzy
 msgid ""
 "Do not close this dialog until updating is finished. Backup your tt-rss "
@@ -2772,12 +2773,12 @@ msgstr ""
 "de seguridad de la carpeta de tt-rss antes de continuar. Escriba 'yes' para "
 "continuar."
 
-#: plugins/updater/init.php:322
+#: plugins/updater/init.php:323
 #, fuzzy
 msgid "Ready to update."
 msgstr "Última actualización:"
 
-#: plugins/updater/init.php:327
+#: plugins/updater/init.php:328
 #, fuzzy
 msgid "Start update"
 msgstr "Última actualización:"
@@ -2887,7 +2888,7 @@ msgstr "Introduzca el nombre de la categoría:"
 msgid "Generate new syndication address for this feed?"
 msgstr "¿Generar nueva dirección de sindicación para esta fuente?"
 
-#: js/functions.js:1597 js/tt-rss.js:350 js/tt-rss.js:721
+#: js/functions.js:1597 js/tt-rss.js:350 js/tt-rss.js:729
 msgid "You can't edit this kind of feed."
 msgstr "No puede editar esta clase de fuente."
 
@@ -3152,12 +3153,12 @@ msgstr "No puede reiniciar la puntuación de esta clase de fuente."
 msgid "Rescore articles in %s?"
 msgstr "¿Reiniciar la puntuación de los artículos de %s?"
 
-#: js/tt-rss.js:680
+#: js/tt-rss.js:688
 #, fuzzy
 msgid "Please enable mail plugin first."
 msgstr "Por favor, seleccione primero alguna fuente."
 
-#: js/tt-rss.js:842
+#: js/tt-rss.js:850
 msgid "New version available!"
 msgstr "¡Nueva versión disponible!"
 
@@ -3183,7 +3184,7 @@ msgstr "Despublicar artículo"
 
 #: 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/mailto/init.js:7
+#: js/viewfeed.js:1053 js/viewfeed.js:1967 plugins/mailto/init.js:7
 #: plugins/mail/mail.js:7
 msgid "No articles are selected."
 msgstr "No se han seleccionado artículos."
@@ -3228,28 +3229,28 @@ msgstr "No se han encontrado artículos que marcar"
 msgid "Mark %d article(s) as read?"
 msgstr "¿Marcar %d artículo(s) como leído(s)?"
 
-#: js/viewfeed.js:1744
+#: js/viewfeed.js:1784
 msgid "Open original article"
 msgstr "Abrir artículo original"
 
-#: js/viewfeed.js:1814
+#: js/viewfeed.js:1854
 msgid "Remove label"
 msgstr "Borrar marcador"
 
-#: js/viewfeed.js:1838
+#: js/viewfeed.js:1878
 msgid "Playing..."
 msgstr "Reproduciendo..."
 
-#: js/viewfeed.js:1839
+#: js/viewfeed.js:1879
 msgid "Click to pause"
 msgstr "Clic para pausar"
 
-#: js/viewfeed.js:1896
+#: js/viewfeed.js:1936
 #, fuzzy
 msgid "Please enter new score for selected articles:"
 msgstr "Por favor, introduzca una nota para este artículo:"
 
-#: js/viewfeed.js:1938
+#: js/viewfeed.js:1978
 #, fuzzy
 msgid "Please enter new score for this article:"
 msgstr "Por favor, introduzca una nota para este artículo:"
@@ -3335,6 +3336,12 @@ msgstr ""
 "de seguridad de la carpeta de tt-rss antes de continuar. Escriba 'yes' para "
 "continuar."
 
+#~ msgid "Yes"
+#~ msgstr "Sí"
+
+#~ msgid "No"
+#~ msgstr "No"
+
 #~ msgid "Comments?"
 #~ msgstr "¿Comentarios?"
 
diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index e71cb6aeb..6c103a2db 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 29cb74395..3b716caae 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-19 22:42+0400\n"
+"POT-Creation-Date: 2013-03-20 10:24+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/"
@@ -297,11 +297,11 @@ msgstr "Adaptatif"
 msgid "All Articles"
 msgstr "Tous les articles"
 
-#: index.php:169 include/functions.php:1911 classes/feeds.php:106
+#: index.php:169 include/functions.php:1915 classes/feeds.php:106
 msgid "Starred"
 msgstr "Remarquables"
 
-#: index.php:170 include/functions.php:1912 classes/feeds.php:107
+#: index.php:170 include/functions.php:1916 classes/feeds.php:107
 msgid "Published"
 msgstr "Publiés"
 
@@ -341,7 +341,7 @@ msgstr "Score"
 msgid "Update"
 msgstr "Mettre à jour"
 
-#: index.php:191 index.php:221 include/functions.php:1902
+#: index.php:191 index.php:221 include/functions.php:1906
 #: include/localized_schema.php:10 classes/feeds.php:111 classes/feeds.php:136
 #: classes/feeds.php:408 js/FeedTree.js:128 js/FeedTree.js:156
 #: plugins/digest/digest.js:630
@@ -402,7 +402,7 @@ msgstr "Basculer en mode résumé..."
 msgid "Show tag cloud..."
 msgstr "Afficher le nuage d'étiquettes"
 
-#: index.php:229 include/functions.php:1889
+#: index.php:229 include/functions.php:1893
 #, fuzzy
 msgid "Toggle widescreen mode"
 msgstr "Marquer comme remarquable"
@@ -428,8 +428,8 @@ msgstr "Aide sur les raccourcis clavier"
 msgid "Logout"
 msgstr "Déconnexion"
 
-#: prefs.php:28 prefs.php:99 include/functions.php:1914
-#: classes/pref/prefs.php:371
+#: prefs.php:28 prefs.php:99 include/functions.php:1918
+#: classes/pref/prefs.php:377
 msgid "Preferences"
 msgstr "Configuration"
 
@@ -450,8 +450,8 @@ msgstr "Flux"
 msgid "Filters"
 msgstr "Filtres"
 
-#: prefs.php:108 mobile/mobile-functions.php:205 include/functions.php:1117
-#: include/functions.php:1738 classes/pref/labels.php:90
+#: prefs.php:108 mobile/mobile-functions.php:205 include/functions.php:1121
+#: include/functions.php:1742 classes/pref/labels.php:90
 msgid "Labels"
 msgstr "Etiquettes"
 
@@ -549,8 +549,8 @@ msgstr ""
 msgid "Home"
 msgstr "Accueil"
 
-#: mobile/mobile-functions.php:178 include/functions.php:1115
-#: include/functions.php:1736
+#: mobile/mobile-functions.php:178 include/functions.php:1119
+#: include/functions.php:1740
 msgid "Special"
 msgstr "Spécial"
 
@@ -592,9 +592,9 @@ msgstr "Trier les flux par nombre d'articles non lus"
 msgid "Reverse headline order (oldest first)"
 msgstr "Inverser l'order des en-têtes (les plus anciens en premier)"
 
-#: include/digest.php:131 include/functions.php:1126
-#: include/functions.php:1639 include/functions.php:1724
-#: include/functions.php:1746 classes/opml.php:416 classes/pref/feeds.php:188
+#: include/digest.php:131 include/functions.php:1130
+#: include/functions.php:1643 include/functions.php:1728
+#: include/functions.php:1750 classes/opml.php:416 classes/pref/feeds.php:188
 msgid "Uncategorized"
 msgstr "Sans catégorie"
 
@@ -607,314 +607,315 @@ msgstr "%d articles archivés"
 msgid "No feeds found."
 msgstr "Aucun flux trouvé."
 
-#: include/functions.php:697
+#: include/functions.php:701
 msgid "Session failed to validate (incorrect IP)"
 msgstr "Echec de la validation de la session (adresse ip incorrecte)"
 
-#: include/functions.php:1588 classes/dlg.php:371 classes/pref/filters.php:368
+#: include/functions.php:1592 classes/dlg.php:371 classes/pref/filters.php:368
 msgid "All feeds"
 msgstr "Tous les flux"
 
-#: include/functions.php:1789
+#: include/functions.php:1793
 msgid "Starred articles"
 msgstr "Articles remarquables"
 
-#: include/functions.php:1791
+#: include/functions.php:1795
 msgid "Published articles"
 msgstr "Articles publiés"
 
-#: include/functions.php:1793
+#: include/functions.php:1797
 msgid "Fresh articles"
 msgstr "Nouveaux articles"
 
-#: include/functions.php:1795 include/functions.php:1909
+#: include/functions.php:1799 include/functions.php:1913
 msgid "All articles"
 msgstr "Tous les articles"
 
-#: include/functions.php:1797
+#: include/functions.php:1801
 msgid "Archived articles"
 msgstr "Articles archivés"
 
-#: include/functions.php:1799
+#: include/functions.php:1803
 msgid "Recently read"
 msgstr ""
 
-#: include/functions.php:1866
+#: include/functions.php:1870
 msgid "Navigation"
 msgstr "Navigation"
 
-#: include/functions.php:1867
+#: include/functions.php:1871
 #, fuzzy
 msgid "Open next feed"
 msgstr "Sauter automatiquement au flux suivant"
 
-#: include/functions.php:1868
+#: include/functions.php:1872
 msgid "Open previous feed"
 msgstr ""
 
-#: include/functions.php:1869
+#: include/functions.php:1873
 #, fuzzy
 msgid "Open next article"
 msgstr "Ouvrir l'article original"
 
-#: include/functions.php:1870
+#: include/functions.php:1874
 #, fuzzy
 msgid "Open previous article"
 msgstr "Ouvrir l'article original"
 
-#: include/functions.php:1871
+#: include/functions.php:1875
 msgid "Open next article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1872
+#: include/functions.php:1876
 msgid "Open previous article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1873
+#: include/functions.php:1877
 msgid "Show search dialog"
 msgstr "Afficher la fenêtre de recherche"
 
-#: include/functions.php:1874
+#: include/functions.php:1878
 #, fuzzy
 msgid "Article"
 msgstr "Tous les articles"
 
-#: include/functions.php:1875
+#: include/functions.php:1879
 msgid "Toggle starred"
 msgstr "Marquer comme remarquable"
 
-#: include/functions.php:1876
+#: include/functions.php:1880
 msgid "Toggle published"
 msgstr "Marquer comme publié"
 
-#: include/functions.php:1877
+#: include/functions.php:1881
 msgid "Toggle unread"
 msgstr "Marquages comme non-lu"
 
-#: include/functions.php:1878
+#: include/functions.php:1882
 msgid "Edit tags"
 msgstr "Modifier les tags"
 
-#: include/functions.php:1879
+#: include/functions.php:1883
 #, fuzzy
 msgid "Dismiss selected"
 msgstr "Exclure les articles sélectionnés"
 
-#: include/functions.php:1880
+#: include/functions.php:1884
 #, fuzzy
 msgid "Dismiss read"
 msgstr "Exclure les articles lus"
 
-#: include/functions.php:1881
+#: include/functions.php:1885
 #, fuzzy
 msgid "Open in new window"
 msgstr "Ouvrir les articles dans une nouvelle fenêtre"
 
-#: include/functions.php:1882 js/viewfeed.js:1758
+#: include/functions.php:1886 js/viewfeed.js:1798
 msgid "Mark below as read"
 msgstr "Marquer les articles en-dessous comme lus"
 
-#: include/functions.php:1883 js/viewfeed.js:1752
+#: include/functions.php:1887 js/viewfeed.js:1792
 msgid "Mark above as read"
 msgstr "Marquer les articles au-dessus comme lus"
 
-#: include/functions.php:1884
+#: include/functions.php:1888
 #, fuzzy
 msgid "Scroll down"
 msgstr "Tout est terminé."
 
-#: include/functions.php:1885
+#: include/functions.php:1889
 msgid "Scroll up"
 msgstr ""
 
-#: include/functions.php:1886
+#: include/functions.php:1890
 #, fuzzy
 msgid "Select article under cursor"
 msgstr "Selectionner l'article sous le curseur de la souris"
 
-#: include/functions.php:1887
+#: include/functions.php:1891
 msgid "Email article"
 msgstr "Envoyer l'article par e-mail"
 
-#: include/functions.php:1888 plugins/close_button/init.php:24
-msgid "Close article"
+#: include/functions.php:1892
+#, fuzzy
+msgid "Close/collapse article"
 msgstr "Fermer l'article"
 
-#: include/functions.php:1890
+#: include/functions.php:1894
 #, fuzzy
 msgid "Article selection"
 msgstr "Inverser la sélection"
 
-#: include/functions.php:1891
+#: include/functions.php:1895
 msgid "Select all articles"
 msgstr "Sélectionner tous les articles"
 
-#: include/functions.php:1892
+#: include/functions.php:1896
 #, fuzzy
 msgid "Select unread"
 msgstr "Sélectionner les articles non lus"
 
-#: include/functions.php:1893
+#: include/functions.php:1897
 #, fuzzy
 msgid "Select starred"
 msgstr "Marquer comme remarquable"
 
-#: include/functions.php:1894
+#: include/functions.php:1898
 #, fuzzy
 msgid "Select published"
 msgstr "Sélectionner les articles non lus"
 
-#: include/functions.php:1895
+#: include/functions.php:1899
 #, fuzzy
 msgid "Invert selection"
 msgstr "Inverser la sélection"
 
-#: include/functions.php:1896
+#: include/functions.php:1900
 #, fuzzy
 msgid "Deselect everything"
 msgstr "Tout déselectionner"
 
-#: include/functions.php:1897 classes/pref/feeds.php:488
+#: include/functions.php:1901 classes/pref/feeds.php:488
 #: classes/pref/feeds.php:719
 msgid "Feed"
 msgstr "Flux"
 
-#: include/functions.php:1898
+#: include/functions.php:1902
 #, fuzzy
 msgid "Refresh current feed"
 msgstr "Mettre à jour le flux actif"
 
-#: include/functions.php:1899
+#: include/functions.php:1903
 #, fuzzy
 msgid "Un/hide read feeds"
 msgstr "(Dé)Masquer les flux lus"
 
-#: include/functions.php:1900 classes/pref/feeds.php:1240
+#: include/functions.php:1904 classes/pref/feeds.php:1240
 msgid "Subscribe to feed"
 msgstr "S'abonner au flux"
 
-#: include/functions.php:1901 js/FeedTree.js:135 js/PrefFeedTree.js:67
+#: include/functions.php:1905 js/FeedTree.js:135 js/PrefFeedTree.js:67
 msgid "Edit feed"
 msgstr "Modifier le flux"
 
-#: include/functions.php:1903
+#: include/functions.php:1907
 #, fuzzy
 msgid "Reverse headlines"
 msgstr "Inverser l'ordre des titres"
 
-#: include/functions.php:1904
+#: include/functions.php:1908
 #, fuzzy
 msgid "Debug feed update"
 msgstr "Désactiver les mises à jour"
 
-#: include/functions.php:1905 js/FeedTree.js:177
+#: include/functions.php:1909 js/FeedTree.js:177
 msgid "Mark all feeds as read"
 msgstr "Marquer tous les flux comme lus"
 
-#: include/functions.php:1906
+#: include/functions.php:1910
 #, fuzzy
 msgid "Un/collapse current category"
 msgstr "Placer dans la catégorie :"
 
-#: include/functions.php:1907
+#: include/functions.php:1911
 #, fuzzy
 msgid "Toggle combined mode"
 msgstr "Marquer comme publié"
 
-#: include/functions.php:1908
+#: include/functions.php:1912
 #, fuzzy
 msgid "Go to"
 msgstr "Aller à..."
 
-#: include/functions.php:1910
+#: include/functions.php:1914
 msgid "Fresh"
 msgstr ""
 
-#: include/functions.php:1913
+#: include/functions.php:1917
 msgid "Tag cloud"
 msgstr "Nuage de tags"
 
-#: include/functions.php:1915
+#: include/functions.php:1919
 #, fuzzy
 msgid "Other"
 msgstr "Autres flux"
 
-#: include/functions.php:1916 classes/pref/labels.php:281
+#: include/functions.php:1920 classes/pref/labels.php:281
 msgid "Create label"
 msgstr "Créer une étiquette"
 
-#: include/functions.php:1917 classes/pref/filters.php:587
+#: include/functions.php:1921 classes/pref/filters.php:587
 msgid "Create filter"
 msgstr "Créer un filtre"
 
-#: include/functions.php:1918
+#: include/functions.php:1922
 #, fuzzy
 msgid "Un/collapse sidebar"
 msgstr "Contracter le menu"
 
-#: include/functions.php:1919
+#: include/functions.php:1923
 #, fuzzy
 msgid "Show help dialog"
 msgstr "Afficher la fenêtre de recherche"
 
-#: include/functions.php:2401
+#: include/functions.php:2405
 #, php-format
 msgid "Search results: %s"
 msgstr ""
 
-#: include/functions.php:2886 js/viewfeed.js:1845
+#: include/functions.php:2892 js/viewfeed.js:1885
 msgid "Click to play"
 msgstr "Cliquez pour lancer la lecture"
 
-#: include/functions.php:2887 js/viewfeed.js:1844
+#: include/functions.php:2893 js/viewfeed.js:1884
 msgid "Play"
 msgstr "Lecture"
 
-#: include/functions.php:3007
+#: include/functions.php:3014
 msgid " - "
 msgstr " - "
 
-#: include/functions.php:3029 include/functions.php:3346 classes/rpc.php:360
+#: include/functions.php:3036 include/functions.php:3353 classes/rpc.php:360
 msgid "no tags"
 msgstr "aucun tag"
 
-#: include/functions.php:3039 classes/feeds.php:650
+#: include/functions.php:3046 classes/feeds.php:653
 msgid "Edit tags for this article"
 msgstr "Modifier les tags pour cet article"
 
-#: include/functions.php:3068 classes/feeds.php:605
+#: include/functions.php:3075 classes/feeds.php:608
 msgid "Originally from:"
 msgstr "Origine :"
 
-#: include/functions.php:3081 classes/feeds.php:618 classes/pref/feeds.php:507
+#: include/functions.php:3088 classes/feeds.php:621 classes/pref/feeds.php:507
 msgid "Feed URL"
 msgstr "URL du flux"
 
-#: include/functions.php:3110
+#: include/functions.php:3117
 #, fuzzy
 msgid "Related"
 msgstr "Lire plus tard"
 
-#: include/functions.php:3137 classes/dlg.php:43 classes/dlg.php:162
+#: include/functions.php:3144 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:1553
 #: classes/pref/feeds.php:1624 plugins/import_export/init.php:407
 #: plugins/import_export/init.php:431 plugins/share/init.php:67
-#: plugins/updater/init.php:329
+#: plugins/updater/init.php:330
 msgid "Close this window"
 msgstr "Fermer cette fenêtre"
 
-#: include/functions.php:3371
+#: include/functions.php:3378
 msgid "(edit note)"
 msgstr "(modifier l'annotation)"
 
-#: include/functions.php:3604
+#: include/functions.php:3611
 msgid "unknown type"
 msgstr "type inconnu"
 
-#: include/functions.php:3654
+#: include/functions.php:3661
 #, fuzzy
 msgid "Attachments"
 msgstr "Fichiers attachés :"
@@ -952,7 +953,7 @@ msgstr "Publier l'article"
 msgid "Assign tags"
 msgstr "Assigner des tags"
 
-#: include/localized_schema.php:14 js/viewfeed.js:1809
+#: include/localized_schema.php:14 js/viewfeed.js:1849
 msgid "Assign label"
 msgstr "Assigner l'étiquette"
 
@@ -1412,7 +1413,7 @@ msgstr "Identification"
 msgid "Login"
 msgstr "Se connecter"
 
-#: classes/dlg.php:276 classes/dlg.php:732 classes/pref/prefs.php:196
+#: classes/dlg.php:276 classes/dlg.php:732 classes/pref/prefs.php:202
 #: classes/pref/feeds.php:569 classes/pref/feeds.php:793
 msgid "Password"
 msgstr "Mot de passe"
@@ -1513,7 +1514,7 @@ msgstr "Voir comme RSS"
 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:591 plugins/updater/init.php:303
+#: classes/dlg.php:591 plugins/updater/init.php:304
 #, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "Une nouvelle version de Tiny Tiny RSS est disponible (%s)."
@@ -1649,7 +1650,7 @@ msgstr "Transférer par email"
 msgid "Feed:"
 msgstr "Flux :"
 
-#: classes/feeds.php:201 classes/feeds.php:795
+#: classes/feeds.php:201 classes/feeds.php:798
 msgid "Feed not found."
 msgstr "Flux non trouvé."
 
@@ -1657,19 +1658,24 @@ msgstr "Flux non trouvé."
 msgid "mark as read"
 msgstr "marquer comme lu"
 
-#: classes/feeds.php:696
+#: classes/feeds.php:553
+#, fuzzy
+msgid "Collapse article"
+msgstr "Fermer l'article"
+
+#: classes/feeds.php:699
 msgid "No unread articles found to display."
 msgstr "Aucun article non-lu à afficher"
 
-#: classes/feeds.php:699
+#: classes/feeds.php:702
 msgid "No updated articles found to display."
 msgstr "Aucun article mis à jour à afficher"
 
-#: classes/feeds.php:702
+#: classes/feeds.php:705
 msgid "No starred articles found to display."
 msgstr "Aucun article remarquable à afficher"
 
-#: classes/feeds.php:706
+#: classes/feeds.php:709
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
@@ -1677,22 +1683,22 @@ 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:708
+#: classes/feeds.php:711
 msgid "No articles found to display."
 msgstr "Aucun article à afficher"
 
-#: classes/feeds.php:723 classes/feeds.php:904
+#: classes/feeds.php:726 classes/feeds.php:907
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "Flux mis à jour à %s"
 
-#: classes/feeds.php:733 classes/feeds.php:914
+#: classes/feeds.php:736 classes/feeds.php:917
 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:894
+#: classes/feeds.php:897
 msgid "No feed selected."
 msgstr "Aucun flux sélectionné."
 
@@ -2022,179 +2028,170 @@ msgstr "Les mots de passe saisie ne sont pas identiques."
 msgid "Function not supported by authentication module."
 msgstr ""
 
-#: classes/pref/prefs.php:63
+#: classes/pref/prefs.php:69
 msgid "The configuration was saved."
 msgstr "La configuration a été enregistrée."
 
-#: classes/pref/prefs.php:77
+#: classes/pref/prefs.php:83
 #, php-format
 msgid "Unknown option: %s"
 msgstr "Option inconnue : %s"
 
-#: classes/pref/prefs.php:91
+#: classes/pref/prefs.php:97
 msgid "Your personal data has been saved."
 msgstr "Vos données personnelles ont été sauvegardées."
 
-#: classes/pref/prefs.php:131
+#: classes/pref/prefs.php:137
 msgid "Personal data / Authentication"
 msgstr "Données personnelles / Authentification"
 
-#: classes/pref/prefs.php:151
+#: classes/pref/prefs.php:157
 #, fuzzy
 msgid "Personal data"
 msgstr "Données personnelles / Authentification"
 
-#: classes/pref/prefs.php:161
+#: classes/pref/prefs.php:167
 msgid "Full name"
 msgstr "Nom"
 
-#: classes/pref/prefs.php:165
+#: classes/pref/prefs.php:171
 msgid "E-mail"
 msgstr "Adresse électronique"
 
-#: classes/pref/prefs.php:171
+#: classes/pref/prefs.php:177
 msgid "Access level"
 msgstr "Permissions"
 
-#: classes/pref/prefs.php:181
+#: classes/pref/prefs.php:187
 msgid "Save data"
 msgstr "Enregistrer les données"
 
-#: classes/pref/prefs.php:203
+#: classes/pref/prefs.php:209
 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:235
+#: classes/pref/prefs.php:241
 msgid "Old password"
 msgstr "Ancien mot de passe"
 
-#: classes/pref/prefs.php:238
+#: classes/pref/prefs.php:244
 msgid "New password"
 msgstr "Nouveau mot de passe"
 
-#: classes/pref/prefs.php:243
+#: classes/pref/prefs.php:249
 msgid "Confirm password"
 msgstr "Confirmation du mot de passe"
 
-#: classes/pref/prefs.php:253
+#: classes/pref/prefs.php:259
 msgid "Change password"
 msgstr "Modifier le mot de passe"
 
-#: classes/pref/prefs.php:259
+#: classes/pref/prefs.php:265
 msgid "One time passwords / Authenticator"
 msgstr ""
 
-#: classes/pref/prefs.php:288 classes/pref/prefs.php:339
+#: classes/pref/prefs.php:294 classes/pref/prefs.php:345
 #, fuzzy
 msgid "Enter your password"
 msgstr "Login ou mot de passe incorrect"
 
-#: classes/pref/prefs.php:299
+#: classes/pref/prefs.php:305
 #, fuzzy
 msgid "Disable OTP"
 msgstr "Désactiver les mises à jour"
 
-#: classes/pref/prefs.php:305
+#: classes/pref/prefs.php:311
 msgid ""
 "You will need a compatible Authenticator to use this. Changing your password "
 "would automatically disable OTP."
 msgstr ""
 
-#: classes/pref/prefs.php:307
+#: classes/pref/prefs.php:313
 msgid "Scan the following code by the Authenticator application:"
 msgstr ""
 
-#: classes/pref/prefs.php:348
+#: classes/pref/prefs.php:354
 msgid "I have scanned the code and would like to enable OTP"
 msgstr ""
 
-#: classes/pref/prefs.php:356
+#: classes/pref/prefs.php:362
 #, fuzzy
 msgid "Enable OTP"
 msgstr "Activé"
 
-#: classes/pref/prefs.php:482
+#: classes/pref/prefs.php:493
 msgid "Customize"
 msgstr "Personnaliser"
 
-#: classes/pref/prefs.php:501 classes/pref/prefs.php:508
-#: classes/pref/prefs.php:513
-msgid "Yes"
-msgstr "Oui"
-
-#: classes/pref/prefs.php:503 classes/pref/prefs.php:513
-msgid "No"
-msgstr "Non"
-
-#: classes/pref/prefs.php:543
+#: classes/pref/prefs.php:552
 msgid "Register"
 msgstr "S'inscrire"
 
-#: classes/pref/prefs.php:547
+#: classes/pref/prefs.php:556
 msgid "Clear"
 msgstr "Effacer"
 
-#: classes/pref/prefs.php:553
+#: classes/pref/prefs.php:562
 #, fuzzy, php-format
 msgid "Current server time: %s (UTC)"
 msgstr "Heure actuelle du serveur : %s"
 
-#: classes/pref/prefs.php:582
+#: classes/pref/prefs.php:595
 msgid "Save configuration"
 msgstr "Enregistrer la configuration"
 
-#: classes/pref/prefs.php:585
+#: classes/pref/prefs.php:598
 msgid "Manage profiles"
 msgstr "Gérer les profils"
 
-#: classes/pref/prefs.php:588
+#: classes/pref/prefs.php:601
 msgid "Reset to defaults"
 msgstr "Revenir aux valeurs par défaut"
 
-#: classes/pref/prefs.php:600
+#: classes/pref/prefs.php:613
 #, fuzzy
 msgid "Show additional preferences"
 msgstr "Quitter la configuration"
 
-#: classes/pref/prefs.php:612 classes/pref/prefs.php:614
+#: classes/pref/prefs.php:625 classes/pref/prefs.php:627
 msgid "Plugins"
 msgstr ""
 
-#: classes/pref/prefs.php:642
+#: classes/pref/prefs.php:655
 msgid "System plugins"
 msgstr ""
 
-#: classes/pref/prefs.php:646 classes/pref/prefs.php:695
+#: classes/pref/prefs.php:659 classes/pref/prefs.php:708
 msgid "Plugin"
 msgstr ""
 
-#: classes/pref/prefs.php:647 classes/pref/prefs.php:696
+#: classes/pref/prefs.php:660 classes/pref/prefs.php:709
 msgid "Description"
 msgstr ""
 
-#: classes/pref/prefs.php:648 classes/pref/prefs.php:697
+#: classes/pref/prefs.php:661 classes/pref/prefs.php:710
 msgid "Version"
 msgstr ""
 
-#: classes/pref/prefs.php:649 classes/pref/prefs.php:698
+#: classes/pref/prefs.php:662 classes/pref/prefs.php:711
 msgid "Author"
 msgstr ""
 
-#: classes/pref/prefs.php:682 classes/pref/prefs.php:733
+#: classes/pref/prefs.php:695 classes/pref/prefs.php:746
 #, fuzzy
 msgid "Clear data"
 msgstr "Purger les données de flux"
 
-#: classes/pref/prefs.php:691
+#: classes/pref/prefs.php:704
 msgid "User plugins"
 msgstr ""
 
-#: classes/pref/prefs.php:748
+#: classes/pref/prefs.php:761
 #, fuzzy
 msgid "Enable selected plugins"
 msgstr "Utiliser les catégories de flux"
 
-#: classes/pref/prefs.php:803 classes/pref/prefs.php:821
+#: classes/pref/prefs.php:816 classes/pref/prefs.php:834
 #, fuzzy
 msgid "Incorrect password"
 msgstr "Login ou mot de passe incorrect"
@@ -2481,6 +2478,10 @@ msgstr "Bonjour,"
 msgid "Regular version"
 msgstr ""
 
+#: plugins/close_button/init.php:24
+msgid "Close article"
+msgstr "Fermer l'article"
+
 #: plugins/nsfw/init.php:32 plugins/nsfw/init.php:43
 msgid "Not work safe (click to toggle)"
 msgstr ""
@@ -2718,29 +2719,29 @@ msgstr "Marquer comme remarquable"
 msgid "Share on Google+"
 msgstr "Partager sur Twitter"
 
-#: plugins/updater/init.php:294 plugins/updater/init.php:306
+#: plugins/updater/init.php:295 plugins/updater/init.php:307
 #: plugins/updater/updater.js:10
 #, fuzzy
 msgid "Update Tiny Tiny RSS"
 msgstr "Revenir à Tiny Tiny RSS"
 
-#: plugins/updater/init.php:309
+#: plugins/updater/init.php:310
 #, 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/init.php:319
+#: plugins/updater/init.php:320
 msgid ""
 "Do not close this dialog until updating is finished. Backup your tt-rss "
 "directory before continuing."
 msgstr ""
 
-#: plugins/updater/init.php:322
+#: plugins/updater/init.php:323
 #, fuzzy
 msgid "Ready to update."
 msgstr "Dernière mise à jour :"
 
-#: plugins/updater/init.php:327
+#: plugins/updater/init.php:328
 #, fuzzy
 msgid "Start update"
 msgstr "Dernière mise à jour :"
@@ -2854,7 +2855,7 @@ msgstr "Veuillez saisir un titre pour cette catégorie :"
 msgid "Generate new syndication address for this feed?"
 msgstr "Générer une nouvelle adresse d'abonnement pour ce flux ?"
 
-#: js/functions.js:1597 js/tt-rss.js:350 js/tt-rss.js:721
+#: js/functions.js:1597 js/tt-rss.js:350 js/tt-rss.js:729
 msgid "You can't edit this kind of feed."
 msgstr "Vous ne pouvez pas modifier ce type de flux."
 
@@ -3125,12 +3126,12 @@ msgstr "Vous ne pouvez pas recalculer le score de ce type de flux."
 msgid "Rescore articles in %s?"
 msgstr "Recalculer le score des articles de %s ?"
 
-#: js/tt-rss.js:680
+#: js/tt-rss.js:688
 #, fuzzy
 msgid "Please enable mail plugin first."
 msgstr "Veuillez d'abord sélectionner un flux."
 
-#: js/tt-rss.js:842
+#: js/tt-rss.js:850
 msgid "New version available!"
 msgstr "Une nouvelle version est disponible !"
 
@@ -3156,7 +3157,7 @@ msgstr "Ne plus publier l'article"
 
 #: 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/mailto/init.js:7
+#: js/viewfeed.js:1053 js/viewfeed.js:1967 plugins/mailto/init.js:7
 #: plugins/mail/mail.js:7
 msgid "No articles are selected."
 msgstr "Aucun article sélectionné."
@@ -3201,28 +3202,28 @@ msgstr "Aucun article à marquer"
 msgid "Mark %d article(s) as read?"
 msgstr "Marquer %d article(s) comme lu(s) ?"
 
-#: js/viewfeed.js:1744
+#: js/viewfeed.js:1784
 msgid "Open original article"
 msgstr "Ouvrir l'article original"
 
-#: js/viewfeed.js:1814
+#: js/viewfeed.js:1854
 msgid "Remove label"
 msgstr "Supprimer l'étiquette"
 
-#: js/viewfeed.js:1838
+#: js/viewfeed.js:1878
 msgid "Playing..."
 msgstr "Lecture..."
 
-#: js/viewfeed.js:1839
+#: js/viewfeed.js:1879
 msgid "Click to pause"
 msgstr "Cliquez pour mettre en pause"
 
-#: js/viewfeed.js:1896
+#: js/viewfeed.js:1936
 #, fuzzy
 msgid "Please enter new score for selected articles:"
 msgstr "Supprimer les %d articles sélectionnés ?"
 
-#: js/viewfeed.js:1938
+#: js/viewfeed.js:1978
 #, fuzzy
 msgid "Please enter new score for this article:"
 msgstr "Veuillez saisir un titre pour cette catégorie :"
@@ -3305,6 +3306,12 @@ msgid ""
 "before continuing. Please type 'yes' to continue."
 msgstr ""
 
+#~ msgid "Yes"
+#~ msgstr "Oui"
+
+#~ msgid "No"
+#~ msgstr "Non"
+
 #~ msgid "Comments?"
 #~ msgstr "Commentaires ?"
 
diff --git a/locale/hu_HU/LC_MESSAGES/messages.mo b/locale/hu_HU/LC_MESSAGES/messages.mo
index 33a6e4cb3..268575892 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 34fdb39d7..c2a5c2756 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-19 22:42+0400\n"
+"POT-Creation-Date: 2013-03-20 10:24+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"
@@ -290,11 +290,11 @@ msgstr "Adaptív"
 msgid "All Articles"
 msgstr "Minden hír"
 
-#: index.php:169 include/functions.php:1911 classes/feeds.php:106
+#: index.php:169 include/functions.php:1915 classes/feeds.php:106
 msgid "Starred"
 msgstr "Csillagozott"
 
-#: index.php:170 include/functions.php:1912 classes/feeds.php:107
+#: index.php:170 include/functions.php:1916 classes/feeds.php:107
 msgid "Published"
 msgstr "Publikált"
 
@@ -334,7 +334,7 @@ msgstr "Pontszám"
 msgid "Update"
 msgstr "Frissítés"
 
-#: index.php:191 index.php:221 include/functions.php:1902
+#: index.php:191 index.php:221 include/functions.php:1906
 #: include/localized_schema.php:10 classes/feeds.php:111 classes/feeds.php:136
 #: classes/feeds.php:408 js/FeedTree.js:128 js/FeedTree.js:156
 #: plugins/digest/digest.js:630
@@ -395,7 +395,7 @@ msgstr "Váltás áttekintő módba..."
 msgid "Show tag cloud..."
 msgstr "Címkefelhő megjelenítése..."
 
-#: index.php:229 include/functions.php:1889
+#: index.php:229 include/functions.php:1893
 #, fuzzy
 msgid "Toggle widescreen mode"
 msgstr "Csillagoz"
@@ -421,8 +421,8 @@ msgstr "Billentyűparancsok súgója"
 msgid "Logout"
 msgstr "Kijelentkezés"
 
-#: prefs.php:28 prefs.php:99 include/functions.php:1914
-#: classes/pref/prefs.php:371
+#: prefs.php:28 prefs.php:99 include/functions.php:1918
+#: classes/pref/prefs.php:377
 msgid "Preferences"
 msgstr "Beállítások"
 
@@ -443,8 +443,8 @@ msgstr "Hírcsatornák"
 msgid "Filters"
 msgstr "Szűrők"
 
-#: prefs.php:108 mobile/mobile-functions.php:205 include/functions.php:1117
-#: include/functions.php:1738 classes/pref/labels.php:90
+#: prefs.php:108 mobile/mobile-functions.php:205 include/functions.php:1121
+#: include/functions.php:1742 classes/pref/labels.php:90
 msgid "Labels"
 msgstr "Címkék"
 
@@ -540,8 +540,8 @@ msgstr "Szokásos verzió használata"
 msgid "Home"
 msgstr "Kezdőlap"
 
-#: mobile/mobile-functions.php:178 include/functions.php:1115
-#: include/functions.php:1736
+#: mobile/mobile-functions.php:178 include/functions.php:1119
+#: include/functions.php:1740
 msgid "Special"
 msgstr "Kiemelt"
 
@@ -583,9 +583,9 @@ msgstr "Hírcsatornák rendezése olvasatlan hírek száma szerint"
 msgid "Reverse headline order (oldest first)"
 msgstr "Fordított hírcím-sorrend (régiebbiek előbb)"
 
-#: include/digest.php:131 include/functions.php:1126
-#: include/functions.php:1639 include/functions.php:1724
-#: include/functions.php:1746 classes/opml.php:416 classes/pref/feeds.php:188
+#: include/digest.php:131 include/functions.php:1130
+#: include/functions.php:1643 include/functions.php:1728
+#: include/functions.php:1750 classes/opml.php:416 classes/pref/feeds.php:188
 msgid "Uncategorized"
 msgstr "Kategorizálatlan"
 
@@ -598,313 +598,314 @@ msgstr "%d archivált hír"
 msgid "No feeds found."
 msgstr "Nem található hírcsatorna."
 
-#: include/functions.php:697
+#: include/functions.php:701
 msgid "Session failed to validate (incorrect IP)"
 msgstr "Nem sikerült érvényesíteni a munkamenetet (érvénytelen IP)"
 
-#: include/functions.php:1588 classes/dlg.php:371 classes/pref/filters.php:368
+#: include/functions.php:1592 classes/dlg.php:371 classes/pref/filters.php:368
 msgid "All feeds"
 msgstr "Összes hírcsatorna"
 
-#: include/functions.php:1789
+#: include/functions.php:1793
 msgid "Starred articles"
 msgstr "Csillagozott hírek"
 
-#: include/functions.php:1791
+#: include/functions.php:1795
 msgid "Published articles"
 msgstr "Publikált hírek"
 
-#: include/functions.php:1793
+#: include/functions.php:1797
 msgid "Fresh articles"
 msgstr "Friss hírek"
 
-#: include/functions.php:1795 include/functions.php:1909
+#: include/functions.php:1799 include/functions.php:1913
 msgid "All articles"
 msgstr "Az összes hír"
 
-#: include/functions.php:1797
+#: include/functions.php:1801
 msgid "Archived articles"
 msgstr "Archivált hírek"
 
-#: include/functions.php:1799
+#: include/functions.php:1803
 msgid "Recently read"
 msgstr "Legutóbb olvasott"
 
-#: include/functions.php:1866
+#: include/functions.php:1870
 msgid "Navigation"
 msgstr "Navigáció"
 
-#: include/functions.php:1867
+#: include/functions.php:1871
 #, fuzzy
 msgid "Open next feed"
 msgstr "Hírcsatorna végén mutassa a következő hírcsatornát"
 
-#: include/functions.php:1868
+#: include/functions.php:1872
 msgid "Open previous feed"
 msgstr ""
 
-#: include/functions.php:1869
+#: include/functions.php:1873
 #, fuzzy
 msgid "Open next article"
 msgstr "Eredeti hír megjelenítése"
 
-#: include/functions.php:1870
+#: include/functions.php:1874
 #, fuzzy
 msgid "Open previous article"
 msgstr "Eredeti hír megjelenítése"
 
-#: include/functions.php:1871
+#: include/functions.php:1875
 msgid "Open next article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1872
+#: include/functions.php:1876
 msgid "Open previous article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1873
+#: include/functions.php:1877
 msgid "Show search dialog"
 msgstr "Keresőmező megjelenítése"
 
-#: include/functions.php:1874
+#: include/functions.php:1878
 #, fuzzy
 msgid "Article"
 msgstr "Minden hír"
 
-#: include/functions.php:1875
+#: include/functions.php:1879
 msgid "Toggle starred"
 msgstr "Csillagoz"
 
-#: include/functions.php:1876
+#: include/functions.php:1880
 msgid "Toggle published"
 msgstr "Publikált"
 
-#: include/functions.php:1877
+#: include/functions.php:1881
 msgid "Toggle unread"
 msgstr "Olvasatlannak jelöl"
 
-#: include/functions.php:1878
+#: include/functions.php:1882
 msgid "Edit tags"
 msgstr "Címkék szerkesztése"
 
-#: include/functions.php:1879
+#: include/functions.php:1883
 #, fuzzy
 msgid "Dismiss selected"
 msgstr "Eltávolítja a kijelölt híreket a címke alól?"
 
-#: include/functions.php:1880
+#: include/functions.php:1884
 #, fuzzy
 msgid "Dismiss read"
 msgstr "Látható olvasott hírek elrejtése"
 
-#: include/functions.php:1881
+#: include/functions.php:1885
 #, fuzzy
 msgid "Open in new window"
 msgstr "Hír megnyitása új ablakban"
 
-#: include/functions.php:1882 js/viewfeed.js:1758
+#: include/functions.php:1886 js/viewfeed.js:1798
 msgid "Mark below as read"
 msgstr "Olvasottnak jel ez alatt"
 
-#: include/functions.php:1883 js/viewfeed.js:1752
+#: include/functions.php:1887 js/viewfeed.js:1792
 msgid "Mark above as read"
 msgstr "Olvasottnak jel ez fölött"
 
-#: include/functions.php:1884
+#: include/functions.php:1888
 #, fuzzy
 msgid "Scroll down"
 msgstr "Kész."
 
-#: include/functions.php:1885
+#: include/functions.php:1889
 msgid "Scroll up"
 msgstr ""
 
-#: include/functions.php:1886
+#: include/functions.php:1890
 #, fuzzy
 msgid "Select article under cursor"
 msgstr "Az egérkurzor alatti hír kiválasztása"
 
-#: include/functions.php:1887
+#: include/functions.php:1891
 msgid "Email article"
 msgstr "Hír küldése emailben"
 
-#: include/functions.php:1888 plugins/close_button/init.php:24
-msgid "Close article"
+#: include/functions.php:1892
+#, fuzzy
+msgid "Close/collapse article"
 msgstr "Hír bezárása"
 
-#: include/functions.php:1890
+#: include/functions.php:1894
 #, fuzzy
 msgid "Article selection"
 msgstr "Fordított kijelölés"
 
-#: include/functions.php:1891
+#: include/functions.php:1895
 msgid "Select all articles"
 msgstr "Minden hír kijelölése"
 
-#: include/functions.php:1892
+#: include/functions.php:1896
 #, fuzzy
 msgid "Select unread"
 msgstr "Olvasatlan hírek kijelölése"
 
-#: include/functions.php:1893
+#: include/functions.php:1897
 #, fuzzy
 msgid "Select starred"
 msgstr "Csillagoz"
 
-#: include/functions.php:1894
+#: include/functions.php:1898
 #, fuzzy
 msgid "Select published"
 msgstr "Publikált hírek kijlölése"
 
-#: include/functions.php:1895
+#: include/functions.php:1899
 #, fuzzy
 msgid "Invert selection"
 msgstr "Fordított kijelölés"
 
-#: include/functions.php:1896
+#: include/functions.php:1900
 #, fuzzy
 msgid "Deselect everything"
 msgstr "Kijelölés eltávolítása"
 
-#: include/functions.php:1897 classes/pref/feeds.php:488
+#: include/functions.php:1901 classes/pref/feeds.php:488
 #: classes/pref/feeds.php:719
 msgid "Feed"
 msgstr "Hírcsatorna"
 
-#: include/functions.php:1898
+#: include/functions.php:1902
 #, fuzzy
 msgid "Refresh current feed"
 msgstr "Aktív hírcsatorna frissítése"
 
-#: include/functions.php:1899
+#: include/functions.php:1903
 #, fuzzy
 msgid "Un/hide read feeds"
 msgstr "Olvasottak rejtése/mutatása"
 
-#: include/functions.php:1900 classes/pref/feeds.php:1240
+#: include/functions.php:1904 classes/pref/feeds.php:1240
 msgid "Subscribe to feed"
 msgstr "Feliratkozás hírcsatornára"
 
-#: include/functions.php:1901 js/FeedTree.js:135 js/PrefFeedTree.js:67
+#: include/functions.php:1905 js/FeedTree.js:135 js/PrefFeedTree.js:67
 msgid "Edit feed"
 msgstr "Hírcsatorna szerkesztése"
 
-#: include/functions.php:1903
+#: include/functions.php:1907
 #, fuzzy
 msgid "Reverse headlines"
 msgstr "Fordított cím sorrend"
 
-#: include/functions.php:1904
+#: include/functions.php:1908
 #, fuzzy
 msgid "Debug feed update"
 msgstr "Frissítések kikapcsolása"
 
-#: include/functions.php:1905 js/FeedTree.js:177
+#: include/functions.php:1909 js/FeedTree.js:177
 msgid "Mark all feeds as read"
 msgstr "Minden hírcsatornát olvasottként jelöl"
 
-#: include/functions.php:1906
+#: include/functions.php:1910
 #, fuzzy
 msgid "Un/collapse current category"
 msgstr "Hozzáadás a következő kategóriához:"
 
-#: include/functions.php:1907
+#: include/functions.php:1911
 #, fuzzy
 msgid "Toggle combined mode"
 msgstr "Publikált"
 
-#: include/functions.php:1908
+#: include/functions.php:1912
 #, fuzzy
 msgid "Go to"
 msgstr "Ugrás ide..."
 
-#: include/functions.php:1910
+#: include/functions.php:1914
 msgid "Fresh"
 msgstr ""
 
-#: include/functions.php:1913
+#: include/functions.php:1917
 msgid "Tag cloud"
 msgstr "Címkefelhő"
 
-#: include/functions.php:1915
+#: include/functions.php:1919
 #, fuzzy
 msgid "Other"
 msgstr "Egyéb hírcsatornák"
 
-#: include/functions.php:1916 classes/pref/labels.php:281
+#: include/functions.php:1920 classes/pref/labels.php:281
 msgid "Create label"
 msgstr "Címke létrehozása"
 
-#: include/functions.php:1917 classes/pref/filters.php:587
+#: include/functions.php:1921 classes/pref/filters.php:587
 msgid "Create filter"
 msgstr "Szűrő létrehozása"
 
-#: include/functions.php:1918
+#: include/functions.php:1922
 #, fuzzy
 msgid "Un/collapse sidebar"
 msgstr "Oldalablak összecsukása"
 
-#: include/functions.php:1919
+#: include/functions.php:1923
 #, fuzzy
 msgid "Show help dialog"
 msgstr "Keresőmező megjelenítése"
 
-#: include/functions.php:2401
+#: include/functions.php:2405
 #, php-format
 msgid "Search results: %s"
 msgstr "Keresési eredmények: %s"
 
-#: include/functions.php:2886 js/viewfeed.js:1845
+#: include/functions.php:2892 js/viewfeed.js:1885
 msgid "Click to play"
 msgstr "Kattintson a lejátszáshoz"
 
-#: include/functions.php:2887 js/viewfeed.js:1844
+#: include/functions.php:2893 js/viewfeed.js:1884
 msgid "Play"
 msgstr "Lejátszás"
 
-#: include/functions.php:3007
+#: include/functions.php:3014
 msgid " - "
 msgstr "-"
 
-#: include/functions.php:3029 include/functions.php:3346 classes/rpc.php:360
+#: include/functions.php:3036 include/functions.php:3353 classes/rpc.php:360
 msgid "no tags"
 msgstr "nincs címke"
 
-#: include/functions.php:3039 classes/feeds.php:650
+#: include/functions.php:3046 classes/feeds.php:653
 msgid "Edit tags for this article"
 msgstr "Címkék hozzáadása a hírhez"
 
-#: include/functions.php:3068 classes/feeds.php:605
+#: include/functions.php:3075 classes/feeds.php:608
 msgid "Originally from:"
 msgstr "Eredeti innen:"
 
-#: include/functions.php:3081 classes/feeds.php:618 classes/pref/feeds.php:507
+#: include/functions.php:3088 classes/feeds.php:621 classes/pref/feeds.php:507
 msgid "Feed URL"
 msgstr "Hírcsatorna URL"
 
-#: include/functions.php:3110
+#: include/functions.php:3117
 msgid "Related"
 msgstr "Kapcsolódik"
 
-#: include/functions.php:3137 classes/dlg.php:43 classes/dlg.php:162
+#: include/functions.php:3144 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:1553
 #: classes/pref/feeds.php:1624 plugins/import_export/init.php:407
 #: plugins/import_export/init.php:431 plugins/share/init.php:67
-#: plugins/updater/init.php:329
+#: plugins/updater/init.php:330
 msgid "Close this window"
 msgstr "Ablak bezárása"
 
-#: include/functions.php:3371
+#: include/functions.php:3378
 msgid "(edit note)"
 msgstr "(jegyzet szerkesztése)"
 
-#: include/functions.php:3604
+#: include/functions.php:3611
 msgid "unknown type"
 msgstr "ismeretlen hírcsatornatípus"
 
-#: include/functions.php:3654
+#: include/functions.php:3661
 msgid "Attachments"
 msgstr "Csatolmányok:"
 
@@ -941,7 +942,7 @@ msgstr "Hír publikálása"
 msgid "Assign tags"
 msgstr "Címke hozzáadása"
 
-#: include/localized_schema.php:14 js/viewfeed.js:1809
+#: include/localized_schema.php:14 js/viewfeed.js:1849
 msgid "Assign label"
 msgstr "Címke hozzáadása"
 
@@ -1392,7 +1393,7 @@ msgstr "Azonosítás"
 msgid "Login"
 msgstr "Belépés"
 
-#: classes/dlg.php:276 classes/dlg.php:732 classes/pref/prefs.php:196
+#: classes/dlg.php:276 classes/dlg.php:732 classes/pref/prefs.php:202
 #: classes/pref/feeds.php:569 classes/pref/feeds.php:793
 msgid "Password"
 msgstr "Jelszó"
@@ -1492,7 +1493,7 @@ msgstr "Megtekintés RSS-ként"
 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:591 plugins/updater/init.php:303
+#: classes/dlg.php:591 plugins/updater/init.php:304
 #, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "Új Tiny Tiny RSS verzió érhető el (%s)."
@@ -1626,7 +1627,7 @@ msgstr "Továbbítás emaiben"
 msgid "Feed:"
 msgstr "Hírcsatorna:"
 
-#: classes/feeds.php:201 classes/feeds.php:795
+#: classes/feeds.php:201 classes/feeds.php:798
 msgid "Feed not found."
 msgstr "Hírcsatorna nem található"
 
@@ -1634,19 +1635,24 @@ msgstr "Hírcsatorna nem található"
 msgid "mark as read"
 msgstr "olvasottként jelöl"
 
-#: classes/feeds.php:696
+#: classes/feeds.php:553
+#, fuzzy
+msgid "Collapse article"
+msgstr "Hír bezárása"
+
+#: classes/feeds.php:699
 msgid "No unread articles found to display."
 msgstr "Nincs megjeleníthető olvasatlan hír."
 
-#: classes/feeds.php:699
+#: classes/feeds.php:702
 msgid "No updated articles found to display."
 msgstr "Nincs megjeleníthető friss hír."
 
-#: classes/feeds.php:702
+#: classes/feeds.php:705
 msgid "No starred articles found to display."
 msgstr "Nincs megjeleníthető csillagozott hír."
 
-#: classes/feeds.php:706
+#: classes/feeds.php:709
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
@@ -1655,21 +1661,21 @@ 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:708
+#: classes/feeds.php:711
 msgid "No articles found to display."
 msgstr "Nincs megjeleníthető hír."
 
-#: classes/feeds.php:723 classes/feeds.php:904
+#: classes/feeds.php:726 classes/feeds.php:907
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "Hírcsatornák utolsó frissítése: %s"
 
-#: classes/feeds.php:733 classes/feeds.php:914
+#: classes/feeds.php:736 classes/feeds.php:917
 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:894
+#: classes/feeds.php:897
 msgid "No feed selected."
 msgstr "Nincs kiválasztott hírcsatorna."
 
@@ -1995,76 +2001,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:63
+#: classes/pref/prefs.php:69
 msgid "The configuration was saved."
 msgstr "Beállítások elmentve."
 
-#: classes/pref/prefs.php:77
+#: classes/pref/prefs.php:83
 #, php-format
 msgid "Unknown option: %s"
 msgstr "Ismeretlen beállítás: %s"
 
-#: classes/pref/prefs.php:91
+#: classes/pref/prefs.php:97
 msgid "Your personal data has been saved."
 msgstr "A személyes adatai el lettek mentve."
 
-#: classes/pref/prefs.php:131
+#: classes/pref/prefs.php:137
 msgid "Personal data / Authentication"
 msgstr "Személyes adatok / Azonosítás"
 
-#: classes/pref/prefs.php:151
+#: classes/pref/prefs.php:157
 msgid "Personal data"
 msgstr "Személyes adatok"
 
-#: classes/pref/prefs.php:161
+#: classes/pref/prefs.php:167
 msgid "Full name"
 msgstr "Teljes név"
 
-#: classes/pref/prefs.php:165
+#: classes/pref/prefs.php:171
 msgid "E-mail"
 msgstr "E-mail"
 
-#: classes/pref/prefs.php:171
+#: classes/pref/prefs.php:177
 msgid "Access level"
 msgstr "Hozzáférési szint"
 
-#: classes/pref/prefs.php:181
+#: classes/pref/prefs.php:187
 msgid "Save data"
 msgstr "Adatok mentése"
 
-#: classes/pref/prefs.php:203
+#: classes/pref/prefs.php:209
 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:235
+#: classes/pref/prefs.php:241
 msgid "Old password"
 msgstr "Régi jelszó"
 
-#: classes/pref/prefs.php:238
+#: classes/pref/prefs.php:244
 msgid "New password"
 msgstr "Új jelszó"
 
-#: classes/pref/prefs.php:243
+#: classes/pref/prefs.php:249
 msgid "Confirm password"
 msgstr "Jelszó még egyszer"
 
-#: classes/pref/prefs.php:253
+#: classes/pref/prefs.php:259
 msgid "Change password"
 msgstr "Jelszó megváltoztatása"
 
-#: classes/pref/prefs.php:259
+#: classes/pref/prefs.php:265
 msgid "One time passwords / Authenticator"
 msgstr "Egyszer használatos jelszavak / Hitelesítő"
 
-#: classes/pref/prefs.php:288 classes/pref/prefs.php:339
+#: classes/pref/prefs.php:294 classes/pref/prefs.php:345
 msgid "Enter your password"
 msgstr "Adja meg a jelszavát"
 
-#: classes/pref/prefs.php:299
+#: classes/pref/prefs.php:305
 msgid "Disable OTP"
 msgstr "OTP letiltása"
 
-#: classes/pref/prefs.php:305
+#: classes/pref/prefs.php:311
 msgid ""
 "You will need a compatible Authenticator to use this. Changing your password "
 "would automatically disable OTP."
@@ -2072,99 +2078,90 @@ 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:307
+#: classes/pref/prefs.php:313
 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:348
+#: classes/pref/prefs.php:354
 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:356
+#: classes/pref/prefs.php:362
 msgid "Enable OTP"
 msgstr "OTP engedélyezése"
 
-#: classes/pref/prefs.php:482
+#: classes/pref/prefs.php:493
 msgid "Customize"
 msgstr "Testreszabás"
 
-#: classes/pref/prefs.php:501 classes/pref/prefs.php:508
-#: classes/pref/prefs.php:513
-msgid "Yes"
-msgstr "Igen"
-
-#: classes/pref/prefs.php:503 classes/pref/prefs.php:513
-msgid "No"
-msgstr "Nem"
-
-#: classes/pref/prefs.php:543
+#: classes/pref/prefs.php:552
 msgid "Register"
 msgstr "Regisztráció"
 
-#: classes/pref/prefs.php:547
+#: classes/pref/prefs.php:556
 msgid "Clear"
 msgstr "Töröl"
 
-#: classes/pref/prefs.php:553
+#: classes/pref/prefs.php:562
 #, php-format
 msgid "Current server time: %s (UTC)"
 msgstr "Aktuális szerveridő: %s (UTC)"
 
-#: classes/pref/prefs.php:582
+#: classes/pref/prefs.php:595
 msgid "Save configuration"
 msgstr "Beállítások mentése"
 
-#: classes/pref/prefs.php:585
+#: classes/pref/prefs.php:598
 msgid "Manage profiles"
 msgstr "Profilok kezelése"
 
-#: classes/pref/prefs.php:588
+#: classes/pref/prefs.php:601
 msgid "Reset to defaults"
 msgstr "Alapértelmezett beállítások"
 
-#: classes/pref/prefs.php:600
+#: classes/pref/prefs.php:613
 msgid "Show additional preferences"
 msgstr "További beállítások megjelenítése"
 
-#: classes/pref/prefs.php:612 classes/pref/prefs.php:614
+#: classes/pref/prefs.php:625 classes/pref/prefs.php:627
 msgid "Plugins"
 msgstr ""
 
-#: classes/pref/prefs.php:642
+#: classes/pref/prefs.php:655
 msgid "System plugins"
 msgstr ""
 
-#: classes/pref/prefs.php:646 classes/pref/prefs.php:695
+#: classes/pref/prefs.php:659 classes/pref/prefs.php:708
 msgid "Plugin"
 msgstr ""
 
-#: classes/pref/prefs.php:647 classes/pref/prefs.php:696
+#: classes/pref/prefs.php:660 classes/pref/prefs.php:709
 msgid "Description"
 msgstr ""
 
-#: classes/pref/prefs.php:648 classes/pref/prefs.php:697
+#: classes/pref/prefs.php:661 classes/pref/prefs.php:710
 msgid "Version"
 msgstr ""
 
-#: classes/pref/prefs.php:649 classes/pref/prefs.php:698
+#: classes/pref/prefs.php:662 classes/pref/prefs.php:711
 msgid "Author"
 msgstr ""
 
-#: classes/pref/prefs.php:682 classes/pref/prefs.php:733
+#: classes/pref/prefs.php:695 classes/pref/prefs.php:746
 #, fuzzy
 msgid "Clear data"
 msgstr "Hírcsatorna-adatok törlése"
 
-#: classes/pref/prefs.php:691
+#: classes/pref/prefs.php:704
 msgid "User plugins"
 msgstr ""
 
-#: classes/pref/prefs.php:748
+#: classes/pref/prefs.php:761
 #, 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
+#: classes/pref/prefs.php:816 classes/pref/prefs.php:834
 msgid "Incorrect password"
 msgstr "Érvénytelen jelszó"
 
@@ -2443,6 +2440,10 @@ msgstr "Üdv,"
 msgid "Regular version"
 msgstr "Alap változat"
 
+#: plugins/close_button/init.php:24
+msgid "Close article"
+msgstr "Hír bezárása"
+
 #: plugins/nsfw/init.php:32 plugins/nsfw/init.php:43
 msgid "Not work safe (click to toggle)"
 msgstr ""
@@ -2679,16 +2680,16 @@ msgstr "Hír csillagozása"
 msgid "Share on Google+"
 msgstr "Megosztás Google+ -on"
 
-#: plugins/updater/init.php:294 plugins/updater/init.php:306
+#: plugins/updater/init.php:295 plugins/updater/init.php:307
 #: plugins/updater/updater.js:10
 msgid "Update Tiny Tiny RSS"
 msgstr "Tiny Tiny RSS frissítése"
 
-#: plugins/updater/init.php:309
+#: plugins/updater/init.php:310
 msgid "Your Tiny Tiny RSS installation is up to date."
 msgstr "A Tiny Tiny RSS telepítés naprakész."
 
-#: plugins/updater/init.php:319
+#: plugins/updater/init.php:320
 msgid ""
 "Do not close this dialog until updating is finished. Backup your tt-rss "
 "directory before continuing."
@@ -2696,11 +2697,11 @@ 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/init.php:322
+#: plugins/updater/init.php:323
 msgid "Ready to update."
 msgstr "Frissítésre kész."
 
-#: plugins/updater/init.php:327
+#: plugins/updater/init.php:328
 msgid "Start update"
 msgstr "Frissítés indtása"
 
@@ -2811,7 +2812,7 @@ msgstr "Adja meg a kategória címét:"
 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:1597 js/tt-rss.js:350 js/tt-rss.js:721
+#: js/functions.js:1597 js/tt-rss.js:350 js/tt-rss.js:729
 msgid "You can't edit this kind of feed."
 msgstr "Ezt a hírcsatornatípust nem szerkesztheted."
 
@@ -3073,11 +3074,11 @@ msgstr "Ez a hírcsatorna típust nem lehet újraponszámozni."
 msgid "Rescore articles in %s?"
 msgstr "Újrapontszámozza %s híreit?"
 
-#: js/tt-rss.js:680
+#: js/tt-rss.js:688
 msgid "Please enable mail plugin first."
 msgstr "Először engedélyezze a mail plugint."
 
-#: js/tt-rss.js:842
+#: js/tt-rss.js:850
 msgid "New version available!"
 msgstr "Új verzió érhető el."
 
@@ -3102,7 +3103,7 @@ msgstr "Publikálás visszavonása"
 
 #: 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/mailto/init.js:7
+#: js/viewfeed.js:1053 js/viewfeed.js:1967 plugins/mailto/init.js:7
 #: plugins/mail/mail.js:7
 msgid "No articles are selected."
 msgstr "Nincsen kiválasztott hír."
@@ -3147,27 +3148,27 @@ msgstr "Nincs megjelölendő hír."
 msgid "Mark %d article(s) as read?"
 msgstr "%d hír megjelölése olvasottként?"
 
-#: js/viewfeed.js:1744
+#: js/viewfeed.js:1784
 msgid "Open original article"
 msgstr "Eredeti hír megjelenítése"
 
-#: js/viewfeed.js:1814
+#: js/viewfeed.js:1854
 msgid "Remove label"
 msgstr "Címke eltávolítás"
 
-#: js/viewfeed.js:1838
+#: js/viewfeed.js:1878
 msgid "Playing..."
 msgstr "Lejátszás..."
 
-#: js/viewfeed.js:1839
+#: js/viewfeed.js:1879
 msgid "Click to pause"
 msgstr "Kattintson a megállításhoz"
 
-#: js/viewfeed.js:1896
+#: js/viewfeed.js:1936
 msgid "Please enter new score for selected articles:"
 msgstr "Adjon meg egy új pontszámot a kijelölt hírekhez:"
 
-#: js/viewfeed.js:1938
+#: js/viewfeed.js:1978
 msgid "Please enter new score for this article:"
 msgstr "Adjon meg egy új pontszámot a hírhez:"
 
@@ -3264,6 +3265,12 @@ 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 "Yes"
+#~ msgstr "Igen"
+
+#~ msgid "No"
+#~ msgstr "Nem"
+
 #~ msgid "Comments?"
 #~ msgstr "Hozzászólások?"
 
diff --git a/locale/it_IT/LC_MESSAGES/messages.mo b/locale/it_IT/LC_MESSAGES/messages.mo
index 1486c6d4c..bd00f3ce3 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 1a940782c..89be52e67 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-19 22:42+0400\n"
+"POT-Creation-Date: 2013-03-20 10:24+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"
@@ -291,11 +291,11 @@ msgstr "Adattivo"
 msgid "All Articles"
 msgstr "Tutti gli articoli"
 
-#: index.php:169 include/functions.php:1911 classes/feeds.php:106
+#: index.php:169 include/functions.php:1915 classes/feeds.php:106
 msgid "Starred"
 msgstr "Con stella"
 
-#: index.php:170 include/functions.php:1912 classes/feeds.php:107
+#: index.php:170 include/functions.php:1916 classes/feeds.php:107
 msgid "Published"
 msgstr "Pubblicati"
 
@@ -335,7 +335,7 @@ msgstr "Punteggio"
 msgid "Update"
 msgstr "Aggiorna"
 
-#: index.php:191 index.php:221 include/functions.php:1902
+#: index.php:191 index.php:221 include/functions.php:1906
 #: include/localized_schema.php:10 classes/feeds.php:111 classes/feeds.php:136
 #: classes/feeds.php:408 js/FeedTree.js:128 js/FeedTree.js:156
 #: plugins/digest/digest.js:630
@@ -396,7 +396,7 @@ msgstr "Passa al sommario..."
 msgid "Show tag cloud..."
 msgstr "Mostra nuvola etichette..."
 
-#: index.php:229 include/functions.php:1889
+#: index.php:229 include/functions.php:1893
 #, fuzzy
 msgid "Toggle widescreen mode"
 msgstr "Inverti con stella"
@@ -422,8 +422,8 @@ msgstr "Aiuto scorciatoie da tastiera"
 msgid "Logout"
 msgstr "Esci"
 
-#: prefs.php:28 prefs.php:99 include/functions.php:1914
-#: classes/pref/prefs.php:371
+#: prefs.php:28 prefs.php:99 include/functions.php:1918
+#: classes/pref/prefs.php:377
 msgid "Preferences"
 msgstr "Preferenze"
 
@@ -444,8 +444,8 @@ msgstr "Notiziari"
 msgid "Filters"
 msgstr "Filtri"
 
-#: prefs.php:108 mobile/mobile-functions.php:205 include/functions.php:1117
-#: include/functions.php:1738 classes/pref/labels.php:90
+#: prefs.php:108 mobile/mobile-functions.php:205 include/functions.php:1121
+#: include/functions.php:1742 classes/pref/labels.php:90
 msgid "Labels"
 msgstr "Etichette"
 
@@ -543,8 +543,8 @@ msgstr ""
 msgid "Home"
 msgstr "Casa"
 
-#: mobile/mobile-functions.php:178 include/functions.php:1115
-#: include/functions.php:1736
+#: mobile/mobile-functions.php:178 include/functions.php:1119
+#: include/functions.php:1740
 msgid "Special"
 msgstr "Speciale"
 
@@ -586,9 +586,9 @@ msgstr "Ordinare i notiziari per numero di non letti"
 msgid "Reverse headline order (oldest first)"
 msgstr "Invertire l&apos;ordine del sommario (prima i più vecchi)"
 
-#: include/digest.php:131 include/functions.php:1126
-#: include/functions.php:1639 include/functions.php:1724
-#: include/functions.php:1746 classes/opml.php:416 classes/pref/feeds.php:188
+#: include/digest.php:131 include/functions.php:1130
+#: include/functions.php:1643 include/functions.php:1728
+#: include/functions.php:1750 classes/opml.php:416 classes/pref/feeds.php:188
 msgid "Uncategorized"
 msgstr "Senza categoria"
 
@@ -601,312 +601,313 @@ msgstr "%d articoli archiviati"
 msgid "No feeds found."
 msgstr "Nessun notiziario trovato."
 
-#: include/functions.php:697
+#: include/functions.php:701
 msgid "Session failed to validate (incorrect IP)"
 msgstr "La validazione della sessione è fallita (IP non corretto)"
 
-#: include/functions.php:1588 classes/dlg.php:371 classes/pref/filters.php:368
+#: include/functions.php:1592 classes/dlg.php:371 classes/pref/filters.php:368
 msgid "All feeds"
 msgstr "Tutti i notiziari"
 
-#: include/functions.php:1789
+#: include/functions.php:1793
 msgid "Starred articles"
 msgstr "Articoli con stella"
 
-#: include/functions.php:1791
+#: include/functions.php:1795
 msgid "Published articles"
 msgstr "Articoli pubblicati"
 
-#: include/functions.php:1793
+#: include/functions.php:1797
 msgid "Fresh articles"
 msgstr "Articoli nuovi"
 
-#: include/functions.php:1795 include/functions.php:1909
+#: include/functions.php:1799 include/functions.php:1913
 msgid "All articles"
 msgstr "Tutti gli articoli"
 
-#: include/functions.php:1797
+#: include/functions.php:1801
 msgid "Archived articles"
 msgstr "Articoli archiviati"
 
-#: include/functions.php:1799
+#: include/functions.php:1803
 msgid "Recently read"
 msgstr ""
 
-#: include/functions.php:1866
+#: include/functions.php:1870
 msgid "Navigation"
 msgstr "Navigazione"
 
-#: include/functions.php:1867
+#: include/functions.php:1871
 #, fuzzy
 msgid "Open next feed"
 msgstr "Su lettura passare al prossimo notiziario"
 
-#: include/functions.php:1868
+#: include/functions.php:1872
 msgid "Open previous feed"
 msgstr ""
 
-#: include/functions.php:1869
+#: include/functions.php:1873
 #, fuzzy
 msgid "Open next article"
 msgstr "Apri articolo di origine"
 
-#: include/functions.php:1870
+#: include/functions.php:1874
 #, fuzzy
 msgid "Open previous article"
 msgstr "Apri articolo di origine"
 
-#: include/functions.php:1871
+#: include/functions.php:1875
 msgid "Open next article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1872
+#: include/functions.php:1876
 msgid "Open previous article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1873
+#: include/functions.php:1877
 msgid "Show search dialog"
 msgstr "Mostra il dialogo di ricerca"
 
-#: include/functions.php:1874
+#: include/functions.php:1878
 #, fuzzy
 msgid "Article"
 msgstr "Tutti gli articoli"
 
-#: include/functions.php:1875
+#: include/functions.php:1879
 msgid "Toggle starred"
 msgstr "Inverti con stella"
 
-#: include/functions.php:1876
+#: include/functions.php:1880
 msgid "Toggle published"
 msgstr "Inverti pubblicati"
 
-#: include/functions.php:1877
+#: include/functions.php:1881
 msgid "Toggle unread"
 msgstr "Inverti non letti"
 
-#: include/functions.php:1878
+#: include/functions.php:1882
 msgid "Edit tags"
 msgstr "Modifica etichette"
 
-#: include/functions.php:1879
+#: include/functions.php:1883
 #, fuzzy
 msgid "Dismiss selected"
 msgstr "Rimuovi gli articoli selezionati"
 
-#: include/functions.php:1880
+#: include/functions.php:1884
 #, fuzzy
 msgid "Dismiss read"
 msgstr "Rimuovi articoli letti"
 
-#: include/functions.php:1881
+#: include/functions.php:1885
 #, fuzzy
 msgid "Open in new window"
 msgstr "Aprire gli articoli in una nuova finestra"
 
-#: include/functions.php:1882 js/viewfeed.js:1758
+#: include/functions.php:1886 js/viewfeed.js:1798
 msgid "Mark below as read"
 msgstr ""
 
-#: include/functions.php:1883 js/viewfeed.js:1752
+#: include/functions.php:1887 js/viewfeed.js:1792
 msgid "Mark above as read"
 msgstr ""
 
-#: include/functions.php:1884
+#: include/functions.php:1888
 #, fuzzy
 msgid "Scroll down"
 msgstr "Fatto tutto."
 
-#: include/functions.php:1885
+#: include/functions.php:1889
 msgid "Scroll up"
 msgstr ""
 
-#: include/functions.php:1886
+#: include/functions.php:1890
 #, fuzzy
 msgid "Select article under cursor"
 msgstr "Seleziona l&apos;articolo sotto il cursore del mouse"
 
-#: include/functions.php:1887
+#: include/functions.php:1891
 msgid "Email article"
 msgstr ""
 
-#: include/functions.php:1888 plugins/close_button/init.php:24
-msgid "Close article"
-msgstr ""
+#: include/functions.php:1892
+#, fuzzy
+msgid "Close/collapse article"
+msgstr "Cambio punteggio degli articoli"
 
-#: include/functions.php:1890
+#: include/functions.php:1894
 #, fuzzy
 msgid "Article selection"
 msgstr "Azioni sull&apos;articolo attivo"
 
-#: include/functions.php:1891
+#: include/functions.php:1895
 msgid "Select all articles"
 msgstr ""
 
-#: include/functions.php:1892
+#: include/functions.php:1896
 #, fuzzy
 msgid "Select unread"
 msgstr "Inverti non letti"
 
-#: include/functions.php:1893
+#: include/functions.php:1897
 #, fuzzy
 msgid "Select starred"
 msgstr "Imposta con stella"
 
-#: include/functions.php:1894
+#: include/functions.php:1898
 #, fuzzy
 msgid "Select published"
 msgstr "Articoli pubblicati"
 
-#: include/functions.php:1895
+#: include/functions.php:1899
 #, fuzzy
 msgid "Invert selection"
 msgstr "Selezione:"
 
-#: include/functions.php:1896
+#: include/functions.php:1900
 msgid "Deselect everything"
 msgstr ""
 
-#: include/functions.php:1897 classes/pref/feeds.php:488
+#: include/functions.php:1901 classes/pref/feeds.php:488
 #: classes/pref/feeds.php:719
 msgid "Feed"
 msgstr "Notiziario"
 
-#: include/functions.php:1898
+#: include/functions.php:1902
 #, fuzzy
 msgid "Refresh current feed"
 msgstr "Aggiorna notiziario attivo"
 
-#: include/functions.php:1899
+#: include/functions.php:1903
 #, fuzzy
 msgid "Un/hide read feeds"
 msgstr "Visualizza/Nascondi notiziari letti"
 
-#: include/functions.php:1900 classes/pref/feeds.php:1240
+#: include/functions.php:1904 classes/pref/feeds.php:1240
 msgid "Subscribe to feed"
 msgstr "Sottoscrivi il notiziario"
 
-#: include/functions.php:1901 js/FeedTree.js:135 js/PrefFeedTree.js:67
+#: include/functions.php:1905 js/FeedTree.js:135 js/PrefFeedTree.js:67
 msgid "Edit feed"
 msgstr "Modifica notiziario"
 
-#: include/functions.php:1903
+#: include/functions.php:1907
 #, fuzzy
 msgid "Reverse headlines"
 msgstr "Invertire l&apos;ordine dei sommari"
 
-#: include/functions.php:1904
+#: include/functions.php:1908
 #, fuzzy
 msgid "Debug feed update"
 msgstr "Disabilitare aggiornamenti"
 
-#: include/functions.php:1905 js/FeedTree.js:177
+#: include/functions.php:1909 js/FeedTree.js:177
 msgid "Mark all feeds as read"
 msgstr "Segna tutti i notiziari come letti"
 
-#: include/functions.php:1906
+#: include/functions.php:1910
 #, fuzzy
 msgid "Un/collapse current category"
 msgstr "Mettere nella categoria:"
 
-#: include/functions.php:1907
+#: include/functions.php:1911
 #, fuzzy
 msgid "Toggle combined mode"
 msgstr "Inverti pubblicati"
 
-#: include/functions.php:1908
+#: include/functions.php:1912
 #, fuzzy
 msgid "Go to"
 msgstr "Vai a..."
 
-#: include/functions.php:1910
+#: include/functions.php:1914
 msgid "Fresh"
 msgstr ""
 
-#: include/functions.php:1913
+#: include/functions.php:1917
 msgid "Tag cloud"
 msgstr "Nuvola etichette"
 
-#: include/functions.php:1915
+#: include/functions.php:1919
 #, fuzzy
 msgid "Other"
 msgstr "Altri notiziari"
 
-#: include/functions.php:1916 classes/pref/labels.php:281
+#: include/functions.php:1920 classes/pref/labels.php:281
 msgid "Create label"
 msgstr "Crea etichetta"
 
-#: include/functions.php:1917 classes/pref/filters.php:587
+#: include/functions.php:1921 classes/pref/filters.php:587
 msgid "Create filter"
 msgstr "Crea filtro"
 
-#: include/functions.php:1918
+#: include/functions.php:1922
 #, fuzzy
 msgid "Un/collapse sidebar"
 msgstr "Contrai la barra laterale"
 
-#: include/functions.php:1919
+#: include/functions.php:1923
 #, fuzzy
 msgid "Show help dialog"
 msgstr "Mostra il dialogo di ricerca"
 
-#: include/functions.php:2401
+#: include/functions.php:2405
 #, php-format
 msgid "Search results: %s"
 msgstr ""
 
-#: include/functions.php:2886 js/viewfeed.js:1845
+#: include/functions.php:2892 js/viewfeed.js:1885
 msgid "Click to play"
 msgstr "Fare clic per riprodurre"
 
-#: include/functions.php:2887 js/viewfeed.js:1844
+#: include/functions.php:2893 js/viewfeed.js:1884
 msgid "Play"
 msgstr "Riproduci"
 
-#: include/functions.php:3007
+#: include/functions.php:3014
 msgid " - "
 msgstr " - "
 
-#: include/functions.php:3029 include/functions.php:3346 classes/rpc.php:360
+#: include/functions.php:3036 include/functions.php:3353 classes/rpc.php:360
 msgid "no tags"
 msgstr "nessuna etichetta"
 
-#: include/functions.php:3039 classes/feeds.php:650
+#: include/functions.php:3046 classes/feeds.php:653
 msgid "Edit tags for this article"
 msgstr "Modifica le etichette per questo articolo"
 
-#: include/functions.php:3068 classes/feeds.php:605
+#: include/functions.php:3075 classes/feeds.php:608
 msgid "Originally from:"
 msgstr "Originariamente da:"
 
-#: include/functions.php:3081 classes/feeds.php:618 classes/pref/feeds.php:507
+#: include/functions.php:3088 classes/feeds.php:621 classes/pref/feeds.php:507
 msgid "Feed URL"
 msgstr "URL del notiziario"
 
-#: include/functions.php:3110
+#: include/functions.php:3117
 msgid "Related"
 msgstr ""
 
-#: include/functions.php:3137 classes/dlg.php:43 classes/dlg.php:162
+#: include/functions.php:3144 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:1553
 #: classes/pref/feeds.php:1624 plugins/import_export/init.php:407
 #: plugins/import_export/init.php:431 plugins/share/init.php:67
-#: plugins/updater/init.php:329
+#: plugins/updater/init.php:330
 msgid "Close this window"
 msgstr "Chiudi questa finestra"
 
-#: include/functions.php:3371
+#: include/functions.php:3378
 msgid "(edit note)"
 msgstr "(modifica note)"
 
-#: include/functions.php:3604
+#: include/functions.php:3611
 msgid "unknown type"
 msgstr "tipo sconosciuto"
 
-#: include/functions.php:3654
+#: include/functions.php:3661
 #, fuzzy
 msgid "Attachments"
 msgstr "Allegati:"
@@ -944,7 +945,7 @@ msgstr "Pubblica articolo"
 msgid "Assign tags"
 msgstr "Assegna etichette"
 
-#: include/localized_schema.php:14 js/viewfeed.js:1809
+#: include/localized_schema.php:14 js/viewfeed.js:1849
 msgid "Assign label"
 msgstr "Assegna etichetta"
 
@@ -1403,7 +1404,7 @@ msgstr "Autenticazione"
 msgid "Login"
 msgstr "Accesso"
 
-#: classes/dlg.php:276 classes/dlg.php:732 classes/pref/prefs.php:196
+#: classes/dlg.php:276 classes/dlg.php:732 classes/pref/prefs.php:202
 #: classes/pref/feeds.php:569 classes/pref/feeds.php:793
 msgid "Password"
 msgstr "Password"
@@ -1505,7 +1506,7 @@ 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:591 plugins/updater/init.php:303
+#: classes/dlg.php:591 plugins/updater/init.php:304
 #, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "È disponibile una nuova versione di Tiny Tiny RSS (%s)."
@@ -1639,7 +1640,7 @@ msgstr "Inoltra per email"
 msgid "Feed:"
 msgstr "Notiziario:"
 
-#: classes/feeds.php:201 classes/feeds.php:795
+#: classes/feeds.php:201 classes/feeds.php:798
 msgid "Feed not found."
 msgstr "Notiziario non trovato."
 
@@ -1647,19 +1648,24 @@ msgstr "Notiziario non trovato."
 msgid "mark as read"
 msgstr "segna come letto"
 
-#: classes/feeds.php:696
+#: classes/feeds.php:553
+#, fuzzy
+msgid "Collapse article"
+msgstr "Tutti gli articoli"
+
+#: classes/feeds.php:699
 msgid "No unread articles found to display."
 msgstr "Nessun articolo non letto trovato da visualizzare."
 
-#: classes/feeds.php:699
+#: classes/feeds.php:702
 msgid "No updated articles found to display."
 msgstr "Nessun articolo non aggiornato trovato da visualizzare."
 
-#: classes/feeds.php:702
+#: classes/feeds.php:705
 msgid "No starred articles found to display."
 msgstr "Nessun articolo con stella trovato da visualizzare."
 
-#: classes/feeds.php:706
+#: classes/feeds.php:709
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
@@ -1668,21 +1674,21 @@ msgstr ""
 "gli articoli alle etichette (vedere il menù «Azioni» sopra) o utilizzare un "
 "filtro."
 
-#: classes/feeds.php:708
+#: classes/feeds.php:711
 msgid "No articles found to display."
 msgstr "Nessun articolo trovato da visualizzare."
 
-#: classes/feeds.php:723 classes/feeds.php:904
+#: classes/feeds.php:726 classes/feeds.php:907
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "Ultimo aggiornamento notiziari alle %s"
 
-#: classes/feeds.php:733 classes/feeds.php:914
+#: classes/feeds.php:736 classes/feeds.php:917
 msgid "Some feeds have update errors (click for details)"
 msgstr ""
 "Qualche notiziario ha degli errori di aggiornamento (fare clic per dettagli)"
 
-#: classes/feeds.php:894
+#: classes/feeds.php:897
 msgid "No feed selected."
 msgstr "Nessun notiziario selezionato."
 
@@ -2012,179 +2018,170 @@ msgstr "Le password inserite non corrispondono."
 msgid "Function not supported by authentication module."
 msgstr ""
 
-#: classes/pref/prefs.php:63
+#: classes/pref/prefs.php:69
 msgid "The configuration was saved."
 msgstr "La configurazione è stata salvata."
 
-#: classes/pref/prefs.php:77
+#: classes/pref/prefs.php:83
 #, php-format
 msgid "Unknown option: %s"
 msgstr "Opzione sconosciuta: %s"
 
-#: classes/pref/prefs.php:91
+#: classes/pref/prefs.php:97
 msgid "Your personal data has been saved."
 msgstr "I dati personali sono stati salvati."
 
-#: classes/pref/prefs.php:131
+#: classes/pref/prefs.php:137
 #, fuzzy
 msgid "Personal data / Authentication"
 msgstr "Autenticazione"
 
-#: classes/pref/prefs.php:151
+#: classes/pref/prefs.php:157
 msgid "Personal data"
 msgstr ""
 
-#: classes/pref/prefs.php:161
+#: classes/pref/prefs.php:167
 msgid "Full name"
 msgstr "Nome completo"
 
-#: classes/pref/prefs.php:165
+#: classes/pref/prefs.php:171
 msgid "E-mail"
 msgstr "Email"
 
-#: classes/pref/prefs.php:171
+#: classes/pref/prefs.php:177
 msgid "Access level"
 msgstr "Livello di accesso"
 
-#: classes/pref/prefs.php:181
+#: classes/pref/prefs.php:187
 msgid "Save data"
 msgstr "Salva dati"
 
-#: classes/pref/prefs.php:203
+#: classes/pref/prefs.php:209
 msgid "Your password is at default value, please change it."
 msgstr "La password è impostata al valore predefinito: cambiarla."
 
-#: classes/pref/prefs.php:235
+#: classes/pref/prefs.php:241
 msgid "Old password"
 msgstr "Vecchia password"
 
-#: classes/pref/prefs.php:238
+#: classes/pref/prefs.php:244
 msgid "New password"
 msgstr "Nuova password"
 
-#: classes/pref/prefs.php:243
+#: classes/pref/prefs.php:249
 msgid "Confirm password"
 msgstr "Conferma password"
 
-#: classes/pref/prefs.php:253
+#: classes/pref/prefs.php:259
 msgid "Change password"
 msgstr "Cambia password"
 
-#: classes/pref/prefs.php:259
+#: classes/pref/prefs.php:265
 msgid "One time passwords / Authenticator"
 msgstr ""
 
-#: classes/pref/prefs.php:288 classes/pref/prefs.php:339
+#: classes/pref/prefs.php:294 classes/pref/prefs.php:345
 #, fuzzy
 msgid "Enter your password"
 msgstr "Nome utente o password sbagliati"
 
-#: classes/pref/prefs.php:299
+#: classes/pref/prefs.php:305
 #, fuzzy
 msgid "Disable OTP"
 msgstr "Disabilitare aggiornamenti"
 
-#: classes/pref/prefs.php:305
+#: classes/pref/prefs.php:311
 msgid ""
 "You will need a compatible Authenticator to use this. Changing your password "
 "would automatically disable OTP."
 msgstr ""
 
-#: classes/pref/prefs.php:307
+#: classes/pref/prefs.php:313
 msgid "Scan the following code by the Authenticator application:"
 msgstr ""
 
-#: classes/pref/prefs.php:348
+#: classes/pref/prefs.php:354
 msgid "I have scanned the code and would like to enable OTP"
 msgstr ""
 
-#: classes/pref/prefs.php:356
+#: classes/pref/prefs.php:362
 #, fuzzy
 msgid "Enable OTP"
 msgstr "Abilitato"
 
-#: classes/pref/prefs.php:482
+#: classes/pref/prefs.php:493
 msgid "Customize"
 msgstr "Personalizza"
 
-#: classes/pref/prefs.php:501 classes/pref/prefs.php:508
-#: classes/pref/prefs.php:513
-msgid "Yes"
-msgstr "Sì"
-
-#: classes/pref/prefs.php:503 classes/pref/prefs.php:513
-msgid "No"
-msgstr "No"
-
-#: classes/pref/prefs.php:543
+#: classes/pref/prefs.php:552
 msgid "Register"
 msgstr "Registro"
 
-#: classes/pref/prefs.php:547
+#: classes/pref/prefs.php:556
 msgid "Clear"
 msgstr "Pulisci"
 
-#: classes/pref/prefs.php:553
+#: classes/pref/prefs.php:562
 #, php-format
 msgid "Current server time: %s (UTC)"
 msgstr ""
 
-#: classes/pref/prefs.php:582
+#: classes/pref/prefs.php:595
 msgid "Save configuration"
 msgstr "Salva configurazione"
 
-#: classes/pref/prefs.php:585
+#: classes/pref/prefs.php:598
 msgid "Manage profiles"
 msgstr "Gestisci profili"
 
-#: classes/pref/prefs.php:588
+#: classes/pref/prefs.php:601
 msgid "Reset to defaults"
 msgstr "Reimposta ai valori predefiniti"
 
-#: classes/pref/prefs.php:600
+#: classes/pref/prefs.php:613
 #, fuzzy
 msgid "Show additional preferences"
 msgstr "Esci dalle preferenze"
 
-#: classes/pref/prefs.php:612 classes/pref/prefs.php:614
+#: classes/pref/prefs.php:625 classes/pref/prefs.php:627
 msgid "Plugins"
 msgstr ""
 
-#: classes/pref/prefs.php:642
+#: classes/pref/prefs.php:655
 msgid "System plugins"
 msgstr ""
 
-#: classes/pref/prefs.php:646 classes/pref/prefs.php:695
+#: classes/pref/prefs.php:659 classes/pref/prefs.php:708
 msgid "Plugin"
 msgstr ""
 
-#: classes/pref/prefs.php:647 classes/pref/prefs.php:696
+#: classes/pref/prefs.php:660 classes/pref/prefs.php:709
 msgid "Description"
 msgstr ""
 
-#: classes/pref/prefs.php:648 classes/pref/prefs.php:697
+#: classes/pref/prefs.php:661 classes/pref/prefs.php:710
 msgid "Version"
 msgstr ""
 
-#: classes/pref/prefs.php:649 classes/pref/prefs.php:698
+#: classes/pref/prefs.php:662 classes/pref/prefs.php:711
 msgid "Author"
 msgstr ""
 
-#: classes/pref/prefs.php:682 classes/pref/prefs.php:733
+#: classes/pref/prefs.php:695 classes/pref/prefs.php:746
 #, fuzzy
 msgid "Clear data"
 msgstr "Pulisci i dati del notiziario"
 
-#: classes/pref/prefs.php:691
+#: classes/pref/prefs.php:704
 msgid "User plugins"
 msgstr ""
 
-#: classes/pref/prefs.php:748
+#: classes/pref/prefs.php:761
 #, fuzzy
 msgid "Enable selected plugins"
 msgstr "Abilitare le categorie dei notiziari"
 
-#: classes/pref/prefs.php:803 classes/pref/prefs.php:821
+#: classes/pref/prefs.php:816 classes/pref/prefs.php:834
 #, fuzzy
 msgid "Incorrect password"
 msgstr "Nome utente o password sbagliati"
@@ -2475,6 +2472,10 @@ msgstr "Salve,"
 msgid "Regular version"
 msgstr ""
 
+#: plugins/close_button/init.php:24
+msgid "Close article"
+msgstr ""
+
 #: plugins/nsfw/init.php:32 plugins/nsfw/init.php:43
 msgid "Not work safe (click to toggle)"
 msgstr ""
@@ -2713,29 +2714,29 @@ msgstr "Metti la stella all&apos;articolo"
 msgid "Share on Google+"
 msgstr "Condividi su Twitter"
 
-#: plugins/updater/init.php:294 plugins/updater/init.php:306
+#: plugins/updater/init.php:295 plugins/updater/init.php:307
 #: plugins/updater/updater.js:10
 #, fuzzy
 msgid "Update Tiny Tiny RSS"
 msgstr "Ritorna a Tiny Tiny RSS"
 
-#: plugins/updater/init.php:309
+#: plugins/updater/init.php:310
 #, fuzzy
 msgid "Your Tiny Tiny RSS installation is up to date."
 msgstr "Il database di Tiny Tiny RSS è aggiornato."
 
-#: plugins/updater/init.php:319
+#: plugins/updater/init.php:320
 msgid ""
 "Do not close this dialog until updating is finished. Backup your tt-rss "
 "directory before continuing."
 msgstr ""
 
-#: plugins/updater/init.php:322
+#: plugins/updater/init.php:323
 #, fuzzy
 msgid "Ready to update."
 msgstr "Ultimo aggiornamento:"
 
-#: plugins/updater/init.php:327
+#: plugins/updater/init.php:328
 #, fuzzy
 msgid "Start update"
 msgstr "Ultimo aggiornamento:"
@@ -2849,7 +2850,7 @@ msgstr "Inserire il titolo della categoria:"
 msgid "Generate new syndication address for this feed?"
 msgstr "Generare un nuovo indirizzo per questo notiziario?"
 
-#: js/functions.js:1597 js/tt-rss.js:350 js/tt-rss.js:721
+#: js/functions.js:1597 js/tt-rss.js:350 js/tt-rss.js:729
 msgid "You can't edit this kind of feed."
 msgstr "Impossibile modificare questo tipo di notiziario."
 
@@ -3117,12 +3118,12 @@ msgstr "Impossibile cambiare il punteggio a questo tipo di notiziari."
 msgid "Rescore articles in %s?"
 msgstr "Cambiare il punteggio degli articoli in «%s»?"
 
-#: js/tt-rss.js:680
+#: js/tt-rss.js:688
 #, fuzzy
 msgid "Please enable mail plugin first."
 msgstr "Selezionare prima qualche notiziario."
 
-#: js/tt-rss.js:842
+#: js/tt-rss.js:850
 msgid "New version available!"
 msgstr "Nuova versione disponibile."
 
@@ -3148,7 +3149,7 @@ msgstr "Non pubblicare articolo"
 
 #: 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/mailto/init.js:7
+#: js/viewfeed.js:1053 js/viewfeed.js:1967 plugins/mailto/init.js:7
 #: plugins/mail/mail.js:7
 msgid "No articles are selected."
 msgstr "Nessun articolo selezionato."
@@ -3193,28 +3194,28 @@ msgstr "Nessun articolo trovato da segnare"
 msgid "Mark %d article(s) as read?"
 msgstr "Segnare %d articolo/i come letto/i?"
 
-#: js/viewfeed.js:1744
+#: js/viewfeed.js:1784
 msgid "Open original article"
 msgstr "Apri articolo di origine"
 
-#: js/viewfeed.js:1814
+#: js/viewfeed.js:1854
 msgid "Remove label"
 msgstr "Rimuovi etichetta"
 
-#: js/viewfeed.js:1838
+#: js/viewfeed.js:1878
 msgid "Playing..."
 msgstr "In riproduzione..."
 
-#: js/viewfeed.js:1839
+#: js/viewfeed.js:1879
 msgid "Click to pause"
 msgstr "Fare clic per mettere in pausa"
 
-#: js/viewfeed.js:1896
+#: js/viewfeed.js:1936
 #, fuzzy
 msgid "Please enter new score for selected articles:"
 msgstr "Eliminare i %d articoli selezionati?"
 
-#: js/viewfeed.js:1938
+#: js/viewfeed.js:1978
 #, fuzzy
 msgid "Please enter new score for this article:"
 msgstr "Inserire il titolo della categoria:"
@@ -3296,6 +3297,12 @@ msgid ""
 "before continuing. Please type 'yes' to continue."
 msgstr ""
 
+#~ msgid "Yes"
+#~ msgstr "Sì"
+
+#~ msgid "No"
+#~ msgstr "No"
+
 #~ msgid "Comments?"
 #~ msgstr "Commenti?"
 
diff --git a/locale/ja_JP/LC_MESSAGES/messages.mo b/locale/ja_JP/LC_MESSAGES/messages.mo
index 6d9f49369..8b4c14c3b 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 19ebad046..512d5a88e 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-19 22:42+0400\n"
+"POT-Creation-Date: 2013-03-20 10:24+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"
@@ -291,11 +291,11 @@ msgstr ""
 msgid "All Articles"
 msgstr "すべての記事"
 
-#: index.php:169 include/functions.php:1911 classes/feeds.php:106
+#: index.php:169 include/functions.php:1915 classes/feeds.php:106
 msgid "Starred"
 msgstr "お気に入り"
 
-#: index.php:170 include/functions.php:1912 classes/feeds.php:107
+#: index.php:170 include/functions.php:1916 classes/feeds.php:107
 msgid "Published"
 msgstr "公開済み"
 
@@ -336,7 +336,7 @@ msgstr "スコア"
 msgid "Update"
 msgstr "更新"
 
-#: index.php:191 index.php:221 include/functions.php:1902
+#: index.php:191 index.php:221 include/functions.php:1906
 #: include/localized_schema.php:10 classes/feeds.php:111 classes/feeds.php:136
 #: classes/feeds.php:408 js/FeedTree.js:128 js/FeedTree.js:156
 #: plugins/digest/digest.js:630
@@ -398,7 +398,7 @@ msgstr ""
 msgid "Show tag cloud..."
 msgstr "タグクラウド"
 
-#: index.php:229 include/functions.php:1889
+#: index.php:229 include/functions.php:1893
 #, fuzzy
 msgid "Toggle widescreen mode"
 msgstr "カテゴリーの並び替えモードの切り替え"
@@ -425,8 +425,8 @@ msgstr "キーボードショートカット"
 msgid "Logout"
 msgstr "ログアウト"
 
-#: prefs.php:28 prefs.php:99 include/functions.php:1914
-#: classes/pref/prefs.php:371
+#: prefs.php:28 prefs.php:99 include/functions.php:1918
+#: classes/pref/prefs.php:377
 msgid "Preferences"
 msgstr "設定"
 
@@ -447,8 +447,8 @@ msgstr "フィード"
 msgid "Filters"
 msgstr "フィルター"
 
-#: prefs.php:108 mobile/mobile-functions.php:205 include/functions.php:1117
-#: include/functions.php:1738 classes/pref/labels.php:90
+#: prefs.php:108 mobile/mobile-functions.php:205 include/functions.php:1121
+#: include/functions.php:1742 classes/pref/labels.php:90
 msgid "Labels"
 msgstr "ラベル"
 
@@ -542,8 +542,8 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
-#: mobile/mobile-functions.php:178 include/functions.php:1115
-#: include/functions.php:1736
+#: mobile/mobile-functions.php:178 include/functions.php:1119
+#: include/functions.php:1740
 msgid "Special"
 msgstr "特別"
 
@@ -590,9 +590,9 @@ msgstr "未読記事数によるフィードの並び替え"
 msgid "Reverse headline order (oldest first)"
 msgstr "ヘッドラインの逆順 (古いものがはじめに)"
 
-#: include/digest.php:131 include/functions.php:1126
-#: include/functions.php:1639 include/functions.php:1724
-#: include/functions.php:1746 classes/opml.php:416 classes/pref/feeds.php:188
+#: include/digest.php:131 include/functions.php:1130
+#: include/functions.php:1643 include/functions.php:1728
+#: include/functions.php:1750 classes/opml.php:416 classes/pref/feeds.php:188
 msgid "Uncategorized"
 msgstr "カテゴリー割り当てなし"
 
@@ -605,324 +605,324 @@ msgstr "お気に入りの記事"
 msgid "No feeds found."
 msgstr "フィードがありません。"
 
-#: include/functions.php:697
+#: include/functions.php:701
 msgid "Session failed to validate (incorrect IP)"
 msgstr "セッションの検査に失敗しました (IP が正しくない)"
 
-#: include/functions.php:1588 classes/dlg.php:371 classes/pref/filters.php:368
+#: include/functions.php:1592 classes/dlg.php:371 classes/pref/filters.php:368
 msgid "All feeds"
 msgstr "すべてのフィード"
 
-#: include/functions.php:1789
+#: include/functions.php:1793
 msgid "Starred articles"
 msgstr "お気に入りの記事"
 
-#: include/functions.php:1791
+#: include/functions.php:1795
 msgid "Published articles"
 msgstr "公開済みの記事"
 
-#: include/functions.php:1793
+#: include/functions.php:1797
 msgid "Fresh articles"
 msgstr "新しい記事"
 
-#: include/functions.php:1795 include/functions.php:1909
+#: include/functions.php:1799 include/functions.php:1913
 msgid "All articles"
 msgstr "すべての記事"
 
-#: include/functions.php:1797
+#: include/functions.php:1801
 #, fuzzy
 msgid "Archived articles"
 msgstr "未読記事"
 
-#: include/functions.php:1799
+#: include/functions.php:1803
 msgid "Recently read"
 msgstr ""
 
-#: include/functions.php:1866
+#: include/functions.php:1870
 msgid "Navigation"
 msgstr "ナビゲーション"
 
-#: include/functions.php:1867
+#: include/functions.php:1871
 #, fuzzy
 msgid "Open next feed"
 msgstr "生成したフィード"
 
-#: include/functions.php:1868
+#: include/functions.php:1872
 msgid "Open previous feed"
 msgstr ""
 
-#: include/functions.php:1869
+#: include/functions.php:1873
 #, fuzzy
 msgid "Open next article"
 msgstr "元の記事内容を表示する"
 
-#: include/functions.php:1870
+#: include/functions.php:1874
 #, fuzzy
 msgid "Open previous article"
 msgstr "元の記事内容を表示する"
 
-#: include/functions.php:1871
+#: include/functions.php:1875
 msgid "Open next article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1872
+#: include/functions.php:1876
 msgid "Open previous article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1873
+#: include/functions.php:1877
 msgid "Show search dialog"
 msgstr "検索ダイアログを表示する"
 
-#: include/functions.php:1874
+#: include/functions.php:1878
 #, fuzzy
 msgid "Article"
 msgstr "すべての記事"
 
-#: include/functions.php:1875
+#: include/functions.php:1879
 msgid "Toggle starred"
 msgstr "お気に入りを切り替える"
 
-#: include/functions.php:1876
+#: include/functions.php:1880
 msgid "Toggle published"
 msgstr "公開を切り替える"
 
-#: include/functions.php:1877
+#: include/functions.php:1881
 msgid "Toggle unread"
 msgstr "未読に切り替える"
 
-#: include/functions.php:1878
+#: include/functions.php:1882
 msgid "Edit tags"
 msgstr "タグを編集する"
 
-#: include/functions.php:1879
+#: include/functions.php:1883
 #, fuzzy
 msgid "Dismiss selected"
 msgstr "ラベルから選択した記事を削除しますか?"
 
-#: include/functions.php:1880
+#: include/functions.php:1884
 #, fuzzy
 msgid "Dismiss read"
 msgstr "公開記事"
 
-#: include/functions.php:1881
+#: include/functions.php:1885
 #, fuzzy
 msgid "Open in new window"
 msgstr "新しいウィンドウで記事を開く"
 
-#: include/functions.php:1882 js/viewfeed.js:1758
+#: include/functions.php:1886 js/viewfeed.js:1798
 #, fuzzy
 msgid "Mark below as read"
 msgstr "既読にする"
 
-#: include/functions.php:1883 js/viewfeed.js:1752
+#: include/functions.php:1887 js/viewfeed.js:1792
 #, fuzzy
 msgid "Mark above as read"
 msgstr "既読にする"
 
-#: include/functions.php:1884
+#: include/functions.php:1888
 #, fuzzy
 msgid "Scroll down"
 msgstr "すべて終了しました。"
 
-#: include/functions.php:1885
+#: include/functions.php:1889
 msgid "Scroll up"
 msgstr ""
 
-#: include/functions.php:1886
+#: include/functions.php:1890
 #, fuzzy
 msgid "Select article under cursor"
 msgstr "マウスカーソルの下の記事を選択する"
 
-#: include/functions.php:1887
+#: include/functions.php:1891
 #, fuzzy
 msgid "Email article"
 msgstr "すべての記事"
 
-#: include/functions.php:1888 plugins/close_button/init.php:24
+#: include/functions.php:1892
 #, fuzzy
-msgid "Close article"
+msgid "Close/collapse article"
 msgstr "記事を消去する"
 
-#: include/functions.php:1890
+#: include/functions.php:1894
 #, fuzzy
 msgid "Article selection"
 msgstr "有効な記事の操作"
 
-#: include/functions.php:1891
+#: include/functions.php:1895
 #, fuzzy
 msgid "Select all articles"
 msgstr "記事を消去する"
 
-#: include/functions.php:1892
+#: include/functions.php:1896
 #, fuzzy
 msgid "Select unread"
 msgstr "未読記事を削除する"
 
-#: include/functions.php:1893
+#: include/functions.php:1897
 #, fuzzy
 msgid "Select starred"
 msgstr "お気に入りに設定する"
 
-#: include/functions.php:1894
+#: include/functions.php:1898
 #, fuzzy
 msgid "Select published"
 msgstr "未読記事を削除する"
 
-#: include/functions.php:1895
+#: include/functions.php:1899
 #, fuzzy
 msgid "Invert selection"
 msgstr "有効な記事の操作"
 
-#: include/functions.php:1896
+#: include/functions.php:1900
 #, fuzzy
 msgid "Deselect everything"
 msgstr "記事を消去する"
 
-#: include/functions.php:1897 classes/pref/feeds.php:488
+#: include/functions.php:1901 classes/pref/feeds.php:488
 #: classes/pref/feeds.php:719
 msgid "Feed"
 msgstr "フィード"
 
-#: include/functions.php:1898
+#: include/functions.php:1902
 #, fuzzy
 msgid "Refresh current feed"
 msgstr "有効なフィードの更新"
 
-#: include/functions.php:1899
+#: include/functions.php:1903
 #, fuzzy
 msgid "Un/hide read feeds"
 msgstr "読んだフィードを隠す/再表示する"
 
-#: include/functions.php:1900 classes/pref/feeds.php:1240
+#: include/functions.php:1904 classes/pref/feeds.php:1240
 msgid "Subscribe to feed"
 msgstr "フィードを購読する"
 
-#: include/functions.php:1901 js/FeedTree.js:135 js/PrefFeedTree.js:67
+#: include/functions.php:1905 js/FeedTree.js:135 js/PrefFeedTree.js:67
 msgid "Edit feed"
 msgstr "フィードを編集する"
 
-#: include/functions.php:1903
+#: include/functions.php:1907
 #, fuzzy
 msgid "Reverse headlines"
 msgstr "ヘッドラインの逆順 (古いものがはじめに)"
 
-#: include/functions.php:1904
+#: include/functions.php:1908
 #, fuzzy
 msgid "Debug feed update"
 msgstr "すべてのフィードを更新しました。"
 
-#: include/functions.php:1905 js/FeedTree.js:177
+#: include/functions.php:1909 js/FeedTree.js:177
 msgid "Mark all feeds as read"
 msgstr "すべてのフィードを既読に設定する"
 
-#: include/functions.php:1906
+#: include/functions.php:1910
 #, fuzzy
 msgid "Un/collapse current category"
 msgstr "閉じたカテゴリーのクリック"
 
-#: include/functions.php:1907
+#: include/functions.php:1911
 #, fuzzy
 msgid "Toggle combined mode"
 msgstr "カテゴリーの並び替えモードの切り替え"
 
-#: include/functions.php:1908
+#: include/functions.php:1912
 #, fuzzy
 msgid "Go to"
 msgstr "移動..."
 
-#: include/functions.php:1910
+#: include/functions.php:1914
 #, fuzzy
 msgid "Fresh"
 msgstr "再描画"
 
-#: include/functions.php:1913
+#: include/functions.php:1917
 msgid "Tag cloud"
 msgstr "タグクラウド"
 
-#: include/functions.php:1915
+#: include/functions.php:1919
 #, fuzzy
 msgid "Other"
 msgstr "その他:"
 
-#: include/functions.php:1916 classes/pref/labels.php:281
+#: include/functions.php:1920 classes/pref/labels.php:281
 msgid "Create label"
 msgstr "ラベルを作成する"
 
-#: include/functions.php:1917 classes/pref/filters.php:587
+#: include/functions.php:1921 classes/pref/filters.php:587
 msgid "Create filter"
 msgstr "フィルターを作成する"
 
-#: include/functions.php:1918
+#: include/functions.php:1922
 #, fuzzy
 msgid "Un/collapse sidebar"
 msgstr "サイドバーを縮小する"
 
-#: include/functions.php:1919
+#: include/functions.php:1923
 #, fuzzy
 msgid "Show help dialog"
 msgstr "検索ダイアログを表示する"
 
-#: include/functions.php:2401
+#: include/functions.php:2405
 #, fuzzy, php-format
 msgid "Search results: %s"
 msgstr "検索結果"
 
-#: include/functions.php:2886 js/viewfeed.js:1845
+#: include/functions.php:2892 js/viewfeed.js:1885
 #, fuzzy
 msgid "Click to play"
 msgstr "編集するにはクリック"
 
-#: include/functions.php:2887 js/viewfeed.js:1844
+#: include/functions.php:2893 js/viewfeed.js:1884
 msgid "Play"
 msgstr ""
 
-#: include/functions.php:3007
+#: include/functions.php:3014
 msgid " - "
 msgstr " - "
 
-#: include/functions.php:3029 include/functions.php:3346 classes/rpc.php:360
+#: include/functions.php:3036 include/functions.php:3353 classes/rpc.php:360
 msgid "no tags"
 msgstr "タグがありません"
 
-#: include/functions.php:3039 classes/feeds.php:650
+#: include/functions.php:3046 classes/feeds.php:653
 msgid "Edit tags for this article"
 msgstr "この記事のタグを編集する"
 
-#: include/functions.php:3068 classes/feeds.php:605
+#: include/functions.php:3075 classes/feeds.php:608
 #, fuzzy
 msgid "Originally from:"
 msgstr "元の記事内容を表示する"
 
-#: include/functions.php:3081 classes/feeds.php:618 classes/pref/feeds.php:507
+#: include/functions.php:3088 classes/feeds.php:621 classes/pref/feeds.php:507
 #, fuzzy
 msgid "Feed URL"
 msgstr "フィード"
 
-#: include/functions.php:3110
+#: include/functions.php:3117
 msgid "Related"
 msgstr ""
 
-#: include/functions.php:3137 classes/dlg.php:43 classes/dlg.php:162
+#: include/functions.php:3144 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:1553
 #: classes/pref/feeds.php:1624 plugins/import_export/init.php:407
 #: plugins/import_export/init.php:431 plugins/share/init.php:67
-#: plugins/updater/init.php:329
+#: plugins/updater/init.php:330
 msgid "Close this window"
 msgstr "このウィンドウを閉じる"
 
-#: include/functions.php:3371
+#: include/functions.php:3378
 #, fuzzy
 msgid "(edit note)"
 msgstr "ノートの編集"
 
-#: include/functions.php:3604
+#: include/functions.php:3611
 msgid "unknown type"
 msgstr "未知の種類"
 
-#: include/functions.php:3654
+#: include/functions.php:3661
 #, fuzzy
 msgid "Attachments"
 msgstr "添付:"
@@ -961,7 +961,7 @@ msgstr "公開記事"
 msgid "Assign tags"
 msgstr "タグの割り当て"
 
-#: include/localized_schema.php:14 js/viewfeed.js:1809
+#: include/localized_schema.php:14 js/viewfeed.js:1849
 msgid "Assign label"
 msgstr "ラベルの割り当て"
 
@@ -1406,7 +1406,7 @@ msgstr "認証"
 msgid "Login"
 msgstr "ログイン"
 
-#: classes/dlg.php:276 classes/dlg.php:732 classes/pref/prefs.php:196
+#: classes/dlg.php:276 classes/dlg.php:732 classes/pref/prefs.php:202
 #: classes/pref/feeds.php:569 classes/pref/feeds.php:793
 #, fuzzy
 msgid "Password"
@@ -1516,7 +1516,7 @@ msgstr "タグを閲覧する"
 msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 
-#: classes/dlg.php:591 plugins/updater/init.php:303
+#: classes/dlg.php:591 plugins/updater/init.php:304
 #, fuzzy, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "Tiny Tiny RSS の新しいバージョンが利用できます!"
@@ -1658,7 +1658,7 @@ msgstr "記事をお気に入りにする"
 msgid "Feed:"
 msgstr "フィード:"
 
-#: classes/feeds.php:201 classes/feeds.php:795
+#: classes/feeds.php:201 classes/feeds.php:798
 msgid "Feed not found."
 msgstr "フィードが見つかりません。"
 
@@ -1666,19 +1666,24 @@ msgstr "フィードが見つかりません。"
 msgid "mark as read"
 msgstr "既読にする"
 
-#: classes/feeds.php:696
+#: classes/feeds.php:553
+#, fuzzy
+msgid "Collapse article"
+msgstr "記事を消去する"
+
+#: classes/feeds.php:699
 msgid "No unread articles found to display."
 msgstr "表示する未読記事が見つかりませんでした。"
 
-#: classes/feeds.php:699
+#: classes/feeds.php:702
 msgid "No updated articles found to display."
 msgstr "表示する更新された記事が見つかりませんでした。"
 
-#: classes/feeds.php:702
+#: classes/feeds.php:705
 msgid "No starred articles found to display."
 msgstr "表示するお気に入りの記事が見つかりませんでした。"
 
-#: classes/feeds.php:706
+#: classes/feeds.php:709
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
@@ -1686,20 +1691,20 @@ msgstr ""
 "表示する記事が見つかりません。手動でラベルに記事を割り当てるか(上の操作メ"
 "ニューを参照します)、フィルターを使うことができます。"
 
-#: classes/feeds.php:708
+#: classes/feeds.php:711
 msgid "No articles found to display."
 msgstr "表示する記事が見つかりません。"
 
-#: classes/feeds.php:723 classes/feeds.php:904
+#: classes/feeds.php:726 classes/feeds.php:907
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr ""
 
-#: classes/feeds.php:733 classes/feeds.php:914
+#: classes/feeds.php:736 classes/feeds.php:917
 msgid "Some feeds have update errors (click for details)"
 msgstr "いくつかのフィードの更新エラーです (詳細はクリックしてください)"
 
-#: classes/feeds.php:894
+#: classes/feeds.php:897
 msgid "No feed selected."
 msgstr "フィードは選択されていません。"
 
@@ -2037,188 +2042,179 @@ msgstr "パスワードが一致しません。"
 msgid "Function not supported by authentication module."
 msgstr ""
 
-#: classes/pref/prefs.php:63
+#: classes/pref/prefs.php:69
 msgid "The configuration was saved."
 msgstr "設定を保存しました。"
 
-#: classes/pref/prefs.php:77
+#: classes/pref/prefs.php:83
 #, php-format
 msgid "Unknown option: %s"
 msgstr "不明なオプション: %s"
 
-#: classes/pref/prefs.php:91
+#: classes/pref/prefs.php:97
 #, fuzzy
 msgid "Your personal data has been saved."
 msgstr "パスワードを変更しました。"
 
-#: classes/pref/prefs.php:131
+#: classes/pref/prefs.php:137
 #, fuzzy
 msgid "Personal data / Authentication"
 msgstr "認証"
 
-#: classes/pref/prefs.php:151
+#: classes/pref/prefs.php:157
 msgid "Personal data"
 msgstr "個人データ"
 
-#: classes/pref/prefs.php:161
+#: classes/pref/prefs.php:167
 msgid "Full name"
 msgstr ""
 
-#: classes/pref/prefs.php:165
+#: classes/pref/prefs.php:171
 msgid "E-mail"
 msgstr "電子メール"
 
-#: classes/pref/prefs.php:171
+#: classes/pref/prefs.php:177
 msgid "Access level"
 msgstr "アクセスレベル"
 
-#: classes/pref/prefs.php:181
+#: classes/pref/prefs.php:187
 #, fuzzy
 msgid "Save data"
 msgstr "保存"
 
-#: classes/pref/prefs.php:203
+#: classes/pref/prefs.php:209
 #, fuzzy
 msgid "Your password is at default value, please change it."
 msgstr ""
 "パスワードが標準のままです。\n"
 "                                                変更してください。"
 
-#: classes/pref/prefs.php:235
+#: classes/pref/prefs.php:241
 msgid "Old password"
 msgstr "現在のパスワード"
 
-#: classes/pref/prefs.php:238
+#: classes/pref/prefs.php:244
 msgid "New password"
 msgstr "新しいパスワード"
 
-#: classes/pref/prefs.php:243
+#: classes/pref/prefs.php:249
 msgid "Confirm password"
 msgstr "新しいパスワード(確認)"
 
-#: classes/pref/prefs.php:253
+#: classes/pref/prefs.php:259
 msgid "Change password"
 msgstr "パスワードを変更する"
 
-#: classes/pref/prefs.php:259
+#: classes/pref/prefs.php:265
 msgid "One time passwords / Authenticator"
 msgstr ""
 
-#: classes/pref/prefs.php:288 classes/pref/prefs.php:339
+#: classes/pref/prefs.php:294 classes/pref/prefs.php:345
 #, fuzzy
 msgid "Enter your password"
 msgstr "ユーザー名かパスワードが正しくありません"
 
-#: classes/pref/prefs.php:299
+#: classes/pref/prefs.php:305
 #, fuzzy
 msgid "Disable OTP"
 msgstr "(無効です)"
 
-#: classes/pref/prefs.php:305
+#: classes/pref/prefs.php:311
 msgid ""
 "You will need a compatible Authenticator to use this. Changing your password "
 "would automatically disable OTP."
 msgstr ""
 
-#: classes/pref/prefs.php:307
+#: classes/pref/prefs.php:313
 msgid "Scan the following code by the Authenticator application:"
 msgstr ""
 
-#: classes/pref/prefs.php:348
+#: classes/pref/prefs.php:354
 msgid "I have scanned the code and would like to enable OTP"
 msgstr ""
 
-#: classes/pref/prefs.php:356
+#: classes/pref/prefs.php:362
 #, fuzzy
 msgid "Enable OTP"
 msgstr "有効にする"
 
-#: classes/pref/prefs.php:482
+#: classes/pref/prefs.php:493
 #, fuzzy
 msgid "Customize"
 msgstr "ユーザースタイルシートの URL"
 
-#: classes/pref/prefs.php:501 classes/pref/prefs.php:508
-#: classes/pref/prefs.php:513
-msgid "Yes"
-msgstr "はい"
-
-#: classes/pref/prefs.php:503 classes/pref/prefs.php:513
-msgid "No"
-msgstr "いいえ"
-
-#: classes/pref/prefs.php:543
+#: classes/pref/prefs.php:552
 #, fuzzy
 msgid "Register"
 msgstr "登録済み"
 
-#: classes/pref/prefs.php:547
+#: classes/pref/prefs.php:556
 msgid "Clear"
 msgstr ""
 
-#: classes/pref/prefs.php:553
+#: classes/pref/prefs.php:562
 #, php-format
 msgid "Current server time: %s (UTC)"
 msgstr ""
 
-#: classes/pref/prefs.php:582
+#: classes/pref/prefs.php:595
 msgid "Save configuration"
 msgstr "設定を保存する"
 
-#: classes/pref/prefs.php:585
+#: classes/pref/prefs.php:598
 #, fuzzy
 msgid "Manage profiles"
 msgstr "フィルターを作成する"
 
-#: classes/pref/prefs.php:588
+#: classes/pref/prefs.php:601
 msgid "Reset to defaults"
 msgstr "標準に戻す"
 
-#: classes/pref/prefs.php:600
+#: classes/pref/prefs.php:613
 #, fuzzy
 msgid "Show additional preferences"
 msgstr "設定を終了する"
 
-#: classes/pref/prefs.php:612 classes/pref/prefs.php:614
+#: classes/pref/prefs.php:625 classes/pref/prefs.php:627
 msgid "Plugins"
 msgstr ""
 
-#: classes/pref/prefs.php:642
+#: classes/pref/prefs.php:655
 msgid "System plugins"
 msgstr ""
 
-#: classes/pref/prefs.php:646 classes/pref/prefs.php:695
+#: classes/pref/prefs.php:659 classes/pref/prefs.php:708
 msgid "Plugin"
 msgstr ""
 
-#: classes/pref/prefs.php:647 classes/pref/prefs.php:696
+#: classes/pref/prefs.php:660 classes/pref/prefs.php:709
 #, fuzzy
 msgid "Description"
 msgstr "説明"
 
-#: classes/pref/prefs.php:648 classes/pref/prefs.php:697
+#: classes/pref/prefs.php:661 classes/pref/prefs.php:710
 msgid "Version"
 msgstr ""
 
-#: classes/pref/prefs.php:649 classes/pref/prefs.php:698
+#: classes/pref/prefs.php:662 classes/pref/prefs.php:711
 msgid "Author"
 msgstr ""
 
-#: classes/pref/prefs.php:682 classes/pref/prefs.php:733
+#: classes/pref/prefs.php:695 classes/pref/prefs.php:746
 #, fuzzy
 msgid "Clear data"
 msgstr "フィードデータの消去"
 
-#: classes/pref/prefs.php:691
+#: classes/pref/prefs.php:704
 msgid "User plugins"
 msgstr ""
 
-#: classes/pref/prefs.php:748
+#: classes/pref/prefs.php:761
 #, fuzzy
 msgid "Enable selected plugins"
 msgstr "フィードアイコンを有効にする"
 
-#: classes/pref/prefs.php:803 classes/pref/prefs.php:821
+#: classes/pref/prefs.php:816 classes/pref/prefs.php:834
 #, fuzzy
 msgid "Incorrect password"
 msgstr "ユーザー名かパスワードが正しくありません"
@@ -2510,6 +2506,11 @@ msgstr "ようこそ、"
 msgid "Regular version"
 msgstr ""
 
+#: plugins/close_button/init.php:24
+#, fuzzy
+msgid "Close article"
+msgstr "記事を消去する"
+
 #: plugins/nsfw/init.php:32 plugins/nsfw/init.php:43
 msgid "Not work safe (click to toggle)"
 msgstr ""
@@ -2755,29 +2756,29 @@ msgstr "記事をお気に入りにする"
 msgid "Share on Google+"
 msgstr "題名"
 
-#: plugins/updater/init.php:294 plugins/updater/init.php:306
+#: plugins/updater/init.php:295 plugins/updater/init.php:307
 #: plugins/updater/updater.js:10
 #, fuzzy
 msgid "Update Tiny Tiny RSS"
 msgstr "Tiny Tiny RSS に戻る"
 
-#: plugins/updater/init.php:309
+#: plugins/updater/init.php:310
 #, fuzzy
 msgid "Your Tiny Tiny RSS installation is up to date."
 msgstr "Tiny Tiny RSS のデータベースを更新しました。"
 
-#: plugins/updater/init.php:319
+#: plugins/updater/init.php:320
 msgid ""
 "Do not close this dialog until updating is finished. Backup your tt-rss "
 "directory before continuing."
 msgstr ""
 
-#: plugins/updater/init.php:322
+#: plugins/updater/init.php:323
 #, fuzzy
 msgid "Ready to update."
 msgstr "最終更新:"
 
-#: plugins/updater/init.php:327
+#: plugins/updater/init.php:328
 #, fuzzy
 msgid "Start update"
 msgstr "最終更新:"
@@ -2893,7 +2894,7 @@ msgstr "このアーティクルのノートを入力してください:"
 msgid "Generate new syndication address for this feed?"
 msgstr ""
 
-#: js/functions.js:1597 js/tt-rss.js:350 js/tt-rss.js:721
+#: js/functions.js:1597 js/tt-rss.js:350 js/tt-rss.js:729
 #, fuzzy
 msgid "You can't edit this kind of feed."
 msgstr "フィードのこの種類を消去できません。"
@@ -3166,12 +3167,12 @@ msgstr "フィードのこの種類を消去できません。"
 msgid "Rescore articles in %s?"
 msgstr "%s の記事のスコアを再計算しますか?"
 
-#: js/tt-rss.js:680
+#: js/tt-rss.js:688
 #, fuzzy
 msgid "Please enable mail plugin first."
 msgstr "はじめにいくつかのフィードを選択してください。"
 
-#: js/tt-rss.js:842
+#: js/tt-rss.js:850
 #, fuzzy
 msgid "New version available!"
 msgstr "Tiny Tiny RSS の新しいバージョンが利用できます!"
@@ -3198,7 +3199,7 @@ msgstr "非公開記事"
 
 #: 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/mailto/init.js:7
+#: js/viewfeed.js:1053 js/viewfeed.js:1967 plugins/mailto/init.js:7
 #: plugins/mail/mail.js:7
 msgid "No articles are selected."
 msgstr "記事は選択されていません。"
@@ -3248,32 +3249,32 @@ msgstr "マークした記事が見つかりません"
 msgid "Mark %d article(s) as read?"
 msgstr "%d 件のマークした記事を既読として設定しますか?"
 
-#: js/viewfeed.js:1744
+#: js/viewfeed.js:1784
 #, fuzzy
 msgid "Open original article"
 msgstr "元の記事内容を表示する"
 
-#: js/viewfeed.js:1814
+#: js/viewfeed.js:1854
 #, fuzzy
 msgid "Remove label"
 msgstr "選択したラベルを削除しますか?"
 
-#: js/viewfeed.js:1838
+#: js/viewfeed.js:1878
 #, fuzzy
 msgid "Playing..."
 msgstr "フィード一覧を読み込んでいます..."
 
-#: js/viewfeed.js:1839
+#: js/viewfeed.js:1879
 #, fuzzy
 msgid "Click to pause"
 msgstr "編集するにはクリック"
 
-#: js/viewfeed.js:1896
+#: js/viewfeed.js:1936
 #, fuzzy
 msgid "Please enter new score for selected articles:"
 msgstr "このアーティクルのノートを入力してください:"
 
-#: js/viewfeed.js:1938
+#: js/viewfeed.js:1978
 #, fuzzy
 msgid "Please enter new score for this article:"
 msgstr "このアーティクルのノートを入力してください:"
@@ -3370,6 +3371,12 @@ msgid ""
 "before continuing. Please type 'yes' to continue."
 msgstr ""
 
+#~ msgid "Yes"
+#~ msgstr "はい"
+
+#~ msgid "No"
+#~ msgstr "いいえ"
+
 #~ msgid "Comments?"
 #~ msgstr "コメントしますか?"
 
diff --git a/locale/lv_LV/LC_MESSAGES/messages.mo b/locale/lv_LV/LC_MESSAGES/messages.mo
index 3d040d3dc..768407cdb 100644
Binary files a/locale/lv_LV/LC_MESSAGES/messages.mo and b/locale/lv_LV/LC_MESSAGES/messages.mo differ
diff --git a/locale/lv_LV/LC_MESSAGES/messages.po b/locale/lv_LV/LC_MESSAGES/messages.po
index 77387e85f..166da533a 100644
--- a/locale/lv_LV/LC_MESSAGES/messages.po
+++ b/locale/lv_LV/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-19 22:42+0400\n"
+"POT-Creation-Date: 2013-03-20 10:24+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"
@@ -287,11 +287,11 @@ msgstr "Adaptīvs"
 msgid "All Articles"
 msgstr "Visus rakstus"
 
-#: index.php:169 include/functions.php:1911 classes/feeds.php:106
+#: index.php:169 include/functions.php:1915 classes/feeds.php:106
 msgid "Starred"
 msgstr "Zvaigžņotos"
 
-#: index.php:170 include/functions.php:1912 classes/feeds.php:107
+#: index.php:170 include/functions.php:1916 classes/feeds.php:107
 msgid "Published"
 msgstr "Publicētos"
 
@@ -331,7 +331,7 @@ msgstr "Novērtējums"
 msgid "Update"
 msgstr "Atjaunot"
 
-#: index.php:191 index.php:221 include/functions.php:1902
+#: index.php:191 index.php:221 include/functions.php:1906
 #: include/localized_schema.php:10 classes/feeds.php:111 classes/feeds.php:136
 #: classes/feeds.php:408 js/FeedTree.js:128 js/FeedTree.js:156
 #: plugins/digest/digest.js:630
@@ -392,7 +392,7 @@ msgstr "Pārslēgties uz īssavilkumu..."
 msgid "Show tag cloud..."
 msgstr "Radīt birku mākoni..."
 
-#: index.php:229 include/functions.php:1889
+#: index.php:229 include/functions.php:1893
 #, fuzzy
 msgid "Toggle widescreen mode"
 msgstr "Pārslēgt zvaigžņošanu"
@@ -418,8 +418,8 @@ msgstr "Isinājumtaustiņu palīdzība"
 msgid "Logout"
 msgstr "Atteikties"
 
-#: prefs.php:28 prefs.php:99 include/functions.php:1914
-#: classes/pref/prefs.php:371
+#: prefs.php:28 prefs.php:99 include/functions.php:1918
+#: classes/pref/prefs.php:377
 msgid "Preferences"
 msgstr "Iestatījumi"
 
@@ -440,8 +440,8 @@ msgstr "Barotnes"
 msgid "Filters"
 msgstr "Filtri"
 
-#: prefs.php:108 mobile/mobile-functions.php:205 include/functions.php:1117
-#: include/functions.php:1738 classes/pref/labels.php:90
+#: prefs.php:108 mobile/mobile-functions.php:205 include/functions.php:1121
+#: include/functions.php:1742 classes/pref/labels.php:90
 msgid "Labels"
 msgstr "Iezīmes"
 
@@ -537,8 +537,8 @@ msgstr "Atvērt parasto versiju"
 msgid "Home"
 msgstr "Mājas"
 
-#: mobile/mobile-functions.php:178 include/functions.php:1115
-#: include/functions.php:1736
+#: mobile/mobile-functions.php:178 include/functions.php:1119
+#: include/functions.php:1740
 msgid "Special"
 msgstr "Īpaši"
 
@@ -580,9 +580,9 @@ msgstr "Kārtot barotnes pēc nelasīto skaita"
 msgid "Reverse headline order (oldest first)"
 msgstr "Apgriezt virsrakstu secību (vecākos vispirms)"
 
-#: include/digest.php:131 include/functions.php:1126
-#: include/functions.php:1639 include/functions.php:1724
-#: include/functions.php:1746 classes/opml.php:416 classes/pref/feeds.php:188
+#: include/digest.php:131 include/functions.php:1130
+#: include/functions.php:1643 include/functions.php:1728
+#: include/functions.php:1750 classes/opml.php:416 classes/pref/feeds.php:188
 msgid "Uncategorized"
 msgstr "Nekategorizēts"
 
@@ -595,313 +595,314 @@ msgstr "%d arhivēti raksti"
 msgid "No feeds found."
 msgstr "Neatradu barotnes."
 
-#: include/functions.php:697
+#: include/functions.php:701
 msgid "Session failed to validate (incorrect IP)"
 msgstr "Neizdevās validēt sesiju (mainījusies IP adrese)"
 
-#: include/functions.php:1588 classes/dlg.php:371 classes/pref/filters.php:368
+#: include/functions.php:1592 classes/dlg.php:371 classes/pref/filters.php:368
 msgid "All feeds"
 msgstr "Visas barotnes"
 
-#: include/functions.php:1789
+#: include/functions.php:1793
 msgid "Starred articles"
 msgstr "Zvaigžņotie raksti"
 
-#: include/functions.php:1791
+#: include/functions.php:1795
 msgid "Published articles"
 msgstr "Publicētie raksti"
 
-#: include/functions.php:1793
+#: include/functions.php:1797
 msgid "Fresh articles"
 msgstr "Jaunākie raksti"
 
-#: include/functions.php:1795 include/functions.php:1909
+#: include/functions.php:1799 include/functions.php:1913
 msgid "All articles"
 msgstr "Visi raksti"
 
-#: include/functions.php:1797
+#: include/functions.php:1801
 msgid "Archived articles"
 msgstr "Arhivētie raksti"
 
-#: include/functions.php:1799
+#: include/functions.php:1803
 msgid "Recently read"
 msgstr "Nesen lasītie raksti"
 
-#: include/functions.php:1866
+#: include/functions.php:1870
 msgid "Navigation"
 msgstr "Navigācija"
 
-#: include/functions.php:1867
+#: include/functions.php:1871
 #, fuzzy
 msgid "Open next feed"
 msgstr "Pēc noķeršanas rādīt nākamo barotni"
 
-#: include/functions.php:1868
+#: include/functions.php:1872
 msgid "Open previous feed"
 msgstr ""
 
-#: include/functions.php:1869
+#: include/functions.php:1873
 #, fuzzy
 msgid "Open next article"
 msgstr "Atvērt sākotnējo rakstu"
 
-#: include/functions.php:1870
+#: include/functions.php:1874
 #, fuzzy
 msgid "Open previous article"
 msgstr "Atvērt sākotnējo rakstu"
 
-#: include/functions.php:1871
+#: include/functions.php:1875
 msgid "Open next article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1872
+#: include/functions.php:1876
 msgid "Open previous article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1873
+#: include/functions.php:1877
 msgid "Show search dialog"
 msgstr "Rādīt meklēšanas logu"
 
-#: include/functions.php:1874
+#: include/functions.php:1878
 #, fuzzy
 msgid "Article"
 msgstr "Visus rakstus"
 
-#: include/functions.php:1875
+#: include/functions.php:1879
 msgid "Toggle starred"
 msgstr "Pārslēgt zvaigžņošanu"
 
-#: include/functions.php:1876
+#: include/functions.php:1880
 msgid "Toggle published"
 msgstr "Pārslēgt publicēšanu"
 
-#: include/functions.php:1877
+#: include/functions.php:1881
 msgid "Toggle unread"
 msgstr "Pārslēgt nelasītu"
 
-#: include/functions.php:1878
+#: include/functions.php:1882
 msgid "Edit tags"
 msgstr "Rediģēt iezīmes"
 
-#: include/functions.php:1879
+#: include/functions.php:1883
 #, fuzzy
 msgid "Dismiss selected"
 msgstr "Atmest atlasītos rakstus"
 
-#: include/functions.php:1880
+#: include/functions.php:1884
 #, fuzzy
 msgid "Dismiss read"
 msgstr "Atmest lasītos rakstus"
 
-#: include/functions.php:1881
+#: include/functions.php:1885
 #, fuzzy
 msgid "Open in new window"
 msgstr "Atvērt rakstu jaunā logā"
 
-#: include/functions.php:1882 js/viewfeed.js:1758
+#: include/functions.php:1886 js/viewfeed.js:1798
 msgid "Mark below as read"
 msgstr "Iezīmēt lejup kā lasītus"
 
-#: include/functions.php:1883 js/viewfeed.js:1752
+#: include/functions.php:1887 js/viewfeed.js:1792
 msgid "Mark above as read"
 msgstr "Iezīmēt augšup kā lasītus"
 
-#: include/functions.php:1884
+#: include/functions.php:1888
 #, fuzzy
 msgid "Scroll down"
 msgstr "Viss izdarīts."
 
-#: include/functions.php:1885
+#: include/functions.php:1889
 msgid "Scroll up"
 msgstr ""
 
-#: include/functions.php:1886
+#: include/functions.php:1890
 #, fuzzy
 msgid "Select article under cursor"
 msgstr "Iezīmēt rakstu zem peles kursora"
 
-#: include/functions.php:1887
+#: include/functions.php:1891
 msgid "Email article"
 msgstr "Nosūtīt rakstu uz e-pastu"
 
-#: include/functions.php:1888 plugins/close_button/init.php:24
-msgid "Close article"
+#: include/functions.php:1892
+#, fuzzy
+msgid "Close/collapse article"
 msgstr "Aizvērt rakstu"
 
-#: include/functions.php:1890
+#: include/functions.php:1894
 #, fuzzy
 msgid "Article selection"
 msgstr "Apgriezt rakstu iezīmēšanu"
 
-#: include/functions.php:1891
+#: include/functions.php:1895
 msgid "Select all articles"
 msgstr "Iezīmēt visus rakstus"
 
-#: include/functions.php:1892
+#: include/functions.php:1896
 #, fuzzy
 msgid "Select unread"
 msgstr "Iezīmēt nelasītos rakstus"
 
-#: include/functions.php:1893
+#: include/functions.php:1897
 #, fuzzy
 msgid "Select starred"
 msgstr "Uzlikt zvaigzni"
 
-#: include/functions.php:1894
+#: include/functions.php:1898
 #, fuzzy
 msgid "Select published"
 msgstr "Iezīmēt publicētos rakstus"
 
-#: include/functions.php:1895
+#: include/functions.php:1899
 #, fuzzy
 msgid "Invert selection"
 msgstr "Apgriezt rakstu iezīmēšanu"
 
-#: include/functions.php:1896
+#: include/functions.php:1900
 #, fuzzy
 msgid "Deselect everything"
 msgstr "Neatzīmēt rakstus"
 
-#: include/functions.php:1897 classes/pref/feeds.php:488
+#: include/functions.php:1901 classes/pref/feeds.php:488
 #: classes/pref/feeds.php:719
 msgid "Feed"
 msgstr "Barotne"
 
-#: include/functions.php:1898
+#: include/functions.php:1902
 #, fuzzy
 msgid "Refresh current feed"
 msgstr "Atjaunot aktīvo barotni"
 
-#: include/functions.php:1899
+#: include/functions.php:1903
 #, fuzzy
 msgid "Un/hide read feeds"
 msgstr "(Ne)rādīt lasītās barotnes"
 
-#: include/functions.php:1900 classes/pref/feeds.php:1240
+#: include/functions.php:1904 classes/pref/feeds.php:1240
 msgid "Subscribe to feed"
 msgstr "Abonēt barotni"
 
-#: include/functions.php:1901 js/FeedTree.js:135 js/PrefFeedTree.js:67
+#: include/functions.php:1905 js/FeedTree.js:135 js/PrefFeedTree.js:67
 msgid "Edit feed"
 msgstr "Rediģēt barotni"
 
-#: include/functions.php:1903
+#: include/functions.php:1907
 #, fuzzy
 msgid "Reverse headlines"
 msgstr "Apgriezt virsrakstu secību"
 
-#: include/functions.php:1904
+#: include/functions.php:1908
 #, fuzzy
 msgid "Debug feed update"
 msgstr "Atslēgt atjaunojumus"
 
-#: include/functions.php:1905 js/FeedTree.js:177
+#: include/functions.php:1909 js/FeedTree.js:177
 msgid "Mark all feeds as read"
 msgstr "Atzīmēt visas barotnes kā lasītas"
 
-#: include/functions.php:1906
+#: include/functions.php:1910
 #, fuzzy
 msgid "Un/collapse current category"
 msgstr "Ievietot kategorijā:"
 
-#: include/functions.php:1907
+#: include/functions.php:1911
 #, fuzzy
 msgid "Toggle combined mode"
 msgstr "Pārslēgt publicēšanu"
 
-#: include/functions.php:1908
+#: include/functions.php:1912
 #, fuzzy
 msgid "Go to"
 msgstr "Doties uz..."
 
-#: include/functions.php:1910
+#: include/functions.php:1914
 msgid "Fresh"
 msgstr ""
 
-#: include/functions.php:1913
+#: include/functions.php:1917
 msgid "Tag cloud"
 msgstr "Iezīmju mākonis"
 
-#: include/functions.php:1915
+#: include/functions.php:1919
 #, fuzzy
 msgid "Other"
 msgstr "Citas barotnes"
 
-#: include/functions.php:1916 classes/pref/labels.php:281
+#: include/functions.php:1920 classes/pref/labels.php:281
 msgid "Create label"
 msgstr "Izveidot etiķeti"
 
-#: include/functions.php:1917 classes/pref/filters.php:587
+#: include/functions.php:1921 classes/pref/filters.php:587
 msgid "Create filter"
 msgstr "Izveidot filtru"
 
-#: include/functions.php:1918
+#: include/functions.php:1922
 #, fuzzy
 msgid "Un/collapse sidebar"
 msgstr "Sakļaut sānjoslu"
 
-#: include/functions.php:1919
+#: include/functions.php:1923
 #, fuzzy
 msgid "Show help dialog"
 msgstr "Rādīt meklēšanas logu"
 
-#: include/functions.php:2401
+#: include/functions.php:2405
 #, php-format
 msgid "Search results: %s"
 msgstr "Meklēšanas rezultāti: %s"
 
-#: include/functions.php:2886 js/viewfeed.js:1845
+#: include/functions.php:2892 js/viewfeed.js:1885
 msgid "Click to play"
 msgstr "Klikšķiniet, lai atskaņotu"
 
-#: include/functions.php:2887 js/viewfeed.js:1844
+#: include/functions.php:2893 js/viewfeed.js:1884
 msgid "Play"
 msgstr "Atskaņot"
 
-#: include/functions.php:3007
+#: include/functions.php:3014
 msgid " - "
 msgstr "–"
 
-#: include/functions.php:3029 include/functions.php:3346 classes/rpc.php:360
+#: include/functions.php:3036 include/functions.php:3353 classes/rpc.php:360
 msgid "no tags"
 msgstr "nav iezīmju"
 
-#: include/functions.php:3039 classes/feeds.php:650
+#: include/functions.php:3046 classes/feeds.php:653
 msgid "Edit tags for this article"
 msgstr "Rediģēt šī raksta iezīmes"
 
-#: include/functions.php:3068 classes/feeds.php:605
+#: include/functions.php:3075 classes/feeds.php:608
 msgid "Originally from:"
 msgstr "Sākotnējais no:"
 
-#: include/functions.php:3081 classes/feeds.php:618 classes/pref/feeds.php:507
+#: include/functions.php:3088 classes/feeds.php:621 classes/pref/feeds.php:507
 msgid "Feed URL"
 msgstr "Barotnes URL"
 
-#: include/functions.php:3110
+#: include/functions.php:3117
 msgid "Related"
 msgstr "Saistīts"
 
-#: include/functions.php:3137 classes/dlg.php:43 classes/dlg.php:162
+#: include/functions.php:3144 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:1553
 #: classes/pref/feeds.php:1624 plugins/import_export/init.php:407
 #: plugins/import_export/init.php:431 plugins/share/init.php:67
-#: plugins/updater/init.php:329
+#: plugins/updater/init.php:330
 msgid "Close this window"
 msgstr "Aizvērt šo logu"
 
-#: include/functions.php:3371
+#: include/functions.php:3378
 msgid "(edit note)"
 msgstr "(rediģēt piezīmi)"
 
-#: include/functions.php:3604
+#: include/functions.php:3611
 msgid "unknown type"
 msgstr "nezināms tips"
 
-#: include/functions.php:3654
+#: include/functions.php:3661
 msgid "Attachments"
 msgstr "Pielikumi"
 
@@ -938,7 +939,7 @@ msgstr "Publicēt rakstu"
 msgid "Assign tags"
 msgstr "Pievienot iezīmi"
 
-#: include/localized_schema.php:14 js/viewfeed.js:1809
+#: include/localized_schema.php:14 js/viewfeed.js:1849
 msgid "Assign label"
 msgstr "Pievienot etiķeti"
 
@@ -1382,7 +1383,7 @@ msgstr "Autentifikācija"
 msgid "Login"
 msgstr "Pieteikšanās"
 
-#: classes/dlg.php:276 classes/dlg.php:732 classes/pref/prefs.php:196
+#: classes/dlg.php:276 classes/dlg.php:732 classes/pref/prefs.php:202
 #: classes/pref/feeds.php:569 classes/pref/feeds.php:793
 msgid "Password"
 msgstr "Parole"
@@ -1482,7 +1483,7 @@ msgstr "Skatīt kā RSS"
 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
+#: classes/dlg.php:591 plugins/updater/init.php:304
 #, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "Ir pieejama jauna Tiny Tiny RSS versija (%s)."
@@ -1618,7 +1619,7 @@ msgstr "Pārsūtīt e-pastā"
 msgid "Feed:"
 msgstr "Barotne:"
 
-#: classes/feeds.php:201 classes/feeds.php:795
+#: classes/feeds.php:201 classes/feeds.php:798
 msgid "Feed not found."
 msgstr "Barotne netika atrasta."
 
@@ -1626,19 +1627,24 @@ msgstr "Barotne netika atrasta."
 msgid "mark as read"
 msgstr "iezīmēt kā lasītu"
 
-#: classes/feeds.php:696
+#: classes/feeds.php:553
+#, fuzzy
+msgid "Collapse article"
+msgstr "Aizvērt rakstu"
+
+#: classes/feeds.php:699
 msgid "No unread articles found to display."
 msgstr "Nav neizlasītu rakstu, ko rādīt."
 
-#: classes/feeds.php:699
+#: classes/feeds.php:702
 msgid "No updated articles found to display."
 msgstr "Nav atjaunotu rakstu, ko rādīt."
 
-#: classes/feeds.php:702
+#: classes/feeds.php:705
 msgid "No starred articles found to display."
 msgstr "Nav zvaigžņotu rakstu, ko rādīt."
 
-#: classes/feeds.php:706
+#: classes/feeds.php:709
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
@@ -1646,21 +1652,21 @@ 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:708
+#: classes/feeds.php:711
 msgid "No articles found to display."
 msgstr "Netika atrasti raksti, ko rādīt."
 
-#: classes/feeds.php:723 classes/feeds.php:904
+#: classes/feeds.php:726 classes/feeds.php:907
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "Barotnes pēdējo reizi atjaunotas %s."
 
-#: classes/feeds.php:733 classes/feeds.php:914
+#: classes/feeds.php:736 classes/feeds.php:917
 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:894
+#: classes/feeds.php:897
 msgid "No feed selected."
 msgstr "Nav izvēlēta barotne."
 
@@ -1984,76 +1990,76 @@ msgstr "Ievadītās paroles nav vienādas."
 msgid "Function not supported by authentication module."
 msgstr "Funkiju neatbalsta autentifikācijas modulis."
 
-#: classes/pref/prefs.php:63
+#: classes/pref/prefs.php:69
 msgid "The configuration was saved."
 msgstr "Iestatījumi ir saglabāti."
 
-#: classes/pref/prefs.php:77
+#: classes/pref/prefs.php:83
 #, php-format
 msgid "Unknown option: %s"
 msgstr "Nezināma iespēja %s."
 
-#: classes/pref/prefs.php:91
+#: classes/pref/prefs.php:97
 msgid "Your personal data has been saved."
 msgstr "Jūsu personīgie dati ir saglabāti."
 
-#: classes/pref/prefs.php:131
+#: classes/pref/prefs.php:137
 msgid "Personal data / Authentication"
 msgstr "Personīgie dati/autentifikācija"
 
-#: classes/pref/prefs.php:151
+#: classes/pref/prefs.php:157
 msgid "Personal data"
 msgstr "Personīgie dati"
 
-#: classes/pref/prefs.php:161
+#: classes/pref/prefs.php:167
 msgid "Full name"
 msgstr "Vārds un uzvārds"
 
-#: classes/pref/prefs.php:165
+#: classes/pref/prefs.php:171
 msgid "E-mail"
 msgstr "E-pasts"
 
-#: classes/pref/prefs.php:171
+#: classes/pref/prefs.php:177
 msgid "Access level"
 msgstr "Pieejas līmenis"
 
-#: classes/pref/prefs.php:181
+#: classes/pref/prefs.php:187
 msgid "Save data"
 msgstr "Saglabāt datus"
 
-#: classes/pref/prefs.php:203
+#: classes/pref/prefs.php:209
 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
+#: classes/pref/prefs.php:241
 msgid "Old password"
 msgstr "Vecā parole"
 
-#: classes/pref/prefs.php:238
+#: classes/pref/prefs.php:244
 msgid "New password"
 msgstr "Jaunā parole"
 
-#: classes/pref/prefs.php:243
+#: classes/pref/prefs.php:249
 msgid "Confirm password"
 msgstr "Apstipriniet paroli"
 
-#: classes/pref/prefs.php:253
+#: classes/pref/prefs.php:259
 msgid "Change password"
 msgstr "Nomainīt paroli"
 
-#: classes/pref/prefs.php:259
+#: classes/pref/prefs.php:265
 msgid "One time passwords / Authenticator"
 msgstr "Vienreizlietojamā parole/autentifikācija"
 
-#: classes/pref/prefs.php:288 classes/pref/prefs.php:339
+#: classes/pref/prefs.php:294 classes/pref/prefs.php:345
 msgid "Enter your password"
 msgstr "Ievadiet savu paroli"
 
-#: classes/pref/prefs.php:299
+#: classes/pref/prefs.php:305
 msgid "Disable OTP"
 msgstr "Atslēgt vienreizlietojamo paroli"
 
-#: classes/pref/prefs.php:305
+#: classes/pref/prefs.php:311
 msgid ""
 "You will need a compatible Authenticator to use this. Changing your password "
 "would automatically disable OTP."
@@ -2061,99 +2067,90 @@ 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
+#: classes/pref/prefs.php:313
 msgid "Scan the following code by the Authenticator application:"
 msgstr "Ar autentifikācijas moduli noskenējiet sekojošo kodu:"
 
-#: classes/pref/prefs.php:348
+#: classes/pref/prefs.php:354
 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
+#: classes/pref/prefs.php:362
 msgid "Enable OTP"
 msgstr "Iespējot vienreizlietojamo paroli"
 
-#: classes/pref/prefs.php:482
+#: classes/pref/prefs.php:493
 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
+#: classes/pref/prefs.php:552
 msgid "Register"
 msgstr "Reģistrēt"
 
-#: classes/pref/prefs.php:547
+#: classes/pref/prefs.php:556
 msgid "Clear"
 msgstr "Attīrīt"
 
-#: classes/pref/prefs.php:553
+#: classes/pref/prefs.php:562
 #, php-format
 msgid "Current server time: %s (UTC)"
 msgstr "Tekošā laika zona ir: %s (UTC)"
 
-#: classes/pref/prefs.php:582
+#: classes/pref/prefs.php:595
 msgid "Save configuration"
 msgstr "Saglabāt iestatījumus"
 
-#: classes/pref/prefs.php:585
+#: classes/pref/prefs.php:598
 msgid "Manage profiles"
 msgstr "Pārvaldīt profilus"
 
-#: classes/pref/prefs.php:588
+#: classes/pref/prefs.php:601
 msgid "Reset to defaults"
 msgstr "Atstatīt uz noklusētajiem"
 
-#: classes/pref/prefs.php:600
+#: classes/pref/prefs.php:613
 msgid "Show additional preferences"
 msgstr "Rādīt papildu iestatījumus"
 
-#: classes/pref/prefs.php:612 classes/pref/prefs.php:614
+#: classes/pref/prefs.php:625 classes/pref/prefs.php:627
 msgid "Plugins"
 msgstr ""
 
-#: classes/pref/prefs.php:642
+#: classes/pref/prefs.php:655
 msgid "System plugins"
 msgstr ""
 
-#: classes/pref/prefs.php:646 classes/pref/prefs.php:695
+#: classes/pref/prefs.php:659 classes/pref/prefs.php:708
 msgid "Plugin"
 msgstr ""
 
-#: classes/pref/prefs.php:647 classes/pref/prefs.php:696
+#: classes/pref/prefs.php:660 classes/pref/prefs.php:709
 msgid "Description"
 msgstr ""
 
-#: classes/pref/prefs.php:648 classes/pref/prefs.php:697
+#: classes/pref/prefs.php:661 classes/pref/prefs.php:710
 msgid "Version"
 msgstr ""
 
-#: classes/pref/prefs.php:649 classes/pref/prefs.php:698
+#: classes/pref/prefs.php:662 classes/pref/prefs.php:711
 msgid "Author"
 msgstr ""
 
-#: classes/pref/prefs.php:682 classes/pref/prefs.php:733
+#: classes/pref/prefs.php:695 classes/pref/prefs.php:746
 #, fuzzy
 msgid "Clear data"
 msgstr "Dzēst barotņu datus"
 
-#: classes/pref/prefs.php:691
+#: classes/pref/prefs.php:704
 msgid "User plugins"
 msgstr ""
 
-#: classes/pref/prefs.php:748
+#: classes/pref/prefs.php:761
 #, fuzzy
 msgid "Enable selected plugins"
 msgstr "Iespējot barotņu kategorijas"
 
-#: classes/pref/prefs.php:803 classes/pref/prefs.php:821
+#: classes/pref/prefs.php:816 classes/pref/prefs.php:834
 msgid "Incorrect password"
 msgstr "Nepareiza parole"
 
@@ -2432,6 +2429,10 @@ msgstr "Sveicināti,"
 msgid "Regular version"
 msgstr "Regulārā versija"
 
+#: plugins/close_button/init.php:24
+msgid "Close article"
+msgstr "Aizvērt rakstu"
+
 #: plugins/nsfw/init.php:32 plugins/nsfw/init.php:43
 msgid "Not work safe (click to toggle)"
 msgstr ""
@@ -2667,16 +2668,16 @@ msgstr "Flattr raksts"
 msgid "Share on Google+"
 msgstr "Kopīgot Google+"
 
-#: plugins/updater/init.php:294 plugins/updater/init.php:306
+#: plugins/updater/init.php:295 plugins/updater/init.php:307
 #: plugins/updater/updater.js:10
 msgid "Update Tiny Tiny RSS"
 msgstr "Atjaunot Tiny Tiny RSS"
 
-#: plugins/updater/init.php:309
+#: plugins/updater/init.php:310
 msgid "Your Tiny Tiny RSS installation is up to date."
 msgstr "Jūsu Tiny Tiny RSS ir aktuāls."
 
-#: plugins/updater/init.php:319
+#: plugins/updater/init.php:320
 msgid ""
 "Do not close this dialog until updating is finished. Backup your tt-rss "
 "directory before continuing."
@@ -2684,11 +2685,11 @@ 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
+#: plugins/updater/init.php:323
 msgid "Ready to update."
 msgstr "Gatavs atjaunošanai."
 
-#: plugins/updater/init.php:327
+#: plugins/updater/init.php:328
 msgid "Start update"
 msgstr "Sākt atjaunošanu"
 
@@ -2798,7 +2799,7 @@ msgstr "Lūdzu ievadiet kategorijas virsrakstu:"
 msgid "Generate new syndication address for this feed?"
 msgstr "Izveidot jaunu šīs barotnes sindikācijas adresi?"
 
-#: js/functions.js:1597 js/tt-rss.js:350 js/tt-rss.js:721
+#: js/functions.js:1597 js/tt-rss.js:350 js/tt-rss.js:729
 msgid "You can't edit this kind of feed."
 msgstr "Jūs nevarat rediģēt šāda veida barotni."
 
@@ -3055,11 +3056,11 @@ msgstr "Jūs nevarat pārvērtēt šī veida barotni."
 msgid "Rescore articles in %s?"
 msgstr "Pārvērtēt rakstus %s?"
 
-#: js/tt-rss.js:680
+#: js/tt-rss.js:688
 msgid "Please enable mail plugin first."
 msgstr "Lūdzu, vispirmi iespējojiet e-pasta spraudni."
 
-#: js/tt-rss.js:842
+#: js/tt-rss.js:850
 msgid "New version available!"
 msgstr "Ir pieejama jauna versija!"
 
@@ -3084,7 +3085,7 @@ 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/mailto/init.js:7
+#: js/viewfeed.js:1053 js/viewfeed.js:1967 plugins/mailto/init.js:7
 #: plugins/mail/mail.js:7
 msgid "No articles are selected."
 msgstr "Nav norādīts raksts."
@@ -3129,27 +3130,27 @@ msgstr "Nav atrasti iezīmējamie raksti"
 msgid "Mark %d article(s) as read?"
 msgstr "Iezīmēt %d rakstus kā lasītus?"
 
-#: js/viewfeed.js:1744
+#: js/viewfeed.js:1784
 msgid "Open original article"
 msgstr "Atvērt sākotnējo rakstu"
 
-#: js/viewfeed.js:1814
+#: js/viewfeed.js:1854
 msgid "Remove label"
 msgstr "Dzēst etiķeti"
 
-#: js/viewfeed.js:1838
+#: js/viewfeed.js:1878
 msgid "Playing..."
 msgstr "Atskaņo..."
 
-#: js/viewfeed.js:1839
+#: js/viewfeed.js:1879
 msgid "Click to pause"
 msgstr "Klikšķiniet, lai apturētu"
 
-#: js/viewfeed.js:1896
+#: js/viewfeed.js:1936
 msgid "Please enter new score for selected articles:"
 msgstr "Ievadiet jauno vērtējumu izvēlētajiem rakstiem:"
 
-#: js/viewfeed.js:1938
+#: js/viewfeed.js:1978
 msgid "Please enter new score for this article:"
 msgstr "Ievadiet jaunu vērtējumu šim rakstam:"
 
@@ -3246,6 +3247,12 @@ msgstr ""
 "Lūdzu neaizveriet logu līdz ir pabeigta atjaunošana. Pirms turpināt, "
 "izveidojiet jūsu tt-rss mapes rezerves kopiju."
 
+#~ msgid "Yes"
+#~ msgstr "Jā"
+
+#~ msgid "No"
+#~ msgstr "Nē"
+
 #~ msgid "Comments?"
 #~ msgstr "Komentāri?"
 
diff --git a/locale/nb_NO/LC_MESSAGES/messages.mo b/locale/nb_NO/LC_MESSAGES/messages.mo
index 58a06ac7e..1c2e07ab1 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 8cedc0533..86f90f113 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-19 22:42+0400\n"
+"POT-Creation-Date: 2013-03-20 10:24+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"
@@ -289,11 +289,11 @@ msgstr "Tilpasset"
 msgid "All Articles"
 msgstr "Alle artikler"
 
-#: index.php:169 include/functions.php:1911 classes/feeds.php:106
+#: index.php:169 include/functions.php:1915 classes/feeds.php:106
 msgid "Starred"
 msgstr "Favoritter"
 
-#: index.php:170 include/functions.php:1912 classes/feeds.php:107
+#: index.php:170 include/functions.php:1916 classes/feeds.php:107
 msgid "Published"
 msgstr "Publisert"
 
@@ -334,7 +334,7 @@ msgstr "Poeng"
 msgid "Update"
 msgstr "Oppdater"
 
-#: index.php:191 index.php:221 include/functions.php:1902
+#: index.php:191 index.php:221 include/functions.php:1906
 #: include/localized_schema.php:10 classes/feeds.php:111 classes/feeds.php:136
 #: classes/feeds.php:408 js/FeedTree.js:128 js/FeedTree.js:156
 #: plugins/digest/digest.js:630
@@ -396,7 +396,7 @@ msgstr ""
 msgid "Show tag cloud..."
 msgstr "Tag-sky"
 
-#: index.php:229 include/functions.php:1889
+#: index.php:229 include/functions.php:1893
 #, fuzzy
 msgid "Toggle widescreen mode"
 msgstr "Tillatt endringer i kategorirekkefølgen?"
@@ -423,8 +423,8 @@ msgstr "Tastatursnarveier"
 msgid "Logout"
 msgstr "Logg ut"
 
-#: prefs.php:28 prefs.php:99 include/functions.php:1914
-#: classes/pref/prefs.php:371
+#: prefs.php:28 prefs.php:99 include/functions.php:1918
+#: classes/pref/prefs.php:377
 msgid "Preferences"
 msgstr "Innstillinger"
 
@@ -445,8 +445,8 @@ msgstr "Nyhetsstrømmer"
 msgid "Filters"
 msgstr "Filtre"
 
-#: prefs.php:108 mobile/mobile-functions.php:205 include/functions.php:1117
-#: include/functions.php:1738 classes/pref/labels.php:90
+#: prefs.php:108 mobile/mobile-functions.php:205 include/functions.php:1121
+#: include/functions.php:1742 classes/pref/labels.php:90
 msgid "Labels"
 msgstr "Merkelapper"
 
@@ -543,8 +543,8 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
-#: mobile/mobile-functions.php:178 include/functions.php:1115
-#: include/functions.php:1736
+#: mobile/mobile-functions.php:178 include/functions.php:1119
+#: include/functions.php:1740
 msgid "Special"
 msgstr "Snarveier"
 
@@ -591,9 +591,9 @@ msgstr "Sorter nyhetsstrømer ut i fra antall uleste artikler"
 msgid "Reverse headline order (oldest first)"
 msgstr "Motsatt titteloversikt (eldste først)"
 
-#: include/digest.php:131 include/functions.php:1126
-#: include/functions.php:1639 include/functions.php:1724
-#: include/functions.php:1746 classes/opml.php:416 classes/pref/feeds.php:188
+#: include/digest.php:131 include/functions.php:1130
+#: include/functions.php:1643 include/functions.php:1728
+#: include/functions.php:1750 classes/opml.php:416 classes/pref/feeds.php:188
 msgid "Uncategorized"
 msgstr "Ukategorisert"
 
@@ -606,324 +606,324 @@ msgstr "Favorittartikler"
 msgid "No feeds found."
 msgstr "Ingen nyhetsstrømmer ble funnet."
 
-#: include/functions.php:697
+#: include/functions.php:701
 msgid "Session failed to validate (incorrect IP)"
 msgstr "Sesjonen kunne ikke valideres (feil IP)"
 
-#: include/functions.php:1588 classes/dlg.php:371 classes/pref/filters.php:368
+#: include/functions.php:1592 classes/dlg.php:371 classes/pref/filters.php:368
 msgid "All feeds"
 msgstr "Alle Nyhetsstrømmer"
 
-#: include/functions.php:1789
+#: include/functions.php:1793
 msgid "Starred articles"
 msgstr "Favorittartikler"
 
-#: include/functions.php:1791
+#: include/functions.php:1795
 msgid "Published articles"
 msgstr "Publiserte artikler"
 
-#: include/functions.php:1793
+#: include/functions.php:1797
 msgid "Fresh articles"
 msgstr "Ferske artikler"
 
-#: include/functions.php:1795 include/functions.php:1909
+#: include/functions.php:1799 include/functions.php:1913
 msgid "All articles"
 msgstr "Alle artikler"
 
-#: include/functions.php:1797
+#: include/functions.php:1801
 #, fuzzy
 msgid "Archived articles"
 msgstr "Lagrede artikler"
 
-#: include/functions.php:1799
+#: include/functions.php:1803
 msgid "Recently read"
 msgstr ""
 
-#: include/functions.php:1866
+#: include/functions.php:1870
 msgid "Navigation"
 msgstr "Navigasjon"
 
-#: include/functions.php:1867
+#: include/functions.php:1871
 #, fuzzy
 msgid "Open next feed"
 msgstr "Generert nyhetsstrøm"
 
-#: include/functions.php:1868
+#: include/functions.php:1872
 msgid "Open previous feed"
 msgstr ""
 
-#: include/functions.php:1869
+#: include/functions.php:1873
 #, fuzzy
 msgid "Open next article"
 msgstr "Vis opprinnelig artikkelinnhold"
 
-#: include/functions.php:1870
+#: include/functions.php:1874
 #, fuzzy
 msgid "Open previous article"
 msgstr "Vis opprinnelig artikkelinnhold"
 
-#: include/functions.php:1871
+#: include/functions.php:1875
 msgid "Open next article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1872
+#: include/functions.php:1876
 msgid "Open previous article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1873
+#: include/functions.php:1877
 msgid "Show search dialog"
 msgstr "Vis søkevinduet"
 
-#: include/functions.php:1874
+#: include/functions.php:1878
 #, fuzzy
 msgid "Article"
 msgstr "Alle artikler"
 
-#: include/functions.php:1875
+#: include/functions.php:1879
 msgid "Toggle starred"
 msgstr "Sett som favoritt"
 
-#: include/functions.php:1876
+#: include/functions.php:1880
 msgid "Toggle published"
 msgstr "Sett som publisert"
 
-#: include/functions.php:1877
+#: include/functions.php:1881
 msgid "Toggle unread"
 msgstr "Sett som ulest"
 
-#: include/functions.php:1878
+#: include/functions.php:1882
 msgid "Edit tags"
 msgstr "Endre stikkord"
 
-#: include/functions.php:1879
+#: include/functions.php:1883
 #, fuzzy
 msgid "Dismiss selected"
 msgstr "Fjerne merkede artikler fra merkelappen?"
 
-#: include/functions.php:1880
+#: include/functions.php:1884
 #, fuzzy
 msgid "Dismiss read"
 msgstr "Publiser artiklen"
 
-#: include/functions.php:1881
+#: include/functions.php:1885
 #, fuzzy
 msgid "Open in new window"
 msgstr "Åpne artikkel i nytt nettleservindu"
 
-#: include/functions.php:1882 js/viewfeed.js:1758
+#: include/functions.php:1886 js/viewfeed.js:1798
 #, fuzzy
 msgid "Mark below as read"
 msgstr "Marker som lest"
 
-#: include/functions.php:1883 js/viewfeed.js:1752
+#: include/functions.php:1887 js/viewfeed.js:1792
 #, fuzzy
 msgid "Mark above as read"
 msgstr "Marker som lest"
 
-#: include/functions.php:1884
+#: include/functions.php:1888
 #, fuzzy
 msgid "Scroll down"
 msgstr "Alt ferdig."
 
-#: include/functions.php:1885
+#: include/functions.php:1889
 msgid "Scroll up"
 msgstr ""
 
-#: include/functions.php:1886
+#: include/functions.php:1890
 #, fuzzy
 msgid "Select article under cursor"
 msgstr "Velg artikkelen under musepekeren"
 
-#: include/functions.php:1887
+#: include/functions.php:1891
 #, fuzzy
 msgid "Email article"
 msgstr "Alle artikler"
 
-#: include/functions.php:1888 plugins/close_button/init.php:24
+#: include/functions.php:1892
 #, fuzzy
-msgid "Close article"
+msgid "Close/collapse article"
 msgstr "Fjern artikler"
 
-#: include/functions.php:1890
+#: include/functions.php:1894
 #, fuzzy
 msgid "Article selection"
 msgstr "Handlinger for aktive artikler"
 
-#: include/functions.php:1891
+#: include/functions.php:1895
 #, fuzzy
 msgid "Select all articles"
 msgstr "Fjern artikler"
 
-#: include/functions.php:1892
+#: include/functions.php:1896
 #, fuzzy
 msgid "Select unread"
 msgstr "Slett uleste artikler"
 
-#: include/functions.php:1893
+#: include/functions.php:1897
 #, fuzzy
 msgid "Select starred"
 msgstr "Sett som favorittartikkel"
 
-#: include/functions.php:1894
+#: include/functions.php:1898
 #, fuzzy
 msgid "Select published"
 msgstr "Slett uleste artikler"
 
-#: include/functions.php:1895
+#: include/functions.php:1899
 #, fuzzy
 msgid "Invert selection"
 msgstr "Handlinger for aktive artikler"
 
-#: include/functions.php:1896
+#: include/functions.php:1900
 #, fuzzy
 msgid "Deselect everything"
 msgstr "Fjern artikler"
 
-#: include/functions.php:1897 classes/pref/feeds.php:488
+#: include/functions.php:1901 classes/pref/feeds.php:488
 #: classes/pref/feeds.php:719
 msgid "Feed"
 msgstr "Nyhetsstrøm"
 
-#: include/functions.php:1898
+#: include/functions.php:1902
 #, fuzzy
 msgid "Refresh current feed"
 msgstr "Oppdater aktive nyhetsstrømmer"
 
-#: include/functions.php:1899
+#: include/functions.php:1903
 #, fuzzy
 msgid "Un/hide read feeds"
 msgstr "Skjul/vis leste nyhetsstrømmer"
 
-#: include/functions.php:1900 classes/pref/feeds.php:1240
+#: include/functions.php:1904 classes/pref/feeds.php:1240
 msgid "Subscribe to feed"
 msgstr "Abonner på nyhetsstrøm"
 
-#: include/functions.php:1901 js/FeedTree.js:135 js/PrefFeedTree.js:67
+#: include/functions.php:1905 js/FeedTree.js:135 js/PrefFeedTree.js:67
 msgid "Edit feed"
 msgstr "Rediger nyhetsstrømmen"
 
-#: include/functions.php:1903
+#: include/functions.php:1907
 #, fuzzy
 msgid "Reverse headlines"
 msgstr "Motsatt titteloversikt (eldste først)"
 
-#: include/functions.php:1904
+#: include/functions.php:1908
 #, fuzzy
 msgid "Debug feed update"
 msgstr "Alle nyhetsstrømmer er oppdatert"
 
-#: include/functions.php:1905 js/FeedTree.js:177
+#: include/functions.php:1909 js/FeedTree.js:177
 msgid "Mark all feeds as read"
 msgstr "Marker alle nyhetsstrømmer som lest"
 
-#: include/functions.php:1906
+#: include/functions.php:1910
 #, fuzzy
 msgid "Un/collapse current category"
 msgstr "Velg for å slå sammen kategorien"
 
-#: include/functions.php:1907
+#: include/functions.php:1911
 #, fuzzy
 msgid "Toggle combined mode"
 msgstr "Tillatt endringer i kategorirekkefølgen?"
 
-#: include/functions.php:1908
+#: include/functions.php:1912
 #, fuzzy
 msgid "Go to"
 msgstr "Gå til..."
 
-#: include/functions.php:1910
+#: include/functions.php:1914
 #, fuzzy
 msgid "Fresh"
 msgstr "Oppdater"
 
-#: include/functions.php:1913
+#: include/functions.php:1917
 msgid "Tag cloud"
 msgstr "Tag-sky"
 
-#: include/functions.php:1915
+#: include/functions.php:1919
 #, fuzzy
 msgid "Other"
 msgstr "Andre:"
 
-#: include/functions.php:1916 classes/pref/labels.php:281
+#: include/functions.php:1920 classes/pref/labels.php:281
 msgid "Create label"
 msgstr "Lag merkelapp"
 
-#: include/functions.php:1917 classes/pref/filters.php:587
+#: include/functions.php:1921 classes/pref/filters.php:587
 msgid "Create filter"
 msgstr "Lag filter"
 
-#: include/functions.php:1918
+#: include/functions.php:1922
 #, fuzzy
 msgid "Un/collapse sidebar"
 msgstr "Skjul nyhetskanalsslisten"
 
-#: include/functions.php:1919
+#: include/functions.php:1923
 #, fuzzy
 msgid "Show help dialog"
 msgstr "Vis søkevinduet"
 
-#: include/functions.php:2401
+#: include/functions.php:2405
 #, fuzzy, php-format
 msgid "Search results: %s"
 msgstr "Søkeresultat"
 
-#: include/functions.php:2886 js/viewfeed.js:1845
+#: include/functions.php:2892 js/viewfeed.js:1885
 #, fuzzy
 msgid "Click to play"
 msgstr "Trykk for å endre"
 
-#: include/functions.php:2887 js/viewfeed.js:1844
+#: include/functions.php:2893 js/viewfeed.js:1884
 msgid "Play"
 msgstr ""
 
-#: include/functions.php:3007
+#: include/functions.php:3014
 msgid " - "
 msgstr "-"
 
-#: include/functions.php:3029 include/functions.php:3346 classes/rpc.php:360
+#: include/functions.php:3036 include/functions.php:3353 classes/rpc.php:360
 msgid "no tags"
 msgstr "Ingen stikkord"
 
-#: include/functions.php:3039 classes/feeds.php:650
+#: include/functions.php:3046 classes/feeds.php:653
 msgid "Edit tags for this article"
 msgstr "Rediger stikkordene for denne artikkelen"
 
-#: include/functions.php:3068 classes/feeds.php:605
+#: include/functions.php:3075 classes/feeds.php:608
 #, fuzzy
 msgid "Originally from:"
 msgstr "Vis opprinnelig artikkelinnhold"
 
-#: include/functions.php:3081 classes/feeds.php:618 classes/pref/feeds.php:507
+#: include/functions.php:3088 classes/feeds.php:621 classes/pref/feeds.php:507
 #, fuzzy
 msgid "Feed URL"
 msgstr "Nyhetsstrøm"
 
-#: include/functions.php:3110
+#: include/functions.php:3117
 msgid "Related"
 msgstr ""
 
-#: include/functions.php:3137 classes/dlg.php:43 classes/dlg.php:162
+#: include/functions.php:3144 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:1553
 #: classes/pref/feeds.php:1624 plugins/import_export/init.php:407
 #: plugins/import_export/init.php:431 plugins/share/init.php:67
-#: plugins/updater/init.php:329
+#: plugins/updater/init.php:330
 msgid "Close this window"
 msgstr "Lukk dette vinduet"
 
-#: include/functions.php:3371
+#: include/functions.php:3378
 #, fuzzy
 msgid "(edit note)"
 msgstr "Rediger notat"
 
-#: include/functions.php:3604
+#: include/functions.php:3611
 msgid "unknown type"
 msgstr "Ukjent type"
 
-#: include/functions.php:3654
+#: include/functions.php:3661
 #, fuzzy
 msgid "Attachments"
 msgstr "Vedlegg:"
@@ -962,7 +962,7 @@ msgstr "Publiser artiklen"
 msgid "Assign tags"
 msgstr "Tildel stikkord"
 
-#: include/localized_schema.php:14 js/viewfeed.js:1809
+#: include/localized_schema.php:14 js/viewfeed.js:1849
 msgid "Assign label"
 msgstr "Tildel stikkord"
 
@@ -1431,7 +1431,7 @@ msgstr "Autentifisering"
 msgid "Login"
 msgstr "Logg inn"
 
-#: classes/dlg.php:276 classes/dlg.php:732 classes/pref/prefs.php:196
+#: classes/dlg.php:276 classes/dlg.php:732 classes/pref/prefs.php:202
 #: classes/pref/feeds.php:569 classes/pref/feeds.php:793
 #, fuzzy
 msgid "Password"
@@ -1540,7 +1540,7 @@ msgstr "Se stikkord"
 msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 
-#: classes/dlg.php:591 plugins/updater/init.php:303
+#: classes/dlg.php:591 plugins/updater/init.php:304
 #, fuzzy, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "Ny versjon av Tiny Tiny Rss er tilgjengelig!"
@@ -1682,7 +1682,7 @@ msgstr "Marker artikkel som favoritt"
 msgid "Feed:"
 msgstr "Nyhetsstrøm:"
 
-#: classes/feeds.php:201 classes/feeds.php:795
+#: classes/feeds.php:201 classes/feeds.php:798
 msgid "Feed not found."
 msgstr "Nyhetsstrømmen ble ikke funnet"
 
@@ -1690,19 +1690,24 @@ msgstr "Nyhetsstrømmen ble ikke funnet"
 msgid "mark as read"
 msgstr "marker som lest"
 
-#: classes/feeds.php:696
+#: classes/feeds.php:553
+#, fuzzy
+msgid "Collapse article"
+msgstr "Fjern artikler"
+
+#: classes/feeds.php:699
 msgid "No unread articles found to display."
 msgstr "Ingen uleste artikler funnet som kunne vises"
 
-#: classes/feeds.php:699
+#: classes/feeds.php:702
 msgid "No updated articles found to display."
 msgstr "Ingen oppdaterte artikler funnet som kunne vises"
 
-#: classes/feeds.php:702
+#: classes/feeds.php:705
 msgid "No starred articles found to display."
 msgstr "Ingen markerte artikler som kan vises"
 
-#: classes/feeds.php:706
+#: classes/feeds.php:709
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
@@ -1710,20 +1715,20 @@ msgstr ""
 "Ingen artikler ble funnet. Du kan gi artikler merkelapper manuelt (se aksjon-"
 "menyen ovenfor) eller bruke et filter."
 
-#: classes/feeds.php:708
+#: classes/feeds.php:711
 msgid "No articles found to display."
 msgstr "Ingen artikler funnet som kan vises"
 
-#: classes/feeds.php:723 classes/feeds.php:904
+#: classes/feeds.php:726 classes/feeds.php:907
 #, fuzzy, php-format
 msgid "Feeds last updated at %s"
 msgstr "Oppdateringsfeil"
 
-#: classes/feeds.php:733 classes/feeds.php:914
+#: classes/feeds.php:736 classes/feeds.php:917
 msgid "Some feeds have update errors (click for details)"
 msgstr "Noen nyhetsstrømmer har oppdateringsfeil (trykk for detaljer)"
 
-#: classes/feeds.php:894
+#: classes/feeds.php:897
 msgid "No feed selected."
 msgstr "Ingen valgt nyhetsstrøm"
 
@@ -2060,188 +2065,179 @@ msgstr "Innskrivne passord matcher ikke."
 msgid "Function not supported by authentication module."
 msgstr ""
 
-#: classes/pref/prefs.php:63
+#: classes/pref/prefs.php:69
 msgid "The configuration was saved."
 msgstr "Konfigurasjonen er lagret."
 
-#: classes/pref/prefs.php:77
+#: classes/pref/prefs.php:83
 #, php-format
 msgid "Unknown option: %s"
 msgstr "Ukjent valg: %s"
 
-#: classes/pref/prefs.php:91
+#: classes/pref/prefs.php:97
 #, fuzzy
 msgid "Your personal data has been saved."
 msgstr "Passord har blitt endret."
 
-#: classes/pref/prefs.php:131
+#: classes/pref/prefs.php:137
 #, fuzzy
 msgid "Personal data / Authentication"
 msgstr "Autentifisering"
 
-#: classes/pref/prefs.php:151
+#: classes/pref/prefs.php:157
 msgid "Personal data"
 msgstr "Personlig informasjon"
 
-#: classes/pref/prefs.php:161
+#: classes/pref/prefs.php:167
 msgid "Full name"
 msgstr ""
 
-#: classes/pref/prefs.php:165
+#: classes/pref/prefs.php:171
 msgid "E-mail"
 msgstr "E-post"
 
-#: classes/pref/prefs.php:171
+#: classes/pref/prefs.php:177
 msgid "Access level"
 msgstr "Tilgangsnivå"
 
-#: classes/pref/prefs.php:181
+#: classes/pref/prefs.php:187
 #, fuzzy
 msgid "Save data"
 msgstr "Lagre"
 
-#: classes/pref/prefs.php:203
+#: classes/pref/prefs.php:209
 #, 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:235
+#: classes/pref/prefs.php:241
 msgid "Old password"
 msgstr "Gammelt passord"
 
-#: classes/pref/prefs.php:238
+#: classes/pref/prefs.php:244
 msgid "New password"
 msgstr "Nytt passord"
 
-#: classes/pref/prefs.php:243
+#: classes/pref/prefs.php:249
 msgid "Confirm password"
 msgstr "Bekreft passord"
 
-#: classes/pref/prefs.php:253
+#: classes/pref/prefs.php:259
 msgid "Change password"
 msgstr "Endre passord"
 
-#: classes/pref/prefs.php:259
+#: classes/pref/prefs.php:265
 msgid "One time passwords / Authenticator"
 msgstr ""
 
-#: classes/pref/prefs.php:288 classes/pref/prefs.php:339
+#: classes/pref/prefs.php:294 classes/pref/prefs.php:345
 #, fuzzy
 msgid "Enter your password"
 msgstr "Feil brukernavn og/eller passord"
 
-#: classes/pref/prefs.php:299
+#: classes/pref/prefs.php:305
 #, fuzzy
 msgid "Disable OTP"
 msgstr "(Avskrudd)"
 
-#: classes/pref/prefs.php:305
+#: classes/pref/prefs.php:311
 msgid ""
 "You will need a compatible Authenticator to use this. Changing your password "
 "would automatically disable OTP."
 msgstr ""
 
-#: classes/pref/prefs.php:307
+#: classes/pref/prefs.php:313
 msgid "Scan the following code by the Authenticator application:"
 msgstr ""
 
-#: classes/pref/prefs.php:348
+#: classes/pref/prefs.php:354
 msgid "I have scanned the code and would like to enable OTP"
 msgstr ""
 
-#: classes/pref/prefs.php:356
+#: classes/pref/prefs.php:362
 #, fuzzy
 msgid "Enable OTP"
 msgstr "Tillatt"
 
-#: classes/pref/prefs.php:482
+#: classes/pref/prefs.php:493
 #, fuzzy
 msgid "Customize"
 msgstr "URL til brukerbestemt utseendemal (CSS)"
 
-#: classes/pref/prefs.php:501 classes/pref/prefs.php:508
-#: classes/pref/prefs.php:513
-msgid "Yes"
-msgstr "Ja"
-
-#: classes/pref/prefs.php:503 classes/pref/prefs.php:513
-msgid "No"
-msgstr "Nei"
-
-#: classes/pref/prefs.php:543
+#: classes/pref/prefs.php:552
 #, fuzzy
 msgid "Register"
 msgstr "Registrert"
 
-#: classes/pref/prefs.php:547
+#: classes/pref/prefs.php:556
 msgid "Clear"
 msgstr ""
 
-#: classes/pref/prefs.php:553
+#: classes/pref/prefs.php:562
 #, php-format
 msgid "Current server time: %s (UTC)"
 msgstr ""
 
-#: classes/pref/prefs.php:582
+#: classes/pref/prefs.php:595
 msgid "Save configuration"
 msgstr "Lagre konfigurasjonen"
 
-#: classes/pref/prefs.php:585
+#: classes/pref/prefs.php:598
 #, fuzzy
 msgid "Manage profiles"
 msgstr "Lag filter"
 
-#: classes/pref/prefs.php:588
+#: classes/pref/prefs.php:601
 msgid "Reset to defaults"
 msgstr "Tilbake til standard"
 
-#: classes/pref/prefs.php:600
+#: classes/pref/prefs.php:613
 #, fuzzy
 msgid "Show additional preferences"
 msgstr "Forlat innstillinger"
 
-#: classes/pref/prefs.php:612 classes/pref/prefs.php:614
+#: classes/pref/prefs.php:625 classes/pref/prefs.php:627
 msgid "Plugins"
 msgstr ""
 
-#: classes/pref/prefs.php:642
+#: classes/pref/prefs.php:655
 msgid "System plugins"
 msgstr ""
 
-#: classes/pref/prefs.php:646 classes/pref/prefs.php:695
+#: classes/pref/prefs.php:659 classes/pref/prefs.php:708
 msgid "Plugin"
 msgstr ""
 
-#: classes/pref/prefs.php:647 classes/pref/prefs.php:696
+#: classes/pref/prefs.php:660 classes/pref/prefs.php:709
 #, fuzzy
 msgid "Description"
 msgstr "beskrivelse"
 
-#: classes/pref/prefs.php:648 classes/pref/prefs.php:697
+#: classes/pref/prefs.php:661 classes/pref/prefs.php:710
 msgid "Version"
 msgstr ""
 
-#: classes/pref/prefs.php:649 classes/pref/prefs.php:698
+#: classes/pref/prefs.php:662 classes/pref/prefs.php:711
 msgid "Author"
 msgstr ""
 
-#: classes/pref/prefs.php:682 classes/pref/prefs.php:733
+#: classes/pref/prefs.php:695 classes/pref/prefs.php:746
 #, fuzzy
 msgid "Clear data"
 msgstr "Slett nyhetsstrømsdata"
 
-#: classes/pref/prefs.php:691
+#: classes/pref/prefs.php:704
 msgid "User plugins"
 msgstr ""
 
-#: classes/pref/prefs.php:748
+#: classes/pref/prefs.php:761
 #, fuzzy
 msgid "Enable selected plugins"
 msgstr "Bruk nyhetsstrømsikoner"
 
-#: classes/pref/prefs.php:803 classes/pref/prefs.php:821
+#: classes/pref/prefs.php:816 classes/pref/prefs.php:834
 #, fuzzy
 msgid "Incorrect password"
 msgstr "Feil brukernavn og/eller passord"
@@ -2541,6 +2537,11 @@ msgstr "Hei, "
 msgid "Regular version"
 msgstr ""
 
+#: plugins/close_button/init.php:24
+#, fuzzy
+msgid "Close article"
+msgstr "Fjern artikler"
+
 #: plugins/nsfw/init.php:32 plugins/nsfw/init.php:43
 msgid "Not work safe (click to toggle)"
 msgstr ""
@@ -2785,29 +2786,29 @@ msgstr "Marker artikkel som favoritt"
 msgid "Share on Google+"
 msgstr "Tittel"
 
-#: plugins/updater/init.php:294 plugins/updater/init.php:306
+#: plugins/updater/init.php:295 plugins/updater/init.php:307
 #: plugins/updater/updater.js:10
 #, fuzzy
 msgid "Update Tiny Tiny RSS"
 msgstr "Returner til Tiny Tiny RSS"
 
-#: plugins/updater/init.php:309
+#: plugins/updater/init.php:310
 #, fuzzy
 msgid "Your Tiny Tiny RSS installation is up to date."
 msgstr "Tiny Tiny RSS-databasen er oppdatert"
 
-#: plugins/updater/init.php:319
+#: plugins/updater/init.php:320
 msgid ""
 "Do not close this dialog until updating is finished. Backup your tt-rss "
 "directory before continuing."
 msgstr ""
 
-#: plugins/updater/init.php:322
+#: plugins/updater/init.php:323
 #, fuzzy
 msgid "Ready to update."
 msgstr "Siste oppdatering:"
 
-#: plugins/updater/init.php:327
+#: plugins/updater/init.php:328
 #, fuzzy
 msgid "Start update"
 msgstr "Siste oppdatering:"
@@ -2923,7 +2924,7 @@ msgstr "Vennligst skriv inn et notat for denne artikkelen:"
 msgid "Generate new syndication address for this feed?"
 msgstr ""
 
-#: js/functions.js:1597 js/tt-rss.js:350 js/tt-rss.js:721
+#: js/functions.js:1597 js/tt-rss.js:350 js/tt-rss.js:729
 msgid "You can't edit this kind of feed."
 msgstr "Du kan ikke endre denne typen nyhetsstrøm"
 
@@ -3193,12 +3194,12 @@ msgstr "Du kan ikke endre poengsummen for denne typen nyhetskanal"
 msgid "Rescore articles in %s?"
 msgstr "Endre poengene for artiklene i %s?"
 
-#: js/tt-rss.js:680
+#: js/tt-rss.js:688
 #, fuzzy
 msgid "Please enable mail plugin first."
 msgstr "Vennligst velg en eller flere nyhetsstrømmer først"
 
-#: js/tt-rss.js:842
+#: js/tt-rss.js:850
 #, fuzzy
 msgid "New version available!"
 msgstr "Ny versjon av Tiny Tiny Rss er tilgjengelig!"
@@ -3225,7 +3226,7 @@ msgstr "Fjern publiseringen av artikkelen."
 
 #: 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/mailto/init.js:7
+#: js/viewfeed.js:1053 js/viewfeed.js:1967 plugins/mailto/init.js:7
 #: plugins/mail/mail.js:7
 msgid "No articles are selected."
 msgstr "Ingen artikler er valgt."
@@ -3275,32 +3276,32 @@ msgstr "Ingen artikler funnet som kan markeres"
 msgid "Mark %d article(s) as read?"
 msgstr "Marker %d artikkel/artikler som leste?"
 
-#: js/viewfeed.js:1744
+#: js/viewfeed.js:1784
 #, fuzzy
 msgid "Open original article"
 msgstr "Vis opprinnelig artikkelinnhold"
 
-#: js/viewfeed.js:1814
+#: js/viewfeed.js:1854
 #, fuzzy
 msgid "Remove label"
 msgstr "Fjerne merkede merkelapper?"
 
-#: js/viewfeed.js:1838
+#: js/viewfeed.js:1878
 #, fuzzy
 msgid "Playing..."
 msgstr "Laster nyhetsstrømmer..."
 
-#: js/viewfeed.js:1839
+#: js/viewfeed.js:1879
 #, fuzzy
 msgid "Click to pause"
 msgstr "Trykk for å endre"
 
-#: js/viewfeed.js:1896
+#: js/viewfeed.js:1936
 #, fuzzy
 msgid "Please enter new score for selected articles:"
 msgstr "Vennligst skriv inn et notat for denne artikkelen:"
 
-#: js/viewfeed.js:1938
+#: js/viewfeed.js:1978
 #, fuzzy
 msgid "Please enter new score for this article:"
 msgstr "Vennligst skriv inn et notat for denne artikkelen:"
@@ -3397,6 +3398,12 @@ msgid ""
 "before continuing. Please type 'yes' to continue."
 msgstr ""
 
+#~ msgid "Yes"
+#~ msgstr "Ja"
+
+#~ msgid "No"
+#~ msgstr "Nei"
+
 #~ msgid "Comments?"
 #~ msgstr "Kommentarer?"
 
diff --git a/locale/pl_PL/LC_MESSAGES/messages.mo b/locale/pl_PL/LC_MESSAGES/messages.mo
index 33044e526..b4be3a08a 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 95b91f22a..6d1c01f80 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-19 22:42+0400\n"
+"POT-Creation-Date: 2013-03-20 10:24+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/"
@@ -297,11 +297,11 @@ msgstr "Adaptacyjny"
 msgid "All Articles"
 msgstr "Wszystkie artykuły"
 
-#: index.php:169 include/functions.php:1911 classes/feeds.php:106
+#: index.php:169 include/functions.php:1915 classes/feeds.php:106
 msgid "Starred"
 msgstr "Oznaczone gwiazdką"
 
-#: index.php:170 include/functions.php:1912 classes/feeds.php:107
+#: index.php:170 include/functions.php:1916 classes/feeds.php:107
 msgid "Published"
 msgstr "Opublikowane"
 
@@ -341,7 +341,7 @@ msgstr "Punktacja"
 msgid "Update"
 msgstr "Aktualizuj"
 
-#: index.php:191 index.php:221 include/functions.php:1902
+#: index.php:191 index.php:221 include/functions.php:1906
 #: include/localized_schema.php:10 classes/feeds.php:111 classes/feeds.php:136
 #: classes/feeds.php:408 js/FeedTree.js:128 js/FeedTree.js:156
 #: plugins/digest/digest.js:630
@@ -402,7 +402,7 @@ msgstr "Przełącz na przegląd..."
 msgid "Show tag cloud..."
 msgstr "Pokaż chmurę tagów..."
 
-#: index.php:229 include/functions.php:1889
+#: index.php:229 include/functions.php:1893
 #, fuzzy
 msgid "Toggle widescreen mode"
 msgstr "Przełącz oznaczenie gwiazdką"
@@ -428,8 +428,8 @@ msgstr "O skrótach klawiszowych"
 msgid "Logout"
 msgstr "Wyloguj"
 
-#: prefs.php:28 prefs.php:99 include/functions.php:1914
-#: classes/pref/prefs.php:371
+#: prefs.php:28 prefs.php:99 include/functions.php:1918
+#: classes/pref/prefs.php:377
 msgid "Preferences"
 msgstr "Ustawienia"
 
@@ -450,8 +450,8 @@ msgstr "Kanały"
 msgid "Filters"
 msgstr "Filtry"
 
-#: prefs.php:108 mobile/mobile-functions.php:205 include/functions.php:1117
-#: include/functions.php:1738 classes/pref/labels.php:90
+#: prefs.php:108 mobile/mobile-functions.php:205 include/functions.php:1121
+#: include/functions.php:1742 classes/pref/labels.php:90
 msgid "Labels"
 msgstr "Etykiety"
 
@@ -549,8 +549,8 @@ msgstr "Otwórz standardową wersję"
 msgid "Home"
 msgstr "Stron główna"
 
-#: mobile/mobile-functions.php:178 include/functions.php:1115
-#: include/functions.php:1736
+#: mobile/mobile-functions.php:178 include/functions.php:1119
+#: include/functions.php:1740
 msgid "Special"
 msgstr "Specjalne"
 
@@ -592,9 +592,9 @@ msgstr "Sortuj kanały według liczby nieprzeczytanych"
 msgid "Reverse headline order (oldest first)"
 msgstr "Odwrotny porządek nagłówków (najstarsze pierwsze)"
 
-#: include/digest.php:131 include/functions.php:1126
-#: include/functions.php:1639 include/functions.php:1724
-#: include/functions.php:1746 classes/opml.php:416 classes/pref/feeds.php:188
+#: include/digest.php:131 include/functions.php:1130
+#: include/functions.php:1643 include/functions.php:1728
+#: include/functions.php:1750 classes/opml.php:416 classes/pref/feeds.php:188
 msgid "Uncategorized"
 msgstr "Bez kategorii"
 
@@ -607,314 +607,315 @@ msgstr "%d zarchiwizowanych artykułów"
 msgid "No feeds found."
 msgstr "Nie znaleziono kanałów."
 
-#: include/functions.php:697
+#: include/functions.php:701
 msgid "Session failed to validate (incorrect IP)"
 msgstr "Nie powiodła się weryfikacja sesji (nieprawidłowy adres IP)"
 
-#: include/functions.php:1588 classes/dlg.php:371 classes/pref/filters.php:368
+#: include/functions.php:1592 classes/dlg.php:371 classes/pref/filters.php:368
 msgid "All feeds"
 msgstr "Wszystkie kanały"
 
-#: include/functions.php:1789
+#: include/functions.php:1793
 msgid "Starred articles"
 msgstr "Artykuły oznaczone gwiazdką"
 
-#: include/functions.php:1791
+#: include/functions.php:1795
 msgid "Published articles"
 msgstr "Opublikowane artykuły"
 
-#: include/functions.php:1793
+#: include/functions.php:1797
 msgid "Fresh articles"
 msgstr "Świeże artykuły"
 
-#: include/functions.php:1795 include/functions.php:1909
+#: include/functions.php:1799 include/functions.php:1913
 msgid "All articles"
 msgstr "Wszystkie artykuły"
 
-#: include/functions.php:1797
+#: include/functions.php:1801
 msgid "Archived articles"
 msgstr "Zarchiwizowane artykuły"
 
-#: include/functions.php:1799
+#: include/functions.php:1803
 msgid "Recently read"
 msgstr "Ostatnio czytane"
 
-#: include/functions.php:1866
+#: include/functions.php:1870
 msgid "Navigation"
 msgstr "Nawigacja"
 
-#: include/functions.php:1867
+#: include/functions.php:1871
 #, fuzzy
 msgid "Open next feed"
 msgstr ""
 "Przejdź do następnego kanału po zakończeniu lektury ostatniego artykułu"
 
-#: include/functions.php:1868
+#: include/functions.php:1872
 msgid "Open previous feed"
 msgstr ""
 
-#: include/functions.php:1869
+#: include/functions.php:1873
 #, fuzzy
 msgid "Open next article"
 msgstr "Otwórz oryginalny artykuł"
 
-#: include/functions.php:1870
+#: include/functions.php:1874
 #, fuzzy
 msgid "Open previous article"
 msgstr "Otwórz oryginalny artykuł"
 
-#: include/functions.php:1871
+#: include/functions.php:1875
 msgid "Open next article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1872
+#: include/functions.php:1876
 msgid "Open previous article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1873
+#: include/functions.php:1877
 msgid "Show search dialog"
 msgstr "Otwórz okno wyszukiwania"
 
-#: include/functions.php:1874
+#: include/functions.php:1878
 #, fuzzy
 msgid "Article"
 msgstr "Wszystkie artykuły"
 
-#: include/functions.php:1875
+#: include/functions.php:1879
 msgid "Toggle starred"
 msgstr "Przełącz oznaczenie gwiazdką"
 
-#: include/functions.php:1876
+#: include/functions.php:1880
 msgid "Toggle published"
 msgstr "Przełącz flagę publikacji"
 
-#: include/functions.php:1877
+#: include/functions.php:1881
 msgid "Toggle unread"
 msgstr "Przełącz flagę \"przeczytano\""
 
-#: include/functions.php:1878
+#: include/functions.php:1882
 msgid "Edit tags"
 msgstr "Edytuj tagi"
 
-#: include/functions.php:1879
+#: include/functions.php:1883
 #, fuzzy
 msgid "Dismiss selected"
 msgstr "Odwołaj wybrane artykuły"
 
-#: include/functions.php:1880
+#: include/functions.php:1884
 #, fuzzy
 msgid "Dismiss read"
 msgstr "Odwołaj przeczytane artykuły"
 
-#: include/functions.php:1881
+#: include/functions.php:1885
 #, fuzzy
 msgid "Open in new window"
 msgstr "Otwórz artykuł w nowym oknie"
 
-#: include/functions.php:1882 js/viewfeed.js:1758
+#: include/functions.php:1886 js/viewfeed.js:1798
 msgid "Mark below as read"
 msgstr "Oznacz poniższe jako przeczytane"
 
-#: include/functions.php:1883 js/viewfeed.js:1752
+#: include/functions.php:1887 js/viewfeed.js:1792
 msgid "Mark above as read"
 msgstr "Oznacz powyższe jako przeczytane"
 
-#: include/functions.php:1884
+#: include/functions.php:1888
 #, fuzzy
 msgid "Scroll down"
 msgstr "Zrobione."
 
-#: include/functions.php:1885
+#: include/functions.php:1889
 msgid "Scroll up"
 msgstr ""
 
-#: include/functions.php:1886
+#: include/functions.php:1890
 #, fuzzy
 msgid "Select article under cursor"
 msgstr "Wybierz artykuł pod kursorem myszy"
 
-#: include/functions.php:1887
+#: include/functions.php:1891
 msgid "Email article"
 msgstr "Prześlij artykuł emailem"
 
-#: include/functions.php:1888 plugins/close_button/init.php:24
-msgid "Close article"
+#: include/functions.php:1892
+#, fuzzy
+msgid "Close/collapse article"
 msgstr "Zamknij artykuł"
 
-#: include/functions.php:1890
+#: include/functions.php:1894
 #, fuzzy
 msgid "Article selection"
 msgstr "Odwróć zaznaczenie artykułów"
 
-#: include/functions.php:1891
+#: include/functions.php:1895
 msgid "Select all articles"
 msgstr "Wybierz wszystkie artykuły"
 
-#: include/functions.php:1892
+#: include/functions.php:1896
 #, fuzzy
 msgid "Select unread"
 msgstr "Wybierz nieprzeczytane artykuły"
 
-#: include/functions.php:1893
+#: include/functions.php:1897
 #, fuzzy
 msgid "Select starred"
 msgstr "Oznacz gwiazdką"
 
-#: include/functions.php:1894
+#: include/functions.php:1898
 #, fuzzy
 msgid "Select published"
 msgstr "Wybierz nieprzeczytane artykuły"
 
-#: include/functions.php:1895
+#: include/functions.php:1899
 #, fuzzy
 msgid "Invert selection"
 msgstr "Odwróć zaznaczenie artykułów"
 
-#: include/functions.php:1896
+#: include/functions.php:1900
 #, fuzzy
 msgid "Deselect everything"
 msgstr "Odznacz wszystkie artykuły"
 
-#: include/functions.php:1897 classes/pref/feeds.php:488
+#: include/functions.php:1901 classes/pref/feeds.php:488
 #: classes/pref/feeds.php:719
 msgid "Feed"
 msgstr "Kanał"
 
-#: include/functions.php:1898
+#: include/functions.php:1902
 #, fuzzy
 msgid "Refresh current feed"
 msgstr "Odśwież aktywny kanał"
 
-#: include/functions.php:1899
+#: include/functions.php:1903
 #, fuzzy
 msgid "Un/hide read feeds"
 msgstr "Pokaż/Ukryj przeczytane kanały"
 
-#: include/functions.php:1900 classes/pref/feeds.php:1240
+#: include/functions.php:1904 classes/pref/feeds.php:1240
 msgid "Subscribe to feed"
 msgstr "Prenumeruj kanał"
 
-#: include/functions.php:1901 js/FeedTree.js:135 js/PrefFeedTree.js:67
+#: include/functions.php:1905 js/FeedTree.js:135 js/PrefFeedTree.js:67
 msgid "Edit feed"
 msgstr "Edytuj kanał"
 
-#: include/functions.php:1903
+#: include/functions.php:1907
 #, fuzzy
 msgid "Reverse headlines"
 msgstr "Odwróć kolejność nagłówków"
 
-#: include/functions.php:1904
+#: include/functions.php:1908
 #, fuzzy
 msgid "Debug feed update"
 msgstr "Wyłącz aktualizacje"
 
-#: include/functions.php:1905 js/FeedTree.js:177
+#: include/functions.php:1909 js/FeedTree.js:177
 msgid "Mark all feeds as read"
 msgstr "Oznacz wszystkie kanały jako przeczytane"
 
-#: include/functions.php:1906
+#: include/functions.php:1910
 #, fuzzy
 msgid "Un/collapse current category"
 msgstr "Umieść w kategorii:"
 
-#: include/functions.php:1907
+#: include/functions.php:1911
 #, fuzzy
 msgid "Toggle combined mode"
 msgstr "Przełącz flagę publikacji"
 
-#: include/functions.php:1908
+#: include/functions.php:1912
 #, fuzzy
 msgid "Go to"
 msgstr "Idź do..."
 
-#: include/functions.php:1910
+#: include/functions.php:1914
 msgid "Fresh"
 msgstr ""
 
-#: include/functions.php:1913
+#: include/functions.php:1917
 msgid "Tag cloud"
 msgstr "Chmura tagów"
 
-#: include/functions.php:1915
+#: include/functions.php:1919
 #, fuzzy
 msgid "Other"
 msgstr "Inne kanały"
 
-#: include/functions.php:1916 classes/pref/labels.php:281
+#: include/functions.php:1920 classes/pref/labels.php:281
 msgid "Create label"
 msgstr "Utwórz etykietę"
 
-#: include/functions.php:1917 classes/pref/filters.php:587
+#: include/functions.php:1921 classes/pref/filters.php:587
 msgid "Create filter"
 msgstr "Utwórz filtr"
 
-#: include/functions.php:1918
+#: include/functions.php:1922
 #, fuzzy
 msgid "Un/collapse sidebar"
 msgstr "Rozwiń pasek boczny"
 
-#: include/functions.php:1919
+#: include/functions.php:1923
 #, fuzzy
 msgid "Show help dialog"
 msgstr "Otwórz okno wyszukiwania"
 
-#: include/functions.php:2401
+#: include/functions.php:2405
 #, php-format
 msgid "Search results: %s"
 msgstr "Wyniki wyszukiwania: %s"
 
-#: include/functions.php:2886 js/viewfeed.js:1845
+#: include/functions.php:2892 js/viewfeed.js:1885
 msgid "Click to play"
 msgstr "Wciśnij aby odtworzyć"
 
-#: include/functions.php:2887 js/viewfeed.js:1844
+#: include/functions.php:2893 js/viewfeed.js:1884
 msgid "Play"
 msgstr "Odtwórz"
 
-#: include/functions.php:3007
+#: include/functions.php:3014
 msgid " - "
 msgstr " - "
 
-#: include/functions.php:3029 include/functions.php:3346 classes/rpc.php:360
+#: include/functions.php:3036 include/functions.php:3353 classes/rpc.php:360
 msgid "no tags"
 msgstr "brak tagów"
 
-#: include/functions.php:3039 classes/feeds.php:650
+#: include/functions.php:3046 classes/feeds.php:653
 msgid "Edit tags for this article"
 msgstr "Edytuj tagi dla tego artykułu"
 
-#: include/functions.php:3068 classes/feeds.php:605
+#: include/functions.php:3075 classes/feeds.php:608
 msgid "Originally from:"
 msgstr "Oryginał pochodzi z:"
 
-#: include/functions.php:3081 classes/feeds.php:618 classes/pref/feeds.php:507
+#: include/functions.php:3088 classes/feeds.php:621 classes/pref/feeds.php:507
 msgid "Feed URL"
 msgstr "Adres kanału"
 
-#: include/functions.php:3110
+#: include/functions.php:3117
 msgid "Related"
 msgstr "Pokrewne"
 
-#: include/functions.php:3137 classes/dlg.php:43 classes/dlg.php:162
+#: include/functions.php:3144 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:1553
 #: classes/pref/feeds.php:1624 plugins/import_export/init.php:407
 #: plugins/import_export/init.php:431 plugins/share/init.php:67
-#: plugins/updater/init.php:329
+#: plugins/updater/init.php:330
 msgid "Close this window"
 msgstr "Zamknij to okno"
 
-#: include/functions.php:3371
+#: include/functions.php:3378
 msgid "(edit note)"
 msgstr "(edytuj notatkę)"
 
-#: include/functions.php:3604
+#: include/functions.php:3611
 msgid "unknown type"
 msgstr "nieznany typ"
 
-#: include/functions.php:3654
+#: include/functions.php:3661
 msgid "Attachments"
 msgstr "Załączniki"
 
@@ -951,7 +952,7 @@ msgstr "Opublikuj"
 msgid "Assign tags"
 msgstr "Przypisz tagi"
 
-#: include/localized_schema.php:14 js/viewfeed.js:1809
+#: include/localized_schema.php:14 js/viewfeed.js:1849
 msgid "Assign label"
 msgstr "Przypisz etykietę"
 
@@ -1409,7 +1410,7 @@ msgstr "Uwierzytelnianie"
 msgid "Login"
 msgstr "Nazwa użytkownika"
 
-#: classes/dlg.php:276 classes/dlg.php:732 classes/pref/prefs.php:196
+#: classes/dlg.php:276 classes/dlg.php:732 classes/pref/prefs.php:202
 #: classes/pref/feeds.php:569 classes/pref/feeds.php:793
 msgid "Password"
 msgstr "Hasło"
@@ -1510,7 +1511,7 @@ msgstr "Wyświetl jako RSS"
 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:591 plugins/updater/init.php:303
+#: classes/dlg.php:591 plugins/updater/init.php:304
 #, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "Dostępna jest nowa wersja Tiny Tiny RSS (%s)."
@@ -1647,7 +1648,7 @@ msgstr "Przekaż za pomocą emaila"
 msgid "Feed:"
 msgstr "Kanał:"
 
-#: classes/feeds.php:201 classes/feeds.php:795
+#: classes/feeds.php:201 classes/feeds.php:798
 msgid "Feed not found."
 msgstr "Kanał nie został odnaleziony."
 
@@ -1655,19 +1656,24 @@ msgstr "Kanał nie został odnaleziony."
 msgid "mark as read"
 msgstr "oznacz jako przeczytane"
 
-#: classes/feeds.php:696
+#: classes/feeds.php:553
+#, fuzzy
+msgid "Collapse article"
+msgstr "Zamknij artykuł"
+
+#: classes/feeds.php:699
 msgid "No unread articles found to display."
 msgstr "Nie znaleziono nieprzeczytanych artykułów."
 
-#: classes/feeds.php:699
+#: classes/feeds.php:702
 msgid "No updated articles found to display."
 msgstr "Nie znaleziono uaktualnionych artykułów."
 
-#: classes/feeds.php:702
+#: classes/feeds.php:705
 msgid "No starred articles found to display."
 msgstr "Nie znaleziono artykułów oznaczonych gwiazdką."
 
-#: classes/feeds.php:706
+#: classes/feeds.php:709
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
@@ -1675,22 +1681,22 @@ 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:708
+#: classes/feeds.php:711
 msgid "No articles found to display."
 msgstr "Nie znaleziono artykułów."
 
-#: classes/feeds.php:723 classes/feeds.php:904
+#: classes/feeds.php:726 classes/feeds.php:907
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "Kanały ostatnio uaktualnione o %s"
 
-#: classes/feeds.php:733 classes/feeds.php:914
+#: classes/feeds.php:736 classes/feeds.php:917
 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:894
+#: classes/feeds.php:897
 msgid "No feed selected."
 msgstr "Nie wybrano kanału."
 
@@ -2016,179 +2022,170 @@ msgstr "Wprowadzone hasła są różne."
 msgid "Function not supported by authentication module."
 msgstr ""
 
-#: classes/pref/prefs.php:63
+#: classes/pref/prefs.php:69
 msgid "The configuration was saved."
 msgstr "Konfiguracja została zapisana."
 
-#: classes/pref/prefs.php:77
+#: classes/pref/prefs.php:83
 #, php-format
 msgid "Unknown option: %s"
 msgstr "Nieznana opcja: %s"
 
-#: classes/pref/prefs.php:91
+#: classes/pref/prefs.php:97
 msgid "Your personal data has been saved."
 msgstr "Dwoje dane osobiste zostały zapisane."
 
-#: classes/pref/prefs.php:131
+#: classes/pref/prefs.php:137
 msgid "Personal data / Authentication"
 msgstr "Dane osobiste / Uwierzytelnianie"
 
-#: classes/pref/prefs.php:151
+#: classes/pref/prefs.php:157
 #, fuzzy
 msgid "Personal data"
 msgstr "Przygotuj dane"
 
-#: classes/pref/prefs.php:161
+#: classes/pref/prefs.php:167
 msgid "Full name"
 msgstr "Nazwa"
 
-#: classes/pref/prefs.php:165
+#: classes/pref/prefs.php:171
 msgid "E-mail"
 msgstr "E-mail"
 
-#: classes/pref/prefs.php:171
+#: classes/pref/prefs.php:177
 msgid "Access level"
 msgstr "Poziom dostępu"
 
-#: classes/pref/prefs.php:181
+#: classes/pref/prefs.php:187
 msgid "Save data"
 msgstr "Zapisz dane"
 
-#: classes/pref/prefs.php:203
+#: classes/pref/prefs.php:209
 msgid "Your password is at default value, please change it."
 msgstr "Używasz domyślnego hasła, zmień je proszę."
 
-#: classes/pref/prefs.php:235
+#: classes/pref/prefs.php:241
 msgid "Old password"
 msgstr "Stare hasło"
 
-#: classes/pref/prefs.php:238
+#: classes/pref/prefs.php:244
 msgid "New password"
 msgstr "Nowe hasło"
 
-#: classes/pref/prefs.php:243
+#: classes/pref/prefs.php:249
 msgid "Confirm password"
 msgstr "Potwierdź hasło"
 
-#: classes/pref/prefs.php:253
+#: classes/pref/prefs.php:259
 msgid "Change password"
 msgstr "Zmień hasło"
 
-#: classes/pref/prefs.php:259
+#: classes/pref/prefs.php:265
 msgid "One time passwords / Authenticator"
 msgstr ""
 
-#: classes/pref/prefs.php:288 classes/pref/prefs.php:339
+#: classes/pref/prefs.php:294 classes/pref/prefs.php:345
 #, fuzzy
 msgid "Enter your password"
 msgstr "Nieprawidłowa nazwa użytkownika lub hasło"
 
-#: classes/pref/prefs.php:299
+#: classes/pref/prefs.php:305
 #, fuzzy
 msgid "Disable OTP"
 msgstr "Wyłącz aktualizacje"
 
-#: classes/pref/prefs.php:305
+#: classes/pref/prefs.php:311
 msgid ""
 "You will need a compatible Authenticator to use this. Changing your password "
 "would automatically disable OTP."
 msgstr ""
 
-#: classes/pref/prefs.php:307
+#: classes/pref/prefs.php:313
 msgid "Scan the following code by the Authenticator application:"
 msgstr ""
 
-#: classes/pref/prefs.php:348
+#: classes/pref/prefs.php:354
 msgid "I have scanned the code and would like to enable OTP"
 msgstr ""
 
-#: classes/pref/prefs.php:356
+#: classes/pref/prefs.php:362
 #, fuzzy
 msgid "Enable OTP"
 msgstr "Włączone"
 
-#: classes/pref/prefs.php:482
+#: classes/pref/prefs.php:493
 msgid "Customize"
 msgstr "Dostosuj"
 
-#: classes/pref/prefs.php:501 classes/pref/prefs.php:508
-#: classes/pref/prefs.php:513
-msgid "Yes"
-msgstr "Tak"
-
-#: classes/pref/prefs.php:503 classes/pref/prefs.php:513
-msgid "No"
-msgstr "Nie"
-
-#: classes/pref/prefs.php:543
+#: classes/pref/prefs.php:552
 msgid "Register"
 msgstr "Zarejestruj"
 
-#: classes/pref/prefs.php:547
+#: classes/pref/prefs.php:556
 msgid "Clear"
 msgstr "Wyczyść"
 
-#: classes/pref/prefs.php:553
+#: classes/pref/prefs.php:562
 #, php-format
 msgid "Current server time: %s (UTC)"
 msgstr ""
 
-#: classes/pref/prefs.php:582
+#: classes/pref/prefs.php:595
 msgid "Save configuration"
 msgstr "Zapisz konfigurację"
 
-#: classes/pref/prefs.php:585
+#: classes/pref/prefs.php:598
 msgid "Manage profiles"
 msgstr "Zarządzaj profilami"
 
-#: classes/pref/prefs.php:588
+#: classes/pref/prefs.php:601
 msgid "Reset to defaults"
 msgstr "Przywróć domyślne"
 
-#: classes/pref/prefs.php:600
+#: classes/pref/prefs.php:613
 #, fuzzy
 msgid "Show additional preferences"
 msgstr "Wyjdź z ustawień"
 
-#: classes/pref/prefs.php:612 classes/pref/prefs.php:614
+#: classes/pref/prefs.php:625 classes/pref/prefs.php:627
 msgid "Plugins"
 msgstr ""
 
-#: classes/pref/prefs.php:642
+#: classes/pref/prefs.php:655
 msgid "System plugins"
 msgstr ""
 
-#: classes/pref/prefs.php:646 classes/pref/prefs.php:695
+#: classes/pref/prefs.php:659 classes/pref/prefs.php:708
 msgid "Plugin"
 msgstr ""
 
-#: classes/pref/prefs.php:647 classes/pref/prefs.php:696
+#: classes/pref/prefs.php:660 classes/pref/prefs.php:709
 msgid "Description"
 msgstr ""
 
-#: classes/pref/prefs.php:648 classes/pref/prefs.php:697
+#: classes/pref/prefs.php:661 classes/pref/prefs.php:710
 msgid "Version"
 msgstr ""
 
-#: classes/pref/prefs.php:649 classes/pref/prefs.php:698
+#: classes/pref/prefs.php:662 classes/pref/prefs.php:711
 msgid "Author"
 msgstr ""
 
-#: classes/pref/prefs.php:682 classes/pref/prefs.php:733
+#: classes/pref/prefs.php:695 classes/pref/prefs.php:746
 #, fuzzy
 msgid "Clear data"
 msgstr "Wyczyść dane kanału"
 
-#: classes/pref/prefs.php:691
+#: classes/pref/prefs.php:704
 msgid "User plugins"
 msgstr ""
 
-#: classes/pref/prefs.php:748
+#: classes/pref/prefs.php:761
 #, fuzzy
 msgid "Enable selected plugins"
 msgstr "Włącz kategorie kanałów"
 
-#: classes/pref/prefs.php:803 classes/pref/prefs.php:821
+#: classes/pref/prefs.php:816 classes/pref/prefs.php:834
 #, fuzzy
 msgid "Incorrect password"
 msgstr "Nieprawidłowa nazwa użytkownika lub hasło"
@@ -2474,6 +2471,10 @@ msgstr "Cześć,"
 msgid "Regular version"
 msgstr "Wersja standardowa"
 
+#: plugins/close_button/init.php:24
+msgid "Close article"
+msgstr "Zamknij artykuł"
+
 #: plugins/nsfw/init.php:32 plugins/nsfw/init.php:43
 msgid "Not work safe (click to toggle)"
 msgstr ""
@@ -2717,17 +2718,17 @@ msgstr "Oznacz artykuł gwiazdką"
 msgid "Share on Google+"
 msgstr "Udostępnij na Twitterze"
 
-#: plugins/updater/init.php:294 plugins/updater/init.php:306
+#: plugins/updater/init.php:295 plugins/updater/init.php:307
 #: plugins/updater/updater.js:10
 msgid "Update Tiny Tiny RSS"
 msgstr "Aktualizuj Tiny Tiny RSS"
 
-#: plugins/updater/init.php:309
+#: plugins/updater/init.php:310
 #, fuzzy
 msgid "Your Tiny Tiny RSS installation is up to date."
 msgstr "Schemat bazy danych Tiny Tiny RSS jest aktualny."
 
-#: plugins/updater/init.php:319
+#: plugins/updater/init.php:320
 #, fuzzy
 msgid ""
 "Do not close this dialog until updating is finished. Backup your tt-rss "
@@ -2737,12 +2738,12 @@ msgstr ""
 "kopię swojego katalogu tt-rss przed kontynuowaniem. Wpisz 'yes' aby "
 "kontynuować."
 
-#: plugins/updater/init.php:322
+#: plugins/updater/init.php:323
 #, fuzzy
 msgid "Ready to update."
 msgstr "Ostatnia aktualizacja:"
 
-#: plugins/updater/init.php:327
+#: plugins/updater/init.php:328
 #, fuzzy
 msgid "Start update"
 msgstr "Ostatnia aktualizacja:"
@@ -2853,7 +2854,7 @@ msgstr "Wprowadź tytuł kategorii:"
 msgid "Generate new syndication address for this feed?"
 msgstr "Wygenerowań nowy adres do dzielenia się tym kanałem?"
 
-#: js/functions.js:1597 js/tt-rss.js:350 js/tt-rss.js:721
+#: js/functions.js:1597 js/tt-rss.js:350 js/tt-rss.js:729
 msgid "You can't edit this kind of feed."
 msgstr "Nie możesz edytować kanału tego typu."
 
@@ -3118,12 +3119,12 @@ msgstr "Nie możesz przeliczyć punktacji kanału tego rodzaju."
 msgid "Rescore articles in %s?"
 msgstr "Przeliczyć punktację artykułów w %s?"
 
-#: js/tt-rss.js:680
+#: js/tt-rss.js:688
 #, fuzzy
 msgid "Please enable mail plugin first."
 msgstr "Wybierz najpierw jakiś kanał."
 
-#: js/tt-rss.js:842
+#: js/tt-rss.js:850
 msgid "New version available!"
 msgstr "Dostępna jest nowa wersja!"
 
@@ -3149,7 +3150,7 @@ msgstr "Anuluj publikacje artykułu"
 
 #: 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/mailto/init.js:7
+#: js/viewfeed.js:1053 js/viewfeed.js:1967 plugins/mailto/init.js:7
 #: plugins/mail/mail.js:7
 msgid "No articles are selected."
 msgstr "Nie wybrano żadnych artykułów"
@@ -3194,28 +3195,28 @@ msgstr "Nie znaleziono artykułów do oznaczenia"
 msgid "Mark %d article(s) as read?"
 msgstr "Oznaczyć %d artykuły(ów) jako przeczytane?"
 
-#: js/viewfeed.js:1744
+#: js/viewfeed.js:1784
 msgid "Open original article"
 msgstr "Otwórz oryginalny artykuł"
 
-#: js/viewfeed.js:1814
+#: js/viewfeed.js:1854
 msgid "Remove label"
 msgstr "Usuń etykietę"
 
-#: js/viewfeed.js:1838
+#: js/viewfeed.js:1878
 msgid "Playing..."
 msgstr "Odtwarzam..."
 
-#: js/viewfeed.js:1839
+#: js/viewfeed.js:1879
 msgid "Click to pause"
 msgstr "Kliknij aby zapauzować"
 
-#: js/viewfeed.js:1896
+#: js/viewfeed.js:1936
 #, fuzzy
 msgid "Please enter new score for selected articles:"
 msgstr "Usunąć %d zaznaczonych artykułów?"
 
-#: js/viewfeed.js:1938
+#: js/viewfeed.js:1978
 #, fuzzy
 msgid "Please enter new score for this article:"
 msgstr "Wprowadź tytuł kategorii:"
@@ -3301,6 +3302,12 @@ msgstr ""
 "kopię swojego katalogu tt-rss przed kontynuowaniem. Wpisz 'yes' aby "
 "kontynuować."
 
+#~ msgid "Yes"
+#~ msgstr "Tak"
+
+#~ msgid "No"
+#~ msgstr "Nie"
+
 #~ msgid "Comments?"
 #~ msgstr "Komentarze?"
 
diff --git a/locale/pt_BR/LC_MESSAGES/messages.mo b/locale/pt_BR/LC_MESSAGES/messages.mo
index 1cf2d4098..06fea5192 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 25a9bbd65..a77f0f2d9 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-19 22:42+0400\n"
+"POT-Creation-Date: 2013-03-20 10:24+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"
@@ -277,11 +277,11 @@ msgstr ""
 msgid "All Articles"
 msgstr ""
 
-#: index.php:169 include/functions.php:1911 classes/feeds.php:106
+#: index.php:169 include/functions.php:1915 classes/feeds.php:106
 msgid "Starred"
 msgstr "Favoritos"
 
-#: index.php:170 include/functions.php:1912 classes/feeds.php:107
+#: index.php:170 include/functions.php:1916 classes/feeds.php:107
 msgid "Published"
 msgstr "Publicado"
 
@@ -323,7 +323,7 @@ msgstr ""
 msgid "Update"
 msgstr "Atualizar"
 
-#: index.php:191 index.php:221 include/functions.php:1902
+#: index.php:191 index.php:221 include/functions.php:1906
 #: include/localized_schema.php:10 classes/feeds.php:111 classes/feeds.php:136
 #: classes/feeds.php:408 js/FeedTree.js:128 js/FeedTree.js:156
 #: plugins/digest/digest.js:630
@@ -388,7 +388,7 @@ msgstr ""
 msgid "Show tag cloud..."
 msgstr "núvem de tags"
 
-#: index.php:229 include/functions.php:1889
+#: index.php:229 include/functions.php:1893
 #, fuzzy
 msgid "Toggle widescreen mode"
 msgstr "Remover as categorias selecionadas?"
@@ -417,8 +417,8 @@ msgstr "&nbsp;&nbsp;Criar filtro"
 msgid "Logout"
 msgstr "Sair"
 
-#: prefs.php:28 prefs.php:99 include/functions.php:1914
-#: classes/pref/prefs.php:371
+#: prefs.php:28 prefs.php:99 include/functions.php:1918
+#: classes/pref/prefs.php:377
 msgid "Preferences"
 msgstr "Preferências"
 
@@ -442,8 +442,8 @@ msgstr "Feed"
 msgid "Filters"
 msgstr "Arquivo:"
 
-#: prefs.php:108 mobile/mobile-functions.php:205 include/functions.php:1117
-#: include/functions.php:1738 classes/pref/labels.php:90
+#: prefs.php:108 mobile/mobile-functions.php:205 include/functions.php:1121
+#: include/functions.php:1742 classes/pref/labels.php:90
 msgid "Labels"
 msgstr ""
 
@@ -540,8 +540,8 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
-#: mobile/mobile-functions.php:178 include/functions.php:1115
-#: include/functions.php:1736
+#: mobile/mobile-functions.php:178 include/functions.php:1119
+#: include/functions.php:1740
 msgid "Special"
 msgstr "Especial"
 
@@ -585,9 +585,9 @@ msgstr ""
 msgid "Reverse headline order (oldest first)"
 msgstr ""
 
-#: include/digest.php:131 include/functions.php:1126
-#: include/functions.php:1639 include/functions.php:1724
-#: include/functions.php:1746 classes/opml.php:416 classes/pref/feeds.php:188
+#: include/digest.php:131 include/functions.php:1130
+#: include/functions.php:1643 include/functions.php:1728
+#: include/functions.php:1750 classes/opml.php:416 classes/pref/feeds.php:188
 msgid "Uncategorized"
 msgstr "Não Categorizado"
 
@@ -601,329 +601,329 @@ msgstr "Favoritos"
 msgid "No feeds found."
 msgstr "Sem Feeds para exibir."
 
-#: include/functions.php:697
+#: include/functions.php:701
 msgid "Session failed to validate (incorrect IP)"
 msgstr ""
 
-#: include/functions.php:1588 classes/dlg.php:371 classes/pref/filters.php:368
+#: include/functions.php:1592 classes/dlg.php:371 classes/pref/filters.php:368
 msgid "All feeds"
 msgstr "Todos os feeds"
 
-#: include/functions.php:1789
+#: include/functions.php:1793
 msgid "Starred articles"
 msgstr ""
 
-#: include/functions.php:1791
+#: include/functions.php:1795
 msgid "Published articles"
 msgstr ""
 
-#: include/functions.php:1793
+#: include/functions.php:1797
 msgid "Fresh articles"
 msgstr ""
 
-#: include/functions.php:1795 include/functions.php:1909
+#: include/functions.php:1799 include/functions.php:1913
 #, fuzzy
 msgid "All articles"
 msgstr "Favoritos"
 
-#: include/functions.php:1797
+#: include/functions.php:1801
 #, fuzzy
 msgid "Archived articles"
 msgstr "Favoritos"
 
-#: include/functions.php:1799
+#: include/functions.php:1803
 msgid "Recently read"
 msgstr ""
 
-#: include/functions.php:1866
+#: include/functions.php:1870
 #, fuzzy
 msgid "Navigation"
 msgstr "Salvar configuração"
 
-#: include/functions.php:1867
+#: include/functions.php:1871
 msgid "Open next feed"
 msgstr ""
 
-#: include/functions.php:1868
+#: include/functions.php:1872
 msgid "Open previous feed"
 msgstr ""
 
-#: include/functions.php:1869
+#: include/functions.php:1873
 #, fuzzy
 msgid "Open next article"
 msgstr "Favoritos"
 
-#: include/functions.php:1870
+#: include/functions.php:1874
 #, fuzzy
 msgid "Open previous article"
 msgstr "Favoritos"
 
-#: include/functions.php:1871
+#: include/functions.php:1875
 msgid "Open next article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1872
+#: include/functions.php:1876
 msgid "Open previous article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1873
+#: include/functions.php:1877
 #, fuzzy
 msgid "Show search dialog"
 msgstr "Favoritos"
 
-#: include/functions.php:1874
+#: include/functions.php:1878
 #, fuzzy
 msgid "Article"
 msgstr "Feed não encontrado."
 
-#: include/functions.php:1875
+#: include/functions.php:1879
 #, fuzzy
 msgid "Toggle starred"
 msgstr "Marcar como favorito"
 
-#: include/functions.php:1876
+#: include/functions.php:1880
 #, fuzzy
 msgid "Toggle published"
 msgstr "Publicado"
 
-#: include/functions.php:1877
+#: include/functions.php:1881
 msgid "Toggle unread"
 msgstr ""
 
-#: include/functions.php:1878
+#: include/functions.php:1882
 #, fuzzy
 msgid "Edit tags"
 msgstr "Editar Tags"
 
-#: include/functions.php:1879
+#: include/functions.php:1883
 #, fuzzy
 msgid "Dismiss selected"
 msgstr "Remover os filtros selecionados?"
 
-#: include/functions.php:1880
+#: include/functions.php:1884
 #, fuzzy
 msgid "Dismiss read"
 msgstr "Favoritos"
 
-#: include/functions.php:1881
+#: include/functions.php:1885
 msgid "Open in new window"
 msgstr ""
 
-#: include/functions.php:1882 js/viewfeed.js:1758
+#: include/functions.php:1886 js/viewfeed.js:1798
 #, fuzzy
 msgid "Mark below as read"
 msgstr "Marcar como lido"
 
-#: include/functions.php:1883 js/viewfeed.js:1752
+#: include/functions.php:1887 js/viewfeed.js:1792
 #, fuzzy
 msgid "Mark above as read"
 msgstr "Marcar como lido"
 
-#: include/functions.php:1884
+#: include/functions.php:1888
 msgid "Scroll down"
 msgstr ""
 
-#: include/functions.php:1885
+#: include/functions.php:1889
 msgid "Scroll up"
 msgstr ""
 
-#: include/functions.php:1886
+#: include/functions.php:1890
 #, fuzzy
 msgid "Select article under cursor"
 msgstr "Favoritos"
 
-#: include/functions.php:1887
+#: include/functions.php:1891
 #, fuzzy
 msgid "Email article"
 msgstr "Favoritos"
 
-#: include/functions.php:1888 plugins/close_button/init.php:24
+#: include/functions.php:1892
 #, fuzzy
-msgid "Close article"
+msgid "Close/collapse article"
 msgstr "Favoritos"
 
-#: include/functions.php:1890
+#: include/functions.php:1894
 #, fuzzy
 msgid "Article selection"
 msgstr "Favoritos"
 
-#: include/functions.php:1891
+#: include/functions.php:1895
 #, fuzzy
 msgid "Select all articles"
 msgstr "Favoritos"
 
-#: include/functions.php:1892
+#: include/functions.php:1896
 #, fuzzy
 msgid "Select unread"
 msgstr "Favoritos"
 
-#: include/functions.php:1893
+#: include/functions.php:1897
 #, fuzzy
 msgid "Select starred"
 msgstr "Marcar como favorito"
 
-#: include/functions.php:1894
+#: include/functions.php:1898
 #, fuzzy
 msgid "Select published"
 msgstr "Favoritos"
 
-#: include/functions.php:1895
+#: include/functions.php:1899
 #, fuzzy
 msgid "Invert selection"
 msgstr "Favoritos"
 
-#: include/functions.php:1896
+#: include/functions.php:1900
 #, fuzzy
 msgid "Deselect everything"
 msgstr "Favoritos"
 
-#: include/functions.php:1897 classes/pref/feeds.php:488
+#: include/functions.php:1901 classes/pref/feeds.php:488
 #: classes/pref/feeds.php:719
 msgid "Feed"
 msgstr "Feed"
 
-#: include/functions.php:1898
+#: include/functions.php:1902
 #, fuzzy
 msgid "Refresh current feed"
 msgstr "Favoritos"
 
-#: include/functions.php:1899
+#: include/functions.php:1903
 #, fuzzy
 msgid "Un/hide read feeds"
 msgstr "Favoritos"
 
-#: include/functions.php:1900 classes/pref/feeds.php:1240
+#: include/functions.php:1904 classes/pref/feeds.php:1240
 msgid "Subscribe to feed"
 msgstr ""
 
-#: include/functions.php:1901 js/FeedTree.js:135 js/PrefFeedTree.js:67
+#: include/functions.php:1905 js/FeedTree.js:135 js/PrefFeedTree.js:67
 #, fuzzy
 msgid "Edit feed"
 msgstr "Editar"
 
-#: include/functions.php:1903
+#: include/functions.php:1907
 #, fuzzy
 msgid "Reverse headlines"
 msgstr "Remover as categorias selecionadas?"
 
-#: include/functions.php:1904
+#: include/functions.php:1908
 #, fuzzy
 msgid "Debug feed update"
 msgstr "Desabilitar updates"
 
-#: include/functions.php:1905 js/FeedTree.js:177
+#: include/functions.php:1909 js/FeedTree.js:177
 #, fuzzy
 msgid "Mark all feeds as read"
 msgstr "Marcando todos os feeds como lidos..."
 
-#: include/functions.php:1906
+#: include/functions.php:1910
 #, fuzzy
 msgid "Un/collapse current category"
 msgstr "Salvando categoria..."
 
-#: include/functions.php:1907
+#: include/functions.php:1911
 #, fuzzy
 msgid "Toggle combined mode"
 msgstr "Remover as categorias selecionadas?"
 
-#: include/functions.php:1908
+#: include/functions.php:1912
 msgid "Go to"
 msgstr ""
 
-#: include/functions.php:1910
+#: include/functions.php:1914
 msgid "Fresh"
 msgstr ""
 
-#: include/functions.php:1913
+#: include/functions.php:1917
 msgid "Tag cloud"
 msgstr "Núvem de tags"
 
-#: include/functions.php:1915
+#: include/functions.php:1919
 #, fuzzy
 msgid "Other"
 msgstr "Onde:"
 
-#: include/functions.php:1916 classes/pref/labels.php:281
+#: include/functions.php:1920 classes/pref/labels.php:281
 msgid "Create label"
 msgstr ""
 
-#: include/functions.php:1917 classes/pref/filters.php:587
+#: include/functions.php:1921 classes/pref/filters.php:587
 msgid "Create filter"
 msgstr ""
 
-#: include/functions.php:1918
+#: include/functions.php:1922
 #, fuzzy
 msgid "Un/collapse sidebar"
 msgstr "Todos os feeds"
 
-#: include/functions.php:1919
+#: include/functions.php:1923
 #, fuzzy
 msgid "Show help dialog"
 msgstr "Favoritos"
 
-#: include/functions.php:2401
+#: include/functions.php:2405
 #, php-format
 msgid "Search results: %s"
 msgstr ""
 
-#: include/functions.php:2886 js/viewfeed.js:1845
+#: include/functions.php:2892 js/viewfeed.js:1885
 #, fuzzy
 msgid "Click to play"
 msgstr "Favoritos"
 
-#: include/functions.php:2887 js/viewfeed.js:1844
+#: include/functions.php:2893 js/viewfeed.js:1884
 msgid "Play"
 msgstr ""
 
-#: include/functions.php:3007
+#: include/functions.php:3014
 #, fuzzy
 msgid " - "
 msgstr " - por "
 
-#: include/functions.php:3029 include/functions.php:3346 classes/rpc.php:360
+#: include/functions.php:3036 include/functions.php:3353 classes/rpc.php:360
 msgid "no tags"
 msgstr "sem tags"
 
-#: include/functions.php:3039 classes/feeds.php:650
+#: include/functions.php:3046 classes/feeds.php:653
 #, fuzzy
 msgid "Edit tags for this article"
 msgstr "Favoritos"
 
-#: include/functions.php:3068 classes/feeds.php:605
+#: include/functions.php:3075 classes/feeds.php:608
 #, fuzzy
 msgid "Originally from:"
 msgstr "Favoritos"
 
-#: include/functions.php:3081 classes/feeds.php:618 classes/pref/feeds.php:507
+#: include/functions.php:3088 classes/feeds.php:621 classes/pref/feeds.php:507
 #, fuzzy
 msgid "Feed URL"
 msgstr "Feed"
 
-#: include/functions.php:3110
+#: include/functions.php:3117
 msgid "Related"
 msgstr ""
 
-#: include/functions.php:3137 classes/dlg.php:43 classes/dlg.php:162
+#: include/functions.php:3144 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:1553
 #: classes/pref/feeds.php:1624 plugins/import_export/init.php:407
 #: plugins/import_export/init.php:431 plugins/share/init.php:67
-#: plugins/updater/init.php:329
+#: plugins/updater/init.php:330
 msgid "Close this window"
 msgstr "Fechar esta janela"
 
-#: include/functions.php:3371
+#: include/functions.php:3378
 msgid "(edit note)"
 msgstr ""
 
-#: include/functions.php:3604
+#: include/functions.php:3611
 #, fuzzy
 msgid "unknown type"
 msgstr "Erro desconhecido"
 
-#: include/functions.php:3654
+#: include/functions.php:3661
 #, fuzzy
 msgid "Attachments"
 msgstr "Conteúdo"
@@ -964,7 +964,7 @@ msgstr ""
 msgid "Assign tags"
 msgstr "sem tags"
 
-#: include/localized_schema.php:14 js/viewfeed.js:1809
+#: include/localized_schema.php:14 js/viewfeed.js:1849
 msgid "Assign label"
 msgstr ""
 
@@ -1407,7 +1407,7 @@ msgstr ""
 msgid "Login"
 msgstr "Login"
 
-#: classes/dlg.php:276 classes/dlg.php:732 classes/pref/prefs.php:196
+#: classes/dlg.php:276 classes/dlg.php:732 classes/pref/prefs.php:202
 #: classes/pref/feeds.php:569 classes/pref/feeds.php:793
 #, fuzzy
 msgid "Password"
@@ -1515,7 +1515,7 @@ msgstr "Editar Tags"
 msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 
-#: classes/dlg.php:591 plugins/updater/init.php:303
+#: classes/dlg.php:591 plugins/updater/init.php:304
 #, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr ""
@@ -1658,7 +1658,7 @@ msgstr "Favoritos"
 msgid "Feed:"
 msgstr "Feed:"
 
-#: classes/feeds.php:201 classes/feeds.php:795
+#: classes/feeds.php:201 classes/feeds.php:798
 msgid "Feed not found."
 msgstr "Feed não encontrado."
 
@@ -1667,42 +1667,47 @@ msgstr "Feed não encontrado."
 msgid "mark as read"
 msgstr "Marcar como lido"
 
-#: classes/feeds.php:696
+#: classes/feeds.php:553
+#, fuzzy
+msgid "Collapse article"
+msgstr "Favoritos"
+
+#: classes/feeds.php:699
 #, fuzzy
 msgid "No unread articles found to display."
 msgstr "Sem Feeds para exibir."
 
-#: classes/feeds.php:699
+#: classes/feeds.php:702
 #, fuzzy
 msgid "No updated articles found to display."
 msgstr "Sem Feeds para exibir."
 
-#: classes/feeds.php:702
+#: classes/feeds.php:705
 #, fuzzy
 msgid "No starred articles found to display."
 msgstr "Sem Feeds para exibir."
 
-#: classes/feeds.php:706
+#: classes/feeds.php:709
 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:708
+#: classes/feeds.php:711
 #, fuzzy
 msgid "No articles found to display."
 msgstr "Sem Feeds para exibir."
 
-#: classes/feeds.php:723 classes/feeds.php:904
+#: classes/feeds.php:726 classes/feeds.php:907
 #, fuzzy, php-format
 msgid "Feeds last updated at %s"
 msgstr "Atualizar"
 
-#: classes/feeds.php:733 classes/feeds.php:914
+#: classes/feeds.php:736 classes/feeds.php:917
 msgid "Some feeds have update errors (click for details)"
 msgstr "Alguns feeds estão com erros (clique aqui para detalhes)"
 
-#: classes/feeds.php:894
+#: classes/feeds.php:897
 msgid "No feed selected."
 msgstr "Nenhum feed foi selecionado."
 
@@ -2058,189 +2063,180 @@ msgstr "As senhas informadas não conferem."
 msgid "Function not supported by authentication module."
 msgstr ""
 
-#: classes/pref/prefs.php:63
+#: classes/pref/prefs.php:69
 #, fuzzy
 msgid "The configuration was saved."
 msgstr "Salvar configuração"
 
-#: classes/pref/prefs.php:77
+#: classes/pref/prefs.php:83
 #, php-format
 msgid "Unknown option: %s"
 msgstr ""
 
-#: classes/pref/prefs.php:91
+#: classes/pref/prefs.php:97
 msgid "Your personal data has been saved."
 msgstr ""
 
-#: classes/pref/prefs.php:131
+#: classes/pref/prefs.php:137
 msgid "Personal data / Authentication"
 msgstr ""
 
-#: classes/pref/prefs.php:151
+#: classes/pref/prefs.php:157
 #, fuzzy
 msgid "Personal data"
 msgstr "Salvar"
 
-#: classes/pref/prefs.php:161
+#: classes/pref/prefs.php:167
 msgid "Full name"
 msgstr ""
 
-#: classes/pref/prefs.php:165
+#: classes/pref/prefs.php:171
 msgid "E-mail"
 msgstr "E-mail"
 
-#: classes/pref/prefs.php:171
+#: classes/pref/prefs.php:177
 #, fuzzy
 msgid "Access level"
 msgstr "Nível de acesso:"
 
-#: classes/pref/prefs.php:181
+#: classes/pref/prefs.php:187
 #, fuzzy
 msgid "Save data"
 msgstr "Salvar"
 
-#: classes/pref/prefs.php:203
+#: classes/pref/prefs.php:209
 #, 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:235
+#: classes/pref/prefs.php:241
 msgid "Old password"
 msgstr "Senha antiga"
 
-#: classes/pref/prefs.php:238
+#: classes/pref/prefs.php:244
 msgid "New password"
 msgstr "Senha nova"
 
-#: classes/pref/prefs.php:243
+#: classes/pref/prefs.php:249
 msgid "Confirm password"
 msgstr "Confirmar senha"
 
-#: classes/pref/prefs.php:253
+#: classes/pref/prefs.php:259
 msgid "Change password"
 msgstr "Mudar senha"
 
-#: classes/pref/prefs.php:259
+#: classes/pref/prefs.php:265
 msgid "One time passwords / Authenticator"
 msgstr ""
 
-#: classes/pref/prefs.php:288 classes/pref/prefs.php:339
+#: classes/pref/prefs.php:294 classes/pref/prefs.php:345
 #, fuzzy
 msgid "Enter your password"
 msgstr "Mudar senha"
 
-#: classes/pref/prefs.php:299
+#: classes/pref/prefs.php:305
 #, fuzzy
 msgid "Disable OTP"
 msgstr "(Desativado)"
 
-#: classes/pref/prefs.php:305
+#: classes/pref/prefs.php:311
 msgid ""
 "You will need a compatible Authenticator to use this. Changing your password "
 "would automatically disable OTP."
 msgstr ""
 
-#: classes/pref/prefs.php:307
+#: classes/pref/prefs.php:313
 msgid "Scan the following code by the Authenticator application:"
 msgstr ""
 
-#: classes/pref/prefs.php:348
+#: classes/pref/prefs.php:354
 msgid "I have scanned the code and would like to enable OTP"
 msgstr ""
 
-#: classes/pref/prefs.php:356
+#: classes/pref/prefs.php:362
 #, fuzzy
 msgid "Enable OTP"
 msgstr "Ativado"
 
-#: classes/pref/prefs.php:482
+#: classes/pref/prefs.php:493
 msgid "Customize"
 msgstr ""
 
-#: classes/pref/prefs.php:501 classes/pref/prefs.php:508
-#: classes/pref/prefs.php:513
-msgid "Yes"
-msgstr "Sim"
-
-#: classes/pref/prefs.php:503 classes/pref/prefs.php:513
-msgid "No"
-msgstr "Não"
-
-#: classes/pref/prefs.php:543
+#: classes/pref/prefs.php:552
 #, fuzzy
 msgid "Register"
 msgstr "Remover as categorias selecionadas?"
 
-#: classes/pref/prefs.php:547
+#: classes/pref/prefs.php:556
 msgid "Clear"
 msgstr ""
 
-#: classes/pref/prefs.php:553
+#: classes/pref/prefs.php:562
 #, php-format
 msgid "Current server time: %s (UTC)"
 msgstr ""
 
-#: classes/pref/prefs.php:582
+#: classes/pref/prefs.php:595
 msgid "Save configuration"
 msgstr "Salvar configuração"
 
-#: classes/pref/prefs.php:585
+#: classes/pref/prefs.php:598
 #, fuzzy
 msgid "Manage profiles"
 msgstr "Criar um usuário"
 
-#: classes/pref/prefs.php:588
+#: classes/pref/prefs.php:601
 #, fuzzy
 msgid "Reset to defaults"
 msgstr "Usar o padrão"
 
-#: classes/pref/prefs.php:600
+#: classes/pref/prefs.php:613
 #, fuzzy
 msgid "Show additional preferences"
 msgstr "Sair das preferências"
 
-#: classes/pref/prefs.php:612 classes/pref/prefs.php:614
+#: classes/pref/prefs.php:625 classes/pref/prefs.php:627
 msgid "Plugins"
 msgstr ""
 
-#: classes/pref/prefs.php:642
+#: classes/pref/prefs.php:655
 msgid "System plugins"
 msgstr ""
 
-#: classes/pref/prefs.php:646 classes/pref/prefs.php:695
+#: classes/pref/prefs.php:659 classes/pref/prefs.php:708
 msgid "Plugin"
 msgstr ""
 
-#: classes/pref/prefs.php:647 classes/pref/prefs.php:696
+#: classes/pref/prefs.php:660 classes/pref/prefs.php:709
 #, fuzzy
 msgid "Description"
 msgstr "descrição"
 
-#: classes/pref/prefs.php:648 classes/pref/prefs.php:697
+#: classes/pref/prefs.php:661 classes/pref/prefs.php:710
 msgid "Version"
 msgstr ""
 
-#: classes/pref/prefs.php:649 classes/pref/prefs.php:698
+#: classes/pref/prefs.php:662 classes/pref/prefs.php:711
 msgid "Author"
 msgstr ""
 
-#: classes/pref/prefs.php:682 classes/pref/prefs.php:733
+#: classes/pref/prefs.php:695 classes/pref/prefs.php:746
 #, fuzzy
 msgid "Clear data"
 msgstr "Salvando o Feed..."
 
-#: classes/pref/prefs.php:691
+#: classes/pref/prefs.php:704
 msgid "User plugins"
 msgstr ""
 
-#: classes/pref/prefs.php:748
+#: classes/pref/prefs.php:761
 #, fuzzy
 msgid "Enable selected plugins"
 msgstr "Editar categorias"
 
-#: classes/pref/prefs.php:803 classes/pref/prefs.php:821
+#: classes/pref/prefs.php:816 classes/pref/prefs.php:834
 #, fuzzy
 msgid "Incorrect password"
 msgstr "Senha nova"
@@ -2529,6 +2525,11 @@ msgstr "Olá,"
 msgid "Regular version"
 msgstr ""
 
+#: plugins/close_button/init.php:24
+#, fuzzy
+msgid "Close article"
+msgstr "Favoritos"
+
 #: plugins/nsfw/init.php:32 plugins/nsfw/init.php:43
 msgid "Not work safe (click to toggle)"
 msgstr ""
@@ -2771,28 +2772,28 @@ msgstr "Favoritos"
 msgid "Share on Google+"
 msgstr "Título"
 
-#: plugins/updater/init.php:294 plugins/updater/init.php:306
+#: plugins/updater/init.php:295 plugins/updater/init.php:307
 #: plugins/updater/updater.js:10
 msgid "Update Tiny Tiny RSS"
 msgstr ""
 
-#: plugins/updater/init.php:309
+#: plugins/updater/init.php:310
 #, fuzzy
 msgid "Your Tiny Tiny RSS installation is up to date."
 msgstr "A checagem da configuração falhou"
 
-#: plugins/updater/init.php:319
+#: plugins/updater/init.php:320
 msgid ""
 "Do not close this dialog until updating is finished. Backup your tt-rss "
 "directory before continuing."
 msgstr ""
 
-#: plugins/updater/init.php:322
+#: plugins/updater/init.php:323
 #, fuzzy
 msgid "Ready to update."
 msgstr "Atualizado"
 
-#: plugins/updater/init.php:327
+#: plugins/updater/init.php:328
 #, fuzzy
 msgid "Start update"
 msgstr "Atualizado"
@@ -2911,7 +2912,7 @@ msgstr "Salvando categoria..."
 msgid "Generate new syndication address for this feed?"
 msgstr ""
 
-#: js/functions.js:1597 js/tt-rss.js:350 js/tt-rss.js:721
+#: js/functions.js:1597 js/tt-rss.js:350 js/tt-rss.js:729
 msgid "You can't edit this kind of feed."
 msgstr ""
 
@@ -3193,12 +3194,12 @@ msgstr ""
 msgid "Rescore articles in %s?"
 msgstr "Favoritos"
 
-#: js/tt-rss.js:680
+#: js/tt-rss.js:688
 #, fuzzy
 msgid "Please enable mail plugin first."
 msgstr "Por favor selecione somente um feed"
 
-#: js/tt-rss.js:842
+#: js/tt-rss.js:850
 msgid "New version available!"
 msgstr ""
 
@@ -3227,7 +3228,7 @@ msgstr "Publicado"
 
 #: 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/mailto/init.js:7
+#: js/viewfeed.js:1053 js/viewfeed.js:1967 plugins/mailto/init.js:7
 #: plugins/mail/mail.js:7
 #, fuzzy
 msgid "No articles are selected."
@@ -3283,32 +3284,32 @@ msgstr "Sem Feeds para exibir."
 msgid "Mark %d article(s) as read?"
 msgstr "Marcando todos os feeds como lidos..."
 
-#: js/viewfeed.js:1744
+#: js/viewfeed.js:1784
 #, fuzzy
 msgid "Open original article"
 msgstr "Favoritos"
 
-#: js/viewfeed.js:1814
+#: js/viewfeed.js:1854
 #, fuzzy
 msgid "Remove label"
 msgstr "Remover"
 
-#: js/viewfeed.js:1838
+#: js/viewfeed.js:1878
 #, fuzzy
 msgid "Playing..."
 msgstr "Salvando o Feed..."
 
-#: js/viewfeed.js:1839
+#: js/viewfeed.js:1879
 #, fuzzy
 msgid "Click to pause"
 msgstr "Favoritos"
 
-#: js/viewfeed.js:1896
+#: js/viewfeed.js:1936
 #, fuzzy
 msgid "Please enter new score for selected articles:"
 msgstr "Remover os filtros selecionados?"
 
-#: js/viewfeed.js:1938
+#: js/viewfeed.js:1978
 #, fuzzy
 msgid "Please enter new score for this article:"
 msgstr "Salvando categoria..."
@@ -3405,6 +3406,12 @@ msgid ""
 "before continuing. Please type 'yes' to continue."
 msgstr ""
 
+#~ msgid "Yes"
+#~ msgstr "Sim"
+
+#~ msgid "No"
+#~ msgstr "Não"
+
 #, fuzzy
 #~ msgid "Comments?"
 #~ msgstr "Conteúdo"
diff --git a/locale/ru_RU/LC_MESSAGES/messages.mo b/locale/ru_RU/LC_MESSAGES/messages.mo
index b51bf5ae7..1dd107667 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 f24deb1e5..d8ca1cbe7 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-19 22:42+0400\n"
+"POT-Creation-Date: 2013-03-20 10:24+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"
@@ -290,11 +290,11 @@ msgstr "Адаптивно"
 msgid "All Articles"
 msgstr "Все статьи"
 
-#: index.php:169 include/functions.php:1911 classes/feeds.php:106
+#: index.php:169 include/functions.php:1915 classes/feeds.php:106
 msgid "Starred"
 msgstr "Отмеченные"
 
-#: index.php:170 include/functions.php:1912 classes/feeds.php:107
+#: index.php:170 include/functions.php:1916 classes/feeds.php:107
 msgid "Published"
 msgstr "Опубликован"
 
@@ -334,7 +334,7 @@ msgstr "Оценка"
 msgid "Update"
 msgstr "Обновить"
 
-#: index.php:191 index.php:221 include/functions.php:1902
+#: index.php:191 index.php:221 include/functions.php:1906
 #: include/localized_schema.php:10 classes/feeds.php:111 classes/feeds.php:136
 #: classes/feeds.php:408 js/FeedTree.js:128 js/FeedTree.js:156
 #: plugins/digest/digest.js:630
@@ -395,7 +395,7 @@ msgstr "Перейти в дайджест..."
 msgid "Show tag cloud..."
 msgstr "Показать облако тегов..."
 
-#: index.php:229 include/functions.php:1889
+#: index.php:229 include/functions.php:1893
 #, fuzzy
 msgid "Toggle widescreen mode"
 msgstr "Переключить изменение режима категории"
@@ -421,8 +421,8 @@ msgstr "Горячие клавиши"
 msgid "Logout"
 msgstr "Выход"
 
-#: prefs.php:28 prefs.php:99 include/functions.php:1914
-#: classes/pref/prefs.php:371
+#: prefs.php:28 prefs.php:99 include/functions.php:1918
+#: classes/pref/prefs.php:377
 msgid "Preferences"
 msgstr "Настройки"
 
@@ -443,8 +443,8 @@ msgstr "Каналы"
 msgid "Filters"
 msgstr "Фильтры"
 
-#: prefs.php:108 mobile/mobile-functions.php:205 include/functions.php:1117
-#: include/functions.php:1738 classes/pref/labels.php:90
+#: prefs.php:108 mobile/mobile-functions.php:205 include/functions.php:1121
+#: include/functions.php:1742 classes/pref/labels.php:90
 msgid "Labels"
 msgstr "Метки"
 
@@ -540,8 +540,8 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
-#: mobile/mobile-functions.php:178 include/functions.php:1115
-#: include/functions.php:1736
+#: mobile/mobile-functions.php:178 include/functions.php:1119
+#: include/functions.php:1740
 msgid "Special"
 msgstr "Особые"
 
@@ -588,9 +588,9 @@ msgstr "Сортировать каналы по количеству непро
 msgid "Reverse headline order (oldest first)"
 msgstr "Обратный порядок заголовков (старые впереди)"
 
-#: include/digest.php:131 include/functions.php:1126
-#: include/functions.php:1639 include/functions.php:1724
-#: include/functions.php:1746 classes/opml.php:416 classes/pref/feeds.php:188
+#: include/digest.php:131 include/functions.php:1130
+#: include/functions.php:1643 include/functions.php:1728
+#: include/functions.php:1750 classes/opml.php:416 classes/pref/feeds.php:188
 msgid "Uncategorized"
 msgstr "Нет категории"
 
@@ -603,316 +603,317 @@ msgstr "Отмеченные"
 msgid "No feeds found."
 msgstr "Каналы не найдены."
 
-#: include/functions.php:697
+#: include/functions.php:701
 msgid "Session failed to validate (incorrect IP)"
 msgstr "Ошибка проверки сессии (некорректный IP)"
 
-#: include/functions.php:1588 classes/dlg.php:371 classes/pref/filters.php:368
+#: include/functions.php:1592 classes/dlg.php:371 classes/pref/filters.php:368
 msgid "All feeds"
 msgstr "Все каналы"
 
-#: include/functions.php:1789
+#: include/functions.php:1793
 msgid "Starred articles"
 msgstr "Отмеченные"
 
-#: include/functions.php:1791
+#: include/functions.php:1795
 msgid "Published articles"
 msgstr "Опубликованные"
 
-#: include/functions.php:1793
+#: include/functions.php:1797
 msgid "Fresh articles"
 msgstr "Свежие"
 
-#: include/functions.php:1795 include/functions.php:1909
+#: include/functions.php:1799 include/functions.php:1913
 msgid "All articles"
 msgstr "Все статьи"
 
-#: include/functions.php:1797
+#: include/functions.php:1801
 msgid "Archived articles"
 msgstr "Архив статей"
 
-#: include/functions.php:1799
+#: include/functions.php:1803
 msgid "Recently read"
 msgstr ""
 
-#: include/functions.php:1866
+#: include/functions.php:1870
 msgid "Navigation"
 msgstr "Навигация"
 
-#: include/functions.php:1867
+#: include/functions.php:1871
 #, fuzzy
 msgid "Open next feed"
 msgstr "Генерировать канал"
 
-#: include/functions.php:1868
+#: include/functions.php:1872
 msgid "Open previous feed"
 msgstr ""
 
-#: include/functions.php:1869
+#: include/functions.php:1873
 #, fuzzy
 msgid "Open next article"
 msgstr "Показать оригинальное содержимое статьи"
 
-#: include/functions.php:1870
+#: include/functions.php:1874
 #, fuzzy
 msgid "Open previous article"
 msgstr "Показать оригинальное содержимое статьи"
 
-#: include/functions.php:1871
+#: include/functions.php:1875
 msgid "Open next article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1872
+#: include/functions.php:1876
 msgid "Open previous article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1873
+#: include/functions.php:1877
 msgid "Show search dialog"
 msgstr "Показать диалог поиска"
 
-#: include/functions.php:1874
+#: include/functions.php:1878
 #, fuzzy
 msgid "Article"
 msgstr "Все статьи"
 
-#: include/functions.php:1875
+#: include/functions.php:1879
 msgid "Toggle starred"
 msgstr "Изм. отмеченное"
 
-#: include/functions.php:1876
+#: include/functions.php:1880
 msgid "Toggle published"
 msgstr "Отметить / снять отметку"
 
-#: include/functions.php:1877
+#: include/functions.php:1881
 msgid "Toggle unread"
 msgstr "Прочитано / не прочитано"
 
-#: include/functions.php:1878
+#: include/functions.php:1882
 msgid "Edit tags"
 msgstr "Редактировать теги"
 
-#: include/functions.php:1879
+#: include/functions.php:1883
 #, fuzzy
 msgid "Dismiss selected"
 msgstr "Скрыть выбранные статьи"
 
-#: include/functions.php:1880
+#: include/functions.php:1884
 #, fuzzy
 msgid "Dismiss read"
 msgstr "Опубликовать"
 
-#: include/functions.php:1881
+#: include/functions.php:1885
 #, fuzzy
 msgid "Open in new window"
 msgstr "Открыть статью в новом окне"
 
-#: include/functions.php:1882 js/viewfeed.js:1758
+#: include/functions.php:1886 js/viewfeed.js:1798
 msgid "Mark below as read"
 msgstr "Отметить статьи ниже как прочитанные"
 
-#: include/functions.php:1883 js/viewfeed.js:1752
+#: include/functions.php:1887 js/viewfeed.js:1792
 msgid "Mark above as read"
 msgstr "Отметить статьи выше как прочитанные"
 
-#: include/functions.php:1884
+#: include/functions.php:1888
 #, fuzzy
 msgid "Scroll down"
 msgstr "Всё выполнено."
 
-#: include/functions.php:1885
+#: include/functions.php:1889
 msgid "Scroll up"
 msgstr ""
 
-#: include/functions.php:1886
+#: include/functions.php:1890
 #, fuzzy
 msgid "Select article under cursor"
 msgstr "Выбрать статью под курсором мыши"
 
-#: include/functions.php:1887
+#: include/functions.php:1891
 msgid "Email article"
 msgstr "Отправить по почте"
 
-#: include/functions.php:1888 plugins/close_button/init.php:24
-msgid "Close article"
+#: include/functions.php:1892
+#, fuzzy
+msgid "Close/collapse article"
 msgstr "Закрыть статью"
 
-#: include/functions.php:1890
+#: include/functions.php:1894
 #, fuzzy
 msgid "Article selection"
 msgstr "Инвертировать выделение"
 
-#: include/functions.php:1891
+#: include/functions.php:1895
 msgid "Select all articles"
 msgstr "Выбрать все статьи"
 
-#: include/functions.php:1892
+#: include/functions.php:1896
 #, fuzzy
 msgid "Select unread"
 msgstr "Выбрать непрочитанные статьи"
 
-#: include/functions.php:1893
+#: include/functions.php:1897
 #, fuzzy
 msgid "Select starred"
 msgstr "Отметить"
 
-#: include/functions.php:1894
+#: include/functions.php:1898
 #, fuzzy
 msgid "Select published"
 msgstr "Выбрать непрочитанные статьи"
 
-#: include/functions.php:1895
+#: include/functions.php:1899
 #, fuzzy
 msgid "Invert selection"
 msgstr "Инвертировать выделение"
 
-#: include/functions.php:1896
+#: include/functions.php:1900
 #, fuzzy
 msgid "Deselect everything"
 msgstr "Очистить выделение статей"
 
-#: include/functions.php:1897 classes/pref/feeds.php:488
+#: include/functions.php:1901 classes/pref/feeds.php:488
 #: classes/pref/feeds.php:719
 msgid "Feed"
 msgstr "Канал"
 
-#: include/functions.php:1898
+#: include/functions.php:1902
 #, fuzzy
 msgid "Refresh current feed"
 msgstr "Обновить активный канал"
 
-#: include/functions.php:1899
+#: include/functions.php:1903
 #, fuzzy
 msgid "Un/hide read feeds"
 msgstr "Показать/скрыть прочитанные"
 
-#: include/functions.php:1900 classes/pref/feeds.php:1240
+#: include/functions.php:1904 classes/pref/feeds.php:1240
 msgid "Subscribe to feed"
 msgstr "Подписаться на канал"
 
-#: include/functions.php:1901 js/FeedTree.js:135 js/PrefFeedTree.js:67
+#: include/functions.php:1905 js/FeedTree.js:135 js/PrefFeedTree.js:67
 msgid "Edit feed"
 msgstr "Редактировать канал"
 
-#: include/functions.php:1903
+#: include/functions.php:1907
 #, fuzzy
 msgid "Reverse headlines"
 msgstr "Обратный порядок заголовков"
 
-#: include/functions.php:1904
+#: include/functions.php:1908
 #, fuzzy
 msgid "Debug feed update"
 msgstr "Все каналы обновлены."
 
-#: include/functions.php:1905 js/FeedTree.js:177
+#: include/functions.php:1909 js/FeedTree.js:177
 msgid "Mark all feeds as read"
 msgstr "Отметить все каналы как прочитанные"
 
-#: include/functions.php:1906
+#: include/functions.php:1910
 #, fuzzy
 msgid "Un/collapse current category"
 msgstr "Щёлкните, чтобы развернуть категорию"
 
-#: include/functions.php:1907
+#: include/functions.php:1911
 #, fuzzy
 msgid "Toggle combined mode"
 msgstr "Переключить изменение режима категории"
 
-#: include/functions.php:1908
+#: include/functions.php:1912
 #, fuzzy
 msgid "Go to"
 msgstr "Перейти к.."
 
-#: include/functions.php:1910
+#: include/functions.php:1914
 #, fuzzy
 msgid "Fresh"
 msgstr "Обновить"
 
-#: include/functions.php:1913
+#: include/functions.php:1917
 msgid "Tag cloud"
 msgstr "Облако тегов"
 
-#: include/functions.php:1915
+#: include/functions.php:1919
 #, fuzzy
 msgid "Other"
 msgstr "Другой:"
 
-#: include/functions.php:1916 classes/pref/labels.php:281
+#: include/functions.php:1920 classes/pref/labels.php:281
 msgid "Create label"
 msgstr "Создать метку"
 
-#: include/functions.php:1917 classes/pref/filters.php:587
+#: include/functions.php:1921 classes/pref/filters.php:587
 msgid "Create filter"
 msgstr "Создать фильтр"
 
-#: include/functions.php:1918
+#: include/functions.php:1922
 #, fuzzy
 msgid "Un/collapse sidebar"
 msgstr "Развернуть боковую панель"
 
-#: include/functions.php:1919
+#: include/functions.php:1923
 #, fuzzy
 msgid "Show help dialog"
 msgstr "Показать диалог поиска"
 
-#: include/functions.php:2401
+#: include/functions.php:2405
 #, fuzzy, php-format
 msgid "Search results: %s"
 msgstr "Результаты поиска"
 
-#: include/functions.php:2886 js/viewfeed.js:1845
+#: include/functions.php:2892 js/viewfeed.js:1885
 msgid "Click to play"
 msgstr "Щёлкните для проигрывания"
 
-#: include/functions.php:2887 js/viewfeed.js:1844
+#: include/functions.php:2893 js/viewfeed.js:1884
 msgid "Play"
 msgstr "Играть"
 
-#: include/functions.php:3007
+#: include/functions.php:3014
 msgid " - "
 msgstr " - "
 
-#: include/functions.php:3029 include/functions.php:3346 classes/rpc.php:360
+#: include/functions.php:3036 include/functions.php:3353 classes/rpc.php:360
 msgid "no tags"
 msgstr "нет тегов"
 
-#: include/functions.php:3039 classes/feeds.php:650
+#: include/functions.php:3046 classes/feeds.php:653
 msgid "Edit tags for this article"
 msgstr "Редактировать теги статьи"
 
-#: include/functions.php:3068 classes/feeds.php:605
+#: include/functions.php:3075 classes/feeds.php:608
 msgid "Originally from:"
 msgstr "Оригинал:"
 
-#: include/functions.php:3081 classes/feeds.php:618 classes/pref/feeds.php:507
+#: include/functions.php:3088 classes/feeds.php:621 classes/pref/feeds.php:507
 #, fuzzy
 msgid "Feed URL"
 msgstr "Канал"
 
-#: include/functions.php:3110
+#: include/functions.php:3117
 msgid "Related"
 msgstr ""
 
-#: include/functions.php:3137 classes/dlg.php:43 classes/dlg.php:162
+#: include/functions.php:3144 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:1553
 #: classes/pref/feeds.php:1624 plugins/import_export/init.php:407
 #: plugins/import_export/init.php:431 plugins/share/init.php:67
-#: plugins/updater/init.php:329
+#: plugins/updater/init.php:330
 msgid "Close this window"
 msgstr "Закрыть это окно"
 
-#: include/functions.php:3371
+#: include/functions.php:3378
 #, fuzzy
 msgid "(edit note)"
 msgstr "править заметку"
 
-#: include/functions.php:3604
+#: include/functions.php:3611
 msgid "unknown type"
 msgstr "неизвестный тип"
 
-#: include/functions.php:3654
+#: include/functions.php:3661
 #, fuzzy
 msgid "Attachments"
 msgstr "Вложения:"
@@ -950,7 +951,7 @@ msgstr "Опубликовать"
 msgid "Assign tags"
 msgstr "Применить теги"
 
-#: include/localized_schema.php:14 js/viewfeed.js:1809
+#: include/localized_schema.php:14 js/viewfeed.js:1849
 msgid "Assign label"
 msgstr "Применить метку"
 
@@ -1404,7 +1405,7 @@ msgstr "Авторизация"
 msgid "Login"
 msgstr "Пользователь:"
 
-#: classes/dlg.php:276 classes/dlg.php:732 classes/pref/prefs.php:196
+#: classes/dlg.php:276 classes/dlg.php:732 classes/pref/prefs.php:202
 #: classes/pref/feeds.php:569 classes/pref/feeds.php:793
 msgid "Password"
 msgstr "Пароль"
@@ -1510,7 +1511,7 @@ msgstr "Показать в формате RSS"
 msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 
-#: classes/dlg.php:591 plugins/updater/init.php:303
+#: classes/dlg.php:591 plugins/updater/init.php:304
 #, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "Доступна новая версия Tiny Tiny RSS (%s)."
@@ -1644,7 +1645,7 @@ msgstr "Отправить по почте"
 msgid "Feed:"
 msgstr "Канал:"
 
-#: classes/feeds.php:201 classes/feeds.php:795
+#: classes/feeds.php:201 classes/feeds.php:798
 msgid "Feed not found."
 msgstr "Канал не найден."
 
@@ -1652,19 +1653,24 @@ msgstr "Канал не найден."
 msgid "mark as read"
 msgstr "Отметить как прочитанные"
 
-#: classes/feeds.php:696
+#: classes/feeds.php:553
+#, fuzzy
+msgid "Collapse article"
+msgstr "Закрыть статью"
+
+#: classes/feeds.php:699
 msgid "No unread articles found to display."
 msgstr "Не найдено не прочитанных статей"
 
-#: classes/feeds.php:699
+#: classes/feeds.php:702
 msgid "No updated articles found to display."
 msgstr "Не найдено не прочитанных статей."
 
-#: classes/feeds.php:702
+#: classes/feeds.php:705
 msgid "No starred articles found to display."
 msgstr "Не найдено отмеченных статей"
 
-#: classes/feeds.php:706
+#: classes/feeds.php:709
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
@@ -1672,20 +1678,20 @@ msgstr ""
 "Нет статей для показа. Вы можете присвоить метку вручную (смотрите выше меню "
 "Действия) или используйте фильтр."
 
-#: classes/feeds.php:708
+#: classes/feeds.php:711
 msgid "No articles found to display."
 msgstr "Статей не найдено."
 
-#: classes/feeds.php:723 classes/feeds.php:904
+#: classes/feeds.php:726 classes/feeds.php:907
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "Последнее обновление в %s"
 
-#: classes/feeds.php:733 classes/feeds.php:914
+#: classes/feeds.php:736 classes/feeds.php:917
 msgid "Some feeds have update errors (click for details)"
 msgstr "Некоторые каналы не могут быть обновлены (щёлкните для подробностей)"
 
-#: classes/feeds.php:894
+#: classes/feeds.php:897
 msgid "No feed selected."
 msgstr "Канал не выбран."
 
@@ -2016,182 +2022,173 @@ msgstr "Пароли не совпадают."
 msgid "Function not supported by authentication module."
 msgstr ""
 
-#: classes/pref/prefs.php:63
+#: classes/pref/prefs.php:69
 msgid "The configuration was saved."
 msgstr "Конфигурация сохранена."
 
-#: classes/pref/prefs.php:77
+#: classes/pref/prefs.php:83
 #, php-format
 msgid "Unknown option: %s"
 msgstr "Неизвестная опция: %s"
 
-#: classes/pref/prefs.php:91
+#: classes/pref/prefs.php:97
 #, fuzzy
 msgid "Your personal data has been saved."
 msgstr "Пароль был изменен."
 
-#: classes/pref/prefs.php:131
+#: classes/pref/prefs.php:137
 #, fuzzy
 msgid "Personal data / Authentication"
 msgstr "Авторизация"
 
-#: classes/pref/prefs.php:151
+#: classes/pref/prefs.php:157
 msgid "Personal data"
 msgstr "Личные данные"
 
-#: classes/pref/prefs.php:161
+#: classes/pref/prefs.php:167
 msgid "Full name"
 msgstr "Полное имя"
 
-#: classes/pref/prefs.php:165
+#: classes/pref/prefs.php:171
 msgid "E-mail"
 msgstr "E-mail"
 
-#: classes/pref/prefs.php:171
+#: classes/pref/prefs.php:177
 msgid "Access level"
 msgstr "Уровень доступа:"
 
-#: classes/pref/prefs.php:181
+#: classes/pref/prefs.php:187
 msgid "Save data"
 msgstr "Сохранить"
 
-#: classes/pref/prefs.php:203
+#: classes/pref/prefs.php:209
 msgid "Your password is at default value, please change it."
 msgstr "Используется пароль по умолчанию, пожалуйста, измените его."
 
-#: classes/pref/prefs.php:235
+#: classes/pref/prefs.php:241
 msgid "Old password"
 msgstr "Старый пароль"
 
-#: classes/pref/prefs.php:238
+#: classes/pref/prefs.php:244
 msgid "New password"
 msgstr "Новый пароль"
 
-#: classes/pref/prefs.php:243
+#: classes/pref/prefs.php:249
 msgid "Confirm password"
 msgstr "Подтверждение пароля"
 
-#: classes/pref/prefs.php:253
+#: classes/pref/prefs.php:259
 msgid "Change password"
 msgstr "Изменить пароль"
 
-#: classes/pref/prefs.php:259
+#: classes/pref/prefs.php:265
 msgid "One time passwords / Authenticator"
 msgstr ""
 
-#: classes/pref/prefs.php:288 classes/pref/prefs.php:339
+#: classes/pref/prefs.php:294 classes/pref/prefs.php:345
 #, fuzzy
 msgid "Enter your password"
 msgstr "Некорректное имя пользователя или пароль"
 
-#: classes/pref/prefs.php:299
+#: classes/pref/prefs.php:305
 #, fuzzy
 msgid "Disable OTP"
 msgstr "(Отключен)"
 
-#: classes/pref/prefs.php:305
+#: classes/pref/prefs.php:311
 msgid ""
 "You will need a compatible Authenticator to use this. Changing your password "
 "would automatically disable OTP."
 msgstr ""
 
-#: classes/pref/prefs.php:307
+#: classes/pref/prefs.php:313
 msgid "Scan the following code by the Authenticator application:"
 msgstr ""
 
-#: classes/pref/prefs.php:348
+#: classes/pref/prefs.php:354
 msgid "I have scanned the code and would like to enable OTP"
 msgstr ""
 
-#: classes/pref/prefs.php:356
+#: classes/pref/prefs.php:362
 #, fuzzy
 msgid "Enable OTP"
 msgstr "Включен"
 
-#: classes/pref/prefs.php:482
+#: classes/pref/prefs.php:493
 #, fuzzy
 msgid "Customize"
 msgstr "Изменить пользовательские стили"
 
-#: classes/pref/prefs.php:501 classes/pref/prefs.php:508
-#: classes/pref/prefs.php:513
-msgid "Yes"
-msgstr "Да"
-
-#: classes/pref/prefs.php:503 classes/pref/prefs.php:513
-msgid "No"
-msgstr "Нет"
-
-#: classes/pref/prefs.php:543
+#: classes/pref/prefs.php:552
 msgid "Register"
 msgstr "Регистрация"
 
-#: classes/pref/prefs.php:547
+#: classes/pref/prefs.php:556
 msgid "Clear"
 msgstr ""
 
-#: classes/pref/prefs.php:553
+#: classes/pref/prefs.php:562
 #, php-format
 msgid "Current server time: %s (UTC)"
 msgstr ""
 
-#: classes/pref/prefs.php:582
+#: classes/pref/prefs.php:595
 msgid "Save configuration"
 msgstr "Сохранить конфигурацию"
 
-#: classes/pref/prefs.php:585
+#: classes/pref/prefs.php:598
 msgid "Manage profiles"
 msgstr "Управление профилями"
 
-#: classes/pref/prefs.php:588
+#: classes/pref/prefs.php:601
 msgid "Reset to defaults"
 msgstr "Сбросить настройки"
 
-#: classes/pref/prefs.php:600
+#: classes/pref/prefs.php:613
 #, fuzzy
 msgid "Show additional preferences"
 msgstr "Закрыть настройки"
 
-#: classes/pref/prefs.php:612 classes/pref/prefs.php:614
+#: classes/pref/prefs.php:625 classes/pref/prefs.php:627
 msgid "Plugins"
 msgstr ""
 
-#: classes/pref/prefs.php:642
+#: classes/pref/prefs.php:655
 msgid "System plugins"
 msgstr ""
 
-#: classes/pref/prefs.php:646 classes/pref/prefs.php:695
+#: classes/pref/prefs.php:659 classes/pref/prefs.php:708
 msgid "Plugin"
 msgstr ""
 
-#: classes/pref/prefs.php:647 classes/pref/prefs.php:696
+#: classes/pref/prefs.php:660 classes/pref/prefs.php:709
 #, fuzzy
 msgid "Description"
 msgstr "описание"
 
-#: classes/pref/prefs.php:648 classes/pref/prefs.php:697
+#: classes/pref/prefs.php:661 classes/pref/prefs.php:710
 msgid "Version"
 msgstr ""
 
-#: classes/pref/prefs.php:649 classes/pref/prefs.php:698
+#: classes/pref/prefs.php:662 classes/pref/prefs.php:711
 msgid "Author"
 msgstr ""
 
-#: classes/pref/prefs.php:682 classes/pref/prefs.php:733
+#: classes/pref/prefs.php:695 classes/pref/prefs.php:746
 #, fuzzy
 msgid "Clear data"
 msgstr "Очистить данные канала."
 
-#: classes/pref/prefs.php:691
+#: classes/pref/prefs.php:704
 msgid "User plugins"
 msgstr ""
 
-#: classes/pref/prefs.php:748
+#: classes/pref/prefs.php:761
 #, fuzzy
 msgid "Enable selected plugins"
 msgstr "Разрешить иконки каналов"
 
-#: classes/pref/prefs.php:803 classes/pref/prefs.php:821
+#: classes/pref/prefs.php:816 classes/pref/prefs.php:834
 #, fuzzy
 msgid "Incorrect password"
 msgstr "Некорректное имя пользователя или пароль"
@@ -2478,6 +2475,10 @@ msgstr "Привет,"
 msgid "Regular version"
 msgstr ""
 
+#: plugins/close_button/init.php:24
+msgid "Close article"
+msgstr "Закрыть статью"
+
 #: plugins/nsfw/init.php:32 plugins/nsfw/init.php:43
 msgid "Not work safe (click to toggle)"
 msgstr ""
@@ -2714,29 +2715,29 @@ msgstr "Отмеченные"
 msgid "Share on Google+"
 msgstr "Заголовок"
 
-#: plugins/updater/init.php:294 plugins/updater/init.php:306
+#: plugins/updater/init.php:295 plugins/updater/init.php:307
 #: plugins/updater/updater.js:10
 #, fuzzy
 msgid "Update Tiny Tiny RSS"
 msgstr "Вернуться к Tiny Tiny RSS"
 
-#: plugins/updater/init.php:309
+#: plugins/updater/init.php:310
 #, fuzzy
 msgid "Your Tiny Tiny RSS installation is up to date."
 msgstr "Tiny Tiny RSS база данных обновлена."
 
-#: plugins/updater/init.php:319
+#: plugins/updater/init.php:320
 msgid ""
 "Do not close this dialog until updating is finished. Backup your tt-rss "
 "directory before continuing."
 msgstr ""
 
-#: plugins/updater/init.php:322
+#: plugins/updater/init.php:323
 #, fuzzy
 msgid "Ready to update."
 msgstr "Последнее обновление:"
 
-#: plugins/updater/init.php:327
+#: plugins/updater/init.php:328
 #, fuzzy
 msgid "Start update"
 msgstr "Последнее обновление:"
@@ -2852,7 +2853,7 @@ msgstr "Пожалуйста, укажите заметку для статьи:
 msgid "Generate new syndication address for this feed?"
 msgstr ""
 
-#: js/functions.js:1597 js/tt-rss.js:350 js/tt-rss.js:721
+#: js/functions.js:1597 js/tt-rss.js:350 js/tt-rss.js:729
 msgid "You can't edit this kind of feed."
 msgstr "Вы не можете редактировать этот канал."
 
@@ -3116,12 +3117,12 @@ msgstr "Вы не можете снова оценить этот канал."
 msgid "Rescore articles in %s?"
 msgstr "Установить оценку статьям в %s?"
 
-#: js/tt-rss.js:680
+#: js/tt-rss.js:688
 #, fuzzy
 msgid "Please enable mail plugin first."
 msgstr "Пожалуйста выберите какой-нибудь канал."
 
-#: js/tt-rss.js:842
+#: js/tt-rss.js:850
 #, fuzzy
 msgid "New version available!"
 msgstr "Доступная новая версия Tiny Tiny RSS!"
@@ -3148,7 +3149,7 @@ msgstr "Не публиковать"
 
 #: 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/mailto/init.js:7
+#: js/viewfeed.js:1053 js/viewfeed.js:1967 plugins/mailto/init.js:7
 #: plugins/mail/mail.js:7
 msgid "No articles are selected."
 msgstr "Нет выбранных статей."
@@ -3194,28 +3195,28 @@ msgstr "Статей для отметки не найдено."
 msgid "Mark %d article(s) as read?"
 msgstr "Отметить %d статью(ей) как прочитанные?"
 
-#: js/viewfeed.js:1744
+#: js/viewfeed.js:1784
 msgid "Open original article"
 msgstr "Показать оригинальное содержимое статьи"
 
-#: js/viewfeed.js:1814
+#: js/viewfeed.js:1854
 msgid "Remove label"
 msgstr "Удалить метку"
 
-#: js/viewfeed.js:1838
+#: js/viewfeed.js:1878
 msgid "Playing..."
 msgstr "Проигрываю..."
 
-#: js/viewfeed.js:1839
+#: js/viewfeed.js:1879
 msgid "Click to pause"
 msgstr "Пауза"
 
-#: js/viewfeed.js:1896
+#: js/viewfeed.js:1936
 #, fuzzy
 msgid "Please enter new score for selected articles:"
 msgstr "Пожалуйста, укажите заметку для статьи:"
 
-#: js/viewfeed.js:1938
+#: js/viewfeed.js:1978
 #, fuzzy
 msgid "Please enter new score for this article:"
 msgstr "Пожалуйста, укажите заметку для статьи:"
@@ -3308,6 +3309,12 @@ msgid ""
 "before continuing. Please type 'yes' to continue."
 msgstr ""
 
+#~ msgid "Yes"
+#~ msgstr "Да"
+
+#~ msgid "No"
+#~ msgstr "Нет"
+
 #~ msgid "Comments?"
 #~ msgstr "Комментарии?"
 
diff --git a/locale/zh_CN/LC_MESSAGES/messages.mo b/locale/zh_CN/LC_MESSAGES/messages.mo
index 933d48462..e53b3c99b 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 cc5a4ba95..9eb832614 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-19 22:42+0400\n"
+"POT-Creation-Date: 2013-03-20 10:24+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/"
@@ -278,11 +278,11 @@ msgstr "自动适应"
 msgid "All Articles"
 msgstr "全部文章"
 
-#: index.php:169 include/functions.php:1911 classes/feeds.php:106
+#: index.php:169 include/functions.php:1915 classes/feeds.php:106
 msgid "Starred"
 msgstr "加星标的"
 
-#: index.php:170 include/functions.php:1912 classes/feeds.php:107
+#: index.php:170 include/functions.php:1916 classes/feeds.php:107
 msgid "Published"
 msgstr "已发布"
 
@@ -322,7 +322,7 @@ msgstr "评分"
 msgid "Update"
 msgstr "更新列表"
 
-#: index.php:191 index.php:221 include/functions.php:1902
+#: index.php:191 index.php:221 include/functions.php:1906
 #: include/localized_schema.php:10 classes/feeds.php:111 classes/feeds.php:136
 #: classes/feeds.php:408 js/FeedTree.js:128 js/FeedTree.js:156
 #: plugins/digest/digest.js:630
@@ -383,7 +383,7 @@ msgstr "切换至摘要模式"
 msgid "Show tag cloud..."
 msgstr "显示标签云"
 
-#: index.php:229 include/functions.php:1889
+#: index.php:229 include/functions.php:1893
 #, fuzzy
 msgid "Toggle widescreen mode"
 msgstr "锁定加星标的项"
@@ -409,8 +409,8 @@ msgstr "快捷键帮助"
 msgid "Logout"
 msgstr "注销"
 
-#: prefs.php:28 prefs.php:99 include/functions.php:1914
-#: classes/pref/prefs.php:371
+#: prefs.php:28 prefs.php:99 include/functions.php:1918
+#: classes/pref/prefs.php:377
 msgid "Preferences"
 msgstr "偏好设置"
 
@@ -431,8 +431,8 @@ msgstr "信息源"
 msgid "Filters"
 msgstr "过滤器"
 
-#: prefs.php:108 mobile/mobile-functions.php:205 include/functions.php:1117
-#: include/functions.php:1738 classes/pref/labels.php:90
+#: prefs.php:108 mobile/mobile-functions.php:205 include/functions.php:1121
+#: include/functions.php:1742 classes/pref/labels.php:90
 msgid "Labels"
 msgstr "预定义标签"
 
@@ -526,8 +526,8 @@ msgstr ""
 msgid "Home"
 msgstr "主页"
 
-#: mobile/mobile-functions.php:178 include/functions.php:1115
-#: include/functions.php:1736
+#: mobile/mobile-functions.php:178 include/functions.php:1119
+#: include/functions.php:1740
 msgid "Special"
 msgstr "特殊区域"
 
@@ -569,9 +569,9 @@ msgstr "以未读文章数量排列信息源"
 msgid "Reverse headline order (oldest first)"
 msgstr "反转标题列表顺序（最旧的在上面）"
 
-#: include/digest.php:131 include/functions.php:1126
-#: include/functions.php:1639 include/functions.php:1724
-#: include/functions.php:1746 classes/opml.php:416 classes/pref/feeds.php:188
+#: include/digest.php:131 include/functions.php:1130
+#: include/functions.php:1643 include/functions.php:1728
+#: include/functions.php:1750 classes/opml.php:416 classes/pref/feeds.php:188
 msgid "Uncategorized"
 msgstr "未分类"
 
@@ -584,313 +584,314 @@ msgstr "%d 个存档的文章"
 msgid "No feeds found."
 msgstr "未找到信息源。"
 
-#: include/functions.php:697
+#: include/functions.php:701
 msgid "Session failed to validate (incorrect IP)"
 msgstr "无法验证会话（IP 错误）"
 
-#: include/functions.php:1588 classes/dlg.php:371 classes/pref/filters.php:368
+#: include/functions.php:1592 classes/dlg.php:371 classes/pref/filters.php:368
 msgid "All feeds"
 msgstr "全部信息源"
 
-#: include/functions.php:1789
+#: include/functions.php:1793
 msgid "Starred articles"
 msgstr "加星标文章"
 
-#: include/functions.php:1791
+#: include/functions.php:1795
 msgid "Published articles"
 msgstr "已发布文章"
 
-#: include/functions.php:1793
+#: include/functions.php:1797
 msgid "Fresh articles"
 msgstr "最新更新的文章"
 
-#: include/functions.php:1795 include/functions.php:1909
+#: include/functions.php:1799 include/functions.php:1913
 msgid "All articles"
 msgstr "全部文章"
 
-#: include/functions.php:1797
+#: include/functions.php:1801
 msgid "Archived articles"
 msgstr "存档的文章"
 
-#: include/functions.php:1799
+#: include/functions.php:1803
 msgid "Recently read"
 msgstr ""
 
-#: include/functions.php:1866
+#: include/functions.php:1870
 msgid "Navigation"
 msgstr "导航"
 
-#: include/functions.php:1867
+#: include/functions.php:1871
 #, fuzzy
 msgid "Open next feed"
 msgstr "自动显示下一个信息源"
 
-#: include/functions.php:1868
+#: include/functions.php:1872
 msgid "Open previous feed"
 msgstr ""
 
-#: include/functions.php:1869
+#: include/functions.php:1873
 #, fuzzy
 msgid "Open next article"
 msgstr "打开原文"
 
-#: include/functions.php:1870
+#: include/functions.php:1874
 #, fuzzy
 msgid "Open previous article"
 msgstr "打开原文"
 
-#: include/functions.php:1871
+#: include/functions.php:1875
 msgid "Open next article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1872
+#: include/functions.php:1876
 msgid "Open previous article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1873
+#: include/functions.php:1877
 msgid "Show search dialog"
 msgstr "显示搜索对话框"
 
-#: include/functions.php:1874
+#: include/functions.php:1878
 #, fuzzy
 msgid "Article"
 msgstr "全部文章"
 
-#: include/functions.php:1875
+#: include/functions.php:1879
 msgid "Toggle starred"
 msgstr "锁定加星标的项"
 
-#: include/functions.php:1876
+#: include/functions.php:1880
 msgid "Toggle published"
 msgstr "锁定发布的项"
 
-#: include/functions.php:1877
+#: include/functions.php:1881
 msgid "Toggle unread"
 msgstr "锁定未读项"
 
-#: include/functions.php:1878
+#: include/functions.php:1882
 msgid "Edit tags"
 msgstr "编辑自定义标签"
 
-#: include/functions.php:1879
+#: include/functions.php:1883
 #, fuzzy
 msgid "Dismiss selected"
 msgstr "不再显示所选的文章"
 
-#: include/functions.php:1880
+#: include/functions.php:1884
 #, fuzzy
 msgid "Dismiss read"
 msgstr "不再显示已读文章"
 
-#: include/functions.php:1881
+#: include/functions.php:1885
 #, fuzzy
 msgid "Open in new window"
 msgstr "在新窗口打开文章"
 
-#: include/functions.php:1882 js/viewfeed.js:1758
+#: include/functions.php:1886 js/viewfeed.js:1798
 msgid "Mark below as read"
 msgstr ""
 
-#: include/functions.php:1883 js/viewfeed.js:1752
+#: include/functions.php:1887 js/viewfeed.js:1792
 msgid "Mark above as read"
 msgstr ""
 
-#: include/functions.php:1884
+#: include/functions.php:1888
 #, fuzzy
 msgid "Scroll down"
 msgstr "全部完成。"
 
-#: include/functions.php:1885
+#: include/functions.php:1889
 msgid "Scroll up"
 msgstr ""
 
-#: include/functions.php:1886
+#: include/functions.php:1890
 #, fuzzy
 msgid "Select article under cursor"
 msgstr "选择鼠标指向的文章"
 
-#: include/functions.php:1887
+#: include/functions.php:1891
 msgid "Email article"
 msgstr "通过邮件发送文章"
 
-#: include/functions.php:1888 plugins/close_button/init.php:24
-msgid "Close article"
-msgstr ""
+#: include/functions.php:1892
+#, fuzzy
+msgid "Close/collapse article"
+msgstr "选择所有文章"
 
-#: include/functions.php:1890
+#: include/functions.php:1894
 #, fuzzy
 msgid "Article selection"
 msgstr "反选文章"
 
-#: include/functions.php:1891
+#: include/functions.php:1895
 msgid "Select all articles"
 msgstr "选择所有文章"
 
-#: include/functions.php:1892
+#: include/functions.php:1896
 #, fuzzy
 msgid "Select unread"
 msgstr "选择未读文章"
 
-#: include/functions.php:1893
+#: include/functions.php:1897
 #, fuzzy
 msgid "Select starred"
 msgstr "加星标"
 
-#: include/functions.php:1894
+#: include/functions.php:1898
 #, fuzzy
 msgid "Select published"
 msgstr "选择未读文章"
 
-#: include/functions.php:1895
+#: include/functions.php:1899
 #, fuzzy
 msgid "Invert selection"
 msgstr "反选文章"
 
-#: include/functions.php:1896
+#: include/functions.php:1900
 #, fuzzy
 msgid "Deselect everything"
 msgstr "取消选择所有文章"
 
-#: include/functions.php:1897 classes/pref/feeds.php:488
+#: include/functions.php:1901 classes/pref/feeds.php:488
 #: classes/pref/feeds.php:719
 msgid "Feed"
 msgstr "信息源"
 
-#: include/functions.php:1898
+#: include/functions.php:1902
 #, fuzzy
 msgid "Refresh current feed"
 msgstr "刷新活动的信息源"
 
-#: include/functions.php:1899
+#: include/functions.php:1903
 #, fuzzy
 msgid "Un/hide read feeds"
 msgstr "隐藏（显示）已读信息"
 
-#: include/functions.php:1900 classes/pref/feeds.php:1240
+#: include/functions.php:1904 classes/pref/feeds.php:1240
 msgid "Subscribe to feed"
 msgstr "订阅信息源"
 
-#: include/functions.php:1901 js/FeedTree.js:135 js/PrefFeedTree.js:67
+#: include/functions.php:1905 js/FeedTree.js:135 js/PrefFeedTree.js:67
 msgid "Edit feed"
 msgstr "编辑信息源"
 
-#: include/functions.php:1903
+#: include/functions.php:1907
 #, fuzzy
 msgid "Reverse headlines"
 msgstr "反向排序"
 
-#: include/functions.php:1904
+#: include/functions.php:1908
 #, fuzzy
 msgid "Debug feed update"
 msgstr "禁用更新"
 
-#: include/functions.php:1905 js/FeedTree.js:177
+#: include/functions.php:1909 js/FeedTree.js:177
 msgid "Mark all feeds as read"
 msgstr "标记所有信息源为已读"
 
-#: include/functions.php:1906
+#: include/functions.php:1910
 #, fuzzy
 msgid "Un/collapse current category"
 msgstr "加入到类别："
 
-#: include/functions.php:1907
+#: include/functions.php:1911
 #, fuzzy
 msgid "Toggle combined mode"
 msgstr "锁定发布的项"
 
-#: include/functions.php:1908
+#: include/functions.php:1912
 #, fuzzy
 msgid "Go to"
 msgstr "跳转至……"
 
-#: include/functions.php:1910
+#: include/functions.php:1914
 msgid "Fresh"
 msgstr ""
 
-#: include/functions.php:1913
+#: include/functions.php:1917
 msgid "Tag cloud"
 msgstr "标签云"
 
-#: include/functions.php:1915
+#: include/functions.php:1919
 #, fuzzy
 msgid "Other"
 msgstr "其他信息源"
 
-#: include/functions.php:1916 classes/pref/labels.php:281
+#: include/functions.php:1920 classes/pref/labels.php:281
 msgid "Create label"
 msgstr "创建预定义标签"
 
-#: include/functions.php:1917 classes/pref/filters.php:587
+#: include/functions.php:1921 classes/pref/filters.php:587
 msgid "Create filter"
 msgstr "创建过滤器"
 
-#: include/functions.php:1918
+#: include/functions.php:1922
 #, fuzzy
 msgid "Un/collapse sidebar"
 msgstr "折叠侧边栏"
 
-#: include/functions.php:1919
+#: include/functions.php:1923
 #, fuzzy
 msgid "Show help dialog"
 msgstr "显示搜索对话框"
 
-#: include/functions.php:2401
+#: include/functions.php:2405
 #, php-format
 msgid "Search results: %s"
 msgstr ""
 
-#: include/functions.php:2886 js/viewfeed.js:1845
+#: include/functions.php:2892 js/viewfeed.js:1885
 msgid "Click to play"
 msgstr "点击播放"
 
-#: include/functions.php:2887 js/viewfeed.js:1844
+#: include/functions.php:2893 js/viewfeed.js:1884
 msgid "Play"
 msgstr "播放"
 
-#: include/functions.php:3007
+#: include/functions.php:3014
 msgid " - "
 msgstr " - "
 
-#: include/functions.php:3029 include/functions.php:3346 classes/rpc.php:360
+#: include/functions.php:3036 include/functions.php:3353 classes/rpc.php:360
 msgid "no tags"
 msgstr "无标签"
 
-#: include/functions.php:3039 classes/feeds.php:650
+#: include/functions.php:3046 classes/feeds.php:653
 msgid "Edit tags for this article"
 msgstr "为本文编辑自定义标签"
 
-#: include/functions.php:3068 classes/feeds.php:605
+#: include/functions.php:3075 classes/feeds.php:608
 msgid "Originally from:"
 msgstr "来源："
 
-#: include/functions.php:3081 classes/feeds.php:618 classes/pref/feeds.php:507
+#: include/functions.php:3088 classes/feeds.php:621 classes/pref/feeds.php:507
 msgid "Feed URL"
 msgstr "信息源 URL"
 
-#: include/functions.php:3110
+#: include/functions.php:3117
 msgid "Related"
 msgstr ""
 
-#: include/functions.php:3137 classes/dlg.php:43 classes/dlg.php:162
+#: include/functions.php:3144 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:1553
 #: classes/pref/feeds.php:1624 plugins/import_export/init.php:407
 #: plugins/import_export/init.php:431 plugins/share/init.php:67
-#: plugins/updater/init.php:329
+#: plugins/updater/init.php:330
 msgid "Close this window"
 msgstr "关闭本窗口"
 
-#: include/functions.php:3371
+#: include/functions.php:3378
 msgid "(edit note)"
 msgstr "（编辑注记）"
 
-#: include/functions.php:3604
+#: include/functions.php:3611
 msgid "unknown type"
 msgstr "未知类型"
 
-#: include/functions.php:3654
+#: include/functions.php:3661
 #, fuzzy
 msgid "Attachments"
 msgstr "附件："
@@ -928,7 +929,7 @@ msgstr "发布文章"
 msgid "Assign tags"
 msgstr "添加自定义标签"
 
-#: include/localized_schema.php:14 js/viewfeed.js:1809
+#: include/localized_schema.php:14 js/viewfeed.js:1849
 msgid "Assign label"
 msgstr "添加预定义标签"
 
@@ -1364,7 +1365,7 @@ msgstr "登录密码"
 msgid "Login"
 msgstr "登陆"
 
-#: classes/dlg.php:276 classes/dlg.php:732 classes/pref/prefs.php:196
+#: classes/dlg.php:276 classes/dlg.php:732 classes/pref/prefs.php:202
 #: classes/pref/feeds.php:569 classes/pref/feeds.php:793
 msgid "Password"
 msgstr "密码"
@@ -1465,7 +1466,7 @@ msgstr "以 RSS 形式阅读"
 msgid "You can view this feed as RSS using the following URL:"
 msgstr "您可以通过如下 URL 以 RSS 方式查看本信息源："
 
-#: classes/dlg.php:591 plugins/updater/init.php:303
+#: classes/dlg.php:591 plugins/updater/init.php:304
 #, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "Tiny Tiny RSS 有可用的新版本 (%s)。"
@@ -1597,7 +1598,7 @@ msgstr "通过邮件转发"
 msgid "Feed:"
 msgstr "信息源："
 
-#: classes/feeds.php:201 classes/feeds.php:795
+#: classes/feeds.php:201 classes/feeds.php:798
 msgid "Feed not found."
 msgstr "找不到信息源。"
 
@@ -1605,19 +1606,24 @@ msgstr "找不到信息源。"
 msgid "mark as read"
 msgstr "标记为已读"
 
-#: classes/feeds.php:696
+#: classes/feeds.php:553
+#, fuzzy
+msgid "Collapse article"
+msgstr "全部文章"
+
+#: classes/feeds.php:699
 msgid "No unread articles found to display."
 msgstr "没有未读文章。"
 
-#: classes/feeds.php:699
+#: classes/feeds.php:702
 msgid "No updated articles found to display."
 msgstr "没有最新更新的文章。"
 
-#: classes/feeds.php:702
+#: classes/feeds.php:705
 msgid "No starred articles found to display."
 msgstr "没有加星标的文章。"
 
-#: classes/feeds.php:706
+#: classes/feeds.php:709
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
@@ -1625,20 +1631,20 @@ msgstr ""
 "本标签下没有文章。你可以通过手动或过滤器的方式为文章添加预定义标签（参考上方"
 "动作菜单）。"
 
-#: classes/feeds.php:708
+#: classes/feeds.php:711
 msgid "No articles found to display."
 msgstr "暂时没有文章。"
 
-#: classes/feeds.php:723 classes/feeds.php:904
+#: classes/feeds.php:726 classes/feeds.php:907
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "上次信息源更新时间：%s"
 
-#: classes/feeds.php:733 classes/feeds.php:914
+#: classes/feeds.php:736 classes/feeds.php:917
 msgid "Some feeds have update errors (click for details)"
 msgstr "部分信息源更新错误（点击了解详情）"
 
-#: classes/feeds.php:894
+#: classes/feeds.php:897
 msgid "No feed selected."
 msgstr "没有选中的信息源。"
 
@@ -1966,179 +1972,170 @@ msgstr "两次输入的密码不一致。"
 msgid "Function not supported by authentication module."
 msgstr ""
 
-#: classes/pref/prefs.php:63
+#: classes/pref/prefs.php:69
 msgid "The configuration was saved."
 msgstr "设置已保存。"
 
-#: classes/pref/prefs.php:77
+#: classes/pref/prefs.php:83
 #, php-format
 msgid "Unknown option: %s"
 msgstr "未知选项： %s"
 
-#: classes/pref/prefs.php:91
+#: classes/pref/prefs.php:97
 msgid "Your personal data has been saved."
 msgstr "您的个人数据已保存。"
 
-#: classes/pref/prefs.php:131
+#: classes/pref/prefs.php:137
 #, fuzzy
 msgid "Personal data / Authentication"
 msgstr "登录密码"
 
-#: classes/pref/prefs.php:151
+#: classes/pref/prefs.php:157
 msgid "Personal data"
 msgstr ""
 
-#: classes/pref/prefs.php:161
+#: classes/pref/prefs.php:167
 msgid "Full name"
 msgstr "姓名"
 
-#: classes/pref/prefs.php:165
+#: classes/pref/prefs.php:171
 msgid "E-mail"
 msgstr "电子邮件"
 
-#: classes/pref/prefs.php:171
+#: classes/pref/prefs.php:177
 msgid "Access level"
 msgstr "访问级别"
 
-#: classes/pref/prefs.php:181
+#: classes/pref/prefs.php:187
 msgid "Save data"
 msgstr "保存信息"
 
-#: classes/pref/prefs.php:203
+#: classes/pref/prefs.php:209
 msgid "Your password is at default value, please change it."
 msgstr "您还在使用系统默认的密码，请修改。"
 
-#: classes/pref/prefs.php:235
+#: classes/pref/prefs.php:241
 msgid "Old password"
 msgstr "原密码"
 
-#: classes/pref/prefs.php:238
+#: classes/pref/prefs.php:244
 msgid "New password"
 msgstr "新密码"
 
-#: classes/pref/prefs.php:243
+#: classes/pref/prefs.php:249
 msgid "Confirm password"
 msgstr "确认密码"
 
-#: classes/pref/prefs.php:253
+#: classes/pref/prefs.php:259
 msgid "Change password"
 msgstr "更改密码"
 
-#: classes/pref/prefs.php:259
+#: classes/pref/prefs.php:265
 msgid "One time passwords / Authenticator"
 msgstr ""
 
-#: classes/pref/prefs.php:288 classes/pref/prefs.php:339
+#: classes/pref/prefs.php:294 classes/pref/prefs.php:345
 #, fuzzy
 msgid "Enter your password"
 msgstr "用户名或密码错误"
 
-#: classes/pref/prefs.php:299
+#: classes/pref/prefs.php:305
 #, fuzzy
 msgid "Disable OTP"
 msgstr "禁用更新"
 
-#: classes/pref/prefs.php:305
+#: classes/pref/prefs.php:311
 msgid ""
 "You will need a compatible Authenticator to use this. Changing your password "
 "would automatically disable OTP."
 msgstr ""
 
-#: classes/pref/prefs.php:307
+#: classes/pref/prefs.php:313
 msgid "Scan the following code by the Authenticator application:"
 msgstr ""
 
-#: classes/pref/prefs.php:348
+#: classes/pref/prefs.php:354
 msgid "I have scanned the code and would like to enable OTP"
 msgstr ""
 
-#: classes/pref/prefs.php:356
+#: classes/pref/prefs.php:362
 #, fuzzy
 msgid "Enable OTP"
 msgstr "已启用"
 
-#: classes/pref/prefs.php:482
+#: classes/pref/prefs.php:493
 msgid "Customize"
 msgstr "自定义"
 
-#: classes/pref/prefs.php:501 classes/pref/prefs.php:508
-#: classes/pref/prefs.php:513
-msgid "Yes"
-msgstr "是"
-
-#: classes/pref/prefs.php:503 classes/pref/prefs.php:513
-msgid "No"
-msgstr "否"
-
-#: classes/pref/prefs.php:543
+#: classes/pref/prefs.php:552
 msgid "Register"
 msgstr "注册"
 
-#: classes/pref/prefs.php:547
+#: classes/pref/prefs.php:556
 msgid "Clear"
 msgstr "清空"
 
-#: classes/pref/prefs.php:553
+#: classes/pref/prefs.php:562
 #, php-format
 msgid "Current server time: %s (UTC)"
 msgstr ""
 
-#: classes/pref/prefs.php:582
+#: classes/pref/prefs.php:595
 msgid "Save configuration"
 msgstr "保存设置"
 
-#: classes/pref/prefs.php:585
+#: classes/pref/prefs.php:598
 msgid "Manage profiles"
 msgstr "管理偏好文件"
 
-#: classes/pref/prefs.php:588
+#: classes/pref/prefs.php:601
 msgid "Reset to defaults"
 msgstr "恢复到默认"
 
-#: classes/pref/prefs.php:600
+#: classes/pref/prefs.php:613
 #, fuzzy
 msgid "Show additional preferences"
 msgstr "退出偏好设置"
 
-#: classes/pref/prefs.php:612 classes/pref/prefs.php:614
+#: classes/pref/prefs.php:625 classes/pref/prefs.php:627
 msgid "Plugins"
 msgstr ""
 
-#: classes/pref/prefs.php:642
+#: classes/pref/prefs.php:655
 msgid "System plugins"
 msgstr ""
 
-#: classes/pref/prefs.php:646 classes/pref/prefs.php:695
+#: classes/pref/prefs.php:659 classes/pref/prefs.php:708
 msgid "Plugin"
 msgstr ""
 
-#: classes/pref/prefs.php:647 classes/pref/prefs.php:696
+#: classes/pref/prefs.php:660 classes/pref/prefs.php:709
 msgid "Description"
 msgstr ""
 
-#: classes/pref/prefs.php:648 classes/pref/prefs.php:697
+#: classes/pref/prefs.php:661 classes/pref/prefs.php:710
 msgid "Version"
 msgstr ""
 
-#: classes/pref/prefs.php:649 classes/pref/prefs.php:698
+#: classes/pref/prefs.php:662 classes/pref/prefs.php:711
 msgid "Author"
 msgstr ""
 
-#: classes/pref/prefs.php:682 classes/pref/prefs.php:733
+#: classes/pref/prefs.php:695 classes/pref/prefs.php:746
 #, fuzzy
 msgid "Clear data"
 msgstr "清空信息源数据"
 
-#: classes/pref/prefs.php:691
+#: classes/pref/prefs.php:704
 msgid "User plugins"
 msgstr ""
 
-#: classes/pref/prefs.php:748
+#: classes/pref/prefs.php:761
 #, fuzzy
 msgid "Enable selected plugins"
 msgstr "启用信息源分类"
 
-#: classes/pref/prefs.php:803 classes/pref/prefs.php:821
+#: classes/pref/prefs.php:816 classes/pref/prefs.php:834
 #, fuzzy
 msgid "Incorrect password"
 msgstr "用户名或密码错误"
@@ -2415,6 +2412,10 @@ msgstr "您好，"
 msgid "Regular version"
 msgstr ""
 
+#: plugins/close_button/init.php:24
+msgid "Close article"
+msgstr ""
+
 #: plugins/nsfw/init.php:32 plugins/nsfw/init.php:43
 msgid "Not work safe (click to toggle)"
 msgstr ""
@@ -2649,29 +2650,29 @@ msgstr "加星标"
 msgid "Share on Google+"
 msgstr "在 Twitter 上分享"
 
-#: plugins/updater/init.php:294 plugins/updater/init.php:306
+#: plugins/updater/init.php:295 plugins/updater/init.php:307
 #: plugins/updater/updater.js:10
 #, fuzzy
 msgid "Update Tiny Tiny RSS"
 msgstr "返回 Tiny Tiny RSS"
 
-#: plugins/updater/init.php:309
+#: plugins/updater/init.php:310
 #, fuzzy
 msgid "Your Tiny Tiny RSS installation is up to date."
 msgstr "Tiny Tiny RSS 数据库是最新版。"
 
-#: plugins/updater/init.php:319
+#: plugins/updater/init.php:320
 msgid ""
 "Do not close this dialog until updating is finished. Backup your tt-rss "
 "directory before continuing."
 msgstr ""
 
-#: plugins/updater/init.php:322
+#: plugins/updater/init.php:323
 #, fuzzy
 msgid "Ready to update."
 msgstr "上次更新："
 
-#: plugins/updater/init.php:327
+#: plugins/updater/init.php:328
 #, fuzzy
 msgid "Start update"
 msgstr "上次更新："
@@ -2783,7 +2784,7 @@ msgstr "请填写类别名称："
 msgid "Generate new syndication address for this feed?"
 msgstr "为本信息源生成新的群地址？"
 
-#: js/functions.js:1597 js/tt-rss.js:350 js/tt-rss.js:721
+#: js/functions.js:1597 js/tt-rss.js:350 js/tt-rss.js:729
 msgid "You can't edit this kind of feed."
 msgstr "您无法编辑这种类型的信息源。"
 
@@ -3037,12 +3038,12 @@ msgstr "无法重置本类信息源的评分。"
 msgid "Rescore articles in %s?"
 msgstr "重置 %s 中文章的评分？"
 
-#: js/tt-rss.js:680
+#: js/tt-rss.js:688
 #, fuzzy
 msgid "Please enable mail plugin first."
 msgstr "请先选几个信息源吧。"
 
-#: js/tt-rss.js:842
+#: js/tt-rss.js:850
 msgid "New version available!"
 msgstr "有可用的新版本啦！"
 
@@ -3068,7 +3069,7 @@ msgstr "取消发布文章"
 
 #: 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/mailto/init.js:7
+#: js/viewfeed.js:1053 js/viewfeed.js:1967 plugins/mailto/init.js:7
 #: plugins/mail/mail.js:7
 msgid "No articles are selected."
 msgstr "没有选中任何文章。"
@@ -3113,28 +3114,28 @@ msgstr "未找到需要标记的文章"
 msgid "Mark %d article(s) as read?"
 msgstr "将 %d 篇文章标记为已读？"
 
-#: js/viewfeed.js:1744
+#: js/viewfeed.js:1784
 msgid "Open original article"
 msgstr "打开原文"
 
-#: js/viewfeed.js:1814
+#: js/viewfeed.js:1854
 msgid "Remove label"
 msgstr "移除预定义标签"
 
-#: js/viewfeed.js:1838
+#: js/viewfeed.js:1878
 msgid "Playing..."
 msgstr "播放中……"
 
-#: js/viewfeed.js:1839
+#: js/viewfeed.js:1879
 msgid "Click to pause"
 msgstr "点击暂停"
 
-#: js/viewfeed.js:1896
+#: js/viewfeed.js:1936
 #, fuzzy
 msgid "Please enter new score for selected articles:"
 msgstr "删除选中的 %d 篇文章？"
 
-#: js/viewfeed.js:1938
+#: js/viewfeed.js:1978
 #, fuzzy
 msgid "Please enter new score for this article:"
 msgstr "请填写类别名称："
@@ -3215,6 +3216,12 @@ msgid ""
 "before continuing. Please type 'yes' to continue."
 msgstr ""
 
+#~ msgid "Yes"
+#~ msgstr "是"
+
+#~ msgid "No"
+#~ msgstr "否"
+
 #~ msgid "Comments?"
 #~ msgstr "评论些什么？"
 
diff --git a/messages.pot b/messages.pot
index a5fc62585..461091cda 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-19 22:42+0400\n"
+"POT-Creation-Date: 2013-03-20 10:24+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"
@@ -271,11 +271,11 @@ msgstr ""
 msgid "All Articles"
 msgstr ""
 
-#: index.php:169 include/functions.php:1911 classes/feeds.php:106
+#: index.php:169 include/functions.php:1915 classes/feeds.php:106
 msgid "Starred"
 msgstr ""
 
-#: index.php:170 include/functions.php:1912 classes/feeds.php:107
+#: index.php:170 include/functions.php:1916 classes/feeds.php:107
 msgid "Published"
 msgstr ""
 
@@ -315,7 +315,7 @@ msgstr ""
 msgid "Update"
 msgstr ""
 
-#: index.php:191 index.php:221 include/functions.php:1902
+#: index.php:191 index.php:221 include/functions.php:1906
 #: include/localized_schema.php:10 classes/feeds.php:111 classes/feeds.php:136
 #: classes/feeds.php:408 js/FeedTree.js:128 js/FeedTree.js:156
 #: plugins/digest/digest.js:630
@@ -375,7 +375,7 @@ msgstr ""
 msgid "Show tag cloud..."
 msgstr ""
 
-#: index.php:229 include/functions.php:1889
+#: index.php:229 include/functions.php:1893
 msgid "Toggle widescreen mode"
 msgstr ""
 
@@ -400,8 +400,8 @@ msgstr ""
 msgid "Logout"
 msgstr ""
 
-#: prefs.php:28 prefs.php:99 include/functions.php:1914
-#: classes/pref/prefs.php:371
+#: prefs.php:28 prefs.php:99 include/functions.php:1918
+#: classes/pref/prefs.php:377
 msgid "Preferences"
 msgstr ""
 
@@ -422,8 +422,8 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
-#: prefs.php:108 mobile/mobile-functions.php:205 include/functions.php:1117
-#: include/functions.php:1738 classes/pref/labels.php:90
+#: prefs.php:108 mobile/mobile-functions.php:205 include/functions.php:1121
+#: include/functions.php:1742 classes/pref/labels.php:90
 msgid "Labels"
 msgstr ""
 
@@ -516,8 +516,8 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
-#: mobile/mobile-functions.php:178 include/functions.php:1115
-#: include/functions.php:1736
+#: mobile/mobile-functions.php:178 include/functions.php:1119
+#: include/functions.php:1740
 msgid "Special"
 msgstr ""
 
@@ -559,9 +559,9 @@ msgstr ""
 msgid "Reverse headline order (oldest first)"
 msgstr ""
 
-#: include/digest.php:131 include/functions.php:1126
-#: include/functions.php:1639 include/functions.php:1724
-#: include/functions.php:1746 classes/opml.php:416 classes/pref/feeds.php:188
+#: include/digest.php:131 include/functions.php:1130
+#: include/functions.php:1643 include/functions.php:1728
+#: include/functions.php:1750 classes/opml.php:416 classes/pref/feeds.php:188
 msgid "Uncategorized"
 msgstr ""
 
@@ -574,288 +574,288 @@ msgstr ""
 msgid "No feeds found."
 msgstr ""
 
-#: include/functions.php:697
+#: include/functions.php:701
 msgid "Session failed to validate (incorrect IP)"
 msgstr ""
 
-#: include/functions.php:1588 classes/dlg.php:371 classes/pref/filters.php:368
+#: include/functions.php:1592 classes/dlg.php:371 classes/pref/filters.php:368
 msgid "All feeds"
 msgstr ""
 
-#: include/functions.php:1789
+#: include/functions.php:1793
 msgid "Starred articles"
 msgstr ""
 
-#: include/functions.php:1791
+#: include/functions.php:1795
 msgid "Published articles"
 msgstr ""
 
-#: include/functions.php:1793
+#: include/functions.php:1797
 msgid "Fresh articles"
 msgstr ""
 
-#: include/functions.php:1795 include/functions.php:1909
+#: include/functions.php:1799 include/functions.php:1913
 msgid "All articles"
 msgstr ""
 
-#: include/functions.php:1797
+#: include/functions.php:1801
 msgid "Archived articles"
 msgstr ""
 
-#: include/functions.php:1799
+#: include/functions.php:1803
 msgid "Recently read"
 msgstr ""
 
-#: include/functions.php:1866
+#: include/functions.php:1870
 msgid "Navigation"
 msgstr ""
 
-#: include/functions.php:1867
+#: include/functions.php:1871
 msgid "Open next feed"
 msgstr ""
 
-#: include/functions.php:1868
+#: include/functions.php:1872
 msgid "Open previous feed"
 msgstr ""
 
-#: include/functions.php:1869
+#: include/functions.php:1873
 msgid "Open next article"
 msgstr ""
 
-#: include/functions.php:1870
+#: include/functions.php:1874
 msgid "Open previous article"
 msgstr ""
 
-#: include/functions.php:1871
+#: include/functions.php:1875
 msgid "Open next article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1872
+#: include/functions.php:1876
 msgid "Open previous article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1873
+#: include/functions.php:1877
 msgid "Show search dialog"
 msgstr ""
 
-#: include/functions.php:1874
+#: include/functions.php:1878
 msgid "Article"
 msgstr ""
 
-#: include/functions.php:1875
+#: include/functions.php:1879
 msgid "Toggle starred"
 msgstr ""
 
-#: include/functions.php:1876
+#: include/functions.php:1880
 msgid "Toggle published"
 msgstr ""
 
-#: include/functions.php:1877
+#: include/functions.php:1881
 msgid "Toggle unread"
 msgstr ""
 
-#: include/functions.php:1878
+#: include/functions.php:1882
 msgid "Edit tags"
 msgstr ""
 
-#: include/functions.php:1879
+#: include/functions.php:1883
 msgid "Dismiss selected"
 msgstr ""
 
-#: include/functions.php:1880
+#: include/functions.php:1884
 msgid "Dismiss read"
 msgstr ""
 
-#: include/functions.php:1881
+#: include/functions.php:1885
 msgid "Open in new window"
 msgstr ""
 
-#: include/functions.php:1882 js/viewfeed.js:1758
+#: include/functions.php:1886 js/viewfeed.js:1798
 msgid "Mark below as read"
 msgstr ""
 
-#: include/functions.php:1883 js/viewfeed.js:1752
+#: include/functions.php:1887 js/viewfeed.js:1792
 msgid "Mark above as read"
 msgstr ""
 
-#: include/functions.php:1884
+#: include/functions.php:1888
 msgid "Scroll down"
 msgstr ""
 
-#: include/functions.php:1885
+#: include/functions.php:1889
 msgid "Scroll up"
 msgstr ""
 
-#: include/functions.php:1886
+#: include/functions.php:1890
 msgid "Select article under cursor"
 msgstr ""
 
-#: include/functions.php:1887
+#: include/functions.php:1891
 msgid "Email article"
 msgstr ""
 
-#: include/functions.php:1888 plugins/close_button/init.php:24
-msgid "Close article"
+#: include/functions.php:1892
+msgid "Close/collapse article"
 msgstr ""
 
-#: include/functions.php:1890
+#: include/functions.php:1894
 msgid "Article selection"
 msgstr ""
 
-#: include/functions.php:1891
+#: include/functions.php:1895
 msgid "Select all articles"
 msgstr ""
 
-#: include/functions.php:1892
+#: include/functions.php:1896
 msgid "Select unread"
 msgstr ""
 
-#: include/functions.php:1893
+#: include/functions.php:1897
 msgid "Select starred"
 msgstr ""
 
-#: include/functions.php:1894
+#: include/functions.php:1898
 msgid "Select published"
 msgstr ""
 
-#: include/functions.php:1895
+#: include/functions.php:1899
 msgid "Invert selection"
 msgstr ""
 
-#: include/functions.php:1896
+#: include/functions.php:1900
 msgid "Deselect everything"
 msgstr ""
 
-#: include/functions.php:1897 classes/pref/feeds.php:488
+#: include/functions.php:1901 classes/pref/feeds.php:488
 #: classes/pref/feeds.php:719
 msgid "Feed"
 msgstr ""
 
-#: include/functions.php:1898
+#: include/functions.php:1902
 msgid "Refresh current feed"
 msgstr ""
 
-#: include/functions.php:1899
+#: include/functions.php:1903
 msgid "Un/hide read feeds"
 msgstr ""
 
-#: include/functions.php:1900 classes/pref/feeds.php:1240
+#: include/functions.php:1904 classes/pref/feeds.php:1240
 msgid "Subscribe to feed"
 msgstr ""
 
-#: include/functions.php:1901 js/FeedTree.js:135 js/PrefFeedTree.js:67
+#: include/functions.php:1905 js/FeedTree.js:135 js/PrefFeedTree.js:67
 msgid "Edit feed"
 msgstr ""
 
-#: include/functions.php:1903
+#: include/functions.php:1907
 msgid "Reverse headlines"
 msgstr ""
 
-#: include/functions.php:1904
+#: include/functions.php:1908
 msgid "Debug feed update"
 msgstr ""
 
-#: include/functions.php:1905 js/FeedTree.js:177
+#: include/functions.php:1909 js/FeedTree.js:177
 msgid "Mark all feeds as read"
 msgstr ""
 
-#: include/functions.php:1906
+#: include/functions.php:1910
 msgid "Un/collapse current category"
 msgstr ""
 
-#: include/functions.php:1907
+#: include/functions.php:1911
 msgid "Toggle combined mode"
 msgstr ""
 
-#: include/functions.php:1908
+#: include/functions.php:1912
 msgid "Go to"
 msgstr ""
 
-#: include/functions.php:1910
+#: include/functions.php:1914
 msgid "Fresh"
 msgstr ""
 
-#: include/functions.php:1913
+#: include/functions.php:1917
 msgid "Tag cloud"
 msgstr ""
 
-#: include/functions.php:1915
+#: include/functions.php:1919
 msgid "Other"
 msgstr ""
 
-#: include/functions.php:1916 classes/pref/labels.php:281
+#: include/functions.php:1920 classes/pref/labels.php:281
 msgid "Create label"
 msgstr ""
 
-#: include/functions.php:1917 classes/pref/filters.php:587
+#: include/functions.php:1921 classes/pref/filters.php:587
 msgid "Create filter"
 msgstr ""
 
-#: include/functions.php:1918
+#: include/functions.php:1922
 msgid "Un/collapse sidebar"
 msgstr ""
 
-#: include/functions.php:1919
+#: include/functions.php:1923
 msgid "Show help dialog"
 msgstr ""
 
-#: include/functions.php:2401
+#: include/functions.php:2405
 #, php-format
 msgid "Search results: %s"
 msgstr ""
 
-#: include/functions.php:2886 js/viewfeed.js:1845
+#: include/functions.php:2892 js/viewfeed.js:1885
 msgid "Click to play"
 msgstr ""
 
-#: include/functions.php:2887 js/viewfeed.js:1844
+#: include/functions.php:2893 js/viewfeed.js:1884
 msgid "Play"
 msgstr ""
 
-#: include/functions.php:3007
+#: include/functions.php:3014
 msgid " - "
 msgstr ""
 
-#: include/functions.php:3029 include/functions.php:3346 classes/rpc.php:360
+#: include/functions.php:3036 include/functions.php:3353 classes/rpc.php:360
 msgid "no tags"
 msgstr ""
 
-#: include/functions.php:3039 classes/feeds.php:650
+#: include/functions.php:3046 classes/feeds.php:653
 msgid "Edit tags for this article"
 msgstr ""
 
-#: include/functions.php:3068 classes/feeds.php:605
+#: include/functions.php:3075 classes/feeds.php:608
 msgid "Originally from:"
 msgstr ""
 
-#: include/functions.php:3081 classes/feeds.php:618 classes/pref/feeds.php:507
+#: include/functions.php:3088 classes/feeds.php:621 classes/pref/feeds.php:507
 msgid "Feed URL"
 msgstr ""
 
-#: include/functions.php:3110
+#: include/functions.php:3117
 msgid "Related"
 msgstr ""
 
-#: include/functions.php:3137 classes/dlg.php:43 classes/dlg.php:162
+#: include/functions.php:3144 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:1553
 #: classes/pref/feeds.php:1624 plugins/import_export/init.php:407
 #: plugins/import_export/init.php:431 plugins/share/init.php:67
-#: plugins/updater/init.php:329
+#: plugins/updater/init.php:330
 msgid "Close this window"
 msgstr ""
 
-#: include/functions.php:3371
+#: include/functions.php:3378
 msgid "(edit note)"
 msgstr ""
 
-#: include/functions.php:3604
+#: include/functions.php:3611
 msgid "unknown type"
 msgstr ""
 
-#: include/functions.php:3654
+#: include/functions.php:3661
 msgid "Attachments"
 msgstr ""
 
@@ -892,7 +892,7 @@ msgstr ""
 msgid "Assign tags"
 msgstr ""
 
-#: include/localized_schema.php:14 js/viewfeed.js:1809
+#: include/localized_schema.php:14 js/viewfeed.js:1849
 msgid "Assign label"
 msgstr ""
 
@@ -1312,7 +1312,7 @@ msgstr ""
 msgid "Login"
 msgstr ""
 
-#: classes/dlg.php:276 classes/dlg.php:732 classes/pref/prefs.php:196
+#: classes/dlg.php:276 classes/dlg.php:732 classes/pref/prefs.php:202
 #: classes/pref/feeds.php:569 classes/pref/feeds.php:793
 msgid "Password"
 msgstr ""
@@ -1412,7 +1412,7 @@ msgstr ""
 msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 
-#: classes/dlg.php:591 plugins/updater/init.php:303
+#: classes/dlg.php:591 plugins/updater/init.php:304
 #, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr ""
@@ -1540,7 +1540,7 @@ msgstr ""
 msgid "Feed:"
 msgstr ""
 
-#: classes/feeds.php:201 classes/feeds.php:795
+#: classes/feeds.php:201 classes/feeds.php:798
 msgid "Feed not found."
 msgstr ""
 
@@ -1548,38 +1548,42 @@ msgstr ""
 msgid "mark as read"
 msgstr ""
 
-#: classes/feeds.php:696
-msgid "No unread articles found to display."
+#: classes/feeds.php:553
+msgid "Collapse article"
 msgstr ""
 
 #: classes/feeds.php:699
-msgid "No updated articles found to display."
+msgid "No unread articles found to display."
 msgstr ""
 
 #: classes/feeds.php:702
+msgid "No updated articles found to display."
+msgstr ""
+
+#: classes/feeds.php:705
 msgid "No starred articles found to display."
 msgstr ""
 
-#: classes/feeds.php:706
+#: classes/feeds.php:709
 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:708
+#: classes/feeds.php:711
 msgid "No articles found to display."
 msgstr ""
 
-#: classes/feeds.php:723 classes/feeds.php:904
+#: classes/feeds.php:726 classes/feeds.php:907
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr ""
 
-#: classes/feeds.php:733 classes/feeds.php:914
+#: classes/feeds.php:736 classes/feeds.php:917
 msgid "Some feeds have update errors (click for details)"
 msgstr ""
 
-#: classes/feeds.php:894
+#: classes/feeds.php:897
 msgid "No feed selected."
 msgstr ""
 
@@ -1901,172 +1905,163 @@ msgstr ""
 msgid "Function not supported by authentication module."
 msgstr ""
 
-#: classes/pref/prefs.php:63
+#: classes/pref/prefs.php:69
 msgid "The configuration was saved."
 msgstr ""
 
-#: classes/pref/prefs.php:77
+#: classes/pref/prefs.php:83
 #, php-format
 msgid "Unknown option: %s"
 msgstr ""
 
-#: classes/pref/prefs.php:91
+#: classes/pref/prefs.php:97
 msgid "Your personal data has been saved."
 msgstr ""
 
-#: classes/pref/prefs.php:131
+#: classes/pref/prefs.php:137
 msgid "Personal data / Authentication"
 msgstr ""
 
-#: classes/pref/prefs.php:151
+#: classes/pref/prefs.php:157
 msgid "Personal data"
 msgstr ""
 
-#: classes/pref/prefs.php:161
+#: classes/pref/prefs.php:167
 msgid "Full name"
 msgstr ""
 
-#: classes/pref/prefs.php:165
+#: classes/pref/prefs.php:171
 msgid "E-mail"
 msgstr ""
 
-#: classes/pref/prefs.php:171
+#: classes/pref/prefs.php:177
 msgid "Access level"
 msgstr ""
 
-#: classes/pref/prefs.php:181
+#: classes/pref/prefs.php:187
 msgid "Save data"
 msgstr ""
 
-#: classes/pref/prefs.php:203
+#: classes/pref/prefs.php:209
 msgid "Your password is at default value, please change it."
 msgstr ""
 
-#: classes/pref/prefs.php:235
+#: classes/pref/prefs.php:241
 msgid "Old password"
 msgstr ""
 
-#: classes/pref/prefs.php:238
+#: classes/pref/prefs.php:244
 msgid "New password"
 msgstr ""
 
-#: classes/pref/prefs.php:243
+#: classes/pref/prefs.php:249
 msgid "Confirm password"
 msgstr ""
 
-#: classes/pref/prefs.php:253
+#: classes/pref/prefs.php:259
 msgid "Change password"
 msgstr ""
 
-#: classes/pref/prefs.php:259
+#: classes/pref/prefs.php:265
 msgid "One time passwords / Authenticator"
 msgstr ""
 
-#: classes/pref/prefs.php:288 classes/pref/prefs.php:339
+#: classes/pref/prefs.php:294 classes/pref/prefs.php:345
 msgid "Enter your password"
 msgstr ""
 
-#: classes/pref/prefs.php:299
+#: classes/pref/prefs.php:305
 msgid "Disable OTP"
 msgstr ""
 
-#: classes/pref/prefs.php:305
+#: classes/pref/prefs.php:311
 msgid ""
 "You will need a compatible Authenticator to use this. Changing your password "
 "would automatically disable OTP."
 msgstr ""
 
-#: classes/pref/prefs.php:307
+#: classes/pref/prefs.php:313
 msgid "Scan the following code by the Authenticator application:"
 msgstr ""
 
-#: classes/pref/prefs.php:348
+#: classes/pref/prefs.php:354
 msgid "I have scanned the code and would like to enable OTP"
 msgstr ""
 
-#: classes/pref/prefs.php:356
+#: classes/pref/prefs.php:362
 msgid "Enable OTP"
 msgstr ""
 
-#: classes/pref/prefs.php:482
+#: classes/pref/prefs.php:493
 msgid "Customize"
 msgstr ""
 
-#: classes/pref/prefs.php:501 classes/pref/prefs.php:508
-#: classes/pref/prefs.php:513
-msgid "Yes"
-msgstr ""
-
-#: classes/pref/prefs.php:503 classes/pref/prefs.php:513
-msgid "No"
-msgstr ""
-
-#: classes/pref/prefs.php:543
+#: classes/pref/prefs.php:552
 msgid "Register"
 msgstr ""
 
-#: classes/pref/prefs.php:547
+#: classes/pref/prefs.php:556
 msgid "Clear"
 msgstr ""
 
-#: classes/pref/prefs.php:553
+#: classes/pref/prefs.php:562
 #, php-format
 msgid "Current server time: %s (UTC)"
 msgstr ""
 
-#: classes/pref/prefs.php:582
+#: classes/pref/prefs.php:595
 msgid "Save configuration"
 msgstr ""
 
-#: classes/pref/prefs.php:585
+#: classes/pref/prefs.php:598
 msgid "Manage profiles"
 msgstr ""
 
-#: classes/pref/prefs.php:588
+#: classes/pref/prefs.php:601
 msgid "Reset to defaults"
 msgstr ""
 
-#: classes/pref/prefs.php:600
+#: classes/pref/prefs.php:613
 msgid "Show additional preferences"
 msgstr ""
 
-#: classes/pref/prefs.php:612 classes/pref/prefs.php:614
+#: classes/pref/prefs.php:625 classes/pref/prefs.php:627
 msgid "Plugins"
 msgstr ""
 
-#: classes/pref/prefs.php:642
+#: classes/pref/prefs.php:655
 msgid "System plugins"
 msgstr ""
 
-#: classes/pref/prefs.php:646 classes/pref/prefs.php:695
+#: classes/pref/prefs.php:659 classes/pref/prefs.php:708
 msgid "Plugin"
 msgstr ""
 
-#: classes/pref/prefs.php:647 classes/pref/prefs.php:696
+#: classes/pref/prefs.php:660 classes/pref/prefs.php:709
 msgid "Description"
 msgstr ""
 
-#: classes/pref/prefs.php:648 classes/pref/prefs.php:697
+#: classes/pref/prefs.php:661 classes/pref/prefs.php:710
 msgid "Version"
 msgstr ""
 
-#: classes/pref/prefs.php:649 classes/pref/prefs.php:698
+#: classes/pref/prefs.php:662 classes/pref/prefs.php:711
 msgid "Author"
 msgstr ""
 
-#: classes/pref/prefs.php:682 classes/pref/prefs.php:733
+#: classes/pref/prefs.php:695 classes/pref/prefs.php:746
 msgid "Clear data"
 msgstr ""
 
-#: classes/pref/prefs.php:691
+#: classes/pref/prefs.php:704
 msgid "User plugins"
 msgstr ""
 
-#: classes/pref/prefs.php:748
+#: classes/pref/prefs.php:761
 msgid "Enable selected plugins"
 msgstr ""
 
-#: classes/pref/prefs.php:803 classes/pref/prefs.php:821
+#: classes/pref/prefs.php:816 classes/pref/prefs.php:834
 msgid "Incorrect password"
 msgstr ""
 
@@ -2326,6 +2321,10 @@ msgstr ""
 msgid "Regular version"
 msgstr ""
 
+#: plugins/close_button/init.php:24
+msgid "Close article"
+msgstr ""
+
 #: plugins/nsfw/init.php:32 plugins/nsfw/init.php:43
 msgid "Not work safe (click to toggle)"
 msgstr ""
@@ -2547,26 +2546,26 @@ msgstr ""
 msgid "Share on Google+"
 msgstr ""
 
-#: plugins/updater/init.php:294 plugins/updater/init.php:306
+#: plugins/updater/init.php:295 plugins/updater/init.php:307
 #: plugins/updater/updater.js:10
 msgid "Update Tiny Tiny RSS"
 msgstr ""
 
-#: plugins/updater/init.php:309
+#: plugins/updater/init.php:310
 msgid "Your Tiny Tiny RSS installation is up to date."
 msgstr ""
 
-#: plugins/updater/init.php:319
+#: plugins/updater/init.php:320
 msgid ""
 "Do not close this dialog until updating is finished. Backup your tt-rss "
 "directory before continuing."
 msgstr ""
 
-#: plugins/updater/init.php:322
+#: plugins/updater/init.php:323
 msgid "Ready to update."
 msgstr ""
 
-#: plugins/updater/init.php:327
+#: plugins/updater/init.php:328
 msgid "Start update"
 msgstr ""
 
@@ -2670,7 +2669,7 @@ msgstr ""
 msgid "Generate new syndication address for this feed?"
 msgstr ""
 
-#: js/functions.js:1597 js/tt-rss.js:350 js/tt-rss.js:721
+#: js/functions.js:1597 js/tt-rss.js:350 js/tt-rss.js:729
 msgid "You can't edit this kind of feed."
 msgstr ""
 
@@ -2919,11 +2918,11 @@ msgstr ""
 msgid "Rescore articles in %s?"
 msgstr ""
 
-#: js/tt-rss.js:680
+#: js/tt-rss.js:688
 msgid "Please enable mail plugin first."
 msgstr ""
 
-#: js/tt-rss.js:842
+#: js/tt-rss.js:850
 msgid "New version available!"
 msgstr ""
 
@@ -2948,7 +2947,7 @@ msgstr ""
 
 #: 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/mailto/init.js:7
+#: js/viewfeed.js:1053 js/viewfeed.js:1967 plugins/mailto/init.js:7
 #: plugins/mail/mail.js:7
 msgid "No articles are selected."
 msgstr ""
@@ -2993,27 +2992,27 @@ msgstr ""
 msgid "Mark %d article(s) as read?"
 msgstr ""
 
-#: js/viewfeed.js:1744
+#: js/viewfeed.js:1784
 msgid "Open original article"
 msgstr ""
 
-#: js/viewfeed.js:1814
+#: js/viewfeed.js:1854
 msgid "Remove label"
 msgstr ""
 
-#: js/viewfeed.js:1838
+#: js/viewfeed.js:1878
 msgid "Playing..."
 msgstr ""
 
-#: js/viewfeed.js:1839
+#: js/viewfeed.js:1879
 msgid "Click to pause"
 msgstr ""
 
-#: js/viewfeed.js:1896
+#: js/viewfeed.js:1936
 msgid "Please enter new score for selected articles:"
 msgstr ""
 
-#: js/viewfeed.js:1938
+#: js/viewfeed.js:1978
 msgid "Please enter new score for this article:"
 msgstr ""
 
diff --git a/plugins/mailto/mail.png b/plugins/mailto/mail.png
index 4d3fe7751..fcdcbd604 100644
Binary files a/plugins/mailto/mail.png and b/plugins/mailto/mail.png differ
diff --git a/plugins/updater/init.php b/plugins/updater/init.php
index 4f9ee86bd..6c31501ed 100644
--- a/plugins/updater/init.php
+++ b/plugins/updater/init.php
@@ -230,6 +230,7 @@ class Updater extends Plugin {
 					CACHE_DIR,
 					CACHE_DIR . "/export",
 					CACHE_DIR . "/images",
+					CACHE_DIR . "/js",
 					CACHE_DIR . "/simplepie",
 					ICONS_DIR,
 					LOCK_DIRECTORY);
diff --git a/tt-rss.css b/tt-rss.css
index 72e73e0d3..3661df44f 100644
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -1189,3 +1189,11 @@ ul.helpKbList h2 {
 .dijitTreeNode .loadingNode {
 	margin-left : 3px;
 }
+
+span.collapseBtn {
+	cursor : pointer;
+}
+
+div.postContent p {
+	max-width : 650px;
+}