diff --git a/messages.pot b/messages.pot
index 20b02c0d7..969fd61b4 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: 2021-03-08 19:06+0300\n"
+"POT-Creation-Date: 2021-06-18 13:34+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -94,514 +94,527 @@ msgstr ""
 msgid "Administrator"
 msgstr ""
 
-#: index.php:123 index.php:138 index.php:261 prefs.php:108
-#: classes/pref/prefs.php:875 classes/pref/prefs.php:925
-#: classes/pref/system.php:219 js/Feeds.js:401 js/Feeds.js:471
-#: js/PrefFeedTree.js:165 js/PrefFeedTree.js:172 js/PrefFeedTree.js:296
-#: js/PrefFeedTree.js:373 js/CommonDialogs.js:289 js/CommonDialogs.js:446
-#: js/CommonDialogs.js:598 js/PrefHelpers.js:27 js/PrefHelpers.js:39
-#: js/PrefHelpers.js:62 js/PrefHelpers.js:115 js/PrefHelpers.js:222
-#: js/PrefHelpers.js:273 js/PrefHelpers.js:416 js/PrefHelpers.js:427
-#: js/PrefHelpers.js:813 js/Headlines.js:344 js/PrefFilterTree.js:100
-#: js/Article.js:337 js/PrefUsers.js:112 js/CommonFilters.js:273
-#: js/CommonFilters.js:401 plugins/af_psql_trgm/init.js:7
+#: index.php:134 index.php:148 index.php:272 prefs.php:119
+#: classes/pref/prefs.php:877 classes/pref/prefs.php:927
+#: classes/pref/system.php:219 js/Feeds.js:475 js/PrefFeedTree.js:165
+#: js/PrefFeedTree.js:172 js/PrefFeedTree.js:296 js/PrefFeedTree.js:373
+#: js/CommonDialogs.js:289 js/CommonDialogs.js:446 js/CommonDialogs.js:598
+#: js/PrefHelpers.js:27 js/PrefHelpers.js:39 js/PrefHelpers.js:62
+#: js/PrefHelpers.js:115 js/PrefHelpers.js:243 js/PrefHelpers.js:294
+#: js/PrefHelpers.js:438 js/PrefHelpers.js:449 js/Headlines.js:354
+#: js/Headlines.js:539 js/PrefFilterTree.js:100 js/Article.js:290
+#: js/Article.js:352 js/PrefUsers.js:112 js/CommonFilters.js:277
+#: js/CommonFilters.js:405 plugins/af_psql_trgm/init.js:7
 #: plugins/note/note.js:28 plugins/af_readability/init.js:19
-#: plugins/share/share.js:56
+#: plugins/share/share.js:56 js/CommonFilters.js:181
 msgid "Loading, please wait..."
 msgstr ""
 
-#: index.php:152 prefs.php:118 js/App.js:460
+#: index.php:163 prefs.php:128 js/App.js:460
 msgid "Communication problem with server."
 msgstr ""
 
-#: index.php:155 prefs.php:120
+#: index.php:166 prefs.php:130
 msgid "Recent entries found in event log."
 msgstr ""
 
-#: index.php:158
+#: index.php:169
 msgid "Updates are available from Git."
 msgstr ""
 
-#: index.php:173
+#: index.php:184
 msgid "Show articles"
 msgstr ""
 
-#: index.php:176
+#: index.php:187
 msgid "Adaptive"
 msgstr ""
 
-#: index.php:177
+#: index.php:188
 msgid "All Articles"
 msgstr ""
 
-#: index.php:178 classes/rpc.php:615
+#: index.php:189 classes/rpc.php:623
 msgid "Starred"
 msgstr ""
 
-#: index.php:179 classes/rpc.php:616
+#: index.php:190 classes/rpc.php:624
 msgid "Published"
 msgstr ""
 
-#: index.php:180
+#: index.php:191
 msgid "Unread"
 msgstr ""
 
-#: index.php:181
+#: index.php:192
 msgid "With Note"
 msgstr ""
 
-#: index.php:184
+#: index.php:195
 msgid "Sort articles"
 msgstr ""
 
-#: index.php:188
+#: index.php:199
 msgid "Default"
 msgstr ""
 
-#: index.php:189
+#: index.php:200
 msgid "Newest first"
 msgstr ""
 
-#: index.php:190
+#: index.php:201
 msgid "Oldest first"
 msgstr ""
 
-#: index.php:191
+#: index.php:202
 msgid "Title"
 msgstr ""
 
-#: index.php:203 index.php:237 classes/rpc.php:603 js/FeedTree.js:89
-#: js/FeedTree.js:119
+#: index.php:214 index.php:248 classes/rpc.php:610 js/FeedTree.js:92
+#: js/FeedTree.js:122
 msgid "Mark as read"
 msgstr ""
 
-#: index.php:206
+#: index.php:217
 msgid "Older than one day"
 msgstr ""
 
-#: index.php:209
+#: index.php:220
 msgid "Older than one week"
 msgstr ""
 
-#: index.php:212
+#: index.php:223
 msgid "Older than two weeks"
 msgstr ""
 
-#: index.php:227
+#: index.php:238
 msgid "Actions..."
 msgstr ""
 
-#: index.php:230
+#: index.php:241
 msgid "Preferences..."
 msgstr ""
 
-#: index.php:231
+#: index.php:242
 msgid "Search..."
 msgstr ""
 
-#: index.php:232
+#: index.php:243
 msgid "Feed actions:"
 msgstr ""
 
-#: index.php:233 plugins/bookmarklets/init.php:38
+#: index.php:244 plugins/bookmarklets/init.php:38
 #: plugins/bookmarklets/init.php:72
 msgid "Subscribe to feed..."
 msgstr ""
 
-#: index.php:234
+#: index.php:245
 msgid "Edit this feed..."
 msgstr ""
 
-#: index.php:235 classes/pref/feeds.php:925 js/PrefFeedTree.js:99
+#: index.php:246 classes/pref/feeds.php:925 js/PrefFeedTree.js:99
 #: js/CommonDialogs.js:585
 msgid "Unsubscribe"
 msgstr ""
 
-#: index.php:236
+#: index.php:247
 msgid "All feeds:"
 msgstr ""
 
-#: index.php:238
+#: index.php:249
 msgid "(Un)hide read feeds"
 msgstr ""
 
-#: index.php:239
+#: index.php:250
 msgid "Other actions:"
 msgstr ""
 
-#: index.php:240 classes/rpc.php:589
+#: index.php:251 classes/rpc.php:596
 msgid "Toggle widescreen mode"
 msgstr ""
 
-#: index.php:241
+#: index.php:252
 msgid "Keyboard shortcuts help"
 msgstr ""
 
-#: index.php:250
+#: index.php:261
 msgid "Logout"
 msgstr ""
 
-#: prefs.php:20 prefs.php:129 classes/rpc.php:618 classes/pref/prefs.php:927
+#: prefs.php:20 prefs.php:139 classes/rpc.php:626 classes/pref/prefs.php:929
 msgid "Preferences"
 msgstr ""
 
-#: prefs.php:122
+#: prefs.php:132
 msgid "Exit preferences"
 msgstr ""
 
-#: prefs.php:132 classes/pref/prefs.php:38 classes/pref/feeds.php:127
+#: prefs.php:142 classes/pref/prefs.php:38 classes/pref/feeds.php:127
 #: classes/pref/feeds.php:914
 msgid "Feeds"
 msgstr ""
 
-#: prefs.php:136 classes/pref/filters.php:228
+#: prefs.php:146 classes/pref/filters.php:228
 msgid "Filters"
 msgstr ""
 
-#: prefs.php:140 classes/pref/labels.php:23 classes/feeds.php:1254
+#: prefs.php:150 classes/pref/labels.php:23 classes/feeds.php:1254
 msgid "Labels"
 msgstr ""
 
-#: prefs.php:145
+#: prefs.php:155
 msgid "Users"
 msgstr ""
 
-#: prefs.php:148
+#: prefs.php:158
 msgid "System"
 msgstr ""
 
-#: classes/rpc.php:560
+#: classes/rpc.php:565
 msgid "Navigation"
 msgstr ""
 
-#: classes/rpc.php:561
+#: classes/rpc.php:566
 msgid "Open next feed"
 msgstr ""
 
-#: classes/rpc.php:562
-msgid "Open previous feed"
-msgstr ""
-
-#: classes/rpc.php:563
-msgid "Open next article (in combined mode, scroll down)"
-msgstr ""
-
-#: classes/rpc.php:564
-msgid "Open previous article (in combined mode, scroll up)"
-msgstr ""
-
-#: classes/rpc.php:565
-msgid "Scroll headlines by one page down"
-msgstr ""
-
-#: classes/rpc.php:566
-msgid "Scroll headlines by one page up"
-msgstr ""
-
 #: classes/rpc.php:567
-msgid "Open next article"
+msgid "Open next unread feed"
 msgstr ""
 
 #: classes/rpc.php:568
-msgid "Open previous article"
+msgid "Open previous feed"
 msgstr ""
 
 #: classes/rpc.php:569
-msgid "Move to next article (don't expand)"
+msgid "Open previous unread feed"
 msgstr ""
 
 #: classes/rpc.php:570
-msgid "Move to previous article (don't expand)"
+msgid "Open next article (in combined mode, scroll down)"
 msgstr ""
 
 #: classes/rpc.php:571
-msgid "Show search dialog"
+msgid "Open previous article (in combined mode, scroll up)"
 msgstr ""
 
 #: classes/rpc.php:572
-msgid "Cancel active search"
+msgid "Scroll headlines by one page down"
 msgstr ""
 
 #: classes/rpc.php:573
-msgid "Article"
+msgid "Scroll headlines by one page up"
 msgstr ""
 
-#: classes/rpc.php:574 js/Headlines.js:1338 js/Headlines.js:626
-msgid "Toggle starred"
+#: classes/rpc.php:574
+msgid "Open next article"
 msgstr ""
 
-#: classes/rpc.php:575 js/Headlines.js:1350
-msgid "Toggle published"
+#: classes/rpc.php:575
+msgid "Open previous article"
 msgstr ""
 
-#: classes/rpc.php:576 js/Headlines.js:1325
-msgid "Toggle unread"
+#: classes/rpc.php:576
+msgid "Move to next article (don't expand)"
 msgstr ""
 
 #: classes/rpc.php:577
-msgid "Edit tags"
+msgid "Move to previous article (don't expand)"
 msgstr ""
 
 #: classes/rpc.php:578
-msgid "Open in new window"
+msgid "Show search dialog"
 msgstr ""
 
-#: classes/rpc.php:579 js/Headlines.js:1371
-msgid "Mark below as read"
+#: classes/rpc.php:579
+msgid "Cancel active search"
 msgstr ""
 
-#: classes/rpc.php:580 js/Headlines.js:1364
-msgid "Mark above as read"
+#: classes/rpc.php:580
+msgid "Article"
 msgstr ""
 
-#: classes/rpc.php:581
-msgid "Scroll down"
+#: classes/rpc.php:581 js/Headlines.js:1388 js/Headlines.js:658
+msgid "Toggle starred"
 msgstr ""
 
-#: classes/rpc.php:582
-msgid "Scroll up"
+#: classes/rpc.php:582 js/Headlines.js:1400
+msgid "Toggle published"
 msgstr ""
 
-#: classes/rpc.php:583
-msgid "Scroll down page"
+#: classes/rpc.php:583 js/Headlines.js:1375
+msgid "Toggle unread"
 msgstr ""
 
 #: classes/rpc.php:584
-msgid "Scroll up page"
+msgid "Edit tags"
 msgstr ""
 
 #: classes/rpc.php:585
-msgid "Select article under cursor"
+msgid "Open in new window"
 msgstr ""
 
-#: classes/rpc.php:586
-msgid "Email article"
+#: classes/rpc.php:586 js/Headlines.js:1421
+msgid "Mark below as read"
 msgstr ""
 
-#: classes/rpc.php:587
-msgid "Close/collapse article"
+#: classes/rpc.php:587 js/Headlines.js:1414
+msgid "Mark above as read"
 msgstr ""
 
 #: classes/rpc.php:588
-msgid "Toggle article expansion (combined mode)"
+msgid "Scroll down"
+msgstr ""
+
+#: classes/rpc.php:589
+msgid "Scroll up"
 msgstr ""
 
 #: classes/rpc.php:590
-msgid "Toggle full article text via Readability"
+msgid "Scroll down page"
 msgstr ""
 
 #: classes/rpc.php:591
-msgid "Article selection"
+msgid "Scroll up page"
 msgstr ""
 
 #: classes/rpc.php:592
-msgid "Select all articles"
+msgid "Select article under cursor"
 msgstr ""
 
 #: classes/rpc.php:593
-msgid "Select unread"
+msgid "Email article"
 msgstr ""
 
 #: classes/rpc.php:594
-msgid "Select starred"
+msgid "Close/collapse article"
 msgstr ""
 
 #: classes/rpc.php:595
-msgid "Select published"
-msgstr ""
-
-#: classes/rpc.php:596
-msgid "Invert selection"
+msgid "Toggle article expansion (combined mode)"
 msgstr ""
 
 #: classes/rpc.php:597
-msgid "Deselect everything"
+msgid "Toggle full article text via Readability"
 msgstr ""
 
 #: classes/rpc.php:598
-msgid "Feed"
+msgid "Article selection"
 msgstr ""
 
 #: classes/rpc.php:599
-msgid "Refresh current feed"
+msgid "Select all articles"
 msgstr ""
 
 #: classes/rpc.php:600
-msgid "Un/hide read feeds"
+msgid "Select unread"
 msgstr ""
 
-#: classes/rpc.php:601 classes/pref/feeds.php:917 js/CommonDialogs.js:19
-msgid "Subscribe to feed"
+#: classes/rpc.php:601
+msgid "Select starred"
 msgstr ""
 
-#: classes/rpc.php:602 js/PrefFeedTree.js:93 js/CommonDialogs.js:336
-#: js/Headlines.js:1494 js/FeedTree.js:96
-msgid "Edit feed"
+#: classes/rpc.php:602
+msgid "Select published"
+msgstr ""
+
+#: classes/rpc.php:603
+msgid "Invert selection"
 msgstr ""
 
 #: classes/rpc.php:604
-msgid "Reverse headlines"
+msgid "Deselect everything"
 msgstr ""
 
 #: classes/rpc.php:605
-msgid "Toggle headline grouping"
+msgid "Feed"
 msgstr ""
 
 #: classes/rpc.php:606
-msgid "Debug feed update"
+msgid "Refresh current feed"
 msgstr ""
 
 #: classes/rpc.php:607
-msgid "Debug viewfeed()"
+msgid "Un/hide read feeds"
 msgstr ""
 
-#: classes/rpc.php:608 js/FeedTree.js:144
-msgid "Mark all feeds as read"
+#: classes/rpc.php:608 classes/pref/feeds.php:917 js/CommonDialogs.js:19
+msgid "Subscribe to feed"
 msgstr ""
 
-#: classes/rpc.php:609
-msgid "Un/collapse current category"
-msgstr ""
-
-#: classes/rpc.php:610
-msgid "Toggle auto expand in combined mode"
+#: classes/rpc.php:609 js/PrefFeedTree.js:93 js/CommonDialogs.js:336
+#: js/Headlines.js:1544 js/FeedTree.js:99
+msgid "Edit feed"
 msgstr ""
 
 #: classes/rpc.php:611
-msgid "Toggle combined mode"
+msgid "Reverse headlines"
 msgstr ""
 
 #: classes/rpc.php:612
-msgid "Go to"
+msgid "Toggle headline grouping"
 msgstr ""
 
-#: classes/rpc.php:613 classes/feeds.php:1120
-msgid "All articles"
+#: classes/rpc.php:613
+msgid "Toggle grid view"
 msgstr ""
 
 #: classes/rpc.php:614
-msgid "Fresh"
+msgid "Debug feed update"
 msgstr ""
 
-#: classes/rpc.php:617 classes/feeds.php:1124
-msgid "Recently read"
+#: classes/rpc.php:615
+msgid "Debug viewfeed()"
+msgstr ""
+
+#: classes/rpc.php:616 js/FeedTree.js:155
+msgid "Mark all feeds as read"
+msgstr ""
+
+#: classes/rpc.php:617
+msgid "Un/collapse current category"
+msgstr ""
+
+#: classes/rpc.php:618
+msgid "Toggle auto expand in combined mode"
 msgstr ""
 
 #: classes/rpc.php:619
-msgid "Other"
+msgid "Toggle combined mode"
 msgstr ""
 
 #: classes/rpc.php:620
-msgid "Create label"
+msgid "Go to"
 msgstr ""
 
-#: classes/rpc.php:621 classes/pref/filters.php:659
-msgid "Create filter"
+#: classes/rpc.php:621 classes/feeds.php:1120
+msgid "All articles"
 msgstr ""
 
 #: classes/rpc.php:622
+msgid "Fresh"
+msgstr ""
+
+#: classes/rpc.php:625 classes/feeds.php:1124
+msgid "Recently read"
+msgstr ""
+
+#: classes/rpc.php:627
+msgid "Other"
+msgstr ""
+
+#: classes/rpc.php:628
+msgid "Create label"
+msgstr ""
+
+#: classes/rpc.php:629 classes/pref/filters.php:659
+msgid "Create filter"
+msgstr ""
+
+#: classes/rpc.php:630
 msgid "Un/collapse sidebar"
 msgstr ""
 
-#: classes/rpc.php:623
+#: classes/rpc.php:631
 msgid "Show help dialog"
 msgstr ""
 
-#: classes/rpc.php:754
+#: classes/rpc.php:766
 msgid "Shift"
 msgstr ""
 
-#: classes/rpc.php:757
+#: classes/rpc.php:769
 msgid "Ctrl"
 msgstr ""
 
-#: classes/rpc.php:782 plugins/af_psql_trgm/init.php:112
-#: plugins/share/init.php:270 js/PrefHelpers.js:469 js/Feeds.js:271
-#: js/CommonDialogs.js:273 js/PrefHelpers.js:66 js/PrefHelpers.js:794
+#: classes/rpc.php:794 plugins/af_psql_trgm/init.php:112
+#: plugins/share/init.php:274 js/PrefHelpers.js:491 js/Feeds.js:272
+#: js/CommonDialogs.js:273 js/PrefHelpers.js:66 js/PrefHelpers.js:814
+#: js/CommonFilters.js:101
 msgid "Close this window"
 msgstr ""
 
-#: classes/handler/public.php:273 classes/pref/prefs.php:1393
-#: include/login_form.php:134
+#: classes/handler/public.php:277 classes/pref/prefs.php:1424
+#: include/login_form.php:132
 msgid "Default profile"
 msgstr ""
 
-#: classes/handler/public.php:396
+#: classes/handler/public.php:389
 msgid "Incorrect username or password"
 msgstr ""
 
-#: classes/handler/public.php:448
+#: classes/handler/public.php:441
 msgid "Password recovery"
 msgstr ""
 
-#: classes/handler/public.php:488 classes/handler/public.php:518
-#: classes/handler/public.php:591 classes/handler/public.php:714
-#: classes/handler/public.php:721 classes/handler/public.php:744
+#: classes/handler/public.php:478 classes/handler/public.php:508
+#: classes/handler/public.php:568 classes/handler/public.php:685
+#: classes/handler/public.php:692 classes/handler/public.php:715
 #: plugins/bookmarklets/init.php:91 plugins/bookmarklets/init.php:136
 #: plugins/bookmarklets/init.php:154 plugins/bookmarklets/init.php:159
 msgid "Return to Tiny Tiny RSS"
 msgstr ""
 
-#: classes/handler/public.php:491
+#: classes/handler/public.php:481
 msgid ""
 "You will need to provide valid account name and email. Password reset link "
 "will be sent to your email address."
 msgstr ""
 
-#: classes/handler/public.php:498 classes/pref/feeds.php:641
-#: plugins/bookmarklets/init.php:302 include/login_form.php:105
+#: classes/handler/public.php:488 classes/pref/feeds.php:641
+#: plugins/bookmarklets/init.php:302 include/login_form.php:103
 #: js/CommonDialogs.js:543 js/PrefUsers.js:64
 msgid "Login:"
 msgstr ""
 
-#: classes/handler/public.php:503
+#: classes/handler/public.php:493
 msgid "Email:"
 msgstr ""
 
-#: classes/handler/public.php:511
+#: classes/handler/public.php:501
 #, php-format
 msgid "How much is %d + %d:"
 msgstr ""
 
-#: classes/handler/public.php:517 classes/pref/users.php:240
+#: classes/handler/public.php:507 classes/pref/users.php:240
 msgid "Reset password"
 msgstr ""
 
-#: classes/handler/public.php:529
+#: classes/handler/public.php:518
 msgid "Some of the required form parameters are missing or incorrect."
 msgstr ""
 
-#: classes/handler/public.php:533 classes/handler/public.php:598
+#: classes/handler/public.php:522 classes/handler/public.php:574
 msgid "Go back"
 msgstr ""
 
-#: classes/handler/public.php:574
+#: classes/handler/public.php:560
 msgid "[tt-rss] Password reset request"
 msgstr ""
 
-#: classes/handler/public.php:594
+#: classes/handler/public.php:570
 msgid "Sorry, login and email combination not found."
 msgstr ""
 
-#: classes/handler/public.php:617
+#: classes/handler/public.php:590
 msgid "Your access level is insufficient to run this script."
 msgstr ""
 
-#: classes/handler/public.php:681
+#: classes/handler/public.php:652
 msgid "Database Updater"
 msgstr ""
 
-#: classes/handler/public.php:694
+#: classes/handler/public.php:665
 #, php-format
 msgid "Performing updates to version %d"
 msgstr ""
 
-#: classes/handler/public.php:709 classes/handler/public.php:736
-#: js/PrefHelpers.js:389 js/PrefHelpers.js:737
+#: classes/handler/public.php:680 classes/handler/public.php:707
+#: js/PrefHelpers.js:411 js/PrefHelpers.js:757
 msgid "Update"
 msgstr ""
 
-#: classes/handler/public.php:729
+#: classes/handler/public.php:700
 #, php-format
 msgid "Database schema needs update to the latest version (%d to %d)."
 msgstr ""
@@ -611,10 +624,10 @@ msgstr ""
 msgid "Created label <b>%s</b>"
 msgstr ""
 
-#: classes/pref/labels.php:180 classes/pref/prefs.php:834
-#: classes/pref/prefs.php:1424 classes/pref/filters.php:649
+#: classes/pref/labels.php:180 classes/pref/prefs.php:836
+#: classes/pref/prefs.php:1463 classes/pref/filters.php:649
 #: classes/pref/users.php:222 classes/pref/feeds.php:904
-#: js/CommonFilters.js:436 js/CommonFilters.js:469 js/CommonDialogs.js:236
+#: js/CommonFilters.js:440 js/CommonFilters.js:473 js/CommonDialogs.js:236
 msgid "Select"
 msgstr ""
 
@@ -626,372 +639,380 @@ msgstr ""
 msgid "Articles"
 msgstr ""
 
-#: classes/pref/prefs.php:64
+#: classes/pref/prefs.php:65
 msgid "Digest"
 msgstr ""
 
-#: classes/pref/prefs.php:69
+#: classes/pref/prefs.php:70
 msgid "Advanced"
 msgstr ""
 
-#: classes/pref/prefs.php:80
+#: classes/pref/prefs.php:81
 msgid "Debugging"
 msgstr ""
 
-#: classes/pref/prefs.php:86
+#: classes/pref/prefs.php:87
 msgid "Never apply these tags automatically (comma-separated list)."
 msgstr ""
 
-#: classes/pref/prefs.php:90
+#: classes/pref/prefs.php:91
 msgid "Blacklisted tags"
 msgstr ""
 
-#: classes/pref/prefs.php:91
+#: classes/pref/prefs.php:92
 msgid "Default language"
 msgstr ""
 
-#: classes/pref/prefs.php:91
+#: classes/pref/prefs.php:92
 msgid "Used for full-text search"
 msgstr ""
 
-#: classes/pref/prefs.php:92
+#: classes/pref/prefs.php:93
 msgid "Mark read on scroll"
 msgstr ""
 
-#: classes/pref/prefs.php:92
+#: classes/pref/prefs.php:93
 msgid "Mark articles as read as you scroll past them"
 msgstr ""
 
-#: classes/pref/prefs.php:93
+#: classes/pref/prefs.php:94
 msgid "Always expand articles"
 msgstr ""
 
-#: classes/pref/prefs.php:94
+#: classes/pref/prefs.php:95
 msgid "Combined mode"
 msgstr ""
 
-#: classes/pref/prefs.php:94
+#: classes/pref/prefs.php:95
 msgid "Show flat list of articles instead of separate panels"
 msgstr ""
 
-#: classes/pref/prefs.php:95
+#: classes/pref/prefs.php:96
 msgid "Confirm marking feeds as read"
 msgstr ""
 
-#: classes/pref/prefs.php:96
+#: classes/pref/prefs.php:97
 msgid "Default update interval"
 msgstr ""
 
-#: classes/pref/prefs.php:97
+#: classes/pref/prefs.php:98
 msgid "Mark sent articles as read"
 msgstr ""
 
-#: classes/pref/prefs.php:98
+#: classes/pref/prefs.php:99
 msgid "Enable digest"
 msgstr ""
 
-#: classes/pref/prefs.php:98
+#: classes/pref/prefs.php:99
 msgid "Send daily digest of new (and unread) headlines to your e-mail address"
 msgstr ""
 
-#: classes/pref/prefs.php:99
+#: classes/pref/prefs.php:100
 msgid "Try to send around this time"
 msgstr ""
 
-#: classes/pref/prefs.php:99
+#: classes/pref/prefs.php:100
 msgid "Time in UTC"
 msgstr ""
 
-#: classes/pref/prefs.php:100
+#: classes/pref/prefs.php:101
 msgid "Enable API"
 msgstr ""
 
-#: classes/pref/prefs.php:100
+#: classes/pref/prefs.php:101
 msgid "Allows accessing this account through the API"
 msgstr ""
 
-#: classes/pref/prefs.php:101
+#: classes/pref/prefs.php:102
 msgid "Enable categories"
 msgstr ""
 
-#: classes/pref/prefs.php:102
+#: classes/pref/prefs.php:103
 msgid "Maximum age of fresh articles"
 msgstr ""
 
-#: classes/pref/prefs.php:102
+#: classes/pref/prefs.php:103
 msgid "hours"
 msgstr ""
 
-#: classes/pref/prefs.php:103
+#: classes/pref/prefs.php:104
 msgid "Hide read feeds"
 msgstr ""
 
-#: classes/pref/prefs.php:104
+#: classes/pref/prefs.php:105
 msgid "Always show special feeds"
 msgstr ""
 
-#: classes/pref/prefs.php:104
+#: classes/pref/prefs.php:105
 msgid "While hiding read feeds"
 msgstr ""
 
-#: classes/pref/prefs.php:105
+#: classes/pref/prefs.php:106
 msgid "Long date format"
 msgstr ""
 
-#: classes/pref/prefs.php:105
+#: classes/pref/prefs.php:106
 msgid ""
 "Syntax is identical to PHP <a href='http://php.net/manual/function.date."
 "php'>date()</a> function."
 msgstr ""
 
-#: classes/pref/prefs.php:106
+#: classes/pref/prefs.php:107
 msgid "Automatically show next feed"
 msgstr ""
 
-#: classes/pref/prefs.php:106
+#: classes/pref/prefs.php:107
 msgid "After marking one as read"
 msgstr ""
 
-#: classes/pref/prefs.php:107
+#: classes/pref/prefs.php:108
 msgid "Purge articles older than"
 msgstr ""
 
-#: classes/pref/prefs.php:107
+#: classes/pref/prefs.php:108
 msgid "<strong>days</strong> (0 disables)"
 msgstr ""
 
-#: classes/pref/prefs.php:108
+#: classes/pref/prefs.php:109
 msgid "Purge unread articles"
 msgstr ""
 
-#: classes/pref/prefs.php:109
+#: classes/pref/prefs.php:110
 msgid "Short date format"
 msgstr ""
 
-#: classes/pref/prefs.php:110
+#: classes/pref/prefs.php:111
 msgid "Show content preview in headlines"
 msgstr ""
 
-#: classes/pref/prefs.php:111
+#: classes/pref/prefs.php:112
 msgid "SSL client certificate"
 msgstr ""
 
-#: classes/pref/prefs.php:112 classes/pref/feeds.php:588
+#: classes/pref/prefs.php:113 classes/pref/feeds.php:588
 #: js/CommonDialogs.js:462
 msgid "Do not embed media"
 msgstr ""
 
-#: classes/pref/prefs.php:113
+#: classes/pref/prefs.php:114
 msgid "Time zone"
 msgstr ""
 
-#: classes/pref/prefs.php:114
+#: classes/pref/prefs.php:115
 msgid "Group by feed"
 msgstr ""
 
-#: classes/pref/prefs.php:114
+#: classes/pref/prefs.php:115
 msgid "Group multiple-feed output by originating feed"
 msgstr ""
 
-#: classes/pref/prefs.php:115
+#: classes/pref/prefs.php:116
 msgid "Language"
 msgstr ""
 
-#: classes/pref/prefs.php:116
+#: classes/pref/prefs.php:117
 msgid "Theme"
 msgstr ""
 
-#: classes/pref/prefs.php:117
+#: classes/pref/prefs.php:118
 msgid "Don't enforce DISTINCT headlines"
 msgstr ""
 
-#: classes/pref/prefs.php:117
+#: classes/pref/prefs.php:118
 msgid "May produce duplicate entries"
 msgstr ""
 
-#: classes/pref/prefs.php:118
+#: classes/pref/prefs.php:119
 msgid "Show article and feed IDs"
 msgstr ""
 
-#: classes/pref/prefs.php:118
+#: classes/pref/prefs.php:119
 msgid "In the headlines buffer"
 msgstr ""
 
-#: classes/pref/prefs.php:119
+#: classes/pref/prefs.php:120
 msgid "Disable conditional counter updates"
 msgstr ""
 
-#: classes/pref/prefs.php:119
+#: classes/pref/prefs.php:120
 msgid "May increase server load"
 msgstr ""
 
-#: classes/pref/prefs.php:220
+#: classes/pref/prefs.php:121
+msgid "Grid view"
+msgstr ""
+
+#: classes/pref/prefs.php:121
+msgid "On wider screens, if always expanded"
+msgstr ""
+
+#: classes/pref/prefs.php:222
 msgid "The configuration was saved."
 msgstr ""
 
-#: classes/pref/prefs.php:262
+#: classes/pref/prefs.php:264
 msgid "Your personal data has been saved."
 msgstr ""
 
-#: classes/pref/prefs.php:292
+#: classes/pref/prefs.php:294
 msgid "Full name:"
 msgstr ""
 
-#: classes/pref/prefs.php:297 js/PrefUsers.js:98
+#: classes/pref/prefs.php:299 js/PrefUsers.js:98
 msgid "E-mail:"
 msgstr ""
 
-#: classes/pref/prefs.php:305 classes/pref/feeds.php:670
+#: classes/pref/prefs.php:307 classes/pref/feeds.php:670
 #: plugins/af_psql_trgm/init.php:193 plugins/note/init.php:51
-#: plugins/af_readability/init.php:91 plugins/nsfw/init.php:101
-#: plugins/af_redditimgur/init.php:100 js/CommonDialogs.js:586
-#: js/CommonFilters.js:232 js/CommonFilters.js:316 js/CommonFilters.js:516
-#: js/PrefLabelTree.js:170 js/PrefUsers.js:119
+#: plugins/af_readability/init.php:91 plugins/nsfw/init.php:98
+#: plugins/af_redditimgur/init.php:101 js/CommonDialogs.js:586
+#: js/CommonFilters.js:236 js/CommonFilters.js:320 js/CommonFilters.js:520
+#: js/PrefLabelTree.js:170 js/Article.js:358 js/PrefUsers.js:119
 msgid "Save"
 msgstr ""
 
-#: classes/pref/prefs.php:356
+#: classes/pref/prefs.php:358
 msgid "Old password:"
 msgstr ""
 
-#: classes/pref/prefs.php:361 js/PrefUsers.js:84
+#: classes/pref/prefs.php:363 js/PrefUsers.js:84
 msgid "New password:"
 msgstr ""
 
-#: classes/pref/prefs.php:366
+#: classes/pref/prefs.php:368
 msgid "Confirm password:"
 msgstr ""
 
-#: classes/pref/prefs.php:374
+#: classes/pref/prefs.php:376
 msgid "Change password"
 msgstr ""
 
-#: classes/pref/prefs.php:381
+#: classes/pref/prefs.php:383
 #, php-format
 msgid ""
 "Authentication module used for this session (<b>%s</b>) does not provide an "
 "ability to set passwords."
 msgstr ""
 
-#: classes/pref/prefs.php:398
+#: classes/pref/prefs.php:400
 msgid "Generate password"
 msgstr ""
 
-#: classes/pref/prefs.php:404 classes/pref/feeds.php:938
+#: classes/pref/prefs.php:406 classes/pref/feeds.php:938 js/PrefHelpers.js:227
 msgid "Remove selected"
 msgstr ""
 
-#: classes/pref/prefs.php:440 classes/pref/prefs.php:492
+#: classes/pref/prefs.php:442 classes/pref/prefs.php:494
 msgid "Your password:"
 msgstr ""
 
-#: classes/pref/prefs.php:448
+#: classes/pref/prefs.php:450
 msgid "Disable OTP"
 msgstr ""
 
-#: classes/pref/prefs.php:470
-msgid "OTP Key:"
+#: classes/pref/prefs.php:472
+msgid "OTP secret:"
 msgstr ""
 
-#: classes/pref/prefs.php:497
-msgid "One time password:"
+#: classes/pref/prefs.php:499
+msgid "Verification code:"
 msgstr ""
 
-#: classes/pref/prefs.php:505
+#: classes/pref/prefs.php:507
 msgid "Enable OTP"
 msgstr ""
 
-#: classes/pref/prefs.php:519
+#: classes/pref/prefs.php:521
 msgid "Personal data"
 msgstr ""
 
-#: classes/pref/prefs.php:522
+#: classes/pref/prefs.php:524
 msgid "Password"
 msgstr ""
 
-#: classes/pref/prefs.php:525
+#: classes/pref/prefs.php:527
 msgid "App passwords"
 msgstr ""
 
-#: classes/pref/prefs.php:528
+#: classes/pref/prefs.php:530
 msgid "Authenticator (OTP)"
 msgstr ""
 
-#: classes/pref/prefs.php:539
+#: classes/pref/prefs.php:541
 msgid "Some preferences are only available in default profile."
 msgstr ""
 
-#: classes/pref/prefs.php:628
+#: classes/pref/prefs.php:630
 msgid "default"
 msgstr ""
 
-#: classes/pref/prefs.php:636
+#: classes/pref/prefs.php:638
 msgid "Customize"
 msgstr ""
 
-#: classes/pref/prefs.php:638
+#: classes/pref/prefs.php:640
 msgid "More themes..."
 msgstr ""
 
-#: classes/pref/prefs.php:669
+#: classes/pref/prefs.php:671
 msgid "Preview"
 msgstr ""
 
-#: classes/pref/prefs.php:695
+#: classes/pref/prefs.php:697
 msgid "Register"
 msgstr ""
 
-#: classes/pref/prefs.php:699 classes/pref/system.php:101
+#: classes/pref/prefs.php:701 classes/pref/system.php:101
 msgid "Clear"
 msgstr ""
 
-#: classes/pref/prefs.php:703 classes/pref/prefs.php:869
+#: classes/pref/prefs.php:705 classes/pref/prefs.php:871
 #: plugins/bookmarklets/init.php:364 js/CommonDialogs.js:641
 msgid "More info..."
 msgstr ""
 
-#: classes/pref/prefs.php:711
+#: classes/pref/prefs.php:713
 #, php-format
 msgid "Current server time: %s"
 msgstr ""
 
-#: classes/pref/prefs.php:759
+#: classes/pref/prefs.php:761
 msgid "Save configuration"
 msgstr ""
 
-#: classes/pref/prefs.php:762
+#: classes/pref/prefs.php:764
 msgid "Save and exit"
 msgstr ""
 
-#: classes/pref/prefs.php:769 js/PrefHelpers.js:127
+#: classes/pref/prefs.php:771 js/PrefHelpers.js:127
 msgid "Manage profiles"
 msgstr ""
 
-#: classes/pref/prefs.php:774
+#: classes/pref/prefs.php:776
 msgid "Reset to defaults"
 msgstr ""
 
-#: classes/pref/prefs.php:829 classes/pref/filters.php:645
-#: classes/pref/users.php:217 classes/pref/feeds.php:900 js/Feeds.js:626
-#: js/Feeds.js:621
+#: classes/pref/prefs.php:831 classes/pref/filters.php:645
+#: classes/pref/users.php:217 classes/pref/feeds.php:900 js/Feeds.js:644
+#: js/Feeds.js:639
 msgid "Search"
 msgstr ""
 
-#: classes/pref/prefs.php:837 classes/pref/prefs.php:1427
+#: classes/pref/prefs.php:839 classes/pref/prefs.php:1466
 #: classes/pref/filters.php:652 classes/pref/users.php:225
-#: classes/pref/feeds.php:907 js/CommonFilters.js:440 js/CommonFilters.js:472
-#: js/PrefFeedTree.js:506 js/PrefHelpers.js:169 js/Headlines.js:620
+#: classes/pref/feeds.php:907 js/CommonFilters.js:444 js/CommonFilters.js:476
+#: js/PrefFeedTree.js:506 js/PrefHelpers.js:187 js/Headlines.js:652
 msgid "All"
 msgstr ""
 
-#: classes/pref/prefs.php:839 classes/pref/prefs.php:1429
+#: classes/pref/prefs.php:841 classes/pref/prefs.php:1468
 #: classes/pref/filters.php:654 classes/pref/users.php:227
-#: classes/pref/feeds.php:909 js/CommonFilters.js:442 js/CommonFilters.js:474
+#: classes/pref/feeds.php:909 js/CommonFilters.js:446 js/CommonFilters.js:478
 #: js/CommonDialogs.js:241
 msgid "None"
 msgstr ""
 
-#: classes/pref/prefs.php:867
+#: classes/pref/prefs.php:869
 #, php-format
 msgid ""
 "The following plugins use per-feed content hooks. This may cause excessive "
@@ -999,65 +1020,65 @@ msgid ""
 "%s</b>"
 msgstr ""
 
-#: classes/pref/prefs.php:883 js/CommonFilters.js:230
+#: classes/pref/prefs.php:885 js/CommonFilters.js:234
 msgid "More info"
 msgstr ""
 
-#: classes/pref/prefs.php:886
+#: classes/pref/prefs.php:888
 msgid "Enable selected"
 msgstr ""
 
-#: classes/pref/prefs.php:889
+#: classes/pref/prefs.php:891
 msgid "Reload"
 msgstr ""
 
-#: classes/pref/prefs.php:896
+#: classes/pref/prefs.php:898
 msgid "Check for updates"
 msgstr ""
 
-#: classes/pref/prefs.php:903
+#: classes/pref/prefs.php:905
 msgid "Install plugin"
 msgstr ""
 
-#: classes/pref/prefs.php:916
+#: classes/pref/prefs.php:918
 msgid "Personal data / Authentication"
 msgstr ""
 
-#: classes/pref/prefs.php:930 classes/pref/feeds.php:1078
+#: classes/pref/prefs.php:932 classes/pref/feeds.php:1067
 msgid "Plugins"
 msgstr ""
 
-#: classes/pref/prefs.php:963
+#: classes/pref/prefs.php:965
 msgid "Incorrect one time password"
 msgstr ""
 
-#: classes/pref/prefs.php:966 classes/pref/prefs.php:1004
+#: classes/pref/prefs.php:968 classes/pref/prefs.php:1006
 msgid "Incorrect password"
 msgstr ""
 
-#: classes/pref/prefs.php:1019
+#: classes/pref/prefs.php:1021
 #, php-format
 msgid "v%.2f, by %s"
 msgstr ""
 
-#: classes/pref/prefs.php:1032
+#: classes/pref/prefs.php:1034
 #, php-format
 msgid "v%s, by %s"
 msgstr ""
 
-#: classes/pref/prefs.php:1438
+#: classes/pref/prefs.php:1477
 msgid "Description"
 msgstr ""
 
-#: classes/pref/prefs.php:1439
+#: classes/pref/prefs.php:1478
 msgid "Created"
 msgstr ""
 
-#: classes/pref/prefs.php:1440
+#: classes/pref/prefs.php:1479
 msgid "Last used"
 msgstr ""
 
-#: classes/pref/prefs.php:1485
+#: classes/pref/prefs.php:1524
 #, php-format
 msgid ""
 "Generated password <strong>%s</strong> for %s. Please remember it for future "
@@ -1068,7 +1089,7 @@ msgstr ""
 msgid "Test message from tt-rss"
 msgstr ""
 
-#: classes/pref/system.php:82 js/PrefHelpers.js:595
+#: classes/pref/system.php:82 js/PrefHelpers.js:615
 msgid "Refresh"
 msgstr ""
 
@@ -1161,7 +1182,7 @@ msgid "Reset sort order"
 msgstr ""
 
 #: classes/pref/filters.php:665 classes/pref/users.php:236
-#: js/CommonDialogs.js:578 js/CommonFilters.js:514
+#: js/CommonDialogs.js:578 js/CommonFilters.js:518
 msgid "Remove"
 msgstr ""
 
@@ -1296,7 +1317,7 @@ msgstr ""
 msgid "Place in category:"
 msgstr ""
 
-#: classes/pref/feeds.php:613 js/Feeds.js:608 js/CommonDialogs.js:516
+#: classes/pref/feeds.php:613 js/Feeds.js:626 js/CommonDialogs.js:516
 msgid "Language:"
 msgstr ""
 
@@ -1314,7 +1335,7 @@ msgid "Authentication"
 msgstr ""
 
 #: classes/pref/feeds.php:647 plugins/bookmarklets/init.php:309
-#: include/login_form.php:114 js/CommonDialogs.js:549
+#: include/login_form.php:112 js/CommonDialogs.js:549
 msgid "Password:"
 msgstr ""
 
@@ -1324,9 +1345,9 @@ msgstr ""
 
 #: classes/pref/feeds.php:671 plugins/note/init.php:52
 #: plugins/bookmarklets/init.php:282 js/CommonDialogs.js:587
-#: js/CommonFilters.js:233 js/CommonFilters.js:317 js/CommonFilters.js:517
-#: js/CommonFilters.js:521 js/Feeds.js:622 js/PrefFeedTree.js:454
-#: js/PrefHelpers.js:211 js/PrefHelpers.js:285 js/Article.js:346
+#: js/CommonFilters.js:237 js/CommonFilters.js:321 js/CommonFilters.js:521
+#: js/CommonFilters.js:525 js/Feeds.js:640 js/PrefFeedTree.js:454
+#: js/PrefHelpers.js:232 js/PrefHelpers.js:306
 msgid "Cancel"
 msgstr ""
 
@@ -1370,31 +1391,23 @@ msgstr ""
 msgid "Include tt-rss settings"
 msgstr ""
 
-#: classes/pref/feeds.php:1017
-msgid "Published OPML"
-msgstr ""
-
-#: classes/pref/feeds.php:1023
-msgid "Display published OPML URL"
-msgstr ""
-
-#: classes/pref/feeds.php:1038
+#: classes/pref/feeds.php:1027
 msgid "Display URL"
 msgstr ""
 
-#: classes/pref/feeds.php:1043
+#: classes/pref/feeds.php:1032
 msgid "Clear all generated URLs"
 msgstr ""
 
-#: classes/pref/feeds.php:1055
+#: classes/pref/feeds.php:1044
 msgid "My feeds"
 msgstr ""
 
-#: classes/pref/feeds.php:1060
+#: classes/pref/feeds.php:1049
 msgid "OPML"
 msgstr ""
 
-#: classes/pref/feeds.php:1065
+#: classes/pref/feeds.php:1054
 msgid "Sharing"
 msgstr ""
 
@@ -1471,7 +1484,7 @@ msgstr ""
 msgid "Error while parsing document."
 msgstr ""
 
-#: classes/config.php:219
+#: classes/config.php:335
 #, php-format
 msgid "Git error [RC=%d]: %s"
 msgstr ""
@@ -1565,18 +1578,22 @@ msgid "%d min"
 msgstr ""
 
 #: plugins/auth_internal/init.php:112
-msgid "Please enter your one time password:"
+msgid "Please enter verification code (OTP):"
 msgstr ""
 
 #: plugins/auth_internal/init.php:114
 msgid "Continue"
 msgstr ""
 
-#: plugins/auth_internal/init.php:221
+#: plugins/auth_internal/init.php:166
+msgid "Too many authentication attempts, throttled."
+msgstr ""
+
+#: plugins/auth_internal/init.php:247
 msgid "Password has been changed."
 msgstr ""
 
-#: plugins/auth_internal/init.php:223
+#: plugins/auth_internal/init.php:249
 msgid "Old password is incorrect."
 msgstr ""
 
@@ -1738,7 +1755,7 @@ msgstr ""
 msgid "Shared article will appear in the Published feed."
 msgstr ""
 
-#: plugins/bookmarklets/init.php:322 include/login_form.php:179
+#: plugins/bookmarklets/init.php:322 include/login_form.php:177
 msgid "Log in"
 msgstr ""
 
@@ -1773,48 +1790,48 @@ msgstr ""
 msgid "The following comics are currently supported:"
 msgstr ""
 
-#: plugins/nsfw/init.php:44
-msgid "Not work safe (click to toggle)"
+#: plugins/nsfw/init.php:39
+msgid "Not safe for work (click to toggle)"
 msgstr ""
 
-#: plugins/nsfw/init.php:76
+#: plugins/nsfw/init.php:73
 msgid "NSFW Plugin"
 msgstr ""
 
-#: plugins/nsfw/init.php:91
+#: plugins/nsfw/init.php:88
 msgid "Tags to consider NSFW (comma-separated):"
 msgstr ""
 
-#: plugins/nsfw/init.php:113
+#: plugins/nsfw/init.php:110
 msgid "Configuration saved."
 msgstr ""
 
-#: plugins/af_redditimgur/init.php:44
+#: plugins/af_redditimgur/init.php:45
 msgid "Reddit content settings (af_redditimgur)"
 msgstr ""
 
-#: plugins/af_redditimgur/init.php:62
+#: plugins/af_redditimgur/init.php:63
 msgid "Apply tags to NSFW posts (comma-separated list):"
 msgstr ""
 
-#: plugins/af_redditimgur/init.php:71
+#: plugins/af_redditimgur/init.php:72
 msgid "Extract missing content using Readability (requires af_readability)"
 msgstr ""
 
-#: plugins/af_redditimgur/init.php:78
+#: plugins/af_redditimgur/init.php:79
 msgid "Enable additional duplicate checking"
 msgstr ""
 
-#: plugins/af_redditimgur/init.php:85
+#: plugins/af_redditimgur/init.php:86
 #, php-format
 msgid "Rewrite Reddit URLs to %s"
 msgstr ""
 
-#: plugins/af_redditimgur/init.php:93
+#: plugins/af_redditimgur/init.php:94
 msgid "Import score, limit maximum to:"
 msgstr ""
 
-#: plugins/af_redditimgur/init.php:124
+#: plugins/af_redditimgur/init.php:125
 msgid "Configuration saved"
 msgstr ""
 
@@ -1838,47 +1855,47 @@ msgstr ""
 msgid "Share by URL"
 msgstr ""
 
-#: plugins/share/init.php:251
+#: plugins/share/init.php:255
 msgid "You can share this article by the following unique URL:"
 msgstr ""
 
-#: plugins/share/init.php:263
+#: plugins/share/init.php:267
 msgid "Article not found."
 msgstr ""
 
-#: plugins/share/init.php:268
+#: plugins/share/init.php:272
 msgid "Unshare article"
 msgstr ""
 
-#: plugins/share/init.php:269 js/CommonDialogs.js:644 js/PrefHelpers.js:852
+#: plugins/share/init.php:273 js/CommonDialogs.js:644
 msgid "Generate new URL"
 msgstr ""
 
-#: include/login_form.php:126
+#: include/login_form.php:124
 msgid "I forgot my password"
 msgstr ""
 
-#: include/login_form.php:131
+#: include/login_form.php:129
 msgid "Profile:"
 msgstr ""
 
-#: include/login_form.php:144
+#: include/login_form.php:142
 msgid "Use less traffic"
 msgstr ""
 
-#: include/login_form.php:148
+#: include/login_form.php:146
 msgid "Does not display images in articles, reduces automatic refreshes."
 msgstr ""
 
-#: include/login_form.php:156 js/Feeds.js:281
+#: include/login_form.php:154 js/Feeds.js:282
 msgid "Safe mode"
 msgstr ""
 
-#: include/login_form.php:161
+#: include/login_form.php:159
 msgid "Uses default theme and prevents all plugins from loading."
 msgstr ""
 
-#: include/login_form.php:169
+#: include/login_form.php:167
 msgid "Remember me"
 msgstr ""
 
@@ -1894,54 +1911,54 @@ msgstr ""
 msgid "Detect automatically"
 msgstr ""
 
-#: js/Feeds.js:261
+#: js/Feeds.js:262
 msgid "Your password is at default value"
 msgstr ""
 
-#: js/Feeds.js:263
+#: js/Feeds.js:264
 msgid ""
 "You are using default tt-rss password. Please change it in the Preferences "
 "(Personal data / Authentication)."
 msgstr ""
 
-#: js/Feeds.js:422
+#: js/Feeds.js:426
 msgid "Mark all articles as read?"
 msgstr ""
 
-#: js/Feeds.js:426
+#: js/Feeds.js:430
 msgid "Marking all feeds as read..."
 msgstr ""
 
-#: js/Feeds.js:443
+#: js/Feeds.js:447
 msgid "Mark %w in %s older than 1 day as read?"
 msgstr ""
 
-#: js/Feeds.js:446
+#: js/Feeds.js:450
 msgid "Mark %w in %s older than 1 week as read?"
 msgstr ""
 
-#: js/Feeds.js:449
+#: js/Feeds.js:453
 msgid "Mark %w in %s older than 2 weeks as read?"
 msgstr ""
 
-#: js/Feeds.js:452
+#: js/Feeds.js:456
 msgid "Mark %w in %s as read?"
 msgstr ""
 
-#: js/Feeds.js:455
+#: js/Feeds.js:459
 msgid "search results"
 msgstr ""
 
-#: js/Feeds.js:455
+#: js/Feeds.js:459
 msgid "all articles"
 msgstr ""
 
-#: js/Feeds.js:496
+#: js/Feeds.js:500
 #, javascript-format
 msgid "Mark all articles in %s as read?"
 msgstr ""
 
-#: js/Feeds.js:617
+#: js/Feeds.js:635
 msgid "Search syntax"
 msgstr ""
 
@@ -1989,53 +2006,53 @@ msgstr ""
 msgid "Update daemon is not updating feeds."
 msgstr ""
 
-#: js/App.js:569
+#: js/App.js:572
 msgid ""
 "URL scheme reported by your browser (%a) doesn't match server-configured "
 "SELF_URL_PATH (%b), check X-Forwarded-Proto."
 msgstr ""
 
-#: js/App.js:576
+#: js/App.js:579
 msgid "Fatal error"
 msgstr ""
 
-#: js/App.js:601
+#: js/App.js:604
 msgid "Unhandled exception"
 msgstr ""
 
-#: js/App.js:829
+#: js/App.js:833
 msgid "Updates for Tiny Tiny RSS are available."
 msgstr ""
 
-#: js/App.js:832
+#: js/App.js:836
 msgid "Updates for some local plugins are available."
 msgstr ""
 
-#: js/App.js:1042
+#: js/App.js:1065
 msgid "Please enable mail or mailto plugin first."
 msgstr ""
 
-#: js/App.js:1093 js/App.js:1221 js/CommonDialogs.js:328
+#: js/App.js:1116 js/App.js:1253 js/CommonDialogs.js:328
 msgid "You can't edit this kind of feed."
 msgstr ""
 
-#: js/App.js:1159
+#: js/App.js:1188
 msgid "Please enable af_readability first."
 msgstr ""
 
-#: js/App.js:1172 js/App.js:1262
+#: js/App.js:1201 js/App.js:1294
 msgid "Widescreen is not available in combined mode."
 msgstr ""
 
-#: js/App.js:1230
+#: js/App.js:1262
 msgid "Please select some feed first."
 msgstr ""
 
-#: js/App.js:1235
+#: js/App.js:1267
 msgid "You can't unsubscribe from the category."
 msgstr ""
 
-#: js/App.js:1241 js/CommonDialogs.js:302 js/CommonDialogs.js:343
+#: js/App.js:1273 js/CommonDialogs.js:302 js/CommonDialogs.js:343
 #, javascript-format
 msgid "Unsubscribe from %s?"
 msgstr ""
@@ -2092,7 +2109,7 @@ msgid "Save changes to selected feeds?"
 msgstr ""
 
 #: js/PrefFeedTree.js:344 js/CommonDialogs.js:430 js/PrefUsers.js:42
-#: js/CommonFilters.js:391
+#: js/CommonFilters.js:395
 msgid "Saving data..."
 msgstr ""
 
@@ -2219,11 +2236,11 @@ msgstr ""
 msgid "Generate new syndication address for this feed?"
 msgstr ""
 
-#: js/CommonDialogs.js:607 js/PrefHelpers.js:821
+#: js/CommonDialogs.js:607
 msgid "Trying to change address..."
 msgstr ""
 
-#: js/CommonDialogs.js:625 js/PrefHelpers.js:835
+#: js/CommonDialogs.js:625
 msgid "Could not change feed URL."
 msgstr ""
 
@@ -2256,280 +2273,280 @@ msgid "Clear event log?"
 msgstr ""
 
 #: js/PrefHelpers.js:135
+msgid "Name for cloned profile:"
+msgstr ""
+
+#: js/PrefHelpers.js:145
+msgid "Please select a single profile to clone."
+msgstr ""
+
+#: js/PrefHelpers.js:153
 msgid ""
 "Remove selected profiles? Active and default profiles will not be removed."
 msgstr ""
 
-#: js/PrefHelpers.js:136
+#: js/PrefHelpers.js:154
 msgid "Removing selected profiles..."
 msgstr ""
 
-#: js/PrefHelpers.js:145
+#: js/PrefHelpers.js:163
 msgid "No profiles selected."
 msgstr ""
 
-#: js/PrefHelpers.js:150
+#: js/PrefHelpers.js:168
 msgid "Creating profile..."
 msgstr ""
 
-#: js/PrefHelpers.js:200
+#: js/PrefHelpers.js:218
 msgid "(active)"
 msgstr ""
 
-#: js/PrefHelpers.js:221
+#: js/PrefHelpers.js:219
+msgid "(empty)"
+msgstr ""
+
+#: js/PrefHelpers.js:242
 msgid "Activate selected profile?"
 msgstr ""
 
-#: js/PrefHelpers.js:230
+#: js/PrefHelpers.js:251
 msgid "Please choose a profile to activate."
 msgstr ""
 
-#: js/PrefHelpers.js:243
+#: js/PrefHelpers.js:264
 msgid "Customize stylesheet"
 msgstr ""
 
-#: js/PrefHelpers.js:259
+#: js/PrefHelpers.js:280
 msgid ""
 "You can override colors, fonts and layout of your currently selected theme "
 "with custom CSS declarations here."
 msgstr ""
 
-#: js/PrefHelpers.js:268
+#: js/PrefHelpers.js:289
 msgid ""
 "User CSS has been applied, you might need to reload the page to see all "
 "changes."
 msgstr ""
 
-#: js/PrefHelpers.js:308
+#: js/PrefHelpers.js:329
 msgid "Reset to defaults?"
 msgstr ""
 
-#: js/PrefHelpers.js:393
+#: js/PrefHelpers.js:415
 msgid "Clear data"
 msgstr ""
 
-#: js/PrefHelpers.js:396
+#: js/PrefHelpers.js:418
 msgid "Uninstall"
 msgstr ""
 
-#: js/PrefHelpers.js:408 js/PrefHelpers.js:569
+#: js/PrefHelpers.js:430 js/PrefHelpers.js:589
 msgid "Could not find any plugins for this search query."
 msgstr ""
 
-#: js/PrefHelpers.js:415
+#: js/PrefHelpers.js:437
 #, javascript-format
 msgid "Clear stored data for %s?"
 msgstr ""
 
-#: js/PrefHelpers.js:424
+#: js/PrefHelpers.js:446
 #, javascript-format
 msgid "Uninstall plugin %s?"
 msgstr ""
 
-#: js/PrefHelpers.js:433
+#: js/PrefHelpers.js:455
 msgid "Plugin uninstallation failed."
 msgstr ""
 
-#: js/PrefHelpers.js:449
+#: js/PrefHelpers.js:471
 msgid "Available plugins"
 msgstr ""
 
-#: js/PrefHelpers.js:462
+#: js/PrefHelpers.js:484
 msgid "Plugin installer"
 msgstr ""
 
-#: js/PrefHelpers.js:465
+#: js/PrefHelpers.js:487
 #, javascript-format
 msgid "Installing %s, please wait..."
 msgstr ""
 
-#: js/PrefHelpers.js:480 js/PrefHelpers.js:524 js/PrefHelpers.js:635
+#: js/PrefHelpers.js:502 js/PrefHelpers.js:544 js/PrefHelpers.js:655
 msgid "Operation failed: check event log."
 msgstr ""
 
-#: js/PrefHelpers.js:484
+#: js/PrefHelpers.js:506
 msgid "Plugin has been installed."
 msgstr ""
 
-#: js/PrefHelpers.js:488
+#: js/PrefHelpers.js:510
 msgid "Plugin is already installed."
 msgstr ""
 
-#: js/PrefHelpers.js:498 js/PrefHelpers.js:652 js/PrefHelpers.js:718
+#: js/PrefHelpers.js:520 js/PrefHelpers.js:672 js/PrefHelpers.js:738
 #, javascript-format
 msgid "Exited with RC: %d"
 msgstr ""
 
-#: js/PrefHelpers.js:549
+#: js/PrefHelpers.js:569
 msgid "Already installed"
 msgstr ""
 
-#: js/PrefHelpers.js:560
+#: js/PrefHelpers.js:580
 msgid "Updated: %s"
 msgstr ""
 
-#: js/PrefHelpers.js:577
+#: js/PrefHelpers.js:597
 msgid "Looking for plugins..."
 msgstr ""
 
-#: js/PrefHelpers.js:596 js/PrefHelpers.js:738
+#: js/PrefHelpers.js:616 js/PrefHelpers.js:758
 msgid "Close"
 msgstr ""
 
-#: js/PrefHelpers.js:614
+#: js/PrefHelpers.js:634
 msgid "Update plugins"
 msgstr ""
 
-#: js/PrefHelpers.js:629
+#: js/PrefHelpers.js:649
 msgid "Updating, please wait..."
 msgstr ""
 
-#: js/PrefHelpers.js:653
+#: js/PrefHelpers.js:673
 msgid "Update done."
 msgstr ""
 
-#: js/PrefHelpers.js:677
+#: js/PrefHelpers.js:697
 msgid "No updates available"
 msgstr ""
 
-#: js/PrefHelpers.js:689
+#: js/PrefHelpers.js:709
 #, javascript-format
 msgid "Checking: %s"
 msgstr ""
 
-#: js/PrefHelpers.js:696
+#: js/PrefHelpers.js:716
 #, javascript-format
 msgid "%s: Operation failed: check event log."
 msgstr ""
 
-#: js/PrefHelpers.js:719
+#: js/PrefHelpers.js:739
 msgid "Ready to update"
 msgstr ""
 
-#: js/PrefHelpers.js:764
+#: js/PrefHelpers.js:784
 msgid "Please choose an OPML file first."
 msgstr ""
 
-#: js/PrefHelpers.js:767
+#: js/PrefHelpers.js:787
 msgid "Importing, please wait..."
 msgstr ""
 
-#: js/PrefHelpers.js:776
+#: js/PrefHelpers.js:796
 msgid "OPML Import"
 msgstr ""
 
-#: js/PrefHelpers.js:787
+#: js/PrefHelpers.js:807
 msgid ""
 "If you have imported labels and/or filters, you might need to reload "
 "preferences to see your new data."
 msgstr ""
 
-#: js/PrefHelpers.js:818
-msgid "Public OPML URL"
-msgstr ""
-
-#: js/PrefHelpers.js:820
-msgid "Replace current OPML publishing address with a new one?"
-msgstr ""
-
-#: js/PrefHelpers.js:843
-msgid "Your Public OPML URL is:"
-msgstr ""
-
-#: js/Headlines.js:610
+#: js/Headlines.js:642
 msgid "Cancel search"
 msgstr ""
 
-#: js/Headlines.js:618
+#: js/Headlines.js:650
 msgid "Select..."
 msgstr ""
 
-#: js/Headlines.js:725 js/Headlines.js:776 js/Headlines.js:793
+#: js/Headlines.js:764 js/Headlines.js:818 js/Headlines.js:835
 msgid "Click to open next unread feed."
 msgstr ""
 
-#: js/Headlines.js:790
+#: js/Headlines.js:832
 msgid "New articles found, reload feed to continue."
 msgstr ""
 
-#: js/Headlines.js:839 js/Headlines.js:865 js/Headlines.js:877
-#: js/Headlines.js:1020 js/Headlines.js:1037 js/Headlines.js:1054
-#: js/Headlines.js:1191 js/Article.js:62
+#: js/Headlines.js:889 js/Headlines.js:915 js/Headlines.js:927
+#: js/Headlines.js:1070 js/Headlines.js:1087 js/Headlines.js:1104
+#: js/Headlines.js:1241 js/Article.js:62
 msgid "No articles selected."
 msgstr ""
 
-#: js/Headlines.js:991
+#: js/Headlines.js:1041
 #, javascript-format
 msgid "%d article selected"
 msgid_plural "%d articles selected"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/Headlines.js:1062
+#: js/Headlines.js:1112
 #, javascript-format
 msgid "Delete %d selected article in %s?"
 msgid_plural "Delete %d selected articles in %s?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/Headlines.js:1064
+#: js/Headlines.js:1114
 #, javascript-format
 msgid "Delete %d selected article?"
 msgid_plural "Delete %d selected articles?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/Headlines.js:1197
+#: js/Headlines.js:1247
 #, javascript-format
 msgid "Mark %d selected article in %s as read?"
 msgid_plural "Mark %d selected articles in %s as read?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/Headlines.js:1213
+#: js/Headlines.js:1263
 msgid "No article is selected."
 msgstr ""
 
-#: js/Headlines.js:1248
+#: js/Headlines.js:1298
 msgid "No articles found to mark"
 msgstr ""
 
-#: js/Headlines.js:1250
+#: js/Headlines.js:1300
 #, javascript-format
 msgid "Mark %d article as read?"
 msgid_plural "Mark %d articles as read?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/Headlines.js:1309
+#: js/Headlines.js:1359
 msgid "Open original article"
 msgstr ""
 
-#: js/Headlines.js:1316
+#: js/Headlines.js:1366
 msgid "Display article URL"
 msgstr ""
 
-#: js/Headlines.js:1423
+#: js/Headlines.js:1473
 msgid "Assign label"
 msgstr ""
 
-#: js/Headlines.js:1428
+#: js/Headlines.js:1478
 msgid "Remove label"
 msgstr ""
 
-#: js/Headlines.js:1465
+#: js/Headlines.js:1515
 msgid "Select articles in group"
 msgstr ""
 
-#: js/Headlines.js:1475
+#: js/Headlines.js:1525
 msgid "Mark group as read"
 msgstr ""
 
-#: js/Headlines.js:1487
+#: js/Headlines.js:1537
 msgid "Mark feed as read"
 msgstr ""
 
-#: js/PrefFilterTree.js:47 js/CommonFilters.js:220
+#: js/PrefFilterTree.js:47 js/CommonFilters.js:224
 msgid "in"
 msgstr ""
 
@@ -2565,45 +2582,45 @@ msgstr ""
 msgid "Please enter new score for this article:"
 msgstr ""
 
-#: js/Article.js:120
+#: js/Article.js:130
 msgid "Article URL:"
 msgstr ""
 
-#: js/Article.js:122
+#: js/Article.js:132
 msgid "No URL could be displayed for this article."
 msgstr ""
 
-#: js/Article.js:144
+#: js/Article.js:154
 msgid "no tags"
 msgstr ""
 
-#: js/Article.js:236
+#: js/Article.js:246
 msgid "comments"
 msgstr ""
 
-#: js/Article.js:239
+#: js/Article.js:249
 msgid "comment"
 msgid_plural "comments"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/Article.js:325
+#: js/Article.js:340
 msgid "Article tags"
 msgstr ""
 
-#: js/Article.js:332
+#: js/Article.js:347
 msgid "Tags for this article (separated by commas):"
 msgstr ""
 
-#: js/Article.js:352
+#: js/Article.js:367
 msgid "Saving article tags..."
 msgstr ""
 
-#: js/FeedTree.js:102
+#: js/FeedTree.js:105
 msgid "Debug feed"
 msgstr ""
 
-#: js/FeedTree.js:125
+#: js/FeedTree.js:128
 msgid "(Un)collapse"
 msgstr ""
 
@@ -2653,65 +2670,72 @@ msgstr ""
 msgid "Create new filter"
 msgstr ""
 
-#: js/CommonFilters.js:41
+#: js/CommonFilters.js:44
 #, javascript-format
 msgid "Looking for articles (%d processed, %f found)..."
 msgstr ""
 
-#: js/CommonFilters.js:70
-#, javascript-format
+#: js/CommonFilters.js:72
+msgid "Articles matching this filter:"
+msgstr ""
+
+#: js/CommonFilters.js:74
 msgid "Found %d articles matching this filter:"
 msgstr ""
 
-#: js/CommonFilters.js:79
+#: js/CommonFilters.js:83
 msgid "Error while trying to get filter test results."
 msgstr ""
 
-#: js/CommonFilters.js:170
+#: js/CommonFilters.js:95
+msgid "Looking for articles..."
+msgstr ""
+
+#: js/CommonFilters.js:174
 msgid "Edit rule"
 msgstr ""
 
-#: js/CommonFilters.js:170
+#: js/CommonFilters.js:174
 msgid "Add rule"
 msgstr ""
 
-#: js/CommonFilters.js:214
+#: js/CommonFilters.js:218
 msgid "Inverse regular expression matching"
 msgstr ""
 
-#: js/CommonFilters.js:218
+#: js/CommonFilters.js:222
 msgid "on"
 msgstr ""
 
-#: js/CommonFilters.js:246
+#: js/CommonFilters.js:250
 msgid "Edit action"
 msgstr ""
 
-#: js/CommonFilters.js:246
+#: js/CommonFilters.js:250
 msgid "Add action"
 msgstr ""
 
-#: js/CommonFilters.js:356
+#: js/CommonFilters.js:360
 msgid "Remove filter?"
 msgstr ""
 
-#: js/CommonFilters.js:361
+#: js/CommonFilters.js:365
 msgid "Removing filter..."
 msgstr ""
 
-#: js/CommonFilters.js:446 js/CommonFilters.js:478
+#: js/CommonFilters.js:450 js/CommonFilters.js:482 js/PrefHelpers.js:195
 msgid "Add"
 msgstr ""
 
-#: js/CommonFilters.js:449 js/CommonFilters.js:481
+#: js/CommonFilters.js:453 js/CommonFilters.js:485
 msgid "Delete"
 msgstr ""
 
-#: js/CommonFilters.js:515 js/CommonFilters.js:519
+#: js/CommonFilters.js:519 js/CommonFilters.js:523
 msgid "Test"
 msgstr ""
 
-#: js/CommonFilters.js:520
+#: js/CommonFilters.js:524
 msgid "Create"
 msgstr ""
 
@@ -2727,8 +2751,8 @@ msgstr ""
 msgid "Unable to fetch full text for this article"
 msgstr ""
 
-#: plugins/shorten_expanded/init.js:41
-msgid "Click to expand article"
+#: plugins/shorten_expanded/init.js:32
+msgid "Expand article"
 msgstr ""
 
 #: plugins/share/share.js:7
@@ -2755,17 +2779,17 @@ msgstr ""
 msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr ""
 
-#: js/Feeds.js:283
+#: js/Feeds.js:284
 msgid ""
 "Tiny Tiny RSS is running in safe mode. All themes and plugins are disabled. "
 "You will need to log out and back in to disable it."
 msgstr ""
 
-#: js/Feeds.js:610
+#: js/Feeds.js:628
 msgid "Used for word stemming"
 msgstr ""
 
-#: js/App.js:609
+#: js/App.js:612
 msgid "Stack trace"
 msgstr ""
 
@@ -2789,56 +2813,52 @@ msgstr ""
 msgid "Site URL:"
 msgstr ""
 
-#: js/PrefHelpers.js:177
-msgid "Create profile"
+#: js/PrefHelpers.js:229
+msgid "Clone"
 msgstr ""
 
-#: js/PrefHelpers.js:208
-msgid "Remove selected profiles"
+#: js/PrefHelpers.js:231
+msgid "Activate"
 msgstr ""
 
-#: js/PrefHelpers.js:210
-msgid "Activate profile"
-msgstr ""
-
-#: js/PrefHelpers.js:278
+#: js/PrefHelpers.js:299
 msgid "Apply"
 msgstr ""
 
-#: js/PrefHelpers.js:331
+#: js/PrefHelpers.js:352
 msgid "Selected plugins have been enabled. Reload?"
 msgstr ""
 
-#: js/PrefHelpers.js:660
+#: js/PrefHelpers.js:680
 msgid "Updates complete"
 msgstr ""
 
-#: js/PrefHelpers.js:674
+#: js/PrefHelpers.js:694
 #, javascript-format
 msgid "Updates pending for %d plugin"
 msgid_plural "Updates pending for %d plugins"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/Headlines.js:622
+#: js/Headlines.js:654
 msgid "Invert"
 msgstr ""
 
-#: js/Headlines.js:630
+#: js/Headlines.js:662
 msgid "Set score"
 msgstr ""
 
-#: js/Headlines.js:635
+#: js/Headlines.js:667
 msgid "Delete permanently"
 msgstr ""
 
-#: js/Headlines.js:809
+#: js/Headlines.js:855
 msgid ""
 "Could not update headlines (invalid object received - see error console for "
 "details)"
 msgstr ""
 
-#: js/Article.js:197
+#: js/Article.js:207
 msgid "Attachments"
 msgstr ""
 
@@ -2846,6 +2866,6 @@ msgstr ""
 msgid "Access level: "
 msgstr ""
 
-#: js/CommonFilters.js:67
+#: js/CommonFilters.js:70
 msgid "No recent articles matching this filter have been found."
 msgstr ""