rebase translations

53 files changed, 35605 insertions, 36221 deletions

diff --git a/locale/ar_SA/LC_MESSAGES/messages.mo b/locale/ar_SA/LC_MESSAGES/messages.mo
index 3bd067221..02efd94ed 100755
--- a/locale/ar_SA/LC_MESSAGES/messages.mo
+++ b/locale/ar_SA/LC_MESSAGES/messages.mo
diff --git a/locale/ar_SA/LC_MESSAGES/messages.po b/locale/ar_SA/LC_MESSAGES/messages.po
index 8266ecde9..f7fa12a7a 100755
--- a/locale/ar_SA/LC_MESSAGES/messages.po
+++ b/locale/ar_SA/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: TinyTinyRSS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 15:25+0300\n"
+"POT-Creation-Date: 2017-07-04 16:29+0300\n"
 "PO-Revision-Date: 2014-08-13 19:15+0300\n"
 "Last-Translator: عبد الناصر سعيد الثبيتي <[email protected]>\n"
 "Language-Team: Arabic <[email protected]>\n"
@@ -173,31 +173,30 @@ msgstr "مستخدم غير موجود"
 #: prefs.php:118
 #: classes/backend.php:5
 #: classes/pref/labels.php:282
-#: classes/pref/feeds.php:1402
-#: classes/pref/filters.php:779
+#: classes/pref/filters.php:819
+#: classes/pref/feeds.php:1376
 #: js/feedlist.js:149
-#: js/functions.js:1131
-#: js/functions.js:1231
-#: js/functions.js:1478
+#: js/functions.js:1210
+#: js/functions.js:1457
 #: js/prefs.js:621
-#: js/prefs.js:818
-#: js/prefs.js:1648
-#: js/prefs.js:1663
-#: js/tt-rss.js:550
-#: js/viewfeed.js:1182
+#: js/prefs.js:813
+#: js/prefs.js:1644
+#: js/prefs.js:1659
+#: js/tt-rss.js:551
+#: js/viewfeed.js:1184
 #: plugins/import_export/import_export.js:17
 #: js/feedlist.js:467
-#: js/feedlist.js:512
+#: js/feedlist.js:515
 #: js/functions.js:372
 #: js/functions.js:630
-#: js/prefs.js:1360
-#: js/prefs.js:1413
-#: js/prefs.js:1452
-#: js/prefs.js:1465
-#: js/prefs.js:1476
-#: js/prefs.js:1491
-#: js/tt-rss.js:567
-#: js/viewfeed.js:762
+#: js/prefs.js:1356
+#: js/prefs.js:1409
+#: js/prefs.js:1448
+#: js/prefs.js:1461
+#: js/prefs.js:1472
+#: js/prefs.js:1487
+#: js/tt-rss.js:568
+#: js/viewfeed.js:764
 msgid "Loading, please wait..."
 msgstr "التحميل جارٍ.  فضلاً انتظر..."
 
@@ -214,13 +213,13 @@ msgid "All Articles"
 msgstr "كل البنود"
 
 #: index.php:192
-#: include/functions2.php:107
+#: include/functions.php:1181
 #: classes/feeds.php:110
 msgid "Starred"
 msgstr "معلَّم بنجمة"
 
 #: index.php:193
-#: include/functions2.php:108
+#: include/functions.php:1182
 #: classes/feeds.php:111
 msgid "Published"
 msgstr "منشور"
@@ -261,7 +260,7 @@ msgstr "العنوان"
 
 #: index.php:209
 #: index.php:249
-#: include/functions2.php:95
+#: include/functions.php:1169
 #: classes/feeds.php:115
 #: js/FeedTree.js:138
 #: js/FeedTree.js:166
@@ -301,7 +300,7 @@ msgid "Feed actions:"
 msgstr "إجراءات الخلاصة:"
 
 #: index.php:244
-#: classes/handler/public.php:672
+#: classes/handler/public.php:583
 msgid "Subscribe to feed..."
 msgstr "إشترك في الخلاصة..."
 
@@ -315,8 +314,8 @@ msgstr "إعادة حساب نقاط الخلاصة"
 
 #: index.php:247
 #: classes/pref/feeds.php:785
-#: classes/pref/feeds.php:1357
-#: js/PrefFeedTree.js:78
+#: classes/pref/feeds.php:1331
+#: js/PrefFeedTree.js:80
 msgid "Unsubscribe"
 msgstr "إلغاء الاشتراك"
 
@@ -333,7 +332,7 @@ msgid "Other actions:"
 msgstr "إجراءات أخرى:"
 
 #: index.php:252
-#: include/functions2.php:81
+#: include/functions.php:1155
 msgid "Toggle widescreen mode"
 msgstr "بدِّل وضع الشاشة العريضة"
 
@@ -359,7 +358,7 @@ msgstr ""
 
 #: prefs.php:33
 #: prefs.php:136
-#: include/functions2.php:110
+#: include/functions.php:1184
 #: classes/pref/prefs.php:435
 msgid "Preferences"
 msgstr "خيارات"
@@ -374,20 +373,19 @@ msgstr "أخرج من الخيارات"
 
 #: prefs.php:139
 #: classes/pref/feeds.php:112
-#: classes/pref/feeds.php:1297
-#: classes/pref/feeds.php:1346
+#: classes/pref/feeds.php:1271
+#: classes/pref/feeds.php:1320
 msgid "Feeds"
 msgstr "الخلاصات"
 
 #: prefs.php:142
-#: classes/pref/filters.php:248
+#: classes/pref/filters.php:273
 msgid "Filters"
 msgstr "المرشِّحات"
 
 #: prefs.php:145
-#: include/functions.php:1327
-#: include/functions.php:1979
 #: classes/pref/labels.php:90
+#: classes/feeds.php:1718
 msgid "Labels"
 msgstr "الأسماء"
 
@@ -416,13 +414,13 @@ msgstr "عطَّل المسؤول إنشاء حسابات مستخدمين جد�
 #: register.php:337
 #: register.php:347
 #: register.php:359
-#: classes/handler/public.php:742
-#: classes/handler/public.php:813
-#: classes/handler/public.php:911
-#: classes/handler/public.php:990
-#: classes/handler/public.php:1004
-#: classes/handler/public.php:1011
-#: classes/handler/public.php:1036
+#: classes/handler/public.php:653
+#: classes/handler/public.php:724
+#: classes/handler/public.php:822
+#: classes/handler/public.php:901
+#: classes/handler/public.php:915
+#: classes/handler/public.php:922
+#: classes/handler/public.php:947
 msgid "Return to Tiny Tiny RSS"
 msgstr "عُد إلى Tiny Tiny RSS"
 
@@ -439,12 +437,12 @@ msgid "Check availability"
 msgstr "تحقق من التوفُّر"
 
 #: register.php:229
-#: classes/handler/public.php:829
+#: classes/handler/public.php:740
 msgid "Email:"
 msgstr "بريد إلكتروني:"
 
 #: register.php:232
-#: classes/handler/public.php:834
+#: classes/handler/public.php:745
 msgid "How much is two plus two:"
 msgstr "كم حاصل إثنان زائد إثنان:"
 
@@ -472,17 +470,23 @@ msgstr "نجح إنشاء الحساب."
 msgid "New user registrations are currently closed."
 msgstr "تسجيل المستخدمين الجدد مقفل حالياً."
 
-#: update.php:67
+#: update.php:66
 msgid "Tiny Tiny RSS data update script."
 msgstr "برنامج تحديث بيانات Tiny Tiny RSS"
 
-#: include/digest.php:109
-#: include/functions.php:1336
-#: include/functions.php:1880
-#: include/functions.php:1965
-#: include/functions.php:1987
-#: classes/opml.php:421
+#: include/controls.php:83
+#: classes/pref/filters.php:242
+#: classes/pref/filters.php:253
+#: classes/pref/filters.php:544
+msgid "All feeds"
+msgstr "كل الخلاصات"
+
+#: include/controls.php:134
+#: include/controls.php:316
 #: classes/pref/feeds.php:228
+#: classes/opml.php:486
+#: classes/feeds.php:1727
+#: classes/digest.php:113
 msgid "Uncategorized"
 msgstr "غير مصنَّفة"
 
@@ -497,391 +501,287 @@ msgstr[1] "%d بنود محفوظة"
 msgid "No feeds found."
 msgstr "لم أجد خلاصة."
 
-#: include/functions.php:1029
+#: include/functions.php:900
 #, php-format
 msgid "%d min"
 msgstr ""
 
-#: include/functions.php:1325
-#: include/functions.php:1977
-msgid "Special"
-msgstr "خاص"
-
-#: include/functions.php:1828
-#: classes/pref/filters.php:229
-#: classes/pref/filters.php:507
-msgid "All feeds"
-msgstr "كل الخلاصات"
-
-#: include/functions.php:2032
-msgid "Starred articles"
-msgstr "البنود بنجمة"
-
-#: include/functions.php:2034
-msgid "Published articles"
-msgstr "البنود المنشورة"
-
-#: include/functions.php:2036
-msgid "Fresh articles"
-msgstr "البنود الطازجة"
-
-#: include/functions.php:2038
-#: include/functions2.php:105
-msgid "All articles"
-msgstr "كل البنود"
-
-#: include/functions.php:2040
-msgid "Archived articles"
-msgstr "البنود المحفوظة"
-
-#: include/functions.php:2042
-msgid "Recently read"
-msgstr "قُرِأَت حديثاً"
-
-#: include/functions2.php:57
+#: include/functions.php:1131
 msgid "Navigation"
 msgstr "التنقُّل"
 
-#: include/functions2.php:58
+#: include/functions.php:1132
 msgid "Open next feed"
 msgstr "إفتح الخلاصة التالية"
 
-#: include/functions2.php:59
+#: include/functions.php:1133
 msgid "Open previous feed"
 msgstr "إفتح الخلاصة السابقة"
 
-#: include/functions2.php:60
+#: include/functions.php:1134
 msgid "Open next article"
 msgstr "إفتح البند التالي"
 
-#: include/functions2.php:61
+#: include/functions.php:1135
 msgid "Open previous article"
 msgstr "إفتح البند السابق"
 
-#: include/functions2.php:62
+#: include/functions.php:1136
 msgid "Open next article (don't scroll long articles)"
 msgstr "إفتح البند التالي (لاتمرِّر البنود الطويلة)"
 
-#: include/functions2.php:63
+#: include/functions.php:1137
 msgid "Open previous article (don't scroll long articles)"
 msgstr "إفتح البند السابق (لاتمرِّر البنود الطويلة)"
 
-#: include/functions2.php:64
+#: include/functions.php:1138
 msgid "Move to next article (don't expand or mark read)"
 msgstr "إنتقل للبند التالي (لاتوسِّعه أو تعلمه مقروءاً)"
 
-#: include/functions2.php:65
+#: include/functions.php:1139
 msgid "Move to previous article (don't expand or mark read)"
 msgstr "إنتقل للبند السابق (لاتوسِّعه أو تعلمه مقروءاً)"
 
-#: include/functions2.php:66
+#: include/functions.php:1140
 msgid "Show search dialog"
 msgstr "إعرض مربَّع البحث"
 
-#: include/functions2.php:67
+#: include/functions.php:1141
 msgid "Article"
 msgstr "بَنْد"
 
-#: include/functions2.php:68
-#: js/viewfeed.js:1699
+#: include/functions.php:1142
+#: js/viewfeed.js:1701
 msgid "Toggle starred"
 msgstr "إقلب المعلَّم بنجمة"
 
-#: include/functions2.php:69
-#: js/viewfeed.js:1711
+#: include/functions.php:1143
+#: js/viewfeed.js:1713
 msgid "Toggle published"
 msgstr "إقلب المنشور"
 
-#: include/functions2.php:70
-#: js/viewfeed.js:1686
+#: include/functions.php:1144
+#: js/viewfeed.js:1688
 msgid "Toggle unread"
 msgstr "إقلب غير المقروء"
 
-#: include/functions2.php:71
+#: include/functions.php:1145
 msgid "Edit tags"
 msgstr "حرِّر العلامات"
 
-#: include/functions2.php:72
+#: include/functions.php:1146
 msgid "Open in new window"
 msgstr "فتح في نافذة جديدة"
 
-#: include/functions2.php:73
-#: js/viewfeed.js:1732
+#: include/functions.php:1147
+#: js/viewfeed.js:1734
 msgid "Mark below as read"
 msgstr "علِّم أسفله مقروءاً"
 
-#: include/functions2.php:74
-#: js/viewfeed.js:1725
+#: include/functions.php:1148
+#: js/viewfeed.js:1727
 msgid "Mark above as read"
 msgstr "علِّم أعلاه مقروءاً"
 
-#: include/functions2.php:75
+#: include/functions.php:1149
 msgid "Scroll down"
 msgstr "تمرير نازل"
 
-#: include/functions2.php:76
+#: include/functions.php:1150
 msgid "Scroll up"
 msgstr "تمرير طالع"
 
-#: include/functions2.php:77
+#: include/functions.php:1151
 msgid "Select article under cursor"
 msgstr "إختر البند تحت المؤشِّر"
 
-#: include/functions2.php:78
+#: include/functions.php:1152
 msgid "Email article"
 msgstr "أرسل البند بالبريد"
 
-#: include/functions2.php:79
+#: include/functions.php:1153
 msgid "Close/collapse article"
 msgstr "أغلق/إطوِ البند"
 
-#: include/functions2.php:80
+#: include/functions.php:1154
 msgid "Toggle article expansion (combined mode)"
 msgstr "بدّل توسيع البند (وضع المجموع)"
 
-#: include/functions2.php:82
+#: include/functions.php:1156
 #: plugins/embed_original/init.php:31
 msgid "Toggle embed original"
 msgstr "بدِّل تضمين الأصل"
 
-#: include/functions2.php:83
+#: include/functions.php:1157
 msgid "Article selection"
 msgstr "إختيار البند"
 
-#: include/functions2.php:84
+#: include/functions.php:1158
 msgid "Select all articles"
 msgstr "إختر كل البنود"
 
-#: include/functions2.php:85
+#: include/functions.php:1159
 msgid "Select unread"
 msgstr "إختر غير المقروء"
 
-#: include/functions2.php:86
+#: include/functions.php:1160
 msgid "Select starred"
 msgstr "إختر المعلَّم بنجمة"
 
-#: include/functions2.php:87
+#: include/functions.php:1161
 msgid "Select published"
 msgstr "إختر المنشور"
 
-#: include/functions2.php:88
+#: include/functions.php:1162
 msgid "Invert selection"
 msgstr "إعكس الاختيار"
 
-#: include/functions2.php:89
+#: include/functions.php:1163
 msgid "Deselect everything"
 msgstr "ألغ اختيار الكل"
 
-#: include/functions2.php:90
+#: include/functions.php:1164
 #: classes/pref/feeds.php:555
-#: classes/pref/feeds.php:823
+#: classes/pref/feeds.php:811
 msgid "Feed"
 msgstr "الخلاصة"
 
-#: include/functions2.php:91
+#: include/functions.php:1165
 msgid "Refresh current feed"
 msgstr "تحديث الخلاصة الحاليَّة"
 
-#: include/functions2.php:92
+#: include/functions.php:1166
 msgid "Un/hide read feeds"
 msgstr "إعرض/أخفِ الخلاصات المقروءة"
 
-#: include/functions2.php:93
-#: classes/pref/feeds.php:1349
+#: include/functions.php:1167
+#: classes/pref/feeds.php:1323
 msgid "Subscribe to feed"
 msgstr "إشترك في خلاصة"
 
-#: include/functions2.php:94
+#: include/functions.php:1168
 #: js/FeedTree.js:145
-#: js/PrefFeedTree.js:72
-#: js/viewfeed.js:1853
+#: js/PrefFeedTree.js:74
+#: js/viewfeed.js:1855
 msgid "Edit feed"
 msgstr "حرِّر خلاصة"
 
-#: include/functions2.php:96
+#: include/functions.php:1170
 msgid "Reverse headlines"
 msgstr "إقلب العناوين"
 
-#: include/functions2.php:97
+#: include/functions.php:1171
 msgid "Toggle headline grouping"
 msgstr ""
 
-#: include/functions2.php:98
+#: include/functions.php:1172
 msgid "Debug feed update"
 msgstr "تصحيح أخطاء تحديث الخلاصة"
 
-#: include/functions2.php:99
+#: include/functions.php:1173
 #, fuzzy
 msgid "Debug viewfeed()"
 msgstr "تصحيح أخطاء تحديث الخلاصة"
 
-#: include/functions2.php:100
+#: include/functions.php:1174
 #: js/FeedTree.js:194
 msgid "Mark all feeds as read"
 msgstr "علِّم كل الخلاصات مقروءة"
 
-#: include/functions2.php:101
+#: include/functions.php:1175
 msgid "Un/collapse current category"
 msgstr "طيّ/بسط التصنيف الحالي"
 
-#: include/functions2.php:102
+#: include/functions.php:1176
 msgid "Toggle combined mode"
 msgstr "تبديل وضع التجميع"
 
-#: include/functions2.php:103
+#: include/functions.php:1177
 msgid "Toggle auto expand in combined mode"
 msgstr "إقلب حالة التوسيع التلقائي في وضع التجميع"
 
-#: include/functions2.php:104
+#: include/functions.php:1178
 msgid "Go to"
 msgstr "إذهب إلى"
 
-#: include/functions2.php:106
+#: include/functions.php:1179
+#: classes/feeds.php:1602
+msgid "All articles"
+msgstr "كل البنود"
+
+#: include/functions.php:1180
 msgid "Fresh"
 msgstr "طازج"
 
-#: include/functions2.php:109
-#: js/tt-rss.js:494
-#: js/tt-rss.js:663
+#: include/functions.php:1183
+#: js/tt-rss.js:495
+#: js/tt-rss.js:664
 msgid "Tag cloud"
 msgstr "سحابة العلامات"
 
-#: include/functions2.php:111
+#: include/functions.php:1185
 msgid "Other"
 msgstr "أخرى"
 
-#: include/functions2.php:112
+#: include/functions.php:1186
 #: classes/pref/labels.php:267
 msgid "Create label"
 msgstr "أنشئ تسمية"
 
-#: include/functions2.php:113
-#: classes/pref/filters.php:753
+#: include/functions.php:1187
+#: classes/pref/filters.php:793
 msgid "Create filter"
 msgstr "أنشئ مرشِّح"
 
-#: include/functions2.php:114
+#: include/functions.php:1188
 msgid "Un/collapse sidebar"
 msgstr "طيّ/بَسْط الشريط الجانبي"
 
-#: include/functions2.php:115
+#: include/functions.php:1189
 msgid "Show help dialog"
 msgstr "إعرض نافذة المساعدة"
 
-#: include/functions2.php:670
-#, php-format
-msgid "Search results: %s"
-msgstr "نتائج البحث: %s"
-
-#: include/functions2.php:1336
-#: classes/feeds.php:752
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] "تعليق"
-msgstr[1] "تعليقات"
-
-#: include/functions2.php:1340
-#: classes/feeds.php:756
-msgid "comments"
-msgstr "تعليقات"
-
-#: include/functions2.php:1366
-msgid " - "
-msgstr " - "
-
-#: include/functions2.php:1397
-#: include/functions2.php:1648
-#: classes/article.php:311
-msgid "no tags"
-msgstr "لا علامات"
-
-#: include/functions2.php:1407
-#: classes/feeds.php:738
-msgid "Edit tags for this article"
-msgstr "حرِّر علامات هذا البند"
-
-#: include/functions2.php:1439
-#: classes/feeds.php:690
-msgid "Originally from:"
-msgstr "أصله من:"
-
-#: include/functions2.php:1452
-#: classes/pref/feeds.php:574
-#: classes/feeds.php:703
-msgid "Feed URL"
-msgstr "عنوان URL للخلاصة"
-
-#: include/functions2.php:1489
-#: classes/backend.php:105
-#: classes/dlg.php:37
-#: classes/dlg.php:60
-#: classes/dlg.php:93
-#: classes/dlg.php:159
-#: classes/dlg.php:186
-#: classes/pref/feeds.php:1652
-#: classes/pref/feeds.php:1718
-#: classes/pref/filters.php:204
-#: classes/pref/prefs.php:1097
-#: plugins/af_psql_trgm/init.php:102
-#: plugins/import_export/init.php:415
-#: plugins/import_export/init.php:461
-#: plugins/share/init.php:121
-msgid "Close this window"
-msgstr "أغلق هذه النافذة"
-
-#: include/functions2.php:1686
-msgid "(edit note)"
-msgstr "(حرِّر ملاحظة)"
-
-#: include/functions2.php:1960
-msgid "unknown type"
-msgstr "نوع غير معروف"
-
-#: include/functions2.php:2037
-msgid "Attachments"
-msgstr "مرفقات"
-
-#: include/functions2.php:2496
+#: include/functions.php:2456
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: include/functions2.php:2497
+#: include/functions.php:2457
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: include/functions2.php:2498
+#: include/functions.php:2458
 msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
 msgstr ""
 
-#: include/functions2.php:2499
+#: include/functions.php:2459
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: include/functions2.php:2500
+#: include/functions.php:2460
 #, fuzzy
 msgid "No file was uploaded"
 msgstr "لم يتم تحميل أي ملف."
 
-#: include/functions2.php:2501
+#: include/functions.php:2461
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: include/functions2.php:2502
+#: include/functions.php:2462
 msgid "Failed to write file to disk."
 msgstr ""
 
-#: include/functions2.php:2503
+#: include/functions.php:2463
 msgid "A PHP extension stopped the file upload."
 msgstr ""
 
 #: include/login_form.php:197
-#: classes/handler/public.php:569
-#: classes/handler/public.php:824
+#: classes/handler/public.php:480
+#: classes/handler/public.php:735
 msgid "Login:"
 msgstr "الدخول:"
 
 #: include/login_form.php:207
-#: classes/handler/public.php:572
+#: classes/handler/public.php:483
 msgid "Password:"
 msgstr "كلمة المرور:"
 
@@ -894,7 +794,7 @@ msgid "Profile:"
 msgstr "الملف الشخصي:"
 
 #: include/login_form.php:223
-#: classes/handler/public.php:311
+#: classes/handler/public.php:287
 #: classes/pref/prefs.php:1035
 #: classes/rpc.php:63
 msgid "Default profile"
@@ -913,7 +813,7 @@ msgid "Remember me"
 msgstr "تذكَّرني"
 
 #: include/login_form.php:249
-#: classes/handler/public.php:577
+#: classes/handler/public.php:488
 msgid "Log in"
 msgstr "الدخول"
 
@@ -929,145 +829,44 @@ msgstr "فشل تحقق الجلسة (المستخدم غير موجود)"
 msgid "Session failed to validate (password changed)"
 msgstr "فشل تحقق الجلسة (تغير كلمة المرور)"
 
-#: classes/article.php:25
-msgid "Article not found."
-msgstr "البند غير موجود"
-
-#: classes/article.php:197
-msgid "Tags for this article (separated by commas):"
-msgstr "العلامات لهذا البند (مفصولة بفواصل)"
-
-#: classes/article.php:222
-#: classes/pref/labels.php:79
-#: classes/pref/users.php:98
-#: classes/pref/feeds.php:801
-#: classes/pref/feeds.php:943
-#: classes/pref/filters.php:485
-#: classes/pref/prefs.php:981
-#: plugins/instances/init.php:245
-#: plugins/nsfw/init.php:85
-#: plugins/note/init.php:51
-#: plugins/af_readability/init.php:68
-#: plugins/af_redditimgur/init.php:60
-#: plugins/af_psql_trgm/init.php:181
-#: plugins/mail/init.php:64
-#: plugins/af_zz_imgproxy/init.php:213
-msgid "Save"
-msgstr "إحفظ"
-
-#: classes/article.php:224
-#: classes/handler/public.php:546
-#: classes/handler/public.php:580
-#: classes/pref/labels.php:81
-#: classes/pref/users.php:100
-#: classes/pref/feeds.php:802
-#: classes/pref/feeds.php:946
-#: classes/pref/feeds.php:1859
-#: classes/pref/filters.php:488
-#: classes/pref/filters.php:902
-#: classes/pref/filters.php:983
-#: classes/pref/filters.php:1076
-#: classes/pref/prefs.php:983
-#: classes/feeds.php:1105
-#: classes/feeds.php:1155
-#: classes/feeds.php:1192
-#: plugins/instances/init.php:248
-#: plugins/instances/init.php:436
-#: plugins/note/init.php:53
-#: plugins/mail/init.php:173
-msgid "Cancel"
-msgstr "ألغ"
-
-#: classes/opml.php:28
-#: classes/opml.php:33
-msgid "OPML Utility"
-msgstr "أداة OPML"
-
-#: classes/opml.php:37
-msgid "Importing OPML..."
-msgstr "إستيراد OPML..."
-
-#: classes/opml.php:41
-msgid "Return to preferences"
-msgstr "العودة للتفضيلات"
-
-#: classes/opml.php:271
-#, php-format
-msgid "Adding feed: %s"
-msgstr "إضافة الخلاصة: %s"
-
-#: classes/opml.php:282
-#, php-format
-msgid "Duplicate feed: %s"
-msgstr "خلاصة مكرَّرة: %s"
-
-#: classes/opml.php:296
-#, php-format
-msgid "Adding label %s"
-msgstr "إضافة التسمية %s"
-
-#: classes/opml.php:299
-#, php-format
-msgid "Duplicate label: %s"
-msgstr "تسمية مكرَّرة: %s"
-
-#: classes/opml.php:311
-#, php-format
-msgid "Setting preference key %s to %s"
-msgstr "ضبط مفتاح التفضيل %s ليصبح %s"
-
-#: classes/opml.php:343
-msgid "Adding filter..."
-msgstr "تجري إضافة المرشِّح..."
-
-#: classes/opml.php:421
-#, php-format
-msgid "Processing category: %s"
-msgstr "معالجة التصنيف: %s"
-
-#: classes/opml.php:470
-#, php-format
-msgid "Upload failed with error code %d"
-msgstr "فشِل الرفع و ظهر رمز الخطأ %d"
-
-#: classes/opml.php:484
-#: plugins/import_export/init.php:442
-msgid "Unable to move uploaded file."
-msgstr "لم أتمكن من نقل الملف المرفوع."
-
-#: classes/opml.php:488
-#: plugins/import_export/init.php:446
-msgid "Error: please upload OPML file."
-msgstr "خطأ: فضلاً إرفع (حمِّل) ملف OPML."
-
-#: classes/opml.php:499
-msgid "Error: unable to find moved OPML file."
-msgstr "خطأ: لم أعثر على ملف الـ OPML المنقول."
-
-#: classes/opml.php:506
-msgid "Error while parsing document."
-msgstr "خطأ أثناء تفسير المستند."
-
-#: classes/backend.php:33
+#: classes/backend.php:31
 msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
 msgstr "توجد تلميحات أخرى عن الواجهة على ويكي Tiny Tiny RSS."
 
-#: classes/backend.php:38
+#: classes/backend.php:36
 msgid "Keyboard Shortcuts"
 msgstr "إختصارات لوحة المفاتيح"
 
-#: classes/backend.php:61
+#: classes/backend.php:59
 msgid "Shift"
 msgstr "مفتاح عالي"
 
-#: classes/backend.php:64
+#: classes/backend.php:62
 msgid "Ctrl"
 msgstr "مفتاح تحكم"
 
-#: classes/backend.php:99
+#: classes/backend.php:97
 msgid "Help topic not found."
 msgstr "موضوع مساعدة غير موجود."
 
+#: classes/backend.php:103
+#: classes/dlg.php:37
+#: classes/dlg.php:60
+#: classes/dlg.php:93
+#: classes/dlg.php:159
+#: classes/dlg.php:186
+#: classes/article.php:744
+#: classes/pref/filters.php:206
+#: classes/pref/prefs.php:1097
+#: classes/pref/feeds.php:1626
+#: classes/pref/feeds.php:1692
+#: plugins/import_export/init.php:421
+#: plugins/import_export/init.php:467
+#: plugins/af_psql_trgm/init.php:102
+#: plugins/share/init.php:120
+msgid "Close this window"
+msgstr "أغلق هذه النافذة"
+
 #: classes/dlg.php:17
 msgid "If you have imported labels and/or filters, you might need to reload preferences to see your new data."
 msgstr "إذا كنت قد استوردت تسميات و/أو مرشحات ، قد تحتاج إلى إعادة تحميل التفضيلات لتشاهد بياناتك الجديدة."
@@ -1078,7 +877,7 @@ msgstr "عنوان URL الظاهر للـ OPML هو :"
 
 #: classes/dlg.php:57
 #: classes/dlg.php:183
-#: plugins/share/init.php:118
+#: plugins/share/init.php:117
 msgid "Generate new URL"
 msgstr "توليد عنوان URL جديد"
 
@@ -1099,128 +898,222 @@ msgstr "ناطر التحديث يستغرق وقتاً طويلا جداً لل
 msgid "You can view this feed as RSS using the following URL:"
 msgstr "يمكنك عرض هذه الخلاصة كـ RSS باستخدام عنوان URL التالي:"
 
-#: classes/handler/public.php:510
+#: classes/article.php:25
+msgid "Article not found."
+msgstr "البند غير موجود"
+
+#: classes/article.php:197
+msgid "Tags for this article (separated by commas):"
+msgstr "العلامات لهذا البند (مفصولة بفواصل)"
+
+#: classes/article.php:222
+#: classes/pref/labels.php:79
+#: classes/pref/filters.php:519
+#: classes/pref/users.php:98
+#: classes/pref/prefs.php:981
+#: classes/pref/feeds.php:789
+#: classes/pref/feeds.php:931
+#: plugins/af_psql_trgm/init.php:181
+#: plugins/nsfw/init.php:85
+#: plugins/af_readability/init.php:68
+#: plugins/mail/init.php:64
+#: plugins/af_redditimgur/init.php:60
+#: plugins/note/init.php:51
+#: plugins/af_zz_imgproxy/init.php:240
+msgid "Save"
+msgstr "إحفظ"
+
+#: classes/article.php:224
+#: classes/handler/public.php:457
+#: classes/handler/public.php:491
+#: classes/pref/labels.php:81
+#: classes/pref/filters.php:522
+#: classes/pref/filters.php:942
+#: classes/pref/filters.php:1022
+#: classes/pref/filters.php:1115
+#: classes/pref/users.php:100
+#: classes/pref/prefs.php:983
+#: classes/pref/feeds.php:790
+#: classes/pref/feeds.php:934
+#: classes/pref/feeds.php:1833
+#: classes/feeds.php:1098
+#: classes/feeds.php:1148
+#: classes/feeds.php:1185
+#: plugins/mail/init.php:173
+#: plugins/note/init.php:53
+msgid "Cancel"
+msgstr "ألغ"
+
+#: classes/article.php:311
+#: classes/article.php:652
+#: classes/article.php:805
+msgid "no tags"
+msgstr "لا علامات"
+
+#: classes/article.php:419
+msgid "unknown type"
+msgstr "نوع غير معروف"
+
+#: classes/article.php:496
+msgid "Attachments"
+msgstr "مرفقات"
+
+#: classes/article.php:591
+#: classes/feeds.php:741
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] "تعليق"
+msgstr[1] "تعليقات"
+
+#: classes/article.php:595
+#: classes/feeds.php:745
+msgid "comments"
+msgstr "تعليقات"
+
+#: classes/article.php:621
+msgid " - "
+msgstr " - "
+
+#: classes/article.php:662
+#: classes/feeds.php:727
+msgid "Edit tags for this article"
+msgstr "حرِّر علامات هذا البند"
+
+#: classes/article.php:694
+#: classes/feeds.php:681
+msgid "Originally from:"
+msgstr "أصله من:"
+
+#: classes/article.php:707
+#: classes/pref/feeds.php:574
+#: classes/feeds.php:694
+msgid "Feed URL"
+msgstr "عنوان URL للخلاصة"
+
+#: classes/article.php:843
+msgid "(edit note)"
+msgstr "(حرِّر ملاحظة)"
+
+#: classes/handler/public.php:421
 #: plugins/bookmarklets/init.php:40
 msgid "Share with Tiny Tiny RSS"
 msgstr "شارك مع/عبر Tiny Tiny RSS"
 
-#: classes/handler/public.php:518
+#: classes/handler/public.php:429
 msgid "Title:"
 msgstr "العنوان:"
 
-#: classes/handler/public.php:520
+#: classes/handler/public.php:431
 #: classes/pref/feeds.php:572
-#: plugins/instances/init.php:212
-#: plugins/instances/init.php:401
 msgid "URL:"
 msgstr "عنوان URL:"
 
-#: classes/handler/public.php:522
+#: classes/handler/public.php:433
 msgid "Content:"
 msgstr "المحتوى:"
 
-#: classes/handler/public.php:524
+#: classes/handler/public.php:435
 msgid "Labels:"
 msgstr "الأسماء:"
 
-#: classes/handler/public.php:543
+#: classes/handler/public.php:454
 msgid "Shared article will appear in the Published feed."
 msgstr "سيظهر البند الذي شاركت في خلاصة \"منشور\""
 
-#: classes/handler/public.php:545
+#: classes/handler/public.php:456
 msgid "Share"
 msgstr "شارِك"
 
-#: classes/handler/public.php:567
+#: classes/handler/public.php:478
 msgid "Not logged in"
 msgstr "لم يسجِّل الدخول"
 
-#: classes/handler/public.php:626
+#: classes/handler/public.php:537
 msgid "Incorrect username or password"
 msgstr "خطأ في اسم المستخدم أو كلمة المرور"
 
-#: classes/handler/public.php:678
+#: classes/handler/public.php:589
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "الإشتراك في <b>%s</b> موجود مسبقاً."
 
-#: classes/handler/public.php:681
+#: classes/handler/public.php:592
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "مشترِك في <b>%s</b>."
 
-#: classes/handler/public.php:684
+#: classes/handler/public.php:595
 #, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "لم أتمكن من الإشتراك في <b>%s</b>."
 
-#: classes/handler/public.php:687
+#: classes/handler/public.php:598
 #, php-format
 msgid "No feeds found in <b>%s</b>."
 msgstr "لم أجد خلاصات في <b>%s</b>."
 
-#: classes/handler/public.php:690
+#: classes/handler/public.php:601
 msgid "Multiple feed URLs found."
 msgstr "وجدت عدة عناوين URL للخلاصة."
 
-#: classes/handler/public.php:694
+#: classes/handler/public.php:605
 #, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr "لم أتمكن من الإشتراك في <b>%s</b>.  <br>لايمكن تنزيل عنوان URL للخلاصة."
 
-#: classes/handler/public.php:712
+#: classes/handler/public.php:623
 msgid "Subscribe to selected feed"
 msgstr "إشترك في الخلاصة المختارة"
 
-#: classes/handler/public.php:737
+#: classes/handler/public.php:648
 msgid "Edit subscription options"
 msgstr "عدّل خيارات الإشتراك"
 
-#: classes/handler/public.php:774
+#: classes/handler/public.php:685
 msgid "Password recovery"
 msgstr "إستعادة كلمة المرور"
 
-#: classes/handler/public.php:817
+#: classes/handler/public.php:728
 msgid "You will need to provide valid account name and email. A password reset link will be sent to your email address."
 msgstr "ستحتاج إلى إدخال اسم مستخدم وبريد إلكتروني صحيحين.  سيتم إرسال رابط إعادة تعيين كلمة المرور إلى عنوان بريدك الإلكتروني."
 
-#: classes/handler/public.php:839
-#: classes/pref/users.php:350
+#: classes/handler/public.php:750
+#: classes/pref/users.php:349
 msgid "Reset password"
 msgstr "إعادة تعيين كلمة المرور"
 
-#: classes/handler/public.php:849
+#: classes/handler/public.php:760
 msgid "Some of the required form parameters are missing or incorrect."
 msgstr "بعض وسائط النموذج اللازمة مفقودة أو غير صحيحة."
 
-#: classes/handler/public.php:853
-#: classes/handler/public.php:919
+#: classes/handler/public.php:764
+#: classes/handler/public.php:830
 msgid "Go back"
 msgstr "الرجوع للخلف"
 
-#: classes/handler/public.php:890
+#: classes/handler/public.php:801
 msgid "[tt-rss] Password reset request"
 msgstr "[tt-rss] طلب إعادة تعيين كلمة المرور"
 
-#: classes/handler/public.php:915
+#: classes/handler/public.php:826
 msgid "Sorry, login and email combination not found."
 msgstr "آسف ، هذا المستخدم والبريد معاً غير موجودين."
 
-#: classes/handler/public.php:937
+#: classes/handler/public.php:848
 msgid "Your access level is insufficient to run this script."
 msgstr "مستوى الوصول الخاص بك غير كافٍ لتشغيل هذا البرنامج."
 
-#: classes/handler/public.php:963
+#: classes/handler/public.php:874
 msgid "Database Updater"
 msgstr "محدِّث قاعدة البيانات"
 
-#: classes/handler/public.php:1028
+#: classes/handler/public.php:939
 msgid "Perform updates"
 msgstr "ثبِّت التحديثات"
 
 #: classes/pref/labels.php:22
-#: classes/pref/filters.php:348
-#: classes/pref/filters.php:823
+#: classes/pref/filters.php:373
+#: classes/pref/filters.php:863
 msgid "Caption"
 msgstr "تسمية توضيحية"
 
@@ -1242,59 +1135,55 @@ msgid "Created label <b>%s</b>"
 msgstr "تم إنشاء التسمية <b>%s</b>"
 
 #: classes/pref/labels.php:258
-#: classes/pref/users.php:334
-#: classes/pref/feeds.php:1337
-#: classes/pref/feeds.php:1600
-#: classes/pref/feeds.php:1664
-#: classes/pref/filters.php:359
-#: classes/pref/filters.php:407
-#: classes/pref/filters.php:744
-#: classes/pref/filters.php:832
-#: classes/pref/filters.php:859
+#: classes/pref/filters.php:384
+#: classes/pref/filters.php:441
+#: classes/pref/filters.php:784
+#: classes/pref/filters.php:872
+#: classes/pref/filters.php:899
+#: classes/pref/users.php:333
 #: classes/pref/prefs.php:992
-#: plugins/instances/init.php:284
+#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1574
+#: classes/pref/feeds.php:1638
 msgid "Select"
 msgstr "إختر"
 
 #: classes/pref/labels.php:261
-#: classes/pref/users.php:337
-#: classes/pref/feeds.php:1340
-#: classes/pref/feeds.php:1603
-#: classes/pref/feeds.php:1667
-#: classes/pref/filters.php:362
-#: classes/pref/filters.php:410
-#: classes/pref/filters.php:747
-#: classes/pref/filters.php:835
-#: classes/pref/filters.php:862
+#: classes/pref/filters.php:387
+#: classes/pref/filters.php:444
+#: classes/pref/filters.php:787
+#: classes/pref/filters.php:875
+#: classes/pref/filters.php:902
+#: classes/pref/users.php:336
 #: classes/pref/prefs.php:995
+#: classes/pref/feeds.php:1314
+#: classes/pref/feeds.php:1577
+#: classes/pref/feeds.php:1641
 #: classes/feeds.php:102
-#: plugins/instances/init.php:287
 msgid "All"
 msgstr "الكل"
 
 #: classes/pref/labels.php:263
-#: classes/pref/users.php:339
-#: classes/pref/feeds.php:1342
-#: classes/pref/feeds.php:1605
-#: classes/pref/feeds.php:1669
-#: classes/pref/filters.php:364
-#: classes/pref/filters.php:412
-#: classes/pref/filters.php:749
-#: classes/pref/filters.php:837
-#: classes/pref/filters.php:864
+#: classes/pref/filters.php:389
+#: classes/pref/filters.php:446
+#: classes/pref/filters.php:789
+#: classes/pref/filters.php:877
+#: classes/pref/filters.php:904
+#: classes/pref/users.php:338
 #: classes/pref/prefs.php:997
+#: classes/pref/feeds.php:1316
+#: classes/pref/feeds.php:1579
+#: classes/pref/feeds.php:1643
 #: classes/feeds.php:105
-#: plugins/instances/init.php:289
 msgid "None"
 msgstr "لاشيء"
 
 #: classes/pref/labels.php:270
-#: classes/pref/users.php:348
+#: classes/pref/filters.php:512
+#: classes/pref/filters.php:806
+#: classes/pref/users.php:347
 #: classes/pref/feeds.php:767
-#: classes/pref/filters.php:478
-#: classes/pref/filters.php:766
-#: classes/feeds.php:1154
-#: plugins/instances/init.php:294
+#: classes/feeds.php:1147
 msgid "Remove"
 msgstr "إحذف"
 
@@ -1302,9 +1191,170 @@ msgstr "إحذف"
 msgid "Clear colors"
 msgstr "إمسح الألوان"
 
+#: classes/pref/filters.php:153
+#, fuzzy
+msgid "Preview article"
+msgstr "البنود الطازجة"
+
+#: classes/pref/filters.php:264
+#: classes/pref/filters.php:558
+msgid "(inverse)"
+msgstr "(إعكس)"
+
+#: classes/pref/filters.php:260
+#: classes/pref/filters.php:557
+#, php-format
+msgid "%s on %s in %s %s"
+msgstr "%s على %s في %s %s"
+
+#: classes/pref/filters.php:379
+#: classes/pref/filters.php:867
+#: classes/pref/filters.php:981
+msgid "Match"
+msgstr "يُطابِق"
+
+#: classes/pref/filters.php:393
+#: classes/pref/filters.php:450
+#: classes/pref/filters.php:881
+#: classes/pref/filters.php:908
+msgid "Add"
+msgstr "أضِف"
+
+#: classes/pref/filters.php:396
+#: classes/pref/filters.php:453
+#: classes/pref/filters.php:884
+#: classes/pref/filters.php:911
+#: classes/feeds.php:122
+msgid "Delete"
+msgstr "إحذف"
+
+#: classes/pref/filters.php:436
+#: classes/pref/filters.php:894
+msgid "Apply actions"
+msgstr "تطبيق الإجراءات"
+
+#: classes/pref/filters.php:486
+#: classes/pref/filters.php:923
+msgid "Enabled"
+msgstr "ممكَّن"
+
+#: classes/pref/filters.php:495
+#: classes/pref/filters.php:926
+msgid "Match any rule"
+msgstr "طابق أي قاعدة"
+
+#: classes/pref/filters.php:504
+#: classes/pref/filters.php:929
+msgid "Inverse matching"
+msgstr "مطابقة عكسيَّة"
+
+#: classes/pref/filters.php:516
+#: classes/pref/filters.php:936
+msgid "Test"
+msgstr "إختبر"
+
+#: classes/pref/filters.php:780
+#: classes/pref/users.php:323
+#: classes/pref/feeds.php:1307
+#: classes/feeds.php:1118
+#: classes/feeds.php:1184
+#: js/tt-rss.js:165
+msgid "Search"
+msgstr "إبحث"
+
+#: classes/pref/filters.php:796
+msgid "Combine"
+msgstr "جمِّع"
+
+#: classes/pref/filters.php:799
+#: classes/pref/users.php:345
+msgid "Edit"
+msgstr "حرِّر"
+
+#: classes/pref/filters.php:802
+#: classes/pref/feeds.php:1327
+#: classes/pref/feeds.php:1341
+msgid "Reset sort order"
+msgstr "أعد تعيين ترتيب الفرز"
+
+#: classes/pref/filters.php:810
+#: classes/pref/feeds.php:1363
+msgid "Rescore articles"
+msgstr "إعادة حساب نقاط البنود"
+
+#: classes/pref/filters.php:939
+msgid "Create"
+msgstr "أنشئ"
+
+#: classes/pref/filters.php:993
+msgid "Inverse regular expression matching"
+msgstr "إعكس مطابقة التعبير العادي"
+
+#: classes/pref/filters.php:995
+msgid "on field"
+msgstr "في الحقل"
+
+#: classes/pref/filters.php:1001
+#: js/PrefFilterTree.js:64
+msgid "in"
+msgstr "في"
+
+#: classes/pref/filters.php:1014
+msgid "Wiki: Filters"
+msgstr "ويكي:المرشحات"
+
+#: classes/pref/filters.php:1019
+msgid "Save rule"
+msgstr "إحفظ القاعدة"
+
+#: classes/pref/filters.php:1019
+#: js/functions.js:865
+msgid "Add rule"
+msgstr "أضف قاعدة"
+
+#: classes/pref/filters.php:1042
+msgid "Perform Action"
+msgstr "القيام بإجراء"
+
+#: classes/pref/filters.php:1093
+#, fuzzy
+msgid "No actions available"
+msgstr "يتوفر إصدار جديد!"
+
+#: classes/pref/filters.php:1112
+msgid "Save action"
+msgstr "إحفظ الإجراء"
+
+#: classes/pref/filters.php:1112
+#: js/functions.js:887
+msgid "Add action"
+msgstr "أضف إجراء"
+
+#: classes/pref/filters.php:1136
+msgid "[No caption]"
+msgstr "[دون تسمية توضيحية]"
+
+#: classes/pref/filters.php:1138
+#, php-format
+msgid "%s (%d rule)"
+msgid_plural "%s (%d rules)"
+msgstr[0] "%s (القاعدة %d)"
+msgstr[1] "%s (القواعد %d)"
+
+#: classes/pref/filters.php:1153
+#, fuzzy
+msgid "matches any rule"
+msgstr "طابق أي قاعدة"
+
+#: classes/pref/filters.php:1156
+#, php-format
+msgid "%s (+%d action)"
+msgid_plural "%s (+%d actions)"
+msgstr[0] "%s (+%d إجراء)"
+msgstr[1] "%s (+%d إجراءات)"
+
 #: classes/pref/users.php:6
 #: classes/pref/system.php:8
-#: plugins/instances/init.php:154
 msgid "Your access level is insufficient to open this tab."
 msgstr "مستوى الوصول الخاص بك غير كافٍ لفتح هذا التبويب."
 
@@ -1315,8 +1365,8 @@ msgstr "تحرير القاعدة"
 
 #: classes/pref/users.php:56
 #: classes/pref/feeds.php:637
-#: classes/pref/feeds.php:878
-#: classes/feeds.php:1075
+#: classes/pref/feeds.php:866
+#: classes/feeds.php:1068
 msgid "Authentication"
 msgstr "الإستيثاق"
 
@@ -1326,7 +1376,7 @@ msgstr "مستوى الوصول:"
 
 #: classes/pref/users.php:77
 #: classes/pref/feeds.php:667
-#: classes/pref/feeds.php:896
+#: classes/pref/feeds.php:884
 msgid "Options"
 msgstr "خيارات"
 
@@ -1340,7 +1390,7 @@ msgid "User not found"
 msgstr "مستخدم غير موجود"
 
 #: classes/pref/users.php:132
-#: classes/pref/users.php:400
+#: classes/pref/users.php:399
 msgid "Registered"
 msgstr "مسجَّل"
 
@@ -1358,7 +1408,7 @@ msgid "Stored articles"
 msgstr "البنود بنجمة"
 
 #: classes/pref/users.php:145
-#: classes/pref/users.php:399
+#: classes/pref/users.php:398
 msgid "Subscribed feeds"
 msgstr "الخلاصات المشتَرَك بها"
 
@@ -1377,506 +1427,57 @@ msgstr "لم أتمكن من إنشاء المستخدم <b>%s</b>"
 msgid "User <b>%s</b> already exists."
 msgstr "المستخدم <b>%s</b> موجود مسبقاً."
 
-#: classes/pref/users.php:265
+#: classes/pref/users.php:264
 #, php-format
 msgid "Changed password of user <b>%s</b> to <b>%s</b>"
 msgstr "تم تغيير كلمة مرور المستخدم <b>%s</b> إلى <b>%s</b>"
 
-#: classes/pref/users.php:267
+#: classes/pref/users.php:266
 #, php-format
 msgid "Sending new password of user <b>%s</b> to <b>%s</b>"
 msgstr "يجري إرسال كلمة المرور الجديدة للمستخدم <b>%s</b> إلى العنوان <b>%s</b>"
 
-#: classes/pref/users.php:291
+#: classes/pref/users.php:290
 msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] إشعار تغيُّر كلمة المرور"
 
-#: classes/pref/users.php:324
-#: classes/pref/feeds.php:1333
-#: classes/pref/filters.php:740
-#: classes/feeds.php:1125
-#: classes/feeds.php:1191
-#: js/tt-rss.js:165
-msgid "Search"
-msgstr "إبحث"
-
-#: classes/pref/users.php:342
+#: classes/pref/users.php:341
 msgid "Create user"
 msgstr "أنشئ مستخدم"
 
-#: classes/pref/users.php:346
-#: classes/pref/filters.php:759
-#: plugins/instances/init.php:293
-msgid "Edit"
-msgstr "حرِّر"
-
-#: classes/pref/users.php:397
+#: classes/pref/users.php:396
 #: classes/pref/feeds.php:643
-#: classes/pref/feeds.php:882
-#: classes/pref/feeds.php:1836
-#: classes/feeds.php:1079
+#: classes/pref/feeds.php:870
+#: classes/pref/feeds.php:1810
+#: classes/feeds.php:1072
 msgid "Login"
 msgstr "الدخول"
 
-#: classes/pref/users.php:398
+#: classes/pref/users.php:397
 msgid "Access Level"
 msgstr "مستوى الوصول"
 
-#: classes/pref/users.php:401
+#: classes/pref/users.php:400
 msgid "Last login"
 msgstr "آخر دخول"
 
-#: classes/pref/users.php:420
-#: plugins/instances/init.php:334
+#: classes/pref/users.php:419
 msgid "Click to edit"
 msgstr "أنقر للتحرير"
 
-#: classes/pref/users.php:441
+#: classes/pref/users.php:440
 msgid "No users defined."
 msgstr "لايوجد مستخدمين معرَّفين."
 
-#: classes/pref/users.php:443
+#: classes/pref/users.php:442
 msgid "No matching users found."
 msgstr "لم يتم العثور على مستخدمين مطابقين"
 
-#: classes/pref/system.php:29
-msgid "Error Log"
-msgstr "قيد الأخطاء"
-
-#: classes/pref/system.php:40
-msgid "Refresh"
-msgstr "تحديث"
-
-#: classes/pref/system.php:43
-msgid "Clear log"
-msgstr "إمسح السجل"
-
-#: classes/pref/system.php:48
-msgid "Error"
-msgstr "خطأ"
-
-#: classes/pref/system.php:49
-msgid "Filename"
-msgstr "اسم الملف"
-
-#: classes/pref/system.php:50
-msgid "Message"
-msgstr "الرسالة"
-
-#: classes/pref/system.php:52
-msgid "Date"
-msgstr "التاريخ"
-
-#: classes/pref/feeds.php:15
-msgid "Check to enable field"
-msgstr "ضع علامة اختيار لتفعيل الحقل"
-
-#: classes/pref/feeds.php:65
-#: classes/pref/feeds.php:214
-#: classes/pref/feeds.php:258
-#: classes/pref/feeds.php:264
-#: classes/pref/feeds.php:290
-#, php-format
-msgid "(%d feed)"
-msgid_plural "(%d feeds)"
-msgstr[0] "(الخلاصة %d)"
-msgstr[1] "(الخلاصات %d)"
-
-#: classes/pref/feeds.php:537
 #: classes/pref/prefs.php:18
+#: classes/pref/feeds.php:537
 msgid "General"
 msgstr "عام"
 
-#: classes/pref/feeds.php:561
-msgid "Feed Title"
-msgstr "عنوان الخلاصة"
-
-#: classes/pref/feeds.php:595
-#: classes/pref/feeds.php:830
-#: classes/pref/feeds.php:1822
-#: classes/feeds.php:1055
-msgid "Place in category:"
-msgstr "ضعه في التصنيف:"
-
-#: classes/pref/feeds.php:608
-#: classes/pref/feeds.php:844
-#, fuzzy
-msgid "Language:"
-msgstr "اللغة"
-
-#: classes/pref/feeds.php:615
-#: classes/pref/feeds.php:853
-msgid "Update"
-msgstr "تحديث"
-
-#: classes/pref/feeds.php:630
-#: classes/pref/feeds.php:869
-msgid "Article purging:"
-msgstr "تنظيف البند:"
-
-#: classes/pref/feeds.php:658
-#: classes/pref/feeds.php:890
-#: classes/pref/feeds.php:1839
-#: classes/pref/prefs.php:245
-#: classes/feeds.php:1083
-msgid "Password"
-msgstr "كلمة المرور"
-
-#: classes/pref/feeds.php:662
-msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
-msgstr "<b>تلميح:</b> لابد من تعبئة معلومات الدخول إذا كانت الخلاصة المرغوبة تتطلب الاستيثاق ، إلا لخلاصات تويتر."
-
-#: classes/pref/feeds.php:681
-#: classes/pref/feeds.php:900
-msgid "Hide from Popular feeds"
-msgstr "خبئها من بين الخلاصات الشَّعبية"
-
-#: classes/pref/feeds.php:693
-#: classes/pref/feeds.php:906
-msgid "Include in e-mail digest"
-msgstr "ضمِّن هذا في رسالة الموجز"
-
-#: classes/pref/feeds.php:706
-#: classes/pref/feeds.php:912
-msgid "Always display image attachments"
-msgstr "إعرض الصور المرفقة دائماً"
-
-#: classes/pref/feeds.php:719
-#: classes/pref/feeds.php:920
-msgid "Do not embed images"
-msgstr "لا تضمِّن الصور"
-
-#: classes/pref/feeds.php:732
-#: classes/pref/feeds.php:928
-msgid "Cache media"
-msgstr ""
-
-#: classes/pref/feeds.php:744
-#: classes/pref/feeds.php:934
-msgid "Mark updated articles as unread"
-msgstr "علِّم البنود المحدَّثة بـ غير مقروءة"
-
-#: classes/pref/feeds.php:748
-msgid "Icon"
-msgstr "أيقونة"
-
-#: classes/pref/feeds.php:765
-msgid "Replace"
-msgstr "إستبدال"
-
-#: classes/pref/feeds.php:772
-#: classes/pref/prefs.php:698
-msgid "Plugins"
-msgstr "إضافات"
-
-#: classes/pref/feeds.php:792
-msgid "Resubscribe to push updates"
-msgstr "إعادة الإشتراك في تحديثات الدفع"
-
-#: classes/pref/feeds.php:799
-msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
-msgstr "إعادة تعيين حالة اشتراك PubSubHubbub للخلاصات المُفعَّل دفعها."
-
-#: classes/pref/feeds.php:1200
-#: classes/pref/feeds.php:1253
-msgid "All done."
-msgstr "انتهى العمل."
-
-#: classes/pref/feeds.php:1308
-msgid "Feeds with errors"
-msgstr "الخلاصات ذات الأخطاء"
-
-#: classes/pref/feeds.php:1315
-msgid "Inactive feeds"
-msgstr "الخلاصات الخاملة"
-
-#: classes/pref/feeds.php:1351
-msgid "Edit selected feeds"
-msgstr "حرّر الخلاصات المختارة"
-
-#: classes/pref/feeds.php:1353
-#: classes/pref/feeds.php:1367
-#: classes/pref/filters.php:762
-msgid "Reset sort order"
-msgstr "أعد تعيين ترتيب الفرز"
-
-#: classes/pref/feeds.php:1355
-#: js/prefs.js:1622
-msgid "Batch subscribe"
-msgstr "إشتراك بالجملة"
-
-#: classes/pref/feeds.php:1362
-msgid "Categories"
-msgstr "التصنيفات"
-
-#: classes/pref/feeds.php:1365
-msgid "Add category"
-msgstr "أضف تصنيفاً"
-
-#: classes/pref/feeds.php:1369
-msgid "Remove selected"
-msgstr "إحذف المختارة"
-
-#: classes/pref/feeds.php:1380
-msgid "More actions..."
-msgstr "إجراءات أكثر..."
-
-#: classes/pref/feeds.php:1384
-msgid "Manual purge"
-msgstr "تنظيف يدوي"
-
-#: classes/pref/feeds.php:1388
-msgid "Clear feed data"
-msgstr "مسح بيانات الخلاصة"
-
-#: classes/pref/feeds.php:1389
-#: classes/pref/filters.php:770
-msgid "Rescore articles"
-msgstr "إعادة حساب نقاط البنود"
-
-#: classes/pref/feeds.php:1442
-msgid "OPML"
-msgstr "OPML"
-
-#: classes/pref/feeds.php:1444
-msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
-msgstr "باستخدام لغة تأشير معالجة المخططات (OPML) يمكنك تصدير واستيراد خلاصاتك ، مرشحاتك ، أسماءك  وإعدادات Tiny Tiny RSS أيضاً."
-
-#: classes/pref/feeds.php:1445
-msgid "Only main settings profile can be migrated using OPML."
-msgstr "الملف الشخصي الأساسي للإعدادات فقط هو الذي يمكن ترحيله باستخدام OPML."
-
-#: classes/pref/feeds.php:1458
-msgid "Import my OPML"
-msgstr "إستورد OMPL الخاصة بي"
-
-#: classes/pref/feeds.php:1464
-msgid "Filename:"
-msgstr "اسم الملف:"
-
-#: classes/pref/feeds.php:1466
-msgid "Include settings"
-msgstr "ضمِّن الإعدادات"
-
-#: classes/pref/feeds.php:1470
-msgid "Export OPML"
-msgstr "تصدير OPML"
-
-#: classes/pref/feeds.php:1474
-msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
-msgstr "يمكن نشر OPML الخاص بك للعامة ، كما يمكن لأي أحد الإشتراك فيه إذا كان عنوان URL أدناه معروفاً."
-
-#: classes/pref/feeds.php:1478
-msgid "Public OPML URL"
-msgstr "عنوان URL لـ OPML المتاح للعامة "
-
-#: classes/pref/feeds.php:1479
-msgid "Display published OPML URL"
-msgstr "إعرض عنوان URL المنشور لـ OPML"
-
-#: classes/pref/feeds.php:1488
-msgid "Firefox integration"
-msgstr "التكامل مع فيرفوكس"
-
-#: classes/pref/feeds.php:1490
-msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
-msgstr "يمكن استخدام موقع Tiny Tiny RSS هذا في فيرفوكس كقارئ خلاصات بالنقر على الرابط أدناه."
-
-#: classes/pref/feeds.php:1497
-msgid "Click here to register this site as a feed reader."
-msgstr "أنقر هنا لتسجيل هذا الموقع كقارئ خلاصات."
-
-#: classes/pref/feeds.php:1505
-msgid "Published & shared articles / Generated feeds"
-msgstr "البنود المنشورة والمشارَكة / الخلاصات المولَّدة"
-
-#: classes/pref/feeds.php:1507
-msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
-msgstr "البنود المنشورة يتم تصديرها كخلاصة RSS متاحة للعامة يمكن الإشتراك بها لأي أحد يعرف عنوان URL المحدد أدناه."
-
-#: classes/pref/feeds.php:1514
-#: classes/feeds.php:54
-#: classes/feeds.php:140
-msgid "View as RSS"
-msgstr "إعرض كـ RSS"
-
-#: classes/pref/feeds.php:1515
-msgid "Display URL"
-msgstr "إعرض عنوان URL"
-
-#: classes/pref/feeds.php:1518
-msgid "Clear all generated URLs"
-msgstr "مسح كل عناوين URL المولَّدة"
-
-#: classes/pref/feeds.php:1596
-msgid "These feeds have not been updated with new content for 3 months (oldest first):"
-msgstr "هذه الخلاصات لم تحدَّث بمحتوى جديد منذ ٣ أشهر (الأقدم أولاً):"
-
-#: classes/pref/feeds.php:1630
-#: classes/pref/feeds.php:1694
-msgid "Click to edit feed"
-msgstr "أنقر لتحرير الخلاصة"
-
-#: classes/pref/feeds.php:1648
-#: classes/pref/feeds.php:1714
-msgid "Unsubscribe from selected feeds"
-msgstr "إلغاء الإشتراك في الخلاصات المختارة"
-
-#: classes/pref/feeds.php:1819
-msgid "Add one valid RSS feed per line (no feed detection is done)"
-msgstr "ضع خلاصة RSS واحدة صحيحة على السطر (لن يجري اكتشاف الخلاصة)"
-
-#: classes/pref/feeds.php:1828
-msgid "Feeds to subscribe, One per line"
-msgstr "الخلاصات المرغوب الاشتراك فيها ، واحدة لكل سطر"
-
-#: classes/pref/feeds.php:1851
-msgid "Feeds require authentication."
-msgstr "الخلاصات تتطلب الاستيثاق."
-
-#: classes/pref/feeds.php:1858
-#: classes/feeds.php:1099
-#: classes/feeds.php:1153
-msgid "Subscribe"
-msgstr "إشترك"
-
-#: classes/pref/filters.php:151
-#, fuzzy
-msgid "Preview article"
-msgstr "البنود الطازجة"
-
-#: classes/pref/filters.php:239
-#: classes/pref/filters.php:518
-msgid "(inverse)"
-msgstr "(إعكس)"
-
-#: classes/pref/filters.php:235
-#: classes/pref/filters.php:517
-#, php-format
-msgid "%s on %s in %s %s"
-msgstr "%s على %s في %s %s"
-
-#: classes/pref/filters.php:354
-#: classes/pref/filters.php:827
-#: classes/pref/filters.php:942
-msgid "Match"
-msgstr "يُطابِق"
-
-#: classes/pref/filters.php:368
-#: classes/pref/filters.php:416
-#: classes/pref/filters.php:841
-#: classes/pref/filters.php:868
-msgid "Add"
-msgstr "أضِف"
-
-#: classes/pref/filters.php:371
-#: classes/pref/filters.php:419
-#: classes/pref/filters.php:844
-#: classes/pref/filters.php:871
-#: classes/feeds.php:122
-msgid "Delete"
-msgstr "إحذف"
-
-#: classes/pref/filters.php:402
-#: classes/pref/filters.php:854
-msgid "Apply actions"
-msgstr "تطبيق الإجراءات"
-
-#: classes/pref/filters.php:452
-#: classes/pref/filters.php:883
-msgid "Enabled"
-msgstr "ممكَّن"
-
-#: classes/pref/filters.php:461
-#: classes/pref/filters.php:886
-msgid "Match any rule"
-msgstr "طابق أي قاعدة"
-
-#: classes/pref/filters.php:470
-#: classes/pref/filters.php:889
-msgid "Inverse matching"
-msgstr "مطابقة عكسيَّة"
-
-#: classes/pref/filters.php:482
-#: classes/pref/filters.php:896
-msgid "Test"
-msgstr "إختبر"
-
-#: classes/pref/filters.php:756
-msgid "Combine"
-msgstr "جمِّع"
-
-#: classes/pref/filters.php:899
-msgid "Create"
-msgstr "أنشئ"
-
-#: classes/pref/filters.php:954
-msgid "Inverse regular expression matching"
-msgstr "إعكس مطابقة التعبير العادي"
-
-#: classes/pref/filters.php:956
-msgid "on field"
-msgstr "في الحقل"
-
-#: classes/pref/filters.php:962
-#: js/PrefFilterTree.js:64
-msgid "in"
-msgstr "في"
-
-#: classes/pref/filters.php:975
-msgid "Wiki: Filters"
-msgstr "ويكي:المرشحات"
-
-#: classes/pref/filters.php:980
-msgid "Save rule"
-msgstr "إحفظ القاعدة"
-
-#: classes/pref/filters.php:980
-#: js/functions.js:865
-msgid "Add rule"
-msgstr "أضف قاعدة"
-
-#: classes/pref/filters.php:1003
-msgid "Perform Action"
-msgstr "القيام بإجراء"
-
-#: classes/pref/filters.php:1054
-#, fuzzy
-msgid "No actions available"
-msgstr "يتوفر إصدار جديد!"
-
-#: classes/pref/filters.php:1073
-msgid "Save action"
-msgstr "إحفظ الإجراء"
-
-#: classes/pref/filters.php:1073
-#: js/functions.js:887
-msgid "Add action"
-msgstr "أضف إجراء"
-
-#: classes/pref/filters.php:1097
-msgid "[No caption]"
-msgstr "[دون تسمية توضيحية]"
-
-#: classes/pref/filters.php:1099
-#, php-format
-msgid "%s (%d rule)"
-msgid_plural "%s (%d rules)"
-msgstr[0] "%s (القاعدة %d)"
-msgstr[1] "%s (القواعد %d)"
-
-#: classes/pref/filters.php:1114
-#, fuzzy
-msgid "matches any rule"
-msgstr "طابق أي قاعدة"
-
-#: classes/pref/filters.php:1117
-#, php-format
-msgid "%s (+%d action)"
-msgid_plural "%s (+%d actions)"
-msgstr[0] "%s (+%d إجراء)"
-msgstr[1] "%s (+%d إجراءات)"
-
 #: classes/pref/prefs.php:19
 msgid "Interface"
 msgstr "واجهة"
@@ -2050,7 +1651,7 @@ msgid "Strip all but most common HTML tags when reading articles."
 msgstr "نزع كل وسوم HTML عدا الشائع منها عند قراءة البنود."
 
 #: classes/pref/prefs.php:53
-#: js/prefs.js:1584
+#: js/prefs.js:1580
 msgid "Customize stylesheet"
 msgstr "تخصيص صفحات الطُّرُز"
 
@@ -2118,6 +1719,14 @@ msgstr "مستوى الوصول"
 msgid "Save data"
 msgstr "إحفظ البيانات"
 
+#: classes/pref/prefs.php:245
+#: classes/pref/feeds.php:658
+#: classes/pref/feeds.php:878
+#: classes/pref/feeds.php:1813
+#: classes/feeds.php:1076
+msgid "Password"
+msgstr "كلمة المرور"
+
 #: classes/pref/prefs.php:254
 msgid "Your password is at default value, please change it."
 msgstr "كلمة المرور لديك على قيمتها الإفتراضية ، فضلاً غيّرها."
@@ -2216,18 +1825,23 @@ msgstr "إدارة الملفات الشخصية"
 msgid "Reset to defaults"
 msgstr "إعادة التعيين إلى الافتراضي"
 
+#: classes/pref/prefs.php:698
+#: classes/pref/feeds.php:772
+msgid "Plugins"
+msgstr "إضافات"
+
 #: classes/pref/prefs.php:700
 msgid "You will need to reload Tiny Tiny RSS for plugin changes to take effect."
 msgstr "ستحتاج إعادة تحميل Tiny Tiny RSS لتصبح تغييرات الإضافات نافذة المفعول."
 
-#: classes/pref/prefs.php:702
-msgid "Download more plugins at tt-rss.org <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forums</a> or <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a>."
-msgstr "يمكن تنزيل المزيد من الإضافات من <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">منتدى</a> أو <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">ويكي</a>  tt-موقع rss.org ."
-
-#: classes/pref/prefs.php:732
+#: classes/pref/prefs.php:730
 msgid "System plugins"
 msgstr "إضافات النظام"
 
+#: classes/pref/prefs.php:731
+msgid "System plugins are enabled in <strong>config.php</strong> for all users."
+msgstr ""
+
 #: classes/pref/prefs.php:736
 #: classes/pref/prefs.php:792
 msgid "Plugin"
@@ -2297,6 +1911,340 @@ msgstr "حذف الملفات الشخصية المحدَّدة"
 msgid "Activate profile"
 msgstr "تنشيط الملف الشخصي"
 
+#: classes/pref/feeds.php:15
+msgid "Check to enable field"
+msgstr "ضع علامة اختيار لتفعيل الحقل"
+
+#: classes/pref/feeds.php:65
+#: classes/pref/feeds.php:214
+#: classes/pref/feeds.php:258
+#: classes/pref/feeds.php:264
+#: classes/pref/feeds.php:290
+#, php-format
+msgid "(%d feed)"
+msgid_plural "(%d feeds)"
+msgstr[0] "(الخلاصة %d)"
+msgstr[1] "(الخلاصات %d)"
+
+#: classes/pref/feeds.php:561
+msgid "Feed Title"
+msgstr "عنوان الخلاصة"
+
+#: classes/pref/feeds.php:595
+#: classes/pref/feeds.php:818
+#: classes/pref/feeds.php:1796
+#: classes/feeds.php:1048
+msgid "Place in category:"
+msgstr "ضعه في التصنيف:"
+
+#: classes/pref/feeds.php:608
+#: classes/pref/feeds.php:832
+#, fuzzy
+msgid "Language:"
+msgstr "اللغة"
+
+#: classes/pref/feeds.php:615
+#: classes/pref/feeds.php:841
+msgid "Update"
+msgstr "تحديث"
+
+#: classes/pref/feeds.php:630
+#: classes/pref/feeds.php:857
+msgid "Article purging:"
+msgstr "تنظيف البند:"
+
+#: classes/pref/feeds.php:662
+msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
+msgstr "<b>تلميح:</b> لابد من تعبئة معلومات الدخول إذا كانت الخلاصة المرغوبة تتطلب الاستيثاق ، إلا لخلاصات تويتر."
+
+#: classes/pref/feeds.php:681
+#: classes/pref/feeds.php:888
+msgid "Hide from Popular feeds"
+msgstr "خبئها من بين الخلاصات الشَّعبية"
+
+#: classes/pref/feeds.php:693
+#: classes/pref/feeds.php:894
+msgid "Include in e-mail digest"
+msgstr "ضمِّن هذا في رسالة الموجز"
+
+#: classes/pref/feeds.php:706
+#: classes/pref/feeds.php:900
+msgid "Always display image attachments"
+msgstr "إعرض الصور المرفقة دائماً"
+
+#: classes/pref/feeds.php:719
+#: classes/pref/feeds.php:908
+msgid "Do not embed images"
+msgstr "لا تضمِّن الصور"
+
+#: classes/pref/feeds.php:732
+#: classes/pref/feeds.php:916
+msgid "Cache media"
+msgstr ""
+
+#: classes/pref/feeds.php:744
+#: classes/pref/feeds.php:922
+msgid "Mark updated articles as unread"
+msgstr "علِّم البنود المحدَّثة بـ غير مقروءة"
+
+#: classes/pref/feeds.php:748
+msgid "Icon"
+msgstr "أيقونة"
+
+#: classes/pref/feeds.php:765
+msgid "Replace"
+msgstr "إستبدال"
+
+#: classes/pref/feeds.php:1174
+#: classes/pref/feeds.php:1227
+msgid "All done."
+msgstr "انتهى العمل."
+
+#: classes/pref/feeds.php:1282
+msgid "Feeds with errors"
+msgstr "الخلاصات ذات الأخطاء"
+
+#: classes/pref/feeds.php:1289
+msgid "Inactive feeds"
+msgstr "الخلاصات الخاملة"
+
+#: classes/pref/feeds.php:1325
+msgid "Edit selected feeds"
+msgstr "حرّر الخلاصات المختارة"
+
+#: classes/pref/feeds.php:1329
+#: js/prefs.js:1618
+msgid "Batch subscribe"
+msgstr "إشتراك بالجملة"
+
+#: classes/pref/feeds.php:1336
+msgid "Categories"
+msgstr "التصنيفات"
+
+#: classes/pref/feeds.php:1339
+msgid "Add category"
+msgstr "أضف تصنيفاً"
+
+#: classes/pref/feeds.php:1343
+msgid "Remove selected"
+msgstr "إحذف المختارة"
+
+#: classes/pref/feeds.php:1354
+msgid "More actions..."
+msgstr "إجراءات أكثر..."
+
+#: classes/pref/feeds.php:1358
+msgid "Manual purge"
+msgstr "تنظيف يدوي"
+
+#: classes/pref/feeds.php:1362
+msgid "Clear feed data"
+msgstr "مسح بيانات الخلاصة"
+
+#: classes/pref/feeds.php:1416
+msgid "OPML"
+msgstr "OPML"
+
+#: classes/pref/feeds.php:1418
+msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
+msgstr "باستخدام لغة تأشير معالجة المخططات (OPML) يمكنك تصدير واستيراد خلاصاتك ، مرشحاتك ، أسماءك  وإعدادات Tiny Tiny RSS أيضاً."
+
+#: classes/pref/feeds.php:1419
+msgid "Only main settings profile can be migrated using OPML."
+msgstr "الملف الشخصي الأساسي للإعدادات فقط هو الذي يمكن ترحيله باستخدام OPML."
+
+#: classes/pref/feeds.php:1432
+msgid "Import my OPML"
+msgstr "إستورد OMPL الخاصة بي"
+
+#: classes/pref/feeds.php:1438
+msgid "Filename:"
+msgstr "اسم الملف:"
+
+#: classes/pref/feeds.php:1440
+msgid "Include settings"
+msgstr "ضمِّن الإعدادات"
+
+#: classes/pref/feeds.php:1444
+msgid "Export OPML"
+msgstr "تصدير OPML"
+
+#: classes/pref/feeds.php:1448
+msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
+msgstr "يمكن نشر OPML الخاص بك للعامة ، كما يمكن لأي أحد الإشتراك فيه إذا كان عنوان URL أدناه معروفاً."
+
+#: classes/pref/feeds.php:1452
+msgid "Public OPML URL"
+msgstr "عنوان URL لـ OPML المتاح للعامة "
+
+#: classes/pref/feeds.php:1453
+msgid "Display published OPML URL"
+msgstr "إعرض عنوان URL المنشور لـ OPML"
+
+#: classes/pref/feeds.php:1462
+msgid "Firefox integration"
+msgstr "التكامل مع فيرفوكس"
+
+#: classes/pref/feeds.php:1464
+msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
+msgstr "يمكن استخدام موقع Tiny Tiny RSS هذا في فيرفوكس كقارئ خلاصات بالنقر على الرابط أدناه."
+
+#: classes/pref/feeds.php:1471
+msgid "Click here to register this site as a feed reader."
+msgstr "أنقر هنا لتسجيل هذا الموقع كقارئ خلاصات."
+
+#: classes/pref/feeds.php:1479
+msgid "Published & shared articles / Generated feeds"
+msgstr "البنود المنشورة والمشارَكة / الخلاصات المولَّدة"
+
+#: classes/pref/feeds.php:1481
+msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
+msgstr "البنود المنشورة يتم تصديرها كخلاصة RSS متاحة للعامة يمكن الإشتراك بها لأي أحد يعرف عنوان URL المحدد أدناه."
+
+#: classes/pref/feeds.php:1488
+#: classes/feeds.php:54
+#: classes/feeds.php:140
+msgid "View as RSS"
+msgstr "إعرض كـ RSS"
+
+#: classes/pref/feeds.php:1489
+msgid "Display URL"
+msgstr "إعرض عنوان URL"
+
+#: classes/pref/feeds.php:1492
+msgid "Clear all generated URLs"
+msgstr "مسح كل عناوين URL المولَّدة"
+
+#: classes/pref/feeds.php:1570
+msgid "These feeds have not been updated with new content for 3 months (oldest first):"
+msgstr "هذه الخلاصات لم تحدَّث بمحتوى جديد منذ ٣ أشهر (الأقدم أولاً):"
+
+#: classes/pref/feeds.php:1604
+#: classes/pref/feeds.php:1668
+msgid "Click to edit feed"
+msgstr "أنقر لتحرير الخلاصة"
+
+#: classes/pref/feeds.php:1622
+#: classes/pref/feeds.php:1688
+msgid "Unsubscribe from selected feeds"
+msgstr "إلغاء الإشتراك في الخلاصات المختارة"
+
+#: classes/pref/feeds.php:1793
+msgid "Add one valid RSS feed per line (no feed detection is done)"
+msgstr "ضع خلاصة RSS واحدة صحيحة على السطر (لن يجري اكتشاف الخلاصة)"
+
+#: classes/pref/feeds.php:1802
+msgid "Feeds to subscribe, One per line"
+msgstr "الخلاصات المرغوب الاشتراك فيها ، واحدة لكل سطر"
+
+#: classes/pref/feeds.php:1825
+msgid "Feeds require authentication."
+msgstr "الخلاصات تتطلب الاستيثاق."
+
+#: classes/pref/feeds.php:1832
+#: classes/feeds.php:1092
+#: classes/feeds.php:1146
+msgid "Subscribe"
+msgstr "إشترك"
+
+#: classes/pref/system.php:29
+msgid "Error Log"
+msgstr "قيد الأخطاء"
+
+#: classes/pref/system.php:40
+msgid "Refresh"
+msgstr "تحديث"
+
+#: classes/pref/system.php:43
+msgid "Clear log"
+msgstr "إمسح السجل"
+
+#: classes/pref/system.php:48
+msgid "Error"
+msgstr "خطأ"
+
+#: classes/pref/system.php:49
+msgid "Filename"
+msgstr "اسم الملف"
+
+#: classes/pref/system.php:50
+msgid "Message"
+msgstr "الرسالة"
+
+#: classes/pref/system.php:52
+msgid "Date"
+msgstr "التاريخ"
+
+#: classes/opml.php:28
+#: classes/opml.php:33
+msgid "OPML Utility"
+msgstr "أداة OPML"
+
+#: classes/opml.php:37
+msgid "Importing OPML..."
+msgstr "إستيراد OPML..."
+
+#: classes/opml.php:41
+msgid "Return to preferences"
+msgstr "العودة للتفضيلات"
+
+#: classes/opml.php:295
+#, php-format
+msgid "Adding feed: %s"
+msgstr "إضافة الخلاصة: %s"
+
+#: classes/opml.php:306
+#, php-format
+msgid "Duplicate feed: %s"
+msgstr "خلاصة مكرَّرة: %s"
+
+#: classes/opml.php:320
+#, php-format
+msgid "Adding label %s"
+msgstr "إضافة التسمية %s"
+
+#: classes/opml.php:323
+#, php-format
+msgid "Duplicate label: %s"
+msgstr "تسمية مكرَّرة: %s"
+
+#: classes/opml.php:335
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr "ضبط مفتاح التفضيل %s ليصبح %s"
+
+#: classes/opml.php:367
+msgid "Adding filter..."
+msgstr "تجري إضافة المرشِّح..."
+
+#: classes/opml.php:486
+#, php-format
+msgid "Processing category: %s"
+msgstr "معالجة التصنيف: %s"
+
+#: classes/opml.php:532
+#, php-format
+msgid "Upload failed with error code %d"
+msgstr "فشِل الرفع و ظهر رمز الخطأ %d"
+
+#: classes/opml.php:544
+#: plugins/import_export/init.php:448
+msgid "Unable to move uploaded file."
+msgstr "لم أتمكن من نقل الملف المرفوع."
+
+#: classes/opml.php:548
+#: plugins/import_export/init.php:452
+msgid "Error: please upload OPML file."
+msgstr "خطأ: فضلاً إرفع (حمِّل) ملف OPML."
+
+#: classes/opml.php:559
+msgid "Error: unable to find moved OPML file."
+msgstr "خطأ: لم أعثر على ملف الـ OPML المنقول."
+
+#: classes/opml.php:566
+msgid "Error while parsing document."
+msgstr "خطأ أثناء تفسير المستند."
+
 #: classes/feeds.php:53
 msgid "View as RSS feed"
 msgstr "إعرض كخلاصة RSS"
@@ -2337,8 +2285,8 @@ msgstr "العودة للخلف"
 
 #: classes/feeds.php:127
 #: classes/feeds.php:132
-#: plugins/mail/init.php:75
 #: plugins/mailto/init.php:25
+#: plugins/mail/init.php:75
 msgid "Forward by email"
 msgstr "أعد التوجيه بالبريد"
 
@@ -2346,317 +2294,144 @@ msgstr "أعد التوجيه بالبريد"
 msgid "Feed:"
 msgstr "خلاصة:"
 
-#: classes/feeds.php:229
-#: classes/feeds.php:892
+#: classes/feeds.php:228
+#: classes/feeds.php:885
 msgid "Feed not found."
 msgstr "لم أجد الخلاصة."
 
-#: classes/feeds.php:300
+#: classes/feeds.php:291
 msgid "Never"
 msgstr "أبداً"
 
-#: classes/feeds.php:413
+#: classes/feeds.php:405
 #, php-format
 msgid "Imported at %s"
 msgstr "تم استيراده في %s"
 
-#: classes/feeds.php:472
-#: classes/feeds.php:569
+#: classes/feeds.php:464
+#: classes/feeds.php:561
 msgid "mark feed as read"
 msgstr "علِّم الخلاصة مقروءة"
 
-#: classes/feeds.php:630
+#: classes/feeds.php:622
 msgid "Collapse article"
 msgstr "طيّ البند"
 
-#: classes/feeds.php:791
+#: classes/feeds.php:784
 msgid "No unread articles found to display."
 msgstr "لم أجد بنوداً غير مقروءة لأعرضها."
 
-#: classes/feeds.php:794
+#: classes/feeds.php:787
 msgid "No updated articles found to display."
 msgstr "لم أجد بنوداً محدَّثة لأعرضها."
 
-#: classes/feeds.php:797
+#: classes/feeds.php:790
 msgid "No starred articles found to display."
 msgstr "لم أجد بنوداً معلَّمة بنجمة لأعرضها."
 
-#: classes/feeds.php:801
+#: classes/feeds.php:794
 msgid "No articles found to display. You can assign articles to labels manually from article header context menu (applies to all selected articles) or use a filter."
 msgstr "لم أجد بنوداً للعرض.  يمكنك إسناد بنود للتسميات يدوياً من قائمة سياق ترويسة البند (هذا ينطبق على جميع البنود المختارة) أو استخدام مرشِّح."
 
-#: classes/feeds.php:803
+#: classes/feeds.php:796
 msgid "No articles found to display."
 msgstr "لم أجد بنوداًلأعرضها."
 
-#: classes/feeds.php:818
-#: classes/feeds.php:992
+#: classes/feeds.php:811
+#: classes/feeds.php:985
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "آخر تحديث للخلاصات في %s"
 
-#: classes/feeds.php:828
-#: classes/feeds.php:1002
+#: classes/feeds.php:821
+#: classes/feeds.php:995
 msgid "Some feeds have update errors (click for details)"
 msgstr "توجد أخطاء في تحديث بعض الخلاصات (أنقر للتفاصيل)"
 
-#: classes/feeds.php:982
+#: classes/feeds.php:975
 msgid "No feed selected."
 msgstr "لم تختر خلاصة."
 
-#: classes/feeds.php:1041
-#: classes/feeds.php:1049
+#: classes/feeds.php:1034
+#: classes/feeds.php:1042
 msgid "Feed or site URL"
 msgstr "عنوان URL للخلاصة أو الموقع"
 
-#: classes/feeds.php:1063
+#: classes/feeds.php:1056
 msgid "Available feeds"
 msgstr "الخلاصات المتوفّرة"
 
-#: classes/feeds.php:1094
+#: classes/feeds.php:1087
 msgid "This feed requires authentication."
 msgstr "هذه الخلاصة تتطلب الإستيثاق."
 
-#: classes/feeds.php:1102
+#: classes/feeds.php:1095
 msgid "More feeds"
 msgstr "المزيد من الخلاصات"
 
-#: classes/feeds.php:1129
+#: classes/feeds.php:1122
 msgid "Popular feeds"
 msgstr "الخلاصات الشعبيَّة"
 
-#: classes/feeds.php:1130
+#: classes/feeds.php:1123
 msgid "Feed archive"
 msgstr "محفوظات الخلاصة"
 
-#: classes/feeds.php:1133
+#: classes/feeds.php:1126
 msgid "limit:"
 msgstr "حدّ:"
 
-#: classes/feeds.php:1165
+#: classes/feeds.php:1158
 msgid "Look for"
 msgstr "إبحث عن"
 
-#: classes/feeds.php:1173
+#: classes/feeds.php:1166
 #, php-format
 msgid "in %s"
 msgstr ""
 
-#: classes/feeds.php:1178
+#: classes/feeds.php:1171
 msgid "Used for word stemming"
 msgstr ""
 
-#: classes/feeds.php:1187
+#: classes/feeds.php:1180
 msgid "Search syntax"
 msgstr "نحو البحث"
 
-#: plugins/instances/init.php:141
-msgid "Linked"
-msgstr "مرتبط"
-
-#: plugins/instances/init.php:204
-#: plugins/instances/init.php:395
-msgid "Instance"
-msgstr "مثيلة"
-
-#: plugins/instances/init.php:215
-#: plugins/instances/init.php:312
-#: plugins/instances/init.php:404
-msgid "Instance URL"
-msgstr "عنوان URL للمثيلة"
-
-#: plugins/instances/init.php:226
-#: plugins/instances/init.php:414
-msgid "Access key:"
-msgstr "مفتاح الوصول:"
-
-#: plugins/instances/init.php:229
-#: plugins/instances/init.php:313
-#: plugins/instances/init.php:417
-msgid "Access key"
-msgstr "مفتاح الوصول"
-
-#: plugins/instances/init.php:233
-#: plugins/instances/init.php:421
-msgid "Use one access key for both linked instances."
-msgstr "إستخدم مفتاح وصول واحد لكلا المثيلتين المتصلتين."
-
-#: plugins/instances/init.php:241
-#: plugins/instances/init.php:429
-msgid "Generate new key"
-msgstr "توليد مفتاح جديد"
-
-#: plugins/instances/init.php:292
-msgid "Link instance"
-msgstr "ربط مثيلة"
-
-#: plugins/instances/init.php:304
-msgid "You can connect other instances of Tiny Tiny RSS to this one to share Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
-msgstr "يمكنك ربط مثيلات Tiny Tiny RSS أخرى للموجودة هنا لمشاركة الخلاصات الشعبية.  إربط بمثيلة Tiny Tiny RSS باستخدام عنوان URL التالي:"
-
-#: plugins/instances/init.php:314
-msgid "Last connected"
-msgstr "آخر اتصال"
-
-#: plugins/instances/init.php:315
-msgid "Status"
-msgstr "الحالة"
-
-#: plugins/instances/init.php:316
-msgid "Stored feeds"
-msgstr "الخلاصات المخزَّنة"
-
-#: plugins/instances/init.php:433
-msgid "Create link"
-msgstr "أنشئ رابط"
-
-#: plugins/nsfw/init.php:30
-#: plugins/nsfw/init.php:42
-msgid "Not work safe (click to toggle)"
-msgstr "غير آمنة في العمل (أنقر للقلب)"
-
-#: plugins/nsfw/init.php:52
-msgid "NSFW Plugin"
-msgstr "إضافة NSFW"
-
-#: plugins/nsfw/init.php:79
-msgid "Tags to consider NSFW (comma-separated)"
-msgstr "العلامات المعتبرة غير آمنة في العمل (NSFW) (مفصولة بفواصل)"
-
-#: plugins/nsfw/init.php:100
-msgid "Configuration saved."
-msgstr "حُفظت الإعدادات."
-
-#: plugins/note/init.php:26
-#: plugins/note/note.js:11
-msgid "Edit article note"
-msgstr "حرّر ملاحظة للبند"
-
-#: plugins/vf_shared/init.php:16
-#: plugins/vf_shared/init.php:69
-msgid "Shared articles"
-msgstr "البنود المشارَكة"
-
-#: plugins/auth_internal/init.php:65
-msgid "Please enter your one time password:"
-msgstr "فضلاً أدخل كلمة المرور ذات الاستخدام الواحد:"
-
-#: plugins/auth_internal/init.php:188
-msgid "Password has been changed."
-msgstr "تم تغيير كلمة المرور."
-
-#: plugins/auth_internal/init.php:190
-msgid "Old password is incorrect."
-msgstr "كلمة المرور القديمة غير صحيحة."
-
-#: plugins/af_readability/init.php:21
-msgid "Data saved."
-msgstr ""
-
-#: plugins/af_readability/init.php:33
-#, fuzzy
-msgid "Inline content"
-msgstr "حرّر ملاحظة للبند"
-
-#: plugins/af_readability/init.php:39
-msgid "Readability settings (af_readability)"
-msgstr ""
-
-#: plugins/af_readability/init.php:66
-msgid "Use Readability for pages shared via bookmarklet."
-msgstr ""
-
-#: plugins/af_readability/init.php:78
-#: plugins/af_psql_trgm/init.php:191
-msgid "Currently enabled for (click to edit):"
-msgstr ""
-
-#: plugins/af_readability/init.php:95
-#, fuzzy
-msgid "Readability"
-msgstr "تحقق من التوفُّر"
-
-#: plugins/af_readability/init.php:106
-#, fuzzy
-msgid "Inline article content"
-msgstr "حرّر ملاحظة للبند"
+#: classes/feeds.php:1596
+msgid "Starred articles"
+msgstr "البنود بنجمة"
 
-#: plugins/af_redditimgur/init.php:25
-msgid "Reddit content settings (af_redditimgur)"
-msgstr ""
+#: classes/feeds.php:1598
+msgid "Published articles"
+msgstr "البنود المنشورة"
 
-#: plugins/af_redditimgur/init.php:50
-msgid "Uses Readability (full-text-rss) implementation by <a target='_blank' href='https://bitbucket.org/fivefilters/'>FiveFilters.org</a>"
-msgstr ""
+#: classes/feeds.php:1600
+msgid "Fresh articles"
+msgstr "البنود الطازجة"
 
-#: plugins/af_redditimgur/init.php:54
-msgid "Extract missing content using Readability"
-msgstr ""
+#: classes/feeds.php:1604
+msgid "Archived articles"
+msgstr "البنود المحفوظة"
 
-#: plugins/af_redditimgur/init.php:59
-msgid "Enable additional duplicate checking"
-msgstr ""
+#: classes/feeds.php:1606
+msgid "Recently read"
+msgstr "قُرِأَت حديثاً"
 
-#: plugins/af_redditimgur/init.php:73
-#: plugins/af_zz_imgproxy/init.php:225
-#, fuzzy
-msgid "Configuration saved"
-msgstr "حُفظت الإعدادات."
+#: classes/feeds.php:1716
+msgid "Special"
+msgstr "خاص"
 
-#: plugins/af_psql_trgm/init.php:28
+#: classes/feeds.php:1962
 #, php-format
-msgid "Data saved (%s, %d)"
-msgstr ""
+msgid "Search results: %s"
+msgstr "نتائج البحث: %s"
 
-#: plugins/af_psql_trgm/init.php:112
-#, fuzzy
-msgid "Show related articles"
+#: plugins/vf_shared/init.php:16
+#: plugins/vf_shared/init.php:60
+msgid "Shared articles"
 msgstr "البنود المشارَكة"
 
-#: plugins/af_psql_trgm/init.php:118
-#: plugins/af_psql_trgm/init.php:220
-#, fuzzy
-msgid "Mark similar articles as read"
-msgstr "أعلّم جميع البنود بـ مقروءة؟"
-
-#: plugins/af_psql_trgm/init.php:157
-msgid "PostgreSQL trigram extension returns string similarity as a floating point number (0-1). Setting it too low might produce false positives, zero disables checking."
-msgstr ""
-
-#: plugins/af_psql_trgm/init.php:160
-#, fuzzy
-msgid "Global settings"
-msgstr "ضمِّن الإعدادات"
-
-#: plugins/af_psql_trgm/init.php:164
-msgid "Minimum similarity:"
-msgstr ""
-
-#: plugins/af_psql_trgm/init.php:169
-msgid "Minimum title length:"
-msgstr ""
-
-#: plugins/af_psql_trgm/init.php:174
-#, fuzzy
-msgid "Enable for all feeds:"
-msgstr "تمكين تصنيفات الخلاصات"
-
-#: plugins/af_psql_trgm/init.php:209
-msgid "Similarity (pg_trgm)"
-msgstr ""
-
-#: plugins/af_comics/init.php:40
-msgid "Feeds supported by af_comics"
-msgstr "الخلاصات التي تدعمها af_comics"
-
-#: plugins/af_comics/init.php:42
-msgid "The following comics are currently supported:"
-msgstr "الرسوم الهزلية التالية مدعومة حالياً :"
-
-#: plugins/af_comics/init.php:60
-msgid "GoComics requires a specific URL to workaround their lack of feed support: <code>http://feeds.feedburner.com/uclick/<em>comic_name</em></code> (e.g. <code>http://www.gocomics.com/garfield</code> uses <code>http://feeds.feedburner.com/uclick/garfield</code>)."
-msgstr ""
-
 #: plugins/import_export/init.php:58
 msgid "Import and export"
 msgstr "إستيراد وتصدير"
@@ -2673,95 +2448,83 @@ msgstr "صدّر بياناتي"
 msgid "Import"
 msgstr "إستيراد"
 
-#: plugins/import_export/init.php:225
+#: plugins/import_export/init.php:231
 msgid "Could not import: incorrect schema version."
 msgstr "لم أتمكن من الاستيراد: إصدار مختطة قاعدة البيانات غير صحيح."
 
-#: plugins/import_export/init.php:230
+#: plugins/import_export/init.php:236
 msgid "Could not import: unrecognized document format."
 msgstr "لم أتمكن من الاستيراد: صيغة مستند غير معروفة."
 
-#: plugins/import_export/init.php:391
+#: plugins/import_export/init.php:397
 msgid "Finished: "
 msgstr "انتهى:"
 
-#: plugins/import_export/init.php:392
+#: plugins/import_export/init.php:398
 #, php-format
 msgid "%d article processed, "
 msgid_plural "%d articles processed, "
 msgstr[0] "تمت معالجة البند %d ،"
 msgstr[1] "تمت معالجة البنود %d ،"
 
-#: plugins/import_export/init.php:393
+#: plugins/import_export/init.php:399
 #, php-format
 msgid "%d imported, "
 msgid_plural "%d imported, "
 msgstr[0] "تم استيراد %d ،"
 msgstr[1] "تم استيراد %d ،"
 
-#: plugins/import_export/init.php:394
+#: plugins/import_export/init.php:400
 #, php-format
 msgid "%d feed created."
 msgid_plural "%d feeds created."
 msgstr[0] "تم إنشاء الخلاصة %d."
 msgstr[1] "تم إنشاء الخلاصات %d."
 
-#: plugins/import_export/init.php:399
+#: plugins/import_export/init.php:405
 msgid "Could not load XML document."
 msgstr "لم أتمكن من تحميل مستند XML."
 
-#: plugins/import_export/init.php:411
+#: plugins/import_export/init.php:417
 msgid "Prepare data"
 msgstr "جهّز البيانات"
 
-#: plugins/import_export/init.php:428
+#: plugins/import_export/init.php:434
 #, fuzzy, php-format
 msgid "Upload failed with error code %d (%s)"
 msgstr "فشِل الرفع و ظهر رمز الخطأ %d"
 
-#: plugins/import_export/init.php:454
+#: plugins/import_export/init.php:460
 msgid "No file uploaded."
 msgstr "لم يتم تحميل أي ملف."
 
-#: plugins/mail/init.php:28
-msgid "Mail addresses saved."
-msgstr "تم حفظ عنوان البريد."
-
-#: plugins/mail/init.php:34
-msgid "Mail plugin"
-msgstr "إضافة البريد"
-
-#: plugins/mail/init.php:36
-msgid "You can set predefined email addressed here (comma-separated list):"
-msgstr "يمكنك تحديد عناوين بريد معرَّف مسبقاً هنا (قائمة مفصولة بفواصل):"
-
+#: plugins/mailto/init.php:48
+#: plugins/mailto/init.php:54
 #: plugins/mail/init.php:112
 #: plugins/mail/init.php:118
-#: plugins/mailto/init.php:49
-#: plugins/mailto/init.php:55
 msgid "[Forwarded]"
 msgstr "[إعادة توجيه]"
 
+#: plugins/mailto/init.php:48
 #: plugins/mail/init.php:112
-#: plugins/mailto/init.php:49
 msgid "Multiple articles"
 msgstr "بنود متعددة"
 
-#: plugins/mail/init.php:140
-msgid "To:"
-msgstr "إلى:"
+#: plugins/mailto/init.php:70
+msgid "Clicking the following link to invoke your mail client:"
+msgstr "النقر على الرابط التالي لاستدعاء برنامج البريد الإلكتروني لديك:"
 
-#: plugins/mail/init.php:155
-msgid "Subject:"
-msgstr "الموضوع:"
+#: plugins/mailto/init.php:74
+msgid "Forward selected article(s) by email."
+msgstr "إعادة توجيه البنود المختارة عبر البريد."
 
-#: plugins/mail/init.php:172
-msgid "Send e-mail"
-msgstr "أرسل بريد إلكتروني"
+#: plugins/mailto/init.php:77
+msgid "You should be able to edit the message before sending in your mail client."
+msgstr "ستتمكن من تحرير الرسالة في برنامج البريد لديك قبل إرسالها."
 
-#: plugins/close_button/init.php:22
-msgid "Close article"
-msgstr "أغلق البند"
+#: plugins/mailto/init.php:82
+msgid "Close this dialog"
+msgstr "أغلق مربع الحوار هذا"
 
 #: plugins/bookmarklets/init.php:20
 msgid "Bookmarklets"
@@ -2784,34 +2547,124 @@ msgstr "إشترك في Tiny Tiny RSS"
 msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
 msgstr "استخدم العلامة المرجعية التالية لتنشر صفحات عشوائية باستخدام Tiny Tiny RSS"
 
+#: plugins/af_psql_trgm/init.php:28
+#, php-format
+msgid "Data saved (%s, %d)"
+msgstr ""
+
+#: plugins/af_psql_trgm/init.php:112
+#, fuzzy
+msgid "Show related articles"
+msgstr "البنود المشارَكة"
+
+#: plugins/af_psql_trgm/init.php:118
+#: plugins/af_psql_trgm/init.php:220
+#, fuzzy
+msgid "Mark similar articles as read"
+msgstr "أعلّم جميع البنود بـ مقروءة؟"
+
+#: plugins/af_psql_trgm/init.php:157
+msgid "PostgreSQL trigram extension returns string similarity as a floating point number (0-1). Setting it too low might produce false positives, zero disables checking."
+msgstr ""
+
+#: plugins/af_psql_trgm/init.php:160
+#, fuzzy
+msgid "Global settings"
+msgstr "ضمِّن الإعدادات"
+
+#: plugins/af_psql_trgm/init.php:164
+msgid "Minimum similarity:"
+msgstr ""
+
+#: plugins/af_psql_trgm/init.php:169
+msgid "Minimum title length:"
+msgstr ""
+
+#: plugins/af_psql_trgm/init.php:174
+#, fuzzy
+msgid "Enable for all feeds:"
+msgstr "تمكين تصنيفات الخلاصات"
+
+#: plugins/af_psql_trgm/init.php:191
+#: plugins/af_readability/init.php:78
+msgid "Currently enabled for (click to edit):"
+msgstr ""
+
+#: plugins/af_psql_trgm/init.php:209
+msgid "Similarity (pg_trgm)"
+msgstr ""
+
+#: plugins/nsfw/init.php:30
+#: plugins/nsfw/init.php:42
+msgid "Not work safe (click to toggle)"
+msgstr "غير آمنة في العمل (أنقر للقلب)"
+
+#: plugins/nsfw/init.php:52
+msgid "NSFW Plugin"
+msgstr "إضافة NSFW"
+
+#: plugins/nsfw/init.php:79
+msgid "Tags to consider NSFW (comma-separated)"
+msgstr "العلامات المعتبرة غير آمنة في العمل (NSFW) (مفصولة بفواصل)"
+
+#: plugins/nsfw/init.php:100
+msgid "Configuration saved."
+msgstr "حُفظت الإعدادات."
+
 #: plugins/toggle_sidebar/init.php:23
 msgid "Collapse feedlist"
 msgstr "طيّ قائمة الخلاصات"
 
-#: plugins/af_zz_imgproxy/init.php:186
-msgid "Image proxy settings (af_zz_imgproxy)"
+#: plugins/af_readability/init.php:21
+msgid "Data saved."
 msgstr ""
 
-#: plugins/af_zz_imgproxy/init.php:211
+#: plugins/af_readability/init.php:33
 #, fuzzy
-msgid "Enable proxy for all remote images."
-msgstr "تمكين تصنيفات الخلاصات"
+msgid "Inline content"
+msgstr "حرّر ملاحظة للبند"
 
-#: plugins/mailto/init.php:71
-msgid "Clicking the following link to invoke your mail client:"
-msgstr "النقر على الرابط التالي لاستدعاء برنامج البريد الإلكتروني لديك:"
+#: plugins/af_readability/init.php:39
+msgid "Readability settings (af_readability)"
+msgstr ""
 
-#: plugins/mailto/init.php:75
-msgid "Forward selected article(s) by email."
-msgstr "إعادة توجيه البنود المختارة عبر البريد."
+#: plugins/af_readability/init.php:66
+msgid "Use Readability for pages shared via bookmarklet."
+msgstr ""
 
-#: plugins/mailto/init.php:78
-msgid "You should be able to edit the message before sending in your mail client."
-msgstr "ستتمكن من تحرير الرسالة في برنامج البريد لديك قبل إرسالها."
+#: plugins/af_readability/init.php:95
+#, fuzzy
+msgid "Readability"
+msgstr "تحقق من التوفُّر"
 
-#: plugins/mailto/init.php:83
-msgid "Close this dialog"
-msgstr "أغلق مربع الحوار هذا"
+#: plugins/af_readability/init.php:106
+#, fuzzy
+msgid "Inline article content"
+msgstr "حرّر ملاحظة للبند"
+
+#: plugins/mail/init.php:28
+msgid "Mail addresses saved."
+msgstr "تم حفظ عنوان البريد."
+
+#: plugins/mail/init.php:34
+msgid "Mail plugin"
+msgstr "إضافة البريد"
+
+#: plugins/mail/init.php:36
+msgid "You can set predefined email addressed here (comma-separated list):"
+msgstr "يمكنك تحديد عناوين بريد معرَّف مسبقاً هنا (قائمة مفصولة بفواصل):"
+
+#: plugins/mail/init.php:140
+msgid "To:"
+msgstr "إلى:"
+
+#: plugins/mail/init.php:155
+msgid "Subject:"
+msgstr "الموضوع:"
+
+#: plugins/mail/init.php:172
+msgid "Send e-mail"
+msgstr "أرسل بريد إلكتروني"
 
 #: plugins/share/init.php:39
 msgid "You can disable all articles shared by unique URLs here."
@@ -2825,24 +2678,97 @@ msgstr "إلغاء مشاركة جميع البنود"
 msgid "Share by URL"
 msgstr "شارك عبر عنوان URL"
 
-#: plugins/share/init.php:97
+#: plugins/share/init.php:96
 msgid "You can share this article by the following unique URL:"
 msgstr "يمكنك مشاركة هذا البند بعنوان URL الفريد التالي:"
 
-#: plugins/share/init.php:115
+#: plugins/share/init.php:114
 msgid "Unshare article"
 msgstr "إلغاء مشاركة البند"
 
+#: plugins/af_comics/init.php:48
+msgid "Feeds supported by af_comics"
+msgstr "الخلاصات التي تدعمها af_comics"
+
+#: plugins/af_comics/init.php:50
+msgid "The following comics are currently supported:"
+msgstr "الرسوم الهزلية التالية مدعومة حالياً :"
+
+#: plugins/af_comics/init.php:68
+msgid "GoComics requires a specific URL to workaround their lack of feed support: <code>http://feeds.feedburner.com/uclick/<em>comic_name</em></code> (e.g. <code>http://www.gocomics.com/garfield</code> uses <code>http://feeds.feedburner.com/uclick/garfield</code>)."
+msgstr ""
+
+#: plugins/af_comics/init.php:70
+msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:25
+msgid "Reddit content settings (af_redditimgur)"
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:50
+msgid "Uses Readability (full-text-rss) implementation by <a target='_blank' href='https://bitbucket.org/fivefilters/'>FiveFilters.org</a>"
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:54
+msgid "Extract missing content using Readability"
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:59
+msgid "Enable additional duplicate checking"
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:73
+#: plugins/af_zz_imgproxy/init.php:254
+#, fuzzy
+msgid "Configuration saved"
+msgstr "حُفظت الإعدادات."
+
+#: plugins/note/init.php:26
+#: plugins/note/note.js:11
+msgid "Edit article note"
+msgstr "حرّر ملاحظة للبند"
+
+#: plugins/close_button/init.php:25
+msgid "Close article"
+msgstr "أغلق البند"
+
+#: plugins/af_zz_imgproxy/init.php:210
+msgid "Image proxy settings (af_zz_imgproxy)"
+msgstr ""
+
+#: plugins/af_zz_imgproxy/init.php:234
+#, fuzzy
+msgid "Enable proxy for all remote images."
+msgstr "تمكين تصنيفات الخلاصات"
+
+#: plugins/af_zz_imgproxy/init.php:238
+#, fuzzy
+msgid "Don't cache files locally."
+msgstr "خبئ الصور محلياً"
+
+#: plugins/auth_internal/init.php:65
+msgid "Please enter your one time password:"
+msgstr "فضلاً أدخل كلمة المرور ذات الاستخدام الواحد:"
+
+#: plugins/auth_internal/init.php:188
+msgid "Password has been changed."
+msgstr "تم تغيير كلمة المرور."
+
+#: plugins/auth_internal/init.php:190
+msgid "Old password is incorrect."
+msgstr "كلمة المرور القديمة غير صحيحة."
+
 #: js/FeedTree.js:172
 #, fuzzy
 msgid "(Un)collapse"
 msgstr "طيّ/بَسْط الشريط الجانبي"
 
-#: js/PrefFeedTree.js:52
+#: js/PrefFeedTree.js:54
 msgid "Edit category"
 msgstr "حرِّر التصنيف"
 
-#: js/PrefFeedTree.js:59
+#: js/PrefFeedTree.js:61
 msgid "Remove category"
 msgstr "إحذف التصنيف"
 
@@ -2877,63 +2803,55 @@ msgid "Create Filter"
 msgstr "إنشاء مرشِّح"
 
 #: js/functions.js:1128
-msgid "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification hub again on next feed update."
-msgstr "إعادة تعيين الإشتراك ؟ Tiny Tiny RSS سوف يحاول الإشتراك ثانية لدى موزع الإشعارات عند التحديث القادم للخلاصة."
-
-#: js/functions.js:1139
-msgid "Subscription reset."
-msgstr "إعادة تعيين الإشتراك."
-
-#: js/functions.js:1149
-#: js/tt-rss.js:695
+#: js/tt-rss.js:696
 #, perl-format
 msgid "Unsubscribe from %s?"
 msgstr "إلغاء الإشتراك في %s ؟"
 
-#: js/functions.js:1152
+#: js/functions.js:1131
 msgid "Removing feed..."
 msgstr "جارٍ حذف الخلاصة..."
 
-#: js/functions.js:1225
+#: js/functions.js:1204
 msgid "Please enter category title:"
 msgstr "فضلاً أدخِل عنوان التصنيف:"
 
-#: js/functions.js:1250
+#: js/functions.js:1229
 msgid "Generate new syndication address for this feed?"
 msgstr "توليد عنوان "
 
-#: js/functions.js:1254
-#: js/prefs.js:1154
+#: js/functions.js:1233
+#: js/prefs.js:1150
 msgid "Trying to change address..."
 msgstr "محاولة تغيير العنوان..."
 
-#: js/functions.js:1497
-#: js/functions.js:1606
+#: js/functions.js:1476
+#: js/functions.js:1585
 #: js/prefs.js:398
 #: js/prefs.js:424
 #: js/prefs.js:456
 #: js/prefs.js:599
 #: js/prefs.js:617
-#: js/prefs.js:1136
-#: js/prefs.js:1263
+#: js/prefs.js:1132
+#: js/prefs.js:1259
 msgid "No feeds are selected."
 msgstr "لم يتم اختيار خلاصة"
 
-#: js/functions.js:1540
+#: js/functions.js:1519
 msgid "Remove selected feeds from the archive? Feeds with stored articles will not be removed."
 msgstr "هل ترغب حذف الخلاصات المختارة من المحفوظات ؟ لن تحذف الخلاصات ذات البنود المخزَّنة."
 
-#: js/functions.js:1577
+#: js/functions.js:1556
 msgid "Feeds with update errors"
 msgstr "الخلاصات التي حصلت أخطاء أثناء تحديثها"
 
-#: js/functions.js:1588
-#: js/prefs.js:1117
+#: js/functions.js:1567
+#: js/prefs.js:1113
 msgid "Remove selected feeds?"
 msgstr "أحذف الخلاصات المختارة؟"
 
-#: js/functions.js:1591
-#: js/prefs.js:1120
+#: js/functions.js:1570
+#: js/prefs.js:1116
 msgid "Removing selected feeds..."
 msgstr "يجري حذف الخلاصات المختارة..."
 
@@ -2956,9 +2874,7 @@ msgstr "محرِّر المستخدم"
 #: js/prefs.js:100
 #: js/prefs.js:209
 #: js/prefs.js:706
-#: plugins/instances/instances.js:26
-#: plugins/instances/instances.js:89
-#: js/functions.js:1408
+#: js/functions.js:1387
 msgid "Saving data..."
 msgstr "أحفظُ البيانات..."
 
@@ -2983,7 +2899,7 @@ msgid "Removing selected labels..."
 msgstr "يجري حذف الأسماء المختارة..."
 
 #: js/prefs.js:308
-#: js/prefs.js:1304
+#: js/prefs.js:1300
 msgid "No labels are selected."
 msgstr "لم يتم اختيار أسماء."
 
@@ -3082,28 +2998,28 @@ msgstr "أحفظ التغييرات في الخلاصات المختارة؟"
 msgid "OPML Import"
 msgstr "إستيراد OPML"
 
-#: js/prefs.js:764
+#: js/prefs.js:759
 msgid "Please choose an OPML file first."
 msgstr "فضلاً إختر ملف OPML أولاً."
 
-#: js/prefs.js:767
+#: js/prefs.js:762
 #: plugins/import_export/import_export.js:115
 msgid "Importing, please wait..."
 msgstr "الإستيراد جارٍ ، يرجى الإنتظار..."
 
-#: js/prefs.js:928
+#: js/prefs.js:924
 msgid "Reset to defaults?"
 msgstr "إعادة التعيين إلى الإعدادات الافتراضية؟"
 
-#: js/prefs.js:1628
+#: js/prefs.js:1624
 msgid "Subscribing to feeds..."
 msgstr "يجري الاشتراك في الخلاصات..."
 
-#: js/prefs.js:1647
+#: js/prefs.js:1643
 msgid "Clear stored data for this plugin?"
 msgstr "أمسح البيانات المخزنة لهذه الإضافة؟"
 
-#: js/prefs.js:1661
+#: js/prefs.js:1657
 msgid "Clear all messages in the error log?"
 msgstr "أمسح كل الرسائل في سجل الأخطاء؟"
 
@@ -3115,177 +3031,147 @@ msgstr "أعلّم جميع البنود بـ مقروءة؟"
 msgid "Marking all feeds as read..."
 msgstr "يجري تعليم جميع البنود مقروءة..."
 
-#: js/tt-rss.js:401
+#: js/tt-rss.js:402
 msgid "Please enable mail plugin first."
 msgstr "فضلاً فعِّل إضافة البريد قبل البدء."
 
-#: js/tt-rss.js:449
-#: js/functions.js:1387
-#: js/tt-rss.js:676
+#: js/tt-rss.js:450
+#: js/functions.js:1366
+#: js/tt-rss.js:677
 msgid "You can't edit this kind of feed."
 msgstr "لايمكنك تحرير هذا النوع من الخلاصات."
 
-#: js/tt-rss.js:530
+#: js/tt-rss.js:531
 msgid "Please enable embed_original plugin first."
 msgstr "فضلاً فعِّل إضافة تضمين الأصل قبل البدء."
 
-#: js/tt-rss.js:543
-#: js/tt-rss.js:726
+#: js/tt-rss.js:544
+#: js/tt-rss.js:727
 msgid "Widescreen is not available in combined mode."
 msgstr ""
 
-#: js/tt-rss.js:824
+#: js/tt-rss.js:825
 msgid "You can't rescore this kind of feed."
 msgstr "لا يمكنك إعادة حساب نقاط هذا النوع من الخلاصات."
 
-#: js/tt-rss.js:829
-#: js/tt-rss.js:689
+#: js/tt-rss.js:830
+#: js/tt-rss.js:690
 msgid "Please select some feed first."
 msgstr "فضلاً إختر أي خلاصة في البداية."
 
-#: js/tt-rss.js:834
+#: js/tt-rss.js:835
 #, perl-format
 msgid "Rescore articles in %s?"
 msgstr "إعادة حساب نقاط البنود في %s؟"
 
-#: js/tt-rss.js:837
+#: js/tt-rss.js:838
 msgid "Rescoring articles..."
 msgstr "إعادة حساب نقاط البنود..."
 
-#: js/viewfeed.js:919
-#: js/viewfeed.js:957
-#: js/viewfeed.js:1005
-#: js/viewfeed.js:1931
-#: plugins/mail/mail.js:7
+#: js/viewfeed.js:921
+#: js/viewfeed.js:959
+#: js/viewfeed.js:1007
+#: js/viewfeed.js:1933
 #: plugins/mailto/init.js:7
-#: js/viewfeed.js:677
-#: js/viewfeed.js:699
-#: js/viewfeed.js:720
-#: js/viewfeed.js:779
-#: js/viewfeed.js:807
+#: plugins/mail/mail.js:7
+#: js/viewfeed.js:679
+#: js/viewfeed.js:701
+#: js/viewfeed.js:722
+#: js/viewfeed.js:781
+#: js/viewfeed.js:809
 msgid "No articles are selected."
 msgstr "لم يتم اختيار أي بند."
 
-#: js/viewfeed.js:927
+#: js/viewfeed.js:929
 #, perl-format
 msgid "Delete %d selected article in %s?"
 msgid_plural "Delete %d selected articles in %s?"
 msgstr[0] "أحذف %d البند المختار في %s ؟"
 msgstr[1] "أحذف %d البنود المختارة في %s ؟"
 
-#: js/viewfeed.js:929
+#: js/viewfeed.js:931
 #, perl-format
 msgid "Delete %d selected article?"
 msgid_plural "Delete %d selected articles?"
 msgstr[0] "حذف البند %d المختار ؟"
 msgstr[1] "حذف البنود %d المختارة ؟"
 
-#: js/viewfeed.js:966
+#: js/viewfeed.js:968
 #, perl-format
 msgid "Archive %d selected article in %s?"
 msgid_plural "Archive %d selected articles in %s?"
 msgstr[0] "حفظ البند %d الذي اخترته في %s ؟"
 msgstr[1] "حفظ البنود %d التي اخترتها في %s ؟"
 
-#: js/viewfeed.js:969
+#: js/viewfeed.js:971
 #, perl-format
 msgid "Move %d archived article back?"
 msgid_plural "Move %d archived articles back?"
 msgstr[0] "استعادة البند المحفوظ  %d ؟"
 msgstr[1] "استعادة البنود المحفوظة  %d ؟"
 
-#: js/viewfeed.js:971
+#: js/viewfeed.js:973
 msgid "Please note that unstarred articles might get purged on next feed update."
 msgstr "يرجى ملاحظة أن البنود غير المعلّمة بنجمة قد يتم تنظيفها في تحديث الخلاصات القادم."
 
-#: js/viewfeed.js:1011
+#: js/viewfeed.js:1013
 #, perl-format
 msgid "Mark %d selected article in %s as read?"
 msgid_plural "Mark %d selected articles in %s as read?"
 msgstr[0] "تعليم البند %d المختار في %s مقروءاً ؟"
 msgstr[1] "تعليم البنود %d المختارة في %s مقروءة ؟"
 
-#: js/viewfeed.js:1031
+#: js/viewfeed.js:1033
 msgid "Edit article Tags"
 msgstr "حرِّر علامات البند"
 
-#: js/viewfeed.js:1037
+#: js/viewfeed.js:1039
 msgid "Saving article tags..."
 msgstr "يجري حفظ علامات البند..."
 
-#: js/viewfeed.js:1670
+#: js/viewfeed.js:1672
 msgid "Open original article"
 msgstr "فتح البند الأصلي"
 
-#: js/viewfeed.js:1677
+#: js/viewfeed.js:1679
 msgid "Display article URL"
 msgstr "إعرض عنوان URL للبند"
 
-#: js/viewfeed.js:1787
+#: js/viewfeed.js:1789
 msgid "Assign label"
 msgstr "أسند تسمية"
 
-#: js/viewfeed.js:1792
+#: js/viewfeed.js:1794
 msgid "Remove label"
 msgstr "إحذف التسمية"
 
-#: js/viewfeed.js:1824
+#: js/viewfeed.js:1826
 msgid "Select articles in group"
 msgstr "إختر البنود في مجموعة"
 
-#: js/viewfeed.js:1834
+#: js/viewfeed.js:1836
 msgid "Mark group as read"
 msgstr "تعليم المجموعة مقروءة"
 
-#: js/viewfeed.js:1846
+#: js/viewfeed.js:1848
 msgid "Mark feed as read"
 msgstr "علِّم الخلاصة مقروءة"
 
-#: js/viewfeed.js:1899
+#: js/viewfeed.js:1901
 msgid "Please enter new score for selected articles:"
 msgstr "فضلاً أدخل نقطة جديدة للبنود المختارة:"
 
-#: js/viewfeed.js:1962
+#: js/viewfeed.js:1964
 msgid "Please enter new score for this article:"
 msgstr "فضلاً أدخل نقطة جديدة لهذا البند:"
 
-#: js/viewfeed.js:1993
+#: js/viewfeed.js:1995
 msgid "Article URL:"
 msgstr "عنوان URL للبند:"
 
-#: plugins/instances/instances.js:10
-msgid "Link Instance"
-msgstr "أربط المثيلة"
-
-#: plugins/instances/instances.js:73
-msgid "Edit Instance"
-msgstr "حرّر المثيلة"
-
-#: plugins/instances/instances.js:122
-msgid "Remove selected instances?"
-msgstr "أحذف المثيلات المختارة؟"
-
-#: plugins/instances/instances.js:125
-msgid "Removing selected instances..."
-msgstr "جارٍ حذف المثيلات المختارة..."
-
-#: plugins/instances/instances.js:139
-#: plugins/instances/instances.js:151
-msgid "No instances are selected."
-msgstr "لم يتم اختيار مثيلات."
-
-#: plugins/instances/instances.js:156
-msgid "Please select only one instance."
-msgstr "فضلاً إختر مثيلة واحدة فقط."
-
-#: plugins/note/note.js:17
-msgid "Saving article note..."
-msgstr "جارٍ حفظ البند..."
-
-#: plugins/af_psql_trgm/init.js:11
-#, fuzzy
-msgid "Related articles"
-msgstr "البنود المشارَكة"
+#: plugins/embed_original/init.js:6
+msgid "Sorry, your browser does not support sandboxed iframes."
+msgstr "آسف، مستعرضك لايدعم إطارات iframe في صندوق الرمل."
 
 #: plugins/import_export/import_export.js:13
 msgid "Export Data"
@@ -3306,11 +3192,16 @@ msgstr "إستيراد البيانات"
 msgid "Please choose the file first."
 msgstr "فضلاً إختر الملف أولاً."
 
-#: plugins/mail/mail.js:21
 #: plugins/mailto/init.js:21
+#: plugins/mail/mail.js:21
 msgid "Forward article by email"
 msgstr "أعد توجيه البند بالبريد"
 
+#: plugins/af_psql_trgm/init.js:11
+#, fuzzy
+msgid "Related articles"
+msgstr "البنود المشارَكة"
+
 #: plugins/mail/mail.js:36
 msgid "Error sending email:"
 msgstr ""
@@ -3320,10 +3211,6 @@ msgstr ""
 msgid "Your message has been sent."
 msgstr "تم حفظ بياناتك الشخصية."
 
-#: plugins/embed_original/init.js:6
-msgid "Sorry, your browser does not support sandboxed iframes."
-msgstr "آسف، مستعرضك لايدعم إطارات iframe في صندوق الرمل."
-
 #: plugins/shorten_expanded/init.js:39
 msgid "Click to expand article"
 msgstr "أنقر لتوسيع البند"
@@ -3353,7 +3240,7 @@ msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr "هذا سيُبطل كل عناوين URL للبنود المشارَكة سابقاً.  إستمرار ؟"
 
 #: plugins/share/share_prefs.js:6
-#: js/prefs.js:1437
+#: js/prefs.js:1433
 msgid "Clearing URLs..."
 msgstr "يجري مسح عناوين URL..."
 
@@ -3361,23 +3248,44 @@ msgstr "يجري مسح عناوين URL..."
 msgid "Shared URLs cleared."
 msgstr "تم مسح عناوين URL المشارَكة."
 
+#: plugins/note/note.js:17
+msgid "Saving article note..."
+msgstr "جارٍ حفظ البند..."
+
 #: js/feedlist.js:429
-#: js/feedlist.js:496
 msgid "Mark all articles in %s as read?"
 msgstr "تعليم جميع البنود في %s مقروءة؟"
 
 #: js/feedlist.js:487
-msgid "Mark all articles in %s older than 1 day as read?"
+#, fuzzy
+msgid "Mark %w in %s older than 1 day as read?"
 msgstr "تعليم جميع البنود في %s الأقدم من يوم واحد مقروءة؟"
 
 #: js/feedlist.js:490
-msgid "Mark all articles in %s older than 1 week as read?"
+#, fuzzy
+msgid "Mark %w in %s older than 1 week as read?"
 msgstr "تعليم جميع البنود في %s الأقدم من أسبوع مقروءة؟"
 
 #: js/feedlist.js:493
-msgid "Mark all articles in %s older than 2 weeks as read?"
+#, fuzzy
+msgid "Mark %w in %s older than 2 weeks as read?"
 msgstr "تعليم جميع البنود في %s الأقدم من أسبوعين مقروءة؟"
 
+#: js/feedlist.js:496
+#, fuzzy
+msgid "Mark %w in %s as read?"
+msgstr "تعليم جميع البنود في %s مقروءة؟"
+
+#: js/feedlist.js:499
+#, fuzzy
+msgid "search results"
+msgstr "نتائج البحث: %s"
+
+#: js/feedlist.js:499
+#, fuzzy
+msgid "all articles"
+msgstr "كل البنود"
+
 #: js/functions.js:506
 msgid "Error explained"
 msgstr "شرح الخطأ"
@@ -3458,178 +3366,247 @@ msgstr "أنت مشترك بالفعل في هذه الخلاصة."
 msgid "Edit rule"
 msgstr "تحرير القاعدة"
 
-#: js/functions.js:1402
+#: js/functions.js:1381
 msgid "Edit Feed"
 msgstr "حرِّر الخلاصة"
 
-#: js/functions.js:1435
+#: js/functions.js:1414
 msgid "More Feeds"
 msgstr "خلاصات أكثر"
 
-#: js/functions.js:1631
+#: js/functions.js:1610
 msgid "Help"
 msgstr "مساعدة"
 
-#: js/prefs.js:1032
+#: js/prefs.js:1028
 msgid "Remove category %s? Any nested feeds would be placed into Uncategorized."
 msgstr "أحذف التصنيف %s ؟ ستوضع أي خلاصة ضمن هذا التصنيف في \"غير مصنَّف\""
 
-#: js/prefs.js:1038
+#: js/prefs.js:1034
 msgid "Removing category..."
 msgstr "يجري حذف التصنيف..."
 
-#: js/prefs.js:1056
+#: js/prefs.js:1052
 msgid "Remove selected categories?"
 msgstr "أحذف التصنيفات المختارة؟"
 
-#: js/prefs.js:1059
+#: js/prefs.js:1055
 msgid "Removing selected categories..."
 msgstr "يجري حذف التصنيفات المختارة..."
 
-#: js/prefs.js:1072
+#: js/prefs.js:1068
 msgid "No categories are selected."
 msgstr "لم يتم اختيار أي تصنيف."
 
-#: js/prefs.js:1079
+#: js/prefs.js:1075
 msgid "Category title:"
 msgstr "عنوان التصنيف:"
 
-#: js/prefs.js:1083
+#: js/prefs.js:1079
 msgid "Creating category..."
 msgstr "إنشاء التصنيف..."
 
-#: js/prefs.js:1106
+#: js/prefs.js:1102
 msgid "Feeds without recent updates"
 msgstr "الخلاصات بلا تحديثات مؤخراً"
 
-#: js/prefs.js:1150
+#: js/prefs.js:1146
 msgid "Replace current OPML publishing address with a new one?"
 msgstr "أستبدل عنوان النشر الحالي للـ OPML بعنوان جديد؟"
 
-#: js/prefs.js:1227
+#: js/prefs.js:1223
 msgid "Clearing feed..."
 msgstr "يجري مسح الخلاصة..."
 
-#: js/prefs.js:1247
+#: js/prefs.js:1243
 msgid "Rescore articles in selected feeds?"
 msgstr "هل تريد إعادة حساب نقاط البنود في الخلاصات المختارة؟"
 
-#: js/prefs.js:1250
+#: js/prefs.js:1246
 msgid "Rescoring selected feeds..."
 msgstr "إعادة حساب نقاط الخلاصات المختارة..."
 
-#: js/prefs.js:1270
+#: js/prefs.js:1266
 msgid "Rescore all articles? This operation may take a lot of time."
 msgstr "هل تريد حقاً إعادة حساب نقاط كل البنود؟ قد تستغرق هذه العملية وقتاً طويلاً."
 
-#: js/prefs.js:1273
+#: js/prefs.js:1269
 msgid "Rescoring feeds..."
 msgstr "إعادة حساب نقاط الخلاصات..."
 
-#: js/prefs.js:1289
+#: js/prefs.js:1285
 msgid "Reset selected labels to default colors?"
 msgstr "أعيد تعيين الألوان الافتراضية للأسماء المختارة ؟"
 
-#: js/prefs.js:1321
+#: js/prefs.js:1317
 msgid "Settings Profiles"
 msgstr "ملفات شخصية للضبط"
 
-#: js/prefs.js:1330
+#: js/prefs.js:1326
 msgid "Remove selected profiles? Active and default profiles will not be removed."
 msgstr "هل ترغب حذف الملفات الشخصية المختارة ؟ الملفات الفعالة والافتراضية لن تحذف."
 
-#: js/prefs.js:1333
+#: js/prefs.js:1329
 msgid "Removing selected profiles..."
 msgstr "حذف الملفات الشخصية المختارة..."
 
-#: js/prefs.js:1349
+#: js/prefs.js:1345
 msgid "No profiles are selected."
 msgstr "لم تخترملفاً شخصياً."
 
-#: js/prefs.js:1357
-#: js/prefs.js:1410
+#: js/prefs.js:1353
+#: js/prefs.js:1406
 msgid "Activate selected profile?"
 msgstr "تفعيل الملف الشخصي المختار ؟"
 
-#: js/prefs.js:1374
-#: js/prefs.js:1426
+#: js/prefs.js:1370
+#: js/prefs.js:1422
 msgid "Please choose a profile to activate."
 msgstr "فضلاً إختر الملف الشخصي للتفعيل."
 
-#: js/prefs.js:1379
+#: js/prefs.js:1375
 msgid "Creating profile..."
 msgstr "إنشاء الملف الشخصي..."
 
-#: js/prefs.js:1434
+#: js/prefs.js:1430
 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr "هذا سيُبطل كل عناوين URL للخلاصات المشارَكة سابقاً.  إستمرار ؟"
 
-#: js/prefs.js:1444
+#: js/prefs.js:1440
 msgid "Generated URLs cleared."
 msgstr "تم مسح عناوين الـ URL المولَّدة."
 
-#: js/prefs.js:1516
+#: js/prefs.js:1512
 msgid "Label Editor"
 msgstr "محرر التسميات"
 
-#: js/tt-rss.js:684
+#: js/tt-rss.js:685
 msgid "You can't unsubscribe from the category."
 msgstr "لايمكنك إلغاء الإشتراك من التصنيف."
 
-#: js/viewfeed.js:125
-#: js/viewfeed.js:175
-#: js/viewfeed.js:192
+#: js/viewfeed.js:127
+#: js/viewfeed.js:177
+#: js/viewfeed.js:194
 #, fuzzy
 msgid "Click to open next unread feed."
 msgstr "أنقر لتحرير الخلاصة"
 
-#: js/viewfeed.js:129
+#: js/viewfeed.js:131
 msgid "Cancel search"
 msgstr "ألغ البحث"
 
-#: js/viewfeed.js:189
+#: js/viewfeed.js:191
 #, fuzzy
 msgid "New articles found, reload feed to continue."
 msgstr "لم أجد بنوداًلأعرضها."
 
-#: js/viewfeed.js:424
+#: js/viewfeed.js:426
 msgid "Unstar article"
 msgstr "إحذف علامة النجمة"
 
-#: js/viewfeed.js:428
+#: js/viewfeed.js:430
 msgid "Star article"
 msgstr "علّم بنجمة"
 
-#: js/viewfeed.js:478
+#: js/viewfeed.js:480
 msgid "Unpublish article"
 msgstr "ألغ نشر البند"
 
-#: js/viewfeed.js:482
+#: js/viewfeed.js:484
 msgid "Publish article"
 msgstr "أنشر البند"
 
-#: js/viewfeed.js:622
+#: js/viewfeed.js:624
 msgid "%d article selected"
 msgid_plural "%d articles selected"
 msgstr[0] "%d بند مختار"
 msgstr[1] "%d بنود مختارة"
 
-#: js/viewfeed.js:1286
+#: js/viewfeed.js:1288
 msgid "No article is selected."
 msgstr "لم يتم اختيار بند."
 
-#: js/viewfeed.js:1321
+#: js/viewfeed.js:1323
 msgid "No articles found to mark"
 msgstr "لاتوجد بنود لأعلمها"
 
-#: js/viewfeed.js:1323
+#: js/viewfeed.js:1325
 msgid "Mark %d article as read?"
 msgid_plural "Mark %d articles as read?"
 msgstr[0] "تعليم البند %d مقروءاً ؟"
 msgstr[1] "تعليم البنود %d مقروءة ؟"
 
-#~ msgid "Cache images locally"
-#~ msgstr "خبئ الصور محلياً"
+#~ msgid "Resubscribe to push updates"
+#~ msgstr "إعادة الإشتراك في تحديثات الدفع"
+
+#~ msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
+#~ msgstr "إعادة تعيين حالة اشتراك PubSubHubbub للخلاصات المُفعَّل دفعها."
+
+#~ msgid "Download more plugins at tt-rss.org <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forums</a> or <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a>."
+#~ msgstr "يمكن تنزيل المزيد من الإضافات من <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">منتدى</a> أو <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">ويكي</a>  tt-موقع rss.org ."
+
+#~ msgid "Linked"
+#~ msgstr "مرتبط"
+
+#~ msgid "Instance"
+#~ msgstr "مثيلة"
+
+#~ msgid "Instance URL"
+#~ msgstr "عنوان URL للمثيلة"
+
+#~ msgid "Access key:"
+#~ msgstr "مفتاح الوصول:"
+
+#~ msgid "Access key"
+#~ msgstr "مفتاح الوصول"
+
+#~ msgid "Use one access key for both linked instances."
+#~ msgstr "إستخدم مفتاح وصول واحد لكلا المثيلتين المتصلتين."
+
+#~ msgid "Generate new key"
+#~ msgstr "توليد مفتاح جديد"
+
+#~ msgid "Link instance"
+#~ msgstr "ربط مثيلة"
+
+#~ msgid "You can connect other instances of Tiny Tiny RSS to this one to share Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
+#~ msgstr "يمكنك ربط مثيلات Tiny Tiny RSS أخرى للموجودة هنا لمشاركة الخلاصات الشعبية.  إربط بمثيلة Tiny Tiny RSS باستخدام عنوان URL التالي:"
+
+#~ msgid "Last connected"
+#~ msgstr "آخر اتصال"
+
+#~ msgid "Status"
+#~ msgstr "الحالة"
+
+#~ msgid "Stored feeds"
+#~ msgstr "الخلاصات المخزَّنة"
+
+#~ msgid "Create link"
+#~ msgstr "أنشئ رابط"
+
+#~ msgid "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification hub again on next feed update."
+#~ msgstr "إعادة تعيين الإشتراك ؟ Tiny Tiny RSS سوف يحاول الإشتراك ثانية لدى موزع الإشعارات عند التحديث القادم للخلاصة."
+
+#~ msgid "Subscription reset."
+#~ msgstr "إعادة تعيين الإشتراك."
+
+#~ msgid "Link Instance"
+#~ msgstr "أربط المثيلة"
+
+#~ msgid "Edit Instance"
+#~ msgstr "حرّر المثيلة"
+
+#~ msgid "Remove selected instances?"
+#~ msgstr "أحذف المثيلات المختارة؟"
+
+#~ msgid "Removing selected instances..."
+#~ msgstr "جارٍ حذف المثيلات المختارة..."
+
+#~ msgid "No instances are selected."
+#~ msgstr "لم يتم اختيار مثيلات."
+
+#~ msgid "Please select only one instance."
+#~ msgstr "فضلاً إختر مثيلة واحدة فقط."
 
 #~ msgid "The error will be reported to the configured log destination."
 #~ msgstr "سيتم الرفع بالتقرير لوجهة السجل المذكورة في الإعدادات."
diff --git a/locale/bg_BG/LC_MESSAGES/messages.mo b/locale/bg_BG/LC_MESSAGES/messages.mo
index 45986bd8c..8612c9c55 100644
--- a/locale/bg_BG/LC_MESSAGES/messages.mo
+++ b/locale/bg_BG/LC_MESSAGES/messages.mo
diff --git a/locale/bg_BG/LC_MESSAGES/messages.po b/locale/bg_BG/LC_MESSAGES/messages.po
index 2879f1312..f702f4ecc 100644
--- a/locale/bg_BG/LC_MESSAGES/messages.po
+++ b/locale/bg_BG/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tt-rss git\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 15:25+0300\n"
+"POT-Creation-Date: 2017-07-04 16:29+0300\n"
 "PO-Revision-Date: 2015-03-09 17:43+0200\n"
 "Last-Translator: Neter <[email protected]>\n"
 "Language-Team: Bulgarian <>\n"
@@ -171,31 +171,30 @@ msgstr "Потребителят не е намерен"
 #: prefs.php:118
 #: classes/backend.php:5
 #: classes/pref/labels.php:282
-#: classes/pref/feeds.php:1402
-#: classes/pref/filters.php:779
+#: classes/pref/filters.php:819
+#: classes/pref/feeds.php:1376
 #: js/feedlist.js:149
-#: js/functions.js:1131
-#: js/functions.js:1231
-#: js/functions.js:1478
+#: js/functions.js:1210
+#: js/functions.js:1457
 #: js/prefs.js:621
-#: js/prefs.js:818
-#: js/prefs.js:1648
-#: js/prefs.js:1663
-#: js/tt-rss.js:550
-#: js/viewfeed.js:1182
+#: js/prefs.js:813
+#: js/prefs.js:1644
+#: js/prefs.js:1659
+#: js/tt-rss.js:551
+#: js/viewfeed.js:1184
 #: plugins/import_export/import_export.js:17
 #: js/feedlist.js:467
-#: js/feedlist.js:512
+#: js/feedlist.js:515
 #: js/functions.js:372
 #: js/functions.js:630
-#: js/prefs.js:1360
-#: js/prefs.js:1413
-#: js/prefs.js:1452
-#: js/prefs.js:1465
-#: js/prefs.js:1476
-#: js/prefs.js:1491
-#: js/tt-rss.js:567
-#: js/viewfeed.js:762
+#: js/prefs.js:1356
+#: js/prefs.js:1409
+#: js/prefs.js:1448
+#: js/prefs.js:1461
+#: js/prefs.js:1472
+#: js/prefs.js:1487
+#: js/tt-rss.js:568
+#: js/viewfeed.js:764
 msgid "Loading, please wait..."
 msgstr "Зареждане. Моля, изчакайте..."
 
@@ -212,13 +211,13 @@ msgid "All Articles"
 msgstr "Всички статии"
 
 #: index.php:192
-#: include/functions2.php:107
+#: include/functions.php:1181
 #: classes/feeds.php:110
 msgid "Starred"
 msgstr "Със звезда"
 
 #: index.php:193
-#: include/functions2.php:108
+#: include/functions.php:1182
 #: classes/feeds.php:111
 msgid "Published"
 msgstr "Публикувани"
@@ -259,7 +258,7 @@ msgstr "По заглавие"
 
 #: index.php:209
 #: index.php:249
-#: include/functions2.php:95
+#: include/functions.php:1169
 #: classes/feeds.php:115
 #: js/FeedTree.js:138
 #: js/FeedTree.js:166
@@ -299,7 +298,7 @@ msgid "Feed actions:"
 msgstr "Действия с хранилки:"
 
 #: index.php:244
-#: classes/handler/public.php:672
+#: classes/handler/public.php:583
 msgid "Subscribe to feed..."
 msgstr "Абониране за хранилка..."
 
@@ -313,8 +312,8 @@ msgstr "Преточкуване на хранилка"
 
 #: index.php:247
 #: classes/pref/feeds.php:785
-#: classes/pref/feeds.php:1357
-#: js/PrefFeedTree.js:78
+#: classes/pref/feeds.php:1331
+#: js/PrefFeedTree.js:80
 msgid "Unsubscribe"
 msgstr "Отписване"
 
@@ -331,7 +330,7 @@ msgid "Other actions:"
 msgstr "Други действия:"
 
 #: index.php:252
-#: include/functions2.php:81
+#: include/functions.php:1155
 msgid "Toggle widescreen mode"
 msgstr "Превключване на широкоекранен режим"
 
@@ -357,7 +356,7 @@ msgstr "Налични са обновления от Git."
 
 #: prefs.php:33
 #: prefs.php:136
-#: include/functions2.php:110
+#: include/functions.php:1184
 #: classes/pref/prefs.php:435
 msgid "Preferences"
 msgstr "Предпочитания"
@@ -372,20 +371,19 @@ msgstr "Изход от предпочитания"
 
 #: prefs.php:139
 #: classes/pref/feeds.php:112
-#: classes/pref/feeds.php:1297
-#: classes/pref/feeds.php:1346
+#: classes/pref/feeds.php:1271
+#: classes/pref/feeds.php:1320
 msgid "Feeds"
 msgstr "Хранилки"
 
 #: prefs.php:142
-#: classes/pref/filters.php:248
+#: classes/pref/filters.php:273
 msgid "Filters"
 msgstr "Филтри"
 
 #: prefs.php:145
-#: include/functions.php:1327
-#: include/functions.php:1979
 #: classes/pref/labels.php:90
+#: classes/feeds.php:1718
 msgid "Labels"
 msgstr "Етикети"
 
@@ -414,13 +412,13 @@ msgstr "Новите потребителски регистрации са за
 #: register.php:337
 #: register.php:347
 #: register.php:359
-#: classes/handler/public.php:742
-#: classes/handler/public.php:813
-#: classes/handler/public.php:911
-#: classes/handler/public.php:990
-#: classes/handler/public.php:1004
-#: classes/handler/public.php:1011
-#: classes/handler/public.php:1036
+#: classes/handler/public.php:653
+#: classes/handler/public.php:724
+#: classes/handler/public.php:822
+#: classes/handler/public.php:901
+#: classes/handler/public.php:915
+#: classes/handler/public.php:922
+#: classes/handler/public.php:947
 msgid "Return to Tiny Tiny RSS"
 msgstr "Назад към Tiny Tiny RSS"
 
@@ -437,12 +435,12 @@ msgid "Check availability"
 msgstr "Проверка за наличност"
 
 #: register.php:229
-#: classes/handler/public.php:829
+#: classes/handler/public.php:740
 msgid "Email:"
 msgstr "E-mail:"
 
 #: register.php:232
-#: classes/handler/public.php:834
+#: classes/handler/public.php:745
 msgid "How much is two plus two:"
 msgstr "Колко е две плюс две:"
 
@@ -470,17 +468,23 @@ msgstr "Акаунтът е създаден успешно."
 msgid "New user registrations are currently closed."
 msgstr "Текущо новите потребителски регистрации са затворени."
 
-#: update.php:67
+#: update.php:66
 msgid "Tiny Tiny RSS data update script."
 msgstr "Tiny Tiny RSS скрипт за обновяване на данните."
 
-#: include/digest.php:109
-#: include/functions.php:1336
-#: include/functions.php:1880
-#: include/functions.php:1965
-#: include/functions.php:1987
-#: classes/opml.php:421
+#: include/controls.php:83
+#: classes/pref/filters.php:242
+#: classes/pref/filters.php:253
+#: classes/pref/filters.php:544
+msgid "All feeds"
+msgstr "Всички хранилки"
+
+#: include/controls.php:134
+#: include/controls.php:316
 #: classes/pref/feeds.php:228
+#: classes/opml.php:486
+#: classes/feeds.php:1727
+#: classes/digest.php:113
 msgid "Uncategorized"
 msgstr "Без категория"
 
@@ -495,391 +499,287 @@ msgstr[1] "%d архивирани статии"
 msgid "No feeds found."
 msgstr "Няма намерени хранилки."
 
-#: include/functions.php:1029
+#: include/functions.php:900
 #, php-format
 msgid "%d min"
 msgstr ""
 
-#: include/functions.php:1325
-#: include/functions.php:1977
-msgid "Special"
-msgstr "Специални"
-
-#: include/functions.php:1828
-#: classes/pref/filters.php:229
-#: classes/pref/filters.php:507
-msgid "All feeds"
-msgstr "Всички хранилки"
-
-#: include/functions.php:2032
-msgid "Starred articles"
-msgstr "Статии със звезда"
-
-#: include/functions.php:2034
-msgid "Published articles"
-msgstr "Публикувани статии"
-
-#: include/functions.php:2036
-msgid "Fresh articles"
-msgstr "Пресни статии"
-
-#: include/functions.php:2038
-#: include/functions2.php:105
-msgid "All articles"
-msgstr "Всички статии"
-
-#: include/functions.php:2040
-msgid "Archived articles"
-msgstr "Архивирани статии"
-
-#: include/functions.php:2042
-msgid "Recently read"
-msgstr "Наскоро четени"
-
-#: include/functions2.php:57
+#: include/functions.php:1131
 msgid "Navigation"
 msgstr "Навигация"
 
-#: include/functions2.php:58
+#: include/functions.php:1132
 msgid "Open next feed"
 msgstr "Отваряне на следваща хранилка"
 
-#: include/functions2.php:59
+#: include/functions.php:1133
 msgid "Open previous feed"
 msgstr "Отваряне на предходна хранилка"
 
-#: include/functions2.php:60
+#: include/functions.php:1134
 msgid "Open next article"
 msgstr "Отваряне на следваща статия"
 
-#: include/functions2.php:61
+#: include/functions.php:1135
 msgid "Open previous article"
 msgstr "Отваряне на предходна статия"
 
-#: include/functions2.php:62
+#: include/functions.php:1136
 msgid "Open next article (don't scroll long articles)"
 msgstr "Отваряне на следваща статия (без скролиране на дълги статии)"
 
-#: include/functions2.php:63
+#: include/functions.php:1137
 msgid "Open previous article (don't scroll long articles)"
 msgstr "Отваряне на предходна статия (без скролиране на дълги статии)"
 
-#: include/functions2.php:64
+#: include/functions.php:1138
 msgid "Move to next article (don't expand or mark read)"
 msgstr "Преместване към следваща статия (без разгръщане или отбелязване като прочетено)"
 
-#: include/functions2.php:65
+#: include/functions.php:1139
 msgid "Move to previous article (don't expand or mark read)"
 msgstr "Преместване към предходна статия (без разгръщане или отбелязване като прочетено)"
 
-#: include/functions2.php:66
+#: include/functions.php:1140
 msgid "Show search dialog"
 msgstr "Показване на диалога за търсене"
 
-#: include/functions2.php:67
+#: include/functions.php:1141
 msgid "Article"
 msgstr "Статия"
 
-#: include/functions2.php:68
-#: js/viewfeed.js:1699
+#: include/functions.php:1142
+#: js/viewfeed.js:1701
 msgid "Toggle starred"
 msgstr "Превключване със/без звезда"
 
-#: include/functions2.php:69
-#: js/viewfeed.js:1711
+#: include/functions.php:1143
+#: js/viewfeed.js:1713
 msgid "Toggle published"
 msgstr "Превключване (не)публикувано"
 
-#: include/functions2.php:70
-#: js/viewfeed.js:1686
+#: include/functions.php:1144
+#: js/viewfeed.js:1688
 msgid "Toggle unread"
 msgstr "Превключване четено/нечетено"
 
-#: include/functions2.php:71
+#: include/functions.php:1145
 msgid "Edit tags"
 msgstr "Редактиране на тагове"
 
-#: include/functions2.php:72
+#: include/functions.php:1146
 msgid "Open in new window"
 msgstr "Отваряне в нов прозорец"
 
-#: include/functions2.php:73
-#: js/viewfeed.js:1732
+#: include/functions.php:1147
+#: js/viewfeed.js:1734
 msgid "Mark below as read"
 msgstr "Отбелязване на по-долните като прочетени"
 
-#: include/functions2.php:74
-#: js/viewfeed.js:1725
+#: include/functions.php:1148
+#: js/viewfeed.js:1727
 msgid "Mark above as read"
 msgstr "Отбелязване на по-горните като прочетени"
 
-#: include/functions2.php:75
+#: include/functions.php:1149
 msgid "Scroll down"
 msgstr "Скролиране надолу"
 
-#: include/functions2.php:76
+#: include/functions.php:1150
 msgid "Scroll up"
 msgstr "Скролиране нагоре"
 
-#: include/functions2.php:77
+#: include/functions.php:1151
 msgid "Select article under cursor"
 msgstr "Избиране на статията под курсора"
 
-#: include/functions2.php:78
+#: include/functions.php:1152
 msgid "Email article"
 msgstr "Изпращане на статия по e-mail"
 
-#: include/functions2.php:79
+#: include/functions.php:1153
 msgid "Close/collapse article"
 msgstr "Затваряне/свиване на статия"
 
-#: include/functions2.php:80
+#: include/functions.php:1154
 msgid "Toggle article expansion (combined mode)"
 msgstr "Превключване разгръщането на статия (комбиниран режим)"
 
-#: include/functions2.php:82
+#: include/functions.php:1156
 #: plugins/embed_original/init.php:31
 msgid "Toggle embed original"
 msgstr "Превключване на вложен оригинал"
 
-#: include/functions2.php:83
+#: include/functions.php:1157
 msgid "Article selection"
 msgstr "Избор на статия"
 
-#: include/functions2.php:84
+#: include/functions.php:1158
 msgid "Select all articles"
 msgstr "Избор на всички статии"
 
-#: include/functions2.php:85
+#: include/functions.php:1159
 msgid "Select unread"
 msgstr "Избор на нечетени"
 
-#: include/functions2.php:86
+#: include/functions.php:1160
 msgid "Select starred"
 msgstr "Избор на тези със звезда"
 
-#: include/functions2.php:87
+#: include/functions.php:1161
 msgid "Select published"
 msgstr "Избор на публикувани"
 
-#: include/functions2.php:88
+#: include/functions.php:1162
 msgid "Invert selection"
 msgstr "Обръщане на избора"
 
-#: include/functions2.php:89
+#: include/functions.php:1163
 msgid "Deselect everything"
 msgstr "Изчистване на избора"
 
-#: include/functions2.php:90
+#: include/functions.php:1164
 #: classes/pref/feeds.php:555
-#: classes/pref/feeds.php:823
+#: classes/pref/feeds.php:811
 msgid "Feed"
 msgstr "Хранилка"
 
-#: include/functions2.php:91
+#: include/functions.php:1165
 msgid "Refresh current feed"
 msgstr "Опресняване на текущата хранилка"
 
-#: include/functions2.php:92
+#: include/functions.php:1166
 msgid "Un/hide read feeds"
 msgstr "Показване/скриване на прочетените хранилки"
 
-#: include/functions2.php:93
-#: classes/pref/feeds.php:1349
+#: include/functions.php:1167
+#: classes/pref/feeds.php:1323
 msgid "Subscribe to feed"
 msgstr "Абониране за хранилка"
 
-#: include/functions2.php:94
+#: include/functions.php:1168
 #: js/FeedTree.js:145
-#: js/PrefFeedTree.js:72
-#: js/viewfeed.js:1853
+#: js/PrefFeedTree.js:74
+#: js/viewfeed.js:1855
 msgid "Edit feed"
 msgstr "Редактиране на хранилка"
 
-#: include/functions2.php:96
+#: include/functions.php:1170
 msgid "Reverse headlines"
 msgstr "Обръщане на подредбата"
 
-#: include/functions2.php:97
+#: include/functions.php:1171
 msgid "Toggle headline grouping"
 msgstr ""
 
-#: include/functions2.php:98
+#: include/functions.php:1172
 msgid "Debug feed update"
 msgstr "Дебъгване обновяването на хранилка"
 
-#: include/functions2.php:99
+#: include/functions.php:1173
 #, fuzzy
 msgid "Debug viewfeed()"
 msgstr "Дебъгване обновяването на хранилка"
 
-#: include/functions2.php:100
+#: include/functions.php:1174
 #: js/FeedTree.js:194
 msgid "Mark all feeds as read"
 msgstr "Отбелязване на всички хранилки като прочетени"
 
-#: include/functions2.php:101
+#: include/functions.php:1175
 msgid "Un/collapse current category"
 msgstr "Свиване/разгъване на текущата категория"
 
-#: include/functions2.php:102
+#: include/functions.php:1176
 msgid "Toggle combined mode"
 msgstr "Превключване на комбиниран режим"
 
-#: include/functions2.php:103
+#: include/functions.php:1177
 msgid "Toggle auto expand in combined mode"
 msgstr "Превключване авто разтягане в комбиниран режим"
 
-#: include/functions2.php:104
+#: include/functions.php:1178
 msgid "Go to"
 msgstr "Отиди до"
 
-#: include/functions2.php:106
+#: include/functions.php:1179
+#: classes/feeds.php:1602
+msgid "All articles"
+msgstr "Всички статии"
+
+#: include/functions.php:1180
 msgid "Fresh"
 msgstr "Опресняване"
 
-#: include/functions2.php:109
-#: js/tt-rss.js:494
-#: js/tt-rss.js:663
+#: include/functions.php:1183
+#: js/tt-rss.js:495
+#: js/tt-rss.js:664
 msgid "Tag cloud"
 msgstr "Облак с тагове"
 
-#: include/functions2.php:111
+#: include/functions.php:1185
 msgid "Other"
 msgstr "Други"
 
-#: include/functions2.php:112
+#: include/functions.php:1186
 #: classes/pref/labels.php:267
 msgid "Create label"
 msgstr "Създаване на етикет"
 
-#: include/functions2.php:113
-#: classes/pref/filters.php:753
+#: include/functions.php:1187
+#: classes/pref/filters.php:793
 msgid "Create filter"
 msgstr "Създаване на филтър"
 
-#: include/functions2.php:114
+#: include/functions.php:1188
 msgid "Un/collapse sidebar"
 msgstr "Прибиране/изваждане на страничния панел"
 
-#: include/functions2.php:115
+#: include/functions.php:1189
 msgid "Show help dialog"
 msgstr "Показване на помощен диалог"
 
-#: include/functions2.php:670
-#, php-format
-msgid "Search results: %s"
-msgstr "Резултати от търсенето: %s"
-
-#: include/functions2.php:1336
-#: classes/feeds.php:752
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] "коментар"
-msgstr[1] "коментара"
-
-#: include/functions2.php:1340
-#: classes/feeds.php:756
-msgid "comments"
-msgstr "коментари"
-
-#: include/functions2.php:1366
-msgid " - "
-msgstr " - "
-
-#: include/functions2.php:1397
-#: include/functions2.php:1648
-#: classes/article.php:311
-msgid "no tags"
-msgstr "няма тагове"
-
-#: include/functions2.php:1407
-#: classes/feeds.php:738
-msgid "Edit tags for this article"
-msgstr "Редактиране на таговете за тази статия"
-
-#: include/functions2.php:1439
-#: classes/feeds.php:690
-msgid "Originally from:"
-msgstr "Оригинално от:"
-
-#: include/functions2.php:1452
-#: classes/pref/feeds.php:574
-#: classes/feeds.php:703
-msgid "Feed URL"
-msgstr "URL на хранилка"
-
-#: include/functions2.php:1489
-#: classes/backend.php:105
-#: classes/dlg.php:37
-#: classes/dlg.php:60
-#: classes/dlg.php:93
-#: classes/dlg.php:159
-#: classes/dlg.php:186
-#: classes/pref/feeds.php:1652
-#: classes/pref/feeds.php:1718
-#: classes/pref/filters.php:204
-#: classes/pref/prefs.php:1097
-#: plugins/af_psql_trgm/init.php:102
-#: plugins/import_export/init.php:415
-#: plugins/import_export/init.php:461
-#: plugins/share/init.php:121
-msgid "Close this window"
-msgstr "Затваряне на този прозорец"
-
-#: include/functions2.php:1686
-msgid "(edit note)"
-msgstr "(редактиране на бележка)"
-
-#: include/functions2.php:1960
-msgid "unknown type"
-msgstr "незнаен вид"
-
-#: include/functions2.php:2037
-msgid "Attachments"
-msgstr "Прикачени"
-
-#: include/functions2.php:2496
+#: include/functions.php:2456
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: include/functions2.php:2497
+#: include/functions.php:2457
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: include/functions2.php:2498
+#: include/functions.php:2458
 msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
 msgstr ""
 
-#: include/functions2.php:2499
+#: include/functions.php:2459
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: include/functions2.php:2500
+#: include/functions.php:2460
 #, fuzzy
 msgid "No file was uploaded"
 msgstr "Няма качени файлове."
 
-#: include/functions2.php:2501
+#: include/functions.php:2461
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: include/functions2.php:2502
+#: include/functions.php:2462
 msgid "Failed to write file to disk."
 msgstr ""
 
-#: include/functions2.php:2503
+#: include/functions.php:2463
 msgid "A PHP extension stopped the file upload."
 msgstr ""
 
 #: include/login_form.php:197
-#: classes/handler/public.php:569
-#: classes/handler/public.php:824
+#: classes/handler/public.php:480
+#: classes/handler/public.php:735
 msgid "Login:"
 msgstr "Потребител:"
 
 #: include/login_form.php:207
-#: classes/handler/public.php:572
+#: classes/handler/public.php:483
 msgid "Password:"
 msgstr "Парола:"
 
@@ -892,7 +792,7 @@ msgid "Profile:"
 msgstr "Профил:"
 
 #: include/login_form.php:223
-#: classes/handler/public.php:311
+#: classes/handler/public.php:287
 #: classes/pref/prefs.php:1035
 #: classes/rpc.php:63
 msgid "Default profile"
@@ -911,7 +811,7 @@ msgid "Remember me"
 msgstr "Запомни ме"
 
 #: include/login_form.php:249
-#: classes/handler/public.php:577
+#: classes/handler/public.php:488
 msgid "Log in"
 msgstr "Вход"
 
@@ -927,145 +827,44 @@ msgstr "Валидацията на сесията се провали (потр
 msgid "Session failed to validate (password changed)"
 msgstr "Валидацията на сесията се провали (паролата е променена)"
 
-#: classes/article.php:25
-msgid "Article not found."
-msgstr "Статията не е намерена."
-
-#: classes/article.php:197
-msgid "Tags for this article (separated by commas):"
-msgstr "Тагове за тази статия (разделени със запетаи):"
-
-#: classes/article.php:222
-#: classes/pref/labels.php:79
-#: classes/pref/users.php:98
-#: classes/pref/feeds.php:801
-#: classes/pref/feeds.php:943
-#: classes/pref/filters.php:485
-#: classes/pref/prefs.php:981
-#: plugins/instances/init.php:245
-#: plugins/nsfw/init.php:85
-#: plugins/note/init.php:51
-#: plugins/af_readability/init.php:68
-#: plugins/af_redditimgur/init.php:60
-#: plugins/af_psql_trgm/init.php:181
-#: plugins/mail/init.php:64
-#: plugins/af_zz_imgproxy/init.php:213
-msgid "Save"
-msgstr "Запазване"
-
-#: classes/article.php:224
-#: classes/handler/public.php:546
-#: classes/handler/public.php:580
-#: classes/pref/labels.php:81
-#: classes/pref/users.php:100
-#: classes/pref/feeds.php:802
-#: classes/pref/feeds.php:946
-#: classes/pref/feeds.php:1859
-#: classes/pref/filters.php:488
-#: classes/pref/filters.php:902
-#: classes/pref/filters.php:983
-#: classes/pref/filters.php:1076
-#: classes/pref/prefs.php:983
-#: classes/feeds.php:1105
-#: classes/feeds.php:1155
-#: classes/feeds.php:1192
-#: plugins/instances/init.php:248
-#: plugins/instances/init.php:436
-#: plugins/note/init.php:53
-#: plugins/mail/init.php:173
-msgid "Cancel"
-msgstr "Отказ"
-
-#: classes/opml.php:28
-#: classes/opml.php:33
-msgid "OPML Utility"
-msgstr "OPML инструмент"
-
-#: classes/opml.php:37
-msgid "Importing OPML..."
-msgstr "Внасяне на OPML..."
-
-#: classes/opml.php:41
-msgid "Return to preferences"
-msgstr "Връщане към предпочитания"
-
-#: classes/opml.php:271
-#, php-format
-msgid "Adding feed: %s"
-msgstr "Добавяне на хранилка: %s"
-
-#: classes/opml.php:282
-#, php-format
-msgid "Duplicate feed: %s"
-msgstr "Дублирана хранилка: %s"
-
-#: classes/opml.php:296
-#, php-format
-msgid "Adding label %s"
-msgstr "Добавяне на етикет \"%s\""
-
-#: classes/opml.php:299
-#, php-format
-msgid "Duplicate label: %s"
-msgstr "Дублиран етикет: %s"
-
-#: classes/opml.php:311
-#, php-format
-msgid "Setting preference key %s to %s"
-msgstr "Задаване на ключ за предпочитания \"%s\" към \"%s\""
-
-#: classes/opml.php:343
-msgid "Adding filter..."
-msgstr "Добавяне на филтър..."
-
-#: classes/opml.php:421
-#, php-format
-msgid "Processing category: %s"
-msgstr "Обработка на категория: %s"
-
-#: classes/opml.php:470
-#, php-format
-msgid "Upload failed with error code %d"
-msgstr "Качването се провали с код за грешка \"%d\""
-
-#: classes/opml.php:484
-#: plugins/import_export/init.php:442
-msgid "Unable to move uploaded file."
-msgstr "Невъзможност за преместване на качения файл."
-
-#: classes/opml.php:488
-#: plugins/import_export/init.php:446
-msgid "Error: please upload OPML file."
-msgstr "Грешка: моля, качете OPML файл!"
-
-#: classes/opml.php:499
-msgid "Error: unable to find moved OPML file."
-msgstr "Грешка: не може да се намери преместеният OPML файл."
-
-#: classes/opml.php:506
-msgid "Error while parsing document."
-msgstr "Грешка при разбора на документа."
-
-#: classes/backend.php:33
+#: classes/backend.php:31
 msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
 msgstr "Още такива съвети има в Tiny Tiny RSS wiki."
 
-#: classes/backend.php:38
+#: classes/backend.php:36
 msgid "Keyboard Shortcuts"
 msgstr "Клавишни препратки"
 
-#: classes/backend.php:61
+#: classes/backend.php:59
 msgid "Shift"
 msgstr "Shift"
 
-#: classes/backend.php:64
+#: classes/backend.php:62
 msgid "Ctrl"
 msgstr "Ctrl"
 
-#: classes/backend.php:99
+#: classes/backend.php:97
 msgid "Help topic not found."
 msgstr "Помощната тема не е намерена."
 
+#: classes/backend.php:103
+#: classes/dlg.php:37
+#: classes/dlg.php:60
+#: classes/dlg.php:93
+#: classes/dlg.php:159
+#: classes/dlg.php:186
+#: classes/article.php:744
+#: classes/pref/filters.php:206
+#: classes/pref/prefs.php:1097
+#: classes/pref/feeds.php:1626
+#: classes/pref/feeds.php:1692
+#: plugins/import_export/init.php:421
+#: plugins/import_export/init.php:467
+#: plugins/af_psql_trgm/init.php:102
+#: plugins/share/init.php:120
+msgid "Close this window"
+msgstr "Затваряне на този прозорец"
+
 #: classes/dlg.php:17
 msgid "If you have imported labels and/or filters, you might need to reload preferences to see your new data."
 msgstr "Ако имате внесени етикети и/или филтри, може да е нужно да презаредите предпочитанията, за да видите новите Ви данни."
@@ -1076,7 +875,7 @@ msgstr "Вашият публичен OPML URL е:"
 
 #: classes/dlg.php:57
 #: classes/dlg.php:183
-#: plugins/share/init.php:118
+#: plugins/share/init.php:117
 msgid "Generate new URL"
 msgstr "Генериране на нов URL"
 
@@ -1097,128 +896,222 @@ msgstr "Обновяващият демон изисква твърде мног
 msgid "You can view this feed as RSS using the following URL:"
 msgstr "Можете да видите тази хранилка като RSS на следния URL:"
 
-#: classes/handler/public.php:510
+#: classes/article.php:25
+msgid "Article not found."
+msgstr "Статията не е намерена."
+
+#: classes/article.php:197
+msgid "Tags for this article (separated by commas):"
+msgstr "Тагове за тази статия (разделени със запетаи):"
+
+#: classes/article.php:222
+#: classes/pref/labels.php:79
+#: classes/pref/filters.php:519
+#: classes/pref/users.php:98
+#: classes/pref/prefs.php:981
+#: classes/pref/feeds.php:789
+#: classes/pref/feeds.php:931
+#: plugins/af_psql_trgm/init.php:181
+#: plugins/nsfw/init.php:85
+#: plugins/af_readability/init.php:68
+#: plugins/mail/init.php:64
+#: plugins/af_redditimgur/init.php:60
+#: plugins/note/init.php:51
+#: plugins/af_zz_imgproxy/init.php:240
+msgid "Save"
+msgstr "Запазване"
+
+#: classes/article.php:224
+#: classes/handler/public.php:457
+#: classes/handler/public.php:491
+#: classes/pref/labels.php:81
+#: classes/pref/filters.php:522
+#: classes/pref/filters.php:942
+#: classes/pref/filters.php:1022
+#: classes/pref/filters.php:1115
+#: classes/pref/users.php:100
+#: classes/pref/prefs.php:983
+#: classes/pref/feeds.php:790
+#: classes/pref/feeds.php:934
+#: classes/pref/feeds.php:1833
+#: classes/feeds.php:1098
+#: classes/feeds.php:1148
+#: classes/feeds.php:1185
+#: plugins/mail/init.php:173
+#: plugins/note/init.php:53
+msgid "Cancel"
+msgstr "Отказ"
+
+#: classes/article.php:311
+#: classes/article.php:652
+#: classes/article.php:805
+msgid "no tags"
+msgstr "няма тагове"
+
+#: classes/article.php:419
+msgid "unknown type"
+msgstr "незнаен вид"
+
+#: classes/article.php:496
+msgid "Attachments"
+msgstr "Прикачени"
+
+#: classes/article.php:591
+#: classes/feeds.php:741
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] "коментар"
+msgstr[1] "коментара"
+
+#: classes/article.php:595
+#: classes/feeds.php:745
+msgid "comments"
+msgstr "коментари"
+
+#: classes/article.php:621
+msgid " - "
+msgstr " - "
+
+#: classes/article.php:662
+#: classes/feeds.php:727
+msgid "Edit tags for this article"
+msgstr "Редактиране на таговете за тази статия"
+
+#: classes/article.php:694
+#: classes/feeds.php:681
+msgid "Originally from:"
+msgstr "Оригинално от:"
+
+#: classes/article.php:707
+#: classes/pref/feeds.php:574
+#: classes/feeds.php:694
+msgid "Feed URL"
+msgstr "URL на хранилка"
+
+#: classes/article.php:843
+msgid "(edit note)"
+msgstr "(редактиране на бележка)"
+
+#: classes/handler/public.php:421
 #: plugins/bookmarklets/init.php:40
 msgid "Share with Tiny Tiny RSS"
 msgstr "Споделяне с Tiny Tiny RSS"
 
-#: classes/handler/public.php:518
+#: classes/handler/public.php:429
 msgid "Title:"
 msgstr "Заглавие:"
 
-#: classes/handler/public.php:520
+#: classes/handler/public.php:431
 #: classes/pref/feeds.php:572
-#: plugins/instances/init.php:212
-#: plugins/instances/init.php:401
 msgid "URL:"
 msgstr "URL:"
 
-#: classes/handler/public.php:522
+#: classes/handler/public.php:433
 msgid "Content:"
 msgstr "Съдържание:"
 
-#: classes/handler/public.php:524
+#: classes/handler/public.php:435
 msgid "Labels:"
 msgstr "Етикети:"
 
-#: classes/handler/public.php:543
+#: classes/handler/public.php:454
 msgid "Shared article will appear in the Published feed."
 msgstr "Споделените статии ще се появят в \"Публикувани статии\"."
 
-#: classes/handler/public.php:545
+#: classes/handler/public.php:456
 msgid "Share"
 msgstr "Споделяне"
 
-#: classes/handler/public.php:567
+#: classes/handler/public.php:478
 msgid "Not logged in"
 msgstr "Не сте влезли"
 
-#: classes/handler/public.php:626
+#: classes/handler/public.php:537
 msgid "Incorrect username or password"
 msgstr "Грешен потребител или парола"
 
-#: classes/handler/public.php:678
+#: classes/handler/public.php:589
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "Вече сте абонирани за <b>%s</b>."
 
-#: classes/handler/public.php:681
+#: classes/handler/public.php:592
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "Абонирани сте за <b>%s</b>."
 
-#: classes/handler/public.php:684
+#: classes/handler/public.php:595
 #, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "Невъзможно абониране за <b>%s</b>."
 
-#: classes/handler/public.php:687
+#: classes/handler/public.php:598
 #, php-format
 msgid "No feeds found in <b>%s</b>."
 msgstr "Няма намерени хранилки в <b>%s</b>."
 
-#: classes/handler/public.php:690
+#: classes/handler/public.php:601
 msgid "Multiple feed URLs found."
 msgstr "Намерени са множество URL-и на хранилки."
 
-#: classes/handler/public.php:694
+#: classes/handler/public.php:605
 #, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr "Невъзможно абониране за <b>%s</b>.<br>Не може да се изтегли URL на хранилка."
 
-#: classes/handler/public.php:712
+#: classes/handler/public.php:623
 msgid "Subscribe to selected feed"
 msgstr "Абониране за избраната хранилка"
 
-#: classes/handler/public.php:737
+#: classes/handler/public.php:648
 msgid "Edit subscription options"
 msgstr "Редактиране на абонаментните опции"
 
-#: classes/handler/public.php:774
+#: classes/handler/public.php:685
 msgid "Password recovery"
 msgstr "Възстановяване на парола"
 
-#: classes/handler/public.php:817
+#: classes/handler/public.php:728
 msgid "You will need to provide valid account name and email. A password reset link will be sent to your email address."
 msgstr "Нужно е да укажете валидни име на акаунт и e-mail. Връзка за смяна на парола ще бъде изпратена на Вашия e-mail адрес."
 
-#: classes/handler/public.php:839
-#: classes/pref/users.php:350
+#: classes/handler/public.php:750
+#: classes/pref/users.php:349
 msgid "Reset password"
 msgstr "Смяна на парола"
 
-#: classes/handler/public.php:849
+#: classes/handler/public.php:760
 msgid "Some of the required form parameters are missing or incorrect."
 msgstr "Някои от задължителните параметри на формата липсват или са грешни."
 
-#: classes/handler/public.php:853
-#: classes/handler/public.php:919
+#: classes/handler/public.php:764
+#: classes/handler/public.php:830
 msgid "Go back"
 msgstr "Назад"
 
-#: classes/handler/public.php:890
+#: classes/handler/public.php:801
 msgid "[tt-rss] Password reset request"
 msgstr "[tt-rss] Заявка за смяна на парола"
 
-#: classes/handler/public.php:915
+#: classes/handler/public.php:826
 msgid "Sorry, login and email combination not found."
 msgstr "Съжалявам, комбинацията от потребител и e-mail не е намерена."
 
-#: classes/handler/public.php:937
+#: classes/handler/public.php:848
 msgid "Your access level is insufficient to run this script."
 msgstr "Вашето ниво на достъп е недостатъчно за изпълнението на този скрипт."
 
-#: classes/handler/public.php:963
+#: classes/handler/public.php:874
 msgid "Database Updater"
 msgstr "Обновяване на базата данни"
 
-#: classes/handler/public.php:1028
+#: classes/handler/public.php:939
 msgid "Perform updates"
 msgstr "Извършване на обновявания"
 
 #: classes/pref/labels.php:22
-#: classes/pref/filters.php:348
-#: classes/pref/filters.php:823
+#: classes/pref/filters.php:373
+#: classes/pref/filters.php:863
 msgid "Caption"
 msgstr "Надпис"
 
@@ -1240,59 +1133,55 @@ msgid "Created label <b>%s</b>"
 msgstr "Създаден етикет <b>%s</b>"
 
 #: classes/pref/labels.php:258
-#: classes/pref/users.php:334
-#: classes/pref/feeds.php:1337
-#: classes/pref/feeds.php:1600
-#: classes/pref/feeds.php:1664
-#: classes/pref/filters.php:359
-#: classes/pref/filters.php:407
-#: classes/pref/filters.php:744
-#: classes/pref/filters.php:832
-#: classes/pref/filters.php:859
+#: classes/pref/filters.php:384
+#: classes/pref/filters.php:441
+#: classes/pref/filters.php:784
+#: classes/pref/filters.php:872
+#: classes/pref/filters.php:899
+#: classes/pref/users.php:333
 #: classes/pref/prefs.php:992
-#: plugins/instances/init.php:284
+#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1574
+#: classes/pref/feeds.php:1638
 msgid "Select"
 msgstr "Избиране"
 
 #: classes/pref/labels.php:261
-#: classes/pref/users.php:337
-#: classes/pref/feeds.php:1340
-#: classes/pref/feeds.php:1603
-#: classes/pref/feeds.php:1667
-#: classes/pref/filters.php:362
-#: classes/pref/filters.php:410
-#: classes/pref/filters.php:747
-#: classes/pref/filters.php:835
-#: classes/pref/filters.php:862
+#: classes/pref/filters.php:387
+#: classes/pref/filters.php:444
+#: classes/pref/filters.php:787
+#: classes/pref/filters.php:875
+#: classes/pref/filters.php:902
+#: classes/pref/users.php:336
 #: classes/pref/prefs.php:995
+#: classes/pref/feeds.php:1314
+#: classes/pref/feeds.php:1577
+#: classes/pref/feeds.php:1641
 #: classes/feeds.php:102
-#: plugins/instances/init.php:287
 msgid "All"
 msgstr "Всички"
 
 #: classes/pref/labels.php:263
-#: classes/pref/users.php:339
-#: classes/pref/feeds.php:1342
-#: classes/pref/feeds.php:1605
-#: classes/pref/feeds.php:1669
-#: classes/pref/filters.php:364
-#: classes/pref/filters.php:412
-#: classes/pref/filters.php:749
-#: classes/pref/filters.php:837
-#: classes/pref/filters.php:864
+#: classes/pref/filters.php:389
+#: classes/pref/filters.php:446
+#: classes/pref/filters.php:789
+#: classes/pref/filters.php:877
+#: classes/pref/filters.php:904
+#: classes/pref/users.php:338
 #: classes/pref/prefs.php:997
+#: classes/pref/feeds.php:1316
+#: classes/pref/feeds.php:1579
+#: classes/pref/feeds.php:1643
 #: classes/feeds.php:105
-#: plugins/instances/init.php:289
 msgid "None"
 msgstr "Нищо"
 
 #: classes/pref/labels.php:270
-#: classes/pref/users.php:348
+#: classes/pref/filters.php:512
+#: classes/pref/filters.php:806
+#: classes/pref/users.php:347
 #: classes/pref/feeds.php:767
-#: classes/pref/filters.php:478
-#: classes/pref/filters.php:766
-#: classes/feeds.php:1154
-#: plugins/instances/init.php:294
+#: classes/feeds.php:1147
 msgid "Remove"
 msgstr "Премахване"
 
@@ -1300,9 +1189,169 @@ msgstr "Премахване"
 msgid "Clear colors"
 msgstr "Изчистване на цветове"
 
+#: classes/pref/filters.php:153
+#, fuzzy
+msgid "Preview article"
+msgstr "Пресни статии"
+
+#: classes/pref/filters.php:264
+#: classes/pref/filters.php:558
+msgid "(inverse)"
+msgstr "(обратно)"
+
+#: classes/pref/filters.php:260
+#: classes/pref/filters.php:557
+#, php-format
+msgid "%s on %s in %s %s"
+msgstr "%s на %s в %s %s"
+
+#: classes/pref/filters.php:379
+#: classes/pref/filters.php:867
+#: classes/pref/filters.php:981
+msgid "Match"
+msgstr "Съвпадение"
+
+#: classes/pref/filters.php:393
+#: classes/pref/filters.php:450
+#: classes/pref/filters.php:881
+#: classes/pref/filters.php:908
+msgid "Add"
+msgstr "Добавяне"
+
+#: classes/pref/filters.php:396
+#: classes/pref/filters.php:453
+#: classes/pref/filters.php:884
+#: classes/pref/filters.php:911
+#: classes/feeds.php:122
+msgid "Delete"
+msgstr "Изтриване"
+
+#: classes/pref/filters.php:436
+#: classes/pref/filters.php:894
+msgid "Apply actions"
+msgstr "Прилагане на действията"
+
+#: classes/pref/filters.php:486
+#: classes/pref/filters.php:923
+msgid "Enabled"
+msgstr "Активирано"
+
+#: classes/pref/filters.php:495
+#: classes/pref/filters.php:926
+msgid "Match any rule"
+msgstr "Съвпадение с някое правило"
+
+#: classes/pref/filters.php:504
+#: classes/pref/filters.php:929
+msgid "Inverse matching"
+msgstr "Обратно съвпадение"
+
+#: classes/pref/filters.php:516
+#: classes/pref/filters.php:936
+msgid "Test"
+msgstr "Проба"
+
+#: classes/pref/filters.php:780
+#: classes/pref/users.php:323
+#: classes/pref/feeds.php:1307
+#: classes/feeds.php:1118
+#: classes/feeds.php:1184
+#: js/tt-rss.js:165
+msgid "Search"
+msgstr "Търсене"
+
+#: classes/pref/filters.php:796
+msgid "Combine"
+msgstr "Комбиниране"
+
+#: classes/pref/filters.php:799
+#: classes/pref/users.php:345
+msgid "Edit"
+msgstr "Редактиране"
+
+#: classes/pref/filters.php:802
+#: classes/pref/feeds.php:1327
+#: classes/pref/feeds.php:1341
+msgid "Reset sort order"
+msgstr "Нулиране на подредбата"
+
+#: classes/pref/filters.php:810
+#: classes/pref/feeds.php:1363
+msgid "Rescore articles"
+msgstr "Преточкуване на статии"
+
+#: classes/pref/filters.php:939
+msgid "Create"
+msgstr "Създаване"
+
+#: classes/pref/filters.php:993
+msgid "Inverse regular expression matching"
+msgstr "Обръщане на съвпадението от регулярното условие"
+
+#: classes/pref/filters.php:995
+msgid "on field"
+msgstr "върху поле"
+
+#: classes/pref/filters.php:1001
+#: js/PrefFilterTree.js:64
+msgid "in"
+msgstr "в"
+
+#: classes/pref/filters.php:1014
+msgid "Wiki: Filters"
+msgstr "Wiki: Филтри"
+
+#: classes/pref/filters.php:1019
+msgid "Save rule"
+msgstr "Запазване на правило"
+
+#: classes/pref/filters.php:1019
+#: js/functions.js:865
+msgid "Add rule"
+msgstr "Добавяне на правило"
+
+#: classes/pref/filters.php:1042
+msgid "Perform Action"
+msgstr "Извършване на действие"
+
+#: classes/pref/filters.php:1093
+msgid "No actions available"
+msgstr ""
+
+#: classes/pref/filters.php:1112
+msgid "Save action"
+msgstr "Запазване на действие"
+
+#: classes/pref/filters.php:1112
+#: js/functions.js:887
+msgid "Add action"
+msgstr "Добавяне на действие"
+
+#: classes/pref/filters.php:1136
+msgid "[No caption]"
+msgstr "[Без надпис]"
+
+#: classes/pref/filters.php:1138
+#, php-format
+msgid "%s (%d rule)"
+msgid_plural "%s (%d rules)"
+msgstr[0] "%s (%d правило)"
+msgstr[1] "%s (%d правила)"
+
+#: classes/pref/filters.php:1153
+#, fuzzy
+msgid "matches any rule"
+msgstr "Съвпадение с някое правило"
+
+#: classes/pref/filters.php:1156
+#, php-format
+msgid "%s (+%d action)"
+msgid_plural "%s (+%d actions)"
+msgstr[0] "%s (+%d действие)"
+msgstr[1] "%s (+%d действия)"
+
 #: classes/pref/users.php:6
 #: classes/pref/system.php:8
-#: plugins/instances/init.php:154
 msgid "Your access level is insufficient to open this tab."
 msgstr "Вашето ниво на достъп е недостатъчно, за да отворите този раздел."
 
@@ -1313,8 +1362,8 @@ msgstr "Редактиране на правило"
 
 #: classes/pref/users.php:56
 #: classes/pref/feeds.php:637
-#: classes/pref/feeds.php:878
-#: classes/feeds.php:1075
+#: classes/pref/feeds.php:866
+#: classes/feeds.php:1068
 msgid "Authentication"
 msgstr "Автентикация"
 
@@ -1324,7 +1373,7 @@ msgstr "Ниво на достъп:"
 
 #: classes/pref/users.php:77
 #: classes/pref/feeds.php:667
-#: classes/pref/feeds.php:896
+#: classes/pref/feeds.php:884
 msgid "Options"
 msgstr "Опции"
 
@@ -1338,7 +1387,7 @@ msgid "User not found"
 msgstr "Потребителят не е намерен"
 
 #: classes/pref/users.php:132
-#: classes/pref/users.php:400
+#: classes/pref/users.php:399
 msgid "Registered"
 msgstr "Регистриран"
 
@@ -1356,7 +1405,7 @@ msgid "Stored articles"
 msgstr "Статии със звезда"
 
 #: classes/pref/users.php:145
-#: classes/pref/users.php:399
+#: classes/pref/users.php:398
 msgid "Subscribed feeds"
 msgstr "Абонирани хранилки"
 
@@ -1375,505 +1424,57 @@ msgstr "Не може да се създаде потребител <b>%s</b>"
 msgid "User <b>%s</b> already exists."
 msgstr "Потребителят <b>%s</b> вече съществува."
 
-#: classes/pref/users.php:265
+#: classes/pref/users.php:264
 #, php-format
 msgid "Changed password of user <b>%s</b> to <b>%s</b>"
 msgstr "Промяна паролата на потребител <b>%s</b> към <b>%s</b>"
 
-#: classes/pref/users.php:267
+#: classes/pref/users.php:266
 #, php-format
 msgid "Sending new password of user <b>%s</b> to <b>%s</b>"
 msgstr "Изпращане на нова парола на потребител <b>%s</b> към <b>%s</b>"
 
-#: classes/pref/users.php:291
+#: classes/pref/users.php:290
 msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] Известие за смяна на парола"
 
-#: classes/pref/users.php:324
-#: classes/pref/feeds.php:1333
-#: classes/pref/filters.php:740
-#: classes/feeds.php:1125
-#: classes/feeds.php:1191
-#: js/tt-rss.js:165
-msgid "Search"
-msgstr "Търсене"
-
-#: classes/pref/users.php:342
+#: classes/pref/users.php:341
 msgid "Create user"
 msgstr "Създаване на потребител"
 
-#: classes/pref/users.php:346
-#: classes/pref/filters.php:759
-#: plugins/instances/init.php:293
-msgid "Edit"
-msgstr "Редактиране"
-
-#: classes/pref/users.php:397
+#: classes/pref/users.php:396
 #: classes/pref/feeds.php:643
-#: classes/pref/feeds.php:882
-#: classes/pref/feeds.php:1836
-#: classes/feeds.php:1079
+#: classes/pref/feeds.php:870
+#: classes/pref/feeds.php:1810
+#: classes/feeds.php:1072
 msgid "Login"
 msgstr "Потребител"
 
-#: classes/pref/users.php:398
+#: classes/pref/users.php:397
 msgid "Access Level"
 msgstr "Ниво на достъп"
 
-#: classes/pref/users.php:401
+#: classes/pref/users.php:400
 msgid "Last login"
 msgstr "Последен вход"
 
-#: classes/pref/users.php:420
-#: plugins/instances/init.php:334
+#: classes/pref/users.php:419
 msgid "Click to edit"
 msgstr "Клик за редактиране"
 
-#: classes/pref/users.php:441
+#: classes/pref/users.php:440
 msgid "No users defined."
 msgstr "Не е указан потребител."
 
-#: classes/pref/users.php:443
+#: classes/pref/users.php:442
 msgid "No matching users found."
 msgstr "Не са намерени съвпадащи потребители."
 
-#: classes/pref/system.php:29
-msgid "Error Log"
-msgstr "Журнал на грешките"
-
-#: classes/pref/system.php:40
-msgid "Refresh"
-msgstr "Опресняване"
-
-#: classes/pref/system.php:43
-msgid "Clear log"
-msgstr "Изчистване на журнала"
-
-#: classes/pref/system.php:48
-msgid "Error"
-msgstr "Грешка"
-
-#: classes/pref/system.php:49
-msgid "Filename"
-msgstr "Име на файл"
-
-#: classes/pref/system.php:50
-msgid "Message"
-msgstr "Съобщение"
-
-#: classes/pref/system.php:52
-msgid "Date"
-msgstr "Дата"
-
-#: classes/pref/feeds.php:15
-msgid "Check to enable field"
-msgstr "Отметка за активиране на полето"
-
-#: classes/pref/feeds.php:65
-#: classes/pref/feeds.php:214
-#: classes/pref/feeds.php:258
-#: classes/pref/feeds.php:264
-#: classes/pref/feeds.php:290
-#, php-format
-msgid "(%d feed)"
-msgid_plural "(%d feeds)"
-msgstr[0] "(%d хранилка)"
-msgstr[1] "(%d хранилки)"
-
-#: classes/pref/feeds.php:537
 #: classes/pref/prefs.php:18
+#: classes/pref/feeds.php:537
 msgid "General"
 msgstr "Основни"
 
-#: classes/pref/feeds.php:561
-msgid "Feed Title"
-msgstr "Заглавие на хранилка"
-
-#: classes/pref/feeds.php:595
-#: classes/pref/feeds.php:830
-#: classes/pref/feeds.php:1822
-#: classes/feeds.php:1055
-msgid "Place in category:"
-msgstr "Поставяне в категория:"
-
-#: classes/pref/feeds.php:608
-#: classes/pref/feeds.php:844
-#, fuzzy
-msgid "Language:"
-msgstr "Език"
-
-#: classes/pref/feeds.php:615
-#: classes/pref/feeds.php:853
-msgid "Update"
-msgstr "Обновяване"
-
-#: classes/pref/feeds.php:630
-#: classes/pref/feeds.php:869
-msgid "Article purging:"
-msgstr "Изтриване на статия:"
-
-#: classes/pref/feeds.php:658
-#: classes/pref/feeds.php:890
-#: classes/pref/feeds.php:1839
-#: classes/pref/prefs.php:245
-#: classes/feeds.php:1083
-msgid "Password"
-msgstr "Парола"
-
-#: classes/pref/feeds.php:662
-msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
-msgstr "<b>Съвет:</b> трябва да попълните информацията Ви за вход, ако хранилката изисква автентикация, с изключение на Twitter хранилките."
-
-#: classes/pref/feeds.php:681
-#: classes/pref/feeds.php:900
-msgid "Hide from Popular feeds"
-msgstr "Скриване от \"Популярни хранилки\""
-
-#: classes/pref/feeds.php:693
-#: classes/pref/feeds.php:906
-msgid "Include in e-mail digest"
-msgstr "Включване в e-mail справката"
-
-#: classes/pref/feeds.php:706
-#: classes/pref/feeds.php:912
-msgid "Always display image attachments"
-msgstr "Винаги да се показват прикачените изображения"
-
-#: classes/pref/feeds.php:719
-#: classes/pref/feeds.php:920
-msgid "Do not embed images"
-msgstr "Да не се влагат изображения"
-
-#: classes/pref/feeds.php:732
-#: classes/pref/feeds.php:928
-msgid "Cache media"
-msgstr ""
-
-#: classes/pref/feeds.php:744
-#: classes/pref/feeds.php:934
-msgid "Mark updated articles as unread"
-msgstr "Отбелязване на обновените статии като нечетени"
-
-#: classes/pref/feeds.php:748
-msgid "Icon"
-msgstr "Икона"
-
-#: classes/pref/feeds.php:765
-msgid "Replace"
-msgstr "Замяна"
-
-#: classes/pref/feeds.php:772
-#: classes/pref/prefs.php:698
-msgid "Plugins"
-msgstr "Добавки"
-
-#: classes/pref/feeds.php:792
-msgid "Resubscribe to push updates"
-msgstr "Преабониране за прокарване на обновления"
-
-#: classes/pref/feeds.php:799
-msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
-msgstr "Нулиране статуса на PubSubHubbub абонамента за хранилки с позволено прокарване."
-
-#: classes/pref/feeds.php:1200
-#: classes/pref/feeds.php:1253
-msgid "All done."
-msgstr "Готово."
-
-#: classes/pref/feeds.php:1308
-msgid "Feeds with errors"
-msgstr "Хранилки с грешки"
-
-#: classes/pref/feeds.php:1315
-msgid "Inactive feeds"
-msgstr "Неактивни хранилки"
-
-#: classes/pref/feeds.php:1351
-msgid "Edit selected feeds"
-msgstr "Редактиране на избраните хранилки"
-
-#: classes/pref/feeds.php:1353
-#: classes/pref/feeds.php:1367
-#: classes/pref/filters.php:762
-msgid "Reset sort order"
-msgstr "Нулиране на подредбата"
-
-#: classes/pref/feeds.php:1355
-#: js/prefs.js:1622
-msgid "Batch subscribe"
-msgstr "Партидно абониране"
-
-#: classes/pref/feeds.php:1362
-msgid "Categories"
-msgstr "Категории"
-
-#: classes/pref/feeds.php:1365
-msgid "Add category"
-msgstr "Добавяне на категория"
-
-#: classes/pref/feeds.php:1369
-msgid "Remove selected"
-msgstr "Премахване на избраното"
-
-#: classes/pref/feeds.php:1380
-msgid "More actions..."
-msgstr "Още действия..."
-
-#: classes/pref/feeds.php:1384
-msgid "Manual purge"
-msgstr "Ръчно изтриване"
-
-#: classes/pref/feeds.php:1388
-msgid "Clear feed data"
-msgstr "Изчистване данните на хранилката"
-
-#: classes/pref/feeds.php:1389
-#: classes/pref/filters.php:770
-msgid "Rescore articles"
-msgstr "Преточкуване на статии"
-
-#: classes/pref/feeds.php:1442
-msgid "OPML"
-msgstr "OPML"
-
-#: classes/pref/feeds.php:1444
-msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
-msgstr "Чрез OPML можете да изнасяте и внасяте Вашите хранилки, филтри, етикети и Tiny Tiny RSS настройки."
-
-#: classes/pref/feeds.php:1445
-msgid "Only main settings profile can be migrated using OPML."
-msgstr "Само основните настройки на профила могат да се мигрират чрез OPML."
-
-#: classes/pref/feeds.php:1458
-msgid "Import my OPML"
-msgstr "Внасяне на мой OPML"
-
-#: classes/pref/feeds.php:1464
-msgid "Filename:"
-msgstr "Име на файл:"
-
-#: classes/pref/feeds.php:1466
-msgid "Include settings"
-msgstr "Включително настройките"
-
-#: classes/pref/feeds.php:1470
-msgid "Export OPML"
-msgstr "Изнасяне на OPML"
-
-#: classes/pref/feeds.php:1474
-msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
-msgstr "Вашият OPML може да се публикува публично и всеки, който знае долния URL, може да се абонира."
-
-#: classes/pref/feeds.php:1478
-msgid "Public OPML URL"
-msgstr "Публичен OPML URL"
-
-#: classes/pref/feeds.php:1479
-msgid "Display published OPML URL"
-msgstr "Показване на публикувания OPML URL"
-
-#: classes/pref/feeds.php:1488
-msgid "Firefox integration"
-msgstr "Firefox интеграция"
-
-#: classes/pref/feeds.php:1490
-msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
-msgstr "Този Tiny Tiny RSS сайт може да се използва като четец на хранилки във Firefox чрез избиране на връзката по-долу."
-
-#: classes/pref/feeds.php:1497
-msgid "Click here to register this site as a feed reader."
-msgstr "Кликнете тук, за да регистрирате този сайт като четец на хранилки."
-
-#: classes/pref/feeds.php:1505
-msgid "Published & shared articles / Generated feeds"
-msgstr "Публикувани и споделени статии / Генерирани хранилки"
-
-#: classes/pref/feeds.php:1507
-msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
-msgstr "Публикуваните статии са изнесени като публична RSS хранилка и всеки, който знае указания по-долу URL, може да се абонира."
-
-#: classes/pref/feeds.php:1514
-#: classes/feeds.php:54
-#: classes/feeds.php:140
-msgid "View as RSS"
-msgstr "Преглед като RSS"
-
-#: classes/pref/feeds.php:1515
-msgid "Display URL"
-msgstr "Показване на URL"
-
-#: classes/pref/feeds.php:1518
-msgid "Clear all generated URLs"
-msgstr "Изчистване на всички генерирани URL-и"
-
-#: classes/pref/feeds.php:1596
-msgid "These feeds have not been updated with new content for 3 months (oldest first):"
-msgstr "Тези хранилки не са обновявани с ново съдържание от 3 месеца (най-старите отгоре):"
-
-#: classes/pref/feeds.php:1630
-#: classes/pref/feeds.php:1694
-msgid "Click to edit feed"
-msgstr "Клик за редактиране на хранилка"
-
-#: classes/pref/feeds.php:1648
-#: classes/pref/feeds.php:1714
-msgid "Unsubscribe from selected feeds"
-msgstr "Отписване от избраните хранилки"
-
-#: classes/pref/feeds.php:1819
-msgid "Add one valid RSS feed per line (no feed detection is done)"
-msgstr "Добавете по една валидна RSS хранилка на ред (не се прави засичане на хранилки)"
-
-#: classes/pref/feeds.php:1828
-msgid "Feeds to subscribe, One per line"
-msgstr "Хранилки за абониране. По една на ред"
-
-#: classes/pref/feeds.php:1851
-msgid "Feeds require authentication."
-msgstr "Хранилките изискват автентикация."
-
-#: classes/pref/feeds.php:1858
-#: classes/feeds.php:1099
-#: classes/feeds.php:1153
-msgid "Subscribe"
-msgstr "Абониране"
-
-#: classes/pref/filters.php:151
-#, fuzzy
-msgid "Preview article"
-msgstr "Пресни статии"
-
-#: classes/pref/filters.php:239
-#: classes/pref/filters.php:518
-msgid "(inverse)"
-msgstr "(обратно)"
-
-#: classes/pref/filters.php:235
-#: classes/pref/filters.php:517
-#, php-format
-msgid "%s on %s in %s %s"
-msgstr "%s на %s в %s %s"
-
-#: classes/pref/filters.php:354
-#: classes/pref/filters.php:827
-#: classes/pref/filters.php:942
-msgid "Match"
-msgstr "Съвпадение"
-
-#: classes/pref/filters.php:368
-#: classes/pref/filters.php:416
-#: classes/pref/filters.php:841
-#: classes/pref/filters.php:868
-msgid "Add"
-msgstr "Добавяне"
-
-#: classes/pref/filters.php:371
-#: classes/pref/filters.php:419
-#: classes/pref/filters.php:844
-#: classes/pref/filters.php:871
-#: classes/feeds.php:122
-msgid "Delete"
-msgstr "Изтриване"
-
-#: classes/pref/filters.php:402
-#: classes/pref/filters.php:854
-msgid "Apply actions"
-msgstr "Прилагане на действията"
-
-#: classes/pref/filters.php:452
-#: classes/pref/filters.php:883
-msgid "Enabled"
-msgstr "Активирано"
-
-#: classes/pref/filters.php:461
-#: classes/pref/filters.php:886
-msgid "Match any rule"
-msgstr "Съвпадение с някое правило"
-
-#: classes/pref/filters.php:470
-#: classes/pref/filters.php:889
-msgid "Inverse matching"
-msgstr "Обратно съвпадение"
-
-#: classes/pref/filters.php:482
-#: classes/pref/filters.php:896
-msgid "Test"
-msgstr "Проба"
-
-#: classes/pref/filters.php:756
-msgid "Combine"
-msgstr "Комбиниране"
-
-#: classes/pref/filters.php:899
-msgid "Create"
-msgstr "Създаване"
-
-#: classes/pref/filters.php:954
-msgid "Inverse regular expression matching"
-msgstr "Обръщане на съвпадението от регулярното условие"
-
-#: classes/pref/filters.php:956
-msgid "on field"
-msgstr "върху поле"
-
-#: classes/pref/filters.php:962
-#: js/PrefFilterTree.js:64
-msgid "in"
-msgstr "в"
-
-#: classes/pref/filters.php:975
-msgid "Wiki: Filters"
-msgstr "Wiki: Филтри"
-
-#: classes/pref/filters.php:980
-msgid "Save rule"
-msgstr "Запазване на правило"
-
-#: classes/pref/filters.php:980
-#: js/functions.js:865
-msgid "Add rule"
-msgstr "Добавяне на правило"
-
-#: classes/pref/filters.php:1003
-msgid "Perform Action"
-msgstr "Извършване на действие"
-
-#: classes/pref/filters.php:1054
-msgid "No actions available"
-msgstr ""
-
-#: classes/pref/filters.php:1073
-msgid "Save action"
-msgstr "Запазване на действие"
-
-#: classes/pref/filters.php:1073
-#: js/functions.js:887
-msgid "Add action"
-msgstr "Добавяне на действие"
-
-#: classes/pref/filters.php:1097
-msgid "[No caption]"
-msgstr "[Без надпис]"
-
-#: classes/pref/filters.php:1099
-#, php-format
-msgid "%s (%d rule)"
-msgid_plural "%s (%d rules)"
-msgstr[0] "%s (%d правило)"
-msgstr[1] "%s (%d правила)"
-
-#: classes/pref/filters.php:1114
-#, fuzzy
-msgid "matches any rule"
-msgstr "Съвпадение с някое правило"
-
-#: classes/pref/filters.php:1117
-#, php-format
-msgid "%s (+%d action)"
-msgid_plural "%s (+%d actions)"
-msgstr[0] "%s (+%d действие)"
-msgstr[1] "%s (+%d действия)"
-
 #: classes/pref/prefs.php:19
 msgid "Interface"
 msgstr "Интерфейс"
@@ -2047,7 +1648,7 @@ msgid "Strip all but most common HTML tags when reading articles."
 msgstr "Премахване на HTML кодовете при показване на статиите, освен най-основните."
 
 #: classes/pref/prefs.php:53
-#: js/prefs.js:1584
+#: js/prefs.js:1580
 msgid "Customize stylesheet"
 msgstr "Нагласяване стила на страницата"
 
@@ -2115,6 +1716,14 @@ msgstr "Ниво на достъп"
 msgid "Save data"
 msgstr "Запазване на данните"
 
+#: classes/pref/prefs.php:245
+#: classes/pref/feeds.php:658
+#: classes/pref/feeds.php:878
+#: classes/pref/feeds.php:1813
+#: classes/feeds.php:1076
+msgid "Password"
+msgstr "Парола"
+
 #: classes/pref/prefs.php:254
 msgid "Your password is at default value, please change it."
 msgstr "Паролата Ви е със стойност по подразбиране. Моля, сменете я!"
@@ -2213,18 +1822,23 @@ msgstr "Управление на профили"
 msgid "Reset to defaults"
 msgstr "Връщане по подразбиране"
 
+#: classes/pref/prefs.php:698
+#: classes/pref/feeds.php:772
+msgid "Plugins"
+msgstr "Добавки"
+
 #: classes/pref/prefs.php:700
 msgid "You will need to reload Tiny Tiny RSS for plugin changes to take effect."
 msgstr "Ще трябва да презаредите Tiny Tiny RSS, за да влязат в сила промените по добавките."
 
-#: classes/pref/prefs.php:702
-msgid "Download more plugins at tt-rss.org <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forums</a> or <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a>."
-msgstr "Изтеглете още добавки от tt-rss.org <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">форумите</a> или <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a>."
-
-#: classes/pref/prefs.php:732
+#: classes/pref/prefs.php:730
 msgid "System plugins"
 msgstr "Системни добавки"
 
+#: classes/pref/prefs.php:731
+msgid "System plugins are enabled in <strong>config.php</strong> for all users."
+msgstr ""
+
 #: classes/pref/prefs.php:736
 #: classes/pref/prefs.php:792
 msgid "Plugin"
@@ -2294,6 +1908,340 @@ msgstr "Премахване на избраните профили"
 msgid "Activate profile"
 msgstr "Активиране на профил"
 
+#: classes/pref/feeds.php:15
+msgid "Check to enable field"
+msgstr "Отметка за активиране на полето"
+
+#: classes/pref/feeds.php:65
+#: classes/pref/feeds.php:214
+#: classes/pref/feeds.php:258
+#: classes/pref/feeds.php:264
+#: classes/pref/feeds.php:290
+#, php-format
+msgid "(%d feed)"
+msgid_plural "(%d feeds)"
+msgstr[0] "(%d хранилка)"
+msgstr[1] "(%d хранилки)"
+
+#: classes/pref/feeds.php:561
+msgid "Feed Title"
+msgstr "Заглавие на хранилка"
+
+#: classes/pref/feeds.php:595
+#: classes/pref/feeds.php:818
+#: classes/pref/feeds.php:1796
+#: classes/feeds.php:1048
+msgid "Place in category:"
+msgstr "Поставяне в категория:"
+
+#: classes/pref/feeds.php:608
+#: classes/pref/feeds.php:832
+#, fuzzy
+msgid "Language:"
+msgstr "Език"
+
+#: classes/pref/feeds.php:615
+#: classes/pref/feeds.php:841
+msgid "Update"
+msgstr "Обновяване"
+
+#: classes/pref/feeds.php:630
+#: classes/pref/feeds.php:857
+msgid "Article purging:"
+msgstr "Изтриване на статия:"
+
+#: classes/pref/feeds.php:662
+msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
+msgstr "<b>Съвет:</b> трябва да попълните информацията Ви за вход, ако хранилката изисква автентикация, с изключение на Twitter хранилките."
+
+#: classes/pref/feeds.php:681
+#: classes/pref/feeds.php:888
+msgid "Hide from Popular feeds"
+msgstr "Скриване от \"Популярни хранилки\""
+
+#: classes/pref/feeds.php:693
+#: classes/pref/feeds.php:894
+msgid "Include in e-mail digest"
+msgstr "Включване в e-mail справката"
+
+#: classes/pref/feeds.php:706
+#: classes/pref/feeds.php:900
+msgid "Always display image attachments"
+msgstr "Винаги да се показват прикачените изображения"
+
+#: classes/pref/feeds.php:719
+#: classes/pref/feeds.php:908
+msgid "Do not embed images"
+msgstr "Да не се влагат изображения"
+
+#: classes/pref/feeds.php:732
+#: classes/pref/feeds.php:916
+msgid "Cache media"
+msgstr ""
+
+#: classes/pref/feeds.php:744
+#: classes/pref/feeds.php:922
+msgid "Mark updated articles as unread"
+msgstr "Отбелязване на обновените статии като нечетени"
+
+#: classes/pref/feeds.php:748
+msgid "Icon"
+msgstr "Икона"
+
+#: classes/pref/feeds.php:765
+msgid "Replace"
+msgstr "Замяна"
+
+#: classes/pref/feeds.php:1174
+#: classes/pref/feeds.php:1227
+msgid "All done."
+msgstr "Готово."
+
+#: classes/pref/feeds.php:1282
+msgid "Feeds with errors"
+msgstr "Хранилки с грешки"
+
+#: classes/pref/feeds.php:1289
+msgid "Inactive feeds"
+msgstr "Неактивни хранилки"
+
+#: classes/pref/feeds.php:1325
+msgid "Edit selected feeds"
+msgstr "Редактиране на избраните хранилки"
+
+#: classes/pref/feeds.php:1329
+#: js/prefs.js:1618
+msgid "Batch subscribe"
+msgstr "Партидно абониране"
+
+#: classes/pref/feeds.php:1336
+msgid "Categories"
+msgstr "Категории"
+
+#: classes/pref/feeds.php:1339
+msgid "Add category"
+msgstr "Добавяне на категория"
+
+#: classes/pref/feeds.php:1343
+msgid "Remove selected"
+msgstr "Премахване на избраното"
+
+#: classes/pref/feeds.php:1354
+msgid "More actions..."
+msgstr "Още действия..."
+
+#: classes/pref/feeds.php:1358
+msgid "Manual purge"
+msgstr "Ръчно изтриване"
+
+#: classes/pref/feeds.php:1362
+msgid "Clear feed data"
+msgstr "Изчистване данните на хранилката"
+
+#: classes/pref/feeds.php:1416
+msgid "OPML"
+msgstr "OPML"
+
+#: classes/pref/feeds.php:1418
+msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
+msgstr "Чрез OPML можете да изнасяте и внасяте Вашите хранилки, филтри, етикети и Tiny Tiny RSS настройки."
+
+#: classes/pref/feeds.php:1419
+msgid "Only main settings profile can be migrated using OPML."
+msgstr "Само основните настройки на профила могат да се мигрират чрез OPML."
+
+#: classes/pref/feeds.php:1432
+msgid "Import my OPML"
+msgstr "Внасяне на мой OPML"
+
+#: classes/pref/feeds.php:1438
+msgid "Filename:"
+msgstr "Име на файл:"
+
+#: classes/pref/feeds.php:1440
+msgid "Include settings"
+msgstr "Включително настройките"
+
+#: classes/pref/feeds.php:1444
+msgid "Export OPML"
+msgstr "Изнасяне на OPML"
+
+#: classes/pref/feeds.php:1448
+msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
+msgstr "Вашият OPML може да се публикува публично и всеки, който знае долния URL, може да се абонира."
+
+#: classes/pref/feeds.php:1452
+msgid "Public OPML URL"
+msgstr "Публичен OPML URL"
+
+#: classes/pref/feeds.php:1453
+msgid "Display published OPML URL"
+msgstr "Показване на публикувания OPML URL"
+
+#: classes/pref/feeds.php:1462
+msgid "Firefox integration"
+msgstr "Firefox интеграция"
+
+#: classes/pref/feeds.php:1464
+msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
+msgstr "Този Tiny Tiny RSS сайт може да се използва като четец на хранилки във Firefox чрез избиране на връзката по-долу."
+
+#: classes/pref/feeds.php:1471
+msgid "Click here to register this site as a feed reader."
+msgstr "Кликнете тук, за да регистрирате този сайт като четец на хранилки."
+
+#: classes/pref/feeds.php:1479
+msgid "Published & shared articles / Generated feeds"
+msgstr "Публикувани и споделени статии / Генерирани хранилки"
+
+#: classes/pref/feeds.php:1481
+msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
+msgstr "Публикуваните статии са изнесени като публична RSS хранилка и всеки, който знае указания по-долу URL, може да се абонира."
+
+#: classes/pref/feeds.php:1488
+#: classes/feeds.php:54
+#: classes/feeds.php:140
+msgid "View as RSS"
+msgstr "Преглед като RSS"
+
+#: classes/pref/feeds.php:1489
+msgid "Display URL"
+msgstr "Показване на URL"
+
+#: classes/pref/feeds.php:1492
+msgid "Clear all generated URLs"
+msgstr "Изчистване на всички генерирани URL-и"
+
+#: classes/pref/feeds.php:1570
+msgid "These feeds have not been updated with new content for 3 months (oldest first):"
+msgstr "Тези хранилки не са обновявани с ново съдържание от 3 месеца (най-старите отгоре):"
+
+#: classes/pref/feeds.php:1604
+#: classes/pref/feeds.php:1668
+msgid "Click to edit feed"
+msgstr "Клик за редактиране на хранилка"
+
+#: classes/pref/feeds.php:1622
+#: classes/pref/feeds.php:1688
+msgid "Unsubscribe from selected feeds"
+msgstr "Отписване от избраните хранилки"
+
+#: classes/pref/feeds.php:1793
+msgid "Add one valid RSS feed per line (no feed detection is done)"
+msgstr "Добавете по една валидна RSS хранилка на ред (не се прави засичане на хранилки)"
+
+#: classes/pref/feeds.php:1802
+msgid "Feeds to subscribe, One per line"
+msgstr "Хранилки за абониране. По една на ред"
+
+#: classes/pref/feeds.php:1825
+msgid "Feeds require authentication."
+msgstr "Хранилките изискват автентикация."
+
+#: classes/pref/feeds.php:1832
+#: classes/feeds.php:1092
+#: classes/feeds.php:1146
+msgid "Subscribe"
+msgstr "Абониране"
+
+#: classes/pref/system.php:29
+msgid "Error Log"
+msgstr "Журнал на грешките"
+
+#: classes/pref/system.php:40
+msgid "Refresh"
+msgstr "Опресняване"
+
+#: classes/pref/system.php:43
+msgid "Clear log"
+msgstr "Изчистване на журнала"
+
+#: classes/pref/system.php:48
+msgid "Error"
+msgstr "Грешка"
+
+#: classes/pref/system.php:49
+msgid "Filename"
+msgstr "Име на файл"
+
+#: classes/pref/system.php:50
+msgid "Message"
+msgstr "Съобщение"
+
+#: classes/pref/system.php:52
+msgid "Date"
+msgstr "Дата"
+
+#: classes/opml.php:28
+#: classes/opml.php:33
+msgid "OPML Utility"
+msgstr "OPML инструмент"
+
+#: classes/opml.php:37
+msgid "Importing OPML..."
+msgstr "Внасяне на OPML..."
+
+#: classes/opml.php:41
+msgid "Return to preferences"
+msgstr "Връщане към предпочитания"
+
+#: classes/opml.php:295
+#, php-format
+msgid "Adding feed: %s"
+msgstr "Добавяне на хранилка: %s"
+
+#: classes/opml.php:306
+#, php-format
+msgid "Duplicate feed: %s"
+msgstr "Дублирана хранилка: %s"
+
+#: classes/opml.php:320
+#, php-format
+msgid "Adding label %s"
+msgstr "Добавяне на етикет \"%s\""
+
+#: classes/opml.php:323
+#, php-format
+msgid "Duplicate label: %s"
+msgstr "Дублиран етикет: %s"
+
+#: classes/opml.php:335
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr "Задаване на ключ за предпочитания \"%s\" към \"%s\""
+
+#: classes/opml.php:367
+msgid "Adding filter..."
+msgstr "Добавяне на филтър..."
+
+#: classes/opml.php:486
+#, php-format
+msgid "Processing category: %s"
+msgstr "Обработка на категория: %s"
+
+#: classes/opml.php:532
+#, php-format
+msgid "Upload failed with error code %d"
+msgstr "Качването се провали с код за грешка \"%d\""
+
+#: classes/opml.php:544
+#: plugins/import_export/init.php:448
+msgid "Unable to move uploaded file."
+msgstr "Невъзможност за преместване на качения файл."
+
+#: classes/opml.php:548
+#: plugins/import_export/init.php:452
+msgid "Error: please upload OPML file."
+msgstr "Грешка: моля, качете OPML файл!"
+
+#: classes/opml.php:559
+msgid "Error: unable to find moved OPML file."
+msgstr "Грешка: не може да се намери преместеният OPML файл."
+
+#: classes/opml.php:566
+msgid "Error while parsing document."
+msgstr "Грешка при разбора на документа."
+
 #: classes/feeds.php:53
 msgid "View as RSS feed"
 msgstr "Преглед като RSS хранилка"
@@ -2334,8 +2282,8 @@ msgstr "Назад"
 
 #: classes/feeds.php:127
 #: classes/feeds.php:132
-#: plugins/mail/init.php:75
 #: plugins/mailto/init.php:25
+#: plugins/mail/init.php:75
 msgid "Forward by email"
 msgstr "Препращане по e-mail"
 
@@ -2343,315 +2291,144 @@ msgstr "Препращане по e-mail"
 msgid "Feed:"
 msgstr "Хранилка:"
 
-#: classes/feeds.php:229
-#: classes/feeds.php:892
+#: classes/feeds.php:228
+#: classes/feeds.php:885
 msgid "Feed not found."
 msgstr "Хранилката не е намерена."
 
-#: classes/feeds.php:300
+#: classes/feeds.php:291
 msgid "Never"
 msgstr "Никога"
 
-#: classes/feeds.php:413
+#: classes/feeds.php:405
 #, php-format
 msgid "Imported at %s"
 msgstr "Внесено в \"%s\""
 
-#: classes/feeds.php:472
-#: classes/feeds.php:569
+#: classes/feeds.php:464
+#: classes/feeds.php:561
 msgid "mark feed as read"
 msgstr "отбелязване на хранилката като прочетена"
 
-#: classes/feeds.php:630
+#: classes/feeds.php:622
 msgid "Collapse article"
 msgstr "Свиване на статия"
 
-#: classes/feeds.php:791
+#: classes/feeds.php:784
 msgid "No unread articles found to display."
 msgstr "Не са намерени нечетени статии за показване."
 
-#: classes/feeds.php:794
+#: classes/feeds.php:787
 msgid "No updated articles found to display."
 msgstr "Не са намерени обновени статии за показване."
 
-#: classes/feeds.php:797
+#: classes/feeds.php:790
 msgid "No starred articles found to display."
 msgstr "Не са намерени статии със звезда за показване."
 
-#: classes/feeds.php:801
+#: classes/feeds.php:794
 msgid "No articles found to display. You can assign articles to labels manually from article header context menu (applies to all selected articles) or use a filter."
 msgstr "Не са намерени статии за показване. Можете да присвоите статии към етикети ръчно от контекстното меню на заглавието на статията (прилага се към всички избрани статии) или да използвате филтър."
 
-#: classes/feeds.php:803
+#: classes/feeds.php:796
 msgid "No articles found to display."
 msgstr "Не са намерени статии за показване."
 
-#: classes/feeds.php:818
-#: classes/feeds.php:992
+#: classes/feeds.php:811
+#: classes/feeds.php:985
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "Хранилките са обновени за последно в %s"
 
-#: classes/feeds.php:828
-#: classes/feeds.php:1002
+#: classes/feeds.php:821
+#: classes/feeds.php:995
 msgid "Some feeds have update errors (click for details)"
 msgstr "Някои хранилки имат грешки при обновяването (клик за детайли)"
 
-#: classes/feeds.php:982
+#: classes/feeds.php:975
 msgid "No feed selected."
 msgstr "Не е избрана хранилка."
 
-#: classes/feeds.php:1041
-#: classes/feeds.php:1049
+#: classes/feeds.php:1034
+#: classes/feeds.php:1042
 msgid "Feed or site URL"
 msgstr "URL на хранилка/сайт"
 
-#: classes/feeds.php:1063
+#: classes/feeds.php:1056
 msgid "Available feeds"
 msgstr "Налични хранилки"
 
-#: classes/feeds.php:1094
+#: classes/feeds.php:1087
 msgid "This feed requires authentication."
 msgstr "Тази хранилка изисква автентикация."
 
-#: classes/feeds.php:1102
+#: classes/feeds.php:1095
 msgid "More feeds"
 msgstr "Още хранилки"
 
-#: classes/feeds.php:1129
+#: classes/feeds.php:1122
 msgid "Popular feeds"
 msgstr "Популярни хранилки"
 
-#: classes/feeds.php:1130
+#: classes/feeds.php:1123
 msgid "Feed archive"
 msgstr "Архив с хранилки"
 
-#: classes/feeds.php:1133
+#: classes/feeds.php:1126
 msgid "limit:"
 msgstr "лимит"
 
-#: classes/feeds.php:1165
+#: classes/feeds.php:1158
 msgid "Look for"
 msgstr "Търсене за"
 
-#: classes/feeds.php:1173
+#: classes/feeds.php:1166
 #, php-format
 msgid "in %s"
 msgstr ""
 
-#: classes/feeds.php:1178
+#: classes/feeds.php:1171
 msgid "Used for word stemming"
 msgstr ""
 
-#: classes/feeds.php:1187
+#: classes/feeds.php:1180
 msgid "Search syntax"
 msgstr "Синтаксис на търсенето"
 
-#: plugins/instances/init.php:141
-msgid "Linked"
-msgstr "Свързана"
-
-#: plugins/instances/init.php:204
-#: plugins/instances/init.php:395
-msgid "Instance"
-msgstr "Инсталация"
-
-#: plugins/instances/init.php:215
-#: plugins/instances/init.php:312
-#: plugins/instances/init.php:404
-msgid "Instance URL"
-msgstr "URL на инсталация"
-
-#: plugins/instances/init.php:226
-#: plugins/instances/init.php:414
-msgid "Access key:"
-msgstr "Ключ за достъп:"
-
-#: plugins/instances/init.php:229
-#: plugins/instances/init.php:313
-#: plugins/instances/init.php:417
-msgid "Access key"
-msgstr "Ключ за достъп"
-
-#: plugins/instances/init.php:233
-#: plugins/instances/init.php:421
-msgid "Use one access key for both linked instances."
-msgstr "Използване на един ключ за достъп за двете свързани инсталации."
-
-#: plugins/instances/init.php:241
-#: plugins/instances/init.php:429
-msgid "Generate new key"
-msgstr "Генериране на нов ключ"
-
-#: plugins/instances/init.php:292
-msgid "Link instance"
-msgstr "Свързване на инсталация"
-
-#: plugins/instances/init.php:304
-msgid "You can connect other instances of Tiny Tiny RSS to this one to share Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
-msgstr "Можете да свържете други инсталации на Tiny Tiny RSS към тази, за да споделяте популярни хранилки. Свързване към тази инсталация на Tiny Tiny RSS чрез този URL:"
-
-#: plugins/instances/init.php:314
-msgid "Last connected"
-msgstr "Последно свързана"
-
-#: plugins/instances/init.php:315
-msgid "Status"
-msgstr "Статус"
-
-#: plugins/instances/init.php:316
-msgid "Stored feeds"
-msgstr "Съхранени хранилки"
-
-#: plugins/instances/init.php:433
-msgid "Create link"
-msgstr "Създаване на връзка"
+#: classes/feeds.php:1596
+msgid "Starred articles"
+msgstr "Статии със звезда"
 
-#: plugins/nsfw/init.php:30
-#: plugins/nsfw/init.php:42
-msgid "Not work safe (click to toggle)"
-msgstr "Не се работи безопасно (клик за превключване)"
+#: classes/feeds.php:1598
+msgid "Published articles"
+msgstr "Публикувани статии"
 
-#: plugins/nsfw/init.php:52
-msgid "NSFW Plugin"
-msgstr "NSFW добавка"
+#: classes/feeds.php:1600
+msgid "Fresh articles"
+msgstr "Пресни статии"
 
-#: plugins/nsfw/init.php:79
-msgid "Tags to consider NSFW (comma-separated)"
-msgstr "Тагове предвид NSFW (разделени със запетаи)"
+#: classes/feeds.php:1604
+msgid "Archived articles"
+msgstr "Архивирани статии"
 
-#: plugins/nsfw/init.php:100
-msgid "Configuration saved."
-msgstr "Конфигурацията е запазена."
+#: classes/feeds.php:1606
+msgid "Recently read"
+msgstr "Наскоро четени"
 
-#: plugins/note/init.php:26
-#: plugins/note/note.js:11
-msgid "Edit article note"
-msgstr "Редактиране бележка на статия"
+#: classes/feeds.php:1716
+msgid "Special"
+msgstr "Специални"
+
+#: classes/feeds.php:1962
+#, php-format
+msgid "Search results: %s"
+msgstr "Резултати от търсенето: %s"
 
 #: plugins/vf_shared/init.php:16
-#: plugins/vf_shared/init.php:69
+#: plugins/vf_shared/init.php:60
 msgid "Shared articles"
 msgstr "Споделени статии"
 
-#: plugins/auth_internal/init.php:65
-msgid "Please enter your one time password:"
-msgstr "Моля, въведете еднократната Ви парола:"
-
-#: plugins/auth_internal/init.php:188
-msgid "Password has been changed."
-msgstr "Паролата е сменена."
-
-#: plugins/auth_internal/init.php:190
-msgid "Old password is incorrect."
-msgstr "Старата парола е грешна."
-
-#: plugins/af_readability/init.php:21
-#, fuzzy
-msgid "Data saved."
-msgstr "Данните са запазени (%s)"
-
-#: plugins/af_readability/init.php:33
-#, fuzzy
-msgid "Inline content"
-msgstr "Редактиране бележка на статия"
-
-#: plugins/af_readability/init.php:39
-msgid "Readability settings (af_readability)"
-msgstr ""
-
-#: plugins/af_readability/init.php:66
-msgid "Use Readability for pages shared via bookmarklet."
-msgstr ""
-
-#: plugins/af_readability/init.php:78
-#: plugins/af_psql_trgm/init.php:191
-msgid "Currently enabled for (click to edit):"
-msgstr "Текущо активирано за (клик за редактиране):"
-
-#: plugins/af_readability/init.php:95
-#, fuzzy
-msgid "Readability"
-msgstr "Проверка за наличност"
-
-#: plugins/af_readability/init.php:106
-#, fuzzy
-msgid "Inline article content"
-msgstr "Редактиране бележка на статия"
-
-#: plugins/af_redditimgur/init.php:25
-msgid "Reddit content settings (af_redditimgur)"
-msgstr ""
-
-#: plugins/af_redditimgur/init.php:50
-msgid "Uses Readability (full-text-rss) implementation by <a target='_blank' href='https://bitbucket.org/fivefilters/'>FiveFilters.org</a>"
-msgstr ""
-
-#: plugins/af_redditimgur/init.php:54
-msgid "Extract missing content using Readability"
-msgstr ""
-
-#: plugins/af_redditimgur/init.php:59
-msgid "Enable additional duplicate checking"
-msgstr ""
-
-#: plugins/af_redditimgur/init.php:73
-#: plugins/af_zz_imgproxy/init.php:225
-#, fuzzy
-msgid "Configuration saved"
-msgstr "Конфигурацията е запазена."
-
-#: plugins/af_psql_trgm/init.php:28
-#, fuzzy, php-format
-msgid "Data saved (%s, %d)"
-msgstr "Данните са запазени (%s)"
-
-#: plugins/af_psql_trgm/init.php:112
-msgid "Show related articles"
-msgstr "Показване на свързани статии"
-
-#: plugins/af_psql_trgm/init.php:118
-#: plugins/af_psql_trgm/init.php:220
-msgid "Mark similar articles as read"
-msgstr "Отбелязване на подобни статии като прочетени"
-
-#: plugins/af_psql_trgm/init.php:157
-msgid "PostgreSQL trigram extension returns string similarity as a floating point number (0-1). Setting it too low might produce false positives, zero disables checking."
-msgstr ""
-
-#: plugins/af_psql_trgm/init.php:160
-msgid "Global settings"
-msgstr "Глобални настройки"
-
-#: plugins/af_psql_trgm/init.php:164
-msgid "Minimum similarity:"
-msgstr "Минимална подобност:"
-
-#: plugins/af_psql_trgm/init.php:169
-msgid "Minimum title length:"
-msgstr "Минимална дължина на заглавие:"
-
-#: plugins/af_psql_trgm/init.php:174
-#, fuzzy
-msgid "Enable for all feeds:"
-msgstr "Активиране на категории за хранилки"
-
-#: plugins/af_psql_trgm/init.php:209
-msgid "Similarity (pg_trgm)"
-msgstr "Подобност (pg_trgm)"
-
-#: plugins/af_comics/init.php:40
-msgid "Feeds supported by af_comics"
-msgstr "Хранилки, поддържани от af_comics"
-
-#: plugins/af_comics/init.php:42
-msgid "The following comics are currently supported:"
-msgstr "Текущо се поддържат следните комикси:"
-
-#: plugins/af_comics/init.php:60
-msgid "GoComics requires a specific URL to workaround their lack of feed support: <code>http://feeds.feedburner.com/uclick/<em>comic_name</em></code> (e.g. <code>http://www.gocomics.com/garfield</code> uses <code>http://feeds.feedburner.com/uclick/garfield</code>)."
-msgstr ""
-
 #: plugins/import_export/init.php:58
 msgid "Import and export"
 msgstr "Внасяне и изнасяне"
@@ -2668,95 +2445,83 @@ msgstr "Изнасяне на моите данни"
 msgid "Import"
 msgstr "Внасяне"
 
-#: plugins/import_export/init.php:225
+#: plugins/import_export/init.php:231
 msgid "Could not import: incorrect schema version."
 msgstr "Неуспешно внасяне: грешна версия на схема."
 
-#: plugins/import_export/init.php:230
+#: plugins/import_export/init.php:236
 msgid "Could not import: unrecognized document format."
 msgstr "Неуспешно внасяне: непознат формат на документа."
 
-#: plugins/import_export/init.php:391
+#: plugins/import_export/init.php:397
 msgid "Finished: "
 msgstr "Завършени:"
 
-#: plugins/import_export/init.php:392
+#: plugins/import_export/init.php:398
 #, php-format
 msgid "%d article processed, "
 msgid_plural "%d articles processed, "
 msgstr[0] "%d обработена статия, "
 msgstr[1] "%d обработени статии, "
 
-#: plugins/import_export/init.php:393
+#: plugins/import_export/init.php:399
 #, php-format
 msgid "%d imported, "
 msgid_plural "%d imported, "
 msgstr[0] "%d внесена, "
 msgstr[1] "%d внесени, "
 
-#: plugins/import_export/init.php:394
+#: plugins/import_export/init.php:400
 #, php-format
 msgid "%d feed created."
 msgid_plural "%d feeds created."
 msgstr[0] "%d създадена хранилка."
 msgstr[1] "%d създадени хранилки."
 
-#: plugins/import_export/init.php:399
+#: plugins/import_export/init.php:405
 msgid "Could not load XML document."
 msgstr "Неуспех при зареждането на XML документ."
 
-#: plugins/import_export/init.php:411
+#: plugins/import_export/init.php:417
 msgid "Prepare data"
 msgstr "Подготовка на данни"
 
-#: plugins/import_export/init.php:428
+#: plugins/import_export/init.php:434
 #, fuzzy, php-format
 msgid "Upload failed with error code %d (%s)"
 msgstr "Качването се провали с код за грешка \"%d\""
 
-#: plugins/import_export/init.php:454
+#: plugins/import_export/init.php:460
 msgid "No file uploaded."
 msgstr "Няма качени файлове."
 
-#: plugins/mail/init.php:28
-msgid "Mail addresses saved."
-msgstr "Пощенските адреси са запазени."
-
-#: plugins/mail/init.php:34
-msgid "Mail plugin"
-msgstr "Добавка за поща"
-
-#: plugins/mail/init.php:36
-msgid "You can set predefined email addressed here (comma-separated list):"
-msgstr "Тук можете да зададете предефинирани e-mail адреси (разделени със запетаи):"
-
+#: plugins/mailto/init.php:48
+#: plugins/mailto/init.php:54
 #: plugins/mail/init.php:112
 #: plugins/mail/init.php:118
-#: plugins/mailto/init.php:49
-#: plugins/mailto/init.php:55
 msgid "[Forwarded]"
 msgstr "[Препратено]"
 
+#: plugins/mailto/init.php:48
 #: plugins/mail/init.php:112
-#: plugins/mailto/init.php:49
 msgid "Multiple articles"
 msgstr "Множество статии"
 
-#: plugins/mail/init.php:140
-msgid "To:"
-msgstr "До:"
+#: plugins/mailto/init.php:70
+msgid "Clicking the following link to invoke your mail client:"
+msgstr "Изберете следния линк, за да извикате пощенския Ви клиент:"
 
-#: plugins/mail/init.php:155
-msgid "Subject:"
-msgstr "Заглавие:"
+#: plugins/mailto/init.php:74
+msgid "Forward selected article(s) by email."
+msgstr "Препращане на избраните статии по e-mail."
 
-#: plugins/mail/init.php:172
-msgid "Send e-mail"
-msgstr "Изпращане на e-mail"
+#: plugins/mailto/init.php:77
+msgid "You should be able to edit the message before sending in your mail client."
+msgstr "Ще имате възможност да редактирате съобщението преди изпращане в пощенския Ви клиент."
 
-#: plugins/close_button/init.php:22
-msgid "Close article"
-msgstr "Затваряне на статия"
+#: plugins/mailto/init.php:82
+msgid "Close this dialog"
+msgstr "Затваряне на този диалог"
 
 #: plugins/bookmarklets/init.php:20
 msgid "Bookmarklets"
@@ -2779,34 +2544,122 @@ msgstr "Абониране в Tiny Tiny RSS?"
 msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
 msgstr "Използвайте тази отметка за публикуване на произволни страници чрез Tiny Tiny RSS"
 
+#: plugins/af_psql_trgm/init.php:28
+#, fuzzy, php-format
+msgid "Data saved (%s, %d)"
+msgstr "Данните са запазени (%s)"
+
+#: plugins/af_psql_trgm/init.php:112
+msgid "Show related articles"
+msgstr "Показване на свързани статии"
+
+#: plugins/af_psql_trgm/init.php:118
+#: plugins/af_psql_trgm/init.php:220
+msgid "Mark similar articles as read"
+msgstr "Отбелязване на подобни статии като прочетени"
+
+#: plugins/af_psql_trgm/init.php:157
+msgid "PostgreSQL trigram extension returns string similarity as a floating point number (0-1). Setting it too low might produce false positives, zero disables checking."
+msgstr ""
+
+#: plugins/af_psql_trgm/init.php:160
+msgid "Global settings"
+msgstr "Глобални настройки"
+
+#: plugins/af_psql_trgm/init.php:164
+msgid "Minimum similarity:"
+msgstr "Минимална подобност:"
+
+#: plugins/af_psql_trgm/init.php:169
+msgid "Minimum title length:"
+msgstr "Минимална дължина на заглавие:"
+
+#: plugins/af_psql_trgm/init.php:174
+#, fuzzy
+msgid "Enable for all feeds:"
+msgstr "Активиране на категории за хранилки"
+
+#: plugins/af_psql_trgm/init.php:191
+#: plugins/af_readability/init.php:78
+msgid "Currently enabled for (click to edit):"
+msgstr "Текущо активирано за (клик за редактиране):"
+
+#: plugins/af_psql_trgm/init.php:209
+msgid "Similarity (pg_trgm)"
+msgstr "Подобност (pg_trgm)"
+
+#: plugins/nsfw/init.php:30
+#: plugins/nsfw/init.php:42
+msgid "Not work safe (click to toggle)"
+msgstr "Не се работи безопасно (клик за превключване)"
+
+#: plugins/nsfw/init.php:52
+msgid "NSFW Plugin"
+msgstr "NSFW добавка"
+
+#: plugins/nsfw/init.php:79
+msgid "Tags to consider NSFW (comma-separated)"
+msgstr "Тагове предвид NSFW (разделени със запетаи)"
+
+#: plugins/nsfw/init.php:100
+msgid "Configuration saved."
+msgstr "Конфигурацията е запазена."
+
 #: plugins/toggle_sidebar/init.php:23
 msgid "Collapse feedlist"
 msgstr "Свиване на списъка с хранилки"
 
-#: plugins/af_zz_imgproxy/init.php:186
-msgid "Image proxy settings (af_zz_imgproxy)"
+#: plugins/af_readability/init.php:21
+#, fuzzy
+msgid "Data saved."
+msgstr "Данните са запазени (%s)"
+
+#: plugins/af_readability/init.php:33
+#, fuzzy
+msgid "Inline content"
+msgstr "Редактиране бележка на статия"
+
+#: plugins/af_readability/init.php:39
+msgid "Readability settings (af_readability)"
+msgstr ""
+
+#: plugins/af_readability/init.php:66
+msgid "Use Readability for pages shared via bookmarklet."
 msgstr ""
 
-#: plugins/af_zz_imgproxy/init.php:211
+#: plugins/af_readability/init.php:95
 #, fuzzy
-msgid "Enable proxy for all remote images."
-msgstr "Активиране на категории за хранилки"
+msgid "Readability"
+msgstr "Проверка за наличност"
 
-#: plugins/mailto/init.php:71
-msgid "Clicking the following link to invoke your mail client:"
-msgstr "Изберете следния линк, за да извикате пощенския Ви клиент:"
+#: plugins/af_readability/init.php:106
+#, fuzzy
+msgid "Inline article content"
+msgstr "Редактиране бележка на статия"
 
-#: plugins/mailto/init.php:75
-msgid "Forward selected article(s) by email."
-msgstr "Препращане на избраните статии по e-mail."
+#: plugins/mail/init.php:28
+msgid "Mail addresses saved."
+msgstr "Пощенските адреси са запазени."
 
-#: plugins/mailto/init.php:78
-msgid "You should be able to edit the message before sending in your mail client."
-msgstr "Ще имате възможност да редактирате съобщението преди изпращане в пощенския Ви клиент."
+#: plugins/mail/init.php:34
+msgid "Mail plugin"
+msgstr "Добавка за поща"
 
-#: plugins/mailto/init.php:83
-msgid "Close this dialog"
-msgstr "Затваряне на този диалог"
+#: plugins/mail/init.php:36
+msgid "You can set predefined email addressed here (comma-separated list):"
+msgstr "Тук можете да зададете предефинирани e-mail адреси (разделени със запетаи):"
+
+#: plugins/mail/init.php:140
+msgid "To:"
+msgstr "До:"
+
+#: plugins/mail/init.php:155
+msgid "Subject:"
+msgstr "Заглавие:"
+
+#: plugins/mail/init.php:172
+msgid "Send e-mail"
+msgstr "Изпращане на e-mail"
 
 #: plugins/share/init.php:39
 msgid "You can disable all articles shared by unique URLs here."
@@ -2820,24 +2673,97 @@ msgstr "Премахване на споделянето на всички ст�
 msgid "Share by URL"
 msgstr "Споделяне чрез URL"
 
-#: plugins/share/init.php:97
+#: plugins/share/init.php:96
 msgid "You can share this article by the following unique URL:"
 msgstr "Можете да споделите тази статия чрез следния уникален URL:"
 
-#: plugins/share/init.php:115
+#: plugins/share/init.php:114
 msgid "Unshare article"
 msgstr "Премахване на споделянето на статия"
 
+#: plugins/af_comics/init.php:48
+msgid "Feeds supported by af_comics"
+msgstr "Хранилки, поддържани от af_comics"
+
+#: plugins/af_comics/init.php:50
+msgid "The following comics are currently supported:"
+msgstr "Текущо се поддържат следните комикси:"
+
+#: plugins/af_comics/init.php:68
+msgid "GoComics requires a specific URL to workaround their lack of feed support: <code>http://feeds.feedburner.com/uclick/<em>comic_name</em></code> (e.g. <code>http://www.gocomics.com/garfield</code> uses <code>http://feeds.feedburner.com/uclick/garfield</code>)."
+msgstr ""
+
+#: plugins/af_comics/init.php:70
+msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:25
+msgid "Reddit content settings (af_redditimgur)"
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:50
+msgid "Uses Readability (full-text-rss) implementation by <a target='_blank' href='https://bitbucket.org/fivefilters/'>FiveFilters.org</a>"
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:54
+msgid "Extract missing content using Readability"
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:59
+msgid "Enable additional duplicate checking"
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:73
+#: plugins/af_zz_imgproxy/init.php:254
+#, fuzzy
+msgid "Configuration saved"
+msgstr "Конфигурацията е запазена."
+
+#: plugins/note/init.php:26
+#: plugins/note/note.js:11
+msgid "Edit article note"
+msgstr "Редактиране бележка на статия"
+
+#: plugins/close_button/init.php:25
+msgid "Close article"
+msgstr "Затваряне на статия"
+
+#: plugins/af_zz_imgproxy/init.php:210
+msgid "Image proxy settings (af_zz_imgproxy)"
+msgstr ""
+
+#: plugins/af_zz_imgproxy/init.php:234
+#, fuzzy
+msgid "Enable proxy for all remote images."
+msgstr "Активиране на категории за хранилки"
+
+#: plugins/af_zz_imgproxy/init.php:238
+#, fuzzy
+msgid "Don't cache files locally."
+msgstr "Локално кеширане на изображенията"
+
+#: plugins/auth_internal/init.php:65
+msgid "Please enter your one time password:"
+msgstr "Моля, въведете еднократната Ви парола:"
+
+#: plugins/auth_internal/init.php:188
+msgid "Password has been changed."
+msgstr "Паролата е сменена."
+
+#: plugins/auth_internal/init.php:190
+msgid "Old password is incorrect."
+msgstr "Старата парола е грешна."
+
 #: js/FeedTree.js:172
 #, fuzzy
 msgid "(Un)collapse"
 msgstr "Прибиране/изваждане на страничния панел"
 
-#: js/PrefFeedTree.js:52
+#: js/PrefFeedTree.js:54
 msgid "Edit category"
 msgstr "Редактиране на категория"
 
-#: js/PrefFeedTree.js:59
+#: js/PrefFeedTree.js:61
 msgid "Remove category"
 msgstr "Премахване на категория"
 
@@ -2872,63 +2798,55 @@ msgid "Create Filter"
 msgstr "Създаване на филтър"
 
 #: js/functions.js:1128
-msgid "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification hub again on next feed update."
-msgstr "Нулиране на абонамента? Tiny Tiny RSS ще опита да се абонира към известията отново при следващото обновяване на хранилките."
-
-#: js/functions.js:1139
-msgid "Subscription reset."
-msgstr "Нулиране на абонамент."
-
-#: js/functions.js:1149
-#: js/tt-rss.js:695
+#: js/tt-rss.js:696
 #, perl-format
 msgid "Unsubscribe from %s?"
 msgstr "Отписване от \"%s\"?"
 
-#: js/functions.js:1152
+#: js/functions.js:1131
 msgid "Removing feed..."
 msgstr "Премахване на хранилка..."
 
-#: js/functions.js:1225
+#: js/functions.js:1204
 msgid "Please enter category title:"
 msgstr "Моля, въведете име на категория:"
 
-#: js/functions.js:1250
+#: js/functions.js:1229
 msgid "Generate new syndication address for this feed?"
 msgstr "Генериране на нов синдикиращ адрес за тази хранилка?"
 
-#: js/functions.js:1254
-#: js/prefs.js:1154
+#: js/functions.js:1233
+#: js/prefs.js:1150
 msgid "Trying to change address..."
 msgstr "Опит за смяна на адрес..."
 
-#: js/functions.js:1497
-#: js/functions.js:1606
+#: js/functions.js:1476
+#: js/functions.js:1585
 #: js/prefs.js:398
 #: js/prefs.js:424
 #: js/prefs.js:456
 #: js/prefs.js:599
 #: js/prefs.js:617
-#: js/prefs.js:1136
-#: js/prefs.js:1263
+#: js/prefs.js:1132
+#: js/prefs.js:1259
 msgid "No feeds are selected."
 msgstr "Не са избрани хранилки."
 
-#: js/functions.js:1540
+#: js/functions.js:1519
 msgid "Remove selected feeds from the archive? Feeds with stored articles will not be removed."
 msgstr "Премахване на избраните хранилки от архива? Хранилките със съхранени статии няма да бъдат премахнати."
 
-#: js/functions.js:1577
+#: js/functions.js:1556
 msgid "Feeds with update errors"
 msgstr "Хранилки с грешки при обновяване"
 
-#: js/functions.js:1588
-#: js/prefs.js:1117
+#: js/functions.js:1567
+#: js/prefs.js:1113
 msgid "Remove selected feeds?"
 msgstr "Премахване на избраните хранилки?"
 
-#: js/functions.js:1591
-#: js/prefs.js:1120
+#: js/functions.js:1570
+#: js/prefs.js:1116
 msgid "Removing selected feeds..."
 msgstr "Премахване на избраните хранилки..."
 
@@ -2951,9 +2869,7 @@ msgstr "Редактор на потребител"
 #: js/prefs.js:100
 #: js/prefs.js:209
 #: js/prefs.js:706
-#: plugins/instances/instances.js:26
-#: plugins/instances/instances.js:89
-#: js/functions.js:1408
+#: js/functions.js:1387
 msgid "Saving data..."
 msgstr "Запазване на данни..."
 
@@ -2978,7 +2894,7 @@ msgid "Removing selected labels..."
 msgstr "Премахване на избраните етикети..."
 
 #: js/prefs.js:308
-#: js/prefs.js:1304
+#: js/prefs.js:1300
 msgid "No labels are selected."
 msgstr "Не са избрани етикети."
 
@@ -3077,28 +2993,28 @@ msgstr "Запазване на промените в избраните хра�
 msgid "OPML Import"
 msgstr "Внасяне на OPML"
 
-#: js/prefs.js:764
+#: js/prefs.js:759
 msgid "Please choose an OPML file first."
 msgstr "Моля, първо изберете OPML файл!"
 
-#: js/prefs.js:767
+#: js/prefs.js:762
 #: plugins/import_export/import_export.js:115
 msgid "Importing, please wait..."
 msgstr "Внасяне. Моля, изчакайте..."
 
-#: js/prefs.js:928
+#: js/prefs.js:924
 msgid "Reset to defaults?"
 msgstr "Връщане по подразбиране?"
 
-#: js/prefs.js:1628
+#: js/prefs.js:1624
 msgid "Subscribing to feeds..."
 msgstr "Абониране за хранилки..."
 
-#: js/prefs.js:1647
+#: js/prefs.js:1643
 msgid "Clear stored data for this plugin?"
 msgstr "Изчистване на съхранените данни за тази добавка?"
 
-#: js/prefs.js:1661
+#: js/prefs.js:1657
 msgid "Clear all messages in the error log?"
 msgstr "Изчистване на всички съобщения от журнала с грешки?"
 
@@ -3110,176 +3026,147 @@ msgstr "Отбелязване на всички статии като проч�
 msgid "Marking all feeds as read..."
 msgstr "Отбелязване на всички хранилки като прочетени..."
 
-#: js/tt-rss.js:401
+#: js/tt-rss.js:402
 msgid "Please enable mail plugin first."
 msgstr "Моля, първо активирайте добавката \"mail\"!"
 
-#: js/tt-rss.js:449
-#: js/functions.js:1387
-#: js/tt-rss.js:676
+#: js/tt-rss.js:450
+#: js/functions.js:1366
+#: js/tt-rss.js:677
 msgid "You can't edit this kind of feed."
 msgstr "Не можете да редактирате този вид хранилка."
 
-#: js/tt-rss.js:530
+#: js/tt-rss.js:531
 msgid "Please enable embed_original plugin first."
 msgstr "Моля, първо активирайте добавката \"embed_original\"!"
 
-#: js/tt-rss.js:543
-#: js/tt-rss.js:726
+#: js/tt-rss.js:544
+#: js/tt-rss.js:727
 msgid "Widescreen is not available in combined mode."
 msgstr "Няма широк екран в комбиниран режим."
 
-#: js/tt-rss.js:824
+#: js/tt-rss.js:825
 msgid "You can't rescore this kind of feed."
 msgstr "Не можете да преточкувате този тип хранилка."
 
-#: js/tt-rss.js:829
-#: js/tt-rss.js:689
+#: js/tt-rss.js:830
+#: js/tt-rss.js:690
 msgid "Please select some feed first."
 msgstr "Моля, първо изберете някоя хранилка!"
 
-#: js/tt-rss.js:834
+#: js/tt-rss.js:835
 #, perl-format
 msgid "Rescore articles in %s?"
 msgstr "Преточкуване на статиите в \"%s\"?"
 
-#: js/tt-rss.js:837
+#: js/tt-rss.js:838
 msgid "Rescoring articles..."
 msgstr "Преточкуване на статии..."
 
-#: js/viewfeed.js:919
-#: js/viewfeed.js:957
-#: js/viewfeed.js:1005
-#: js/viewfeed.js:1931
-#: plugins/mail/mail.js:7
+#: js/viewfeed.js:921
+#: js/viewfeed.js:959
+#: js/viewfeed.js:1007
+#: js/viewfeed.js:1933
 #: plugins/mailto/init.js:7
-#: js/viewfeed.js:677
-#: js/viewfeed.js:699
-#: js/viewfeed.js:720
-#: js/viewfeed.js:779
-#: js/viewfeed.js:807
+#: plugins/mail/mail.js:7
+#: js/viewfeed.js:679
+#: js/viewfeed.js:701
+#: js/viewfeed.js:722
+#: js/viewfeed.js:781
+#: js/viewfeed.js:809
 msgid "No articles are selected."
 msgstr "Не са избрани статии."
 
-#: js/viewfeed.js:927
+#: js/viewfeed.js:929
 #, perl-format
 msgid "Delete %d selected article in %s?"
 msgid_plural "Delete %d selected articles in %s?"
 msgstr[0] "Изтриване на %d избрана статия в \"%s\"?"
 msgstr[1] "Изтриване на %d избрани статии в \"%s\"?"
 
-#: js/viewfeed.js:929
+#: js/viewfeed.js:931
 #, perl-format
 msgid "Delete %d selected article?"
 msgid_plural "Delete %d selected articles?"
 msgstr[0] "Изтриване на %d избрана статия?"
 msgstr[1] "Изтриване на %d избрани статии?"
 
-#: js/viewfeed.js:966
+#: js/viewfeed.js:968
 #, perl-format
 msgid "Archive %d selected article in %s?"
 msgid_plural "Archive %d selected articles in %s?"
 msgstr[0] "Архивиране на %d избрана статия в \"%s\"?"
 msgstr[1] "Архивиране на %d избрани статии в \"%s\"?"
 
-#: js/viewfeed.js:969
+#: js/viewfeed.js:971
 #, perl-format
 msgid "Move %d archived article back?"
 msgid_plural "Move %d archived articles back?"
 msgstr[0] "Връщане на %d архивирана статия?"
 msgstr[1] "Връщане на %d архивирани статии?"
 
-#: js/viewfeed.js:971
+#: js/viewfeed.js:973
 msgid "Please note that unstarred articles might get purged on next feed update."
 msgstr "Моля имайте предвид, че статиите без звезда може да бъдат изтрити при следващото обновяване на хранилката."
 
-#: js/viewfeed.js:1011
+#: js/viewfeed.js:1013
 #, perl-format
 msgid "Mark %d selected article in %s as read?"
 msgid_plural "Mark %d selected articles in %s as read?"
 msgstr[0] "Отбелязване на %d избрана статия в \"%s\" като прочетена?"
 msgstr[1] "Отбелязване на %d избрани статии в \"%s\" като прочетени?"
 
-#: js/viewfeed.js:1031
+#: js/viewfeed.js:1033
 msgid "Edit article Tags"
 msgstr "Редактиране таговете на статия"
 
-#: js/viewfeed.js:1037
+#: js/viewfeed.js:1039
 msgid "Saving article tags..."
 msgstr "Запазване таговете на статия..."
 
-#: js/viewfeed.js:1670
+#: js/viewfeed.js:1672
 msgid "Open original article"
 msgstr "Отваряне на оригиналната статия"
 
-#: js/viewfeed.js:1677
+#: js/viewfeed.js:1679
 msgid "Display article URL"
 msgstr "Показване URL-а на статията"
 
-#: js/viewfeed.js:1787
+#: js/viewfeed.js:1789
 msgid "Assign label"
 msgstr "Присвояване на етикет"
 
-#: js/viewfeed.js:1792
+#: js/viewfeed.js:1794
 msgid "Remove label"
 msgstr "Премахване на етикет"
 
-#: js/viewfeed.js:1824
+#: js/viewfeed.js:1826
 msgid "Select articles in group"
 msgstr "Избиране на статии в група"
 
-#: js/viewfeed.js:1834
+#: js/viewfeed.js:1836
 msgid "Mark group as read"
 msgstr "Отбелязване на групата като прочетена"
 
-#: js/viewfeed.js:1846
+#: js/viewfeed.js:1848
 msgid "Mark feed as read"
 msgstr "Отбелязване на хранилката като прочетена"
 
-#: js/viewfeed.js:1899
+#: js/viewfeed.js:1901
 msgid "Please enter new score for selected articles:"
 msgstr "Моля, въведете нови точки за избраната статия:"
 
-#: js/viewfeed.js:1962
+#: js/viewfeed.js:1964
 msgid "Please enter new score for this article:"
 msgstr "Моля, въведете нови точки за тази статия:"
 
-#: js/viewfeed.js:1993
+#: js/viewfeed.js:1995
 msgid "Article URL:"
 msgstr "URL на статията:"
 
-#: plugins/instances/instances.js:10
-msgid "Link Instance"
-msgstr "Свързване на инсталация"
-
-#: plugins/instances/instances.js:73
-msgid "Edit Instance"
-msgstr "Редактиране на инсталация"
-
-#: plugins/instances/instances.js:122
-msgid "Remove selected instances?"
-msgstr "Премахване на избраните инсталации?"
-
-#: plugins/instances/instances.js:125
-msgid "Removing selected instances..."
-msgstr "Премахване на избраните инсталации..."
-
-#: plugins/instances/instances.js:139
-#: plugins/instances/instances.js:151
-msgid "No instances are selected."
-msgstr "Не са избрани инсталации."
-
-#: plugins/instances/instances.js:156
-msgid "Please select only one instance."
-msgstr "Моля, изберете само една инсталация!"
-
-#: plugins/note/note.js:17
-msgid "Saving article note..."
-msgstr "Запазване бележка на статия..."
-
-#: plugins/af_psql_trgm/init.js:11
-msgid "Related articles"
-msgstr "Свързани статии"
+#: plugins/embed_original/init.js:6
+msgid "Sorry, your browser does not support sandboxed iframes."
+msgstr "Съжалявам, браузърът Ви не поддържа тестови iframe-ове."
 
 #: plugins/import_export/import_export.js:13
 msgid "Export Data"
@@ -3300,11 +3187,15 @@ msgstr "Внасяне на данни"
 msgid "Please choose the file first."
 msgstr "Моля, първо изберете файл!"
 
-#: plugins/mail/mail.js:21
 #: plugins/mailto/init.js:21
+#: plugins/mail/mail.js:21
 msgid "Forward article by email"
 msgstr "Препращане на статия по e-mail"
 
+#: plugins/af_psql_trgm/init.js:11
+msgid "Related articles"
+msgstr "Свързани статии"
+
 #: plugins/mail/mail.js:36
 msgid "Error sending email:"
 msgstr "Грешка при изпращане на e-mail:"
@@ -3313,10 +3204,6 @@ msgstr "Грешка при изпращане на e-mail:"
 msgid "Your message has been sent."
 msgstr "Съобщението Ви е изпратено."
 
-#: plugins/embed_original/init.js:6
-msgid "Sorry, your browser does not support sandboxed iframes."
-msgstr "Съжалявам, браузърът Ви не поддържа тестови iframe-ове."
-
 #: plugins/shorten_expanded/init.js:39
 msgid "Click to expand article"
 msgstr "Клик за разпъване на статия"
@@ -3346,7 +3233,7 @@ msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr "Това ще отвалидира всички предходно споделени URL-и на статията. Продължаване?"
 
 #: plugins/share/share_prefs.js:6
-#: js/prefs.js:1437
+#: js/prefs.js:1433
 msgid "Clearing URLs..."
 msgstr "Изчистване на URL-и..."
 
@@ -3354,23 +3241,44 @@ msgstr "Изчистване на URL-и..."
 msgid "Shared URLs cleared."
 msgstr "Споделените URL-и са изчистени."
 
+#: plugins/note/note.js:17
+msgid "Saving article note..."
+msgstr "Запазване бележка на статия..."
+
 #: js/feedlist.js:429
-#: js/feedlist.js:496
 msgid "Mark all articles in %s as read?"
 msgstr "Отбелязване на всички статии в \"%s\" като прочетени?"
 
 #: js/feedlist.js:487
-msgid "Mark all articles in %s older than 1 day as read?"
+#, fuzzy
+msgid "Mark %w in %s older than 1 day as read?"
 msgstr "Отбелязване на всички статии в \"%s\", по-стари от 1 ден, като прочетени?"
 
 #: js/feedlist.js:490
-msgid "Mark all articles in %s older than 1 week as read?"
+#, fuzzy
+msgid "Mark %w in %s older than 1 week as read?"
 msgstr "Отбелязване на всички статии в \"%s\", по-стари от 1 седмица, като прочетени?"
 
 #: js/feedlist.js:493
-msgid "Mark all articles in %s older than 2 weeks as read?"
+#, fuzzy
+msgid "Mark %w in %s older than 2 weeks as read?"
 msgstr "Отбелязване на всички статии в \"%s\", по-стари от 2 седмици, като прочетени?"
 
+#: js/feedlist.js:496
+#, fuzzy
+msgid "Mark %w in %s as read?"
+msgstr "Отбелязване на всички статии в \"%s\" като прочетени?"
+
+#: js/feedlist.js:499
+#, fuzzy
+msgid "search results"
+msgstr "Резултати от търсенето: %s"
+
+#: js/feedlist.js:499
+#, fuzzy
+msgid "all articles"
+msgstr "Всички статии"
+
 #: js/functions.js:506
 msgid "Error explained"
 msgstr "Обяснение на грешка"
@@ -3451,177 +3359,246 @@ msgstr "Вече сте абонирани за тази хранилка."
 msgid "Edit rule"
 msgstr "Редактиране на правило"
 
-#: js/functions.js:1402
+#: js/functions.js:1381
 msgid "Edit Feed"
 msgstr "Редактиране на хранилка"
 
-#: js/functions.js:1435
+#: js/functions.js:1414
 msgid "More Feeds"
 msgstr "Още хранилки"
 
-#: js/functions.js:1631
+#: js/functions.js:1610
 msgid "Help"
 msgstr "Помощ"
 
-#: js/prefs.js:1032
+#: js/prefs.js:1028
 msgid "Remove category %s? Any nested feeds would be placed into Uncategorized."
 msgstr "Премахване на категория \"%s\"? Всички хранилки в нея ще бъдат сложени в \"Без категория\"."
 
-#: js/prefs.js:1038
+#: js/prefs.js:1034
 msgid "Removing category..."
 msgstr "Премахване на категория..."
 
-#: js/prefs.js:1056
+#: js/prefs.js:1052
 msgid "Remove selected categories?"
 msgstr "Премахване на избраните категории?"
 
-#: js/prefs.js:1059
+#: js/prefs.js:1055
 msgid "Removing selected categories..."
 msgstr "Премахване на избраните категории..."
 
-#: js/prefs.js:1072
+#: js/prefs.js:1068
 msgid "No categories are selected."
 msgstr "Не са избрани категории."
 
-#: js/prefs.js:1079
+#: js/prefs.js:1075
 msgid "Category title:"
 msgstr "Име на категория:"
 
-#: js/prefs.js:1083
+#: js/prefs.js:1079
 msgid "Creating category..."
 msgstr "Създаване на категория..."
 
-#: js/prefs.js:1106
+#: js/prefs.js:1102
 msgid "Feeds without recent updates"
 msgstr "Хранилки без скорошни обновления"
 
-#: js/prefs.js:1150
+#: js/prefs.js:1146
 msgid "Replace current OPML publishing address with a new one?"
 msgstr "Замяна на текущо публикувания OPML адрес с нов?"
 
-#: js/prefs.js:1227
+#: js/prefs.js:1223
 msgid "Clearing feed..."
 msgstr "Изчистване на хранилка..."
 
-#: js/prefs.js:1247
+#: js/prefs.js:1243
 msgid "Rescore articles in selected feeds?"
 msgstr "Преточкуване на статиите в избраните хранилки?"
 
-#: js/prefs.js:1250
+#: js/prefs.js:1246
 msgid "Rescoring selected feeds..."
 msgstr "Преточкуване на избраните хранилки..."
 
-#: js/prefs.js:1270
+#: js/prefs.js:1266
 msgid "Rescore all articles? This operation may take a lot of time."
 msgstr "Преточкуване на всички статии? Това може да отнеме много време."
 
-#: js/prefs.js:1273
+#: js/prefs.js:1269
 msgid "Rescoring feeds..."
 msgstr "Преточкуване на хранилки..."
 
-#: js/prefs.js:1289
+#: js/prefs.js:1285
 msgid "Reset selected labels to default colors?"
 msgstr "Връщане на избраните етикети към цветове по подразбиране?"
 
-#: js/prefs.js:1321
+#: js/prefs.js:1317
 msgid "Settings Profiles"
 msgstr "Настройки на профили"
 
-#: js/prefs.js:1330
+#: js/prefs.js:1326
 msgid "Remove selected profiles? Active and default profiles will not be removed."
 msgstr "Премахване на избраните профили? Активните и подразбиращи профили няма да бъдат премахнати."
 
-#: js/prefs.js:1333
+#: js/prefs.js:1329
 msgid "Removing selected profiles..."
 msgstr "Премахване на избраните профили..."
 
-#: js/prefs.js:1349
+#: js/prefs.js:1345
 msgid "No profiles are selected."
 msgstr "Не са избрани профили."
 
-#: js/prefs.js:1357
-#: js/prefs.js:1410
+#: js/prefs.js:1353
+#: js/prefs.js:1406
 msgid "Activate selected profile?"
 msgstr "Активиране на избрания профил?"
 
-#: js/prefs.js:1374
-#: js/prefs.js:1426
+#: js/prefs.js:1370
+#: js/prefs.js:1422
 msgid "Please choose a profile to activate."
 msgstr "Моля, изберете профил за активиране!"
 
-#: js/prefs.js:1379
+#: js/prefs.js:1375
 msgid "Creating profile..."
 msgstr "Създаване на профил..."
 
-#: js/prefs.js:1434
+#: js/prefs.js:1430
 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr "Това ще отвалидира всички предходно генерирани URL-и за хранилката. Продължаване?"
 
-#: js/prefs.js:1444
+#: js/prefs.js:1440
 msgid "Generated URLs cleared."
 msgstr "Генерираните URL-и са изчистени."
 
-#: js/prefs.js:1516
+#: js/prefs.js:1512
 msgid "Label Editor"
 msgstr "Редактор на етикети"
 
-#: js/tt-rss.js:684
+#: js/tt-rss.js:685
 msgid "You can't unsubscribe from the category."
 msgstr "Не можете да се отпишете от тази категория."
 
-#: js/viewfeed.js:125
-#: js/viewfeed.js:175
-#: js/viewfeed.js:192
+#: js/viewfeed.js:127
+#: js/viewfeed.js:177
+#: js/viewfeed.js:194
 msgid "Click to open next unread feed."
 msgstr "Отваряне на следващата непрочетена хранилка."
 
-#: js/viewfeed.js:129
+#: js/viewfeed.js:131
 msgid "Cancel search"
 msgstr "Отмяна на търсенето"
 
-#: js/viewfeed.js:189
+#: js/viewfeed.js:191
 #, fuzzy
 msgid "New articles found, reload feed to continue."
 msgstr "Не са намерени статии за показване."
 
-#: js/viewfeed.js:424
+#: js/viewfeed.js:426
 msgid "Unstar article"
 msgstr "Премахване на звезда на статия"
 
-#: js/viewfeed.js:428
+#: js/viewfeed.js:430
 msgid "Star article"
 msgstr "Слагане на звезда на статия"
 
-#: js/viewfeed.js:478
+#: js/viewfeed.js:480
 msgid "Unpublish article"
 msgstr "Разпубликуване на статия"
 
-#: js/viewfeed.js:482
+#: js/viewfeed.js:484
 msgid "Publish article"
 msgstr "Публикуване на статия"
 
-#: js/viewfeed.js:622
+#: js/viewfeed.js:624
 msgid "%d article selected"
 msgid_plural "%d articles selected"
 msgstr[0] "%d статия е избрана"
 msgstr[1] "%d статии са избрани"
 
-#: js/viewfeed.js:1286
+#: js/viewfeed.js:1288
 msgid "No article is selected."
 msgstr "Не е избрана статия."
 
-#: js/viewfeed.js:1321
+#: js/viewfeed.js:1323
 msgid "No articles found to mark"
 msgstr "Не са намерени статии за отбелязване"
 
-#: js/viewfeed.js:1323
+#: js/viewfeed.js:1325
 msgid "Mark %d article as read?"
 msgid_plural "Mark %d articles as read?"
 msgstr[0] "Отбелязване на %d статия като прочетена?"
 msgstr[1] "Отбелязване на %d статии като прочетени?"
 
-#~ msgid "Cache images locally"
-#~ msgstr "Локално кеширане на изображенията"
+#~ msgid "Resubscribe to push updates"
+#~ msgstr "Преабониране за прокарване на обновления"
+
+#~ msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
+#~ msgstr "Нулиране статуса на PubSubHubbub абонамента за хранилки с позволено прокарване."
+
+#~ msgid "Download more plugins at tt-rss.org <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forums</a> or <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a>."
+#~ msgstr "Изтеглете още добавки от tt-rss.org <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">форумите</a> или <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a>."
+
+#~ msgid "Linked"
+#~ msgstr "Свързана"
+
+#~ msgid "Instance"
+#~ msgstr "Инсталация"
+
+#~ msgid "Instance URL"
+#~ msgstr "URL на инсталация"
+
+#~ msgid "Access key:"
+#~ msgstr "Ключ за достъп:"
+
+#~ msgid "Access key"
+#~ msgstr "Ключ за достъп"
+
+#~ msgid "Use one access key for both linked instances."
+#~ msgstr "Използване на един ключ за достъп за двете свързани инсталации."
+
+#~ msgid "Generate new key"
+#~ msgstr "Генериране на нов ключ"
+
+#~ msgid "Link instance"
+#~ msgstr "Свързване на инсталация"
+
+#~ msgid "You can connect other instances of Tiny Tiny RSS to this one to share Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
+#~ msgstr "Можете да свържете други инсталации на Tiny Tiny RSS към тази, за да споделяте популярни хранилки. Свързване към тази инсталация на Tiny Tiny RSS чрез този URL:"
+
+#~ msgid "Last connected"
+#~ msgstr "Последно свързана"
+
+#~ msgid "Status"
+#~ msgstr "Статус"
+
+#~ msgid "Stored feeds"
+#~ msgstr "Съхранени хранилки"
+
+#~ msgid "Create link"
+#~ msgstr "Създаване на връзка"
+
+#~ msgid "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification hub again on next feed update."
+#~ msgstr "Нулиране на абонамента? Tiny Tiny RSS ще опита да се абонира към известията отново при следващото обновяване на хранилките."
+
+#~ msgid "Subscription reset."
+#~ msgstr "Нулиране на абонамент."
+
+#~ msgid "Link Instance"
+#~ msgstr "Свързване на инсталация"
+
+#~ msgid "Edit Instance"
+#~ msgstr "Редактиране на инсталация"
+
+#~ msgid "Remove selected instances?"
+#~ msgstr "Премахване на избраните инсталации?"
+
+#~ msgid "Removing selected instances..."
+#~ msgstr "Премахване на избраните инсталации..."
+
+#~ msgid "No instances are selected."
+#~ msgstr "Не са избрани инсталации."
+
+#~ msgid "Please select only one instance."
+#~ msgstr "Моля, изберете само една инсталация!"
 
 #~ msgid "The error will be reported to the configured log destination."
 #~ msgstr "Грешката ще бъде записана в указаното място за журнал."
diff --git a/locale/ca_CA/LC_MESSAGES/messages.mo b/locale/ca_CA/LC_MESSAGES/messages.mo
index 987442923..1be2f9ebc 100644
--- a/locale/ca_CA/LC_MESSAGES/messages.mo
+++ b/locale/ca_CA/LC_MESSAGES/messages.mo
diff --git a/locale/ca_CA/LC_MESSAGES/messages.po b/locale/ca_CA/LC_MESSAGES/messages.po
index 7ef43d529..2fb46ad5f 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: 2017-03-23 15:25+0300\n"
+"POT-Creation-Date: 2017-07-04 16:29+0300\n"
 "PO-Revision-Date: 2009-11-19 09:40+0100\n"
 "Last-Translator: Alfred Galitó <[email protected]>\n"
 "Language-Team: Català <[email protected]>\n"
@@ -177,31 +177,30 @@ msgstr "No s'ha trobat l'usuari"
 #: prefs.php:118
 #: classes/backend.php:5
 #: classes/pref/labels.php:282
-#: classes/pref/feeds.php:1402
-#: classes/pref/filters.php:779
+#: classes/pref/filters.php:819
+#: classes/pref/feeds.php:1376
 #: js/feedlist.js:149
-#: js/functions.js:1131
-#: js/functions.js:1231
-#: js/functions.js:1478
+#: js/functions.js:1210
+#: js/functions.js:1457
 #: js/prefs.js:621
-#: js/prefs.js:818
-#: js/prefs.js:1648
-#: js/prefs.js:1663
-#: js/tt-rss.js:550
-#: js/viewfeed.js:1182
+#: js/prefs.js:813
+#: js/prefs.js:1644
+#: js/prefs.js:1659
+#: js/tt-rss.js:551
+#: js/viewfeed.js:1184
 #: plugins/import_export/import_export.js:17
 #: js/feedlist.js:467
-#: js/feedlist.js:512
+#: js/feedlist.js:515
 #: js/functions.js:372
 #: js/functions.js:630
-#: js/prefs.js:1360
-#: js/prefs.js:1413
-#: js/prefs.js:1452
-#: js/prefs.js:1465
-#: js/prefs.js:1476
-#: js/prefs.js:1491
-#: js/tt-rss.js:567
-#: js/viewfeed.js:762
+#: js/prefs.js:1356
+#: js/prefs.js:1409
+#: js/prefs.js:1448
+#: js/prefs.js:1461
+#: js/prefs.js:1472
+#: js/prefs.js:1487
+#: js/tt-rss.js:568
+#: js/viewfeed.js:764
 msgid "Loading, please wait..."
 msgstr "S'està obrint, preneu paciència..."
 
@@ -219,13 +218,13 @@ msgid "All Articles"
 msgstr "Tots els articles"
 
 #: index.php:192
-#: include/functions2.php:107
+#: include/functions.php:1181
 #: classes/feeds.php:110
 msgid "Starred"
 msgstr "Marcats"
 
 #: index.php:193
-#: include/functions2.php:108
+#: include/functions.php:1182
 #: classes/feeds.php:111
 msgid "Published"
 msgstr "Publicats"
@@ -267,7 +266,7 @@ msgstr "Títol"
 
 #: index.php:209
 #: index.php:249
-#: include/functions2.php:95
+#: include/functions.php:1169
 #: classes/feeds.php:115
 #: js/FeedTree.js:138
 #: js/FeedTree.js:166
@@ -308,7 +307,7 @@ msgid "Feed actions:"
 msgstr "Accions sobre els canals:"
 
 #: index.php:244
-#: classes/handler/public.php:672
+#: classes/handler/public.php:583
 msgid "Subscribe to feed..."
 msgstr "Subscriviu-vos al canal"
 
@@ -322,8 +321,8 @@ msgstr "Canvia la puntuació del canal"
 
 #: index.php:247
 #: classes/pref/feeds.php:785
-#: classes/pref/feeds.php:1357
-#: js/PrefFeedTree.js:78
+#: classes/pref/feeds.php:1331
+#: js/PrefFeedTree.js:80
 msgid "Unsubscribe"
 msgstr "Dóna't de baixa"
 
@@ -340,7 +339,7 @@ msgid "Other actions:"
 msgstr "Altres accions:"
 
 #: index.php:252
-#: include/functions2.php:81
+#: include/functions.php:1155
 #, fuzzy
 msgid "Toggle widescreen mode"
 msgstr "Canvia al mode de reordenació de categories"
@@ -368,7 +367,7 @@ msgstr ""
 
 #: prefs.php:33
 #: prefs.php:136
-#: include/functions2.php:110
+#: include/functions.php:1184
 #: classes/pref/prefs.php:435
 msgid "Preferences"
 msgstr "Preferències"
@@ -383,20 +382,19 @@ msgstr "Surt de les preferències"
 
 #: prefs.php:139
 #: classes/pref/feeds.php:112
-#: classes/pref/feeds.php:1297
-#: classes/pref/feeds.php:1346
+#: classes/pref/feeds.php:1271
+#: classes/pref/feeds.php:1320
 msgid "Feeds"
 msgstr "Canals"
 
 #: prefs.php:142
-#: classes/pref/filters.php:248
+#: classes/pref/filters.php:273
 msgid "Filters"
 msgstr "Filtres"
 
 #: prefs.php:145
-#: include/functions.php:1327
-#: include/functions.php:1979
 #: classes/pref/labels.php:90
+#: classes/feeds.php:1718
 msgid "Labels"
 msgstr "Etiquetes"
 
@@ -425,13 +423,13 @@ msgstr "L'administrador ha deshabilitat els registres de nous usuaris."
 #: register.php:337
 #: register.php:347
 #: register.php:359
-#: classes/handler/public.php:742
-#: classes/handler/public.php:813
-#: classes/handler/public.php:911
-#: classes/handler/public.php:990
-#: classes/handler/public.php:1004
-#: classes/handler/public.php:1011
-#: classes/handler/public.php:1036
+#: classes/handler/public.php:653
+#: classes/handler/public.php:724
+#: classes/handler/public.php:822
+#: classes/handler/public.php:901
+#: classes/handler/public.php:915
+#: classes/handler/public.php:922
+#: classes/handler/public.php:947
 msgid "Return to Tiny Tiny RSS"
 msgstr "Torna a Tiny Tiny RSS"
 
@@ -448,12 +446,12 @@ msgid "Check availability"
 msgstr "Comprova la disponibilitat"
 
 #: register.php:229
-#: classes/handler/public.php:829
+#: classes/handler/public.php:740
 msgid "Email:"
 msgstr "Adreça electrònica:"
 
 #: register.php:232
-#: classes/handler/public.php:834
+#: classes/handler/public.php:745
 msgid "How much is two plus two:"
 msgstr "Quant és dos més dos:"
 
@@ -481,18 +479,24 @@ msgstr "S'ha creat el compte."
 msgid "New user registrations are currently closed."
 msgstr "Actualment no es permet el registre de nous usuaris."
 
-#: update.php:67
+#: update.php:66
 #, fuzzy
 msgid "Tiny Tiny RSS data update script."
 msgstr "La base de dades de Tiny Tiny RSS està actualitzada."
 
-#: include/digest.php:109
-#: include/functions.php:1336
-#: include/functions.php:1880
-#: include/functions.php:1965
-#: include/functions.php:1987
-#: classes/opml.php:421
+#: include/controls.php:83
+#: classes/pref/filters.php:242
+#: classes/pref/filters.php:253
+#: classes/pref/filters.php:544
+msgid "All feeds"
+msgstr "Tots els canals"
+
+#: include/controls.php:134
+#: include/controls.php:316
 #: classes/pref/feeds.php:228
+#: classes/opml.php:486
+#: classes/feeds.php:1727
+#: classes/digest.php:113
 msgid "Uncategorized"
 msgstr "Sense categoria"
 
@@ -507,429 +511,319 @@ msgstr[1] "Articles marcats"
 msgid "No feeds found."
 msgstr "No s'ha trobat cap canal."
 
-#: include/functions.php:1029
+#: include/functions.php:900
 #, php-format
 msgid "%d min"
 msgstr ""
 
-#: include/functions.php:1325
-#: include/functions.php:1977
-msgid "Special"
-msgstr "Especial"
-
-#: include/functions.php:1828
-#: classes/pref/filters.php:229
-#: classes/pref/filters.php:507
-msgid "All feeds"
-msgstr "Tots els canals"
-
-#: include/functions.php:2032
-msgid "Starred articles"
-msgstr "Articles marcats"
-
-#: include/functions.php:2034
-msgid "Published articles"
-msgstr "Articles publicats"
-
-#: include/functions.php:2036
-msgid "Fresh articles"
-msgstr "Articles nous"
-
-#: include/functions.php:2038
-#: include/functions2.php:105
-msgid "All articles"
-msgstr "Tots els articles"
-
-#: include/functions.php:2040
-#, fuzzy
-msgid "Archived articles"
-msgstr "Articles mémorisés"
-
-#: include/functions.php:2042
-msgid "Recently read"
-msgstr ""
-
-#: include/functions2.php:57
+#: include/functions.php:1131
 msgid "Navigation"
 msgstr "Navegació"
 
-#: include/functions2.php:58
+#: include/functions.php:1132
 #, fuzzy
 msgid "Open next feed"
 msgstr "Canals generats"
 
-#: include/functions2.php:59
+#: include/functions.php:1133
 msgid "Open previous feed"
 msgstr ""
 
-#: include/functions2.php:60
+#: include/functions.php:1134
 #, fuzzy
 msgid "Open next article"
 msgstr "Mostra el contingut original de l'article"
 
-#: include/functions2.php:61
+#: include/functions.php:1135
 #, fuzzy
 msgid "Open previous article"
 msgstr "Mostra el contingut original de l'article"
 
-#: include/functions2.php:62
+#: include/functions.php:1136
 msgid "Open next article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions2.php:63
+#: include/functions.php:1137
 msgid "Open previous article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions2.php:64
+#: include/functions.php:1138
 msgid "Move to next article (don't expand or mark read)"
 msgstr ""
 
-#: include/functions2.php:65
+#: include/functions.php:1139
 msgid "Move to previous article (don't expand or mark read)"
 msgstr ""
 
-#: include/functions2.php:66
+#: include/functions.php:1140
 msgid "Show search dialog"
 msgstr "Mostra el diàleg de cerca"
 
-#: include/functions2.php:67
+#: include/functions.php:1141
 #, fuzzy
 msgid "Article"
 msgstr "Tots els articles"
 
-#: include/functions2.php:68
-#: js/viewfeed.js:1699
+#: include/functions.php:1142
+#: js/viewfeed.js:1701
 msgid "Toggle starred"
 msgstr "Commuta els marcats"
 
-#: include/functions2.php:69
-#: js/viewfeed.js:1711
+#: include/functions.php:1143
+#: js/viewfeed.js:1713
 msgid "Toggle published"
 msgstr "Commuta els publicats"
 
-#: include/functions2.php:70
-#: js/viewfeed.js:1686
+#: include/functions.php:1144
+#: js/viewfeed.js:1688
 msgid "Toggle unread"
 msgstr "Commuta els no llegits"
 
-#: include/functions2.php:71
+#: include/functions.php:1145
 msgid "Edit tags"
 msgstr "Edita les etiquetes"
 
-#: include/functions2.php:72
+#: include/functions.php:1146
 #, fuzzy
 msgid "Open in new window"
 msgstr "Obre l'article en una finestra nova"
 
-#: include/functions2.php:73
-#: js/viewfeed.js:1732
+#: include/functions.php:1147
+#: js/viewfeed.js:1734
 #, fuzzy
 msgid "Mark below as read"
 msgstr "Marca'l com a llegit"
 
-#: include/functions2.php:74
-#: js/viewfeed.js:1725
+#: include/functions.php:1148
+#: js/viewfeed.js:1727
 #, fuzzy
 msgid "Mark above as read"
 msgstr "Marca'l com a llegit"
 
-#: include/functions2.php:75
+#: include/functions.php:1149
 #, fuzzy
 msgid "Scroll down"
 msgstr "Fet!"
 
-#: include/functions2.php:76
+#: include/functions.php:1150
 msgid "Scroll up"
 msgstr ""
 
-#: include/functions2.php:77
+#: include/functions.php:1151
 #, fuzzy
 msgid "Select article under cursor"
 msgstr "Seleccioneu un article mitjançant el ratolí."
 
-#: include/functions2.php:78
+#: include/functions.php:1152
 #, fuzzy
 msgid "Email article"
 msgstr "Tots els articles"
 
-#: include/functions2.php:79
+#: include/functions.php:1153
 #, fuzzy
 msgid "Close/collapse article"
 msgstr "Buida els articles"
 
-#: include/functions2.php:80
+#: include/functions.php:1154
 #, fuzzy
 msgid "Toggle article expansion (combined mode)"
 msgstr "Canvia al mode de reordenació de categories"
 
-#: include/functions2.php:82
+#: include/functions.php:1156
 #: plugins/embed_original/init.php:31
 #, fuzzy
 msgid "Toggle embed original"
 msgstr "Canvia al mode de reordenació de categories"
 
-#: include/functions2.php:83
+#: include/functions.php:1157
 #, fuzzy
 msgid "Article selection"
 msgstr "Accions actives de l'article"
 
-#: include/functions2.php:84
+#: include/functions.php:1158
 #, fuzzy
 msgid "Select all articles"
 msgstr "Buida els articles"
 
-#: include/functions2.php:85
+#: include/functions.php:1159
 #, fuzzy
 msgid "Select unread"
 msgstr "Purga els articles per llegir"
 
-#: include/functions2.php:86
+#: include/functions.php:1160
 #, fuzzy
 msgid "Select starred"
 msgstr "Marca'l com a destacat"
 
-#: include/functions2.php:87
+#: include/functions.php:1161
 #, fuzzy
 msgid "Select published"
 msgstr "Purga els articles per llegir"
 
-#: include/functions2.php:88
+#: include/functions.php:1162
 #, fuzzy
 msgid "Invert selection"
 msgstr "Accions actives de l'article"
 
-#: include/functions2.php:89
+#: include/functions.php:1163
 #, fuzzy
 msgid "Deselect everything"
 msgstr "Buida els articles"
 
-#: include/functions2.php:90
+#: include/functions.php:1164
 #: classes/pref/feeds.php:555
-#: classes/pref/feeds.php:823
+#: classes/pref/feeds.php:811
 msgid "Feed"
 msgstr "Canal"
 
-#: include/functions2.php:91
+#: include/functions.php:1165
 #, fuzzy
 msgid "Refresh current feed"
 msgstr "Actualitza els canals actius"
 
-#: include/functions2.php:92
+#: include/functions.php:1166
 #, fuzzy
 msgid "Un/hide read feeds"
 msgstr "Mostra/amaga els canals llegits"
 
-#: include/functions2.php:93
-#: classes/pref/feeds.php:1349
+#: include/functions.php:1167
+#: classes/pref/feeds.php:1323
 msgid "Subscribe to feed"
 msgstr "Subscriu-te al canal"
 
-#: include/functions2.php:94
+#: include/functions.php:1168
 #: js/FeedTree.js:145
-#: js/PrefFeedTree.js:72
-#: js/viewfeed.js:1853
+#: js/PrefFeedTree.js:74
+#: js/viewfeed.js:1855
 msgid "Edit feed"
 msgstr "Edita el canal"
 
-#: include/functions2.php:96
+#: include/functions.php:1170
 #, fuzzy
 msgid "Reverse headlines"
 msgstr "Inverteix l'ordre de les capçaleres (les més antigues les primeres)"
 
-#: include/functions2.php:97
+#: include/functions.php:1171
 msgid "Toggle headline grouping"
 msgstr ""
 
-#: include/functions2.php:98
+#: include/functions.php:1172
 #, fuzzy
 msgid "Debug feed update"
 msgstr "S'ha acabat l'actualització dels canals."
 
-#: include/functions2.php:99
+#: include/functions.php:1173
 #, fuzzy
 msgid "Debug viewfeed()"
 msgstr "S'ha acabat l'actualització dels canals."
 
-#: include/functions2.php:100
+#: include/functions.php:1174
 #: js/FeedTree.js:194
 msgid "Mark all feeds as read"
 msgstr "Marca tots els canals com a llegits"
 
-#: include/functions2.php:101
+#: include/functions.php:1175
 #, fuzzy
 msgid "Un/collapse current category"
 msgstr "Clica-hi per a reduir la categoria"
 
-#: include/functions2.php:102
+#: include/functions.php:1176
 #, fuzzy
 msgid "Toggle combined mode"
 msgstr "Canvia al mode de reordenació de categories"
 
-#: include/functions2.php:103
+#: include/functions.php:1177
 #, fuzzy
 msgid "Toggle auto expand in combined mode"
 msgstr "Canvia al mode de reordenació de categories"
 
-#: include/functions2.php:104
+#: include/functions.php:1178
 #, fuzzy
 msgid "Go to"
 msgstr "Vés a..."
 
-#: include/functions2.php:106
+#: include/functions.php:1179
+#: classes/feeds.php:1602
+msgid "All articles"
+msgstr "Tots els articles"
+
+#: include/functions.php:1180
 #, fuzzy
 msgid "Fresh"
 msgstr "Actualitza"
 
-#: include/functions2.php:109
-#: js/tt-rss.js:494
-#: js/tt-rss.js:663
+#: include/functions.php:1183
+#: js/tt-rss.js:495
+#: js/tt-rss.js:664
 msgid "Tag cloud"
 msgstr "Núvol d'etiquetes"
 
-#: include/functions2.php:111
+#: include/functions.php:1185
 #, fuzzy
 msgid "Other"
 msgstr "Altres:"
 
-#: include/functions2.php:112
+#: include/functions.php:1186
 #: classes/pref/labels.php:267
 msgid "Create label"
 msgstr "Crea una etiqueta"
 
-#: include/functions2.php:113
-#: classes/pref/filters.php:753
+#: include/functions.php:1187
+#: classes/pref/filters.php:793
 msgid "Create filter"
 msgstr "Crea un filtre"
 
-#: include/functions2.php:114
+#: include/functions.php:1188
 #, fuzzy
 msgid "Un/collapse sidebar"
 msgstr "Redueix la barra lateral"
 
-#: include/functions2.php:115
+#: include/functions.php:1189
 #, fuzzy
 msgid "Show help dialog"
 msgstr "Mostra el diàleg de cerca"
 
-#: include/functions2.php:670
-#, fuzzy, php-format
-msgid "Search results: %s"
-msgstr "Resultats de la cerca"
-
-#: include/functions2.php:1336
-#: classes/feeds.php:752
-#, fuzzy
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] "comentaris"
-msgstr[1] "comentaris"
-
-#: include/functions2.php:1340
-#: classes/feeds.php:756
-msgid "comments"
-msgstr "comentaris"
-
-#: include/functions2.php:1366
-msgid " - "
-msgstr " - "
-
-#: include/functions2.php:1397
-#: include/functions2.php:1648
-#: classes/article.php:311
-msgid "no tags"
-msgstr "sense etiqueta"
-
-#: include/functions2.php:1407
-#: classes/feeds.php:738
-msgid "Edit tags for this article"
-msgstr "Edita les etiquetes d'aquest article"
-
-#: include/functions2.php:1439
-#: classes/feeds.php:690
-#, fuzzy
-msgid "Originally from:"
-msgstr "Mostra el contingut original de l'article"
-
-#: include/functions2.php:1452
-#: classes/pref/feeds.php:574
-#: classes/feeds.php:703
-#, fuzzy
-msgid "Feed URL"
-msgstr "Canal"
-
-#: include/functions2.php:1489
-#: classes/backend.php:105
-#: classes/dlg.php:37
-#: classes/dlg.php:60
-#: classes/dlg.php:93
-#: classes/dlg.php:159
-#: classes/dlg.php:186
-#: classes/pref/feeds.php:1652
-#: classes/pref/feeds.php:1718
-#: classes/pref/filters.php:204
-#: classes/pref/prefs.php:1097
-#: plugins/af_psql_trgm/init.php:102
-#: plugins/import_export/init.php:415
-#: plugins/import_export/init.php:461
-#: plugins/share/init.php:121
-msgid "Close this window"
-msgstr "Tanca la finestra"
-
-#: include/functions2.php:1686
-#, fuzzy
-msgid "(edit note)"
-msgstr "edita la nota"
-
-#: include/functions2.php:1960
-msgid "unknown type"
-msgstr "tipus desconegut"
-
-#: include/functions2.php:2037
-#, fuzzy
-msgid "Attachments"
-msgstr "Adjuncions:"
-
-#: include/functions2.php:2496
+#: include/functions.php:2456
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: include/functions2.php:2497
+#: include/functions.php:2457
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: include/functions2.php:2498
+#: include/functions.php:2458
 msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
 msgstr ""
 
-#: include/functions2.php:2499
+#: include/functions.php:2459
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: include/functions2.php:2500
+#: include/functions.php:2460
 #, fuzzy
 msgid "No file was uploaded"
 msgstr "No hi ha cap fitxer OPML per a carregar."
 
-#: include/functions2.php:2501
+#: include/functions.php:2461
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: include/functions2.php:2502
+#: include/functions.php:2462
 msgid "Failed to write file to disk."
 msgstr ""
 
-#: include/functions2.php:2503
+#: include/functions.php:2463
 msgid "A PHP extension stopped the file upload."
 msgstr ""
 
 #: include/login_form.php:197
-#: classes/handler/public.php:569
-#: classes/handler/public.php:824
+#: classes/handler/public.php:480
+#: classes/handler/public.php:735
 msgid "Login:"
 msgstr "Usuari:"
 
 #: include/login_form.php:207
-#: classes/handler/public.php:572
+#: classes/handler/public.php:483
 msgid "Password:"
 msgstr "Contrasenya:"
 
@@ -944,7 +838,7 @@ msgid "Profile:"
 msgstr "Fitxer:"
 
 #: include/login_form.php:223
-#: classes/handler/public.php:311
+#: classes/handler/public.php:287
 #: classes/pref/prefs.php:1035
 #: classes/rpc.php:63
 #, fuzzy
@@ -964,7 +858,7 @@ msgid "Remember me"
 msgstr ""
 
 #: include/login_form.php:249
-#: classes/handler/public.php:577
+#: classes/handler/public.php:488
 msgid "Log in"
 msgstr "Registreu-vos"
 
@@ -983,150 +877,44 @@ msgstr "No s'ha pogut validar la sessió (IP incorrecta)"
 msgid "Session failed to validate (password changed)"
 msgstr "No s'ha pogut validar la sessió (IP incorrecta)"
 
-#: classes/article.php:25
-#, fuzzy
-msgid "Article not found."
-msgstr "No s'ha trobat el canal."
-
-#: classes/article.php:197
-msgid "Tags for this article (separated by commas):"
-msgstr "Etiquetes per aquest article (separades per comes):"
-
-#: classes/article.php:222
-#: classes/pref/labels.php:79
-#: classes/pref/users.php:98
-#: classes/pref/feeds.php:801
-#: classes/pref/feeds.php:943
-#: classes/pref/filters.php:485
-#: classes/pref/prefs.php:981
-#: plugins/instances/init.php:245
-#: plugins/nsfw/init.php:85
-#: plugins/note/init.php:51
-#: plugins/af_readability/init.php:68
-#: plugins/af_redditimgur/init.php:60
-#: plugins/af_psql_trgm/init.php:181
-#: plugins/mail/init.php:64
-#: plugins/af_zz_imgproxy/init.php:213
-msgid "Save"
-msgstr "Desa"
-
-#: classes/article.php:224
-#: classes/handler/public.php:546
-#: classes/handler/public.php:580
-#: classes/pref/labels.php:81
-#: classes/pref/users.php:100
-#: classes/pref/feeds.php:802
-#: classes/pref/feeds.php:946
-#: classes/pref/feeds.php:1859
-#: classes/pref/filters.php:488
-#: classes/pref/filters.php:902
-#: classes/pref/filters.php:983
-#: classes/pref/filters.php:1076
-#: classes/pref/prefs.php:983
-#: classes/feeds.php:1105
-#: classes/feeds.php:1155
-#: classes/feeds.php:1192
-#: plugins/instances/init.php:248
-#: plugins/instances/init.php:436
-#: plugins/note/init.php:53
-#: plugins/mail/init.php:173
-msgid "Cancel"
-msgstr "Cancel·la"
-
-#: classes/opml.php:28
-#: classes/opml.php:33
-msgid "OPML Utility"
-msgstr "Eina OPML"
-
-#: classes/opml.php:37
-#, fuzzy
-msgid "Importing OPML..."
-msgstr "S'està important OPML (s'està utilitzant l'extensió DOMXML)..."
-
-#: classes/opml.php:41
-msgid "Return to preferences"
-msgstr "Torna a les preferències"
-
-#: classes/opml.php:271
-#, fuzzy, php-format
-msgid "Adding feed: %s"
-msgstr "S'està afegint el canal..."
-
-#: classes/opml.php:282
-#, fuzzy, php-format
-msgid "Duplicate feed: %s"
-msgstr "Crea un filtre"
-
-#: classes/opml.php:296
-#, fuzzy, php-format
-msgid "Adding label %s"
-msgstr "Assigna-li l'etiqueta"
-
-#: classes/opml.php:299
-#, php-format
-msgid "Duplicate label: %s"
-msgstr ""
-
-#: classes/opml.php:311
-#, php-format
-msgid "Setting preference key %s to %s"
-msgstr ""
-
-#: classes/opml.php:343
-#, fuzzy
-msgid "Adding filter..."
-msgstr "S'està afegint el canal..."
-
-#: classes/opml.php:421
-#, fuzzy, php-format
-msgid "Processing category: %s"
-msgstr "Posa'l a la categoria:"
-
-#: classes/opml.php:470
-#, php-format
-msgid "Upload failed with error code %d"
-msgstr ""
-
-#: classes/opml.php:484
-#: plugins/import_export/init.php:442
-#, fuzzy
-msgid "Unable to move uploaded file."
-msgstr "Error: si us plau carregueu el fitxer OPML."
-
-#: classes/opml.php:488
-#: plugins/import_export/init.php:446
-msgid "Error: please upload OPML file."
-msgstr "Error: si us plau carregueu el fitxer OPML."
-
-#: classes/opml.php:499
-#, fuzzy
-msgid "Error: unable to find moved OPML file."
-msgstr "Error: si us plau carregueu el fitxer OPML."
-
-#: classes/opml.php:506
-msgid "Error while parsing document."
-msgstr "Error mentre s'analitza el document."
-
-#: classes/backend.php:33
+#: classes/backend.php:31
 msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
 msgstr ""
 
-#: classes/backend.php:38
+#: classes/backend.php:36
 msgid "Keyboard Shortcuts"
 msgstr "Dreceres de teclat"
 
-#: classes/backend.php:61
+#: classes/backend.php:59
 msgid "Shift"
 msgstr ""
 
-#: classes/backend.php:64
+#: classes/backend.php:62
 msgid "Ctrl"
 msgstr ""
 
-#: classes/backend.php:99
+#: classes/backend.php:97
 msgid "Help topic not found."
 msgstr "No s'ha trobat el tema a l'ajuda."
 
+#: classes/backend.php:103
+#: classes/dlg.php:37
+#: classes/dlg.php:60
+#: classes/dlg.php:93
+#: classes/dlg.php:159
+#: classes/dlg.php:186
+#: classes/article.php:744
+#: classes/pref/filters.php:206
+#: classes/pref/prefs.php:1097
+#: classes/pref/feeds.php:1626
+#: classes/pref/feeds.php:1692
+#: plugins/import_export/init.php:421
+#: plugins/import_export/init.php:467
+#: plugins/af_psql_trgm/init.php:102
+#: plugins/share/init.php:120
+msgid "Close this window"
+msgstr "Tanca la finestra"
+
 #: classes/dlg.php:17
 msgid "If you have imported labels and/or filters, you might need to reload preferences to see your new data."
 msgstr ""
@@ -1138,7 +926,7 @@ msgstr "Enllaç als articles publicats del canal."
 
 #: classes/dlg.php:57
 #: classes/dlg.php:183
-#: plugins/share/init.php:118
+#: plugins/share/init.php:117
 #, fuzzy
 msgid "Generate new URL"
 msgstr "Canals generats"
@@ -1160,137 +948,237 @@ msgstr "L'actualització del daemon és més llarga que la d'un canal. Això pot
 msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 
-#: classes/handler/public.php:510
+#: classes/article.php:25
+#, fuzzy
+msgid "Article not found."
+msgstr "No s'ha trobat el canal."
+
+#: classes/article.php:197
+msgid "Tags for this article (separated by commas):"
+msgstr "Etiquetes per aquest article (separades per comes):"
+
+#: classes/article.php:222
+#: classes/pref/labels.php:79
+#: classes/pref/filters.php:519
+#: classes/pref/users.php:98
+#: classes/pref/prefs.php:981
+#: classes/pref/feeds.php:789
+#: classes/pref/feeds.php:931
+#: plugins/af_psql_trgm/init.php:181
+#: plugins/nsfw/init.php:85
+#: plugins/af_readability/init.php:68
+#: plugins/mail/init.php:64
+#: plugins/af_redditimgur/init.php:60
+#: plugins/note/init.php:51
+#: plugins/af_zz_imgproxy/init.php:240
+msgid "Save"
+msgstr "Desa"
+
+#: classes/article.php:224
+#: classes/handler/public.php:457
+#: classes/handler/public.php:491
+#: classes/pref/labels.php:81
+#: classes/pref/filters.php:522
+#: classes/pref/filters.php:942
+#: classes/pref/filters.php:1022
+#: classes/pref/filters.php:1115
+#: classes/pref/users.php:100
+#: classes/pref/prefs.php:983
+#: classes/pref/feeds.php:790
+#: classes/pref/feeds.php:934
+#: classes/pref/feeds.php:1833
+#: classes/feeds.php:1098
+#: classes/feeds.php:1148
+#: classes/feeds.php:1185
+#: plugins/mail/init.php:173
+#: plugins/note/init.php:53
+msgid "Cancel"
+msgstr "Cancel·la"
+
+#: classes/article.php:311
+#: classes/article.php:652
+#: classes/article.php:805
+msgid "no tags"
+msgstr "sense etiqueta"
+
+#: classes/article.php:419
+msgid "unknown type"
+msgstr "tipus desconegut"
+
+#: classes/article.php:496
+#, fuzzy
+msgid "Attachments"
+msgstr "Adjuncions:"
+
+#: classes/article.php:591
+#: classes/feeds.php:741
+#, fuzzy
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] "comentaris"
+msgstr[1] "comentaris"
+
+#: classes/article.php:595
+#: classes/feeds.php:745
+msgid "comments"
+msgstr "comentaris"
+
+#: classes/article.php:621
+msgid " - "
+msgstr " - "
+
+#: classes/article.php:662
+#: classes/feeds.php:727
+msgid "Edit tags for this article"
+msgstr "Edita les etiquetes d'aquest article"
+
+#: classes/article.php:694
+#: classes/feeds.php:681
+#, fuzzy
+msgid "Originally from:"
+msgstr "Mostra el contingut original de l'article"
+
+#: classes/article.php:707
+#: classes/pref/feeds.php:574
+#: classes/feeds.php:694
+#, fuzzy
+msgid "Feed URL"
+msgstr "Canal"
+
+#: classes/article.php:843
+#, fuzzy
+msgid "(edit note)"
+msgstr "edita la nota"
+
+#: classes/handler/public.php:421
 #: plugins/bookmarklets/init.php:40
 #, fuzzy
 msgid "Share with Tiny Tiny RSS"
 msgstr "Torna a Tiny Tiny RSS"
 
-#: classes/handler/public.php:518
+#: classes/handler/public.php:429
 msgid "Title:"
 msgstr "Titre&nbsp;:"
 
-#: classes/handler/public.php:520
+#: classes/handler/public.php:431
 #: classes/pref/feeds.php:572
-#: plugins/instances/init.php:212
-#: plugins/instances/init.php:401
 msgid "URL:"
 msgstr "URL:"
 
-#: classes/handler/public.php:522
+#: classes/handler/public.php:433
 #, fuzzy
 msgid "Content:"
 msgstr "Contingut"
 
-#: classes/handler/public.php:524
+#: classes/handler/public.php:435
 #, fuzzy
 msgid "Labels:"
 msgstr "Etiquetes"
 
-#: classes/handler/public.php:543
+#: classes/handler/public.php:454
 msgid "Shared article will appear in the Published feed."
 msgstr ""
 
-#: classes/handler/public.php:545
+#: classes/handler/public.php:456
 msgid "Share"
 msgstr ""
 
-#: classes/handler/public.php:567
+#: classes/handler/public.php:478
 #, fuzzy
 msgid "Not logged in"
 msgstr "Última connexió el"
 
-#: classes/handler/public.php:626
+#: classes/handler/public.php:537
 msgid "Incorrect username or password"
 msgstr "El nom d'usuari o la contrasenya és incorrecte"
 
-#: classes/handler/public.php:678
+#: classes/handler/public.php:589
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "Ja esteu subscrit a <b>%s</b>."
 
-#: classes/handler/public.php:681
+#: classes/handler/public.php:592
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "Subscrit a <b>%s</b>."
 
-#: classes/handler/public.php:684
+#: classes/handler/public.php:595
 #, fuzzy, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "Ja esteu subscrit a <b>%s</b>."
 
-#: classes/handler/public.php:687
+#: classes/handler/public.php:598
 #, fuzzy, php-format
 msgid "No feeds found in <b>%s</b>."
 msgstr "No s'ha trobat cap canal."
 
-#: classes/handler/public.php:690
+#: classes/handler/public.php:601
 #, fuzzy
 msgid "Multiple feed URLs found."
 msgstr "L'adreça URL del canal ha canviat."
 
-#: classes/handler/public.php:694
+#: classes/handler/public.php:605
 #, fuzzy, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr "Ja esteu subscrit a <b>%s</b>."
 
-#: classes/handler/public.php:712
+#: classes/handler/public.php:623
 #, fuzzy
 msgid "Subscribe to selected feed"
 msgstr "Us voleu donar de baixa dels canals seleccionats?"
 
-#: classes/handler/public.php:737
+#: classes/handler/public.php:648
 msgid "Edit subscription options"
 msgstr "Edita les opcions de les subscripcions"
 
-#: classes/handler/public.php:774
+#: classes/handler/public.php:685
 #, fuzzy
 msgid "Password recovery"
 msgstr "Contrasenya:"
 
-#: classes/handler/public.php:817
+#: classes/handler/public.php:728
 msgid "You will need to provide valid account name and email. A password reset link will be sent to your email address."
 msgstr ""
 
-#: classes/handler/public.php:839
-#: classes/pref/users.php:350
+#: classes/handler/public.php:750
+#: classes/pref/users.php:349
 msgid "Reset password"
 msgstr "Reinicia la contrasenya"
 
-#: classes/handler/public.php:849
+#: classes/handler/public.php:760
 msgid "Some of the required form parameters are missing or incorrect."
 msgstr ""
 
-#: classes/handler/public.php:853
-#: classes/handler/public.php:919
+#: classes/handler/public.php:764
+#: classes/handler/public.php:830
 #, fuzzy
 msgid "Go back"
 msgstr "Vés enrere"
 
-#: classes/handler/public.php:890
+#: classes/handler/public.php:801
 #, fuzzy
 msgid "[tt-rss] Password reset request"
 msgstr "[tt-rss] Notificació de canvi de contrasenya"
 
-#: classes/handler/public.php:915
+#: classes/handler/public.php:826
 msgid "Sorry, login and email combination not found."
 msgstr ""
 
-#: classes/handler/public.php:937
+#: classes/handler/public.php:848
 msgid "Your access level is insufficient to run this script."
 msgstr "No teniu prou permisos per a executar aquest script."
 
-#: classes/handler/public.php:963
+#: classes/handler/public.php:874
 msgid "Database Updater"
 msgstr "Eina d'actualització de la base de dades"
 
-#: classes/handler/public.php:1028
+#: classes/handler/public.php:939
 msgid "Perform updates"
 msgstr "Aplica les actualitzacions"
 
 #: classes/pref/labels.php:22
-#: classes/pref/filters.php:348
-#: classes/pref/filters.php:823
+#: classes/pref/filters.php:373
+#: classes/pref/filters.php:863
 msgid "Caption"
 msgstr "Descriptif"
 
@@ -1315,60 +1203,56 @@ msgid "Created label <b>%s</b>"
 msgstr "S'ha creat l'etiqueta <b>%s</b> "
 
 #: classes/pref/labels.php:258
-#: classes/pref/users.php:334
-#: classes/pref/feeds.php:1337
-#: classes/pref/feeds.php:1600
-#: classes/pref/feeds.php:1664
-#: classes/pref/filters.php:359
-#: classes/pref/filters.php:407
-#: classes/pref/filters.php:744
-#: classes/pref/filters.php:832
-#: classes/pref/filters.php:859
+#: classes/pref/filters.php:384
+#: classes/pref/filters.php:441
+#: classes/pref/filters.php:784
+#: classes/pref/filters.php:872
+#: classes/pref/filters.php:899
+#: classes/pref/users.php:333
 #: classes/pref/prefs.php:992
-#: plugins/instances/init.php:284
+#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1574
+#: classes/pref/feeds.php:1638
 #, fuzzy
 msgid "Select"
 msgstr "Selecciona:"
 
 #: classes/pref/labels.php:261
-#: classes/pref/users.php:337
-#: classes/pref/feeds.php:1340
-#: classes/pref/feeds.php:1603
-#: classes/pref/feeds.php:1667
-#: classes/pref/filters.php:362
-#: classes/pref/filters.php:410
-#: classes/pref/filters.php:747
-#: classes/pref/filters.php:835
-#: classes/pref/filters.php:862
+#: classes/pref/filters.php:387
+#: classes/pref/filters.php:444
+#: classes/pref/filters.php:787
+#: classes/pref/filters.php:875
+#: classes/pref/filters.php:902
+#: classes/pref/users.php:336
 #: classes/pref/prefs.php:995
+#: classes/pref/feeds.php:1314
+#: classes/pref/feeds.php:1577
+#: classes/pref/feeds.php:1641
 #: classes/feeds.php:102
-#: plugins/instances/init.php:287
 msgid "All"
 msgstr "Tot"
 
 #: classes/pref/labels.php:263
-#: classes/pref/users.php:339
-#: classes/pref/feeds.php:1342
-#: classes/pref/feeds.php:1605
-#: classes/pref/feeds.php:1669
-#: classes/pref/filters.php:364
-#: classes/pref/filters.php:412
-#: classes/pref/filters.php:749
-#: classes/pref/filters.php:837
-#: classes/pref/filters.php:864
+#: classes/pref/filters.php:389
+#: classes/pref/filters.php:446
+#: classes/pref/filters.php:789
+#: classes/pref/filters.php:877
+#: classes/pref/filters.php:904
+#: classes/pref/users.php:338
 #: classes/pref/prefs.php:997
+#: classes/pref/feeds.php:1316
+#: classes/pref/feeds.php:1579
+#: classes/pref/feeds.php:1643
 #: classes/feeds.php:105
-#: plugins/instances/init.php:289
 msgid "None"
 msgstr "Cap"
 
 #: classes/pref/labels.php:270
-#: classes/pref/users.php:348
+#: classes/pref/filters.php:512
+#: classes/pref/filters.php:806
+#: classes/pref/users.php:347
 #: classes/pref/feeds.php:767
-#: classes/pref/filters.php:478
-#: classes/pref/filters.php:766
-#: classes/feeds.php:1154
-#: plugins/instances/init.php:294
+#: classes/feeds.php:1147
 msgid "Remove"
 msgstr "Suprimeix"
 
@@ -1376,9 +1260,182 @@ msgstr "Suprimeix"
 msgid "Clear colors"
 msgstr "Elimina els colors"
 
+#: classes/pref/filters.php:153
+#, fuzzy
+msgid "Preview article"
+msgstr "Filtra l'article"
+
+#: classes/pref/filters.php:264
+#: classes/pref/filters.php:558
+#, fuzzy
+msgid "(inverse)"
+msgstr "(Invers)"
+
+#: classes/pref/filters.php:260
+#: classes/pref/filters.php:557
+#, php-format
+msgid "%s on %s in %s %s"
+msgstr ""
+
+#: classes/pref/filters.php:379
+#: classes/pref/filters.php:867
+#: classes/pref/filters.php:981
+msgid "Match"
+msgstr "Coincidència"
+
+#: classes/pref/filters.php:393
+#: classes/pref/filters.php:450
+#: classes/pref/filters.php:881
+#: classes/pref/filters.php:908
+msgid "Add"
+msgstr ""
+
+#: classes/pref/filters.php:396
+#: classes/pref/filters.php:453
+#: classes/pref/filters.php:884
+#: classes/pref/filters.php:911
+#: classes/feeds.php:122
+#, fuzzy
+msgid "Delete"
+msgstr "Per defecte"
+
+#: classes/pref/filters.php:436
+#: classes/pref/filters.php:894
+#, fuzzy
+msgid "Apply actions"
+msgstr "Accions dels canals"
+
+#: classes/pref/filters.php:486
+#: classes/pref/filters.php:923
+msgid "Enabled"
+msgstr "Activat"
+
+#: classes/pref/filters.php:495
+#: classes/pref/filters.php:926
+#, fuzzy
+msgid "Match any rule"
+msgstr "Basat en:"
+
+#: classes/pref/filters.php:504
+#: classes/pref/filters.php:929
+#, fuzzy
+msgid "Inverse matching"
+msgstr "Coincidència inversa"
+
+#: classes/pref/filters.php:516
+#: classes/pref/filters.php:936
+msgid "Test"
+msgstr "Tester"
+
+#: classes/pref/filters.php:780
+#: classes/pref/users.php:323
+#: classes/pref/feeds.php:1307
+#: classes/feeds.php:1118
+#: classes/feeds.php:1184
+#: js/tt-rss.js:165
+msgid "Search"
+msgstr "Cerca"
+
+#: classes/pref/filters.php:796
+msgid "Combine"
+msgstr ""
+
+#: classes/pref/filters.php:799
+#: classes/pref/users.php:345
+msgid "Edit"
+msgstr "Edita"
+
+#: classes/pref/filters.php:802
+#: classes/pref/feeds.php:1327
+#: classes/pref/feeds.php:1341
+#, fuzzy
+msgid "Reset sort order"
+msgstr "Reinicia la contrasenya"
+
+#: classes/pref/filters.php:810
+#: classes/pref/feeds.php:1363
+msgid "Rescore articles"
+msgstr "Canvia la puntuació dels articles"
+
+#: classes/pref/filters.php:939
+msgid "Create"
+msgstr "Crea"
+
+#: classes/pref/filters.php:993
+msgid "Inverse regular expression matching"
+msgstr ""
+
+#: classes/pref/filters.php:995
+msgid "on field"
+msgstr "al camp"
+
+#: classes/pref/filters.php:1001
+#: js/PrefFilterTree.js:64
+msgid "in"
+msgstr "a"
+
+#: classes/pref/filters.php:1014
+#, fuzzy
+msgid "Wiki: Filters"
+msgstr "Filtres"
+
+#: classes/pref/filters.php:1019
+#, fuzzy
+msgid "Save rule"
+msgstr "Desa"
+
+#: classes/pref/filters.php:1019
+#: js/functions.js:865
+#, fuzzy
+msgid "Add rule"
+msgstr "S'està afegint la categoria..."
+
+#: classes/pref/filters.php:1042
+msgid "Perform Action"
+msgstr "Acció a realitzar:"
+
+#: classes/pref/filters.php:1093
+#, fuzzy
+msgid "No actions available"
+msgstr "Hi ha una nova versió de Tiny Tiny RSS!"
+
+#: classes/pref/filters.php:1112
+#, fuzzy
+msgid "Save action"
+msgstr "Quadre d'accions"
+
+#: classes/pref/filters.php:1112
+#: js/functions.js:887
+#, fuzzy
+msgid "Add action"
+msgstr "Accions dels canals"
+
+#: classes/pref/filters.php:1136
+#, fuzzy
+msgid "[No caption]"
+msgstr "Descriptif"
+
+#: classes/pref/filters.php:1138
+#, fuzzy, php-format
+msgid "%s (%d rule)"
+msgid_plural "%s (%d rules)"
+msgstr[0] "S'està afegint la categoria..."
+msgstr[1] "S'està afegint la categoria..."
+
+#: classes/pref/filters.php:1153
+#, fuzzy
+msgid "matches any rule"
+msgstr "Basat en:"
+
+#: classes/pref/filters.php:1156
+#, fuzzy, php-format
+msgid "%s (+%d action)"
+msgid_plural "%s (+%d actions)"
+msgstr[0] "Accions dels canals"
+msgstr[1] "Accions dels canals"
+
 #: classes/pref/users.php:6
 #: classes/pref/system.php:8
-#: plugins/instances/init.php:154
 msgid "Your access level is insufficient to open this tab."
 msgstr "No teniu  permisos per a obrir aquesta pestanya."
 
@@ -1389,8 +1446,8 @@ msgstr "Filtres"
 
 #: classes/pref/users.php:56
 #: classes/pref/feeds.php:637
-#: classes/pref/feeds.php:878
-#: classes/feeds.php:1075
+#: classes/pref/feeds.php:866
+#: classes/feeds.php:1068
 msgid "Authentication"
 msgstr "Autenticació"
 
@@ -1400,7 +1457,7 @@ msgstr "Nivell d'accés:"
 
 #: classes/pref/users.php:77
 #: classes/pref/feeds.php:667
-#: classes/pref/feeds.php:896
+#: classes/pref/feeds.php:884
 msgid "Options"
 msgstr "Opcions"
 
@@ -1414,7 +1471,7 @@ msgid "User not found"
 msgstr "No s'ha trobat l'usuari"
 
 #: classes/pref/users.php:132
-#: classes/pref/users.php:400
+#: classes/pref/users.php:399
 msgid "Registered"
 msgstr "Registrat"
 
@@ -1432,7 +1489,7 @@ msgid "Stored articles"
 msgstr "Articles marcats"
 
 #: classes/pref/users.php:145
-#: classes/pref/users.php:399
+#: classes/pref/users.php:398
 msgid "Subscribed feeds"
 msgstr "Canals subscrits"
 
@@ -1451,550 +1508,61 @@ msgstr "No s'ha pogut crear l'usuari <b>%s</b>"
 msgid "User <b>%s</b> already exists."
 msgstr "L'usuari<b>%s</b> ja existeix."
 
-#: classes/pref/users.php:265
+#: classes/pref/users.php:264
 #, fuzzy, php-format
 msgid "Changed password of user <b>%s</b> to <b>%s</b>"
 msgstr ""
 "La contrasenya de l'usuari <b>%s</b>\n"
 "\t\t\t\t\ts'ha canviat a <b>%s</b>"
 
-#: classes/pref/users.php:267
+#: classes/pref/users.php:266
 #, fuzzy, php-format
 msgid "Sending new password of user <b>%s</b> to <b>%s</b>"
 msgstr ""
 "La contrasenya de l'usuari <b>%s</b>\n"
 "\t\t\t\t\ts'ha canviat a <b>%s</b>"
 
-#: classes/pref/users.php:291
+#: classes/pref/users.php:290
 msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] Notificació de canvi de contrasenya"
 
-#: classes/pref/users.php:324
-#: classes/pref/feeds.php:1333
-#: classes/pref/filters.php:740
-#: classes/feeds.php:1125
-#: classes/feeds.php:1191
-#: js/tt-rss.js:165
-msgid "Search"
-msgstr "Cerca"
-
-#: classes/pref/users.php:342
+#: classes/pref/users.php:341
 msgid "Create user"
 msgstr "Crea un usuari"
 
-#: classes/pref/users.php:346
-#: classes/pref/filters.php:759
-#: plugins/instances/init.php:293
-msgid "Edit"
-msgstr "Edita"
-
-#: classes/pref/users.php:397
+#: classes/pref/users.php:396
 #: classes/pref/feeds.php:643
-#: classes/pref/feeds.php:882
-#: classes/pref/feeds.php:1836
-#: classes/feeds.php:1079
+#: classes/pref/feeds.php:870
+#: classes/pref/feeds.php:1810
+#: classes/feeds.php:1072
 msgid "Login"
 msgstr "Entra"
 
-#: classes/pref/users.php:398
+#: classes/pref/users.php:397
 msgid "Access Level"
 msgstr "Permisos"
 
-#: classes/pref/users.php:401
+#: classes/pref/users.php:400
 msgid "Last login"
 msgstr "Última connexió"
 
-#: classes/pref/users.php:420
-#: plugins/instances/init.php:334
+#: classes/pref/users.php:419
 msgid "Click to edit"
 msgstr "Feu clic per editar"
 
-#: classes/pref/users.php:441
+#: classes/pref/users.php:440
 msgid "No users defined."
 msgstr "No s'han definit els usuaris."
 
-#: classes/pref/users.php:443
+#: classes/pref/users.php:442
 msgid "No matching users found."
 msgstr "No s'ha trobat cap usuari que coinicideixi. "
 
-#: classes/pref/system.php:29
-msgid "Error Log"
-msgstr ""
-
-#: classes/pref/system.php:40
-#, fuzzy
-msgid "Refresh"
-msgstr "Actualitza"
-
-#: classes/pref/system.php:43
-#, fuzzy
-msgid "Clear log"
-msgstr "Elimina els colors"
-
-#: classes/pref/system.php:48
-msgid "Error"
-msgstr ""
-
-#: classes/pref/system.php:49
-msgid "Filename"
-msgstr ""
-
-#: classes/pref/system.php:50
-msgid "Message"
-msgstr ""
-
-#: classes/pref/system.php:52
-msgid "Date"
-msgstr "Data"
-
-#: classes/pref/feeds.php:15
-msgid "Check to enable field"
-msgstr "Seleccioneu-ho per activar els camps"
-
-#: classes/pref/feeds.php:65
-#: classes/pref/feeds.php:214
-#: classes/pref/feeds.php:258
-#: classes/pref/feeds.php:264
-#: classes/pref/feeds.php:290
-#, fuzzy, php-format
-msgid "(%d feed)"
-msgid_plural "(%d feeds)"
-msgstr[0] "Edita el canal"
-msgstr[1] "Edita el canal"
-
-#: classes/pref/feeds.php:537
 #: classes/pref/prefs.php:18
+#: classes/pref/feeds.php:537
 msgid "General"
 msgstr "General"
 
-#: classes/pref/feeds.php:561
-#, fuzzy
-msgid "Feed Title"
-msgstr "Títol"
-
-#: classes/pref/feeds.php:595
-#: classes/pref/feeds.php:830
-#: classes/pref/feeds.php:1822
-#: classes/feeds.php:1055
-msgid "Place in category:"
-msgstr "Posa'l a la categoria:"
-
-#: classes/pref/feeds.php:608
-#: classes/pref/feeds.php:844
-#, fuzzy
-msgid "Language:"
-msgstr "Idioma:"
-
-#: classes/pref/feeds.php:615
-#: classes/pref/feeds.php:853
-msgid "Update"
-msgstr "Actualitza"
-
-#: classes/pref/feeds.php:630
-#: classes/pref/feeds.php:869
-msgid "Article purging:"
-msgstr "Neteja d'articles:"
-
-#: classes/pref/feeds.php:658
-#: classes/pref/feeds.php:890
-#: classes/pref/feeds.php:1839
-#: classes/pref/prefs.php:245
-#: classes/feeds.php:1083
-#, fuzzy
-msgid "Password"
-msgstr "Contrasenya:"
-
-#: classes/pref/feeds.php:662
-msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
-msgstr ""
-
-#: classes/pref/feeds.php:681
-#: classes/pref/feeds.php:900
-#, fuzzy
-msgid "Hide from Popular feeds"
-msgstr "Amaga-ho de la llista de canals"
-
-#: classes/pref/feeds.php:693
-#: classes/pref/feeds.php:906
-msgid "Include in e-mail digest"
-msgstr "Inclou-lo en el resum diari per correu electrònic"
-
-#: classes/pref/feeds.php:706
-#: classes/pref/feeds.php:912
-msgid "Always display image attachments"
-msgstr "Mostra les imatges adjuntes"
-
-#: classes/pref/feeds.php:719
-#: classes/pref/feeds.php:920
-msgid "Do not embed images"
-msgstr ""
-
-#: classes/pref/feeds.php:732
-#: classes/pref/feeds.php:928
-msgid "Cache media"
-msgstr ""
-
-#: classes/pref/feeds.php:744
-#: classes/pref/feeds.php:934
-#, fuzzy
-msgid "Mark updated articles as unread"
-msgstr "Esteu segur que voleu marcar tots els articles com a llegits?"
-
-#: classes/pref/feeds.php:748
-#, fuzzy
-msgid "Icon"
-msgstr "Action"
-
-#: classes/pref/feeds.php:765
-msgid "Replace"
-msgstr ""
-
-#: classes/pref/feeds.php:772
-#: classes/pref/prefs.php:698
-msgid "Plugins"
-msgstr ""
-
-#: classes/pref/feeds.php:792
-#, fuzzy
-msgid "Resubscribe to push updates"
-msgstr "Subscrit als canals:"
-
-#: classes/pref/feeds.php:799
-msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
-msgstr ""
-
-#: classes/pref/feeds.php:1200
-#: classes/pref/feeds.php:1253
-msgid "All done."
-msgstr "Fet!"
-
-#: classes/pref/feeds.php:1308
-#, fuzzy
-msgid "Feeds with errors"
-msgstr "Editor de canals"
-
-#: classes/pref/feeds.php:1315
-#, fuzzy
-msgid "Inactive feeds"
-msgstr "Tots els canals"
-
-#: classes/pref/feeds.php:1351
-#, fuzzy
-msgid "Edit selected feeds"
-msgstr "S'estan purgant els canals seleccionats..."
-
-#: classes/pref/feeds.php:1353
-#: classes/pref/feeds.php:1367
-#: classes/pref/filters.php:762
-#, fuzzy
-msgid "Reset sort order"
-msgstr "Reinicia la contrasenya"
-
-#: classes/pref/feeds.php:1355
-#: js/prefs.js:1622
-#, fuzzy
-msgid "Batch subscribe"
-msgstr "Dóna't de baixa"
-
-#: classes/pref/feeds.php:1362
-#, fuzzy
-msgid "Categories"
-msgstr "Catégorie&nbsp;:"
-
-#: classes/pref/feeds.php:1365
-#, fuzzy
-msgid "Add category"
-msgstr "S'està afegint la categoria..."
-
-#: classes/pref/feeds.php:1369
-#, fuzzy
-msgid "Remove selected"
-msgstr "Esteu segur que voleu suprimir els filtres seleccionats?"
-
-#: classes/pref/feeds.php:1380
-#, fuzzy
-msgid "More actions..."
-msgstr "Accions..."
-
-#: classes/pref/feeds.php:1384
-msgid "Manual purge"
-msgstr "Purger manuellement"
-
-#: classes/pref/feeds.php:1388
-msgid "Clear feed data"
-msgstr "Esborra les dades del canal"
-
-#: classes/pref/feeds.php:1389
-#: classes/pref/filters.php:770
-msgid "Rescore articles"
-msgstr "Canvia la puntuació dels articles"
-
-#: classes/pref/feeds.php:1442
-msgid "OPML"
-msgstr "OPML"
-
-#: classes/pref/feeds.php:1444
-msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
-msgstr ""
-
-#: classes/pref/feeds.php:1445
-msgid "Only main settings profile can be migrated using OPML."
-msgstr ""
-
-#: classes/pref/feeds.php:1458
-#, fuzzy
-msgid "Import my OPML"
-msgstr "S'està important OPML (s'està utilitzant l'extensió DOMXML)..."
-
-#: classes/pref/feeds.php:1464
-msgid "Filename:"
-msgstr ""
-
-#: classes/pref/feeds.php:1466
-#, fuzzy
-msgid "Include settings"
-msgstr "Inclou-lo en el resum diari per correu electrònic"
-
-#: classes/pref/feeds.php:1470
-#, fuzzy
-msgid "Export OPML"
-msgstr "Exporta en format OPML"
-
-#: classes/pref/feeds.php:1474
-#, fuzzy
-msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
-msgstr "Els articles publicats s'exporten en un canal RSS públic al qual s'hi pot subscriure qualsevol que en conegui l'adreça URL."
-
-#: classes/pref/feeds.php:1478
-msgid "Public OPML URL"
-msgstr ""
-
-#: classes/pref/feeds.php:1479
-msgid "Display published OPML URL"
-msgstr ""
-
-#: classes/pref/feeds.php:1488
-#, fuzzy
-msgid "Firefox integration"
-msgstr "Integració al Firefox"
-
-#: classes/pref/feeds.php:1490
-msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
-msgstr "Podeu utilitzar Tiny Tiny RSS  com a lector de canals amb el Firefox fent clic en el següent enllaç."
-
-#: classes/pref/feeds.php:1497
-msgid "Click here to register this site as a feed reader."
-msgstr "Feu clic aquí per a desar aquesta pàgina web com un canal."
-
-#: classes/pref/feeds.php:1505
-#, fuzzy
-msgid "Published & shared articles / Generated feeds"
-msgstr "Esteu segur que voleu canviar la puntuació dels articles en les etiquetes personalitzades?"
-
-#: classes/pref/feeds.php:1507
-msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
-msgstr "Els articles publicats s'exporten en un canal RSS públic al qual s'hi pot subscriure qualsevol que en conegui l'adreça URL."
-
-#: classes/pref/feeds.php:1514
-#: classes/feeds.php:54
-#: classes/feeds.php:140
-#, fuzzy
-msgid "View as RSS"
-msgstr "Visualitza les etiquetes"
-
-#: classes/pref/feeds.php:1515
-#, fuzzy
-msgid "Display URL"
-msgstr "afficher les étiquettes"
-
-#: classes/pref/feeds.php:1518
-msgid "Clear all generated URLs"
-msgstr ""
-
-#: classes/pref/feeds.php:1596
-#, fuzzy
-msgid "These feeds have not been updated with new content for 3 months (oldest first):"
-msgstr "Aquests canals no s'han actualitzat degut als següents errors:"
-
-#: classes/pref/feeds.php:1630
-#: classes/pref/feeds.php:1694
-#, fuzzy
-msgid "Click to edit feed"
-msgstr "Feu clic per editar"
-
-#: classes/pref/feeds.php:1648
-#: classes/pref/feeds.php:1714
-#, fuzzy
-msgid "Unsubscribe from selected feeds"
-msgstr "Us voleu donar de baixa dels canals seleccionats?"
-
-#: classes/pref/feeds.php:1819
-msgid "Add one valid RSS feed per line (no feed detection is done)"
-msgstr ""
-
-#: classes/pref/feeds.php:1828
-msgid "Feeds to subscribe, One per line"
-msgstr ""
-
-#: classes/pref/feeds.php:1851
-#, fuzzy
-msgid "Feeds require authentication."
-msgstr "Aquest canal requereix autenticació."
-
-#: classes/pref/feeds.php:1858
-#: classes/feeds.php:1099
-#: classes/feeds.php:1153
-msgid "Subscribe"
-msgstr "Subscriu-t'hi"
-
-#: classes/pref/filters.php:151
-#, fuzzy
-msgid "Preview article"
-msgstr "Filtra l'article"
-
-#: classes/pref/filters.php:239
-#: classes/pref/filters.php:518
-#, fuzzy
-msgid "(inverse)"
-msgstr "(Invers)"
-
-#: classes/pref/filters.php:235
-#: classes/pref/filters.php:517
-#, php-format
-msgid "%s on %s in %s %s"
-msgstr ""
-
-#: classes/pref/filters.php:354
-#: classes/pref/filters.php:827
-#: classes/pref/filters.php:942
-msgid "Match"
-msgstr "Coincidència"
-
-#: classes/pref/filters.php:368
-#: classes/pref/filters.php:416
-#: classes/pref/filters.php:841
-#: classes/pref/filters.php:868
-msgid "Add"
-msgstr ""
-
-#: classes/pref/filters.php:371
-#: classes/pref/filters.php:419
-#: classes/pref/filters.php:844
-#: classes/pref/filters.php:871
-#: classes/feeds.php:122
-#, fuzzy
-msgid "Delete"
-msgstr "Per defecte"
-
-#: classes/pref/filters.php:402
-#: classes/pref/filters.php:854
-#, fuzzy
-msgid "Apply actions"
-msgstr "Accions dels canals"
-
-#: classes/pref/filters.php:452
-#: classes/pref/filters.php:883
-msgid "Enabled"
-msgstr "Activat"
-
-#: classes/pref/filters.php:461
-#: classes/pref/filters.php:886
-#, fuzzy
-msgid "Match any rule"
-msgstr "Basat en:"
-
-#: classes/pref/filters.php:470
-#: classes/pref/filters.php:889
-#, fuzzy
-msgid "Inverse matching"
-msgstr "Coincidència inversa"
-
-#: classes/pref/filters.php:482
-#: classes/pref/filters.php:896
-msgid "Test"
-msgstr "Tester"
-
-#: classes/pref/filters.php:756
-msgid "Combine"
-msgstr ""
-
-#: classes/pref/filters.php:899
-msgid "Create"
-msgstr "Crea"
-
-#: classes/pref/filters.php:954
-msgid "Inverse regular expression matching"
-msgstr ""
-
-#: classes/pref/filters.php:956
-msgid "on field"
-msgstr "al camp"
-
-#: classes/pref/filters.php:962
-#: js/PrefFilterTree.js:64
-msgid "in"
-msgstr "a"
-
-#: classes/pref/filters.php:975
-#, fuzzy
-msgid "Wiki: Filters"
-msgstr "Filtres"
-
-#: classes/pref/filters.php:980
-#, fuzzy
-msgid "Save rule"
-msgstr "Desa"
-
-#: classes/pref/filters.php:980
-#: js/functions.js:865
-#, fuzzy
-msgid "Add rule"
-msgstr "S'està afegint la categoria..."
-
-#: classes/pref/filters.php:1003
-msgid "Perform Action"
-msgstr "Acció a realitzar:"
-
-#: classes/pref/filters.php:1054
-#, fuzzy
-msgid "No actions available"
-msgstr "Hi ha una nova versió de Tiny Tiny RSS!"
-
-#: classes/pref/filters.php:1073
-#, fuzzy
-msgid "Save action"
-msgstr "Quadre d'accions"
-
-#: classes/pref/filters.php:1073
-#: js/functions.js:887
-#, fuzzy
-msgid "Add action"
-msgstr "Accions dels canals"
-
-#: classes/pref/filters.php:1097
-#, fuzzy
-msgid "[No caption]"
-msgstr "Descriptif"
-
-#: classes/pref/filters.php:1099
-#, fuzzy, php-format
-msgid "%s (%d rule)"
-msgid_plural "%s (%d rules)"
-msgstr[0] "S'està afegint la categoria..."
-msgstr[1] "S'està afegint la categoria..."
-
-#: classes/pref/filters.php:1114
-#, fuzzy
-msgid "matches any rule"
-msgstr "Basat en:"
-
-#: classes/pref/filters.php:1117
-#, fuzzy, php-format
-msgid "%s (+%d action)"
-msgid_plural "%s (+%d actions)"
-msgstr[0] "Accions dels canals"
-msgstr[1] "Accions dels canals"
-
 #: classes/pref/prefs.php:19
 msgid "Interface"
 msgstr "Interfície"
@@ -2181,7 +1749,7 @@ msgid "Strip all but most common HTML tags when reading articles."
 msgstr "Elimina les etiquetes HTML més freqüents en llegir els articles."
 
 #: classes/pref/prefs.php:53
-#: js/prefs.js:1584
+#: js/prefs.js:1580
 #, fuzzy
 msgid "Customize stylesheet"
 msgstr "URL de la fulla d'estils personalitzada."
@@ -2255,6 +1823,15 @@ msgstr "Nivell d'accés"
 msgid "Save data"
 msgstr "Desa"
 
+#: classes/pref/prefs.php:245
+#: classes/pref/feeds.php:658
+#: classes/pref/feeds.php:878
+#: classes/pref/feeds.php:1813
+#: classes/feeds.php:1076
+#, fuzzy
+msgid "Password"
+msgstr "Contrasenya:"
+
 #: classes/pref/prefs.php:254
 #, fuzzy
 msgid "Your password is at default value, please change it."
@@ -2364,16 +1941,21 @@ msgstr "Crea un filtre"
 msgid "Reset to defaults"
 msgstr "Torna als paràmetres per defecte"
 
+#: classes/pref/prefs.php:698
+#: classes/pref/feeds.php:772
+msgid "Plugins"
+msgstr ""
+
 #: classes/pref/prefs.php:700
 msgid "You will need to reload Tiny Tiny RSS for plugin changes to take effect."
 msgstr ""
 
-#: classes/pref/prefs.php:702
-msgid "Download more plugins at tt-rss.org <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forums</a> or <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a>."
+#: classes/pref/prefs.php:730
+msgid "System plugins"
 msgstr ""
 
-#: classes/pref/prefs.php:732
-msgid "System plugins"
+#: classes/pref/prefs.php:731
+msgid "System plugins are enabled in <strong>config.php</strong> for all users."
 msgstr ""
 
 #: classes/pref/prefs.php:736
@@ -2454,6 +2036,370 @@ msgstr "Esteu segur que voleu suprimir els filtres seleccionats?"
 msgid "Activate profile"
 msgstr "Esteu segur que voleu suprimir els filtres seleccionats?"
 
+#: classes/pref/feeds.php:15
+msgid "Check to enable field"
+msgstr "Seleccioneu-ho per activar els camps"
+
+#: classes/pref/feeds.php:65
+#: classes/pref/feeds.php:214
+#: classes/pref/feeds.php:258
+#: classes/pref/feeds.php:264
+#: classes/pref/feeds.php:290
+#, fuzzy, php-format
+msgid "(%d feed)"
+msgid_plural "(%d feeds)"
+msgstr[0] "Edita el canal"
+msgstr[1] "Edita el canal"
+
+#: classes/pref/feeds.php:561
+#, fuzzy
+msgid "Feed Title"
+msgstr "Títol"
+
+#: classes/pref/feeds.php:595
+#: classes/pref/feeds.php:818
+#: classes/pref/feeds.php:1796
+#: classes/feeds.php:1048
+msgid "Place in category:"
+msgstr "Posa'l a la categoria:"
+
+#: classes/pref/feeds.php:608
+#: classes/pref/feeds.php:832
+#, fuzzy
+msgid "Language:"
+msgstr "Idioma:"
+
+#: classes/pref/feeds.php:615
+#: classes/pref/feeds.php:841
+msgid "Update"
+msgstr "Actualitza"
+
+#: classes/pref/feeds.php:630
+#: classes/pref/feeds.php:857
+msgid "Article purging:"
+msgstr "Neteja d'articles:"
+
+#: classes/pref/feeds.php:662
+msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
+msgstr ""
+
+#: classes/pref/feeds.php:681
+#: classes/pref/feeds.php:888
+#, fuzzy
+msgid "Hide from Popular feeds"
+msgstr "Amaga-ho de la llista de canals"
+
+#: classes/pref/feeds.php:693
+#: classes/pref/feeds.php:894
+msgid "Include in e-mail digest"
+msgstr "Inclou-lo en el resum diari per correu electrònic"
+
+#: classes/pref/feeds.php:706
+#: classes/pref/feeds.php:900
+msgid "Always display image attachments"
+msgstr "Mostra les imatges adjuntes"
+
+#: classes/pref/feeds.php:719
+#: classes/pref/feeds.php:908
+msgid "Do not embed images"
+msgstr ""
+
+#: classes/pref/feeds.php:732
+#: classes/pref/feeds.php:916
+msgid "Cache media"
+msgstr ""
+
+#: classes/pref/feeds.php:744
+#: classes/pref/feeds.php:922
+#, fuzzy
+msgid "Mark updated articles as unread"
+msgstr "Esteu segur que voleu marcar tots els articles com a llegits?"
+
+#: classes/pref/feeds.php:748
+#, fuzzy
+msgid "Icon"
+msgstr "Action"
+
+#: classes/pref/feeds.php:765
+msgid "Replace"
+msgstr ""
+
+#: classes/pref/feeds.php:1174
+#: classes/pref/feeds.php:1227
+msgid "All done."
+msgstr "Fet!"
+
+#: classes/pref/feeds.php:1282
+#, fuzzy
+msgid "Feeds with errors"
+msgstr "Editor de canals"
+
+#: classes/pref/feeds.php:1289
+#, fuzzy
+msgid "Inactive feeds"
+msgstr "Tots els canals"
+
+#: classes/pref/feeds.php:1325
+#, fuzzy
+msgid "Edit selected feeds"
+msgstr "S'estan purgant els canals seleccionats..."
+
+#: classes/pref/feeds.php:1329
+#: js/prefs.js:1618
+#, fuzzy
+msgid "Batch subscribe"
+msgstr "Dóna't de baixa"
+
+#: classes/pref/feeds.php:1336
+#, fuzzy
+msgid "Categories"
+msgstr "Catégorie&nbsp;:"
+
+#: classes/pref/feeds.php:1339
+#, fuzzy
+msgid "Add category"
+msgstr "S'està afegint la categoria..."
+
+#: classes/pref/feeds.php:1343
+#, fuzzy
+msgid "Remove selected"
+msgstr "Esteu segur que voleu suprimir els filtres seleccionats?"
+
+#: classes/pref/feeds.php:1354
+#, fuzzy
+msgid "More actions..."
+msgstr "Accions..."
+
+#: classes/pref/feeds.php:1358
+msgid "Manual purge"
+msgstr "Purger manuellement"
+
+#: classes/pref/feeds.php:1362
+msgid "Clear feed data"
+msgstr "Esborra les dades del canal"
+
+#: classes/pref/feeds.php:1416
+msgid "OPML"
+msgstr "OPML"
+
+#: classes/pref/feeds.php:1418
+msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
+msgstr ""
+
+#: classes/pref/feeds.php:1419
+msgid "Only main settings profile can be migrated using OPML."
+msgstr ""
+
+#: classes/pref/feeds.php:1432
+#, fuzzy
+msgid "Import my OPML"
+msgstr "S'està important OPML (s'està utilitzant l'extensió DOMXML)..."
+
+#: classes/pref/feeds.php:1438
+msgid "Filename:"
+msgstr ""
+
+#: classes/pref/feeds.php:1440
+#, fuzzy
+msgid "Include settings"
+msgstr "Inclou-lo en el resum diari per correu electrònic"
+
+#: classes/pref/feeds.php:1444
+#, fuzzy
+msgid "Export OPML"
+msgstr "Exporta en format OPML"
+
+#: classes/pref/feeds.php:1448
+#, fuzzy
+msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
+msgstr "Els articles publicats s'exporten en un canal RSS públic al qual s'hi pot subscriure qualsevol que en conegui l'adreça URL."
+
+#: classes/pref/feeds.php:1452
+msgid "Public OPML URL"
+msgstr ""
+
+#: classes/pref/feeds.php:1453
+msgid "Display published OPML URL"
+msgstr ""
+
+#: classes/pref/feeds.php:1462
+#, fuzzy
+msgid "Firefox integration"
+msgstr "Integració al Firefox"
+
+#: classes/pref/feeds.php:1464
+msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
+msgstr "Podeu utilitzar Tiny Tiny RSS  com a lector de canals amb el Firefox fent clic en el següent enllaç."
+
+#: classes/pref/feeds.php:1471
+msgid "Click here to register this site as a feed reader."
+msgstr "Feu clic aquí per a desar aquesta pàgina web com un canal."
+
+#: classes/pref/feeds.php:1479
+#, fuzzy
+msgid "Published & shared articles / Generated feeds"
+msgstr "Esteu segur que voleu canviar la puntuació dels articles en les etiquetes personalitzades?"
+
+#: classes/pref/feeds.php:1481
+msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
+msgstr "Els articles publicats s'exporten en un canal RSS públic al qual s'hi pot subscriure qualsevol que en conegui l'adreça URL."
+
+#: classes/pref/feeds.php:1488
+#: classes/feeds.php:54
+#: classes/feeds.php:140
+#, fuzzy
+msgid "View as RSS"
+msgstr "Visualitza les etiquetes"
+
+#: classes/pref/feeds.php:1489
+#, fuzzy
+msgid "Display URL"
+msgstr "afficher les étiquettes"
+
+#: classes/pref/feeds.php:1492
+msgid "Clear all generated URLs"
+msgstr ""
+
+#: classes/pref/feeds.php:1570
+#, fuzzy
+msgid "These feeds have not been updated with new content for 3 months (oldest first):"
+msgstr "Aquests canals no s'han actualitzat degut als següents errors:"
+
+#: classes/pref/feeds.php:1604
+#: classes/pref/feeds.php:1668
+#, fuzzy
+msgid "Click to edit feed"
+msgstr "Feu clic per editar"
+
+#: classes/pref/feeds.php:1622
+#: classes/pref/feeds.php:1688
+#, fuzzy
+msgid "Unsubscribe from selected feeds"
+msgstr "Us voleu donar de baixa dels canals seleccionats?"
+
+#: classes/pref/feeds.php:1793
+msgid "Add one valid RSS feed per line (no feed detection is done)"
+msgstr ""
+
+#: classes/pref/feeds.php:1802
+msgid "Feeds to subscribe, One per line"
+msgstr ""
+
+#: classes/pref/feeds.php:1825
+#, fuzzy
+msgid "Feeds require authentication."
+msgstr "Aquest canal requereix autenticació."
+
+#: classes/pref/feeds.php:1832
+#: classes/feeds.php:1092
+#: classes/feeds.php:1146
+msgid "Subscribe"
+msgstr "Subscriu-t'hi"
+
+#: classes/pref/system.php:29
+msgid "Error Log"
+msgstr ""
+
+#: classes/pref/system.php:40
+#, fuzzy
+msgid "Refresh"
+msgstr "Actualitza"
+
+#: classes/pref/system.php:43
+#, fuzzy
+msgid "Clear log"
+msgstr "Elimina els colors"
+
+#: classes/pref/system.php:48
+msgid "Error"
+msgstr ""
+
+#: classes/pref/system.php:49
+msgid "Filename"
+msgstr ""
+
+#: classes/pref/system.php:50
+msgid "Message"
+msgstr ""
+
+#: classes/pref/system.php:52
+msgid "Date"
+msgstr "Data"
+
+#: classes/opml.php:28
+#: classes/opml.php:33
+msgid "OPML Utility"
+msgstr "Eina OPML"
+
+#: classes/opml.php:37
+#, fuzzy
+msgid "Importing OPML..."
+msgstr "S'està important OPML (s'està utilitzant l'extensió DOMXML)..."
+
+#: classes/opml.php:41
+msgid "Return to preferences"
+msgstr "Torna a les preferències"
+
+#: classes/opml.php:295
+#, fuzzy, php-format
+msgid "Adding feed: %s"
+msgstr "S'està afegint el canal..."
+
+#: classes/opml.php:306
+#, fuzzy, php-format
+msgid "Duplicate feed: %s"
+msgstr "Crea un filtre"
+
+#: classes/opml.php:320
+#, fuzzy, php-format
+msgid "Adding label %s"
+msgstr "Assigna-li l'etiqueta"
+
+#: classes/opml.php:323
+#, php-format
+msgid "Duplicate label: %s"
+msgstr ""
+
+#: classes/opml.php:335
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr ""
+
+#: classes/opml.php:367
+#, fuzzy
+msgid "Adding filter..."
+msgstr "S'està afegint el canal..."
+
+#: classes/opml.php:486
+#, fuzzy, php-format
+msgid "Processing category: %s"
+msgstr "Posa'l a la categoria:"
+
+#: classes/opml.php:532
+#, php-format
+msgid "Upload failed with error code %d"
+msgstr ""
+
+#: classes/opml.php:544
+#: plugins/import_export/init.php:448
+#, fuzzy
+msgid "Unable to move uploaded file."
+msgstr "Error: si us plau carregueu el fitxer OPML."
+
+#: classes/opml.php:548
+#: plugins/import_export/init.php:452
+msgid "Error: please upload OPML file."
+msgstr "Error: si us plau carregueu el fitxer OPML."
+
+#: classes/opml.php:559
+#, fuzzy
+msgid "Error: unable to find moved OPML file."
+msgstr "Error: si us plau carregueu el fitxer OPML."
+
+#: classes/opml.php:566
+msgid "Error while parsing document."
+msgstr "Error mentre s'analitza el document."
+
 #: classes/feeds.php:53
 #, fuzzy
 msgid "View as RSS feed"
@@ -2498,8 +2444,8 @@ msgstr "Vés enrere"
 
 #: classes/feeds.php:127
 #: classes/feeds.php:132
-#: plugins/mail/init.php:75
 #: plugins/mailto/init.php:25
+#: plugins/mail/init.php:75
 #, fuzzy
 msgid "Forward by email"
 msgstr "Marca l'article"
@@ -2508,284 +2454,279 @@ msgstr "Marca l'article"
 msgid "Feed:"
 msgstr "Flux&nbsp;:"
 
-#: classes/feeds.php:229
-#: classes/feeds.php:892
+#: classes/feeds.php:228
+#: classes/feeds.php:885
 msgid "Feed not found."
 msgstr "No s'ha trobat el canal."
 
-#: classes/feeds.php:300
+#: classes/feeds.php:291
 #, fuzzy
 msgid "Never"
 msgstr "No ho purguis mai"
 
-#: classes/feeds.php:413
+#: classes/feeds.php:405
 #, fuzzy, php-format
 msgid "Imported at %s"
 msgstr "Importeu"
 
-#: classes/feeds.php:472
-#: classes/feeds.php:569
+#: classes/feeds.php:464
+#: classes/feeds.php:561
 #, fuzzy
 msgid "mark feed as read"
 msgstr "Marca el canal com a llegit"
 
-#: classes/feeds.php:630
+#: classes/feeds.php:622
 #, fuzzy
 msgid "Collapse article"
 msgstr "Buida els articles"
 
-#: classes/feeds.php:791
+#: classes/feeds.php:784
 msgid "No unread articles found to display."
 msgstr "No es poden mostrar els articles no llegits perquè no n'hi ha."
 
-#: classes/feeds.php:794
+#: classes/feeds.php:787
 msgid "No updated articles found to display."
 msgstr "No hi ha cap article actualitzat."
 
-#: classes/feeds.php:797
+#: classes/feeds.php:790
 msgid "No starred articles found to display."
 msgstr "No hi ha articles marcats per mostrar."
 
-#: classes/feeds.php:801
+#: classes/feeds.php:794
 #, fuzzy
 msgid "No articles found to display. You can assign articles to labels manually from article header context menu (applies to all selected articles) or use a filter."
 msgstr "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:803
+#: classes/feeds.php:796
 msgid "No articles found to display."
 msgstr "No s'han trobat articles per a mostrar."
 
-#: classes/feeds.php:818
-#: classes/feeds.php:992
+#: classes/feeds.php:811
+#: classes/feeds.php:985
 #, fuzzy, php-format
 msgid "Feeds last updated at %s"
 msgstr "Erreurs de mise à jour"
 
-#: classes/feeds.php:828
-#: classes/feeds.php:1002
+#: classes/feeds.php:821
+#: classes/feeds.php:995
 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:982
+#: classes/feeds.php:975
 msgid "No feed selected."
 msgstr "No heu seleccionat cap canal."
 
-#: classes/feeds.php:1041
-#: classes/feeds.php:1049
+#: classes/feeds.php:1034
+#: classes/feeds.php:1042
 #, fuzzy
 msgid "Feed or site URL"
 msgstr "Canal"
 
-#: classes/feeds.php:1063
+#: classes/feeds.php:1056
 #, fuzzy
 msgid "Available feeds"
 msgstr "Tots els canals"
 
-#: classes/feeds.php:1094
+#: classes/feeds.php:1087
 msgid "This feed requires authentication."
 msgstr "Aquest canal requereix autenticació."
 
-#: classes/feeds.php:1102
+#: classes/feeds.php:1095
 #, fuzzy
 msgid "More feeds"
 msgstr "Més canals"
 
-#: classes/feeds.php:1129
+#: classes/feeds.php:1122
 #, fuzzy
 msgid "Popular feeds"
 msgstr "mostra els canals"
 
-#: classes/feeds.php:1130
+#: classes/feeds.php:1123
 #, fuzzy
 msgid "Feed archive"
 msgstr "Accions dels canals"
 
-#: classes/feeds.php:1133
+#: classes/feeds.php:1126
 #, fuzzy
 msgid "limit:"
 msgstr "Límit:"
 
-#: classes/feeds.php:1165
+#: classes/feeds.php:1158
 msgid "Look for"
 msgstr "Mirar-ho per"
 
-#: classes/feeds.php:1173
+#: classes/feeds.php:1166
 #, php-format
 msgid "in %s"
 msgstr ""
 
-#: classes/feeds.php:1178
+#: classes/feeds.php:1171
 msgid "Used for word stemming"
 msgstr ""
 
-#: classes/feeds.php:1187
+#: classes/feeds.php:1180
 #, fuzzy
 msgid "Search syntax"
 msgstr "Convertir en intitulé"
 
-#: plugins/instances/init.php:141
-#, fuzzy
-msgid "Linked"
-msgstr "Enllaç"
-
-#: plugins/instances/init.php:204
-#: plugins/instances/init.php:395
-msgid "Instance"
-msgstr ""
+#: classes/feeds.php:1596
+msgid "Starred articles"
+msgstr "Articles marcats"
 
-#: plugins/instances/init.php:215
-#: plugins/instances/init.php:312
-#: plugins/instances/init.php:404
-msgid "Instance URL"
-msgstr ""
+#: classes/feeds.php:1598
+msgid "Published articles"
+msgstr "Articles publicats"
 
-#: plugins/instances/init.php:226
-#: plugins/instances/init.php:414
-#, fuzzy
-msgid "Access key:"
-msgstr "Nivell d'accés:"
+#: classes/feeds.php:1600
+msgid "Fresh articles"
+msgstr "Articles nous"
 
-#: plugins/instances/init.php:229
-#: plugins/instances/init.php:313
-#: plugins/instances/init.php:417
+#: classes/feeds.php:1604
 #, fuzzy
-msgid "Access key"
-msgstr "Nivell d'accés"
+msgid "Archived articles"
+msgstr "Articles mémorisés"
 
-#: plugins/instances/init.php:233
-#: plugins/instances/init.php:421
-msgid "Use one access key for both linked instances."
+#: classes/feeds.php:1606
+msgid "Recently read"
 msgstr ""
 
-#: plugins/instances/init.php:241
-#: plugins/instances/init.php:429
-#, fuzzy
-msgid "Generate new key"
-msgstr "Canals generats"
+#: classes/feeds.php:1716
+msgid "Special"
+msgstr "Especial"
 
-#: plugins/instances/init.php:292
-#, fuzzy
-msgid "Link instance"
-msgstr "Edita les etiquetes"
+#: classes/feeds.php:1962
+#, fuzzy, php-format
+msgid "Search results: %s"
+msgstr "Resultats de la cerca"
 
-#: plugins/instances/init.php:304
-msgid "You can connect other instances of Tiny Tiny RSS to this one to share Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
-msgstr ""
+#: plugins/vf_shared/init.php:16
+#: plugins/vf_shared/init.php:60
+#, fuzzy
+msgid "Shared articles"
+msgstr "Articles marcats"
 
-#: plugins/instances/init.php:314
-msgid "Last connected"
+#: plugins/import_export/init.php:58
+msgid "Import and export"
 msgstr ""
 
-#: plugins/instances/init.php:315
-msgid "Status"
+#: plugins/import_export/init.php:60
+msgid "You can export and import your Starred and Archived articles for safekeeping or when migrating between tt-rss instances of same version."
 msgstr ""
 
-#: plugins/instances/init.php:316
+#: plugins/import_export/init.php:65
 #, fuzzy
-msgid "Stored feeds"
-msgstr "Més canals"
+msgid "Export my data"
+msgstr "Exporta en format OPML"
+
+#: plugins/import_export/init.php:81
+msgid "Import"
+msgstr "Importeu"
 
-#: plugins/instances/init.php:433
+#: plugins/import_export/init.php:231
 #, fuzzy
-msgid "Create link"
-msgstr "Crea"
+msgid "Could not import: incorrect schema version."
+msgstr "No s'ha pogut trobar el fitxer d'esquema necessari, es necessita la versió:"
 
-#: plugins/nsfw/init.php:30
-#: plugins/nsfw/init.php:42
-msgid "Not work safe (click to toggle)"
+#: plugins/import_export/init.php:236
+msgid "Could not import: unrecognized document format."
 msgstr ""
 
-#: plugins/nsfw/init.php:52
-msgid "NSFW Plugin"
+#: plugins/import_export/init.php:397
+msgid "Finished: "
 msgstr ""
 
-#: plugins/nsfw/init.php:79
-msgid "Tags to consider NSFW (comma-separated)"
-msgstr ""
+#: plugins/import_export/init.php:398
+#, fuzzy, php-format
+msgid "%d article processed, "
+msgid_plural "%d articles processed, "
+msgstr[0] "Edita les etiquetes"
+msgstr[1] "Edita les etiquetes"
 
-#: plugins/nsfw/init.php:100
-#, fuzzy
-msgid "Configuration saved."
-msgstr "S'ha desat la configuració"
+#: plugins/import_export/init.php:399
+#, fuzzy, php-format
+msgid "%d imported, "
+msgid_plural "%d imported, "
+msgstr[0] "Ja s'ha importat"
+msgstr[1] "Ja s'ha importat"
 
-#: plugins/note/init.php:26
-#: plugins/note/note.js:11
-#, fuzzy
-msgid "Edit article note"
-msgstr "Edita les etiquetes"
+#: plugins/import_export/init.php:400
+#, fuzzy, php-format
+msgid "%d feed created."
+msgid_plural "%d feeds created."
+msgstr[0] "No heu seleccionat cap canal."
+msgstr[1] "No heu seleccionat cap canal."
 
-#: plugins/vf_shared/init.php:16
-#: plugins/vf_shared/init.php:69
-#, fuzzy
-msgid "Shared articles"
-msgstr "Articles marcats"
+#: plugins/import_export/init.php:405
+msgid "Could not load XML document."
+msgstr ""
 
-#: plugins/auth_internal/init.php:65
+#: plugins/import_export/init.php:417
 #, fuzzy
-msgid "Please enter your one time password:"
-msgstr "Si us plau, escriviu una nota per aquest article:"
-
-#: plugins/auth_internal/init.php:188
-msgid "Password has been changed."
-msgstr "S'ha modificat la contrasenya."
-
-#: plugins/auth_internal/init.php:190
-msgid "Old password is incorrect."
-msgstr "La contrasenya antiga és incorrecta."
+msgid "Prepare data"
+msgstr "Desa"
 
-#: plugins/af_readability/init.php:21
-msgid "Data saved."
+#: plugins/import_export/init.php:434
+#, php-format
+msgid "Upload failed with error code %d (%s)"
 msgstr ""
 
-#: plugins/af_readability/init.php:33
+#: plugins/import_export/init.php:460
 #, fuzzy
-msgid "Inline content"
-msgstr "Desplaça el contingut de l'article"
+msgid "No file uploaded."
+msgstr "No hi ha cap fitxer OPML per a carregar."
 
-#: plugins/af_readability/init.php:39
-msgid "Readability settings (af_readability)"
+#: plugins/mailto/init.php:48
+#: plugins/mailto/init.php:54
+#: plugins/mail/init.php:112
+#: plugins/mail/init.php:118
+msgid "[Forwarded]"
 msgstr ""
 
-#: plugins/af_readability/init.php:66
-msgid "Use Readability for pages shared via bookmarklet."
-msgstr ""
+#: plugins/mailto/init.php:48
+#: plugins/mail/init.php:112
+#, fuzzy
+msgid "Multiple articles"
+msgstr "Tots els articles"
 
-#: plugins/af_readability/init.php:78
-#: plugins/af_psql_trgm/init.php:191
-msgid "Currently enabled for (click to edit):"
+#: plugins/mailto/init.php:70
+msgid "Clicking the following link to invoke your mail client:"
 msgstr ""
 
-#: plugins/af_readability/init.php:95
-#, fuzzy
-msgid "Readability"
-msgstr "Comprova la disponibilitat"
-
-#: plugins/af_readability/init.php:106
+#: plugins/mailto/init.php:74
 #, fuzzy
-msgid "Inline article content"
-msgstr "Desplaça el contingut de l'article"
+msgid "Forward selected article(s) by email."
+msgstr "Marca l'article"
 
-#: plugins/af_redditimgur/init.php:25
-msgid "Reddit content settings (af_redditimgur)"
+#: plugins/mailto/init.php:77
+msgid "You should be able to edit the message before sending in your mail client."
 msgstr ""
 
-#: plugins/af_redditimgur/init.php:50
-msgid "Uses Readability (full-text-rss) implementation by <a target='_blank' href='https://bitbucket.org/fivefilters/'>FiveFilters.org</a>"
-msgstr ""
+#: plugins/mailto/init.php:82
+#, fuzzy
+msgid "Close this dialog"
+msgstr "Tanca la finestra"
 
-#: plugins/af_redditimgur/init.php:54
-msgid "Extract missing content using Readability"
+#: plugins/bookmarklets/init.php:20
+msgid "Bookmarklets"
 msgstr ""
 
-#: plugins/af_redditimgur/init.php:59
-msgid "Enable additional duplicate checking"
+#: plugins/bookmarklets/init.php:22
+msgid "Drag the link below to your browser toolbar, open the feed you're interested in in your browser and click on the link to subscribe to it."
 msgstr ""
 
-#: plugins/af_redditimgur/init.php:73
-#: plugins/af_zz_imgproxy/init.php:225
+#: plugins/bookmarklets/init.php:26
+#, fuzzy, php-format
+msgid "Subscribe to %s in Tiny Tiny RSS?"
+msgstr "Torna a Tiny Tiny RSS"
+
+#: plugins/bookmarklets/init.php:31
 #, fuzzy
-msgid "Configuration saved"
-msgstr "S'ha desat la configuració"
+msgid "Subscribe in Tiny Tiny RSS"
+msgstr "Torna a Tiny Tiny RSS"
+
+#: plugins/bookmarklets/init.php:34
+msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
+msgstr ""
 
 #: plugins/af_psql_trgm/init.php:28
 #, php-format
@@ -2825,91 +2766,63 @@ msgstr ""
 msgid "Enable for all feeds:"
 msgstr "Afficher les icônes dans la liste des flux"
 
-#: plugins/af_psql_trgm/init.php:209
-msgid "Similarity (pg_trgm)"
-msgstr ""
-
-#: plugins/af_comics/init.php:40
-msgid "Feeds supported by af_comics"
+#: plugins/af_psql_trgm/init.php:191
+#: plugins/af_readability/init.php:78
+msgid "Currently enabled for (click to edit):"
 msgstr ""
 
-#: plugins/af_comics/init.php:42
-msgid "The following comics are currently supported:"
+#: plugins/af_psql_trgm/init.php:209
+msgid "Similarity (pg_trgm)"
 msgstr ""
 
-#: plugins/af_comics/init.php:60
-msgid "GoComics requires a specific URL to workaround their lack of feed support: <code>http://feeds.feedburner.com/uclick/<em>comic_name</em></code> (e.g. <code>http://www.gocomics.com/garfield</code> uses <code>http://feeds.feedburner.com/uclick/garfield</code>)."
+#: plugins/nsfw/init.php:30
+#: plugins/nsfw/init.php:42
+msgid "Not work safe (click to toggle)"
 msgstr ""
 
-#: plugins/import_export/init.php:58
-msgid "Import and export"
+#: plugins/nsfw/init.php:52
+msgid "NSFW Plugin"
 msgstr ""
 
-#: plugins/import_export/init.php:60
-msgid "You can export and import your Starred and Archived articles for safekeeping or when migrating between tt-rss instances of same version."
+#: plugins/nsfw/init.php:79
+msgid "Tags to consider NSFW (comma-separated)"
 msgstr ""
 
-#: plugins/import_export/init.php:65
-#, fuzzy
-msgid "Export my data"
-msgstr "Exporta en format OPML"
-
-#: plugins/import_export/init.php:81
-msgid "Import"
-msgstr "Importeu"
-
-#: plugins/import_export/init.php:225
+#: plugins/nsfw/init.php:100
 #, fuzzy
-msgid "Could not import: incorrect schema version."
-msgstr "No s'ha pogut trobar el fitxer d'esquema necessari, es necessita la versió:"
+msgid "Configuration saved."
+msgstr "S'ha desat la configuració"
 
-#: plugins/import_export/init.php:230
-msgid "Could not import: unrecognized document format."
-msgstr ""
+#: plugins/toggle_sidebar/init.php:23
+msgid "Collapse feedlist"
+msgstr "Redueix la llista de canals"
 
-#: plugins/import_export/init.php:391
-msgid "Finished: "
+#: plugins/af_readability/init.php:21
+msgid "Data saved."
 msgstr ""
 
-#: plugins/import_export/init.php:392
-#, fuzzy, php-format
-msgid "%d article processed, "
-msgid_plural "%d articles processed, "
-msgstr[0] "Edita les etiquetes"
-msgstr[1] "Edita les etiquetes"
-
-#: plugins/import_export/init.php:393
-#, fuzzy, php-format
-msgid "%d imported, "
-msgid_plural "%d imported, "
-msgstr[0] "Ja s'ha importat"
-msgstr[1] "Ja s'ha importat"
+#: plugins/af_readability/init.php:33
+#, fuzzy
+msgid "Inline content"
+msgstr "Desplaça el contingut de l'article"
 
-#: plugins/import_export/init.php:394
-#, fuzzy, php-format
-msgid "%d feed created."
-msgid_plural "%d feeds created."
-msgstr[0] "No heu seleccionat cap canal."
-msgstr[1] "No heu seleccionat cap canal."
+#: plugins/af_readability/init.php:39
+msgid "Readability settings (af_readability)"
+msgstr ""
 
-#: plugins/import_export/init.php:399
-msgid "Could not load XML document."
+#: plugins/af_readability/init.php:66
+msgid "Use Readability for pages shared via bookmarklet."
 msgstr ""
 
-#: plugins/import_export/init.php:411
+#: plugins/af_readability/init.php:95
 #, fuzzy
-msgid "Prepare data"
-msgstr "Desa"
-
-#: plugins/import_export/init.php:428
-#, php-format
-msgid "Upload failed with error code %d (%s)"
-msgstr ""
+msgid "Readability"
+msgstr "Comprova la disponibilitat"
 
-#: plugins/import_export/init.php:454
+#: plugins/af_readability/init.php:106
 #, fuzzy
-msgid "No file uploaded."
-msgstr "No hi ha cap fitxer OPML per a carregar."
+msgid "Inline article content"
+msgstr "Desplaça el contingut de l'article"
 
 #: plugins/mail/init.php:28
 msgid "Mail addresses saved."
@@ -2923,19 +2836,6 @@ msgstr ""
 msgid "You can set predefined email addressed here (comma-separated list):"
 msgstr ""
 
-#: plugins/mail/init.php:112
-#: plugins/mail/init.php:118
-#: plugins/mailto/init.php:49
-#: plugins/mailto/init.php:55
-msgid "[Forwarded]"
-msgstr ""
-
-#: plugins/mail/init.php:112
-#: plugins/mailto/init.php:49
-#, fuzzy
-msgid "Multiple articles"
-msgstr "Tots els articles"
-
 #: plugins/mail/init.php:140
 #, fuzzy
 msgid "To:"
@@ -2951,98 +2851,116 @@ msgstr "Selecciona:"
 msgid "Send e-mail"
 msgstr "Canvieu l'adreça electrònica"
 
-#: plugins/close_button/init.php:22
+#: plugins/share/init.php:39
+msgid "You can disable all articles shared by unique URLs here."
+msgstr ""
+
+#: plugins/share/init.php:42
 #, fuzzy
-msgid "Close article"
-msgstr "Buida els articles"
+msgid "Unshare all articles"
+msgstr "Articles mémorisés"
 
-#: plugins/bookmarklets/init.php:20
-msgid "Bookmarklets"
+#: plugins/share/init.php:75
+#, fuzzy
+msgid "Share by URL"
+msgstr "Marca l'article"
+
+#: plugins/share/init.php:96
+msgid "You can share this article by the following unique URL:"
 msgstr ""
 
-#: plugins/bookmarklets/init.php:22
-msgid "Drag the link below to your browser toolbar, open the feed you're interested in in your browser and click on the link to subscribe to it."
+#: plugins/share/init.php:114
+#, fuzzy
+msgid "Unshare article"
+msgstr "Treu la marca de l'article"
+
+#: plugins/af_comics/init.php:48
+msgid "Feeds supported by af_comics"
 msgstr ""
 
-#: plugins/bookmarklets/init.php:26
-#, fuzzy, php-format
-msgid "Subscribe to %s in Tiny Tiny RSS?"
-msgstr "Torna a Tiny Tiny RSS"
+#: plugins/af_comics/init.php:50
+msgid "The following comics are currently supported:"
+msgstr ""
 
-#: plugins/bookmarklets/init.php:31
-#, fuzzy
-msgid "Subscribe in Tiny Tiny RSS"
-msgstr "Torna a Tiny Tiny RSS"
+#: plugins/af_comics/init.php:68
+msgid "GoComics requires a specific URL to workaround their lack of feed support: <code>http://feeds.feedburner.com/uclick/<em>comic_name</em></code> (e.g. <code>http://www.gocomics.com/garfield</code> uses <code>http://feeds.feedburner.com/uclick/garfield</code>)."
+msgstr ""
 
-#: plugins/bookmarklets/init.php:34
-msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
+#: plugins/af_comics/init.php:70
+msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
 msgstr ""
 
-#: plugins/toggle_sidebar/init.php:23
-msgid "Collapse feedlist"
-msgstr "Redueix la llista de canals"
+#: plugins/af_redditimgur/init.php:25
+msgid "Reddit content settings (af_redditimgur)"
+msgstr ""
 
-#: plugins/af_zz_imgproxy/init.php:186
-msgid "Image proxy settings (af_zz_imgproxy)"
+#: plugins/af_redditimgur/init.php:50
+msgid "Uses Readability (full-text-rss) implementation by <a target='_blank' href='https://bitbucket.org/fivefilters/'>FiveFilters.org</a>"
 msgstr ""
 
-#: plugins/af_zz_imgproxy/init.php:211
-#, fuzzy
-msgid "Enable proxy for all remote images."
-msgstr "Afficher les icônes dans la liste des flux"
+#: plugins/af_redditimgur/init.php:54
+msgid "Extract missing content using Readability"
+msgstr ""
 
-#: plugins/mailto/init.php:71
-msgid "Clicking the following link to invoke your mail client:"
+#: plugins/af_redditimgur/init.php:59
+msgid "Enable additional duplicate checking"
 msgstr ""
 
-#: plugins/mailto/init.php:75
+#: plugins/af_redditimgur/init.php:73
+#: plugins/af_zz_imgproxy/init.php:254
 #, fuzzy
-msgid "Forward selected article(s) by email."
-msgstr "Marca l'article"
+msgid "Configuration saved"
+msgstr "S'ha desat la configuració"
 
-#: plugins/mailto/init.php:78
-msgid "You should be able to edit the message before sending in your mail client."
-msgstr ""
+#: plugins/note/init.php:26
+#: plugins/note/note.js:11
+#, fuzzy
+msgid "Edit article note"
+msgstr "Edita les etiquetes"
 
-#: plugins/mailto/init.php:83
+#: plugins/close_button/init.php:25
 #, fuzzy
-msgid "Close this dialog"
-msgstr "Tanca la finestra"
+msgid "Close article"
+msgstr "Buida els articles"
 
-#: plugins/share/init.php:39
-msgid "You can disable all articles shared by unique URLs here."
+#: plugins/af_zz_imgproxy/init.php:210
+msgid "Image proxy settings (af_zz_imgproxy)"
 msgstr ""
 
-#: plugins/share/init.php:42
+#: plugins/af_zz_imgproxy/init.php:234
 #, fuzzy
-msgid "Unshare all articles"
-msgstr "Articles mémorisés"
+msgid "Enable proxy for all remote images."
+msgstr "Afficher les icônes dans la liste des flux"
 
-#: plugins/share/init.php:75
+#: plugins/af_zz_imgproxy/init.php:238
 #, fuzzy
-msgid "Share by URL"
-msgstr "Marca l'article"
-
-#: plugins/share/init.php:97
-msgid "You can share this article by the following unique URL:"
-msgstr ""
+msgid "Don't cache files locally."
+msgstr "Emmagatzema les imatges localment"
 
-#: plugins/share/init.php:115
+#: plugins/auth_internal/init.php:65
 #, fuzzy
-msgid "Unshare article"
-msgstr "Treu la marca de l'article"
+msgid "Please enter your one time password:"
+msgstr "Si us plau, escriviu una nota per aquest article:"
+
+#: plugins/auth_internal/init.php:188
+msgid "Password has been changed."
+msgstr "S'ha modificat la contrasenya."
+
+#: plugins/auth_internal/init.php:190
+msgid "Old password is incorrect."
+msgstr "La contrasenya antiga és incorrecta."
 
 #: js/FeedTree.js:172
 #, fuzzy
 msgid "(Un)collapse"
 msgstr "Redueix la barra lateral"
 
-#: js/PrefFeedTree.js:52
+#: js/PrefFeedTree.js:54
 #, fuzzy
 msgid "Edit category"
 msgstr "Edita les categories"
 
-#: js/PrefFeedTree.js:59
+#: js/PrefFeedTree.js:61
 #, fuzzy
 msgid "Remove category"
 msgstr "Crea una categoria"
@@ -3081,67 +2999,58 @@ msgid "Create Filter"
 msgstr "Crea un filtre"
 
 #: js/functions.js:1128
-msgid "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification hub again on next feed update."
-msgstr ""
-
-#: js/functions.js:1139
-#, fuzzy
-msgid "Subscription reset."
-msgstr "Subscriviu-vos al canal"
-
-#: js/functions.js:1149
-#: js/tt-rss.js:695
+#: js/tt-rss.js:696
 #, perl-format
 msgid "Unsubscribe from %s?"
 msgstr "Us voleu donar de baixa de %s ?"
 
-#: js/functions.js:1152
+#: js/functions.js:1131
 msgid "Removing feed..."
 msgstr "S'està eliminant el canal..."
 
-#: js/functions.js:1225
+#: js/functions.js:1204
 #, fuzzy
 msgid "Please enter category title:"
 msgstr "Si us plau, escriviu una nota per aquest article:"
 
-#: js/functions.js:1250
+#: js/functions.js:1229
 msgid "Generate new syndication address for this feed?"
 msgstr ""
 
-#: js/functions.js:1254
-#: js/prefs.js:1154
+#: js/functions.js:1233
+#: js/prefs.js:1150
 msgid "Trying to change address..."
 msgstr "S'està intentant canviar l'adreça..."
 
-#: js/functions.js:1497
-#: js/functions.js:1606
+#: js/functions.js:1476
+#: js/functions.js:1585
 #: js/prefs.js:398
 #: js/prefs.js:424
 #: js/prefs.js:456
 #: js/prefs.js:599
 #: js/prefs.js:617
-#: js/prefs.js:1136
-#: js/prefs.js:1263
+#: js/prefs.js:1132
+#: js/prefs.js:1259
 msgid "No feeds are selected."
 msgstr "No heu seleccionat cap canal."
 
-#: js/functions.js:1540
+#: js/functions.js:1519
 msgid "Remove selected feeds from the archive? Feeds with stored articles will not be removed."
 msgstr ""
 
-#: js/functions.js:1577
+#: js/functions.js:1556
 #, fuzzy
 msgid "Feeds with update errors"
 msgstr "Erreurs de mise à jour"
 
-#: js/functions.js:1588
-#: js/prefs.js:1117
+#: js/functions.js:1567
+#: js/prefs.js:1113
 #, fuzzy
 msgid "Remove selected feeds?"
 msgstr "Esteu segur que voleu suprimir els filtres seleccionats?"
 
-#: js/functions.js:1591
-#: js/prefs.js:1120
+#: js/functions.js:1570
+#: js/prefs.js:1116
 #, fuzzy
 msgid "Removing selected feeds..."
 msgstr "S'estan suprimint els filtres seleccionats..."
@@ -3165,9 +3074,7 @@ msgstr "Editor de perfils d'usuari"
 #: js/prefs.js:100
 #: js/prefs.js:209
 #: js/prefs.js:706
-#: plugins/instances/instances.js:26
-#: plugins/instances/instances.js:89
-#: js/functions.js:1408
+#: js/functions.js:1387
 #, fuzzy
 msgid "Saving data..."
 msgstr "S'està desant el canal..."
@@ -3195,7 +3102,7 @@ msgid "Removing selected labels..."
 msgstr "S'estan seleccionat les etiquetes seleccionades..."
 
 #: js/prefs.js:308
-#: js/prefs.js:1304
+#: js/prefs.js:1300
 msgid "No labels are selected."
 msgstr "No heu seleccionat cap etiqueta."
 
@@ -3299,31 +3206,31 @@ msgstr "Esteu segur que voleu desar els canvis als canals seleccionats?"
 msgid "OPML Import"
 msgstr "Importeu"
 
-#: js/prefs.js:764
+#: js/prefs.js:759
 #, fuzzy
 msgid "Please choose an OPML file first."
 msgstr "Primerament heu de seleccionar un canal."
 
-#: js/prefs.js:767
+#: js/prefs.js:762
 #: plugins/import_export/import_export.js:115
 #, fuzzy
 msgid "Importing, please wait..."
 msgstr "S'està obrint, preneu paciència..."
 
-#: js/prefs.js:928
+#: js/prefs.js:924
 msgid "Reset to defaults?"
 msgstr "Esteu segur que voleu establir els valors per defecte?"
 
-#: js/prefs.js:1628
+#: js/prefs.js:1624
 #, fuzzy
 msgid "Subscribing to feeds..."
 msgstr "S'està subscrivint a un canal..."
 
-#: js/prefs.js:1647
+#: js/prefs.js:1643
 msgid "Clear stored data for this plugin?"
 msgstr ""
 
-#: js/prefs.js:1661
+#: js/prefs.js:1657
 msgid "Clear all messages in the error log?"
 msgstr ""
 
@@ -3335,195 +3242,158 @@ msgstr "Esteu segur que voleu marcar tots els articles com a llegits?"
 msgid "Marking all feeds as read..."
 msgstr "S'estan marcant tots els canals com a llegits..."
 
-#: js/tt-rss.js:401
+#: js/tt-rss.js:402
 #, fuzzy
 msgid "Please enable mail plugin first."
 msgstr "Primerament heu de seleccionar un canal."
 
-#: js/tt-rss.js:449
-#: js/functions.js:1387
-#: js/tt-rss.js:676
+#: js/tt-rss.js:450
+#: js/functions.js:1366
+#: js/tt-rss.js:677
 msgid "You can't edit this kind of feed."
 msgstr "No podeu editar aquest tipus de canal."
 
-#: js/tt-rss.js:530
+#: js/tt-rss.js:531
 #, fuzzy
 msgid "Please enable embed_original plugin first."
 msgstr "Primerament heu de seleccionar un canal."
 
-#: js/tt-rss.js:543
-#: js/tt-rss.js:726
+#: js/tt-rss.js:544
+#: js/tt-rss.js:727
 msgid "Widescreen is not available in combined mode."
 msgstr ""
 
-#: js/tt-rss.js:824
+#: js/tt-rss.js:825
 msgid "You can't rescore this kind of feed."
 msgstr "No podeu canviar la puntuació d'aquest tipus de canal."
 
-#: js/tt-rss.js:829
-#: js/tt-rss.js:689
+#: js/tt-rss.js:830
+#: js/tt-rss.js:690
 msgid "Please select some feed first."
 msgstr "Primerament heu de seleccionar un canal."
 
-#: js/tt-rss.js:834
+#: js/tt-rss.js:835
 #, perl-format
 msgid "Rescore articles in %s?"
 msgstr "Esteu segur que voleu canviar la puntuació dels articles a %s?"
 
-#: js/tt-rss.js:837
+#: js/tt-rss.js:838
 msgid "Rescoring articles..."
 msgstr "S'estan canviant la puntuació dels articles"
 
-#: js/viewfeed.js:919
-#: js/viewfeed.js:957
-#: js/viewfeed.js:1005
-#: js/viewfeed.js:1931
-#: plugins/mail/mail.js:7
+#: js/viewfeed.js:921
+#: js/viewfeed.js:959
+#: js/viewfeed.js:1007
+#: js/viewfeed.js:1933
 #: plugins/mailto/init.js:7
-#: js/viewfeed.js:677
-#: js/viewfeed.js:699
-#: js/viewfeed.js:720
-#: js/viewfeed.js:779
-#: js/viewfeed.js:807
+#: plugins/mail/mail.js:7
+#: js/viewfeed.js:679
+#: js/viewfeed.js:701
+#: js/viewfeed.js:722
+#: js/viewfeed.js:781
+#: js/viewfeed.js:809
 msgid "No articles are selected."
 msgstr "No hi ha cap article seleccionat."
 
-#: js/viewfeed.js:927
+#: js/viewfeed.js:929
 #, fuzzy, perl-format
 msgid "Delete %d selected article in %s?"
 msgid_plural "Delete %d selected articles in %s?"
 msgstr[0] "Esteu segur que voleu marcar els %d articles seleccionats de %s com a llegits?"
 msgstr[1] "Esteu segur que voleu marcar els %d articles seleccionats de %s com a llegits?"
 
-#: js/viewfeed.js:929
+#: js/viewfeed.js:931
 #, fuzzy, perl-format
 msgid "Delete %d selected article?"
 msgid_plural "Delete %d selected articles?"
 msgstr[0] "Esteu segur que voleu eliminar els articles seleccionats de l'etiqueta?"
 msgstr[1] "Esteu segur que voleu eliminar els articles seleccionats de l'etiqueta?"
 
-#: js/viewfeed.js:966
+#: js/viewfeed.js:968
 #, fuzzy, perl-format
 msgid "Archive %d selected article in %s?"
 msgid_plural "Archive %d selected articles in %s?"
 msgstr[0] "Esteu segur que voleu marcar els %d articles seleccionats de %s com a llegits?"
 msgstr[1] "Esteu segur que voleu marcar els %d articles seleccionats de %s com a llegits?"
 
-#: js/viewfeed.js:969
+#: js/viewfeed.js:971
 #, fuzzy, perl-format
 msgid "Move %d archived article back?"
 msgid_plural "Move %d archived articles back?"
 msgstr[0] "Articles marcats"
 msgstr[1] "Articles marcats"
 
-#: js/viewfeed.js:971
+#: js/viewfeed.js:973
 msgid "Please note that unstarred articles might get purged on next feed update."
 msgstr ""
 
-#: js/viewfeed.js:1011
+#: js/viewfeed.js:1013
 #, fuzzy, perl-format
 msgid "Mark %d selected article in %s as read?"
 msgid_plural "Mark %d selected articles in %s as read?"
 msgstr[0] "Esteu segur que voleu marcar els %d articles seleccionats de %s com a llegits?"
 msgstr[1] "Esteu segur que voleu marcar els %d articles seleccionats de %s com a llegits?"
 
-#: js/viewfeed.js:1031
+#: js/viewfeed.js:1033
 #, fuzzy
 msgid "Edit article Tags"
 msgstr "Edita les etiquetes"
 
-#: js/viewfeed.js:1037
+#: js/viewfeed.js:1039
 msgid "Saving article tags..."
 msgstr "S'estan desant les etiquetes de l'article"
 
-#: js/viewfeed.js:1670
+#: js/viewfeed.js:1672
 #, fuzzy
 msgid "Open original article"
 msgstr "Mostra el contingut original de l'article"
 
-#: js/viewfeed.js:1677
+#: js/viewfeed.js:1679
 #, fuzzy
 msgid "Display article URL"
 msgstr "afficher les étiquettes"
 
-#: js/viewfeed.js:1787
+#: js/viewfeed.js:1789
 msgid "Assign label"
 msgstr "Assigna-li l'etiqueta"
 
-#: js/viewfeed.js:1792
+#: js/viewfeed.js:1794
 #, fuzzy
 msgid "Remove label"
 msgstr "Esteu segur que voleu suprimir les etiquetes seleccionades?"
 
-#: js/viewfeed.js:1824
+#: js/viewfeed.js:1826
 #, fuzzy
 msgid "Select articles in group"
 msgstr "Seleccioneu un article mitjançant el ratolí."
 
-#: js/viewfeed.js:1834
+#: js/viewfeed.js:1836
 #, fuzzy
 msgid "Mark group as read"
 msgstr "Marca'l com a llegit"
 
-#: js/viewfeed.js:1846
+#: js/viewfeed.js:1848
 msgid "Mark feed as read"
 msgstr "Marca el canal com a llegit"
 
-#: js/viewfeed.js:1899
+#: js/viewfeed.js:1901
 #, fuzzy
 msgid "Please enter new score for selected articles:"
 msgstr "Si us plau, escriviu una nota per aquest article:"
 
-#: js/viewfeed.js:1962
+#: js/viewfeed.js:1964
 #, fuzzy
 msgid "Please enter new score for this article:"
 msgstr "Si us plau, escriviu una nota per aquest article:"
 
-#: js/viewfeed.js:1993
+#: js/viewfeed.js:1995
 #, fuzzy
 msgid "Article URL:"
 msgstr "Tots els articles"
 
-#: plugins/instances/instances.js:10
-#, fuzzy
-msgid "Link Instance"
-msgstr "Edita les etiquetes"
-
-#: plugins/instances/instances.js:73
-#, fuzzy
-msgid "Edit Instance"
-msgstr "Edita les etiquetes"
-
-#: plugins/instances/instances.js:122
-#, fuzzy
-msgid "Remove selected instances?"
-msgstr "Esteu segur que voleu suprimir els filtres seleccionats?"
-
-#: plugins/instances/instances.js:125
-#, fuzzy
-msgid "Removing selected instances..."
-msgstr "S'estan suprimint els filtres seleccionats..."
-
-#: plugins/instances/instances.js:139
-#: plugins/instances/instances.js:151
-#, fuzzy
-msgid "No instances are selected."
-msgstr "No heu seleccionat cap filtre."
-
-#: plugins/instances/instances.js:156
-#, fuzzy
-msgid "Please select only one instance."
-msgstr "Si us plau, seleccioneu només un filtre."
-
-#: plugins/note/note.js:17
-#, fuzzy
-msgid "Saving article note..."
-msgstr "S'estan desant les etiquetes de l'article"
-
-#: plugins/af_psql_trgm/init.js:11
-#, fuzzy
-msgid "Related articles"
-msgstr "Buida els articles"
+#: plugins/embed_original/init.js:6
+msgid "Sorry, your browser does not support sandboxed iframes."
+msgstr ""
 
 #: plugins/import_export/import_export.js:13
 #, fuzzy
@@ -3547,12 +3417,17 @@ msgstr "Importeu"
 msgid "Please choose the file first."
 msgstr "Primerament heu de seleccionar un canal."
 
-#: plugins/mail/mail.js:21
 #: plugins/mailto/init.js:21
+#: plugins/mail/mail.js:21
 #, fuzzy
 msgid "Forward article by email"
 msgstr "Marca l'article"
 
+#: plugins/af_psql_trgm/init.js:11
+#, fuzzy
+msgid "Related articles"
+msgstr "Buida els articles"
+
 #: plugins/mail/mail.js:36
 msgid "Error sending email:"
 msgstr ""
@@ -3562,10 +3437,6 @@ msgstr ""
 msgid "Your message has been sent."
 msgstr "S'ha modificat la contrasenya."
 
-#: plugins/embed_original/init.js:6
-msgid "Sorry, your browser does not support sandboxed iframes."
-msgstr ""
-
 #: plugins/shorten_expanded/init.js:39
 msgid "Click to expand article"
 msgstr "Clica-hi per a veure el cos de l'article"
@@ -3600,7 +3471,7 @@ msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr ""
 
 #: plugins/share/share_prefs.js:6
-#: js/prefs.js:1437
+#: js/prefs.js:1433
 #, fuzzy
 msgid "Clearing URLs..."
 msgstr "S'està netejant el canal..."
@@ -3609,26 +3480,45 @@ msgstr "S'està netejant el canal..."
 msgid "Shared URLs cleared."
 msgstr ""
 
+#: plugins/note/note.js:17
+#, fuzzy
+msgid "Saving article note..."
+msgstr "S'estan desant les etiquetes de l'article"
+
 #: js/feedlist.js:429
-#: js/feedlist.js:496
 msgid "Mark all articles in %s as read?"
 msgstr "Esteu segur que voleu marcar tots els articles de %s com a llegits?"
 
 #: js/feedlist.js:487
 #, fuzzy
-msgid "Mark all articles in %s older than 1 day as read?"
+msgid "Mark %w in %s older than 1 day as read?"
 msgstr "Esteu segur que voleu marcar tots els articles de %s com a llegits?"
 
 #: js/feedlist.js:490
 #, fuzzy
-msgid "Mark all articles in %s older than 1 week as read?"
+msgid "Mark %w in %s older than 1 week as read?"
 msgstr "Esteu segur que voleu marcar tots els articles de %s com a llegits?"
 
 #: js/feedlist.js:493
 #, fuzzy
-msgid "Mark all articles in %s older than 2 weeks as read?"
+msgid "Mark %w in %s older than 2 weeks as read?"
+msgstr "Esteu segur que voleu marcar tots els articles de %s com a llegits?"
+
+#: js/feedlist.js:496
+#, fuzzy
+msgid "Mark %w in %s as read?"
 msgstr "Esteu segur que voleu marcar tots els articles de %s com a llegits?"
 
+#: js/feedlist.js:499
+#, fuzzy
+msgid "search results"
+msgstr "Resultats de la cerca"
+
+#: js/feedlist.js:499
+#, fuzzy
+msgid "all articles"
+msgstr "Tots els articles"
+
 #: js/functions.js:506
 msgid "Error explained"
 msgstr ""
@@ -3720,198 +3610,255 @@ msgstr "No esteu subscrit a cap canal."
 msgid "Edit rule"
 msgstr "Filtres"
 
-#: js/functions.js:1402
+#: js/functions.js:1381
 #, fuzzy
 msgid "Edit Feed"
 msgstr "Edita el canal"
 
-#: js/functions.js:1435
+#: js/functions.js:1414
 #, fuzzy
 msgid "More Feeds"
 msgstr "Més canals"
 
-#: js/functions.js:1631
+#: js/functions.js:1610
 msgid "Help"
 msgstr "Ajuda"
 
-#: js/prefs.js:1032
+#: js/prefs.js:1028
 msgid "Remove category %s? Any nested feeds would be placed into Uncategorized."
 msgstr ""
 
-#: js/prefs.js:1038
+#: js/prefs.js:1034
 #, fuzzy
 msgid "Removing category..."
 msgstr "Crea una categoria"
 
-#: js/prefs.js:1056
+#: js/prefs.js:1052
 msgid "Remove selected categories?"
 msgstr "Esteu segur que voleu suprimir les categories seleccionades?"
 
-#: js/prefs.js:1059
+#: js/prefs.js:1055
 msgid "Removing selected categories..."
 msgstr "S'estan seleccionant les categories seleccionades..."
 
-#: js/prefs.js:1072
+#: js/prefs.js:1068
 msgid "No categories are selected."
 msgstr "No heu seleccionat cap categoria."
 
-#: js/prefs.js:1079
+#: js/prefs.js:1075
 #, fuzzy
 msgid "Category title:"
 msgstr "Edita les categories"
 
-#: js/prefs.js:1083
+#: js/prefs.js:1079
 #, fuzzy
 msgid "Creating category..."
 msgstr "Crea un filtre..."
 
-#: js/prefs.js:1106
+#: js/prefs.js:1102
 #, fuzzy
 msgid "Feeds without recent updates"
 msgstr "Erreurs de mise à jour"
 
-#: js/prefs.js:1150
+#: js/prefs.js:1146
 #, fuzzy
 msgid "Replace current OPML publishing address with a new one?"
 msgstr "Voleu canviar l'adreça de publicació per una de nova?"
 
-#: js/prefs.js:1227
+#: js/prefs.js:1223
 msgid "Clearing feed..."
 msgstr "S'està netejant el canal..."
 
-#: js/prefs.js:1247
+#: js/prefs.js:1243
 msgid "Rescore articles in selected feeds?"
 msgstr "Esteu segur que voleu canviar la puntuació dels articles en les etiquetes personalitzades?"
 
-#: js/prefs.js:1250
+#: js/prefs.js:1246
 #, fuzzy
 msgid "Rescoring selected feeds..."
 msgstr "S'està netejant el canal seleccionat..."
 
-#: js/prefs.js:1270
+#: js/prefs.js:1266
 msgid "Rescore all articles? This operation may take a lot of time."
 msgstr "Esteu segur que voleu recuperar tots els articles? Aquesta operació pot durar molt temps."
 
-#: js/prefs.js:1273
+#: js/prefs.js:1269
 #, fuzzy
 msgid "Rescoring feeds..."
 msgstr "Suppression d'un flux..."
 
-#: js/prefs.js:1289
+#: js/prefs.js:1285
 #, fuzzy
 msgid "Reset selected labels to default colors?"
 msgstr "Esteu segur que voleu canviar els colors de les etiquetes pels colors per defecte?"
 
-#: js/prefs.js:1321
+#: js/prefs.js:1317
 #, fuzzy
 msgid "Settings Profiles"
 msgstr "Crea un filtre"
 
-#: js/prefs.js:1330
+#: js/prefs.js:1326
 msgid "Remove selected profiles? Active and default profiles will not be removed."
 msgstr ""
 
-#: js/prefs.js:1333
+#: js/prefs.js:1329
 #, fuzzy
 msgid "Removing selected profiles..."
 msgstr "S'estan suprimint els filtres seleccionats..."
 
-#: js/prefs.js:1349
+#: js/prefs.js:1345
 #, fuzzy
 msgid "No profiles are selected."
 msgstr "No hi ha cap article seleccionat."
 
-#: js/prefs.js:1357
-#: js/prefs.js:1410
+#: js/prefs.js:1353
+#: js/prefs.js:1406
 #, fuzzy
 msgid "Activate selected profile?"
 msgstr "Esteu segur que voleu suprimir els filtres seleccionats?"
 
-#: js/prefs.js:1374
-#: js/prefs.js:1426
+#: js/prefs.js:1370
+#: js/prefs.js:1422
 #, fuzzy
 msgid "Please choose a profile to activate."
 msgstr "Primerament heu de seleccionar un canal."
 
-#: js/prefs.js:1379
+#: js/prefs.js:1375
 #, fuzzy
 msgid "Creating profile..."
 msgstr "Crea un filtre"
 
-#: js/prefs.js:1434
+#: js/prefs.js:1430
 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr ""
 
-#: js/prefs.js:1444
+#: js/prefs.js:1440
 #, fuzzy
 msgid "Generated URLs cleared."
 msgstr "Canals generats"
 
-#: js/prefs.js:1516
+#: js/prefs.js:1512
 msgid "Label Editor"
 msgstr "Éditeur d'intitulé"
 
-#: js/tt-rss.js:684
+#: js/tt-rss.js:685
 msgid "You can't unsubscribe from the category."
 msgstr "No us podeu donar de baixa de la categoria."
 
-#: js/viewfeed.js:125
-#: js/viewfeed.js:175
-#: js/viewfeed.js:192
+#: js/viewfeed.js:127
+#: js/viewfeed.js:177
+#: js/viewfeed.js:194
 #, fuzzy
 msgid "Click to open next unread feed."
 msgstr "Feu clic per editar"
 
-#: js/viewfeed.js:129
+#: js/viewfeed.js:131
 #, fuzzy
 msgid "Cancel search"
 msgstr "Cancel·la"
 
-#: js/viewfeed.js:189
+#: js/viewfeed.js:191
 #, fuzzy
 msgid "New articles found, reload feed to continue."
 msgstr "No s'han trobat articles per a mostrar."
 
-#: js/viewfeed.js:424
+#: js/viewfeed.js:426
 msgid "Unstar article"
 msgstr "Treu la marca de l'article"
 
-#: js/viewfeed.js:428
+#: js/viewfeed.js:430
 msgid "Star article"
 msgstr "Marca l'article"
 
-#: js/viewfeed.js:478
+#: js/viewfeed.js:480
 msgid "Unpublish article"
 msgstr "Deixa de publicar l'article"
 
-#: js/viewfeed.js:482
+#: js/viewfeed.js:484
 msgid "Publish article"
 msgstr "Publica l'article"
 
-#: js/viewfeed.js:622
+#: js/viewfeed.js:624
 #, fuzzy
 msgid "%d article selected"
 msgid_plural "%d articles selected"
 msgstr[0] "No hi ha cap article seleccionat."
 msgstr[1] "No hi ha cap article seleccionat."
 
-#: js/viewfeed.js:1286
+#: js/viewfeed.js:1288
 msgid "No article is selected."
 msgstr "No hi ha cap article seleccionat."
 
-#: js/viewfeed.js:1321
+#: js/viewfeed.js:1323
 msgid "No articles found to mark"
 msgstr "No s'han trobat articles per a marcar."
 
-#: js/viewfeed.js:1323
+#: js/viewfeed.js:1325
 #, fuzzy
 msgid "Mark %d article as read?"
 msgid_plural "Mark %d articles as read?"
 msgstr[0] "Esteu segur que voleu marcar  %d article(s) com a llegit(s) ?"
 msgstr[1] "Esteu segur que voleu marcar  %d article(s) com a llegit(s) ?"
 
-#~ msgid "Cache images locally"
-#~ msgstr "Emmagatzema les imatges localment"
+#, fuzzy
+#~ msgid "Resubscribe to push updates"
+#~ msgstr "Subscrit als canals:"
+
+#, fuzzy
+#~ msgid "Linked"
+#~ msgstr "Enllaç"
+
+#, fuzzy
+#~ msgid "Access key:"
+#~ msgstr "Nivell d'accés:"
+
+#, fuzzy
+#~ msgid "Access key"
+#~ msgstr "Nivell d'accés"
+
+#, fuzzy
+#~ msgid "Generate new key"
+#~ msgstr "Canals generats"
+
+#, fuzzy
+#~ msgid "Link instance"
+#~ msgstr "Edita les etiquetes"
+
+#, fuzzy
+#~ msgid "Stored feeds"
+#~ msgstr "Més canals"
+
+#, fuzzy
+#~ msgid "Create link"
+#~ msgstr "Crea"
+
+#, fuzzy
+#~ msgid "Subscription reset."
+#~ msgstr "Subscriviu-vos al canal"
+
+#, fuzzy
+#~ msgid "Link Instance"
+#~ msgstr "Edita les etiquetes"
+
+#, fuzzy
+#~ msgid "Edit Instance"
+#~ msgstr "Edita les etiquetes"
+
+#, fuzzy
+#~ msgid "Remove selected instances?"
+#~ msgstr "Esteu segur que voleu suprimir els filtres seleccionats?"
+
+#, fuzzy
+#~ msgid "Removing selected instances..."
+#~ msgstr "S'estan suprimint els filtres seleccionats..."
+
+#, fuzzy
+#~ msgid "No instances are selected."
+#~ msgstr "No heu seleccionat cap filtre."
+
+#, fuzzy
+#~ msgid "Please select only one instance."
+#~ msgstr "Si us plau, seleccioneu només un filtre."
 
 #, fuzzy
 #~ msgid "More..."
diff --git a/locale/cs_CZ/LC_MESSAGES/messages.mo b/locale/cs_CZ/LC_MESSAGES/messages.mo
index 5c0a4d31b..7fa413f9b 100644
--- a/locale/cs_CZ/LC_MESSAGES/messages.mo
+++ b/locale/cs_CZ/LC_MESSAGES/messages.mo
diff --git a/locale/cs_CZ/LC_MESSAGES/messages.po b/locale/cs_CZ/LC_MESSAGES/messages.po
index 3115f3dae..881da60d1 100644
--- a/locale/cs_CZ/LC_MESSAGES/messages.po
+++ b/locale/cs_CZ/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: TT-RSS CZech\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 15:25+0300\n"
+"POT-Creation-Date: 2017-07-04 16:29+0300\n"
 "PO-Revision-Date: 2014-09-09 08:13+0100\n"
 "Last-Translator: Trottel <[email protected]>\n"
 "Language-Team: Czech <[email protected]>\n"
@@ -172,31 +172,30 @@ msgstr "Uživatel nebyl nalezen"
 #: prefs.php:118
 #: classes/backend.php:5
 #: classes/pref/labels.php:282
-#: classes/pref/feeds.php:1402
-#: classes/pref/filters.php:779
+#: classes/pref/filters.php:819
+#: classes/pref/feeds.php:1376
 #: js/feedlist.js:149
-#: js/functions.js:1131
-#: js/functions.js:1231
-#: js/functions.js:1478
+#: js/functions.js:1210
+#: js/functions.js:1457
 #: js/prefs.js:621
-#: js/prefs.js:818
-#: js/prefs.js:1648
-#: js/prefs.js:1663
-#: js/tt-rss.js:550
-#: js/viewfeed.js:1182
+#: js/prefs.js:813
+#: js/prefs.js:1644
+#: js/prefs.js:1659
+#: js/tt-rss.js:551
+#: js/viewfeed.js:1184
 #: plugins/import_export/import_export.js:17
 #: js/feedlist.js:467
-#: js/feedlist.js:512
+#: js/feedlist.js:515
 #: js/functions.js:372
 #: js/functions.js:630
-#: js/prefs.js:1360
-#: js/prefs.js:1413
-#: js/prefs.js:1452
-#: js/prefs.js:1465
-#: js/prefs.js:1476
-#: js/prefs.js:1491
-#: js/tt-rss.js:567
-#: js/viewfeed.js:762
+#: js/prefs.js:1356
+#: js/prefs.js:1409
+#: js/prefs.js:1448
+#: js/prefs.js:1461
+#: js/prefs.js:1472
+#: js/prefs.js:1487
+#: js/tt-rss.js:568
+#: js/viewfeed.js:764
 msgid "Loading, please wait..."
 msgstr "Načítání, čekejte..."
 
@@ -213,13 +212,13 @@ msgid "All Articles"
 msgstr "Všechny články"
 
 #: index.php:192
-#: include/functions2.php:107
+#: include/functions.php:1181
 #: classes/feeds.php:110
 msgid "Starred"
 msgstr "Označeno hvězdičkou"
 
 #: index.php:193
-#: include/functions2.php:108
+#: include/functions.php:1182
 #: classes/feeds.php:111
 msgid "Published"
 msgstr "Publikováno"
@@ -260,7 +259,7 @@ msgstr "Název"
 
 #: index.php:209
 #: index.php:249
-#: include/functions2.php:95
+#: include/functions.php:1169
 #: classes/feeds.php:115
 #: js/FeedTree.js:138
 #: js/FeedTree.js:166
@@ -300,7 +299,7 @@ msgid "Feed actions:"
 msgstr "Akce kanálů:"
 
 #: index.php:244
-#: classes/handler/public.php:672
+#: classes/handler/public.php:583
 msgid "Subscribe to feed..."
 msgstr "Přihlásit se k odběru kanálu..."
 
@@ -314,8 +313,8 @@ msgstr "Přehodnotit kanál"
 
 #: index.php:247
 #: classes/pref/feeds.php:785
-#: classes/pref/feeds.php:1357
-#: js/PrefFeedTree.js:78
+#: classes/pref/feeds.php:1331
+#: js/PrefFeedTree.js:80
 msgid "Unsubscribe"
 msgstr "Odhlásit odběr"
 
@@ -332,7 +331,7 @@ msgid "Other actions:"
 msgstr "Ostatní akce:"
 
 #: index.php:252
-#: include/functions2.php:81
+#: include/functions.php:1155
 msgid "Toggle widescreen mode"
 msgstr "Přepnout širokoúhlý režim"
 
@@ -358,7 +357,7 @@ msgstr ""
 
 #: prefs.php:33
 #: prefs.php:136
-#: include/functions2.php:110
+#: include/functions.php:1184
 #: classes/pref/prefs.php:435
 msgid "Preferences"
 msgstr "Předvolby"
@@ -373,20 +372,19 @@ msgstr "Opustit předvolby"
 
 #: prefs.php:139
 #: classes/pref/feeds.php:112
-#: classes/pref/feeds.php:1297
-#: classes/pref/feeds.php:1346
+#: classes/pref/feeds.php:1271
+#: classes/pref/feeds.php:1320
 msgid "Feeds"
 msgstr "Kanály"
 
 #: prefs.php:142
-#: classes/pref/filters.php:248
+#: classes/pref/filters.php:273
 msgid "Filters"
 msgstr "Filtry"
 
 #: prefs.php:145
-#: include/functions.php:1327
-#: include/functions.php:1979
 #: classes/pref/labels.php:90
+#: classes/feeds.php:1718
 msgid "Labels"
 msgstr "Štítky"
 
@@ -415,13 +413,13 @@ msgstr "Registrace nových uživatelů jsou zakázány správcem."
 #: register.php:337
 #: register.php:347
 #: register.php:359
-#: classes/handler/public.php:742
-#: classes/handler/public.php:813
-#: classes/handler/public.php:911
-#: classes/handler/public.php:990
-#: classes/handler/public.php:1004
-#: classes/handler/public.php:1011
-#: classes/handler/public.php:1036
+#: classes/handler/public.php:653
+#: classes/handler/public.php:724
+#: classes/handler/public.php:822
+#: classes/handler/public.php:901
+#: classes/handler/public.php:915
+#: classes/handler/public.php:922
+#: classes/handler/public.php:947
 msgid "Return to Tiny Tiny RSS"
 msgstr "Zpět do Tiny Tiny RSS"
 
@@ -438,12 +436,12 @@ msgid "Check availability"
 msgstr "Zkontrolovat dostupnost"
 
 #: register.php:229
-#: classes/handler/public.php:829
+#: classes/handler/public.php:740
 msgid "Email:"
 msgstr "E-mail:"
 
 #: register.php:232
-#: classes/handler/public.php:834
+#: classes/handler/public.php:745
 msgid "How much is two plus two:"
 msgstr "Kolik je dva plus dva:"
 
@@ -471,17 +469,23 @@ msgstr "Účet byl úspěšně vytvořen."
 msgid "New user registrations are currently closed."
 msgstr "Registrace nových uživatelů jsou nyní uzavřeny."
 
-#: update.php:67
+#: update.php:66
 msgid "Tiny Tiny RSS data update script."
 msgstr "Skript aktualizace dat Tiny Tiny RSS."
 
-#: include/digest.php:109
-#: include/functions.php:1336
-#: include/functions.php:1880
-#: include/functions.php:1965
-#: include/functions.php:1987
-#: classes/opml.php:421
+#: include/controls.php:83
+#: classes/pref/filters.php:242
+#: classes/pref/filters.php:253
+#: classes/pref/filters.php:544
+msgid "All feeds"
+msgstr "Všechny kanály"
+
+#: include/controls.php:134
+#: include/controls.php:316
 #: classes/pref/feeds.php:228
+#: classes/opml.php:486
+#: classes/feeds.php:1727
+#: classes/digest.php:113
 msgid "Uncategorized"
 msgstr "Bez zařazení"
 
@@ -497,392 +501,287 @@ msgstr[2] "%d archivovaných článků"
 msgid "No feeds found."
 msgstr "Nenalezeny žádné kanály."
 
-#: include/functions.php:1029
+#: include/functions.php:900
 #, php-format
 msgid "%d min"
 msgstr ""
 
-#: include/functions.php:1325
-#: include/functions.php:1977
-msgid "Special"
-msgstr "Speciální"
-
-#: include/functions.php:1828
-#: classes/pref/filters.php:229
-#: classes/pref/filters.php:507
-msgid "All feeds"
-msgstr "Všechny kanály"
-
-#: include/functions.php:2032
-msgid "Starred articles"
-msgstr "Články označené hvězdičkou"
-
-#: include/functions.php:2034
-msgid "Published articles"
-msgstr "Publikované články"
-
-#: include/functions.php:2036
-msgid "Fresh articles"
-msgstr "Nové články"
-
-#: include/functions.php:2038
-#: include/functions2.php:105
-msgid "All articles"
-msgstr "Všechny články"
-
-#: include/functions.php:2040
-msgid "Archived articles"
-msgstr "Archivované články"
-
-#: include/functions.php:2042
-msgid "Recently read"
-msgstr "Nedávno přečtené"
-
-#: include/functions2.php:57
+#: include/functions.php:1131
 msgid "Navigation"
 msgstr "Navigace"
 
-#: include/functions2.php:58
+#: include/functions.php:1132
 msgid "Open next feed"
 msgstr "Otevřít další kanál"
 
-#: include/functions2.php:59
+#: include/functions.php:1133
 msgid "Open previous feed"
 msgstr "Otevřít předchozí kanál"
 
-#: include/functions2.php:60
+#: include/functions.php:1134
 msgid "Open next article"
 msgstr "Otevřít další článek"
 
-#: include/functions2.php:61
+#: include/functions.php:1135
 msgid "Open previous article"
 msgstr "Otevřít předchozí článek"
 
-#: include/functions2.php:62
+#: include/functions.php:1136
 msgid "Open next article (don't scroll long articles)"
 msgstr "Otevřít další článek (neposouvat dlouhé články)"
 
-#: include/functions2.php:63
+#: include/functions.php:1137
 msgid "Open previous article (don't scroll long articles)"
 msgstr "Otevřít předchozí článek (neposouvat dlouhé články)"
 
-#: include/functions2.php:64
+#: include/functions.php:1138
 msgid "Move to next article (don't expand or mark read)"
 msgstr "Přejít na další článek (nerozbalovat ani neoznačovat jako přečtené)"
 
-#: include/functions2.php:65
+#: include/functions.php:1139
 msgid "Move to previous article (don't expand or mark read)"
 msgstr "Přejít na předchozí článek (nerozbalovat ani neoznačovat jako přečtené)"
 
-#: include/functions2.php:66
+#: include/functions.php:1140
 msgid "Show search dialog"
 msgstr "Zobrazit dialogové okno hledání"
 
-#: include/functions2.php:67
+#: include/functions.php:1141
 msgid "Article"
 msgstr "Článek"
 
-#: include/functions2.php:68
-#: js/viewfeed.js:1699
+#: include/functions.php:1142
+#: js/viewfeed.js:1701
 msgid "Toggle starred"
 msgstr "Přepnout označeno hvězdičkou"
 
-#: include/functions2.php:69
-#: js/viewfeed.js:1711
+#: include/functions.php:1143
+#: js/viewfeed.js:1713
 msgid "Toggle published"
 msgstr "Přepnout publikováno"
 
-#: include/functions2.php:70
-#: js/viewfeed.js:1686
+#: include/functions.php:1144
+#: js/viewfeed.js:1688
 msgid "Toggle unread"
 msgstr "Přepnout nepřečteno"
 
-#: include/functions2.php:71
+#: include/functions.php:1145
 msgid "Edit tags"
 msgstr "Upravit značky"
 
-#: include/functions2.php:72
+#: include/functions.php:1146
 msgid "Open in new window"
 msgstr "Otevřít v novém okně"
 
-#: include/functions2.php:73
-#: js/viewfeed.js:1732
+#: include/functions.php:1147
+#: js/viewfeed.js:1734
 msgid "Mark below as read"
 msgstr "Označit pod jako přečtené"
 
-#: include/functions2.php:74
-#: js/viewfeed.js:1725
+#: include/functions.php:1148
+#: js/viewfeed.js:1727
 msgid "Mark above as read"
 msgstr "Označit nad jako přečtené"
 
-#: include/functions2.php:75
+#: include/functions.php:1149
 msgid "Scroll down"
 msgstr "Posunout dolů"
 
-#: include/functions2.php:76
+#: include/functions.php:1150
 msgid "Scroll up"
 msgstr "Posunout nahoru"
 
-#: include/functions2.php:77
+#: include/functions.php:1151
 msgid "Select article under cursor"
 msgstr "Vybrat článek pod kurzorem"
 
-#: include/functions2.php:78
+#: include/functions.php:1152
 msgid "Email article"
 msgstr "Odeslat článek e-mailem"
 
-#: include/functions2.php:79
+#: include/functions.php:1153
 msgid "Close/collapse article"
 msgstr "Zavřít nebo sbalit článek"
 
-#: include/functions2.php:80
+#: include/functions.php:1154
 msgid "Toggle article expansion (combined mode)"
 msgstr "Přepnout rozbalení článku (kombinovaný režim)"
 
-#: include/functions2.php:82
+#: include/functions.php:1156
 #: plugins/embed_original/init.php:31
 msgid "Toggle embed original"
 msgstr "Přepnout vložen originál"
 
-#: include/functions2.php:83
+#: include/functions.php:1157
 msgid "Article selection"
 msgstr "Výběr článků"
 
-#: include/functions2.php:84
+#: include/functions.php:1158
 msgid "Select all articles"
 msgstr "Vybrat všechny články"
 
-#: include/functions2.php:85
+#: include/functions.php:1159
 msgid "Select unread"
 msgstr "Vybrat nepřečtené"
 
-#: include/functions2.php:86
+#: include/functions.php:1160
 msgid "Select starred"
 msgstr "Vybrat označené hvězdičkou"
 
-#: include/functions2.php:87
+#: include/functions.php:1161
 msgid "Select published"
 msgstr "Vybrat publikované"
 
-#: include/functions2.php:88
+#: include/functions.php:1162
 msgid "Invert selection"
 msgstr "Invertovat výběr"
 
-#: include/functions2.php:89
+#: include/functions.php:1163
 msgid "Deselect everything"
 msgstr "Zrušit výběr všeho"
 
-#: include/functions2.php:90
+#: include/functions.php:1164
 #: classes/pref/feeds.php:555
-#: classes/pref/feeds.php:823
+#: classes/pref/feeds.php:811
 msgid "Feed"
 msgstr "Kanál"
 
-#: include/functions2.php:91
+#: include/functions.php:1165
 msgid "Refresh current feed"
 msgstr "Obnovit aktuální kanál"
 
-#: include/functions2.php:92
+#: include/functions.php:1166
 msgid "Un/hide read feeds"
 msgstr "Zobrazit nebo skrýt přečtené kanály"
 
-#: include/functions2.php:93
-#: classes/pref/feeds.php:1349
+#: include/functions.php:1167
+#: classes/pref/feeds.php:1323
 msgid "Subscribe to feed"
 msgstr "Přihlásit se k odběru kanálu"
 
-#: include/functions2.php:94
+#: include/functions.php:1168
 #: js/FeedTree.js:145
-#: js/PrefFeedTree.js:72
-#: js/viewfeed.js:1853
+#: js/PrefFeedTree.js:74
+#: js/viewfeed.js:1855
 msgid "Edit feed"
 msgstr "Upravit kanál"
 
-#: include/functions2.php:96
+#: include/functions.php:1170
 msgid "Reverse headlines"
 msgstr "Obrácené pořadí nadpisů"
 
-#: include/functions2.php:97
+#: include/functions.php:1171
 msgid "Toggle headline grouping"
 msgstr ""
 
-#: include/functions2.php:98
+#: include/functions.php:1172
 msgid "Debug feed update"
 msgstr "Ladit aktualizaci kanálů"
 
-#: include/functions2.php:99
+#: include/functions.php:1173
 #, fuzzy
 msgid "Debug viewfeed()"
 msgstr "Ladit aktualizaci kanálů"
 
-#: include/functions2.php:100
+#: include/functions.php:1174
 #: js/FeedTree.js:194
 msgid "Mark all feeds as read"
 msgstr "Označit všechny kanály jako přečtené"
 
-#: include/functions2.php:101
+#: include/functions.php:1175
 msgid "Un/collapse current category"
 msgstr "Rozbalit nebo sbalit aktuální kategorii"
 
-#: include/functions2.php:102
+#: include/functions.php:1176
 msgid "Toggle combined mode"
 msgstr "Přepnout kombinovaný režim"
 
-#: include/functions2.php:103
+#: include/functions.php:1177
 msgid "Toggle auto expand in combined mode"
 msgstr "Přepnout automatické rozbalení v kombinovaném režimu"
 
-#: include/functions2.php:104
+#: include/functions.php:1178
 msgid "Go to"
 msgstr "Přejít na"
 
-#: include/functions2.php:106
+#: include/functions.php:1179
+#: classes/feeds.php:1602
+msgid "All articles"
+msgstr "Všechny články"
+
+#: include/functions.php:1180
 msgid "Fresh"
 msgstr "Nové"
 
-#: include/functions2.php:109
-#: js/tt-rss.js:494
-#: js/tt-rss.js:663
+#: include/functions.php:1183
+#: js/tt-rss.js:495
+#: js/tt-rss.js:664
 msgid "Tag cloud"
 msgstr "Seznam značek"
 
-#: include/functions2.php:111
+#: include/functions.php:1185
 msgid "Other"
 msgstr "Ostatní"
 
-#: include/functions2.php:112
+#: include/functions.php:1186
 #: classes/pref/labels.php:267
 msgid "Create label"
 msgstr "Vytvořit štítek"
 
-#: include/functions2.php:113
-#: classes/pref/filters.php:753
+#: include/functions.php:1187
+#: classes/pref/filters.php:793
 msgid "Create filter"
 msgstr "Vytvořit filtr"
 
-#: include/functions2.php:114
+#: include/functions.php:1188
 msgid "Un/collapse sidebar"
 msgstr "Rozbalit nebo sbalit postranní panel"
 
-#: include/functions2.php:115
+#: include/functions.php:1189
 msgid "Show help dialog"
 msgstr "Zobrazit dialogové okno nápovědy"
 
-#: include/functions2.php:670
-#, php-format
-msgid "Search results: %s"
-msgstr "Výsledky hledání: %s"
-
-#: include/functions2.php:1336
-#: classes/feeds.php:752
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] "komentář"
-msgstr[1] "komentáře"
-msgstr[2] "komentáře"
-
-#: include/functions2.php:1340
-#: classes/feeds.php:756
-msgid "comments"
-msgstr "komentáře"
-
-#: include/functions2.php:1366
-msgid " - "
-msgstr " - "
-
-#: include/functions2.php:1397
-#: include/functions2.php:1648
-#: classes/article.php:311
-msgid "no tags"
-msgstr "žádné značky"
-
-#: include/functions2.php:1407
-#: classes/feeds.php:738
-msgid "Edit tags for this article"
-msgstr "Upravit značky pro tento článek"
-
-#: include/functions2.php:1439
-#: classes/feeds.php:690
-msgid "Originally from:"
-msgstr "Původně z:"
-
-#: include/functions2.php:1452
-#: classes/pref/feeds.php:574
-#: classes/feeds.php:703
-msgid "Feed URL"
-msgstr "URL kanálu"
-
-#: include/functions2.php:1489
-#: classes/backend.php:105
-#: classes/dlg.php:37
-#: classes/dlg.php:60
-#: classes/dlg.php:93
-#: classes/dlg.php:159
-#: classes/dlg.php:186
-#: classes/pref/feeds.php:1652
-#: classes/pref/feeds.php:1718
-#: classes/pref/filters.php:204
-#: classes/pref/prefs.php:1097
-#: plugins/af_psql_trgm/init.php:102
-#: plugins/import_export/init.php:415
-#: plugins/import_export/init.php:461
-#: plugins/share/init.php:121
-msgid "Close this window"
-msgstr "Zavřít toto okno"
-
-#: include/functions2.php:1686
-msgid "(edit note)"
-msgstr "(upravit poznámku)"
-
-#: include/functions2.php:1960
-msgid "unknown type"
-msgstr "neznámý typ"
-
-#: include/functions2.php:2037
-msgid "Attachments"
-msgstr "Přílohy"
-
-#: include/functions2.php:2496
+#: include/functions.php:2456
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: include/functions2.php:2497
+#: include/functions.php:2457
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: include/functions2.php:2498
+#: include/functions.php:2458
 msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
 msgstr ""
 
-#: include/functions2.php:2499
+#: include/functions.php:2459
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: include/functions2.php:2500
+#: include/functions.php:2460
 #, fuzzy
 msgid "No file was uploaded"
 msgstr "Nebyl nahrán žádný soubor."
 
-#: include/functions2.php:2501
+#: include/functions.php:2461
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: include/functions2.php:2502
+#: include/functions.php:2462
 msgid "Failed to write file to disk."
 msgstr ""
 
-#: include/functions2.php:2503
+#: include/functions.php:2463
 msgid "A PHP extension stopped the file upload."
 msgstr ""
 
 #: include/login_form.php:197
-#: classes/handler/public.php:569
-#: classes/handler/public.php:824
+#: classes/handler/public.php:480
+#: classes/handler/public.php:735
 msgid "Login:"
 msgstr "Přihlášení:"
 
 #: include/login_form.php:207
-#: classes/handler/public.php:572
+#: classes/handler/public.php:483
 msgid "Password:"
 msgstr "Heslo:"
 
@@ -895,7 +794,7 @@ msgid "Profile:"
 msgstr "Profil:"
 
 #: include/login_form.php:223
-#: classes/handler/public.php:311
+#: classes/handler/public.php:287
 #: classes/pref/prefs.php:1035
 #: classes/rpc.php:63
 msgid "Default profile"
@@ -914,7 +813,7 @@ msgid "Remember me"
 msgstr "Zapamatovat si mě"
 
 #: include/login_form.php:249
-#: classes/handler/public.php:577
+#: classes/handler/public.php:488
 msgid "Log in"
 msgstr "Přihlásit se"
 
@@ -930,145 +829,44 @@ msgstr "Nepodařilo se ověřit relaci (uživatel nebyl nalezen)"
 msgid "Session failed to validate (password changed)"
 msgstr "Nepodařilo se ověřit relaci (změnilo se heslo)"
 
-#: classes/article.php:25
-msgid "Article not found."
-msgstr "Článek nenalezen."
-
-#: classes/article.php:197
-msgid "Tags for this article (separated by commas):"
-msgstr "Značky pro tento článek (oddělené čárkami):"
-
-#: classes/article.php:222
-#: classes/pref/labels.php:79
-#: classes/pref/users.php:98
-#: classes/pref/feeds.php:801
-#: classes/pref/feeds.php:943
-#: classes/pref/filters.php:485
-#: classes/pref/prefs.php:981
-#: plugins/instances/init.php:245
-#: plugins/nsfw/init.php:85
-#: plugins/note/init.php:51
-#: plugins/af_readability/init.php:68
-#: plugins/af_redditimgur/init.php:60
-#: plugins/af_psql_trgm/init.php:181
-#: plugins/mail/init.php:64
-#: plugins/af_zz_imgproxy/init.php:213
-msgid "Save"
-msgstr "Uložit"
-
-#: classes/article.php:224
-#: classes/handler/public.php:546
-#: classes/handler/public.php:580
-#: classes/pref/labels.php:81
-#: classes/pref/users.php:100
-#: classes/pref/feeds.php:802
-#: classes/pref/feeds.php:946
-#: classes/pref/feeds.php:1859
-#: classes/pref/filters.php:488
-#: classes/pref/filters.php:902
-#: classes/pref/filters.php:983
-#: classes/pref/filters.php:1076
-#: classes/pref/prefs.php:983
-#: classes/feeds.php:1105
-#: classes/feeds.php:1155
-#: classes/feeds.php:1192
-#: plugins/instances/init.php:248
-#: plugins/instances/init.php:436
-#: plugins/note/init.php:53
-#: plugins/mail/init.php:173
-msgid "Cancel"
-msgstr "Zrušit"
-
-#: classes/opml.php:28
-#: classes/opml.php:33
-msgid "OPML Utility"
-msgstr "Nástroj OPML"
-
-#: classes/opml.php:37
-msgid "Importing OPML..."
-msgstr "Importování OPML..."
-
-#: classes/opml.php:41
-msgid "Return to preferences"
-msgstr "Zpět do předvoleb"
-
-#: classes/opml.php:271
-#, php-format
-msgid "Adding feed: %s"
-msgstr "Přidávání kanálu: %s"
-
-#: classes/opml.php:282
-#, php-format
-msgid "Duplicate feed: %s"
-msgstr "Duplicitní kanál: %s"
-
-#: classes/opml.php:296
-#, php-format
-msgid "Adding label %s"
-msgstr "Přidávání štítku %s"
-
-#: classes/opml.php:299
-#, php-format
-msgid "Duplicate label: %s"
-msgstr "Duplicitní štítek: %s"
-
-#: classes/opml.php:311
-#, php-format
-msgid "Setting preference key %s to %s"
-msgstr "Nastavení klíče předvoleb %s na %s"
-
-#: classes/opml.php:343
-msgid "Adding filter..."
-msgstr "Přidávání filtru..."
-
-#: classes/opml.php:421
-#, php-format
-msgid "Processing category: %s"
-msgstr "Zpracovávání kategorie: %s"
-
-#: classes/opml.php:470
-#, php-format
-msgid "Upload failed with error code %d"
-msgstr "Nahrávání selhalo s kódem chyby %d"
-
-#: classes/opml.php:484
-#: plugins/import_export/init.php:442
-msgid "Unable to move uploaded file."
-msgstr "Nelze přesunout nahraný soubor."
-
-#: classes/opml.php:488
-#: plugins/import_export/init.php:446
-msgid "Error: please upload OPML file."
-msgstr "Chyba: nahrajte soubor OPML."
-
-#: classes/opml.php:499
-msgid "Error: unable to find moved OPML file."
-msgstr "Chyba: nelze nalézt přesunutý soubor OPML."
-
-#: classes/opml.php:506
-msgid "Error while parsing document."
-msgstr "Chyba při zpracování dokumentu."
-
-#: classes/backend.php:33
+#: classes/backend.php:31
 msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
 msgstr "Další tipy k používání rozhraní jsou dostupné ve wiki Tiny Tiny RSS."
 
-#: classes/backend.php:38
+#: classes/backend.php:36
 msgid "Keyboard Shortcuts"
 msgstr "Klávesové zkratky"
 
-#: classes/backend.php:61
+#: classes/backend.php:59
 msgid "Shift"
 msgstr "Shift"
 
-#: classes/backend.php:64
+#: classes/backend.php:62
 msgid "Ctrl"
 msgstr "Ctrl"
 
-#: classes/backend.php:99
+#: classes/backend.php:97
 msgid "Help topic not found."
 msgstr "Téma nápovědy nenalezeno."
 
+#: classes/backend.php:103
+#: classes/dlg.php:37
+#: classes/dlg.php:60
+#: classes/dlg.php:93
+#: classes/dlg.php:159
+#: classes/dlg.php:186
+#: classes/article.php:744
+#: classes/pref/filters.php:206
+#: classes/pref/prefs.php:1097
+#: classes/pref/feeds.php:1626
+#: classes/pref/feeds.php:1692
+#: plugins/import_export/init.php:421
+#: plugins/import_export/init.php:467
+#: plugins/af_psql_trgm/init.php:102
+#: plugins/share/init.php:120
+msgid "Close this window"
+msgstr "Zavřít toto okno"
+
 #: classes/dlg.php:17
 msgid "If you have imported labels and/or filters, you might need to reload preferences to see your new data."
 msgstr "Pokud jste importovali štítky a/nebo filtry, budete možná muset znovu načíst předvolby pro zobrazení nových dat."
@@ -1079,7 +877,7 @@ msgstr "Vaše veřejná URL OPML je:"
 
 #: classes/dlg.php:57
 #: classes/dlg.php:183
-#: plugins/share/init.php:118
+#: plugins/share/init.php:117
 msgid "Generate new URL"
 msgstr "Generovat novou URL"
 
@@ -1100,128 +898,223 @@ msgstr "Démonu aktualizací trvá příliš dlouho provedení aktualizace kaná
 msgid "You can view this feed as RSS using the following URL:"
 msgstr "Můžete zobrazit tento kanál jako RSS pomocí následující URL:"
 
-#: classes/handler/public.php:510
+#: classes/article.php:25
+msgid "Article not found."
+msgstr "Článek nenalezen."
+
+#: classes/article.php:197
+msgid "Tags for this article (separated by commas):"
+msgstr "Značky pro tento článek (oddělené čárkami):"
+
+#: classes/article.php:222
+#: classes/pref/labels.php:79
+#: classes/pref/filters.php:519
+#: classes/pref/users.php:98
+#: classes/pref/prefs.php:981
+#: classes/pref/feeds.php:789
+#: classes/pref/feeds.php:931
+#: plugins/af_psql_trgm/init.php:181
+#: plugins/nsfw/init.php:85
+#: plugins/af_readability/init.php:68
+#: plugins/mail/init.php:64
+#: plugins/af_redditimgur/init.php:60
+#: plugins/note/init.php:51
+#: plugins/af_zz_imgproxy/init.php:240
+msgid "Save"
+msgstr "Uložit"
+
+#: classes/article.php:224
+#: classes/handler/public.php:457
+#: classes/handler/public.php:491
+#: classes/pref/labels.php:81
+#: classes/pref/filters.php:522
+#: classes/pref/filters.php:942
+#: classes/pref/filters.php:1022
+#: classes/pref/filters.php:1115
+#: classes/pref/users.php:100
+#: classes/pref/prefs.php:983
+#: classes/pref/feeds.php:790
+#: classes/pref/feeds.php:934
+#: classes/pref/feeds.php:1833
+#: classes/feeds.php:1098
+#: classes/feeds.php:1148
+#: classes/feeds.php:1185
+#: plugins/mail/init.php:173
+#: plugins/note/init.php:53
+msgid "Cancel"
+msgstr "Zrušit"
+
+#: classes/article.php:311
+#: classes/article.php:652
+#: classes/article.php:805
+msgid "no tags"
+msgstr "žádné značky"
+
+#: classes/article.php:419
+msgid "unknown type"
+msgstr "neznámý typ"
+
+#: classes/article.php:496
+msgid "Attachments"
+msgstr "Přílohy"
+
+#: classes/article.php:591
+#: classes/feeds.php:741
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] "komentář"
+msgstr[1] "komentáře"
+msgstr[2] "komentáře"
+
+#: classes/article.php:595
+#: classes/feeds.php:745
+msgid "comments"
+msgstr "komentáře"
+
+#: classes/article.php:621
+msgid " - "
+msgstr " - "
+
+#: classes/article.php:662
+#: classes/feeds.php:727
+msgid "Edit tags for this article"
+msgstr "Upravit značky pro tento článek"
+
+#: classes/article.php:694
+#: classes/feeds.php:681
+msgid "Originally from:"
+msgstr "Původně z:"
+
+#: classes/article.php:707
+#: classes/pref/feeds.php:574
+#: classes/feeds.php:694
+msgid "Feed URL"
+msgstr "URL kanálu"
+
+#: classes/article.php:843
+msgid "(edit note)"
+msgstr "(upravit poznámku)"
+
+#: classes/handler/public.php:421
 #: plugins/bookmarklets/init.php:40
 msgid "Share with Tiny Tiny RSS"
 msgstr "Sdílet s Tiny Tiny RSS"
 
-#: classes/handler/public.php:518
+#: classes/handler/public.php:429
 msgid "Title:"
 msgstr "Název:"
 
-#: classes/handler/public.php:520
+#: classes/handler/public.php:431
 #: classes/pref/feeds.php:572
-#: plugins/instances/init.php:212
-#: plugins/instances/init.php:401
 msgid "URL:"
 msgstr "URL:"
 
-#: classes/handler/public.php:522
+#: classes/handler/public.php:433
 msgid "Content:"
 msgstr "Obsah:"
 
-#: classes/handler/public.php:524
+#: classes/handler/public.php:435
 msgid "Labels:"
 msgstr "Štítky:"
 
-#: classes/handler/public.php:543
+#: classes/handler/public.php:454
 msgid "Shared article will appear in the Published feed."
 msgstr "Sdílený článek se objeví v kanálu Publikováno."
 
-#: classes/handler/public.php:545
+#: classes/handler/public.php:456
 msgid "Share"
 msgstr "Sdílet"
 
-#: classes/handler/public.php:567
+#: classes/handler/public.php:478
 msgid "Not logged in"
 msgstr "Nepřihlášený"
 
-#: classes/handler/public.php:626
+#: classes/handler/public.php:537
 msgid "Incorrect username or password"
 msgstr "Nesprávné uživatelské jméno nebo heslo"
 
-#: classes/handler/public.php:678
+#: classes/handler/public.php:589
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "Již odebíráte <b>%s</b>."
 
-#: classes/handler/public.php:681
+#: classes/handler/public.php:592
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "Přihlášen k odběru <b>%s</b>."
 
-#: classes/handler/public.php:684
+#: classes/handler/public.php:595
 #, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "Nelze se přihlásit k odběru <b>%s</b>."
 
-#: classes/handler/public.php:687
+#: classes/handler/public.php:598
 #, php-format
 msgid "No feeds found in <b>%s</b>."
 msgstr "Nenalezeny žádné kanály v <b>%s</b>."
 
-#: classes/handler/public.php:690
+#: classes/handler/public.php:601
 msgid "Multiple feed URLs found."
 msgstr "Nalezeno více URL kanálů."
 
-#: classes/handler/public.php:694
+#: classes/handler/public.php:605
 #, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr "Nelze se přihlásit k odběru <b>%s</b>.<br>Nelze stáhnout URL kanálu."
 
-#: classes/handler/public.php:712
+#: classes/handler/public.php:623
 msgid "Subscribe to selected feed"
 msgstr "Přihlásit se k odběru vybraného kanálu"
 
-#: classes/handler/public.php:737
+#: classes/handler/public.php:648
 msgid "Edit subscription options"
 msgstr "Upravit volby odebírání"
 
-#: classes/handler/public.php:774
+#: classes/handler/public.php:685
 msgid "Password recovery"
 msgstr "Obnovení hesla"
 
-#: classes/handler/public.php:817
+#: classes/handler/public.php:728
 msgid "You will need to provide valid account name and email. A password reset link will be sent to your email address."
 msgstr "Budete muset zadat platný název a e-mailovou adresu účtu. Odkaz na obnovení hesla bude zaslán na vaši e-mailovou adresu."
 
-#: classes/handler/public.php:839
-#: classes/pref/users.php:350
+#: classes/handler/public.php:750
+#: classes/pref/users.php:349
 msgid "Reset password"
 msgstr "Obnovit heslo"
 
-#: classes/handler/public.php:849
+#: classes/handler/public.php:760
 msgid "Some of the required form parameters are missing or incorrect."
 msgstr "Některé z požadovaných parametrů formuláře chybí nebo jsou nesprávné."
 
-#: classes/handler/public.php:853
-#: classes/handler/public.php:919
+#: classes/handler/public.php:764
+#: classes/handler/public.php:830
 msgid "Go back"
 msgstr "Jít zpět"
 
-#: classes/handler/public.php:890
+#: classes/handler/public.php:801
 msgid "[tt-rss] Password reset request"
 msgstr "[tt-rss] Vyžadováno obnovení hesla"
 
-#: classes/handler/public.php:915
+#: classes/handler/public.php:826
 msgid "Sorry, login and email combination not found."
 msgstr "Bohužel, kombinace přihlašovacího jména a e-mailu nebyla nalezena."
 
-#: classes/handler/public.php:937
+#: classes/handler/public.php:848
 msgid "Your access level is insufficient to run this script."
 msgstr "Nemáte dostatečnou úroveň přístupu pro spuštění tohoto skriptu."
 
-#: classes/handler/public.php:963
+#: classes/handler/public.php:874
 msgid "Database Updater"
 msgstr "Aktualizační nástroj databáze"
 
-#: classes/handler/public.php:1028
+#: classes/handler/public.php:939
 msgid "Perform updates"
 msgstr "Provést aktualizace"
 
 #: classes/pref/labels.php:22
-#: classes/pref/filters.php:348
-#: classes/pref/filters.php:823
+#: classes/pref/filters.php:373
+#: classes/pref/filters.php:863
 msgid "Caption"
 msgstr "Titulek"
 
@@ -1243,59 +1136,55 @@ msgid "Created label <b>%s</b>"
 msgstr "Vytvořen štítek <b>%s</b>"
 
 #: classes/pref/labels.php:258
-#: classes/pref/users.php:334
-#: classes/pref/feeds.php:1337
-#: classes/pref/feeds.php:1600
-#: classes/pref/feeds.php:1664
-#: classes/pref/filters.php:359
-#: classes/pref/filters.php:407
-#: classes/pref/filters.php:744
-#: classes/pref/filters.php:832
-#: classes/pref/filters.php:859
+#: classes/pref/filters.php:384
+#: classes/pref/filters.php:441
+#: classes/pref/filters.php:784
+#: classes/pref/filters.php:872
+#: classes/pref/filters.php:899
+#: classes/pref/users.php:333
 #: classes/pref/prefs.php:992
-#: plugins/instances/init.php:284
+#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1574
+#: classes/pref/feeds.php:1638
 msgid "Select"
 msgstr "Vybrat"
 
 #: classes/pref/labels.php:261
-#: classes/pref/users.php:337
-#: classes/pref/feeds.php:1340
-#: classes/pref/feeds.php:1603
-#: classes/pref/feeds.php:1667
-#: classes/pref/filters.php:362
-#: classes/pref/filters.php:410
-#: classes/pref/filters.php:747
-#: classes/pref/filters.php:835
-#: classes/pref/filters.php:862
+#: classes/pref/filters.php:387
+#: classes/pref/filters.php:444
+#: classes/pref/filters.php:787
+#: classes/pref/filters.php:875
+#: classes/pref/filters.php:902
+#: classes/pref/users.php:336
 #: classes/pref/prefs.php:995
+#: classes/pref/feeds.php:1314
+#: classes/pref/feeds.php:1577
+#: classes/pref/feeds.php:1641
 #: classes/feeds.php:102
-#: plugins/instances/init.php:287
 msgid "All"
 msgstr "Vše"
 
 #: classes/pref/labels.php:263
-#: classes/pref/users.php:339
-#: classes/pref/feeds.php:1342
-#: classes/pref/feeds.php:1605
-#: classes/pref/feeds.php:1669
-#: classes/pref/filters.php:364
-#: classes/pref/filters.php:412
-#: classes/pref/filters.php:749
-#: classes/pref/filters.php:837
-#: classes/pref/filters.php:864
+#: classes/pref/filters.php:389
+#: classes/pref/filters.php:446
+#: classes/pref/filters.php:789
+#: classes/pref/filters.php:877
+#: classes/pref/filters.php:904
+#: classes/pref/users.php:338
 #: classes/pref/prefs.php:997
+#: classes/pref/feeds.php:1316
+#: classes/pref/feeds.php:1579
+#: classes/pref/feeds.php:1643
 #: classes/feeds.php:105
-#: plugins/instances/init.php:289
 msgid "None"
 msgstr "Žádný"
 
 #: classes/pref/labels.php:270
-#: classes/pref/users.php:348
+#: classes/pref/filters.php:512
+#: classes/pref/filters.php:806
+#: classes/pref/users.php:347
 #: classes/pref/feeds.php:767
-#: classes/pref/filters.php:478
-#: classes/pref/filters.php:766
-#: classes/feeds.php:1154
-#: plugins/instances/init.php:294
+#: classes/feeds.php:1147
 msgid "Remove"
 msgstr "Odebrat"
 
@@ -1303,9 +1192,172 @@ msgstr "Odebrat"
 msgid "Clear colors"
 msgstr "Vymazat barvy"
 
+#: classes/pref/filters.php:153
+#, fuzzy
+msgid "Preview article"
+msgstr "Nové články"
+
+#: classes/pref/filters.php:264
+#: classes/pref/filters.php:558
+msgid "(inverse)"
+msgstr "(inverzní)"
+
+#: classes/pref/filters.php:260
+#: classes/pref/filters.php:557
+#, php-format
+msgid "%s on %s in %s %s"
+msgstr "%s na %s v %s %s"
+
+#: classes/pref/filters.php:379
+#: classes/pref/filters.php:867
+#: classes/pref/filters.php:981
+msgid "Match"
+msgstr "Odpovídá"
+
+#: classes/pref/filters.php:393
+#: classes/pref/filters.php:450
+#: classes/pref/filters.php:881
+#: classes/pref/filters.php:908
+msgid "Add"
+msgstr "Přidat"
+
+#: classes/pref/filters.php:396
+#: classes/pref/filters.php:453
+#: classes/pref/filters.php:884
+#: classes/pref/filters.php:911
+#: classes/feeds.php:122
+msgid "Delete"
+msgstr "Odstranit"
+
+#: classes/pref/filters.php:436
+#: classes/pref/filters.php:894
+msgid "Apply actions"
+msgstr "Použít akce"
+
+#: classes/pref/filters.php:486
+#: classes/pref/filters.php:923
+msgid "Enabled"
+msgstr "Povoleno"
+
+#: classes/pref/filters.php:495
+#: classes/pref/filters.php:926
+msgid "Match any rule"
+msgstr "Odpovídá jakémukoliv pravidlu"
+
+#: classes/pref/filters.php:504
+#: classes/pref/filters.php:929
+msgid "Inverse matching"
+msgstr "Inverzní porovnání"
+
+#: classes/pref/filters.php:516
+#: classes/pref/filters.php:936
+msgid "Test"
+msgstr "Test"
+
+#: classes/pref/filters.php:780
+#: classes/pref/users.php:323
+#: classes/pref/feeds.php:1307
+#: classes/feeds.php:1118
+#: classes/feeds.php:1184
+#: js/tt-rss.js:165
+msgid "Search"
+msgstr "Hledat"
+
+#: classes/pref/filters.php:796
+msgid "Combine"
+msgstr "Kombinovat"
+
+#: classes/pref/filters.php:799
+#: classes/pref/users.php:345
+msgid "Edit"
+msgstr "Upravit"
+
+#: classes/pref/filters.php:802
+#: classes/pref/feeds.php:1327
+#: classes/pref/feeds.php:1341
+msgid "Reset sort order"
+msgstr "Obnovit pořadí řazení"
+
+#: classes/pref/filters.php:810
+#: classes/pref/feeds.php:1363
+msgid "Rescore articles"
+msgstr "Přehodnotit články"
+
+#: classes/pref/filters.php:939
+msgid "Create"
+msgstr "Vytvořit"
+
+#: classes/pref/filters.php:993
+msgid "Inverse regular expression matching"
+msgstr "Inverzní porovnání regulárního výrazu"
+
+#: classes/pref/filters.php:995
+msgid "on field"
+msgstr "pole"
+
+#: classes/pref/filters.php:1001
+#: js/PrefFilterTree.js:64
+msgid "in"
+msgstr "v"
+
+#: classes/pref/filters.php:1014
+msgid "Wiki: Filters"
+msgstr "Wiki: Filtry"
+
+#: classes/pref/filters.php:1019
+msgid "Save rule"
+msgstr "Uložit pravidlo"
+
+#: classes/pref/filters.php:1019
+#: js/functions.js:865
+msgid "Add rule"
+msgstr "Přidat pravidlo"
+
+#: classes/pref/filters.php:1042
+msgid "Perform Action"
+msgstr "Provést akci"
+
+#: classes/pref/filters.php:1093
+#, fuzzy
+msgid "No actions available"
+msgstr "Je dostupná nová verze!"
+
+#: classes/pref/filters.php:1112
+msgid "Save action"
+msgstr "Uložit akci"
+
+#: classes/pref/filters.php:1112
+#: js/functions.js:887
+msgid "Add action"
+msgstr "Přidat akci"
+
+#: classes/pref/filters.php:1136
+msgid "[No caption]"
+msgstr "[Bez titulku]"
+
+#: classes/pref/filters.php:1138
+#, php-format
+msgid "%s (%d rule)"
+msgid_plural "%s (%d rules)"
+msgstr[0] "%s (%d pravidlo)"
+msgstr[1] "%s (%d pravidla)"
+msgstr[2] "%s (%d pravidel)"
+
+#: classes/pref/filters.php:1153
+#, fuzzy
+msgid "matches any rule"
+msgstr "Odpovídá jakémukoliv pravidlu"
+
+#: classes/pref/filters.php:1156
+#, php-format
+msgid "%s (+%d action)"
+msgid_plural "%s (+%d actions)"
+msgstr[0] "%s (+ %d akce)"
+msgstr[1] "%s (+ %d akce)"
+msgstr[2] "%s (+ %d akcí)"
+
 #: classes/pref/users.php:6
 #: classes/pref/system.php:8
-#: plugins/instances/init.php:154
 msgid "Your access level is insufficient to open this tab."
 msgstr "Nemáte dostatečnou úroveň přístupu pro otevření této záložky."
 
@@ -1316,8 +1368,8 @@ msgstr "Upravit pravidlo"
 
 #: classes/pref/users.php:56
 #: classes/pref/feeds.php:637
-#: classes/pref/feeds.php:878
-#: classes/feeds.php:1075
+#: classes/pref/feeds.php:866
+#: classes/feeds.php:1068
 msgid "Authentication"
 msgstr "Ověření"
 
@@ -1327,7 +1379,7 @@ msgstr "Úroveň přístupu: "
 
 #: classes/pref/users.php:77
 #: classes/pref/feeds.php:667
-#: classes/pref/feeds.php:896
+#: classes/pref/feeds.php:884
 msgid "Options"
 msgstr "Volby"
 
@@ -1341,7 +1393,7 @@ msgid "User not found"
 msgstr "Uživatel nebyl nalezen"
 
 #: classes/pref/users.php:132
-#: classes/pref/users.php:400
+#: classes/pref/users.php:399
 msgid "Registered"
 msgstr "Registrován"
 
@@ -1359,7 +1411,7 @@ msgid "Stored articles"
 msgstr "Články označené hvězdičkou"
 
 #: classes/pref/users.php:145
-#: classes/pref/users.php:399
+#: classes/pref/users.php:398
 msgid "Subscribed feeds"
 msgstr "Odebírané kanály"
 
@@ -1378,509 +1430,57 @@ msgstr "Nelze vytvořit uživatele <b>%s</b>"
 msgid "User <b>%s</b> already exists."
 msgstr "Uživatel <b>%s</b> již existuje."
 
-#: classes/pref/users.php:265
+#: classes/pref/users.php:264
 #, php-format
 msgid "Changed password of user <b>%s</b> to <b>%s</b>"
 msgstr "Změněno heslo uživatele <b>%s</b> na <b>%s</b>"
 
-#: classes/pref/users.php:267
+#: classes/pref/users.php:266
 #, php-format
 msgid "Sending new password of user <b>%s</b> to <b>%s</b>"
 msgstr "Odesílání nového hesla uživatele <b>%s</b> na <b>%s</b>"
 
-#: classes/pref/users.php:291
+#: classes/pref/users.php:290
 msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] Oznámení o změně hesla"
 
-#: classes/pref/users.php:324
-#: classes/pref/feeds.php:1333
-#: classes/pref/filters.php:740
-#: classes/feeds.php:1125
-#: classes/feeds.php:1191
-#: js/tt-rss.js:165
-msgid "Search"
-msgstr "Hledat"
-
-#: classes/pref/users.php:342
+#: classes/pref/users.php:341
 msgid "Create user"
 msgstr "Vytvořit uživatele"
 
-#: classes/pref/users.php:346
-#: classes/pref/filters.php:759
-#: plugins/instances/init.php:293
-msgid "Edit"
-msgstr "Upravit"
-
-#: classes/pref/users.php:397
+#: classes/pref/users.php:396
 #: classes/pref/feeds.php:643
-#: classes/pref/feeds.php:882
-#: classes/pref/feeds.php:1836
-#: classes/feeds.php:1079
+#: classes/pref/feeds.php:870
+#: classes/pref/feeds.php:1810
+#: classes/feeds.php:1072
 msgid "Login"
 msgstr "Přihlášení"
 
-#: classes/pref/users.php:398
+#: classes/pref/users.php:397
 msgid "Access Level"
 msgstr "Úroveň přístupu"
 
-#: classes/pref/users.php:401
+#: classes/pref/users.php:400
 msgid "Last login"
 msgstr "Poslední přihlášení"
 
-#: classes/pref/users.php:420
-#: plugins/instances/init.php:334
+#: classes/pref/users.php:419
 msgid "Click to edit"
 msgstr "Klikněte pro úpravu"
 
-#: classes/pref/users.php:441
+#: classes/pref/users.php:440
 msgid "No users defined."
 msgstr "Nejsou definováni žádní uživatelé."
 
-#: classes/pref/users.php:443
+#: classes/pref/users.php:442
 msgid "No matching users found."
 msgstr "Nebyli nalezeni žádní odpovídající uživatelé."
 
-#: classes/pref/system.php:29
-msgid "Error Log"
-msgstr "Protokol chyb"
-
-#: classes/pref/system.php:40
-msgid "Refresh"
-msgstr "Obnovit"
-
-#: classes/pref/system.php:43
-msgid "Clear log"
-msgstr "Vymazat protokol"
-
-#: classes/pref/system.php:48
-msgid "Error"
-msgstr "Chyba"
-
-#: classes/pref/system.php:49
-msgid "Filename"
-msgstr "Název souboru"
-
-#: classes/pref/system.php:50
-msgid "Message"
-msgstr "Zpráva"
-
-#: classes/pref/system.php:52
-msgid "Date"
-msgstr "Datum"
-
-#: classes/pref/feeds.php:15
-msgid "Check to enable field"
-msgstr "Zaškrtněte pro povolení pole"
-
-#: classes/pref/feeds.php:65
-#: classes/pref/feeds.php:214
-#: classes/pref/feeds.php:258
-#: classes/pref/feeds.php:264
-#: classes/pref/feeds.php:290
-#, php-format
-msgid "(%d feed)"
-msgid_plural "(%d feeds)"
-msgstr[0] "(%d kanál)"
-msgstr[1] "(%d kanály)"
-msgstr[2] "(%d kanálů)"
-
-#: classes/pref/feeds.php:537
 #: classes/pref/prefs.php:18
+#: classes/pref/feeds.php:537
 msgid "General"
 msgstr "Obecné"
 
-#: classes/pref/feeds.php:561
-msgid "Feed Title"
-msgstr "Název kanálu"
-
-#: classes/pref/feeds.php:595
-#: classes/pref/feeds.php:830
-#: classes/pref/feeds.php:1822
-#: classes/feeds.php:1055
-msgid "Place in category:"
-msgstr "Umístit do kategorie:"
-
-#: classes/pref/feeds.php:608
-#: classes/pref/feeds.php:844
-#, fuzzy
-msgid "Language:"
-msgstr "Jazyk"
-
-#: classes/pref/feeds.php:615
-#: classes/pref/feeds.php:853
-msgid "Update"
-msgstr "Aktualizovat"
-
-#: classes/pref/feeds.php:630
-#: classes/pref/feeds.php:869
-msgid "Article purging:"
-msgstr "Čištění článků:"
-
-#: classes/pref/feeds.php:658
-#: classes/pref/feeds.php:890
-#: classes/pref/feeds.php:1839
-#: classes/pref/prefs.php:245
-#: classes/feeds.php:1083
-msgid "Password"
-msgstr "Heslo"
-
-#: classes/pref/feeds.php:662
-msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
-msgstr "<b>Rada:</b> pokud váš kanál vyžaduje ověření, musíte zadat přihlašovací údaje, s výjimkou pro kanály Twitteru."
-
-#: classes/pref/feeds.php:681
-#: classes/pref/feeds.php:900
-msgid "Hide from Popular feeds"
-msgstr "Skrýt před oblíbenými kanály"
-
-#: classes/pref/feeds.php:693
-#: classes/pref/feeds.php:906
-msgid "Include in e-mail digest"
-msgstr "Zahrnout do e-mailového výtahu"
-
-#: classes/pref/feeds.php:706
-#: classes/pref/feeds.php:912
-msgid "Always display image attachments"
-msgstr "Vždy zobrazovat obrázkové přílohy"
-
-#: classes/pref/feeds.php:719
-#: classes/pref/feeds.php:920
-msgid "Do not embed images"
-msgstr "Nevkládat obrázky"
-
-#: classes/pref/feeds.php:732
-#: classes/pref/feeds.php:928
-msgid "Cache media"
-msgstr ""
-
-#: classes/pref/feeds.php:744
-#: classes/pref/feeds.php:934
-msgid "Mark updated articles as unread"
-msgstr "Označit aktualizované články jako nepřečtené"
-
-#: classes/pref/feeds.php:748
-msgid "Icon"
-msgstr "Ikona"
-
-#: classes/pref/feeds.php:765
-msgid "Replace"
-msgstr "Nahradit"
-
-#: classes/pref/feeds.php:772
-#: classes/pref/prefs.php:698
-msgid "Plugins"
-msgstr "Moduly"
-
-#: classes/pref/feeds.php:792
-msgid "Resubscribe to push updates"
-msgstr "Znovu se přihlásit k odběru pro aktualizace doručené bez vyžádání"
-
-#: classes/pref/feeds.php:799
-msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
-msgstr "Obnoví stav odběru PubSubHubbub pro kanály s povoleným doručením bez vyžádání."
-
-#: classes/pref/feeds.php:1200
-#: classes/pref/feeds.php:1253
-msgid "All done."
-msgstr "Vše hotovo."
-
-#: classes/pref/feeds.php:1308
-msgid "Feeds with errors"
-msgstr "Kanály s chybami"
-
-#: classes/pref/feeds.php:1315
-msgid "Inactive feeds"
-msgstr "Neaktivní kanály"
-
-#: classes/pref/feeds.php:1351
-msgid "Edit selected feeds"
-msgstr "Upravit vybrané kanály"
-
-#: classes/pref/feeds.php:1353
-#: classes/pref/feeds.php:1367
-#: classes/pref/filters.php:762
-msgid "Reset sort order"
-msgstr "Obnovit pořadí řazení"
-
-#: classes/pref/feeds.php:1355
-#: js/prefs.js:1622
-msgid "Batch subscribe"
-msgstr "Dávkové přihlášení k odběru"
-
-#: classes/pref/feeds.php:1362
-msgid "Categories"
-msgstr "Kategorie"
-
-#: classes/pref/feeds.php:1365
-msgid "Add category"
-msgstr "Přidat kategorii"
-
-#: classes/pref/feeds.php:1369
-msgid "Remove selected"
-msgstr "Odebrat vybrané"
-
-#: classes/pref/feeds.php:1380
-msgid "More actions..."
-msgstr "Více akcí..."
-
-#: classes/pref/feeds.php:1384
-msgid "Manual purge"
-msgstr "Ruční čištění"
-
-#: classes/pref/feeds.php:1388
-msgid "Clear feed data"
-msgstr "Vymazat data kanálu"
-
-#: classes/pref/feeds.php:1389
-#: classes/pref/filters.php:770
-msgid "Rescore articles"
-msgstr "Přehodnotit články"
-
-#: classes/pref/feeds.php:1442
-msgid "OPML"
-msgstr "OPML"
-
-#: classes/pref/feeds.php:1444
-msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
-msgstr "Pomocí OPML můžete exportovat a importovat své kanály, filtry, štítky a nastavení Tiny Tiny RSS."
-
-#: classes/pref/feeds.php:1445
-msgid "Only main settings profile can be migrated using OPML."
-msgstr "Pomocí OPML může být migrován pouze profil hlavního nastavení."
-
-#: classes/pref/feeds.php:1458
-msgid "Import my OPML"
-msgstr "Importovat mé OPML"
-
-#: classes/pref/feeds.php:1464
-msgid "Filename:"
-msgstr "Název souboru:"
-
-#: classes/pref/feeds.php:1466
-msgid "Include settings"
-msgstr "Zahrnout nastavení"
-
-#: classes/pref/feeds.php:1470
-msgid "Export OPML"
-msgstr "Exportovat OPML"
-
-#: classes/pref/feeds.php:1474
-msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
-msgstr "Vaše OPML může být publikováno veřejně a odebíráno kýmkoliv, kdo zná následující URL."
-
-#: classes/pref/feeds.php:1478
-msgid "Public OPML URL"
-msgstr "Veřejná URL OPML"
-
-#: classes/pref/feeds.php:1479
-msgid "Display published OPML URL"
-msgstr "Zobrazit URL publikovaných OPML"
-
-#: classes/pref/feeds.php:1488
-msgid "Firefox integration"
-msgstr "Integrace s Firefoxem"
-
-#: classes/pref/feeds.php:1490
-msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
-msgstr "Tato stránka Tiny Tiny RSS může být použita jako Čtečka kanálů Firefox kliknutím na následující odkaz."
-
-#: classes/pref/feeds.php:1497
-msgid "Click here to register this site as a feed reader."
-msgstr "Klikněte sem pro registraci této stránky jako čtečky kanálů."
-
-#: classes/pref/feeds.php:1505
-msgid "Published & shared articles / Generated feeds"
-msgstr "Publikované a sdílené články / Generované kanály"
-
-#: classes/pref/feeds.php:1507
-msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
-msgstr "Publikované články jsou exportovány jako veřejný kanál RSS, který může odebírat kdokoliv, kdo zná níže zadanou URL."
-
-#: classes/pref/feeds.php:1514
-#: classes/feeds.php:54
-#: classes/feeds.php:140
-msgid "View as RSS"
-msgstr "Zobrazit jako RSS"
-
-#: classes/pref/feeds.php:1515
-msgid "Display URL"
-msgstr "Zobrazit URL"
-
-#: classes/pref/feeds.php:1518
-msgid "Clear all generated URLs"
-msgstr "Vymazat všechny vygenerované URL"
-
-#: classes/pref/feeds.php:1596
-msgid "These feeds have not been updated with new content for 3 months (oldest first):"
-msgstr "Tyto kanály nebyly aktualizovány novým obsahem po tři měsíce (nejdříve nejstarší):"
-
-#: classes/pref/feeds.php:1630
-#: classes/pref/feeds.php:1694
-msgid "Click to edit feed"
-msgstr "Klikněte pro úpravu kanálu"
-
-#: classes/pref/feeds.php:1648
-#: classes/pref/feeds.php:1714
-msgid "Unsubscribe from selected feeds"
-msgstr "Odhlásit odběr vybraných kanálů"
-
-#: classes/pref/feeds.php:1819
-msgid "Add one valid RSS feed per line (no feed detection is done)"
-msgstr "Přidávejte jeden platný kanál RSS na řádek (neprobíhá detekce kanálu)"
-
-#: classes/pref/feeds.php:1828
-msgid "Feeds to subscribe, One per line"
-msgstr "Kanály k odebírání, jeden na řádek"
-
-#: classes/pref/feeds.php:1851
-msgid "Feeds require authentication."
-msgstr "Kanály vyžadují ověření."
-
-#: classes/pref/feeds.php:1858
-#: classes/feeds.php:1099
-#: classes/feeds.php:1153
-msgid "Subscribe"
-msgstr "Přihlásit se k odběru"
-
-#: classes/pref/filters.php:151
-#, fuzzy
-msgid "Preview article"
-msgstr "Nové články"
-
-#: classes/pref/filters.php:239
-#: classes/pref/filters.php:518
-msgid "(inverse)"
-msgstr "(inverzní)"
-
-#: classes/pref/filters.php:235
-#: classes/pref/filters.php:517
-#, php-format
-msgid "%s on %s in %s %s"
-msgstr "%s na %s v %s %s"
-
-#: classes/pref/filters.php:354
-#: classes/pref/filters.php:827
-#: classes/pref/filters.php:942
-msgid "Match"
-msgstr "Odpovídá"
-
-#: classes/pref/filters.php:368
-#: classes/pref/filters.php:416
-#: classes/pref/filters.php:841
-#: classes/pref/filters.php:868
-msgid "Add"
-msgstr "Přidat"
-
-#: classes/pref/filters.php:371
-#: classes/pref/filters.php:419
-#: classes/pref/filters.php:844
-#: classes/pref/filters.php:871
-#: classes/feeds.php:122
-msgid "Delete"
-msgstr "Odstranit"
-
-#: classes/pref/filters.php:402
-#: classes/pref/filters.php:854
-msgid "Apply actions"
-msgstr "Použít akce"
-
-#: classes/pref/filters.php:452
-#: classes/pref/filters.php:883
-msgid "Enabled"
-msgstr "Povoleno"
-
-#: classes/pref/filters.php:461
-#: classes/pref/filters.php:886
-msgid "Match any rule"
-msgstr "Odpovídá jakémukoliv pravidlu"
-
-#: classes/pref/filters.php:470
-#: classes/pref/filters.php:889
-msgid "Inverse matching"
-msgstr "Inverzní porovnání"
-
-#: classes/pref/filters.php:482
-#: classes/pref/filters.php:896
-msgid "Test"
-msgstr "Test"
-
-#: classes/pref/filters.php:756
-msgid "Combine"
-msgstr "Kombinovat"
-
-#: classes/pref/filters.php:899
-msgid "Create"
-msgstr "Vytvořit"
-
-#: classes/pref/filters.php:954
-msgid "Inverse regular expression matching"
-msgstr "Inverzní porovnání regulárního výrazu"
-
-#: classes/pref/filters.php:956
-msgid "on field"
-msgstr "pole"
-
-#: classes/pref/filters.php:962
-#: js/PrefFilterTree.js:64
-msgid "in"
-msgstr "v"
-
-#: classes/pref/filters.php:975
-msgid "Wiki: Filters"
-msgstr "Wiki: Filtry"
-
-#: classes/pref/filters.php:980
-msgid "Save rule"
-msgstr "Uložit pravidlo"
-
-#: classes/pref/filters.php:980
-#: js/functions.js:865
-msgid "Add rule"
-msgstr "Přidat pravidlo"
-
-#: classes/pref/filters.php:1003
-msgid "Perform Action"
-msgstr "Provést akci"
-
-#: classes/pref/filters.php:1054
-#, fuzzy
-msgid "No actions available"
-msgstr "Je dostupná nová verze!"
-
-#: classes/pref/filters.php:1073
-msgid "Save action"
-msgstr "Uložit akci"
-
-#: classes/pref/filters.php:1073
-#: js/functions.js:887
-msgid "Add action"
-msgstr "Přidat akci"
-
-#: classes/pref/filters.php:1097
-msgid "[No caption]"
-msgstr "[Bez titulku]"
-
-#: classes/pref/filters.php:1099
-#, php-format
-msgid "%s (%d rule)"
-msgid_plural "%s (%d rules)"
-msgstr[0] "%s (%d pravidlo)"
-msgstr[1] "%s (%d pravidla)"
-msgstr[2] "%s (%d pravidel)"
-
-#: classes/pref/filters.php:1114
-#, fuzzy
-msgid "matches any rule"
-msgstr "Odpovídá jakémukoliv pravidlu"
-
-#: classes/pref/filters.php:1117
-#, php-format
-msgid "%s (+%d action)"
-msgid_plural "%s (+%d actions)"
-msgstr[0] "%s (+ %d akce)"
-msgstr[1] "%s (+ %d akce)"
-msgstr[2] "%s (+ %d akcí)"
-
 #: classes/pref/prefs.php:19
 msgid "Interface"
 msgstr "Rozhraní"
@@ -2054,7 +1654,7 @@ msgid "Strip all but most common HTML tags when reading articles."
 msgstr "Při čtení článků odstranit všechny značky HTML kromě nejběžnějších."
 
 #: classes/pref/prefs.php:53
-#: js/prefs.js:1584
+#: js/prefs.js:1580
 msgid "Customize stylesheet"
 msgstr "Přizpůsobit šablonu stylů"
 
@@ -2122,6 +1722,14 @@ msgstr "Úroveň přístupu"
 msgid "Save data"
 msgstr "Uložit data"
 
+#: classes/pref/prefs.php:245
+#: classes/pref/feeds.php:658
+#: classes/pref/feeds.php:878
+#: classes/pref/feeds.php:1813
+#: classes/feeds.php:1076
+msgid "Password"
+msgstr "Heslo"
+
 #: classes/pref/prefs.php:254
 msgid "Your password is at default value, please change it."
 msgstr "Vaše heslo má výchozí hodnotu, změňte ho."
@@ -2220,18 +1828,23 @@ msgstr "Spravovat profily"
 msgid "Reset to defaults"
 msgstr "Obnovit na výchozí hodnoty"
 
+#: classes/pref/prefs.php:698
+#: classes/pref/feeds.php:772
+msgid "Plugins"
+msgstr "Moduly"
+
 #: classes/pref/prefs.php:700
 msgid "You will need to reload Tiny Tiny RSS for plugin changes to take effect."
 msgstr "Budete muset znovu načíst Tiny Tiny RSS pro uplatnění změn v modulech."
 
-#: classes/pref/prefs.php:702
-msgid "Download more plugins at tt-rss.org <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forums</a> or <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a>."
-msgstr "Stáhnout více modulů na <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">fórech</a> nebo <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a> tt-rss.org."
-
-#: classes/pref/prefs.php:732
+#: classes/pref/prefs.php:730
 msgid "System plugins"
 msgstr "Systémové moduly"
 
+#: classes/pref/prefs.php:731
+msgid "System plugins are enabled in <strong>config.php</strong> for all users."
+msgstr ""
+
 #: classes/pref/prefs.php:736
 #: classes/pref/prefs.php:792
 msgid "Plugin"
@@ -2301,6 +1914,341 @@ msgstr "Odebrat vybrané profily"
 msgid "Activate profile"
 msgstr "Aktivovat profil"
 
+#: classes/pref/feeds.php:15
+msgid "Check to enable field"
+msgstr "Zaškrtněte pro povolení pole"
+
+#: classes/pref/feeds.php:65
+#: classes/pref/feeds.php:214
+#: classes/pref/feeds.php:258
+#: classes/pref/feeds.php:264
+#: classes/pref/feeds.php:290
+#, php-format
+msgid "(%d feed)"
+msgid_plural "(%d feeds)"
+msgstr[0] "(%d kanál)"
+msgstr[1] "(%d kanály)"
+msgstr[2] "(%d kanálů)"
+
+#: classes/pref/feeds.php:561
+msgid "Feed Title"
+msgstr "Název kanálu"
+
+#: classes/pref/feeds.php:595
+#: classes/pref/feeds.php:818
+#: classes/pref/feeds.php:1796
+#: classes/feeds.php:1048
+msgid "Place in category:"
+msgstr "Umístit do kategorie:"
+
+#: classes/pref/feeds.php:608
+#: classes/pref/feeds.php:832
+#, fuzzy
+msgid "Language:"
+msgstr "Jazyk"
+
+#: classes/pref/feeds.php:615
+#: classes/pref/feeds.php:841
+msgid "Update"
+msgstr "Aktualizovat"
+
+#: classes/pref/feeds.php:630
+#: classes/pref/feeds.php:857
+msgid "Article purging:"
+msgstr "Čištění článků:"
+
+#: classes/pref/feeds.php:662
+msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
+msgstr "<b>Rada:</b> pokud váš kanál vyžaduje ověření, musíte zadat přihlašovací údaje, s výjimkou pro kanály Twitteru."
+
+#: classes/pref/feeds.php:681
+#: classes/pref/feeds.php:888
+msgid "Hide from Popular feeds"
+msgstr "Skrýt před oblíbenými kanály"
+
+#: classes/pref/feeds.php:693
+#: classes/pref/feeds.php:894
+msgid "Include in e-mail digest"
+msgstr "Zahrnout do e-mailového výtahu"
+
+#: classes/pref/feeds.php:706
+#: classes/pref/feeds.php:900
+msgid "Always display image attachments"
+msgstr "Vždy zobrazovat obrázkové přílohy"
+
+#: classes/pref/feeds.php:719
+#: classes/pref/feeds.php:908
+msgid "Do not embed images"
+msgstr "Nevkládat obrázky"
+
+#: classes/pref/feeds.php:732
+#: classes/pref/feeds.php:916
+msgid "Cache media"
+msgstr ""
+
+#: classes/pref/feeds.php:744
+#: classes/pref/feeds.php:922
+msgid "Mark updated articles as unread"
+msgstr "Označit aktualizované články jako nepřečtené"
+
+#: classes/pref/feeds.php:748
+msgid "Icon"
+msgstr "Ikona"
+
+#: classes/pref/feeds.php:765
+msgid "Replace"
+msgstr "Nahradit"
+
+#: classes/pref/feeds.php:1174
+#: classes/pref/feeds.php:1227
+msgid "All done."
+msgstr "Vše hotovo."
+
+#: classes/pref/feeds.php:1282
+msgid "Feeds with errors"
+msgstr "Kanály s chybami"
+
+#: classes/pref/feeds.php:1289
+msgid "Inactive feeds"
+msgstr "Neaktivní kanály"
+
+#: classes/pref/feeds.php:1325
+msgid "Edit selected feeds"
+msgstr "Upravit vybrané kanály"
+
+#: classes/pref/feeds.php:1329
+#: js/prefs.js:1618
+msgid "Batch subscribe"
+msgstr "Dávkové přihlášení k odběru"
+
+#: classes/pref/feeds.php:1336
+msgid "Categories"
+msgstr "Kategorie"
+
+#: classes/pref/feeds.php:1339
+msgid "Add category"
+msgstr "Přidat kategorii"
+
+#: classes/pref/feeds.php:1343
+msgid "Remove selected"
+msgstr "Odebrat vybrané"
+
+#: classes/pref/feeds.php:1354
+msgid "More actions..."
+msgstr "Více akcí..."
+
+#: classes/pref/feeds.php:1358
+msgid "Manual purge"
+msgstr "Ruční čištění"
+
+#: classes/pref/feeds.php:1362
+msgid "Clear feed data"
+msgstr "Vymazat data kanálu"
+
+#: classes/pref/feeds.php:1416
+msgid "OPML"
+msgstr "OPML"
+
+#: classes/pref/feeds.php:1418
+msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
+msgstr "Pomocí OPML můžete exportovat a importovat své kanály, filtry, štítky a nastavení Tiny Tiny RSS."
+
+#: classes/pref/feeds.php:1419
+msgid "Only main settings profile can be migrated using OPML."
+msgstr "Pomocí OPML může být migrován pouze profil hlavního nastavení."
+
+#: classes/pref/feeds.php:1432
+msgid "Import my OPML"
+msgstr "Importovat mé OPML"
+
+#: classes/pref/feeds.php:1438
+msgid "Filename:"
+msgstr "Název souboru:"
+
+#: classes/pref/feeds.php:1440
+msgid "Include settings"
+msgstr "Zahrnout nastavení"
+
+#: classes/pref/feeds.php:1444
+msgid "Export OPML"
+msgstr "Exportovat OPML"
+
+#: classes/pref/feeds.php:1448
+msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
+msgstr "Vaše OPML může být publikováno veřejně a odebíráno kýmkoliv, kdo zná následující URL."
+
+#: classes/pref/feeds.php:1452
+msgid "Public OPML URL"
+msgstr "Veřejná URL OPML"
+
+#: classes/pref/feeds.php:1453
+msgid "Display published OPML URL"
+msgstr "Zobrazit URL publikovaných OPML"
+
+#: classes/pref/feeds.php:1462
+msgid "Firefox integration"
+msgstr "Integrace s Firefoxem"
+
+#: classes/pref/feeds.php:1464
+msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
+msgstr "Tato stránka Tiny Tiny RSS může být použita jako Čtečka kanálů Firefox kliknutím na následující odkaz."
+
+#: classes/pref/feeds.php:1471
+msgid "Click here to register this site as a feed reader."
+msgstr "Klikněte sem pro registraci této stránky jako čtečky kanálů."
+
+#: classes/pref/feeds.php:1479
+msgid "Published & shared articles / Generated feeds"
+msgstr "Publikované a sdílené články / Generované kanály"
+
+#: classes/pref/feeds.php:1481
+msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
+msgstr "Publikované články jsou exportovány jako veřejný kanál RSS, který může odebírat kdokoliv, kdo zná níže zadanou URL."
+
+#: classes/pref/feeds.php:1488
+#: classes/feeds.php:54
+#: classes/feeds.php:140
+msgid "View as RSS"
+msgstr "Zobrazit jako RSS"
+
+#: classes/pref/feeds.php:1489
+msgid "Display URL"
+msgstr "Zobrazit URL"
+
+#: classes/pref/feeds.php:1492
+msgid "Clear all generated URLs"
+msgstr "Vymazat všechny vygenerované URL"
+
+#: classes/pref/feeds.php:1570
+msgid "These feeds have not been updated with new content for 3 months (oldest first):"
+msgstr "Tyto kanály nebyly aktualizovány novým obsahem po tři měsíce (nejdříve nejstarší):"
+
+#: classes/pref/feeds.php:1604
+#: classes/pref/feeds.php:1668
+msgid "Click to edit feed"
+msgstr "Klikněte pro úpravu kanálu"
+
+#: classes/pref/feeds.php:1622
+#: classes/pref/feeds.php:1688
+msgid "Unsubscribe from selected feeds"
+msgstr "Odhlásit odběr vybraných kanálů"
+
+#: classes/pref/feeds.php:1793
+msgid "Add one valid RSS feed per line (no feed detection is done)"
+msgstr "Přidávejte jeden platný kanál RSS na řádek (neprobíhá detekce kanálu)"
+
+#: classes/pref/feeds.php:1802
+msgid "Feeds to subscribe, One per line"
+msgstr "Kanály k odebírání, jeden na řádek"
+
+#: classes/pref/feeds.php:1825
+msgid "Feeds require authentication."
+msgstr "Kanály vyžadují ověření."
+
+#: classes/pref/feeds.php:1832
+#: classes/feeds.php:1092
+#: classes/feeds.php:1146
+msgid "Subscribe"
+msgstr "Přihlásit se k odběru"
+
+#: classes/pref/system.php:29
+msgid "Error Log"
+msgstr "Protokol chyb"
+
+#: classes/pref/system.php:40
+msgid "Refresh"
+msgstr "Obnovit"
+
+#: classes/pref/system.php:43
+msgid "Clear log"
+msgstr "Vymazat protokol"
+
+#: classes/pref/system.php:48
+msgid "Error"
+msgstr "Chyba"
+
+#: classes/pref/system.php:49
+msgid "Filename"
+msgstr "Název souboru"
+
+#: classes/pref/system.php:50
+msgid "Message"
+msgstr "Zpráva"
+
+#: classes/pref/system.php:52
+msgid "Date"
+msgstr "Datum"
+
+#: classes/opml.php:28
+#: classes/opml.php:33
+msgid "OPML Utility"
+msgstr "Nástroj OPML"
+
+#: classes/opml.php:37
+msgid "Importing OPML..."
+msgstr "Importování OPML..."
+
+#: classes/opml.php:41
+msgid "Return to preferences"
+msgstr "Zpět do předvoleb"
+
+#: classes/opml.php:295
+#, php-format
+msgid "Adding feed: %s"
+msgstr "Přidávání kanálu: %s"
+
+#: classes/opml.php:306
+#, php-format
+msgid "Duplicate feed: %s"
+msgstr "Duplicitní kanál: %s"
+
+#: classes/opml.php:320
+#, php-format
+msgid "Adding label %s"
+msgstr "Přidávání štítku %s"
+
+#: classes/opml.php:323
+#, php-format
+msgid "Duplicate label: %s"
+msgstr "Duplicitní štítek: %s"
+
+#: classes/opml.php:335
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr "Nastavení klíče předvoleb %s na %s"
+
+#: classes/opml.php:367
+msgid "Adding filter..."
+msgstr "Přidávání filtru..."
+
+#: classes/opml.php:486
+#, php-format
+msgid "Processing category: %s"
+msgstr "Zpracovávání kategorie: %s"
+
+#: classes/opml.php:532
+#, php-format
+msgid "Upload failed with error code %d"
+msgstr "Nahrávání selhalo s kódem chyby %d"
+
+#: classes/opml.php:544
+#: plugins/import_export/init.php:448
+msgid "Unable to move uploaded file."
+msgstr "Nelze přesunout nahraný soubor."
+
+#: classes/opml.php:548
+#: plugins/import_export/init.php:452
+msgid "Error: please upload OPML file."
+msgstr "Chyba: nahrajte soubor OPML."
+
+#: classes/opml.php:559
+msgid "Error: unable to find moved OPML file."
+msgstr "Chyba: nelze nalézt přesunutý soubor OPML."
+
+#: classes/opml.php:566
+msgid "Error while parsing document."
+msgstr "Chyba při zpracování dokumentu."
+
 #: classes/feeds.php:53
 msgid "View as RSS feed"
 msgstr "Zobrazit jako kanál RSS"
@@ -2341,8 +2289,8 @@ msgstr "Zpět"
 
 #: classes/feeds.php:127
 #: classes/feeds.php:132
-#: plugins/mail/init.php:75
 #: plugins/mailto/init.php:25
+#: plugins/mail/init.php:75
 msgid "Forward by email"
 msgstr "Přeposlat e-mailem"
 
@@ -2350,317 +2298,144 @@ msgstr "Přeposlat e-mailem"
 msgid "Feed:"
 msgstr "Kanál:"
 
-#: classes/feeds.php:229
-#: classes/feeds.php:892
+#: classes/feeds.php:228
+#: classes/feeds.php:885
 msgid "Feed not found."
 msgstr "Kanál nenalezen."
 
-#: classes/feeds.php:300
+#: classes/feeds.php:291
 msgid "Never"
 msgstr "Nikdy"
 
-#: classes/feeds.php:413
+#: classes/feeds.php:405
 #, php-format
 msgid "Imported at %s"
 msgstr "Importováno v %s"
 
-#: classes/feeds.php:472
-#: classes/feeds.php:569
+#: classes/feeds.php:464
+#: classes/feeds.php:561
 msgid "mark feed as read"
 msgstr "označit kanál jako přečtený"
 
-#: classes/feeds.php:630
+#: classes/feeds.php:622
 msgid "Collapse article"
 msgstr "Sbalit článek"
 
-#: classes/feeds.php:791
+#: classes/feeds.php:784
 msgid "No unread articles found to display."
 msgstr "Nenalezeny žádné nepřečtené články k zobrazení."
 
-#: classes/feeds.php:794
+#: classes/feeds.php:787
 msgid "No updated articles found to display."
 msgstr "Nenalezeny žádné aktualizované články k zobrazení."
 
-#: classes/feeds.php:797
+#: classes/feeds.php:790
 msgid "No starred articles found to display."
 msgstr "Nenalezeny žádné články označené hvězdičkou k zobrazení."
 
-#: classes/feeds.php:801
+#: classes/feeds.php:794
 msgid "No articles found to display. You can assign articles to labels manually from article header context menu (applies to all selected articles) or use a filter."
 msgstr "Nenalezeny žádné články k zobrazení. Můžete přiřadit články ke štítkům ručně z kontextové nabídky v hlavičce článku (použije se pro všechny vybrané články) nebo použít filtr."
 
-#: classes/feeds.php:803
+#: classes/feeds.php:796
 msgid "No articles found to display."
 msgstr "Nenalezeny žádné články k zobrazení."
 
-#: classes/feeds.php:818
-#: classes/feeds.php:992
+#: classes/feeds.php:811
+#: classes/feeds.php:985
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "Kanál naposledy aktualizován v %s"
 
-#: classes/feeds.php:828
-#: classes/feeds.php:1002
+#: classes/feeds.php:821
+#: classes/feeds.php:995
 msgid "Some feeds have update errors (click for details)"
 msgstr "Některé kanály mají chyby aktualizace (klikněte pro podrobnosti)"
 
-#: classes/feeds.php:982
+#: classes/feeds.php:975
 msgid "No feed selected."
 msgstr "Není vybrán žádný kanál."
 
-#: classes/feeds.php:1041
-#: classes/feeds.php:1049
+#: classes/feeds.php:1034
+#: classes/feeds.php:1042
 msgid "Feed or site URL"
 msgstr "Kanál nebo URL stránky"
 
-#: classes/feeds.php:1063
+#: classes/feeds.php:1056
 msgid "Available feeds"
 msgstr "Dostupné kanály"
 
-#: classes/feeds.php:1094
+#: classes/feeds.php:1087
 msgid "This feed requires authentication."
 msgstr "Tento kanál vyžaduje ověření."
 
-#: classes/feeds.php:1102
+#: classes/feeds.php:1095
 msgid "More feeds"
 msgstr "Více kanálů"
 
-#: classes/feeds.php:1129
+#: classes/feeds.php:1122
 msgid "Popular feeds"
 msgstr "Oblíbené kanály"
 
-#: classes/feeds.php:1130
+#: classes/feeds.php:1123
 msgid "Feed archive"
 msgstr "Archiv kanálů"
 
-#: classes/feeds.php:1133
+#: classes/feeds.php:1126
 msgid "limit:"
 msgstr "omezení:"
 
-#: classes/feeds.php:1165
+#: classes/feeds.php:1158
 msgid "Look for"
 msgstr "Hledat"
 
-#: classes/feeds.php:1173
+#: classes/feeds.php:1166
 #, php-format
 msgid "in %s"
 msgstr ""
 
-#: classes/feeds.php:1178
+#: classes/feeds.php:1171
 msgid "Used for word stemming"
 msgstr ""
 
-#: classes/feeds.php:1187
+#: classes/feeds.php:1180
 msgid "Search syntax"
 msgstr "Syntaxe hledání"
 
-#: plugins/instances/init.php:141
-msgid "Linked"
-msgstr "Propojeno"
-
-#: plugins/instances/init.php:204
-#: plugins/instances/init.php:395
-msgid "Instance"
-msgstr "Instance"
-
-#: plugins/instances/init.php:215
-#: plugins/instances/init.php:312
-#: plugins/instances/init.php:404
-msgid "Instance URL"
-msgstr "URL instance"
-
-#: plugins/instances/init.php:226
-#: plugins/instances/init.php:414
-msgid "Access key:"
-msgstr "Přístupový klíč:"
-
-#: plugins/instances/init.php:229
-#: plugins/instances/init.php:313
-#: plugins/instances/init.php:417
-msgid "Access key"
-msgstr "Přístupový klíč"
-
-#: plugins/instances/init.php:233
-#: plugins/instances/init.php:421
-msgid "Use one access key for both linked instances."
-msgstr "Použít jeden přístupový klíč pro obě propojené instance."
-
-#: plugins/instances/init.php:241
-#: plugins/instances/init.php:429
-msgid "Generate new key"
-msgstr "Generovat nový klíč"
-
-#: plugins/instances/init.php:292
-msgid "Link instance"
-msgstr "Propojit instanci"
-
-#: plugins/instances/init.php:304
-msgid "You can connect other instances of Tiny Tiny RSS to this one to share Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
-msgstr "Můžete připojit další instance Tiny Tiny RSS k této pro sdílení oblíbených kanálů. Připojit k této instanci Tiny Tiny RSS pomocí této URL:"
-
-#: plugins/instances/init.php:314
-msgid "Last connected"
-msgstr "Naposledy připojen"
-
-#: plugins/instances/init.php:315
-msgid "Status"
-msgstr "Stav"
-
-#: plugins/instances/init.php:316
-msgid "Stored feeds"
-msgstr "Uložené kanály"
-
-#: plugins/instances/init.php:433
-msgid "Create link"
-msgstr "Vytvořit odkaz"
-
-#: plugins/nsfw/init.php:30
-#: plugins/nsfw/init.php:42
-msgid "Not work safe (click to toggle)"
-msgstr "Není bezpečné pro práci (kliknutím přepnout)"
-
-#: plugins/nsfw/init.php:52
-msgid "NSFW Plugin"
-msgstr "Modul Neotvírat v práci"
-
-#: plugins/nsfw/init.php:79
-msgid "Tags to consider NSFW (comma-separated)"
-msgstr "Značky považované za neotvírat v práci (oddělené čárkami)"
-
-#: plugins/nsfw/init.php:100
-msgid "Configuration saved."
-msgstr "Konfigurace uložena."
-
-#: plugins/note/init.php:26
-#: plugins/note/note.js:11
-msgid "Edit article note"
-msgstr "Upravit poznámku článku"
-
-#: plugins/vf_shared/init.php:16
-#: plugins/vf_shared/init.php:69
-msgid "Shared articles"
-msgstr "Sdílené články"
-
-#: plugins/auth_internal/init.php:65
-msgid "Please enter your one time password:"
-msgstr "Zadejte své jednorázové heslo:"
-
-#: plugins/auth_internal/init.php:188
-msgid "Password has been changed."
-msgstr "Heslo bylo změněno."
-
-#: plugins/auth_internal/init.php:190
-msgid "Old password is incorrect."
-msgstr "Staré heslo je nesprávné."
-
-#: plugins/af_readability/init.php:21
-msgid "Data saved."
-msgstr ""
-
-#: plugins/af_readability/init.php:33
-#, fuzzy
-msgid "Inline content"
-msgstr "Upravit poznámku článku"
-
-#: plugins/af_readability/init.php:39
-msgid "Readability settings (af_readability)"
-msgstr ""
-
-#: plugins/af_readability/init.php:66
-msgid "Use Readability for pages shared via bookmarklet."
-msgstr ""
-
-#: plugins/af_readability/init.php:78
-#: plugins/af_psql_trgm/init.php:191
-msgid "Currently enabled for (click to edit):"
-msgstr ""
-
-#: plugins/af_readability/init.php:95
-#, fuzzy
-msgid "Readability"
-msgstr "Zkontrolovat dostupnost"
-
-#: plugins/af_readability/init.php:106
-#, fuzzy
-msgid "Inline article content"
-msgstr "Upravit poznámku článku"
+#: classes/feeds.php:1596
+msgid "Starred articles"
+msgstr "Články označené hvězdičkou"
 
-#: plugins/af_redditimgur/init.php:25
-msgid "Reddit content settings (af_redditimgur)"
-msgstr ""
+#: classes/feeds.php:1598
+msgid "Published articles"
+msgstr "Publikované články"
 
-#: plugins/af_redditimgur/init.php:50
-msgid "Uses Readability (full-text-rss) implementation by <a target='_blank' href='https://bitbucket.org/fivefilters/'>FiveFilters.org</a>"
-msgstr ""
+#: classes/feeds.php:1600
+msgid "Fresh articles"
+msgstr "Nové články"
 
-#: plugins/af_redditimgur/init.php:54
-msgid "Extract missing content using Readability"
-msgstr ""
+#: classes/feeds.php:1604
+msgid "Archived articles"
+msgstr "Archivované články"
 
-#: plugins/af_redditimgur/init.php:59
-msgid "Enable additional duplicate checking"
-msgstr ""
+#: classes/feeds.php:1606
+msgid "Recently read"
+msgstr "Nedávno přečtené"
 
-#: plugins/af_redditimgur/init.php:73
-#: plugins/af_zz_imgproxy/init.php:225
-#, fuzzy
-msgid "Configuration saved"
-msgstr "Konfigurace uložena."
+#: classes/feeds.php:1716
+msgid "Special"
+msgstr "Speciální"
 
-#: plugins/af_psql_trgm/init.php:28
+#: classes/feeds.php:1962
 #, php-format
-msgid "Data saved (%s, %d)"
-msgstr ""
+msgid "Search results: %s"
+msgstr "Výsledky hledání: %s"
 
-#: plugins/af_psql_trgm/init.php:112
-#, fuzzy
-msgid "Show related articles"
+#: plugins/vf_shared/init.php:16
+#: plugins/vf_shared/init.php:60
+msgid "Shared articles"
 msgstr "Sdílené články"
 
-#: plugins/af_psql_trgm/init.php:118
-#: plugins/af_psql_trgm/init.php:220
-#, fuzzy
-msgid "Mark similar articles as read"
-msgstr "Označit všechny články jako přečtené?"
-
-#: plugins/af_psql_trgm/init.php:157
-msgid "PostgreSQL trigram extension returns string similarity as a floating point number (0-1). Setting it too low might produce false positives, zero disables checking."
-msgstr ""
-
-#: plugins/af_psql_trgm/init.php:160
-#, fuzzy
-msgid "Global settings"
-msgstr "Zahrnout nastavení"
-
-#: plugins/af_psql_trgm/init.php:164
-msgid "Minimum similarity:"
-msgstr ""
-
-#: plugins/af_psql_trgm/init.php:169
-msgid "Minimum title length:"
-msgstr ""
-
-#: plugins/af_psql_trgm/init.php:174
-#, fuzzy
-msgid "Enable for all feeds:"
-msgstr "Povolit kategorie kanálů"
-
-#: plugins/af_psql_trgm/init.php:209
-msgid "Similarity (pg_trgm)"
-msgstr ""
-
-#: plugins/af_comics/init.php:40
-msgid "Feeds supported by af_comics"
-msgstr "Kanály podporované af_comics"
-
-#: plugins/af_comics/init.php:42
-msgid "The following comics are currently supported:"
-msgstr "Nyní jsou podporovány následující komiksy:"
-
-#: plugins/af_comics/init.php:60
-msgid "GoComics requires a specific URL to workaround their lack of feed support: <code>http://feeds.feedburner.com/uclick/<em>comic_name</em></code> (e.g. <code>http://www.gocomics.com/garfield</code> uses <code>http://feeds.feedburner.com/uclick/garfield</code>)."
-msgstr ""
-
 #: plugins/import_export/init.php:58
 msgid "Import and export"
 msgstr "Import a export"
@@ -2677,19 +2452,19 @@ msgstr "Exportovat má data"
 msgid "Import"
 msgstr "Importovat"
 
-#: plugins/import_export/init.php:225
+#: plugins/import_export/init.php:231
 msgid "Could not import: incorrect schema version."
 msgstr "Nelze importovat: nesprávná verze schématu."
 
-#: plugins/import_export/init.php:230
+#: plugins/import_export/init.php:236
 msgid "Could not import: unrecognized document format."
 msgstr "Nelze importovat: nerozpoznaný formát dokumentu."
 
-#: plugins/import_export/init.php:391
+#: plugins/import_export/init.php:397
 msgid "Finished: "
 msgstr "Dokončeno: "
 
-#: plugins/import_export/init.php:392
+#: plugins/import_export/init.php:398
 #, php-format
 msgid "%d article processed, "
 msgid_plural "%d articles processed, "
@@ -2697,7 +2472,7 @@ msgstr[0] "zpracován %d článek, "
 msgstr[1] "zpracovány %d články, "
 msgstr[2] "zpracováno %d článků, "
 
-#: plugins/import_export/init.php:393
+#: plugins/import_export/init.php:399
 #, php-format
 msgid "%d imported, "
 msgid_plural "%d imported, "
@@ -2705,7 +2480,7 @@ msgstr[0] "%d importován, "
 msgstr[1] "%d importovány, "
 msgstr[2] "%d importováno, "
 
-#: plugins/import_export/init.php:394
+#: plugins/import_export/init.php:400
 #, php-format
 msgid "%d feed created."
 msgid_plural "%d feeds created."
@@ -2713,62 +2488,50 @@ msgstr[0] "vytvořen %d kanál."
 msgstr[1] "vytvořeny %d kanály."
 msgstr[2] "vytvořeno %d kanálů."
 
-#: plugins/import_export/init.php:399
+#: plugins/import_export/init.php:405
 msgid "Could not load XML document."
 msgstr "Nelze načíst dokument XML."
 
-#: plugins/import_export/init.php:411
+#: plugins/import_export/init.php:417
 msgid "Prepare data"
 msgstr "Připravit data"
 
-#: plugins/import_export/init.php:428
+#: plugins/import_export/init.php:434
 #, fuzzy, php-format
 msgid "Upload failed with error code %d (%s)"
 msgstr "Nahrávání selhalo s kódem chyby %d"
 
-#: plugins/import_export/init.php:454
+#: plugins/import_export/init.php:460
 msgid "No file uploaded."
 msgstr "Nebyl nahrán žádný soubor."
 
-#: plugins/mail/init.php:28
-msgid "Mail addresses saved."
-msgstr "E-mailové adresy uloženy."
-
-#: plugins/mail/init.php:34
-msgid "Mail plugin"
-msgstr "Modul odesílání e-mailů"
-
-#: plugins/mail/init.php:36
-msgid "You can set predefined email addressed here (comma-separated list):"
-msgstr "Zde můžete nastavit předdefinované e-mailové adresy (čárkami oddělený seznam):"
-
+#: plugins/mailto/init.php:48
+#: plugins/mailto/init.php:54
 #: plugins/mail/init.php:112
 #: plugins/mail/init.php:118
-#: plugins/mailto/init.php:49
-#: plugins/mailto/init.php:55
 msgid "[Forwarded]"
 msgstr "[Přeposláno]"
 
+#: plugins/mailto/init.php:48
 #: plugins/mail/init.php:112
-#: plugins/mailto/init.php:49
 msgid "Multiple articles"
 msgstr "Více článků"
 
-#: plugins/mail/init.php:140
-msgid "To:"
-msgstr "Do:"
+#: plugins/mailto/init.php:70
+msgid "Clicking the following link to invoke your mail client:"
+msgstr "Klikněte na následující odkaz pro spuštění poštovního klienta:"
 
-#: plugins/mail/init.php:155
-msgid "Subject:"
-msgstr "Předmět:"
+#: plugins/mailto/init.php:74
+msgid "Forward selected article(s) by email."
+msgstr "Přeposlat vybrané články e-mailem."
 
-#: plugins/mail/init.php:172
-msgid "Send e-mail"
-msgstr "Odeslat e-mail"
+#: plugins/mailto/init.php:77
+msgid "You should be able to edit the message before sending in your mail client."
+msgstr "Měli byste být schopni upravit zprávu před odesláním ve vašem poštovním klientu."
 
-#: plugins/close_button/init.php:22
-msgid "Close article"
-msgstr "Zavřít článek"
+#: plugins/mailto/init.php:82
+msgid "Close this dialog"
+msgstr "Zavřít tento dialog"
 
 #: plugins/bookmarklets/init.php:20
 msgid "Bookmarklets"
@@ -2791,34 +2554,124 @@ msgstr "Přihlásit se k odběru v Tiny Tiny RSS"
 msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
 msgstr "Použijte tento záložkový aplet pro publikování libovolných stránek pomocí Tiny Tiny RSS"
 
+#: plugins/af_psql_trgm/init.php:28
+#, php-format
+msgid "Data saved (%s, %d)"
+msgstr ""
+
+#: plugins/af_psql_trgm/init.php:112
+#, fuzzy
+msgid "Show related articles"
+msgstr "Sdílené články"
+
+#: plugins/af_psql_trgm/init.php:118
+#: plugins/af_psql_trgm/init.php:220
+#, fuzzy
+msgid "Mark similar articles as read"
+msgstr "Označit všechny články jako přečtené?"
+
+#: plugins/af_psql_trgm/init.php:157
+msgid "PostgreSQL trigram extension returns string similarity as a floating point number (0-1). Setting it too low might produce false positives, zero disables checking."
+msgstr ""
+
+#: plugins/af_psql_trgm/init.php:160
+#, fuzzy
+msgid "Global settings"
+msgstr "Zahrnout nastavení"
+
+#: plugins/af_psql_trgm/init.php:164
+msgid "Minimum similarity:"
+msgstr ""
+
+#: plugins/af_psql_trgm/init.php:169
+msgid "Minimum title length:"
+msgstr ""
+
+#: plugins/af_psql_trgm/init.php:174
+#, fuzzy
+msgid "Enable for all feeds:"
+msgstr "Povolit kategorie kanálů"
+
+#: plugins/af_psql_trgm/init.php:191
+#: plugins/af_readability/init.php:78
+msgid "Currently enabled for (click to edit):"
+msgstr ""
+
+#: plugins/af_psql_trgm/init.php:209
+msgid "Similarity (pg_trgm)"
+msgstr ""
+
+#: plugins/nsfw/init.php:30
+#: plugins/nsfw/init.php:42
+msgid "Not work safe (click to toggle)"
+msgstr "Není bezpečné pro práci (kliknutím přepnout)"
+
+#: plugins/nsfw/init.php:52
+msgid "NSFW Plugin"
+msgstr "Modul Neotvírat v práci"
+
+#: plugins/nsfw/init.php:79
+msgid "Tags to consider NSFW (comma-separated)"
+msgstr "Značky považované za neotvírat v práci (oddělené čárkami)"
+
+#: plugins/nsfw/init.php:100
+msgid "Configuration saved."
+msgstr "Konfigurace uložena."
+
 #: plugins/toggle_sidebar/init.php:23
 msgid "Collapse feedlist"
 msgstr "Sbalit seznam kanálů"
 
-#: plugins/af_zz_imgproxy/init.php:186
-msgid "Image proxy settings (af_zz_imgproxy)"
+#: plugins/af_readability/init.php:21
+msgid "Data saved."
 msgstr ""
 
-#: plugins/af_zz_imgproxy/init.php:211
+#: plugins/af_readability/init.php:33
 #, fuzzy
-msgid "Enable proxy for all remote images."
-msgstr "Povolit kategorie kanálů"
+msgid "Inline content"
+msgstr "Upravit poznámku článku"
 
-#: plugins/mailto/init.php:71
-msgid "Clicking the following link to invoke your mail client:"
-msgstr "Klikněte na následující odkaz pro spuštění poštovního klienta:"
+#: plugins/af_readability/init.php:39
+msgid "Readability settings (af_readability)"
+msgstr ""
 
-#: plugins/mailto/init.php:75
-msgid "Forward selected article(s) by email."
-msgstr "Přeposlat vybrané články e-mailem."
+#: plugins/af_readability/init.php:66
+msgid "Use Readability for pages shared via bookmarklet."
+msgstr ""
 
-#: plugins/mailto/init.php:78
-msgid "You should be able to edit the message before sending in your mail client."
-msgstr "Měli byste být schopni upravit zprávu před odesláním ve vašem poštovním klientu."
+#: plugins/af_readability/init.php:95
+#, fuzzy
+msgid "Readability"
+msgstr "Zkontrolovat dostupnost"
 
-#: plugins/mailto/init.php:83
-msgid "Close this dialog"
-msgstr "Zavřít tento dialog"
+#: plugins/af_readability/init.php:106
+#, fuzzy
+msgid "Inline article content"
+msgstr "Upravit poznámku článku"
+
+#: plugins/mail/init.php:28
+msgid "Mail addresses saved."
+msgstr "E-mailové adresy uloženy."
+
+#: plugins/mail/init.php:34
+msgid "Mail plugin"
+msgstr "Modul odesílání e-mailů"
+
+#: plugins/mail/init.php:36
+msgid "You can set predefined email addressed here (comma-separated list):"
+msgstr "Zde můžete nastavit předdefinované e-mailové adresy (čárkami oddělený seznam):"
+
+#: plugins/mail/init.php:140
+msgid "To:"
+msgstr "Do:"
+
+#: plugins/mail/init.php:155
+msgid "Subject:"
+msgstr "Předmět:"
+
+#: plugins/mail/init.php:172
+msgid "Send e-mail"
+msgstr "Odeslat e-mail"
 
 #: plugins/share/init.php:39
 msgid "You can disable all articles shared by unique URLs here."
@@ -2832,24 +2685,97 @@ msgstr "Zrušit sdílení všech článků"
 msgid "Share by URL"
 msgstr "Sdílet pomocí URL"
 
-#: plugins/share/init.php:97
+#: plugins/share/init.php:96
 msgid "You can share this article by the following unique URL:"
 msgstr "Můžete sdílet tento článek pomocí následující jedinečné URL:"
 
-#: plugins/share/init.php:115
+#: plugins/share/init.php:114
 msgid "Unshare article"
 msgstr "Zrušit sdílení článku"
 
+#: plugins/af_comics/init.php:48
+msgid "Feeds supported by af_comics"
+msgstr "Kanály podporované af_comics"
+
+#: plugins/af_comics/init.php:50
+msgid "The following comics are currently supported:"
+msgstr "Nyní jsou podporovány následující komiksy:"
+
+#: plugins/af_comics/init.php:68
+msgid "GoComics requires a specific URL to workaround their lack of feed support: <code>http://feeds.feedburner.com/uclick/<em>comic_name</em></code> (e.g. <code>http://www.gocomics.com/garfield</code> uses <code>http://feeds.feedburner.com/uclick/garfield</code>)."
+msgstr ""
+
+#: plugins/af_comics/init.php:70
+msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:25
+msgid "Reddit content settings (af_redditimgur)"
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:50
+msgid "Uses Readability (full-text-rss) implementation by <a target='_blank' href='https://bitbucket.org/fivefilters/'>FiveFilters.org</a>"
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:54
+msgid "Extract missing content using Readability"
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:59
+msgid "Enable additional duplicate checking"
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:73
+#: plugins/af_zz_imgproxy/init.php:254
+#, fuzzy
+msgid "Configuration saved"
+msgstr "Konfigurace uložena."
+
+#: plugins/note/init.php:26
+#: plugins/note/note.js:11
+msgid "Edit article note"
+msgstr "Upravit poznámku článku"
+
+#: plugins/close_button/init.php:25
+msgid "Close article"
+msgstr "Zavřít článek"
+
+#: plugins/af_zz_imgproxy/init.php:210
+msgid "Image proxy settings (af_zz_imgproxy)"
+msgstr ""
+
+#: plugins/af_zz_imgproxy/init.php:234
+#, fuzzy
+msgid "Enable proxy for all remote images."
+msgstr "Povolit kategorie kanálů"
+
+#: plugins/af_zz_imgproxy/init.php:238
+#, fuzzy
+msgid "Don't cache files locally."
+msgstr "Ukládat obrázky do mezipaměti místně"
+
+#: plugins/auth_internal/init.php:65
+msgid "Please enter your one time password:"
+msgstr "Zadejte své jednorázové heslo:"
+
+#: plugins/auth_internal/init.php:188
+msgid "Password has been changed."
+msgstr "Heslo bylo změněno."
+
+#: plugins/auth_internal/init.php:190
+msgid "Old password is incorrect."
+msgstr "Staré heslo je nesprávné."
+
 #: js/FeedTree.js:172
 #, fuzzy
 msgid "(Un)collapse"
 msgstr "Rozbalit nebo sbalit postranní panel"
 
-#: js/PrefFeedTree.js:52
+#: js/PrefFeedTree.js:54
 msgid "Edit category"
 msgstr "Upravit kategorii"
 
-#: js/PrefFeedTree.js:59
+#: js/PrefFeedTree.js:61
 msgid "Remove category"
 msgstr "Odebrat kategorii"
 
@@ -2884,63 +2810,55 @@ msgid "Create Filter"
 msgstr "Vytvořit filtr"
 
 #: js/functions.js:1128
-msgid "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification hub again on next feed update."
-msgstr "Obnovit odběr? Tiny Tiny RSS se pokusí znovu přihlásit k odběru oznamovacího centra při další aktualizaci kanálu."
-
-#: js/functions.js:1139
-msgid "Subscription reset."
-msgstr "Odběr obnoven."
-
-#: js/functions.js:1149
-#: js/tt-rss.js:695
+#: js/tt-rss.js:696
 #, perl-format
 msgid "Unsubscribe from %s?"
 msgstr "Odhlásit odběr %s?"
 
-#: js/functions.js:1152
+#: js/functions.js:1131
 msgid "Removing feed..."
 msgstr "Odebírání kanálu..."
 
-#: js/functions.js:1225
+#: js/functions.js:1204
 msgid "Please enter category title:"
 msgstr "Zadejte název kategorie:"
 
-#: js/functions.js:1250
+#: js/functions.js:1229
 msgid "Generate new syndication address for this feed?"
 msgstr "Generovat novou adresu syndikace pro tento kanál?"
 
-#: js/functions.js:1254
-#: js/prefs.js:1154
+#: js/functions.js:1233
+#: js/prefs.js:1150
 msgid "Trying to change address..."
 msgstr "Pokus o změnu adresy..."
 
-#: js/functions.js:1497
-#: js/functions.js:1606
+#: js/functions.js:1476
+#: js/functions.js:1585
 #: js/prefs.js:398
 #: js/prefs.js:424
 #: js/prefs.js:456
 #: js/prefs.js:599
 #: js/prefs.js:617
-#: js/prefs.js:1136
-#: js/prefs.js:1263
+#: js/prefs.js:1132
+#: js/prefs.js:1259
 msgid "No feeds are selected."
 msgstr "Nejsou vybrány žádné kanály."
 
-#: js/functions.js:1540
+#: js/functions.js:1519
 msgid "Remove selected feeds from the archive? Feeds with stored articles will not be removed."
 msgstr "Odebrat vybrané kanály z archivu? Kanály s uloženými články nebudou odebrány."
 
-#: js/functions.js:1577
+#: js/functions.js:1556
 msgid "Feeds with update errors"
 msgstr "Kanály s chybami aktualizace"
 
-#: js/functions.js:1588
-#: js/prefs.js:1117
+#: js/functions.js:1567
+#: js/prefs.js:1113
 msgid "Remove selected feeds?"
 msgstr "Odebrat vybrané kanály?"
 
-#: js/functions.js:1591
-#: js/prefs.js:1120
+#: js/functions.js:1570
+#: js/prefs.js:1116
 msgid "Removing selected feeds..."
 msgstr "Odebírání vybraných kanálů..."
 
@@ -2963,9 +2881,7 @@ msgstr "Editor uživatelů"
 #: js/prefs.js:100
 #: js/prefs.js:209
 #: js/prefs.js:706
-#: plugins/instances/instances.js:26
-#: plugins/instances/instances.js:89
-#: js/functions.js:1408
+#: js/functions.js:1387
 msgid "Saving data..."
 msgstr "Ukládání dat..."
 
@@ -2990,7 +2906,7 @@ msgid "Removing selected labels..."
 msgstr "Odebírání vybraných štítků..."
 
 #: js/prefs.js:308
-#: js/prefs.js:1304
+#: js/prefs.js:1300
 msgid "No labels are selected."
 msgstr "Nejsou vybrány žádné štítky."
 
@@ -3089,28 +3005,28 @@ msgstr "Uložit změny ve vybraných kanálech?"
 msgid "OPML Import"
 msgstr "Import OPML"
 
-#: js/prefs.js:764
+#: js/prefs.js:759
 msgid "Please choose an OPML file first."
 msgstr "Nejdříve zvolte soubor OPML."
 
-#: js/prefs.js:767
+#: js/prefs.js:762
 #: plugins/import_export/import_export.js:115
 msgid "Importing, please wait..."
 msgstr "Importování, čekejte..."
 
-#: js/prefs.js:928
+#: js/prefs.js:924
 msgid "Reset to defaults?"
 msgstr "Obnovit na výchozí hodnoty?"
 
-#: js/prefs.js:1628
+#: js/prefs.js:1624
 msgid "Subscribing to feeds..."
 msgstr "Přihlašování k odběru kanálů..."
 
-#: js/prefs.js:1647
+#: js/prefs.js:1643
 msgid "Clear stored data for this plugin?"
 msgstr "Vymazat uložená data pro tento modul?"
 
-#: js/prefs.js:1661
+#: js/prefs.js:1657
 msgid "Clear all messages in the error log?"
 msgstr "Vymazat všechny zprávy v protokolu chyb?"
 
@@ -3122,58 +3038,58 @@ msgstr "Označit všechny články jako přečtené?"
 msgid "Marking all feeds as read..."
 msgstr "Označování všech kanálů jako přečtených..."
 
-#: js/tt-rss.js:401
+#: js/tt-rss.js:402
 msgid "Please enable mail plugin first."
 msgstr "Nejdříve povolte modul odesílání e-mailů."
 
-#: js/tt-rss.js:449
-#: js/functions.js:1387
-#: js/tt-rss.js:676
+#: js/tt-rss.js:450
+#: js/functions.js:1366
+#: js/tt-rss.js:677
 msgid "You can't edit this kind of feed."
 msgstr "Nemůžete upravit tento druh kanálu."
 
-#: js/tt-rss.js:530
+#: js/tt-rss.js:531
 msgid "Please enable embed_original plugin first."
 msgstr "Nejdříve povolte modul embed_original."
 
-#: js/tt-rss.js:543
-#: js/tt-rss.js:726
+#: js/tt-rss.js:544
+#: js/tt-rss.js:727
 msgid "Widescreen is not available in combined mode."
 msgstr ""
 
-#: js/tt-rss.js:824
+#: js/tt-rss.js:825
 msgid "You can't rescore this kind of feed."
 msgstr "Nemůžete přehodnotit tento druh kanálu."
 
-#: js/tt-rss.js:829
-#: js/tt-rss.js:689
+#: js/tt-rss.js:830
+#: js/tt-rss.js:690
 msgid "Please select some feed first."
 msgstr "Nejdříve vyberte nějaký kanál."
 
-#: js/tt-rss.js:834
+#: js/tt-rss.js:835
 #, perl-format
 msgid "Rescore articles in %s?"
 msgstr "Přehodnotit články v %s?"
 
-#: js/tt-rss.js:837
+#: js/tt-rss.js:838
 msgid "Rescoring articles..."
 msgstr "Přehodnocování článků..."
 
-#: js/viewfeed.js:919
-#: js/viewfeed.js:957
-#: js/viewfeed.js:1005
-#: js/viewfeed.js:1931
-#: plugins/mail/mail.js:7
+#: js/viewfeed.js:921
+#: js/viewfeed.js:959
+#: js/viewfeed.js:1007
+#: js/viewfeed.js:1933
 #: plugins/mailto/init.js:7
-#: js/viewfeed.js:677
-#: js/viewfeed.js:699
-#: js/viewfeed.js:720
-#: js/viewfeed.js:779
-#: js/viewfeed.js:807
+#: plugins/mail/mail.js:7
+#: js/viewfeed.js:679
+#: js/viewfeed.js:701
+#: js/viewfeed.js:722
+#: js/viewfeed.js:781
+#: js/viewfeed.js:809
 msgid "No articles are selected."
 msgstr "Nejsou vybrány žádné články."
 
-#: js/viewfeed.js:927
+#: js/viewfeed.js:929
 #, perl-format
 msgid "Delete %d selected article in %s?"
 msgid_plural "Delete %d selected articles in %s?"
@@ -3181,7 +3097,7 @@ msgstr[0] "Odstranit %d vybraný článek v %s?"
 msgstr[1] "Odstranit %d vybrané články v %s?"
 msgstr[2] "Odstranit %d vybraných článků v %s?"
 
-#: js/viewfeed.js:929
+#: js/viewfeed.js:931
 #, perl-format
 msgid "Delete %d selected article?"
 msgid_plural "Delete %d selected articles?"
@@ -3189,7 +3105,7 @@ msgstr[0] "Odstranit %d vybraný článek?"
 msgstr[1] "Odstranit %d vybrané články?"
 msgstr[2] "Odstranit %d vybraných článků?"
 
-#: js/viewfeed.js:966
+#: js/viewfeed.js:968
 #, perl-format
 msgid "Archive %d selected article in %s?"
 msgid_plural "Archive %d selected articles in %s?"
@@ -3197,7 +3113,7 @@ msgstr[0] "Archivovat %d vybraný článek v %s?"
 msgstr[1] "Archivovat %d vybrané články v %s?"
 msgstr[2] "Archivovat %d vybraných článků v %s?"
 
-#: js/viewfeed.js:969
+#: js/viewfeed.js:971
 #, perl-format
 msgid "Move %d archived article back?"
 msgid_plural "Move %d archived articles back?"
@@ -3205,11 +3121,11 @@ msgstr[0] "Přesunout zpět %d archivovaný článek?"
 msgstr[1] "Přesunout zpět %d archivované články?"
 msgstr[2] "Přesunout zpět %d archivovaných článků?"
 
-#: js/viewfeed.js:971
+#: js/viewfeed.js:973
 msgid "Please note that unstarred articles might get purged on next feed update."
 msgstr "Vezměte na vědomí, že články neoznačené hvězdičkou mohou být při další aktualizaci kanálu vyčištěny."
 
-#: js/viewfeed.js:1011
+#: js/viewfeed.js:1013
 #, perl-format
 msgid "Mark %d selected article in %s as read?"
 msgid_plural "Mark %d selected articles in %s as read?"
@@ -3217,87 +3133,57 @@ msgstr[0] "Označit %d vybraný článek v %s jako přečtený?"
 msgstr[1] "Označit %d vybrané články v %s jako přečtené?"
 msgstr[2] "Označit %d vybraných článků v %s jako přečtené?"
 
-#: js/viewfeed.js:1031
+#: js/viewfeed.js:1033
 msgid "Edit article Tags"
 msgstr "Upravit značky článku"
 
-#: js/viewfeed.js:1037
+#: js/viewfeed.js:1039
 msgid "Saving article tags..."
 msgstr "Ukládání značek článku..."
 
-#: js/viewfeed.js:1670
+#: js/viewfeed.js:1672
 msgid "Open original article"
 msgstr "Otevřít původní článek"
 
-#: js/viewfeed.js:1677
+#: js/viewfeed.js:1679
 msgid "Display article URL"
 msgstr "Zobrazit URL článku"
 
-#: js/viewfeed.js:1787
+#: js/viewfeed.js:1789
 msgid "Assign label"
 msgstr "Přiřadit štítek"
 
-#: js/viewfeed.js:1792
+#: js/viewfeed.js:1794
 msgid "Remove label"
 msgstr "Odebrat štítek"
 
-#: js/viewfeed.js:1824
+#: js/viewfeed.js:1826
 msgid "Select articles in group"
 msgstr "Vybrat články ve skupině"
 
-#: js/viewfeed.js:1834
+#: js/viewfeed.js:1836
 msgid "Mark group as read"
 msgstr "Označit skupinu jako přečtenou"
 
-#: js/viewfeed.js:1846
+#: js/viewfeed.js:1848
 msgid "Mark feed as read"
 msgstr "Označit kanál jako přečtený"
 
-#: js/viewfeed.js:1899
+#: js/viewfeed.js:1901
 msgid "Please enter new score for selected articles:"
 msgstr "Zadejte nové hodnocení pro vybrané články:"
 
-#: js/viewfeed.js:1962
+#: js/viewfeed.js:1964
 msgid "Please enter new score for this article:"
 msgstr "Zadejte nové hodnocení pro tento článek:"
 
-#: js/viewfeed.js:1993
+#: js/viewfeed.js:1995
 msgid "Article URL:"
 msgstr "URL článku:"
 
-#: plugins/instances/instances.js:10
-msgid "Link Instance"
-msgstr "Propojit instanci"
-
-#: plugins/instances/instances.js:73
-msgid "Edit Instance"
-msgstr "Upravit instanci"
-
-#: plugins/instances/instances.js:122
-msgid "Remove selected instances?"
-msgstr "Odebrat vybrané instance?"
-
-#: plugins/instances/instances.js:125
-msgid "Removing selected instances..."
-msgstr "Odebírání vybraných instancí..."
-
-#: plugins/instances/instances.js:139
-#: plugins/instances/instances.js:151
-msgid "No instances are selected."
-msgstr "Nejsou vybrány žádné instance."
-
-#: plugins/instances/instances.js:156
-msgid "Please select only one instance."
-msgstr "Vyberte pouze jednu instanci."
-
-#: plugins/note/note.js:17
-msgid "Saving article note..."
-msgstr "Ukládání poznámky článku..."
-
-#: plugins/af_psql_trgm/init.js:11
-#, fuzzy
-msgid "Related articles"
-msgstr "Smazat článek"
+#: plugins/embed_original/init.js:6
+msgid "Sorry, your browser does not support sandboxed iframes."
+msgstr "Bohužel, váš prohlížeč nepodporuje vložené rámce v izolovaném prostoru."
 
 #: plugins/import_export/import_export.js:13
 msgid "Export Data"
@@ -3319,11 +3205,16 @@ msgstr "Import dat"
 msgid "Please choose the file first."
 msgstr "Nejdříve zvolte soubor."
 
-#: plugins/mail/mail.js:21
 #: plugins/mailto/init.js:21
+#: plugins/mail/mail.js:21
 msgid "Forward article by email"
 msgstr "Přeposlat článek e-mailem"
 
+#: plugins/af_psql_trgm/init.js:11
+#, fuzzy
+msgid "Related articles"
+msgstr "Smazat článek"
+
 #: plugins/mail/mail.js:36
 msgid "Error sending email:"
 msgstr "Chyba při odesílání e-mailu:"
@@ -3332,10 +3223,6 @@ msgstr "Chyba při odesílání e-mailu:"
 msgid "Your message has been sent."
 msgstr "Vaše zpráva byla odeslána."
 
-#: plugins/embed_original/init.js:6
-msgid "Sorry, your browser does not support sandboxed iframes."
-msgstr "Bohužel, váš prohlížeč nepodporuje vložené rámce v izolovaném prostoru."
-
 #: plugins/shorten_expanded/init.js:39
 msgid "Click to expand article"
 msgstr "Klikněte pro rozbalení článku"
@@ -3365,7 +3252,7 @@ msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr "Zneplatní všechny dříve vygenerované URL sdílených článků. Pokračovat?"
 
 #: plugins/share/share_prefs.js:6
-#: js/prefs.js:1437
+#: js/prefs.js:1433
 msgid "Clearing URLs..."
 msgstr "Vymazávání URL..."
 
@@ -3373,23 +3260,44 @@ msgstr "Vymazávání URL..."
 msgid "Shared URLs cleared."
 msgstr "Sdílené URL vymazány."
 
+#: plugins/note/note.js:17
+msgid "Saving article note..."
+msgstr "Ukládání poznámky článku..."
+
 #: js/feedlist.js:429
-#: js/feedlist.js:496
 msgid "Mark all articles in %s as read?"
 msgstr "Označit všechny články v %s jako přečtené?"
 
 #: js/feedlist.js:487
-msgid "Mark all articles in %s older than 1 day as read?"
+#, fuzzy
+msgid "Mark %w in %s older than 1 day as read?"
 msgstr "Označit všechny články starší než 1 den v %s jako přečtené?"
 
 #: js/feedlist.js:490
-msgid "Mark all articles in %s older than 1 week as read?"
+#, fuzzy
+msgid "Mark %w in %s older than 1 week as read?"
 msgstr "Označit všechny články starší než 1 týden v %s jako přečtené?"
 
 #: js/feedlist.js:493
-msgid "Mark all articles in %s older than 2 weeks as read?"
+#, fuzzy
+msgid "Mark %w in %s older than 2 weeks as read?"
 msgstr "Označit všechny články starší než 2 týdny v %s jako přečtené?"
 
+#: js/feedlist.js:496
+#, fuzzy
+msgid "Mark %w in %s as read?"
+msgstr "Označit všechny články v %s jako přečtené?"
+
+#: js/feedlist.js:499
+#, fuzzy
+msgid "search results"
+msgstr "Výsledky hledání: %s"
+
+#: js/feedlist.js:499
+#, fuzzy
+msgid "all articles"
+msgstr "Všechny články"
+
 #: js/functions.js:506
 msgid "Error explained"
 msgstr "Vysvětlení chyby"
@@ -3470,179 +3378,248 @@ msgstr "Již jste přihlášeni k odběru tohoto kanálu."
 msgid "Edit rule"
 msgstr "Upravit pravidlo"
 
-#: js/functions.js:1402
+#: js/functions.js:1381
 msgid "Edit Feed"
 msgstr "Upravit kanál"
 
-#: js/functions.js:1435
+#: js/functions.js:1414
 msgid "More Feeds"
 msgstr "Více kanálů"
 
-#: js/functions.js:1631
+#: js/functions.js:1610
 msgid "Help"
 msgstr "Nápověda"
 
-#: js/prefs.js:1032
+#: js/prefs.js:1028
 msgid "Remove category %s? Any nested feeds would be placed into Uncategorized."
 msgstr "Odebrat kategorii %s? Všechny vnořené kanály budou umístěny do kategorie Nezařazeno."
 
-#: js/prefs.js:1038
+#: js/prefs.js:1034
 msgid "Removing category..."
 msgstr "Odebírání kategorie..."
 
-#: js/prefs.js:1056
+#: js/prefs.js:1052
 msgid "Remove selected categories?"
 msgstr "Odebrat vybrané kategorie?"
 
-#: js/prefs.js:1059
+#: js/prefs.js:1055
 msgid "Removing selected categories..."
 msgstr "Odebírání vybraných kategorií..."
 
-#: js/prefs.js:1072
+#: js/prefs.js:1068
 msgid "No categories are selected."
 msgstr "Nejsou vybrány žádné kategorie."
 
-#: js/prefs.js:1079
+#: js/prefs.js:1075
 msgid "Category title:"
 msgstr "Název kategorie:"
 
-#: js/prefs.js:1083
+#: js/prefs.js:1079
 msgid "Creating category..."
 msgstr "Vytváření kategorie..."
 
-#: js/prefs.js:1106
+#: js/prefs.js:1102
 msgid "Feeds without recent updates"
 msgstr "Kanály bez nedávných aktualizací"
 
-#: js/prefs.js:1150
+#: js/prefs.js:1146
 msgid "Replace current OPML publishing address with a new one?"
 msgstr "Nahradit aktuální publikační adresu OPML novou?"
 
-#: js/prefs.js:1227
+#: js/prefs.js:1223
 msgid "Clearing feed..."
 msgstr "Vymazávání kanálu..."
 
-#: js/prefs.js:1247
+#: js/prefs.js:1243
 msgid "Rescore articles in selected feeds?"
 msgstr "Přehodnotit články ve vybraných kanálech?"
 
-#: js/prefs.js:1250
+#: js/prefs.js:1246
 msgid "Rescoring selected feeds..."
 msgstr "Přehodnocování vybraných kanálů..."
 
-#: js/prefs.js:1270
+#: js/prefs.js:1266
 msgid "Rescore all articles? This operation may take a lot of time."
 msgstr "Přehodnotit všechny články? Tato operace může trvat dlouho."
 
-#: js/prefs.js:1273
+#: js/prefs.js:1269
 msgid "Rescoring feeds..."
 msgstr "Přehodnocování kanálů..."
 
-#: js/prefs.js:1289
+#: js/prefs.js:1285
 msgid "Reset selected labels to default colors?"
 msgstr "Obnovit vybrané štítky na výchozí barvy?"
 
-#: js/prefs.js:1321
+#: js/prefs.js:1317
 msgid "Settings Profiles"
 msgstr "Profily nastavení"
 
-#: js/prefs.js:1330
+#: js/prefs.js:1326
 msgid "Remove selected profiles? Active and default profiles will not be removed."
 msgstr "Odebrat vybrané profily? Aktivní a výchozí profily nebudou odebrány."
 
-#: js/prefs.js:1333
+#: js/prefs.js:1329
 msgid "Removing selected profiles..."
 msgstr "Odebírání vybraných profilů..."
 
-#: js/prefs.js:1349
+#: js/prefs.js:1345
 msgid "No profiles are selected."
 msgstr "Nejsou vybrány žádné profily."
 
-#: js/prefs.js:1357
-#: js/prefs.js:1410
+#: js/prefs.js:1353
+#: js/prefs.js:1406
 msgid "Activate selected profile?"
 msgstr "Aktivovat vybraný profil?"
 
-#: js/prefs.js:1374
-#: js/prefs.js:1426
+#: js/prefs.js:1370
+#: js/prefs.js:1422
 msgid "Please choose a profile to activate."
 msgstr "Zvolte profil k aktivaci."
 
-#: js/prefs.js:1379
+#: js/prefs.js:1375
 msgid "Creating profile..."
 msgstr "Vytváření profilu..."
 
-#: js/prefs.js:1434
+#: js/prefs.js:1430
 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr "Zneplatní všechny dříve vygenerované URL kanálů. Pokračovat?"
 
-#: js/prefs.js:1444
+#: js/prefs.js:1440
 msgid "Generated URLs cleared."
 msgstr "Generované URL vymazány."
 
-#: js/prefs.js:1516
+#: js/prefs.js:1512
 msgid "Label Editor"
 msgstr "Editor štítků"
 
-#: js/tt-rss.js:684
+#: js/tt-rss.js:685
 msgid "You can't unsubscribe from the category."
 msgstr "Nemůžete odhlásit odběr kategorie."
 
-#: js/viewfeed.js:125
-#: js/viewfeed.js:175
-#: js/viewfeed.js:192
+#: js/viewfeed.js:127
+#: js/viewfeed.js:177
+#: js/viewfeed.js:194
 msgid "Click to open next unread feed."
 msgstr "Klikněte pro otevření dalšího nepřečteného kanálu."
 
-#: js/viewfeed.js:129
+#: js/viewfeed.js:131
 msgid "Cancel search"
 msgstr "Zrušit hledání"
 
-#: js/viewfeed.js:189
+#: js/viewfeed.js:191
 #, fuzzy
 msgid "New articles found, reload feed to continue."
 msgstr "Nenalezeny žádné články k zobrazení."
 
-#: js/viewfeed.js:424
+#: js/viewfeed.js:426
 msgid "Unstar article"
 msgstr "Zrušit označení článku hvězdičkou"
 
-#: js/viewfeed.js:428
+#: js/viewfeed.js:430
 msgid "Star article"
 msgstr "Označit článek hvězdičkou"
 
-#: js/viewfeed.js:478
+#: js/viewfeed.js:480
 msgid "Unpublish article"
 msgstr "Zrušit publikování článku"
 
-#: js/viewfeed.js:482
+#: js/viewfeed.js:484
 msgid "Publish article"
 msgstr "Publikovat článek"
 
-#: js/viewfeed.js:622
+#: js/viewfeed.js:624
 msgid "%d article selected"
 msgid_plural "%d articles selected"
 msgstr[0] "%d vybraný článek"
 msgstr[1] "%d vybrané články"
 msgstr[2] "%d vybraných článků"
 
-#: js/viewfeed.js:1286
+#: js/viewfeed.js:1288
 msgid "No article is selected."
 msgstr "Není vybrán žádný článek."
 
-#: js/viewfeed.js:1321
+#: js/viewfeed.js:1323
 msgid "No articles found to mark"
 msgstr "Nenalezeny žádné články k označení"
 
-#: js/viewfeed.js:1323
+#: js/viewfeed.js:1325
 msgid "Mark %d article as read?"
 msgid_plural "Mark %d articles as read?"
 msgstr[0] "Označit %d článek jako přečtený?"
 msgstr[1] "Označit %d články jako přečtené?"
 msgstr[2] "Označit %d článků jako přečtené?"
 
-#~ msgid "Cache images locally"
-#~ msgstr "Ukládat obrázky do mezipaměti místně"
+#~ msgid "Resubscribe to push updates"
+#~ msgstr "Znovu se přihlásit k odběru pro aktualizace doručené bez vyžádání"
+
+#~ msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
+#~ msgstr "Obnoví stav odběru PubSubHubbub pro kanály s povoleným doručením bez vyžádání."
+
+#~ msgid "Download more plugins at tt-rss.org <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forums</a> or <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a>."
+#~ msgstr "Stáhnout více modulů na <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">fórech</a> nebo <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a> tt-rss.org."
+
+#~ msgid "Linked"
+#~ msgstr "Propojeno"
+
+#~ msgid "Instance"
+#~ msgstr "Instance"
+
+#~ msgid "Instance URL"
+#~ msgstr "URL instance"
+
+#~ msgid "Access key:"
+#~ msgstr "Přístupový klíč:"
+
+#~ msgid "Access key"
+#~ msgstr "Přístupový klíč"
+
+#~ msgid "Use one access key for both linked instances."
+#~ msgstr "Použít jeden přístupový klíč pro obě propojené instance."
+
+#~ msgid "Generate new key"
+#~ msgstr "Generovat nový klíč"
+
+#~ msgid "Link instance"
+#~ msgstr "Propojit instanci"
+
+#~ msgid "You can connect other instances of Tiny Tiny RSS to this one to share Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
+#~ msgstr "Můžete připojit další instance Tiny Tiny RSS k této pro sdílení oblíbených kanálů. Připojit k této instanci Tiny Tiny RSS pomocí této URL:"
+
+#~ msgid "Last connected"
+#~ msgstr "Naposledy připojen"
+
+#~ msgid "Status"
+#~ msgstr "Stav"
+
+#~ msgid "Stored feeds"
+#~ msgstr "Uložené kanály"
+
+#~ msgid "Create link"
+#~ msgstr "Vytvořit odkaz"
+
+#~ msgid "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification hub again on next feed update."
+#~ msgstr "Obnovit odběr? Tiny Tiny RSS se pokusí znovu přihlásit k odběru oznamovacího centra při další aktualizaci kanálu."
+
+#~ msgid "Subscription reset."
+#~ msgstr "Odběr obnoven."
+
+#~ msgid "Link Instance"
+#~ msgstr "Propojit instanci"
+
+#~ msgid "Edit Instance"
+#~ msgstr "Upravit instanci"
+
+#~ msgid "Remove selected instances?"
+#~ msgstr "Odebrat vybrané instance?"
+
+#~ msgid "Removing selected instances..."
+#~ msgstr "Odebírání vybraných instancí..."
+
+#~ msgid "No instances are selected."
+#~ msgstr "Nejsou vybrány žádné instance."
+
+#~ msgid "Please select only one instance."
+#~ msgstr "Vyberte pouze jednu instanci."
 
 #~ msgid "The error will be reported to the configured log destination."
 #~ msgstr "Chyba bude nahlášena do nastaveného cíle protokolu."
diff --git a/locale/da_DK/LC_MESSAGES/messages.mo b/locale/da_DK/LC_MESSAGES/messages.mo
index c15aeb793..e0c869577 100644
--- a/locale/da_DK/LC_MESSAGES/messages.mo
+++ b/locale/da_DK/LC_MESSAGES/messages.mo
diff --git a/locale/da_DK/LC_MESSAGES/messages.po b/locale/da_DK/LC_MESSAGES/messages.po
index 4b6b9231c..31424a485 100644
--- a/locale/da_DK/LC_MESSAGES/messages.po
+++ b/locale/da_DK/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tt-rss git\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 15:25+0300\n"
+"POT-Creation-Date: 2017-07-04 16:29+0300\n"
 "Last-Translator: Brendan <[email protected]>\n"
 "Language-Team: OpenSRS [email protected]>\n"
 "Language: da_DK\n"
@@ -166,31 +166,30 @@ msgstr "Bruger ikke fundet"
 #: prefs.php:118
 #: classes/backend.php:5
 #: classes/pref/labels.php:282
-#: classes/pref/feeds.php:1402
-#: classes/pref/filters.php:779
+#: classes/pref/filters.php:819
+#: classes/pref/feeds.php:1376
 #: js/feedlist.js:149
-#: js/functions.js:1131
-#: js/functions.js:1231
-#: js/functions.js:1478
+#: js/functions.js:1210
+#: js/functions.js:1457
 #: js/prefs.js:621
-#: js/prefs.js:818
-#: js/prefs.js:1648
-#: js/prefs.js:1663
-#: js/tt-rss.js:550
-#: js/viewfeed.js:1182
+#: js/prefs.js:813
+#: js/prefs.js:1644
+#: js/prefs.js:1659
+#: js/tt-rss.js:551
+#: js/viewfeed.js:1184
 #: plugins/import_export/import_export.js:17
 #: js/feedlist.js:467
-#: js/feedlist.js:512
+#: js/feedlist.js:515
 #: js/functions.js:372
 #: js/functions.js:630
-#: js/prefs.js:1360
-#: js/prefs.js:1413
-#: js/prefs.js:1452
-#: js/prefs.js:1465
-#: js/prefs.js:1476
-#: js/prefs.js:1491
-#: js/tt-rss.js:567
-#: js/viewfeed.js:762
+#: js/prefs.js:1356
+#: js/prefs.js:1409
+#: js/prefs.js:1448
+#: js/prefs.js:1461
+#: js/prefs.js:1472
+#: js/prefs.js:1487
+#: js/tt-rss.js:568
+#: js/viewfeed.js:764
 msgid "Loading, please wait..."
 msgstr "Indlæser, vent venligst ..."
 
@@ -207,13 +206,13 @@ msgid "All Articles"
 msgstr "Alle artikler"
 
 #: index.php:192
-#: include/functions2.php:107
+#: include/functions.php:1181
 #: classes/feeds.php:110
 msgid "Starred"
 msgstr "Markeret"
 
 #: index.php:193
-#: include/functions2.php:108
+#: include/functions.php:1182
 #: classes/feeds.php:111
 msgid "Published"
 msgstr "Udgivet"
@@ -254,7 +253,7 @@ msgstr "Overskrift"
 
 #: index.php:209
 #: index.php:249
-#: include/functions2.php:95
+#: include/functions.php:1169
 #: classes/feeds.php:115
 #: js/FeedTree.js:138
 #: js/FeedTree.js:166
@@ -294,7 +293,7 @@ msgid "Feed actions:"
 msgstr "Feed-handlinger:"
 
 #: index.php:244
-#: classes/handler/public.php:672
+#: classes/handler/public.php:583
 msgid "Subscribe to feed..."
 msgstr "Abonner på feedet ..."
 
@@ -308,8 +307,8 @@ msgstr "Gendan feed"
 
 #: index.php:247
 #: classes/pref/feeds.php:785
-#: classes/pref/feeds.php:1357
-#: js/PrefFeedTree.js:78
+#: classes/pref/feeds.php:1331
+#: js/PrefFeedTree.js:80
 msgid "Unsubscribe"
 msgstr "Aflys abonnement"
 
@@ -326,7 +325,7 @@ msgid "Other actions:"
 msgstr "Andre handlinger:"
 
 #: index.php:252
-#: include/functions2.php:81
+#: include/functions.php:1155
 msgid "Toggle widescreen mode"
 msgstr "Skift til widescreen"
 
@@ -352,7 +351,7 @@ msgstr ""
 
 #: prefs.php:33
 #: prefs.php:136
-#: include/functions2.php:110
+#: include/functions.php:1184
 #: classes/pref/prefs.php:435
 msgid "Preferences"
 msgstr "Præferencer"
@@ -367,20 +366,19 @@ msgstr "Luk præferencer"
 
 #: prefs.php:139
 #: classes/pref/feeds.php:112
-#: classes/pref/feeds.php:1297
-#: classes/pref/feeds.php:1346
+#: classes/pref/feeds.php:1271
+#: classes/pref/feeds.php:1320
 msgid "Feeds"
 msgstr "Feeds"
 
 #: prefs.php:142
-#: classes/pref/filters.php:248
+#: classes/pref/filters.php:273
 msgid "Filters"
 msgstr "Filtre"
 
 #: prefs.php:145
-#: include/functions.php:1327
-#: include/functions.php:1979
 #: classes/pref/labels.php:90
+#: classes/feeds.php:1718
 msgid "Labels"
 msgstr "Etiketter"
 
@@ -409,13 +407,13 @@ msgstr ""
 #: register.php:337
 #: register.php:347
 #: register.php:359
-#: classes/handler/public.php:742
-#: classes/handler/public.php:813
-#: classes/handler/public.php:911
-#: classes/handler/public.php:990
-#: classes/handler/public.php:1004
-#: classes/handler/public.php:1011
-#: classes/handler/public.php:1036
+#: classes/handler/public.php:653
+#: classes/handler/public.php:724
+#: classes/handler/public.php:822
+#: classes/handler/public.php:901
+#: classes/handler/public.php:915
+#: classes/handler/public.php:922
+#: classes/handler/public.php:947
 #, fuzzy
 msgid "Return to Tiny Tiny RSS"
 msgstr "Opdater Tiny Tiny RSS"
@@ -433,12 +431,12 @@ msgid "Check availability"
 msgstr "Tjek tilgængelighed"
 
 #: register.php:229
-#: classes/handler/public.php:829
+#: classes/handler/public.php:740
 msgid "Email:"
 msgstr "E-mail:"
 
 #: register.php:232
-#: classes/handler/public.php:834
+#: classes/handler/public.php:745
 msgid "How much is two plus two:"
 msgstr ""
 
@@ -466,17 +464,23 @@ msgstr "Konto blev oprettet med succes."
 msgid "New user registrations are currently closed."
 msgstr ""
 
-#: update.php:67
+#: update.php:66
 msgid "Tiny Tiny RSS data update script."
 msgstr ""
 
-#: include/digest.php:109
-#: include/functions.php:1336
-#: include/functions.php:1880
-#: include/functions.php:1965
-#: include/functions.php:1987
-#: classes/opml.php:421
+#: include/controls.php:83
+#: classes/pref/filters.php:242
+#: classes/pref/filters.php:253
+#: classes/pref/filters.php:544
+msgid "All feeds"
+msgstr "Alle feeds"
+
+#: include/controls.php:134
+#: include/controls.php:316
 #: classes/pref/feeds.php:228
+#: classes/opml.php:486
+#: classes/feeds.php:1727
+#: classes/digest.php:113
 msgid "Uncategorized"
 msgstr "Ikke kategoriseret"
 
@@ -491,395 +495,290 @@ msgstr[1] "Arkiverede artikler"
 msgid "No feeds found."
 msgstr "Der blev ikke fundet nogen feeds."
 
-#: include/functions.php:1029
+#: include/functions.php:900
 #, php-format
 msgid "%d min"
 msgstr ""
 
-#: include/functions.php:1325
-#: include/functions.php:1977
-msgid "Special"
-msgstr "Speciel"
-
-#: include/functions.php:1828
-#: classes/pref/filters.php:229
-#: classes/pref/filters.php:507
-msgid "All feeds"
-msgstr "Alle feeds"
-
-#: include/functions.php:2032
-msgid "Starred articles"
-msgstr "Markerede artikler"
-
-#: include/functions.php:2034
-msgid "Published articles"
-msgstr "Udgivne artikler"
-
-#: include/functions.php:2036
-msgid "Fresh articles"
-msgstr "Nye artikler"
-
-#: include/functions.php:2038
-#: include/functions2.php:105
-msgid "All articles"
-msgstr "Alle artikler"
-
-#: include/functions.php:2040
-msgid "Archived articles"
-msgstr "Arkiverede artikler"
-
-#: include/functions.php:2042
-msgid "Recently read"
-msgstr "Senest læst"
-
-#: include/functions2.php:57
+#: include/functions.php:1131
 msgid "Navigation"
 msgstr "Navigation"
 
-#: include/functions2.php:58
+#: include/functions.php:1132
 msgid "Open next feed"
 msgstr "Åbn næste feed"
 
-#: include/functions2.php:59
+#: include/functions.php:1133
 msgid "Open previous feed"
 msgstr "Åbn forrige feed"
 
-#: include/functions2.php:60
+#: include/functions.php:1134
 msgid "Open next article"
 msgstr "Åbn næste artikel"
 
-#: include/functions2.php:61
+#: include/functions.php:1135
 msgid "Open previous article"
 msgstr "Åbn forrige artikel"
 
-#: include/functions2.php:62
+#: include/functions.php:1136
 msgid "Open next article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions2.php:63
+#: include/functions.php:1137
 msgid "Open previous article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions2.php:64
+#: include/functions.php:1138
 msgid "Move to next article (don't expand or mark read)"
 msgstr ""
 
-#: include/functions2.php:65
+#: include/functions.php:1139
 msgid "Move to previous article (don't expand or mark read)"
 msgstr ""
 
-#: include/functions2.php:66
+#: include/functions.php:1140
 msgid "Show search dialog"
 msgstr "Vise søgedialog"
 
-#: include/functions2.php:67
+#: include/functions.php:1141
 msgid "Article"
 msgstr "Artikel"
 
-#: include/functions2.php:68
-#: js/viewfeed.js:1699
+#: include/functions.php:1142
+#: js/viewfeed.js:1701
 msgid "Toggle starred"
 msgstr "Skift markeret"
 
-#: include/functions2.php:69
-#: js/viewfeed.js:1711
+#: include/functions.php:1143
+#: js/viewfeed.js:1713
 msgid "Toggle published"
 msgstr "Skift udgivne"
 
-#: include/functions2.php:70
-#: js/viewfeed.js:1686
+#: include/functions.php:1144
+#: js/viewfeed.js:1688
 msgid "Toggle unread"
 msgstr "Skift ulæst"
 
-#: include/functions2.php:71
+#: include/functions.php:1145
 msgid "Edit tags"
 msgstr "Rediger tags"
 
-#: include/functions2.php:72
+#: include/functions.php:1146
 msgid "Open in new window"
 msgstr "Åbn i et nyt vindue"
 
-#: include/functions2.php:73
-#: js/viewfeed.js:1732
+#: include/functions.php:1147
+#: js/viewfeed.js:1734
 msgid "Mark below as read"
 msgstr "Marker nedenstående som læst"
 
-#: include/functions2.php:74
-#: js/viewfeed.js:1725
+#: include/functions.php:1148
+#: js/viewfeed.js:1727
 msgid "Mark above as read"
 msgstr "Marker ovenstående som læst"
 
-#: include/functions2.php:75
+#: include/functions.php:1149
 msgid "Scroll down"
 msgstr "Rul nedad"
 
-#: include/functions2.php:76
+#: include/functions.php:1150
 msgid "Scroll up"
 msgstr "Rul opad"
 
-#: include/functions2.php:77
+#: include/functions.php:1151
 msgid "Select article under cursor"
 msgstr "Vælg artikel under markør"
 
-#: include/functions2.php:78
+#: include/functions.php:1152
 msgid "Email article"
 msgstr "E-mail-artikel"
 
-#: include/functions2.php:79
+#: include/functions.php:1153
 msgid "Close/collapse article"
 msgstr "Luk/skjul artikel"
 
-#: include/functions2.php:80
+#: include/functions.php:1154
 #, fuzzy
 msgid "Toggle article expansion (combined mode)"
 msgstr "Skift kombineret modus"
 
-#: include/functions2.php:82
+#: include/functions.php:1156
 #: plugins/embed_original/init.php:31
 msgid "Toggle embed original"
 msgstr "Skift integreret original"
 
-#: include/functions2.php:83
+#: include/functions.php:1157
 msgid "Article selection"
 msgstr "Artikelvalg"
 
-#: include/functions2.php:84
+#: include/functions.php:1158
 msgid "Select all articles"
 msgstr "Vælg alle artikler"
 
-#: include/functions2.php:85
+#: include/functions.php:1159
 msgid "Select unread"
 msgstr "Vælg ulæste"
 
-#: include/functions2.php:86
+#: include/functions.php:1160
 msgid "Select starred"
 msgstr "Vælg markerede"
 
-#: include/functions2.php:87
+#: include/functions.php:1161
 msgid "Select published"
 msgstr "Vælg udgivne"
 
-#: include/functions2.php:88
+#: include/functions.php:1162
 msgid "Invert selection"
 msgstr "Inverter valg"
 
-#: include/functions2.php:89
+#: include/functions.php:1163
 msgid "Deselect everything"
 msgstr "Fravælg alt"
 
-#: include/functions2.php:90
+#: include/functions.php:1164
 #: classes/pref/feeds.php:555
-#: classes/pref/feeds.php:823
+#: classes/pref/feeds.php:811
 msgid "Feed"
 msgstr "Feed"
 
-#: include/functions2.php:91
+#: include/functions.php:1165
 msgid "Refresh current feed"
 msgstr "Opdater aktuelt feed"
 
-#: include/functions2.php:92
+#: include/functions.php:1166
 msgid "Un/hide read feeds"
 msgstr "Vis/skjul læste feeds"
 
-#: include/functions2.php:93
-#: classes/pref/feeds.php:1349
+#: include/functions.php:1167
+#: classes/pref/feeds.php:1323
 msgid "Subscribe to feed"
 msgstr "Abonner på feedet"
 
-#: include/functions2.php:94
+#: include/functions.php:1168
 #: js/FeedTree.js:145
-#: js/PrefFeedTree.js:72
-#: js/viewfeed.js:1853
+#: js/PrefFeedTree.js:74
+#: js/viewfeed.js:1855
 msgid "Edit feed"
 msgstr "Rediger feed"
 
-#: include/functions2.php:96
+#: include/functions.php:1170
 msgid "Reverse headlines"
 msgstr "Reverser overskrifter"
 
-#: include/functions2.php:97
+#: include/functions.php:1171
 msgid "Toggle headline grouping"
 msgstr ""
 
-#: include/functions2.php:98
+#: include/functions.php:1172
 msgid "Debug feed update"
 msgstr "Udfør fejlfinding i feed-opdatering"
 
-#: include/functions2.php:99
+#: include/functions.php:1173
 #, fuzzy
 msgid "Debug viewfeed()"
 msgstr "Udfør fejlfinding i feed-opdatering"
 
-#: include/functions2.php:100
+#: include/functions.php:1174
 #: js/FeedTree.js:194
 #, fuzzy
 msgid "Mark all feeds as read"
 msgstr "Marker feed som læst"
 
-#: include/functions2.php:101
+#: include/functions.php:1175
 msgid "Un/collapse current category"
 msgstr "Vis/skjul aktuel kategori"
 
-#: include/functions2.php:102
+#: include/functions.php:1176
 msgid "Toggle combined mode"
 msgstr "Skift kombineret modus"
 
-#: include/functions2.php:103
+#: include/functions.php:1177
 #, fuzzy
 msgid "Toggle auto expand in combined mode"
 msgstr "Skift kombineret modus"
 
-#: include/functions2.php:104
+#: include/functions.php:1178
 msgid "Go to"
 msgstr "Gå til"
 
-#: include/functions2.php:106
+#: include/functions.php:1179
+#: classes/feeds.php:1602
+msgid "All articles"
+msgstr "Alle artikler"
+
+#: include/functions.php:1180
 msgid "Fresh"
 msgstr "Ny"
 
-#: include/functions2.php:109
-#: js/tt-rss.js:494
-#: js/tt-rss.js:663
+#: include/functions.php:1183
+#: js/tt-rss.js:495
+#: js/tt-rss.js:664
 msgid "Tag cloud"
 msgstr "Tag Cloud"
 
-#: include/functions2.php:111
+#: include/functions.php:1185
 msgid "Other"
 msgstr "Andet"
 
-#: include/functions2.php:112
+#: include/functions.php:1186
 #: classes/pref/labels.php:267
 msgid "Create label"
 msgstr "Opret etiket"
 
-#: include/functions2.php:113
-#: classes/pref/filters.php:753
+#: include/functions.php:1187
+#: classes/pref/filters.php:793
 msgid "Create filter"
 msgstr "Opret filter"
 
-#: include/functions2.php:114
+#: include/functions.php:1188
 msgid "Un/collapse sidebar"
 msgstr "Vis/skjul sidebjælke"
 
-#: include/functions2.php:115
+#: include/functions.php:1189
 msgid "Show help dialog"
 msgstr "Vis hjælpedialog"
 
-#: include/functions2.php:670
-#, php-format
-msgid "Search results: %s"
-msgstr "Søgeresultater: %s"
-
-#: include/functions2.php:1336
-#: classes/feeds.php:752
-#, fuzzy
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] "kommentarer"
-msgstr[1] "kommentarer"
-
-#: include/functions2.php:1340
-#: classes/feeds.php:756
-msgid "comments"
-msgstr "kommentarer"
-
-#: include/functions2.php:1366
-msgid " - "
-msgstr " - "
-
-#: include/functions2.php:1397
-#: include/functions2.php:1648
-#: classes/article.php:311
-msgid "no tags"
-msgstr "ingen tags"
-
-#: include/functions2.php:1407
-#: classes/feeds.php:738
-msgid "Edit tags for this article"
-msgstr ""
-
-#: include/functions2.php:1439
-#: classes/feeds.php:690
-msgid "Originally from:"
-msgstr "Oprindeligt fra:"
-
-#: include/functions2.php:1452
-#: classes/pref/feeds.php:574
-#: classes/feeds.php:703
-msgid "Feed URL"
-msgstr "Feedets webadresse"
-
-#: include/functions2.php:1489
-#: classes/backend.php:105
-#: classes/dlg.php:37
-#: classes/dlg.php:60
-#: classes/dlg.php:93
-#: classes/dlg.php:159
-#: classes/dlg.php:186
-#: classes/pref/feeds.php:1652
-#: classes/pref/feeds.php:1718
-#: classes/pref/filters.php:204
-#: classes/pref/prefs.php:1097
-#: plugins/af_psql_trgm/init.php:102
-#: plugins/import_export/init.php:415
-#: plugins/import_export/init.php:461
-#: plugins/share/init.php:121
-msgid "Close this window"
-msgstr "Luk dette vindue"
-
-#: include/functions2.php:1686
-msgid "(edit note)"
-msgstr "(rediger note)"
-
-#: include/functions2.php:1960
-msgid "unknown type"
-msgstr "ukendt type"
-
-#: include/functions2.php:2037
-msgid "Attachments"
-msgstr "Vedhæftninger"
-
-#: include/functions2.php:2496
+#: include/functions.php:2456
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: include/functions2.php:2497
+#: include/functions.php:2457
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: include/functions2.php:2498
+#: include/functions.php:2458
 msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
 msgstr ""
 
-#: include/functions2.php:2499
+#: include/functions.php:2459
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: include/functions2.php:2500
+#: include/functions.php:2460
 #, fuzzy
 msgid "No file was uploaded"
 msgstr "Der er ikke indlæst nogen fil."
 
-#: include/functions2.php:2501
+#: include/functions.php:2461
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: include/functions2.php:2502
+#: include/functions.php:2462
 msgid "Failed to write file to disk."
 msgstr ""
 
-#: include/functions2.php:2503
+#: include/functions.php:2463
 msgid "A PHP extension stopped the file upload."
 msgstr ""
 
 #: include/login_form.php:197
-#: classes/handler/public.php:569
-#: classes/handler/public.php:824
+#: classes/handler/public.php:480
+#: classes/handler/public.php:735
 msgid "Login:"
 msgstr "Logon:"
 
 #: include/login_form.php:207
-#: classes/handler/public.php:572
+#: classes/handler/public.php:483
 msgid "Password:"
 msgstr "Adgangskode:"
 
@@ -892,7 +791,7 @@ msgid "Profile:"
 msgstr "Profil:"
 
 #: include/login_form.php:223
-#: classes/handler/public.php:311
+#: classes/handler/public.php:287
 #: classes/pref/prefs.php:1035
 #: classes/rpc.php:63
 msgid "Default profile"
@@ -911,7 +810,7 @@ msgid "Remember me"
 msgstr "Husk mig"
 
 #: include/login_form.php:249
-#: classes/handler/public.php:577
+#: classes/handler/public.php:488
 msgid "Log in"
 msgstr "Log på"
 
@@ -927,145 +826,44 @@ msgstr ""
 msgid "Session failed to validate (password changed)"
 msgstr ""
 
-#: classes/article.php:25
-msgid "Article not found."
-msgstr "Artikel ikke fundet"
-
-#: classes/article.php:197
-msgid "Tags for this article (separated by commas):"
-msgstr ""
-
-#: classes/article.php:222
-#: classes/pref/labels.php:79
-#: classes/pref/users.php:98
-#: classes/pref/feeds.php:801
-#: classes/pref/feeds.php:943
-#: classes/pref/filters.php:485
-#: classes/pref/prefs.php:981
-#: plugins/instances/init.php:245
-#: plugins/nsfw/init.php:85
-#: plugins/note/init.php:51
-#: plugins/af_readability/init.php:68
-#: plugins/af_redditimgur/init.php:60
-#: plugins/af_psql_trgm/init.php:181
-#: plugins/mail/init.php:64
-#: plugins/af_zz_imgproxy/init.php:213
-msgid "Save"
-msgstr "Gem"
-
-#: classes/article.php:224
-#: classes/handler/public.php:546
-#: classes/handler/public.php:580
-#: classes/pref/labels.php:81
-#: classes/pref/users.php:100
-#: classes/pref/feeds.php:802
-#: classes/pref/feeds.php:946
-#: classes/pref/feeds.php:1859
-#: classes/pref/filters.php:488
-#: classes/pref/filters.php:902
-#: classes/pref/filters.php:983
-#: classes/pref/filters.php:1076
-#: classes/pref/prefs.php:983
-#: classes/feeds.php:1105
-#: classes/feeds.php:1155
-#: classes/feeds.php:1192
-#: plugins/instances/init.php:248
-#: plugins/instances/init.php:436
-#: plugins/note/init.php:53
-#: plugins/mail/init.php:173
-msgid "Cancel"
-msgstr "Annuller"
-
-#: classes/opml.php:28
-#: classes/opml.php:33
-msgid "OPML Utility"
-msgstr "OPML-hjælpeprogram"
-
-#: classes/opml.php:37
-msgid "Importing OPML..."
-msgstr "Importerer OPML ..."
-
-#: classes/opml.php:41
-msgid "Return to preferences"
-msgstr "Vend tilbage til præferencer"
-
-#: classes/opml.php:271
-#, php-format
-msgid "Adding feed: %s"
-msgstr "Tilføjer feed: %s"
-
-#: classes/opml.php:282
-#, php-format
-msgid "Duplicate feed: %s"
-msgstr "Dupliker feed: %s"
-
-#: classes/opml.php:296
-#, php-format
-msgid "Adding label %s"
-msgstr "Tilføjer etiket: %s"
-
-#: classes/opml.php:299
-#, php-format
-msgid "Duplicate label: %s"
-msgstr "Dupliker etiket: %s"
-
-#: classes/opml.php:311
-#, php-format
-msgid "Setting preference key %s to %s"
-msgstr ""
-
-#: classes/opml.php:343
-msgid "Adding filter..."
-msgstr "Tilføjer filter ..."
-
-#: classes/opml.php:421
-#, php-format
-msgid "Processing category: %s"
-msgstr "Behandler kategori: %s"
-
-#: classes/opml.php:470
-#, php-format
-msgid "Upload failed with error code %d"
-msgstr ""
-
-#: classes/opml.php:484
-#: plugins/import_export/init.php:442
-msgid "Unable to move uploaded file."
-msgstr ""
-
-#: classes/opml.php:488
-#: plugins/import_export/init.php:446
-msgid "Error: please upload OPML file."
-msgstr ""
-
-#: classes/opml.php:499
-msgid "Error: unable to find moved OPML file."
-msgstr ""
-
-#: classes/opml.php:506
-msgid "Error while parsing document."
-msgstr "Fejl under dokumentparsing."
-
-#: classes/backend.php:33
+#: classes/backend.php:31
 msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
 msgstr ""
 
-#: classes/backend.php:38
+#: classes/backend.php:36
 msgid "Keyboard Shortcuts"
 msgstr "Tastaturgenveje"
 
-#: classes/backend.php:61
+#: classes/backend.php:59
 msgid "Shift"
 msgstr "Shift"
 
-#: classes/backend.php:64
+#: classes/backend.php:62
 msgid "Ctrl"
 msgstr "Ctrl"
 
-#: classes/backend.php:99
+#: classes/backend.php:97
 msgid "Help topic not found."
 msgstr "Emne i hjælp ikke fundet."
 
+#: classes/backend.php:103
+#: classes/dlg.php:37
+#: classes/dlg.php:60
+#: classes/dlg.php:93
+#: classes/dlg.php:159
+#: classes/dlg.php:186
+#: classes/article.php:744
+#: classes/pref/filters.php:206
+#: classes/pref/prefs.php:1097
+#: classes/pref/feeds.php:1626
+#: classes/pref/feeds.php:1692
+#: plugins/import_export/init.php:421
+#: plugins/import_export/init.php:467
+#: plugins/af_psql_trgm/init.php:102
+#: plugins/share/init.php:120
+msgid "Close this window"
+msgstr "Luk dette vindue"
+
 #: classes/dlg.php:17
 msgid "If you have imported labels and/or filters, you might need to reload preferences to see your new data."
 msgstr ""
@@ -1077,7 +875,7 @@ msgstr "Webadresse til offentlig OPML"
 
 #: classes/dlg.php:57
 #: classes/dlg.php:183
-#: plugins/share/init.php:118
+#: plugins/share/init.php:117
 msgid "Generate new URL"
 msgstr "Generer ny webadresse"
 
@@ -1098,130 +896,225 @@ msgstr ""
 msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 
-#: classes/handler/public.php:510
+#: classes/article.php:25
+msgid "Article not found."
+msgstr "Artikel ikke fundet"
+
+#: classes/article.php:197
+msgid "Tags for this article (separated by commas):"
+msgstr ""
+
+#: classes/article.php:222
+#: classes/pref/labels.php:79
+#: classes/pref/filters.php:519
+#: classes/pref/users.php:98
+#: classes/pref/prefs.php:981
+#: classes/pref/feeds.php:789
+#: classes/pref/feeds.php:931
+#: plugins/af_psql_trgm/init.php:181
+#: plugins/nsfw/init.php:85
+#: plugins/af_readability/init.php:68
+#: plugins/mail/init.php:64
+#: plugins/af_redditimgur/init.php:60
+#: plugins/note/init.php:51
+#: plugins/af_zz_imgproxy/init.php:240
+msgid "Save"
+msgstr "Gem"
+
+#: classes/article.php:224
+#: classes/handler/public.php:457
+#: classes/handler/public.php:491
+#: classes/pref/labels.php:81
+#: classes/pref/filters.php:522
+#: classes/pref/filters.php:942
+#: classes/pref/filters.php:1022
+#: classes/pref/filters.php:1115
+#: classes/pref/users.php:100
+#: classes/pref/prefs.php:983
+#: classes/pref/feeds.php:790
+#: classes/pref/feeds.php:934
+#: classes/pref/feeds.php:1833
+#: classes/feeds.php:1098
+#: classes/feeds.php:1148
+#: classes/feeds.php:1185
+#: plugins/mail/init.php:173
+#: plugins/note/init.php:53
+msgid "Cancel"
+msgstr "Annuller"
+
+#: classes/article.php:311
+#: classes/article.php:652
+#: classes/article.php:805
+msgid "no tags"
+msgstr "ingen tags"
+
+#: classes/article.php:419
+msgid "unknown type"
+msgstr "ukendt type"
+
+#: classes/article.php:496
+msgid "Attachments"
+msgstr "Vedhæftninger"
+
+#: classes/article.php:591
+#: classes/feeds.php:741
+#, fuzzy
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] "kommentarer"
+msgstr[1] "kommentarer"
+
+#: classes/article.php:595
+#: classes/feeds.php:745
+msgid "comments"
+msgstr "kommentarer"
+
+#: classes/article.php:621
+msgid " - "
+msgstr " - "
+
+#: classes/article.php:662
+#: classes/feeds.php:727
+msgid "Edit tags for this article"
+msgstr ""
+
+#: classes/article.php:694
+#: classes/feeds.php:681
+msgid "Originally from:"
+msgstr "Oprindeligt fra:"
+
+#: classes/article.php:707
+#: classes/pref/feeds.php:574
+#: classes/feeds.php:694
+msgid "Feed URL"
+msgstr "Feedets webadresse"
+
+#: classes/article.php:843
+msgid "(edit note)"
+msgstr "(rediger note)"
+
+#: classes/handler/public.php:421
 #: plugins/bookmarklets/init.php:40
 #, fuzzy
 msgid "Share with Tiny Tiny RSS"
 msgstr "Opdater Tiny Tiny RSS"
 
-#: classes/handler/public.php:518
+#: classes/handler/public.php:429
 msgid "Title:"
 msgstr "Overskrift:"
 
-#: classes/handler/public.php:520
+#: classes/handler/public.php:431
 #: classes/pref/feeds.php:572
-#: plugins/instances/init.php:212
-#: plugins/instances/init.php:401
 msgid "URL:"
 msgstr "URL:"
 
-#: classes/handler/public.php:522
+#: classes/handler/public.php:433
 msgid "Content:"
 msgstr "Indhold:"
 
-#: classes/handler/public.php:524
+#: classes/handler/public.php:435
 msgid "Labels:"
 msgstr "Etiketter:"
 
-#: classes/handler/public.php:543
+#: classes/handler/public.php:454
 msgid "Shared article will appear in the Published feed."
 msgstr ""
 
-#: classes/handler/public.php:545
+#: classes/handler/public.php:456
 msgid "Share"
 msgstr "Del"
 
-#: classes/handler/public.php:567
+#: classes/handler/public.php:478
 msgid "Not logged in"
 msgstr "Ikke logget på"
 
-#: classes/handler/public.php:626
+#: classes/handler/public.php:537
 msgid "Incorrect username or password"
 msgstr "Forkert brugernavn eller adgangskode"
 
-#: classes/handler/public.php:678
+#: classes/handler/public.php:589
 #, fuzzy, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "Abonneret på %s"
 
-#: classes/handler/public.php:681
+#: classes/handler/public.php:592
 #, fuzzy, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "Abonneret på %s"
 
-#: classes/handler/public.php:684
+#: classes/handler/public.php:595
 #, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr ""
 
-#: classes/handler/public.php:687
+#: classes/handler/public.php:598
 #, fuzzy, php-format
 msgid "No feeds found in <b>%s</b>."
 msgstr "Der blev ikke fundet nogen feeds."
 
-#: classes/handler/public.php:690
+#: classes/handler/public.php:601
 msgid "Multiple feed URLs found."
 msgstr "Der er fundet flere webadresser til feed"
 
-#: classes/handler/public.php:694
+#: classes/handler/public.php:605
 #, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr ""
 
-#: classes/handler/public.php:712
+#: classes/handler/public.php:623
 msgid "Subscribe to selected feed"
 msgstr "Abonner på valgte feed"
 
-#: classes/handler/public.php:737
+#: classes/handler/public.php:648
 msgid "Edit subscription options"
 msgstr "Rediger abonnementsindstillinger"
 
-#: classes/handler/public.php:774
+#: classes/handler/public.php:685
 msgid "Password recovery"
 msgstr "Genoprettelse af adgangskode"
 
-#: classes/handler/public.php:817
+#: classes/handler/public.php:728
 msgid "You will need to provide valid account name and email. A password reset link will be sent to your email address."
 msgstr ""
 
-#: classes/handler/public.php:839
-#: classes/pref/users.php:350
+#: classes/handler/public.php:750
+#: classes/pref/users.php:349
 msgid "Reset password"
 msgstr "Nulstil adgangskode"
 
-#: classes/handler/public.php:849
+#: classes/handler/public.php:760
 msgid "Some of the required form parameters are missing or incorrect."
 msgstr ""
 
-#: classes/handler/public.php:853
-#: classes/handler/public.php:919
+#: classes/handler/public.php:764
+#: classes/handler/public.php:830
 msgid "Go back"
 msgstr "Gå tilbage"
 
-#: classes/handler/public.php:890
+#: classes/handler/public.php:801
 #, fuzzy
 msgid "[tt-rss] Password reset request"
 msgstr "[tt-rss] meddelelse om adgangskodeændring"
 
-#: classes/handler/public.php:915
+#: classes/handler/public.php:826
 msgid "Sorry, login and email combination not found."
 msgstr ""
 
-#: classes/handler/public.php:937
+#: classes/handler/public.php:848
 msgid "Your access level is insufficient to run this script."
 msgstr ""
 
-#: classes/handler/public.php:963
+#: classes/handler/public.php:874
 msgid "Database Updater"
 msgstr "Opdatering af database"
 
-#: classes/handler/public.php:1028
+#: classes/handler/public.php:939
 msgid "Perform updates"
 msgstr "Udfør opdateringer"
 
 #: classes/pref/labels.php:22
-#: classes/pref/filters.php:348
-#: classes/pref/filters.php:823
+#: classes/pref/filters.php:373
+#: classes/pref/filters.php:863
 msgid "Caption"
 msgstr "Billedtekst"
 
@@ -1243,59 +1136,55 @@ msgid "Created label <b>%s</b>"
 msgstr "Opret etiket"
 
 #: classes/pref/labels.php:258
-#: classes/pref/users.php:334
-#: classes/pref/feeds.php:1337
-#: classes/pref/feeds.php:1600
-#: classes/pref/feeds.php:1664
-#: classes/pref/filters.php:359
-#: classes/pref/filters.php:407
-#: classes/pref/filters.php:744
-#: classes/pref/filters.php:832
-#: classes/pref/filters.php:859
+#: classes/pref/filters.php:384
+#: classes/pref/filters.php:441
+#: classes/pref/filters.php:784
+#: classes/pref/filters.php:872
+#: classes/pref/filters.php:899
+#: classes/pref/users.php:333
 #: classes/pref/prefs.php:992
-#: plugins/instances/init.php:284
+#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1574
+#: classes/pref/feeds.php:1638
 msgid "Select"
 msgstr "Vælg"
 
 #: classes/pref/labels.php:261
-#: classes/pref/users.php:337
-#: classes/pref/feeds.php:1340
-#: classes/pref/feeds.php:1603
-#: classes/pref/feeds.php:1667
-#: classes/pref/filters.php:362
-#: classes/pref/filters.php:410
-#: classes/pref/filters.php:747
-#: classes/pref/filters.php:835
-#: classes/pref/filters.php:862
+#: classes/pref/filters.php:387
+#: classes/pref/filters.php:444
+#: classes/pref/filters.php:787
+#: classes/pref/filters.php:875
+#: classes/pref/filters.php:902
+#: classes/pref/users.php:336
 #: classes/pref/prefs.php:995
+#: classes/pref/feeds.php:1314
+#: classes/pref/feeds.php:1577
+#: classes/pref/feeds.php:1641
 #: classes/feeds.php:102
-#: plugins/instances/init.php:287
 msgid "All"
 msgstr "Alle"
 
 #: classes/pref/labels.php:263
-#: classes/pref/users.php:339
-#: classes/pref/feeds.php:1342
-#: classes/pref/feeds.php:1605
-#: classes/pref/feeds.php:1669
-#: classes/pref/filters.php:364
-#: classes/pref/filters.php:412
-#: classes/pref/filters.php:749
-#: classes/pref/filters.php:837
-#: classes/pref/filters.php:864
+#: classes/pref/filters.php:389
+#: classes/pref/filters.php:446
+#: classes/pref/filters.php:789
+#: classes/pref/filters.php:877
+#: classes/pref/filters.php:904
+#: classes/pref/users.php:338
 #: classes/pref/prefs.php:997
+#: classes/pref/feeds.php:1316
+#: classes/pref/feeds.php:1579
+#: classes/pref/feeds.php:1643
 #: classes/feeds.php:105
-#: plugins/instances/init.php:289
 msgid "None"
 msgstr "Ingen"
 
 #: classes/pref/labels.php:270
-#: classes/pref/users.php:348
+#: classes/pref/filters.php:512
+#: classes/pref/filters.php:806
+#: classes/pref/users.php:347
 #: classes/pref/feeds.php:767
-#: classes/pref/filters.php:478
-#: classes/pref/filters.php:766
-#: classes/feeds.php:1154
-#: plugins/instances/init.php:294
+#: classes/feeds.php:1147
 msgid "Remove"
 msgstr "Fjern"
 
@@ -1303,9 +1192,170 @@ msgstr "Fjern"
 msgid "Clear colors"
 msgstr "Gennemsigtige farver"
 
+#: classes/pref/filters.php:153
+#, fuzzy
+msgid "Preview article"
+msgstr "Nye artikler"
+
+#: classes/pref/filters.php:264
+#: classes/pref/filters.php:558
+msgid "(inverse)"
+msgstr "(inverter)"
+
+#: classes/pref/filters.php:260
+#: classes/pref/filters.php:557
+#, php-format
+msgid "%s on %s in %s %s"
+msgstr ""
+
+#: classes/pref/filters.php:379
+#: classes/pref/filters.php:867
+#: classes/pref/filters.php:981
+msgid "Match"
+msgstr "Tilpasning"
+
+#: classes/pref/filters.php:393
+#: classes/pref/filters.php:450
+#: classes/pref/filters.php:881
+#: classes/pref/filters.php:908
+msgid "Add"
+msgstr "Tilføj"
+
+#: classes/pref/filters.php:396
+#: classes/pref/filters.php:453
+#: classes/pref/filters.php:884
+#: classes/pref/filters.php:911
+#: classes/feeds.php:122
+msgid "Delete"
+msgstr "Slet"
+
+#: classes/pref/filters.php:436
+#: classes/pref/filters.php:894
+msgid "Apply actions"
+msgstr "Anvend handlinger"
+
+#: classes/pref/filters.php:486
+#: classes/pref/filters.php:923
+msgid "Enabled"
+msgstr "Aktiveret"
+
+#: classes/pref/filters.php:495
+#: classes/pref/filters.php:926
+msgid "Match any rule"
+msgstr "Match enhver regel"
+
+#: classes/pref/filters.php:504
+#: classes/pref/filters.php:929
+msgid "Inverse matching"
+msgstr "Inverter tilpasning"
+
+#: classes/pref/filters.php:516
+#: classes/pref/filters.php:936
+msgid "Test"
+msgstr "Test"
+
+#: classes/pref/filters.php:780
+#: classes/pref/users.php:323
+#: classes/pref/feeds.php:1307
+#: classes/feeds.php:1118
+#: classes/feeds.php:1184
+#: js/tt-rss.js:165
+msgid "Search"
+msgstr "Søg"
+
+#: classes/pref/filters.php:796
+msgid "Combine"
+msgstr "Kombiner"
+
+#: classes/pref/filters.php:799
+#: classes/pref/users.php:345
+msgid "Edit"
+msgstr "Rediger"
+
+#: classes/pref/filters.php:802
+#: classes/pref/feeds.php:1327
+#: classes/pref/feeds.php:1341
+msgid "Reset sort order"
+msgstr "Nulstil sorteringsrækkefølge"
+
+#: classes/pref/filters.php:810
+#: classes/pref/feeds.php:1363
+msgid "Rescore articles"
+msgstr "Nulstil artikler"
+
+#: classes/pref/filters.php:939
+msgid "Create"
+msgstr "Opret"
+
+#: classes/pref/filters.php:993
+msgid "Inverse regular expression matching"
+msgstr "Inverter tilpasning af normalt udtryk"
+
+#: classes/pref/filters.php:995
+msgid "on field"
+msgstr "på feltet"
+
+#: classes/pref/filters.php:1001
+#: js/PrefFilterTree.js:64
+msgid "in"
+msgstr "i"
+
+#: classes/pref/filters.php:1014
+msgid "Wiki: Filters"
+msgstr "Wiki: Filtre"
+
+#: classes/pref/filters.php:1019
+msgid "Save rule"
+msgstr "Gem regel"
+
+#: classes/pref/filters.php:1019
+#: js/functions.js:865
+msgid "Add rule"
+msgstr "Tilføj regel"
+
+#: classes/pref/filters.php:1042
+msgid "Perform Action"
+msgstr "Udfør handling"
+
+#: classes/pref/filters.php:1093
+#, fuzzy
+msgid "No actions available"
+msgstr "Ny version til rådighed!"
+
+#: classes/pref/filters.php:1112
+msgid "Save action"
+msgstr "Gem handling"
+
+#: classes/pref/filters.php:1112
+#: js/functions.js:887
+msgid "Add action"
+msgstr "Tilføj handling"
+
+#: classes/pref/filters.php:1136
+msgid "[No caption]"
+msgstr "[Ingen billedtekst]"
+
+#: classes/pref/filters.php:1138
+#, fuzzy, php-format
+msgid "%s (%d rule)"
+msgid_plural "%s (%d rules)"
+msgstr[0] "Tilføj regel"
+msgstr[1] "Tilføj regel"
+
+#: classes/pref/filters.php:1153
+#, fuzzy
+msgid "matches any rule"
+msgstr "Match enhver regel"
+
+#: classes/pref/filters.php:1156
+#, fuzzy, php-format
+msgid "%s (+%d action)"
+msgid_plural "%s (+%d actions)"
+msgstr[0] "Tilføj handling"
+msgstr[1] "Tilføj handling"
+
 #: classes/pref/users.php:6
 #: classes/pref/system.php:8
-#: plugins/instances/init.php:154
 msgid "Your access level is insufficient to open this tab."
 msgstr ""
 
@@ -1316,8 +1366,8 @@ msgstr "Rediger regel"
 
 #: classes/pref/users.php:56
 #: classes/pref/feeds.php:637
-#: classes/pref/feeds.php:878
-#: classes/feeds.php:1075
+#: classes/pref/feeds.php:866
+#: classes/feeds.php:1068
 msgid "Authentication"
 msgstr "Godkendelse"
 
@@ -1327,7 +1377,7 @@ msgstr "Adgangsniveau: "
 
 #: classes/pref/users.php:77
 #: classes/pref/feeds.php:667
-#: classes/pref/feeds.php:896
+#: classes/pref/feeds.php:884
 msgid "Options"
 msgstr "Indstillinger"
 
@@ -1341,7 +1391,7 @@ msgid "User not found"
 msgstr "Bruger ikke fundet"
 
 #: classes/pref/users.php:132
-#: classes/pref/users.php:400
+#: classes/pref/users.php:399
 msgid "Registered"
 msgstr "Registreret"
 
@@ -1359,7 +1409,7 @@ msgid "Stored articles"
 msgstr "Markerede artikler"
 
 #: classes/pref/users.php:145
-#: classes/pref/users.php:399
+#: classes/pref/users.php:398
 msgid "Subscribed feeds"
 msgstr "Abonnerede feeds"
 
@@ -1378,507 +1428,57 @@ msgstr ""
 msgid "User <b>%s</b> already exists."
 msgstr ""
 
-#: classes/pref/users.php:265
+#: classes/pref/users.php:264
 #, php-format
 msgid "Changed password of user <b>%s</b> to <b>%s</b>"
 msgstr ""
 
-#: classes/pref/users.php:267
+#: classes/pref/users.php:266
 #, php-format
 msgid "Sending new password of user <b>%s</b> to <b>%s</b>"
 msgstr ""
 
-#: classes/pref/users.php:291
+#: classes/pref/users.php:290
 msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] meddelelse om adgangskodeændring"
 
-#: classes/pref/users.php:324
-#: classes/pref/feeds.php:1333
-#: classes/pref/filters.php:740
-#: classes/feeds.php:1125
-#: classes/feeds.php:1191
-#: js/tt-rss.js:165
-msgid "Search"
-msgstr "Søg"
-
-#: classes/pref/users.php:342
+#: classes/pref/users.php:341
 msgid "Create user"
 msgstr "Opret bruger"
 
-#: classes/pref/users.php:346
-#: classes/pref/filters.php:759
-#: plugins/instances/init.php:293
-msgid "Edit"
-msgstr "Rediger"
-
-#: classes/pref/users.php:397
+#: classes/pref/users.php:396
 #: classes/pref/feeds.php:643
-#: classes/pref/feeds.php:882
-#: classes/pref/feeds.php:1836
-#: classes/feeds.php:1079
+#: classes/pref/feeds.php:870
+#: classes/pref/feeds.php:1810
+#: classes/feeds.php:1072
 msgid "Login"
 msgstr "Logon"
 
-#: classes/pref/users.php:398
+#: classes/pref/users.php:397
 msgid "Access Level"
 msgstr "Adgangsniveau"
 
-#: classes/pref/users.php:401
+#: classes/pref/users.php:400
 msgid "Last login"
 msgstr "Sidste logon"
 
-#: classes/pref/users.php:420
-#: plugins/instances/init.php:334
+#: classes/pref/users.php:419
 msgid "Click to edit"
 msgstr "Klik for at redigere"
 
-#: classes/pref/users.php:441
+#: classes/pref/users.php:440
 msgid "No users defined."
 msgstr "Der er ikke defineret nogen brugere."
 
-#: classes/pref/users.php:443
+#: classes/pref/users.php:442
 msgid "No matching users found."
 msgstr "Der er ikke fundet matchende brugere."
 
-#: classes/pref/system.php:29
-msgid "Error Log"
-msgstr "Fejllog"
-
-#: classes/pref/system.php:40
-msgid "Refresh"
-msgstr "Opdater"
-
-#: classes/pref/system.php:43
-msgid "Clear log"
-msgstr "Ryd log"
-
-#: classes/pref/system.php:48
-msgid "Error"
-msgstr "Fejl"
-
-#: classes/pref/system.php:49
-msgid "Filename"
-msgstr "Filnavn"
-
-#: classes/pref/system.php:50
-msgid "Message"
-msgstr "Meddelelse"
-
-#: classes/pref/system.php:52
-msgid "Date"
-msgstr "Dato"
-
-#: classes/pref/feeds.php:15
-msgid "Check to enable field"
-msgstr "Sæt flueben for at aktivere felt"
-
-#: classes/pref/feeds.php:65
-#: classes/pref/feeds.php:214
-#: classes/pref/feeds.php:258
-#: classes/pref/feeds.php:264
-#: classes/pref/feeds.php:290
-#, fuzzy, php-format
-msgid "(%d feed)"
-msgid_plural "(%d feeds)"
-msgstr[0] "Rediger feed"
-msgstr[1] "Rediger feed"
-
-#: classes/pref/feeds.php:537
 #: classes/pref/prefs.php:18
+#: classes/pref/feeds.php:537
 msgid "General"
 msgstr "Generelt"
 
-#: classes/pref/feeds.php:561
-msgid "Feed Title"
-msgstr "Feed-overskrift"
-
-#: classes/pref/feeds.php:595
-#: classes/pref/feeds.php:830
-#: classes/pref/feeds.php:1822
-#: classes/feeds.php:1055
-msgid "Place in category:"
-msgstr "Placer i kategori:"
-
-#: classes/pref/feeds.php:608
-#: classes/pref/feeds.php:844
-#, fuzzy
-msgid "Language:"
-msgstr "Sprog"
-
-#: classes/pref/feeds.php:615
-#: classes/pref/feeds.php:853
-msgid "Update"
-msgstr "Opdater"
-
-#: classes/pref/feeds.php:630
-#: classes/pref/feeds.php:869
-msgid "Article purging:"
-msgstr "Artikeltømning:"
-
-#: classes/pref/feeds.php:658
-#: classes/pref/feeds.php:890
-#: classes/pref/feeds.php:1839
-#: classes/pref/prefs.php:245
-#: classes/feeds.php:1083
-msgid "Password"
-msgstr "Adgangskode"
-
-#: classes/pref/feeds.php:662
-msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
-msgstr ""
-
-#: classes/pref/feeds.php:681
-#: classes/pref/feeds.php:900
-msgid "Hide from Popular feeds"
-msgstr "Skjul fra Populære feeds"
-
-#: classes/pref/feeds.php:693
-#: classes/pref/feeds.php:906
-msgid "Include in e-mail digest"
-msgstr "Inkluder i e-mail-digest"
-
-#: classes/pref/feeds.php:706
-#: classes/pref/feeds.php:912
-msgid "Always display image attachments"
-msgstr "Vis altid billedvedhæftninger"
-
-#: classes/pref/feeds.php:719
-#: classes/pref/feeds.php:920
-msgid "Do not embed images"
-msgstr "Inkorporer ikke billeder"
-
-#: classes/pref/feeds.php:732
-#: classes/pref/feeds.php:928
-msgid "Cache media"
-msgstr ""
-
-#: classes/pref/feeds.php:744
-#: classes/pref/feeds.php:934
-#, fuzzy
-msgid "Mark updated articles as unread"
-msgstr "Marker feed som læst"
-
-#: classes/pref/feeds.php:748
-msgid "Icon"
-msgstr "Ikon"
-
-#: classes/pref/feeds.php:765
-msgid "Replace"
-msgstr "Erstat"
-
-#: classes/pref/feeds.php:772
-#: classes/pref/prefs.php:698
-msgid "Plugins"
-msgstr "Plugins"
-
-#: classes/pref/feeds.php:792
-msgid "Resubscribe to push updates"
-msgstr "Forny abonnement på push-opdateringer"
-
-#: classes/pref/feeds.php:799
-msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
-msgstr ""
-
-#: classes/pref/feeds.php:1200
-#: classes/pref/feeds.php:1253
-msgid "All done."
-msgstr "Alt færdigt."
-
-#: classes/pref/feeds.php:1308
-msgid "Feeds with errors"
-msgstr "Feeds med fejl"
-
-#: classes/pref/feeds.php:1315
-msgid "Inactive feeds"
-msgstr "Inaktive feeds"
-
-#: classes/pref/feeds.php:1351
-msgid "Edit selected feeds"
-msgstr "Rediger valgte feeds"
-
-#: classes/pref/feeds.php:1353
-#: classes/pref/feeds.php:1367
-#: classes/pref/filters.php:762
-msgid "Reset sort order"
-msgstr "Nulstil sorteringsrækkefølge"
-
-#: classes/pref/feeds.php:1355
-#: js/prefs.js:1622
-msgid "Batch subscribe"
-msgstr "Batchabonnement"
-
-#: classes/pref/feeds.php:1362
-msgid "Categories"
-msgstr "Kategorier"
-
-#: classes/pref/feeds.php:1365
-msgid "Add category"
-msgstr "Tilføj kategori"
-
-#: classes/pref/feeds.php:1369
-msgid "Remove selected"
-msgstr "Fjern valgte"
-
-#: classes/pref/feeds.php:1380
-msgid "More actions..."
-msgstr "Flere handlinger ..."
-
-#: classes/pref/feeds.php:1384
-msgid "Manual purge"
-msgstr "Manuel tømning"
-
-#: classes/pref/feeds.php:1388
-msgid "Clear feed data"
-msgstr "Ryd feed-data"
-
-#: classes/pref/feeds.php:1389
-#: classes/pref/filters.php:770
-msgid "Rescore articles"
-msgstr "Nulstil artikler"
-
-#: classes/pref/feeds.php:1442
-msgid "OPML"
-msgstr "OPML"
-
-#: classes/pref/feeds.php:1444
-msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
-msgstr ""
-
-#: classes/pref/feeds.php:1445
-msgid "Only main settings profile can be migrated using OPML."
-msgstr ""
-
-#: classes/pref/feeds.php:1458
-msgid "Import my OPML"
-msgstr "Importer min OPML"
-
-#: classes/pref/feeds.php:1464
-msgid "Filename:"
-msgstr "Filnavn:"
-
-#: classes/pref/feeds.php:1466
-msgid "Include settings"
-msgstr "Inkluder indstillinger"
-
-#: classes/pref/feeds.php:1470
-msgid "Export OPML"
-msgstr "Eksporter OPML"
-
-#: classes/pref/feeds.php:1474
-msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
-msgstr ""
-
-#: classes/pref/feeds.php:1478
-msgid "Public OPML URL"
-msgstr "Webadresse til offentlig OPML"
-
-#: classes/pref/feeds.php:1479
-msgid "Display published OPML URL"
-msgstr "Vis webadresse på udgivne OPML"
-
-#: classes/pref/feeds.php:1488
-msgid "Firefox integration"
-msgstr "Firefox-integration"
-
-#: classes/pref/feeds.php:1490
-msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
-msgstr ""
-
-#: classes/pref/feeds.php:1497
-msgid "Click here to register this site as a feed reader."
-msgstr ""
-
-#: classes/pref/feeds.php:1505
-msgid "Published & shared articles / Generated feeds"
-msgstr ""
-
-#: classes/pref/feeds.php:1507
-msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
-msgstr ""
-
-#: classes/pref/feeds.php:1514
-#: classes/feeds.php:54
-#: classes/feeds.php:140
-msgid "View as RSS"
-msgstr "Vis som RSS"
-
-#: classes/pref/feeds.php:1515
-msgid "Display URL"
-msgstr "Vis webadresse"
-
-#: classes/pref/feeds.php:1518
-msgid "Clear all generated URLs"
-msgstr "Ryd alle genererede webadresser"
-
-#: classes/pref/feeds.php:1596
-msgid "These feeds have not been updated with new content for 3 months (oldest first):"
-msgstr ""
-
-#: classes/pref/feeds.php:1630
-#: classes/pref/feeds.php:1694
-msgid "Click to edit feed"
-msgstr "Klik for at redigere feed"
-
-#: classes/pref/feeds.php:1648
-#: classes/pref/feeds.php:1714
-msgid "Unsubscribe from selected feeds"
-msgstr "Aflys abonnement for valgte feeds"
-
-#: classes/pref/feeds.php:1819
-msgid "Add one valid RSS feed per line (no feed detection is done)"
-msgstr ""
-
-#: classes/pref/feeds.php:1828
-msgid "Feeds to subscribe, One per line"
-msgstr ""
-
-#: classes/pref/feeds.php:1851
-msgid "Feeds require authentication."
-msgstr "Feeds kræver godkendelse."
-
-#: classes/pref/feeds.php:1858
-#: classes/feeds.php:1099
-#: classes/feeds.php:1153
-msgid "Subscribe"
-msgstr "Abonner"
-
-#: classes/pref/filters.php:151
-#, fuzzy
-msgid "Preview article"
-msgstr "Nye artikler"
-
-#: classes/pref/filters.php:239
-#: classes/pref/filters.php:518
-msgid "(inverse)"
-msgstr "(inverter)"
-
-#: classes/pref/filters.php:235
-#: classes/pref/filters.php:517
-#, php-format
-msgid "%s on %s in %s %s"
-msgstr ""
-
-#: classes/pref/filters.php:354
-#: classes/pref/filters.php:827
-#: classes/pref/filters.php:942
-msgid "Match"
-msgstr "Tilpasning"
-
-#: classes/pref/filters.php:368
-#: classes/pref/filters.php:416
-#: classes/pref/filters.php:841
-#: classes/pref/filters.php:868
-msgid "Add"
-msgstr "Tilføj"
-
-#: classes/pref/filters.php:371
-#: classes/pref/filters.php:419
-#: classes/pref/filters.php:844
-#: classes/pref/filters.php:871
-#: classes/feeds.php:122
-msgid "Delete"
-msgstr "Slet"
-
-#: classes/pref/filters.php:402
-#: classes/pref/filters.php:854
-msgid "Apply actions"
-msgstr "Anvend handlinger"
-
-#: classes/pref/filters.php:452
-#: classes/pref/filters.php:883
-msgid "Enabled"
-msgstr "Aktiveret"
-
-#: classes/pref/filters.php:461
-#: classes/pref/filters.php:886
-msgid "Match any rule"
-msgstr "Match enhver regel"
-
-#: classes/pref/filters.php:470
-#: classes/pref/filters.php:889
-msgid "Inverse matching"
-msgstr "Inverter tilpasning"
-
-#: classes/pref/filters.php:482
-#: classes/pref/filters.php:896
-msgid "Test"
-msgstr "Test"
-
-#: classes/pref/filters.php:756
-msgid "Combine"
-msgstr "Kombiner"
-
-#: classes/pref/filters.php:899
-msgid "Create"
-msgstr "Opret"
-
-#: classes/pref/filters.php:954
-msgid "Inverse regular expression matching"
-msgstr "Inverter tilpasning af normalt udtryk"
-
-#: classes/pref/filters.php:956
-msgid "on field"
-msgstr "på feltet"
-
-#: classes/pref/filters.php:962
-#: js/PrefFilterTree.js:64
-msgid "in"
-msgstr "i"
-
-#: classes/pref/filters.php:975
-msgid "Wiki: Filters"
-msgstr "Wiki: Filtre"
-
-#: classes/pref/filters.php:980
-msgid "Save rule"
-msgstr "Gem regel"
-
-#: classes/pref/filters.php:980
-#: js/functions.js:865
-msgid "Add rule"
-msgstr "Tilføj regel"
-
-#: classes/pref/filters.php:1003
-msgid "Perform Action"
-msgstr "Udfør handling"
-
-#: classes/pref/filters.php:1054
-#, fuzzy
-msgid "No actions available"
-msgstr "Ny version til rådighed!"
-
-#: classes/pref/filters.php:1073
-msgid "Save action"
-msgstr "Gem handling"
-
-#: classes/pref/filters.php:1073
-#: js/functions.js:887
-msgid "Add action"
-msgstr "Tilføj handling"
-
-#: classes/pref/filters.php:1097
-msgid "[No caption]"
-msgstr "[Ingen billedtekst]"
-
-#: classes/pref/filters.php:1099
-#, fuzzy, php-format
-msgid "%s (%d rule)"
-msgid_plural "%s (%d rules)"
-msgstr[0] "Tilføj regel"
-msgstr[1] "Tilføj regel"
-
-#: classes/pref/filters.php:1114
-#, fuzzy
-msgid "matches any rule"
-msgstr "Match enhver regel"
-
-#: classes/pref/filters.php:1117
-#, fuzzy, php-format
-msgid "%s (+%d action)"
-msgid_plural "%s (+%d actions)"
-msgstr[0] "Tilføj handling"
-msgstr[1] "Tilføj handling"
-
 #: classes/pref/prefs.php:19
 msgid "Interface"
 msgstr "Grænseflade"
@@ -2059,7 +1659,7 @@ msgid "Strip all but most common HTML tags when reading articles."
 msgstr ""
 
 #: classes/pref/prefs.php:53
-#: js/prefs.js:1584
+#: js/prefs.js:1580
 msgid "Customize stylesheet"
 msgstr "Tilpas designark"
 
@@ -2128,6 +1728,14 @@ msgstr "Adgangsniveau"
 msgid "Save data"
 msgstr "Gem data"
 
+#: classes/pref/prefs.php:245
+#: classes/pref/feeds.php:658
+#: classes/pref/feeds.php:878
+#: classes/pref/feeds.php:1813
+#: classes/feeds.php:1076
+msgid "Password"
+msgstr "Adgangskode"
+
 #: classes/pref/prefs.php:254
 msgid "Your password is at default value, please change it."
 msgstr ""
@@ -2227,18 +1835,23 @@ msgstr "Administrer profiler"
 msgid "Reset to defaults"
 msgstr "Nulstil til standardindstillinger"
 
+#: classes/pref/prefs.php:698
+#: classes/pref/feeds.php:772
+msgid "Plugins"
+msgstr "Plugins"
+
 #: classes/pref/prefs.php:700
 msgid "You will need to reload Tiny Tiny RSS for plugin changes to take effect."
 msgstr ""
 
-#: classes/pref/prefs.php:702
-msgid "Download more plugins at tt-rss.org <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forums</a> or <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a>."
-msgstr ""
-
-#: classes/pref/prefs.php:732
+#: classes/pref/prefs.php:730
 msgid "System plugins"
 msgstr "Systemplugins"
 
+#: classes/pref/prefs.php:731
+msgid "System plugins are enabled in <strong>config.php</strong> for all users."
+msgstr ""
+
 #: classes/pref/prefs.php:736
 #: classes/pref/prefs.php:792
 msgid "Plugin"
@@ -2308,6 +1921,341 @@ msgstr "Fjern valgte profiler"
 msgid "Activate profile"
 msgstr "Aktiver profil"
 
+#: classes/pref/feeds.php:15
+msgid "Check to enable field"
+msgstr "Sæt flueben for at aktivere felt"
+
+#: classes/pref/feeds.php:65
+#: classes/pref/feeds.php:214
+#: classes/pref/feeds.php:258
+#: classes/pref/feeds.php:264
+#: classes/pref/feeds.php:290
+#, fuzzy, php-format
+msgid "(%d feed)"
+msgid_plural "(%d feeds)"
+msgstr[0] "Rediger feed"
+msgstr[1] "Rediger feed"
+
+#: classes/pref/feeds.php:561
+msgid "Feed Title"
+msgstr "Feed-overskrift"
+
+#: classes/pref/feeds.php:595
+#: classes/pref/feeds.php:818
+#: classes/pref/feeds.php:1796
+#: classes/feeds.php:1048
+msgid "Place in category:"
+msgstr "Placer i kategori:"
+
+#: classes/pref/feeds.php:608
+#: classes/pref/feeds.php:832
+#, fuzzy
+msgid "Language:"
+msgstr "Sprog"
+
+#: classes/pref/feeds.php:615
+#: classes/pref/feeds.php:841
+msgid "Update"
+msgstr "Opdater"
+
+#: classes/pref/feeds.php:630
+#: classes/pref/feeds.php:857
+msgid "Article purging:"
+msgstr "Artikeltømning:"
+
+#: classes/pref/feeds.php:662
+msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
+msgstr ""
+
+#: classes/pref/feeds.php:681
+#: classes/pref/feeds.php:888
+msgid "Hide from Popular feeds"
+msgstr "Skjul fra Populære feeds"
+
+#: classes/pref/feeds.php:693
+#: classes/pref/feeds.php:894
+msgid "Include in e-mail digest"
+msgstr "Inkluder i e-mail-digest"
+
+#: classes/pref/feeds.php:706
+#: classes/pref/feeds.php:900
+msgid "Always display image attachments"
+msgstr "Vis altid billedvedhæftninger"
+
+#: classes/pref/feeds.php:719
+#: classes/pref/feeds.php:908
+msgid "Do not embed images"
+msgstr "Inkorporer ikke billeder"
+
+#: classes/pref/feeds.php:732
+#: classes/pref/feeds.php:916
+msgid "Cache media"
+msgstr ""
+
+#: classes/pref/feeds.php:744
+#: classes/pref/feeds.php:922
+#, fuzzy
+msgid "Mark updated articles as unread"
+msgstr "Marker feed som læst"
+
+#: classes/pref/feeds.php:748
+msgid "Icon"
+msgstr "Ikon"
+
+#: classes/pref/feeds.php:765
+msgid "Replace"
+msgstr "Erstat"
+
+#: classes/pref/feeds.php:1174
+#: classes/pref/feeds.php:1227
+msgid "All done."
+msgstr "Alt færdigt."
+
+#: classes/pref/feeds.php:1282
+msgid "Feeds with errors"
+msgstr "Feeds med fejl"
+
+#: classes/pref/feeds.php:1289
+msgid "Inactive feeds"
+msgstr "Inaktive feeds"
+
+#: classes/pref/feeds.php:1325
+msgid "Edit selected feeds"
+msgstr "Rediger valgte feeds"
+
+#: classes/pref/feeds.php:1329
+#: js/prefs.js:1618
+msgid "Batch subscribe"
+msgstr "Batchabonnement"
+
+#: classes/pref/feeds.php:1336
+msgid "Categories"
+msgstr "Kategorier"
+
+#: classes/pref/feeds.php:1339
+msgid "Add category"
+msgstr "Tilføj kategori"
+
+#: classes/pref/feeds.php:1343
+msgid "Remove selected"
+msgstr "Fjern valgte"
+
+#: classes/pref/feeds.php:1354
+msgid "More actions..."
+msgstr "Flere handlinger ..."
+
+#: classes/pref/feeds.php:1358
+msgid "Manual purge"
+msgstr "Manuel tømning"
+
+#: classes/pref/feeds.php:1362
+msgid "Clear feed data"
+msgstr "Ryd feed-data"
+
+#: classes/pref/feeds.php:1416
+msgid "OPML"
+msgstr "OPML"
+
+#: classes/pref/feeds.php:1418
+msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
+msgstr ""
+
+#: classes/pref/feeds.php:1419
+msgid "Only main settings profile can be migrated using OPML."
+msgstr ""
+
+#: classes/pref/feeds.php:1432
+msgid "Import my OPML"
+msgstr "Importer min OPML"
+
+#: classes/pref/feeds.php:1438
+msgid "Filename:"
+msgstr "Filnavn:"
+
+#: classes/pref/feeds.php:1440
+msgid "Include settings"
+msgstr "Inkluder indstillinger"
+
+#: classes/pref/feeds.php:1444
+msgid "Export OPML"
+msgstr "Eksporter OPML"
+
+#: classes/pref/feeds.php:1448
+msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
+msgstr ""
+
+#: classes/pref/feeds.php:1452
+msgid "Public OPML URL"
+msgstr "Webadresse til offentlig OPML"
+
+#: classes/pref/feeds.php:1453
+msgid "Display published OPML URL"
+msgstr "Vis webadresse på udgivne OPML"
+
+#: classes/pref/feeds.php:1462
+msgid "Firefox integration"
+msgstr "Firefox-integration"
+
+#: classes/pref/feeds.php:1464
+msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
+msgstr ""
+
+#: classes/pref/feeds.php:1471
+msgid "Click here to register this site as a feed reader."
+msgstr ""
+
+#: classes/pref/feeds.php:1479
+msgid "Published & shared articles / Generated feeds"
+msgstr ""
+
+#: classes/pref/feeds.php:1481
+msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
+msgstr ""
+
+#: classes/pref/feeds.php:1488
+#: classes/feeds.php:54
+#: classes/feeds.php:140
+msgid "View as RSS"
+msgstr "Vis som RSS"
+
+#: classes/pref/feeds.php:1489
+msgid "Display URL"
+msgstr "Vis webadresse"
+
+#: classes/pref/feeds.php:1492
+msgid "Clear all generated URLs"
+msgstr "Ryd alle genererede webadresser"
+
+#: classes/pref/feeds.php:1570
+msgid "These feeds have not been updated with new content for 3 months (oldest first):"
+msgstr ""
+
+#: classes/pref/feeds.php:1604
+#: classes/pref/feeds.php:1668
+msgid "Click to edit feed"
+msgstr "Klik for at redigere feed"
+
+#: classes/pref/feeds.php:1622
+#: classes/pref/feeds.php:1688
+msgid "Unsubscribe from selected feeds"
+msgstr "Aflys abonnement for valgte feeds"
+
+#: classes/pref/feeds.php:1793
+msgid "Add one valid RSS feed per line (no feed detection is done)"
+msgstr ""
+
+#: classes/pref/feeds.php:1802
+msgid "Feeds to subscribe, One per line"
+msgstr ""
+
+#: classes/pref/feeds.php:1825
+msgid "Feeds require authentication."
+msgstr "Feeds kræver godkendelse."
+
+#: classes/pref/feeds.php:1832
+#: classes/feeds.php:1092
+#: classes/feeds.php:1146
+msgid "Subscribe"
+msgstr "Abonner"
+
+#: classes/pref/system.php:29
+msgid "Error Log"
+msgstr "Fejllog"
+
+#: classes/pref/system.php:40
+msgid "Refresh"
+msgstr "Opdater"
+
+#: classes/pref/system.php:43
+msgid "Clear log"
+msgstr "Ryd log"
+
+#: classes/pref/system.php:48
+msgid "Error"
+msgstr "Fejl"
+
+#: classes/pref/system.php:49
+msgid "Filename"
+msgstr "Filnavn"
+
+#: classes/pref/system.php:50
+msgid "Message"
+msgstr "Meddelelse"
+
+#: classes/pref/system.php:52
+msgid "Date"
+msgstr "Dato"
+
+#: classes/opml.php:28
+#: classes/opml.php:33
+msgid "OPML Utility"
+msgstr "OPML-hjælpeprogram"
+
+#: classes/opml.php:37
+msgid "Importing OPML..."
+msgstr "Importerer OPML ..."
+
+#: classes/opml.php:41
+msgid "Return to preferences"
+msgstr "Vend tilbage til præferencer"
+
+#: classes/opml.php:295
+#, php-format
+msgid "Adding feed: %s"
+msgstr "Tilføjer feed: %s"
+
+#: classes/opml.php:306
+#, php-format
+msgid "Duplicate feed: %s"
+msgstr "Dupliker feed: %s"
+
+#: classes/opml.php:320
+#, php-format
+msgid "Adding label %s"
+msgstr "Tilføjer etiket: %s"
+
+#: classes/opml.php:323
+#, php-format
+msgid "Duplicate label: %s"
+msgstr "Dupliker etiket: %s"
+
+#: classes/opml.php:335
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr ""
+
+#: classes/opml.php:367
+msgid "Adding filter..."
+msgstr "Tilføjer filter ..."
+
+#: classes/opml.php:486
+#, php-format
+msgid "Processing category: %s"
+msgstr "Behandler kategori: %s"
+
+#: classes/opml.php:532
+#, php-format
+msgid "Upload failed with error code %d"
+msgstr ""
+
+#: classes/opml.php:544
+#: plugins/import_export/init.php:448
+msgid "Unable to move uploaded file."
+msgstr ""
+
+#: classes/opml.php:548
+#: plugins/import_export/init.php:452
+msgid "Error: please upload OPML file."
+msgstr ""
+
+#: classes/opml.php:559
+msgid "Error: unable to find moved OPML file."
+msgstr ""
+
+#: classes/opml.php:566
+msgid "Error while parsing document."
+msgstr "Fejl under dokumentparsing."
+
 #: classes/feeds.php:53
 msgid "View as RSS feed"
 msgstr "Vis som RSS-feed"
@@ -2348,8 +2296,8 @@ msgstr "Gå tilbage"
 
 #: classes/feeds.php:127
 #: classes/feeds.php:132
-#: plugins/mail/init.php:75
 #: plugins/mailto/init.php:25
+#: plugins/mail/init.php:75
 msgid "Forward by email"
 msgstr "Videresend via e-mail"
 
@@ -2357,263 +2305,260 @@ msgstr "Videresend via e-mail"
 msgid "Feed:"
 msgstr "Feed:"
 
-#: classes/feeds.php:229
-#: classes/feeds.php:892
+#: classes/feeds.php:228
+#: classes/feeds.php:885
 msgid "Feed not found."
 msgstr "Feed ikke fundet."
 
-#: classes/feeds.php:300
+#: classes/feeds.php:291
 msgid "Never"
 msgstr "Aldrig"
 
-#: classes/feeds.php:413
+#: classes/feeds.php:405
 #, php-format
 msgid "Imported at %s"
 msgstr "Importeret på %s"
 
-#: classes/feeds.php:472
-#: classes/feeds.php:569
+#: classes/feeds.php:464
+#: classes/feeds.php:561
 msgid "mark feed as read"
 msgstr "marker feed som læst"
 
-#: classes/feeds.php:630
+#: classes/feeds.php:622
 msgid "Collapse article"
 msgstr "Skjul artikel"
 
-#: classes/feeds.php:791
+#: classes/feeds.php:784
 msgid "No unread articles found to display."
 msgstr ""
 
-#: classes/feeds.php:794
+#: classes/feeds.php:787
 msgid "No updated articles found to display."
 msgstr ""
 
-#: classes/feeds.php:797
+#: classes/feeds.php:790
 msgid "No starred articles found to display."
 msgstr ""
 
-#: classes/feeds.php:801
+#: classes/feeds.php:794
 msgid "No articles found to display. You can assign articles to labels manually from article header context menu (applies to all selected articles) or use a filter."
 msgstr ""
 
-#: classes/feeds.php:803
+#: classes/feeds.php:796
 msgid "No articles found to display."
 msgstr ""
 
-#: classes/feeds.php:818
-#: classes/feeds.php:992
+#: classes/feeds.php:811
+#: classes/feeds.php:985
 #, fuzzy, php-format
 msgid "Feeds last updated at %s"
 msgstr "Sidste opdatering: %s"
 
-#: classes/feeds.php:828
-#: classes/feeds.php:1002
+#: classes/feeds.php:821
+#: classes/feeds.php:995
 msgid "Some feeds have update errors (click for details)"
 msgstr ""
 
-#: classes/feeds.php:982
+#: classes/feeds.php:975
 msgid "No feed selected."
 msgstr "Der er ikke valgt noget feed."
 
-#: classes/feeds.php:1041
-#: classes/feeds.php:1049
+#: classes/feeds.php:1034
+#: classes/feeds.php:1042
 msgid "Feed or site URL"
 msgstr "Webadresse til feed eller webside"
 
-#: classes/feeds.php:1063
+#: classes/feeds.php:1056
 msgid "Available feeds"
 msgstr "Tilgængelige feeds"
 
-#: classes/feeds.php:1094
+#: classes/feeds.php:1087
 msgid "This feed requires authentication."
 msgstr "Dette feed kræver godkendelse."
 
-#: classes/feeds.php:1102
+#: classes/feeds.php:1095
 msgid "More feeds"
 msgstr "Flere feeds"
 
-#: classes/feeds.php:1129
+#: classes/feeds.php:1122
 msgid "Popular feeds"
 msgstr "Populære feeds"
 
-#: classes/feeds.php:1130
+#: classes/feeds.php:1123
 msgid "Feed archive"
 msgstr "Feed-arkiv"
 
-#: classes/feeds.php:1133
+#: classes/feeds.php:1126
 msgid "limit:"
 msgstr "grænse:"
 
-#: classes/feeds.php:1165
+#: classes/feeds.php:1158
 msgid "Look for"
 msgstr "Led efter"
 
-#: classes/feeds.php:1173
+#: classes/feeds.php:1166
 #, php-format
 msgid "in %s"
 msgstr ""
 
-#: classes/feeds.php:1178
+#: classes/feeds.php:1171
 msgid "Used for word stemming"
 msgstr ""
 
-#: classes/feeds.php:1187
+#: classes/feeds.php:1180
 msgid "Search syntax"
 msgstr "Søgesyntaks"
 
-#: plugins/instances/init.php:141
-msgid "Linked"
-msgstr "Tilknyttet"
-
-#: plugins/instances/init.php:204
-#: plugins/instances/init.php:395
-msgid "Instance"
-msgstr "Instans"
+#: classes/feeds.php:1596
+msgid "Starred articles"
+msgstr "Markerede artikler"
 
-#: plugins/instances/init.php:215
-#: plugins/instances/init.php:312
-#: plugins/instances/init.php:404
-msgid "Instance URL"
-msgstr "Webadresse til instans"
+#: classes/feeds.php:1598
+msgid "Published articles"
+msgstr "Udgivne artikler"
 
-#: plugins/instances/init.php:226
-#: plugins/instances/init.php:414
-msgid "Access key:"
-msgstr "Adgangsnøgle:"
+#: classes/feeds.php:1600
+msgid "Fresh articles"
+msgstr "Nye artikler"
 
-#: plugins/instances/init.php:229
-#: plugins/instances/init.php:313
-#: plugins/instances/init.php:417
-msgid "Access key"
-msgstr "Adgangsnøgle"
+#: classes/feeds.php:1604
+msgid "Archived articles"
+msgstr "Arkiverede artikler"
 
-#: plugins/instances/init.php:233
-#: plugins/instances/init.php:421
-msgid "Use one access key for both linked instances."
-msgstr ""
+#: classes/feeds.php:1606
+msgid "Recently read"
+msgstr "Senest læst"
 
-#: plugins/instances/init.php:241
-#: plugins/instances/init.php:429
-msgid "Generate new key"
-msgstr "Generer ny nøgle"
+#: classes/feeds.php:1716
+msgid "Special"
+msgstr "Speciel"
 
-#: plugins/instances/init.php:292
-msgid "Link instance"
-msgstr "Tilknyt instans"
+#: classes/feeds.php:1962
+#, php-format
+msgid "Search results: %s"
+msgstr "Søgeresultater: %s"
 
-#: plugins/instances/init.php:304
-msgid "You can connect other instances of Tiny Tiny RSS to this one to share Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
-msgstr ""
+#: plugins/vf_shared/init.php:16
+#: plugins/vf_shared/init.php:60
+msgid "Shared articles"
+msgstr "Delte artikler"
 
-#: plugins/instances/init.php:314
-msgid "Last connected"
-msgstr "Sidst forbundet"
+#: plugins/import_export/init.php:58
+msgid "Import and export"
+msgstr "Import og eksport"
 
-#: plugins/instances/init.php:315
-msgid "Status"
-msgstr "Status"
+#: plugins/import_export/init.php:60
+msgid "You can export and import your Starred and Archived articles for safekeeping or when migrating between tt-rss instances of same version."
+msgstr ""
 
-#: plugins/instances/init.php:316
-msgid "Stored feeds"
-msgstr "Gemte feeds"
+#: plugins/import_export/init.php:65
+msgid "Export my data"
+msgstr "Eksporter mine data"
 
-#: plugins/instances/init.php:433
-msgid "Create link"
-msgstr "Opret link"
+#: plugins/import_export/init.php:81
+msgid "Import"
+msgstr "Import"
 
-#: plugins/nsfw/init.php:30
-#: plugins/nsfw/init.php:42
-msgid "Not work safe (click to toggle)"
+#: plugins/import_export/init.php:231
+msgid "Could not import: incorrect schema version."
 msgstr ""
 
-#: plugins/nsfw/init.php:52
-msgid "NSFW Plugin"
-msgstr "NSFW-plugin"
-
-#: plugins/nsfw/init.php:79
-msgid "Tags to consider NSFW (comma-separated)"
+#: plugins/import_export/init.php:236
+msgid "Could not import: unrecognized document format."
 msgstr ""
 
-#: plugins/nsfw/init.php:100
-msgid "Configuration saved."
-msgstr "Konfiguration gemt."
+#: plugins/import_export/init.php:397
+msgid "Finished: "
+msgstr "Færdig: "
 
-#: plugins/note/init.php:26
-#: plugins/note/note.js:11
-msgid "Edit article note"
-msgstr "Rediger artikelnote"
+#: plugins/import_export/init.php:398
+#, fuzzy, php-format
+msgid "%d article processed, "
+msgid_plural "%d articles processed, "
+msgstr[0] "Rediger artikelnote"
+msgstr[1] "Rediger artikelnote"
 
-#: plugins/vf_shared/init.php:16
-#: plugins/vf_shared/init.php:69
-msgid "Shared articles"
-msgstr "Delte artikler"
+#: plugins/import_export/init.php:399
+#, php-format
+msgid "%d imported, "
+msgid_plural "%d imported, "
+msgstr[0] ""
+msgstr[1] ""
 
-#: plugins/auth_internal/init.php:65
-#, fuzzy
-msgid "Please enter your one time password:"
-msgstr "Forkert engangsadgangskode"
+#: plugins/import_export/init.php:400
+#, fuzzy, php-format
+msgid "%d feed created."
+msgid_plural "%d feeds created."
+msgstr[0] "Der er ikke valgt noget feed."
+msgstr[1] "Der er ikke valgt noget feed."
 
-#: plugins/auth_internal/init.php:188
-msgid "Password has been changed."
-msgstr "Adgangskoden er blevet ændret."
+#: plugins/import_export/init.php:405
+msgid "Could not load XML document."
+msgstr ""
 
-#: plugins/auth_internal/init.php:190
-msgid "Old password is incorrect."
-msgstr "Gammel adgangskode er forkert."
+#: plugins/import_export/init.php:417
+msgid "Prepare data"
+msgstr "Forbered data"
 
-#: plugins/af_readability/init.php:21
-msgid "Data saved."
+#: plugins/import_export/init.php:434
+#, php-format
+msgid "Upload failed with error code %d (%s)"
 msgstr ""
 
-#: plugins/af_readability/init.php:33
-#, fuzzy
-msgid "Inline content"
-msgstr "Rediger artikelnote"
+#: plugins/import_export/init.php:460
+msgid "No file uploaded."
+msgstr "Der er ikke indlæst nogen fil."
 
-#: plugins/af_readability/init.php:39
-msgid "Readability settings (af_readability)"
-msgstr ""
+#: plugins/mailto/init.php:48
+#: plugins/mailto/init.php:54
+#: plugins/mail/init.php:112
+#: plugins/mail/init.php:118
+msgid "[Forwarded]"
+msgstr "[Fremsendt]"
 
-#: plugins/af_readability/init.php:66
-msgid "Use Readability for pages shared via bookmarklet."
-msgstr ""
+#: plugins/mailto/init.php:48
+#: plugins/mail/init.php:112
+msgid "Multiple articles"
+msgstr "Flere artikler"
 
-#: plugins/af_readability/init.php:78
-#: plugins/af_psql_trgm/init.php:191
-msgid "Currently enabled for (click to edit):"
+#: plugins/mailto/init.php:70
+msgid "Clicking the following link to invoke your mail client:"
 msgstr ""
 
-#: plugins/af_readability/init.php:95
+#: plugins/mailto/init.php:74
 #, fuzzy
-msgid "Readability"
-msgstr "Tjek tilgængelighed"
-
-#: plugins/af_readability/init.php:106
-#, fuzzy
-msgid "Inline article content"
-msgstr "Rediger artikelnote"
+msgid "Forward selected article(s) by email."
+msgstr "Videresend artikel via e-mail"
 
-#: plugins/af_redditimgur/init.php:25
-msgid "Reddit content settings (af_redditimgur)"
+#: plugins/mailto/init.php:77
+msgid "You should be able to edit the message before sending in your mail client."
 msgstr ""
 
-#: plugins/af_redditimgur/init.php:50
-msgid "Uses Readability (full-text-rss) implementation by <a target='_blank' href='https://bitbucket.org/fivefilters/'>FiveFilters.org</a>"
-msgstr ""
+#: plugins/mailto/init.php:82
+msgid "Close this dialog"
+msgstr "Luk denne dialog"
 
-#: plugins/af_redditimgur/init.php:54
-msgid "Extract missing content using Readability"
-msgstr ""
+#: plugins/bookmarklets/init.php:20
+msgid "Bookmarklets"
+msgstr "Bogmærker"
 
-#: plugins/af_redditimgur/init.php:59
-msgid "Enable additional duplicate checking"
+#: plugins/bookmarklets/init.php:22
+msgid "Drag the link below to your browser toolbar, open the feed you're interested in in your browser and click on the link to subscribe to it."
 msgstr ""
 
-#: plugins/af_redditimgur/init.php:73
-#: plugins/af_zz_imgproxy/init.php:225
+#: plugins/bookmarklets/init.php:26
+#, fuzzy, php-format
+msgid "Subscribe to %s in Tiny Tiny RSS?"
+msgstr "Abonneret på %s"
+
+#: plugins/bookmarklets/init.php:31
 #, fuzzy
-msgid "Configuration saved"
-msgstr "Konfiguration gemt."
+msgid "Subscribe in Tiny Tiny RSS"
+msgstr "Opdater Tiny Tiny RSS"
+
+#: plugins/bookmarklets/init.php:34
+msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
+msgstr ""
 
 #: plugins/af_psql_trgm/init.php:28
 #, php-format
@@ -2653,87 +2598,62 @@ msgstr ""
 msgid "Enable for all feeds:"
 msgstr "Aktiver feed-kategorier"
 
-#: plugins/af_psql_trgm/init.php:209
-msgid "Similarity (pg_trgm)"
-msgstr ""
-
-#: plugins/af_comics/init.php:40
-msgid "Feeds supported by af_comics"
+#: plugins/af_psql_trgm/init.php:191
+#: plugins/af_readability/init.php:78
+msgid "Currently enabled for (click to edit):"
 msgstr ""
 
-#: plugins/af_comics/init.php:42
-msgid "The following comics are currently supported:"
+#: plugins/af_psql_trgm/init.php:209
+msgid "Similarity (pg_trgm)"
 msgstr ""
 
-#: plugins/af_comics/init.php:60
-msgid "GoComics requires a specific URL to workaround their lack of feed support: <code>http://feeds.feedburner.com/uclick/<em>comic_name</em></code> (e.g. <code>http://www.gocomics.com/garfield</code> uses <code>http://feeds.feedburner.com/uclick/garfield</code>)."
+#: plugins/nsfw/init.php:30
+#: plugins/nsfw/init.php:42
+msgid "Not work safe (click to toggle)"
 msgstr ""
 
-#: plugins/import_export/init.php:58
-msgid "Import and export"
-msgstr "Import og eksport"
+#: plugins/nsfw/init.php:52
+msgid "NSFW Plugin"
+msgstr "NSFW-plugin"
 
-#: plugins/import_export/init.php:60
-msgid "You can export and import your Starred and Archived articles for safekeeping or when migrating between tt-rss instances of same version."
+#: plugins/nsfw/init.php:79
+msgid "Tags to consider NSFW (comma-separated)"
 msgstr ""
 
-#: plugins/import_export/init.php:65
-msgid "Export my data"
-msgstr "Eksporter mine data"
-
-#: plugins/import_export/init.php:81
-msgid "Import"
-msgstr "Import"
+#: plugins/nsfw/init.php:100
+msgid "Configuration saved."
+msgstr "Konfiguration gemt."
 
-#: plugins/import_export/init.php:225
-msgid "Could not import: incorrect schema version."
-msgstr ""
+#: plugins/toggle_sidebar/init.php:23
+msgid "Collapse feedlist"
+msgstr "Skjul feed-liste"
 
-#: plugins/import_export/init.php:230
-msgid "Could not import: unrecognized document format."
+#: plugins/af_readability/init.php:21
+msgid "Data saved."
 msgstr ""
 
-#: plugins/import_export/init.php:391
-msgid "Finished: "
-msgstr "Færdig: "
-
-#: plugins/import_export/init.php:392
-#, fuzzy, php-format
-msgid "%d article processed, "
-msgid_plural "%d articles processed, "
-msgstr[0] "Rediger artikelnote"
-msgstr[1] "Rediger artikelnote"
-
-#: plugins/import_export/init.php:393
-#, php-format
-msgid "%d imported, "
-msgid_plural "%d imported, "
-msgstr[0] ""
-msgstr[1] ""
-
-#: plugins/import_export/init.php:394
-#, fuzzy, php-format
-msgid "%d feed created."
-msgid_plural "%d feeds created."
-msgstr[0] "Der er ikke valgt noget feed."
-msgstr[1] "Der er ikke valgt noget feed."
+#: plugins/af_readability/init.php:33
+#, fuzzy
+msgid "Inline content"
+msgstr "Rediger artikelnote"
 
-#: plugins/import_export/init.php:399
-msgid "Could not load XML document."
+#: plugins/af_readability/init.php:39
+msgid "Readability settings (af_readability)"
 msgstr ""
 
-#: plugins/import_export/init.php:411
-msgid "Prepare data"
-msgstr "Forbered data"
-
-#: plugins/import_export/init.php:428
-#, php-format
-msgid "Upload failed with error code %d (%s)"
+#: plugins/af_readability/init.php:66
+msgid "Use Readability for pages shared via bookmarklet."
 msgstr ""
 
-#: plugins/import_export/init.php:454
-msgid "No file uploaded."
-msgstr "Der er ikke indlæst nogen fil."
+#: plugins/af_readability/init.php:95
+#, fuzzy
+msgid "Readability"
+msgstr "Tjek tilgængelighed"
+
+#: plugins/af_readability/init.php:106
+#, fuzzy
+msgid "Inline article content"
+msgstr "Rediger artikelnote"
 
 #: plugins/mail/init.php:28
 msgid "Mail addresses saved."
@@ -2748,18 +2668,6 @@ msgstr "Brugerplugins"
 msgid "You can set predefined email addressed here (comma-separated list):"
 msgstr ""
 
-#: plugins/mail/init.php:112
-#: plugins/mail/init.php:118
-#: plugins/mailto/init.php:49
-#: plugins/mailto/init.php:55
-msgid "[Forwarded]"
-msgstr "[Fremsendt]"
-
-#: plugins/mail/init.php:112
-#: plugins/mailto/init.php:49
-msgid "Multiple articles"
-msgstr "Flere artikler"
-
 #: plugins/mail/init.php:140
 msgid "To:"
 msgstr "Til:"
@@ -2772,92 +2680,110 @@ msgstr "Emne:"
 msgid "Send e-mail"
 msgstr "Send e-mail"
 
-#: plugins/close_button/init.php:22
-msgid "Close article"
-msgstr "Luk artikel"
+#: plugins/share/init.php:39
+msgid "You can disable all articles shared by unique URLs here."
+msgstr ""
 
-#: plugins/bookmarklets/init.php:20
-msgid "Bookmarklets"
-msgstr "Bogmærker"
+#: plugins/share/init.php:42
+msgid "Unshare all articles"
+msgstr "Annuller deling af alle artikler"
 
-#: plugins/bookmarklets/init.php:22
-msgid "Drag the link below to your browser toolbar, open the feed you're interested in in your browser and click on the link to subscribe to it."
+#: plugins/share/init.php:75
+msgid "Share by URL"
+msgstr "Del via webadresse"
+
+#: plugins/share/init.php:96
+msgid "You can share this article by the following unique URL:"
 msgstr ""
 
-#: plugins/bookmarklets/init.php:26
-#, fuzzy, php-format
-msgid "Subscribe to %s in Tiny Tiny RSS?"
-msgstr "Abonneret på %s"
+#: plugins/share/init.php:114
+msgid "Unshare article"
+msgstr "Annuller deling af artikel"
 
-#: plugins/bookmarklets/init.php:31
-#, fuzzy
-msgid "Subscribe in Tiny Tiny RSS"
-msgstr "Opdater Tiny Tiny RSS"
+#: plugins/af_comics/init.php:48
+msgid "Feeds supported by af_comics"
+msgstr ""
 
-#: plugins/bookmarklets/init.php:34
-msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
+#: plugins/af_comics/init.php:50
+msgid "The following comics are currently supported:"
 msgstr ""
 
-#: plugins/toggle_sidebar/init.php:23
-msgid "Collapse feedlist"
-msgstr "Skjul feed-liste"
+#: plugins/af_comics/init.php:68
+msgid "GoComics requires a specific URL to workaround their lack of feed support: <code>http://feeds.feedburner.com/uclick/<em>comic_name</em></code> (e.g. <code>http://www.gocomics.com/garfield</code> uses <code>http://feeds.feedburner.com/uclick/garfield</code>)."
+msgstr ""
 
-#: plugins/af_zz_imgproxy/init.php:186
-msgid "Image proxy settings (af_zz_imgproxy)"
+#: plugins/af_comics/init.php:70
+msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
 msgstr ""
 
-#: plugins/af_zz_imgproxy/init.php:211
-#, fuzzy
-msgid "Enable proxy for all remote images."
-msgstr "Aktiver feed-kategorier"
+#: plugins/af_redditimgur/init.php:25
+msgid "Reddit content settings (af_redditimgur)"
+msgstr ""
 
-#: plugins/mailto/init.php:71
-msgid "Clicking the following link to invoke your mail client:"
+#: plugins/af_redditimgur/init.php:50
+msgid "Uses Readability (full-text-rss) implementation by <a target='_blank' href='https://bitbucket.org/fivefilters/'>FiveFilters.org</a>"
 msgstr ""
 
-#: plugins/mailto/init.php:75
-#, fuzzy
-msgid "Forward selected article(s) by email."
-msgstr "Videresend artikel via e-mail"
+#: plugins/af_redditimgur/init.php:54
+msgid "Extract missing content using Readability"
+msgstr ""
 
-#: plugins/mailto/init.php:78
-msgid "You should be able to edit the message before sending in your mail client."
+#: plugins/af_redditimgur/init.php:59
+msgid "Enable additional duplicate checking"
 msgstr ""
 
-#: plugins/mailto/init.php:83
-msgid "Close this dialog"
-msgstr "Luk denne dialog"
+#: plugins/af_redditimgur/init.php:73
+#: plugins/af_zz_imgproxy/init.php:254
+#, fuzzy
+msgid "Configuration saved"
+msgstr "Konfiguration gemt."
 
-#: plugins/share/init.php:39
-msgid "You can disable all articles shared by unique URLs here."
+#: plugins/note/init.php:26
+#: plugins/note/note.js:11
+msgid "Edit article note"
+msgstr "Rediger artikelnote"
+
+#: plugins/close_button/init.php:25
+msgid "Close article"
+msgstr "Luk artikel"
+
+#: plugins/af_zz_imgproxy/init.php:210
+msgid "Image proxy settings (af_zz_imgproxy)"
 msgstr ""
 
-#: plugins/share/init.php:42
-msgid "Unshare all articles"
-msgstr "Annuller deling af alle artikler"
+#: plugins/af_zz_imgproxy/init.php:234
+#, fuzzy
+msgid "Enable proxy for all remote images."
+msgstr "Aktiver feed-kategorier"
 
-#: plugins/share/init.php:75
-msgid "Share by URL"
-msgstr "Del via webadresse"
+#: plugins/af_zz_imgproxy/init.php:238
+#, fuzzy
+msgid "Don't cache files locally."
+msgstr "Cache billeder lokalt"
 
-#: plugins/share/init.php:97
-msgid "You can share this article by the following unique URL:"
-msgstr ""
+#: plugins/auth_internal/init.php:65
+#, fuzzy
+msgid "Please enter your one time password:"
+msgstr "Forkert engangsadgangskode"
 
-#: plugins/share/init.php:115
-msgid "Unshare article"
-msgstr "Annuller deling af artikel"
+#: plugins/auth_internal/init.php:188
+msgid "Password has been changed."
+msgstr "Adgangskoden er blevet ændret."
+
+#: plugins/auth_internal/init.php:190
+msgid "Old password is incorrect."
+msgstr "Gammel adgangskode er forkert."
 
 #: js/FeedTree.js:172
 #, fuzzy
 msgid "(Un)collapse"
 msgstr "Vis/skjul sidebjælke"
 
-#: js/PrefFeedTree.js:52
+#: js/PrefFeedTree.js:54
 msgid "Edit category"
 msgstr "Rediger kategori"
 
-#: js/PrefFeedTree.js:59
+#: js/PrefFeedTree.js:61
 msgid "Remove category"
 msgstr "Fjern kategori"
 
@@ -2892,63 +2818,55 @@ msgid "Create Filter"
 msgstr "Opret filter"
 
 #: js/functions.js:1128
-msgid "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification hub again on next feed update."
-msgstr ""
-
-#: js/functions.js:1139
-msgid "Subscription reset."
-msgstr "Abonnement nulstillet."
-
-#: js/functions.js:1149
-#: js/tt-rss.js:695
+#: js/tt-rss.js:696
 #, perl-format
 msgid "Unsubscribe from %s?"
 msgstr "Aflyse abonnement fra %s?"
 
-#: js/functions.js:1152
+#: js/functions.js:1131
 msgid "Removing feed..."
 msgstr "Fjerner feed ..."
 
-#: js/functions.js:1225
+#: js/functions.js:1204
 msgid "Please enter category title:"
 msgstr "Indtast kategorititel:"
 
-#: js/functions.js:1250
+#: js/functions.js:1229
 msgid "Generate new syndication address for this feed?"
 msgstr ""
 
-#: js/functions.js:1254
-#: js/prefs.js:1154
+#: js/functions.js:1233
+#: js/prefs.js:1150
 msgid "Trying to change address..."
 msgstr "Prøver at ændre adresse ..."
 
-#: js/functions.js:1497
-#: js/functions.js:1606
+#: js/functions.js:1476
+#: js/functions.js:1585
 #: js/prefs.js:398
 #: js/prefs.js:424
 #: js/prefs.js:456
 #: js/prefs.js:599
 #: js/prefs.js:617
-#: js/prefs.js:1136
-#: js/prefs.js:1263
+#: js/prefs.js:1132
+#: js/prefs.js:1259
 msgid "No feeds are selected."
 msgstr "Der er ikke valgt nogen feeds."
 
-#: js/functions.js:1540
+#: js/functions.js:1519
 msgid "Remove selected feeds from the archive? Feeds with stored articles will not be removed."
 msgstr ""
 
-#: js/functions.js:1577
+#: js/functions.js:1556
 msgid "Feeds with update errors"
 msgstr "Feeds med opdateringsfejl"
 
-#: js/functions.js:1588
-#: js/prefs.js:1117
+#: js/functions.js:1567
+#: js/prefs.js:1113
 msgid "Remove selected feeds?"
 msgstr "Fjern valgte feeds?"
 
-#: js/functions.js:1591
-#: js/prefs.js:1120
+#: js/functions.js:1570
+#: js/prefs.js:1116
 msgid "Removing selected feeds..."
 msgstr "Fjerner valgte feeds ..."
 
@@ -2971,9 +2889,7 @@ msgstr "Redigeringsprogram til bruger"
 #: js/prefs.js:100
 #: js/prefs.js:209
 #: js/prefs.js:706
-#: plugins/instances/instances.js:26
-#: plugins/instances/instances.js:89
-#: js/functions.js:1408
+#: js/functions.js:1387
 msgid "Saving data..."
 msgstr "Gemmer data ..."
 
@@ -2998,7 +2914,7 @@ msgid "Removing selected labels..."
 msgstr "Fjerner valgte etiketter ..."
 
 #: js/prefs.js:308
-#: js/prefs.js:1304
+#: js/prefs.js:1300
 msgid "No labels are selected."
 msgstr "Der er ikke valgt nogen etiketter."
 
@@ -3102,28 +3018,28 @@ msgstr "Abonner på valgte feed"
 msgid "OPML Import"
 msgstr "OPML-import"
 
-#: js/prefs.js:764
+#: js/prefs.js:759
 msgid "Please choose an OPML file first."
 msgstr ""
 
-#: js/prefs.js:767
+#: js/prefs.js:762
 #: plugins/import_export/import_export.js:115
 msgid "Importing, please wait..."
 msgstr "Importerer, vent venligst ..."
 
-#: js/prefs.js:928
+#: js/prefs.js:924
 msgid "Reset to defaults?"
 msgstr "Nulstil til standardindstillinger?"
 
-#: js/prefs.js:1628
+#: js/prefs.js:1624
 msgid "Subscribing to feeds..."
 msgstr "Abonnerer på feeds ..."
 
-#: js/prefs.js:1647
+#: js/prefs.js:1643
 msgid "Clear stored data for this plugin?"
 msgstr ""
 
-#: js/prefs.js:1661
+#: js/prefs.js:1657
 msgid "Clear all messages in the error log?"
 msgstr ""
 
@@ -3137,181 +3053,150 @@ msgstr "Marker ovenstående som læst"
 msgid "Marking all feeds as read..."
 msgstr "Marker feed som læst"
 
-#: js/tt-rss.js:401
+#: js/tt-rss.js:402
 msgid "Please enable mail plugin first."
 msgstr ""
 
-#: js/tt-rss.js:449
-#: js/functions.js:1387
-#: js/tt-rss.js:676
+#: js/tt-rss.js:450
+#: js/functions.js:1366
+#: js/tt-rss.js:677
 msgid "You can't edit this kind of feed."
 msgstr ""
 
-#: js/tt-rss.js:530
+#: js/tt-rss.js:531
 msgid "Please enable embed_original plugin first."
 msgstr ""
 
-#: js/tt-rss.js:543
-#: js/tt-rss.js:726
+#: js/tt-rss.js:544
+#: js/tt-rss.js:727
 msgid "Widescreen is not available in combined mode."
 msgstr ""
 
-#: js/tt-rss.js:824
+#: js/tt-rss.js:825
 msgid "You can't rescore this kind of feed."
 msgstr ""
 
-#: js/tt-rss.js:829
-#: js/tt-rss.js:689
+#: js/tt-rss.js:830
+#: js/tt-rss.js:690
 #, fuzzy
 msgid "Please select some feed first."
 msgstr "Rydder valgte feed ..."
 
-#: js/tt-rss.js:834
+#: js/tt-rss.js:835
 #, perl-format
 msgid "Rescore articles in %s?"
 msgstr "Ændr resultater af artikler i %s?"
 
-#: js/tt-rss.js:837
+#: js/tt-rss.js:838
 msgid "Rescoring articles..."
 msgstr "Ændrer artikelresultater ..."
 
-#: js/viewfeed.js:919
-#: js/viewfeed.js:957
-#: js/viewfeed.js:1005
-#: js/viewfeed.js:1931
-#: plugins/mail/mail.js:7
+#: js/viewfeed.js:921
+#: js/viewfeed.js:959
+#: js/viewfeed.js:1007
+#: js/viewfeed.js:1933
 #: plugins/mailto/init.js:7
-#: js/viewfeed.js:677
-#: js/viewfeed.js:699
-#: js/viewfeed.js:720
-#: js/viewfeed.js:779
-#: js/viewfeed.js:807
+#: plugins/mail/mail.js:7
+#: js/viewfeed.js:679
+#: js/viewfeed.js:701
+#: js/viewfeed.js:722
+#: js/viewfeed.js:781
+#: js/viewfeed.js:809
 msgid "No articles are selected."
 msgstr "Der er ikke valgt nogen artikler."
 
-#: js/viewfeed.js:927
+#: js/viewfeed.js:929
 #, fuzzy, perl-format
 msgid "Delete %d selected article in %s?"
 msgid_plural "Delete %d selected articles in %s?"
 msgstr[0] "Ændr resultater af artikler i %s?"
 msgstr[1] "Ændr resultater af artikler i %s?"
 
-#: js/viewfeed.js:929
+#: js/viewfeed.js:931
 #, fuzzy, perl-format
 msgid "Delete %d selected article?"
 msgid_plural "Delete %d selected articles?"
 msgstr[0] "Aktiver valgte profil?"
 msgstr[1] "Aktiver valgte profil?"
 
-#: js/viewfeed.js:966
+#: js/viewfeed.js:968
 #, fuzzy, perl-format
 msgid "Archive %d selected article in %s?"
 msgid_plural "Archive %d selected articles in %s?"
 msgstr[0] "Arkiverede artikler"
 msgstr[1] "Arkiverede artikler"
 
-#: js/viewfeed.js:969
+#: js/viewfeed.js:971
 #, fuzzy, perl-format
 msgid "Move %d archived article back?"
 msgid_plural "Move %d archived articles back?"
 msgstr[0] "Arkiverede artikler"
 msgstr[1] "Arkiverede artikler"
 
-#: js/viewfeed.js:971
+#: js/viewfeed.js:973
 msgid "Please note that unstarred articles might get purged on next feed update."
 msgstr ""
 
-#: js/viewfeed.js:1011
+#: js/viewfeed.js:1013
 #, perl-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/viewfeed.js:1031
+#: js/viewfeed.js:1033
 msgid "Edit article Tags"
 msgstr "Rediger artikeltags"
 
-#: js/viewfeed.js:1037
+#: js/viewfeed.js:1039
 msgid "Saving article tags..."
 msgstr "Gemmer artikeltags ..."
 
-#: js/viewfeed.js:1670
+#: js/viewfeed.js:1672
 msgid "Open original article"
 msgstr "Åbn oprindelige artikel"
 
-#: js/viewfeed.js:1677
+#: js/viewfeed.js:1679
 msgid "Display article URL"
 msgstr "Vis artiklens webadresse"
 
-#: js/viewfeed.js:1787
+#: js/viewfeed.js:1789
 msgid "Assign label"
 msgstr "Tildel etiket"
 
-#: js/viewfeed.js:1792
+#: js/viewfeed.js:1794
 msgid "Remove label"
 msgstr "Fjern etiket"
 
-#: js/viewfeed.js:1824
+#: js/viewfeed.js:1826
 msgid "Select articles in group"
 msgstr "Vælg artikler i gruppen"
 
-#: js/viewfeed.js:1834
+#: js/viewfeed.js:1836
 msgid "Mark group as read"
 msgstr "Marker gruppe som læst"
 
-#: js/viewfeed.js:1846
+#: js/viewfeed.js:1848
 msgid "Mark feed as read"
 msgstr "Marker feed som læst"
 
-#: js/viewfeed.js:1899
+#: js/viewfeed.js:1901
 #, fuzzy
 msgid "Please enter new score for selected articles:"
 msgstr "Indtast kategorititel:"
 
-#: js/viewfeed.js:1962
+#: js/viewfeed.js:1964
 #, fuzzy
 msgid "Please enter new score for this article:"
 msgstr "Indtast kategorititel:"
 
-#: js/viewfeed.js:1993
+#: js/viewfeed.js:1995
 msgid "Article URL:"
 msgstr "Artiklens webadresse:"
 
-#: plugins/instances/instances.js:10
-msgid "Link Instance"
-msgstr "Tilknyt forekomst"
-
-#: plugins/instances/instances.js:73
-msgid "Edit Instance"
-msgstr "Rediger forekomst"
-
-#: plugins/instances/instances.js:122
-msgid "Remove selected instances?"
-msgstr "Fjerne valgte forekomster?"
-
-#: plugins/instances/instances.js:125
-msgid "Removing selected instances..."
-msgstr "Fjerner valgte forekomster ..."
-
-#: plugins/instances/instances.js:139
-#: plugins/instances/instances.js:151
-msgid "No instances are selected."
-msgstr "Der er ikke valgt nogen forekomster."
-
-#: plugins/instances/instances.js:156
-#, fuzzy
-msgid "Please select only one instance."
-msgstr "Fjerne valgte forekomster?"
-
-#: plugins/note/note.js:17
-msgid "Saving article note..."
-msgstr "Gemmer artikelnote ..."
-
-#: plugins/af_psql_trgm/init.js:11
-#, fuzzy
-msgid "Related articles"
-msgstr "Delte artikler"
+#: plugins/embed_original/init.js:6
+msgid "Sorry, your browser does not support sandboxed iframes."
+msgstr ""
 
 #: plugins/import_export/import_export.js:13
 msgid "Export Data"
@@ -3332,11 +3217,16 @@ msgstr "Dataimport"
 msgid "Please choose the file first."
 msgstr ""
 
-#: plugins/mail/mail.js:21
 #: plugins/mailto/init.js:21
+#: plugins/mail/mail.js:21
 msgid "Forward article by email"
 msgstr "Videresend artikel via e-mail"
 
+#: plugins/af_psql_trgm/init.js:11
+#, fuzzy
+msgid "Related articles"
+msgstr "Delte artikler"
+
 #: plugins/mail/mail.js:36
 msgid "Error sending email:"
 msgstr ""
@@ -3345,10 +3235,6 @@ msgstr ""
 msgid "Your message has been sent."
 msgstr ""
 
-#: plugins/embed_original/init.js:6
-msgid "Sorry, your browser does not support sandboxed iframes."
-msgstr ""
-
 #: plugins/shorten_expanded/init.js:39
 msgid "Click to expand article"
 msgstr "Klik for at udvide artikel"
@@ -3378,7 +3264,7 @@ msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr ""
 
 #: plugins/share/share_prefs.js:6
-#: js/prefs.js:1437
+#: js/prefs.js:1433
 msgid "Clearing URLs..."
 msgstr "Rydder webadresser ..."
 
@@ -3386,27 +3272,45 @@ msgstr "Rydder webadresser ..."
 msgid "Shared URLs cleared."
 msgstr "Delte webadresser er ryddet."
 
+#: plugins/note/note.js:17
+msgid "Saving article note..."
+msgstr "Gemmer artikelnote ..."
+
 #: js/feedlist.js:429
-#: js/feedlist.js:496
 #, fuzzy
 msgid "Mark all articles in %s as read?"
 msgstr "Ændr resultater af artikler i %s?"
 
 #: js/feedlist.js:487
 #, fuzzy
-msgid "Mark all articles in %s older than 1 day as read?"
+msgid "Mark %w in %s older than 1 day as read?"
 msgstr "Ændr resultater af artikler i %s?"
 
 #: js/feedlist.js:490
 #, fuzzy
-msgid "Mark all articles in %s older than 1 week as read?"
+msgid "Mark %w in %s older than 1 week as read?"
 msgstr "Ændr resultater af artikler i %s?"
 
 #: js/feedlist.js:493
 #, fuzzy
-msgid "Mark all articles in %s older than 2 weeks as read?"
+msgid "Mark %w in %s older than 2 weeks as read?"
+msgstr "Ændr resultater af artikler i %s?"
+
+#: js/feedlist.js:496
+#, fuzzy
+msgid "Mark %w in %s as read?"
 msgstr "Ændr resultater af artikler i %s?"
 
+#: js/feedlist.js:499
+#, fuzzy
+msgid "search results"
+msgstr "Søgeresultater: %s"
+
+#: js/feedlist.js:499
+#, fuzzy
+msgid "all articles"
+msgstr "Alle artikler"
+
 #: js/functions.js:506
 msgid "Error explained"
 msgstr "Fejl forklaret"
@@ -3490,181 +3394,236 @@ msgstr "Abonneret på %s"
 msgid "Edit rule"
 msgstr "Rediger regel"
 
-#: js/functions.js:1402
+#: js/functions.js:1381
 msgid "Edit Feed"
 msgstr "Rediger feed"
 
-#: js/functions.js:1435
+#: js/functions.js:1414
 msgid "More Feeds"
 msgstr "Flere feeds"
 
-#: js/functions.js:1631
+#: js/functions.js:1610
 msgid "Help"
 msgstr "Hjælp"
 
-#: js/prefs.js:1032
+#: js/prefs.js:1028
 msgid "Remove category %s? Any nested feeds would be placed into Uncategorized."
 msgstr ""
 
-#: js/prefs.js:1038
+#: js/prefs.js:1034
 msgid "Removing category..."
 msgstr "Fjerner kategori ..."
 
-#: js/prefs.js:1056
+#: js/prefs.js:1052
 msgid "Remove selected categories?"
 msgstr "Fjern valgte kategorier?"
 
-#: js/prefs.js:1059
+#: js/prefs.js:1055
 msgid "Removing selected categories..."
 msgstr "Fjerner valgte kategorier ..."
 
-#: js/prefs.js:1072
+#: js/prefs.js:1068
 msgid "No categories are selected."
 msgstr "Der er ikke valgt nogen kategorier."
 
-#: js/prefs.js:1079
+#: js/prefs.js:1075
 msgid "Category title:"
 msgstr "Kategorititel:"
 
-#: js/prefs.js:1083
+#: js/prefs.js:1079
 msgid "Creating category..."
 msgstr "Opretter kategori ..."
 
-#: js/prefs.js:1106
+#: js/prefs.js:1102
 msgid "Feeds without recent updates"
 msgstr "Feeds uden nylige opdateringer"
 
-#: js/prefs.js:1150
+#: js/prefs.js:1146
 msgid "Replace current OPML publishing address with a new one?"
 msgstr ""
 
-#: js/prefs.js:1227
+#: js/prefs.js:1223
 msgid "Clearing feed..."
 msgstr "Rydder feed ..."
 
-#: js/prefs.js:1247
+#: js/prefs.js:1243
 #, fuzzy
 msgid "Rescore articles in selected feeds?"
 msgstr "Ændr resultater af artikler i %s?"
 
-#: js/prefs.js:1250
+#: js/prefs.js:1246
 msgid "Rescoring selected feeds..."
 msgstr "Genopretter valgte feeds ..."
 
-#: js/prefs.js:1270
+#: js/prefs.js:1266
 msgid "Rescore all articles? This operation may take a lot of time."
 msgstr ""
 
-#: js/prefs.js:1273
+#: js/prefs.js:1269
 msgid "Rescoring feeds..."
 msgstr "Genopretter feeds ..."
 
-#: js/prefs.js:1289
+#: js/prefs.js:1285
 #, fuzzy
 msgid "Reset selected labels to default colors?"
 msgstr "Fjerne valgte etiketter?"
 
-#: js/prefs.js:1321
+#: js/prefs.js:1317
 msgid "Settings Profiles"
 msgstr "Profilindstillinger"
 
-#: js/prefs.js:1330
+#: js/prefs.js:1326
 msgid "Remove selected profiles? Active and default profiles will not be removed."
 msgstr ""
 
-#: js/prefs.js:1333
+#: js/prefs.js:1329
 msgid "Removing selected profiles..."
 msgstr "Fjerner valgte profiler ..."
 
-#: js/prefs.js:1349
+#: js/prefs.js:1345
 msgid "No profiles are selected."
 msgstr "Der er ikke valgt nogen profiler."
 
-#: js/prefs.js:1357
-#: js/prefs.js:1410
+#: js/prefs.js:1353
+#: js/prefs.js:1406
 msgid "Activate selected profile?"
 msgstr "Aktiver valgte profil?"
 
-#: js/prefs.js:1374
-#: js/prefs.js:1426
+#: js/prefs.js:1370
+#: js/prefs.js:1422
 msgid "Please choose a profile to activate."
 msgstr ""
 
-#: js/prefs.js:1379
+#: js/prefs.js:1375
 msgid "Creating profile..."
 msgstr "Opretter profil ..."
 
-#: js/prefs.js:1434
+#: js/prefs.js:1430
 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr ""
 
-#: js/prefs.js:1444
+#: js/prefs.js:1440
 msgid "Generated URLs cleared."
 msgstr "Genererede webadresser er ryddet."
 
-#: js/prefs.js:1516
+#: js/prefs.js:1512
 msgid "Label Editor"
 msgstr "Labeleditor"
 
-#: js/tt-rss.js:684
+#: js/tt-rss.js:685
 msgid "You can't unsubscribe from the category."
 msgstr ""
 
-#: js/viewfeed.js:125
-#: js/viewfeed.js:175
-#: js/viewfeed.js:192
+#: js/viewfeed.js:127
+#: js/viewfeed.js:177
+#: js/viewfeed.js:194
 #, fuzzy
 msgid "Click to open next unread feed."
 msgstr "Klik for at redigere feed"
 
-#: js/viewfeed.js:129
+#: js/viewfeed.js:131
 msgid "Cancel search"
 msgstr "Annuller søgning"
 
-#: js/viewfeed.js:189
+#: js/viewfeed.js:191
 msgid "New articles found, reload feed to continue."
 msgstr ""
 
-#: js/viewfeed.js:424
+#: js/viewfeed.js:426
 msgid "Unstar article"
 msgstr "Fjern stjerne fra artikel"
 
-#: js/viewfeed.js:428
+#: js/viewfeed.js:430
 msgid "Star article"
 msgstr "Sæt stjerne på artikel"
 
-#: js/viewfeed.js:478
+#: js/viewfeed.js:480
 msgid "Unpublish article"
 msgstr "Annuller udgivelse af artikel"
 
-#: js/viewfeed.js:482
+#: js/viewfeed.js:484
 msgid "Publish article"
 msgstr "Udgiv artikel"
 
-#: js/viewfeed.js:622
+#: js/viewfeed.js:624
 #, fuzzy
 msgid "%d article selected"
 msgid_plural "%d articles selected"
 msgstr[0] "Der er ikke valgt nogen artikel."
 msgstr[1] "Der er ikke valgt nogen artikel."
 
-#: js/viewfeed.js:1286
+#: js/viewfeed.js:1288
 msgid "No article is selected."
 msgstr "Der er ikke valgt nogen artikel."
 
-#: js/viewfeed.js:1321
+#: js/viewfeed.js:1323
 msgid "No articles found to mark"
 msgstr ""
 
-#: js/viewfeed.js:1323
+#: js/viewfeed.js:1325
 #, fuzzy
 msgid "Mark %d article as read?"
 msgid_plural "Mark %d articles as read?"
 msgstr[0] "Marker ovenstående som læst"
 msgstr[1] "Marker ovenstående som læst"
 
-#~ msgid "Cache images locally"
-#~ msgstr "Cache billeder lokalt"
+#~ msgid "Resubscribe to push updates"
+#~ msgstr "Forny abonnement på push-opdateringer"
+
+#~ msgid "Linked"
+#~ msgstr "Tilknyttet"
+
+#~ msgid "Instance"
+#~ msgstr "Instans"
+
+#~ msgid "Instance URL"
+#~ msgstr "Webadresse til instans"
+
+#~ msgid "Access key:"
+#~ msgstr "Adgangsnøgle:"
+
+#~ msgid "Access key"
+#~ msgstr "Adgangsnøgle"
+
+#~ msgid "Generate new key"
+#~ msgstr "Generer ny nøgle"
+
+#~ msgid "Link instance"
+#~ msgstr "Tilknyt instans"
+
+#~ msgid "Last connected"
+#~ msgstr "Sidst forbundet"
+
+#~ msgid "Status"
+#~ msgstr "Status"
+
+#~ msgid "Stored feeds"
+#~ msgstr "Gemte feeds"
+
+#~ msgid "Create link"
+#~ msgstr "Opret link"
+
+#~ msgid "Subscription reset."
+#~ msgstr "Abonnement nulstillet."
+
+#~ msgid "Link Instance"
+#~ msgstr "Tilknyt forekomst"
+
+#~ msgid "Edit Instance"
+#~ msgstr "Rediger forekomst"
+
+#~ msgid "Remove selected instances?"
+#~ msgstr "Fjerne valgte forekomster?"
+
+#~ msgid "Removing selected instances..."
+#~ msgstr "Fjerner valgte forekomster ..."
+
+#~ msgid "No instances are selected."
+#~ msgstr "Der er ikke valgt nogen forekomster."
+
+#, fuzzy
+#~ msgid "Please select only one instance."
+#~ msgstr "Fjerne valgte forekomster?"
 
 #~ msgid "More..."
 #~ msgstr "Mere ..."
diff --git a/locale/de_DE/LC_MESSAGES/messages.mo b/locale/de_DE/LC_MESSAGES/messages.mo
index 14351f549..b1f83919b 100644
--- a/locale/de_DE/LC_MESSAGES/messages.mo
+++ b/locale/de_DE/LC_MESSAGES/messages.mo
diff --git a/locale/de_DE/LC_MESSAGES/messages.po b/locale/de_DE/LC_MESSAGES/messages.po
index 9e195df42..10845ae6a 100644
--- a/locale/de_DE/LC_MESSAGES/messages.po
+++ b/locale/de_DE/LC_MESSAGES/messages.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tt-rss git\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 15:25+0300\n"
+"POT-Creation-Date: 2017-07-04 16:29+0300\n"
 "PO-Revision-Date: 2017-02-14 09:42+0100\n"
 "Last-Translator: Heiko Adams <[email protected]>\n"
 "Language-Team: \n"
@@ -171,31 +171,30 @@ msgstr "Plugin nicht gefunden"
 #: prefs.php:118
 #: classes/backend.php:5
 #: classes/pref/labels.php:282
-#: classes/pref/feeds.php:1402
-#: classes/pref/filters.php:779
+#: classes/pref/filters.php:819
+#: classes/pref/feeds.php:1376
 #: js/feedlist.js:149
-#: js/functions.js:1131
-#: js/functions.js:1231
-#: js/functions.js:1478
+#: js/functions.js:1210
+#: js/functions.js:1457
 #: js/prefs.js:621
-#: js/prefs.js:818
-#: js/prefs.js:1648
-#: js/prefs.js:1663
-#: js/tt-rss.js:550
-#: js/viewfeed.js:1182
+#: js/prefs.js:813
+#: js/prefs.js:1644
+#: js/prefs.js:1659
+#: js/tt-rss.js:551
+#: js/viewfeed.js:1184
 #: plugins/import_export/import_export.js:17
 #: js/feedlist.js:467
-#: js/feedlist.js:512
+#: js/feedlist.js:515
 #: js/functions.js:372
 #: js/functions.js:630
-#: js/prefs.js:1360
-#: js/prefs.js:1413
-#: js/prefs.js:1452
-#: js/prefs.js:1465
-#: js/prefs.js:1476
-#: js/prefs.js:1491
-#: js/tt-rss.js:567
-#: js/viewfeed.js:762
+#: js/prefs.js:1356
+#: js/prefs.js:1409
+#: js/prefs.js:1448
+#: js/prefs.js:1461
+#: js/prefs.js:1472
+#: js/prefs.js:1487
+#: js/tt-rss.js:568
+#: js/viewfeed.js:764
 msgid "Loading, please wait..."
 msgstr "Ladevorgang, bitte warten..."
 
@@ -212,13 +211,13 @@ msgid "All Articles"
 msgstr "Alle Artikel"
 
 #: index.php:192
-#: include/functions2.php:107
+#: include/functions.php:1181
 #: classes/feeds.php:110
 msgid "Starred"
 msgstr "Markiert"
 
 #: index.php:193
-#: include/functions2.php:108
+#: include/functions.php:1182
 #: classes/feeds.php:111
 msgid "Published"
 msgstr "Veröffentlicht"
@@ -259,7 +258,7 @@ msgstr "Titel"
 
 #: index.php:209
 #: index.php:249
-#: include/functions2.php:95
+#: include/functions.php:1169
 #: classes/feeds.php:115
 #: js/FeedTree.js:138
 #: js/FeedTree.js:166
@@ -299,7 +298,7 @@ msgid "Feed actions:"
 msgstr "Feed-Aktionen:"
 
 #: index.php:244
-#: classes/handler/public.php:672
+#: classes/handler/public.php:583
 msgid "Subscribe to feed..."
 msgstr "Feed abonnieren..."
 
@@ -313,8 +312,8 @@ msgstr "Feed neu bewerten"
 
 #: index.php:247
 #: classes/pref/feeds.php:785
-#: classes/pref/feeds.php:1357
-#: js/PrefFeedTree.js:78
+#: classes/pref/feeds.php:1331
+#: js/PrefFeedTree.js:80
 msgid "Unsubscribe"
 msgstr "Feed abbestellen"
 
@@ -331,7 +330,7 @@ msgid "Other actions:"
 msgstr "Andere Aktionen:"
 
 #: index.php:252
-#: include/functions2.php:81
+#: include/functions.php:1155
 msgid "Toggle widescreen mode"
 msgstr "Breitbild-Modus umschalten"
 
@@ -357,7 +356,7 @@ msgstr "Git-Updates sind verfügbar"
 
 #: prefs.php:33
 #: prefs.php:136
-#: include/functions2.php:110
+#: include/functions.php:1184
 #: classes/pref/prefs.php:435
 msgid "Preferences"
 msgstr "Einstellungen"
@@ -372,20 +371,19 @@ msgstr "Einstellungen verlassen"
 
 #: prefs.php:139
 #: classes/pref/feeds.php:112
-#: classes/pref/feeds.php:1297
-#: classes/pref/feeds.php:1346
+#: classes/pref/feeds.php:1271
+#: classes/pref/feeds.php:1320
 msgid "Feeds"
 msgstr "Feeds"
 
 #: prefs.php:142
-#: classes/pref/filters.php:248
+#: classes/pref/filters.php:273
 msgid "Filters"
 msgstr "Filter"
 
 #: prefs.php:145
-#: include/functions.php:1327
-#: include/functions.php:1979
 #: classes/pref/labels.php:90
+#: classes/feeds.php:1718
 msgid "Labels"
 msgstr "Label"
 
@@ -414,13 +412,13 @@ msgstr "Die Registrierung für neue Benutzer wurde administrativ deaktiviert."
 #: register.php:337
 #: register.php:347
 #: register.php:359
-#: classes/handler/public.php:742
-#: classes/handler/public.php:813
-#: classes/handler/public.php:911
-#: classes/handler/public.php:990
-#: classes/handler/public.php:1004
-#: classes/handler/public.php:1011
-#: classes/handler/public.php:1036
+#: classes/handler/public.php:653
+#: classes/handler/public.php:724
+#: classes/handler/public.php:822
+#: classes/handler/public.php:901
+#: classes/handler/public.php:915
+#: classes/handler/public.php:922
+#: classes/handler/public.php:947
 msgid "Return to Tiny Tiny RSS"
 msgstr "Zu Tiny Tiny RSS zurückkehren"
 
@@ -437,12 +435,12 @@ msgid "Check availability"
 msgstr "Verfügbarkeit prüfen"
 
 #: register.php:229
-#: classes/handler/public.php:829
+#: classes/handler/public.php:740
 msgid "Email:"
 msgstr "E-Mail:"
 
 #: register.php:232
-#: classes/handler/public.php:834
+#: classes/handler/public.php:745
 msgid "How much is two plus two:"
 msgstr "Wieviel ist zwei plus zwei:"
 
@@ -470,17 +468,23 @@ msgstr "Konto erfolgreich erstellt."
 msgid "New user registrations are currently closed."
 msgstr "Registrierung für neue Benutzer ist momentan geschlossen."
 
-#: update.php:67
+#: update.php:66
 msgid "Tiny Tiny RSS data update script."
 msgstr "Skript zum Updaten von Tiny Tiny RSS."
 
-#: include/digest.php:109
-#: include/functions.php:1336
-#: include/functions.php:1880
-#: include/functions.php:1965
-#: include/functions.php:1987
-#: classes/opml.php:421
+#: include/controls.php:83
+#: classes/pref/filters.php:242
+#: classes/pref/filters.php:253
+#: classes/pref/filters.php:544
+msgid "All feeds"
+msgstr "Alle Feeds"
+
+#: include/controls.php:134
+#: include/controls.php:316
 #: classes/pref/feeds.php:228
+#: classes/opml.php:486
+#: classes/feeds.php:1727
+#: classes/digest.php:113
 msgid "Uncategorized"
 msgstr "Unkategorisiert"
 
@@ -495,389 +499,285 @@ msgstr[1] "%d archivierte Artikel"
 msgid "No feeds found."
 msgstr "Keine Feeds gefunden."
 
-#: include/functions.php:1029
+#: include/functions.php:900
 #, php-format
 msgid "%d min"
 msgstr "%d min"
 
-#: include/functions.php:1325
-#: include/functions.php:1977
-msgid "Special"
-msgstr "Sonderfeeds"
-
-#: include/functions.php:1828
-#: classes/pref/filters.php:229
-#: classes/pref/filters.php:507
-msgid "All feeds"
-msgstr "Alle Feeds"
-
-#: include/functions.php:2032
-msgid "Starred articles"
-msgstr "Markierte Artikel"
-
-#: include/functions.php:2034
-msgid "Published articles"
-msgstr "Veröffentlichte Artikel"
-
-#: include/functions.php:2036
-msgid "Fresh articles"
-msgstr "Neue Artikel"
-
-#: include/functions.php:2038
-#: include/functions2.php:105
-msgid "All articles"
-msgstr "Alle Artikel"
-
-#: include/functions.php:2040
-msgid "Archived articles"
-msgstr "Archivierte Artikel"
-
-#: include/functions.php:2042
-msgid "Recently read"
-msgstr "Kürzlich gelesen"
-
-#: include/functions2.php:57
+#: include/functions.php:1131
 msgid "Navigation"
 msgstr "Navigation"
 
-#: include/functions2.php:58
+#: include/functions.php:1132
 msgid "Open next feed"
 msgstr "Nächsten Feed öffnen"
 
-#: include/functions2.php:59
+#: include/functions.php:1133
 msgid "Open previous feed"
 msgstr "Vorherigen Feed öffnen"
 
-#: include/functions2.php:60
+#: include/functions.php:1134
 msgid "Open next article"
 msgstr "Nächsten Artikel öffnen"
 
-#: include/functions2.php:61
+#: include/functions.php:1135
 msgid "Open previous article"
 msgstr "Vorherigen Artikel öffnen"
 
-#: include/functions2.php:62
+#: include/functions.php:1136
 msgid "Open next article (don't scroll long articles)"
 msgstr "Nächsten Artikel laden (lange Artikel werden nicht gescrollt)"
 
-#: include/functions2.php:63
+#: include/functions.php:1137
 msgid "Open previous article (don't scroll long articles)"
 msgstr "Vorherigen Artikel laden (lange Artikel werden nicht gescrollt)"
 
-#: include/functions2.php:64
+#: include/functions.php:1138
 msgid "Move to next article (don't expand or mark read)"
 msgstr "Zum nächsten Artikel springen (nicht als gelesen markieren oder ausklappen)"
 
-#: include/functions2.php:65
+#: include/functions.php:1139
 msgid "Move to previous article (don't expand or mark read)"
 msgstr "Zum vorherigen Artikel springen (nicht als gelesen markieren oder ausklappen)"
 
-#: include/functions2.php:66
+#: include/functions.php:1140
 msgid "Show search dialog"
 msgstr "Suchdialog anzeigen"
 
-#: include/functions2.php:67
+#: include/functions.php:1141
 msgid "Article"
 msgstr "Artikel"
 
-#: include/functions2.php:68
-#: js/viewfeed.js:1699
+#: include/functions.php:1142
+#: js/viewfeed.js:1701
 msgid "Toggle starred"
 msgstr "Markierung ein-/ausschalten"
 
-#: include/functions2.php:69
-#: js/viewfeed.js:1711
+#: include/functions.php:1143
+#: js/viewfeed.js:1713
 msgid "Toggle published"
 msgstr "Veröffentlichung ein-/ausschalten"
 
-#: include/functions2.php:70
-#: js/viewfeed.js:1686
+#: include/functions.php:1144
+#: js/viewfeed.js:1688
 msgid "Toggle unread"
 msgstr "Gelesen-Status umschalten"
 
-#: include/functions2.php:71
+#: include/functions.php:1145
 msgid "Edit tags"
 msgstr "Tags bearbeiten"
 
-#: include/functions2.php:72
+#: include/functions.php:1146
 msgid "Open in new window"
 msgstr "In neuem Fenster öffnen"
 
-#: include/functions2.php:73
-#: js/viewfeed.js:1732
+#: include/functions.php:1147
+#: js/viewfeed.js:1734
 msgid "Mark below as read"
 msgstr "Untere als gelesen markieren"
 
-#: include/functions2.php:74
-#: js/viewfeed.js:1725
+#: include/functions.php:1148
+#: js/viewfeed.js:1727
 msgid "Mark above as read"
 msgstr "Obige als gelesen markieren"
 
-#: include/functions2.php:75
+#: include/functions.php:1149
 msgid "Scroll down"
 msgstr "Nach unten scrollen"
 
-#: include/functions2.php:76
+#: include/functions.php:1150
 msgid "Scroll up"
 msgstr "Nach oben scrollen"
 
-#: include/functions2.php:77
+#: include/functions.php:1151
 msgid "Select article under cursor"
 msgstr "Artikel unter Mauszeiger auswählen"
 
-#: include/functions2.php:78
+#: include/functions.php:1152
 msgid "Email article"
 msgstr "Artikel per E-Mail versenden"
 
-#: include/functions2.php:79
+#: include/functions.php:1153
 msgid "Close/collapse article"
 msgstr "Artikel schließen/verbergen"
 
-#: include/functions2.php:80
+#: include/functions.php:1154
 msgid "Toggle article expansion (combined mode)"
 msgstr "Kombinierte Feed-Anzeige umschalten"
 
-#: include/functions2.php:82
+#: include/functions.php:1156
 #: plugins/embed_original/init.php:31
 msgid "Toggle embed original"
 msgstr "\"Original einbetten\" umschalten"
 
-#: include/functions2.php:83
+#: include/functions.php:1157
 msgid "Article selection"
 msgstr "Artikelauswahl"
 
-#: include/functions2.php:84
+#: include/functions.php:1158
 msgid "Select all articles"
 msgstr "Alle Artikel auswählen"
 
-#: include/functions2.php:85
+#: include/functions.php:1159
 msgid "Select unread"
 msgstr "Ungelesene Artikel auswählen"
 
-#: include/functions2.php:86
+#: include/functions.php:1160
 msgid "Select starred"
 msgstr "Markierte Artikel auswählen"
 
-#: include/functions2.php:87
+#: include/functions.php:1161
 msgid "Select published"
 msgstr "Veröffentlichte Artikel auswählen"
 
-#: include/functions2.php:88
+#: include/functions.php:1162
 msgid "Invert selection"
 msgstr "Auswahl umkehren"
 
-#: include/functions2.php:89
+#: include/functions.php:1163
 msgid "Deselect everything"
 msgstr "Auswahl aufheben"
 
-#: include/functions2.php:90
+#: include/functions.php:1164
 #: classes/pref/feeds.php:555
-#: classes/pref/feeds.php:823
+#: classes/pref/feeds.php:811
 msgid "Feed"
 msgstr "Feed"
 
-#: include/functions2.php:91
+#: include/functions.php:1165
 msgid "Refresh current feed"
 msgstr "Aktuellen Feed aktualisieren"
 
-#: include/functions2.php:92
+#: include/functions.php:1166
 msgid "Un/hide read feeds"
 msgstr "Gelesene Feeds zeigen/verstecken"
 
-#: include/functions2.php:93
-#: classes/pref/feeds.php:1349
+#: include/functions.php:1167
+#: classes/pref/feeds.php:1323
 msgid "Subscribe to feed"
 msgstr "Feed abonnieren"
 
-#: include/functions2.php:94
+#: include/functions.php:1168
 #: js/FeedTree.js:145
-#: js/PrefFeedTree.js:72
-#: js/viewfeed.js:1853
+#: js/PrefFeedTree.js:74
+#: js/viewfeed.js:1855
 msgid "Edit feed"
 msgstr "Feed bearbeiten"
 
-#: include/functions2.php:96
+#: include/functions.php:1170
 msgid "Reverse headlines"
 msgstr "Schlagzeilensortierung umkehren"
 
-#: include/functions2.php:97
+#: include/functions.php:1171
 msgid "Toggle headline grouping"
 msgstr "Gruppierung der Kopfzeilen umschalten"
 
-#: include/functions2.php:98
+#: include/functions.php:1172
 msgid "Debug feed update"
 msgstr "Aktualisierung im Diagnose-Modus durchführen"
 
-#: include/functions2.php:99
+#: include/functions.php:1173
 msgid "Debug viewfeed()"
 msgstr "viewfeed() debuggen"
 
-#: include/functions2.php:100
+#: include/functions.php:1174
 #: js/FeedTree.js:194
 msgid "Mark all feeds as read"
 msgstr "Alle Feeds als gelesen markieren"
 
-#: include/functions2.php:101
+#: include/functions.php:1175
 msgid "Un/collapse current category"
 msgstr "Aktuelle Kategorie ein-/ausklappen:"
 
-#: include/functions2.php:102
+#: include/functions.php:1176
 msgid "Toggle combined mode"
 msgstr "Kombinierte Feed-Anzeige umschalten"
 
-#: include/functions2.php:103
+#: include/functions.php:1177
 msgid "Toggle auto expand in combined mode"
 msgstr "Kombinierte Feed-Anzeige umschalten"
 
-#: include/functions2.php:104
+#: include/functions.php:1178
 msgid "Go to"
 msgstr "Gehe zu"
 
-#: include/functions2.php:106
+#: include/functions.php:1179
+#: classes/feeds.php:1602
+msgid "All articles"
+msgstr "Alle Artikel"
+
+#: include/functions.php:1180
 msgid "Fresh"
 msgstr "Neu"
 
-#: include/functions2.php:109
-#: js/tt-rss.js:494
-#: js/tt-rss.js:663
+#: include/functions.php:1183
+#: js/tt-rss.js:495
+#: js/tt-rss.js:664
 msgid "Tag cloud"
 msgstr "Tagwolke"
 
-#: include/functions2.php:111
+#: include/functions.php:1185
 msgid "Other"
 msgstr "Sonstiges"
 
-#: include/functions2.php:112
+#: include/functions.php:1186
 #: classes/pref/labels.php:267
 msgid "Create label"
 msgstr "Label erstellen"
 
-#: include/functions2.php:113
-#: classes/pref/filters.php:753
+#: include/functions.php:1187
+#: classes/pref/filters.php:793
 msgid "Create filter"
 msgstr "Filter erstellen"
 
-#: include/functions2.php:114
+#: include/functions.php:1188
 msgid "Un/collapse sidebar"
 msgstr "Seitenleiste ein-/ausklappen"
 
-#: include/functions2.php:115
+#: include/functions.php:1189
 msgid "Show help dialog"
 msgstr "Hilfe anzeigen"
 
-#: include/functions2.php:670
-#, php-format
-msgid "Search results: %s"
-msgstr "Suchergebnisse: %s"
-
-#: include/functions2.php:1336
-#: classes/feeds.php:752
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] "Kommentar"
-msgstr[1] "Kommentare"
-
-#: include/functions2.php:1340
-#: classes/feeds.php:756
-msgid "comments"
-msgstr "Kommentare"
-
-#: include/functions2.php:1366
-msgid " - "
-msgstr " - "
-
-#: include/functions2.php:1397
-#: include/functions2.php:1648
-#: classes/article.php:311
-msgid "no tags"
-msgstr "Keine Tags"
-
-#: include/functions2.php:1407
-#: classes/feeds.php:738
-msgid "Edit tags for this article"
-msgstr "Tags für diesen Artikel bearbeiten"
-
-#: include/functions2.php:1439
-#: classes/feeds.php:690
-msgid "Originally from:"
-msgstr "Original von:"
-
-#: include/functions2.php:1452
-#: classes/pref/feeds.php:574
-#: classes/feeds.php:703
-msgid "Feed URL"
-msgstr "Feed URL"
-
-#: include/functions2.php:1489
-#: classes/backend.php:105
-#: classes/dlg.php:37
-#: classes/dlg.php:60
-#: classes/dlg.php:93
-#: classes/dlg.php:159
-#: classes/dlg.php:186
-#: classes/pref/feeds.php:1652
-#: classes/pref/feeds.php:1718
-#: classes/pref/filters.php:204
-#: classes/pref/prefs.php:1097
-#: plugins/af_psql_trgm/init.php:102
-#: plugins/import_export/init.php:415
-#: plugins/import_export/init.php:461
-#: plugins/share/init.php:121
-msgid "Close this window"
-msgstr "Fenster schließen"
-
-#: include/functions2.php:1686
-msgid "(edit note)"
-msgstr "(Notiz bearbeiten)"
-
-#: include/functions2.php:1960
-msgid "unknown type"
-msgstr "unbekannter Typ"
-
-#: include/functions2.php:2037
-msgid "Attachments"
-msgstr "Anhänge"
-
-#: include/functions2.php:2496
+#: include/functions.php:2456
 msgid "There is no error, the file uploaded with success"
 msgstr "Kein Fehler. Datei erfolgreich hochgeladen"
 
-#: include/functions2.php:2497
+#: include/functions.php:2457
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Die hochgeladene Datei überschreitet die upload_max_filesize Direktive in der php.ini"
 
-#: include/functions2.php:2498
+#: include/functions.php:2458
 msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
 msgstr "Die hochgeladene Datei überschreitet die MAX_FILE_SIZE Direktive des HTML-Formulars"
 
-#: include/functions2.php:2499
+#: include/functions.php:2459
 msgid "The uploaded file was only partially uploaded"
 msgstr "Die Datei wurde nur teilweise hochgeladen"
 
-#: include/functions2.php:2500
+#: include/functions.php:2460
 msgid "No file was uploaded"
 msgstr "Es wurde keine Datei hochgeladen."
 
-#: include/functions2.php:2501
+#: include/functions.php:2461
 msgid "Missing a temporary folder"
 msgstr "Fehlender temporärer Ordner"
 
-#: include/functions2.php:2502
+#: include/functions.php:2462
 msgid "Failed to write file to disk."
 msgstr "Konnte Datei nicht speichern."
 
-#: include/functions2.php:2503
+#: include/functions.php:2463
 msgid "A PHP extension stopped the file upload."
 msgstr "Eine PHP-Erweiterung hat den Upload unterbrochen."
 
 #: include/login_form.php:197
-#: classes/handler/public.php:569
-#: classes/handler/public.php:824
+#: classes/handler/public.php:480
+#: classes/handler/public.php:735
 msgid "Login:"
 msgstr "Benutzername:"
 
 #: include/login_form.php:207
-#: classes/handler/public.php:572
+#: classes/handler/public.php:483
 msgid "Password:"
 msgstr "Passwort:"
 
@@ -890,7 +790,7 @@ msgid "Profile:"
 msgstr "Profil:"
 
 #: include/login_form.php:223
-#: classes/handler/public.php:311
+#: classes/handler/public.php:287
 #: classes/pref/prefs.php:1035
 #: classes/rpc.php:63
 msgid "Default profile"
@@ -909,7 +809,7 @@ msgid "Remember me"
 msgstr "Erinnere dich an mich"
 
 #: include/login_form.php:249
-#: classes/handler/public.php:577
+#: classes/handler/public.php:488
 msgid "Log in"
 msgstr "Anmelden"
 
@@ -925,145 +825,44 @@ msgstr "Sitzung konnte nicht validiert werden (Benutzer existiert nicht)"
 msgid "Session failed to validate (password changed)"
 msgstr "Sitzung konnte nicht validiert werden (Passwort wurde geändert)"
 
-#: classes/article.php:25
-msgid "Article not found."
-msgstr "Artikel nicht gefunden."
-
-#: classes/article.php:197
-msgid "Tags for this article (separated by commas):"
-msgstr "Tags für diesen Artikel (durch Komma getrennt):"
-
-#: classes/article.php:222
-#: classes/pref/labels.php:79
-#: classes/pref/users.php:98
-#: classes/pref/feeds.php:801
-#: classes/pref/feeds.php:943
-#: classes/pref/filters.php:485
-#: classes/pref/prefs.php:981
-#: plugins/instances/init.php:245
-#: plugins/nsfw/init.php:85
-#: plugins/note/init.php:51
-#: plugins/af_readability/init.php:68
-#: plugins/af_redditimgur/init.php:60
-#: plugins/af_psql_trgm/init.php:181
-#: plugins/mail/init.php:64
-#: plugins/af_zz_imgproxy/init.php:213
-msgid "Save"
-msgstr "Speichern"
-
-#: classes/article.php:224
-#: classes/handler/public.php:546
-#: classes/handler/public.php:580
-#: classes/pref/labels.php:81
-#: classes/pref/users.php:100
-#: classes/pref/feeds.php:802
-#: classes/pref/feeds.php:946
-#: classes/pref/feeds.php:1859
-#: classes/pref/filters.php:488
-#: classes/pref/filters.php:902
-#: classes/pref/filters.php:983
-#: classes/pref/filters.php:1076
-#: classes/pref/prefs.php:983
-#: classes/feeds.php:1105
-#: classes/feeds.php:1155
-#: classes/feeds.php:1192
-#: plugins/instances/init.php:248
-#: plugins/instances/init.php:436
-#: plugins/note/init.php:53
-#: plugins/mail/init.php:173
-msgid "Cancel"
-msgstr "Abbrechen"
-
-#: classes/opml.php:28
-#: classes/opml.php:33
-msgid "OPML Utility"
-msgstr "OPML Werkzeug"
-
-#: classes/opml.php:37
-msgid "Importing OPML..."
-msgstr "Importiere OPML..."
-
-#: classes/opml.php:41
-msgid "Return to preferences"
-msgstr "Zu den Einstellungen zurückkehren"
-
-#: classes/opml.php:271
-#, php-format
-msgid "Adding feed: %s"
-msgstr "Füge Feed hinzu: %s"
-
-#: classes/opml.php:282
-#, php-format
-msgid "Duplicate feed: %s"
-msgstr "Doppelter Feed: %s"
-
-#: classes/opml.php:296
-#, php-format
-msgid "Adding label %s"
-msgstr "Füge Label %s hinzu"
-
-#: classes/opml.php:299
-#, php-format
-msgid "Duplicate label: %s"
-msgstr "Doppeltes Label: %s"
-
-#: classes/opml.php:311
-#, php-format
-msgid "Setting preference key %s to %s"
-msgstr "Setze Konfigurationsoption %s auf %s"
-
-#: classes/opml.php:343
-msgid "Adding filter..."
-msgstr "Füge Filter hinzu..."
-
-#: classes/opml.php:421
-#, php-format
-msgid "Processing category: %s"
-msgstr "Verarbeite Kategorie: %s"
-
-#: classes/opml.php:470
-#, php-format
-msgid "Upload failed with error code %d"
-msgstr "Upload schlug fehl. Fehlercode: %d"
-
-#: classes/opml.php:484
-#: plugins/import_export/init.php:442
-msgid "Unable to move uploaded file."
-msgstr "Fehler: konnte die hochgeladene Datei nicht verschieben."
-
-#: classes/opml.php:488
-#: plugins/import_export/init.php:446
-msgid "Error: please upload OPML file."
-msgstr "Fehler: bitte eine OPML-Datei hochladen."
-
-#: classes/opml.php:499
-msgid "Error: unable to find moved OPML file."
-msgstr "Fehler: konnte die verschobene OPML-Datei nicht finden."
-
-#: classes/opml.php:506
-msgid "Error while parsing document."
-msgstr "Fehler beim Parsen des Dokuments."
-
-#: classes/backend.php:33
+#: classes/backend.php:31
 msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
 msgstr "Im Wiki von Tiny Tiny RSS finden Sie weitere Tipps."
 
-#: classes/backend.php:38
+#: classes/backend.php:36
 msgid "Keyboard Shortcuts"
 msgstr "Tastaturkürzel"
 
-#: classes/backend.php:61
+#: classes/backend.php:59
 msgid "Shift"
 msgstr "Shift"
 
-#: classes/backend.php:64
+#: classes/backend.php:62
 msgid "Ctrl"
 msgstr "Strg"
 
-#: classes/backend.php:99
+#: classes/backend.php:97
 msgid "Help topic not found."
 msgstr "Hilfethema nicht gefunden."
 
+#: classes/backend.php:103
+#: classes/dlg.php:37
+#: classes/dlg.php:60
+#: classes/dlg.php:93
+#: classes/dlg.php:159
+#: classes/dlg.php:186
+#: classes/article.php:744
+#: classes/pref/filters.php:206
+#: classes/pref/prefs.php:1097
+#: classes/pref/feeds.php:1626
+#: classes/pref/feeds.php:1692
+#: plugins/import_export/init.php:421
+#: plugins/import_export/init.php:467
+#: plugins/af_psql_trgm/init.php:102
+#: plugins/share/init.php:120
+msgid "Close this window"
+msgstr "Fenster schließen"
+
 #: classes/dlg.php:17
 msgid "If you have imported labels and/or filters, you might need to reload preferences to see your new data."
 msgstr "Wenn Label und/oder Filter importiert wurden, müssen die Einstellungen erneut geladen werden, um alle neuen Einstellungen zu sehen."
@@ -1074,7 +873,7 @@ msgstr "Ihre öffentliche OPML-URL lautet:"
 
 #: classes/dlg.php:57
 #: classes/dlg.php:183
-#: plugins/share/init.php:118
+#: plugins/share/init.php:117
 msgid "Generate new URL"
 msgstr "Erzeuge neue URL"
 
@@ -1095,128 +894,222 @@ msgstr "Der Aktualisierungs Daemon braucht zu lange, um eine Aktualisierung durc
 msgid "You can view this feed as RSS using the following URL:"
 msgstr "Sie finden diesen Feed als RSS unter der folgenden URL:"
 
-#: classes/handler/public.php:510
+#: classes/article.php:25
+msgid "Article not found."
+msgstr "Artikel nicht gefunden."
+
+#: classes/article.php:197
+msgid "Tags for this article (separated by commas):"
+msgstr "Tags für diesen Artikel (durch Komma getrennt):"
+
+#: classes/article.php:222
+#: classes/pref/labels.php:79
+#: classes/pref/filters.php:519
+#: classes/pref/users.php:98
+#: classes/pref/prefs.php:981
+#: classes/pref/feeds.php:789
+#: classes/pref/feeds.php:931
+#: plugins/af_psql_trgm/init.php:181
+#: plugins/nsfw/init.php:85
+#: plugins/af_readability/init.php:68
+#: plugins/mail/init.php:64
+#: plugins/af_redditimgur/init.php:60
+#: plugins/note/init.php:51
+#: plugins/af_zz_imgproxy/init.php:240
+msgid "Save"
+msgstr "Speichern"
+
+#: classes/article.php:224
+#: classes/handler/public.php:457
+#: classes/handler/public.php:491
+#: classes/pref/labels.php:81
+#: classes/pref/filters.php:522
+#: classes/pref/filters.php:942
+#: classes/pref/filters.php:1022
+#: classes/pref/filters.php:1115
+#: classes/pref/users.php:100
+#: classes/pref/prefs.php:983
+#: classes/pref/feeds.php:790
+#: classes/pref/feeds.php:934
+#: classes/pref/feeds.php:1833
+#: classes/feeds.php:1098
+#: classes/feeds.php:1148
+#: classes/feeds.php:1185
+#: plugins/mail/init.php:173
+#: plugins/note/init.php:53
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#: classes/article.php:311
+#: classes/article.php:652
+#: classes/article.php:805
+msgid "no tags"
+msgstr "Keine Tags"
+
+#: classes/article.php:419
+msgid "unknown type"
+msgstr "unbekannter Typ"
+
+#: classes/article.php:496
+msgid "Attachments"
+msgstr "Anhänge"
+
+#: classes/article.php:591
+#: classes/feeds.php:741
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] "Kommentar"
+msgstr[1] "Kommentare"
+
+#: classes/article.php:595
+#: classes/feeds.php:745
+msgid "comments"
+msgstr "Kommentare"
+
+#: classes/article.php:621
+msgid " - "
+msgstr " - "
+
+#: classes/article.php:662
+#: classes/feeds.php:727
+msgid "Edit tags for this article"
+msgstr "Tags für diesen Artikel bearbeiten"
+
+#: classes/article.php:694
+#: classes/feeds.php:681
+msgid "Originally from:"
+msgstr "Original von:"
+
+#: classes/article.php:707
+#: classes/pref/feeds.php:574
+#: classes/feeds.php:694
+msgid "Feed URL"
+msgstr "Feed URL"
+
+#: classes/article.php:843
+msgid "(edit note)"
+msgstr "(Notiz bearbeiten)"
+
+#: classes/handler/public.php:421
 #: plugins/bookmarklets/init.php:40
 msgid "Share with Tiny Tiny RSS"
 msgstr "Teilen mit Tiny Tiny RSS"
 
-#: classes/handler/public.php:518
+#: classes/handler/public.php:429
 msgid "Title:"
 msgstr "Titel:"
 
-#: classes/handler/public.php:520
+#: classes/handler/public.php:431
 #: classes/pref/feeds.php:572
-#: plugins/instances/init.php:212
-#: plugins/instances/init.php:401
 msgid "URL:"
 msgstr "URL:"
 
-#: classes/handler/public.php:522
+#: classes/handler/public.php:433
 msgid "Content:"
 msgstr "Inhalt:"
 
-#: classes/handler/public.php:524
+#: classes/handler/public.php:435
 msgid "Labels:"
 msgstr "Label:"
 
-#: classes/handler/public.php:543
+#: classes/handler/public.php:454
 msgid "Shared article will appear in the Published feed."
 msgstr "Geteilte Artikel erscheinen unter 'Veröffentlichte Artikel'."
 
-#: classes/handler/public.php:545
+#: classes/handler/public.php:456
 msgid "Share"
 msgstr "Teilen"
 
-#: classes/handler/public.php:567
+#: classes/handler/public.php:478
 msgid "Not logged in"
 msgstr "Nicht angemeldet"
 
-#: classes/handler/public.php:626
+#: classes/handler/public.php:537
 msgid "Incorrect username or password"
 msgstr "Benutzername oder Passwort falsch"
 
-#: classes/handler/public.php:678
+#: classes/handler/public.php:589
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "<b>%s</b> bereits abonniert."
 
-#: classes/handler/public.php:681
+#: classes/handler/public.php:592
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "<b>%s</b> abonniert."
 
-#: classes/handler/public.php:684
+#: classes/handler/public.php:595
 #, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "Konnte <b>%s</b> nicht abonnieren."
 
-#: classes/handler/public.php:687
+#: classes/handler/public.php:598
 #, php-format
 msgid "No feeds found in <b>%s</b>."
 msgstr "Keine Feeds in <b>%s</b> gefunden."
 
-#: classes/handler/public.php:690
+#: classes/handler/public.php:601
 msgid "Multiple feed URLs found."
 msgstr "Mehrere Feed-URLs gefunden."
 
-#: classes/handler/public.php:694
+#: classes/handler/public.php:605
 #, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr "Das Abonnieren von <b>%s</b> ist fehlgeschlagen.<br>Der Feed konnte nicht heruntergeladen werden."
 
-#: classes/handler/public.php:712
+#: classes/handler/public.php:623
 msgid "Subscribe to selected feed"
 msgstr "Ausgewählte Feeds abonnieren"
 
-#: classes/handler/public.php:737
+#: classes/handler/public.php:648
 msgid "Edit subscription options"
 msgstr "Abonnementoptionen bearbeiten"
 
-#: classes/handler/public.php:774
+#: classes/handler/public.php:685
 msgid "Password recovery"
 msgstr "Passwort-Wiederherstellung"
 
-#: classes/handler/public.php:817
+#: classes/handler/public.php:728
 msgid "You will need to provide valid account name and email. A password reset link will be sent to your email address."
 msgstr "Sie müssen einen gültigen Benutzernamen und EMail angeben. Das neue Passwort wird an Ihre EMail gesendet."
 
-#: classes/handler/public.php:839
-#: classes/pref/users.php:350
+#: classes/handler/public.php:750
+#: classes/pref/users.php:349
 msgid "Reset password"
 msgstr "Passwort zurücksetzen"
 
-#: classes/handler/public.php:849
+#: classes/handler/public.php:760
 msgid "Some of the required form parameters are missing or incorrect."
 msgstr "Einige der benötigten Eingaben fehlen oder sind falsch."
 
-#: classes/handler/public.php:853
-#: classes/handler/public.php:919
+#: classes/handler/public.php:764
+#: classes/handler/public.php:830
 msgid "Go back"
 msgstr "Zurück"
 
-#: classes/handler/public.php:890
+#: classes/handler/public.php:801
 msgid "[tt-rss] Password reset request"
 msgstr "[tt-rss] neues Passwort anfordern"
 
-#: classes/handler/public.php:915
+#: classes/handler/public.php:826
 msgid "Sorry, login and email combination not found."
 msgstr "Entschuldigung, diese Kombination von Benutzername und E-Mail konnte nicht gefunden werden."
 
-#: classes/handler/public.php:937
+#: classes/handler/public.php:848
 msgid "Your access level is insufficient to run this script."
 msgstr "Sie haben nicht die benötigten Rechte, um dieses Skript auszuführen."
 
-#: classes/handler/public.php:963
+#: classes/handler/public.php:874
 msgid "Database Updater"
 msgstr "Datenbank-Updater"
 
-#: classes/handler/public.php:1028
+#: classes/handler/public.php:939
 msgid "Perform updates"
 msgstr "Aktualisierungen durchführen"
 
 #: classes/pref/labels.php:22
-#: classes/pref/filters.php:348
-#: classes/pref/filters.php:823
+#: classes/pref/filters.php:373
+#: classes/pref/filters.php:863
 msgid "Caption"
 msgstr "Titel"
 
@@ -1238,59 +1131,55 @@ msgid "Created label <b>%s</b>"
 msgstr "Label <b>%s</b> erstellt"
 
 #: classes/pref/labels.php:258
-#: classes/pref/users.php:334
-#: classes/pref/feeds.php:1337
-#: classes/pref/feeds.php:1600
-#: classes/pref/feeds.php:1664
-#: classes/pref/filters.php:359
-#: classes/pref/filters.php:407
-#: classes/pref/filters.php:744
-#: classes/pref/filters.php:832
-#: classes/pref/filters.php:859
+#: classes/pref/filters.php:384
+#: classes/pref/filters.php:441
+#: classes/pref/filters.php:784
+#: classes/pref/filters.php:872
+#: classes/pref/filters.php:899
+#: classes/pref/users.php:333
 #: classes/pref/prefs.php:992
-#: plugins/instances/init.php:284
+#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1574
+#: classes/pref/feeds.php:1638
 msgid "Select"
 msgstr "Auswahl"
 
 #: classes/pref/labels.php:261
-#: classes/pref/users.php:337
-#: classes/pref/feeds.php:1340
-#: classes/pref/feeds.php:1603
-#: classes/pref/feeds.php:1667
-#: classes/pref/filters.php:362
-#: classes/pref/filters.php:410
-#: classes/pref/filters.php:747
-#: classes/pref/filters.php:835
-#: classes/pref/filters.php:862
+#: classes/pref/filters.php:387
+#: classes/pref/filters.php:444
+#: classes/pref/filters.php:787
+#: classes/pref/filters.php:875
+#: classes/pref/filters.php:902
+#: classes/pref/users.php:336
 #: classes/pref/prefs.php:995
+#: classes/pref/feeds.php:1314
+#: classes/pref/feeds.php:1577
+#: classes/pref/feeds.php:1641
 #: classes/feeds.php:102
-#: plugins/instances/init.php:287
 msgid "All"
 msgstr "Alle"
 
 #: classes/pref/labels.php:263
-#: classes/pref/users.php:339
-#: classes/pref/feeds.php:1342
-#: classes/pref/feeds.php:1605
-#: classes/pref/feeds.php:1669
-#: classes/pref/filters.php:364
-#: classes/pref/filters.php:412
-#: classes/pref/filters.php:749
-#: classes/pref/filters.php:837
-#: classes/pref/filters.php:864
+#: classes/pref/filters.php:389
+#: classes/pref/filters.php:446
+#: classes/pref/filters.php:789
+#: classes/pref/filters.php:877
+#: classes/pref/filters.php:904
+#: classes/pref/users.php:338
 #: classes/pref/prefs.php:997
+#: classes/pref/feeds.php:1316
+#: classes/pref/feeds.php:1579
+#: classes/pref/feeds.php:1643
 #: classes/feeds.php:105
-#: plugins/instances/init.php:289
 msgid "None"
 msgstr "Keine"
 
 #: classes/pref/labels.php:270
-#: classes/pref/users.php:348
+#: classes/pref/filters.php:512
+#: classes/pref/filters.php:806
+#: classes/pref/users.php:347
 #: classes/pref/feeds.php:767
-#: classes/pref/filters.php:478
-#: classes/pref/filters.php:766
-#: classes/feeds.php:1154
-#: plugins/instances/init.php:294
+#: classes/feeds.php:1147
 msgid "Remove"
 msgstr "Entfernen"
 
@@ -1298,9 +1187,167 @@ msgstr "Entfernen"
 msgid "Clear colors"
 msgstr "Farben löschen"
 
+#: classes/pref/filters.php:153
+msgid "Preview article"
+msgstr "Artikel-Vorschau"
+
+#: classes/pref/filters.php:264
+#: classes/pref/filters.php:558
+msgid "(inverse)"
+msgstr "Invertiert"
+
+#: classes/pref/filters.php:260
+#: classes/pref/filters.php:557
+#, php-format
+msgid "%s on %s in %s %s"
+msgstr "%s innerhalb %s von %s %s"
+
+#: classes/pref/filters.php:379
+#: classes/pref/filters.php:867
+#: classes/pref/filters.php:981
+msgid "Match"
+msgstr "Kriterien"
+
+#: classes/pref/filters.php:393
+#: classes/pref/filters.php:450
+#: classes/pref/filters.php:881
+#: classes/pref/filters.php:908
+msgid "Add"
+msgstr "Hinzufügen"
+
+#: classes/pref/filters.php:396
+#: classes/pref/filters.php:453
+#: classes/pref/filters.php:884
+#: classes/pref/filters.php:911
+#: classes/feeds.php:122
+msgid "Delete"
+msgstr "Löschen"
+
+#: classes/pref/filters.php:436
+#: classes/pref/filters.php:894
+msgid "Apply actions"
+msgstr "Aktionen anwenden"
+
+#: classes/pref/filters.php:486
+#: classes/pref/filters.php:923
+msgid "Enabled"
+msgstr "Aktiviert"
+
+#: classes/pref/filters.php:495
+#: classes/pref/filters.php:926
+msgid "Match any rule"
+msgstr "Ein erfülltes Kriterium ist ausreichend"
+
+#: classes/pref/filters.php:504
+#: classes/pref/filters.php:929
+msgid "Inverse matching"
+msgstr "Invertierte Übereinstimmung"
+
+#: classes/pref/filters.php:516
+#: classes/pref/filters.php:936
+msgid "Test"
+msgstr "Test"
+
+#: classes/pref/filters.php:780
+#: classes/pref/users.php:323
+#: classes/pref/feeds.php:1307
+#: classes/feeds.php:1118
+#: classes/feeds.php:1184
+#: js/tt-rss.js:165
+msgid "Search"
+msgstr "Suchen"
+
+#: classes/pref/filters.php:796
+msgid "Combine"
+msgstr "Zusammenfügen"
+
+#: classes/pref/filters.php:799
+#: classes/pref/users.php:345
+msgid "Edit"
+msgstr "Bearbeiten"
+
+#: classes/pref/filters.php:802
+#: classes/pref/feeds.php:1327
+#: classes/pref/feeds.php:1341
+msgid "Reset sort order"
+msgstr "Sortierreihenfolge zurücksetzen"
+
+#: classes/pref/filters.php:810
+#: classes/pref/feeds.php:1363
+msgid "Rescore articles"
+msgstr "Artikel neu bewerten"
+
+#: classes/pref/filters.php:939
+msgid "Create"
+msgstr "Erstellen"
+
+#: classes/pref/filters.php:993
+msgid "Inverse regular expression matching"
+msgstr "Invertiere reguläre Ausdrücke"
+
+#: classes/pref/filters.php:995
+msgid "on field"
+msgstr "in Feld"
+
+#: classes/pref/filters.php:1001
+#: js/PrefFilterTree.js:64
+msgid "in"
+msgstr "in"
+
+#: classes/pref/filters.php:1014
+msgid "Wiki: Filters"
+msgstr "Wiki:Filter"
+
+#: classes/pref/filters.php:1019
+msgid "Save rule"
+msgstr "Regel speichern"
+
+#: classes/pref/filters.php:1019
+#: js/functions.js:865
+msgid "Add rule"
+msgstr "Regel hinzufügen"
+
+#: classes/pref/filters.php:1042
+msgid "Perform Action"
+msgstr "Aktion ausführen"
+
+#: classes/pref/filters.php:1093
+msgid "No actions available"
+msgstr "keine Aktionen verfügbar"
+
+#: classes/pref/filters.php:1112
+msgid "Save action"
+msgstr "Aktion speichern"
+
+#: classes/pref/filters.php:1112
+#: js/functions.js:887
+msgid "Add action"
+msgstr "Aktion hinzufügen"
+
+#: classes/pref/filters.php:1136
+msgid "[No caption]"
+msgstr "[kein Titel]"
+
+#: classes/pref/filters.php:1138
+#, php-format
+msgid "%s (%d rule)"
+msgid_plural "%s (%d rules)"
+msgstr[0] "%s (%d Regel)"
+msgstr[1] "%s (%d Regeln)"
+
+#: classes/pref/filters.php:1153
+msgid "matches any rule"
+msgstr "erfüllt alle Regeln"
+
+#: classes/pref/filters.php:1156
+#, php-format
+msgid "%s (+%d action)"
+msgid_plural "%s (+%d actions)"
+msgstr[0] "%s (+%d Aktion)"
+msgstr[1] "%s (+%d Aktionen)"
+
 #: classes/pref/users.php:6
 #: classes/pref/system.php:8
-#: plugins/instances/init.php:154
 msgid "Your access level is insufficient to open this tab."
 msgstr "Sie haben nicht die benötigten Rechte, um diese Registerkarte zu öffnen."
 
@@ -1310,8 +1357,8 @@ msgstr "Benutzer bearbeiten"
 
 #: classes/pref/users.php:56
 #: classes/pref/feeds.php:637
-#: classes/pref/feeds.php:878
-#: classes/feeds.php:1075
+#: classes/pref/feeds.php:866
+#: classes/feeds.php:1068
 msgid "Authentication"
 msgstr "Authentifizierung"
 
@@ -1321,7 +1368,7 @@ msgstr "Zugriffsberechtigung: "
 
 #: classes/pref/users.php:77
 #: classes/pref/feeds.php:667
-#: classes/pref/feeds.php:896
+#: classes/pref/feeds.php:884
 msgid "Options"
 msgstr "Optionen"
 
@@ -1335,7 +1382,7 @@ msgid "User not found"
 msgstr "Benutzer nicht gefunden"
 
 #: classes/pref/users.php:132
-#: classes/pref/users.php:400
+#: classes/pref/users.php:399
 msgid "Registered"
 msgstr "Registriert"
 
@@ -1352,7 +1399,7 @@ msgid "Stored articles"
 msgstr "gespeicherte Artikel"
 
 #: classes/pref/users.php:145
-#: classes/pref/users.php:399
+#: classes/pref/users.php:398
 msgid "Subscribed feeds"
 msgstr "Abonnierte Feeds"
 
@@ -1371,502 +1418,57 @@ msgstr "Konnte den Benutzer <b>%s</b> nicht anlegen"
 msgid "User <b>%s</b> already exists."
 msgstr "Benutzer <b>%s</b> existiert bereits."
 
-#: classes/pref/users.php:265
+#: classes/pref/users.php:264
 #, php-format
 msgid "Changed password of user <b>%s</b> to <b>%s</b>"
 msgstr "Passwort für Benutzer <b>%s</b> auf <b>%s</b> geändert"
 
-#: classes/pref/users.php:267
+#: classes/pref/users.php:266
 #, php-format
 msgid "Sending new password of user <b>%s</b> to <b>%s</b>"
 msgstr "Sende das neue Passwort von Benutzer <b>%s</b> an <b>%s</b>"
 
-#: classes/pref/users.php:291
+#: classes/pref/users.php:290
 msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] Benachrichtigung: Passwort geändert"
 
-#: classes/pref/users.php:324
-#: classes/pref/feeds.php:1333
-#: classes/pref/filters.php:740
-#: classes/feeds.php:1125
-#: classes/feeds.php:1191
-#: js/tt-rss.js:165
-msgid "Search"
-msgstr "Suchen"
-
-#: classes/pref/users.php:342
+#: classes/pref/users.php:341
 msgid "Create user"
 msgstr "Benutzer anlegen"
 
-#: classes/pref/users.php:346
-#: classes/pref/filters.php:759
-#: plugins/instances/init.php:293
-msgid "Edit"
-msgstr "Bearbeiten"
-
-#: classes/pref/users.php:397
+#: classes/pref/users.php:396
 #: classes/pref/feeds.php:643
-#: classes/pref/feeds.php:882
-#: classes/pref/feeds.php:1836
-#: classes/feeds.php:1079
+#: classes/pref/feeds.php:870
+#: classes/pref/feeds.php:1810
+#: classes/feeds.php:1072
 msgid "Login"
 msgstr "Benutzername"
 
-#: classes/pref/users.php:398
+#: classes/pref/users.php:397
 msgid "Access Level"
 msgstr "Zugriffsberechtigung"
 
-#: classes/pref/users.php:401
+#: classes/pref/users.php:400
 msgid "Last login"
 msgstr "Zuletzt angemeldet"
 
-#: classes/pref/users.php:420
-#: plugins/instances/init.php:334
+#: classes/pref/users.php:419
 msgid "Click to edit"
 msgstr "Zum Bearbeiten klicken"
 
-#: classes/pref/users.php:441
+#: classes/pref/users.php:440
 msgid "No users defined."
 msgstr "Keine Benutzer definiert."
 
-#: classes/pref/users.php:443
+#: classes/pref/users.php:442
 msgid "No matching users found."
 msgstr "Keine zugehörigen Benutzer gefunden."
 
-#: classes/pref/system.php:29
-msgid "Error Log"
-msgstr "Fehler-Protokoll"
-
-#: classes/pref/system.php:40
-msgid "Refresh"
-msgstr "Neuladen"
-
-#: classes/pref/system.php:43
-msgid "Clear log"
-msgstr "Protokoll löschen"
-
-#: classes/pref/system.php:48
-msgid "Error"
-msgstr "Fehler"
-
-#: classes/pref/system.php:49
-msgid "Filename"
-msgstr "Dateiname"
-
-#: classes/pref/system.php:50
-msgid "Message"
-msgstr "Meldung"
-
-#: classes/pref/system.php:52
-msgid "Date"
-msgstr "Datum"
-
-#: classes/pref/feeds.php:15
-msgid "Check to enable field"
-msgstr "Ankreuzen, um das Feld zu aktivieren"
-
-#: classes/pref/feeds.php:65
-#: classes/pref/feeds.php:214
-#: classes/pref/feeds.php:258
-#: classes/pref/feeds.php:264
-#: classes/pref/feeds.php:290
-#, php-format
-msgid "(%d feed)"
-msgid_plural "(%d feeds)"
-msgstr[0] "(%d Feed)"
-msgstr[1] "(%d Feeds)"
-
-#: classes/pref/feeds.php:537
 #: classes/pref/prefs.php:18
+#: classes/pref/feeds.php:537
 msgid "General"
 msgstr "Allgemein"
 
-#: classes/pref/feeds.php:561
-msgid "Feed Title"
-msgstr "Feed-Titel"
-
-#: classes/pref/feeds.php:595
-#: classes/pref/feeds.php:830
-#: classes/pref/feeds.php:1822
-#: classes/feeds.php:1055
-msgid "Place in category:"
-msgstr "In Kategorie einordnen:"
-
-#: classes/pref/feeds.php:608
-#: classes/pref/feeds.php:844
-msgid "Language:"
-msgstr "Sprache:"
-
-#: classes/pref/feeds.php:615
-#: classes/pref/feeds.php:853
-msgid "Update"
-msgstr "Aktualisieren"
-
-#: classes/pref/feeds.php:630
-#: classes/pref/feeds.php:869
-msgid "Article purging:"
-msgstr "Artikel löschen:"
-
-#: classes/pref/feeds.php:658
-#: classes/pref/feeds.php:890
-#: classes/pref/feeds.php:1839
-#: classes/pref/prefs.php:245
-#: classes/feeds.php:1083
-msgid "Password"
-msgstr "Passwort"
-
-#: classes/pref/feeds.php:662
-msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
-msgstr "<b>Hinweis:</b> Sie müssen Ihre Login-Informationen eingeben, wenn Ihr Feed eine Authentifizierung erfordert (außer Twitter-Feeds)."
-
-#: classes/pref/feeds.php:681
-#: classes/pref/feeds.php:900
-msgid "Hide from Popular feeds"
-msgstr "Nicht unter beliebten Feeds aufführen"
-
-#: classes/pref/feeds.php:693
-#: classes/pref/feeds.php:906
-msgid "Include in e-mail digest"
-msgstr "In E-Mail-Zusammenfassung aufnehmen"
-
-#: classes/pref/feeds.php:706
-#: classes/pref/feeds.php:912
-msgid "Always display image attachments"
-msgstr "Angehängte Bilder immer anzeigen"
-
-#: classes/pref/feeds.php:719
-#: classes/pref/feeds.php:920
-msgid "Do not embed images"
-msgstr "Bilder nicht einbetten"
-
-#: classes/pref/feeds.php:732
-#: classes/pref/feeds.php:928
-msgid "Cache media"
-msgstr ""
-
-#: classes/pref/feeds.php:744
-#: classes/pref/feeds.php:934
-msgid "Mark updated articles as unread"
-msgstr "Aktualisierte Artikel als ungelesen markieren"
-
-#: classes/pref/feeds.php:748
-msgid "Icon"
-msgstr "Symbol"
-
-#: classes/pref/feeds.php:765
-msgid "Replace"
-msgstr "Ersetzen"
-
-#: classes/pref/feeds.php:772
-#: classes/pref/prefs.php:698
-msgid "Plugins"
-msgstr "Plugins"
-
-#: classes/pref/feeds.php:792
-msgid "Resubscribe to push updates"
-msgstr "Abonnierte Feeds:"
-
-#: classes/pref/feeds.php:799
-msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
-msgstr "PubSubHubbub-Abonnementstatus für Push-fähige Feeds zurücksetzen."
-
-#: classes/pref/feeds.php:1200
-#: classes/pref/feeds.php:1253
-msgid "All done."
-msgstr "Fertig."
-
-#: classes/pref/feeds.php:1308
-msgid "Feeds with errors"
-msgstr "Feeds mit Fehlern"
-
-#: classes/pref/feeds.php:1315
-msgid "Inactive feeds"
-msgstr "Inaktive Feeds"
-
-#: classes/pref/feeds.php:1351
-msgid "Edit selected feeds"
-msgstr "Bearbeite ausgewählte Feeds"
-
-#: classes/pref/feeds.php:1353
-#: classes/pref/feeds.php:1367
-#: classes/pref/filters.php:762
-msgid "Reset sort order"
-msgstr "Sortierreihenfolge zurücksetzen"
-
-#: classes/pref/feeds.php:1355
-#: js/prefs.js:1622
-msgid "Batch subscribe"
-msgstr "Mehrere Feeds abonnieren"
-
-#: classes/pref/feeds.php:1362
-msgid "Categories"
-msgstr "Kategorien"
-
-#: classes/pref/feeds.php:1365
-msgid "Add category"
-msgstr "Kategorie anlegen"
-
-#: classes/pref/feeds.php:1369
-msgid "Remove selected"
-msgstr "Ausgewählte Kategorien löschen"
-
-#: classes/pref/feeds.php:1380
-msgid "More actions..."
-msgstr "Mehr Aktionen..."
-
-#: classes/pref/feeds.php:1384
-msgid "Manual purge"
-msgstr "Manuelles Löschen"
-
-#: classes/pref/feeds.php:1388
-msgid "Clear feed data"
-msgstr "Feed-Daten löschen"
-
-#: classes/pref/feeds.php:1389
-#: classes/pref/filters.php:770
-msgid "Rescore articles"
-msgstr "Artikel neu bewerten"
-
-#: classes/pref/feeds.php:1442
-msgid "OPML"
-msgstr "OPML"
-
-#: classes/pref/feeds.php:1444
-msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
-msgstr "Über OPML können Feeds, Filter, Label und Tiny-Tiny-RSS-Einstellungen importiert und exportiert werden."
-
-#: classes/pref/feeds.php:1445
-msgid "Only main settings profile can be migrated using OPML."
-msgstr "Nur das Hauptprofil kann mit OPML gesichert werden."
-
-#: classes/pref/feeds.php:1458
-msgid "Import my OPML"
-msgstr "OPML importieren"
-
-#: classes/pref/feeds.php:1464
-msgid "Filename:"
-msgstr "Dateiname:"
-
-#: classes/pref/feeds.php:1466
-msgid "Include settings"
-msgstr "Inklusive Einstellungen"
-
-#: classes/pref/feeds.php:1470
-msgid "Export OPML"
-msgstr "OPML exportieren"
-
-#: classes/pref/feeds.php:1474
-msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
-msgstr "Ihre OPML können veröffentlicht werden, so dass jeder, der die URL kennt, diese abonnieren kann."
-
-#: classes/pref/feeds.php:1478
-msgid "Public OPML URL"
-msgstr "Öffentliche OPML-URL"
-
-#: classes/pref/feeds.php:1479
-msgid "Display published OPML URL"
-msgstr "Zeige öffentliche OPML-URL"
-
-#: classes/pref/feeds.php:1488
-msgid "Firefox integration"
-msgstr "Firefox-Integration"
-
-#: classes/pref/feeds.php:1490
-msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
-msgstr "Tiny Tiny RSS kann durch den folgenden Link als Feedreader für Firefox verwendet werden."
-
-#: classes/pref/feeds.php:1497
-msgid "Click here to register this site as a feed reader."
-msgstr "Diese Website als Feedreader registrieren."
-
-#: classes/pref/feeds.php:1505
-msgid "Published & shared articles / Generated feeds"
-msgstr "Veröffentlichte & geteilte Artikel / erzeugte Feeds"
-
-#: classes/pref/feeds.php:1507
-msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
-msgstr "Veröffentlichte Artikel werden als öffentlicher RSS-Feed exportiert und können von jedem abonniert werden, der die nachstehende URL kennt."
-
-#: classes/pref/feeds.php:1514
-#: classes/feeds.php:54
-#: classes/feeds.php:140
-msgid "View as RSS"
-msgstr "Als RSS anzeigen"
-
-#: classes/pref/feeds.php:1515
-msgid "Display URL"
-msgstr "Zeige URL an"
-
-#: classes/pref/feeds.php:1518
-msgid "Clear all generated URLs"
-msgstr "Alle generierten URLs löschen"
-
-#: classes/pref/feeds.php:1596
-msgid "These feeds have not been updated with new content for 3 months (oldest first):"
-msgstr "Folgende Feeds konnten seit 3 Monaten nicht aktualisiert werden (älteste zuerst):"
-
-#: classes/pref/feeds.php:1630
-#: classes/pref/feeds.php:1694
-msgid "Click to edit feed"
-msgstr "Zum Bearbeiten klicken"
-
-#: classes/pref/feeds.php:1648
-#: classes/pref/feeds.php:1714
-msgid "Unsubscribe from selected feeds"
-msgstr "Ausgewählte Feeds abbestellen"
-
-#: classes/pref/feeds.php:1819
-msgid "Add one valid RSS feed per line (no feed detection is done)"
-msgstr "Einen gültigen RSS Feed pro Zeile hinzufügen (Es findet keine Feederkennung statt)"
-
-#: classes/pref/feeds.php:1828
-msgid "Feeds to subscribe, One per line"
-msgstr "Zu abonnierende Feeds, Einen pro Zeile"
-
-#: classes/pref/feeds.php:1851
-msgid "Feeds require authentication."
-msgstr "Feeds benötigen Authentifizierung."
-
-#: classes/pref/feeds.php:1858
-#: classes/feeds.php:1099
-#: classes/feeds.php:1153
-msgid "Subscribe"
-msgstr "Abonnieren"
-
-#: classes/pref/filters.php:151
-msgid "Preview article"
-msgstr "Artikel-Vorschau"
-
-#: classes/pref/filters.php:239
-#: classes/pref/filters.php:518
-msgid "(inverse)"
-msgstr "Invertiert"
-
-#: classes/pref/filters.php:235
-#: classes/pref/filters.php:517
-#, php-format
-msgid "%s on %s in %s %s"
-msgstr "%s innerhalb %s von %s %s"
-
-#: classes/pref/filters.php:354
-#: classes/pref/filters.php:827
-#: classes/pref/filters.php:942
-msgid "Match"
-msgstr "Kriterien"
-
-#: classes/pref/filters.php:368
-#: classes/pref/filters.php:416
-#: classes/pref/filters.php:841
-#: classes/pref/filters.php:868
-msgid "Add"
-msgstr "Hinzufügen"
-
-#: classes/pref/filters.php:371
-#: classes/pref/filters.php:419
-#: classes/pref/filters.php:844
-#: classes/pref/filters.php:871
-#: classes/feeds.php:122
-msgid "Delete"
-msgstr "Löschen"
-
-#: classes/pref/filters.php:402
-#: classes/pref/filters.php:854
-msgid "Apply actions"
-msgstr "Aktionen anwenden"
-
-#: classes/pref/filters.php:452
-#: classes/pref/filters.php:883
-msgid "Enabled"
-msgstr "Aktiviert"
-
-#: classes/pref/filters.php:461
-#: classes/pref/filters.php:886
-msgid "Match any rule"
-msgstr "Ein erfülltes Kriterium ist ausreichend"
-
-#: classes/pref/filters.php:470
-#: classes/pref/filters.php:889
-msgid "Inverse matching"
-msgstr "Invertierte Übereinstimmung"
-
-#: classes/pref/filters.php:482
-#: classes/pref/filters.php:896
-msgid "Test"
-msgstr "Test"
-
-#: classes/pref/filters.php:756
-msgid "Combine"
-msgstr "Zusammenfügen"
-
-#: classes/pref/filters.php:899
-msgid "Create"
-msgstr "Erstellen"
-
-#: classes/pref/filters.php:954
-msgid "Inverse regular expression matching"
-msgstr "Invertiere reguläre Ausdrücke"
-
-#: classes/pref/filters.php:956
-msgid "on field"
-msgstr "in Feld"
-
-#: classes/pref/filters.php:962
-#: js/PrefFilterTree.js:64
-msgid "in"
-msgstr "in"
-
-#: classes/pref/filters.php:975
-msgid "Wiki: Filters"
-msgstr "Wiki:Filter"
-
-#: classes/pref/filters.php:980
-msgid "Save rule"
-msgstr "Regel speichern"
-
-#: classes/pref/filters.php:980
-#: js/functions.js:865
-msgid "Add rule"
-msgstr "Regel hinzufügen"
-
-#: classes/pref/filters.php:1003
-msgid "Perform Action"
-msgstr "Aktion ausführen"
-
-#: classes/pref/filters.php:1054
-msgid "No actions available"
-msgstr "keine Aktionen verfügbar"
-
-#: classes/pref/filters.php:1073
-msgid "Save action"
-msgstr "Aktion speichern"
-
-#: classes/pref/filters.php:1073
-#: js/functions.js:887
-msgid "Add action"
-msgstr "Aktion hinzufügen"
-
-#: classes/pref/filters.php:1097
-msgid "[No caption]"
-msgstr "[kein Titel]"
-
-#: classes/pref/filters.php:1099
-#, php-format
-msgid "%s (%d rule)"
-msgid_plural "%s (%d rules)"
-msgstr[0] "%s (%d Regel)"
-msgstr[1] "%s (%d Regeln)"
-
-#: classes/pref/filters.php:1114
-msgid "matches any rule"
-msgstr "erfüllt alle Regeln"
-
-#: classes/pref/filters.php:1117
-#, php-format
-msgid "%s (+%d action)"
-msgid_plural "%s (+%d actions)"
-msgstr[0] "%s (+%d Aktion)"
-msgstr[1] "%s (+%d Aktionen)"
-
 #: classes/pref/prefs.php:19
 msgid "Interface"
 msgstr "Oberfläche"
@@ -2040,7 +1642,7 @@ msgid "Strip all but most common HTML tags when reading articles."
 msgstr "Alle außer den meist verwendeten HTML Tags beim Lesen entfernen."
 
 #: classes/pref/prefs.php:53
-#: js/prefs.js:1584
+#: js/prefs.js:1580
 msgid "Customize stylesheet"
 msgstr "Benutzerdefiniertes Stylesheet"
 
@@ -2108,6 +1710,14 @@ msgstr "Zugriffsberechtigung"
 msgid "Save data"
 msgstr "Speichern"
 
+#: classes/pref/prefs.php:245
+#: classes/pref/feeds.php:658
+#: classes/pref/feeds.php:878
+#: classes/pref/feeds.php:1813
+#: classes/feeds.php:1076
+msgid "Password"
+msgstr "Passwort"
+
 #: classes/pref/prefs.php:254
 msgid "Your password is at default value, please change it."
 msgstr "Sie nutzen das Standard Passwort, bitte ändern Sie es."
@@ -2206,18 +1816,23 @@ msgstr "Profile verwalten"
 msgid "Reset to defaults"
 msgstr "Auf Standardwerte zurücksetzen"
 
+#: classes/pref/prefs.php:698
+#: classes/pref/feeds.php:772
+msgid "Plugins"
+msgstr "Plugins"
+
 #: classes/pref/prefs.php:700
 msgid "You will need to reload Tiny Tiny RSS for plugin changes to take effect."
 msgstr "Du musst Tiny Tiny RSS neu laden, damit Pluginänderungen angewandt werden."
 
-#: classes/pref/prefs.php:702
-msgid "Download more plugins at tt-rss.org <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forums</a> or <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a>."
-msgstr "Mehr Plugins im tt-rss.org <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">Forum</a> oder im <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">Wiki</a>."
-
-#: classes/pref/prefs.php:732
+#: classes/pref/prefs.php:730
 msgid "System plugins"
 msgstr "System-Plugins"
 
+#: classes/pref/prefs.php:731
+msgid "System plugins are enabled in <strong>config.php</strong> for all users."
+msgstr ""
+
 #: classes/pref/prefs.php:736
 #: classes/pref/prefs.php:792
 msgid "Plugin"
@@ -2287,6 +1902,339 @@ msgstr "Ausgewählte Profile entfernen"
 msgid "Activate profile"
 msgstr "Profil aktivieren"
 
+#: classes/pref/feeds.php:15
+msgid "Check to enable field"
+msgstr "Ankreuzen, um das Feld zu aktivieren"
+
+#: classes/pref/feeds.php:65
+#: classes/pref/feeds.php:214
+#: classes/pref/feeds.php:258
+#: classes/pref/feeds.php:264
+#: classes/pref/feeds.php:290
+#, php-format
+msgid "(%d feed)"
+msgid_plural "(%d feeds)"
+msgstr[0] "(%d Feed)"
+msgstr[1] "(%d Feeds)"
+
+#: classes/pref/feeds.php:561
+msgid "Feed Title"
+msgstr "Feed-Titel"
+
+#: classes/pref/feeds.php:595
+#: classes/pref/feeds.php:818
+#: classes/pref/feeds.php:1796
+#: classes/feeds.php:1048
+msgid "Place in category:"
+msgstr "In Kategorie einordnen:"
+
+#: classes/pref/feeds.php:608
+#: classes/pref/feeds.php:832
+msgid "Language:"
+msgstr "Sprache:"
+
+#: classes/pref/feeds.php:615
+#: classes/pref/feeds.php:841
+msgid "Update"
+msgstr "Aktualisieren"
+
+#: classes/pref/feeds.php:630
+#: classes/pref/feeds.php:857
+msgid "Article purging:"
+msgstr "Artikel löschen:"
+
+#: classes/pref/feeds.php:662
+msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
+msgstr "<b>Hinweis:</b> Sie müssen Ihre Login-Informationen eingeben, wenn Ihr Feed eine Authentifizierung erfordert (außer Twitter-Feeds)."
+
+#: classes/pref/feeds.php:681
+#: classes/pref/feeds.php:888
+msgid "Hide from Popular feeds"
+msgstr "Nicht unter beliebten Feeds aufführen"
+
+#: classes/pref/feeds.php:693
+#: classes/pref/feeds.php:894
+msgid "Include in e-mail digest"
+msgstr "In E-Mail-Zusammenfassung aufnehmen"
+
+#: classes/pref/feeds.php:706
+#: classes/pref/feeds.php:900
+msgid "Always display image attachments"
+msgstr "Angehängte Bilder immer anzeigen"
+
+#: classes/pref/feeds.php:719
+#: classes/pref/feeds.php:908
+msgid "Do not embed images"
+msgstr "Bilder nicht einbetten"
+
+#: classes/pref/feeds.php:732
+#: classes/pref/feeds.php:916
+msgid "Cache media"
+msgstr ""
+
+#: classes/pref/feeds.php:744
+#: classes/pref/feeds.php:922
+msgid "Mark updated articles as unread"
+msgstr "Aktualisierte Artikel als ungelesen markieren"
+
+#: classes/pref/feeds.php:748
+msgid "Icon"
+msgstr "Symbol"
+
+#: classes/pref/feeds.php:765
+msgid "Replace"
+msgstr "Ersetzen"
+
+#: classes/pref/feeds.php:1174
+#: classes/pref/feeds.php:1227
+msgid "All done."
+msgstr "Fertig."
+
+#: classes/pref/feeds.php:1282
+msgid "Feeds with errors"
+msgstr "Feeds mit Fehlern"
+
+#: classes/pref/feeds.php:1289
+msgid "Inactive feeds"
+msgstr "Inaktive Feeds"
+
+#: classes/pref/feeds.php:1325
+msgid "Edit selected feeds"
+msgstr "Bearbeite ausgewählte Feeds"
+
+#: classes/pref/feeds.php:1329
+#: js/prefs.js:1618
+msgid "Batch subscribe"
+msgstr "Mehrere Feeds abonnieren"
+
+#: classes/pref/feeds.php:1336
+msgid "Categories"
+msgstr "Kategorien"
+
+#: classes/pref/feeds.php:1339
+msgid "Add category"
+msgstr "Kategorie anlegen"
+
+#: classes/pref/feeds.php:1343
+msgid "Remove selected"
+msgstr "Ausgewählte Kategorien löschen"
+
+#: classes/pref/feeds.php:1354
+msgid "More actions..."
+msgstr "Mehr Aktionen..."
+
+#: classes/pref/feeds.php:1358
+msgid "Manual purge"
+msgstr "Manuelles Löschen"
+
+#: classes/pref/feeds.php:1362
+msgid "Clear feed data"
+msgstr "Feed-Daten löschen"
+
+#: classes/pref/feeds.php:1416
+msgid "OPML"
+msgstr "OPML"
+
+#: classes/pref/feeds.php:1418
+msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
+msgstr "Über OPML können Feeds, Filter, Label und Tiny-Tiny-RSS-Einstellungen importiert und exportiert werden."
+
+#: classes/pref/feeds.php:1419
+msgid "Only main settings profile can be migrated using OPML."
+msgstr "Nur das Hauptprofil kann mit OPML gesichert werden."
+
+#: classes/pref/feeds.php:1432
+msgid "Import my OPML"
+msgstr "OPML importieren"
+
+#: classes/pref/feeds.php:1438
+msgid "Filename:"
+msgstr "Dateiname:"
+
+#: classes/pref/feeds.php:1440
+msgid "Include settings"
+msgstr "Inklusive Einstellungen"
+
+#: classes/pref/feeds.php:1444
+msgid "Export OPML"
+msgstr "OPML exportieren"
+
+#: classes/pref/feeds.php:1448
+msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
+msgstr "Ihre OPML können veröffentlicht werden, so dass jeder, der die URL kennt, diese abonnieren kann."
+
+#: classes/pref/feeds.php:1452
+msgid "Public OPML URL"
+msgstr "Öffentliche OPML-URL"
+
+#: classes/pref/feeds.php:1453
+msgid "Display published OPML URL"
+msgstr "Zeige öffentliche OPML-URL"
+
+#: classes/pref/feeds.php:1462
+msgid "Firefox integration"
+msgstr "Firefox-Integration"
+
+#: classes/pref/feeds.php:1464
+msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
+msgstr "Tiny Tiny RSS kann durch den folgenden Link als Feedreader für Firefox verwendet werden."
+
+#: classes/pref/feeds.php:1471
+msgid "Click here to register this site as a feed reader."
+msgstr "Diese Website als Feedreader registrieren."
+
+#: classes/pref/feeds.php:1479
+msgid "Published & shared articles / Generated feeds"
+msgstr "Veröffentlichte & geteilte Artikel / erzeugte Feeds"
+
+#: classes/pref/feeds.php:1481
+msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
+msgstr "Veröffentlichte Artikel werden als öffentlicher RSS-Feed exportiert und können von jedem abonniert werden, der die nachstehende URL kennt."
+
+#: classes/pref/feeds.php:1488
+#: classes/feeds.php:54
+#: classes/feeds.php:140
+msgid "View as RSS"
+msgstr "Als RSS anzeigen"
+
+#: classes/pref/feeds.php:1489
+msgid "Display URL"
+msgstr "Zeige URL an"
+
+#: classes/pref/feeds.php:1492
+msgid "Clear all generated URLs"
+msgstr "Alle generierten URLs löschen"
+
+#: classes/pref/feeds.php:1570
+msgid "These feeds have not been updated with new content for 3 months (oldest first):"
+msgstr "Folgende Feeds konnten seit 3 Monaten nicht aktualisiert werden (älteste zuerst):"
+
+#: classes/pref/feeds.php:1604
+#: classes/pref/feeds.php:1668
+msgid "Click to edit feed"
+msgstr "Zum Bearbeiten klicken"
+
+#: classes/pref/feeds.php:1622
+#: classes/pref/feeds.php:1688
+msgid "Unsubscribe from selected feeds"
+msgstr "Ausgewählte Feeds abbestellen"
+
+#: classes/pref/feeds.php:1793
+msgid "Add one valid RSS feed per line (no feed detection is done)"
+msgstr "Einen gültigen RSS Feed pro Zeile hinzufügen (Es findet keine Feederkennung statt)"
+
+#: classes/pref/feeds.php:1802
+msgid "Feeds to subscribe, One per line"
+msgstr "Zu abonnierende Feeds, Einen pro Zeile"
+
+#: classes/pref/feeds.php:1825
+msgid "Feeds require authentication."
+msgstr "Feeds benötigen Authentifizierung."
+
+#: classes/pref/feeds.php:1832
+#: classes/feeds.php:1092
+#: classes/feeds.php:1146
+msgid "Subscribe"
+msgstr "Abonnieren"
+
+#: classes/pref/system.php:29
+msgid "Error Log"
+msgstr "Fehler-Protokoll"
+
+#: classes/pref/system.php:40
+msgid "Refresh"
+msgstr "Neuladen"
+
+#: classes/pref/system.php:43
+msgid "Clear log"
+msgstr "Protokoll löschen"
+
+#: classes/pref/system.php:48
+msgid "Error"
+msgstr "Fehler"
+
+#: classes/pref/system.php:49
+msgid "Filename"
+msgstr "Dateiname"
+
+#: classes/pref/system.php:50
+msgid "Message"
+msgstr "Meldung"
+
+#: classes/pref/system.php:52
+msgid "Date"
+msgstr "Datum"
+
+#: classes/opml.php:28
+#: classes/opml.php:33
+msgid "OPML Utility"
+msgstr "OPML Werkzeug"
+
+#: classes/opml.php:37
+msgid "Importing OPML..."
+msgstr "Importiere OPML..."
+
+#: classes/opml.php:41
+msgid "Return to preferences"
+msgstr "Zu den Einstellungen zurückkehren"
+
+#: classes/opml.php:295
+#, php-format
+msgid "Adding feed: %s"
+msgstr "Füge Feed hinzu: %s"
+
+#: classes/opml.php:306
+#, php-format
+msgid "Duplicate feed: %s"
+msgstr "Doppelter Feed: %s"
+
+#: classes/opml.php:320
+#, php-format
+msgid "Adding label %s"
+msgstr "Füge Label %s hinzu"
+
+#: classes/opml.php:323
+#, php-format
+msgid "Duplicate label: %s"
+msgstr "Doppeltes Label: %s"
+
+#: classes/opml.php:335
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr "Setze Konfigurationsoption %s auf %s"
+
+#: classes/opml.php:367
+msgid "Adding filter..."
+msgstr "Füge Filter hinzu..."
+
+#: classes/opml.php:486
+#, php-format
+msgid "Processing category: %s"
+msgstr "Verarbeite Kategorie: %s"
+
+#: classes/opml.php:532
+#, php-format
+msgid "Upload failed with error code %d"
+msgstr "Upload schlug fehl. Fehlercode: %d"
+
+#: classes/opml.php:544
+#: plugins/import_export/init.php:448
+msgid "Unable to move uploaded file."
+msgstr "Fehler: konnte die hochgeladene Datei nicht verschieben."
+
+#: classes/opml.php:548
+#: plugins/import_export/init.php:452
+msgid "Error: please upload OPML file."
+msgstr "Fehler: bitte eine OPML-Datei hochladen."
+
+#: classes/opml.php:559
+msgid "Error: unable to find moved OPML file."
+msgstr "Fehler: konnte die verschobene OPML-Datei nicht finden."
+
+#: classes/opml.php:566
+msgid "Error while parsing document."
+msgstr "Fehler beim Parsen des Dokuments."
+
 #: classes/feeds.php:53
 msgid "View as RSS feed"
 msgstr "Als RSS-Feed anzeigen"
@@ -2326,8 +2274,8 @@ msgstr "Zurückgehen"
 
 #: classes/feeds.php:127
 #: classes/feeds.php:132
-#: plugins/mail/init.php:75
 #: plugins/mailto/init.php:25
+#: plugins/mail/init.php:75
 msgid "Forward by email"
 msgstr "Per E-Mail weiterleiten"
 
@@ -2335,309 +2283,144 @@ msgstr "Per E-Mail weiterleiten"
 msgid "Feed:"
 msgstr "Feed:"
 
-#: classes/feeds.php:229
-#: classes/feeds.php:892
+#: classes/feeds.php:228
+#: classes/feeds.php:885
 msgid "Feed not found."
 msgstr "Feed nicht gefunden."
 
-#: classes/feeds.php:300
+#: classes/feeds.php:291
 msgid "Never"
 msgstr "Niemals"
 
-#: classes/feeds.php:413
+#: classes/feeds.php:405
 #, php-format
 msgid "Imported at %s"
 msgstr "Importiert nach %s"
 
-#: classes/feeds.php:472
-#: classes/feeds.php:569
+#: classes/feeds.php:464
+#: classes/feeds.php:561
 msgid "mark feed as read"
 msgstr "Feed als gelesen markieren"
 
-#: classes/feeds.php:630
+#: classes/feeds.php:622
 msgid "Collapse article"
 msgstr "Artikel einklappen"
 
-#: classes/feeds.php:791
+#: classes/feeds.php:784
 msgid "No unread articles found to display."
 msgstr "Keine ungelesenen Artikel zum Anzeigen gefunden."
 
-#: classes/feeds.php:794
+#: classes/feeds.php:787
 msgid "No updated articles found to display."
 msgstr "Keine aktualisierten Artikel zum Anzeigen gefunden."
 
-#: classes/feeds.php:797
+#: classes/feeds.php:790
 msgid "No starred articles found to display."
 msgstr "Keine markierten Artikel zum Anzeigen gefunden."
 
-#: classes/feeds.php:801
+#: classes/feeds.php:794
 msgid "No articles found to display. You can assign articles to labels manually from article header context menu (applies to all selected articles) or use a filter."
 msgstr "Keine Artikel zum Anzeigen gefunden. Sie können Artikel zu Labeln manuell hinzufügen (siehe obiges Aktionsmenü) oder durch das Benutzen von Filtern."
 
-#: classes/feeds.php:803
+#: classes/feeds.php:796
 msgid "No articles found to display."
 msgstr "Keine Artikel zum Anzeigen gefunden."
 
-#: classes/feeds.php:818
-#: classes/feeds.php:992
+#: classes/feeds.php:811
+#: classes/feeds.php:985
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "Feeds zuletzt aktualisiert am %s"
 
-#: classes/feeds.php:828
-#: classes/feeds.php:1002
+#: classes/feeds.php:821
+#: classes/feeds.php:995
 msgid "Some feeds have update errors (click for details)"
 msgstr "Einige Feeds haben Aktualisierungsfehler (klicken für Details)"
 
-#: classes/feeds.php:982
+#: classes/feeds.php:975
 msgid "No feed selected."
 msgstr "Keinen Feed ausgewählt."
 
-#: classes/feeds.php:1041
-#: classes/feeds.php:1049
+#: classes/feeds.php:1034
+#: classes/feeds.php:1042
 msgid "Feed or site URL"
 msgstr "URL von Feed oder Seite"
 
-#: classes/feeds.php:1063
+#: classes/feeds.php:1056
 msgid "Available feeds"
 msgstr "Verfügbare Feeds"
 
-#: classes/feeds.php:1094
+#: classes/feeds.php:1087
 msgid "This feed requires authentication."
 msgstr "Dieser Feed erfordert Authentifizierung."
 
-#: classes/feeds.php:1102
+#: classes/feeds.php:1095
 msgid "More feeds"
 msgstr "Weitere Feeds"
 
-#: classes/feeds.php:1129
+#: classes/feeds.php:1122
 msgid "Popular feeds"
 msgstr "Beliebte Feeds"
 
-#: classes/feeds.php:1130
+#: classes/feeds.php:1123
 msgid "Feed archive"
 msgstr "Feed-Archiv"
 
-#: classes/feeds.php:1133
+#: classes/feeds.php:1126
 msgid "limit:"
 msgstr "Grenzwert:"
 
-#: classes/feeds.php:1165
+#: classes/feeds.php:1158
 msgid "Look for"
 msgstr "Suche nach"
 
-#: classes/feeds.php:1173
+#: classes/feeds.php:1166
 #, php-format
 msgid "in %s"
 msgstr "in %s"
 
-#: classes/feeds.php:1178
+#: classes/feeds.php:1171
 msgid "Used for word stemming"
 msgstr "Verwendet für Wortstamm"
 
-#: classes/feeds.php:1187
+#: classes/feeds.php:1180
 msgid "Search syntax"
 msgstr "Such-Syntax"
 
-#: plugins/instances/init.php:141
-msgid "Linked"
-msgstr "Verbunden"
-
-#: plugins/instances/init.php:204
-#: plugins/instances/init.php:395
-msgid "Instance"
-msgstr "Instanz"
-
-#: plugins/instances/init.php:215
-#: plugins/instances/init.php:312
-#: plugins/instances/init.php:404
-msgid "Instance URL"
-msgstr "Instanz-URL"
-
-#: plugins/instances/init.php:226
-#: plugins/instances/init.php:414
-msgid "Access key:"
-msgstr "Zugriffsberechtigung:"
-
-#: plugins/instances/init.php:229
-#: plugins/instances/init.php:313
-#: plugins/instances/init.php:417
-msgid "Access key"
-msgstr "Zugriffsberechtigung"
-
-#: plugins/instances/init.php:233
-#: plugins/instances/init.php:421
-msgid "Use one access key for both linked instances."
-msgstr "Benutzen Sie den selben Zugriffschlüssel für beide verbundenen Instanzen."
-
-#: plugins/instances/init.php:241
-#: plugins/instances/init.php:429
-msgid "Generate new key"
-msgstr "Neuen Zugriffsschlüssel erzeugen"
-
-#: plugins/instances/init.php:292
-msgid "Link instance"
-msgstr "Instanz verbinden"
-
-#: plugins/instances/init.php:304
-msgid "You can connect other instances of Tiny Tiny RSS to this one to share Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
-msgstr "Sie können andere Instanzen von Tiny Tiny RSS mit dieser verbinden, um beliebte Feeds zu teilen. Verbinden Sie diese Instanz von Tiny Tiny RSS mit folgender URL:"
-
-#: plugins/instances/init.php:314
-msgid "Last connected"
-msgstr "Zuletzt verbunden"
-
-#: plugins/instances/init.php:315
-msgid "Status"
-msgstr "Status"
-
-#: plugins/instances/init.php:316
-msgid "Stored feeds"
-msgstr "Gespeicherte Feeds"
+#: classes/feeds.php:1596
+msgid "Starred articles"
+msgstr "Markierte Artikel"
 
-#: plugins/instances/init.php:433
-msgid "Create link"
-msgstr "Verbindung herstellen"
+#: classes/feeds.php:1598
+msgid "Published articles"
+msgstr "Veröffentlichte Artikel"
 
-#: plugins/nsfw/init.php:30
-#: plugins/nsfw/init.php:42
-msgid "Not work safe (click to toggle)"
-msgstr "NSFW (Klicken zum Anzeigen)"
+#: classes/feeds.php:1600
+msgid "Fresh articles"
+msgstr "Neue Artikel"
 
-#: plugins/nsfw/init.php:52
-msgid "NSFW Plugin"
-msgstr "NSFW Plugin"
+#: classes/feeds.php:1604
+msgid "Archived articles"
+msgstr "Archivierte Artikel"
 
-#: plugins/nsfw/init.php:79
-msgid "Tags to consider NSFW (comma-separated)"
-msgstr "Liste von NSFW-Tags (kommagetrennt)"
+#: classes/feeds.php:1606
+msgid "Recently read"
+msgstr "Kürzlich gelesen"
 
-#: plugins/nsfw/init.php:100
-msgid "Configuration saved."
-msgstr "Die Einstellungen wurden gespeichert."
+#: classes/feeds.php:1716
+msgid "Special"
+msgstr "Sonderfeeds"
 
-#: plugins/note/init.php:26
-#: plugins/note/note.js:11
-msgid "Edit article note"
-msgstr "Artikelnotizen bearbeiten"
+#: classes/feeds.php:1962
+#, php-format
+msgid "Search results: %s"
+msgstr "Suchergebnisse: %s"
 
 #: plugins/vf_shared/init.php:16
-#: plugins/vf_shared/init.php:69
+#: plugins/vf_shared/init.php:60
 msgid "Shared articles"
 msgstr "Geteilte Artikel"
 
-#: plugins/auth_internal/init.php:65
-msgid "Please enter your one time password:"
-msgstr "Bitte geben Sie Einmalpasswort ein:"
-
-#: plugins/auth_internal/init.php:188
-msgid "Password has been changed."
-msgstr "Passwort wurde geändert."
-
-#: plugins/auth_internal/init.php:190
-msgid "Old password is incorrect."
-msgstr "Altes Passwort ist falsch."
-
-#: plugins/af_readability/init.php:21
-msgid "Data saved."
-msgstr "Daten gespeichert."
-
-#: plugins/af_readability/init.php:33
-msgid "Inline content"
-msgstr "eingebetteter Artikelinhalt"
-
-#: plugins/af_readability/init.php:39
-msgid "Readability settings (af_readability)"
-msgstr "Readability Einstellungen (af_readability)"
-
-#: plugins/af_readability/init.php:66
-msgid "Use Readability for pages shared via bookmarklet."
-msgstr "Verwende Readability für über das Bookmarklet geteilte Seiten."
-
-#: plugins/af_readability/init.php:78
-#: plugins/af_psql_trgm/init.php:191
-msgid "Currently enabled for (click to edit):"
-msgstr "Zur Zeit aktiviert für (klicken zum Bearbeiten):"
-
-#: plugins/af_readability/init.php:95
-msgid "Readability"
-msgstr "Lesbarkeit"
-
-#: plugins/af_readability/init.php:106
-msgid "Inline article content"
-msgstr "Artikelinhalt"
-
-#: plugins/af_redditimgur/init.php:25
-msgid "Reddit content settings (af_redditimgur)"
-msgstr "Reddit Inhalts-Einstellungen (af_redditimgur)"
-
-#: plugins/af_redditimgur/init.php:50
-msgid "Uses Readability (full-text-rss) implementation by <a target='_blank' href='https://bitbucket.org/fivefilters/'>FiveFilters.org</a>"
-msgstr "Verwendet Readability (Volltext-RSS) Implementierung von <a target='_blank' href='https://bitbucket.org/fivefilters/'>FiveFilters.org</a>"
-
-#: plugins/af_redditimgur/init.php:54
-msgid "Extract missing content using Readability"
-msgstr "Extrahiere fehlenden Inhalt mit Readability"
-
-#: plugins/af_redditimgur/init.php:59
-msgid "Enable additional duplicate checking"
-msgstr "zusätzliche Duplikat-Prüfung aktivieren"
-
-#: plugins/af_redditimgur/init.php:73
-#: plugins/af_zz_imgproxy/init.php:225
-msgid "Configuration saved"
-msgstr "Die Einstellungen wurden gespeichert."
-
-#: plugins/af_psql_trgm/init.php:28
-#, php-format
-msgid "Data saved (%s, %d)"
-msgstr "Daten gespeichert (%s, %d)"
-
-#: plugins/af_psql_trgm/init.php:112
-msgid "Show related articles"
-msgstr "zeige verwandte Artikel"
-
-#: plugins/af_psql_trgm/init.php:118
-#: plugins/af_psql_trgm/init.php:220
-msgid "Mark similar articles as read"
-msgstr "markiere ähnliche Artikel als gelesen"
-
-#: plugins/af_psql_trgm/init.php:157
-msgid "PostgreSQL trigram extension returns string similarity as a floating point number (0-1). Setting it too low might produce false positives, zero disables checking."
-msgstr "Die PostgreSQL trigram Erweiterung liefert einen Stringähnlichkeit als Fließkommazahl (0-1). Eine zu niedrige Einstellung könnte false positives verursachen, 0 deaktiviert die Prüfung."
-
-#: plugins/af_psql_trgm/init.php:160
-msgid "Global settings"
-msgstr "globale Einstellungen"
-
-#: plugins/af_psql_trgm/init.php:164
-msgid "Minimum similarity:"
-msgstr "Mindestähnlichkeit:"
-
-#: plugins/af_psql_trgm/init.php:169
-msgid "Minimum title length:"
-msgstr "Mindestlänge des Titels:"
-
-#: plugins/af_psql_trgm/init.php:174
-msgid "Enable for all feeds:"
-msgstr "Für alle Feeds aktivieren:"
-
-#: plugins/af_psql_trgm/init.php:209
-msgid "Similarity (pg_trgm)"
-msgstr "Ähnlichkeit (pg_trgm)"
-
-#: plugins/af_comics/init.php:40
-msgid "Feeds supported by af_comics"
-msgstr "von af_comics unterstützte Feeds"
-
-#: plugins/af_comics/init.php:42
-msgid "The following comics are currently supported:"
-msgstr "Die folgenden Comics werden momentan unterstützt:"
-
-#: plugins/af_comics/init.php:60
-msgid "GoComics requires a specific URL to workaround their lack of feed support: <code>http://feeds.feedburner.com/uclick/<em>comic_name</em></code> (e.g. <code>http://www.gocomics.com/garfield</code> uses <code>http://feeds.feedburner.com/uclick/garfield</code>)."
-msgstr "GoComics benötigt eine spezifische URL als Workaround für den fehlende Feed-Support: <code>http://feeds.feedburner.com/uclick/<em>comic_name</em></code> (e.g. <code>http://www.gocomics.com/garfield</code> verwendet <code>http://feeds.feedburner.com/uclick/garfield</code>)."
-
 #: plugins/import_export/init.php:58
 msgid "Import and export"
 msgstr "Import und Export"
@@ -2654,95 +2437,83 @@ msgstr "Meine Daten exportieren"
 msgid "Import"
 msgstr "Importieren"
 
-#: plugins/import_export/init.php:225
+#: plugins/import_export/init.php:231
 msgid "Could not import: incorrect schema version."
 msgstr "Import fehlgeschlagen: Falsche Schemaversion"
 
-#: plugins/import_export/init.php:230
+#: plugins/import_export/init.php:236
 msgid "Could not import: unrecognized document format."
 msgstr "Import fehlgeschlagen: Unbekanntes Dateiformat"
 
-#: plugins/import_export/init.php:391
+#: plugins/import_export/init.php:397
 msgid "Finished: "
 msgstr "Beendet: "
 
-#: plugins/import_export/init.php:392
+#: plugins/import_export/init.php:398
 #, php-format
 msgid "%d article processed, "
 msgid_plural "%d articles processed, "
 msgstr[0] "%d Artikel verarbeitet, "
 msgstr[1] "%d Artikel verarbeitet, "
 
-#: plugins/import_export/init.php:393
+#: plugins/import_export/init.php:399
 #, php-format
 msgid "%d imported, "
 msgid_plural "%d imported, "
 msgstr[0] "%d importiert, "
 msgstr[1] "%d importiert, "
 
-#: plugins/import_export/init.php:394
+#: plugins/import_export/init.php:400
 #, php-format
 msgid "%d feed created."
 msgid_plural "%d feeds created."
 msgstr[0] "%d Feed erstellt."
 msgstr[1] "%d Feeds erstellt."
 
-#: plugins/import_export/init.php:399
+#: plugins/import_export/init.php:405
 msgid "Could not load XML document."
 msgstr "Konnte XML-Datei nicht laden."
 
-#: plugins/import_export/init.php:411
+#: plugins/import_export/init.php:417
 msgid "Prepare data"
 msgstr "Bereite Daten vor"
 
-#: plugins/import_export/init.php:428
+#: plugins/import_export/init.php:434
 #, php-format
 msgid "Upload failed with error code %d (%s)"
 msgstr "Upload schlug fehl. Fehlercode: %d (%s)"
 
-#: plugins/import_export/init.php:454
+#: plugins/import_export/init.php:460
 msgid "No file uploaded."
 msgstr "Es wurde keine Datei hochgeladen."
 
-#: plugins/mail/init.php:28
-msgid "Mail addresses saved."
-msgstr "Mailadresse gespeichert"
-
-#: plugins/mail/init.php:34
-msgid "Mail plugin"
-msgstr "Mail-Plugin"
-
-#: plugins/mail/init.php:36
-msgid "You can set predefined email addressed here (comma-separated list):"
-msgstr "Sie können hier Mailadressen vordefinieren (Komma getrennte Liste):"
-
+#: plugins/mailto/init.php:48
+#: plugins/mailto/init.php:54
 #: plugins/mail/init.php:112
 #: plugins/mail/init.php:118
-#: plugins/mailto/init.php:49
-#: plugins/mailto/init.php:55
 msgid "[Forwarded]"
 msgstr "[Weitergeleitet]"
 
+#: plugins/mailto/init.php:48
 #: plugins/mail/init.php:112
-#: plugins/mailto/init.php:49
 msgid "Multiple articles"
 msgstr "Mehrere Artikel"
 
-#: plugins/mail/init.php:140
-msgid "To:"
-msgstr "Empfänger:"
+#: plugins/mailto/init.php:70
+msgid "Clicking the following link to invoke your mail client:"
+msgstr "Klicken Sie den folgenden Link, um Ihren Mailclienten aufzurufen:"
 
-#: plugins/mail/init.php:155
-msgid "Subject:"
-msgstr "Betreff:"
+#: plugins/mailto/init.php:74
+msgid "Forward selected article(s) by email."
+msgstr "Markierte(n) Artikel per E-Mail weiterleiten"
 
-#: plugins/mail/init.php:172
-msgid "Send e-mail"
-msgstr "E-Mail versenden"
+#: plugins/mailto/init.php:77
+msgid "You should be able to edit the message before sending in your mail client."
+msgstr "Sie können die Nachricht bearbeiten, bevor Sie diese mit Ihrem Mailclienten abschicken."
 
-#: plugins/close_button/init.php:22
-msgid "Close article"
-msgstr "Artikel schließen"
+#: plugins/mailto/init.php:82
+msgid "Close this dialog"
+msgstr "Diesen Dialog schließen"
 
 #: plugins/bookmarklets/init.php:20
 msgid "Bookmarklets"
@@ -2765,33 +2536,117 @@ msgstr "Abonnieren in Tiny Tiny RSS"
 msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
 msgstr "Benutzen Sie dieses Lesezeichen, um beliebige Seiten mit Tiny Tiny RSS zu teilen"
 
+#: plugins/af_psql_trgm/init.php:28
+#, php-format
+msgid "Data saved (%s, %d)"
+msgstr "Daten gespeichert (%s, %d)"
+
+#: plugins/af_psql_trgm/init.php:112
+msgid "Show related articles"
+msgstr "zeige verwandte Artikel"
+
+#: plugins/af_psql_trgm/init.php:118
+#: plugins/af_psql_trgm/init.php:220
+msgid "Mark similar articles as read"
+msgstr "markiere ähnliche Artikel als gelesen"
+
+#: plugins/af_psql_trgm/init.php:157
+msgid "PostgreSQL trigram extension returns string similarity as a floating point number (0-1). Setting it too low might produce false positives, zero disables checking."
+msgstr "Die PostgreSQL trigram Erweiterung liefert einen Stringähnlichkeit als Fließkommazahl (0-1). Eine zu niedrige Einstellung könnte false positives verursachen, 0 deaktiviert die Prüfung."
+
+#: plugins/af_psql_trgm/init.php:160
+msgid "Global settings"
+msgstr "globale Einstellungen"
+
+#: plugins/af_psql_trgm/init.php:164
+msgid "Minimum similarity:"
+msgstr "Mindestähnlichkeit:"
+
+#: plugins/af_psql_trgm/init.php:169
+msgid "Minimum title length:"
+msgstr "Mindestlänge des Titels:"
+
+#: plugins/af_psql_trgm/init.php:174
+msgid "Enable for all feeds:"
+msgstr "Für alle Feeds aktivieren:"
+
+#: plugins/af_psql_trgm/init.php:191
+#: plugins/af_readability/init.php:78
+msgid "Currently enabled for (click to edit):"
+msgstr "Zur Zeit aktiviert für (klicken zum Bearbeiten):"
+
+#: plugins/af_psql_trgm/init.php:209
+msgid "Similarity (pg_trgm)"
+msgstr "Ähnlichkeit (pg_trgm)"
+
+#: plugins/nsfw/init.php:30
+#: plugins/nsfw/init.php:42
+msgid "Not work safe (click to toggle)"
+msgstr "NSFW (Klicken zum Anzeigen)"
+
+#: plugins/nsfw/init.php:52
+msgid "NSFW Plugin"
+msgstr "NSFW Plugin"
+
+#: plugins/nsfw/init.php:79
+msgid "Tags to consider NSFW (comma-separated)"
+msgstr "Liste von NSFW-Tags (kommagetrennt)"
+
+#: plugins/nsfw/init.php:100
+msgid "Configuration saved."
+msgstr "Die Einstellungen wurden gespeichert."
+
 #: plugins/toggle_sidebar/init.php:23
 msgid "Collapse feedlist"
 msgstr "Feedliste verbergen"
 
-#: plugins/af_zz_imgproxy/init.php:186
-msgid "Image proxy settings (af_zz_imgproxy)"
-msgstr "Bild-Proxy Einstellungen (af_zz_imgproxy)"
+#: plugins/af_readability/init.php:21
+msgid "Data saved."
+msgstr "Daten gespeichert."
 
-#: plugins/af_zz_imgproxy/init.php:211
-msgid "Enable proxy for all remote images."
-msgstr "Aktiviere proxy für alle remote Bilddateien"
+#: plugins/af_readability/init.php:33
+msgid "Inline content"
+msgstr "eingebetteter Artikelinhalt"
 
-#: plugins/mailto/init.php:71
-msgid "Clicking the following link to invoke your mail client:"
-msgstr "Klicken Sie den folgenden Link, um Ihren Mailclienten aufzurufen:"
+#: plugins/af_readability/init.php:39
+msgid "Readability settings (af_readability)"
+msgstr "Readability Einstellungen (af_readability)"
 
-#: plugins/mailto/init.php:75
-msgid "Forward selected article(s) by email."
-msgstr "Markierte(n) Artikel per E-Mail weiterleiten"
+#: plugins/af_readability/init.php:66
+msgid "Use Readability for pages shared via bookmarklet."
+msgstr "Verwende Readability für über das Bookmarklet geteilte Seiten."
 
-#: plugins/mailto/init.php:78
-msgid "You should be able to edit the message before sending in your mail client."
-msgstr "Sie können die Nachricht bearbeiten, bevor Sie diese mit Ihrem Mailclienten abschicken."
+#: plugins/af_readability/init.php:95
+msgid "Readability"
+msgstr "Lesbarkeit"
 
-#: plugins/mailto/init.php:83
-msgid "Close this dialog"
-msgstr "Diesen Dialog schließen"
+#: plugins/af_readability/init.php:106
+msgid "Inline article content"
+msgstr "Artikelinhalt"
+
+#: plugins/mail/init.php:28
+msgid "Mail addresses saved."
+msgstr "Mailadresse gespeichert"
+
+#: plugins/mail/init.php:34
+msgid "Mail plugin"
+msgstr "Mail-Plugin"
+
+#: plugins/mail/init.php:36
+msgid "You can set predefined email addressed here (comma-separated list):"
+msgstr "Sie können hier Mailadressen vordefinieren (Komma getrennte Liste):"
+
+#: plugins/mail/init.php:140
+msgid "To:"
+msgstr "Empfänger:"
+
+#: plugins/mail/init.php:155
+msgid "Subject:"
+msgstr "Betreff:"
+
+#: plugins/mail/init.php:172
+msgid "Send e-mail"
+msgstr "E-Mail versenden"
 
 #: plugins/share/init.php:39
 msgid "You can disable all articles shared by unique URLs here."
@@ -2805,23 +2660,94 @@ msgstr "Alle Artikel nicht mehr teilen"
 msgid "Share by URL"
 msgstr "Per URL teilen"
 
-#: plugins/share/init.php:97
+#: plugins/share/init.php:96
 msgid "You can share this article by the following unique URL:"
 msgstr "Sie können diesen Artikel über folgende eindeutige URL teilen:"
 
-#: plugins/share/init.php:115
+#: plugins/share/init.php:114
 msgid "Unshare article"
 msgstr "Artikel nicht mehr teilen"
 
+#: plugins/af_comics/init.php:48
+msgid "Feeds supported by af_comics"
+msgstr "von af_comics unterstützte Feeds"
+
+#: plugins/af_comics/init.php:50
+msgid "The following comics are currently supported:"
+msgstr "Die folgenden Comics werden momentan unterstützt:"
+
+#: plugins/af_comics/init.php:68
+msgid "GoComics requires a specific URL to workaround their lack of feed support: <code>http://feeds.feedburner.com/uclick/<em>comic_name</em></code> (e.g. <code>http://www.gocomics.com/garfield</code> uses <code>http://feeds.feedburner.com/uclick/garfield</code>)."
+msgstr "GoComics benötigt eine spezifische URL als Workaround für den fehlende Feed-Support: <code>http://feeds.feedburner.com/uclick/<em>comic_name</em></code> (e.g. <code>http://www.gocomics.com/garfield</code> verwendet <code>http://feeds.feedburner.com/uclick/garfield</code>)."
+
+#: plugins/af_comics/init.php:70
+msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:25
+msgid "Reddit content settings (af_redditimgur)"
+msgstr "Reddit Inhalts-Einstellungen (af_redditimgur)"
+
+#: plugins/af_redditimgur/init.php:50
+msgid "Uses Readability (full-text-rss) implementation by <a target='_blank' href='https://bitbucket.org/fivefilters/'>FiveFilters.org</a>"
+msgstr "Verwendet Readability (Volltext-RSS) Implementierung von <a target='_blank' href='https://bitbucket.org/fivefilters/'>FiveFilters.org</a>"
+
+#: plugins/af_redditimgur/init.php:54
+msgid "Extract missing content using Readability"
+msgstr "Extrahiere fehlenden Inhalt mit Readability"
+
+#: plugins/af_redditimgur/init.php:59
+msgid "Enable additional duplicate checking"
+msgstr "zusätzliche Duplikat-Prüfung aktivieren"
+
+#: plugins/af_redditimgur/init.php:73
+#: plugins/af_zz_imgproxy/init.php:254
+msgid "Configuration saved"
+msgstr "Die Einstellungen wurden gespeichert."
+
+#: plugins/note/init.php:26
+#: plugins/note/note.js:11
+msgid "Edit article note"
+msgstr "Artikelnotizen bearbeiten"
+
+#: plugins/close_button/init.php:25
+msgid "Close article"
+msgstr "Artikel schließen"
+
+#: plugins/af_zz_imgproxy/init.php:210
+msgid "Image proxy settings (af_zz_imgproxy)"
+msgstr "Bild-Proxy Einstellungen (af_zz_imgproxy)"
+
+#: plugins/af_zz_imgproxy/init.php:234
+msgid "Enable proxy for all remote images."
+msgstr "Aktiviere proxy für alle remote Bilddateien"
+
+#: plugins/af_zz_imgproxy/init.php:238
+#, fuzzy
+msgid "Don't cache files locally."
+msgstr "Bilder lokal zwischenspeichern"
+
+#: plugins/auth_internal/init.php:65
+msgid "Please enter your one time password:"
+msgstr "Bitte geben Sie Einmalpasswort ein:"
+
+#: plugins/auth_internal/init.php:188
+msgid "Password has been changed."
+msgstr "Passwort wurde geändert."
+
+#: plugins/auth_internal/init.php:190
+msgid "Old password is incorrect."
+msgstr "Altes Passwort ist falsch."
+
 #: js/FeedTree.js:172
 msgid "(Un)collapse"
 msgstr "ein-/ausklappen"
 
-#: js/PrefFeedTree.js:52
+#: js/PrefFeedTree.js:54
 msgid "Edit category"
 msgstr "Kategorie bearbeiten"
 
-#: js/PrefFeedTree.js:59
+#: js/PrefFeedTree.js:61
 msgid "Remove category"
 msgstr "Kategorie entfernen"
 
@@ -2856,63 +2782,55 @@ msgid "Create Filter"
 msgstr "Filter erstellen"
 
 #: js/functions.js:1128
-msgid "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification hub again on next feed update."
-msgstr "Abonnement zurücksetzen? Tiny Tiny RSS wird versuchen, sich bei der nächsten Feed-Aktualisierung erneut beim Benachrichtigungs-Hub anzumelden."
-
-#: js/functions.js:1139
-msgid "Subscription reset."
-msgstr "Abonnement zurückgesetzt."
-
-#: js/functions.js:1149
-#: js/tt-rss.js:695
+#: js/tt-rss.js:696
 #, perl-format
 msgid "Unsubscribe from %s?"
 msgstr "%s abbestellen?"
 
-#: js/functions.js:1152
+#: js/functions.js:1131
 msgid "Removing feed..."
 msgstr "Feed wird entfernt..."
 
-#: js/functions.js:1225
+#: js/functions.js:1204
 msgid "Please enter category title:"
 msgstr "Bitte geben Sie den Kategorietitel ein:"
 
-#: js/functions.js:1250
+#: js/functions.js:1229
 msgid "Generate new syndication address for this feed?"
 msgstr "Neue Veröffentlichungsadresse für diesen Feed erzeugen?"
 
-#: js/functions.js:1254
-#: js/prefs.js:1154
+#: js/functions.js:1233
+#: js/prefs.js:1150
 msgid "Trying to change address..."
 msgstr "Versuche, die Adresse zu ändern..."
 
-#: js/functions.js:1497
-#: js/functions.js:1606
+#: js/functions.js:1476
+#: js/functions.js:1585
 #: js/prefs.js:398
 #: js/prefs.js:424
 #: js/prefs.js:456
 #: js/prefs.js:599
 #: js/prefs.js:617
-#: js/prefs.js:1136
-#: js/prefs.js:1263
+#: js/prefs.js:1132
+#: js/prefs.js:1259
 msgid "No feeds are selected."
 msgstr "Keine Feeds ausgewählt."
 
-#: js/functions.js:1540
+#: js/functions.js:1519
 msgid "Remove selected feeds from the archive? Feeds with stored articles will not be removed."
 msgstr "Die ausgewählten Feeds aus dem Archiv löschen? Feeds mit gespeicherten Artikeln werden nicht gelöscht"
 
-#: js/functions.js:1577
+#: js/functions.js:1556
 msgid "Feeds with update errors"
 msgstr "Feeds mit Aktualisierungsfehlern"
 
-#: js/functions.js:1588
-#: js/prefs.js:1117
+#: js/functions.js:1567
+#: js/prefs.js:1113
 msgid "Remove selected feeds?"
 msgstr "Ausgewählte Feeds entfernen?"
 
-#: js/functions.js:1591
-#: js/prefs.js:1120
+#: js/functions.js:1570
+#: js/prefs.js:1116
 msgid "Removing selected feeds..."
 msgstr "Ausgewählte Feeds werden entfernt..."
 
@@ -2935,9 +2853,7 @@ msgstr "Benutzereditor"
 #: js/prefs.js:100
 #: js/prefs.js:209
 #: js/prefs.js:706
-#: plugins/instances/instances.js:26
-#: plugins/instances/instances.js:89
-#: js/functions.js:1408
+#: js/functions.js:1387
 msgid "Saving data..."
 msgstr "Speichere Daten..."
 
@@ -2962,7 +2878,7 @@ msgid "Removing selected labels..."
 msgstr "Ausgewählte Label werden entfernt..."
 
 #: js/prefs.js:308
-#: js/prefs.js:1304
+#: js/prefs.js:1300
 msgid "No labels are selected."
 msgstr "Keine Label ausgewählt."
 
@@ -3061,28 +2977,28 @@ msgstr "Änderungen an den gewählten Feeds speichern?"
 msgid "OPML Import"
 msgstr "OPML Import"
 
-#: js/prefs.js:764
+#: js/prefs.js:759
 msgid "Please choose an OPML file first."
 msgstr "Bitte zuerst eine OPML-Datei auswählen."
 
-#: js/prefs.js:767
+#: js/prefs.js:762
 #: plugins/import_export/import_export.js:115
 msgid "Importing, please wait..."
 msgstr "Importiere, bitte warten..."
 
-#: js/prefs.js:928
+#: js/prefs.js:924
 msgid "Reset to defaults?"
 msgstr "Auf Standardwerte zurücksetzen?"
 
-#: js/prefs.js:1628
+#: js/prefs.js:1624
 msgid "Subscribing to feeds..."
 msgstr "Abonniere Feeds..."
 
-#: js/prefs.js:1647
+#: js/prefs.js:1643
 msgid "Clear stored data for this plugin?"
 msgstr "Gesicherte Daten dieses Plugins löschen?"
 
-#: js/prefs.js:1661
+#: js/prefs.js:1657
 msgid "Clear all messages in the error log?"
 msgstr "Alle Einträge aus dem Fehler-Protokoll löschen?"
 
@@ -3094,176 +3010,147 @@ msgstr "Alle Artikel als gelesen markieren?"
 msgid "Marking all feeds as read..."
 msgstr "Alle Feeds werden als gelesen markiert..."
 
-#: js/tt-rss.js:401
+#: js/tt-rss.js:402
 msgid "Please enable mail plugin first."
 msgstr "Bitte erst das Mail-Plugin aktivieren."
 
-#: js/tt-rss.js:449
-#: js/functions.js:1387
-#: js/tt-rss.js:676
+#: js/tt-rss.js:450
+#: js/functions.js:1366
+#: js/tt-rss.js:677
 msgid "You can't edit this kind of feed."
 msgstr "Sie können diese Art von Feed nicht bearbeiten."
 
-#: js/tt-rss.js:530
+#: js/tt-rss.js:531
 msgid "Please enable embed_original plugin first."
 msgstr "Bitte erst das \"Original einbetten\" Plugin aktivieren."
 
-#: js/tt-rss.js:543
-#: js/tt-rss.js:726
+#: js/tt-rss.js:544
+#: js/tt-rss.js:727
 msgid "Widescreen is not available in combined mode."
 msgstr "Widescreen ist in der kombinierten Ansicht nicht verfügbar"
 
-#: js/tt-rss.js:824
+#: js/tt-rss.js:825
 msgid "You can't rescore this kind of feed."
 msgstr "Sie können diese Art von Feed nicht neu bewerten."
 
-#: js/tt-rss.js:829
-#: js/tt-rss.js:689
+#: js/tt-rss.js:830
+#: js/tt-rss.js:690
 msgid "Please select some feed first."
 msgstr "Bitte erst einen Feed auswählen."
 
-#: js/tt-rss.js:834
+#: js/tt-rss.js:835
 #, perl-format
 msgid "Rescore articles in %s?"
 msgstr "Artikel in %s neu bewerten?"
 
-#: js/tt-rss.js:837
+#: js/tt-rss.js:838
 msgid "Rescoring articles..."
 msgstr "Artikel werden neu bewertet..."
 
-#: js/viewfeed.js:919
-#: js/viewfeed.js:957
-#: js/viewfeed.js:1005
-#: js/viewfeed.js:1931
-#: plugins/mail/mail.js:7
+#: js/viewfeed.js:921
+#: js/viewfeed.js:959
+#: js/viewfeed.js:1007
+#: js/viewfeed.js:1933
 #: plugins/mailto/init.js:7
-#: js/viewfeed.js:677
-#: js/viewfeed.js:699
-#: js/viewfeed.js:720
-#: js/viewfeed.js:779
-#: js/viewfeed.js:807
+#: plugins/mail/mail.js:7
+#: js/viewfeed.js:679
+#: js/viewfeed.js:701
+#: js/viewfeed.js:722
+#: js/viewfeed.js:781
+#: js/viewfeed.js:809
 msgid "No articles are selected."
 msgstr "Keine Artikel ausgewählt."
 
-#: js/viewfeed.js:927
+#: js/viewfeed.js:929
 #, perl-format
 msgid "Delete %d selected article in %s?"
 msgid_plural "Delete %d selected articles in %s?"
 msgstr[0] "%d ausgewählten Artikel in %s löschen?"
 msgstr[1] "%d ausgewählte Artikel in %s löschen?"
 
-#: js/viewfeed.js:929
+#: js/viewfeed.js:931
 #, perl-format
 msgid "Delete %d selected article?"
 msgid_plural "Delete %d selected articles?"
 msgstr[0] "%d ausgewählten Artikel löschen?"
 msgstr[1] "%d ausgewählte Artikel löschen?"
 
-#: js/viewfeed.js:966
+#: js/viewfeed.js:968
 #, perl-format
 msgid "Archive %d selected article in %s?"
 msgid_plural "Archive %d selected articles in %s?"
 msgstr[0] "%d ausgewählten Artikel in %s archivieren?"
 msgstr[1] "%d ausgewählte Artikel in %s archivieren?"
 
-#: js/viewfeed.js:969
+#: js/viewfeed.js:971
 #, perl-format
 msgid "Move %d archived article back?"
 msgid_plural "Move %d archived articles back?"
 msgstr[0] "%d archivierten Artikel zurück verschieben?"
 msgstr[1] "%d archivierte Artikel zurück verschieben?"
 
-#: js/viewfeed.js:971
+#: js/viewfeed.js:973
 msgid "Please note that unstarred articles might get purged on next feed update."
 msgstr "Bitte beachten Sie, dass nicht markierte Artikel beim nächsten Update der Feeds gelöscht werden könnten."
 
-#: js/viewfeed.js:1011
+#: js/viewfeed.js:1013
 #, perl-format
 msgid "Mark %d selected article in %s as read?"
 msgid_plural "Mark %d selected articles in %s as read?"
 msgstr[0] "%d ausgewählten Artikel in %s als gelesen markieren?"
 msgstr[1] "%d ausgewählte Artikel in %s als gelesen markieren?"
 
-#: js/viewfeed.js:1031
+#: js/viewfeed.js:1033
 msgid "Edit article Tags"
 msgstr "Artikel-Tags bearbeiten"
 
-#: js/viewfeed.js:1037
+#: js/viewfeed.js:1039
 msgid "Saving article tags..."
 msgstr "Artikel-Tags werden gespeichert..."
 
-#: js/viewfeed.js:1670
+#: js/viewfeed.js:1672
 msgid "Open original article"
 msgstr "Originalartikel öffnen"
 
-#: js/viewfeed.js:1677
+#: js/viewfeed.js:1679
 msgid "Display article URL"
 msgstr "Zeige Artikel-URL an"
 
-#: js/viewfeed.js:1787
+#: js/viewfeed.js:1789
 msgid "Assign label"
 msgstr "Label zuweisen"
 
-#: js/viewfeed.js:1792
+#: js/viewfeed.js:1794
 msgid "Remove label"
 msgstr "Label entfernen"
 
-#: js/viewfeed.js:1824
+#: js/viewfeed.js:1826
 msgid "Select articles in group"
 msgstr "Artikel als Gruppe auswählen"
 
-#: js/viewfeed.js:1834
+#: js/viewfeed.js:1836
 msgid "Mark group as read"
 msgstr "Gruppe als gelesen markieren"
 
-#: js/viewfeed.js:1846
+#: js/viewfeed.js:1848
 msgid "Mark feed as read"
 msgstr "Feed als gelesen markieren"
 
-#: js/viewfeed.js:1899
+#: js/viewfeed.js:1901
 msgid "Please enter new score for selected articles:"
 msgstr "Bitte geben Sie eine neue Bewertung für die ausgewählten Artikel ab:"
 
-#: js/viewfeed.js:1962
+#: js/viewfeed.js:1964
 msgid "Please enter new score for this article:"
 msgstr "Bitte geben Sie eine neue Bewertung für diesen Artikel ab:"
 
-#: js/viewfeed.js:1993
+#: js/viewfeed.js:1995
 msgid "Article URL:"
 msgstr "Artikel-URL:"
 
-#: plugins/instances/instances.js:10
-msgid "Link Instance"
-msgstr "Instanz verbinden"
-
-#: plugins/instances/instances.js:73
-msgid "Edit Instance"
-msgstr "Instanz bearbeiten"
-
-#: plugins/instances/instances.js:122
-msgid "Remove selected instances?"
-msgstr "Ausgewählte Instanzen entfernen?"
-
-#: plugins/instances/instances.js:125
-msgid "Removing selected instances..."
-msgstr "Ausgewählte Instanzen werden entfernt..."
-
-#: plugins/instances/instances.js:139
-#: plugins/instances/instances.js:151
-msgid "No instances are selected."
-msgstr "Keine Instanzen ausgewählt."
-
-#: plugins/instances/instances.js:156
-msgid "Please select only one instance."
-msgstr "Bitte nur eine Instanz auswählen."
-
-#: plugins/note/note.js:17
-msgid "Saving article note..."
-msgstr "Artikelnotiz wird gespeichert..."
-
-#: plugins/af_psql_trgm/init.js:11
-msgid "Related articles"
-msgstr "verwandte Artikel"
+#: plugins/embed_original/init.js:6
+msgid "Sorry, your browser does not support sandboxed iframes."
+msgstr "Entschuldigung, dein Browser unterstützt keine \"Sandbox\" für iframes."
 
 #: plugins/import_export/import_export.js:13
 msgid "Export Data"
@@ -3284,11 +3171,15 @@ msgstr "Daten importieren"
 msgid "Please choose the file first."
 msgstr "Bitte zuerst die Datei auswählen."
 
-#: plugins/mail/mail.js:21
 #: plugins/mailto/init.js:21
+#: plugins/mail/mail.js:21
 msgid "Forward article by email"
 msgstr "Artikel via E-Mail weiterleiten"
 
+#: plugins/af_psql_trgm/init.js:11
+msgid "Related articles"
+msgstr "verwandte Artikel"
+
 #: plugins/mail/mail.js:36
 msgid "Error sending email:"
 msgstr "Fehler beim Senden der E-Mail:"
@@ -3297,10 +3188,6 @@ msgstr "Fehler beim Senden der E-Mail:"
 msgid "Your message has been sent."
 msgstr "Ihre Nachricht wurde gesendet"
 
-#: plugins/embed_original/init.js:6
-msgid "Sorry, your browser does not support sandboxed iframes."
-msgstr "Entschuldigung, dein Browser unterstützt keine \"Sandbox\" für iframes."
-
 #: plugins/shorten_expanded/init.js:39
 msgid "Click to expand article"
 msgstr "Klicken, um den Artikel aufzuklappen."
@@ -3330,7 +3217,7 @@ msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr "Alle bisher geteilten Artikel URLs werden ungültig. Fortfahren?"
 
 #: plugins/share/share_prefs.js:6
-#: js/prefs.js:1437
+#: js/prefs.js:1433
 msgid "Clearing URLs..."
 msgstr "Leere URLs..."
 
@@ -3338,23 +3225,44 @@ msgstr "Leere URLs..."
 msgid "Shared URLs cleared."
 msgstr "Geteilte URLs geleert."
 
+#: plugins/note/note.js:17
+msgid "Saving article note..."
+msgstr "Artikelnotiz wird gespeichert..."
+
 #: js/feedlist.js:429
-#: js/feedlist.js:496
 msgid "Mark all articles in %s as read?"
 msgstr "Alle Artikel in %s als gelesen markieren?"
 
 #: js/feedlist.js:487
-msgid "Mark all articles in %s older than 1 day as read?"
+#, fuzzy
+msgid "Mark %w in %s older than 1 day as read?"
 msgstr "Alle Artikel in %s, die älter als einen Tag sind, als gelesen markieren?"
 
 #: js/feedlist.js:490
-msgid "Mark all articles in %s older than 1 week as read?"
+#, fuzzy
+msgid "Mark %w in %s older than 1 week as read?"
 msgstr "Alle Artikel in %s, die älter als eine Woche sind, als gelesen markieren?"
 
 #: js/feedlist.js:493
-msgid "Mark all articles in %s older than 2 weeks as read?"
+#, fuzzy
+msgid "Mark %w in %s older than 2 weeks as read?"
 msgstr "Alle Artikel in %s, die älter als 2 Wochen sind, als gelesen markieren?"
 
+#: js/feedlist.js:496
+#, fuzzy
+msgid "Mark %w in %s as read?"
+msgstr "Alle Artikel in %s als gelesen markieren?"
+
+#: js/feedlist.js:499
+#, fuzzy
+msgid "search results"
+msgstr "Suchergebnisse: %s"
+
+#: js/feedlist.js:499
+#, fuzzy
+msgid "all articles"
+msgstr "Alle Artikel"
+
 #: js/functions.js:506
 msgid "Error explained"
 msgstr "Fehler erklärt"
@@ -3435,176 +3343,245 @@ msgstr "Sie haben diesen Feed bereits abonniert."
 msgid "Edit rule"
 msgstr "Regel bearbeiten"
 
-#: js/functions.js:1402
+#: js/functions.js:1381
 msgid "Edit Feed"
 msgstr "Feed bearbeiten"
 
-#: js/functions.js:1435
+#: js/functions.js:1414
 msgid "More Feeds"
 msgstr "Weitere Feeds"
 
-#: js/functions.js:1631
+#: js/functions.js:1610
 msgid "Help"
 msgstr "Hilfe"
 
-#: js/prefs.js:1032
+#: js/prefs.js:1028
 msgid "Remove category %s? Any nested feeds would be placed into Uncategorized."
 msgstr "Kategorie %s löschen? Feeds dieser Kategorie werden dann nach Unkategorisiert verschoben."
 
-#: js/prefs.js:1038
+#: js/prefs.js:1034
 msgid "Removing category..."
 msgstr "Kategorie wird entfernt..."
 
-#: js/prefs.js:1056
+#: js/prefs.js:1052
 msgid "Remove selected categories?"
 msgstr "Ausgewählte Kategorien entfernen?"
 
-#: js/prefs.js:1059
+#: js/prefs.js:1055
 msgid "Removing selected categories..."
 msgstr "Ausgewählte Kategorien werden entfernt..."
 
-#: js/prefs.js:1072
+#: js/prefs.js:1068
 msgid "No categories are selected."
 msgstr "Keine Kategorien ausgewählt."
 
-#: js/prefs.js:1079
+#: js/prefs.js:1075
 msgid "Category title:"
 msgstr "Name der Kategorie:"
 
-#: js/prefs.js:1083
+#: js/prefs.js:1079
 msgid "Creating category..."
 msgstr "Kategorie wird erstellt..."
 
-#: js/prefs.js:1106
+#: js/prefs.js:1102
 msgid "Feeds without recent updates"
 msgstr "Feeds ohne kürzliche Aktualisierungen"
 
-#: js/prefs.js:1150
+#: js/prefs.js:1146
 msgid "Replace current OPML publishing address with a new one?"
 msgstr "Aktuelle Veröffentlichungsadresse durch eine Neue ersetzen?"
 
-#: js/prefs.js:1227
+#: js/prefs.js:1223
 msgid "Clearing feed..."
 msgstr "Feed wird geleert..."
 
-#: js/prefs.js:1247
+#: js/prefs.js:1243
 msgid "Rescore articles in selected feeds?"
 msgstr "Artikel in gewählten Feeds neu bewerten?"
 
-#: js/prefs.js:1250
+#: js/prefs.js:1246
 msgid "Rescoring selected feeds..."
 msgstr "Ausgewählte Feed werden neu bewertet..."
 
-#: js/prefs.js:1270
+#: js/prefs.js:1266
 msgid "Rescore all articles? This operation may take a lot of time."
 msgstr "Alle Artikel neu bewerten? Dieser Vorgang kann viel Zeit in Anspruch nehmen."
 
-#: js/prefs.js:1273
+#: js/prefs.js:1269
 msgid "Rescoring feeds..."
 msgstr "Feed werden neu bewertet..."
 
-#: js/prefs.js:1289
+#: js/prefs.js:1285
 msgid "Reset selected labels to default colors?"
 msgstr "Farben der ausgewählten Label auf Standardwerte zurücksetzen?"
 
-#: js/prefs.js:1321
+#: js/prefs.js:1317
 msgid "Settings Profiles"
 msgstr "Einstellungsprofile"
 
-#: js/prefs.js:1330
+#: js/prefs.js:1326
 msgid "Remove selected profiles? Active and default profiles will not be removed."
 msgstr "Ausgewählte Profile löschen? Das aktive und das Standardprofil werden nicht gelöscht."
 
-#: js/prefs.js:1333
+#: js/prefs.js:1329
 msgid "Removing selected profiles..."
 msgstr "Ausgewählte Profile werden entfernt..."
 
-#: js/prefs.js:1349
+#: js/prefs.js:1345
 msgid "No profiles are selected."
 msgstr "Keine Profile ausgewählt."
 
-#: js/prefs.js:1357
-#: js/prefs.js:1410
+#: js/prefs.js:1353
+#: js/prefs.js:1406
 msgid "Activate selected profile?"
 msgstr "Ausgewählte Profile entfernen?"
 
-#: js/prefs.js:1374
-#: js/prefs.js:1426
+#: js/prefs.js:1370
+#: js/prefs.js:1422
 msgid "Please choose a profile to activate."
 msgstr "Bitte ein Profil zum Aktivieren auswählen."
 
-#: js/prefs.js:1379
+#: js/prefs.js:1375
 msgid "Creating profile..."
 msgstr "Profil wird erstellt..."
 
-#: js/prefs.js:1434
+#: js/prefs.js:1430
 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr "Alle zuvor erstellten Feed-URLs werden ungültig. Fortfahren?"
 
-#: js/prefs.js:1444
+#: js/prefs.js:1440
 msgid "Generated URLs cleared."
 msgstr "Generierte URLs gelöscht."
 
-#: js/prefs.js:1516
+#: js/prefs.js:1512
 msgid "Label Editor"
 msgstr "Label-Editor"
 
-#: js/tt-rss.js:684
+#: js/tt-rss.js:685
 msgid "You can't unsubscribe from the category."
 msgstr "Sie können die Kategorie nicht abbestellen."
 
-#: js/viewfeed.js:125
-#: js/viewfeed.js:175
-#: js/viewfeed.js:192
+#: js/viewfeed.js:127
+#: js/viewfeed.js:177
+#: js/viewfeed.js:194
 msgid "Click to open next unread feed."
 msgstr "Hier klicken, um den nächsten ungelesenen Feed zu öffnen"
 
-#: js/viewfeed.js:129
+#: js/viewfeed.js:131
 msgid "Cancel search"
 msgstr "Suche abbrechen"
 
-#: js/viewfeed.js:189
+#: js/viewfeed.js:191
 msgid "New articles found, reload feed to continue."
 msgstr "Neue Artikel gefunden. Feed neu laden, um fortzufahren."
 
-#: js/viewfeed.js:424
+#: js/viewfeed.js:426
 msgid "Unstar article"
 msgstr "Artikelmarkierung entfernen"
 
-#: js/viewfeed.js:428
+#: js/viewfeed.js:430
 msgid "Star article"
 msgstr "Artikel markieren"
 
-#: js/viewfeed.js:478
+#: js/viewfeed.js:480
 msgid "Unpublish article"
 msgstr "Artikelveröffentlichung widerrufen"
 
-#: js/viewfeed.js:482
+#: js/viewfeed.js:484
 msgid "Publish article"
 msgstr "Artikel veröffentlichen"
 
-#: js/viewfeed.js:622
+#: js/viewfeed.js:624
 msgid "%d article selected"
 msgid_plural "%d articles selected"
 msgstr[0] "%d Artikel ausgewählt."
 msgstr[1] "%d Artikel ausgewählt."
 
-#: js/viewfeed.js:1286
+#: js/viewfeed.js:1288
 msgid "No article is selected."
 msgstr "Kein Artikel ausgewählt."
 
-#: js/viewfeed.js:1321
+#: js/viewfeed.js:1323
 msgid "No articles found to mark"
 msgstr "Keine Artikel zum markieren gefunden"
 
-#: js/viewfeed.js:1323
+#: js/viewfeed.js:1325
 msgid "Mark %d article as read?"
 msgid_plural "Mark %d articles as read?"
 msgstr[0] "%d Artikel als gelesen markieren?"
 msgstr[1] "%d Artikel als gelesen markieren?"
 
-#~ msgid "Cache images locally"
-#~ msgstr "Bilder lokal zwischenspeichern"
+#~ msgid "Resubscribe to push updates"
+#~ msgstr "Abonnierte Feeds:"
+
+#~ msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
+#~ msgstr "PubSubHubbub-Abonnementstatus für Push-fähige Feeds zurücksetzen."
+
+#~ msgid "Download more plugins at tt-rss.org <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forums</a> or <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a>."
+#~ msgstr "Mehr Plugins im tt-rss.org <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">Forum</a> oder im <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">Wiki</a>."
+
+#~ msgid "Linked"
+#~ msgstr "Verbunden"
+
+#~ msgid "Instance"
+#~ msgstr "Instanz"
+
+#~ msgid "Instance URL"
+#~ msgstr "Instanz-URL"
+
+#~ msgid "Access key:"
+#~ msgstr "Zugriffsberechtigung:"
+
+#~ msgid "Access key"
+#~ msgstr "Zugriffsberechtigung"
+
+#~ msgid "Use one access key for both linked instances."
+#~ msgstr "Benutzen Sie den selben Zugriffschlüssel für beide verbundenen Instanzen."
+
+#~ msgid "Generate new key"
+#~ msgstr "Neuen Zugriffsschlüssel erzeugen"
+
+#~ msgid "Link instance"
+#~ msgstr "Instanz verbinden"
+
+#~ msgid "You can connect other instances of Tiny Tiny RSS to this one to share Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
+#~ msgstr "Sie können andere Instanzen von Tiny Tiny RSS mit dieser verbinden, um beliebte Feeds zu teilen. Verbinden Sie diese Instanz von Tiny Tiny RSS mit folgender URL:"
+
+#~ msgid "Last connected"
+#~ msgstr "Zuletzt verbunden"
+
+#~ msgid "Status"
+#~ msgstr "Status"
+
+#~ msgid "Stored feeds"
+#~ msgstr "Gespeicherte Feeds"
+
+#~ msgid "Create link"
+#~ msgstr "Verbindung herstellen"
+
+#~ msgid "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification hub again on next feed update."
+#~ msgstr "Abonnement zurücksetzen? Tiny Tiny RSS wird versuchen, sich bei der nächsten Feed-Aktualisierung erneut beim Benachrichtigungs-Hub anzumelden."
+
+#~ msgid "Subscription reset."
+#~ msgstr "Abonnement zurückgesetzt."
+
+#~ msgid "Link Instance"
+#~ msgstr "Instanz verbinden"
+
+#~ msgid "Edit Instance"
+#~ msgstr "Instanz bearbeiten"
+
+#~ msgid "Remove selected instances?"
+#~ msgstr "Ausgewählte Instanzen entfernen?"
+
+#~ msgid "Removing selected instances..."
+#~ msgstr "Ausgewählte Instanzen werden entfernt..."
+
+#~ msgid "No instances are selected."
+#~ msgstr "Keine Instanzen ausgewählt."
+
+#~ msgid "Please select only one instance."
+#~ msgstr "Bitte nur eine Instanz auswählen."
 
 #~ msgid "The error will be reported to the configured log destination."
 #~ msgstr "Der Fehler wird im Fehlerprotokoll gespeichert"
diff --git a/locale/el_GR/LC_MESSAGES/messages.mo b/locale/el_GR/LC_MESSAGES/messages.mo
index 7849a2a43..f8f9e6535 100644
--- a/locale/el_GR/LC_MESSAGES/messages.mo
+++ b/locale/el_GR/LC_MESSAGES/messages.mo
diff --git a/locale/el_GR/LC_MESSAGES/messages.po b/locale/el_GR/LC_MESSAGES/messages.po
index 0245af951..be4df120d 100644
--- a/locale/el_GR/LC_MESSAGES/messages.po
+++ b/locale/el_GR/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tt-rss git\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 15:25+0300\n"
+"POT-Creation-Date: 2017-07-04 16:29+0300\n"
 "Last-Translator: Brendan <[email protected]>\n"
 "Language-Team: OpenSRS [email protected]>\n"
 "Language: el_GR\n"
@@ -166,31 +166,30 @@ msgstr "Ο χρήστης δεν βρέθηκε."
 #: prefs.php:118
 #: classes/backend.php:5
 #: classes/pref/labels.php:282
-#: classes/pref/feeds.php:1402
-#: classes/pref/filters.php:779
+#: classes/pref/filters.php:819
+#: classes/pref/feeds.php:1376
 #: js/feedlist.js:149
-#: js/functions.js:1131
-#: js/functions.js:1231
-#: js/functions.js:1478
+#: js/functions.js:1210
+#: js/functions.js:1457
 #: js/prefs.js:621
-#: js/prefs.js:818
-#: js/prefs.js:1648
-#: js/prefs.js:1663
-#: js/tt-rss.js:550
-#: js/viewfeed.js:1182
+#: js/prefs.js:813
+#: js/prefs.js:1644
+#: js/prefs.js:1659
+#: js/tt-rss.js:551
+#: js/viewfeed.js:1184
 #: plugins/import_export/import_export.js:17
 #: js/feedlist.js:467
-#: js/feedlist.js:512
+#: js/feedlist.js:515
 #: js/functions.js:372
 #: js/functions.js:630
-#: js/prefs.js:1360
-#: js/prefs.js:1413
-#: js/prefs.js:1452
-#: js/prefs.js:1465
-#: js/prefs.js:1476
-#: js/prefs.js:1491
-#: js/tt-rss.js:567
-#: js/viewfeed.js:762
+#: js/prefs.js:1356
+#: js/prefs.js:1409
+#: js/prefs.js:1448
+#: js/prefs.js:1461
+#: js/prefs.js:1472
+#: js/prefs.js:1487
+#: js/tt-rss.js:568
+#: js/viewfeed.js:764
 msgid "Loading, please wait..."
 msgstr "Φόρτωση σε εξέλιξη, παρακαλώ περιμένετε..."
 
@@ -207,13 +206,13 @@ msgid "All Articles"
 msgstr "Όλα τα Άρθρα"
 
 #: index.php:192
-#: include/functions2.php:107
+#: include/functions.php:1181
 #: classes/feeds.php:110
 msgid "Starred"
 msgstr "Με αστέρι"
 
 #: index.php:193
-#: include/functions2.php:108
+#: include/functions.php:1182
 #: classes/feeds.php:111
 msgid "Published"
 msgstr "Δημοσιεύτηκαν"
@@ -254,7 +253,7 @@ msgstr "Τίτλος"
 
 #: index.php:209
 #: index.php:249
-#: include/functions2.php:95
+#: include/functions.php:1169
 #: classes/feeds.php:115
 #: js/FeedTree.js:138
 #: js/FeedTree.js:166
@@ -294,7 +293,7 @@ msgid "Feed actions:"
 msgstr "Ενέργειες ροών:"
 
 #: index.php:244
-#: classes/handler/public.php:672
+#: classes/handler/public.php:583
 msgid "Subscribe to feed..."
 msgstr "Εγγραφή για ροή..."
 
@@ -308,8 +307,8 @@ msgstr "Επανασύνθεση ροών"
 
 #: index.php:247
 #: classes/pref/feeds.php:785
-#: classes/pref/feeds.php:1357
-#: js/PrefFeedTree.js:78
+#: classes/pref/feeds.php:1331
+#: js/PrefFeedTree.js:80
 msgid "Unsubscribe"
 msgstr "Κατάργηση εγγραφής"
 
@@ -326,7 +325,7 @@ msgid "Other actions:"
 msgstr "Άλλες ενέργειες:"
 
 #: index.php:252
-#: include/functions2.php:81
+#: include/functions.php:1155
 msgid "Toggle widescreen mode"
 msgstr "Εναλλαγή λειτουργίας ευρείας οθόνης"
 
@@ -352,7 +351,7 @@ msgstr ""
 
 #: prefs.php:33
 #: prefs.php:136
-#: include/functions2.php:110
+#: include/functions.php:1184
 #: classes/pref/prefs.php:435
 msgid "Preferences"
 msgstr "Προτιμήσεις"
@@ -367,20 +366,19 @@ msgstr "Προτιμήσεις εξόδου"
 
 #: prefs.php:139
 #: classes/pref/feeds.php:112
-#: classes/pref/feeds.php:1297
-#: classes/pref/feeds.php:1346
+#: classes/pref/feeds.php:1271
+#: classes/pref/feeds.php:1320
 msgid "Feeds"
 msgstr "Ροές"
 
 #: prefs.php:142
-#: classes/pref/filters.php:248
+#: classes/pref/filters.php:273
 msgid "Filters"
 msgstr "Φίλτρα"
 
 #: prefs.php:145
-#: include/functions.php:1327
-#: include/functions.php:1979
 #: classes/pref/labels.php:90
+#: classes/feeds.php:1718
 msgid "Labels"
 msgstr "Ετικέτες"
 
@@ -409,13 +407,13 @@ msgstr ""
 #: register.php:337
 #: register.php:347
 #: register.php:359
-#: classes/handler/public.php:742
-#: classes/handler/public.php:813
-#: classes/handler/public.php:911
-#: classes/handler/public.php:990
-#: classes/handler/public.php:1004
-#: classes/handler/public.php:1011
-#: classes/handler/public.php:1036
+#: classes/handler/public.php:653
+#: classes/handler/public.php:724
+#: classes/handler/public.php:822
+#: classes/handler/public.php:901
+#: classes/handler/public.php:915
+#: classes/handler/public.php:922
+#: classes/handler/public.php:947
 #, fuzzy
 msgid "Return to Tiny Tiny RSS"
 msgstr "Ενημέρωση του Tiny Tiny RSS"
@@ -433,12 +431,12 @@ msgid "Check availability"
 msgstr "Έλεγχος διαθεσιμότητας"
 
 #: register.php:229
-#: classes/handler/public.php:829
+#: classes/handler/public.php:740
 msgid "Email:"
 msgstr "Email:"
 
 #: register.php:232
-#: classes/handler/public.php:834
+#: classes/handler/public.php:745
 msgid "How much is two plus two:"
 msgstr ""
 
@@ -466,17 +464,23 @@ msgstr "Δημιουργήθηκε λογαριασμός με επιτυχία.
 msgid "New user registrations are currently closed."
 msgstr ""
 
-#: update.php:67
+#: update.php:66
 msgid "Tiny Tiny RSS data update script."
 msgstr ""
 
-#: include/digest.php:109
-#: include/functions.php:1336
-#: include/functions.php:1880
-#: include/functions.php:1965
-#: include/functions.php:1987
-#: classes/opml.php:421
+#: include/controls.php:83
+#: classes/pref/filters.php:242
+#: classes/pref/filters.php:253
+#: classes/pref/filters.php:544
+msgid "All feeds"
+msgstr "Όλες οι ροές"
+
+#: include/controls.php:134
+#: include/controls.php:316
 #: classes/pref/feeds.php:228
+#: classes/opml.php:486
+#: classes/feeds.php:1727
+#: classes/digest.php:113
 msgid "Uncategorized"
 msgstr "Χωρίς κατηγορία"
 
@@ -491,395 +495,290 @@ msgstr[1] "Αρχειοθετημένα άρθρα"
 msgid "No feeds found."
 msgstr "Δεν βρέθηκαν ροές."
 
-#: include/functions.php:1029
+#: include/functions.php:900
 #, php-format
 msgid "%d min"
 msgstr ""
 
-#: include/functions.php:1325
-#: include/functions.php:1977
-msgid "Special"
-msgstr "Ειδικό"
-
-#: include/functions.php:1828
-#: classes/pref/filters.php:229
-#: classes/pref/filters.php:507
-msgid "All feeds"
-msgstr "Όλες οι ροές"
-
-#: include/functions.php:2032
-msgid "Starred articles"
-msgstr "Άρθρα με αστέρια"
-
-#: include/functions.php:2034
-msgid "Published articles"
-msgstr "Δημοσιευμένα άρθρα"
-
-#: include/functions.php:2036
-msgid "Fresh articles"
-msgstr "Καινούργια άρθρα"
-
-#: include/functions.php:2038
-#: include/functions2.php:105
-msgid "All articles"
-msgstr "Όλα τα άρθρα"
-
-#: include/functions.php:2040
-msgid "Archived articles"
-msgstr "Αρχειοθετημένα άρθρα"
-
-#: include/functions.php:2042
-msgid "Recently read"
-msgstr "Πρόσφατα αναγνωσμένα"
-
-#: include/functions2.php:57
+#: include/functions.php:1131
 msgid "Navigation"
 msgstr "Πλοήγηση"
 
-#: include/functions2.php:58
+#: include/functions.php:1132
 msgid "Open next feed"
 msgstr "Άνοιγμα επόμενης ροής"
 
-#: include/functions2.php:59
+#: include/functions.php:1133
 msgid "Open previous feed"
 msgstr "Άνοιγμα προηγούμενης ροής"
 
-#: include/functions2.php:60
+#: include/functions.php:1134
 msgid "Open next article"
 msgstr "Άνοιγμα επόμενου άρθρου"
 
-#: include/functions2.php:61
+#: include/functions.php:1135
 msgid "Open previous article"
 msgstr "Άνοιγμα προηγούμενου άρθρου"
 
-#: include/functions2.php:62
+#: include/functions.php:1136
 msgid "Open next article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions2.php:63
+#: include/functions.php:1137
 msgid "Open previous article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions2.php:64
+#: include/functions.php:1138
 msgid "Move to next article (don't expand or mark read)"
 msgstr ""
 
-#: include/functions2.php:65
+#: include/functions.php:1139
 msgid "Move to previous article (don't expand or mark read)"
 msgstr ""
 
-#: include/functions2.php:66
+#: include/functions.php:1140
 msgid "Show search dialog"
 msgstr "Εμφάνιση διαλόγου αναζήτησης"
 
-#: include/functions2.php:67
+#: include/functions.php:1141
 msgid "Article"
 msgstr "Άρθρο"
 
-#: include/functions2.php:68
-#: js/viewfeed.js:1699
+#: include/functions.php:1142
+#: js/viewfeed.js:1701
 msgid "Toggle starred"
 msgstr "Εναλλαγή με αστέρια"
 
-#: include/functions2.php:69
-#: js/viewfeed.js:1711
+#: include/functions.php:1143
+#: js/viewfeed.js:1713
 msgid "Toggle published"
 msgstr "Εναλλαγή δημοσιευμένη"
 
-#: include/functions2.php:70
-#: js/viewfeed.js:1686
+#: include/functions.php:1144
+#: js/viewfeed.js:1688
 msgid "Toggle unread"
 msgstr "Εναλλαγή μη αναγνωσμένο"
 
-#: include/functions2.php:71
+#: include/functions.php:1145
 msgid "Edit tags"
 msgstr "Επεξεργασία ετικετών"
 
-#: include/functions2.php:72
+#: include/functions.php:1146
 msgid "Open in new window"
 msgstr "Άνοιγμα σε νέο παράθυρο"
 
-#: include/functions2.php:73
-#: js/viewfeed.js:1732
+#: include/functions.php:1147
+#: js/viewfeed.js:1734
 msgid "Mark below as read"
 msgstr "Σήμανση παρακάτω ως αναγνωσμένα"
 
-#: include/functions2.php:74
-#: js/viewfeed.js:1725
+#: include/functions.php:1148
+#: js/viewfeed.js:1727
 msgid "Mark above as read"
 msgstr "Σήμανση παραπάνω ως αναγνωσμένα"
 
-#: include/functions2.php:75
+#: include/functions.php:1149
 msgid "Scroll down"
 msgstr "Κύλιση προς τα κάτω"
 
-#: include/functions2.php:76
+#: include/functions.php:1150
 msgid "Scroll up"
 msgstr "Κύλιση προς τα επάνω"
 
-#: include/functions2.php:77
+#: include/functions.php:1151
 msgid "Select article under cursor"
 msgstr "Επιλογή άρθρου κάτω από τον κέρσορα"
 
-#: include/functions2.php:78
+#: include/functions.php:1152
 msgid "Email article"
 msgstr "Αποστολή άρθρου με e-mail"
 
-#: include/functions2.php:79
+#: include/functions.php:1153
 msgid "Close/collapse article"
 msgstr "Κλείσιμο/σύμπτηξη άρθρου"
 
-#: include/functions2.php:80
+#: include/functions.php:1154
 #, fuzzy
 msgid "Toggle article expansion (combined mode)"
 msgstr "Εναλλαγή συνδυασμένης λειτουργίας"
 
-#: include/functions2.php:82
+#: include/functions.php:1156
 #: plugins/embed_original/init.php:31
 msgid "Toggle embed original"
 msgstr "Εναλλαγή ενσωμάτωσης πρωτοτύπου"
 
-#: include/functions2.php:83
+#: include/functions.php:1157
 msgid "Article selection"
 msgstr "Επιλογή άρθρου"
 
-#: include/functions2.php:84
+#: include/functions.php:1158
 msgid "Select all articles"
 msgstr "Επιλογή όλων των άρθρων"
 
-#: include/functions2.php:85
+#: include/functions.php:1159
 msgid "Select unread"
 msgstr "Επιλογή μη αναγνωσμένων"
 
-#: include/functions2.php:86
+#: include/functions.php:1160
 msgid "Select starred"
 msgstr "Επιλογή με αστέρια"
 
-#: include/functions2.php:87
+#: include/functions.php:1161
 msgid "Select published"
 msgstr "Επιλογή δημοσιευμένων"
 
-#: include/functions2.php:88
+#: include/functions.php:1162
 msgid "Invert selection"
 msgstr "Αναστροφή επιλογής"
 
-#: include/functions2.php:89
+#: include/functions.php:1163
 msgid "Deselect everything"
 msgstr "Αποεπιλογή όλων"
 
-#: include/functions2.php:90
+#: include/functions.php:1164
 #: classes/pref/feeds.php:555
-#: classes/pref/feeds.php:823
+#: classes/pref/feeds.php:811
 msgid "Feed"
 msgstr "Ροή"
 
-#: include/functions2.php:91
+#: include/functions.php:1165
 msgid "Refresh current feed"
 msgstr "Ανανέωση τρέχουσας ροής"
 
-#: include/functions2.php:92
+#: include/functions.php:1166
 msgid "Un/hide read feeds"
 msgstr "Επανεμφάνιση/Απόκρυψη ροών ανάγνωσης"
 
-#: include/functions2.php:93
-#: classes/pref/feeds.php:1349
+#: include/functions.php:1167
+#: classes/pref/feeds.php:1323
 msgid "Subscribe to feed"
 msgstr "Εγγραφή για ροή"
 
-#: include/functions2.php:94
+#: include/functions.php:1168
 #: js/FeedTree.js:145
-#: js/PrefFeedTree.js:72
-#: js/viewfeed.js:1853
+#: js/PrefFeedTree.js:74
+#: js/viewfeed.js:1855
 msgid "Edit feed"
 msgstr "Επεξεργασία ροής"
 
-#: include/functions2.php:96
+#: include/functions.php:1170
 msgid "Reverse headlines"
 msgstr "Αναστροφή κεφαλίδων"
 
-#: include/functions2.php:97
+#: include/functions.php:1171
 msgid "Toggle headline grouping"
 msgstr ""
 
-#: include/functions2.php:98
+#: include/functions.php:1172
 msgid "Debug feed update"
 msgstr "Εκσφαλμάτωση ενημέρωσης ροής"
 
-#: include/functions2.php:99
+#: include/functions.php:1173
 #, fuzzy
 msgid "Debug viewfeed()"
 msgstr "Εκσφαλμάτωση ενημέρωσης ροής"
 
-#: include/functions2.php:100
+#: include/functions.php:1174
 #: js/FeedTree.js:194
 #, fuzzy
 msgid "Mark all feeds as read"
 msgstr "Σήμανση ροής ως αναγνωσμένη"
 
-#: include/functions2.php:101
+#: include/functions.php:1175
 msgid "Un/collapse current category"
 msgstr "Ανάπτυξη/σύμπτηξη τρέχουσας κατηγορίας"
 
-#: include/functions2.php:102
+#: include/functions.php:1176
 msgid "Toggle combined mode"
 msgstr "Εναλλαγή συνδυασμένης λειτουργίας"
 
-#: include/functions2.php:103
+#: include/functions.php:1177
 #, fuzzy
 msgid "Toggle auto expand in combined mode"
 msgstr "Εναλλαγή συνδυασμένης λειτουργίας"
 
-#: include/functions2.php:104
+#: include/functions.php:1178
 msgid "Go to"
 msgstr "Μετάβαση σε"
 
-#: include/functions2.php:106
+#: include/functions.php:1179
+#: classes/feeds.php:1602
+msgid "All articles"
+msgstr "Όλα τα άρθρα"
+
+#: include/functions.php:1180
 msgid "Fresh"
 msgstr "Φρέσκο"
 
-#: include/functions2.php:109
-#: js/tt-rss.js:494
-#: js/tt-rss.js:663
+#: include/functions.php:1183
+#: js/tt-rss.js:495
+#: js/tt-rss.js:664
 msgid "Tag cloud"
 msgstr "Τοποθέτηση ετικέτας σε νέφος"
 
-#: include/functions2.php:111
+#: include/functions.php:1185
 msgid "Other"
 msgstr "Άλλο"
 
-#: include/functions2.php:112
+#: include/functions.php:1186
 #: classes/pref/labels.php:267
 msgid "Create label"
 msgstr "Δημιουργία ετικέτας"
 
-#: include/functions2.php:113
-#: classes/pref/filters.php:753
+#: include/functions.php:1187
+#: classes/pref/filters.php:793
 msgid "Create filter"
 msgstr "Δημιουργία φίλτρου"
 
-#: include/functions2.php:114
+#: include/functions.php:1188
 msgid "Un/collapse sidebar"
 msgstr "Ανάπτυξη/σύμπτυξη πλευρικής μπάρας"
 
-#: include/functions2.php:115
+#: include/functions.php:1189
 msgid "Show help dialog"
 msgstr "Εμφάνιση πλαισίου βοήθειας"
 
-#: include/functions2.php:670
-#, php-format
-msgid "Search results: %s"
-msgstr "Αποτελέσματα αναζήτησης: %s"
-
-#: include/functions2.php:1336
-#: classes/feeds.php:752
-#, fuzzy
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] "σχόλια"
-msgstr[1] "σχόλια"
-
-#: include/functions2.php:1340
-#: classes/feeds.php:756
-msgid "comments"
-msgstr "σχόλια"
-
-#: include/functions2.php:1366
-msgid " - "
-msgstr " - "
-
-#: include/functions2.php:1397
-#: include/functions2.php:1648
-#: classes/article.php:311
-msgid "no tags"
-msgstr "χωρίς ετικέτες"
-
-#: include/functions2.php:1407
-#: classes/feeds.php:738
-msgid "Edit tags for this article"
-msgstr ""
-
-#: include/functions2.php:1439
-#: classes/feeds.php:690
-msgid "Originally from:"
-msgstr "Αρχικά από:"
-
-#: include/functions2.php:1452
-#: classes/pref/feeds.php:574
-#: classes/feeds.php:703
-msgid "Feed URL"
-msgstr "URL Ροής"
-
-#: include/functions2.php:1489
-#: classes/backend.php:105
-#: classes/dlg.php:37
-#: classes/dlg.php:60
-#: classes/dlg.php:93
-#: classes/dlg.php:159
-#: classes/dlg.php:186
-#: classes/pref/feeds.php:1652
-#: classes/pref/feeds.php:1718
-#: classes/pref/filters.php:204
-#: classes/pref/prefs.php:1097
-#: plugins/af_psql_trgm/init.php:102
-#: plugins/import_export/init.php:415
-#: plugins/import_export/init.php:461
-#: plugins/share/init.php:121
-msgid "Close this window"
-msgstr "Κλείστε αυτό το παράθυρο"
-
-#: include/functions2.php:1686
-msgid "(edit note)"
-msgstr "(επεξεργασία σημείωσης)"
-
-#: include/functions2.php:1960
-msgid "unknown type"
-msgstr "άγνωστος τύπος"
-
-#: include/functions2.php:2037
-msgid "Attachments"
-msgstr "Συνημμένα"
-
-#: include/functions2.php:2496
+#: include/functions.php:2456
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: include/functions2.php:2497
+#: include/functions.php:2457
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: include/functions2.php:2498
+#: include/functions.php:2458
 msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
 msgstr ""
 
-#: include/functions2.php:2499
+#: include/functions.php:2459
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: include/functions2.php:2500
+#: include/functions.php:2460
 #, fuzzy
 msgid "No file was uploaded"
 msgstr "Δεν φορτώθηκε αρχείο."
 
-#: include/functions2.php:2501
+#: include/functions.php:2461
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: include/functions2.php:2502
+#: include/functions.php:2462
 msgid "Failed to write file to disk."
 msgstr ""
 
-#: include/functions2.php:2503
+#: include/functions.php:2463
 msgid "A PHP extension stopped the file upload."
 msgstr ""
 
 #: include/login_form.php:197
-#: classes/handler/public.php:569
-#: classes/handler/public.php:824
+#: classes/handler/public.php:480
+#: classes/handler/public.php:735
 msgid "Login:"
 msgstr "Είσοδος:"
 
 #: include/login_form.php:207
-#: classes/handler/public.php:572
+#: classes/handler/public.php:483
 msgid "Password:"
 msgstr "Κωδικός Πρόσβασης:"
 
@@ -892,7 +791,7 @@ msgid "Profile:"
 msgstr "Προφίλ:"
 
 #: include/login_form.php:223
-#: classes/handler/public.php:311
+#: classes/handler/public.php:287
 #: classes/pref/prefs.php:1035
 #: classes/rpc.php:63
 msgid "Default profile"
@@ -911,7 +810,7 @@ msgid "Remember me"
 msgstr "Απομνημόνευση"
 
 #: include/login_form.php:249
-#: classes/handler/public.php:577
+#: classes/handler/public.php:488
 msgid "Log in"
 msgstr "Συνδεθείτε"
 
@@ -927,145 +826,44 @@ msgstr ""
 msgid "Session failed to validate (password changed)"
 msgstr ""
 
-#: classes/article.php:25
-msgid "Article not found."
-msgstr "Το άρθρο δεν βρέθηκε."
-
-#: classes/article.php:197
-msgid "Tags for this article (separated by commas):"
-msgstr ""
-
-#: classes/article.php:222
-#: classes/pref/labels.php:79
-#: classes/pref/users.php:98
-#: classes/pref/feeds.php:801
-#: classes/pref/feeds.php:943
-#: classes/pref/filters.php:485
-#: classes/pref/prefs.php:981
-#: plugins/instances/init.php:245
-#: plugins/nsfw/init.php:85
-#: plugins/note/init.php:51
-#: plugins/af_readability/init.php:68
-#: plugins/af_redditimgur/init.php:60
-#: plugins/af_psql_trgm/init.php:181
-#: plugins/mail/init.php:64
-#: plugins/af_zz_imgproxy/init.php:213
-msgid "Save"
-msgstr "Αποθήκευση"
-
-#: classes/article.php:224
-#: classes/handler/public.php:546
-#: classes/handler/public.php:580
-#: classes/pref/labels.php:81
-#: classes/pref/users.php:100
-#: classes/pref/feeds.php:802
-#: classes/pref/feeds.php:946
-#: classes/pref/feeds.php:1859
-#: classes/pref/filters.php:488
-#: classes/pref/filters.php:902
-#: classes/pref/filters.php:983
-#: classes/pref/filters.php:1076
-#: classes/pref/prefs.php:983
-#: classes/feeds.php:1105
-#: classes/feeds.php:1155
-#: classes/feeds.php:1192
-#: plugins/instances/init.php:248
-#: plugins/instances/init.php:436
-#: plugins/note/init.php:53
-#: plugins/mail/init.php:173
-msgid "Cancel"
-msgstr "Ακύρωση"
-
-#: classes/opml.php:28
-#: classes/opml.php:33
-msgid "OPML Utility"
-msgstr "Βοηθητικό OPML"
-
-#: classes/opml.php:37
-msgid "Importing OPML..."
-msgstr "Εισαγωγή OPML σε εξέλιξη..."
-
-#: classes/opml.php:41
-msgid "Return to preferences"
-msgstr "Επιστροφή σε προτιμήσεις"
-
-#: classes/opml.php:271
-#, php-format
-msgid "Adding feed: %s"
-msgstr "Προσθήκη ροής: %s"
-
-#: classes/opml.php:282
-#, php-format
-msgid "Duplicate feed: %s"
-msgstr "Αντιγραφή ροής: %s"
-
-#: classes/opml.php:296
-#, php-format
-msgid "Adding label %s"
-msgstr "Προσθήκη ετικέτας %s"
-
-#: classes/opml.php:299
-#, php-format
-msgid "Duplicate label: %s"
-msgstr "Αντιγραφή ετικέτας: %s"
-
-#: classes/opml.php:311
-#, php-format
-msgid "Setting preference key %s to %s"
-msgstr ""
-
-#: classes/opml.php:343
-msgid "Adding filter..."
-msgstr "Προσθήκη φίλτρου σε εξέλιξη..."
-
-#: classes/opml.php:421
-#, php-format
-msgid "Processing category: %s"
-msgstr "Επεξεργασία κατηγορίας: %s"
-
-#: classes/opml.php:470
-#, php-format
-msgid "Upload failed with error code %d"
-msgstr ""
-
-#: classes/opml.php:484
-#: plugins/import_export/init.php:442
-msgid "Unable to move uploaded file."
-msgstr ""
-
-#: classes/opml.php:488
-#: plugins/import_export/init.php:446
-msgid "Error: please upload OPML file."
-msgstr ""
-
-#: classes/opml.php:499
-msgid "Error: unable to find moved OPML file."
-msgstr ""
-
-#: classes/opml.php:506
-msgid "Error while parsing document."
-msgstr "Σφάλμα κατά τη συντακτική ανάλυση του εγγράφου."
-
-#: classes/backend.php:33
+#: classes/backend.php:31
 msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
 msgstr ""
 
-#: classes/backend.php:38
+#: classes/backend.php:36
 msgid "Keyboard Shortcuts"
 msgstr "Συντομεύσεις Πληκτρολογίου"
 
-#: classes/backend.php:61
+#: classes/backend.php:59
 msgid "Shift"
 msgstr "Shift"
 
-#: classes/backend.php:64
+#: classes/backend.php:62
 msgid "Ctrl"
 msgstr "Ctrl"
 
-#: classes/backend.php:99
+#: classes/backend.php:97
 msgid "Help topic not found."
 msgstr "Δεν βρέθηκε το θέμα βοήθειας."
 
+#: classes/backend.php:103
+#: classes/dlg.php:37
+#: classes/dlg.php:60
+#: classes/dlg.php:93
+#: classes/dlg.php:159
+#: classes/dlg.php:186
+#: classes/article.php:744
+#: classes/pref/filters.php:206
+#: classes/pref/prefs.php:1097
+#: classes/pref/feeds.php:1626
+#: classes/pref/feeds.php:1692
+#: plugins/import_export/init.php:421
+#: plugins/import_export/init.php:467
+#: plugins/af_psql_trgm/init.php:102
+#: plugins/share/init.php:120
+msgid "Close this window"
+msgstr "Κλείστε αυτό το παράθυρο"
+
 #: classes/dlg.php:17
 msgid "If you have imported labels and/or filters, you might need to reload preferences to see your new data."
 msgstr ""
@@ -1077,7 +875,7 @@ msgstr "Κοινό OPML URL"
 
 #: classes/dlg.php:57
 #: classes/dlg.php:183
-#: plugins/share/init.php:118
+#: plugins/share/init.php:117
 msgid "Generate new URL"
 msgstr "Παραγωγή νέου URL"
 
@@ -1098,130 +896,225 @@ msgstr ""
 msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 
-#: classes/handler/public.php:510
+#: classes/article.php:25
+msgid "Article not found."
+msgstr "Το άρθρο δεν βρέθηκε."
+
+#: classes/article.php:197
+msgid "Tags for this article (separated by commas):"
+msgstr ""
+
+#: classes/article.php:222
+#: classes/pref/labels.php:79
+#: classes/pref/filters.php:519
+#: classes/pref/users.php:98
+#: classes/pref/prefs.php:981
+#: classes/pref/feeds.php:789
+#: classes/pref/feeds.php:931
+#: plugins/af_psql_trgm/init.php:181
+#: plugins/nsfw/init.php:85
+#: plugins/af_readability/init.php:68
+#: plugins/mail/init.php:64
+#: plugins/af_redditimgur/init.php:60
+#: plugins/note/init.php:51
+#: plugins/af_zz_imgproxy/init.php:240
+msgid "Save"
+msgstr "Αποθήκευση"
+
+#: classes/article.php:224
+#: classes/handler/public.php:457
+#: classes/handler/public.php:491
+#: classes/pref/labels.php:81
+#: classes/pref/filters.php:522
+#: classes/pref/filters.php:942
+#: classes/pref/filters.php:1022
+#: classes/pref/filters.php:1115
+#: classes/pref/users.php:100
+#: classes/pref/prefs.php:983
+#: classes/pref/feeds.php:790
+#: classes/pref/feeds.php:934
+#: classes/pref/feeds.php:1833
+#: classes/feeds.php:1098
+#: classes/feeds.php:1148
+#: classes/feeds.php:1185
+#: plugins/mail/init.php:173
+#: plugins/note/init.php:53
+msgid "Cancel"
+msgstr "Ακύρωση"
+
+#: classes/article.php:311
+#: classes/article.php:652
+#: classes/article.php:805
+msgid "no tags"
+msgstr "χωρίς ετικέτες"
+
+#: classes/article.php:419
+msgid "unknown type"
+msgstr "άγνωστος τύπος"
+
+#: classes/article.php:496
+msgid "Attachments"
+msgstr "Συνημμένα"
+
+#: classes/article.php:591
+#: classes/feeds.php:741
+#, fuzzy
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] "σχόλια"
+msgstr[1] "σχόλια"
+
+#: classes/article.php:595
+#: classes/feeds.php:745
+msgid "comments"
+msgstr "σχόλια"
+
+#: classes/article.php:621
+msgid " - "
+msgstr " - "
+
+#: classes/article.php:662
+#: classes/feeds.php:727
+msgid "Edit tags for this article"
+msgstr ""
+
+#: classes/article.php:694
+#: classes/feeds.php:681
+msgid "Originally from:"
+msgstr "Αρχικά από:"
+
+#: classes/article.php:707
+#: classes/pref/feeds.php:574
+#: classes/feeds.php:694
+msgid "Feed URL"
+msgstr "URL Ροής"
+
+#: classes/article.php:843
+msgid "(edit note)"
+msgstr "(επεξεργασία σημείωσης)"
+
+#: classes/handler/public.php:421
 #: plugins/bookmarklets/init.php:40
 #, fuzzy
 msgid "Share with Tiny Tiny RSS"
 msgstr "Ενημέρωση του Tiny Tiny RSS"
 
-#: classes/handler/public.php:518
+#: classes/handler/public.php:429
 msgid "Title:"
 msgstr "Τίτλος:"
 
-#: classes/handler/public.php:520
+#: classes/handler/public.php:431
 #: classes/pref/feeds.php:572
-#: plugins/instances/init.php:212
-#: plugins/instances/init.php:401
 msgid "URL:"
 msgstr "URL:"
 
-#: classes/handler/public.php:522
+#: classes/handler/public.php:433
 msgid "Content:"
 msgstr "Περιεχόμενο:"
 
-#: classes/handler/public.php:524
+#: classes/handler/public.php:435
 msgid "Labels:"
 msgstr "Ετικέτες:"
 
-#: classes/handler/public.php:543
+#: classes/handler/public.php:454
 msgid "Shared article will appear in the Published feed."
 msgstr ""
 
-#: classes/handler/public.php:545
+#: classes/handler/public.php:456
 msgid "Share"
 msgstr "Διαμοιρασμός"
 
-#: classes/handler/public.php:567
+#: classes/handler/public.php:478
 msgid "Not logged in"
 msgstr "Δεν έγινε σύνδεση"
 
-#: classes/handler/public.php:626
+#: classes/handler/public.php:537
 msgid "Incorrect username or password"
 msgstr "Λανθασμένο όνομα χρήστη ή κωδικός πρόσβασης"
 
-#: classes/handler/public.php:678
+#: classes/handler/public.php:589
 #, fuzzy, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "Εγγεγραμμένος σε %s"
 
-#: classes/handler/public.php:681
+#: classes/handler/public.php:592
 #, fuzzy, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "Εγγεγραμμένος σε %s"
 
-#: classes/handler/public.php:684
+#: classes/handler/public.php:595
 #, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr ""
 
-#: classes/handler/public.php:687
+#: classes/handler/public.php:598
 #, fuzzy, php-format
 msgid "No feeds found in <b>%s</b>."
 msgstr "Δεν βρέθηκαν ροές."
 
-#: classes/handler/public.php:690
+#: classes/handler/public.php:601
 msgid "Multiple feed URLs found."
 msgstr "Βρέθηκαν πολλαπλές URLs ροής."
 
-#: classes/handler/public.php:694
+#: classes/handler/public.php:605
 #, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr ""
 
-#: classes/handler/public.php:712
+#: classes/handler/public.php:623
 msgid "Subscribe to selected feed"
 msgstr "Εγγραφή σε επιλεγμένες ροές"
 
-#: classes/handler/public.php:737
+#: classes/handler/public.php:648
 msgid "Edit subscription options"
 msgstr "Επεξεργασία επιλογών εγγραφής"
 
-#: classes/handler/public.php:774
+#: classes/handler/public.php:685
 msgid "Password recovery"
 msgstr "Ανάκτηση κωδικού πρόσβασης"
 
-#: classes/handler/public.php:817
+#: classes/handler/public.php:728
 msgid "You will need to provide valid account name and email. A password reset link will be sent to your email address."
 msgstr ""
 
-#: classes/handler/public.php:839
-#: classes/pref/users.php:350
+#: classes/handler/public.php:750
+#: classes/pref/users.php:349
 msgid "Reset password"
 msgstr "Επαναφορά κωδικού πρόσβασης"
 
-#: classes/handler/public.php:849
+#: classes/handler/public.php:760
 msgid "Some of the required form parameters are missing or incorrect."
 msgstr ""
 
-#: classes/handler/public.php:853
-#: classes/handler/public.php:919
+#: classes/handler/public.php:764
+#: classes/handler/public.php:830
 msgid "Go back"
 msgstr "Επιστροφή"
 
-#: classes/handler/public.php:890
+#: classes/handler/public.php:801
 #, fuzzy
 msgid "[tt-rss] Password reset request"
 msgstr "[tt-rss] Ειδοποίηση αλλαγής κωδικού πρόσβασης"
 
-#: classes/handler/public.php:915
+#: classes/handler/public.php:826
 msgid "Sorry, login and email combination not found."
 msgstr ""
 
-#: classes/handler/public.php:937
+#: classes/handler/public.php:848
 msgid "Your access level is insufficient to run this script."
 msgstr ""
 
-#: classes/handler/public.php:963
+#: classes/handler/public.php:874
 msgid "Database Updater"
 msgstr "Πρόγραμμα Ενημέρωσης Βάσης Δεδομένων"
 
-#: classes/handler/public.php:1028
+#: classes/handler/public.php:939
 msgid "Perform updates"
 msgstr "Εκτέλεση ενημερώσεων"
 
 #: classes/pref/labels.php:22
-#: classes/pref/filters.php:348
-#: classes/pref/filters.php:823
+#: classes/pref/filters.php:373
+#: classes/pref/filters.php:863
 msgid "Caption"
 msgstr "Λεζάντα"
 
@@ -1243,59 +1136,55 @@ msgid "Created label <b>%s</b>"
 msgstr "Δημιουργία ετικέτας"
 
 #: classes/pref/labels.php:258
-#: classes/pref/users.php:334
-#: classes/pref/feeds.php:1337
-#: classes/pref/feeds.php:1600
-#: classes/pref/feeds.php:1664
-#: classes/pref/filters.php:359
-#: classes/pref/filters.php:407
-#: classes/pref/filters.php:744
-#: classes/pref/filters.php:832
-#: classes/pref/filters.php:859
+#: classes/pref/filters.php:384
+#: classes/pref/filters.php:441
+#: classes/pref/filters.php:784
+#: classes/pref/filters.php:872
+#: classes/pref/filters.php:899
+#: classes/pref/users.php:333
 #: classes/pref/prefs.php:992
-#: plugins/instances/init.php:284
+#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1574
+#: classes/pref/feeds.php:1638
 msgid "Select"
 msgstr "Επιλογή"
 
 #: classes/pref/labels.php:261
-#: classes/pref/users.php:337
-#: classes/pref/feeds.php:1340
-#: classes/pref/feeds.php:1603
-#: classes/pref/feeds.php:1667
-#: classes/pref/filters.php:362
-#: classes/pref/filters.php:410
-#: classes/pref/filters.php:747
-#: classes/pref/filters.php:835
-#: classes/pref/filters.php:862
+#: classes/pref/filters.php:387
+#: classes/pref/filters.php:444
+#: classes/pref/filters.php:787
+#: classes/pref/filters.php:875
+#: classes/pref/filters.php:902
+#: classes/pref/users.php:336
 #: classes/pref/prefs.php:995
+#: classes/pref/feeds.php:1314
+#: classes/pref/feeds.php:1577
+#: classes/pref/feeds.php:1641
 #: classes/feeds.php:102
-#: plugins/instances/init.php:287
 msgid "All"
 msgstr "Όλα"
 
 #: classes/pref/labels.php:263
-#: classes/pref/users.php:339
-#: classes/pref/feeds.php:1342
-#: classes/pref/feeds.php:1605
-#: classes/pref/feeds.php:1669
-#: classes/pref/filters.php:364
-#: classes/pref/filters.php:412
-#: classes/pref/filters.php:749
-#: classes/pref/filters.php:837
-#: classes/pref/filters.php:864
+#: classes/pref/filters.php:389
+#: classes/pref/filters.php:446
+#: classes/pref/filters.php:789
+#: classes/pref/filters.php:877
+#: classes/pref/filters.php:904
+#: classes/pref/users.php:338
 #: classes/pref/prefs.php:997
+#: classes/pref/feeds.php:1316
+#: classes/pref/feeds.php:1579
+#: classes/pref/feeds.php:1643
 #: classes/feeds.php:105
-#: plugins/instances/init.php:289
 msgid "None"
 msgstr "Κανένα"
 
 #: classes/pref/labels.php:270
-#: classes/pref/users.php:348
+#: classes/pref/filters.php:512
+#: classes/pref/filters.php:806
+#: classes/pref/users.php:347
 #: classes/pref/feeds.php:767
-#: classes/pref/filters.php:478
-#: classes/pref/filters.php:766
-#: classes/feeds.php:1154
-#: plugins/instances/init.php:294
+#: classes/feeds.php:1147
 msgid "Remove"
 msgstr "Αφαίρεση"
 
@@ -1303,9 +1192,170 @@ msgstr "Αφαίρεση"
 msgid "Clear colors"
 msgstr "Απαλοιφή χρωμάτων"
 
+#: classes/pref/filters.php:153
+#, fuzzy
+msgid "Preview article"
+msgstr "Καινούργια άρθρα"
+
+#: classes/pref/filters.php:264
+#: classes/pref/filters.php:558
+msgid "(inverse)"
+msgstr "(αναστροφή)"
+
+#: classes/pref/filters.php:260
+#: classes/pref/filters.php:557
+#, php-format
+msgid "%s on %s in %s %s"
+msgstr ""
+
+#: classes/pref/filters.php:379
+#: classes/pref/filters.php:867
+#: classes/pref/filters.php:981
+msgid "Match"
+msgstr "Αντιστοίχιση"
+
+#: classes/pref/filters.php:393
+#: classes/pref/filters.php:450
+#: classes/pref/filters.php:881
+#: classes/pref/filters.php:908
+msgid "Add"
+msgstr "Προσθήκη"
+
+#: classes/pref/filters.php:396
+#: classes/pref/filters.php:453
+#: classes/pref/filters.php:884
+#: classes/pref/filters.php:911
+#: classes/feeds.php:122
+msgid "Delete"
+msgstr "Διαγραφή"
+
+#: classes/pref/filters.php:436
+#: classes/pref/filters.php:894
+msgid "Apply actions"
+msgstr "Εφαρμογή ενεργειών"
+
+#: classes/pref/filters.php:486
+#: classes/pref/filters.php:923
+msgid "Enabled"
+msgstr "Ενεργοποιημένο"
+
+#: classes/pref/filters.php:495
+#: classes/pref/filters.php:926
+msgid "Match any rule"
+msgstr "Αντιστοίχιση με οποιονδήποτε κανόνα"
+
+#: classes/pref/filters.php:504
+#: classes/pref/filters.php:929
+msgid "Inverse matching"
+msgstr "Αναστροφή αντιστοίχισης"
+
+#: classes/pref/filters.php:516
+#: classes/pref/filters.php:936
+msgid "Test"
+msgstr "Δοκιμή"
+
+#: classes/pref/filters.php:780
+#: classes/pref/users.php:323
+#: classes/pref/feeds.php:1307
+#: classes/feeds.php:1118
+#: classes/feeds.php:1184
+#: js/tt-rss.js:165
+msgid "Search"
+msgstr "Αναζήτηση"
+
+#: classes/pref/filters.php:796
+msgid "Combine"
+msgstr "Συνδυασμός"
+
+#: classes/pref/filters.php:799
+#: classes/pref/users.php:345
+msgid "Edit"
+msgstr "Επεξεργασία"
+
+#: classes/pref/filters.php:802
+#: classes/pref/feeds.php:1327
+#: classes/pref/feeds.php:1341
+msgid "Reset sort order"
+msgstr "Επαναφορά σειράς ταξινόμησης"
+
+#: classes/pref/filters.php:810
+#: classes/pref/feeds.php:1363
+msgid "Rescore articles"
+msgstr "Αναβαθμολόγηση άρθρων"
+
+#: classes/pref/filters.php:939
+msgid "Create"
+msgstr "Δημιουργία"
+
+#: classes/pref/filters.php:993
+msgid "Inverse regular expression matching"
+msgstr "Αναστροφή τακτικής αντιστοίχισης έκφρασης"
+
+#: classes/pref/filters.php:995
+msgid "on field"
+msgstr "επί τόπου"
+
+#: classes/pref/filters.php:1001
+#: js/PrefFilterTree.js:64
+msgid "in"
+msgstr "σε"
+
+#: classes/pref/filters.php:1014
+msgid "Wiki: Filters"
+msgstr "Wiki: Φίλτρα"
+
+#: classes/pref/filters.php:1019
+msgid "Save rule"
+msgstr "Αποθήκευση κανόνα"
+
+#: classes/pref/filters.php:1019
+#: js/functions.js:865
+msgid "Add rule"
+msgstr "Προσθήκη κανόνα"
+
+#: classes/pref/filters.php:1042
+msgid "Perform Action"
+msgstr "Πραγματοποίηση Ενέργειας"
+
+#: classes/pref/filters.php:1093
+#, fuzzy
+msgid "No actions available"
+msgstr "Διατίθεται νέα έκδοση!"
+
+#: classes/pref/filters.php:1112
+msgid "Save action"
+msgstr "Αποθήκευση ενέργειας"
+
+#: classes/pref/filters.php:1112
+#: js/functions.js:887
+msgid "Add action"
+msgstr "Προσθήκη ενέργειας"
+
+#: classes/pref/filters.php:1136
+msgid "[No caption]"
+msgstr "[Χωρίς λεζάντα]"
+
+#: classes/pref/filters.php:1138
+#, fuzzy, php-format
+msgid "%s (%d rule)"
+msgid_plural "%s (%d rules)"
+msgstr[0] "Προσθήκη κανόνα"
+msgstr[1] "Προσθήκη κανόνα"
+
+#: classes/pref/filters.php:1153
+#, fuzzy
+msgid "matches any rule"
+msgstr "Αντιστοίχιση με οποιονδήποτε κανόνα"
+
+#: classes/pref/filters.php:1156
+#, fuzzy, php-format
+msgid "%s (+%d action)"
+msgid_plural "%s (+%d actions)"
+msgstr[0] "Προσθήκη ενέργειας"
+msgstr[1] "Προσθήκη ενέργειας"
+
 #: classes/pref/users.php:6
 #: classes/pref/system.php:8
-#: plugins/instances/init.php:154
 msgid "Your access level is insufficient to open this tab."
 msgstr ""
 
@@ -1316,8 +1366,8 @@ msgstr "Επεξεργασία κανόνα"
 
 #: classes/pref/users.php:56
 #: classes/pref/feeds.php:637
-#: classes/pref/feeds.php:878
-#: classes/feeds.php:1075
+#: classes/pref/feeds.php:866
+#: classes/feeds.php:1068
 msgid "Authentication"
 msgstr "Πιστοποίηση"
 
@@ -1327,7 +1377,7 @@ msgstr "Επίπεδο πρόσβασης: "
 
 #: classes/pref/users.php:77
 #: classes/pref/feeds.php:667
-#: classes/pref/feeds.php:896
+#: classes/pref/feeds.php:884
 msgid "Options"
 msgstr "Επιλογές"
 
@@ -1341,7 +1391,7 @@ msgid "User not found"
 msgstr "Ο χρήστης δεν βρέθηκε."
 
 #: classes/pref/users.php:132
-#: classes/pref/users.php:400
+#: classes/pref/users.php:399
 msgid "Registered"
 msgstr "Εγγεγραμμένος"
 
@@ -1359,7 +1409,7 @@ msgid "Stored articles"
 msgstr "Άρθρα με αστέρια"
 
 #: classes/pref/users.php:145
-#: classes/pref/users.php:399
+#: classes/pref/users.php:398
 msgid "Subscribed feeds"
 msgstr "Εγγεγραμμένες ροές"
 
@@ -1378,507 +1428,57 @@ msgstr ""
 msgid "User <b>%s</b> already exists."
 msgstr ""
 
-#: classes/pref/users.php:265
+#: classes/pref/users.php:264
 #, php-format
 msgid "Changed password of user <b>%s</b> to <b>%s</b>"
 msgstr ""
 
-#: classes/pref/users.php:267
+#: classes/pref/users.php:266
 #, php-format
 msgid "Sending new password of user <b>%s</b> to <b>%s</b>"
 msgstr ""
 
-#: classes/pref/users.php:291
+#: classes/pref/users.php:290
 msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] Ειδοποίηση αλλαγής κωδικού πρόσβασης"
 
-#: classes/pref/users.php:324
-#: classes/pref/feeds.php:1333
-#: classes/pref/filters.php:740
-#: classes/feeds.php:1125
-#: classes/feeds.php:1191
-#: js/tt-rss.js:165
-msgid "Search"
-msgstr "Αναζήτηση"
-
-#: classes/pref/users.php:342
+#: classes/pref/users.php:341
 msgid "Create user"
 msgstr "Δημιουργία χρήστη"
 
-#: classes/pref/users.php:346
-#: classes/pref/filters.php:759
-#: plugins/instances/init.php:293
-msgid "Edit"
-msgstr "Επεξεργασία"
-
-#: classes/pref/users.php:397
+#: classes/pref/users.php:396
 #: classes/pref/feeds.php:643
-#: classes/pref/feeds.php:882
-#: classes/pref/feeds.php:1836
-#: classes/feeds.php:1079
+#: classes/pref/feeds.php:870
+#: classes/pref/feeds.php:1810
+#: classes/feeds.php:1072
 msgid "Login"
 msgstr "Σύνδεση"
 
-#: classes/pref/users.php:398
+#: classes/pref/users.php:397
 msgid "Access Level"
 msgstr "Επίπεδο Πρόσβασης"
 
-#: classes/pref/users.php:401
+#: classes/pref/users.php:400
 msgid "Last login"
 msgstr "Τελευταία σύνδεση"
 
-#: classes/pref/users.php:420
-#: plugins/instances/init.php:334
+#: classes/pref/users.php:419
 msgid "Click to edit"
 msgstr "Κάντε κλικ για επεξεργασία"
 
-#: classes/pref/users.php:441
+#: classes/pref/users.php:440
 msgid "No users defined."
 msgstr "Δεν ορίστηκαν χρήστες."
 
-#: classes/pref/users.php:443
+#: classes/pref/users.php:442
 msgid "No matching users found."
 msgstr "Δεν βρέθηκαν χρήστες που να αντιστοιχούν."
 
-#: classes/pref/system.php:29
-msgid "Error Log"
-msgstr "Καταγραφή Σφάλματος"
-
-#: classes/pref/system.php:40
-msgid "Refresh"
-msgstr "Ανανέωση"
-
-#: classes/pref/system.php:43
-msgid "Clear log"
-msgstr "Απαλοιφή καταγραφής"
-
-#: classes/pref/system.php:48
-msgid "Error"
-msgstr "Σφάλμα"
-
-#: classes/pref/system.php:49
-msgid "Filename"
-msgstr "Όνομα αρχείου"
-
-#: classes/pref/system.php:50
-msgid "Message"
-msgstr "Μήνυμα"
-
-#: classes/pref/system.php:52
-msgid "Date"
-msgstr "Ημερομηνία"
-
-#: classes/pref/feeds.php:15
-msgid "Check to enable field"
-msgstr "Έλεγχος για ενεργοποίηση πεδίου"
-
-#: classes/pref/feeds.php:65
-#: classes/pref/feeds.php:214
-#: classes/pref/feeds.php:258
-#: classes/pref/feeds.php:264
-#: classes/pref/feeds.php:290
-#, fuzzy, php-format
-msgid "(%d feed)"
-msgid_plural "(%d feeds)"
-msgstr[0] "Επεξεργασία ροής"
-msgstr[1] "Επεξεργασία ροής"
-
-#: classes/pref/feeds.php:537
 #: classes/pref/prefs.php:18
+#: classes/pref/feeds.php:537
 msgid "General"
 msgstr "Γενικά"
 
-#: classes/pref/feeds.php:561
-msgid "Feed Title"
-msgstr "Τίτλος Ροής"
-
-#: classes/pref/feeds.php:595
-#: classes/pref/feeds.php:830
-#: classes/pref/feeds.php:1822
-#: classes/feeds.php:1055
-msgid "Place in category:"
-msgstr "Τοποθέτηση σε κατηγορία:"
-
-#: classes/pref/feeds.php:608
-#: classes/pref/feeds.php:844
-#, fuzzy
-msgid "Language:"
-msgstr "Γλώσσα"
-
-#: classes/pref/feeds.php:615
-#: classes/pref/feeds.php:853
-msgid "Update"
-msgstr "Ενημέρωση"
-
-#: classes/pref/feeds.php:630
-#: classes/pref/feeds.php:869
-msgid "Article purging:"
-msgstr "Εκκαθάριση άρθρου:"
-
-#: classes/pref/feeds.php:658
-#: classes/pref/feeds.php:890
-#: classes/pref/feeds.php:1839
-#: classes/pref/prefs.php:245
-#: classes/feeds.php:1083
-msgid "Password"
-msgstr "Κωδικός Πρόσβασης"
-
-#: classes/pref/feeds.php:662
-msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
-msgstr ""
-
-#: classes/pref/feeds.php:681
-#: classes/pref/feeds.php:900
-msgid "Hide from Popular feeds"
-msgstr "Απόκρυψη από Δημοφιλείς ροές"
-
-#: classes/pref/feeds.php:693
-#: classes/pref/feeds.php:906
-msgid "Include in e-mail digest"
-msgstr "Συμπεριλάβετε σε σύνοψη e-mail"
-
-#: classes/pref/feeds.php:706
-#: classes/pref/feeds.php:912
-msgid "Always display image attachments"
-msgstr "Να εμφανίζονται πάντα συνημμένα εικόνας"
-
-#: classes/pref/feeds.php:719
-#: classes/pref/feeds.php:920
-msgid "Do not embed images"
-msgstr "Μην ενσωματώνετε εικόνες"
-
-#: classes/pref/feeds.php:732
-#: classes/pref/feeds.php:928
-msgid "Cache media"
-msgstr ""
-
-#: classes/pref/feeds.php:744
-#: classes/pref/feeds.php:934
-#, fuzzy
-msgid "Mark updated articles as unread"
-msgstr "Σήμανση ροής ως αναγνωσμένη"
-
-#: classes/pref/feeds.php:748
-msgid "Icon"
-msgstr "Εικονίδιο"
-
-#: classes/pref/feeds.php:765
-msgid "Replace"
-msgstr "Αντικατάσταση"
-
-#: classes/pref/feeds.php:772
-#: classes/pref/prefs.php:698
-msgid "Plugins"
-msgstr "Πρόσθετα"
-
-#: classes/pref/feeds.php:792
-msgid "Resubscribe to push updates"
-msgstr "Επανάληψη εγγραφής για προώθηση ενημερώσεων"
-
-#: classes/pref/feeds.php:799
-msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
-msgstr ""
-
-#: classes/pref/feeds.php:1200
-#: classes/pref/feeds.php:1253
-msgid "All done."
-msgstr "Όλα έτοιμα."
-
-#: classes/pref/feeds.php:1308
-msgid "Feeds with errors"
-msgstr "Ροές με σφάλματα"
-
-#: classes/pref/feeds.php:1315
-msgid "Inactive feeds"
-msgstr "Αδρανείς ροές"
-
-#: classes/pref/feeds.php:1351
-msgid "Edit selected feeds"
-msgstr "Επεξεργασία επιλεγμένων ροών"
-
-#: classes/pref/feeds.php:1353
-#: classes/pref/feeds.php:1367
-#: classes/pref/filters.php:762
-msgid "Reset sort order"
-msgstr "Επαναφορά σειράς ταξινόμησης"
-
-#: classes/pref/feeds.php:1355
-#: js/prefs.js:1622
-msgid "Batch subscribe"
-msgstr "Εγγραφή παρτίδας"
-
-#: classes/pref/feeds.php:1362
-msgid "Categories"
-msgstr "Κατηγορίες"
-
-#: classes/pref/feeds.php:1365
-msgid "Add category"
-msgstr "Προσθήκη κατηγορίας"
-
-#: classes/pref/feeds.php:1369
-msgid "Remove selected"
-msgstr "Αφαίρεση επιλεγμένων"
-
-#: classes/pref/feeds.php:1380
-msgid "More actions..."
-msgstr "Περισσότερες ενέργειες..."
-
-#: classes/pref/feeds.php:1384
-msgid "Manual purge"
-msgstr "Χειροκίνητη εκκαθάριση"
-
-#: classes/pref/feeds.php:1388
-msgid "Clear feed data"
-msgstr "Απαλοιφή δεδομένων ροής"
-
-#: classes/pref/feeds.php:1389
-#: classes/pref/filters.php:770
-msgid "Rescore articles"
-msgstr "Αναβαθμολόγηση άρθρων"
-
-#: classes/pref/feeds.php:1442
-msgid "OPML"
-msgstr "OPML"
-
-#: classes/pref/feeds.php:1444
-msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
-msgstr ""
-
-#: classes/pref/feeds.php:1445
-msgid "Only main settings profile can be migrated using OPML."
-msgstr ""
-
-#: classes/pref/feeds.php:1458
-msgid "Import my OPML"
-msgstr "Εισαγωγή του OPML μου"
-
-#: classes/pref/feeds.php:1464
-msgid "Filename:"
-msgstr "Όνομα αρχείου:"
-
-#: classes/pref/feeds.php:1466
-msgid "Include settings"
-msgstr "Συμπεριλάβετε ρυθμίσεις"
-
-#: classes/pref/feeds.php:1470
-msgid "Export OPML"
-msgstr "Εξαγωγή OPML"
-
-#: classes/pref/feeds.php:1474
-msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
-msgstr ""
-
-#: classes/pref/feeds.php:1478
-msgid "Public OPML URL"
-msgstr "Κοινό OPML URL"
-
-#: classes/pref/feeds.php:1479
-msgid "Display published OPML URL"
-msgstr "Εμφάνιση δημοσιευμένου URL του OPML"
-
-#: classes/pref/feeds.php:1488
-msgid "Firefox integration"
-msgstr "Ένταξη Firefox"
-
-#: classes/pref/feeds.php:1490
-msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
-msgstr ""
-
-#: classes/pref/feeds.php:1497
-msgid "Click here to register this site as a feed reader."
-msgstr ""
-
-#: classes/pref/feeds.php:1505
-msgid "Published & shared articles / Generated feeds"
-msgstr ""
-
-#: classes/pref/feeds.php:1507
-msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
-msgstr ""
-
-#: classes/pref/feeds.php:1514
-#: classes/feeds.php:54
-#: classes/feeds.php:140
-msgid "View as RSS"
-msgstr "Προβολή ως RSS"
-
-#: classes/pref/feeds.php:1515
-msgid "Display URL"
-msgstr "Εμφάνιση URL"
-
-#: classes/pref/feeds.php:1518
-msgid "Clear all generated URLs"
-msgstr "Απαλοιφή όλων των παραχθέντων URLs"
-
-#: classes/pref/feeds.php:1596
-msgid "These feeds have not been updated with new content for 3 months (oldest first):"
-msgstr ""
-
-#: classes/pref/feeds.php:1630
-#: classes/pref/feeds.php:1694
-msgid "Click to edit feed"
-msgstr "Κάντε κλικ για επεξεργασία ροής"
-
-#: classes/pref/feeds.php:1648
-#: classes/pref/feeds.php:1714
-msgid "Unsubscribe from selected feeds"
-msgstr "Κατάργηση εγγραφής από επιλεγμένες ροές"
-
-#: classes/pref/feeds.php:1819
-msgid "Add one valid RSS feed per line (no feed detection is done)"
-msgstr ""
-
-#: classes/pref/feeds.php:1828
-msgid "Feeds to subscribe, One per line"
-msgstr ""
-
-#: classes/pref/feeds.php:1851
-msgid "Feeds require authentication."
-msgstr "Οι ροές απαιτούν πιστοποίηση."
-
-#: classes/pref/feeds.php:1858
-#: classes/feeds.php:1099
-#: classes/feeds.php:1153
-msgid "Subscribe"
-msgstr "Εγγραφή"
-
-#: classes/pref/filters.php:151
-#, fuzzy
-msgid "Preview article"
-msgstr "Καινούργια άρθρα"
-
-#: classes/pref/filters.php:239
-#: classes/pref/filters.php:518
-msgid "(inverse)"
-msgstr "(αναστροφή)"
-
-#: classes/pref/filters.php:235
-#: classes/pref/filters.php:517
-#, php-format
-msgid "%s on %s in %s %s"
-msgstr ""
-
-#: classes/pref/filters.php:354
-#: classes/pref/filters.php:827
-#: classes/pref/filters.php:942
-msgid "Match"
-msgstr "Αντιστοίχιση"
-
-#: classes/pref/filters.php:368
-#: classes/pref/filters.php:416
-#: classes/pref/filters.php:841
-#: classes/pref/filters.php:868
-msgid "Add"
-msgstr "Προσθήκη"
-
-#: classes/pref/filters.php:371
-#: classes/pref/filters.php:419
-#: classes/pref/filters.php:844
-#: classes/pref/filters.php:871
-#: classes/feeds.php:122
-msgid "Delete"
-msgstr "Διαγραφή"
-
-#: classes/pref/filters.php:402
-#: classes/pref/filters.php:854
-msgid "Apply actions"
-msgstr "Εφαρμογή ενεργειών"
-
-#: classes/pref/filters.php:452
-#: classes/pref/filters.php:883
-msgid "Enabled"
-msgstr "Ενεργοποιημένο"
-
-#: classes/pref/filters.php:461
-#: classes/pref/filters.php:886
-msgid "Match any rule"
-msgstr "Αντιστοίχιση με οποιονδήποτε κανόνα"
-
-#: classes/pref/filters.php:470
-#: classes/pref/filters.php:889
-msgid "Inverse matching"
-msgstr "Αναστροφή αντιστοίχισης"
-
-#: classes/pref/filters.php:482
-#: classes/pref/filters.php:896
-msgid "Test"
-msgstr "Δοκιμή"
-
-#: classes/pref/filters.php:756
-msgid "Combine"
-msgstr "Συνδυασμός"
-
-#: classes/pref/filters.php:899
-msgid "Create"
-msgstr "Δημιουργία"
-
-#: classes/pref/filters.php:954
-msgid "Inverse regular expression matching"
-msgstr "Αναστροφή τακτικής αντιστοίχισης έκφρασης"
-
-#: classes/pref/filters.php:956
-msgid "on field"
-msgstr "επί τόπου"
-
-#: classes/pref/filters.php:962
-#: js/PrefFilterTree.js:64
-msgid "in"
-msgstr "σε"
-
-#: classes/pref/filters.php:975
-msgid "Wiki: Filters"
-msgstr "Wiki: Φίλτρα"
-
-#: classes/pref/filters.php:980
-msgid "Save rule"
-msgstr "Αποθήκευση κανόνα"
-
-#: classes/pref/filters.php:980
-#: js/functions.js:865
-msgid "Add rule"
-msgstr "Προσθήκη κανόνα"
-
-#: classes/pref/filters.php:1003
-msgid "Perform Action"
-msgstr "Πραγματοποίηση Ενέργειας"
-
-#: classes/pref/filters.php:1054
-#, fuzzy
-msgid "No actions available"
-msgstr "Διατίθεται νέα έκδοση!"
-
-#: classes/pref/filters.php:1073
-msgid "Save action"
-msgstr "Αποθήκευση ενέργειας"
-
-#: classes/pref/filters.php:1073
-#: js/functions.js:887
-msgid "Add action"
-msgstr "Προσθήκη ενέργειας"
-
-#: classes/pref/filters.php:1097
-msgid "[No caption]"
-msgstr "[Χωρίς λεζάντα]"
-
-#: classes/pref/filters.php:1099
-#, fuzzy, php-format
-msgid "%s (%d rule)"
-msgid_plural "%s (%d rules)"
-msgstr[0] "Προσθήκη κανόνα"
-msgstr[1] "Προσθήκη κανόνα"
-
-#: classes/pref/filters.php:1114
-#, fuzzy
-msgid "matches any rule"
-msgstr "Αντιστοίχιση με οποιονδήποτε κανόνα"
-
-#: classes/pref/filters.php:1117
-#, fuzzy, php-format
-msgid "%s (+%d action)"
-msgid_plural "%s (+%d actions)"
-msgstr[0] "Προσθήκη ενέργειας"
-msgstr[1] "Προσθήκη ενέργειας"
-
 #: classes/pref/prefs.php:19
 msgid "Interface"
 msgstr "Διεπαφή"
@@ -2059,7 +1659,7 @@ msgid "Strip all but most common HTML tags when reading articles."
 msgstr ""
 
 #: classes/pref/prefs.php:53
-#: js/prefs.js:1584
+#: js/prefs.js:1580
 msgid "Customize stylesheet"
 msgstr "Διαμόρφωση φύλλου ύφους"
 
@@ -2128,6 +1728,14 @@ msgstr "Επίπεδο πρόσβασης"
 msgid "Save data"
 msgstr "Αποθήκευση δεδομένων"
 
+#: classes/pref/prefs.php:245
+#: classes/pref/feeds.php:658
+#: classes/pref/feeds.php:878
+#: classes/pref/feeds.php:1813
+#: classes/feeds.php:1076
+msgid "Password"
+msgstr "Κωδικός Πρόσβασης"
+
 #: classes/pref/prefs.php:254
 msgid "Your password is at default value, please change it."
 msgstr ""
@@ -2227,18 +1835,23 @@ msgstr "Διαχείριση προφίλ"
 msgid "Reset to defaults"
 msgstr "Επαναφορά σε προεπιλογή"
 
+#: classes/pref/prefs.php:698
+#: classes/pref/feeds.php:772
+msgid "Plugins"
+msgstr "Πρόσθετα"
+
 #: classes/pref/prefs.php:700
 msgid "You will need to reload Tiny Tiny RSS for plugin changes to take effect."
 msgstr ""
 
-#: classes/pref/prefs.php:702
-msgid "Download more plugins at tt-rss.org <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forums</a> or <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a>."
-msgstr ""
-
-#: classes/pref/prefs.php:732
+#: classes/pref/prefs.php:730
 msgid "System plugins"
 msgstr "Πρόσθετα συστήματος"
 
+#: classes/pref/prefs.php:731
+msgid "System plugins are enabled in <strong>config.php</strong> for all users."
+msgstr ""
+
 #: classes/pref/prefs.php:736
 #: classes/pref/prefs.php:792
 msgid "Plugin"
@@ -2308,6 +1921,341 @@ msgstr "Αφαίρεση επιλεγμένων προφίλ"
 msgid "Activate profile"
 msgstr "Ενεργοποίηση προφίλ"
 
+#: classes/pref/feeds.php:15
+msgid "Check to enable field"
+msgstr "Έλεγχος για ενεργοποίηση πεδίου"
+
+#: classes/pref/feeds.php:65
+#: classes/pref/feeds.php:214
+#: classes/pref/feeds.php:258
+#: classes/pref/feeds.php:264
+#: classes/pref/feeds.php:290
+#, fuzzy, php-format
+msgid "(%d feed)"
+msgid_plural "(%d feeds)"
+msgstr[0] "Επεξεργασία ροής"
+msgstr[1] "Επεξεργασία ροής"
+
+#: classes/pref/feeds.php:561
+msgid "Feed Title"
+msgstr "Τίτλος Ροής"
+
+#: classes/pref/feeds.php:595
+#: classes/pref/feeds.php:818
+#: classes/pref/feeds.php:1796
+#: classes/feeds.php:1048
+msgid "Place in category:"
+msgstr "Τοποθέτηση σε κατηγορία:"
+
+#: classes/pref/feeds.php:608
+#: classes/pref/feeds.php:832
+#, fuzzy
+msgid "Language:"
+msgstr "Γλώσσα"
+
+#: classes/pref/feeds.php:615
+#: classes/pref/feeds.php:841
+msgid "Update"
+msgstr "Ενημέρωση"
+
+#: classes/pref/feeds.php:630
+#: classes/pref/feeds.php:857
+msgid "Article purging:"
+msgstr "Εκκαθάριση άρθρου:"
+
+#: classes/pref/feeds.php:662
+msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
+msgstr ""
+
+#: classes/pref/feeds.php:681
+#: classes/pref/feeds.php:888
+msgid "Hide from Popular feeds"
+msgstr "Απόκρυψη από Δημοφιλείς ροές"
+
+#: classes/pref/feeds.php:693
+#: classes/pref/feeds.php:894
+msgid "Include in e-mail digest"
+msgstr "Συμπεριλάβετε σε σύνοψη e-mail"
+
+#: classes/pref/feeds.php:706
+#: classes/pref/feeds.php:900
+msgid "Always display image attachments"
+msgstr "Να εμφανίζονται πάντα συνημμένα εικόνας"
+
+#: classes/pref/feeds.php:719
+#: classes/pref/feeds.php:908
+msgid "Do not embed images"
+msgstr "Μην ενσωματώνετε εικόνες"
+
+#: classes/pref/feeds.php:732
+#: classes/pref/feeds.php:916
+msgid "Cache media"
+msgstr ""
+
+#: classes/pref/feeds.php:744
+#: classes/pref/feeds.php:922
+#, fuzzy
+msgid "Mark updated articles as unread"
+msgstr "Σήμανση ροής ως αναγνωσμένη"
+
+#: classes/pref/feeds.php:748
+msgid "Icon"
+msgstr "Εικονίδιο"
+
+#: classes/pref/feeds.php:765
+msgid "Replace"
+msgstr "Αντικατάσταση"
+
+#: classes/pref/feeds.php:1174
+#: classes/pref/feeds.php:1227
+msgid "All done."
+msgstr "Όλα έτοιμα."
+
+#: classes/pref/feeds.php:1282
+msgid "Feeds with errors"
+msgstr "Ροές με σφάλματα"
+
+#: classes/pref/feeds.php:1289
+msgid "Inactive feeds"
+msgstr "Αδρανείς ροές"
+
+#: classes/pref/feeds.php:1325
+msgid "Edit selected feeds"
+msgstr "Επεξεργασία επιλεγμένων ροών"
+
+#: classes/pref/feeds.php:1329
+#: js/prefs.js:1618
+msgid "Batch subscribe"
+msgstr "Εγγραφή παρτίδας"
+
+#: classes/pref/feeds.php:1336
+msgid "Categories"
+msgstr "Κατηγορίες"
+
+#: classes/pref/feeds.php:1339
+msgid "Add category"
+msgstr "Προσθήκη κατηγορίας"
+
+#: classes/pref/feeds.php:1343
+msgid "Remove selected"
+msgstr "Αφαίρεση επιλεγμένων"
+
+#: classes/pref/feeds.php:1354
+msgid "More actions..."
+msgstr "Περισσότερες ενέργειες..."
+
+#: classes/pref/feeds.php:1358
+msgid "Manual purge"
+msgstr "Χειροκίνητη εκκαθάριση"
+
+#: classes/pref/feeds.php:1362
+msgid "Clear feed data"
+msgstr "Απαλοιφή δεδομένων ροής"
+
+#: classes/pref/feeds.php:1416
+msgid "OPML"
+msgstr "OPML"
+
+#: classes/pref/feeds.php:1418
+msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
+msgstr ""
+
+#: classes/pref/feeds.php:1419
+msgid "Only main settings profile can be migrated using OPML."
+msgstr ""
+
+#: classes/pref/feeds.php:1432
+msgid "Import my OPML"
+msgstr "Εισαγωγή του OPML μου"
+
+#: classes/pref/feeds.php:1438
+msgid "Filename:"
+msgstr "Όνομα αρχείου:"
+
+#: classes/pref/feeds.php:1440
+msgid "Include settings"
+msgstr "Συμπεριλάβετε ρυθμίσεις"
+
+#: classes/pref/feeds.php:1444
+msgid "Export OPML"
+msgstr "Εξαγωγή OPML"
+
+#: classes/pref/feeds.php:1448
+msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
+msgstr ""
+
+#: classes/pref/feeds.php:1452
+msgid "Public OPML URL"
+msgstr "Κοινό OPML URL"
+
+#: classes/pref/feeds.php:1453
+msgid "Display published OPML URL"
+msgstr "Εμφάνιση δημοσιευμένου URL του OPML"
+
+#: classes/pref/feeds.php:1462
+msgid "Firefox integration"
+msgstr "Ένταξη Firefox"
+
+#: classes/pref/feeds.php:1464
+msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
+msgstr ""
+
+#: classes/pref/feeds.php:1471
+msgid "Click here to register this site as a feed reader."
+msgstr ""
+
+#: classes/pref/feeds.php:1479
+msgid "Published & shared articles / Generated feeds"
+msgstr ""
+
+#: classes/pref/feeds.php:1481
+msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
+msgstr ""
+
+#: classes/pref/feeds.php:1488
+#: classes/feeds.php:54
+#: classes/feeds.php:140
+msgid "View as RSS"
+msgstr "Προβολή ως RSS"
+
+#: classes/pref/feeds.php:1489
+msgid "Display URL"
+msgstr "Εμφάνιση URL"
+
+#: classes/pref/feeds.php:1492
+msgid "Clear all generated URLs"
+msgstr "Απαλοιφή όλων των παραχθέντων URLs"
+
+#: classes/pref/feeds.php:1570
+msgid "These feeds have not been updated with new content for 3 months (oldest first):"
+msgstr ""
+
+#: classes/pref/feeds.php:1604
+#: classes/pref/feeds.php:1668
+msgid "Click to edit feed"
+msgstr "Κάντε κλικ για επεξεργασία ροής"
+
+#: classes/pref/feeds.php:1622
+#: classes/pref/feeds.php:1688
+msgid "Unsubscribe from selected feeds"
+msgstr "Κατάργηση εγγραφής από επιλεγμένες ροές"
+
+#: classes/pref/feeds.php:1793
+msgid "Add one valid RSS feed per line (no feed detection is done)"
+msgstr ""
+
+#: classes/pref/feeds.php:1802
+msgid "Feeds to subscribe, One per line"
+msgstr ""
+
+#: classes/pref/feeds.php:1825
+msgid "Feeds require authentication."
+msgstr "Οι ροές απαιτούν πιστοποίηση."
+
+#: classes/pref/feeds.php:1832
+#: classes/feeds.php:1092
+#: classes/feeds.php:1146
+msgid "Subscribe"
+msgstr "Εγγραφή"
+
+#: classes/pref/system.php:29
+msgid "Error Log"
+msgstr "Καταγραφή Σφάλματος"
+
+#: classes/pref/system.php:40
+msgid "Refresh"
+msgstr "Ανανέωση"
+
+#: classes/pref/system.php:43
+msgid "Clear log"
+msgstr "Απαλοιφή καταγραφής"
+
+#: classes/pref/system.php:48
+msgid "Error"
+msgstr "Σφάλμα"
+
+#: classes/pref/system.php:49
+msgid "Filename"
+msgstr "Όνομα αρχείου"
+
+#: classes/pref/system.php:50
+msgid "Message"
+msgstr "Μήνυμα"
+
+#: classes/pref/system.php:52
+msgid "Date"
+msgstr "Ημερομηνία"
+
+#: classes/opml.php:28
+#: classes/opml.php:33
+msgid "OPML Utility"
+msgstr "Βοηθητικό OPML"
+
+#: classes/opml.php:37
+msgid "Importing OPML..."
+msgstr "Εισαγωγή OPML σε εξέλιξη..."
+
+#: classes/opml.php:41
+msgid "Return to preferences"
+msgstr "Επιστροφή σε προτιμήσεις"
+
+#: classes/opml.php:295
+#, php-format
+msgid "Adding feed: %s"
+msgstr "Προσθήκη ροής: %s"
+
+#: classes/opml.php:306
+#, php-format
+msgid "Duplicate feed: %s"
+msgstr "Αντιγραφή ροής: %s"
+
+#: classes/opml.php:320
+#, php-format
+msgid "Adding label %s"
+msgstr "Προσθήκη ετικέτας %s"
+
+#: classes/opml.php:323
+#, php-format
+msgid "Duplicate label: %s"
+msgstr "Αντιγραφή ετικέτας: %s"
+
+#: classes/opml.php:335
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr ""
+
+#: classes/opml.php:367
+msgid "Adding filter..."
+msgstr "Προσθήκη φίλτρου σε εξέλιξη..."
+
+#: classes/opml.php:486
+#, php-format
+msgid "Processing category: %s"
+msgstr "Επεξεργασία κατηγορίας: %s"
+
+#: classes/opml.php:532
+#, php-format
+msgid "Upload failed with error code %d"
+msgstr ""
+
+#: classes/opml.php:544
+#: plugins/import_export/init.php:448
+msgid "Unable to move uploaded file."
+msgstr ""
+
+#: classes/opml.php:548
+#: plugins/import_export/init.php:452
+msgid "Error: please upload OPML file."
+msgstr ""
+
+#: classes/opml.php:559
+msgid "Error: unable to find moved OPML file."
+msgstr ""
+
+#: classes/opml.php:566
+msgid "Error while parsing document."
+msgstr "Σφάλμα κατά τη συντακτική ανάλυση του εγγράφου."
+
 #: classes/feeds.php:53
 msgid "View as RSS feed"
 msgstr "Προβολή ως ροή RSS"
@@ -2348,8 +2296,8 @@ msgstr "Κίνηση προς τα πίσω"
 
 #: classes/feeds.php:127
 #: classes/feeds.php:132
-#: plugins/mail/init.php:75
 #: plugins/mailto/init.php:25
+#: plugins/mail/init.php:75
 msgid "Forward by email"
 msgstr "Προώθηση μέσω e-mail"
 
@@ -2357,263 +2305,260 @@ msgstr "Προώθηση μέσω e-mail"
 msgid "Feed:"
 msgstr "Ροή:"
 
-#: classes/feeds.php:229
-#: classes/feeds.php:892
+#: classes/feeds.php:228
+#: classes/feeds.php:885
 msgid "Feed not found."
 msgstr "Η ροή δεν βρέθηκε."
 
-#: classes/feeds.php:300
+#: classes/feeds.php:291
 msgid "Never"
 msgstr "Ποτέ"
 
-#: classes/feeds.php:413
+#: classes/feeds.php:405
 #, php-format
 msgid "Imported at %s"
 msgstr "Εισήχθη στις %s"
 
-#: classes/feeds.php:472
-#: classes/feeds.php:569
+#: classes/feeds.php:464
+#: classes/feeds.php:561
 msgid "mark feed as read"
 msgstr "σήμανση ροής ως αναγνωσμένη"
 
-#: classes/feeds.php:630
+#: classes/feeds.php:622
 msgid "Collapse article"
 msgstr "Σύμπτυξη άρθρου"
 
-#: classes/feeds.php:791
+#: classes/feeds.php:784
 msgid "No unread articles found to display."
 msgstr ""
 
-#: classes/feeds.php:794
+#: classes/feeds.php:787
 msgid "No updated articles found to display."
 msgstr ""
 
-#: classes/feeds.php:797
+#: classes/feeds.php:790
 msgid "No starred articles found to display."
 msgstr ""
 
-#: classes/feeds.php:801
+#: classes/feeds.php:794
 msgid "No articles found to display. You can assign articles to labels manually from article header context menu (applies to all selected articles) or use a filter."
 msgstr ""
 
-#: classes/feeds.php:803
+#: classes/feeds.php:796
 msgid "No articles found to display."
 msgstr ""
 
-#: classes/feeds.php:818
-#: classes/feeds.php:992
+#: classes/feeds.php:811
+#: classes/feeds.php:985
 #, fuzzy, php-format
 msgid "Feeds last updated at %s"
 msgstr "Ενημερώθηκε τελευταία: %s"
 
-#: classes/feeds.php:828
-#: classes/feeds.php:1002
+#: classes/feeds.php:821
+#: classes/feeds.php:995
 msgid "Some feeds have update errors (click for details)"
 msgstr ""
 
-#: classes/feeds.php:982
+#: classes/feeds.php:975
 msgid "No feed selected."
 msgstr "Δεν επιλέχθηκε ροή."
 
-#: classes/feeds.php:1041
-#: classes/feeds.php:1049
+#: classes/feeds.php:1034
+#: classes/feeds.php:1042
 msgid "Feed or site URL"
 msgstr "URL ροής ή ιστοτόπου"
 
-#: classes/feeds.php:1063
+#: classes/feeds.php:1056
 msgid "Available feeds"
 msgstr "Διαθέσιμες ροές"
 
-#: classes/feeds.php:1094
+#: classes/feeds.php:1087
 msgid "This feed requires authentication."
 msgstr "Αυτή η ροή απαιτεί πιστοποίηση."
 
-#: classes/feeds.php:1102
+#: classes/feeds.php:1095
 msgid "More feeds"
 msgstr "Περισσότερες ροές"
 
-#: classes/feeds.php:1129
+#: classes/feeds.php:1122
 msgid "Popular feeds"
 msgstr "Δημοφιλείς ροές"
 
-#: classes/feeds.php:1130
+#: classes/feeds.php:1123
 msgid "Feed archive"
 msgstr "Αρχειοθέτηση ροής"
 
-#: classes/feeds.php:1133
+#: classes/feeds.php:1126
 msgid "limit:"
 msgstr "όριο:"
 
-#: classes/feeds.php:1165
+#: classes/feeds.php:1158
 msgid "Look for"
 msgstr "Αναζήτηση"
 
-#: classes/feeds.php:1173
+#: classes/feeds.php:1166
 #, php-format
 msgid "in %s"
 msgstr ""
 
-#: classes/feeds.php:1178
+#: classes/feeds.php:1171
 msgid "Used for word stemming"
 msgstr ""
 
-#: classes/feeds.php:1187
+#: classes/feeds.php:1180
 msgid "Search syntax"
 msgstr "Σύνταξη αναζήτησης"
 
-#: plugins/instances/init.php:141
-msgid "Linked"
-msgstr "Συνδεδεμένο"
-
-#: plugins/instances/init.php:204
-#: plugins/instances/init.php:395
-msgid "Instance"
-msgstr "Instance"
+#: classes/feeds.php:1596
+msgid "Starred articles"
+msgstr "Άρθρα με αστέρια"
 
-#: plugins/instances/init.php:215
-#: plugins/instances/init.php:312
-#: plugins/instances/init.php:404
-msgid "Instance URL"
-msgstr "Instance URL"
+#: classes/feeds.php:1598
+msgid "Published articles"
+msgstr "Δημοσιευμένα άρθρα"
 
-#: plugins/instances/init.php:226
-#: plugins/instances/init.php:414
-msgid "Access key:"
-msgstr "Κλειδί πρόσβασης:"
+#: classes/feeds.php:1600
+msgid "Fresh articles"
+msgstr "Καινούργια άρθρα"
 
-#: plugins/instances/init.php:229
-#: plugins/instances/init.php:313
-#: plugins/instances/init.php:417
-msgid "Access key"
-msgstr "Κλειδί πρόσβασης"
+#: classes/feeds.php:1604
+msgid "Archived articles"
+msgstr "Αρχειοθετημένα άρθρα"
 
-#: plugins/instances/init.php:233
-#: plugins/instances/init.php:421
-msgid "Use one access key for both linked instances."
-msgstr ""
+#: classes/feeds.php:1606
+msgid "Recently read"
+msgstr "Πρόσφατα αναγνωσμένα"
 
-#: plugins/instances/init.php:241
-#: plugins/instances/init.php:429
-msgid "Generate new key"
-msgstr "Παραγωγή νέου κλειδιού"
+#: classes/feeds.php:1716
+msgid "Special"
+msgstr "Ειδικό"
 
-#: plugins/instances/init.php:292
-msgid "Link instance"
-msgstr "Σύνδεσμος instance"
+#: classes/feeds.php:1962
+#, php-format
+msgid "Search results: %s"
+msgstr "Αποτελέσματα αναζήτησης: %s"
 
-#: plugins/instances/init.php:304
-msgid "You can connect other instances of Tiny Tiny RSS to this one to share Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
-msgstr ""
+#: plugins/vf_shared/init.php:16
+#: plugins/vf_shared/init.php:60
+msgid "Shared articles"
+msgstr "Κοινόχρηστα άρθρα"
 
-#: plugins/instances/init.php:314
-msgid "Last connected"
-msgstr "Τελευταία σύνδεση"
+#: plugins/import_export/init.php:58
+msgid "Import and export"
+msgstr "Εισαγωγή και εξαγωγή"
 
-#: plugins/instances/init.php:315
-msgid "Status"
-msgstr "Κατάσταση"
+#: plugins/import_export/init.php:60
+msgid "You can export and import your Starred and Archived articles for safekeeping or when migrating between tt-rss instances of same version."
+msgstr ""
 
-#: plugins/instances/init.php:316
-msgid "Stored feeds"
-msgstr "Αποθηκευμένες ροές"
+#: plugins/import_export/init.php:65
+msgid "Export my data"
+msgstr "Εξαγωγή των δεδομένων μου"
 
-#: plugins/instances/init.php:433
-msgid "Create link"
-msgstr "Δημιουργία συνδέσμου"
+#: plugins/import_export/init.php:81
+msgid "Import"
+msgstr "Εισαγωγή"
 
-#: plugins/nsfw/init.php:30
-#: plugins/nsfw/init.php:42
-msgid "Not work safe (click to toggle)"
+#: plugins/import_export/init.php:231
+msgid "Could not import: incorrect schema version."
 msgstr ""
 
-#: plugins/nsfw/init.php:52
-msgid "NSFW Plugin"
-msgstr "Πρόσθετο NSFW"
-
-#: plugins/nsfw/init.php:79
-msgid "Tags to consider NSFW (comma-separated)"
+#: plugins/import_export/init.php:236
+msgid "Could not import: unrecognized document format."
 msgstr ""
 
-#: plugins/nsfw/init.php:100
-msgid "Configuration saved."
-msgstr "Η διαμόρφωση αποθηκεύτηκε."
+#: plugins/import_export/init.php:397
+msgid "Finished: "
+msgstr "Ολοκληρώθηκε: "
 
-#: plugins/note/init.php:26
-#: plugins/note/note.js:11
-msgid "Edit article note"
-msgstr "Επεξεργασία σημείωσης άρθρου"
+#: plugins/import_export/init.php:398
+#, fuzzy, php-format
+msgid "%d article processed, "
+msgid_plural "%d articles processed, "
+msgstr[0] "Επεξεργασία σημείωσης άρθρου"
+msgstr[1] "Επεξεργασία σημείωσης άρθρου"
 
-#: plugins/vf_shared/init.php:16
-#: plugins/vf_shared/init.php:69
-msgid "Shared articles"
-msgstr "Κοινόχρηστα άρθρα"
+#: plugins/import_export/init.php:399
+#, php-format
+msgid "%d imported, "
+msgid_plural "%d imported, "
+msgstr[0] ""
+msgstr[1] ""
 
-#: plugins/auth_internal/init.php:65
-#, fuzzy
-msgid "Please enter your one time password:"
-msgstr "Λανθασμένος κωδικός πρόσβασης μίας φοράς"
+#: plugins/import_export/init.php:400
+#, fuzzy, php-format
+msgid "%d feed created."
+msgid_plural "%d feeds created."
+msgstr[0] "Δεν επιλέχθηκε ροή."
+msgstr[1] "Δεν επιλέχθηκε ροή."
 
-#: plugins/auth_internal/init.php:188
-msgid "Password has been changed."
-msgstr "Ο κωδικός πρόσβασης έχει αλλάξει."
+#: plugins/import_export/init.php:405
+msgid "Could not load XML document."
+msgstr ""
 
-#: plugins/auth_internal/init.php:190
-msgid "Old password is incorrect."
-msgstr "Ο παλιός κωδικός πρόσβασης είναι λανθασμένος."
+#: plugins/import_export/init.php:417
+msgid "Prepare data"
+msgstr "Προετοιμασία δεδομένων"
 
-#: plugins/af_readability/init.php:21
-msgid "Data saved."
+#: plugins/import_export/init.php:434
+#, php-format
+msgid "Upload failed with error code %d (%s)"
 msgstr ""
 
-#: plugins/af_readability/init.php:33
-#, fuzzy
-msgid "Inline content"
-msgstr "Επεξεργασία σημείωσης άρθρου"
+#: plugins/import_export/init.php:460
+msgid "No file uploaded."
+msgstr "Δεν φορτώθηκε αρχείο."
 
-#: plugins/af_readability/init.php:39
-msgid "Readability settings (af_readability)"
-msgstr ""
+#: plugins/mailto/init.php:48
+#: plugins/mailto/init.php:54
+#: plugins/mail/init.php:112
+#: plugins/mail/init.php:118
+msgid "[Forwarded]"
+msgstr "[Προωθήθηκε]"
 
-#: plugins/af_readability/init.php:66
-msgid "Use Readability for pages shared via bookmarklet."
-msgstr ""
+#: plugins/mailto/init.php:48
+#: plugins/mail/init.php:112
+msgid "Multiple articles"
+msgstr "Πολλαπλά άρθρα"
 
-#: plugins/af_readability/init.php:78
-#: plugins/af_psql_trgm/init.php:191
-msgid "Currently enabled for (click to edit):"
+#: plugins/mailto/init.php:70
+msgid "Clicking the following link to invoke your mail client:"
 msgstr ""
 
-#: plugins/af_readability/init.php:95
+#: plugins/mailto/init.php:74
 #, fuzzy
-msgid "Readability"
-msgstr "Έλεγχος διαθεσιμότητας"
-
-#: plugins/af_readability/init.php:106
-#, fuzzy
-msgid "Inline article content"
-msgstr "Επεξεργασία σημείωσης άρθρου"
+msgid "Forward selected article(s) by email."
+msgstr "Προώθηση άρθρου μέσω e-mail"
 
-#: plugins/af_redditimgur/init.php:25
-msgid "Reddit content settings (af_redditimgur)"
+#: plugins/mailto/init.php:77
+msgid "You should be able to edit the message before sending in your mail client."
 msgstr ""
 
-#: plugins/af_redditimgur/init.php:50
-msgid "Uses Readability (full-text-rss) implementation by <a target='_blank' href='https://bitbucket.org/fivefilters/'>FiveFilters.org</a>"
-msgstr ""
+#: plugins/mailto/init.php:82
+msgid "Close this dialog"
+msgstr "Κλείστε αυτό το πλαίσιο διαλόγου"
 
-#: plugins/af_redditimgur/init.php:54
-msgid "Extract missing content using Readability"
-msgstr ""
+#: plugins/bookmarklets/init.php:20
+msgid "Bookmarklets"
+msgstr "Σελιδοδείκτες"
 
-#: plugins/af_redditimgur/init.php:59
-msgid "Enable additional duplicate checking"
+#: plugins/bookmarklets/init.php:22
+msgid "Drag the link below to your browser toolbar, open the feed you're interested in in your browser and click on the link to subscribe to it."
 msgstr ""
 
-#: plugins/af_redditimgur/init.php:73
-#: plugins/af_zz_imgproxy/init.php:225
+#: plugins/bookmarklets/init.php:26
+#, fuzzy, php-format
+msgid "Subscribe to %s in Tiny Tiny RSS?"
+msgstr "Εγγεγραμμένος σε %s"
+
+#: plugins/bookmarklets/init.php:31
 #, fuzzy
-msgid "Configuration saved"
-msgstr "Η διαμόρφωση αποθηκεύτηκε."
+msgid "Subscribe in Tiny Tiny RSS"
+msgstr "Ενημέρωση του Tiny Tiny RSS"
+
+#: plugins/bookmarklets/init.php:34
+msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
+msgstr ""
 
 #: plugins/af_psql_trgm/init.php:28
 #, php-format
@@ -2653,87 +2598,62 @@ msgstr ""
 msgid "Enable for all feeds:"
 msgstr "Ενεργοποίηση κατηγοριών ροών"
 
-#: plugins/af_psql_trgm/init.php:209
-msgid "Similarity (pg_trgm)"
-msgstr ""
-
-#: plugins/af_comics/init.php:40
-msgid "Feeds supported by af_comics"
+#: plugins/af_psql_trgm/init.php:191
+#: plugins/af_readability/init.php:78
+msgid "Currently enabled for (click to edit):"
 msgstr ""
 
-#: plugins/af_comics/init.php:42
-msgid "The following comics are currently supported:"
+#: plugins/af_psql_trgm/init.php:209
+msgid "Similarity (pg_trgm)"
 msgstr ""
 
-#: plugins/af_comics/init.php:60
-msgid "GoComics requires a specific URL to workaround their lack of feed support: <code>http://feeds.feedburner.com/uclick/<em>comic_name</em></code> (e.g. <code>http://www.gocomics.com/garfield</code> uses <code>http://feeds.feedburner.com/uclick/garfield</code>)."
+#: plugins/nsfw/init.php:30
+#: plugins/nsfw/init.php:42
+msgid "Not work safe (click to toggle)"
 msgstr ""
 
-#: plugins/import_export/init.php:58
-msgid "Import and export"
-msgstr "Εισαγωγή και εξαγωγή"
+#: plugins/nsfw/init.php:52
+msgid "NSFW Plugin"
+msgstr "Πρόσθετο NSFW"
 
-#: plugins/import_export/init.php:60
-msgid "You can export and import your Starred and Archived articles for safekeeping or when migrating between tt-rss instances of same version."
+#: plugins/nsfw/init.php:79
+msgid "Tags to consider NSFW (comma-separated)"
 msgstr ""
 
-#: plugins/import_export/init.php:65
-msgid "Export my data"
-msgstr "Εξαγωγή των δεδομένων μου"
-
-#: plugins/import_export/init.php:81
-msgid "Import"
-msgstr "Εισαγωγή"
+#: plugins/nsfw/init.php:100
+msgid "Configuration saved."
+msgstr "Η διαμόρφωση αποθηκεύτηκε."
 
-#: plugins/import_export/init.php:225
-msgid "Could not import: incorrect schema version."
-msgstr ""
+#: plugins/toggle_sidebar/init.php:23
+msgid "Collapse feedlist"
+msgstr "Συρρίκνωση λίστας ροών"
 
-#: plugins/import_export/init.php:230
-msgid "Could not import: unrecognized document format."
+#: plugins/af_readability/init.php:21
+msgid "Data saved."
 msgstr ""
 
-#: plugins/import_export/init.php:391
-msgid "Finished: "
-msgstr "Ολοκληρώθηκε: "
-
-#: plugins/import_export/init.php:392
-#, fuzzy, php-format
-msgid "%d article processed, "
-msgid_plural "%d articles processed, "
-msgstr[0] "Επεξεργασία σημείωσης άρθρου"
-msgstr[1] "Επεξεργασία σημείωσης άρθρου"
-
-#: plugins/import_export/init.php:393
-#, php-format
-msgid "%d imported, "
-msgid_plural "%d imported, "
-msgstr[0] ""
-msgstr[1] ""
-
-#: plugins/import_export/init.php:394
-#, fuzzy, php-format
-msgid "%d feed created."
-msgid_plural "%d feeds created."
-msgstr[0] "Δεν επιλέχθηκε ροή."
-msgstr[1] "Δεν επιλέχθηκε ροή."
+#: plugins/af_readability/init.php:33
+#, fuzzy
+msgid "Inline content"
+msgstr "Επεξεργασία σημείωσης άρθρου"
 
-#: plugins/import_export/init.php:399
-msgid "Could not load XML document."
+#: plugins/af_readability/init.php:39
+msgid "Readability settings (af_readability)"
 msgstr ""
 
-#: plugins/import_export/init.php:411
-msgid "Prepare data"
-msgstr "Προετοιμασία δεδομένων"
-
-#: plugins/import_export/init.php:428
-#, php-format
-msgid "Upload failed with error code %d (%s)"
+#: plugins/af_readability/init.php:66
+msgid "Use Readability for pages shared via bookmarklet."
 msgstr ""
 
-#: plugins/import_export/init.php:454
-msgid "No file uploaded."
-msgstr "Δεν φορτώθηκε αρχείο."
+#: plugins/af_readability/init.php:95
+#, fuzzy
+msgid "Readability"
+msgstr "Έλεγχος διαθεσιμότητας"
+
+#: plugins/af_readability/init.php:106
+#, fuzzy
+msgid "Inline article content"
+msgstr "Επεξεργασία σημείωσης άρθρου"
 
 #: plugins/mail/init.php:28
 msgid "Mail addresses saved."
@@ -2748,18 +2668,6 @@ msgstr "Πρόσθετα χρήστη"
 msgid "You can set predefined email addressed here (comma-separated list):"
 msgstr ""
 
-#: plugins/mail/init.php:112
-#: plugins/mail/init.php:118
-#: plugins/mailto/init.php:49
-#: plugins/mailto/init.php:55
-msgid "[Forwarded]"
-msgstr "[Προωθήθηκε]"
-
-#: plugins/mail/init.php:112
-#: plugins/mailto/init.php:49
-msgid "Multiple articles"
-msgstr "Πολλαπλά άρθρα"
-
 #: plugins/mail/init.php:140
 msgid "To:"
 msgstr "Προς:"
@@ -2772,92 +2680,110 @@ msgstr "Θέμα:"
 msgid "Send e-mail"
 msgstr "Αποστολή e-mail"
 
-#: plugins/close_button/init.php:22
-msgid "Close article"
-msgstr "Κλείσιμο άρθρου"
+#: plugins/share/init.php:39
+msgid "You can disable all articles shared by unique URLs here."
+msgstr ""
 
-#: plugins/bookmarklets/init.php:20
-msgid "Bookmarklets"
-msgstr "Σελιδοδείκτες"
+#: plugins/share/init.php:42
+msgid "Unshare all articles"
+msgstr "Κατάργηση κοινής χρήσης όλων των άρθρων"
 
-#: plugins/bookmarklets/init.php:22
-msgid "Drag the link below to your browser toolbar, open the feed you're interested in in your browser and click on the link to subscribe to it."
+#: plugins/share/init.php:75
+msgid "Share by URL"
+msgstr "Διαμοιρασμός κατά URL"
+
+#: plugins/share/init.php:96
+msgid "You can share this article by the following unique URL:"
 msgstr ""
 
-#: plugins/bookmarklets/init.php:26
-#, fuzzy, php-format
-msgid "Subscribe to %s in Tiny Tiny RSS?"
-msgstr "Εγγεγραμμένος σε %s"
+#: plugins/share/init.php:114
+msgid "Unshare article"
+msgstr "Κατάργηση διαμοιρασμού άρθρου"
 
-#: plugins/bookmarklets/init.php:31
-#, fuzzy
-msgid "Subscribe in Tiny Tiny RSS"
-msgstr "Ενημέρωση του Tiny Tiny RSS"
+#: plugins/af_comics/init.php:48
+msgid "Feeds supported by af_comics"
+msgstr ""
 
-#: plugins/bookmarklets/init.php:34
-msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
+#: plugins/af_comics/init.php:50
+msgid "The following comics are currently supported:"
 msgstr ""
 
-#: plugins/toggle_sidebar/init.php:23
-msgid "Collapse feedlist"
-msgstr "Συρρίκνωση λίστας ροών"
+#: plugins/af_comics/init.php:68
+msgid "GoComics requires a specific URL to workaround their lack of feed support: <code>http://feeds.feedburner.com/uclick/<em>comic_name</em></code> (e.g. <code>http://www.gocomics.com/garfield</code> uses <code>http://feeds.feedburner.com/uclick/garfield</code>)."
+msgstr ""
 
-#: plugins/af_zz_imgproxy/init.php:186
-msgid "Image proxy settings (af_zz_imgproxy)"
+#: plugins/af_comics/init.php:70
+msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
 msgstr ""
 
-#: plugins/af_zz_imgproxy/init.php:211
-#, fuzzy
-msgid "Enable proxy for all remote images."
-msgstr "Ενεργοποίηση κατηγοριών ροών"
+#: plugins/af_redditimgur/init.php:25
+msgid "Reddit content settings (af_redditimgur)"
+msgstr ""
 
-#: plugins/mailto/init.php:71
-msgid "Clicking the following link to invoke your mail client:"
+#: plugins/af_redditimgur/init.php:50
+msgid "Uses Readability (full-text-rss) implementation by <a target='_blank' href='https://bitbucket.org/fivefilters/'>FiveFilters.org</a>"
 msgstr ""
 
-#: plugins/mailto/init.php:75
-#, fuzzy
-msgid "Forward selected article(s) by email."
-msgstr "Προώθηση άρθρου μέσω e-mail"
+#: plugins/af_redditimgur/init.php:54
+msgid "Extract missing content using Readability"
+msgstr ""
 
-#: plugins/mailto/init.php:78
-msgid "You should be able to edit the message before sending in your mail client."
+#: plugins/af_redditimgur/init.php:59
+msgid "Enable additional duplicate checking"
 msgstr ""
 
-#: plugins/mailto/init.php:83
-msgid "Close this dialog"
-msgstr "Κλείστε αυτό το πλαίσιο διαλόγου"
+#: plugins/af_redditimgur/init.php:73
+#: plugins/af_zz_imgproxy/init.php:254
+#, fuzzy
+msgid "Configuration saved"
+msgstr "Η διαμόρφωση αποθηκεύτηκε."
 
-#: plugins/share/init.php:39
-msgid "You can disable all articles shared by unique URLs here."
+#: plugins/note/init.php:26
+#: plugins/note/note.js:11
+msgid "Edit article note"
+msgstr "Επεξεργασία σημείωσης άρθρου"
+
+#: plugins/close_button/init.php:25
+msgid "Close article"
+msgstr "Κλείσιμο άρθρου"
+
+#: plugins/af_zz_imgproxy/init.php:210
+msgid "Image proxy settings (af_zz_imgproxy)"
 msgstr ""
 
-#: plugins/share/init.php:42
-msgid "Unshare all articles"
-msgstr "Κατάργηση κοινής χρήσης όλων των άρθρων"
+#: plugins/af_zz_imgproxy/init.php:234
+#, fuzzy
+msgid "Enable proxy for all remote images."
+msgstr "Ενεργοποίηση κατηγοριών ροών"
 
-#: plugins/share/init.php:75
-msgid "Share by URL"
-msgstr "Διαμοιρασμός κατά URL"
+#: plugins/af_zz_imgproxy/init.php:238
+#, fuzzy
+msgid "Don't cache files locally."
+msgstr "Αποθήκευση εικόνων τοπικά"
 
-#: plugins/share/init.php:97
-msgid "You can share this article by the following unique URL:"
-msgstr ""
+#: plugins/auth_internal/init.php:65
+#, fuzzy
+msgid "Please enter your one time password:"
+msgstr "Λανθασμένος κωδικός πρόσβασης μίας φοράς"
 
-#: plugins/share/init.php:115
-msgid "Unshare article"
-msgstr "Κατάργηση διαμοιρασμού άρθρου"
+#: plugins/auth_internal/init.php:188
+msgid "Password has been changed."
+msgstr "Ο κωδικός πρόσβασης έχει αλλάξει."
+
+#: plugins/auth_internal/init.php:190
+msgid "Old password is incorrect."
+msgstr "Ο παλιός κωδικός πρόσβασης είναι λανθασμένος."
 
 #: js/FeedTree.js:172
 #, fuzzy
 msgid "(Un)collapse"
 msgstr "Ανάπτυξη/σύμπτυξη πλευρικής μπάρας"
 
-#: js/PrefFeedTree.js:52
+#: js/PrefFeedTree.js:54
 msgid "Edit category"
 msgstr "Επεξεργασία κατηγορίας"
 
-#: js/PrefFeedTree.js:59
+#: js/PrefFeedTree.js:61
 msgid "Remove category"
 msgstr "Αφαίρεση κατηγορίας"
 
@@ -2892,63 +2818,55 @@ msgid "Create Filter"
 msgstr "Δημιουργία Φίλτρου"
 
 #: js/functions.js:1128
-msgid "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification hub again on next feed update."
-msgstr ""
-
-#: js/functions.js:1139
-msgid "Subscription reset."
-msgstr "Επαναφορά εγγραφής."
-
-#: js/functions.js:1149
-#: js/tt-rss.js:695
+#: js/tt-rss.js:696
 #, perl-format
 msgid "Unsubscribe from %s?"
 msgstr "Κατάργηση εγγραφής από %s;"
 
-#: js/functions.js:1152
+#: js/functions.js:1131
 msgid "Removing feed..."
 msgstr "Αφαίρεση ροής σε εξέλιξη..."
 
-#: js/functions.js:1225
+#: js/functions.js:1204
 msgid "Please enter category title:"
 msgstr "Εισάγετε τίτλο κατηγορίας:"
 
-#: js/functions.js:1250
+#: js/functions.js:1229
 msgid "Generate new syndication address for this feed?"
 msgstr ""
 
-#: js/functions.js:1254
-#: js/prefs.js:1154
+#: js/functions.js:1233
+#: js/prefs.js:1150
 msgid "Trying to change address..."
 msgstr "Απόπειρα αλλαγής διεύθυνσης σε εξέλιξη..."
 
-#: js/functions.js:1497
-#: js/functions.js:1606
+#: js/functions.js:1476
+#: js/functions.js:1585
 #: js/prefs.js:398
 #: js/prefs.js:424
 #: js/prefs.js:456
 #: js/prefs.js:599
 #: js/prefs.js:617
-#: js/prefs.js:1136
-#: js/prefs.js:1263
+#: js/prefs.js:1132
+#: js/prefs.js:1259
 msgid "No feeds are selected."
 msgstr "Δεν επιλέχθηκαν ροές."
 
-#: js/functions.js:1540
+#: js/functions.js:1519
 msgid "Remove selected feeds from the archive? Feeds with stored articles will not be removed."
 msgstr ""
 
-#: js/functions.js:1577
+#: js/functions.js:1556
 msgid "Feeds with update errors"
 msgstr "Ροές με σφάλματα ενημέρωσης"
 
-#: js/functions.js:1588
-#: js/prefs.js:1117
+#: js/functions.js:1567
+#: js/prefs.js:1113
 msgid "Remove selected feeds?"
 msgstr "Αφαίρεση επιλεγμένων ροών;"
 
-#: js/functions.js:1591
-#: js/prefs.js:1120
+#: js/functions.js:1570
+#: js/prefs.js:1116
 msgid "Removing selected feeds..."
 msgstr "Αφαίρεση επιλεγμένων ροών σε εξέλιξη..."
 
@@ -2971,9 +2889,7 @@ msgstr "Επεξεργαστής Χρήστη"
 #: js/prefs.js:100
 #: js/prefs.js:209
 #: js/prefs.js:706
-#: plugins/instances/instances.js:26
-#: plugins/instances/instances.js:89
-#: js/functions.js:1408
+#: js/functions.js:1387
 msgid "Saving data..."
 msgstr "Αποθήκευση δεδομένων σε εξέλιξη..."
 
@@ -2998,7 +2914,7 @@ msgid "Removing selected labels..."
 msgstr "Αφαίρεση επιλεγμένων ετικετών σε εξέλιξη..."
 
 #: js/prefs.js:308
-#: js/prefs.js:1304
+#: js/prefs.js:1300
 msgid "No labels are selected."
 msgstr "Δεν επιλέχθηκαν ετικέτες."
 
@@ -3102,28 +3018,28 @@ msgstr "Εγγραφή σε επιλεγμένες ροές"
 msgid "OPML Import"
 msgstr "Εισαγωγή OPML"
 
-#: js/prefs.js:764
+#: js/prefs.js:759
 msgid "Please choose an OPML file first."
 msgstr ""
 
-#: js/prefs.js:767
+#: js/prefs.js:762
 #: plugins/import_export/import_export.js:115
 msgid "Importing, please wait..."
 msgstr "Εισαγωγή σε εξέλιξη, παρακαλώ περιμένετε..."
 
-#: js/prefs.js:928
+#: js/prefs.js:924
 msgid "Reset to defaults?"
 msgstr "Επαναφορά σε προεπιλογές;"
 
-#: js/prefs.js:1628
+#: js/prefs.js:1624
 msgid "Subscribing to feeds..."
 msgstr "Γίνεται εγγραφή σε ροές..."
 
-#: js/prefs.js:1647
+#: js/prefs.js:1643
 msgid "Clear stored data for this plugin?"
 msgstr ""
 
-#: js/prefs.js:1661
+#: js/prefs.js:1657
 msgid "Clear all messages in the error log?"
 msgstr ""
 
@@ -3137,181 +3053,150 @@ msgstr "Σήμανση παραπάνω ως αναγνωσμένα"
 msgid "Marking all feeds as read..."
 msgstr "Σήμανση ροής ως αναγνωσμένη"
 
-#: js/tt-rss.js:401
+#: js/tt-rss.js:402
 msgid "Please enable mail plugin first."
 msgstr ""
 
-#: js/tt-rss.js:449
-#: js/functions.js:1387
-#: js/tt-rss.js:676
+#: js/tt-rss.js:450
+#: js/functions.js:1366
+#: js/tt-rss.js:677
 msgid "You can't edit this kind of feed."
 msgstr ""
 
-#: js/tt-rss.js:530
+#: js/tt-rss.js:531
 msgid "Please enable embed_original plugin first."
 msgstr ""
 
-#: js/tt-rss.js:543
-#: js/tt-rss.js:726
+#: js/tt-rss.js:544
+#: js/tt-rss.js:727
 msgid "Widescreen is not available in combined mode."
 msgstr ""
 
-#: js/tt-rss.js:824
+#: js/tt-rss.js:825
 msgid "You can't rescore this kind of feed."
 msgstr ""
 
-#: js/tt-rss.js:829
-#: js/tt-rss.js:689
+#: js/tt-rss.js:830
+#: js/tt-rss.js:690
 #, fuzzy
 msgid "Please select some feed first."
 msgstr "Απαλοιφή επιλεγμένης ροής σε εξέλιξη..."
 
-#: js/tt-rss.js:834
+#: js/tt-rss.js:835
 #, perl-format
 msgid "Rescore articles in %s?"
 msgstr "Αναβαθμολόγηση άρθρων σε %s;"
 
-#: js/tt-rss.js:837
+#: js/tt-rss.js:838
 msgid "Rescoring articles..."
 msgstr "Γίνεται αναβαθμολόγηση άρθρων..."
 
-#: js/viewfeed.js:919
-#: js/viewfeed.js:957
-#: js/viewfeed.js:1005
-#: js/viewfeed.js:1931
-#: plugins/mail/mail.js:7
+#: js/viewfeed.js:921
+#: js/viewfeed.js:959
+#: js/viewfeed.js:1007
+#: js/viewfeed.js:1933
 #: plugins/mailto/init.js:7
-#: js/viewfeed.js:677
-#: js/viewfeed.js:699
-#: js/viewfeed.js:720
-#: js/viewfeed.js:779
-#: js/viewfeed.js:807
+#: plugins/mail/mail.js:7
+#: js/viewfeed.js:679
+#: js/viewfeed.js:701
+#: js/viewfeed.js:722
+#: js/viewfeed.js:781
+#: js/viewfeed.js:809
 msgid "No articles are selected."
 msgstr "Δεν επιλέχθηκαν άρθρα."
 
-#: js/viewfeed.js:927
+#: js/viewfeed.js:929
 #, fuzzy, perl-format
 msgid "Delete %d selected article in %s?"
 msgid_plural "Delete %d selected articles in %s?"
 msgstr[0] "Αναβαθμολόγηση άρθρων σε %s;"
 msgstr[1] "Αναβαθμολόγηση άρθρων σε %s;"
 
-#: js/viewfeed.js:929
+#: js/viewfeed.js:931
 #, fuzzy, perl-format
 msgid "Delete %d selected article?"
 msgid_plural "Delete %d selected articles?"
 msgstr[0] "Ενεργοποίηση επιλεγμένου προφίλ;"
 msgstr[1] "Ενεργοποίηση επιλεγμένου προφίλ;"
 
-#: js/viewfeed.js:966
+#: js/viewfeed.js:968
 #, fuzzy, perl-format
 msgid "Archive %d selected article in %s?"
 msgid_plural "Archive %d selected articles in %s?"
 msgstr[0] "Αρχειοθετημένα άρθρα"
 msgstr[1] "Αρχειοθετημένα άρθρα"
 
-#: js/viewfeed.js:969
+#: js/viewfeed.js:971
 #, fuzzy, perl-format
 msgid "Move %d archived article back?"
 msgid_plural "Move %d archived articles back?"
 msgstr[0] "Αρχειοθετημένα άρθρα"
 msgstr[1] "Αρχειοθετημένα άρθρα"
 
-#: js/viewfeed.js:971
+#: js/viewfeed.js:973
 msgid "Please note that unstarred articles might get purged on next feed update."
 msgstr ""
 
-#: js/viewfeed.js:1011
+#: js/viewfeed.js:1013
 #, perl-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/viewfeed.js:1031
+#: js/viewfeed.js:1033
 msgid "Edit article Tags"
 msgstr "Επεξεργασία ετικετών άρθρου"
 
-#: js/viewfeed.js:1037
+#: js/viewfeed.js:1039
 msgid "Saving article tags..."
 msgstr "Γίνεται αποθήκευση ετικετών άρθρου..."
 
-#: js/viewfeed.js:1670
+#: js/viewfeed.js:1672
 msgid "Open original article"
 msgstr "Άνοιγμα πρωτότυπου άρθρου"
 
-#: js/viewfeed.js:1677
+#: js/viewfeed.js:1679
 msgid "Display article URL"
 msgstr "Εμφάνιση URL άρθρου"
 
-#: js/viewfeed.js:1787
+#: js/viewfeed.js:1789
 msgid "Assign label"
 msgstr "Ανάθεση ετικέτας"
 
-#: js/viewfeed.js:1792
+#: js/viewfeed.js:1794
 msgid "Remove label"
 msgstr "Αφαίρεση ετικέτας"
 
-#: js/viewfeed.js:1824
+#: js/viewfeed.js:1826
 msgid "Select articles in group"
 msgstr "Επιλογή άρθρων σε ομάδα"
 
-#: js/viewfeed.js:1834
+#: js/viewfeed.js:1836
 msgid "Mark group as read"
 msgstr "Σήμανση ομάδας ως αναγνωσμένη"
 
-#: js/viewfeed.js:1846
+#: js/viewfeed.js:1848
 msgid "Mark feed as read"
 msgstr "Σήμανση ροής ως αναγνωσμένη"
 
-#: js/viewfeed.js:1899
+#: js/viewfeed.js:1901
 #, fuzzy
 msgid "Please enter new score for selected articles:"
 msgstr "Εισάγετε τίτλο κατηγορίας:"
 
-#: js/viewfeed.js:1962
+#: js/viewfeed.js:1964
 #, fuzzy
 msgid "Please enter new score for this article:"
 msgstr "Εισάγετε τίτλο κατηγορίας:"
 
-#: js/viewfeed.js:1993
+#: js/viewfeed.js:1995
 msgid "Article URL:"
 msgstr "URL άρθρου:"
 
-#: plugins/instances/instances.js:10
-msgid "Link Instance"
-msgstr "Παράδειγμα Συνδέσμου"
-
-#: plugins/instances/instances.js:73
-msgid "Edit Instance"
-msgstr "Παράδειγμα Επεξεργασίας"
-
-#: plugins/instances/instances.js:122
-msgid "Remove selected instances?"
-msgstr "Αφαίρεση επιλεγμένων παραδειγμάτων;"
-
-#: plugins/instances/instances.js:125
-msgid "Removing selected instances..."
-msgstr "Γίνεται αφαίρεση επιλεγμένων παραδειγμάτων..."
-
-#: plugins/instances/instances.js:139
-#: plugins/instances/instances.js:151
-msgid "No instances are selected."
-msgstr "Δεν επιλέχθηκαν παραδείγματα."
-
-#: plugins/instances/instances.js:156
-#, fuzzy
-msgid "Please select only one instance."
-msgstr "Αφαίρεση επιλεγμένων παραδειγμάτων;"
-
-#: plugins/note/note.js:17
-msgid "Saving article note..."
-msgstr "Γίνεται αποθήκευση σημείωσης..."
-
-#: plugins/af_psql_trgm/init.js:11
-#, fuzzy
-msgid "Related articles"
-msgstr "Κοινόχρηστα άρθρα"
+#: plugins/embed_original/init.js:6
+msgid "Sorry, your browser does not support sandboxed iframes."
+msgstr ""
 
 #: plugins/import_export/import_export.js:13
 msgid "Export Data"
@@ -3332,11 +3217,16 @@ msgstr "Εισαγωγή Δεδομένων"
 msgid "Please choose the file first."
 msgstr ""
 
-#: plugins/mail/mail.js:21
 #: plugins/mailto/init.js:21
+#: plugins/mail/mail.js:21
 msgid "Forward article by email"
 msgstr "Προώθηση άρθρου μέσω e-mail"
 
+#: plugins/af_psql_trgm/init.js:11
+#, fuzzy
+msgid "Related articles"
+msgstr "Κοινόχρηστα άρθρα"
+
 #: plugins/mail/mail.js:36
 msgid "Error sending email:"
 msgstr ""
@@ -3345,10 +3235,6 @@ msgstr ""
 msgid "Your message has been sent."
 msgstr ""
 
-#: plugins/embed_original/init.js:6
-msgid "Sorry, your browser does not support sandboxed iframes."
-msgstr ""
-
 #: plugins/shorten_expanded/init.js:39
 msgid "Click to expand article"
 msgstr "Κάντε κλικ για επέκταση άρθρου"
@@ -3378,7 +3264,7 @@ msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr ""
 
 #: plugins/share/share_prefs.js:6
-#: js/prefs.js:1437
+#: js/prefs.js:1433
 msgid "Clearing URLs..."
 msgstr "Απαλοιφή των URL..."
 
@@ -3386,27 +3272,45 @@ msgstr "Απαλοιφή των URL..."
 msgid "Shared URLs cleared."
 msgstr "Έγινε απαλοιφή των κοινόχρηστων URL."
 
+#: plugins/note/note.js:17
+msgid "Saving article note..."
+msgstr "Γίνεται αποθήκευση σημείωσης..."
+
 #: js/feedlist.js:429
-#: js/feedlist.js:496
 #, fuzzy
 msgid "Mark all articles in %s as read?"
 msgstr "Αναβαθμολόγηση άρθρων σε %s;"
 
 #: js/feedlist.js:487
 #, fuzzy
-msgid "Mark all articles in %s older than 1 day as read?"
+msgid "Mark %w in %s older than 1 day as read?"
 msgstr "Αναβαθμολόγηση άρθρων σε %s;"
 
 #: js/feedlist.js:490
 #, fuzzy
-msgid "Mark all articles in %s older than 1 week as read?"
+msgid "Mark %w in %s older than 1 week as read?"
 msgstr "Αναβαθμολόγηση άρθρων σε %s;"
 
 #: js/feedlist.js:493
 #, fuzzy
-msgid "Mark all articles in %s older than 2 weeks as read?"
+msgid "Mark %w in %s older than 2 weeks as read?"
+msgstr "Αναβαθμολόγηση άρθρων σε %s;"
+
+#: js/feedlist.js:496
+#, fuzzy
+msgid "Mark %w in %s as read?"
 msgstr "Αναβαθμολόγηση άρθρων σε %s;"
 
+#: js/feedlist.js:499
+#, fuzzy
+msgid "search results"
+msgstr "Αποτελέσματα αναζήτησης: %s"
+
+#: js/feedlist.js:499
+#, fuzzy
+msgid "all articles"
+msgstr "Όλα τα άρθρα"
+
 #: js/functions.js:506
 msgid "Error explained"
 msgstr "Επεξήγηση σφάλματος"
@@ -3490,181 +3394,236 @@ msgstr "Εγγεγραμμένος σε %s"
 msgid "Edit rule"
 msgstr "Επεξεργασία κανόνα"
 
-#: js/functions.js:1402
+#: js/functions.js:1381
 msgid "Edit Feed"
 msgstr "Επεξεργασία Ροής"
 
-#: js/functions.js:1435
+#: js/functions.js:1414
 msgid "More Feeds"
 msgstr "Περισσότερες Ροές"
 
-#: js/functions.js:1631
+#: js/functions.js:1610
 msgid "Help"
 msgstr "Βοήθεια"
 
-#: js/prefs.js:1032
+#: js/prefs.js:1028
 msgid "Remove category %s? Any nested feeds would be placed into Uncategorized."
 msgstr ""
 
-#: js/prefs.js:1038
+#: js/prefs.js:1034
 msgid "Removing category..."
 msgstr "Αφαίρεση κατηγορίας σε εξέλιξη..."
 
-#: js/prefs.js:1056
+#: js/prefs.js:1052
 msgid "Remove selected categories?"
 msgstr "Αφαίρεση επιλεγμένων κατηγοριών;"
 
-#: js/prefs.js:1059
+#: js/prefs.js:1055
 msgid "Removing selected categories..."
 msgstr "Αφαίρεση επιλεγμένων κατηγοριών σε εξέλιξη..."
 
-#: js/prefs.js:1072
+#: js/prefs.js:1068
 msgid "No categories are selected."
 msgstr "Δεν επιλέχθηκαν κατηγορίες."
 
-#: js/prefs.js:1079
+#: js/prefs.js:1075
 msgid "Category title:"
 msgstr "Τίτλος κατηγορίας:"
 
-#: js/prefs.js:1083
+#: js/prefs.js:1079
 msgid "Creating category..."
 msgstr "Δημιουργία κατηγορίας σε εξέλιξη..."
 
-#: js/prefs.js:1106
+#: js/prefs.js:1102
 msgid "Feeds without recent updates"
 msgstr "Ροές χωρίς πρόσφατες ενημερώσεις"
 
-#: js/prefs.js:1150
+#: js/prefs.js:1146
 msgid "Replace current OPML publishing address with a new one?"
 msgstr ""
 
-#: js/prefs.js:1227
+#: js/prefs.js:1223
 msgid "Clearing feed..."
 msgstr "Απαλοιφή ροής σε εξέλιξη..."
 
-#: js/prefs.js:1247
+#: js/prefs.js:1243
 #, fuzzy
 msgid "Rescore articles in selected feeds?"
 msgstr "Αναβαθμολόγηση άρθρων σε %s;"
 
-#: js/prefs.js:1250
+#: js/prefs.js:1246
 msgid "Rescoring selected feeds..."
 msgstr "Εκ νέου βαθμολόγηση επιλεγμένων ροών σε εξέλιξη..."
 
-#: js/prefs.js:1270
+#: js/prefs.js:1266
 msgid "Rescore all articles? This operation may take a lot of time."
 msgstr ""
 
-#: js/prefs.js:1273
+#: js/prefs.js:1269
 msgid "Rescoring feeds..."
 msgstr "Εκ νέου βαθμολόγηση ροών σε εξέλιξη..."
 
-#: js/prefs.js:1289
+#: js/prefs.js:1285
 #, fuzzy
 msgid "Reset selected labels to default colors?"
 msgstr "Αφαίρεση επιλεγμένων ετικετών;"
 
-#: js/prefs.js:1321
+#: js/prefs.js:1317
 msgid "Settings Profiles"
 msgstr "Προφίλ Ρυθμίσεων"
 
-#: js/prefs.js:1330
+#: js/prefs.js:1326
 msgid "Remove selected profiles? Active and default profiles will not be removed."
 msgstr ""
 
-#: js/prefs.js:1333
+#: js/prefs.js:1329
 msgid "Removing selected profiles..."
 msgstr "Αφαίρεση επιλεγμένων φίλτρων σε εξέλιξη..."
 
-#: js/prefs.js:1349
+#: js/prefs.js:1345
 msgid "No profiles are selected."
 msgstr "Δεν επιλέχθηκαν προφίλ."
 
-#: js/prefs.js:1357
-#: js/prefs.js:1410
+#: js/prefs.js:1353
+#: js/prefs.js:1406
 msgid "Activate selected profile?"
 msgstr "Ενεργοποίηση επιλεγμένου προφίλ;"
 
-#: js/prefs.js:1374
-#: js/prefs.js:1426
+#: js/prefs.js:1370
+#: js/prefs.js:1422
 msgid "Please choose a profile to activate."
 msgstr ""
 
-#: js/prefs.js:1379
+#: js/prefs.js:1375
 msgid "Creating profile..."
 msgstr "Δημιουργία προφίλ σε εξέλιξη..."
 
-#: js/prefs.js:1434
+#: js/prefs.js:1430
 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr ""
 
-#: js/prefs.js:1444
+#: js/prefs.js:1440
 msgid "Generated URLs cleared."
 msgstr "Έγινε απαλοιφή των URL που παρήχθησαν."
 
-#: js/prefs.js:1516
+#: js/prefs.js:1512
 msgid "Label Editor"
 msgstr "Επεξεργαστής Ετικέτας"
 
-#: js/tt-rss.js:684
+#: js/tt-rss.js:685
 msgid "You can't unsubscribe from the category."
 msgstr ""
 
-#: js/viewfeed.js:125
-#: js/viewfeed.js:175
-#: js/viewfeed.js:192
+#: js/viewfeed.js:127
+#: js/viewfeed.js:177
+#: js/viewfeed.js:194
 #, fuzzy
 msgid "Click to open next unread feed."
 msgstr "Κάντε κλικ για επεξεργασία ροής"
 
-#: js/viewfeed.js:129
+#: js/viewfeed.js:131
 msgid "Cancel search"
 msgstr "Ακύρωση αναζήτησης"
 
-#: js/viewfeed.js:189
+#: js/viewfeed.js:191
 msgid "New articles found, reload feed to continue."
 msgstr ""
 
-#: js/viewfeed.js:424
+#: js/viewfeed.js:426
 msgid "Unstar article"
 msgstr "Απαλοιφή αστεριού σε άρθρο"
 
-#: js/viewfeed.js:428
+#: js/viewfeed.js:430
 msgid "Star article"
 msgstr "Προσθήκη αστεριού σε άρθρο"
 
-#: js/viewfeed.js:478
+#: js/viewfeed.js:480
 msgid "Unpublish article"
 msgstr "Κατάργηση δημοσίευσης άρθρου"
 
-#: js/viewfeed.js:482
+#: js/viewfeed.js:484
 msgid "Publish article"
 msgstr "Δημοσίευση άρθρου"
 
-#: js/viewfeed.js:622
+#: js/viewfeed.js:624
 #, fuzzy
 msgid "%d article selected"
 msgid_plural "%d articles selected"
 msgstr[0] "Δεν επιλέχθηκε άρθρο."
 msgstr[1] "Δεν επιλέχθηκε άρθρο."
 
-#: js/viewfeed.js:1286
+#: js/viewfeed.js:1288
 msgid "No article is selected."
 msgstr "Δεν επιλέχθηκε άρθρο."
 
-#: js/viewfeed.js:1321
+#: js/viewfeed.js:1323
 msgid "No articles found to mark"
 msgstr ""
 
-#: js/viewfeed.js:1323
+#: js/viewfeed.js:1325
 #, fuzzy
 msgid "Mark %d article as read?"
 msgid_plural "Mark %d articles as read?"
 msgstr[0] "Σήμανση παραπάνω ως αναγνωσμένα"
 msgstr[1] "Σήμανση παραπάνω ως αναγνωσμένα"
 
-#~ msgid "Cache images locally"
-#~ msgstr "Αποθήκευση εικόνων τοπικά"
+#~ msgid "Resubscribe to push updates"
+#~ msgstr "Επανάληψη εγγραφής για προώθηση ενημερώσεων"
+
+#~ msgid "Linked"
+#~ msgstr "Συνδεδεμένο"
+
+#~ msgid "Instance"
+#~ msgstr "Instance"
+
+#~ msgid "Instance URL"
+#~ msgstr "Instance URL"
+
+#~ msgid "Access key:"
+#~ msgstr "Κλειδί πρόσβασης:"
+
+#~ msgid "Access key"
+#~ msgstr "Κλειδί πρόσβασης"
+
+#~ msgid "Generate new key"
+#~ msgstr "Παραγωγή νέου κλειδιού"
+
+#~ msgid "Link instance"
+#~ msgstr "Σύνδεσμος instance"
+
+#~ msgid "Last connected"
+#~ msgstr "Τελευταία σύνδεση"
+
+#~ msgid "Status"
+#~ msgstr "Κατάσταση"
+
+#~ msgid "Stored feeds"
+#~ msgstr "Αποθηκευμένες ροές"
+
+#~ msgid "Create link"
+#~ msgstr "Δημιουργία συνδέσμου"
+
+#~ msgid "Subscription reset."
+#~ msgstr "Επαναφορά εγγραφής."
+
+#~ msgid "Link Instance"
+#~ msgstr "Παράδειγμα Συνδέσμου"
+
+#~ msgid "Edit Instance"
+#~ msgstr "Παράδειγμα Επεξεργασίας"
+
+#~ msgid "Remove selected instances?"
+#~ msgstr "Αφαίρεση επιλεγμένων παραδειγμάτων;"
+
+#~ msgid "Removing selected instances..."
+#~ msgstr "Γίνεται αφαίρεση επιλεγμένων παραδειγμάτων..."
+
+#~ msgid "No instances are selected."
+#~ msgstr "Δεν επιλέχθηκαν παραδείγματα."
+
+#, fuzzy
+#~ msgid "Please select only one instance."
+#~ msgstr "Αφαίρεση επιλεγμένων παραδειγμάτων;"
 
 #~ msgid "More..."
 #~ msgstr "Περισσότερα..."
diff --git a/locale/es_ES/LC_MESSAGES/messages.mo b/locale/es_ES/LC_MESSAGES/messages.mo
index 90300710e..d1b37bffd 100644
--- a/locale/es_ES/LC_MESSAGES/messages.mo
+++ b/locale/es_ES/LC_MESSAGES/messages.mo
diff --git a/locale/es_ES/LC_MESSAGES/messages.po b/locale/es_ES/LC_MESSAGES/messages.po
index 961c0644b..5293acbc8 100644
--- a/locale/es_ES/LC_MESSAGES/messages.po
+++ b/locale/es_ES/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tt-rss git\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 15:25+0300\n"
+"POT-Creation-Date: 2017-07-04 16:29+0300\n"
 "PO-Revision-Date: 2014-03-10 14:18+0100\n"
 "Last-Translator: DavidM <[email protected]>\n"
 "Language-Team: Español <[email protected]>\n"
@@ -172,31 +172,30 @@ msgstr "Usuario no encontrado"
 #: prefs.php:118
 #: classes/backend.php:5
 #: classes/pref/labels.php:282
-#: classes/pref/feeds.php:1402
-#: classes/pref/filters.php:779
+#: classes/pref/filters.php:819
+#: classes/pref/feeds.php:1376
 #: js/feedlist.js:149
-#: js/functions.js:1131
-#: js/functions.js:1231
-#: js/functions.js:1478
+#: js/functions.js:1210
+#: js/functions.js:1457
 #: js/prefs.js:621
-#: js/prefs.js:818
-#: js/prefs.js:1648
-#: js/prefs.js:1663
-#: js/tt-rss.js:550
-#: js/viewfeed.js:1182
+#: js/prefs.js:813
+#: js/prefs.js:1644
+#: js/prefs.js:1659
+#: js/tt-rss.js:551
+#: js/viewfeed.js:1184
 #: plugins/import_export/import_export.js:17
 #: js/feedlist.js:467
-#: js/feedlist.js:512
+#: js/feedlist.js:515
 #: js/functions.js:372
 #: js/functions.js:630
-#: js/prefs.js:1360
-#: js/prefs.js:1413
-#: js/prefs.js:1452
-#: js/prefs.js:1465
-#: js/prefs.js:1476
-#: js/prefs.js:1491
-#: js/tt-rss.js:567
-#: js/viewfeed.js:762
+#: js/prefs.js:1356
+#: js/prefs.js:1409
+#: js/prefs.js:1448
+#: js/prefs.js:1461
+#: js/prefs.js:1472
+#: js/prefs.js:1487
+#: js/tt-rss.js:568
+#: js/viewfeed.js:764
 msgid "Loading, please wait..."
 msgstr "Cargando. Por favor, espere..."
 
@@ -213,13 +212,13 @@ msgid "All Articles"
 msgstr "Todos"
 
 #: index.php:192
-#: include/functions2.php:107
+#: include/functions.php:1181
 #: classes/feeds.php:110
 msgid "Starred"
 msgstr "Favoritos"
 
 #: index.php:193
-#: include/functions2.php:108
+#: include/functions.php:1182
 #: classes/feeds.php:111
 msgid "Published"
 msgstr "Publicados"
@@ -260,7 +259,7 @@ msgstr "Título"
 
 #: index.php:209
 #: index.php:249
-#: include/functions2.php:95
+#: include/functions.php:1169
 #: classes/feeds.php:115
 #: js/FeedTree.js:138
 #: js/FeedTree.js:166
@@ -300,7 +299,7 @@ msgid "Feed actions:"
 msgstr "Acciones de la fuente:"
 
 #: index.php:244
-#: classes/handler/public.php:672
+#: classes/handler/public.php:583
 msgid "Subscribe to feed..."
 msgstr "Suscribirse a una fuente..."
 
@@ -314,8 +313,8 @@ msgstr "Reiniciar la puntuación"
 
 #: index.php:247
 #: classes/pref/feeds.php:785
-#: classes/pref/feeds.php:1357
-#: js/PrefFeedTree.js:78
+#: classes/pref/feeds.php:1331
+#: js/PrefFeedTree.js:80
 msgid "Unsubscribe"
 msgstr "Cancelar la suscripción"
 
@@ -332,7 +331,7 @@ msgid "Other actions:"
 msgstr "Otras acciones:"
 
 #: index.php:252
-#: include/functions2.php:81
+#: include/functions.php:1155
 msgid "Toggle widescreen mode"
 msgstr "Alternar modo de pantalla ancha"
 
@@ -358,7 +357,7 @@ msgstr ""
 
 #: prefs.php:33
 #: prefs.php:136
-#: include/functions2.php:110
+#: include/functions.php:1184
 #: classes/pref/prefs.php:435
 msgid "Preferences"
 msgstr "Preferencias"
@@ -373,20 +372,19 @@ msgstr "Salir de las preferencias"
 
 #: prefs.php:139
 #: classes/pref/feeds.php:112
-#: classes/pref/feeds.php:1297
-#: classes/pref/feeds.php:1346
+#: classes/pref/feeds.php:1271
+#: classes/pref/feeds.php:1320
 msgid "Feeds"
 msgstr "Fuentes"
 
 #: prefs.php:142
-#: classes/pref/filters.php:248
+#: classes/pref/filters.php:273
 msgid "Filters"
 msgstr "Filtros"
 
 #: prefs.php:145
-#: include/functions.php:1327
-#: include/functions.php:1979
 #: classes/pref/labels.php:90
+#: classes/feeds.php:1718
 msgid "Labels"
 msgstr "Marcadores"
 
@@ -415,13 +413,13 @@ msgstr "El registro de nuevos usuarios ha sido deshabilitado por el administrado
 #: register.php:337
 #: register.php:347
 #: register.php:359
-#: classes/handler/public.php:742
-#: classes/handler/public.php:813
-#: classes/handler/public.php:911
-#: classes/handler/public.php:990
-#: classes/handler/public.php:1004
-#: classes/handler/public.php:1011
-#: classes/handler/public.php:1036
+#: classes/handler/public.php:653
+#: classes/handler/public.php:724
+#: classes/handler/public.php:822
+#: classes/handler/public.php:901
+#: classes/handler/public.php:915
+#: classes/handler/public.php:922
+#: classes/handler/public.php:947
 msgid "Return to Tiny Tiny RSS"
 msgstr "Volver a Tiny Tiny RSS"
 
@@ -438,12 +436,12 @@ msgid "Check availability"
 msgstr "Comprobar la disponibilidad"
 
 #: register.php:229
-#: classes/handler/public.php:829
+#: classes/handler/public.php:740
 msgid "Email:"
 msgstr "Correo electrónico:"
 
 #: register.php:232
-#: classes/handler/public.php:834
+#: classes/handler/public.php:745
 msgid "How much is two plus two:"
 msgstr "¿Cuánto es dos más dos?"
 
@@ -471,17 +469,23 @@ msgstr "Cuenta creada correctamente."
 msgid "New user registrations are currently closed."
 msgstr "El registro de nuevos usuarios está cerrado en estos momentos."
 
-#: update.php:67
+#: update.php:66
 msgid "Tiny Tiny RSS data update script."
 msgstr "Script para actualizar datos de Tiny Tiny RSS."
 
-#: include/digest.php:109
-#: include/functions.php:1336
-#: include/functions.php:1880
-#: include/functions.php:1965
-#: include/functions.php:1987
-#: classes/opml.php:421
+#: include/controls.php:83
+#: classes/pref/filters.php:242
+#: classes/pref/filters.php:253
+#: classes/pref/filters.php:544
+msgid "All feeds"
+msgstr "Todas las fuentes"
+
+#: include/controls.php:134
+#: include/controls.php:316
 #: classes/pref/feeds.php:228
+#: classes/opml.php:486
+#: classes/feeds.php:1727
+#: classes/digest.php:113
 msgid "Uncategorized"
 msgstr "Sin clasificar"
 
@@ -496,391 +500,287 @@ msgstr[1] "%d artículos archivados"
 msgid "No feeds found."
 msgstr "No se han encontrado fuentes."
 
-#: include/functions.php:1029
+#: include/functions.php:900
 #, php-format
 msgid "%d min"
 msgstr ""
 
-#: include/functions.php:1325
-#: include/functions.php:1977
-msgid "Special"
-msgstr "Especial"
-
-#: include/functions.php:1828
-#: classes/pref/filters.php:229
-#: classes/pref/filters.php:507
-msgid "All feeds"
-msgstr "Todas las fuentes"
-
-#: include/functions.php:2032
-msgid "Starred articles"
-msgstr "Favoritos"
-
-#: include/functions.php:2034
-msgid "Published articles"
-msgstr "Publicados"
-
-#: include/functions.php:2036
-msgid "Fresh articles"
-msgstr "Recientes"
-
-#: include/functions.php:2038
-#: include/functions2.php:105
-msgid "All articles"
-msgstr "Todos"
-
-#: include/functions.php:2040
-msgid "Archived articles"
-msgstr "Artículos archivados"
-
-#: include/functions.php:2042
-msgid "Recently read"
-msgstr "Leídos recientemente"
-
-#: include/functions2.php:57
+#: include/functions.php:1131
 msgid "Navigation"
 msgstr "Navegación"
 
-#: include/functions2.php:58
+#: include/functions.php:1132
 msgid "Open next feed"
 msgstr "Abrir la fuente siguiente"
 
-#: include/functions2.php:59
+#: include/functions.php:1133
 msgid "Open previous feed"
 msgstr "Abrir la fuente siguiente"
 
-#: include/functions2.php:60
+#: include/functions.php:1134
 msgid "Open next article"
 msgstr "Abrir el artículo siguiente"
 
-#: include/functions2.php:61
+#: include/functions.php:1135
 msgid "Open previous article"
 msgstr "Abrir el artículo anterior"
 
-#: include/functions2.php:62
+#: include/functions.php:1136
 msgid "Open next article (don't scroll long articles)"
 msgstr "Abrir artículo siguiente (no desplazar artículos largos)"
 
-#: include/functions2.php:63
+#: include/functions.php:1137
 msgid "Open previous article (don't scroll long articles)"
 msgstr "Abrir artículo anterior (no desplazar artículos largos)"
 
-#: include/functions2.php:64
+#: include/functions.php:1138
 msgid "Move to next article (don't expand or mark read)"
 msgstr "Ir al artículo siguiente (no expandir ni marcar como leído)"
 
-#: include/functions2.php:65
+#: include/functions.php:1139
 msgid "Move to previous article (don't expand or mark read)"
 msgstr "Ir al artículo anterior (no expandir ni marcar como leído)"
 
-#: include/functions2.php:66
+#: include/functions.php:1140
 msgid "Show search dialog"
 msgstr "Mostrar el diálogo de búsqueda"
 
-#: include/functions2.php:67
+#: include/functions.php:1141
 msgid "Article"
 msgstr "Artículo"
 
-#: include/functions2.php:68
-#: js/viewfeed.js:1699
+#: include/functions.php:1142
+#: js/viewfeed.js:1701
 msgid "Toggle starred"
 msgstr "Alternar favoritos"
 
-#: include/functions2.php:69
-#: js/viewfeed.js:1711
+#: include/functions.php:1143
+#: js/viewfeed.js:1713
 msgid "Toggle published"
 msgstr "Alternar publicados"
 
-#: include/functions2.php:70
-#: js/viewfeed.js:1686
+#: include/functions.php:1144
+#: js/viewfeed.js:1688
 msgid "Toggle unread"
 msgstr "Alternar sin leer"
 
-#: include/functions2.php:71
+#: include/functions.php:1145
 msgid "Edit tags"
 msgstr "Editar etiquetas"
 
-#: include/functions2.php:72
+#: include/functions.php:1146
 msgid "Open in new window"
 msgstr "Abrir en ventana nueva"
 
-#: include/functions2.php:73
-#: js/viewfeed.js:1732
+#: include/functions.php:1147
+#: js/viewfeed.js:1734
 msgid "Mark below as read"
 msgstr "Marcar artículos posteriores como leídos"
 
-#: include/functions2.php:74
-#: js/viewfeed.js:1725
+#: include/functions.php:1148
+#: js/viewfeed.js:1727
 msgid "Mark above as read"
 msgstr "Marcar artículos anteriores como leídos"
 
-#: include/functions2.php:75
+#: include/functions.php:1149
 msgid "Scroll down"
 msgstr "Desplazarse abajo"
 
-#: include/functions2.php:76
+#: include/functions.php:1150
 msgid "Scroll up"
 msgstr "Desplazarse hacia arriba"
 
-#: include/functions2.php:77
+#: include/functions.php:1151
 msgid "Select article under cursor"
 msgstr "Seleccionar el artículo que esté bajo el cursor del ratón"
 
-#: include/functions2.php:78
+#: include/functions.php:1152
 msgid "Email article"
 msgstr "Enviar artículo por correo"
 
-#: include/functions2.php:79
+#: include/functions.php:1153
 msgid "Close/collapse article"
 msgstr "Cerrar/plegar artículo"
 
-#: include/functions2.php:80
+#: include/functions.php:1154
 msgid "Toggle article expansion (combined mode)"
 msgstr "Alternar expansión de los artículos (modo combinado)"
 
-#: include/functions2.php:82
+#: include/functions.php:1156
 #: plugins/embed_original/init.php:31
 msgid "Toggle embed original"
 msgstr "Alternar incrustación del artículo original"
 
-#: include/functions2.php:83
+#: include/functions.php:1157
 msgid "Article selection"
 msgstr "Selección de artículos"
 
-#: include/functions2.php:84
+#: include/functions.php:1158
 msgid "Select all articles"
 msgstr "Seleccionar todos los artículos"
 
-#: include/functions2.php:85
+#: include/functions.php:1159
 msgid "Select unread"
 msgstr "Seleccionar artículos sin leer"
 
-#: include/functions2.php:86
+#: include/functions.php:1160
 msgid "Select starred"
 msgstr "Seleccionar artículos favoritos"
 
-#: include/functions2.php:87
+#: include/functions.php:1161
 msgid "Select published"
 msgstr "Seleccionar artículos publicados"
 
-#: include/functions2.php:88
+#: include/functions.php:1162
 msgid "Invert selection"
 msgstr "Invertir selección "
 
-#: include/functions2.php:89
+#: include/functions.php:1163
 msgid "Deselect everything"
 msgstr "Deseleccionar todo"
 
-#: include/functions2.php:90
+#: include/functions.php:1164
 #: classes/pref/feeds.php:555
-#: classes/pref/feeds.php:823
+#: classes/pref/feeds.php:811
 msgid "Feed"
 msgstr "Fuente"
 
-#: include/functions2.php:91
+#: include/functions.php:1165
 msgid "Refresh current feed"
 msgstr "Actualizar la fuente activa"
 
-#: include/functions2.php:92
+#: include/functions.php:1166
 msgid "Un/hide read feeds"
 msgstr "Ocultar/Mostrar fuentes leídas"
 
-#: include/functions2.php:93
-#: classes/pref/feeds.php:1349
+#: include/functions.php:1167
+#: classes/pref/feeds.php:1323
 msgid "Subscribe to feed"
 msgstr "Suscribirse a una fuente"
 
-#: include/functions2.php:94
+#: include/functions.php:1168
 #: js/FeedTree.js:145
-#: js/PrefFeedTree.js:72
-#: js/viewfeed.js:1853
+#: js/PrefFeedTree.js:74
+#: js/viewfeed.js:1855
 msgid "Edit feed"
 msgstr "Editar fuente"
 
-#: include/functions2.php:96
+#: include/functions.php:1170
 msgid "Reverse headlines"
 msgstr "Invertir orden de titulares"
 
-#: include/functions2.php:97
+#: include/functions.php:1171
 msgid "Toggle headline grouping"
 msgstr ""
 
-#: include/functions2.php:98
+#: include/functions.php:1172
 msgid "Debug feed update"
 msgstr "Depurar la actualización de fuentes"
 
-#: include/functions2.php:99
+#: include/functions.php:1173
 #, fuzzy
 msgid "Debug viewfeed()"
 msgstr "Depurar la actualización de fuentes"
 
-#: include/functions2.php:100
+#: include/functions.php:1174
 #: js/FeedTree.js:194
 msgid "Mark all feeds as read"
 msgstr "Marcar todas las fuentes como leídas"
 
-#: include/functions2.php:101
+#: include/functions.php:1175
 msgid "Un/collapse current category"
 msgstr "Desplegar/plegar la categoría"
 
-#: include/functions2.php:102
+#: include/functions.php:1176
 msgid "Toggle combined mode"
 msgstr "Alternar modo combinado"
 
-#: include/functions2.php:103
+#: include/functions.php:1177
 msgid "Toggle auto expand in combined mode"
 msgstr "Expandir automáticamente los artículos en el modo combinado"
 
-#: include/functions2.php:104
+#: include/functions.php:1178
 msgid "Go to"
 msgstr "Ir a"
 
-#: include/functions2.php:106
+#: include/functions.php:1179
+#: classes/feeds.php:1602
+msgid "All articles"
+msgstr "Todos"
+
+#: include/functions.php:1180
 msgid "Fresh"
 msgstr "Reciente"
 
-#: include/functions2.php:109
-#: js/tt-rss.js:494
-#: js/tt-rss.js:663
+#: include/functions.php:1183
+#: js/tt-rss.js:495
+#: js/tt-rss.js:664
 msgid "Tag cloud"
 msgstr "Nube de etiquetas"
 
-#: include/functions2.php:111
+#: include/functions.php:1185
 msgid "Other"
 msgstr "Otro"
 
-#: include/functions2.php:112
+#: include/functions.php:1186
 #: classes/pref/labels.php:267
 msgid "Create label"
 msgstr "Crear marcador"
 
-#: include/functions2.php:113
-#: classes/pref/filters.php:753
+#: include/functions.php:1187
+#: classes/pref/filters.php:793
 msgid "Create filter"
 msgstr "Crear filtro"
 
-#: include/functions2.php:114
+#: include/functions.php:1188
 msgid "Un/collapse sidebar"
 msgstr "Mostrar/ocultar la barra lateral"
 
-#: include/functions2.php:115
+#: include/functions.php:1189
 msgid "Show help dialog"
 msgstr "Mostrar el diálogo de ayuda"
 
-#: include/functions2.php:670
-#, php-format
-msgid "Search results: %s"
-msgstr "Resultados de búsqueda: %s"
-
-#: include/functions2.php:1336
-#: classes/feeds.php:752
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] "comentario"
-msgstr[1] "comentarios"
-
-#: include/functions2.php:1340
-#: classes/feeds.php:756
-msgid "comments"
-msgstr "comentarios"
-
-#: include/functions2.php:1366
-msgid " - "
-msgstr " - "
-
-#: include/functions2.php:1397
-#: include/functions2.php:1648
-#: classes/article.php:311
-msgid "no tags"
-msgstr "sin etiquetas"
-
-#: include/functions2.php:1407
-#: classes/feeds.php:738
-msgid "Edit tags for this article"
-msgstr "Editar las etiquetas de este artículo"
-
-#: include/functions2.php:1439
-#: classes/feeds.php:690
-msgid "Originally from:"
-msgstr "Original de:"
-
-#: include/functions2.php:1452
-#: classes/pref/feeds.php:574
-#: classes/feeds.php:703
-msgid "Feed URL"
-msgstr "URL de la fuente"
-
-#: include/functions2.php:1489
-#: classes/backend.php:105
-#: classes/dlg.php:37
-#: classes/dlg.php:60
-#: classes/dlg.php:93
-#: classes/dlg.php:159
-#: classes/dlg.php:186
-#: classes/pref/feeds.php:1652
-#: classes/pref/feeds.php:1718
-#: classes/pref/filters.php:204
-#: classes/pref/prefs.php:1097
-#: plugins/af_psql_trgm/init.php:102
-#: plugins/import_export/init.php:415
-#: plugins/import_export/init.php:461
-#: plugins/share/init.php:121
-msgid "Close this window"
-msgstr "Cerrar esta ventana"
-
-#: include/functions2.php:1686
-msgid "(edit note)"
-msgstr "(editar nota)"
-
-#: include/functions2.php:1960
-msgid "unknown type"
-msgstr "tipo desconocido"
-
-#: include/functions2.php:2037
-msgid "Attachments"
-msgstr "Adjuntos"
-
-#: include/functions2.php:2496
+#: include/functions.php:2456
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: include/functions2.php:2497
+#: include/functions.php:2457
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: include/functions2.php:2498
+#: include/functions.php:2458
 msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
 msgstr ""
 
-#: include/functions2.php:2499
+#: include/functions.php:2459
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: include/functions2.php:2500
+#: include/functions.php:2460
 #, fuzzy
 msgid "No file was uploaded"
 msgstr "No se ha cargado ningún archivo."
 
-#: include/functions2.php:2501
+#: include/functions.php:2461
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: include/functions2.php:2502
+#: include/functions.php:2462
 msgid "Failed to write file to disk."
 msgstr ""
 
-#: include/functions2.php:2503
+#: include/functions.php:2463
 msgid "A PHP extension stopped the file upload."
 msgstr ""
 
 #: include/login_form.php:197
-#: classes/handler/public.php:569
-#: classes/handler/public.php:824
+#: classes/handler/public.php:480
+#: classes/handler/public.php:735
 msgid "Login:"
 msgstr "Nombre de usuario:"
 
 #: include/login_form.php:207
-#: classes/handler/public.php:572
+#: classes/handler/public.php:483
 msgid "Password:"
 msgstr "Contraseña:"
 
@@ -893,7 +793,7 @@ msgid "Profile:"
 msgstr "Perfil:"
 
 #: include/login_form.php:223
-#: classes/handler/public.php:311
+#: classes/handler/public.php:287
 #: classes/pref/prefs.php:1035
 #: classes/rpc.php:63
 msgid "Default profile"
@@ -912,7 +812,7 @@ msgid "Remember me"
 msgstr "Recordarme"
 
 #: include/login_form.php:249
-#: classes/handler/public.php:577
+#: classes/handler/public.php:488
 msgid "Log in"
 msgstr "Iniciar sesión"
 
@@ -928,145 +828,44 @@ msgstr "No se pudo validar la sesión (usuario no encontrado)"
 msgid "Session failed to validate (password changed)"
 msgstr "No se pudo validar la sesión (ha cambiado la contraseña)"
 
-#: classes/article.php:25
-msgid "Article not found."
-msgstr "Artículo no encontrado."
-
-#: classes/article.php:197
-msgid "Tags for this article (separated by commas):"
-msgstr "Etiquetas para este artículo (separadas por comas):"
-
-#: classes/article.php:222
-#: classes/pref/labels.php:79
-#: classes/pref/users.php:98
-#: classes/pref/feeds.php:801
-#: classes/pref/feeds.php:943
-#: classes/pref/filters.php:485
-#: classes/pref/prefs.php:981
-#: plugins/instances/init.php:245
-#: plugins/nsfw/init.php:85
-#: plugins/note/init.php:51
-#: plugins/af_readability/init.php:68
-#: plugins/af_redditimgur/init.php:60
-#: plugins/af_psql_trgm/init.php:181
-#: plugins/mail/init.php:64
-#: plugins/af_zz_imgproxy/init.php:213
-msgid "Save"
-msgstr "Guardar"
-
-#: classes/article.php:224
-#: classes/handler/public.php:546
-#: classes/handler/public.php:580
-#: classes/pref/labels.php:81
-#: classes/pref/users.php:100
-#: classes/pref/feeds.php:802
-#: classes/pref/feeds.php:946
-#: classes/pref/feeds.php:1859
-#: classes/pref/filters.php:488
-#: classes/pref/filters.php:902
-#: classes/pref/filters.php:983
-#: classes/pref/filters.php:1076
-#: classes/pref/prefs.php:983
-#: classes/feeds.php:1105
-#: classes/feeds.php:1155
-#: classes/feeds.php:1192
-#: plugins/instances/init.php:248
-#: plugins/instances/init.php:436
-#: plugins/note/init.php:53
-#: plugins/mail/init.php:173
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: classes/opml.php:28
-#: classes/opml.php:33
-msgid "OPML Utility"
-msgstr "Utilidad OPML"
-
-#: classes/opml.php:37
-msgid "Importing OPML..."
-msgstr "Importando OPML..."
-
-#: classes/opml.php:41
-msgid "Return to preferences"
-msgstr "Volver a las preferencias"
-
-#: classes/opml.php:271
-#, php-format
-msgid "Adding feed: %s"
-msgstr "Añadiendo fuente: %s"
-
-#: classes/opml.php:282
-#, php-format
-msgid "Duplicate feed: %s"
-msgstr "Duplicar fuente: %s"
-
-#: classes/opml.php:296
-#, php-format
-msgid "Adding label %s"
-msgstr "Añadiendo el marcador %s"
-
-#: classes/opml.php:299
-#, php-format
-msgid "Duplicate label: %s"
-msgstr "Duplicar marcador: %s"
-
-#: classes/opml.php:311
-#, php-format
-msgid "Setting preference key %s to %s"
-msgstr "Configurando la opción %s como %s"
-
-#: classes/opml.php:343
-msgid "Adding filter..."
-msgstr "Añadiendo filtro..."
-
-#: classes/opml.php:421
-#, php-format
-msgid "Processing category: %s"
-msgstr "Procesando categoría: %s"
-
-#: classes/opml.php:470
-#, php-format
-msgid "Upload failed with error code %d"
-msgstr "La subida falló con el código de error %d"
-
-#: classes/opml.php:484
-#: plugins/import_export/init.php:442
-msgid "Unable to move uploaded file."
-msgstr "No se pudo mover el archivo subido."
-
-#: classes/opml.php:488
-#: plugins/import_export/init.php:446
-msgid "Error: please upload OPML file."
-msgstr "Error: por favor, suba un fichero OPML."
-
-#: classes/opml.php:499
-msgid "Error: unable to find moved OPML file."
-msgstr "Error: no se pudo encontrar el fichero OPML movido."
-
-#: classes/opml.php:506
-msgid "Error while parsing document."
-msgstr "Error mientras se analizaba el documento."
-
-#: classes/backend.php:33
+#: classes/backend.php:31
 msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
 msgstr "Otros trucos están disponibles en el wiki de Tiny Tiny RSS."
 
-#: classes/backend.php:38
+#: classes/backend.php:36
 msgid "Keyboard Shortcuts"
 msgstr "Atajos de teclado"
 
-#: classes/backend.php:61
+#: classes/backend.php:59
 msgid "Shift"
 msgstr "Mayúsculas"
 
-#: classes/backend.php:64
+#: classes/backend.php:62
 msgid "Ctrl"
 msgstr "Ctrl"
 
-#: classes/backend.php:99
+#: classes/backend.php:97
 msgid "Help topic not found."
 msgstr "Tema de ayuda no encontrado."
 
+#: classes/backend.php:103
+#: classes/dlg.php:37
+#: classes/dlg.php:60
+#: classes/dlg.php:93
+#: classes/dlg.php:159
+#: classes/dlg.php:186
+#: classes/article.php:744
+#: classes/pref/filters.php:206
+#: classes/pref/prefs.php:1097
+#: classes/pref/feeds.php:1626
+#: classes/pref/feeds.php:1692
+#: plugins/import_export/init.php:421
+#: plugins/import_export/init.php:467
+#: plugins/af_psql_trgm/init.php:102
+#: plugins/share/init.php:120
+msgid "Close this window"
+msgstr "Cerrar esta ventana"
+
 #: classes/dlg.php:17
 msgid "If you have imported labels and/or filters, you might need to reload preferences to see your new data."
 msgstr "Si ha importado marcadores y/o filtros, puede ser necesario recargar las preferencia para ver sus nuevos datos."
@@ -1077,7 +876,7 @@ msgstr "La URL de su archivo OPML público es:"
 
 #: classes/dlg.php:57
 #: classes/dlg.php:183
-#: plugins/share/init.php:118
+#: plugins/share/init.php:117
 msgid "Generate new URL"
 msgstr "Generar URL nueva"
 
@@ -1098,128 +897,222 @@ msgstr "El demonio de actualización está tardando demasiado en realizar una ac
 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/handler/public.php:510
+#: classes/article.php:25
+msgid "Article not found."
+msgstr "Artículo no encontrado."
+
+#: classes/article.php:197
+msgid "Tags for this article (separated by commas):"
+msgstr "Etiquetas para este artículo (separadas por comas):"
+
+#: classes/article.php:222
+#: classes/pref/labels.php:79
+#: classes/pref/filters.php:519
+#: classes/pref/users.php:98
+#: classes/pref/prefs.php:981
+#: classes/pref/feeds.php:789
+#: classes/pref/feeds.php:931
+#: plugins/af_psql_trgm/init.php:181
+#: plugins/nsfw/init.php:85
+#: plugins/af_readability/init.php:68
+#: plugins/mail/init.php:64
+#: plugins/af_redditimgur/init.php:60
+#: plugins/note/init.php:51
+#: plugins/af_zz_imgproxy/init.php:240
+msgid "Save"
+msgstr "Guardar"
+
+#: classes/article.php:224
+#: classes/handler/public.php:457
+#: classes/handler/public.php:491
+#: classes/pref/labels.php:81
+#: classes/pref/filters.php:522
+#: classes/pref/filters.php:942
+#: classes/pref/filters.php:1022
+#: classes/pref/filters.php:1115
+#: classes/pref/users.php:100
+#: classes/pref/prefs.php:983
+#: classes/pref/feeds.php:790
+#: classes/pref/feeds.php:934
+#: classes/pref/feeds.php:1833
+#: classes/feeds.php:1098
+#: classes/feeds.php:1148
+#: classes/feeds.php:1185
+#: plugins/mail/init.php:173
+#: plugins/note/init.php:53
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: classes/article.php:311
+#: classes/article.php:652
+#: classes/article.php:805
+msgid "no tags"
+msgstr "sin etiquetas"
+
+#: classes/article.php:419
+msgid "unknown type"
+msgstr "tipo desconocido"
+
+#: classes/article.php:496
+msgid "Attachments"
+msgstr "Adjuntos"
+
+#: classes/article.php:591
+#: classes/feeds.php:741
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] "comentario"
+msgstr[1] "comentarios"
+
+#: classes/article.php:595
+#: classes/feeds.php:745
+msgid "comments"
+msgstr "comentarios"
+
+#: classes/article.php:621
+msgid " - "
+msgstr " - "
+
+#: classes/article.php:662
+#: classes/feeds.php:727
+msgid "Edit tags for this article"
+msgstr "Editar las etiquetas de este artículo"
+
+#: classes/article.php:694
+#: classes/feeds.php:681
+msgid "Originally from:"
+msgstr "Original de:"
+
+#: classes/article.php:707
+#: classes/pref/feeds.php:574
+#: classes/feeds.php:694
+msgid "Feed URL"
+msgstr "URL de la fuente"
+
+#: classes/article.php:843
+msgid "(edit note)"
+msgstr "(editar nota)"
+
+#: classes/handler/public.php:421
 #: plugins/bookmarklets/init.php:40
 msgid "Share with Tiny Tiny RSS"
 msgstr "Compartir con Tiny Tiny RSS"
 
-#: classes/handler/public.php:518
+#: classes/handler/public.php:429
 msgid "Title:"
 msgstr "Título:"
 
-#: classes/handler/public.php:520
+#: classes/handler/public.php:431
 #: classes/pref/feeds.php:572
-#: plugins/instances/init.php:212
-#: plugins/instances/init.php:401
 msgid "URL:"
 msgstr "URL:"
 
-#: classes/handler/public.php:522
+#: classes/handler/public.php:433
 msgid "Content:"
 msgstr "Contenido:"
 
-#: classes/handler/public.php:524
+#: classes/handler/public.php:435
 msgid "Labels:"
 msgstr "Marcadores:"
 
-#: classes/handler/public.php:543
+#: classes/handler/public.php:454
 msgid "Shared article will appear in the Published feed."
 msgstr "El artículo compartido aparecerá en la fuente Publicados."
 
-#: classes/handler/public.php:545
+#: classes/handler/public.php:456
 msgid "Share"
 msgstr "Compartir"
 
-#: classes/handler/public.php:567
+#: classes/handler/public.php:478
 msgid "Not logged in"
 msgstr "No ha iniciado sesión"
 
-#: classes/handler/public.php:626
+#: classes/handler/public.php:537
 msgid "Incorrect username or password"
 msgstr "Nombre de usuario o contraseña incorrecta"
 
-#: classes/handler/public.php:678
+#: classes/handler/public.php:589
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "Ya está suscrito a <strong>%s</strong>."
 
-#: classes/handler/public.php:681
+#: classes/handler/public.php:592
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "Suscrito a <strong>%s</strong>."
 
-#: classes/handler/public.php:684
+#: classes/handler/public.php:595
 #, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "No se pudo suscribir a <b>%s</b>."
 
-#: classes/handler/public.php:687
+#: classes/handler/public.php:598
 #, php-format
 msgid "No feeds found in <b>%s</b>."
 msgstr "No se han encontrado fuentes en <b>%s</b>."
 
-#: classes/handler/public.php:690
+#: classes/handler/public.php:601
 msgid "Multiple feed URLs found."
 msgstr "Múltiples fuentes encontradas."
 
-#: classes/handler/public.php:694
+#: classes/handler/public.php:605
 #, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr "No se pudo suscribir a <strong>%s</strong>. No se pudo descargar la fuente de su URL."
 
-#: classes/handler/public.php:712
+#: classes/handler/public.php:623
 msgid "Subscribe to selected feed"
 msgstr "Suscribirse a la fuente seleccionada"
 
-#: classes/handler/public.php:737
+#: classes/handler/public.php:648
 msgid "Edit subscription options"
 msgstr "Editar las opciones de suscripción"
 
-#: classes/handler/public.php:774
+#: classes/handler/public.php:685
 msgid "Password recovery"
 msgstr "Recuperación de contraseña"
 
-#: classes/handler/public.php:817
+#: classes/handler/public.php:728
 msgid "You will need to provide valid account name and email. A password reset link will be sent to your email address."
 msgstr "Se necesita que proporcione un nombre de usuario y correo electrónico válidos. Un enlace para crear una nueva contraseña será enviado a su correo electrónico."
 
-#: classes/handler/public.php:839
-#: classes/pref/users.php:350
+#: classes/handler/public.php:750
+#: classes/pref/users.php:349
 msgid "Reset password"
 msgstr "Redefinir contraseña"
 
-#: classes/handler/public.php:849
+#: classes/handler/public.php:760
 msgid "Some of the required form parameters are missing or incorrect."
 msgstr "Algunos de los parámetros necesarios son incorrectos o faltan."
 
-#: classes/handler/public.php:853
-#: classes/handler/public.php:919
+#: classes/handler/public.php:764
+#: classes/handler/public.php:830
 msgid "Go back"
 msgstr "Volver"
 
-#: classes/handler/public.php:890
+#: classes/handler/public.php:801
 msgid "[tt-rss] Password reset request"
 msgstr "[tt-rss] Petición de cambio de contraseña"
 
-#: classes/handler/public.php:915
+#: classes/handler/public.php:826
 msgid "Sorry, login and email combination not found."
 msgstr "Lo siento, combinación de usuario y correo electrónico incorrecta."
 
-#: classes/handler/public.php:937
+#: classes/handler/public.php:848
 msgid "Your access level is insufficient to run this script."
 msgstr "Su nivel de acceso es insuficiente para ejecutar este programa."
 
-#: classes/handler/public.php:963
+#: classes/handler/public.php:874
 msgid "Database Updater"
 msgstr "Actualizador de la base de datos"
 
-#: classes/handler/public.php:1028
+#: classes/handler/public.php:939
 msgid "Perform updates"
 msgstr "Actualizar"
 
 #: classes/pref/labels.php:22
-#: classes/pref/filters.php:348
-#: classes/pref/filters.php:823
+#: classes/pref/filters.php:373
+#: classes/pref/filters.php:863
 msgid "Caption"
 msgstr "Leyenda"
 
@@ -1241,59 +1134,55 @@ msgid "Created label <b>%s</b>"
 msgstr "Se ha creado la etiqueta <strong>%s</strong>"
 
 #: classes/pref/labels.php:258
-#: classes/pref/users.php:334
-#: classes/pref/feeds.php:1337
-#: classes/pref/feeds.php:1600
-#: classes/pref/feeds.php:1664
-#: classes/pref/filters.php:359
-#: classes/pref/filters.php:407
-#: classes/pref/filters.php:744
-#: classes/pref/filters.php:832
-#: classes/pref/filters.php:859
+#: classes/pref/filters.php:384
+#: classes/pref/filters.php:441
+#: classes/pref/filters.php:784
+#: classes/pref/filters.php:872
+#: classes/pref/filters.php:899
+#: classes/pref/users.php:333
 #: classes/pref/prefs.php:992
-#: plugins/instances/init.php:284
+#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1574
+#: classes/pref/feeds.php:1638
 msgid "Select"
 msgstr "Seleccionar"
 
 #: classes/pref/labels.php:261
-#: classes/pref/users.php:337
-#: classes/pref/feeds.php:1340
-#: classes/pref/feeds.php:1603
-#: classes/pref/feeds.php:1667
-#: classes/pref/filters.php:362
-#: classes/pref/filters.php:410
-#: classes/pref/filters.php:747
-#: classes/pref/filters.php:835
-#: classes/pref/filters.php:862
+#: classes/pref/filters.php:387
+#: classes/pref/filters.php:444
+#: classes/pref/filters.php:787
+#: classes/pref/filters.php:875
+#: classes/pref/filters.php:902
+#: classes/pref/users.php:336
 #: classes/pref/prefs.php:995
+#: classes/pref/feeds.php:1314
+#: classes/pref/feeds.php:1577
+#: classes/pref/feeds.php:1641
 #: classes/feeds.php:102
-#: plugins/instances/init.php:287
 msgid "All"
 msgstr "Todo"
 
 #: classes/pref/labels.php:263
-#: classes/pref/users.php:339
-#: classes/pref/feeds.php:1342
-#: classes/pref/feeds.php:1605
-#: classes/pref/feeds.php:1669
-#: classes/pref/filters.php:364
-#: classes/pref/filters.php:412
-#: classes/pref/filters.php:749
-#: classes/pref/filters.php:837
-#: classes/pref/filters.php:864
+#: classes/pref/filters.php:389
+#: classes/pref/filters.php:446
+#: classes/pref/filters.php:789
+#: classes/pref/filters.php:877
+#: classes/pref/filters.php:904
+#: classes/pref/users.php:338
 #: classes/pref/prefs.php:997
+#: classes/pref/feeds.php:1316
+#: classes/pref/feeds.php:1579
+#: classes/pref/feeds.php:1643
 #: classes/feeds.php:105
-#: plugins/instances/init.php:289
 msgid "None"
 msgstr "Nada"
 
 #: classes/pref/labels.php:270
-#: classes/pref/users.php:348
+#: classes/pref/filters.php:512
+#: classes/pref/filters.php:806
+#: classes/pref/users.php:347
 #: classes/pref/feeds.php:767
-#: classes/pref/filters.php:478
-#: classes/pref/filters.php:766
-#: classes/feeds.php:1154
-#: plugins/instances/init.php:294
+#: classes/feeds.php:1147
 msgid "Remove"
 msgstr "Eliminar"
 
@@ -1301,9 +1190,170 @@ msgstr "Eliminar"
 msgid "Clear colors"
 msgstr "Limpiar los colores"
 
+#: classes/pref/filters.php:153
+#, fuzzy
+msgid "Preview article"
+msgstr "Filtrar artículo"
+
+#: classes/pref/filters.php:264
+#: classes/pref/filters.php:558
+msgid "(inverse)"
+msgstr "(inverso)"
+
+#: classes/pref/filters.php:260
+#: classes/pref/filters.php:557
+#, php-format
+msgid "%s on %s in %s %s"
+msgstr "%s en %s en %s %s"
+
+#: classes/pref/filters.php:379
+#: classes/pref/filters.php:867
+#: classes/pref/filters.php:981
+msgid "Match"
+msgstr "Coincidir"
+
+#: classes/pref/filters.php:393
+#: classes/pref/filters.php:450
+#: classes/pref/filters.php:881
+#: classes/pref/filters.php:908
+msgid "Add"
+msgstr "Añadir"
+
+#: classes/pref/filters.php:396
+#: classes/pref/filters.php:453
+#: classes/pref/filters.php:884
+#: classes/pref/filters.php:911
+#: classes/feeds.php:122
+msgid "Delete"
+msgstr "Borrar"
+
+#: classes/pref/filters.php:436
+#: classes/pref/filters.php:894
+msgid "Apply actions"
+msgstr "Aplicar acciones"
+
+#: classes/pref/filters.php:486
+#: classes/pref/filters.php:923
+msgid "Enabled"
+msgstr "Habilitado"
+
+#: classes/pref/filters.php:495
+#: classes/pref/filters.php:926
+msgid "Match any rule"
+msgstr "Coincidencia con cualquier regla"
+
+#: classes/pref/filters.php:504
+#: classes/pref/filters.php:929
+msgid "Inverse matching"
+msgstr "Coincidencia inversa"
+
+#: classes/pref/filters.php:516
+#: classes/pref/filters.php:936
+msgid "Test"
+msgstr "Probar"
+
+#: classes/pref/filters.php:780
+#: classes/pref/users.php:323
+#: classes/pref/feeds.php:1307
+#: classes/feeds.php:1118
+#: classes/feeds.php:1184
+#: js/tt-rss.js:165
+msgid "Search"
+msgstr "Buscar"
+
+#: classes/pref/filters.php:796
+msgid "Combine"
+msgstr "Combinar"
+
+#: classes/pref/filters.php:799
+#: classes/pref/users.php:345
+msgid "Edit"
+msgstr "Editar"
+
+#: classes/pref/filters.php:802
+#: classes/pref/feeds.php:1327
+#: classes/pref/feeds.php:1341
+msgid "Reset sort order"
+msgstr "Reiniciar orden"
+
+#: classes/pref/filters.php:810
+#: classes/pref/feeds.php:1363
+msgid "Rescore articles"
+msgstr "Reiniciar la puntuación de los artículos"
+
+#: classes/pref/filters.php:939
+msgid "Create"
+msgstr "Crear"
+
+#: classes/pref/filters.php:993
+msgid "Inverse regular expression matching"
+msgstr "Coincidencia inversa con la expresión regular"
+
+#: classes/pref/filters.php:995
+msgid "on field"
+msgstr "en el campo"
+
+#: classes/pref/filters.php:1001
+#: js/PrefFilterTree.js:64
+msgid "in"
+msgstr "en"
+
+#: classes/pref/filters.php:1014
+msgid "Wiki: Filters"
+msgstr "Wiki: Filtros"
+
+#: classes/pref/filters.php:1019
+msgid "Save rule"
+msgstr "Guardar regla"
+
+#: classes/pref/filters.php:1019
+#: js/functions.js:865
+msgid "Add rule"
+msgstr "Añadir regla"
+
+#: classes/pref/filters.php:1042
+msgid "Perform Action"
+msgstr "Realizar la acción"
+
+#: classes/pref/filters.php:1093
+#, fuzzy
+msgid "No actions available"
+msgstr "¡Nueva versión disponible!"
+
+#: classes/pref/filters.php:1112
+msgid "Save action"
+msgstr "Guardar acción"
+
+#: classes/pref/filters.php:1112
+#: js/functions.js:887
+msgid "Add action"
+msgstr "Añadir acción"
+
+#: classes/pref/filters.php:1136
+msgid "[No caption]"
+msgstr "[Sin leyenda]"
+
+#: classes/pref/filters.php:1138
+#, php-format
+msgid "%s (%d rule)"
+msgid_plural "%s (%d rules)"
+msgstr[0] "%s (%d regla)"
+msgstr[1] "%s (%d reglas)"
+
+#: classes/pref/filters.php:1153
+#, fuzzy
+msgid "matches any rule"
+msgstr "Coincidencia con cualquier regla"
+
+#: classes/pref/filters.php:1156
+#, php-format
+msgid "%s (+%d action)"
+msgid_plural "%s (+%d actions)"
+msgstr[0] "%s (+%d acción)"
+msgstr[1] "%s (+%d acciones)"
+
 #: classes/pref/users.php:6
 #: classes/pref/system.php:8
-#: plugins/instances/init.php:154
 msgid "Your access level is insufficient to open this tab."
 msgstr "Su nivel de acceso es insuficiente para abrir esta pestaña."
 
@@ -1314,8 +1364,8 @@ msgstr "Editar regla"
 
 #: classes/pref/users.php:56
 #: classes/pref/feeds.php:637
-#: classes/pref/feeds.php:878
-#: classes/feeds.php:1075
+#: classes/pref/feeds.php:866
+#: classes/feeds.php:1068
 msgid "Authentication"
 msgstr "Autenticación"
 
@@ -1325,7 +1375,7 @@ msgstr "Nivel de acceso:"
 
 #: classes/pref/users.php:77
 #: classes/pref/feeds.php:667
-#: classes/pref/feeds.php:896
+#: classes/pref/feeds.php:884
 msgid "Options"
 msgstr "Opciones"
 
@@ -1339,7 +1389,7 @@ msgid "User not found"
 msgstr "Usuario no encontrado"
 
 #: classes/pref/users.php:132
-#: classes/pref/users.php:400
+#: classes/pref/users.php:399
 msgid "Registered"
 msgstr "Registrado"
 
@@ -1357,7 +1407,7 @@ msgid "Stored articles"
 msgstr "Favoritos"
 
 #: classes/pref/users.php:145
-#: classes/pref/users.php:399
+#: classes/pref/users.php:398
 msgid "Subscribed feeds"
 msgstr "Fuentes suscritas"
 
@@ -1376,506 +1426,57 @@ msgstr "No se puede crear el usuario <strong>%s</strong>"
 msgid "User <b>%s</b> already exists."
 msgstr "El usuario <strong>%s</strong> ya existe."
 
-#: classes/pref/users.php:265
+#: classes/pref/users.php:264
 #, php-format
 msgid "Changed password of user <b>%s</b> to <b>%s</b>"
 msgstr "Se ha cambiado la contraseña del usuario <b>%s</b> a <b>%s</b>"
 
-#: classes/pref/users.php:267
+#: classes/pref/users.php:266
 #, php-format
 msgid "Sending new password of user <b>%s</b> to <b>%s</b>"
 msgstr "Enviando nueva contraseña del usuario <strong>%s</strong> a <strong>%s</strong>"
 
-#: classes/pref/users.php:291
+#: classes/pref/users.php:290
 msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] Notificación de cambio de contraseña"
 
-#: classes/pref/users.php:324
-#: classes/pref/feeds.php:1333
-#: classes/pref/filters.php:740
-#: classes/feeds.php:1125
-#: classes/feeds.php:1191
-#: js/tt-rss.js:165
-msgid "Search"
-msgstr "Buscar"
-
-#: classes/pref/users.php:342
+#: classes/pref/users.php:341
 msgid "Create user"
 msgstr "Crear usuario"
 
-#: classes/pref/users.php:346
-#: classes/pref/filters.php:759
-#: plugins/instances/init.php:293
-msgid "Edit"
-msgstr "Editar"
-
-#: classes/pref/users.php:397
+#: classes/pref/users.php:396
 #: classes/pref/feeds.php:643
-#: classes/pref/feeds.php:882
-#: classes/pref/feeds.php:1836
-#: classes/feeds.php:1079
+#: classes/pref/feeds.php:870
+#: classes/pref/feeds.php:1810
+#: classes/feeds.php:1072
 msgid "Login"
 msgstr "Iniciar sesión"
 
-#: classes/pref/users.php:398
+#: classes/pref/users.php:397
 msgid "Access Level"
 msgstr "Nivel de acceso"
 
-#: classes/pref/users.php:401
+#: classes/pref/users.php:400
 msgid "Last login"
 msgstr "Última sesión"
 
-#: classes/pref/users.php:420
-#: plugins/instances/init.php:334
+#: classes/pref/users.php:419
 msgid "Click to edit"
 msgstr "Pulse aquí para editar"
 
-#: classes/pref/users.php:441
+#: classes/pref/users.php:440
 msgid "No users defined."
 msgstr "No se han definido usuarios."
 
-#: classes/pref/users.php:443
+#: classes/pref/users.php:442
 msgid "No matching users found."
 msgstr "No se han encontrado usuarios coincidentes."
 
-#: classes/pref/system.php:29
-msgid "Error Log"
-msgstr "Registro de errores"
-
-#: classes/pref/system.php:40
-msgid "Refresh"
-msgstr "Actualizar"
-
-#: classes/pref/system.php:43
-msgid "Clear log"
-msgstr "Borrar registro"
-
-#: classes/pref/system.php:48
-msgid "Error"
-msgstr "Error"
-
-#: classes/pref/system.php:49
-msgid "Filename"
-msgstr "Nombre de archivo"
-
-#: classes/pref/system.php:50
-msgid "Message"
-msgstr "Mensaje"
-
-#: classes/pref/system.php:52
-msgid "Date"
-msgstr "Fecha"
-
-#: classes/pref/feeds.php:15
-msgid "Check to enable field"
-msgstr "Marcar para habilitar el campo"
-
-#: classes/pref/feeds.php:65
-#: classes/pref/feeds.php:214
-#: classes/pref/feeds.php:258
-#: classes/pref/feeds.php:264
-#: classes/pref/feeds.php:290
-#, php-format
-msgid "(%d feed)"
-msgid_plural "(%d feeds)"
-msgstr[0] "(%d fuente)"
-msgstr[1] "(%d fuentes)"
-
-#: classes/pref/feeds.php:537
 #: classes/pref/prefs.php:18
+#: classes/pref/feeds.php:537
 msgid "General"
 msgstr "General"
 
-#: classes/pref/feeds.php:561
-msgid "Feed Title"
-msgstr "Título de la fuente"
-
-#: classes/pref/feeds.php:595
-#: classes/pref/feeds.php:830
-#: classes/pref/feeds.php:1822
-#: classes/feeds.php:1055
-msgid "Place in category:"
-msgstr "Categoría:"
-
-#: classes/pref/feeds.php:608
-#: classes/pref/feeds.php:844
-#, fuzzy
-msgid "Language:"
-msgstr "Idioma"
-
-#: classes/pref/feeds.php:615
-#: classes/pref/feeds.php:853
-msgid "Update"
-msgstr "Actualizar"
-
-#: classes/pref/feeds.php:630
-#: classes/pref/feeds.php:869
-msgid "Article purging:"
-msgstr "Purga de artículos"
-
-#: classes/pref/feeds.php:658
-#: classes/pref/feeds.php:890
-#: classes/pref/feeds.php:1839
-#: classes/pref/prefs.php:245
-#: classes/feeds.php:1083
-msgid "Password"
-msgstr "Contraseña:"
-
-#: classes/pref/feeds.php:662
-msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
-msgstr "<b>Pista:</b> necesita rellenar su información de usuario si la fuente requiere autenticación, excepto para las fuentes de Twitter."
-
-#: classes/pref/feeds.php:681
-#: classes/pref/feeds.php:900
-msgid "Hide from Popular feeds"
-msgstr "No incluir en Fuentes Populares"
-
-#: classes/pref/feeds.php:693
-#: classes/pref/feeds.php:906
-msgid "Include in e-mail digest"
-msgstr "Incluir en el correo recopilatorio"
-
-#: classes/pref/feeds.php:706
-#: classes/pref/feeds.php:912
-msgid "Always display image attachments"
-msgstr "Mostrar siempre imágenes adjuntas"
-
-#: classes/pref/feeds.php:719
-#: classes/pref/feeds.php:920
-msgid "Do not embed images"
-msgstr "No mostrar imágenes"
-
-#: classes/pref/feeds.php:732
-#: classes/pref/feeds.php:928
-msgid "Cache media"
-msgstr ""
-
-#: classes/pref/feeds.php:744
-#: classes/pref/feeds.php:934
-msgid "Mark updated articles as unread"
-msgstr "Marcar los artículos actualizados como sin leer"
-
-#: classes/pref/feeds.php:748
-msgid "Icon"
-msgstr "Icono"
-
-#: classes/pref/feeds.php:765
-msgid "Replace"
-msgstr "Reemplazar"
-
-#: classes/pref/feeds.php:772
-#: classes/pref/prefs.php:698
-msgid "Plugins"
-msgstr "Plugins"
-
-#: classes/pref/feeds.php:792
-msgid "Resubscribe to push updates"
-msgstr "Volver a suscribirse a las actualizaciones push"
-
-#: classes/pref/feeds.php:799
-msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
-msgstr "Reinicia el estatus de suscripción de PubSubHubbub para las fuentes habilitadas para push."
-
-#: classes/pref/feeds.php:1200
-#: classes/pref/feeds.php:1253
-msgid "All done."
-msgstr "Hecho."
-
-#: classes/pref/feeds.php:1308
-msgid "Feeds with errors"
-msgstr "Fuentes con errores"
-
-#: classes/pref/feeds.php:1315
-msgid "Inactive feeds"
-msgstr "Fuentes inactivas"
-
-#: classes/pref/feeds.php:1351
-msgid "Edit selected feeds"
-msgstr "Editar fuentes seleccionadas"
-
-#: classes/pref/feeds.php:1353
-#: classes/pref/feeds.php:1367
-#: classes/pref/filters.php:762
-msgid "Reset sort order"
-msgstr "Reiniciar orden"
-
-#: classes/pref/feeds.php:1355
-#: js/prefs.js:1622
-msgid "Batch subscribe"
-msgstr "Suscripción en lote"
-
-#: classes/pref/feeds.php:1362
-msgid "Categories"
-msgstr "Categorías"
-
-#: classes/pref/feeds.php:1365
-msgid "Add category"
-msgstr "Añadir categoría"
-
-#: classes/pref/feeds.php:1369
-msgid "Remove selected"
-msgstr "Eliminar seleccionadas"
-
-#: classes/pref/feeds.php:1380
-msgid "More actions..."
-msgstr "Más acciones..."
-
-#: classes/pref/feeds.php:1384
-msgid "Manual purge"
-msgstr "Purga manual"
-
-#: classes/pref/feeds.php:1388
-msgid "Clear feed data"
-msgstr "Limpiar los datos de la fuente"
-
-#: classes/pref/feeds.php:1389
-#: classes/pref/filters.php:770
-msgid "Rescore articles"
-msgstr "Reiniciar la puntuación de los artículos"
-
-#: classes/pref/feeds.php:1442
-msgid "OPML"
-msgstr "OPML"
-
-#: classes/pref/feeds.php:1444
-msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
-msgstr "Puede usar OPML para importar y exportar sus fuentes, filtros, marcadores y preferencias de Tiny Tiny RSS."
-
-#: classes/pref/feeds.php:1445
-msgid "Only main settings profile can be migrated using OPML."
-msgstr "Sólo el perfil de opciones principal se puede migrar usando OPML."
-
-#: classes/pref/feeds.php:1458
-msgid "Import my OPML"
-msgstr "Importar OPML"
-
-#: classes/pref/feeds.php:1464
-msgid "Filename:"
-msgstr "Nombre de archivo:"
-
-#: classes/pref/feeds.php:1466
-msgid "Include settings"
-msgstr "Incluir preferencias"
-
-#: classes/pref/feeds.php:1470
-msgid "Export OPML"
-msgstr "Exportar OPML"
-
-#: classes/pref/feeds.php:1474
-msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
-msgstr "Puede hacer público su OPML. Cualquiera que conozca la siguiente URL podrá suscribirse al OPML."
-
-#: classes/pref/feeds.php:1478
-msgid "Public OPML URL"
-msgstr "URL del archivo OPML público"
-
-#: classes/pref/feeds.php:1479
-msgid "Display published OPML URL"
-msgstr "Mostrar la URL del OPML público"
-
-#: classes/pref/feeds.php:1488
-msgid "Firefox integration"
-msgstr "Integración con Firefox"
-
-#: classes/pref/feeds.php:1490
-msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
-msgstr "Esta instalación de Tiny tiny RSS puede ser usada como un lector de fuentes de Firefox si pulsa en el enlace de abajo."
-
-#: classes/pref/feeds.php:1497
-msgid "Click here to register this site as a feed reader."
-msgstr "Pulse aquí para registrar este sitio como un lector de fuentes."
-
-#: classes/pref/feeds.php:1505
-msgid "Published & shared articles / Generated feeds"
-msgstr "Artículos publicados y compartidos / Fuentes generadas"
-
-#: classes/pref/feeds.php:1507
-msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
-msgstr "Los artículos publicados son exportados como una fuente RSS pública a la cual podrá suscribirse cualquiera que conozca la URL especificada a continuación."
-
-#: classes/pref/feeds.php:1514
-#: classes/feeds.php:54
-#: classes/feeds.php:140
-msgid "View as RSS"
-msgstr "Ver como RSS"
-
-#: classes/pref/feeds.php:1515
-msgid "Display URL"
-msgstr "Mostrar URL"
-
-#: classes/pref/feeds.php:1518
-msgid "Clear all generated URLs"
-msgstr "Limpiar todas las URLs generadas"
-
-#: classes/pref/feeds.php:1596
-msgid "These feeds have not been updated with new content for 3 months (oldest first):"
-msgstr "Estas fuentes no han publicado contenidos nuevos al menos en 3 meses (más antiguas primero):"
-
-#: classes/pref/feeds.php:1630
-#: classes/pref/feeds.php:1694
-msgid "Click to edit feed"
-msgstr "Pulse para editar fuente"
-
-#: classes/pref/feeds.php:1648
-#: classes/pref/feeds.php:1714
-msgid "Unsubscribe from selected feeds"
-msgstr "Cancelar la suscripción a las fuentes seleccionadas"
-
-#: classes/pref/feeds.php:1819
-msgid "Add one valid RSS feed per line (no feed detection is done)"
-msgstr "Añadir una fuente RSS válida en cada línea (no se realizará detección de fuentes)"
-
-#: classes/pref/feeds.php:1828
-msgid "Feeds to subscribe, One per line"
-msgstr "Fuentes para suscribirse, una por línea"
-
-#: classes/pref/feeds.php:1851
-msgid "Feeds require authentication."
-msgstr "Las fuentes requieren autenticación."
-
-#: classes/pref/feeds.php:1858
-#: classes/feeds.php:1099
-#: classes/feeds.php:1153
-msgid "Subscribe"
-msgstr "Suscribir"
-
-#: classes/pref/filters.php:151
-#, fuzzy
-msgid "Preview article"
-msgstr "Filtrar artículo"
-
-#: classes/pref/filters.php:239
-#: classes/pref/filters.php:518
-msgid "(inverse)"
-msgstr "(inverso)"
-
-#: classes/pref/filters.php:235
-#: classes/pref/filters.php:517
-#, php-format
-msgid "%s on %s in %s %s"
-msgstr "%s en %s en %s %s"
-
-#: classes/pref/filters.php:354
-#: classes/pref/filters.php:827
-#: classes/pref/filters.php:942
-msgid "Match"
-msgstr "Coincidir"
-
-#: classes/pref/filters.php:368
-#: classes/pref/filters.php:416
-#: classes/pref/filters.php:841
-#: classes/pref/filters.php:868
-msgid "Add"
-msgstr "Añadir"
-
-#: classes/pref/filters.php:371
-#: classes/pref/filters.php:419
-#: classes/pref/filters.php:844
-#: classes/pref/filters.php:871
-#: classes/feeds.php:122
-msgid "Delete"
-msgstr "Borrar"
-
-#: classes/pref/filters.php:402
-#: classes/pref/filters.php:854
-msgid "Apply actions"
-msgstr "Aplicar acciones"
-
-#: classes/pref/filters.php:452
-#: classes/pref/filters.php:883
-msgid "Enabled"
-msgstr "Habilitado"
-
-#: classes/pref/filters.php:461
-#: classes/pref/filters.php:886
-msgid "Match any rule"
-msgstr "Coincidencia con cualquier regla"
-
-#: classes/pref/filters.php:470
-#: classes/pref/filters.php:889
-msgid "Inverse matching"
-msgstr "Coincidencia inversa"
-
-#: classes/pref/filters.php:482
-#: classes/pref/filters.php:896
-msgid "Test"
-msgstr "Probar"
-
-#: classes/pref/filters.php:756
-msgid "Combine"
-msgstr "Combinar"
-
-#: classes/pref/filters.php:899
-msgid "Create"
-msgstr "Crear"
-
-#: classes/pref/filters.php:954
-msgid "Inverse regular expression matching"
-msgstr "Coincidencia inversa con la expresión regular"
-
-#: classes/pref/filters.php:956
-msgid "on field"
-msgstr "en el campo"
-
-#: classes/pref/filters.php:962
-#: js/PrefFilterTree.js:64
-msgid "in"
-msgstr "en"
-
-#: classes/pref/filters.php:975
-msgid "Wiki: Filters"
-msgstr "Wiki: Filtros"
-
-#: classes/pref/filters.php:980
-msgid "Save rule"
-msgstr "Guardar regla"
-
-#: classes/pref/filters.php:980
-#: js/functions.js:865
-msgid "Add rule"
-msgstr "Añadir regla"
-
-#: classes/pref/filters.php:1003
-msgid "Perform Action"
-msgstr "Realizar la acción"
-
-#: classes/pref/filters.php:1054
-#, fuzzy
-msgid "No actions available"
-msgstr "¡Nueva versión disponible!"
-
-#: classes/pref/filters.php:1073
-msgid "Save action"
-msgstr "Guardar acción"
-
-#: classes/pref/filters.php:1073
-#: js/functions.js:887
-msgid "Add action"
-msgstr "Añadir acción"
-
-#: classes/pref/filters.php:1097
-msgid "[No caption]"
-msgstr "[Sin leyenda]"
-
-#: classes/pref/filters.php:1099
-#, php-format
-msgid "%s (%d rule)"
-msgid_plural "%s (%d rules)"
-msgstr[0] "%s (%d regla)"
-msgstr[1] "%s (%d reglas)"
-
-#: classes/pref/filters.php:1114
-#, fuzzy
-msgid "matches any rule"
-msgstr "Coincidencia con cualquier regla"
-
-#: classes/pref/filters.php:1117
-#, php-format
-msgid "%s (+%d action)"
-msgid_plural "%s (+%d actions)"
-msgstr[0] "%s (+%d acción)"
-msgstr[1] "%s (+%d acciones)"
-
 #: classes/pref/prefs.php:19
 msgid "Interface"
 msgstr "Interfaz"
@@ -2049,7 +1650,7 @@ msgid "Strip all but most common HTML tags when reading articles."
 msgstr "Quitar etiquetas HTML, salvo las más comunes, cuando se esté leyendo los artículos."
 
 #: classes/pref/prefs.php:53
-#: js/prefs.js:1584
+#: js/prefs.js:1580
 msgid "Customize stylesheet"
 msgstr "Personalizar hoja de estilo"
 
@@ -2117,6 +1718,14 @@ msgstr "Nivel de acceso"
 msgid "Save data"
 msgstr "Guardar datos"
 
+#: classes/pref/prefs.php:245
+#: classes/pref/feeds.php:658
+#: classes/pref/feeds.php:878
+#: classes/pref/feeds.php:1813
+#: classes/feeds.php:1076
+msgid "Password"
+msgstr "Contraseña:"
+
 #: classes/pref/prefs.php:254
 msgid "Your password is at default value, please change it."
 msgstr "Su contraseña tiene el valor por defecto. Por favor, modifíquela."
@@ -2215,18 +1824,23 @@ msgstr "Gestionar perfiles"
 msgid "Reset to defaults"
 msgstr "Opciones por defecto"
 
+#: classes/pref/prefs.php:698
+#: classes/pref/feeds.php:772
+msgid "Plugins"
+msgstr "Plugins"
+
 #: classes/pref/prefs.php:700
 msgid "You will need to reload Tiny Tiny RSS for plugin changes to take effect."
 msgstr "Tiene que recargar Tiny Tiny RSS para que tengan efecto los cambios en los plugins."
 
-#: classes/pref/prefs.php:702
-msgid "Download more plugins at tt-rss.org <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forums</a> or <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a>."
-msgstr "Descargue más plugins de tt-rss.org: <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">foros</a> y <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a>."
-
-#: classes/pref/prefs.php:732
+#: classes/pref/prefs.php:730
 msgid "System plugins"
 msgstr "Plugins de sistema"
 
+#: classes/pref/prefs.php:731
+msgid "System plugins are enabled in <strong>config.php</strong> for all users."
+msgstr ""
+
 #: classes/pref/prefs.php:736
 #: classes/pref/prefs.php:792
 msgid "Plugin"
@@ -2296,6 +1910,340 @@ msgstr "Borrar los perfiles seleccionados"
 msgid "Activate profile"
 msgstr "Activar perfil"
 
+#: classes/pref/feeds.php:15
+msgid "Check to enable field"
+msgstr "Marcar para habilitar el campo"
+
+#: classes/pref/feeds.php:65
+#: classes/pref/feeds.php:214
+#: classes/pref/feeds.php:258
+#: classes/pref/feeds.php:264
+#: classes/pref/feeds.php:290
+#, php-format
+msgid "(%d feed)"
+msgid_plural "(%d feeds)"
+msgstr[0] "(%d fuente)"
+msgstr[1] "(%d fuentes)"
+
+#: classes/pref/feeds.php:561
+msgid "Feed Title"
+msgstr "Título de la fuente"
+
+#: classes/pref/feeds.php:595
+#: classes/pref/feeds.php:818
+#: classes/pref/feeds.php:1796
+#: classes/feeds.php:1048
+msgid "Place in category:"
+msgstr "Categoría:"
+
+#: classes/pref/feeds.php:608
+#: classes/pref/feeds.php:832
+#, fuzzy
+msgid "Language:"
+msgstr "Idioma"
+
+#: classes/pref/feeds.php:615
+#: classes/pref/feeds.php:841
+msgid "Update"
+msgstr "Actualizar"
+
+#: classes/pref/feeds.php:630
+#: classes/pref/feeds.php:857
+msgid "Article purging:"
+msgstr "Purga de artículos"
+
+#: classes/pref/feeds.php:662
+msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
+msgstr "<b>Pista:</b> necesita rellenar su información de usuario si la fuente requiere autenticación, excepto para las fuentes de Twitter."
+
+#: classes/pref/feeds.php:681
+#: classes/pref/feeds.php:888
+msgid "Hide from Popular feeds"
+msgstr "No incluir en Fuentes Populares"
+
+#: classes/pref/feeds.php:693
+#: classes/pref/feeds.php:894
+msgid "Include in e-mail digest"
+msgstr "Incluir en el correo recopilatorio"
+
+#: classes/pref/feeds.php:706
+#: classes/pref/feeds.php:900
+msgid "Always display image attachments"
+msgstr "Mostrar siempre imágenes adjuntas"
+
+#: classes/pref/feeds.php:719
+#: classes/pref/feeds.php:908
+msgid "Do not embed images"
+msgstr "No mostrar imágenes"
+
+#: classes/pref/feeds.php:732
+#: classes/pref/feeds.php:916
+msgid "Cache media"
+msgstr ""
+
+#: classes/pref/feeds.php:744
+#: classes/pref/feeds.php:922
+msgid "Mark updated articles as unread"
+msgstr "Marcar los artículos actualizados como sin leer"
+
+#: classes/pref/feeds.php:748
+msgid "Icon"
+msgstr "Icono"
+
+#: classes/pref/feeds.php:765
+msgid "Replace"
+msgstr "Reemplazar"
+
+#: classes/pref/feeds.php:1174
+#: classes/pref/feeds.php:1227
+msgid "All done."
+msgstr "Hecho."
+
+#: classes/pref/feeds.php:1282
+msgid "Feeds with errors"
+msgstr "Fuentes con errores"
+
+#: classes/pref/feeds.php:1289
+msgid "Inactive feeds"
+msgstr "Fuentes inactivas"
+
+#: classes/pref/feeds.php:1325
+msgid "Edit selected feeds"
+msgstr "Editar fuentes seleccionadas"
+
+#: classes/pref/feeds.php:1329
+#: js/prefs.js:1618
+msgid "Batch subscribe"
+msgstr "Suscripción en lote"
+
+#: classes/pref/feeds.php:1336
+msgid "Categories"
+msgstr "Categorías"
+
+#: classes/pref/feeds.php:1339
+msgid "Add category"
+msgstr "Añadir categoría"
+
+#: classes/pref/feeds.php:1343
+msgid "Remove selected"
+msgstr "Eliminar seleccionadas"
+
+#: classes/pref/feeds.php:1354
+msgid "More actions..."
+msgstr "Más acciones..."
+
+#: classes/pref/feeds.php:1358
+msgid "Manual purge"
+msgstr "Purga manual"
+
+#: classes/pref/feeds.php:1362
+msgid "Clear feed data"
+msgstr "Limpiar los datos de la fuente"
+
+#: classes/pref/feeds.php:1416
+msgid "OPML"
+msgstr "OPML"
+
+#: classes/pref/feeds.php:1418
+msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
+msgstr "Puede usar OPML para importar y exportar sus fuentes, filtros, marcadores y preferencias de Tiny Tiny RSS."
+
+#: classes/pref/feeds.php:1419
+msgid "Only main settings profile can be migrated using OPML."
+msgstr "Sólo el perfil de opciones principal se puede migrar usando OPML."
+
+#: classes/pref/feeds.php:1432
+msgid "Import my OPML"
+msgstr "Importar OPML"
+
+#: classes/pref/feeds.php:1438
+msgid "Filename:"
+msgstr "Nombre de archivo:"
+
+#: classes/pref/feeds.php:1440
+msgid "Include settings"
+msgstr "Incluir preferencias"
+
+#: classes/pref/feeds.php:1444
+msgid "Export OPML"
+msgstr "Exportar OPML"
+
+#: classes/pref/feeds.php:1448
+msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
+msgstr "Puede hacer público su OPML. Cualquiera que conozca la siguiente URL podrá suscribirse al OPML."
+
+#: classes/pref/feeds.php:1452
+msgid "Public OPML URL"
+msgstr "URL del archivo OPML público"
+
+#: classes/pref/feeds.php:1453
+msgid "Display published OPML URL"
+msgstr "Mostrar la URL del OPML público"
+
+#: classes/pref/feeds.php:1462
+msgid "Firefox integration"
+msgstr "Integración con Firefox"
+
+#: classes/pref/feeds.php:1464
+msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
+msgstr "Esta instalación de Tiny tiny RSS puede ser usada como un lector de fuentes de Firefox si pulsa en el enlace de abajo."
+
+#: classes/pref/feeds.php:1471
+msgid "Click here to register this site as a feed reader."
+msgstr "Pulse aquí para registrar este sitio como un lector de fuentes."
+
+#: classes/pref/feeds.php:1479
+msgid "Published & shared articles / Generated feeds"
+msgstr "Artículos publicados y compartidos / Fuentes generadas"
+
+#: classes/pref/feeds.php:1481
+msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
+msgstr "Los artículos publicados son exportados como una fuente RSS pública a la cual podrá suscribirse cualquiera que conozca la URL especificada a continuación."
+
+#: classes/pref/feeds.php:1488
+#: classes/feeds.php:54
+#: classes/feeds.php:140
+msgid "View as RSS"
+msgstr "Ver como RSS"
+
+#: classes/pref/feeds.php:1489
+msgid "Display URL"
+msgstr "Mostrar URL"
+
+#: classes/pref/feeds.php:1492
+msgid "Clear all generated URLs"
+msgstr "Limpiar todas las URLs generadas"
+
+#: classes/pref/feeds.php:1570
+msgid "These feeds have not been updated with new content for 3 months (oldest first):"
+msgstr "Estas fuentes no han publicado contenidos nuevos al menos en 3 meses (más antiguas primero):"
+
+#: classes/pref/feeds.php:1604
+#: classes/pref/feeds.php:1668
+msgid "Click to edit feed"
+msgstr "Pulse para editar fuente"
+
+#: classes/pref/feeds.php:1622
+#: classes/pref/feeds.php:1688
+msgid "Unsubscribe from selected feeds"
+msgstr "Cancelar la suscripción a las fuentes seleccionadas"
+
+#: classes/pref/feeds.php:1793
+msgid "Add one valid RSS feed per line (no feed detection is done)"
+msgstr "Añadir una fuente RSS válida en cada línea (no se realizará detección de fuentes)"
+
+#: classes/pref/feeds.php:1802
+msgid "Feeds to subscribe, One per line"
+msgstr "Fuentes para suscribirse, una por línea"
+
+#: classes/pref/feeds.php:1825
+msgid "Feeds require authentication."
+msgstr "Las fuentes requieren autenticación."
+
+#: classes/pref/feeds.php:1832
+#: classes/feeds.php:1092
+#: classes/feeds.php:1146
+msgid "Subscribe"
+msgstr "Suscribir"
+
+#: classes/pref/system.php:29
+msgid "Error Log"
+msgstr "Registro de errores"
+
+#: classes/pref/system.php:40
+msgid "Refresh"
+msgstr "Actualizar"
+
+#: classes/pref/system.php:43
+msgid "Clear log"
+msgstr "Borrar registro"
+
+#: classes/pref/system.php:48
+msgid "Error"
+msgstr "Error"
+
+#: classes/pref/system.php:49
+msgid "Filename"
+msgstr "Nombre de archivo"
+
+#: classes/pref/system.php:50
+msgid "Message"
+msgstr "Mensaje"
+
+#: classes/pref/system.php:52
+msgid "Date"
+msgstr "Fecha"
+
+#: classes/opml.php:28
+#: classes/opml.php:33
+msgid "OPML Utility"
+msgstr "Utilidad OPML"
+
+#: classes/opml.php:37
+msgid "Importing OPML..."
+msgstr "Importando OPML..."
+
+#: classes/opml.php:41
+msgid "Return to preferences"
+msgstr "Volver a las preferencias"
+
+#: classes/opml.php:295
+#, php-format
+msgid "Adding feed: %s"
+msgstr "Añadiendo fuente: %s"
+
+#: classes/opml.php:306
+#, php-format
+msgid "Duplicate feed: %s"
+msgstr "Duplicar fuente: %s"
+
+#: classes/opml.php:320
+#, php-format
+msgid "Adding label %s"
+msgstr "Añadiendo el marcador %s"
+
+#: classes/opml.php:323
+#, php-format
+msgid "Duplicate label: %s"
+msgstr "Duplicar marcador: %s"
+
+#: classes/opml.php:335
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr "Configurando la opción %s como %s"
+
+#: classes/opml.php:367
+msgid "Adding filter..."
+msgstr "Añadiendo filtro..."
+
+#: classes/opml.php:486
+#, php-format
+msgid "Processing category: %s"
+msgstr "Procesando categoría: %s"
+
+#: classes/opml.php:532
+#, php-format
+msgid "Upload failed with error code %d"
+msgstr "La subida falló con el código de error %d"
+
+#: classes/opml.php:544
+#: plugins/import_export/init.php:448
+msgid "Unable to move uploaded file."
+msgstr "No se pudo mover el archivo subido."
+
+#: classes/opml.php:548
+#: plugins/import_export/init.php:452
+msgid "Error: please upload OPML file."
+msgstr "Error: por favor, suba un fichero OPML."
+
+#: classes/opml.php:559
+msgid "Error: unable to find moved OPML file."
+msgstr "Error: no se pudo encontrar el fichero OPML movido."
+
+#: classes/opml.php:566
+msgid "Error while parsing document."
+msgstr "Error mientras se analizaba el documento."
+
 #: classes/feeds.php:53
 msgid "View as RSS feed"
 msgstr "Ver como fuente RSS"
@@ -2336,8 +2284,8 @@ msgstr "Mover a la fuente original"
 
 #: classes/feeds.php:127
 #: classes/feeds.php:132
-#: plugins/mail/init.php:75
 #: plugins/mailto/init.php:25
+#: plugins/mail/init.php:75
 msgid "Forward by email"
 msgstr "Enviar por correo electrónico"
 
@@ -2345,317 +2293,144 @@ msgstr "Enviar por correo electrónico"
 msgid "Feed:"
 msgstr "Fuente:"
 
-#: classes/feeds.php:229
-#: classes/feeds.php:892
+#: classes/feeds.php:228
+#: classes/feeds.php:885
 msgid "Feed not found."
 msgstr "Fuente no encontrada."
 
-#: classes/feeds.php:300
+#: classes/feeds.php:291
 msgid "Never"
 msgstr "Nunca "
 
-#: classes/feeds.php:413
+#: classes/feeds.php:405
 #, php-format
 msgid "Imported at %s"
 msgstr "Importado en %s"
 
-#: classes/feeds.php:472
-#: classes/feeds.php:569
+#: classes/feeds.php:464
+#: classes/feeds.php:561
 msgid "mark feed as read"
 msgstr "Marcar fuente como leída"
 
-#: classes/feeds.php:630
+#: classes/feeds.php:622
 msgid "Collapse article"
 msgstr "Cerrar artículo"
 
-#: classes/feeds.php:791
+#: classes/feeds.php:784
 msgid "No unread articles found to display."
 msgstr "No se han encontrado artículos sin leer."
 
-#: classes/feeds.php:794
+#: classes/feeds.php:787
 msgid "No updated articles found to display."
 msgstr "No se han encontrado artículos actualizados."
 
-#: classes/feeds.php:797
+#: classes/feeds.php:790
 msgid "No starred articles found to display."
 msgstr "No se han encontrado artículos favoritos."
 
-#: classes/feeds.php:801
+#: classes/feeds.php:794
 msgid "No articles found to display. You can assign articles to labels manually from article header context menu (applies to all selected articles) or use a filter."
 msgstr "No se han encontrado artículos que mostrar. Puede asignar artículos a los marcadores manualmente con el menú contextual del titular (se aplica a todos los artículos seleccionados) o usar un filtro."
 
-#: classes/feeds.php:803
+#: classes/feeds.php:796
 msgid "No articles found to display."
 msgstr "No se han encontrado artículos que mostrar."
 
-#: classes/feeds.php:818
-#: classes/feeds.php:992
+#: classes/feeds.php:811
+#: classes/feeds.php:985
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "Última actualización de las fuentes: %s"
 
-#: classes/feeds.php:828
-#: classes/feeds.php:1002
+#: classes/feeds.php:821
+#: classes/feeds.php:995
 msgid "Some feeds have update errors (click for details)"
 msgstr "Error al actualizar algunas fuentes (pulse aquí para obtener los detalles)"
 
-#: classes/feeds.php:982
+#: classes/feeds.php:975
 msgid "No feed selected."
 msgstr "No se ha seleccionado ninguna fuente."
 
-#: classes/feeds.php:1041
-#: classes/feeds.php:1049
+#: classes/feeds.php:1034
+#: classes/feeds.php:1042
 msgid "Feed or site URL"
 msgstr "URL de la fuente o del sitio"
 
-#: classes/feeds.php:1063
+#: classes/feeds.php:1056
 msgid "Available feeds"
 msgstr "Fuentes disponibles"
 
-#: classes/feeds.php:1094
+#: classes/feeds.php:1087
 msgid "This feed requires authentication."
 msgstr "Esta fuente requiere autenticación."
 
-#: classes/feeds.php:1102
+#: classes/feeds.php:1095
 msgid "More feeds"
 msgstr "Más fuentes"
 
-#: classes/feeds.php:1129
+#: classes/feeds.php:1122
 msgid "Popular feeds"
 msgstr "Fuentes populares"
 
-#: classes/feeds.php:1130
+#: classes/feeds.php:1123
 msgid "Feed archive"
 msgstr "Archivo de fuentes"
 
-#: classes/feeds.php:1133
+#: classes/feeds.php:1126
 msgid "limit:"
 msgstr "límite:"
 
-#: classes/feeds.php:1165
+#: classes/feeds.php:1158
 msgid "Look for"
 msgstr "Buscar"
 
-#: classes/feeds.php:1173
+#: classes/feeds.php:1166
 #, php-format
 msgid "in %s"
 msgstr ""
 
-#: classes/feeds.php:1178
+#: classes/feeds.php:1171
 msgid "Used for word stemming"
 msgstr ""
 
-#: classes/feeds.php:1187
+#: classes/feeds.php:1180
 msgid "Search syntax"
 msgstr "Sintaxis de búsqueda"
 
-#: plugins/instances/init.php:141
-msgid "Linked"
-msgstr "Enlazado"
-
-#: plugins/instances/init.php:204
-#: plugins/instances/init.php:395
-msgid "Instance"
-msgstr "Instancia"
-
-#: plugins/instances/init.php:215
-#: plugins/instances/init.php:312
-#: plugins/instances/init.php:404
-msgid "Instance URL"
-msgstr "URL de la instancia"
-
-#: plugins/instances/init.php:226
-#: plugins/instances/init.php:414
-msgid "Access key:"
-msgstr "Clave de acceso:"
-
-#: plugins/instances/init.php:229
-#: plugins/instances/init.php:313
-#: plugins/instances/init.php:417
-msgid "Access key"
-msgstr "Clave de acceso"
-
-#: plugins/instances/init.php:233
-#: plugins/instances/init.php:421
-msgid "Use one access key for both linked instances."
-msgstr "Usar una clave de acceso para ambas instancias enlazadas."
-
-#: plugins/instances/init.php:241
-#: plugins/instances/init.php:429
-msgid "Generate new key"
-msgstr "Generar nueva clave"
-
-#: plugins/instances/init.php:292
-msgid "Link instance"
-msgstr "Enlazar instancia"
-
-#: plugins/instances/init.php:304
-msgid "You can connect other instances of Tiny Tiny RSS to this one to share Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
-msgstr "Puede conectar otras instancias de Tiny Tiny RSS con esta para compartir Fuentes Populares. Para enlazar esta instancia de Tiny Tiny RSS con otras utilice esta URL:"
-
-#: plugins/instances/init.php:314
-msgid "Last connected"
-msgstr "Última sesión"
-
-#: plugins/instances/init.php:315
-msgid "Status"
-msgstr "Estatus"
-
-#: plugins/instances/init.php:316
-msgid "Stored feeds"
-msgstr "Fuentes archivadas"
+#: classes/feeds.php:1596
+msgid "Starred articles"
+msgstr "Favoritos"
 
-#: plugins/instances/init.php:433
-msgid "Create link"
-msgstr "Crear enlace"
+#: classes/feeds.php:1598
+msgid "Published articles"
+msgstr "Publicados"
 
-#: plugins/nsfw/init.php:30
-#: plugins/nsfw/init.php:42
-msgid "Not work safe (click to toggle)"
-msgstr "NSFW (click para alternar)"
+#: classes/feeds.php:1600
+msgid "Fresh articles"
+msgstr "Recientes"
 
-#: plugins/nsfw/init.php:52
-msgid "NSFW Plugin"
-msgstr "Plugin NSFW"
+#: classes/feeds.php:1604
+msgid "Archived articles"
+msgstr "Artículos archivados"
 
-#: plugins/nsfw/init.php:79
-msgid "Tags to consider NSFW (comma-separated)"
-msgstr "Etiquetas que se considerarán NSFW (separadas por comas)"
+#: classes/feeds.php:1606
+msgid "Recently read"
+msgstr "Leídos recientemente"
 
-#: plugins/nsfw/init.php:100
-msgid "Configuration saved."
-msgstr "Configuración guardada."
+#: classes/feeds.php:1716
+msgid "Special"
+msgstr "Especial"
 
-#: plugins/note/init.php:26
-#: plugins/note/note.js:11
-msgid "Edit article note"
-msgstr "Editar nota del artículo"
+#: classes/feeds.php:1962
+#, php-format
+msgid "Search results: %s"
+msgstr "Resultados de búsqueda: %s"
 
 #: plugins/vf_shared/init.php:16
-#: plugins/vf_shared/init.php:69
+#: plugins/vf_shared/init.php:60
 msgid "Shared articles"
 msgstr "Artículos compartidos"
 
-#: plugins/auth_internal/init.php:65
-msgid "Please enter your one time password:"
-msgstr "Por favor, introduzca su contraseña de un solo uso:"
-
-#: plugins/auth_internal/init.php:188
-msgid "Password has been changed."
-msgstr "La contraseña ha sido cambiada."
-
-#: plugins/auth_internal/init.php:190
-msgid "Old password is incorrect."
-msgstr "La contraseña antigua es incorrecta."
-
-#: plugins/af_readability/init.php:21
-msgid "Data saved."
-msgstr ""
-
-#: plugins/af_readability/init.php:33
-#, fuzzy
-msgid "Inline content"
-msgstr "Desplazar el contenido del artículo"
-
-#: plugins/af_readability/init.php:39
-msgid "Readability settings (af_readability)"
-msgstr ""
-
-#: plugins/af_readability/init.php:66
-msgid "Use Readability for pages shared via bookmarklet."
-msgstr ""
-
-#: plugins/af_readability/init.php:78
-#: plugins/af_psql_trgm/init.php:191
-msgid "Currently enabled for (click to edit):"
-msgstr ""
-
-#: plugins/af_readability/init.php:95
-#, fuzzy
-msgid "Readability"
-msgstr "Comprobar la disponibilidad"
-
-#: plugins/af_readability/init.php:106
-#, fuzzy
-msgid "Inline article content"
-msgstr "Desplazar el contenido del artículo"
-
-#: plugins/af_redditimgur/init.php:25
-msgid "Reddit content settings (af_redditimgur)"
-msgstr ""
-
-#: plugins/af_redditimgur/init.php:50
-msgid "Uses Readability (full-text-rss) implementation by <a target='_blank' href='https://bitbucket.org/fivefilters/'>FiveFilters.org</a>"
-msgstr ""
-
-#: plugins/af_redditimgur/init.php:54
-msgid "Extract missing content using Readability"
-msgstr ""
-
-#: plugins/af_redditimgur/init.php:59
-msgid "Enable additional duplicate checking"
-msgstr ""
-
-#: plugins/af_redditimgur/init.php:73
-#: plugins/af_zz_imgproxy/init.php:225
-#, fuzzy
-msgid "Configuration saved"
-msgstr "Configuración guardada."
-
-#: plugins/af_psql_trgm/init.php:28
-#, php-format
-msgid "Data saved (%s, %d)"
-msgstr ""
-
-#: plugins/af_psql_trgm/init.php:112
-#, fuzzy
-msgid "Show related articles"
-msgstr "Artículos compartidos"
-
-#: plugins/af_psql_trgm/init.php:118
-#: plugins/af_psql_trgm/init.php:220
-#, fuzzy
-msgid "Mark similar articles as read"
-msgstr "¿Marcar todos los artículos como leídos?"
-
-#: plugins/af_psql_trgm/init.php:157
-msgid "PostgreSQL trigram extension returns string similarity as a floating point number (0-1). Setting it too low might produce false positives, zero disables checking."
-msgstr ""
-
-#: plugins/af_psql_trgm/init.php:160
-#, fuzzy
-msgid "Global settings"
-msgstr "Incluir preferencias"
-
-#: plugins/af_psql_trgm/init.php:164
-msgid "Minimum similarity:"
-msgstr ""
-
-#: plugins/af_psql_trgm/init.php:169
-msgid "Minimum title length:"
-msgstr ""
-
-#: plugins/af_psql_trgm/init.php:174
-#, fuzzy
-msgid "Enable for all feeds:"
-msgstr "Actualizar todas las fuentes"
-
-#: plugins/af_psql_trgm/init.php:209
-msgid "Similarity (pg_trgm)"
-msgstr ""
-
-#: plugins/af_comics/init.php:40
-msgid "Feeds supported by af_comics"
-msgstr "Fuentes soportadas por af_comics"
-
-#: plugins/af_comics/init.php:42
-msgid "The following comics are currently supported:"
-msgstr "Actualmente están soportados los siguientes cómics:"
-
-#: plugins/af_comics/init.php:60
-msgid "GoComics requires a specific URL to workaround their lack of feed support: <code>http://feeds.feedburner.com/uclick/<em>comic_name</em></code> (e.g. <code>http://www.gocomics.com/garfield</code> uses <code>http://feeds.feedburner.com/uclick/garfield</code>)."
-msgstr ""
-
 #: plugins/import_export/init.php:58
 msgid "Import and export"
 msgstr "Importar y exportar"
@@ -2672,96 +2447,83 @@ msgstr "Exportar mis datos"
 msgid "Import"
 msgstr "Importar"
 
-#: plugins/import_export/init.php:225
+#: plugins/import_export/init.php:231
 msgid "Could not import: incorrect schema version."
 msgstr "Fallo de la importación: la versión del esquema es incorrecta."
 
-#: plugins/import_export/init.php:230
+#: plugins/import_export/init.php:236
 msgid "Could not import: unrecognized document format."
 msgstr "Fallo de la importación: no se reconoce el formato del documento."
 
-#: plugins/import_export/init.php:391
+#: plugins/import_export/init.php:397
 msgid "Finished: "
 msgstr "Terminado:"
 
-#: plugins/import_export/init.php:392
+#: plugins/import_export/init.php:398
 #, php-format
 msgid "%d article processed, "
 msgid_plural "%d articles processed, "
 msgstr[0] "%d artículo procesado, "
 msgstr[1] "%d artículos procesados, "
 
-#: plugins/import_export/init.php:393
+#: plugins/import_export/init.php:399
 #, php-format
 msgid "%d imported, "
 msgid_plural "%d imported, "
 msgstr[0] "%d importado, "
 msgstr[1] "%d importados, "
 
-#: plugins/import_export/init.php:394
+#: plugins/import_export/init.php:400
 #, php-format
 msgid "%d feed created."
 msgid_plural "%d feeds created."
 msgstr[0] "%d fuente creada."
 msgstr[1] "%d fuentes creadas."
 
-#: plugins/import_export/init.php:399
+#: plugins/import_export/init.php:405
 msgid "Could not load XML document."
 msgstr "No se pudo cargar documento XML."
 
-#: plugins/import_export/init.php:411
+#: plugins/import_export/init.php:417
 msgid "Prepare data"
 msgstr "Preparar datos"
 
-#: plugins/import_export/init.php:428
+#: plugins/import_export/init.php:434
 #, fuzzy, php-format
 msgid "Upload failed with error code %d (%s)"
 msgstr "La subida falló con el código de error %d"
 
-#: plugins/import_export/init.php:454
+#: plugins/import_export/init.php:460
 msgid "No file uploaded."
 msgstr "No se ha cargado ningún archivo."
 
-#: plugins/mail/init.php:28
-msgid "Mail addresses saved."
-msgstr ""
-
-#: plugins/mail/init.php:34
-#, fuzzy
-msgid "Mail plugin"
-msgstr "Plugins de usuario"
-
-#: plugins/mail/init.php:36
-msgid "You can set predefined email addressed here (comma-separated list):"
-msgstr ""
-
+#: plugins/mailto/init.php:48
+#: plugins/mailto/init.php:54
 #: plugins/mail/init.php:112
 #: plugins/mail/init.php:118
-#: plugins/mailto/init.php:49
-#: plugins/mailto/init.php:55
 msgid "[Forwarded]"
 msgstr "[Reenviado]"
 
+#: plugins/mailto/init.php:48
 #: plugins/mail/init.php:112
-#: plugins/mailto/init.php:49
 msgid "Multiple articles"
 msgstr "Múltiples artículos"
 
-#: plugins/mail/init.php:140
-msgid "To:"
-msgstr "Para:"
+#: plugins/mailto/init.php:70
+msgid "Clicking the following link to invoke your mail client:"
+msgstr "Hacer click en el enlace siguiente invocará su aplicación de correo:"
 
-#: plugins/mail/init.php:155
-msgid "Subject:"
-msgstr "Asunto:"
+#: plugins/mailto/init.php:74
+msgid "Forward selected article(s) by email."
+msgstr "Enviar artículo por correo"
 
-#: plugins/mail/init.php:172
-msgid "Send e-mail"
-msgstr "Enviar correo electrónico"
+#: plugins/mailto/init.php:77
+msgid "You should be able to edit the message before sending in your mail client."
+msgstr "Debería poder editar el mensaje en su aplicación de correo antes de enviarlo."
 
-#: plugins/close_button/init.php:22
-msgid "Close article"
-msgstr "Cerrar artículo"
+#: plugins/mailto/init.php:82
+msgid "Close this dialog"
+msgstr "Cerrar este diálogo"
 
 #: plugins/bookmarklets/init.php:20
 msgid "Bookmarklets"
@@ -2784,34 +2546,125 @@ msgstr "Suscribirse con Tiny Tiny RSS"
 msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
 msgstr "Use este bookmarklet para publicar cualquier página usando Tiny Tiny RSS"
 
+#: plugins/af_psql_trgm/init.php:28
+#, php-format
+msgid "Data saved (%s, %d)"
+msgstr ""
+
+#: plugins/af_psql_trgm/init.php:112
+#, fuzzy
+msgid "Show related articles"
+msgstr "Artículos compartidos"
+
+#: plugins/af_psql_trgm/init.php:118
+#: plugins/af_psql_trgm/init.php:220
+#, fuzzy
+msgid "Mark similar articles as read"
+msgstr "¿Marcar todos los artículos como leídos?"
+
+#: plugins/af_psql_trgm/init.php:157
+msgid "PostgreSQL trigram extension returns string similarity as a floating point number (0-1). Setting it too low might produce false positives, zero disables checking."
+msgstr ""
+
+#: plugins/af_psql_trgm/init.php:160
+#, fuzzy
+msgid "Global settings"
+msgstr "Incluir preferencias"
+
+#: plugins/af_psql_trgm/init.php:164
+msgid "Minimum similarity:"
+msgstr ""
+
+#: plugins/af_psql_trgm/init.php:169
+msgid "Minimum title length:"
+msgstr ""
+
+#: plugins/af_psql_trgm/init.php:174
+#, fuzzy
+msgid "Enable for all feeds:"
+msgstr "Actualizar todas las fuentes"
+
+#: plugins/af_psql_trgm/init.php:191
+#: plugins/af_readability/init.php:78
+msgid "Currently enabled for (click to edit):"
+msgstr ""
+
+#: plugins/af_psql_trgm/init.php:209
+msgid "Similarity (pg_trgm)"
+msgstr ""
+
+#: plugins/nsfw/init.php:30
+#: plugins/nsfw/init.php:42
+msgid "Not work safe (click to toggle)"
+msgstr "NSFW (click para alternar)"
+
+#: plugins/nsfw/init.php:52
+msgid "NSFW Plugin"
+msgstr "Plugin NSFW"
+
+#: plugins/nsfw/init.php:79
+msgid "Tags to consider NSFW (comma-separated)"
+msgstr "Etiquetas que se considerarán NSFW (separadas por comas)"
+
+#: plugins/nsfw/init.php:100
+msgid "Configuration saved."
+msgstr "Configuración guardada."
+
 #: plugins/toggle_sidebar/init.php:23
 msgid "Collapse feedlist"
 msgstr "Colapsar la lista de fuentes"
 
-#: plugins/af_zz_imgproxy/init.php:186
-msgid "Image proxy settings (af_zz_imgproxy)"
+#: plugins/af_readability/init.php:21
+msgid "Data saved."
 msgstr ""
 
-#: plugins/af_zz_imgproxy/init.php:211
+#: plugins/af_readability/init.php:33
 #, fuzzy
-msgid "Enable proxy for all remote images."
-msgstr "Actualizar todas las fuentes"
+msgid "Inline content"
+msgstr "Desplazar el contenido del artículo"
 
-#: plugins/mailto/init.php:71
-msgid "Clicking the following link to invoke your mail client:"
-msgstr "Hacer click en el enlace siguiente invocará su aplicación de correo:"
+#: plugins/af_readability/init.php:39
+msgid "Readability settings (af_readability)"
+msgstr ""
 
-#: plugins/mailto/init.php:75
-msgid "Forward selected article(s) by email."
-msgstr "Enviar artículo por correo"
+#: plugins/af_readability/init.php:66
+msgid "Use Readability for pages shared via bookmarklet."
+msgstr ""
 
-#: plugins/mailto/init.php:78
-msgid "You should be able to edit the message before sending in your mail client."
-msgstr "Debería poder editar el mensaje en su aplicación de correo antes de enviarlo."
+#: plugins/af_readability/init.php:95
+#, fuzzy
+msgid "Readability"
+msgstr "Comprobar la disponibilidad"
 
-#: plugins/mailto/init.php:83
-msgid "Close this dialog"
-msgstr "Cerrar este diálogo"
+#: plugins/af_readability/init.php:106
+#, fuzzy
+msgid "Inline article content"
+msgstr "Desplazar el contenido del artículo"
+
+#: plugins/mail/init.php:28
+msgid "Mail addresses saved."
+msgstr ""
+
+#: plugins/mail/init.php:34
+#, fuzzy
+msgid "Mail plugin"
+msgstr "Plugins de usuario"
+
+#: plugins/mail/init.php:36
+msgid "You can set predefined email addressed here (comma-separated list):"
+msgstr ""
+
+#: plugins/mail/init.php:140
+msgid "To:"
+msgstr "Para:"
+
+#: plugins/mail/init.php:155
+msgid "Subject:"
+msgstr "Asunto:"
+
+#: plugins/mail/init.php:172
+msgid "Send e-mail"
+msgstr "Enviar correo electrónico"
 
 #: plugins/share/init.php:39
 msgid "You can disable all articles shared by unique URLs here."
@@ -2825,24 +2678,97 @@ msgstr "Dejar de compartir todos los artículos"
 msgid "Share by URL"
 msgstr "Compartir mediante URL"
 
-#: plugins/share/init.php:97
+#: plugins/share/init.php:96
 msgid "You can share this article by the following unique URL:"
 msgstr "Puede compartir este artículo con la siguiente URL única:"
 
-#: plugins/share/init.php:115
+#: plugins/share/init.php:114
 msgid "Unshare article"
 msgstr "Dejar de compartir el artículo"
 
+#: plugins/af_comics/init.php:48
+msgid "Feeds supported by af_comics"
+msgstr "Fuentes soportadas por af_comics"
+
+#: plugins/af_comics/init.php:50
+msgid "The following comics are currently supported:"
+msgstr "Actualmente están soportados los siguientes cómics:"
+
+#: plugins/af_comics/init.php:68
+msgid "GoComics requires a specific URL to workaround their lack of feed support: <code>http://feeds.feedburner.com/uclick/<em>comic_name</em></code> (e.g. <code>http://www.gocomics.com/garfield</code> uses <code>http://feeds.feedburner.com/uclick/garfield</code>)."
+msgstr ""
+
+#: plugins/af_comics/init.php:70
+msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:25
+msgid "Reddit content settings (af_redditimgur)"
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:50
+msgid "Uses Readability (full-text-rss) implementation by <a target='_blank' href='https://bitbucket.org/fivefilters/'>FiveFilters.org</a>"
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:54
+msgid "Extract missing content using Readability"
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:59
+msgid "Enable additional duplicate checking"
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:73
+#: plugins/af_zz_imgproxy/init.php:254
+#, fuzzy
+msgid "Configuration saved"
+msgstr "Configuración guardada."
+
+#: plugins/note/init.php:26
+#: plugins/note/note.js:11
+msgid "Edit article note"
+msgstr "Editar nota del artículo"
+
+#: plugins/close_button/init.php:25
+msgid "Close article"
+msgstr "Cerrar artículo"
+
+#: plugins/af_zz_imgproxy/init.php:210
+msgid "Image proxy settings (af_zz_imgproxy)"
+msgstr ""
+
+#: plugins/af_zz_imgproxy/init.php:234
+#, fuzzy
+msgid "Enable proxy for all remote images."
+msgstr "Actualizar todas las fuentes"
+
+#: plugins/af_zz_imgproxy/init.php:238
+#, fuzzy
+msgid "Don't cache files locally."
+msgstr "Guardar las imágenes en la memoria caché local"
+
+#: plugins/auth_internal/init.php:65
+msgid "Please enter your one time password:"
+msgstr "Por favor, introduzca su contraseña de un solo uso:"
+
+#: plugins/auth_internal/init.php:188
+msgid "Password has been changed."
+msgstr "La contraseña ha sido cambiada."
+
+#: plugins/auth_internal/init.php:190
+msgid "Old password is incorrect."
+msgstr "La contraseña antigua es incorrecta."
+
 #: js/FeedTree.js:172
 #, fuzzy
 msgid "(Un)collapse"
 msgstr "Mostrar/ocultar la barra lateral"
 
-#: js/PrefFeedTree.js:52
+#: js/PrefFeedTree.js:54
 msgid "Edit category"
 msgstr "Editar categoría"
 
-#: js/PrefFeedTree.js:59
+#: js/PrefFeedTree.js:61
 msgid "Remove category"
 msgstr "Borrar categoría"
 
@@ -2878,63 +2804,55 @@ msgid "Create Filter"
 msgstr "Crear filtro"
 
 #: js/functions.js:1128
-msgid "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification hub again on next feed update."
-msgstr "¿Restaurar suscripción? Tiny Tiny RSS volverá a intentar suscribirse al hub de notificaciones en la siguiente actualización de fuentes."
-
-#: js/functions.js:1139
-msgid "Subscription reset."
-msgstr "Suscripción reiniciada."
-
-#: js/functions.js:1149
-#: js/tt-rss.js:695
+#: js/tt-rss.js:696
 #, perl-format
 msgid "Unsubscribe from %s?"
 msgstr "¿Cancelar la suscripción a %s?"
 
-#: js/functions.js:1152
+#: js/functions.js:1131
 msgid "Removing feed..."
 msgstr "Eliminando la fuente..."
 
-#: js/functions.js:1225
+#: js/functions.js:1204
 msgid "Please enter category title:"
 msgstr "Introduzca el nombre de la categoría:"
 
-#: js/functions.js:1250
+#: js/functions.js:1229
 msgid "Generate new syndication address for this feed?"
 msgstr "¿Generar nueva dirección de sindicación para esta fuente?"
 
-#: js/functions.js:1254
-#: js/prefs.js:1154
+#: js/functions.js:1233
+#: js/prefs.js:1150
 msgid "Trying to change address..."
 msgstr "Intentando cambiar la dirección..."
 
-#: js/functions.js:1497
-#: js/functions.js:1606
+#: js/functions.js:1476
+#: js/functions.js:1585
 #: js/prefs.js:398
 #: js/prefs.js:424
 #: js/prefs.js:456
 #: js/prefs.js:599
 #: js/prefs.js:617
-#: js/prefs.js:1136
-#: js/prefs.js:1263
+#: js/prefs.js:1132
+#: js/prefs.js:1259
 msgid "No feeds are selected."
 msgstr "No se han seleccionado fuentes."
 
-#: js/functions.js:1540
+#: js/functions.js:1519
 msgid "Remove selected feeds from the archive? Feeds with stored articles will not be removed."
 msgstr "¿Eliminar las fuentes seleccionadas del archivo? Las fuentes con artículos archivados no serán eliminadas."
 
-#: js/functions.js:1577
+#: js/functions.js:1556
 msgid "Feeds with update errors"
 msgstr "Fuentes con errores de actualización"
 
-#: js/functions.js:1588
-#: js/prefs.js:1117
+#: js/functions.js:1567
+#: js/prefs.js:1113
 msgid "Remove selected feeds?"
 msgstr "¿Borrar fuentes seleccionadas?"
 
-#: js/functions.js:1591
-#: js/prefs.js:1120
+#: js/functions.js:1570
+#: js/prefs.js:1116
 msgid "Removing selected feeds..."
 msgstr "Borrando fuentes seleccionadas..."
 
@@ -2957,9 +2875,7 @@ msgstr "Editor de usuario"
 #: js/prefs.js:100
 #: js/prefs.js:209
 #: js/prefs.js:706
-#: plugins/instances/instances.js:26
-#: plugins/instances/instances.js:89
-#: js/functions.js:1408
+#: js/functions.js:1387
 msgid "Saving data..."
 msgstr "Guardando datos..."
 
@@ -2984,7 +2900,7 @@ msgid "Removing selected labels..."
 msgstr "Eliminando las etiquetas seleccionadas..."
 
 #: js/prefs.js:308
-#: js/prefs.js:1304
+#: js/prefs.js:1300
 msgid "No labels are selected."
 msgstr "No se han seleccionado marcadores."
 
@@ -3083,28 +2999,28 @@ msgstr "¿Guardar los cambios de las fuentes seleccionadas?"
 msgid "OPML Import"
 msgstr "Importar OPML"
 
-#: js/prefs.js:764
+#: js/prefs.js:759
 msgid "Please choose an OPML file first."
 msgstr "Por favor, seleccione un archivo OPML."
 
-#: js/prefs.js:767
+#: js/prefs.js:762
 #: plugins/import_export/import_export.js:115
 msgid "Importing, please wait..."
 msgstr "Importando, espere por favor..."
 
-#: js/prefs.js:928
+#: js/prefs.js:924
 msgid "Reset to defaults?"
 msgstr "¿Restaurar las opciones por defecto?"
 
-#: js/prefs.js:1628
+#: js/prefs.js:1624
 msgid "Subscribing to feeds..."
 msgstr "Suscribiéndose a las fuentes..."
 
-#: js/prefs.js:1647
+#: js/prefs.js:1643
 msgid "Clear stored data for this plugin?"
 msgstr "¿Borrar los datos guardados por este plugin?"
 
-#: js/prefs.js:1661
+#: js/prefs.js:1657
 msgid "Clear all messages in the error log?"
 msgstr "¿Borrar todos los mensajes del registro de errores?"
 
@@ -3116,177 +3032,147 @@ msgstr "¿Marcar todos los artículos como leídos?"
 msgid "Marking all feeds as read..."
 msgstr "Marcando todas las fuentes como leídas..."
 
-#: js/tt-rss.js:401
+#: js/tt-rss.js:402
 msgid "Please enable mail plugin first."
 msgstr "Por favor, habilite primero el plugin mail."
 
-#: js/tt-rss.js:449
-#: js/functions.js:1387
-#: js/tt-rss.js:676
+#: js/tt-rss.js:450
+#: js/functions.js:1366
+#: js/tt-rss.js:677
 msgid "You can't edit this kind of feed."
 msgstr "No puede editar esta clase de fuente."
 
-#: js/tt-rss.js:530
+#: js/tt-rss.js:531
 msgid "Please enable embed_original plugin first."
 msgstr "Por favor, habilite primero el plugin embed_original."
 
-#: js/tt-rss.js:543
-#: js/tt-rss.js:726
+#: js/tt-rss.js:544
+#: js/tt-rss.js:727
 msgid "Widescreen is not available in combined mode."
 msgstr ""
 
-#: js/tt-rss.js:824
+#: js/tt-rss.js:825
 msgid "You can't rescore this kind of feed."
 msgstr "No puede reiniciar la puntuación de esta clase de fuente."
 
-#: js/tt-rss.js:829
-#: js/tt-rss.js:689
+#: js/tt-rss.js:830
+#: js/tt-rss.js:690
 msgid "Please select some feed first."
 msgstr "Por favor, seleccione primero alguna fuente."
 
-#: js/tt-rss.js:834
+#: js/tt-rss.js:835
 #, perl-format
 msgid "Rescore articles in %s?"
 msgstr "¿Reiniciar la puntuación de los artículos de %s?"
 
-#: js/tt-rss.js:837
+#: js/tt-rss.js:838
 msgid "Rescoring articles..."
 msgstr "Reiniciando la puntuación de los artículos..."
 
-#: js/viewfeed.js:919
-#: js/viewfeed.js:957
-#: js/viewfeed.js:1005
-#: js/viewfeed.js:1931
-#: plugins/mail/mail.js:7
+#: js/viewfeed.js:921
+#: js/viewfeed.js:959
+#: js/viewfeed.js:1007
+#: js/viewfeed.js:1933
 #: plugins/mailto/init.js:7
-#: js/viewfeed.js:677
-#: js/viewfeed.js:699
-#: js/viewfeed.js:720
-#: js/viewfeed.js:779
-#: js/viewfeed.js:807
+#: plugins/mail/mail.js:7
+#: js/viewfeed.js:679
+#: js/viewfeed.js:701
+#: js/viewfeed.js:722
+#: js/viewfeed.js:781
+#: js/viewfeed.js:809
 msgid "No articles are selected."
 msgstr "No se han seleccionado artículos."
 
-#: js/viewfeed.js:927
+#: js/viewfeed.js:929
 #, perl-format
 msgid "Delete %d selected article in %s?"
 msgid_plural "Delete %d selected articles in %s?"
 msgstr[0] "¿Borrar %d artículo seleccionado en %s?"
 msgstr[1] "¿Borrar %d artículos seleccionados en %s?"
 
-#: js/viewfeed.js:929
+#: js/viewfeed.js:931
 #, perl-format
 msgid "Delete %d selected article?"
 msgid_plural "Delete %d selected articles?"
 msgstr[0] "¿Borrar %d artículo seleccionado?"
 msgstr[1] "¿Borrar %d artículos seleccionados?"
 
-#: js/viewfeed.js:966
+#: js/viewfeed.js:968
 #, perl-format
 msgid "Archive %d selected article in %s?"
 msgid_plural "Archive %d selected articles in %s?"
 msgstr[0] "¿Archivar %d artículo seleccionado en %s?"
 msgstr[1] "¿Archivar %d artículos seleccionados en %s?"
 
-#: js/viewfeed.js:969
+#: js/viewfeed.js:971
 #, perl-format
 msgid "Move %d archived article back?"
 msgid_plural "Move %d archived articles back?"
 msgstr[0] "¿Mover %d artículo archivado a su fuente original?"
 msgstr[1] "¿Mover %d artículos archivados a su fuente original?"
 
-#: js/viewfeed.js:971
+#: js/viewfeed.js:973
 msgid "Please note that unstarred articles might get purged on next feed update."
 msgstr "Recuerde que los artículos no favoritos podrían ser purgados en la siguiente actualización de las fuentes."
 
-#: js/viewfeed.js:1011
+#: js/viewfeed.js:1013
 #, perl-format
 msgid "Mark %d selected article in %s as read?"
 msgid_plural "Mark %d selected articles in %s as read?"
 msgstr[0] "¿Marcar %d artículo seleccionado de %s como leído?"
 msgstr[1] "¿Marcar %d artículos seleccionados de %s como leídos?"
 
-#: js/viewfeed.js:1031
+#: js/viewfeed.js:1033
 msgid "Edit article Tags"
 msgstr "Editar las etiquetas del artículo"
 
-#: js/viewfeed.js:1037
+#: js/viewfeed.js:1039
 msgid "Saving article tags..."
 msgstr "Guardando las etiquetas del artículo..."
 
-#: js/viewfeed.js:1670
+#: js/viewfeed.js:1672
 msgid "Open original article"
 msgstr "Abrir artículo original"
 
-#: js/viewfeed.js:1677
+#: js/viewfeed.js:1679
 msgid "Display article URL"
 msgstr "Mostrar la URL del artículo"
 
-#: js/viewfeed.js:1787
+#: js/viewfeed.js:1789
 msgid "Assign label"
 msgstr "Asignar marcador"
 
-#: js/viewfeed.js:1792
+#: js/viewfeed.js:1794
 msgid "Remove label"
 msgstr "Borrar marcador"
 
-#: js/viewfeed.js:1824
+#: js/viewfeed.js:1826
 msgid "Select articles in group"
 msgstr "Seleccionar los artículos del grupo"
 
-#: js/viewfeed.js:1834
+#: js/viewfeed.js:1836
 msgid "Mark group as read"
 msgstr "Marcar grupo como leído"
 
-#: js/viewfeed.js:1846
+#: js/viewfeed.js:1848
 msgid "Mark feed as read"
 msgstr "Marcar fuente como leída"
 
-#: js/viewfeed.js:1899
+#: js/viewfeed.js:1901
 msgid "Please enter new score for selected articles:"
 msgstr "Por favor, introduzca puntuación para los artículos seleccionados:"
 
-#: js/viewfeed.js:1962
+#: js/viewfeed.js:1964
 msgid "Please enter new score for this article:"
 msgstr "Por favor, introduzca puntuación para este artículo:"
 
-#: js/viewfeed.js:1993
+#: js/viewfeed.js:1995
 msgid "Article URL:"
 msgstr "URL del artículo:"
 
-#: plugins/instances/instances.js:10
-msgid "Link Instance"
-msgstr "Enlazar instancia"
-
-#: plugins/instances/instances.js:73
-msgid "Edit Instance"
-msgstr "Editar instancia"
-
-#: plugins/instances/instances.js:122
-msgid "Remove selected instances?"
-msgstr "¿Borrar instancias seleccionadas?"
-
-#: plugins/instances/instances.js:125
-msgid "Removing selected instances..."
-msgstr "Borrando instancias seleccionadas..."
-
-#: plugins/instances/instances.js:139
-#: plugins/instances/instances.js:151
-msgid "No instances are selected."
-msgstr "No se han seleccionado instancias."
-
-#: plugins/instances/instances.js:156
-msgid "Please select only one instance."
-msgstr "Por favor, seleccione una sola instancia."
-
-#: plugins/note/note.js:17
-msgid "Saving article note..."
-msgstr "Guardando nota del artículo..."
-
-#: plugins/af_psql_trgm/init.js:11
-#, fuzzy
-msgid "Related articles"
-msgstr "Borrar artículo"
+#: plugins/embed_original/init.js:6
+msgid "Sorry, your browser does not support sandboxed iframes."
+msgstr "Lo siento, su navegador no soporta iframes aislados (sandbox)."
 
 #: plugins/import_export/import_export.js:13
 msgid "Export Data"
@@ -3307,11 +3193,16 @@ msgstr "Importación de datos"
 msgid "Please choose the file first."
 msgstr "Por favor, seleccione un archivo."
 
-#: plugins/mail/mail.js:21
 #: plugins/mailto/init.js:21
+#: plugins/mail/mail.js:21
 msgid "Forward article by email"
 msgstr "Enviar artículo por correo"
 
+#: plugins/af_psql_trgm/init.js:11
+#, fuzzy
+msgid "Related articles"
+msgstr "Borrar artículo"
+
 #: plugins/mail/mail.js:36
 msgid "Error sending email:"
 msgstr ""
@@ -3321,10 +3212,6 @@ msgstr ""
 msgid "Your message has been sent."
 msgstr "Sus datos personales han sido guardados."
 
-#: plugins/embed_original/init.js:6
-msgid "Sorry, your browser does not support sandboxed iframes."
-msgstr "Lo siento, su navegador no soporta iframes aislados (sandbox)."
-
 #: plugins/shorten_expanded/init.js:39
 msgid "Click to expand article"
 msgstr "Desplegar el artículo"
@@ -3354,7 +3241,7 @@ msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr "Se invalidarán todas las URLs de artículos compartidos. ¿Continuar?"
 
 #: plugins/share/share_prefs.js:6
-#: js/prefs.js:1437
+#: js/prefs.js:1433
 msgid "Clearing URLs..."
 msgstr "Limpiando URLs..."
 
@@ -3362,23 +3249,44 @@ msgstr "Limpiando URLs..."
 msgid "Shared URLs cleared."
 msgstr "Las URLs compartidas han sido borradas."
 
+#: plugins/note/note.js:17
+msgid "Saving article note..."
+msgstr "Guardando nota del artículo..."
+
 #: js/feedlist.js:429
-#: js/feedlist.js:496
 msgid "Mark all articles in %s as read?"
 msgstr "¿Marcar todos los artículos de %s como leídos?"
 
 #: js/feedlist.js:487
-msgid "Mark all articles in %s older than 1 day as read?"
+#, fuzzy
+msgid "Mark %w in %s older than 1 day as read?"
 msgstr "¿Marcar como leídos todos los artículos de más de 1 día de antigüedad de %s? "
 
 #: js/feedlist.js:490
-msgid "Mark all articles in %s older than 1 week as read?"
+#, fuzzy
+msgid "Mark %w in %s older than 1 week as read?"
 msgstr "¿Marcar como leídos todos los artículos de más de 1 semana de antigüedad de %s?"
 
 #: js/feedlist.js:493
-msgid "Mark all articles in %s older than 2 weeks as read?"
+#, fuzzy
+msgid "Mark %w in %s older than 2 weeks as read?"
 msgstr "¿Marcar como leídos todos los artículos de más de 2 semanas de antigüedad de %s?"
 
+#: js/feedlist.js:496
+#, fuzzy
+msgid "Mark %w in %s as read?"
+msgstr "¿Marcar todos los artículos de %s como leídos?"
+
+#: js/feedlist.js:499
+#, fuzzy
+msgid "search results"
+msgstr "Resultados de búsqueda: %s"
+
+#: js/feedlist.js:499
+#, fuzzy
+msgid "all articles"
+msgstr "Todos"
+
 #: js/functions.js:506
 msgid "Error explained"
 msgstr "Error explicado"
@@ -3459,178 +3367,247 @@ msgstr "Ya está suscrito a esta fuente."
 msgid "Edit rule"
 msgstr "Editar regla"
 
-#: js/functions.js:1402
+#: js/functions.js:1381
 msgid "Edit Feed"
 msgstr "Editar fuente"
 
-#: js/functions.js:1435
+#: js/functions.js:1414
 msgid "More Feeds"
 msgstr "Más fuentes"
 
-#: js/functions.js:1631
+#: js/functions.js:1610
 msgid "Help"
 msgstr "Ayuda"
 
-#: js/prefs.js:1032
+#: js/prefs.js:1028
 msgid "Remove category %s? Any nested feeds would be placed into Uncategorized."
 msgstr "¿Borrar la categoría %s? Cualquier subcategoría será movida a Sin Categoría."
 
-#: js/prefs.js:1038
+#: js/prefs.js:1034
 msgid "Removing category..."
 msgstr "Borrando categoría..."
 
-#: js/prefs.js:1056
+#: js/prefs.js:1052
 msgid "Remove selected categories?"
 msgstr "¿Eliminar las categorías seleccionadas?"
 
-#: js/prefs.js:1059
+#: js/prefs.js:1055
 msgid "Removing selected categories..."
 msgstr "Eliminando las categorías seleccionadas..."
 
-#: js/prefs.js:1072
+#: js/prefs.js:1068
 msgid "No categories are selected."
 msgstr "No se han seleccionado categorías."
 
-#: js/prefs.js:1079
+#: js/prefs.js:1075
 msgid "Category title:"
 msgstr "Nombre de la categoría:"
 
-#: js/prefs.js:1083
+#: js/prefs.js:1079
 msgid "Creating category..."
 msgstr "Creando categoría..."
 
-#: js/prefs.js:1106
+#: js/prefs.js:1102
 msgid "Feeds without recent updates"
 msgstr "Fuentes sin actualizaciones recientes"
 
-#: js/prefs.js:1150
+#: js/prefs.js:1146
 msgid "Replace current OPML publishing address with a new one?"
 msgstr "¿Reemplazar la dirección actual de publicación del OPML por una dirección nueva?"
 
-#: js/prefs.js:1227
+#: js/prefs.js:1223
 msgid "Clearing feed..."
 msgstr "Limpiando la fuente..."
 
-#: js/prefs.js:1247
+#: js/prefs.js:1243
 msgid "Rescore articles in selected feeds?"
 msgstr "¿Reiniciar la puntuación de los artículos de las fuentes seleccionadas?"
 
-#: js/prefs.js:1250
+#: js/prefs.js:1246
 msgid "Rescoring selected feeds..."
 msgstr "Volviendo a puntuar las fuentes seleccionadas..."
 
-#: js/prefs.js:1270
+#: js/prefs.js:1266
 msgid "Rescore all articles? This operation may take a lot of time."
 msgstr "¿Reiniciar la puntuación de todos los artículos? Esta operación puede llevar cierto tiempo."
 
-#: js/prefs.js:1273
+#: js/prefs.js:1269
 msgid "Rescoring feeds..."
 msgstr "Volviendo a puntuar las fuentes..."
 
-#: js/prefs.js:1289
+#: js/prefs.js:1285
 msgid "Reset selected labels to default colors?"
 msgstr "¿Restaurar color por defecto en los marcadores seleccionados?"
 
-#: js/prefs.js:1321
+#: js/prefs.js:1317
 msgid "Settings Profiles"
 msgstr "Perfiles de preferencias"
 
-#: js/prefs.js:1330
+#: js/prefs.js:1326
 msgid "Remove selected profiles? Active and default profiles will not be removed."
 msgstr "¿Borrar los perfiles seleccionados? El perfil activo y el perfil por defecto no serán borrados."
 
-#: js/prefs.js:1333
+#: js/prefs.js:1329
 msgid "Removing selected profiles..."
 msgstr "Borrando los perfiles seleccionados..."
 
-#: js/prefs.js:1349
+#: js/prefs.js:1345
 msgid "No profiles are selected."
 msgstr "No se ha seleccionado ningún perfil."
 
-#: js/prefs.js:1357
-#: js/prefs.js:1410
+#: js/prefs.js:1353
+#: js/prefs.js:1406
 msgid "Activate selected profile?"
 msgstr "¿Activar el perfil seleccionado?"
 
-#: js/prefs.js:1374
-#: js/prefs.js:1426
+#: js/prefs.js:1370
+#: js/prefs.js:1422
 msgid "Please choose a profile to activate."
 msgstr "Seleccione un perfil para activar."
 
-#: js/prefs.js:1379
+#: js/prefs.js:1375
 msgid "Creating profile..."
 msgstr "Creando perfil..."
 
-#: js/prefs.js:1434
+#: js/prefs.js:1430
 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr "Se invalidarán todas las URLs generadas previamente. ¿Continuar?"
 
-#: js/prefs.js:1444
+#: js/prefs.js:1440
 msgid "Generated URLs cleared."
 msgstr "Borrar todas las URLs generadas"
 
-#: js/prefs.js:1516
+#: js/prefs.js:1512
 msgid "Label Editor"
 msgstr "Editor de marcadores"
 
-#: js/tt-rss.js:684
+#: js/tt-rss.js:685
 msgid "You can't unsubscribe from the category."
 msgstr "No puede cancelar la suscripción a la categoría."
 
-#: js/viewfeed.js:125
-#: js/viewfeed.js:175
-#: js/viewfeed.js:192
+#: js/viewfeed.js:127
+#: js/viewfeed.js:177
+#: js/viewfeed.js:194
 #, fuzzy
 msgid "Click to open next unread feed."
 msgstr "Pulse para editar fuente"
 
-#: js/viewfeed.js:129
+#: js/viewfeed.js:131
 msgid "Cancel search"
 msgstr "Cancelar búsqueda"
 
-#: js/viewfeed.js:189
+#: js/viewfeed.js:191
 #, fuzzy
 msgid "New articles found, reload feed to continue."
 msgstr "No se han encontrado artículos que mostrar."
 
-#: js/viewfeed.js:424
+#: js/viewfeed.js:426
 msgid "Unstar article"
 msgstr "Quitar el artículo de los favoritos"
 
-#: js/viewfeed.js:428
+#: js/viewfeed.js:430
 msgid "Star article"
 msgstr "Marcar el artículo como favorito"
 
-#: js/viewfeed.js:478
+#: js/viewfeed.js:480
 msgid "Unpublish article"
 msgstr "Despublicar artículo"
 
-#: js/viewfeed.js:482
+#: js/viewfeed.js:484
 msgid "Publish article"
 msgstr "Publicar artículo"
 
-#: js/viewfeed.js:622
+#: js/viewfeed.js:624
 msgid "%d article selected"
 msgid_plural "%d articles selected"
 msgstr[0] "%d artículo seleccionado"
 msgstr[1] "%d artículos seleccionados"
 
-#: js/viewfeed.js:1286
+#: js/viewfeed.js:1288
 msgid "No article is selected."
 msgstr "No se ha seleccionado ningún artículo."
 
-#: js/viewfeed.js:1321
+#: js/viewfeed.js:1323
 msgid "No articles found to mark"
 msgstr "No se han encontrado artículos que marcar"
 
-#: js/viewfeed.js:1323
+#: js/viewfeed.js:1325
 msgid "Mark %d article as read?"
 msgid_plural "Mark %d articles as read?"
 msgstr[0] "¿Marcar %d artículo como leído?"
 msgstr[1] "¿Marcar %d artículos como leídos?"
 
-#~ msgid "Cache images locally"
-#~ msgstr "Guardar las imágenes en la memoria caché local"
+#~ msgid "Resubscribe to push updates"
+#~ msgstr "Volver a suscribirse a las actualizaciones push"
+
+#~ msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
+#~ msgstr "Reinicia el estatus de suscripción de PubSubHubbub para las fuentes habilitadas para push."
+
+#~ msgid "Download more plugins at tt-rss.org <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forums</a> or <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a>."
+#~ msgstr "Descargue más plugins de tt-rss.org: <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">foros</a> y <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a>."
+
+#~ msgid "Linked"
+#~ msgstr "Enlazado"
+
+#~ msgid "Instance"
+#~ msgstr "Instancia"
+
+#~ msgid "Instance URL"
+#~ msgstr "URL de la instancia"
+
+#~ msgid "Access key:"
+#~ msgstr "Clave de acceso:"
+
+#~ msgid "Access key"
+#~ msgstr "Clave de acceso"
+
+#~ msgid "Use one access key for both linked instances."
+#~ msgstr "Usar una clave de acceso para ambas instancias enlazadas."
+
+#~ msgid "Generate new key"
+#~ msgstr "Generar nueva clave"
+
+#~ msgid "Link instance"
+#~ msgstr "Enlazar instancia"
+
+#~ msgid "You can connect other instances of Tiny Tiny RSS to this one to share Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
+#~ msgstr "Puede conectar otras instancias de Tiny Tiny RSS con esta para compartir Fuentes Populares. Para enlazar esta instancia de Tiny Tiny RSS con otras utilice esta URL:"
+
+#~ msgid "Last connected"
+#~ msgstr "Última sesión"
+
+#~ msgid "Status"
+#~ msgstr "Estatus"
+
+#~ msgid "Stored feeds"
+#~ msgstr "Fuentes archivadas"
+
+#~ msgid "Create link"
+#~ msgstr "Crear enlace"
+
+#~ msgid "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification hub again on next feed update."
+#~ msgstr "¿Restaurar suscripción? Tiny Tiny RSS volverá a intentar suscribirse al hub de notificaciones en la siguiente actualización de fuentes."
+
+#~ msgid "Subscription reset."
+#~ msgstr "Suscripción reiniciada."
+
+#~ msgid "Link Instance"
+#~ msgstr "Enlazar instancia"
+
+#~ msgid "Edit Instance"
+#~ msgstr "Editar instancia"
+
+#~ msgid "Remove selected instances?"
+#~ msgstr "¿Borrar instancias seleccionadas?"
+
+#~ msgid "Removing selected instances..."
+#~ msgstr "Borrando instancias seleccionadas..."
+
+#~ msgid "No instances are selected."
+#~ msgstr "No se han seleccionado instancias."
+
+#~ msgid "Please select only one instance."
+#~ msgstr "Por favor, seleccione una sola instancia."
 
 #~ msgid "The error will be reported to the configured log destination."
 #~ msgstr "El error será reportado a la ubicación configurada para los logs."
diff --git a/locale/es_LA/LC_MESSAGES/messages.mo b/locale/es_LA/LC_MESSAGES/messages.mo
index 923e2f95a..eac1977ab 100644
--- a/locale/es_LA/LC_MESSAGES/messages.mo
+++ b/locale/es_LA/LC_MESSAGES/messages.mo
diff --git a/locale/es_LA/LC_MESSAGES/messages.po b/locale/es_LA/LC_MESSAGES/messages.po
index 25bbd9db0..80a079b00 100644
--- a/locale/es_LA/LC_MESSAGES/messages.po
+++ b/locale/es_LA/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tt-rss git\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 15:25+0300\n"
+"POT-Creation-Date: 2017-07-04 16:29+0300\n"
 "Last-Translator: Brendan <[email protected]>\n"
 "Language-Team: OpenSRS [email protected]>\n"
 "Language: es_LA\n"
@@ -166,31 +166,30 @@ msgstr "Usuario no encontrado"
 #: prefs.php:118
 #: classes/backend.php:5
 #: classes/pref/labels.php:282
-#: classes/pref/feeds.php:1402
-#: classes/pref/filters.php:779
+#: classes/pref/filters.php:819
+#: classes/pref/feeds.php:1376
 #: js/feedlist.js:149
-#: js/functions.js:1131
-#: js/functions.js:1231
-#: js/functions.js:1478
+#: js/functions.js:1210
+#: js/functions.js:1457
 #: js/prefs.js:621
-#: js/prefs.js:818
-#: js/prefs.js:1648
-#: js/prefs.js:1663
-#: js/tt-rss.js:550
-#: js/viewfeed.js:1182
+#: js/prefs.js:813
+#: js/prefs.js:1644
+#: js/prefs.js:1659
+#: js/tt-rss.js:551
+#: js/viewfeed.js:1184
 #: plugins/import_export/import_export.js:17
 #: js/feedlist.js:467
-#: js/feedlist.js:512
+#: js/feedlist.js:515
 #: js/functions.js:372
 #: js/functions.js:630
-#: js/prefs.js:1360
-#: js/prefs.js:1413
-#: js/prefs.js:1452
-#: js/prefs.js:1465
-#: js/prefs.js:1476
-#: js/prefs.js:1491
-#: js/tt-rss.js:567
-#: js/viewfeed.js:762
+#: js/prefs.js:1356
+#: js/prefs.js:1409
+#: js/prefs.js:1448
+#: js/prefs.js:1461
+#: js/prefs.js:1472
+#: js/prefs.js:1487
+#: js/tt-rss.js:568
+#: js/viewfeed.js:764
 msgid "Loading, please wait..."
 msgstr "Cargando. Por favor, espere..."
 
@@ -207,13 +206,13 @@ msgid "All Articles"
 msgstr "Todos"
 
 #: index.php:192
-#: include/functions2.php:107
+#: include/functions.php:1181
 #: classes/feeds.php:110
 msgid "Starred"
 msgstr "Favoritos"
 
 #: index.php:193
-#: include/functions2.php:108
+#: include/functions.php:1182
 #: classes/feeds.php:111
 msgid "Published"
 msgstr "Publicados"
@@ -254,7 +253,7 @@ msgstr "Título"
 
 #: index.php:209
 #: index.php:249
-#: include/functions2.php:95
+#: include/functions.php:1169
 #: classes/feeds.php:115
 #: js/FeedTree.js:138
 #: js/FeedTree.js:166
@@ -294,7 +293,7 @@ msgid "Feed actions:"
 msgstr "Acciones de la fuente:"
 
 #: index.php:244
-#: classes/handler/public.php:672
+#: classes/handler/public.php:583
 msgid "Subscribe to feed..."
 msgstr "Suscribirse a una fuente..."
 
@@ -308,8 +307,8 @@ msgstr "Reiniciar la puntuación"
 
 #: index.php:247
 #: classes/pref/feeds.php:785
-#: classes/pref/feeds.php:1357
-#: js/PrefFeedTree.js:78
+#: classes/pref/feeds.php:1331
+#: js/PrefFeedTree.js:80
 msgid "Unsubscribe"
 msgstr "Cancelar la suscripción"
 
@@ -326,7 +325,7 @@ msgid "Other actions:"
 msgstr "Otras acciones:"
 
 #: index.php:252
-#: include/functions2.php:81
+#: include/functions.php:1155
 msgid "Toggle widescreen mode"
 msgstr "Alternar modo de pantalla ancha"
 
@@ -352,7 +351,7 @@ msgstr ""
 
 #: prefs.php:33
 #: prefs.php:136
-#: include/functions2.php:110
+#: include/functions.php:1184
 #: classes/pref/prefs.php:435
 msgid "Preferences"
 msgstr "Preferencias"
@@ -367,20 +366,19 @@ msgstr "Salir de las preferencias"
 
 #: prefs.php:139
 #: classes/pref/feeds.php:112
-#: classes/pref/feeds.php:1297
-#: classes/pref/feeds.php:1346
+#: classes/pref/feeds.php:1271
+#: classes/pref/feeds.php:1320
 msgid "Feeds"
 msgstr "Fuentes"
 
 #: prefs.php:142
-#: classes/pref/filters.php:248
+#: classes/pref/filters.php:273
 msgid "Filters"
 msgstr "Filtros"
 
 #: prefs.php:145
-#: include/functions.php:1327
-#: include/functions.php:1979
 #: classes/pref/labels.php:90
+#: classes/feeds.php:1718
 msgid "Labels"
 msgstr "Marcadores"
 
@@ -409,13 +407,13 @@ msgstr ""
 #: register.php:337
 #: register.php:347
 #: register.php:359
-#: classes/handler/public.php:742
-#: classes/handler/public.php:813
-#: classes/handler/public.php:911
-#: classes/handler/public.php:990
-#: classes/handler/public.php:1004
-#: classes/handler/public.php:1011
-#: classes/handler/public.php:1036
+#: classes/handler/public.php:653
+#: classes/handler/public.php:724
+#: classes/handler/public.php:822
+#: classes/handler/public.php:901
+#: classes/handler/public.php:915
+#: classes/handler/public.php:922
+#: classes/handler/public.php:947
 #, fuzzy
 msgid "Return to Tiny Tiny RSS"
 msgstr "Actualizar Tiny Tiny RSS"
@@ -433,12 +431,12 @@ msgid "Check availability"
 msgstr "Comprobar la disponibilidad"
 
 #: register.php:229
-#: classes/handler/public.php:829
+#: classes/handler/public.php:740
 msgid "Email:"
 msgstr "Correo electrónico:"
 
 #: register.php:232
-#: classes/handler/public.php:834
+#: classes/handler/public.php:745
 msgid "How much is two plus two:"
 msgstr ""
 
@@ -466,17 +464,23 @@ msgstr "Cuenta creada correctamente."
 msgid "New user registrations are currently closed."
 msgstr ""
 
-#: update.php:67
+#: update.php:66
 msgid "Tiny Tiny RSS data update script."
 msgstr ""
 
-#: include/digest.php:109
-#: include/functions.php:1336
-#: include/functions.php:1880
-#: include/functions.php:1965
-#: include/functions.php:1987
-#: classes/opml.php:421
+#: include/controls.php:83
+#: classes/pref/filters.php:242
+#: classes/pref/filters.php:253
+#: classes/pref/filters.php:544
+msgid "All feeds"
+msgstr "Todas las fuentes"
+
+#: include/controls.php:134
+#: include/controls.php:316
 #: classes/pref/feeds.php:228
+#: classes/opml.php:486
+#: classes/feeds.php:1727
+#: classes/digest.php:113
 msgid "Uncategorized"
 msgstr "Sin clasificar"
 
@@ -491,395 +495,290 @@ msgstr[1] "Artículos archivados"
 msgid "No feeds found."
 msgstr "No se han encontrado fuentes."
 
-#: include/functions.php:1029
+#: include/functions.php:900
 #, php-format
 msgid "%d min"
 msgstr ""
 
-#: include/functions.php:1325
-#: include/functions.php:1977
-msgid "Special"
-msgstr "Especial"
-
-#: include/functions.php:1828
-#: classes/pref/filters.php:229
-#: classes/pref/filters.php:507
-msgid "All feeds"
-msgstr "Todas las fuentes"
-
-#: include/functions.php:2032
-msgid "Starred articles"
-msgstr "Favoritos"
-
-#: include/functions.php:2034
-msgid "Published articles"
-msgstr "Publicados"
-
-#: include/functions.php:2036
-msgid "Fresh articles"
-msgstr "Recientes"
-
-#: include/functions.php:2038
-#: include/functions2.php:105
-msgid "All articles"
-msgstr "Todos"
-
-#: include/functions.php:2040
-msgid "Archived articles"
-msgstr "Artículos archivados"
-
-#: include/functions.php:2042
-msgid "Recently read"
-msgstr "Leídos recientemente"
-
-#: include/functions2.php:57
+#: include/functions.php:1131
 msgid "Navigation"
 msgstr "Navegación"
 
-#: include/functions2.php:58
+#: include/functions.php:1132
 msgid "Open next feed"
 msgstr "Abrir la fuente siguiente"
 
-#: include/functions2.php:59
+#: include/functions.php:1133
 msgid "Open previous feed"
 msgstr "Abrir la fuente anterior"
 
-#: include/functions2.php:60
+#: include/functions.php:1134
 msgid "Open next article"
 msgstr "Abrir el artículo siguiente"
 
-#: include/functions2.php:61
+#: include/functions.php:1135
 msgid "Open previous article"
 msgstr "Abrir el artículo anterior"
 
-#: include/functions2.php:62
+#: include/functions.php:1136
 msgid "Open next article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions2.php:63
+#: include/functions.php:1137
 msgid "Open previous article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions2.php:64
+#: include/functions.php:1138
 msgid "Move to next article (don't expand or mark read)"
 msgstr ""
 
-#: include/functions2.php:65
+#: include/functions.php:1139
 msgid "Move to previous article (don't expand or mark read)"
 msgstr ""
 
-#: include/functions2.php:66
+#: include/functions.php:1140
 msgid "Show search dialog"
 msgstr "Mostrar el diálogo de búsqueda"
 
-#: include/functions2.php:67
+#: include/functions.php:1141
 msgid "Article"
 msgstr "Artículo"
 
-#: include/functions2.php:68
-#: js/viewfeed.js:1699
+#: include/functions.php:1142
+#: js/viewfeed.js:1701
 msgid "Toggle starred"
 msgstr "Alternar favoritos"
 
-#: include/functions2.php:69
-#: js/viewfeed.js:1711
+#: include/functions.php:1143
+#: js/viewfeed.js:1713
 msgid "Toggle published"
 msgstr "Alternar publicados"
 
-#: include/functions2.php:70
-#: js/viewfeed.js:1686
+#: include/functions.php:1144
+#: js/viewfeed.js:1688
 msgid "Toggle unread"
 msgstr "Alternar sin leer"
 
-#: include/functions2.php:71
+#: include/functions.php:1145
 msgid "Edit tags"
 msgstr "Editar etiquetas"
 
-#: include/functions2.php:72
+#: include/functions.php:1146
 msgid "Open in new window"
 msgstr "Abrir en nueva ventana"
 
-#: include/functions2.php:73
-#: js/viewfeed.js:1732
+#: include/functions.php:1147
+#: js/viewfeed.js:1734
 msgid "Mark below as read"
 msgstr "Marcar artículos posteriores como leídos"
 
-#: include/functions2.php:74
-#: js/viewfeed.js:1725
+#: include/functions.php:1148
+#: js/viewfeed.js:1727
 msgid "Mark above as read"
 msgstr "Marcar artículos anteriores como leídos"
 
-#: include/functions2.php:75
+#: include/functions.php:1149
 msgid "Scroll down"
 msgstr "Desplazarse hacia abajo"
 
-#: include/functions2.php:76
+#: include/functions.php:1150
 msgid "Scroll up"
 msgstr "Desplazarse hacia arriba"
 
-#: include/functions2.php:77
+#: include/functions.php:1151
 msgid "Select article under cursor"
 msgstr "Seleccionar el artículo bajo el puntero del mouse"
 
-#: include/functions2.php:78
+#: include/functions.php:1152
 msgid "Email article"
 msgstr "Enviar artículo por correo electrónico"
 
-#: include/functions2.php:79
+#: include/functions.php:1153
 msgid "Close/collapse article"
 msgstr "Cerrar/plegar artículo"
 
-#: include/functions2.php:80
+#: include/functions.php:1154
 #, fuzzy
 msgid "Toggle article expansion (combined mode)"
 msgstr "Alternar modo combinado"
 
-#: include/functions2.php:82
+#: include/functions.php:1156
 #: plugins/embed_original/init.php:31
 msgid "Toggle embed original"
 msgstr "Alternar incrustación del artículo original"
 
-#: include/functions2.php:83
+#: include/functions.php:1157
 msgid "Article selection"
 msgstr "Selección de artículos"
 
-#: include/functions2.php:84
+#: include/functions.php:1158
 msgid "Select all articles"
 msgstr "Seleccionar todos los artículos"
 
-#: include/functions2.php:85
+#: include/functions.php:1159
 msgid "Select unread"
 msgstr "Seleccionar artículos sin leer"
 
-#: include/functions2.php:86
+#: include/functions.php:1160
 msgid "Select starred"
 msgstr "Seleccionar artículos favoritos"
 
-#: include/functions2.php:87
+#: include/functions.php:1161
 msgid "Select published"
 msgstr "Seleccionar artículos publicados"
 
-#: include/functions2.php:88
+#: include/functions.php:1162
 msgid "Invert selection"
 msgstr "Invertir selección"
 
-#: include/functions2.php:89
+#: include/functions.php:1163
 msgid "Deselect everything"
 msgstr "Deseleccionar todo"
 
-#: include/functions2.php:90
+#: include/functions.php:1164
 #: classes/pref/feeds.php:555
-#: classes/pref/feeds.php:823
+#: classes/pref/feeds.php:811
 msgid "Feed"
 msgstr "Fuente"
 
-#: include/functions2.php:91
+#: include/functions.php:1165
 msgid "Refresh current feed"
 msgstr "Actualizar la fuente activa"
 
-#: include/functions2.php:92
+#: include/functions.php:1166
 msgid "Un/hide read feeds"
 msgstr "Ocultar/mostrar fuentes leídas"
 
-#: include/functions2.php:93
-#: classes/pref/feeds.php:1349
+#: include/functions.php:1167
+#: classes/pref/feeds.php:1323
 msgid "Subscribe to feed"
 msgstr "Suscribirse a una fuente"
 
-#: include/functions2.php:94
+#: include/functions.php:1168
 #: js/FeedTree.js:145
-#: js/PrefFeedTree.js:72
-#: js/viewfeed.js:1853
+#: js/PrefFeedTree.js:74
+#: js/viewfeed.js:1855
 msgid "Edit feed"
 msgstr "Editar fuente"
 
-#: include/functions2.php:96
+#: include/functions.php:1170
 msgid "Reverse headlines"
 msgstr "Invertir orden de titulares"
 
-#: include/functions2.php:97
+#: include/functions.php:1171
 msgid "Toggle headline grouping"
 msgstr ""
 
-#: include/functions2.php:98
+#: include/functions.php:1172
 msgid "Debug feed update"
 msgstr "Depurar la actualización de fuentes"
 
-#: include/functions2.php:99
+#: include/functions.php:1173
 #, fuzzy
 msgid "Debug viewfeed()"
 msgstr "Depurar la actualización de fuentes"
 
-#: include/functions2.php:100
+#: include/functions.php:1174
 #: js/FeedTree.js:194
 #, fuzzy
 msgid "Mark all feeds as read"
 msgstr "Marcar fuente como leída"
 
-#: include/functions2.php:101
+#: include/functions.php:1175
 msgid "Un/collapse current category"
 msgstr "Desplegar/plegar la categoría"
 
-#: include/functions2.php:102
+#: include/functions.php:1176
 msgid "Toggle combined mode"
 msgstr "Alternar modo combinado"
 
-#: include/functions2.php:103
+#: include/functions.php:1177
 #, fuzzy
 msgid "Toggle auto expand in combined mode"
 msgstr "Alternar modo combinado"
 
-#: include/functions2.php:104
+#: include/functions.php:1178
 msgid "Go to"
 msgstr "Ir a"
 
-#: include/functions2.php:106
+#: include/functions.php:1179
+#: classes/feeds.php:1602
+msgid "All articles"
+msgstr "Todos"
+
+#: include/functions.php:1180
 msgid "Fresh"
 msgstr "Reciente"
 
-#: include/functions2.php:109
-#: js/tt-rss.js:494
-#: js/tt-rss.js:663
+#: include/functions.php:1183
+#: js/tt-rss.js:495
+#: js/tt-rss.js:664
 msgid "Tag cloud"
 msgstr "Nube de etiquetas"
 
-#: include/functions2.php:111
+#: include/functions.php:1185
 msgid "Other"
 msgstr "Otro"
 
-#: include/functions2.php:112
+#: include/functions.php:1186
 #: classes/pref/labels.php:267
 msgid "Create label"
 msgstr "Crear marcador"
 
-#: include/functions2.php:113
-#: classes/pref/filters.php:753
+#: include/functions.php:1187
+#: classes/pref/filters.php:793
 msgid "Create filter"
 msgstr "Crear filtro"
 
-#: include/functions2.php:114
+#: include/functions.php:1188
 msgid "Un/collapse sidebar"
 msgstr "Mostrar/ocultar la barra lateral"
 
-#: include/functions2.php:115
+#: include/functions.php:1189
 msgid "Show help dialog"
 msgstr "Mostrar el diálogo de ayuda"
 
-#: include/functions2.php:670
-#, php-format
-msgid "Search results: %s"
-msgstr "Resultados de búsqueda: %s"
-
-#: include/functions2.php:1336
-#: classes/feeds.php:752
-#, fuzzy
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] "comentarios"
-msgstr[1] "comentarios"
-
-#: include/functions2.php:1340
-#: classes/feeds.php:756
-msgid "comments"
-msgstr "comentarios"
-
-#: include/functions2.php:1366
-msgid " - "
-msgstr " - "
-
-#: include/functions2.php:1397
-#: include/functions2.php:1648
-#: classes/article.php:311
-msgid "no tags"
-msgstr "sin etiquetas"
-
-#: include/functions2.php:1407
-#: classes/feeds.php:738
-msgid "Edit tags for this article"
-msgstr ""
-
-#: include/functions2.php:1439
-#: classes/feeds.php:690
-msgid "Originally from:"
-msgstr "Original de:"
-
-#: include/functions2.php:1452
-#: classes/pref/feeds.php:574
-#: classes/feeds.php:703
-msgid "Feed URL"
-msgstr "URL de la fuente"
-
-#: include/functions2.php:1489
-#: classes/backend.php:105
-#: classes/dlg.php:37
-#: classes/dlg.php:60
-#: classes/dlg.php:93
-#: classes/dlg.php:159
-#: classes/dlg.php:186
-#: classes/pref/feeds.php:1652
-#: classes/pref/feeds.php:1718
-#: classes/pref/filters.php:204
-#: classes/pref/prefs.php:1097
-#: plugins/af_psql_trgm/init.php:102
-#: plugins/import_export/init.php:415
-#: plugins/import_export/init.php:461
-#: plugins/share/init.php:121
-msgid "Close this window"
-msgstr "Cerrar esta ventana"
-
-#: include/functions2.php:1686
-msgid "(edit note)"
-msgstr "(editar nota)"
-
-#: include/functions2.php:1960
-msgid "unknown type"
-msgstr "tipo desconocido"
-
-#: include/functions2.php:2037
-msgid "Attachments"
-msgstr "Adjuntos"
-
-#: include/functions2.php:2496
+#: include/functions.php:2456
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: include/functions2.php:2497
+#: include/functions.php:2457
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: include/functions2.php:2498
+#: include/functions.php:2458
 msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
 msgstr ""
 
-#: include/functions2.php:2499
+#: include/functions.php:2459
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: include/functions2.php:2500
+#: include/functions.php:2460
 #, fuzzy
 msgid "No file was uploaded"
 msgstr "No se ha cargado ningún archivo."
 
-#: include/functions2.php:2501
+#: include/functions.php:2461
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: include/functions2.php:2502
+#: include/functions.php:2462
 msgid "Failed to write file to disk."
 msgstr ""
 
-#: include/functions2.php:2503
+#: include/functions.php:2463
 msgid "A PHP extension stopped the file upload."
 msgstr ""
 
 #: include/login_form.php:197
-#: classes/handler/public.php:569
-#: classes/handler/public.php:824
+#: classes/handler/public.php:480
+#: classes/handler/public.php:735
 msgid "Login:"
 msgstr "Nombre de usuario:"
 
 #: include/login_form.php:207
-#: classes/handler/public.php:572
+#: classes/handler/public.php:483
 msgid "Password:"
 msgstr "Contraseña:"
 
@@ -892,7 +791,7 @@ msgid "Profile:"
 msgstr "Perfil:"
 
 #: include/login_form.php:223
-#: classes/handler/public.php:311
+#: classes/handler/public.php:287
 #: classes/pref/prefs.php:1035
 #: classes/rpc.php:63
 msgid "Default profile"
@@ -911,7 +810,7 @@ msgid "Remember me"
 msgstr "Recordarme"
 
 #: include/login_form.php:249
-#: classes/handler/public.php:577
+#: classes/handler/public.php:488
 msgid "Log in"
 msgstr "Iniciar sesión"
 
@@ -927,145 +826,44 @@ msgstr ""
 msgid "Session failed to validate (password changed)"
 msgstr ""
 
-#: classes/article.php:25
-msgid "Article not found."
-msgstr "Artículo no encontrado."
-
-#: classes/article.php:197
-msgid "Tags for this article (separated by commas):"
-msgstr ""
-
-#: classes/article.php:222
-#: classes/pref/labels.php:79
-#: classes/pref/users.php:98
-#: classes/pref/feeds.php:801
-#: classes/pref/feeds.php:943
-#: classes/pref/filters.php:485
-#: classes/pref/prefs.php:981
-#: plugins/instances/init.php:245
-#: plugins/nsfw/init.php:85
-#: plugins/note/init.php:51
-#: plugins/af_readability/init.php:68
-#: plugins/af_redditimgur/init.php:60
-#: plugins/af_psql_trgm/init.php:181
-#: plugins/mail/init.php:64
-#: plugins/af_zz_imgproxy/init.php:213
-msgid "Save"
-msgstr "Guardar"
-
-#: classes/article.php:224
-#: classes/handler/public.php:546
-#: classes/handler/public.php:580
-#: classes/pref/labels.php:81
-#: classes/pref/users.php:100
-#: classes/pref/feeds.php:802
-#: classes/pref/feeds.php:946
-#: classes/pref/feeds.php:1859
-#: classes/pref/filters.php:488
-#: classes/pref/filters.php:902
-#: classes/pref/filters.php:983
-#: classes/pref/filters.php:1076
-#: classes/pref/prefs.php:983
-#: classes/feeds.php:1105
-#: classes/feeds.php:1155
-#: classes/feeds.php:1192
-#: plugins/instances/init.php:248
-#: plugins/instances/init.php:436
-#: plugins/note/init.php:53
-#: plugins/mail/init.php:173
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: classes/opml.php:28
-#: classes/opml.php:33
-msgid "OPML Utility"
-msgstr "Utilidad OPML"
-
-#: classes/opml.php:37
-msgid "Importing OPML..."
-msgstr "Importando OPML..."
-
-#: classes/opml.php:41
-msgid "Return to preferences"
-msgstr "Volver a las preferencias"
-
-#: classes/opml.php:271
-#, php-format
-msgid "Adding feed: %s"
-msgstr "Añadiendo fuente: %s"
-
-#: classes/opml.php:282
-#, php-format
-msgid "Duplicate feed: %s"
-msgstr "Duplicar fuente: %s"
-
-#: classes/opml.php:296
-#, php-format
-msgid "Adding label %s"
-msgstr "Añadiendo el marcador %s"
-
-#: classes/opml.php:299
-#, php-format
-msgid "Duplicate label: %s"
-msgstr "Duplicar marcador: %s"
-
-#: classes/opml.php:311
-#, php-format
-msgid "Setting preference key %s to %s"
-msgstr ""
-
-#: classes/opml.php:343
-msgid "Adding filter..."
-msgstr "Añadiendo filtro..."
-
-#: classes/opml.php:421
-#, php-format
-msgid "Processing category: %s"
-msgstr "Procesando categoría: %s"
-
-#: classes/opml.php:470
-#, php-format
-msgid "Upload failed with error code %d"
-msgstr ""
-
-#: classes/opml.php:484
-#: plugins/import_export/init.php:442
-msgid "Unable to move uploaded file."
-msgstr ""
-
-#: classes/opml.php:488
-#: plugins/import_export/init.php:446
-msgid "Error: please upload OPML file."
-msgstr ""
-
-#: classes/opml.php:499
-msgid "Error: unable to find moved OPML file."
-msgstr ""
-
-#: classes/opml.php:506
-msgid "Error while parsing document."
-msgstr "Error mientras se analizaba el documento."
-
-#: classes/backend.php:33
+#: classes/backend.php:31
 msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
 msgstr ""
 
-#: classes/backend.php:38
+#: classes/backend.php:36
 msgid "Keyboard Shortcuts"
 msgstr "Atajos de teclado"
 
-#: classes/backend.php:61
+#: classes/backend.php:59
 msgid "Shift"
 msgstr "Mayúsculas"
 
-#: classes/backend.php:64
+#: classes/backend.php:62
 msgid "Ctrl"
 msgstr "Ctrl"
 
-#: classes/backend.php:99
+#: classes/backend.php:97
 msgid "Help topic not found."
 msgstr "Tema de ayuda no encontrado."
 
+#: classes/backend.php:103
+#: classes/dlg.php:37
+#: classes/dlg.php:60
+#: classes/dlg.php:93
+#: classes/dlg.php:159
+#: classes/dlg.php:186
+#: classes/article.php:744
+#: classes/pref/filters.php:206
+#: classes/pref/prefs.php:1097
+#: classes/pref/feeds.php:1626
+#: classes/pref/feeds.php:1692
+#: plugins/import_export/init.php:421
+#: plugins/import_export/init.php:467
+#: plugins/af_psql_trgm/init.php:102
+#: plugins/share/init.php:120
+msgid "Close this window"
+msgstr "Cerrar esta ventana"
+
 #: classes/dlg.php:17
 msgid "If you have imported labels and/or filters, you might need to reload preferences to see your new data."
 msgstr ""
@@ -1077,7 +875,7 @@ msgstr "URL del archivo OPML público"
 
 #: classes/dlg.php:57
 #: classes/dlg.php:183
-#: plugins/share/init.php:118
+#: plugins/share/init.php:117
 msgid "Generate new URL"
 msgstr "Generar URL nueva"
 
@@ -1098,130 +896,225 @@ msgstr ""
 msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 
-#: classes/handler/public.php:510
+#: classes/article.php:25
+msgid "Article not found."
+msgstr "Artículo no encontrado."
+
+#: classes/article.php:197
+msgid "Tags for this article (separated by commas):"
+msgstr ""
+
+#: classes/article.php:222
+#: classes/pref/labels.php:79
+#: classes/pref/filters.php:519
+#: classes/pref/users.php:98
+#: classes/pref/prefs.php:981
+#: classes/pref/feeds.php:789
+#: classes/pref/feeds.php:931
+#: plugins/af_psql_trgm/init.php:181
+#: plugins/nsfw/init.php:85
+#: plugins/af_readability/init.php:68
+#: plugins/mail/init.php:64
+#: plugins/af_redditimgur/init.php:60
+#: plugins/note/init.php:51
+#: plugins/af_zz_imgproxy/init.php:240
+msgid "Save"
+msgstr "Guardar"
+
+#: classes/article.php:224
+#: classes/handler/public.php:457
+#: classes/handler/public.php:491
+#: classes/pref/labels.php:81
+#: classes/pref/filters.php:522
+#: classes/pref/filters.php:942
+#: classes/pref/filters.php:1022
+#: classes/pref/filters.php:1115
+#: classes/pref/users.php:100
+#: classes/pref/prefs.php:983
+#: classes/pref/feeds.php:790
+#: classes/pref/feeds.php:934
+#: classes/pref/feeds.php:1833
+#: classes/feeds.php:1098
+#: classes/feeds.php:1148
+#: classes/feeds.php:1185
+#: plugins/mail/init.php:173
+#: plugins/note/init.php:53
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: classes/article.php:311
+#: classes/article.php:652
+#: classes/article.php:805
+msgid "no tags"
+msgstr "sin etiquetas"
+
+#: classes/article.php:419
+msgid "unknown type"
+msgstr "tipo desconocido"
+
+#: classes/article.php:496
+msgid "Attachments"
+msgstr "Adjuntos"
+
+#: classes/article.php:591
+#: classes/feeds.php:741
+#, fuzzy
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] "comentarios"
+msgstr[1] "comentarios"
+
+#: classes/article.php:595
+#: classes/feeds.php:745
+msgid "comments"
+msgstr "comentarios"
+
+#: classes/article.php:621
+msgid " - "
+msgstr " - "
+
+#: classes/article.php:662
+#: classes/feeds.php:727
+msgid "Edit tags for this article"
+msgstr ""
+
+#: classes/article.php:694
+#: classes/feeds.php:681
+msgid "Originally from:"
+msgstr "Original de:"
+
+#: classes/article.php:707
+#: classes/pref/feeds.php:574
+#: classes/feeds.php:694
+msgid "Feed URL"
+msgstr "URL de la fuente"
+
+#: classes/article.php:843
+msgid "(edit note)"
+msgstr "(editar nota)"
+
+#: classes/handler/public.php:421
 #: plugins/bookmarklets/init.php:40
 #, fuzzy
 msgid "Share with Tiny Tiny RSS"
 msgstr "Actualizar Tiny Tiny RSS"
 
-#: classes/handler/public.php:518
+#: classes/handler/public.php:429
 msgid "Title:"
 msgstr "Título:"
 
-#: classes/handler/public.php:520
+#: classes/handler/public.php:431
 #: classes/pref/feeds.php:572
-#: plugins/instances/init.php:212
-#: plugins/instances/init.php:401
 msgid "URL:"
 msgstr "URL:"
 
-#: classes/handler/public.php:522
+#: classes/handler/public.php:433
 msgid "Content:"
 msgstr "Contenido:"
 
-#: classes/handler/public.php:524
+#: classes/handler/public.php:435
 msgid "Labels:"
 msgstr "Marcadores:"
 
-#: classes/handler/public.php:543
+#: classes/handler/public.php:454
 msgid "Shared article will appear in the Published feed."
 msgstr ""
 
-#: classes/handler/public.php:545
+#: classes/handler/public.php:456
 msgid "Share"
 msgstr "Compartir"
 
-#: classes/handler/public.php:567
+#: classes/handler/public.php:478
 msgid "Not logged in"
 msgstr "No ha iniciado sesión"
 
-#: classes/handler/public.php:626
+#: classes/handler/public.php:537
 msgid "Incorrect username or password"
 msgstr "Nombre de usuario o contraseña incorrectos"
 
-#: classes/handler/public.php:678
+#: classes/handler/public.php:589
 #, fuzzy, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "Se ha suscrito a %s"
 
-#: classes/handler/public.php:681
+#: classes/handler/public.php:592
 #, fuzzy, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "Se ha suscrito a %s"
 
-#: classes/handler/public.php:684
+#: classes/handler/public.php:595
 #, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr ""
 
-#: classes/handler/public.php:687
+#: classes/handler/public.php:598
 #, fuzzy, php-format
 msgid "No feeds found in <b>%s</b>."
 msgstr "No se han encontrado fuentes."
 
-#: classes/handler/public.php:690
+#: classes/handler/public.php:601
 msgid "Multiple feed URLs found."
 msgstr "Múltiples fuentes encontradas."
 
-#: classes/handler/public.php:694
+#: classes/handler/public.php:605
 #, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr ""
 
-#: classes/handler/public.php:712
+#: classes/handler/public.php:623
 msgid "Subscribe to selected feed"
 msgstr "Suscribirse a la fuente seleccionada"
 
-#: classes/handler/public.php:737
+#: classes/handler/public.php:648
 msgid "Edit subscription options"
 msgstr "Editar las opciones de suscripción"
 
-#: classes/handler/public.php:774
+#: classes/handler/public.php:685
 msgid "Password recovery"
 msgstr "Recuperación de contraseña"
 
-#: classes/handler/public.php:817
+#: classes/handler/public.php:728
 msgid "You will need to provide valid account name and email. A password reset link will be sent to your email address."
 msgstr ""
 
-#: classes/handler/public.php:839
-#: classes/pref/users.php:350
+#: classes/handler/public.php:750
+#: classes/pref/users.php:349
 msgid "Reset password"
 msgstr "Restablecer contraseña"
 
-#: classes/handler/public.php:849
+#: classes/handler/public.php:760
 msgid "Some of the required form parameters are missing or incorrect."
 msgstr ""
 
-#: classes/handler/public.php:853
-#: classes/handler/public.php:919
+#: classes/handler/public.php:764
+#: classes/handler/public.php:830
 msgid "Go back"
 msgstr "Volver"
 
-#: classes/handler/public.php:890
+#: classes/handler/public.php:801
 #, fuzzy
 msgid "[tt-rss] Password reset request"
 msgstr "[tt-rss] Notificación de cambio de contraseña"
 
-#: classes/handler/public.php:915
+#: classes/handler/public.php:826
 msgid "Sorry, login and email combination not found."
 msgstr ""
 
-#: classes/handler/public.php:937
+#: classes/handler/public.php:848
 msgid "Your access level is insufficient to run this script."
 msgstr ""
 
-#: classes/handler/public.php:963
+#: classes/handler/public.php:874
 msgid "Database Updater"
 msgstr "Actualizador de la base de datos"
 
-#: classes/handler/public.php:1028
+#: classes/handler/public.php:939
 msgid "Perform updates"
 msgstr "Actualizar"
 
 #: classes/pref/labels.php:22
-#: classes/pref/filters.php:348
-#: classes/pref/filters.php:823
+#: classes/pref/filters.php:373
+#: classes/pref/filters.php:863
 msgid "Caption"
 msgstr "Leyenda"
 
@@ -1243,59 +1136,55 @@ msgid "Created label <b>%s</b>"
 msgstr "Crear marcador"
 
 #: classes/pref/labels.php:258
-#: classes/pref/users.php:334
-#: classes/pref/feeds.php:1337
-#: classes/pref/feeds.php:1600
-#: classes/pref/feeds.php:1664
-#: classes/pref/filters.php:359
-#: classes/pref/filters.php:407
-#: classes/pref/filters.php:744
-#: classes/pref/filters.php:832
-#: classes/pref/filters.php:859
+#: classes/pref/filters.php:384
+#: classes/pref/filters.php:441
+#: classes/pref/filters.php:784
+#: classes/pref/filters.php:872
+#: classes/pref/filters.php:899
+#: classes/pref/users.php:333
 #: classes/pref/prefs.php:992
-#: plugins/instances/init.php:284
+#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1574
+#: classes/pref/feeds.php:1638
 msgid "Select"
 msgstr "Seleccionar"
 
 #: classes/pref/labels.php:261
-#: classes/pref/users.php:337
-#: classes/pref/feeds.php:1340
-#: classes/pref/feeds.php:1603
-#: classes/pref/feeds.php:1667
-#: classes/pref/filters.php:362
-#: classes/pref/filters.php:410
-#: classes/pref/filters.php:747
-#: classes/pref/filters.php:835
-#: classes/pref/filters.php:862
+#: classes/pref/filters.php:387
+#: classes/pref/filters.php:444
+#: classes/pref/filters.php:787
+#: classes/pref/filters.php:875
+#: classes/pref/filters.php:902
+#: classes/pref/users.php:336
 #: classes/pref/prefs.php:995
+#: classes/pref/feeds.php:1314
+#: classes/pref/feeds.php:1577
+#: classes/pref/feeds.php:1641
 #: classes/feeds.php:102
-#: plugins/instances/init.php:287
 msgid "All"
 msgstr "Todos"
 
 #: classes/pref/labels.php:263
-#: classes/pref/users.php:339
-#: classes/pref/feeds.php:1342
-#: classes/pref/feeds.php:1605
-#: classes/pref/feeds.php:1669
-#: classes/pref/filters.php:364
-#: classes/pref/filters.php:412
-#: classes/pref/filters.php:749
-#: classes/pref/filters.php:837
-#: classes/pref/filters.php:864
+#: classes/pref/filters.php:389
+#: classes/pref/filters.php:446
+#: classes/pref/filters.php:789
+#: classes/pref/filters.php:877
+#: classes/pref/filters.php:904
+#: classes/pref/users.php:338
 #: classes/pref/prefs.php:997
+#: classes/pref/feeds.php:1316
+#: classes/pref/feeds.php:1579
+#: classes/pref/feeds.php:1643
 #: classes/feeds.php:105
-#: plugins/instances/init.php:289
 msgid "None"
 msgstr "Ninguno"
 
 #: classes/pref/labels.php:270
-#: classes/pref/users.php:348
+#: classes/pref/filters.php:512
+#: classes/pref/filters.php:806
+#: classes/pref/users.php:347
 #: classes/pref/feeds.php:767
-#: classes/pref/filters.php:478
-#: classes/pref/filters.php:766
-#: classes/feeds.php:1154
-#: plugins/instances/init.php:294
+#: classes/feeds.php:1147
 msgid "Remove"
 msgstr "Eliminar"
 
@@ -1303,9 +1192,170 @@ msgstr "Eliminar"
 msgid "Clear colors"
 msgstr "Limpiar los colores"
 
+#: classes/pref/filters.php:153
+#, fuzzy
+msgid "Preview article"
+msgstr "Recientes"
+
+#: classes/pref/filters.php:264
+#: classes/pref/filters.php:558
+msgid "(inverse)"
+msgstr "(inverso)"
+
+#: classes/pref/filters.php:260
+#: classes/pref/filters.php:557
+#, php-format
+msgid "%s on %s in %s %s"
+msgstr ""
+
+#: classes/pref/filters.php:379
+#: classes/pref/filters.php:867
+#: classes/pref/filters.php:981
+msgid "Match"
+msgstr "Coincidir"
+
+#: classes/pref/filters.php:393
+#: classes/pref/filters.php:450
+#: classes/pref/filters.php:881
+#: classes/pref/filters.php:908
+msgid "Add"
+msgstr "Añadir"
+
+#: classes/pref/filters.php:396
+#: classes/pref/filters.php:453
+#: classes/pref/filters.php:884
+#: classes/pref/filters.php:911
+#: classes/feeds.php:122
+msgid "Delete"
+msgstr "Eliminar"
+
+#: classes/pref/filters.php:436
+#: classes/pref/filters.php:894
+msgid "Apply actions"
+msgstr "Aplicar acciones"
+
+#: classes/pref/filters.php:486
+#: classes/pref/filters.php:923
+msgid "Enabled"
+msgstr "Habilitado"
+
+#: classes/pref/filters.php:495
+#: classes/pref/filters.php:926
+msgid "Match any rule"
+msgstr "Coincidencia con cualquier regla"
+
+#: classes/pref/filters.php:504
+#: classes/pref/filters.php:929
+msgid "Inverse matching"
+msgstr "Coincidencia inversa"
+
+#: classes/pref/filters.php:516
+#: classes/pref/filters.php:936
+msgid "Test"
+msgstr "Probar"
+
+#: classes/pref/filters.php:780
+#: classes/pref/users.php:323
+#: classes/pref/feeds.php:1307
+#: classes/feeds.php:1118
+#: classes/feeds.php:1184
+#: js/tt-rss.js:165
+msgid "Search"
+msgstr "Buscar"
+
+#: classes/pref/filters.php:796
+msgid "Combine"
+msgstr "Combinar"
+
+#: classes/pref/filters.php:799
+#: classes/pref/users.php:345
+msgid "Edit"
+msgstr "Editar"
+
+#: classes/pref/filters.php:802
+#: classes/pref/feeds.php:1327
+#: classes/pref/feeds.php:1341
+msgid "Reset sort order"
+msgstr "Reiniciar orden"
+
+#: classes/pref/filters.php:810
+#: classes/pref/feeds.php:1363
+msgid "Rescore articles"
+msgstr "Reiniciar la puntuación de los artículos"
+
+#: classes/pref/filters.php:939
+msgid "Create"
+msgstr "Crear"
+
+#: classes/pref/filters.php:993
+msgid "Inverse regular expression matching"
+msgstr "Coincidencia inversa con la expresión regular"
+
+#: classes/pref/filters.php:995
+msgid "on field"
+msgstr "en el campo"
+
+#: classes/pref/filters.php:1001
+#: js/PrefFilterTree.js:64
+msgid "in"
+msgstr "en"
+
+#: classes/pref/filters.php:1014
+msgid "Wiki: Filters"
+msgstr "Wiki: Filtros"
+
+#: classes/pref/filters.php:1019
+msgid "Save rule"
+msgstr "Guardar regla"
+
+#: classes/pref/filters.php:1019
+#: js/functions.js:865
+msgid "Add rule"
+msgstr "Añadir regla"
+
+#: classes/pref/filters.php:1042
+msgid "Perform Action"
+msgstr "Realizar la acción"
+
+#: classes/pref/filters.php:1093
+#, fuzzy
+msgid "No actions available"
+msgstr "¡Nueva versión disponible!"
+
+#: classes/pref/filters.php:1112
+msgid "Save action"
+msgstr "Guardar acción"
+
+#: classes/pref/filters.php:1112
+#: js/functions.js:887
+msgid "Add action"
+msgstr "Añadir acción"
+
+#: classes/pref/filters.php:1136
+msgid "[No caption]"
+msgstr "[Sin leyenda]"
+
+#: classes/pref/filters.php:1138
+#, fuzzy, php-format
+msgid "%s (%d rule)"
+msgid_plural "%s (%d rules)"
+msgstr[0] "Añadir regla"
+msgstr[1] "Añadir regla"
+
+#: classes/pref/filters.php:1153
+#, fuzzy
+msgid "matches any rule"
+msgstr "Coincidencia con cualquier regla"
+
+#: classes/pref/filters.php:1156
+#, fuzzy, php-format
+msgid "%s (+%d action)"
+msgid_plural "%s (+%d actions)"
+msgstr[0] "Añadir acción"
+msgstr[1] "Añadir acción"
+
 #: classes/pref/users.php:6
 #: classes/pref/system.php:8
-#: plugins/instances/init.php:154
 msgid "Your access level is insufficient to open this tab."
 msgstr ""
 
@@ -1316,8 +1366,8 @@ msgstr "Editar regla"
 
 #: classes/pref/users.php:56
 #: classes/pref/feeds.php:637
-#: classes/pref/feeds.php:878
-#: classes/feeds.php:1075
+#: classes/pref/feeds.php:866
+#: classes/feeds.php:1068
 msgid "Authentication"
 msgstr "Autenticación"
 
@@ -1327,7 +1377,7 @@ msgstr "Nivel de acceso: "
 
 #: classes/pref/users.php:77
 #: classes/pref/feeds.php:667
-#: classes/pref/feeds.php:896
+#: classes/pref/feeds.php:884
 msgid "Options"
 msgstr "Opciones"
 
@@ -1341,7 +1391,7 @@ msgid "User not found"
 msgstr "Usuario no encontrado"
 
 #: classes/pref/users.php:132
-#: classes/pref/users.php:400
+#: classes/pref/users.php:399
 msgid "Registered"
 msgstr "Registrado"
 
@@ -1359,7 +1409,7 @@ msgid "Stored articles"
 msgstr "Favoritos"
 
 #: classes/pref/users.php:145
-#: classes/pref/users.php:399
+#: classes/pref/users.php:398
 msgid "Subscribed feeds"
 msgstr "Fuentes suscritas"
 
@@ -1378,507 +1428,57 @@ msgstr ""
 msgid "User <b>%s</b> already exists."
 msgstr ""
 
-#: classes/pref/users.php:265
+#: classes/pref/users.php:264
 #, php-format
 msgid "Changed password of user <b>%s</b> to <b>%s</b>"
 msgstr ""
 
-#: classes/pref/users.php:267
+#: classes/pref/users.php:266
 #, php-format
 msgid "Sending new password of user <b>%s</b> to <b>%s</b>"
 msgstr ""
 
-#: classes/pref/users.php:291
+#: classes/pref/users.php:290
 msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] Notificación de cambio de contraseña"
 
-#: classes/pref/users.php:324
-#: classes/pref/feeds.php:1333
-#: classes/pref/filters.php:740
-#: classes/feeds.php:1125
-#: classes/feeds.php:1191
-#: js/tt-rss.js:165
-msgid "Search"
-msgstr "Buscar"
-
-#: classes/pref/users.php:342
+#: classes/pref/users.php:341
 msgid "Create user"
 msgstr "Crear usuario"
 
-#: classes/pref/users.php:346
-#: classes/pref/filters.php:759
-#: plugins/instances/init.php:293
-msgid "Edit"
-msgstr "Editar"
-
-#: classes/pref/users.php:397
+#: classes/pref/users.php:396
 #: classes/pref/feeds.php:643
-#: classes/pref/feeds.php:882
-#: classes/pref/feeds.php:1836
-#: classes/feeds.php:1079
+#: classes/pref/feeds.php:870
+#: classes/pref/feeds.php:1810
+#: classes/feeds.php:1072
 msgid "Login"
 msgstr "Iniciar sesión"
 
-#: classes/pref/users.php:398
+#: classes/pref/users.php:397
 msgid "Access Level"
 msgstr "Nivel de acceso"
 
-#: classes/pref/users.php:401
+#: classes/pref/users.php:400
 msgid "Last login"
 msgstr "Última sesión"
 
-#: classes/pref/users.php:420
-#: plugins/instances/init.php:334
+#: classes/pref/users.php:419
 msgid "Click to edit"
 msgstr "Haga clic para editar"
 
-#: classes/pref/users.php:441
+#: classes/pref/users.php:440
 msgid "No users defined."
 msgstr "No se han definido usuarios."
 
-#: classes/pref/users.php:443
+#: classes/pref/users.php:442
 msgid "No matching users found."
 msgstr "No se han encontrado usuarios coincidentes."
 
-#: classes/pref/system.php:29
-msgid "Error Log"
-msgstr "Registro de errores"
-
-#: classes/pref/system.php:40
-msgid "Refresh"
-msgstr "Actualizar"
-
-#: classes/pref/system.php:43
-msgid "Clear log"
-msgstr "Borrar registro"
-
-#: classes/pref/system.php:48
-msgid "Error"
-msgstr "Error"
-
-#: classes/pref/system.php:49
-msgid "Filename"
-msgstr "Nombre de archivo"
-
-#: classes/pref/system.php:50
-msgid "Message"
-msgstr "Mensaje"
-
-#: classes/pref/system.php:52
-msgid "Date"
-msgstr "Fecha"
-
-#: classes/pref/feeds.php:15
-msgid "Check to enable field"
-msgstr "Marcar para habilitar el campo"
-
-#: classes/pref/feeds.php:65
-#: classes/pref/feeds.php:214
-#: classes/pref/feeds.php:258
-#: classes/pref/feeds.php:264
-#: classes/pref/feeds.php:290
-#, fuzzy, php-format
-msgid "(%d feed)"
-msgid_plural "(%d feeds)"
-msgstr[0] "Editar fuente"
-msgstr[1] "Editar fuente"
-
-#: classes/pref/feeds.php:537
 #: classes/pref/prefs.php:18
+#: classes/pref/feeds.php:537
 msgid "General"
 msgstr "General"
 
-#: classes/pref/feeds.php:561
-msgid "Feed Title"
-msgstr "Título de la fuente"
-
-#: classes/pref/feeds.php:595
-#: classes/pref/feeds.php:830
-#: classes/pref/feeds.php:1822
-#: classes/feeds.php:1055
-msgid "Place in category:"
-msgstr "Categoría:"
-
-#: classes/pref/feeds.php:608
-#: classes/pref/feeds.php:844
-#, fuzzy
-msgid "Language:"
-msgstr "Idioma"
-
-#: classes/pref/feeds.php:615
-#: classes/pref/feeds.php:853
-msgid "Update"
-msgstr "Actualizar"
-
-#: classes/pref/feeds.php:630
-#: classes/pref/feeds.php:869
-msgid "Article purging:"
-msgstr "Purga de artículos:"
-
-#: classes/pref/feeds.php:658
-#: classes/pref/feeds.php:890
-#: classes/pref/feeds.php:1839
-#: classes/pref/prefs.php:245
-#: classes/feeds.php:1083
-msgid "Password"
-msgstr "Contraseña"
-
-#: classes/pref/feeds.php:662
-msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
-msgstr ""
-
-#: classes/pref/feeds.php:681
-#: classes/pref/feeds.php:900
-msgid "Hide from Popular feeds"
-msgstr "No incluir en fuentes populares"
-
-#: classes/pref/feeds.php:693
-#: classes/pref/feeds.php:906
-msgid "Include in e-mail digest"
-msgstr "Incluir en el correo recopilatorio"
-
-#: classes/pref/feeds.php:706
-#: classes/pref/feeds.php:912
-msgid "Always display image attachments"
-msgstr "Mostrar siempre imágenes adjuntas"
-
-#: classes/pref/feeds.php:719
-#: classes/pref/feeds.php:920
-msgid "Do not embed images"
-msgstr "No mostrar imágenes"
-
-#: classes/pref/feeds.php:732
-#: classes/pref/feeds.php:928
-msgid "Cache media"
-msgstr ""
-
-#: classes/pref/feeds.php:744
-#: classes/pref/feeds.php:934
-#, fuzzy
-msgid "Mark updated articles as unread"
-msgstr "Marcar fuente como leída"
-
-#: classes/pref/feeds.php:748
-msgid "Icon"
-msgstr "Icono"
-
-#: classes/pref/feeds.php:765
-msgid "Replace"
-msgstr "Reemplazar"
-
-#: classes/pref/feeds.php:772
-#: classes/pref/prefs.php:698
-msgid "Plugins"
-msgstr "Plugins"
-
-#: classes/pref/feeds.php:792
-msgid "Resubscribe to push updates"
-msgstr "Volver a suscribirse a las actualizaciones push"
-
-#: classes/pref/feeds.php:799
-msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
-msgstr ""
-
-#: classes/pref/feeds.php:1200
-#: classes/pref/feeds.php:1253
-msgid "All done."
-msgstr "Hecho."
-
-#: classes/pref/feeds.php:1308
-msgid "Feeds with errors"
-msgstr "Fuentes con errores"
-
-#: classes/pref/feeds.php:1315
-msgid "Inactive feeds"
-msgstr "Fuentes inactivas"
-
-#: classes/pref/feeds.php:1351
-msgid "Edit selected feeds"
-msgstr "Editar fuentes seleccionadas"
-
-#: classes/pref/feeds.php:1353
-#: classes/pref/feeds.php:1367
-#: classes/pref/filters.php:762
-msgid "Reset sort order"
-msgstr "Reiniciar orden"
-
-#: classes/pref/feeds.php:1355
-#: js/prefs.js:1622
-msgid "Batch subscribe"
-msgstr "Suscripción en lote"
-
-#: classes/pref/feeds.php:1362
-msgid "Categories"
-msgstr "Categorías"
-
-#: classes/pref/feeds.php:1365
-msgid "Add category"
-msgstr "Añadir categoría"
-
-#: classes/pref/feeds.php:1369
-msgid "Remove selected"
-msgstr "Eliminar seleccionadas"
-
-#: classes/pref/feeds.php:1380
-msgid "More actions..."
-msgstr "Más acciones..."
-
-#: classes/pref/feeds.php:1384
-msgid "Manual purge"
-msgstr "Purga manual"
-
-#: classes/pref/feeds.php:1388
-msgid "Clear feed data"
-msgstr "Limpiar los datos de la fuente"
-
-#: classes/pref/feeds.php:1389
-#: classes/pref/filters.php:770
-msgid "Rescore articles"
-msgstr "Reiniciar la puntuación de los artículos"
-
-#: classes/pref/feeds.php:1442
-msgid "OPML"
-msgstr "OPML"
-
-#: classes/pref/feeds.php:1444
-msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
-msgstr ""
-
-#: classes/pref/feeds.php:1445
-msgid "Only main settings profile can be migrated using OPML."
-msgstr ""
-
-#: classes/pref/feeds.php:1458
-msgid "Import my OPML"
-msgstr "Importar OPML"
-
-#: classes/pref/feeds.php:1464
-msgid "Filename:"
-msgstr "Nombre de archivo:"
-
-#: classes/pref/feeds.php:1466
-msgid "Include settings"
-msgstr "Incluir preferencias"
-
-#: classes/pref/feeds.php:1470
-msgid "Export OPML"
-msgstr "Exportar OPML"
-
-#: classes/pref/feeds.php:1474
-msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
-msgstr ""
-
-#: classes/pref/feeds.php:1478
-msgid "Public OPML URL"
-msgstr "URL del archivo OPML público"
-
-#: classes/pref/feeds.php:1479
-msgid "Display published OPML URL"
-msgstr "Mostrar la URL del OPML público"
-
-#: classes/pref/feeds.php:1488
-msgid "Firefox integration"
-msgstr "Integración con Firefox"
-
-#: classes/pref/feeds.php:1490
-msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
-msgstr ""
-
-#: classes/pref/feeds.php:1497
-msgid "Click here to register this site as a feed reader."
-msgstr ""
-
-#: classes/pref/feeds.php:1505
-msgid "Published & shared articles / Generated feeds"
-msgstr ""
-
-#: classes/pref/feeds.php:1507
-msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
-msgstr ""
-
-#: classes/pref/feeds.php:1514
-#: classes/feeds.php:54
-#: classes/feeds.php:140
-msgid "View as RSS"
-msgstr "Ver como RSS"
-
-#: classes/pref/feeds.php:1515
-msgid "Display URL"
-msgstr "Mostrar URL"
-
-#: classes/pref/feeds.php:1518
-msgid "Clear all generated URLs"
-msgstr "Limpiar todas las URL generadas"
-
-#: classes/pref/feeds.php:1596
-msgid "These feeds have not been updated with new content for 3 months (oldest first):"
-msgstr ""
-
-#: classes/pref/feeds.php:1630
-#: classes/pref/feeds.php:1694
-msgid "Click to edit feed"
-msgstr "Haga clic para editar fuente"
-
-#: classes/pref/feeds.php:1648
-#: classes/pref/feeds.php:1714
-msgid "Unsubscribe from selected feeds"
-msgstr "Cancelar la suscripción a las fuentes seleccionadas"
-
-#: classes/pref/feeds.php:1819
-msgid "Add one valid RSS feed per line (no feed detection is done)"
-msgstr ""
-
-#: classes/pref/feeds.php:1828
-msgid "Feeds to subscribe, One per line"
-msgstr ""
-
-#: classes/pref/feeds.php:1851
-msgid "Feeds require authentication."
-msgstr "Las fuentes requieren autenticación."
-
-#: classes/pref/feeds.php:1858
-#: classes/feeds.php:1099
-#: classes/feeds.php:1153
-msgid "Subscribe"
-msgstr "Suscribir"
-
-#: classes/pref/filters.php:151
-#, fuzzy
-msgid "Preview article"
-msgstr "Recientes"
-
-#: classes/pref/filters.php:239
-#: classes/pref/filters.php:518
-msgid "(inverse)"
-msgstr "(inverso)"
-
-#: classes/pref/filters.php:235
-#: classes/pref/filters.php:517
-#, php-format
-msgid "%s on %s in %s %s"
-msgstr ""
-
-#: classes/pref/filters.php:354
-#: classes/pref/filters.php:827
-#: classes/pref/filters.php:942
-msgid "Match"
-msgstr "Coincidir"
-
-#: classes/pref/filters.php:368
-#: classes/pref/filters.php:416
-#: classes/pref/filters.php:841
-#: classes/pref/filters.php:868
-msgid "Add"
-msgstr "Añadir"
-
-#: classes/pref/filters.php:371
-#: classes/pref/filters.php:419
-#: classes/pref/filters.php:844
-#: classes/pref/filters.php:871
-#: classes/feeds.php:122
-msgid "Delete"
-msgstr "Eliminar"
-
-#: classes/pref/filters.php:402
-#: classes/pref/filters.php:854
-msgid "Apply actions"
-msgstr "Aplicar acciones"
-
-#: classes/pref/filters.php:452
-#: classes/pref/filters.php:883
-msgid "Enabled"
-msgstr "Habilitado"
-
-#: classes/pref/filters.php:461
-#: classes/pref/filters.php:886
-msgid "Match any rule"
-msgstr "Coincidencia con cualquier regla"
-
-#: classes/pref/filters.php:470
-#: classes/pref/filters.php:889
-msgid "Inverse matching"
-msgstr "Coincidencia inversa"
-
-#: classes/pref/filters.php:482
-#: classes/pref/filters.php:896
-msgid "Test"
-msgstr "Probar"
-
-#: classes/pref/filters.php:756
-msgid "Combine"
-msgstr "Combinar"
-
-#: classes/pref/filters.php:899
-msgid "Create"
-msgstr "Crear"
-
-#: classes/pref/filters.php:954
-msgid "Inverse regular expression matching"
-msgstr "Coincidencia inversa con la expresión regular"
-
-#: classes/pref/filters.php:956
-msgid "on field"
-msgstr "en el campo"
-
-#: classes/pref/filters.php:962
-#: js/PrefFilterTree.js:64
-msgid "in"
-msgstr "en"
-
-#: classes/pref/filters.php:975
-msgid "Wiki: Filters"
-msgstr "Wiki: Filtros"
-
-#: classes/pref/filters.php:980
-msgid "Save rule"
-msgstr "Guardar regla"
-
-#: classes/pref/filters.php:980
-#: js/functions.js:865
-msgid "Add rule"
-msgstr "Añadir regla"
-
-#: classes/pref/filters.php:1003
-msgid "Perform Action"
-msgstr "Realizar la acción"
-
-#: classes/pref/filters.php:1054
-#, fuzzy
-msgid "No actions available"
-msgstr "¡Nueva versión disponible!"
-
-#: classes/pref/filters.php:1073
-msgid "Save action"
-msgstr "Guardar acción"
-
-#: classes/pref/filters.php:1073
-#: js/functions.js:887
-msgid "Add action"
-msgstr "Añadir acción"
-
-#: classes/pref/filters.php:1097
-msgid "[No caption]"
-msgstr "[Sin leyenda]"
-
-#: classes/pref/filters.php:1099
-#, fuzzy, php-format
-msgid "%s (%d rule)"
-msgid_plural "%s (%d rules)"
-msgstr[0] "Añadir regla"
-msgstr[1] "Añadir regla"
-
-#: classes/pref/filters.php:1114
-#, fuzzy
-msgid "matches any rule"
-msgstr "Coincidencia con cualquier regla"
-
-#: classes/pref/filters.php:1117
-#, fuzzy, php-format
-msgid "%s (+%d action)"
-msgid_plural "%s (+%d actions)"
-msgstr[0] "Añadir acción"
-msgstr[1] "Añadir acción"
-
 #: classes/pref/prefs.php:19
 msgid "Interface"
 msgstr "Interfaz"
@@ -2059,7 +1659,7 @@ msgid "Strip all but most common HTML tags when reading articles."
 msgstr ""
 
 #: classes/pref/prefs.php:53
-#: js/prefs.js:1584
+#: js/prefs.js:1580
 msgid "Customize stylesheet"
 msgstr "Personalizar hoja de estilo"
 
@@ -2128,6 +1728,14 @@ msgstr "Nivel de acceso"
 msgid "Save data"
 msgstr "Guardar datos"
 
+#: classes/pref/prefs.php:245
+#: classes/pref/feeds.php:658
+#: classes/pref/feeds.php:878
+#: classes/pref/feeds.php:1813
+#: classes/feeds.php:1076
+msgid "Password"
+msgstr "Contraseña"
+
 #: classes/pref/prefs.php:254
 msgid "Your password is at default value, please change it."
 msgstr ""
@@ -2227,18 +1835,23 @@ msgstr "Gestionar perfiles"
 msgid "Reset to defaults"
 msgstr "Opciones por defecto"
 
+#: classes/pref/prefs.php:698
+#: classes/pref/feeds.php:772
+msgid "Plugins"
+msgstr "Plugins"
+
 #: classes/pref/prefs.php:700
 msgid "You will need to reload Tiny Tiny RSS for plugin changes to take effect."
 msgstr ""
 
-#: classes/pref/prefs.php:702
-msgid "Download more plugins at tt-rss.org <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forums</a> or <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a>."
-msgstr ""
-
-#: classes/pref/prefs.php:732
+#: classes/pref/prefs.php:730
 msgid "System plugins"
 msgstr "Plugins de sistema"
 
+#: classes/pref/prefs.php:731
+msgid "System plugins are enabled in <strong>config.php</strong> for all users."
+msgstr ""
+
 #: classes/pref/prefs.php:736
 #: classes/pref/prefs.php:792
 msgid "Plugin"
@@ -2308,6 +1921,341 @@ msgstr "Borrar los perfiles seleccionados"
 msgid "Activate profile"
 msgstr "Activar perfil"
 
+#: classes/pref/feeds.php:15
+msgid "Check to enable field"
+msgstr "Marcar para habilitar el campo"
+
+#: classes/pref/feeds.php:65
+#: classes/pref/feeds.php:214
+#: classes/pref/feeds.php:258
+#: classes/pref/feeds.php:264
+#: classes/pref/feeds.php:290
+#, fuzzy, php-format
+msgid "(%d feed)"
+msgid_plural "(%d feeds)"
+msgstr[0] "Editar fuente"
+msgstr[1] "Editar fuente"
+
+#: classes/pref/feeds.php:561
+msgid "Feed Title"
+msgstr "Título de la fuente"
+
+#: classes/pref/feeds.php:595
+#: classes/pref/feeds.php:818
+#: classes/pref/feeds.php:1796
+#: classes/feeds.php:1048
+msgid "Place in category:"
+msgstr "Categoría:"
+
+#: classes/pref/feeds.php:608
+#: classes/pref/feeds.php:832
+#, fuzzy
+msgid "Language:"
+msgstr "Idioma"
+
+#: classes/pref/feeds.php:615
+#: classes/pref/feeds.php:841
+msgid "Update"
+msgstr "Actualizar"
+
+#: classes/pref/feeds.php:630
+#: classes/pref/feeds.php:857
+msgid "Article purging:"
+msgstr "Purga de artículos:"
+
+#: classes/pref/feeds.php:662
+msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
+msgstr ""
+
+#: classes/pref/feeds.php:681
+#: classes/pref/feeds.php:888
+msgid "Hide from Popular feeds"
+msgstr "No incluir en fuentes populares"
+
+#: classes/pref/feeds.php:693
+#: classes/pref/feeds.php:894
+msgid "Include in e-mail digest"
+msgstr "Incluir en el correo recopilatorio"
+
+#: classes/pref/feeds.php:706
+#: classes/pref/feeds.php:900
+msgid "Always display image attachments"
+msgstr "Mostrar siempre imágenes adjuntas"
+
+#: classes/pref/feeds.php:719
+#: classes/pref/feeds.php:908
+msgid "Do not embed images"
+msgstr "No mostrar imágenes"
+
+#: classes/pref/feeds.php:732
+#: classes/pref/feeds.php:916
+msgid "Cache media"
+msgstr ""
+
+#: classes/pref/feeds.php:744
+#: classes/pref/feeds.php:922
+#, fuzzy
+msgid "Mark updated articles as unread"
+msgstr "Marcar fuente como leída"
+
+#: classes/pref/feeds.php:748
+msgid "Icon"
+msgstr "Icono"
+
+#: classes/pref/feeds.php:765
+msgid "Replace"
+msgstr "Reemplazar"
+
+#: classes/pref/feeds.php:1174
+#: classes/pref/feeds.php:1227
+msgid "All done."
+msgstr "Hecho."
+
+#: classes/pref/feeds.php:1282
+msgid "Feeds with errors"
+msgstr "Fuentes con errores"
+
+#: classes/pref/feeds.php:1289
+msgid "Inactive feeds"
+msgstr "Fuentes inactivas"
+
+#: classes/pref/feeds.php:1325
+msgid "Edit selected feeds"
+msgstr "Editar fuentes seleccionadas"
+
+#: classes/pref/feeds.php:1329
+#: js/prefs.js:1618
+msgid "Batch subscribe"
+msgstr "Suscripción en lote"
+
+#: classes/pref/feeds.php:1336
+msgid "Categories"
+msgstr "Categorías"
+
+#: classes/pref/feeds.php:1339
+msgid "Add category"
+msgstr "Añadir categoría"
+
+#: classes/pref/feeds.php:1343
+msgid "Remove selected"
+msgstr "Eliminar seleccionadas"
+
+#: classes/pref/feeds.php:1354
+msgid "More actions..."
+msgstr "Más acciones..."
+
+#: classes/pref/feeds.php:1358
+msgid "Manual purge"
+msgstr "Purga manual"
+
+#: classes/pref/feeds.php:1362
+msgid "Clear feed data"
+msgstr "Limpiar los datos de la fuente"
+
+#: classes/pref/feeds.php:1416
+msgid "OPML"
+msgstr "OPML"
+
+#: classes/pref/feeds.php:1418
+msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
+msgstr ""
+
+#: classes/pref/feeds.php:1419
+msgid "Only main settings profile can be migrated using OPML."
+msgstr ""
+
+#: classes/pref/feeds.php:1432
+msgid "Import my OPML"
+msgstr "Importar OPML"
+
+#: classes/pref/feeds.php:1438
+msgid "Filename:"
+msgstr "Nombre de archivo:"
+
+#: classes/pref/feeds.php:1440
+msgid "Include settings"
+msgstr "Incluir preferencias"
+
+#: classes/pref/feeds.php:1444
+msgid "Export OPML"
+msgstr "Exportar OPML"
+
+#: classes/pref/feeds.php:1448
+msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
+msgstr ""
+
+#: classes/pref/feeds.php:1452
+msgid "Public OPML URL"
+msgstr "URL del archivo OPML público"
+
+#: classes/pref/feeds.php:1453
+msgid "Display published OPML URL"
+msgstr "Mostrar la URL del OPML público"
+
+#: classes/pref/feeds.php:1462
+msgid "Firefox integration"
+msgstr "Integración con Firefox"
+
+#: classes/pref/feeds.php:1464
+msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
+msgstr ""
+
+#: classes/pref/feeds.php:1471
+msgid "Click here to register this site as a feed reader."
+msgstr ""
+
+#: classes/pref/feeds.php:1479
+msgid "Published & shared articles / Generated feeds"
+msgstr ""
+
+#: classes/pref/feeds.php:1481
+msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
+msgstr ""
+
+#: classes/pref/feeds.php:1488
+#: classes/feeds.php:54
+#: classes/feeds.php:140
+msgid "View as RSS"
+msgstr "Ver como RSS"
+
+#: classes/pref/feeds.php:1489
+msgid "Display URL"
+msgstr "Mostrar URL"
+
+#: classes/pref/feeds.php:1492
+msgid "Clear all generated URLs"
+msgstr "Limpiar todas las URL generadas"
+
+#: classes/pref/feeds.php:1570
+msgid "These feeds have not been updated with new content for 3 months (oldest first):"
+msgstr ""
+
+#: classes/pref/feeds.php:1604
+#: classes/pref/feeds.php:1668
+msgid "Click to edit feed"
+msgstr "Haga clic para editar fuente"
+
+#: classes/pref/feeds.php:1622
+#: classes/pref/feeds.php:1688
+msgid "Unsubscribe from selected feeds"
+msgstr "Cancelar la suscripción a las fuentes seleccionadas"
+
+#: classes/pref/feeds.php:1793
+msgid "Add one valid RSS feed per line (no feed detection is done)"
+msgstr ""
+
+#: classes/pref/feeds.php:1802
+msgid "Feeds to subscribe, One per line"
+msgstr ""
+
+#: classes/pref/feeds.php:1825
+msgid "Feeds require authentication."
+msgstr "Las fuentes requieren autenticación."
+
+#: classes/pref/feeds.php:1832
+#: classes/feeds.php:1092
+#: classes/feeds.php:1146
+msgid "Subscribe"
+msgstr "Suscribir"
+
+#: classes/pref/system.php:29
+msgid "Error Log"
+msgstr "Registro de errores"
+
+#: classes/pref/system.php:40
+msgid "Refresh"
+msgstr "Actualizar"
+
+#: classes/pref/system.php:43
+msgid "Clear log"
+msgstr "Borrar registro"
+
+#: classes/pref/system.php:48
+msgid "Error"
+msgstr "Error"
+
+#: classes/pref/system.php:49
+msgid "Filename"
+msgstr "Nombre de archivo"
+
+#: classes/pref/system.php:50
+msgid "Message"
+msgstr "Mensaje"
+
+#: classes/pref/system.php:52
+msgid "Date"
+msgstr "Fecha"
+
+#: classes/opml.php:28
+#: classes/opml.php:33
+msgid "OPML Utility"
+msgstr "Utilidad OPML"
+
+#: classes/opml.php:37
+msgid "Importing OPML..."
+msgstr "Importando OPML..."
+
+#: classes/opml.php:41
+msgid "Return to preferences"
+msgstr "Volver a las preferencias"
+
+#: classes/opml.php:295
+#, php-format
+msgid "Adding feed: %s"
+msgstr "Añadiendo fuente: %s"
+
+#: classes/opml.php:306
+#, php-format
+msgid "Duplicate feed: %s"
+msgstr "Duplicar fuente: %s"
+
+#: classes/opml.php:320
+#, php-format
+msgid "Adding label %s"
+msgstr "Añadiendo el marcador %s"
+
+#: classes/opml.php:323
+#, php-format
+msgid "Duplicate label: %s"
+msgstr "Duplicar marcador: %s"
+
+#: classes/opml.php:335
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr ""
+
+#: classes/opml.php:367
+msgid "Adding filter..."
+msgstr "Añadiendo filtro..."
+
+#: classes/opml.php:486
+#, php-format
+msgid "Processing category: %s"
+msgstr "Procesando categoría: %s"
+
+#: classes/opml.php:532
+#, php-format
+msgid "Upload failed with error code %d"
+msgstr ""
+
+#: classes/opml.php:544
+#: plugins/import_export/init.php:448
+msgid "Unable to move uploaded file."
+msgstr ""
+
+#: classes/opml.php:548
+#: plugins/import_export/init.php:452
+msgid "Error: please upload OPML file."
+msgstr ""
+
+#: classes/opml.php:559
+msgid "Error: unable to find moved OPML file."
+msgstr ""
+
+#: classes/opml.php:566
+msgid "Error while parsing document."
+msgstr "Error mientras se analizaba el documento."
+
 #: classes/feeds.php:53
 msgid "View as RSS feed"
 msgstr "Ver como fuente RSS"
@@ -2348,8 +2296,8 @@ msgstr "Mover a la fuente original"
 
 #: classes/feeds.php:127
 #: classes/feeds.php:132
-#: plugins/mail/init.php:75
 #: plugins/mailto/init.php:25
+#: plugins/mail/init.php:75
 msgid "Forward by email"
 msgstr "Enviar por correo electrónico"
 
@@ -2357,263 +2305,260 @@ msgstr "Enviar por correo electrónico"
 msgid "Feed:"
 msgstr "Fuente:"
 
-#: classes/feeds.php:229
-#: classes/feeds.php:892
+#: classes/feeds.php:228
+#: classes/feeds.php:885
 msgid "Feed not found."
 msgstr "Fuente no encontrada."
 
-#: classes/feeds.php:300
+#: classes/feeds.php:291
 msgid "Never"
 msgstr "Nunca"
 
-#: classes/feeds.php:413
+#: classes/feeds.php:405
 #, php-format
 msgid "Imported at %s"
 msgstr "Importado en %s"
 
-#: classes/feeds.php:472
-#: classes/feeds.php:569
+#: classes/feeds.php:464
+#: classes/feeds.php:561
 msgid "mark feed as read"
 msgstr "Marcar fuente como leída"
 
-#: classes/feeds.php:630
+#: classes/feeds.php:622
 msgid "Collapse article"
 msgstr "Cerrar artículo"
 
-#: classes/feeds.php:791
+#: classes/feeds.php:784
 msgid "No unread articles found to display."
 msgstr ""
 
-#: classes/feeds.php:794
+#: classes/feeds.php:787
 msgid "No updated articles found to display."
 msgstr ""
 
-#: classes/feeds.php:797
+#: classes/feeds.php:790
 msgid "No starred articles found to display."
 msgstr ""
 
-#: classes/feeds.php:801
+#: classes/feeds.php:794
 msgid "No articles found to display. You can assign articles to labels manually from article header context menu (applies to all selected articles) or use a filter."
 msgstr ""
 
-#: classes/feeds.php:803
+#: classes/feeds.php:796
 msgid "No articles found to display."
 msgstr ""
 
-#: classes/feeds.php:818
-#: classes/feeds.php:992
+#: classes/feeds.php:811
+#: classes/feeds.php:985
 #, fuzzy, php-format
 msgid "Feeds last updated at %s"
 msgstr "Última actualización: %s"
 
-#: classes/feeds.php:828
-#: classes/feeds.php:1002
+#: classes/feeds.php:821
+#: classes/feeds.php:995
 msgid "Some feeds have update errors (click for details)"
 msgstr ""
 
-#: classes/feeds.php:982
+#: classes/feeds.php:975
 msgid "No feed selected."
 msgstr "No se ha seleccionado ninguna fuente."
 
-#: classes/feeds.php:1041
-#: classes/feeds.php:1049
+#: classes/feeds.php:1034
+#: classes/feeds.php:1042
 msgid "Feed or site URL"
 msgstr "URL de la fuente o del sitio"
 
-#: classes/feeds.php:1063
+#: classes/feeds.php:1056
 msgid "Available feeds"
 msgstr "Fuentes disponibles"
 
-#: classes/feeds.php:1094
+#: classes/feeds.php:1087
 msgid "This feed requires authentication."
 msgstr "Esta fuente requiere autenticación."
 
-#: classes/feeds.php:1102
+#: classes/feeds.php:1095
 msgid "More feeds"
 msgstr "Más fuentes"
 
-#: classes/feeds.php:1129
+#: classes/feeds.php:1122
 msgid "Popular feeds"
 msgstr "Fuentes populares"
 
-#: classes/feeds.php:1130
+#: classes/feeds.php:1123
 msgid "Feed archive"
 msgstr "Archivo de fuentes"
 
-#: classes/feeds.php:1133
+#: classes/feeds.php:1126
 msgid "limit:"
 msgstr "límite:"
 
-#: classes/feeds.php:1165
+#: classes/feeds.php:1158
 msgid "Look for"
 msgstr "Buscar"
 
-#: classes/feeds.php:1173
+#: classes/feeds.php:1166
 #, php-format
 msgid "in %s"
 msgstr ""
 
-#: classes/feeds.php:1178
+#: classes/feeds.php:1171
 msgid "Used for word stemming"
 msgstr ""
 
-#: classes/feeds.php:1187
+#: classes/feeds.php:1180
 msgid "Search syntax"
 msgstr "Sintaxis de búsqueda"
 
-#: plugins/instances/init.php:141
-msgid "Linked"
-msgstr "Enlazado"
-
-#: plugins/instances/init.php:204
-#: plugins/instances/init.php:395
-msgid "Instance"
-msgstr "Instancia"
+#: classes/feeds.php:1596
+msgid "Starred articles"
+msgstr "Favoritos"
 
-#: plugins/instances/init.php:215
-#: plugins/instances/init.php:312
-#: plugins/instances/init.php:404
-msgid "Instance URL"
-msgstr "URL de la instancia"
+#: classes/feeds.php:1598
+msgid "Published articles"
+msgstr "Publicados"
 
-#: plugins/instances/init.php:226
-#: plugins/instances/init.php:414
-msgid "Access key:"
-msgstr "Clave de acceso:"
+#: classes/feeds.php:1600
+msgid "Fresh articles"
+msgstr "Recientes"
 
-#: plugins/instances/init.php:229
-#: plugins/instances/init.php:313
-#: plugins/instances/init.php:417
-msgid "Access key"
-msgstr "Clave de acceso"
+#: classes/feeds.php:1604
+msgid "Archived articles"
+msgstr "Artículos archivados"
 
-#: plugins/instances/init.php:233
-#: plugins/instances/init.php:421
-msgid "Use one access key for both linked instances."
-msgstr ""
+#: classes/feeds.php:1606
+msgid "Recently read"
+msgstr "Leídos recientemente"
 
-#: plugins/instances/init.php:241
-#: plugins/instances/init.php:429
-msgid "Generate new key"
-msgstr "Generar nueva clave"
+#: classes/feeds.php:1716
+msgid "Special"
+msgstr "Especial"
 
-#: plugins/instances/init.php:292
-msgid "Link instance"
-msgstr "Enlazar instancia"
+#: classes/feeds.php:1962
+#, php-format
+msgid "Search results: %s"
+msgstr "Resultados de búsqueda: %s"
 
-#: plugins/instances/init.php:304
-msgid "You can connect other instances of Tiny Tiny RSS to this one to share Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
-msgstr ""
+#: plugins/vf_shared/init.php:16
+#: plugins/vf_shared/init.php:60
+msgid "Shared articles"
+msgstr "Artículos compartidos"
 
-#: plugins/instances/init.php:314
-msgid "Last connected"
-msgstr "Última sesión"
+#: plugins/import_export/init.php:58
+msgid "Import and export"
+msgstr "Importar y exportar"
 
-#: plugins/instances/init.php:315
-msgid "Status"
-msgstr "Estado"
+#: plugins/import_export/init.php:60
+msgid "You can export and import your Starred and Archived articles for safekeeping or when migrating between tt-rss instances of same version."
+msgstr ""
 
-#: plugins/instances/init.php:316
-msgid "Stored feeds"
-msgstr "Fuentes archivadas"
+#: plugins/import_export/init.php:65
+msgid "Export my data"
+msgstr "Exportar mis datos"
 
-#: plugins/instances/init.php:433
-msgid "Create link"
-msgstr "Crear enlace"
+#: plugins/import_export/init.php:81
+msgid "Import"
+msgstr "Importar"
 
-#: plugins/nsfw/init.php:30
-#: plugins/nsfw/init.php:42
-msgid "Not work safe (click to toggle)"
+#: plugins/import_export/init.php:231
+msgid "Could not import: incorrect schema version."
 msgstr ""
 
-#: plugins/nsfw/init.php:52
-msgid "NSFW Plugin"
-msgstr "Plugin NSFW"
-
-#: plugins/nsfw/init.php:79
-msgid "Tags to consider NSFW (comma-separated)"
+#: plugins/import_export/init.php:236
+msgid "Could not import: unrecognized document format."
 msgstr ""
 
-#: plugins/nsfw/init.php:100
-msgid "Configuration saved."
-msgstr "Configuración guardada."
+#: plugins/import_export/init.php:397
+msgid "Finished: "
+msgstr "Terminado: "
 
-#: plugins/note/init.php:26
-#: plugins/note/note.js:11
-msgid "Edit article note"
-msgstr "Editar nota del artículo"
+#: plugins/import_export/init.php:398
+#, fuzzy, php-format
+msgid "%d article processed, "
+msgid_plural "%d articles processed, "
+msgstr[0] "Editar nota del artículo"
+msgstr[1] "Editar nota del artículo"
 
-#: plugins/vf_shared/init.php:16
-#: plugins/vf_shared/init.php:69
-msgid "Shared articles"
-msgstr "Artículos compartidos"
+#: plugins/import_export/init.php:399
+#, php-format
+msgid "%d imported, "
+msgid_plural "%d imported, "
+msgstr[0] ""
+msgstr[1] ""
 
-#: plugins/auth_internal/init.php:65
-#, fuzzy
-msgid "Please enter your one time password:"
-msgstr "Contraseña de un solo uso incorrecta"
+#: plugins/import_export/init.php:400
+#, fuzzy, php-format
+msgid "%d feed created."
+msgid_plural "%d feeds created."
+msgstr[0] "No se ha seleccionado ninguna fuente."
+msgstr[1] "No se ha seleccionado ninguna fuente."
 
-#: plugins/auth_internal/init.php:188
-msgid "Password has been changed."
-msgstr "La contraseña ha sido cambiada."
+#: plugins/import_export/init.php:405
+msgid "Could not load XML document."
+msgstr ""
 
-#: plugins/auth_internal/init.php:190
-msgid "Old password is incorrect."
-msgstr "La contraseña antigua es incorrecta."
+#: plugins/import_export/init.php:417
+msgid "Prepare data"
+msgstr "Preparar datos"
 
-#: plugins/af_readability/init.php:21
-msgid "Data saved."
+#: plugins/import_export/init.php:434
+#, php-format
+msgid "Upload failed with error code %d (%s)"
 msgstr ""
 
-#: plugins/af_readability/init.php:33
-#, fuzzy
-msgid "Inline content"
-msgstr "Editar nota del artículo"
+#: plugins/import_export/init.php:460
+msgid "No file uploaded."
+msgstr "No se ha cargado ningún archivo."
 
-#: plugins/af_readability/init.php:39
-msgid "Readability settings (af_readability)"
-msgstr ""
+#: plugins/mailto/init.php:48
+#: plugins/mailto/init.php:54
+#: plugins/mail/init.php:112
+#: plugins/mail/init.php:118
+msgid "[Forwarded]"
+msgstr "[Reenviado]"
 
-#: plugins/af_readability/init.php:66
-msgid "Use Readability for pages shared via bookmarklet."
-msgstr ""
+#: plugins/mailto/init.php:48
+#: plugins/mail/init.php:112
+msgid "Multiple articles"
+msgstr "Múltiples artículos"
 
-#: plugins/af_readability/init.php:78
-#: plugins/af_psql_trgm/init.php:191
-msgid "Currently enabled for (click to edit):"
+#: plugins/mailto/init.php:70
+msgid "Clicking the following link to invoke your mail client:"
 msgstr ""
 
-#: plugins/af_readability/init.php:95
+#: plugins/mailto/init.php:74
 #, fuzzy
-msgid "Readability"
-msgstr "Comprobar la disponibilidad"
-
-#: plugins/af_readability/init.php:106
-#, fuzzy
-msgid "Inline article content"
-msgstr "Editar nota del artículo"
+msgid "Forward selected article(s) by email."
+msgstr "Enviar artículo por correo electrónico"
 
-#: plugins/af_redditimgur/init.php:25
-msgid "Reddit content settings (af_redditimgur)"
+#: plugins/mailto/init.php:77
+msgid "You should be able to edit the message before sending in your mail client."
 msgstr ""
 
-#: plugins/af_redditimgur/init.php:50
-msgid "Uses Readability (full-text-rss) implementation by <a target='_blank' href='https://bitbucket.org/fivefilters/'>FiveFilters.org</a>"
-msgstr ""
+#: plugins/mailto/init.php:82
+msgid "Close this dialog"
+msgstr "Cerrar este diálogo"
 
-#: plugins/af_redditimgur/init.php:54
-msgid "Extract missing content using Readability"
-msgstr ""
+#: plugins/bookmarklets/init.php:20
+msgid "Bookmarklets"
+msgstr "Bookmarklets"
 
-#: plugins/af_redditimgur/init.php:59
-msgid "Enable additional duplicate checking"
+#: plugins/bookmarklets/init.php:22
+msgid "Drag the link below to your browser toolbar, open the feed you're interested in in your browser and click on the link to subscribe to it."
 msgstr ""
 
-#: plugins/af_redditimgur/init.php:73
-#: plugins/af_zz_imgproxy/init.php:225
+#: plugins/bookmarklets/init.php:26
+#, fuzzy, php-format
+msgid "Subscribe to %s in Tiny Tiny RSS?"
+msgstr "Se ha suscrito a %s"
+
+#: plugins/bookmarklets/init.php:31
 #, fuzzy
-msgid "Configuration saved"
-msgstr "Configuración guardada."
+msgid "Subscribe in Tiny Tiny RSS"
+msgstr "Actualizar Tiny Tiny RSS"
+
+#: plugins/bookmarklets/init.php:34
+msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
+msgstr ""
 
 #: plugins/af_psql_trgm/init.php:28
 #, php-format
@@ -2653,87 +2598,62 @@ msgstr ""
 msgid "Enable for all feeds:"
 msgstr "Habilitar categorías de fuentes"
 
-#: plugins/af_psql_trgm/init.php:209
-msgid "Similarity (pg_trgm)"
-msgstr ""
-
-#: plugins/af_comics/init.php:40
-msgid "Feeds supported by af_comics"
+#: plugins/af_psql_trgm/init.php:191
+#: plugins/af_readability/init.php:78
+msgid "Currently enabled for (click to edit):"
 msgstr ""
 
-#: plugins/af_comics/init.php:42
-msgid "The following comics are currently supported:"
+#: plugins/af_psql_trgm/init.php:209
+msgid "Similarity (pg_trgm)"
 msgstr ""
 
-#: plugins/af_comics/init.php:60
-msgid "GoComics requires a specific URL to workaround their lack of feed support: <code>http://feeds.feedburner.com/uclick/<em>comic_name</em></code> (e.g. <code>http://www.gocomics.com/garfield</code> uses <code>http://feeds.feedburner.com/uclick/garfield</code>)."
+#: plugins/nsfw/init.php:30
+#: plugins/nsfw/init.php:42
+msgid "Not work safe (click to toggle)"
 msgstr ""
 
-#: plugins/import_export/init.php:58
-msgid "Import and export"
-msgstr "Importar y exportar"
+#: plugins/nsfw/init.php:52
+msgid "NSFW Plugin"
+msgstr "Plugin NSFW"
 
-#: plugins/import_export/init.php:60
-msgid "You can export and import your Starred and Archived articles for safekeeping or when migrating between tt-rss instances of same version."
+#: plugins/nsfw/init.php:79
+msgid "Tags to consider NSFW (comma-separated)"
 msgstr ""
 
-#: plugins/import_export/init.php:65
-msgid "Export my data"
-msgstr "Exportar mis datos"
-
-#: plugins/import_export/init.php:81
-msgid "Import"
-msgstr "Importar"
+#: plugins/nsfw/init.php:100
+msgid "Configuration saved."
+msgstr "Configuración guardada."
 
-#: plugins/import_export/init.php:225
-msgid "Could not import: incorrect schema version."
-msgstr ""
+#: plugins/toggle_sidebar/init.php:23
+msgid "Collapse feedlist"
+msgstr "Cerrar la lista de fuentes"
 
-#: plugins/import_export/init.php:230
-msgid "Could not import: unrecognized document format."
+#: plugins/af_readability/init.php:21
+msgid "Data saved."
 msgstr ""
 
-#: plugins/import_export/init.php:391
-msgid "Finished: "
-msgstr "Terminado: "
-
-#: plugins/import_export/init.php:392
-#, fuzzy, php-format
-msgid "%d article processed, "
-msgid_plural "%d articles processed, "
-msgstr[0] "Editar nota del artículo"
-msgstr[1] "Editar nota del artículo"
-
-#: plugins/import_export/init.php:393
-#, php-format
-msgid "%d imported, "
-msgid_plural "%d imported, "
-msgstr[0] ""
-msgstr[1] ""
-
-#: plugins/import_export/init.php:394
-#, fuzzy, php-format
-msgid "%d feed created."
-msgid_plural "%d feeds created."
-msgstr[0] "No se ha seleccionado ninguna fuente."
-msgstr[1] "No se ha seleccionado ninguna fuente."
+#: plugins/af_readability/init.php:33
+#, fuzzy
+msgid "Inline content"
+msgstr "Editar nota del artículo"
 
-#: plugins/import_export/init.php:399
-msgid "Could not load XML document."
+#: plugins/af_readability/init.php:39
+msgid "Readability settings (af_readability)"
 msgstr ""
 
-#: plugins/import_export/init.php:411
-msgid "Prepare data"
-msgstr "Preparar datos"
-
-#: plugins/import_export/init.php:428
-#, php-format
-msgid "Upload failed with error code %d (%s)"
+#: plugins/af_readability/init.php:66
+msgid "Use Readability for pages shared via bookmarklet."
 msgstr ""
 
-#: plugins/import_export/init.php:454
-msgid "No file uploaded."
-msgstr "No se ha cargado ningún archivo."
+#: plugins/af_readability/init.php:95
+#, fuzzy
+msgid "Readability"
+msgstr "Comprobar la disponibilidad"
+
+#: plugins/af_readability/init.php:106
+#, fuzzy
+msgid "Inline article content"
+msgstr "Editar nota del artículo"
 
 #: plugins/mail/init.php:28
 msgid "Mail addresses saved."
@@ -2748,18 +2668,6 @@ msgstr "Plugins de usuario"
 msgid "You can set predefined email addressed here (comma-separated list):"
 msgstr ""
 
-#: plugins/mail/init.php:112
-#: plugins/mail/init.php:118
-#: plugins/mailto/init.php:49
-#: plugins/mailto/init.php:55
-msgid "[Forwarded]"
-msgstr "[Reenviado]"
-
-#: plugins/mail/init.php:112
-#: plugins/mailto/init.php:49
-msgid "Multiple articles"
-msgstr "Múltiples artículos"
-
 #: plugins/mail/init.php:140
 msgid "To:"
 msgstr "Para:"
@@ -2772,92 +2680,110 @@ msgstr "Asunto:"
 msgid "Send e-mail"
 msgstr "Enviar correo electrónico"
 
-#: plugins/close_button/init.php:22
-msgid "Close article"
-msgstr "Cerrar artículo"
+#: plugins/share/init.php:39
+msgid "You can disable all articles shared by unique URLs here."
+msgstr ""
 
-#: plugins/bookmarklets/init.php:20
-msgid "Bookmarklets"
-msgstr "Bookmarklets"
+#: plugins/share/init.php:42
+msgid "Unshare all articles"
+msgstr "Dejar de compartir todos los artículos"
 
-#: plugins/bookmarklets/init.php:22
-msgid "Drag the link below to your browser toolbar, open the feed you're interested in in your browser and click on the link to subscribe to it."
+#: plugins/share/init.php:75
+msgid "Share by URL"
+msgstr "Compartir mediante URL"
+
+#: plugins/share/init.php:96
+msgid "You can share this article by the following unique URL:"
 msgstr ""
 
-#: plugins/bookmarklets/init.php:26
-#, fuzzy, php-format
-msgid "Subscribe to %s in Tiny Tiny RSS?"
-msgstr "Se ha suscrito a %s"
+#: plugins/share/init.php:114
+msgid "Unshare article"
+msgstr "Dejar de compartir el artículo"
 
-#: plugins/bookmarklets/init.php:31
-#, fuzzy
-msgid "Subscribe in Tiny Tiny RSS"
-msgstr "Actualizar Tiny Tiny RSS"
+#: plugins/af_comics/init.php:48
+msgid "Feeds supported by af_comics"
+msgstr ""
 
-#: plugins/bookmarklets/init.php:34
-msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
+#: plugins/af_comics/init.php:50
+msgid "The following comics are currently supported:"
 msgstr ""
 
-#: plugins/toggle_sidebar/init.php:23
-msgid "Collapse feedlist"
-msgstr "Cerrar la lista de fuentes"
+#: plugins/af_comics/init.php:68
+msgid "GoComics requires a specific URL to workaround their lack of feed support: <code>http://feeds.feedburner.com/uclick/<em>comic_name</em></code> (e.g. <code>http://www.gocomics.com/garfield</code> uses <code>http://feeds.feedburner.com/uclick/garfield</code>)."
+msgstr ""
 
-#: plugins/af_zz_imgproxy/init.php:186
-msgid "Image proxy settings (af_zz_imgproxy)"
+#: plugins/af_comics/init.php:70
+msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
 msgstr ""
 
-#: plugins/af_zz_imgproxy/init.php:211
-#, fuzzy
-msgid "Enable proxy for all remote images."
-msgstr "Habilitar categorías de fuentes"
+#: plugins/af_redditimgur/init.php:25
+msgid "Reddit content settings (af_redditimgur)"
+msgstr ""
 
-#: plugins/mailto/init.php:71
-msgid "Clicking the following link to invoke your mail client:"
+#: plugins/af_redditimgur/init.php:50
+msgid "Uses Readability (full-text-rss) implementation by <a target='_blank' href='https://bitbucket.org/fivefilters/'>FiveFilters.org</a>"
 msgstr ""
 
-#: plugins/mailto/init.php:75
-#, fuzzy
-msgid "Forward selected article(s) by email."
-msgstr "Enviar artículo por correo electrónico"
+#: plugins/af_redditimgur/init.php:54
+msgid "Extract missing content using Readability"
+msgstr ""
 
-#: plugins/mailto/init.php:78
-msgid "You should be able to edit the message before sending in your mail client."
+#: plugins/af_redditimgur/init.php:59
+msgid "Enable additional duplicate checking"
 msgstr ""
 
-#: plugins/mailto/init.php:83
-msgid "Close this dialog"
-msgstr "Cerrar este diálogo"
+#: plugins/af_redditimgur/init.php:73
+#: plugins/af_zz_imgproxy/init.php:254
+#, fuzzy
+msgid "Configuration saved"
+msgstr "Configuración guardada."
 
-#: plugins/share/init.php:39
-msgid "You can disable all articles shared by unique URLs here."
+#: plugins/note/init.php:26
+#: plugins/note/note.js:11
+msgid "Edit article note"
+msgstr "Editar nota del artículo"
+
+#: plugins/close_button/init.php:25
+msgid "Close article"
+msgstr "Cerrar artículo"
+
+#: plugins/af_zz_imgproxy/init.php:210
+msgid "Image proxy settings (af_zz_imgproxy)"
 msgstr ""
 
-#: plugins/share/init.php:42
-msgid "Unshare all articles"
-msgstr "Dejar de compartir todos los artículos"
+#: plugins/af_zz_imgproxy/init.php:234
+#, fuzzy
+msgid "Enable proxy for all remote images."
+msgstr "Habilitar categorías de fuentes"
 
-#: plugins/share/init.php:75
-msgid "Share by URL"
-msgstr "Compartir mediante URL"
+#: plugins/af_zz_imgproxy/init.php:238
+#, fuzzy
+msgid "Don't cache files locally."
+msgstr "Guardar las imágenes en la memoria caché local"
 
-#: plugins/share/init.php:97
-msgid "You can share this article by the following unique URL:"
-msgstr ""
+#: plugins/auth_internal/init.php:65
+#, fuzzy
+msgid "Please enter your one time password:"
+msgstr "Contraseña de un solo uso incorrecta"
 
-#: plugins/share/init.php:115
-msgid "Unshare article"
-msgstr "Dejar de compartir el artículo"
+#: plugins/auth_internal/init.php:188
+msgid "Password has been changed."
+msgstr "La contraseña ha sido cambiada."
+
+#: plugins/auth_internal/init.php:190
+msgid "Old password is incorrect."
+msgstr "La contraseña antigua es incorrecta."
 
 #: js/FeedTree.js:172
 #, fuzzy
 msgid "(Un)collapse"
 msgstr "Mostrar/ocultar la barra lateral"
 
-#: js/PrefFeedTree.js:52
+#: js/PrefFeedTree.js:54
 msgid "Edit category"
 msgstr "Editar categoría"
 
-#: js/PrefFeedTree.js:59
+#: js/PrefFeedTree.js:61
 msgid "Remove category"
 msgstr "Borrar categoría"
 
@@ -2892,63 +2818,55 @@ msgid "Create Filter"
 msgstr "Crear filtro"
 
 #: js/functions.js:1128
-msgid "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification hub again on next feed update."
-msgstr ""
-
-#: js/functions.js:1139
-msgid "Subscription reset."
-msgstr "Suscripción reiniciada."
-
-#: js/functions.js:1149
-#: js/tt-rss.js:695
+#: js/tt-rss.js:696
 #, perl-format
 msgid "Unsubscribe from %s?"
 msgstr "¿Cancelar la suscripción a %s?"
 
-#: js/functions.js:1152
+#: js/functions.js:1131
 msgid "Removing feed..."
 msgstr "Eliminando la fuente..."
 
-#: js/functions.js:1225
+#: js/functions.js:1204
 msgid "Please enter category title:"
 msgstr "Introduzca el nombre de la categoría:"
 
-#: js/functions.js:1250
+#: js/functions.js:1229
 msgid "Generate new syndication address for this feed?"
 msgstr ""
 
-#: js/functions.js:1254
-#: js/prefs.js:1154
+#: js/functions.js:1233
+#: js/prefs.js:1150
 msgid "Trying to change address..."
 msgstr "Intentando cambiar la dirección..."
 
-#: js/functions.js:1497
-#: js/functions.js:1606
+#: js/functions.js:1476
+#: js/functions.js:1585
 #: js/prefs.js:398
 #: js/prefs.js:424
 #: js/prefs.js:456
 #: js/prefs.js:599
 #: js/prefs.js:617
-#: js/prefs.js:1136
-#: js/prefs.js:1263
+#: js/prefs.js:1132
+#: js/prefs.js:1259
 msgid "No feeds are selected."
 msgstr "No se han seleccionado fuentes."
 
-#: js/functions.js:1540
+#: js/functions.js:1519
 msgid "Remove selected feeds from the archive? Feeds with stored articles will not be removed."
 msgstr ""
 
-#: js/functions.js:1577
+#: js/functions.js:1556
 msgid "Feeds with update errors"
 msgstr "Fuentes con errores de actualización"
 
-#: js/functions.js:1588
-#: js/prefs.js:1117
+#: js/functions.js:1567
+#: js/prefs.js:1113
 msgid "Remove selected feeds?"
 msgstr "¿Borrar fuentes seleccionadas?"
 
-#: js/functions.js:1591
-#: js/prefs.js:1120
+#: js/functions.js:1570
+#: js/prefs.js:1116
 msgid "Removing selected feeds..."
 msgstr "Borrando fuentes seleccionadas..."
 
@@ -2971,9 +2889,7 @@ msgstr "Editor de usuario"
 #: js/prefs.js:100
 #: js/prefs.js:209
 #: js/prefs.js:706
-#: plugins/instances/instances.js:26
-#: plugins/instances/instances.js:89
-#: js/functions.js:1408
+#: js/functions.js:1387
 msgid "Saving data..."
 msgstr "Guardando datos..."
 
@@ -2998,7 +2914,7 @@ msgid "Removing selected labels..."
 msgstr "Eliminando los marcadores seleccionados..."
 
 #: js/prefs.js:308
-#: js/prefs.js:1304
+#: js/prefs.js:1300
 msgid "No labels are selected."
 msgstr "No se han seleccionado marcadores."
 
@@ -3102,28 +3018,28 @@ msgstr "Suscribirse a la fuente seleccionada"
 msgid "OPML Import"
 msgstr "Importar OPML"
 
-#: js/prefs.js:764
+#: js/prefs.js:759
 msgid "Please choose an OPML file first."
 msgstr ""
 
-#: js/prefs.js:767
+#: js/prefs.js:762
 #: plugins/import_export/import_export.js:115
 msgid "Importing, please wait..."
 msgstr "Importando. Por favor, espere..."
 
-#: js/prefs.js:928
+#: js/prefs.js:924
 msgid "Reset to defaults?"
 msgstr "¿Restaurar las opciones por defecto?"
 
-#: js/prefs.js:1628
+#: js/prefs.js:1624
 msgid "Subscribing to feeds..."
 msgstr "Suscribiéndose a las fuentes..."
 
-#: js/prefs.js:1647
+#: js/prefs.js:1643
 msgid "Clear stored data for this plugin?"
 msgstr ""
 
-#: js/prefs.js:1661
+#: js/prefs.js:1657
 msgid "Clear all messages in the error log?"
 msgstr ""
 
@@ -3137,181 +3053,150 @@ msgstr "Marcar artículos anteriores como leídos"
 msgid "Marking all feeds as read..."
 msgstr "Marcar fuente como leída"
 
-#: js/tt-rss.js:401
+#: js/tt-rss.js:402
 msgid "Please enable mail plugin first."
 msgstr ""
 
-#: js/tt-rss.js:449
-#: js/functions.js:1387
-#: js/tt-rss.js:676
+#: js/tt-rss.js:450
+#: js/functions.js:1366
+#: js/tt-rss.js:677
 msgid "You can't edit this kind of feed."
 msgstr ""
 
-#: js/tt-rss.js:530
+#: js/tt-rss.js:531
 msgid "Please enable embed_original plugin first."
 msgstr ""
 
-#: js/tt-rss.js:543
-#: js/tt-rss.js:726
+#: js/tt-rss.js:544
+#: js/tt-rss.js:727
 msgid "Widescreen is not available in combined mode."
 msgstr ""
 
-#: js/tt-rss.js:824
+#: js/tt-rss.js:825
 msgid "You can't rescore this kind of feed."
 msgstr ""
 
-#: js/tt-rss.js:829
-#: js/tt-rss.js:689
+#: js/tt-rss.js:830
+#: js/tt-rss.js:690
 #, fuzzy
 msgid "Please select some feed first."
 msgstr "Limpiando las fuentes seleccionadas..."
 
-#: js/tt-rss.js:834
+#: js/tt-rss.js:835
 #, fuzzy, perl-format
 msgid "Rescore articles in %s?"
 msgstr "¿Reiniciar la puntuación de los artículos en %?"
 
-#: js/tt-rss.js:837
+#: js/tt-rss.js:838
 msgid "Rescoring articles..."
 msgstr "Reiniciando la puntuación de los artículos..."
 
-#: js/viewfeed.js:919
-#: js/viewfeed.js:957
-#: js/viewfeed.js:1005
-#: js/viewfeed.js:1931
-#: plugins/mail/mail.js:7
+#: js/viewfeed.js:921
+#: js/viewfeed.js:959
+#: js/viewfeed.js:1007
+#: js/viewfeed.js:1933
 #: plugins/mailto/init.js:7
-#: js/viewfeed.js:677
-#: js/viewfeed.js:699
-#: js/viewfeed.js:720
-#: js/viewfeed.js:779
-#: js/viewfeed.js:807
+#: plugins/mail/mail.js:7
+#: js/viewfeed.js:679
+#: js/viewfeed.js:701
+#: js/viewfeed.js:722
+#: js/viewfeed.js:781
+#: js/viewfeed.js:809
 msgid "No articles are selected."
 msgstr "No se han seleccionado artículos."
 
-#: js/viewfeed.js:927
+#: js/viewfeed.js:929
 #, fuzzy, perl-format
 msgid "Delete %d selected article in %s?"
 msgid_plural "Delete %d selected articles in %s?"
 msgstr[0] "¿Reiniciar la puntuación de los artículos en %?"
 msgstr[1] "¿Reiniciar la puntuación de los artículos en %?"
 
-#: js/viewfeed.js:929
+#: js/viewfeed.js:931
 #, fuzzy, perl-format
 msgid "Delete %d selected article?"
 msgid_plural "Delete %d selected articles?"
 msgstr[0] "¿Activar el perfil seleccionado?"
 msgstr[1] "¿Activar el perfil seleccionado?"
 
-#: js/viewfeed.js:966
+#: js/viewfeed.js:968
 #, fuzzy, perl-format
 msgid "Archive %d selected article in %s?"
 msgid_plural "Archive %d selected articles in %s?"
 msgstr[0] "Artículos archivados"
 msgstr[1] "Artículos archivados"
 
-#: js/viewfeed.js:969
+#: js/viewfeed.js:971
 #, fuzzy, perl-format
 msgid "Move %d archived article back?"
 msgid_plural "Move %d archived articles back?"
 msgstr[0] "Artículos archivados"
 msgstr[1] "Artículos archivados"
 
-#: js/viewfeed.js:971
+#: js/viewfeed.js:973
 msgid "Please note that unstarred articles might get purged on next feed update."
 msgstr ""
 
-#: js/viewfeed.js:1011
+#: js/viewfeed.js:1013
 #, perl-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/viewfeed.js:1031
+#: js/viewfeed.js:1033
 msgid "Edit article Tags"
 msgstr "Editar las etiquetas del artículo"
 
-#: js/viewfeed.js:1037
+#: js/viewfeed.js:1039
 msgid "Saving article tags..."
 msgstr "Guardando las etiquetas del artículo..."
 
-#: js/viewfeed.js:1670
+#: js/viewfeed.js:1672
 msgid "Open original article"
 msgstr "Abrir artículo original"
 
-#: js/viewfeed.js:1677
+#: js/viewfeed.js:1679
 msgid "Display article URL"
 msgstr "Mostrar la URL del artículo"
 
-#: js/viewfeed.js:1787
+#: js/viewfeed.js:1789
 msgid "Assign label"
 msgstr "Asignar marcador"
 
-#: js/viewfeed.js:1792
+#: js/viewfeed.js:1794
 msgid "Remove label"
 msgstr "Eliminar marcador"
 
-#: js/viewfeed.js:1824
+#: js/viewfeed.js:1826
 msgid "Select articles in group"
 msgstr "Seleccionar los artículos del grupo"
 
-#: js/viewfeed.js:1834
+#: js/viewfeed.js:1836
 msgid "Mark group as read"
 msgstr "Marcar grupo como leído"
 
-#: js/viewfeed.js:1846
+#: js/viewfeed.js:1848
 msgid "Mark feed as read"
 msgstr "Marcar fuente como leída"
 
-#: js/viewfeed.js:1899
+#: js/viewfeed.js:1901
 #, fuzzy
 msgid "Please enter new score for selected articles:"
 msgstr "Introduzca el nombre de la categoría:"
 
-#: js/viewfeed.js:1962
+#: js/viewfeed.js:1964
 #, fuzzy
 msgid "Please enter new score for this article:"
 msgstr "Introduzca el nombre de la categoría:"
 
-#: js/viewfeed.js:1993
+#: js/viewfeed.js:1995
 msgid "Article URL:"
 msgstr "URL del artículo:"
 
-#: plugins/instances/instances.js:10
-msgid "Link Instance"
-msgstr "Enlazar instancia"
-
-#: plugins/instances/instances.js:73
-msgid "Edit Instance"
-msgstr "Editar instancia"
-
-#: plugins/instances/instances.js:122
-msgid "Remove selected instances?"
-msgstr "¿Eliminar instancias seleccionadas?"
-
-#: plugins/instances/instances.js:125
-msgid "Removing selected instances..."
-msgstr "Eliminando instancias seleccionadas..."
-
-#: plugins/instances/instances.js:139
-#: plugins/instances/instances.js:151
-msgid "No instances are selected."
-msgstr "No se han seleccionado instancias."
-
-#: plugins/instances/instances.js:156
-#, fuzzy
-msgid "Please select only one instance."
-msgstr "¿Eliminar instancias seleccionadas?"
-
-#: plugins/note/note.js:17
-msgid "Saving article note..."
-msgstr "Guardando nota del artículo..."
-
-#: plugins/af_psql_trgm/init.js:11
-#, fuzzy
-msgid "Related articles"
-msgstr "Artículos compartidos"
+#: plugins/embed_original/init.js:6
+msgid "Sorry, your browser does not support sandboxed iframes."
+msgstr ""
 
 #: plugins/import_export/import_export.js:13
 msgid "Export Data"
@@ -3332,11 +3217,16 @@ msgstr "Importación de datos"
 msgid "Please choose the file first."
 msgstr ""
 
-#: plugins/mail/mail.js:21
 #: plugins/mailto/init.js:21
+#: plugins/mail/mail.js:21
 msgid "Forward article by email"
 msgstr "Enviar artículo por correo electrónico"
 
+#: plugins/af_psql_trgm/init.js:11
+#, fuzzy
+msgid "Related articles"
+msgstr "Artículos compartidos"
+
 #: plugins/mail/mail.js:36
 msgid "Error sending email:"
 msgstr ""
@@ -3345,10 +3235,6 @@ msgstr ""
 msgid "Your message has been sent."
 msgstr ""
 
-#: plugins/embed_original/init.js:6
-msgid "Sorry, your browser does not support sandboxed iframes."
-msgstr ""
-
 #: plugins/shorten_expanded/init.js:39
 msgid "Click to expand article"
 msgstr "Desplegar el artículo"
@@ -3378,7 +3264,7 @@ msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr ""
 
 #: plugins/share/share_prefs.js:6
-#: js/prefs.js:1437
+#: js/prefs.js:1433
 msgid "Clearing URLs..."
 msgstr "Limpiando URL..."
 
@@ -3386,27 +3272,45 @@ msgstr "Limpiando URL..."
 msgid "Shared URLs cleared."
 msgstr "Las URL compartidas han sido borradas."
 
+#: plugins/note/note.js:17
+msgid "Saving article note..."
+msgstr "Guardando nota del artículo..."
+
 #: js/feedlist.js:429
-#: js/feedlist.js:496
 #, fuzzy
 msgid "Mark all articles in %s as read?"
 msgstr "¿Reiniciar la puntuación de los artículos en %?"
 
 #: js/feedlist.js:487
 #, fuzzy
-msgid "Mark all articles in %s older than 1 day as read?"
+msgid "Mark %w in %s older than 1 day as read?"
 msgstr "¿Reiniciar la puntuación de los artículos en %?"
 
 #: js/feedlist.js:490
 #, fuzzy
-msgid "Mark all articles in %s older than 1 week as read?"
+msgid "Mark %w in %s older than 1 week as read?"
 msgstr "¿Reiniciar la puntuación de los artículos en %?"
 
 #: js/feedlist.js:493
 #, fuzzy
-msgid "Mark all articles in %s older than 2 weeks as read?"
+msgid "Mark %w in %s older than 2 weeks as read?"
+msgstr "¿Reiniciar la puntuación de los artículos en %?"
+
+#: js/feedlist.js:496
+#, fuzzy
+msgid "Mark %w in %s as read?"
 msgstr "¿Reiniciar la puntuación de los artículos en %?"
 
+#: js/feedlist.js:499
+#, fuzzy
+msgid "search results"
+msgstr "Resultados de búsqueda: %s"
+
+#: js/feedlist.js:499
+#, fuzzy
+msgid "all articles"
+msgstr "Todos"
+
 #: js/functions.js:506
 msgid "Error explained"
 msgstr "Error explicado"
@@ -3490,181 +3394,236 @@ msgstr "Se ha suscrito a %s"
 msgid "Edit rule"
 msgstr "Editar regla"
 
-#: js/functions.js:1402
+#: js/functions.js:1381
 msgid "Edit Feed"
 msgstr "Editar fuente"
 
-#: js/functions.js:1435
+#: js/functions.js:1414
 msgid "More Feeds"
 msgstr "Más fuentes"
 
-#: js/functions.js:1631
+#: js/functions.js:1610
 msgid "Help"
 msgstr "Ayuda"
 
-#: js/prefs.js:1032
+#: js/prefs.js:1028
 msgid "Remove category %s? Any nested feeds would be placed into Uncategorized."
 msgstr ""
 
-#: js/prefs.js:1038
+#: js/prefs.js:1034
 msgid "Removing category..."
 msgstr "Eliminando categoría..."
 
-#: js/prefs.js:1056
+#: js/prefs.js:1052
 msgid "Remove selected categories?"
 msgstr "¿Eliminar las categorías seleccionadas?"
 
-#: js/prefs.js:1059
+#: js/prefs.js:1055
 msgid "Removing selected categories..."
 msgstr "Eliminando las categorías seleccionadas..."
 
-#: js/prefs.js:1072
+#: js/prefs.js:1068
 msgid "No categories are selected."
 msgstr "No se han seleccionado categorías."
 
-#: js/prefs.js:1079
+#: js/prefs.js:1075
 msgid "Category title:"
 msgstr "Nombre de la categoría:"
 
-#: js/prefs.js:1083
+#: js/prefs.js:1079
 msgid "Creating category..."
 msgstr "Creando categoría..."
 
-#: js/prefs.js:1106
+#: js/prefs.js:1102
 msgid "Feeds without recent updates"
 msgstr "Fuentes sin actualizaciones recientes"
 
-#: js/prefs.js:1150
+#: js/prefs.js:1146
 msgid "Replace current OPML publishing address with a new one?"
 msgstr ""
 
-#: js/prefs.js:1227
+#: js/prefs.js:1223
 msgid "Clearing feed..."
 msgstr "Limpiando la fuente..."
 
-#: js/prefs.js:1247
+#: js/prefs.js:1243
 #, fuzzy
 msgid "Rescore articles in selected feeds?"
 msgstr "¿Reiniciar la puntuación de los artículos en %?"
 
-#: js/prefs.js:1250
+#: js/prefs.js:1246
 msgid "Rescoring selected feeds..."
 msgstr "Volviendo a puntuar las fuentes seleccionadas..."
 
-#: js/prefs.js:1270
+#: js/prefs.js:1266
 msgid "Rescore all articles? This operation may take a lot of time."
 msgstr ""
 
-#: js/prefs.js:1273
+#: js/prefs.js:1269
 msgid "Rescoring feeds..."
 msgstr "Volviendo a puntuar las fuentes..."
 
-#: js/prefs.js:1289
+#: js/prefs.js:1285
 #, fuzzy
 msgid "Reset selected labels to default colors?"
 msgstr "¿Borrar los marcadores seleccionados?"
 
-#: js/prefs.js:1321
+#: js/prefs.js:1317
 msgid "Settings Profiles"
 msgstr "Perfiles de preferencias"
 
-#: js/prefs.js:1330
+#: js/prefs.js:1326
 msgid "Remove selected profiles? Active and default profiles will not be removed."
 msgstr ""
 
-#: js/prefs.js:1333
+#: js/prefs.js:1329
 msgid "Removing selected profiles..."
 msgstr "Borrando los perfiles seleccionados..."
 
-#: js/prefs.js:1349
+#: js/prefs.js:1345
 msgid "No profiles are selected."
 msgstr "No se ha seleccionado ningún perfil."
 
-#: js/prefs.js:1357
-#: js/prefs.js:1410
+#: js/prefs.js:1353
+#: js/prefs.js:1406
 msgid "Activate selected profile?"
 msgstr "¿Activar el perfil seleccionado?"
 
-#: js/prefs.js:1374
-#: js/prefs.js:1426
+#: js/prefs.js:1370
+#: js/prefs.js:1422
 msgid "Please choose a profile to activate."
 msgstr ""
 
-#: js/prefs.js:1379
+#: js/prefs.js:1375
 msgid "Creating profile..."
 msgstr "Creando perfil..."
 
-#: js/prefs.js:1434
+#: js/prefs.js:1430
 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr ""
 
-#: js/prefs.js:1444
+#: js/prefs.js:1440
 msgid "Generated URLs cleared."
 msgstr "Las URL generadas han sido borradas."
 
-#: js/prefs.js:1516
+#: js/prefs.js:1512
 msgid "Label Editor"
 msgstr "Editor de marcadores"
 
-#: js/tt-rss.js:684
+#: js/tt-rss.js:685
 msgid "You can't unsubscribe from the category."
 msgstr ""
 
-#: js/viewfeed.js:125
-#: js/viewfeed.js:175
-#: js/viewfeed.js:192
+#: js/viewfeed.js:127
+#: js/viewfeed.js:177
+#: js/viewfeed.js:194
 #, fuzzy
 msgid "Click to open next unread feed."
 msgstr "Haga clic para editar fuente"
 
-#: js/viewfeed.js:129
+#: js/viewfeed.js:131
 msgid "Cancel search"
 msgstr "Cancelar búsqueda"
 
-#: js/viewfeed.js:189
+#: js/viewfeed.js:191
 msgid "New articles found, reload feed to continue."
 msgstr ""
 
-#: js/viewfeed.js:424
+#: js/viewfeed.js:426
 msgid "Unstar article"
 msgstr "Quitar el artículo de los favoritos"
 
-#: js/viewfeed.js:428
+#: js/viewfeed.js:430
 msgid "Star article"
 msgstr "Marcar el artículo como favorito"
 
-#: js/viewfeed.js:478
+#: js/viewfeed.js:480
 msgid "Unpublish article"
 msgstr "Cancelar publicación de artículo"
 
-#: js/viewfeed.js:482
+#: js/viewfeed.js:484
 msgid "Publish article"
 msgstr "Publicar artículo"
 
-#: js/viewfeed.js:622
+#: js/viewfeed.js:624
 #, fuzzy
 msgid "%d article selected"
 msgid_plural "%d articles selected"
 msgstr[0] "No se ha seleccionado ningún artículo."
 msgstr[1] "No se ha seleccionado ningún artículo."
 
-#: js/viewfeed.js:1286
+#: js/viewfeed.js:1288
 msgid "No article is selected."
 msgstr "No se ha seleccionado ningún artículo."
 
-#: js/viewfeed.js:1321
+#: js/viewfeed.js:1323
 msgid "No articles found to mark"
 msgstr ""
 
-#: js/viewfeed.js:1323
+#: js/viewfeed.js:1325
 #, fuzzy
 msgid "Mark %d article as read?"
 msgid_plural "Mark %d articles as read?"
 msgstr[0] "Marcar artículos anteriores como leídos"
 msgstr[1] "Marcar artículos anteriores como leídos"
 
-#~ msgid "Cache images locally"
-#~ msgstr "Guardar las imágenes en la memoria caché local"
+#~ msgid "Resubscribe to push updates"
+#~ msgstr "Volver a suscribirse a las actualizaciones push"
+
+#~ msgid "Linked"
+#~ msgstr "Enlazado"
+
+#~ msgid "Instance"
+#~ msgstr "Instancia"
+
+#~ msgid "Instance URL"
+#~ msgstr "URL de la instancia"
+
+#~ msgid "Access key:"
+#~ msgstr "Clave de acceso:"
+
+#~ msgid "Access key"
+#~ msgstr "Clave de acceso"
+
+#~ msgid "Generate new key"
+#~ msgstr "Generar nueva clave"
+
+#~ msgid "Link instance"
+#~ msgstr "Enlazar instancia"
+
+#~ msgid "Last connected"
+#~ msgstr "Última sesión"
+
+#~ msgid "Status"
+#~ msgstr "Estado"
+
+#~ msgid "Stored feeds"
+#~ msgstr "Fuentes archivadas"
+
+#~ msgid "Create link"
+#~ msgstr "Crear enlace"
+
+#~ msgid "Subscription reset."
+#~ msgstr "Suscripción reiniciada."
+
+#~ msgid "Link Instance"
+#~ msgstr "Enlazar instancia"
+
+#~ msgid "Edit Instance"
+#~ msgstr "Editar instancia"
+
+#~ msgid "Remove selected instances?"
+#~ msgstr "¿Eliminar instancias seleccionadas?"
+
+#~ msgid "Removing selected instances..."
+#~ msgstr "Eliminando instancias seleccionadas..."
+
+#~ msgid "No instances are selected."
+#~ msgstr "No se han seleccionado instancias."
+
+#, fuzzy
+#~ msgid "Please select only one instance."
+#~ msgstr "¿Eliminar instancias seleccionadas?"
 
 #~ msgid "More..."
 #~ msgstr "Más..."
diff --git a/locale/fi_FI/LC_MESSAGES/messages.mo b/locale/fi_FI/LC_MESSAGES/messages.mo
index 55abfdcc2..f0d3c108c 100644
--- a/locale/fi_FI/LC_MESSAGES/messages.mo
+++ b/locale/fi_FI/LC_MESSAGES/messages.mo
diff --git a/locale/fi_FI/LC_MESSAGES/messages.po b/locale/fi_FI/LC_MESSAGES/messages.po
index 76346e021..af272442d 100644
--- a/locale/fi_FI/LC_MESSAGES/messages.po
+++ b/locale/fi_FI/LC_MESSAGES/messages.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tt-rss 1.7.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 15:25+0300\n"
+"POT-Creation-Date: 2017-07-04 16:29+0300\n"
 "PO-Revision-Date: 2015-06-25 22:05+0300\n"
 "Last-Translator: Henrik Ahlgren <[email protected]>\n"
 "Language-Team: \n"
@@ -171,31 +171,30 @@ msgstr "Lisäosaa ei löydy"
 #: prefs.php:118
 #: classes/backend.php:5
 #: classes/pref/labels.php:282
-#: classes/pref/feeds.php:1402
-#: classes/pref/filters.php:779
+#: classes/pref/filters.php:819
+#: classes/pref/feeds.php:1376
 #: js/feedlist.js:149
-#: js/functions.js:1131
-#: js/functions.js:1231
-#: js/functions.js:1478
+#: js/functions.js:1210
+#: js/functions.js:1457
 #: js/prefs.js:621
-#: js/prefs.js:818
-#: js/prefs.js:1648
-#: js/prefs.js:1663
-#: js/tt-rss.js:550
-#: js/viewfeed.js:1182
+#: js/prefs.js:813
+#: js/prefs.js:1644
+#: js/prefs.js:1659
+#: js/tt-rss.js:551
+#: js/viewfeed.js:1184
 #: plugins/import_export/import_export.js:17
 #: js/feedlist.js:467
-#: js/feedlist.js:512
+#: js/feedlist.js:515
 #: js/functions.js:372
 #: js/functions.js:630
-#: js/prefs.js:1360
-#: js/prefs.js:1413
-#: js/prefs.js:1452
-#: js/prefs.js:1465
-#: js/prefs.js:1476
-#: js/prefs.js:1491
-#: js/tt-rss.js:567
-#: js/viewfeed.js:762
+#: js/prefs.js:1356
+#: js/prefs.js:1409
+#: js/prefs.js:1448
+#: js/prefs.js:1461
+#: js/prefs.js:1472
+#: js/prefs.js:1487
+#: js/tt-rss.js:568
+#: js/viewfeed.js:764
 msgid "Loading, please wait..."
 msgstr "Ladataan, odota..."
 
@@ -212,13 +211,13 @@ msgid "All Articles"
 msgstr "Kaikki artikkelit"
 
 #: index.php:192
-#: include/functions2.php:107
+#: include/functions.php:1181
 #: classes/feeds.php:110
 msgid "Starred"
 msgstr "Tähdelliset"
 
 #: index.php:193
-#: include/functions2.php:108
+#: include/functions.php:1182
 #: classes/feeds.php:111
 msgid "Published"
 msgstr "Julkiset"
@@ -259,7 +258,7 @@ msgstr "Otsikko"
 
 #: index.php:209
 #: index.php:249
-#: include/functions2.php:95
+#: include/functions.php:1169
 #: classes/feeds.php:115
 #: js/FeedTree.js:138
 #: js/FeedTree.js:166
@@ -299,7 +298,7 @@ msgid "Feed actions:"
 msgstr "Syötetoiminnot:"
 
 #: index.php:244
-#: classes/handler/public.php:672
+#: classes/handler/public.php:583
 msgid "Subscribe to feed..."
 msgstr "Tilaa syöte..."
 
@@ -313,8 +312,8 @@ msgstr "Uudelleenpisteytä syöte"
 
 #: index.php:247
 #: classes/pref/feeds.php:785
-#: classes/pref/feeds.php:1357
-#: js/PrefFeedTree.js:78
+#: classes/pref/feeds.php:1331
+#: js/PrefFeedTree.js:80
 msgid "Unsubscribe"
 msgstr "Peru tilaus"
 
@@ -331,7 +330,7 @@ msgid "Other actions:"
 msgstr "Muut toiminnot:"
 
 #: index.php:252
-#: include/functions2.php:81
+#: include/functions.php:1155
 msgid "Toggle widescreen mode"
 msgstr "Vaihda näkymä"
 
@@ -357,7 +356,7 @@ msgstr "Päivityksiä saatavilla Gitistä."
 
 #: prefs.php:33
 #: prefs.php:136
-#: include/functions2.php:110
+#: include/functions.php:1184
 #: classes/pref/prefs.php:435
 msgid "Preferences"
 msgstr "Asetukset"
@@ -372,20 +371,19 @@ msgstr "Poistu asetuksista"
 
 #: prefs.php:139
 #: classes/pref/feeds.php:112
-#: classes/pref/feeds.php:1297
-#: classes/pref/feeds.php:1346
+#: classes/pref/feeds.php:1271
+#: classes/pref/feeds.php:1320
 msgid "Feeds"
 msgstr "Syötteet"
 
 #: prefs.php:142
-#: classes/pref/filters.php:248
+#: classes/pref/filters.php:273
 msgid "Filters"
 msgstr "Suodattimet"
 
 #: prefs.php:145
-#: include/functions.php:1327
-#: include/functions.php:1979
 #: classes/pref/labels.php:90
+#: classes/feeds.php:1718
 msgid "Labels"
 msgstr "Tunnisteet"
 
@@ -414,13 +412,13 @@ msgstr "Uusien käyttäjien rekisteröityminen on hallinnollisesti estetty."
 #: register.php:337
 #: register.php:347
 #: register.php:359
-#: classes/handler/public.php:742
-#: classes/handler/public.php:813
-#: classes/handler/public.php:911
-#: classes/handler/public.php:990
-#: classes/handler/public.php:1004
-#: classes/handler/public.php:1011
-#: classes/handler/public.php:1036
+#: classes/handler/public.php:653
+#: classes/handler/public.php:724
+#: classes/handler/public.php:822
+#: classes/handler/public.php:901
+#: classes/handler/public.php:915
+#: classes/handler/public.php:922
+#: classes/handler/public.php:947
 msgid "Return to Tiny Tiny RSS"
 msgstr "Takaisin Tiny Tiny RSS:ään"
 
@@ -437,12 +435,12 @@ msgid "Check availability"
 msgstr "Tarkasta saatavuus"
 
 #: register.php:229
-#: classes/handler/public.php:829
+#: classes/handler/public.php:740
 msgid "Email:"
 msgstr "Sähköposti:"
 
 #: register.php:232
-#: classes/handler/public.php:834
+#: classes/handler/public.php:745
 msgid "How much is two plus two:"
 msgstr "Paljonko on kaksi plus kaksi:"
 
@@ -470,17 +468,23 @@ msgstr "Käyttäjätunnus luotu onnistuneesti."
 msgid "New user registrations are currently closed."
 msgstr "Uusien käyttäjien rekisteröinti on tällä hetkellä suljettu."
 
-#: update.php:67
+#: update.php:66
 msgid "Tiny Tiny RSS data update script."
 msgstr "Tiny Tiny RSS:n datapäivitysskripti."
 
-#: include/digest.php:109
-#: include/functions.php:1336
-#: include/functions.php:1880
-#: include/functions.php:1965
-#: include/functions.php:1987
-#: classes/opml.php:421
+#: include/controls.php:83
+#: classes/pref/filters.php:242
+#: classes/pref/filters.php:253
+#: classes/pref/filters.php:544
+msgid "All feeds"
+msgstr "Kaikki syötteet"
+
+#: include/controls.php:134
+#: include/controls.php:316
 #: classes/pref/feeds.php:228
+#: classes/opml.php:486
+#: classes/feeds.php:1727
+#: classes/digest.php:113
 msgid "Uncategorized"
 msgstr "Luokittelemattomat"
 
@@ -495,392 +499,287 @@ msgstr[1] "%d arkistoitua artikkelia"
 msgid "No feeds found."
 msgstr "Syötteitä ei löytynyt."
 
-#: include/functions.php:1029
+#: include/functions.php:900
 #, php-format
 msgid "%d min"
 msgstr ""
 
-#: include/functions.php:1325
-#: include/functions.php:1977
-msgid "Special"
-msgstr "Erikoiset"
-
-#: include/functions.php:1828
-#: classes/pref/filters.php:229
-#: classes/pref/filters.php:507
-msgid "All feeds"
-msgstr "Kaikki syötteet"
-
-#: include/functions.php:2032
-msgid "Starred articles"
-msgstr "Tähdelliset artikkelit"
-
-#: include/functions.php:2034
-msgid "Published articles"
-msgstr "Julkiset artikkelit"
-
-#: include/functions.php:2036
-msgid "Fresh articles"
-msgstr "Tuoreet artikkelit"
-
-#: include/functions.php:2038
-#: include/functions2.php:105
-msgid "All articles"
-msgstr "Kaikki artikkelit"
-
-#: include/functions.php:2040
-msgid "Archived articles"
-msgstr "Arkistoidut artikkelit"
-
-#: include/functions.php:2042
-msgid "Recently read"
-msgstr "Viimeksi luetut"
-
-#: include/functions2.php:57
+#: include/functions.php:1131
 msgid "Navigation"
 msgstr "Valikko"
 
-#: include/functions2.php:58
+#: include/functions.php:1132
 msgid "Open next feed"
 msgstr "Avaa seuraava syöte"
 
-#: include/functions2.php:59
+#: include/functions.php:1133
 msgid "Open previous feed"
 msgstr "Avaa edellinen syöte"
 
-#: include/functions2.php:60
+#: include/functions.php:1134
 msgid "Open next article"
 msgstr "Avaa seuraava artikkeli"
 
-#: include/functions2.php:61
+#: include/functions.php:1135
 msgid "Open previous article"
 msgstr "Avaa edellinen artikkeli"
 
-#: include/functions2.php:62
+#: include/functions.php:1136
 msgid "Open next article (don't scroll long articles)"
 msgstr "Avaa seuraava artikkeli (älä vieritä pitkiä artikkeleita)"
 
-#: include/functions2.php:63
+#: include/functions.php:1137
 msgid "Open previous article (don't scroll long articles)"
 msgstr "Avaa edellinen artikkeli (älä vieritä pitkiä artikkeleita)"
 
-#: include/functions2.php:64
+#: include/functions.php:1138
 msgid "Move to next article (don't expand or mark read)"
 msgstr "Siirry seuraavaan artikkeliin (älä laajenna tai merkitse luetuksi)"
 
-#: include/functions2.php:65
+#: include/functions.php:1139
 msgid "Move to previous article (don't expand or mark read)"
 msgstr "Siirry edelliseen artikkeliin (älä laajenna tai merkitse luetuksi)"
 
-#: include/functions2.php:66
+#: include/functions.php:1140
 msgid "Show search dialog"
 msgstr "Näytä hakudialogi"
 
-#: include/functions2.php:67
+#: include/functions.php:1141
 msgid "Article"
 msgstr "Artikkeli"
 
-#: include/functions2.php:68
-#: js/viewfeed.js:1699
+#: include/functions.php:1142
+#: js/viewfeed.js:1701
 msgid "Toggle starred"
 msgstr "Lisää/Poista tähti"
 
-#: include/functions2.php:69
-#: js/viewfeed.js:1711
+#: include/functions.php:1143
+#: js/viewfeed.js:1713
 msgid "Toggle published"
 msgstr "Vaihda julkinen-tilaa"
 
-#: include/functions2.php:70
-#: js/viewfeed.js:1686
+#: include/functions.php:1144
+#: js/viewfeed.js:1688
 msgid "Toggle unread"
 msgstr "Vaihda luettu/lukematon"
 
-#: include/functions2.php:71
+#: include/functions.php:1145
 msgid "Edit tags"
 msgstr "Muokkaa avainsanoja"
 
-#: include/functions2.php:72
+#: include/functions.php:1146
 msgid "Open in new window"
 msgstr "Avaa uudessa ikkunassa"
 
-#: include/functions2.php:73
-#: js/viewfeed.js:1732
+#: include/functions.php:1147
+#: js/viewfeed.js:1734
 msgid "Mark below as read"
 msgstr "Merkitse alla olevat luetuiksi"
 
-#: include/functions2.php:74
-#: js/viewfeed.js:1725
+#: include/functions.php:1148
+#: js/viewfeed.js:1727
 msgid "Mark above as read"
 msgstr "Merkitse yllä olevat luetuiksi"
 
-#: include/functions2.php:75
+#: include/functions.php:1149
 msgid "Scroll down"
 msgstr "Vieritä alas"
 
-#: include/functions2.php:76
+#: include/functions.php:1150
 msgid "Scroll up"
 msgstr "Vieritä ylös"
 
-#: include/functions2.php:77
+#: include/functions.php:1151
 msgid "Select article under cursor"
 msgstr "Valitse osoittimen kohdalla oleva artikkeli"
 
-#: include/functions2.php:78
+#: include/functions.php:1152
 msgid "Email article"
 msgstr "Lähetä artikkeli sähköpostilla"
 
-#: include/functions2.php:79
+#: include/functions.php:1153
 msgid "Close/collapse article"
 msgstr "Piilota/näytä artikkeli"
 
-#: include/functions2.php:80
+#: include/functions.php:1154
 #, fuzzy
 msgid "Toggle article expansion (combined mode)"
 msgstr "Vaihda automaattilaajennuksen tila (yhdistelmänäkymässä)"
 
-#: include/functions2.php:82
+#: include/functions.php:1156
 #: plugins/embed_original/init.php:31
 msgid "Toggle embed original"
 msgstr "Vaihda alkuperäinen liitetty"
 
-#: include/functions2.php:83
+#: include/functions.php:1157
 msgid "Article selection"
 msgstr "Artikkelin valinta"
 
-#: include/functions2.php:84
+#: include/functions.php:1158
 msgid "Select all articles"
 msgstr "Valitse kaikki artikkelit"
 
-#: include/functions2.php:85
+#: include/functions.php:1159
 msgid "Select unread"
 msgstr "Valitse lukemattomat"
 
-#: include/functions2.php:86
+#: include/functions.php:1160
 msgid "Select starred"
 msgstr "Valitse tähdellä merkityt"
 
-#: include/functions2.php:87
+#: include/functions.php:1161
 msgid "Select published"
 msgstr "Valitse julkaistu"
 
-#: include/functions2.php:88
+#: include/functions.php:1162
 msgid "Invert selection"
 msgstr "Vaihda valittujen tila"
 
-#: include/functions2.php:89
+#: include/functions.php:1163
 msgid "Deselect everything"
 msgstr "Poista valinnat"
 
-#: include/functions2.php:90
+#: include/functions.php:1164
 #: classes/pref/feeds.php:555
-#: classes/pref/feeds.php:823
+#: classes/pref/feeds.php:811
 msgid "Feed"
 msgstr "Syöte"
 
-#: include/functions2.php:91
+#: include/functions.php:1165
 msgid "Refresh current feed"
 msgstr "Päivitä tämänhetkinen syöte"
 
-#: include/functions2.php:92
+#: include/functions.php:1166
 msgid "Un/hide read feeds"
 msgstr "Piilota/näytä luetut syötteet"
 
-#: include/functions2.php:93
-#: classes/pref/feeds.php:1349
+#: include/functions.php:1167
+#: classes/pref/feeds.php:1323
 msgid "Subscribe to feed"
 msgstr "Tilaa syöte"
 
-#: include/functions2.php:94
+#: include/functions.php:1168
 #: js/FeedTree.js:145
-#: js/PrefFeedTree.js:72
-#: js/viewfeed.js:1853
+#: js/PrefFeedTree.js:74
+#: js/viewfeed.js:1855
 msgid "Edit feed"
 msgstr "Muokkaa syötettä"
 
-#: include/functions2.php:96
+#: include/functions.php:1170
 msgid "Reverse headlines"
 msgstr "Otsikot käänteisjärjestyksessä"
 
-#: include/functions2.php:97
+#: include/functions.php:1171
 msgid "Toggle headline grouping"
 msgstr ""
 
-#: include/functions2.php:98
+#: include/functions.php:1172
 msgid "Debug feed update"
 msgstr "Syötepäivityksen vianetsintä"
 
-#: include/functions2.php:99
+#: include/functions.php:1173
 #, fuzzy
 msgid "Debug viewfeed()"
 msgstr "Syötepäivityksen vianetsintä"
 
-#: include/functions2.php:100
+#: include/functions.php:1174
 #: js/FeedTree.js:194
 msgid "Mark all feeds as read"
 msgstr "Merkitse kaikki syötteet luetuiksi"
 
-#: include/functions2.php:101
+#: include/functions.php:1175
 msgid "Un/collapse current category"
 msgstr "Piilota/näytä tämänhetkinen kansio"
 
-#: include/functions2.php:102
+#: include/functions.php:1176
 msgid "Toggle combined mode"
 msgstr "Vaihda yhdistelmänäkymän tila"
 
-#: include/functions2.php:103
+#: include/functions.php:1177
 msgid "Toggle auto expand in combined mode"
 msgstr "Vaihda automaattilaajennuksen tila yhdistelmänäkymässä"
 
-#: include/functions2.php:104
+#: include/functions.php:1178
 msgid "Go to"
 msgstr "Mene"
 
-#: include/functions2.php:106
+#: include/functions.php:1179
+#: classes/feeds.php:1602
+msgid "All articles"
+msgstr "Kaikki artikkelit"
+
+#: include/functions.php:1180
 msgid "Fresh"
 msgstr "Päivitä"
 
-#: include/functions2.php:109
-#: js/tt-rss.js:494
-#: js/tt-rss.js:663
+#: include/functions.php:1183
+#: js/tt-rss.js:495
+#: js/tt-rss.js:664
 msgid "Tag cloud"
 msgstr "Avainsanapilvi"
 
-#: include/functions2.php:111
+#: include/functions.php:1185
 msgid "Other"
 msgstr "Muu"
 
-#: include/functions2.php:112
+#: include/functions.php:1186
 #: classes/pref/labels.php:267
 msgid "Create label"
 msgstr "Luo tunniste"
 
-#: include/functions2.php:113
-#: classes/pref/filters.php:753
+#: include/functions.php:1187
+#: classes/pref/filters.php:793
 msgid "Create filter"
 msgstr "Luo suodatin"
 
-#: include/functions2.php:114
+#: include/functions.php:1188
 msgid "Un/collapse sidebar"
 msgstr "Piilota/näytä sivupalkki"
 
-#: include/functions2.php:115
+#: include/functions.php:1189
 msgid "Show help dialog"
 msgstr "Näytä ohjeikkuna"
 
-#: include/functions2.php:670
-#, php-format
-msgid "Search results: %s"
-msgstr "Hakutulokset: %s"
-
-#: include/functions2.php:1336
-#: classes/feeds.php:752
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] "kommentti"
-msgstr[1] "kommenttia"
-
-#: include/functions2.php:1340
-#: classes/feeds.php:756
-#, fuzzy
-msgid "comments"
-msgstr "Litteet"
-
-#: include/functions2.php:1366
-msgid " - "
-msgstr " - "
-
-#: include/functions2.php:1397
-#: include/functions2.php:1648
-#: classes/article.php:311
-msgid "no tags"
-msgstr "ei avainsanoja"
-
-#: include/functions2.php:1407
-#: classes/feeds.php:738
-msgid "Edit tags for this article"
-msgstr "Muokkaa tämän artikkelin avainsanoja"
-
-#: include/functions2.php:1439
-#: classes/feeds.php:690
-msgid "Originally from:"
-msgstr ""
-
-#: include/functions2.php:1452
-#: classes/pref/feeds.php:574
-#: classes/feeds.php:703
-msgid "Feed URL"
-msgstr "Syötteen osoite"
-
-#: include/functions2.php:1489
-#: classes/backend.php:105
-#: classes/dlg.php:37
-#: classes/dlg.php:60
-#: classes/dlg.php:93
-#: classes/dlg.php:159
-#: classes/dlg.php:186
-#: classes/pref/feeds.php:1652
-#: classes/pref/feeds.php:1718
-#: classes/pref/filters.php:204
-#: classes/pref/prefs.php:1097
-#: plugins/af_psql_trgm/init.php:102
-#: plugins/import_export/init.php:415
-#: plugins/import_export/init.php:461
-#: plugins/share/init.php:121
-msgid "Close this window"
-msgstr "Sulje ikkuna"
-
-#: include/functions2.php:1686
-msgid "(edit note)"
-msgstr "(muokkaa muistiinpanoa)"
-
-#: include/functions2.php:1960
-msgid "unknown type"
-msgstr "tuntematon tyyppi"
-
-#: include/functions2.php:2037
-msgid "Attachments"
-msgstr "Litteet"
-
-#: include/functions2.php:2496
+#: include/functions.php:2456
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: include/functions2.php:2497
+#: include/functions.php:2457
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: include/functions2.php:2498
+#: include/functions.php:2458
 msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
 msgstr ""
 
-#: include/functions2.php:2499
+#: include/functions.php:2459
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: include/functions2.php:2500
+#: include/functions.php:2460
 msgid "No file was uploaded"
 msgstr ""
 
-#: include/functions2.php:2501
+#: include/functions.php:2461
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: include/functions2.php:2502
+#: include/functions.php:2462
 msgid "Failed to write file to disk."
 msgstr ""
 
-#: include/functions2.php:2503
+#: include/functions.php:2463
 msgid "A PHP extension stopped the file upload."
 msgstr ""
 
 #: include/login_form.php:197
-#: classes/handler/public.php:569
-#: classes/handler/public.php:824
+#: classes/handler/public.php:480
+#: classes/handler/public.php:735
 msgid "Login:"
 msgstr "Käyttäjätunnus:"
 
 #: include/login_form.php:207
-#: classes/handler/public.php:572
+#: classes/handler/public.php:483
 msgid "Password:"
 msgstr "Salasana:"
 
@@ -893,7 +792,7 @@ msgid "Profile:"
 msgstr "Profiili:"
 
 #: include/login_form.php:223
-#: classes/handler/public.php:311
+#: classes/handler/public.php:287
 #: classes/pref/prefs.php:1035
 #: classes/rpc.php:63
 msgid "Default profile"
@@ -912,7 +811,7 @@ msgid "Remember me"
 msgstr "Muista kirjautumiseni"
 
 #: include/login_form.php:249
-#: classes/handler/public.php:577
+#: classes/handler/public.php:488
 msgid "Log in"
 msgstr "Kirjaudu sisään"
 
@@ -928,147 +827,44 @@ msgstr "Istunnon validointi epäonnistui (käyttäjää ei löydy)"
 msgid "Session failed to validate (password changed)"
 msgstr "Session validointi epäonnistui (salasana vaihtunut)"
 
-#: classes/article.php:25
-msgid "Article not found."
-msgstr "Artikkelia ei löytynyt"
-
-#: classes/article.php:197
-msgid "Tags for this article (separated by commas):"
-msgstr "Tämän syötteen avainsanat (pilkulla erotettuina)"
-
-#: classes/article.php:222
-#: classes/pref/labels.php:79
-#: classes/pref/users.php:98
-#: classes/pref/feeds.php:801
-#: classes/pref/feeds.php:943
-#: classes/pref/filters.php:485
-#: classes/pref/prefs.php:981
-#: plugins/instances/init.php:245
-#: plugins/nsfw/init.php:85
-#: plugins/note/init.php:51
-#: plugins/af_readability/init.php:68
-#: plugins/af_redditimgur/init.php:60
-#: plugins/af_psql_trgm/init.php:181
-#: plugins/mail/init.php:64
-#: plugins/af_zz_imgproxy/init.php:213
-msgid "Save"
-msgstr "Tallenna"
-
-#: classes/article.php:224
-#: classes/handler/public.php:546
-#: classes/handler/public.php:580
-#: classes/pref/labels.php:81
-#: classes/pref/users.php:100
-#: classes/pref/feeds.php:802
-#: classes/pref/feeds.php:946
-#: classes/pref/feeds.php:1859
-#: classes/pref/filters.php:488
-#: classes/pref/filters.php:902
-#: classes/pref/filters.php:983
-#: classes/pref/filters.php:1076
-#: classes/pref/prefs.php:983
-#: classes/feeds.php:1105
-#: classes/feeds.php:1155
-#: classes/feeds.php:1192
-#: plugins/instances/init.php:248
-#: plugins/instances/init.php:436
-#: plugins/note/init.php:53
-#: plugins/mail/init.php:173
-msgid "Cancel"
-msgstr "Peru"
-
-#: classes/opml.php:28
-#: classes/opml.php:33
-msgid "OPML Utility"
-msgstr "OPML-työkalu"
-
-#: classes/opml.php:37
-msgid "Importing OPML..."
-msgstr "Luetaan OPML-tiedostoa"
-
-#: classes/opml.php:41
-msgid "Return to preferences"
-msgstr "Palaa asetuksiin"
-
-#: classes/opml.php:271
-#, php-format
-msgid "Adding feed: %s"
-msgstr "Lisätään syöte: %s"
-
-#: classes/opml.php:282
-#, php-format
-msgid "Duplicate feed: %s"
-msgstr "Syötteen kaksoiskappale: %s"
-
-#: classes/opml.php:296
-#, php-format
-msgid "Adding label %s"
-msgstr "Lisätään tunniste %s"
-
-#: classes/opml.php:299
-#, php-format
-msgid "Duplicate label: %s"
-msgstr "Tunnisteen kaksoiskappale: %s"
-
-#: classes/opml.php:311
-#, php-format
-msgid "Setting preference key %s to %s"
-msgstr ""
-
-#: classes/opml.php:343
-msgid "Adding filter..."
-msgstr "Lisätään suodatin..."
-
-#: classes/opml.php:421
-#, php-format
-msgid "Processing category: %s"
-msgstr ""
-
-#: classes/opml.php:470
-#, php-format
-msgid "Upload failed with error code %d"
-msgstr "Lähettäminen epäonnistui virhekoodilla %d"
-
-#: classes/opml.php:484
-#: plugins/import_export/init.php:442
-#, fuzzy
-msgid "Unable to move uploaded file."
-msgstr "Ladatun tiedoston siirtäminen epäonnistui."
-
-#: classes/opml.php:488
-#: plugins/import_export/init.php:446
-msgid "Error: please upload OPML file."
-msgstr "Virhe: lähetä OPML-tiedosto."
-
-#: classes/opml.php:499
-#, fuzzy
-msgid "Error: unable to find moved OPML file."
-msgstr "Virhe: siirretty OPML-tiedosto katosi."
-
-#: classes/opml.php:506
-msgid "Error while parsing document."
-msgstr "Virhe tulkitessa dokumenttia."
-
-#: classes/backend.php:33
+#: classes/backend.php:31
 msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
 msgstr "Lisää käyttövinkkejä löydät Tiny Tiny RSS -wikistä."
 
-#: classes/backend.php:38
+#: classes/backend.php:36
 msgid "Keyboard Shortcuts"
 msgstr "Pikanäppäimet"
 
-#: classes/backend.php:61
+#: classes/backend.php:59
 msgid "Shift"
 msgstr "Shift"
 
-#: classes/backend.php:64
+#: classes/backend.php:62
 msgid "Ctrl"
 msgstr "Ctrl"
 
-#: classes/backend.php:99
+#: classes/backend.php:97
 msgid "Help topic not found."
 msgstr "Aiheesta ei löytynyt ohjeita."
 
+#: classes/backend.php:103
+#: classes/dlg.php:37
+#: classes/dlg.php:60
+#: classes/dlg.php:93
+#: classes/dlg.php:159
+#: classes/dlg.php:186
+#: classes/article.php:744
+#: classes/pref/filters.php:206
+#: classes/pref/prefs.php:1097
+#: classes/pref/feeds.php:1626
+#: classes/pref/feeds.php:1692
+#: plugins/import_export/init.php:421
+#: plugins/import_export/init.php:467
+#: plugins/af_psql_trgm/init.php:102
+#: plugins/share/init.php:120
+msgid "Close this window"
+msgstr "Sulje ikkuna"
+
 #: classes/dlg.php:17
 msgid "If you have imported labels and/or filters, you might need to reload preferences to see your new data."
 msgstr ""
@@ -1079,7 +875,7 @@ msgstr "Julkinen OPML URL:isi on:"
 
 #: classes/dlg.php:57
 #: classes/dlg.php:183
-#: plugins/share/init.php:118
+#: plugins/share/init.php:117
 msgid "Generate new URL"
 msgstr "Luo uusi URL"
 
@@ -1100,130 +896,225 @@ msgstr ""
 msgid "You can view this feed as RSS using the following URL:"
 msgstr "Tämän RSS-syötteen julkinen osoite on:"
 
-#: classes/handler/public.php:510
+#: classes/article.php:25
+msgid "Article not found."
+msgstr "Artikkelia ei löytynyt"
+
+#: classes/article.php:197
+msgid "Tags for this article (separated by commas):"
+msgstr "Tämän syötteen avainsanat (pilkulla erotettuina)"
+
+#: classes/article.php:222
+#: classes/pref/labels.php:79
+#: classes/pref/filters.php:519
+#: classes/pref/users.php:98
+#: classes/pref/prefs.php:981
+#: classes/pref/feeds.php:789
+#: classes/pref/feeds.php:931
+#: plugins/af_psql_trgm/init.php:181
+#: plugins/nsfw/init.php:85
+#: plugins/af_readability/init.php:68
+#: plugins/mail/init.php:64
+#: plugins/af_redditimgur/init.php:60
+#: plugins/note/init.php:51
+#: plugins/af_zz_imgproxy/init.php:240
+msgid "Save"
+msgstr "Tallenna"
+
+#: classes/article.php:224
+#: classes/handler/public.php:457
+#: classes/handler/public.php:491
+#: classes/pref/labels.php:81
+#: classes/pref/filters.php:522
+#: classes/pref/filters.php:942
+#: classes/pref/filters.php:1022
+#: classes/pref/filters.php:1115
+#: classes/pref/users.php:100
+#: classes/pref/prefs.php:983
+#: classes/pref/feeds.php:790
+#: classes/pref/feeds.php:934
+#: classes/pref/feeds.php:1833
+#: classes/feeds.php:1098
+#: classes/feeds.php:1148
+#: classes/feeds.php:1185
+#: plugins/mail/init.php:173
+#: plugins/note/init.php:53
+msgid "Cancel"
+msgstr "Peru"
+
+#: classes/article.php:311
+#: classes/article.php:652
+#: classes/article.php:805
+msgid "no tags"
+msgstr "ei avainsanoja"
+
+#: classes/article.php:419
+msgid "unknown type"
+msgstr "tuntematon tyyppi"
+
+#: classes/article.php:496
+msgid "Attachments"
+msgstr "Litteet"
+
+#: classes/article.php:591
+#: classes/feeds.php:741
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] "kommentti"
+msgstr[1] "kommenttia"
+
+#: classes/article.php:595
+#: classes/feeds.php:745
+#, fuzzy
+msgid "comments"
+msgstr "Litteet"
+
+#: classes/article.php:621
+msgid " - "
+msgstr " - "
+
+#: classes/article.php:662
+#: classes/feeds.php:727
+msgid "Edit tags for this article"
+msgstr "Muokkaa tämän artikkelin avainsanoja"
+
+#: classes/article.php:694
+#: classes/feeds.php:681
+msgid "Originally from:"
+msgstr ""
+
+#: classes/article.php:707
+#: classes/pref/feeds.php:574
+#: classes/feeds.php:694
+msgid "Feed URL"
+msgstr "Syötteen osoite"
+
+#: classes/article.php:843
+msgid "(edit note)"
+msgstr "(muokkaa muistiinpanoa)"
+
+#: classes/handler/public.php:421
 #: plugins/bookmarklets/init.php:40
 msgid "Share with Tiny Tiny RSS"
 msgstr "Jaa Tiny Tiny RSS:llä"
 
-#: classes/handler/public.php:518
+#: classes/handler/public.php:429
 msgid "Title:"
 msgstr "Otsikko:"
 
-#: classes/handler/public.php:520
+#: classes/handler/public.php:431
 #: classes/pref/feeds.php:572
-#: plugins/instances/init.php:212
-#: plugins/instances/init.php:401
 msgid "URL:"
 msgstr "URL:"
 
-#: classes/handler/public.php:522
+#: classes/handler/public.php:433
 msgid "Content:"
 msgstr "Sisältö:"
 
-#: classes/handler/public.php:524
+#: classes/handler/public.php:435
 msgid "Labels:"
 msgstr "Tunnisteet"
 
-#: classes/handler/public.php:543
+#: classes/handler/public.php:454
 msgid "Shared article will appear in the Published feed."
 msgstr "Jaetut artikkelit näkyvät 'Julkisissa syötteissä'."
 
-#: classes/handler/public.php:545
+#: classes/handler/public.php:456
 msgid "Share"
 msgstr "Jaa"
 
-#: classes/handler/public.php:567
+#: classes/handler/public.php:478
 msgid "Not logged in"
 msgstr "Et ole kirjautunut"
 
-#: classes/handler/public.php:626
+#: classes/handler/public.php:537
 msgid "Incorrect username or password"
 msgstr "Väärä käyttäjätunnus tai salasana"
 
-#: classes/handler/public.php:678
+#: classes/handler/public.php:589
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "Olet jo tilannut syötteen <b>%s</b>."
 
-#: classes/handler/public.php:681
+#: classes/handler/public.php:592
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "Tilattu syöte <b>%s</b>."
 
-#: classes/handler/public.php:684
+#: classes/handler/public.php:595
 #, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "Tätä syötettä ei voitu tilata <b>%s</b>."
 
-#: classes/handler/public.php:687
+#: classes/handler/public.php:598
 #, php-format
 msgid "No feeds found in <b>%s</b>."
 msgstr "<b>%s</b> ei sisällä syötteitä."
 
-#: classes/handler/public.php:690
+#: classes/handler/public.php:601
 msgid "Multiple feed URLs found."
 msgstr "Useita syöteosoitteita löytyi."
 
-#: classes/handler/public.php:694
+#: classes/handler/public.php:605
 #, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr "Syötettä <b>%s</b> ei voitu tilata.<br>Osoitetta ei voi ladata."
 
-#: classes/handler/public.php:712
+#: classes/handler/public.php:623
 msgid "Subscribe to selected feed"
 msgstr "Tilaa valittu syöte"
 
-#: classes/handler/public.php:737
+#: classes/handler/public.php:648
 msgid "Edit subscription options"
 msgstr "Muokkaa syötteen asetuksia"
 
-#: classes/handler/public.php:774
+#: classes/handler/public.php:685
 msgid "Password recovery"
 msgstr "Salasanan palautus"
 
-#: classes/handler/public.php:817
+#: classes/handler/public.php:728
 #, fuzzy
 msgid "You will need to provide valid account name and email. A password reset link will be sent to your email address."
 msgstr "Syötä tilisi sähköpostiosoite. Uusi salasana lähetetään sinulle sähköpostilla."
 
-#: classes/handler/public.php:839
-#: classes/pref/users.php:350
+#: classes/handler/public.php:750
+#: classes/pref/users.php:349
 msgid "Reset password"
 msgstr "Palauta salasana"
 
-#: classes/handler/public.php:849
+#: classes/handler/public.php:760
 msgid "Some of the required form parameters are missing or incorrect."
 msgstr "Jotkin vaadituista parametreistä puuttuvat tai ovat väärin."
 
-#: classes/handler/public.php:853
-#: classes/handler/public.php:919
+#: classes/handler/public.php:764
+#: classes/handler/public.php:830
 msgid "Go back"
 msgstr "Takaisin"
 
-#: classes/handler/public.php:890
+#: classes/handler/public.php:801
 msgid "[tt-rss] Password reset request"
 msgstr ""
 
-#: classes/handler/public.php:915
+#: classes/handler/public.php:826
 msgid "Sorry, login and email combination not found."
 msgstr "Tätä käyttäjätunnus-sähköposti -yhdistelmää ei valitettavasti löydy."
 
 # Better this way...
-#: classes/handler/public.php:937
+#: classes/handler/public.php:848
 msgid "Your access level is insufficient to run this script."
 msgstr "Käyttäjäoikeutesi eivät riitä päivitysscriptin suorittamiseen."
 
-#: classes/handler/public.php:963
+#: classes/handler/public.php:874
 msgid "Database Updater"
 msgstr "Tietokannan päivitys"
 
-#: classes/handler/public.php:1028
+#: classes/handler/public.php:939
 msgid "Perform updates"
 msgstr "Suorita päivityksiä"
 
 #: classes/pref/labels.php:22
-#: classes/pref/filters.php:348
-#: classes/pref/filters.php:823
+#: classes/pref/filters.php:373
+#: classes/pref/filters.php:863
 msgid "Caption"
 msgstr "Nimi"
 
@@ -1245,59 +1136,55 @@ msgid "Created label <b>%s</b>"
 msgstr "Luotiin tunniste <b>%s</b>"
 
 #: classes/pref/labels.php:258
-#: classes/pref/users.php:334
-#: classes/pref/feeds.php:1337
-#: classes/pref/feeds.php:1600
-#: classes/pref/feeds.php:1664
-#: classes/pref/filters.php:359
-#: classes/pref/filters.php:407
-#: classes/pref/filters.php:744
-#: classes/pref/filters.php:832
-#: classes/pref/filters.php:859
+#: classes/pref/filters.php:384
+#: classes/pref/filters.php:441
+#: classes/pref/filters.php:784
+#: classes/pref/filters.php:872
+#: classes/pref/filters.php:899
+#: classes/pref/users.php:333
 #: classes/pref/prefs.php:992
-#: plugins/instances/init.php:284
+#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1574
+#: classes/pref/feeds.php:1638
 msgid "Select"
 msgstr "Valitse"
 
 #: classes/pref/labels.php:261
-#: classes/pref/users.php:337
-#: classes/pref/feeds.php:1340
-#: classes/pref/feeds.php:1603
-#: classes/pref/feeds.php:1667
-#: classes/pref/filters.php:362
-#: classes/pref/filters.php:410
-#: classes/pref/filters.php:747
-#: classes/pref/filters.php:835
-#: classes/pref/filters.php:862
+#: classes/pref/filters.php:387
+#: classes/pref/filters.php:444
+#: classes/pref/filters.php:787
+#: classes/pref/filters.php:875
+#: classes/pref/filters.php:902
+#: classes/pref/users.php:336
 #: classes/pref/prefs.php:995
+#: classes/pref/feeds.php:1314
+#: classes/pref/feeds.php:1577
+#: classes/pref/feeds.php:1641
 #: classes/feeds.php:102
-#: plugins/instances/init.php:287
 msgid "All"
 msgstr "Kaikki"
 
 #: classes/pref/labels.php:263
-#: classes/pref/users.php:339
-#: classes/pref/feeds.php:1342
-#: classes/pref/feeds.php:1605
-#: classes/pref/feeds.php:1669
-#: classes/pref/filters.php:364
-#: classes/pref/filters.php:412
-#: classes/pref/filters.php:749
-#: classes/pref/filters.php:837
-#: classes/pref/filters.php:864
+#: classes/pref/filters.php:389
+#: classes/pref/filters.php:446
+#: classes/pref/filters.php:789
+#: classes/pref/filters.php:877
+#: classes/pref/filters.php:904
+#: classes/pref/users.php:338
 #: classes/pref/prefs.php:997
+#: classes/pref/feeds.php:1316
+#: classes/pref/feeds.php:1579
+#: classes/pref/feeds.php:1643
 #: classes/feeds.php:105
-#: plugins/instances/init.php:289
 msgid "None"
 msgstr "Ei mikään"
 
 #: classes/pref/labels.php:270
-#: classes/pref/users.php:348
+#: classes/pref/filters.php:512
+#: classes/pref/filters.php:806
+#: classes/pref/users.php:347
 #: classes/pref/feeds.php:767
-#: classes/pref/filters.php:478
-#: classes/pref/filters.php:766
-#: classes/feeds.php:1154
-#: plugins/instances/init.php:294
+#: classes/feeds.php:1147
 msgid "Remove"
 msgstr "Poista"
 
@@ -1305,9 +1192,172 @@ msgstr "Poista"
 msgid "Clear colors"
 msgstr "Poista värit"
 
+#: classes/pref/filters.php:153
+#, fuzzy
+msgid "Preview article"
+msgstr "Tuoreet artikkelit"
+
+#: classes/pref/filters.php:264
+#: classes/pref/filters.php:558
+msgid "(inverse)"
+msgstr "(käänteinen)"
+
+#: classes/pref/filters.php:260
+#: classes/pref/filters.php:557
+#, php-format
+msgid "%s on %s in %s %s"
+msgstr ""
+
+#: classes/pref/filters.php:379
+#: classes/pref/filters.php:867
+#: classes/pref/filters.php:981
+msgid "Match"
+msgstr "Täsmäys"
+
+#: classes/pref/filters.php:393
+#: classes/pref/filters.php:450
+#: classes/pref/filters.php:881
+#: classes/pref/filters.php:908
+msgid "Add"
+msgstr "Lisää"
+
+#: classes/pref/filters.php:396
+#: classes/pref/filters.php:453
+#: classes/pref/filters.php:884
+#: classes/pref/filters.php:911
+#: classes/feeds.php:122
+msgid "Delete"
+msgstr "Poista"
+
+#: classes/pref/filters.php:436
+#: classes/pref/filters.php:894
+msgid "Apply actions"
+msgstr "Suorita toiminnot"
+
+#: classes/pref/filters.php:486
+#: classes/pref/filters.php:923
+msgid "Enabled"
+msgstr "Aktivoitu"
+
+#: classes/pref/filters.php:495
+#: classes/pref/filters.php:926
+msgid "Match any rule"
+msgstr "Täsmää ainakin yhteen säännöistä"
+
+#: classes/pref/filters.php:504
+#: classes/pref/filters.php:929
+msgid "Inverse matching"
+msgstr "Käänteinen täsmäys"
+
+#: classes/pref/filters.php:516
+#: classes/pref/filters.php:936
+msgid "Test"
+msgstr "Kokeilu"
+
+#: classes/pref/filters.php:780
+#: classes/pref/users.php:323
+#: classes/pref/feeds.php:1307
+#: classes/feeds.php:1118
+#: classes/feeds.php:1184
+#: js/tt-rss.js:165
+msgid "Search"
+msgstr "Etsi"
+
+#: classes/pref/filters.php:796
+msgid "Combine"
+msgstr "Yhdistä"
+
+#: classes/pref/filters.php:799
+#: classes/pref/users.php:345
+msgid "Edit"
+msgstr "Muokkaa"
+
+#: classes/pref/filters.php:802
+#: classes/pref/feeds.php:1327
+#: classes/pref/feeds.php:1341
+msgid "Reset sort order"
+msgstr "Järjestä oletuksen mukaisesti"
+
+#: classes/pref/filters.php:810
+#: classes/pref/feeds.php:1363
+msgid "Rescore articles"
+msgstr "Uudelleenpisteytä artikkelit"
+
+#: classes/pref/filters.php:939
+msgid "Create"
+msgstr "Luo"
+
+#: classes/pref/filters.php:993
+msgid "Inverse regular expression matching"
+msgstr "Käänteinen täsmäys säännöllisellä lausekkeella"
+
+#: classes/pref/filters.php:995
+msgid "on field"
+msgstr "kentässä"
+
+#: classes/pref/filters.php:1001
+#: js/PrefFilterTree.js:64
+msgid "in"
+msgstr "kansiossa"
+
+#: classes/pref/filters.php:1014
+#, fuzzy
+msgid "Wiki: Filters"
+msgstr "Suodattimet"
+
+#: classes/pref/filters.php:1019
+msgid "Save rule"
+msgstr "Tallenna sääntö"
+
+#: classes/pref/filters.php:1019
+#: js/functions.js:865
+msgid "Add rule"
+msgstr "Lisää sääntö"
+
+#: classes/pref/filters.php:1042
+msgid "Perform Action"
+msgstr "Suorita toiminto"
+
+#: classes/pref/filters.php:1093
+#, fuzzy
+msgid "No actions available"
+msgstr "Uusi versio saatavilla!"
+
+#: classes/pref/filters.php:1112
+msgid "Save action"
+msgstr "Tallenna toiminto"
+
+#: classes/pref/filters.php:1112
+#: js/functions.js:887
+msgid "Add action"
+msgstr "Lisää toiminto"
+
+#: classes/pref/filters.php:1136
+#, fuzzy
+msgid "[No caption]"
+msgstr "Nimi"
+
+#: classes/pref/filters.php:1138
+#, fuzzy, php-format
+msgid "%s (%d rule)"
+msgid_plural "%s (%d rules)"
+msgstr[0] "Lisää sääntö"
+msgstr[1] "Lisää sääntö"
+
+#: classes/pref/filters.php:1153
+#, fuzzy
+msgid "matches any rule"
+msgstr "Täsmää ainakin yhteen säännöistä"
+
+#: classes/pref/filters.php:1156
+#, fuzzy, php-format
+msgid "%s (+%d action)"
+msgid_plural "%s (+%d actions)"
+msgstr[0] "Lisää toiminto"
+msgstr[1] "Lisää toiminto"
+
 #: classes/pref/users.php:6
 #: classes/pref/system.php:8
-#: plugins/instances/init.php:154
 msgid "Your access level is insufficient to open this tab."
 msgstr "Käyttäjäoikeutesi eivät ole riittävät tämän alasivun avaamiseen."
 
@@ -1318,8 +1368,8 @@ msgstr "Muokkaa sääntöä"
 
 #: classes/pref/users.php:56
 #: classes/pref/feeds.php:637
-#: classes/pref/feeds.php:878
-#: classes/feeds.php:1075
+#: classes/pref/feeds.php:866
+#: classes/feeds.php:1068
 msgid "Authentication"
 msgstr "Tunnistautuminen"
 
@@ -1329,7 +1379,7 @@ msgstr "Käyttäjäoikeudet:"
 
 #: classes/pref/users.php:77
 #: classes/pref/feeds.php:667
-#: classes/pref/feeds.php:896
+#: classes/pref/feeds.php:884
 msgid "Options"
 msgstr "Valinnat"
 
@@ -1343,7 +1393,7 @@ msgid "User not found"
 msgstr "Käyttäjätunnusta ei löydy"
 
 #: classes/pref/users.php:132
-#: classes/pref/users.php:400
+#: classes/pref/users.php:399
 msgid "Registered"
 msgstr "Rekisteröity"
 
@@ -1361,7 +1411,7 @@ msgid "Stored articles"
 msgstr "Tähdelliset artikkelit"
 
 #: classes/pref/users.php:145
-#: classes/pref/users.php:399
+#: classes/pref/users.php:398
 msgid "Subscribed feeds"
 msgstr "Tilatut syötteet"
 
@@ -1380,508 +1430,57 @@ msgstr "Käyttäjää <b>%s</b> ei voitu luoda"
 msgid "User <b>%s</b> already exists."
 msgstr "Käyttäjätunnus <b>%s</b> on jo olemassa."
 
-#: classes/pref/users.php:265
+#: classes/pref/users.php:264
 #, php-format
 msgid "Changed password of user <b>%s</b> to <b>%s</b>"
 msgstr "Käyttäjän <b>%s</b> salasanaksi vaihdettu <b>%s</b>"
 
-#: classes/pref/users.php:267
+#: classes/pref/users.php:266
 #, php-format
 msgid "Sending new password of user <b>%s</b> to <b>%s</b>"
 msgstr "Lähetetään käyttäjän <b>%s</b> uusi salasana osoitteeseen <b>%s</b>"
 
-#: classes/pref/users.php:291
+#: classes/pref/users.php:290
 msgid "[tt-rss] Password change notification"
 msgstr ""
 
-#: classes/pref/users.php:324
-#: classes/pref/feeds.php:1333
-#: classes/pref/filters.php:740
-#: classes/feeds.php:1125
-#: classes/feeds.php:1191
-#: js/tt-rss.js:165
-msgid "Search"
-msgstr "Etsi"
-
-#: classes/pref/users.php:342
+#: classes/pref/users.php:341
 msgid "Create user"
 msgstr "Luo käyttäjätunnus"
 
-#: classes/pref/users.php:346
-#: classes/pref/filters.php:759
-#: plugins/instances/init.php:293
-msgid "Edit"
-msgstr "Muokkaa"
-
-#: classes/pref/users.php:397
+#: classes/pref/users.php:396
 #: classes/pref/feeds.php:643
-#: classes/pref/feeds.php:882
-#: classes/pref/feeds.php:1836
-#: classes/feeds.php:1079
+#: classes/pref/feeds.php:870
+#: classes/pref/feeds.php:1810
+#: classes/feeds.php:1072
 msgid "Login"
 msgstr "Käyttäjätunnus"
 
-#: classes/pref/users.php:398
+#: classes/pref/users.php:397
 msgid "Access Level"
 msgstr "Käyttäjäoikeudet"
 
-#: classes/pref/users.php:401
+#: classes/pref/users.php:400
 msgid "Last login"
 msgstr "Viimeisin kirjautuminen"
 
-#: classes/pref/users.php:420
-#: plugins/instances/init.php:334
+#: classes/pref/users.php:419
 msgid "Click to edit"
 msgstr "Napsauta muokataksesi"
 
-#: classes/pref/users.php:441
+#: classes/pref/users.php:440
 msgid "No users defined."
 msgstr "Käyttäjätunnuksia ei määritelty."
 
-#: classes/pref/users.php:443
+#: classes/pref/users.php:442
 msgid "No matching users found."
 msgstr "Hakua vastaavia käyttäjätunnuksia ei löytynyt"
 
-#: classes/pref/system.php:29
-msgid "Error Log"
-msgstr "Virheloki"
-
-#: classes/pref/system.php:40
-msgid "Refresh"
-msgstr "Päivitä"
-
-#: classes/pref/system.php:43
-msgid "Clear log"
-msgstr "Tyhjennä loki"
-
-#: classes/pref/system.php:48
-msgid "Error"
-msgstr "Virhe"
-
-#: classes/pref/system.php:49
-msgid "Filename"
-msgstr "Tiedosto"
-
-#: classes/pref/system.php:50
-msgid "Message"
-msgstr "Viesti"
-
-#: classes/pref/system.php:52
-msgid "Date"
-msgstr "Päiväys"
-
-#: classes/pref/feeds.php:15
-msgid "Check to enable field"
-msgstr "Valitse aktivoidaksesi kenttä"
-
-#: classes/pref/feeds.php:65
-#: classes/pref/feeds.php:214
-#: classes/pref/feeds.php:258
-#: classes/pref/feeds.php:264
-#: classes/pref/feeds.php:290
-#, fuzzy, php-format
-msgid "(%d feed)"
-msgid_plural "(%d feeds)"
-msgstr[0] "Muokkaa syötettä"
-msgstr[1] "Muokkaa syötettä"
-
-#: classes/pref/feeds.php:537
 #: classes/pref/prefs.php:18
+#: classes/pref/feeds.php:537
 msgid "General"
 msgstr "Yleinen"
 
-#: classes/pref/feeds.php:561
-msgid "Feed Title"
-msgstr "Syötteen otsikko"
-
-#: classes/pref/feeds.php:595
-#: classes/pref/feeds.php:830
-#: classes/pref/feeds.php:1822
-#: classes/feeds.php:1055
-msgid "Place in category:"
-msgstr "Siirrä kansioon:"
-
-#: classes/pref/feeds.php:608
-#: classes/pref/feeds.php:844
-#, fuzzy
-msgid "Language:"
-msgstr "Kieli"
-
-#: classes/pref/feeds.php:615
-#: classes/pref/feeds.php:853
-msgid "Update"
-msgstr "Päivitä"
-
-#: classes/pref/feeds.php:630
-#: classes/pref/feeds.php:869
-msgid "Article purging:"
-msgstr "Artikkeleiden siivous"
-
-#: classes/pref/feeds.php:658
-#: classes/pref/feeds.php:890
-#: classes/pref/feeds.php:1839
-#: classes/pref/prefs.php:245
-#: classes/feeds.php:1083
-msgid "Password"
-msgstr "Salasana"
-
-#: classes/pref/feeds.php:662
-msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
-msgstr "<b>Vinkki:</b> sinun on annettava kirjautumistiedot jos syöte vaatii kirjautumisen, paitsi Twitter-syötteet."
-
-#: classes/pref/feeds.php:681
-#: classes/pref/feeds.php:900
-msgid "Hide from Popular feeds"
-msgstr "Piilota suosituista syötteistä"
-
-#: classes/pref/feeds.php:693
-#: classes/pref/feeds.php:906
-msgid "Include in e-mail digest"
-msgstr "Sisällytä sähköpostitiivistelmään"
-
-#: classes/pref/feeds.php:706
-#: classes/pref/feeds.php:912
-msgid "Always display image attachments"
-msgstr "Näytä aina liitetyt kuvat"
-
-#: classes/pref/feeds.php:719
-#: classes/pref/feeds.php:920
-msgid "Do not embed images"
-msgstr "Älä näytä kuvia"
-
-#: classes/pref/feeds.php:732
-#: classes/pref/feeds.php:928
-msgid "Cache media"
-msgstr ""
-
-#: classes/pref/feeds.php:744
-#: classes/pref/feeds.php:934
-msgid "Mark updated articles as unread"
-msgstr "Merkitse päivitetyt artikkelit lukemattomiksi"
-
-#: classes/pref/feeds.php:748
-msgid "Icon"
-msgstr "Suosikkikuvake"
-
-#: classes/pref/feeds.php:765
-msgid "Replace"
-msgstr "Vaihda"
-
-#: classes/pref/feeds.php:772
-#: classes/pref/prefs.php:698
-msgid "Plugins"
-msgstr "Lisäosat"
-
-#: classes/pref/feeds.php:792
-msgid "Resubscribe to push updates"
-msgstr ""
-
-#: classes/pref/feeds.php:799
-msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
-msgstr ""
-
-#: classes/pref/feeds.php:1200
-#: classes/pref/feeds.php:1253
-msgid "All done."
-msgstr "Valmis."
-
-#: classes/pref/feeds.php:1308
-msgid "Feeds with errors"
-msgstr "Virheelliset syötteet"
-
-#: classes/pref/feeds.php:1315
-msgid "Inactive feeds"
-msgstr "Passiiviset syötteet"
-
-#: classes/pref/feeds.php:1351
-msgid "Edit selected feeds"
-msgstr "Muokkaa valittuja syötteitä"
-
-#: classes/pref/feeds.php:1353
-#: classes/pref/feeds.php:1367
-#: classes/pref/filters.php:762
-msgid "Reset sort order"
-msgstr "Järjestä oletuksen mukaisesti"
-
-#: classes/pref/feeds.php:1355
-#: js/prefs.js:1622
-msgid "Batch subscribe"
-msgstr "Tilaa useita"
-
-#: classes/pref/feeds.php:1362
-msgid "Categories"
-msgstr "Kansiot"
-
-#: classes/pref/feeds.php:1365
-msgid "Add category"
-msgstr "Lisää kansio"
-
-#: classes/pref/feeds.php:1369
-msgid "Remove selected"
-msgstr "Poista valittu"
-
-#: classes/pref/feeds.php:1380
-msgid "More actions..."
-msgstr "Lisää toimintoja..."
-
-#: classes/pref/feeds.php:1384
-msgid "Manual purge"
-msgstr "Manuaalinen siivous"
-
-#: classes/pref/feeds.php:1388
-msgid "Clear feed data"
-msgstr "Tyhjennnä syötetiedot"
-
-#: classes/pref/feeds.php:1389
-#: classes/pref/filters.php:770
-msgid "Rescore articles"
-msgstr "Uudelleenpisteytä artikkelit"
-
-#: classes/pref/feeds.php:1442
-msgid "OPML"
-msgstr "OPML"
-
-#: classes/pref/feeds.php:1444
-msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
-msgstr "OPML:ää käyttäen voit viedä ja tuoda syötteitä, suodattimia, tunnisteita ja Tiny Tiny RSS:n asetuksia."
-
-#: classes/pref/feeds.php:1445
-msgid "Only main settings profile can be migrated using OPML."
-msgstr "Vain pääasetusprofiili voidaan siirtää OPML:ää käyttäen."
-
-#: classes/pref/feeds.php:1458
-msgid "Import my OPML"
-msgstr "Tuo OPML"
-
-#: classes/pref/feeds.php:1464
-msgid "Filename:"
-msgstr "Tiedosto:"
-
-#: classes/pref/feeds.php:1466
-msgid "Include settings"
-msgstr "Sisältäen asetukset"
-
-#: classes/pref/feeds.php:1470
-msgid "Export OPML"
-msgstr "Vie OMPL"
-
-#: classes/pref/feeds.php:1474
-msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
-msgstr "OPML:si voidaan julkaista ja kuka vain voi tilata ne käyttäen alla olevaa osoitetta."
-
-#: classes/pref/feeds.php:1478
-msgid "Public OPML URL"
-msgstr "Julkinen OPML URL"
-
-#: classes/pref/feeds.php:1479
-msgid "Display published OPML URL"
-msgstr "Näytä julkaistu OPML URL"
-
-#: classes/pref/feeds.php:1488
-msgid "Firefox integration"
-msgstr "Firefox-integraatio"
-
-#: classes/pref/feeds.php:1490
-msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
-msgstr "Tiny Tiny RSS -sivustoa voidaan käyttää Firefoxin syötelukijana klikkaamalla alla olevaa linkkiä"
-
-#: classes/pref/feeds.php:1497
-msgid "Click here to register this site as a feed reader."
-msgstr "Klikkaa tästä rekisteröidäksesi tämän sivuston syötelukijaksi."
-
-#: classes/pref/feeds.php:1505
-msgid "Published & shared articles / Generated feeds"
-msgstr "Julkaistut ja jaetut artikkelit / Luodut syötteet"
-
-#: classes/pref/feeds.php:1507
-msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
-msgstr "Julkistetut artikkelit näkyvät julkisena RSS-syötteenä ja niitä voi lukea ja tilata jokainen, joka tietää alla annetun osoitteen"
-
-#: classes/pref/feeds.php:1514
-#: classes/feeds.php:54
-#: classes/feeds.php:140
-msgid "View as RSS"
-msgstr "Näytä RSS-syötteenä"
-
-#: classes/pref/feeds.php:1515
-msgid "Display URL"
-msgstr "Näytä osoite"
-
-#: classes/pref/feeds.php:1518
-msgid "Clear all generated URLs"
-msgstr "Poista kaikki luodut osoitteet"
-
-#: classes/pref/feeds.php:1596
-msgid "These feeds have not been updated with new content for 3 months (oldest first):"
-msgstr "Näihin syötteisiin ei ole tullut uusia artikkeleita 3 kuukauteen (vanhimmat ensin):"
-
-#: classes/pref/feeds.php:1630
-#: classes/pref/feeds.php:1694
-msgid "Click to edit feed"
-msgstr "Napsauta muokataksesi syötettä"
-
-#: classes/pref/feeds.php:1648
-#: classes/pref/feeds.php:1714
-msgid "Unsubscribe from selected feeds"
-msgstr "Lopeta valittujen syötteiden tilaukset"
-
-#: classes/pref/feeds.php:1819
-msgid "Add one valid RSS feed per line (no feed detection is done)"
-msgstr "Lisää RSS-syötteitä riveittäin (syötteitä ei yritetä tunnistaa)"
-
-#: classes/pref/feeds.php:1828
-msgid "Feeds to subscribe, One per line"
-msgstr "Tilattavat syötteet, yksi syöte riviä kohden"
-
-#: classes/pref/feeds.php:1851
-msgid "Feeds require authentication."
-msgstr "Syötteet vaativat kirjautumisen."
-
-#: classes/pref/feeds.php:1858
-#: classes/feeds.php:1099
-#: classes/feeds.php:1153
-msgid "Subscribe"
-msgstr "Tilaa"
-
-#: classes/pref/filters.php:151
-#, fuzzy
-msgid "Preview article"
-msgstr "Tuoreet artikkelit"
-
-#: classes/pref/filters.php:239
-#: classes/pref/filters.php:518
-msgid "(inverse)"
-msgstr "(käänteinen)"
-
-#: classes/pref/filters.php:235
-#: classes/pref/filters.php:517
-#, php-format
-msgid "%s on %s in %s %s"
-msgstr ""
-
-#: classes/pref/filters.php:354
-#: classes/pref/filters.php:827
-#: classes/pref/filters.php:942
-msgid "Match"
-msgstr "Täsmäys"
-
-#: classes/pref/filters.php:368
-#: classes/pref/filters.php:416
-#: classes/pref/filters.php:841
-#: classes/pref/filters.php:868
-msgid "Add"
-msgstr "Lisää"
-
-#: classes/pref/filters.php:371
-#: classes/pref/filters.php:419
-#: classes/pref/filters.php:844
-#: classes/pref/filters.php:871
-#: classes/feeds.php:122
-msgid "Delete"
-msgstr "Poista"
-
-#: classes/pref/filters.php:402
-#: classes/pref/filters.php:854
-msgid "Apply actions"
-msgstr "Suorita toiminnot"
-
-#: classes/pref/filters.php:452
-#: classes/pref/filters.php:883
-msgid "Enabled"
-msgstr "Aktivoitu"
-
-#: classes/pref/filters.php:461
-#: classes/pref/filters.php:886
-msgid "Match any rule"
-msgstr "Täsmää ainakin yhteen säännöistä"
-
-#: classes/pref/filters.php:470
-#: classes/pref/filters.php:889
-msgid "Inverse matching"
-msgstr "Käänteinen täsmäys"
-
-#: classes/pref/filters.php:482
-#: classes/pref/filters.php:896
-msgid "Test"
-msgstr "Kokeilu"
-
-#: classes/pref/filters.php:756
-msgid "Combine"
-msgstr "Yhdistä"
-
-#: classes/pref/filters.php:899
-msgid "Create"
-msgstr "Luo"
-
-#: classes/pref/filters.php:954
-msgid "Inverse regular expression matching"
-msgstr "Käänteinen täsmäys säännöllisellä lausekkeella"
-
-#: classes/pref/filters.php:956
-msgid "on field"
-msgstr "kentässä"
-
-#: classes/pref/filters.php:962
-#: js/PrefFilterTree.js:64
-msgid "in"
-msgstr "kansiossa"
-
-#: classes/pref/filters.php:975
-#, fuzzy
-msgid "Wiki: Filters"
-msgstr "Suodattimet"
-
-#: classes/pref/filters.php:980
-msgid "Save rule"
-msgstr "Tallenna sääntö"
-
-#: classes/pref/filters.php:980
-#: js/functions.js:865
-msgid "Add rule"
-msgstr "Lisää sääntö"
-
-#: classes/pref/filters.php:1003
-msgid "Perform Action"
-msgstr "Suorita toiminto"
-
-#: classes/pref/filters.php:1054
-#, fuzzy
-msgid "No actions available"
-msgstr "Uusi versio saatavilla!"
-
-#: classes/pref/filters.php:1073
-msgid "Save action"
-msgstr "Tallenna toiminto"
-
-#: classes/pref/filters.php:1073
-#: js/functions.js:887
-msgid "Add action"
-msgstr "Lisää toiminto"
-
-#: classes/pref/filters.php:1097
-#, fuzzy
-msgid "[No caption]"
-msgstr "Nimi"
-
-#: classes/pref/filters.php:1099
-#, fuzzy, php-format
-msgid "%s (%d rule)"
-msgid_plural "%s (%d rules)"
-msgstr[0] "Lisää sääntö"
-msgstr[1] "Lisää sääntö"
-
-#: classes/pref/filters.php:1114
-#, fuzzy
-msgid "matches any rule"
-msgstr "Täsmää ainakin yhteen säännöistä"
-
-#: classes/pref/filters.php:1117
-#, fuzzy, php-format
-msgid "%s (+%d action)"
-msgid_plural "%s (+%d actions)"
-msgstr[0] "Lisää toiminto"
-msgstr[1] "Lisää toiminto"
-
 #: classes/pref/prefs.php:19
 msgid "Interface"
 msgstr "Käyttöliittymä"
@@ -2056,7 +1655,7 @@ msgid "Strip all but most common HTML tags when reading articles."
 msgstr "Karsi erikoiset HTML-koodit artikkeleita luettaessa."
 
 #: classes/pref/prefs.php:53
-#: js/prefs.js:1584
+#: js/prefs.js:1580
 msgid "Customize stylesheet"
 msgstr "Muokkaa CSS-tyylitiedostoa"
 
@@ -2124,6 +1723,14 @@ msgstr "Käyttäjäoikeudet"
 msgid "Save data"
 msgstr "Tallenna tiedot"
 
+#: classes/pref/prefs.php:245
+#: classes/pref/feeds.php:658
+#: classes/pref/feeds.php:878
+#: classes/pref/feeds.php:1813
+#: classes/feeds.php:1076
+msgid "Password"
+msgstr "Salasana"
+
 #: classes/pref/prefs.php:254
 msgid "Your password is at default value, please change it."
 msgstr "Käytät vieläkin oletussalasanaa, se kannattaa vaihtaa."
@@ -2222,18 +1829,23 @@ msgstr "Hallitse profiileita"
 msgid "Reset to defaults"
 msgstr "Palauta oletusarvot"
 
+#: classes/pref/prefs.php:698
+#: classes/pref/feeds.php:772
+msgid "Plugins"
+msgstr "Lisäosat"
+
 #: classes/pref/prefs.php:700
 msgid "You will need to reload Tiny Tiny RSS for plugin changes to take effect."
 msgstr "Päivitä sivu aktivoidaksesi lisäosiin tehdyt muutokset."
 
-#: classes/pref/prefs.php:702
-msgid "Download more plugins at tt-rss.org <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forums</a> or <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a>."
-msgstr "Lataa lisää lisäosia tt-rss.org:n <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">foorumeilta</a> tai <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wikistä</a>."
-
-#: classes/pref/prefs.php:732
+#: classes/pref/prefs.php:730
 msgid "System plugins"
 msgstr "Järjestelmän lisäosat"
 
+#: classes/pref/prefs.php:731
+msgid "System plugins are enabled in <strong>config.php</strong> for all users."
+msgstr ""
+
 #: classes/pref/prefs.php:736
 #: classes/pref/prefs.php:792
 msgid "Plugin"
@@ -2303,6 +1915,342 @@ msgstr "Poista valitut profiilit"
 msgid "Activate profile"
 msgstr "Aktivoi profiili"
 
+#: classes/pref/feeds.php:15
+msgid "Check to enable field"
+msgstr "Valitse aktivoidaksesi kenttä"
+
+#: classes/pref/feeds.php:65
+#: classes/pref/feeds.php:214
+#: classes/pref/feeds.php:258
+#: classes/pref/feeds.php:264
+#: classes/pref/feeds.php:290
+#, fuzzy, php-format
+msgid "(%d feed)"
+msgid_plural "(%d feeds)"
+msgstr[0] "Muokkaa syötettä"
+msgstr[1] "Muokkaa syötettä"
+
+#: classes/pref/feeds.php:561
+msgid "Feed Title"
+msgstr "Syötteen otsikko"
+
+#: classes/pref/feeds.php:595
+#: classes/pref/feeds.php:818
+#: classes/pref/feeds.php:1796
+#: classes/feeds.php:1048
+msgid "Place in category:"
+msgstr "Siirrä kansioon:"
+
+#: classes/pref/feeds.php:608
+#: classes/pref/feeds.php:832
+#, fuzzy
+msgid "Language:"
+msgstr "Kieli"
+
+#: classes/pref/feeds.php:615
+#: classes/pref/feeds.php:841
+msgid "Update"
+msgstr "Päivitä"
+
+#: classes/pref/feeds.php:630
+#: classes/pref/feeds.php:857
+msgid "Article purging:"
+msgstr "Artikkeleiden siivous"
+
+#: classes/pref/feeds.php:662
+msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
+msgstr "<b>Vinkki:</b> sinun on annettava kirjautumistiedot jos syöte vaatii kirjautumisen, paitsi Twitter-syötteet."
+
+#: classes/pref/feeds.php:681
+#: classes/pref/feeds.php:888
+msgid "Hide from Popular feeds"
+msgstr "Piilota suosituista syötteistä"
+
+#: classes/pref/feeds.php:693
+#: classes/pref/feeds.php:894
+msgid "Include in e-mail digest"
+msgstr "Sisällytä sähköpostitiivistelmään"
+
+#: classes/pref/feeds.php:706
+#: classes/pref/feeds.php:900
+msgid "Always display image attachments"
+msgstr "Näytä aina liitetyt kuvat"
+
+#: classes/pref/feeds.php:719
+#: classes/pref/feeds.php:908
+msgid "Do not embed images"
+msgstr "Älä näytä kuvia"
+
+#: classes/pref/feeds.php:732
+#: classes/pref/feeds.php:916
+msgid "Cache media"
+msgstr ""
+
+#: classes/pref/feeds.php:744
+#: classes/pref/feeds.php:922
+msgid "Mark updated articles as unread"
+msgstr "Merkitse päivitetyt artikkelit lukemattomiksi"
+
+#: classes/pref/feeds.php:748
+msgid "Icon"
+msgstr "Suosikkikuvake"
+
+#: classes/pref/feeds.php:765
+msgid "Replace"
+msgstr "Vaihda"
+
+#: classes/pref/feeds.php:1174
+#: classes/pref/feeds.php:1227
+msgid "All done."
+msgstr "Valmis."
+
+#: classes/pref/feeds.php:1282
+msgid "Feeds with errors"
+msgstr "Virheelliset syötteet"
+
+#: classes/pref/feeds.php:1289
+msgid "Inactive feeds"
+msgstr "Passiiviset syötteet"
+
+#: classes/pref/feeds.php:1325
+msgid "Edit selected feeds"
+msgstr "Muokkaa valittuja syötteitä"
+
+#: classes/pref/feeds.php:1329
+#: js/prefs.js:1618
+msgid "Batch subscribe"
+msgstr "Tilaa useita"
+
+#: classes/pref/feeds.php:1336
+msgid "Categories"
+msgstr "Kansiot"
+
+#: classes/pref/feeds.php:1339
+msgid "Add category"
+msgstr "Lisää kansio"
+
+#: classes/pref/feeds.php:1343
+msgid "Remove selected"
+msgstr "Poista valittu"
+
+#: classes/pref/feeds.php:1354
+msgid "More actions..."
+msgstr "Lisää toimintoja..."
+
+#: classes/pref/feeds.php:1358
+msgid "Manual purge"
+msgstr "Manuaalinen siivous"
+
+#: classes/pref/feeds.php:1362
+msgid "Clear feed data"
+msgstr "Tyhjennnä syötetiedot"
+
+#: classes/pref/feeds.php:1416
+msgid "OPML"
+msgstr "OPML"
+
+#: classes/pref/feeds.php:1418
+msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
+msgstr "OPML:ää käyttäen voit viedä ja tuoda syötteitä, suodattimia, tunnisteita ja Tiny Tiny RSS:n asetuksia."
+
+#: classes/pref/feeds.php:1419
+msgid "Only main settings profile can be migrated using OPML."
+msgstr "Vain pääasetusprofiili voidaan siirtää OPML:ää käyttäen."
+
+#: classes/pref/feeds.php:1432
+msgid "Import my OPML"
+msgstr "Tuo OPML"
+
+#: classes/pref/feeds.php:1438
+msgid "Filename:"
+msgstr "Tiedosto:"
+
+#: classes/pref/feeds.php:1440
+msgid "Include settings"
+msgstr "Sisältäen asetukset"
+
+#: classes/pref/feeds.php:1444
+msgid "Export OPML"
+msgstr "Vie OMPL"
+
+#: classes/pref/feeds.php:1448
+msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
+msgstr "OPML:si voidaan julkaista ja kuka vain voi tilata ne käyttäen alla olevaa osoitetta."
+
+#: classes/pref/feeds.php:1452
+msgid "Public OPML URL"
+msgstr "Julkinen OPML URL"
+
+#: classes/pref/feeds.php:1453
+msgid "Display published OPML URL"
+msgstr "Näytä julkaistu OPML URL"
+
+#: classes/pref/feeds.php:1462
+msgid "Firefox integration"
+msgstr "Firefox-integraatio"
+
+#: classes/pref/feeds.php:1464
+msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
+msgstr "Tiny Tiny RSS -sivustoa voidaan käyttää Firefoxin syötelukijana klikkaamalla alla olevaa linkkiä"
+
+#: classes/pref/feeds.php:1471
+msgid "Click here to register this site as a feed reader."
+msgstr "Klikkaa tästä rekisteröidäksesi tämän sivuston syötelukijaksi."
+
+#: classes/pref/feeds.php:1479
+msgid "Published & shared articles / Generated feeds"
+msgstr "Julkaistut ja jaetut artikkelit / Luodut syötteet"
+
+#: classes/pref/feeds.php:1481
+msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
+msgstr "Julkistetut artikkelit näkyvät julkisena RSS-syötteenä ja niitä voi lukea ja tilata jokainen, joka tietää alla annetun osoitteen"
+
+#: classes/pref/feeds.php:1488
+#: classes/feeds.php:54
+#: classes/feeds.php:140
+msgid "View as RSS"
+msgstr "Näytä RSS-syötteenä"
+
+#: classes/pref/feeds.php:1489
+msgid "Display URL"
+msgstr "Näytä osoite"
+
+#: classes/pref/feeds.php:1492
+msgid "Clear all generated URLs"
+msgstr "Poista kaikki luodut osoitteet"
+
+#: classes/pref/feeds.php:1570
+msgid "These feeds have not been updated with new content for 3 months (oldest first):"
+msgstr "Näihin syötteisiin ei ole tullut uusia artikkeleita 3 kuukauteen (vanhimmat ensin):"
+
+#: classes/pref/feeds.php:1604
+#: classes/pref/feeds.php:1668
+msgid "Click to edit feed"
+msgstr "Napsauta muokataksesi syötettä"
+
+#: classes/pref/feeds.php:1622
+#: classes/pref/feeds.php:1688
+msgid "Unsubscribe from selected feeds"
+msgstr "Lopeta valittujen syötteiden tilaukset"
+
+#: classes/pref/feeds.php:1793
+msgid "Add one valid RSS feed per line (no feed detection is done)"
+msgstr "Lisää RSS-syötteitä riveittäin (syötteitä ei yritetä tunnistaa)"
+
+#: classes/pref/feeds.php:1802
+msgid "Feeds to subscribe, One per line"
+msgstr "Tilattavat syötteet, yksi syöte riviä kohden"
+
+#: classes/pref/feeds.php:1825
+msgid "Feeds require authentication."
+msgstr "Syötteet vaativat kirjautumisen."
+
+#: classes/pref/feeds.php:1832
+#: classes/feeds.php:1092
+#: classes/feeds.php:1146
+msgid "Subscribe"
+msgstr "Tilaa"
+
+#: classes/pref/system.php:29
+msgid "Error Log"
+msgstr "Virheloki"
+
+#: classes/pref/system.php:40
+msgid "Refresh"
+msgstr "Päivitä"
+
+#: classes/pref/system.php:43
+msgid "Clear log"
+msgstr "Tyhjennä loki"
+
+#: classes/pref/system.php:48
+msgid "Error"
+msgstr "Virhe"
+
+#: classes/pref/system.php:49
+msgid "Filename"
+msgstr "Tiedosto"
+
+#: classes/pref/system.php:50
+msgid "Message"
+msgstr "Viesti"
+
+#: classes/pref/system.php:52
+msgid "Date"
+msgstr "Päiväys"
+
+#: classes/opml.php:28
+#: classes/opml.php:33
+msgid "OPML Utility"
+msgstr "OPML-työkalu"
+
+#: classes/opml.php:37
+msgid "Importing OPML..."
+msgstr "Luetaan OPML-tiedostoa"
+
+#: classes/opml.php:41
+msgid "Return to preferences"
+msgstr "Palaa asetuksiin"
+
+#: classes/opml.php:295
+#, php-format
+msgid "Adding feed: %s"
+msgstr "Lisätään syöte: %s"
+
+#: classes/opml.php:306
+#, php-format
+msgid "Duplicate feed: %s"
+msgstr "Syötteen kaksoiskappale: %s"
+
+#: classes/opml.php:320
+#, php-format
+msgid "Adding label %s"
+msgstr "Lisätään tunniste %s"
+
+#: classes/opml.php:323
+#, php-format
+msgid "Duplicate label: %s"
+msgstr "Tunnisteen kaksoiskappale: %s"
+
+#: classes/opml.php:335
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr ""
+
+#: classes/opml.php:367
+msgid "Adding filter..."
+msgstr "Lisätään suodatin..."
+
+#: classes/opml.php:486
+#, php-format
+msgid "Processing category: %s"
+msgstr ""
+
+#: classes/opml.php:532
+#, php-format
+msgid "Upload failed with error code %d"
+msgstr "Lähettäminen epäonnistui virhekoodilla %d"
+
+#: classes/opml.php:544
+#: plugins/import_export/init.php:448
+#, fuzzy
+msgid "Unable to move uploaded file."
+msgstr "Ladatun tiedoston siirtäminen epäonnistui."
+
+#: classes/opml.php:548
+#: plugins/import_export/init.php:452
+msgid "Error: please upload OPML file."
+msgstr "Virhe: lähetä OPML-tiedosto."
+
+#: classes/opml.php:559
+#, fuzzy
+msgid "Error: unable to find moved OPML file."
+msgstr "Virhe: siirretty OPML-tiedosto katosi."
+
+#: classes/opml.php:566
+msgid "Error while parsing document."
+msgstr "Virhe tulkitessa dokumenttia."
+
 #: classes/feeds.php:53
 msgid "View as RSS feed"
 msgstr "Näytä RSS-syötteenä"
@@ -2343,8 +2291,8 @@ msgstr "Siirrä takaisin"
 
 #: classes/feeds.php:127
 #: classes/feeds.php:132
-#: plugins/mail/init.php:75
 #: plugins/mailto/init.php:25
+#: plugins/mail/init.php:75
 msgid "Forward by email"
 msgstr "Lähetä sähköpostilla"
 
@@ -2352,266 +2300,261 @@ msgstr "Lähetä sähköpostilla"
 msgid "Feed:"
 msgstr "Syöte:"
 
-#: classes/feeds.php:229
-#: classes/feeds.php:892
+#: classes/feeds.php:228
+#: classes/feeds.php:885
 msgid "Feed not found."
 msgstr "Syötettä ei löydy"
 
-#: classes/feeds.php:300
+#: classes/feeds.php:291
 #, fuzzy
 msgid "Never"
 msgstr "Älä poista koskaan"
 
-#: classes/feeds.php:413
+#: classes/feeds.php:405
 #, php-format
 msgid "Imported at %s"
 msgstr "Tuotu %s"
 
-#: classes/feeds.php:472
-#: classes/feeds.php:569
+#: classes/feeds.php:464
+#: classes/feeds.php:561
 #, fuzzy
 msgid "mark feed as read"
 msgstr "Merkitse syöte luetuksi"
 
-#: classes/feeds.php:630
+#: classes/feeds.php:622
 msgid "Collapse article"
 msgstr "Sulje artikkeli"
 
-#: classes/feeds.php:791
+#: classes/feeds.php:784
 msgid "No unread articles found to display."
 msgstr "Lukemattomia artikkeleita ei ole näytettäväksi"
 
-#: classes/feeds.php:794
+#: classes/feeds.php:787
 msgid "No updated articles found to display."
 msgstr "Päivitettyjä artikkeleita ei ole näytettäväksi"
 
-#: classes/feeds.php:797
+#: classes/feeds.php:790
 msgid "No starred articles found to display."
 msgstr "Tähdellä merkittyjä artikkeleita ei ole näytettäväksi"
 
-#: classes/feeds.php:801
+#: classes/feeds.php:794
 #, fuzzy
 msgid "No articles found to display. You can assign articles to labels manually from article header context menu (applies to all selected articles) or use a filter."
 msgstr "Ei näytettäviä artikkeleita. Voit merkitä artikkeleita tunnisteilla käsin (Toiminnot-valikko yläreunassa) tai käytää suodattimia."
 
-#: classes/feeds.php:803
+#: classes/feeds.php:796
 msgid "No articles found to display."
 msgstr "Ei näytettäviä artikkeleita."
 
-#: classes/feeds.php:818
-#: classes/feeds.php:992
+#: classes/feeds.php:811
+#: classes/feeds.php:985
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "Syötteet päivitetty viimeksi %s"
 
-#: classes/feeds.php:828
-#: classes/feeds.php:1002
+#: classes/feeds.php:821
+#: classes/feeds.php:995
 msgid "Some feeds have update errors (click for details)"
 msgstr "Osassa syötteistä oli päivitysongelmia (napsauta nähdäksesi lisätietoja)"
 
-#: classes/feeds.php:982
+#: classes/feeds.php:975
 msgid "No feed selected."
 msgstr "Yhtään syötettä ei ole valittuna"
 
-#: classes/feeds.php:1041
-#: classes/feeds.php:1049
+#: classes/feeds.php:1034
+#: classes/feeds.php:1042
 msgid "Feed or site URL"
 msgstr "Syötteen/sivuston osoite"
 
-#: classes/feeds.php:1063
+#: classes/feeds.php:1056
 msgid "Available feeds"
 msgstr "Saatavilla olevat syötteet"
 
-#: classes/feeds.php:1094
+#: classes/feeds.php:1087
 msgid "This feed requires authentication."
 msgstr "Tämä syöte vaatii kirjautumisen"
 
-#: classes/feeds.php:1102
+#: classes/feeds.php:1095
 msgid "More feeds"
 msgstr "Lisää syötteitä"
 
-#: classes/feeds.php:1129
+#: classes/feeds.php:1122
 msgid "Popular feeds"
 msgstr "Suositut syötteet"
 
-#: classes/feeds.php:1130
+#: classes/feeds.php:1123
 msgid "Feed archive"
 msgstr "Syötearkisto"
 
-#: classes/feeds.php:1133
+#: classes/feeds.php:1126
 msgid "limit:"
 msgstr "raja:"
 
-#: classes/feeds.php:1165
+#: classes/feeds.php:1158
 msgid "Look for"
 msgstr "Etsi"
 
-#: classes/feeds.php:1173
+#: classes/feeds.php:1166
 #, php-format
 msgid "in %s"
 msgstr ""
 
-#: classes/feeds.php:1178
+#: classes/feeds.php:1171
 msgid "Used for word stemming"
 msgstr ""
 
-#: classes/feeds.php:1187
+#: classes/feeds.php:1180
 msgid "Search syntax"
 msgstr "Haun syntaksi"
 
-#: plugins/instances/init.php:141
-msgid "Linked"
-msgstr "Linkitetty"
-
-#: plugins/instances/init.php:204
-#: plugins/instances/init.php:395
-msgid "Instance"
-msgstr ""
-
-#: plugins/instances/init.php:215
-#: plugins/instances/init.php:312
-#: plugins/instances/init.php:404
-msgid "Instance URL"
-msgstr ""
+#: classes/feeds.php:1596
+msgid "Starred articles"
+msgstr "Tähdelliset artikkelit"
 
-#: plugins/instances/init.php:226
-#: plugins/instances/init.php:414
-msgid "Access key:"
-msgstr ""
+#: classes/feeds.php:1598
+msgid "Published articles"
+msgstr "Julkiset artikkelit"
 
-#: plugins/instances/init.php:229
-#: plugins/instances/init.php:313
-#: plugins/instances/init.php:417
-msgid "Access key"
-msgstr ""
+#: classes/feeds.php:1600
+msgid "Fresh articles"
+msgstr "Tuoreet artikkelit"
 
-#: plugins/instances/init.php:233
-#: plugins/instances/init.php:421
-msgid "Use one access key for both linked instances."
-msgstr ""
+#: classes/feeds.php:1604
+msgid "Archived articles"
+msgstr "Arkistoidut artikkelit"
 
-#: plugins/instances/init.php:241
-#: plugins/instances/init.php:429
-msgid "Generate new key"
-msgstr ""
+#: classes/feeds.php:1606
+msgid "Recently read"
+msgstr "Viimeksi luetut"
 
-#: plugins/instances/init.php:292
-msgid "Link instance"
-msgstr ""
+#: classes/feeds.php:1716
+msgid "Special"
+msgstr "Erikoiset"
 
-#: plugins/instances/init.php:304
-msgid "You can connect other instances of Tiny Tiny RSS to this one to share Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
-msgstr ""
+#: classes/feeds.php:1962
+#, php-format
+msgid "Search results: %s"
+msgstr "Hakutulokset: %s"
 
-#: plugins/instances/init.php:314
-msgid "Last connected"
-msgstr "Viimeksi yhteydessä"
+#: plugins/vf_shared/init.php:16
+#: plugins/vf_shared/init.php:60
+msgid "Shared articles"
+msgstr "Jaetut artikkelit"
 
-#: plugins/instances/init.php:315
-msgid "Status"
-msgstr "Tila"
+#: plugins/import_export/init.php:58
+msgid "Import and export"
+msgstr "Tuonti ja vienti"
 
-#: plugins/instances/init.php:316
-msgid "Stored feeds"
-msgstr "Talletetut syötteet"
+#: plugins/import_export/init.php:60
+msgid "You can export and import your Starred and Archived articles for safekeeping or when migrating between tt-rss instances of same version."
+msgstr ""
 
-#: plugins/instances/init.php:433
-msgid "Create link"
-msgstr "Luo linkki"
+#: plugins/import_export/init.php:65
+msgid "Export my data"
+msgstr "Vie tietoni"
 
-#: plugins/nsfw/init.php:30
-#: plugins/nsfw/init.php:42
-msgid "Not work safe (click to toggle)"
-msgstr ""
+#: plugins/import_export/init.php:81
+msgid "Import"
+msgstr "Tuo"
 
-#: plugins/nsfw/init.php:52
-msgid "NSFW Plugin"
+#: plugins/import_export/init.php:231
+msgid "Could not import: incorrect schema version."
 msgstr ""
 
-#: plugins/nsfw/init.php:79
-msgid "Tags to consider NSFW (comma-separated)"
+#: plugins/import_export/init.php:236
+msgid "Could not import: unrecognized document format."
 msgstr ""
 
-#: plugins/nsfw/init.php:100
-msgid "Configuration saved."
-msgstr "Asetukset tallennettiin."
-
-#: plugins/note/init.php:26
-#: plugins/note/note.js:11
-msgid "Edit article note"
-msgstr "Muokkaa artikkelin muistiinpanoa"
+#: plugins/import_export/init.php:397
+msgid "Finished: "
+msgstr "Valmis: "
 
-#: plugins/vf_shared/init.php:16
-#: plugins/vf_shared/init.php:69
-msgid "Shared articles"
-msgstr "Jaetut artikkelit"
+#: plugins/import_export/init.php:398
+#, php-format
+msgid "%d article processed, "
+msgid_plural "%d articles processed, "
+msgstr[0] ""
+msgstr[1] ""
 
-#: plugins/auth_internal/init.php:65
-msgid "Please enter your one time password:"
-msgstr "Syötä kertakäyttösalasanasi:"
+#: plugins/import_export/init.php:399
+#, php-format
+msgid "%d imported, "
+msgid_plural "%d imported, "
+msgstr[0] ""
+msgstr[1] ""
 
-#: plugins/auth_internal/init.php:188
-msgid "Password has been changed."
-msgstr "Salasana on vaihdettu."
+#: plugins/import_export/init.php:400
+#, php-format
+msgid "%d feed created."
+msgid_plural "%d feeds created."
+msgstr[0] ""
+msgstr[1] ""
 
-#: plugins/auth_internal/init.php:190
-msgid "Old password is incorrect."
-msgstr "Vanha salasana on virheellinen."
+#: plugins/import_export/init.php:405
+msgid "Could not load XML document."
+msgstr "XML-dokumentin lataus epäonnistui."
 
-#: plugins/af_readability/init.php:21
-#, fuzzy
-msgid "Data saved."
-msgstr "Tiedot talletettu (%s, %d)"
+#: plugins/import_export/init.php:417
+msgid "Prepare data"
+msgstr ""
 
-#: plugins/af_readability/init.php:33
-#, fuzzy
-msgid "Inline content"
-msgstr "Muokkaa artikkelin muistiinpanoa"
+#: plugins/import_export/init.php:434
+#, fuzzy, php-format
+msgid "Upload failed with error code %d (%s)"
+msgstr "Lähettäminen epäonnistui virhekoodilla %d"
 
-#: plugins/af_readability/init.php:39
-msgid "Readability settings (af_readability)"
+#: plugins/import_export/init.php:460
+msgid "No file uploaded."
 msgstr ""
 
-#: plugins/af_readability/init.php:66
-msgid "Use Readability for pages shared via bookmarklet."
+#: plugins/mailto/init.php:48
+#: plugins/mailto/init.php:54
+#: plugins/mail/init.php:112
+#: plugins/mail/init.php:118
+msgid "[Forwarded]"
 msgstr ""
 
-#: plugins/af_readability/init.php:78
-#: plugins/af_psql_trgm/init.php:191
-msgid "Currently enabled for (click to edit):"
-msgstr ""
+#: plugins/mailto/init.php:48
+#: plugins/mail/init.php:112
+msgid "Multiple articles"
+msgstr "Monta artikkelia"
 
-#: plugins/af_readability/init.php:95
-#, fuzzy
-msgid "Readability"
-msgstr "Tarkasta saatavuus"
+#: plugins/mailto/init.php:70
+msgid "Clicking the following link to invoke your mail client:"
+msgstr ""
 
-#: plugins/af_readability/init.php:106
-#, fuzzy
-msgid "Inline article content"
-msgstr "Muokkaa artikkelin muistiinpanoa"
+#: plugins/mailto/init.php:74
+msgid "Forward selected article(s) by email."
+msgstr "Lähetä valitut artikkeli(t) sähköpostitse."
 
-#: plugins/af_redditimgur/init.php:25
-msgid "Reddit content settings (af_redditimgur)"
+#: plugins/mailto/init.php:77
+msgid "You should be able to edit the message before sending in your mail client."
 msgstr ""
 
-#: plugins/af_redditimgur/init.php:50
-msgid "Uses Readability (full-text-rss) implementation by <a target='_blank' href='https://bitbucket.org/fivefilters/'>FiveFilters.org</a>"
-msgstr ""
+#: plugins/mailto/init.php:82
+msgid "Close this dialog"
+msgstr "Sulje"
 
-#: plugins/af_redditimgur/init.php:54
-msgid "Extract missing content using Readability"
+#: plugins/bookmarklets/init.php:20
+msgid "Bookmarklets"
 msgstr ""
 
-#: plugins/af_redditimgur/init.php:59
-msgid "Enable additional duplicate checking"
-msgstr ""
+#: plugins/bookmarklets/init.php:22
+msgid "Drag the link below to your browser toolbar, open the feed you're interested in in your browser and click on the link to subscribe to it."
+msgstr "Raahaa allaoleva linkki selaimesi työkaluriville, avaa syöte josta olet kiinnsotunut selaimessasi ja klikkaa linkkiä tilataksesi syötteen."
 
-#: plugins/af_redditimgur/init.php:73
-#: plugins/af_zz_imgproxy/init.php:225
-#, fuzzy
-msgid "Configuration saved"
-msgstr "Asetukset tallennettiin."
+#: plugins/bookmarklets/init.php:26
+#, php-format
+msgid "Subscribe to %s in Tiny Tiny RSS?"
+msgstr "TIlataanko %s Tiny Tiny RSS:ssä?"
+
+#: plugins/bookmarklets/init.php:31
+msgid "Subscribe in Tiny Tiny RSS"
+msgstr "Tilaa Tiny Tiny RSS:ssä"
+
+#: plugins/bookmarklets/init.php:34
+msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
+msgstr "Käytä tätä kirjanmerkkiä tilataksesi sivuja Tiny Tiny RSS:ää käyttäen"
 
 #: plugins/af_psql_trgm/init.php:28
 #, php-format
@@ -2649,87 +2592,63 @@ msgstr ""
 msgid "Enable for all feeds:"
 msgstr "Käytä syötekansioita"
 
-#: plugins/af_psql_trgm/init.php:209
-msgid "Similarity (pg_trgm)"
+#: plugins/af_psql_trgm/init.php:191
+#: plugins/af_readability/init.php:78
+msgid "Currently enabled for (click to edit):"
 msgstr ""
 
-#: plugins/af_comics/init.php:40
-msgid "Feeds supported by af_comics"
-msgstr "af_comics:n tukemat syötteet"
-
-#: plugins/af_comics/init.php:42
-msgid "The following comics are currently supported:"
-msgstr "Seuraavat sarjakuvat ovat tuettuja:"
-
-#: plugins/af_comics/init.php:60
-msgid "GoComics requires a specific URL to workaround their lack of feed support: <code>http://feeds.feedburner.com/uclick/<em>comic_name</em></code> (e.g. <code>http://www.gocomics.com/garfield</code> uses <code>http://feeds.feedburner.com/uclick/garfield</code>)."
+#: plugins/af_psql_trgm/init.php:209
+msgid "Similarity (pg_trgm)"
 msgstr ""
 
-#: plugins/import_export/init.php:58
-msgid "Import and export"
-msgstr "Tuonti ja vienti"
-
-#: plugins/import_export/init.php:60
-msgid "You can export and import your Starred and Archived articles for safekeeping or when migrating between tt-rss instances of same version."
+#: plugins/nsfw/init.php:30
+#: plugins/nsfw/init.php:42
+msgid "Not work safe (click to toggle)"
 msgstr ""
 
-#: plugins/import_export/init.php:65
-msgid "Export my data"
-msgstr "Vie tietoni"
-
-#: plugins/import_export/init.php:81
-msgid "Import"
-msgstr "Tuo"
-
-#: plugins/import_export/init.php:225
-msgid "Could not import: incorrect schema version."
+#: plugins/nsfw/init.php:52
+msgid "NSFW Plugin"
 msgstr ""
 
-#: plugins/import_export/init.php:230
-msgid "Could not import: unrecognized document format."
+#: plugins/nsfw/init.php:79
+msgid "Tags to consider NSFW (comma-separated)"
 msgstr ""
 
-#: plugins/import_export/init.php:391
-msgid "Finished: "
-msgstr "Valmis: "
+#: plugins/nsfw/init.php:100
+msgid "Configuration saved."
+msgstr "Asetukset tallennettiin."
 
-#: plugins/import_export/init.php:392
-#, php-format
-msgid "%d article processed, "
-msgid_plural "%d articles processed, "
-msgstr[0] ""
-msgstr[1] ""
+#: plugins/toggle_sidebar/init.php:23
+msgid "Collapse feedlist"
+msgstr "Sulje syöteluettelo"
 
-#: plugins/import_export/init.php:393
-#, php-format
-msgid "%d imported, "
-msgid_plural "%d imported, "
-msgstr[0] ""
-msgstr[1] ""
+#: plugins/af_readability/init.php:21
+#, fuzzy
+msgid "Data saved."
+msgstr "Tiedot talletettu (%s, %d)"
 
-#: plugins/import_export/init.php:394
-#, php-format
-msgid "%d feed created."
-msgid_plural "%d feeds created."
-msgstr[0] ""
-msgstr[1] ""
+#: plugins/af_readability/init.php:33
+#, fuzzy
+msgid "Inline content"
+msgstr "Muokkaa artikkelin muistiinpanoa"
 
-#: plugins/import_export/init.php:399
-msgid "Could not load XML document."
-msgstr "XML-dokumentin lataus epäonnistui."
+#: plugins/af_readability/init.php:39
+msgid "Readability settings (af_readability)"
+msgstr ""
 
-#: plugins/import_export/init.php:411
-msgid "Prepare data"
+#: plugins/af_readability/init.php:66
+msgid "Use Readability for pages shared via bookmarklet."
 msgstr ""
 
-#: plugins/import_export/init.php:428
-#, fuzzy, php-format
-msgid "Upload failed with error code %d (%s)"
-msgstr "Lähettäminen epäonnistui virhekoodilla %d"
+#: plugins/af_readability/init.php:95
+#, fuzzy
+msgid "Readability"
+msgstr "Tarkasta saatavuus"
 
-#: plugins/import_export/init.php:454
-msgid "No file uploaded."
-msgstr ""
+#: plugins/af_readability/init.php:106
+#, fuzzy
+msgid "Inline article content"
+msgstr "Muokkaa artikkelin muistiinpanoa"
 
 #: plugins/mail/init.php:28
 msgid "Mail addresses saved."
@@ -2743,18 +2662,6 @@ msgstr "Sähköpostilisäosa"
 msgid "You can set predefined email addressed here (comma-separated list):"
 msgstr "Voit listata sähköpostiosoitteita tähän (pilkulla erotettuna):"
 
-#: plugins/mail/init.php:112
-#: plugins/mail/init.php:118
-#: plugins/mailto/init.php:49
-#: plugins/mailto/init.php:55
-msgid "[Forwarded]"
-msgstr ""
-
-#: plugins/mail/init.php:112
-#: plugins/mailto/init.php:49
-msgid "Multiple articles"
-msgstr "Monta artikkelia"
-
 #: plugins/mail/init.php:140
 msgid "To:"
 msgstr "Vastaanottaja:"
@@ -2767,90 +2674,109 @@ msgstr "Otsikko:"
 msgid "Send e-mail"
 msgstr "Lähetä sähköposti"
 
-#: plugins/close_button/init.php:22
-msgid "Close article"
-msgstr "Sulje artikkeli"
+#: plugins/share/init.php:39
+msgid "You can disable all articles shared by unique URLs here."
+msgstr "Tässä voit perua kaikki osoitteen kautta jaettujen artikkeleiden julkistukset."
 
-#: plugins/bookmarklets/init.php:20
-msgid "Bookmarklets"
-msgstr ""
+#: plugins/share/init.php:42
+msgid "Unshare all articles"
+msgstr "Poista kaikkien artikkeleiden jako"
 
-#: plugins/bookmarklets/init.php:22
-msgid "Drag the link below to your browser toolbar, open the feed you're interested in in your browser and click on the link to subscribe to it."
-msgstr "Raahaa allaoleva linkki selaimesi työkaluriville, avaa syöte josta olet kiinnsotunut selaimessasi ja klikkaa linkkiä tilataksesi syötteen."
+#: plugins/share/init.php:75
+msgid "Share by URL"
+msgstr "Jaa osoitteella"
 
-#: plugins/bookmarklets/init.php:26
-#, php-format
-msgid "Subscribe to %s in Tiny Tiny RSS?"
-msgstr "TIlataanko %s Tiny Tiny RSS:ssä?"
+#: plugins/share/init.php:96
+msgid "You can share this article by the following unique URL:"
+msgstr "Voit jakaa tämän artikkelin seuraavalla uniikilla osoitteella:"
 
-#: plugins/bookmarklets/init.php:31
-msgid "Subscribe in Tiny Tiny RSS"
-msgstr "Tilaa Tiny Tiny RSS:ssä"
+#: plugins/share/init.php:114
+msgid "Unshare article"
+msgstr "Poista artikkelin jako"
 
-#: plugins/bookmarklets/init.php:34
-msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
-msgstr "Käytä tätä kirjanmerkkiä tilataksesi sivuja Tiny Tiny RSS:ää käyttäen"
+#: plugins/af_comics/init.php:48
+msgid "Feeds supported by af_comics"
+msgstr "af_comics:n tukemat syötteet"
 
-#: plugins/toggle_sidebar/init.php:23
-msgid "Collapse feedlist"
-msgstr "Sulje syöteluettelo"
+#: plugins/af_comics/init.php:50
+msgid "The following comics are currently supported:"
+msgstr "Seuraavat sarjakuvat ovat tuettuja:"
 
-#: plugins/af_zz_imgproxy/init.php:186
-msgid "Image proxy settings (af_zz_imgproxy)"
+#: plugins/af_comics/init.php:68
+msgid "GoComics requires a specific URL to workaround their lack of feed support: <code>http://feeds.feedburner.com/uclick/<em>comic_name</em></code> (e.g. <code>http://www.gocomics.com/garfield</code> uses <code>http://feeds.feedburner.com/uclick/garfield</code>)."
 msgstr ""
 
-#: plugins/af_zz_imgproxy/init.php:211
-#, fuzzy
-msgid "Enable proxy for all remote images."
-msgstr "Käytä syötekansioita"
+#: plugins/af_comics/init.php:70
+msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
+msgstr ""
 
-#: plugins/mailto/init.php:71
-msgid "Clicking the following link to invoke your mail client:"
+#: plugins/af_redditimgur/init.php:25
+msgid "Reddit content settings (af_redditimgur)"
 msgstr ""
 
-#: plugins/mailto/init.php:75
-msgid "Forward selected article(s) by email."
-msgstr "Lähetä valitut artikkeli(t) sähköpostitse."
+#: plugins/af_redditimgur/init.php:50
+msgid "Uses Readability (full-text-rss) implementation by <a target='_blank' href='https://bitbucket.org/fivefilters/'>FiveFilters.org</a>"
+msgstr ""
 
-#: plugins/mailto/init.php:78
-msgid "You should be able to edit the message before sending in your mail client."
+#: plugins/af_redditimgur/init.php:54
+msgid "Extract missing content using Readability"
 msgstr ""
 
-#: plugins/mailto/init.php:83
-msgid "Close this dialog"
-msgstr "Sulje"
+#: plugins/af_redditimgur/init.php:59
+msgid "Enable additional duplicate checking"
+msgstr ""
 
-#: plugins/share/init.php:39
-msgid "You can disable all articles shared by unique URLs here."
-msgstr "Tässä voit perua kaikki osoitteen kautta jaettujen artikkeleiden julkistukset."
+#: plugins/af_redditimgur/init.php:73
+#: plugins/af_zz_imgproxy/init.php:254
+#, fuzzy
+msgid "Configuration saved"
+msgstr "Asetukset tallennettiin."
 
-#: plugins/share/init.php:42
-msgid "Unshare all articles"
-msgstr "Poista kaikkien artikkeleiden jako"
+#: plugins/note/init.php:26
+#: plugins/note/note.js:11
+msgid "Edit article note"
+msgstr "Muokkaa artikkelin muistiinpanoa"
 
-#: plugins/share/init.php:75
-msgid "Share by URL"
-msgstr "Jaa osoitteella"
+#: plugins/close_button/init.php:25
+msgid "Close article"
+msgstr "Sulje artikkeli"
 
-#: plugins/share/init.php:97
-msgid "You can share this article by the following unique URL:"
-msgstr "Voit jakaa tämän artikkelin seuraavalla uniikilla osoitteella:"
+#: plugins/af_zz_imgproxy/init.php:210
+msgid "Image proxy settings (af_zz_imgproxy)"
+msgstr ""
 
-#: plugins/share/init.php:115
-msgid "Unshare article"
-msgstr "Poista artikkelin jako"
+#: plugins/af_zz_imgproxy/init.php:234
+#, fuzzy
+msgid "Enable proxy for all remote images."
+msgstr "Käytä syötekansioita"
+
+#: plugins/af_zz_imgproxy/init.php:238
+#, fuzzy
+msgid "Don't cache files locally."
+msgstr "Tallenna kuvat välimuistiin"
+
+#: plugins/auth_internal/init.php:65
+msgid "Please enter your one time password:"
+msgstr "Syötä kertakäyttösalasanasi:"
+
+#: plugins/auth_internal/init.php:188
+msgid "Password has been changed."
+msgstr "Salasana on vaihdettu."
+
+#: plugins/auth_internal/init.php:190
+msgid "Old password is incorrect."
+msgstr "Vanha salasana on virheellinen."
 
 #: js/FeedTree.js:172
 #, fuzzy
 msgid "(Un)collapse"
 msgstr "Piilota/näytä sivupalkki"
 
-#: js/PrefFeedTree.js:52
+#: js/PrefFeedTree.js:54
 msgid "Edit category"
 msgstr "Muokkaa kansiota"
 
-#: js/PrefFeedTree.js:59
+#: js/PrefFeedTree.js:61
 msgid "Remove category"
 msgstr "Poista kansio"
 
@@ -2886,63 +2812,55 @@ msgid "Create Filter"
 msgstr "Luo suodatin"
 
 #: js/functions.js:1128
-msgid "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification hub again on next feed update."
-msgstr ""
-
-#: js/functions.js:1139
-msgid "Subscription reset."
-msgstr ""
-
-#: js/functions.js:1149
-#: js/tt-rss.js:695
+#: js/tt-rss.js:696
 #, perl-format
 msgid "Unsubscribe from %s?"
 msgstr "Perutaanko syötteen %s tilaus?"
 
-#: js/functions.js:1152
+#: js/functions.js:1131
 msgid "Removing feed..."
 msgstr "Poistetaan syöte..."
 
-#: js/functions.js:1225
+#: js/functions.js:1204
 msgid "Please enter category title:"
 msgstr "Syötä kansion nimi:"
 
-#: js/functions.js:1250
+#: js/functions.js:1229
 msgid "Generate new syndication address for this feed?"
 msgstr ""
 
-#: js/functions.js:1254
-#: js/prefs.js:1154
+#: js/functions.js:1233
+#: js/prefs.js:1150
 msgid "Trying to change address..."
 msgstr "Vaihdetaan osoitetta..."
 
-#: js/functions.js:1497
-#: js/functions.js:1606
+#: js/functions.js:1476
+#: js/functions.js:1585
 #: js/prefs.js:398
 #: js/prefs.js:424
 #: js/prefs.js:456
 #: js/prefs.js:599
 #: js/prefs.js:617
-#: js/prefs.js:1136
-#: js/prefs.js:1263
+#: js/prefs.js:1132
+#: js/prefs.js:1259
 msgid "No feeds are selected."
 msgstr "Yhtään syötettä ei ole valittuna."
 
-#: js/functions.js:1540
+#: js/functions.js:1519
 msgid "Remove selected feeds from the archive? Feeds with stored articles will not be removed."
 msgstr "Poistetaanko valitut syötteet arkistosta? Syötteitä joissa on tallennettuja artikkeleita ei poisteta."
 
-#: js/functions.js:1577
+#: js/functions.js:1556
 msgid "Feeds with update errors"
 msgstr "Virheelliset syötteet"
 
-#: js/functions.js:1588
-#: js/prefs.js:1117
+#: js/functions.js:1567
+#: js/prefs.js:1113
 msgid "Remove selected feeds?"
 msgstr "Poistetaanko valitut syötteet?"
 
-#: js/functions.js:1591
-#: js/prefs.js:1120
+#: js/functions.js:1570
+#: js/prefs.js:1116
 msgid "Removing selected feeds..."
 msgstr "Poistetaan valitut syötteet..."
 
@@ -2965,9 +2883,7 @@ msgstr "Käyttäjätunnusten muokkaus"
 #: js/prefs.js:100
 #: js/prefs.js:209
 #: js/prefs.js:706
-#: plugins/instances/instances.js:26
-#: plugins/instances/instances.js:89
-#: js/functions.js:1408
+#: js/functions.js:1387
 msgid "Saving data..."
 msgstr "Tallennetaan tiedot..."
 
@@ -2992,7 +2908,7 @@ msgid "Removing selected labels..."
 msgstr "Poistetaan valitut tunnisteet..."
 
 #: js/prefs.js:308
-#: js/prefs.js:1304
+#: js/prefs.js:1300
 msgid "No labels are selected."
 msgstr "Yhtään tunnistetta ei ole valittuna"
 
@@ -3091,28 +3007,28 @@ msgstr "Tallenna valittujen syötteiden muutokset?"
 msgid "OPML Import"
 msgstr ""
 
-#: js/prefs.js:764
+#: js/prefs.js:759
 msgid "Please choose an OPML file first."
 msgstr "Valitse ensin OPML-tiedosto."
 
-#: js/prefs.js:767
+#: js/prefs.js:762
 #: plugins/import_export/import_export.js:115
 msgid "Importing, please wait..."
 msgstr "Importoidaan, odota..."
 
-#: js/prefs.js:928
+#: js/prefs.js:924
 msgid "Reset to defaults?"
 msgstr "Palautetaanko oletusasetukset?"
 
-#: js/prefs.js:1628
+#: js/prefs.js:1624
 msgid "Subscribing to feeds..."
 msgstr "Tilataan syötteet..."
 
-#: js/prefs.js:1647
+#: js/prefs.js:1643
 msgid "Clear stored data for this plugin?"
 msgstr "Poistetaanko kaikki tämän lisäosan tallentamat tiedot?"
 
-#: js/prefs.js:1661
+#: js/prefs.js:1657
 msgid "Clear all messages in the error log?"
 msgstr "Tyhjätäänkö kaikki viestit virhelokista?"
 
@@ -3124,178 +3040,149 @@ msgstr "Merkitäänkö kaikki artikkelit luetuksi?"
 msgid "Marking all feeds as read..."
 msgstr "Merkitään kaikki syötteet luetuiksi..."
 
-#: js/tt-rss.js:401
+#: js/tt-rss.js:402
 msgid "Please enable mail plugin first."
 msgstr "Aktivoi ensin email-lisäosa."
 
-#: js/tt-rss.js:449
-#: js/functions.js:1387
-#: js/tt-rss.js:676
+#: js/tt-rss.js:450
+#: js/functions.js:1366
+#: js/tt-rss.js:677
 msgid "You can't edit this kind of feed."
 msgstr "Et voi muokata tämäntyyppistä syötettä."
 
-#: js/tt-rss.js:530
+#: js/tt-rss.js:531
 msgid "Please enable embed_original plugin first."
 msgstr ""
 
-#: js/tt-rss.js:543
-#: js/tt-rss.js:726
+#: js/tt-rss.js:544
+#: js/tt-rss.js:727
 msgid "Widescreen is not available in combined mode."
 msgstr "Leveä näyttö ei käytössä yhdistelmätilassa."
 
-#: js/tt-rss.js:824
+#: js/tt-rss.js:825
 msgid "You can't rescore this kind of feed."
 msgstr ""
 
-#: js/tt-rss.js:829
-#: js/tt-rss.js:689
+#: js/tt-rss.js:830
+#: js/tt-rss.js:690
 msgid "Please select some feed first."
 msgstr "Valitse syötteet ensin."
 
-#: js/tt-rss.js:834
+#: js/tt-rss.js:835
 #, perl-format
 msgid "Rescore articles in %s?"
 msgstr "Uudelleenpisteytä artikkelit kansiossa %s?"
 
-#: js/tt-rss.js:837
+#: js/tt-rss.js:838
 msgid "Rescoring articles..."
 msgstr "Uudelleenpisteytetään artikkelit..."
 
-#: js/viewfeed.js:919
-#: js/viewfeed.js:957
-#: js/viewfeed.js:1005
-#: js/viewfeed.js:1931
-#: plugins/mail/mail.js:7
+#: js/viewfeed.js:921
+#: js/viewfeed.js:959
+#: js/viewfeed.js:1007
+#: js/viewfeed.js:1933
 #: plugins/mailto/init.js:7
-#: js/viewfeed.js:677
-#: js/viewfeed.js:699
-#: js/viewfeed.js:720
-#: js/viewfeed.js:779
-#: js/viewfeed.js:807
+#: plugins/mail/mail.js:7
+#: js/viewfeed.js:679
+#: js/viewfeed.js:701
+#: js/viewfeed.js:722
+#: js/viewfeed.js:781
+#: js/viewfeed.js:809
 msgid "No articles are selected."
 msgstr "Yhtään artikkelia ei ole valittuna."
 
-#: js/viewfeed.js:927
+#: js/viewfeed.js:929
 #, perl-format
 msgid "Delete %d selected article in %s?"
 msgid_plural "Delete %d selected articles in %s?"
 msgstr[0] "Poista %d valittu artikkeli syötteessä %s?"
 msgstr[1] "Poista %d valittua artikkelia syötteessä %s?"
 
-#: js/viewfeed.js:929
+#: js/viewfeed.js:931
 #, perl-format
 msgid "Delete %d selected article?"
 msgid_plural "Delete %d selected articles?"
 msgstr[0] "Poista %d valittu artikkeli?"
 msgstr[1] "Poista %d valittua artikkelia?"
 
-#: js/viewfeed.js:966
+#: js/viewfeed.js:968
 #, perl-format
 msgid "Archive %d selected article in %s?"
 msgid_plural "Archive %d selected articles in %s?"
 msgstr[0] "Arkistoi %d valittu artikkeli syötteestä %s?"
 msgstr[1] "Arkistoi %d valittua artikkelia syötteestä %s?"
 
-#: js/viewfeed.js:969
+#: js/viewfeed.js:971
 #, perl-format
 msgid "Move %d archived article back?"
 msgid_plural "Move %d archived articles back?"
 msgstr[0] "Siirretäänkö %d arkistoitu artikkeli takaisin?"
 msgstr[1] "Siirretäänkö %d arkistoitua artikkelia takaisin?"
 
-#: js/viewfeed.js:971
+#: js/viewfeed.js:973
 msgid "Please note that unstarred articles might get purged on next feed update."
 msgstr ""
 
-#: js/viewfeed.js:1011
+#: js/viewfeed.js:1013
 #, perl-format
 msgid "Mark %d selected article in %s as read?"
 msgid_plural "Mark %d selected articles in %s as read?"
 msgstr[0] "Merkitäänkö %d valittu artikkeli syötteessä %s luetuksi?"
 msgstr[1] "Merkitäänkö %d valittua artikkelia syötteessä %s luetuiksi?"
 
-#: js/viewfeed.js:1031
+#: js/viewfeed.js:1033
 msgid "Edit article Tags"
 msgstr "Muokkaa artikkelin avainsanoja"
 
-#: js/viewfeed.js:1037
+#: js/viewfeed.js:1039
 msgid "Saving article tags..."
 msgstr "Tallennetaan artikkelin avainsanat..."
 
-#: js/viewfeed.js:1670
+#: js/viewfeed.js:1672
 msgid "Open original article"
 msgstr "Avaa alkuperäinen artikkeli"
 
-#: js/viewfeed.js:1677
+#: js/viewfeed.js:1679
 msgid "Display article URL"
 msgstr "Näytä artikkelin osoite"
 
-#: js/viewfeed.js:1787
+#: js/viewfeed.js:1789
 msgid "Assign label"
 msgstr "Liitä tunniste"
 
-#: js/viewfeed.js:1792
+#: js/viewfeed.js:1794
 msgid "Remove label"
 msgstr "Poista tunniste"
 
-#: js/viewfeed.js:1824
+#: js/viewfeed.js:1826
 #, fuzzy
 msgid "Select articles in group"
 msgstr "Valitse osoittimen kohdalla oleva artikkeli"
 
-#: js/viewfeed.js:1834
+#: js/viewfeed.js:1836
 msgid "Mark group as read"
 msgstr "Merkitse ryhmä luetuiksi"
 
-#: js/viewfeed.js:1846
+#: js/viewfeed.js:1848
 msgid "Mark feed as read"
 msgstr "Merkitse syöte luetuksi"
 
-#: js/viewfeed.js:1899
+#: js/viewfeed.js:1901
 msgid "Please enter new score for selected articles:"
 msgstr "Anna uusi pistemäärä valituille artikkeleille:"
 
-#: js/viewfeed.js:1962
+#: js/viewfeed.js:1964
 msgid "Please enter new score for this article:"
 msgstr "Anna uusi pistemäärä tälle artikkelille:"
 
-#: js/viewfeed.js:1993
+#: js/viewfeed.js:1995
 msgid "Article URL:"
 msgstr "Artikkelin osoite:"
 
-#: plugins/instances/instances.js:10
-msgid "Link Instance"
-msgstr ""
-
-#: plugins/instances/instances.js:73
-msgid "Edit Instance"
-msgstr ""
-
-#: plugins/instances/instances.js:122
-msgid "Remove selected instances?"
-msgstr ""
-
-#: plugins/instances/instances.js:125
-msgid "Removing selected instances..."
-msgstr ""
-
-#: plugins/instances/instances.js:139
-#: plugins/instances/instances.js:151
-msgid "No instances are selected."
-msgstr "Ei valittuja instansseja."
-
-#: plugins/instances/instances.js:156
-msgid "Please select only one instance."
-msgstr "Valitse vain yksi instanssi."
-
-#: plugins/note/note.js:17
-msgid "Saving article note..."
+#: plugins/embed_original/init.js:6
+msgid "Sorry, your browser does not support sandboxed iframes."
 msgstr ""
 
-#: plugins/af_psql_trgm/init.js:11
-msgid "Related articles"
-msgstr "Liittyvät artikkelit"
-
 #: plugins/import_export/import_export.js:13
 msgid "Export Data"
 msgstr "Vie tiedot"
@@ -3315,11 +3202,15 @@ msgstr "Tuo tiedot"
 msgid "Please choose the file first."
 msgstr "Valitse ensin tiedosto."
 
-#: plugins/mail/mail.js:21
 #: plugins/mailto/init.js:21
+#: plugins/mail/mail.js:21
 msgid "Forward article by email"
 msgstr "Lähetä sähköpostilla"
 
+#: plugins/af_psql_trgm/init.js:11
+msgid "Related articles"
+msgstr "Liittyvät artikkelit"
+
 #: plugins/mail/mail.js:36
 msgid "Error sending email:"
 msgstr "Virhe lähtettäessä sähköpostia:"
@@ -3328,10 +3219,6 @@ msgstr "Virhe lähtettäessä sähköpostia:"
 msgid "Your message has been sent."
 msgstr "Viestisi lähetettiin."
 
-#: plugins/embed_original/init.js:6
-msgid "Sorry, your browser does not support sandboxed iframes."
-msgstr ""
-
 #: plugins/shorten_expanded/init.js:39
 msgid "Click to expand article"
 msgstr "Napsauta nähdäksesi koko artikkelin."
@@ -3361,7 +3248,7 @@ msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr "Kaikki jaettujen artikkeleiden osoitteet poistetaan. Jatketaanko?"
 
 #: plugins/share/share_prefs.js:6
-#: js/prefs.js:1437
+#: js/prefs.js:1433
 msgid "Clearing URLs..."
 msgstr "Poistetaan osoitteita..."
 
@@ -3369,23 +3256,44 @@ msgstr "Poistetaan osoitteita..."
 msgid "Shared URLs cleared."
 msgstr "Jaetut osoitteet poistettiin."
 
+#: plugins/note/note.js:17
+msgid "Saving article note..."
+msgstr ""
+
 #: js/feedlist.js:429
-#: js/feedlist.js:496
 msgid "Mark all articles in %s as read?"
 msgstr "Merkitäänkö kaikki artikkelit syötteessä %s luetuiksi?"
 
 #: js/feedlist.js:487
-msgid "Mark all articles in %s older than 1 day as read?"
+#, fuzzy
+msgid "Mark %w in %s older than 1 day as read?"
 msgstr "Merkitäänkö kaikki päivää vanhemmat artikkelit syötteessä %s luetuiksi?"
 
 #: js/feedlist.js:490
-msgid "Mark all articles in %s older than 1 week as read?"
+#, fuzzy
+msgid "Mark %w in %s older than 1 week as read?"
 msgstr "Merkitäänkö kaikki viikkoa vanhemmat artikkelit syötteessä %s luetuiksi?"
 
 #: js/feedlist.js:493
-msgid "Mark all articles in %s older than 2 weeks as read?"
+#, fuzzy
+msgid "Mark %w in %s older than 2 weeks as read?"
 msgstr "Merkitäänkö kaikki kahta viikkoa vanhemmat artikkelit syötteessä %s luetuiksi?"
 
+#: js/feedlist.js:496
+#, fuzzy
+msgid "Mark %w in %s as read?"
+msgstr "Merkitäänkö kaikki artikkelit syötteessä %s luetuiksi?"
+
+#: js/feedlist.js:499
+#, fuzzy
+msgid "search results"
+msgstr "Hakutulokset: %s"
+
+#: js/feedlist.js:499
+#, fuzzy
+msgid "all articles"
+msgstr "Kaikki artikkelit"
+
 #: js/functions.js:506
 msgid "Error explained"
 msgstr "Virheet selitettynä"
@@ -3467,177 +3375,198 @@ msgstr "Olet jo tilannut tämän syötteen."
 msgid "Edit rule"
 msgstr "Muokkaa sääntöä"
 
-#: js/functions.js:1402
+#: js/functions.js:1381
 msgid "Edit Feed"
 msgstr "Muokkaa syötettä"
 
-#: js/functions.js:1435
+#: js/functions.js:1414
 msgid "More Feeds"
 msgstr "Lisää syötteitä"
 
-#: js/functions.js:1631
+#: js/functions.js:1610
 msgid "Help"
 msgstr "Apua"
 
-#: js/prefs.js:1032
+#: js/prefs.js:1028
 msgid "Remove category %s? Any nested feeds would be placed into Uncategorized."
 msgstr ""
 
-#: js/prefs.js:1038
+#: js/prefs.js:1034
 msgid "Removing category..."
 msgstr "Poistetaan kansio..."
 
-#: js/prefs.js:1056
+#: js/prefs.js:1052
 msgid "Remove selected categories?"
 msgstr "Haluatko poistaa valitun kansion?"
 
-#: js/prefs.js:1059
+#: js/prefs.js:1055
 msgid "Removing selected categories..."
 msgstr "Poistetaan valitut kansiot..."
 
-#: js/prefs.js:1072
+#: js/prefs.js:1068
 msgid "No categories are selected."
 msgstr "Yhtään kansiota ei ole valittuna."
 
-#: js/prefs.js:1079
+#: js/prefs.js:1075
 msgid "Category title:"
 msgstr "Kansion nimi:"
 
-#: js/prefs.js:1083
+#: js/prefs.js:1079
 msgid "Creating category..."
 msgstr "Luodaan kansio..."
 
-#: js/prefs.js:1106
+#: js/prefs.js:1102
 msgid "Feeds without recent updates"
 msgstr "Syötteet joissa ei ole tuoreita artikkeleita"
 
-#: js/prefs.js:1150
+#: js/prefs.js:1146
 msgid "Replace current OPML publishing address with a new one?"
 msgstr "Korvataanko nykyinen OPML-julkaisuosoite uudella?"
 
-#: js/prefs.js:1227
+#: js/prefs.js:1223
 msgid "Clearing feed..."
 msgstr "Siivotaan syöte..."
 
-#: js/prefs.js:1247
+#: js/prefs.js:1243
 msgid "Rescore articles in selected feeds?"
 msgstr "Uudelleenpisteytetäänkö valitun syötteen artikkelit?"
 
-#: js/prefs.js:1250
+#: js/prefs.js:1246
 msgid "Rescoring selected feeds..."
 msgstr "Uudelleenpisteytetään valitut syötteet..."
 
-#: js/prefs.js:1270
+#: js/prefs.js:1266
 msgid "Rescore all articles? This operation may take a lot of time."
 msgstr "Uudelleenpisteytetäänkö kaikki artikkelit? Toiminto voi kestää kauan."
 
-#: js/prefs.js:1273
+#: js/prefs.js:1269
 msgid "Rescoring feeds..."
 msgstr "Uudelleenpisteytetään syötteet..."
 
-#: js/prefs.js:1289
+#: js/prefs.js:1285
 msgid "Reset selected labels to default colors?"
 msgstr "Palautetaanko oletusväri valituille tunnisteille?"
 
-#: js/prefs.js:1321
+#: js/prefs.js:1317
 msgid "Settings Profiles"
 msgstr "Profiilien asetukset"
 
-#: js/prefs.js:1330
+#: js/prefs.js:1326
 msgid "Remove selected profiles? Active and default profiles will not be removed."
 msgstr "Poistetaanko valitut profiilit? Aktiivisia ja oletusprofiilia ei poisteta."
 
-#: js/prefs.js:1333
+#: js/prefs.js:1329
 msgid "Removing selected profiles..."
 msgstr "Poistetaan valitut profiilit..."
 
-#: js/prefs.js:1349
+#: js/prefs.js:1345
 msgid "No profiles are selected."
 msgstr "Yhtään profiilia ei ole valittuna."
 
-#: js/prefs.js:1357
-#: js/prefs.js:1410
+#: js/prefs.js:1353
+#: js/prefs.js:1406
 msgid "Activate selected profile?"
 msgstr "Aktivoidaanko valittu profiili?"
 
-#: js/prefs.js:1374
-#: js/prefs.js:1426
+#: js/prefs.js:1370
+#: js/prefs.js:1422
 msgid "Please choose a profile to activate."
 msgstr "Valitse profiili jonka haluat aktivoida."
 
-#: js/prefs.js:1379
+#: js/prefs.js:1375
 msgid "Creating profile..."
 msgstr "Luodaan profiili..."
 
-#: js/prefs.js:1434
+#: js/prefs.js:1430
 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr "Kaikki luodut syöteosoitteet poistetaan. Jatketaanko?"
 
-#: js/prefs.js:1444
+#: js/prefs.js:1440
 msgid "Generated URLs cleared."
 msgstr "Luodut osoitteet poistettiin."
 
-#: js/prefs.js:1516
+#: js/prefs.js:1512
 msgid "Label Editor"
 msgstr "Tunnisteiden muokkaus"
 
-#: js/tt-rss.js:684
+#: js/tt-rss.js:685
 msgid "You can't unsubscribe from the category."
 msgstr "Et voi perua tämän kansion tilausta."
 
-#: js/viewfeed.js:125
-#: js/viewfeed.js:175
-#: js/viewfeed.js:192
+#: js/viewfeed.js:127
+#: js/viewfeed.js:177
+#: js/viewfeed.js:194
 msgid "Click to open next unread feed."
 msgstr "Napsauta avataksesi seuraavan lukemattoman syötteen."
 
-#: js/viewfeed.js:129
+#: js/viewfeed.js:131
 msgid "Cancel search"
 msgstr "Peru haku"
 
-#: js/viewfeed.js:189
+#: js/viewfeed.js:191
 #, fuzzy
 msgid "New articles found, reload feed to continue."
 msgstr "Ei näytettäviä artikkeleita."
 
-#: js/viewfeed.js:424
+#: js/viewfeed.js:426
 msgid "Unstar article"
 msgstr "Poista tähti artikkelista"
 
-#: js/viewfeed.js:428
+#: js/viewfeed.js:430
 msgid "Star article"
 msgstr "Merkitse artikkeli tähdellä"
 
-#: js/viewfeed.js:478
+#: js/viewfeed.js:480
 msgid "Unpublish article"
 msgstr "Aseta artikkeli yksityiseksi"
 
-#: js/viewfeed.js:482
+#: js/viewfeed.js:484
 msgid "Publish article"
 msgstr "Julkista artikkeli"
 
-#: js/viewfeed.js:622
+#: js/viewfeed.js:624
 msgid "%d article selected"
 msgid_plural "%d articles selected"
 msgstr[0] "%d artikkeli valittu"
 msgstr[1] "%d artikkelia valittu"
 
-#: js/viewfeed.js:1286
+#: js/viewfeed.js:1288
 msgid "No article is selected."
 msgstr "Yhtään artikkelia ei ole valittuna."
 
-#: js/viewfeed.js:1321
+#: js/viewfeed.js:1323
 msgid "No articles found to mark"
 msgstr "Artikkeleita ei ole merkittäväksi"
 
-#: js/viewfeed.js:1323
+#: js/viewfeed.js:1325
 msgid "Mark %d article as read?"
 msgid_plural "Mark %d articles as read?"
 msgstr[0] "Merkitäänkö %d artikkeli luetuksi?"
 msgstr[1] "Merkitäänkö %d artikkelia luetuiksi?"
 
-#~ msgid "Cache images locally"
-#~ msgstr "Tallenna kuvat välimuistiin"
+#~ msgid "Download more plugins at tt-rss.org <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forums</a> or <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a>."
+#~ msgstr "Lataa lisää lisäosia tt-rss.org:n <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">foorumeilta</a> tai <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wikistä</a>."
+
+#~ msgid "Linked"
+#~ msgstr "Linkitetty"
+
+#~ msgid "Last connected"
+#~ msgstr "Viimeksi yhteydessä"
+
+#~ msgid "Status"
+#~ msgstr "Tila"
+
+#~ msgid "Stored feeds"
+#~ msgstr "Talletetut syötteet"
+
+#~ msgid "Create link"
+#~ msgstr "Luo linkki"
+
+#~ msgid "No instances are selected."
+#~ msgstr "Ei valittuja instansseja."
+
+#~ msgid "Please select only one instance."
+#~ msgstr "Valitse vain yksi instanssi."
 
 #~ msgid "The error will be reported to the configured log destination."
 #~ msgstr "Virhe lähetetään konfiguroituun lokikohteeseen."
diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index 7a0374fa9..0d5b5788f 100644
--- a/locale/fr_FR/LC_MESSAGES/messages.mo
+++ b/locale/fr_FR/LC_MESSAGES/messages.mo
diff --git a/locale/fr_FR/LC_MESSAGES/messages.po b/locale/fr_FR/LC_MESSAGES/messages.po
index 5ce6c7784..f3d487743 100644
--- a/locale/fr_FR/LC_MESSAGES/messages.po
+++ b/locale/fr_FR/LC_MESSAGES/messages.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tiny Tiny RSS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 15:25+0300\n"
+"POT-Creation-Date: 2017-07-04 16:29+0300\n"
 "PO-Revision-Date: 2015-11-30 09:29+0100\n"
 "Last-Translator: Raphael Rochet <[email protected]>\n"
 "Language-Team: French\n"
@@ -171,31 +171,30 @@ msgstr "Plugin non trouvé"
 #: prefs.php:118
 #: classes/backend.php:5
 #: classes/pref/labels.php:282
-#: classes/pref/feeds.php:1402
-#: classes/pref/filters.php:779
+#: classes/pref/filters.php:819
+#: classes/pref/feeds.php:1376
 #: js/feedlist.js:149
-#: js/functions.js:1131
-#: js/functions.js:1231
-#: js/functions.js:1478
+#: js/functions.js:1210
+#: js/functions.js:1457
 #: js/prefs.js:621
-#: js/prefs.js:818
-#: js/prefs.js:1648
-#: js/prefs.js:1663
-#: js/tt-rss.js:550
-#: js/viewfeed.js:1182
+#: js/prefs.js:813
+#: js/prefs.js:1644
+#: js/prefs.js:1659
+#: js/tt-rss.js:551
+#: js/viewfeed.js:1184
 #: plugins/import_export/import_export.js:17
 #: js/feedlist.js:467
-#: js/feedlist.js:512
+#: js/feedlist.js:515
 #: js/functions.js:372
 #: js/functions.js:630
-#: js/prefs.js:1360
-#: js/prefs.js:1413
-#: js/prefs.js:1452
-#: js/prefs.js:1465
-#: js/prefs.js:1476
-#: js/prefs.js:1491
-#: js/tt-rss.js:567
-#: js/viewfeed.js:762
+#: js/prefs.js:1356
+#: js/prefs.js:1409
+#: js/prefs.js:1448
+#: js/prefs.js:1461
+#: js/prefs.js:1472
+#: js/prefs.js:1487
+#: js/tt-rss.js:568
+#: js/viewfeed.js:764
 msgid "Loading, please wait..."
 msgstr "Chargement en cours, veuillez patienter..."
 
@@ -212,13 +211,13 @@ msgid "All Articles"
 msgstr "Tous les articles"
 
 #: index.php:192
-#: include/functions2.php:107
+#: include/functions.php:1181
 #: classes/feeds.php:110
 msgid "Starred"
 msgstr "Remarquables"
 
 #: index.php:193
-#: include/functions2.php:108
+#: include/functions.php:1182
 #: classes/feeds.php:111
 msgid "Published"
 msgstr "Publiés"
@@ -259,7 +258,7 @@ msgstr "Titre"
 
 #: index.php:209
 #: index.php:249
-#: include/functions2.php:95
+#: include/functions.php:1169
 #: classes/feeds.php:115
 #: js/FeedTree.js:138
 #: js/FeedTree.js:166
@@ -299,7 +298,7 @@ msgid "Feed actions:"
 msgstr "Actions sur ce flux :"
 
 #: index.php:244
-#: classes/handler/public.php:672
+#: classes/handler/public.php:583
 msgid "Subscribe to feed..."
 msgstr "S'abonner au flux..."
 
@@ -313,8 +312,8 @@ msgstr "Recalculer le score du flux"
 
 #: index.php:247
 #: classes/pref/feeds.php:785
-#: classes/pref/feeds.php:1357
-#: js/PrefFeedTree.js:78
+#: classes/pref/feeds.php:1331
+#: js/PrefFeedTree.js:80
 msgid "Unsubscribe"
 msgstr "Se désabonner"
 
@@ -331,7 +330,7 @@ msgid "Other actions:"
 msgstr "Autres actions :"
 
 #: index.php:252
-#: include/functions2.php:81
+#: include/functions.php:1155
 msgid "Toggle widescreen mode"
 msgstr "Basculer le mode écran large"
 
@@ -357,7 +356,7 @@ msgstr "Des mises à jour sont disponible via Git"
 
 #: prefs.php:33
 #: prefs.php:136
-#: include/functions2.php:110
+#: include/functions.php:1184
 #: classes/pref/prefs.php:435
 msgid "Preferences"
 msgstr "Configuration"
@@ -372,20 +371,19 @@ msgstr "Quitter la configuration"
 
 #: prefs.php:139
 #: classes/pref/feeds.php:112
-#: classes/pref/feeds.php:1297
-#: classes/pref/feeds.php:1346
+#: classes/pref/feeds.php:1271
+#: classes/pref/feeds.php:1320
 msgid "Feeds"
 msgstr "Flux"
 
 #: prefs.php:142
-#: classes/pref/filters.php:248
+#: classes/pref/filters.php:273
 msgid "Filters"
 msgstr "Filtres"
 
 #: prefs.php:145
-#: include/functions.php:1327
-#: include/functions.php:1979
 #: classes/pref/labels.php:90
+#: classes/feeds.php:1718
 msgid "Labels"
 msgstr "Etiquettes"
 
@@ -414,13 +412,13 @@ msgstr "L'inscription de nouveaux utilisateurs est désactivée par l'administra
 #: register.php:337
 #: register.php:347
 #: register.php:359
-#: classes/handler/public.php:742
-#: classes/handler/public.php:813
-#: classes/handler/public.php:911
-#: classes/handler/public.php:990
-#: classes/handler/public.php:1004
-#: classes/handler/public.php:1011
-#: classes/handler/public.php:1036
+#: classes/handler/public.php:653
+#: classes/handler/public.php:724
+#: classes/handler/public.php:822
+#: classes/handler/public.php:901
+#: classes/handler/public.php:915
+#: classes/handler/public.php:922
+#: classes/handler/public.php:947
 msgid "Return to Tiny Tiny RSS"
 msgstr "Revenir à Tiny Tiny RSS"
 
@@ -437,12 +435,12 @@ msgid "Check availability"
 msgstr "Vérifier la disponibilité"
 
 #: register.php:229
-#: classes/handler/public.php:829
+#: classes/handler/public.php:740
 msgid "Email:"
 msgstr "Adresse mail :"
 
 #: register.php:232
-#: classes/handler/public.php:834
+#: classes/handler/public.php:745
 msgid "How much is two plus two:"
 msgstr "Combien font 2 plus 2 :"
 
@@ -470,17 +468,23 @@ msgstr "Compte créé avec succès."
 msgid "New user registrations are currently closed."
 msgstr "L'inscription de nouveaux utilisateurs est actuellement fermée."
 
-#: update.php:67
+#: update.php:66
 msgid "Tiny Tiny RSS data update script."
 msgstr "Script de mise à jour des données de Tiny Tiny RSS."
 
-#: include/digest.php:109
-#: include/functions.php:1336
-#: include/functions.php:1880
-#: include/functions.php:1965
-#: include/functions.php:1987
-#: classes/opml.php:421
+#: include/controls.php:83
+#: classes/pref/filters.php:242
+#: classes/pref/filters.php:253
+#: classes/pref/filters.php:544
+msgid "All feeds"
+msgstr "Tous les flux"
+
+#: include/controls.php:134
+#: include/controls.php:316
 #: classes/pref/feeds.php:228
+#: classes/opml.php:486
+#: classes/feeds.php:1727
+#: classes/digest.php:113
 msgid "Uncategorized"
 msgstr "Sans catégorie"
 
@@ -495,390 +499,286 @@ msgstr[1] "%d articles archivés"
 msgid "No feeds found."
 msgstr "Aucun flux trouvé."
 
-#: include/functions.php:1029
+#: include/functions.php:900
 #, php-format
 msgid "%d min"
 msgstr "%d min"
 
-#: include/functions.php:1325
-#: include/functions.php:1977
-msgid "Special"
-msgstr "Spécial"
-
-#: include/functions.php:1828
-#: classes/pref/filters.php:229
-#: classes/pref/filters.php:507
-msgid "All feeds"
-msgstr "Tous les flux"
-
-#: include/functions.php:2032
-msgid "Starred articles"
-msgstr "Articles remarquables"
-
-#: include/functions.php:2034
-msgid "Published articles"
-msgstr "Articles publiés"
-
-#: include/functions.php:2036
-msgid "Fresh articles"
-msgstr "Nouveaux articles"
-
-#: include/functions.php:2038
-#: include/functions2.php:105
-msgid "All articles"
-msgstr "Tous les articles"
-
-#: include/functions.php:2040
-msgid "Archived articles"
-msgstr "Articles archivés"
-
-#: include/functions.php:2042
-msgid "Recently read"
-msgstr "Lus récemment"
-
-#: include/functions2.php:57
+#: include/functions.php:1131
 msgid "Navigation"
 msgstr "Navigation"
 
-#: include/functions2.php:58
+#: include/functions.php:1132
 msgid "Open next feed"
 msgstr "Ouvrir le flux suivant"
 
-#: include/functions2.php:59
+#: include/functions.php:1133
 msgid "Open previous feed"
 msgstr "Ouvrir le flux précédent"
 
-#: include/functions2.php:60
+#: include/functions.php:1134
 msgid "Open next article"
 msgstr "Ouvrir l'article suivant"
 
-#: include/functions2.php:61
+#: include/functions.php:1135
 msgid "Open previous article"
 msgstr "Ouvrir l'article précédent"
 
-#: include/functions2.php:62
+#: include/functions.php:1136
 msgid "Open next article (don't scroll long articles)"
 msgstr "Ouvrir l'article suivant (ne pas faire défiler les articles longs)"
 
-#: include/functions2.php:63
+#: include/functions.php:1137
 msgid "Open previous article (don't scroll long articles)"
 msgstr "Ouvrir l'article précédent (ne pas faire défiler les articles longs)"
 
-#: include/functions2.php:64
+#: include/functions.php:1138
 msgid "Move to next article (don't expand or mark read)"
 msgstr "Aller à l'article suivant (ne pas développer ou marqué lu)"
 
-#: include/functions2.php:65
+#: include/functions.php:1139
 msgid "Move to previous article (don't expand or mark read)"
 msgstr "Aller à l'article précédent (ne pas développer ou marqué lu)"
 
-#: include/functions2.php:66
+#: include/functions.php:1140
 msgid "Show search dialog"
 msgstr "Afficher la fenêtre de recherche"
 
-#: include/functions2.php:67
+#: include/functions.php:1141
 msgid "Article"
 msgstr "Article"
 
-#: include/functions2.php:68
-#: js/viewfeed.js:1699
+#: include/functions.php:1142
+#: js/viewfeed.js:1701
 msgid "Toggle starred"
 msgstr "Marquer comme (non) remarquable"
 
-#: include/functions2.php:69
-#: js/viewfeed.js:1711
+#: include/functions.php:1143
+#: js/viewfeed.js:1713
 msgid "Toggle published"
 msgstr "Marquer comme (non) publié"
 
-#: include/functions2.php:70
-#: js/viewfeed.js:1686
+#: include/functions.php:1144
+#: js/viewfeed.js:1688
 msgid "Toggle unread"
 msgstr "Marquer comme (non) lu"
 
-#: include/functions2.php:71
+#: include/functions.php:1145
 msgid "Edit tags"
 msgstr "Modifier les tags"
 
-#: include/functions2.php:72
+#: include/functions.php:1146
 msgid "Open in new window"
 msgstr "Ouvrir dans une nouvelle fenêtre"
 
-#: include/functions2.php:73
-#: js/viewfeed.js:1732
+#: include/functions.php:1147
+#: js/viewfeed.js:1734
 msgid "Mark below as read"
 msgstr "Marquer les articles en-dessous comme lus"
 
-#: include/functions2.php:74
-#: js/viewfeed.js:1725
+#: include/functions.php:1148
+#: js/viewfeed.js:1727
 msgid "Mark above as read"
 msgstr "Marquer les articles au-dessus comme lus"
 
-#: include/functions2.php:75
+#: include/functions.php:1149
 msgid "Scroll down"
 msgstr "Défiler vers le bas"
 
-#: include/functions2.php:76
+#: include/functions.php:1150
 msgid "Scroll up"
 msgstr "Défiler vers le haut"
 
-#: include/functions2.php:77
+#: include/functions.php:1151
 msgid "Select article under cursor"
 msgstr "Sélectionner l'article sous le curseur"
 
-#: include/functions2.php:78
+#: include/functions.php:1152
 msgid "Email article"
 msgstr "Envoyer l'article par mail"
 
-#: include/functions2.php:79
+#: include/functions.php:1153
 msgid "Close/collapse article"
 msgstr "Contracter l'article"
 
-#: include/functions2.php:80
+#: include/functions.php:1154
 msgid "Toggle article expansion (combined mode)"
 msgstr "Basculer le développement (mode combiné)"
 
-#: include/functions2.php:82
+#: include/functions.php:1156
 #: plugins/embed_original/init.php:31
 msgid "Toggle embed original"
 msgstr "Basculer l'intégration de l'article original"
 
-#: include/functions2.php:83
+#: include/functions.php:1157
 msgid "Article selection"
 msgstr "Sélection d'article"
 
-#: include/functions2.php:84
+#: include/functions.php:1158
 msgid "Select all articles"
 msgstr "Sélectionner tous les articles"
 
-#: include/functions2.php:85
+#: include/functions.php:1159
 msgid "Select unread"
 msgstr "Sélectionner les articles non-lus"
 
-#: include/functions2.php:86
+#: include/functions.php:1160
 msgid "Select starred"
 msgstr "Sélectionner les articles remarquables"
 
-#: include/functions2.php:87
+#: include/functions.php:1161
 msgid "Select published"
 msgstr "Sélectionner les articles publiés"
 
-#: include/functions2.php:88
+#: include/functions.php:1162
 msgid "Invert selection"
 msgstr "Inverser la sélection"
 
-#: include/functions2.php:89
+#: include/functions.php:1163
 msgid "Deselect everything"
 msgstr "Tout désélectionner"
 
-#: include/functions2.php:90
+#: include/functions.php:1164
 #: classes/pref/feeds.php:555
-#: classes/pref/feeds.php:823
+#: classes/pref/feeds.php:811
 msgid "Feed"
 msgstr "Flux"
 
-#: include/functions2.php:91
+#: include/functions.php:1165
 msgid "Refresh current feed"
 msgstr "Actualiser le flux actif"
 
-#: include/functions2.php:92
+#: include/functions.php:1166
 msgid "Un/hide read feeds"
 msgstr "Masquer/afficher les flux lus"
 
-#: include/functions2.php:93
-#: classes/pref/feeds.php:1349
+#: include/functions.php:1167
+#: classes/pref/feeds.php:1323
 msgid "Subscribe to feed"
 msgstr "S'abonner au flux"
 
-#: include/functions2.php:94
+#: include/functions.php:1168
 #: js/FeedTree.js:145
-#: js/PrefFeedTree.js:72
-#: js/viewfeed.js:1853
+#: js/PrefFeedTree.js:74
+#: js/viewfeed.js:1855
 msgid "Edit feed"
 msgstr "Modifier le flux"
 
-#: include/functions2.php:96
+#: include/functions.php:1170
 msgid "Reverse headlines"
 msgstr "Inverser l'ordre des en-têtes"
 
-#: include/functions2.php:97
+#: include/functions.php:1171
 msgid "Toggle headline grouping"
 msgstr ""
 
-#: include/functions2.php:98
+#: include/functions.php:1172
 msgid "Debug feed update"
 msgstr "Déboguer les mises à jour"
 
-#: include/functions2.php:99
+#: include/functions.php:1173
 msgid "Debug viewfeed()"
 msgstr "Déboguer viewfeed()"
 
-#: include/functions2.php:100
+#: include/functions.php:1174
 #: js/FeedTree.js:194
 msgid "Mark all feeds as read"
 msgstr "Marquer tous les flux comme lus"
 
-#: include/functions2.php:101
+#: include/functions.php:1175
 msgid "Un/collapse current category"
 msgstr "Étendre/contracter la catégorie"
 
-#: include/functions2.php:102
+#: include/functions.php:1176
 msgid "Toggle combined mode"
 msgstr "Basculer le mode combiné"
 
-#: include/functions2.php:103
+#: include/functions.php:1177
 msgid "Toggle auto expand in combined mode"
 msgstr "Basculer le développement automatique en mode combiné"
 
-#: include/functions2.php:104
+#: include/functions.php:1178
 msgid "Go to"
 msgstr "Aller à"
 
-#: include/functions2.php:106
+#: include/functions.php:1179
+#: classes/feeds.php:1602
+msgid "All articles"
+msgstr "Tous les articles"
+
+#: include/functions.php:1180
 msgid "Fresh"
 msgstr "Nouveaux"
 
-#: include/functions2.php:109
-#: js/tt-rss.js:494
-#: js/tt-rss.js:663
+#: include/functions.php:1183
+#: js/tt-rss.js:495
+#: js/tt-rss.js:664
 msgid "Tag cloud"
 msgstr "Nuage de tags"
 
-#: include/functions2.php:111
+#: include/functions.php:1185
 msgid "Other"
 msgstr "Autre"
 
-#: include/functions2.php:112
+#: include/functions.php:1186
 #: classes/pref/labels.php:267
 msgid "Create label"
 msgstr "Créer une étiquette"
 
-#: include/functions2.php:113
-#: classes/pref/filters.php:753
+#: include/functions.php:1187
+#: classes/pref/filters.php:793
 msgid "Create filter"
 msgstr "Créer un filtre"
 
-#: include/functions2.php:114
+#: include/functions.php:1188
 msgid "Un/collapse sidebar"
 msgstr "Ouvrir/fermer la barre latérale"
 
-#: include/functions2.php:115
+#: include/functions.php:1189
 msgid "Show help dialog"
 msgstr "Afficher la fenêtre d'aide"
 
-#: include/functions2.php:670
-#, php-format
-msgid "Search results: %s"
-msgstr "Résultats de recherche : %s"
-
-#: include/functions2.php:1336
-#: classes/feeds.php:752
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] "Commentaire"
-msgstr[1] "Commentaires"
-
-#: include/functions2.php:1340
-#: classes/feeds.php:756
-msgid "comments"
-msgstr "Commentaires"
-
-#: include/functions2.php:1366
-msgid " - "
-msgstr " - "
-
-#: include/functions2.php:1397
-#: include/functions2.php:1648
-#: classes/article.php:311
-msgid "no tags"
-msgstr "aucun tag"
-
-#: include/functions2.php:1407
-#: classes/feeds.php:738
-msgid "Edit tags for this article"
-msgstr "Modifier les tags pour cet article"
-
-#: include/functions2.php:1439
-#: classes/feeds.php:690
-msgid "Originally from:"
-msgstr "Origine :"
-
-#: include/functions2.php:1452
-#: classes/pref/feeds.php:574
-#: classes/feeds.php:703
-msgid "Feed URL"
-msgstr "URL du flux"
-
-#: include/functions2.php:1489
-#: classes/backend.php:105
-#: classes/dlg.php:37
-#: classes/dlg.php:60
-#: classes/dlg.php:93
-#: classes/dlg.php:159
-#: classes/dlg.php:186
-#: classes/pref/feeds.php:1652
-#: classes/pref/feeds.php:1718
-#: classes/pref/filters.php:204
-#: classes/pref/prefs.php:1097
-#: plugins/af_psql_trgm/init.php:102
-#: plugins/import_export/init.php:415
-#: plugins/import_export/init.php:461
-#: plugins/share/init.php:121
-msgid "Close this window"
-msgstr "Fermer cette fenêtre"
-
-#: include/functions2.php:1686
-msgid "(edit note)"
-msgstr "(modifier l'annotation)"
-
-#: include/functions2.php:1960
-msgid "unknown type"
-msgstr "type inconnu"
-
-#: include/functions2.php:2037
-msgid "Attachments"
-msgstr "Fichier attaché"
-
-#: include/functions2.php:2496
+#: include/functions.php:2456
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: include/functions2.php:2497
+#: include/functions.php:2457
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: include/functions2.php:2498
+#: include/functions.php:2458
 msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
 msgstr ""
 
-#: include/functions2.php:2499
+#: include/functions.php:2459
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: include/functions2.php:2500
+#: include/functions.php:2460
 #, fuzzy
 msgid "No file was uploaded"
 msgstr "Aucun fichier envoyé."
 
-#: include/functions2.php:2501
+#: include/functions.php:2461
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: include/functions2.php:2502
+#: include/functions.php:2462
 msgid "Failed to write file to disk."
 msgstr ""
 
-#: include/functions2.php:2503
+#: include/functions.php:2463
 msgid "A PHP extension stopped the file upload."
 msgstr ""
 
 #: include/login_form.php:197
-#: classes/handler/public.php:569
-#: classes/handler/public.php:824
+#: classes/handler/public.php:480
+#: classes/handler/public.php:735
 msgid "Login:"
 msgstr "Identifiant :"
 
 #: include/login_form.php:207
-#: classes/handler/public.php:572
+#: classes/handler/public.php:483
 msgid "Password:"
 msgstr "Mot de passe :"
 
@@ -891,7 +791,7 @@ msgid "Profile:"
 msgstr "Profil :"
 
 #: include/login_form.php:223
-#: classes/handler/public.php:311
+#: classes/handler/public.php:287
 #: classes/pref/prefs.php:1035
 #: classes/rpc.php:63
 msgid "Default profile"
@@ -910,7 +810,7 @@ msgid "Remember me"
 msgstr "Se souvenir de moi"
 
 #: include/login_form.php:249
-#: classes/handler/public.php:577
+#: classes/handler/public.php:488
 msgid "Log in"
 msgstr "Se connecter"
 
@@ -926,145 +826,44 @@ msgstr "Échec de la validation de la session (utilisateur introuvable)"
 msgid "Session failed to validate (password changed)"
 msgstr "Échec de la validation de la session (mot de passe changé)"
 
-#: classes/article.php:25
-msgid "Article not found."
-msgstr "Article non trouvé."
-
-#: classes/article.php:197
-msgid "Tags for this article (separated by commas):"
-msgstr "Tags pour cet article (séparés par des virgules) :"
-
-#: classes/article.php:222
-#: classes/pref/labels.php:79
-#: classes/pref/users.php:98
-#: classes/pref/feeds.php:801
-#: classes/pref/feeds.php:943
-#: classes/pref/filters.php:485
-#: classes/pref/prefs.php:981
-#: plugins/instances/init.php:245
-#: plugins/nsfw/init.php:85
-#: plugins/note/init.php:51
-#: plugins/af_readability/init.php:68
-#: plugins/af_redditimgur/init.php:60
-#: plugins/af_psql_trgm/init.php:181
-#: plugins/mail/init.php:64
-#: plugins/af_zz_imgproxy/init.php:213
-msgid "Save"
-msgstr "Enregistrer"
-
-#: classes/article.php:224
-#: classes/handler/public.php:546
-#: classes/handler/public.php:580
-#: classes/pref/labels.php:81
-#: classes/pref/users.php:100
-#: classes/pref/feeds.php:802
-#: classes/pref/feeds.php:946
-#: classes/pref/feeds.php:1859
-#: classes/pref/filters.php:488
-#: classes/pref/filters.php:902
-#: classes/pref/filters.php:983
-#: classes/pref/filters.php:1076
-#: classes/pref/prefs.php:983
-#: classes/feeds.php:1105
-#: classes/feeds.php:1155
-#: classes/feeds.php:1192
-#: plugins/instances/init.php:248
-#: plugins/instances/init.php:436
-#: plugins/note/init.php:53
-#: plugins/mail/init.php:173
-msgid "Cancel"
-msgstr "Annuler"
-
-#: classes/opml.php:28
-#: classes/opml.php:33
-msgid "OPML Utility"
-msgstr "Outil OPML"
-
-#: classes/opml.php:37
-msgid "Importing OPML..."
-msgstr "Import OPML en cours..."
-
-#: classes/opml.php:41
-msgid "Return to preferences"
-msgstr "Revenir à la configuration"
-
-#: classes/opml.php:271
-#, php-format
-msgid "Adding feed: %s"
-msgstr "Ajout du flux : %s"
-
-#: classes/opml.php:282
-#, php-format
-msgid "Duplicate feed: %s"
-msgstr "Flux en doublon : %s"
-
-#: classes/opml.php:296
-#, php-format
-msgid "Adding label %s"
-msgstr "Ajout de l'étiquette %s"
-
-#: classes/opml.php:299
-#, php-format
-msgid "Duplicate label: %s"
-msgstr "Étiquette en doublon: %s"
-
-#: classes/opml.php:311
-#, php-format
-msgid "Setting preference key %s to %s"
-msgstr "Paramétrage de la préférence %s à %s"
-
-#: classes/opml.php:343
-msgid "Adding filter..."
-msgstr "Créer un filtre..."
-
-#: classes/opml.php:421
-#, php-format
-msgid "Processing category: %s"
-msgstr "Placer dans la catégorie : %s"
-
-#: classes/opml.php:470
-#, php-format
-msgid "Upload failed with error code %d"
-msgstr "Échec de l'envoi, code d'erreur %d"
-
-#: classes/opml.php:484
-#: plugins/import_export/init.php:442
-msgid "Unable to move uploaded file."
-msgstr "Impossible de déplacer le fichier envoyé."
-
-#: classes/opml.php:488
-#: plugins/import_export/init.php:446
-msgid "Error: please upload OPML file."
-msgstr "Erreur : veuillez envoyer un document OPML."
-
-#: classes/opml.php:499
-msgid "Error: unable to find moved OPML file."
-msgstr "Erreur : impossible de trouver le fichier OPML déplacé."
-
-#: classes/opml.php:506
-msgid "Error while parsing document."
-msgstr "Erreur lors de l'analyse du document."
-
-#: classes/backend.php:33
+#: classes/backend.php:31
 msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
 msgstr "D'autres astuces sur l'interface sont disponibles sur le wiki de Tiny Tiny RSS."
 
-#: classes/backend.php:38
+#: classes/backend.php:36
 msgid "Keyboard Shortcuts"
 msgstr "Raccourcis clavier"
 
-#: classes/backend.php:61
+#: classes/backend.php:59
 msgid "Shift"
 msgstr "Maj"
 
-#: classes/backend.php:64
+#: classes/backend.php:62
 msgid "Ctrl"
 msgstr "Ctrl"
 
-#: classes/backend.php:99
+#: classes/backend.php:97
 msgid "Help topic not found."
 msgstr "Sujet non trouvé dans l'aide."
 
+#: classes/backend.php:103
+#: classes/dlg.php:37
+#: classes/dlg.php:60
+#: classes/dlg.php:93
+#: classes/dlg.php:159
+#: classes/dlg.php:186
+#: classes/article.php:744
+#: classes/pref/filters.php:206
+#: classes/pref/prefs.php:1097
+#: classes/pref/feeds.php:1626
+#: classes/pref/feeds.php:1692
+#: plugins/import_export/init.php:421
+#: plugins/import_export/init.php:467
+#: plugins/af_psql_trgm/init.php:102
+#: plugins/share/init.php:120
+msgid "Close this window"
+msgstr "Fermer cette fenêtre"
+
 #: classes/dlg.php:17
 msgid "If you have imported labels and/or filters, you might need to reload preferences to see your new data."
 msgstr "Si vous avez importé des étiquettes et/ou des filtres, vous devrez peut-être recharger les préférences pour voir les nouvelles données."
@@ -1075,7 +874,7 @@ msgstr "Votre URL OPML publique est :"
 
 #: classes/dlg.php:57
 #: classes/dlg.php:183
-#: plugins/share/init.php:118
+#: plugins/share/init.php:117
 msgid "Generate new URL"
 msgstr "Générer une nouvelle URL"
 
@@ -1096,128 +895,222 @@ msgstr "Le démon de mise à jour prend trop de temps pour effectuer une mise à
 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/handler/public.php:510
+#: classes/article.php:25
+msgid "Article not found."
+msgstr "Article non trouvé."
+
+#: classes/article.php:197
+msgid "Tags for this article (separated by commas):"
+msgstr "Tags pour cet article (séparés par des virgules) :"
+
+#: classes/article.php:222
+#: classes/pref/labels.php:79
+#: classes/pref/filters.php:519
+#: classes/pref/users.php:98
+#: classes/pref/prefs.php:981
+#: classes/pref/feeds.php:789
+#: classes/pref/feeds.php:931
+#: plugins/af_psql_trgm/init.php:181
+#: plugins/nsfw/init.php:85
+#: plugins/af_readability/init.php:68
+#: plugins/mail/init.php:64
+#: plugins/af_redditimgur/init.php:60
+#: plugins/note/init.php:51
+#: plugins/af_zz_imgproxy/init.php:240
+msgid "Save"
+msgstr "Enregistrer"
+
+#: classes/article.php:224
+#: classes/handler/public.php:457
+#: classes/handler/public.php:491
+#: classes/pref/labels.php:81
+#: classes/pref/filters.php:522
+#: classes/pref/filters.php:942
+#: classes/pref/filters.php:1022
+#: classes/pref/filters.php:1115
+#: classes/pref/users.php:100
+#: classes/pref/prefs.php:983
+#: classes/pref/feeds.php:790
+#: classes/pref/feeds.php:934
+#: classes/pref/feeds.php:1833
+#: classes/feeds.php:1098
+#: classes/feeds.php:1148
+#: classes/feeds.php:1185
+#: plugins/mail/init.php:173
+#: plugins/note/init.php:53
+msgid "Cancel"
+msgstr "Annuler"
+
+#: classes/article.php:311
+#: classes/article.php:652
+#: classes/article.php:805
+msgid "no tags"
+msgstr "aucun tag"
+
+#: classes/article.php:419
+msgid "unknown type"
+msgstr "type inconnu"
+
+#: classes/article.php:496
+msgid "Attachments"
+msgstr "Fichier attaché"
+
+#: classes/article.php:591
+#: classes/feeds.php:741
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] "Commentaire"
+msgstr[1] "Commentaires"
+
+#: classes/article.php:595
+#: classes/feeds.php:745
+msgid "comments"
+msgstr "Commentaires"
+
+#: classes/article.php:621
+msgid " - "
+msgstr " - "
+
+#: classes/article.php:662
+#: classes/feeds.php:727
+msgid "Edit tags for this article"
+msgstr "Modifier les tags pour cet article"
+
+#: classes/article.php:694
+#: classes/feeds.php:681
+msgid "Originally from:"
+msgstr "Origine :"
+
+#: classes/article.php:707
+#: classes/pref/feeds.php:574
+#: classes/feeds.php:694
+msgid "Feed URL"
+msgstr "URL du flux"
+
+#: classes/article.php:843
+msgid "(edit note)"
+msgstr "(modifier l'annotation)"
+
+#: classes/handler/public.php:421
 #: plugins/bookmarklets/init.php:40
 msgid "Share with Tiny Tiny RSS"
 msgstr "Partager avec Tiny Tiny RSS"
 
-#: classes/handler/public.php:518
+#: classes/handler/public.php:429
 msgid "Title:"
 msgstr "Titre :"
 
-#: classes/handler/public.php:520
+#: classes/handler/public.php:431
 #: classes/pref/feeds.php:572
-#: plugins/instances/init.php:212
-#: plugins/instances/init.php:401
 msgid "URL:"
 msgstr "URL :"
 
-#: classes/handler/public.php:522
+#: classes/handler/public.php:433
 msgid "Content:"
 msgstr "Contenu :"
 
-#: classes/handler/public.php:524
+#: classes/handler/public.php:435
 msgid "Labels:"
 msgstr "Étiquettes :"
 
-#: classes/handler/public.php:543
+#: classes/handler/public.php:454
 msgid "Shared article will appear in the Published feed."
 msgstr "Les articles partagés apparaîtront dans le flux Publiés."
 
-#: classes/handler/public.php:545
+#: classes/handler/public.php:456
 msgid "Share"
 msgstr "Partager"
 
-#: classes/handler/public.php:567
+#: classes/handler/public.php:478
 msgid "Not logged in"
 msgstr "Non connecté"
 
-#: classes/handler/public.php:626
+#: classes/handler/public.php:537
 msgid "Incorrect username or password"
 msgstr "Identifiant ou mot de passe incorrect"
 
-#: classes/handler/public.php:678
+#: classes/handler/public.php:589
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "Déjà abonné à <b>%s</b>."
 
-#: classes/handler/public.php:681
+#: classes/handler/public.php:592
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "Abonné à <b>%s</b>."
 
-#: classes/handler/public.php:684
+#: classes/handler/public.php:595
 #, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "Impossible de s'abonner à <b>%s</b>."
 
-#: classes/handler/public.php:687
+#: classes/handler/public.php:598
 #, php-format
 msgid "No feeds found in <b>%s</b>."
 msgstr "Aucun flux trouvé dans <b>%s</b>."
 
-#: classes/handler/public.php:690
+#: classes/handler/public.php:601
 msgid "Multiple feed URLs found."
 msgstr "Plusieurs flux trouvés."
 
-#: classes/handler/public.php:694
+#: classes/handler/public.php:605
 #, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr "Impossible de s'abonner à <b>%s</b>.<br>Impossible de télécharger l'URL du flux."
 
-#: classes/handler/public.php:712
+#: classes/handler/public.php:623
 msgid "Subscribe to selected feed"
 msgstr "S'abonner au flux sélectionné"
 
-#: classes/handler/public.php:737
+#: classes/handler/public.php:648
 msgid "Edit subscription options"
 msgstr "Modifier les options d'abonnement"
 
-#: classes/handler/public.php:774
+#: classes/handler/public.php:685
 msgid "Password recovery"
 msgstr "Récupération de mot de passe"
 
-#: classes/handler/public.php:817
+#: classes/handler/public.php:728
 msgid "You will need to provide valid account name and email. A password reset link will be sent to your email address."
 msgstr "Vous devrez fournir un nom et une adresse email valides. Un lien pour réinitialiser votre mot de passe sera envoyé à votre adresse email."
 
-#: classes/handler/public.php:839
-#: classes/pref/users.php:350
+#: classes/handler/public.php:750
+#: classes/pref/users.php:349
 msgid "Reset password"
 msgstr "Réinitialiser le mot de passe"
 
-#: classes/handler/public.php:849
+#: classes/handler/public.php:760
 msgid "Some of the required form parameters are missing or incorrect."
 msgstr "Des paramètres du formulaire manquent ou sont invalides."
 
-#: classes/handler/public.php:853
-#: classes/handler/public.php:919
+#: classes/handler/public.php:764
+#: classes/handler/public.php:830
 msgid "Go back"
 msgstr "Revenir"
 
-#: classes/handler/public.php:890
+#: classes/handler/public.php:801
 msgid "[tt-rss] Password reset request"
 msgstr "[tt-rss] Demande de réinitialisation de mot de passe"
 
-#: classes/handler/public.php:915
+#: classes/handler/public.php:826
 msgid "Sorry, login and email combination not found."
 msgstr "Désolé, ce couple identifiant et mail n'a pas été trouvé."
 
-#: classes/handler/public.php:937
+#: classes/handler/public.php:848
 msgid "Your access level is insufficient to run this script."
 msgstr "Vous n'avez pas les permissions nécessaires pour exécuter ce script."
 
-#: classes/handler/public.php:963
+#: classes/handler/public.php:874
 msgid "Database Updater"
 msgstr "Outil de mise à jour de la base de données"
 
-#: classes/handler/public.php:1028
+#: classes/handler/public.php:939
 msgid "Perform updates"
 msgstr "Exécuter les mises à jour"
 
 #: classes/pref/labels.php:22
-#: classes/pref/filters.php:348
-#: classes/pref/filters.php:823
+#: classes/pref/filters.php:373
+#: classes/pref/filters.php:863
 msgid "Caption"
 msgstr "Légende"
 
@@ -1239,59 +1132,55 @@ msgid "Created label <b>%s</b>"
 msgstr "Étiquette <b>%s</b> créé"
 
 #: classes/pref/labels.php:258
-#: classes/pref/users.php:334
-#: classes/pref/feeds.php:1337
-#: classes/pref/feeds.php:1600
-#: classes/pref/feeds.php:1664
-#: classes/pref/filters.php:359
-#: classes/pref/filters.php:407
-#: classes/pref/filters.php:744
-#: classes/pref/filters.php:832
-#: classes/pref/filters.php:859
+#: classes/pref/filters.php:384
+#: classes/pref/filters.php:441
+#: classes/pref/filters.php:784
+#: classes/pref/filters.php:872
+#: classes/pref/filters.php:899
+#: classes/pref/users.php:333
 #: classes/pref/prefs.php:992
-#: plugins/instances/init.php:284
+#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1574
+#: classes/pref/feeds.php:1638
 msgid "Select"
 msgstr "Sélectionner"
 
 #: classes/pref/labels.php:261
-#: classes/pref/users.php:337
-#: classes/pref/feeds.php:1340
-#: classes/pref/feeds.php:1603
-#: classes/pref/feeds.php:1667
-#: classes/pref/filters.php:362
-#: classes/pref/filters.php:410
-#: classes/pref/filters.php:747
-#: classes/pref/filters.php:835
-#: classes/pref/filters.php:862
+#: classes/pref/filters.php:387
+#: classes/pref/filters.php:444
+#: classes/pref/filters.php:787
+#: classes/pref/filters.php:875
+#: classes/pref/filters.php:902
+#: classes/pref/users.php:336
 #: classes/pref/prefs.php:995
+#: classes/pref/feeds.php:1314
+#: classes/pref/feeds.php:1577
+#: classes/pref/feeds.php:1641
 #: classes/feeds.php:102
-#: plugins/instances/init.php:287
 msgid "All"
 msgstr "Tout"
 
 #: classes/pref/labels.php:263
-#: classes/pref/users.php:339
-#: classes/pref/feeds.php:1342
-#: classes/pref/feeds.php:1605
-#: classes/pref/feeds.php:1669
-#: classes/pref/filters.php:364
-#: classes/pref/filters.php:412
-#: classes/pref/filters.php:749
-#: classes/pref/filters.php:837
-#: classes/pref/filters.php:864
+#: classes/pref/filters.php:389
+#: classes/pref/filters.php:446
+#: classes/pref/filters.php:789
+#: classes/pref/filters.php:877
+#: classes/pref/filters.php:904
+#: classes/pref/users.php:338
 #: classes/pref/prefs.php:997
+#: classes/pref/feeds.php:1316
+#: classes/pref/feeds.php:1579
+#: classes/pref/feeds.php:1643
 #: classes/feeds.php:105
-#: plugins/instances/init.php:289
 msgid "None"
 msgstr "Aucun"
 
 #: classes/pref/labels.php:270
-#: classes/pref/users.php:348
+#: classes/pref/filters.php:512
+#: classes/pref/filters.php:806
+#: classes/pref/users.php:347
 #: classes/pref/feeds.php:767
-#: classes/pref/filters.php:478
-#: classes/pref/filters.php:766
-#: classes/feeds.php:1154
-#: plugins/instances/init.php:294
+#: classes/feeds.php:1147
 msgid "Remove"
 msgstr "Supprimer"
 
@@ -1299,9 +1188,167 @@ msgstr "Supprimer"
 msgid "Clear colors"
 msgstr "Ré-initialiser les couleurs"
 
+#: classes/pref/filters.php:153
+msgid "Preview article"
+msgstr "Prévisualiser l'article"
+
+#: classes/pref/filters.php:264
+#: classes/pref/filters.php:558
+msgid "(inverse)"
+msgstr "(inversé)"
+
+#: classes/pref/filters.php:260
+#: classes/pref/filters.php:557
+#, php-format
+msgid "%s on %s in %s %s"
+msgstr "%s sur %s dans %s %s"
+
+#: classes/pref/filters.php:379
+#: classes/pref/filters.php:867
+#: classes/pref/filters.php:981
+msgid "Match"
+msgstr "Correspondance"
+
+#: classes/pref/filters.php:393
+#: classes/pref/filters.php:450
+#: classes/pref/filters.php:881
+#: classes/pref/filters.php:908
+msgid "Add"
+msgstr "Ajouter"
+
+#: classes/pref/filters.php:396
+#: classes/pref/filters.php:453
+#: classes/pref/filters.php:884
+#: classes/pref/filters.php:911
+#: classes/feeds.php:122
+msgid "Delete"
+msgstr "Supprimer"
+
+#: classes/pref/filters.php:436
+#: classes/pref/filters.php:894
+msgid "Apply actions"
+msgstr "Actions effectuées"
+
+#: classes/pref/filters.php:486
+#: classes/pref/filters.php:923
+msgid "Enabled"
+msgstr "Activé"
+
+#: classes/pref/filters.php:495
+#: classes/pref/filters.php:926
+msgid "Match any rule"
+msgstr "Au moins une correspondance"
+
+#: classes/pref/filters.php:504
+#: classes/pref/filters.php:929
+msgid "Inverse matching"
+msgstr "Correspondance inverse"
+
+#: classes/pref/filters.php:516
+#: classes/pref/filters.php:936
+msgid "Test"
+msgstr "Test"
+
+#: classes/pref/filters.php:780
+#: classes/pref/users.php:323
+#: classes/pref/feeds.php:1307
+#: classes/feeds.php:1118
+#: classes/feeds.php:1184
+#: js/tt-rss.js:165
+msgid "Search"
+msgstr "Rechercher"
+
+#: classes/pref/filters.php:796
+msgid "Combine"
+msgstr "Combiner"
+
+#: classes/pref/filters.php:799
+#: classes/pref/users.php:345
+msgid "Edit"
+msgstr "Modifier"
+
+#: classes/pref/filters.php:802
+#: classes/pref/feeds.php:1327
+#: classes/pref/feeds.php:1341
+msgid "Reset sort order"
+msgstr "Réinitialiser le critère de tri"
+
+#: classes/pref/filters.php:810
+#: classes/pref/feeds.php:1363
+msgid "Rescore articles"
+msgstr "Recalculer le score des articles"
+
+#: classes/pref/filters.php:939
+msgid "Create"
+msgstr "Créer"
+
+#: classes/pref/filters.php:993
+msgid "Inverse regular expression matching"
+msgstr "Inverser le résultat de l'expression rationnelle"
+
+#: classes/pref/filters.php:995
+msgid "on field"
+msgstr "sur le champ"
+
+#: classes/pref/filters.php:1001
+#: js/PrefFilterTree.js:64
+msgid "in"
+msgstr "dans"
+
+#: classes/pref/filters.php:1014
+msgid "Wiki: Filters"
+msgstr "Filtres Wiki:"
+
+#: classes/pref/filters.php:1019
+msgid "Save rule"
+msgstr "Enregistrer"
+
+#: classes/pref/filters.php:1019
+#: js/functions.js:865
+msgid "Add rule"
+msgstr "Ajouter une règle"
+
+#: classes/pref/filters.php:1042
+msgid "Perform Action"
+msgstr "Exécuter l'action"
+
+#: classes/pref/filters.php:1093
+msgid "No actions available"
+msgstr "Aucune action disponible"
+
+#: classes/pref/filters.php:1112
+msgid "Save action"
+msgstr "Enregistrer"
+
+#: classes/pref/filters.php:1112
+#: js/functions.js:887
+msgid "Add action"
+msgstr "Ajouter une action"
+
+#: classes/pref/filters.php:1136
+msgid "[No caption]"
+msgstr "[Pas de titre]"
+
+#: classes/pref/filters.php:1138
+#, php-format
+msgid "%s (%d rule)"
+msgid_plural "%s (%d rules)"
+msgstr[0] "%s (%d règle)"
+msgstr[1] "%s (%d règles)"
+
+#: classes/pref/filters.php:1153
+msgid "matches any rule"
+msgstr "Au moins une correspondance"
+
+#: classes/pref/filters.php:1156
+#, php-format
+msgid "%s (+%d action)"
+msgid_plural "%s (+%d actions)"
+msgstr[0] "%s (+%d action)"
+msgstr[1] "%s (+%d actions)"
+
 #: classes/pref/users.php:6
 #: classes/pref/system.php:8
-#: plugins/instances/init.php:154
 msgid "Your access level is insufficient to open this tab."
 msgstr "Vous n'avez pas les permissions nécessaires pour ouvrir cet onglet."
 
@@ -1311,8 +1358,8 @@ msgstr "Modifier Utilisateur"
 
 #: classes/pref/users.php:56
 #: classes/pref/feeds.php:637
-#: classes/pref/feeds.php:878
-#: classes/feeds.php:1075
+#: classes/pref/feeds.php:866
+#: classes/feeds.php:1068
 msgid "Authentication"
 msgstr "Identification"
 
@@ -1322,7 +1369,7 @@ msgstr "Permissions : "
 
 #: classes/pref/users.php:77
 #: classes/pref/feeds.php:667
-#: classes/pref/feeds.php:896
+#: classes/pref/feeds.php:884
 msgid "Options"
 msgstr "Options"
 
@@ -1336,7 +1383,7 @@ msgid "User not found"
 msgstr "Utilisateur non trouvé"
 
 #: classes/pref/users.php:132
-#: classes/pref/users.php:400
+#: classes/pref/users.php:399
 msgid "Registered"
 msgstr "Inscrit"
 
@@ -1353,7 +1400,7 @@ msgid "Stored articles"
 msgstr "Articles stockés"
 
 #: classes/pref/users.php:145
-#: classes/pref/users.php:399
+#: classes/pref/users.php:398
 msgid "Subscribed feeds"
 msgstr "Flux abonnés"
 
@@ -1372,502 +1419,57 @@ msgstr "Impossible de créer l'utilisateur <b>%s</b>"
 msgid "User <b>%s</b> already exists."
 msgstr "L'utilisateur <b>%s</b> existe déjà."
 
-#: classes/pref/users.php:265
+#: classes/pref/users.php:264
 #, php-format
 msgid "Changed password of user <b>%s</b> to <b>%s</b>"
 msgstr "Mot de passe de l'utilisateur <b>%s</b> changé en <b>%s</b>"
 
-#: classes/pref/users.php:267
+#: classes/pref/users.php:266
 #, php-format
 msgid "Sending new password of user <b>%s</b> to <b>%s</b>"
 msgstr "Envoi du mot de passe de <b>%s</b> à <b>%s</b>"
 
-#: classes/pref/users.php:291
+#: classes/pref/users.php:290
 msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] Notification de changement de mot de passe"
 
-#: classes/pref/users.php:324
-#: classes/pref/feeds.php:1333
-#: classes/pref/filters.php:740
-#: classes/feeds.php:1125
-#: classes/feeds.php:1191
-#: js/tt-rss.js:165
-msgid "Search"
-msgstr "Rechercher"
-
-#: classes/pref/users.php:342
+#: classes/pref/users.php:341
 msgid "Create user"
 msgstr "Créer l'utilisateur"
 
-#: classes/pref/users.php:346
-#: classes/pref/filters.php:759
-#: plugins/instances/init.php:293
-msgid "Edit"
-msgstr "Modifier"
-
-#: classes/pref/users.php:397
+#: classes/pref/users.php:396
 #: classes/pref/feeds.php:643
-#: classes/pref/feeds.php:882
-#: classes/pref/feeds.php:1836
-#: classes/feeds.php:1079
+#: classes/pref/feeds.php:870
+#: classes/pref/feeds.php:1810
+#: classes/feeds.php:1072
 msgid "Login"
 msgstr "Se connecter"
 
-#: classes/pref/users.php:398
+#: classes/pref/users.php:397
 msgid "Access Level"
 msgstr "Permissions"
 
-#: classes/pref/users.php:401
+#: classes/pref/users.php:400
 msgid "Last login"
 msgstr "Dernière connexion"
 
-#: classes/pref/users.php:420
-#: plugins/instances/init.php:334
+#: classes/pref/users.php:419
 msgid "Click to edit"
 msgstr "Cliquer pour modifier"
 
-#: classes/pref/users.php:441
+#: classes/pref/users.php:440
 msgid "No users defined."
 msgstr "Aucun utilisateur défini."
 
-#: classes/pref/users.php:443
+#: classes/pref/users.php:442
 msgid "No matching users found."
 msgstr "Aucun utilisateur correspondant trouvé."
 
-#: classes/pref/system.php:29
-msgid "Error Log"
-msgstr "Journal des erreurs"
-
-#: classes/pref/system.php:40
-msgid "Refresh"
-msgstr "Actualiser"
-
-#: classes/pref/system.php:43
-msgid "Clear log"
-msgstr "Vider le journal"
-
-#: classes/pref/system.php:48
-msgid "Error"
-msgstr "Erreur"
-
-#: classes/pref/system.php:49
-msgid "Filename"
-msgstr "Nom du fichier"
-
-#: classes/pref/system.php:50
-msgid "Message"
-msgstr "Message"
-
-#: classes/pref/system.php:52
-msgid "Date"
-msgstr "Date"
-
-#: classes/pref/feeds.php:15
-msgid "Check to enable field"
-msgstr "Cocher pour activer le champ"
-
-#: classes/pref/feeds.php:65
-#: classes/pref/feeds.php:214
-#: classes/pref/feeds.php:258
-#: classes/pref/feeds.php:264
-#: classes/pref/feeds.php:290
-#, php-format
-msgid "(%d feed)"
-msgid_plural "(%d feeds)"
-msgstr[0] "(%d flux)"
-msgstr[1] "(%d flux)"
-
-#: classes/pref/feeds.php:537
 #: classes/pref/prefs.php:18
+#: classes/pref/feeds.php:537
 msgid "General"
 msgstr "Général"
 
-#: classes/pref/feeds.php:561
-msgid "Feed Title"
-msgstr "Titre du flux"
-
-#: classes/pref/feeds.php:595
-#: classes/pref/feeds.php:830
-#: classes/pref/feeds.php:1822
-#: classes/feeds.php:1055
-msgid "Place in category:"
-msgstr "Placer dans la catégorie :"
-
-#: classes/pref/feeds.php:608
-#: classes/pref/feeds.php:844
-msgid "Language:"
-msgstr "Langue:"
-
-#: classes/pref/feeds.php:615
-#: classes/pref/feeds.php:853
-msgid "Update"
-msgstr "Mettre à jour"
-
-#: classes/pref/feeds.php:630
-#: classes/pref/feeds.php:869
-msgid "Article purging:"
-msgstr "Purge des articles :"
-
-#: classes/pref/feeds.php:658
-#: classes/pref/feeds.php:890
-#: classes/pref/feeds.php:1839
-#: classes/pref/prefs.php:245
-#: classes/feeds.php:1083
-msgid "Password"
-msgstr "Mot de passe"
-
-#: classes/pref/feeds.php:662
-msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
-msgstr "<b>Astuce :</b> vous devez renseigner vos informations d'identification si le flux nécessite une authentification, sauf pour les flux Twitter."
-
-#: classes/pref/feeds.php:681
-#: classes/pref/feeds.php:900
-msgid "Hide from Popular feeds"
-msgstr "Masquer dans la liste des flux populaires"
-
-#: classes/pref/feeds.php:693
-#: classes/pref/feeds.php:906
-msgid "Include in e-mail digest"
-msgstr "Inclure dans la synthèse quotidienne par courrier électronique"
-
-#: classes/pref/feeds.php:706
-#: classes/pref/feeds.php:912
-msgid "Always display image attachments"
-msgstr "Toujours afficher les images jointes"
-
-#: classes/pref/feeds.php:719
-#: classes/pref/feeds.php:920
-msgid "Do not embed images"
-msgstr "Ne pas intégrer les images"
-
-#: classes/pref/feeds.php:732
-#: classes/pref/feeds.php:928
-msgid "Cache media"
-msgstr ""
-
-#: classes/pref/feeds.php:744
-#: classes/pref/feeds.php:934
-msgid "Mark updated articles as unread"
-msgstr "Marquer les article mis à jour comme non lus"
-
-#: classes/pref/feeds.php:748
-msgid "Icon"
-msgstr "Icône"
-
-#: classes/pref/feeds.php:765
-msgid "Replace"
-msgstr "Remplacer"
-
-#: classes/pref/feeds.php:772
-#: classes/pref/prefs.php:698
-msgid "Plugins"
-msgstr "Plugins"
-
-#: classes/pref/feeds.php:792
-msgid "Resubscribe to push updates"
-msgstr "Réinscription aux mises à jour en push"
-
-#: classes/pref/feeds.php:799
-msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
-msgstr "Réinitialiser l'état de l'inscription PubSubHubbub pour les flux en mise à jour push."
-
-#: classes/pref/feeds.php:1200
-#: classes/pref/feeds.php:1253
-msgid "All done."
-msgstr "Tout est terminé."
-
-#: classes/pref/feeds.php:1308
-msgid "Feeds with errors"
-msgstr "Flux avec des erreurs"
-
-#: classes/pref/feeds.php:1315
-msgid "Inactive feeds"
-msgstr "Flux inactifs"
-
-#: classes/pref/feeds.php:1351
-msgid "Edit selected feeds"
-msgstr "Modifier les flux sélectionnés"
-
-#: classes/pref/feeds.php:1353
-#: classes/pref/feeds.php:1367
-#: classes/pref/filters.php:762
-msgid "Reset sort order"
-msgstr "Réinitialiser le critère de tri"
-
-#: classes/pref/feeds.php:1355
-#: js/prefs.js:1622
-msgid "Batch subscribe"
-msgstr "Abonnement par lots"
-
-#: classes/pref/feeds.php:1362
-msgid "Categories"
-msgstr "Catégories"
-
-#: classes/pref/feeds.php:1365
-msgid "Add category"
-msgstr "Ajouter une catégorie"
-
-#: classes/pref/feeds.php:1369
-msgid "Remove selected"
-msgstr "Supprimer les flux sélectionnés"
-
-#: classes/pref/feeds.php:1380
-msgid "More actions..."
-msgstr "Autres actions..."
-
-#: classes/pref/feeds.php:1384
-msgid "Manual purge"
-msgstr "Purger manuellement"
-
-#: classes/pref/feeds.php:1388
-msgid "Clear feed data"
-msgstr "Purger les données de flux"
-
-#: classes/pref/feeds.php:1389
-#: classes/pref/filters.php:770
-msgid "Rescore articles"
-msgstr "Recalculer le score des articles"
-
-#: classes/pref/feeds.php:1442
-msgid "OPML"
-msgstr "OPML"
-
-#: classes/pref/feeds.php:1444
-msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
-msgstr "Avec OPML, vous pouvez exporter et importer vos flux, filtres, étiquettes et réglages de Tiny Tiny RSS."
-
-#: classes/pref/feeds.php:1445
-msgid "Only main settings profile can be migrated using OPML."
-msgstr "Seul le profil de réglages principal peut être migré en utilisant OPML."
-
-#: classes/pref/feeds.php:1458
-msgid "Import my OPML"
-msgstr "Importer mon OPML"
-
-#: classes/pref/feeds.php:1464
-msgid "Filename:"
-msgstr "Nom du fichier :"
-
-#: classes/pref/feeds.php:1466
-msgid "Include settings"
-msgstr "Inclure les paramètres"
-
-#: classes/pref/feeds.php:1470
-msgid "Export OPML"
-msgstr "Exporter en OPML"
-
-#: classes/pref/feeds.php:1474
-msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
-msgstr "Votre fichier OPML peut être publié et toute personne qui connaît l'adresse indiquée ci-dessous peut s'y abonner."
-
-#: classes/pref/feeds.php:1478
-msgid "Public OPML URL"
-msgstr "URL OPML publique"
-
-#: classes/pref/feeds.php:1479
-msgid "Display published OPML URL"
-msgstr "Afficher l'URL de l'OPML public"
-
-#: classes/pref/feeds.php:1488
-msgid "Firefox integration"
-msgstr "Intégration à Firefox"
-
-#: classes/pref/feeds.php:1490
-msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
-msgstr "Ce site Tiny Tiny RSS peut être utilisé comme lecteur de flux dans Firefox en cliquant sur le lien ci-dessous."
-
-#: classes/pref/feeds.php:1497
-msgid "Click here to register this site as a feed reader."
-msgstr "Cliquer ici pour enregistrer ce site comme lecteur de flux."
-
-#: classes/pref/feeds.php:1505
-msgid "Published & shared articles / Generated feeds"
-msgstr "Articles publiés et partagés / Flux générés"
-
-#: classes/pref/feeds.php:1507
-msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
-msgstr "Les articles publiés sont exportés comme un flux RSS public et toute personne qui connaît l'adresse indiquée ci-dessous peut s'y abonner."
-
-#: classes/pref/feeds.php:1514
-#: classes/feeds.php:54
-#: classes/feeds.php:140
-msgid "View as RSS"
-msgstr "Voir comme RSS"
-
-#: classes/pref/feeds.php:1515
-msgid "Display URL"
-msgstr "Afficher l'URL"
-
-#: classes/pref/feeds.php:1518
-msgid "Clear all generated URLs"
-msgstr "Supprimer toutes les URL générées"
-
-#: classes/pref/feeds.php:1596
-msgid "These feeds have not been updated with new content for 3 months (oldest first):"
-msgstr "Les flux suivants n'ont pas été mis à jour depuis 3 mois (par âge décroissant) :"
-
-#: classes/pref/feeds.php:1630
-#: classes/pref/feeds.php:1694
-msgid "Click to edit feed"
-msgstr "Cliquez pour modifier le flux"
-
-#: classes/pref/feeds.php:1648
-#: classes/pref/feeds.php:1714
-msgid "Unsubscribe from selected feeds"
-msgstr "Se désabonner des flux sélectionnés"
-
-#: classes/pref/feeds.php:1819
-msgid "Add one valid RSS feed per line (no feed detection is done)"
-msgstr "Ajoutez un flux RSS valide par ligne (aucune détection de flux n'est réalisée)"
-
-#: classes/pref/feeds.php:1828
-msgid "Feeds to subscribe, One per line"
-msgstr "Flux auxquels s'abonner, un par ligne"
-
-#: classes/pref/feeds.php:1851
-msgid "Feeds require authentication."
-msgstr "Les flux requièrent une identification."
-
-#: classes/pref/feeds.php:1858
-#: classes/feeds.php:1099
-#: classes/feeds.php:1153
-msgid "Subscribe"
-msgstr "S'abonner"
-
-#: classes/pref/filters.php:151
-msgid "Preview article"
-msgstr "Prévisualiser l'article"
-
-#: classes/pref/filters.php:239
-#: classes/pref/filters.php:518
-msgid "(inverse)"
-msgstr "(inversé)"
-
-#: classes/pref/filters.php:235
-#: classes/pref/filters.php:517
-#, php-format
-msgid "%s on %s in %s %s"
-msgstr "%s sur %s dans %s %s"
-
-#: classes/pref/filters.php:354
-#: classes/pref/filters.php:827
-#: classes/pref/filters.php:942
-msgid "Match"
-msgstr "Correspondance"
-
-#: classes/pref/filters.php:368
-#: classes/pref/filters.php:416
-#: classes/pref/filters.php:841
-#: classes/pref/filters.php:868
-msgid "Add"
-msgstr "Ajouter"
-
-#: classes/pref/filters.php:371
-#: classes/pref/filters.php:419
-#: classes/pref/filters.php:844
-#: classes/pref/filters.php:871
-#: classes/feeds.php:122
-msgid "Delete"
-msgstr "Supprimer"
-
-#: classes/pref/filters.php:402
-#: classes/pref/filters.php:854
-msgid "Apply actions"
-msgstr "Actions effectuées"
-
-#: classes/pref/filters.php:452
-#: classes/pref/filters.php:883
-msgid "Enabled"
-msgstr "Activé"
-
-#: classes/pref/filters.php:461
-#: classes/pref/filters.php:886
-msgid "Match any rule"
-msgstr "Au moins une correspondance"
-
-#: classes/pref/filters.php:470
-#: classes/pref/filters.php:889
-msgid "Inverse matching"
-msgstr "Correspondance inverse"
-
-#: classes/pref/filters.php:482
-#: classes/pref/filters.php:896
-msgid "Test"
-msgstr "Test"
-
-#: classes/pref/filters.php:756
-msgid "Combine"
-msgstr "Combiner"
-
-#: classes/pref/filters.php:899
-msgid "Create"
-msgstr "Créer"
-
-#: classes/pref/filters.php:954
-msgid "Inverse regular expression matching"
-msgstr "Inverser le résultat de l'expression rationnelle"
-
-#: classes/pref/filters.php:956
-msgid "on field"
-msgstr "sur le champ"
-
-#: classes/pref/filters.php:962
-#: js/PrefFilterTree.js:64
-msgid "in"
-msgstr "dans"
-
-#: classes/pref/filters.php:975
-msgid "Wiki: Filters"
-msgstr "Filtres Wiki:"
-
-#: classes/pref/filters.php:980
-msgid "Save rule"
-msgstr "Enregistrer"
-
-#: classes/pref/filters.php:980
-#: js/functions.js:865
-msgid "Add rule"
-msgstr "Ajouter une règle"
-
-#: classes/pref/filters.php:1003
-msgid "Perform Action"
-msgstr "Exécuter l'action"
-
-#: classes/pref/filters.php:1054
-msgid "No actions available"
-msgstr "Aucune action disponible"
-
-#: classes/pref/filters.php:1073
-msgid "Save action"
-msgstr "Enregistrer"
-
-#: classes/pref/filters.php:1073
-#: js/functions.js:887
-msgid "Add action"
-msgstr "Ajouter une action"
-
-#: classes/pref/filters.php:1097
-msgid "[No caption]"
-msgstr "[Pas de titre]"
-
-#: classes/pref/filters.php:1099
-#, php-format
-msgid "%s (%d rule)"
-msgid_plural "%s (%d rules)"
-msgstr[0] "%s (%d règle)"
-msgstr[1] "%s (%d règles)"
-
-#: classes/pref/filters.php:1114
-msgid "matches any rule"
-msgstr "Au moins une correspondance"
-
-#: classes/pref/filters.php:1117
-#, php-format
-msgid "%s (+%d action)"
-msgid_plural "%s (+%d actions)"
-msgstr[0] "%s (+%d action)"
-msgstr[1] "%s (+%d actions)"
-
 #: classes/pref/prefs.php:19
 msgid "Interface"
 msgstr "Interface"
@@ -2041,7 +1643,7 @@ msgid "Strip all but most common HTML tags when reading articles."
 msgstr "Élimine toutes les balises HTML sauf les plus courantes lors de la lecture des articles."
 
 #: classes/pref/prefs.php:53
-#: js/prefs.js:1584
+#: js/prefs.js:1580
 msgid "Customize stylesheet"
 msgstr "Personnaliser la feuille de style"
 
@@ -2109,6 +1711,14 @@ msgstr "Permissions"
 msgid "Save data"
 msgstr "Enregistrer les données"
 
+#: classes/pref/prefs.php:245
+#: classes/pref/feeds.php:658
+#: classes/pref/feeds.php:878
+#: classes/pref/feeds.php:1813
+#: classes/feeds.php:1076
+msgid "Password"
+msgstr "Mot de passe"
+
 #: classes/pref/prefs.php:254
 msgid "Your password is at default value, please change it."
 msgstr "Votre mot de passe est celui par défaut, veuillez le modifier."
@@ -2207,18 +1817,23 @@ msgstr "Gérer les profils"
 msgid "Reset to defaults"
 msgstr "Revenir aux valeurs par défaut"
 
+#: classes/pref/prefs.php:698
+#: classes/pref/feeds.php:772
+msgid "Plugins"
+msgstr "Plugins"
+
 #: classes/pref/prefs.php:700
 msgid "You will need to reload Tiny Tiny RSS for plugin changes to take effect."
 msgstr "Vous devrez relancer Tiny Tiny RSS pour que les changements apportés aux plugins prennent effet."
 
-#: classes/pref/prefs.php:702
-msgid "Download more plugins at tt-rss.org <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forums</a> or <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a>."
-msgstr "Téléchargez plus de plugins sur <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">le forum</a> ou <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">le wiki</a> de Tiny Tiny RSS."
-
-#: classes/pref/prefs.php:732
+#: classes/pref/prefs.php:730
 msgid "System plugins"
 msgstr "Plugins systèmes"
 
+#: classes/pref/prefs.php:731
+msgid "System plugins are enabled in <strong>config.php</strong> for all users."
+msgstr ""
+
 #: classes/pref/prefs.php:736
 #: classes/pref/prefs.php:792
 msgid "Plugin"
@@ -2288,6 +1903,339 @@ msgstr "Supprimer les profils sélectionnés"
 msgid "Activate profile"
 msgstr "Activer le profil"
 
+#: classes/pref/feeds.php:15
+msgid "Check to enable field"
+msgstr "Cocher pour activer le champ"
+
+#: classes/pref/feeds.php:65
+#: classes/pref/feeds.php:214
+#: classes/pref/feeds.php:258
+#: classes/pref/feeds.php:264
+#: classes/pref/feeds.php:290
+#, php-format
+msgid "(%d feed)"
+msgid_plural "(%d feeds)"
+msgstr[0] "(%d flux)"
+msgstr[1] "(%d flux)"
+
+#: classes/pref/feeds.php:561
+msgid "Feed Title"
+msgstr "Titre du flux"
+
+#: classes/pref/feeds.php:595
+#: classes/pref/feeds.php:818
+#: classes/pref/feeds.php:1796
+#: classes/feeds.php:1048
+msgid "Place in category:"
+msgstr "Placer dans la catégorie :"
+
+#: classes/pref/feeds.php:608
+#: classes/pref/feeds.php:832
+msgid "Language:"
+msgstr "Langue:"
+
+#: classes/pref/feeds.php:615
+#: classes/pref/feeds.php:841
+msgid "Update"
+msgstr "Mettre à jour"
+
+#: classes/pref/feeds.php:630
+#: classes/pref/feeds.php:857
+msgid "Article purging:"
+msgstr "Purge des articles :"
+
+#: classes/pref/feeds.php:662
+msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
+msgstr "<b>Astuce :</b> vous devez renseigner vos informations d'identification si le flux nécessite une authentification, sauf pour les flux Twitter."
+
+#: classes/pref/feeds.php:681
+#: classes/pref/feeds.php:888
+msgid "Hide from Popular feeds"
+msgstr "Masquer dans la liste des flux populaires"
+
+#: classes/pref/feeds.php:693
+#: classes/pref/feeds.php:894
+msgid "Include in e-mail digest"
+msgstr "Inclure dans la synthèse quotidienne par courrier électronique"
+
+#: classes/pref/feeds.php:706
+#: classes/pref/feeds.php:900
+msgid "Always display image attachments"
+msgstr "Toujours afficher les images jointes"
+
+#: classes/pref/feeds.php:719
+#: classes/pref/feeds.php:908
+msgid "Do not embed images"
+msgstr "Ne pas intégrer les images"
+
+#: classes/pref/feeds.php:732
+#: classes/pref/feeds.php:916
+msgid "Cache media"
+msgstr ""
+
+#: classes/pref/feeds.php:744
+#: classes/pref/feeds.php:922
+msgid "Mark updated articles as unread"
+msgstr "Marquer les article mis à jour comme non lus"
+
+#: classes/pref/feeds.php:748
+msgid "Icon"
+msgstr "Icône"
+
+#: classes/pref/feeds.php:765
+msgid "Replace"
+msgstr "Remplacer"
+
+#: classes/pref/feeds.php:1174
+#: classes/pref/feeds.php:1227
+msgid "All done."
+msgstr "Tout est terminé."
+
+#: classes/pref/feeds.php:1282
+msgid "Feeds with errors"
+msgstr "Flux avec des erreurs"
+
+#: classes/pref/feeds.php:1289
+msgid "Inactive feeds"
+msgstr "Flux inactifs"
+
+#: classes/pref/feeds.php:1325
+msgid "Edit selected feeds"
+msgstr "Modifier les flux sélectionnés"
+
+#: classes/pref/feeds.php:1329
+#: js/prefs.js:1618
+msgid "Batch subscribe"
+msgstr "Abonnement par lots"
+
+#: classes/pref/feeds.php:1336
+msgid "Categories"
+msgstr "Catégories"
+
+#: classes/pref/feeds.php:1339
+msgid "Add category"
+msgstr "Ajouter une catégorie"
+
+#: classes/pref/feeds.php:1343
+msgid "Remove selected"
+msgstr "Supprimer les flux sélectionnés"
+
+#: classes/pref/feeds.php:1354
+msgid "More actions..."
+msgstr "Autres actions..."
+
+#: classes/pref/feeds.php:1358
+msgid "Manual purge"
+msgstr "Purger manuellement"
+
+#: classes/pref/feeds.php:1362
+msgid "Clear feed data"
+msgstr "Purger les données de flux"
+
+#: classes/pref/feeds.php:1416
+msgid "OPML"
+msgstr "OPML"
+
+#: classes/pref/feeds.php:1418
+msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
+msgstr "Avec OPML, vous pouvez exporter et importer vos flux, filtres, étiquettes et réglages de Tiny Tiny RSS."
+
+#: classes/pref/feeds.php:1419
+msgid "Only main settings profile can be migrated using OPML."
+msgstr "Seul le profil de réglages principal peut être migré en utilisant OPML."
+
+#: classes/pref/feeds.php:1432
+msgid "Import my OPML"
+msgstr "Importer mon OPML"
+
+#: classes/pref/feeds.php:1438
+msgid "Filename:"
+msgstr "Nom du fichier :"
+
+#: classes/pref/feeds.php:1440
+msgid "Include settings"
+msgstr "Inclure les paramètres"
+
+#: classes/pref/feeds.php:1444
+msgid "Export OPML"
+msgstr "Exporter en OPML"
+
+#: classes/pref/feeds.php:1448
+msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
+msgstr "Votre fichier OPML peut être publié et toute personne qui connaît l'adresse indiquée ci-dessous peut s'y abonner."
+
+#: classes/pref/feeds.php:1452
+msgid "Public OPML URL"
+msgstr "URL OPML publique"
+
+#: classes/pref/feeds.php:1453
+msgid "Display published OPML URL"
+msgstr "Afficher l'URL de l'OPML public"
+
+#: classes/pref/feeds.php:1462
+msgid "Firefox integration"
+msgstr "Intégration à Firefox"
+
+#: classes/pref/feeds.php:1464
+msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
+msgstr "Ce site Tiny Tiny RSS peut être utilisé comme lecteur de flux dans Firefox en cliquant sur le lien ci-dessous."
+
+#: classes/pref/feeds.php:1471
+msgid "Click here to register this site as a feed reader."
+msgstr "Cliquer ici pour enregistrer ce site comme lecteur de flux."
+
+#: classes/pref/feeds.php:1479
+msgid "Published & shared articles / Generated feeds"
+msgstr "Articles publiés et partagés / Flux générés"
+
+#: classes/pref/feeds.php:1481
+msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
+msgstr "Les articles publiés sont exportés comme un flux RSS public et toute personne qui connaît l'adresse indiquée ci-dessous peut s'y abonner."
+
+#: classes/pref/feeds.php:1488
+#: classes/feeds.php:54
+#: classes/feeds.php:140
+msgid "View as RSS"
+msgstr "Voir comme RSS"
+
+#: classes/pref/feeds.php:1489
+msgid "Display URL"
+msgstr "Afficher l'URL"
+
+#: classes/pref/feeds.php:1492
+msgid "Clear all generated URLs"
+msgstr "Supprimer toutes les URL générées"
+
+#: classes/pref/feeds.php:1570
+msgid "These feeds have not been updated with new content for 3 months (oldest first):"
+msgstr "Les flux suivants n'ont pas été mis à jour depuis 3 mois (par âge décroissant) :"
+
+#: classes/pref/feeds.php:1604
+#: classes/pref/feeds.php:1668
+msgid "Click to edit feed"
+msgstr "Cliquez pour modifier le flux"
+
+#: classes/pref/feeds.php:1622
+#: classes/pref/feeds.php:1688
+msgid "Unsubscribe from selected feeds"
+msgstr "Se désabonner des flux sélectionnés"
+
+#: classes/pref/feeds.php:1793
+msgid "Add one valid RSS feed per line (no feed detection is done)"
+msgstr "Ajoutez un flux RSS valide par ligne (aucune détection de flux n'est réalisée)"
+
+#: classes/pref/feeds.php:1802
+msgid "Feeds to subscribe, One per line"
+msgstr "Flux auxquels s'abonner, un par ligne"
+
+#: classes/pref/feeds.php:1825
+msgid "Feeds require authentication."
+msgstr "Les flux requièrent une identification."
+
+#: classes/pref/feeds.php:1832
+#: classes/feeds.php:1092
+#: classes/feeds.php:1146
+msgid "Subscribe"
+msgstr "S'abonner"
+
+#: classes/pref/system.php:29
+msgid "Error Log"
+msgstr "Journal des erreurs"
+
+#: classes/pref/system.php:40
+msgid "Refresh"
+msgstr "Actualiser"
+
+#: classes/pref/system.php:43
+msgid "Clear log"
+msgstr "Vider le journal"
+
+#: classes/pref/system.php:48
+msgid "Error"
+msgstr "Erreur"
+
+#: classes/pref/system.php:49
+msgid "Filename"
+msgstr "Nom du fichier"
+
+#: classes/pref/system.php:50
+msgid "Message"
+msgstr "Message"
+
+#: classes/pref/system.php:52
+msgid "Date"
+msgstr "Date"
+
+#: classes/opml.php:28
+#: classes/opml.php:33
+msgid "OPML Utility"
+msgstr "Outil OPML"
+
+#: classes/opml.php:37
+msgid "Importing OPML..."
+msgstr "Import OPML en cours..."
+
+#: classes/opml.php:41
+msgid "Return to preferences"
+msgstr "Revenir à la configuration"
+
+#: classes/opml.php:295
+#, php-format
+msgid "Adding feed: %s"
+msgstr "Ajout du flux : %s"
+
+#: classes/opml.php:306
+#, php-format
+msgid "Duplicate feed: %s"
+msgstr "Flux en doublon : %s"
+
+#: classes/opml.php:320
+#, php-format
+msgid "Adding label %s"
+msgstr "Ajout de l'étiquette %s"
+
+#: classes/opml.php:323
+#, php-format
+msgid "Duplicate label: %s"
+msgstr "Étiquette en doublon: %s"
+
+#: classes/opml.php:335
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr "Paramétrage de la préférence %s à %s"
+
+#: classes/opml.php:367
+msgid "Adding filter..."
+msgstr "Créer un filtre..."
+
+#: classes/opml.php:486
+#, php-format
+msgid "Processing category: %s"
+msgstr "Placer dans la catégorie : %s"
+
+#: classes/opml.php:532
+#, php-format
+msgid "Upload failed with error code %d"
+msgstr "Échec de l'envoi, code d'erreur %d"
+
+#: classes/opml.php:544
+#: plugins/import_export/init.php:448
+msgid "Unable to move uploaded file."
+msgstr "Impossible de déplacer le fichier envoyé."
+
+#: classes/opml.php:548
+#: plugins/import_export/init.php:452
+msgid "Error: please upload OPML file."
+msgstr "Erreur : veuillez envoyer un document OPML."
+
+#: classes/opml.php:559
+msgid "Error: unable to find moved OPML file."
+msgstr "Erreur : impossible de trouver le fichier OPML déplacé."
+
+#: classes/opml.php:566
+msgid "Error while parsing document."
+msgstr "Erreur lors de l'analyse du document."
+
 #: classes/feeds.php:53
 msgid "View as RSS feed"
 msgstr "Voir comme flux RSS"
@@ -2328,8 +2276,8 @@ msgstr "Revenir"
 
 #: classes/feeds.php:127
 #: classes/feeds.php:132
-#: plugins/mail/init.php:75
 #: plugins/mailto/init.php:25
+#: plugins/mail/init.php:75
 msgid "Forward by email"
 msgstr "Transférer par email"
 
@@ -2337,311 +2285,144 @@ msgstr "Transférer par email"
 msgid "Feed:"
 msgstr "Flux :"
 
-#: classes/feeds.php:229
-#: classes/feeds.php:892
+#: classes/feeds.php:228
+#: classes/feeds.php:885
 msgid "Feed not found."
 msgstr "Flux non trouvé."
 
-#: classes/feeds.php:300
+#: classes/feeds.php:291
 msgid "Never"
 msgstr "Jamais"
 
-#: classes/feeds.php:413
+#: classes/feeds.php:405
 #, php-format
 msgid "Imported at %s"
 msgstr "Importé à %s"
 
-#: classes/feeds.php:472
-#: classes/feeds.php:569
+#: classes/feeds.php:464
+#: classes/feeds.php:561
 msgid "mark feed as read"
 msgstr "Marquer le flux comme lu"
 
-#: classes/feeds.php:630
+#: classes/feeds.php:622
 msgid "Collapse article"
 msgstr "Fermer l'article"
 
-#: classes/feeds.php:791
+#: classes/feeds.php:784
 msgid "No unread articles found to display."
 msgstr "Aucun article non lu à afficher."
 
-#: classes/feeds.php:794
+#: classes/feeds.php:787
 msgid "No updated articles found to display."
 msgstr "Aucun article mis à jour à afficher."
 
-#: classes/feeds.php:797
+#: classes/feeds.php:790
 msgid "No starred articles found to display."
 msgstr "Aucun article remarquable à afficher."
 
-#: classes/feeds.php:801
+#: classes/feeds.php:794
 msgid "No articles found to display. You can assign articles to labels manually from article header context menu (applies to all selected articles) or use a filter."
 msgstr "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:803
+#: classes/feeds.php:796
 msgid "No articles found to display."
 msgstr "Aucun article à afficher."
 
-#: classes/feeds.php:818
-#: classes/feeds.php:992
+#: classes/feeds.php:811
+#: classes/feeds.php:985
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "Flux mis à jour à %s"
 
-#: classes/feeds.php:828
-#: classes/feeds.php:1002
+#: classes/feeds.php:821
+#: classes/feeds.php:995
 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:982
+#: classes/feeds.php:975
 msgid "No feed selected."
 msgstr "Aucun flux sélectionné."
 
-#: classes/feeds.php:1041
-#: classes/feeds.php:1049
+#: classes/feeds.php:1034
+#: classes/feeds.php:1042
 msgid "Feed or site URL"
 msgstr "URL du flux"
 
-#: classes/feeds.php:1063
+#: classes/feeds.php:1056
 msgid "Available feeds"
 msgstr "Flux disponibles"
 
-#: classes/feeds.php:1094
+#: classes/feeds.php:1087
 msgid "This feed requires authentication."
 msgstr "Ce flux nécessite une identification."
 
-#: classes/feeds.php:1102
+#: classes/feeds.php:1095
 msgid "More feeds"
 msgstr "D'autres flux"
 
-#: classes/feeds.php:1129
+#: classes/feeds.php:1122
 msgid "Popular feeds"
 msgstr "Flux populaires"
 
-#: classes/feeds.php:1130
+#: classes/feeds.php:1123
 msgid "Feed archive"
 msgstr "Archive du flux"
 
-#: classes/feeds.php:1133
+#: classes/feeds.php:1126
 msgid "limit:"
 msgstr "limite :"
 
-#: classes/feeds.php:1165
+#: classes/feeds.php:1158
 msgid "Look for"
 msgstr "Rechercher"
 
-#: classes/feeds.php:1173
+#: classes/feeds.php:1166
 #, php-format
 msgid "in %s"
 msgstr "dans %s"
 
-#: classes/feeds.php:1178
+#: classes/feeds.php:1171
 msgid "Used for word stemming"
 msgstr "Utilisé pour la racinisation des mots"
 
-#: classes/feeds.php:1187
+#: classes/feeds.php:1180
 msgid "Search syntax"
 msgstr "Syntaxe de la recherche"
 
-#: plugins/instances/init.php:141
-msgid "Linked"
-msgstr "Instances liées"
-
-#: plugins/instances/init.php:204
-#: plugins/instances/init.php:395
-msgid "Instance"
-msgstr "Instance"
-
-#: plugins/instances/init.php:215
-#: plugins/instances/init.php:312
-#: plugins/instances/init.php:404
-msgid "Instance URL"
-msgstr "URL de l'instance"
-
-#: plugins/instances/init.php:226
-#: plugins/instances/init.php:414
-msgid "Access key:"
-msgstr "Clef d'accès :"
-
-#: plugins/instances/init.php:229
-#: plugins/instances/init.php:313
-#: plugins/instances/init.php:417
-msgid "Access key"
-msgstr "Clef d'accès"
-
-#: plugins/instances/init.php:233
-#: plugins/instances/init.php:421
-msgid "Use one access key for both linked instances."
-msgstr "Utilisez une clef d'accès pour les deux instances liées."
-
-#: plugins/instances/init.php:241
-#: plugins/instances/init.php:429
-msgid "Generate new key"
-msgstr "Générer une nouvelle clef"
-
-#: plugins/instances/init.php:292
-msgid "Link instance"
-msgstr "Lier une instance"
-
-#: plugins/instances/init.php:304
-msgid "You can connect other instances of Tiny Tiny RSS to this one to share Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
-msgstr "Vous pouvez connecter d'autres instances de Tiny Tiny RSS à celle-ci pour partager les flux populaires. Pour cela, utilisez l'URL suivante :"
-
-#: plugins/instances/init.php:314
-msgid "Last connected"
-msgstr "Dernière connexion"
-
-#: plugins/instances/init.php:315
-msgid "Status"
-msgstr "État"
-
-#: plugins/instances/init.php:316
-msgid "Stored feeds"
-msgstr "Flux stockés"
+#: classes/feeds.php:1596
+msgid "Starred articles"
+msgstr "Articles remarquables"
 
-#: plugins/instances/init.php:433
-msgid "Create link"
-msgstr "Créer un lien"
+#: classes/feeds.php:1598
+msgid "Published articles"
+msgstr "Articles publiés"
 
-#: plugins/nsfw/init.php:30
-#: plugins/nsfw/init.php:42
-msgid "Not work safe (click to toggle)"
-msgstr "Non convenable au travail (cliquer pour basculer)"
+#: classes/feeds.php:1600
+msgid "Fresh articles"
+msgstr "Nouveaux articles"
 
-#: plugins/nsfw/init.php:52
-msgid "NSFW Plugin"
-msgstr "Plugin NSFW"
+#: classes/feeds.php:1604
+msgid "Archived articles"
+msgstr "Articles archivés"
 
-#: plugins/nsfw/init.php:79
-msgid "Tags to consider NSFW (comma-separated)"
-msgstr "Tags à considérer non convenables au travail (séparés par des virgules)"
+#: classes/feeds.php:1606
+msgid "Recently read"
+msgstr "Lus récemment"
 
-#: plugins/nsfw/init.php:100
-msgid "Configuration saved."
-msgstr "La configuration a été enregistrée."
+#: classes/feeds.php:1716
+msgid "Special"
+msgstr "Spécial"
 
-#: plugins/note/init.php:26
-#: plugins/note/note.js:11
-msgid "Edit article note"
-msgstr "Modifier l'annotation de l'article"
+#: classes/feeds.php:1962
+#, php-format
+msgid "Search results: %s"
+msgstr "Résultats de recherche : %s"
 
 #: plugins/vf_shared/init.php:16
-#: plugins/vf_shared/init.php:69
+#: plugins/vf_shared/init.php:60
 msgid "Shared articles"
 msgstr "Articles partagés"
 
-#: plugins/auth_internal/init.php:65
-msgid "Please enter your one time password:"
-msgstr "Veuillez saisir votre mot de passe à usage unique :"
-
-#: plugins/auth_internal/init.php:188
-msgid "Password has been changed."
-msgstr "Le mot de passe a été modifié."
-
-#: plugins/auth_internal/init.php:190
-msgid "Old password is incorrect."
-msgstr "L'ancien mot de passe n'est pas correct."
-
-#: plugins/af_readability/init.php:21
-#, fuzzy
-msgid "Data saved."
-msgstr "Donnée enregistrée (%s, %d)"
-
-#: plugins/af_readability/init.php:33
-msgid "Inline content"
-msgstr "Contenu intégré"
-
-#: plugins/af_readability/init.php:39
-#, fuzzy
-msgid "Readability settings (af_readability)"
-msgstr "Réglages af_readability"
-
-#: plugins/af_readability/init.php:66
-msgid "Use Readability for pages shared via bookmarklet."
-msgstr ""
-
-#: plugins/af_readability/init.php:78
-#: plugins/af_psql_trgm/init.php:191
-msgid "Currently enabled for (click to edit):"
-msgstr "Actuellement activé pour (cliquer pour modifier):"
-
-#: plugins/af_readability/init.php:95
-msgid "Readability"
-msgstr "Readability"
-
-#: plugins/af_readability/init.php:106
-msgid "Inline article content"
-msgstr "Simplifier le contenu de l'article"
-
-#: plugins/af_redditimgur/init.php:25
-msgid "Reddit content settings (af_redditimgur)"
-msgstr ""
-
-#: plugins/af_redditimgur/init.php:50
-msgid "Uses Readability (full-text-rss) implementation by <a target='_blank' href='https://bitbucket.org/fivefilters/'>FiveFilters.org</a>"
-msgstr "Utilise l'implémentation de Readability (full-text-rss) par <a target='_blank' href='https://bitbucket.org/fivefilters/'>FiveFilters.org</a>"
-
-#: plugins/af_redditimgur/init.php:54
-msgid "Extract missing content using Readability"
-msgstr "Extraire le contenu manquant avec Readability"
-
-#: plugins/af_redditimgur/init.php:59
-msgid "Enable additional duplicate checking"
-msgstr ""
-
-#: plugins/af_redditimgur/init.php:73
-#: plugins/af_zz_imgproxy/init.php:225
-msgid "Configuration saved"
-msgstr "La configuration a été enregistrée"
-
-#: plugins/af_psql_trgm/init.php:28
-#, php-format
-msgid "Data saved (%s, %d)"
-msgstr "Donnée enregistrée (%s, %d)"
-
-#: plugins/af_psql_trgm/init.php:112
-msgid "Show related articles"
-msgstr "Voir les articles liés"
-
-#: plugins/af_psql_trgm/init.php:118
-#: plugins/af_psql_trgm/init.php:220
-msgid "Mark similar articles as read"
-msgstr "Marquer les articles similaires comme lus"
-
-#: plugins/af_psql_trgm/init.php:157
-msgid "PostgreSQL trigram extension returns string similarity as a floating point number (0-1). Setting it too low might produce false positives, zero disables checking."
-msgstr "L'extension trigram de PostgreSQL renvoie la similarité des chaînes en nombre à virgule flottante  (0-1). Un réglage bas risque de donner des faux positifs, zéro désactive la vérification."
-
-#: plugins/af_psql_trgm/init.php:160
-msgid "Global settings"
-msgstr "Paramètres généraux"
-
-#: plugins/af_psql_trgm/init.php:164
-msgid "Minimum similarity:"
-msgstr "Similarité minimale:"
-
-#: plugins/af_psql_trgm/init.php:169
-msgid "Minimum title length:"
-msgstr "Longueur minimale du titre:"
-
-#: plugins/af_psql_trgm/init.php:174
-msgid "Enable for all feeds:"
-msgstr "Activer pour tous les flux:"
-
-#: plugins/af_psql_trgm/init.php:209
-msgid "Similarity (pg_trgm)"
-msgstr "Similarité (pg_trgm)"
-
-#: plugins/af_comics/init.php:40
-msgid "Feeds supported by af_comics"
-msgstr "Flux supportés par af_comics"
-
-#: plugins/af_comics/init.php:42
-msgid "The following comics are currently supported:"
-msgstr "Les comics suivants sont actuellement supportés :"
-
-#: plugins/af_comics/init.php:60
-msgid "GoComics requires a specific URL to workaround their lack of feed support: <code>http://feeds.feedburner.com/uclick/<em>comic_name</em></code> (e.g. <code>http://www.gocomics.com/garfield</code> uses <code>http://feeds.feedburner.com/uclick/garfield</code>)."
-msgstr ""
-
 #: plugins/import_export/init.php:58
 msgid "Import and export"
 msgstr "Importer et exporter"
@@ -2658,95 +2439,83 @@ msgstr "Exporter mes données"
 msgid "Import"
 msgstr "Importer"
 
-#: plugins/import_export/init.php:225
+#: plugins/import_export/init.php:231
 msgid "Could not import: incorrect schema version."
 msgstr "Import impossible : version du schéma incorrecte."
 
-#: plugins/import_export/init.php:230
+#: plugins/import_export/init.php:236
 msgid "Could not import: unrecognized document format."
 msgstr "Import impossible : format de document non reconnu."
 
-#: plugins/import_export/init.php:391
+#: plugins/import_export/init.php:397
 msgid "Finished: "
 msgstr "Fini : "
 
-#: plugins/import_export/init.php:392
+#: plugins/import_export/init.php:398
 #, php-format
 msgid "%d article processed, "
 msgid_plural "%d articles processed, "
 msgstr[0] "%d article traité, "
 msgstr[1] "%d articles traités, "
 
-#: plugins/import_export/init.php:393
+#: plugins/import_export/init.php:399
 #, php-format
 msgid "%d imported, "
 msgid_plural "%d imported, "
 msgstr[0] "%d importé, "
 msgstr[1] "%d importés, "
 
-#: plugins/import_export/init.php:394
+#: plugins/import_export/init.php:400
 #, php-format
 msgid "%d feed created."
 msgid_plural "%d feeds created."
 msgstr[0] "%d flux créé."
 msgstr[1] "%d flux créés."
 
-#: plugins/import_export/init.php:399
+#: plugins/import_export/init.php:405
 msgid "Could not load XML document."
 msgstr "Impossible de charger le document XML."
 
-#: plugins/import_export/init.php:411
+#: plugins/import_export/init.php:417
 msgid "Prepare data"
 msgstr "Préparer les données"
 
-#: plugins/import_export/init.php:428
+#: plugins/import_export/init.php:434
 #, fuzzy, php-format
 msgid "Upload failed with error code %d (%s)"
 msgstr "Échec de l'envoi, code d'erreur %d"
 
-#: plugins/import_export/init.php:454
+#: plugins/import_export/init.php:460
 msgid "No file uploaded."
 msgstr "Aucun fichier envoyé."
 
-#: plugins/mail/init.php:28
-msgid "Mail addresses saved."
-msgstr "Adresses de courriel enregistrées."
-
-#: plugins/mail/init.php:34
-msgid "Mail plugin"
-msgstr "Plugin de courriel"
-
-#: plugins/mail/init.php:36
-msgid "You can set predefined email addressed here (comma-separated list):"
-msgstr "Vous pouvez prédéfinir des adresses de courriel (séparées par des virgules):"
-
+#: plugins/mailto/init.php:48
+#: plugins/mailto/init.php:54
 #: plugins/mail/init.php:112
 #: plugins/mail/init.php:118
-#: plugins/mailto/init.php:49
-#: plugins/mailto/init.php:55
 msgid "[Forwarded]"
 msgstr "[Transféré]"
 
+#: plugins/mailto/init.php:48
 #: plugins/mail/init.php:112
-#: plugins/mailto/init.php:49
 msgid "Multiple articles"
 msgstr "Articles multiples"
 
-#: plugins/mail/init.php:140
-msgid "To:"
-msgstr "À :"
+#: plugins/mailto/init.php:70
+msgid "Clicking the following link to invoke your mail client:"
+msgstr "Cliquez sur le lien suivant pour ouvrir votre client de messagerie :"
 
-#: plugins/mail/init.php:155
-msgid "Subject:"
-msgstr "Sujet :"
+#: plugins/mailto/init.php:74
+msgid "Forward selected article(s) by email."
+msgstr "Transférer le ou les article(s) par mail."
 
-#: plugins/mail/init.php:172
-msgid "Send e-mail"
-msgstr "Envoyer le mail"
+#: plugins/mailto/init.php:77
+msgid "You should be able to edit the message before sending in your mail client."
+msgstr "Vous devriez pouvoir modifier le message avant son envoi dans votre client de messagerie."
 
-#: plugins/close_button/init.php:22
-msgid "Close article"
-msgstr "Fermer l'article"
+#: plugins/mailto/init.php:82
+msgid "Close this dialog"
+msgstr "Fermer ce dialogue"
 
 #: plugins/bookmarklets/init.php:20
 msgid "Bookmarklets"
@@ -2769,34 +2538,119 @@ msgstr "S'abonner dans Tiny Tiny RSS"
 msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
 msgstr "Utilisez ce bookmarklet pour publier des pages avec Tiny Tiny RSS"
 
+#: plugins/af_psql_trgm/init.php:28
+#, php-format
+msgid "Data saved (%s, %d)"
+msgstr "Donnée enregistrée (%s, %d)"
+
+#: plugins/af_psql_trgm/init.php:112
+msgid "Show related articles"
+msgstr "Voir les articles liés"
+
+#: plugins/af_psql_trgm/init.php:118
+#: plugins/af_psql_trgm/init.php:220
+msgid "Mark similar articles as read"
+msgstr "Marquer les articles similaires comme lus"
+
+#: plugins/af_psql_trgm/init.php:157
+msgid "PostgreSQL trigram extension returns string similarity as a floating point number (0-1). Setting it too low might produce false positives, zero disables checking."
+msgstr "L'extension trigram de PostgreSQL renvoie la similarité des chaînes en nombre à virgule flottante  (0-1). Un réglage bas risque de donner des faux positifs, zéro désactive la vérification."
+
+#: plugins/af_psql_trgm/init.php:160
+msgid "Global settings"
+msgstr "Paramètres généraux"
+
+#: plugins/af_psql_trgm/init.php:164
+msgid "Minimum similarity:"
+msgstr "Similarité minimale:"
+
+#: plugins/af_psql_trgm/init.php:169
+msgid "Minimum title length:"
+msgstr "Longueur minimale du titre:"
+
+#: plugins/af_psql_trgm/init.php:174
+msgid "Enable for all feeds:"
+msgstr "Activer pour tous les flux:"
+
+#: plugins/af_psql_trgm/init.php:191
+#: plugins/af_readability/init.php:78
+msgid "Currently enabled for (click to edit):"
+msgstr "Actuellement activé pour (cliquer pour modifier):"
+
+#: plugins/af_psql_trgm/init.php:209
+msgid "Similarity (pg_trgm)"
+msgstr "Similarité (pg_trgm)"
+
+#: plugins/nsfw/init.php:30
+#: plugins/nsfw/init.php:42
+msgid "Not work safe (click to toggle)"
+msgstr "Non convenable au travail (cliquer pour basculer)"
+
+#: plugins/nsfw/init.php:52
+msgid "NSFW Plugin"
+msgstr "Plugin NSFW"
+
+#: plugins/nsfw/init.php:79
+msgid "Tags to consider NSFW (comma-separated)"
+msgstr "Tags à considérer non convenables au travail (séparés par des virgules)"
+
+#: plugins/nsfw/init.php:100
+msgid "Configuration saved."
+msgstr "La configuration a été enregistrée."
+
 #: plugins/toggle_sidebar/init.php:23
 msgid "Collapse feedlist"
 msgstr "Contracter la liste des flux"
 
-#: plugins/af_zz_imgproxy/init.php:186
-msgid "Image proxy settings (af_zz_imgproxy)"
-msgstr ""
+#: plugins/af_readability/init.php:21
+#, fuzzy
+msgid "Data saved."
+msgstr "Donnée enregistrée (%s, %d)"
 
-#: plugins/af_zz_imgproxy/init.php:211
+#: plugins/af_readability/init.php:33
+msgid "Inline content"
+msgstr "Contenu intégré"
+
+#: plugins/af_readability/init.php:39
 #, fuzzy
-msgid "Enable proxy for all remote images."
-msgstr "Activer pour tous les flux:"
+msgid "Readability settings (af_readability)"
+msgstr "Réglages af_readability"
 
-#: plugins/mailto/init.php:71
-msgid "Clicking the following link to invoke your mail client:"
-msgstr "Cliquez sur le lien suivant pour ouvrir votre client de messagerie :"
+#: plugins/af_readability/init.php:66
+msgid "Use Readability for pages shared via bookmarklet."
+msgstr ""
 
-#: plugins/mailto/init.php:75
-msgid "Forward selected article(s) by email."
-msgstr "Transférer le ou les article(s) par mail."
+#: plugins/af_readability/init.php:95
+msgid "Readability"
+msgstr "Readability"
 
-#: plugins/mailto/init.php:78
-msgid "You should be able to edit the message before sending in your mail client."
-msgstr "Vous devriez pouvoir modifier le message avant son envoi dans votre client de messagerie."
+#: plugins/af_readability/init.php:106
+msgid "Inline article content"
+msgstr "Simplifier le contenu de l'article"
 
-#: plugins/mailto/init.php:83
-msgid "Close this dialog"
-msgstr "Fermer ce dialogue"
+#: plugins/mail/init.php:28
+msgid "Mail addresses saved."
+msgstr "Adresses de courriel enregistrées."
+
+#: plugins/mail/init.php:34
+msgid "Mail plugin"
+msgstr "Plugin de courriel"
+
+#: plugins/mail/init.php:36
+msgid "You can set predefined email addressed here (comma-separated list):"
+msgstr "Vous pouvez prédéfinir des adresses de courriel (séparées par des virgules):"
+
+#: plugins/mail/init.php:140
+msgid "To:"
+msgstr "À :"
+
+#: plugins/mail/init.php:155
+msgid "Subject:"
+msgstr "Sujet :"
+
+#: plugins/mail/init.php:172
+msgid "Send e-mail"
+msgstr "Envoyer le mail"
 
 #: plugins/share/init.php:39
 msgid "You can disable all articles shared by unique URLs here."
@@ -2810,24 +2664,96 @@ msgstr "Désactiver le partage pour tous les articles"
 msgid "Share by URL"
 msgstr "Partager par URL"
 
-#: plugins/share/init.php:97
+#: plugins/share/init.php:96
 msgid "You can share this article by the following unique URL:"
 msgstr "Vous pouvez partager cet article avec l'URL unique suivante :"
 
-#: plugins/share/init.php:115
+#: plugins/share/init.php:114
 msgid "Unshare article"
 msgstr "Annuler le partage de l'article"
 
+#: plugins/af_comics/init.php:48
+msgid "Feeds supported by af_comics"
+msgstr "Flux supportés par af_comics"
+
+#: plugins/af_comics/init.php:50
+msgid "The following comics are currently supported:"
+msgstr "Les comics suivants sont actuellement supportés :"
+
+#: plugins/af_comics/init.php:68
+msgid "GoComics requires a specific URL to workaround their lack of feed support: <code>http://feeds.feedburner.com/uclick/<em>comic_name</em></code> (e.g. <code>http://www.gocomics.com/garfield</code> uses <code>http://feeds.feedburner.com/uclick/garfield</code>)."
+msgstr ""
+
+#: plugins/af_comics/init.php:70
+msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:25
+msgid "Reddit content settings (af_redditimgur)"
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:50
+msgid "Uses Readability (full-text-rss) implementation by <a target='_blank' href='https://bitbucket.org/fivefilters/'>FiveFilters.org</a>"
+msgstr "Utilise l'implémentation de Readability (full-text-rss) par <a target='_blank' href='https://bitbucket.org/fivefilters/'>FiveFilters.org</a>"
+
+#: plugins/af_redditimgur/init.php:54
+msgid "Extract missing content using Readability"
+msgstr "Extraire le contenu manquant avec Readability"
+
+#: plugins/af_redditimgur/init.php:59
+msgid "Enable additional duplicate checking"
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:73
+#: plugins/af_zz_imgproxy/init.php:254
+msgid "Configuration saved"
+msgstr "La configuration a été enregistrée"
+
+#: plugins/note/init.php:26
+#: plugins/note/note.js:11
+msgid "Edit article note"
+msgstr "Modifier l'annotation de l'article"
+
+#: plugins/close_button/init.php:25
+msgid "Close article"
+msgstr "Fermer l'article"
+
+#: plugins/af_zz_imgproxy/init.php:210
+msgid "Image proxy settings (af_zz_imgproxy)"
+msgstr ""
+
+#: plugins/af_zz_imgproxy/init.php:234
+#, fuzzy
+msgid "Enable proxy for all remote images."
+msgstr "Activer pour tous les flux:"
+
+#: plugins/af_zz_imgproxy/init.php:238
+#, fuzzy
+msgid "Don't cache files locally."
+msgstr "Enregistrer localement les images"
+
+#: plugins/auth_internal/init.php:65
+msgid "Please enter your one time password:"
+msgstr "Veuillez saisir votre mot de passe à usage unique :"
+
+#: plugins/auth_internal/init.php:188
+msgid "Password has been changed."
+msgstr "Le mot de passe a été modifié."
+
+#: plugins/auth_internal/init.php:190
+msgid "Old password is incorrect."
+msgstr "L'ancien mot de passe n'est pas correct."
+
 #: js/FeedTree.js:172
 #, fuzzy
 msgid "(Un)collapse"
 msgstr "Ouvrir/fermer la barre latérale"
 
-#: js/PrefFeedTree.js:52
+#: js/PrefFeedTree.js:54
 msgid "Edit category"
 msgstr "Modifier la catégorie"
 
-#: js/PrefFeedTree.js:59
+#: js/PrefFeedTree.js:61
 msgid "Remove category"
 msgstr "Supprimer la catégorie"
 
@@ -2862,63 +2788,55 @@ msgid "Create Filter"
 msgstr "Créer un filtre"
 
 #: js/functions.js:1128
-msgid "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification hub again on next feed update."
-msgstr "Réinitialiser l'inscription ? Tiny Tiny RSS essayera de se réinscrire au hub de notification lors de la prochaine mise à jour du flux."
-
-#: js/functions.js:1139
-msgid "Subscription reset."
-msgstr "Abonnement réinitialisé."
-
-#: js/functions.js:1149
-#: js/tt-rss.js:695
+#: js/tt-rss.js:696
 #, perl-format
 msgid "Unsubscribe from %s?"
 msgstr "Se désabonner de %s ?"
 
-#: js/functions.js:1152
+#: js/functions.js:1131
 msgid "Removing feed..."
 msgstr "Suppression du flux..."
 
-#: js/functions.js:1225
+#: js/functions.js:1204
 msgid "Please enter category title:"
 msgstr "Veuillez saisir un titre pour cette catégorie :"
 
-#: js/functions.js:1250
+#: js/functions.js:1229
 msgid "Generate new syndication address for this feed?"
 msgstr "Générer une nouvelle adresse d'abonnement pour ce flux ?"
 
-#: js/functions.js:1254
-#: js/prefs.js:1154
+#: js/functions.js:1233
+#: js/prefs.js:1150
 msgid "Trying to change address..."
 msgstr "Changement de l'adresse..."
 
-#: js/functions.js:1497
-#: js/functions.js:1606
+#: js/functions.js:1476
+#: js/functions.js:1585
 #: js/prefs.js:398
 #: js/prefs.js:424
 #: js/prefs.js:456
 #: js/prefs.js:599
 #: js/prefs.js:617
-#: js/prefs.js:1136
-#: js/prefs.js:1263
+#: js/prefs.js:1132
+#: js/prefs.js:1259
 msgid "No feeds are selected."
 msgstr "Aucun flux sélectionné."
 
-#: js/functions.js:1540
+#: js/functions.js:1519
 msgid "Remove selected feeds from the archive? Feeds with stored articles will not be removed."
 msgstr "Supprimer les flux sélectionnés de l'archive ? Les flux contenant des articles stockés ne seront pas supprimés."
 
-#: js/functions.js:1577
+#: js/functions.js:1556
 msgid "Feeds with update errors"
 msgstr "Flux avec des erreurs de mise à jour"
 
-#: js/functions.js:1588
-#: js/prefs.js:1117
+#: js/functions.js:1567
+#: js/prefs.js:1113
 msgid "Remove selected feeds?"
 msgstr "Supprimer les flux sélectionnés ?"
 
-#: js/functions.js:1591
-#: js/prefs.js:1120
+#: js/functions.js:1570
+#: js/prefs.js:1116
 msgid "Removing selected feeds..."
 msgstr "Suppression des flux sélectionnés..."
 
@@ -2941,9 +2859,7 @@ msgstr "Éditeur d'utilisateur"
 #: js/prefs.js:100
 #: js/prefs.js:209
 #: js/prefs.js:706
-#: plugins/instances/instances.js:26
-#: plugins/instances/instances.js:89
-#: js/functions.js:1408
+#: js/functions.js:1387
 msgid "Saving data..."
 msgstr "Enregistrement des données..."
 
@@ -2968,7 +2884,7 @@ msgid "Removing selected labels..."
 msgstr "Suppression des étiquettes sélectionnées..."
 
 #: js/prefs.js:308
-#: js/prefs.js:1304
+#: js/prefs.js:1300
 msgid "No labels are selected."
 msgstr "Aucune étiquette sélectionnée."
 
@@ -3067,28 +2983,28 @@ msgstr "Enregistrer les modifications aux flux sélectionnés ?"
 msgid "OPML Import"
 msgstr "Import OPML"
 
-#: js/prefs.js:764
+#: js/prefs.js:759
 msgid "Please choose an OPML file first."
 msgstr "Veuillez d'abord sélectionner un fichier OPML."
 
-#: js/prefs.js:767
+#: js/prefs.js:762
 #: plugins/import_export/import_export.js:115
 msgid "Importing, please wait..."
 msgstr "Import en cours, veuillez patienter..."
 
-#: js/prefs.js:928
+#: js/prefs.js:924
 msgid "Reset to defaults?"
 msgstr "Revenir aux valeurs par défaut ?"
 
-#: js/prefs.js:1628
+#: js/prefs.js:1624
 msgid "Subscribing to feeds..."
 msgstr "Abonnement aux flux..."
 
-#: js/prefs.js:1647
+#: js/prefs.js:1643
 msgid "Clear stored data for this plugin?"
 msgstr "Effacer les données pour ce plugin ?"
 
-#: js/prefs.js:1661
+#: js/prefs.js:1657
 msgid "Clear all messages in the error log?"
 msgstr "Vider le journal des erreurs ?"
 
@@ -3100,176 +3016,147 @@ msgstr "Marquer tous les articles comme lus ?"
 msgid "Marking all feeds as read..."
 msgstr "Marquage de tous les flux comme lus..."
 
-#: js/tt-rss.js:401
+#: js/tt-rss.js:402
 msgid "Please enable mail plugin first."
 msgstr "Veuillez d'abord activer le plugin mail."
 
-#: js/tt-rss.js:449
-#: js/functions.js:1387
-#: js/tt-rss.js:676
+#: js/tt-rss.js:450
+#: js/functions.js:1366
+#: js/tt-rss.js:677
 msgid "You can't edit this kind of feed."
 msgstr "Vous ne pouvez pas modifier ce type de flux."
 
-#: js/tt-rss.js:530
+#: js/tt-rss.js:531
 msgid "Please enable embed_original plugin first."
 msgstr "Veuillez d'abord activer le plugin embed_original."
 
-#: js/tt-rss.js:543
-#: js/tt-rss.js:726
+#: js/tt-rss.js:544
+#: js/tt-rss.js:727
 msgid "Widescreen is not available in combined mode."
 msgstr "L'écran large n'est pas disponible en mode combiné."
 
-#: js/tt-rss.js:824
+#: js/tt-rss.js:825
 msgid "You can't rescore this kind of feed."
 msgstr "Vous ne pouvez pas recalculer le score de ce type de flux."
 
-#: js/tt-rss.js:829
-#: js/tt-rss.js:689
+#: js/tt-rss.js:830
+#: js/tt-rss.js:690
 msgid "Please select some feed first."
 msgstr "Veuillez d'abord sélectionner un flux."
 
-#: js/tt-rss.js:834
+#: js/tt-rss.js:835
 #, perl-format
 msgid "Rescore articles in %s?"
 msgstr "Recalculer le score des articles de %s ?"
 
-#: js/tt-rss.js:837
+#: js/tt-rss.js:838
 msgid "Rescoring articles..."
 msgstr "Recalcul des scores des articles..."
 
-#: js/viewfeed.js:919
-#: js/viewfeed.js:957
-#: js/viewfeed.js:1005
-#: js/viewfeed.js:1931
-#: plugins/mail/mail.js:7
+#: js/viewfeed.js:921
+#: js/viewfeed.js:959
+#: js/viewfeed.js:1007
+#: js/viewfeed.js:1933
 #: plugins/mailto/init.js:7
-#: js/viewfeed.js:677
-#: js/viewfeed.js:699
-#: js/viewfeed.js:720
-#: js/viewfeed.js:779
-#: js/viewfeed.js:807
+#: plugins/mail/mail.js:7
+#: js/viewfeed.js:679
+#: js/viewfeed.js:701
+#: js/viewfeed.js:722
+#: js/viewfeed.js:781
+#: js/viewfeed.js:809
 msgid "No articles are selected."
 msgstr "Aucun article sélectionné."
 
-#: js/viewfeed.js:927
+#: js/viewfeed.js:929
 #, perl-format
 msgid "Delete %d selected article in %s?"
 msgid_plural "Delete %d selected articles in %s?"
 msgstr[0] "Supprimer %d article sélectionné de %s ?"
 msgstr[1] "Supprimer les %d articles sélectionnés de %s ?"
 
-#: js/viewfeed.js:929
+#: js/viewfeed.js:931
 #, perl-format
 msgid "Delete %d selected article?"
 msgid_plural "Delete %d selected articles?"
 msgstr[0] "Supprimer %d article sélectionné ?"
 msgstr[1] "Supprimer les %d articles sélectionnés ?"
 
-#: js/viewfeed.js:966
+#: js/viewfeed.js:968
 #, perl-format
 msgid "Archive %d selected article in %s?"
 msgid_plural "Archive %d selected articles in %s?"
 msgstr[0] "Archiver %d article sélectionné de %s ?"
 msgstr[1] "Archiver les %d articles sélectionnés de %s ?"
 
-#: js/viewfeed.js:969
+#: js/viewfeed.js:971
 #, perl-format
 msgid "Move %d archived article back?"
 msgid_plural "Move %d archived articles back?"
 msgstr[0] "Restaurer %d article archivé ?"
 msgstr[1] "Restaurer %d articles archivés ?"
 
-#: js/viewfeed.js:971
+#: js/viewfeed.js:973
 msgid "Please note that unstarred articles might get purged on next feed update."
 msgstr "Veuillez noter que les articles non marqués risquent d'être purgés à la prochaine mise à jour du flux."
 
-#: js/viewfeed.js:1011
+#: js/viewfeed.js:1013
 #, perl-format
 msgid "Mark %d selected article in %s as read?"
 msgid_plural "Mark %d selected articles in %s as read?"
 msgstr[0] "Marquer %d article sélectionné de %s comme lu ?"
 msgstr[1] "Marquer %d articles sélectionnés de %s comme lus ?"
 
-#: js/viewfeed.js:1031
+#: js/viewfeed.js:1033
 msgid "Edit article Tags"
 msgstr "Modifier les tags de l'article"
 
-#: js/viewfeed.js:1037
+#: js/viewfeed.js:1039
 msgid "Saving article tags..."
 msgstr "Sauvegarde des tags de l'article..."
 
-#: js/viewfeed.js:1670
+#: js/viewfeed.js:1672
 msgid "Open original article"
 msgstr "Ouvrir l'article original"
 
-#: js/viewfeed.js:1677
+#: js/viewfeed.js:1679
 msgid "Display article URL"
 msgstr "Afficher l'URL"
 
-#: js/viewfeed.js:1787
+#: js/viewfeed.js:1789
 msgid "Assign label"
 msgstr "Assigner l'étiquette"
 
-#: js/viewfeed.js:1792
+#: js/viewfeed.js:1794
 msgid "Remove label"
 msgstr "Supprimer l'étiquette"
 
-#: js/viewfeed.js:1824
+#: js/viewfeed.js:1826
 msgid "Select articles in group"
 msgstr "Sélectionner les articles du groupe"
 
-#: js/viewfeed.js:1834
+#: js/viewfeed.js:1836
 msgid "Mark group as read"
 msgstr "Marquer le groupe comme lu"
 
-#: js/viewfeed.js:1846
+#: js/viewfeed.js:1848
 msgid "Mark feed as read"
 msgstr "Marquer le flux comme lu"
 
-#: js/viewfeed.js:1899
+#: js/viewfeed.js:1901
 msgid "Please enter new score for selected articles:"
 msgstr "Nouveau score des articles sélectionnés :"
 
-#: js/viewfeed.js:1962
+#: js/viewfeed.js:1964
 msgid "Please enter new score for this article:"
 msgstr "Nouveau score pour cet article :"
 
-#: js/viewfeed.js:1993
+#: js/viewfeed.js:1995
 msgid "Article URL:"
 msgstr "URL de l'article :"
 
-#: plugins/instances/instances.js:10
-msgid "Link Instance"
-msgstr "Lier l'instance"
-
-#: plugins/instances/instances.js:73
-msgid "Edit Instance"
-msgstr "Modifier l'instance"
-
-#: plugins/instances/instances.js:122
-msgid "Remove selected instances?"
-msgstr "Supprimer les instances sélectionnées ?"
-
-#: plugins/instances/instances.js:125
-msgid "Removing selected instances..."
-msgstr "Suppression des instances sélectionnées..."
-
-#: plugins/instances/instances.js:139
-#: plugins/instances/instances.js:151
-msgid "No instances are selected."
-msgstr "Aucune instance sélectionnée."
-
-#: plugins/instances/instances.js:156
-msgid "Please select only one instance."
-msgstr "Veuillez ne sélectionner qu'une instance."
-
-#: plugins/note/note.js:17
-msgid "Saving article note..."
-msgstr "Sauvegarde de l'annotation de l'article..."
-
-#: plugins/af_psql_trgm/init.js:11
-msgid "Related articles"
-msgstr "Articles liés"
+#: plugins/embed_original/init.js:6
+msgid "Sorry, your browser does not support sandboxed iframes."
+msgstr "Malheureusement, votre navigateur ne supporte pas les iframes sécurisées."
 
 #: plugins/import_export/import_export.js:13
 msgid "Export Data"
@@ -3290,11 +3177,15 @@ msgstr "Import de données"
 msgid "Please choose the file first."
 msgstr "Veuillez d'abord choisir le fichier."
 
-#: plugins/mail/mail.js:21
 #: plugins/mailto/init.js:21
+#: plugins/mail/mail.js:21
 msgid "Forward article by email"
 msgstr "Transférer l'article par email"
 
+#: plugins/af_psql_trgm/init.js:11
+msgid "Related articles"
+msgstr "Articles liés"
+
 #: plugins/mail/mail.js:36
 msgid "Error sending email:"
 msgstr "Erreur à l'envoi du courriel:"
@@ -3303,10 +3194,6 @@ msgstr "Erreur à l'envoi du courriel:"
 msgid "Your message has been sent."
 msgstr "Votre message a été envoyé."
 
-#: plugins/embed_original/init.js:6
-msgid "Sorry, your browser does not support sandboxed iframes."
-msgstr "Malheureusement, votre navigateur ne supporte pas les iframes sécurisées."
-
 #: plugins/shorten_expanded/init.js:39
 msgid "Click to expand article"
 msgstr "Cliquer pour développer l'article"
@@ -3336,7 +3223,7 @@ msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr "Ceci va invalider tous les articles partagés par URL. Souhaitez-vous continuer ?"
 
 #: plugins/share/share_prefs.js:6
-#: js/prefs.js:1437
+#: js/prefs.js:1433
 msgid "Clearing URLs..."
 msgstr "Nettoyage des URL..."
 
@@ -3344,23 +3231,44 @@ msgstr "Nettoyage des URL..."
 msgid "Shared URLs cleared."
 msgstr "URL partagées supprimées."
 
+#: plugins/note/note.js:17
+msgid "Saving article note..."
+msgstr "Sauvegarde de l'annotation de l'article..."
+
 #: js/feedlist.js:429
-#: js/feedlist.js:496
 msgid "Mark all articles in %s as read?"
 msgstr "Marquer tous les articles de %s comme lus ?"
 
 #: js/feedlist.js:487
-msgid "Mark all articles in %s older than 1 day as read?"
+#, fuzzy
+msgid "Mark %w in %s older than 1 day as read?"
 msgstr "Marquer tous les articles de %s âgés d'au moins 1 jour comme lus ?"
 
 #: js/feedlist.js:490
-msgid "Mark all articles in %s older than 1 week as read?"
+#, fuzzy
+msgid "Mark %w in %s older than 1 week as read?"
 msgstr "Marquer tous les articles de %s âgés d'au moins 1 semaine comme lus ?"
 
 #: js/feedlist.js:493
-msgid "Mark all articles in %s older than 2 weeks as read?"
+#, fuzzy
+msgid "Mark %w in %s older than 2 weeks as read?"
 msgstr "Marquer tous les articles de %s âgés d'au moins 2 semaines comme lus ?"
 
+#: js/feedlist.js:496
+#, fuzzy
+msgid "Mark %w in %s as read?"
+msgstr "Marquer tous les articles de %s comme lus ?"
+
+#: js/feedlist.js:499
+#, fuzzy
+msgid "search results"
+msgstr "Résultats de recherche : %s"
+
+#: js/feedlist.js:499
+#, fuzzy
+msgid "all articles"
+msgstr "Tous les articles"
+
 #: js/functions.js:506
 msgid "Error explained"
 msgstr "Erreur expliquée"
@@ -3441,176 +3349,245 @@ msgstr "Vous êtes déjà abonné à ce flux."
 msgid "Edit rule"
 msgstr "Modifier la règle"
 
-#: js/functions.js:1402
+#: js/functions.js:1381
 msgid "Edit Feed"
 msgstr "Modifier le flux"
 
-#: js/functions.js:1435
+#: js/functions.js:1414
 msgid "More Feeds"
 msgstr "D'autres flux"
 
-#: js/functions.js:1631
+#: js/functions.js:1610
 msgid "Help"
 msgstr "Aide"
 
-#: js/prefs.js:1032
+#: js/prefs.js:1028
 msgid "Remove category %s? Any nested feeds would be placed into Uncategorized."
 msgstr "Supprimer la catégorie %s ? Tous les flux enfants seront placés dans Sans catégorie."
 
-#: js/prefs.js:1038
+#: js/prefs.js:1034
 msgid "Removing category..."
 msgstr "Suppression de la catégorie..."
 
-#: js/prefs.js:1056
+#: js/prefs.js:1052
 msgid "Remove selected categories?"
 msgstr "Supprimer les catégories sélectionnées ?"
 
-#: js/prefs.js:1059
+#: js/prefs.js:1055
 msgid "Removing selected categories..."
 msgstr "Suppression des catégories sélectionnées..."
 
-#: js/prefs.js:1072
+#: js/prefs.js:1068
 msgid "No categories are selected."
 msgstr "Aucune catégorie sélectionnée."
 
-#: js/prefs.js:1079
+#: js/prefs.js:1075
 msgid "Category title:"
 msgstr "Titre de la catégorie :"
 
-#: js/prefs.js:1083
+#: js/prefs.js:1079
 msgid "Creating category..."
 msgstr "Création de la catégorie..."
 
-#: js/prefs.js:1106
+#: js/prefs.js:1102
 msgid "Feeds without recent updates"
 msgstr "Flux sans mise à jour récente"
 
-#: js/prefs.js:1150
+#: js/prefs.js:1146
 msgid "Replace current OPML publishing address with a new one?"
 msgstr "Remplacer l'adresse de publication OPML actuelle par une nouvelle ?"
 
-#: js/prefs.js:1227
+#: js/prefs.js:1223
 msgid "Clearing feed..."
 msgstr "Nettoyage du flux..."
 
-#: js/prefs.js:1247
+#: js/prefs.js:1243
 msgid "Rescore articles in selected feeds?"
 msgstr "Recalculer le score des articles des flux sélectionnés ?"
 
-#: js/prefs.js:1250
+#: js/prefs.js:1246
 msgid "Rescoring selected feeds..."
 msgstr "Recalcul du score des flux sélectionnés..."
 
-#: js/prefs.js:1270
+#: js/prefs.js:1266
 msgid "Rescore all articles? This operation may take a lot of time."
 msgstr "Recalculer le score de tous les articles ? Cette opération peut prendre beaucoup de temps."
 
-#: js/prefs.js:1273
+#: js/prefs.js:1269
 msgid "Rescoring feeds..."
 msgstr "Recalcul du score des flux..."
 
-#: js/prefs.js:1289
+#: js/prefs.js:1285
 msgid "Reset selected labels to default colors?"
 msgstr "Ré-initialiser les couleurs des étiquettes aux couleurs par défaut ?"
 
-#: js/prefs.js:1321
+#: js/prefs.js:1317
 msgid "Settings Profiles"
 msgstr "Paramètres des profils"
 
-#: js/prefs.js:1330
+#: js/prefs.js:1326
 msgid "Remove selected profiles? Active and default profiles will not be removed."
 msgstr "Supprimer les profils sélectionnés ? Les profils actifs et par défaut ne seront pas supprimés."
 
-#: js/prefs.js:1333
+#: js/prefs.js:1329
 msgid "Removing selected profiles..."
 msgstr "Suppression des profils sélectionnés..."
 
-#: js/prefs.js:1349
+#: js/prefs.js:1345
 msgid "No profiles are selected."
 msgstr "Aucun profil sélectionné."
 
-#: js/prefs.js:1357
-#: js/prefs.js:1410
+#: js/prefs.js:1353
+#: js/prefs.js:1406
 msgid "Activate selected profile?"
 msgstr "Activer le profil sélectionné ?"
 
-#: js/prefs.js:1374
-#: js/prefs.js:1426
+#: js/prefs.js:1370
+#: js/prefs.js:1422
 msgid "Please choose a profile to activate."
 msgstr "Veuillez sélectionner un profil à activer."
 
-#: js/prefs.js:1379
+#: js/prefs.js:1375
 msgid "Creating profile..."
 msgstr "Création d'un profil..."
 
-#: js/prefs.js:1434
+#: js/prefs.js:1430
 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr "Ceci va invalider toutes les URL de flux générées auparavant. Souhaitez-vous continuer ?"
 
-#: js/prefs.js:1444
+#: js/prefs.js:1440
 msgid "Generated URLs cleared."
 msgstr "URL générées supprimées."
 
-#: js/prefs.js:1516
+#: js/prefs.js:1512
 msgid "Label Editor"
 msgstr "Éditeur d'étiquette"
 
-#: js/tt-rss.js:684
+#: js/tt-rss.js:685
 msgid "You can't unsubscribe from the category."
 msgstr "Vous ne pouvez pas vous désabonner de la catégorie."
 
-#: js/viewfeed.js:125
-#: js/viewfeed.js:175
-#: js/viewfeed.js:192
+#: js/viewfeed.js:127
+#: js/viewfeed.js:177
+#: js/viewfeed.js:194
 msgid "Click to open next unread feed."
 msgstr "Cliquez pour aller au prochain flux non lu"
 
-#: js/viewfeed.js:129
+#: js/viewfeed.js:131
 msgid "Cancel search"
 msgstr "Annuler la recherche"
 
-#: js/viewfeed.js:189
+#: js/viewfeed.js:191
 msgid "New articles found, reload feed to continue."
 msgstr "Nouveaux articles trouvés, rechargez le flux pour continuer."
 
-#: js/viewfeed.js:424
+#: js/viewfeed.js:426
 msgid "Unstar article"
 msgstr "Ne plus marquer comme remarquable"
 
-#: js/viewfeed.js:428
+#: js/viewfeed.js:430
 msgid "Star article"
 msgstr "Marquer comme remarquable"
 
-#: js/viewfeed.js:478
+#: js/viewfeed.js:480
 msgid "Unpublish article"
 msgstr "Ne plus publier l'article"
 
-#: js/viewfeed.js:482
+#: js/viewfeed.js:484
 msgid "Publish article"
 msgstr "Publier l'article"
 
-#: js/viewfeed.js:622
+#: js/viewfeed.js:624
 msgid "%d article selected"
 msgid_plural "%d articles selected"
 msgstr[0] "%d article sélectionné"
 msgstr[1] "%d articles sélectionnés"
 
-#: js/viewfeed.js:1286
+#: js/viewfeed.js:1288
 msgid "No article is selected."
 msgstr "Aucun article sélectionné."
 
-#: js/viewfeed.js:1321
+#: js/viewfeed.js:1323
 msgid "No articles found to mark"
 msgstr "Aucun article à marquer"
 
-#: js/viewfeed.js:1323
+#: js/viewfeed.js:1325
 msgid "Mark %d article as read?"
 msgid_plural "Mark %d articles as read?"
 msgstr[0] "Marquer %d article comme lu ?"
 msgstr[1] "Marquer %d articles comme lus ?"
 
-#~ msgid "Cache images locally"
-#~ msgstr "Enregistrer localement les images"
+#~ msgid "Resubscribe to push updates"
+#~ msgstr "Réinscription aux mises à jour en push"
+
+#~ msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
+#~ msgstr "Réinitialiser l'état de l'inscription PubSubHubbub pour les flux en mise à jour push."
+
+#~ msgid "Download more plugins at tt-rss.org <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forums</a> or <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a>."
+#~ msgstr "Téléchargez plus de plugins sur <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">le forum</a> ou <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">le wiki</a> de Tiny Tiny RSS."
+
+#~ msgid "Linked"
+#~ msgstr "Instances liées"
+
+#~ msgid "Instance"
+#~ msgstr "Instance"
+
+#~ msgid "Instance URL"
+#~ msgstr "URL de l'instance"
+
+#~ msgid "Access key:"
+#~ msgstr "Clef d'accès :"
+
+#~ msgid "Access key"
+#~ msgstr "Clef d'accès"
+
+#~ msgid "Use one access key for both linked instances."
+#~ msgstr "Utilisez une clef d'accès pour les deux instances liées."
+
+#~ msgid "Generate new key"
+#~ msgstr "Générer une nouvelle clef"
+
+#~ msgid "Link instance"
+#~ msgstr "Lier une instance"
+
+#~ msgid "You can connect other instances of Tiny Tiny RSS to this one to share Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
+#~ msgstr "Vous pouvez connecter d'autres instances de Tiny Tiny RSS à celle-ci pour partager les flux populaires. Pour cela, utilisez l'URL suivante :"
+
+#~ msgid "Last connected"
+#~ msgstr "Dernière connexion"
+
+#~ msgid "Status"
+#~ msgstr "État"
+
+#~ msgid "Stored feeds"
+#~ msgstr "Flux stockés"
+
+#~ msgid "Create link"
+#~ msgstr "Créer un lien"
+
+#~ msgid "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification hub again on next feed update."
+#~ msgstr "Réinitialiser l'inscription ? Tiny Tiny RSS essayera de se réinscrire au hub de notification lors de la prochaine mise à jour du flux."
+
+#~ msgid "Subscription reset."
+#~ msgstr "Abonnement réinitialisé."
+
+#~ msgid "Link Instance"
+#~ msgstr "Lier l'instance"
+
+#~ msgid "Edit Instance"
+#~ msgstr "Modifier l'instance"
+
+#~ msgid "Remove selected instances?"
+#~ msgstr "Supprimer les instances sélectionnées ?"
+
+#~ msgid "Removing selected instances..."
+#~ msgstr "Suppression des instances sélectionnées..."
+
+#~ msgid "No instances are selected."
+#~ msgstr "Aucune instance sélectionnée."
+
+#~ msgid "Please select only one instance."
+#~ msgstr "Veuillez ne sélectionner qu'une instance."
 
 #~ msgid "The error will be reported to the configured log destination."
 #~ msgstr "L'erreur sera reportée vers la destination configurée."
diff --git a/locale/hu_HU/LC_MESSAGES/messages.mo b/locale/hu_HU/LC_MESSAGES/messages.mo
index 43a5b886b..244615140 100644
--- a/locale/hu_HU/LC_MESSAGES/messages.mo
+++ b/locale/hu_HU/LC_MESSAGES/messages.mo
diff --git a/locale/hu_HU/LC_MESSAGES/messages.po b/locale/hu_HU/LC_MESSAGES/messages.po
index 433a6e492..6a8023af3 100644
--- a/locale/hu_HU/LC_MESSAGES/messages.po
+++ b/locale/hu_HU/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tt-rss-hu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 15:25+0300\n"
+"POT-Creation-Date: 2017-07-04 16:29+0300\n"
 "PO-Revision-Date: 2013-05-15 01:19+0100\n"
 "Last-Translator: Faludi Zoltán <[email protected]>\n"
 "Language-Team: HUNGARIAN\n"
@@ -172,31 +172,30 @@ msgstr "Felhasználó nem találhat"
 #: prefs.php:118
 #: classes/backend.php:5
 #: classes/pref/labels.php:282
-#: classes/pref/feeds.php:1402
-#: classes/pref/filters.php:779
+#: classes/pref/filters.php:819
+#: classes/pref/feeds.php:1376
 #: js/feedlist.js:149
-#: js/functions.js:1131
-#: js/functions.js:1231
-#: js/functions.js:1478
+#: js/functions.js:1210
+#: js/functions.js:1457
 #: js/prefs.js:621
-#: js/prefs.js:818
-#: js/prefs.js:1648
-#: js/prefs.js:1663
-#: js/tt-rss.js:550
-#: js/viewfeed.js:1182
+#: js/prefs.js:813
+#: js/prefs.js:1644
+#: js/prefs.js:1659
+#: js/tt-rss.js:551
+#: js/viewfeed.js:1184
 #: plugins/import_export/import_export.js:17
 #: js/feedlist.js:467
-#: js/feedlist.js:512
+#: js/feedlist.js:515
 #: js/functions.js:372
 #: js/functions.js:630
-#: js/prefs.js:1360
-#: js/prefs.js:1413
-#: js/prefs.js:1452
-#: js/prefs.js:1465
-#: js/prefs.js:1476
-#: js/prefs.js:1491
-#: js/tt-rss.js:567
-#: js/viewfeed.js:762
+#: js/prefs.js:1356
+#: js/prefs.js:1409
+#: js/prefs.js:1448
+#: js/prefs.js:1461
+#: js/prefs.js:1472
+#: js/prefs.js:1487
+#: js/tt-rss.js:568
+#: js/viewfeed.js:764
 msgid "Loading, please wait..."
 msgstr "Betöltés, kérem várjon..."
 
@@ -213,13 +212,13 @@ msgid "All Articles"
 msgstr "Minden hír"
 
 #: index.php:192
-#: include/functions2.php:107
+#: include/functions.php:1181
 #: classes/feeds.php:110
 msgid "Starred"
 msgstr "Csillagozott"
 
 #: index.php:193
-#: include/functions2.php:108
+#: include/functions.php:1182
 #: classes/feeds.php:111
 msgid "Published"
 msgstr "Publikált"
@@ -260,7 +259,7 @@ msgstr "Cím"
 
 #: index.php:209
 #: index.php:249
-#: include/functions2.php:95
+#: include/functions.php:1169
 #: classes/feeds.php:115
 #: js/FeedTree.js:138
 #: js/FeedTree.js:166
@@ -300,7 +299,7 @@ msgid "Feed actions:"
 msgstr "Műveletek hírcsatornákkal:"
 
 #: index.php:244
-#: classes/handler/public.php:672
+#: classes/handler/public.php:583
 msgid "Subscribe to feed..."
 msgstr "Feliratkozás hírcsatornára..."
 
@@ -314,8 +313,8 @@ msgstr "Hírcsatorna újrapontozása"
 
 #: index.php:247
 #: classes/pref/feeds.php:785
-#: classes/pref/feeds.php:1357
-#: js/PrefFeedTree.js:78
+#: classes/pref/feeds.php:1331
+#: js/PrefFeedTree.js:80
 msgid "Unsubscribe"
 msgstr "Leiratkozás"
 
@@ -332,7 +331,7 @@ msgid "Other actions:"
 msgstr "Egyéb műveletek:"
 
 #: index.php:252
-#: include/functions2.php:81
+#: include/functions.php:1155
 msgid "Toggle widescreen mode"
 msgstr "Szélesvásznú mód váltása"
 
@@ -358,7 +357,7 @@ msgstr ""
 
 #: prefs.php:33
 #: prefs.php:136
-#: include/functions2.php:110
+#: include/functions.php:1184
 #: classes/pref/prefs.php:435
 msgid "Preferences"
 msgstr "Beállítások"
@@ -373,20 +372,19 @@ msgstr "Kilépés a beállításokból"
 
 #: prefs.php:139
 #: classes/pref/feeds.php:112
-#: classes/pref/feeds.php:1297
-#: classes/pref/feeds.php:1346
+#: classes/pref/feeds.php:1271
+#: classes/pref/feeds.php:1320
 msgid "Feeds"
 msgstr "Hírcsatornák"
 
 #: prefs.php:142
-#: classes/pref/filters.php:248
+#: classes/pref/filters.php:273
 msgid "Filters"
 msgstr "Szűrők"
 
 #: prefs.php:145
-#: include/functions.php:1327
-#: include/functions.php:1979
 #: classes/pref/labels.php:90
+#: classes/feeds.php:1718
 msgid "Labels"
 msgstr "Címkék"
 
@@ -415,13 +413,13 @@ msgstr "Új felhasználók regisztrációja adminisztrátor által letilva."
 #: register.php:337
 #: register.php:347
 #: register.php:359
-#: classes/handler/public.php:742
-#: classes/handler/public.php:813
-#: classes/handler/public.php:911
-#: classes/handler/public.php:990
-#: classes/handler/public.php:1004
-#: classes/handler/public.php:1011
-#: classes/handler/public.php:1036
+#: classes/handler/public.php:653
+#: classes/handler/public.php:724
+#: classes/handler/public.php:822
+#: classes/handler/public.php:901
+#: classes/handler/public.php:915
+#: classes/handler/public.php:922
+#: classes/handler/public.php:947
 msgid "Return to Tiny Tiny RSS"
 msgstr "Vissza az RSS-olvasóhoz"
 
@@ -438,12 +436,12 @@ msgid "Check availability"
 msgstr "Ellenőrizze, hogy nem foglalt-e már:"
 
 #: register.php:229
-#: classes/handler/public.php:829
+#: classes/handler/public.php:740
 msgid "Email:"
 msgstr "E-mail:"
 
 #: register.php:232
-#: classes/handler/public.php:834
+#: classes/handler/public.php:745
 msgid "How much is two plus two:"
 msgstr "Mennyi kettő meg kettő?"
 
@@ -471,17 +469,23 @@ msgstr "Felhasználói fiók sikeresen létrehozva"
 msgid "New user registrations are currently closed."
 msgstr "Új felhasználók regisztrációja jelenleg nem engedélyezett."
 
-#: update.php:67
+#: update.php:66
 msgid "Tiny Tiny RSS data update script."
 msgstr "A Tiny Tiny RSS adatbázis frissítő szkript."
 
-#: include/digest.php:109
-#: include/functions.php:1336
-#: include/functions.php:1880
-#: include/functions.php:1965
-#: include/functions.php:1987
-#: classes/opml.php:421
+#: include/controls.php:83
+#: classes/pref/filters.php:242
+#: classes/pref/filters.php:253
+#: classes/pref/filters.php:544
+msgid "All feeds"
+msgstr "Összes hírcsatorna"
+
+#: include/controls.php:134
+#: include/controls.php:316
 #: classes/pref/feeds.php:228
+#: classes/opml.php:486
+#: classes/feeds.php:1727
+#: classes/digest.php:113
 msgid "Uncategorized"
 msgstr "Kategorizálatlan"
 
@@ -496,391 +500,287 @@ msgstr[1] "%d archivált hír"
 msgid "No feeds found."
 msgstr "Nem található hírcsatorna."
 
-#: include/functions.php:1029
+#: include/functions.php:900
 #, php-format
 msgid "%d min"
 msgstr ""
 
-#: include/functions.php:1325
-#: include/functions.php:1977
-msgid "Special"
-msgstr "Kiemelt"
-
-#: include/functions.php:1828
-#: classes/pref/filters.php:229
-#: classes/pref/filters.php:507
-msgid "All feeds"
-msgstr "Összes hírcsatorna"
-
-#: include/functions.php:2032
-msgid "Starred articles"
-msgstr "Csillagozott hírek"
-
-#: include/functions.php:2034
-msgid "Published articles"
-msgstr "Publikált hírek"
-
-#: include/functions.php:2036
-msgid "Fresh articles"
-msgstr "Friss hírek"
-
-#: include/functions.php:2038
-#: include/functions2.php:105
-msgid "All articles"
-msgstr "Az összes hír"
-
-#: include/functions.php:2040
-msgid "Archived articles"
-msgstr "Archivált hírek"
-
-#: include/functions.php:2042
-msgid "Recently read"
-msgstr "Legutóbb olvasott"
-
-#: include/functions2.php:57
+#: include/functions.php:1131
 msgid "Navigation"
 msgstr "Navigáció"
 
-#: include/functions2.php:58
+#: include/functions.php:1132
 msgid "Open next feed"
 msgstr "Következő hírcsatorna megnyitása"
 
-#: include/functions2.php:59
+#: include/functions.php:1133
 msgid "Open previous feed"
 msgstr "Előző hírcsatorna megnyitása"
 
-#: include/functions2.php:60
+#: include/functions.php:1134
 msgid "Open next article"
 msgstr "Következő hír megnyitása"
 
-#: include/functions2.php:61
+#: include/functions.php:1135
 msgid "Open previous article"
 msgstr "Előző hír megjelenítése"
 
-#: include/functions2.php:62
+#: include/functions.php:1136
 msgid "Open next article (don't scroll long articles)"
 msgstr "Következő hír megnyitása (nem görgeti a hosszú híreket)"
 
-#: include/functions2.php:63
+#: include/functions.php:1137
 msgid "Open previous article (don't scroll long articles)"
 msgstr "Előző hír megnyitása (nem görgeti a hosszú híreket)"
 
-#: include/functions2.php:64
+#: include/functions.php:1138
 msgid "Move to next article (don't expand or mark read)"
 msgstr "Ugrás a következő hírre (nem bontja ki vagy jelöli olvasottnak)"
 
-#: include/functions2.php:65
+#: include/functions.php:1139
 msgid "Move to previous article (don't expand or mark read)"
 msgstr "Ugrás az előző hírre (nem bontja ki vagy jelöli olvasottnak)"
 
-#: include/functions2.php:66
+#: include/functions.php:1140
 msgid "Show search dialog"
 msgstr "Keresőmező megjelenítése"
 
-#: include/functions2.php:67
+#: include/functions.php:1141
 msgid "Article"
 msgstr "Hír"
 
-#: include/functions2.php:68
-#: js/viewfeed.js:1699
+#: include/functions.php:1142
+#: js/viewfeed.js:1701
 msgid "Toggle starred"
 msgstr "Csillagoz"
 
-#: include/functions2.php:69
-#: js/viewfeed.js:1711
+#: include/functions.php:1143
+#: js/viewfeed.js:1713
 msgid "Toggle published"
 msgstr "Publikált"
 
-#: include/functions2.php:70
-#: js/viewfeed.js:1686
+#: include/functions.php:1144
+#: js/viewfeed.js:1688
 msgid "Toggle unread"
 msgstr "Olvasatlannak jelöl"
 
-#: include/functions2.php:71
+#: include/functions.php:1145
 msgid "Edit tags"
 msgstr "Címkék szerkesztése"
 
-#: include/functions2.php:72
+#: include/functions.php:1146
 msgid "Open in new window"
 msgstr "Megnyitás új ablakban"
 
-#: include/functions2.php:73
-#: js/viewfeed.js:1732
+#: include/functions.php:1147
+#: js/viewfeed.js:1734
 msgid "Mark below as read"
 msgstr "Olvasottnak jel ez alatt"
 
-#: include/functions2.php:74
-#: js/viewfeed.js:1725
+#: include/functions.php:1148
+#: js/viewfeed.js:1727
 msgid "Mark above as read"
 msgstr "Olvasottnak jel ez fölött"
 
-#: include/functions2.php:75
+#: include/functions.php:1149
 msgid "Scroll down"
 msgstr "Legördítés"
 
-#: include/functions2.php:76
+#: include/functions.php:1150
 msgid "Scroll up"
 msgstr "Felgördítés"
 
-#: include/functions2.php:77
+#: include/functions.php:1151
 msgid "Select article under cursor"
 msgstr "Az kurzor alatti hír kiválasztása"
 
-#: include/functions2.php:78
+#: include/functions.php:1152
 msgid "Email article"
 msgstr "Hír küldése emailben"
 
-#: include/functions2.php:79
+#: include/functions.php:1153
 msgid "Close/collapse article"
 msgstr "Hír bezárása"
 
-#: include/functions2.php:80
+#: include/functions.php:1154
 msgid "Toggle article expansion (combined mode)"
 msgstr "Hír kibontás váltása (kombinált módban)"
 
-#: include/functions2.php:82
+#: include/functions.php:1156
 #: plugins/embed_original/init.php:31
 msgid "Toggle embed original"
 msgstr "Eredeti megjelenítésének váltása"
 
-#: include/functions2.php:83
+#: include/functions.php:1157
 msgid "Article selection"
 msgstr "Hír kijelölés"
 
-#: include/functions2.php:84
+#: include/functions.php:1158
 msgid "Select all articles"
 msgstr "Minden hír kijelölése"
 
-#: include/functions2.php:85
+#: include/functions.php:1159
 msgid "Select unread"
 msgstr "Olvasatlan hírek kijelölése"
 
-#: include/functions2.php:86
+#: include/functions.php:1160
 msgid "Select starred"
 msgstr "Csillagozott hírek kijelölése"
 
-#: include/functions2.php:87
+#: include/functions.php:1161
 msgid "Select published"
 msgstr "Publikált hírek kijlölése"
 
-#: include/functions2.php:88
+#: include/functions.php:1162
 msgid "Invert selection"
 msgstr "Fordított kijelölés"
 
-#: include/functions2.php:89
+#: include/functions.php:1163
 msgid "Deselect everything"
 msgstr "Kijelölés eltávolítása"
 
-#: include/functions2.php:90
+#: include/functions.php:1164
 #: classes/pref/feeds.php:555
-#: classes/pref/feeds.php:823
+#: classes/pref/feeds.php:811
 msgid "Feed"
 msgstr "Hírcsatorna"
 
-#: include/functions2.php:91
+#: include/functions.php:1165
 msgid "Refresh current feed"
 msgstr "Aktuális hírcsatorna frissítése"
 
-#: include/functions2.php:92
+#: include/functions.php:1166
 msgid "Un/hide read feeds"
 msgstr "Olvasott hírcsatornák rejtése/mutatása"
 
-#: include/functions2.php:93
-#: classes/pref/feeds.php:1349
+#: include/functions.php:1167
+#: classes/pref/feeds.php:1323
 msgid "Subscribe to feed"
 msgstr "Feliratkozás hírcsatornára"
 
-#: include/functions2.php:94
+#: include/functions.php:1168
 #: js/FeedTree.js:145
-#: js/PrefFeedTree.js:72
-#: js/viewfeed.js:1853
+#: js/PrefFeedTree.js:74
+#: js/viewfeed.js:1855
 msgid "Edit feed"
 msgstr "Hírcsatorna szerkesztése"
 
-#: include/functions2.php:96
+#: include/functions.php:1170
 msgid "Reverse headlines"
 msgstr "Címek fordított sorrendben"
 
-#: include/functions2.php:97
+#: include/functions.php:1171
 msgid "Toggle headline grouping"
 msgstr ""
 
-#: include/functions2.php:98
+#: include/functions.php:1172
 msgid "Debug feed update"
 msgstr "Hírcsatorna frissítés hibakaresés"
 
-#: include/functions2.php:99
+#: include/functions.php:1173
 #, fuzzy
 msgid "Debug viewfeed()"
 msgstr "Hírcsatorna frissítés hibakaresés"
 
-#: include/functions2.php:100
+#: include/functions.php:1174
 #: js/FeedTree.js:194
 msgid "Mark all feeds as read"
 msgstr "Minden hírcsatornát olvasottként jelöl"
 
-#: include/functions2.php:101
+#: include/functions.php:1175
 msgid "Un/collapse current category"
 msgstr "Kategória kinyitás/összecsukás"
 
-#: include/functions2.php:102
+#: include/functions.php:1176
 msgid "Toggle combined mode"
 msgstr "Váltás kombinált módba"
 
-#: include/functions2.php:103
+#: include/functions.php:1177
 msgid "Toggle auto expand in combined mode"
 msgstr "Automatikus kibontás kombinált módban"
 
-#: include/functions2.php:104
+#: include/functions.php:1178
 msgid "Go to"
 msgstr "Ugrás ide"
 
-#: include/functions2.php:106
+#: include/functions.php:1179
+#: classes/feeds.php:1602
+msgid "All articles"
+msgstr "Az összes hír"
+
+#: include/functions.php:1180
 msgid "Fresh"
 msgstr "Friss"
 
-#: include/functions2.php:109
-#: js/tt-rss.js:494
-#: js/tt-rss.js:663
+#: include/functions.php:1183
+#: js/tt-rss.js:495
+#: js/tt-rss.js:664
 msgid "Tag cloud"
 msgstr "Címkefelhő"
 
-#: include/functions2.php:111
+#: include/functions.php:1185
 msgid "Other"
 msgstr "Egyéb"
 
-#: include/functions2.php:112
+#: include/functions.php:1186
 #: classes/pref/labels.php:267
 msgid "Create label"
 msgstr "Címke létrehozása"
 
-#: include/functions2.php:113
-#: classes/pref/filters.php:753
+#: include/functions.php:1187
+#: classes/pref/filters.php:793
 msgid "Create filter"
 msgstr "Szűrő létrehozása"
 
-#: include/functions2.php:114
+#: include/functions.php:1188
 msgid "Un/collapse sidebar"
 msgstr "Oldalsáv megjelenítés/elrejtés"
 
-#: include/functions2.php:115
+#: include/functions.php:1189
 msgid "Show help dialog"
 msgstr "Súgó ablak megjelenítése"
 
-#: include/functions2.php:670
-#, php-format
-msgid "Search results: %s"
-msgstr "Keresési eredmények: %s"
-
-#: include/functions2.php:1336
-#: classes/feeds.php:752
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] "megjegyzés"
-msgstr[1] "megjegyzés"
-
-#: include/functions2.php:1340
-#: classes/feeds.php:756
-msgid "comments"
-msgstr "megjegyzések"
-
-#: include/functions2.php:1366
-msgid " - "
-msgstr "-"
-
-#: include/functions2.php:1397
-#: include/functions2.php:1648
-#: classes/article.php:311
-msgid "no tags"
-msgstr "nincs címke"
-
-#: include/functions2.php:1407
-#: classes/feeds.php:738
-msgid "Edit tags for this article"
-msgstr "Címkék hozzáadása a hírhez"
-
-#: include/functions2.php:1439
-#: classes/feeds.php:690
-msgid "Originally from:"
-msgstr "Eredeti innen:"
-
-#: include/functions2.php:1452
-#: classes/pref/feeds.php:574
-#: classes/feeds.php:703
-msgid "Feed URL"
-msgstr "Hírcsatorna URL"
-
-#: include/functions2.php:1489
-#: classes/backend.php:105
-#: classes/dlg.php:37
-#: classes/dlg.php:60
-#: classes/dlg.php:93
-#: classes/dlg.php:159
-#: classes/dlg.php:186
-#: classes/pref/feeds.php:1652
-#: classes/pref/feeds.php:1718
-#: classes/pref/filters.php:204
-#: classes/pref/prefs.php:1097
-#: plugins/af_psql_trgm/init.php:102
-#: plugins/import_export/init.php:415
-#: plugins/import_export/init.php:461
-#: plugins/share/init.php:121
-msgid "Close this window"
-msgstr "Ablak bezárása"
-
-#: include/functions2.php:1686
-msgid "(edit note)"
-msgstr "(jegyzet szerkesztése)"
-
-#: include/functions2.php:1960
-msgid "unknown type"
-msgstr "ismeretlen hírcsatornatípus"
-
-#: include/functions2.php:2037
-msgid "Attachments"
-msgstr "Csatolmányok:"
-
-#: include/functions2.php:2496
+#: include/functions.php:2456
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: include/functions2.php:2497
+#: include/functions.php:2457
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: include/functions2.php:2498
+#: include/functions.php:2458
 msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
 msgstr ""
 
-#: include/functions2.php:2499
+#: include/functions.php:2459
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: include/functions2.php:2500
+#: include/functions.php:2460
 #, fuzzy
 msgid "No file was uploaded"
 msgstr "Nincs felöltött fájl."
 
-#: include/functions2.php:2501
+#: include/functions.php:2461
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: include/functions2.php:2502
+#: include/functions.php:2462
 msgid "Failed to write file to disk."
 msgstr ""
 
-#: include/functions2.php:2503
+#: include/functions.php:2463
 msgid "A PHP extension stopped the file upload."
 msgstr ""
 
 #: include/login_form.php:197
-#: classes/handler/public.php:569
-#: classes/handler/public.php:824
+#: classes/handler/public.php:480
+#: classes/handler/public.php:735
 msgid "Login:"
 msgstr "Felhasználó:"
 
 #: include/login_form.php:207
-#: classes/handler/public.php:572
+#: classes/handler/public.php:483
 msgid "Password:"
 msgstr "Jelszó:"
 
@@ -893,7 +793,7 @@ msgid "Profile:"
 msgstr "Profil:"
 
 #: include/login_form.php:223
-#: classes/handler/public.php:311
+#: classes/handler/public.php:287
 #: classes/pref/prefs.php:1035
 #: classes/rpc.php:63
 msgid "Default profile"
@@ -912,7 +812,7 @@ msgid "Remember me"
 msgstr "Emlékezzen rám"
 
 #: include/login_form.php:249
-#: classes/handler/public.php:577
+#: classes/handler/public.php:488
 msgid "Log in"
 msgstr "Belépés"
 
@@ -928,145 +828,44 @@ msgstr "Nem sikerült érvényesíteni a munkamenetet (felhasználó nem találh
 msgid "Session failed to validate (password changed)"
 msgstr "Nem sikerült érvényesíteni a munkamenetet (megváltozott a jelszó)"
 
-#: classes/article.php:25
-msgid "Article not found."
-msgstr "Hír nem található."
-
-#: classes/article.php:197
-msgid "Tags for this article (separated by commas):"
-msgstr "A hír címkéi (vesszőkkel elválasztva):"
-
-#: classes/article.php:222
-#: classes/pref/labels.php:79
-#: classes/pref/users.php:98
-#: classes/pref/feeds.php:801
-#: classes/pref/feeds.php:943
-#: classes/pref/filters.php:485
-#: classes/pref/prefs.php:981
-#: plugins/instances/init.php:245
-#: plugins/nsfw/init.php:85
-#: plugins/note/init.php:51
-#: plugins/af_readability/init.php:68
-#: plugins/af_redditimgur/init.php:60
-#: plugins/af_psql_trgm/init.php:181
-#: plugins/mail/init.php:64
-#: plugins/af_zz_imgproxy/init.php:213
-msgid "Save"
-msgstr "Mentés"
-
-#: classes/article.php:224
-#: classes/handler/public.php:546
-#: classes/handler/public.php:580
-#: classes/pref/labels.php:81
-#: classes/pref/users.php:100
-#: classes/pref/feeds.php:802
-#: classes/pref/feeds.php:946
-#: classes/pref/feeds.php:1859
-#: classes/pref/filters.php:488
-#: classes/pref/filters.php:902
-#: classes/pref/filters.php:983
-#: classes/pref/filters.php:1076
-#: classes/pref/prefs.php:983
-#: classes/feeds.php:1105
-#: classes/feeds.php:1155
-#: classes/feeds.php:1192
-#: plugins/instances/init.php:248
-#: plugins/instances/init.php:436
-#: plugins/note/init.php:53
-#: plugins/mail/init.php:173
-msgid "Cancel"
-msgstr "Mégsem"
-
-#: classes/opml.php:28
-#: classes/opml.php:33
-msgid "OPML Utility"
-msgstr "OMPL-segédprogram"
-
-#: classes/opml.php:37
-msgid "Importing OPML..."
-msgstr "OPML importálás..."
-
-#: classes/opml.php:41
-msgid "Return to preferences"
-msgstr "Vissza a beállításokhoz"
-
-#: classes/opml.php:271
-#, php-format
-msgid "Adding feed: %s"
-msgstr "Hírcsatorna hozzáadása: %s"
-
-#: classes/opml.php:282
-#, php-format
-msgid "Duplicate feed: %s"
-msgstr "Duplikált hírcsatorna: %s"
-
-#: classes/opml.php:296
-#, php-format
-msgid "Adding label %s"
-msgstr "Címke hozzáadása %s"
-
-#: classes/opml.php:299
-#, php-format
-msgid "Duplicate label: %s"
-msgstr "Dupla címke: %s"
-
-#: classes/opml.php:311
-#, php-format
-msgid "Setting preference key %s to %s"
-msgstr "%s kulcs beállítása erre: %s"
-
-#: classes/opml.php:343
-msgid "Adding filter..."
-msgstr "Szűrő hozzáadása..."
-
-#: classes/opml.php:421
-#, php-format
-msgid "Processing category: %s"
-msgstr "%s kategória feldolgozása"
-
-#: classes/opml.php:470
-#, php-format
-msgid "Upload failed with error code %d"
-msgstr "Feltöltés sikertelen. Hibakód: %d"
-
-#: classes/opml.php:484
-#: plugins/import_export/init.php:442
-msgid "Unable to move uploaded file."
-msgstr "A feltöltött fájl nem helyezhető át."
-
-#: classes/opml.php:488
-#: plugins/import_export/init.php:446
-msgid "Error: please upload OPML file."
-msgstr "Hiba: kérem töltse fel az OPML fájlt!"
-
-#: classes/opml.php:499
-msgid "Error: unable to find moved OPML file."
-msgstr "Hiba: nem található az áthelyezett OPML fájl."
-
-#: classes/opml.php:506
-msgid "Error while parsing document."
-msgstr "Hiba történt a dokuementum feldoglozása közben"
-
-#: classes/backend.php:33
+#: classes/backend.php:31
 msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
 msgstr "További tippek a felhasználói felülethez elérhetők a Tiny Tiny RSS wikiben."
 
-#: classes/backend.php:38
+#: classes/backend.php:36
 msgid "Keyboard Shortcuts"
 msgstr "Billentyűparancsok"
 
-#: classes/backend.php:61
+#: classes/backend.php:59
 msgid "Shift"
 msgstr "Shift"
 
-#: classes/backend.php:64
+#: classes/backend.php:62
 msgid "Ctrl"
 msgstr "Ctrl"
 
-#: classes/backend.php:99
+#: classes/backend.php:97
 msgid "Help topic not found."
 msgstr "Súgótéma nem tlálható."
 
+#: classes/backend.php:103
+#: classes/dlg.php:37
+#: classes/dlg.php:60
+#: classes/dlg.php:93
+#: classes/dlg.php:159
+#: classes/dlg.php:186
+#: classes/article.php:744
+#: classes/pref/filters.php:206
+#: classes/pref/prefs.php:1097
+#: classes/pref/feeds.php:1626
+#: classes/pref/feeds.php:1692
+#: plugins/import_export/init.php:421
+#: plugins/import_export/init.php:467
+#: plugins/af_psql_trgm/init.php:102
+#: plugins/share/init.php:120
+msgid "Close this window"
+msgstr "Ablak bezárása"
+
 #: classes/dlg.php:17
 msgid "If you have imported labels and/or filters, you might need to reload preferences to see your new data."
 msgstr "Ha címkéket és szűrőket is importált, akkor szükség lehet a beállításokat újra kell tölteni."
@@ -1077,7 +876,7 @@ msgstr "A publikus OPML URL címe:"
 
 #: classes/dlg.php:57
 #: classes/dlg.php:183
-#: plugins/share/init.php:118
+#: plugins/share/init.php:117
 msgid "Generate new URL"
 msgstr "Új URL generálás"
 
@@ -1098,130 +897,224 @@ msgstr "A frissítő daemon túl régóta próbálkozik a hírcsatornák frissí
 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/handler/public.php:510
+#: classes/article.php:25
+msgid "Article not found."
+msgstr "Hír nem található."
+
+#: classes/article.php:197
+msgid "Tags for this article (separated by commas):"
+msgstr "A hír címkéi (vesszőkkel elválasztva):"
+
+#: classes/article.php:222
+#: classes/pref/labels.php:79
+#: classes/pref/filters.php:519
+#: classes/pref/users.php:98
+#: classes/pref/prefs.php:981
+#: classes/pref/feeds.php:789
+#: classes/pref/feeds.php:931
+#: plugins/af_psql_trgm/init.php:181
+#: plugins/nsfw/init.php:85
+#: plugins/af_readability/init.php:68
+#: plugins/mail/init.php:64
+#: plugins/af_redditimgur/init.php:60
+#: plugins/note/init.php:51
+#: plugins/af_zz_imgproxy/init.php:240
+msgid "Save"
+msgstr "Mentés"
+
+#: classes/article.php:224
+#: classes/handler/public.php:457
+#: classes/handler/public.php:491
+#: classes/pref/labels.php:81
+#: classes/pref/filters.php:522
+#: classes/pref/filters.php:942
+#: classes/pref/filters.php:1022
+#: classes/pref/filters.php:1115
+#: classes/pref/users.php:100
+#: classes/pref/prefs.php:983
+#: classes/pref/feeds.php:790
+#: classes/pref/feeds.php:934
+#: classes/pref/feeds.php:1833
+#: classes/feeds.php:1098
+#: classes/feeds.php:1148
+#: classes/feeds.php:1185
+#: plugins/mail/init.php:173
+#: plugins/note/init.php:53
+msgid "Cancel"
+msgstr "Mégsem"
+
+#: classes/article.php:311
+#: classes/article.php:652
+#: classes/article.php:805
+msgid "no tags"
+msgstr "nincs címke"
+
+#: classes/article.php:419
+msgid "unknown type"
+msgstr "ismeretlen hírcsatornatípus"
+
+#: classes/article.php:496
+msgid "Attachments"
+msgstr "Csatolmányok:"
+
+#: classes/article.php:591
+#: classes/feeds.php:741
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] "megjegyzés"
+msgstr[1] "megjegyzés"
+
+#: classes/article.php:595
+#: classes/feeds.php:745
+msgid "comments"
+msgstr "megjegyzések"
+
+#: classes/article.php:621
+msgid " - "
+msgstr "-"
+
+#: classes/article.php:662
+#: classes/feeds.php:727
+msgid "Edit tags for this article"
+msgstr "Címkék hozzáadása a hírhez"
+
+#: classes/article.php:694
+#: classes/feeds.php:681
+msgid "Originally from:"
+msgstr "Eredeti innen:"
+
+#: classes/article.php:707
+#: classes/pref/feeds.php:574
+#: classes/feeds.php:694
+msgid "Feed URL"
+msgstr "Hírcsatorna URL"
+
+#: classes/article.php:843
+msgid "(edit note)"
+msgstr "(jegyzet szerkesztése)"
+
+#: classes/handler/public.php:421
 #: plugins/bookmarklets/init.php:40
 msgid "Share with Tiny Tiny RSS"
 msgstr "Megosztás Tiny Tiny RSS-el"
 
-#: classes/handler/public.php:518
+#: classes/handler/public.php:429
 msgid "Title:"
 msgstr "Cím:"
 
-#: classes/handler/public.php:520
+#: classes/handler/public.php:431
 #: classes/pref/feeds.php:572
-#: plugins/instances/init.php:212
-#: plugins/instances/init.php:401
 msgid "URL:"
 msgstr "Hírcsatorna URL:"
 
-#: classes/handler/public.php:522
+#: classes/handler/public.php:433
 msgid "Content:"
 msgstr "Tartalom:"
 
-#: classes/handler/public.php:524
+#: classes/handler/public.php:435
 msgid "Labels:"
 msgstr "Címkék:"
 
-#: classes/handler/public.php:543
+#: classes/handler/public.php:454
 msgid "Shared article will appear in the Published feed."
 msgstr "A megosztott hír a Publikált hírek között fog megjelenni."
 
-#: classes/handler/public.php:545
+#: classes/handler/public.php:456
 msgid "Share"
 msgstr "Megosztás"
 
-#: classes/handler/public.php:567
+#: classes/handler/public.php:478
 msgid "Not logged in"
 msgstr "Nincs belépve"
 
-#: classes/handler/public.php:626
+#: classes/handler/public.php:537
 msgid "Incorrect username or password"
 msgstr "Hibás felhasználói név vagy jelszó"
 
-#: classes/handler/public.php:678
+#: classes/handler/public.php:589
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "Már fel van iratkozva erre a hírcsatornára: <b>%s</b>."
 
-#: classes/handler/public.php:681
+#: classes/handler/public.php:592
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "Feliratkozva erre a hírcsatornára: <b>%s</b>."
 
-#: classes/handler/public.php:684
+#: classes/handler/public.php:595
 #, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "Nem lehet feliratkozni ide: <b>%s</b>."
 
-#: classes/handler/public.php:687
+#: classes/handler/public.php:598
 #, php-format
 msgid "No feeds found in <b>%s</b>."
 msgstr "Nem található hírcsatorna itt: <b>%s</b>."
 
-#: classes/handler/public.php:690
+#: classes/handler/public.php:601
 msgid "Multiple feed URLs found."
 msgstr "Több hírcsatorna URL-t találtam."
 
-#: classes/handler/public.php:694
+#: classes/handler/public.php:605
 #, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr "Nem lehet feliratkozni ide: <b>%s</b>.<br>Nem lehet betölteni a hícsatorna URL-t."
 
-#: classes/handler/public.php:712
+#: classes/handler/public.php:623
 msgid "Subscribe to selected feed"
 msgstr "Feliratkozás a kiválasztott hírcsatornára"
 
-#: classes/handler/public.php:737
+#: classes/handler/public.php:648
 msgid "Edit subscription options"
 msgstr "Feliratkozási beállítások szerkesztése"
 
-#: classes/handler/public.php:774
+#: classes/handler/public.php:685
 msgid "Password recovery"
 msgstr "Jelszó helyreállítás"
 
-#: classes/handler/public.php:817
+#: classes/handler/public.php:728
 #, fuzzy
 msgid "You will need to provide valid account name and email. A password reset link will be sent to your email address."
 msgstr "Adjon meg érvényes fióknevet és email címet. Az új jelszó a megadott email címre lesz elküldve."
 
-#: classes/handler/public.php:839
-#: classes/pref/users.php:350
+#: classes/handler/public.php:750
+#: classes/pref/users.php:349
 msgid "Reset password"
 msgstr "Jelszó visszaállítás"
 
-#: classes/handler/public.php:849
+#: classes/handler/public.php:760
 msgid "Some of the required form parameters are missing or incorrect."
 msgstr "Néhány szükséges paraméter hiányzik az űrlapról vagy érvénytelen."
 
-#: classes/handler/public.php:853
-#: classes/handler/public.php:919
+#: classes/handler/public.php:764
+#: classes/handler/public.php:830
 msgid "Go back"
 msgstr "Visszalépés"
 
-#: classes/handler/public.php:890
+#: classes/handler/public.php:801
 #, fuzzy
 msgid "[tt-rss] Password reset request"
 msgstr "[tt-rss] Értesítés jelszó megváltoztatásáról."
 
-#: classes/handler/public.php:915
+#: classes/handler/public.php:826
 msgid "Sorry, login and email combination not found."
 msgstr "Sajnálom, a belépési és email kombináció nem található."
 
-#: classes/handler/public.php:937
+#: classes/handler/public.php:848
 msgid "Your access level is insufficient to run this script."
 msgstr "A hozzáférési szinted nem elég magasa script futtatásához"
 
-#: classes/handler/public.php:963
+#: classes/handler/public.php:874
 msgid "Database Updater"
 msgstr "Adatbázis-frissítő"
 
-#: classes/handler/public.php:1028
+#: classes/handler/public.php:939
 msgid "Perform updates"
 msgstr "Frissítések végrehajtása"
 
 #: classes/pref/labels.php:22
-#: classes/pref/filters.php:348
-#: classes/pref/filters.php:823
+#: classes/pref/filters.php:373
+#: classes/pref/filters.php:863
 msgid "Caption"
 msgstr "Cím"
 
@@ -1243,59 +1136,55 @@ msgid "Created label <b>%s</b>"
 msgstr "Címke létrehozva: <b>%s</b>"
 
 #: classes/pref/labels.php:258
-#: classes/pref/users.php:334
-#: classes/pref/feeds.php:1337
-#: classes/pref/feeds.php:1600
-#: classes/pref/feeds.php:1664
-#: classes/pref/filters.php:359
-#: classes/pref/filters.php:407
-#: classes/pref/filters.php:744
-#: classes/pref/filters.php:832
-#: classes/pref/filters.php:859
+#: classes/pref/filters.php:384
+#: classes/pref/filters.php:441
+#: classes/pref/filters.php:784
+#: classes/pref/filters.php:872
+#: classes/pref/filters.php:899
+#: classes/pref/users.php:333
 #: classes/pref/prefs.php:992
-#: plugins/instances/init.php:284
+#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1574
+#: classes/pref/feeds.php:1638
 msgid "Select"
 msgstr "Kiválasztás"
 
 #: classes/pref/labels.php:261
-#: classes/pref/users.php:337
-#: classes/pref/feeds.php:1340
-#: classes/pref/feeds.php:1603
-#: classes/pref/feeds.php:1667
-#: classes/pref/filters.php:362
-#: classes/pref/filters.php:410
-#: classes/pref/filters.php:747
-#: classes/pref/filters.php:835
-#: classes/pref/filters.php:862
+#: classes/pref/filters.php:387
+#: classes/pref/filters.php:444
+#: classes/pref/filters.php:787
+#: classes/pref/filters.php:875
+#: classes/pref/filters.php:902
+#: classes/pref/users.php:336
 #: classes/pref/prefs.php:995
+#: classes/pref/feeds.php:1314
+#: classes/pref/feeds.php:1577
+#: classes/pref/feeds.php:1641
 #: classes/feeds.php:102
-#: plugins/instances/init.php:287
 msgid "All"
 msgstr "Mind"
 
 #: classes/pref/labels.php:263
-#: classes/pref/users.php:339
-#: classes/pref/feeds.php:1342
-#: classes/pref/feeds.php:1605
-#: classes/pref/feeds.php:1669
-#: classes/pref/filters.php:364
-#: classes/pref/filters.php:412
-#: classes/pref/filters.php:749
-#: classes/pref/filters.php:837
-#: classes/pref/filters.php:864
+#: classes/pref/filters.php:389
+#: classes/pref/filters.php:446
+#: classes/pref/filters.php:789
+#: classes/pref/filters.php:877
+#: classes/pref/filters.php:904
+#: classes/pref/users.php:338
 #: classes/pref/prefs.php:997
+#: classes/pref/feeds.php:1316
+#: classes/pref/feeds.php:1579
+#: classes/pref/feeds.php:1643
 #: classes/feeds.php:105
-#: plugins/instances/init.php:289
 msgid "None"
 msgstr "Kijelölés törlése"
 
 #: classes/pref/labels.php:270
-#: classes/pref/users.php:348
+#: classes/pref/filters.php:512
+#: classes/pref/filters.php:806
+#: classes/pref/users.php:347
 #: classes/pref/feeds.php:767
-#: classes/pref/filters.php:478
-#: classes/pref/filters.php:766
-#: classes/feeds.php:1154
-#: plugins/instances/init.php:294
+#: classes/feeds.php:1147
 msgid "Remove"
 msgstr "Eltávolít"
 
@@ -1303,9 +1192,171 @@ msgstr "Eltávolít"
 msgid "Clear colors"
 msgstr "Színek visszaállítása"
 
+#: classes/pref/filters.php:153
+#, fuzzy
+msgid "Preview article"
+msgstr "Friss hírek"
+
+#: classes/pref/filters.php:264
+#: classes/pref/filters.php:558
+msgid "(inverse)"
+msgstr "(fordított)"
+
+#: classes/pref/filters.php:260
+#: classes/pref/filters.php:557
+#, php-format
+msgid "%s on %s in %s %s"
+msgstr "%s ebben: %s itt: %s %s"
+
+#: classes/pref/filters.php:379
+#: classes/pref/filters.php:867
+#: classes/pref/filters.php:981
+msgid "Match"
+msgstr "Szabály"
+
+#: classes/pref/filters.php:393
+#: classes/pref/filters.php:450
+#: classes/pref/filters.php:881
+#: classes/pref/filters.php:908
+msgid "Add"
+msgstr "Hozzáad"
+
+#: classes/pref/filters.php:396
+#: classes/pref/filters.php:453
+#: classes/pref/filters.php:884
+#: classes/pref/filters.php:911
+#: classes/feeds.php:122
+msgid "Delete"
+msgstr "Törlés"
+
+#: classes/pref/filters.php:436
+#: classes/pref/filters.php:894
+msgid "Apply actions"
+msgstr "Műveletek alkalmazása"
+
+#: classes/pref/filters.php:486
+#: classes/pref/filters.php:923
+msgid "Enabled"
+msgstr "Engedélyezve"
+
+#: classes/pref/filters.php:495
+#: classes/pref/filters.php:926
+msgid "Match any rule"
+msgstr "Minden szabálynak megfeleljen"
+
+#: classes/pref/filters.php:504
+#: classes/pref/filters.php:929
+msgid "Inverse matching"
+msgstr "Fordított egyezés"
+
+#: classes/pref/filters.php:516
+#: classes/pref/filters.php:936
+msgid "Test"
+msgstr "Teszt"
+
+#: classes/pref/filters.php:780
+#: classes/pref/users.php:323
+#: classes/pref/feeds.php:1307
+#: classes/feeds.php:1118
+#: classes/feeds.php:1184
+#: js/tt-rss.js:165
+msgid "Search"
+msgstr "Keresés"
+
+#: classes/pref/filters.php:796
+msgid "Combine"
+msgstr "Egyesít"
+
+#: classes/pref/filters.php:799
+#: classes/pref/users.php:345
+msgid "Edit"
+msgstr "Szerkesztés"
+
+#: classes/pref/filters.php:802
+#: classes/pref/feeds.php:1327
+#: classes/pref/feeds.php:1341
+msgid "Reset sort order"
+msgstr "Rendezési sorren visszaállítása"
+
+#: classes/pref/filters.php:810
+#: classes/pref/feeds.php:1363
+msgid "Rescore articles"
+msgstr "Hírek újrapontszámozása"
+
+#: classes/pref/filters.php:939
+msgid "Create"
+msgstr "Létrehoz"
+
+#: classes/pref/filters.php:993
+msgid "Inverse regular expression matching"
+msgstr "Fordított reguláris kifejezés egyezés"
+
+#: classes/pref/filters.php:995
+msgid "on field"
+msgstr "...szerepeljen ebben a mezőben: "
+
+#: classes/pref/filters.php:1001
+#: js/PrefFilterTree.js:64
+msgid "in"
+msgstr "itt"
+
+#: classes/pref/filters.php:1014
+#, fuzzy
+msgid "Wiki: Filters"
+msgstr "Szűrők"
+
+#: classes/pref/filters.php:1019
+msgid "Save rule"
+msgstr "Szabály mentés"
+
+#: classes/pref/filters.php:1019
+#: js/functions.js:865
+msgid "Add rule"
+msgstr "Szabály hozzáadás"
+
+#: classes/pref/filters.php:1042
+msgid "Perform Action"
+msgstr "Műveletek"
+
+#: classes/pref/filters.php:1093
+#, fuzzy
+msgid "No actions available"
+msgstr "Új verzió érhető el."
+
+#: classes/pref/filters.php:1112
+msgid "Save action"
+msgstr "Művelet mentés"
+
+#: classes/pref/filters.php:1112
+#: js/functions.js:887
+msgid "Add action"
+msgstr "Művelet hozzáadás"
+
+#: classes/pref/filters.php:1136
+msgid "[No caption]"
+msgstr "[Nincs cím]"
+
+#: classes/pref/filters.php:1138
+#, php-format
+msgid "%s (%d rule)"
+msgid_plural "%s (%d rules)"
+msgstr[0] "%s (%d szabály)"
+msgstr[1] "%s (%d szabály)"
+
+#: classes/pref/filters.php:1153
+#, fuzzy
+msgid "matches any rule"
+msgstr "Minden szabálynak megfeleljen"
+
+#: classes/pref/filters.php:1156
+#, php-format
+msgid "%s (+%d action)"
+msgid_plural "%s (+%d actions)"
+msgstr[0] "%s (+%d művelet)"
+msgstr[1] "%s (+%d művelet)"
+
 #: classes/pref/users.php:6
 #: classes/pref/system.php:8
-#: plugins/instances/init.php:154
 msgid "Your access level is insufficient to open this tab."
 msgstr "Hozzáférési szintje elégtelen ehhez a művelethez."
 
@@ -1316,8 +1367,8 @@ msgstr "Szabály szerkesztése"
 
 #: classes/pref/users.php:56
 #: classes/pref/feeds.php:637
-#: classes/pref/feeds.php:878
-#: classes/feeds.php:1075
+#: classes/pref/feeds.php:866
+#: classes/feeds.php:1068
 msgid "Authentication"
 msgstr "Azonosítás"
 
@@ -1327,7 +1378,7 @@ msgstr "Hozzáférési szint:"
 
 #: classes/pref/users.php:77
 #: classes/pref/feeds.php:667
-#: classes/pref/feeds.php:896
+#: classes/pref/feeds.php:884
 msgid "Options"
 msgstr "Beállítások"
 
@@ -1341,7 +1392,7 @@ msgid "User not found"
 msgstr "Felhasználó nem találhat"
 
 #: classes/pref/users.php:132
-#: classes/pref/users.php:400
+#: classes/pref/users.php:399
 msgid "Registered"
 msgstr "Regisztrált"
 
@@ -1359,7 +1410,7 @@ msgid "Stored articles"
 msgstr "Csillagozott hírek"
 
 #: classes/pref/users.php:145
-#: classes/pref/users.php:399
+#: classes/pref/users.php:398
 msgid "Subscribed feeds"
 msgstr "Feliratkozott a következő hírcsatornákra:"
 
@@ -1378,507 +1429,57 @@ msgstr "A következő felhasználó létrehozása sikertelen <b>%s</b>"
 msgid "User <b>%s</b> already exists."
 msgstr "A következő felhasználó már létezik <b>%s</b>."
 
-#: classes/pref/users.php:265
+#: classes/pref/users.php:264
 #, php-format
 msgid "Changed password of user <b>%s</b> to <b>%s</b>"
 msgstr "<b>%s</b> felhasználó jelszava megváltoztatva erre: <b>%s</b>"
 
-#: classes/pref/users.php:267
+#: classes/pref/users.php:266
 #, php-format
 msgid "Sending new password of user <b>%s</b> to <b>%s</b>"
 msgstr "Új jelszó küldése <b>%s</b> felhasználónak ide: <b>%s</b>"
 
-#: classes/pref/users.php:291
+#: classes/pref/users.php:290
 msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] Értesítés jelszó megváltoztatásáról."
 
-#: classes/pref/users.php:324
-#: classes/pref/feeds.php:1333
-#: classes/pref/filters.php:740
-#: classes/feeds.php:1125
-#: classes/feeds.php:1191
-#: js/tt-rss.js:165
-msgid "Search"
-msgstr "Keresés"
-
-#: classes/pref/users.php:342
+#: classes/pref/users.php:341
 msgid "Create user"
 msgstr "Felhasználó létrehozás"
 
-#: classes/pref/users.php:346
-#: classes/pref/filters.php:759
-#: plugins/instances/init.php:293
-msgid "Edit"
-msgstr "Szerkesztés"
-
-#: classes/pref/users.php:397
+#: classes/pref/users.php:396
 #: classes/pref/feeds.php:643
-#: classes/pref/feeds.php:882
-#: classes/pref/feeds.php:1836
-#: classes/feeds.php:1079
+#: classes/pref/feeds.php:870
+#: classes/pref/feeds.php:1810
+#: classes/feeds.php:1072
 msgid "Login"
 msgstr "Belépés"
 
-#: classes/pref/users.php:398
+#: classes/pref/users.php:397
 msgid "Access Level"
 msgstr "Hozzáférési szint"
 
-#: classes/pref/users.php:401
+#: classes/pref/users.php:400
 msgid "Last login"
 msgstr "Utolsó belépés"
 
-#: classes/pref/users.php:420
-#: plugins/instances/init.php:334
+#: classes/pref/users.php:419
 msgid "Click to edit"
 msgstr "Kattintson ide a szerkesztéshez"
 
-#: classes/pref/users.php:441
+#: classes/pref/users.php:440
 msgid "No users defined."
 msgstr "Nincs megadva felhasználó."
 
-#: classes/pref/users.php:443
+#: classes/pref/users.php:442
 msgid "No matching users found."
 msgstr "Nem található a feltételeknek megfelelő felhasználó."
 
-#: classes/pref/system.php:29
-msgid "Error Log"
-msgstr "Hibanapló"
-
-#: classes/pref/system.php:40
-msgid "Refresh"
-msgstr "Frissítés"
-
-#: classes/pref/system.php:43
-msgid "Clear log"
-msgstr "Napló törlés"
-
-#: classes/pref/system.php:48
-msgid "Error"
-msgstr "Hiba"
-
-#: classes/pref/system.php:49
-msgid "Filename"
-msgstr "Fájlnév"
-
-#: classes/pref/system.php:50
-msgid "Message"
-msgstr "Üzenet"
-
-#: classes/pref/system.php:52
-msgid "Date"
-msgstr "Dátum"
-
-#: classes/pref/feeds.php:15
-msgid "Check to enable field"
-msgstr "Jelölje be a mező engedélyezéséhez"
-
-#: classes/pref/feeds.php:65
-#: classes/pref/feeds.php:214
-#: classes/pref/feeds.php:258
-#: classes/pref/feeds.php:264
-#: classes/pref/feeds.php:290
-#, php-format
-msgid "(%d feed)"
-msgid_plural "(%d feeds)"
-msgstr[0] "(%d hírcsatorna)"
-msgstr[1] "(%d hírcsatorna)"
-
-#: classes/pref/feeds.php:537
 #: classes/pref/prefs.php:18
+#: classes/pref/feeds.php:537
 msgid "General"
 msgstr "Általános"
 
-#: classes/pref/feeds.php:561
-msgid "Feed Title"
-msgstr "Hírcsatorna címe"
-
-#: classes/pref/feeds.php:595
-#: classes/pref/feeds.php:830
-#: classes/pref/feeds.php:1822
-#: classes/feeds.php:1055
-msgid "Place in category:"
-msgstr "Hozzáadás a következő kategóriához:"
-
-#: classes/pref/feeds.php:608
-#: classes/pref/feeds.php:844
-#, fuzzy
-msgid "Language:"
-msgstr "Nyelv"
-
-#: classes/pref/feeds.php:615
-#: classes/pref/feeds.php:853
-msgid "Update"
-msgstr "Frissítés"
-
-#: classes/pref/feeds.php:630
-#: classes/pref/feeds.php:869
-msgid "Article purging:"
-msgstr "Régi hírek törlése:"
-
-#: classes/pref/feeds.php:658
-#: classes/pref/feeds.php:890
-#: classes/pref/feeds.php:1839
-#: classes/pref/prefs.php:245
-#: classes/feeds.php:1083
-msgid "Password"
-msgstr "Jelszó"
-
-#: classes/pref/feeds.php:662
-msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
-msgstr "<b>Megjegyzés:</b> ha a hírcsatorna megköveteli a hitelesítést (kivéve a Twitter csatornákat), ki kell tölteni a bejelentkezési információkat."
-
-#: classes/pref/feeds.php:681
-#: classes/pref/feeds.php:900
-msgid "Hide from Popular feeds"
-msgstr "Elrejtés a Népszerű hírcsatornákból"
-
-#: classes/pref/feeds.php:693
-#: classes/pref/feeds.php:906
-msgid "Include in e-mail digest"
-msgstr "Hozzáadás az e-mail összefoglalóhoz"
-
-#: classes/pref/feeds.php:706
-#: classes/pref/feeds.php:912
-msgid "Always display image attachments"
-msgstr "Kép csatolmányokat mindig jelenítse meg"
-
-#: classes/pref/feeds.php:719
-#: classes/pref/feeds.php:920
-msgid "Do not embed images"
-msgstr "Ne ágyazza be a képeket"
-
-#: classes/pref/feeds.php:732
-#: classes/pref/feeds.php:928
-msgid "Cache media"
-msgstr ""
-
-#: classes/pref/feeds.php:744
-#: classes/pref/feeds.php:934
-msgid "Mark updated articles as unread"
-msgstr "Frissült hírek megjelölése olvasatlanként"
-
-#: classes/pref/feeds.php:748
-msgid "Icon"
-msgstr "Ikon"
-
-#: classes/pref/feeds.php:765
-msgid "Replace"
-msgstr "Csere"
-
-#: classes/pref/feeds.php:772
-#: classes/pref/prefs.php:698
-msgid "Plugins"
-msgstr "Beépülők"
-
-#: classes/pref/feeds.php:792
-msgid "Resubscribe to push updates"
-msgstr "Újra feliratkozás a push frissítésekre"
-
-#: classes/pref/feeds.php:799
-msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
-msgstr "Visszaállítja a PubSubHubbub feliratkozást a push-engedélyezett hírcsatornákhoz."
-
-#: classes/pref/feeds.php:1200
-#: classes/pref/feeds.php:1253
-msgid "All done."
-msgstr "Kész."
-
-#: classes/pref/feeds.php:1308
-msgid "Feeds with errors"
-msgstr "Hibás hírcsatornák"
-
-#: classes/pref/feeds.php:1315
-msgid "Inactive feeds"
-msgstr "Inaktív hírcsatornák"
-
-#: classes/pref/feeds.php:1351
-msgid "Edit selected feeds"
-msgstr "Kijelölt hírcsatornák szerkeztése"
-
-#: classes/pref/feeds.php:1353
-#: classes/pref/feeds.php:1367
-#: classes/pref/filters.php:762
-msgid "Reset sort order"
-msgstr "Rendezési sorren visszaállítása"
-
-#: classes/pref/feeds.php:1355
-#: js/prefs.js:1622
-msgid "Batch subscribe"
-msgstr "Kötegelt feliratkozás"
-
-#: classes/pref/feeds.php:1362
-msgid "Categories"
-msgstr "Kategóriák"
-
-#: classes/pref/feeds.php:1365
-msgid "Add category"
-msgstr "Kategória hozzáadás"
-
-#: classes/pref/feeds.php:1369
-msgid "Remove selected"
-msgstr "Kijelölt eltávolítása"
-
-#: classes/pref/feeds.php:1380
-msgid "More actions..."
-msgstr "További műveletek..."
-
-#: classes/pref/feeds.php:1384
-msgid "Manual purge"
-msgstr "Kézi takarítás (régi hírek törlése)"
-
-#: classes/pref/feeds.php:1388
-msgid "Clear feed data"
-msgstr "Hírcsatorna-adatok törlése"
-
-#: classes/pref/feeds.php:1389
-#: classes/pref/filters.php:770
-msgid "Rescore articles"
-msgstr "Hírek újrapontszámozása"
-
-#: classes/pref/feeds.php:1442
-msgid "OPML"
-msgstr "OPML"
-
-#: classes/pref/feeds.php:1444
-msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
-msgstr "Az OPML használatával hírcsatornákat, szűrőket, címkéket és beállításokat exportálhat, importálhat."
-
-#: classes/pref/feeds.php:1445
-msgid "Only main settings profile can be migrated using OPML."
-msgstr "Csak a fő beállításprofilt lehet OPML használatával költöztetni."
-
-#: classes/pref/feeds.php:1458
-msgid "Import my OPML"
-msgstr "OPML importálása"
-
-#: classes/pref/feeds.php:1464
-msgid "Filename:"
-msgstr "Fájlnév:"
-
-#: classes/pref/feeds.php:1466
-msgid "Include settings"
-msgstr "Beállításokkal együtt"
-
-#: classes/pref/feeds.php:1470
-msgid "Export OPML"
-msgstr "Exportálás OPML-be"
-
-#: classes/pref/feeds.php:1474
-msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
-msgstr "Az OPML nyilvánosságra hozható és bárki feliratkozhat rá, aki ismeri az alábbi URL-t."
-
-#: classes/pref/feeds.php:1478
-msgid "Public OPML URL"
-msgstr "Publikus OPML URL"
-
-#: classes/pref/feeds.php:1479
-msgid "Display published OPML URL"
-msgstr "Publikált OPML URL mejelenítése"
-
-#: classes/pref/feeds.php:1488
-msgid "Firefox integration"
-msgstr "Firefox integráció"
-
-#: classes/pref/feeds.php:1490
-msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
-msgstr "Ez a Tiny Tiny RSS oldal beállítható a Firefox böngésző alapértelmezett hírcsatorna-olvasójaként. Ehhez kattintson az alábbi linkre!"
-
-#: classes/pref/feeds.php:1497
-msgid "Click here to register this site as a feed reader."
-msgstr "Kattintson ide az oldal hírcsatorna-olvasóként való beállításához!"
-
-#: classes/pref/feeds.php:1505
-msgid "Published & shared articles / Generated feeds"
-msgstr "Publikált és megosztott hírek / Generált hírcsatornák"
-
-#: classes/pref/feeds.php:1507
-msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
-msgstr "A program a publikált hírekből egy publikus RSS hírcsatornát készít, amelyre bárki feliratkozhat, aki tudja a lenti címet."
-
-#: classes/pref/feeds.php:1514
-#: classes/feeds.php:54
-#: classes/feeds.php:140
-msgid "View as RSS"
-msgstr "Megtekintés RSS-ként"
-
-#: classes/pref/feeds.php:1515
-msgid "Display URL"
-msgstr "URL megjelenítés"
-
-#: classes/pref/feeds.php:1518
-msgid "Clear all generated URLs"
-msgstr "Minden generált URL törlése"
-
-#: classes/pref/feeds.php:1596
-msgid "These feeds have not been updated with new content for 3 months (oldest first):"
-msgstr "Ezek a hírcsatornák 3 hónapja nem frissültek új tartalommal (régebbiek elöl):"
-
-#: classes/pref/feeds.php:1630
-#: classes/pref/feeds.php:1694
-msgid "Click to edit feed"
-msgstr "Kattintson a hírcsatorna szerkesztéséhez"
-
-#: classes/pref/feeds.php:1648
-#: classes/pref/feeds.php:1714
-msgid "Unsubscribe from selected feeds"
-msgstr "Leiratkozás a kiválasztott hírcsatornákról"
-
-#: classes/pref/feeds.php:1819
-msgid "Add one valid RSS feed per line (no feed detection is done)"
-msgstr "Soronként egy érvényes RSS hírcsatornát adjon meg"
-
-#: classes/pref/feeds.php:1828
-msgid "Feeds to subscribe, One per line"
-msgstr "Feliratkozás hírcsatornákra, soronként egy"
-
-#: classes/pref/feeds.php:1851
-msgid "Feeds require authentication."
-msgstr "Ez a hírcsatorna azonosítást igényel."
-
-#: classes/pref/feeds.php:1858
-#: classes/feeds.php:1099
-#: classes/feeds.php:1153
-msgid "Subscribe"
-msgstr "Feliratkozás"
-
-#: classes/pref/filters.php:151
-#, fuzzy
-msgid "Preview article"
-msgstr "Friss hírek"
-
-#: classes/pref/filters.php:239
-#: classes/pref/filters.php:518
-msgid "(inverse)"
-msgstr "(fordított)"
-
-#: classes/pref/filters.php:235
-#: classes/pref/filters.php:517
-#, php-format
-msgid "%s on %s in %s %s"
-msgstr "%s ebben: %s itt: %s %s"
-
-#: classes/pref/filters.php:354
-#: classes/pref/filters.php:827
-#: classes/pref/filters.php:942
-msgid "Match"
-msgstr "Szabály"
-
-#: classes/pref/filters.php:368
-#: classes/pref/filters.php:416
-#: classes/pref/filters.php:841
-#: classes/pref/filters.php:868
-msgid "Add"
-msgstr "Hozzáad"
-
-#: classes/pref/filters.php:371
-#: classes/pref/filters.php:419
-#: classes/pref/filters.php:844
-#: classes/pref/filters.php:871
-#: classes/feeds.php:122
-msgid "Delete"
-msgstr "Törlés"
-
-#: classes/pref/filters.php:402
-#: classes/pref/filters.php:854
-msgid "Apply actions"
-msgstr "Műveletek alkalmazása"
-
-#: classes/pref/filters.php:452
-#: classes/pref/filters.php:883
-msgid "Enabled"
-msgstr "Engedélyezve"
-
-#: classes/pref/filters.php:461
-#: classes/pref/filters.php:886
-msgid "Match any rule"
-msgstr "Minden szabálynak megfeleljen"
-
-#: classes/pref/filters.php:470
-#: classes/pref/filters.php:889
-msgid "Inverse matching"
-msgstr "Fordított egyezés"
-
-#: classes/pref/filters.php:482
-#: classes/pref/filters.php:896
-msgid "Test"
-msgstr "Teszt"
-
-#: classes/pref/filters.php:756
-msgid "Combine"
-msgstr "Egyesít"
-
-#: classes/pref/filters.php:899
-msgid "Create"
-msgstr "Létrehoz"
-
-#: classes/pref/filters.php:954
-msgid "Inverse regular expression matching"
-msgstr "Fordított reguláris kifejezés egyezés"
-
-#: classes/pref/filters.php:956
-msgid "on field"
-msgstr "...szerepeljen ebben a mezőben: "
-
-#: classes/pref/filters.php:962
-#: js/PrefFilterTree.js:64
-msgid "in"
-msgstr "itt"
-
-#: classes/pref/filters.php:975
-#, fuzzy
-msgid "Wiki: Filters"
-msgstr "Szűrők"
-
-#: classes/pref/filters.php:980
-msgid "Save rule"
-msgstr "Szabály mentés"
-
-#: classes/pref/filters.php:980
-#: js/functions.js:865
-msgid "Add rule"
-msgstr "Szabály hozzáadás"
-
-#: classes/pref/filters.php:1003
-msgid "Perform Action"
-msgstr "Műveletek"
-
-#: classes/pref/filters.php:1054
-#, fuzzy
-msgid "No actions available"
-msgstr "Új verzió érhető el."
-
-#: classes/pref/filters.php:1073
-msgid "Save action"
-msgstr "Művelet mentés"
-
-#: classes/pref/filters.php:1073
-#: js/functions.js:887
-msgid "Add action"
-msgstr "Művelet hozzáadás"
-
-#: classes/pref/filters.php:1097
-msgid "[No caption]"
-msgstr "[Nincs cím]"
-
-#: classes/pref/filters.php:1099
-#, php-format
-msgid "%s (%d rule)"
-msgid_plural "%s (%d rules)"
-msgstr[0] "%s (%d szabály)"
-msgstr[1] "%s (%d szabály)"
-
-#: classes/pref/filters.php:1114
-#, fuzzy
-msgid "matches any rule"
-msgstr "Minden szabálynak megfeleljen"
-
-#: classes/pref/filters.php:1117
-#, php-format
-msgid "%s (+%d action)"
-msgid_plural "%s (+%d actions)"
-msgstr[0] "%s (+%d művelet)"
-msgstr[1] "%s (+%d művelet)"
-
 #: classes/pref/prefs.php:19
 msgid "Interface"
 msgstr "Kezelőfelület"
@@ -2052,7 +1653,7 @@ msgid "Strip all but most common HTML tags when reading articles."
 msgstr "Hírek olvasásakor távolítsa el a a HTML kódokat a leggyakrabban használtak kivételével."
 
 #: classes/pref/prefs.php:53
-#: js/prefs.js:1584
+#: js/prefs.js:1580
 msgid "Customize stylesheet"
 msgstr "Stíluslap testreszabása"
 
@@ -2120,6 +1721,14 @@ msgstr "Hozzáférési szint"
 msgid "Save data"
 msgstr "Adatok mentése"
 
+#: classes/pref/prefs.php:245
+#: classes/pref/feeds.php:658
+#: classes/pref/feeds.php:878
+#: classes/pref/feeds.php:1813
+#: classes/feeds.php:1076
+msgid "Password"
+msgstr "Jelszó"
+
 #: classes/pref/prefs.php:254
 msgid "Your password is at default value, please change it."
 msgstr "A jelszava még az alapértelmezett, kérem változtassa meg."
@@ -2218,18 +1827,23 @@ msgstr "Profilok kezelése"
 msgid "Reset to defaults"
 msgstr "Alapértelmezett beállítások"
 
+#: classes/pref/prefs.php:698
+#: classes/pref/feeds.php:772
+msgid "Plugins"
+msgstr "Beépülők"
+
 #: classes/pref/prefs.php:700
 msgid "You will need to reload Tiny Tiny RSS for plugin changes to take effect."
 msgstr "A beépülők változtatásainak érvényesítéséhez újra kell tölteni a Tiny Tiny RSS-t."
 
-#: classes/pref/prefs.php:702
-msgid "Download more plugins at tt-rss.org <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forums</a> or <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a>."
-msgstr "További beépülők letölthetők a tt-rss.org <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">fórumairól</a> vagy a <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wikiről</a>."
-
-#: classes/pref/prefs.php:732
+#: classes/pref/prefs.php:730
 msgid "System plugins"
 msgstr "Rendszer beépülők"
 
+#: classes/pref/prefs.php:731
+msgid "System plugins are enabled in <strong>config.php</strong> for all users."
+msgstr ""
+
 #: classes/pref/prefs.php:736
 #: classes/pref/prefs.php:792
 msgid "Plugin"
@@ -2299,6 +1913,340 @@ msgstr "Eltávolítja a kiválasztott profilokat?"
 msgid "Activate profile"
 msgstr "Profil aktiválás"
 
+#: classes/pref/feeds.php:15
+msgid "Check to enable field"
+msgstr "Jelölje be a mező engedélyezéséhez"
+
+#: classes/pref/feeds.php:65
+#: classes/pref/feeds.php:214
+#: classes/pref/feeds.php:258
+#: classes/pref/feeds.php:264
+#: classes/pref/feeds.php:290
+#, php-format
+msgid "(%d feed)"
+msgid_plural "(%d feeds)"
+msgstr[0] "(%d hírcsatorna)"
+msgstr[1] "(%d hírcsatorna)"
+
+#: classes/pref/feeds.php:561
+msgid "Feed Title"
+msgstr "Hírcsatorna címe"
+
+#: classes/pref/feeds.php:595
+#: classes/pref/feeds.php:818
+#: classes/pref/feeds.php:1796
+#: classes/feeds.php:1048
+msgid "Place in category:"
+msgstr "Hozzáadás a következő kategóriához:"
+
+#: classes/pref/feeds.php:608
+#: classes/pref/feeds.php:832
+#, fuzzy
+msgid "Language:"
+msgstr "Nyelv"
+
+#: classes/pref/feeds.php:615
+#: classes/pref/feeds.php:841
+msgid "Update"
+msgstr "Frissítés"
+
+#: classes/pref/feeds.php:630
+#: classes/pref/feeds.php:857
+msgid "Article purging:"
+msgstr "Régi hírek törlése:"
+
+#: classes/pref/feeds.php:662
+msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
+msgstr "<b>Megjegyzés:</b> ha a hírcsatorna megköveteli a hitelesítést (kivéve a Twitter csatornákat), ki kell tölteni a bejelentkezési információkat."
+
+#: classes/pref/feeds.php:681
+#: classes/pref/feeds.php:888
+msgid "Hide from Popular feeds"
+msgstr "Elrejtés a Népszerű hírcsatornákból"
+
+#: classes/pref/feeds.php:693
+#: classes/pref/feeds.php:894
+msgid "Include in e-mail digest"
+msgstr "Hozzáadás az e-mail összefoglalóhoz"
+
+#: classes/pref/feeds.php:706
+#: classes/pref/feeds.php:900
+msgid "Always display image attachments"
+msgstr "Kép csatolmányokat mindig jelenítse meg"
+
+#: classes/pref/feeds.php:719
+#: classes/pref/feeds.php:908
+msgid "Do not embed images"
+msgstr "Ne ágyazza be a képeket"
+
+#: classes/pref/feeds.php:732
+#: classes/pref/feeds.php:916
+msgid "Cache media"
+msgstr ""
+
+#: classes/pref/feeds.php:744
+#: classes/pref/feeds.php:922
+msgid "Mark updated articles as unread"
+msgstr "Frissült hírek megjelölése olvasatlanként"
+
+#: classes/pref/feeds.php:748
+msgid "Icon"
+msgstr "Ikon"
+
+#: classes/pref/feeds.php:765
+msgid "Replace"
+msgstr "Csere"
+
+#: classes/pref/feeds.php:1174
+#: classes/pref/feeds.php:1227
+msgid "All done."
+msgstr "Kész."
+
+#: classes/pref/feeds.php:1282
+msgid "Feeds with errors"
+msgstr "Hibás hírcsatornák"
+
+#: classes/pref/feeds.php:1289
+msgid "Inactive feeds"
+msgstr "Inaktív hírcsatornák"
+
+#: classes/pref/feeds.php:1325
+msgid "Edit selected feeds"
+msgstr "Kijelölt hírcsatornák szerkeztése"
+
+#: classes/pref/feeds.php:1329
+#: js/prefs.js:1618
+msgid "Batch subscribe"
+msgstr "Kötegelt feliratkozás"
+
+#: classes/pref/feeds.php:1336
+msgid "Categories"
+msgstr "Kategóriák"
+
+#: classes/pref/feeds.php:1339
+msgid "Add category"
+msgstr "Kategória hozzáadás"
+
+#: classes/pref/feeds.php:1343
+msgid "Remove selected"
+msgstr "Kijelölt eltávolítása"
+
+#: classes/pref/feeds.php:1354
+msgid "More actions..."
+msgstr "További műveletek..."
+
+#: classes/pref/feeds.php:1358
+msgid "Manual purge"
+msgstr "Kézi takarítás (régi hírek törlése)"
+
+#: classes/pref/feeds.php:1362
+msgid "Clear feed data"
+msgstr "Hírcsatorna-adatok törlése"
+
+#: classes/pref/feeds.php:1416
+msgid "OPML"
+msgstr "OPML"
+
+#: classes/pref/feeds.php:1418
+msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
+msgstr "Az OPML használatával hírcsatornákat, szűrőket, címkéket és beállításokat exportálhat, importálhat."
+
+#: classes/pref/feeds.php:1419
+msgid "Only main settings profile can be migrated using OPML."
+msgstr "Csak a fő beállításprofilt lehet OPML használatával költöztetni."
+
+#: classes/pref/feeds.php:1432
+msgid "Import my OPML"
+msgstr "OPML importálása"
+
+#: classes/pref/feeds.php:1438
+msgid "Filename:"
+msgstr "Fájlnév:"
+
+#: classes/pref/feeds.php:1440
+msgid "Include settings"
+msgstr "Beállításokkal együtt"
+
+#: classes/pref/feeds.php:1444
+msgid "Export OPML"
+msgstr "Exportálás OPML-be"
+
+#: classes/pref/feeds.php:1448
+msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
+msgstr "Az OPML nyilvánosságra hozható és bárki feliratkozhat rá, aki ismeri az alábbi URL-t."
+
+#: classes/pref/feeds.php:1452
+msgid "Public OPML URL"
+msgstr "Publikus OPML URL"
+
+#: classes/pref/feeds.php:1453
+msgid "Display published OPML URL"
+msgstr "Publikált OPML URL mejelenítése"
+
+#: classes/pref/feeds.php:1462
+msgid "Firefox integration"
+msgstr "Firefox integráció"
+
+#: classes/pref/feeds.php:1464
+msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
+msgstr "Ez a Tiny Tiny RSS oldal beállítható a Firefox böngésző alapértelmezett hírcsatorna-olvasójaként. Ehhez kattintson az alábbi linkre!"
+
+#: classes/pref/feeds.php:1471
+msgid "Click here to register this site as a feed reader."
+msgstr "Kattintson ide az oldal hírcsatorna-olvasóként való beállításához!"
+
+#: classes/pref/feeds.php:1479
+msgid "Published & shared articles / Generated feeds"
+msgstr "Publikált és megosztott hírek / Generált hírcsatornák"
+
+#: classes/pref/feeds.php:1481
+msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
+msgstr "A program a publikált hírekből egy publikus RSS hírcsatornát készít, amelyre bárki feliratkozhat, aki tudja a lenti címet."
+
+#: classes/pref/feeds.php:1488
+#: classes/feeds.php:54
+#: classes/feeds.php:140
+msgid "View as RSS"
+msgstr "Megtekintés RSS-ként"
+
+#: classes/pref/feeds.php:1489
+msgid "Display URL"
+msgstr "URL megjelenítés"
+
+#: classes/pref/feeds.php:1492
+msgid "Clear all generated URLs"
+msgstr "Minden generált URL törlése"
+
+#: classes/pref/feeds.php:1570
+msgid "These feeds have not been updated with new content for 3 months (oldest first):"
+msgstr "Ezek a hírcsatornák 3 hónapja nem frissültek új tartalommal (régebbiek elöl):"
+
+#: classes/pref/feeds.php:1604
+#: classes/pref/feeds.php:1668
+msgid "Click to edit feed"
+msgstr "Kattintson a hírcsatorna szerkesztéséhez"
+
+#: classes/pref/feeds.php:1622
+#: classes/pref/feeds.php:1688
+msgid "Unsubscribe from selected feeds"
+msgstr "Leiratkozás a kiválasztott hírcsatornákról"
+
+#: classes/pref/feeds.php:1793
+msgid "Add one valid RSS feed per line (no feed detection is done)"
+msgstr "Soronként egy érvényes RSS hírcsatornát adjon meg"
+
+#: classes/pref/feeds.php:1802
+msgid "Feeds to subscribe, One per line"
+msgstr "Feliratkozás hírcsatornákra, soronként egy"
+
+#: classes/pref/feeds.php:1825
+msgid "Feeds require authentication."
+msgstr "Ez a hírcsatorna azonosítást igényel."
+
+#: classes/pref/feeds.php:1832
+#: classes/feeds.php:1092
+#: classes/feeds.php:1146
+msgid "Subscribe"
+msgstr "Feliratkozás"
+
+#: classes/pref/system.php:29
+msgid "Error Log"
+msgstr "Hibanapló"
+
+#: classes/pref/system.php:40
+msgid "Refresh"
+msgstr "Frissítés"
+
+#: classes/pref/system.php:43
+msgid "Clear log"
+msgstr "Napló törlés"
+
+#: classes/pref/system.php:48
+msgid "Error"
+msgstr "Hiba"
+
+#: classes/pref/system.php:49
+msgid "Filename"
+msgstr "Fájlnév"
+
+#: classes/pref/system.php:50
+msgid "Message"
+msgstr "Üzenet"
+
+#: classes/pref/system.php:52
+msgid "Date"
+msgstr "Dátum"
+
+#: classes/opml.php:28
+#: classes/opml.php:33
+msgid "OPML Utility"
+msgstr "OMPL-segédprogram"
+
+#: classes/opml.php:37
+msgid "Importing OPML..."
+msgstr "OPML importálás..."
+
+#: classes/opml.php:41
+msgid "Return to preferences"
+msgstr "Vissza a beállításokhoz"
+
+#: classes/opml.php:295
+#, php-format
+msgid "Adding feed: %s"
+msgstr "Hírcsatorna hozzáadása: %s"
+
+#: classes/opml.php:306
+#, php-format
+msgid "Duplicate feed: %s"
+msgstr "Duplikált hírcsatorna: %s"
+
+#: classes/opml.php:320
+#, php-format
+msgid "Adding label %s"
+msgstr "Címke hozzáadása %s"
+
+#: classes/opml.php:323
+#, php-format
+msgid "Duplicate label: %s"
+msgstr "Dupla címke: %s"
+
+#: classes/opml.php:335
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr "%s kulcs beállítása erre: %s"
+
+#: classes/opml.php:367
+msgid "Adding filter..."
+msgstr "Szűrő hozzáadása..."
+
+#: classes/opml.php:486
+#, php-format
+msgid "Processing category: %s"
+msgstr "%s kategória feldolgozása"
+
+#: classes/opml.php:532
+#, php-format
+msgid "Upload failed with error code %d"
+msgstr "Feltöltés sikertelen. Hibakód: %d"
+
+#: classes/opml.php:544
+#: plugins/import_export/init.php:448
+msgid "Unable to move uploaded file."
+msgstr "A feltöltött fájl nem helyezhető át."
+
+#: classes/opml.php:548
+#: plugins/import_export/init.php:452
+msgid "Error: please upload OPML file."
+msgstr "Hiba: kérem töltse fel az OPML fájlt!"
+
+#: classes/opml.php:559
+msgid "Error: unable to find moved OPML file."
+msgstr "Hiba: nem található az áthelyezett OPML fájl."
+
+#: classes/opml.php:566
+msgid "Error while parsing document."
+msgstr "Hiba történt a dokuementum feldoglozása közben"
+
 #: classes/feeds.php:53
 msgid "View as RSS feed"
 msgstr "Megtekintés RSS feedként"
@@ -2339,8 +2287,8 @@ msgstr "Visszalépés"
 
 #: classes/feeds.php:127
 #: classes/feeds.php:132
-#: plugins/mail/init.php:75
 #: plugins/mailto/init.php:25
+#: plugins/mail/init.php:75
 msgid "Forward by email"
 msgstr "Továbbítás emaiben"
 
@@ -2348,319 +2296,146 @@ msgstr "Továbbítás emaiben"
 msgid "Feed:"
 msgstr "Hírcsatorna:"
 
-#: classes/feeds.php:229
-#: classes/feeds.php:892
+#: classes/feeds.php:228
+#: classes/feeds.php:885
 msgid "Feed not found."
 msgstr "Hírcsatorna nem található"
 
-#: classes/feeds.php:300
+#: classes/feeds.php:291
 msgid "Never"
 msgstr "Soha"
 
-#: classes/feeds.php:413
+#: classes/feeds.php:405
 #, php-format
 msgid "Imported at %s"
 msgstr "Importálás %s"
 
-#: classes/feeds.php:472
-#: classes/feeds.php:569
+#: classes/feeds.php:464
+#: classes/feeds.php:561
 #, fuzzy
 msgid "mark feed as read"
 msgstr "olvasottként jelöl"
 
-#: classes/feeds.php:630
+#: classes/feeds.php:622
 msgid "Collapse article"
 msgstr "Hír bezárása"
 
-#: classes/feeds.php:791
+#: classes/feeds.php:784
 msgid "No unread articles found to display."
 msgstr "Nincs megjeleníthető olvasatlan hír."
 
-#: classes/feeds.php:794
+#: classes/feeds.php:787
 msgid "No updated articles found to display."
 msgstr "Nincs megjeleníthető friss hír."
 
-#: classes/feeds.php:797
+#: classes/feeds.php:790
 msgid "No starred articles found to display."
 msgstr "Nincs megjeleníthető csillagozott hír."
 
-#: classes/feeds.php:801
+#: classes/feeds.php:794
 msgid "No articles found to display. You can assign articles to labels manually from article header context menu (applies to all selected articles) or use a filter."
 msgstr "Nem található megjelenítendő hír. A kiválasztott hírekhez manuálisan is hozzá lehet rendelni címkéket a fejléc helyi menüjéből vagy szűrő használatával."
 
-#: classes/feeds.php:803
+#: classes/feeds.php:796
 msgid "No articles found to display."
 msgstr "Nincs megjeleníthető hír."
 
-#: classes/feeds.php:818
-#: classes/feeds.php:992
+#: classes/feeds.php:811
+#: classes/feeds.php:985
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "Hírcsatornák utolsó frissítése: %s"
 
-#: classes/feeds.php:828
-#: classes/feeds.php:1002
+#: classes/feeds.php:821
+#: classes/feeds.php:995
 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:982
+#: classes/feeds.php:975
 msgid "No feed selected."
 msgstr "Nincs kiválasztott hírcsatorna."
 
-#: classes/feeds.php:1041
-#: classes/feeds.php:1049
+#: classes/feeds.php:1034
+#: classes/feeds.php:1042
 msgid "Feed or site URL"
 msgstr "Hírcsatorna vagy weboldal URL"
 
-#: classes/feeds.php:1063
+#: classes/feeds.php:1056
 msgid "Available feeds"
 msgstr "Elérhető hírcsatornák"
 
-#: classes/feeds.php:1094
+#: classes/feeds.php:1087
 msgid "This feed requires authentication."
 msgstr "Ez a hírcsatorna azonosítást igényel."
 
-#: classes/feeds.php:1102
+#: classes/feeds.php:1095
 msgid "More feeds"
 msgstr "További hírcsatornák"
 
-#: classes/feeds.php:1129
+#: classes/feeds.php:1122
 msgid "Popular feeds"
 msgstr "Népszerű hírcsatornák"
 
-#: classes/feeds.php:1130
+#: classes/feeds.php:1123
 msgid "Feed archive"
 msgstr "Hírcsatorna archívum"
 
-#: classes/feeds.php:1133
+#: classes/feeds.php:1126
 msgid "limit:"
 msgstr "határ:"
 
-#: classes/feeds.php:1165
+#: classes/feeds.php:1158
 msgid "Look for"
 msgstr "Keresés"
 
-#: classes/feeds.php:1173
+#: classes/feeds.php:1166
 #, php-format
 msgid "in %s"
 msgstr ""
 
-#: classes/feeds.php:1178
+#: classes/feeds.php:1171
 msgid "Used for word stemming"
 msgstr ""
 
-#: classes/feeds.php:1187
+#: classes/feeds.php:1180
 #, fuzzy
 msgid "Search syntax"
 msgstr "Keresés"
 
-#: plugins/instances/init.php:141
-msgid "Linked"
-msgstr "Összekapcsolás"
-
-#: plugins/instances/init.php:204
-#: plugins/instances/init.php:395
-msgid "Instance"
-msgstr "Példány"
-
-#: plugins/instances/init.php:215
-#: plugins/instances/init.php:312
-#: plugins/instances/init.php:404
-msgid "Instance URL"
-msgstr "Példány URL"
-
-#: plugins/instances/init.php:226
-#: plugins/instances/init.php:414
-msgid "Access key:"
-msgstr "Hozzáférési kulcs:"
-
-#: plugins/instances/init.php:229
-#: plugins/instances/init.php:313
-#: plugins/instances/init.php:417
-msgid "Access key"
-msgstr "Hozzáférési kulcs"
-
-#: plugins/instances/init.php:233
-#: plugins/instances/init.php:421
-msgid "Use one access key for both linked instances."
-msgstr "Egy hozzáférési kulcs használata minden összekapcsolt példányhoz."
-
-#: plugins/instances/init.php:241
-#: plugins/instances/init.php:429
-msgid "Generate new key"
-msgstr "Új kulcs generálása"
-
-#: plugins/instances/init.php:292
-msgid "Link instance"
-msgstr "Példány összekapcsolás"
-
-#: plugins/instances/init.php:304
-msgid "You can connect other instances of Tiny Tiny RSS to this one to share Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
-msgstr "A Népszerű hírcsatornák megosztásához csatlakoztathat másik Tiny Tiny RSS példányokat ehhez. A Tiny Tiny RSS ezen példányához való kapcsolódáshoz ez az URL használható:"
-
-#: plugins/instances/init.php:314
-msgid "Last connected"
-msgstr "Utoljára belépve"
-
-#: plugins/instances/init.php:315
-msgid "Status"
-msgstr "Állapot"
-
-#: plugins/instances/init.php:316
-msgid "Stored feeds"
-msgstr "Tárolt hírcsatornák"
-
-#: plugins/instances/init.php:433
-msgid "Create link"
-msgstr "Link létrehozás"
-
-#: plugins/nsfw/init.php:30
-#: plugins/nsfw/init.php:42
-msgid "Not work safe (click to toggle)"
-msgstr "Munkahelyen nem bitonságos (kattintson a váltáshoz)"
-
-#: plugins/nsfw/init.php:52
-msgid "NSFW Plugin"
-msgstr "NSFW beépülő"
-
-#: plugins/nsfw/init.php:79
-msgid "Tags to consider NSFW (comma-separated)"
-msgstr "Munkahelyen nem biztonságos tartalmak címkéi (vesszővel elválasztva)"
-
-#: plugins/nsfw/init.php:100
-msgid "Configuration saved."
-msgstr "Beállítások elmentve."
-
-#: plugins/note/init.php:26
-#: plugins/note/note.js:11
-msgid "Edit article note"
-msgstr "Megjegyzés"
-
-#: plugins/vf_shared/init.php:16
-#: plugins/vf_shared/init.php:69
-msgid "Shared articles"
-msgstr "Megosztott hírek"
-
-#: plugins/auth_internal/init.php:65
-msgid "Please enter your one time password:"
-msgstr "Adja meg az egyszer használatos jelszót:"
-
-#: plugins/auth_internal/init.php:188
-msgid "Password has been changed."
-msgstr "A jelszó megváltoztatva."
-
-#: plugins/auth_internal/init.php:190
-msgid "Old password is incorrect."
-msgstr "A régi jelszó helytelen."
-
-#: plugins/af_readability/init.php:21
-msgid "Data saved."
-msgstr ""
-
-#: plugins/af_readability/init.php:33
-#, fuzzy
-msgid "Inline content"
-msgstr "Megjegyzés"
-
-#: plugins/af_readability/init.php:39
-msgid "Readability settings (af_readability)"
-msgstr ""
-
-#: plugins/af_readability/init.php:66
-msgid "Use Readability for pages shared via bookmarklet."
-msgstr ""
-
-#: plugins/af_readability/init.php:78
-#: plugins/af_psql_trgm/init.php:191
-msgid "Currently enabled for (click to edit):"
-msgstr ""
-
-#: plugins/af_readability/init.php:95
-#, fuzzy
-msgid "Readability"
-msgstr "Ellenőrizze, hogy nem foglalt-e már:"
-
-#: plugins/af_readability/init.php:106
-#, fuzzy
-msgid "Inline article content"
-msgstr "Megjegyzés"
+#: classes/feeds.php:1596
+msgid "Starred articles"
+msgstr "Csillagozott hírek"
 
-#: plugins/af_redditimgur/init.php:25
-msgid "Reddit content settings (af_redditimgur)"
-msgstr ""
+#: classes/feeds.php:1598
+msgid "Published articles"
+msgstr "Publikált hírek"
 
-#: plugins/af_redditimgur/init.php:50
-msgid "Uses Readability (full-text-rss) implementation by <a target='_blank' href='https://bitbucket.org/fivefilters/'>FiveFilters.org</a>"
-msgstr ""
+#: classes/feeds.php:1600
+msgid "Fresh articles"
+msgstr "Friss hírek"
 
-#: plugins/af_redditimgur/init.php:54
-msgid "Extract missing content using Readability"
-msgstr ""
+#: classes/feeds.php:1604
+msgid "Archived articles"
+msgstr "Archivált hírek"
 
-#: plugins/af_redditimgur/init.php:59
-msgid "Enable additional duplicate checking"
-msgstr ""
+#: classes/feeds.php:1606
+msgid "Recently read"
+msgstr "Legutóbb olvasott"
 
-#: plugins/af_redditimgur/init.php:73
-#: plugins/af_zz_imgproxy/init.php:225
-#, fuzzy
-msgid "Configuration saved"
-msgstr "Beállítások elmentve."
+#: classes/feeds.php:1716
+msgid "Special"
+msgstr "Kiemelt"
 
-#: plugins/af_psql_trgm/init.php:28
+#: classes/feeds.php:1962
 #, php-format
-msgid "Data saved (%s, %d)"
-msgstr ""
+msgid "Search results: %s"
+msgstr "Keresési eredmények: %s"
 
-#: plugins/af_psql_trgm/init.php:112
-#, fuzzy
-msgid "Show related articles"
+#: plugins/vf_shared/init.php:16
+#: plugins/vf_shared/init.php:60
+msgid "Shared articles"
 msgstr "Megosztott hírek"
 
-#: plugins/af_psql_trgm/init.php:118
-#: plugins/af_psql_trgm/init.php:220
-#, fuzzy
-msgid "Mark similar articles as read"
-msgstr "Minden hírt megjelöl olvasottként?"
-
-#: plugins/af_psql_trgm/init.php:157
-msgid "PostgreSQL trigram extension returns string similarity as a floating point number (0-1). Setting it too low might produce false positives, zero disables checking."
-msgstr ""
-
-#: plugins/af_psql_trgm/init.php:160
-#, fuzzy
-msgid "Global settings"
-msgstr "Beállításokkal együtt"
-
-#: plugins/af_psql_trgm/init.php:164
-msgid "Minimum similarity:"
-msgstr ""
-
-#: plugins/af_psql_trgm/init.php:169
-msgid "Minimum title length:"
-msgstr ""
-
-#: plugins/af_psql_trgm/init.php:174
-#, fuzzy
-msgid "Enable for all feeds:"
-msgstr "Hírcsatornák kategorizálásának engedélyezése"
-
-#: plugins/af_psql_trgm/init.php:209
-msgid "Similarity (pg_trgm)"
-msgstr ""
-
-#: plugins/af_comics/init.php:40
-msgid "Feeds supported by af_comics"
-msgstr ""
-
-#: plugins/af_comics/init.php:42
-msgid "The following comics are currently supported:"
-msgstr ""
-
-#: plugins/af_comics/init.php:60
-msgid "GoComics requires a specific URL to workaround their lack of feed support: <code>http://feeds.feedburner.com/uclick/<em>comic_name</em></code> (e.g. <code>http://www.gocomics.com/garfield</code> uses <code>http://feeds.feedburner.com/uclick/garfield</code>)."
-msgstr ""
-
 #: plugins/import_export/init.php:58
 msgid "Import and export"
 msgstr "Import és export"
@@ -2677,96 +2452,83 @@ msgstr "Adataim expotálása"
 msgid "Import"
 msgstr "Importálás"
 
-#: plugins/import_export/init.php:225
+#: plugins/import_export/init.php:231
 msgid "Could not import: incorrect schema version."
 msgstr "Nem sikerült az importálás: érvénytelen séma verzió."
 
-#: plugins/import_export/init.php:230
+#: plugins/import_export/init.php:236
 msgid "Could not import: unrecognized document format."
 msgstr "Nem sikerült az importálás: ismeretlen dokumentum formátum."
 
-#: plugins/import_export/init.php:391
+#: plugins/import_export/init.php:397
 msgid "Finished: "
 msgstr "Befejezve:"
 
-#: plugins/import_export/init.php:392
+#: plugins/import_export/init.php:398
 #, php-format
 msgid "%d article processed, "
 msgid_plural "%d articles processed, "
 msgstr[0] "%d hír feldolgozva,"
 msgstr[1] "%d hír feldolgozva,"
 
-#: plugins/import_export/init.php:393
+#: plugins/import_export/init.php:399
 #, php-format
 msgid "%d imported, "
 msgid_plural "%d imported, "
 msgstr[0] "%d importálva,"
 msgstr[1] "%d importálva,"
 
-#: plugins/import_export/init.php:394
+#: plugins/import_export/init.php:400
 #, php-format
 msgid "%d feed created."
 msgid_plural "%d feeds created."
 msgstr[0] "%d hírcsatorna létrehozva."
 msgstr[1] "%d hírcsatorna létrehozva."
 
-#: plugins/import_export/init.php:399
+#: plugins/import_export/init.php:405
 msgid "Could not load XML document."
 msgstr "Az XML dokumentum nem tölthető be."
 
-#: plugins/import_export/init.php:411
+#: plugins/import_export/init.php:417
 msgid "Prepare data"
 msgstr "Adatok előkészítése"
 
-#: plugins/import_export/init.php:428
+#: plugins/import_export/init.php:434
 #, fuzzy, php-format
 msgid "Upload failed with error code %d (%s)"
 msgstr "Feltöltés sikertelen. Hibakód: %d"
 
-#: plugins/import_export/init.php:454
+#: plugins/import_export/init.php:460
 msgid "No file uploaded."
 msgstr "Nincs felöltött fájl."
 
-#: plugins/mail/init.php:28
-msgid "Mail addresses saved."
-msgstr ""
-
-#: plugins/mail/init.php:34
-#, fuzzy
-msgid "Mail plugin"
-msgstr "Felhasználói beépülők"
-
-#: plugins/mail/init.php:36
-msgid "You can set predefined email addressed here (comma-separated list):"
-msgstr ""
-
+#: plugins/mailto/init.php:48
+#: plugins/mailto/init.php:54
 #: plugins/mail/init.php:112
 #: plugins/mail/init.php:118
-#: plugins/mailto/init.php:49
-#: plugins/mailto/init.php:55
 msgid "[Forwarded]"
 msgstr "[Továbbítva]"
 
+#: plugins/mailto/init.php:48
 #: plugins/mail/init.php:112
-#: plugins/mailto/init.php:49
 msgid "Multiple articles"
 msgstr "Többszörös hírek"
 
-#: plugins/mail/init.php:140
-msgid "To:"
-msgstr "Címzett:"
+#: plugins/mailto/init.php:70
+msgid "Clicking the following link to invoke your mail client:"
+msgstr "A levelezőprogram használatával való továbbításhoz kattintson az alábbi linkre:"
 
-#: plugins/mail/init.php:155
-msgid "Subject:"
-msgstr "Tárgy:"
+#: plugins/mailto/init.php:74
+msgid "Forward selected article(s) by email."
+msgstr "Kijelölt hírek továbbítása e-mailben."
 
-#: plugins/mail/init.php:172
-msgid "Send e-mail"
-msgstr "Email küldés"
+#: plugins/mailto/init.php:77
+msgid "You should be able to edit the message before sending in your mail client."
+msgstr "A levél elküldése előtt lehetőség van az üzenet szerkesztésére."
 
-#: plugins/close_button/init.php:22
-msgid "Close article"
-msgstr "Hír bezárása"
+#: plugins/mailto/init.php:82
+msgid "Close this dialog"
+msgstr "Ablak bezárása"
 
 #: plugins/bookmarklets/init.php:20
 msgid "Bookmarklets"
@@ -2789,34 +2551,125 @@ msgstr "Feliratkozás a Tiny Tiny RSS-ben?"
 msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
 msgstr "Használja ezt a bookmarkletet tetszőleges oldalak közzétételére a Tiny Tiny RSS használatával"
 
+#: plugins/af_psql_trgm/init.php:28
+#, php-format
+msgid "Data saved (%s, %d)"
+msgstr ""
+
+#: plugins/af_psql_trgm/init.php:112
+#, fuzzy
+msgid "Show related articles"
+msgstr "Megosztott hírek"
+
+#: plugins/af_psql_trgm/init.php:118
+#: plugins/af_psql_trgm/init.php:220
+#, fuzzy
+msgid "Mark similar articles as read"
+msgstr "Minden hírt megjelöl olvasottként?"
+
+#: plugins/af_psql_trgm/init.php:157
+msgid "PostgreSQL trigram extension returns string similarity as a floating point number (0-1). Setting it too low might produce false positives, zero disables checking."
+msgstr ""
+
+#: plugins/af_psql_trgm/init.php:160
+#, fuzzy
+msgid "Global settings"
+msgstr "Beállításokkal együtt"
+
+#: plugins/af_psql_trgm/init.php:164
+msgid "Minimum similarity:"
+msgstr ""
+
+#: plugins/af_psql_trgm/init.php:169
+msgid "Minimum title length:"
+msgstr ""
+
+#: plugins/af_psql_trgm/init.php:174
+#, fuzzy
+msgid "Enable for all feeds:"
+msgstr "Hírcsatornák kategorizálásának engedélyezése"
+
+#: plugins/af_psql_trgm/init.php:191
+#: plugins/af_readability/init.php:78
+msgid "Currently enabled for (click to edit):"
+msgstr ""
+
+#: plugins/af_psql_trgm/init.php:209
+msgid "Similarity (pg_trgm)"
+msgstr ""
+
+#: plugins/nsfw/init.php:30
+#: plugins/nsfw/init.php:42
+msgid "Not work safe (click to toggle)"
+msgstr "Munkahelyen nem bitonságos (kattintson a váltáshoz)"
+
+#: plugins/nsfw/init.php:52
+msgid "NSFW Plugin"
+msgstr "NSFW beépülő"
+
+#: plugins/nsfw/init.php:79
+msgid "Tags to consider NSFW (comma-separated)"
+msgstr "Munkahelyen nem biztonságos tartalmak címkéi (vesszővel elválasztva)"
+
+#: plugins/nsfw/init.php:100
+msgid "Configuration saved."
+msgstr "Beállítások elmentve."
+
 #: plugins/toggle_sidebar/init.php:23
 msgid "Collapse feedlist"
 msgstr "Hírcsatornalista összecsukása"
 
-#: plugins/af_zz_imgproxy/init.php:186
-msgid "Image proxy settings (af_zz_imgproxy)"
+#: plugins/af_readability/init.php:21
+msgid "Data saved."
 msgstr ""
 
-#: plugins/af_zz_imgproxy/init.php:211
+#: plugins/af_readability/init.php:33
 #, fuzzy
-msgid "Enable proxy for all remote images."
-msgstr "Hírcsatornák kategorizálásának engedélyezése"
+msgid "Inline content"
+msgstr "Megjegyzés"
 
-#: plugins/mailto/init.php:71
-msgid "Clicking the following link to invoke your mail client:"
-msgstr "A levelezőprogram használatával való továbbításhoz kattintson az alábbi linkre:"
+#: plugins/af_readability/init.php:39
+msgid "Readability settings (af_readability)"
+msgstr ""
 
-#: plugins/mailto/init.php:75
-msgid "Forward selected article(s) by email."
-msgstr "Kijelölt hírek továbbítása e-mailben."
+#: plugins/af_readability/init.php:66
+msgid "Use Readability for pages shared via bookmarklet."
+msgstr ""
 
-#: plugins/mailto/init.php:78
-msgid "You should be able to edit the message before sending in your mail client."
-msgstr "A levél elküldése előtt lehetőség van az üzenet szerkesztésére."
+#: plugins/af_readability/init.php:95
+#, fuzzy
+msgid "Readability"
+msgstr "Ellenőrizze, hogy nem foglalt-e már:"
 
-#: plugins/mailto/init.php:83
-msgid "Close this dialog"
-msgstr "Ablak bezárása"
+#: plugins/af_readability/init.php:106
+#, fuzzy
+msgid "Inline article content"
+msgstr "Megjegyzés"
+
+#: plugins/mail/init.php:28
+msgid "Mail addresses saved."
+msgstr ""
+
+#: plugins/mail/init.php:34
+#, fuzzy
+msgid "Mail plugin"
+msgstr "Felhasználói beépülők"
+
+#: plugins/mail/init.php:36
+msgid "You can set predefined email addressed here (comma-separated list):"
+msgstr ""
+
+#: plugins/mail/init.php:140
+msgid "To:"
+msgstr "Címzett:"
+
+#: plugins/mail/init.php:155
+msgid "Subject:"
+msgstr "Tárgy:"
+
+#: plugins/mail/init.php:172
+msgid "Send e-mail"
+msgstr "Email küldés"
 
 #: plugins/share/init.php:39
 msgid "You can disable all articles shared by unique URLs here."
@@ -2830,24 +2683,97 @@ msgstr "Minden hír megosztásának visszavonása"
 msgid "Share by URL"
 msgstr "Megosztás URL-el"
 
-#: plugins/share/init.php:97
+#: plugins/share/init.php:96
 msgid "You can share this article by the following unique URL:"
 msgstr "Ezt a hírt megoszthatja a következő egyedi URL segítségével:"
 
-#: plugins/share/init.php:115
+#: plugins/share/init.php:114
 msgid "Unshare article"
 msgstr "Hír megosztásának visszavonása"
 
+#: plugins/af_comics/init.php:48
+msgid "Feeds supported by af_comics"
+msgstr ""
+
+#: plugins/af_comics/init.php:50
+msgid "The following comics are currently supported:"
+msgstr ""
+
+#: plugins/af_comics/init.php:68
+msgid "GoComics requires a specific URL to workaround their lack of feed support: <code>http://feeds.feedburner.com/uclick/<em>comic_name</em></code> (e.g. <code>http://www.gocomics.com/garfield</code> uses <code>http://feeds.feedburner.com/uclick/garfield</code>)."
+msgstr ""
+
+#: plugins/af_comics/init.php:70
+msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:25
+msgid "Reddit content settings (af_redditimgur)"
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:50
+msgid "Uses Readability (full-text-rss) implementation by <a target='_blank' href='https://bitbucket.org/fivefilters/'>FiveFilters.org</a>"
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:54
+msgid "Extract missing content using Readability"
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:59
+msgid "Enable additional duplicate checking"
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:73
+#: plugins/af_zz_imgproxy/init.php:254
+#, fuzzy
+msgid "Configuration saved"
+msgstr "Beállítások elmentve."
+
+#: plugins/note/init.php:26
+#: plugins/note/note.js:11
+msgid "Edit article note"
+msgstr "Megjegyzés"
+
+#: plugins/close_button/init.php:25
+msgid "Close article"
+msgstr "Hír bezárása"
+
+#: plugins/af_zz_imgproxy/init.php:210
+msgid "Image proxy settings (af_zz_imgproxy)"
+msgstr ""
+
+#: plugins/af_zz_imgproxy/init.php:234
+#, fuzzy
+msgid "Enable proxy for all remote images."
+msgstr "Hírcsatornák kategorizálásának engedélyezése"
+
+#: plugins/af_zz_imgproxy/init.php:238
+#, fuzzy
+msgid "Don't cache files locally."
+msgstr "Képek helyi tárolása"
+
+#: plugins/auth_internal/init.php:65
+msgid "Please enter your one time password:"
+msgstr "Adja meg az egyszer használatos jelszót:"
+
+#: plugins/auth_internal/init.php:188
+msgid "Password has been changed."
+msgstr "A jelszó megváltoztatva."
+
+#: plugins/auth_internal/init.php:190
+msgid "Old password is incorrect."
+msgstr "A régi jelszó helytelen."
+
 #: js/FeedTree.js:172
 #, fuzzy
 msgid "(Un)collapse"
 msgstr "Oldalsáv megjelenítés/elrejtés"
 
-#: js/PrefFeedTree.js:52
+#: js/PrefFeedTree.js:54
 msgid "Edit category"
 msgstr "Kategória szerkesztése"
 
-#: js/PrefFeedTree.js:59
+#: js/PrefFeedTree.js:61
 msgid "Remove category"
 msgstr "Kategória eltávolítása"
 
@@ -2882,63 +2808,55 @@ msgid "Create Filter"
 msgstr "Szűrő létrehozás"
 
 #: js/functions.js:1128
-msgid "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification hub again on next feed update."
-msgstr "Feliratkozás visszaállítása? a következő frissítéskor Tiny Tiny RSS megpróbál automatikusan újra feliratkozni."
-
-#: js/functions.js:1139
-msgid "Subscription reset."
-msgstr "Feliratkozás visszaállítás."
-
-#: js/functions.js:1149
-#: js/tt-rss.js:695
+#: js/tt-rss.js:696
 #, perl-format
 msgid "Unsubscribe from %s?"
 msgstr "Leiratkozik innen: %s?"
 
-#: js/functions.js:1152
+#: js/functions.js:1131
 msgid "Removing feed..."
 msgstr "Hírcsatorna eltávolítás..."
 
-#: js/functions.js:1225
+#: js/functions.js:1204
 msgid "Please enter category title:"
 msgstr "Adja meg a kategória címét:"
 
-#: js/functions.js:1250
+#: js/functions.js:1229
 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:1254
-#: js/prefs.js:1154
+#: js/functions.js:1233
+#: js/prefs.js:1150
 msgid "Trying to change address..."
 msgstr "Cím cseréje..."
 
-#: js/functions.js:1497
-#: js/functions.js:1606
+#: js/functions.js:1476
+#: js/functions.js:1585
 #: js/prefs.js:398
 #: js/prefs.js:424
 #: js/prefs.js:456
 #: js/prefs.js:599
 #: js/prefs.js:617
-#: js/prefs.js:1136
-#: js/prefs.js:1263
+#: js/prefs.js:1132
+#: js/prefs.js:1259
 msgid "No feeds are selected."
 msgstr "Nincs kiválasztott hírcsatorna."
 
-#: js/functions.js:1540
+#: js/functions.js:1519
 msgid "Remove selected feeds from the archive? Feeds with stored articles will not be removed."
 msgstr "Eltávolítja a kijelölt hírcsatornákat az archívumból? A tárolt hírekkel rendelkező hírcsatornák nem lesznek törölve."
 
-#: js/functions.js:1577
+#: js/functions.js:1556
 msgid "Feeds with update errors"
 msgstr "Hírcsatornák frissítési hibával"
 
-#: js/functions.js:1588
-#: js/prefs.js:1117
+#: js/functions.js:1567
+#: js/prefs.js:1113
 msgid "Remove selected feeds?"
 msgstr "Eltávolítja a kiválasztott hírcsatornákat?"
 
-#: js/functions.js:1591
-#: js/prefs.js:1120
+#: js/functions.js:1570
+#: js/prefs.js:1116
 msgid "Removing selected feeds..."
 msgstr "Kiválasztott hírcsatornák eltávolítása..."
 
@@ -2961,9 +2879,7 @@ msgstr "Felhasználó-szerkesztő"
 #: js/prefs.js:100
 #: js/prefs.js:209
 #: js/prefs.js:706
-#: plugins/instances/instances.js:26
-#: plugins/instances/instances.js:89
-#: js/functions.js:1408
+#: js/functions.js:1387
 msgid "Saving data..."
 msgstr "Adatok mentése..."
 
@@ -2988,7 +2904,7 @@ msgid "Removing selected labels..."
 msgstr "Kiválasztott címkék eltávolítása..."
 
 #: js/prefs.js:308
-#: js/prefs.js:1304
+#: js/prefs.js:1300
 msgid "No labels are selected."
 msgstr "Nincs kiválasztott címke."
 
@@ -3087,28 +3003,28 @@ msgstr "Leiratkozik a kiválasztott hírcsatornákról?"
 msgid "OPML Import"
 msgstr "OPML importálás"
 
-#: js/prefs.js:764
+#: js/prefs.js:759
 msgid "Please choose an OPML file first."
 msgstr "Először válasszon egy OPML fjlt."
 
-#: js/prefs.js:767
+#: js/prefs.js:762
 #: plugins/import_export/import_export.js:115
 msgid "Importing, please wait..."
 msgstr "Importálás, kérem várjon..."
 
-#: js/prefs.js:928
+#: js/prefs.js:924
 msgid "Reset to defaults?"
 msgstr "Visszaállítja a gyári beállításokat?"
 
-#: js/prefs.js:1628
+#: js/prefs.js:1624
 msgid "Subscribing to feeds..."
 msgstr "Feliratkozás a hírcsatornákra..."
 
-#: js/prefs.js:1647
+#: js/prefs.js:1643
 msgid "Clear stored data for this plugin?"
 msgstr "Törli a beépülő tárolt adatait?"
 
-#: js/prefs.js:1661
+#: js/prefs.js:1657
 msgid "Clear all messages in the error log?"
 msgstr "Töröl minden bejegyzést a hibanaplóból?"
 
@@ -3120,180 +3036,150 @@ msgstr "Minden hírt megjelöl olvasottként?"
 msgid "Marking all feeds as read..."
 msgstr "Minden hírcsatornát megjelölése olvasottként..."
 
-#: js/tt-rss.js:401
+#: js/tt-rss.js:402
 msgid "Please enable mail plugin first."
 msgstr "Először engedélyezze a mail beépülőt."
 
-#: js/tt-rss.js:449
-#: js/functions.js:1387
-#: js/tt-rss.js:676
+#: js/tt-rss.js:450
+#: js/functions.js:1366
+#: js/tt-rss.js:677
 msgid "You can't edit this kind of feed."
 msgstr "Ezt a hírcsatornatípust nem szerkesztheted."
 
-#: js/tt-rss.js:530
+#: js/tt-rss.js:531
 msgid "Please enable embed_original plugin first."
 msgstr "Először engedélyezze az embed_original beépülőt."
 
-#: js/tt-rss.js:543
-#: js/tt-rss.js:726
+#: js/tt-rss.js:544
+#: js/tt-rss.js:727
 msgid "Widescreen is not available in combined mode."
 msgstr ""
 
-#: js/tt-rss.js:824
+#: js/tt-rss.js:825
 msgid "You can't rescore this kind of feed."
 msgstr "Ez a hírcsatorna típust nem lehet újraponszámozni."
 
-#: js/tt-rss.js:829
-#: js/tt-rss.js:689
+#: js/tt-rss.js:830
+#: js/tt-rss.js:690
 msgid "Please select some feed first."
 msgstr "Válasszon hírcsatorná(ka)t!"
 
-#: js/tt-rss.js:834
+#: js/tt-rss.js:835
 #, perl-format
 msgid "Rescore articles in %s?"
 msgstr "Újrapontszámozza %s híreit?"
 
-#: js/tt-rss.js:837
+#: js/tt-rss.js:838
 msgid "Rescoring articles..."
 msgstr "Hírek újrapontozása..."
 
-#: js/viewfeed.js:919
-#: js/viewfeed.js:957
-#: js/viewfeed.js:1005
-#: js/viewfeed.js:1931
-#: plugins/mail/mail.js:7
+#: js/viewfeed.js:921
+#: js/viewfeed.js:959
+#: js/viewfeed.js:1007
+#: js/viewfeed.js:1933
 #: plugins/mailto/init.js:7
-#: js/viewfeed.js:677
-#: js/viewfeed.js:699
-#: js/viewfeed.js:720
-#: js/viewfeed.js:779
-#: js/viewfeed.js:807
+#: plugins/mail/mail.js:7
+#: js/viewfeed.js:679
+#: js/viewfeed.js:701
+#: js/viewfeed.js:722
+#: js/viewfeed.js:781
+#: js/viewfeed.js:809
 msgid "No articles are selected."
 msgstr "Nincsen kiválasztott hír."
 
-#: js/viewfeed.js:927
+#: js/viewfeed.js:929
 #, perl-format
 msgid "Delete %d selected article in %s?"
 msgid_plural "Delete %d selected articles in %s?"
 msgstr[0] "%d kijelölt hír törlése innen: %s?"
 msgstr[1] "%d kijelölt hír törlése innen: %s?"
 
-#: js/viewfeed.js:929
+#: js/viewfeed.js:931
 #, perl-format
 msgid "Delete %d selected article?"
 msgid_plural "Delete %d selected articles?"
 msgstr[0] "%d kijelölt hír törlése?"
 msgstr[1] "%d kijelölt hír törlése?"
 
-#: js/viewfeed.js:966
+#: js/viewfeed.js:968
 #, perl-format
 msgid "Archive %d selected article in %s?"
 msgid_plural "Archive %d selected articles in %s?"
 msgstr[0] "%d kijelölt hír archiválása innen: %s?"
 msgstr[1] "%d kijelölt hír archiválása innen: %s?"
 
-#: js/viewfeed.js:969
+#: js/viewfeed.js:971
 #, perl-format
 msgid "Move %d archived article back?"
 msgid_plural "Move %d archived articles back?"
 msgstr[0] "%d archivált hír visszaállítása?"
 msgstr[1] "%d archivált hír visszaállítása?"
 
-#: js/viewfeed.js:971
+#: js/viewfeed.js:973
 msgid "Please note that unstarred articles might get purged on next feed update."
 msgstr "Kérem vegye figyelembe, hogy a nem csillagozott hírek lehet, hogy törölve lesznek a következő frissítéskor."
 
-#: js/viewfeed.js:1011
+#: js/viewfeed.js:1013
 #, perl-format
 msgid "Mark %d selected article in %s as read?"
 msgid_plural "Mark %d selected articles in %s as read?"
 msgstr[0] "%d kijelölt hír megjelölése olvasottként itt: %s?"
 msgstr[1] "%d kijelölt hír megjelölése olvasottként itt: %s?"
 
-#: js/viewfeed.js:1031
+#: js/viewfeed.js:1033
 msgid "Edit article Tags"
 msgstr "Hír címkéinek szerkesztése"
 
-#: js/viewfeed.js:1037
+#: js/viewfeed.js:1039
 msgid "Saving article tags..."
 msgstr "Hír címkéinek mentése..."
 
-#: js/viewfeed.js:1670
+#: js/viewfeed.js:1672
 msgid "Open original article"
 msgstr "Eredeti hír megjelenítése"
 
-#: js/viewfeed.js:1677
+#: js/viewfeed.js:1679
 msgid "Display article URL"
 msgstr "URL megjelenítése"
 
-#: js/viewfeed.js:1787
+#: js/viewfeed.js:1789
 msgid "Assign label"
 msgstr "Címke hozzáadása"
 
-#: js/viewfeed.js:1792
+#: js/viewfeed.js:1794
 msgid "Remove label"
 msgstr "Címke eltávolítás"
 
-#: js/viewfeed.js:1824
+#: js/viewfeed.js:1826
 #, fuzzy
 msgid "Select articles in group"
 msgstr "Az kurzor alatti hír kiválasztása"
 
-#: js/viewfeed.js:1834
+#: js/viewfeed.js:1836
 #, fuzzy
 msgid "Mark group as read"
 msgstr "Megjelölés olvasottként"
 
-#: js/viewfeed.js:1846
+#: js/viewfeed.js:1848
 #, fuzzy
 msgid "Mark feed as read"
 msgstr "Minden hírcsatornát olvasottként jelöl"
 
-#: js/viewfeed.js:1899
+#: js/viewfeed.js:1901
 msgid "Please enter new score for selected articles:"
 msgstr "Adjon meg egy új pontszámot a kijelölt hírekhez:"
 
-#: js/viewfeed.js:1962
+#: js/viewfeed.js:1964
 msgid "Please enter new score for this article:"
 msgstr "Adjon meg egy új pontszámot a hírhez:"
 
-#: js/viewfeed.js:1993
+#: js/viewfeed.js:1995
 msgid "Article URL:"
 msgstr "Hír URL:"
 
-#: plugins/instances/instances.js:10
-msgid "Link Instance"
-msgstr "Példány összekapcsolás"
-
-#: plugins/instances/instances.js:73
-msgid "Edit Instance"
-msgstr "Pédány szerkesztés"
-
-#: plugins/instances/instances.js:122
-msgid "Remove selected instances?"
-msgstr "Eltávolítja a kiválasztott példányokat?"
-
-#: plugins/instances/instances.js:125
-msgid "Removing selected instances..."
-msgstr "Kiválasztott példányok eltávolítása..."
-
-#: plugins/instances/instances.js:139
-#: plugins/instances/instances.js:151
-msgid "No instances are selected."
-msgstr "Nincs kiválasztott példányok."
-
-#: plugins/instances/instances.js:156
-msgid "Please select only one instance."
-msgstr "Kérem csak egy példányt válasszon ki."
-
-#: plugins/note/note.js:17
-msgid "Saving article note..."
-msgstr "Megjegyzés mentése..."
-
-#: plugins/af_psql_trgm/init.js:11
-#, fuzzy
-msgid "Related articles"
-msgstr "Megosztott hírek"
+#: plugins/embed_original/init.js:6
+msgid "Sorry, your browser does not support sandboxed iframes."
+msgstr "Elnézést, a böngészője nem támogatja sandboxed iframeket."
 
 #: plugins/import_export/import_export.js:13
 msgid "Export Data"
@@ -3314,11 +3200,16 @@ msgstr "Adatok importálása"
 msgid "Please choose the file first."
 msgstr "Először válassza ki a fájlt."
 
-#: plugins/mail/mail.js:21
 #: plugins/mailto/init.js:21
+#: plugins/mail/mail.js:21
 msgid "Forward article by email"
 msgstr "Továbbítás emaiben"
 
+#: plugins/af_psql_trgm/init.js:11
+#, fuzzy
+msgid "Related articles"
+msgstr "Megosztott hírek"
+
 #: plugins/mail/mail.js:36
 msgid "Error sending email:"
 msgstr ""
@@ -3328,10 +3219,6 @@ msgstr ""
 msgid "Your message has been sent."
 msgstr "A személyes adatai el lettek mentve."
 
-#: plugins/embed_original/init.js:6
-msgid "Sorry, your browser does not support sandboxed iframes."
-msgstr "Elnézést, a böngészője nem támogatja sandboxed iframeket."
-
 #: plugins/shorten_expanded/init.js:39
 msgid "Click to expand article"
 msgstr "Kattints a hír kibontásához"
@@ -3361,7 +3248,7 @@ msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr "Ez érvényteleníteni fog minden korábban megosztott hír URL-t. Folytatja?"
 
 #: plugins/share/share_prefs.js:6
-#: js/prefs.js:1437
+#: js/prefs.js:1433
 msgid "Clearing URLs..."
 msgstr "URL-ek törlése..."
 
@@ -3369,23 +3256,44 @@ msgstr "URL-ek törlése..."
 msgid "Shared URLs cleared."
 msgstr "Megosztott URL-ek törölve."
 
+#: plugins/note/note.js:17
+msgid "Saving article note..."
+msgstr "Megjegyzés mentése..."
+
 #: js/feedlist.js:429
-#: js/feedlist.js:496
 msgid "Mark all articles in %s as read?"
 msgstr "Minden hírt megjelöl olvasottként itt: %s?"
 
 #: js/feedlist.js:487
-msgid "Mark all articles in %s older than 1 day as read?"
+#, fuzzy
+msgid "Mark %w in %s older than 1 day as read?"
 msgstr "Minden 1 napnál régebbi %s hírt megjelöl olvasottként?"
 
 #: js/feedlist.js:490
-msgid "Mark all articles in %s older than 1 week as read?"
+#, fuzzy
+msgid "Mark %w in %s older than 1 week as read?"
 msgstr "Minden 1 hétnél régebbi %s hírt megjelöl olvasottként?"
 
 #: js/feedlist.js:493
-msgid "Mark all articles in %s older than 2 weeks as read?"
+#, fuzzy
+msgid "Mark %w in %s older than 2 weeks as read?"
 msgstr "Minden 2 hétnél régebbi %s hírt megjelöl olvasottként?"
 
+#: js/feedlist.js:496
+#, fuzzy
+msgid "Mark %w in %s as read?"
+msgstr "Minden hírt megjelöl olvasottként itt: %s?"
+
+#: js/feedlist.js:499
+#, fuzzy
+msgid "search results"
+msgstr "Keresési eredmények: %s"
+
+#: js/feedlist.js:499
+#, fuzzy
+msgid "all articles"
+msgstr "Az összes hír"
+
 #: js/functions.js:506
 msgid "Error explained"
 msgstr "Hiba magyarázata"
@@ -3466,178 +3374,247 @@ msgstr "Már feliratkozott erre a hírcsatornára."
 msgid "Edit rule"
 msgstr "Szabály szerkesztése"
 
-#: js/functions.js:1402
+#: js/functions.js:1381
 msgid "Edit Feed"
 msgstr "Hírcsatorna szerkesztése"
 
-#: js/functions.js:1435
+#: js/functions.js:1414
 msgid "More Feeds"
 msgstr "További hírcsatornák"
 
-#: js/functions.js:1631
+#: js/functions.js:1610
 msgid "Help"
 msgstr "Súgó"
 
-#: js/prefs.js:1032
+#: js/prefs.js:1028
 msgid "Remove category %s? Any nested feeds would be placed into Uncategorized."
 msgstr "Eltávolítja %s kategóriát? Minden tartalmazott hírcsatorna a Kategorizálatlanba fog kerülni."
 
-#: js/prefs.js:1038
+#: js/prefs.js:1034
 msgid "Removing category..."
 msgstr "Kategória eltávolítása..."
 
-#: js/prefs.js:1056
+#: js/prefs.js:1052
 msgid "Remove selected categories?"
 msgstr "Kiválasztott kategóriák eltávolítása?"
 
-#: js/prefs.js:1059
+#: js/prefs.js:1055
 msgid "Removing selected categories..."
 msgstr "Kiválasztott kategóriák eltávolítása..."
 
-#: js/prefs.js:1072
+#: js/prefs.js:1068
 msgid "No categories are selected."
 msgstr "Nincs kategória kiválaszta."
 
-#: js/prefs.js:1079
+#: js/prefs.js:1075
 msgid "Category title:"
 msgstr "Kategória címe:"
 
-#: js/prefs.js:1083
+#: js/prefs.js:1079
 msgid "Creating category..."
 msgstr "Kategória létrehozása..."
 
-#: js/prefs.js:1106
+#: js/prefs.js:1102
 msgid "Feeds without recent updates"
 msgstr "Hírcsatornák frissítések nélkül"
 
-#: js/prefs.js:1150
+#: js/prefs.js:1146
 msgid "Replace current OPML publishing address with a new one?"
 msgstr "Lecseréli a jelenlegi OPML hírcsatornája címét egy újra?"
 
-#: js/prefs.js:1227
+#: js/prefs.js:1223
 msgid "Clearing feed..."
 msgstr "Hírcsatorna törlése..."
 
-#: js/prefs.js:1247
+#: js/prefs.js:1243
 msgid "Rescore articles in selected feeds?"
 msgstr "Újrapontszámozza a híreket a kijelölt hírcsatornákban?"
 
-#: js/prefs.js:1250
+#: js/prefs.js:1246
 msgid "Rescoring selected feeds..."
 msgstr "Kijelölt hírcsatornák újrapontozása..."
 
-#: js/prefs.js:1270
+#: js/prefs.js:1266
 msgid "Rescore all articles? This operation may take a lot of time."
 msgstr "Újrapontoz minden cíkket? Ez a művelet hosszú ideig is eltarthat."
 
-#: js/prefs.js:1273
+#: js/prefs.js:1269
 msgid "Rescoring feeds..."
 msgstr "Hírcsatornák újrapontozása"
 
-#: js/prefs.js:1289
+#: js/prefs.js:1285
 msgid "Reset selected labels to default colors?"
 msgstr "Visszaállítja a kijelölt címkék színét az alapértelmezettre?"
 
-#: js/prefs.js:1321
+#: js/prefs.js:1317
 msgid "Settings Profiles"
 msgstr "Beállítási profilok"
 
-#: js/prefs.js:1330
+#: js/prefs.js:1326
 msgid "Remove selected profiles? Active and default profiles will not be removed."
 msgstr "Eltávolítja a kijelölt profilokat? Az aktív és az alapértelmezett profil nem lesz törölve."
 
-#: js/prefs.js:1333
+#: js/prefs.js:1329
 msgid "Removing selected profiles..."
 msgstr "Kiválasztott profilok eltávolítása..."
 
-#: js/prefs.js:1349
+#: js/prefs.js:1345
 msgid "No profiles are selected."
 msgstr "Nincsenek kiválasztott profilok."
 
-#: js/prefs.js:1357
-#: js/prefs.js:1410
+#: js/prefs.js:1353
+#: js/prefs.js:1406
 msgid "Activate selected profile?"
 msgstr "Aktiválja a kiválasztott profilt?"
 
-#: js/prefs.js:1374
-#: js/prefs.js:1426
+#: js/prefs.js:1370
+#: js/prefs.js:1422
 msgid "Please choose a profile to activate."
 msgstr "Válasszon egy aktiválandó profilt."
 
-#: js/prefs.js:1379
+#: js/prefs.js:1375
 msgid "Creating profile..."
 msgstr "Profil létrehozás..."
 
-#: js/prefs.js:1434
+#: js/prefs.js:1430
 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr "Ez érvényteleníteni fog minden korábban generált hírcsatorna URL-t. Folytatja?"
 
-#: js/prefs.js:1444
+#: js/prefs.js:1440
 msgid "Generated URLs cleared."
 msgstr "Generált URL-ek törölve."
 
-#: js/prefs.js:1516
+#: js/prefs.js:1512
 msgid "Label Editor"
 msgstr "Címke Szerkesztő"
 
-#: js/tt-rss.js:684
+#: js/tt-rss.js:685
 msgid "You can't unsubscribe from the category."
 msgstr "Ebből a kategóriából nem ."
 
-#: js/viewfeed.js:125
-#: js/viewfeed.js:175
-#: js/viewfeed.js:192
+#: js/viewfeed.js:127
+#: js/viewfeed.js:177
+#: js/viewfeed.js:194
 #, fuzzy
 msgid "Click to open next unread feed."
 msgstr "Kattintson a hírcsatorna szerkesztéséhez"
 
-#: js/viewfeed.js:129
+#: js/viewfeed.js:131
 msgid "Cancel search"
 msgstr "Keresés megszakítása"
 
-#: js/viewfeed.js:189
+#: js/viewfeed.js:191
 #, fuzzy
 msgid "New articles found, reload feed to continue."
 msgstr "Nincs megjeleníthető hír."
 
-#: js/viewfeed.js:424
+#: js/viewfeed.js:426
 msgid "Unstar article"
 msgstr "Csillagot levesz a hírről"
 
-#: js/viewfeed.js:428
+#: js/viewfeed.js:430
 msgid "Star article"
 msgstr "Hír csillagozása"
 
-#: js/viewfeed.js:478
+#: js/viewfeed.js:480
 msgid "Unpublish article"
 msgstr "Publikálás visszavonása"
 
-#: js/viewfeed.js:482
+#: js/viewfeed.js:484
 msgid "Publish article"
 msgstr "Hír publikálása"
 
-#: js/viewfeed.js:622
+#: js/viewfeed.js:624
 msgid "%d article selected"
 msgid_plural "%d articles selected"
 msgstr[0] "%d hír kijelölve"
 msgstr[1] "%d hír kijelölve"
 
-#: js/viewfeed.js:1286
+#: js/viewfeed.js:1288
 msgid "No article is selected."
 msgstr "Nincs kiválasztott hír."
 
-#: js/viewfeed.js:1321
+#: js/viewfeed.js:1323
 msgid "No articles found to mark"
 msgstr "Nincs megjelölendő hír."
 
-#: js/viewfeed.js:1323
+#: js/viewfeed.js:1325
 msgid "Mark %d article as read?"
 msgid_plural "Mark %d articles as read?"
 msgstr[0] "%d hír megjelölése olvasottként?"
 msgstr[1] "%d hír megjelölése olvasottként?"
 
-#~ msgid "Cache images locally"
-#~ msgstr "Képek helyi tárolása"
+#~ msgid "Resubscribe to push updates"
+#~ msgstr "Újra feliratkozás a push frissítésekre"
+
+#~ msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
+#~ msgstr "Visszaállítja a PubSubHubbub feliratkozást a push-engedélyezett hírcsatornákhoz."
+
+#~ msgid "Download more plugins at tt-rss.org <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forums</a> or <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a>."
+#~ msgstr "További beépülők letölthetők a tt-rss.org <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">fórumairól</a> vagy a <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wikiről</a>."
+
+#~ msgid "Linked"
+#~ msgstr "Összekapcsolás"
+
+#~ msgid "Instance"
+#~ msgstr "Példány"
+
+#~ msgid "Instance URL"
+#~ msgstr "Példány URL"
+
+#~ msgid "Access key:"
+#~ msgstr "Hozzáférési kulcs:"
+
+#~ msgid "Access key"
+#~ msgstr "Hozzáférési kulcs"
+
+#~ msgid "Use one access key for both linked instances."
+#~ msgstr "Egy hozzáférési kulcs használata minden összekapcsolt példányhoz."
+
+#~ msgid "Generate new key"
+#~ msgstr "Új kulcs generálása"
+
+#~ msgid "Link instance"
+#~ msgstr "Példány összekapcsolás"
+
+#~ msgid "You can connect other instances of Tiny Tiny RSS to this one to share Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
+#~ msgstr "A Népszerű hírcsatornák megosztásához csatlakoztathat másik Tiny Tiny RSS példányokat ehhez. A Tiny Tiny RSS ezen példányához való kapcsolódáshoz ez az URL használható:"
+
+#~ msgid "Last connected"
+#~ msgstr "Utoljára belépve"
+
+#~ msgid "Status"
+#~ msgstr "Állapot"
+
+#~ msgid "Stored feeds"
+#~ msgstr "Tárolt hírcsatornák"
+
+#~ msgid "Create link"
+#~ msgstr "Link létrehozás"
+
+#~ msgid "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification hub again on next feed update."
+#~ msgstr "Feliratkozás visszaállítása? a következő frissítéskor Tiny Tiny RSS megpróbál automatikusan újra feliratkozni."
+
+#~ msgid "Subscription reset."
+#~ msgstr "Feliratkozás visszaállítás."
+
+#~ msgid "Link Instance"
+#~ msgstr "Példány összekapcsolás"
+
+#~ msgid "Edit Instance"
+#~ msgstr "Pédány szerkesztés"
+
+#~ msgid "Remove selected instances?"
+#~ msgstr "Eltávolítja a kiválasztott példányokat?"
+
+#~ msgid "Removing selected instances..."
+#~ msgstr "Kiválasztott példányok eltávolítása..."
+
+#~ msgid "No instances are selected."
+#~ msgstr "Nincs kiválasztott példányok."
+
+#~ msgid "Please select only one instance."
+#~ msgstr "Kérem csak egy példányt válasszon ki."
 
 #~ msgid "The error will be reported to the configured log destination."
 #~ msgstr "A hiba a beállított naplóhelyre lesz jelentve."
diff --git a/locale/it_IT/LC_MESSAGES/messages.mo b/locale/it_IT/LC_MESSAGES/messages.mo
index dcedff4df..31f6a97fb 100644
--- a/locale/it_IT/LC_MESSAGES/messages.mo
+++ b/locale/it_IT/LC_MESSAGES/messages.mo
diff --git a/locale/it_IT/LC_MESSAGES/messages.po b/locale/it_IT/LC_MESSAGES/messages.po
index 0da422eb3..618e09a0c 100644
--- a/locale/it_IT/LC_MESSAGES/messages.po
+++ b/locale/it_IT/LC_MESSAGES/messages.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tiny Tiny RSS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 15:25+0300\n"
+"POT-Creation-Date: 2017-07-04 16:29+0300\n"
 "PO-Revision-Date: 2017-03-29 22:05+0200\n"
 "Last-Translator: dedioste <[email protected]>\n"
 "Language-Team: \n"
@@ -52,39 +52,49 @@ msgstr "Vecchi di 3 mesi"
 msgid "Default interval"
 msgstr "Intervallo predefinito"
 
-#: backend.php:83 backend.php:93
+#: backend.php:83
+#: backend.php:93
 msgid "Disable updates"
 msgstr "Disattiva aggiornamenti"
 
-#: backend.php:84 backend.php:94
+#: backend.php:84
+#: backend.php:94
 msgid "15 minutes"
 msgstr "15 minuti"
 
-#: backend.php:85 backend.php:95
+#: backend.php:85
+#: backend.php:95
 msgid "30 minutes"
 msgstr "30 minuti"
 
-#: backend.php:86 backend.php:96
+#: backend.php:86
+#: backend.php:96
 msgid "Hourly"
 msgstr "Ogni ora"
 
-#: backend.php:87 backend.php:97
+#: backend.php:87
+#: backend.php:97
 msgid "4 hours"
 msgstr "4 ore"
 
-#: backend.php:88 backend.php:98
+#: backend.php:88
+#: backend.php:98
 msgid "12 hours"
 msgstr "12 ore"
 
-#: backend.php:89 backend.php:99
+#: backend.php:89
+#: backend.php:99
 msgid "Daily"
 msgstr "Ogni giorno"
 
-#: backend.php:90 backend.php:100
+#: backend.php:90
+#: backend.php:100
 msgid "Weekly"
 msgstr "Ogni settimana"
 
-#: backend.php:103 classes/pref/users.php:42 classes/pref/system.php:51
+#: backend.php:103
+#: classes/pref/users.php:42
+#: classes/pref/system.php:51
 msgid "User"
 msgstr "Utente"
 
@@ -152,16 +162,36 @@ msgstr "Metodo non trovato"
 msgid "Plugin not found"
 msgstr "Plugin non trovato"
 
-#: index.php:149 index.php:165 index.php:283 prefs.php:118
-#: classes/backend.php:5 classes/pref/labels.php:282
-#: classes/pref/feeds.php:1402 classes/pref/filters.php:779 js/feedlist.js:149
-#: js/functions.js:1131 js/functions.js:1231 js/functions.js:1478
-#: js/prefs.js:621 js/prefs.js:818 js/prefs.js:1648 js/prefs.js:1663
-#: js/tt-rss.js:550 js/viewfeed.js:1182
-#: plugins/import_export/import_export.js:17 js/feedlist.js:467
-#: js/feedlist.js:512 js/functions.js:372 js/functions.js:630 js/prefs.js:1360
-#: js/prefs.js:1413 js/prefs.js:1452 js/prefs.js:1465 js/prefs.js:1476
-#: js/prefs.js:1491 js/tt-rss.js:567 js/viewfeed.js:762
+#: index.php:149
+#: index.php:165
+#: index.php:283
+#: prefs.php:118
+#: classes/backend.php:5
+#: classes/pref/labels.php:282
+#: classes/pref/filters.php:819
+#: classes/pref/feeds.php:1376
+#: js/feedlist.js:149
+#: js/functions.js:1210
+#: js/functions.js:1457
+#: js/prefs.js:621
+#: js/prefs.js:813
+#: js/prefs.js:1644
+#: js/prefs.js:1659
+#: js/tt-rss.js:551
+#: js/viewfeed.js:1184
+#: plugins/import_export/import_export.js:17
+#: js/feedlist.js:467
+#: js/feedlist.js:515
+#: js/functions.js:372
+#: js/functions.js:630
+#: js/prefs.js:1356
+#: js/prefs.js:1409
+#: js/prefs.js:1448
+#: js/prefs.js:1461
+#: js/prefs.js:1472
+#: js/prefs.js:1487
+#: js/tt-rss.js:568
+#: js/viewfeed.js:764
 msgid "Loading, please wait..."
 msgstr "Caricamento, attendere prego..."
 
@@ -177,15 +207,21 @@ msgstr "Adattivo"
 msgid "All Articles"
 msgstr "Tutti gli articoli"
 
-#: index.php:192 include/functions2.php:107 classes/feeds.php:110
+#: index.php:192
+#: include/functions.php:1181
+#: classes/feeds.php:110
 msgid "Starred"
 msgstr "Con stella"
 
-#: index.php:193 include/functions2.php:108 classes/feeds.php:111
+#: index.php:193
+#: include/functions.php:1182
+#: classes/feeds.php:111
 msgid "Published"
 msgstr "Pubblicati"
 
-#: index.php:194 classes/feeds.php:103 classes/feeds.php:109
+#: index.php:194
+#: classes/feeds.php:103
+#: classes/feeds.php:109
 msgid "Unread"
 msgstr "Non letti"
 
@@ -217,8 +253,12 @@ msgstr "Prima i più vecchi"
 msgid "Title"
 msgstr "Titolo"
 
-#: index.php:209 index.php:249 include/functions2.php:95 classes/feeds.php:115
-#: js/FeedTree.js:138 js/FeedTree.js:166
+#: index.php:209
+#: index.php:249
+#: include/functions.php:1169
+#: classes/feeds.php:115
+#: js/FeedTree.js:138
+#: js/FeedTree.js:166
 msgid "Mark as read"
 msgstr "Segna come letto"
 
@@ -254,7 +294,8 @@ msgstr "Cerca..."
 msgid "Feed actions:"
 msgstr "Azioni sul notiziario:"
 
-#: index.php:244 classes/handler/public.php:672
+#: index.php:244
+#: classes/handler/public.php:583
 msgid "Subscribe to feed..."
 msgstr "Sottoscrivi il notiziario..."
 
@@ -266,8 +307,10 @@ msgstr "Modifica questo notiziario..."
 msgid "Rescore feed"
 msgstr "Cambia punteggio notiziario"
 
-#: index.php:247 classes/pref/feeds.php:785 classes/pref/feeds.php:1357
-#: js/PrefFeedTree.js:78
+#: index.php:247
+#: classes/pref/feeds.php:785
+#: classes/pref/feeds.php:1331
+#: js/PrefFeedTree.js:80
 msgid "Unsubscribe"
 msgstr "Annulla sottoscrizione"
 
@@ -283,7 +326,8 @@ msgstr "Visualizza/Nascondi notiziari letti"
 msgid "Other actions:"
 msgstr "Altre azioni:"
 
-#: index.php:252 include/functions2.php:81
+#: index.php:252
+#: include/functions.php:1155
 msgid "Toggle widescreen mode"
 msgstr "Modalità widescreen"
 
@@ -307,7 +351,9 @@ msgstr "Esci"
 msgid "Updates are available from Git."
 msgstr "Gli aggiornamenti sono disponibili via Git."
 
-#: prefs.php:33 prefs.php:136 include/functions2.php:110
+#: prefs.php:33
+#: prefs.php:136
+#: include/functions.php:1184
 #: classes/pref/prefs.php:435
 msgid "Preferences"
 msgstr "Preferenze"
@@ -320,17 +366,21 @@ msgstr "Scorciatoie da tastiera"
 msgid "Exit preferences"
 msgstr "Esci dalle preferenze"
 
-#: prefs.php:139 classes/pref/feeds.php:112 classes/pref/feeds.php:1297
-#: classes/pref/feeds.php:1346
+#: prefs.php:139
+#: classes/pref/feeds.php:112
+#: classes/pref/feeds.php:1271
+#: classes/pref/feeds.php:1320
 msgid "Feeds"
 msgstr "Notiziari"
 
-#: prefs.php:142 classes/pref/filters.php:248
+#: prefs.php:142
+#: classes/pref/filters.php:273
 msgid "Filters"
 msgstr "Filtri"
 
-#: prefs.php:145 include/functions.php:1327 include/functions.php:1979
+#: prefs.php:145
 #: classes/pref/labels.php:90
+#: classes/feeds.php:1718
 msgid "Labels"
 msgstr "Etichette"
 
@@ -342,7 +392,8 @@ msgstr "Utenti"
 msgid "System"
 msgstr "Sistema"
 
-#: register.php:187 include/login_form.php:252
+#: register.php:187
+#: include/login_form.php:252
 msgid "Create new account"
 msgstr "Crea un nuovo account"
 
@@ -350,12 +401,21 @@ msgstr "Crea un nuovo account"
 msgid "New user registrations are administratively disabled."
 msgstr "La registrazione di nuovi utenti è disattivata dall'amministratore."
 
-#: register.php:197 register.php:242 register.php:255 register.php:270
-#: register.php:289 register.php:337 register.php:347 register.php:359
-#: classes/handler/public.php:742 classes/handler/public.php:813
-#: classes/handler/public.php:911 classes/handler/public.php:990
-#: classes/handler/public.php:1004 classes/handler/public.php:1011
-#: classes/handler/public.php:1036
+#: register.php:197
+#: register.php:242
+#: register.php:255
+#: register.php:270
+#: register.php:289
+#: register.php:337
+#: register.php:347
+#: register.php:359
+#: classes/handler/public.php:653
+#: classes/handler/public.php:724
+#: classes/handler/public.php:822
+#: classes/handler/public.php:901
+#: classes/handler/public.php:915
+#: classes/handler/public.php:922
+#: classes/handler/public.php:947
 msgid "Return to Tiny Tiny RSS"
 msgstr "Ritorna a Tiny Tiny RSS"
 
@@ -371,11 +431,13 @@ msgstr "Nome utente desiderato:"
 msgid "Check availability"
 msgstr "Controlla disponibilità"
 
-#: register.php:229 classes/handler/public.php:829
+#: register.php:229
+#: classes/handler/public.php:740
 msgid "Email:"
 msgstr "Email:"
 
-#: register.php:232 classes/handler/public.php:834
+#: register.php:232
+#: classes/handler/public.php:745
 msgid "How much is two plus two:"
 msgstr "Quanto fa due più due:"
 
@@ -403,13 +465,23 @@ msgstr "Account creato con successo."
 msgid "New user registrations are currently closed."
 msgstr "La registrazione di nuovi utenti è attualmente chiusa."
 
-#: update.php:67
+#: update.php:66
 msgid "Tiny Tiny RSS data update script."
 msgstr "Script di aggiornamento dei dati di Tiny Tiny RSS."
 
-#: include/digest.php:109 include/functions.php:1336 include/functions.php:1880
-#: include/functions.php:1965 include/functions.php:1987 classes/opml.php:421
+#: include/controls.php:83
+#: classes/pref/filters.php:242
+#: classes/pref/filters.php:253
+#: classes/pref/filters.php:544
+msgid "All feeds"
+msgstr "Tutti i notiziari"
+
+#: include/controls.php:134
+#: include/controls.php:316
 #: classes/pref/feeds.php:228
+#: classes/opml.php:486
+#: classes/feeds.php:1727
+#: classes/digest.php:113
 msgid "Uncategorized"
 msgstr "Senza categoria"
 
@@ -424,353 +496,285 @@ msgstr[1] "%d articoli archiviati"
 msgid "No feeds found."
 msgstr "Nessun notiziario trovato."
 
-#: include/functions.php:1029
+#: include/functions.php:900
 #, php-format
 msgid "%d min"
 msgstr "%d min"
 
-#: include/functions.php:1325 include/functions.php:1977
-msgid "Special"
-msgstr "Speciale"
-
-#: include/functions.php:1828 classes/pref/filters.php:229
-#: classes/pref/filters.php:507
-msgid "All feeds"
-msgstr "Tutti i notiziari"
-
-#: include/functions.php:2032
-msgid "Starred articles"
-msgstr "Articoli con stella"
-
-#: include/functions.php:2034
-msgid "Published articles"
-msgstr "Articoli pubblicati"
-
-#: include/functions.php:2036
-msgid "Fresh articles"
-msgstr "Articoli nuovi"
-
-#: include/functions.php:2038 include/functions2.php:105
-msgid "All articles"
-msgstr "Tutti gli articoli"
-
-#: include/functions.php:2040
-msgid "Archived articles"
-msgstr "Articoli archiviati"
-
-#: include/functions.php:2042
-msgid "Recently read"
-msgstr "Letti di recente"
-
-#: include/functions2.php:57
+#: include/functions.php:1131
 msgid "Navigation"
 msgstr "Navigazione"
 
-#: include/functions2.php:58
+#: include/functions.php:1132
 msgid "Open next feed"
 msgstr "Apri il notiziario successivo"
 
-#: include/functions2.php:59
+#: include/functions.php:1133
 msgid "Open previous feed"
 msgstr "Apri il notiziario precedente"
 
-#: include/functions2.php:60
+#: include/functions.php:1134
 msgid "Open next article"
 msgstr "Apri il prossimo articolo"
 
-#: include/functions2.php:61
+#: include/functions.php:1135
 msgid "Open previous article"
 msgstr "Apri l'articolo precedente"
 
-#: include/functions2.php:62
+#: include/functions.php:1136
 msgid "Open next article (don't scroll long articles)"
 msgstr "Apri il prossimo articolo (non scorrere gli articoli lunghi)"
 
-#: include/functions2.php:63
+#: include/functions.php:1137
 msgid "Open previous article (don't scroll long articles)"
 msgstr "Apri l'articolo precedente (non scorrere gli articoli lunghi)"
 
-#: include/functions2.php:64
+#: include/functions.php:1138
 msgid "Move to next article (don't expand or mark read)"
 msgstr "Passa al prossimo articolo (senza espandere o segnare come letto)"
 
-#: include/functions2.php:65
+#: include/functions.php:1139
 msgid "Move to previous article (don't expand or mark read)"
 msgstr "Passa all'articolo precedente (senza espandere o segnare come letto)"
 
-#: include/functions2.php:66
+#: include/functions.php:1140
 msgid "Show search dialog"
 msgstr "Mostra il campo di ricerca"
 
-#: include/functions2.php:67
+#: include/functions.php:1141
 msgid "Article"
 msgstr "Articolo"
 
-#: include/functions2.php:68 js/viewfeed.js:1699
+#: include/functions.php:1142
+#: js/viewfeed.js:1701
 msgid "Toggle starred"
 msgstr "Inverti articoli con stella"
 
-#: include/functions2.php:69 js/viewfeed.js:1711
+#: include/functions.php:1143
+#: js/viewfeed.js:1713
 msgid "Toggle published"
 msgstr "Inverti articoli pubblicati"
 
-#: include/functions2.php:70 js/viewfeed.js:1686
+#: include/functions.php:1144
+#: js/viewfeed.js:1688
 msgid "Toggle unread"
 msgstr "Inverti articoli non letti"
 
-#: include/functions2.php:71
+#: include/functions.php:1145
 msgid "Edit tags"
 msgstr "Modifica etichette"
 
-#: include/functions2.php:72
+#: include/functions.php:1146
 msgid "Open in new window"
 msgstr "Apri in una nuova finestra"
 
-#: include/functions2.php:73 js/viewfeed.js:1732
+#: include/functions.php:1147
+#: js/viewfeed.js:1734
 msgid "Mark below as read"
 msgstr "Segna gli articoli sotto come letti"
 
-#: include/functions2.php:74 js/viewfeed.js:1725
+#: include/functions.php:1148
+#: js/viewfeed.js:1727
 msgid "Mark above as read"
 msgstr "Segna gli articoli sopra come letti"
 
-#: include/functions2.php:75
+#: include/functions.php:1149
 msgid "Scroll down"
 msgstr "Scorri giù"
 
-#: include/functions2.php:76
+#: include/functions.php:1150
 msgid "Scroll up"
 msgstr "Scorri sù"
 
-#: include/functions2.php:77
+#: include/functions.php:1151
 msgid "Select article under cursor"
 msgstr "Seleziona l'articolo sotto il cursore del mouse"
 
-#: include/functions2.php:78
+#: include/functions.php:1152
 msgid "Email article"
 msgstr "Invia articolo per email"
 
-#: include/functions2.php:79
+#: include/functions.php:1153
 msgid "Close/collapse article"
 msgstr "Chiudi / collassa articolo"
 
-#: include/functions2.php:80
+#: include/functions.php:1154
 msgid "Toggle article expansion (combined mode)"
 msgstr "Attiva/disattiva l'espansione degli articoli (modalità combinata)"
 
-#: include/functions2.php:82 plugins/embed_original/init.php:31
+#: include/functions.php:1156
+#: plugins/embed_original/init.php:31
 msgid "Toggle embed original"
 msgstr "Attiva/disattiva gli originali"
 
-#: include/functions2.php:83
+#: include/functions.php:1157
 msgid "Article selection"
 msgstr "Seleziona articolo"
 
-#: include/functions2.php:84
+#: include/functions.php:1158
 msgid "Select all articles"
 msgstr "Seleziona tutti gli articoli"
 
-#: include/functions2.php:85
+#: include/functions.php:1159
 msgid "Select unread"
 msgstr "Seleziona articoli non letti"
 
-#: include/functions2.php:86
+#: include/functions.php:1160
 msgid "Select starred"
 msgstr "Seleziona articoli con stella"
 
-#: include/functions2.php:87
+#: include/functions.php:1161
 msgid "Select published"
 msgstr "Seleziona articoli pubblicati"
 
-#: include/functions2.php:88
+#: include/functions.php:1162
 msgid "Invert selection"
 msgstr "Inverti la selezione"
 
-#: include/functions2.php:89
+#: include/functions.php:1163
 msgid "Deselect everything"
 msgstr "Deseleziona tutto"
 
-#: include/functions2.php:90 classes/pref/feeds.php:555
-#: classes/pref/feeds.php:823
+#: include/functions.php:1164
+#: classes/pref/feeds.php:555
+#: classes/pref/feeds.php:811
 msgid "Feed"
 msgstr "Notiziario"
 
-#: include/functions2.php:91
+#: include/functions.php:1165
 msgid "Refresh current feed"
 msgstr "Aggiorna notiziario attivo"
 
-#: include/functions2.php:92
+#: include/functions.php:1166
 msgid "Un/hide read feeds"
 msgstr "Visualizza/Nascondi notiziari letti"
 
-#: include/functions2.php:93 classes/pref/feeds.php:1349
+#: include/functions.php:1167
+#: classes/pref/feeds.php:1323
 msgid "Subscribe to feed"
 msgstr "Sottoscrivi il notiziario"
 
-#: include/functions2.php:94 js/FeedTree.js:145 js/PrefFeedTree.js:72
-#: js/viewfeed.js:1853
+#: include/functions.php:1168
+#: js/FeedTree.js:145
+#: js/PrefFeedTree.js:74
+#: js/viewfeed.js:1855
 msgid "Edit feed"
 msgstr "Modifica notiziario"
 
-#: include/functions2.php:96
+#: include/functions.php:1170
 msgid "Reverse headlines"
 msgstr "Invertire l'ordine dei sommari"
 
-#: include/functions2.php:97
+#: include/functions.php:1171
 msgid "Toggle headline grouping"
 msgstr "Attiva/disattiva il raggruppamento dei titoli"
 
-#: include/functions2.php:98
+#: include/functions.php:1172
 msgid "Debug feed update"
 msgstr "Debug aggiornamenti dei feed"
 
-#: include/functions2.php:99
+#: include/functions.php:1173
 msgid "Debug viewfeed()"
 msgstr "Debug vista del feed (viewfeed())"
 
-#: include/functions2.php:100 js/FeedTree.js:194
+#: include/functions.php:1174
+#: js/FeedTree.js:194
 msgid "Mark all feeds as read"
 msgstr "Segna tutti i notiziari come letti"
 
-#: include/functions2.php:101
+#: include/functions.php:1175
 msgid "Un/collapse current category"
 msgstr "Contrai la categoria corrente"
 
-#: include/functions2.php:102
+#: include/functions.php:1176
 msgid "Toggle combined mode"
 msgstr "Attiva/disattiva modalità combinata"
 
-#: include/functions2.php:103
+#: include/functions.php:1177
 msgid "Toggle auto expand in combined mode"
 msgstr "Attiva/disattiva espansione automatica in modalità combinata"
 
-#: include/functions2.php:104
+#: include/functions.php:1178
 msgid "Go to"
 msgstr "Vai a"
 
-#: include/functions2.php:106
+#: include/functions.php:1179
+#: classes/feeds.php:1602
+msgid "All articles"
+msgstr "Tutti gli articoli"
+
+#: include/functions.php:1180
 msgid "Fresh"
 msgstr "Recenti"
 
-#: include/functions2.php:109 js/tt-rss.js:494 js/tt-rss.js:663
+#: include/functions.php:1183
+#: js/tt-rss.js:495
+#: js/tt-rss.js:664
 msgid "Tag cloud"
 msgstr "Nuvola etichette"
 
-#: include/functions2.php:111
+#: include/functions.php:1185
 msgid "Other"
 msgstr "Altri"
 
-#: include/functions2.php:112 classes/pref/labels.php:267
+#: include/functions.php:1186
+#: classes/pref/labels.php:267
 msgid "Create label"
 msgstr "Crea etichetta"
 
-#: include/functions2.php:113 classes/pref/filters.php:753
+#: include/functions.php:1187
+#: classes/pref/filters.php:793
 msgid "Create filter"
 msgstr "Crea filtro"
 
-#: include/functions2.php:114
+#: include/functions.php:1188
 msgid "Un/collapse sidebar"
 msgstr "Espandi/Riduci la barra laterale"
 
-#: include/functions2.php:115
+#: include/functions.php:1189
 msgid "Show help dialog"
 msgstr "Mostra la sezione di aiuto"
 
-#: include/functions2.php:670
-#, php-format
-msgid "Search results: %s"
-msgstr "Risultati di ricerca: %s"
-
-#: include/functions2.php:1336 classes/feeds.php:752
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] "commento"
-msgstr[1] "commenti"
-
-#: include/functions2.php:1340 classes/feeds.php:756
-msgid "comments"
-msgstr "commenti"
-
-#: include/functions2.php:1366
-msgid " - "
-msgstr " - "
-
-#: include/functions2.php:1397 include/functions2.php:1648
-#: classes/article.php:311
-msgid "no tags"
-msgstr "nessuna etichetta"
-
-#: include/functions2.php:1407 classes/feeds.php:738
-msgid "Edit tags for this article"
-msgstr "Modifica le etichette per questo articolo"
-
-#: include/functions2.php:1439 classes/feeds.php:690
-msgid "Originally from:"
-msgstr "Originariamente da:"
-
-#: include/functions2.php:1452 classes/pref/feeds.php:574 classes/feeds.php:703
-msgid "Feed URL"
-msgstr "URL del notiziario"
-
-#: include/functions2.php:1489 classes/backend.php:105 classes/dlg.php:37
-#: classes/dlg.php:60 classes/dlg.php:93 classes/dlg.php:159
-#: classes/dlg.php:186 classes/pref/feeds.php:1652 classes/pref/feeds.php:1718
-#: classes/pref/filters.php:204 classes/pref/prefs.php:1097
-#: plugins/af_psql_trgm/init.php:102 plugins/import_export/init.php:415
-#: plugins/import_export/init.php:461 plugins/share/init.php:121
-msgid "Close this window"
-msgstr "Chiudi questa finestra"
-
-#: include/functions2.php:1686
-msgid "(edit note)"
-msgstr "(modifica nota)"
-
-#: include/functions2.php:1960
-msgid "unknown type"
-msgstr "tipo sconosciuto"
-
-#: include/functions2.php:2037
-msgid "Attachments"
-msgstr "Allegati"
-
-#: include/functions2.php:2496
+#: include/functions.php:2456
 msgid "There is no error, the file uploaded with success"
 msgstr "Nessun errore, file caricato correttamente"
 
-#: include/functions2.php:2497
+#: include/functions.php:2457
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Il file selezionato per il caricamento supera la dimensione limite definita da upload_max_filesize in php.ini"
 
-#: include/functions2.php:2498
+#: include/functions.php:2458
 msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
 msgstr "Il file selezionato per il caricamento supera la dimensione limite definita da MAX_FILE_SIZE nel form HTML"
 
-#: include/functions2.php:2499
+#: include/functions.php:2459
 msgid "The uploaded file was only partially uploaded"
 msgstr "Il file selezionato per il caricamento è stato trasferito solo parzialmente"
 
-#: include/functions2.php:2500
+#: include/functions.php:2460
 msgid "No file was uploaded"
 msgstr "Nessun file caricato"
 
-#: include/functions2.php:2501
+#: include/functions.php:2461
 msgid "Missing a temporary folder"
 msgstr "Cartella temporanea mancante"
 
-#: include/functions2.php:2502
+#: include/functions.php:2462
 msgid "Failed to write file to disk."
 msgstr "Scrittura su disko fallita."
 
-#: include/functions2.php:2503
+#: include/functions.php:2463
 msgid "A PHP extension stopped the file upload."
 msgstr "Una estensione di PHP ha bloccato il caricamento del file."
 
-#: include/login_form.php:197 classes/handler/public.php:569
-#: classes/handler/public.php:824
+#: include/login_form.php:197
+#: classes/handler/public.php:480
+#: classes/handler/public.php:735
 msgid "Login:"
 msgstr "Nome utente:"
 
-#: include/login_form.php:207 classes/handler/public.php:572
+#: include/login_form.php:207
+#: classes/handler/public.php:483
 msgid "Password:"
 msgstr "Password:"
 
@@ -782,8 +786,10 @@ msgstr "Ho dimenticato la mia password"
 msgid "Profile:"
 msgstr "Profilo:"
 
-#: include/login_form.php:223 classes/handler/public.php:311
-#: classes/pref/prefs.php:1035 classes/rpc.php:63
+#: include/login_form.php:223
+#: classes/handler/public.php:287
+#: classes/pref/prefs.php:1035
+#: classes/rpc.php:63
 msgid "Default profile"
 msgstr "Profilo predefinito"
 
@@ -799,7 +805,8 @@ msgstr "Non mostra le immagini negli articoli, riduce i refresh automatici."
 msgid "Remember me"
 msgstr "Ricordami"
 
-#: include/login_form.php:249 classes/handler/public.php:577
+#: include/login_form.php:249
+#: classes/handler/public.php:488
 msgid "Log in"
 msgstr "Accedi"
 
@@ -815,124 +822,44 @@ msgstr "La validazione della sessione è fallita (utente non trovato)"
 msgid "Session failed to validate (password changed)"
 msgstr "La validazione della sessione è fallita (password cambiata)"
 
-#: classes/article.php:25
-msgid "Article not found."
-msgstr "Articolo non trovato."
-
-#: classes/article.php:197
-msgid "Tags for this article (separated by commas):"
-msgstr "Etichette per questo articolo (separate da virgole):"
-
-#: classes/article.php:222 classes/pref/labels.php:79 classes/pref/users.php:98
-#: classes/pref/feeds.php:801 classes/pref/feeds.php:943
-#: classes/pref/filters.php:485 classes/pref/prefs.php:981
-#: plugins/instances/init.php:245 plugins/nsfw/init.php:85
-#: plugins/note/init.php:51 plugins/af_readability/init.php:68
-#: plugins/af_redditimgur/init.php:60 plugins/af_psql_trgm/init.php:181
-#: plugins/mail/init.php:64 plugins/af_zz_imgproxy/init.php:213
-msgid "Save"
-msgstr "Salva"
-
-#: classes/article.php:224 classes/handler/public.php:546
-#: classes/handler/public.php:580 classes/pref/labels.php:81
-#: classes/pref/users.php:100 classes/pref/feeds.php:802
-#: classes/pref/feeds.php:946 classes/pref/feeds.php:1859
-#: classes/pref/filters.php:488 classes/pref/filters.php:902
-#: classes/pref/filters.php:983 classes/pref/filters.php:1076
-#: classes/pref/prefs.php:983 classes/feeds.php:1105 classes/feeds.php:1155
-#: classes/feeds.php:1192 plugins/instances/init.php:248
-#: plugins/instances/init.php:436 plugins/note/init.php:53
-#: plugins/mail/init.php:173
-msgid "Cancel"
-msgstr "Annulla"
-
-#: classes/opml.php:28 classes/opml.php:33
-msgid "OPML Utility"
-msgstr "Utility OPML"
-
-#: classes/opml.php:37
-msgid "Importing OPML..."
-msgstr "Importazione OPML..."
-
-#: classes/opml.php:41
-msgid "Return to preferences"
-msgstr "Ritorna alle preferenze"
-
-#: classes/opml.php:271
-#, php-format
-msgid "Adding feed: %s"
-msgstr "Aggiungendo notiziario: %s"
-
-#: classes/opml.php:282
-#, php-format
-msgid "Duplicate feed: %s"
-msgstr "Notiziario duplicato: %s"
-
-#: classes/opml.php:296
-#, php-format
-msgid "Adding label %s"
-msgstr "Aggiunta etichetta %s"
-
-#: classes/opml.php:299
-#, php-format
-msgid "Duplicate label: %s"
-msgstr "Etichetta duplicata: %s"
-
-#: classes/opml.php:311
-#, php-format
-msgid "Setting preference key %s to %s"
-msgstr "Impostazione della voce delle preferenze %s a %s"
-
-#: classes/opml.php:343
-msgid "Adding filter..."
-msgstr "Aggiungendo filtro..."
-
-#: classes/opml.php:421
-#, php-format
-msgid "Processing category: %s"
-msgstr "Elaborando categoria: %s"
-
-#: classes/opml.php:470
-#, php-format
-msgid "Upload failed with error code %d"
-msgstr "Caricamento fallito con codice errore %d"
-
-#: classes/opml.php:484 plugins/import_export/init.php:442
-msgid "Unable to move uploaded file."
-msgstr "Non è possibile spostare il file caricato."
-
-#: classes/opml.php:488 plugins/import_export/init.php:446
-msgid "Error: please upload OPML file."
-msgstr "Errore: caricare il file OPML."
-
-#: classes/opml.php:499
-msgid "Error: unable to find moved OPML file."
-msgstr "Errore: non trovato il file OPML spostato."
-
-#: classes/opml.php:506
-msgid "Error while parsing document."
-msgstr "Errore durante l'analisi del documento."
-
-#: classes/backend.php:33
+#: classes/backend.php:31
 msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
 msgstr "Nel wiki di Tiny Tiny RSS sono disponibili altri suggerimenti per l'interfaccia."
 
-#: classes/backend.php:38
+#: classes/backend.php:36
 msgid "Keyboard Shortcuts"
 msgstr "Scorciatoie da tastiera"
 
-#: classes/backend.php:61
+#: classes/backend.php:59
 msgid "Shift"
 msgstr "Shift"
 
-#: classes/backend.php:64
+#: classes/backend.php:62
 msgid "Ctrl"
 msgstr "Ctrl"
 
-#: classes/backend.php:99
+#: classes/backend.php:97
 msgid "Help topic not found."
 msgstr "Argomento dell'aiuto non trovato."
 
+#: classes/backend.php:103
+#: classes/dlg.php:37
+#: classes/dlg.php:60
+#: classes/dlg.php:93
+#: classes/dlg.php:159
+#: classes/dlg.php:186
+#: classes/article.php:744
+#: classes/pref/filters.php:206
+#: classes/pref/prefs.php:1097
+#: classes/pref/feeds.php:1626
+#: classes/pref/feeds.php:1692
+#: plugins/import_export/init.php:421
+#: plugins/import_export/init.php:467
+#: plugins/af_psql_trgm/init.php:102
+#: plugins/share/init.php:120
+msgid "Close this window"
+msgstr "Chiudi questa finestra"
+
 #: classes/dlg.php:17
 msgid "If you have imported labels and/or filters, you might need to reload preferences to see your new data."
 msgstr "Se sono stati importati etichette e/o filtri, ricaricare le preferenze per visualizzare i nuovi dati."
@@ -941,7 +868,9 @@ msgstr "Se sono stati importati etichette e/o filtri, ricaricare le preferenze p
 msgid "Your Public OPML URL is:"
 msgstr "L'URL OPML pubblico è:"
 
-#: classes/dlg.php:57 classes/dlg.php:183 plugins/share/init.php:118
+#: classes/dlg.php:57
+#: classes/dlg.php:183
+#: plugins/share/init.php:117
 msgid "Generate new URL"
 msgstr "Genera nuovo URL"
 
@@ -949,7 +878,8 @@ msgstr "Genera nuovo URL"
 msgid "Update daemon is enabled in configuration, but daemon process is not running, which prevents all feeds from updating. Please start the daemon process or contact instance owner."
 msgstr "Il demone per l'aggiornamento è attivato nella configurazione, ma il processo del demone non è in esecuzione; questo impedisce l'aggiornamento di tutti i notiziari. Avviare il processo del demone o contattare il proprietario dell'istanza."
 
-#: classes/dlg.php:75 classes/dlg.php:84
+#: classes/dlg.php:75
+#: classes/dlg.php:84
 msgid "Last update:"
 msgstr "Ultimo aggiornamento:"
 
@@ -961,122 +891,222 @@ msgstr "Il demone di aggiornamento sta impiegando troppo tempo a eseguire l'aggi
 msgid "You can view this feed as RSS using the following URL:"
 msgstr "È possibile vedere questo notiziario come RSS usando il seguente URL:"
 
-#: classes/handler/public.php:510 plugins/bookmarklets/init.php:40
+#: classes/article.php:25
+msgid "Article not found."
+msgstr "Articolo non trovato."
+
+#: classes/article.php:197
+msgid "Tags for this article (separated by commas):"
+msgstr "Etichette per questo articolo (separate da virgole):"
+
+#: classes/article.php:222
+#: classes/pref/labels.php:79
+#: classes/pref/filters.php:519
+#: classes/pref/users.php:98
+#: classes/pref/prefs.php:981
+#: classes/pref/feeds.php:789
+#: classes/pref/feeds.php:931
+#: plugins/af_psql_trgm/init.php:181
+#: plugins/nsfw/init.php:85
+#: plugins/af_readability/init.php:68
+#: plugins/mail/init.php:64
+#: plugins/af_redditimgur/init.php:60
+#: plugins/note/init.php:51
+#: plugins/af_zz_imgproxy/init.php:240
+msgid "Save"
+msgstr "Salva"
+
+#: classes/article.php:224
+#: classes/handler/public.php:457
+#: classes/handler/public.php:491
+#: classes/pref/labels.php:81
+#: classes/pref/filters.php:522
+#: classes/pref/filters.php:942
+#: classes/pref/filters.php:1022
+#: classes/pref/filters.php:1115
+#: classes/pref/users.php:100
+#: classes/pref/prefs.php:983
+#: classes/pref/feeds.php:790
+#: classes/pref/feeds.php:934
+#: classes/pref/feeds.php:1833
+#: classes/feeds.php:1098
+#: classes/feeds.php:1148
+#: classes/feeds.php:1185
+#: plugins/mail/init.php:173
+#: plugins/note/init.php:53
+msgid "Cancel"
+msgstr "Annulla"
+
+#: classes/article.php:311
+#: classes/article.php:652
+#: classes/article.php:805
+msgid "no tags"
+msgstr "nessuna etichetta"
+
+#: classes/article.php:419
+msgid "unknown type"
+msgstr "tipo sconosciuto"
+
+#: classes/article.php:496
+msgid "Attachments"
+msgstr "Allegati"
+
+#: classes/article.php:591
+#: classes/feeds.php:741
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] "commento"
+msgstr[1] "commenti"
+
+#: classes/article.php:595
+#: classes/feeds.php:745
+msgid "comments"
+msgstr "commenti"
+
+#: classes/article.php:621
+msgid " - "
+msgstr " - "
+
+#: classes/article.php:662
+#: classes/feeds.php:727
+msgid "Edit tags for this article"
+msgstr "Modifica le etichette per questo articolo"
+
+#: classes/article.php:694
+#: classes/feeds.php:681
+msgid "Originally from:"
+msgstr "Originariamente da:"
+
+#: classes/article.php:707
+#: classes/pref/feeds.php:574
+#: classes/feeds.php:694
+msgid "Feed URL"
+msgstr "URL del notiziario"
+
+#: classes/article.php:843
+msgid "(edit note)"
+msgstr "(modifica nota)"
+
+#: classes/handler/public.php:421
+#: plugins/bookmarklets/init.php:40
 msgid "Share with Tiny Tiny RSS"
 msgstr "Condividi con Tiny Tiny RSS"
 
-#: classes/handler/public.php:518
+#: classes/handler/public.php:429
 msgid "Title:"
 msgstr "Titolo:"
 
-#: classes/handler/public.php:520 classes/pref/feeds.php:572
-#: plugins/instances/init.php:212 plugins/instances/init.php:401
+#: classes/handler/public.php:431
+#: classes/pref/feeds.php:572
 msgid "URL:"
 msgstr "URL:"
 
-#: classes/handler/public.php:522
+#: classes/handler/public.php:433
 msgid "Content:"
 msgstr "Contenuto:"
 
-#: classes/handler/public.php:524
+#: classes/handler/public.php:435
 msgid "Labels:"
 msgstr "Etichette:"
 
-#: classes/handler/public.php:543
+#: classes/handler/public.php:454
 msgid "Shared article will appear in the Published feed."
 msgstr "Gli articoli condivisi appariranno nel notiziario Pubblicati."
 
-#: classes/handler/public.php:545
+#: classes/handler/public.php:456
 msgid "Share"
 msgstr "Condividi"
 
-#: classes/handler/public.php:567
+#: classes/handler/public.php:478
 msgid "Not logged in"
 msgstr "Non connesso"
 
-#: classes/handler/public.php:626
+#: classes/handler/public.php:537
 msgid "Incorrect username or password"
 msgstr "Nome utente o password sbagliati"
 
-#: classes/handler/public.php:678
+#: classes/handler/public.php:589
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "Notiziario <b>%s</b> già sottoscritto."
 
-#: classes/handler/public.php:681
+#: classes/handler/public.php:592
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "Notiziario <b>%s</b> sottoscritto."
 
-#: classes/handler/public.php:684
+#: classes/handler/public.php:595
 #, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "Impossibile sottoscrivere <b>%s</b>."
 
-#: classes/handler/public.php:687
+#: classes/handler/public.php:598
 #, php-format
 msgid "No feeds found in <b>%s</b>."
 msgstr "Nessun notiziario trovato in <b>%s</b>."
 
-#: classes/handler/public.php:690
+#: classes/handler/public.php:601
 msgid "Multiple feed URLs found."
 msgstr "Trovati più URL di notiziari."
 
-#: classes/handler/public.php:694
+#: classes/handler/public.php:605
 #, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr "Impossibile sottoscrivere <b>%s</b>.<br>Impossibile scaricare l'URL del notiziario."
 
-#: classes/handler/public.php:712
+#: classes/handler/public.php:623
 msgid "Subscribe to selected feed"
 msgstr "Sottoscrivi il notiziario selezionato"
 
-#: classes/handler/public.php:737
+#: classes/handler/public.php:648
 msgid "Edit subscription options"
 msgstr "Modifica opzioni di sottoscrizione"
 
-#: classes/handler/public.php:774
+#: classes/handler/public.php:685
 msgid "Password recovery"
 msgstr "Recupera password"
 
-#: classes/handler/public.php:817
+#: classes/handler/public.php:728
 msgid "You will need to provide valid account name and email. A password reset link will be sent to your email address."
 msgstr "Dovrai fornire un nome utente e una email collegata validi. Verrà spedito un link per resettare la password."
 
-#: classes/handler/public.php:839 classes/pref/users.php:350
+#: classes/handler/public.php:750
+#: classes/pref/users.php:349
 msgid "Reset password"
 msgstr "Reimposta password"
 
-#: classes/handler/public.php:849
+#: classes/handler/public.php:760
 msgid "Some of the required form parameters are missing or incorrect."
 msgstr "Alcuni dei parametri richiesti sono mancanti o scorretti."
 
-#: classes/handler/public.php:853 classes/handler/public.php:919
+#: classes/handler/public.php:764
+#: classes/handler/public.php:830
 msgid "Go back"
 msgstr "Torna indietro"
 
-#: classes/handler/public.php:890
+#: classes/handler/public.php:801
 msgid "[tt-rss] Password reset request"
 msgstr "[tt-rss] Richiesta di reset password"
 
-#: classes/handler/public.php:915
+#: classes/handler/public.php:826
 msgid "Sorry, login and email combination not found."
 msgstr "Mi dispiace, nome utente e email non trovati."
 
-#: classes/handler/public.php:937
+#: classes/handler/public.php:848
 msgid "Your access level is insufficient to run this script."
 msgstr "Il livello di accesso non è sufficiente per eseguire questo script."
 
-#: classes/handler/public.php:963
+#: classes/handler/public.php:874
 msgid "Database Updater"
 msgstr "Aggiornatore database"
 
-#: classes/handler/public.php:1028
+#: classes/handler/public.php:939
 msgid "Perform updates"
 msgstr "Effettua gli aggiornamenti"
 
-#: classes/pref/labels.php:22 classes/pref/filters.php:348
-#: classes/pref/filters.php:823
+#: classes/pref/labels.php:22
+#: classes/pref/filters.php:373
+#: classes/pref/filters.php:863
 msgid "Caption"
 msgstr "Etichetta"
 
@@ -1097,39 +1127,56 @@ msgstr "Sfondo:"
 msgid "Created label <b>%s</b>"
 msgstr "Etichetta <b>%s</b> creata"
 
-#: classes/pref/labels.php:258 classes/pref/users.php:334
-#: classes/pref/feeds.php:1337 classes/pref/feeds.php:1600
-#: classes/pref/feeds.php:1664 classes/pref/filters.php:359
-#: classes/pref/filters.php:407 classes/pref/filters.php:744
-#: classes/pref/filters.php:832 classes/pref/filters.php:859
-#: classes/pref/prefs.php:992 plugins/instances/init.php:284
+#: classes/pref/labels.php:258
+#: classes/pref/filters.php:384
+#: classes/pref/filters.php:441
+#: classes/pref/filters.php:784
+#: classes/pref/filters.php:872
+#: classes/pref/filters.php:899
+#: classes/pref/users.php:333
+#: classes/pref/prefs.php:992
+#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1574
+#: classes/pref/feeds.php:1638
 msgid "Select"
 msgstr "Seleziona"
 
-#: classes/pref/labels.php:261 classes/pref/users.php:337
-#: classes/pref/feeds.php:1340 classes/pref/feeds.php:1603
-#: classes/pref/feeds.php:1667 classes/pref/filters.php:362
-#: classes/pref/filters.php:410 classes/pref/filters.php:747
-#: classes/pref/filters.php:835 classes/pref/filters.php:862
-#: classes/pref/prefs.php:995 classes/feeds.php:102
-#: plugins/instances/init.php:287
+#: classes/pref/labels.php:261
+#: classes/pref/filters.php:387
+#: classes/pref/filters.php:444
+#: classes/pref/filters.php:787
+#: classes/pref/filters.php:875
+#: classes/pref/filters.php:902
+#: classes/pref/users.php:336
+#: classes/pref/prefs.php:995
+#: classes/pref/feeds.php:1314
+#: classes/pref/feeds.php:1577
+#: classes/pref/feeds.php:1641
+#: classes/feeds.php:102
 msgid "All"
 msgstr "Tutti"
 
-#: classes/pref/labels.php:263 classes/pref/users.php:339
-#: classes/pref/feeds.php:1342 classes/pref/feeds.php:1605
-#: classes/pref/feeds.php:1669 classes/pref/filters.php:364
-#: classes/pref/filters.php:412 classes/pref/filters.php:749
-#: classes/pref/filters.php:837 classes/pref/filters.php:864
-#: classes/pref/prefs.php:997 classes/feeds.php:105
-#: plugins/instances/init.php:289
+#: classes/pref/labels.php:263
+#: classes/pref/filters.php:389
+#: classes/pref/filters.php:446
+#: classes/pref/filters.php:789
+#: classes/pref/filters.php:877
+#: classes/pref/filters.php:904
+#: classes/pref/users.php:338
+#: classes/pref/prefs.php:997
+#: classes/pref/feeds.php:1316
+#: classes/pref/feeds.php:1579
+#: classes/pref/feeds.php:1643
+#: classes/feeds.php:105
 msgid "None"
 msgstr "Nessuno"
 
-#: classes/pref/labels.php:270 classes/pref/users.php:348
-#: classes/pref/feeds.php:767 classes/pref/filters.php:478
-#: classes/pref/filters.php:766 classes/feeds.php:1154
-#: plugins/instances/init.php:294
+#: classes/pref/labels.php:270
+#: classes/pref/filters.php:512
+#: classes/pref/filters.php:806
+#: classes/pref/users.php:347
+#: classes/pref/feeds.php:767
+#: classes/feeds.php:1147
 msgid "Remove"
 msgstr "Rimuovi"
 
@@ -1137,8 +1184,167 @@ msgstr "Rimuovi"
 msgid "Clear colors"
 msgstr "Cancella colori"
 
-#: classes/pref/users.php:6 classes/pref/system.php:8
-#: plugins/instances/init.php:154
+#: classes/pref/filters.php:153
+msgid "Preview article"
+msgstr "Anteprima articolo"
+
+#: classes/pref/filters.php:264
+#: classes/pref/filters.php:558
+msgid "(inverse)"
+msgstr "(inverso)"
+
+#: classes/pref/filters.php:260
+#: classes/pref/filters.php:557
+#, php-format
+msgid "%s on %s in %s %s"
+msgstr "%s su %s in %s %s"
+
+#: classes/pref/filters.php:379
+#: classes/pref/filters.php:867
+#: classes/pref/filters.php:981
+msgid "Match"
+msgstr "Corrisponde"
+
+#: classes/pref/filters.php:393
+#: classes/pref/filters.php:450
+#: classes/pref/filters.php:881
+#: classes/pref/filters.php:908
+msgid "Add"
+msgstr "Aggiungi"
+
+#: classes/pref/filters.php:396
+#: classes/pref/filters.php:453
+#: classes/pref/filters.php:884
+#: classes/pref/filters.php:911
+#: classes/feeds.php:122
+msgid "Delete"
+msgstr "Elimina"
+
+#: classes/pref/filters.php:436
+#: classes/pref/filters.php:894
+msgid "Apply actions"
+msgstr "Applica azioni"
+
+#: classes/pref/filters.php:486
+#: classes/pref/filters.php:923
+msgid "Enabled"
+msgstr "Attivato"
+
+#: classes/pref/filters.php:495
+#: classes/pref/filters.php:926
+msgid "Match any rule"
+msgstr "Corrisponde a una qualsiasi regola"
+
+#: classes/pref/filters.php:504
+#: classes/pref/filters.php:929
+msgid "Inverse matching"
+msgstr "Corrispondenza inversa"
+
+#: classes/pref/filters.php:516
+#: classes/pref/filters.php:936
+msgid "Test"
+msgstr "Prova"
+
+#: classes/pref/filters.php:780
+#: classes/pref/users.php:323
+#: classes/pref/feeds.php:1307
+#: classes/feeds.php:1118
+#: classes/feeds.php:1184
+#: js/tt-rss.js:165
+msgid "Search"
+msgstr "Cerca"
+
+#: classes/pref/filters.php:796
+msgid "Combine"
+msgstr "Combina"
+
+#: classes/pref/filters.php:799
+#: classes/pref/users.php:345
+msgid "Edit"
+msgstr "Modifica"
+
+#: classes/pref/filters.php:802
+#: classes/pref/feeds.php:1327
+#: classes/pref/feeds.php:1341
+msgid "Reset sort order"
+msgstr "Reimposta ordinamento"
+
+#: classes/pref/filters.php:810
+#: classes/pref/feeds.php:1363
+msgid "Rescore articles"
+msgstr "Cambia punteggio degli articoli"
+
+#: classes/pref/filters.php:939
+msgid "Create"
+msgstr "Crea"
+
+#: classes/pref/filters.php:993
+msgid "Inverse regular expression matching"
+msgstr "Corrispondenza inversa delle espressioni regolari"
+
+#: classes/pref/filters.php:995
+msgid "on field"
+msgstr "al campo"
+
+#: classes/pref/filters.php:1001
+#: js/PrefFilterTree.js:64
+msgid "in"
+msgstr "in"
+
+#: classes/pref/filters.php:1014
+msgid "Wiki: Filters"
+msgstr "Wiki: Filtri"
+
+#: classes/pref/filters.php:1019
+msgid "Save rule"
+msgstr "Salva regola"
+
+#: classes/pref/filters.php:1019
+#: js/functions.js:865
+msgid "Add rule"
+msgstr "Aggiungi regola"
+
+#: classes/pref/filters.php:1042
+msgid "Perform Action"
+msgstr "Esegui azione"
+
+#: classes/pref/filters.php:1093
+msgid "No actions available"
+msgstr "Nessuna azione disponibile"
+
+#: classes/pref/filters.php:1112
+msgid "Save action"
+msgstr "Salva azione"
+
+#: classes/pref/filters.php:1112
+#: js/functions.js:887
+msgid "Add action"
+msgstr "Aggiungi azione"
+
+#: classes/pref/filters.php:1136
+msgid "[No caption]"
+msgstr "[Nessuna etichetta]"
+
+#: classes/pref/filters.php:1138
+#, php-format
+msgid "%s (%d rule)"
+msgid_plural "%s (%d rules)"
+msgstr[0] "%s (%d regola)"
+msgstr[1] "%s (%d regole)"
+
+#: classes/pref/filters.php:1153
+msgid "matches any rule"
+msgstr "Corrisponde a una qualsiasi regola"
+
+#: classes/pref/filters.php:1156
+#, php-format
+msgid "%s (+%d action)"
+msgid_plural "%s (+%d actions)"
+msgstr[0] "%s (+%d azione)"
+msgstr[1] "%s (+%d azioni)"
+
+#: classes/pref/users.php:6
+#: classes/pref/system.php:8
 msgid "Your access level is insufficient to open this tab."
 msgstr "Il livello di accesso non è sufficiente per aprire questa scheda."
 
@@ -1146,8 +1352,10 @@ msgstr "Il livello di accesso non è sufficiente per aprire questa scheda."
 msgid "Edit user"
 msgstr "Modifica utente"
 
-#: classes/pref/users.php:56 classes/pref/feeds.php:637
-#: classes/pref/feeds.php:878 classes/feeds.php:1075
+#: classes/pref/users.php:56
+#: classes/pref/feeds.php:637
+#: classes/pref/feeds.php:866
+#: classes/feeds.php:1068
 msgid "Authentication"
 msgstr "Autenticazione"
 
@@ -1155,12 +1363,14 @@ msgstr "Autenticazione"
 msgid "Access level: "
 msgstr "Livello di accesso: "
 
-#: classes/pref/users.php:77 classes/pref/feeds.php:667
-#: classes/pref/feeds.php:896
+#: classes/pref/users.php:77
+#: classes/pref/feeds.php:667
+#: classes/pref/feeds.php:884
 msgid "Options"
 msgstr "Opzioni"
 
-#: classes/pref/users.php:91 js/prefs.js:538
+#: classes/pref/users.php:91
+#: js/prefs.js:538
 msgid "User details"
 msgstr "Dettagli utente"
 
@@ -1168,7 +1378,8 @@ msgstr "Dettagli utente"
 msgid "User not found"
 msgstr "Utente non trovato"
 
-#: classes/pref/users.php:132 classes/pref/users.php:400
+#: classes/pref/users.php:132
+#: classes/pref/users.php:399
 msgid "Registered"
 msgstr "Registrato"
 
@@ -1184,7 +1395,8 @@ msgstr "Numero notiziari sottoscritti"
 msgid "Stored articles"
 msgstr "Articoli memorizzati"
 
-#: classes/pref/users.php:145 classes/pref/users.php:399
+#: classes/pref/users.php:145
+#: classes/pref/users.php:398
 msgid "Subscribed feeds"
 msgstr "Notiziari sottoscritti"
 
@@ -1203,453 +1415,57 @@ msgstr "Impossibile creare l'utente <b>%s<b>"
 msgid "User <b>%s</b> already exists."
 msgstr "L'utente <b>%s</b> esiste già."
 
-#: classes/pref/users.php:265
+#: classes/pref/users.php:264
 #, php-format
 msgid "Changed password of user <b>%s</b> to <b>%s</b>"
 msgstr "Modificata password dell'utente <b>%s</b> a <b>%s</b>"
 
-#: classes/pref/users.php:267
+#: classes/pref/users.php:266
 #, php-format
 msgid "Sending new password of user <b>%s</b> to <b>%s</b>"
 msgstr "Inviata nuova password dell'utente <b>%s</b> a <b>%s</b> "
 
-#: classes/pref/users.php:291
+#: classes/pref/users.php:290
 msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] Notifica di cambio password"
 
-#: classes/pref/users.php:324 classes/pref/feeds.php:1333
-#: classes/pref/filters.php:740 classes/feeds.php:1125 classes/feeds.php:1191
-#: js/tt-rss.js:165
-msgid "Search"
-msgstr "Cerca"
-
-#: classes/pref/users.php:342
+#: classes/pref/users.php:341
 msgid "Create user"
 msgstr "Crea utente"
 
-#: classes/pref/users.php:346 classes/pref/filters.php:759
-#: plugins/instances/init.php:293
-msgid "Edit"
-msgstr "Modifica"
-
-#: classes/pref/users.php:397 classes/pref/feeds.php:643
-#: classes/pref/feeds.php:882 classes/pref/feeds.php:1836
-#: classes/feeds.php:1079
+#: classes/pref/users.php:396
+#: classes/pref/feeds.php:643
+#: classes/pref/feeds.php:870
+#: classes/pref/feeds.php:1810
+#: classes/feeds.php:1072
 msgid "Login"
 msgstr "Nome utente"
 
-#: classes/pref/users.php:398
+#: classes/pref/users.php:397
 msgid "Access Level"
 msgstr "Livello di accesso"
 
-#: classes/pref/users.php:401
+#: classes/pref/users.php:400
 msgid "Last login"
 msgstr "Ultimo accesso"
 
-#: classes/pref/users.php:420 plugins/instances/init.php:334
+#: classes/pref/users.php:419
 msgid "Click to edit"
 msgstr "Fai clic per modificare"
 
-#: classes/pref/users.php:441
+#: classes/pref/users.php:440
 msgid "No users defined."
 msgstr "Nessun utente definito."
 
-#: classes/pref/users.php:443
+#: classes/pref/users.php:442
 msgid "No matching users found."
 msgstr "Nessun utente corrispondente trovato."
 
-#: classes/pref/system.php:29
-msgid "Error Log"
-msgstr "Log degli errori"
-
-#: classes/pref/system.php:40
-msgid "Refresh"
-msgstr "Aggiorna"
-
-#: classes/pref/system.php:43
-msgid "Clear log"
-msgstr "Cancella log"
-
-#: classes/pref/system.php:48
-msgid "Error"
-msgstr "Errore"
-
-#: classes/pref/system.php:49
-msgid "Filename"
-msgstr "Nome del file"
-
-#: classes/pref/system.php:50
-msgid "Message"
-msgstr "Messaggio"
-
-#: classes/pref/system.php:52
-msgid "Date"
-msgstr "Data"
-
-#: classes/pref/feeds.php:15
-msgid "Check to enable field"
-msgstr "Spuntare per attivare il campo"
-
-#: classes/pref/feeds.php:65 classes/pref/feeds.php:214
-#: classes/pref/feeds.php:258 classes/pref/feeds.php:264
-#: classes/pref/feeds.php:290
-#, php-format
-msgid "(%d feed)"
-msgid_plural "(%d feeds)"
-msgstr[0] "(%d notiziario)"
-msgstr[1] "(%d notiziari)"
-
-#: classes/pref/feeds.php:537 classes/pref/prefs.php:18
+#: classes/pref/prefs.php:18
+#: classes/pref/feeds.php:537
 msgid "General"
 msgstr "Generale"
 
-#: classes/pref/feeds.php:561
-msgid "Feed Title"
-msgstr "Titolo del notiziario"
-
-#: classes/pref/feeds.php:595 classes/pref/feeds.php:830
-#: classes/pref/feeds.php:1822 classes/feeds.php:1055
-msgid "Place in category:"
-msgstr "Mettere nella categoria:"
-
-#: classes/pref/feeds.php:608 classes/pref/feeds.php:844
-msgid "Language:"
-msgstr "Lingua:"
-
-#: classes/pref/feeds.php:615 classes/pref/feeds.php:853
-msgid "Update"
-msgstr "Aggiorna"
-
-#: classes/pref/feeds.php:630 classes/pref/feeds.php:869
-msgid "Article purging:"
-msgstr "Eliminazione articoli:"
-
-#: classes/pref/feeds.php:658 classes/pref/feeds.php:890
-#: classes/pref/feeds.php:1839 classes/pref/prefs.php:245
-#: classes/feeds.php:1083
-msgid "Password"
-msgstr "Password"
-
-#: classes/pref/feeds.php:662
-msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
-msgstr "<b>Suggerimento:</b> occorre fornire le credenziali di accesso se il proprio notiziario richiede l'autenticazione, eccetto che per i notiziari di Twitter."
-
-#: classes/pref/feeds.php:681 classes/pref/feeds.php:900
-msgid "Hide from Popular feeds"
-msgstr "Nascondere dai notiziari Popolari"
-
-#: classes/pref/feeds.php:693 classes/pref/feeds.php:906
-msgid "Include in e-mail digest"
-msgstr "Includere nell'email riassunto"
-
-#: classes/pref/feeds.php:706 classes/pref/feeds.php:912
-msgid "Always display image attachments"
-msgstr "Mostrare sempre le immagini allegate"
-
-#: classes/pref/feeds.php:719 classes/pref/feeds.php:920
-msgid "Do not embed images"
-msgstr "Non includere le immagini"
-
-#: classes/pref/feeds.php:732 classes/pref/feeds.php:928
-msgid "Cache media"
-msgstr "Fai la cache degli elementi media"
-
-#: classes/pref/feeds.php:744 classes/pref/feeds.php:934
-msgid "Mark updated articles as unread"
-msgstr "Segnare gli articoli aggiornati come non letti"
-
-#: classes/pref/feeds.php:748
-msgid "Icon"
-msgstr "Icona"
-
-#: classes/pref/feeds.php:765
-msgid "Replace"
-msgstr "Sostituisci"
-
-#: classes/pref/feeds.php:772 classes/pref/prefs.php:698
-msgid "Plugins"
-msgstr "Plugin"
-
-#: classes/pref/feeds.php:792
-msgid "Resubscribe to push updates"
-msgstr "Sottoscrivi di nuovo per inviare aggiornamenti"
-
-#: classes/pref/feeds.php:799
-msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
-msgstr "Reimposta lo stato di sottoscrizione a PubSubHubbub per i notiziari abilitati al push."
-
-#: classes/pref/feeds.php:1200 classes/pref/feeds.php:1253
-msgid "All done."
-msgstr "Tutto fatto."
-
-#: classes/pref/feeds.php:1308
-msgid "Feeds with errors"
-msgstr "Notiziari con errori"
-
-#: classes/pref/feeds.php:1315
-msgid "Inactive feeds"
-msgstr "Notiziari non attivi"
-
-#: classes/pref/feeds.php:1351
-msgid "Edit selected feeds"
-msgstr "Modifica i notiziari selezionati"
-
-#: classes/pref/feeds.php:1353 classes/pref/feeds.php:1367
-#: classes/pref/filters.php:762
-msgid "Reset sort order"
-msgstr "Reimposta ordinamento"
-
-#: classes/pref/feeds.php:1355 js/prefs.js:1622
-msgid "Batch subscribe"
-msgstr "Sottoscrivi in gruppo"
-
-#: classes/pref/feeds.php:1362
-msgid "Categories"
-msgstr "Categorie"
-
-#: classes/pref/feeds.php:1365
-msgid "Add category"
-msgstr "Aggiungi categoria"
-
-#: classes/pref/feeds.php:1369
-msgid "Remove selected"
-msgstr "Rimuovere i selezionati"
-
-#: classes/pref/feeds.php:1380
-msgid "More actions..."
-msgstr "Altre azioni..."
-
-#: classes/pref/feeds.php:1384
-msgid "Manual purge"
-msgstr "Eliminazione manuale"
-
-#: classes/pref/feeds.php:1388
-msgid "Clear feed data"
-msgstr "Cancella i dati del notiziario"
-
-#: classes/pref/feeds.php:1389 classes/pref/filters.php:770
-msgid "Rescore articles"
-msgstr "Cambia punteggio degli articoli"
-
-#: classes/pref/feeds.php:1442
-msgid "OPML"
-msgstr "OPML"
-
-#: classes/pref/feeds.php:1444
-msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
-msgstr "Usando OML puoi esportare e importare i tuoi notiziari, i filtri, le etichette e le impostazioni di Tiny Tiny RSS."
-
-#: classes/pref/feeds.php:1445
-msgid "Only main settings profile can be migrated using OPML."
-msgstr "Puoi migrare con OPML solamente il profilo principale e le sue impostazioni."
-
-#: classes/pref/feeds.php:1458
-msgid "Import my OPML"
-msgstr "Importa il mio OPML"
-
-#: classes/pref/feeds.php:1464
-msgid "Filename:"
-msgstr "Nome del file:"
-
-#: classes/pref/feeds.php:1466
-msgid "Include settings"
-msgstr "Includi le impostazioni"
-
-#: classes/pref/feeds.php:1470
-msgid "Export OPML"
-msgstr "Esporta OPML"
-
-#: classes/pref/feeds.php:1474
-msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
-msgstr "Il tuo OPML può essere reso pubblico e può essere sottoscritto da chiunque conosca l'URL seguente."
-
-#: classes/pref/feeds.php:1478
-msgid "Public OPML URL"
-msgstr "URL OPML pubblico"
-
-#: classes/pref/feeds.php:1479
-msgid "Display published OPML URL"
-msgstr "Mostra URL pubblico dell'OPML"
-
-#: classes/pref/feeds.php:1488
-msgid "Firefox integration"
-msgstr "Integrazione con Firefox"
-
-#: classes/pref/feeds.php:1490
-msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
-msgstr "Questa istanza di Tiny Tiny RSS può essere impostata come lettore di notiziari in Firefox facendo clic sul collegamento qui sotto."
-
-#: classes/pref/feeds.php:1497
-msgid "Click here to register this site as a feed reader."
-msgstr "Clicca qui per registrare questo sito come lettore di notiziari."
-
-#: classes/pref/feeds.php:1505
-msgid "Published & shared articles / Generated feeds"
-msgstr "Articoli pubblicati e condivisi / Notiziari generati"
-
-#: classes/pref/feeds.php:1507
-msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
-msgstr " Gli articoli pubblicati vengono esportati come un notiziario RSS pubblico e possono essere sottoscritti da chiunque conosca l'URL specificato qui sotto."
-
-#: classes/pref/feeds.php:1514 classes/feeds.php:54 classes/feeds.php:140
-msgid "View as RSS"
-msgstr "Visualizza come RSS"
-
-#: classes/pref/feeds.php:1515
-msgid "Display URL"
-msgstr "Visualizza URL"
-
-#: classes/pref/feeds.php:1518
-msgid "Clear all generated URLs"
-msgstr "Cancella tutti gli URL generati"
-
-#: classes/pref/feeds.php:1596
-msgid "These feeds have not been updated with new content for 3 months (oldest first):"
-msgstr "Questi notiziari non sono stati aggiornati con nuovi contenuti da 3 mesi (prima i più vecchi):"
-
-#: classes/pref/feeds.php:1630 classes/pref/feeds.php:1694
-msgid "Click to edit feed"
-msgstr "Fare clic per modificare il notiziario"
-
-#: classes/pref/feeds.php:1648 classes/pref/feeds.php:1714
-msgid "Unsubscribe from selected feeds"
-msgstr "Annulla la sottoscrizione ai notiziari selezionati"
-
-#: classes/pref/feeds.php:1819
-msgid "Add one valid RSS feed per line (no feed detection is done)"
-msgstr "Inserisci un indirizzo valido di notiziario per riga (non viene fatta una ricerca automatica)"
-
-#: classes/pref/feeds.php:1828
-msgid "Feeds to subscribe, One per line"
-msgstr "Notiziari da sottoscrivere, uno per linea"
-
-#: classes/pref/feeds.php:1851
-msgid "Feeds require authentication."
-msgstr "I notiziari richiedono autenticazione."
-
-#: classes/pref/feeds.php:1858 classes/feeds.php:1099 classes/feeds.php:1153
-msgid "Subscribe"
-msgstr "Sottoscrivi"
-
-#: classes/pref/filters.php:151
-msgid "Preview article"
-msgstr "Anteprima articolo"
-
-#: classes/pref/filters.php:239 classes/pref/filters.php:518
-msgid "(inverse)"
-msgstr "(inverso)"
-
-#: classes/pref/filters.php:235 classes/pref/filters.php:517
-#, php-format
-msgid "%s on %s in %s %s"
-msgstr "%s su %s in %s %s"
-
-#: classes/pref/filters.php:354 classes/pref/filters.php:827
-#: classes/pref/filters.php:942
-msgid "Match"
-msgstr "Corrisponde"
-
-#: classes/pref/filters.php:368 classes/pref/filters.php:416
-#: classes/pref/filters.php:841 classes/pref/filters.php:868
-msgid "Add"
-msgstr "Aggiungi"
-
-#: classes/pref/filters.php:371 classes/pref/filters.php:419
-#: classes/pref/filters.php:844 classes/pref/filters.php:871
-#: classes/feeds.php:122
-msgid "Delete"
-msgstr "Elimina"
-
-#: classes/pref/filters.php:402 classes/pref/filters.php:854
-msgid "Apply actions"
-msgstr "Applica azioni"
-
-#: classes/pref/filters.php:452 classes/pref/filters.php:883
-msgid "Enabled"
-msgstr "Attivato"
-
-#: classes/pref/filters.php:461 classes/pref/filters.php:886
-msgid "Match any rule"
-msgstr "Corrisponde a una qualsiasi regola"
-
-#: classes/pref/filters.php:470 classes/pref/filters.php:889
-msgid "Inverse matching"
-msgstr "Corrispondenza inversa"
-
-#: classes/pref/filters.php:482 classes/pref/filters.php:896
-msgid "Test"
-msgstr "Prova"
-
-#: classes/pref/filters.php:756
-msgid "Combine"
-msgstr "Combina"
-
-#: classes/pref/filters.php:899
-msgid "Create"
-msgstr "Crea"
-
-#: classes/pref/filters.php:954
-msgid "Inverse regular expression matching"
-msgstr "Corrispondenza inversa delle espressioni regolari"
-
-#: classes/pref/filters.php:956
-msgid "on field"
-msgstr "al campo"
-
-#: classes/pref/filters.php:962 js/PrefFilterTree.js:64
-msgid "in"
-msgstr "in"
-
-#: classes/pref/filters.php:975
-msgid "Wiki: Filters"
-msgstr "Wiki: Filtri"
-
-#: classes/pref/filters.php:980
-msgid "Save rule"
-msgstr "Salva regola"
-
-#: classes/pref/filters.php:980 js/functions.js:865
-msgid "Add rule"
-msgstr "Aggiungi regola"
-
-#: classes/pref/filters.php:1003
-msgid "Perform Action"
-msgstr "Esegui azione"
-
-#: classes/pref/filters.php:1054
-msgid "No actions available"
-msgstr "Nessuna azione disponibile"
-
-#: classes/pref/filters.php:1073
-msgid "Save action"
-msgstr "Salva azione"
-
-#: classes/pref/filters.php:1073 js/functions.js:887
-msgid "Add action"
-msgstr "Aggiungi azione"
-
-#: classes/pref/filters.php:1097
-msgid "[No caption]"
-msgstr "[Nessuna etichetta]"
-
-#: classes/pref/filters.php:1099
-#, php-format
-msgid "%s (%d rule)"
-msgid_plural "%s (%d rules)"
-msgstr[0] "%s (%d regola)"
-msgstr[1] "%s (%d regole)"
-
-#: classes/pref/filters.php:1114
-msgid "matches any rule"
-msgstr "Corrisponde a una qualsiasi regola"
-
-#: classes/pref/filters.php:1117
-#, php-format
-msgid "%s (+%d action)"
-msgid_plural "%s (+%d actions)"
-msgstr[0] "%s (+%d azione)"
-msgstr[1] "%s (+%d azioni)"
-
 #: classes/pref/prefs.php:19
 msgid "Interface"
 msgstr "Interfaccia"
@@ -1822,7 +1638,8 @@ msgstr "Togliere le etichette non sicure dagli articoli"
 msgid "Strip all but most common HTML tags when reading articles."
 msgstr "Toglie le tag HTML meno comuni durante la lettura degli articoli."
 
-#: classes/pref/prefs.php:53 js/prefs.js:1584
+#: classes/pref/prefs.php:53
+#: js/prefs.js:1580
 msgid "Customize stylesheet"
 msgstr "Personalizza il foglio di stile"
 
@@ -1890,6 +1707,14 @@ msgstr "Livello di accesso"
 msgid "Save data"
 msgstr "Salva dati"
 
+#: classes/pref/prefs.php:245
+#: classes/pref/feeds.php:658
+#: classes/pref/feeds.php:878
+#: classes/pref/feeds.php:1813
+#: classes/feeds.php:1076
+msgid "Password"
+msgstr "Password"
+
 #: classes/pref/prefs.php:254
 msgid "Your password is at default value, please change it."
 msgstr "La password è impostata al valore predefinito, cambiala, per favore."
@@ -1922,7 +1747,8 @@ msgstr "Password usa e getta(OTP) / Autenticatore"
 msgid "One time passwords are currently enabled. Enter your current password below to disable."
 msgstr "Le password usa e getta (OTP) sono attualmente attive. Inserisci la password attuale per disattivarle."
 
-#: classes/pref/prefs.php:347 classes/pref/prefs.php:398
+#: classes/pref/prefs.php:347
+#: classes/pref/prefs.php:398
 msgid "Enter your password"
 msgstr "Inserire la password"
 
@@ -1987,39 +1813,50 @@ msgstr "Gestisci profili"
 msgid "Reset to defaults"
 msgstr "Reimposta ai valori predefiniti"
 
+#: classes/pref/prefs.php:698
+#: classes/pref/feeds.php:772
+msgid "Plugins"
+msgstr "Plugin"
+
 #: classes/pref/prefs.php:700
 msgid "You will need to reload Tiny Tiny RSS for plugin changes to take effect."
 msgstr "Ricaricare Tiny Tiny Rss per attivare le modifiche ai plugin."
 
-#: classes/pref/prefs.php:702
-msgid "Download more plugins at tt-rss.org <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forums</a> or <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a>."
-msgstr "Scarica altri plugin dai <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forum</a> o dalla <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a> di tt-rss.org."
-
-#: classes/pref/prefs.php:732
+#: classes/pref/prefs.php:730
 msgid "System plugins"
 msgstr "Plugin di sistema"
 
-#: classes/pref/prefs.php:736 classes/pref/prefs.php:792
+#: classes/pref/prefs.php:731
+msgid "System plugins are enabled in <strong>config.php</strong> for all users."
+msgstr ""
+
+#: classes/pref/prefs.php:736
+#: classes/pref/prefs.php:792
 msgid "Plugin"
 msgstr "Plugin"
 
-#: classes/pref/prefs.php:737 classes/pref/prefs.php:793
+#: classes/pref/prefs.php:737
+#: classes/pref/prefs.php:793
 msgid "Description"
 msgstr "Descrizione"
 
-#: classes/pref/prefs.php:738 classes/pref/prefs.php:794
+#: classes/pref/prefs.php:738
+#: classes/pref/prefs.php:794
 msgid "Version"
 msgstr "Versione"
 
-#: classes/pref/prefs.php:739 classes/pref/prefs.php:795
+#: classes/pref/prefs.php:739
+#: classes/pref/prefs.php:795
 msgid "Author"
 msgstr "Autore"
 
-#: classes/pref/prefs.php:770 classes/pref/prefs.php:829
+#: classes/pref/prefs.php:770
+#: classes/pref/prefs.php:829
 msgid "more info"
 msgstr "Ulteriori informazioni"
 
-#: classes/pref/prefs.php:779 classes/pref/prefs.php:838
+#: classes/pref/prefs.php:779
+#: classes/pref/prefs.php:838
 msgid "Clear data"
 msgstr "Cancella i dati"
 
@@ -2035,7 +1872,8 @@ msgstr "Attiva i plugin selezionati"
 msgid "Incorrect one time password"
 msgstr "Password usa e getta sbagliata"
 
-#: classes/pref/prefs.php:924 classes/pref/prefs.php:941
+#: classes/pref/prefs.php:924
+#: classes/pref/prefs.php:941
 msgid "Incorrect password"
 msgstr "Password sbagliata"
 
@@ -2048,7 +1886,8 @@ msgstr "Si possono cambiare i colori, i caratteri e la disposizione del tema cor
 msgid "Create profile"
 msgstr "Crea profilo"
 
-#: classes/pref/prefs.php:1029 classes/pref/prefs.php:1057
+#: classes/pref/prefs.php:1029
+#: classes/pref/prefs.php:1057
 msgid "(active)"
 msgstr "(attivo)"
 
@@ -2060,6 +1899,339 @@ msgstr "Rimuovi i profili selezionati"
 msgid "Activate profile"
 msgstr "Attiva profilo"
 
+#: classes/pref/feeds.php:15
+msgid "Check to enable field"
+msgstr "Spuntare per attivare il campo"
+
+#: classes/pref/feeds.php:65
+#: classes/pref/feeds.php:214
+#: classes/pref/feeds.php:258
+#: classes/pref/feeds.php:264
+#: classes/pref/feeds.php:290
+#, php-format
+msgid "(%d feed)"
+msgid_plural "(%d feeds)"
+msgstr[0] "(%d notiziario)"
+msgstr[1] "(%d notiziari)"
+
+#: classes/pref/feeds.php:561
+msgid "Feed Title"
+msgstr "Titolo del notiziario"
+
+#: classes/pref/feeds.php:595
+#: classes/pref/feeds.php:818
+#: classes/pref/feeds.php:1796
+#: classes/feeds.php:1048
+msgid "Place in category:"
+msgstr "Mettere nella categoria:"
+
+#: classes/pref/feeds.php:608
+#: classes/pref/feeds.php:832
+msgid "Language:"
+msgstr "Lingua:"
+
+#: classes/pref/feeds.php:615
+#: classes/pref/feeds.php:841
+msgid "Update"
+msgstr "Aggiorna"
+
+#: classes/pref/feeds.php:630
+#: classes/pref/feeds.php:857
+msgid "Article purging:"
+msgstr "Eliminazione articoli:"
+
+#: classes/pref/feeds.php:662
+msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
+msgstr "<b>Suggerimento:</b> occorre fornire le credenziali di accesso se il proprio notiziario richiede l'autenticazione, eccetto che per i notiziari di Twitter."
+
+#: classes/pref/feeds.php:681
+#: classes/pref/feeds.php:888
+msgid "Hide from Popular feeds"
+msgstr "Nascondere dai notiziari Popolari"
+
+#: classes/pref/feeds.php:693
+#: classes/pref/feeds.php:894
+msgid "Include in e-mail digest"
+msgstr "Includere nell'email riassunto"
+
+#: classes/pref/feeds.php:706
+#: classes/pref/feeds.php:900
+msgid "Always display image attachments"
+msgstr "Mostrare sempre le immagini allegate"
+
+#: classes/pref/feeds.php:719
+#: classes/pref/feeds.php:908
+msgid "Do not embed images"
+msgstr "Non includere le immagini"
+
+#: classes/pref/feeds.php:732
+#: classes/pref/feeds.php:916
+msgid "Cache media"
+msgstr "Fai la cache degli elementi media"
+
+#: classes/pref/feeds.php:744
+#: classes/pref/feeds.php:922
+msgid "Mark updated articles as unread"
+msgstr "Segnare gli articoli aggiornati come non letti"
+
+#: classes/pref/feeds.php:748
+msgid "Icon"
+msgstr "Icona"
+
+#: classes/pref/feeds.php:765
+msgid "Replace"
+msgstr "Sostituisci"
+
+#: classes/pref/feeds.php:1174
+#: classes/pref/feeds.php:1227
+msgid "All done."
+msgstr "Tutto fatto."
+
+#: classes/pref/feeds.php:1282
+msgid "Feeds with errors"
+msgstr "Notiziari con errori"
+
+#: classes/pref/feeds.php:1289
+msgid "Inactive feeds"
+msgstr "Notiziari non attivi"
+
+#: classes/pref/feeds.php:1325
+msgid "Edit selected feeds"
+msgstr "Modifica i notiziari selezionati"
+
+#: classes/pref/feeds.php:1329
+#: js/prefs.js:1618
+msgid "Batch subscribe"
+msgstr "Sottoscrivi in gruppo"
+
+#: classes/pref/feeds.php:1336
+msgid "Categories"
+msgstr "Categorie"
+
+#: classes/pref/feeds.php:1339
+msgid "Add category"
+msgstr "Aggiungi categoria"
+
+#: classes/pref/feeds.php:1343
+msgid "Remove selected"
+msgstr "Rimuovere i selezionati"
+
+#: classes/pref/feeds.php:1354
+msgid "More actions..."
+msgstr "Altre azioni..."
+
+#: classes/pref/feeds.php:1358
+msgid "Manual purge"
+msgstr "Eliminazione manuale"
+
+#: classes/pref/feeds.php:1362
+msgid "Clear feed data"
+msgstr "Cancella i dati del notiziario"
+
+#: classes/pref/feeds.php:1416
+msgid "OPML"
+msgstr "OPML"
+
+#: classes/pref/feeds.php:1418
+msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
+msgstr "Usando OML puoi esportare e importare i tuoi notiziari, i filtri, le etichette e le impostazioni di Tiny Tiny RSS."
+
+#: classes/pref/feeds.php:1419
+msgid "Only main settings profile can be migrated using OPML."
+msgstr "Puoi migrare con OPML solamente il profilo principale e le sue impostazioni."
+
+#: classes/pref/feeds.php:1432
+msgid "Import my OPML"
+msgstr "Importa il mio OPML"
+
+#: classes/pref/feeds.php:1438
+msgid "Filename:"
+msgstr "Nome del file:"
+
+#: classes/pref/feeds.php:1440
+msgid "Include settings"
+msgstr "Includi le impostazioni"
+
+#: classes/pref/feeds.php:1444
+msgid "Export OPML"
+msgstr "Esporta OPML"
+
+#: classes/pref/feeds.php:1448
+msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
+msgstr "Il tuo OPML può essere reso pubblico e può essere sottoscritto da chiunque conosca l'URL seguente."
+
+#: classes/pref/feeds.php:1452
+msgid "Public OPML URL"
+msgstr "URL OPML pubblico"
+
+#: classes/pref/feeds.php:1453
+msgid "Display published OPML URL"
+msgstr "Mostra URL pubblico dell'OPML"
+
+#: classes/pref/feeds.php:1462
+msgid "Firefox integration"
+msgstr "Integrazione con Firefox"
+
+#: classes/pref/feeds.php:1464
+msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
+msgstr "Questa istanza di Tiny Tiny RSS può essere impostata come lettore di notiziari in Firefox facendo clic sul collegamento qui sotto."
+
+#: classes/pref/feeds.php:1471
+msgid "Click here to register this site as a feed reader."
+msgstr "Clicca qui per registrare questo sito come lettore di notiziari."
+
+#: classes/pref/feeds.php:1479
+msgid "Published & shared articles / Generated feeds"
+msgstr "Articoli pubblicati e condivisi / Notiziari generati"
+
+#: classes/pref/feeds.php:1481
+msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
+msgstr " Gli articoli pubblicati vengono esportati come un notiziario RSS pubblico e possono essere sottoscritti da chiunque conosca l'URL specificato qui sotto."
+
+#: classes/pref/feeds.php:1488
+#: classes/feeds.php:54
+#: classes/feeds.php:140
+msgid "View as RSS"
+msgstr "Visualizza come RSS"
+
+#: classes/pref/feeds.php:1489
+msgid "Display URL"
+msgstr "Visualizza URL"
+
+#: classes/pref/feeds.php:1492
+msgid "Clear all generated URLs"
+msgstr "Cancella tutti gli URL generati"
+
+#: classes/pref/feeds.php:1570
+msgid "These feeds have not been updated with new content for 3 months (oldest first):"
+msgstr "Questi notiziari non sono stati aggiornati con nuovi contenuti da 3 mesi (prima i più vecchi):"
+
+#: classes/pref/feeds.php:1604
+#: classes/pref/feeds.php:1668
+msgid "Click to edit feed"
+msgstr "Fare clic per modificare il notiziario"
+
+#: classes/pref/feeds.php:1622
+#: classes/pref/feeds.php:1688
+msgid "Unsubscribe from selected feeds"
+msgstr "Annulla la sottoscrizione ai notiziari selezionati"
+
+#: classes/pref/feeds.php:1793
+msgid "Add one valid RSS feed per line (no feed detection is done)"
+msgstr "Inserisci un indirizzo valido di notiziario per riga (non viene fatta una ricerca automatica)"
+
+#: classes/pref/feeds.php:1802
+msgid "Feeds to subscribe, One per line"
+msgstr "Notiziari da sottoscrivere, uno per linea"
+
+#: classes/pref/feeds.php:1825
+msgid "Feeds require authentication."
+msgstr "I notiziari richiedono autenticazione."
+
+#: classes/pref/feeds.php:1832
+#: classes/feeds.php:1092
+#: classes/feeds.php:1146
+msgid "Subscribe"
+msgstr "Sottoscrivi"
+
+#: classes/pref/system.php:29
+msgid "Error Log"
+msgstr "Log degli errori"
+
+#: classes/pref/system.php:40
+msgid "Refresh"
+msgstr "Aggiorna"
+
+#: classes/pref/system.php:43
+msgid "Clear log"
+msgstr "Cancella log"
+
+#: classes/pref/system.php:48
+msgid "Error"
+msgstr "Errore"
+
+#: classes/pref/system.php:49
+msgid "Filename"
+msgstr "Nome del file"
+
+#: classes/pref/system.php:50
+msgid "Message"
+msgstr "Messaggio"
+
+#: classes/pref/system.php:52
+msgid "Date"
+msgstr "Data"
+
+#: classes/opml.php:28
+#: classes/opml.php:33
+msgid "OPML Utility"
+msgstr "Utility OPML"
+
+#: classes/opml.php:37
+msgid "Importing OPML..."
+msgstr "Importazione OPML..."
+
+#: classes/opml.php:41
+msgid "Return to preferences"
+msgstr "Ritorna alle preferenze"
+
+#: classes/opml.php:295
+#, php-format
+msgid "Adding feed: %s"
+msgstr "Aggiungendo notiziario: %s"
+
+#: classes/opml.php:306
+#, php-format
+msgid "Duplicate feed: %s"
+msgstr "Notiziario duplicato: %s"
+
+#: classes/opml.php:320
+#, php-format
+msgid "Adding label %s"
+msgstr "Aggiunta etichetta %s"
+
+#: classes/opml.php:323
+#, php-format
+msgid "Duplicate label: %s"
+msgstr "Etichetta duplicata: %s"
+
+#: classes/opml.php:335
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr "Impostazione della voce delle preferenze %s a %s"
+
+#: classes/opml.php:367
+msgid "Adding filter..."
+msgstr "Aggiungendo filtro..."
+
+#: classes/opml.php:486
+#, php-format
+msgid "Processing category: %s"
+msgstr "Elaborando categoria: %s"
+
+#: classes/opml.php:532
+#, php-format
+msgid "Upload failed with error code %d"
+msgstr "Caricamento fallito con codice errore %d"
+
+#: classes/opml.php:544
+#: plugins/import_export/init.php:448
+msgid "Unable to move uploaded file."
+msgstr "Non è possibile spostare il file caricato."
+
+#: classes/opml.php:548
+#: plugins/import_export/init.php:452
+msgid "Error: please upload OPML file."
+msgstr "Errore: caricare il file OPML."
+
+#: classes/opml.php:559
+msgid "Error: unable to find moved OPML file."
+msgstr "Errore: non trovato il file OPML spostato."
+
+#: classes/opml.php:566
+msgid "Error while parsing document."
+msgstr "Errore durante l'analisi del documento."
+
 #: classes/feeds.php:53
 msgid "View as RSS feed"
 msgstr "Visualizza come notiziario RSS"
@@ -2097,8 +2269,10 @@ msgstr "Archivio"
 msgid "Move back"
 msgstr "Sposta indietro"
 
-#: classes/feeds.php:127 classes/feeds.php:132 plugins/mail/init.php:75
+#: classes/feeds.php:127
+#: classes/feeds.php:132
 #: plugins/mailto/init.php:25
+#: plugins/mail/init.php:75
 msgid "Forward by email"
 msgstr "Inoltra per email"
 
@@ -2106,292 +2280,144 @@ msgstr "Inoltra per email"
 msgid "Feed:"
 msgstr "Notiziario:"
 
-#: classes/feeds.php:229 classes/feeds.php:892
+#: classes/feeds.php:228
+#: classes/feeds.php:885
 msgid "Feed not found."
 msgstr "Notiziario non trovato."
 
-#: classes/feeds.php:300
+#: classes/feeds.php:291
 msgid "Never"
 msgstr "Mai"
 
-#: classes/feeds.php:413
+#: classes/feeds.php:405
 #, php-format
 msgid "Imported at %s"
 msgstr "Importato alle %s"
 
-#: classes/feeds.php:472 classes/feeds.php:569
+#: classes/feeds.php:464
+#: classes/feeds.php:561
 msgid "mark feed as read"
 msgstr "Segna notiziario come letto"
 
-#: classes/feeds.php:630
+#: classes/feeds.php:622
 msgid "Collapse article"
 msgstr "Riduci articoli"
 
-#: classes/feeds.php:791
+#: classes/feeds.php:784
 msgid "No unread articles found to display."
 msgstr "Nessun articolo non letto trovato da visualizzare."
 
-#: classes/feeds.php:794
+#: classes/feeds.php:787
 msgid "No updated articles found to display."
 msgstr "Nessun articolo aggiornato trovato da visualizzare."
 
-#: classes/feeds.php:797
+#: classes/feeds.php:790
 msgid "No starred articles found to display."
 msgstr "Nessun articolo con stella trovato da visualizzare."
 
-#: classes/feeds.php:801
+#: classes/feeds.php:794
 msgid "No articles found to display. You can assign articles to labels manually from article header context menu (applies to all selected articles) or use a filter."
 msgstr "Nessun articolo trovato da visualizzare. Si possono assegnare manualmente gli articoli alle etichette (ha effetto su tutti gli articoli selezionati) o usare un filtro."
 
-#: classes/feeds.php:803
+#: classes/feeds.php:796
 msgid "No articles found to display."
 msgstr "Nessun articolo trovato da visualizzare."
 
-#: classes/feeds.php:818 classes/feeds.php:992
+#: classes/feeds.php:811
+#: classes/feeds.php:985
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "Ultimo aggiornamento notiziari alle %s"
 
-#: classes/feeds.php:828 classes/feeds.php:1002
+#: classes/feeds.php:821
+#: classes/feeds.php:995
 msgid "Some feeds have update errors (click for details)"
 msgstr "Qualche notiziario ha degli errori di aggiornamento (fare clic per dettagli)"
 
-#: classes/feeds.php:982
+#: classes/feeds.php:975
 msgid "No feed selected."
 msgstr "Nessun notiziario selezionato."
 
-#: classes/feeds.php:1041 classes/feeds.php:1049
+#: classes/feeds.php:1034
+#: classes/feeds.php:1042
 msgid "Feed or site URL"
 msgstr "URL del sito o del notiziario"
 
-#: classes/feeds.php:1063
+#: classes/feeds.php:1056
 msgid "Available feeds"
 msgstr "Notiziari disponibili"
 
-#: classes/feeds.php:1094
+#: classes/feeds.php:1087
 msgid "This feed requires authentication."
 msgstr "Questo notiziario richiede l'autenticazione."
 
-#: classes/feeds.php:1102
+#: classes/feeds.php:1095
 msgid "More feeds"
 msgstr "Altri notiziari"
 
-#: classes/feeds.php:1129
+#: classes/feeds.php:1122
 msgid "Popular feeds"
 msgstr "Notiziari popolari"
 
-#: classes/feeds.php:1130
+#: classes/feeds.php:1123
 msgid "Feed archive"
 msgstr "Archivio notiziari"
 
-#: classes/feeds.php:1133
+#: classes/feeds.php:1126
 msgid "limit:"
 msgstr "Limite:"
 
-#: classes/feeds.php:1165
+#: classes/feeds.php:1158
 msgid "Look for"
 msgstr "Cerca"
 
-#: classes/feeds.php:1173
+#: classes/feeds.php:1166
 #, php-format
 msgid "in %s"
 msgstr "in %s"
 
-#: classes/feeds.php:1178
+#: classes/feeds.php:1171
 msgid "Used for word stemming"
 msgstr "Usato per determinare la radice delle parole"
 
-#: classes/feeds.php:1187
+#: classes/feeds.php:1180
 msgid "Search syntax"
 msgstr "Sintassi di ricerca"
 
-#: plugins/instances/init.php:141
-msgid "Linked"
-msgstr "Collegato"
-
-#: plugins/instances/init.php:204 plugins/instances/init.php:395
-msgid "Instance"
-msgstr "Istanza"
-
-#: plugins/instances/init.php:215 plugins/instances/init.php:312
-#: plugins/instances/init.php:404
-msgid "Instance URL"
-msgstr "URL dell'istanza"
-
-#: plugins/instances/init.php:226 plugins/instances/init.php:414
-msgid "Access key:"
-msgstr "Chiave di accesso:"
-
-#: plugins/instances/init.php:229 plugins/instances/init.php:313
-#: plugins/instances/init.php:417
-msgid "Access key"
-msgstr "Chiave di accesso"
-
-#: plugins/instances/init.php:233 plugins/instances/init.php:421
-msgid "Use one access key for both linked instances."
-msgstr "Usare una sola chiave di accesso per entrambe le istanze collegate."
-
-#: plugins/instances/init.php:241 plugins/instances/init.php:429
-msgid "Generate new key"
-msgstr "Genera nuova chiave"
-
-#: plugins/instances/init.php:292
-msgid "Link instance"
-msgstr "Collega istanza"
-
-#: plugins/instances/init.php:304
-msgid "You can connect other instances of Tiny Tiny RSS to this one to share Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
-msgstr "E' possibile connettere altre istanze di Tiny Tiny RSS a questa per condividere i notiziari Popolari. Collegare questa istanza di Tiny Tiny RSS usando questo URL:"
-
-#: plugins/instances/init.php:314
-msgid "Last connected"
-msgstr "Ultima connessione"
-
-#: plugins/instances/init.php:315
-msgid "Status"
-msgstr "Stato"
-
-#: plugins/instances/init.php:316
-msgid "Stored feeds"
-msgstr "Notiziari memorizzati"
+#: classes/feeds.php:1596
+msgid "Starred articles"
+msgstr "Articoli con stella"
 
-#: plugins/instances/init.php:433
-msgid "Create link"
-msgstr "Crea collegamento"
+#: classes/feeds.php:1598
+msgid "Published articles"
+msgstr "Articoli pubblicati"
 
-#: plugins/nsfw/init.php:30 plugins/nsfw/init.php:42
-msgid "Not work safe (click to toggle)"
-msgstr "Non sicuro per luoghi di lavoro (clicca per attivare)"
+#: classes/feeds.php:1600
+msgid "Fresh articles"
+msgstr "Articoli nuovi"
 
-#: plugins/nsfw/init.php:52
-msgid "NSFW Plugin"
-msgstr "Plugin NSFW"
+#: classes/feeds.php:1604
+msgid "Archived articles"
+msgstr "Articoli archiviati"
 
-#: plugins/nsfw/init.php:79
-msgid "Tags to consider NSFW (comma-separated)"
-msgstr "Tag da considerare NSFW (divisi da virgole)"
+#: classes/feeds.php:1606
+msgid "Recently read"
+msgstr "Letti di recente"
 
-#: plugins/nsfw/init.php:100
-msgid "Configuration saved."
-msgstr "La configurazione è stata salvata."
+#: classes/feeds.php:1716
+msgid "Special"
+msgstr "Speciale"
 
-#: plugins/note/init.php:26 plugins/note/note.js:11
-msgid "Edit article note"
-msgstr "Modifica note articolo"
+#: classes/feeds.php:1962
+#, php-format
+msgid "Search results: %s"
+msgstr "Risultati di ricerca: %s"
 
-#: plugins/vf_shared/init.php:16 plugins/vf_shared/init.php:69
+#: plugins/vf_shared/init.php:16
+#: plugins/vf_shared/init.php:60
 msgid "Shared articles"
 msgstr "Articoli condivisi"
 
-#: plugins/auth_internal/init.php:65
-msgid "Please enter your one time password:"
-msgstr "Inserisci la password usa e getta:"
-
-#: plugins/auth_internal/init.php:188
-msgid "Password has been changed."
-msgstr "La password è stata cambiata."
-
-#: plugins/auth_internal/init.php:190
-msgid "Old password is incorrect."
-msgstr "La vecchia password non è corretta."
-
-#: plugins/af_readability/init.php:21
-msgid "Data saved."
-msgstr "Data salvata."
-
-#: plugins/af_readability/init.php:33
-msgid "Inline content"
-msgstr "Contenuto completo dell'articolo"
-
-#: plugins/af_readability/init.php:39
-msgid "Readability settings (af_readability)"
-msgstr "Impostazioni di Readability (af_readability)"
-
-#: plugins/af_readability/init.php:66
-msgid "Use Readability for pages shared via bookmarklet."
-msgstr "Usa Readability per i contenuti condivisi via bookmarklet."
-
-#: plugins/af_readability/init.php:78 plugins/af_psql_trgm/init.php:191
-msgid "Currently enabled for (click to edit):"
-msgstr "Attualmente attivo per (clicca per modificare):"
-
-#: plugins/af_readability/init.php:95
-msgid "Readability"
-msgstr "Readability"
-
-#: plugins/af_readability/init.php:106
-msgid "Inline article content"
-msgstr "Contenuto completo dell'articolo."
-
-#: plugins/af_redditimgur/init.php:25
-msgid "Reddit content settings (af_redditimgur)"
-msgstr "Impostazioni per i contenuti di Reddit (af_redditimgur)"
-
-#: plugins/af_redditimgur/init.php:50
-msgid "Uses Readability (full-text-rss) implementation by <a target='_blank' href='https://bitbucket.org/fivefilters/'>FiveFilters.org</a>"
-msgstr "Usa Readability (full-text-rss) nell'implementazione di <a target='_blank' href='https://bitbucket.org/fivefilters/'>FiveFilters.org</a>"
-
-#: plugins/af_redditimgur/init.php:54
-msgid "Extract missing content using Readability"
-msgstr "Estrai il contenuto mancante usando Readability"
-
-#: plugins/af_redditimgur/init.php:59
-msgid "Enable additional duplicate checking"
-msgstr "Abilita un controllo addizionale sui post duplicati"
-
-#: plugins/af_redditimgur/init.php:73 plugins/af_zz_imgproxy/init.php:225
-msgid "Configuration saved"
-msgstr "La configurazione è stata salvata"
-
-#: plugins/af_psql_trgm/init.php:28
-#, php-format
-msgid "Data saved (%s, %d)"
-msgstr "Data salvata (%s, %d)"
-
-#: plugins/af_psql_trgm/init.php:112
-msgid "Show related articles"
-msgstr "Mostra articoli collegati"
-
-#: plugins/af_psql_trgm/init.php:118 plugins/af_psql_trgm/init.php:220
-msgid "Mark similar articles as read"
-msgstr "Segnare tutti gli articoli simili come letti"
-
-#: plugins/af_psql_trgm/init.php:157
-msgid "PostgreSQL trigram extension returns string similarity as a floating point number (0-1). Setting it too low might produce false positives, zero disables checking."
-msgstr "L'estensione di PostgreSQL Trigram ritorna la somiglianza di stringhe espressa come numero a virgola mobile (0-1). Impostare un valore troppo basso può produrre dei falsi positivi, impostarlo a zero disabilita il controllo."
-
-#: plugins/af_psql_trgm/init.php:160
-msgid "Global settings"
-msgstr "Impostazioni globali"
-
-#: plugins/af_psql_trgm/init.php:164
-msgid "Minimum similarity:"
-msgstr "Somiglianza minima:"
-
-#: plugins/af_psql_trgm/init.php:169
-msgid "Minimum title length:"
-msgstr "Lunghezza del titolo minima:"
-
-#: plugins/af_psql_trgm/init.php:174
-msgid "Enable for all feeds:"
-msgstr "Attiva per tutti i notiziari:"
-
-#: plugins/af_psql_trgm/init.php:209
-msgid "Similarity (pg_trgm)"
-msgstr "Somiglianza (pg_trgm)"
-
-#: plugins/af_comics/init.php:40
-msgid "Feeds supported by af_comics"
-msgstr "Notiziari supportati da af_comics"
-
-#: plugins/af_comics/init.php:42
-msgid "The following comics are currently supported:"
-msgstr "I seguenti fumetti sono attualmente supportati:"
-
-#: plugins/af_comics/init.php:60
-msgid "GoComics requires a specific URL to workaround their lack of feed support: <code>http://feeds.feedburner.com/uclick/<em>comic_name</em></code> (e.g. <code>http://www.gocomics.com/garfield</code> uses <code>http://feeds.feedburner.com/uclick/garfield</code>)."
-msgstr "GoComics richiede un URL specifico per aggirare il loro mancato supporto ai feed: <code>http://feeds.feedburner.com/uclick/<em>comic_name</em></code> (e.g. <code>http://www.gocomics.com/garfield</code> uses <code>http://feeds.feedburner.com/uclick/garfield</code>)."
-
 #: plugins/import_export/init.php:58
 msgid "Import and export"
 msgstr "Importa e esporta"
@@ -2408,92 +2434,83 @@ msgstr "Esporta i miei dati"
 msgid "Import"
 msgstr "Importa"
 
-#: plugins/import_export/init.php:225
+#: plugins/import_export/init.php:231
 msgid "Could not import: incorrect schema version."
 msgstr "Import fallito: versione dello schema database non corretta."
 
-#: plugins/import_export/init.php:230
+#: plugins/import_export/init.php:236
 msgid "Could not import: unrecognized document format."
 msgstr "Import fallito: formato documento sconosciuto."
 
-#: plugins/import_export/init.php:391
+#: plugins/import_export/init.php:397
 msgid "Finished: "
 msgstr "Finito: "
 
-#: plugins/import_export/init.php:392
+#: plugins/import_export/init.php:398
 #, php-format
 msgid "%d article processed, "
 msgid_plural "%d articles processed, "
 msgstr[0] "%d articolo elaborato,"
 msgstr[1] "%d articoli elaborati,"
 
-#: plugins/import_export/init.php:393
+#: plugins/import_export/init.php:399
 #, php-format
 msgid "%d imported, "
 msgid_plural "%d imported, "
 msgstr[0] "%d importato,"
 msgstr[1] "%d importati,"
 
-#: plugins/import_export/init.php:394
+#: plugins/import_export/init.php:400
 #, php-format
 msgid "%d feed created."
 msgid_plural "%d feeds created."
 msgstr[0] "%d notiziario creato."
 msgstr[1] "%d notiziari creati."
 
-#: plugins/import_export/init.php:399
+#: plugins/import_export/init.php:405
 msgid "Could not load XML document."
 msgstr "Documento XML non caricato."
 
-#: plugins/import_export/init.php:411
+#: plugins/import_export/init.php:417
 msgid "Prepare data"
 msgstr "Prepara dati"
 
-#: plugins/import_export/init.php:428
+#: plugins/import_export/init.php:434
 #, php-format
 msgid "Upload failed with error code %d (%s)"
 msgstr "Caricamento fallito con codice errore %d (%s)"
 
-#: plugins/import_export/init.php:454
+#: plugins/import_export/init.php:460
 msgid "No file uploaded."
 msgstr "Nessun file caricato."
 
-#: plugins/mail/init.php:28
-msgid "Mail addresses saved."
-msgstr "Indirizzi email salvati."
-
-#: plugins/mail/init.php:34
-msgid "Mail plugin"
-msgstr "Plugin Mail"
-
-#: plugins/mail/init.php:36
-msgid "You can set predefined email addressed here (comma-separated list):"
-msgstr "Puoi inserire gli indirizzi email predefiniti qui (separati da virgole):"
-
-#: plugins/mail/init.php:112 plugins/mail/init.php:118
-#: plugins/mailto/init.php:49 plugins/mailto/init.php:55
+#: plugins/mailto/init.php:48
+#: plugins/mailto/init.php:54
+#: plugins/mail/init.php:112
+#: plugins/mail/init.php:118
 msgid "[Forwarded]"
 msgstr "[Inoltrato]"
 
-#: plugins/mail/init.php:112 plugins/mailto/init.php:49
+#: plugins/mailto/init.php:48
+#: plugins/mail/init.php:112
 msgid "Multiple articles"
 msgstr "Articoli multipli"
 
-#: plugins/mail/init.php:140
-msgid "To:"
-msgstr "A:"
+#: plugins/mailto/init.php:70
+msgid "Clicking the following link to invoke your mail client:"
+msgstr "Clicca il link seguente per aprire il tuo client di posta:"
 
-#: plugins/mail/init.php:155
-msgid "Subject:"
-msgstr "Oggetto:"
+#: plugins/mailto/init.php:74
+msgid "Forward selected article(s) by email."
+msgstr "Inoltra l'articolo per email."
 
-#: plugins/mail/init.php:172
-msgid "Send e-mail"
-msgstr "Invia email"
+#: plugins/mailto/init.php:77
+msgid "You should be able to edit the message before sending in your mail client."
+msgstr "Puoi modificare l'articolo nel tuo client di posta prima di inviarlo."
 
-#: plugins/close_button/init.php:22
-msgid "Close article"
-msgstr "Chiudi articolo"
+#: plugins/mailto/init.php:82
+msgid "Close this dialog"
+msgstr "Chiudi questa finestra"
 
 #: plugins/bookmarklets/init.php:20
 msgid "Bookmarklets"
@@ -2516,33 +2533,117 @@ msgstr "Sottoscrivi in Tiny Tiny RSS"
 msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
 msgstr "Usa questo bookmarklet per condividere qualsiasi pagina usando Tiny Tiny RSS"
 
+#: plugins/af_psql_trgm/init.php:28
+#, php-format
+msgid "Data saved (%s, %d)"
+msgstr "Data salvata (%s, %d)"
+
+#: plugins/af_psql_trgm/init.php:112
+msgid "Show related articles"
+msgstr "Mostra articoli collegati"
+
+#: plugins/af_psql_trgm/init.php:118
+#: plugins/af_psql_trgm/init.php:220
+msgid "Mark similar articles as read"
+msgstr "Segnare tutti gli articoli simili come letti"
+
+#: plugins/af_psql_trgm/init.php:157
+msgid "PostgreSQL trigram extension returns string similarity as a floating point number (0-1). Setting it too low might produce false positives, zero disables checking."
+msgstr "L'estensione di PostgreSQL Trigram ritorna la somiglianza di stringhe espressa come numero a virgola mobile (0-1). Impostare un valore troppo basso può produrre dei falsi positivi, impostarlo a zero disabilita il controllo."
+
+#: plugins/af_psql_trgm/init.php:160
+msgid "Global settings"
+msgstr "Impostazioni globali"
+
+#: plugins/af_psql_trgm/init.php:164
+msgid "Minimum similarity:"
+msgstr "Somiglianza minima:"
+
+#: plugins/af_psql_trgm/init.php:169
+msgid "Minimum title length:"
+msgstr "Lunghezza del titolo minima:"
+
+#: plugins/af_psql_trgm/init.php:174
+msgid "Enable for all feeds:"
+msgstr "Attiva per tutti i notiziari:"
+
+#: plugins/af_psql_trgm/init.php:191
+#: plugins/af_readability/init.php:78
+msgid "Currently enabled for (click to edit):"
+msgstr "Attualmente attivo per (clicca per modificare):"
+
+#: plugins/af_psql_trgm/init.php:209
+msgid "Similarity (pg_trgm)"
+msgstr "Somiglianza (pg_trgm)"
+
+#: plugins/nsfw/init.php:30
+#: plugins/nsfw/init.php:42
+msgid "Not work safe (click to toggle)"
+msgstr "Non sicuro per luoghi di lavoro (clicca per attivare)"
+
+#: plugins/nsfw/init.php:52
+msgid "NSFW Plugin"
+msgstr "Plugin NSFW"
+
+#: plugins/nsfw/init.php:79
+msgid "Tags to consider NSFW (comma-separated)"
+msgstr "Tag da considerare NSFW (divisi da virgole)"
+
+#: plugins/nsfw/init.php:100
+msgid "Configuration saved."
+msgstr "La configurazione è stata salvata."
+
 #: plugins/toggle_sidebar/init.php:23
 msgid "Collapse feedlist"
 msgstr "Riduci elenco notiziari"
 
-#: plugins/af_zz_imgproxy/init.php:186
-msgid "Image proxy settings (af_zz_imgproxy)"
-msgstr "Impostazioni per il proxy delle immagini (af_zz_imgproxy)"
+#: plugins/af_readability/init.php:21
+msgid "Data saved."
+msgstr "Data salvata."
 
-#: plugins/af_zz_imgproxy/init.php:211
-msgid "Enable proxy for all remote images."
-msgstr "Attiva il proxy delle immagini per tutte le immagini remote."
+#: plugins/af_readability/init.php:33
+msgid "Inline content"
+msgstr "Contenuto completo dell'articolo"
 
-#: plugins/mailto/init.php:71
-msgid "Clicking the following link to invoke your mail client:"
-msgstr "Clicca il link seguente per aprire il tuo client di posta:"
+#: plugins/af_readability/init.php:39
+msgid "Readability settings (af_readability)"
+msgstr "Impostazioni di Readability (af_readability)"
 
-#: plugins/mailto/init.php:75
-msgid "Forward selected article(s) by email."
-msgstr "Inoltra l'articolo per email."
+#: plugins/af_readability/init.php:66
+msgid "Use Readability for pages shared via bookmarklet."
+msgstr "Usa Readability per i contenuti condivisi via bookmarklet."
 
-#: plugins/mailto/init.php:78
-msgid "You should be able to edit the message before sending in your mail client."
-msgstr "Puoi modificare l'articolo nel tuo client di posta prima di inviarlo."
+#: plugins/af_readability/init.php:95
+msgid "Readability"
+msgstr "Readability"
 
-#: plugins/mailto/init.php:83
-msgid "Close this dialog"
-msgstr "Chiudi questa finestra"
+#: plugins/af_readability/init.php:106
+msgid "Inline article content"
+msgstr "Contenuto completo dell'articolo."
+
+#: plugins/mail/init.php:28
+msgid "Mail addresses saved."
+msgstr "Indirizzi email salvati."
+
+#: plugins/mail/init.php:34
+msgid "Mail plugin"
+msgstr "Plugin Mail"
+
+#: plugins/mail/init.php:36
+msgid "You can set predefined email addressed here (comma-separated list):"
+msgstr "Puoi inserire gli indirizzi email predefiniti qui (separati da virgole):"
+
+#: plugins/mail/init.php:140
+msgid "To:"
+msgstr "A:"
+
+#: plugins/mail/init.php:155
+msgid "Subject:"
+msgstr "Oggetto:"
+
+#: plugins/mail/init.php:172
+msgid "Send e-mail"
+msgstr "Invia email"
 
 #: plugins/share/init.php:39
 msgid "You can disable all articles shared by unique URLs here."
@@ -2556,23 +2657,94 @@ msgstr "Togli la condivisione a tutti gli articoli."
 msgid "Share by URL"
 msgstr "Condividi per URL"
 
-#: plugins/share/init.php:97
+#: plugins/share/init.php:96
 msgid "You can share this article by the following unique URL:"
 msgstr "Puoi condividere questo articolo usando il seguente URL unico:"
 
-#: plugins/share/init.php:115
+#: plugins/share/init.php:114
 msgid "Unshare article"
 msgstr "Togli la condivisione all'articolo"
 
+#: plugins/af_comics/init.php:48
+msgid "Feeds supported by af_comics"
+msgstr "Notiziari supportati da af_comics"
+
+#: plugins/af_comics/init.php:50
+msgid "The following comics are currently supported:"
+msgstr "I seguenti fumetti sono attualmente supportati:"
+
+#: plugins/af_comics/init.php:68
+msgid "GoComics requires a specific URL to workaround their lack of feed support: <code>http://feeds.feedburner.com/uclick/<em>comic_name</em></code> (e.g. <code>http://www.gocomics.com/garfield</code> uses <code>http://feeds.feedburner.com/uclick/garfield</code>)."
+msgstr "GoComics richiede un URL specifico per aggirare il loro mancato supporto ai feed: <code>http://feeds.feedburner.com/uclick/<em>comic_name</em></code> (e.g. <code>http://www.gocomics.com/garfield</code> uses <code>http://feeds.feedburner.com/uclick/garfield</code>)."
+
+#: plugins/af_comics/init.php:70
+msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:25
+msgid "Reddit content settings (af_redditimgur)"
+msgstr "Impostazioni per i contenuti di Reddit (af_redditimgur)"
+
+#: plugins/af_redditimgur/init.php:50
+msgid "Uses Readability (full-text-rss) implementation by <a target='_blank' href='https://bitbucket.org/fivefilters/'>FiveFilters.org</a>"
+msgstr "Usa Readability (full-text-rss) nell'implementazione di <a target='_blank' href='https://bitbucket.org/fivefilters/'>FiveFilters.org</a>"
+
+#: plugins/af_redditimgur/init.php:54
+msgid "Extract missing content using Readability"
+msgstr "Estrai il contenuto mancante usando Readability"
+
+#: plugins/af_redditimgur/init.php:59
+msgid "Enable additional duplicate checking"
+msgstr "Abilita un controllo addizionale sui post duplicati"
+
+#: plugins/af_redditimgur/init.php:73
+#: plugins/af_zz_imgproxy/init.php:254
+msgid "Configuration saved"
+msgstr "La configurazione è stata salvata"
+
+#: plugins/note/init.php:26
+#: plugins/note/note.js:11
+msgid "Edit article note"
+msgstr "Modifica note articolo"
+
+#: plugins/close_button/init.php:25
+msgid "Close article"
+msgstr "Chiudi articolo"
+
+#: plugins/af_zz_imgproxy/init.php:210
+msgid "Image proxy settings (af_zz_imgproxy)"
+msgstr "Impostazioni per il proxy delle immagini (af_zz_imgproxy)"
+
+#: plugins/af_zz_imgproxy/init.php:234
+msgid "Enable proxy for all remote images."
+msgstr "Attiva il proxy delle immagini per tutte le immagini remote."
+
+#: plugins/af_zz_imgproxy/init.php:238
+#, fuzzy
+msgid "Don't cache files locally."
+msgstr "Memorizzare le immagini localmente"
+
+#: plugins/auth_internal/init.php:65
+msgid "Please enter your one time password:"
+msgstr "Inserisci la password usa e getta:"
+
+#: plugins/auth_internal/init.php:188
+msgid "Password has been changed."
+msgstr "La password è stata cambiata."
+
+#: plugins/auth_internal/init.php:190
+msgid "Old password is incorrect."
+msgstr "La vecchia password non è corretta."
+
 #: js/FeedTree.js:172
 msgid "(Un)collapse"
 msgstr "Espandi/Riduci la barra laterale"
 
-#: js/PrefFeedTree.js:52
+#: js/PrefFeedTree.js:54
 msgid "Edit category"
 msgstr "Modifica categoria"
 
-#: js/PrefFeedTree.js:59
+#: js/PrefFeedTree.js:61
 msgid "Remove category"
 msgstr "Rimuovi la categoria"
 
@@ -2607,53 +2779,55 @@ msgid "Create Filter"
 msgstr "Crea filtro"
 
 #: js/functions.js:1128
-msgid "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification hub again on next feed update."
-msgstr "Reimpostare la sottoscrizione? Tiny Tiny RSS proverà ancora al prossimo aggiornamento del notiziario a sottoscrivere il centro notifiche."
-
-#: js/functions.js:1139
-msgid "Subscription reset."
-msgstr "Sottoscrizione reimpostata."
-
-#: js/functions.js:1149 js/tt-rss.js:695
+#: js/tt-rss.js:696
 #, perl-format
 msgid "Unsubscribe from %s?"
 msgstr "Annullare la sottoscrizione a %s?"
 
-#: js/functions.js:1152
+#: js/functions.js:1131
 msgid "Removing feed..."
 msgstr "Notiziario in cancellazione..."
 
-#: js/functions.js:1225
+#: js/functions.js:1204
 msgid "Please enter category title:"
 msgstr "Inserire il titolo della categoria:"
 
-#: js/functions.js:1250
+#: js/functions.js:1229
 msgid "Generate new syndication address for this feed?"
 msgstr "Generare un nuovo indirizzo per questo notiziario?"
 
-#: js/functions.js:1254 js/prefs.js:1154
+#: js/functions.js:1233
+#: js/prefs.js:1150
 msgid "Trying to change address..."
 msgstr "Provo a cambiare indirizzo..."
 
-#: js/functions.js:1497 js/functions.js:1606 js/prefs.js:398 js/prefs.js:424
-#: js/prefs.js:456 js/prefs.js:599 js/prefs.js:617 js/prefs.js:1136
-#: js/prefs.js:1263
+#: js/functions.js:1476
+#: js/functions.js:1585
+#: js/prefs.js:398
+#: js/prefs.js:424
+#: js/prefs.js:456
+#: js/prefs.js:599
+#: js/prefs.js:617
+#: js/prefs.js:1132
+#: js/prefs.js:1259
 msgid "No feeds are selected."
 msgstr "Nessun notiziario selezionato."
 
-#: js/functions.js:1540
+#: js/functions.js:1519
 msgid "Remove selected feeds from the archive? Feeds with stored articles will not be removed."
 msgstr "Rimuovere i notiziari selezionati dall'archivio? I notiziari con articoli archiviati non saranno rimossi."
 
-#: js/functions.js:1577
+#: js/functions.js:1556
 msgid "Feeds with update errors"
 msgstr "Notiziari con errori di aggiornamento"
 
-#: js/functions.js:1588 js/prefs.js:1117
+#: js/functions.js:1567
+#: js/prefs.js:1113
 msgid "Remove selected feeds?"
 msgstr "Rimuovere i notiziari selezionati?"
 
-#: js/functions.js:1591 js/prefs.js:1120
+#: js/functions.js:1570
+#: js/prefs.js:1116
 msgid "Removing selected feeds..."
 msgstr "Rimuovendo i notiziari selezionati..."
 
@@ -2673,9 +2847,10 @@ msgstr "Creando utente..."
 msgid "User Editor"
 msgstr "Editor utente"
 
-#: js/prefs.js:100 js/prefs.js:209 js/prefs.js:706
-#: plugins/instances/instances.js:26 plugins/instances/instances.js:89
-#: js/functions.js:1408
+#: js/prefs.js:100
+#: js/prefs.js:209
+#: js/prefs.js:706
+#: js/functions.js:1387
 msgid "Saving data..."
 msgstr "Salvando dati..."
 
@@ -2699,7 +2874,8 @@ msgstr "Rimuovere le etichette selezionate?"
 msgid "Removing selected labels..."
 msgstr "Rimuovendo le etichette selezionate..."
 
-#: js/prefs.js:308 js/prefs.js:1304
+#: js/prefs.js:308
+#: js/prefs.js:1300
 msgid "No labels are selected."
 msgstr "Nessuna etichetta selezionata."
 
@@ -2711,7 +2887,10 @@ msgstr "Rimuovere gli utenti selezionati? Non saranno rimossi l'amministratore p
 msgid "Removing selected users..."
 msgstr "Rimuovendo gli utenti selezionati..."
 
-#: js/prefs.js:338 js/prefs.js:467 js/prefs.js:486 js/prefs.js:520
+#: js/prefs.js:338
+#: js/prefs.js:467
+#: js/prefs.js:486
+#: js/prefs.js:520
 msgid "No users are selected."
 msgstr "Nessun utente selezionato."
 
@@ -2723,7 +2902,9 @@ msgstr "Rimuovere i filtri selezionati?"
 msgid "Removing selected filters..."
 msgstr "Rimuovendo i filtri selezionati..."
 
-#: js/prefs.js:366 js/prefs.js:554 js/prefs.js:573
+#: js/prefs.js:366
+#: js/prefs.js:554
+#: js/prefs.js:573
 msgid "No filters are selected."
 msgstr "Nessun filtro selezionato."
 
@@ -2755,7 +2936,9 @@ msgstr "Per quanti giorni vuoi conservare gli articoli? (0 - usa il valore prede
 msgid "Purging selected feed..."
 msgstr "Pulendo i notiziari selezionati..."
 
-#: js/prefs.js:472 js/prefs.js:491 js/prefs.js:525
+#: js/prefs.js:472
+#: js/prefs.js:491
+#: js/prefs.js:525
 msgid "Please select only one user."
 msgstr "Selezionare un solo utente."
 
@@ -2791,27 +2974,28 @@ msgstr "Salvare i cambiamenti ai notiziari selezionati?"
 msgid "OPML Import"
 msgstr "Importazione OPML"
 
-#: js/prefs.js:764
+#: js/prefs.js:759
 msgid "Please choose an OPML file first."
 msgstr "Scegliere prima un file OPML."
 
-#: js/prefs.js:767 plugins/import_export/import_export.js:115
+#: js/prefs.js:762
+#: plugins/import_export/import_export.js:115
 msgid "Importing, please wait..."
 msgstr "Importando, attendere prego..."
 
-#: js/prefs.js:928
+#: js/prefs.js:924
 msgid "Reset to defaults?"
 msgstr "Reimpostare ai valori predefiniti?"
 
-#: js/prefs.js:1628
+#: js/prefs.js:1624
 msgid "Subscribing to feeds..."
 msgstr "Sottoscrivendo i notiziari..."
 
-#: js/prefs.js:1647
+#: js/prefs.js:1643
 msgid "Clear stored data for this plugin?"
 msgstr "Cancellare i dati salvati dei plugin?"
 
-#: js/prefs.js:1661
+#: js/prefs.js:1657
 msgid "Clear all messages in the error log?"
 msgstr "Cancellare tutti i messaggi nel log degli errori?"
 
@@ -2823,164 +3007,147 @@ msgstr "Segnare tutti gli articoli come letti?"
 msgid "Marking all feeds as read..."
 msgstr "Segnando tutti i notiziari come letti..."
 
-#: js/tt-rss.js:401
+#: js/tt-rss.js:402
 msgid "Please enable mail plugin first."
 msgstr "Per favore, prima attiva il plugin email."
 
-#: js/tt-rss.js:449 js/functions.js:1387 js/tt-rss.js:676
+#: js/tt-rss.js:450
+#: js/functions.js:1366
+#: js/tt-rss.js:677
 msgid "You can't edit this kind of feed."
 msgstr "Impossibile modificare questo tipo di notiziario."
 
-#: js/tt-rss.js:530
+#: js/tt-rss.js:531
 msgid "Please enable embed_original plugin first."
 msgstr "Per favore, prima attiva il plugin embed_original."
 
-#: js/tt-rss.js:543 js/tt-rss.js:726
+#: js/tt-rss.js:544
+#: js/tt-rss.js:727
 msgid "Widescreen is not available in combined mode."
 msgstr "Widescreen non disponibile nella modalità combinata."
 
-#: js/tt-rss.js:824
+#: js/tt-rss.js:825
 msgid "You can't rescore this kind of feed."
 msgstr "Impossibile cambiare il punteggio a questo tipo di notiziari."
 
-#: js/tt-rss.js:829 js/tt-rss.js:689
+#: js/tt-rss.js:830
+#: js/tt-rss.js:690
 msgid "Please select some feed first."
 msgstr "Selezionare prima qualche notiziario."
 
-#: js/tt-rss.js:834
+#: js/tt-rss.js:835
 #, perl-format
 msgid "Rescore articles in %s?"
 msgstr "Cambiare il punteggio degli articoli in %s ?"
 
-#: js/tt-rss.js:837
+#: js/tt-rss.js:838
 msgid "Rescoring articles..."
 msgstr "Cambiando punteggio degli articoli..."
 
-#: js/viewfeed.js:919 js/viewfeed.js:957 js/viewfeed.js:1005
-#: js/viewfeed.js:1931 plugins/mail/mail.js:7 plugins/mailto/init.js:7
-#: js/viewfeed.js:677 js/viewfeed.js:699 js/viewfeed.js:720 js/viewfeed.js:779
-#: js/viewfeed.js:807
+#: js/viewfeed.js:921
+#: js/viewfeed.js:959
+#: js/viewfeed.js:1007
+#: js/viewfeed.js:1933
+#: plugins/mailto/init.js:7
+#: plugins/mail/mail.js:7
+#: js/viewfeed.js:679
+#: js/viewfeed.js:701
+#: js/viewfeed.js:722
+#: js/viewfeed.js:781
+#: js/viewfeed.js:809
 msgid "No articles are selected."
 msgstr "Nessun articolo selezionato."
 
-#: js/viewfeed.js:927
+#: js/viewfeed.js:929
 #, perl-format
 msgid "Delete %d selected article in %s?"
 msgid_plural "Delete %d selected articles in %s?"
 msgstr[0] "Eliminare %d articolo selezionato in %s?"
 msgstr[1] "Eliminare i %d articoli selezionati in %s?"
 
-#: js/viewfeed.js:929
+#: js/viewfeed.js:931
 #, perl-format
 msgid "Delete %d selected article?"
 msgid_plural "Delete %d selected articles?"
 msgstr[0] "Eliminare %d articolo selezionato?"
 msgstr[1] "Eliminare i %d articoli selezionati?"
 
-#: js/viewfeed.js:966
+#: js/viewfeed.js:968
 #, perl-format
 msgid "Archive %d selected article in %s?"
 msgid_plural "Archive %d selected articles in %s?"
 msgstr[0] "Archiviare l' %d articolo selezionato in %s?"
 msgstr[1] "Archiviare i %d articoli selezionati in %s?"
 
-#: js/viewfeed.js:969
+#: js/viewfeed.js:971
 #, perl-format
 msgid "Move %d archived article back?"
 msgid_plural "Move %d archived articles back?"
 msgstr[0] "Spostare %d articolo archiviato indietro?"
 msgstr[1] "Spostare %d articoli archiviati indietro?"
 
-#: js/viewfeed.js:971
+#: js/viewfeed.js:973
 msgid "Please note that unstarred articles might get purged on next feed update."
 msgstr "Per favore, considera che gli articoli a cui è stata tolta la stella potrebbero essere cancellati al prossimo aggiornamento dei notiziari."
 
-#: js/viewfeed.js:1011
+#: js/viewfeed.js:1013
 #, perl-format
 msgid "Mark %d selected article in %s as read?"
 msgid_plural "Mark %d selected articles in %s as read?"
 msgstr[0] "Segnare %d articolo selezionato in %s come letto?"
 msgstr[1] "Segnare %d articoli selezionati in %s come letti?"
 
-#: js/viewfeed.js:1031
+#: js/viewfeed.js:1033
 msgid "Edit article Tags"
 msgstr "Modifica etichette articolo"
 
-#: js/viewfeed.js:1037
+#: js/viewfeed.js:1039
 msgid "Saving article tags..."
 msgstr "Salvando le etichette degli articoli..."
 
-#: js/viewfeed.js:1670
+#: js/viewfeed.js:1672
 msgid "Open original article"
 msgstr "Apri articolo originale"
 
-#: js/viewfeed.js:1677
+#: js/viewfeed.js:1679
 msgid "Display article URL"
 msgstr "Visualizza URL articolo"
 
-#: js/viewfeed.js:1787
+#: js/viewfeed.js:1789
 msgid "Assign label"
 msgstr "Assegna etichetta"
 
-#: js/viewfeed.js:1792
+#: js/viewfeed.js:1794
 msgid "Remove label"
 msgstr "Rimuovi etichetta"
 
-#: js/viewfeed.js:1824
+#: js/viewfeed.js:1826
 msgid "Select articles in group"
 msgstr "Seleziona gli articoli in gruppo"
 
-#: js/viewfeed.js:1834
+#: js/viewfeed.js:1836
 msgid "Mark group as read"
 msgstr "Segna il gruppo come letto"
 
-#: js/viewfeed.js:1846
+#: js/viewfeed.js:1848
 msgid "Mark feed as read"
 msgstr "Segna il notiziario come letto"
 
-#: js/viewfeed.js:1899
+#: js/viewfeed.js:1901
 msgid "Please enter new score for selected articles:"
 msgstr "Inserire il nuovo punteggio per gli articoli selezionati:"
 
-#: js/viewfeed.js:1962
+#: js/viewfeed.js:1964
 msgid "Please enter new score for this article:"
 msgstr "Inserire il nuovo punteggio per questo articolo:"
 
-#: js/viewfeed.js:1993
+#: js/viewfeed.js:1995
 msgid "Article URL:"
 msgstr "URL dell'articolo:"
 
-#: plugins/instances/instances.js:10
-msgid "Link Instance"
-msgstr "Collega istanza"
-
-#: plugins/instances/instances.js:73
-msgid "Edit Instance"
-msgstr "Modifica istanza"
-
-#: plugins/instances/instances.js:122
-msgid "Remove selected instances?"
-msgstr "Rimuovere le istanze selezionate?"
-
-#: plugins/instances/instances.js:125
-msgid "Removing selected instances..."
-msgstr "Rimuovendo le istanze selezionate..."
-
-#: plugins/instances/instances.js:139 plugins/instances/instances.js:151
-msgid "No instances are selected."
-msgstr "Nessuna istanza selezionata."
-
-#: plugins/instances/instances.js:156
-msgid "Please select only one instance."
-msgstr "Selezionare solo un'istanza."
-
-#: plugins/note/note.js:17
-msgid "Saving article note..."
-msgstr "Salvando le note dell'articolo..."
-
-#: plugins/af_psql_trgm/init.js:11
-msgid "Related articles"
-msgstr "Articoli collegati"
+#: plugins/embed_original/init.js:6
+msgid "Sorry, your browser does not support sandboxed iframes."
+msgstr "Mi dispiace, il browser non supporda gli iframe nella sandbox."
 
 #: plugins/import_export/import_export.js:13
 msgid "Export Data"
@@ -3001,10 +3168,15 @@ msgstr "Importa dati"
 msgid "Please choose the file first."
 msgstr "Scegli prima il file, per favore."
 
-#: plugins/mail/mail.js:21 plugins/mailto/init.js:21
+#: plugins/mailto/init.js:21
+#: plugins/mail/mail.js:21
 msgid "Forward article by email"
 msgstr "Inoltra l'articolo per email"
 
+#: plugins/af_psql_trgm/init.js:11
+msgid "Related articles"
+msgstr "Articoli collegati"
+
 #: plugins/mail/mail.js:36
 msgid "Error sending email:"
 msgstr "Errore nell'invio email:"
@@ -3013,10 +3185,6 @@ msgstr "Errore nell'invio email:"
 msgid "Your message has been sent."
 msgstr "Il messaggio è stato inviato."
 
-#: plugins/embed_original/init.js:6
-msgid "Sorry, your browser does not support sandboxed iframes."
-msgstr "Mi dispiace, il browser non supporda gli iframe nella sandbox."
-
 #: plugins/shorten_expanded/init.js:39
 msgid "Click to expand article"
 msgstr "Fare clic per espandere l'articolo."
@@ -3045,7 +3213,8 @@ msgstr "Provando a togliere la condivisione..."
 msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr "Questo renderà non più accessibili tutti gli URL degli articoli precedentemente condivisi. Procedere?"
 
-#: plugins/share/share_prefs.js:6 js/prefs.js:1437
+#: plugins/share/share_prefs.js:6
+#: js/prefs.js:1433
 msgid "Clearing URLs..."
 msgstr "Cancellando gli URL..."
 
@@ -3053,22 +3222,44 @@ msgstr "Cancellando gli URL..."
 msgid "Shared URLs cleared."
 msgstr "ULR condivisi cancellati."
 
-#: js/feedlist.js:429 js/feedlist.js:496
+#: plugins/note/note.js:17
+msgid "Saving article note..."
+msgstr "Salvando le note dell'articolo..."
+
+#: js/feedlist.js:429
 msgid "Mark all articles in %s as read?"
 msgstr "Segnare tutti gli articoli in %s come letti?"
 
 #: js/feedlist.js:487
-msgid "Mark all articles in %s older than 1 day as read?"
+#, fuzzy
+msgid "Mark %w in %s older than 1 day as read?"
 msgstr "Segnare tutti gli articoli in %s più vecchi di un giorno come letti?"
 
 #: js/feedlist.js:490
-msgid "Mark all articles in %s older than 1 week as read?"
+#, fuzzy
+msgid "Mark %w in %s older than 1 week as read?"
 msgstr "Segnare tutti gli articoli in %s più vecchi di una settimana come letti?"
 
 #: js/feedlist.js:493
-msgid "Mark all articles in %s older than 2 weeks as read?"
+#, fuzzy
+msgid "Mark %w in %s older than 2 weeks as read?"
 msgstr "Segnare tutti gli articoli in %s più vecchi di due settimane come letti?"
 
+#: js/feedlist.js:496
+#, fuzzy
+msgid "Mark %w in %s as read?"
+msgstr "Segnare tutti gli articoli in %s come letti?"
+
+#: js/feedlist.js:499
+#, fuzzy
+msgid "search results"
+msgstr "Risultati di ricerca: %s"
+
+#: js/feedlist.js:499
+#, fuzzy
+msgid "all articles"
+msgstr "Tutti gli articoli"
+
 #: js/functions.js:506
 msgid "Error explained"
 msgstr "Errore spiegato"
@@ -3149,172 +3340,245 @@ msgstr "Hai già sottoscritto questo notiziario."
 msgid "Edit rule"
 msgstr "Modifica regola"
 
-#: js/functions.js:1402
+#: js/functions.js:1381
 msgid "Edit Feed"
 msgstr "Modifica notiziario"
 
-#: js/functions.js:1435
+#: js/functions.js:1414
 msgid "More Feeds"
 msgstr "Altri notiziari"
 
-#: js/functions.js:1631
+#: js/functions.js:1610
 msgid "Help"
 msgstr "Aiuto"
 
-#: js/prefs.js:1032
+#: js/prefs.js:1028
 msgid "Remove category %s? Any nested feeds would be placed into Uncategorized."
 msgstr "Rimuovere la categoria %s ? Ogni notiziario incluso verrà inserito in Senza categoria."
 
-#: js/prefs.js:1038
+#: js/prefs.js:1034
 msgid "Removing category..."
 msgstr "Rimuovendo la categoria..."
 
-#: js/prefs.js:1056
+#: js/prefs.js:1052
 msgid "Remove selected categories?"
 msgstr "Rimuovere le categorie selezionate?"
 
-#: js/prefs.js:1059
+#: js/prefs.js:1055
 msgid "Removing selected categories..."
 msgstr "Rimuovendo le categorie selezionate..."
 
-#: js/prefs.js:1072
+#: js/prefs.js:1068
 msgid "No categories are selected."
 msgstr "Nessuna categoria selezionata."
 
-#: js/prefs.js:1079
+#: js/prefs.js:1075
 msgid "Category title:"
 msgstr "Titolo categoria: "
 
-#: js/prefs.js:1083
+#: js/prefs.js:1079
 msgid "Creating category..."
 msgstr "Creando categoria..."
 
-#: js/prefs.js:1106
+#: js/prefs.js:1102
 msgid "Feeds without recent updates"
 msgstr "Notiziari senza aggiornamenti recenti"
 
-#: js/prefs.js:1150
+#: js/prefs.js:1146
 msgid "Replace current OPML publishing address with a new one?"
 msgstr "Sostituire l'indirizzo di pubblicazione OPML attuale con uno nuovo?"
 
-#: js/prefs.js:1227
+#: js/prefs.js:1223
 msgid "Clearing feed..."
 msgstr "Cancellando i notiziari..."
 
-#: js/prefs.js:1247
+#: js/prefs.js:1243
 msgid "Rescore articles in selected feeds?"
 msgstr "Cambiare il punteggio agli articoli nel notiziario selezionato?"
 
-#: js/prefs.js:1250
+#: js/prefs.js:1246
 msgid "Rescoring selected feeds..."
 msgstr "Cambiando il punteggio agli articoli nel notiziario selezionato..."
 
-#: js/prefs.js:1270
+#: js/prefs.js:1266
 msgid "Rescore all articles? This operation may take a lot of time."
 msgstr "Cambiare il punteggio a tutti gli articoli? Questa operazione può durare molto tempo."
 
-#: js/prefs.js:1273
+#: js/prefs.js:1269
 msgid "Rescoring feeds..."
 msgstr "Cambiando punteggio dei notiziari..."
 
-#: js/prefs.js:1289
+#: js/prefs.js:1285
 msgid "Reset selected labels to default colors?"
 msgstr "Reimpostare le etichette selezionate ai colori predefiniti?"
 
-#: js/prefs.js:1321
+#: js/prefs.js:1317
 msgid "Settings Profiles"
 msgstr "Impostazioni dei profili"
 
-#: js/prefs.js:1330
+#: js/prefs.js:1326
 msgid "Remove selected profiles? Active and default profiles will not be removed."
 msgstr "Rimuovere i profili selezionati? Il profilo attivo e quello predefinito non saranno rimossi."
 
-#: js/prefs.js:1333
+#: js/prefs.js:1329
 msgid "Removing selected profiles..."
 msgstr "Rimuovendo i profili selezionati..."
 
-#: js/prefs.js:1349
+#: js/prefs.js:1345
 msgid "No profiles are selected."
 msgstr "Nessun profilo selezionato."
 
-#: js/prefs.js:1357 js/prefs.js:1410
+#: js/prefs.js:1353
+#: js/prefs.js:1406
 msgid "Activate selected profile?"
 msgstr "Attivare il profilo selezionato?"
 
-#: js/prefs.js:1374 js/prefs.js:1426
+#: js/prefs.js:1370
+#: js/prefs.js:1422
 msgid "Please choose a profile to activate."
 msgstr "Scegliere un profilo da attivare."
 
-#: js/prefs.js:1379
+#: js/prefs.js:1375
 msgid "Creating profile..."
 msgstr "Creando profilo..."
 
-#: js/prefs.js:1434
+#: js/prefs.js:1430
 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr "Questo renderà non più accessibili tutti gli URL dei notiziari generati. Procedere?"
 
-#: js/prefs.js:1444
+#: js/prefs.js:1440
 msgid "Generated URLs cleared."
 msgstr "URL generati cancellati."
 
-#: js/prefs.js:1516
+#: js/prefs.js:1512
 msgid "Label Editor"
 msgstr "Editor etichette"
 
-#: js/tt-rss.js:684
+#: js/tt-rss.js:685
 msgid "You can't unsubscribe from the category."
 msgstr "Impossibile annullare la sottoscrizione alla categoria."
 
-#: js/viewfeed.js:125 js/viewfeed.js:175 js/viewfeed.js:192
+#: js/viewfeed.js:127
+#: js/viewfeed.js:177
+#: js/viewfeed.js:194
 msgid "Click to open next unread feed."
 msgstr "Clicca per passare al prossimo notiziario da leggere."
 
-#: js/viewfeed.js:129
+#: js/viewfeed.js:131
 msgid "Cancel search"
 msgstr "Annulla ricerca"
 
-#: js/viewfeed.js:189
+#: js/viewfeed.js:191
 msgid "New articles found, reload feed to continue."
 msgstr "Nuovi articoli ricevuti, ricarica il notiziario per continuare."
 
-#: js/viewfeed.js:424
+#: js/viewfeed.js:426
 msgid "Unstar article"
 msgstr "Togli la stella all'articolo"
 
-#: js/viewfeed.js:428
+#: js/viewfeed.js:430
 msgid "Star article"
 msgstr "Metti la stella all'articolo"
 
-#: js/viewfeed.js:478
+#: js/viewfeed.js:480
 msgid "Unpublish article"
 msgstr "Rendi l'articolo non più pubblico"
 
-#: js/viewfeed.js:482
+#: js/viewfeed.js:484
 msgid "Publish article"
 msgstr "Pubblica articolo"
 
-#: js/viewfeed.js:622
+#: js/viewfeed.js:624
 msgid "%d article selected"
 msgid_plural "%d articles selected"
 msgstr[0] "%d articolo selezionato"
 msgstr[1] "%d articoli selezionati"
 
-#: js/viewfeed.js:1286
+#: js/viewfeed.js:1288
 msgid "No article is selected."
 msgstr "Nessun articolo selezionato."
 
-#: js/viewfeed.js:1321
+#: js/viewfeed.js:1323
 msgid "No articles found to mark"
 msgstr "Nessun articolo trovato da segnare"
 
-#: js/viewfeed.js:1323
+#: js/viewfeed.js:1325
 msgid "Mark %d article as read?"
 msgid_plural "Mark %d articles as read?"
 msgstr[0] "Segnare %d articolo come letto?"
 msgstr[1] "Segnare %d articoli come letti?"
 
-#~ msgid "Cache images locally"
-#~ msgstr "Memorizzare le immagini localmente"
+#~ msgid "Resubscribe to push updates"
+#~ msgstr "Sottoscrivi di nuovo per inviare aggiornamenti"
+
+#~ msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
+#~ msgstr "Reimposta lo stato di sottoscrizione a PubSubHubbub per i notiziari abilitati al push."
+
+#~ msgid "Download more plugins at tt-rss.org <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forums</a> or <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a>."
+#~ msgstr "Scarica altri plugin dai <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forum</a> o dalla <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a> di tt-rss.org."
+
+#~ msgid "Linked"
+#~ msgstr "Collegato"
+
+#~ msgid "Instance"
+#~ msgstr "Istanza"
+
+#~ msgid "Instance URL"
+#~ msgstr "URL dell'istanza"
+
+#~ msgid "Access key:"
+#~ msgstr "Chiave di accesso:"
+
+#~ msgid "Access key"
+#~ msgstr "Chiave di accesso"
+
+#~ msgid "Use one access key for both linked instances."
+#~ msgstr "Usare una sola chiave di accesso per entrambe le istanze collegate."
+
+#~ msgid "Generate new key"
+#~ msgstr "Genera nuova chiave"
+
+#~ msgid "Link instance"
+#~ msgstr "Collega istanza"
+
+#~ msgid "You can connect other instances of Tiny Tiny RSS to this one to share Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
+#~ msgstr "E' possibile connettere altre istanze di Tiny Tiny RSS a questa per condividere i notiziari Popolari. Collegare questa istanza di Tiny Tiny RSS usando questo URL:"
+
+#~ msgid "Last connected"
+#~ msgstr "Ultima connessione"
+
+#~ msgid "Status"
+#~ msgstr "Stato"
+
+#~ msgid "Stored feeds"
+#~ msgstr "Notiziari memorizzati"
+
+#~ msgid "Create link"
+#~ msgstr "Crea collegamento"
+
+#~ msgid "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification hub again on next feed update."
+#~ msgstr "Reimpostare la sottoscrizione? Tiny Tiny RSS proverà ancora al prossimo aggiornamento del notiziario a sottoscrivere il centro notifiche."
+
+#~ msgid "Subscription reset."
+#~ msgstr "Sottoscrizione reimpostata."
+
+#~ msgid "Link Instance"
+#~ msgstr "Collega istanza"
+
+#~ msgid "Edit Instance"
+#~ msgstr "Modifica istanza"
+
+#~ msgid "Remove selected instances?"
+#~ msgstr "Rimuovere le istanze selezionate?"
+
+#~ msgid "Removing selected instances..."
+#~ msgstr "Rimuovendo le istanze selezionate..."
+
+#~ msgid "No instances are selected."
+#~ msgstr "Nessuna istanza selezionata."
+
+#~ msgid "Please select only one instance."
+#~ msgstr "Selezionare solo un'istanza."
 
 #~ msgid "The error will be reported to the configured log destination."
 #~ msgstr "Questo errore verrà riportato nel log, alla posizione stabilita."
diff --git a/locale/ja_JP/LC_MESSAGES/messages.mo b/locale/ja_JP/LC_MESSAGES/messages.mo
index 1fb3ea3a6..e47c37ea0 100644
--- a/locale/ja_JP/LC_MESSAGES/messages.mo
+++ b/locale/ja_JP/LC_MESSAGES/messages.mo
diff --git a/locale/ja_JP/LC_MESSAGES/messages.po b/locale/ja_JP/LC_MESSAGES/messages.po
index df4bd01fe..dcd2bc3ae 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: 2017-03-23 15:25+0300\n"
+"POT-Creation-Date: 2017-07-04 16:29+0300\n"
 "PO-Revision-Date: 2013-07-13 11:05+0900\n"
 "Last-Translator: Yak! <[email protected]>\n"
 "Language-Team: \n"
@@ -171,31 +171,30 @@ msgstr "ユーザーが見つかりません"
 #: prefs.php:118
 #: classes/backend.php:5
 #: classes/pref/labels.php:282
-#: classes/pref/feeds.php:1402
-#: classes/pref/filters.php:779
+#: classes/pref/filters.php:819
+#: classes/pref/feeds.php:1376
 #: js/feedlist.js:149
-#: js/functions.js:1131
-#: js/functions.js:1231
-#: js/functions.js:1478
+#: js/functions.js:1210
+#: js/functions.js:1457
 #: js/prefs.js:621
-#: js/prefs.js:818
-#: js/prefs.js:1648
-#: js/prefs.js:1663
-#: js/tt-rss.js:550
-#: js/viewfeed.js:1182
+#: js/prefs.js:813
+#: js/prefs.js:1644
+#: js/prefs.js:1659
+#: js/tt-rss.js:551
+#: js/viewfeed.js:1184
 #: plugins/import_export/import_export.js:17
 #: js/feedlist.js:467
-#: js/feedlist.js:512
+#: js/feedlist.js:515
 #: js/functions.js:372
 #: js/functions.js:630
-#: js/prefs.js:1360
-#: js/prefs.js:1413
-#: js/prefs.js:1452
-#: js/prefs.js:1465
-#: js/prefs.js:1476
-#: js/prefs.js:1491
-#: js/tt-rss.js:567
-#: js/viewfeed.js:762
+#: js/prefs.js:1356
+#: js/prefs.js:1409
+#: js/prefs.js:1448
+#: js/prefs.js:1461
+#: js/prefs.js:1472
+#: js/prefs.js:1487
+#: js/tt-rss.js:568
+#: js/viewfeed.js:764
 msgid "Loading, please wait..."
 msgstr "読み込みんでいます。しばらくお待ちください..."
 
@@ -212,13 +211,13 @@ msgid "All Articles"
 msgstr "すべての記事"
 
 #: index.php:192
-#: include/functions2.php:107
+#: include/functions.php:1181
 #: classes/feeds.php:110
 msgid "Starred"
 msgstr "お気に入り"
 
 #: index.php:193
-#: include/functions2.php:108
+#: include/functions.php:1182
 #: classes/feeds.php:111
 msgid "Published"
 msgstr "公開済み"
@@ -259,7 +258,7 @@ msgstr "題名"
 
 #: index.php:209
 #: index.php:249
-#: include/functions2.php:95
+#: include/functions.php:1169
 #: classes/feeds.php:115
 #: js/FeedTree.js:138
 #: js/FeedTree.js:166
@@ -299,7 +298,7 @@ msgid "Feed actions:"
 msgstr "フィード操作:"
 
 #: index.php:244
-#: classes/handler/public.php:672
+#: classes/handler/public.php:583
 msgid "Subscribe to feed..."
 msgstr "フィードを購読する..."
 
@@ -313,8 +312,8 @@ msgstr "フィードのスコアを再計算しています..."
 
 #: index.php:247
 #: classes/pref/feeds.php:785
-#: classes/pref/feeds.php:1357
-#: js/PrefFeedTree.js:78
+#: classes/pref/feeds.php:1331
+#: js/PrefFeedTree.js:80
 msgid "Unsubscribe"
 msgstr "購読をやめる"
 
@@ -331,7 +330,7 @@ msgid "Other actions:"
 msgstr "その他の操作:"
 
 #: index.php:252
-#: include/functions2.php:81
+#: include/functions.php:1155
 msgid "Toggle widescreen mode"
 msgstr "ワイド表示モードの切り替え"
 
@@ -357,7 +356,7 @@ msgstr ""
 
 #: prefs.php:33
 #: prefs.php:136
-#: include/functions2.php:110
+#: include/functions.php:1184
 #: classes/pref/prefs.php:435
 msgid "Preferences"
 msgstr "設定"
@@ -372,20 +371,19 @@ msgstr "設定を終了する"
 
 #: prefs.php:139
 #: classes/pref/feeds.php:112
-#: classes/pref/feeds.php:1297
-#: classes/pref/feeds.php:1346
+#: classes/pref/feeds.php:1271
+#: classes/pref/feeds.php:1320
 msgid "Feeds"
 msgstr "フィード"
 
 #: prefs.php:142
-#: classes/pref/filters.php:248
+#: classes/pref/filters.php:273
 msgid "Filters"
 msgstr "フィルター"
 
 #: prefs.php:145
-#: include/functions.php:1327
-#: include/functions.php:1979
 #: classes/pref/labels.php:90
+#: classes/feeds.php:1718
 msgid "Labels"
 msgstr "ラベル"
 
@@ -414,13 +412,13 @@ msgstr "新規ユーザーの登録は管理者によって無効になってい
 #: register.php:337
 #: register.php:347
 #: register.php:359
-#: classes/handler/public.php:742
-#: classes/handler/public.php:813
-#: classes/handler/public.php:911
-#: classes/handler/public.php:990
-#: classes/handler/public.php:1004
-#: classes/handler/public.php:1011
-#: classes/handler/public.php:1036
+#: classes/handler/public.php:653
+#: classes/handler/public.php:724
+#: classes/handler/public.php:822
+#: classes/handler/public.php:901
+#: classes/handler/public.php:915
+#: classes/handler/public.php:922
+#: classes/handler/public.php:947
 msgid "Return to Tiny Tiny RSS"
 msgstr "Tiny Tiny RSS に戻る"
 
@@ -437,12 +435,12 @@ msgid "Check availability"
 msgstr "有効性の確認"
 
 #: register.php:229
-#: classes/handler/public.php:829
+#: classes/handler/public.php:740
 msgid "Email:"
 msgstr "メールアドレス:"
 
 #: register.php:232
-#: classes/handler/public.php:834
+#: classes/handler/public.php:745
 msgid "How much is two plus two:"
 msgstr "2 + 2 = ？"
 
@@ -470,17 +468,23 @@ msgstr "アカウントの作成に成功しました。"
 msgid "New user registrations are currently closed."
 msgstr "新規ユーザーの登録は現在行っていません。"
 
-#: update.php:67
+#: update.php:66
 msgid "Tiny Tiny RSS data update script."
 msgstr "Tiny Tiny RSS データ更新スクリプト。"
 
-#: include/digest.php:109
-#: include/functions.php:1336
-#: include/functions.php:1880
-#: include/functions.php:1965
-#: include/functions.php:1987
-#: classes/opml.php:421
+#: include/controls.php:83
+#: classes/pref/filters.php:242
+#: classes/pref/filters.php:253
+#: classes/pref/filters.php:544
+msgid "All feeds"
+msgstr "すべてのフィード"
+
+#: include/controls.php:134
+#: include/controls.php:316
 #: classes/pref/feeds.php:228
+#: classes/opml.php:486
+#: classes/feeds.php:1727
+#: classes/digest.php:113
 msgid "Uncategorized"
 msgstr "カテゴリー割り当てなし"
 
@@ -494,391 +498,287 @@ msgstr[0] "保管された記事 %d 件"
 msgid "No feeds found."
 msgstr "フィードがありません。"
 
-#: include/functions.php:1029
+#: include/functions.php:900
 #, php-format
 msgid "%d min"
 msgstr ""
 
-#: include/functions.php:1325
-#: include/functions.php:1977
-msgid "Special"
-msgstr "特別"
-
-#: include/functions.php:1828
-#: classes/pref/filters.php:229
-#: classes/pref/filters.php:507
-msgid "All feeds"
-msgstr "すべてのフィード"
-
-#: include/functions.php:2032
-msgid "Starred articles"
-msgstr "お気に入りの記事"
-
-#: include/functions.php:2034
-msgid "Published articles"
-msgstr "公開済みの記事"
-
-#: include/functions.php:2036
-msgid "Fresh articles"
-msgstr "新しい記事"
-
-#: include/functions.php:2038
-#: include/functions2.php:105
-msgid "All articles"
-msgstr "すべての記事"
-
-#: include/functions.php:2040
-msgid "Archived articles"
-msgstr "保管された記事"
-
-#: include/functions.php:2042
-msgid "Recently read"
-msgstr "最近読んだ"
-
-#: include/functions2.php:57
+#: include/functions.php:1131
 msgid "Navigation"
 msgstr "ナビゲーション"
 
-#: include/functions2.php:58
+#: include/functions.php:1132
 msgid "Open next feed"
 msgstr "次のフィードを開く"
 
-#: include/functions2.php:59
+#: include/functions.php:1133
 msgid "Open previous feed"
 msgstr "前のフィードを開く"
 
-#: include/functions2.php:60
+#: include/functions.php:1134
 msgid "Open next article"
 msgstr "次の記事を開く"
 
-#: include/functions2.php:61
+#: include/functions.php:1135
 msgid "Open previous article"
 msgstr "前の記事を開く"
 
-#: include/functions2.php:62
+#: include/functions.php:1136
 msgid "Open next article (don't scroll long articles)"
 msgstr "次の記事を開く(スクロールしない)"
 
-#: include/functions2.php:63
+#: include/functions.php:1137
 msgid "Open previous article (don't scroll long articles)"
 msgstr "前の記事を開く(スクロールしない)"
 
-#: include/functions2.php:64
+#: include/functions.php:1138
 msgid "Move to next article (don't expand or mark read)"
 msgstr "次の記事へ移動する(展開せず既読にもしない)"
 
-#: include/functions2.php:65
+#: include/functions.php:1139
 msgid "Move to previous article (don't expand or mark read)"
 msgstr "前の記事へ移動する(展開せず既読にもしない)"
 
-#: include/functions2.php:66
+#: include/functions.php:1140
 msgid "Show search dialog"
 msgstr "検索ダイアログを表示する"
 
-#: include/functions2.php:67
+#: include/functions.php:1141
 msgid "Article"
 msgstr "記事"
 
-#: include/functions2.php:68
-#: js/viewfeed.js:1699
+#: include/functions.php:1142
+#: js/viewfeed.js:1701
 msgid "Toggle starred"
 msgstr "お気に入りを切り替える"
 
-#: include/functions2.php:69
-#: js/viewfeed.js:1711
+#: include/functions.php:1143
+#: js/viewfeed.js:1713
 msgid "Toggle published"
 msgstr "公開を切り替える"
 
-#: include/functions2.php:70
-#: js/viewfeed.js:1686
+#: include/functions.php:1144
+#: js/viewfeed.js:1688
 msgid "Toggle unread"
 msgstr "未読/既読を切り替える"
 
-#: include/functions2.php:71
+#: include/functions.php:1145
 msgid "Edit tags"
 msgstr "タグを編集する"
 
-#: include/functions2.php:72
+#: include/functions.php:1146
 msgid "Open in new window"
 msgstr "新しいウィンドウで開く"
 
-#: include/functions2.php:73
-#: js/viewfeed.js:1732
+#: include/functions.php:1147
+#: js/viewfeed.js:1734
 msgid "Mark below as read"
 msgstr "これより下を既読にする"
 
-#: include/functions2.php:74
-#: js/viewfeed.js:1725
+#: include/functions.php:1148
+#: js/viewfeed.js:1727
 msgid "Mark above as read"
 msgstr "これより上を既読にする"
 
-#: include/functions2.php:75
+#: include/functions.php:1149
 msgid "Scroll down"
 msgstr "下にスクロール"
 
-#: include/functions2.php:76
+#: include/functions.php:1150
 msgid "Scroll up"
 msgstr "上にスクロール"
 
-#: include/functions2.php:77
+#: include/functions.php:1151
 msgid "Select article under cursor"
 msgstr "マウスカーソルの下の記事を選択する"
 
-#: include/functions2.php:78
+#: include/functions.php:1152
 msgid "Email article"
 msgstr "記事をメールする"
 
-#: include/functions2.php:79
+#: include/functions.php:1153
 msgid "Close/collapse article"
 msgstr "記事を閉じる"
 
-#: include/functions2.php:80
+#: include/functions.php:1154
 msgid "Toggle article expansion (combined mode)"
 msgstr "記事の展開状態の切り替え(組み合わせモード)"
 
-#: include/functions2.php:82
+#: include/functions.php:1156
 #: plugins/embed_original/init.php:31
 msgid "Toggle embed original"
 msgstr "元の記事の埋め込みモードの切り替え"
 
-#: include/functions2.php:83
+#: include/functions.php:1157
 msgid "Article selection"
 msgstr "記事の選択"
 
-#: include/functions2.php:84
+#: include/functions.php:1158
 msgid "Select all articles"
 msgstr "すべての記事を選択する"
 
-#: include/functions2.php:85
+#: include/functions.php:1159
 msgid "Select unread"
 msgstr "未読記事を選択する"
 
-#: include/functions2.php:86
+#: include/functions.php:1160
 msgid "Select starred"
 msgstr "お気に入りの記事を選択する"
 
-#: include/functions2.php:87
+#: include/functions.php:1161
 msgid "Select published"
 msgstr "公開済みの記事を選択する"
 
-#: include/functions2.php:88
+#: include/functions.php:1162
 msgid "Invert selection"
 msgstr "選択を反転する"
 
-#: include/functions2.php:89
+#: include/functions.php:1163
 msgid "Deselect everything"
 msgstr "選択を全て解除する"
 
-#: include/functions2.php:90
+#: include/functions.php:1164
 #: classes/pref/feeds.php:555
-#: classes/pref/feeds.php:823
+#: classes/pref/feeds.php:811
 msgid "Feed"
 msgstr "フィード"
 
-#: include/functions2.php:91
+#: include/functions.php:1165
 msgid "Refresh current feed"
 msgstr "現在のフィードを更新する"
 
-#: include/functions2.php:92
+#: include/functions.php:1166
 msgid "Un/hide read feeds"
 msgstr "読んだフィードを隠す/再表示する"
 
-#: include/functions2.php:93
-#: classes/pref/feeds.php:1349
+#: include/functions.php:1167
+#: classes/pref/feeds.php:1323
 msgid "Subscribe to feed"
 msgstr "フィードを購読する"
 
-#: include/functions2.php:94
+#: include/functions.php:1168
 #: js/FeedTree.js:145
-#: js/PrefFeedTree.js:72
-#: js/viewfeed.js:1853
+#: js/PrefFeedTree.js:74
+#: js/viewfeed.js:1855
 msgid "Edit feed"
 msgstr "フィードを編集する"
 
-#: include/functions2.php:96
+#: include/functions.php:1170
 msgid "Reverse headlines"
 msgstr "ヘッドラインの順序を逆転する"
 
-#: include/functions2.php:97
+#: include/functions.php:1171
 msgid "Toggle headline grouping"
 msgstr ""
 
-#: include/functions2.php:98
+#: include/functions.php:1172
 msgid "Debug feed update"
 msgstr "フィードの更新を確認する"
 
-#: include/functions2.php:99
+#: include/functions.php:1173
 #, fuzzy
 msgid "Debug viewfeed()"
 msgstr "フィードの更新を確認する"
 
-#: include/functions2.php:100
+#: include/functions.php:1174
 #: js/FeedTree.js:194
 msgid "Mark all feeds as read"
 msgstr "すべてのフィードを既読に設定する"
 
-#: include/functions2.php:101
+#: include/functions.php:1175
 msgid "Un/collapse current category"
 msgstr "カテゴリーの開閉"
 
-#: include/functions2.php:102
+#: include/functions.php:1176
 msgid "Toggle combined mode"
 msgstr "組み合わせモードの切り替え"
 
-#: include/functions2.php:103
+#: include/functions.php:1177
 msgid "Toggle auto expand in combined mode"
 msgstr "組み合わせモードでの自動展開の切り替え"
 
-#: include/functions2.php:104
+#: include/functions.php:1178
 msgid "Go to"
 msgstr "移動"
 
-#: include/functions2.php:106
+#: include/functions.php:1179
+#: classes/feeds.php:1602
+msgid "All articles"
+msgstr "すべての記事"
+
+#: include/functions.php:1180
 msgid "Fresh"
 msgstr "新しい記事"
 
-#: include/functions2.php:109
-#: js/tt-rss.js:494
-#: js/tt-rss.js:663
+#: include/functions.php:1183
+#: js/tt-rss.js:495
+#: js/tt-rss.js:664
 msgid "Tag cloud"
 msgstr "タグクラウド"
 
-#: include/functions2.php:111
+#: include/functions.php:1185
 msgid "Other"
 msgstr "その他"
 
-#: include/functions2.php:112
+#: include/functions.php:1186
 #: classes/pref/labels.php:267
 msgid "Create label"
 msgstr "ラベルを作成する"
 
-#: include/functions2.php:113
-#: classes/pref/filters.php:753
+#: include/functions.php:1187
+#: classes/pref/filters.php:793
 msgid "Create filter"
 msgstr "フィルターを作成する"
 
-#: include/functions2.php:114
+#: include/functions.php:1188
 msgid "Un/collapse sidebar"
 msgstr "サイドバーを開閉する"
 
-#: include/functions2.php:115
+#: include/functions.php:1189
 msgid "Show help dialog"
 msgstr "ヘルプダイアログを表示する"
 
-#: include/functions2.php:670
-#, php-format
-msgid "Search results: %s"
-msgstr "検索結果: %s"
-
-#: include/functions2.php:1336
-#: classes/feeds.php:752
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] ""
-
-#: include/functions2.php:1340
-#: classes/feeds.php:756
-#, fuzzy
-msgid "comments"
-msgstr "添付"
-
-#: include/functions2.php:1366
-msgid " - "
-msgstr " - "
-
-#: include/functions2.php:1397
-#: include/functions2.php:1648
-#: classes/article.php:311
-msgid "no tags"
-msgstr "タグがありません"
-
-#: include/functions2.php:1407
-#: classes/feeds.php:738
-msgid "Edit tags for this article"
-msgstr "この記事のタグを編集する"
-
-#: include/functions2.php:1439
-#: classes/feeds.php:690
-msgid "Originally from:"
-msgstr "元の記事:"
-
-#: include/functions2.php:1452
-#: classes/pref/feeds.php:574
-#: classes/feeds.php:703
-msgid "Feed URL"
-msgstr "フィード URL"
-
-#: include/functions2.php:1489
-#: classes/backend.php:105
-#: classes/dlg.php:37
-#: classes/dlg.php:60
-#: classes/dlg.php:93
-#: classes/dlg.php:159
-#: classes/dlg.php:186
-#: classes/pref/feeds.php:1652
-#: classes/pref/feeds.php:1718
-#: classes/pref/filters.php:204
-#: classes/pref/prefs.php:1097
-#: plugins/af_psql_trgm/init.php:102
-#: plugins/import_export/init.php:415
-#: plugins/import_export/init.php:461
-#: plugins/share/init.php:121
-msgid "Close this window"
-msgstr "このウィンドウを閉じる"
-
-#: include/functions2.php:1686
-msgid "(edit note)"
-msgstr "(ノートの編集)"
-
-#: include/functions2.php:1960
-msgid "unknown type"
-msgstr "未知の種類"
-
-#: include/functions2.php:2037
-msgid "Attachments"
-msgstr "添付"
-
-#: include/functions2.php:2496
+#: include/functions.php:2456
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: include/functions2.php:2497
+#: include/functions.php:2457
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: include/functions2.php:2498
+#: include/functions.php:2458
 msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
 msgstr ""
 
-#: include/functions2.php:2499
+#: include/functions.php:2459
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: include/functions2.php:2500
+#: include/functions.php:2460
 #, fuzzy
 msgid "No file was uploaded"
 msgstr "ファイルがアップロードされていません。"
 
-#: include/functions2.php:2501
+#: include/functions.php:2461
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: include/functions2.php:2502
+#: include/functions.php:2462
 msgid "Failed to write file to disk."
 msgstr ""
 
-#: include/functions2.php:2503
+#: include/functions.php:2463
 msgid "A PHP extension stopped the file upload."
 msgstr ""
 
 #: include/login_form.php:197
-#: classes/handler/public.php:569
-#: classes/handler/public.php:824
+#: classes/handler/public.php:480
+#: classes/handler/public.php:735
 msgid "Login:"
 msgstr "ログイン:"
 
 #: include/login_form.php:207
-#: classes/handler/public.php:572
+#: classes/handler/public.php:483
 msgid "Password:"
 msgstr "パスワード:"
 
@@ -891,7 +791,7 @@ msgid "Profile:"
 msgstr "プロファイル:"
 
 #: include/login_form.php:223
-#: classes/handler/public.php:311
+#: classes/handler/public.php:287
 #: classes/pref/prefs.php:1035
 #: classes/rpc.php:63
 msgid "Default profile"
@@ -910,7 +810,7 @@ msgid "Remember me"
 msgstr "ログイン状態を記憶する"
 
 #: include/login_form.php:249
-#: classes/handler/public.php:577
+#: classes/handler/public.php:488
 msgid "Log in"
 msgstr "ログイン"
 
@@ -926,145 +826,44 @@ msgstr "セッションの検査に失敗しました (ユーザーが見つか�
 msgid "Session failed to validate (password changed)"
 msgstr "セッションの検査に失敗しました (パスワードが変更されました)"
 
-#: classes/article.php:25
-msgid "Article not found."
-msgstr "記事が見つかりません。"
-
-#: classes/article.php:197
-msgid "Tags for this article (separated by commas):"
-msgstr "この記事のタグ (カンマで区切ります):"
-
-#: classes/article.php:222
-#: classes/pref/labels.php:79
-#: classes/pref/users.php:98
-#: classes/pref/feeds.php:801
-#: classes/pref/feeds.php:943
-#: classes/pref/filters.php:485
-#: classes/pref/prefs.php:981
-#: plugins/instances/init.php:245
-#: plugins/nsfw/init.php:85
-#: plugins/note/init.php:51
-#: plugins/af_readability/init.php:68
-#: plugins/af_redditimgur/init.php:60
-#: plugins/af_psql_trgm/init.php:181
-#: plugins/mail/init.php:64
-#: plugins/af_zz_imgproxy/init.php:213
-msgid "Save"
-msgstr "保存"
-
-#: classes/article.php:224
-#: classes/handler/public.php:546
-#: classes/handler/public.php:580
-#: classes/pref/labels.php:81
-#: classes/pref/users.php:100
-#: classes/pref/feeds.php:802
-#: classes/pref/feeds.php:946
-#: classes/pref/feeds.php:1859
-#: classes/pref/filters.php:488
-#: classes/pref/filters.php:902
-#: classes/pref/filters.php:983
-#: classes/pref/filters.php:1076
-#: classes/pref/prefs.php:983
-#: classes/feeds.php:1105
-#: classes/feeds.php:1155
-#: classes/feeds.php:1192
-#: plugins/instances/init.php:248
-#: plugins/instances/init.php:436
-#: plugins/note/init.php:53
-#: plugins/mail/init.php:173
-msgid "Cancel"
-msgstr "取り消し"
-
-#: classes/opml.php:28
-#: classes/opml.php:33
-msgid "OPML Utility"
-msgstr "OPML ユーティリティ"
-
-#: classes/opml.php:37
-msgid "Importing OPML..."
-msgstr "OPML のインポート中..."
-
-#: classes/opml.php:41
-msgid "Return to preferences"
-msgstr "設定に戻る"
-
-#: classes/opml.php:271
-#, php-format
-msgid "Adding feed: %s"
-msgstr "フィード追加: %s"
-
-#: classes/opml.php:282
-#, php-format
-msgid "Duplicate feed: %s"
-msgstr "重複したフィード: %s"
-
-#: classes/opml.php:296
-#, php-format
-msgid "Adding label %s"
-msgstr "ラベル %s の割り当て"
-
-#: classes/opml.php:299
-#, php-format
-msgid "Duplicate label: %s"
-msgstr "重複したラベル: %s"
-
-#: classes/opml.php:311
-#, php-format
-msgid "Setting preference key %s to %s"
-msgstr "%s を %s に設定"
-
-#: classes/opml.php:343
-msgid "Adding filter..."
-msgstr "フィルタを追加しています..."
-
-#: classes/opml.php:421
-#, php-format
-msgid "Processing category: %s"
-msgstr "処理中のカテゴリ: %s"
-
-#: classes/opml.php:470
-#, php-format
-msgid "Upload failed with error code %d"
-msgstr "エラーコード %d でアップロードが失敗しました"
-
-#: classes/opml.php:484
-#: plugins/import_export/init.php:442
-msgid "Unable to move uploaded file."
-msgstr "アップロードされたファイルを移動できません。"
-
-#: classes/opml.php:488
-#: plugins/import_export/init.php:446
-msgid "Error: please upload OPML file."
-msgstr "エラー: OPML ファイルをアップロードしてください。"
-
-#: classes/opml.php:499
-msgid "Error: unable to find moved OPML file."
-msgstr "エラー: 移動された OPML ファイルが見つかりません。"
-
-#: classes/opml.php:506
-msgid "Error while parsing document."
-msgstr "ドキュメントの解析中のエラーです。"
-
-#: classes/backend.php:33
+#: classes/backend.php:31
 msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
 msgstr "インタフェースに関する他のヒントが Tiny Tiny RSS の Wiki にあります。"
 
-#: classes/backend.php:38
+#: classes/backend.php:36
 msgid "Keyboard Shortcuts"
 msgstr "キーボードショートカット"
 
-#: classes/backend.php:61
+#: classes/backend.php:59
 msgid "Shift"
 msgstr "Shift"
 
-#: classes/backend.php:64
+#: classes/backend.php:62
 msgid "Ctrl"
 msgstr "Ctrl"
 
-#: classes/backend.php:99
+#: classes/backend.php:97
 msgid "Help topic not found."
 msgstr "ヘルプのトピックが見つかりません。"
 
+#: classes/backend.php:103
+#: classes/dlg.php:37
+#: classes/dlg.php:60
+#: classes/dlg.php:93
+#: classes/dlg.php:159
+#: classes/dlg.php:186
+#: classes/article.php:744
+#: classes/pref/filters.php:206
+#: classes/pref/prefs.php:1097
+#: classes/pref/feeds.php:1626
+#: classes/pref/feeds.php:1692
+#: plugins/import_export/init.php:421
+#: plugins/import_export/init.php:467
+#: plugins/af_psql_trgm/init.php:102
+#: plugins/share/init.php:120
+msgid "Close this window"
+msgstr "このウィンドウを閉じる"
+
 #: classes/dlg.php:17
 msgid "If you have imported labels and/or filters, you might need to reload preferences to see your new data."
 msgstr "インポートしたラベルかフィルタがあるなら、新しいデータを見るために設定を更新(リロード)する必要があるかもしれません。"
@@ -1075,7 +874,7 @@ msgstr "あなたの公開 OPML の URL:"
 
 #: classes/dlg.php:57
 #: classes/dlg.php:183
-#: plugins/share/init.php:118
+#: plugins/share/init.php:117
 msgid "Generate new URL"
 msgstr "新しい URL を生成する"
 
@@ -1096,130 +895,224 @@ msgstr "更新デーモンがフィードを更新するのに非常に長い時
 msgid "You can view this feed as RSS using the following URL:"
 msgstr "このフィードは以下の URL で RSS として見られます:"
 
-#: classes/handler/public.php:510
+#: classes/article.php:25
+msgid "Article not found."
+msgstr "記事が見つかりません。"
+
+#: classes/article.php:197
+msgid "Tags for this article (separated by commas):"
+msgstr "この記事のタグ (カンマで区切ります):"
+
+#: classes/article.php:222
+#: classes/pref/labels.php:79
+#: classes/pref/filters.php:519
+#: classes/pref/users.php:98
+#: classes/pref/prefs.php:981
+#: classes/pref/feeds.php:789
+#: classes/pref/feeds.php:931
+#: plugins/af_psql_trgm/init.php:181
+#: plugins/nsfw/init.php:85
+#: plugins/af_readability/init.php:68
+#: plugins/mail/init.php:64
+#: plugins/af_redditimgur/init.php:60
+#: plugins/note/init.php:51
+#: plugins/af_zz_imgproxy/init.php:240
+msgid "Save"
+msgstr "保存"
+
+#: classes/article.php:224
+#: classes/handler/public.php:457
+#: classes/handler/public.php:491
+#: classes/pref/labels.php:81
+#: classes/pref/filters.php:522
+#: classes/pref/filters.php:942
+#: classes/pref/filters.php:1022
+#: classes/pref/filters.php:1115
+#: classes/pref/users.php:100
+#: classes/pref/prefs.php:983
+#: classes/pref/feeds.php:790
+#: classes/pref/feeds.php:934
+#: classes/pref/feeds.php:1833
+#: classes/feeds.php:1098
+#: classes/feeds.php:1148
+#: classes/feeds.php:1185
+#: plugins/mail/init.php:173
+#: plugins/note/init.php:53
+msgid "Cancel"
+msgstr "取り消し"
+
+#: classes/article.php:311
+#: classes/article.php:652
+#: classes/article.php:805
+msgid "no tags"
+msgstr "タグがありません"
+
+#: classes/article.php:419
+msgid "unknown type"
+msgstr "未知の種類"
+
+#: classes/article.php:496
+msgid "Attachments"
+msgstr "添付"
+
+#: classes/article.php:591
+#: classes/feeds.php:741
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] ""
+
+#: classes/article.php:595
+#: classes/feeds.php:745
+#, fuzzy
+msgid "comments"
+msgstr "添付"
+
+#: classes/article.php:621
+msgid " - "
+msgstr " - "
+
+#: classes/article.php:662
+#: classes/feeds.php:727
+msgid "Edit tags for this article"
+msgstr "この記事のタグを編集する"
+
+#: classes/article.php:694
+#: classes/feeds.php:681
+msgid "Originally from:"
+msgstr "元の記事:"
+
+#: classes/article.php:707
+#: classes/pref/feeds.php:574
+#: classes/feeds.php:694
+msgid "Feed URL"
+msgstr "フィード URL"
+
+#: classes/article.php:843
+msgid "(edit note)"
+msgstr "(ノートの編集)"
+
+#: classes/handler/public.php:421
 #: plugins/bookmarklets/init.php:40
 msgid "Share with Tiny Tiny RSS"
 msgstr "Tiny Tiny RSS で共有する"
 
-#: classes/handler/public.php:518
+#: classes/handler/public.php:429
 msgid "Title:"
 msgstr "題名:"
 
-#: classes/handler/public.php:520
+#: classes/handler/public.php:431
 #: classes/pref/feeds.php:572
-#: plugins/instances/init.php:212
-#: plugins/instances/init.php:401
 msgid "URL:"
 msgstr "URL:"
 
-#: classes/handler/public.php:522
+#: classes/handler/public.php:433
 msgid "Content:"
 msgstr "内容:"
 
-#: classes/handler/public.php:524
+#: classes/handler/public.php:435
 msgid "Labels:"
 msgstr "ラベル:"
 
-#: classes/handler/public.php:543
+#: classes/handler/public.php:454
 msgid "Shared article will appear in the Published feed."
 msgstr "共有した記事は「公開済みの記事」に表示されます。"
 
-#: classes/handler/public.php:545
+#: classes/handler/public.php:456
 msgid "Share"
 msgstr "共有"
 
-#: classes/handler/public.php:567
+#: classes/handler/public.php:478
 msgid "Not logged in"
 msgstr "ログインしていません"
 
-#: classes/handler/public.php:626
+#: classes/handler/public.php:537
 msgid "Incorrect username or password"
 msgstr "ユーザー名かパスワードが正しくありません"
 
-#: classes/handler/public.php:678
+#: classes/handler/public.php:589
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "<b>%s</b> は既に購読しています。"
 
-#: classes/handler/public.php:681
+#: classes/handler/public.php:592
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "<b>%s</b> を購読しました。"
 
-#: classes/handler/public.php:684
+#: classes/handler/public.php:595
 #, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "<b>%s</b> は購読できませんでした。"
 
-#: classes/handler/public.php:687
+#: classes/handler/public.php:598
 #, php-format
 msgid "No feeds found in <b>%s</b>."
 msgstr "<b>%s</b>にフィードが見つかりません。"
 
-#: classes/handler/public.php:690
+#: classes/handler/public.php:601
 msgid "Multiple feed URLs found."
 msgstr "複数のフィードの URL が見つかりました。"
 
-#: classes/handler/public.php:694
+#: classes/handler/public.php:605
 #, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr "<b>%s</b> は購読できませんでした。<br>フィードの URL がダウンロードできません。"
 
-#: classes/handler/public.php:712
+#: classes/handler/public.php:623
 msgid "Subscribe to selected feed"
 msgstr "選択したフィードを購読する"
 
-#: classes/handler/public.php:737
+#: classes/handler/public.php:648
 msgid "Edit subscription options"
 msgstr "購読オプションの編集"
 
-#: classes/handler/public.php:774
+#: classes/handler/public.php:685
 msgid "Password recovery"
 msgstr "パスワードの復旧"
 
-#: classes/handler/public.php:817
+#: classes/handler/public.php:728
 #, fuzzy
 msgid "You will need to provide valid account name and email. A password reset link will be sent to your email address."
 msgstr "有効なアカウント名と電子メールアドレスを入力する必要があります。新しいパスワードがあなたの電子メールアドレスに送信されます。"
 
-#: classes/handler/public.php:839
-#: classes/pref/users.php:350
+#: classes/handler/public.php:750
+#: classes/pref/users.php:349
 msgid "Reset password"
 msgstr "パスワードのリセット"
 
-#: classes/handler/public.php:849
+#: classes/handler/public.php:760
 msgid "Some of the required form parameters are missing or incorrect."
 msgstr "いくつかの必須項目が入力されていないか、正しくありません"
 
-#: classes/handler/public.php:853
-#: classes/handler/public.php:919
+#: classes/handler/public.php:764
+#: classes/handler/public.php:830
 msgid "Go back"
 msgstr "戻る"
 
-#: classes/handler/public.php:890
+#: classes/handler/public.php:801
 #, fuzzy
 msgid "[tt-rss] Password reset request"
 msgstr "[tt-rss] パスワード変更通知"
 
-#: classes/handler/public.php:915
+#: classes/handler/public.php:826
 msgid "Sorry, login and email combination not found."
 msgstr "ログイン名とメールアドレスの組み合わせが組み合わせが見つかりませんでした"
 
-#: classes/handler/public.php:937
+#: classes/handler/public.php:848
 msgid "Your access level is insufficient to run this script."
 msgstr "あなたの権限では、このスクリプトを実行できません。"
 
-#: classes/handler/public.php:963
+#: classes/handler/public.php:874
 msgid "Database Updater"
 msgstr "データベースアップデーター"
 
-#: classes/handler/public.php:1028
+#: classes/handler/public.php:939
 msgid "Perform updates"
 msgstr "更新の実行"
 
 #: classes/pref/labels.php:22
-#: classes/pref/filters.php:348
-#: classes/pref/filters.php:823
+#: classes/pref/filters.php:373
+#: classes/pref/filters.php:863
 msgid "Caption"
 msgstr "キャプション"
 
@@ -1241,59 +1134,55 @@ msgid "Created label <b>%s</b>"
 msgstr "ラベル <b>%s</b> を作成しました"
 
 #: classes/pref/labels.php:258
-#: classes/pref/users.php:334
-#: classes/pref/feeds.php:1337
-#: classes/pref/feeds.php:1600
-#: classes/pref/feeds.php:1664
-#: classes/pref/filters.php:359
-#: classes/pref/filters.php:407
-#: classes/pref/filters.php:744
-#: classes/pref/filters.php:832
-#: classes/pref/filters.php:859
+#: classes/pref/filters.php:384
+#: classes/pref/filters.php:441
+#: classes/pref/filters.php:784
+#: classes/pref/filters.php:872
+#: classes/pref/filters.php:899
+#: classes/pref/users.php:333
 #: classes/pref/prefs.php:992
-#: plugins/instances/init.php:284
+#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1574
+#: classes/pref/feeds.php:1638
 msgid "Select"
 msgstr "選択"
 
 #: classes/pref/labels.php:261
-#: classes/pref/users.php:337
-#: classes/pref/feeds.php:1340
-#: classes/pref/feeds.php:1603
-#: classes/pref/feeds.php:1667
-#: classes/pref/filters.php:362
-#: classes/pref/filters.php:410
-#: classes/pref/filters.php:747
-#: classes/pref/filters.php:835
-#: classes/pref/filters.php:862
+#: classes/pref/filters.php:387
+#: classes/pref/filters.php:444
+#: classes/pref/filters.php:787
+#: classes/pref/filters.php:875
+#: classes/pref/filters.php:902
+#: classes/pref/users.php:336
 #: classes/pref/prefs.php:995
+#: classes/pref/feeds.php:1314
+#: classes/pref/feeds.php:1577
+#: classes/pref/feeds.php:1641
 #: classes/feeds.php:102
-#: plugins/instances/init.php:287
 msgid "All"
 msgstr "すべて"
 
 #: classes/pref/labels.php:263
-#: classes/pref/users.php:339
-#: classes/pref/feeds.php:1342
-#: classes/pref/feeds.php:1605
-#: classes/pref/feeds.php:1669
-#: classes/pref/filters.php:364
-#: classes/pref/filters.php:412
-#: classes/pref/filters.php:749
-#: classes/pref/filters.php:837
-#: classes/pref/filters.php:864
+#: classes/pref/filters.php:389
+#: classes/pref/filters.php:446
+#: classes/pref/filters.php:789
+#: classes/pref/filters.php:877
+#: classes/pref/filters.php:904
+#: classes/pref/users.php:338
 #: classes/pref/prefs.php:997
+#: classes/pref/feeds.php:1316
+#: classes/pref/feeds.php:1579
+#: classes/pref/feeds.php:1643
 #: classes/feeds.php:105
-#: plugins/instances/init.php:289
 msgid "None"
 msgstr "なし"
 
 #: classes/pref/labels.php:270
-#: classes/pref/users.php:348
+#: classes/pref/filters.php:512
+#: classes/pref/filters.php:806
+#: classes/pref/users.php:347
 #: classes/pref/feeds.php:767
-#: classes/pref/filters.php:478
-#: classes/pref/filters.php:766
-#: classes/feeds.php:1154
-#: plugins/instances/init.php:294
+#: classes/feeds.php:1147
 msgid "Remove"
 msgstr "削除"
 
@@ -1301,9 +1190,169 @@ msgstr "削除"
 msgid "Clear colors"
 msgstr "色の消去"
 
+#: classes/pref/filters.php:153
+#, fuzzy
+msgid "Preview article"
+msgstr "新しい記事"
+
+#: classes/pref/filters.php:264
+#: classes/pref/filters.php:558
+msgid "(inverse)"
+msgstr "(反転)"
+
+#: classes/pref/filters.php:260
+#: classes/pref/filters.php:557
+#, php-format
+msgid "%s on %s in %s %s"
+msgstr "「%3$s」の %2$s に対して %1$s %4$s"
+
+#: classes/pref/filters.php:379
+#: classes/pref/filters.php:867
+#: classes/pref/filters.php:981
+msgid "Match"
+msgstr "一致"
+
+#: classes/pref/filters.php:393
+#: classes/pref/filters.php:450
+#: classes/pref/filters.php:881
+#: classes/pref/filters.php:908
+msgid "Add"
+msgstr "追加"
+
+#: classes/pref/filters.php:396
+#: classes/pref/filters.php:453
+#: classes/pref/filters.php:884
+#: classes/pref/filters.php:911
+#: classes/feeds.php:122
+msgid "Delete"
+msgstr "削除"
+
+#: classes/pref/filters.php:436
+#: classes/pref/filters.php:894
+msgid "Apply actions"
+msgstr "適用する操作"
+
+#: classes/pref/filters.php:486
+#: classes/pref/filters.php:923
+msgid "Enabled"
+msgstr "有効にする"
+
+#: classes/pref/filters.php:495
+#: classes/pref/filters.php:926
+msgid "Match any rule"
+msgstr "いずれかのルールに一致"
+
+#: classes/pref/filters.php:504
+#: classes/pref/filters.php:929
+msgid "Inverse matching"
+msgstr "一致結果の反転"
+
+#: classes/pref/filters.php:516
+#: classes/pref/filters.php:936
+msgid "Test"
+msgstr "テスト"
+
+#: classes/pref/filters.php:780
+#: classes/pref/users.php:323
+#: classes/pref/feeds.php:1307
+#: classes/feeds.php:1118
+#: classes/feeds.php:1184
+#: js/tt-rss.js:165
+msgid "Search"
+msgstr "検索"
+
+#: classes/pref/filters.php:796
+msgid "Combine"
+msgstr "組み合わせ"
+
+#: classes/pref/filters.php:799
+#: classes/pref/users.php:345
+msgid "Edit"
+msgstr "編集"
+
+#: classes/pref/filters.php:802
+#: classes/pref/feeds.php:1327
+#: classes/pref/feeds.php:1341
+msgid "Reset sort order"
+msgstr "ソート順のリセット"
+
+#: classes/pref/filters.php:810
+#: classes/pref/feeds.php:1363
+msgid "Rescore articles"
+msgstr "記事のスコアの再集計"
+
+#: classes/pref/filters.php:939
+msgid "Create"
+msgstr "作成"
+
+#: classes/pref/filters.php:993
+msgid "Inverse regular expression matching"
+msgstr "正規表現の一致結果を反転する"
+
+#: classes/pref/filters.php:995
+msgid "on field"
+msgstr "対象項目"
+
+#: classes/pref/filters.php:1001
+#: js/PrefFilterTree.js:64
+msgid "in"
+msgstr "フィード"
+
+#: classes/pref/filters.php:1014
+#, fuzzy
+msgid "Wiki: Filters"
+msgstr "フィルター"
+
+#: classes/pref/filters.php:1019
+msgid "Save rule"
+msgstr "ルールの保存"
+
+#: classes/pref/filters.php:1019
+#: js/functions.js:865
+msgid "Add rule"
+msgstr "ルールの追加"
+
+#: classes/pref/filters.php:1042
+msgid "Perform Action"
+msgstr "操作の実行"
+
+#: classes/pref/filters.php:1093
+#, fuzzy
+msgid "No actions available"
+msgstr "新しいバージョンが利用できます!"
+
+#: classes/pref/filters.php:1112
+msgid "Save action"
+msgstr "操作の保存"
+
+#: classes/pref/filters.php:1112
+#: js/functions.js:887
+msgid "Add action"
+msgstr "操作の追加"
+
+#: classes/pref/filters.php:1136
+msgid "[No caption]"
+msgstr "[キャプションなし]"
+
+#: classes/pref/filters.php:1138
+#, fuzzy, php-format
+msgid "%s (%d rule)"
+msgid_plural "%s (%d rules)"
+msgstr[0] "ルールの追加"
+
+#: classes/pref/filters.php:1153
+#, fuzzy
+msgid "matches any rule"
+msgstr "いずれかのルールに一致"
+
+#: classes/pref/filters.php:1156
+#, fuzzy, php-format
+msgid "%s (+%d action)"
+msgid_plural "%s (+%d actions)"
+msgstr[0] "操作の追加"
+
 #: classes/pref/users.php:6
 #: classes/pref/system.php:8
-#: plugins/instances/init.php:154
 msgid "Your access level is insufficient to open this tab."
 msgstr "あなたの権限では、このタブを開ません。"
 
@@ -1314,8 +1363,8 @@ msgstr "ルールの編集"
 
 #: classes/pref/users.php:56
 #: classes/pref/feeds.php:637
-#: classes/pref/feeds.php:878
-#: classes/feeds.php:1075
+#: classes/pref/feeds.php:866
+#: classes/feeds.php:1068
 msgid "Authentication"
 msgstr "認証"
 
@@ -1325,7 +1374,7 @@ msgstr "アクセスレベル: "
 
 #: classes/pref/users.php:77
 #: classes/pref/feeds.php:667
-#: classes/pref/feeds.php:896
+#: classes/pref/feeds.php:884
 msgid "Options"
 msgstr "オプション"
 
@@ -1339,7 +1388,7 @@ msgid "User not found"
 msgstr "ユーザーが見つかりません"
 
 #: classes/pref/users.php:132
-#: classes/pref/users.php:400
+#: classes/pref/users.php:399
 msgid "Registered"
 msgstr "登録済み"
 
@@ -1357,7 +1406,7 @@ msgid "Stored articles"
 msgstr "お気に入りの記事"
 
 #: classes/pref/users.php:145
-#: classes/pref/users.php:399
+#: classes/pref/users.php:398
 msgid "Subscribed feeds"
 msgstr "購読したフィード"
 
@@ -1376,504 +1425,57 @@ msgstr "ユーザー <b>%s</b> の追加中です。"
 msgid "User <b>%s</b> already exists."
 msgstr "ユーザー <b>%s</b> は既に存在します。"
 
-#: classes/pref/users.php:265
+#: classes/pref/users.php:264
 #, php-format
 msgid "Changed password of user <b>%s</b> to <b>%s</b>"
 msgstr "ユーザー <b>%s</b> のパスワードを <b>%s</b> に変更しました"
 
-#: classes/pref/users.php:267
+#: classes/pref/users.php:266
 #, php-format
 msgid "Sending new password of user <b>%s</b> to <b>%s</b>"
 msgstr "ユーザー <b>%s</b> の新しいパスワードを <b>%s</b> に送信しています"
 
-#: classes/pref/users.php:291
+#: classes/pref/users.php:290
 msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] パスワード変更通知"
 
-#: classes/pref/users.php:324
-#: classes/pref/feeds.php:1333
-#: classes/pref/filters.php:740
-#: classes/feeds.php:1125
-#: classes/feeds.php:1191
-#: js/tt-rss.js:165
-msgid "Search"
-msgstr "検索"
-
-#: classes/pref/users.php:342
+#: classes/pref/users.php:341
 msgid "Create user"
 msgstr "ユーザーの作成"
 
-#: classes/pref/users.php:346
-#: classes/pref/filters.php:759
-#: plugins/instances/init.php:293
-msgid "Edit"
-msgstr "編集"
-
-#: classes/pref/users.php:397
+#: classes/pref/users.php:396
 #: classes/pref/feeds.php:643
-#: classes/pref/feeds.php:882
-#: classes/pref/feeds.php:1836
-#: classes/feeds.php:1079
+#: classes/pref/feeds.php:870
+#: classes/pref/feeds.php:1810
+#: classes/feeds.php:1072
 msgid "Login"
 msgstr "ログイン"
 
-#: classes/pref/users.php:398
+#: classes/pref/users.php:397
 msgid "Access Level"
 msgstr "アクセスレベル"
 
-#: classes/pref/users.php:401
+#: classes/pref/users.php:400
 msgid "Last login"
 msgstr "最終ログイン"
 
-#: classes/pref/users.php:420
-#: plugins/instances/init.php:334
+#: classes/pref/users.php:419
 msgid "Click to edit"
 msgstr "編集するにはクリック"
 
-#: classes/pref/users.php:441
+#: classes/pref/users.php:440
 msgid "No users defined."
 msgstr "ユーザーが定義されていません。"
 
-#: classes/pref/users.php:443
+#: classes/pref/users.php:442
 msgid "No matching users found."
 msgstr "ユーザーが見つかりません。"
 
-#: classes/pref/system.php:29
-msgid "Error Log"
-msgstr "エラーログ"
-
-#: classes/pref/system.php:40
-msgid "Refresh"
-msgstr "再描画"
-
-#: classes/pref/system.php:43
-msgid "Clear log"
-msgstr "ログの消去"
-
-#: classes/pref/system.php:48
-msgid "Error"
-msgstr "エラー"
-
-#: classes/pref/system.php:49
-msgid "Filename"
-msgstr "ファイル名"
-
-#: classes/pref/system.php:50
-msgid "Message"
-msgstr "メッセージ"
-
-#: classes/pref/system.php:52
-msgid "Date"
-msgstr "日付"
-
-#: classes/pref/feeds.php:15
-msgid "Check to enable field"
-msgstr "有効にするフィールドにチェック"
-
-#: classes/pref/feeds.php:65
-#: classes/pref/feeds.php:214
-#: classes/pref/feeds.php:258
-#: classes/pref/feeds.php:264
-#: classes/pref/feeds.php:290
-#, fuzzy, php-format
-msgid "(%d feed)"
-msgid_plural "(%d feeds)"
-msgstr[0] "フィードを編集する"
-
-#: classes/pref/feeds.php:537
 #: classes/pref/prefs.php:18
+#: classes/pref/feeds.php:537
 msgid "General"
 msgstr "全体"
 
-#: classes/pref/feeds.php:561
-msgid "Feed Title"
-msgstr "フィードの題名"
-
-#: classes/pref/feeds.php:595
-#: classes/pref/feeds.php:830
-#: classes/pref/feeds.php:1822
-#: classes/feeds.php:1055
-msgid "Place in category:"
-msgstr "カテゴリーの場所:"
-
-#: classes/pref/feeds.php:608
-#: classes/pref/feeds.php:844
-#, fuzzy
-msgid "Language:"
-msgstr "言語"
-
-#: classes/pref/feeds.php:615
-#: classes/pref/feeds.php:853
-msgid "Update"
-msgstr "更新"
-
-#: classes/pref/feeds.php:630
-#: classes/pref/feeds.php:869
-msgid "Article purging:"
-msgstr "記事の削除:"
-
-#: classes/pref/feeds.php:658
-#: classes/pref/feeds.php:890
-#: classes/pref/feeds.php:1839
-#: classes/pref/prefs.php:245
-#: classes/feeds.php:1083
-msgid "Password"
-msgstr "パスワード"
-
-#: classes/pref/feeds.php:662
-msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
-msgstr "<b>ヒント:</b> Twitter フィード以外でもしフィードが認証を要求するなら、ログイン情報を入力する必要があります。"
-
-#: classes/pref/feeds.php:681
-#: classes/pref/feeds.php:900
-msgid "Hide from Popular feeds"
-msgstr "人気のあるフィードから隠す"
-
-#: classes/pref/feeds.php:693
-#: classes/pref/feeds.php:906
-msgid "Include in e-mail digest"
-msgstr "電子メールダイジェストに含む"
-
-#: classes/pref/feeds.php:706
-#: classes/pref/feeds.php:912
-msgid "Always display image attachments"
-msgstr "常に添付画像を表示する"
-
-#: classes/pref/feeds.php:719
-#: classes/pref/feeds.php:920
-msgid "Do not embed images"
-msgstr "画像を埋め込まない"
-
-#: classes/pref/feeds.php:732
-#: classes/pref/feeds.php:928
-msgid "Cache media"
-msgstr ""
-
-#: classes/pref/feeds.php:744
-#: classes/pref/feeds.php:934
-msgid "Mark updated articles as unread"
-msgstr "更新された記事を既読にする"
-
-#: classes/pref/feeds.php:748
-msgid "Icon"
-msgstr "アイコン"
-
-#: classes/pref/feeds.php:765
-msgid "Replace"
-msgstr "置き換え"
-
-#: classes/pref/feeds.php:772
-#: classes/pref/prefs.php:698
-msgid "Plugins"
-msgstr "プラグイン"
-
-#: classes/pref/feeds.php:792
-msgid "Resubscribe to push updates"
-msgstr "プッシュ更新の再購読"
-
-#: classes/pref/feeds.php:799
-msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
-msgstr "プッシュ対応フィードについて PubSubHubbub の購読状態をリセットする。"
-
-#: classes/pref/feeds.php:1200
-#: classes/pref/feeds.php:1253
-msgid "All done."
-msgstr "すべて終了しました。"
-
-#: classes/pref/feeds.php:1308
-msgid "Feeds with errors"
-msgstr "エラーのあったフィード"
-
-#: classes/pref/feeds.php:1315
-msgid "Inactive feeds"
-msgstr "活発でないフィード"
-
-#: classes/pref/feeds.php:1351
-msgid "Edit selected feeds"
-msgstr "選択したフィードを編集"
-
-#: classes/pref/feeds.php:1353
-#: classes/pref/feeds.php:1367
-#: classes/pref/filters.php:762
-msgid "Reset sort order"
-msgstr "ソート順のリセット"
-
-#: classes/pref/feeds.php:1355
-#: js/prefs.js:1622
-msgid "Batch subscribe"
-msgstr "一括購読"
-
-#: classes/pref/feeds.php:1362
-msgid "Categories"
-msgstr "カテゴリー"
-
-#: classes/pref/feeds.php:1365
-msgid "Add category"
-msgstr "カテゴリーを追加"
-
-#: classes/pref/feeds.php:1369
-msgid "Remove selected"
-msgstr "選択したカテゴリーを削除"
-
-#: classes/pref/feeds.php:1380
-msgid "More actions..."
-msgstr "操作..."
-
-#: classes/pref/feeds.php:1384
-msgid "Manual purge"
-msgstr "手動削除"
-
-#: classes/pref/feeds.php:1388
-msgid "Clear feed data"
-msgstr "フィードデータの消去"
-
-#: classes/pref/feeds.php:1389
-#: classes/pref/filters.php:770
-msgid "Rescore articles"
-msgstr "記事のスコアの再集計"
-
-#: classes/pref/feeds.php:1442
-msgid "OPML"
-msgstr "OPML"
-
-#: classes/pref/feeds.php:1444
-msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
-msgstr "OPML を使うことで、フィード、フィルター、ラベル、Tiny Tiny RSS の設定をエクスポート、インポートできます。"
-
-#: classes/pref/feeds.php:1445
-msgid "Only main settings profile can be migrated using OPML."
-msgstr "OPML を使って移行できるのはメインの設定プロファイルのみです。"
-
-#: classes/pref/feeds.php:1458
-msgid "Import my OPML"
-msgstr "OPML インポート"
-
-#: classes/pref/feeds.php:1464
-msgid "Filename:"
-msgstr "ファイル名:"
-
-#: classes/pref/feeds.php:1466
-msgid "Include settings"
-msgstr "設定を含める"
-
-#: classes/pref/feeds.php:1470
-msgid "Export OPML"
-msgstr "OPML エクスポート"
-
-#: classes/pref/feeds.php:1474
-msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
-msgstr "あなたの OPML は公に公開でき、以下の URL を知っている人であれば誰でも購読できます。"
-
-#: classes/pref/feeds.php:1478
-msgid "Public OPML URL"
-msgstr "公開 OPML URL"
-
-#: classes/pref/feeds.php:1479
-msgid "Display published OPML URL"
-msgstr "公開 OPML URL を表示"
-
-#: classes/pref/feeds.php:1488
-msgid "Firefox integration"
-msgstr "Firefox 統合"
-
-#: classes/pref/feeds.php:1490
-msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
-msgstr "下のリンクをクリックすることで、Firefox のフィードリーダーとしてこの Tiny Tiny RSS のサイトを使うことができます。"
-
-#: classes/pref/feeds.php:1497
-msgid "Click here to register this site as a feed reader."
-msgstr "クリックするとフィードリーダーとしてこのサイトを登録します。"
-
-#: classes/pref/feeds.php:1505
-msgid "Published & shared articles / Generated feeds"
-msgstr "公開・共有した記事 / 生成したフィード"
-
-#: classes/pref/feeds.php:1507
-msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
-msgstr "公開した記事は公開 RSS フィードとしてエクスポートされ、以下の URL を知っている人であれば誰でも購読できます。"
-
-#: classes/pref/feeds.php:1514
-#: classes/feeds.php:54
-#: classes/feeds.php:140
-msgid "View as RSS"
-msgstr "RSS として閲覧する"
-
-#: classes/pref/feeds.php:1515
-msgid "Display URL"
-msgstr "URL の表示"
-
-#: classes/pref/feeds.php:1518
-msgid "Clear all generated URLs"
-msgstr "生成された URL をすべて消去する"
-
-#: classes/pref/feeds.php:1596
-msgid "These feeds have not been updated with new content for 3 months (oldest first):"
-msgstr "3 ヶ月間更新されていないフィード(古いもの順):"
-
-#: classes/pref/feeds.php:1630
-#: classes/pref/feeds.php:1694
-msgid "Click to edit feed"
-msgstr "編集するにはクリック"
-
-#: classes/pref/feeds.php:1648
-#: classes/pref/feeds.php:1714
-msgid "Unsubscribe from selected feeds"
-msgstr "選択したフィードの購読をやめる"
-
-#: classes/pref/feeds.php:1819
-msgid "Add one valid RSS feed per line (no feed detection is done)"
-msgstr "1 行に 1 フィードずつ有効な RSS フィードを追加(フィードの自動検出は行われません)"
-
-#: classes/pref/feeds.php:1828
-msgid "Feeds to subscribe, One per line"
-msgstr "購読するフィード(1 行 1 フィード)"
-
-#: classes/pref/feeds.php:1851
-msgid "Feeds require authentication."
-msgstr "このフィードは認証を要求します。"
-
-#: classes/pref/feeds.php:1858
-#: classes/feeds.php:1099
-#: classes/feeds.php:1153
-msgid "Subscribe"
-msgstr "購読"
-
-#: classes/pref/filters.php:151
-#, fuzzy
-msgid "Preview article"
-msgstr "新しい記事"
-
-#: classes/pref/filters.php:239
-#: classes/pref/filters.php:518
-msgid "(inverse)"
-msgstr "(反転)"
-
-#: classes/pref/filters.php:235
-#: classes/pref/filters.php:517
-#, php-format
-msgid "%s on %s in %s %s"
-msgstr "「%3$s」の %2$s に対して %1$s %4$s"
-
-#: classes/pref/filters.php:354
-#: classes/pref/filters.php:827
-#: classes/pref/filters.php:942
-msgid "Match"
-msgstr "一致"
-
-#: classes/pref/filters.php:368
-#: classes/pref/filters.php:416
-#: classes/pref/filters.php:841
-#: classes/pref/filters.php:868
-msgid "Add"
-msgstr "追加"
-
-#: classes/pref/filters.php:371
-#: classes/pref/filters.php:419
-#: classes/pref/filters.php:844
-#: classes/pref/filters.php:871
-#: classes/feeds.php:122
-msgid "Delete"
-msgstr "削除"
-
-#: classes/pref/filters.php:402
-#: classes/pref/filters.php:854
-msgid "Apply actions"
-msgstr "適用する操作"
-
-#: classes/pref/filters.php:452
-#: classes/pref/filters.php:883
-msgid "Enabled"
-msgstr "有効にする"
-
-#: classes/pref/filters.php:461
-#: classes/pref/filters.php:886
-msgid "Match any rule"
-msgstr "いずれかのルールに一致"
-
-#: classes/pref/filters.php:470
-#: classes/pref/filters.php:889
-msgid "Inverse matching"
-msgstr "一致結果の反転"
-
-#: classes/pref/filters.php:482
-#: classes/pref/filters.php:896
-msgid "Test"
-msgstr "テスト"
-
-#: classes/pref/filters.php:756
-msgid "Combine"
-msgstr "組み合わせ"
-
-#: classes/pref/filters.php:899
-msgid "Create"
-msgstr "作成"
-
-#: classes/pref/filters.php:954
-msgid "Inverse regular expression matching"
-msgstr "正規表現の一致結果を反転する"
-
-#: classes/pref/filters.php:956
-msgid "on field"
-msgstr "対象項目"
-
-#: classes/pref/filters.php:962
-#: js/PrefFilterTree.js:64
-msgid "in"
-msgstr "フィード"
-
-#: classes/pref/filters.php:975
-#, fuzzy
-msgid "Wiki: Filters"
-msgstr "フィルター"
-
-#: classes/pref/filters.php:980
-msgid "Save rule"
-msgstr "ルールの保存"
-
-#: classes/pref/filters.php:980
-#: js/functions.js:865
-msgid "Add rule"
-msgstr "ルールの追加"
-
-#: classes/pref/filters.php:1003
-msgid "Perform Action"
-msgstr "操作の実行"
-
-#: classes/pref/filters.php:1054
-#, fuzzy
-msgid "No actions available"
-msgstr "新しいバージョンが利用できます!"
-
-#: classes/pref/filters.php:1073
-msgid "Save action"
-msgstr "操作の保存"
-
-#: classes/pref/filters.php:1073
-#: js/functions.js:887
-msgid "Add action"
-msgstr "操作の追加"
-
-#: classes/pref/filters.php:1097
-msgid "[No caption]"
-msgstr "[キャプションなし]"
-
-#: classes/pref/filters.php:1099
-#, fuzzy, php-format
-msgid "%s (%d rule)"
-msgid_plural "%s (%d rules)"
-msgstr[0] "ルールの追加"
-
-#: classes/pref/filters.php:1114
-#, fuzzy
-msgid "matches any rule"
-msgstr "いずれかのルールに一致"
-
-#: classes/pref/filters.php:1117
-#, fuzzy, php-format
-msgid "%s (+%d action)"
-msgid_plural "%s (+%d actions)"
-msgstr[0] "操作の追加"
-
 #: classes/pref/prefs.php:19
 msgid "Interface"
 msgstr "インターフェース"
@@ -2047,7 +1649,7 @@ msgid "Strip all but most common HTML tags when reading articles."
 msgstr "記事を読み込む際、最も一般的な HTML タグ以外を除去する。"
 
 #: classes/pref/prefs.php:53
-#: js/prefs.js:1584
+#: js/prefs.js:1580
 msgid "Customize stylesheet"
 msgstr "スタイルシートのカスタマイズ"
 
@@ -2115,6 +1717,14 @@ msgstr "アクセスレベル"
 msgid "Save data"
 msgstr "保存"
 
+#: classes/pref/prefs.php:245
+#: classes/pref/feeds.php:658
+#: classes/pref/feeds.php:878
+#: classes/pref/feeds.php:1813
+#: classes/feeds.php:1076
+msgid "Password"
+msgstr "パスワード"
+
 #: classes/pref/prefs.php:254
 msgid "Your password is at default value, please change it."
 msgstr "パスワードが標準のままです。変更してください。"
@@ -2213,18 +1823,23 @@ msgstr "プロファイルを管理する"
 msgid "Reset to defaults"
 msgstr "標準に戻す"
 
+#: classes/pref/prefs.php:698
+#: classes/pref/feeds.php:772
+msgid "Plugins"
+msgstr "プラグイン"
+
 #: classes/pref/prefs.php:700
 msgid "You will need to reload Tiny Tiny RSS for plugin changes to take effect."
 msgstr "プラグインの変更を反映するためには Tiny Tiny RSS を再読み込みする必要があります。"
 
-#: classes/pref/prefs.php:702
-msgid "Download more plugins at tt-rss.org <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forums</a> or <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a>."
-msgstr "tt-rss.org の <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forums</a> か <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a> で他のプラグインをダウンロードできます。"
-
-#: classes/pref/prefs.php:732
+#: classes/pref/prefs.php:730
 msgid "System plugins"
 msgstr "システムプラグイン"
 
+#: classes/pref/prefs.php:731
+msgid "System plugins are enabled in <strong>config.php</strong> for all users."
+msgstr ""
+
 #: classes/pref/prefs.php:736
 #: classes/pref/prefs.php:792
 msgid "Plugin"
@@ -2294,6 +1909,339 @@ msgstr "選択したプロファイルを削除しますか"
 msgid "Activate profile"
 msgstr "プロファイルを有効にする"
 
+#: classes/pref/feeds.php:15
+msgid "Check to enable field"
+msgstr "有効にするフィールドにチェック"
+
+#: classes/pref/feeds.php:65
+#: classes/pref/feeds.php:214
+#: classes/pref/feeds.php:258
+#: classes/pref/feeds.php:264
+#: classes/pref/feeds.php:290
+#, fuzzy, php-format
+msgid "(%d feed)"
+msgid_plural "(%d feeds)"
+msgstr[0] "フィードを編集する"
+
+#: classes/pref/feeds.php:561
+msgid "Feed Title"
+msgstr "フィードの題名"
+
+#: classes/pref/feeds.php:595
+#: classes/pref/feeds.php:818
+#: classes/pref/feeds.php:1796
+#: classes/feeds.php:1048
+msgid "Place in category:"
+msgstr "カテゴリーの場所:"
+
+#: classes/pref/feeds.php:608
+#: classes/pref/feeds.php:832
+#, fuzzy
+msgid "Language:"
+msgstr "言語"
+
+#: classes/pref/feeds.php:615
+#: classes/pref/feeds.php:841
+msgid "Update"
+msgstr "更新"
+
+#: classes/pref/feeds.php:630
+#: classes/pref/feeds.php:857
+msgid "Article purging:"
+msgstr "記事の削除:"
+
+#: classes/pref/feeds.php:662
+msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
+msgstr "<b>ヒント:</b> Twitter フィード以外でもしフィードが認証を要求するなら、ログイン情報を入力する必要があります。"
+
+#: classes/pref/feeds.php:681
+#: classes/pref/feeds.php:888
+msgid "Hide from Popular feeds"
+msgstr "人気のあるフィードから隠す"
+
+#: classes/pref/feeds.php:693
+#: classes/pref/feeds.php:894
+msgid "Include in e-mail digest"
+msgstr "電子メールダイジェストに含む"
+
+#: classes/pref/feeds.php:706
+#: classes/pref/feeds.php:900
+msgid "Always display image attachments"
+msgstr "常に添付画像を表示する"
+
+#: classes/pref/feeds.php:719
+#: classes/pref/feeds.php:908
+msgid "Do not embed images"
+msgstr "画像を埋め込まない"
+
+#: classes/pref/feeds.php:732
+#: classes/pref/feeds.php:916
+msgid "Cache media"
+msgstr ""
+
+#: classes/pref/feeds.php:744
+#: classes/pref/feeds.php:922
+msgid "Mark updated articles as unread"
+msgstr "更新された記事を既読にする"
+
+#: classes/pref/feeds.php:748
+msgid "Icon"
+msgstr "アイコン"
+
+#: classes/pref/feeds.php:765
+msgid "Replace"
+msgstr "置き換え"
+
+#: classes/pref/feeds.php:1174
+#: classes/pref/feeds.php:1227
+msgid "All done."
+msgstr "すべて終了しました。"
+
+#: classes/pref/feeds.php:1282
+msgid "Feeds with errors"
+msgstr "エラーのあったフィード"
+
+#: classes/pref/feeds.php:1289
+msgid "Inactive feeds"
+msgstr "活発でないフィード"
+
+#: classes/pref/feeds.php:1325
+msgid "Edit selected feeds"
+msgstr "選択したフィードを編集"
+
+#: classes/pref/feeds.php:1329
+#: js/prefs.js:1618
+msgid "Batch subscribe"
+msgstr "一括購読"
+
+#: classes/pref/feeds.php:1336
+msgid "Categories"
+msgstr "カテゴリー"
+
+#: classes/pref/feeds.php:1339
+msgid "Add category"
+msgstr "カテゴリーを追加"
+
+#: classes/pref/feeds.php:1343
+msgid "Remove selected"
+msgstr "選択したカテゴリーを削除"
+
+#: classes/pref/feeds.php:1354
+msgid "More actions..."
+msgstr "操作..."
+
+#: classes/pref/feeds.php:1358
+msgid "Manual purge"
+msgstr "手動削除"
+
+#: classes/pref/feeds.php:1362
+msgid "Clear feed data"
+msgstr "フィードデータの消去"
+
+#: classes/pref/feeds.php:1416
+msgid "OPML"
+msgstr "OPML"
+
+#: classes/pref/feeds.php:1418
+msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
+msgstr "OPML を使うことで、フィード、フィルター、ラベル、Tiny Tiny RSS の設定をエクスポート、インポートできます。"
+
+#: classes/pref/feeds.php:1419
+msgid "Only main settings profile can be migrated using OPML."
+msgstr "OPML を使って移行できるのはメインの設定プロファイルのみです。"
+
+#: classes/pref/feeds.php:1432
+msgid "Import my OPML"
+msgstr "OPML インポート"
+
+#: classes/pref/feeds.php:1438
+msgid "Filename:"
+msgstr "ファイル名:"
+
+#: classes/pref/feeds.php:1440
+msgid "Include settings"
+msgstr "設定を含める"
+
+#: classes/pref/feeds.php:1444
+msgid "Export OPML"
+msgstr "OPML エクスポート"
+
+#: classes/pref/feeds.php:1448
+msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
+msgstr "あなたの OPML は公に公開でき、以下の URL を知っている人であれば誰でも購読できます。"
+
+#: classes/pref/feeds.php:1452
+msgid "Public OPML URL"
+msgstr "公開 OPML URL"
+
+#: classes/pref/feeds.php:1453
+msgid "Display published OPML URL"
+msgstr "公開 OPML URL を表示"
+
+#: classes/pref/feeds.php:1462
+msgid "Firefox integration"
+msgstr "Firefox 統合"
+
+#: classes/pref/feeds.php:1464
+msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
+msgstr "下のリンクをクリックすることで、Firefox のフィードリーダーとしてこの Tiny Tiny RSS のサイトを使うことができます。"
+
+#: classes/pref/feeds.php:1471
+msgid "Click here to register this site as a feed reader."
+msgstr "クリックするとフィードリーダーとしてこのサイトを登録します。"
+
+#: classes/pref/feeds.php:1479
+msgid "Published & shared articles / Generated feeds"
+msgstr "公開・共有した記事 / 生成したフィード"
+
+#: classes/pref/feeds.php:1481
+msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
+msgstr "公開した記事は公開 RSS フィードとしてエクスポートされ、以下の URL を知っている人であれば誰でも購読できます。"
+
+#: classes/pref/feeds.php:1488
+#: classes/feeds.php:54
+#: classes/feeds.php:140
+msgid "View as RSS"
+msgstr "RSS として閲覧する"
+
+#: classes/pref/feeds.php:1489
+msgid "Display URL"
+msgstr "URL の表示"
+
+#: classes/pref/feeds.php:1492
+msgid "Clear all generated URLs"
+msgstr "生成された URL をすべて消去する"
+
+#: classes/pref/feeds.php:1570
+msgid "These feeds have not been updated with new content for 3 months (oldest first):"
+msgstr "3 ヶ月間更新されていないフィード(古いもの順):"
+
+#: classes/pref/feeds.php:1604
+#: classes/pref/feeds.php:1668
+msgid "Click to edit feed"
+msgstr "編集するにはクリック"
+
+#: classes/pref/feeds.php:1622
+#: classes/pref/feeds.php:1688
+msgid "Unsubscribe from selected feeds"
+msgstr "選択したフィードの購読をやめる"
+
+#: classes/pref/feeds.php:1793
+msgid "Add one valid RSS feed per line (no feed detection is done)"
+msgstr "1 行に 1 フィードずつ有効な RSS フィードを追加(フィードの自動検出は行われません)"
+
+#: classes/pref/feeds.php:1802
+msgid "Feeds to subscribe, One per line"
+msgstr "購読するフィード(1 行 1 フィード)"
+
+#: classes/pref/feeds.php:1825
+msgid "Feeds require authentication."
+msgstr "このフィードは認証を要求します。"
+
+#: classes/pref/feeds.php:1832
+#: classes/feeds.php:1092
+#: classes/feeds.php:1146
+msgid "Subscribe"
+msgstr "購読"
+
+#: classes/pref/system.php:29
+msgid "Error Log"
+msgstr "エラーログ"
+
+#: classes/pref/system.php:40
+msgid "Refresh"
+msgstr "再描画"
+
+#: classes/pref/system.php:43
+msgid "Clear log"
+msgstr "ログの消去"
+
+#: classes/pref/system.php:48
+msgid "Error"
+msgstr "エラー"
+
+#: classes/pref/system.php:49
+msgid "Filename"
+msgstr "ファイル名"
+
+#: classes/pref/system.php:50
+msgid "Message"
+msgstr "メッセージ"
+
+#: classes/pref/system.php:52
+msgid "Date"
+msgstr "日付"
+
+#: classes/opml.php:28
+#: classes/opml.php:33
+msgid "OPML Utility"
+msgstr "OPML ユーティリティ"
+
+#: classes/opml.php:37
+msgid "Importing OPML..."
+msgstr "OPML のインポート中..."
+
+#: classes/opml.php:41
+msgid "Return to preferences"
+msgstr "設定に戻る"
+
+#: classes/opml.php:295
+#, php-format
+msgid "Adding feed: %s"
+msgstr "フィード追加: %s"
+
+#: classes/opml.php:306
+#, php-format
+msgid "Duplicate feed: %s"
+msgstr "重複したフィード: %s"
+
+#: classes/opml.php:320
+#, php-format
+msgid "Adding label %s"
+msgstr "ラベル %s の割り当て"
+
+#: classes/opml.php:323
+#, php-format
+msgid "Duplicate label: %s"
+msgstr "重複したラベル: %s"
+
+#: classes/opml.php:335
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr "%s を %s に設定"
+
+#: classes/opml.php:367
+msgid "Adding filter..."
+msgstr "フィルタを追加しています..."
+
+#: classes/opml.php:486
+#, php-format
+msgid "Processing category: %s"
+msgstr "処理中のカテゴリ: %s"
+
+#: classes/opml.php:532
+#, php-format
+msgid "Upload failed with error code %d"
+msgstr "エラーコード %d でアップロードが失敗しました"
+
+#: classes/opml.php:544
+#: plugins/import_export/init.php:448
+msgid "Unable to move uploaded file."
+msgstr "アップロードされたファイルを移動できません。"
+
+#: classes/opml.php:548
+#: plugins/import_export/init.php:452
+msgid "Error: please upload OPML file."
+msgstr "エラー: OPML ファイルをアップロードしてください。"
+
+#: classes/opml.php:559
+msgid "Error: unable to find moved OPML file."
+msgstr "エラー: 移動された OPML ファイルが見つかりません。"
+
+#: classes/opml.php:566
+msgid "Error while parsing document."
+msgstr "ドキュメントの解析中のエラーです。"
+
 #: classes/feeds.php:53
 msgid "View as RSS feed"
 msgstr "RSS フィードとして閲覧する"
@@ -2334,8 +2282,8 @@ msgstr "戻る"
 
 #: classes/feeds.php:127
 #: classes/feeds.php:132
-#: plugins/mail/init.php:75
 #: plugins/mailto/init.php:25
+#: plugins/mail/init.php:75
 msgid "Forward by email"
 msgstr "メールで転送する"
 
@@ -2343,319 +2291,146 @@ msgstr "メールで転送する"
 msgid "Feed:"
 msgstr "フィード:"
 
-#: classes/feeds.php:229
-#: classes/feeds.php:892
+#: classes/feeds.php:228
+#: classes/feeds.php:885
 msgid "Feed not found."
 msgstr "フィードが見つかりません。"
 
-#: classes/feeds.php:300
+#: classes/feeds.php:291
 msgid "Never"
 msgstr "未更新"
 
-#: classes/feeds.php:413
+#: classes/feeds.php:405
 #, php-format
 msgid "Imported at %s"
 msgstr "%s にインポート"
 
-#: classes/feeds.php:472
-#: classes/feeds.php:569
+#: classes/feeds.php:464
+#: classes/feeds.php:561
 #, fuzzy
 msgid "mark feed as read"
 msgstr "既読にする"
 
-#: classes/feeds.php:630
+#: classes/feeds.php:622
 msgid "Collapse article"
 msgstr "記事を閉じる"
 
-#: classes/feeds.php:791
+#: classes/feeds.php:784
 msgid "No unread articles found to display."
 msgstr "表示する未読記事が見つかりませんでした。"
 
-#: classes/feeds.php:794
+#: classes/feeds.php:787
 msgid "No updated articles found to display."
 msgstr "表示する更新された記事が見つかりませんでした。"
 
-#: classes/feeds.php:797
+#: classes/feeds.php:790
 msgid "No starred articles found to display."
 msgstr "表示するお気に入りの記事が見つかりませんでした。"
 
-#: classes/feeds.php:801
+#: classes/feeds.php:794
 msgid "No articles found to display. You can assign articles to labels manually from article header context menu (applies to all selected articles) or use a filter."
 msgstr "表示する記事が見つかりません。手動でラベルに記事を割り当てるか(上の操作メニューを参照します)、フィルターを使うことができます。"
 
-#: classes/feeds.php:803
+#: classes/feeds.php:796
 msgid "No articles found to display."
 msgstr "表示する記事が見つかりません。"
 
-#: classes/feeds.php:818
-#: classes/feeds.php:992
+#: classes/feeds.php:811
+#: classes/feeds.php:985
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "%s に最終更新されたフィード"
 
-#: classes/feeds.php:828
-#: classes/feeds.php:1002
+#: classes/feeds.php:821
+#: classes/feeds.php:995
 msgid "Some feeds have update errors (click for details)"
 msgstr "いくつかのフィードの更新エラーです (詳細はクリックしてください)"
 
-#: classes/feeds.php:982
+#: classes/feeds.php:975
 msgid "No feed selected."
 msgstr "フィードが選択されていません。"
 
-#: classes/feeds.php:1041
-#: classes/feeds.php:1049
+#: classes/feeds.php:1034
+#: classes/feeds.php:1042
 msgid "Feed or site URL"
 msgstr "フィードかサイトの URL"
 
-#: classes/feeds.php:1063
+#: classes/feeds.php:1056
 msgid "Available feeds"
 msgstr "利用可能なフィード"
 
-#: classes/feeds.php:1094
+#: classes/feeds.php:1087
 msgid "This feed requires authentication."
 msgstr "このフィードは認証を要求します。"
 
-#: classes/feeds.php:1102
+#: classes/feeds.php:1095
 msgid "More feeds"
 msgstr "さらなるフィード"
 
-#: classes/feeds.php:1129
+#: classes/feeds.php:1122
 msgid "Popular feeds"
 msgstr "人気のあるフィード"
 
-#: classes/feeds.php:1130
+#: classes/feeds.php:1123
 msgid "Feed archive"
 msgstr "フィード保管庫"
 
-#: classes/feeds.php:1133
+#: classes/feeds.php:1126
 msgid "limit:"
 msgstr "制限:"
 
-#: classes/feeds.php:1165
+#: classes/feeds.php:1158
 msgid "Look for"
 msgstr "検索"
 
-#: classes/feeds.php:1173
+#: classes/feeds.php:1166
 #, php-format
 msgid "in %s"
 msgstr ""
 
-#: classes/feeds.php:1178
+#: classes/feeds.php:1171
 msgid "Used for word stemming"
 msgstr ""
 
-#: classes/feeds.php:1187
+#: classes/feeds.php:1180
 #, fuzzy
 msgid "Search syntax"
 msgstr "検索"
 
-#: plugins/instances/init.php:141
-msgid "Linked"
-msgstr "リンクされたインスタンス"
-
-#: plugins/instances/init.php:204
-#: plugins/instances/init.php:395
-msgid "Instance"
-msgstr "インスタンス"
-
-#: plugins/instances/init.php:215
-#: plugins/instances/init.php:312
-#: plugins/instances/init.php:404
-msgid "Instance URL"
-msgstr "インスタンス URL"
-
-#: plugins/instances/init.php:226
-#: plugins/instances/init.php:414
-msgid "Access key:"
-msgstr "アクセスキー:"
-
-#: plugins/instances/init.php:229
-#: plugins/instances/init.php:313
-#: plugins/instances/init.php:417
-msgid "Access key"
-msgstr "アクセスキー"
-
-#: plugins/instances/init.php:233
-#: plugins/instances/init.php:421
-msgid "Use one access key for both linked instances."
-msgstr "リンクされたインスタンスの両方で同じアクセスキーを使用してください。"
-
-#: plugins/instances/init.php:241
-#: plugins/instances/init.php:429
-msgid "Generate new key"
-msgstr "新しいキーを生成する"
-
-#: plugins/instances/init.php:292
-msgid "Link instance"
-msgstr "インスタンスのリンク"
-
-#: plugins/instances/init.php:304
-msgid "You can connect other instances of Tiny Tiny RSS to this one to share Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
-msgstr "人気のあるフィードを共有するために Tiny Tiny RSS の別インスタンスとリンクすることができます。Tiny Tiny RSS のこのインスタンスとリンクするにはこの URL を使用して ください:"
-
-#: plugins/instances/init.php:314
-msgid "Last connected"
-msgstr "最終リンク"
-
-#: plugins/instances/init.php:315
-msgid "Status"
-msgstr "状態"
-
-#: plugins/instances/init.php:316
-msgid "Stored feeds"
-msgstr "保存されたフィード"
-
-#: plugins/instances/init.php:433
-msgid "Create link"
-msgstr "リンクの作成"
-
-#: plugins/nsfw/init.php:30
-#: plugins/nsfw/init.php:42
-msgid "Not work safe (click to toggle)"
-msgstr "職場閲覧不適切 (クリックで切り替え)"
-
-#: plugins/nsfw/init.php:52
-msgid "NSFW Plugin"
-msgstr "NSFW(Not suitable for work: 職場閲覧不適切) プラグイン"
-
-#: plugins/nsfw/init.php:79
-msgid "Tags to consider NSFW (comma-separated)"
-msgstr "職場で閲覧するのが不適切だとみなすタグ (カンマ区切り)"
-
-#: plugins/nsfw/init.php:100
-msgid "Configuration saved."
-msgstr "設定を保存しました。"
-
-#: plugins/note/init.php:26
-#: plugins/note/note.js:11
-msgid "Edit article note"
-msgstr "記事のノートを編集する"
-
-#: plugins/vf_shared/init.php:16
-#: plugins/vf_shared/init.php:69
-msgid "Shared articles"
-msgstr "共有した記事"
-
-#: plugins/auth_internal/init.php:65
-msgid "Please enter your one time password:"
-msgstr "ワンタイムパスワードを入力してください:"
-
-#: plugins/auth_internal/init.php:188
-msgid "Password has been changed."
-msgstr "パスワードを変更しました。"
-
-#: plugins/auth_internal/init.php:190
-msgid "Old password is incorrect."
-msgstr "古いパスワードが不正確です。"
-
-#: plugins/af_readability/init.php:21
-msgid "Data saved."
-msgstr ""
-
-#: plugins/af_readability/init.php:33
-#, fuzzy
-msgid "Inline content"
-msgstr "記事のノートを編集する"
-
-#: plugins/af_readability/init.php:39
-msgid "Readability settings (af_readability)"
-msgstr ""
-
-#: plugins/af_readability/init.php:66
-msgid "Use Readability for pages shared via bookmarklet."
-msgstr ""
-
-#: plugins/af_readability/init.php:78
-#: plugins/af_psql_trgm/init.php:191
-msgid "Currently enabled for (click to edit):"
-msgstr ""
-
-#: plugins/af_readability/init.php:95
-#, fuzzy
-msgid "Readability"
-msgstr "有効性の確認"
-
-#: plugins/af_readability/init.php:106
-#, fuzzy
-msgid "Inline article content"
-msgstr "記事のノートを編集する"
+#: classes/feeds.php:1596
+msgid "Starred articles"
+msgstr "お気に入りの記事"
 
-#: plugins/af_redditimgur/init.php:25
-msgid "Reddit content settings (af_redditimgur)"
-msgstr ""
+#: classes/feeds.php:1598
+msgid "Published articles"
+msgstr "公開済みの記事"
 
-#: plugins/af_redditimgur/init.php:50
-msgid "Uses Readability (full-text-rss) implementation by <a target='_blank' href='https://bitbucket.org/fivefilters/'>FiveFilters.org</a>"
-msgstr ""
+#: classes/feeds.php:1600
+msgid "Fresh articles"
+msgstr "新しい記事"
 
-#: plugins/af_redditimgur/init.php:54
-msgid "Extract missing content using Readability"
-msgstr ""
+#: classes/feeds.php:1604
+msgid "Archived articles"
+msgstr "保管された記事"
 
-#: plugins/af_redditimgur/init.php:59
-msgid "Enable additional duplicate checking"
-msgstr ""
+#: classes/feeds.php:1606
+msgid "Recently read"
+msgstr "最近読んだ"
 
-#: plugins/af_redditimgur/init.php:73
-#: plugins/af_zz_imgproxy/init.php:225
-#, fuzzy
-msgid "Configuration saved"
-msgstr "設定を保存しました。"
+#: classes/feeds.php:1716
+msgid "Special"
+msgstr "特別"
 
-#: plugins/af_psql_trgm/init.php:28
+#: classes/feeds.php:1962
 #, php-format
-msgid "Data saved (%s, %d)"
-msgstr ""
+msgid "Search results: %s"
+msgstr "検索結果: %s"
 
-#: plugins/af_psql_trgm/init.php:112
-#, fuzzy
-msgid "Show related articles"
+#: plugins/vf_shared/init.php:16
+#: plugins/vf_shared/init.php:60
+msgid "Shared articles"
 msgstr "共有した記事"
 
-#: plugins/af_psql_trgm/init.php:118
-#: plugins/af_psql_trgm/init.php:220
-#, fuzzy
-msgid "Mark similar articles as read"
-msgstr "すべての記事を既読にしますか?"
-
-#: plugins/af_psql_trgm/init.php:157
-msgid "PostgreSQL trigram extension returns string similarity as a floating point number (0-1). Setting it too low might produce false positives, zero disables checking."
-msgstr ""
-
-#: plugins/af_psql_trgm/init.php:160
-#, fuzzy
-msgid "Global settings"
-msgstr "設定を含める"
-
-#: plugins/af_psql_trgm/init.php:164
-msgid "Minimum similarity:"
-msgstr ""
-
-#: plugins/af_psql_trgm/init.php:169
-msgid "Minimum title length:"
-msgstr ""
-
-#: plugins/af_psql_trgm/init.php:174
-#, fuzzy
-msgid "Enable for all feeds:"
-msgstr "フィードカテゴリーを有効にする"
-
-#: plugins/af_psql_trgm/init.php:209
-msgid "Similarity (pg_trgm)"
-msgstr ""
-
-#: plugins/af_comics/init.php:40
-msgid "Feeds supported by af_comics"
-msgstr ""
-
-#: plugins/af_comics/init.php:42
-msgid "The following comics are currently supported:"
-msgstr ""
-
-#: plugins/af_comics/init.php:60
-msgid "GoComics requires a specific URL to workaround their lack of feed support: <code>http://feeds.feedburner.com/uclick/<em>comic_name</em></code> (e.g. <code>http://www.gocomics.com/garfield</code> uses <code>http://feeds.feedburner.com/uclick/garfield</code>)."
-msgstr ""
-
 #: plugins/import_export/init.php:58
 msgid "Import and export"
 msgstr "インポート・エクスポート"
@@ -2672,93 +2447,80 @@ msgstr "データのエクスポート"
 msgid "Import"
 msgstr "インポート"
 
-#: plugins/import_export/init.php:225
+#: plugins/import_export/init.php:231
 msgid "Could not import: incorrect schema version."
 msgstr "インポートできませんでした: スキーマのバージョンが不正です。"
 
-#: plugins/import_export/init.php:230
+#: plugins/import_export/init.php:236
 msgid "Could not import: unrecognized document format."
 msgstr "インポートできませんでした: フォーマットが認識できません。"
 
-#: plugins/import_export/init.php:391
+#: plugins/import_export/init.php:397
 msgid "Finished: "
 msgstr "完了: "
 
-#: plugins/import_export/init.php:392
+#: plugins/import_export/init.php:398
 #, php-format
 msgid "%d article processed, "
 msgid_plural "%d articles processed, "
 msgstr[0] "%d 件の記事を処理, "
 
-#: plugins/import_export/init.php:393
+#: plugins/import_export/init.php:399
 #, php-format
 msgid "%d imported, "
 msgid_plural "%d imported, "
 msgstr[0] "%d 件インポート済み, "
 
-#: plugins/import_export/init.php:394
+#: plugins/import_export/init.php:400
 #, php-format
 msgid "%d feed created."
 msgid_plural "%d feeds created."
 msgstr[0] "%d 件のフィードを作成。"
 
-#: plugins/import_export/init.php:399
+#: plugins/import_export/init.php:405
 msgid "Could not load XML document."
 msgstr "XML 文書を読み込めません。"
 
-#: plugins/import_export/init.php:411
+#: plugins/import_export/init.php:417
 msgid "Prepare data"
 msgstr "データの準備"
 
-#: plugins/import_export/init.php:428
+#: plugins/import_export/init.php:434
 #, fuzzy, php-format
 msgid "Upload failed with error code %d (%s)"
 msgstr "エラーコード %d でアップロードが失敗しました"
 
-#: plugins/import_export/init.php:454
+#: plugins/import_export/init.php:460
 msgid "No file uploaded."
 msgstr "ファイルがアップロードされていません。"
 
-#: plugins/mail/init.php:28
-msgid "Mail addresses saved."
-msgstr ""
-
-#: plugins/mail/init.php:34
-#, fuzzy
-msgid "Mail plugin"
-msgstr "ユーザープラグイン"
-
-#: plugins/mail/init.php:36
-msgid "You can set predefined email addressed here (comma-separated list):"
-msgstr ""
-
+#: plugins/mailto/init.php:48
+#: plugins/mailto/init.php:54
 #: plugins/mail/init.php:112
 #: plugins/mail/init.php:118
-#: plugins/mailto/init.php:49
-#: plugins/mailto/init.php:55
 msgid "[Forwarded]"
 msgstr "[Forwarded]"
 
+#: plugins/mailto/init.php:48
 #: plugins/mail/init.php:112
-#: plugins/mailto/init.php:49
 msgid "Multiple articles"
 msgstr "複数記事"
 
-#: plugins/mail/init.php:140
-msgid "To:"
-msgstr "To:"
+#: plugins/mailto/init.php:70
+msgid "Clicking the following link to invoke your mail client:"
+msgstr "以下のリンクをクリックするとメールクライアントが起動されます:"
 
-#: plugins/mail/init.php:155
-msgid "Subject:"
-msgstr "題名:"
+#: plugins/mailto/init.php:74
+msgid "Forward selected article(s) by email."
+msgstr "選択した記事を電子メールで転送する"
 
-#: plugins/mail/init.php:172
-msgid "Send e-mail"
-msgstr "電子メールを送信する"
+#: plugins/mailto/init.php:77
+msgid "You should be able to edit the message before sending in your mail client."
+msgstr "送信前にあなたの電子メールクライアントでメッセージの編集が可能です。"
 
-#: plugins/close_button/init.php:22
-msgid "Close article"
-msgstr "記事を閉じる"
+#: plugins/mailto/init.php:82
+msgid "Close this dialog"
+msgstr "このダイアログを閉じる"
 
 #: plugins/bookmarklets/init.php:20
 msgid "Bookmarklets"
@@ -2781,34 +2543,125 @@ msgstr "Tiny Tiny RSS で購読する"
 msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
 msgstr "Tiny Tiny RSS を使って任意のページを公開するためにこのブックマークレットを使ってください。"
 
+#: plugins/af_psql_trgm/init.php:28
+#, php-format
+msgid "Data saved (%s, %d)"
+msgstr ""
+
+#: plugins/af_psql_trgm/init.php:112
+#, fuzzy
+msgid "Show related articles"
+msgstr "共有した記事"
+
+#: plugins/af_psql_trgm/init.php:118
+#: plugins/af_psql_trgm/init.php:220
+#, fuzzy
+msgid "Mark similar articles as read"
+msgstr "すべての記事を既読にしますか?"
+
+#: plugins/af_psql_trgm/init.php:157
+msgid "PostgreSQL trigram extension returns string similarity as a floating point number (0-1). Setting it too low might produce false positives, zero disables checking."
+msgstr ""
+
+#: plugins/af_psql_trgm/init.php:160
+#, fuzzy
+msgid "Global settings"
+msgstr "設定を含める"
+
+#: plugins/af_psql_trgm/init.php:164
+msgid "Minimum similarity:"
+msgstr ""
+
+#: plugins/af_psql_trgm/init.php:169
+msgid "Minimum title length:"
+msgstr ""
+
+#: plugins/af_psql_trgm/init.php:174
+#, fuzzy
+msgid "Enable for all feeds:"
+msgstr "フィードカテゴリーを有効にする"
+
+#: plugins/af_psql_trgm/init.php:191
+#: plugins/af_readability/init.php:78
+msgid "Currently enabled for (click to edit):"
+msgstr ""
+
+#: plugins/af_psql_trgm/init.php:209
+msgid "Similarity (pg_trgm)"
+msgstr ""
+
+#: plugins/nsfw/init.php:30
+#: plugins/nsfw/init.php:42
+msgid "Not work safe (click to toggle)"
+msgstr "職場閲覧不適切 (クリックで切り替え)"
+
+#: plugins/nsfw/init.php:52
+msgid "NSFW Plugin"
+msgstr "NSFW(Not suitable for work: 職場閲覧不適切) プラグイン"
+
+#: plugins/nsfw/init.php:79
+msgid "Tags to consider NSFW (comma-separated)"
+msgstr "職場で閲覧するのが不適切だとみなすタグ (カンマ区切り)"
+
+#: plugins/nsfw/init.php:100
+msgid "Configuration saved."
+msgstr "設定を保存しました。"
+
 #: plugins/toggle_sidebar/init.php:23
 msgid "Collapse feedlist"
 msgstr "フィード一覧を閉じる"
 
-#: plugins/af_zz_imgproxy/init.php:186
-msgid "Image proxy settings (af_zz_imgproxy)"
+#: plugins/af_readability/init.php:21
+msgid "Data saved."
 msgstr ""
 
-#: plugins/af_zz_imgproxy/init.php:211
+#: plugins/af_readability/init.php:33
 #, fuzzy
-msgid "Enable proxy for all remote images."
-msgstr "フィードカテゴリーを有効にする"
+msgid "Inline content"
+msgstr "記事のノートを編集する"
 
-#: plugins/mailto/init.php:71
-msgid "Clicking the following link to invoke your mail client:"
-msgstr "以下のリンクをクリックするとメールクライアントが起動されます:"
+#: plugins/af_readability/init.php:39
+msgid "Readability settings (af_readability)"
+msgstr ""
 
-#: plugins/mailto/init.php:75
-msgid "Forward selected article(s) by email."
-msgstr "選択した記事を電子メールで転送する"
+#: plugins/af_readability/init.php:66
+msgid "Use Readability for pages shared via bookmarklet."
+msgstr ""
 
-#: plugins/mailto/init.php:78
-msgid "You should be able to edit the message before sending in your mail client."
-msgstr "送信前にあなたの電子メールクライアントでメッセージの編集が可能です。"
+#: plugins/af_readability/init.php:95
+#, fuzzy
+msgid "Readability"
+msgstr "有効性の確認"
 
-#: plugins/mailto/init.php:83
-msgid "Close this dialog"
-msgstr "このダイアログを閉じる"
+#: plugins/af_readability/init.php:106
+#, fuzzy
+msgid "Inline article content"
+msgstr "記事のノートを編集する"
+
+#: plugins/mail/init.php:28
+msgid "Mail addresses saved."
+msgstr ""
+
+#: plugins/mail/init.php:34
+#, fuzzy
+msgid "Mail plugin"
+msgstr "ユーザープラグイン"
+
+#: plugins/mail/init.php:36
+msgid "You can set predefined email addressed here (comma-separated list):"
+msgstr ""
+
+#: plugins/mail/init.php:140
+msgid "To:"
+msgstr "To:"
+
+#: plugins/mail/init.php:155
+msgid "Subject:"
+msgstr "題名:"
+
+#: plugins/mail/init.php:172
+msgid "Send e-mail"
+msgstr "電子メールを送信する"
 
 #: plugins/share/init.php:39
 msgid "You can disable all articles shared by unique URLs here."
@@ -2822,24 +2675,97 @@ msgstr "全ての記事のお気に入りを解除する"
 msgid "Share by URL"
 msgstr "URL で共有"
 
-#: plugins/share/init.php:97
+#: plugins/share/init.php:96
 msgid "You can share this article by the following unique URL:"
 msgstr "以下のユニーク URL によってこの記事を共有できます。"
 
-#: plugins/share/init.php:115
+#: plugins/share/init.php:114
 msgid "Unshare article"
 msgstr "記事の共有を解除"
 
+#: plugins/af_comics/init.php:48
+msgid "Feeds supported by af_comics"
+msgstr ""
+
+#: plugins/af_comics/init.php:50
+msgid "The following comics are currently supported:"
+msgstr ""
+
+#: plugins/af_comics/init.php:68
+msgid "GoComics requires a specific URL to workaround their lack of feed support: <code>http://feeds.feedburner.com/uclick/<em>comic_name</em></code> (e.g. <code>http://www.gocomics.com/garfield</code> uses <code>http://feeds.feedburner.com/uclick/garfield</code>)."
+msgstr ""
+
+#: plugins/af_comics/init.php:70
+msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:25
+msgid "Reddit content settings (af_redditimgur)"
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:50
+msgid "Uses Readability (full-text-rss) implementation by <a target='_blank' href='https://bitbucket.org/fivefilters/'>FiveFilters.org</a>"
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:54
+msgid "Extract missing content using Readability"
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:59
+msgid "Enable additional duplicate checking"
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:73
+#: plugins/af_zz_imgproxy/init.php:254
+#, fuzzy
+msgid "Configuration saved"
+msgstr "設定を保存しました。"
+
+#: plugins/note/init.php:26
+#: plugins/note/note.js:11
+msgid "Edit article note"
+msgstr "記事のノートを編集する"
+
+#: plugins/close_button/init.php:25
+msgid "Close article"
+msgstr "記事を閉じる"
+
+#: plugins/af_zz_imgproxy/init.php:210
+msgid "Image proxy settings (af_zz_imgproxy)"
+msgstr ""
+
+#: plugins/af_zz_imgproxy/init.php:234
+#, fuzzy
+msgid "Enable proxy for all remote images."
+msgstr "フィードカテゴリーを有効にする"
+
+#: plugins/af_zz_imgproxy/init.php:238
+#, fuzzy
+msgid "Don't cache files locally."
+msgstr "ローカルに画像をキャッシュする"
+
+#: plugins/auth_internal/init.php:65
+msgid "Please enter your one time password:"
+msgstr "ワンタイムパスワードを入力してください:"
+
+#: plugins/auth_internal/init.php:188
+msgid "Password has been changed."
+msgstr "パスワードを変更しました。"
+
+#: plugins/auth_internal/init.php:190
+msgid "Old password is incorrect."
+msgstr "古いパスワードが不正確です。"
+
 #: js/FeedTree.js:172
 #, fuzzy
 msgid "(Un)collapse"
 msgstr "サイドバーを開閉する"
 
-#: js/PrefFeedTree.js:52
+#: js/PrefFeedTree.js:54
 msgid "Edit category"
 msgstr "カテゴリーの編集"
 
-#: js/PrefFeedTree.js:59
+#: js/PrefFeedTree.js:61
 msgid "Remove category"
 msgstr "カテゴリーの削除"
 
@@ -2874,63 +2800,55 @@ msgid "Create Filter"
 msgstr "フィルターを作成する"
 
 #: js/functions.js:1128
-msgid "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification hub again on next feed update."
-msgstr "購読をリセットしますか?次回フィード更新時に Tiny Tiny RSS は通知ハブに対して再購読を試みます。"
-
-#: js/functions.js:1139
-msgid "Subscription reset."
-msgstr "購読がリセットされました。"
-
-#: js/functions.js:1149
-#: js/tt-rss.js:695
+#: js/tt-rss.js:696
 #, perl-format
 msgid "Unsubscribe from %s?"
 msgstr "%s の購読をやめますか?"
 
-#: js/functions.js:1152
+#: js/functions.js:1131
 msgid "Removing feed..."
 msgstr "フィードを削除しています..."
 
-#: js/functions.js:1225
+#: js/functions.js:1204
 msgid "Please enter category title:"
 msgstr "カテゴリーの題名を入力してください:"
 
-#: js/functions.js:1250
+#: js/functions.js:1229
 msgid "Generate new syndication address for this feed?"
 msgstr "このフィードに対して新しいシンジケートアドレスを生成しますか?"
 
-#: js/functions.js:1254
-#: js/prefs.js:1154
+#: js/functions.js:1233
+#: js/prefs.js:1150
 msgid "Trying to change address..."
 msgstr "アドレスの変更をしようとしています..."
 
-#: js/functions.js:1497
-#: js/functions.js:1606
+#: js/functions.js:1476
+#: js/functions.js:1585
 #: js/prefs.js:398
 #: js/prefs.js:424
 #: js/prefs.js:456
 #: js/prefs.js:599
 #: js/prefs.js:617
-#: js/prefs.js:1136
-#: js/prefs.js:1263
+#: js/prefs.js:1132
+#: js/prefs.js:1259
 msgid "No feeds are selected."
 msgstr "フィードが選択されていません。"
 
-#: js/functions.js:1540
+#: js/functions.js:1519
 msgid "Remove selected feeds from the archive? Feeds with stored articles will not be removed."
 msgstr "選択したフィードを保管庫から削除しますか?保存された記事があるフィードは削除されません。"
 
-#: js/functions.js:1577
+#: js/functions.js:1556
 msgid "Feeds with update errors"
 msgstr "更新エラーのあるフィード"
 
-#: js/functions.js:1588
-#: js/prefs.js:1117
+#: js/functions.js:1567
+#: js/prefs.js:1113
 msgid "Remove selected feeds?"
 msgstr "選択したフィードを削除しますか?"
 
-#: js/functions.js:1591
-#: js/prefs.js:1120
+#: js/functions.js:1570
+#: js/prefs.js:1116
 msgid "Removing selected feeds..."
 msgstr "選択したフィードを削除しています..."
 
@@ -2953,9 +2871,7 @@ msgstr "ユーザーエディター"
 #: js/prefs.js:100
 #: js/prefs.js:209
 #: js/prefs.js:706
-#: plugins/instances/instances.js:26
-#: plugins/instances/instances.js:89
-#: js/functions.js:1408
+#: js/functions.js:1387
 msgid "Saving data..."
 msgstr "データを保存しています..."
 
@@ -2980,7 +2896,7 @@ msgid "Removing selected labels..."
 msgstr "選択したラベルを削除しています..."
 
 #: js/prefs.js:308
-#: js/prefs.js:1304
+#: js/prefs.js:1300
 msgid "No labels are selected."
 msgstr "ラベルが選択されていません。"
 
@@ -3079,28 +2995,28 @@ msgstr "選択したフィードの変更を保存しますか?"
 msgid "OPML Import"
 msgstr "OPML インポート"
 
-#: js/prefs.js:764
+#: js/prefs.js:759
 msgid "Please choose an OPML file first."
 msgstr "はじめに OPML ファイルを選択してください。"
 
-#: js/prefs.js:767
+#: js/prefs.js:762
 #: plugins/import_export/import_export.js:115
 msgid "Importing, please wait..."
 msgstr "インポートしています。しばらくお待ちください..."
 
-#: js/prefs.js:928
+#: js/prefs.js:924
 msgid "Reset to defaults?"
 msgstr "標準に戻しますか?"
 
-#: js/prefs.js:1628
+#: js/prefs.js:1624
 msgid "Subscribing to feeds..."
 msgstr "フィードを購読しています..."
 
-#: js/prefs.js:1647
+#: js/prefs.js:1643
 msgid "Clear stored data for this plugin?"
 msgstr "このプラグイン用に保存されたデータを消去しますか?"
 
-#: js/prefs.js:1661
+#: js/prefs.js:1657
 msgid "Clear all messages in the error log?"
 msgstr "エラーログの全メッセージを消去しますか?"
 
@@ -3112,175 +3028,145 @@ msgstr "すべての記事を既読にしますか?"
 msgid "Marking all feeds as read..."
 msgstr "すべてのフィードを既読に設定しています..."
 
-#: js/tt-rss.js:401
+#: js/tt-rss.js:402
 msgid "Please enable mail plugin first."
 msgstr "はじめにメールプラグインを有効にしてください。"
 
-#: js/tt-rss.js:449
-#: js/functions.js:1387
-#: js/tt-rss.js:676
+#: js/tt-rss.js:450
+#: js/functions.js:1366
+#: js/tt-rss.js:677
 msgid "You can't edit this kind of feed."
 msgstr "この種類のフィードは編集できません。"
 
-#: js/tt-rss.js:530
+#: js/tt-rss.js:531
 msgid "Please enable embed_original plugin first."
 msgstr "はじめに embed_original プラグインを有効にしてください。"
 
-#: js/tt-rss.js:543
-#: js/tt-rss.js:726
+#: js/tt-rss.js:544
+#: js/tt-rss.js:727
 msgid "Widescreen is not available in combined mode."
 msgstr ""
 
-#: js/tt-rss.js:824
+#: js/tt-rss.js:825
 msgid "You can't rescore this kind of feed."
 msgstr "この種類のフィードはスコアを再計算できません。"
 
-#: js/tt-rss.js:829
-#: js/tt-rss.js:689
+#: js/tt-rss.js:830
+#: js/tt-rss.js:690
 msgid "Please select some feed first."
 msgstr "はじめにいくつかのフィードを選択してください。"
 
-#: js/tt-rss.js:834
+#: js/tt-rss.js:835
 #, perl-format
 msgid "Rescore articles in %s?"
 msgstr "%s の記事のスコアを再計算しますか?"
 
-#: js/tt-rss.js:837
+#: js/tt-rss.js:838
 msgid "Rescoring articles..."
 msgstr "記事のスコアを再計算しています..."
 
-#: js/viewfeed.js:919
-#: js/viewfeed.js:957
-#: js/viewfeed.js:1005
-#: js/viewfeed.js:1931
-#: plugins/mail/mail.js:7
+#: js/viewfeed.js:921
+#: js/viewfeed.js:959
+#: js/viewfeed.js:1007
+#: js/viewfeed.js:1933
 #: plugins/mailto/init.js:7
-#: js/viewfeed.js:677
-#: js/viewfeed.js:699
-#: js/viewfeed.js:720
-#: js/viewfeed.js:779
-#: js/viewfeed.js:807
+#: plugins/mail/mail.js:7
+#: js/viewfeed.js:679
+#: js/viewfeed.js:701
+#: js/viewfeed.js:722
+#: js/viewfeed.js:781
+#: js/viewfeed.js:809
 msgid "No articles are selected."
 msgstr "記事が選択されていません。"
 
-#: js/viewfeed.js:927
+#: js/viewfeed.js:929
 #, fuzzy, perl-format
 msgid "Delete %d selected article in %s?"
 msgid_plural "Delete %d selected articles in %s?"
 msgstr[0] "選択した「%s」の %d 件の記事を削除しますか?"
 
-#: js/viewfeed.js:929
+#: js/viewfeed.js:931
 #, perl-format
 msgid "Delete %d selected article?"
 msgid_plural "Delete %d selected articles?"
 msgstr[0] "選択した %d 件の記事を削除しますか?"
 
-#: js/viewfeed.js:966
+#: js/viewfeed.js:968
 #, fuzzy, perl-format
 msgid "Archive %d selected article in %s?"
 msgid_plural "Archive %d selected articles in %s?"
 msgstr[0] "選択した「%s」の %d 件の記事を保管しますか?"
 
-#: js/viewfeed.js:969
+#: js/viewfeed.js:971
 #, perl-format
 msgid "Move %d archived article back?"
 msgid_plural "Move %d archived articles back?"
 msgstr[0] "%d 件の保管された記事を元に戻しますか?"
 
-#: js/viewfeed.js:971
+#: js/viewfeed.js:973
 msgid "Please note that unstarred articles might get purged on next feed update."
 msgstr "お気に入りから外した記事は次回フィード更新時に削除されるかもしれない点に注意してください。"
 
-#: js/viewfeed.js:1011
+#: js/viewfeed.js:1013
 #, fuzzy, perl-format
 msgid "Mark %d selected article in %s as read?"
 msgid_plural "Mark %d selected articles in %s as read?"
 msgstr[0] "選択した「%s」の %d 件の記事を既読に設定しますか?"
 
-#: js/viewfeed.js:1031
+#: js/viewfeed.js:1033
 msgid "Edit article Tags"
 msgstr "記事のタグを編集"
 
-#: js/viewfeed.js:1037
+#: js/viewfeed.js:1039
 msgid "Saving article tags..."
 msgstr "記事のタグを保存しています..."
 
-#: js/viewfeed.js:1670
+#: js/viewfeed.js:1672
 msgid "Open original article"
 msgstr "元の記事内容を表示"
 
-#: js/viewfeed.js:1677
+#: js/viewfeed.js:1679
 msgid "Display article URL"
 msgstr "記事の URL を表示"
 
-#: js/viewfeed.js:1787
+#: js/viewfeed.js:1789
 msgid "Assign label"
 msgstr "ラベルの割り当て"
 
-#: js/viewfeed.js:1792
+#: js/viewfeed.js:1794
 msgid "Remove label"
 msgstr "ラベルの削除"
 
-#: js/viewfeed.js:1824
+#: js/viewfeed.js:1826
 #, fuzzy
 msgid "Select articles in group"
 msgstr "マウスカーソルの下の記事を選択する"
 
-#: js/viewfeed.js:1834
+#: js/viewfeed.js:1836
 #, fuzzy
 msgid "Mark group as read"
 msgstr "既読にする"
 
-#: js/viewfeed.js:1846
+#: js/viewfeed.js:1848
 #, fuzzy
 msgid "Mark feed as read"
 msgstr "すべてのフィードを既読に設定する"
 
-#: js/viewfeed.js:1899
+#: js/viewfeed.js:1901
 msgid "Please enter new score for selected articles:"
 msgstr "選択した記事の新しいスコアを入力してください:"
 
-#: js/viewfeed.js:1962
+#: js/viewfeed.js:1964
 msgid "Please enter new score for this article:"
 msgstr "この記事の新しいスコアを入力してください:"
 
-#: js/viewfeed.js:1993
+#: js/viewfeed.js:1995
 msgid "Article URL:"
 msgstr "記事の URL:"
 
-#: plugins/instances/instances.js:10
-msgid "Link Instance"
-msgstr "インスタンスのリンク"
-
-#: plugins/instances/instances.js:73
-msgid "Edit Instance"
-msgstr "インスタンスの編集"
-
-#: plugins/instances/instances.js:122
-msgid "Remove selected instances?"
-msgstr "選択したインスタンスを削除しますか?"
-
-#: plugins/instances/instances.js:125
-msgid "Removing selected instances..."
-msgstr "選択したインスタンスを削除しています..."
-
-#: plugins/instances/instances.js:139
-#: plugins/instances/instances.js:151
-msgid "No instances are selected."
-msgstr "インスタンスが選択されていません。"
-
-#: plugins/instances/instances.js:156
-msgid "Please select only one instance."
-msgstr "インスタンスをひとつだけ選択してください。"
-
-#: plugins/note/note.js:17
-msgid "Saving article note..."
-msgstr "記事のノートを保存しています..."
-
-#: plugins/af_psql_trgm/init.js:11
-#, fuzzy
-msgid "Related articles"
-msgstr "共有した記事"
+#: plugins/embed_original/init.js:6
+msgid "Sorry, your browser does not support sandboxed iframes."
+msgstr "あなたのブラウザはサンドボックス化された iframe をサポートしていません。"
 
 #: plugins/import_export/import_export.js:13
 msgid "Export Data"
@@ -3300,11 +3186,16 @@ msgstr "データのインポート"
 msgid "Please choose the file first."
 msgstr "はじめにファイルを選択してください。"
 
-#: plugins/mail/mail.js:21
 #: plugins/mailto/init.js:21
+#: plugins/mail/mail.js:21
 msgid "Forward article by email"
 msgstr "電子メールで記事を転送する"
 
+#: plugins/af_psql_trgm/init.js:11
+#, fuzzy
+msgid "Related articles"
+msgstr "共有した記事"
+
 #: plugins/mail/mail.js:36
 msgid "Error sending email:"
 msgstr ""
@@ -3314,10 +3205,6 @@ msgstr ""
 msgid "Your message has been sent."
 msgstr "個人データを変更しました。"
 
-#: plugins/embed_original/init.js:6
-msgid "Sorry, your browser does not support sandboxed iframes."
-msgstr "あなたのブラウザはサンドボックス化された iframe をサポートしていません。"
-
 #: plugins/shorten_expanded/init.js:39
 #, fuzzy
 msgid "Click to expand article"
@@ -3348,7 +3235,7 @@ msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr "この操作は過去に共有された記事の URL 全てを無効化します。続けますか?"
 
 #: plugins/share/share_prefs.js:6
-#: js/prefs.js:1437
+#: js/prefs.js:1433
 msgid "Clearing URLs..."
 msgstr "URL を消去しています..."
 
@@ -3356,23 +3243,44 @@ msgstr "URL を消去しています..."
 msgid "Shared URLs cleared."
 msgstr "共有された URL を消去しました。"
 
+#: plugins/note/note.js:17
+msgid "Saving article note..."
+msgstr "記事のノートを保存しています..."
+
 #: js/feedlist.js:429
-#: js/feedlist.js:496
 msgid "Mark all articles in %s as read?"
 msgstr "「%s」のすべての記事を既読に設定しますか?"
 
 #: js/feedlist.js:487
-msgid "Mark all articles in %s older than 1 day as read?"
+#, fuzzy
+msgid "Mark %w in %s older than 1 day as read?"
 msgstr "「%s」の 1 日以上前の記事を既読に設定しますか?"
 
 #: js/feedlist.js:490
-msgid "Mark all articles in %s older than 1 week as read?"
+#, fuzzy
+msgid "Mark %w in %s older than 1 week as read?"
 msgstr "「%s」の 1 週間以上前の記事を既読に設定しますか?"
 
 #: js/feedlist.js:493
-msgid "Mark all articles in %s older than 2 weeks as read?"
+#, fuzzy
+msgid "Mark %w in %s older than 2 weeks as read?"
 msgstr "「%s」の 2 週間以上前の記事を既読に設定しますか?"
 
+#: js/feedlist.js:496
+#, fuzzy
+msgid "Mark %w in %s as read?"
+msgstr "「%s」のすべての記事を既読に設定しますか?"
+
+#: js/feedlist.js:499
+#, fuzzy
+msgid "search results"
+msgstr "検索結果: %s"
+
+#: js/feedlist.js:499
+#, fuzzy
+msgid "all articles"
+msgstr "すべての記事"
+
 #: js/functions.js:506
 msgid "Error explained"
 msgstr "エラーの説明"
@@ -3453,176 +3361,245 @@ msgstr "このフィードは購読済みです。"
 msgid "Edit rule"
 msgstr "ルールの編集"
 
-#: js/functions.js:1402
+#: js/functions.js:1381
 msgid "Edit Feed"
 msgstr "フィードの編集"
 
-#: js/functions.js:1435
+#: js/functions.js:1414
 msgid "More Feeds"
 msgstr "さらなるフィード"
 
-#: js/functions.js:1631
+#: js/functions.js:1610
 msgid "Help"
 msgstr "ヘルプ"
 
-#: js/prefs.js:1032
+#: js/prefs.js:1028
 msgid "Remove category %s? Any nested feeds would be placed into Uncategorized."
 msgstr "カテゴリー %s を削除しますか?カテゴリー内のフィードは全てカテゴリー割り当てなしに配置されます。"
 
-#: js/prefs.js:1038
+#: js/prefs.js:1034
 msgid "Removing category..."
 msgstr "カテゴリーを削除しています..."
 
-#: js/prefs.js:1056
+#: js/prefs.js:1052
 msgid "Remove selected categories?"
 msgstr "選択したカテゴリーを削除しますか?"
 
-#: js/prefs.js:1059
+#: js/prefs.js:1055
 msgid "Removing selected categories..."
 msgstr "選択したカテゴリーを削除しています..."
 
-#: js/prefs.js:1072
+#: js/prefs.js:1068
 msgid "No categories are selected."
 msgstr "カテゴリーが選択されていません。"
 
-#: js/prefs.js:1079
+#: js/prefs.js:1075
 msgid "Category title:"
 msgstr "カテゴリーの題名:"
 
-#: js/prefs.js:1083
+#: js/prefs.js:1079
 msgid "Creating category..."
 msgstr "カテゴリーを作成しています..."
 
-#: js/prefs.js:1106
+#: js/prefs.js:1102
 msgid "Feeds without recent updates"
 msgstr "最近の更新がないフィード"
 
-#: js/prefs.js:1150
+#: js/prefs.js:1146
 msgid "Replace current OPML publishing address with a new one?"
 msgstr "新しいもので現在の OPML 公開アドレスを置き換えますか?"
 
-#: js/prefs.js:1227
+#: js/prefs.js:1223
 msgid "Clearing feed..."
 msgstr "フィードを消去しています..."
 
-#: js/prefs.js:1247
+#: js/prefs.js:1243
 msgid "Rescore articles in selected feeds?"
 msgstr "選択したフィードの記事のスコアを再計算しますか?"
 
-#: js/prefs.js:1250
+#: js/prefs.js:1246
 msgid "Rescoring selected feeds..."
 msgstr "選択したフィードのスコアを再計算しています..."
 
-#: js/prefs.js:1270
+#: js/prefs.js:1266
 msgid "Rescore all articles? This operation may take a lot of time."
 msgstr "全ての記事のスコアを再計算しますか?この操作には長い時間がかかるかもしません。"
 
-#: js/prefs.js:1273
+#: js/prefs.js:1269
 msgid "Rescoring feeds..."
 msgstr "フィードのスコアを再計算しています..."
 
-#: js/prefs.js:1289
+#: js/prefs.js:1285
 msgid "Reset selected labels to default colors?"
 msgstr "選択したラベルの色を標準にリセットしますか?"
 
-#: js/prefs.js:1321
+#: js/prefs.js:1317
 msgid "Settings Profiles"
 msgstr "設定プロファイル"
 
-#: js/prefs.js:1330
+#: js/prefs.js:1326
 msgid "Remove selected profiles? Active and default profiles will not be removed."
 msgstr "選択したプロファイルを削除しますか?現在のプロファイル、標準のプロファイルは削除されません。"
 
-#: js/prefs.js:1333
+#: js/prefs.js:1329
 msgid "Removing selected profiles..."
 msgstr "選択したプロファイルを削除しています..."
 
-#: js/prefs.js:1349
+#: js/prefs.js:1345
 msgid "No profiles are selected."
 msgstr "プロファイルが選択されていません。"
 
-#: js/prefs.js:1357
-#: js/prefs.js:1410
+#: js/prefs.js:1353
+#: js/prefs.js:1406
 msgid "Activate selected profile?"
 msgstr "選択したプロファイルを有効にしますか?"
 
-#: js/prefs.js:1374
-#: js/prefs.js:1426
+#: js/prefs.js:1370
+#: js/prefs.js:1422
 msgid "Please choose a profile to activate."
 msgstr "有効にするプロファイルを選択してください。"
 
-#: js/prefs.js:1379
+#: js/prefs.js:1375
 msgid "Creating profile..."
 msgstr "プロファイルを作成しています..."
 
-#: js/prefs.js:1434
+#: js/prefs.js:1430
 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr "この操作は過去に生成されたフィードの URL 全てを無効化します。続けますか?"
 
-#: js/prefs.js:1444
+#: js/prefs.js:1440
 msgid "Generated URLs cleared."
 msgstr "生成された URL を消去しました。"
 
-#: js/prefs.js:1516
+#: js/prefs.js:1512
 msgid "Label Editor"
 msgstr "ラベルエディター"
 
-#: js/tt-rss.js:684
+#: js/tt-rss.js:685
 msgid "You can't unsubscribe from the category."
 msgstr "カテゴリーから購読をやめることができません。"
 
-#: js/viewfeed.js:125
-#: js/viewfeed.js:175
-#: js/viewfeed.js:192
+#: js/viewfeed.js:127
+#: js/viewfeed.js:177
+#: js/viewfeed.js:194
 #, fuzzy
 msgid "Click to open next unread feed."
 msgstr "編集するにはクリック"
 
-#: js/viewfeed.js:129
+#: js/viewfeed.js:131
 msgid "Cancel search"
 msgstr "検索の取り消し"
 
-#: js/viewfeed.js:189
+#: js/viewfeed.js:191
 #, fuzzy
 msgid "New articles found, reload feed to continue."
 msgstr "表示する記事が見つかりません。"
 
-#: js/viewfeed.js:424
+#: js/viewfeed.js:426
 msgid "Unstar article"
 msgstr "記事のお気に入りを解除"
 
-#: js/viewfeed.js:428
+#: js/viewfeed.js:430
 msgid "Star article"
 msgstr "記事をお気に入りにする"
 
-#: js/viewfeed.js:478
+#: js/viewfeed.js:480
 msgid "Unpublish article"
 msgstr "記事の公開を解除"
 
-#: js/viewfeed.js:482
+#: js/viewfeed.js:484
 msgid "Publish article"
 msgstr "記事を公開"
 
-#: js/viewfeed.js:622
+#: js/viewfeed.js:624
 msgid "%d article selected"
 msgid_plural "%d articles selected"
 msgstr[0] "%d 件の記事を選択"
 
-#: js/viewfeed.js:1286
+#: js/viewfeed.js:1288
 msgid "No article is selected."
 msgstr "記事が選択されていません。"
 
-#: js/viewfeed.js:1321
+#: js/viewfeed.js:1323
 msgid "No articles found to mark"
 msgstr "記事が選択されていません。"
 
-#: js/viewfeed.js:1323
+#: js/viewfeed.js:1325
 msgid "Mark %d article as read?"
 msgid_plural "Mark %d articles as read?"
 msgstr[0] "%d 件の記事を既読として設定しますか?"
 
-#~ msgid "Cache images locally"
-#~ msgstr "ローカルに画像をキャッシュする"
+#~ msgid "Resubscribe to push updates"
+#~ msgstr "プッシュ更新の再購読"
+
+#~ msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
+#~ msgstr "プッシュ対応フィードについて PubSubHubbub の購読状態をリセットする。"
+
+#~ msgid "Download more plugins at tt-rss.org <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forums</a> or <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a>."
+#~ msgstr "tt-rss.org の <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forums</a> か <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a> で他のプラグインをダウンロードできます。"
+
+#~ msgid "Linked"
+#~ msgstr "リンクされたインスタンス"
+
+#~ msgid "Instance"
+#~ msgstr "インスタンス"
+
+#~ msgid "Instance URL"
+#~ msgstr "インスタンス URL"
+
+#~ msgid "Access key:"
+#~ msgstr "アクセスキー:"
+
+#~ msgid "Access key"
+#~ msgstr "アクセスキー"
+
+#~ msgid "Use one access key for both linked instances."
+#~ msgstr "リンクされたインスタンスの両方で同じアクセスキーを使用してください。"
+
+#~ msgid "Generate new key"
+#~ msgstr "新しいキーを生成する"
+
+#~ msgid "Link instance"
+#~ msgstr "インスタンスのリンク"
+
+#~ msgid "You can connect other instances of Tiny Tiny RSS to this one to share Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
+#~ msgstr "人気のあるフィードを共有するために Tiny Tiny RSS の別インスタンスとリンクすることができます。Tiny Tiny RSS のこのインスタンスとリンクするにはこの URL を使用して ください:"
+
+#~ msgid "Last connected"
+#~ msgstr "最終リンク"
+
+#~ msgid "Status"
+#~ msgstr "状態"
+
+#~ msgid "Stored feeds"
+#~ msgstr "保存されたフィード"
+
+#~ msgid "Create link"
+#~ msgstr "リンクの作成"
+
+#~ msgid "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification hub again on next feed update."
+#~ msgstr "購読をリセットしますか?次回フィード更新時に Tiny Tiny RSS は通知ハブに対して再購読を試みます。"
+
+#~ msgid "Subscription reset."
+#~ msgstr "購読がリセットされました。"
+
+#~ msgid "Link Instance"
+#~ msgstr "インスタンスのリンク"
+
+#~ msgid "Edit Instance"
+#~ msgstr "インスタンスの編集"
+
+#~ msgid "Remove selected instances?"
+#~ msgstr "選択したインスタンスを削除しますか?"
+
+#~ msgid "Removing selected instances..."
+#~ msgstr "選択したインスタンスを削除しています..."
+
+#~ msgid "No instances are selected."
+#~ msgstr "インスタンスが選択されていません。"
+
+#~ msgid "Please select only one instance."
+#~ msgstr "インスタンスをひとつだけ選択してください。"
 
 #~ msgid "The error will be reported to the configured log destination."
 #~ msgstr "設定されたログ出力先にエラーが出力されます。"
diff --git a/locale/ko_KR/LC_MESSAGES/messages.mo b/locale/ko_KR/LC_MESSAGES/messages.mo
index e5a5fff16..4d120a15e 100644
--- a/locale/ko_KR/LC_MESSAGES/messages.mo
+++ b/locale/ko_KR/LC_MESSAGES/messages.mo
diff --git a/locale/ko_KR/LC_MESSAGES/messages.po b/locale/ko_KR/LC_MESSAGES/messages.po
index 350d4bc58..4703e3f74 100644
--- a/locale/ko_KR/LC_MESSAGES/messages.po
+++ b/locale/ko_KR/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tt-rss unstable\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 15:25+0300\n"
+"POT-Creation-Date: 2017-07-04 16:29+0300\n"
 "PO-Revision-Date: 2014-11-04 12:05+0900\n"
 "Last-Translator: YoungMin Park <[email protected]>\n"
 "Language-Team: YoungMin Park <[email protected]>\n"
@@ -172,31 +172,30 @@ msgstr "사용자를 찾지 못했습니다."
 #: prefs.php:118
 #: classes/backend.php:5
 #: classes/pref/labels.php:282
-#: classes/pref/feeds.php:1402
-#: classes/pref/filters.php:779
+#: classes/pref/filters.php:819
+#: classes/pref/feeds.php:1376
 #: js/feedlist.js:149
-#: js/functions.js:1131
-#: js/functions.js:1231
-#: js/functions.js:1478
+#: js/functions.js:1210
+#: js/functions.js:1457
 #: js/prefs.js:621
-#: js/prefs.js:818
-#: js/prefs.js:1648
-#: js/prefs.js:1663
-#: js/tt-rss.js:550
-#: js/viewfeed.js:1182
+#: js/prefs.js:813
+#: js/prefs.js:1644
+#: js/prefs.js:1659
+#: js/tt-rss.js:551
+#: js/viewfeed.js:1184
 #: plugins/import_export/import_export.js:17
 #: js/feedlist.js:467
-#: js/feedlist.js:512
+#: js/feedlist.js:515
 #: js/functions.js:372
 #: js/functions.js:630
-#: js/prefs.js:1360
-#: js/prefs.js:1413
-#: js/prefs.js:1452
-#: js/prefs.js:1465
-#: js/prefs.js:1476
-#: js/prefs.js:1491
-#: js/tt-rss.js:567
-#: js/viewfeed.js:762
+#: js/prefs.js:1356
+#: js/prefs.js:1409
+#: js/prefs.js:1448
+#: js/prefs.js:1461
+#: js/prefs.js:1472
+#: js/prefs.js:1487
+#: js/tt-rss.js:568
+#: js/viewfeed.js:764
 msgid "Loading, please wait..."
 msgstr "로딩중입니다. 잠깐의 여유를 갖고 하늘을 바라보아요 ^^"
 
@@ -213,13 +212,13 @@ msgid "All Articles"
 msgstr "전체 내용"
 
 #: index.php:192
-#: include/functions2.php:107
+#: include/functions.php:1181
 #: classes/feeds.php:110
 msgid "Starred"
 msgstr "중요 표시"
 
 #: index.php:193
-#: include/functions2.php:108
+#: include/functions.php:1182
 #: classes/feeds.php:111
 msgid "Published"
 msgstr "공개됨"
@@ -260,7 +259,7 @@ msgstr "제목순으로"
 
 #: index.php:209
 #: index.php:249
-#: include/functions2.php:95
+#: include/functions.php:1169
 #: classes/feeds.php:115
 #: js/FeedTree.js:138
 #: js/FeedTree.js:166
@@ -300,7 +299,7 @@ msgid "Feed actions:"
 msgstr "피드 동작"
 
 #: index.php:244
-#: classes/handler/public.php:672
+#: classes/handler/public.php:583
 msgid "Subscribe to feed..."
 msgstr "피드 구독..."
 
@@ -314,8 +313,8 @@ msgstr "피드 점수 다시 매기기..."
 
 #: index.php:247
 #: classes/pref/feeds.php:785
-#: classes/pref/feeds.php:1357
-#: js/PrefFeedTree.js:78
+#: classes/pref/feeds.php:1331
+#: js/PrefFeedTree.js:80
 msgid "Unsubscribe"
 msgstr "구독 해제"
 
@@ -332,7 +331,7 @@ msgid "Other actions:"
 msgstr "기타 동작"
 
 #: index.php:252
-#: include/functions2.php:81
+#: include/functions.php:1155
 msgid "Toggle widescreen mode"
 msgstr "와이드스크린 모드 켜기/끄기"
 
@@ -358,7 +357,7 @@ msgstr ""
 
 #: prefs.php:33
 #: prefs.php:136
-#: include/functions2.php:110
+#: include/functions.php:1184
 #: classes/pref/prefs.php:435
 msgid "Preferences"
 msgstr "설정"
@@ -373,20 +372,19 @@ msgstr "설정 완료"
 
 #: prefs.php:139
 #: classes/pref/feeds.php:112
-#: classes/pref/feeds.php:1297
-#: classes/pref/feeds.php:1346
+#: classes/pref/feeds.php:1271
+#: classes/pref/feeds.php:1320
 msgid "Feeds"
 msgstr "피드"
 
 #: prefs.php:142
-#: classes/pref/filters.php:248
+#: classes/pref/filters.php:273
 msgid "Filters"
 msgstr "필터"
 
 #: prefs.php:145
-#: include/functions.php:1327
-#: include/functions.php:1979
 #: classes/pref/labels.php:90
+#: classes/feeds.php:1718
 msgid "Labels"
 msgstr "라벨"
 
@@ -415,13 +413,13 @@ msgstr "관리자가 신규 사용자 등록 기능을 비활성화 한 상태�
 #: register.php:337
 #: register.php:347
 #: register.php:359
-#: classes/handler/public.php:742
-#: classes/handler/public.php:813
-#: classes/handler/public.php:911
-#: classes/handler/public.php:990
-#: classes/handler/public.php:1004
-#: classes/handler/public.php:1011
-#: classes/handler/public.php:1036
+#: classes/handler/public.php:653
+#: classes/handler/public.php:724
+#: classes/handler/public.php:822
+#: classes/handler/public.php:901
+#: classes/handler/public.php:915
+#: classes/handler/public.php:922
+#: classes/handler/public.php:947
 msgid "Return to Tiny Tiny RSS"
 msgstr "Tiny Tiny RSS로 돌아가기"
 
@@ -438,12 +436,12 @@ msgid "Check availability"
 msgstr "가능한지 확인"
 
 #: register.php:229
-#: classes/handler/public.php:829
+#: classes/handler/public.php:740
 msgid "Email:"
 msgstr "이메일:"
 
 #: register.php:232
-#: classes/handler/public.php:834
+#: classes/handler/public.php:745
 msgid "How much is two plus two:"
 msgstr "2 + 2 = ？"
 
@@ -471,17 +469,23 @@ msgstr "계정 생성이 완료되었습니다."
 msgid "New user registrations are currently closed."
 msgstr "현재는 신규 사용자 등록을 할 수 없습니다."
 
-#: update.php:67
+#: update.php:66
 msgid "Tiny Tiny RSS data update script."
 msgstr "Tiny Tiny RSS 데이터 업데이트 스크립트."
 
-#: include/digest.php:109
-#: include/functions.php:1336
-#: include/functions.php:1880
-#: include/functions.php:1965
-#: include/functions.php:1987
-#: classes/opml.php:421
+#: include/controls.php:83
+#: classes/pref/filters.php:242
+#: classes/pref/filters.php:253
+#: classes/pref/filters.php:544
+msgid "All feeds"
+msgstr "모든 피드"
+
+#: include/controls.php:134
+#: include/controls.php:316
 #: classes/pref/feeds.php:228
+#: classes/opml.php:486
+#: classes/feeds.php:1727
+#: classes/digest.php:113
 msgid "Uncategorized"
 msgstr "카테고리 없음"
 
@@ -495,390 +499,287 @@ msgstr[0] "저장된 글(%d개)"
 msgid "No feeds found."
 msgstr "피드가 없습니다."
 
-#: include/functions.php:1029
+#: include/functions.php:900
 #, php-format
 msgid "%d min"
 msgstr ""
 
-#: include/functions.php:1325
-#: include/functions.php:1977
-msgid "Special"
-msgstr "자동 분류"
-
-#: include/functions.php:1828
-#: classes/pref/filters.php:229
-#: classes/pref/filters.php:507
-msgid "All feeds"
-msgstr "모든 피드"
-
-#: include/functions.php:2032
-msgid "Starred articles"
-msgstr "중요 표시된 글"
-
-#: include/functions.php:2034
-msgid "Published articles"
-msgstr "공개 글"
-
-#: include/functions.php:2036
-msgid "Fresh articles"
-msgstr "새 글"
-
-#: include/functions.php:2038
-#: include/functions2.php:105
-msgid "All articles"
-msgstr "전체 글"
-
-#: include/functions.php:2040
-msgid "Archived articles"
-msgstr "보관 처리된 글"
-
-#: include/functions.php:2042
-msgid "Recently read"
-msgstr "최근에 읽은 글"
-
-#: include/functions2.php:57
+#: include/functions.php:1131
 msgid "Navigation"
 msgstr "이동"
 
-#: include/functions2.php:58
+#: include/functions.php:1132
 msgid "Open next feed"
 msgstr "다음 피드 열기"
 
-#: include/functions2.php:59
+#: include/functions.php:1133
 msgid "Open previous feed"
 msgstr "이전 피드 열기"
 
-#: include/functions2.php:60
+#: include/functions.php:1134
 msgid "Open next article"
 msgstr "다음 글 보기"
 
-#: include/functions2.php:61
+#: include/functions.php:1135
 msgid "Open previous article"
 msgstr "이전 글 보기"
 
-#: include/functions2.php:62
+#: include/functions.php:1136
 msgid "Open next article (don't scroll long articles)"
 msgstr "다음 글 보기 (긴 글 스크롤 하지 않음)"
 
-#: include/functions2.php:63
+#: include/functions.php:1137
 msgid "Open previous article (don't scroll long articles)"
 msgstr "이전 글 열기 (긴 글 스크롤 하지 않음)"
 
-#: include/functions2.php:64
+#: include/functions.php:1138
 msgid "Move to next article (don't expand or mark read)"
 msgstr "다음 글로 이동(펼치거나 읽음 표시하지 않음)"
 
-#: include/functions2.php:65
+#: include/functions.php:1139
 msgid "Move to previous article (don't expand or mark read)"
 msgstr "이전 글로 이동(펼치거나 읽음 표시하지 않음)"
 
-#: include/functions2.php:66
+#: include/functions.php:1140
 msgid "Show search dialog"
 msgstr "검색 기능 표시"
 
-#: include/functions2.php:67
+#: include/functions.php:1141
 msgid "Article"
 msgstr "글"
 
-#: include/functions2.php:68
-#: js/viewfeed.js:1699
+#: include/functions.php:1142
+#: js/viewfeed.js:1701
 msgid "Toggle starred"
 msgstr "중요 표시"
 
-#: include/functions2.php:69
-#: js/viewfeed.js:1711
+#: include/functions.php:1143
+#: js/viewfeed.js:1713
 msgid "Toggle published"
 msgstr "공개 설정"
 
-#: include/functions2.php:70
-#: js/viewfeed.js:1686
+#: include/functions.php:1144
+#: js/viewfeed.js:1688
 msgid "Toggle unread"
 msgstr "읽지 않음 표시"
 
-#: include/functions2.php:71
+#: include/functions.php:1145
 msgid "Edit tags"
 msgstr "태그 편집"
 
-#: include/functions2.php:72
+#: include/functions.php:1146
 msgid "Open in new window"
 msgstr "새창에서 열기"
 
-#: include/functions2.php:73
-#: js/viewfeed.js:1732
+#: include/functions.php:1147
+#: js/viewfeed.js:1734
 msgid "Mark below as read"
 msgstr "아래 글 읽음 표시"
 
-#: include/functions2.php:74
-#: js/viewfeed.js:1725
+#: include/functions.php:1148
+#: js/viewfeed.js:1727
 msgid "Mark above as read"
 msgstr "위 글 읽음 표시"
 
-#: include/functions2.php:75
+#: include/functions.php:1149
 msgid "Scroll down"
 msgstr "스크롤 다운"
 
-#: include/functions2.php:76
+#: include/functions.php:1150
 msgid "Scroll up"
 msgstr "위로 스크롤"
 
-#: include/functions2.php:77
+#: include/functions.php:1151
 msgid "Select article under cursor"
 msgstr "커서위치의 글 선택"
 
-#: include/functions2.php:78
+#: include/functions.php:1152
 msgid "Email article"
 msgstr "이메일로 글 전송"
 
-#: include/functions2.php:79
+#: include/functions.php:1153
 msgid "Close/collapse article"
 msgstr "글 접기/펴기"
 
-#: include/functions2.php:80
+#: include/functions.php:1154
 msgid "Toggle article expansion (combined mode)"
 msgstr "글 확장 (혼합 모드)"
 
-#: include/functions2.php:82
+#: include/functions.php:1156
 #: plugins/embed_original/init.php:31
 msgid "Toggle embed original"
 msgstr "원문 표시"
 
-#: include/functions2.php:83
+#: include/functions.php:1157
 msgid "Article selection"
 msgstr "글 선택"
 
-#: include/functions2.php:84
+#: include/functions.php:1158
 msgid "Select all articles"
 msgstr "전체 글 선택"
 
-#: include/functions2.php:85
+#: include/functions.php:1159
 msgid "Select unread"
 msgstr "읽지 않은 글 선택"
 
-#: include/functions2.php:86
+#: include/functions.php:1160
 msgid "Select starred"
 msgstr "중요 표시 글 선택"
 
-#: include/functions2.php:87
+#: include/functions.php:1161
 msgid "Select published"
 msgstr "공개한 글 선택"
 
-#: include/functions2.php:88
+#: include/functions.php:1162
 msgid "Invert selection"
 msgstr "선택 반전"
 
-#: include/functions2.php:89
+#: include/functions.php:1163
 msgid "Deselect everything"
 msgstr "전체 선택 해제"
 
-#: include/functions2.php:90
+#: include/functions.php:1164
 #: classes/pref/feeds.php:555
-#: classes/pref/feeds.php:823
+#: classes/pref/feeds.php:811
 msgid "Feed"
 msgstr "피드"
 
-#: include/functions2.php:91
+#: include/functions.php:1165
 msgid "Refresh current feed"
 msgstr "이 피드 새로고침"
 
-#: include/functions2.php:92
+#: include/functions.php:1166
 msgid "Un/hide read feeds"
 msgstr "읽은 피드 숨기기/보이기"
 
-#: include/functions2.php:93
-#: classes/pref/feeds.php:1349
+#: include/functions.php:1167
+#: classes/pref/feeds.php:1323
 msgid "Subscribe to feed"
 msgstr "피드 구독"
 
-#: include/functions2.php:94
+#: include/functions.php:1168
 #: js/FeedTree.js:145
-#: js/PrefFeedTree.js:72
-#: js/viewfeed.js:1853
+#: js/PrefFeedTree.js:74
+#: js/viewfeed.js:1855
 msgid "Edit feed"
 msgstr "피드 편집"
 
-#: include/functions2.php:96
+#: include/functions.php:1170
 msgid "Reverse headlines"
 msgstr "헤드라인 거꾸로 표시"
 
-#: include/functions2.php:97
+#: include/functions.php:1171
 msgid "Toggle headline grouping"
 msgstr ""
 
-#: include/functions2.php:98
+#: include/functions.php:1172
 msgid "Debug feed update"
 msgstr "피드 업데이트 디버그"
 
-#: include/functions2.php:99
+#: include/functions.php:1173
 #, fuzzy
 msgid "Debug viewfeed()"
 msgstr "피드 업데이트 디버그"
 
-#: include/functions2.php:100
+#: include/functions.php:1174
 #: js/FeedTree.js:194
 msgid "Mark all feeds as read"
 msgstr "모든 피드를 읽음 표시"
 
-#: include/functions2.php:101
+#: include/functions.php:1175
 msgid "Un/collapse current category"
 msgstr "이 카테고리 접기/펴기"
 
-#: include/functions2.php:102
+#: include/functions.php:1176
 msgid "Toggle combined mode"
 msgstr "통합 모드 켜기/끄기"
 
-#: include/functions2.php:103
+#: include/functions.php:1177
 msgid "Toggle auto expand in combined mode"
 msgstr "통합 모드에서의 자동 펼침 켜기/끄기"
 
-#: include/functions2.php:104
+#: include/functions.php:1178
 msgid "Go to"
 msgstr "이동"
 
-#: include/functions2.php:106
+#: include/functions.php:1179
+#: classes/feeds.php:1602
+msgid "All articles"
+msgstr "전체 글"
+
+#: include/functions.php:1180
 msgid "Fresh"
 msgstr "새 글"
 
-#: include/functions2.php:109
-#: js/tt-rss.js:494
-#: js/tt-rss.js:663
+#: include/functions.php:1183
+#: js/tt-rss.js:495
+#: js/tt-rss.js:664
 msgid "Tag cloud"
 msgstr "태그 클라우드"
 
-#: include/functions2.php:111
+#: include/functions.php:1185
 msgid "Other"
 msgstr "기타"
 
-#: include/functions2.php:112
+#: include/functions.php:1186
 #: classes/pref/labels.php:267
 msgid "Create label"
 msgstr "라벨 생성"
 
-#: include/functions2.php:113
-#: classes/pref/filters.php:753
+#: include/functions.php:1187
+#: classes/pref/filters.php:793
 msgid "Create filter"
 msgstr "필터 생성"
 
-#: include/functions2.php:114
+#: include/functions.php:1188
 msgid "Un/collapse sidebar"
 msgstr "사이드바 숨김/표시"
 
-#: include/functions2.php:115
+#: include/functions.php:1189
 msgid "Show help dialog"
 msgstr "도움말 보이기"
 
-#: include/functions2.php:670
-#, php-format
-msgid "Search results: %s"
-msgstr "검색 결과: %s"
-
-#: include/functions2.php:1336
-#: classes/feeds.php:752
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] "코멘트"
-
-#: include/functions2.php:1340
-#: classes/feeds.php:756
-msgid "comments"
-msgstr "코멘트"
-
-#: include/functions2.php:1366
-msgid " - "
-msgstr " - "
-
-#: include/functions2.php:1397
-#: include/functions2.php:1648
-#: classes/article.php:311
-msgid "no tags"
-msgstr "태그 없음"
-
-#: include/functions2.php:1407
-#: classes/feeds.php:738
-msgid "Edit tags for this article"
-msgstr "이 글의 태그 편집"
-
-#: include/functions2.php:1439
-#: classes/feeds.php:690
-msgid "Originally from:"
-msgstr "원 출처:"
-
-#: include/functions2.php:1452
-#: classes/pref/feeds.php:574
-#: classes/feeds.php:703
-msgid "Feed URL"
-msgstr "피드 주소"
-
-#: include/functions2.php:1489
-#: classes/backend.php:105
-#: classes/dlg.php:37
-#: classes/dlg.php:60
-#: classes/dlg.php:93
-#: classes/dlg.php:159
-#: classes/dlg.php:186
-#: classes/pref/feeds.php:1652
-#: classes/pref/feeds.php:1718
-#: classes/pref/filters.php:204
-#: classes/pref/prefs.php:1097
-#: plugins/af_psql_trgm/init.php:102
-#: plugins/import_export/init.php:415
-#: plugins/import_export/init.php:461
-#: plugins/share/init.php:121
-msgid "Close this window"
-msgstr "이 창 닫기"
-
-#: include/functions2.php:1686
-msgid "(edit note)"
-msgstr "(노트 편집)"
-
-#: include/functions2.php:1960
-msgid "unknown type"
-msgstr "알수 없는 종류"
-
-#: include/functions2.php:2037
-msgid "Attachments"
-msgstr "첨부"
-
-#: include/functions2.php:2496
+#: include/functions.php:2456
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: include/functions2.php:2497
+#: include/functions.php:2457
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: include/functions2.php:2498
+#: include/functions.php:2458
 msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
 msgstr ""
 
-#: include/functions2.php:2499
+#: include/functions.php:2459
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: include/functions2.php:2500
+#: include/functions.php:2460
 #, fuzzy
 msgid "No file was uploaded"
 msgstr "업로드된 파일 없음."
 
-#: include/functions2.php:2501
+#: include/functions.php:2461
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: include/functions2.php:2502
+#: include/functions.php:2462
 msgid "Failed to write file to disk."
 msgstr ""
 
-#: include/functions2.php:2503
+#: include/functions.php:2463
 msgid "A PHP extension stopped the file upload."
 msgstr ""
 
 #: include/login_form.php:197
-#: classes/handler/public.php:569
-#: classes/handler/public.php:824
+#: classes/handler/public.php:480
+#: classes/handler/public.php:735
 msgid "Login:"
 msgstr "로그인:"
 
 #: include/login_form.php:207
-#: classes/handler/public.php:572
+#: classes/handler/public.php:483
 msgid "Password:"
 msgstr "암호:"
 
@@ -891,7 +792,7 @@ msgid "Profile:"
 msgstr "프로필:"
 
 #: include/login_form.php:223
-#: classes/handler/public.php:311
+#: classes/handler/public.php:287
 #: classes/pref/prefs.php:1035
 #: classes/rpc.php:63
 msgid "Default profile"
@@ -910,7 +811,7 @@ msgid "Remember me"
 msgstr "ID/PW 저장"
 
 #: include/login_form.php:249
-#: classes/handler/public.php:577
+#: classes/handler/public.php:488
 msgid "Log in"
 msgstr "로그인"
 
@@ -929,145 +830,44 @@ msgstr "세션 유효성 검사 실패(잘못된 IP)"
 msgid "Session failed to validate (password changed)"
 msgstr "세션 유효성 검사 실패(잘못된 IP)"
 
-#: classes/article.php:25
-msgid "Article not found."
-msgstr "글이 없습니다."
-
-#: classes/article.php:197
-msgid "Tags for this article (separated by commas):"
-msgstr "이 글의 태그 (쉼표로 구분)"
-
-#: classes/article.php:222
-#: classes/pref/labels.php:79
-#: classes/pref/users.php:98
-#: classes/pref/feeds.php:801
-#: classes/pref/feeds.php:943
-#: classes/pref/filters.php:485
-#: classes/pref/prefs.php:981
-#: plugins/instances/init.php:245
-#: plugins/nsfw/init.php:85
-#: plugins/note/init.php:51
-#: plugins/af_readability/init.php:68
-#: plugins/af_redditimgur/init.php:60
-#: plugins/af_psql_trgm/init.php:181
-#: plugins/mail/init.php:64
-#: plugins/af_zz_imgproxy/init.php:213
-msgid "Save"
-msgstr "저장"
-
-#: classes/article.php:224
-#: classes/handler/public.php:546
-#: classes/handler/public.php:580
-#: classes/pref/labels.php:81
-#: classes/pref/users.php:100
-#: classes/pref/feeds.php:802
-#: classes/pref/feeds.php:946
-#: classes/pref/feeds.php:1859
-#: classes/pref/filters.php:488
-#: classes/pref/filters.php:902
-#: classes/pref/filters.php:983
-#: classes/pref/filters.php:1076
-#: classes/pref/prefs.php:983
-#: classes/feeds.php:1105
-#: classes/feeds.php:1155
-#: classes/feeds.php:1192
-#: plugins/instances/init.php:248
-#: plugins/instances/init.php:436
-#: plugins/note/init.php:53
-#: plugins/mail/init.php:173
-msgid "Cancel"
-msgstr "취소"
-
-#: classes/opml.php:28
-#: classes/opml.php:33
-msgid "OPML Utility"
-msgstr "OPML 유틸리티"
-
-#: classes/opml.php:37
-msgid "Importing OPML..."
-msgstr "OPML 불러오는중..."
-
-#: classes/opml.php:41
-msgid "Return to preferences"
-msgstr "설정으로 돌아가기"
-
-#: classes/opml.php:271
-#, php-format
-msgid "Adding feed: %s"
-msgstr "%s 피드를 추가하는중..."
-
-#: classes/opml.php:282
-#, php-format
-msgid "Duplicate feed: %s"
-msgstr "중복 피드: %s"
-
-#: classes/opml.php:296
-#, php-format
-msgid "Adding label %s"
-msgstr "%s에 라벨 추가중..."
-
-#: classes/opml.php:299
-#, php-format
-msgid "Duplicate label: %s"
-msgstr ""
-
-#: classes/opml.php:311
-#, php-format
-msgid "Setting preference key %s to %s"
-msgstr ""
-
-#: classes/opml.php:343
-msgid "Adding filter..."
-msgstr "필터를 추가하는중..."
-
-#: classes/opml.php:421
-#, php-format
-msgid "Processing category: %s"
-msgstr "카테고리 처리중: %s"
-
-#: classes/opml.php:470
-#, php-format
-msgid "Upload failed with error code %d"
-msgstr ""
-
-#: classes/opml.php:484
-#: plugins/import_export/init.php:442
-msgid "Unable to move uploaded file."
-msgstr "업로드된 파일을 이동할 수 없습니다."
-
-#: classes/opml.php:488
-#: plugins/import_export/init.php:446
-msgid "Error: please upload OPML file."
-msgstr "오류: OPML 파일을 업로드 하세요."
-
-#: classes/opml.php:499
-msgid "Error: unable to find moved OPML file."
-msgstr "오류: 이동된 OPML 파일을 찾을 수 없습니다."
-
-#: classes/opml.php:506
-msgid "Error while parsing document."
-msgstr "문서 분석중에 오류가 발생했습니다."
-
-#: classes/backend.php:33
+#: classes/backend.php:31
 msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
 msgstr ""
 
-#: classes/backend.php:38
+#: classes/backend.php:36
 msgid "Keyboard Shortcuts"
 msgstr "키보드 단축키"
 
-#: classes/backend.php:61
+#: classes/backend.php:59
 msgid "Shift"
 msgstr ""
 
-#: classes/backend.php:64
+#: classes/backend.php:62
 msgid "Ctrl"
 msgstr ""
 
-#: classes/backend.php:99
+#: classes/backend.php:97
 msgid "Help topic not found."
 msgstr "도움말 주제가 없습니다."
 
+#: classes/backend.php:103
+#: classes/dlg.php:37
+#: classes/dlg.php:60
+#: classes/dlg.php:93
+#: classes/dlg.php:159
+#: classes/dlg.php:186
+#: classes/article.php:744
+#: classes/pref/filters.php:206
+#: classes/pref/prefs.php:1097
+#: classes/pref/feeds.php:1626
+#: classes/pref/feeds.php:1692
+#: plugins/import_export/init.php:421
+#: plugins/import_export/init.php:467
+#: plugins/af_psql_trgm/init.php:102
+#: plugins/share/init.php:120
+msgid "Close this window"
+msgstr "이 창 닫기"
+
 #: classes/dlg.php:17
 msgid "If you have imported labels and/or filters, you might need to reload preferences to see your new data."
 msgstr ""
@@ -1078,7 +878,7 @@ msgstr "공개 OPML URL: "
 
 #: classes/dlg.php:57
 #: classes/dlg.php:183
-#: plugins/share/init.php:118
+#: plugins/share/init.php:117
 msgid "Generate new URL"
 msgstr "새 URL 생성"
 
@@ -1099,129 +899,222 @@ msgstr ""
 msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 
-#: classes/handler/public.php:510
+#: classes/article.php:25
+msgid "Article not found."
+msgstr "글이 없습니다."
+
+#: classes/article.php:197
+msgid "Tags for this article (separated by commas):"
+msgstr "이 글의 태그 (쉼표로 구분)"
+
+#: classes/article.php:222
+#: classes/pref/labels.php:79
+#: classes/pref/filters.php:519
+#: classes/pref/users.php:98
+#: classes/pref/prefs.php:981
+#: classes/pref/feeds.php:789
+#: classes/pref/feeds.php:931
+#: plugins/af_psql_trgm/init.php:181
+#: plugins/nsfw/init.php:85
+#: plugins/af_readability/init.php:68
+#: plugins/mail/init.php:64
+#: plugins/af_redditimgur/init.php:60
+#: plugins/note/init.php:51
+#: plugins/af_zz_imgproxy/init.php:240
+msgid "Save"
+msgstr "저장"
+
+#: classes/article.php:224
+#: classes/handler/public.php:457
+#: classes/handler/public.php:491
+#: classes/pref/labels.php:81
+#: classes/pref/filters.php:522
+#: classes/pref/filters.php:942
+#: classes/pref/filters.php:1022
+#: classes/pref/filters.php:1115
+#: classes/pref/users.php:100
+#: classes/pref/prefs.php:983
+#: classes/pref/feeds.php:790
+#: classes/pref/feeds.php:934
+#: classes/pref/feeds.php:1833
+#: classes/feeds.php:1098
+#: classes/feeds.php:1148
+#: classes/feeds.php:1185
+#: plugins/mail/init.php:173
+#: plugins/note/init.php:53
+msgid "Cancel"
+msgstr "취소"
+
+#: classes/article.php:311
+#: classes/article.php:652
+#: classes/article.php:805
+msgid "no tags"
+msgstr "태그 없음"
+
+#: classes/article.php:419
+msgid "unknown type"
+msgstr "알수 없는 종류"
+
+#: classes/article.php:496
+msgid "Attachments"
+msgstr "첨부"
+
+#: classes/article.php:591
+#: classes/feeds.php:741
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] "코멘트"
+
+#: classes/article.php:595
+#: classes/feeds.php:745
+msgid "comments"
+msgstr "코멘트"
+
+#: classes/article.php:621
+msgid " - "
+msgstr " - "
+
+#: classes/article.php:662
+#: classes/feeds.php:727
+msgid "Edit tags for this article"
+msgstr "이 글의 태그 편집"
+
+#: classes/article.php:694
+#: classes/feeds.php:681
+msgid "Originally from:"
+msgstr "원 출처:"
+
+#: classes/article.php:707
+#: classes/pref/feeds.php:574
+#: classes/feeds.php:694
+msgid "Feed URL"
+msgstr "피드 주소"
+
+#: classes/article.php:843
+msgid "(edit note)"
+msgstr "(노트 편집)"
+
+#: classes/handler/public.php:421
 #: plugins/bookmarklets/init.php:40
 msgid "Share with Tiny Tiny RSS"
 msgstr "Tiny Tiny RSS에 공유하기"
 
-#: classes/handler/public.php:518
+#: classes/handler/public.php:429
 msgid "Title:"
 msgstr "제목:"
 
-#: classes/handler/public.php:520
+#: classes/handler/public.php:431
 #: classes/pref/feeds.php:572
-#: plugins/instances/init.php:212
-#: plugins/instances/init.php:401
 msgid "URL:"
 msgstr "URL:"
 
-#: classes/handler/public.php:522
+#: classes/handler/public.php:433
 msgid "Content:"
 msgstr "내용:"
 
-#: classes/handler/public.php:524
+#: classes/handler/public.php:435
 msgid "Labels:"
 msgstr "라벨:"
 
-#: classes/handler/public.php:543
+#: classes/handler/public.php:454
 msgid "Shared article will appear in the Published feed."
 msgstr "공유된 글은 공개된 피드에 표시됩니다."
 
-#: classes/handler/public.php:545
+#: classes/handler/public.php:456
 msgid "Share"
 msgstr "공유"
 
-#: classes/handler/public.php:567
+#: classes/handler/public.php:478
 msgid "Not logged in"
 msgstr "로그인되지 않음"
 
-#: classes/handler/public.php:626
+#: classes/handler/public.php:537
 msgid "Incorrect username or password"
 msgstr "잘못된 사용자명 / 암호입니다."
 
-#: classes/handler/public.php:678
+#: classes/handler/public.php:589
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "<b>%s</b>는 이미 구독중입니다."
 
-#: classes/handler/public.php:681
+#: classes/handler/public.php:592
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "<b>%s</b>를 구독했습니다."
 
-#: classes/handler/public.php:684
+#: classes/handler/public.php:595
 #, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "<b>%s</b>를 구독하는데 실패했습니다."
 
-#: classes/handler/public.php:687
+#: classes/handler/public.php:598
 #, php-format
 msgid "No feeds found in <b>%s</b>."
 msgstr "<b>%s</b>에서 피드를 찾지 못했습니다."
 
-#: classes/handler/public.php:690
+#: classes/handler/public.php:601
 msgid "Multiple feed URLs found."
 msgstr "여러개의 피드를 찾았습니다."
 
-#: classes/handler/public.php:694
+#: classes/handler/public.php:605
 #, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr "<b>%s</b>를 구독하는데 실패했습니다. <br>피드 URL을 다운로드 할 수 없습니다."
 
-#: classes/handler/public.php:712
+#: classes/handler/public.php:623
 msgid "Subscribe to selected feed"
 msgstr "선택된 피드 구독"
 
-#: classes/handler/public.php:737
+#: classes/handler/public.php:648
 msgid "Edit subscription options"
 msgstr "구독 옵션 편집"
 
-#: classes/handler/public.php:774
+#: classes/handler/public.php:685
 msgid "Password recovery"
 msgstr "암호 복구"
 
-#: classes/handler/public.php:817
+#: classes/handler/public.php:728
 msgid "You will need to provide valid account name and email. A password reset link will be sent to your email address."
 msgstr ""
 
-#: classes/handler/public.php:839
-#: classes/pref/users.php:350
+#: classes/handler/public.php:750
+#: classes/pref/users.php:349
 msgid "Reset password"
 msgstr "암호 초기화"
 
-#: classes/handler/public.php:849
+#: classes/handler/public.php:760
 msgid "Some of the required form parameters are missing or incorrect."
 msgstr "일부 필수 파라미터가 누락되었거나 잘못되었습니다."
 
-#: classes/handler/public.php:853
-#: classes/handler/public.php:919
+#: classes/handler/public.php:764
+#: classes/handler/public.php:830
 msgid "Go back"
 msgstr "돌아가기"
 
-#: classes/handler/public.php:890
+#: classes/handler/public.php:801
 #, fuzzy
 msgid "[tt-rss] Password reset request"
 msgstr "[tt-rss] 암호 변경 안내"
 
-#: classes/handler/public.php:915
+#: classes/handler/public.php:826
 msgid "Sorry, login and email combination not found."
 msgstr "로그인/이메일 정보가 없습니다."
 
-#: classes/handler/public.php:937
+#: classes/handler/public.php:848
 msgid "Your access level is insufficient to run this script."
 msgstr "현재 계정 권한으로는 이 스크립트를 실행할 수 없습니다."
 
-#: classes/handler/public.php:963
+#: classes/handler/public.php:874
 msgid "Database Updater"
 msgstr "데이터베이스 업데이터"
 
-#: classes/handler/public.php:1028
+#: classes/handler/public.php:939
 msgid "Perform updates"
 msgstr "업데이트 실행"
 
 #: classes/pref/labels.php:22
-#: classes/pref/filters.php:348
-#: classes/pref/filters.php:823
+#: classes/pref/filters.php:373
+#: classes/pref/filters.php:863
 msgid "Caption"
 msgstr "자막"
 
@@ -1243,59 +1136,55 @@ msgid "Created label <b>%s</b>"
 msgstr "<b>%s</b> 라벨이 생성되었습니다."
 
 #: classes/pref/labels.php:258
-#: classes/pref/users.php:334
-#: classes/pref/feeds.php:1337
-#: classes/pref/feeds.php:1600
-#: classes/pref/feeds.php:1664
-#: classes/pref/filters.php:359
-#: classes/pref/filters.php:407
-#: classes/pref/filters.php:744
-#: classes/pref/filters.php:832
-#: classes/pref/filters.php:859
+#: classes/pref/filters.php:384
+#: classes/pref/filters.php:441
+#: classes/pref/filters.php:784
+#: classes/pref/filters.php:872
+#: classes/pref/filters.php:899
+#: classes/pref/users.php:333
 #: classes/pref/prefs.php:992
-#: plugins/instances/init.php:284
+#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1574
+#: classes/pref/feeds.php:1638
 msgid "Select"
 msgstr "선택"
 
 #: classes/pref/labels.php:261
-#: classes/pref/users.php:337
-#: classes/pref/feeds.php:1340
-#: classes/pref/feeds.php:1603
-#: classes/pref/feeds.php:1667
-#: classes/pref/filters.php:362
-#: classes/pref/filters.php:410
-#: classes/pref/filters.php:747
-#: classes/pref/filters.php:835
-#: classes/pref/filters.php:862
+#: classes/pref/filters.php:387
+#: classes/pref/filters.php:444
+#: classes/pref/filters.php:787
+#: classes/pref/filters.php:875
+#: classes/pref/filters.php:902
+#: classes/pref/users.php:336
 #: classes/pref/prefs.php:995
+#: classes/pref/feeds.php:1314
+#: classes/pref/feeds.php:1577
+#: classes/pref/feeds.php:1641
 #: classes/feeds.php:102
-#: plugins/instances/init.php:287
 msgid "All"
 msgstr "전체"
 
 #: classes/pref/labels.php:263
-#: classes/pref/users.php:339
-#: classes/pref/feeds.php:1342
-#: classes/pref/feeds.php:1605
-#: classes/pref/feeds.php:1669
-#: classes/pref/filters.php:364
-#: classes/pref/filters.php:412
-#: classes/pref/filters.php:749
-#: classes/pref/filters.php:837
-#: classes/pref/filters.php:864
+#: classes/pref/filters.php:389
+#: classes/pref/filters.php:446
+#: classes/pref/filters.php:789
+#: classes/pref/filters.php:877
+#: classes/pref/filters.php:904
+#: classes/pref/users.php:338
 #: classes/pref/prefs.php:997
+#: classes/pref/feeds.php:1316
+#: classes/pref/feeds.php:1579
+#: classes/pref/feeds.php:1643
 #: classes/feeds.php:105
-#: plugins/instances/init.php:289
 msgid "None"
 msgstr "선택 안 함"
 
 #: classes/pref/labels.php:270
-#: classes/pref/users.php:348
+#: classes/pref/filters.php:512
+#: classes/pref/filters.php:806
+#: classes/pref/users.php:347
 #: classes/pref/feeds.php:767
-#: classes/pref/filters.php:478
-#: classes/pref/filters.php:766
-#: classes/feeds.php:1154
-#: plugins/instances/init.php:294
+#: classes/feeds.php:1147
 msgid "Remove"
 msgstr "삭제"
 
@@ -1303,9 +1192,169 @@ msgstr "삭제"
 msgid "Clear colors"
 msgstr "색 정리"
 
+#: classes/pref/filters.php:153
+#, fuzzy
+msgid "Preview article"
+msgstr "記事フィルター"
+
+#: classes/pref/filters.php:264
+#: classes/pref/filters.php:558
+msgid "(inverse)"
+msgstr "반전"
+
+#: classes/pref/filters.php:260
+#: classes/pref/filters.php:557
+#, php-format
+msgid "%s on %s in %s %s"
+msgstr ""
+
+#: classes/pref/filters.php:379
+#: classes/pref/filters.php:867
+#: classes/pref/filters.php:981
+msgid "Match"
+msgstr "일치"
+
+#: classes/pref/filters.php:393
+#: classes/pref/filters.php:450
+#: classes/pref/filters.php:881
+#: classes/pref/filters.php:908
+msgid "Add"
+msgstr "추가"
+
+#: classes/pref/filters.php:396
+#: classes/pref/filters.php:453
+#: classes/pref/filters.php:884
+#: classes/pref/filters.php:911
+#: classes/feeds.php:122
+msgid "Delete"
+msgstr "삭제"
+
+#: classes/pref/filters.php:436
+#: classes/pref/filters.php:894
+msgid "Apply actions"
+msgstr "동작 적용"
+
+#: classes/pref/filters.php:486
+#: classes/pref/filters.php:923
+msgid "Enabled"
+msgstr "활성화"
+
+#: classes/pref/filters.php:495
+#: classes/pref/filters.php:926
+msgid "Match any rule"
+msgstr "아무 규칙이나 적용"
+
+#: classes/pref/filters.php:504
+#: classes/pref/filters.php:929
+msgid "Inverse matching"
+msgstr "반대 적용"
+
+#: classes/pref/filters.php:516
+#: classes/pref/filters.php:936
+msgid "Test"
+msgstr "테스트"
+
+#: classes/pref/filters.php:780
+#: classes/pref/users.php:323
+#: classes/pref/feeds.php:1307
+#: classes/feeds.php:1118
+#: classes/feeds.php:1184
+#: js/tt-rss.js:165
+msgid "Search"
+msgstr "검색"
+
+#: classes/pref/filters.php:796
+msgid "Combine"
+msgstr "병합"
+
+#: classes/pref/filters.php:799
+#: classes/pref/users.php:345
+msgid "Edit"
+msgstr "편집"
+
+#: classes/pref/filters.php:802
+#: classes/pref/feeds.php:1327
+#: classes/pref/feeds.php:1341
+msgid "Reset sort order"
+msgstr "정렬 순서 초기화"
+
+#: classes/pref/filters.php:810
+#: classes/pref/feeds.php:1363
+msgid "Rescore articles"
+msgstr "글 점수 다시 매기기"
+
+#: classes/pref/filters.php:939
+msgid "Create"
+msgstr "생성"
+
+#: classes/pref/filters.php:993
+msgid "Inverse regular expression matching"
+msgstr ""
+
+#: classes/pref/filters.php:995
+msgid "on field"
+msgstr "필드"
+
+#: classes/pref/filters.php:1001
+#: js/PrefFilterTree.js:64
+msgid "in"
+msgstr ""
+
+#: classes/pref/filters.php:1014
+#, fuzzy
+msgid "Wiki: Filters"
+msgstr "필터"
+
+#: classes/pref/filters.php:1019
+msgid "Save rule"
+msgstr "규칙 저장"
+
+#: classes/pref/filters.php:1019
+#: js/functions.js:865
+msgid "Add rule"
+msgstr "규칙 추가"
+
+#: classes/pref/filters.php:1042
+msgid "Perform Action"
+msgstr "동작 실행"
+
+#: classes/pref/filters.php:1093
+#, fuzzy
+msgid "No actions available"
+msgstr "새 버전 나왔어요!"
+
+#: classes/pref/filters.php:1112
+msgid "Save action"
+msgstr "저장 동작"
+
+#: classes/pref/filters.php:1112
+#: js/functions.js:887
+msgid "Add action"
+msgstr "동작 추가"
+
+#: classes/pref/filters.php:1136
+msgid "[No caption]"
+msgstr "[자막 없음]"
+
+#: classes/pref/filters.php:1138
+#, fuzzy, php-format
+msgid "%s (%d rule)"
+msgid_plural "%s (%d rules)"
+msgstr[0] "규칙 추가"
+
+#: classes/pref/filters.php:1153
+#, fuzzy
+msgid "matches any rule"
+msgstr "아무 규칙이나 적용"
+
+#: classes/pref/filters.php:1156
+#, fuzzy, php-format
+msgid "%s (+%d action)"
+msgid_plural "%s (+%d actions)"
+msgstr[0] "동작 추가"
+
 #: classes/pref/users.php:6
 #: classes/pref/system.php:8
-#: plugins/instances/init.php:154
 msgid "Your access level is insufficient to open this tab."
 msgstr "현재 계정 권한으로는 이 탭을 사용할 수 없습니다."
 
@@ -1316,8 +1365,8 @@ msgstr "규칙 편집"
 
 #: classes/pref/users.php:56
 #: classes/pref/feeds.php:637
-#: classes/pref/feeds.php:878
-#: classes/feeds.php:1075
+#: classes/pref/feeds.php:866
+#: classes/feeds.php:1068
 msgid "Authentication"
 msgstr "인증"
 
@@ -1327,7 +1376,7 @@ msgstr "계정 권한:"
 
 #: classes/pref/users.php:77
 #: classes/pref/feeds.php:667
-#: classes/pref/feeds.php:896
+#: classes/pref/feeds.php:884
 msgid "Options"
 msgstr "옵션"
 
@@ -1341,7 +1390,7 @@ msgid "User not found"
 msgstr "사용자를 찾지 못했습니다."
 
 #: classes/pref/users.php:132
-#: classes/pref/users.php:400
+#: classes/pref/users.php:399
 msgid "Registered"
 msgstr "등록 일자"
 
@@ -1359,7 +1408,7 @@ msgid "Stored articles"
 msgstr "중요 표시된 글"
 
 #: classes/pref/users.php:145
-#: classes/pref/users.php:399
+#: classes/pref/users.php:398
 msgid "Subscribed feeds"
 msgstr "구독중인 피드"
 
@@ -1378,504 +1427,57 @@ msgstr "사용자 <b>%s</b>를 만들 수 없습니다."
 msgid "User <b>%s</b> already exists."
 msgstr "<b>%s</b>는 이미 사용중입니다."
 
-#: classes/pref/users.php:265
+#: classes/pref/users.php:264
 #, php-format
 msgid "Changed password of user <b>%s</b> to <b>%s</b>"
 msgstr "사용자 <b>%s</b>의 암호가 <b>%s</b>로 변경되었습니다."
 
-#: classes/pref/users.php:267
+#: classes/pref/users.php:266
 #, php-format
 msgid "Sending new password of user <b>%s</b> to <b>%s</b>"
 msgstr "사용자 <b>%s</b>의 새 암호를 <b>%s</b>로 보내중..."
 
-#: classes/pref/users.php:291
+#: classes/pref/users.php:290
 msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] 암호 변경 안내"
 
-#: classes/pref/users.php:324
-#: classes/pref/feeds.php:1333
-#: classes/pref/filters.php:740
-#: classes/feeds.php:1125
-#: classes/feeds.php:1191
-#: js/tt-rss.js:165
-msgid "Search"
-msgstr "검색"
-
-#: classes/pref/users.php:342
+#: classes/pref/users.php:341
 msgid "Create user"
 msgstr "사용자 생성"
 
-#: classes/pref/users.php:346
-#: classes/pref/filters.php:759
-#: plugins/instances/init.php:293
-msgid "Edit"
-msgstr "편집"
-
-#: classes/pref/users.php:397
+#: classes/pref/users.php:396
 #: classes/pref/feeds.php:643
-#: classes/pref/feeds.php:882
-#: classes/pref/feeds.php:1836
-#: classes/feeds.php:1079
+#: classes/pref/feeds.php:870
+#: classes/pref/feeds.php:1810
+#: classes/feeds.php:1072
 msgid "Login"
 msgstr "로그인"
 
-#: classes/pref/users.php:398
+#: classes/pref/users.php:397
 msgid "Access Level"
 msgstr "계정 권한"
 
-#: classes/pref/users.php:401
+#: classes/pref/users.php:400
 msgid "Last login"
 msgstr "마지막 로그인"
 
-#: classes/pref/users.php:420
-#: plugins/instances/init.php:334
+#: classes/pref/users.php:419
 msgid "Click to edit"
 msgstr "클릭하여 편집"
 
-#: classes/pref/users.php:441
+#: classes/pref/users.php:440
 msgid "No users defined."
 msgstr "정의된 사용자가 없습니다."
 
-#: classes/pref/users.php:443
+#: classes/pref/users.php:442
 msgid "No matching users found."
 msgstr "일치하는 사용자가 없습니다."
 
-#: classes/pref/system.php:29
-msgid "Error Log"
-msgstr ""
-
-#: classes/pref/system.php:40
-msgid "Refresh"
-msgstr "새로고침"
-
-#: classes/pref/system.php:43
-msgid "Clear log"
-msgstr "로그 지우기"
-
-#: classes/pref/system.php:48
-msgid "Error"
-msgstr ""
-
-#: classes/pref/system.php:49
-msgid "Filename"
-msgstr ""
-
-#: classes/pref/system.php:50
-msgid "Message"
-msgstr ""
-
-#: classes/pref/system.php:52
-msgid "Date"
-msgstr "날짜"
-
-#: classes/pref/feeds.php:15
-msgid "Check to enable field"
-msgstr "필드 활성화 확인"
-
-#: classes/pref/feeds.php:65
-#: classes/pref/feeds.php:214
-#: classes/pref/feeds.php:258
-#: classes/pref/feeds.php:264
-#: classes/pref/feeds.php:290
-#, php-format
-msgid "(%d feed)"
-msgid_plural "(%d feeds)"
-msgstr[0] "(%d개의 피드)"
-
-#: classes/pref/feeds.php:537
 #: classes/pref/prefs.php:18
+#: classes/pref/feeds.php:537
 msgid "General"
 msgstr "일반"
 
-#: classes/pref/feeds.php:561
-msgid "Feed Title"
-msgstr "피드 제목"
-
-#: classes/pref/feeds.php:595
-#: classes/pref/feeds.php:830
-#: classes/pref/feeds.php:1822
-#: classes/feeds.php:1055
-msgid "Place in category:"
-msgstr "카테고리 위치:"
-
-#: classes/pref/feeds.php:608
-#: classes/pref/feeds.php:844
-#, fuzzy
-msgid "Language:"
-msgstr "언어"
-
-#: classes/pref/feeds.php:615
-#: classes/pref/feeds.php:853
-msgid "Update"
-msgstr "업데이트"
-
-#: classes/pref/feeds.php:630
-#: classes/pref/feeds.php:869
-msgid "Article purging:"
-msgstr "글을 유지:"
-
-#: classes/pref/feeds.php:658
-#: classes/pref/feeds.php:890
-#: classes/pref/feeds.php:1839
-#: classes/pref/prefs.php:245
-#: classes/feeds.php:1083
-msgid "Password"
-msgstr "암호"
-
-#: classes/pref/feeds.php:662
-msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
-msgstr ""
-
-#: classes/pref/feeds.php:681
-#: classes/pref/feeds.php:900
-msgid "Hide from Popular feeds"
-msgstr "인기 피드에서 숨김"
-
-#: classes/pref/feeds.php:693
-#: classes/pref/feeds.php:906
-msgid "Include in e-mail digest"
-msgstr "이메일 요약에 포함"
-
-#: classes/pref/feeds.php:706
-#: classes/pref/feeds.php:912
-msgid "Always display image attachments"
-msgstr ""
-
-#: classes/pref/feeds.php:719
-#: classes/pref/feeds.php:920
-msgid "Do not embed images"
-msgstr ""
-
-#: classes/pref/feeds.php:732
-#: classes/pref/feeds.php:928
-msgid "Cache media"
-msgstr ""
-
-#: classes/pref/feeds.php:744
-#: classes/pref/feeds.php:934
-msgid "Mark updated articles as unread"
-msgstr "업데이트된 글을 읽지 않음 표시"
-
-#: classes/pref/feeds.php:748
-msgid "Icon"
-msgstr "아이콘"
-
-#: classes/pref/feeds.php:765
-msgid "Replace"
-msgstr ""
-
-#: classes/pref/feeds.php:772
-#: classes/pref/prefs.php:698
-msgid "Plugins"
-msgstr "플러그인"
-
-#: classes/pref/feeds.php:792
-msgid "Resubscribe to push updates"
-msgstr "업데이트 알림을 위해 다시 구독"
-
-#: classes/pref/feeds.php:799
-msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
-msgstr ""
-
-#: classes/pref/feeds.php:1200
-#: classes/pref/feeds.php:1253
-msgid "All done."
-msgstr "완료되었습니다."
-
-#: classes/pref/feeds.php:1308
-msgid "Feeds with errors"
-msgstr "오류가 있는 피드"
-
-#: classes/pref/feeds.php:1315
-msgid "Inactive feeds"
-msgstr "피드 비활성화"
-
-#: classes/pref/feeds.php:1351
-msgid "Edit selected feeds"
-msgstr "선택된 피드 편집"
-
-#: classes/pref/feeds.php:1353
-#: classes/pref/feeds.php:1367
-#: classes/pref/filters.php:762
-msgid "Reset sort order"
-msgstr "정렬 순서 초기화"
-
-#: classes/pref/feeds.php:1355
-#: js/prefs.js:1622
-msgid "Batch subscribe"
-msgstr "일괄 구독"
-
-#: classes/pref/feeds.php:1362
-msgid "Categories"
-msgstr "카테고리"
-
-#: classes/pref/feeds.php:1365
-msgid "Add category"
-msgstr "카테고리 추가"
-
-#: classes/pref/feeds.php:1369
-msgid "Remove selected"
-msgstr "선택된 항목 제거"
-
-#: classes/pref/feeds.php:1380
-msgid "More actions..."
-msgstr "기타 동작..."
-
-#: classes/pref/feeds.php:1384
-msgid "Manual purge"
-msgstr "수동 남김"
-
-#: classes/pref/feeds.php:1388
-msgid "Clear feed data"
-msgstr "피드 데이터 정리"
-
-#: classes/pref/feeds.php:1389
-#: classes/pref/filters.php:770
-msgid "Rescore articles"
-msgstr "글 점수 다시 매기기"
-
-#: classes/pref/feeds.php:1442
-msgid "OPML"
-msgstr "OPML"
-
-#: classes/pref/feeds.php:1444
-msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
-msgstr "OPML을 사용하면 피드/필터/라벨/설정을 내보내고 불러올 수 있습니다."
-
-#: classes/pref/feeds.php:1445
-msgid "Only main settings profile can be migrated using OPML."
-msgstr ""
-
-#: classes/pref/feeds.php:1458
-msgid "Import my OPML"
-msgstr "내 OPML 불러오기"
-
-#: classes/pref/feeds.php:1464
-msgid "Filename:"
-msgstr ""
-
-#: classes/pref/feeds.php:1466
-msgid "Include settings"
-msgstr "설정 포함"
-
-#: classes/pref/feeds.php:1470
-msgid "Export OPML"
-msgstr "OPML 내보내기"
-
-#: classes/pref/feeds.php:1474
-msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
-msgstr "사용중인 OPML을 공개하면, 누구든 아래 URL만으로 구독할 수 있습니다."
-
-#: classes/pref/feeds.php:1478
-msgid "Public OPML URL"
-msgstr ""
-
-#: classes/pref/feeds.php:1479
-msgid "Display published OPML URL"
-msgstr "공개 OPML URL 표시"
-
-#: classes/pref/feeds.php:1488
-msgid "Firefox integration"
-msgstr "Firefox 연동"
-
-#: classes/pref/feeds.php:1490
-msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
-msgstr "Tiny Tiny RSS를 Firefox Feed Reader로 사용하려면 아래 링크를 클릭하세요."
-
-#: classes/pref/feeds.php:1497
-msgid "Click here to register this site as a feed reader."
-msgstr "이 사이트를 피드 리더로 등록하려면 여기를 클릭하세요"
-
-#: classes/pref/feeds.php:1505
-msgid "Published & shared articles / Generated feeds"
-msgstr "공개, 공유된 글 / 생성된 피드"
-
-#: classes/pref/feeds.php:1507
-msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
-msgstr "공개된 글들은 RSS 피드로 공개되며, 누구든 아래 URL만으로 구독할 수 있습니다."
-
-#: classes/pref/feeds.php:1514
-#: classes/feeds.php:54
-#: classes/feeds.php:140
-msgid "View as RSS"
-msgstr "RSS로 보기"
-
-#: classes/pref/feeds.php:1515
-msgid "Display URL"
-msgstr "URL 표시"
-
-#: classes/pref/feeds.php:1518
-msgid "Clear all generated URLs"
-msgstr "이미 만들어진 URL 제거"
-
-#: classes/pref/feeds.php:1596
-msgid "These feeds have not been updated with new content for 3 months (oldest first):"
-msgstr "3개월 이상 업데이트 되지 않은 피드(오래된 순서):"
-
-#: classes/pref/feeds.php:1630
-#: classes/pref/feeds.php:1694
-msgid "Click to edit feed"
-msgstr "클릭하여 피드 편집"
-
-#: classes/pref/feeds.php:1648
-#: classes/pref/feeds.php:1714
-msgid "Unsubscribe from selected feeds"
-msgstr "선택된 피드 구독 해제 중..."
-
-#: classes/pref/feeds.php:1819
-msgid "Add one valid RSS feed per line (no feed detection is done)"
-msgstr ""
-
-#: classes/pref/feeds.php:1828
-msgid "Feeds to subscribe, One per line"
-msgstr ""
-
-#: classes/pref/feeds.php:1851
-msgid "Feeds require authentication."
-msgstr "인증이 필요한 피드"
-
-#: classes/pref/feeds.php:1858
-#: classes/feeds.php:1099
-#: classes/feeds.php:1153
-msgid "Subscribe"
-msgstr "구독"
-
-#: classes/pref/filters.php:151
-#, fuzzy
-msgid "Preview article"
-msgstr "記事フィルター"
-
-#: classes/pref/filters.php:239
-#: classes/pref/filters.php:518
-msgid "(inverse)"
-msgstr "반전"
-
-#: classes/pref/filters.php:235
-#: classes/pref/filters.php:517
-#, php-format
-msgid "%s on %s in %s %s"
-msgstr ""
-
-#: classes/pref/filters.php:354
-#: classes/pref/filters.php:827
-#: classes/pref/filters.php:942
-msgid "Match"
-msgstr "일치"
-
-#: classes/pref/filters.php:368
-#: classes/pref/filters.php:416
-#: classes/pref/filters.php:841
-#: classes/pref/filters.php:868
-msgid "Add"
-msgstr "추가"
-
-#: classes/pref/filters.php:371
-#: classes/pref/filters.php:419
-#: classes/pref/filters.php:844
-#: classes/pref/filters.php:871
-#: classes/feeds.php:122
-msgid "Delete"
-msgstr "삭제"
-
-#: classes/pref/filters.php:402
-#: classes/pref/filters.php:854
-msgid "Apply actions"
-msgstr "동작 적용"
-
-#: classes/pref/filters.php:452
-#: classes/pref/filters.php:883
-msgid "Enabled"
-msgstr "활성화"
-
-#: classes/pref/filters.php:461
-#: classes/pref/filters.php:886
-msgid "Match any rule"
-msgstr "아무 규칙이나 적용"
-
-#: classes/pref/filters.php:470
-#: classes/pref/filters.php:889
-msgid "Inverse matching"
-msgstr "반대 적용"
-
-#: classes/pref/filters.php:482
-#: classes/pref/filters.php:896
-msgid "Test"
-msgstr "테스트"
-
-#: classes/pref/filters.php:756
-msgid "Combine"
-msgstr "병합"
-
-#: classes/pref/filters.php:899
-msgid "Create"
-msgstr "생성"
-
-#: classes/pref/filters.php:954
-msgid "Inverse regular expression matching"
-msgstr ""
-
-#: classes/pref/filters.php:956
-msgid "on field"
-msgstr "필드"
-
-#: classes/pref/filters.php:962
-#: js/PrefFilterTree.js:64
-msgid "in"
-msgstr ""
-
-#: classes/pref/filters.php:975
-#, fuzzy
-msgid "Wiki: Filters"
-msgstr "필터"
-
-#: classes/pref/filters.php:980
-msgid "Save rule"
-msgstr "규칙 저장"
-
-#: classes/pref/filters.php:980
-#: js/functions.js:865
-msgid "Add rule"
-msgstr "규칙 추가"
-
-#: classes/pref/filters.php:1003
-msgid "Perform Action"
-msgstr "동작 실행"
-
-#: classes/pref/filters.php:1054
-#, fuzzy
-msgid "No actions available"
-msgstr "새 버전 나왔어요!"
-
-#: classes/pref/filters.php:1073
-msgid "Save action"
-msgstr "저장 동작"
-
-#: classes/pref/filters.php:1073
-#: js/functions.js:887
-msgid "Add action"
-msgstr "동작 추가"
-
-#: classes/pref/filters.php:1097
-msgid "[No caption]"
-msgstr "[자막 없음]"
-
-#: classes/pref/filters.php:1099
-#, fuzzy, php-format
-msgid "%s (%d rule)"
-msgid_plural "%s (%d rules)"
-msgstr[0] "규칙 추가"
-
-#: classes/pref/filters.php:1114
-#, fuzzy
-msgid "matches any rule"
-msgstr "아무 규칙이나 적용"
-
-#: classes/pref/filters.php:1117
-#, fuzzy, php-format
-msgid "%s (+%d action)"
-msgid_plural "%s (+%d actions)"
-msgstr[0] "동작 추가"
-
 #: classes/pref/prefs.php:19
 msgid "Interface"
 msgstr "인터페이스"
@@ -2049,7 +1651,7 @@ msgid "Strip all but most common HTML tags when reading articles."
 msgstr ""
 
 #: classes/pref/prefs.php:53
-#: js/prefs.js:1584
+#: js/prefs.js:1580
 msgid "Customize stylesheet"
 msgstr "스타일시트 변경"
 
@@ -2117,6 +1719,14 @@ msgstr "계정 권한"
 msgid "Save data"
 msgstr "데이터 저장"
 
+#: classes/pref/prefs.php:245
+#: classes/pref/feeds.php:658
+#: classes/pref/feeds.php:878
+#: classes/pref/feeds.php:1813
+#: classes/feeds.php:1076
+msgid "Password"
+msgstr "암호"
+
 #: classes/pref/prefs.php:254
 msgid "Your password is at default value, please change it."
 msgstr "사용중인 암호가 기본 값입니다. 암호를 변경하세요."
@@ -2215,18 +1825,23 @@ msgstr "프로필 관리"
 msgid "Reset to defaults"
 msgstr "초기화"
 
+#: classes/pref/prefs.php:698
+#: classes/pref/feeds.php:772
+msgid "Plugins"
+msgstr "플러그인"
+
 #: classes/pref/prefs.php:700
 msgid "You will need to reload Tiny Tiny RSS for plugin changes to take effect."
 msgstr "변경 사항을 적용하기 위해서는 Tiny Tiny RSS를 새로 고침해야합니다."
 
-#: classes/pref/prefs.php:702
-msgid "Download more plugins at tt-rss.org <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forums</a> or <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a>."
-msgstr ""
-
-#: classes/pref/prefs.php:732
+#: classes/pref/prefs.php:730
 msgid "System plugins"
 msgstr "시스템 플러그인"
 
+#: classes/pref/prefs.php:731
+msgid "System plugins are enabled in <strong>config.php</strong> for all users."
+msgstr ""
+
 #: classes/pref/prefs.php:736
 #: classes/pref/prefs.php:792
 msgid "Plugin"
@@ -2296,6 +1911,339 @@ msgstr "선택된 프로필 삭제"
 msgid "Activate profile"
 msgstr "프로필 활성화"
 
+#: classes/pref/feeds.php:15
+msgid "Check to enable field"
+msgstr "필드 활성화 확인"
+
+#: classes/pref/feeds.php:65
+#: classes/pref/feeds.php:214
+#: classes/pref/feeds.php:258
+#: classes/pref/feeds.php:264
+#: classes/pref/feeds.php:290
+#, php-format
+msgid "(%d feed)"
+msgid_plural "(%d feeds)"
+msgstr[0] "(%d개의 피드)"
+
+#: classes/pref/feeds.php:561
+msgid "Feed Title"
+msgstr "피드 제목"
+
+#: classes/pref/feeds.php:595
+#: classes/pref/feeds.php:818
+#: classes/pref/feeds.php:1796
+#: classes/feeds.php:1048
+msgid "Place in category:"
+msgstr "카테고리 위치:"
+
+#: classes/pref/feeds.php:608
+#: classes/pref/feeds.php:832
+#, fuzzy
+msgid "Language:"
+msgstr "언어"
+
+#: classes/pref/feeds.php:615
+#: classes/pref/feeds.php:841
+msgid "Update"
+msgstr "업데이트"
+
+#: classes/pref/feeds.php:630
+#: classes/pref/feeds.php:857
+msgid "Article purging:"
+msgstr "글을 유지:"
+
+#: classes/pref/feeds.php:662
+msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
+msgstr ""
+
+#: classes/pref/feeds.php:681
+#: classes/pref/feeds.php:888
+msgid "Hide from Popular feeds"
+msgstr "인기 피드에서 숨김"
+
+#: classes/pref/feeds.php:693
+#: classes/pref/feeds.php:894
+msgid "Include in e-mail digest"
+msgstr "이메일 요약에 포함"
+
+#: classes/pref/feeds.php:706
+#: classes/pref/feeds.php:900
+msgid "Always display image attachments"
+msgstr ""
+
+#: classes/pref/feeds.php:719
+#: classes/pref/feeds.php:908
+msgid "Do not embed images"
+msgstr ""
+
+#: classes/pref/feeds.php:732
+#: classes/pref/feeds.php:916
+msgid "Cache media"
+msgstr ""
+
+#: classes/pref/feeds.php:744
+#: classes/pref/feeds.php:922
+msgid "Mark updated articles as unread"
+msgstr "업데이트된 글을 읽지 않음 표시"
+
+#: classes/pref/feeds.php:748
+msgid "Icon"
+msgstr "아이콘"
+
+#: classes/pref/feeds.php:765
+msgid "Replace"
+msgstr ""
+
+#: classes/pref/feeds.php:1174
+#: classes/pref/feeds.php:1227
+msgid "All done."
+msgstr "완료되었습니다."
+
+#: classes/pref/feeds.php:1282
+msgid "Feeds with errors"
+msgstr "오류가 있는 피드"
+
+#: classes/pref/feeds.php:1289
+msgid "Inactive feeds"
+msgstr "피드 비활성화"
+
+#: classes/pref/feeds.php:1325
+msgid "Edit selected feeds"
+msgstr "선택된 피드 편집"
+
+#: classes/pref/feeds.php:1329
+#: js/prefs.js:1618
+msgid "Batch subscribe"
+msgstr "일괄 구독"
+
+#: classes/pref/feeds.php:1336
+msgid "Categories"
+msgstr "카테고리"
+
+#: classes/pref/feeds.php:1339
+msgid "Add category"
+msgstr "카테고리 추가"
+
+#: classes/pref/feeds.php:1343
+msgid "Remove selected"
+msgstr "선택된 항목 제거"
+
+#: classes/pref/feeds.php:1354
+msgid "More actions..."
+msgstr "기타 동작..."
+
+#: classes/pref/feeds.php:1358
+msgid "Manual purge"
+msgstr "수동 남김"
+
+#: classes/pref/feeds.php:1362
+msgid "Clear feed data"
+msgstr "피드 데이터 정리"
+
+#: classes/pref/feeds.php:1416
+msgid "OPML"
+msgstr "OPML"
+
+#: classes/pref/feeds.php:1418
+msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
+msgstr "OPML을 사용하면 피드/필터/라벨/설정을 내보내고 불러올 수 있습니다."
+
+#: classes/pref/feeds.php:1419
+msgid "Only main settings profile can be migrated using OPML."
+msgstr ""
+
+#: classes/pref/feeds.php:1432
+msgid "Import my OPML"
+msgstr "내 OPML 불러오기"
+
+#: classes/pref/feeds.php:1438
+msgid "Filename:"
+msgstr ""
+
+#: classes/pref/feeds.php:1440
+msgid "Include settings"
+msgstr "설정 포함"
+
+#: classes/pref/feeds.php:1444
+msgid "Export OPML"
+msgstr "OPML 내보내기"
+
+#: classes/pref/feeds.php:1448
+msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
+msgstr "사용중인 OPML을 공개하면, 누구든 아래 URL만으로 구독할 수 있습니다."
+
+#: classes/pref/feeds.php:1452
+msgid "Public OPML URL"
+msgstr ""
+
+#: classes/pref/feeds.php:1453
+msgid "Display published OPML URL"
+msgstr "공개 OPML URL 표시"
+
+#: classes/pref/feeds.php:1462
+msgid "Firefox integration"
+msgstr "Firefox 연동"
+
+#: classes/pref/feeds.php:1464
+msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
+msgstr "Tiny Tiny RSS를 Firefox Feed Reader로 사용하려면 아래 링크를 클릭하세요."
+
+#: classes/pref/feeds.php:1471
+msgid "Click here to register this site as a feed reader."
+msgstr "이 사이트를 피드 리더로 등록하려면 여기를 클릭하세요"
+
+#: classes/pref/feeds.php:1479
+msgid "Published & shared articles / Generated feeds"
+msgstr "공개, 공유된 글 / 생성된 피드"
+
+#: classes/pref/feeds.php:1481
+msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
+msgstr "공개된 글들은 RSS 피드로 공개되며, 누구든 아래 URL만으로 구독할 수 있습니다."
+
+#: classes/pref/feeds.php:1488
+#: classes/feeds.php:54
+#: classes/feeds.php:140
+msgid "View as RSS"
+msgstr "RSS로 보기"
+
+#: classes/pref/feeds.php:1489
+msgid "Display URL"
+msgstr "URL 표시"
+
+#: classes/pref/feeds.php:1492
+msgid "Clear all generated URLs"
+msgstr "이미 만들어진 URL 제거"
+
+#: classes/pref/feeds.php:1570
+msgid "These feeds have not been updated with new content for 3 months (oldest first):"
+msgstr "3개월 이상 업데이트 되지 않은 피드(오래된 순서):"
+
+#: classes/pref/feeds.php:1604
+#: classes/pref/feeds.php:1668
+msgid "Click to edit feed"
+msgstr "클릭하여 피드 편집"
+
+#: classes/pref/feeds.php:1622
+#: classes/pref/feeds.php:1688
+msgid "Unsubscribe from selected feeds"
+msgstr "선택된 피드 구독 해제 중..."
+
+#: classes/pref/feeds.php:1793
+msgid "Add one valid RSS feed per line (no feed detection is done)"
+msgstr ""
+
+#: classes/pref/feeds.php:1802
+msgid "Feeds to subscribe, One per line"
+msgstr ""
+
+#: classes/pref/feeds.php:1825
+msgid "Feeds require authentication."
+msgstr "인증이 필요한 피드"
+
+#: classes/pref/feeds.php:1832
+#: classes/feeds.php:1092
+#: classes/feeds.php:1146
+msgid "Subscribe"
+msgstr "구독"
+
+#: classes/pref/system.php:29
+msgid "Error Log"
+msgstr ""
+
+#: classes/pref/system.php:40
+msgid "Refresh"
+msgstr "새로고침"
+
+#: classes/pref/system.php:43
+msgid "Clear log"
+msgstr "로그 지우기"
+
+#: classes/pref/system.php:48
+msgid "Error"
+msgstr ""
+
+#: classes/pref/system.php:49
+msgid "Filename"
+msgstr ""
+
+#: classes/pref/system.php:50
+msgid "Message"
+msgstr ""
+
+#: classes/pref/system.php:52
+msgid "Date"
+msgstr "날짜"
+
+#: classes/opml.php:28
+#: classes/opml.php:33
+msgid "OPML Utility"
+msgstr "OPML 유틸리티"
+
+#: classes/opml.php:37
+msgid "Importing OPML..."
+msgstr "OPML 불러오는중..."
+
+#: classes/opml.php:41
+msgid "Return to preferences"
+msgstr "설정으로 돌아가기"
+
+#: classes/opml.php:295
+#, php-format
+msgid "Adding feed: %s"
+msgstr "%s 피드를 추가하는중..."
+
+#: classes/opml.php:306
+#, php-format
+msgid "Duplicate feed: %s"
+msgstr "중복 피드: %s"
+
+#: classes/opml.php:320
+#, php-format
+msgid "Adding label %s"
+msgstr "%s에 라벨 추가중..."
+
+#: classes/opml.php:323
+#, php-format
+msgid "Duplicate label: %s"
+msgstr ""
+
+#: classes/opml.php:335
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr ""
+
+#: classes/opml.php:367
+msgid "Adding filter..."
+msgstr "필터를 추가하는중..."
+
+#: classes/opml.php:486
+#, php-format
+msgid "Processing category: %s"
+msgstr "카테고리 처리중: %s"
+
+#: classes/opml.php:532
+#, php-format
+msgid "Upload failed with error code %d"
+msgstr ""
+
+#: classes/opml.php:544
+#: plugins/import_export/init.php:448
+msgid "Unable to move uploaded file."
+msgstr "업로드된 파일을 이동할 수 없습니다."
+
+#: classes/opml.php:548
+#: plugins/import_export/init.php:452
+msgid "Error: please upload OPML file."
+msgstr "오류: OPML 파일을 업로드 하세요."
+
+#: classes/opml.php:559
+msgid "Error: unable to find moved OPML file."
+msgstr "오류: 이동된 OPML 파일을 찾을 수 없습니다."
+
+#: classes/opml.php:566
+msgid "Error while parsing document."
+msgstr "문서 분석중에 오류가 발생했습니다."
+
 #: classes/feeds.php:53
 msgid "View as RSS feed"
 msgstr "RSS 피드로 보기"
@@ -2336,8 +2284,8 @@ msgstr "돌아가기"
 
 #: classes/feeds.php:127
 #: classes/feeds.php:132
-#: plugins/mail/init.php:75
 #: plugins/mailto/init.php:25
+#: plugins/mail/init.php:75
 msgid "Forward by email"
 msgstr "이메일로 전달"
 
@@ -2345,263 +2293,256 @@ msgstr "이메일로 전달"
 msgid "Feed:"
 msgstr "피드"
 
-#: classes/feeds.php:229
-#: classes/feeds.php:892
+#: classes/feeds.php:228
+#: classes/feeds.php:885
 msgid "Feed not found."
 msgstr "피드가 없습니다."
 
-#: classes/feeds.php:300
+#: classes/feeds.php:291
 msgid "Never"
 msgstr "영원히"
 
-#: classes/feeds.php:413
+#: classes/feeds.php:405
 #, php-format
 msgid "Imported at %s"
 msgstr "%s에서 불러옴"
 
-#: classes/feeds.php:472
-#: classes/feeds.php:569
+#: classes/feeds.php:464
+#: classes/feeds.php:561
 msgid "mark feed as read"
 msgstr "피드 읽음 표시"
 
-#: classes/feeds.php:630
+#: classes/feeds.php:622
 msgid "Collapse article"
 msgstr "글 접기"
 
-#: classes/feeds.php:791
+#: classes/feeds.php:784
 msgid "No unread articles found to display."
 msgstr "읽지 않은 글이 없습니다."
 
-#: classes/feeds.php:794
+#: classes/feeds.php:787
 msgid "No updated articles found to display."
 msgstr "업데이트된 글이 없습니다."
 
-#: classes/feeds.php:797
+#: classes/feeds.php:790
 msgid "No starred articles found to display."
 msgstr "중요 표시된 글이 없습니다."
 
-#: classes/feeds.php:801
+#: classes/feeds.php:794
 msgid "No articles found to display. You can assign articles to labels manually from article header context menu (applies to all selected articles) or use a filter."
 msgstr "표시할 글이 없습니다. 필터를 사용하거나 글 제목을 우클릭해서 라벨을 추가할 수 있습니다."
 
-#: classes/feeds.php:803
+#: classes/feeds.php:796
 msgid "No articles found to display."
 msgstr "표시할 글이 없습니다."
 
-#: classes/feeds.php:818
-#: classes/feeds.php:992
+#: classes/feeds.php:811
+#: classes/feeds.php:985
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "%s에 마지막으로 업데이트 되었습니다."
 
-#: classes/feeds.php:828
-#: classes/feeds.php:1002
+#: classes/feeds.php:821
+#: classes/feeds.php:995
 msgid "Some feeds have update errors (click for details)"
 msgstr "일부 피드에 업데이트 오류가 있습니다 (상세 정보는 클릭)"
 
-#: classes/feeds.php:982
+#: classes/feeds.php:975
 msgid "No feed selected."
 msgstr "선택된 피드가 없습니다."
 
-#: classes/feeds.php:1041
-#: classes/feeds.php:1049
+#: classes/feeds.php:1034
+#: classes/feeds.php:1042
 msgid "Feed or site URL"
 msgstr "피드나 사이트 URL"
 
-#: classes/feeds.php:1063
+#: classes/feeds.php:1056
 msgid "Available feeds"
 msgstr "사용 가능한 피드"
 
-#: classes/feeds.php:1094
+#: classes/feeds.php:1087
 msgid "This feed requires authentication."
 msgstr "이 피드는 로그인이 필요합니다."
 
-#: classes/feeds.php:1102
+#: classes/feeds.php:1095
 msgid "More feeds"
 msgstr "기타 피드"
 
-#: classes/feeds.php:1129
+#: classes/feeds.php:1122
 msgid "Popular feeds"
 msgstr "인기 피드"
 
-#: classes/feeds.php:1130
+#: classes/feeds.php:1123
 msgid "Feed archive"
 msgstr "피드 보관"
 
-#: classes/feeds.php:1133
+#: classes/feeds.php:1126
 msgid "limit:"
 msgstr "제한:"
 
-#: classes/feeds.php:1165
+#: classes/feeds.php:1158
 msgid "Look for"
 msgstr ""
 
-#: classes/feeds.php:1173
+#: classes/feeds.php:1166
 #, php-format
 msgid "in %s"
 msgstr ""
 
-#: classes/feeds.php:1178
+#: classes/feeds.php:1171
 msgid "Used for word stemming"
 msgstr ""
 
-#: classes/feeds.php:1187
+#: classes/feeds.php:1180
 msgid "Search syntax"
 msgstr "문법 "
 
-#: plugins/instances/init.php:141
-msgid "Linked"
-msgstr "연결됨"
+#: classes/feeds.php:1596
+msgid "Starred articles"
+msgstr "중요 표시된 글"
 
-#: plugins/instances/init.php:204
-#: plugins/instances/init.php:395
-msgid "Instance"
-msgstr ""
+#: classes/feeds.php:1598
+msgid "Published articles"
+msgstr "공개 글"
 
-#: plugins/instances/init.php:215
-#: plugins/instances/init.php:312
-#: plugins/instances/init.php:404
-msgid "Instance URL"
-msgstr ""
+#: classes/feeds.php:1600
+msgid "Fresh articles"
+msgstr "새 글"
 
-#: plugins/instances/init.php:226
-#: plugins/instances/init.php:414
-msgid "Access key:"
-msgstr "접근 키:"
+#: classes/feeds.php:1604
+msgid "Archived articles"
+msgstr "보관 처리된 글"
 
-#: plugins/instances/init.php:229
-#: plugins/instances/init.php:313
-#: plugins/instances/init.php:417
-msgid "Access key"
-msgstr "접근 키"
+#: classes/feeds.php:1606
+msgid "Recently read"
+msgstr "최근에 읽은 글"
 
-#: plugins/instances/init.php:233
-#: plugins/instances/init.php:421
-msgid "Use one access key for both linked instances."
-msgstr ""
+#: classes/feeds.php:1716
+msgid "Special"
+msgstr "자동 분류"
 
-#: plugins/instances/init.php:241
-#: plugins/instances/init.php:429
-msgid "Generate new key"
-msgstr "새 키 생성"
+#: classes/feeds.php:1962
+#, php-format
+msgid "Search results: %s"
+msgstr "검색 결과: %s"
 
-#: plugins/instances/init.php:292
-msgid "Link instance"
-msgstr "링크 항목"
+#: plugins/vf_shared/init.php:16
+#: plugins/vf_shared/init.php:60
+#, fuzzy
+msgid "Shared articles"
+msgstr "중요 표시된 글"
 
-#: plugins/instances/init.php:304
-msgid "You can connect other instances of Tiny Tiny RSS to this one to share Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
+#: plugins/import_export/init.php:58
+msgid "Import and export"
 msgstr ""
 
-#: plugins/instances/init.php:314
-msgid "Last connected"
+#: plugins/import_export/init.php:60
+msgid "You can export and import your Starred and Archived articles for safekeeping or when migrating between tt-rss instances of same version."
 msgstr ""
 
-#: plugins/instances/init.php:315
-msgid "Status"
-msgstr ""
+#: plugins/import_export/init.php:65
+msgid "Export my data"
+msgstr "내 데이터 내보내기"
 
-#: plugins/instances/init.php:316
-msgid "Stored feeds"
-msgstr "저장된 피드"
+#: plugins/import_export/init.php:81
+msgid "Import"
+msgstr "불러오기"
 
-#: plugins/instances/init.php:433
-msgid "Create link"
-msgstr "링크 생성"
+#: plugins/import_export/init.php:231
+msgid "Could not import: incorrect schema version."
+msgstr "불러오기 실패: 잘못된 스키마 버전"
 
-#: plugins/nsfw/init.php:30
-#: plugins/nsfw/init.php:42
-msgid "Not work safe (click to toggle)"
+#: plugins/import_export/init.php:236
+msgid "Could not import: unrecognized document format."
 msgstr ""
 
-#: plugins/nsfw/init.php:52
-msgid "NSFW Plugin"
+#: plugins/import_export/init.php:397
+msgid "Finished: "
 msgstr ""
 
-#: plugins/nsfw/init.php:79
-msgid "Tags to consider NSFW (comma-separated)"
-msgstr ""
+#: plugins/import_export/init.php:398
+#, php-format
+msgid "%d article processed, "
+msgid_plural "%d articles processed, "
+msgstr[0] "%d개의 글이 처리되었습니다, "
 
-#: plugins/nsfw/init.php:100
-msgid "Configuration saved."
-msgstr "설정이 저장되었습니다."
+#: plugins/import_export/init.php:399
+#, php-format
+msgid "%d imported, "
+msgid_plural "%d imported, "
+msgstr[0] "%d를 불러왔습니다,"
 
-#: plugins/note/init.php:26
-#: plugins/note/note.js:11
-msgid "Edit article note"
-msgstr "글 노트 편집"
+#: plugins/import_export/init.php:400
+#, php-format
+msgid "%d feed created."
+msgid_plural "%d feeds created."
+msgstr[0] "%d개의 피드가 생성되었습니다."
 
-#: plugins/vf_shared/init.php:16
-#: plugins/vf_shared/init.php:69
-#, fuzzy
-msgid "Shared articles"
-msgstr "중요 표시된 글"
+#: plugins/import_export/init.php:405
+msgid "Could not load XML document."
+msgstr ""
 
-#: plugins/auth_internal/init.php:65
-msgid "Please enter your one time password:"
-msgstr "OTP를 입력하세요:"
+#: plugins/import_export/init.php:417
+msgid "Prepare data"
+msgstr "데이터 준비"
 
-#: plugins/auth_internal/init.php:188
-msgid "Password has been changed."
-msgstr "암호가 변경되었습니다."
+#: plugins/import_export/init.php:434
+#, php-format
+msgid "Upload failed with error code %d (%s)"
+msgstr ""
 
-#: plugins/auth_internal/init.php:190
-msgid "Old password is incorrect."
-msgstr "현재 암호가 틀립니다."
+#: plugins/import_export/init.php:460
+msgid "No file uploaded."
+msgstr "업로드된 파일 없음."
 
-#: plugins/af_readability/init.php:21
-msgid "Data saved."
+#: plugins/mailto/init.php:48
+#: plugins/mailto/init.php:54
+#: plugins/mail/init.php:112
+#: plugins/mail/init.php:118
+msgid "[Forwarded]"
 msgstr ""
 
-#: plugins/af_readability/init.php:33
-#, fuzzy
-msgid "Inline content"
-msgstr "記事の内容をスクロールする"
+#: plugins/mailto/init.php:48
+#: plugins/mail/init.php:112
+msgid "Multiple articles"
+msgstr "여러 글"
 
-#: plugins/af_readability/init.php:39
-msgid "Readability settings (af_readability)"
+#: plugins/mailto/init.php:70
+msgid "Clicking the following link to invoke your mail client:"
 msgstr ""
 
-#: plugins/af_readability/init.php:66
-msgid "Use Readability for pages shared via bookmarklet."
-msgstr ""
+#: plugins/mailto/init.php:74
+msgid "Forward selected article(s) by email."
+msgstr "선택된 글이 이메일로 전달되었습니다."
 
-#: plugins/af_readability/init.php:78
-#: plugins/af_psql_trgm/init.php:191
-msgid "Currently enabled for (click to edit):"
+#: plugins/mailto/init.php:77
+msgid "You should be able to edit the message before sending in your mail client."
 msgstr ""
 
-#: plugins/af_readability/init.php:95
-#, fuzzy
-msgid "Readability"
-msgstr "가능한지 확인"
-
-#: plugins/af_readability/init.php:106
-#, fuzzy
-msgid "Inline article content"
-msgstr "記事の内容をスクロールする"
+#: plugins/mailto/init.php:82
+msgid "Close this dialog"
+msgstr "이 창 닫기"
 
-#: plugins/af_redditimgur/init.php:25
-msgid "Reddit content settings (af_redditimgur)"
+#: plugins/bookmarklets/init.php:20
+msgid "Bookmarklets"
 msgstr ""
 
-#: plugins/af_redditimgur/init.php:50
-msgid "Uses Readability (full-text-rss) implementation by <a target='_blank' href='https://bitbucket.org/fivefilters/'>FiveFilters.org</a>"
+#: plugins/bookmarklets/init.php:22
+msgid "Drag the link below to your browser toolbar, open the feed you're interested in in your browser and click on the link to subscribe to it."
 msgstr ""
 
-#: plugins/af_redditimgur/init.php:54
-msgid "Extract missing content using Readability"
-msgstr ""
+#: plugins/bookmarklets/init.php:26
+#, php-format
+msgid "Subscribe to %s in Tiny Tiny RSS?"
+msgstr "Tiny Tiny RSS에서 %s를 구독할까요?"
 
-#: plugins/af_redditimgur/init.php:59
-msgid "Enable additional duplicate checking"
-msgstr ""
+#: plugins/bookmarklets/init.php:31
+msgid "Subscribe in Tiny Tiny RSS"
+msgstr "Tiny Tiny RSS 구독 목록"
 
-#: plugins/af_redditimgur/init.php:73
-#: plugins/af_zz_imgproxy/init.php:225
-#, fuzzy
-msgid "Configuration saved"
-msgstr "설정이 저장되었습니다."
+#: plugins/bookmarklets/init.php:34
+msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
+msgstr ""
 
 #: plugins/af_psql_trgm/init.php:28
 #, php-format
@@ -2641,84 +2582,62 @@ msgstr ""
 msgid "Enable for all feeds:"
 msgstr "フィード一覧のアイコンを有効にする"
 
-#: plugins/af_psql_trgm/init.php:209
-msgid "Similarity (pg_trgm)"
-msgstr ""
-
-#: plugins/af_comics/init.php:40
-msgid "Feeds supported by af_comics"
+#: plugins/af_psql_trgm/init.php:191
+#: plugins/af_readability/init.php:78
+msgid "Currently enabled for (click to edit):"
 msgstr ""
 
-#: plugins/af_comics/init.php:42
-msgid "The following comics are currently supported:"
+#: plugins/af_psql_trgm/init.php:209
+msgid "Similarity (pg_trgm)"
 msgstr ""
 
-#: plugins/af_comics/init.php:60
-msgid "GoComics requires a specific URL to workaround their lack of feed support: <code>http://feeds.feedburner.com/uclick/<em>comic_name</em></code> (e.g. <code>http://www.gocomics.com/garfield</code> uses <code>http://feeds.feedburner.com/uclick/garfield</code>)."
+#: plugins/nsfw/init.php:30
+#: plugins/nsfw/init.php:42
+msgid "Not work safe (click to toggle)"
 msgstr ""
 
-#: plugins/import_export/init.php:58
-msgid "Import and export"
+#: plugins/nsfw/init.php:52
+msgid "NSFW Plugin"
 msgstr ""
 
-#: plugins/import_export/init.php:60
-msgid "You can export and import your Starred and Archived articles for safekeeping or when migrating between tt-rss instances of same version."
+#: plugins/nsfw/init.php:79
+msgid "Tags to consider NSFW (comma-separated)"
 msgstr ""
 
-#: plugins/import_export/init.php:65
-msgid "Export my data"
-msgstr "내 데이터 내보내기"
-
-#: plugins/import_export/init.php:81
-msgid "Import"
-msgstr "불러오기"
-
-#: plugins/import_export/init.php:225
-msgid "Could not import: incorrect schema version."
-msgstr "불러오기 실패: 잘못된 스키마 버전"
+#: plugins/nsfw/init.php:100
+msgid "Configuration saved."
+msgstr "설정이 저장되었습니다."
 
-#: plugins/import_export/init.php:230
-msgid "Could not import: unrecognized document format."
-msgstr ""
+#: plugins/toggle_sidebar/init.php:23
+msgid "Collapse feedlist"
+msgstr "피드목록 접기"
 
-#: plugins/import_export/init.php:391
-msgid "Finished: "
+#: plugins/af_readability/init.php:21
+msgid "Data saved."
 msgstr ""
 
-#: plugins/import_export/init.php:392
-#, php-format
-msgid "%d article processed, "
-msgid_plural "%d articles processed, "
-msgstr[0] "%d개의 글이 처리되었습니다, "
-
-#: plugins/import_export/init.php:393
-#, php-format
-msgid "%d imported, "
-msgid_plural "%d imported, "
-msgstr[0] "%d를 불러왔습니다,"
-
-#: plugins/import_export/init.php:394
-#, php-format
-msgid "%d feed created."
-msgid_plural "%d feeds created."
-msgstr[0] "%d개의 피드가 생성되었습니다."
+#: plugins/af_readability/init.php:33
+#, fuzzy
+msgid "Inline content"
+msgstr "記事の内容をスクロールする"
 
-#: plugins/import_export/init.php:399
-msgid "Could not load XML document."
+#: plugins/af_readability/init.php:39
+msgid "Readability settings (af_readability)"
 msgstr ""
 
-#: plugins/import_export/init.php:411
-msgid "Prepare data"
-msgstr "데이터 준비"
-
-#: plugins/import_export/init.php:428
-#, php-format
-msgid "Upload failed with error code %d (%s)"
+#: plugins/af_readability/init.php:66
+msgid "Use Readability for pages shared via bookmarklet."
 msgstr ""
 
-#: plugins/import_export/init.php:454
-msgid "No file uploaded."
-msgstr "업로드된 파일 없음."
+#: plugins/af_readability/init.php:95
+#, fuzzy
+msgid "Readability"
+msgstr "가능한지 확인"
+
+#: plugins/af_readability/init.php:106
+#, fuzzy
+msgid "Inline article content"
+msgstr "記事の内容をスクロールする"
 
 #: plugins/mail/init.php:28
 msgid "Mail addresses saved."
@@ -2733,18 +2652,6 @@ msgstr "사용자 플러그인"
 msgid "You can set predefined email addressed here (comma-separated list):"
 msgstr ""
 
-#: plugins/mail/init.php:112
-#: plugins/mail/init.php:118
-#: plugins/mailto/init.php:49
-#: plugins/mailto/init.php:55
-msgid "[Forwarded]"
-msgstr ""
-
-#: plugins/mail/init.php:112
-#: plugins/mailto/init.php:49
-msgid "Multiple articles"
-msgstr "여러 글"
-
 #: plugins/mail/init.php:140
 msgid "To:"
 msgstr "받는 사람:"
@@ -2757,91 +2664,110 @@ msgstr "제목:"
 msgid "Send e-mail"
 msgstr "이메일 전송"
 
-#: plugins/close_button/init.php:22
-msgid "Close article"
-msgstr "글 닫기"
+#: plugins/share/init.php:39
+msgid "You can disable all articles shared by unique URLs here."
+msgstr "아래의 개별 URL로 공유된 모든 글들이 공유 중단됩니다."
 
-#: plugins/bookmarklets/init.php:20
-msgid "Bookmarklets"
-msgstr ""
+#: plugins/share/init.php:42
+msgid "Unshare all articles"
+msgstr "모든 글 공유중단"
 
-#: plugins/bookmarklets/init.php:22
-msgid "Drag the link below to your browser toolbar, open the feed you're interested in in your browser and click on the link to subscribe to it."
-msgstr ""
+#: plugins/share/init.php:75
+msgid "Share by URL"
+msgstr "URL로 공유"
 
-#: plugins/bookmarklets/init.php:26
-#, php-format
-msgid "Subscribe to %s in Tiny Tiny RSS?"
-msgstr "Tiny Tiny RSS에서 %s를 구독할까요?"
+#: plugins/share/init.php:96
+msgid "You can share this article by the following unique URL:"
+msgstr ""
 
-#: plugins/bookmarklets/init.php:31
-msgid "Subscribe in Tiny Tiny RSS"
-msgstr "Tiny Tiny RSS 구독 목록"
+#: plugins/share/init.php:114
+#, fuzzy
+msgid "Unshare article"
+msgstr "중요 표시 해제"
 
-#: plugins/bookmarklets/init.php:34
-msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
+#: plugins/af_comics/init.php:48
+msgid "Feeds supported by af_comics"
 msgstr ""
 
-#: plugins/toggle_sidebar/init.php:23
-msgid "Collapse feedlist"
-msgstr "피드목록 접기"
+#: plugins/af_comics/init.php:50
+msgid "The following comics are currently supported:"
+msgstr ""
 
-#: plugins/af_zz_imgproxy/init.php:186
-msgid "Image proxy settings (af_zz_imgproxy)"
+#: plugins/af_comics/init.php:68
+msgid "GoComics requires a specific URL to workaround their lack of feed support: <code>http://feeds.feedburner.com/uclick/<em>comic_name</em></code> (e.g. <code>http://www.gocomics.com/garfield</code> uses <code>http://feeds.feedburner.com/uclick/garfield</code>)."
 msgstr ""
 
-#: plugins/af_zz_imgproxy/init.php:211
-#, fuzzy
-msgid "Enable proxy for all remote images."
-msgstr "フィード一覧のアイコンを有効にする"
+#: plugins/af_comics/init.php:70
+msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
+msgstr ""
 
-#: plugins/mailto/init.php:71
-msgid "Clicking the following link to invoke your mail client:"
+#: plugins/af_redditimgur/init.php:25
+msgid "Reddit content settings (af_redditimgur)"
 msgstr ""
 
-#: plugins/mailto/init.php:75
-msgid "Forward selected article(s) by email."
-msgstr "선택된 글이 이메일로 전달되었습니다."
+#: plugins/af_redditimgur/init.php:50
+msgid "Uses Readability (full-text-rss) implementation by <a target='_blank' href='https://bitbucket.org/fivefilters/'>FiveFilters.org</a>"
+msgstr ""
 
-#: plugins/mailto/init.php:78
-msgid "You should be able to edit the message before sending in your mail client."
+#: plugins/af_redditimgur/init.php:54
+msgid "Extract missing content using Readability"
 msgstr ""
 
-#: plugins/mailto/init.php:83
-msgid "Close this dialog"
-msgstr "이 창 닫기"
+#: plugins/af_redditimgur/init.php:59
+msgid "Enable additional duplicate checking"
+msgstr ""
 
-#: plugins/share/init.php:39
-msgid "You can disable all articles shared by unique URLs here."
-msgstr "아래의 개별 URL로 공유된 모든 글들이 공유 중단됩니다."
+#: plugins/af_redditimgur/init.php:73
+#: plugins/af_zz_imgproxy/init.php:254
+#, fuzzy
+msgid "Configuration saved"
+msgstr "설정이 저장되었습니다."
 
-#: plugins/share/init.php:42
-msgid "Unshare all articles"
-msgstr "모든 글 공유중단"
+#: plugins/note/init.php:26
+#: plugins/note/note.js:11
+msgid "Edit article note"
+msgstr "글 노트 편집"
 
-#: plugins/share/init.php:75
-msgid "Share by URL"
-msgstr "URL로 공유"
+#: plugins/close_button/init.php:25
+msgid "Close article"
+msgstr "글 닫기"
 
-#: plugins/share/init.php:97
-msgid "You can share this article by the following unique URL:"
+#: plugins/af_zz_imgproxy/init.php:210
+msgid "Image proxy settings (af_zz_imgproxy)"
 msgstr ""
 
-#: plugins/share/init.php:115
+#: plugins/af_zz_imgproxy/init.php:234
 #, fuzzy
-msgid "Unshare article"
-msgstr "중요 표시 해제"
+msgid "Enable proxy for all remote images."
+msgstr "フィード一覧のアイコンを有効にする"
+
+#: plugins/af_zz_imgproxy/init.php:238
+#, fuzzy
+msgid "Don't cache files locally."
+msgstr "이미지를 로컬에 캐쉬"
+
+#: plugins/auth_internal/init.php:65
+msgid "Please enter your one time password:"
+msgstr "OTP를 입력하세요:"
+
+#: plugins/auth_internal/init.php:188
+msgid "Password has been changed."
+msgstr "암호가 변경되었습니다."
+
+#: plugins/auth_internal/init.php:190
+msgid "Old password is incorrect."
+msgstr "현재 암호가 틀립니다."
 
 #: js/FeedTree.js:172
 #, fuzzy
 msgid "(Un)collapse"
 msgstr "사이드바 숨김/표시"
 
-#: js/PrefFeedTree.js:52
+#: js/PrefFeedTree.js:54
 msgid "Edit category"
 msgstr "카테고리 편집"
 
-#: js/PrefFeedTree.js:59
+#: js/PrefFeedTree.js:61
 msgid "Remove category"
 msgstr "카테고리 제거"
 
@@ -2876,63 +2802,55 @@ msgid "Create Filter"
 msgstr "필터 생성"
 
 #: js/functions.js:1128
-msgid "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification hub again on next feed update."
-msgstr ""
-
-#: js/functions.js:1139
-msgid "Subscription reset."
-msgstr "구독이 초기화되었습니다."
-
-#: js/functions.js:1149
-#: js/tt-rss.js:695
+#: js/tt-rss.js:696
 #, perl-format
 msgid "Unsubscribe from %s?"
 msgstr "%s를 구독 해제 할까요?"
 
-#: js/functions.js:1152
+#: js/functions.js:1131
 msgid "Removing feed..."
 msgstr "피드 제거중..."
 
-#: js/functions.js:1225
+#: js/functions.js:1204
 msgid "Please enter category title:"
 msgstr "카테고리 이름을 입력하세요:"
 
-#: js/functions.js:1250
+#: js/functions.js:1229
 msgid "Generate new syndication address for this feed?"
 msgstr ""
 
-#: js/functions.js:1254
-#: js/prefs.js:1154
+#: js/functions.js:1233
+#: js/prefs.js:1150
 msgid "Trying to change address..."
 msgstr "주소 변경중..."
 
-#: js/functions.js:1497
-#: js/functions.js:1606
+#: js/functions.js:1476
+#: js/functions.js:1585
 #: js/prefs.js:398
 #: js/prefs.js:424
 #: js/prefs.js:456
 #: js/prefs.js:599
 #: js/prefs.js:617
-#: js/prefs.js:1136
-#: js/prefs.js:1263
+#: js/prefs.js:1132
+#: js/prefs.js:1259
 msgid "No feeds are selected."
 msgstr "선택된 피드가 없습니다."
 
-#: js/functions.js:1540
+#: js/functions.js:1519
 msgid "Remove selected feeds from the archive? Feeds with stored articles will not be removed."
 msgstr ""
 
-#: js/functions.js:1577
+#: js/functions.js:1556
 msgid "Feeds with update errors"
 msgstr "업데이트 오류가 있는 피드"
 
-#: js/functions.js:1588
-#: js/prefs.js:1117
+#: js/functions.js:1567
+#: js/prefs.js:1113
 msgid "Remove selected feeds?"
 msgstr "선택된 피드를 제거할까요?"
 
-#: js/functions.js:1591
-#: js/prefs.js:1120
+#: js/functions.js:1570
+#: js/prefs.js:1116
 msgid "Removing selected feeds..."
 msgstr "선택된 피드 제거중..."
 
@@ -2955,9 +2873,7 @@ msgstr "사용자 편집기"
 #: js/prefs.js:100
 #: js/prefs.js:209
 #: js/prefs.js:706
-#: plugins/instances/instances.js:26
-#: plugins/instances/instances.js:89
-#: js/functions.js:1408
+#: js/functions.js:1387
 msgid "Saving data..."
 msgstr "데이터 저장중..."
 
@@ -2982,7 +2898,7 @@ msgid "Removing selected labels..."
 msgstr "라벨 삭제중..."
 
 #: js/prefs.js:308
-#: js/prefs.js:1304
+#: js/prefs.js:1300
 msgid "No labels are selected."
 msgstr "선택된 라벨이 없습니다."
 
@@ -3081,28 +2997,28 @@ msgstr "선택한 피드에 수정 사항을 반영할까요?"
 msgid "OPML Import"
 msgstr "OPML 불러오기"
 
-#: js/prefs.js:764
+#: js/prefs.js:759
 msgid "Please choose an OPML file first."
 msgstr "먼저 OPML 파일을 선택하세요."
 
-#: js/prefs.js:767
+#: js/prefs.js:762
 #: plugins/import_export/import_export.js:115
 msgid "Importing, please wait..."
 msgstr "불러오는 중입니다. 화장실이라도 다녀오시죠?"
 
-#: js/prefs.js:928
+#: js/prefs.js:924
 msgid "Reset to defaults?"
 msgstr "초기화 할까요?"
 
-#: js/prefs.js:1628
+#: js/prefs.js:1624
 msgid "Subscribing to feeds..."
 msgstr "피드 구독하는중..."
 
-#: js/prefs.js:1647
+#: js/prefs.js:1643
 msgid "Clear stored data for this plugin?"
 msgstr ""
 
-#: js/prefs.js:1661
+#: js/prefs.js:1657
 msgid "Clear all messages in the error log?"
 msgstr ""
 
@@ -3114,174 +3030,144 @@ msgstr "모든 글을 읽음 표시 할까요?"
 msgid "Marking all feeds as read..."
 msgstr "모든 피드를 읽음 표시중..."
 
-#: js/tt-rss.js:401
+#: js/tt-rss.js:402
 msgid "Please enable mail plugin first."
 msgstr "먼저 메일 플러그인을 켜세요."
 
-#: js/tt-rss.js:449
-#: js/functions.js:1387
-#: js/tt-rss.js:676
+#: js/tt-rss.js:450
+#: js/functions.js:1366
+#: js/tt-rss.js:677
 msgid "You can't edit this kind of feed."
 msgstr "이 형식의 피드는 편집할 수 없습니다."
 
-#: js/tt-rss.js:530
+#: js/tt-rss.js:531
 msgid "Please enable embed_original plugin first."
 msgstr "먼저 embed_original 플러그인을 켜세요."
 
-#: js/tt-rss.js:543
-#: js/tt-rss.js:726
+#: js/tt-rss.js:544
+#: js/tt-rss.js:727
 msgid "Widescreen is not available in combined mode."
 msgstr ""
 
-#: js/tt-rss.js:824
+#: js/tt-rss.js:825
 msgid "You can't rescore this kind of feed."
 msgstr "이 형식의 피드는 점수를 새로 매길 수 없습니다."
 
-#: js/tt-rss.js:829
-#: js/tt-rss.js:689
+#: js/tt-rss.js:830
+#: js/tt-rss.js:690
 msgid "Please select some feed first."
 msgstr "피드를 먼저 선택하세요."
 
-#: js/tt-rss.js:834
+#: js/tt-rss.js:835
 #, perl-format
 msgid "Rescore articles in %s?"
 msgstr "%s의 글의 점수를 다시 매길까요?"
 
-#: js/tt-rss.js:837
+#: js/tt-rss.js:838
 msgid "Rescoring articles..."
 msgstr "글 점수 다시 매기는중..."
 
-#: js/viewfeed.js:919
-#: js/viewfeed.js:957
-#: js/viewfeed.js:1005
-#: js/viewfeed.js:1931
-#: plugins/mail/mail.js:7
+#: js/viewfeed.js:921
+#: js/viewfeed.js:959
+#: js/viewfeed.js:1007
+#: js/viewfeed.js:1933
 #: plugins/mailto/init.js:7
-#: js/viewfeed.js:677
-#: js/viewfeed.js:699
-#: js/viewfeed.js:720
-#: js/viewfeed.js:779
-#: js/viewfeed.js:807
+#: plugins/mail/mail.js:7
+#: js/viewfeed.js:679
+#: js/viewfeed.js:701
+#: js/viewfeed.js:722
+#: js/viewfeed.js:781
+#: js/viewfeed.js:809
 msgid "No articles are selected."
 msgstr "선택된 글이 없습니다."
 
-#: js/viewfeed.js:927
+#: js/viewfeed.js:929
 #, fuzzy, perl-format
 msgid "Delete %d selected article in %s?"
 msgid_plural "Delete %d selected articles in %s?"
 msgstr[0] "%s에서 선택된 %d개 글을 삭제 할까요?"
 
-#: js/viewfeed.js:929
+#: js/viewfeed.js:931
 #, perl-format
 msgid "Delete %d selected article?"
 msgid_plural "Delete %d selected articles?"
 msgstr[0] "선택된 %d개 글을 삭제할까요?"
 
-#: js/viewfeed.js:966
+#: js/viewfeed.js:968
 #, fuzzy, perl-format
 msgid "Archive %d selected article in %s?"
 msgid_plural "Archive %d selected articles in %s?"
 msgstr[0] "%s에서 선택된 %d개 글을 보관 처리 할까요?"
 
-#: js/viewfeed.js:969
+#: js/viewfeed.js:971
 #, perl-format
 msgid "Move %d archived article back?"
 msgid_plural "Move %d archived articles back?"
 msgstr[0] "보관 처리된 %d개의 글을 다시 옮길까요?"
 
-#: js/viewfeed.js:971
+#: js/viewfeed.js:973
 msgid "Please note that unstarred articles might get purged on next feed update."
 msgstr ""
 
-#: js/viewfeed.js:1011
+#: js/viewfeed.js:1013
 #, fuzzy, perl-format
 msgid "Mark %d selected article in %s as read?"
 msgid_plural "Mark %d selected articles in %s as read?"
 msgstr[0] "%s에서 선택된 %d개 글을 읽음 표시 할까요?"
 
-#: js/viewfeed.js:1031
+#: js/viewfeed.js:1033
 msgid "Edit article Tags"
 msgstr "글 태그 편집"
 
-#: js/viewfeed.js:1037
+#: js/viewfeed.js:1039
 msgid "Saving article tags..."
 msgstr "글의 태그 저장 중..."
 
-#: js/viewfeed.js:1670
+#: js/viewfeed.js:1672
 msgid "Open original article"
 msgstr "원본 글 열기"
 
-#: js/viewfeed.js:1677
+#: js/viewfeed.js:1679
 msgid "Display article URL"
 msgstr "글 URL 표시"
 
-#: js/viewfeed.js:1787
+#: js/viewfeed.js:1789
 msgid "Assign label"
 msgstr "라벨 적용"
 
-#: js/viewfeed.js:1792
+#: js/viewfeed.js:1794
 msgid "Remove label"
 msgstr "라벨 제거"
 
-#: js/viewfeed.js:1824
+#: js/viewfeed.js:1826
 #, fuzzy
 msgid "Select articles in group"
 msgstr "커서위치의 글 선택"
 
-#: js/viewfeed.js:1834
+#: js/viewfeed.js:1836
 #, fuzzy
 msgid "Mark group as read"
 msgstr "읽음 표시"
 
-#: js/viewfeed.js:1846
+#: js/viewfeed.js:1848
 msgid "Mark feed as read"
 msgstr "피드 읽음 표시"
 
-#: js/viewfeed.js:1899
+#: js/viewfeed.js:1901
 msgid "Please enter new score for selected articles:"
 msgstr "선택된 글의 점수를 새로 매기세요:"
 
-#: js/viewfeed.js:1962
+#: js/viewfeed.js:1964
 msgid "Please enter new score for this article:"
 msgstr "이 글의 점수를 새로 매기세요:"
 
-#: js/viewfeed.js:1993
+#: js/viewfeed.js:1995
 msgid "Article URL:"
 msgstr "글 URL:"
 
-#: plugins/instances/instances.js:10
-msgid "Link Instance"
-msgstr "링크 항목"
-
-#: plugins/instances/instances.js:73
-msgid "Edit Instance"
-msgstr "항목 편집"
-
-#: plugins/instances/instances.js:122
-msgid "Remove selected instances?"
-msgstr "선택된 항목을 제거할까요?"
-
-#: plugins/instances/instances.js:125
-msgid "Removing selected instances..."
-msgstr "선택된 항목 제거중..."
-
-#: plugins/instances/instances.js:139
-#: plugins/instances/instances.js:151
-msgid "No instances are selected."
-msgstr "선택된 항목이 없습니다."
-
-#: plugins/instances/instances.js:156
-msgid "Please select only one instance."
-msgstr "항목을 하나만 선택하세요."
-
-#: plugins/note/note.js:17
-msgid "Saving article note..."
-msgstr "글 노트 저장중..."
-
-#: plugins/af_psql_trgm/init.js:11
-#, fuzzy
-msgid "Related articles"
-msgstr "記事を消去する"
+#: plugins/embed_original/init.js:6
+msgid "Sorry, your browser does not support sandboxed iframes."
+msgstr ""
 
 #: plugins/import_export/import_export.js:13
 msgid "Export Data"
@@ -3302,11 +3188,16 @@ msgstr "데이터 불러오기"
 msgid "Please choose the file first."
 msgstr "먼저 파일을 선택하세요."
 
-#: plugins/mail/mail.js:21
 #: plugins/mailto/init.js:21
+#: plugins/mail/mail.js:21
 msgid "Forward article by email"
 msgstr "이메일로 글 전달"
 
+#: plugins/af_psql_trgm/init.js:11
+#, fuzzy
+msgid "Related articles"
+msgstr "記事を消去する"
+
 #: plugins/mail/mail.js:36
 msgid "Error sending email:"
 msgstr ""
@@ -3316,10 +3207,6 @@ msgstr ""
 msgid "Your message has been sent."
 msgstr "개인 정보가 저장되었습니다."
 
-#: plugins/embed_original/init.js:6
-msgid "Sorry, your browser does not support sandboxed iframes."
-msgstr ""
-
 #: plugins/shorten_expanded/init.js:39
 msgid "Click to expand article"
 msgstr "글을 펼쳐보려면 클릭하세요"
@@ -3352,7 +3239,7 @@ msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr ""
 
 #: plugins/share/share_prefs.js:6
-#: js/prefs.js:1437
+#: js/prefs.js:1433
 msgid "Clearing URLs..."
 msgstr "URL 지우는중..."
 
@@ -3360,23 +3247,44 @@ msgstr "URL 지우는중..."
 msgid "Shared URLs cleared."
 msgstr ""
 
+#: plugins/note/note.js:17
+msgid "Saving article note..."
+msgstr "글 노트 저장중..."
+
 #: js/feedlist.js:429
-#: js/feedlist.js:496
 msgid "Mark all articles in %s as read?"
 msgstr "%s의 모든 글을 읽음 표시 할까요?"
 
 #: js/feedlist.js:487
-msgid "Mark all articles in %s older than 1 day as read?"
+#, fuzzy
+msgid "Mark %w in %s older than 1 day as read?"
 msgstr "하루 이상 지난 %s의 모든 글을 읽음 표시 할까요?"
 
 #: js/feedlist.js:490
-msgid "Mark all articles in %s older than 1 week as read?"
+#, fuzzy
+msgid "Mark %w in %s older than 1 week as read?"
 msgstr "1주일 이상 지난 %s의 모든 글을 읽음 표시 할까요?"
 
 #: js/feedlist.js:493
-msgid "Mark all articles in %s older than 2 weeks as read?"
+#, fuzzy
+msgid "Mark %w in %s older than 2 weeks as read?"
 msgstr "2주일 이상 지난 %s의 모든 글을 읽음 표시 할까요?"
 
+#: js/feedlist.js:496
+#, fuzzy
+msgid "Mark %w in %s as read?"
+msgstr "%s의 모든 글을 읽음 표시 할까요?"
+
+#: js/feedlist.js:499
+#, fuzzy
+msgid "search results"
+msgstr "검색 결과: %s"
+
+#: js/feedlist.js:499
+#, fuzzy
+msgid "all articles"
+msgstr "전체 글"
+
 #: js/functions.js:506
 msgid "Error explained"
 msgstr ""
@@ -3457,178 +3365,220 @@ msgstr "이미 구독중인 피드입니다."
 msgid "Edit rule"
 msgstr "규칙 편집"
 
-#: js/functions.js:1402
+#: js/functions.js:1381
 msgid "Edit Feed"
 msgstr "피드 편집"
 
-#: js/functions.js:1435
+#: js/functions.js:1414
 msgid "More Feeds"
 msgstr "기타 피드"
 
-#: js/functions.js:1631
+#: js/functions.js:1610
 msgid "Help"
 msgstr "도움말"
 
-#: js/prefs.js:1032
+#: js/prefs.js:1028
 msgid "Remove category %s? Any nested feeds would be placed into Uncategorized."
 msgstr ""
 
-#: js/prefs.js:1038
+#: js/prefs.js:1034
 msgid "Removing category..."
 msgstr "카테고리 제거중..."
 
-#: js/prefs.js:1056
+#: js/prefs.js:1052
 msgid "Remove selected categories?"
 msgstr "선택한 카테고리를 삭제할까요?"
 
-#: js/prefs.js:1059
+#: js/prefs.js:1055
 msgid "Removing selected categories..."
 msgstr "카테고리 삭제중..."
 
-#: js/prefs.js:1072
+#: js/prefs.js:1068
 msgid "No categories are selected."
 msgstr "선택된 카테고리가 없습니다."
 
-#: js/prefs.js:1079
+#: js/prefs.js:1075
 msgid "Category title:"
 msgstr "카테고리 제목:"
 
-#: js/prefs.js:1083
+#: js/prefs.js:1079
 msgid "Creating category..."
 msgstr "카테고리 생성중..."
 
-#: js/prefs.js:1106
+#: js/prefs.js:1102
 #, fuzzy
 msgid "Feeds without recent updates"
 msgstr "업데이트 오류가 있는 피드"
 
-#: js/prefs.js:1150
+#: js/prefs.js:1146
 msgid "Replace current OPML publishing address with a new one?"
 msgstr "현재 OPML 공개 주소를 새 주소로 교체할까요?"
 
-#: js/prefs.js:1227
+#: js/prefs.js:1223
 msgid "Clearing feed..."
 msgstr "피드 정리중..."
 
-#: js/prefs.js:1247
+#: js/prefs.js:1243
 msgid "Rescore articles in selected feeds?"
 msgstr "선택한 피드에서 글의 점수를 다시 매길까요?"
 
-#: js/prefs.js:1250
+#: js/prefs.js:1246
 msgid "Rescoring selected feeds..."
 msgstr "선택된 피드의 점수 다시 매기는중..."
 
-#: js/prefs.js:1270
+#: js/prefs.js:1266
 msgid "Rescore all articles? This operation may take a lot of time."
 msgstr "모든 글에 점수를 다시 매기겠습니까? (한참 걸릴 수도 있습니다.)"
 
-#: js/prefs.js:1273
+#: js/prefs.js:1269
 msgid "Rescoring feeds..."
 msgstr "피드 점수 다시매기는 중..."
 
-#: js/prefs.js:1289
+#: js/prefs.js:1285
 msgid "Reset selected labels to default colors?"
 msgstr "선택된 라벨의 색을 기본값으로 초기화 할까요?"
 
-#: js/prefs.js:1321
+#: js/prefs.js:1317
 #, fuzzy
 msgid "Settings Profiles"
 msgstr "프로필 생성중..."
 
-#: js/prefs.js:1330
+#: js/prefs.js:1326
 msgid "Remove selected profiles? Active and default profiles will not be removed."
 msgstr ""
 
-#: js/prefs.js:1333
+#: js/prefs.js:1329
 msgid "Removing selected profiles..."
 msgstr "선택된 프로필 제거중..."
 
-#: js/prefs.js:1349
+#: js/prefs.js:1345
 msgid "No profiles are selected."
 msgstr "선택된 프로필이 없습니다."
 
-#: js/prefs.js:1357
-#: js/prefs.js:1410
+#: js/prefs.js:1353
+#: js/prefs.js:1406
 msgid "Activate selected profile?"
 msgstr "선택된 프로필을 활성화 할까요?"
 
-#: js/prefs.js:1374
-#: js/prefs.js:1426
+#: js/prefs.js:1370
+#: js/prefs.js:1422
 msgid "Please choose a profile to activate."
 msgstr "활성화할 프로필을 선택하세요."
 
-#: js/prefs.js:1379
+#: js/prefs.js:1375
 msgid "Creating profile..."
 msgstr "프로필 생성중..."
 
-#: js/prefs.js:1434
+#: js/prefs.js:1430
 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr ""
 
-#: js/prefs.js:1444
+#: js/prefs.js:1440
 msgid "Generated URLs cleared."
 msgstr "생성된 URL이 지워졌습니다."
 
-#: js/prefs.js:1516
+#: js/prefs.js:1512
 msgid "Label Editor"
 msgstr "라벨 편집기"
 
-#: js/tt-rss.js:684
+#: js/tt-rss.js:685
 msgid "You can't unsubscribe from the category."
 msgstr "카테고리에서는 구독 해제 할 수 없습니다."
 
-#: js/viewfeed.js:125
-#: js/viewfeed.js:175
-#: js/viewfeed.js:192
+#: js/viewfeed.js:127
+#: js/viewfeed.js:177
+#: js/viewfeed.js:194
 #, fuzzy
 msgid "Click to open next unread feed."
 msgstr "클릭하여 피드 편집"
 
-#: js/viewfeed.js:129
+#: js/viewfeed.js:131
 msgid "Cancel search"
 msgstr "검색 취소"
 
-#: js/viewfeed.js:189
+#: js/viewfeed.js:191
 #, fuzzy
 msgid "New articles found, reload feed to continue."
 msgstr "표시할 글이 없습니다."
 
-#: js/viewfeed.js:424
+#: js/viewfeed.js:426
 msgid "Unstar article"
 msgstr "중요 표시 해제"
 
-#: js/viewfeed.js:428
+#: js/viewfeed.js:430
 msgid "Star article"
 msgstr "중요 표시"
 
-#: js/viewfeed.js:478
+#: js/viewfeed.js:480
 msgid "Unpublish article"
 msgstr "공개되지 않은 글"
 
-#: js/viewfeed.js:482
+#: js/viewfeed.js:484
 msgid "Publish article"
 msgstr "글 공개"
 
-#: js/viewfeed.js:622
+#: js/viewfeed.js:624
 msgid "%d article selected"
 msgid_plural "%d articles selected"
 msgstr[0] "%d개의 글이 선택되었습니다."
 
-#: js/viewfeed.js:1286
+#: js/viewfeed.js:1288
 msgid "No article is selected."
 msgstr "선택된 글이 없습니다."
 
-#: js/viewfeed.js:1321
+#: js/viewfeed.js:1323
 msgid "No articles found to mark"
 msgstr "표시할 글이 없습니다."
 
-#: js/viewfeed.js:1323
+#: js/viewfeed.js:1325
 msgid "Mark %d article as read?"
 msgid_plural "Mark %d articles as read?"
 msgstr[0] "%d 글을 읽음 표시 할까요?"
 
-#~ msgid "Cache images locally"
-#~ msgstr "이미지를 로컬에 캐쉬"
+#~ msgid "Resubscribe to push updates"
+#~ msgstr "업데이트 알림을 위해 다시 구독"
+
+#~ msgid "Linked"
+#~ msgstr "연결됨"
+
+#~ msgid "Access key:"
+#~ msgstr "접근 키:"
+
+#~ msgid "Access key"
+#~ msgstr "접근 키"
+
+#~ msgid "Generate new key"
+#~ msgstr "새 키 생성"
+
+#~ msgid "Link instance"
+#~ msgstr "링크 항목"
+
+#~ msgid "Stored feeds"
+#~ msgstr "저장된 피드"
+
+#~ msgid "Create link"
+#~ msgstr "링크 생성"
+
+#~ msgid "Subscription reset."
+#~ msgstr "구독이 초기화되었습니다."
+
+#~ msgid "Link Instance"
+#~ msgstr "링크 항목"
+
+#~ msgid "Edit Instance"
+#~ msgstr "항목 편집"
+
+#~ msgid "Remove selected instances?"
+#~ msgstr "선택된 항목을 제거할까요?"
+
+#~ msgid "Removing selected instances..."
+#~ msgstr "선택된 항목 제거중..."
+
+#~ msgid "No instances are selected."
+#~ msgstr "선택된 항목이 없습니다."
+
+#~ msgid "Please select only one instance."
+#~ msgstr "항목을 하나만 선택하세요."
 
 #~ msgid "More..."
 #~ msgstr "기타..."
diff --git a/locale/lv_LV/LC_MESSAGES/messages.mo b/locale/lv_LV/LC_MESSAGES/messages.mo
index 287b49f55..fc94f8eeb 100644
--- a/locale/lv_LV/LC_MESSAGES/messages.mo
+++ b/locale/lv_LV/LC_MESSAGES/messages.mo
diff --git a/locale/lv_LV/LC_MESSAGES/messages.po b/locale/lv_LV/LC_MESSAGES/messages.po
index 80b0392c4..95d19377d 100644
--- a/locale/lv_LV/LC_MESSAGES/messages.po
+++ b/locale/lv_LV/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tt-rss git\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 15:25+0300\n"
+"POT-Creation-Date: 2017-07-04 16:29+0300\n"
 "PO-Revision-Date: 2014-11-01 23:36+0300\n"
 "Last-Translator: Valdis Vītoliņš <[email protected]>\n"
 "Language-Team: \n"
@@ -172,31 +172,30 @@ msgstr "Lietotājs netika atrasts"
 #: prefs.php:118
 #: classes/backend.php:5
 #: classes/pref/labels.php:282
-#: classes/pref/feeds.php:1402
-#: classes/pref/filters.php:779
+#: classes/pref/filters.php:819
+#: classes/pref/feeds.php:1376
 #: js/feedlist.js:149
-#: js/functions.js:1131
-#: js/functions.js:1231
-#: js/functions.js:1478
+#: js/functions.js:1210
+#: js/functions.js:1457
 #: js/prefs.js:621
-#: js/prefs.js:818
-#: js/prefs.js:1648
-#: js/prefs.js:1663
-#: js/tt-rss.js:550
-#: js/viewfeed.js:1182
+#: js/prefs.js:813
+#: js/prefs.js:1644
+#: js/prefs.js:1659
+#: js/tt-rss.js:551
+#: js/viewfeed.js:1184
 #: plugins/import_export/import_export.js:17
 #: js/feedlist.js:467
-#: js/feedlist.js:512
+#: js/feedlist.js:515
 #: js/functions.js:372
 #: js/functions.js:630
-#: js/prefs.js:1360
-#: js/prefs.js:1413
-#: js/prefs.js:1452
-#: js/prefs.js:1465
-#: js/prefs.js:1476
-#: js/prefs.js:1491
-#: js/tt-rss.js:567
-#: js/viewfeed.js:762
+#: js/prefs.js:1356
+#: js/prefs.js:1409
+#: js/prefs.js:1448
+#: js/prefs.js:1461
+#: js/prefs.js:1472
+#: js/prefs.js:1487
+#: js/tt-rss.js:568
+#: js/viewfeed.js:764
 msgid "Loading, please wait..."
 msgstr "Ielādē, lūdzu gaidiet..."
 
@@ -213,13 +212,13 @@ msgid "All Articles"
 msgstr "Visus rakstus"
 
 #: index.php:192
-#: include/functions2.php:107
+#: include/functions.php:1181
 #: classes/feeds.php:110
 msgid "Starred"
 msgstr "Zvaigžņotos"
 
 #: index.php:193
-#: include/functions2.php:108
+#: include/functions.php:1182
 #: classes/feeds.php:111
 msgid "Published"
 msgstr "Publicētos"
@@ -260,7 +259,7 @@ msgstr "Virsraksts"
 
 #: index.php:209
 #: index.php:249
-#: include/functions2.php:95
+#: include/functions.php:1169
 #: classes/feeds.php:115
 #: js/FeedTree.js:138
 #: js/FeedTree.js:166
@@ -300,7 +299,7 @@ msgid "Feed actions:"
 msgstr "Barotnes darbības"
 
 #: index.php:244
-#: classes/handler/public.php:672
+#: classes/handler/public.php:583
 msgid "Subscribe to feed..."
 msgstr "Abonēt barotni..."
 
@@ -314,8 +313,8 @@ msgstr "Pārvērtēt barotni"
 
 #: index.php:247
 #: classes/pref/feeds.php:785
-#: classes/pref/feeds.php:1357
-#: js/PrefFeedTree.js:78
+#: classes/pref/feeds.php:1331
+#: js/PrefFeedTree.js:80
 msgid "Unsubscribe"
 msgstr "Dzēst"
 
@@ -332,7 +331,7 @@ msgid "Other actions:"
 msgstr "Citas darbības:"
 
 #: index.php:252
-#: include/functions2.php:81
+#: include/functions.php:1155
 msgid "Toggle widescreen mode"
 msgstr "Pārslēgt platekrāna režīmu"
 
@@ -358,7 +357,7 @@ msgstr ""
 
 #: prefs.php:33
 #: prefs.php:136
-#: include/functions2.php:110
+#: include/functions.php:1184
 #: classes/pref/prefs.php:435
 msgid "Preferences"
 msgstr "Iestatījumi"
@@ -373,20 +372,19 @@ msgstr "Iziet no iestatījumiem"
 
 #: prefs.php:139
 #: classes/pref/feeds.php:112
-#: classes/pref/feeds.php:1297
-#: classes/pref/feeds.php:1346
+#: classes/pref/feeds.php:1271
+#: classes/pref/feeds.php:1320
 msgid "Feeds"
 msgstr "Barotnes"
 
 #: prefs.php:142
-#: classes/pref/filters.php:248
+#: classes/pref/filters.php:273
 msgid "Filters"
 msgstr "Filtri"
 
 #: prefs.php:145
-#: include/functions.php:1327
-#: include/functions.php:1979
 #: classes/pref/labels.php:90
+#: classes/feeds.php:1718
 msgid "Labels"
 msgstr "Iezīmes"
 
@@ -415,13 +413,13 @@ msgstr "Jaunu lietotāju reģistrēšana ir administratīvi atcelta."
 #: register.php:337
 #: register.php:347
 #: register.php:359
-#: classes/handler/public.php:742
-#: classes/handler/public.php:813
-#: classes/handler/public.php:911
-#: classes/handler/public.php:990
-#: classes/handler/public.php:1004
-#: classes/handler/public.php:1011
-#: classes/handler/public.php:1036
+#: classes/handler/public.php:653
+#: classes/handler/public.php:724
+#: classes/handler/public.php:822
+#: classes/handler/public.php:901
+#: classes/handler/public.php:915
+#: classes/handler/public.php:922
+#: classes/handler/public.php:947
 msgid "Return to Tiny Tiny RSS"
 msgstr "Atgriezties uz Tiny Tiny RSS"
 
@@ -438,12 +436,12 @@ msgid "Check availability"
 msgstr "Pārbaudīt pieejamību"
 
 #: register.php:229
-#: classes/handler/public.php:829
+#: classes/handler/public.php:740
 msgid "Email:"
 msgstr "E-pasts:"
 
 #: register.php:232
-#: classes/handler/public.php:834
+#: classes/handler/public.php:745
 msgid "How much is two plus two:"
 msgstr "Cik ir divi un divi:"
 
@@ -471,17 +469,23 @@ msgstr "Konts ir veiksmīgi izveidots."
 msgid "New user registrations are currently closed."
 msgstr "Jaunu lietotāju reģistrācija šobrīd ir slēgta."
 
-#: update.php:67
+#: update.php:66
 msgid "Tiny Tiny RSS data update script."
 msgstr "Tiny Tiny RSS datu atjaunošanas skripts."
 
-#: include/digest.php:109
-#: include/functions.php:1336
-#: include/functions.php:1880
-#: include/functions.php:1965
-#: include/functions.php:1987
-#: classes/opml.php:421
+#: include/controls.php:83
+#: classes/pref/filters.php:242
+#: classes/pref/filters.php:253
+#: classes/pref/filters.php:544
+msgid "All feeds"
+msgstr "Visas barotnes"
+
+#: include/controls.php:134
+#: include/controls.php:316
 #: classes/pref/feeds.php:228
+#: classes/opml.php:486
+#: classes/feeds.php:1727
+#: classes/digest.php:113
 msgid "Uncategorized"
 msgstr "Nekategorizēts"
 
@@ -496,391 +500,287 @@ msgstr[1] "%d arhivēti raksti"
 msgid "No feeds found."
 msgstr "Neatradu barotnes."
 
-#: include/functions.php:1029
+#: include/functions.php:900
 #, php-format
 msgid "%d min"
 msgstr ""
 
-#: include/functions.php:1325
-#: include/functions.php:1977
-msgid "Special"
-msgstr "Īpaši"
-
-#: include/functions.php:1828
-#: classes/pref/filters.php:229
-#: classes/pref/filters.php:507
-msgid "All feeds"
-msgstr "Visas barotnes"
-
-#: include/functions.php:2032
-msgid "Starred articles"
-msgstr "Zvaigžņotie raksti"
-
-#: include/functions.php:2034
-msgid "Published articles"
-msgstr "Publicētie raksti"
-
-#: include/functions.php:2036
-msgid "Fresh articles"
-msgstr "Jaunākie raksti"
-
-#: include/functions.php:2038
-#: include/functions2.php:105
-msgid "All articles"
-msgstr "Visi raksti"
-
-#: include/functions.php:2040
-msgid "Archived articles"
-msgstr "Arhivētie raksti"
-
-#: include/functions.php:2042
-msgid "Recently read"
-msgstr "Nesen lasītie raksti"
-
-#: include/functions2.php:57
+#: include/functions.php:1131
 msgid "Navigation"
 msgstr "Navigācija"
 
-#: include/functions2.php:58
+#: include/functions.php:1132
 msgid "Open next feed"
 msgstr "Atvērt nākamo barotni"
 
-#: include/functions2.php:59
+#: include/functions.php:1133
 msgid "Open previous feed"
 msgstr "Atvērt iepriekšējo barotni"
 
-#: include/functions2.php:60
+#: include/functions.php:1134
 msgid "Open next article"
 msgstr "Atvērt nākamo rakstu"
 
-#: include/functions2.php:61
+#: include/functions.php:1135
 msgid "Open previous article"
 msgstr "Atvērt iepriekšējo rakstu"
 
-#: include/functions2.php:62
+#: include/functions.php:1136
 msgid "Open next article (don't scroll long articles)"
 msgstr "Atvērt nākamo rakstu (nepārtīt garus rakstus)"
 
-#: include/functions2.php:63
+#: include/functions.php:1137
 msgid "Open previous article (don't scroll long articles)"
 msgstr "Atvērt iepriekšējo rakstu (nepārtīt garus rakstus)"
 
-#: include/functions2.php:64
+#: include/functions.php:1138
 msgid "Move to next article (don't expand or mark read)"
 msgstr "Pāriet uz nākamo rakstu (neizvērst un neatzīmēt kā lasītu)"
 
-#: include/functions2.php:65
+#: include/functions.php:1139
 msgid "Move to previous article (don't expand or mark read)"
 msgstr "Pāriet uz iepriekšējo rakstu (neizvērst un neatzīmēt kā lasītu)"
 
-#: include/functions2.php:66
+#: include/functions.php:1140
 msgid "Show search dialog"
 msgstr "Rādīt meklēšanas logu"
 
-#: include/functions2.php:67
+#: include/functions.php:1141
 msgid "Article"
 msgstr "Raksts"
 
-#: include/functions2.php:68
-#: js/viewfeed.js:1699
+#: include/functions.php:1142
+#: js/viewfeed.js:1701
 msgid "Toggle starred"
 msgstr "Pārslēgt zvaigžņošanu"
 
-#: include/functions2.php:69
-#: js/viewfeed.js:1711
+#: include/functions.php:1143
+#: js/viewfeed.js:1713
 msgid "Toggle published"
 msgstr "Pārslēgt publicēšanu"
 
-#: include/functions2.php:70
-#: js/viewfeed.js:1686
+#: include/functions.php:1144
+#: js/viewfeed.js:1688
 msgid "Toggle unread"
 msgstr "Pārslēgt nelasītu"
 
-#: include/functions2.php:71
+#: include/functions.php:1145
 msgid "Edit tags"
 msgstr "Mainīt iezīmes"
 
-#: include/functions2.php:72
+#: include/functions.php:1146
 msgid "Open in new window"
 msgstr "Atvērt jaunā logā"
 
-#: include/functions2.php:73
-#: js/viewfeed.js:1732
+#: include/functions.php:1147
+#: js/viewfeed.js:1734
 msgid "Mark below as read"
 msgstr "Iezīmēt lejup kā lasītus"
 
-#: include/functions2.php:74
-#: js/viewfeed.js:1725
+#: include/functions.php:1148
+#: js/viewfeed.js:1727
 msgid "Mark above as read"
 msgstr "Iezīmēt augšup kā lasītus"
 
-#: include/functions2.php:75
+#: include/functions.php:1149
 msgid "Scroll down"
 msgstr "Pārtīt lejup"
 
-#: include/functions2.php:76
+#: include/functions.php:1150
 msgid "Scroll up"
 msgstr "Pārtīt uz augšu"
 
-#: include/functions2.php:77
+#: include/functions.php:1151
 msgid "Select article under cursor"
 msgstr "Izvēlēties rakstu zem kursora"
 
-#: include/functions2.php:78
+#: include/functions.php:1152
 msgid "Email article"
 msgstr "Nosūtīt rakstu uz e-pastu"
 
-#: include/functions2.php:79
+#: include/functions.php:1153
 msgid "Close/collapse article"
 msgstr "Aizvērt/sakļaut rakstu"
 
-#: include/functions2.php:80
+#: include/functions.php:1154
 msgid "Toggle article expansion (combined mode)"
 msgstr "Pārslēgt raksta izvēršanu (kombinētais režīms)"
 
-#: include/functions2.php:82
+#: include/functions.php:1156
 #: plugins/embed_original/init.php:31
 msgid "Toggle embed original"
 msgstr "Pārslēgt oriģināla iegulšanu"
 
-#: include/functions2.php:83
+#: include/functions.php:1157
 msgid "Article selection"
 msgstr "Raksta atzīmēšana"
 
-#: include/functions2.php:84
+#: include/functions.php:1158
 msgid "Select all articles"
 msgstr "Iezīmēt visus rakstus"
 
-#: include/functions2.php:85
+#: include/functions.php:1159
 msgid "Select unread"
 msgstr "Atzīmēt nelasītos"
 
-#: include/functions2.php:86
+#: include/functions.php:1160
 msgid "Select starred"
 msgstr "Atzīmēt zvaigžņotos"
 
-#: include/functions2.php:87
+#: include/functions.php:1161
 msgid "Select published"
 msgstr "Atzīmēt publicētos"
 
-#: include/functions2.php:88
+#: include/functions.php:1162
 msgid "Invert selection"
 msgstr "Apvērst izvēli"
 
-#: include/functions2.php:89
+#: include/functions.php:1163
 msgid "Deselect everything"
 msgstr "Neatzīmēt visu"
 
-#: include/functions2.php:90
+#: include/functions.php:1164
 #: classes/pref/feeds.php:555
-#: classes/pref/feeds.php:823
+#: classes/pref/feeds.php:811
 msgid "Feed"
 msgstr "Barotne"
 
-#: include/functions2.php:91
+#: include/functions.php:1165
 msgid "Refresh current feed"
 msgstr "Atjaunot tekošo barotni"
 
-#: include/functions2.php:92
+#: include/functions.php:1166
 msgid "Un/hide read feeds"
 msgstr "(Ne)rādīt lasītās barotnes"
 
-#: include/functions2.php:93
-#: classes/pref/feeds.php:1349
+#: include/functions.php:1167
+#: classes/pref/feeds.php:1323
 msgid "Subscribe to feed"
 msgstr "Abonēt barotni"
 
-#: include/functions2.php:94
+#: include/functions.php:1168
 #: js/FeedTree.js:145
-#: js/PrefFeedTree.js:72
-#: js/viewfeed.js:1853
+#: js/PrefFeedTree.js:74
+#: js/viewfeed.js:1855
 msgid "Edit feed"
 msgstr "Mainīt barotni"
 
-#: include/functions2.php:96
+#: include/functions.php:1170
 msgid "Reverse headlines"
 msgstr "Apvērst virsrakstus"
 
-#: include/functions2.php:97
+#: include/functions.php:1171
 msgid "Toggle headline grouping"
 msgstr ""
 
-#: include/functions2.php:98
+#: include/functions.php:1172
 msgid "Debug feed update"
 msgstr "Atkļūdot barotņu atjaunojumus"
 
-#: include/functions2.php:99
+#: include/functions.php:1173
 #, fuzzy
 msgid "Debug viewfeed()"
 msgstr "Atkļūdot barotņu atjaunojumus"
 
-#: include/functions2.php:100
+#: include/functions.php:1174
 #: js/FeedTree.js:194
 msgid "Mark all feeds as read"
 msgstr "Atzīmēt visas barotnes kā lasītas"
 
-#: include/functions2.php:101
+#: include/functions.php:1175
 msgid "Un/collapse current category"
 msgstr "Izvērst/sakļaut tekošo kategoriju"
 
-#: include/functions2.php:102
+#: include/functions.php:1176
 msgid "Toggle combined mode"
 msgstr "Pārslēgt kombinēto režīmu"
 
-#: include/functions2.php:103
+#: include/functions.php:1177
 msgid "Toggle auto expand in combined mode"
 msgstr "Pārslēgt autoizvēršanu kombinētajā režīmā"
 
-#: include/functions2.php:104
+#: include/functions.php:1178
 msgid "Go to"
 msgstr "Doties uz"
 
-#: include/functions2.php:106
+#: include/functions.php:1179
+#: classes/feeds.php:1602
+msgid "All articles"
+msgstr "Visi raksti"
+
+#: include/functions.php:1180
 msgid "Fresh"
 msgstr "Svaigs"
 
-#: include/functions2.php:109
-#: js/tt-rss.js:494
-#: js/tt-rss.js:663
+#: include/functions.php:1183
+#: js/tt-rss.js:495
+#: js/tt-rss.js:664
 msgid "Tag cloud"
 msgstr "Iezīmju mākonis"
 
-#: include/functions2.php:111
+#: include/functions.php:1185
 msgid "Other"
 msgstr "Citi"
 
-#: include/functions2.php:112
+#: include/functions.php:1186
 #: classes/pref/labels.php:267
 msgid "Create label"
 msgstr "Izveidot etiķeti"
 
-#: include/functions2.php:113
-#: classes/pref/filters.php:753
+#: include/functions.php:1187
+#: classes/pref/filters.php:793
 msgid "Create filter"
 msgstr "Izveidot filtru"
 
-#: include/functions2.php:114
+#: include/functions.php:1188
 msgid "Un/collapse sidebar"
 msgstr "Izvērst/sakļaut sānjoslu"
 
-#: include/functions2.php:115
+#: include/functions.php:1189
 msgid "Show help dialog"
 msgstr "Rādīt palīdzības logu"
 
-#: include/functions2.php:670
-#, php-format
-msgid "Search results: %s"
-msgstr "Meklēšanas rezultāti: %s"
-
-#: include/functions2.php:1336
-#: classes/feeds.php:752
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] "komentārs"
-msgstr[1] "komentāri"
-
-#: include/functions2.php:1340
-#: classes/feeds.php:756
-msgid "comments"
-msgstr "komentāri"
-
-#: include/functions2.php:1366
-msgid " - "
-msgstr "–"
-
-#: include/functions2.php:1397
-#: include/functions2.php:1648
-#: classes/article.php:311
-msgid "no tags"
-msgstr "nav iezīmju"
-
-#: include/functions2.php:1407
-#: classes/feeds.php:738
-msgid "Edit tags for this article"
-msgstr "Mainīt šī raksta iezīmes"
-
-#: include/functions2.php:1439
-#: classes/feeds.php:690
-msgid "Originally from:"
-msgstr "Sākotnējais no:"
-
-#: include/functions2.php:1452
-#: classes/pref/feeds.php:574
-#: classes/feeds.php:703
-msgid "Feed URL"
-msgstr "Barotnes URL"
-
-#: include/functions2.php:1489
-#: classes/backend.php:105
-#: classes/dlg.php:37
-#: classes/dlg.php:60
-#: classes/dlg.php:93
-#: classes/dlg.php:159
-#: classes/dlg.php:186
-#: classes/pref/feeds.php:1652
-#: classes/pref/feeds.php:1718
-#: classes/pref/filters.php:204
-#: classes/pref/prefs.php:1097
-#: plugins/af_psql_trgm/init.php:102
-#: plugins/import_export/init.php:415
-#: plugins/import_export/init.php:461
-#: plugins/share/init.php:121
-msgid "Close this window"
-msgstr "Aizvērt šo logu"
-
-#: include/functions2.php:1686
-msgid "(edit note)"
-msgstr "(mainīt piezīmi)"
-
-#: include/functions2.php:1960
-msgid "unknown type"
-msgstr "nezināms tips"
-
-#: include/functions2.php:2037
-msgid "Attachments"
-msgstr "Pielikumi"
-
-#: include/functions2.php:2496
+#: include/functions.php:2456
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: include/functions2.php:2497
+#: include/functions.php:2457
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: include/functions2.php:2498
+#: include/functions.php:2458
 msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
 msgstr ""
 
-#: include/functions2.php:2499
+#: include/functions.php:2459
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: include/functions2.php:2500
+#: include/functions.php:2460
 #, fuzzy
 msgid "No file was uploaded"
 msgstr "Fails nav augšuplādēts."
 
-#: include/functions2.php:2501
+#: include/functions.php:2461
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: include/functions2.php:2502
+#: include/functions.php:2462
 msgid "Failed to write file to disk."
 msgstr ""
 
-#: include/functions2.php:2503
+#: include/functions.php:2463
 msgid "A PHP extension stopped the file upload."
 msgstr ""
 
 #: include/login_form.php:197
-#: classes/handler/public.php:569
-#: classes/handler/public.php:824
+#: classes/handler/public.php:480
+#: classes/handler/public.php:735
 msgid "Login:"
 msgstr "Pieteikties:"
 
 #: include/login_form.php:207
-#: classes/handler/public.php:572
+#: classes/handler/public.php:483
 msgid "Password:"
 msgstr "Parole:"
 
@@ -893,7 +793,7 @@ msgid "Profile:"
 msgstr "Profils:"
 
 #: include/login_form.php:223
-#: classes/handler/public.php:311
+#: classes/handler/public.php:287
 #: classes/pref/prefs.php:1035
 #: classes/rpc.php:63
 msgid "Default profile"
@@ -912,7 +812,7 @@ msgid "Remember me"
 msgstr "Atcerēties mani"
 
 #: include/login_form.php:249
-#: classes/handler/public.php:577
+#: classes/handler/public.php:488
 msgid "Log in"
 msgstr "Pieteikties"
 
@@ -928,145 +828,44 @@ msgstr "Neizdevās validēt sesiju (lietotājs nav atrasts)"
 msgid "Session failed to validate (password changed)"
 msgstr "Neizdevās validēt sesiju (mainījusies parole)"
 
-#: classes/article.php:25
-msgid "Article not found."
-msgstr "Raksts netika atrasts."
-
-#: classes/article.php:197
-msgid "Tags for this article (separated by commas):"
-msgstr "Šī raksta iezīmes (atdalītas ar komatiem):"
-
-#: classes/article.php:222
-#: classes/pref/labels.php:79
-#: classes/pref/users.php:98
-#: classes/pref/feeds.php:801
-#: classes/pref/feeds.php:943
-#: classes/pref/filters.php:485
-#: classes/pref/prefs.php:981
-#: plugins/instances/init.php:245
-#: plugins/nsfw/init.php:85
-#: plugins/note/init.php:51
-#: plugins/af_readability/init.php:68
-#: plugins/af_redditimgur/init.php:60
-#: plugins/af_psql_trgm/init.php:181
-#: plugins/mail/init.php:64
-#: plugins/af_zz_imgproxy/init.php:213
-msgid "Save"
-msgstr "Saglabāt"
-
-#: classes/article.php:224
-#: classes/handler/public.php:546
-#: classes/handler/public.php:580
-#: classes/pref/labels.php:81
-#: classes/pref/users.php:100
-#: classes/pref/feeds.php:802
-#: classes/pref/feeds.php:946
-#: classes/pref/feeds.php:1859
-#: classes/pref/filters.php:488
-#: classes/pref/filters.php:902
-#: classes/pref/filters.php:983
-#: classes/pref/filters.php:1076
-#: classes/pref/prefs.php:983
-#: classes/feeds.php:1105
-#: classes/feeds.php:1155
-#: classes/feeds.php:1192
-#: plugins/instances/init.php:248
-#: plugins/instances/init.php:436
-#: plugins/note/init.php:53
-#: plugins/mail/init.php:173
-msgid "Cancel"
-msgstr "Atcelt"
-
-#: classes/opml.php:28
-#: classes/opml.php:33
-msgid "OPML Utility"
-msgstr "OPML rīks"
-
-#: classes/opml.php:37
-msgid "Importing OPML..."
-msgstr "Importē OPML..."
-
-#: classes/opml.php:41
-msgid "Return to preferences"
-msgstr "Atgriezties uz iestatījumiem"
-
-#: classes/opml.php:271
-#, php-format
-msgid "Adding feed: %s"
-msgstr "Pievieno barotni: %s"
-
-#: classes/opml.php:282
-#, php-format
-msgid "Duplicate feed: %s"
-msgstr "Dublēta barotne: %s"
-
-#: classes/opml.php:296
-#, php-format
-msgid "Adding label %s"
-msgstr "Pievieno etiķeti %s"
-
-#: classes/opml.php:299
-#, php-format
-msgid "Duplicate label: %s"
-msgstr "Dublēta etiķete: %s"
-
-#: classes/opml.php:311
-#, php-format
-msgid "Setting preference key %s to %s"
-msgstr "Saglabā iestatījumu atslēgu %s līdz %s"
-
-#: classes/opml.php:343
-msgid "Adding filter..."
-msgstr "Pievieno filtru..."
-
-#: classes/opml.php:421
-#, php-format
-msgid "Processing category: %s"
-msgstr "Apstrādā kategoriju: %s"
-
-#: classes/opml.php:470
-#, php-format
-msgid "Upload failed with error code %d"
-msgstr "Augšuplāde neizdevās ar kļūdas kodu %d"
-
-#: classes/opml.php:484
-#: plugins/import_export/init.php:442
-msgid "Unable to move uploaded file."
-msgstr "Neizdevās pārvietot augšuplādēto failu."
-
-#: classes/opml.php:488
-#: plugins/import_export/init.php:446
-msgid "Error: please upload OPML file."
-msgstr "Kļūda: lūdzu augšuplādējiet OPML failu."
-
-#: classes/opml.php:499
-msgid "Error: unable to find moved OPML file."
-msgstr "Kļūda: neizdevās atrast pārvietoto OPML failu."
-
-#: classes/opml.php:506
-msgid "Error while parsing document."
-msgstr "Dokumenta apstrādes kļūda."
-
-#: classes/backend.php:33
+#: classes/backend.php:31
 msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
 msgstr "Citi saskarnes padomi ir pieejami Tiny Tiny RSS viki vietnē."
 
-#: classes/backend.php:38
+#: classes/backend.php:36
 msgid "Keyboard Shortcuts"
 msgstr "Īsinājumtaustiņi"
 
-#: classes/backend.php:61
+#: classes/backend.php:59
 msgid "Shift"
 msgstr "Shift"
 
-#: classes/backend.php:64
+#: classes/backend.php:62
 msgid "Ctrl"
 msgstr "Ctrl"
 
-#: classes/backend.php:99
+#: classes/backend.php:97
 msgid "Help topic not found."
 msgstr "Palīdzības tēma netika atrasta."
 
+#: classes/backend.php:103
+#: classes/dlg.php:37
+#: classes/dlg.php:60
+#: classes/dlg.php:93
+#: classes/dlg.php:159
+#: classes/dlg.php:186
+#: classes/article.php:744
+#: classes/pref/filters.php:206
+#: classes/pref/prefs.php:1097
+#: classes/pref/feeds.php:1626
+#: classes/pref/feeds.php:1692
+#: plugins/import_export/init.php:421
+#: plugins/import_export/init.php:467
+#: plugins/af_psql_trgm/init.php:102
+#: plugins/share/init.php:120
+msgid "Close this window"
+msgstr "Aizvērt šo logu"
+
 #: classes/dlg.php:17
 msgid "If you have imported labels and/or filters, you might need to reload preferences to see your new data."
 msgstr "Ja esat importējis etiķetus vai filtrus, iespējams, ka jums nepieciešams pārlādēt iestatījumus, lai redzētu jaunos datus."
@@ -1077,7 +876,7 @@ msgstr "Jūsu publiskais OPML URL ir:"
 
 #: classes/dlg.php:57
 #: classes/dlg.php:183
-#: plugins/share/init.php:118
+#: plugins/share/init.php:117
 msgid "Generate new URL"
 msgstr "Izveidot jaunu URL"
 
@@ -1098,128 +897,222 @@ msgstr "Atjaunošanas process aizņem pārāk ilgu laiku. Iespējams, ka tas ir
 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/handler/public.php:510
+#: classes/article.php:25
+msgid "Article not found."
+msgstr "Raksts netika atrasts."
+
+#: classes/article.php:197
+msgid "Tags for this article (separated by commas):"
+msgstr "Šī raksta iezīmes (atdalītas ar komatiem):"
+
+#: classes/article.php:222
+#: classes/pref/labels.php:79
+#: classes/pref/filters.php:519
+#: classes/pref/users.php:98
+#: classes/pref/prefs.php:981
+#: classes/pref/feeds.php:789
+#: classes/pref/feeds.php:931
+#: plugins/af_psql_trgm/init.php:181
+#: plugins/nsfw/init.php:85
+#: plugins/af_readability/init.php:68
+#: plugins/mail/init.php:64
+#: plugins/af_redditimgur/init.php:60
+#: plugins/note/init.php:51
+#: plugins/af_zz_imgproxy/init.php:240
+msgid "Save"
+msgstr "Saglabāt"
+
+#: classes/article.php:224
+#: classes/handler/public.php:457
+#: classes/handler/public.php:491
+#: classes/pref/labels.php:81
+#: classes/pref/filters.php:522
+#: classes/pref/filters.php:942
+#: classes/pref/filters.php:1022
+#: classes/pref/filters.php:1115
+#: classes/pref/users.php:100
+#: classes/pref/prefs.php:983
+#: classes/pref/feeds.php:790
+#: classes/pref/feeds.php:934
+#: classes/pref/feeds.php:1833
+#: classes/feeds.php:1098
+#: classes/feeds.php:1148
+#: classes/feeds.php:1185
+#: plugins/mail/init.php:173
+#: plugins/note/init.php:53
+msgid "Cancel"
+msgstr "Atcelt"
+
+#: classes/article.php:311
+#: classes/article.php:652
+#: classes/article.php:805
+msgid "no tags"
+msgstr "nav iezīmju"
+
+#: classes/article.php:419
+msgid "unknown type"
+msgstr "nezināms tips"
+
+#: classes/article.php:496
+msgid "Attachments"
+msgstr "Pielikumi"
+
+#: classes/article.php:591
+#: classes/feeds.php:741
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] "komentārs"
+msgstr[1] "komentāri"
+
+#: classes/article.php:595
+#: classes/feeds.php:745
+msgid "comments"
+msgstr "komentāri"
+
+#: classes/article.php:621
+msgid " - "
+msgstr "–"
+
+#: classes/article.php:662
+#: classes/feeds.php:727
+msgid "Edit tags for this article"
+msgstr "Mainīt šī raksta iezīmes"
+
+#: classes/article.php:694
+#: classes/feeds.php:681
+msgid "Originally from:"
+msgstr "Sākotnējais no:"
+
+#: classes/article.php:707
+#: classes/pref/feeds.php:574
+#: classes/feeds.php:694
+msgid "Feed URL"
+msgstr "Barotnes URL"
+
+#: classes/article.php:843
+msgid "(edit note)"
+msgstr "(mainīt piezīmi)"
+
+#: classes/handler/public.php:421
 #: plugins/bookmarklets/init.php:40
 msgid "Share with Tiny Tiny RSS"
 msgstr "Kopīgot ar Tiny Tiny RSS"
 
-#: classes/handler/public.php:518
+#: classes/handler/public.php:429
 msgid "Title:"
 msgstr "Virsraksts:"
 
-#: classes/handler/public.php:520
+#: classes/handler/public.php:431
 #: classes/pref/feeds.php:572
-#: plugins/instances/init.php:212
-#: plugins/instances/init.php:401
 msgid "URL:"
 msgstr "URL:"
 
-#: classes/handler/public.php:522
+#: classes/handler/public.php:433
 msgid "Content:"
 msgstr "Saturs:"
 
-#: classes/handler/public.php:524
+#: classes/handler/public.php:435
 msgid "Labels:"
 msgstr "Etiķetes:"
 
-#: classes/handler/public.php:543
+#: classes/handler/public.php:454
 msgid "Shared article will appear in the Published feed."
 msgstr "Kopīgotais raksts parādīsies Publicēts barotnē"
 
-#: classes/handler/public.php:545
+#: classes/handler/public.php:456
 msgid "Share"
 msgstr "Kopīgot"
 
-#: classes/handler/public.php:567
+#: classes/handler/public.php:478
 msgid "Not logged in"
 msgstr "Nav pieteicies"
 
-#: classes/handler/public.php:626
+#: classes/handler/public.php:537
 msgid "Incorrect username or password"
 msgstr "Nepareizs lietotāja vārds vai parole"
 
-#: classes/handler/public.php:678
+#: classes/handler/public.php:589
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "Jau ir pasūtījis <b>%s</b>."
 
-#: classes/handler/public.php:681
+#: classes/handler/public.php:592
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "Pasūtījis <b>%s</b>."
 
-#: classes/handler/public.php:684
+#: classes/handler/public.php:595
 #, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "Neizdevās pasūtīt <b>%s</b>."
 
-#: classes/handler/public.php:687
+#: classes/handler/public.php:598
 #, php-format
 msgid "No feeds found in <b>%s</b>."
 msgstr "<b>%s</b> barotne netika atrasta."
 
-#: classes/handler/public.php:690
+#: classes/handler/public.php:601
 msgid "Multiple feed URLs found."
 msgstr "Atradu vairākus barotņu URLus."
 
-#: classes/handler/public.php:694
+#: classes/handler/public.php:605
 #, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr "Neizdevās pasūtīt <b>%s</b>.<br>Nevarēju lejuplādēt barotnes URL."
 
-#: classes/handler/public.php:712
+#: classes/handler/public.php:623
 msgid "Subscribe to selected feed"
 msgstr "Pasūtīt norādīto barotni"
 
-#: classes/handler/public.php:737
+#: classes/handler/public.php:648
 msgid "Edit subscription options"
 msgstr "Mainīt barotnes iestatījumus"
 
-#: classes/handler/public.php:774
+#: classes/handler/public.php:685
 msgid "Password recovery"
 msgstr "Parole atjaunošana"
 
-#: classes/handler/public.php:817
+#: classes/handler/public.php:728
 msgid "You will need to provide valid account name and email. A password reset link will be sent to your email address."
 msgstr "Jums būs nepieciešams norādīt darbojošos e-pasta kontu. Uz jūsu norādīto adresi tiks nosūtīta paroles pārstatīšanas saite."
 
-#: classes/handler/public.php:839
-#: classes/pref/users.php:350
+#: classes/handler/public.php:750
+#: classes/pref/users.php:349
 msgid "Reset password"
 msgstr "Atstatīt paroli"
 
-#: classes/handler/public.php:849
+#: classes/handler/public.php:760
 msgid "Some of the required form parameters are missing or incorrect."
 msgstr "Trūkst daži no obligātajiem parametriem, vai tie ir norādīti nepareizi."
 
-#: classes/handler/public.php:853
-#: classes/handler/public.php:919
+#: classes/handler/public.php:764
+#: classes/handler/public.php:830
 msgid "Go back"
 msgstr "Doties atpakaļ"
 
-#: classes/handler/public.php:890
+#: classes/handler/public.php:801
 msgid "[tt-rss] Password reset request"
 msgstr "[tt-rss] paroles pārstatīšanas pieprasījums"
 
-#: classes/handler/public.php:915
+#: classes/handler/public.php:826
 msgid "Sorry, login and email combination not found."
 msgstr "Piedodiet, norādītā e-pasta un pieteikšanās kombinācija netika atrasta."
 
-#: classes/handler/public.php:937
+#: classes/handler/public.php:848
 msgid "Your access level is insufficient to run this script."
 msgstr "Jums nav nepieciešamo skripta palaišanas tiesību. "
 
-#: classes/handler/public.php:963
+#: classes/handler/public.php:874
 msgid "Database Updater"
 msgstr "Datu bāzes atjaunotājs"
 
-#: classes/handler/public.php:1028
+#: classes/handler/public.php:939
 msgid "Perform updates"
 msgstr "Izpildīt atjaunojumus"
 
 #: classes/pref/labels.php:22
-#: classes/pref/filters.php:348
-#: classes/pref/filters.php:823
+#: classes/pref/filters.php:373
+#: classes/pref/filters.php:863
 msgid "Caption"
 msgstr "Uzraksts"
 
@@ -1241,59 +1134,55 @@ msgid "Created label <b>%s</b>"
 msgstr "Izveidoju etiķeti <b>%s</b>"
 
 #: classes/pref/labels.php:258
-#: classes/pref/users.php:334
-#: classes/pref/feeds.php:1337
-#: classes/pref/feeds.php:1600
-#: classes/pref/feeds.php:1664
-#: classes/pref/filters.php:359
-#: classes/pref/filters.php:407
-#: classes/pref/filters.php:744
-#: classes/pref/filters.php:832
-#: classes/pref/filters.php:859
+#: classes/pref/filters.php:384
+#: classes/pref/filters.php:441
+#: classes/pref/filters.php:784
+#: classes/pref/filters.php:872
+#: classes/pref/filters.php:899
+#: classes/pref/users.php:333
 #: classes/pref/prefs.php:992
-#: plugins/instances/init.php:284
+#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1574
+#: classes/pref/feeds.php:1638
 msgid "Select"
 msgstr "Iezīmēt"
 
 #: classes/pref/labels.php:261
-#: classes/pref/users.php:337
-#: classes/pref/feeds.php:1340
-#: classes/pref/feeds.php:1603
-#: classes/pref/feeds.php:1667
-#: classes/pref/filters.php:362
-#: classes/pref/filters.php:410
-#: classes/pref/filters.php:747
-#: classes/pref/filters.php:835
-#: classes/pref/filters.php:862
+#: classes/pref/filters.php:387
+#: classes/pref/filters.php:444
+#: classes/pref/filters.php:787
+#: classes/pref/filters.php:875
+#: classes/pref/filters.php:902
+#: classes/pref/users.php:336
 #: classes/pref/prefs.php:995
+#: classes/pref/feeds.php:1314
+#: classes/pref/feeds.php:1577
+#: classes/pref/feeds.php:1641
 #: classes/feeds.php:102
-#: plugins/instances/init.php:287
 msgid "All"
 msgstr "Visus"
 
 #: classes/pref/labels.php:263
-#: classes/pref/users.php:339
-#: classes/pref/feeds.php:1342
-#: classes/pref/feeds.php:1605
-#: classes/pref/feeds.php:1669
-#: classes/pref/filters.php:364
-#: classes/pref/filters.php:412
-#: classes/pref/filters.php:749
-#: classes/pref/filters.php:837
-#: classes/pref/filters.php:864
+#: classes/pref/filters.php:389
+#: classes/pref/filters.php:446
+#: classes/pref/filters.php:789
+#: classes/pref/filters.php:877
+#: classes/pref/filters.php:904
+#: classes/pref/users.php:338
 #: classes/pref/prefs.php:997
+#: classes/pref/feeds.php:1316
+#: classes/pref/feeds.php:1579
+#: classes/pref/feeds.php:1643
 #: classes/feeds.php:105
-#: plugins/instances/init.php:289
 msgid "None"
 msgstr "Nevienu"
 
 #: classes/pref/labels.php:270
-#: classes/pref/users.php:348
+#: classes/pref/filters.php:512
+#: classes/pref/filters.php:806
+#: classes/pref/users.php:347
 #: classes/pref/feeds.php:767
-#: classes/pref/filters.php:478
-#: classes/pref/filters.php:766
-#: classes/feeds.php:1154
-#: plugins/instances/init.php:294
+#: classes/feeds.php:1147
 msgid "Remove"
 msgstr "Dzēst"
 
@@ -1301,9 +1190,170 @@ msgstr "Dzēst"
 msgid "Clear colors"
 msgstr "Attīrīt krāsas"
 
+#: classes/pref/filters.php:153
+#, fuzzy
+msgid "Preview article"
+msgstr "Jaunākie raksti"
+
+#: classes/pref/filters.php:264
+#: classes/pref/filters.php:558
+msgid "(inverse)"
+msgstr "(apvērst)"
+
+#: classes/pref/filters.php:260
+#: classes/pref/filters.php:557
+#, php-format
+msgid "%s on %s in %s %s"
+msgstr "%s uz %s iekš %s %s"
+
+#: classes/pref/filters.php:379
+#: classes/pref/filters.php:867
+#: classes/pref/filters.php:981
+msgid "Match"
+msgstr "Atbilstība"
+
+#: classes/pref/filters.php:393
+#: classes/pref/filters.php:450
+#: classes/pref/filters.php:881
+#: classes/pref/filters.php:908
+msgid "Add"
+msgstr "Pievienot"
+
+#: classes/pref/filters.php:396
+#: classes/pref/filters.php:453
+#: classes/pref/filters.php:884
+#: classes/pref/filters.php:911
+#: classes/feeds.php:122
+msgid "Delete"
+msgstr "Dzēst"
+
+#: classes/pref/filters.php:436
+#: classes/pref/filters.php:894
+msgid "Apply actions"
+msgstr "Pielietot darbības"
+
+#: classes/pref/filters.php:486
+#: classes/pref/filters.php:923
+msgid "Enabled"
+msgstr "Ieslēgts"
+
+#: classes/pref/filters.php:495
+#: classes/pref/filters.php:926
+msgid "Match any rule"
+msgstr "Atbilst jebkuram likumam"
+
+#: classes/pref/filters.php:504
+#: classes/pref/filters.php:929
+msgid "Inverse matching"
+msgstr "Ačgārnā atbilstība"
+
+#: classes/pref/filters.php:516
+#: classes/pref/filters.php:936
+msgid "Test"
+msgstr "Pārbaudīt"
+
+#: classes/pref/filters.php:780
+#: classes/pref/users.php:323
+#: classes/pref/feeds.php:1307
+#: classes/feeds.php:1118
+#: classes/feeds.php:1184
+#: js/tt-rss.js:165
+msgid "Search"
+msgstr "Meklēt"
+
+#: classes/pref/filters.php:796
+msgid "Combine"
+msgstr "Apvienot"
+
+#: classes/pref/filters.php:799
+#: classes/pref/users.php:345
+msgid "Edit"
+msgstr "Mainīt"
+
+#: classes/pref/filters.php:802
+#: classes/pref/feeds.php:1327
+#: classes/pref/feeds.php:1341
+msgid "Reset sort order"
+msgstr "Atstatīt kārtošanas secību"
+
+#: classes/pref/filters.php:810
+#: classes/pref/feeds.php:1363
+msgid "Rescore articles"
+msgstr "Pārvērtēt rakstus"
+
+#: classes/pref/filters.php:939
+msgid "Create"
+msgstr "Izveidot"
+
+#: classes/pref/filters.php:993
+msgid "Inverse regular expression matching"
+msgstr "Ačgārna regulāro izteiksmju atbilstība"
+
+#: classes/pref/filters.php:995
+msgid "on field"
+msgstr "laukā"
+
+#: classes/pref/filters.php:1001
+#: js/PrefFilterTree.js:64
+msgid "in"
+msgstr "kur"
+
+#: classes/pref/filters.php:1014
+msgid "Wiki: Filters"
+msgstr "Wiki: Filtri"
+
+#: classes/pref/filters.php:1019
+msgid "Save rule"
+msgstr "Saglabāt likumu"
+
+#: classes/pref/filters.php:1019
+#: js/functions.js:865
+msgid "Add rule"
+msgstr "Pievienot likumu"
+
+#: classes/pref/filters.php:1042
+msgid "Perform Action"
+msgstr "Pielietot darbību"
+
+#: classes/pref/filters.php:1093
+#, fuzzy
+msgid "No actions available"
+msgstr "Ir pieejama jauna versija!"
+
+#: classes/pref/filters.php:1112
+msgid "Save action"
+msgstr "Saglabāt darbību"
+
+#: classes/pref/filters.php:1112
+#: js/functions.js:887
+msgid "Add action"
+msgstr "Pievienot darbību"
+
+#: classes/pref/filters.php:1136
+msgid "[No caption]"
+msgstr "[nav paraksta]"
+
+#: classes/pref/filters.php:1138
+#, php-format
+msgid "%s (%d rule)"
+msgid_plural "%s (%d rules)"
+msgstr[0] "%s (%d likums)"
+msgstr[1] "%s (%d likumi)"
+
+#: classes/pref/filters.php:1153
+#, fuzzy
+msgid "matches any rule"
+msgstr "Atbilst jebkuram likumam"
+
+#: classes/pref/filters.php:1156
+#, php-format
+msgid "%s (+%d action)"
+msgid_plural "%s (+%d actions)"
+msgstr[0] "%s (+%d darbība)"
+msgstr[1] "%s (+%d darbības)"
+
 #: classes/pref/users.php:6
 #: classes/pref/system.php:8
-#: plugins/instances/init.php:154
 msgid "Your access level is insufficient to open this tab."
 msgstr "Jums nav pietiekamas pieejas tiesības, lai atvērtu šo cilni."
 
@@ -1314,8 +1364,8 @@ msgstr "Mainīt likumu"
 
 #: classes/pref/users.php:56
 #: classes/pref/feeds.php:637
-#: classes/pref/feeds.php:878
-#: classes/feeds.php:1075
+#: classes/pref/feeds.php:866
+#: classes/feeds.php:1068
 msgid "Authentication"
 msgstr "Autentifikācija"
 
@@ -1325,7 +1375,7 @@ msgstr "Pieejas līmenis:"
 
 #: classes/pref/users.php:77
 #: classes/pref/feeds.php:667
-#: classes/pref/feeds.php:896
+#: classes/pref/feeds.php:884
 msgid "Options"
 msgstr "Iespējas"
 
@@ -1339,7 +1389,7 @@ msgid "User not found"
 msgstr "Lietotājs netika atrasts"
 
 #: classes/pref/users.php:132
-#: classes/pref/users.php:400
+#: classes/pref/users.php:399
 msgid "Registered"
 msgstr "Reģistrēts"
 
@@ -1357,7 +1407,7 @@ msgid "Stored articles"
 msgstr "Zvaigžņotie raksti"
 
 #: classes/pref/users.php:145
-#: classes/pref/users.php:399
+#: classes/pref/users.php:398
 msgid "Subscribed feeds"
 msgstr "Pasūtītās barotnes"
 
@@ -1376,506 +1426,57 @@ msgstr "Neizdevās izveidot lietotāju <b>%s</b>"
 msgid "User <b>%s</b> already exists."
 msgstr "Lietotājs <b>%s</b> jau pastāv."
 
-#: classes/pref/users.php:265
+#: classes/pref/users.php:264
 #, php-format
 msgid "Changed password of user <b>%s</b> to <b>%s</b>"
 msgstr "Izmainīta parole lietotājam no <b>%s</b> uz <b>%s</b>"
 
-#: classes/pref/users.php:267
+#: classes/pref/users.php:266
 #, php-format
 msgid "Sending new password of user <b>%s</b> to <b>%s</b>"
 msgstr "Sūta jauno paroli lietotājam <b>%s</b> uz <b>%s</b>"
 
-#: classes/pref/users.php:291
+#: classes/pref/users.php:290
 msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] paroles maiņas paziņojums"
 
-#: classes/pref/users.php:324
-#: classes/pref/feeds.php:1333
-#: classes/pref/filters.php:740
-#: classes/feeds.php:1125
-#: classes/feeds.php:1191
-#: js/tt-rss.js:165
-msgid "Search"
-msgstr "Meklēt"
-
-#: classes/pref/users.php:342
+#: classes/pref/users.php:341
 msgid "Create user"
 msgstr "Izveidot lietotāju"
 
-#: classes/pref/users.php:346
-#: classes/pref/filters.php:759
-#: plugins/instances/init.php:293
-msgid "Edit"
-msgstr "Mainīt"
-
-#: classes/pref/users.php:397
+#: classes/pref/users.php:396
 #: classes/pref/feeds.php:643
-#: classes/pref/feeds.php:882
-#: classes/pref/feeds.php:1836
-#: classes/feeds.php:1079
+#: classes/pref/feeds.php:870
+#: classes/pref/feeds.php:1810
+#: classes/feeds.php:1072
 msgid "Login"
 msgstr "Pieteikšanās"
 
-#: classes/pref/users.php:398
+#: classes/pref/users.php:397
 msgid "Access Level"
 msgstr "Pieejas līmenis"
 
-#: classes/pref/users.php:401
+#: classes/pref/users.php:400
 msgid "Last login"
 msgstr "Pēdējā pieteikšanās"
 
-#: classes/pref/users.php:420
-#: plugins/instances/init.php:334
+#: classes/pref/users.php:419
 msgid "Click to edit"
 msgstr "Klikšķiniet, lai mainītu"
 
-#: classes/pref/users.php:441
+#: classes/pref/users.php:440
 msgid "No users defined."
 msgstr "Nav definēti lietotāji."
 
-#: classes/pref/users.php:443
+#: classes/pref/users.php:442
 msgid "No matching users found."
 msgstr "Neatradu atbilstošus lietotājus."
 
-#: classes/pref/system.php:29
-msgid "Error Log"
-msgstr "Kļūdu žurnāls"
-
-#: classes/pref/system.php:40
-msgid "Refresh"
-msgstr "Atjaunot"
-
-#: classes/pref/system.php:43
-msgid "Clear log"
-msgstr "Attīrīt žurnālu"
-
-#: classes/pref/system.php:48
-msgid "Error"
-msgstr "Kļūda"
-
-#: classes/pref/system.php:49
-msgid "Filename"
-msgstr "Faila nosaukums"
-
-#: classes/pref/system.php:50
-msgid "Message"
-msgstr "Ziņojums"
-
-#: classes/pref/system.php:52
-msgid "Date"
-msgstr "Datums"
-
-#: classes/pref/feeds.php:15
-msgid "Check to enable field"
-msgstr "Iezīmējiet, lai ieslēgtu"
-
-#: classes/pref/feeds.php:65
-#: classes/pref/feeds.php:214
-#: classes/pref/feeds.php:258
-#: classes/pref/feeds.php:264
-#: classes/pref/feeds.php:290
-#, php-format
-msgid "(%d feed)"
-msgid_plural "(%d feeds)"
-msgstr[0] "(%d barotne)"
-msgstr[1] "(%d barotnes)"
-
-#: classes/pref/feeds.php:537
 #: classes/pref/prefs.php:18
+#: classes/pref/feeds.php:537
 msgid "General"
 msgstr "Vispārīgi"
 
-#: classes/pref/feeds.php:561
-msgid "Feed Title"
-msgstr "Barotnes virsraksts"
-
-#: classes/pref/feeds.php:595
-#: classes/pref/feeds.php:830
-#: classes/pref/feeds.php:1822
-#: classes/feeds.php:1055
-msgid "Place in category:"
-msgstr "Ievietot kategorijā:"
-
-#: classes/pref/feeds.php:608
-#: classes/pref/feeds.php:844
-#, fuzzy
-msgid "Language:"
-msgstr "Valoda"
-
-#: classes/pref/feeds.php:615
-#: classes/pref/feeds.php:853
-msgid "Update"
-msgstr "Atjaunot"
-
-#: classes/pref/feeds.php:630
-#: classes/pref/feeds.php:869
-msgid "Article purging:"
-msgstr "Dzēšu rakstu:"
-
-#: classes/pref/feeds.php:658
-#: classes/pref/feeds.php:890
-#: classes/pref/feeds.php:1839
-#: classes/pref/prefs.php:245
-#: classes/feeds.php:1083
-msgid "Password"
-msgstr "Parole"
-
-#: classes/pref/feeds.php:662
-msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
-msgstr "<b>Ieteikums:</b> ja jūsu barotnei ir nepieciešama autentifikācija, jums ir jāievada pieteikšanās informācija. Vienīgais izņēmums ir Twitter barotnes."
-
-#: classes/pref/feeds.php:681
-#: classes/pref/feeds.php:900
-msgid "Hide from Popular feeds"
-msgstr "Nerādīt populārajās barotnēs"
-
-#: classes/pref/feeds.php:693
-#: classes/pref/feeds.php:906
-msgid "Include in e-mail digest"
-msgstr "Iekļaut e-pasta īssavilkumu"
-
-#: classes/pref/feeds.php:706
-#: classes/pref/feeds.php:912
-msgid "Always display image attachments"
-msgstr "Vienmēr rādīt attēlu pielikumus"
-
-#: classes/pref/feeds.php:719
-#: classes/pref/feeds.php:920
-msgid "Do not embed images"
-msgstr "Neiegult attēlus"
-
-#: classes/pref/feeds.php:732
-#: classes/pref/feeds.php:928
-msgid "Cache media"
-msgstr ""
-
-#: classes/pref/feeds.php:744
-#: classes/pref/feeds.php:934
-msgid "Mark updated articles as unread"
-msgstr "Atzīmēt atjaunotos rakstus kā nelasītus"
-
-#: classes/pref/feeds.php:748
-msgid "Icon"
-msgstr "Ikona"
-
-#: classes/pref/feeds.php:765
-msgid "Replace"
-msgstr "Aizvietot"
-
-#: classes/pref/feeds.php:772
-#: classes/pref/prefs.php:698
-msgid "Plugins"
-msgstr "Spraudņi"
-
-#: classes/pref/feeds.php:792
-msgid "Resubscribe to push updates"
-msgstr "Pārpasūtīt atjaunojumu grūšanu"
-
-#: classes/pref/feeds.php:799
-msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
-msgstr "Atstata PubSubHubbub pasūtījumu statusu barotnēm ar ieslēgtu atjaunojumu grūšanu."
-
-#: classes/pref/feeds.php:1200
-#: classes/pref/feeds.php:1253
-msgid "All done."
-msgstr "Viss izdarīts."
-
-#: classes/pref/feeds.php:1308
-msgid "Feeds with errors"
-msgstr "Barotnes ar kļūdām"
-
-#: classes/pref/feeds.php:1315
-msgid "Inactive feeds"
-msgstr "Neaktīvās barotnes"
-
-#: classes/pref/feeds.php:1351
-msgid "Edit selected feeds"
-msgstr "Mainīt izvēlētās barotnes"
-
-#: classes/pref/feeds.php:1353
-#: classes/pref/feeds.php:1367
-#: classes/pref/filters.php:762
-msgid "Reset sort order"
-msgstr "Atstatīt kārtošanas secību"
-
-#: classes/pref/feeds.php:1355
-#: js/prefs.js:1622
-msgid "Batch subscribe"
-msgstr "Pasūtījuma pakotne"
-
-#: classes/pref/feeds.php:1362
-msgid "Categories"
-msgstr "Kategorijas"
-
-#: classes/pref/feeds.php:1365
-msgid "Add category"
-msgstr "Pievienot kategoriju"
-
-#: classes/pref/feeds.php:1369
-msgid "Remove selected"
-msgstr "Dzēst izvēlētās"
-
-#: classes/pref/feeds.php:1380
-msgid "More actions..."
-msgstr "Papildu iespējas..."
-
-#: classes/pref/feeds.php:1384
-msgid "Manual purge"
-msgstr "Manuāla dzēšana"
-
-#: classes/pref/feeds.php:1388
-msgid "Clear feed data"
-msgstr "Dzēst barotņu datus"
-
-#: classes/pref/feeds.php:1389
-#: classes/pref/filters.php:770
-msgid "Rescore articles"
-msgstr "Pārvērtēt rakstus"
-
-#: classes/pref/feeds.php:1442
-msgid "OPML"
-msgstr "OPML"
-
-#: classes/pref/feeds.php:1444
-msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
-msgstr "Izmantojot OPML jūs varat eksportēt un importēt savas barotnes, filtrus, etiķetes un Tiny Tiny RSS iestatījumus."
-
-#: classes/pref/feeds.php:1445
-msgid "Only main settings profile can be migrated using OPML."
-msgstr "Izmantojot OPML var migrēt tikai galvenos iestatījumus."
-
-#: classes/pref/feeds.php:1458
-msgid "Import my OPML"
-msgstr "Importēt manu OPML"
-
-#: classes/pref/feeds.php:1464
-msgid "Filename:"
-msgstr "Faila nosaukums:"
-
-#: classes/pref/feeds.php:1466
-msgid "Include settings"
-msgstr "Iekļaut iestatījumus"
-
-#: classes/pref/feeds.php:1470
-msgid "Export OPML"
-msgstr "Eksportēt OPML"
-
-#: classes/pref/feeds.php:1474
-msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
-msgstr "Jūsu OPML var publicēt un to var abonēt katrs, kas zin zemāk minēto saiti."
-
-#: classes/pref/feeds.php:1478
-msgid "Public OPML URL"
-msgstr "Publiskā OPML URL (adrese)"
-
-#: classes/pref/feeds.php:1479
-msgid "Display published OPML URL"
-msgstr "Parādīt publicētā OPML URL"
-
-#: classes/pref/feeds.php:1488
-msgid "Firefox integration"
-msgstr "Firefox integrācija"
-
-#: classes/pref/feeds.php:1490
-msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
-msgstr "Šo Tiny Tiny RSS vietni var izmantot kā Firefox Feed Reader, klikšķinot uz zemākās saites."
-
-#: classes/pref/feeds.php:1497
-msgid "Click here to register this site as a feed reader."
-msgstr "Klikšķiniet šeit, lai reģistrētu šo vietni kā barotņu avotu."
-
-#: classes/pref/feeds.php:1505
-msgid "Published & shared articles / Generated feeds"
-msgstr "Publicētie un kopīgotie raksti / sagatavotās barotnes"
-
-#: classes/pref/feeds.php:1507
-msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
-msgstr "Publicētie raksti tiek eksportēti kā publiskas RSS barotnes un tās var izmantot katrs, kas zina zemāk minēto saiti."
-
-#: classes/pref/feeds.php:1514
-#: classes/feeds.php:54
-#: classes/feeds.php:140
-msgid "View as RSS"
-msgstr "Skatīt kā RSS"
-
-#: classes/pref/feeds.php:1515
-msgid "Display URL"
-msgstr "Parādīt URL"
-
-#: classes/pref/feeds.php:1518
-msgid "Clear all generated URLs"
-msgstr "Attīrīt visus ģenerētos URL"
-
-#: classes/pref/feeds.php:1596
-msgid "These feeds have not been updated with new content for 3 months (oldest first):"
-msgstr "Šajās barotnēs nav bijis jauns saturs vairāk kā 3 mēnešus (sākot ar vecākajām):"
-
-#: classes/pref/feeds.php:1630
-#: classes/pref/feeds.php:1694
-msgid "Click to edit feed"
-msgstr "Klikšķiniet, lai mainītu"
-
-#: classes/pref/feeds.php:1648
-#: classes/pref/feeds.php:1714
-msgid "Unsubscribe from selected feeds"
-msgstr "Atcelt izvēlēto barotņu pasūtīšanu"
-
-#: classes/pref/feeds.php:1819
-msgid "Add one valid RSS feed per line (no feed detection is done)"
-msgstr "Pievienojiet vienu derīgu RSS barotni vienā rindā (barotnes netiek pārbaudītas)"
-
-#: classes/pref/feeds.php:1828
-msgid "Feeds to subscribe, One per line"
-msgstr "Pasūtāmās barotnes, pa vienai katrā rindā"
-
-#: classes/pref/feeds.php:1851
-msgid "Feeds require authentication."
-msgstr "Barotnēm nepieciešama autentifikācija"
-
-#: classes/pref/feeds.php:1858
-#: classes/feeds.php:1099
-#: classes/feeds.php:1153
-msgid "Subscribe"
-msgstr "Pasūtīt"
-
-#: classes/pref/filters.php:151
-#, fuzzy
-msgid "Preview article"
-msgstr "Jaunākie raksti"
-
-#: classes/pref/filters.php:239
-#: classes/pref/filters.php:518
-msgid "(inverse)"
-msgstr "(apvērst)"
-
-#: classes/pref/filters.php:235
-#: classes/pref/filters.php:517
-#, php-format
-msgid "%s on %s in %s %s"
-msgstr "%s uz %s iekš %s %s"
-
-#: classes/pref/filters.php:354
-#: classes/pref/filters.php:827
-#: classes/pref/filters.php:942
-msgid "Match"
-msgstr "Atbilstība"
-
-#: classes/pref/filters.php:368
-#: classes/pref/filters.php:416
-#: classes/pref/filters.php:841
-#: classes/pref/filters.php:868
-msgid "Add"
-msgstr "Pievienot"
-
-#: classes/pref/filters.php:371
-#: classes/pref/filters.php:419
-#: classes/pref/filters.php:844
-#: classes/pref/filters.php:871
-#: classes/feeds.php:122
-msgid "Delete"
-msgstr "Dzēst"
-
-#: classes/pref/filters.php:402
-#: classes/pref/filters.php:854
-msgid "Apply actions"
-msgstr "Pielietot darbības"
-
-#: classes/pref/filters.php:452
-#: classes/pref/filters.php:883
-msgid "Enabled"
-msgstr "Ieslēgts"
-
-#: classes/pref/filters.php:461
-#: classes/pref/filters.php:886
-msgid "Match any rule"
-msgstr "Atbilst jebkuram likumam"
-
-#: classes/pref/filters.php:470
-#: classes/pref/filters.php:889
-msgid "Inverse matching"
-msgstr "Ačgārnā atbilstība"
-
-#: classes/pref/filters.php:482
-#: classes/pref/filters.php:896
-msgid "Test"
-msgstr "Pārbaudīt"
-
-#: classes/pref/filters.php:756
-msgid "Combine"
-msgstr "Apvienot"
-
-#: classes/pref/filters.php:899
-msgid "Create"
-msgstr "Izveidot"
-
-#: classes/pref/filters.php:954
-msgid "Inverse regular expression matching"
-msgstr "Ačgārna regulāro izteiksmju atbilstība"
-
-#: classes/pref/filters.php:956
-msgid "on field"
-msgstr "laukā"
-
-#: classes/pref/filters.php:962
-#: js/PrefFilterTree.js:64
-msgid "in"
-msgstr "kur"
-
-#: classes/pref/filters.php:975
-msgid "Wiki: Filters"
-msgstr "Wiki: Filtri"
-
-#: classes/pref/filters.php:980
-msgid "Save rule"
-msgstr "Saglabāt likumu"
-
-#: classes/pref/filters.php:980
-#: js/functions.js:865
-msgid "Add rule"
-msgstr "Pievienot likumu"
-
-#: classes/pref/filters.php:1003
-msgid "Perform Action"
-msgstr "Pielietot darbību"
-
-#: classes/pref/filters.php:1054
-#, fuzzy
-msgid "No actions available"
-msgstr "Ir pieejama jauna versija!"
-
-#: classes/pref/filters.php:1073
-msgid "Save action"
-msgstr "Saglabāt darbību"
-
-#: classes/pref/filters.php:1073
-#: js/functions.js:887
-msgid "Add action"
-msgstr "Pievienot darbību"
-
-#: classes/pref/filters.php:1097
-msgid "[No caption]"
-msgstr "[nav paraksta]"
-
-#: classes/pref/filters.php:1099
-#, php-format
-msgid "%s (%d rule)"
-msgid_plural "%s (%d rules)"
-msgstr[0] "%s (%d likums)"
-msgstr[1] "%s (%d likumi)"
-
-#: classes/pref/filters.php:1114
-#, fuzzy
-msgid "matches any rule"
-msgstr "Atbilst jebkuram likumam"
-
-#: classes/pref/filters.php:1117
-#, php-format
-msgid "%s (+%d action)"
-msgid_plural "%s (+%d actions)"
-msgstr[0] "%s (+%d darbība)"
-msgstr[1] "%s (+%d darbības)"
-
 #: classes/pref/prefs.php:19
 msgid "Interface"
 msgstr "Saskarne"
@@ -2049,7 +1650,7 @@ msgid "Strip all but most common HTML tags when reading articles."
 msgstr "Lasot rakstus, atmest visus, izņemot pašus svarīgākos HTML tagus."
 
 #: classes/pref/prefs.php:53
-#: js/prefs.js:1584
+#: js/prefs.js:1580
 msgid "Customize stylesheet"
 msgstr "Pielāgot stilu lapu"
 
@@ -2117,6 +1718,14 @@ msgstr "Pieejas līmenis"
 msgid "Save data"
 msgstr "Saglabāt datus"
 
+#: classes/pref/prefs.php:245
+#: classes/pref/feeds.php:658
+#: classes/pref/feeds.php:878
+#: classes/pref/feeds.php:1813
+#: classes/feeds.php:1076
+msgid "Password"
+msgstr "Parole"
+
 #: classes/pref/prefs.php:254
 msgid "Your password is at default value, please change it."
 msgstr "Jums ir norādīta noklusētā parole, lūdzu nomainiet to."
@@ -2215,18 +1824,23 @@ msgstr "Pārvaldīt profilus"
 msgid "Reset to defaults"
 msgstr "Atstatīt uz noklusētajiem"
 
+#: classes/pref/prefs.php:698
+#: classes/pref/feeds.php:772
+msgid "Plugins"
+msgstr "Spraudņi"
+
 #: classes/pref/prefs.php:700
 msgid "You will need to reload Tiny Tiny RSS for plugin changes to take effect."
 msgstr "Lai tas sāktu strādāt, jums būs nepieciešams pārlādēt Tiny Tiny RSS spraudni."
 
-#: classes/pref/prefs.php:702
-msgid "Download more plugins at tt-rss.org <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forums</a> or <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a>."
-msgstr "Lejuplādējiet citus spraudņus no tt-rss.org <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forumiem</a> vai <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">viki</a>."
-
-#: classes/pref/prefs.php:732
+#: classes/pref/prefs.php:730
 msgid "System plugins"
 msgstr "Sistēmas spraudņi"
 
+#: classes/pref/prefs.php:731
+msgid "System plugins are enabled in <strong>config.php</strong> for all users."
+msgstr ""
+
 #: classes/pref/prefs.php:736
 #: classes/pref/prefs.php:792
 msgid "Plugin"
@@ -2296,6 +1910,340 @@ msgstr "Dzēst iezīmētos profilus"
 msgid "Activate profile"
 msgstr "Aktivizēt profilu"
 
+#: classes/pref/feeds.php:15
+msgid "Check to enable field"
+msgstr "Iezīmējiet, lai ieslēgtu"
+
+#: classes/pref/feeds.php:65
+#: classes/pref/feeds.php:214
+#: classes/pref/feeds.php:258
+#: classes/pref/feeds.php:264
+#: classes/pref/feeds.php:290
+#, php-format
+msgid "(%d feed)"
+msgid_plural "(%d feeds)"
+msgstr[0] "(%d barotne)"
+msgstr[1] "(%d barotnes)"
+
+#: classes/pref/feeds.php:561
+msgid "Feed Title"
+msgstr "Barotnes virsraksts"
+
+#: classes/pref/feeds.php:595
+#: classes/pref/feeds.php:818
+#: classes/pref/feeds.php:1796
+#: classes/feeds.php:1048
+msgid "Place in category:"
+msgstr "Ievietot kategorijā:"
+
+#: classes/pref/feeds.php:608
+#: classes/pref/feeds.php:832
+#, fuzzy
+msgid "Language:"
+msgstr "Valoda"
+
+#: classes/pref/feeds.php:615
+#: classes/pref/feeds.php:841
+msgid "Update"
+msgstr "Atjaunot"
+
+#: classes/pref/feeds.php:630
+#: classes/pref/feeds.php:857
+msgid "Article purging:"
+msgstr "Dzēšu rakstu:"
+
+#: classes/pref/feeds.php:662
+msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
+msgstr "<b>Ieteikums:</b> ja jūsu barotnei ir nepieciešama autentifikācija, jums ir jāievada pieteikšanās informācija. Vienīgais izņēmums ir Twitter barotnes."
+
+#: classes/pref/feeds.php:681
+#: classes/pref/feeds.php:888
+msgid "Hide from Popular feeds"
+msgstr "Nerādīt populārajās barotnēs"
+
+#: classes/pref/feeds.php:693
+#: classes/pref/feeds.php:894
+msgid "Include in e-mail digest"
+msgstr "Iekļaut e-pasta īssavilkumu"
+
+#: classes/pref/feeds.php:706
+#: classes/pref/feeds.php:900
+msgid "Always display image attachments"
+msgstr "Vienmēr rādīt attēlu pielikumus"
+
+#: classes/pref/feeds.php:719
+#: classes/pref/feeds.php:908
+msgid "Do not embed images"
+msgstr "Neiegult attēlus"
+
+#: classes/pref/feeds.php:732
+#: classes/pref/feeds.php:916
+msgid "Cache media"
+msgstr ""
+
+#: classes/pref/feeds.php:744
+#: classes/pref/feeds.php:922
+msgid "Mark updated articles as unread"
+msgstr "Atzīmēt atjaunotos rakstus kā nelasītus"
+
+#: classes/pref/feeds.php:748
+msgid "Icon"
+msgstr "Ikona"
+
+#: classes/pref/feeds.php:765
+msgid "Replace"
+msgstr "Aizvietot"
+
+#: classes/pref/feeds.php:1174
+#: classes/pref/feeds.php:1227
+msgid "All done."
+msgstr "Viss izdarīts."
+
+#: classes/pref/feeds.php:1282
+msgid "Feeds with errors"
+msgstr "Barotnes ar kļūdām"
+
+#: classes/pref/feeds.php:1289
+msgid "Inactive feeds"
+msgstr "Neaktīvās barotnes"
+
+#: classes/pref/feeds.php:1325
+msgid "Edit selected feeds"
+msgstr "Mainīt izvēlētās barotnes"
+
+#: classes/pref/feeds.php:1329
+#: js/prefs.js:1618
+msgid "Batch subscribe"
+msgstr "Pasūtījuma pakotne"
+
+#: classes/pref/feeds.php:1336
+msgid "Categories"
+msgstr "Kategorijas"
+
+#: classes/pref/feeds.php:1339
+msgid "Add category"
+msgstr "Pievienot kategoriju"
+
+#: classes/pref/feeds.php:1343
+msgid "Remove selected"
+msgstr "Dzēst izvēlētās"
+
+#: classes/pref/feeds.php:1354
+msgid "More actions..."
+msgstr "Papildu iespējas..."
+
+#: classes/pref/feeds.php:1358
+msgid "Manual purge"
+msgstr "Manuāla dzēšana"
+
+#: classes/pref/feeds.php:1362
+msgid "Clear feed data"
+msgstr "Dzēst barotņu datus"
+
+#: classes/pref/feeds.php:1416
+msgid "OPML"
+msgstr "OPML"
+
+#: classes/pref/feeds.php:1418
+msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
+msgstr "Izmantojot OPML jūs varat eksportēt un importēt savas barotnes, filtrus, etiķetes un Tiny Tiny RSS iestatījumus."
+
+#: classes/pref/feeds.php:1419
+msgid "Only main settings profile can be migrated using OPML."
+msgstr "Izmantojot OPML var migrēt tikai galvenos iestatījumus."
+
+#: classes/pref/feeds.php:1432
+msgid "Import my OPML"
+msgstr "Importēt manu OPML"
+
+#: classes/pref/feeds.php:1438
+msgid "Filename:"
+msgstr "Faila nosaukums:"
+
+#: classes/pref/feeds.php:1440
+msgid "Include settings"
+msgstr "Iekļaut iestatījumus"
+
+#: classes/pref/feeds.php:1444
+msgid "Export OPML"
+msgstr "Eksportēt OPML"
+
+#: classes/pref/feeds.php:1448
+msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
+msgstr "Jūsu OPML var publicēt un to var abonēt katrs, kas zin zemāk minēto saiti."
+
+#: classes/pref/feeds.php:1452
+msgid "Public OPML URL"
+msgstr "Publiskā OPML URL (adrese)"
+
+#: classes/pref/feeds.php:1453
+msgid "Display published OPML URL"
+msgstr "Parādīt publicētā OPML URL"
+
+#: classes/pref/feeds.php:1462
+msgid "Firefox integration"
+msgstr "Firefox integrācija"
+
+#: classes/pref/feeds.php:1464
+msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
+msgstr "Šo Tiny Tiny RSS vietni var izmantot kā Firefox Feed Reader, klikšķinot uz zemākās saites."
+
+#: classes/pref/feeds.php:1471
+msgid "Click here to register this site as a feed reader."
+msgstr "Klikšķiniet šeit, lai reģistrētu šo vietni kā barotņu avotu."
+
+#: classes/pref/feeds.php:1479
+msgid "Published & shared articles / Generated feeds"
+msgstr "Publicētie un kopīgotie raksti / sagatavotās barotnes"
+
+#: classes/pref/feeds.php:1481
+msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
+msgstr "Publicētie raksti tiek eksportēti kā publiskas RSS barotnes un tās var izmantot katrs, kas zina zemāk minēto saiti."
+
+#: classes/pref/feeds.php:1488
+#: classes/feeds.php:54
+#: classes/feeds.php:140
+msgid "View as RSS"
+msgstr "Skatīt kā RSS"
+
+#: classes/pref/feeds.php:1489
+msgid "Display URL"
+msgstr "Parādīt URL"
+
+#: classes/pref/feeds.php:1492
+msgid "Clear all generated URLs"
+msgstr "Attīrīt visus ģenerētos URL"
+
+#: classes/pref/feeds.php:1570
+msgid "These feeds have not been updated with new content for 3 months (oldest first):"
+msgstr "Šajās barotnēs nav bijis jauns saturs vairāk kā 3 mēnešus (sākot ar vecākajām):"
+
+#: classes/pref/feeds.php:1604
+#: classes/pref/feeds.php:1668
+msgid "Click to edit feed"
+msgstr "Klikšķiniet, lai mainītu"
+
+#: classes/pref/feeds.php:1622
+#: classes/pref/feeds.php:1688
+msgid "Unsubscribe from selected feeds"
+msgstr "Atcelt izvēlēto barotņu pasūtīšanu"
+
+#: classes/pref/feeds.php:1793
+msgid "Add one valid RSS feed per line (no feed detection is done)"
+msgstr "Pievienojiet vienu derīgu RSS barotni vienā rindā (barotnes netiek pārbaudītas)"
+
+#: classes/pref/feeds.php:1802
+msgid "Feeds to subscribe, One per line"
+msgstr "Pasūtāmās barotnes, pa vienai katrā rindā"
+
+#: classes/pref/feeds.php:1825
+msgid "Feeds require authentication."
+msgstr "Barotnēm nepieciešama autentifikācija"
+
+#: classes/pref/feeds.php:1832
+#: classes/feeds.php:1092
+#: classes/feeds.php:1146
+msgid "Subscribe"
+msgstr "Pasūtīt"
+
+#: classes/pref/system.php:29
+msgid "Error Log"
+msgstr "Kļūdu žurnāls"
+
+#: classes/pref/system.php:40
+msgid "Refresh"
+msgstr "Atjaunot"
+
+#: classes/pref/system.php:43
+msgid "Clear log"
+msgstr "Attīrīt žurnālu"
+
+#: classes/pref/system.php:48
+msgid "Error"
+msgstr "Kļūda"
+
+#: classes/pref/system.php:49
+msgid "Filename"
+msgstr "Faila nosaukums"
+
+#: classes/pref/system.php:50
+msgid "Message"
+msgstr "Ziņojums"
+
+#: classes/pref/system.php:52
+msgid "Date"
+msgstr "Datums"
+
+#: classes/opml.php:28
+#: classes/opml.php:33
+msgid "OPML Utility"
+msgstr "OPML rīks"
+
+#: classes/opml.php:37
+msgid "Importing OPML..."
+msgstr "Importē OPML..."
+
+#: classes/opml.php:41
+msgid "Return to preferences"
+msgstr "Atgriezties uz iestatījumiem"
+
+#: classes/opml.php:295
+#, php-format
+msgid "Adding feed: %s"
+msgstr "Pievieno barotni: %s"
+
+#: classes/opml.php:306
+#, php-format
+msgid "Duplicate feed: %s"
+msgstr "Dublēta barotne: %s"
+
+#: classes/opml.php:320
+#, php-format
+msgid "Adding label %s"
+msgstr "Pievieno etiķeti %s"
+
+#: classes/opml.php:323
+#, php-format
+msgid "Duplicate label: %s"
+msgstr "Dublēta etiķete: %s"
+
+#: classes/opml.php:335
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr "Saglabā iestatījumu atslēgu %s līdz %s"
+
+#: classes/opml.php:367
+msgid "Adding filter..."
+msgstr "Pievieno filtru..."
+
+#: classes/opml.php:486
+#, php-format
+msgid "Processing category: %s"
+msgstr "Apstrādā kategoriju: %s"
+
+#: classes/opml.php:532
+#, php-format
+msgid "Upload failed with error code %d"
+msgstr "Augšuplāde neizdevās ar kļūdas kodu %d"
+
+#: classes/opml.php:544
+#: plugins/import_export/init.php:448
+msgid "Unable to move uploaded file."
+msgstr "Neizdevās pārvietot augšuplādēto failu."
+
+#: classes/opml.php:548
+#: plugins/import_export/init.php:452
+msgid "Error: please upload OPML file."
+msgstr "Kļūda: lūdzu augšuplādējiet OPML failu."
+
+#: classes/opml.php:559
+msgid "Error: unable to find moved OPML file."
+msgstr "Kļūda: neizdevās atrast pārvietoto OPML failu."
+
+#: classes/opml.php:566
+msgid "Error while parsing document."
+msgstr "Dokumenta apstrādes kļūda."
+
 #: classes/feeds.php:53
 msgid "View as RSS feed"
 msgstr "Skatīt RSS barotni"
@@ -2336,8 +2284,8 @@ msgstr "Pārvietot atpakaļ"
 
 #: classes/feeds.php:127
 #: classes/feeds.php:132
-#: plugins/mail/init.php:75
 #: plugins/mailto/init.php:25
+#: plugins/mail/init.php:75
 msgid "Forward by email"
 msgstr "Pārsūtīt e-pastā"
 
@@ -2345,317 +2293,144 @@ msgstr "Pārsūtīt e-pastā"
 msgid "Feed:"
 msgstr "Barotne:"
 
-#: classes/feeds.php:229
-#: classes/feeds.php:892
+#: classes/feeds.php:228
+#: classes/feeds.php:885
 msgid "Feed not found."
 msgstr "Barotne netika atrasta."
 
-#: classes/feeds.php:300
+#: classes/feeds.php:291
 msgid "Never"
 msgstr "Nekad"
 
-#: classes/feeds.php:413
+#: classes/feeds.php:405
 #, php-format
 msgid "Imported at %s"
 msgstr "Importēts %s"
 
-#: classes/feeds.php:472
-#: classes/feeds.php:569
+#: classes/feeds.php:464
+#: classes/feeds.php:561
 msgid "mark feed as read"
 msgstr "atzīmēt barotni kā lasītu"
 
-#: classes/feeds.php:630
+#: classes/feeds.php:622
 msgid "Collapse article"
 msgstr "Sakļaut rakstu"
 
-#: classes/feeds.php:791
+#: classes/feeds.php:784
 msgid "No unread articles found to display."
 msgstr "Nav neizlasītu rakstu, ko rādīt."
 
-#: classes/feeds.php:794
+#: classes/feeds.php:787
 msgid "No updated articles found to display."
 msgstr "Nav atjaunotu rakstu, ko rādīt."
 
-#: classes/feeds.php:797
+#: classes/feeds.php:790
 msgid "No starred articles found to display."
 msgstr "Nav zvaigžņotu rakstu, ko rādīt."
 
-#: classes/feeds.php:801
+#: classes/feeds.php:794
 msgid "No articles found to display. You can assign articles to labels manually from article header context menu (applies to all selected articles) or use a filter."
 msgstr "Netika atrasti parādāmi raksti. Jūs varat pievienot rakstus etiķetēm manuāli (ir spēkā visiem atlasītajiem rakstiem), vai arī ar filtru."
 
-#: classes/feeds.php:803
+#: classes/feeds.php:796
 msgid "No articles found to display."
 msgstr "Netika atrasti raksti, ko rādīt."
 
-#: classes/feeds.php:818
-#: classes/feeds.php:992
+#: classes/feeds.php:811
+#: classes/feeds.php:985
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "Barotnes pēdējo reizi atjaunotas %s."
 
-#: classes/feeds.php:828
-#: classes/feeds.php:1002
+#: classes/feeds.php:821
+#: classes/feeds.php:995
 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:982
+#: classes/feeds.php:975
 msgid "No feed selected."
 msgstr "Nav izvēlēta barotne."
 
-#: classes/feeds.php:1041
-#: classes/feeds.php:1049
+#: classes/feeds.php:1034
+#: classes/feeds.php:1042
 msgid "Feed or site URL"
 msgstr "Barotnes vai vietnes URL"
 
-#: classes/feeds.php:1063
+#: classes/feeds.php:1056
 msgid "Available feeds"
 msgstr "Pieejamās barotnes"
 
-#: classes/feeds.php:1094
+#: classes/feeds.php:1087
 msgid "This feed requires authentication."
 msgstr "Šim laukam ir nepieciešams autentificēties."
 
-#: classes/feeds.php:1102
+#: classes/feeds.php:1095
 msgid "More feeds"
 msgstr "Vairāk barotnes"
 
-#: classes/feeds.php:1129
+#: classes/feeds.php:1122
 msgid "Popular feeds"
 msgstr "Populārās barotnes"
 
-#: classes/feeds.php:1130
+#: classes/feeds.php:1123
 msgid "Feed archive"
 msgstr "Barotņu arhīvs"
 
-#: classes/feeds.php:1133
+#: classes/feeds.php:1126
 msgid "limit:"
 msgstr "ierobežojumi:"
 
-#: classes/feeds.php:1165
+#: classes/feeds.php:1158
 msgid "Look for"
 msgstr "Meklēt"
 
-#: classes/feeds.php:1173
+#: classes/feeds.php:1166
 #, php-format
 msgid "in %s"
 msgstr ""
 
-#: classes/feeds.php:1178
+#: classes/feeds.php:1171
 msgid "Used for word stemming"
 msgstr ""
 
-#: classes/feeds.php:1187
+#: classes/feeds.php:1180
 msgid "Search syntax"
 msgstr "Meklēšanas sintakse"
 
-#: plugins/instances/init.php:141
-msgid "Linked"
-msgstr "Saistīts"
-
-#: plugins/instances/init.php:204
-#: plugins/instances/init.php:395
-msgid "Instance"
-msgstr "Instance"
-
-#: plugins/instances/init.php:215
-#: plugins/instances/init.php:312
-#: plugins/instances/init.php:404
-msgid "Instance URL"
-msgstr "Instances URL"
-
-#: plugins/instances/init.php:226
-#: plugins/instances/init.php:414
-msgid "Access key:"
-msgstr "Pieejas atslēga:"
-
-#: plugins/instances/init.php:229
-#: plugins/instances/init.php:313
-#: plugins/instances/init.php:417
-msgid "Access key"
-msgstr "Pieejas aslēga"
-
-#: plugins/instances/init.php:233
-#: plugins/instances/init.php:421
-msgid "Use one access key for both linked instances."
-msgstr "Izmantot to pašu pieejas aslēgu abām saistītajām instancēm."
-
-#: plugins/instances/init.php:241
-#: plugins/instances/init.php:429
-msgid "Generate new key"
-msgstr "Ģenerēt jaunu atslēgu"
-
-#: plugins/instances/init.php:292
-msgid "Link instance"
-msgstr "Saites instance"
-
-#: plugins/instances/init.php:304
-msgid "You can connect other instances of Tiny Tiny RSS to this one to share Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
-msgstr "Jūs varat pievienot kopīgot populārās barotnes un pieslēgt tai citas Tiny Tiny RSS instances. Pievienoties šai Tiny Tiny RSS instancei var, izmantojot šo saiti:"
-
-#: plugins/instances/init.php:314
-msgid "Last connected"
-msgstr "Pēdējo reizi pieteicies"
-
-#: plugins/instances/init.php:315
-msgid "Status"
-msgstr "Statuss"
-
-#: plugins/instances/init.php:316
-msgid "Stored feeds"
-msgstr "Saglabātās barotnes"
+#: classes/feeds.php:1596
+msgid "Starred articles"
+msgstr "Zvaigžņotie raksti"
 
-#: plugins/instances/init.php:433
-msgid "Create link"
-msgstr "Izveidot saiti"
+#: classes/feeds.php:1598
+msgid "Published articles"
+msgstr "Publicētie raksti"
 
-#: plugins/nsfw/init.php:30
-#: plugins/nsfw/init.php:42
-msgid "Not work safe (click to toggle)"
-msgstr "Nav drošs darbam (klikšķiniet, lai pārslēgtu)"
+#: classes/feeds.php:1600
+msgid "Fresh articles"
+msgstr "Jaunākie raksti"
 
-#: plugins/nsfw/init.php:52
-msgid "NSFW Plugin"
-msgstr "NSFW spraudnis"
+#: classes/feeds.php:1604
+msgid "Archived articles"
+msgstr "Arhivētie raksti"
 
-#: plugins/nsfw/init.php:79
-msgid "Tags to consider NSFW (comma-separated)"
-msgstr "Tagi, kurus izmantot NSFW (atdalīti ar komatu)"
+#: classes/feeds.php:1606
+msgid "Recently read"
+msgstr "Nesen lasītie raksti"
 
-#: plugins/nsfw/init.php:100
-msgid "Configuration saved."
-msgstr "Iestatījumi ir saglabāti."
+#: classes/feeds.php:1716
+msgid "Special"
+msgstr "Īpaši"
 
-#: plugins/note/init.php:26
-#: plugins/note/note.js:11
-msgid "Edit article note"
-msgstr "Mainīt raksta piezīmes"
+#: classes/feeds.php:1962
+#, php-format
+msgid "Search results: %s"
+msgstr "Meklēšanas rezultāti: %s"
 
 #: plugins/vf_shared/init.php:16
-#: plugins/vf_shared/init.php:69
+#: plugins/vf_shared/init.php:60
 msgid "Shared articles"
 msgstr "Kopīgoti raksti"
 
-#: plugins/auth_internal/init.php:65
-msgid "Please enter your one time password:"
-msgstr "Lūdzu ievadiet vienreizlietojamo paroli:"
-
-#: plugins/auth_internal/init.php:188
-msgid "Password has been changed."
-msgstr "Parole ir nomainīta."
-
-#: plugins/auth_internal/init.php:190
-msgid "Old password is incorrect."
-msgstr "Vecā parole nav pareiza."
-
-#: plugins/af_readability/init.php:21
-msgid "Data saved."
-msgstr ""
-
-#: plugins/af_readability/init.php:33
-#, fuzzy
-msgid "Inline content"
-msgstr "Pārtīt raksta saturu"
-
-#: plugins/af_readability/init.php:39
-msgid "Readability settings (af_readability)"
-msgstr ""
-
-#: plugins/af_readability/init.php:66
-msgid "Use Readability for pages shared via bookmarklet."
-msgstr ""
-
-#: plugins/af_readability/init.php:78
-#: plugins/af_psql_trgm/init.php:191
-msgid "Currently enabled for (click to edit):"
-msgstr ""
-
-#: plugins/af_readability/init.php:95
-#, fuzzy
-msgid "Readability"
-msgstr "Pārbaudīt pieejamību"
-
-#: plugins/af_readability/init.php:106
-#, fuzzy
-msgid "Inline article content"
-msgstr "Pārtīt raksta saturu"
-
-#: plugins/af_redditimgur/init.php:25
-msgid "Reddit content settings (af_redditimgur)"
-msgstr ""
-
-#: plugins/af_redditimgur/init.php:50
-msgid "Uses Readability (full-text-rss) implementation by <a target='_blank' href='https://bitbucket.org/fivefilters/'>FiveFilters.org</a>"
-msgstr ""
-
-#: plugins/af_redditimgur/init.php:54
-msgid "Extract missing content using Readability"
-msgstr ""
-
-#: plugins/af_redditimgur/init.php:59
-msgid "Enable additional duplicate checking"
-msgstr ""
-
-#: plugins/af_redditimgur/init.php:73
-#: plugins/af_zz_imgproxy/init.php:225
-#, fuzzy
-msgid "Configuration saved"
-msgstr "Iestatījumi ir saglabāti."
-
-#: plugins/af_psql_trgm/init.php:28
-#, php-format
-msgid "Data saved (%s, %d)"
-msgstr ""
-
-#: plugins/af_psql_trgm/init.php:112
-#, fuzzy
-msgid "Show related articles"
-msgstr "Kopīgoti raksti"
-
-#: plugins/af_psql_trgm/init.php:118
-#: plugins/af_psql_trgm/init.php:220
-#, fuzzy
-msgid "Mark similar articles as read"
-msgstr "Vai atzīmēt visus rakstus kā lasītus?"
-
-#: plugins/af_psql_trgm/init.php:157
-msgid "PostgreSQL trigram extension returns string similarity as a floating point number (0-1). Setting it too low might produce false positives, zero disables checking."
-msgstr ""
-
-#: plugins/af_psql_trgm/init.php:160
-#, fuzzy
-msgid "Global settings"
-msgstr "Iekļaut iestatījumus"
-
-#: plugins/af_psql_trgm/init.php:164
-msgid "Minimum similarity:"
-msgstr ""
-
-#: plugins/af_psql_trgm/init.php:169
-msgid "Minimum title length:"
-msgstr ""
-
-#: plugins/af_psql_trgm/init.php:174
-#, fuzzy
-msgid "Enable for all feeds:"
-msgstr "Ieslēgt barotņu kategorijas"
-
-#: plugins/af_psql_trgm/init.php:209
-msgid "Similarity (pg_trgm)"
-msgstr ""
-
-#: plugins/af_comics/init.php:40
-msgid "Feeds supported by af_comics"
-msgstr "Ar af_comics atbalstītās barotnes"
-
-#: plugins/af_comics/init.php:42
-msgid "The following comics are currently supported:"
-msgstr "Šobrīd tiek atbalstīti sekojoši komiksi:"
-
-#: plugins/af_comics/init.php:60
-msgid "GoComics requires a specific URL to workaround their lack of feed support: <code>http://feeds.feedburner.com/uclick/<em>comic_name</em></code> (e.g. <code>http://www.gocomics.com/garfield</code> uses <code>http://feeds.feedburner.com/uclick/garfield</code>)."
-msgstr ""
-
 #: plugins/import_export/init.php:58
 msgid "Import and export"
 msgstr "Imports un eksports"
@@ -2672,95 +2447,83 @@ msgstr "Eksportēt manus datus"
 msgid "Import"
 msgstr "Imports"
 
-#: plugins/import_export/init.php:225
+#: plugins/import_export/init.php:231
 msgid "Could not import: incorrect schema version."
 msgstr "Neizdevās importēt: nepareiza shēmas versija."
 
-#: plugins/import_export/init.php:230
+#: plugins/import_export/init.php:236
 msgid "Could not import: unrecognized document format."
 msgstr "Neizdevās importēt: neatpazīts dokumenta formāts."
 
-#: plugins/import_export/init.php:391
+#: plugins/import_export/init.php:397
 msgid "Finished: "
 msgstr "Pabeigts:"
 
-#: plugins/import_export/init.php:392
+#: plugins/import_export/init.php:398
 #, php-format
 msgid "%d article processed, "
 msgid_plural "%d articles processed, "
 msgstr[0] "apstrādāts %d raksts,"
 msgstr[1] "apstrādāti %d raksti, "
 
-#: plugins/import_export/init.php:393
+#: plugins/import_export/init.php:399
 #, php-format
 msgid "%d imported, "
 msgid_plural "%d imported, "
 msgstr[0] "%d importēts, "
 msgstr[1] "%d importēti, "
 
-#: plugins/import_export/init.php:394
+#: plugins/import_export/init.php:400
 #, php-format
 msgid "%d feed created."
 msgid_plural "%d feeds created."
 msgstr[0] "%d izveidota barotne."
 msgstr[1] "izveidotas %d barotnes."
 
-#: plugins/import_export/init.php:399
+#: plugins/import_export/init.php:405
 msgid "Could not load XML document."
 msgstr "Neizdevās ielādēt XML dokumentu."
 
-#: plugins/import_export/init.php:411
+#: plugins/import_export/init.php:417
 msgid "Prepare data"
 msgstr "Sagatavo datus"
 
-#: plugins/import_export/init.php:428
+#: plugins/import_export/init.php:434
 #, fuzzy, php-format
 msgid "Upload failed with error code %d (%s)"
 msgstr "Augšuplāde neizdevās ar kļūdas kodu %d"
 
-#: plugins/import_export/init.php:454
+#: plugins/import_export/init.php:460
 msgid "No file uploaded."
 msgstr "Fails nav augšuplādēts."
 
-#: plugins/mail/init.php:28
-msgid "Mail addresses saved."
-msgstr "E-pasta adrese saglabāta."
-
-#: plugins/mail/init.php:34
-msgid "Mail plugin"
-msgstr "E-pasta spraudnis"
-
-#: plugins/mail/init.php:36
-msgid "You can set predefined email addressed here (comma-separated list):"
-msgstr "Jūs varat šeit iestatīt iepriekšnoteiktas adreses (ar komatu atdalīts saraksts):"
-
+#: plugins/mailto/init.php:48
+#: plugins/mailto/init.php:54
 #: plugins/mail/init.php:112
 #: plugins/mail/init.php:118
-#: plugins/mailto/init.php:49
-#: plugins/mailto/init.php:55
 msgid "[Forwarded]"
 msgstr "[Pārsūtīts]"
 
+#: plugins/mailto/init.php:48
 #: plugins/mail/init.php:112
-#: plugins/mailto/init.php:49
 msgid "Multiple articles"
 msgstr "Vairāki raksti"
 
-#: plugins/mail/init.php:140
-msgid "To:"
-msgstr "Uz:"
+#: plugins/mailto/init.php:70
+msgid "Clicking the following link to invoke your mail client:"
+msgstr "Klikšķiniet uz šīs saites, lai uzlūgtu jūsu e-pasta klientu:"
 
-#: plugins/mail/init.php:155
-msgid "Subject:"
-msgstr "Temats:"
+#: plugins/mailto/init.php:74
+msgid "Forward selected article(s) by email."
+msgstr "Pārsūtīt izvēlētos rakstus pa e-pastu."
 
-#: plugins/mail/init.php:172
-msgid "Send e-mail"
-msgstr "Nosūtīt e-pastu"
+#: plugins/mailto/init.php:77
+msgid "You should be able to edit the message before sending in your mail client."
+msgstr "Jums vajadzētu spēt mainīt ziņu pirms nosūtīšanas jūsu e-pasta klientam."
 
-#: plugins/close_button/init.php:22
-msgid "Close article"
-msgstr "Aizvērt rakstu"
+#: plugins/mailto/init.php:82
+msgid "Close this dialog"
+msgstr "Aizvērt šo logu"
 
 #: plugins/bookmarklets/init.php:20
 msgid "Bookmarklets"
@@ -2783,34 +2546,124 @@ msgstr "Pasūtīt Tiny Tiny RSS"
 msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
 msgstr "Izmantojiet grāmatzīmes lai publicētu izvēlētās lapas Tiny Tiny RSS"
 
+#: plugins/af_psql_trgm/init.php:28
+#, php-format
+msgid "Data saved (%s, %d)"
+msgstr ""
+
+#: plugins/af_psql_trgm/init.php:112
+#, fuzzy
+msgid "Show related articles"
+msgstr "Kopīgoti raksti"
+
+#: plugins/af_psql_trgm/init.php:118
+#: plugins/af_psql_trgm/init.php:220
+#, fuzzy
+msgid "Mark similar articles as read"
+msgstr "Vai atzīmēt visus rakstus kā lasītus?"
+
+#: plugins/af_psql_trgm/init.php:157
+msgid "PostgreSQL trigram extension returns string similarity as a floating point number (0-1). Setting it too low might produce false positives, zero disables checking."
+msgstr ""
+
+#: plugins/af_psql_trgm/init.php:160
+#, fuzzy
+msgid "Global settings"
+msgstr "Iekļaut iestatījumus"
+
+#: plugins/af_psql_trgm/init.php:164
+msgid "Minimum similarity:"
+msgstr ""
+
+#: plugins/af_psql_trgm/init.php:169
+msgid "Minimum title length:"
+msgstr ""
+
+#: plugins/af_psql_trgm/init.php:174
+#, fuzzy
+msgid "Enable for all feeds:"
+msgstr "Ieslēgt barotņu kategorijas"
+
+#: plugins/af_psql_trgm/init.php:191
+#: plugins/af_readability/init.php:78
+msgid "Currently enabled for (click to edit):"
+msgstr ""
+
+#: plugins/af_psql_trgm/init.php:209
+msgid "Similarity (pg_trgm)"
+msgstr ""
+
+#: plugins/nsfw/init.php:30
+#: plugins/nsfw/init.php:42
+msgid "Not work safe (click to toggle)"
+msgstr "Nav drošs darbam (klikšķiniet, lai pārslēgtu)"
+
+#: plugins/nsfw/init.php:52
+msgid "NSFW Plugin"
+msgstr "NSFW spraudnis"
+
+#: plugins/nsfw/init.php:79
+msgid "Tags to consider NSFW (comma-separated)"
+msgstr "Tagi, kurus izmantot NSFW (atdalīti ar komatu)"
+
+#: plugins/nsfw/init.php:100
+msgid "Configuration saved."
+msgstr "Iestatījumi ir saglabāti."
+
 #: plugins/toggle_sidebar/init.php:23
 msgid "Collapse feedlist"
 msgstr "Sakļaut barotņu sarakstu"
 
-#: plugins/af_zz_imgproxy/init.php:186
-msgid "Image proxy settings (af_zz_imgproxy)"
+#: plugins/af_readability/init.php:21
+msgid "Data saved."
 msgstr ""
 
-#: plugins/af_zz_imgproxy/init.php:211
+#: plugins/af_readability/init.php:33
 #, fuzzy
-msgid "Enable proxy for all remote images."
-msgstr "Ieslēgt barotņu kategorijas"
+msgid "Inline content"
+msgstr "Pārtīt raksta saturu"
 
-#: plugins/mailto/init.php:71
-msgid "Clicking the following link to invoke your mail client:"
-msgstr "Klikšķiniet uz šīs saites, lai uzlūgtu jūsu e-pasta klientu:"
+#: plugins/af_readability/init.php:39
+msgid "Readability settings (af_readability)"
+msgstr ""
 
-#: plugins/mailto/init.php:75
-msgid "Forward selected article(s) by email."
-msgstr "Pārsūtīt izvēlētos rakstus pa e-pastu."
+#: plugins/af_readability/init.php:66
+msgid "Use Readability for pages shared via bookmarklet."
+msgstr ""
 
-#: plugins/mailto/init.php:78
-msgid "You should be able to edit the message before sending in your mail client."
-msgstr "Jums vajadzētu spēt mainīt ziņu pirms nosūtīšanas jūsu e-pasta klientam."
+#: plugins/af_readability/init.php:95
+#, fuzzy
+msgid "Readability"
+msgstr "Pārbaudīt pieejamību"
 
-#: plugins/mailto/init.php:83
-msgid "Close this dialog"
-msgstr "Aizvērt šo logu"
+#: plugins/af_readability/init.php:106
+#, fuzzy
+msgid "Inline article content"
+msgstr "Pārtīt raksta saturu"
+
+#: plugins/mail/init.php:28
+msgid "Mail addresses saved."
+msgstr "E-pasta adrese saglabāta."
+
+#: plugins/mail/init.php:34
+msgid "Mail plugin"
+msgstr "E-pasta spraudnis"
+
+#: plugins/mail/init.php:36
+msgid "You can set predefined email addressed here (comma-separated list):"
+msgstr "Jūs varat šeit iestatīt iepriekšnoteiktas adreses (ar komatu atdalīts saraksts):"
+
+#: plugins/mail/init.php:140
+msgid "To:"
+msgstr "Uz:"
+
+#: plugins/mail/init.php:155
+msgid "Subject:"
+msgstr "Temats:"
+
+#: plugins/mail/init.php:172
+msgid "Send e-mail"
+msgstr "Nosūtīt e-pastu"
 
 #: plugins/share/init.php:39
 msgid "You can disable all articles shared by unique URLs here."
@@ -2824,24 +2677,97 @@ msgstr "Atcelt visu rakstu kopīgošanu"
 msgid "Share by URL"
 msgstr "Kopīgot ar URL"
 
-#: plugins/share/init.php:97
+#: plugins/share/init.php:96
 msgid "You can share this article by the following unique URL:"
 msgstr "Jūs varat kopīgot šo rakstu ar sekojošu unikālu URL:"
 
-#: plugins/share/init.php:115
+#: plugins/share/init.php:114
 msgid "Unshare article"
 msgstr "Nekopīgot rakstu"
 
+#: plugins/af_comics/init.php:48
+msgid "Feeds supported by af_comics"
+msgstr "Ar af_comics atbalstītās barotnes"
+
+#: plugins/af_comics/init.php:50
+msgid "The following comics are currently supported:"
+msgstr "Šobrīd tiek atbalstīti sekojoši komiksi:"
+
+#: plugins/af_comics/init.php:68
+msgid "GoComics requires a specific URL to workaround their lack of feed support: <code>http://feeds.feedburner.com/uclick/<em>comic_name</em></code> (e.g. <code>http://www.gocomics.com/garfield</code> uses <code>http://feeds.feedburner.com/uclick/garfield</code>)."
+msgstr ""
+
+#: plugins/af_comics/init.php:70
+msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:25
+msgid "Reddit content settings (af_redditimgur)"
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:50
+msgid "Uses Readability (full-text-rss) implementation by <a target='_blank' href='https://bitbucket.org/fivefilters/'>FiveFilters.org</a>"
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:54
+msgid "Extract missing content using Readability"
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:59
+msgid "Enable additional duplicate checking"
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:73
+#: plugins/af_zz_imgproxy/init.php:254
+#, fuzzy
+msgid "Configuration saved"
+msgstr "Iestatījumi ir saglabāti."
+
+#: plugins/note/init.php:26
+#: plugins/note/note.js:11
+msgid "Edit article note"
+msgstr "Mainīt raksta piezīmes"
+
+#: plugins/close_button/init.php:25
+msgid "Close article"
+msgstr "Aizvērt rakstu"
+
+#: plugins/af_zz_imgproxy/init.php:210
+msgid "Image proxy settings (af_zz_imgproxy)"
+msgstr ""
+
+#: plugins/af_zz_imgproxy/init.php:234
+#, fuzzy
+msgid "Enable proxy for all remote images."
+msgstr "Ieslēgt barotņu kategorijas"
+
+#: plugins/af_zz_imgproxy/init.php:238
+#, fuzzy
+msgid "Don't cache files locally."
+msgstr "Kešot attēlus lokāli"
+
+#: plugins/auth_internal/init.php:65
+msgid "Please enter your one time password:"
+msgstr "Lūdzu ievadiet vienreizlietojamo paroli:"
+
+#: plugins/auth_internal/init.php:188
+msgid "Password has been changed."
+msgstr "Parole ir nomainīta."
+
+#: plugins/auth_internal/init.php:190
+msgid "Old password is incorrect."
+msgstr "Vecā parole nav pareiza."
+
 #: js/FeedTree.js:172
 #, fuzzy
 msgid "(Un)collapse"
 msgstr "Izvērst/sakļaut sānjoslu"
 
-#: js/PrefFeedTree.js:52
+#: js/PrefFeedTree.js:54
 msgid "Edit category"
 msgstr "Mainīt kategoriju"
 
-#: js/PrefFeedTree.js:59
+#: js/PrefFeedTree.js:61
 msgid "Remove category"
 msgstr "Dzēst kategoriju"
 
@@ -2876,63 +2802,55 @@ msgid "Create Filter"
 msgstr "Izveidot filtru"
 
 #: js/functions.js:1128
-msgid "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification hub again on next feed update."
-msgstr "Atstatīt pasūtīšanu? Tiny Tiny RSS mēģinās savākt informāciju no šīs barotnes kārtējā atjaunojuma laikā."
-
-#: js/functions.js:1139
-msgid "Subscription reset."
-msgstr "Barotnes pārstatīšana."
-
-#: js/functions.js:1149
-#: js/tt-rss.js:695
+#: js/tt-rss.js:696
 #, perl-format
 msgid "Unsubscribe from %s?"
 msgstr "Atteikt pasūtījumu %s?"
 
-#: js/functions.js:1152
+#: js/functions.js:1131
 msgid "Removing feed..."
 msgstr "Pārsauc barotni..."
 
-#: js/functions.js:1225
+#: js/functions.js:1204
 msgid "Please enter category title:"
 msgstr "Lūdzu ievadiet kategorijas virsrakstu:"
 
-#: js/functions.js:1250
+#: js/functions.js:1229
 msgid "Generate new syndication address for this feed?"
 msgstr "Izveidot jaunu šīs barotnes sindikācijas adresi?"
 
-#: js/functions.js:1254
-#: js/prefs.js:1154
+#: js/functions.js:1233
+#: js/prefs.js:1150
 msgid "Trying to change address..."
 msgstr "Mēģina izmainīt adresi..."
 
-#: js/functions.js:1497
-#: js/functions.js:1606
+#: js/functions.js:1476
+#: js/functions.js:1585
 #: js/prefs.js:398
 #: js/prefs.js:424
 #: js/prefs.js:456
 #: js/prefs.js:599
 #: js/prefs.js:617
-#: js/prefs.js:1136
-#: js/prefs.js:1263
+#: js/prefs.js:1132
+#: js/prefs.js:1259
 msgid "No feeds are selected."
 msgstr "Nav izvēlēta barotne"
 
-#: js/functions.js:1540
+#: js/functions.js:1519
 msgid "Remove selected feeds from the archive? Feeds with stored articles will not be removed."
 msgstr "Dzēst izvēlētās barotnes no arhīva? Barotnes, kurās ir raksti, netiks dzēstas."
 
-#: js/functions.js:1577
+#: js/functions.js:1556
 msgid "Feeds with update errors"
 msgstr "Barotnes ar atjaunošanas kļūdām"
 
-#: js/functions.js:1588
-#: js/prefs.js:1117
+#: js/functions.js:1567
+#: js/prefs.js:1113
 msgid "Remove selected feeds?"
 msgstr "Dzēst izvēlētās barotnes?"
 
-#: js/functions.js:1591
-#: js/prefs.js:1120
+#: js/functions.js:1570
+#: js/prefs.js:1116
 msgid "Removing selected feeds..."
 msgstr "Dzēš izvēlētās barotnes..."
 
@@ -2955,9 +2873,7 @@ msgstr "Lietotāja redaktors"
 #: js/prefs.js:100
 #: js/prefs.js:209
 #: js/prefs.js:706
-#: plugins/instances/instances.js:26
-#: plugins/instances/instances.js:89
-#: js/functions.js:1408
+#: js/functions.js:1387
 msgid "Saving data..."
 msgstr "Saglabā datus..."
 
@@ -2982,7 +2898,7 @@ msgid "Removing selected labels..."
 msgstr "Dzēš izvēlētās etiķetes..."
 
 #: js/prefs.js:308
-#: js/prefs.js:1304
+#: js/prefs.js:1300
 msgid "No labels are selected."
 msgstr "Nav izvēlēta etiķete."
 
@@ -3081,28 +2997,28 @@ msgstr "Saglabāt izvēlēto barotņu izmaiņas?"
 msgid "OPML Import"
 msgstr "OPML imports"
 
-#: js/prefs.js:764
+#: js/prefs.js:759
 msgid "Please choose an OPML file first."
 msgstr "Lūdzu vispirms norādiet OPML failu."
 
-#: js/prefs.js:767
+#: js/prefs.js:762
 #: plugins/import_export/import_export.js:115
 msgid "Importing, please wait..."
 msgstr "Importē, lūdzu gaidiet..."
 
-#: js/prefs.js:928
+#: js/prefs.js:924
 msgid "Reset to defaults?"
 msgstr "Atsatīt uz noklusēto?"
 
-#: js/prefs.js:1628
+#: js/prefs.js:1624
 msgid "Subscribing to feeds..."
 msgstr "Barotņu pasūtīšana"
 
-#: js/prefs.js:1647
+#: js/prefs.js:1643
 msgid "Clear stored data for this plugin?"
 msgstr "Attīrīt šī spraudņa saglabātos datus?"
 
-#: js/prefs.js:1661
+#: js/prefs.js:1657
 msgid "Clear all messages in the error log?"
 msgstr "Izdzēst visus ziņojumus kļūdu žurnālā?"
 
@@ -3114,178 +3030,148 @@ msgstr "Vai atzīmēt visus rakstus kā lasītus?"
 msgid "Marking all feeds as read..."
 msgstr "Atzīmē visas barotnes kā lasītas..."
 
-#: js/tt-rss.js:401
+#: js/tt-rss.js:402
 msgid "Please enable mail plugin first."
 msgstr "Lūdzu, vispirmi ieslēdziet e-pasta spraudni."
 
-#: js/tt-rss.js:449
-#: js/functions.js:1387
-#: js/tt-rss.js:676
+#: js/tt-rss.js:450
+#: js/functions.js:1366
+#: js/tt-rss.js:677
 msgid "You can't edit this kind of feed."
 msgstr "Jūs nevarat mainīt šāda veida barotni."
 
-#: js/tt-rss.js:530
+#: js/tt-rss.js:531
 msgid "Please enable embed_original plugin first."
 msgstr "Lūdzu, vispirms ieslēdziet embeded_original spraudni."
 
-#: js/tt-rss.js:543
-#: js/tt-rss.js:726
+#: js/tt-rss.js:544
+#: js/tt-rss.js:727
 msgid "Widescreen is not available in combined mode."
 msgstr ""
 
-#: js/tt-rss.js:824
+#: js/tt-rss.js:825
 msgid "You can't rescore this kind of feed."
 msgstr "Jūs nevarat pārvērtēt šī veida barotni."
 
-#: js/tt-rss.js:829
-#: js/tt-rss.js:689
+#: js/tt-rss.js:830
+#: js/tt-rss.js:690
 msgid "Please select some feed first."
 msgstr "Lūdzu, vispirms norādiet barotni."
 
-#: js/tt-rss.js:834
+#: js/tt-rss.js:835
 #, perl-format
 msgid "Rescore articles in %s?"
 msgstr "Pārvērtēt rakstus %s?"
 
-#: js/tt-rss.js:837
+#: js/tt-rss.js:838
 msgid "Rescoring articles..."
 msgstr "Pārvērtē rakstus..."
 
-#: js/viewfeed.js:919
-#: js/viewfeed.js:957
-#: js/viewfeed.js:1005
-#: js/viewfeed.js:1931
-#: plugins/mail/mail.js:7
+#: js/viewfeed.js:921
+#: js/viewfeed.js:959
+#: js/viewfeed.js:1007
+#: js/viewfeed.js:1933
 #: plugins/mailto/init.js:7
-#: js/viewfeed.js:677
-#: js/viewfeed.js:699
-#: js/viewfeed.js:720
-#: js/viewfeed.js:779
-#: js/viewfeed.js:807
+#: plugins/mail/mail.js:7
+#: js/viewfeed.js:679
+#: js/viewfeed.js:701
+#: js/viewfeed.js:722
+#: js/viewfeed.js:781
+#: js/viewfeed.js:809
 msgid "No articles are selected."
 msgstr "Nav norādīts raksts."
 
-#: js/viewfeed.js:927
+#: js/viewfeed.js:929
 #, perl-format
 msgid "Delete %d selected article in %s?"
 msgid_plural "Delete %d selected articles in %s?"
 msgstr[0] "Dzēst %d izvēlēto rakstu %s?"
 msgstr[1] "Dzēst %d izvēlētos rakstus %s?"
 
-#: js/viewfeed.js:929
+#: js/viewfeed.js:931
 #, perl-format
 msgid "Delete %d selected article?"
 msgid_plural "Delete %d selected articles?"
 msgstr[0] "Dzēst %d izvēlēto rakstu?"
 msgstr[1] "Dzēst %d izvēlētos rakstus?"
 
-#: js/viewfeed.js:966
+#: js/viewfeed.js:968
 #, perl-format
 msgid "Archive %d selected article in %s?"
 msgid_plural "Archive %d selected articles in %s?"
 msgstr[0] "Arhivēt %d izvēlēto rakstu %s?"
 msgstr[1] "Arhivēt %d izvēlētos rakstus %s?"
 
-#: js/viewfeed.js:969
+#: js/viewfeed.js:971
 #, perl-format
 msgid "Move %d archived article back?"
 msgid_plural "Move %d archived articles back?"
 msgstr[0] "Pārvietot %d arhivēto rakstu atpakaļ?"
 msgstr[1] "Pārvietot %d arhivētos rakstus atpakaļ?"
 
-#: js/viewfeed.js:971
+#: js/viewfeed.js:973
 msgid "Please note that unstarred articles might get purged on next feed update."
 msgstr "Lūdzu ņemiet vērā, ka nezvaigžņotie raksti pēc nākamā atjaunojuma var tikt dzēsti."
 
-#: js/viewfeed.js:1011
+#: js/viewfeed.js:1013
 #, perl-format
 msgid "Mark %d selected article in %s as read?"
 msgid_plural "Mark %d selected articles in %s as read?"
 msgstr[0] "Atzīmēt %d izvēlēto rakstu %s kā lasītu?"
 msgstr[1] "Atzīmēt %d izvēlētos rakstus %s kā lasītus?"
 
-#: js/viewfeed.js:1031
+#: js/viewfeed.js:1033
 msgid "Edit article Tags"
 msgstr "Mainīt rakstu iezīmes"
 
-#: js/viewfeed.js:1037
+#: js/viewfeed.js:1039
 msgid "Saving article tags..."
 msgstr "Saglabā rakstu iezīmes..."
 
-#: js/viewfeed.js:1670
+#: js/viewfeed.js:1672
 msgid "Open original article"
 msgstr "Atvērt sākotnējo rakstu"
 
-#: js/viewfeed.js:1677
+#: js/viewfeed.js:1679
 #, fuzzy
 msgid "Display article URL"
 msgstr "Parādīt URL"
 
-#: js/viewfeed.js:1787
+#: js/viewfeed.js:1789
 msgid "Assign label"
 msgstr "Pievienot etiķeti"
 
-#: js/viewfeed.js:1792
+#: js/viewfeed.js:1794
 msgid "Remove label"
 msgstr "Dzēst etiķeti"
 
-#: js/viewfeed.js:1824
+#: js/viewfeed.js:1826
 msgid "Select articles in group"
 msgstr "Izvēlēties grupas rakstus"
 
-#: js/viewfeed.js:1834
+#: js/viewfeed.js:1836
 msgid "Mark group as read"
 msgstr "Atzīmēt grupu kā lasītu"
 
-#: js/viewfeed.js:1846
+#: js/viewfeed.js:1848
 msgid "Mark feed as read"
 msgstr "Atzīmēt barotni kā lasītu"
 
-#: js/viewfeed.js:1899
+#: js/viewfeed.js:1901
 msgid "Please enter new score for selected articles:"
 msgstr "Ievadiet jauno vērtējumu izvēlētajiem rakstiem:"
 
-#: js/viewfeed.js:1962
+#: js/viewfeed.js:1964
 msgid "Please enter new score for this article:"
 msgstr "Ievadiet jaunu vērtējumu šim rakstam:"
 
-#: js/viewfeed.js:1993
+#: js/viewfeed.js:1995
 msgid "Article URL:"
 msgstr "Raksta vietrādis:"
 
-#: plugins/instances/instances.js:10
-msgid "Link Instance"
-msgstr "Saistīt instanci"
-
-#: plugins/instances/instances.js:73
-msgid "Edit Instance"
-msgstr "Mainīt instanci"
-
-#: plugins/instances/instances.js:122
-msgid "Remove selected instances?"
-msgstr "Dzēst izvēlētās instances?"
-
-#: plugins/instances/instances.js:125
-msgid "Removing selected instances..."
-msgstr "Dzēš izvēlētās instances..."
-
-#: plugins/instances/instances.js:139
-#: plugins/instances/instances.js:151
-msgid "No instances are selected."
-msgstr "Nav izvēlēta neviena instance."
-
-#: plugins/instances/instances.js:156
-msgid "Please select only one instance."
-msgstr "Lūdzu, izvēlieties tikai vienu instanci."
-
-#: plugins/note/note.js:17
-msgid "Saving article note..."
-msgstr "Saglabā raksta piezīmes..."
-
-#: plugins/af_psql_trgm/init.js:11
-#, fuzzy
-msgid "Related articles"
-msgstr "Dzēst rakstu"
+#: plugins/embed_original/init.js:6
+msgid "Sorry, your browser does not support sandboxed iframes."
+msgstr "Piedodiet, jūsu pārlūkprogramma neatbalsta iegultos rāmjus (iframe) smilšu kastē."
 
 #: plugins/import_export/import_export.js:13
 msgid "Export Data"
@@ -3306,11 +3192,16 @@ msgstr "Datu imports"
 msgid "Please choose the file first."
 msgstr "Lūdzu vispirms norādiet failu."
 
-#: plugins/mail/mail.js:21
 #: plugins/mailto/init.js:21
+#: plugins/mail/mail.js:21
 msgid "Forward article by email"
 msgstr "Pārsūtīt rakstu pa e-pastu"
 
+#: plugins/af_psql_trgm/init.js:11
+#, fuzzy
+msgid "Related articles"
+msgstr "Dzēst rakstu"
+
 #: plugins/mail/mail.js:36
 msgid "Error sending email:"
 msgstr "Kļūda sūtot e-pastu:"
@@ -3319,10 +3210,6 @@ msgstr "Kļūda sūtot e-pastu:"
 msgid "Your message has been sent."
 msgstr "Jūsu ziņojums ir nosūtīts."
 
-#: plugins/embed_original/init.js:6
-msgid "Sorry, your browser does not support sandboxed iframes."
-msgstr "Piedodiet, jūsu pārlūkprogramma neatbalsta iegultos rāmjus (iframe) smilšu kastē."
-
 #: plugins/shorten_expanded/init.js:39
 msgid "Click to expand article"
 msgstr "Klikšķiniet, lai izvērstu rakstu"
@@ -3352,7 +3239,7 @@ msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr "Tas padarīs nederīgus visu iepriekš izveidoto kopīgoto rakstu URLus. Turpināt?"
 
 #: plugins/share/share_prefs.js:6
-#: js/prefs.js:1437
+#: js/prefs.js:1433
 msgid "Clearing URLs..."
 msgstr "Attīra vietrāžus..."
 
@@ -3360,26 +3247,44 @@ msgstr "Attīra vietrāžus..."
 msgid "Shared URLs cleared."
 msgstr "Kopīgotie vietrāži attīrīti."
 
+#: plugins/note/note.js:17
+msgid "Saving article note..."
+msgstr "Saglabā raksta piezīmes..."
+
 #: js/feedlist.js:429
-#: js/feedlist.js:496
 msgid "Mark all articles in %s as read?"
 msgstr "Vai atzīmēt visus rakstus %s kā lasītus?"
 
 #: js/feedlist.js:487
 #, fuzzy
-msgid "Mark all articles in %s older than 1 day as read?"
+msgid "Mark %w in %s older than 1 day as read?"
 msgstr "Vai atzīmēt visus rakstus %s kā lasītus?"
 
 #: js/feedlist.js:490
 #, fuzzy
-msgid "Mark all articles in %s older than 1 week as read?"
+msgid "Mark %w in %s older than 1 week as read?"
 msgstr "Vai atzīmēt visus rakstus %s kā lasītus?"
 
 #: js/feedlist.js:493
 #, fuzzy
-msgid "Mark all articles in %s older than 2 weeks as read?"
+msgid "Mark %w in %s older than 2 weeks as read?"
+msgstr "Vai atzīmēt visus rakstus %s kā lasītus?"
+
+#: js/feedlist.js:496
+#, fuzzy
+msgid "Mark %w in %s as read?"
 msgstr "Vai atzīmēt visus rakstus %s kā lasītus?"
 
+#: js/feedlist.js:499
+#, fuzzy
+msgid "search results"
+msgstr "Meklēšanas rezultāti: %s"
+
+#: js/feedlist.js:499
+#, fuzzy
+msgid "all articles"
+msgstr "Visi raksti"
+
 #: js/functions.js:506
 msgid "Error explained"
 msgstr ""
@@ -3464,187 +3369,256 @@ msgstr "Jūs jau esat pasūtījis šo barotni."
 msgid "Edit rule"
 msgstr "Mainīt likumu"
 
-#: js/functions.js:1402
+#: js/functions.js:1381
 msgid "Edit Feed"
 msgstr "Mainīt barotni"
 
-#: js/functions.js:1435
+#: js/functions.js:1414
 msgid "More Feeds"
 msgstr "Vairāk barotnes"
 
-#: js/functions.js:1631
+#: js/functions.js:1610
 msgid "Help"
 msgstr "Palīdzība"
 
-#: js/prefs.js:1032
+#: js/prefs.js:1028
 msgid "Remove category %s? Any nested feeds would be placed into Uncategorized."
 msgstr "Dzēst kategoriju %s? Visas iekļautās barotnes tiks pārvietotas uz Nekategorizēts kategoriju."
 
-#: js/prefs.js:1038
+#: js/prefs.js:1034
 #, fuzzy
 msgid "Removing category..."
 msgstr "Dzēst kategoriju..."
 
-#: js/prefs.js:1056
+#: js/prefs.js:1052
 msgid "Remove selected categories?"
 msgstr "Dzēst izvēlētās kategorijas?"
 
-#: js/prefs.js:1059
+#: js/prefs.js:1055
 #, fuzzy
 msgid "Removing selected categories..."
 msgstr "Dzēš izvēlētās kategorijas..."
 
-#: js/prefs.js:1072
+#: js/prefs.js:1068
 msgid "No categories are selected."
 msgstr "Nav izvēlēta kategorija."
 
-#: js/prefs.js:1079
+#: js/prefs.js:1075
 msgid "Category title:"
 msgstr "Kategorijas virsraksts:"
 
-#: js/prefs.js:1083
+#: js/prefs.js:1079
 #, fuzzy
 msgid "Creating category..."
 msgstr "Izveidot filtru..."
 
-#: js/prefs.js:1106
+#: js/prefs.js:1102
 msgid "Feeds without recent updates"
 msgstr "Barotnes bez neseniem jaunumiem"
 
-#: js/prefs.js:1150
+#: js/prefs.js:1146
 msgid "Replace current OPML publishing address with a new one?"
 msgstr "Aizvietot esošo OPML publicēto adresi ar jauno vērtību?"
 
-#: js/prefs.js:1227
+#: js/prefs.js:1223
 #, fuzzy
 msgid "Clearing feed..."
 msgstr "Dzēš barotņu datus..."
 
-#: js/prefs.js:1247
+#: js/prefs.js:1243
 msgid "Rescore articles in selected feeds?"
 msgstr "Atjaunot rakstus izvēlētajās barotnēs?"
 
-#: js/prefs.js:1250
+#: js/prefs.js:1246
 #, fuzzy
 msgid "Rescoring selected feeds..."
 msgstr "Atjauno rakstus izvēlētajās barotnēs..."
 
-#: js/prefs.js:1270
+#: js/prefs.js:1266
 msgid "Rescore all articles? This operation may take a lot of time."
 msgstr "Pārvērtēt visus rakstus? Tas var prasīt ilgu laiku."
 
-#: js/prefs.js:1273
+#: js/prefs.js:1269
 #, fuzzy
 msgid "Rescoring feeds..."
 msgstr "Pārvērtē barotni..."
 
-#: js/prefs.js:1289
+#: js/prefs.js:1285
 msgid "Reset selected labels to default colors?"
 msgstr "Atstatīt iezīmētās etiķetes uz noklusētajām krāsām?"
 
-#: js/prefs.js:1321
+#: js/prefs.js:1317
 msgid "Settings Profiles"
 msgstr "Profilu iestatījumi"
 
-#: js/prefs.js:1330
+#: js/prefs.js:1326
 msgid "Remove selected profiles? Active and default profiles will not be removed."
 msgstr "Dzēst izvēlētos profilus? Aktīvie un noklusētie profili netiks dzēsti."
 
-#: js/prefs.js:1333
+#: js/prefs.js:1329
 #, fuzzy
 msgid "Removing selected profiles..."
 msgstr "Dzēš iezīmētos profilus..."
 
-#: js/prefs.js:1349
+#: js/prefs.js:1345
 msgid "No profiles are selected."
 msgstr "Nav izvēlēts profils."
 
-#: js/prefs.js:1357
-#: js/prefs.js:1410
+#: js/prefs.js:1353
+#: js/prefs.js:1406
 msgid "Activate selected profile?"
 msgstr "Aktivizēt izvēlēto profilu?"
 
-#: js/prefs.js:1374
-#: js/prefs.js:1426
+#: js/prefs.js:1370
+#: js/prefs.js:1422
 msgid "Please choose a profile to activate."
 msgstr "Lūdzu norādiet aktivizējamo profilu."
 
-#: js/prefs.js:1379
+#: js/prefs.js:1375
 #, fuzzy
 msgid "Creating profile..."
 msgstr "Izveido profilu..."
 
-#: js/prefs.js:1434
+#: js/prefs.js:1430
 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr "Tas padarīs nederīgus visu iepriekš izveidoto barotņu URLus. Turpināt?"
 
-#: js/prefs.js:1444
+#: js/prefs.js:1440
 #, fuzzy
 msgid "Generated URLs cleared."
 msgstr "Izveidot jaunu URL"
 
-#: js/prefs.js:1516
+#: js/prefs.js:1512
 msgid "Label Editor"
 msgstr "Etiķešu redaktors"
 
-#: js/tt-rss.js:684
+#: js/tt-rss.js:685
 msgid "You can't unsubscribe from the category."
 msgstr "Jūs nevarat atteikties no kategorijas."
 
-#: js/viewfeed.js:125
-#: js/viewfeed.js:175
-#: js/viewfeed.js:192
+#: js/viewfeed.js:127
+#: js/viewfeed.js:177
+#: js/viewfeed.js:194
 msgid "Click to open next unread feed."
 msgstr "Klikšķiniet, lai atvērtu nākamo nelasīto barotni."
 
-#: js/viewfeed.js:129
+#: js/viewfeed.js:131
 msgid "Cancel search"
 msgstr "Atcelt meklēšanu"
 
-#: js/viewfeed.js:189
+#: js/viewfeed.js:191
 #, fuzzy
 msgid "New articles found, reload feed to continue."
 msgstr "Netika atrasti raksti, ko rādīt."
 
-#: js/viewfeed.js:424
+#: js/viewfeed.js:426
 msgid "Unstar article"
 msgstr "Atzvaigžņot rakstu"
 
-#: js/viewfeed.js:428
+#: js/viewfeed.js:430
 msgid "Star article"
 msgstr "Zvaigžņot rakstu"
 
-#: js/viewfeed.js:478
+#: js/viewfeed.js:480
 msgid "Unpublish article"
 msgstr "Atpublicēt rakstu"
 
-#: js/viewfeed.js:482
+#: js/viewfeed.js:484
 msgid "Publish article"
 msgstr "Publicēt rakstu"
 
-#: js/viewfeed.js:622
+#: js/viewfeed.js:624
 msgid "%d article selected"
 msgid_plural "%d articles selected"
 msgstr[0] "izvēlēts %d raksts"
 msgstr[1] "izvēlēti %d raksti"
 
-#: js/viewfeed.js:1286
+#: js/viewfeed.js:1288
 msgid "No article is selected."
 msgstr "Nav izvēlēts raksts."
 
-#: js/viewfeed.js:1321
+#: js/viewfeed.js:1323
 msgid "No articles found to mark"
 msgstr "Nav atrasti iezīmējamie raksti"
 
-#: js/viewfeed.js:1323
+#: js/viewfeed.js:1325
 #, fuzzy
 msgid "Mark %d article as read?"
 msgid_plural "Mark %d articles as read?"
 msgstr[0] "Iezīmēt %d rakstu kā lasītu?"
 msgstr[1] "Iezīmēt %d rakstus kā lasītus?"
 
-#~ msgid "Cache images locally"
-#~ msgstr "Kešot attēlus lokāli"
+#~ msgid "Resubscribe to push updates"
+#~ msgstr "Pārpasūtīt atjaunojumu grūšanu"
+
+#~ msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
+#~ msgstr "Atstata PubSubHubbub pasūtījumu statusu barotnēm ar ieslēgtu atjaunojumu grūšanu."
+
+#~ msgid "Download more plugins at tt-rss.org <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forums</a> or <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a>."
+#~ msgstr "Lejuplādējiet citus spraudņus no tt-rss.org <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forumiem</a> vai <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">viki</a>."
+
+#~ msgid "Linked"
+#~ msgstr "Saistīts"
+
+#~ msgid "Instance"
+#~ msgstr "Instance"
+
+#~ msgid "Instance URL"
+#~ msgstr "Instances URL"
+
+#~ msgid "Access key:"
+#~ msgstr "Pieejas atslēga:"
+
+#~ msgid "Access key"
+#~ msgstr "Pieejas aslēga"
+
+#~ msgid "Use one access key for both linked instances."
+#~ msgstr "Izmantot to pašu pieejas aslēgu abām saistītajām instancēm."
+
+#~ msgid "Generate new key"
+#~ msgstr "Ģenerēt jaunu atslēgu"
+
+#~ msgid "Link instance"
+#~ msgstr "Saites instance"
+
+#~ msgid "You can connect other instances of Tiny Tiny RSS to this one to share Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
+#~ msgstr "Jūs varat pievienot kopīgot populārās barotnes un pieslēgt tai citas Tiny Tiny RSS instances. Pievienoties šai Tiny Tiny RSS instancei var, izmantojot šo saiti:"
+
+#~ msgid "Last connected"
+#~ msgstr "Pēdējo reizi pieteicies"
+
+#~ msgid "Status"
+#~ msgstr "Statuss"
+
+#~ msgid "Stored feeds"
+#~ msgstr "Saglabātās barotnes"
+
+#~ msgid "Create link"
+#~ msgstr "Izveidot saiti"
+
+#~ msgid "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification hub again on next feed update."
+#~ msgstr "Atstatīt pasūtīšanu? Tiny Tiny RSS mēģinās savākt informāciju no šīs barotnes kārtējā atjaunojuma laikā."
+
+#~ msgid "Subscription reset."
+#~ msgstr "Barotnes pārstatīšana."
+
+#~ msgid "Link Instance"
+#~ msgstr "Saistīt instanci"
+
+#~ msgid "Edit Instance"
+#~ msgstr "Mainīt instanci"
+
+#~ msgid "Remove selected instances?"
+#~ msgstr "Dzēst izvēlētās instances?"
+
+#~ msgid "Removing selected instances..."
+#~ msgstr "Dzēš izvēlētās instances..."
+
+#~ msgid "No instances are selected."
+#~ msgstr "Nav izvēlēta neviena instance."
+
+#~ msgid "Please select only one instance."
+#~ msgstr "Lūdzu, izvēlieties tikai vienu instanci."
 
 #~ msgid "The error will be reported to the configured log destination."
 #~ msgstr "Kļūda tiks reģistrēta iestatījumos norādītajā žurnālā."
diff --git a/locale/nb_NO/LC_MESSAGES/messages.mo b/locale/nb_NO/LC_MESSAGES/messages.mo
index 060d8ddf2..5a330ee6a 100644
--- a/locale/nb_NO/LC_MESSAGES/messages.mo
+++ b/locale/nb_NO/LC_MESSAGES/messages.mo
diff --git a/locale/nb_NO/LC_MESSAGES/messages.po b/locale/nb_NO/LC_MESSAGES/messages.po
index a462c38aa..9e8e48049 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: 2017-03-23 15:25+0300\n"
+"POT-Creation-Date: 2017-07-04 16:29+0300\n"
 "PO-Revision-Date: 2009-05-02 00:10+0100\n"
 "Last-Translator: Christian Lomsdalen <[email protected]>\n"
 "Language-Team: Norwegian Bokmål <[email protected]>\n"
@@ -176,31 +176,30 @@ msgstr "Brukeren ble  ikke funnet"
 #: prefs.php:118
 #: classes/backend.php:5
 #: classes/pref/labels.php:282
-#: classes/pref/feeds.php:1402
-#: classes/pref/filters.php:779
+#: classes/pref/filters.php:819
+#: classes/pref/feeds.php:1376
 #: js/feedlist.js:149
-#: js/functions.js:1131
-#: js/functions.js:1231
-#: js/functions.js:1478
+#: js/functions.js:1210
+#: js/functions.js:1457
 #: js/prefs.js:621
-#: js/prefs.js:818
-#: js/prefs.js:1648
-#: js/prefs.js:1663
-#: js/tt-rss.js:550
-#: js/viewfeed.js:1182
+#: js/prefs.js:813
+#: js/prefs.js:1644
+#: js/prefs.js:1659
+#: js/tt-rss.js:551
+#: js/viewfeed.js:1184
 #: plugins/import_export/import_export.js:17
 #: js/feedlist.js:467
-#: js/feedlist.js:512
+#: js/feedlist.js:515
 #: js/functions.js:372
 #: js/functions.js:630
-#: js/prefs.js:1360
-#: js/prefs.js:1413
-#: js/prefs.js:1452
-#: js/prefs.js:1465
-#: js/prefs.js:1476
-#: js/prefs.js:1491
-#: js/tt-rss.js:567
-#: js/viewfeed.js:762
+#: js/prefs.js:1356
+#: js/prefs.js:1409
+#: js/prefs.js:1448
+#: js/prefs.js:1461
+#: js/prefs.js:1472
+#: js/prefs.js:1487
+#: js/tt-rss.js:568
+#: js/viewfeed.js:764
 msgid "Loading, please wait..."
 msgstr "laster, vennligst vent"
 
@@ -218,13 +217,13 @@ msgid "All Articles"
 msgstr "Alle artikler"
 
 #: index.php:192
-#: include/functions2.php:107
+#: include/functions.php:1181
 #: classes/feeds.php:110
 msgid "Starred"
 msgstr "Favoritter"
 
 #: index.php:193
-#: include/functions2.php:108
+#: include/functions.php:1182
 #: classes/feeds.php:111
 msgid "Published"
 msgstr "Publisert"
@@ -266,7 +265,7 @@ msgstr "Tittel"
 
 #: index.php:209
 #: index.php:249
-#: include/functions2.php:95
+#: include/functions.php:1169
 #: classes/feeds.php:115
 #: js/FeedTree.js:138
 #: js/FeedTree.js:166
@@ -307,7 +306,7 @@ msgid "Feed actions:"
 msgstr "Nyhetsstrømshandlinger:"
 
 #: index.php:244
-#: classes/handler/public.php:672
+#: classes/handler/public.php:583
 msgid "Subscribe to feed..."
 msgstr "Abonner på nyhetsstrøm..."
 
@@ -321,8 +320,8 @@ msgstr "Sett poeng på nytt for nyhetskanalene"
 
 #: index.php:247
 #: classes/pref/feeds.php:785
-#: classes/pref/feeds.php:1357
-#: js/PrefFeedTree.js:78
+#: classes/pref/feeds.php:1331
+#: js/PrefFeedTree.js:80
 msgid "Unsubscribe"
 msgstr "Avabonner"
 
@@ -339,7 +338,7 @@ msgid "Other actions:"
 msgstr "Andre handlinger:"
 
 #: index.php:252
-#: include/functions2.php:81
+#: include/functions.php:1155
 #, fuzzy
 msgid "Toggle widescreen mode"
 msgstr "Tillatt endringer i kategorirekkefølgen?"
@@ -367,7 +366,7 @@ msgstr ""
 
 #: prefs.php:33
 #: prefs.php:136
-#: include/functions2.php:110
+#: include/functions.php:1184
 #: classes/pref/prefs.php:435
 msgid "Preferences"
 msgstr "Innstillinger"
@@ -382,20 +381,19 @@ msgstr "Forlat innstillinger"
 
 #: prefs.php:139
 #: classes/pref/feeds.php:112
-#: classes/pref/feeds.php:1297
-#: classes/pref/feeds.php:1346
+#: classes/pref/feeds.php:1271
+#: classes/pref/feeds.php:1320
 msgid "Feeds"
 msgstr "Nyhetsstrømmer"
 
 #: prefs.php:142
-#: classes/pref/filters.php:248
+#: classes/pref/filters.php:273
 msgid "Filters"
 msgstr "Filtre"
 
 #: prefs.php:145
-#: include/functions.php:1327
-#: include/functions.php:1979
 #: classes/pref/labels.php:90
+#: classes/feeds.php:1718
 msgid "Labels"
 msgstr "Merkelapper"
 
@@ -424,13 +422,13 @@ msgstr "Registrering av nye brukere er administrativt avskrudd"
 #: register.php:337
 #: register.php:347
 #: register.php:359
-#: classes/handler/public.php:742
-#: classes/handler/public.php:813
-#: classes/handler/public.php:911
-#: classes/handler/public.php:990
-#: classes/handler/public.php:1004
-#: classes/handler/public.php:1011
-#: classes/handler/public.php:1036
+#: classes/handler/public.php:653
+#: classes/handler/public.php:724
+#: classes/handler/public.php:822
+#: classes/handler/public.php:901
+#: classes/handler/public.php:915
+#: classes/handler/public.php:922
+#: classes/handler/public.php:947
 msgid "Return to Tiny Tiny RSS"
 msgstr "Returner til Tiny Tiny RSS"
 
@@ -447,12 +445,12 @@ msgid "Check availability"
 msgstr "Sjekk tilgjengeligheten"
 
 #: register.php:229
-#: classes/handler/public.php:829
+#: classes/handler/public.php:740
 msgid "Email:"
 msgstr "E-post:"
 
 #: register.php:232
-#: classes/handler/public.php:834
+#: classes/handler/public.php:745
 msgid "How much is two plus two:"
 msgstr "Hvor mye er to pluss to:"
 
@@ -480,18 +478,24 @@ msgstr "Kontoen ble opprettet med suksess."
 msgid "New user registrations are currently closed."
 msgstr "Registrering av nye brukere er stengt."
 
-#: update.php:67
+#: update.php:66
 #, fuzzy
 msgid "Tiny Tiny RSS data update script."
 msgstr "Tiny Tiny RSS-databasen er oppdatert"
 
-#: include/digest.php:109
-#: include/functions.php:1336
-#: include/functions.php:1880
-#: include/functions.php:1965
-#: include/functions.php:1987
-#: classes/opml.php:421
+#: include/controls.php:83
+#: classes/pref/filters.php:242
+#: classes/pref/filters.php:253
+#: classes/pref/filters.php:544
+msgid "All feeds"
+msgstr "Alle Nyhetsstrømmer"
+
+#: include/controls.php:134
+#: include/controls.php:316
 #: classes/pref/feeds.php:228
+#: classes/opml.php:486
+#: classes/feeds.php:1727
+#: classes/digest.php:113
 msgid "Uncategorized"
 msgstr "Ukategorisert"
 
@@ -506,429 +510,319 @@ msgstr[1] "Favorittartikler"
 msgid "No feeds found."
 msgstr "Ingen nyhetsstrømmer ble funnet."
 
-#: include/functions.php:1029
+#: include/functions.php:900
 #, php-format
 msgid "%d min"
 msgstr ""
 
-#: include/functions.php:1325
-#: include/functions.php:1977
-msgid "Special"
-msgstr "Snarveier"
-
-#: include/functions.php:1828
-#: classes/pref/filters.php:229
-#: classes/pref/filters.php:507
-msgid "All feeds"
-msgstr "Alle Nyhetsstrømmer"
-
-#: include/functions.php:2032
-msgid "Starred articles"
-msgstr "Favorittartikler"
-
-#: include/functions.php:2034
-msgid "Published articles"
-msgstr "Publiserte artikler"
-
-#: include/functions.php:2036
-msgid "Fresh articles"
-msgstr "Ferske artikler"
-
-#: include/functions.php:2038
-#: include/functions2.php:105
-msgid "All articles"
-msgstr "Alle artikler"
-
-#: include/functions.php:2040
-#, fuzzy
-msgid "Archived articles"
-msgstr "Lagrede artikler"
-
-#: include/functions.php:2042
-msgid "Recently read"
-msgstr ""
-
-#: include/functions2.php:57
+#: include/functions.php:1131
 msgid "Navigation"
 msgstr "Navigasjon"
 
-#: include/functions2.php:58
+#: include/functions.php:1132
 #, fuzzy
 msgid "Open next feed"
 msgstr "Generert nyhetsstrøm"
 
-#: include/functions2.php:59
+#: include/functions.php:1133
 msgid "Open previous feed"
 msgstr ""
 
-#: include/functions2.php:60
+#: include/functions.php:1134
 #, fuzzy
 msgid "Open next article"
 msgstr "Vis opprinnelig artikkelinnhold"
 
-#: include/functions2.php:61
+#: include/functions.php:1135
 #, fuzzy
 msgid "Open previous article"
 msgstr "Vis opprinnelig artikkelinnhold"
 
-#: include/functions2.php:62
+#: include/functions.php:1136
 msgid "Open next article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions2.php:63
+#: include/functions.php:1137
 msgid "Open previous article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions2.php:64
+#: include/functions.php:1138
 msgid "Move to next article (don't expand or mark read)"
 msgstr ""
 
-#: include/functions2.php:65
+#: include/functions.php:1139
 msgid "Move to previous article (don't expand or mark read)"
 msgstr ""
 
-#: include/functions2.php:66
+#: include/functions.php:1140
 msgid "Show search dialog"
 msgstr "Vis søkevinduet"
 
-#: include/functions2.php:67
+#: include/functions.php:1141
 #, fuzzy
 msgid "Article"
 msgstr "Alle artikler"
 
-#: include/functions2.php:68
-#: js/viewfeed.js:1699
+#: include/functions.php:1142
+#: js/viewfeed.js:1701
 msgid "Toggle starred"
 msgstr "Sett som favoritt"
 
-#: include/functions2.php:69
-#: js/viewfeed.js:1711
+#: include/functions.php:1143
+#: js/viewfeed.js:1713
 msgid "Toggle published"
 msgstr "Sett som publisert"
 
-#: include/functions2.php:70
-#: js/viewfeed.js:1686
+#: include/functions.php:1144
+#: js/viewfeed.js:1688
 msgid "Toggle unread"
 msgstr "Sett som ulest"
 
-#: include/functions2.php:71
+#: include/functions.php:1145
 msgid "Edit tags"
 msgstr "Endre stikkord"
 
-#: include/functions2.php:72
+#: include/functions.php:1146
 #, fuzzy
 msgid "Open in new window"
 msgstr "Åpne artikkel i nytt nettleservindu"
 
-#: include/functions2.php:73
-#: js/viewfeed.js:1732
+#: include/functions.php:1147
+#: js/viewfeed.js:1734
 #, fuzzy
 msgid "Mark below as read"
 msgstr "Marker som lest"
 
-#: include/functions2.php:74
-#: js/viewfeed.js:1725
+#: include/functions.php:1148
+#: js/viewfeed.js:1727
 #, fuzzy
 msgid "Mark above as read"
 msgstr "Marker som lest"
 
-#: include/functions2.php:75
+#: include/functions.php:1149
 #, fuzzy
 msgid "Scroll down"
 msgstr "Alt ferdig."
 
-#: include/functions2.php:76
+#: include/functions.php:1150
 msgid "Scroll up"
 msgstr ""
 
-#: include/functions2.php:77
+#: include/functions.php:1151
 #, fuzzy
 msgid "Select article under cursor"
 msgstr "Velg artikkelen under musepekeren"
 
-#: include/functions2.php:78
+#: include/functions.php:1152
 #, fuzzy
 msgid "Email article"
 msgstr "Alle artikler"
 
-#: include/functions2.php:79
+#: include/functions.php:1153
 #, fuzzy
 msgid "Close/collapse article"
 msgstr "Fjern artikler"
 
-#: include/functions2.php:80
+#: include/functions.php:1154
 #, fuzzy
 msgid "Toggle article expansion (combined mode)"
 msgstr "Tillatt endringer i kategorirekkefølgen?"
 
-#: include/functions2.php:82
+#: include/functions.php:1156
 #: plugins/embed_original/init.php:31
 #, fuzzy
 msgid "Toggle embed original"
 msgstr "Tillatt endringer i kategorirekkefølgen?"
 
-#: include/functions2.php:83
+#: include/functions.php:1157
 #, fuzzy
 msgid "Article selection"
 msgstr "Handlinger for aktive artikler"
 
-#: include/functions2.php:84
+#: include/functions.php:1158
 #, fuzzy
 msgid "Select all articles"
 msgstr "Fjern artikler"
 
-#: include/functions2.php:85
+#: include/functions.php:1159
 #, fuzzy
 msgid "Select unread"
 msgstr "Slett uleste artikler"
 
-#: include/functions2.php:86
+#: include/functions.php:1160
 #, fuzzy
 msgid "Select starred"
 msgstr "Sett som favorittartikkel"
 
-#: include/functions2.php:87
+#: include/functions.php:1161
 #, fuzzy
 msgid "Select published"
 msgstr "Slett uleste artikler"
 
-#: include/functions2.php:88
+#: include/functions.php:1162
 #, fuzzy
 msgid "Invert selection"
 msgstr "Handlinger for aktive artikler"
 
-#: include/functions2.php:89
+#: include/functions.php:1163
 #, fuzzy
 msgid "Deselect everything"
 msgstr "Fjern artikler"
 
-#: include/functions2.php:90
+#: include/functions.php:1164
 #: classes/pref/feeds.php:555
-#: classes/pref/feeds.php:823
+#: classes/pref/feeds.php:811
 msgid "Feed"
 msgstr "Nyhetsstrøm"
 
-#: include/functions2.php:91
+#: include/functions.php:1165
 #, fuzzy
 msgid "Refresh current feed"
 msgstr "Oppdater aktive nyhetsstrømmer"
 
-#: include/functions2.php:92
+#: include/functions.php:1166
 #, fuzzy
 msgid "Un/hide read feeds"
 msgstr "Skjul/vis leste nyhetsstrømmer"
 
-#: include/functions2.php:93
-#: classes/pref/feeds.php:1349
+#: include/functions.php:1167
+#: classes/pref/feeds.php:1323
 msgid "Subscribe to feed"
 msgstr "Abonner på nyhetsstrøm"
 
-#: include/functions2.php:94
+#: include/functions.php:1168
 #: js/FeedTree.js:145
-#: js/PrefFeedTree.js:72
-#: js/viewfeed.js:1853
+#: js/PrefFeedTree.js:74
+#: js/viewfeed.js:1855
 msgid "Edit feed"
 msgstr "Rediger nyhetsstrømmen"
 
-#: include/functions2.php:96
+#: include/functions.php:1170
 #, fuzzy
 msgid "Reverse headlines"
 msgstr "Motsatt titteloversikt (eldste først)"
 
-#: include/functions2.php:97
+#: include/functions.php:1171
 msgid "Toggle headline grouping"
 msgstr ""
 
-#: include/functions2.php:98
+#: include/functions.php:1172
 #, fuzzy
 msgid "Debug feed update"
 msgstr "Alle nyhetsstrømmer er oppdatert"
 
-#: include/functions2.php:99
+#: include/functions.php:1173
 #, fuzzy
 msgid "Debug viewfeed()"
 msgstr "Alle nyhetsstrømmer er oppdatert"
 
-#: include/functions2.php:100
+#: include/functions.php:1174
 #: js/FeedTree.js:194
 msgid "Mark all feeds as read"
 msgstr "Marker alle nyhetsstrømmer som lest"
 
-#: include/functions2.php:101
+#: include/functions.php:1175
 #, fuzzy
 msgid "Un/collapse current category"
 msgstr "Velg for å slå sammen kategorien"
 
-#: include/functions2.php:102
+#: include/functions.php:1176
 #, fuzzy
 msgid "Toggle combined mode"
 msgstr "Tillatt endringer i kategorirekkefølgen?"
 
-#: include/functions2.php:103
+#: include/functions.php:1177
 #, fuzzy
 msgid "Toggle auto expand in combined mode"
 msgstr "Tillatt endringer i kategorirekkefølgen?"
 
-#: include/functions2.php:104
+#: include/functions.php:1178
 #, fuzzy
 msgid "Go to"
 msgstr "Gå til..."
 
-#: include/functions2.php:106
+#: include/functions.php:1179
+#: classes/feeds.php:1602
+msgid "All articles"
+msgstr "Alle artikler"
+
+#: include/functions.php:1180
 #, fuzzy
 msgid "Fresh"
 msgstr "Oppdater"
 
-#: include/functions2.php:109
-#: js/tt-rss.js:494
-#: js/tt-rss.js:663
+#: include/functions.php:1183
+#: js/tt-rss.js:495
+#: js/tt-rss.js:664
 msgid "Tag cloud"
 msgstr "Tag-sky"
 
-#: include/functions2.php:111
+#: include/functions.php:1185
 #, fuzzy
 msgid "Other"
 msgstr "Andre:"
 
-#: include/functions2.php:112
+#: include/functions.php:1186
 #: classes/pref/labels.php:267
 msgid "Create label"
 msgstr "Lag merkelapp"
 
-#: include/functions2.php:113
-#: classes/pref/filters.php:753
+#: include/functions.php:1187
+#: classes/pref/filters.php:793
 msgid "Create filter"
 msgstr "Lag filter"
 
-#: include/functions2.php:114
+#: include/functions.php:1188
 #, fuzzy
 msgid "Un/collapse sidebar"
 msgstr "Skjul nyhetskanalsslisten"
 
-#: include/functions2.php:115
+#: include/functions.php:1189
 #, fuzzy
 msgid "Show help dialog"
 msgstr "Vis søkevinduet"
 
-#: include/functions2.php:670
-#, fuzzy, php-format
-msgid "Search results: %s"
-msgstr "Søkeresultat"
-
-#: include/functions2.php:1336
-#: classes/feeds.php:752
-#, fuzzy
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] "Kommentarer"
-msgstr[1] "Kommentarer"
-
-#: include/functions2.php:1340
-#: classes/feeds.php:756
-msgid "comments"
-msgstr "Kommentarer"
-
-#: include/functions2.php:1366
-msgid " - "
-msgstr "-"
-
-#: include/functions2.php:1397
-#: include/functions2.php:1648
-#: classes/article.php:311
-msgid "no tags"
-msgstr "Ingen stikkord"
-
-#: include/functions2.php:1407
-#: classes/feeds.php:738
-msgid "Edit tags for this article"
-msgstr "Rediger stikkordene for denne artikkelen"
-
-#: include/functions2.php:1439
-#: classes/feeds.php:690
-#, fuzzy
-msgid "Originally from:"
-msgstr "Vis opprinnelig artikkelinnhold"
-
-#: include/functions2.php:1452
-#: classes/pref/feeds.php:574
-#: classes/feeds.php:703
-#, fuzzy
-msgid "Feed URL"
-msgstr "Nyhetsstrøm"
-
-#: include/functions2.php:1489
-#: classes/backend.php:105
-#: classes/dlg.php:37
-#: classes/dlg.php:60
-#: classes/dlg.php:93
-#: classes/dlg.php:159
-#: classes/dlg.php:186
-#: classes/pref/feeds.php:1652
-#: classes/pref/feeds.php:1718
-#: classes/pref/filters.php:204
-#: classes/pref/prefs.php:1097
-#: plugins/af_psql_trgm/init.php:102
-#: plugins/import_export/init.php:415
-#: plugins/import_export/init.php:461
-#: plugins/share/init.php:121
-msgid "Close this window"
-msgstr "Lukk dette vinduet"
-
-#: include/functions2.php:1686
-#, fuzzy
-msgid "(edit note)"
-msgstr "Rediger notat"
-
-#: include/functions2.php:1960
-msgid "unknown type"
-msgstr "Ukjent type"
-
-#: include/functions2.php:2037
-#, fuzzy
-msgid "Attachments"
-msgstr "Vedlegg:"
-
-#: include/functions2.php:2496
+#: include/functions.php:2456
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: include/functions2.php:2497
+#: include/functions.php:2457
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: include/functions2.php:2498
+#: include/functions.php:2458
 msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
 msgstr ""
 
-#: include/functions2.php:2499
+#: include/functions.php:2459
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: include/functions2.php:2500
+#: include/functions.php:2460
 #, fuzzy
 msgid "No file was uploaded"
 msgstr "Ingen OPML-fil til å lastes opp."
 
-#: include/functions2.php:2501
+#: include/functions.php:2461
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: include/functions2.php:2502
+#: include/functions.php:2462
 msgid "Failed to write file to disk."
 msgstr ""
 
-#: include/functions2.php:2503
+#: include/functions.php:2463
 msgid "A PHP extension stopped the file upload."
 msgstr ""
 
 #: include/login_form.php:197
-#: classes/handler/public.php:569
-#: classes/handler/public.php:824
+#: classes/handler/public.php:480
+#: classes/handler/public.php:735
 msgid "Login:"
 msgstr "Brukernavn:"
 
 #: include/login_form.php:207
-#: classes/handler/public.php:572
+#: classes/handler/public.php:483
 msgid "Password:"
 msgstr "Passord:"
 
@@ -943,7 +837,7 @@ msgid "Profile:"
 msgstr "Fil:"
 
 #: include/login_form.php:223
-#: classes/handler/public.php:311
+#: classes/handler/public.php:287
 #: classes/pref/prefs.php:1035
 #: classes/rpc.php:63
 #, fuzzy
@@ -963,7 +857,7 @@ msgid "Remember me"
 msgstr ""
 
 #: include/login_form.php:249
-#: classes/handler/public.php:577
+#: classes/handler/public.php:488
 msgid "Log in"
 msgstr "Logg inn"
 
@@ -982,150 +876,44 @@ msgstr "Sesjonen kunne ikke valideres (feil IP)"
 msgid "Session failed to validate (password changed)"
 msgstr "Sesjonen kunne ikke valideres (feil IP)"
 
-#: classes/article.php:25
-#, fuzzy
-msgid "Article not found."
-msgstr "Nyhetsstrømmen ble ikke funnet"
-
-#: classes/article.php:197
-msgid "Tags for this article (separated by commas):"
-msgstr "Denne artikkelens stikkord (separert med kommaer):"
-
-#: classes/article.php:222
-#: classes/pref/labels.php:79
-#: classes/pref/users.php:98
-#: classes/pref/feeds.php:801
-#: classes/pref/feeds.php:943
-#: classes/pref/filters.php:485
-#: classes/pref/prefs.php:981
-#: plugins/instances/init.php:245
-#: plugins/nsfw/init.php:85
-#: plugins/note/init.php:51
-#: plugins/af_readability/init.php:68
-#: plugins/af_redditimgur/init.php:60
-#: plugins/af_psql_trgm/init.php:181
-#: plugins/mail/init.php:64
-#: plugins/af_zz_imgproxy/init.php:213
-msgid "Save"
-msgstr "Lagre"
-
-#: classes/article.php:224
-#: classes/handler/public.php:546
-#: classes/handler/public.php:580
-#: classes/pref/labels.php:81
-#: classes/pref/users.php:100
-#: classes/pref/feeds.php:802
-#: classes/pref/feeds.php:946
-#: classes/pref/feeds.php:1859
-#: classes/pref/filters.php:488
-#: classes/pref/filters.php:902
-#: classes/pref/filters.php:983
-#: classes/pref/filters.php:1076
-#: classes/pref/prefs.php:983
-#: classes/feeds.php:1105
-#: classes/feeds.php:1155
-#: classes/feeds.php:1192
-#: plugins/instances/init.php:248
-#: plugins/instances/init.php:436
-#: plugins/note/init.php:53
-#: plugins/mail/init.php:173
-msgid "Cancel"
-msgstr "Avbryt"
-
-#: classes/opml.php:28
-#: classes/opml.php:33
-msgid "OPML Utility"
-msgstr "OPML-verktøy"
-
-#: classes/opml.php:37
-#, fuzzy
-msgid "Importing OPML..."
-msgstr "Importerer OPML (bruker DOMXML-utvidelsen)..."
-
-#: classes/opml.php:41
-msgid "Return to preferences"
-msgstr "Returner til innstillinger"
-
-#: classes/opml.php:271
-#, fuzzy, php-format
-msgid "Adding feed: %s"
-msgstr "Legger til nyhetsstrøm..."
-
-#: classes/opml.php:282
-#, fuzzy, php-format
-msgid "Duplicate feed: %s"
-msgstr "Lag filter"
-
-#: classes/opml.php:296
-#, fuzzy, php-format
-msgid "Adding label %s"
-msgstr "Tildel stikkord"
-
-#: classes/opml.php:299
-#, php-format
-msgid "Duplicate label: %s"
-msgstr ""
-
-#: classes/opml.php:311
-#, php-format
-msgid "Setting preference key %s to %s"
-msgstr ""
-
-#: classes/opml.php:343
-#, fuzzy
-msgid "Adding filter..."
-msgstr "Legger til nyhetsstrøm..."
-
-#: classes/opml.php:421
-#, fuzzy, php-format
-msgid "Processing category: %s"
-msgstr "Plasser i kategori..."
-
-#: classes/opml.php:470
-#, php-format
-msgid "Upload failed with error code %d"
-msgstr ""
-
-#: classes/opml.php:484
-#: plugins/import_export/init.php:442
-#, fuzzy
-msgid "Unable to move uploaded file."
-msgstr "Feil: Kan ikke laste opp OPMLfil"
-
-#: classes/opml.php:488
-#: plugins/import_export/init.php:446
-msgid "Error: please upload OPML file."
-msgstr "Feil: Kan ikke laste opp OPMLfil"
-
-#: classes/opml.php:499
-#, fuzzy
-msgid "Error: unable to find moved OPML file."
-msgstr "Feil: Kan ikke laste opp OPMLfil"
-
-#: classes/opml.php:506
-msgid "Error while parsing document."
-msgstr "Feil under behandling av dokumentet"
-
-#: classes/backend.php:33
+#: classes/backend.php:31
 msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
 msgstr ""
 
-#: classes/backend.php:38
+#: classes/backend.php:36
 msgid "Keyboard Shortcuts"
 msgstr "Tastatursnarveier"
 
-#: classes/backend.php:61
+#: classes/backend.php:59
 msgid "Shift"
 msgstr ""
 
-#: classes/backend.php:64
+#: classes/backend.php:62
 msgid "Ctrl"
 msgstr ""
 
-#: classes/backend.php:99
+#: classes/backend.php:97
 msgid "Help topic not found."
 msgstr "Hjelp-emne kunne ikke bli funnet"
 
+#: classes/backend.php:103
+#: classes/dlg.php:37
+#: classes/dlg.php:60
+#: classes/dlg.php:93
+#: classes/dlg.php:159
+#: classes/dlg.php:186
+#: classes/article.php:744
+#: classes/pref/filters.php:206
+#: classes/pref/prefs.php:1097
+#: classes/pref/feeds.php:1626
+#: classes/pref/feeds.php:1692
+#: plugins/import_export/init.php:421
+#: plugins/import_export/init.php:467
+#: plugins/af_psql_trgm/init.php:102
+#: plugins/share/init.php:120
+msgid "Close this window"
+msgstr "Lukk dette vinduet"
+
 #: classes/dlg.php:17
 msgid "If you have imported labels and/or filters, you might need to reload preferences to see your new data."
 msgstr ""
@@ -1137,7 +925,7 @@ msgstr "Lenke til nyhetsstrøm for publiserte artikler"
 
 #: classes/dlg.php:57
 #: classes/dlg.php:183
-#: plugins/share/init.php:118
+#: plugins/share/init.php:117
 #, fuzzy
 msgid "Generate new URL"
 msgstr "Generert nyhetsstrøm"
@@ -1159,137 +947,237 @@ msgstr "TT-RSS har oppdaget at oppdateringsmetoden bruker for lang tid å oppdat
 msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 
-#: classes/handler/public.php:510
+#: classes/article.php:25
+#, fuzzy
+msgid "Article not found."
+msgstr "Nyhetsstrømmen ble ikke funnet"
+
+#: classes/article.php:197
+msgid "Tags for this article (separated by commas):"
+msgstr "Denne artikkelens stikkord (separert med kommaer):"
+
+#: classes/article.php:222
+#: classes/pref/labels.php:79
+#: classes/pref/filters.php:519
+#: classes/pref/users.php:98
+#: classes/pref/prefs.php:981
+#: classes/pref/feeds.php:789
+#: classes/pref/feeds.php:931
+#: plugins/af_psql_trgm/init.php:181
+#: plugins/nsfw/init.php:85
+#: plugins/af_readability/init.php:68
+#: plugins/mail/init.php:64
+#: plugins/af_redditimgur/init.php:60
+#: plugins/note/init.php:51
+#: plugins/af_zz_imgproxy/init.php:240
+msgid "Save"
+msgstr "Lagre"
+
+#: classes/article.php:224
+#: classes/handler/public.php:457
+#: classes/handler/public.php:491
+#: classes/pref/labels.php:81
+#: classes/pref/filters.php:522
+#: classes/pref/filters.php:942
+#: classes/pref/filters.php:1022
+#: classes/pref/filters.php:1115
+#: classes/pref/users.php:100
+#: classes/pref/prefs.php:983
+#: classes/pref/feeds.php:790
+#: classes/pref/feeds.php:934
+#: classes/pref/feeds.php:1833
+#: classes/feeds.php:1098
+#: classes/feeds.php:1148
+#: classes/feeds.php:1185
+#: plugins/mail/init.php:173
+#: plugins/note/init.php:53
+msgid "Cancel"
+msgstr "Avbryt"
+
+#: classes/article.php:311
+#: classes/article.php:652
+#: classes/article.php:805
+msgid "no tags"
+msgstr "Ingen stikkord"
+
+#: classes/article.php:419
+msgid "unknown type"
+msgstr "Ukjent type"
+
+#: classes/article.php:496
+#, fuzzy
+msgid "Attachments"
+msgstr "Vedlegg:"
+
+#: classes/article.php:591
+#: classes/feeds.php:741
+#, fuzzy
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] "Kommentarer"
+msgstr[1] "Kommentarer"
+
+#: classes/article.php:595
+#: classes/feeds.php:745
+msgid "comments"
+msgstr "Kommentarer"
+
+#: classes/article.php:621
+msgid " - "
+msgstr "-"
+
+#: classes/article.php:662
+#: classes/feeds.php:727
+msgid "Edit tags for this article"
+msgstr "Rediger stikkordene for denne artikkelen"
+
+#: classes/article.php:694
+#: classes/feeds.php:681
+#, fuzzy
+msgid "Originally from:"
+msgstr "Vis opprinnelig artikkelinnhold"
+
+#: classes/article.php:707
+#: classes/pref/feeds.php:574
+#: classes/feeds.php:694
+#, fuzzy
+msgid "Feed URL"
+msgstr "Nyhetsstrøm"
+
+#: classes/article.php:843
+#, fuzzy
+msgid "(edit note)"
+msgstr "Rediger notat"
+
+#: classes/handler/public.php:421
 #: plugins/bookmarklets/init.php:40
 #, fuzzy
 msgid "Share with Tiny Tiny RSS"
 msgstr "Returner til Tiny Tiny RSS"
 
-#: classes/handler/public.php:518
+#: classes/handler/public.php:429
 msgid "Title:"
 msgstr "Tittel:"
 
-#: classes/handler/public.php:520
+#: classes/handler/public.php:431
 #: classes/pref/feeds.php:572
-#: plugins/instances/init.php:212
-#: plugins/instances/init.php:401
 msgid "URL:"
 msgstr "Nettadresse:"
 
-#: classes/handler/public.php:522
+#: classes/handler/public.php:433
 #, fuzzy
 msgid "Content:"
 msgstr "Innhold"
 
-#: classes/handler/public.php:524
+#: classes/handler/public.php:435
 #, fuzzy
 msgid "Labels:"
 msgstr "Merkelapper"
 
-#: classes/handler/public.php:543
+#: classes/handler/public.php:454
 msgid "Shared article will appear in the Published feed."
 msgstr ""
 
-#: classes/handler/public.php:545
+#: classes/handler/public.php:456
 msgid "Share"
 msgstr ""
 
-#: classes/handler/public.php:567
+#: classes/handler/public.php:478
 #, fuzzy
 msgid "Not logged in"
 msgstr "Sist innlogget"
 
-#: classes/handler/public.php:626
+#: classes/handler/public.php:537
 msgid "Incorrect username or password"
 msgstr "Feil brukernavn og/eller passord"
 
-#: classes/handler/public.php:678
+#: classes/handler/public.php:589
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "Abonnerer allerede på <b>%s</b>"
 
-#: classes/handler/public.php:681
+#: classes/handler/public.php:592
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "Abonnerer på <b>%s</b>"
 
-#: classes/handler/public.php:684
+#: classes/handler/public.php:595
 #, fuzzy, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "Abonnerer allerede på <b>%s</b>"
 
-#: classes/handler/public.php:687
+#: classes/handler/public.php:598
 #, fuzzy, php-format
 msgid "No feeds found in <b>%s</b>."
 msgstr "Ingen nyhetsstrømmer ble funnet."
 
-#: classes/handler/public.php:690
+#: classes/handler/public.php:601
 #, fuzzy
 msgid "Multiple feed URLs found."
 msgstr "Adresse for nyhetsstrømmen for offentliggjorte innlegg har endret seg."
 
-#: classes/handler/public.php:694
+#: classes/handler/public.php:605
 #, fuzzy, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr "Abonnerer allerede på <b>%s</b>"
 
-#: classes/handler/public.php:712
+#: classes/handler/public.php:623
 #, fuzzy
 msgid "Subscribe to selected feed"
 msgstr "Fjern abonnement på valgte nyhetsstrømmer"
 
-#: classes/handler/public.php:737
+#: classes/handler/public.php:648
 msgid "Edit subscription options"
 msgstr "Rediger abonnementsalternativer"
 
-#: classes/handler/public.php:774
+#: classes/handler/public.php:685
 #, fuzzy
 msgid "Password recovery"
 msgstr "Passord:"
 
-#: classes/handler/public.php:817
+#: classes/handler/public.php:728
 msgid "You will need to provide valid account name and email. A password reset link will be sent to your email address."
 msgstr ""
 
-#: classes/handler/public.php:839
-#: classes/pref/users.php:350
+#: classes/handler/public.php:750
+#: classes/pref/users.php:349
 msgid "Reset password"
 msgstr "Nullstill passordet"
 
-#: classes/handler/public.php:849
+#: classes/handler/public.php:760
 msgid "Some of the required form parameters are missing or incorrect."
 msgstr ""
 
-#: classes/handler/public.php:853
-#: classes/handler/public.php:919
+#: classes/handler/public.php:764
+#: classes/handler/public.php:830
 #, fuzzy
 msgid "Go back"
 msgstr "Gå tilbake"
 
-#: classes/handler/public.php:890
+#: classes/handler/public.php:801
 #, fuzzy
 msgid "[tt-rss] Password reset request"
 msgstr "[tt-rss] Varsel om endring av passord"
 
-#: classes/handler/public.php:915
+#: classes/handler/public.php:826
 msgid "Sorry, login and email combination not found."
 msgstr ""
 
-#: classes/handler/public.php:937
+#: classes/handler/public.php:848
 msgid "Your access level is insufficient to run this script."
 msgstr "Adgangsnivået ditt er for lavt for å kjøre dette scriptet"
 
-#: classes/handler/public.php:963
+#: classes/handler/public.php:874
 msgid "Database Updater"
 msgstr "Databaseoppdaterer"
 
-#: classes/handler/public.php:1028
+#: classes/handler/public.php:939
 msgid "Perform updates"
 msgstr "Utfør oppdateringene"
 
 #: classes/pref/labels.php:22
-#: classes/pref/filters.php:348
-#: classes/pref/filters.php:823
+#: classes/pref/filters.php:373
+#: classes/pref/filters.php:863
 msgid "Caption"
 msgstr "Overskrift"
 
@@ -1314,60 +1202,56 @@ msgid "Created label <b>%s</b>"
 msgstr "Laget merkelappen <b>%s</b>"
 
 #: classes/pref/labels.php:258
-#: classes/pref/users.php:334
-#: classes/pref/feeds.php:1337
-#: classes/pref/feeds.php:1600
-#: classes/pref/feeds.php:1664
-#: classes/pref/filters.php:359
-#: classes/pref/filters.php:407
-#: classes/pref/filters.php:744
-#: classes/pref/filters.php:832
-#: classes/pref/filters.php:859
+#: classes/pref/filters.php:384
+#: classes/pref/filters.php:441
+#: classes/pref/filters.php:784
+#: classes/pref/filters.php:872
+#: classes/pref/filters.php:899
+#: classes/pref/users.php:333
 #: classes/pref/prefs.php:992
-#: plugins/instances/init.php:284
+#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1574
+#: classes/pref/feeds.php:1638
 #, fuzzy
 msgid "Select"
 msgstr "Velg:"
 
 #: classes/pref/labels.php:261
-#: classes/pref/users.php:337
-#: classes/pref/feeds.php:1340
-#: classes/pref/feeds.php:1603
-#: classes/pref/feeds.php:1667
-#: classes/pref/filters.php:362
-#: classes/pref/filters.php:410
-#: classes/pref/filters.php:747
-#: classes/pref/filters.php:835
-#: classes/pref/filters.php:862
+#: classes/pref/filters.php:387
+#: classes/pref/filters.php:444
+#: classes/pref/filters.php:787
+#: classes/pref/filters.php:875
+#: classes/pref/filters.php:902
+#: classes/pref/users.php:336
 #: classes/pref/prefs.php:995
+#: classes/pref/feeds.php:1314
+#: classes/pref/feeds.php:1577
+#: classes/pref/feeds.php:1641
 #: classes/feeds.php:102
-#: plugins/instances/init.php:287
 msgid "All"
 msgstr "Alle"
 
 #: classes/pref/labels.php:263
-#: classes/pref/users.php:339
-#: classes/pref/feeds.php:1342
-#: classes/pref/feeds.php:1605
-#: classes/pref/feeds.php:1669
-#: classes/pref/filters.php:364
-#: classes/pref/filters.php:412
-#: classes/pref/filters.php:749
-#: classes/pref/filters.php:837
-#: classes/pref/filters.php:864
+#: classes/pref/filters.php:389
+#: classes/pref/filters.php:446
+#: classes/pref/filters.php:789
+#: classes/pref/filters.php:877
+#: classes/pref/filters.php:904
+#: classes/pref/users.php:338
 #: classes/pref/prefs.php:997
+#: classes/pref/feeds.php:1316
+#: classes/pref/feeds.php:1579
+#: classes/pref/feeds.php:1643
 #: classes/feeds.php:105
-#: plugins/instances/init.php:289
 msgid "None"
 msgstr "Ingen"
 
 #: classes/pref/labels.php:270
-#: classes/pref/users.php:348
+#: classes/pref/filters.php:512
+#: classes/pref/filters.php:806
+#: classes/pref/users.php:347
 #: classes/pref/feeds.php:767
-#: classes/pref/filters.php:478
-#: classes/pref/filters.php:766
-#: classes/feeds.php:1154
-#: plugins/instances/init.php:294
+#: classes/feeds.php:1147
 msgid "Remove"
 msgstr "Fjern"
 
@@ -1375,9 +1259,181 @@ msgstr "Fjern"
 msgid "Clear colors"
 msgstr "Fjern farger"
 
+#: classes/pref/filters.php:153
+#, fuzzy
+msgid "Preview article"
+msgstr "Filtrer artikkel"
+
+#: classes/pref/filters.php:264
+#: classes/pref/filters.php:558
+#, fuzzy
+msgid "(inverse)"
+msgstr "(Motsatt)"
+
+#: classes/pref/filters.php:260
+#: classes/pref/filters.php:557
+#, php-format
+msgid "%s on %s in %s %s"
+msgstr ""
+
+#: classes/pref/filters.php:379
+#: classes/pref/filters.php:867
+#: classes/pref/filters.php:981
+msgid "Match"
+msgstr "Match"
+
+#: classes/pref/filters.php:393
+#: classes/pref/filters.php:450
+#: classes/pref/filters.php:881
+#: classes/pref/filters.php:908
+msgid "Add"
+msgstr "Legg til"
+
+#: classes/pref/filters.php:396
+#: classes/pref/filters.php:453
+#: classes/pref/filters.php:884
+#: classes/pref/filters.php:911
+#: classes/feeds.php:122
+#, fuzzy
+msgid "Delete"
+msgstr "Standard"
+
+#: classes/pref/filters.php:436
+#: classes/pref/filters.php:894
+#, fuzzy
+msgid "Apply actions"
+msgstr "Nyhetsstrømshandlinger"
+
+#: classes/pref/filters.php:486
+#: classes/pref/filters.php:923
+msgid "Enabled"
+msgstr "Tillatt"
+
+#: classes/pref/filters.php:495
+#: classes/pref/filters.php:926
+#, fuzzy
+msgid "Match any rule"
+msgstr "Match på:"
+
+#: classes/pref/filters.php:504
+#: classes/pref/filters.php:929
+#, fuzzy
+msgid "Inverse matching"
+msgstr "Motsatt markering"
+
+#: classes/pref/filters.php:516
+#: classes/pref/filters.php:936
+msgid "Test"
+msgstr "Test"
+
+#: classes/pref/filters.php:780
+#: classes/pref/users.php:323
+#: classes/pref/feeds.php:1307
+#: classes/feeds.php:1118
+#: classes/feeds.php:1184
+#: js/tt-rss.js:165
+msgid "Search"
+msgstr "Søk"
+
+#: classes/pref/filters.php:796
+msgid "Combine"
+msgstr ""
+
+#: classes/pref/filters.php:799
+#: classes/pref/users.php:345
+msgid "Edit"
+msgstr "Rediger"
+
+#: classes/pref/filters.php:802
+#: classes/pref/feeds.php:1327
+#: classes/pref/feeds.php:1341
+#, fuzzy
+msgid "Reset sort order"
+msgstr "Nullstill passordet"
+
+#: classes/pref/filters.php:810
+#: classes/pref/feeds.php:1363
+msgid "Rescore articles"
+msgstr "Tilbakestill poengsummene for artiklene"
+
+#: classes/pref/filters.php:939
+msgid "Create"
+msgstr "Lag"
+
+#: classes/pref/filters.php:993
+msgid "Inverse regular expression matching"
+msgstr ""
+
+#: classes/pref/filters.php:995
+msgid "on field"
+msgstr "På felt:"
+
+#: classes/pref/filters.php:1001
+#: js/PrefFilterTree.js:64
+msgid "in"
+msgstr "i"
+
+#: classes/pref/filters.php:1014
+#, fuzzy
+msgid "Wiki: Filters"
+msgstr "Filtre"
+
+#: classes/pref/filters.php:1019
+#, fuzzy
+msgid "Save rule"
+msgstr "Lagre"
+
+#: classes/pref/filters.php:1019
+#: js/functions.js:865
+#, fuzzy
+msgid "Add rule"
+msgstr "Legger til kategori for nyhetsstrømmer"
+
+#: classes/pref/filters.php:1042
+msgid "Perform Action"
+msgstr "Utfør handlingen"
+
+#: classes/pref/filters.php:1093
+#, fuzzy
+msgid "No actions available"
+msgstr "Ny versjon av Tiny Tiny Rss er tilgjengelig!"
+
+#: classes/pref/filters.php:1112
+#, fuzzy
+msgid "Save action"
+msgstr "Panelhandlinger"
+
+#: classes/pref/filters.php:1112
+#: js/functions.js:887
+#, fuzzy
+msgid "Add action"
+msgstr "Nyhetsstrømshandlinger"
+
+#: classes/pref/filters.php:1136
+msgid "[No caption]"
+msgstr "Ingen bildetekst"
+
+#: classes/pref/filters.php:1138
+#, fuzzy, php-format
+msgid "%s (%d rule)"
+msgid_plural "%s (%d rules)"
+msgstr[0] "Legger til kategori for nyhetsstrømmer"
+msgstr[1] "Legger til kategori for nyhetsstrømmer"
+
+#: classes/pref/filters.php:1153
+#, fuzzy
+msgid "matches any rule"
+msgstr "Match på:"
+
+#: classes/pref/filters.php:1156
+#, fuzzy, php-format
+msgid "%s (+%d action)"
+msgid_plural "%s (+%d actions)"
+msgstr[0] "Nyhetsstrømshandlinger"
+msgstr[1] "Nyhetsstrømshandlinger"
+
 #: classes/pref/users.php:6
 #: classes/pref/system.php:8
-#: plugins/instances/init.php:154
 msgid "Your access level is insufficient to open this tab."
 msgstr "Adgangsnivået ditt er for lavt for å åpne denne siden."
 
@@ -1388,8 +1444,8 @@ msgstr "Filtre"
 
 #: classes/pref/users.php:56
 #: classes/pref/feeds.php:637
-#: classes/pref/feeds.php:878
-#: classes/feeds.php:1075
+#: classes/pref/feeds.php:866
+#: classes/feeds.php:1068
 msgid "Authentication"
 msgstr "Autentifisering"
 
@@ -1399,7 +1455,7 @@ msgstr "Tilgangsnivå:"
 
 #: classes/pref/users.php:77
 #: classes/pref/feeds.php:667
-#: classes/pref/feeds.php:896
+#: classes/pref/feeds.php:884
 msgid "Options"
 msgstr "Alternativer:"
 
@@ -1413,7 +1469,7 @@ msgid "User not found"
 msgstr "Brukeren ble  ikke funnet"
 
 #: classes/pref/users.php:132
-#: classes/pref/users.php:400
+#: classes/pref/users.php:399
 msgid "Registered"
 msgstr "Registrert"
 
@@ -1431,7 +1487,7 @@ msgid "Stored articles"
 msgstr "Favorittartikler"
 
 #: classes/pref/users.php:145
-#: classes/pref/users.php:399
+#: classes/pref/users.php:398
 msgid "Subscribed feeds"
 msgstr "Nyhetsstrømmer som abonneres på"
 
@@ -1450,549 +1506,61 @@ msgstr "Kunne ikke lage brukeren <b>%s</b>"
 msgid "User <b>%s</b> already exists."
 msgstr "Brukeren <b>%s</b> finnes allerede."
 
-#: classes/pref/users.php:265
+#: classes/pref/users.php:264
 #, fuzzy, php-format
 msgid "Changed password of user <b>%s</b> to <b>%s</b>"
 msgstr ""
 "Byttet passord forbruker <b>%s</b>\n"
 "\t\t\t\t\t til <b>%s</b>"
 
-#: classes/pref/users.php:267
+#: classes/pref/users.php:266
 #, fuzzy, php-format
 msgid "Sending new password of user <b>%s</b> to <b>%s</b>"
 msgstr ""
 "Byttet passord forbruker <b>%s</b>\n"
 "\t\t\t\t\t til <b>%s</b>"
 
-#: classes/pref/users.php:291
+#: classes/pref/users.php:290
 msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] Varsel om endring av passord"
 
-#: classes/pref/users.php:324
-#: classes/pref/feeds.php:1333
-#: classes/pref/filters.php:740
-#: classes/feeds.php:1125
-#: classes/feeds.php:1191
-#: js/tt-rss.js:165
-msgid "Search"
-msgstr "Søk"
-
-#: classes/pref/users.php:342
+#: classes/pref/users.php:341
 msgid "Create user"
 msgstr "Lag bruker"
 
-#: classes/pref/users.php:346
-#: classes/pref/filters.php:759
-#: plugins/instances/init.php:293
-msgid "Edit"
-msgstr "Rediger"
-
-#: classes/pref/users.php:397
+#: classes/pref/users.php:396
 #: classes/pref/feeds.php:643
-#: classes/pref/feeds.php:882
-#: classes/pref/feeds.php:1836
-#: classes/feeds.php:1079
+#: classes/pref/feeds.php:870
+#: classes/pref/feeds.php:1810
+#: classes/feeds.php:1072
 msgid "Login"
 msgstr "Logg inn"
 
-#: classes/pref/users.php:398
+#: classes/pref/users.php:397
 msgid "Access Level"
 msgstr "Tilgangsnivå"
 
-#: classes/pref/users.php:401
+#: classes/pref/users.php:400
 msgid "Last login"
 msgstr "Siste innlogging"
 
-#: classes/pref/users.php:420
-#: plugins/instances/init.php:334
+#: classes/pref/users.php:419
 msgid "Click to edit"
 msgstr "Trykk for å endre"
 
-#: classes/pref/users.php:441
+#: classes/pref/users.php:440
 msgid "No users defined."
 msgstr "Ingen brukere er valgt"
 
-#: classes/pref/users.php:443
+#: classes/pref/users.php:442
 msgid "No matching users found."
 msgstr "Ingen matchende brukere ble funnet"
 
-#: classes/pref/system.php:29
-msgid "Error Log"
-msgstr ""
-
-#: classes/pref/system.php:40
-#, fuzzy
-msgid "Refresh"
-msgstr "Oppdater"
-
-#: classes/pref/system.php:43
-#, fuzzy
-msgid "Clear log"
-msgstr "Fjern farger"
-
-#: classes/pref/system.php:48
-msgid "Error"
-msgstr ""
-
-#: classes/pref/system.php:49
-msgid "Filename"
-msgstr ""
-
-#: classes/pref/system.php:50
-msgid "Message"
-msgstr ""
-
-#: classes/pref/system.php:52
-msgid "Date"
-msgstr "Dato"
-
-#: classes/pref/feeds.php:15
-msgid "Check to enable field"
-msgstr "Marker for å tillate felt"
-
-#: classes/pref/feeds.php:65
-#: classes/pref/feeds.php:214
-#: classes/pref/feeds.php:258
-#: classes/pref/feeds.php:264
-#: classes/pref/feeds.php:290
-#, fuzzy, php-format
-msgid "(%d feed)"
-msgid_plural "(%d feeds)"
-msgstr[0] "Rediger nyhetsstrømmen"
-msgstr[1] "Rediger nyhetsstrømmen"
-
-#: classes/pref/feeds.php:537
 #: classes/pref/prefs.php:18
+#: classes/pref/feeds.php:537
 msgid "General"
 msgstr "Generelt"
 
-#: classes/pref/feeds.php:561
-#, fuzzy
-msgid "Feed Title"
-msgstr "Tittel"
-
-#: classes/pref/feeds.php:595
-#: classes/pref/feeds.php:830
-#: classes/pref/feeds.php:1822
-#: classes/feeds.php:1055
-msgid "Place in category:"
-msgstr "Plasser i kategori..."
-
-#: classes/pref/feeds.php:608
-#: classes/pref/feeds.php:844
-#, fuzzy
-msgid "Language:"
-msgstr "Språk:"
-
-#: classes/pref/feeds.php:615
-#: classes/pref/feeds.php:853
-msgid "Update"
-msgstr "Oppdater"
-
-#: classes/pref/feeds.php:630
-#: classes/pref/feeds.php:869
-msgid "Article purging:"
-msgstr "Slett artikler:"
-
-#: classes/pref/feeds.php:658
-#: classes/pref/feeds.php:890
-#: classes/pref/feeds.php:1839
-#: classes/pref/prefs.php:245
-#: classes/feeds.php:1083
-#, fuzzy
-msgid "Password"
-msgstr "Passord:"
-
-#: classes/pref/feeds.php:662
-msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
-msgstr ""
-
-#: classes/pref/feeds.php:681
-#: classes/pref/feeds.php:900
-#, fuzzy
-msgid "Hide from Popular feeds"
-msgstr "Skjul fra min nyhetsstrømslisten"
-
-#: classes/pref/feeds.php:693
-#: classes/pref/feeds.php:906
-msgid "Include in e-mail digest"
-msgstr "Inkluder i e-postsammendraget"
-
-#: classes/pref/feeds.php:706
-#: classes/pref/feeds.php:912
-msgid "Always display image attachments"
-msgstr ""
-
-#: classes/pref/feeds.php:719
-#: classes/pref/feeds.php:920
-msgid "Do not embed images"
-msgstr ""
-
-#: classes/pref/feeds.php:732
-#: classes/pref/feeds.php:928
-msgid "Cache media"
-msgstr ""
-
-#: classes/pref/feeds.php:744
-#: classes/pref/feeds.php:934
-#, fuzzy
-msgid "Mark updated articles as unread"
-msgstr "Marker alle artikler som leste?"
-
-#: classes/pref/feeds.php:748
-#, fuzzy
-msgid "Icon"
-msgstr "Handling"
-
-#: classes/pref/feeds.php:765
-msgid "Replace"
-msgstr ""
-
-#: classes/pref/feeds.php:772
-#: classes/pref/prefs.php:698
-msgid "Plugins"
-msgstr ""
-
-#: classes/pref/feeds.php:792
-#, fuzzy
-msgid "Resubscribe to push updates"
-msgstr "Abonnerer på følgende nyhetsstrømmer:"
-
-#: classes/pref/feeds.php:799
-msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
-msgstr ""
-
-#: classes/pref/feeds.php:1200
-#: classes/pref/feeds.php:1253
-msgid "All done."
-msgstr "Alt ferdig."
-
-#: classes/pref/feeds.php:1308
-#, fuzzy
-msgid "Feeds with errors"
-msgstr "Nyhetsstrømsredigerer"
-
-#: classes/pref/feeds.php:1315
-#, fuzzy
-msgid "Inactive feeds"
-msgstr "Hele nyhetsstrømmen"
-
-#: classes/pref/feeds.php:1351
-#, fuzzy
-msgid "Edit selected feeds"
-msgstr "Sletter den valgte nyhetsstrømmen..."
-
-#: classes/pref/feeds.php:1353
-#: classes/pref/feeds.php:1367
-#: classes/pref/filters.php:762
-#, fuzzy
-msgid "Reset sort order"
-msgstr "Nullstill passordet"
-
-#: classes/pref/feeds.php:1355
-#: js/prefs.js:1622
-#, fuzzy
-msgid "Batch subscribe"
-msgstr "Avabonner"
-
-#: classes/pref/feeds.php:1362
-#, fuzzy
-msgid "Categories"
-msgstr "Kategori:"
-
-#: classes/pref/feeds.php:1365
-#, fuzzy
-msgid "Add category"
-msgstr "Legger til kategori for nyhetsstrømmer"
-
-#: classes/pref/feeds.php:1369
-#, fuzzy
-msgid "Remove selected"
-msgstr "Fjerne valgte filtre?"
-
-#: classes/pref/feeds.php:1380
-#, fuzzy
-msgid "More actions..."
-msgstr "Handlinger..."
-
-#: classes/pref/feeds.php:1384
-msgid "Manual purge"
-msgstr "Slett manuelt"
-
-#: classes/pref/feeds.php:1388
-msgid "Clear feed data"
-msgstr "Slett nyhetsstrømsdata"
-
-#: classes/pref/feeds.php:1389
-#: classes/pref/filters.php:770
-msgid "Rescore articles"
-msgstr "Tilbakestill poengsummene for artiklene"
-
-#: classes/pref/feeds.php:1442
-msgid "OPML"
-msgstr "OPML"
-
-#: classes/pref/feeds.php:1444
-msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
-msgstr ""
-
-#: classes/pref/feeds.php:1445
-msgid "Only main settings profile can be migrated using OPML."
-msgstr ""
-
-#: classes/pref/feeds.php:1458
-#, fuzzy
-msgid "Import my OPML"
-msgstr "Importerer OPML (bruker DOMXML-utvidelsen)..."
-
-#: classes/pref/feeds.php:1464
-msgid "Filename:"
-msgstr ""
-
-#: classes/pref/feeds.php:1466
-#, fuzzy
-msgid "Include settings"
-msgstr "Inkluder i e-postsammendraget"
-
-#: classes/pref/feeds.php:1470
-#, fuzzy
-msgid "Export OPML"
-msgstr "Eksporter OPML"
-
-#: classes/pref/feeds.php:1474
-#, fuzzy
-msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
-msgstr "Publiserte artikler kan bli eksportert som en offentlig RSS-nyhetskanal og kan bli abonnert på av alle som vet adressen som blir spesifisert nedenfor."
-
-#: classes/pref/feeds.php:1478
-msgid "Public OPML URL"
-msgstr ""
-
-#: classes/pref/feeds.php:1479
-msgid "Display published OPML URL"
-msgstr ""
-
-#: classes/pref/feeds.php:1488
-#, fuzzy
-msgid "Firefox integration"
-msgstr "Firefox integrering"
-
-#: classes/pref/feeds.php:1490
-msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
-msgstr "Denne Tiny Tiny RSS siden kan bli brukt som nyhetsstrømsleser for Firefox ved å trykke på lenken nedenfor."
-
-#: classes/pref/feeds.php:1497
-msgid "Click here to register this site as a feed reader."
-msgstr "Trykk her for å registrere denne siden som nyhetsstrømsleser"
-
-#: classes/pref/feeds.php:1505
-#, fuzzy
-msgid "Published & shared articles / Generated feeds"
-msgstr "Sett poeng på nytt for artiklene i de valgte nyhetskanalene?"
-
-#: classes/pref/feeds.php:1507
-msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
-msgstr "Publiserte artikler kan bli eksportert som en offentlig RSS-nyhetskanal og kan bli abonnert på av alle som vet adressen som blir spesifisert nedenfor."
-
-#: classes/pref/feeds.php:1514
-#: classes/feeds.php:54
-#: classes/feeds.php:140
-#, fuzzy
-msgid "View as RSS"
-msgstr "Se stikkord"
-
-#: classes/pref/feeds.php:1515
-#, fuzzy
-msgid "Display URL"
-msgstr "Vis stikkord"
-
-#: classes/pref/feeds.php:1518
-msgid "Clear all generated URLs"
-msgstr ""
-
-#: classes/pref/feeds.php:1596
-#, fuzzy
-msgid "These feeds have not been updated with new content for 3 months (oldest first):"
-msgstr "Disse nyhetsstrømmene kunne ikke oppdateres på grunn av feil:"
-
-#: classes/pref/feeds.php:1630
-#: classes/pref/feeds.php:1694
-#, fuzzy
-msgid "Click to edit feed"
-msgstr "Trykk for å endre"
-
-#: classes/pref/feeds.php:1648
-#: classes/pref/feeds.php:1714
-#, fuzzy
-msgid "Unsubscribe from selected feeds"
-msgstr "Fjern abonnement på valgte nyhetsstrømmer"
-
-#: classes/pref/feeds.php:1819
-msgid "Add one valid RSS feed per line (no feed detection is done)"
-msgstr ""
-
-#: classes/pref/feeds.php:1828
-msgid "Feeds to subscribe, One per line"
-msgstr ""
-
-#: classes/pref/feeds.php:1851
-#, fuzzy
-msgid "Feeds require authentication."
-msgstr "Denne nyhetsstrømmen krever autentifisering"
-
-#: classes/pref/feeds.php:1858
-#: classes/feeds.php:1099
-#: classes/feeds.php:1153
-msgid "Subscribe"
-msgstr "Abonner"
-
-#: classes/pref/filters.php:151
-#, fuzzy
-msgid "Preview article"
-msgstr "Filtrer artikkel"
-
-#: classes/pref/filters.php:239
-#: classes/pref/filters.php:518
-#, fuzzy
-msgid "(inverse)"
-msgstr "(Motsatt)"
-
-#: classes/pref/filters.php:235
-#: classes/pref/filters.php:517
-#, php-format
-msgid "%s on %s in %s %s"
-msgstr ""
-
-#: classes/pref/filters.php:354
-#: classes/pref/filters.php:827
-#: classes/pref/filters.php:942
-msgid "Match"
-msgstr "Match"
-
-#: classes/pref/filters.php:368
-#: classes/pref/filters.php:416
-#: classes/pref/filters.php:841
-#: classes/pref/filters.php:868
-msgid "Add"
-msgstr "Legg til"
-
-#: classes/pref/filters.php:371
-#: classes/pref/filters.php:419
-#: classes/pref/filters.php:844
-#: classes/pref/filters.php:871
-#: classes/feeds.php:122
-#, fuzzy
-msgid "Delete"
-msgstr "Standard"
-
-#: classes/pref/filters.php:402
-#: classes/pref/filters.php:854
-#, fuzzy
-msgid "Apply actions"
-msgstr "Nyhetsstrømshandlinger"
-
-#: classes/pref/filters.php:452
-#: classes/pref/filters.php:883
-msgid "Enabled"
-msgstr "Tillatt"
-
-#: classes/pref/filters.php:461
-#: classes/pref/filters.php:886
-#, fuzzy
-msgid "Match any rule"
-msgstr "Match på:"
-
-#: classes/pref/filters.php:470
-#: classes/pref/filters.php:889
-#, fuzzy
-msgid "Inverse matching"
-msgstr "Motsatt markering"
-
-#: classes/pref/filters.php:482
-#: classes/pref/filters.php:896
-msgid "Test"
-msgstr "Test"
-
-#: classes/pref/filters.php:756
-msgid "Combine"
-msgstr ""
-
-#: classes/pref/filters.php:899
-msgid "Create"
-msgstr "Lag"
-
-#: classes/pref/filters.php:954
-msgid "Inverse regular expression matching"
-msgstr ""
-
-#: classes/pref/filters.php:956
-msgid "on field"
-msgstr "På felt:"
-
-#: classes/pref/filters.php:962
-#: js/PrefFilterTree.js:64
-msgid "in"
-msgstr "i"
-
-#: classes/pref/filters.php:975
-#, fuzzy
-msgid "Wiki: Filters"
-msgstr "Filtre"
-
-#: classes/pref/filters.php:980
-#, fuzzy
-msgid "Save rule"
-msgstr "Lagre"
-
-#: classes/pref/filters.php:980
-#: js/functions.js:865
-#, fuzzy
-msgid "Add rule"
-msgstr "Legger til kategori for nyhetsstrømmer"
-
-#: classes/pref/filters.php:1003
-msgid "Perform Action"
-msgstr "Utfør handlingen"
-
-#: classes/pref/filters.php:1054
-#, fuzzy
-msgid "No actions available"
-msgstr "Ny versjon av Tiny Tiny Rss er tilgjengelig!"
-
-#: classes/pref/filters.php:1073
-#, fuzzy
-msgid "Save action"
-msgstr "Panelhandlinger"
-
-#: classes/pref/filters.php:1073
-#: js/functions.js:887
-#, fuzzy
-msgid "Add action"
-msgstr "Nyhetsstrømshandlinger"
-
-#: classes/pref/filters.php:1097
-msgid "[No caption]"
-msgstr "Ingen bildetekst"
-
-#: classes/pref/filters.php:1099
-#, fuzzy, php-format
-msgid "%s (%d rule)"
-msgid_plural "%s (%d rules)"
-msgstr[0] "Legger til kategori for nyhetsstrømmer"
-msgstr[1] "Legger til kategori for nyhetsstrømmer"
-
-#: classes/pref/filters.php:1114
-#, fuzzy
-msgid "matches any rule"
-msgstr "Match på:"
-
-#: classes/pref/filters.php:1117
-#, fuzzy, php-format
-msgid "%s (+%d action)"
-msgid_plural "%s (+%d actions)"
-msgstr[0] "Nyhetsstrømshandlinger"
-msgstr[1] "Nyhetsstrømshandlinger"
-
 #: classes/pref/prefs.php:19
 msgid "Interface"
 msgstr "Grensesnitt"
@@ -2179,7 +1747,7 @@ msgid "Strip all but most common HTML tags when reading articles."
 msgstr "Fjern alle HTML-koder utenom de mest vanlige når artikler leses."
 
 #: classes/pref/prefs.php:53
-#: js/prefs.js:1584
+#: js/prefs.js:1580
 #, fuzzy
 msgid "Customize stylesheet"
 msgstr "URL til brukerbestemt utseendemal (CSS)"
@@ -2253,6 +1821,15 @@ msgstr "Tilgangsnivå"
 msgid "Save data"
 msgstr "Lagre"
 
+#: classes/pref/prefs.php:245
+#: classes/pref/feeds.php:658
+#: classes/pref/feeds.php:878
+#: classes/pref/feeds.php:1813
+#: classes/feeds.php:1076
+#, fuzzy
+msgid "Password"
+msgstr "Passord:"
+
 #: classes/pref/prefs.php:254
 #, fuzzy
 msgid "Your password is at default value, please change it."
@@ -2362,16 +1939,21 @@ msgstr "Lag filter"
 msgid "Reset to defaults"
 msgstr "Tilbake til standard"
 
+#: classes/pref/prefs.php:698
+#: classes/pref/feeds.php:772
+msgid "Plugins"
+msgstr ""
+
 #: classes/pref/prefs.php:700
 msgid "You will need to reload Tiny Tiny RSS for plugin changes to take effect."
 msgstr ""
 
-#: classes/pref/prefs.php:702
-msgid "Download more plugins at tt-rss.org <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forums</a> or <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a>."
+#: classes/pref/prefs.php:730
+msgid "System plugins"
 msgstr ""
 
-#: classes/pref/prefs.php:732
-msgid "System plugins"
+#: classes/pref/prefs.php:731
+msgid "System plugins are enabled in <strong>config.php</strong> for all users."
 msgstr ""
 
 #: classes/pref/prefs.php:736
@@ -2452,6 +2034,370 @@ msgstr "Fjerne valgte filtre?"
 msgid "Activate profile"
 msgstr "Fjerne valgte filtre?"
 
+#: classes/pref/feeds.php:15
+msgid "Check to enable field"
+msgstr "Marker for å tillate felt"
+
+#: classes/pref/feeds.php:65
+#: classes/pref/feeds.php:214
+#: classes/pref/feeds.php:258
+#: classes/pref/feeds.php:264
+#: classes/pref/feeds.php:290
+#, fuzzy, php-format
+msgid "(%d feed)"
+msgid_plural "(%d feeds)"
+msgstr[0] "Rediger nyhetsstrømmen"
+msgstr[1] "Rediger nyhetsstrømmen"
+
+#: classes/pref/feeds.php:561
+#, fuzzy
+msgid "Feed Title"
+msgstr "Tittel"
+
+#: classes/pref/feeds.php:595
+#: classes/pref/feeds.php:818
+#: classes/pref/feeds.php:1796
+#: classes/feeds.php:1048
+msgid "Place in category:"
+msgstr "Plasser i kategori..."
+
+#: classes/pref/feeds.php:608
+#: classes/pref/feeds.php:832
+#, fuzzy
+msgid "Language:"
+msgstr "Språk:"
+
+#: classes/pref/feeds.php:615
+#: classes/pref/feeds.php:841
+msgid "Update"
+msgstr "Oppdater"
+
+#: classes/pref/feeds.php:630
+#: classes/pref/feeds.php:857
+msgid "Article purging:"
+msgstr "Slett artikler:"
+
+#: classes/pref/feeds.php:662
+msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
+msgstr ""
+
+#: classes/pref/feeds.php:681
+#: classes/pref/feeds.php:888
+#, fuzzy
+msgid "Hide from Popular feeds"
+msgstr "Skjul fra min nyhetsstrømslisten"
+
+#: classes/pref/feeds.php:693
+#: classes/pref/feeds.php:894
+msgid "Include in e-mail digest"
+msgstr "Inkluder i e-postsammendraget"
+
+#: classes/pref/feeds.php:706
+#: classes/pref/feeds.php:900
+msgid "Always display image attachments"
+msgstr ""
+
+#: classes/pref/feeds.php:719
+#: classes/pref/feeds.php:908
+msgid "Do not embed images"
+msgstr ""
+
+#: classes/pref/feeds.php:732
+#: classes/pref/feeds.php:916
+msgid "Cache media"
+msgstr ""
+
+#: classes/pref/feeds.php:744
+#: classes/pref/feeds.php:922
+#, fuzzy
+msgid "Mark updated articles as unread"
+msgstr "Marker alle artikler som leste?"
+
+#: classes/pref/feeds.php:748
+#, fuzzy
+msgid "Icon"
+msgstr "Handling"
+
+#: classes/pref/feeds.php:765
+msgid "Replace"
+msgstr ""
+
+#: classes/pref/feeds.php:1174
+#: classes/pref/feeds.php:1227
+msgid "All done."
+msgstr "Alt ferdig."
+
+#: classes/pref/feeds.php:1282
+#, fuzzy
+msgid "Feeds with errors"
+msgstr "Nyhetsstrømsredigerer"
+
+#: classes/pref/feeds.php:1289
+#, fuzzy
+msgid "Inactive feeds"
+msgstr "Hele nyhetsstrømmen"
+
+#: classes/pref/feeds.php:1325
+#, fuzzy
+msgid "Edit selected feeds"
+msgstr "Sletter den valgte nyhetsstrømmen..."
+
+#: classes/pref/feeds.php:1329
+#: js/prefs.js:1618
+#, fuzzy
+msgid "Batch subscribe"
+msgstr "Avabonner"
+
+#: classes/pref/feeds.php:1336
+#, fuzzy
+msgid "Categories"
+msgstr "Kategori:"
+
+#: classes/pref/feeds.php:1339
+#, fuzzy
+msgid "Add category"
+msgstr "Legger til kategori for nyhetsstrømmer"
+
+#: classes/pref/feeds.php:1343
+#, fuzzy
+msgid "Remove selected"
+msgstr "Fjerne valgte filtre?"
+
+#: classes/pref/feeds.php:1354
+#, fuzzy
+msgid "More actions..."
+msgstr "Handlinger..."
+
+#: classes/pref/feeds.php:1358
+msgid "Manual purge"
+msgstr "Slett manuelt"
+
+#: classes/pref/feeds.php:1362
+msgid "Clear feed data"
+msgstr "Slett nyhetsstrømsdata"
+
+#: classes/pref/feeds.php:1416
+msgid "OPML"
+msgstr "OPML"
+
+#: classes/pref/feeds.php:1418
+msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
+msgstr ""
+
+#: classes/pref/feeds.php:1419
+msgid "Only main settings profile can be migrated using OPML."
+msgstr ""
+
+#: classes/pref/feeds.php:1432
+#, fuzzy
+msgid "Import my OPML"
+msgstr "Importerer OPML (bruker DOMXML-utvidelsen)..."
+
+#: classes/pref/feeds.php:1438
+msgid "Filename:"
+msgstr ""
+
+#: classes/pref/feeds.php:1440
+#, fuzzy
+msgid "Include settings"
+msgstr "Inkluder i e-postsammendraget"
+
+#: classes/pref/feeds.php:1444
+#, fuzzy
+msgid "Export OPML"
+msgstr "Eksporter OPML"
+
+#: classes/pref/feeds.php:1448
+#, fuzzy
+msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
+msgstr "Publiserte artikler kan bli eksportert som en offentlig RSS-nyhetskanal og kan bli abonnert på av alle som vet adressen som blir spesifisert nedenfor."
+
+#: classes/pref/feeds.php:1452
+msgid "Public OPML URL"
+msgstr ""
+
+#: classes/pref/feeds.php:1453
+msgid "Display published OPML URL"
+msgstr ""
+
+#: classes/pref/feeds.php:1462
+#, fuzzy
+msgid "Firefox integration"
+msgstr "Firefox integrering"
+
+#: classes/pref/feeds.php:1464
+msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
+msgstr "Denne Tiny Tiny RSS siden kan bli brukt som nyhetsstrømsleser for Firefox ved å trykke på lenken nedenfor."
+
+#: classes/pref/feeds.php:1471
+msgid "Click here to register this site as a feed reader."
+msgstr "Trykk her for å registrere denne siden som nyhetsstrømsleser"
+
+#: classes/pref/feeds.php:1479
+#, fuzzy
+msgid "Published & shared articles / Generated feeds"
+msgstr "Sett poeng på nytt for artiklene i de valgte nyhetskanalene?"
+
+#: classes/pref/feeds.php:1481
+msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
+msgstr "Publiserte artikler kan bli eksportert som en offentlig RSS-nyhetskanal og kan bli abonnert på av alle som vet adressen som blir spesifisert nedenfor."
+
+#: classes/pref/feeds.php:1488
+#: classes/feeds.php:54
+#: classes/feeds.php:140
+#, fuzzy
+msgid "View as RSS"
+msgstr "Se stikkord"
+
+#: classes/pref/feeds.php:1489
+#, fuzzy
+msgid "Display URL"
+msgstr "Vis stikkord"
+
+#: classes/pref/feeds.php:1492
+msgid "Clear all generated URLs"
+msgstr ""
+
+#: classes/pref/feeds.php:1570
+#, fuzzy
+msgid "These feeds have not been updated with new content for 3 months (oldest first):"
+msgstr "Disse nyhetsstrømmene kunne ikke oppdateres på grunn av feil:"
+
+#: classes/pref/feeds.php:1604
+#: classes/pref/feeds.php:1668
+#, fuzzy
+msgid "Click to edit feed"
+msgstr "Trykk for å endre"
+
+#: classes/pref/feeds.php:1622
+#: classes/pref/feeds.php:1688
+#, fuzzy
+msgid "Unsubscribe from selected feeds"
+msgstr "Fjern abonnement på valgte nyhetsstrømmer"
+
+#: classes/pref/feeds.php:1793
+msgid "Add one valid RSS feed per line (no feed detection is done)"
+msgstr ""
+
+#: classes/pref/feeds.php:1802
+msgid "Feeds to subscribe, One per line"
+msgstr ""
+
+#: classes/pref/feeds.php:1825
+#, fuzzy
+msgid "Feeds require authentication."
+msgstr "Denne nyhetsstrømmen krever autentifisering"
+
+#: classes/pref/feeds.php:1832
+#: classes/feeds.php:1092
+#: classes/feeds.php:1146
+msgid "Subscribe"
+msgstr "Abonner"
+
+#: classes/pref/system.php:29
+msgid "Error Log"
+msgstr ""
+
+#: classes/pref/system.php:40
+#, fuzzy
+msgid "Refresh"
+msgstr "Oppdater"
+
+#: classes/pref/system.php:43
+#, fuzzy
+msgid "Clear log"
+msgstr "Fjern farger"
+
+#: classes/pref/system.php:48
+msgid "Error"
+msgstr ""
+
+#: classes/pref/system.php:49
+msgid "Filename"
+msgstr ""
+
+#: classes/pref/system.php:50
+msgid "Message"
+msgstr ""
+
+#: classes/pref/system.php:52
+msgid "Date"
+msgstr "Dato"
+
+#: classes/opml.php:28
+#: classes/opml.php:33
+msgid "OPML Utility"
+msgstr "OPML-verktøy"
+
+#: classes/opml.php:37
+#, fuzzy
+msgid "Importing OPML..."
+msgstr "Importerer OPML (bruker DOMXML-utvidelsen)..."
+
+#: classes/opml.php:41
+msgid "Return to preferences"
+msgstr "Returner til innstillinger"
+
+#: classes/opml.php:295
+#, fuzzy, php-format
+msgid "Adding feed: %s"
+msgstr "Legger til nyhetsstrøm..."
+
+#: classes/opml.php:306
+#, fuzzy, php-format
+msgid "Duplicate feed: %s"
+msgstr "Lag filter"
+
+#: classes/opml.php:320
+#, fuzzy, php-format
+msgid "Adding label %s"
+msgstr "Tildel stikkord"
+
+#: classes/opml.php:323
+#, php-format
+msgid "Duplicate label: %s"
+msgstr ""
+
+#: classes/opml.php:335
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr ""
+
+#: classes/opml.php:367
+#, fuzzy
+msgid "Adding filter..."
+msgstr "Legger til nyhetsstrøm..."
+
+#: classes/opml.php:486
+#, fuzzy, php-format
+msgid "Processing category: %s"
+msgstr "Plasser i kategori..."
+
+#: classes/opml.php:532
+#, php-format
+msgid "Upload failed with error code %d"
+msgstr ""
+
+#: classes/opml.php:544
+#: plugins/import_export/init.php:448
+#, fuzzy
+msgid "Unable to move uploaded file."
+msgstr "Feil: Kan ikke laste opp OPMLfil"
+
+#: classes/opml.php:548
+#: plugins/import_export/init.php:452
+msgid "Error: please upload OPML file."
+msgstr "Feil: Kan ikke laste opp OPMLfil"
+
+#: classes/opml.php:559
+#, fuzzy
+msgid "Error: unable to find moved OPML file."
+msgstr "Feil: Kan ikke laste opp OPMLfil"
+
+#: classes/opml.php:566
+msgid "Error while parsing document."
+msgstr "Feil under behandling av dokumentet"
+
 #: classes/feeds.php:53
 #, fuzzy
 msgid "View as RSS feed"
@@ -2496,8 +2442,8 @@ msgstr "Gå tilbake"
 
 #: classes/feeds.php:127
 #: classes/feeds.php:132
-#: plugins/mail/init.php:75
 #: plugins/mailto/init.php:25
+#: plugins/mail/init.php:75
 #, fuzzy
 msgid "Forward by email"
 msgstr "Marker artikkel som favoritt"
@@ -2506,284 +2452,279 @@ msgstr "Marker artikkel som favoritt"
 msgid "Feed:"
 msgstr "Nyhetsstrøm:"
 
-#: classes/feeds.php:229
-#: classes/feeds.php:892
+#: classes/feeds.php:228
+#: classes/feeds.php:885
 msgid "Feed not found."
 msgstr "Nyhetsstrømmen ble ikke funnet"
 
-#: classes/feeds.php:300
+#: classes/feeds.php:291
 #, fuzzy
 msgid "Never"
 msgstr "Slett aldri"
 
-#: classes/feeds.php:413
+#: classes/feeds.php:405
 #, fuzzy, php-format
 msgid "Imported at %s"
 msgstr "Importer"
 
-#: classes/feeds.php:472
-#: classes/feeds.php:569
+#: classes/feeds.php:464
+#: classes/feeds.php:561
 #, fuzzy
 msgid "mark feed as read"
 msgstr "Marker nyhetsstrøm som lest"
 
-#: classes/feeds.php:630
+#: classes/feeds.php:622
 #, fuzzy
 msgid "Collapse article"
 msgstr "Fjern artikler"
 
-#: classes/feeds.php:791
+#: classes/feeds.php:784
 msgid "No unread articles found to display."
 msgstr "Ingen uleste artikler funnet som kunne vises"
 
-#: classes/feeds.php:794
+#: classes/feeds.php:787
 msgid "No updated articles found to display."
 msgstr "Ingen oppdaterte artikler funnet som kunne vises"
 
-#: classes/feeds.php:797
+#: classes/feeds.php:790
 msgid "No starred articles found to display."
 msgstr "Ingen markerte artikler som kan vises"
 
-#: classes/feeds.php:801
+#: classes/feeds.php:794
 #, fuzzy
 msgid "No articles found to display. You can assign articles to labels manually from article header context menu (applies to all selected articles) or use a filter."
 msgstr "Ingen artikler ble funnet. Du kan gi artikler merkelapper manuelt (se aksjon-menyen ovenfor) eller bruke et filter."
 
-#: classes/feeds.php:803
+#: classes/feeds.php:796
 msgid "No articles found to display."
 msgstr "Ingen artikler funnet som kan vises"
 
-#: classes/feeds.php:818
-#: classes/feeds.php:992
+#: classes/feeds.php:811
+#: classes/feeds.php:985
 #, fuzzy, php-format
 msgid "Feeds last updated at %s"
 msgstr "Oppdateringsfeil"
 
-#: classes/feeds.php:828
-#: classes/feeds.php:1002
+#: classes/feeds.php:821
+#: classes/feeds.php:995
 msgid "Some feeds have update errors (click for details)"
 msgstr "Noen nyhetsstrømmer har oppdateringsfeil (trykk for detaljer)"
 
-#: classes/feeds.php:982
+#: classes/feeds.php:975
 msgid "No feed selected."
 msgstr "Ingen valgt nyhetsstrøm"
 
-#: classes/feeds.php:1041
-#: classes/feeds.php:1049
+#: classes/feeds.php:1034
+#: classes/feeds.php:1042
 #, fuzzy
 msgid "Feed or site URL"
 msgstr "Nyhetsstrøm"
 
-#: classes/feeds.php:1063
+#: classes/feeds.php:1056
 #, fuzzy
 msgid "Available feeds"
 msgstr "Alle Nyhetsstrømmer"
 
-#: classes/feeds.php:1094
+#: classes/feeds.php:1087
 msgid "This feed requires authentication."
 msgstr "Denne nyhetsstrømmen krever autentifisering"
 
-#: classes/feeds.php:1102
+#: classes/feeds.php:1095
 #, fuzzy
 msgid "More feeds"
 msgstr "Flere nyhetsstrømmer"
 
-#: classes/feeds.php:1129
+#: classes/feeds.php:1122
 #, fuzzy
 msgid "Popular feeds"
 msgstr "Vis nyhetsstrømmer"
 
-#: classes/feeds.php:1130
+#: classes/feeds.php:1123
 #, fuzzy
 msgid "Feed archive"
 msgstr "Nyhetsstrømshandlinger"
 
-#: classes/feeds.php:1133
+#: classes/feeds.php:1126
 #, fuzzy
 msgid "limit:"
 msgstr "Antall:"
 
-#: classes/feeds.php:1165
+#: classes/feeds.php:1158
 msgid "Look for"
 msgstr ""
 
-#: classes/feeds.php:1173
+#: classes/feeds.php:1166
 #, php-format
 msgid "in %s"
 msgstr ""
 
-#: classes/feeds.php:1178
+#: classes/feeds.php:1171
 msgid "Used for word stemming"
 msgstr ""
 
-#: classes/feeds.php:1187
+#: classes/feeds.php:1180
 #, fuzzy
 msgid "Search syntax"
 msgstr "Søk etter merkelapp"
 
-#: plugins/instances/init.php:141
-#, fuzzy
-msgid "Linked"
-msgstr "Lenke"
-
-#: plugins/instances/init.php:204
-#: plugins/instances/init.php:395
-msgid "Instance"
-msgstr ""
+#: classes/feeds.php:1596
+msgid "Starred articles"
+msgstr "Favorittartikler"
 
-#: plugins/instances/init.php:215
-#: plugins/instances/init.php:312
-#: plugins/instances/init.php:404
-msgid "Instance URL"
-msgstr ""
+#: classes/feeds.php:1598
+msgid "Published articles"
+msgstr "Publiserte artikler"
 
-#: plugins/instances/init.php:226
-#: plugins/instances/init.php:414
-#, fuzzy
-msgid "Access key:"
-msgstr "Tilgangsnivå:"
+#: classes/feeds.php:1600
+msgid "Fresh articles"
+msgstr "Ferske artikler"
 
-#: plugins/instances/init.php:229
-#: plugins/instances/init.php:313
-#: plugins/instances/init.php:417
+#: classes/feeds.php:1604
 #, fuzzy
-msgid "Access key"
-msgstr "Tilgangsnivå"
+msgid "Archived articles"
+msgstr "Lagrede artikler"
 
-#: plugins/instances/init.php:233
-#: plugins/instances/init.php:421
-msgid "Use one access key for both linked instances."
+#: classes/feeds.php:1606
+msgid "Recently read"
 msgstr ""
 
-#: plugins/instances/init.php:241
-#: plugins/instances/init.php:429
-#, fuzzy
-msgid "Generate new key"
-msgstr "Generert nyhetsstrøm"
+#: classes/feeds.php:1716
+msgid "Special"
+msgstr "Snarveier"
 
-#: plugins/instances/init.php:292
-#, fuzzy
-msgid "Link instance"
-msgstr "Endre stikkord"
+#: classes/feeds.php:1962
+#, fuzzy, php-format
+msgid "Search results: %s"
+msgstr "Søkeresultat"
 
-#: plugins/instances/init.php:304
-msgid "You can connect other instances of Tiny Tiny RSS to this one to share Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
-msgstr ""
+#: plugins/vf_shared/init.php:16
+#: plugins/vf_shared/init.php:60
+#, fuzzy
+msgid "Shared articles"
+msgstr "Favorittartikler"
 
-#: plugins/instances/init.php:314
-msgid "Last connected"
+#: plugins/import_export/init.php:58
+msgid "Import and export"
 msgstr ""
 
-#: plugins/instances/init.php:315
-msgid "Status"
+#: plugins/import_export/init.php:60
+msgid "You can export and import your Starred and Archived articles for safekeeping or when migrating between tt-rss instances of same version."
 msgstr ""
 
-#: plugins/instances/init.php:316
+#: plugins/import_export/init.php:65
 #, fuzzy
-msgid "Stored feeds"
-msgstr "Flere nyhetsstrømmer"
+msgid "Export my data"
+msgstr "Eksporter OPML"
 
-#: plugins/instances/init.php:433
+#: plugins/import_export/init.php:81
+msgid "Import"
+msgstr "Importer"
+
+#: plugins/import_export/init.php:231
 #, fuzzy
-msgid "Create link"
-msgstr "Lag"
+msgid "Could not import: incorrect schema version."
+msgstr "Kunne ikke finne den nødvendige skjemafilen, nødvendig versjon:"
 
-#: plugins/nsfw/init.php:30
-#: plugins/nsfw/init.php:42
-msgid "Not work safe (click to toggle)"
+#: plugins/import_export/init.php:236
+msgid "Could not import: unrecognized document format."
 msgstr ""
 
-#: plugins/nsfw/init.php:52
-msgid "NSFW Plugin"
+#: plugins/import_export/init.php:397
+msgid "Finished: "
 msgstr ""
 
-#: plugins/nsfw/init.php:79
-msgid "Tags to consider NSFW (comma-separated)"
-msgstr ""
+#: plugins/import_export/init.php:398
+#, fuzzy, php-format
+msgid "%d article processed, "
+msgid_plural "%d articles processed, "
+msgstr[0] "Endre Stikkord"
+msgstr[1] "Endre Stikkord"
 
-#: plugins/nsfw/init.php:100
-#, fuzzy
-msgid "Configuration saved."
-msgstr "Konfigurasjonen er lagret."
+#: plugins/import_export/init.php:399
+#, fuzzy, php-format
+msgid "%d imported, "
+msgid_plural "%d imported, "
+msgstr[0] "Allerede importert."
+msgstr[1] "Allerede importert."
 
-#: plugins/note/init.php:26
-#: plugins/note/note.js:11
-#, fuzzy
-msgid "Edit article note"
-msgstr "Endre Stikkord"
+#: plugins/import_export/init.php:400
+#, fuzzy, php-format
+msgid "%d feed created."
+msgid_plural "%d feeds created."
+msgstr[0] "Ingen valgt nyhetsstrøm"
+msgstr[1] "Ingen valgt nyhetsstrøm"
 
-#: plugins/vf_shared/init.php:16
-#: plugins/vf_shared/init.php:69
-#, fuzzy
-msgid "Shared articles"
-msgstr "Favorittartikler"
+#: plugins/import_export/init.php:405
+msgid "Could not load XML document."
+msgstr ""
 
-#: plugins/auth_internal/init.php:65
+#: plugins/import_export/init.php:417
 #, fuzzy
-msgid "Please enter your one time password:"
-msgstr "Vennligst skriv inn et notat for denne artikkelen:"
-
-#: plugins/auth_internal/init.php:188
-msgid "Password has been changed."
-msgstr "Passord har blitt endret."
-
-#: plugins/auth_internal/init.php:190
-msgid "Old password is incorrect."
-msgstr "Gammelt passord er feil"
+msgid "Prepare data"
+msgstr "Lagre"
 
-#: plugins/af_readability/init.php:21
-msgid "Data saved."
+#: plugins/import_export/init.php:434
+#, php-format
+msgid "Upload failed with error code %d (%s)"
 msgstr ""
 
-#: plugins/af_readability/init.php:33
+#: plugins/import_export/init.php:460
 #, fuzzy
-msgid "Inline content"
-msgstr "Rullevisning av artkkelens innhold"
+msgid "No file uploaded."
+msgstr "Ingen OPML-fil til å lastes opp."
 
-#: plugins/af_readability/init.php:39
-msgid "Readability settings (af_readability)"
+#: plugins/mailto/init.php:48
+#: plugins/mailto/init.php:54
+#: plugins/mail/init.php:112
+#: plugins/mail/init.php:118
+msgid "[Forwarded]"
 msgstr ""
 
-#: plugins/af_readability/init.php:66
-msgid "Use Readability for pages shared via bookmarklet."
-msgstr ""
+#: plugins/mailto/init.php:48
+#: plugins/mail/init.php:112
+#, fuzzy
+msgid "Multiple articles"
+msgstr "Alle artikler"
 
-#: plugins/af_readability/init.php:78
-#: plugins/af_psql_trgm/init.php:191
-msgid "Currently enabled for (click to edit):"
+#: plugins/mailto/init.php:70
+msgid "Clicking the following link to invoke your mail client:"
 msgstr ""
 
-#: plugins/af_readability/init.php:95
-#, fuzzy
-msgid "Readability"
-msgstr "Sjekk tilgjengeligheten"
-
-#: plugins/af_readability/init.php:106
+#: plugins/mailto/init.php:74
 #, fuzzy
-msgid "Inline article content"
-msgstr "Rullevisning av artkkelens innhold"
+msgid "Forward selected article(s) by email."
+msgstr "Marker artikkel som favoritt"
 
-#: plugins/af_redditimgur/init.php:25
-msgid "Reddit content settings (af_redditimgur)"
+#: plugins/mailto/init.php:77
+msgid "You should be able to edit the message before sending in your mail client."
 msgstr ""
 
-#: plugins/af_redditimgur/init.php:50
-msgid "Uses Readability (full-text-rss) implementation by <a target='_blank' href='https://bitbucket.org/fivefilters/'>FiveFilters.org</a>"
-msgstr ""
+#: plugins/mailto/init.php:82
+#, fuzzy
+msgid "Close this dialog"
+msgstr "Lukk dette vinduet"
 
-#: plugins/af_redditimgur/init.php:54
-msgid "Extract missing content using Readability"
+#: plugins/bookmarklets/init.php:20
+msgid "Bookmarklets"
 msgstr ""
 
-#: plugins/af_redditimgur/init.php:59
-msgid "Enable additional duplicate checking"
+#: plugins/bookmarklets/init.php:22
+msgid "Drag the link below to your browser toolbar, open the feed you're interested in in your browser and click on the link to subscribe to it."
 msgstr ""
 
-#: plugins/af_redditimgur/init.php:73
-#: plugins/af_zz_imgproxy/init.php:225
+#: plugins/bookmarklets/init.php:26
+#, fuzzy, php-format
+msgid "Subscribe to %s in Tiny Tiny RSS?"
+msgstr "Returner til Tiny Tiny RSS"
+
+#: plugins/bookmarklets/init.php:31
 #, fuzzy
-msgid "Configuration saved"
-msgstr "Konfigurasjonen er lagret."
+msgid "Subscribe in Tiny Tiny RSS"
+msgstr "Returner til Tiny Tiny RSS"
+
+#: plugins/bookmarklets/init.php:34
+msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
+msgstr ""
 
 #: plugins/af_psql_trgm/init.php:28
 #, php-format
@@ -2823,91 +2764,63 @@ msgstr ""
 msgid "Enable for all feeds:"
 msgstr "Tillat ikoner i nyhetsstrømslisten"
 
-#: plugins/af_psql_trgm/init.php:209
-msgid "Similarity (pg_trgm)"
-msgstr ""
-
-#: plugins/af_comics/init.php:40
-msgid "Feeds supported by af_comics"
+#: plugins/af_psql_trgm/init.php:191
+#: plugins/af_readability/init.php:78
+msgid "Currently enabled for (click to edit):"
 msgstr ""
 
-#: plugins/af_comics/init.php:42
-msgid "The following comics are currently supported:"
+#: plugins/af_psql_trgm/init.php:209
+msgid "Similarity (pg_trgm)"
 msgstr ""
 
-#: plugins/af_comics/init.php:60
-msgid "GoComics requires a specific URL to workaround their lack of feed support: <code>http://feeds.feedburner.com/uclick/<em>comic_name</em></code> (e.g. <code>http://www.gocomics.com/garfield</code> uses <code>http://feeds.feedburner.com/uclick/garfield</code>)."
+#: plugins/nsfw/init.php:30
+#: plugins/nsfw/init.php:42
+msgid "Not work safe (click to toggle)"
 msgstr ""
 
-#: plugins/import_export/init.php:58
-msgid "Import and export"
+#: plugins/nsfw/init.php:52
+msgid "NSFW Plugin"
 msgstr ""
 
-#: plugins/import_export/init.php:60
-msgid "You can export and import your Starred and Archived articles for safekeeping or when migrating between tt-rss instances of same version."
+#: plugins/nsfw/init.php:79
+msgid "Tags to consider NSFW (comma-separated)"
 msgstr ""
 
-#: plugins/import_export/init.php:65
-#, fuzzy
-msgid "Export my data"
-msgstr "Eksporter OPML"
-
-#: plugins/import_export/init.php:81
-msgid "Import"
-msgstr "Importer"
-
-#: plugins/import_export/init.php:225
+#: plugins/nsfw/init.php:100
 #, fuzzy
-msgid "Could not import: incorrect schema version."
-msgstr "Kunne ikke finne den nødvendige skjemafilen, nødvendig versjon:"
+msgid "Configuration saved."
+msgstr "Konfigurasjonen er lagret."
 
-#: plugins/import_export/init.php:230
-msgid "Could not import: unrecognized document format."
-msgstr ""
+#: plugins/toggle_sidebar/init.php:23
+msgid "Collapse feedlist"
+msgstr "Skjul nyhetskanalsslisten"
 
-#: plugins/import_export/init.php:391
-msgid "Finished: "
+#: plugins/af_readability/init.php:21
+msgid "Data saved."
 msgstr ""
 
-#: plugins/import_export/init.php:392
-#, fuzzy, php-format
-msgid "%d article processed, "
-msgid_plural "%d articles processed, "
-msgstr[0] "Endre Stikkord"
-msgstr[1] "Endre Stikkord"
-
-#: plugins/import_export/init.php:393
-#, fuzzy, php-format
-msgid "%d imported, "
-msgid_plural "%d imported, "
-msgstr[0] "Allerede importert."
-msgstr[1] "Allerede importert."
+#: plugins/af_readability/init.php:33
+#, fuzzy
+msgid "Inline content"
+msgstr "Rullevisning av artkkelens innhold"
 
-#: plugins/import_export/init.php:394
-#, fuzzy, php-format
-msgid "%d feed created."
-msgid_plural "%d feeds created."
-msgstr[0] "Ingen valgt nyhetsstrøm"
-msgstr[1] "Ingen valgt nyhetsstrøm"
+#: plugins/af_readability/init.php:39
+msgid "Readability settings (af_readability)"
+msgstr ""
 
-#: plugins/import_export/init.php:399
-msgid "Could not load XML document."
+#: plugins/af_readability/init.php:66
+msgid "Use Readability for pages shared via bookmarklet."
 msgstr ""
 
-#: plugins/import_export/init.php:411
+#: plugins/af_readability/init.php:95
 #, fuzzy
-msgid "Prepare data"
-msgstr "Lagre"
-
-#: plugins/import_export/init.php:428
-#, php-format
-msgid "Upload failed with error code %d (%s)"
-msgstr ""
+msgid "Readability"
+msgstr "Sjekk tilgjengeligheten"
 
-#: plugins/import_export/init.php:454
+#: plugins/af_readability/init.php:106
 #, fuzzy
-msgid "No file uploaded."
-msgstr "Ingen OPML-fil til å lastes opp."
+msgid "Inline article content"
+msgstr "Rullevisning av artkkelens innhold"
 
 #: plugins/mail/init.php:28
 msgid "Mail addresses saved."
@@ -2921,19 +2834,6 @@ msgstr ""
 msgid "You can set predefined email addressed here (comma-separated list):"
 msgstr ""
 
-#: plugins/mail/init.php:112
-#: plugins/mail/init.php:118
-#: plugins/mailto/init.php:49
-#: plugins/mailto/init.php:55
-msgid "[Forwarded]"
-msgstr ""
-
-#: plugins/mail/init.php:112
-#: plugins/mailto/init.php:49
-#, fuzzy
-msgid "Multiple articles"
-msgstr "Alle artikler"
-
 #: plugins/mail/init.php:140
 #, fuzzy
 msgid "To:"
@@ -2949,98 +2849,116 @@ msgstr "Velg:"
 msgid "Send e-mail"
 msgstr "Skift e-post"
 
-#: plugins/close_button/init.php:22
+#: plugins/share/init.php:39
+msgid "You can disable all articles shared by unique URLs here."
+msgstr ""
+
+#: plugins/share/init.php:42
 #, fuzzy
-msgid "Close article"
-msgstr "Fjern artikler"
+msgid "Unshare all articles"
+msgstr "Uleste artikler"
 
-#: plugins/bookmarklets/init.php:20
-msgid "Bookmarklets"
+#: plugins/share/init.php:75
+#, fuzzy
+msgid "Share by URL"
+msgstr "Marker artikkel som favoritt"
+
+#: plugins/share/init.php:96
+msgid "You can share this article by the following unique URL:"
 msgstr ""
 
-#: plugins/bookmarklets/init.php:22
-msgid "Drag the link below to your browser toolbar, open the feed you're interested in in your browser and click on the link to subscribe to it."
+#: plugins/share/init.php:114
+#, fuzzy
+msgid "Unshare article"
+msgstr "Fjern favorittmerkingen fra artiklen"
+
+#: plugins/af_comics/init.php:48
+msgid "Feeds supported by af_comics"
 msgstr ""
 
-#: plugins/bookmarklets/init.php:26
-#, fuzzy, php-format
-msgid "Subscribe to %s in Tiny Tiny RSS?"
-msgstr "Returner til Tiny Tiny RSS"
+#: plugins/af_comics/init.php:50
+msgid "The following comics are currently supported:"
+msgstr ""
 
-#: plugins/bookmarklets/init.php:31
-#, fuzzy
-msgid "Subscribe in Tiny Tiny RSS"
-msgstr "Returner til Tiny Tiny RSS"
+#: plugins/af_comics/init.php:68
+msgid "GoComics requires a specific URL to workaround their lack of feed support: <code>http://feeds.feedburner.com/uclick/<em>comic_name</em></code> (e.g. <code>http://www.gocomics.com/garfield</code> uses <code>http://feeds.feedburner.com/uclick/garfield</code>)."
+msgstr ""
 
-#: plugins/bookmarklets/init.php:34
-msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
+#: plugins/af_comics/init.php:70
+msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
 msgstr ""
 
-#: plugins/toggle_sidebar/init.php:23
-msgid "Collapse feedlist"
-msgstr "Skjul nyhetskanalsslisten"
+#: plugins/af_redditimgur/init.php:25
+msgid "Reddit content settings (af_redditimgur)"
+msgstr ""
 
-#: plugins/af_zz_imgproxy/init.php:186
-msgid "Image proxy settings (af_zz_imgproxy)"
+#: plugins/af_redditimgur/init.php:50
+msgid "Uses Readability (full-text-rss) implementation by <a target='_blank' href='https://bitbucket.org/fivefilters/'>FiveFilters.org</a>"
 msgstr ""
 
-#: plugins/af_zz_imgproxy/init.php:211
-#, fuzzy
-msgid "Enable proxy for all remote images."
-msgstr "Tillat ikoner i nyhetsstrømslisten"
+#: plugins/af_redditimgur/init.php:54
+msgid "Extract missing content using Readability"
+msgstr ""
 
-#: plugins/mailto/init.php:71
-msgid "Clicking the following link to invoke your mail client:"
+#: plugins/af_redditimgur/init.php:59
+msgid "Enable additional duplicate checking"
 msgstr ""
 
-#: plugins/mailto/init.php:75
+#: plugins/af_redditimgur/init.php:73
+#: plugins/af_zz_imgproxy/init.php:254
 #, fuzzy
-msgid "Forward selected article(s) by email."
-msgstr "Marker artikkel som favoritt"
+msgid "Configuration saved"
+msgstr "Konfigurasjonen er lagret."
 
-#: plugins/mailto/init.php:78
-msgid "You should be able to edit the message before sending in your mail client."
-msgstr ""
+#: plugins/note/init.php:26
+#: plugins/note/note.js:11
+#, fuzzy
+msgid "Edit article note"
+msgstr "Endre Stikkord"
 
-#: plugins/mailto/init.php:83
+#: plugins/close_button/init.php:25
 #, fuzzy
-msgid "Close this dialog"
-msgstr "Lukk dette vinduet"
+msgid "Close article"
+msgstr "Fjern artikler"
 
-#: plugins/share/init.php:39
-msgid "You can disable all articles shared by unique URLs here."
+#: plugins/af_zz_imgproxy/init.php:210
+msgid "Image proxy settings (af_zz_imgproxy)"
 msgstr ""
 
-#: plugins/share/init.php:42
+#: plugins/af_zz_imgproxy/init.php:234
 #, fuzzy
-msgid "Unshare all articles"
-msgstr "Uleste artikler"
+msgid "Enable proxy for all remote images."
+msgstr "Tillat ikoner i nyhetsstrømslisten"
 
-#: plugins/share/init.php:75
+#: plugins/af_zz_imgproxy/init.php:238
 #, fuzzy
-msgid "Share by URL"
-msgstr "Marker artikkel som favoritt"
-
-#: plugins/share/init.php:97
-msgid "You can share this article by the following unique URL:"
-msgstr ""
+msgid "Don't cache files locally."
+msgstr "Mellomlagre bilder lokalt på serveren"
 
-#: plugins/share/init.php:115
+#: plugins/auth_internal/init.php:65
 #, fuzzy
-msgid "Unshare article"
-msgstr "Fjern favorittmerkingen fra artiklen"
+msgid "Please enter your one time password:"
+msgstr "Vennligst skriv inn et notat for denne artikkelen:"
+
+#: plugins/auth_internal/init.php:188
+msgid "Password has been changed."
+msgstr "Passord har blitt endret."
+
+#: plugins/auth_internal/init.php:190
+msgid "Old password is incorrect."
+msgstr "Gammelt passord er feil"
 
 #: js/FeedTree.js:172
 #, fuzzy
 msgid "(Un)collapse"
 msgstr "Skjul nyhetskanalsslisten"
 
-#: js/PrefFeedTree.js:52
+#: js/PrefFeedTree.js:54
 #, fuzzy
 msgid "Edit category"
 msgstr "Rediger kategorier"
 
-#: js/PrefFeedTree.js:59
+#: js/PrefFeedTree.js:61
 #, fuzzy
 msgid "Remove category"
 msgstr "Lag kategori"
@@ -3079,67 +2997,58 @@ msgid "Create Filter"
 msgstr "Lag filter"
 
 #: js/functions.js:1128
-msgid "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification hub again on next feed update."
-msgstr ""
-
-#: js/functions.js:1139
-#, fuzzy
-msgid "Subscription reset."
-msgstr "Abonner på nyhetsstrøm..."
-
-#: js/functions.js:1149
-#: js/tt-rss.js:695
+#: js/tt-rss.js:696
 #, perl-format
 msgid "Unsubscribe from %s?"
 msgstr "Fjerne abonnement på %s?"
 
-#: js/functions.js:1152
+#: js/functions.js:1131
 msgid "Removing feed..."
 msgstr "Fjerner nyhetsstrøm..."
 
-#: js/functions.js:1225
+#: js/functions.js:1204
 #, fuzzy
 msgid "Please enter category title:"
 msgstr "Vennligst skriv inn et notat for denne artikkelen:"
 
-#: js/functions.js:1250
+#: js/functions.js:1229
 msgid "Generate new syndication address for this feed?"
 msgstr ""
 
-#: js/functions.js:1254
-#: js/prefs.js:1154
+#: js/functions.js:1233
+#: js/prefs.js:1150
 msgid "Trying to change address..."
 msgstr "Prøver å endre adressen..."
 
-#: js/functions.js:1497
-#: js/functions.js:1606
+#: js/functions.js:1476
+#: js/functions.js:1585
 #: js/prefs.js:398
 #: js/prefs.js:424
 #: js/prefs.js:456
 #: js/prefs.js:599
 #: js/prefs.js:617
-#: js/prefs.js:1136
-#: js/prefs.js:1263
+#: js/prefs.js:1132
+#: js/prefs.js:1259
 msgid "No feeds are selected."
 msgstr "Ingen nyhetsstrømmer er valgt"
 
-#: js/functions.js:1540
+#: js/functions.js:1519
 msgid "Remove selected feeds from the archive? Feeds with stored articles will not be removed."
 msgstr ""
 
-#: js/functions.js:1577
+#: js/functions.js:1556
 #, fuzzy
 msgid "Feeds with update errors"
 msgstr "Oppdateringsfeil"
 
-#: js/functions.js:1588
-#: js/prefs.js:1117
+#: js/functions.js:1567
+#: js/prefs.js:1113
 #, fuzzy
 msgid "Remove selected feeds?"
 msgstr "Fjerne valgte filtre?"
 
-#: js/functions.js:1591
-#: js/prefs.js:1120
+#: js/functions.js:1570
+#: js/prefs.js:1116
 #, fuzzy
 msgid "Removing selected feeds..."
 msgstr "Fjerner valgte filtre..."
@@ -3163,9 +3072,7 @@ msgstr "Brukeradministrering"
 #: js/prefs.js:100
 #: js/prefs.js:209
 #: js/prefs.js:706
-#: plugins/instances/instances.js:26
-#: plugins/instances/instances.js:89
-#: js/functions.js:1408
+#: js/functions.js:1387
 #, fuzzy
 msgid "Saving data..."
 msgstr "Lagrer Nyhetsstrøm"
@@ -3193,7 +3100,7 @@ msgid "Removing selected labels..."
 msgstr "Fjerner merkede merkelapper..."
 
 #: js/prefs.js:308
-#: js/prefs.js:1304
+#: js/prefs.js:1300
 msgid "No labels are selected."
 msgstr "Ingen merkelapper er markert"
 
@@ -3297,31 +3204,31 @@ msgstr "Lagre endringer til de valgte nyhetsstrømmene?"
 msgid "OPML Import"
 msgstr "Importer"
 
-#: js/prefs.js:764
+#: js/prefs.js:759
 #, fuzzy
 msgid "Please choose an OPML file first."
 msgstr "Vennligst velg en eller flere nyhetsstrømmer først"
 
-#: js/prefs.js:767
+#: js/prefs.js:762
 #: plugins/import_export/import_export.js:115
 #, fuzzy
 msgid "Importing, please wait..."
 msgstr "laster, vennligst vent"
 
-#: js/prefs.js:928
+#: js/prefs.js:924
 msgid "Reset to defaults?"
 msgstr "Tilbakefør til standardinnstillingene"
 
-#: js/prefs.js:1628
+#: js/prefs.js:1624
 #, fuzzy
 msgid "Subscribing to feeds..."
 msgstr "Abonnerer på nyhetsstrømmen..."
 
-#: js/prefs.js:1647
+#: js/prefs.js:1643
 msgid "Clear stored data for this plugin?"
 msgstr ""
 
-#: js/prefs.js:1661
+#: js/prefs.js:1657
 msgid "Clear all messages in the error log?"
 msgstr ""
 
@@ -3333,195 +3240,158 @@ msgstr "Marker alle artikler som leste?"
 msgid "Marking all feeds as read..."
 msgstr "Marker alle nyhetsstrømmer som lest"
 
-#: js/tt-rss.js:401
+#: js/tt-rss.js:402
 #, fuzzy
 msgid "Please enable mail plugin first."
 msgstr "Vennligst velg en eller flere nyhetsstrømmer først"
 
-#: js/tt-rss.js:449
-#: js/functions.js:1387
-#: js/tt-rss.js:676
+#: js/tt-rss.js:450
+#: js/functions.js:1366
+#: js/tt-rss.js:677
 msgid "You can't edit this kind of feed."
 msgstr "Du kan ikke endre denne typen nyhetsstrøm"
 
-#: js/tt-rss.js:530
+#: js/tt-rss.js:531
 #, fuzzy
 msgid "Please enable embed_original plugin first."
 msgstr "Vennligst velg en eller flere nyhetsstrømmer først"
 
-#: js/tt-rss.js:543
-#: js/tt-rss.js:726
+#: js/tt-rss.js:544
+#: js/tt-rss.js:727
 msgid "Widescreen is not available in combined mode."
 msgstr ""
 
-#: js/tt-rss.js:824
+#: js/tt-rss.js:825
 msgid "You can't rescore this kind of feed."
 msgstr "Du kan ikke endre poengsummen for denne typen nyhetskanal"
 
-#: js/tt-rss.js:829
-#: js/tt-rss.js:689
+#: js/tt-rss.js:830
+#: js/tt-rss.js:690
 msgid "Please select some feed first."
 msgstr "Vennligst velg en eller flere nyhetsstrømmer først"
 
-#: js/tt-rss.js:834
+#: js/tt-rss.js:835
 #, perl-format
 msgid "Rescore articles in %s?"
 msgstr "Endre poengene for artiklene i %s?"
 
-#: js/tt-rss.js:837
+#: js/tt-rss.js:838
 msgid "Rescoring articles..."
 msgstr "Endrer poengsummen for artiklene..."
 
-#: js/viewfeed.js:919
-#: js/viewfeed.js:957
-#: js/viewfeed.js:1005
-#: js/viewfeed.js:1931
-#: plugins/mail/mail.js:7
+#: js/viewfeed.js:921
+#: js/viewfeed.js:959
+#: js/viewfeed.js:1007
+#: js/viewfeed.js:1933
 #: plugins/mailto/init.js:7
-#: js/viewfeed.js:677
-#: js/viewfeed.js:699
-#: js/viewfeed.js:720
-#: js/viewfeed.js:779
-#: js/viewfeed.js:807
+#: plugins/mail/mail.js:7
+#: js/viewfeed.js:679
+#: js/viewfeed.js:701
+#: js/viewfeed.js:722
+#: js/viewfeed.js:781
+#: js/viewfeed.js:809
 msgid "No articles are selected."
 msgstr "Ingen artikler er valgt."
 
-#: js/viewfeed.js:927
+#: js/viewfeed.js:929
 #, fuzzy, perl-format
 msgid "Delete %d selected article in %s?"
 msgid_plural "Delete %d selected articles in %s?"
 msgstr[0] "Marker %d valgte artikler i %s som leste?"
 msgstr[1] "Marker %d valgte artikler i %s som leste?"
 
-#: js/viewfeed.js:929
+#: js/viewfeed.js:931
 #, fuzzy, perl-format
 msgid "Delete %d selected article?"
 msgid_plural "Delete %d selected articles?"
 msgstr[0] "Fjerne merkede artikler fra merkelappen?"
 msgstr[1] "Fjerne merkede artikler fra merkelappen?"
 
-#: js/viewfeed.js:966
+#: js/viewfeed.js:968
 #, fuzzy, perl-format
 msgid "Archive %d selected article in %s?"
 msgid_plural "Archive %d selected articles in %s?"
 msgstr[0] "Marker %d valgte artikler i %s som leste?"
 msgstr[1] "Marker %d valgte artikler i %s som leste?"
 
-#: js/viewfeed.js:969
+#: js/viewfeed.js:971
 #, fuzzy, perl-format
 msgid "Move %d archived article back?"
 msgid_plural "Move %d archived articles back?"
 msgstr[0] "Favorittartikler"
 msgstr[1] "Favorittartikler"
 
-#: js/viewfeed.js:971
+#: js/viewfeed.js:973
 msgid "Please note that unstarred articles might get purged on next feed update."
 msgstr ""
 
-#: js/viewfeed.js:1011
+#: js/viewfeed.js:1013
 #, fuzzy, perl-format
 msgid "Mark %d selected article in %s as read?"
 msgid_plural "Mark %d selected articles in %s as read?"
 msgstr[0] "Marker %d valgte artikler i %s som leste?"
 msgstr[1] "Marker %d valgte artikler i %s som leste?"
 
-#: js/viewfeed.js:1031
+#: js/viewfeed.js:1033
 #, fuzzy
 msgid "Edit article Tags"
 msgstr "Endre Stikkord"
 
-#: js/viewfeed.js:1037
+#: js/viewfeed.js:1039
 msgid "Saving article tags..."
 msgstr "Lagrer artikkelens kategorier..."
 
-#: js/viewfeed.js:1670
+#: js/viewfeed.js:1672
 #, fuzzy
 msgid "Open original article"
 msgstr "Vis opprinnelig artikkelinnhold"
 
-#: js/viewfeed.js:1677
+#: js/viewfeed.js:1679
 #, fuzzy
 msgid "Display article URL"
 msgstr "Vis stikkord"
 
-#: js/viewfeed.js:1787
+#: js/viewfeed.js:1789
 msgid "Assign label"
 msgstr "Tildel stikkord"
 
-#: js/viewfeed.js:1792
+#: js/viewfeed.js:1794
 #, fuzzy
 msgid "Remove label"
 msgstr "Fjerne merkede merkelapper?"
 
-#: js/viewfeed.js:1824
+#: js/viewfeed.js:1826
 #, fuzzy
 msgid "Select articles in group"
 msgstr "Velg artikkelen under musepekeren"
 
-#: js/viewfeed.js:1834
+#: js/viewfeed.js:1836
 #, fuzzy
 msgid "Mark group as read"
 msgstr "Marker som lest"
 
-#: js/viewfeed.js:1846
+#: js/viewfeed.js:1848
 msgid "Mark feed as read"
 msgstr "Marker nyhetsstrøm som lest"
 
-#: js/viewfeed.js:1899
+#: js/viewfeed.js:1901
 #, fuzzy
 msgid "Please enter new score for selected articles:"
 msgstr "Vennligst skriv inn et notat for denne artikkelen:"
 
-#: js/viewfeed.js:1962
+#: js/viewfeed.js:1964
 #, fuzzy
 msgid "Please enter new score for this article:"
 msgstr "Vennligst skriv inn et notat for denne artikkelen:"
 
-#: js/viewfeed.js:1993
+#: js/viewfeed.js:1995
 #, fuzzy
 msgid "Article URL:"
 msgstr "Alle artikler"
 
-#: plugins/instances/instances.js:10
-#, fuzzy
-msgid "Link Instance"
-msgstr "Endre stikkord"
-
-#: plugins/instances/instances.js:73
-#, fuzzy
-msgid "Edit Instance"
-msgstr "Endre stikkord"
-
-#: plugins/instances/instances.js:122
-#, fuzzy
-msgid "Remove selected instances?"
-msgstr "Fjerne valgte filtre?"
-
-#: plugins/instances/instances.js:125
-#, fuzzy
-msgid "Removing selected instances..."
-msgstr "Fjerner valgte filtre..."
-
-#: plugins/instances/instances.js:139
-#: plugins/instances/instances.js:151
-#, fuzzy
-msgid "No instances are selected."
-msgstr "Ingen filtre er valgt"
-
-#: plugins/instances/instances.js:156
-#, fuzzy
-msgid "Please select only one instance."
-msgstr "Vennligst velg kun et filter"
-
-#: plugins/note/note.js:17
-#, fuzzy
-msgid "Saving article note..."
-msgstr "Lagrer artikkelens kategorier..."
-
-#: plugins/af_psql_trgm/init.js:11
-#, fuzzy
-msgid "Related articles"
-msgstr "Fjern artikler"
+#: plugins/embed_original/init.js:6
+msgid "Sorry, your browser does not support sandboxed iframes."
+msgstr ""
 
 #: plugins/import_export/import_export.js:13
 #, fuzzy
@@ -3545,12 +3415,17 @@ msgstr "Importer"
 msgid "Please choose the file first."
 msgstr "Vennligst velg en eller flere nyhetsstrømmer først"
 
-#: plugins/mail/mail.js:21
 #: plugins/mailto/init.js:21
+#: plugins/mail/mail.js:21
 #, fuzzy
 msgid "Forward article by email"
 msgstr "Marker artikkel som favoritt"
 
+#: plugins/af_psql_trgm/init.js:11
+#, fuzzy
+msgid "Related articles"
+msgstr "Fjern artikler"
+
 #: plugins/mail/mail.js:36
 msgid "Error sending email:"
 msgstr ""
@@ -3560,10 +3435,6 @@ msgstr ""
 msgid "Your message has been sent."
 msgstr "Passord har blitt endret."
 
-#: plugins/embed_original/init.js:6
-msgid "Sorry, your browser does not support sandboxed iframes."
-msgstr ""
-
 #: plugins/shorten_expanded/init.js:39
 msgid "Click to expand article"
 msgstr "Trykk for å utvide artikkel"
@@ -3598,7 +3469,7 @@ msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr ""
 
 #: plugins/share/share_prefs.js:6
-#: js/prefs.js:1437
+#: js/prefs.js:1433
 #, fuzzy
 msgid "Clearing URLs..."
 msgstr "Rensker nyhetsstrøm..."
@@ -3607,26 +3478,45 @@ msgstr "Rensker nyhetsstrøm..."
 msgid "Shared URLs cleared."
 msgstr ""
 
+#: plugins/note/note.js:17
+#, fuzzy
+msgid "Saving article note..."
+msgstr "Lagrer artikkelens kategorier..."
+
 #: js/feedlist.js:429
-#: js/feedlist.js:496
 msgid "Mark all articles in %s as read?"
 msgstr "Marker alle artikler i %s som leste?"
 
 #: js/feedlist.js:487
 #, fuzzy
-msgid "Mark all articles in %s older than 1 day as read?"
+msgid "Mark %w in %s older than 1 day as read?"
 msgstr "Marker alle artikler i %s som leste?"
 
 #: js/feedlist.js:490
 #, fuzzy
-msgid "Mark all articles in %s older than 1 week as read?"
+msgid "Mark %w in %s older than 1 week as read?"
 msgstr "Marker alle artikler i %s som leste?"
 
 #: js/feedlist.js:493
 #, fuzzy
-msgid "Mark all articles in %s older than 2 weeks as read?"
+msgid "Mark %w in %s older than 2 weeks as read?"
 msgstr "Marker alle artikler i %s som leste?"
 
+#: js/feedlist.js:496
+#, fuzzy
+msgid "Mark %w in %s as read?"
+msgstr "Marker alle artikler i %s som leste?"
+
+#: js/feedlist.js:499
+#, fuzzy
+msgid "search results"
+msgstr "Søkeresultat"
+
+#: js/feedlist.js:499
+#, fuzzy
+msgid "all articles"
+msgstr "Alle artikler"
+
 #: js/functions.js:506
 msgid "Error explained"
 msgstr ""
@@ -3718,197 +3608,254 @@ msgstr "Du kan ikke fjerne abonnement fra kategorien."
 msgid "Edit rule"
 msgstr "Filtre"
 
-#: js/functions.js:1402
+#: js/functions.js:1381
 #, fuzzy
 msgid "Edit Feed"
 msgstr "Rediger nyhetsstrømmen"
 
-#: js/functions.js:1435
+#: js/functions.js:1414
 #, fuzzy
 msgid "More Feeds"
 msgstr "Flere nyhetsstrømmer"
 
-#: js/functions.js:1631
+#: js/functions.js:1610
 msgid "Help"
 msgstr "Hjelp"
 
-#: js/prefs.js:1032
+#: js/prefs.js:1028
 msgid "Remove category %s? Any nested feeds would be placed into Uncategorized."
 msgstr ""
 
-#: js/prefs.js:1038
+#: js/prefs.js:1034
 #, fuzzy
 msgid "Removing category..."
 msgstr "Lag kategori"
 
-#: js/prefs.js:1056
+#: js/prefs.js:1052
 msgid "Remove selected categories?"
 msgstr "Fjerne valgte kategorier?"
 
-#: js/prefs.js:1059
+#: js/prefs.js:1055
 msgid "Removing selected categories..."
 msgstr "Fjerner valgte kategorier..."
 
-#: js/prefs.js:1072
+#: js/prefs.js:1068
 msgid "No categories are selected."
 msgstr "Ingen kategorier er valgt."
 
-#: js/prefs.js:1079
+#: js/prefs.js:1075
 #, fuzzy
 msgid "Category title:"
 msgstr "Kategoriredigerer"
 
-#: js/prefs.js:1083
+#: js/prefs.js:1079
 #, fuzzy
 msgid "Creating category..."
 msgstr "Lag filter..."
 
-#: js/prefs.js:1106
+#: js/prefs.js:1102
 #, fuzzy
 msgid "Feeds without recent updates"
 msgstr "Oppdateringsfeil"
 
-#: js/prefs.js:1150
+#: js/prefs.js:1146
 #, fuzzy
 msgid "Replace current OPML publishing address with a new one?"
 msgstr "Bytt ut nåværende publiseringsadresse med en ny?"
 
-#: js/prefs.js:1227
+#: js/prefs.js:1223
 msgid "Clearing feed..."
 msgstr "Rensker nyhetsstrøm..."
 
-#: js/prefs.js:1247
+#: js/prefs.js:1243
 msgid "Rescore articles in selected feeds?"
 msgstr "Sett poeng på nytt for artiklene i de valgte nyhetskanalene?"
 
-#: js/prefs.js:1250
+#: js/prefs.js:1246
 #, fuzzy
 msgid "Rescoring selected feeds..."
 msgstr "Rensker valgt nyhetsstrøm..."
 
-#: js/prefs.js:1270
+#: js/prefs.js:1266
 msgid "Rescore all articles? This operation may take a lot of time."
 msgstr "Endre poengene til artiklene? Dette kan ta lang tid."
 
-#: js/prefs.js:1273
+#: js/prefs.js:1269
 msgid "Rescoring feeds..."
 msgstr "Setter poeng på nytt for nyhetskanalene..."
 
-#: js/prefs.js:1289
+#: js/prefs.js:1285
 #, fuzzy
 msgid "Reset selected labels to default colors?"
 msgstr "Sett merkelappsfargene til standard?"
 
-#: js/prefs.js:1321
+#: js/prefs.js:1317
 #, fuzzy
 msgid "Settings Profiles"
 msgstr "Lag filter"
 
-#: js/prefs.js:1330
+#: js/prefs.js:1326
 msgid "Remove selected profiles? Active and default profiles will not be removed."
 msgstr ""
 
-#: js/prefs.js:1333
+#: js/prefs.js:1329
 #, fuzzy
 msgid "Removing selected profiles..."
 msgstr "Fjerner valgte filtre..."
 
-#: js/prefs.js:1349
+#: js/prefs.js:1345
 #, fuzzy
 msgid "No profiles are selected."
 msgstr "Ingen artikkel er valgt."
 
-#: js/prefs.js:1357
-#: js/prefs.js:1410
+#: js/prefs.js:1353
+#: js/prefs.js:1406
 #, fuzzy
 msgid "Activate selected profile?"
 msgstr "Fjerne valgte filtre?"
 
-#: js/prefs.js:1374
-#: js/prefs.js:1426
+#: js/prefs.js:1370
+#: js/prefs.js:1422
 #, fuzzy
 msgid "Please choose a profile to activate."
 msgstr "Vennligst velg en eller flere nyhetsstrømmer først"
 
-#: js/prefs.js:1379
+#: js/prefs.js:1375
 #, fuzzy
 msgid "Creating profile..."
 msgstr "Lag filter"
 
-#: js/prefs.js:1434
+#: js/prefs.js:1430
 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr ""
 
-#: js/prefs.js:1444
+#: js/prefs.js:1440
 #, fuzzy
 msgid "Generated URLs cleared."
 msgstr "Generert nyhetsstrøm"
 
-#: js/prefs.js:1516
+#: js/prefs.js:1512
 msgid "Label Editor"
 msgstr "Merkelappredigerer"
 
-#: js/tt-rss.js:684
+#: js/tt-rss.js:685
 msgid "You can't unsubscribe from the category."
 msgstr "Du kan ikke fjerne abonnement fra kategorien."
 
-#: js/viewfeed.js:125
-#: js/viewfeed.js:175
-#: js/viewfeed.js:192
+#: js/viewfeed.js:127
+#: js/viewfeed.js:177
+#: js/viewfeed.js:194
 #, fuzzy
 msgid "Click to open next unread feed."
 msgstr "Trykk for å endre"
 
-#: js/viewfeed.js:129
+#: js/viewfeed.js:131
 #, fuzzy
 msgid "Cancel search"
 msgstr "Avbryt"
 
-#: js/viewfeed.js:189
+#: js/viewfeed.js:191
 #, fuzzy
 msgid "New articles found, reload feed to continue."
 msgstr "Ingen artikler funnet som kan vises"
 
-#: js/viewfeed.js:424
+#: js/viewfeed.js:426
 msgid "Unstar article"
 msgstr "Fjern favorittmerkingen fra artiklen"
 
-#: js/viewfeed.js:428
+#: js/viewfeed.js:430
 msgid "Star article"
 msgstr "Marker artikkel som favoritt"
 
-#: js/viewfeed.js:478
+#: js/viewfeed.js:480
 msgid "Unpublish article"
 msgstr "Fjern publiseringen av artikkelen."
 
-#: js/viewfeed.js:482
+#: js/viewfeed.js:484
 msgid "Publish article"
 msgstr "Publiser artiklen"
 
-#: js/viewfeed.js:622
+#: js/viewfeed.js:624
 #, fuzzy
 msgid "%d article selected"
 msgid_plural "%d articles selected"
 msgstr[0] "Ingen artikkel er valgt."
 msgstr[1] "Ingen artikkel er valgt."
 
-#: js/viewfeed.js:1286
+#: js/viewfeed.js:1288
 msgid "No article is selected."
 msgstr "Ingen artikkel er valgt."
 
-#: js/viewfeed.js:1321
+#: js/viewfeed.js:1323
 msgid "No articles found to mark"
 msgstr "Ingen artikler funnet som kan markeres"
 
-#: js/viewfeed.js:1323
+#: js/viewfeed.js:1325
 #, fuzzy
 msgid "Mark %d article as read?"
 msgid_plural "Mark %d articles as read?"
 msgstr[0] "Marker %d artikkel/artikler som leste?"
 msgstr[1] "Marker %d artikkel/artikler som leste?"
 
-#~ msgid "Cache images locally"
-#~ msgstr "Mellomlagre bilder lokalt på serveren"
+#, fuzzy
+#~ msgid "Resubscribe to push updates"
+#~ msgstr "Abonnerer på følgende nyhetsstrømmer:"
+
+#, fuzzy
+#~ msgid "Linked"
+#~ msgstr "Lenke"
+
+#, fuzzy
+#~ msgid "Access key:"
+#~ msgstr "Tilgangsnivå:"
+
+#, fuzzy
+#~ msgid "Access key"
+#~ msgstr "Tilgangsnivå"
+
+#, fuzzy
+#~ msgid "Generate new key"
+#~ msgstr "Generert nyhetsstrøm"
+
+#, fuzzy
+#~ msgid "Link instance"
+#~ msgstr "Endre stikkord"
+
+#, fuzzy
+#~ msgid "Stored feeds"
+#~ msgstr "Flere nyhetsstrømmer"
+
+#, fuzzy
+#~ msgid "Create link"
+#~ msgstr "Lag"
+
+#, fuzzy
+#~ msgid "Subscription reset."
+#~ msgstr "Abonner på nyhetsstrøm..."
+
+#, fuzzy
+#~ msgid "Link Instance"
+#~ msgstr "Endre stikkord"
+
+#, fuzzy
+#~ msgid "Edit Instance"
+#~ msgstr "Endre stikkord"
+
+#, fuzzy
+#~ msgid "Remove selected instances?"
+#~ msgstr "Fjerne valgte filtre?"
+
+#, fuzzy
+#~ msgid "Removing selected instances..."
+#~ msgstr "Fjerner valgte filtre..."
+
+#, fuzzy
+#~ msgid "No instances are selected."
+#~ msgstr "Ingen filtre er valgt"
+
+#, fuzzy
+#~ msgid "Please select only one instance."
+#~ msgstr "Vennligst velg kun et filter"
 
 #, fuzzy
 #~ msgid "More..."
diff --git a/locale/nl_NL/LC_MESSAGES/messages.mo b/locale/nl_NL/LC_MESSAGES/messages.mo
index 18b7d0d38..bce411740 100644
--- a/locale/nl_NL/LC_MESSAGES/messages.mo
+++ b/locale/nl_NL/LC_MESSAGES/messages.mo
diff --git a/locale/nl_NL/LC_MESSAGES/messages.po b/locale/nl_NL/LC_MESSAGES/messages.po
index d4a0368e3..70bba0d23 100644
--- a/locale/nl_NL/LC_MESSAGES/messages.po
+++ b/locale/nl_NL/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tt-rss git\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 15:25+0300\n"
+"POT-Creation-Date: 2017-07-04 16:29+0300\n"
 "PO-Revision-Date: 2013-05-02 13:55+0100\n"
 "Last-Translator: ArmyOfPirates\n"
 "Language-Team: translations <[email protected]>\n"
@@ -175,31 +175,30 @@ msgstr "Gebruiker niet gevonden"
 #: prefs.php:118
 #: classes/backend.php:5
 #: classes/pref/labels.php:282
-#: classes/pref/feeds.php:1402
-#: classes/pref/filters.php:779
+#: classes/pref/filters.php:819
+#: classes/pref/feeds.php:1376
 #: js/feedlist.js:149
-#: js/functions.js:1131
-#: js/functions.js:1231
-#: js/functions.js:1478
+#: js/functions.js:1210
+#: js/functions.js:1457
 #: js/prefs.js:621
-#: js/prefs.js:818
-#: js/prefs.js:1648
-#: js/prefs.js:1663
-#: js/tt-rss.js:550
-#: js/viewfeed.js:1182
+#: js/prefs.js:813
+#: js/prefs.js:1644
+#: js/prefs.js:1659
+#: js/tt-rss.js:551
+#: js/viewfeed.js:1184
 #: plugins/import_export/import_export.js:17
 #: js/feedlist.js:467
-#: js/feedlist.js:512
+#: js/feedlist.js:515
 #: js/functions.js:372
 #: js/functions.js:630
-#: js/prefs.js:1360
-#: js/prefs.js:1413
-#: js/prefs.js:1452
-#: js/prefs.js:1465
-#: js/prefs.js:1476
-#: js/prefs.js:1491
-#: js/tt-rss.js:567
-#: js/viewfeed.js:762
+#: js/prefs.js:1356
+#: js/prefs.js:1409
+#: js/prefs.js:1448
+#: js/prefs.js:1461
+#: js/prefs.js:1472
+#: js/prefs.js:1487
+#: js/tt-rss.js:568
+#: js/viewfeed.js:764
 msgid "Loading, please wait..."
 msgstr "Aan 't laden, even wachten aub..."
 
@@ -216,13 +215,13 @@ msgid "All Articles"
 msgstr "Alle artikelen"
 
 #: index.php:192
-#: include/functions2.php:107
+#: include/functions.php:1181
 #: classes/feeds.php:110
 msgid "Starred"
 msgstr "Met ster"
 
 #: index.php:193
-#: include/functions2.php:108
+#: include/functions.php:1182
 #: classes/feeds.php:111
 msgid "Published"
 msgstr "Gepubliceerd"
@@ -263,7 +262,7 @@ msgstr "Titel"
 
 #: index.php:209
 #: index.php:249
-#: include/functions2.php:95
+#: include/functions.php:1169
 #: classes/feeds.php:115
 #: js/FeedTree.js:138
 #: js/FeedTree.js:166
@@ -303,7 +302,7 @@ msgid "Feed actions:"
 msgstr "Feed acties:"
 
 #: index.php:244
-#: classes/handler/public.php:672
+#: classes/handler/public.php:583
 msgid "Subscribe to feed..."
 msgstr "Abonneren op feed..."
 
@@ -317,8 +316,8 @@ msgstr "Feed opnieuw score geven"
 
 #: index.php:247
 #: classes/pref/feeds.php:785
-#: classes/pref/feeds.php:1357
-#: js/PrefFeedTree.js:78
+#: classes/pref/feeds.php:1331
+#: js/PrefFeedTree.js:80
 msgid "Unsubscribe"
 msgstr "Abonnement opzeggen"
 
@@ -335,7 +334,7 @@ msgid "Other actions:"
 msgstr "Andere acties:"
 
 #: index.php:252
-#: include/functions2.php:81
+#: include/functions.php:1155
 msgid "Toggle widescreen mode"
 msgstr "Wisselen breedbeeld modus"
 
@@ -361,7 +360,7 @@ msgstr ""
 
 #: prefs.php:33
 #: prefs.php:136
-#: include/functions2.php:110
+#: include/functions.php:1184
 #: classes/pref/prefs.php:435
 msgid "Preferences"
 msgstr "Voorkeuren"
@@ -376,20 +375,19 @@ msgstr "Verlaat voorkeuren"
 
 #: prefs.php:139
 #: classes/pref/feeds.php:112
-#: classes/pref/feeds.php:1297
-#: classes/pref/feeds.php:1346
+#: classes/pref/feeds.php:1271
+#: classes/pref/feeds.php:1320
 msgid "Feeds"
 msgstr "Feeds"
 
 #: prefs.php:142
-#: classes/pref/filters.php:248
+#: classes/pref/filters.php:273
 msgid "Filters"
 msgstr "Filters"
 
 #: prefs.php:145
-#: include/functions.php:1327
-#: include/functions.php:1979
 #: classes/pref/labels.php:90
+#: classes/feeds.php:1718
 msgid "Labels"
 msgstr "Labels"
 
@@ -418,13 +416,13 @@ msgstr "Het registreren van nieuwe gebruikers is door de beheerder uitgeschakeld
 #: register.php:337
 #: register.php:347
 #: register.php:359
-#: classes/handler/public.php:742
-#: classes/handler/public.php:813
-#: classes/handler/public.php:911
-#: classes/handler/public.php:990
-#: classes/handler/public.php:1004
-#: classes/handler/public.php:1011
-#: classes/handler/public.php:1036
+#: classes/handler/public.php:653
+#: classes/handler/public.php:724
+#: classes/handler/public.php:822
+#: classes/handler/public.php:901
+#: classes/handler/public.php:915
+#: classes/handler/public.php:922
+#: classes/handler/public.php:947
 msgid "Return to Tiny Tiny RSS"
 msgstr "Ga terug naar Tiny Tiny RSS"
 
@@ -441,12 +439,12 @@ msgid "Check availability"
 msgstr "Controleer beschikbaarheid"
 
 #: register.php:229
-#: classes/handler/public.php:829
+#: classes/handler/public.php:740
 msgid "Email:"
 msgstr "E-mail:"
 
 #: register.php:232
-#: classes/handler/public.php:834
+#: classes/handler/public.php:745
 msgid "How much is two plus two:"
 msgstr "Hoeveel is twee plus twee:"
 
@@ -474,17 +472,23 @@ msgstr "Het account is met succes aangemaakt."
 msgid "New user registrations are currently closed."
 msgstr "Nieuwe gebruikersregistratie is op dit moment niet mogelijk."
 
-#: update.php:67
+#: update.php:66
 msgid "Tiny Tiny RSS data update script."
 msgstr "Tiny Tiny RSS data update script."
 
-#: include/digest.php:109
-#: include/functions.php:1336
-#: include/functions.php:1880
-#: include/functions.php:1965
-#: include/functions.php:1987
-#: classes/opml.php:421
+#: include/controls.php:83
+#: classes/pref/filters.php:242
+#: classes/pref/filters.php:253
+#: classes/pref/filters.php:544
+msgid "All feeds"
+msgstr "Alle feeds"
+
+#: include/controls.php:134
+#: include/controls.php:316
 #: classes/pref/feeds.php:228
+#: classes/opml.php:486
+#: classes/feeds.php:1727
+#: classes/digest.php:113
 msgid "Uncategorized"
 msgstr "Ongecategoriseerd"
 
@@ -499,392 +503,287 @@ msgstr[1] "%d gearchiveerde artikelen"
 msgid "No feeds found."
 msgstr "Geen feeds gevonden."
 
-#: include/functions.php:1029
+#: include/functions.php:900
 #, php-format
 msgid "%d min"
 msgstr ""
 
-#: include/functions.php:1325
-#: include/functions.php:1977
-msgid "Special"
-msgstr "Speciaal"
-
-#: include/functions.php:1828
-#: classes/pref/filters.php:229
-#: classes/pref/filters.php:507
-msgid "All feeds"
-msgstr "Alle feeds"
-
-#: include/functions.php:2032
-msgid "Starred articles"
-msgstr "Artikelen met ster"
-
-#: include/functions.php:2034
-msgid "Published articles"
-msgstr "Gepubliceerde artikelen"
-
-#: include/functions.php:2036
-msgid "Fresh articles"
-msgstr "Nieuwe artikelen"
-
-#: include/functions.php:2038
-#: include/functions2.php:105
-msgid "All articles"
-msgstr "Alle artikelen"
-
-#: include/functions.php:2040
-msgid "Archived articles"
-msgstr "Gearchiveerde artikelen"
-
-#: include/functions.php:2042
-msgid "Recently read"
-msgstr "Recent gelezen"
-
-#: include/functions2.php:57
+#: include/functions.php:1131
 msgid "Navigation"
 msgstr "Navigatie"
 
-#: include/functions2.php:58
+#: include/functions.php:1132
 msgid "Open next feed"
 msgstr "Open volgende feed"
 
-#: include/functions2.php:59
+#: include/functions.php:1133
 msgid "Open previous feed"
 msgstr "Open voorgaande feed"
 
-#: include/functions2.php:60
+#: include/functions.php:1134
 msgid "Open next article"
 msgstr "Open volgende artikel"
 
-#: include/functions2.php:61
+#: include/functions.php:1135
 msgid "Open previous article"
 msgstr "Open voorgaand artikel"
 
-#: include/functions2.php:62
+#: include/functions.php:1136
 msgid "Open next article (don't scroll long articles)"
 msgstr "Open volgend artikel (lange artikelen niet scrollen)"
 
-#: include/functions2.php:63
+#: include/functions.php:1137
 msgid "Open previous article (don't scroll long articles)"
 msgstr "Open vorig artikel (lange artikelen niet scrollen)"
 
-#: include/functions2.php:64
+#: include/functions.php:1138
 msgid "Move to next article (don't expand or mark read)"
 msgstr "Open volgend artikel (niet uitklappen of markeren als gelezen)"
 
-#: include/functions2.php:65
+#: include/functions.php:1139
 msgid "Move to previous article (don't expand or mark read)"
 msgstr "Open vorig artikel (niet uitklappen of markeren als gelezen)"
 
-#: include/functions2.php:66
+#: include/functions.php:1140
 msgid "Show search dialog"
 msgstr "Toon zoekdialoogvenster"
 
-#: include/functions2.php:67
+#: include/functions.php:1141
 msgid "Article"
 msgstr "Artikel"
 
-#: include/functions2.php:68
-#: js/viewfeed.js:1699
+#: include/functions.php:1142
+#: js/viewfeed.js:1701
 msgid "Toggle starred"
 msgstr "In/uitschakelen sterren"
 
-#: include/functions2.php:69
-#: js/viewfeed.js:1711
+#: include/functions.php:1143
+#: js/viewfeed.js:1713
 msgid "Toggle published"
 msgstr "In/uitschakelen gepubliceerd"
 
-#: include/functions2.php:70
-#: js/viewfeed.js:1686
+#: include/functions.php:1144
+#: js/viewfeed.js:1688
 msgid "Toggle unread"
 msgstr "In/uitschakelen gelezen"
 
-#: include/functions2.php:71
+#: include/functions.php:1145
 msgid "Edit tags"
 msgstr "Bewerk tags"
 
-#: include/functions2.php:72
+#: include/functions.php:1146
 msgid "Open in new window"
 msgstr "Open in nieuw venster"
 
-#: include/functions2.php:73
-#: js/viewfeed.js:1732
+#: include/functions.php:1147
+#: js/viewfeed.js:1734
 msgid "Mark below as read"
 msgstr "Hieronder markeren als gelezen"
 
-#: include/functions2.php:74
-#: js/viewfeed.js:1725
+#: include/functions.php:1148
+#: js/viewfeed.js:1727
 msgid "Mark above as read"
 msgstr "Hierboven markeren als gelezen"
 
-#: include/functions2.php:75
+#: include/functions.php:1149
 msgid "Scroll down"
 msgstr "Omlaag scrollen"
 
-#: include/functions2.php:76
+#: include/functions.php:1150
 msgid "Scroll up"
 msgstr "Omhoog scrollen"
 
-#: include/functions2.php:77
+#: include/functions.php:1151
 msgid "Select article under cursor"
 msgstr "Selecteer artikel onder de cursor"
 
-#: include/functions2.php:78
+#: include/functions.php:1152
 msgid "Email article"
 msgstr "E-mail artikel"
 
-#: include/functions2.php:79
+#: include/functions.php:1153
 msgid "Close/collapse article"
 msgstr "Sluiten/inklappen artikel"
 
-#: include/functions2.php:80
+#: include/functions.php:1154
 msgid "Toggle article expansion (combined mode)"
 msgstr "In/uitschakelen artikel uitklappen (gecombineerde modus)"
 
-#: include/functions2.php:82
+#: include/functions.php:1156
 #: plugins/embed_original/init.php:31
 msgid "Toggle embed original"
 msgstr "In/uitschakelen origineel  insluiten"
 
-#: include/functions2.php:83
+#: include/functions.php:1157
 msgid "Article selection"
 msgstr "Artikelselectie"
 
-#: include/functions2.php:84
+#: include/functions.php:1158
 msgid "Select all articles"
 msgstr "Selecteer alle artikelen"
 
-#: include/functions2.php:85
+#: include/functions.php:1159
 msgid "Select unread"
 msgstr "Selecteer ongelezen"
 
-#: include/functions2.php:86
+#: include/functions.php:1160
 msgid "Select starred"
 msgstr "Selecteer met ster"
 
-#: include/functions2.php:87
+#: include/functions.php:1161
 msgid "Select published"
 msgstr "Selecteer gepubliceerde"
 
-#: include/functions2.php:88
+#: include/functions.php:1162
 msgid "Invert selection"
 msgstr "Keer selectie om"
 
-#: include/functions2.php:89
+#: include/functions.php:1163
 msgid "Deselect everything"
 msgstr "Deselecteer alles"
 
-#: include/functions2.php:90
+#: include/functions.php:1164
 #: classes/pref/feeds.php:555
-#: classes/pref/feeds.php:823
+#: classes/pref/feeds.php:811
 msgid "Feed"
 msgstr "Feed"
 
-#: include/functions2.php:91
+#: include/functions.php:1165
 msgid "Refresh current feed"
 msgstr "Ververs huidige feed"
 
-#: include/functions2.php:92
+#: include/functions.php:1166
 msgid "Un/hide read feeds"
 msgstr "Toon/Verberg gelezen feeds"
 
-#: include/functions2.php:93
-#: classes/pref/feeds.php:1349
+#: include/functions.php:1167
+#: classes/pref/feeds.php:1323
 msgid "Subscribe to feed"
 msgstr "Abonneer op feed"
 
-#: include/functions2.php:94
+#: include/functions.php:1168
 #: js/FeedTree.js:145
-#: js/PrefFeedTree.js:72
-#: js/viewfeed.js:1853
+#: js/PrefFeedTree.js:74
+#: js/viewfeed.js:1855
 msgid "Edit feed"
 msgstr "Bewerk feed"
 
-#: include/functions2.php:96
+#: include/functions.php:1170
 msgid "Reverse headlines"
 msgstr "Draai kopteksten om"
 
-#: include/functions2.php:97
+#: include/functions.php:1171
 msgid "Toggle headline grouping"
 msgstr ""
 
-#: include/functions2.php:98
+#: include/functions.php:1172
 msgid "Debug feed update"
 msgstr "Debug feed update"
 
-#: include/functions2.php:99
+#: include/functions.php:1173
 #, fuzzy
 msgid "Debug viewfeed()"
 msgstr "Debug feed update"
 
-#: include/functions2.php:100
+#: include/functions.php:1174
 #: js/FeedTree.js:194
 msgid "Mark all feeds as read"
 msgstr "Markeer alle feeds als gelezen"
 
-#: include/functions2.php:101
+#: include/functions.php:1175
 msgid "Un/collapse current category"
 msgstr "Uit/Inklappen huidige categorie"
 
-#: include/functions2.php:102
+#: include/functions.php:1176
 msgid "Toggle combined mode"
 msgstr "In/uitschakelen gecombineerde modus"
 
-#: include/functions2.php:103
+#: include/functions.php:1177
 msgid "Toggle auto expand in combined mode"
 msgstr "In/uitschakelen automatisch uitklappen in gecombineerde modus"
 
-#: include/functions2.php:104
+#: include/functions.php:1178
 msgid "Go to"
 msgstr "Ga naar"
 
-#: include/functions2.php:106
+#: include/functions.php:1179
+#: classes/feeds.php:1602
+msgid "All articles"
+msgstr "Alle artikelen"
+
+#: include/functions.php:1180
 msgid "Fresh"
 msgstr "Nieuw"
 
-#: include/functions2.php:109
-#: js/tt-rss.js:494
-#: js/tt-rss.js:663
+#: include/functions.php:1183
+#: js/tt-rss.js:495
+#: js/tt-rss.js:664
 msgid "Tag cloud"
 msgstr "Tag wolk"
 
-#: include/functions2.php:111
+#: include/functions.php:1185
 msgid "Other"
 msgstr "Andere"
 
-#: include/functions2.php:112
+#: include/functions.php:1186
 #: classes/pref/labels.php:267
 msgid "Create label"
 msgstr "Maak label"
 
-#: include/functions2.php:113
-#: classes/pref/filters.php:753
+#: include/functions.php:1187
+#: classes/pref/filters.php:793
 msgid "Create filter"
 msgstr "Maak filter"
 
-#: include/functions2.php:114
+#: include/functions.php:1188
 msgid "Un/collapse sidebar"
 msgstr "Uit/Inklappen zijbalk"
 
-#: include/functions2.php:115
+#: include/functions.php:1189
 msgid "Show help dialog"
 msgstr "Toon helpdialoogvenster"
 
-#: include/functions2.php:670
-#, php-format
-msgid "Search results: %s"
-msgstr "Zoekresultaten: %s"
-
-#: include/functions2.php:1336
-#: classes/feeds.php:752
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] ""
-msgstr[1] ""
-
-#: include/functions2.php:1340
-#: classes/feeds.php:756
-#, fuzzy
-msgid "comments"
-msgstr "Bijlagen"
-
-#: include/functions2.php:1366
-msgid " - "
-msgstr " - "
-
-#: include/functions2.php:1397
-#: include/functions2.php:1648
-#: classes/article.php:311
-msgid "no tags"
-msgstr "geen tags"
-
-#: include/functions2.php:1407
-#: classes/feeds.php:738
-msgid "Edit tags for this article"
-msgstr "Bewerk tags voor dit artikel"
-
-#: include/functions2.php:1439
-#: classes/feeds.php:690
-msgid "Originally from:"
-msgstr "Oorspronkelijk uit:"
-
-#: include/functions2.php:1452
-#: classes/pref/feeds.php:574
-#: classes/feeds.php:703
-msgid "Feed URL"
-msgstr "Feed URL"
-
-#: include/functions2.php:1489
-#: classes/backend.php:105
-#: classes/dlg.php:37
-#: classes/dlg.php:60
-#: classes/dlg.php:93
-#: classes/dlg.php:159
-#: classes/dlg.php:186
-#: classes/pref/feeds.php:1652
-#: classes/pref/feeds.php:1718
-#: classes/pref/filters.php:204
-#: classes/pref/prefs.php:1097
-#: plugins/af_psql_trgm/init.php:102
-#: plugins/import_export/init.php:415
-#: plugins/import_export/init.php:461
-#: plugins/share/init.php:121
-msgid "Close this window"
-msgstr "Sluit dit venster"
-
-#: include/functions2.php:1686
-msgid "(edit note)"
-msgstr "(bewerk notitie)"
-
-#: include/functions2.php:1960
-msgid "unknown type"
-msgstr "onbekend type"
-
-#: include/functions2.php:2037
-msgid "Attachments"
-msgstr "Bijlagen"
-
-#: include/functions2.php:2496
+#: include/functions.php:2456
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: include/functions2.php:2497
+#: include/functions.php:2457
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: include/functions2.php:2498
+#: include/functions.php:2458
 msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
 msgstr ""
 
-#: include/functions2.php:2499
+#: include/functions.php:2459
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: include/functions2.php:2500
+#: include/functions.php:2460
 #, fuzzy
 msgid "No file was uploaded"
 msgstr "Geen bestand geupload."
 
-#: include/functions2.php:2501
+#: include/functions.php:2461
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: include/functions2.php:2502
+#: include/functions.php:2462
 msgid "Failed to write file to disk."
 msgstr ""
 
-#: include/functions2.php:2503
+#: include/functions.php:2463
 msgid "A PHP extension stopped the file upload."
 msgstr ""
 
 #: include/login_form.php:197
-#: classes/handler/public.php:569
-#: classes/handler/public.php:824
+#: classes/handler/public.php:480
+#: classes/handler/public.php:735
 msgid "Login:"
 msgstr "Aanmelden:"
 
 #: include/login_form.php:207
-#: classes/handler/public.php:572
+#: classes/handler/public.php:483
 msgid "Password:"
 msgstr "Wachtwoord:"
 
@@ -897,7 +796,7 @@ msgid "Profile:"
 msgstr "Profiel:"
 
 #: include/login_form.php:223
-#: classes/handler/public.php:311
+#: classes/handler/public.php:287
 #: classes/pref/prefs.php:1035
 #: classes/rpc.php:63
 msgid "Default profile"
@@ -916,7 +815,7 @@ msgid "Remember me"
 msgstr "Onthoud mij"
 
 #: include/login_form.php:249
-#: classes/handler/public.php:577
+#: classes/handler/public.php:488
 msgid "Log in"
 msgstr "Aanmelden"
 
@@ -935,145 +834,44 @@ msgstr "De sessie kon niet worden gevalideerd (onjuist IP)"
 msgid "Session failed to validate (password changed)"
 msgstr "De sessie kon niet worden gevalideerd (onjuist IP)"
 
-#: classes/article.php:25
-msgid "Article not found."
-msgstr "Artikel niet gevonden."
-
-#: classes/article.php:197
-msgid "Tags for this article (separated by commas):"
-msgstr "Tags voor dit artikel (komma gescheiden):"
-
-#: classes/article.php:222
-#: classes/pref/labels.php:79
-#: classes/pref/users.php:98
-#: classes/pref/feeds.php:801
-#: classes/pref/feeds.php:943
-#: classes/pref/filters.php:485
-#: classes/pref/prefs.php:981
-#: plugins/instances/init.php:245
-#: plugins/nsfw/init.php:85
-#: plugins/note/init.php:51
-#: plugins/af_readability/init.php:68
-#: plugins/af_redditimgur/init.php:60
-#: plugins/af_psql_trgm/init.php:181
-#: plugins/mail/init.php:64
-#: plugins/af_zz_imgproxy/init.php:213
-msgid "Save"
-msgstr "Opslaan"
-
-#: classes/article.php:224
-#: classes/handler/public.php:546
-#: classes/handler/public.php:580
-#: classes/pref/labels.php:81
-#: classes/pref/users.php:100
-#: classes/pref/feeds.php:802
-#: classes/pref/feeds.php:946
-#: classes/pref/feeds.php:1859
-#: classes/pref/filters.php:488
-#: classes/pref/filters.php:902
-#: classes/pref/filters.php:983
-#: classes/pref/filters.php:1076
-#: classes/pref/prefs.php:983
-#: classes/feeds.php:1105
-#: classes/feeds.php:1155
-#: classes/feeds.php:1192
-#: plugins/instances/init.php:248
-#: plugins/instances/init.php:436
-#: plugins/note/init.php:53
-#: plugins/mail/init.php:173
-msgid "Cancel"
-msgstr "Annuleren"
-
-#: classes/opml.php:28
-#: classes/opml.php:33
-msgid "OPML Utility"
-msgstr "OPML hulpprogramma"
-
-#: classes/opml.php:37
-msgid "Importing OPML..."
-msgstr "OPML aan 't importeren…"
-
-#: classes/opml.php:41
-msgid "Return to preferences"
-msgstr "Terug naar voorkeuren"
-
-#: classes/opml.php:271
-#, php-format
-msgid "Adding feed: %s"
-msgstr "Feed toevoegen: %s"
-
-#: classes/opml.php:282
-#, php-format
-msgid "Duplicate feed: %s"
-msgstr "Dubbele feed: %s"
-
-#: classes/opml.php:296
-#, php-format
-msgid "Adding label %s"
-msgstr "Toevoegen label %s"
-
-#: classes/opml.php:299
-#, php-format
-msgid "Duplicate label: %s"
-msgstr "Dubbele label: %s"
-
-#: classes/opml.php:311
-#, php-format
-msgid "Setting preference key %s to %s"
-msgstr "Instellen voorkeursleutel %s op %s"
-
-#: classes/opml.php:343
-msgid "Adding filter..."
-msgstr "Filter toevoegen..."
-
-#: classes/opml.php:421
-#, php-format
-msgid "Processing category: %s"
-msgstr "Verwerken categorie: %s"
-
-#: classes/opml.php:470
-#, php-format
-msgid "Upload failed with error code %d"
-msgstr "Upload mislukt met fout nummer %d"
-
-#: classes/opml.php:484
-#: plugins/import_export/init.php:442
-msgid "Unable to move uploaded file."
-msgstr "Kan het geüploade bestand niet verplaatsen."
-
-#: classes/opml.php:488
-#: plugins/import_export/init.php:446
-msgid "Error: please upload OPML file."
-msgstr "Fout: OPML bestand uploaden aub."
-
-#: classes/opml.php:499
-msgid "Error: unable to find moved OPML file."
-msgstr "Fout: kan het verplaatste OPML bestand niet vinden."
-
-#: classes/opml.php:506
-msgid "Error while parsing document."
-msgstr "Fout bij het parsen van het document."
-
-#: classes/backend.php:33
+#: classes/backend.php:31
 msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
 msgstr "Andere interface tips zijn te vinden in de Tiny Tiny RSS wiki."
 
-#: classes/backend.php:38
+#: classes/backend.php:36
 msgid "Keyboard Shortcuts"
 msgstr "Sneltoetscombinaties"
 
-#: classes/backend.php:61
+#: classes/backend.php:59
 msgid "Shift"
 msgstr "Shift"
 
-#: classes/backend.php:64
+#: classes/backend.php:62
 msgid "Ctrl"
 msgstr "Ctrl"
 
-#: classes/backend.php:99
+#: classes/backend.php:97
 msgid "Help topic not found."
 msgstr "Help onderwerp niet gevonden."
 
+#: classes/backend.php:103
+#: classes/dlg.php:37
+#: classes/dlg.php:60
+#: classes/dlg.php:93
+#: classes/dlg.php:159
+#: classes/dlg.php:186
+#: classes/article.php:744
+#: classes/pref/filters.php:206
+#: classes/pref/prefs.php:1097
+#: classes/pref/feeds.php:1626
+#: classes/pref/feeds.php:1692
+#: plugins/import_export/init.php:421
+#: plugins/import_export/init.php:467
+#: plugins/af_psql_trgm/init.php:102
+#: plugins/share/init.php:120
+msgid "Close this window"
+msgstr "Sluit dit venster"
+
 #: classes/dlg.php:17
 msgid "If you have imported labels and/or filters, you might need to reload preferences to see your new data."
 msgstr "Indien u labels en/of filters heeft geïmporteerd moet u waarschijnlijk te voorkeuren herladen om uw bijgewerkte gegevens te zien."
@@ -1084,7 +882,7 @@ msgstr "Uw publieke OPML URL is:"
 
 #: classes/dlg.php:57
 #: classes/dlg.php:183
-#: plugins/share/init.php:118
+#: plugins/share/init.php:117
 msgid "Generate new URL"
 msgstr "Genereer nieuwe URL"
 
@@ -1105,130 +903,225 @@ msgstr "De update daemon neemt te veel tijd om een feed bij te werken. Dit kan b
 msgid "You can view this feed as RSS using the following URL:"
 msgstr "u kunt deze feed bekijken als RSS via de volgende URL:"
 
-#: classes/handler/public.php:510
+#: classes/article.php:25
+msgid "Article not found."
+msgstr "Artikel niet gevonden."
+
+#: classes/article.php:197
+msgid "Tags for this article (separated by commas):"
+msgstr "Tags voor dit artikel (komma gescheiden):"
+
+#: classes/article.php:222
+#: classes/pref/labels.php:79
+#: classes/pref/filters.php:519
+#: classes/pref/users.php:98
+#: classes/pref/prefs.php:981
+#: classes/pref/feeds.php:789
+#: classes/pref/feeds.php:931
+#: plugins/af_psql_trgm/init.php:181
+#: plugins/nsfw/init.php:85
+#: plugins/af_readability/init.php:68
+#: plugins/mail/init.php:64
+#: plugins/af_redditimgur/init.php:60
+#: plugins/note/init.php:51
+#: plugins/af_zz_imgproxy/init.php:240
+msgid "Save"
+msgstr "Opslaan"
+
+#: classes/article.php:224
+#: classes/handler/public.php:457
+#: classes/handler/public.php:491
+#: classes/pref/labels.php:81
+#: classes/pref/filters.php:522
+#: classes/pref/filters.php:942
+#: classes/pref/filters.php:1022
+#: classes/pref/filters.php:1115
+#: classes/pref/users.php:100
+#: classes/pref/prefs.php:983
+#: classes/pref/feeds.php:790
+#: classes/pref/feeds.php:934
+#: classes/pref/feeds.php:1833
+#: classes/feeds.php:1098
+#: classes/feeds.php:1148
+#: classes/feeds.php:1185
+#: plugins/mail/init.php:173
+#: plugins/note/init.php:53
+msgid "Cancel"
+msgstr "Annuleren"
+
+#: classes/article.php:311
+#: classes/article.php:652
+#: classes/article.php:805
+msgid "no tags"
+msgstr "geen tags"
+
+#: classes/article.php:419
+msgid "unknown type"
+msgstr "onbekend type"
+
+#: classes/article.php:496
+msgid "Attachments"
+msgstr "Bijlagen"
+
+#: classes/article.php:591
+#: classes/feeds.php:741
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] ""
+msgstr[1] ""
+
+#: classes/article.php:595
+#: classes/feeds.php:745
+#, fuzzy
+msgid "comments"
+msgstr "Bijlagen"
+
+#: classes/article.php:621
+msgid " - "
+msgstr " - "
+
+#: classes/article.php:662
+#: classes/feeds.php:727
+msgid "Edit tags for this article"
+msgstr "Bewerk tags voor dit artikel"
+
+#: classes/article.php:694
+#: classes/feeds.php:681
+msgid "Originally from:"
+msgstr "Oorspronkelijk uit:"
+
+#: classes/article.php:707
+#: classes/pref/feeds.php:574
+#: classes/feeds.php:694
+msgid "Feed URL"
+msgstr "Feed URL"
+
+#: classes/article.php:843
+msgid "(edit note)"
+msgstr "(bewerk notitie)"
+
+#: classes/handler/public.php:421
 #: plugins/bookmarklets/init.php:40
 msgid "Share with Tiny Tiny RSS"
 msgstr "Deel met Tiny Tiny RSS"
 
-#: classes/handler/public.php:518
+#: classes/handler/public.php:429
 msgid "Title:"
 msgstr "Titel:"
 
-#: classes/handler/public.php:520
+#: classes/handler/public.php:431
 #: classes/pref/feeds.php:572
-#: plugins/instances/init.php:212
-#: plugins/instances/init.php:401
 msgid "URL:"
 msgstr "URL:"
 
-#: classes/handler/public.php:522
+#: classes/handler/public.php:433
 msgid "Content:"
 msgstr "Inhoud:"
 
-#: classes/handler/public.php:524
+#: classes/handler/public.php:435
 msgid "Labels:"
 msgstr "Labels:"
 
-#: classes/handler/public.php:543
+#: classes/handler/public.php:454
 msgid "Shared article will appear in the Published feed."
 msgstr "Gedeeld artikel zal verschijnen in de Gepubliceerd feed."
 
-#: classes/handler/public.php:545
+#: classes/handler/public.php:456
 msgid "Share"
 msgstr "Delen"
 
-#: classes/handler/public.php:567
+#: classes/handler/public.php:478
 msgid "Not logged in"
 msgstr "Niet ingelogd"
 
-#: classes/handler/public.php:626
+#: classes/handler/public.php:537
 msgid "Incorrect username or password"
 msgstr "Onjuiste gebruikersnaam of wachtwoord"
 
-#: classes/handler/public.php:678
+#: classes/handler/public.php:589
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "Reeds geabonneerd op <b>%s</b>."
 
-#: classes/handler/public.php:681
+#: classes/handler/public.php:592
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "Geabonneerd op  <b>%s</b>."
 
-#: classes/handler/public.php:684
+#: classes/handler/public.php:595
 #, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "Kon niet abonneren op  <b>%s</b>."
 
-#: classes/handler/public.php:687
+#: classes/handler/public.php:598
 #, php-format
 msgid "No feeds found in <b>%s</b>."
 msgstr "Geen feeds gevonden in <b>%s</b>."
 
-#: classes/handler/public.php:690
+#: classes/handler/public.php:601
 msgid "Multiple feed URLs found."
 msgstr "Meerdere feed-URL's gevonden."
 
-#: classes/handler/public.php:694
+#: classes/handler/public.php:605
 #, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr "Kon niet abonneren op  <b>%s</b>.<br>Kon de feed URL niet downloaden."
 
-#: classes/handler/public.php:712
+#: classes/handler/public.php:623
 msgid "Subscribe to selected feed"
 msgstr "Abonneren op de geselecteerde feed"
 
-#: classes/handler/public.php:737
+#: classes/handler/public.php:648
 msgid "Edit subscription options"
 msgstr "Bewerk abonnement opties"
 
-#: classes/handler/public.php:774
+#: classes/handler/public.php:685
 msgid "Password recovery"
 msgstr "Wachtwoordherstel"
 
-#: classes/handler/public.php:817
+#: classes/handler/public.php:728
 #, fuzzy
 msgid "You will need to provide valid account name and email. A password reset link will be sent to your email address."
 msgstr "Je moet een geldige naam en emailadres opgeven. Het nieuwe wachtwoord wordt naar je emailadres verzonden."
 
-#: classes/handler/public.php:839
-#: classes/pref/users.php:350
+#: classes/handler/public.php:750
+#: classes/pref/users.php:349
 msgid "Reset password"
 msgstr "Herstel wachtwoord"
 
-#: classes/handler/public.php:849
+#: classes/handler/public.php:760
 msgid "Some of the required form parameters are missing or incorrect."
 msgstr "Sommige vereiste velden ontbreken of zijn onjuist."
 
-#: classes/handler/public.php:853
-#: classes/handler/public.php:919
+#: classes/handler/public.php:764
+#: classes/handler/public.php:830
 msgid "Go back"
 msgstr "Ga terug"
 
-#: classes/handler/public.php:890
+#: classes/handler/public.php:801
 #, fuzzy
 msgid "[tt-rss] Password reset request"
 msgstr "[tt-rss] Melding verandering van wachtwoord"
 
-#: classes/handler/public.php:915
+#: classes/handler/public.php:826
 msgid "Sorry, login and email combination not found."
 msgstr "Sorry, deze combinatie van naam en wachtwoord is onbekend."
 
-#: classes/handler/public.php:937
+#: classes/handler/public.php:848
 msgid "Your access level is insufficient to run this script."
 msgstr "Uw toegangsrechten zijn niet voldoende om dit script uit te voeren."
 
-#: classes/handler/public.php:963
+#: classes/handler/public.php:874
 msgid "Database Updater"
 msgstr "Database updater"
 
-#: classes/handler/public.php:1028
+#: classes/handler/public.php:939
 msgid "Perform updates"
 msgstr "Voor de updates uit"
 
 #: classes/pref/labels.php:22
-#: classes/pref/filters.php:348
-#: classes/pref/filters.php:823
+#: classes/pref/filters.php:373
+#: classes/pref/filters.php:863
 msgid "Caption"
 msgstr "Onderschrift"
 
@@ -1250,59 +1143,55 @@ msgid "Created label <b>%s</b>"
 msgstr "Label <b>%s</b> aangemaakt"
 
 #: classes/pref/labels.php:258
-#: classes/pref/users.php:334
-#: classes/pref/feeds.php:1337
-#: classes/pref/feeds.php:1600
-#: classes/pref/feeds.php:1664
-#: classes/pref/filters.php:359
-#: classes/pref/filters.php:407
-#: classes/pref/filters.php:744
-#: classes/pref/filters.php:832
-#: classes/pref/filters.php:859
+#: classes/pref/filters.php:384
+#: classes/pref/filters.php:441
+#: classes/pref/filters.php:784
+#: classes/pref/filters.php:872
+#: classes/pref/filters.php:899
+#: classes/pref/users.php:333
 #: classes/pref/prefs.php:992
-#: plugins/instances/init.php:284
+#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1574
+#: classes/pref/feeds.php:1638
 msgid "Select"
 msgstr "Selecteer"
 
 #: classes/pref/labels.php:261
-#: classes/pref/users.php:337
-#: classes/pref/feeds.php:1340
-#: classes/pref/feeds.php:1603
-#: classes/pref/feeds.php:1667
-#: classes/pref/filters.php:362
-#: classes/pref/filters.php:410
-#: classes/pref/filters.php:747
-#: classes/pref/filters.php:835
-#: classes/pref/filters.php:862
+#: classes/pref/filters.php:387
+#: classes/pref/filters.php:444
+#: classes/pref/filters.php:787
+#: classes/pref/filters.php:875
+#: classes/pref/filters.php:902
+#: classes/pref/users.php:336
 #: classes/pref/prefs.php:995
+#: classes/pref/feeds.php:1314
+#: classes/pref/feeds.php:1577
+#: classes/pref/feeds.php:1641
 #: classes/feeds.php:102
-#: plugins/instances/init.php:287
 msgid "All"
 msgstr "Alles"
 
 #: classes/pref/labels.php:263
-#: classes/pref/users.php:339
-#: classes/pref/feeds.php:1342
-#: classes/pref/feeds.php:1605
-#: classes/pref/feeds.php:1669
-#: classes/pref/filters.php:364
-#: classes/pref/filters.php:412
-#: classes/pref/filters.php:749
-#: classes/pref/filters.php:837
-#: classes/pref/filters.php:864
+#: classes/pref/filters.php:389
+#: classes/pref/filters.php:446
+#: classes/pref/filters.php:789
+#: classes/pref/filters.php:877
+#: classes/pref/filters.php:904
+#: classes/pref/users.php:338
 #: classes/pref/prefs.php:997
+#: classes/pref/feeds.php:1316
+#: classes/pref/feeds.php:1579
+#: classes/pref/feeds.php:1643
 #: classes/feeds.php:105
-#: plugins/instances/init.php:289
 msgid "None"
 msgstr "Niets"
 
 #: classes/pref/labels.php:270
-#: classes/pref/users.php:348
+#: classes/pref/filters.php:512
+#: classes/pref/filters.php:806
+#: classes/pref/users.php:347
 #: classes/pref/feeds.php:767
-#: classes/pref/filters.php:478
-#: classes/pref/filters.php:766
-#: classes/feeds.php:1154
-#: plugins/instances/init.php:294
+#: classes/feeds.php:1147
 msgid "Remove"
 msgstr "Verwijderen"
 
@@ -1310,9 +1199,171 @@ msgstr "Verwijderen"
 msgid "Clear colors"
 msgstr "Wis kleuren"
 
+#: classes/pref/filters.php:153
+#, fuzzy
+msgid "Preview article"
+msgstr "Nieuwe artikelen"
+
+#: classes/pref/filters.php:264
+#: classes/pref/filters.php:558
+msgid "(inverse)"
+msgstr "(omgekeerd)"
+
+#: classes/pref/filters.php:260
+#: classes/pref/filters.php:557
+#, php-format
+msgid "%s on %s in %s %s"
+msgstr "%s op %s in %s %s"
+
+#: classes/pref/filters.php:379
+#: classes/pref/filters.php:867
+#: classes/pref/filters.php:981
+msgid "Match"
+msgstr "Match"
+
+#: classes/pref/filters.php:393
+#: classes/pref/filters.php:450
+#: classes/pref/filters.php:881
+#: classes/pref/filters.php:908
+msgid "Add"
+msgstr "Toevoegen"
+
+#: classes/pref/filters.php:396
+#: classes/pref/filters.php:453
+#: classes/pref/filters.php:884
+#: classes/pref/filters.php:911
+#: classes/feeds.php:122
+msgid "Delete"
+msgstr "Verwijderen"
+
+#: classes/pref/filters.php:436
+#: classes/pref/filters.php:894
+msgid "Apply actions"
+msgstr "Acties toepassen"
+
+#: classes/pref/filters.php:486
+#: classes/pref/filters.php:923
+msgid "Enabled"
+msgstr "Ingeschakeld"
+
+#: classes/pref/filters.php:495
+#: classes/pref/filters.php:926
+msgid "Match any rule"
+msgstr "Match elke regel"
+
+#: classes/pref/filters.php:504
+#: classes/pref/filters.php:929
+msgid "Inverse matching"
+msgstr "Omgekeerde matching"
+
+#: classes/pref/filters.php:516
+#: classes/pref/filters.php:936
+msgid "Test"
+msgstr "Test"
+
+#: classes/pref/filters.php:780
+#: classes/pref/users.php:323
+#: classes/pref/feeds.php:1307
+#: classes/feeds.php:1118
+#: classes/feeds.php:1184
+#: js/tt-rss.js:165
+msgid "Search"
+msgstr "Zoeken"
+
+#: classes/pref/filters.php:796
+msgid "Combine"
+msgstr "Combineren"
+
+#: classes/pref/filters.php:799
+#: classes/pref/users.php:345
+msgid "Edit"
+msgstr "Bewerken"
+
+#: classes/pref/filters.php:802
+#: classes/pref/feeds.php:1327
+#: classes/pref/feeds.php:1341
+msgid "Reset sort order"
+msgstr "Herstel sorteervolgorde"
+
+#: classes/pref/filters.php:810
+#: classes/pref/feeds.php:1363
+msgid "Rescore articles"
+msgstr "Artikelen nieuwe score geven"
+
+#: classes/pref/filters.php:939
+msgid "Create"
+msgstr "Aanmaken"
+
+#: classes/pref/filters.php:993
+msgid "Inverse regular expression matching"
+msgstr "Omgekeerde regular expression matching"
+
+#: classes/pref/filters.php:995
+msgid "on field"
+msgstr "op veld"
+
+#: classes/pref/filters.php:1001
+#: js/PrefFilterTree.js:64
+msgid "in"
+msgstr "in"
+
+#: classes/pref/filters.php:1014
+#, fuzzy
+msgid "Wiki: Filters"
+msgstr "Filters"
+
+#: classes/pref/filters.php:1019
+msgid "Save rule"
+msgstr "Regel opslaan"
+
+#: classes/pref/filters.php:1019
+#: js/functions.js:865
+msgid "Add rule"
+msgstr "Regel toevoegen"
+
+#: classes/pref/filters.php:1042
+msgid "Perform Action"
+msgstr "Actie uitvoeren"
+
+#: classes/pref/filters.php:1093
+#, fuzzy
+msgid "No actions available"
+msgstr "Nieuwe versie beschikbaar!"
+
+#: classes/pref/filters.php:1112
+msgid "Save action"
+msgstr "Actie opslaan"
+
+#: classes/pref/filters.php:1112
+#: js/functions.js:887
+msgid "Add action"
+msgstr "Actie toevoegen"
+
+#: classes/pref/filters.php:1136
+msgid "[No caption]"
+msgstr "[Geen onderschrift]"
+
+#: classes/pref/filters.php:1138
+#, fuzzy, php-format
+msgid "%s (%d rule)"
+msgid_plural "%s (%d rules)"
+msgstr[0] "Regel toevoegen"
+msgstr[1] "Regel toevoegen"
+
+#: classes/pref/filters.php:1153
+#, fuzzy
+msgid "matches any rule"
+msgstr "Match elke regel"
+
+#: classes/pref/filters.php:1156
+#, fuzzy, php-format
+msgid "%s (+%d action)"
+msgid_plural "%s (+%d actions)"
+msgstr[0] "Actie toevoegen"
+msgstr[1] "Actie toevoegen"
+
 #: classes/pref/users.php:6
 #: classes/pref/system.php:8
-#: plugins/instances/init.php:154
 msgid "Your access level is insufficient to open this tab."
 msgstr "Uw toegangsniveau is niet toereikend om deze tab te openen."
 
@@ -1323,8 +1374,8 @@ msgstr "Bewerk regel"
 
 #: classes/pref/users.php:56
 #: classes/pref/feeds.php:637
-#: classes/pref/feeds.php:878
-#: classes/feeds.php:1075
+#: classes/pref/feeds.php:866
+#: classes/feeds.php:1068
 msgid "Authentication"
 msgstr "Authenticatie"
 
@@ -1334,7 +1385,7 @@ msgstr "Toegangsniveau:"
 
 #: classes/pref/users.php:77
 #: classes/pref/feeds.php:667
-#: classes/pref/feeds.php:896
+#: classes/pref/feeds.php:884
 msgid "Options"
 msgstr "Opties"
 
@@ -1348,7 +1399,7 @@ msgid "User not found"
 msgstr "Gebruiker niet gevonden"
 
 #: classes/pref/users.php:132
-#: classes/pref/users.php:400
+#: classes/pref/users.php:399
 msgid "Registered"
 msgstr "Geregistreerd"
 
@@ -1366,7 +1417,7 @@ msgid "Stored articles"
 msgstr "Artikelen met ster"
 
 #: classes/pref/users.php:145
-#: classes/pref/users.php:399
+#: classes/pref/users.php:398
 msgid "Subscribed feeds"
 msgstr "Geabonneerde feeds"
 
@@ -1385,508 +1436,57 @@ msgstr "Kon gebruiker <b>%s</b> niet aanmaken"
 msgid "User <b>%s</b> already exists."
 msgstr "Gebruiker <b>%s</b> bestaat al."
 
-#: classes/pref/users.php:265
+#: classes/pref/users.php:264
 #, php-format
 msgid "Changed password of user <b>%s</b> to <b>%s</b>"
 msgstr "Wachtwoord van gebruiker<b>%s</b> naar <b>%s</b> gewijzigd"
 
-#: classes/pref/users.php:267
+#: classes/pref/users.php:266
 #, php-format
 msgid "Sending new password of user <b>%s</b> to <b>%s</b>"
 msgstr "Wachtwoord van gebruiker<b>%s</b>naar <b>%s</b> versturen"
 
-#: classes/pref/users.php:291
+#: classes/pref/users.php:290
 msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] Melding verandering van wachtwoord"
 
-#: classes/pref/users.php:324
-#: classes/pref/feeds.php:1333
-#: classes/pref/filters.php:740
-#: classes/feeds.php:1125
-#: classes/feeds.php:1191
-#: js/tt-rss.js:165
-msgid "Search"
-msgstr "Zoeken"
-
-#: classes/pref/users.php:342
+#: classes/pref/users.php:341
 msgid "Create user"
 msgstr "Gebruiker aanmaken"
 
-#: classes/pref/users.php:346
-#: classes/pref/filters.php:759
-#: plugins/instances/init.php:293
-msgid "Edit"
-msgstr "Bewerken"
-
-#: classes/pref/users.php:397
+#: classes/pref/users.php:396
 #: classes/pref/feeds.php:643
-#: classes/pref/feeds.php:882
-#: classes/pref/feeds.php:1836
-#: classes/feeds.php:1079
+#: classes/pref/feeds.php:870
+#: classes/pref/feeds.php:1810
+#: classes/feeds.php:1072
 msgid "Login"
 msgstr "LoginID"
 
-#: classes/pref/users.php:398
+#: classes/pref/users.php:397
 msgid "Access Level"
 msgstr "Toegangsniveau"
 
-#: classes/pref/users.php:401
+#: classes/pref/users.php:400
 msgid "Last login"
 msgstr "Laatste loginID"
 
-#: classes/pref/users.php:420
-#: plugins/instances/init.php:334
+#: classes/pref/users.php:419
 msgid "Click to edit"
 msgstr "Klik om te bewerken"
 
-#: classes/pref/users.php:441
+#: classes/pref/users.php:440
 msgid "No users defined."
 msgstr "Geen gebruikers gedefinieerd."
 
-#: classes/pref/users.php:443
+#: classes/pref/users.php:442
 msgid "No matching users found."
 msgstr "Geen overeenkomstige gebruikers gevonden."
 
-#: classes/pref/system.php:29
-msgid "Error Log"
-msgstr "Fouten Log"
-
-#: classes/pref/system.php:40
-msgid "Refresh"
-msgstr "Herlaad"
-
-#: classes/pref/system.php:43
-#, fuzzy
-msgid "Clear log"
-msgstr "Wis kleuren"
-
-#: classes/pref/system.php:48
-msgid "Error"
-msgstr "Fout"
-
-#: classes/pref/system.php:49
-msgid "Filename"
-msgstr "Bestandsnaam"
-
-#: classes/pref/system.php:50
-msgid "Message"
-msgstr "Bericht"
-
-#: classes/pref/system.php:52
-msgid "Date"
-msgstr "Datum"
-
-#: classes/pref/feeds.php:15
-msgid "Check to enable field"
-msgstr "Aanvinken om veld in te schakelen"
-
-#: classes/pref/feeds.php:65
-#: classes/pref/feeds.php:214
-#: classes/pref/feeds.php:258
-#: classes/pref/feeds.php:264
-#: classes/pref/feeds.php:290
-#, fuzzy, php-format
-msgid "(%d feed)"
-msgid_plural "(%d feeds)"
-msgstr[0] "(%d feeds)"
-msgstr[1] "(%d feeds)"
-
-#: classes/pref/feeds.php:537
 #: classes/pref/prefs.php:18
+#: classes/pref/feeds.php:537
 msgid "General"
 msgstr "Algemeen"
 
-#: classes/pref/feeds.php:561
-msgid "Feed Title"
-msgstr "Feed titel"
-
-#: classes/pref/feeds.php:595
-#: classes/pref/feeds.php:830
-#: classes/pref/feeds.php:1822
-#: classes/feeds.php:1055
-msgid "Place in category:"
-msgstr "Plaats in categorie:"
-
-#: classes/pref/feeds.php:608
-#: classes/pref/feeds.php:844
-#, fuzzy
-msgid "Language:"
-msgstr "Taal"
-
-#: classes/pref/feeds.php:615
-#: classes/pref/feeds.php:853
-msgid "Update"
-msgstr "Bijwerken"
-
-#: classes/pref/feeds.php:630
-#: classes/pref/feeds.php:869
-msgid "Article purging:"
-msgstr "Artikelopschoning:"
-
-#: classes/pref/feeds.php:658
-#: classes/pref/feeds.php:890
-#: classes/pref/feeds.php:1839
-#: classes/pref/prefs.php:245
-#: classes/feeds.php:1083
-msgid "Password"
-msgstr "Wachtwoord"
-
-#: classes/pref/feeds.php:662
-msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
-msgstr "<b>Hint:</b> U moet uw aanmeld informatie invullen als uw feed authenticatie vereist, behalve voor Twitter feeds."
-
-#: classes/pref/feeds.php:681
-#: classes/pref/feeds.php:900
-msgid "Hide from Popular feeds"
-msgstr "Verbergen voor populaire feeds"
-
-#: classes/pref/feeds.php:693
-#: classes/pref/feeds.php:906
-msgid "Include in e-mail digest"
-msgstr "Toevoegen aan e-mail samenvatting"
-
-#: classes/pref/feeds.php:706
-#: classes/pref/feeds.php:912
-msgid "Always display image attachments"
-msgstr "Altijd afbeeldingsbijlagen weergeven"
-
-#: classes/pref/feeds.php:719
-#: classes/pref/feeds.php:920
-msgid "Do not embed images"
-msgstr "Afbeeldingen niet insluiten."
-
-#: classes/pref/feeds.php:732
-#: classes/pref/feeds.php:928
-msgid "Cache media"
-msgstr ""
-
-#: classes/pref/feeds.php:744
-#: classes/pref/feeds.php:934
-msgid "Mark updated articles as unread"
-msgstr "Markeer bijgewerkte artikelen als niet-gelezen"
-
-#: classes/pref/feeds.php:748
-msgid "Icon"
-msgstr "Pictogram"
-
-#: classes/pref/feeds.php:765
-msgid "Replace"
-msgstr "Vervangen"
-
-#: classes/pref/feeds.php:772
-#: classes/pref/prefs.php:698
-msgid "Plugins"
-msgstr "Plug-ins"
-
-#: classes/pref/feeds.php:792
-msgid "Resubscribe to push updates"
-msgstr "Herabonneren voor push updates"
-
-#: classes/pref/feeds.php:799
-msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
-msgstr "Herstelt PubSubHubbub abonnement status voor gepushte feeds."
-
-#: classes/pref/feeds.php:1200
-#: classes/pref/feeds.php:1253
-msgid "All done."
-msgstr "Alles gedaan."
-
-#: classes/pref/feeds.php:1308
-msgid "Feeds with errors"
-msgstr "Feeds met fouten"
-
-#: classes/pref/feeds.php:1315
-msgid "Inactive feeds"
-msgstr "Inactieve feeds"
-
-#: classes/pref/feeds.php:1351
-msgid "Edit selected feeds"
-msgstr "Bewerk geselecteerde feeds"
-
-#: classes/pref/feeds.php:1353
-#: classes/pref/feeds.php:1367
-#: classes/pref/filters.php:762
-msgid "Reset sort order"
-msgstr "Herstel sorteervolgorde"
-
-#: classes/pref/feeds.php:1355
-#: js/prefs.js:1622
-msgid "Batch subscribe"
-msgstr "Batchmatig abonneren"
-
-#: classes/pref/feeds.php:1362
-msgid "Categories"
-msgstr "Categorieën"
-
-#: classes/pref/feeds.php:1365
-msgid "Add category"
-msgstr "Categorie toevoegen"
-
-#: classes/pref/feeds.php:1369
-msgid "Remove selected"
-msgstr "Verwijder geselecteerde"
-
-#: classes/pref/feeds.php:1380
-msgid "More actions..."
-msgstr "Meer acties…"
-
-#: classes/pref/feeds.php:1384
-msgid "Manual purge"
-msgstr "Handmatig opschonen"
-
-#: classes/pref/feeds.php:1388
-msgid "Clear feed data"
-msgstr "Wis feed data"
-
-#: classes/pref/feeds.php:1389
-#: classes/pref/filters.php:770
-msgid "Rescore articles"
-msgstr "Artikelen nieuwe score geven"
-
-#: classes/pref/feeds.php:1442
-msgid "OPML"
-msgstr "OPML"
-
-#: classes/pref/feeds.php:1444
-msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
-msgstr "Met OPML kunt u feeds, filters, labels en Tiny Tiny RSS instellingen exporteren en importeren."
-
-#: classes/pref/feeds.php:1445
-msgid "Only main settings profile can be migrated using OPML."
-msgstr "Alleen instellingen van het hoofdprofiel kunnen worden overgebracht met OPML."
-
-#: classes/pref/feeds.php:1458
-msgid "Import my OPML"
-msgstr "Importeer mijn OPML"
-
-#: classes/pref/feeds.php:1464
-msgid "Filename:"
-msgstr "Bestandsnaam:"
-
-#: classes/pref/feeds.php:1466
-msgid "Include settings"
-msgstr "Toevoegingsinstellingen"
-
-#: classes/pref/feeds.php:1470
-msgid "Export OPML"
-msgstr "OPML exporteren"
-
-#: classes/pref/feeds.php:1474
-msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
-msgstr "Uw OPML kan openbaar worden gepubliceerd en er kan op worden geabonneerd door iedereen die de URL hieronder kent."
-
-#: classes/pref/feeds.php:1478
-msgid "Public OPML URL"
-msgstr "Publieke OPML URL"
-
-#: classes/pref/feeds.php:1479
-msgid "Display published OPML URL"
-msgstr "Gepubliceerde OPML URL weergeven"
-
-#: classes/pref/feeds.php:1488
-msgid "Firefox integration"
-msgstr "Firefox integratie"
-
-#: classes/pref/feeds.php:1490
-msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
-msgstr "Deze Tiny Tiny RSS site kan gebruikt worden als een Firefox Feed Reader door op de link hieronder te klikken."
-
-#: classes/pref/feeds.php:1497
-msgid "Click here to register this site as a feed reader."
-msgstr "Klik hier om deze site te registreren als een feed reader."
-
-#: classes/pref/feeds.php:1505
-msgid "Published & shared articles / Generated feeds"
-msgstr "Gepubliceerde & gedeelde artikelen / Gegenereerde feeds"
-
-#: classes/pref/feeds.php:1507
-msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
-msgstr "Gepubliceerde artikelen worden geëxporteerd als publieke RSS-feed en er kan door iedereen die de URL hieronder kent op worden geabonneerd."
-
-#: classes/pref/feeds.php:1514
-#: classes/feeds.php:54
-#: classes/feeds.php:140
-msgid "View as RSS"
-msgstr "Toon als RSS"
-
-#: classes/pref/feeds.php:1515
-msgid "Display URL"
-msgstr "Toon URL"
-
-#: classes/pref/feeds.php:1518
-msgid "Clear all generated URLs"
-msgstr "Wis alle gegenereerde URL's"
-
-#: classes/pref/feeds.php:1596
-msgid "These feeds have not been updated with new content for 3 months (oldest first):"
-msgstr "Deze feeds hebben al 3 maanden geen nieuwe inhoud (oudste eerst):"
-
-#: classes/pref/feeds.php:1630
-#: classes/pref/feeds.php:1694
-msgid "Click to edit feed"
-msgstr "Klik om feed te bewerken"
-
-#: classes/pref/feeds.php:1648
-#: classes/pref/feeds.php:1714
-msgid "Unsubscribe from selected feeds"
-msgstr "Abonnement opzeggen voor geselecteerde feeds"
-
-#: classes/pref/feeds.php:1819
-msgid "Add one valid RSS feed per line (no feed detection is done)"
-msgstr "Een geldige RSS feed per regel toevoegen (er wordt geen feed detectie uitgevoerd)"
-
-#: classes/pref/feeds.php:1828
-msgid "Feeds to subscribe, One per line"
-msgstr "Te abonneren feeds: één per regel"
-
-#: classes/pref/feeds.php:1851
-msgid "Feeds require authentication."
-msgstr "Feeds vereisen authenticatie."
-
-#: classes/pref/feeds.php:1858
-#: classes/feeds.php:1099
-#: classes/feeds.php:1153
-msgid "Subscribe"
-msgstr "Abonneren"
-
-#: classes/pref/filters.php:151
-#, fuzzy
-msgid "Preview article"
-msgstr "Nieuwe artikelen"
-
-#: classes/pref/filters.php:239
-#: classes/pref/filters.php:518
-msgid "(inverse)"
-msgstr "(omgekeerd)"
-
-#: classes/pref/filters.php:235
-#: classes/pref/filters.php:517
-#, php-format
-msgid "%s on %s in %s %s"
-msgstr "%s op %s in %s %s"
-
-#: classes/pref/filters.php:354
-#: classes/pref/filters.php:827
-#: classes/pref/filters.php:942
-msgid "Match"
-msgstr "Match"
-
-#: classes/pref/filters.php:368
-#: classes/pref/filters.php:416
-#: classes/pref/filters.php:841
-#: classes/pref/filters.php:868
-msgid "Add"
-msgstr "Toevoegen"
-
-#: classes/pref/filters.php:371
-#: classes/pref/filters.php:419
-#: classes/pref/filters.php:844
-#: classes/pref/filters.php:871
-#: classes/feeds.php:122
-msgid "Delete"
-msgstr "Verwijderen"
-
-#: classes/pref/filters.php:402
-#: classes/pref/filters.php:854
-msgid "Apply actions"
-msgstr "Acties toepassen"
-
-#: classes/pref/filters.php:452
-#: classes/pref/filters.php:883
-msgid "Enabled"
-msgstr "Ingeschakeld"
-
-#: classes/pref/filters.php:461
-#: classes/pref/filters.php:886
-msgid "Match any rule"
-msgstr "Match elke regel"
-
-#: classes/pref/filters.php:470
-#: classes/pref/filters.php:889
-msgid "Inverse matching"
-msgstr "Omgekeerde matching"
-
-#: classes/pref/filters.php:482
-#: classes/pref/filters.php:896
-msgid "Test"
-msgstr "Test"
-
-#: classes/pref/filters.php:756
-msgid "Combine"
-msgstr "Combineren"
-
-#: classes/pref/filters.php:899
-msgid "Create"
-msgstr "Aanmaken"
-
-#: classes/pref/filters.php:954
-msgid "Inverse regular expression matching"
-msgstr "Omgekeerde regular expression matching"
-
-#: classes/pref/filters.php:956
-msgid "on field"
-msgstr "op veld"
-
-#: classes/pref/filters.php:962
-#: js/PrefFilterTree.js:64
-msgid "in"
-msgstr "in"
-
-#: classes/pref/filters.php:975
-#, fuzzy
-msgid "Wiki: Filters"
-msgstr "Filters"
-
-#: classes/pref/filters.php:980
-msgid "Save rule"
-msgstr "Regel opslaan"
-
-#: classes/pref/filters.php:980
-#: js/functions.js:865
-msgid "Add rule"
-msgstr "Regel toevoegen"
-
-#: classes/pref/filters.php:1003
-msgid "Perform Action"
-msgstr "Actie uitvoeren"
-
-#: classes/pref/filters.php:1054
-#, fuzzy
-msgid "No actions available"
-msgstr "Nieuwe versie beschikbaar!"
-
-#: classes/pref/filters.php:1073
-msgid "Save action"
-msgstr "Actie opslaan"
-
-#: classes/pref/filters.php:1073
-#: js/functions.js:887
-msgid "Add action"
-msgstr "Actie toevoegen"
-
-#: classes/pref/filters.php:1097
-msgid "[No caption]"
-msgstr "[Geen onderschrift]"
-
-#: classes/pref/filters.php:1099
-#, fuzzy, php-format
-msgid "%s (%d rule)"
-msgid_plural "%s (%d rules)"
-msgstr[0] "Regel toevoegen"
-msgstr[1] "Regel toevoegen"
-
-#: classes/pref/filters.php:1114
-#, fuzzy
-msgid "matches any rule"
-msgstr "Match elke regel"
-
-#: classes/pref/filters.php:1117
-#, fuzzy, php-format
-msgid "%s (+%d action)"
-msgid_plural "%s (+%d actions)"
-msgstr[0] "Actie toevoegen"
-msgstr[1] "Actie toevoegen"
-
 #: classes/pref/prefs.php:19
 msgid "Interface"
 msgstr "Interface"
@@ -2060,7 +1660,7 @@ msgid "Strip all but most common HTML tags when reading articles."
 msgstr "Verwijder alles behalve de meest algemene HTML tags bij het lezen van artikelen."
 
 #: classes/pref/prefs.php:53
-#: js/prefs.js:1584
+#: js/prefs.js:1580
 msgid "Customize stylesheet"
 msgstr "Aanpassen opmaakmodel"
 
@@ -2128,6 +1728,14 @@ msgstr "Toegangsniveau"
 msgid "Save data"
 msgstr "Gegevens opslaan"
 
+#: classes/pref/prefs.php:245
+#: classes/pref/feeds.php:658
+#: classes/pref/feeds.php:878
+#: classes/pref/feeds.php:1813
+#: classes/feeds.php:1076
+msgid "Password"
+msgstr "Wachtwoord"
+
 #: classes/pref/prefs.php:254
 msgid "Your password is at default value, please change it."
 msgstr "Uw wachtwoord staat op de standaard waarde. Verander het aub."
@@ -2226,18 +1834,23 @@ msgstr "Profielbeheer"
 msgid "Reset to defaults"
 msgstr "Terugzetten naar de standaardwaarden"
 
+#: classes/pref/prefs.php:698
+#: classes/pref/feeds.php:772
+msgid "Plugins"
+msgstr "Plug-ins"
+
 #: classes/pref/prefs.php:700
 msgid "You will need to reload Tiny Tiny RSS for plugin changes to take effect."
 msgstr "Je moet Tiny Tiny RSS herladen om wijzigingen te kunnen zien."
 
-#: classes/pref/prefs.php:702
-msgid "Download more plugins at tt-rss.org <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forums</a> or <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a>."
-msgstr "Download meer plugins van tt-rss.org <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forum</a> of <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a>."
-
-#: classes/pref/prefs.php:732
+#: classes/pref/prefs.php:730
 msgid "System plugins"
 msgstr "Systeem plug-ins"
 
+#: classes/pref/prefs.php:731
+msgid "System plugins are enabled in <strong>config.php</strong> for all users."
+msgstr ""
+
 #: classes/pref/prefs.php:736
 #: classes/pref/prefs.php:792
 msgid "Plugin"
@@ -2307,6 +1920,341 @@ msgstr "Verwijder geselecteerde profielen"
 msgid "Activate profile"
 msgstr "Activeer profiel"
 
+#: classes/pref/feeds.php:15
+msgid "Check to enable field"
+msgstr "Aanvinken om veld in te schakelen"
+
+#: classes/pref/feeds.php:65
+#: classes/pref/feeds.php:214
+#: classes/pref/feeds.php:258
+#: classes/pref/feeds.php:264
+#: classes/pref/feeds.php:290
+#, fuzzy, php-format
+msgid "(%d feed)"
+msgid_plural "(%d feeds)"
+msgstr[0] "(%d feeds)"
+msgstr[1] "(%d feeds)"
+
+#: classes/pref/feeds.php:561
+msgid "Feed Title"
+msgstr "Feed titel"
+
+#: classes/pref/feeds.php:595
+#: classes/pref/feeds.php:818
+#: classes/pref/feeds.php:1796
+#: classes/feeds.php:1048
+msgid "Place in category:"
+msgstr "Plaats in categorie:"
+
+#: classes/pref/feeds.php:608
+#: classes/pref/feeds.php:832
+#, fuzzy
+msgid "Language:"
+msgstr "Taal"
+
+#: classes/pref/feeds.php:615
+#: classes/pref/feeds.php:841
+msgid "Update"
+msgstr "Bijwerken"
+
+#: classes/pref/feeds.php:630
+#: classes/pref/feeds.php:857
+msgid "Article purging:"
+msgstr "Artikelopschoning:"
+
+#: classes/pref/feeds.php:662
+msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
+msgstr "<b>Hint:</b> U moet uw aanmeld informatie invullen als uw feed authenticatie vereist, behalve voor Twitter feeds."
+
+#: classes/pref/feeds.php:681
+#: classes/pref/feeds.php:888
+msgid "Hide from Popular feeds"
+msgstr "Verbergen voor populaire feeds"
+
+#: classes/pref/feeds.php:693
+#: classes/pref/feeds.php:894
+msgid "Include in e-mail digest"
+msgstr "Toevoegen aan e-mail samenvatting"
+
+#: classes/pref/feeds.php:706
+#: classes/pref/feeds.php:900
+msgid "Always display image attachments"
+msgstr "Altijd afbeeldingsbijlagen weergeven"
+
+#: classes/pref/feeds.php:719
+#: classes/pref/feeds.php:908
+msgid "Do not embed images"
+msgstr "Afbeeldingen niet insluiten."
+
+#: classes/pref/feeds.php:732
+#: classes/pref/feeds.php:916
+msgid "Cache media"
+msgstr ""
+
+#: classes/pref/feeds.php:744
+#: classes/pref/feeds.php:922
+msgid "Mark updated articles as unread"
+msgstr "Markeer bijgewerkte artikelen als niet-gelezen"
+
+#: classes/pref/feeds.php:748
+msgid "Icon"
+msgstr "Pictogram"
+
+#: classes/pref/feeds.php:765
+msgid "Replace"
+msgstr "Vervangen"
+
+#: classes/pref/feeds.php:1174
+#: classes/pref/feeds.php:1227
+msgid "All done."
+msgstr "Alles gedaan."
+
+#: classes/pref/feeds.php:1282
+msgid "Feeds with errors"
+msgstr "Feeds met fouten"
+
+#: classes/pref/feeds.php:1289
+msgid "Inactive feeds"
+msgstr "Inactieve feeds"
+
+#: classes/pref/feeds.php:1325
+msgid "Edit selected feeds"
+msgstr "Bewerk geselecteerde feeds"
+
+#: classes/pref/feeds.php:1329
+#: js/prefs.js:1618
+msgid "Batch subscribe"
+msgstr "Batchmatig abonneren"
+
+#: classes/pref/feeds.php:1336
+msgid "Categories"
+msgstr "Categorieën"
+
+#: classes/pref/feeds.php:1339
+msgid "Add category"
+msgstr "Categorie toevoegen"
+
+#: classes/pref/feeds.php:1343
+msgid "Remove selected"
+msgstr "Verwijder geselecteerde"
+
+#: classes/pref/feeds.php:1354
+msgid "More actions..."
+msgstr "Meer acties…"
+
+#: classes/pref/feeds.php:1358
+msgid "Manual purge"
+msgstr "Handmatig opschonen"
+
+#: classes/pref/feeds.php:1362
+msgid "Clear feed data"
+msgstr "Wis feed data"
+
+#: classes/pref/feeds.php:1416
+msgid "OPML"
+msgstr "OPML"
+
+#: classes/pref/feeds.php:1418
+msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
+msgstr "Met OPML kunt u feeds, filters, labels en Tiny Tiny RSS instellingen exporteren en importeren."
+
+#: classes/pref/feeds.php:1419
+msgid "Only main settings profile can be migrated using OPML."
+msgstr "Alleen instellingen van het hoofdprofiel kunnen worden overgebracht met OPML."
+
+#: classes/pref/feeds.php:1432
+msgid "Import my OPML"
+msgstr "Importeer mijn OPML"
+
+#: classes/pref/feeds.php:1438
+msgid "Filename:"
+msgstr "Bestandsnaam:"
+
+#: classes/pref/feeds.php:1440
+msgid "Include settings"
+msgstr "Toevoegingsinstellingen"
+
+#: classes/pref/feeds.php:1444
+msgid "Export OPML"
+msgstr "OPML exporteren"
+
+#: classes/pref/feeds.php:1448
+msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
+msgstr "Uw OPML kan openbaar worden gepubliceerd en er kan op worden geabonneerd door iedereen die de URL hieronder kent."
+
+#: classes/pref/feeds.php:1452
+msgid "Public OPML URL"
+msgstr "Publieke OPML URL"
+
+#: classes/pref/feeds.php:1453
+msgid "Display published OPML URL"
+msgstr "Gepubliceerde OPML URL weergeven"
+
+#: classes/pref/feeds.php:1462
+msgid "Firefox integration"
+msgstr "Firefox integratie"
+
+#: classes/pref/feeds.php:1464
+msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
+msgstr "Deze Tiny Tiny RSS site kan gebruikt worden als een Firefox Feed Reader door op de link hieronder te klikken."
+
+#: classes/pref/feeds.php:1471
+msgid "Click here to register this site as a feed reader."
+msgstr "Klik hier om deze site te registreren als een feed reader."
+
+#: classes/pref/feeds.php:1479
+msgid "Published & shared articles / Generated feeds"
+msgstr "Gepubliceerde & gedeelde artikelen / Gegenereerde feeds"
+
+#: classes/pref/feeds.php:1481
+msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
+msgstr "Gepubliceerde artikelen worden geëxporteerd als publieke RSS-feed en er kan door iedereen die de URL hieronder kent op worden geabonneerd."
+
+#: classes/pref/feeds.php:1488
+#: classes/feeds.php:54
+#: classes/feeds.php:140
+msgid "View as RSS"
+msgstr "Toon als RSS"
+
+#: classes/pref/feeds.php:1489
+msgid "Display URL"
+msgstr "Toon URL"
+
+#: classes/pref/feeds.php:1492
+msgid "Clear all generated URLs"
+msgstr "Wis alle gegenereerde URL's"
+
+#: classes/pref/feeds.php:1570
+msgid "These feeds have not been updated with new content for 3 months (oldest first):"
+msgstr "Deze feeds hebben al 3 maanden geen nieuwe inhoud (oudste eerst):"
+
+#: classes/pref/feeds.php:1604
+#: classes/pref/feeds.php:1668
+msgid "Click to edit feed"
+msgstr "Klik om feed te bewerken"
+
+#: classes/pref/feeds.php:1622
+#: classes/pref/feeds.php:1688
+msgid "Unsubscribe from selected feeds"
+msgstr "Abonnement opzeggen voor geselecteerde feeds"
+
+#: classes/pref/feeds.php:1793
+msgid "Add one valid RSS feed per line (no feed detection is done)"
+msgstr "Een geldige RSS feed per regel toevoegen (er wordt geen feed detectie uitgevoerd)"
+
+#: classes/pref/feeds.php:1802
+msgid "Feeds to subscribe, One per line"
+msgstr "Te abonneren feeds: één per regel"
+
+#: classes/pref/feeds.php:1825
+msgid "Feeds require authentication."
+msgstr "Feeds vereisen authenticatie."
+
+#: classes/pref/feeds.php:1832
+#: classes/feeds.php:1092
+#: classes/feeds.php:1146
+msgid "Subscribe"
+msgstr "Abonneren"
+
+#: classes/pref/system.php:29
+msgid "Error Log"
+msgstr "Fouten Log"
+
+#: classes/pref/system.php:40
+msgid "Refresh"
+msgstr "Herlaad"
+
+#: classes/pref/system.php:43
+#, fuzzy
+msgid "Clear log"
+msgstr "Wis kleuren"
+
+#: classes/pref/system.php:48
+msgid "Error"
+msgstr "Fout"
+
+#: classes/pref/system.php:49
+msgid "Filename"
+msgstr "Bestandsnaam"
+
+#: classes/pref/system.php:50
+msgid "Message"
+msgstr "Bericht"
+
+#: classes/pref/system.php:52
+msgid "Date"
+msgstr "Datum"
+
+#: classes/opml.php:28
+#: classes/opml.php:33
+msgid "OPML Utility"
+msgstr "OPML hulpprogramma"
+
+#: classes/opml.php:37
+msgid "Importing OPML..."
+msgstr "OPML aan 't importeren…"
+
+#: classes/opml.php:41
+msgid "Return to preferences"
+msgstr "Terug naar voorkeuren"
+
+#: classes/opml.php:295
+#, php-format
+msgid "Adding feed: %s"
+msgstr "Feed toevoegen: %s"
+
+#: classes/opml.php:306
+#, php-format
+msgid "Duplicate feed: %s"
+msgstr "Dubbele feed: %s"
+
+#: classes/opml.php:320
+#, php-format
+msgid "Adding label %s"
+msgstr "Toevoegen label %s"
+
+#: classes/opml.php:323
+#, php-format
+msgid "Duplicate label: %s"
+msgstr "Dubbele label: %s"
+
+#: classes/opml.php:335
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr "Instellen voorkeursleutel %s op %s"
+
+#: classes/opml.php:367
+msgid "Adding filter..."
+msgstr "Filter toevoegen..."
+
+#: classes/opml.php:486
+#, php-format
+msgid "Processing category: %s"
+msgstr "Verwerken categorie: %s"
+
+#: classes/opml.php:532
+#, php-format
+msgid "Upload failed with error code %d"
+msgstr "Upload mislukt met fout nummer %d"
+
+#: classes/opml.php:544
+#: plugins/import_export/init.php:448
+msgid "Unable to move uploaded file."
+msgstr "Kan het geüploade bestand niet verplaatsen."
+
+#: classes/opml.php:548
+#: plugins/import_export/init.php:452
+msgid "Error: please upload OPML file."
+msgstr "Fout: OPML bestand uploaden aub."
+
+#: classes/opml.php:559
+msgid "Error: unable to find moved OPML file."
+msgstr "Fout: kan het verplaatste OPML bestand niet vinden."
+
+#: classes/opml.php:566
+msgid "Error while parsing document."
+msgstr "Fout bij het parsen van het document."
+
 #: classes/feeds.php:53
 msgid "View as RSS feed"
 msgstr "Toon als RSS feed"
@@ -2347,8 +2295,8 @@ msgstr "Terugzetten"
 
 #: classes/feeds.php:127
 #: classes/feeds.php:132
-#: plugins/mail/init.php:75
 #: plugins/mailto/init.php:25
+#: plugins/mail/init.php:75
 msgid "Forward by email"
 msgstr "Doorsturen per e-mail"
 
@@ -2356,320 +2304,147 @@ msgstr "Doorsturen per e-mail"
 msgid "Feed:"
 msgstr "Feed:"
 
-#: classes/feeds.php:229
-#: classes/feeds.php:892
+#: classes/feeds.php:228
+#: classes/feeds.php:885
 msgid "Feed not found."
 msgstr "Feed niet gevonden."
 
-#: classes/feeds.php:300
+#: classes/feeds.php:291
 msgid "Never"
 msgstr "Nooit"
 
-#: classes/feeds.php:413
+#: classes/feeds.php:405
 #, php-format
 msgid "Imported at %s"
 msgstr "Geïmporteerd op %s"
 
-#: classes/feeds.php:472
-#: classes/feeds.php:569
+#: classes/feeds.php:464
+#: classes/feeds.php:561
 #, fuzzy
 msgid "mark feed as read"
 msgstr "Markeer alle feeds als gelezen"
 
-#: classes/feeds.php:630
+#: classes/feeds.php:622
 msgid "Collapse article"
 msgstr "Artikel inklappen"
 
-#: classes/feeds.php:791
+#: classes/feeds.php:784
 msgid "No unread articles found to display."
 msgstr "Er zijn geen ongelezen artikelen gevonden om weer te geven."
 
-#: classes/feeds.php:794
+#: classes/feeds.php:787
 msgid "No updated articles found to display."
 msgstr "Geen bijgewerkte artikelen gevonden om weer te geven."
 
-#: classes/feeds.php:797
+#: classes/feeds.php:790
 msgid "No starred articles found to display."
 msgstr "Er zijn geen artikelen met ster gevonden om weer te geven."
 
-#: classes/feeds.php:801
+#: classes/feeds.php:794
 msgid "No articles found to display. You can assign articles to labels manually from article header context menu (applies to all selected articles) or use a filter."
 msgstr "Geen artikelen gevonden voor weergave. U kunt handmatig labels aan artikels toekennen (zie het Actie menu hierboven) of een filter gebruiken."
 
-#: classes/feeds.php:803
+#: classes/feeds.php:796
 msgid "No articles found to display."
 msgstr "Geen artikelen gevonden om weer te geven."
 
-#: classes/feeds.php:818
-#: classes/feeds.php:992
+#: classes/feeds.php:811
+#: classes/feeds.php:985
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "Feeds laatst bijgewerkt op %s"
 
-#: classes/feeds.php:828
-#: classes/feeds.php:1002
+#: classes/feeds.php:821
+#: classes/feeds.php:995
 msgid "Some feeds have update errors (click for details)"
 msgstr "Sommige feeds hebben update fouten (klik voor details)"
 
-#: classes/feeds.php:982
+#: classes/feeds.php:975
 msgid "No feed selected."
 msgstr "Geen feeds geselecteerd."
 
-#: classes/feeds.php:1041
-#: classes/feeds.php:1049
+#: classes/feeds.php:1034
+#: classes/feeds.php:1042
 msgid "Feed or site URL"
 msgstr "Feed of website URL"
 
-#: classes/feeds.php:1063
+#: classes/feeds.php:1056
 msgid "Available feeds"
 msgstr "Beschikbare feeds"
 
-#: classes/feeds.php:1094
+#: classes/feeds.php:1087
 msgid "This feed requires authentication."
 msgstr "Deze feed vereist authenticatie."
 
-#: classes/feeds.php:1102
+#: classes/feeds.php:1095
 msgid "More feeds"
 msgstr "Meer feeds"
 
-#: classes/feeds.php:1129
+#: classes/feeds.php:1122
 msgid "Popular feeds"
 msgstr "Populaire feeds"
 
-#: classes/feeds.php:1130
+#: classes/feeds.php:1123
 msgid "Feed archive"
 msgstr "Feed archief"
 
-#: classes/feeds.php:1133
+#: classes/feeds.php:1126
 msgid "limit:"
 msgstr "beperking:"
 
-#: classes/feeds.php:1165
+#: classes/feeds.php:1158
 msgid "Look for"
 msgstr "Zoek naar"
 
-#: classes/feeds.php:1173
+#: classes/feeds.php:1166
 #, php-format
 msgid "in %s"
 msgstr ""
 
-#: classes/feeds.php:1178
+#: classes/feeds.php:1171
 msgid "Used for word stemming"
 msgstr ""
 
-#: classes/feeds.php:1187
+#: classes/feeds.php:1180
 #, fuzzy
 msgid "Search syntax"
 msgstr "Zoeken"
 
-#: plugins/instances/init.php:141
-msgid "Linked"
-msgstr "Gekoppeld"
-
-#: plugins/instances/init.php:204
-#: plugins/instances/init.php:395
-msgid "Instance"
-msgstr "Instantie"
-
-#: plugins/instances/init.php:215
-#: plugins/instances/init.php:312
-#: plugins/instances/init.php:404
-msgid "Instance URL"
-msgstr "Instantie URL"
-
-#: plugins/instances/init.php:226
-#: plugins/instances/init.php:414
-msgid "Access key:"
-msgstr "Toegangssleutel:"
-
-#: plugins/instances/init.php:229
-#: plugins/instances/init.php:313
-#: plugins/instances/init.php:417
-msgid "Access key"
-msgstr "Toegangssleutel"
-
-#: plugins/instances/init.php:233
-#: plugins/instances/init.php:421
-msgid "Use one access key for both linked instances."
-msgstr "Gebruik één toegang-sleutel voor beide gekoppelde instanties."
-
-#: plugins/instances/init.php:241
-#: plugins/instances/init.php:429
-msgid "Generate new key"
-msgstr "Genereer nieuwe sleutel"
-
-#: plugins/instances/init.php:292
-msgid "Link instance"
-msgstr "Link instantie"
-
-#: plugins/instances/init.php:304
-msgid "You can connect other instances of Tiny Tiny RSS to this one to share Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
-msgstr "U kunt deze instantie verbinden met andere instanties van Tiny Tiny RSS om Populaire feeds te delen. Verbindt deze instantie van Tiny Tiny RSS  met deze URL:"
-
-#: plugins/instances/init.php:314
-msgid "Last connected"
-msgstr "Laatst verbonden"
-
-#: plugins/instances/init.php:315
-msgid "Status"
-msgstr "Status"
-
-#: plugins/instances/init.php:316
-msgid "Stored feeds"
-msgstr "Opgeslagen feeds"
-
-#: plugins/instances/init.php:433
-msgid "Create link"
-msgstr "Link aanmaken"
-
-#: plugins/nsfw/init.php:30
-#: plugins/nsfw/init.php:42
-msgid "Not work safe (click to toggle)"
-msgstr "NVVW (Niet Veilig Voor Werk) (klik om in/uit te schakelen)"
-
-#: plugins/nsfw/init.php:52
-msgid "NSFW Plugin"
-msgstr "NVVW (Niet Veilig Voor Werk) Plug-in"
-
-#: plugins/nsfw/init.php:79
-msgid "Tags to consider NSFW (comma-separated)"
-msgstr "Tags te overwegen als NVVW (komma gescheiden)"
-
-#: plugins/nsfw/init.php:100
-msgid "Configuration saved."
-msgstr "Configuratie opgeslagen."
-
-#: plugins/note/init.php:26
-#: plugins/note/note.js:11
-msgid "Edit article note"
-msgstr "Bewerk artikel notitie"
-
-#: plugins/vf_shared/init.php:16
-#: plugins/vf_shared/init.php:69
-#, fuzzy
-msgid "Shared articles"
+#: classes/feeds.php:1596
+msgid "Starred articles"
 msgstr "Artikelen met ster"
 
-#: plugins/auth_internal/init.php:65
-msgid "Please enter your one time password:"
-msgstr "Geef aub uw eenmalig wachtwoord:"
-
-#: plugins/auth_internal/init.php:188
-msgid "Password has been changed."
-msgstr "Wachtwoord is veranderd."
-
-#: plugins/auth_internal/init.php:190
-msgid "Old password is incorrect."
-msgstr "Oud wachtwoord is onjuist."
-
-#: plugins/af_readability/init.php:21
-msgid "Data saved."
-msgstr ""
-
-#: plugins/af_readability/init.php:33
-#, fuzzy
-msgid "Inline content"
-msgstr "Bewerk artikel notitie"
-
-#: plugins/af_readability/init.php:39
-msgid "Readability settings (af_readability)"
-msgstr ""
-
-#: plugins/af_readability/init.php:66
-msgid "Use Readability for pages shared via bookmarklet."
-msgstr ""
-
-#: plugins/af_readability/init.php:78
-#: plugins/af_psql_trgm/init.php:191
-msgid "Currently enabled for (click to edit):"
-msgstr ""
-
-#: plugins/af_readability/init.php:95
-#, fuzzy
-msgid "Readability"
-msgstr "Controleer beschikbaarheid"
-
-#: plugins/af_readability/init.php:106
-#, fuzzy
-msgid "Inline article content"
-msgstr "Bewerk artikel notitie"
-
-#: plugins/af_redditimgur/init.php:25
-msgid "Reddit content settings (af_redditimgur)"
-msgstr ""
+#: classes/feeds.php:1598
+msgid "Published articles"
+msgstr "Gepubliceerde artikelen"
 
-#: plugins/af_redditimgur/init.php:50
-msgid "Uses Readability (full-text-rss) implementation by <a target='_blank' href='https://bitbucket.org/fivefilters/'>FiveFilters.org</a>"
-msgstr ""
+#: classes/feeds.php:1600
+msgid "Fresh articles"
+msgstr "Nieuwe artikelen"
 
-#: plugins/af_redditimgur/init.php:54
-msgid "Extract missing content using Readability"
-msgstr ""
+#: classes/feeds.php:1604
+msgid "Archived articles"
+msgstr "Gearchiveerde artikelen"
 
-#: plugins/af_redditimgur/init.php:59
-msgid "Enable additional duplicate checking"
-msgstr ""
+#: classes/feeds.php:1606
+msgid "Recently read"
+msgstr "Recent gelezen"
 
-#: plugins/af_redditimgur/init.php:73
-#: plugins/af_zz_imgproxy/init.php:225
-#, fuzzy
-msgid "Configuration saved"
-msgstr "Configuratie opgeslagen."
+#: classes/feeds.php:1716
+msgid "Special"
+msgstr "Speciaal"
 
-#: plugins/af_psql_trgm/init.php:28
+#: classes/feeds.php:1962
 #, php-format
-msgid "Data saved (%s, %d)"
-msgstr ""
+msgid "Search results: %s"
+msgstr "Zoekresultaten: %s"
 
-#: plugins/af_psql_trgm/init.php:112
+#: plugins/vf_shared/init.php:16
+#: plugins/vf_shared/init.php:60
 #, fuzzy
-msgid "Show related articles"
+msgid "Shared articles"
 msgstr "Artikelen met ster"
 
-#: plugins/af_psql_trgm/init.php:118
-#: plugins/af_psql_trgm/init.php:220
-#, fuzzy
-msgid "Mark similar articles as read"
-msgstr "Markeer alle artikelen als gelezen?"
-
-#: plugins/af_psql_trgm/init.php:157
-msgid "PostgreSQL trigram extension returns string similarity as a floating point number (0-1). Setting it too low might produce false positives, zero disables checking."
-msgstr ""
-
-#: plugins/af_psql_trgm/init.php:160
-#, fuzzy
-msgid "Global settings"
-msgstr "Toevoegingsinstellingen"
-
-#: plugins/af_psql_trgm/init.php:164
-msgid "Minimum similarity:"
-msgstr ""
-
-#: plugins/af_psql_trgm/init.php:169
-msgid "Minimum title length:"
-msgstr ""
-
-#: plugins/af_psql_trgm/init.php:174
-#, fuzzy
-msgid "Enable for all feeds:"
-msgstr "Inschakelen feed categorieën"
-
-#: plugins/af_psql_trgm/init.php:209
-msgid "Similarity (pg_trgm)"
-msgstr ""
-
-#: plugins/af_comics/init.php:40
-msgid "Feeds supported by af_comics"
-msgstr ""
-
-#: plugins/af_comics/init.php:42
-msgid "The following comics are currently supported:"
-msgstr ""
-
-#: plugins/af_comics/init.php:60
-msgid "GoComics requires a specific URL to workaround their lack of feed support: <code>http://feeds.feedburner.com/uclick/<em>comic_name</em></code> (e.g. <code>http://www.gocomics.com/garfield</code> uses <code>http://feeds.feedburner.com/uclick/garfield</code>)."
-msgstr ""
-
 #: plugins/import_export/init.php:58
 msgid "Import and export"
 msgstr "Import en export"
@@ -2687,96 +2462,83 @@ msgstr "Exporteer mijn data"
 msgid "Import"
 msgstr "Importeren"
 
-#: plugins/import_export/init.php:225
+#: plugins/import_export/init.php:231
 msgid "Could not import: incorrect schema version."
 msgstr "Kon niet importeren: onjuiste schema versie."
 
-#: plugins/import_export/init.php:230
+#: plugins/import_export/init.php:236
 msgid "Could not import: unrecognized document format."
 msgstr "Kon niet importeren: onbekend documentindeling."
 
-#: plugins/import_export/init.php:391
+#: plugins/import_export/init.php:397
 msgid "Finished: "
 msgstr "Klaar:"
 
-#: plugins/import_export/init.php:392
+#: plugins/import_export/init.php:398
 #, php-format
 msgid "%d article processed, "
 msgid_plural "%d articles processed, "
 msgstr[0] "%d artikel verwerkt, "
 msgstr[1] "%d artikels verwerkt, "
 
-#: plugins/import_export/init.php:393
+#: plugins/import_export/init.php:399
 #, php-format
 msgid "%d imported, "
 msgid_plural "%d imported, "
 msgstr[0] "%d geïmporteerd, "
 msgstr[1] "%d geïmporteerd, "
 
-#: plugins/import_export/init.php:394
+#: plugins/import_export/init.php:400
 #, php-format
 msgid "%d feed created."
 msgid_plural "%d feeds created."
 msgstr[0] "%d feed gemaakt."
 msgstr[1] "%d feeds gemaakt."
 
-#: plugins/import_export/init.php:399
+#: plugins/import_export/init.php:405
 msgid "Could not load XML document."
 msgstr "Kon XML-document niet laden."
 
-#: plugins/import_export/init.php:411
+#: plugins/import_export/init.php:417
 msgid "Prepare data"
 msgstr "Voorbereiden data"
 
-#: plugins/import_export/init.php:428
+#: plugins/import_export/init.php:434
 #, fuzzy, php-format
 msgid "Upload failed with error code %d (%s)"
 msgstr "Upload mislukt met fout nummer %d"
 
-#: plugins/import_export/init.php:454
+#: plugins/import_export/init.php:460
 msgid "No file uploaded."
 msgstr "Geen bestand geupload."
 
-#: plugins/mail/init.php:28
-msgid "Mail addresses saved."
-msgstr ""
-
-#: plugins/mail/init.php:34
-#, fuzzy
-msgid "Mail plugin"
-msgstr "Gebruiker's plug-ins"
-
-#: plugins/mail/init.php:36
-msgid "You can set predefined email addressed here (comma-separated list):"
-msgstr ""
-
+#: plugins/mailto/init.php:48
+#: plugins/mailto/init.php:54
 #: plugins/mail/init.php:112
 #: plugins/mail/init.php:118
-#: plugins/mailto/init.php:49
-#: plugins/mailto/init.php:55
 msgid "[Forwarded]"
 msgstr "[Doorgestuurd]"
 
+#: plugins/mailto/init.php:48
 #: plugins/mail/init.php:112
-#: plugins/mailto/init.php:49
 msgid "Multiple articles"
 msgstr "Meerdere artikelen"
 
-#: plugins/mail/init.php:140
-msgid "To:"
-msgstr "Naar:"
+#: plugins/mailto/init.php:70
+msgid "Clicking the following link to invoke your mail client:"
+msgstr "Klikken op de volgende link om uw e-mail cliënt te starten:"
 
-#: plugins/mail/init.php:155
-msgid "Subject:"
-msgstr "Onderwerp:"
+#: plugins/mailto/init.php:74
+msgid "Forward selected article(s) by email."
+msgstr "Geselecteerde artikel(en) doorsturen per e-mail."
 
-#: plugins/mail/init.php:172
-msgid "Send e-mail"
-msgstr "Verzend e-mail"
+#: plugins/mailto/init.php:77
+msgid "You should be able to edit the message before sending in your mail client."
+msgstr "U zou in staat moeten zijn het bericht te bewerken vóórdat u het verzendt met uw e-mail cliënt."
 
-#: plugins/close_button/init.php:22
-msgid "Close article"
-msgstr "Sluit artikel"
+#: plugins/mailto/init.php:82
+msgid "Close this dialog"
+msgstr "Sluit dit dialoogvenster"
 
 #: plugins/bookmarklets/init.php:20
 msgid "Bookmarklets"
@@ -2799,34 +2561,125 @@ msgstr "Abonneren in Tiny Tiny RSS"
 msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
 msgstr "Gebruik deze bookmarklet om willekeurige pagina's met Tiny Tiny RSS te publiceren"
 
+#: plugins/af_psql_trgm/init.php:28
+#, php-format
+msgid "Data saved (%s, %d)"
+msgstr ""
+
+#: plugins/af_psql_trgm/init.php:112
+#, fuzzy
+msgid "Show related articles"
+msgstr "Artikelen met ster"
+
+#: plugins/af_psql_trgm/init.php:118
+#: plugins/af_psql_trgm/init.php:220
+#, fuzzy
+msgid "Mark similar articles as read"
+msgstr "Markeer alle artikelen als gelezen?"
+
+#: plugins/af_psql_trgm/init.php:157
+msgid "PostgreSQL trigram extension returns string similarity as a floating point number (0-1). Setting it too low might produce false positives, zero disables checking."
+msgstr ""
+
+#: plugins/af_psql_trgm/init.php:160
+#, fuzzy
+msgid "Global settings"
+msgstr "Toevoegingsinstellingen"
+
+#: plugins/af_psql_trgm/init.php:164
+msgid "Minimum similarity:"
+msgstr ""
+
+#: plugins/af_psql_trgm/init.php:169
+msgid "Minimum title length:"
+msgstr ""
+
+#: plugins/af_psql_trgm/init.php:174
+#, fuzzy
+msgid "Enable for all feeds:"
+msgstr "Inschakelen feed categorieën"
+
+#: plugins/af_psql_trgm/init.php:191
+#: plugins/af_readability/init.php:78
+msgid "Currently enabled for (click to edit):"
+msgstr ""
+
+#: plugins/af_psql_trgm/init.php:209
+msgid "Similarity (pg_trgm)"
+msgstr ""
+
+#: plugins/nsfw/init.php:30
+#: plugins/nsfw/init.php:42
+msgid "Not work safe (click to toggle)"
+msgstr "NVVW (Niet Veilig Voor Werk) (klik om in/uit te schakelen)"
+
+#: plugins/nsfw/init.php:52
+msgid "NSFW Plugin"
+msgstr "NVVW (Niet Veilig Voor Werk) Plug-in"
+
+#: plugins/nsfw/init.php:79
+msgid "Tags to consider NSFW (comma-separated)"
+msgstr "Tags te overwegen als NVVW (komma gescheiden)"
+
+#: plugins/nsfw/init.php:100
+msgid "Configuration saved."
+msgstr "Configuratie opgeslagen."
+
 #: plugins/toggle_sidebar/init.php:23
 msgid "Collapse feedlist"
 msgstr "Feedlijst inklappen"
 
-#: plugins/af_zz_imgproxy/init.php:186
-msgid "Image proxy settings (af_zz_imgproxy)"
+#: plugins/af_readability/init.php:21
+msgid "Data saved."
 msgstr ""
 
-#: plugins/af_zz_imgproxy/init.php:211
+#: plugins/af_readability/init.php:33
 #, fuzzy
-msgid "Enable proxy for all remote images."
-msgstr "Inschakelen feed categorieën"
+msgid "Inline content"
+msgstr "Bewerk artikel notitie"
 
-#: plugins/mailto/init.php:71
-msgid "Clicking the following link to invoke your mail client:"
-msgstr "Klikken op de volgende link om uw e-mail cliënt te starten:"
+#: plugins/af_readability/init.php:39
+msgid "Readability settings (af_readability)"
+msgstr ""
 
-#: plugins/mailto/init.php:75
-msgid "Forward selected article(s) by email."
-msgstr "Geselecteerde artikel(en) doorsturen per e-mail."
+#: plugins/af_readability/init.php:66
+msgid "Use Readability for pages shared via bookmarklet."
+msgstr ""
 
-#: plugins/mailto/init.php:78
-msgid "You should be able to edit the message before sending in your mail client."
-msgstr "U zou in staat moeten zijn het bericht te bewerken vóórdat u het verzendt met uw e-mail cliënt."
+#: plugins/af_readability/init.php:95
+#, fuzzy
+msgid "Readability"
+msgstr "Controleer beschikbaarheid"
 
-#: plugins/mailto/init.php:83
-msgid "Close this dialog"
-msgstr "Sluit dit dialoogvenster"
+#: plugins/af_readability/init.php:106
+#, fuzzy
+msgid "Inline article content"
+msgstr "Bewerk artikel notitie"
+
+#: plugins/mail/init.php:28
+msgid "Mail addresses saved."
+msgstr ""
+
+#: plugins/mail/init.php:34
+#, fuzzy
+msgid "Mail plugin"
+msgstr "Gebruiker's plug-ins"
+
+#: plugins/mail/init.php:36
+msgid "You can set predefined email addressed here (comma-separated list):"
+msgstr ""
+
+#: plugins/mail/init.php:140
+msgid "To:"
+msgstr "Naar:"
+
+#: plugins/mail/init.php:155
+msgid "Subject:"
+msgstr "Onderwerp:"
+
+#: plugins/mail/init.php:172
+msgid "Send e-mail"
+msgstr "Verzend e-mail"
 
 #: plugins/share/init.php:39
 msgid "You can disable all articles shared by unique URLs here."
@@ -2840,25 +2693,98 @@ msgstr "Delen alle artikelen teniet doen"
 msgid "Share by URL"
 msgstr "Deel via URL"
 
-#: plugins/share/init.php:97
+#: plugins/share/init.php:96
 msgid "You can share this article by the following unique URL:"
 msgstr "U kunt dit artikel delen via de volgende unieke URL:"
 
-#: plugins/share/init.php:115
+#: plugins/share/init.php:114
 #, fuzzy
 msgid "Unshare article"
 msgstr "Ster weghalen bij artikel"
 
+#: plugins/af_comics/init.php:48
+msgid "Feeds supported by af_comics"
+msgstr ""
+
+#: plugins/af_comics/init.php:50
+msgid "The following comics are currently supported:"
+msgstr ""
+
+#: plugins/af_comics/init.php:68
+msgid "GoComics requires a specific URL to workaround their lack of feed support: <code>http://feeds.feedburner.com/uclick/<em>comic_name</em></code> (e.g. <code>http://www.gocomics.com/garfield</code> uses <code>http://feeds.feedburner.com/uclick/garfield</code>)."
+msgstr ""
+
+#: plugins/af_comics/init.php:70
+msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:25
+msgid "Reddit content settings (af_redditimgur)"
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:50
+msgid "Uses Readability (full-text-rss) implementation by <a target='_blank' href='https://bitbucket.org/fivefilters/'>FiveFilters.org</a>"
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:54
+msgid "Extract missing content using Readability"
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:59
+msgid "Enable additional duplicate checking"
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:73
+#: plugins/af_zz_imgproxy/init.php:254
+#, fuzzy
+msgid "Configuration saved"
+msgstr "Configuratie opgeslagen."
+
+#: plugins/note/init.php:26
+#: plugins/note/note.js:11
+msgid "Edit article note"
+msgstr "Bewerk artikel notitie"
+
+#: plugins/close_button/init.php:25
+msgid "Close article"
+msgstr "Sluit artikel"
+
+#: plugins/af_zz_imgproxy/init.php:210
+msgid "Image proxy settings (af_zz_imgproxy)"
+msgstr ""
+
+#: plugins/af_zz_imgproxy/init.php:234
+#, fuzzy
+msgid "Enable proxy for all remote images."
+msgstr "Inschakelen feed categorieën"
+
+#: plugins/af_zz_imgproxy/init.php:238
+#, fuzzy
+msgid "Don't cache files locally."
+msgstr "Afbeelding lokaal in cache plaatsen"
+
+#: plugins/auth_internal/init.php:65
+msgid "Please enter your one time password:"
+msgstr "Geef aub uw eenmalig wachtwoord:"
+
+#: plugins/auth_internal/init.php:188
+msgid "Password has been changed."
+msgstr "Wachtwoord is veranderd."
+
+#: plugins/auth_internal/init.php:190
+msgid "Old password is incorrect."
+msgstr "Oud wachtwoord is onjuist."
+
 #: js/FeedTree.js:172
 #, fuzzy
 msgid "(Un)collapse"
 msgstr "Uit/Inklappen zijbalk"
 
-#: js/PrefFeedTree.js:52
+#: js/PrefFeedTree.js:54
 msgid "Edit category"
 msgstr "Bewerk categorie"
 
-#: js/PrefFeedTree.js:59
+#: js/PrefFeedTree.js:61
 msgid "Remove category"
 msgstr "Categorie verwijderen"
 
@@ -2893,63 +2819,55 @@ msgid "Create Filter"
 msgstr "Filter aanmaken"
 
 #: js/functions.js:1128
-msgid "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification hub again on next feed update."
-msgstr "Abonnement opnieuw instellen? Tiny Tiny RSS zal proberen zich opnieuw op de notification hub te abonneren bij de volgende feed update."
-
-#: js/functions.js:1139
-msgid "Subscription reset."
-msgstr "Abonnement hersteld."
-
-#: js/functions.js:1149
-#: js/tt-rss.js:695
+#: js/tt-rss.js:696
 #, perl-format
 msgid "Unsubscribe from %s?"
 msgstr "Abonnement opzeggen voor %s?"
 
-#: js/functions.js:1152
+#: js/functions.js:1131
 msgid "Removing feed..."
 msgstr "Feed wordt verwijderd..."
 
-#: js/functions.js:1225
+#: js/functions.js:1204
 msgid "Please enter category title:"
 msgstr "Vul titel van categorie in aub:"
 
-#: js/functions.js:1250
+#: js/functions.js:1229
 msgid "Generate new syndication address for this feed?"
 msgstr "Nieuw syndicatie-adres voor deze feed genereren?"
 
-#: js/functions.js:1254
-#: js/prefs.js:1154
+#: js/functions.js:1233
+#: js/prefs.js:1150
 msgid "Trying to change address..."
 msgstr "Adres aan het aanpassen..."
 
-#: js/functions.js:1497
-#: js/functions.js:1606
+#: js/functions.js:1476
+#: js/functions.js:1585
 #: js/prefs.js:398
 #: js/prefs.js:424
 #: js/prefs.js:456
 #: js/prefs.js:599
 #: js/prefs.js:617
-#: js/prefs.js:1136
-#: js/prefs.js:1263
+#: js/prefs.js:1132
+#: js/prefs.js:1259
 msgid "No feeds are selected."
 msgstr "Er zijn geen feeds geselecteerd."
 
-#: js/functions.js:1540
+#: js/functions.js:1519
 msgid "Remove selected feeds from the archive? Feeds with stored articles will not be removed."
 msgstr "Geselecteerde feeds uit het archief verwijderen? Feeds met opgeslagen artikelen zullen niet worden verwijderd."
 
-#: js/functions.js:1577
+#: js/functions.js:1556
 msgid "Feeds with update errors"
 msgstr "Feeds met update fouten"
 
-#: js/functions.js:1588
-#: js/prefs.js:1117
+#: js/functions.js:1567
+#: js/prefs.js:1113
 msgid "Remove selected feeds?"
 msgstr "Geselecteerde feeds verwijderen?"
 
-#: js/functions.js:1591
-#: js/prefs.js:1120
+#: js/functions.js:1570
+#: js/prefs.js:1116
 msgid "Removing selected feeds..."
 msgstr "Geselecteerde feeds verwijderen..."
 
@@ -2972,9 +2890,7 @@ msgstr "Gebruikers bewerken"
 #: js/prefs.js:100
 #: js/prefs.js:209
 #: js/prefs.js:706
-#: plugins/instances/instances.js:26
-#: plugins/instances/instances.js:89
-#: js/functions.js:1408
+#: js/functions.js:1387
 msgid "Saving data..."
 msgstr "Gegevens opslaan..."
 
@@ -2999,7 +2915,7 @@ msgid "Removing selected labels..."
 msgstr "Geselecteerde labels verwijderen..."
 
 #: js/prefs.js:308
-#: js/prefs.js:1304
+#: js/prefs.js:1300
 msgid "No labels are selected."
 msgstr "Er zijn geen labels geselecteerd."
 
@@ -3098,28 +3014,28 @@ msgstr "Veranderingen aan geselecteerde feeds opslaan?"
 msgid "OPML Import"
 msgstr "OPML import"
 
-#: js/prefs.js:764
+#: js/prefs.js:759
 msgid "Please choose an OPML file first."
 msgstr "kies eerst een OPML-bestand aub."
 
-#: js/prefs.js:767
+#: js/prefs.js:762
 #: plugins/import_export/import_export.js:115
 msgid "Importing, please wait..."
 msgstr "Aan 't importeren, even wachten aub..."
 
-#: js/prefs.js:928
+#: js/prefs.js:924
 msgid "Reset to defaults?"
 msgstr "Terugzetten naar de standaardwaarden?"
 
-#: js/prefs.js:1628
+#: js/prefs.js:1624
 msgid "Subscribing to feeds..."
 msgstr "Abonneren op feeds..."
 
-#: js/prefs.js:1647
+#: js/prefs.js:1643
 msgid "Clear stored data for this plugin?"
 msgstr "Wis opgeslagen data voor deze plug-in?"
 
-#: js/prefs.js:1661
+#: js/prefs.js:1657
 msgid "Clear all messages in the error log?"
 msgstr ""
 
@@ -3131,180 +3047,150 @@ msgstr "Markeer alle artikelen als gelezen?"
 msgid "Marking all feeds as read..."
 msgstr "Alle feeds als gelezen markeren..."
 
-#: js/tt-rss.js:401
+#: js/tt-rss.js:402
 msgid "Please enable mail plugin first."
 msgstr "Eerst de e-mail plug-in inschakelen aub."
 
-#: js/tt-rss.js:449
-#: js/functions.js:1387
-#: js/tt-rss.js:676
+#: js/tt-rss.js:450
+#: js/functions.js:1366
+#: js/tt-rss.js:677
 msgid "You can't edit this kind of feed."
 msgstr "U kunt dit type feed niet bewerken."
 
-#: js/tt-rss.js:530
+#: js/tt-rss.js:531
 msgid "Please enable embed_original plugin first."
 msgstr "Eerst embed_original plug-in inschakelen aub."
 
-#: js/tt-rss.js:543
-#: js/tt-rss.js:726
+#: js/tt-rss.js:544
+#: js/tt-rss.js:727
 msgid "Widescreen is not available in combined mode."
 msgstr ""
 
-#: js/tt-rss.js:824
+#: js/tt-rss.js:825
 msgid "You can't rescore this kind of feed."
 msgstr "U kunt dit type feed geen andere score geven."
 
-#: js/tt-rss.js:829
-#: js/tt-rss.js:689
+#: js/tt-rss.js:830
+#: js/tt-rss.js:690
 msgid "Please select some feed first."
 msgstr "Selecteer aub eerst een feed."
 
-#: js/tt-rss.js:834
+#: js/tt-rss.js:835
 #, perl-format
 msgid "Rescore articles in %s?"
 msgstr "Artikelen in %s opnieuw een score geven?"
 
-#: js/tt-rss.js:837
+#: js/tt-rss.js:838
 msgid "Rescoring articles..."
 msgstr "Artikelen nieuwe score geven..."
 
-#: js/viewfeed.js:919
-#: js/viewfeed.js:957
-#: js/viewfeed.js:1005
-#: js/viewfeed.js:1931
-#: plugins/mail/mail.js:7
+#: js/viewfeed.js:921
+#: js/viewfeed.js:959
+#: js/viewfeed.js:1007
+#: js/viewfeed.js:1933
 #: plugins/mailto/init.js:7
-#: js/viewfeed.js:677
-#: js/viewfeed.js:699
-#: js/viewfeed.js:720
-#: js/viewfeed.js:779
-#: js/viewfeed.js:807
+#: plugins/mail/mail.js:7
+#: js/viewfeed.js:679
+#: js/viewfeed.js:701
+#: js/viewfeed.js:722
+#: js/viewfeed.js:781
+#: js/viewfeed.js:809
 msgid "No articles are selected."
 msgstr "Geen artikelen geselecteerd."
 
-#: js/viewfeed.js:927
+#: js/viewfeed.js:929
 #, perl-format
 msgid "Delete %d selected article in %s?"
 msgid_plural "Delete %d selected articles in %s?"
 msgstr[0] "Verwijder %d geselecteerd artikel in %s?"
 msgstr[1] "Verwijder %d geselecteerde artikelen in %s?"
 
-#: js/viewfeed.js:929
+#: js/viewfeed.js:931
 #, perl-format
 msgid "Delete %d selected article?"
 msgid_plural "Delete %d selected articles?"
 msgstr[0] "Verwijder %d geselecteerd artikel?"
 msgstr[1] "Verwijder %d geselecteerde artikelen?"
 
-#: js/viewfeed.js:966
+#: js/viewfeed.js:968
 #, perl-format
 msgid "Archive %d selected article in %s?"
 msgid_plural "Archive %d selected articles in %s?"
 msgstr[0] "%d geselecteerd artikel archiveren in %s?"
 msgstr[1] "%d geselecteerd artikelen archiveren in %s?"
 
-#: js/viewfeed.js:969
+#: js/viewfeed.js:971
 #, perl-format
 msgid "Move %d archived article back?"
 msgid_plural "Move %d archived articles back?"
 msgstr[0] "%d gearchiveerd artikel terugzetten?"
 msgstr[1] "%d gearchiveerde artikelen terugzetten?"
 
-#: js/viewfeed.js:971
+#: js/viewfeed.js:973
 msgid "Please note that unstarred articles might get purged on next feed update."
 msgstr "Let op, artikels zonder ster kunnen verloren gaan bij de volgende feed update."
 
-#: js/viewfeed.js:1011
+#: js/viewfeed.js:1013
 #, perl-format
 msgid "Mark %d selected article in %s as read?"
 msgid_plural "Mark %d selected articles in %s as read?"
 msgstr[0] "Markeer %d geselecteerd artikel in %s als gelezen?"
 msgstr[1] "Markeer %d geselecteerde artikelen in %s als gelezen?"
 
-#: js/viewfeed.js:1031
+#: js/viewfeed.js:1033
 msgid "Edit article Tags"
 msgstr "Bewerk artikel tags"
 
-#: js/viewfeed.js:1037
+#: js/viewfeed.js:1039
 msgid "Saving article tags..."
 msgstr "Artikel tags opslaan..."
 
-#: js/viewfeed.js:1670
+#: js/viewfeed.js:1672
 msgid "Open original article"
 msgstr "Open origineel artikel"
 
-#: js/viewfeed.js:1677
+#: js/viewfeed.js:1679
 msgid "Display article URL"
 msgstr "Toon artikel URL"
 
-#: js/viewfeed.js:1787
+#: js/viewfeed.js:1789
 msgid "Assign label"
 msgstr "Labels toevoegen"
 
-#: js/viewfeed.js:1792
+#: js/viewfeed.js:1794
 msgid "Remove label"
 msgstr "Label verwijderen"
 
-#: js/viewfeed.js:1824
+#: js/viewfeed.js:1826
 #, fuzzy
 msgid "Select articles in group"
 msgstr "Selecteer artikel onder de cursor"
 
-#: js/viewfeed.js:1834
+#: js/viewfeed.js:1836
 #, fuzzy
 msgid "Mark group as read"
 msgstr "Markeren als gelezen"
 
-#: js/viewfeed.js:1846
+#: js/viewfeed.js:1848
 #, fuzzy
 msgid "Mark feed as read"
 msgstr "Markeer alle feeds als gelezen"
 
-#: js/viewfeed.js:1899
+#: js/viewfeed.js:1901
 msgid "Please enter new score for selected articles:"
 msgstr "Geef aub een nieuwe score voor de geselecteerde artikelen:"
 
-#: js/viewfeed.js:1962
+#: js/viewfeed.js:1964
 msgid "Please enter new score for this article:"
 msgstr "Geef aub een nieuwe score voor dit artikel:"
 
-#: js/viewfeed.js:1993
+#: js/viewfeed.js:1995
 msgid "Article URL:"
 msgstr "Artikel URL:"
 
-#: plugins/instances/instances.js:10
-msgid "Link Instance"
-msgstr "Link Instantie"
-
-#: plugins/instances/instances.js:73
-msgid "Edit Instance"
-msgstr "Bewerk instantie"
-
-#: plugins/instances/instances.js:122
-msgid "Remove selected instances?"
-msgstr "Geselecteerde instanties verwijderen?"
-
-#: plugins/instances/instances.js:125
-msgid "Removing selected instances..."
-msgstr "Geselecteerde instanties verwijderen..."
-
-#: plugins/instances/instances.js:139
-#: plugins/instances/instances.js:151
-msgid "No instances are selected."
-msgstr "Er zijn geen instanties geselecteerd."
-
-#: plugins/instances/instances.js:156
-msgid "Please select only one instance."
-msgstr "Selecteer aub slechts één instantie."
-
-#: plugins/note/note.js:17
-msgid "Saving article note..."
-msgstr "Artikel notitie opslaan..."
-
-#: plugins/af_psql_trgm/init.js:11
-#, fuzzy
-msgid "Related articles"
-msgstr "Verwijder artikel"
+#: plugins/embed_original/init.js:6
+msgid "Sorry, your browser does not support sandboxed iframes."
+msgstr "Sorry, uw browser lijkt iframes in een sandbox niet te ondersteunen."
 
 #: plugins/import_export/import_export.js:13
 msgid "Export Data"
@@ -3325,11 +3211,16 @@ msgstr "Data importeren"
 msgid "Please choose the file first."
 msgstr "Kies het bestand eerst aub."
 
-#: plugins/mail/mail.js:21
 #: plugins/mailto/init.js:21
+#: plugins/mail/mail.js:21
 msgid "Forward article by email"
 msgstr "Artikel doorsturen per e-mail"
 
+#: plugins/af_psql_trgm/init.js:11
+#, fuzzy
+msgid "Related articles"
+msgstr "Verwijder artikel"
+
 #: plugins/mail/mail.js:36
 msgid "Error sending email:"
 msgstr ""
@@ -3339,10 +3230,6 @@ msgstr ""
 msgid "Your message has been sent."
 msgstr "Uw persoonlijke gegevens zijn opgeslagen."
 
-#: plugins/embed_original/init.js:6
-msgid "Sorry, your browser does not support sandboxed iframes."
-msgstr "Sorry, uw browser lijkt iframes in een sandbox niet te ondersteunen."
-
 #: plugins/shorten_expanded/init.js:39
 #, fuzzy
 msgid "Click to expand article"
@@ -3377,7 +3264,7 @@ msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr "Dit zal all eerder gedeelde artikel-URL's ongeldig maken. Doorgaan?"
 
 #: plugins/share/share_prefs.js:6
-#: js/prefs.js:1437
+#: js/prefs.js:1433
 msgid "Clearing URLs..."
 msgstr "URLs opruimen..."
 
@@ -3385,23 +3272,44 @@ msgstr "URLs opruimen..."
 msgid "Shared URLs cleared."
 msgstr "Gedeelde URLs opgeruimd."
 
+#: plugins/note/note.js:17
+msgid "Saving article note..."
+msgstr "Artikel notitie opslaan..."
+
 #: js/feedlist.js:429
-#: js/feedlist.js:496
 msgid "Mark all articles in %s as read?"
 msgstr "Markeer alle artikelen in %s als gelezen?"
 
 #: js/feedlist.js:487
-msgid "Mark all articles in %s older than 1 day as read?"
+#, fuzzy
+msgid "Mark %w in %s older than 1 day as read?"
 msgstr "Markeer alle artikelen in %s ouder dan 1 dag als gelezen?"
 
 #: js/feedlist.js:490
-msgid "Mark all articles in %s older than 1 week as read?"
+#, fuzzy
+msgid "Mark %w in %s older than 1 week as read?"
 msgstr "Markeer alle artikelen in %s ouder dan 1 week als gelezen?"
 
 #: js/feedlist.js:493
-msgid "Mark all articles in %s older than 2 weeks as read?"
+#, fuzzy
+msgid "Mark %w in %s older than 2 weeks as read?"
 msgstr "Markeer alle artikelen in %s ouder dan 2 weken als gelezen?"
 
+#: js/feedlist.js:496
+#, fuzzy
+msgid "Mark %w in %s as read?"
+msgstr "Markeer alle artikelen in %s als gelezen?"
+
+#: js/feedlist.js:499
+#, fuzzy
+msgid "search results"
+msgstr "Zoekresultaten: %s"
+
+#: js/feedlist.js:499
+#, fuzzy
+msgid "all articles"
+msgstr "Alle artikelen"
+
 #: js/functions.js:506
 msgid "Error explained"
 msgstr "Fout uitleg"
@@ -3482,178 +3390,247 @@ msgstr "U bent al geabonneerd op deze feed."
 msgid "Edit rule"
 msgstr "Bewerk regel"
 
-#: js/functions.js:1402
+#: js/functions.js:1381
 msgid "Edit Feed"
 msgstr "Bewerk feed"
 
-#: js/functions.js:1435
+#: js/functions.js:1414
 msgid "More Feeds"
 msgstr "Meer feeds"
 
-#: js/functions.js:1631
+#: js/functions.js:1610
 msgid "Help"
 msgstr "Help"
 
-#: js/prefs.js:1032
+#: js/prefs.js:1028
 msgid "Remove category %s? Any nested feeds would be placed into Uncategorized."
 msgstr "Categorie %s verwijderen? elke genestelde feed zal in de rubriek 'Ongecategoriseerd' worden geplaatst."
 
-#: js/prefs.js:1038
+#: js/prefs.js:1034
 msgid "Removing category..."
 msgstr "Categorie verwijderen..."
 
-#: js/prefs.js:1056
+#: js/prefs.js:1052
 msgid "Remove selected categories?"
 msgstr "Geselecteerde categorieën verwijderen?"
 
-#: js/prefs.js:1059
+#: js/prefs.js:1055
 msgid "Removing selected categories..."
 msgstr "Geselecteerde categorieën verwijderen..."
 
-#: js/prefs.js:1072
+#: js/prefs.js:1068
 msgid "No categories are selected."
 msgstr "Geen categorieën geselecteerd."
 
-#: js/prefs.js:1079
+#: js/prefs.js:1075
 msgid "Category title:"
 msgstr "Categorie titel:"
 
-#: js/prefs.js:1083
+#: js/prefs.js:1079
 msgid "Creating category..."
 msgstr "Aanmaken categorie…"
 
-#: js/prefs.js:1106
+#: js/prefs.js:1102
 msgid "Feeds without recent updates"
 msgstr "Feeds zonder recente updates"
 
-#: js/prefs.js:1150
+#: js/prefs.js:1146
 msgid "Replace current OPML publishing address with a new one?"
 msgstr "Huidig OPML publicatieadres vervangen door een nieuwe?"
 
-#: js/prefs.js:1227
+#: js/prefs.js:1223
 msgid "Clearing feed..."
 msgstr "Feed opruimen..."
 
-#: js/prefs.js:1247
+#: js/prefs.js:1243
 msgid "Rescore articles in selected feeds?"
 msgstr "Artikelen in geselecteerde feeds opnieuw een score geven?"
 
-#: js/prefs.js:1250
+#: js/prefs.js:1246
 msgid "Rescoring selected feeds..."
 msgstr "Geselecteerde feeds nieuwe score geven..."
 
-#: js/prefs.js:1270
+#: js/prefs.js:1266
 msgid "Rescore all articles? This operation may take a lot of time."
 msgstr "Alle artikelen opnieuw een score geven? Dit kan veel tijd in beslag nemen."
 
-#: js/prefs.js:1273
+#: js/prefs.js:1269
 msgid "Rescoring feeds..."
 msgstr "Feed opnieuw score geven..."
 
-#: js/prefs.js:1289
+#: js/prefs.js:1285
 msgid "Reset selected labels to default colors?"
 msgstr "Geselecteerd label naar de standaard kleur terugzetten?"
 
-#: js/prefs.js:1321
+#: js/prefs.js:1317
 msgid "Settings Profiles"
 msgstr "Instellingsprofielen"
 
-#: js/prefs.js:1330
+#: js/prefs.js:1326
 msgid "Remove selected profiles? Active and default profiles will not be removed."
 msgstr "Geselecteerde profielen verwijderen? Actieve en standaard profielen zullen niet worden verwijderd."
 
-#: js/prefs.js:1333
+#: js/prefs.js:1329
 msgid "Removing selected profiles..."
 msgstr "Geselecteerde profielen verwijderen..."
 
-#: js/prefs.js:1349
+#: js/prefs.js:1345
 msgid "No profiles are selected."
 msgstr "Er zijn geen profielen geselecteerd."
 
-#: js/prefs.js:1357
-#: js/prefs.js:1410
+#: js/prefs.js:1353
+#: js/prefs.js:1406
 msgid "Activate selected profile?"
 msgstr "Geselecteerd profiel activeren?"
 
-#: js/prefs.js:1374
-#: js/prefs.js:1426
+#: js/prefs.js:1370
+#: js/prefs.js:1422
 msgid "Please choose a profile to activate."
 msgstr "Kies een te activeren profiel aub."
 
-#: js/prefs.js:1379
+#: js/prefs.js:1375
 msgid "Creating profile..."
 msgstr "Profiel aanmaken..."
 
-#: js/prefs.js:1434
+#: js/prefs.js:1430
 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr "Dit zal alle eerder gegenereerde feed-URL's ongeldig maken. Doorgaan?"
 
-#: js/prefs.js:1444
+#: js/prefs.js:1440
 msgid "Generated URLs cleared."
 msgstr "Genereerde URLs gewist."
 
-#: js/prefs.js:1516
+#: js/prefs.js:1512
 msgid "Label Editor"
 msgstr "Label editor"
 
-#: js/tt-rss.js:684
+#: js/tt-rss.js:685
 msgid "You can't unsubscribe from the category."
 msgstr "U kunt het abonnementen niet opzeggen in deze categorie."
 
-#: js/viewfeed.js:125
-#: js/viewfeed.js:175
-#: js/viewfeed.js:192
+#: js/viewfeed.js:127
+#: js/viewfeed.js:177
+#: js/viewfeed.js:194
 #, fuzzy
 msgid "Click to open next unread feed."
 msgstr "Klik om feed te bewerken"
 
-#: js/viewfeed.js:129
+#: js/viewfeed.js:131
 msgid "Cancel search"
 msgstr "Zoeken annuleren"
 
-#: js/viewfeed.js:189
+#: js/viewfeed.js:191
 #, fuzzy
 msgid "New articles found, reload feed to continue."
 msgstr "Geen artikelen gevonden om weer te geven."
 
-#: js/viewfeed.js:424
+#: js/viewfeed.js:426
 msgid "Unstar article"
 msgstr "Ster weghalen bij artikel"
 
-#: js/viewfeed.js:428
+#: js/viewfeed.js:430
 msgid "Star article"
 msgstr "Geef artikel een ster"
 
-#: js/viewfeed.js:478
+#: js/viewfeed.js:480
 msgid "Unpublish article"
 msgstr "Ongepubliceerd artikel"
 
-#: js/viewfeed.js:482
+#: js/viewfeed.js:484
 msgid "Publish article"
 msgstr "Artikel publiceren"
 
-#: js/viewfeed.js:622
+#: js/viewfeed.js:624
 msgid "%d article selected"
 msgid_plural "%d articles selected"
 msgstr[0] "%d artikel geselecteerd"
 msgstr[1] "%d artikelen geselecteerd"
 
-#: js/viewfeed.js:1286
+#: js/viewfeed.js:1288
 msgid "No article is selected."
 msgstr "Geen artikel geselecteerd."
 
-#: js/viewfeed.js:1321
+#: js/viewfeed.js:1323
 msgid "No articles found to mark"
 msgstr "Geen artikelen gevonden om te markeren"
 
-#: js/viewfeed.js:1323
+#: js/viewfeed.js:1325
 msgid "Mark %d article as read?"
 msgid_plural "Mark %d articles as read?"
 msgstr[0] "Markeer %d artikel als gelezen?"
 msgstr[1] "Markeer %d artikelen als gelezen?"
 
-#~ msgid "Cache images locally"
-#~ msgstr "Afbeelding lokaal in cache plaatsen"
+#~ msgid "Resubscribe to push updates"
+#~ msgstr "Herabonneren voor push updates"
+
+#~ msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
+#~ msgstr "Herstelt PubSubHubbub abonnement status voor gepushte feeds."
+
+#~ msgid "Download more plugins at tt-rss.org <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forums</a> or <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a>."
+#~ msgstr "Download meer plugins van tt-rss.org <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forum</a> of <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a>."
+
+#~ msgid "Linked"
+#~ msgstr "Gekoppeld"
+
+#~ msgid "Instance"
+#~ msgstr "Instantie"
+
+#~ msgid "Instance URL"
+#~ msgstr "Instantie URL"
+
+#~ msgid "Access key:"
+#~ msgstr "Toegangssleutel:"
+
+#~ msgid "Access key"
+#~ msgstr "Toegangssleutel"
+
+#~ msgid "Use one access key for both linked instances."
+#~ msgstr "Gebruik één toegang-sleutel voor beide gekoppelde instanties."
+
+#~ msgid "Generate new key"
+#~ msgstr "Genereer nieuwe sleutel"
+
+#~ msgid "Link instance"
+#~ msgstr "Link instantie"
+
+#~ msgid "You can connect other instances of Tiny Tiny RSS to this one to share Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
+#~ msgstr "U kunt deze instantie verbinden met andere instanties van Tiny Tiny RSS om Populaire feeds te delen. Verbindt deze instantie van Tiny Tiny RSS  met deze URL:"
+
+#~ msgid "Last connected"
+#~ msgstr "Laatst verbonden"
+
+#~ msgid "Status"
+#~ msgstr "Status"
+
+#~ msgid "Stored feeds"
+#~ msgstr "Opgeslagen feeds"
+
+#~ msgid "Create link"
+#~ msgstr "Link aanmaken"
+
+#~ msgid "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification hub again on next feed update."
+#~ msgstr "Abonnement opnieuw instellen? Tiny Tiny RSS zal proberen zich opnieuw op de notification hub te abonneren bij de volgende feed update."
+
+#~ msgid "Subscription reset."
+#~ msgstr "Abonnement hersteld."
+
+#~ msgid "Link Instance"
+#~ msgstr "Link Instantie"
+
+#~ msgid "Edit Instance"
+#~ msgstr "Bewerk instantie"
+
+#~ msgid "Remove selected instances?"
+#~ msgstr "Geselecteerde instanties verwijderen?"
+
+#~ msgid "Removing selected instances..."
+#~ msgstr "Geselecteerde instanties verwijderen..."
+
+#~ msgid "No instances are selected."
+#~ msgstr "Er zijn geen instanties geselecteerd."
+
+#~ msgid "Please select only one instance."
+#~ msgstr "Selecteer aub slechts één instantie."
 
 #~ msgid "The error will be reported to the configured log destination."
 #~ msgstr "De fout wordt in het geconfigureerde log vastgelegd."
diff --git a/locale/pl_PL/LC_MESSAGES/messages.mo b/locale/pl_PL/LC_MESSAGES/messages.mo
index f6b9fd31c..cc48dbd75 100644
--- a/locale/pl_PL/LC_MESSAGES/messages.mo
+++ b/locale/pl_PL/LC_MESSAGES/messages.mo
diff --git a/locale/pl_PL/LC_MESSAGES/messages.po b/locale/pl_PL/LC_MESSAGES/messages.po
index 068ce78ab..fb0110875 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: 2017-03-23 15:25+0300\n"
+"POT-Creation-Date: 2017-07-04 16:29+0300\n"
 "PO-Revision-Date: 2013-08-02 08:25+0100\n"
 "Last-Translator: Mirosław Lach <[email protected]>\n"
 "Language-Team: \n"
@@ -173,31 +173,30 @@ msgstr "Użytkownik nie został odnaleziony"
 #: prefs.php:118
 #: classes/backend.php:5
 #: classes/pref/labels.php:282
-#: classes/pref/feeds.php:1402
-#: classes/pref/filters.php:779
+#: classes/pref/filters.php:819
+#: classes/pref/feeds.php:1376
 #: js/feedlist.js:149
-#: js/functions.js:1131
-#: js/functions.js:1231
-#: js/functions.js:1478
+#: js/functions.js:1210
+#: js/functions.js:1457
 #: js/prefs.js:621
-#: js/prefs.js:818
-#: js/prefs.js:1648
-#: js/prefs.js:1663
-#: js/tt-rss.js:550
-#: js/viewfeed.js:1182
+#: js/prefs.js:813
+#: js/prefs.js:1644
+#: js/prefs.js:1659
+#: js/tt-rss.js:551
+#: js/viewfeed.js:1184
 #: plugins/import_export/import_export.js:17
 #: js/feedlist.js:467
-#: js/feedlist.js:512
+#: js/feedlist.js:515
 #: js/functions.js:372
 #: js/functions.js:630
-#: js/prefs.js:1360
-#: js/prefs.js:1413
-#: js/prefs.js:1452
-#: js/prefs.js:1465
-#: js/prefs.js:1476
-#: js/prefs.js:1491
-#: js/tt-rss.js:567
-#: js/viewfeed.js:762
+#: js/prefs.js:1356
+#: js/prefs.js:1409
+#: js/prefs.js:1448
+#: js/prefs.js:1461
+#: js/prefs.js:1472
+#: js/prefs.js:1487
+#: js/tt-rss.js:568
+#: js/viewfeed.js:764
 msgid "Loading, please wait..."
 msgstr "Trwa ładowanie, proszę czekać..."
 
@@ -214,13 +213,13 @@ msgid "All Articles"
 msgstr "Wszystkie artykuły"
 
 #: index.php:192
-#: include/functions2.php:107
+#: include/functions.php:1181
 #: classes/feeds.php:110
 msgid "Starred"
 msgstr "Oznaczone gwiazdką"
 
 #: index.php:193
-#: include/functions2.php:108
+#: include/functions.php:1182
 #: classes/feeds.php:111
 msgid "Published"
 msgstr "Opublikowane"
@@ -261,7 +260,7 @@ msgstr "Tytuł"
 
 #: index.php:209
 #: index.php:249
-#: include/functions2.php:95
+#: include/functions.php:1169
 #: classes/feeds.php:115
 #: js/FeedTree.js:138
 #: js/FeedTree.js:166
@@ -301,7 +300,7 @@ msgid "Feed actions:"
 msgstr "Działania dla kanałów:"
 
 #: index.php:244
-#: classes/handler/public.php:672
+#: classes/handler/public.php:583
 msgid "Subscribe to feed..."
 msgstr "Prenumeruj kanał..."
 
@@ -315,8 +314,8 @@ msgstr "Przelicz punktację kanału"
 
 #: index.php:247
 #: classes/pref/feeds.php:785
-#: classes/pref/feeds.php:1357
-#: js/PrefFeedTree.js:78
+#: classes/pref/feeds.php:1331
+#: js/PrefFeedTree.js:80
 msgid "Unsubscribe"
 msgstr "Wypisz się"
 
@@ -333,7 +332,7 @@ msgid "Other actions:"
 msgstr "Inne działania:"
 
 #: index.php:252
-#: include/functions2.php:81
+#: include/functions.php:1155
 msgid "Toggle widescreen mode"
 msgstr "Przełącz tryb szerokoekranowy"
 
@@ -359,7 +358,7 @@ msgstr ""
 
 #: prefs.php:33
 #: prefs.php:136
-#: include/functions2.php:110
+#: include/functions.php:1184
 #: classes/pref/prefs.php:435
 msgid "Preferences"
 msgstr "Ustawienia"
@@ -374,20 +373,19 @@ msgstr "Wyjdź z ustawień"
 
 #: prefs.php:139
 #: classes/pref/feeds.php:112
-#: classes/pref/feeds.php:1297
-#: classes/pref/feeds.php:1346
+#: classes/pref/feeds.php:1271
+#: classes/pref/feeds.php:1320
 msgid "Feeds"
 msgstr "Kanały"
 
 #: prefs.php:142
-#: classes/pref/filters.php:248
+#: classes/pref/filters.php:273
 msgid "Filters"
 msgstr "Filtry"
 
 #: prefs.php:145
-#: include/functions.php:1327
-#: include/functions.php:1979
 #: classes/pref/labels.php:90
+#: classes/feeds.php:1718
 msgid "Labels"
 msgstr "Etykiety"
 
@@ -416,13 +414,13 @@ msgstr "Rejestracja nowych użytkowników został zablokowana przez administrato
 #: register.php:337
 #: register.php:347
 #: register.php:359
-#: classes/handler/public.php:742
-#: classes/handler/public.php:813
-#: classes/handler/public.php:911
-#: classes/handler/public.php:990
-#: classes/handler/public.php:1004
-#: classes/handler/public.php:1011
-#: classes/handler/public.php:1036
+#: classes/handler/public.php:653
+#: classes/handler/public.php:724
+#: classes/handler/public.php:822
+#: classes/handler/public.php:901
+#: classes/handler/public.php:915
+#: classes/handler/public.php:922
+#: classes/handler/public.php:947
 msgid "Return to Tiny Tiny RSS"
 msgstr "Wróć do Tiny Tiny RSS"
 
@@ -439,12 +437,12 @@ msgid "Check availability"
 msgstr "Sprawdź dostępność"
 
 #: register.php:229
-#: classes/handler/public.php:829
+#: classes/handler/public.php:740
 msgid "Email:"
 msgstr "Email:"
 
 #: register.php:232
-#: classes/handler/public.php:834
+#: classes/handler/public.php:745
 msgid "How much is two plus two:"
 msgstr "Ile wynosi dwa plus dwa:"
 
@@ -472,17 +470,23 @@ msgstr "Konto zostało założone."
 msgid "New user registrations are currently closed."
 msgstr "Możliwość rejestracji jest obecnie wyłączona."
 
-#: update.php:67
+#: update.php:66
 msgid "Tiny Tiny RSS data update script."
 msgstr "Skrypt aktualizacji danych Tiny Tiny RSS."
 
-#: include/digest.php:109
-#: include/functions.php:1336
-#: include/functions.php:1880
-#: include/functions.php:1965
-#: include/functions.php:1987
-#: classes/opml.php:421
+#: include/controls.php:83
+#: classes/pref/filters.php:242
+#: classes/pref/filters.php:253
+#: classes/pref/filters.php:544
+msgid "All feeds"
+msgstr "Wszystkie kanały"
+
+#: include/controls.php:134
+#: include/controls.php:316
 #: classes/pref/feeds.php:228
+#: classes/opml.php:486
+#: classes/feeds.php:1727
+#: classes/digest.php:113
 msgid "Uncategorized"
 msgstr "Bez kategorii"
 
@@ -498,394 +502,287 @@ msgstr[2] "%d zarchiwizowanych artykułów"
 msgid "No feeds found."
 msgstr "Nie znaleziono kanałów."
 
-#: include/functions.php:1029
+#: include/functions.php:900
 #, php-format
 msgid "%d min"
 msgstr ""
 
-#: include/functions.php:1325
-#: include/functions.php:1977
-msgid "Special"
-msgstr "Specjalne"
-
-#: include/functions.php:1828
-#: classes/pref/filters.php:229
-#: classes/pref/filters.php:507
-msgid "All feeds"
-msgstr "Wszystkie kanały"
-
-#: include/functions.php:2032
-msgid "Starred articles"
-msgstr "Artykuły oznaczone gwiazdką"
-
-#: include/functions.php:2034
-msgid "Published articles"
-msgstr "Opublikowane artykuły"
-
-#: include/functions.php:2036
-msgid "Fresh articles"
-msgstr "Świeże artykuły"
-
-#: include/functions.php:2038
-#: include/functions2.php:105
-msgid "All articles"
-msgstr "Wszystkie artykuły"
-
-#: include/functions.php:2040
-msgid "Archived articles"
-msgstr "Zarchiwizowane artykuły"
-
-#: include/functions.php:2042
-msgid "Recently read"
-msgstr "Ostatnio czytane"
-
-#: include/functions2.php:57
+#: include/functions.php:1131
 msgid "Navigation"
 msgstr "Nawigacja"
 
-#: include/functions2.php:58
+#: include/functions.php:1132
 msgid "Open next feed"
 msgstr "Przejdź do następnego kanału"
 
-#: include/functions2.php:59
+#: include/functions.php:1133
 msgid "Open previous feed"
 msgstr "Otwórz poprzedni kanał"
 
-#: include/functions2.php:60
+#: include/functions.php:1134
 msgid "Open next article"
 msgstr "Otwórz następny artykuł"
 
-#: include/functions2.php:61
+#: include/functions.php:1135
 msgid "Open previous article"
 msgstr "Otwórz poprzedni artykuł"
 
-#: include/functions2.php:62
+#: include/functions.php:1136
 msgid "Open next article (don't scroll long articles)"
 msgstr "Otwórz następny artykuł (nie przewijaj długich artykułów)"
 
-#: include/functions2.php:63
+#: include/functions.php:1137
 msgid "Open previous article (don't scroll long articles)"
 msgstr "Otwórz poprzeni artykuł (nie przewijaj długich artykułów)"
 
-#: include/functions2.php:64
+#: include/functions.php:1138
 msgid "Move to next article (don't expand or mark read)"
 msgstr "Otwórz następny artykuł (nie rozszerzaj lub oznaczaj jako przeczytane)"
 
-#: include/functions2.php:65
+#: include/functions.php:1139
 msgid "Move to previous article (don't expand or mark read)"
 msgstr "Otwórz poprzeni artykuł (nie rozszerzaj lub oznaczaj jako przeczytane)"
 
-#: include/functions2.php:66
+#: include/functions.php:1140
 msgid "Show search dialog"
 msgstr "Otwórz okno wyszukiwania"
 
-#: include/functions2.php:67
+#: include/functions.php:1141
 msgid "Article"
 msgstr "Artykuł"
 
-#: include/functions2.php:68
-#: js/viewfeed.js:1699
+#: include/functions.php:1142
+#: js/viewfeed.js:1701
 msgid "Toggle starred"
 msgstr "Przełącz oznaczenie gwiazdką"
 
-#: include/functions2.php:69
-#: js/viewfeed.js:1711
+#: include/functions.php:1143
+#: js/viewfeed.js:1713
 msgid "Toggle published"
 msgstr "Przełącz flagę publikacji"
 
-#: include/functions2.php:70
-#: js/viewfeed.js:1686
+#: include/functions.php:1144
+#: js/viewfeed.js:1688
 msgid "Toggle unread"
 msgstr "Przełącz flagę \"przeczytano\""
 
-#: include/functions2.php:71
+#: include/functions.php:1145
 msgid "Edit tags"
 msgstr "Edytuj tagi"
 
-#: include/functions2.php:72
+#: include/functions.php:1146
 msgid "Open in new window"
 msgstr "Otwórz w nowym oknie"
 
-#: include/functions2.php:73
-#: js/viewfeed.js:1732
+#: include/functions.php:1147
+#: js/viewfeed.js:1734
 msgid "Mark below as read"
 msgstr "Oznacz poniższe jako przeczytane"
 
-#: include/functions2.php:74
-#: js/viewfeed.js:1725
+#: include/functions.php:1148
+#: js/viewfeed.js:1727
 msgid "Mark above as read"
 msgstr "Oznacz powyższe jako przeczytane"
 
-#: include/functions2.php:75
+#: include/functions.php:1149
 msgid "Scroll down"
 msgstr "Przewiń w dół"
 
-#: include/functions2.php:76
+#: include/functions.php:1150
 msgid "Scroll up"
 msgstr "Przewiń do góry"
 
-#: include/functions2.php:77
+#: include/functions.php:1151
 msgid "Select article under cursor"
 msgstr "Wybierz artykuł pod kursorem"
 
-#: include/functions2.php:78
+#: include/functions.php:1152
 msgid "Email article"
 msgstr "Prześlij artykuł emailem"
 
-#: include/functions2.php:79
+#: include/functions.php:1153
 msgid "Close/collapse article"
 msgstr "Zamknij/zwiń artykuł"
 
-#: include/functions2.php:80
+#: include/functions.php:1154
 msgid "Toggle article expansion (combined mode)"
 msgstr "Przełącz rozszerzanie artykułów (tryb scalony)"
 
-#: include/functions2.php:82
+#: include/functions.php:1156
 #: plugins/embed_original/init.php:31
 msgid "Toggle embed original"
 msgstr "Przełącza flagę \"wbuduj oryginalny artykuł\""
 
-#: include/functions2.php:83
+#: include/functions.php:1157
 msgid "Article selection"
 msgstr "Wybór artykułów"
 
-#: include/functions2.php:84
+#: include/functions.php:1158
 msgid "Select all articles"
 msgstr "Wybierz wszystkie artykuły"
 
-#: include/functions2.php:85
+#: include/functions.php:1159
 msgid "Select unread"
 msgstr "Wybierz nieprzeczytane"
 
-#: include/functions2.php:86
+#: include/functions.php:1160
 msgid "Select starred"
 msgstr "Wybierz oznaczone gwiazdką"
 
-#: include/functions2.php:87
+#: include/functions.php:1161
 msgid "Select published"
 msgstr "Wybierz opublikowane"
 
-#: include/functions2.php:88
+#: include/functions.php:1162
 msgid "Invert selection"
 msgstr "Odwróć zaznaczenie"
 
-#: include/functions2.php:89
+#: include/functions.php:1163
 msgid "Deselect everything"
 msgstr "Odznacz wszystko"
 
-#: include/functions2.php:90
+#: include/functions.php:1164
 #: classes/pref/feeds.php:555
-#: classes/pref/feeds.php:823
+#: classes/pref/feeds.php:811
 msgid "Feed"
 msgstr "Kanał"
 
-#: include/functions2.php:91
+#: include/functions.php:1165
 msgid "Refresh current feed"
 msgstr "Odśwież bieżący kanał"
 
-#: include/functions2.php:92
+#: include/functions.php:1166
 msgid "Un/hide read feeds"
 msgstr "Pokaż/Ukryj przeczytane kanały"
 
-#: include/functions2.php:93
-#: classes/pref/feeds.php:1349
+#: include/functions.php:1167
+#: classes/pref/feeds.php:1323
 msgid "Subscribe to feed"
 msgstr "Prenumeruj kanał"
 
-#: include/functions2.php:94
+#: include/functions.php:1168
 #: js/FeedTree.js:145
-#: js/PrefFeedTree.js:72
-#: js/viewfeed.js:1853
+#: js/PrefFeedTree.js:74
+#: js/viewfeed.js:1855
 msgid "Edit feed"
 msgstr "Edytuj kanał"
 
-#: include/functions2.php:96
+#: include/functions.php:1170
 msgid "Reverse headlines"
 msgstr "Odwróć kolejność nagłówków"
 
-#: include/functions2.php:97
+#: include/functions.php:1171
 msgid "Toggle headline grouping"
 msgstr ""
 
-#: include/functions2.php:98
+#: include/functions.php:1172
 msgid "Debug feed update"
 msgstr "Testuj aktualizację kanałów"
 
-#: include/functions2.php:99
+#: include/functions.php:1173
 #, fuzzy
 msgid "Debug viewfeed()"
 msgstr "Testuj aktualizację kanałów"
 
-#: include/functions2.php:100
+#: include/functions.php:1174
 #: js/FeedTree.js:194
 msgid "Mark all feeds as read"
 msgstr "Oznacz wszystkie kanały jako przeczytane"
 
-#: include/functions2.php:101
+#: include/functions.php:1175
 msgid "Un/collapse current category"
 msgstr "Zwiń/rozwiń bieżącą kategorię"
 
-#: include/functions2.php:102
+#: include/functions.php:1176
 msgid "Toggle combined mode"
 msgstr "Przełącz tryb scalony"
 
-#: include/functions2.php:103
+#: include/functions.php:1177
 msgid "Toggle auto expand in combined mode"
 msgstr "Przełącz automatyczne rozszerzanie artykułów w trybie scalonym"
 
-#: include/functions2.php:104
+#: include/functions.php:1178
 msgid "Go to"
 msgstr "Idź do"
 
-#: include/functions2.php:106
+#: include/functions.php:1179
+#: classes/feeds.php:1602
+msgid "All articles"
+msgstr "Wszystkie artykuły"
+
+#: include/functions.php:1180
 msgid "Fresh"
 msgstr "Świeży"
 
-#: include/functions2.php:109
-#: js/tt-rss.js:494
-#: js/tt-rss.js:663
+#: include/functions.php:1183
+#: js/tt-rss.js:495
+#: js/tt-rss.js:664
 msgid "Tag cloud"
 msgstr "Chmura tagów"
 
-#: include/functions2.php:111
+#: include/functions.php:1185
 msgid "Other"
 msgstr "Inne"
 
-#: include/functions2.php:112
+#: include/functions.php:1186
 #: classes/pref/labels.php:267
 msgid "Create label"
 msgstr "Utwórz etykietę"
 
-#: include/functions2.php:113
-#: classes/pref/filters.php:753
+#: include/functions.php:1187
+#: classes/pref/filters.php:793
 msgid "Create filter"
 msgstr "Utwórz filtr"
 
-#: include/functions2.php:114
+#: include/functions.php:1188
 msgid "Un/collapse sidebar"
 msgstr "Zwin/rozwiń pasek boczny"
 
-#: include/functions2.php:115
+#: include/functions.php:1189
 msgid "Show help dialog"
 msgstr "Otwórz okno pomocy"
 
-#: include/functions2.php:670
-#, php-format
-msgid "Search results: %s"
-msgstr "Wyniki wyszukiwania: %s"
-
-#: include/functions2.php:1336
-#: classes/feeds.php:752
-#, fuzzy
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] "Komentarze?"
-msgstr[1] "Komentarze?"
-msgstr[2] "Komentarze?"
-
-#: include/functions2.php:1340
-#: classes/feeds.php:756
-#, fuzzy
-msgid "comments"
-msgstr "Komentarze?"
-
-#: include/functions2.php:1366
-msgid " - "
-msgstr " - "
-
-#: include/functions2.php:1397
-#: include/functions2.php:1648
-#: classes/article.php:311
-msgid "no tags"
-msgstr "brak tagów"
-
-#: include/functions2.php:1407
-#: classes/feeds.php:738
-msgid "Edit tags for this article"
-msgstr "Edytuj tagi dla tego artykułu"
-
-#: include/functions2.php:1439
-#: classes/feeds.php:690
-msgid "Originally from:"
-msgstr "Oryginał pochodzi z:"
-
-#: include/functions2.php:1452
-#: classes/pref/feeds.php:574
-#: classes/feeds.php:703
-msgid "Feed URL"
-msgstr "Adres kanału"
-
-#: include/functions2.php:1489
-#: classes/backend.php:105
-#: classes/dlg.php:37
-#: classes/dlg.php:60
-#: classes/dlg.php:93
-#: classes/dlg.php:159
-#: classes/dlg.php:186
-#: classes/pref/feeds.php:1652
-#: classes/pref/feeds.php:1718
-#: classes/pref/filters.php:204
-#: classes/pref/prefs.php:1097
-#: plugins/af_psql_trgm/init.php:102
-#: plugins/import_export/init.php:415
-#: plugins/import_export/init.php:461
-#: plugins/share/init.php:121
-msgid "Close this window"
-msgstr "Zamknij to okno"
-
-#: include/functions2.php:1686
-msgid "(edit note)"
-msgstr "(edytuj notatkę)"
-
-#: include/functions2.php:1960
-msgid "unknown type"
-msgstr "nieznany typ"
-
-#: include/functions2.php:2037
-msgid "Attachments"
-msgstr "Załączniki"
-
-#: include/functions2.php:2496
+#: include/functions.php:2456
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: include/functions2.php:2497
+#: include/functions.php:2457
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: include/functions2.php:2498
+#: include/functions.php:2458
 msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
 msgstr ""
 
-#: include/functions2.php:2499
+#: include/functions.php:2459
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: include/functions2.php:2500
+#: include/functions.php:2460
 #, fuzzy
 msgid "No file was uploaded"
 msgstr "Nie przesłano żadnego pliku."
 
-#: include/functions2.php:2501
+#: include/functions.php:2461
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: include/functions2.php:2502
+#: include/functions.php:2462
 msgid "Failed to write file to disk."
 msgstr ""
 
-#: include/functions2.php:2503
+#: include/functions.php:2463
 msgid "A PHP extension stopped the file upload."
 msgstr ""
 
 #: include/login_form.php:197
-#: classes/handler/public.php:569
-#: classes/handler/public.php:824
+#: classes/handler/public.php:480
+#: classes/handler/public.php:735
 msgid "Login:"
 msgstr "Nazwa użytkownika:"
 
 #: include/login_form.php:207
-#: classes/handler/public.php:572
+#: classes/handler/public.php:483
 msgid "Password:"
 msgstr "Hasło:"
 
@@ -898,7 +795,7 @@ msgid "Profile:"
 msgstr "Profil:"
 
 #: include/login_form.php:223
-#: classes/handler/public.php:311
+#: classes/handler/public.php:287
 #: classes/pref/prefs.php:1035
 #: classes/rpc.php:63
 msgid "Default profile"
@@ -917,7 +814,7 @@ msgid "Remember me"
 msgstr "Pamiętaj mnie"
 
 #: include/login_form.php:249
-#: classes/handler/public.php:577
+#: classes/handler/public.php:488
 msgid "Log in"
 msgstr "Zaloguj"
 
@@ -933,145 +830,44 @@ msgstr "Nie powiodła się weryfikacja sesji (nie znaleziono użytkownika)"
 msgid "Session failed to validate (password changed)"
 msgstr "Nie powiodła się weryfikacja sesji (zmienione hasło)"
 
-#: classes/article.php:25
-msgid "Article not found."
-msgstr "Artykuł nie został znaleziony."
-
-#: classes/article.php:197
-msgid "Tags for this article (separated by commas):"
-msgstr "Tagi dla tego artykułu (oddzielone przecinkami):"
-
-#: classes/article.php:222
-#: classes/pref/labels.php:79
-#: classes/pref/users.php:98
-#: classes/pref/feeds.php:801
-#: classes/pref/feeds.php:943
-#: classes/pref/filters.php:485
-#: classes/pref/prefs.php:981
-#: plugins/instances/init.php:245
-#: plugins/nsfw/init.php:85
-#: plugins/note/init.php:51
-#: plugins/af_readability/init.php:68
-#: plugins/af_redditimgur/init.php:60
-#: plugins/af_psql_trgm/init.php:181
-#: plugins/mail/init.php:64
-#: plugins/af_zz_imgproxy/init.php:213
-msgid "Save"
-msgstr "Zapisz"
-
-#: classes/article.php:224
-#: classes/handler/public.php:546
-#: classes/handler/public.php:580
-#: classes/pref/labels.php:81
-#: classes/pref/users.php:100
-#: classes/pref/feeds.php:802
-#: classes/pref/feeds.php:946
-#: classes/pref/feeds.php:1859
-#: classes/pref/filters.php:488
-#: classes/pref/filters.php:902
-#: classes/pref/filters.php:983
-#: classes/pref/filters.php:1076
-#: classes/pref/prefs.php:983
-#: classes/feeds.php:1105
-#: classes/feeds.php:1155
-#: classes/feeds.php:1192
-#: plugins/instances/init.php:248
-#: plugins/instances/init.php:436
-#: plugins/note/init.php:53
-#: plugins/mail/init.php:173
-msgid "Cancel"
-msgstr "Anuluj"
-
-#: classes/opml.php:28
-#: classes/opml.php:33
-msgid "OPML Utility"
-msgstr "Narzędzie OPML"
-
-#: classes/opml.php:37
-msgid "Importing OPML..."
-msgstr "Importowanie OPML..."
-
-#: classes/opml.php:41
-msgid "Return to preferences"
-msgstr "Wróć do ustawień"
-
-#: classes/opml.php:271
-#, php-format
-msgid "Adding feed: %s"
-msgstr "Dodaję kanał: %s"
-
-#: classes/opml.php:282
-#, php-format
-msgid "Duplicate feed: %s"
-msgstr "Duplikat kanału: %s"
-
-#: classes/opml.php:296
-#, php-format
-msgid "Adding label %s"
-msgstr "Dodaję etykietę %s"
-
-#: classes/opml.php:299
-#, php-format
-msgid "Duplicate label: %s"
-msgstr "Duplikat etykiety: %s"
-
-#: classes/opml.php:311
-#, php-format
-msgid "Setting preference key %s to %s"
-msgstr "Ustawiam wartość parametru %s na %s"
-
-#: classes/opml.php:343
-msgid "Adding filter..."
-msgstr "Dodaję filtr..."
-
-#: classes/opml.php:421
-#, php-format
-msgid "Processing category: %s"
-msgstr "Przetwarzam kategorię: %s"
-
-#: classes/opml.php:470
-#, php-format
-msgid "Upload failed with error code %d"
-msgstr "Przesyłanie pliku zakończone błędem numer %d"
-
-#: classes/opml.php:484
-#: plugins/import_export/init.php:442
-msgid "Unable to move uploaded file."
-msgstr "Nie udało się przenieść przesłanego pliku."
-
-#: classes/opml.php:488
-#: plugins/import_export/init.php:446
-msgid "Error: please upload OPML file."
-msgstr "Błąd: proszę wgrać plik OPML."
-
-#: classes/opml.php:499
-msgid "Error: unable to find moved OPML file."
-msgstr "Błąd: nie udało się przenieść pliku OPML."
-
-#: classes/opml.php:506
-msgid "Error while parsing document."
-msgstr "Błąd przetwarzania dokumentu."
-
-#: classes/backend.php:33
+#: classes/backend.php:31
 msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
 msgstr "Inne wskazówki dotyczące interfejsu znajdziesz na wiki Tiny Tiny RSS."
 
-#: classes/backend.php:38
+#: classes/backend.php:36
 msgid "Keyboard Shortcuts"
 msgstr "Skróty klawiszowe"
 
-#: classes/backend.php:61
+#: classes/backend.php:59
 msgid "Shift"
 msgstr "Shift"
 
-#: classes/backend.php:64
+#: classes/backend.php:62
 msgid "Ctrl"
 msgstr "Ctrl"
 
-#: classes/backend.php:99
+#: classes/backend.php:97
 msgid "Help topic not found."
 msgstr "Temat pomocy nie został znaleziony."
 
+#: classes/backend.php:103
+#: classes/dlg.php:37
+#: classes/dlg.php:60
+#: classes/dlg.php:93
+#: classes/dlg.php:159
+#: classes/dlg.php:186
+#: classes/article.php:744
+#: classes/pref/filters.php:206
+#: classes/pref/prefs.php:1097
+#: classes/pref/feeds.php:1626
+#: classes/pref/feeds.php:1692
+#: plugins/import_export/init.php:421
+#: plugins/import_export/init.php:467
+#: plugins/af_psql_trgm/init.php:102
+#: plugins/share/init.php:120
+msgid "Close this window"
+msgstr "Zamknij to okno"
+
 #: classes/dlg.php:17
 msgid "If you have imported labels and/or filters, you might need to reload preferences to see your new data."
 msgstr "Jeżeli posiadasz zaimportowane etykiety i/lub filtry, aby zobaczyć nowe dane możesz musieć przeładować ustawienia."
@@ -1082,7 +878,7 @@ msgstr "Twój publiczny adres OPML to:"
 
 #: classes/dlg.php:57
 #: classes/dlg.php:183
-#: plugins/share/init.php:118
+#: plugins/share/init.php:117
 msgid "Generate new URL"
 msgstr "Wygeneruj nowy adres"
 
@@ -1103,130 +899,227 @@ msgstr "Aktualizacja kanału z wykorzystaniem zewnętrznego procesu aktualizacji
 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/handler/public.php:510
+#: classes/article.php:25
+msgid "Article not found."
+msgstr "Artykuł nie został znaleziony."
+
+#: classes/article.php:197
+msgid "Tags for this article (separated by commas):"
+msgstr "Tagi dla tego artykułu (oddzielone przecinkami):"
+
+#: classes/article.php:222
+#: classes/pref/labels.php:79
+#: classes/pref/filters.php:519
+#: classes/pref/users.php:98
+#: classes/pref/prefs.php:981
+#: classes/pref/feeds.php:789
+#: classes/pref/feeds.php:931
+#: plugins/af_psql_trgm/init.php:181
+#: plugins/nsfw/init.php:85
+#: plugins/af_readability/init.php:68
+#: plugins/mail/init.php:64
+#: plugins/af_redditimgur/init.php:60
+#: plugins/note/init.php:51
+#: plugins/af_zz_imgproxy/init.php:240
+msgid "Save"
+msgstr "Zapisz"
+
+#: classes/article.php:224
+#: classes/handler/public.php:457
+#: classes/handler/public.php:491
+#: classes/pref/labels.php:81
+#: classes/pref/filters.php:522
+#: classes/pref/filters.php:942
+#: classes/pref/filters.php:1022
+#: classes/pref/filters.php:1115
+#: classes/pref/users.php:100
+#: classes/pref/prefs.php:983
+#: classes/pref/feeds.php:790
+#: classes/pref/feeds.php:934
+#: classes/pref/feeds.php:1833
+#: classes/feeds.php:1098
+#: classes/feeds.php:1148
+#: classes/feeds.php:1185
+#: plugins/mail/init.php:173
+#: plugins/note/init.php:53
+msgid "Cancel"
+msgstr "Anuluj"
+
+#: classes/article.php:311
+#: classes/article.php:652
+#: classes/article.php:805
+msgid "no tags"
+msgstr "brak tagów"
+
+#: classes/article.php:419
+msgid "unknown type"
+msgstr "nieznany typ"
+
+#: classes/article.php:496
+msgid "Attachments"
+msgstr "Załączniki"
+
+#: classes/article.php:591
+#: classes/feeds.php:741
+#, fuzzy
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] "Komentarze?"
+msgstr[1] "Komentarze?"
+msgstr[2] "Komentarze?"
+
+#: classes/article.php:595
+#: classes/feeds.php:745
+#, fuzzy
+msgid "comments"
+msgstr "Komentarze?"
+
+#: classes/article.php:621
+msgid " - "
+msgstr " - "
+
+#: classes/article.php:662
+#: classes/feeds.php:727
+msgid "Edit tags for this article"
+msgstr "Edytuj tagi dla tego artykułu"
+
+#: classes/article.php:694
+#: classes/feeds.php:681
+msgid "Originally from:"
+msgstr "Oryginał pochodzi z:"
+
+#: classes/article.php:707
+#: classes/pref/feeds.php:574
+#: classes/feeds.php:694
+msgid "Feed URL"
+msgstr "Adres kanału"
+
+#: classes/article.php:843
+msgid "(edit note)"
+msgstr "(edytuj notatkę)"
+
+#: classes/handler/public.php:421
 #: plugins/bookmarklets/init.php:40
 msgid "Share with Tiny Tiny RSS"
 msgstr "Udostępnij za pomocą Tiny Tiny RSS"
 
-#: classes/handler/public.php:518
+#: classes/handler/public.php:429
 msgid "Title:"
 msgstr "Tytuł:"
 
-#: classes/handler/public.php:520
+#: classes/handler/public.php:431
 #: classes/pref/feeds.php:572
-#: plugins/instances/init.php:212
-#: plugins/instances/init.php:401
 msgid "URL:"
 msgstr "Adres:"
 
-#: classes/handler/public.php:522
+#: classes/handler/public.php:433
 msgid "Content:"
 msgstr "Treść:"
 
-#: classes/handler/public.php:524
+#: classes/handler/public.php:435
 msgid "Labels:"
 msgstr "Etykiety:"
 
-#: classes/handler/public.php:543
+#: classes/handler/public.php:454
 msgid "Shared article will appear in the Published feed."
 msgstr "Udostępniany artykuł będzie wyświetlany w Publikowanych kanałach."
 
-#: classes/handler/public.php:545
+#: classes/handler/public.php:456
 msgid "Share"
 msgstr "Udostępnij"
 
-#: classes/handler/public.php:567
+#: classes/handler/public.php:478
 msgid "Not logged in"
 msgstr "Nie zalogowany"
 
-#: classes/handler/public.php:626
+#: classes/handler/public.php:537
 msgid "Incorrect username or password"
 msgstr "Nieprawidłowa nazwa użytkownika lub hasło"
 
-#: classes/handler/public.php:678
+#: classes/handler/public.php:589
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "Prenumerujesz już kanał <b>%s</b>."
 
-#: classes/handler/public.php:681
+#: classes/handler/public.php:592
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "Zaprenumerowano kanał <b>%s</b>."
 
-#: classes/handler/public.php:684
+#: classes/handler/public.php:595
 #, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "Nie udało się zaprenumerować <b>%s</b>."
 
-#: classes/handler/public.php:687
+#: classes/handler/public.php:598
 #, php-format
 msgid "No feeds found in <b>%s</b>."
 msgstr "Nie znaleziono kanałów w <b>%s</b>."
 
-#: classes/handler/public.php:690
+#: classes/handler/public.php:601
 msgid "Multiple feed URLs found."
 msgstr "Znaleziono wiele adresów kanałów."
 
-#: classes/handler/public.php:694
+#: classes/handler/public.php:605
 #, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr "Nie udało się zaprenumerować <b>%s</b>. Nie udało się pobrać adresu kanału."
 
-#: classes/handler/public.php:712
+#: classes/handler/public.php:623
 msgid "Subscribe to selected feed"
 msgstr "Prenumeruj wybrany kanał"
 
-#: classes/handler/public.php:737
+#: classes/handler/public.php:648
 msgid "Edit subscription options"
 msgstr "Edytuj opcje prenumeraty"
 
-#: classes/handler/public.php:774
+#: classes/handler/public.php:685
 msgid "Password recovery"
 msgstr "Odzyskiwanie hasła"
 
-#: classes/handler/public.php:817
+#: classes/handler/public.php:728
 #, fuzzy
 msgid "You will need to provide valid account name and email. A password reset link will be sent to your email address."
 msgstr "Będziesz musiał podać prawidłową nazwę konta oraz adres email. Nowe hasło zostanie przesłane na Twój adres email."
 
-#: classes/handler/public.php:839
-#: classes/pref/users.php:350
+#: classes/handler/public.php:750
+#: classes/pref/users.php:349
 msgid "Reset password"
 msgstr "Resetuj hasło"
 
-#: classes/handler/public.php:849
+#: classes/handler/public.php:760
 msgid "Some of the required form parameters are missing or incorrect."
 msgstr "Niektóre z wymaganych parametrów są nieprawidłowe lub nie zostały wprowadzone."
 
-#: classes/handler/public.php:853
-#: classes/handler/public.php:919
+#: classes/handler/public.php:764
+#: classes/handler/public.php:830
 msgid "Go back"
 msgstr "Cofnij"
 
-#: classes/handler/public.php:890
+#: classes/handler/public.php:801
 #, fuzzy
 msgid "[tt-rss] Password reset request"
 msgstr "[tt-rss] Informacja o zmianie hasła"
 
-#: classes/handler/public.php:915
+#: classes/handler/public.php:826
 msgid "Sorry, login and email combination not found."
 msgstr "Przykro mi, podana kombinacja nazwy użytkownika i adresu email nie została oznaleziona."
 
-#: classes/handler/public.php:937
+#: classes/handler/public.php:848
 msgid "Your access level is insufficient to run this script."
 msgstr "Twój poziom dostępu jest niewystarczający do uruchomienia tego skryptu."
 
-#: classes/handler/public.php:963
+#: classes/handler/public.php:874
 msgid "Database Updater"
 msgstr "Aktualizator bazy danych"
 
-#: classes/handler/public.php:1028
+#: classes/handler/public.php:939
 msgid "Perform updates"
 msgstr "Przeprowadź aktualizacje"
 
 #: classes/pref/labels.php:22
-#: classes/pref/filters.php:348
-#: classes/pref/filters.php:823
+#: classes/pref/filters.php:373
+#: classes/pref/filters.php:863
 msgid "Caption"
 msgstr "Opis"
 
@@ -1248,59 +1141,55 @@ msgid "Created label <b>%s</b>"
 msgstr "Utworzono etykietę <b>%s</b>"
 
 #: classes/pref/labels.php:258
-#: classes/pref/users.php:334
-#: classes/pref/feeds.php:1337
-#: classes/pref/feeds.php:1600
-#: classes/pref/feeds.php:1664
-#: classes/pref/filters.php:359
-#: classes/pref/filters.php:407
-#: classes/pref/filters.php:744
-#: classes/pref/filters.php:832
-#: classes/pref/filters.php:859
+#: classes/pref/filters.php:384
+#: classes/pref/filters.php:441
+#: classes/pref/filters.php:784
+#: classes/pref/filters.php:872
+#: classes/pref/filters.php:899
+#: classes/pref/users.php:333
 #: classes/pref/prefs.php:992
-#: plugins/instances/init.php:284
+#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1574
+#: classes/pref/feeds.php:1638
 msgid "Select"
 msgstr "Wybierz"
 
 #: classes/pref/labels.php:261
-#: classes/pref/users.php:337
-#: classes/pref/feeds.php:1340
-#: classes/pref/feeds.php:1603
-#: classes/pref/feeds.php:1667
-#: classes/pref/filters.php:362
-#: classes/pref/filters.php:410
-#: classes/pref/filters.php:747
-#: classes/pref/filters.php:835
-#: classes/pref/filters.php:862
+#: classes/pref/filters.php:387
+#: classes/pref/filters.php:444
+#: classes/pref/filters.php:787
+#: classes/pref/filters.php:875
+#: classes/pref/filters.php:902
+#: classes/pref/users.php:336
 #: classes/pref/prefs.php:995
+#: classes/pref/feeds.php:1314
+#: classes/pref/feeds.php:1577
+#: classes/pref/feeds.php:1641
 #: classes/feeds.php:102
-#: plugins/instances/init.php:287
 msgid "All"
 msgstr "Wszystko"
 
 #: classes/pref/labels.php:263
-#: classes/pref/users.php:339
-#: classes/pref/feeds.php:1342
-#: classes/pref/feeds.php:1605
-#: classes/pref/feeds.php:1669
-#: classes/pref/filters.php:364
-#: classes/pref/filters.php:412
-#: classes/pref/filters.php:749
-#: classes/pref/filters.php:837
-#: classes/pref/filters.php:864
+#: classes/pref/filters.php:389
+#: classes/pref/filters.php:446
+#: classes/pref/filters.php:789
+#: classes/pref/filters.php:877
+#: classes/pref/filters.php:904
+#: classes/pref/users.php:338
 #: classes/pref/prefs.php:997
+#: classes/pref/feeds.php:1316
+#: classes/pref/feeds.php:1579
+#: classes/pref/feeds.php:1643
 #: classes/feeds.php:105
-#: plugins/instances/init.php:289
 msgid "None"
 msgstr "Nic"
 
 #: classes/pref/labels.php:270
-#: classes/pref/users.php:348
+#: classes/pref/filters.php:512
+#: classes/pref/filters.php:806
+#: classes/pref/users.php:347
 #: classes/pref/feeds.php:767
-#: classes/pref/filters.php:478
-#: classes/pref/filters.php:766
-#: classes/feeds.php:1154
-#: plugins/instances/init.php:294
+#: classes/feeds.php:1147
 msgid "Remove"
 msgstr "Usuń"
 
@@ -1308,9 +1197,173 @@ msgstr "Usuń"
 msgid "Clear colors"
 msgstr "Wyczyść kolory"
 
+#: classes/pref/filters.php:153
+#, fuzzy
+msgid "Preview article"
+msgstr "Świeże artykuły"
+
+#: classes/pref/filters.php:264
+#: classes/pref/filters.php:558
+msgid "(inverse)"
+msgstr "(odwróć)"
+
+#: classes/pref/filters.php:260
+#: classes/pref/filters.php:557
+#, php-format
+msgid "%s on %s in %s %s"
+msgstr "%s na %s w %s %s"
+
+#: classes/pref/filters.php:379
+#: classes/pref/filters.php:867
+#: classes/pref/filters.php:981
+msgid "Match"
+msgstr "Dopasuj"
+
+#: classes/pref/filters.php:393
+#: classes/pref/filters.php:450
+#: classes/pref/filters.php:881
+#: classes/pref/filters.php:908
+msgid "Add"
+msgstr "Dodaj"
+
+#: classes/pref/filters.php:396
+#: classes/pref/filters.php:453
+#: classes/pref/filters.php:884
+#: classes/pref/filters.php:911
+#: classes/feeds.php:122
+msgid "Delete"
+msgstr "Usuń"
+
+#: classes/pref/filters.php:436
+#: classes/pref/filters.php:894
+msgid "Apply actions"
+msgstr "Zastosuj działania"
+
+#: classes/pref/filters.php:486
+#: classes/pref/filters.php:923
+msgid "Enabled"
+msgstr "Włączone"
+
+#: classes/pref/filters.php:495
+#: classes/pref/filters.php:926
+msgid "Match any rule"
+msgstr "Pasuje do dowolnej reguły"
+
+#: classes/pref/filters.php:504
+#: classes/pref/filters.php:929
+msgid "Inverse matching"
+msgstr "Odwróć dopasowanie"
+
+#: classes/pref/filters.php:516
+#: classes/pref/filters.php:936
+msgid "Test"
+msgstr "Testuj"
+
+#: classes/pref/filters.php:780
+#: classes/pref/users.php:323
+#: classes/pref/feeds.php:1307
+#: classes/feeds.php:1118
+#: classes/feeds.php:1184
+#: js/tt-rss.js:165
+msgid "Search"
+msgstr "Szukaj"
+
+#: classes/pref/filters.php:796
+msgid "Combine"
+msgstr "Połącz"
+
+#: classes/pref/filters.php:799
+#: classes/pref/users.php:345
+msgid "Edit"
+msgstr "Edytuj"
+
+#: classes/pref/filters.php:802
+#: classes/pref/feeds.php:1327
+#: classes/pref/feeds.php:1341
+msgid "Reset sort order"
+msgstr "Zresetuj porządek sortowania"
+
+#: classes/pref/filters.php:810
+#: classes/pref/feeds.php:1363
+msgid "Rescore articles"
+msgstr "Przywróć artykuły"
+
+#: classes/pref/filters.php:939
+msgid "Create"
+msgstr "Utwórz"
+
+#: classes/pref/filters.php:993
+msgid "Inverse regular expression matching"
+msgstr "Odwróć dopasowywanie wyrażeniami regularnymi"
+
+#: classes/pref/filters.php:995
+msgid "on field"
+msgstr "pole"
+
+#: classes/pref/filters.php:1001
+#: js/PrefFilterTree.js:64
+msgid "in"
+msgstr "w"
+
+#: classes/pref/filters.php:1014
+#, fuzzy
+msgid "Wiki: Filters"
+msgstr "Filtry"
+
+#: classes/pref/filters.php:1019
+msgid "Save rule"
+msgstr "Zapisz regułę"
+
+#: classes/pref/filters.php:1019
+#: js/functions.js:865
+msgid "Add rule"
+msgstr "Dodaj regułę"
+
+#: classes/pref/filters.php:1042
+msgid "Perform Action"
+msgstr "Wykonaj operację"
+
+#: classes/pref/filters.php:1093
+#, fuzzy
+msgid "No actions available"
+msgstr "Dostępna jest nowa wersja!"
+
+#: classes/pref/filters.php:1112
+msgid "Save action"
+msgstr "Zapisz działanie"
+
+#: classes/pref/filters.php:1112
+#: js/functions.js:887
+msgid "Add action"
+msgstr "Dodaj działania"
+
+#: classes/pref/filters.php:1136
+msgid "[No caption]"
+msgstr "[Brak opisu]"
+
+#: classes/pref/filters.php:1138
+#, fuzzy, php-format
+msgid "%s (%d rule)"
+msgid_plural "%s (%d rules)"
+msgstr[0] "Dodaj regułę"
+msgstr[1] "Dodaj regułę"
+msgstr[2] "Dodaj regułę"
+
+#: classes/pref/filters.php:1153
+#, fuzzy
+msgid "matches any rule"
+msgstr "Pasuje do dowolnej reguły"
+
+#: classes/pref/filters.php:1156
+#, fuzzy, php-format
+msgid "%s (+%d action)"
+msgid_plural "%s (+%d actions)"
+msgstr[0] "Dodaj działania"
+msgstr[1] "Dodaj działania"
+msgstr[2] "Dodaj działania"
+
 #: classes/pref/users.php:6
 #: classes/pref/system.php:8
-#: plugins/instances/init.php:154
 msgid "Your access level is insufficient to open this tab."
 msgstr "Twój poziom uprawnień jest niewystarczający aby otworzyć tę zakładkę."
 
@@ -1321,8 +1374,8 @@ msgstr "Edytuj regułę"
 
 #: classes/pref/users.php:56
 #: classes/pref/feeds.php:637
-#: classes/pref/feeds.php:878
-#: classes/feeds.php:1075
+#: classes/pref/feeds.php:866
+#: classes/feeds.php:1068
 msgid "Authentication"
 msgstr "Uwierzytelnianie"
 
@@ -1332,7 +1385,7 @@ msgstr "Poziom dostępu: "
 
 #: classes/pref/users.php:77
 #: classes/pref/feeds.php:667
-#: classes/pref/feeds.php:896
+#: classes/pref/feeds.php:884
 msgid "Options"
 msgstr "Opcje"
 
@@ -1346,7 +1399,7 @@ msgid "User not found"
 msgstr "Użytkownik nie został odnaleziony"
 
 #: classes/pref/users.php:132
-#: classes/pref/users.php:400
+#: classes/pref/users.php:399
 msgid "Registered"
 msgstr "Zarejestrowany"
 
@@ -1364,7 +1417,7 @@ msgid "Stored articles"
 msgstr "Artykuły oznaczone gwiazdką"
 
 #: classes/pref/users.php:145
-#: classes/pref/users.php:399
+#: classes/pref/users.php:398
 msgid "Subscribed feeds"
 msgstr "Prenumerowane kanały"
 
@@ -1383,510 +1436,57 @@ msgstr "Nie udało się utworzyć użytkownika <b>%s</b>"
 msgid "User <b>%s</b> already exists."
 msgstr "Użytkownik <b>%s</b> już istnieje."
 
-#: classes/pref/users.php:265
+#: classes/pref/users.php:264
 #, php-format
 msgid "Changed password of user <b>%s</b> to <b>%s</b>"
 msgstr "Zmieniono hasło użytkownika <b>%s</b> na <b>%s</b>"
 
-#: classes/pref/users.php:267
+#: classes/pref/users.php:266
 #, php-format
 msgid "Sending new password of user <b>%s</b> to <b>%s</b>"
 msgstr "Wysyłam nowe hasło dla użytkownika <b>%s</b> na adres <b>%s</b>"
 
-#: classes/pref/users.php:291
+#: classes/pref/users.php:290
 msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] Informacja o zmianie hasła"
 
-#: classes/pref/users.php:324
-#: classes/pref/feeds.php:1333
-#: classes/pref/filters.php:740
-#: classes/feeds.php:1125
-#: classes/feeds.php:1191
-#: js/tt-rss.js:165
-msgid "Search"
-msgstr "Szukaj"
-
-#: classes/pref/users.php:342
+#: classes/pref/users.php:341
 msgid "Create user"
 msgstr "Utwórz użytkownika"
 
-#: classes/pref/users.php:346
-#: classes/pref/filters.php:759
-#: plugins/instances/init.php:293
-msgid "Edit"
-msgstr "Edytuj"
-
-#: classes/pref/users.php:397
+#: classes/pref/users.php:396
 #: classes/pref/feeds.php:643
-#: classes/pref/feeds.php:882
-#: classes/pref/feeds.php:1836
-#: classes/feeds.php:1079
+#: classes/pref/feeds.php:870
+#: classes/pref/feeds.php:1810
+#: classes/feeds.php:1072
 msgid "Login"
 msgstr "Nazwa użytkownika"
 
-#: classes/pref/users.php:398
+#: classes/pref/users.php:397
 msgid "Access Level"
 msgstr "Poziom dostępu"
 
-#: classes/pref/users.php:401
+#: classes/pref/users.php:400
 msgid "Last login"
 msgstr "Ostatnie logowanie"
 
-#: classes/pref/users.php:420
-#: plugins/instances/init.php:334
+#: classes/pref/users.php:419
 msgid "Click to edit"
 msgstr "Kliknij aby edytować"
 
-#: classes/pref/users.php:441
+#: classes/pref/users.php:440
 msgid "No users defined."
 msgstr "Nie zdefiniowano żadnego użytkownika."
 
-#: classes/pref/users.php:443
+#: classes/pref/users.php:442
 msgid "No matching users found."
 msgstr "Nie odnaleziono pasującego użytkownika."
 
-#: classes/pref/system.php:29
-msgid "Error Log"
-msgstr "Dziennik błędów"
-
-#: classes/pref/system.php:40
-msgid "Refresh"
-msgstr "Odśwież"
-
-#: classes/pref/system.php:43
-msgid "Clear log"
-msgstr "Wyczyść dziennik"
-
-#: classes/pref/system.php:48
-msgid "Error"
-msgstr "Błąd"
-
-#: classes/pref/system.php:49
-msgid "Filename"
-msgstr "Nazwa pliku"
-
-#: classes/pref/system.php:50
-msgid "Message"
-msgstr "Wiadomość"
-
-#: classes/pref/system.php:52
-msgid "Date"
-msgstr "Data"
-
-#: classes/pref/feeds.php:15
-msgid "Check to enable field"
-msgstr "Zaznacz aby uaktywnić pole"
-
-#: classes/pref/feeds.php:65
-#: classes/pref/feeds.php:214
-#: classes/pref/feeds.php:258
-#: classes/pref/feeds.php:264
-#: classes/pref/feeds.php:290
-#, php-format
-msgid "(%d feed)"
-msgid_plural "(%d feeds)"
-msgstr[0] "(%d kanał)"
-msgstr[1] "(%d kanały)"
-msgstr[2] "(%d kanałów)"
-
-#: classes/pref/feeds.php:537
 #: classes/pref/prefs.php:18
+#: classes/pref/feeds.php:537
 msgid "General"
 msgstr "Ogólne"
 
-#: classes/pref/feeds.php:561
-msgid "Feed Title"
-msgstr "Tytuł kanału"
-
-#: classes/pref/feeds.php:595
-#: classes/pref/feeds.php:830
-#: classes/pref/feeds.php:1822
-#: classes/feeds.php:1055
-msgid "Place in category:"
-msgstr "Umieść w kategorii:"
-
-#: classes/pref/feeds.php:608
-#: classes/pref/feeds.php:844
-#, fuzzy
-msgid "Language:"
-msgstr "Język"
-
-#: classes/pref/feeds.php:615
-#: classes/pref/feeds.php:853
-msgid "Update"
-msgstr "Aktualizuj"
-
-#: classes/pref/feeds.php:630
-#: classes/pref/feeds.php:869
-msgid "Article purging:"
-msgstr "Czyszczenie artykułów:"
-
-#: classes/pref/feeds.php:658
-#: classes/pref/feeds.php:890
-#: classes/pref/feeds.php:1839
-#: classes/pref/prefs.php:245
-#: classes/feeds.php:1083
-msgid "Password"
-msgstr "Hasło"
-
-#: classes/pref/feeds.php:662
-msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
-msgstr "<b>Wskazówka:</b> musisz wypełnić dane logowania jeżeli Twój kanał wymaga uwierzytelniania. Nie dotyczy to kanałów z Twittera."
-
-#: classes/pref/feeds.php:681
-#: classes/pref/feeds.php:900
-msgid "Hide from Popular feeds"
-msgstr "Ukryj przed umieszczeniem w Popularnych kanałach"
-
-#: classes/pref/feeds.php:693
-#: classes/pref/feeds.php:906
-msgid "Include in e-mail digest"
-msgstr "Umieść w przeglądzie emailowym"
-
-#: classes/pref/feeds.php:706
-#: classes/pref/feeds.php:912
-msgid "Always display image attachments"
-msgstr "Zawsze wyświetlaj załączniki graficzne"
-
-#: classes/pref/feeds.php:719
-#: classes/pref/feeds.php:920
-msgid "Do not embed images"
-msgstr "Nie osadzaj obrazków"
-
-#: classes/pref/feeds.php:732
-#: classes/pref/feeds.php:928
-msgid "Cache media"
-msgstr ""
-
-#: classes/pref/feeds.php:744
-#: classes/pref/feeds.php:934
-msgid "Mark updated articles as unread"
-msgstr "Oznacz zaktualizowane artykuły jako nieprzeczytane"
-
-#: classes/pref/feeds.php:748
-msgid "Icon"
-msgstr "Ikona"
-
-#: classes/pref/feeds.php:765
-msgid "Replace"
-msgstr "Zamień"
-
-#: classes/pref/feeds.php:772
-#: classes/pref/prefs.php:698
-msgid "Plugins"
-msgstr "Wtyczki"
-
-#: classes/pref/feeds.php:792
-msgid "Resubscribe to push updates"
-msgstr "Odnów prenumeratę aktualizacji typu PUSH"
-
-#: classes/pref/feeds.php:799
-msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
-msgstr "Resetuje status prenumerat PubSubHubbub dla kanałów obsługujących PUSH."
-
-#: classes/pref/feeds.php:1200
-#: classes/pref/feeds.php:1253
-msgid "All done."
-msgstr "Zrobione."
-
-#: classes/pref/feeds.php:1308
-msgid "Feeds with errors"
-msgstr "Kanały z błędami"
-
-#: classes/pref/feeds.php:1315
-msgid "Inactive feeds"
-msgstr "Nieaktywne kanały"
-
-#: classes/pref/feeds.php:1351
-msgid "Edit selected feeds"
-msgstr "Edytuj wybrane kanały"
-
-#: classes/pref/feeds.php:1353
-#: classes/pref/feeds.php:1367
-#: classes/pref/filters.php:762
-msgid "Reset sort order"
-msgstr "Zresetuj porządek sortowania"
-
-#: classes/pref/feeds.php:1355
-#: js/prefs.js:1622
-msgid "Batch subscribe"
-msgstr "Prenumerata wsadowa"
-
-#: classes/pref/feeds.php:1362
-msgid "Categories"
-msgstr "Kategorie"
-
-#: classes/pref/feeds.php:1365
-msgid "Add category"
-msgstr "Dodaj kategorię"
-
-#: classes/pref/feeds.php:1369
-msgid "Remove selected"
-msgstr "Usuń wybrane"
-
-#: classes/pref/feeds.php:1380
-msgid "More actions..."
-msgstr "Więcej działań..."
-
-#: classes/pref/feeds.php:1384
-msgid "Manual purge"
-msgstr "Czyszczenie ręczne"
-
-#: classes/pref/feeds.php:1388
-msgid "Clear feed data"
-msgstr "Wyczyść dane kanału"
-
-#: classes/pref/feeds.php:1389
-#: classes/pref/filters.php:770
-msgid "Rescore articles"
-msgstr "Przywróć artykuły"
-
-#: classes/pref/feeds.php:1442
-msgid "OPML"
-msgstr "OPML"
-
-#: classes/pref/feeds.php:1444
-msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
-msgstr "Korzystając z OPML możesz eksportować i importować kanały, filtry, etykiety i ustawienia Tiny Tiny RSS."
-
-#: classes/pref/feeds.php:1445
-msgid "Only main settings profile can be migrated using OPML."
-msgstr "Tylko główne ustawienia profilu mogą być migrowane korzystając z OPML."
-
-#: classes/pref/feeds.php:1458
-msgid "Import my OPML"
-msgstr "Importuj mój OPML"
-
-#: classes/pref/feeds.php:1464
-msgid "Filename:"
-msgstr "Nazwa pliku:"
-
-#: classes/pref/feeds.php:1466
-msgid "Include settings"
-msgstr "Załącz ustawienia"
-
-#: classes/pref/feeds.php:1470
-msgid "Export OPML"
-msgstr "Eksportuj OPML"
-
-#: classes/pref/feeds.php:1474
-msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
-msgstr "Twój OPML może zostać opublikowany i być prenumerowany przez każdego kto zna poniższy adres."
-
-#: classes/pref/feeds.php:1478
-msgid "Public OPML URL"
-msgstr "Publiczny adres OPML"
-
-#: classes/pref/feeds.php:1479
-msgid "Display published OPML URL"
-msgstr "Wyświetl opublikowany adres OPML"
-
-#: classes/pref/feeds.php:1488
-msgid "Firefox integration"
-msgstr "Integracja z Firefoxem"
-
-#: classes/pref/feeds.php:1490
-msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
-msgstr "Tiny Tiny RSS może być ustawiona jako domyślny czytnik kanałów w Firefoxie poprzez kliknięcie odnośnika poniżej."
-
-#: classes/pref/feeds.php:1497
-msgid "Click here to register this site as a feed reader."
-msgstr "Kliknij tutaj aby ustawić tę stronę jako czytnik kanałów."
-
-#: classes/pref/feeds.php:1505
-msgid "Published & shared articles / Generated feeds"
-msgstr "Opublikowane i udostępnione artykuły / Wygenerowane kanały"
-
-#: classes/pref/feeds.php:1507
-msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
-msgstr "Opublikowane artykuły są eksportowane jako publiczny kanał RSS i mogą być prenumerowane przez każdego kto zna adres podany poniżej."
-
-#: classes/pref/feeds.php:1514
-#: classes/feeds.php:54
-#: classes/feeds.php:140
-msgid "View as RSS"
-msgstr "Wyświetl jako RSS"
-
-#: classes/pref/feeds.php:1515
-msgid "Display URL"
-msgstr "Wyświetl adres"
-
-#: classes/pref/feeds.php:1518
-msgid "Clear all generated URLs"
-msgstr "Wyczyść wszystkie wygenerowane adresy"
-
-#: classes/pref/feeds.php:1596
-msgid "These feeds have not been updated with new content for 3 months (oldest first):"
-msgstr "Niniejsze kanały nie zostały uaktualnione przez 3 miesiące (najstarsze pierwsze):"
-
-#: classes/pref/feeds.php:1630
-#: classes/pref/feeds.php:1694
-msgid "Click to edit feed"
-msgstr "Kliknij aby edytować kanał"
-
-#: classes/pref/feeds.php:1648
-#: classes/pref/feeds.php:1714
-msgid "Unsubscribe from selected feeds"
-msgstr "Zakończ prenumeratę wybranych kanałów:"
-
-#: classes/pref/feeds.php:1819
-msgid "Add one valid RSS feed per line (no feed detection is done)"
-msgstr "Wpisz jeden prawidłowy adres kanału RSS w każdej linii (nie jest przeprowadzana automatyczna detekcja adresu kanału)"
-
-#: classes/pref/feeds.php:1828
-msgid "Feeds to subscribe, One per line"
-msgstr "Kanały do prenumeraty. Każdy w osobnej linii"
-
-#: classes/pref/feeds.php:1851
-msgid "Feeds require authentication."
-msgstr "Kanały wymagają uwierzytelniania."
-
-#: classes/pref/feeds.php:1858
-#: classes/feeds.php:1099
-#: classes/feeds.php:1153
-msgid "Subscribe"
-msgstr "Prenumeruj"
-
-#: classes/pref/filters.php:151
-#, fuzzy
-msgid "Preview article"
-msgstr "Świeże artykuły"
-
-#: classes/pref/filters.php:239
-#: classes/pref/filters.php:518
-msgid "(inverse)"
-msgstr "(odwróć)"
-
-#: classes/pref/filters.php:235
-#: classes/pref/filters.php:517
-#, php-format
-msgid "%s on %s in %s %s"
-msgstr "%s na %s w %s %s"
-
-#: classes/pref/filters.php:354
-#: classes/pref/filters.php:827
-#: classes/pref/filters.php:942
-msgid "Match"
-msgstr "Dopasuj"
-
-#: classes/pref/filters.php:368
-#: classes/pref/filters.php:416
-#: classes/pref/filters.php:841
-#: classes/pref/filters.php:868
-msgid "Add"
-msgstr "Dodaj"
-
-#: classes/pref/filters.php:371
-#: classes/pref/filters.php:419
-#: classes/pref/filters.php:844
-#: classes/pref/filters.php:871
-#: classes/feeds.php:122
-msgid "Delete"
-msgstr "Usuń"
-
-#: classes/pref/filters.php:402
-#: classes/pref/filters.php:854
-msgid "Apply actions"
-msgstr "Zastosuj działania"
-
-#: classes/pref/filters.php:452
-#: classes/pref/filters.php:883
-msgid "Enabled"
-msgstr "Włączone"
-
-#: classes/pref/filters.php:461
-#: classes/pref/filters.php:886
-msgid "Match any rule"
-msgstr "Pasuje do dowolnej reguły"
-
-#: classes/pref/filters.php:470
-#: classes/pref/filters.php:889
-msgid "Inverse matching"
-msgstr "Odwróć dopasowanie"
-
-#: classes/pref/filters.php:482
-#: classes/pref/filters.php:896
-msgid "Test"
-msgstr "Testuj"
-
-#: classes/pref/filters.php:756
-msgid "Combine"
-msgstr "Połącz"
-
-#: classes/pref/filters.php:899
-msgid "Create"
-msgstr "Utwórz"
-
-#: classes/pref/filters.php:954
-msgid "Inverse regular expression matching"
-msgstr "Odwróć dopasowywanie wyrażeniami regularnymi"
-
-#: classes/pref/filters.php:956
-msgid "on field"
-msgstr "pole"
-
-#: classes/pref/filters.php:962
-#: js/PrefFilterTree.js:64
-msgid "in"
-msgstr "w"
-
-#: classes/pref/filters.php:975
-#, fuzzy
-msgid "Wiki: Filters"
-msgstr "Filtry"
-
-#: classes/pref/filters.php:980
-msgid "Save rule"
-msgstr "Zapisz regułę"
-
-#: classes/pref/filters.php:980
-#: js/functions.js:865
-msgid "Add rule"
-msgstr "Dodaj regułę"
-
-#: classes/pref/filters.php:1003
-msgid "Perform Action"
-msgstr "Wykonaj operację"
-
-#: classes/pref/filters.php:1054
-#, fuzzy
-msgid "No actions available"
-msgstr "Dostępna jest nowa wersja!"
-
-#: classes/pref/filters.php:1073
-msgid "Save action"
-msgstr "Zapisz działanie"
-
-#: classes/pref/filters.php:1073
-#: js/functions.js:887
-msgid "Add action"
-msgstr "Dodaj działania"
-
-#: classes/pref/filters.php:1097
-msgid "[No caption]"
-msgstr "[Brak opisu]"
-
-#: classes/pref/filters.php:1099
-#, fuzzy, php-format
-msgid "%s (%d rule)"
-msgid_plural "%s (%d rules)"
-msgstr[0] "Dodaj regułę"
-msgstr[1] "Dodaj regułę"
-msgstr[2] "Dodaj regułę"
-
-#: classes/pref/filters.php:1114
-#, fuzzy
-msgid "matches any rule"
-msgstr "Pasuje do dowolnej reguły"
-
-#: classes/pref/filters.php:1117
-#, fuzzy, php-format
-msgid "%s (+%d action)"
-msgid_plural "%s (+%d actions)"
-msgstr[0] "Dodaj działania"
-msgstr[1] "Dodaj działania"
-msgstr[2] "Dodaj działania"
-
 #: classes/pref/prefs.php:19
 msgid "Interface"
 msgstr "Interfejs"
@@ -2060,7 +1660,7 @@ msgid "Strip all but most common HTML tags when reading articles."
 msgstr "Podczas czytania artykułu usuń wszystkie poza najpopularniejszymi znaczniki HTML."
 
 #: classes/pref/prefs.php:53
-#: js/prefs.js:1584
+#: js/prefs.js:1580
 msgid "Customize stylesheet"
 msgstr "Dostosuj arkusz styli"
 
@@ -2128,6 +1728,14 @@ msgstr "Poziom dostępu"
 msgid "Save data"
 msgstr "Zapisz dane"
 
+#: classes/pref/prefs.php:245
+#: classes/pref/feeds.php:658
+#: classes/pref/feeds.php:878
+#: classes/pref/feeds.php:1813
+#: classes/feeds.php:1076
+msgid "Password"
+msgstr "Hasło"
+
 #: classes/pref/prefs.php:254
 msgid "Your password is at default value, please change it."
 msgstr "Używasz domyślnego hasła, zmień je proszę."
@@ -2226,18 +1834,23 @@ msgstr "Zarządzaj profilami"
 msgid "Reset to defaults"
 msgstr "Przywróć domyślne"
 
+#: classes/pref/prefs.php:698
+#: classes/pref/feeds.php:772
+msgid "Plugins"
+msgstr "Wtyczki"
+
 #: classes/pref/prefs.php:700
 msgid "You will need to reload Tiny Tiny RSS for plugin changes to take effect."
 msgstr "Musisz przeładować Tiny Tiny RSS aby zastosować zmiany we wtyczkach."
 
-#: classes/pref/prefs.php:702
-msgid "Download more plugins at tt-rss.org <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forums</a> or <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a>."
-msgstr "Pobierz więcej wtyczek  z <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forum</a> lub <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a> tt-rss.org."
-
-#: classes/pref/prefs.php:732
+#: classes/pref/prefs.php:730
 msgid "System plugins"
 msgstr "Wtyczki systemowe"
 
+#: classes/pref/prefs.php:731
+msgid "System plugins are enabled in <strong>config.php</strong> for all users."
+msgstr ""
+
 #: classes/pref/prefs.php:736
 #: classes/pref/prefs.php:792
 msgid "Plugin"
@@ -2307,6 +1920,341 @@ msgstr "Usuń wybrane profile"
 msgid "Activate profile"
 msgstr "Aktywuj profil"
 
+#: classes/pref/feeds.php:15
+msgid "Check to enable field"
+msgstr "Zaznacz aby uaktywnić pole"
+
+#: classes/pref/feeds.php:65
+#: classes/pref/feeds.php:214
+#: classes/pref/feeds.php:258
+#: classes/pref/feeds.php:264
+#: classes/pref/feeds.php:290
+#, php-format
+msgid "(%d feed)"
+msgid_plural "(%d feeds)"
+msgstr[0] "(%d kanał)"
+msgstr[1] "(%d kanały)"
+msgstr[2] "(%d kanałów)"
+
+#: classes/pref/feeds.php:561
+msgid "Feed Title"
+msgstr "Tytuł kanału"
+
+#: classes/pref/feeds.php:595
+#: classes/pref/feeds.php:818
+#: classes/pref/feeds.php:1796
+#: classes/feeds.php:1048
+msgid "Place in category:"
+msgstr "Umieść w kategorii:"
+
+#: classes/pref/feeds.php:608
+#: classes/pref/feeds.php:832
+#, fuzzy
+msgid "Language:"
+msgstr "Język"
+
+#: classes/pref/feeds.php:615
+#: classes/pref/feeds.php:841
+msgid "Update"
+msgstr "Aktualizuj"
+
+#: classes/pref/feeds.php:630
+#: classes/pref/feeds.php:857
+msgid "Article purging:"
+msgstr "Czyszczenie artykułów:"
+
+#: classes/pref/feeds.php:662
+msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
+msgstr "<b>Wskazówka:</b> musisz wypełnić dane logowania jeżeli Twój kanał wymaga uwierzytelniania. Nie dotyczy to kanałów z Twittera."
+
+#: classes/pref/feeds.php:681
+#: classes/pref/feeds.php:888
+msgid "Hide from Popular feeds"
+msgstr "Ukryj przed umieszczeniem w Popularnych kanałach"
+
+#: classes/pref/feeds.php:693
+#: classes/pref/feeds.php:894
+msgid "Include in e-mail digest"
+msgstr "Umieść w przeglądzie emailowym"
+
+#: classes/pref/feeds.php:706
+#: classes/pref/feeds.php:900
+msgid "Always display image attachments"
+msgstr "Zawsze wyświetlaj załączniki graficzne"
+
+#: classes/pref/feeds.php:719
+#: classes/pref/feeds.php:908
+msgid "Do not embed images"
+msgstr "Nie osadzaj obrazków"
+
+#: classes/pref/feeds.php:732
+#: classes/pref/feeds.php:916
+msgid "Cache media"
+msgstr ""
+
+#: classes/pref/feeds.php:744
+#: classes/pref/feeds.php:922
+msgid "Mark updated articles as unread"
+msgstr "Oznacz zaktualizowane artykuły jako nieprzeczytane"
+
+#: classes/pref/feeds.php:748
+msgid "Icon"
+msgstr "Ikona"
+
+#: classes/pref/feeds.php:765
+msgid "Replace"
+msgstr "Zamień"
+
+#: classes/pref/feeds.php:1174
+#: classes/pref/feeds.php:1227
+msgid "All done."
+msgstr "Zrobione."
+
+#: classes/pref/feeds.php:1282
+msgid "Feeds with errors"
+msgstr "Kanały z błędami"
+
+#: classes/pref/feeds.php:1289
+msgid "Inactive feeds"
+msgstr "Nieaktywne kanały"
+
+#: classes/pref/feeds.php:1325
+msgid "Edit selected feeds"
+msgstr "Edytuj wybrane kanały"
+
+#: classes/pref/feeds.php:1329
+#: js/prefs.js:1618
+msgid "Batch subscribe"
+msgstr "Prenumerata wsadowa"
+
+#: classes/pref/feeds.php:1336
+msgid "Categories"
+msgstr "Kategorie"
+
+#: classes/pref/feeds.php:1339
+msgid "Add category"
+msgstr "Dodaj kategorię"
+
+#: classes/pref/feeds.php:1343
+msgid "Remove selected"
+msgstr "Usuń wybrane"
+
+#: classes/pref/feeds.php:1354
+msgid "More actions..."
+msgstr "Więcej działań..."
+
+#: classes/pref/feeds.php:1358
+msgid "Manual purge"
+msgstr "Czyszczenie ręczne"
+
+#: classes/pref/feeds.php:1362
+msgid "Clear feed data"
+msgstr "Wyczyść dane kanału"
+
+#: classes/pref/feeds.php:1416
+msgid "OPML"
+msgstr "OPML"
+
+#: classes/pref/feeds.php:1418
+msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
+msgstr "Korzystając z OPML możesz eksportować i importować kanały, filtry, etykiety i ustawienia Tiny Tiny RSS."
+
+#: classes/pref/feeds.php:1419
+msgid "Only main settings profile can be migrated using OPML."
+msgstr "Tylko główne ustawienia profilu mogą być migrowane korzystając z OPML."
+
+#: classes/pref/feeds.php:1432
+msgid "Import my OPML"
+msgstr "Importuj mój OPML"
+
+#: classes/pref/feeds.php:1438
+msgid "Filename:"
+msgstr "Nazwa pliku:"
+
+#: classes/pref/feeds.php:1440
+msgid "Include settings"
+msgstr "Załącz ustawienia"
+
+#: classes/pref/feeds.php:1444
+msgid "Export OPML"
+msgstr "Eksportuj OPML"
+
+#: classes/pref/feeds.php:1448
+msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
+msgstr "Twój OPML może zostać opublikowany i być prenumerowany przez każdego kto zna poniższy adres."
+
+#: classes/pref/feeds.php:1452
+msgid "Public OPML URL"
+msgstr "Publiczny adres OPML"
+
+#: classes/pref/feeds.php:1453
+msgid "Display published OPML URL"
+msgstr "Wyświetl opublikowany adres OPML"
+
+#: classes/pref/feeds.php:1462
+msgid "Firefox integration"
+msgstr "Integracja z Firefoxem"
+
+#: classes/pref/feeds.php:1464
+msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
+msgstr "Tiny Tiny RSS może być ustawiona jako domyślny czytnik kanałów w Firefoxie poprzez kliknięcie odnośnika poniżej."
+
+#: classes/pref/feeds.php:1471
+msgid "Click here to register this site as a feed reader."
+msgstr "Kliknij tutaj aby ustawić tę stronę jako czytnik kanałów."
+
+#: classes/pref/feeds.php:1479
+msgid "Published & shared articles / Generated feeds"
+msgstr "Opublikowane i udostępnione artykuły / Wygenerowane kanały"
+
+#: classes/pref/feeds.php:1481
+msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
+msgstr "Opublikowane artykuły są eksportowane jako publiczny kanał RSS i mogą być prenumerowane przez każdego kto zna adres podany poniżej."
+
+#: classes/pref/feeds.php:1488
+#: classes/feeds.php:54
+#: classes/feeds.php:140
+msgid "View as RSS"
+msgstr "Wyświetl jako RSS"
+
+#: classes/pref/feeds.php:1489
+msgid "Display URL"
+msgstr "Wyświetl adres"
+
+#: classes/pref/feeds.php:1492
+msgid "Clear all generated URLs"
+msgstr "Wyczyść wszystkie wygenerowane adresy"
+
+#: classes/pref/feeds.php:1570
+msgid "These feeds have not been updated with new content for 3 months (oldest first):"
+msgstr "Niniejsze kanały nie zostały uaktualnione przez 3 miesiące (najstarsze pierwsze):"
+
+#: classes/pref/feeds.php:1604
+#: classes/pref/feeds.php:1668
+msgid "Click to edit feed"
+msgstr "Kliknij aby edytować kanał"
+
+#: classes/pref/feeds.php:1622
+#: classes/pref/feeds.php:1688
+msgid "Unsubscribe from selected feeds"
+msgstr "Zakończ prenumeratę wybranych kanałów:"
+
+#: classes/pref/feeds.php:1793
+msgid "Add one valid RSS feed per line (no feed detection is done)"
+msgstr "Wpisz jeden prawidłowy adres kanału RSS w każdej linii (nie jest przeprowadzana automatyczna detekcja adresu kanału)"
+
+#: classes/pref/feeds.php:1802
+msgid "Feeds to subscribe, One per line"
+msgstr "Kanały do prenumeraty. Każdy w osobnej linii"
+
+#: classes/pref/feeds.php:1825
+msgid "Feeds require authentication."
+msgstr "Kanały wymagają uwierzytelniania."
+
+#: classes/pref/feeds.php:1832
+#: classes/feeds.php:1092
+#: classes/feeds.php:1146
+msgid "Subscribe"
+msgstr "Prenumeruj"
+
+#: classes/pref/system.php:29
+msgid "Error Log"
+msgstr "Dziennik błędów"
+
+#: classes/pref/system.php:40
+msgid "Refresh"
+msgstr "Odśwież"
+
+#: classes/pref/system.php:43
+msgid "Clear log"
+msgstr "Wyczyść dziennik"
+
+#: classes/pref/system.php:48
+msgid "Error"
+msgstr "Błąd"
+
+#: classes/pref/system.php:49
+msgid "Filename"
+msgstr "Nazwa pliku"
+
+#: classes/pref/system.php:50
+msgid "Message"
+msgstr "Wiadomość"
+
+#: classes/pref/system.php:52
+msgid "Date"
+msgstr "Data"
+
+#: classes/opml.php:28
+#: classes/opml.php:33
+msgid "OPML Utility"
+msgstr "Narzędzie OPML"
+
+#: classes/opml.php:37
+msgid "Importing OPML..."
+msgstr "Importowanie OPML..."
+
+#: classes/opml.php:41
+msgid "Return to preferences"
+msgstr "Wróć do ustawień"
+
+#: classes/opml.php:295
+#, php-format
+msgid "Adding feed: %s"
+msgstr "Dodaję kanał: %s"
+
+#: classes/opml.php:306
+#, php-format
+msgid "Duplicate feed: %s"
+msgstr "Duplikat kanału: %s"
+
+#: classes/opml.php:320
+#, php-format
+msgid "Adding label %s"
+msgstr "Dodaję etykietę %s"
+
+#: classes/opml.php:323
+#, php-format
+msgid "Duplicate label: %s"
+msgstr "Duplikat etykiety: %s"
+
+#: classes/opml.php:335
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr "Ustawiam wartość parametru %s na %s"
+
+#: classes/opml.php:367
+msgid "Adding filter..."
+msgstr "Dodaję filtr..."
+
+#: classes/opml.php:486
+#, php-format
+msgid "Processing category: %s"
+msgstr "Przetwarzam kategorię: %s"
+
+#: classes/opml.php:532
+#, php-format
+msgid "Upload failed with error code %d"
+msgstr "Przesyłanie pliku zakończone błędem numer %d"
+
+#: classes/opml.php:544
+#: plugins/import_export/init.php:448
+msgid "Unable to move uploaded file."
+msgstr "Nie udało się przenieść przesłanego pliku."
+
+#: classes/opml.php:548
+#: plugins/import_export/init.php:452
+msgid "Error: please upload OPML file."
+msgstr "Błąd: proszę wgrać plik OPML."
+
+#: classes/opml.php:559
+msgid "Error: unable to find moved OPML file."
+msgstr "Błąd: nie udało się przenieść pliku OPML."
+
+#: classes/opml.php:566
+msgid "Error while parsing document."
+msgstr "Błąd przetwarzania dokumentu."
+
 #: classes/feeds.php:53
 msgid "View as RSS feed"
 msgstr "Zobacz jako kanał RSS"
@@ -2347,8 +2295,8 @@ msgstr "Cofnij"
 
 #: classes/feeds.php:127
 #: classes/feeds.php:132
-#: plugins/mail/init.php:75
 #: plugins/mailto/init.php:25
+#: plugins/mail/init.php:75
 msgid "Forward by email"
 msgstr "Przekaż za pomocą emaila"
 
@@ -2356,319 +2304,146 @@ msgstr "Przekaż za pomocą emaila"
 msgid "Feed:"
 msgstr "Kanał:"
 
-#: classes/feeds.php:229
-#: classes/feeds.php:892
+#: classes/feeds.php:228
+#: classes/feeds.php:885
 msgid "Feed not found."
 msgstr "Kanał nie został odnaleziony."
 
-#: classes/feeds.php:300
+#: classes/feeds.php:291
 msgid "Never"
 msgstr "Nigdy"
 
-#: classes/feeds.php:413
+#: classes/feeds.php:405
 #, php-format
 msgid "Imported at %s"
 msgstr "Zaimportowane do %s"
 
-#: classes/feeds.php:472
-#: classes/feeds.php:569
+#: classes/feeds.php:464
+#: classes/feeds.php:561
 #, fuzzy
 msgid "mark feed as read"
 msgstr "Oznacz kanał jako przeczytany"
 
-#: classes/feeds.php:630
+#: classes/feeds.php:622
 msgid "Collapse article"
 msgstr "Zwiń artykuł"
 
-#: classes/feeds.php:791
+#: classes/feeds.php:784
 msgid "No unread articles found to display."
 msgstr "Nie znaleziono nieprzeczytanych artykułów."
 
-#: classes/feeds.php:794
+#: classes/feeds.php:787
 msgid "No updated articles found to display."
 msgstr "Nie znaleziono uaktualnionych artykułów."
 
-#: classes/feeds.php:797
+#: classes/feeds.php:790
 msgid "No starred articles found to display."
 msgstr "Nie znaleziono artykułów oznaczonych gwiazdką."
 
-#: classes/feeds.php:801
+#: classes/feeds.php:794
 msgid "No articles found to display. You can assign articles to labels manually from article header context menu (applies to all selected articles) or use a filter."
 msgstr "Nie znaleziono artykułów do wyświetlenia. Możesz ręcznie przypisać artykuły do etykiet z menu kontekstowego artykułu (ma zastosowanie do wszystkich zaznaczonych artykułów) lub użyć filtru."
 
-#: classes/feeds.php:803
+#: classes/feeds.php:796
 msgid "No articles found to display."
 msgstr "Nie znaleziono artykułów."
 
-#: classes/feeds.php:818
-#: classes/feeds.php:992
+#: classes/feeds.php:811
+#: classes/feeds.php:985
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "Kanały ostatnio uaktualnione o %s"
 
-#: classes/feeds.php:828
-#: classes/feeds.php:1002
+#: classes/feeds.php:821
+#: classes/feeds.php:995
 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:982
+#: classes/feeds.php:975
 msgid "No feed selected."
 msgstr "Nie wybrano kanału."
 
-#: classes/feeds.php:1041
-#: classes/feeds.php:1049
+#: classes/feeds.php:1034
+#: classes/feeds.php:1042
 msgid "Feed or site URL"
 msgstr "Adres kanału lub strony"
 
-#: classes/feeds.php:1063
+#: classes/feeds.php:1056
 msgid "Available feeds"
 msgstr "Dostępne kanały"
 
-#: classes/feeds.php:1094
+#: classes/feeds.php:1087
 msgid "This feed requires authentication."
 msgstr "Ten kanał wymaga uwierzytelniania."
 
-#: classes/feeds.php:1102
+#: classes/feeds.php:1095
 msgid "More feeds"
 msgstr "Więcej kanałów"
 
-#: classes/feeds.php:1129
+#: classes/feeds.php:1122
 msgid "Popular feeds"
 msgstr "Popularne kanały"
 
-#: classes/feeds.php:1130
+#: classes/feeds.php:1123
 msgid "Feed archive"
 msgstr "Archiwum kanału"
 
-#: classes/feeds.php:1133
+#: classes/feeds.php:1126
 msgid "limit:"
 msgstr "limit:"
 
-#: classes/feeds.php:1165
+#: classes/feeds.php:1158
 msgid "Look for"
 msgstr "Szukaj napisu"
 
-#: classes/feeds.php:1173
+#: classes/feeds.php:1166
 #, php-format
 msgid "in %s"
 msgstr ""
 
-#: classes/feeds.php:1178
+#: classes/feeds.php:1171
 msgid "Used for word stemming"
 msgstr ""
 
-#: classes/feeds.php:1187
+#: classes/feeds.php:1180
 #, fuzzy
 msgid "Search syntax"
 msgstr "Szukaj"
 
-#: plugins/instances/init.php:141
-msgid "Linked"
-msgstr "Połączone instancje"
-
-#: plugins/instances/init.php:204
-#: plugins/instances/init.php:395
-msgid "Instance"
-msgstr "Instancja"
-
-#: plugins/instances/init.php:215
-#: plugins/instances/init.php:312
-#: plugins/instances/init.php:404
-msgid "Instance URL"
-msgstr "Adres instancji:"
-
-#: plugins/instances/init.php:226
-#: plugins/instances/init.php:414
-msgid "Access key:"
-msgstr "Klucz dostępu:"
-
-#: plugins/instances/init.php:229
-#: plugins/instances/init.php:313
-#: plugins/instances/init.php:417
-msgid "Access key"
-msgstr "Klucz dostępu"
-
-#: plugins/instances/init.php:233
-#: plugins/instances/init.php:421
-msgid "Use one access key for both linked instances."
-msgstr "Użyj jednego klucza dostępu dla obydwóch połączonych instancji."
-
-#: plugins/instances/init.php:241
-#: plugins/instances/init.php:429
-msgid "Generate new key"
-msgstr "Wygeneruj nowy klucz"
-
-#: plugins/instances/init.php:292
-msgid "Link instance"
-msgstr "Połącz instalację"
-
-#: plugins/instances/init.php:304
-msgid "You can connect other instances of Tiny Tiny RSS to this one to share Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
-msgstr "Możesz podłączyć inne instalacje Tiny Tiny RSS do bieżącej aby współdzielić informacje o Popularnych kanałach. Połącz z tą instancją Tiny Tiny RSS używając tego adresu:"
-
-#: plugins/instances/init.php:314
-msgid "Last connected"
-msgstr "Ostatnio połączony"
-
-#: plugins/instances/init.php:315
-msgid "Status"
-msgstr "Status"
-
-#: plugins/instances/init.php:316
-msgid "Stored feeds"
-msgstr "Zapisane kanały"
-
-#: plugins/instances/init.php:433
-msgid "Create link"
-msgstr "Utwórz łącze"
-
-#: plugins/nsfw/init.php:30
-#: plugins/nsfw/init.php:42
-msgid "Not work safe (click to toggle)"
-msgstr "Niewłaściwe w pracy (wciśnij aby przełączyć)"
-
-#: plugins/nsfw/init.php:52
-msgid "NSFW Plugin"
-msgstr "Wtyczka \"Niewłaściwe w pracy\""
-
-#: plugins/nsfw/init.php:79
-msgid "Tags to consider NSFW (comma-separated)"
-msgstr "Znaczniki uznawane za niewłaściwe w pracy (oddzielone przecinkami)"
-
-#: plugins/nsfw/init.php:100
-msgid "Configuration saved."
-msgstr "Konfiguracja została zapisana."
-
-#: plugins/note/init.php:26
-#: plugins/note/note.js:11
-msgid "Edit article note"
-msgstr "Edytuj notatkę do artykułu"
-
-#: plugins/vf_shared/init.php:16
-#: plugins/vf_shared/init.php:69
-msgid "Shared articles"
-msgstr "Udostępnione artykuły"
-
-#: plugins/auth_internal/init.php:65
-msgid "Please enter your one time password:"
-msgstr "Wprowadź hasło jednorazowe:"
-
-#: plugins/auth_internal/init.php:188
-msgid "Password has been changed."
-msgstr "Hasło zostało zmienione."
-
-#: plugins/auth_internal/init.php:190
-msgid "Old password is incorrect."
-msgstr "Nieprawidłowe stare hasło."
-
-#: plugins/af_readability/init.php:21
-msgid "Data saved."
-msgstr ""
-
-#: plugins/af_readability/init.php:33
-#, fuzzy
-msgid "Inline content"
-msgstr "Przewijanie treści artykułu"
-
-#: plugins/af_readability/init.php:39
-msgid "Readability settings (af_readability)"
-msgstr ""
-
-#: plugins/af_readability/init.php:66
-msgid "Use Readability for pages shared via bookmarklet."
-msgstr ""
-
-#: plugins/af_readability/init.php:78
-#: plugins/af_psql_trgm/init.php:191
-msgid "Currently enabled for (click to edit):"
-msgstr ""
-
-#: plugins/af_readability/init.php:95
-#, fuzzy
-msgid "Readability"
-msgstr "Sprawdź dostępność"
-
-#: plugins/af_readability/init.php:106
-#, fuzzy
-msgid "Inline article content"
-msgstr "Przewijanie treści artykułu"
+#: classes/feeds.php:1596
+msgid "Starred articles"
+msgstr "Artykuły oznaczone gwiazdką"
 
-#: plugins/af_redditimgur/init.php:25
-msgid "Reddit content settings (af_redditimgur)"
-msgstr ""
+#: classes/feeds.php:1598
+msgid "Published articles"
+msgstr "Opublikowane artykuły"
 
-#: plugins/af_redditimgur/init.php:50
-msgid "Uses Readability (full-text-rss) implementation by <a target='_blank' href='https://bitbucket.org/fivefilters/'>FiveFilters.org</a>"
-msgstr ""
+#: classes/feeds.php:1600
+msgid "Fresh articles"
+msgstr "Świeże artykuły"
 
-#: plugins/af_redditimgur/init.php:54
-msgid "Extract missing content using Readability"
-msgstr ""
+#: classes/feeds.php:1604
+msgid "Archived articles"
+msgstr "Zarchiwizowane artykuły"
 
-#: plugins/af_redditimgur/init.php:59
-msgid "Enable additional duplicate checking"
-msgstr ""
+#: classes/feeds.php:1606
+msgid "Recently read"
+msgstr "Ostatnio czytane"
 
-#: plugins/af_redditimgur/init.php:73
-#: plugins/af_zz_imgproxy/init.php:225
-#, fuzzy
-msgid "Configuration saved"
-msgstr "Konfiguracja została zapisana."
+#: classes/feeds.php:1716
+msgid "Special"
+msgstr "Specjalne"
 
-#: plugins/af_psql_trgm/init.php:28
+#: classes/feeds.php:1962
 #, php-format
-msgid "Data saved (%s, %d)"
-msgstr ""
+msgid "Search results: %s"
+msgstr "Wyniki wyszukiwania: %s"
 
-#: plugins/af_psql_trgm/init.php:112
-#, fuzzy
-msgid "Show related articles"
+#: plugins/vf_shared/init.php:16
+#: plugins/vf_shared/init.php:60
+msgid "Shared articles"
 msgstr "Udostępnione artykuły"
 
-#: plugins/af_psql_trgm/init.php:118
-#: plugins/af_psql_trgm/init.php:220
-#, fuzzy
-msgid "Mark similar articles as read"
-msgstr "Oznaczyć wszystkie artykuły jako przeczytane?"
-
-#: plugins/af_psql_trgm/init.php:157
-msgid "PostgreSQL trigram extension returns string similarity as a floating point number (0-1). Setting it too low might produce false positives, zero disables checking."
-msgstr ""
-
-#: plugins/af_psql_trgm/init.php:160
-#, fuzzy
-msgid "Global settings"
-msgstr "Załącz ustawienia"
-
-#: plugins/af_psql_trgm/init.php:164
-msgid "Minimum similarity:"
-msgstr ""
-
-#: plugins/af_psql_trgm/init.php:169
-msgid "Minimum title length:"
-msgstr ""
-
-#: plugins/af_psql_trgm/init.php:174
-#, fuzzy
-msgid "Enable for all feeds:"
-msgstr "Włącz kategorie kanałów"
-
-#: plugins/af_psql_trgm/init.php:209
-msgid "Similarity (pg_trgm)"
-msgstr ""
-
-#: plugins/af_comics/init.php:40
-msgid "Feeds supported by af_comics"
-msgstr ""
-
-#: plugins/af_comics/init.php:42
-msgid "The following comics are currently supported:"
-msgstr ""
-
-#: plugins/af_comics/init.php:60
-msgid "GoComics requires a specific URL to workaround their lack of feed support: <code>http://feeds.feedburner.com/uclick/<em>comic_name</em></code> (e.g. <code>http://www.gocomics.com/garfield</code> uses <code>http://feeds.feedburner.com/uclick/garfield</code>)."
-msgstr ""
-
 #: plugins/import_export/init.php:58
 msgid "Import and export"
 msgstr "Import i eksport"
@@ -2685,19 +2460,19 @@ msgstr "Eksportuj moje dane"
 msgid "Import"
 msgstr "Importuj"
 
-#: plugins/import_export/init.php:225
+#: plugins/import_export/init.php:231
 msgid "Could not import: incorrect schema version."
 msgstr "Nieudany import: nieprawidłowa wersja schematu."
 
-#: plugins/import_export/init.php:230
+#: plugins/import_export/init.php:236
 msgid "Could not import: unrecognized document format."
 msgstr "Nieudany import: nierozpoznany typ dokumentu."
 
-#: plugins/import_export/init.php:391
+#: plugins/import_export/init.php:397
 msgid "Finished: "
 msgstr "Zakończono: "
 
-#: plugins/import_export/init.php:392
+#: plugins/import_export/init.php:398
 #, php-format
 msgid "%d article processed, "
 msgid_plural "%d articles processed, "
@@ -2705,7 +2480,7 @@ msgstr[0] "%d artykuł przetworzony."
 msgstr[1] "%d artykuły przetworzone."
 msgstr[2] "%d artykułów przetworzonych."
 
-#: plugins/import_export/init.php:393
+#: plugins/import_export/init.php:399
 #, php-format
 msgid "%d imported, "
 msgid_plural "%d imported, "
@@ -2713,7 +2488,7 @@ msgstr[0] "%d zaimportowany."
 msgstr[1] "%d zaimportowane."
 msgstr[2] "%d zaimportowanych."
 
-#: plugins/import_export/init.php:394
+#: plugins/import_export/init.php:400
 #, php-format
 msgid "%d feed created."
 msgid_plural "%d feeds created."
@@ -2721,63 +2496,50 @@ msgstr[0] "%d kanał utworzony."
 msgstr[1] "%d kanały utworzone."
 msgstr[2] "%d kanałów utworzonych."
 
-#: plugins/import_export/init.php:399
+#: plugins/import_export/init.php:405
 msgid "Could not load XML document."
 msgstr "Nie udało się wczytać dokumentu XML."
 
-#: plugins/import_export/init.php:411
+#: plugins/import_export/init.php:417
 msgid "Prepare data"
 msgstr "Przygotuj dane"
 
-#: plugins/import_export/init.php:428
+#: plugins/import_export/init.php:434
 #, fuzzy, php-format
 msgid "Upload failed with error code %d (%s)"
 msgstr "Przesyłanie pliku zakończone błędem numer %d"
 
-#: plugins/import_export/init.php:454
+#: plugins/import_export/init.php:460
 msgid "No file uploaded."
 msgstr "Nie przesłano żadnego pliku."
 
-#: plugins/mail/init.php:28
-msgid "Mail addresses saved."
-msgstr ""
-
-#: plugins/mail/init.php:34
-#, fuzzy
-msgid "Mail plugin"
-msgstr "Wtyczki użytkowników"
-
-#: plugins/mail/init.php:36
-msgid "You can set predefined email addressed here (comma-separated list):"
-msgstr ""
-
+#: plugins/mailto/init.php:48
+#: plugins/mailto/init.php:54
 #: plugins/mail/init.php:112
 #: plugins/mail/init.php:118
-#: plugins/mailto/init.php:49
-#: plugins/mailto/init.php:55
 msgid "[Forwarded]"
 msgstr "[Przekazane]"
 
+#: plugins/mailto/init.php:48
 #: plugins/mail/init.php:112
-#: plugins/mailto/init.php:49
 msgid "Multiple articles"
 msgstr "Wiele artykułów"
 
-#: plugins/mail/init.php:140
-msgid "To:"
-msgstr "Do:"
+#: plugins/mailto/init.php:70
+msgid "Clicking the following link to invoke your mail client:"
+msgstr "Kliknij odnośnik aby uruchomić Twój program pocztowy:"
 
-#: plugins/mail/init.php:155
-msgid "Subject:"
-msgstr "Temat:"
+#: plugins/mailto/init.php:74
+msgid "Forward selected article(s) by email."
+msgstr "Prześlij artykuł emailem."
 
-#: plugins/mail/init.php:172
-msgid "Send e-mail"
-msgstr "Wyślij email"
+#: plugins/mailto/init.php:77
+msgid "You should be able to edit the message before sending in your mail client."
+msgstr "Powinieneś mieć jeszcze możliwość edycji wiamości przed wysłaniem w poziomu programu pocztowego."
 
-#: plugins/close_button/init.php:22
-msgid "Close article"
-msgstr "Zamknij artykuł"
+#: plugins/mailto/init.php:82
+msgid "Close this dialog"
+msgstr "Zamknij to okno"
 
 #: plugins/bookmarklets/init.php:20
 msgid "Bookmarklets"
@@ -2800,34 +2562,125 @@ msgstr "Prenumeruj w Tiny Tiny RSS"
 msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
 msgstr "Użyj tej Skryptozakładki aby publikować dowolne strony używając Tiny Tiny RSS"
 
+#: plugins/af_psql_trgm/init.php:28
+#, php-format
+msgid "Data saved (%s, %d)"
+msgstr ""
+
+#: plugins/af_psql_trgm/init.php:112
+#, fuzzy
+msgid "Show related articles"
+msgstr "Udostępnione artykuły"
+
+#: plugins/af_psql_trgm/init.php:118
+#: plugins/af_psql_trgm/init.php:220
+#, fuzzy
+msgid "Mark similar articles as read"
+msgstr "Oznaczyć wszystkie artykuły jako przeczytane?"
+
+#: plugins/af_psql_trgm/init.php:157
+msgid "PostgreSQL trigram extension returns string similarity as a floating point number (0-1). Setting it too low might produce false positives, zero disables checking."
+msgstr ""
+
+#: plugins/af_psql_trgm/init.php:160
+#, fuzzy
+msgid "Global settings"
+msgstr "Załącz ustawienia"
+
+#: plugins/af_psql_trgm/init.php:164
+msgid "Minimum similarity:"
+msgstr ""
+
+#: plugins/af_psql_trgm/init.php:169
+msgid "Minimum title length:"
+msgstr ""
+
+#: plugins/af_psql_trgm/init.php:174
+#, fuzzy
+msgid "Enable for all feeds:"
+msgstr "Włącz kategorie kanałów"
+
+#: plugins/af_psql_trgm/init.php:191
+#: plugins/af_readability/init.php:78
+msgid "Currently enabled for (click to edit):"
+msgstr ""
+
+#: plugins/af_psql_trgm/init.php:209
+msgid "Similarity (pg_trgm)"
+msgstr ""
+
+#: plugins/nsfw/init.php:30
+#: plugins/nsfw/init.php:42
+msgid "Not work safe (click to toggle)"
+msgstr "Niewłaściwe w pracy (wciśnij aby przełączyć)"
+
+#: plugins/nsfw/init.php:52
+msgid "NSFW Plugin"
+msgstr "Wtyczka \"Niewłaściwe w pracy\""
+
+#: plugins/nsfw/init.php:79
+msgid "Tags to consider NSFW (comma-separated)"
+msgstr "Znaczniki uznawane za niewłaściwe w pracy (oddzielone przecinkami)"
+
+#: plugins/nsfw/init.php:100
+msgid "Configuration saved."
+msgstr "Konfiguracja została zapisana."
+
 #: plugins/toggle_sidebar/init.php:23
 msgid "Collapse feedlist"
 msgstr "Rozwiń listę kanałów"
 
-#: plugins/af_zz_imgproxy/init.php:186
-msgid "Image proxy settings (af_zz_imgproxy)"
+#: plugins/af_readability/init.php:21
+msgid "Data saved."
 msgstr ""
 
-#: plugins/af_zz_imgproxy/init.php:211
+#: plugins/af_readability/init.php:33
 #, fuzzy
-msgid "Enable proxy for all remote images."
-msgstr "Włącz kategorie kanałów"
+msgid "Inline content"
+msgstr "Przewijanie treści artykułu"
 
-#: plugins/mailto/init.php:71
-msgid "Clicking the following link to invoke your mail client:"
-msgstr "Kliknij odnośnik aby uruchomić Twój program pocztowy:"
+#: plugins/af_readability/init.php:39
+msgid "Readability settings (af_readability)"
+msgstr ""
 
-#: plugins/mailto/init.php:75
-msgid "Forward selected article(s) by email."
-msgstr "Prześlij artykuł emailem."
+#: plugins/af_readability/init.php:66
+msgid "Use Readability for pages shared via bookmarklet."
+msgstr ""
 
-#: plugins/mailto/init.php:78
-msgid "You should be able to edit the message before sending in your mail client."
-msgstr "Powinieneś mieć jeszcze możliwość edycji wiamości przed wysłaniem w poziomu programu pocztowego."
+#: plugins/af_readability/init.php:95
+#, fuzzy
+msgid "Readability"
+msgstr "Sprawdź dostępność"
 
-#: plugins/mailto/init.php:83
-msgid "Close this dialog"
-msgstr "Zamknij to okno"
+#: plugins/af_readability/init.php:106
+#, fuzzy
+msgid "Inline article content"
+msgstr "Przewijanie treści artykułu"
+
+#: plugins/mail/init.php:28
+msgid "Mail addresses saved."
+msgstr ""
+
+#: plugins/mail/init.php:34
+#, fuzzy
+msgid "Mail plugin"
+msgstr "Wtyczki użytkowników"
+
+#: plugins/mail/init.php:36
+msgid "You can set predefined email addressed here (comma-separated list):"
+msgstr ""
+
+#: plugins/mail/init.php:140
+msgid "To:"
+msgstr "Do:"
+
+#: plugins/mail/init.php:155
+msgid "Subject:"
+msgstr "Temat:"
+
+#: plugins/mail/init.php:172
+msgid "Send e-mail"
+msgstr "Wyślij email"
 
 #: plugins/share/init.php:39
 msgid "You can disable all articles shared by unique URLs here."
@@ -2841,24 +2694,97 @@ msgstr "Zakończ udostępnianie wszystkich artykułów"
 msgid "Share by URL"
 msgstr "Udostępnij adres"
 
-#: plugins/share/init.php:97
+#: plugins/share/init.php:96
 msgid "You can share this article by the following unique URL:"
 msgstr "Możesz udostępnić ten artykuł korzystając z tego unikalnego adresu:"
 
-#: plugins/share/init.php:115
+#: plugins/share/init.php:114
 msgid "Unshare article"
 msgstr "Zakończ udostępnianie artykułu"
 
+#: plugins/af_comics/init.php:48
+msgid "Feeds supported by af_comics"
+msgstr ""
+
+#: plugins/af_comics/init.php:50
+msgid "The following comics are currently supported:"
+msgstr ""
+
+#: plugins/af_comics/init.php:68
+msgid "GoComics requires a specific URL to workaround their lack of feed support: <code>http://feeds.feedburner.com/uclick/<em>comic_name</em></code> (e.g. <code>http://www.gocomics.com/garfield</code> uses <code>http://feeds.feedburner.com/uclick/garfield</code>)."
+msgstr ""
+
+#: plugins/af_comics/init.php:70
+msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:25
+msgid "Reddit content settings (af_redditimgur)"
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:50
+msgid "Uses Readability (full-text-rss) implementation by <a target='_blank' href='https://bitbucket.org/fivefilters/'>FiveFilters.org</a>"
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:54
+msgid "Extract missing content using Readability"
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:59
+msgid "Enable additional duplicate checking"
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:73
+#: plugins/af_zz_imgproxy/init.php:254
+#, fuzzy
+msgid "Configuration saved"
+msgstr "Konfiguracja została zapisana."
+
+#: plugins/note/init.php:26
+#: plugins/note/note.js:11
+msgid "Edit article note"
+msgstr "Edytuj notatkę do artykułu"
+
+#: plugins/close_button/init.php:25
+msgid "Close article"
+msgstr "Zamknij artykuł"
+
+#: plugins/af_zz_imgproxy/init.php:210
+msgid "Image proxy settings (af_zz_imgproxy)"
+msgstr ""
+
+#: plugins/af_zz_imgproxy/init.php:234
+#, fuzzy
+msgid "Enable proxy for all remote images."
+msgstr "Włącz kategorie kanałów"
+
+#: plugins/af_zz_imgproxy/init.php:238
+#, fuzzy
+msgid "Don't cache files locally."
+msgstr "Przechowuj obrazki lokalnie"
+
+#: plugins/auth_internal/init.php:65
+msgid "Please enter your one time password:"
+msgstr "Wprowadź hasło jednorazowe:"
+
+#: plugins/auth_internal/init.php:188
+msgid "Password has been changed."
+msgstr "Hasło zostało zmienione."
+
+#: plugins/auth_internal/init.php:190
+msgid "Old password is incorrect."
+msgstr "Nieprawidłowe stare hasło."
+
 #: js/FeedTree.js:172
 #, fuzzy
 msgid "(Un)collapse"
 msgstr "Zwin/rozwiń pasek boczny"
 
-#: js/PrefFeedTree.js:52
+#: js/PrefFeedTree.js:54
 msgid "Edit category"
 msgstr "Edytuj kategorię"
 
-#: js/PrefFeedTree.js:59
+#: js/PrefFeedTree.js:61
 msgid "Remove category"
 msgstr "Usuń kategorię"
 
@@ -2894,63 +2820,55 @@ msgid "Create Filter"
 msgstr "Utwórz filtr"
 
 #: js/functions.js:1128
-msgid "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification hub again on next feed update."
-msgstr "Zresetować prenumeraty? Tiny Tiny RSS spróbuje zaprenumerować powiadomienia przy następnej aktualizacji."
-
-#: js/functions.js:1139
-msgid "Subscription reset."
-msgstr "Zresetowano prenumerate."
-
-#: js/functions.js:1149
-#: js/tt-rss.js:695
+#: js/tt-rss.js:696
 #, perl-format
 msgid "Unsubscribe from %s?"
 msgstr "Zakończyć prenumeratę %s?"
 
-#: js/functions.js:1152
+#: js/functions.js:1131
 msgid "Removing feed..."
 msgstr "Usuwanie kanału..."
 
-#: js/functions.js:1225
+#: js/functions.js:1204
 msgid "Please enter category title:"
 msgstr "Wprowadź tytuł kategorii:"
 
-#: js/functions.js:1250
+#: js/functions.js:1229
 msgid "Generate new syndication address for this feed?"
 msgstr "Wygenerowań nowy adres do dzielenia się tym kanałem?"
 
-#: js/functions.js:1254
-#: js/prefs.js:1154
+#: js/functions.js:1233
+#: js/prefs.js:1150
 msgid "Trying to change address..."
 msgstr "Próbuje zmienić adres..."
 
-#: js/functions.js:1497
-#: js/functions.js:1606
+#: js/functions.js:1476
+#: js/functions.js:1585
 #: js/prefs.js:398
 #: js/prefs.js:424
 #: js/prefs.js:456
 #: js/prefs.js:599
 #: js/prefs.js:617
-#: js/prefs.js:1136
-#: js/prefs.js:1263
+#: js/prefs.js:1132
+#: js/prefs.js:1259
 msgid "No feeds are selected."
 msgstr "Nie wybrano żadnego kanału."
 
-#: js/functions.js:1540
+#: js/functions.js:1519
 msgid "Remove selected feeds from the archive? Feeds with stored articles will not be removed."
 msgstr "Usunąć wybrane kanały z archiwum? Kanały z zachowanymi artykułami nie zostaną usunięte."
 
-#: js/functions.js:1577
+#: js/functions.js:1556
 msgid "Feeds with update errors"
 msgstr "Kanały z błędami aktualizacji"
 
-#: js/functions.js:1588
-#: js/prefs.js:1117
+#: js/functions.js:1567
+#: js/prefs.js:1113
 msgid "Remove selected feeds?"
 msgstr "Usunąć wybrane kanały?"
 
-#: js/functions.js:1591
-#: js/prefs.js:1120
+#: js/functions.js:1570
+#: js/prefs.js:1116
 msgid "Removing selected feeds..."
 msgstr "Usuwanie wybranych kanałów..."
 
@@ -2973,9 +2891,7 @@ msgstr "Edytor użytkowników"
 #: js/prefs.js:100
 #: js/prefs.js:209
 #: js/prefs.js:706
-#: plugins/instances/instances.js:26
-#: plugins/instances/instances.js:89
-#: js/functions.js:1408
+#: js/functions.js:1387
 msgid "Saving data..."
 msgstr "Zapisywanie danych..."
 
@@ -3000,7 +2916,7 @@ msgid "Removing selected labels..."
 msgstr "Usuwanie wybranych etykiet..."
 
 #: js/prefs.js:308
-#: js/prefs.js:1304
+#: js/prefs.js:1300
 msgid "No labels are selected."
 msgstr "Nie wybrano żadnych etykiet."
 
@@ -3099,28 +3015,28 @@ msgstr "Zapisać zmiany w wybranych kanałach?"
 msgid "OPML Import"
 msgstr "Import OPML"
 
-#: js/prefs.js:764
+#: js/prefs.js:759
 msgid "Please choose an OPML file first."
 msgstr "Najpierw wybierz plik OPML."
 
-#: js/prefs.js:767
+#: js/prefs.js:762
 #: plugins/import_export/import_export.js:115
 msgid "Importing, please wait..."
 msgstr "Trwa import, proszę czekać..."
 
-#: js/prefs.js:928
+#: js/prefs.js:924
 msgid "Reset to defaults?"
 msgstr "Przywrócić ustawienia domyślne?"
 
-#: js/prefs.js:1628
+#: js/prefs.js:1624
 msgid "Subscribing to feeds..."
 msgstr "Prenumerowanie kanałów..."
 
-#: js/prefs.js:1647
+#: js/prefs.js:1643
 msgid "Clear stored data for this plugin?"
 msgstr "Wyczyścić zapamiętane dane tej wtyczki?"
 
-#: js/prefs.js:1661
+#: js/prefs.js:1657
 msgid "Clear all messages in the error log?"
 msgstr "Usunąć wszystkie wiadomości z dziennika błędów?"
 
@@ -3132,58 +3048,58 @@ msgstr "Oznaczyć wszystkie artykuły jako przeczytane?"
 msgid "Marking all feeds as read..."
 msgstr "Oznaczam wszystkie kanały jako przeczytane..."
 
-#: js/tt-rss.js:401
+#: js/tt-rss.js:402
 msgid "Please enable mail plugin first."
 msgstr "Włącz najpierw wtyczkę obsługi poczty (mail)."
 
-#: js/tt-rss.js:449
-#: js/functions.js:1387
-#: js/tt-rss.js:676
+#: js/tt-rss.js:450
+#: js/functions.js:1366
+#: js/tt-rss.js:677
 msgid "You can't edit this kind of feed."
 msgstr "Nie możesz edytować kanału tego typu."
 
-#: js/tt-rss.js:530
+#: js/tt-rss.js:531
 msgid "Please enable embed_original plugin first."
 msgstr "Włącz najpierw wtyczkę osadzania oryginalnej wiadomości (embed_original)."
 
-#: js/tt-rss.js:543
-#: js/tt-rss.js:726
+#: js/tt-rss.js:544
+#: js/tt-rss.js:727
 msgid "Widescreen is not available in combined mode."
 msgstr ""
 
-#: js/tt-rss.js:824
+#: js/tt-rss.js:825
 msgid "You can't rescore this kind of feed."
 msgstr "Nie możesz przeliczyć punktacji kanału tego rodzaju."
 
-#: js/tt-rss.js:829
-#: js/tt-rss.js:689
+#: js/tt-rss.js:830
+#: js/tt-rss.js:690
 msgid "Please select some feed first."
 msgstr "Wybierz najpierw jakiś kanał."
 
-#: js/tt-rss.js:834
+#: js/tt-rss.js:835
 #, perl-format
 msgid "Rescore articles in %s?"
 msgstr "Przeliczyć punktację artykułów w %s?"
 
-#: js/tt-rss.js:837
+#: js/tt-rss.js:838
 msgid "Rescoring articles..."
 msgstr "Przeliczanie punktacji kanałów..."
 
-#: js/viewfeed.js:919
-#: js/viewfeed.js:957
-#: js/viewfeed.js:1005
-#: js/viewfeed.js:1931
-#: plugins/mail/mail.js:7
+#: js/viewfeed.js:921
+#: js/viewfeed.js:959
+#: js/viewfeed.js:1007
+#: js/viewfeed.js:1933
 #: plugins/mailto/init.js:7
-#: js/viewfeed.js:677
-#: js/viewfeed.js:699
-#: js/viewfeed.js:720
-#: js/viewfeed.js:779
-#: js/viewfeed.js:807
+#: plugins/mail/mail.js:7
+#: js/viewfeed.js:679
+#: js/viewfeed.js:701
+#: js/viewfeed.js:722
+#: js/viewfeed.js:781
+#: js/viewfeed.js:809
 msgid "No articles are selected."
 msgstr "Nie wybrano żadnych artykułów"
 
-#: js/viewfeed.js:927
+#: js/viewfeed.js:929
 #, perl-format
 msgid "Delete %d selected article in %s?"
 msgid_plural "Delete %d selected articles in %s?"
@@ -3191,7 +3107,7 @@ msgstr[0] "Usunąć %d zaznaczony artykuł z %s?"
 msgstr[1] "Usunąć %d zaznaczone artykuły z %s?"
 msgstr[2] "Usunąć %d zaznaczonych artykułów z %s?"
 
-#: js/viewfeed.js:929
+#: js/viewfeed.js:931
 #, perl-format
 msgid "Delete %d selected article?"
 msgid_plural "Delete %d selected articles?"
@@ -3199,7 +3115,7 @@ msgstr[0] "Usunąć %d zaznaczony artykuł?"
 msgstr[1] "Usunąć %d zaznaczone artykuły?"
 msgstr[2] "Usunąć %d zaznaczonych artykułów?"
 
-#: js/viewfeed.js:966
+#: js/viewfeed.js:968
 #, perl-format
 msgid "Archive %d selected article in %s?"
 msgid_plural "Archive %d selected articles in %s?"
@@ -3207,7 +3123,7 @@ msgstr[0] "Zarchiwizować %d zaznaczony artykuł z %s?"
 msgstr[1] "Zarchiwizować %d zaznaczone artykuły z %s?"
 msgstr[2] "Zarchiwizować %d zaznaczonych artykułów z %s?"
 
-#: js/viewfeed.js:969
+#: js/viewfeed.js:971
 #, perl-format
 msgid "Move %d archived article back?"
 msgid_plural "Move %d archived articles back?"
@@ -3215,11 +3131,11 @@ msgstr[0] "Przywrócić %d zarchiwizowany artykuł?"
 msgstr[1] "Przywrócić %d zarchiwizowane artykuły?"
 msgstr[2] "Przywrócić %d zarchiwizowanych artykułów?"
 
-#: js/viewfeed.js:971
+#: js/viewfeed.js:973
 msgid "Please note that unstarred articles might get purged on next feed update."
 msgstr "Pamiętaj, iż artykuły nie oznaczone gwiazdką mogą zostać usunięte podczas następnej aktualizacji."
 
-#: js/viewfeed.js:1011
+#: js/viewfeed.js:1013
 #, perl-format
 msgid "Mark %d selected article in %s as read?"
 msgid_plural "Mark %d selected articles in %s as read?"
@@ -3227,89 +3143,59 @@ msgstr[0] "Oznaczyć %d wybrany artykuł z %s jako przeczytany?"
 msgstr[1] "Oznaczyć %d wybrane artykuły z %s jako przeczytane?"
 msgstr[2] "Oznaczyć %d wybranych artykułów z %s jako przeczytane?"
 
-#: js/viewfeed.js:1031
+#: js/viewfeed.js:1033
 msgid "Edit article Tags"
 msgstr "Edytuj tagi artykułu"
 
-#: js/viewfeed.js:1037
+#: js/viewfeed.js:1039
 msgid "Saving article tags..."
 msgstr "Zapisuję tagi artykułu..."
 
-#: js/viewfeed.js:1670
+#: js/viewfeed.js:1672
 msgid "Open original article"
 msgstr "Otwórz oryginalny artykuł"
 
-#: js/viewfeed.js:1677
+#: js/viewfeed.js:1679
 msgid "Display article URL"
 msgstr "Wyświetl adres artykułu"
 
-#: js/viewfeed.js:1787
+#: js/viewfeed.js:1789
 msgid "Assign label"
 msgstr "Przypisz etykietę"
 
-#: js/viewfeed.js:1792
+#: js/viewfeed.js:1794
 msgid "Remove label"
 msgstr "Usuń etykietę"
 
-#: js/viewfeed.js:1824
+#: js/viewfeed.js:1826
 #, fuzzy
 msgid "Select articles in group"
 msgstr "Wybierz artykuł pod kursorem"
 
-#: js/viewfeed.js:1834
+#: js/viewfeed.js:1836
 #, fuzzy
 msgid "Mark group as read"
 msgstr "Oznacz jako przeczytane"
 
-#: js/viewfeed.js:1846
+#: js/viewfeed.js:1848
 msgid "Mark feed as read"
 msgstr "Oznacz kanał jako przeczytany"
 
-#: js/viewfeed.js:1899
+#: js/viewfeed.js:1901
 msgid "Please enter new score for selected articles:"
 msgstr "Wprowadź nową punktację dla wybranych artykułów:"
 
-#: js/viewfeed.js:1962
+#: js/viewfeed.js:1964
 msgid "Please enter new score for this article:"
 msgstr "Wprowadź nową punktację dla tego artykułu:"
 
-#: js/viewfeed.js:1993
+#: js/viewfeed.js:1995
 msgid "Article URL:"
 msgstr "Adres artykułu:"
 
-#: plugins/instances/instances.js:10
-msgid "Link Instance"
-msgstr "Połącz instancję"
-
-#: plugins/instances/instances.js:73
-msgid "Edit Instance"
-msgstr "Edytuj instancję"
-
-#: plugins/instances/instances.js:122
-msgid "Remove selected instances?"
-msgstr "Usunąć wybrane instancje?"
-
-#: plugins/instances/instances.js:125
-msgid "Removing selected instances..."
-msgstr "Usuwanie wybranych instancji..."
-
-#: plugins/instances/instances.js:139
-#: plugins/instances/instances.js:151
-msgid "No instances are selected."
-msgstr "Nie wybrano żadnych instancji."
-
-#: plugins/instances/instances.js:156
-msgid "Please select only one instance."
-msgstr "Wybierz tylko jedną instancję."
-
-#: plugins/note/note.js:17
-msgid "Saving article note..."
-msgstr "Zapisuję notatkę do artykułu..."
-
-#: plugins/af_psql_trgm/init.js:11
-#, fuzzy
-msgid "Related articles"
-msgstr "Usuń artykuł"
+#: plugins/embed_original/init.js:6
+msgid "Sorry, your browser does not support sandboxed iframes."
+msgstr "Przykro mi, Twoja przeglądarka nie wspiera izolowanych obiektów iframe."
 
 #: plugins/import_export/import_export.js:13
 msgid "Export Data"
@@ -3331,11 +3217,16 @@ msgstr "Importuj dane"
 msgid "Please choose the file first."
 msgstr "Najpierw wybierz plik."
 
-#: plugins/mail/mail.js:21
 #: plugins/mailto/init.js:21
+#: plugins/mail/mail.js:21
 msgid "Forward article by email"
 msgstr "Prześlij artykuł emailem"
 
+#: plugins/af_psql_trgm/init.js:11
+#, fuzzy
+msgid "Related articles"
+msgstr "Usuń artykuł"
+
 #: plugins/mail/mail.js:36
 msgid "Error sending email:"
 msgstr ""
@@ -3345,10 +3236,6 @@ msgstr ""
 msgid "Your message has been sent."
 msgstr "Dwoje dane osobiste zostały zapisane."
 
-#: plugins/embed_original/init.js:6
-msgid "Sorry, your browser does not support sandboxed iframes."
-msgstr "Przykro mi, Twoja przeglądarka nie wspiera izolowanych obiektów iframe."
-
 #: plugins/shorten_expanded/init.js:39
 #, fuzzy
 msgid "Click to expand article"
@@ -3379,7 +3266,7 @@ msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr "Operacja spowoduje unieważnienie adresów wszystkich poprzednio udostępnionych artykułów. Kontynuować?"
 
 #: plugins/share/share_prefs.js:6
-#: js/prefs.js:1437
+#: js/prefs.js:1433
 msgid "Clearing URLs..."
 msgstr "Czyszczę URLe..."
 
@@ -3387,23 +3274,44 @@ msgstr "Czyszczę URLe..."
 msgid "Shared URLs cleared."
 msgstr "Udostępniane adresy zostały wyczyszczone."
 
+#: plugins/note/note.js:17
+msgid "Saving article note..."
+msgstr "Zapisuję notatkę do artykułu..."
+
 #: js/feedlist.js:429
-#: js/feedlist.js:496
 msgid "Mark all articles in %s as read?"
 msgstr "Oznaczyć wszystkie artykuły w %s jako przeczytane?"
 
 #: js/feedlist.js:487
-msgid "Mark all articles in %s older than 1 day as read?"
+#, fuzzy
+msgid "Mark %w in %s older than 1 day as read?"
 msgstr "Oznaczyć wszystkie w kanale %s starsze jak 1 dzień jako przeczytane?"
 
 #: js/feedlist.js:490
-msgid "Mark all articles in %s older than 1 week as read?"
+#, fuzzy
+msgid "Mark %w in %s older than 1 week as read?"
 msgstr "Oznaczyć wszystkie w kanale %s starsze jak tydzień jako przeczytane?"
 
 #: js/feedlist.js:493
-msgid "Mark all articles in %s older than 2 weeks as read?"
+#, fuzzy
+msgid "Mark %w in %s older than 2 weeks as read?"
 msgstr "Oznaczyć wszystkie w kanale %s starsze jak 2 tygodnie jako przeczytane?"
 
+#: js/feedlist.js:496
+#, fuzzy
+msgid "Mark %w in %s as read?"
+msgstr "Oznaczyć wszystkie artykuły w %s jako przeczytane?"
+
+#: js/feedlist.js:499
+#, fuzzy
+msgid "search results"
+msgstr "Wyniki wyszukiwania: %s"
+
+#: js/feedlist.js:499
+#, fuzzy
+msgid "all articles"
+msgstr "Wszystkie artykuły"
+
 #: js/functions.js:506
 msgid "Error explained"
 msgstr "Wyjaśnienie błędu"
@@ -3484,180 +3392,249 @@ msgstr "Prenumerujesz już ten kanał."
 msgid "Edit rule"
 msgstr "Edytuj regułę"
 
-#: js/functions.js:1402
+#: js/functions.js:1381
 msgid "Edit Feed"
 msgstr "Edytuj kanał"
 
-#: js/functions.js:1435
+#: js/functions.js:1414
 msgid "More Feeds"
 msgstr "Więcej kanałów"
 
-#: js/functions.js:1631
+#: js/functions.js:1610
 msgid "Help"
 msgstr "Pomoc"
 
-#: js/prefs.js:1032
+#: js/prefs.js:1028
 msgid "Remove category %s? Any nested feeds would be placed into Uncategorized."
 msgstr "Usunąć kategorię %s? Wszystkie zagnieżdżone kanały zostaną umieszczone w Bez kategorii."
 
-#: js/prefs.js:1038
+#: js/prefs.js:1034
 msgid "Removing category..."
 msgstr "Usuwanie kategorii..."
 
-#: js/prefs.js:1056
+#: js/prefs.js:1052
 msgid "Remove selected categories?"
 msgstr "Usunąć wybrane kategorię?"
 
-#: js/prefs.js:1059
+#: js/prefs.js:1055
 msgid "Removing selected categories..."
 msgstr "Usuwanie wybranych kategorii..."
 
-#: js/prefs.js:1072
+#: js/prefs.js:1068
 msgid "No categories are selected."
 msgstr "Nie wybrano żadnej kategorii."
 
-#: js/prefs.js:1079
+#: js/prefs.js:1075
 msgid "Category title:"
 msgstr "Tytuł kategorii:"
 
-#: js/prefs.js:1083
+#: js/prefs.js:1079
 msgid "Creating category..."
 msgstr "Tworzenie kategorii..."
 
-#: js/prefs.js:1106
+#: js/prefs.js:1102
 msgid "Feeds without recent updates"
 msgstr "Kanały nieaktualizowane ostatnio"
 
-#: js/prefs.js:1150
+#: js/prefs.js:1146
 msgid "Replace current OPML publishing address with a new one?"
 msgstr "Zastąpić obecny adres publikacji OPML nowym adresem?"
 
-#: js/prefs.js:1227
+#: js/prefs.js:1223
 msgid "Clearing feed..."
 msgstr "Czyszczenie kanału..."
 
-#: js/prefs.js:1247
+#: js/prefs.js:1243
 msgid "Rescore articles in selected feeds?"
 msgstr "Przeliczyć punktację w wybranych kanałach?"
 
-#: js/prefs.js:1250
+#: js/prefs.js:1246
 msgid "Rescoring selected feeds..."
 msgstr "Przeliczanie punktacji wybranych kanałów..."
 
-#: js/prefs.js:1270
+#: js/prefs.js:1266
 msgid "Rescore all articles? This operation may take a lot of time."
 msgstr "Przeliczyć punktację wszystkich artykułów? Ta czynność może zająć dużo czasu."
 
-#: js/prefs.js:1273
+#: js/prefs.js:1269
 msgid "Rescoring feeds..."
 msgstr "Przeliczanie punktacji kanałów..."
 
-#: js/prefs.js:1289
+#: js/prefs.js:1285
 msgid "Reset selected labels to default colors?"
 msgstr "Przywrócić domyślne kolory wybranym etykietom?"
 
-#: js/prefs.js:1321
+#: js/prefs.js:1317
 msgid "Settings Profiles"
 msgstr "Profile ustawień"
 
-#: js/prefs.js:1330
+#: js/prefs.js:1326
 msgid "Remove selected profiles? Active and default profiles will not be removed."
 msgstr "Usunąć wybrane profile? Aktywne i domyślne profile nie zostaną usunięte."
 
-#: js/prefs.js:1333
+#: js/prefs.js:1329
 msgid "Removing selected profiles..."
 msgstr "Usuwanie wybranych profili..."
 
-#: js/prefs.js:1349
+#: js/prefs.js:1345
 msgid "No profiles are selected."
 msgstr "Nie wybrano żadnych profili."
 
-#: js/prefs.js:1357
-#: js/prefs.js:1410
+#: js/prefs.js:1353
+#: js/prefs.js:1406
 msgid "Activate selected profile?"
 msgstr "Uaktywnić wybrany profil?"
 
-#: js/prefs.js:1374
-#: js/prefs.js:1426
+#: js/prefs.js:1370
+#: js/prefs.js:1422
 msgid "Please choose a profile to activate."
 msgstr "Wybierz profil do uaktywnienia."
 
-#: js/prefs.js:1379
+#: js/prefs.js:1375
 msgid "Creating profile..."
 msgstr "Tworzenie profili...."
 
-#: js/prefs.js:1434
+#: js/prefs.js:1430
 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr "Operacja spowoduje unieważnienie wszystkich poprzednio wygenerowanych adresów kanałów. Kontynuować?"
 
-#: js/prefs.js:1444
+#: js/prefs.js:1440
 msgid "Generated URLs cleared."
 msgstr "Wyczyszczono wygenerowane adresy URL."
 
-#: js/prefs.js:1516
+#: js/prefs.js:1512
 msgid "Label Editor"
 msgstr "Edytor etykiet"
 
-#: js/tt-rss.js:684
+#: js/tt-rss.js:685
 msgid "You can't unsubscribe from the category."
 msgstr "Nie możesz zrezygnować z prenumeraty tej kategorii."
 
-#: js/viewfeed.js:125
-#: js/viewfeed.js:175
-#: js/viewfeed.js:192
+#: js/viewfeed.js:127
+#: js/viewfeed.js:177
+#: js/viewfeed.js:194
 #, fuzzy
 msgid "Click to open next unread feed."
 msgstr "Kliknij aby edytować kanał"
 
-#: js/viewfeed.js:129
+#: js/viewfeed.js:131
 msgid "Cancel search"
 msgstr "Anuluj wyszukiwanie"
 
-#: js/viewfeed.js:189
+#: js/viewfeed.js:191
 #, fuzzy
 msgid "New articles found, reload feed to continue."
 msgstr "Nie znaleziono artykułów."
 
-#: js/viewfeed.js:424
+#: js/viewfeed.js:426
 msgid "Unstar article"
 msgstr "Usuń oznaczenie gwiazdką"
 
-#: js/viewfeed.js:428
+#: js/viewfeed.js:430
 msgid "Star article"
 msgstr "Oznacz artykuł gwiazdką"
 
-#: js/viewfeed.js:478
+#: js/viewfeed.js:480
 msgid "Unpublish article"
 msgstr "Anuluj publikacje artykułu"
 
-#: js/viewfeed.js:482
+#: js/viewfeed.js:484
 msgid "Publish article"
 msgstr "Opublikuj"
 
-#: js/viewfeed.js:622
+#: js/viewfeed.js:624
 msgid "%d article selected"
 msgid_plural "%d articles selected"
 msgstr[0] "Wybrano artykuł."
 msgstr[1] "Wybrano %d artykuły."
 msgstr[2] "Wybrano %d artykułów."
 
-#: js/viewfeed.js:1286
+#: js/viewfeed.js:1288
 msgid "No article is selected."
 msgstr "Nie wybrano żadnego artykułu."
 
-#: js/viewfeed.js:1321
+#: js/viewfeed.js:1323
 msgid "No articles found to mark"
 msgstr "Nie znaleziono artykułów do oznaczenia"
 
-#: js/viewfeed.js:1323
+#: js/viewfeed.js:1325
 msgid "Mark %d article as read?"
 msgid_plural "Mark %d articles as read?"
 msgstr[0] "Oznaczyć %d artykuł jako przeczytany?"
 msgstr[1] "Oznaczyć %d artykuły jako przeczytane?"
 msgstr[2] "Oznaczyć %d artykułów jako przeczytane?"
 
-#~ msgid "Cache images locally"
-#~ msgstr "Przechowuj obrazki lokalnie"
+#~ msgid "Resubscribe to push updates"
+#~ msgstr "Odnów prenumeratę aktualizacji typu PUSH"
+
+#~ msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
+#~ msgstr "Resetuje status prenumerat PubSubHubbub dla kanałów obsługujących PUSH."
+
+#~ msgid "Download more plugins at tt-rss.org <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forums</a> or <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a>."
+#~ msgstr "Pobierz więcej wtyczek  z <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forum</a> lub <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a> tt-rss.org."
+
+#~ msgid "Linked"
+#~ msgstr "Połączone instancje"
+
+#~ msgid "Instance"
+#~ msgstr "Instancja"
+
+#~ msgid "Instance URL"
+#~ msgstr "Adres instancji:"
+
+#~ msgid "Access key:"
+#~ msgstr "Klucz dostępu:"
+
+#~ msgid "Access key"
+#~ msgstr "Klucz dostępu"
+
+#~ msgid "Use one access key for both linked instances."
+#~ msgstr "Użyj jednego klucza dostępu dla obydwóch połączonych instancji."
+
+#~ msgid "Generate new key"
+#~ msgstr "Wygeneruj nowy klucz"
+
+#~ msgid "Link instance"
+#~ msgstr "Połącz instalację"
+
+#~ msgid "You can connect other instances of Tiny Tiny RSS to this one to share Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
+#~ msgstr "Możesz podłączyć inne instalacje Tiny Tiny RSS do bieżącej aby współdzielić informacje o Popularnych kanałach. Połącz z tą instancją Tiny Tiny RSS używając tego adresu:"
+
+#~ msgid "Last connected"
+#~ msgstr "Ostatnio połączony"
+
+#~ msgid "Status"
+#~ msgstr "Status"
+
+#~ msgid "Stored feeds"
+#~ msgstr "Zapisane kanały"
+
+#~ msgid "Create link"
+#~ msgstr "Utwórz łącze"
+
+#~ msgid "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification hub again on next feed update."
+#~ msgstr "Zresetować prenumeraty? Tiny Tiny RSS spróbuje zaprenumerować powiadomienia przy następnej aktualizacji."
+
+#~ msgid "Subscription reset."
+#~ msgstr "Zresetowano prenumerate."
+
+#~ msgid "Link Instance"
+#~ msgstr "Połącz instancję"
+
+#~ msgid "Edit Instance"
+#~ msgstr "Edytuj instancję"
+
+#~ msgid "Remove selected instances?"
+#~ msgstr "Usunąć wybrane instancje?"
+
+#~ msgid "Removing selected instances..."
+#~ msgstr "Usuwanie wybranych instancji..."
+
+#~ msgid "No instances are selected."
+#~ msgstr "Nie wybrano żadnych instancji."
+
+#~ msgid "Please select only one instance."
+#~ msgstr "Wybierz tylko jedną instancję."
 
 #~ msgid "The error will be reported to the configured log destination."
 #~ msgstr "Błąd zostanie zapisany we wskazanym dzienniku systemu."
diff --git a/locale/pt_BR/LC_MESSAGES/messages.mo b/locale/pt_BR/LC_MESSAGES/messages.mo
index 2dc9e73d2..dc34bd9a1 100755
--- a/locale/pt_BR/LC_MESSAGES/messages.mo
+++ b/locale/pt_BR/LC_MESSAGES/messages.mo
diff --git a/locale/pt_BR/LC_MESSAGES/messages.po b/locale/pt_BR/LC_MESSAGES/messages.po
index f7bb877b8..2cfbb1c4c 100644
--- a/locale/pt_BR/LC_MESSAGES/messages.po
+++ b/locale/pt_BR/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tt-rss git\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 15:25+0300\n"
+"POT-Creation-Date: 2017-07-04 16:29+0300\n"
 "PO-Revision-Date: 2016-01-03 15:27-0200\n"
 "Last-Translator: Eduardo Kalinowski <[email protected]>\n"
 "Language-Team: Portuguese/Brazil\n"
@@ -166,31 +166,30 @@ msgstr "Plugin não encontrado"
 #: prefs.php:118
 #: classes/backend.php:5
 #: classes/pref/labels.php:282
-#: classes/pref/feeds.php:1402
-#: classes/pref/filters.php:779
+#: classes/pref/filters.php:819
+#: classes/pref/feeds.php:1376
 #: js/feedlist.js:149
-#: js/functions.js:1131
-#: js/functions.js:1231
-#: js/functions.js:1478
+#: js/functions.js:1210
+#: js/functions.js:1457
 #: js/prefs.js:621
-#: js/prefs.js:818
-#: js/prefs.js:1648
-#: js/prefs.js:1663
-#: js/tt-rss.js:550
-#: js/viewfeed.js:1182
+#: js/prefs.js:813
+#: js/prefs.js:1644
+#: js/prefs.js:1659
+#: js/tt-rss.js:551
+#: js/viewfeed.js:1184
 #: plugins/import_export/import_export.js:17
 #: js/feedlist.js:467
-#: js/feedlist.js:512
+#: js/feedlist.js:515
 #: js/functions.js:372
 #: js/functions.js:630
-#: js/prefs.js:1360
-#: js/prefs.js:1413
-#: js/prefs.js:1452
-#: js/prefs.js:1465
-#: js/prefs.js:1476
-#: js/prefs.js:1491
-#: js/tt-rss.js:567
-#: js/viewfeed.js:762
+#: js/prefs.js:1356
+#: js/prefs.js:1409
+#: js/prefs.js:1448
+#: js/prefs.js:1461
+#: js/prefs.js:1472
+#: js/prefs.js:1487
+#: js/tt-rss.js:568
+#: js/viewfeed.js:764
 msgid "Loading, please wait..."
 msgstr "Carregando, por favor aguarde..."
 
@@ -207,13 +206,13 @@ msgid "All Articles"
 msgstr "Todos os artigos"
 
 #: index.php:192
-#: include/functions2.php:107
+#: include/functions.php:1181
 #: classes/feeds.php:110
 msgid "Starred"
 msgstr "Favoritos"
 
 #: index.php:193
-#: include/functions2.php:108
+#: include/functions.php:1182
 #: classes/feeds.php:111
 msgid "Published"
 msgstr "Publicados"
@@ -254,7 +253,7 @@ msgstr "Título"
 
 #: index.php:209
 #: index.php:249
-#: include/functions2.php:95
+#: include/functions.php:1169
 #: classes/feeds.php:115
 #: js/FeedTree.js:138
 #: js/FeedTree.js:166
@@ -294,7 +293,7 @@ msgid "Feed actions:"
 msgstr "Ações do feed:"
 
 #: index.php:244
-#: classes/handler/public.php:672
+#: classes/handler/public.php:583
 msgid "Subscribe to feed..."
 msgstr "Inscrever-se ao feed..."
 
@@ -308,8 +307,8 @@ msgstr "Reclassificar feed"
 
 #: index.php:247
 #: classes/pref/feeds.php:785
-#: classes/pref/feeds.php:1357
-#: js/PrefFeedTree.js:78
+#: classes/pref/feeds.php:1331
+#: js/PrefFeedTree.js:80
 msgid "Unsubscribe"
 msgstr "Cancelar inscrição"
 
@@ -326,7 +325,7 @@ msgid "Other actions:"
 msgstr "Outras ações:"
 
 #: index.php:252
-#: include/functions2.php:81
+#: include/functions.php:1155
 msgid "Toggle widescreen mode"
 msgstr "Ativa/Desativa modo tela-cheia"
 
@@ -352,7 +351,7 @@ msgstr "Atualizações estão disponíveis via Git."
 
 #: prefs.php:33
 #: prefs.php:136
-#: include/functions2.php:110
+#: include/functions.php:1184
 #: classes/pref/prefs.php:435
 msgid "Preferences"
 msgstr "Preferências"
@@ -367,20 +366,19 @@ msgstr "Sair das preferências"
 
 #: prefs.php:139
 #: classes/pref/feeds.php:112
-#: classes/pref/feeds.php:1297
-#: classes/pref/feeds.php:1346
+#: classes/pref/feeds.php:1271
+#: classes/pref/feeds.php:1320
 msgid "Feeds"
 msgstr "Inscrições"
 
 #: prefs.php:142
-#: classes/pref/filters.php:248
+#: classes/pref/filters.php:273
 msgid "Filters"
 msgstr "Filtros"
 
 #: prefs.php:145
-#: include/functions.php:1327
-#: include/functions.php:1979
 #: classes/pref/labels.php:90
+#: classes/feeds.php:1718
 msgid "Labels"
 msgstr "Marcadores"
 
@@ -409,13 +407,13 @@ msgstr "Registro de novos usuários foi desativado pelo administrador."
 #: register.php:337
 #: register.php:347
 #: register.php:359
-#: classes/handler/public.php:742
-#: classes/handler/public.php:813
-#: classes/handler/public.php:911
-#: classes/handler/public.php:990
-#: classes/handler/public.php:1004
-#: classes/handler/public.php:1011
-#: classes/handler/public.php:1036
+#: classes/handler/public.php:653
+#: classes/handler/public.php:724
+#: classes/handler/public.php:822
+#: classes/handler/public.php:901
+#: classes/handler/public.php:915
+#: classes/handler/public.php:922
+#: classes/handler/public.php:947
 msgid "Return to Tiny Tiny RSS"
 msgstr "Retornar ao Tiny Tiny RSS"
 
@@ -432,12 +430,12 @@ msgid "Check availability"
 msgstr "Verificar disponibilidade"
 
 #: register.php:229
-#: classes/handler/public.php:829
+#: classes/handler/public.php:740
 msgid "Email:"
 msgstr "E-mail:"
 
 #: register.php:232
-#: classes/handler/public.php:834
+#: classes/handler/public.php:745
 msgid "How much is two plus two:"
 msgstr "Quanto é dois mais dois:"
 
@@ -465,17 +463,23 @@ msgstr "Conta criada com sucesso."
 msgid "New user registrations are currently closed."
 msgstr "Registro de novos usuários está suspenso."
 
-#: update.php:67
+#: update.php:66
 msgid "Tiny Tiny RSS data update script."
 msgstr "Script de atualização do Tiny Tiny RSS."
 
-#: include/digest.php:109
-#: include/functions.php:1336
-#: include/functions.php:1880
-#: include/functions.php:1965
-#: include/functions.php:1987
-#: classes/opml.php:421
+#: include/controls.php:83
+#: classes/pref/filters.php:242
+#: classes/pref/filters.php:253
+#: classes/pref/filters.php:544
+msgid "All feeds"
+msgstr "Todos os feeds"
+
+#: include/controls.php:134
+#: include/controls.php:316
 #: classes/pref/feeds.php:228
+#: classes/opml.php:486
+#: classes/feeds.php:1727
+#: classes/digest.php:113
 msgid "Uncategorized"
 msgstr "Não categorizado"
 
@@ -490,390 +494,286 @@ msgstr[1] "%d artigos arquivados"
 msgid "No feeds found."
 msgstr "Sem feeds para exibir."
 
-#: include/functions.php:1029
+#: include/functions.php:900
 #, php-format
 msgid "%d min"
 msgstr "%d min"
 
-#: include/functions.php:1325
-#: include/functions.php:1977
-msgid "Special"
-msgstr "Especial"
-
-#: include/functions.php:1828
-#: classes/pref/filters.php:229
-#: classes/pref/filters.php:507
-msgid "All feeds"
-msgstr "Todos os feeds"
-
-#: include/functions.php:2032
-msgid "Starred articles"
-msgstr "Artigos com estrela"
-
-#: include/functions.php:2034
-msgid "Published articles"
-msgstr "Artigos publicados"
-
-#: include/functions.php:2036
-msgid "Fresh articles"
-msgstr "Recentes"
-
-#: include/functions.php:2038
-#: include/functions2.php:105
-msgid "All articles"
-msgstr "Todos os artigos"
-
-#: include/functions.php:2040
-msgid "Archived articles"
-msgstr "Artigos arquivados"
-
-#: include/functions.php:2042
-msgid "Recently read"
-msgstr "Lidos recentemente"
-
-#: include/functions2.php:57
+#: include/functions.php:1131
 msgid "Navigation"
 msgstr "Navegação"
 
-#: include/functions2.php:58
+#: include/functions.php:1132
 msgid "Open next feed"
 msgstr "Abrir o próximo feed"
 
-#: include/functions2.php:59
+#: include/functions.php:1133
 msgid "Open previous feed"
 msgstr "Abrir o feed anterior"
 
-#: include/functions2.php:60
+#: include/functions.php:1134
 msgid "Open next article"
 msgstr "Abrir o próximo artigo"
 
-#: include/functions2.php:61
+#: include/functions.php:1135
 msgid "Open previous article"
 msgstr "Abrir o artigo anterior"
 
-#: include/functions2.php:62
+#: include/functions.php:1136
 msgid "Open next article (don't scroll long articles)"
 msgstr "Abrir o próximo artigo (não rola artigos longos)"
 
-#: include/functions2.php:63
+#: include/functions.php:1137
 msgid "Open previous article (don't scroll long articles)"
 msgstr "Abrir o artigo anterior (não rola artigos longos)"
 
-#: include/functions2.php:64
+#: include/functions.php:1138
 msgid "Move to next article (don't expand or mark read)"
 msgstr "Mover para o próximo artigo (não expande ou marca como lido)"
 
-#: include/functions2.php:65
+#: include/functions.php:1139
 msgid "Move to previous article (don't expand or mark read)"
 msgstr "Mover para o artigo anterior (não expande ou marca como lido)"
 
-#: include/functions2.php:66
+#: include/functions.php:1140
 msgid "Show search dialog"
 msgstr "Mostrar janela de pesquisa"
 
-#: include/functions2.php:67
+#: include/functions.php:1141
 msgid "Article"
 msgstr "Artigo"
 
-#: include/functions2.php:68
-#: js/viewfeed.js:1699
+#: include/functions.php:1142
+#: js/viewfeed.js:1701
 msgid "Toggle starred"
 msgstr "Incluir/Remover estrela"
 
-#: include/functions2.php:69
-#: js/viewfeed.js:1711
+#: include/functions.php:1143
+#: js/viewfeed.js:1713
 msgid "Toggle published"
 msgstr "Marcar/Desmarcar como publicado"
 
-#: include/functions2.php:70
-#: js/viewfeed.js:1686
+#: include/functions.php:1144
+#: js/viewfeed.js:1688
 msgid "Toggle unread"
 msgstr "Marcar como não lido/lido"
 
-#: include/functions2.php:71
+#: include/functions.php:1145
 msgid "Edit tags"
 msgstr "Editar tags"
 
-#: include/functions2.php:72
+#: include/functions.php:1146
 msgid "Open in new window"
 msgstr "Abrir em uma nova janela"
 
-#: include/functions2.php:73
-#: js/viewfeed.js:1732
+#: include/functions.php:1147
+#: js/viewfeed.js:1734
 msgid "Mark below as read"
 msgstr "Marcar abaixo como lido"
 
-#: include/functions2.php:74
-#: js/viewfeed.js:1725
+#: include/functions.php:1148
+#: js/viewfeed.js:1727
 msgid "Mark above as read"
 msgstr "Marcar acima como lido"
 
-#: include/functions2.php:75
+#: include/functions.php:1149
 msgid "Scroll down"
 msgstr "Rolar para baixo"
 
-#: include/functions2.php:76
+#: include/functions.php:1150
 msgid "Scroll up"
 msgstr "Rolar para cima"
 
-#: include/functions2.php:77
+#: include/functions.php:1151
 msgid "Select article under cursor"
 msgstr "Selecionar artigo sob o cursor"
 
-#: include/functions2.php:78
+#: include/functions.php:1152
 msgid "Email article"
 msgstr "Enviar artigo por e-mail"
 
-#: include/functions2.php:79
+#: include/functions.php:1153
 msgid "Close/collapse article"
 msgstr "Fechar/contrair artigo"
 
-#: include/functions2.php:80
+#: include/functions.php:1154
 msgid "Toggle article expansion (combined mode)"
 msgstr "Ativar/Desativar expansão de artigo (modo combinado)"
 
-#: include/functions2.php:82
+#: include/functions.php:1156
 #: plugins/embed_original/init.php:31
 msgid "Toggle embed original"
 msgstr "Ativar/Desativar inclusão do original"
 
-#: include/functions2.php:83
+#: include/functions.php:1157
 msgid "Article selection"
 msgstr "Seleção de artigos"
 
-#: include/functions2.php:84
+#: include/functions.php:1158
 msgid "Select all articles"
 msgstr "Selecionar todos os artigos"
 
-#: include/functions2.php:85
+#: include/functions.php:1159
 msgid "Select unread"
 msgstr "Selecionar os não lidos"
 
-#: include/functions2.php:86
+#: include/functions.php:1160
 msgid "Select starred"
 msgstr "Selecionar artigos com estrela"
 
-#: include/functions2.php:87
+#: include/functions.php:1161
 msgid "Select published"
 msgstr "Selecionar artigos publicados"
 
-#: include/functions2.php:88
+#: include/functions.php:1162
 msgid "Invert selection"
 msgstr "Inverter seleção"
 
-#: include/functions2.php:89
+#: include/functions.php:1163
 msgid "Deselect everything"
 msgstr "Desmarcar tudo"
 
-#: include/functions2.php:90
+#: include/functions.php:1164
 #: classes/pref/feeds.php:555
-#: classes/pref/feeds.php:823
+#: classes/pref/feeds.php:811
 msgid "Feed"
 msgstr "Feed"
 
-#: include/functions2.php:91
+#: include/functions.php:1165
 msgid "Refresh current feed"
 msgstr "Atualizar feed atual"
 
-#: include/functions2.php:92
+#: include/functions.php:1166
 msgid "Un/hide read feeds"
 msgstr "Ocultar/mostrar feeds lidos"
 
-#: include/functions2.php:93
-#: classes/pref/feeds.php:1349
+#: include/functions.php:1167
+#: classes/pref/feeds.php:1323
 msgid "Subscribe to feed"
 msgstr "Inscrever-se no feed"
 
-#: include/functions2.php:94
+#: include/functions.php:1168
 #: js/FeedTree.js:145
-#: js/PrefFeedTree.js:72
-#: js/viewfeed.js:1853
+#: js/PrefFeedTree.js:74
+#: js/viewfeed.js:1855
 msgid "Edit feed"
 msgstr "Editar inscrição"
 
-#: include/functions2.php:96
+#: include/functions.php:1170
 msgid "Reverse headlines"
 msgstr "Reverter títulos"
 
-#: include/functions2.php:97
+#: include/functions.php:1171
 msgid "Toggle headline grouping"
 msgstr ""
 
-#: include/functions2.php:98
+#: include/functions.php:1172
 msgid "Debug feed update"
 msgstr "Debugar atualização de feeds"
 
-#: include/functions2.php:99
+#: include/functions.php:1173
 msgid "Debug viewfeed()"
 msgstr "Debugar viewfeed()"
 
-#: include/functions2.php:100
+#: include/functions.php:1174
 #: js/FeedTree.js:194
 msgid "Mark all feeds as read"
 msgstr "Marcar todos os feeds como lidos"
 
-#: include/functions2.php:101
+#: include/functions.php:1175
 msgid "Un/collapse current category"
 msgstr "Mostrar/Ocultar categoria atual"
 
-#: include/functions2.php:102
+#: include/functions.php:1176
 msgid "Toggle combined mode"
 msgstr "Ativar/Desativar modo combinado"
 
-#: include/functions2.php:103
+#: include/functions.php:1177
 msgid "Toggle auto expand in combined mode"
 msgstr "Ativar/Desativar expansão automática no modo combinado"
 
-#: include/functions2.php:104
+#: include/functions.php:1178
 msgid "Go to"
 msgstr "Ir para"
 
-#: include/functions2.php:106
+#: include/functions.php:1179
+#: classes/feeds.php:1602
+msgid "All articles"
+msgstr "Todos os artigos"
+
+#: include/functions.php:1180
 msgid "Fresh"
 msgstr "Recentes"
 
-#: include/functions2.php:109
-#: js/tt-rss.js:494
-#: js/tt-rss.js:663
+#: include/functions.php:1183
+#: js/tt-rss.js:495
+#: js/tt-rss.js:664
 msgid "Tag cloud"
 msgstr "Núvem de tags"
 
-#: include/functions2.php:111
+#: include/functions.php:1185
 msgid "Other"
 msgstr "Outros"
 
-#: include/functions2.php:112
+#: include/functions.php:1186
 #: classes/pref/labels.php:267
 msgid "Create label"
 msgstr "Criar marcador"
 
-#: include/functions2.php:113
-#: classes/pref/filters.php:753
+#: include/functions.php:1187
+#: classes/pref/filters.php:793
 msgid "Create filter"
 msgstr "Criar filtro"
 
-#: include/functions2.php:114
+#: include/functions.php:1188
 msgid "Un/collapse sidebar"
 msgstr "Mostrar/Ocultar barra lateral"
 
-#: include/functions2.php:115
+#: include/functions.php:1189
 msgid "Show help dialog"
 msgstr "Mostrar janela de ajuda"
 
-#: include/functions2.php:670
-#, php-format
-msgid "Search results: %s"
-msgstr "Resultados da pesquisa: %s"
-
-#: include/functions2.php:1336
-#: classes/feeds.php:752
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] "comentário"
-msgstr[1] "comentários"
-
-#: include/functions2.php:1340
-#: classes/feeds.php:756
-msgid "comments"
-msgstr "comentários"
-
-#: include/functions2.php:1366
-msgid " - "
-msgstr " - "
-
-#: include/functions2.php:1397
-#: include/functions2.php:1648
-#: classes/article.php:311
-msgid "no tags"
-msgstr "sem tags"
-
-#: include/functions2.php:1407
-#: classes/feeds.php:738
-msgid "Edit tags for this article"
-msgstr "Editar tags deste artigo"
-
-#: include/functions2.php:1439
-#: classes/feeds.php:690
-msgid "Originally from:"
-msgstr "Originalmente de:"
-
-#: include/functions2.php:1452
-#: classes/pref/feeds.php:574
-#: classes/feeds.php:703
-msgid "Feed URL"
-msgstr "URL do feed"
-
-#: include/functions2.php:1489
-#: classes/backend.php:105
-#: classes/dlg.php:37
-#: classes/dlg.php:60
-#: classes/dlg.php:93
-#: classes/dlg.php:159
-#: classes/dlg.php:186
-#: classes/pref/feeds.php:1652
-#: classes/pref/feeds.php:1718
-#: classes/pref/filters.php:204
-#: classes/pref/prefs.php:1097
-#: plugins/af_psql_trgm/init.php:102
-#: plugins/import_export/init.php:415
-#: plugins/import_export/init.php:461
-#: plugins/share/init.php:121
-msgid "Close this window"
-msgstr "Fechar esta janela"
-
-#: include/functions2.php:1686
-msgid "(edit note)"
-msgstr "(editar nota)"
-
-#: include/functions2.php:1960
-msgid "unknown type"
-msgstr "tipo desconhecido"
-
-#: include/functions2.php:2037
-msgid "Attachments"
-msgstr "Anexos"
-
-#: include/functions2.php:2496
+#: include/functions.php:2456
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: include/functions2.php:2497
+#: include/functions.php:2457
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: include/functions2.php:2498
+#: include/functions.php:2458
 msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
 msgstr ""
 
-#: include/functions2.php:2499
+#: include/functions.php:2459
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: include/functions2.php:2500
+#: include/functions.php:2460
 #, fuzzy
 msgid "No file was uploaded"
 msgstr "Nenhum arquivo enviado."
 
-#: include/functions2.php:2501
+#: include/functions.php:2461
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: include/functions2.php:2502
+#: include/functions.php:2462
 msgid "Failed to write file to disk."
 msgstr ""
 
-#: include/functions2.php:2503
+#: include/functions.php:2463
 msgid "A PHP extension stopped the file upload."
 msgstr ""
 
 #: include/login_form.php:197
-#: classes/handler/public.php:569
-#: classes/handler/public.php:824
+#: classes/handler/public.php:480
+#: classes/handler/public.php:735
 msgid "Login:"
 msgstr "Nome de usuário:"
 
 #: include/login_form.php:207
-#: classes/handler/public.php:572
+#: classes/handler/public.php:483
 msgid "Password:"
 msgstr "Senha:"
 
@@ -886,7 +786,7 @@ msgid "Profile:"
 msgstr "Perfil:"
 
 #: include/login_form.php:223
-#: classes/handler/public.php:311
+#: classes/handler/public.php:287
 #: classes/pref/prefs.php:1035
 #: classes/rpc.php:63
 msgid "Default profile"
@@ -905,7 +805,7 @@ msgid "Remember me"
 msgstr "Continuar conectado"
 
 #: include/login_form.php:249
-#: classes/handler/public.php:577
+#: classes/handler/public.php:488
 msgid "Log in"
 msgstr "Conectar"
 
@@ -921,145 +821,44 @@ msgstr "Falha ao validar a sessão (usuário não encontrado)"
 msgid "Session failed to validate (password changed)"
 msgstr "Falha ao validar a sessão (senha foi alterada)"
 
-#: classes/article.php:25
-msgid "Article not found."
-msgstr "Artigo não encontrado."
-
-#: classes/article.php:197
-msgid "Tags for this article (separated by commas):"
-msgstr "Tags para esse artigo (separadas por vírgula):"
-
-#: classes/article.php:222
-#: classes/pref/labels.php:79
-#: classes/pref/users.php:98
-#: classes/pref/feeds.php:801
-#: classes/pref/feeds.php:943
-#: classes/pref/filters.php:485
-#: classes/pref/prefs.php:981
-#: plugins/instances/init.php:245
-#: plugins/nsfw/init.php:85
-#: plugins/note/init.php:51
-#: plugins/af_readability/init.php:68
-#: plugins/af_redditimgur/init.php:60
-#: plugins/af_psql_trgm/init.php:181
-#: plugins/mail/init.php:64
-#: plugins/af_zz_imgproxy/init.php:213
-msgid "Save"
-msgstr "Salvar"
-
-#: classes/article.php:224
-#: classes/handler/public.php:546
-#: classes/handler/public.php:580
-#: classes/pref/labels.php:81
-#: classes/pref/users.php:100
-#: classes/pref/feeds.php:802
-#: classes/pref/feeds.php:946
-#: classes/pref/feeds.php:1859
-#: classes/pref/filters.php:488
-#: classes/pref/filters.php:902
-#: classes/pref/filters.php:983
-#: classes/pref/filters.php:1076
-#: classes/pref/prefs.php:983
-#: classes/feeds.php:1105
-#: classes/feeds.php:1155
-#: classes/feeds.php:1192
-#: plugins/instances/init.php:248
-#: plugins/instances/init.php:436
-#: plugins/note/init.php:53
-#: plugins/mail/init.php:173
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: classes/opml.php:28
-#: classes/opml.php:33
-msgid "OPML Utility"
-msgstr "Utilitário OPML"
-
-#: classes/opml.php:37
-msgid "Importing OPML..."
-msgstr "Importando OPML..."
-
-#: classes/opml.php:41
-msgid "Return to preferences"
-msgstr "Retornar às preferências"
-
-#: classes/opml.php:271
-#, php-format
-msgid "Adding feed: %s"
-msgstr "Adicionando feed: %s"
-
-#: classes/opml.php:282
-#, php-format
-msgid "Duplicate feed: %s"
-msgstr "Feed duplicado: %s"
-
-#: classes/opml.php:296
-#, php-format
-msgid "Adding label %s"
-msgstr "Adicionando marcador %s"
-
-#: classes/opml.php:299
-#, php-format
-msgid "Duplicate label: %s"
-msgstr "Marcador duplicado: %s"
-
-#: classes/opml.php:311
-#, php-format
-msgid "Setting preference key %s to %s"
-msgstr "Ajustando chave de configuração %s para %s"
-
-#: classes/opml.php:343
-msgid "Adding filter..."
-msgstr "Adicionando filtro..."
-
-#: classes/opml.php:421
-#, php-format
-msgid "Processing category: %s"
-msgstr "Processando categoria: %s"
-
-#: classes/opml.php:470
-#, php-format
-msgid "Upload failed with error code %d"
-msgstr "Envio falhou com o código de erro %d"
-
-#: classes/opml.php:484
-#: plugins/import_export/init.php:442
-msgid "Unable to move uploaded file."
-msgstr "Incapaz de mover arquivo enviado."
-
-#: classes/opml.php:488
-#: plugins/import_export/init.php:446
-msgid "Error: please upload OPML file."
-msgstr "Erro: por favor envie um arquivo OPML."
-
-#: classes/opml.php:499
-msgid "Error: unable to find moved OPML file."
-msgstr "Erro: arquivo OPML movido não foi encontrado."
-
-#: classes/opml.php:506
-msgid "Error while parsing document."
-msgstr "Erro ao processar o documento."
-
-#: classes/backend.php:33
+#: classes/backend.php:31
 msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
 msgstr "Outras dicas de interface estão disponíveis no wiki to Tiny Tiny RSS."
 
-#: classes/backend.php:38
+#: classes/backend.php:36
 msgid "Keyboard Shortcuts"
 msgstr "Atalhos de teclado"
 
-#: classes/backend.php:61
+#: classes/backend.php:59
 msgid "Shift"
 msgstr "Shift"
 
-#: classes/backend.php:64
+#: classes/backend.php:62
 msgid "Ctrl"
 msgstr "Ctrl"
 
-#: classes/backend.php:99
+#: classes/backend.php:97
 msgid "Help topic not found."
 msgstr "Tópico de ajuda não encontrado."
 
+#: classes/backend.php:103
+#: classes/dlg.php:37
+#: classes/dlg.php:60
+#: classes/dlg.php:93
+#: classes/dlg.php:159
+#: classes/dlg.php:186
+#: classes/article.php:744
+#: classes/pref/filters.php:206
+#: classes/pref/prefs.php:1097
+#: classes/pref/feeds.php:1626
+#: classes/pref/feeds.php:1692
+#: plugins/import_export/init.php:421
+#: plugins/import_export/init.php:467
+#: plugins/af_psql_trgm/init.php:102
+#: plugins/share/init.php:120
+msgid "Close this window"
+msgstr "Fechar esta janela"
+
 #: classes/dlg.php:17
 msgid "If you have imported labels and/or filters, you might need to reload preferences to see your new data."
 msgstr "Se você importou rótulos e/ou filtros, você talvez tenha que recarregar as preferências para ver seus novos dados."
@@ -1070,7 +869,7 @@ msgstr "Sua URL OPML pública é:"
 
 #: classes/dlg.php:57
 #: classes/dlg.php:183
-#: plugins/share/init.php:118
+#: plugins/share/init.php:117
 msgid "Generate new URL"
 msgstr "Gerar nova URL"
 
@@ -1091,128 +890,222 @@ msgstr "O serviço de atualização está demorando demais para atualizar um fee
 msgid "You can view this feed as RSS using the following URL:"
 msgstr "Você pode ver esse feed como RSS usando a seguinte URL:"
 
-#: classes/handler/public.php:510
+#: classes/article.php:25
+msgid "Article not found."
+msgstr "Artigo não encontrado."
+
+#: classes/article.php:197
+msgid "Tags for this article (separated by commas):"
+msgstr "Tags para esse artigo (separadas por vírgula):"
+
+#: classes/article.php:222
+#: classes/pref/labels.php:79
+#: classes/pref/filters.php:519
+#: classes/pref/users.php:98
+#: classes/pref/prefs.php:981
+#: classes/pref/feeds.php:789
+#: classes/pref/feeds.php:931
+#: plugins/af_psql_trgm/init.php:181
+#: plugins/nsfw/init.php:85
+#: plugins/af_readability/init.php:68
+#: plugins/mail/init.php:64
+#: plugins/af_redditimgur/init.php:60
+#: plugins/note/init.php:51
+#: plugins/af_zz_imgproxy/init.php:240
+msgid "Save"
+msgstr "Salvar"
+
+#: classes/article.php:224
+#: classes/handler/public.php:457
+#: classes/handler/public.php:491
+#: classes/pref/labels.php:81
+#: classes/pref/filters.php:522
+#: classes/pref/filters.php:942
+#: classes/pref/filters.php:1022
+#: classes/pref/filters.php:1115
+#: classes/pref/users.php:100
+#: classes/pref/prefs.php:983
+#: classes/pref/feeds.php:790
+#: classes/pref/feeds.php:934
+#: classes/pref/feeds.php:1833
+#: classes/feeds.php:1098
+#: classes/feeds.php:1148
+#: classes/feeds.php:1185
+#: plugins/mail/init.php:173
+#: plugins/note/init.php:53
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: classes/article.php:311
+#: classes/article.php:652
+#: classes/article.php:805
+msgid "no tags"
+msgstr "sem tags"
+
+#: classes/article.php:419
+msgid "unknown type"
+msgstr "tipo desconhecido"
+
+#: classes/article.php:496
+msgid "Attachments"
+msgstr "Anexos"
+
+#: classes/article.php:591
+#: classes/feeds.php:741
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] "comentário"
+msgstr[1] "comentários"
+
+#: classes/article.php:595
+#: classes/feeds.php:745
+msgid "comments"
+msgstr "comentários"
+
+#: classes/article.php:621
+msgid " - "
+msgstr " - "
+
+#: classes/article.php:662
+#: classes/feeds.php:727
+msgid "Edit tags for this article"
+msgstr "Editar tags deste artigo"
+
+#: classes/article.php:694
+#: classes/feeds.php:681
+msgid "Originally from:"
+msgstr "Originalmente de:"
+
+#: classes/article.php:707
+#: classes/pref/feeds.php:574
+#: classes/feeds.php:694
+msgid "Feed URL"
+msgstr "URL do feed"
+
+#: classes/article.php:843
+msgid "(edit note)"
+msgstr "(editar nota)"
+
+#: classes/handler/public.php:421
 #: plugins/bookmarklets/init.php:40
 msgid "Share with Tiny Tiny RSS"
 msgstr "Compartilhar com Tiny Tiny RSS"
 
-#: classes/handler/public.php:518
+#: classes/handler/public.php:429
 msgid "Title:"
 msgstr "Título:"
 
-#: classes/handler/public.php:520
+#: classes/handler/public.php:431
 #: classes/pref/feeds.php:572
-#: plugins/instances/init.php:212
-#: plugins/instances/init.php:401
 msgid "URL:"
 msgstr "URL:"
 
-#: classes/handler/public.php:522
+#: classes/handler/public.php:433
 msgid "Content:"
 msgstr "Conteúdo:"
 
-#: classes/handler/public.php:524
+#: classes/handler/public.php:435
 msgid "Labels:"
 msgstr "Marcadores:"
 
-#: classes/handler/public.php:543
+#: classes/handler/public.php:454
 msgid "Shared article will appear in the Published feed."
 msgstr "Artigo compartilhado vai aparecer nos publicados."
 
-#: classes/handler/public.php:545
+#: classes/handler/public.php:456
 msgid "Share"
 msgstr "Compartilhar"
 
-#: classes/handler/public.php:567
+#: classes/handler/public.php:478
 msgid "Not logged in"
 msgstr "Não logado"
 
-#: classes/handler/public.php:626
+#: classes/handler/public.php:537
 msgid "Incorrect username or password"
 msgstr "Usuário ou senha inválidos"
 
-#: classes/handler/public.php:678
+#: classes/handler/public.php:589
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "Já inscrito em <b>%s</b>"
 
-#: classes/handler/public.php:681
+#: classes/handler/public.php:592
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "Inscrito em <b>%s</b>."
 
-#: classes/handler/public.php:684
+#: classes/handler/public.php:595
 #, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "Não foi possível inscrever-se em <b>%s</b>"
 
-#: classes/handler/public.php:687
+#: classes/handler/public.php:598
 #, php-format
 msgid "No feeds found in <b>%s</b>."
 msgstr "Nenhum feed encontrado em <b>%s</b>."
 
-#: classes/handler/public.php:690
+#: classes/handler/public.php:601
 msgid "Multiple feed URLs found."
 msgstr "Multiplas URLs de feed encontradas."
 
-#: classes/handler/public.php:694
+#: classes/handler/public.php:605
 #, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr "Não foi possível increver-se em <b>%s</b> não foi possível.<br>Erro ao baixar a URL do feed RSS."
 
-#: classes/handler/public.php:712
+#: classes/handler/public.php:623
 msgid "Subscribe to selected feed"
 msgstr "Inscrever-se no feed selecionado"
 
-#: classes/handler/public.php:737
+#: classes/handler/public.php:648
 msgid "Edit subscription options"
 msgstr "Editar opções de inscrição"
 
-#: classes/handler/public.php:774
+#: classes/handler/public.php:685
 msgid "Password recovery"
 msgstr "Recuperação de senha"
 
-#: classes/handler/public.php:817
+#: classes/handler/public.php:728
 msgid "You will need to provide valid account name and email. A password reset link will be sent to your email address."
 msgstr "Você precisa informar um nome de usuário válido e endereço de e-mail. Um link para criar uma nova senha será enviada para seu endereço de e-mail."
 
-#: classes/handler/public.php:839
-#: classes/pref/users.php:350
+#: classes/handler/public.php:750
+#: classes/pref/users.php:349
 msgid "Reset password"
 msgstr "Redefinir a senha"
 
-#: classes/handler/public.php:849
+#: classes/handler/public.php:760
 msgid "Some of the required form parameters are missing or incorrect."
 msgstr "Alguns dos parâmetros necessários estão faltando ou incorretos."
 
-#: classes/handler/public.php:853
-#: classes/handler/public.php:919
+#: classes/handler/public.php:764
+#: classes/handler/public.php:830
 msgid "Go back"
 msgstr "Voltar"
 
-#: classes/handler/public.php:890
+#: classes/handler/public.php:801
 msgid "[tt-rss] Password reset request"
 msgstr "[tt-rss] Requisição de troca de senha"
 
-#: classes/handler/public.php:915
+#: classes/handler/public.php:826
 msgid "Sorry, login and email combination not found."
 msgstr "Desculpe, nome de usuário e e-mail não encontrados."
 
-#: classes/handler/public.php:937
+#: classes/handler/public.php:848
 msgid "Your access level is insufficient to run this script."
 msgstr "Seu nível de acesso é insuficiente para executar esse script."
 
-#: classes/handler/public.php:963
+#: classes/handler/public.php:874
 msgid "Database Updater"
 msgstr "Atualizador do banco de dados"
 
-#: classes/handler/public.php:1028
+#: classes/handler/public.php:939
 msgid "Perform updates"
 msgstr "Executar atualização"
 
 #: classes/pref/labels.php:22
-#: classes/pref/filters.php:348
-#: classes/pref/filters.php:823
+#: classes/pref/filters.php:373
+#: classes/pref/filters.php:863
 msgid "Caption"
 msgstr "Título"
 
@@ -1234,59 +1127,55 @@ msgid "Created label <b>%s</b>"
 msgstr "Marcador <b>%s</b> criado"
 
 #: classes/pref/labels.php:258
-#: classes/pref/users.php:334
-#: classes/pref/feeds.php:1337
-#: classes/pref/feeds.php:1600
-#: classes/pref/feeds.php:1664
-#: classes/pref/filters.php:359
-#: classes/pref/filters.php:407
-#: classes/pref/filters.php:744
-#: classes/pref/filters.php:832
-#: classes/pref/filters.php:859
+#: classes/pref/filters.php:384
+#: classes/pref/filters.php:441
+#: classes/pref/filters.php:784
+#: classes/pref/filters.php:872
+#: classes/pref/filters.php:899
+#: classes/pref/users.php:333
 #: classes/pref/prefs.php:992
-#: plugins/instances/init.php:284
+#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1574
+#: classes/pref/feeds.php:1638
 msgid "Select"
 msgstr "Selecione"
 
 #: classes/pref/labels.php:261
-#: classes/pref/users.php:337
-#: classes/pref/feeds.php:1340
-#: classes/pref/feeds.php:1603
-#: classes/pref/feeds.php:1667
-#: classes/pref/filters.php:362
-#: classes/pref/filters.php:410
-#: classes/pref/filters.php:747
-#: classes/pref/filters.php:835
-#: classes/pref/filters.php:862
+#: classes/pref/filters.php:387
+#: classes/pref/filters.php:444
+#: classes/pref/filters.php:787
+#: classes/pref/filters.php:875
+#: classes/pref/filters.php:902
+#: classes/pref/users.php:336
 #: classes/pref/prefs.php:995
+#: classes/pref/feeds.php:1314
+#: classes/pref/feeds.php:1577
+#: classes/pref/feeds.php:1641
 #: classes/feeds.php:102
-#: plugins/instances/init.php:287
 msgid "All"
 msgstr "Tudo"
 
 #: classes/pref/labels.php:263
-#: classes/pref/users.php:339
-#: classes/pref/feeds.php:1342
-#: classes/pref/feeds.php:1605
-#: classes/pref/feeds.php:1669
-#: classes/pref/filters.php:364
-#: classes/pref/filters.php:412
-#: classes/pref/filters.php:749
-#: classes/pref/filters.php:837
-#: classes/pref/filters.php:864
+#: classes/pref/filters.php:389
+#: classes/pref/filters.php:446
+#: classes/pref/filters.php:789
+#: classes/pref/filters.php:877
+#: classes/pref/filters.php:904
+#: classes/pref/users.php:338
 #: classes/pref/prefs.php:997
+#: classes/pref/feeds.php:1316
+#: classes/pref/feeds.php:1579
+#: classes/pref/feeds.php:1643
 #: classes/feeds.php:105
-#: plugins/instances/init.php:289
 msgid "None"
 msgstr "Nenhum"
 
 #: classes/pref/labels.php:270
-#: classes/pref/users.php:348
+#: classes/pref/filters.php:512
+#: classes/pref/filters.php:806
+#: classes/pref/users.php:347
 #: classes/pref/feeds.php:767
-#: classes/pref/filters.php:478
-#: classes/pref/filters.php:766
-#: classes/feeds.php:1154
-#: plugins/instances/init.php:294
+#: classes/feeds.php:1147
 msgid "Remove"
 msgstr "Remover"
 
@@ -1294,9 +1183,167 @@ msgstr "Remover"
 msgid "Clear colors"
 msgstr "Limpar cores"
 
+#: classes/pref/filters.php:153
+msgid "Preview article"
+msgstr "Pré-visualizar artigo"
+
+#: classes/pref/filters.php:264
+#: classes/pref/filters.php:558
+msgid "(inverse)"
+msgstr "(invertido)"
+
+#: classes/pref/filters.php:260
+#: classes/pref/filters.php:557
+#, php-format
+msgid "%s on %s in %s %s"
+msgstr "%s em %s em %s %s"
+
+#: classes/pref/filters.php:379
+#: classes/pref/filters.php:867
+#: classes/pref/filters.php:981
+msgid "Match"
+msgstr "Critérios"
+
+#: classes/pref/filters.php:393
+#: classes/pref/filters.php:450
+#: classes/pref/filters.php:881
+#: classes/pref/filters.php:908
+msgid "Add"
+msgstr "Adicionar"
+
+#: classes/pref/filters.php:396
+#: classes/pref/filters.php:453
+#: classes/pref/filters.php:884
+#: classes/pref/filters.php:911
+#: classes/feeds.php:122
+msgid "Delete"
+msgstr "Apagar"
+
+#: classes/pref/filters.php:436
+#: classes/pref/filters.php:894
+msgid "Apply actions"
+msgstr "Aplicar ações"
+
+#: classes/pref/filters.php:486
+#: classes/pref/filters.php:923
+msgid "Enabled"
+msgstr "Ativado"
+
+#: classes/pref/filters.php:495
+#: classes/pref/filters.php:926
+msgid "Match any rule"
+msgstr "Ativar se qualquer critério for satisfeito"
+
+#: classes/pref/filters.php:504
+#: classes/pref/filters.php:929
+msgid "Inverse matching"
+msgstr "Inverter aplicação dos critérios"
+
+#: classes/pref/filters.php:516
+#: classes/pref/filters.php:936
+msgid "Test"
+msgstr "Testar"
+
+#: classes/pref/filters.php:780
+#: classes/pref/users.php:323
+#: classes/pref/feeds.php:1307
+#: classes/feeds.php:1118
+#: classes/feeds.php:1184
+#: js/tt-rss.js:165
+msgid "Search"
+msgstr "Pesquisar"
+
+#: classes/pref/filters.php:796
+msgid "Combine"
+msgstr "Combinar"
+
+#: classes/pref/filters.php:799
+#: classes/pref/users.php:345
+msgid "Edit"
+msgstr "Editar"
+
+#: classes/pref/filters.php:802
+#: classes/pref/feeds.php:1327
+#: classes/pref/feeds.php:1341
+msgid "Reset sort order"
+msgstr "Reiniciar ordenação"
+
+#: classes/pref/filters.php:810
+#: classes/pref/feeds.php:1363
+msgid "Rescore articles"
+msgstr "Reclassificar artigos"
+
+#: classes/pref/filters.php:939
+msgid "Create"
+msgstr "Criar"
+
+#: classes/pref/filters.php:993
+msgid "Inverse regular expression matching"
+msgstr "Inverter o teste da expressão regular"
+
+#: classes/pref/filters.php:995
+msgid "on field"
+msgstr "no campo"
+
+#: classes/pref/filters.php:1001
+#: js/PrefFilterTree.js:64
+msgid "in"
+msgstr "em"
+
+#: classes/pref/filters.php:1014
+msgid "Wiki: Filters"
+msgstr "Wiki: Filtros"
+
+#: classes/pref/filters.php:1019
+msgid "Save rule"
+msgstr "Salvar regra"
+
+#: classes/pref/filters.php:1019
+#: js/functions.js:865
+msgid "Add rule"
+msgstr "Adicionar regra"
+
+#: classes/pref/filters.php:1042
+msgid "Perform Action"
+msgstr "Executar ação"
+
+#: classes/pref/filters.php:1093
+msgid "No actions available"
+msgstr "Nenhuma ação disponível"
+
+#: classes/pref/filters.php:1112
+msgid "Save action"
+msgstr "Salvar ação"
+
+#: classes/pref/filters.php:1112
+#: js/functions.js:887
+msgid "Add action"
+msgstr "Adicionar ação"
+
+#: classes/pref/filters.php:1136
+msgid "[No caption]"
+msgstr "[Sem título]"
+
+#: classes/pref/filters.php:1138
+#, php-format
+msgid "%s (%d rule)"
+msgid_plural "%s (%d rules)"
+msgstr[0] "%s (%d regra)"
+msgstr[1] "%s (%d regras)"
+
+#: classes/pref/filters.php:1153
+msgid "matches any rule"
+msgstr "qualquer critério"
+
+#: classes/pref/filters.php:1156
+#, php-format
+msgid "%s (+%d action)"
+msgid_plural "%s (+%d actions)"
+msgstr[0] "%s (+%d ação)"
+msgstr[1] "%s (+%d ações)"
+
 #: classes/pref/users.php:6
 #: classes/pref/system.php:8
-#: plugins/instances/init.php:154
 msgid "Your access level is insufficient to open this tab."
 msgstr "Seu nível de acesso é insuficiente para abrir esta aba."
 
@@ -1306,8 +1353,8 @@ msgstr "Editar usuário"
 
 #: classes/pref/users.php:56
 #: classes/pref/feeds.php:637
-#: classes/pref/feeds.php:878
-#: classes/feeds.php:1075
+#: classes/pref/feeds.php:866
+#: classes/feeds.php:1068
 msgid "Authentication"
 msgstr "Autenticação"
 
@@ -1317,7 +1364,7 @@ msgstr "Nível de acesso:"
 
 #: classes/pref/users.php:77
 #: classes/pref/feeds.php:667
-#: classes/pref/feeds.php:896
+#: classes/pref/feeds.php:884
 msgid "Options"
 msgstr "Opções"
 
@@ -1331,7 +1378,7 @@ msgid "User not found"
 msgstr "Usuário não encontrado"
 
 #: classes/pref/users.php:132
-#: classes/pref/users.php:400
+#: classes/pref/users.php:399
 msgid "Registered"
 msgstr "Registrado"
 
@@ -1348,7 +1395,7 @@ msgid "Stored articles"
 msgstr "Artigos armazenados"
 
 #: classes/pref/users.php:145
-#: classes/pref/users.php:399
+#: classes/pref/users.php:398
 msgid "Subscribed feeds"
 msgstr "Inscrições"
 
@@ -1367,502 +1414,57 @@ msgstr "Não foi possível criar o usuário <b>%s</b>"
 msgid "User <b>%s</b> already exists."
 msgstr "O usuário <b>%s</b> já existe."
 
-#: classes/pref/users.php:265
+#: classes/pref/users.php:264
 #, php-format
 msgid "Changed password of user <b>%s</b> to <b>%s</b>"
 msgstr "Senha do usuário <b>%s</b> alterada para <b>%s</b>"
 
-#: classes/pref/users.php:267
+#: classes/pref/users.php:266
 #, php-format
 msgid "Sending new password of user <b>%s</b> to <b>%s</b>"
 msgstr "Enviando nova senha do usuário <b>%s</b> para <b>%s</b>"
 
-#: classes/pref/users.php:291
+#: classes/pref/users.php:290
 msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] Notificação de troca de senha"
 
-#: classes/pref/users.php:324
-#: classes/pref/feeds.php:1333
-#: classes/pref/filters.php:740
-#: classes/feeds.php:1125
-#: classes/feeds.php:1191
-#: js/tt-rss.js:165
-msgid "Search"
-msgstr "Pesquisar"
-
-#: classes/pref/users.php:342
+#: classes/pref/users.php:341
 msgid "Create user"
 msgstr "Criar um usuário"
 
-#: classes/pref/users.php:346
-#: classes/pref/filters.php:759
-#: plugins/instances/init.php:293
-msgid "Edit"
-msgstr "Editar"
-
-#: classes/pref/users.php:397
+#: classes/pref/users.php:396
 #: classes/pref/feeds.php:643
-#: classes/pref/feeds.php:882
-#: classes/pref/feeds.php:1836
-#: classes/feeds.php:1079
+#: classes/pref/feeds.php:870
+#: classes/pref/feeds.php:1810
+#: classes/feeds.php:1072
 msgid "Login"
 msgstr "Nome de usuário"
 
-#: classes/pref/users.php:398
+#: classes/pref/users.php:397
 msgid "Access Level"
 msgstr "Nível de acesso"
 
-#: classes/pref/users.php:401
+#: classes/pref/users.php:400
 msgid "Last login"
 msgstr "Último acesso"
 
-#: classes/pref/users.php:420
-#: plugins/instances/init.php:334
+#: classes/pref/users.php:419
 msgid "Click to edit"
 msgstr "Clique para editar"
 
-#: classes/pref/users.php:441
+#: classes/pref/users.php:440
 msgid "No users defined."
 msgstr "Nenhum usuário definido."
 
-#: classes/pref/users.php:443
+#: classes/pref/users.php:442
 msgid "No matching users found."
 msgstr "Nenhum usuário encontrado."
 
-#: classes/pref/system.php:29
-msgid "Error Log"
-msgstr "Registro de erros"
-
-#: classes/pref/system.php:40
-msgid "Refresh"
-msgstr "Atualizar"
-
-#: classes/pref/system.php:43
-msgid "Clear log"
-msgstr "Limpar o log"
-
-#: classes/pref/system.php:48
-msgid "Error"
-msgstr "Erro"
-
-#: classes/pref/system.php:49
-msgid "Filename"
-msgstr "Nome do arquivo"
-
-#: classes/pref/system.php:50
-msgid "Message"
-msgstr "Mensagem"
-
-#: classes/pref/system.php:52
-msgid "Date"
-msgstr "Data"
-
-#: classes/pref/feeds.php:15
-msgid "Check to enable field"
-msgstr "Clique para habilitar o campo"
-
-#: classes/pref/feeds.php:65
-#: classes/pref/feeds.php:214
-#: classes/pref/feeds.php:258
-#: classes/pref/feeds.php:264
-#: classes/pref/feeds.php:290
-#, php-format
-msgid "(%d feed)"
-msgid_plural "(%d feeds)"
-msgstr[0] "(%d feed)"
-msgstr[1] "(%d feeds)"
-
-#: classes/pref/feeds.php:537
 #: classes/pref/prefs.php:18
+#: classes/pref/feeds.php:537
 msgid "General"
 msgstr "Geral"
 
-#: classes/pref/feeds.php:561
-msgid "Feed Title"
-msgstr "Título do feed"
-
-#: classes/pref/feeds.php:595
-#: classes/pref/feeds.php:830
-#: classes/pref/feeds.php:1822
-#: classes/feeds.php:1055
-msgid "Place in category:"
-msgstr "Colocar na categoria:"
-
-#: classes/pref/feeds.php:608
-#: classes/pref/feeds.php:844
-msgid "Language:"
-msgstr "Língua:"
-
-#: classes/pref/feeds.php:615
-#: classes/pref/feeds.php:853
-msgid "Update"
-msgstr "Atualizar"
-
-#: classes/pref/feeds.php:630
-#: classes/pref/feeds.php:869
-msgid "Article purging:"
-msgstr "Remoção de artigos:"
-
-#: classes/pref/feeds.php:658
-#: classes/pref/feeds.php:890
-#: classes/pref/feeds.php:1839
-#: classes/pref/prefs.php:245
-#: classes/feeds.php:1083
-msgid "Password"
-msgstr "Senha"
-
-#: classes/pref/feeds.php:662
-msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
-msgstr "<b>Hint:</b> Você precisa preencher suas informações de conexão se o feed precisa de autenticação, exceto para os feeds do Twitter."
-
-#: classes/pref/feeds.php:681
-#: classes/pref/feeds.php:900
-msgid "Hide from Popular feeds"
-msgstr "Ocultar do feed populares"
-
-#: classes/pref/feeds.php:693
-#: classes/pref/feeds.php:906
-msgid "Include in e-mail digest"
-msgstr "Incluir no resumo por e-mail"
-
-#: classes/pref/feeds.php:706
-#: classes/pref/feeds.php:912
-msgid "Always display image attachments"
-msgstr "Sempre mostrar imagens anexas"
-
-#: classes/pref/feeds.php:719
-#: classes/pref/feeds.php:920
-msgid "Do not embed images"
-msgstr "Não embutir imagens"
-
-#: classes/pref/feeds.php:732
-#: classes/pref/feeds.php:928
-msgid "Cache media"
-msgstr ""
-
-#: classes/pref/feeds.php:744
-#: classes/pref/feeds.php:934
-msgid "Mark updated articles as unread"
-msgstr "Marcar artigos atualizados como não lidos"
-
-#: classes/pref/feeds.php:748
-msgid "Icon"
-msgstr "Ícone"
-
-#: classes/pref/feeds.php:765
-msgid "Replace"
-msgstr "Substituir"
-
-#: classes/pref/feeds.php:772
-#: classes/pref/prefs.php:698
-msgid "Plugins"
-msgstr "Plugins"
-
-#: classes/pref/feeds.php:792
-msgid "Resubscribe to push updates"
-msgstr "Reinscrever-se nas atualizações tipo push"
-
-#: classes/pref/feeds.php:799
-msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
-msgstr "Reinicia o status da inscrição do PubSubHubbub para feeds com push habilitado."
-
-#: classes/pref/feeds.php:1200
-#: classes/pref/feeds.php:1253
-msgid "All done."
-msgstr "Completo."
-
-#: classes/pref/feeds.php:1308
-msgid "Feeds with errors"
-msgstr "Feeds com erro"
-
-#: classes/pref/feeds.php:1315
-msgid "Inactive feeds"
-msgstr "Feeds inativos"
-
-#: classes/pref/feeds.php:1351
-msgid "Edit selected feeds"
-msgstr "Editar feeds selecionados"
-
-#: classes/pref/feeds.php:1353
-#: classes/pref/feeds.php:1367
-#: classes/pref/filters.php:762
-msgid "Reset sort order"
-msgstr "Reiniciar ordenação"
-
-#: classes/pref/feeds.php:1355
-#: js/prefs.js:1622
-msgid "Batch subscribe"
-msgstr "Inscrição em lote"
-
-#: classes/pref/feeds.php:1362
-msgid "Categories"
-msgstr "Categorias"
-
-#: classes/pref/feeds.php:1365
-msgid "Add category"
-msgstr "Adicionar categoria"
-
-#: classes/pref/feeds.php:1369
-msgid "Remove selected"
-msgstr "Remover selecionados"
-
-#: classes/pref/feeds.php:1380
-msgid "More actions..."
-msgstr "Mais ações..."
-
-#: classes/pref/feeds.php:1384
-msgid "Manual purge"
-msgstr "Remover manualmente"
-
-#: classes/pref/feeds.php:1388
-msgid "Clear feed data"
-msgstr "Limpar dados do feed"
-
-#: classes/pref/feeds.php:1389
-#: classes/pref/filters.php:770
-msgid "Rescore articles"
-msgstr "Reclassificar artigos"
-
-#: classes/pref/feeds.php:1442
-msgid "OPML"
-msgstr "OPML"
-
-#: classes/pref/feeds.php:1444
-msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
-msgstr "Usando OPML você pode exportar e importar suas inscrições, filtros, marcadores e configurações do Tiny Tiny RSS."
-
-#: classes/pref/feeds.php:1445
-msgid "Only main settings profile can be migrated using OPML."
-msgstr "Só o perfil de configurações principal pode ser migrado via OPML."
-
-#: classes/pref/feeds.php:1458
-msgid "Import my OPML"
-msgstr "Importar OPML"
-
-#: classes/pref/feeds.php:1464
-msgid "Filename:"
-msgstr "Nome do arquivo:"
-
-#: classes/pref/feeds.php:1466
-msgid "Include settings"
-msgstr "Incluir configurações"
-
-#: classes/pref/feeds.php:1470
-msgid "Export OPML"
-msgstr "Exportar OPML"
-
-#: classes/pref/feeds.php:1474
-msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
-msgstr "Seu OPML pode ser inscrito por qualquer um que conheça a URL abaixo."
-
-#: classes/pref/feeds.php:1478
-msgid "Public OPML URL"
-msgstr "URL OPML pública"
-
-#: classes/pref/feeds.php:1479
-msgid "Display published OPML URL"
-msgstr "Mostrar a URL OPML publicada"
-
-#: classes/pref/feeds.php:1488
-msgid "Firefox integration"
-msgstr "Integração com o Firefox"
-
-#: classes/pref/feeds.php:1490
-msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
-msgstr "Este Tiny Tiny RSS pode ser usado como um leitor de feeds no Firefox clicando no link abaixo."
-
-#: classes/pref/feeds.php:1497
-msgid "Click here to register this site as a feed reader."
-msgstr "Clique aqui para registrar esse site com um leitor de feeds."
-
-#: classes/pref/feeds.php:1505
-msgid "Published & shared articles / Generated feeds"
-msgstr "Artigos publicados e compartilhados / Feeds gerados"
-
-#: classes/pref/feeds.php:1507
-msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
-msgstr "Artigos publicados são exportados como um feed RSS público que pode ser inscrito por qualquer um que saiba a URL abaixo."
-
-#: classes/pref/feeds.php:1514
-#: classes/feeds.php:54
-#: classes/feeds.php:140
-msgid "View as RSS"
-msgstr "Ver como RSS"
-
-#: classes/pref/feeds.php:1515
-msgid "Display URL"
-msgstr "Mostrar URL"
-
-#: classes/pref/feeds.php:1518
-msgid "Clear all generated URLs"
-msgstr "Limpar todas as URLs geradas"
-
-#: classes/pref/feeds.php:1596
-msgid "These feeds have not been updated with new content for 3 months (oldest first):"
-msgstr "Estes feeds não foram atualizados há 3 meses (mais antigo primeiro):"
-
-#: classes/pref/feeds.php:1630
-#: classes/pref/feeds.php:1694
-msgid "Click to edit feed"
-msgstr "Clique para editar a inscrição"
-
-#: classes/pref/feeds.php:1648
-#: classes/pref/feeds.php:1714
-msgid "Unsubscribe from selected feeds"
-msgstr "Cancelar inscrições selecionadas"
-
-#: classes/pref/feeds.php:1819
-msgid "Add one valid RSS feed per line (no feed detection is done)"
-msgstr "Inclua um feed RSS por linha (detecção de feeds não será feita)"
-
-#: classes/pref/feeds.php:1828
-msgid "Feeds to subscribe, One per line"
-msgstr "Feeds para se inscrever, um por linha"
-
-#: classes/pref/feeds.php:1851
-msgid "Feeds require authentication."
-msgstr "Feed requer autenticação."
-
-#: classes/pref/feeds.php:1858
-#: classes/feeds.php:1099
-#: classes/feeds.php:1153
-msgid "Subscribe"
-msgstr "Inscrever-se"
-
-#: classes/pref/filters.php:151
-msgid "Preview article"
-msgstr "Pré-visualizar artigo"
-
-#: classes/pref/filters.php:239
-#: classes/pref/filters.php:518
-msgid "(inverse)"
-msgstr "(invertido)"
-
-#: classes/pref/filters.php:235
-#: classes/pref/filters.php:517
-#, php-format
-msgid "%s on %s in %s %s"
-msgstr "%s em %s em %s %s"
-
-#: classes/pref/filters.php:354
-#: classes/pref/filters.php:827
-#: classes/pref/filters.php:942
-msgid "Match"
-msgstr "Critérios"
-
-#: classes/pref/filters.php:368
-#: classes/pref/filters.php:416
-#: classes/pref/filters.php:841
-#: classes/pref/filters.php:868
-msgid "Add"
-msgstr "Adicionar"
-
-#: classes/pref/filters.php:371
-#: classes/pref/filters.php:419
-#: classes/pref/filters.php:844
-#: classes/pref/filters.php:871
-#: classes/feeds.php:122
-msgid "Delete"
-msgstr "Apagar"
-
-#: classes/pref/filters.php:402
-#: classes/pref/filters.php:854
-msgid "Apply actions"
-msgstr "Aplicar ações"
-
-#: classes/pref/filters.php:452
-#: classes/pref/filters.php:883
-msgid "Enabled"
-msgstr "Ativado"
-
-#: classes/pref/filters.php:461
-#: classes/pref/filters.php:886
-msgid "Match any rule"
-msgstr "Ativar se qualquer critério for satisfeito"
-
-#: classes/pref/filters.php:470
-#: classes/pref/filters.php:889
-msgid "Inverse matching"
-msgstr "Inverter aplicação dos critérios"
-
-#: classes/pref/filters.php:482
-#: classes/pref/filters.php:896
-msgid "Test"
-msgstr "Testar"
-
-#: classes/pref/filters.php:756
-msgid "Combine"
-msgstr "Combinar"
-
-#: classes/pref/filters.php:899
-msgid "Create"
-msgstr "Criar"
-
-#: classes/pref/filters.php:954
-msgid "Inverse regular expression matching"
-msgstr "Inverter o teste da expressão regular"
-
-#: classes/pref/filters.php:956
-msgid "on field"
-msgstr "no campo"
-
-#: classes/pref/filters.php:962
-#: js/PrefFilterTree.js:64
-msgid "in"
-msgstr "em"
-
-#: classes/pref/filters.php:975
-msgid "Wiki: Filters"
-msgstr "Wiki: Filtros"
-
-#: classes/pref/filters.php:980
-msgid "Save rule"
-msgstr "Salvar regra"
-
-#: classes/pref/filters.php:980
-#: js/functions.js:865
-msgid "Add rule"
-msgstr "Adicionar regra"
-
-#: classes/pref/filters.php:1003
-msgid "Perform Action"
-msgstr "Executar ação"
-
-#: classes/pref/filters.php:1054
-msgid "No actions available"
-msgstr "Nenhuma ação disponível"
-
-#: classes/pref/filters.php:1073
-msgid "Save action"
-msgstr "Salvar ação"
-
-#: classes/pref/filters.php:1073
-#: js/functions.js:887
-msgid "Add action"
-msgstr "Adicionar ação"
-
-#: classes/pref/filters.php:1097
-msgid "[No caption]"
-msgstr "[Sem título]"
-
-#: classes/pref/filters.php:1099
-#, php-format
-msgid "%s (%d rule)"
-msgid_plural "%s (%d rules)"
-msgstr[0] "%s (%d regra)"
-msgstr[1] "%s (%d regras)"
-
-#: classes/pref/filters.php:1114
-msgid "matches any rule"
-msgstr "qualquer critério"
-
-#: classes/pref/filters.php:1117
-#, php-format
-msgid "%s (+%d action)"
-msgid_plural "%s (+%d actions)"
-msgstr[0] "%s (+%d ação)"
-msgstr[1] "%s (+%d ações)"
-
 #: classes/pref/prefs.php:19
 msgid "Interface"
 msgstr "Interface"
@@ -2036,7 +1638,7 @@ msgid "Strip all but most common HTML tags when reading articles."
 msgstr "Remover todas as tags HTML exceto as mais comuns ao ler artigos."
 
 #: classes/pref/prefs.php:53
-#: js/prefs.js:1584
+#: js/prefs.js:1580
 msgid "Customize stylesheet"
 msgstr "Personalize a folha de estilo"
 
@@ -2104,6 +1706,14 @@ msgstr "Nível de acesso"
 msgid "Save data"
 msgstr "Salvar"
 
+#: classes/pref/prefs.php:245
+#: classes/pref/feeds.php:658
+#: classes/pref/feeds.php:878
+#: classes/pref/feeds.php:1813
+#: classes/feeds.php:1076
+msgid "Password"
+msgstr "Senha"
+
 #: classes/pref/prefs.php:254
 msgid "Your password is at default value, please change it."
 msgstr "Sua senha é a padrão, você deve mudá-la."
@@ -2202,18 +1812,23 @@ msgstr "Gerenciar perfis"
 msgid "Reset to defaults"
 msgstr "Reverter para o padrão"
 
+#: classes/pref/prefs.php:698
+#: classes/pref/feeds.php:772
+msgid "Plugins"
+msgstr "Plugins"
+
 #: classes/pref/prefs.php:700
 msgid "You will need to reload Tiny Tiny RSS for plugin changes to take effect."
 msgstr "Você precisa reiniciar o Tiny Tiny RSS para que as mudanças de plugin façam efeito."
 
-#: classes/pref/prefs.php:702
-msgid "Download more plugins at tt-rss.org <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forums</a> or <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a>."
-msgstr "Obtenha mais plugins no <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forum</a> ou <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a> do tt-rss."
-
-#: classes/pref/prefs.php:732
+#: classes/pref/prefs.php:730
 msgid "System plugins"
 msgstr "Plugins de sistema"
 
+#: classes/pref/prefs.php:731
+msgid "System plugins are enabled in <strong>config.php</strong> for all users."
+msgstr ""
+
 #: classes/pref/prefs.php:736
 #: classes/pref/prefs.php:792
 msgid "Plugin"
@@ -2283,6 +1898,339 @@ msgstr "Remover os perfis selecionados"
 msgid "Activate profile"
 msgstr "Ativar perfil"
 
+#: classes/pref/feeds.php:15
+msgid "Check to enable field"
+msgstr "Clique para habilitar o campo"
+
+#: classes/pref/feeds.php:65
+#: classes/pref/feeds.php:214
+#: classes/pref/feeds.php:258
+#: classes/pref/feeds.php:264
+#: classes/pref/feeds.php:290
+#, php-format
+msgid "(%d feed)"
+msgid_plural "(%d feeds)"
+msgstr[0] "(%d feed)"
+msgstr[1] "(%d feeds)"
+
+#: classes/pref/feeds.php:561
+msgid "Feed Title"
+msgstr "Título do feed"
+
+#: classes/pref/feeds.php:595
+#: classes/pref/feeds.php:818
+#: classes/pref/feeds.php:1796
+#: classes/feeds.php:1048
+msgid "Place in category:"
+msgstr "Colocar na categoria:"
+
+#: classes/pref/feeds.php:608
+#: classes/pref/feeds.php:832
+msgid "Language:"
+msgstr "Língua:"
+
+#: classes/pref/feeds.php:615
+#: classes/pref/feeds.php:841
+msgid "Update"
+msgstr "Atualizar"
+
+#: classes/pref/feeds.php:630
+#: classes/pref/feeds.php:857
+msgid "Article purging:"
+msgstr "Remoção de artigos:"
+
+#: classes/pref/feeds.php:662
+msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
+msgstr "<b>Hint:</b> Você precisa preencher suas informações de conexão se o feed precisa de autenticação, exceto para os feeds do Twitter."
+
+#: classes/pref/feeds.php:681
+#: classes/pref/feeds.php:888
+msgid "Hide from Popular feeds"
+msgstr "Ocultar do feed populares"
+
+#: classes/pref/feeds.php:693
+#: classes/pref/feeds.php:894
+msgid "Include in e-mail digest"
+msgstr "Incluir no resumo por e-mail"
+
+#: classes/pref/feeds.php:706
+#: classes/pref/feeds.php:900
+msgid "Always display image attachments"
+msgstr "Sempre mostrar imagens anexas"
+
+#: classes/pref/feeds.php:719
+#: classes/pref/feeds.php:908
+msgid "Do not embed images"
+msgstr "Não embutir imagens"
+
+#: classes/pref/feeds.php:732
+#: classes/pref/feeds.php:916
+msgid "Cache media"
+msgstr ""
+
+#: classes/pref/feeds.php:744
+#: classes/pref/feeds.php:922
+msgid "Mark updated articles as unread"
+msgstr "Marcar artigos atualizados como não lidos"
+
+#: classes/pref/feeds.php:748
+msgid "Icon"
+msgstr "Ícone"
+
+#: classes/pref/feeds.php:765
+msgid "Replace"
+msgstr "Substituir"
+
+#: classes/pref/feeds.php:1174
+#: classes/pref/feeds.php:1227
+msgid "All done."
+msgstr "Completo."
+
+#: classes/pref/feeds.php:1282
+msgid "Feeds with errors"
+msgstr "Feeds com erro"
+
+#: classes/pref/feeds.php:1289
+msgid "Inactive feeds"
+msgstr "Feeds inativos"
+
+#: classes/pref/feeds.php:1325
+msgid "Edit selected feeds"
+msgstr "Editar feeds selecionados"
+
+#: classes/pref/feeds.php:1329
+#: js/prefs.js:1618
+msgid "Batch subscribe"
+msgstr "Inscrição em lote"
+
+#: classes/pref/feeds.php:1336
+msgid "Categories"
+msgstr "Categorias"
+
+#: classes/pref/feeds.php:1339
+msgid "Add category"
+msgstr "Adicionar categoria"
+
+#: classes/pref/feeds.php:1343
+msgid "Remove selected"
+msgstr "Remover selecionados"
+
+#: classes/pref/feeds.php:1354
+msgid "More actions..."
+msgstr "Mais ações..."
+
+#: classes/pref/feeds.php:1358
+msgid "Manual purge"
+msgstr "Remover manualmente"
+
+#: classes/pref/feeds.php:1362
+msgid "Clear feed data"
+msgstr "Limpar dados do feed"
+
+#: classes/pref/feeds.php:1416
+msgid "OPML"
+msgstr "OPML"
+
+#: classes/pref/feeds.php:1418
+msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
+msgstr "Usando OPML você pode exportar e importar suas inscrições, filtros, marcadores e configurações do Tiny Tiny RSS."
+
+#: classes/pref/feeds.php:1419
+msgid "Only main settings profile can be migrated using OPML."
+msgstr "Só o perfil de configurações principal pode ser migrado via OPML."
+
+#: classes/pref/feeds.php:1432
+msgid "Import my OPML"
+msgstr "Importar OPML"
+
+#: classes/pref/feeds.php:1438
+msgid "Filename:"
+msgstr "Nome do arquivo:"
+
+#: classes/pref/feeds.php:1440
+msgid "Include settings"
+msgstr "Incluir configurações"
+
+#: classes/pref/feeds.php:1444
+msgid "Export OPML"
+msgstr "Exportar OPML"
+
+#: classes/pref/feeds.php:1448
+msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
+msgstr "Seu OPML pode ser inscrito por qualquer um que conheça a URL abaixo."
+
+#: classes/pref/feeds.php:1452
+msgid "Public OPML URL"
+msgstr "URL OPML pública"
+
+#: classes/pref/feeds.php:1453
+msgid "Display published OPML URL"
+msgstr "Mostrar a URL OPML publicada"
+
+#: classes/pref/feeds.php:1462
+msgid "Firefox integration"
+msgstr "Integração com o Firefox"
+
+#: classes/pref/feeds.php:1464
+msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
+msgstr "Este Tiny Tiny RSS pode ser usado como um leitor de feeds no Firefox clicando no link abaixo."
+
+#: classes/pref/feeds.php:1471
+msgid "Click here to register this site as a feed reader."
+msgstr "Clique aqui para registrar esse site com um leitor de feeds."
+
+#: classes/pref/feeds.php:1479
+msgid "Published & shared articles / Generated feeds"
+msgstr "Artigos publicados e compartilhados / Feeds gerados"
+
+#: classes/pref/feeds.php:1481
+msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
+msgstr "Artigos publicados são exportados como um feed RSS público que pode ser inscrito por qualquer um que saiba a URL abaixo."
+
+#: classes/pref/feeds.php:1488
+#: classes/feeds.php:54
+#: classes/feeds.php:140
+msgid "View as RSS"
+msgstr "Ver como RSS"
+
+#: classes/pref/feeds.php:1489
+msgid "Display URL"
+msgstr "Mostrar URL"
+
+#: classes/pref/feeds.php:1492
+msgid "Clear all generated URLs"
+msgstr "Limpar todas as URLs geradas"
+
+#: classes/pref/feeds.php:1570
+msgid "These feeds have not been updated with new content for 3 months (oldest first):"
+msgstr "Estes feeds não foram atualizados há 3 meses (mais antigo primeiro):"
+
+#: classes/pref/feeds.php:1604
+#: classes/pref/feeds.php:1668
+msgid "Click to edit feed"
+msgstr "Clique para editar a inscrição"
+
+#: classes/pref/feeds.php:1622
+#: classes/pref/feeds.php:1688
+msgid "Unsubscribe from selected feeds"
+msgstr "Cancelar inscrições selecionadas"
+
+#: classes/pref/feeds.php:1793
+msgid "Add one valid RSS feed per line (no feed detection is done)"
+msgstr "Inclua um feed RSS por linha (detecção de feeds não será feita)"
+
+#: classes/pref/feeds.php:1802
+msgid "Feeds to subscribe, One per line"
+msgstr "Feeds para se inscrever, um por linha"
+
+#: classes/pref/feeds.php:1825
+msgid "Feeds require authentication."
+msgstr "Feed requer autenticação."
+
+#: classes/pref/feeds.php:1832
+#: classes/feeds.php:1092
+#: classes/feeds.php:1146
+msgid "Subscribe"
+msgstr "Inscrever-se"
+
+#: classes/pref/system.php:29
+msgid "Error Log"
+msgstr "Registro de erros"
+
+#: classes/pref/system.php:40
+msgid "Refresh"
+msgstr "Atualizar"
+
+#: classes/pref/system.php:43
+msgid "Clear log"
+msgstr "Limpar o log"
+
+#: classes/pref/system.php:48
+msgid "Error"
+msgstr "Erro"
+
+#: classes/pref/system.php:49
+msgid "Filename"
+msgstr "Nome do arquivo"
+
+#: classes/pref/system.php:50
+msgid "Message"
+msgstr "Mensagem"
+
+#: classes/pref/system.php:52
+msgid "Date"
+msgstr "Data"
+
+#: classes/opml.php:28
+#: classes/opml.php:33
+msgid "OPML Utility"
+msgstr "Utilitário OPML"
+
+#: classes/opml.php:37
+msgid "Importing OPML..."
+msgstr "Importando OPML..."
+
+#: classes/opml.php:41
+msgid "Return to preferences"
+msgstr "Retornar às preferências"
+
+#: classes/opml.php:295
+#, php-format
+msgid "Adding feed: %s"
+msgstr "Adicionando feed: %s"
+
+#: classes/opml.php:306
+#, php-format
+msgid "Duplicate feed: %s"
+msgstr "Feed duplicado: %s"
+
+#: classes/opml.php:320
+#, php-format
+msgid "Adding label %s"
+msgstr "Adicionando marcador %s"
+
+#: classes/opml.php:323
+#, php-format
+msgid "Duplicate label: %s"
+msgstr "Marcador duplicado: %s"
+
+#: classes/opml.php:335
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr "Ajustando chave de configuração %s para %s"
+
+#: classes/opml.php:367
+msgid "Adding filter..."
+msgstr "Adicionando filtro..."
+
+#: classes/opml.php:486
+#, php-format
+msgid "Processing category: %s"
+msgstr "Processando categoria: %s"
+
+#: classes/opml.php:532
+#, php-format
+msgid "Upload failed with error code %d"
+msgstr "Envio falhou com o código de erro %d"
+
+#: classes/opml.php:544
+#: plugins/import_export/init.php:448
+msgid "Unable to move uploaded file."
+msgstr "Incapaz de mover arquivo enviado."
+
+#: classes/opml.php:548
+#: plugins/import_export/init.php:452
+msgid "Error: please upload OPML file."
+msgstr "Erro: por favor envie um arquivo OPML."
+
+#: classes/opml.php:559
+msgid "Error: unable to find moved OPML file."
+msgstr "Erro: arquivo OPML movido não foi encontrado."
+
+#: classes/opml.php:566
+msgid "Error while parsing document."
+msgstr "Erro ao processar o documento."
+
 #: classes/feeds.php:53
 msgid "View as RSS feed"
 msgstr "Ver como um feed RSS"
@@ -2323,8 +2271,8 @@ msgstr "Retornar"
 
 #: classes/feeds.php:127
 #: classes/feeds.php:132
-#: plugins/mail/init.php:75
 #: plugins/mailto/init.php:25
+#: plugins/mail/init.php:75
 msgid "Forward by email"
 msgstr "Encaminhar por e-mail"
 
@@ -2332,311 +2280,144 @@ msgstr "Encaminhar por e-mail"
 msgid "Feed:"
 msgstr "Feed:"
 
-#: classes/feeds.php:229
-#: classes/feeds.php:892
+#: classes/feeds.php:228
+#: classes/feeds.php:885
 msgid "Feed not found."
 msgstr "Feed não encontrado."
 
-#: classes/feeds.php:300
+#: classes/feeds.php:291
 msgid "Never"
 msgstr "Nunca"
 
-#: classes/feeds.php:413
+#: classes/feeds.php:405
 #, php-format
 msgid "Imported at %s"
 msgstr "Importado em %s"
 
-#: classes/feeds.php:472
-#: classes/feeds.php:569
+#: classes/feeds.php:464
+#: classes/feeds.php:561
 msgid "mark feed as read"
 msgstr "marcar feed como lido"
 
-#: classes/feeds.php:630
+#: classes/feeds.php:622
 msgid "Collapse article"
 msgstr "Fechar artigo"
 
-#: classes/feeds.php:791
+#: classes/feeds.php:784
 msgid "No unread articles found to display."
 msgstr "Sem artigos não lidos para exibir."
 
-#: classes/feeds.php:794
+#: classes/feeds.php:787
 msgid "No updated articles found to display."
 msgstr "Sem artigos atualizados para exibir."
 
-#: classes/feeds.php:797
+#: classes/feeds.php:790
 msgid "No starred articles found to display."
 msgstr "Sem artigos com estrela para exibir."
 
-#: classes/feeds.php:801
+#: classes/feeds.php:794
 msgid "No articles found to display. You can assign articles to labels manually from article header context menu (applies to all selected articles) or use a filter."
 msgstr "Nenhum artigo encontrado para mostrar. Você pode associar artigos a marcadores manualmente pelo menu de contexto no título (altera todos os artigos selecionados) ou usar um filtro."
 
-#: classes/feeds.php:803
+#: classes/feeds.php:796
 msgid "No articles found to display."
 msgstr "Nenhum artigo foi encontrado para exibir."
 
-#: classes/feeds.php:818
-#: classes/feeds.php:992
+#: classes/feeds.php:811
+#: classes/feeds.php:985
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "Feeds atualizados em %s"
 
-#: classes/feeds.php:828
-#: classes/feeds.php:1002
+#: classes/feeds.php:821
+#: classes/feeds.php:995
 msgid "Some feeds have update errors (click for details)"
 msgstr "Alguns feeds estão com erros (clique aqui para detalhes)"
 
-#: classes/feeds.php:982
+#: classes/feeds.php:975
 msgid "No feed selected."
 msgstr "Nenhum feed foi selecionado."
 
-#: classes/feeds.php:1041
-#: classes/feeds.php:1049
+#: classes/feeds.php:1034
+#: classes/feeds.php:1042
 msgid "Feed or site URL"
 msgstr "URL do site ou feed"
 
-#: classes/feeds.php:1063
+#: classes/feeds.php:1056
 msgid "Available feeds"
 msgstr "Feeds disponíveis"
 
-#: classes/feeds.php:1094
+#: classes/feeds.php:1087
 msgid "This feed requires authentication."
 msgstr "Este feed requer autenticação."
 
-#: classes/feeds.php:1102
+#: classes/feeds.php:1095
 msgid "More feeds"
 msgstr "Mais feeds"
 
-#: classes/feeds.php:1129
+#: classes/feeds.php:1122
 msgid "Popular feeds"
 msgstr "Feeds populares"
 
-#: classes/feeds.php:1130
+#: classes/feeds.php:1123
 msgid "Feed archive"
 msgstr "Arquivo de feeds"
 
-#: classes/feeds.php:1133
+#: classes/feeds.php:1126
 msgid "limit:"
 msgstr "limite:"
 
-#: classes/feeds.php:1165
+#: classes/feeds.php:1158
 msgid "Look for"
 msgstr "Procurar por"
 
-#: classes/feeds.php:1173
+#: classes/feeds.php:1166
 #, php-format
 msgid "in %s"
 msgstr "em %s"
 
-#: classes/feeds.php:1178
+#: classes/feeds.php:1171
 msgid "Used for word stemming"
 msgstr "Usado para achar as raízes das palavras"
 
-#: classes/feeds.php:1187
+#: classes/feeds.php:1180
 msgid "Search syntax"
 msgstr "Sintaxe da pesquisa"
 
-#: plugins/instances/init.php:141
-msgid "Linked"
-msgstr "Conectado"
-
-#: plugins/instances/init.php:204
-#: plugins/instances/init.php:395
-msgid "Instance"
-msgstr "Instância"
-
-#: plugins/instances/init.php:215
-#: plugins/instances/init.php:312
-#: plugins/instances/init.php:404
-msgid "Instance URL"
-msgstr "URL da instância"
-
-#: plugins/instances/init.php:226
-#: plugins/instances/init.php:414
-msgid "Access key:"
-msgstr "Chave de acesso:"
-
-#: plugins/instances/init.php:229
-#: plugins/instances/init.php:313
-#: plugins/instances/init.php:417
-msgid "Access key"
-msgstr "Chave de acesso"
-
-#: plugins/instances/init.php:233
-#: plugins/instances/init.php:421
-msgid "Use one access key for both linked instances."
-msgstr "Use uma chave de acesso para ambas as instâncias."
-
-#: plugins/instances/init.php:241
-#: plugins/instances/init.php:429
-msgid "Generate new key"
-msgstr "Gerar uma nova chave"
-
-#: plugins/instances/init.php:292
-msgid "Link instance"
-msgstr "Conectar instância"
-
-#: plugins/instances/init.php:304
-msgid "You can connect other instances of Tiny Tiny RSS to this one to share Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
-msgstr "Você pode conectar outras instâncias to Tiny Tiny RSS a esta para compartilhar feeds populares. Conecte a esta instância do Tiny Tiny RSS usando esta URL:"
-
-#: plugins/instances/init.php:314
-msgid "Last connected"
-msgstr "Última conexão"
-
-#: plugins/instances/init.php:315
-msgid "Status"
-msgstr "Estado"
-
-#: plugins/instances/init.php:316
-msgid "Stored feeds"
-msgstr "Feeds armazenados"
-
-#: plugins/instances/init.php:433
-msgid "Create link"
-msgstr "Criar link"
+#: classes/feeds.php:1596
+msgid "Starred articles"
+msgstr "Artigos com estrela"
 
-#: plugins/nsfw/init.php:30
-#: plugins/nsfw/init.php:42
-msgid "Not work safe (click to toggle)"
-msgstr "Não apropriado para abrir no trabalho (clique para alternar)"
+#: classes/feeds.php:1598
+msgid "Published articles"
+msgstr "Artigos publicados"
 
-#: plugins/nsfw/init.php:52
-msgid "NSFW Plugin"
-msgstr "Plugin NSFW"
+#: classes/feeds.php:1600
+msgid "Fresh articles"
+msgstr "Recentes"
 
-#: plugins/nsfw/init.php:79
-msgid "Tags to consider NSFW (comma-separated)"
-msgstr "Tags para considerar NSFW (separadas por vírgula)"
+#: classes/feeds.php:1604
+msgid "Archived articles"
+msgstr "Artigos arquivados"
 
-#: plugins/nsfw/init.php:100
-msgid "Configuration saved."
-msgstr "Configuração salva."
+#: classes/feeds.php:1606
+msgid "Recently read"
+msgstr "Lidos recentemente"
 
-#: plugins/note/init.php:26
-#: plugins/note/note.js:11
-msgid "Edit article note"
-msgstr "Editar anotação sobre o artigo"
+#: classes/feeds.php:1716
+msgid "Special"
+msgstr "Especial"
+
+#: classes/feeds.php:1962
+#, php-format
+msgid "Search results: %s"
+msgstr "Resultados da pesquisa: %s"
 
 #: plugins/vf_shared/init.php:16
-#: plugins/vf_shared/init.php:69
+#: plugins/vf_shared/init.php:60
 msgid "Shared articles"
 msgstr "Artigos compartilhados"
 
-#: plugins/auth_internal/init.php:65
-msgid "Please enter your one time password:"
-msgstr "Por favor, entre sua senha temporária:"
-
-#: plugins/auth_internal/init.php:188
-msgid "Password has been changed."
-msgstr "Senha foi alterada."
-
-#: plugins/auth_internal/init.php:190
-msgid "Old password is incorrect."
-msgstr "Senha antiga incorreta."
-
-#: plugins/af_readability/init.php:21
-#, fuzzy
-msgid "Data saved."
-msgstr "Dados salvos (%s, %d)"
-
-#: plugins/af_readability/init.php:33
-msgid "Inline content"
-msgstr "Exibir conteúdo em linha"
-
-#: plugins/af_readability/init.php:39
-#, fuzzy
-msgid "Readability settings (af_readability)"
-msgstr "Configurações do af_readability"
-
-#: plugins/af_readability/init.php:66
-msgid "Use Readability for pages shared via bookmarklet."
-msgstr ""
-
-#: plugins/af_readability/init.php:78
-#: plugins/af_psql_trgm/init.php:191
-msgid "Currently enabled for (click to edit):"
-msgstr "Atualmente habilitado para (clique para editar):"
-
-#: plugins/af_readability/init.php:95
-msgid "Readability"
-msgstr "Readability"
-
-#: plugins/af_readability/init.php:106
-msgid "Inline article content"
-msgstr "Exibir conteúdo do arquivo em linha"
-
-#: plugins/af_redditimgur/init.php:25
-msgid "Reddit content settings (af_redditimgur)"
-msgstr ""
-
-#: plugins/af_redditimgur/init.php:50
-msgid "Uses Readability (full-text-rss) implementation by <a target='_blank' href='https://bitbucket.org/fivefilters/'>FiveFilters.org</a>"
-msgstr "Usar a implementação Readability (full-text-rss) de <a target='_blank' href='https://bitbucket.org/fivefilters/'>FiveFilters.org</a>"
-
-#: plugins/af_redditimgur/init.php:54
-msgid "Extract missing content using Readability"
-msgstr "Extrair conteúdo que falta usando o Readability"
-
-#: plugins/af_redditimgur/init.php:59
-msgid "Enable additional duplicate checking"
-msgstr ""
-
-#: plugins/af_redditimgur/init.php:73
-#: plugins/af_zz_imgproxy/init.php:225
-msgid "Configuration saved"
-msgstr "Configuração salva"
-
-#: plugins/af_psql_trgm/init.php:28
-#, php-format
-msgid "Data saved (%s, %d)"
-msgstr "Dados salvos (%s, %d)"
-
-#: plugins/af_psql_trgm/init.php:112
-msgid "Show related articles"
-msgstr "Mostrar artigos relacionados"
-
-#: plugins/af_psql_trgm/init.php:118
-#: plugins/af_psql_trgm/init.php:220
-msgid "Mark similar articles as read"
-msgstr "Marcar artigos semelhantes como lidos"
-
-#: plugins/af_psql_trgm/init.php:157
-msgid "PostgreSQL trigram extension returns string similarity as a floating point number (0-1). Setting it too low might produce false positives, zero disables checking."
-msgstr "A extensão trigram do PostgreSQL retorna a semelhança de strings como um número entre 0 e 1. Usar um valor muito baixo pode produzir falsos positivos; e 0 desabilita a verificação."
-
-#: plugins/af_psql_trgm/init.php:160
-msgid "Global settings"
-msgstr "Configurações globais"
-
-#: plugins/af_psql_trgm/init.php:164
-msgid "Minimum similarity:"
-msgstr "Semelhança mínima:"
-
-#: plugins/af_psql_trgm/init.php:169
-msgid "Minimum title length:"
-msgstr "Tamanho mínimo do título:"
-
-#: plugins/af_psql_trgm/init.php:174
-msgid "Enable for all feeds:"
-msgstr "Habilitar para todos os feeds:"
-
-#: plugins/af_psql_trgm/init.php:209
-msgid "Similarity (pg_trgm)"
-msgstr "Semelhança (pg_trgm)"
-
-#: plugins/af_comics/init.php:40
-msgid "Feeds supported by af_comics"
-msgstr "Feeds suportados pelo af_comics"
-
-#: plugins/af_comics/init.php:42
-msgid "The following comics are currently supported:"
-msgstr "Os quadrinhos a seguir são suportados no momento:"
-
-#: plugins/af_comics/init.php:60
-msgid "GoComics requires a specific URL to workaround their lack of feed support: <code>http://feeds.feedburner.com/uclick/<em>comic_name</em></code> (e.g. <code>http://www.gocomics.com/garfield</code> uses <code>http://feeds.feedburner.com/uclick/garfield</code>)."
-msgstr ""
-
 #: plugins/import_export/init.php:58
 msgid "Import and export"
 msgstr "Importar e exportar"
@@ -2653,95 +2434,83 @@ msgstr "Exportar meus dados"
 msgid "Import"
 msgstr "Importar"
 
-#: plugins/import_export/init.php:225
+#: plugins/import_export/init.php:231
 msgid "Could not import: incorrect schema version."
 msgstr "Não foi possível importar: versão do esquema incorreta."
 
-#: plugins/import_export/init.php:230
+#: plugins/import_export/init.php:236
 msgid "Could not import: unrecognized document format."
 msgstr "Não foi possível importar: formato de documento desconhecido."
 
-#: plugins/import_export/init.php:391
+#: plugins/import_export/init.php:397
 msgid "Finished: "
 msgstr "Terminado: "
 
-#: plugins/import_export/init.php:392
+#: plugins/import_export/init.php:398
 #, php-format
 msgid "%d article processed, "
 msgid_plural "%d articles processed, "
 msgstr[0] "%d artigo processado,"
 msgstr[1] "%d artigos processados,"
 
-#: plugins/import_export/init.php:393
+#: plugins/import_export/init.php:399
 #, php-format
 msgid "%d imported, "
 msgid_plural "%d imported, "
 msgstr[0] "%d importado,"
 msgstr[1] "%d importados,"
 
-#: plugins/import_export/init.php:394
+#: plugins/import_export/init.php:400
 #, php-format
 msgid "%d feed created."
 msgid_plural "%d feeds created."
 msgstr[0] "%d feed criado."
 msgstr[1] "%d feeds criados."
 
-#: plugins/import_export/init.php:399
+#: plugins/import_export/init.php:405
 msgid "Could not load XML document."
 msgstr "Não foi possível ler o documento XML."
 
-#: plugins/import_export/init.php:411
+#: plugins/import_export/init.php:417
 msgid "Prepare data"
 msgstr "Preparar dados"
 
-#: plugins/import_export/init.php:428
+#: plugins/import_export/init.php:434
 #, fuzzy, php-format
 msgid "Upload failed with error code %d (%s)"
 msgstr "Envio falhou com o código de erro %d"
 
-#: plugins/import_export/init.php:454
+#: plugins/import_export/init.php:460
 msgid "No file uploaded."
 msgstr "Nenhum arquivo enviado."
 
-#: plugins/mail/init.php:28
-msgid "Mail addresses saved."
-msgstr "Endereços de e-mail salvos."
-
-#: plugins/mail/init.php:34
-msgid "Mail plugin"
-msgstr "Plugin de e-mail"
-
-#: plugins/mail/init.php:36
-msgid "You can set predefined email addressed here (comma-separated list):"
-msgstr "Você pode definir endereços de e-mail predefinidos aqui (lista separada por vírgulas):"
-
+#: plugins/mailto/init.php:48
+#: plugins/mailto/init.php:54
 #: plugins/mail/init.php:112
 #: plugins/mail/init.php:118
-#: plugins/mailto/init.php:49
-#: plugins/mailto/init.php:55
 msgid "[Forwarded]"
 msgstr "[Encaminhado]"
 
+#: plugins/mailto/init.php:48
 #: plugins/mail/init.php:112
-#: plugins/mailto/init.php:49
 msgid "Multiple articles"
 msgstr "Múltiplos artigos"
 
-#: plugins/mail/init.php:140
-msgid "To:"
-msgstr "Para:"
+#: plugins/mailto/init.php:70
+msgid "Clicking the following link to invoke your mail client:"
+msgstr "Clique no link seguinte para ativar seu cliente de e-mail:"
 
-#: plugins/mail/init.php:155
-msgid "Subject:"
-msgstr "Assunto:"
+#: plugins/mailto/init.php:74
+msgid "Forward selected article(s) by email."
+msgstr "Encaminhar artigo(s) selecionado(s) por e-mail."
 
-#: plugins/mail/init.php:172
-msgid "Send e-mail"
-msgstr "Enviar e-mail"
+#: plugins/mailto/init.php:77
+msgid "You should be able to edit the message before sending in your mail client."
+msgstr "Você poderá editar a mensagem antes de enviar em seu cliente de e-mail."
 
-#: plugins/close_button/init.php:22
-msgid "Close article"
-msgstr "Fechar artigo"
+#: plugins/mailto/init.php:82
+msgid "Close this dialog"
+msgstr "Fechar esta janela"
 
 #: plugins/bookmarklets/init.php:20
 msgid "Bookmarklets"
@@ -2764,34 +2533,119 @@ msgstr "Inscrever-se com Tiny Tiny RSS"
 msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
 msgstr "Use este bookmarklet para publicar qualquer página usando o Tiny Tiny RSS"
 
+#: plugins/af_psql_trgm/init.php:28
+#, php-format
+msgid "Data saved (%s, %d)"
+msgstr "Dados salvos (%s, %d)"
+
+#: plugins/af_psql_trgm/init.php:112
+msgid "Show related articles"
+msgstr "Mostrar artigos relacionados"
+
+#: plugins/af_psql_trgm/init.php:118
+#: plugins/af_psql_trgm/init.php:220
+msgid "Mark similar articles as read"
+msgstr "Marcar artigos semelhantes como lidos"
+
+#: plugins/af_psql_trgm/init.php:157
+msgid "PostgreSQL trigram extension returns string similarity as a floating point number (0-1). Setting it too low might produce false positives, zero disables checking."
+msgstr "A extensão trigram do PostgreSQL retorna a semelhança de strings como um número entre 0 e 1. Usar um valor muito baixo pode produzir falsos positivos; e 0 desabilita a verificação."
+
+#: plugins/af_psql_trgm/init.php:160
+msgid "Global settings"
+msgstr "Configurações globais"
+
+#: plugins/af_psql_trgm/init.php:164
+msgid "Minimum similarity:"
+msgstr "Semelhança mínima:"
+
+#: plugins/af_psql_trgm/init.php:169
+msgid "Minimum title length:"
+msgstr "Tamanho mínimo do título:"
+
+#: plugins/af_psql_trgm/init.php:174
+msgid "Enable for all feeds:"
+msgstr "Habilitar para todos os feeds:"
+
+#: plugins/af_psql_trgm/init.php:191
+#: plugins/af_readability/init.php:78
+msgid "Currently enabled for (click to edit):"
+msgstr "Atualmente habilitado para (clique para editar):"
+
+#: plugins/af_psql_trgm/init.php:209
+msgid "Similarity (pg_trgm)"
+msgstr "Semelhança (pg_trgm)"
+
+#: plugins/nsfw/init.php:30
+#: plugins/nsfw/init.php:42
+msgid "Not work safe (click to toggle)"
+msgstr "Não apropriado para abrir no trabalho (clique para alternar)"
+
+#: plugins/nsfw/init.php:52
+msgid "NSFW Plugin"
+msgstr "Plugin NSFW"
+
+#: plugins/nsfw/init.php:79
+msgid "Tags to consider NSFW (comma-separated)"
+msgstr "Tags para considerar NSFW (separadas por vírgula)"
+
+#: plugins/nsfw/init.php:100
+msgid "Configuration saved."
+msgstr "Configuração salva."
+
 #: plugins/toggle_sidebar/init.php:23
 msgid "Collapse feedlist"
 msgstr "Contrair lista de feeds"
 
-#: plugins/af_zz_imgproxy/init.php:186
-msgid "Image proxy settings (af_zz_imgproxy)"
-msgstr ""
+#: plugins/af_readability/init.php:21
+#, fuzzy
+msgid "Data saved."
+msgstr "Dados salvos (%s, %d)"
 
-#: plugins/af_zz_imgproxy/init.php:211
+#: plugins/af_readability/init.php:33
+msgid "Inline content"
+msgstr "Exibir conteúdo em linha"
+
+#: plugins/af_readability/init.php:39
 #, fuzzy
-msgid "Enable proxy for all remote images."
-msgstr "Habilitar para todos os feeds:"
+msgid "Readability settings (af_readability)"
+msgstr "Configurações do af_readability"
 
-#: plugins/mailto/init.php:71
-msgid "Clicking the following link to invoke your mail client:"
-msgstr "Clique no link seguinte para ativar seu cliente de e-mail:"
+#: plugins/af_readability/init.php:66
+msgid "Use Readability for pages shared via bookmarklet."
+msgstr ""
 
-#: plugins/mailto/init.php:75
-msgid "Forward selected article(s) by email."
-msgstr "Encaminhar artigo(s) selecionado(s) por e-mail."
+#: plugins/af_readability/init.php:95
+msgid "Readability"
+msgstr "Readability"
 
-#: plugins/mailto/init.php:78
-msgid "You should be able to edit the message before sending in your mail client."
-msgstr "Você poderá editar a mensagem antes de enviar em seu cliente de e-mail."
+#: plugins/af_readability/init.php:106
+msgid "Inline article content"
+msgstr "Exibir conteúdo do arquivo em linha"
 
-#: plugins/mailto/init.php:83
-msgid "Close this dialog"
-msgstr "Fechar esta janela"
+#: plugins/mail/init.php:28
+msgid "Mail addresses saved."
+msgstr "Endereços de e-mail salvos."
+
+#: plugins/mail/init.php:34
+msgid "Mail plugin"
+msgstr "Plugin de e-mail"
+
+#: plugins/mail/init.php:36
+msgid "You can set predefined email addressed here (comma-separated list):"
+msgstr "Você pode definir endereços de e-mail predefinidos aqui (lista separada por vírgulas):"
+
+#: plugins/mail/init.php:140
+msgid "To:"
+msgstr "Para:"
+
+#: plugins/mail/init.php:155
+msgid "Subject:"
+msgstr "Assunto:"
+
+#: plugins/mail/init.php:172
+msgid "Send e-mail"
+msgstr "Enviar e-mail"
 
 #: plugins/share/init.php:39
 msgid "You can disable all articles shared by unique URLs here."
@@ -2805,24 +2659,96 @@ msgstr "Cancelar compartilhamento de todos os artigos"
 msgid "Share by URL"
 msgstr "Compartilhar pela URL"
 
-#: plugins/share/init.php:97
+#: plugins/share/init.php:96
 msgid "You can share this article by the following unique URL:"
 msgstr "Você pode compartilhar esse artigo pela seguinte URL:"
 
-#: plugins/share/init.php:115
+#: plugins/share/init.php:114
 msgid "Unshare article"
 msgstr "Remover compartilhamento"
 
+#: plugins/af_comics/init.php:48
+msgid "Feeds supported by af_comics"
+msgstr "Feeds suportados pelo af_comics"
+
+#: plugins/af_comics/init.php:50
+msgid "The following comics are currently supported:"
+msgstr "Os quadrinhos a seguir são suportados no momento:"
+
+#: plugins/af_comics/init.php:68
+msgid "GoComics requires a specific URL to workaround their lack of feed support: <code>http://feeds.feedburner.com/uclick/<em>comic_name</em></code> (e.g. <code>http://www.gocomics.com/garfield</code> uses <code>http://feeds.feedburner.com/uclick/garfield</code>)."
+msgstr ""
+
+#: plugins/af_comics/init.php:70
+msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:25
+msgid "Reddit content settings (af_redditimgur)"
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:50
+msgid "Uses Readability (full-text-rss) implementation by <a target='_blank' href='https://bitbucket.org/fivefilters/'>FiveFilters.org</a>"
+msgstr "Usar a implementação Readability (full-text-rss) de <a target='_blank' href='https://bitbucket.org/fivefilters/'>FiveFilters.org</a>"
+
+#: plugins/af_redditimgur/init.php:54
+msgid "Extract missing content using Readability"
+msgstr "Extrair conteúdo que falta usando o Readability"
+
+#: plugins/af_redditimgur/init.php:59
+msgid "Enable additional duplicate checking"
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:73
+#: plugins/af_zz_imgproxy/init.php:254
+msgid "Configuration saved"
+msgstr "Configuração salva"
+
+#: plugins/note/init.php:26
+#: plugins/note/note.js:11
+msgid "Edit article note"
+msgstr "Editar anotação sobre o artigo"
+
+#: plugins/close_button/init.php:25
+msgid "Close article"
+msgstr "Fechar artigo"
+
+#: plugins/af_zz_imgproxy/init.php:210
+msgid "Image proxy settings (af_zz_imgproxy)"
+msgstr ""
+
+#: plugins/af_zz_imgproxy/init.php:234
+#, fuzzy
+msgid "Enable proxy for all remote images."
+msgstr "Habilitar para todos os feeds:"
+
+#: plugins/af_zz_imgproxy/init.php:238
+#, fuzzy
+msgid "Don't cache files locally."
+msgstr "Guardar imagens no cache local"
+
+#: plugins/auth_internal/init.php:65
+msgid "Please enter your one time password:"
+msgstr "Por favor, entre sua senha temporária:"
+
+#: plugins/auth_internal/init.php:188
+msgid "Password has been changed."
+msgstr "Senha foi alterada."
+
+#: plugins/auth_internal/init.php:190
+msgid "Old password is incorrect."
+msgstr "Senha antiga incorreta."
+
 #: js/FeedTree.js:172
 #, fuzzy
 msgid "(Un)collapse"
 msgstr "Mostrar/Ocultar barra lateral"
 
-#: js/PrefFeedTree.js:52
+#: js/PrefFeedTree.js:54
 msgid "Edit category"
 msgstr "Editar categoria"
 
-#: js/PrefFeedTree.js:59
+#: js/PrefFeedTree.js:61
 msgid "Remove category"
 msgstr "Remover categoria"
 
@@ -2857,63 +2783,55 @@ msgid "Create Filter"
 msgstr "Criar um filtro"
 
 #: js/functions.js:1128
-msgid "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification hub again on next feed update."
-msgstr "Reiniciar a inscrição? Tiny Tiny RSS vai tentar reinscrever-se no hub de notificações na próxima atualização."
-
-#: js/functions.js:1139
-msgid "Subscription reset."
-msgstr "Inscrição reiniciada."
-
-#: js/functions.js:1149
-#: js/tt-rss.js:695
+#: js/tt-rss.js:696
 #, perl-format
 msgid "Unsubscribe from %s?"
 msgstr "Cancelar inscrição de %s?"
 
-#: js/functions.js:1152
+#: js/functions.js:1131
 msgid "Removing feed..."
 msgstr "Removendo a inscrição..."
 
-#: js/functions.js:1225
+#: js/functions.js:1204
 msgid "Please enter category title:"
 msgstr "Por favor entre o título da categoria:"
 
-#: js/functions.js:1250
+#: js/functions.js:1229
 msgid "Generate new syndication address for this feed?"
 msgstr "Gerar novo endereço para este feed?"
 
-#: js/functions.js:1254
-#: js/prefs.js:1154
+#: js/functions.js:1233
+#: js/prefs.js:1150
 msgid "Trying to change address..."
 msgstr "Tentando alterar endereço ..."
 
-#: js/functions.js:1497
-#: js/functions.js:1606
+#: js/functions.js:1476
+#: js/functions.js:1585
 #: js/prefs.js:398
 #: js/prefs.js:424
 #: js/prefs.js:456
 #: js/prefs.js:599
 #: js/prefs.js:617
-#: js/prefs.js:1136
-#: js/prefs.js:1263
+#: js/prefs.js:1132
+#: js/prefs.js:1259
 msgid "No feeds are selected."
 msgstr "Nenhum feed foi selecionado."
 
-#: js/functions.js:1540
+#: js/functions.js:1519
 msgid "Remove selected feeds from the archive? Feeds with stored articles will not be removed."
 msgstr "Remover os feeds selecionados do arquivo? Feeds com artigos armazenados não serão removidos."
 
-#: js/functions.js:1577
+#: js/functions.js:1556
 msgid "Feeds with update errors"
 msgstr "Feeds com erro na atualização"
 
-#: js/functions.js:1588
-#: js/prefs.js:1117
+#: js/functions.js:1567
+#: js/prefs.js:1113
 msgid "Remove selected feeds?"
 msgstr "Remover feeds selecionados?"
 
-#: js/functions.js:1591
-#: js/prefs.js:1120
+#: js/functions.js:1570
+#: js/prefs.js:1116
 msgid "Removing selected feeds..."
 msgstr "Removendo feeds selecionados..."
 
@@ -2936,9 +2854,7 @@ msgstr "Editor de usuários"
 #: js/prefs.js:100
 #: js/prefs.js:209
 #: js/prefs.js:706
-#: plugins/instances/instances.js:26
-#: plugins/instances/instances.js:89
-#: js/functions.js:1408
+#: js/functions.js:1387
 msgid "Saving data..."
 msgstr "Salvando dados..."
 
@@ -2963,7 +2879,7 @@ msgid "Removing selected labels..."
 msgstr "Removendo marcadores selecionados..."
 
 #: js/prefs.js:308
-#: js/prefs.js:1304
+#: js/prefs.js:1300
 msgid "No labels are selected."
 msgstr "Nenhum marcador está selecionado."
 
@@ -3062,28 +2978,28 @@ msgstr "Salvar alterações nas inscrições selecionadas?"
 msgid "OPML Import"
 msgstr "Importar OPML"
 
-#: js/prefs.js:764
+#: js/prefs.js:759
 msgid "Please choose an OPML file first."
 msgstr "Por favor selecione um arquivo OPML."
 
-#: js/prefs.js:767
+#: js/prefs.js:762
 #: plugins/import_export/import_export.js:115
 msgid "Importing, please wait..."
 msgstr "Importando, por favor aguarde..."
 
-#: js/prefs.js:928
+#: js/prefs.js:924
 msgid "Reset to defaults?"
 msgstr "Usar o padrão?"
 
-#: js/prefs.js:1628
+#: js/prefs.js:1624
 msgid "Subscribing to feeds..."
 msgstr "Inscrevendo-se aos feeds..."
 
-#: js/prefs.js:1647
+#: js/prefs.js:1643
 msgid "Clear stored data for this plugin?"
 msgstr "Limpar dados armazenados para este plugin?"
 
-#: js/prefs.js:1661
+#: js/prefs.js:1657
 msgid "Clear all messages in the error log?"
 msgstr "Limpar todas as mensagems do registro de erro?"
 
@@ -3095,176 +3011,147 @@ msgstr "Marcar todos os artigos como lidos?"
 msgid "Marking all feeds as read..."
 msgstr "Marcando todos os feeds como lidos..."
 
-#: js/tt-rss.js:401
+#: js/tt-rss.js:402
 msgid "Please enable mail plugin first."
 msgstr "Por favor habilite o plugin de e-mail."
 
-#: js/tt-rss.js:449
-#: js/functions.js:1387
-#: js/tt-rss.js:676
+#: js/tt-rss.js:450
+#: js/functions.js:1366
+#: js/tt-rss.js:677
 msgid "You can't edit this kind of feed."
 msgstr "Você não pode editar esse tipo de feed."
 
-#: js/tt-rss.js:530
+#: js/tt-rss.js:531
 msgid "Please enable embed_original plugin first."
 msgstr "Por favor, habilite o plugin \"embed_original\"."
 
-#: js/tt-rss.js:543
-#: js/tt-rss.js:726
+#: js/tt-rss.js:544
+#: js/tt-rss.js:727
 msgid "Widescreen is not available in combined mode."
 msgstr "Tela-cheia não suportado no modo combinado."
 
-#: js/tt-rss.js:824
+#: js/tt-rss.js:825
 msgid "You can't rescore this kind of feed."
 msgstr "Você não pode classificar esse tipo de feed."
 
-#: js/tt-rss.js:829
-#: js/tt-rss.js:689
+#: js/tt-rss.js:830
+#: js/tt-rss.js:690
 msgid "Please select some feed first."
 msgstr "Por favor selecione algum feed."
 
-#: js/tt-rss.js:834
+#: js/tt-rss.js:835
 #, perl-format
 msgid "Rescore articles in %s?"
 msgstr "Reclassificar artigos em %s?"
 
-#: js/tt-rss.js:837
+#: js/tt-rss.js:838
 msgid "Rescoring articles..."
 msgstr "Reclassificando artigos..."
 
-#: js/viewfeed.js:919
-#: js/viewfeed.js:957
-#: js/viewfeed.js:1005
-#: js/viewfeed.js:1931
-#: plugins/mail/mail.js:7
+#: js/viewfeed.js:921
+#: js/viewfeed.js:959
+#: js/viewfeed.js:1007
+#: js/viewfeed.js:1933
 #: plugins/mailto/init.js:7
-#: js/viewfeed.js:677
-#: js/viewfeed.js:699
-#: js/viewfeed.js:720
-#: js/viewfeed.js:779
-#: js/viewfeed.js:807
+#: plugins/mail/mail.js:7
+#: js/viewfeed.js:679
+#: js/viewfeed.js:701
+#: js/viewfeed.js:722
+#: js/viewfeed.js:781
+#: js/viewfeed.js:809
 msgid "No articles are selected."
 msgstr "Nenhum artigo foi selecionado."
 
-#: js/viewfeed.js:927
+#: js/viewfeed.js:929
 #, perl-format
 msgid "Delete %d selected article in %s?"
 msgid_plural "Delete %d selected articles in %s?"
 msgstr[0] "Apagar %d artigo selecionado em %s?"
 msgstr[1] "Apagar %d artigos selecionados em %s?"
 
-#: js/viewfeed.js:929
+#: js/viewfeed.js:931
 #, perl-format
 msgid "Delete %d selected article?"
 msgid_plural "Delete %d selected articles?"
 msgstr[0] "Apagar %d artigo selecionado?"
 msgstr[1] "Apagar %d artigos selecionados?"
 
-#: js/viewfeed.js:966
+#: js/viewfeed.js:968
 #, perl-format
 msgid "Archive %d selected article in %s?"
 msgid_plural "Archive %d selected articles in %s?"
 msgstr[0] "Arquivar %d artigo em %s?"
 msgstr[1] "Arquivar %d artigos em %s?"
 
-#: js/viewfeed.js:969
+#: js/viewfeed.js:971
 #, perl-format
 msgid "Move %d archived article back?"
 msgid_plural "Move %d archived articles back?"
 msgstr[0] "Mover %d artigo de volta?"
 msgstr[1] "Mover %d artigos de volta?"
 
-#: js/viewfeed.js:971
+#: js/viewfeed.js:973
 msgid "Please note that unstarred articles might get purged on next feed update."
 msgstr "Por favor note que artigos sem estrela podem ser removidos na próxima atualização."
 
-#: js/viewfeed.js:1011
+#: js/viewfeed.js:1013
 #, perl-format
 msgid "Mark %d selected article in %s as read?"
 msgid_plural "Mark %d selected articles in %s as read?"
 msgstr[0] "Marcar %d artigo selecionado em %s como lido?"
 msgstr[1] "Marcar %d artigos selecionados em %s como lidos?"
 
-#: js/viewfeed.js:1031
+#: js/viewfeed.js:1033
 msgid "Edit article Tags"
 msgstr "Editar tags do artigo"
 
-#: js/viewfeed.js:1037
+#: js/viewfeed.js:1039
 msgid "Saving article tags..."
 msgstr "Salvando tags..."
 
-#: js/viewfeed.js:1670
+#: js/viewfeed.js:1672
 msgid "Open original article"
 msgstr "Abrir o artigo original"
 
-#: js/viewfeed.js:1677
+#: js/viewfeed.js:1679
 msgid "Display article URL"
 msgstr "Mostrar URL do artigo"
 
-#: js/viewfeed.js:1787
+#: js/viewfeed.js:1789
 msgid "Assign label"
 msgstr "Incluir marcador"
 
-#: js/viewfeed.js:1792
+#: js/viewfeed.js:1794
 msgid "Remove label"
 msgstr "Remover marcador"
 
-#: js/viewfeed.js:1824
+#: js/viewfeed.js:1826
 msgid "Select articles in group"
 msgstr "Selecionar artigos no grupo"
 
-#: js/viewfeed.js:1834
+#: js/viewfeed.js:1836
 msgid "Mark group as read"
 msgstr "Marcar grupo como lido"
 
-#: js/viewfeed.js:1846
+#: js/viewfeed.js:1848
 msgid "Mark feed as read"
 msgstr "Marcar feed como lido"
 
-#: js/viewfeed.js:1899
+#: js/viewfeed.js:1901
 msgid "Please enter new score for selected articles:"
 msgstr "Por favor entre uma nova classificação para os artigos selecionados:"
 
-#: js/viewfeed.js:1962
+#: js/viewfeed.js:1964
 msgid "Please enter new score for this article:"
 msgstr "Por favor entre uma nova classificação para esse artigo:"
 
-#: js/viewfeed.js:1993
+#: js/viewfeed.js:1995
 msgid "Article URL:"
 msgstr "URL do artigo:"
 
-#: plugins/instances/instances.js:10
-msgid "Link Instance"
-msgstr "Conectar instância"
-
-#: plugins/instances/instances.js:73
-msgid "Edit Instance"
-msgstr "Editar instância"
-
-#: plugins/instances/instances.js:122
-msgid "Remove selected instances?"
-msgstr "Remover as instâncias selecionadas?"
-
-#: plugins/instances/instances.js:125
-msgid "Removing selected instances..."
-msgstr "Removendo instâncias selecionadas..."
-
-#: plugins/instances/instances.js:139
-#: plugins/instances/instances.js:151
-msgid "No instances are selected."
-msgstr "Nenhuma instância foi selecionada."
-
-#: plugins/instances/instances.js:156
-msgid "Please select only one instance."
-msgstr "Por favor selecione apenas uma instância"
-
-#: plugins/note/note.js:17
-msgid "Saving article note..."
-msgstr "Salvando anotação..."
-
-#: plugins/af_psql_trgm/init.js:11
-msgid "Related articles"
-msgstr "Artigos relacionados"
+#: plugins/embed_original/init.js:6
+msgid "Sorry, your browser does not support sandboxed iframes."
+msgstr "Desculpe, seu navegador não suporta sandboxed iframes."
 
 #: plugins/import_export/import_export.js:13
 msgid "Export Data"
@@ -3285,11 +3172,15 @@ msgstr "Importar dados"
 msgid "Please choose the file first."
 msgstr "Por favor selecione primeiro o arquivo."
 
-#: plugins/mail/mail.js:21
 #: plugins/mailto/init.js:21
+#: plugins/mail/mail.js:21
 msgid "Forward article by email"
 msgstr "Encaminhar artigo por e-mail"
 
+#: plugins/af_psql_trgm/init.js:11
+msgid "Related articles"
+msgstr "Artigos relacionados"
+
 #: plugins/mail/mail.js:36
 msgid "Error sending email:"
 msgstr "Erro ao enviar e-mail:"
@@ -3298,10 +3189,6 @@ msgstr "Erro ao enviar e-mail:"
 msgid "Your message has been sent."
 msgstr "Sua mensagem foi enviada."
 
-#: plugins/embed_original/init.js:6
-msgid "Sorry, your browser does not support sandboxed iframes."
-msgstr "Desculpe, seu navegador não suporta sandboxed iframes."
-
 #: plugins/shorten_expanded/init.js:39
 msgid "Click to expand article"
 msgstr "Clique para expandir o artigo"
@@ -3331,7 +3218,7 @@ msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr "Isso irá invalidar todos os URLs de artigos compartilhados anteriormente. Continuar?"
 
 #: plugins/share/share_prefs.js:6
-#: js/prefs.js:1437
+#: js/prefs.js:1433
 msgid "Clearing URLs..."
 msgstr "Apagando URLs..."
 
@@ -3339,23 +3226,44 @@ msgstr "Apagando URLs..."
 msgid "Shared URLs cleared."
 msgstr "URLs compartilhados apagados."
 
+#: plugins/note/note.js:17
+msgid "Saving article note..."
+msgstr "Salvando anotação..."
+
 #: js/feedlist.js:429
-#: js/feedlist.js:496
 msgid "Mark all articles in %s as read?"
 msgstr "Marcar todos os artigos em %s como lidos?"
 
 #: js/feedlist.js:487
-msgid "Mark all articles in %s older than 1 day as read?"
+#, fuzzy
+msgid "Mark %w in %s older than 1 day as read?"
 msgstr "Marcar todos os artigos em %s com mais de um dia como lidos?"
 
 #: js/feedlist.js:490
-msgid "Mark all articles in %s older than 1 week as read?"
+#, fuzzy
+msgid "Mark %w in %s older than 1 week as read?"
 msgstr "Marcar todos os artigos em %s com mais de uma semana como lidos?"
 
 #: js/feedlist.js:493
-msgid "Mark all articles in %s older than 2 weeks as read?"
+#, fuzzy
+msgid "Mark %w in %s older than 2 weeks as read?"
 msgstr "Marcar todos os artigos em %s com mais de duas semanas como lidos?"
 
+#: js/feedlist.js:496
+#, fuzzy
+msgid "Mark %w in %s as read?"
+msgstr "Marcar todos os artigos em %s como lidos?"
+
+#: js/feedlist.js:499
+#, fuzzy
+msgid "search results"
+msgstr "Resultados da pesquisa: %s"
+
+#: js/feedlist.js:499
+#, fuzzy
+msgid "all articles"
+msgstr "Todos os artigos"
+
 #: js/functions.js:506
 msgid "Error explained"
 msgstr "Detalhamento do erro"
@@ -3436,176 +3344,245 @@ msgstr "Você já está inscrito neste feed."
 msgid "Edit rule"
 msgstr "Editar regra"
 
-#: js/functions.js:1402
+#: js/functions.js:1381
 msgid "Edit Feed"
 msgstr "Editar inscrição"
 
-#: js/functions.js:1435
+#: js/functions.js:1414
 msgid "More Feeds"
 msgstr "Mais feeds"
 
-#: js/functions.js:1631
+#: js/functions.js:1610
 msgid "Help"
 msgstr "Ajuda"
 
-#: js/prefs.js:1032
+#: js/prefs.js:1028
 msgid "Remove category %s? Any nested feeds would be placed into Uncategorized."
 msgstr "Remover a categoria %s? As inscrições associadas serão colocadas em \"Não categorizadas\"."
 
-#: js/prefs.js:1038
+#: js/prefs.js:1034
 msgid "Removing category..."
 msgstr "Removendo categoria..."
 
-#: js/prefs.js:1056
+#: js/prefs.js:1052
 msgid "Remove selected categories?"
 msgstr "Remover as categorias selecionadas?"
 
-#: js/prefs.js:1059
+#: js/prefs.js:1055
 msgid "Removing selected categories..."
 msgstr "Removendo categorias selecionadas..."
 
-#: js/prefs.js:1072
+#: js/prefs.js:1068
 msgid "No categories are selected."
 msgstr "Nenhuma categoria foi selecionada."
 
-#: js/prefs.js:1079
+#: js/prefs.js:1075
 msgid "Category title:"
 msgstr "Título da categoria:"
 
-#: js/prefs.js:1083
+#: js/prefs.js:1079
 msgid "Creating category..."
 msgstr "Criando categoria..."
 
-#: js/prefs.js:1106
+#: js/prefs.js:1102
 msgid "Feeds without recent updates"
 msgstr "Feeds sem atualização recente"
 
-#: js/prefs.js:1150
+#: js/prefs.js:1146
 msgid "Replace current OPML publishing address with a new one?"
 msgstr "Substituir o endereço de publicação OPML por um novo?"
 
-#: js/prefs.js:1227
+#: js/prefs.js:1223
 msgid "Clearing feed..."
 msgstr "Limpando feed..."
 
-#: js/prefs.js:1247
+#: js/prefs.js:1243
 msgid "Rescore articles in selected feeds?"
 msgstr "Reclassificar artigos nos feeds selecionados?"
 
-#: js/prefs.js:1250
+#: js/prefs.js:1246
 msgid "Rescoring selected feeds..."
 msgstr "Removendo inscrições selecionadas..."
 
-#: js/prefs.js:1270
+#: js/prefs.js:1266
 msgid "Rescore all articles? This operation may take a lot of time."
 msgstr "Reclassificar todos os artigos? Esta operação pode demorar um bom tempo."
 
-#: js/prefs.js:1273
+#: js/prefs.js:1269
 msgid "Rescoring feeds..."
 msgstr "Reclassificando feeds..."
 
-#: js/prefs.js:1289
+#: js/prefs.js:1285
 msgid "Reset selected labels to default colors?"
 msgstr "Reiniciar marcadores selecionados para a cor padrão?"
 
-#: js/prefs.js:1321
+#: js/prefs.js:1317
 msgid "Settings Profiles"
 msgstr "Perfis de configurações"
 
-#: js/prefs.js:1330
+#: js/prefs.js:1326
 msgid "Remove selected profiles? Active and default profiles will not be removed."
 msgstr "Remover os perfis selecionados? O perfil ativo e os perfis padrão não serão removidos."
 
-#: js/prefs.js:1333
+#: js/prefs.js:1329
 msgid "Removing selected profiles..."
 msgstr "Removendo perfis selecionados..."
 
-#: js/prefs.js:1349
+#: js/prefs.js:1345
 msgid "No profiles are selected."
 msgstr "Nenhum perfil está selecionado."
 
-#: js/prefs.js:1357
-#: js/prefs.js:1410
+#: js/prefs.js:1353
+#: js/prefs.js:1406
 msgid "Activate selected profile?"
 msgstr "Ativar o perfil selecionado?"
 
-#: js/prefs.js:1374
-#: js/prefs.js:1426
+#: js/prefs.js:1370
+#: js/prefs.js:1422
 msgid "Please choose a profile to activate."
 msgstr "Por favor, selecione um perfil para ativar."
 
-#: js/prefs.js:1379
+#: js/prefs.js:1375
 msgid "Creating profile..."
 msgstr "Criando perfil..."
 
-#: js/prefs.js:1434
+#: js/prefs.js:1430
 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr "Isso irá invalidar todos os URLs gerados para feeds. Continuar?"
 
-#: js/prefs.js:1444
+#: js/prefs.js:1440
 msgid "Generated URLs cleared."
 msgstr "URLs geradas apagadas."
 
-#: js/prefs.js:1516
+#: js/prefs.js:1512
 msgid "Label Editor"
 msgstr "Editor de marcador"
 
-#: js/tt-rss.js:684
+#: js/tt-rss.js:685
 msgid "You can't unsubscribe from the category."
 msgstr "Você não pode cancelar a inscrição dessa categoria."
 
-#: js/viewfeed.js:125
-#: js/viewfeed.js:175
-#: js/viewfeed.js:192
+#: js/viewfeed.js:127
+#: js/viewfeed.js:177
+#: js/viewfeed.js:194
 msgid "Click to open next unread feed."
 msgstr "Clique para abrir o próximo feed não lido."
 
-#: js/viewfeed.js:129
+#: js/viewfeed.js:131
 msgid "Cancel search"
 msgstr "Cancelar pesquisa"
 
-#: js/viewfeed.js:189
+#: js/viewfeed.js:191
 msgid "New articles found, reload feed to continue."
 msgstr "Novos artigos encontrados, recarregue o feed para continuar."
 
-#: js/viewfeed.js:424
+#: js/viewfeed.js:426
 msgid "Unstar article"
 msgstr "Remover estrela"
 
-#: js/viewfeed.js:428
+#: js/viewfeed.js:430
 msgid "Star article"
 msgstr "Incluir estrela"
 
-#: js/viewfeed.js:478
+#: js/viewfeed.js:480
 msgid "Unpublish article"
 msgstr "Cancelar publicação"
 
-#: js/viewfeed.js:482
+#: js/viewfeed.js:484
 msgid "Publish article"
 msgstr "Publicar artigo"
 
-#: js/viewfeed.js:622
+#: js/viewfeed.js:624
 msgid "%d article selected"
 msgid_plural "%d articles selected"
 msgstr[0] "%d artigo selecionado"
 msgstr[1] "%d artigos selecionados"
 
-#: js/viewfeed.js:1286
+#: js/viewfeed.js:1288
 msgid "No article is selected."
 msgstr "Nenhum artigo foi selecionado."
 
-#: js/viewfeed.js:1321
+#: js/viewfeed.js:1323
 msgid "No articles found to mark"
 msgstr "Nenhum artigo foi encontrado para marcar"
 
-#: js/viewfeed.js:1323
+#: js/viewfeed.js:1325
 msgid "Mark %d article as read?"
 msgid_plural "Mark %d articles as read?"
 msgstr[0] "Marcar %d artigo como lido?"
 msgstr[1] "Marcar %d artigos como lidos?"
 
-#~ msgid "Cache images locally"
-#~ msgstr "Guardar imagens no cache local"
+#~ msgid "Resubscribe to push updates"
+#~ msgstr "Reinscrever-se nas atualizações tipo push"
+
+#~ msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
+#~ msgstr "Reinicia o status da inscrição do PubSubHubbub para feeds com push habilitado."
+
+#~ msgid "Download more plugins at tt-rss.org <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forums</a> or <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a>."
+#~ msgstr "Obtenha mais plugins no <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forum</a> ou <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a> do tt-rss."
+
+#~ msgid "Linked"
+#~ msgstr "Conectado"
+
+#~ msgid "Instance"
+#~ msgstr "Instância"
+
+#~ msgid "Instance URL"
+#~ msgstr "URL da instância"
+
+#~ msgid "Access key:"
+#~ msgstr "Chave de acesso:"
+
+#~ msgid "Access key"
+#~ msgstr "Chave de acesso"
+
+#~ msgid "Use one access key for both linked instances."
+#~ msgstr "Use uma chave de acesso para ambas as instâncias."
+
+#~ msgid "Generate new key"
+#~ msgstr "Gerar uma nova chave"
+
+#~ msgid "Link instance"
+#~ msgstr "Conectar instância"
+
+#~ msgid "You can connect other instances of Tiny Tiny RSS to this one to share Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
+#~ msgstr "Você pode conectar outras instâncias to Tiny Tiny RSS a esta para compartilhar feeds populares. Conecte a esta instância do Tiny Tiny RSS usando esta URL:"
+
+#~ msgid "Last connected"
+#~ msgstr "Última conexão"
+
+#~ msgid "Status"
+#~ msgstr "Estado"
+
+#~ msgid "Stored feeds"
+#~ msgstr "Feeds armazenados"
+
+#~ msgid "Create link"
+#~ msgstr "Criar link"
+
+#~ msgid "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification hub again on next feed update."
+#~ msgstr "Reiniciar a inscrição? Tiny Tiny RSS vai tentar reinscrever-se no hub de notificações na próxima atualização."
+
+#~ msgid "Subscription reset."
+#~ msgstr "Inscrição reiniciada."
+
+#~ msgid "Link Instance"
+#~ msgstr "Conectar instância"
+
+#~ msgid "Edit Instance"
+#~ msgstr "Editar instância"
+
+#~ msgid "Remove selected instances?"
+#~ msgstr "Remover as instâncias selecionadas?"
+
+#~ msgid "Removing selected instances..."
+#~ msgstr "Removendo instâncias selecionadas..."
+
+#~ msgid "No instances are selected."
+#~ msgstr "Nenhuma instância foi selecionada."
+
+#~ msgid "Please select only one instance."
+#~ msgstr "Por favor selecione apenas uma instância"
 
 #~ msgid "The error will be reported to the configured log destination."
 #~ msgstr "O erro será enviado para o arquivo de log configurado."
diff --git a/locale/pt_PT/LC_MESSAGES/messages.mo b/locale/pt_PT/LC_MESSAGES/messages.mo
index 8c011b412..f1c1a9ce9 100644
--- a/locale/pt_PT/LC_MESSAGES/messages.mo
+++ b/locale/pt_PT/LC_MESSAGES/messages.mo
diff --git a/locale/pt_PT/LC_MESSAGES/messages.po b/locale/pt_PT/LC_MESSAGES/messages.po
index b0bd6775d..dff2406fe 100644
--- a/locale/pt_PT/LC_MESSAGES/messages.po
+++ b/locale/pt_PT/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tt-rss 1.2.14.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 15:25+0300\n"
+"POT-Creation-Date: 2017-07-04 16:29+0300\n"
 "PO-Revision-Date: 2016-01-09 14:25-0200\n"
 "Last-Translator: Duarte Velez Grilo <[email protected]>\n"
 "Language-Team: Portuguese/Portugal <[email protected]>\n"
@@ -174,31 +174,30 @@ msgstr "Usuário não encontrado"
 #: prefs.php:118
 #: classes/backend.php:5
 #: classes/pref/labels.php:282
-#: classes/pref/feeds.php:1402
-#: classes/pref/filters.php:779
+#: classes/pref/filters.php:819
+#: classes/pref/feeds.php:1376
 #: js/feedlist.js:149
-#: js/functions.js:1131
-#: js/functions.js:1231
-#: js/functions.js:1478
+#: js/functions.js:1210
+#: js/functions.js:1457
 #: js/prefs.js:621
-#: js/prefs.js:818
-#: js/prefs.js:1648
-#: js/prefs.js:1663
-#: js/tt-rss.js:550
-#: js/viewfeed.js:1182
+#: js/prefs.js:813
+#: js/prefs.js:1644
+#: js/prefs.js:1659
+#: js/tt-rss.js:551
+#: js/viewfeed.js:1184
 #: plugins/import_export/import_export.js:17
 #: js/feedlist.js:467
-#: js/feedlist.js:512
+#: js/feedlist.js:515
 #: js/functions.js:372
 #: js/functions.js:630
-#: js/prefs.js:1360
-#: js/prefs.js:1413
-#: js/prefs.js:1452
-#: js/prefs.js:1465
-#: js/prefs.js:1476
-#: js/prefs.js:1491
-#: js/tt-rss.js:567
-#: js/viewfeed.js:762
+#: js/prefs.js:1356
+#: js/prefs.js:1409
+#: js/prefs.js:1448
+#: js/prefs.js:1461
+#: js/prefs.js:1472
+#: js/prefs.js:1487
+#: js/tt-rss.js:568
+#: js/viewfeed.js:764
 msgid "Loading, please wait..."
 msgstr "A carregar, por favor aguarde..."
 
@@ -215,13 +214,13 @@ msgid "All Articles"
 msgstr "Todos os artigos"
 
 #: index.php:192
-#: include/functions2.php:107
+#: include/functions.php:1181
 #: classes/feeds.php:110
 msgid "Starred"
 msgstr "Favoritos"
 
 #: index.php:193
-#: include/functions2.php:108
+#: include/functions.php:1182
 #: classes/feeds.php:111
 msgid "Published"
 msgstr "Publicados"
@@ -262,7 +261,7 @@ msgstr "Título"
 
 #: index.php:209
 #: index.php:249
-#: include/functions2.php:95
+#: include/functions.php:1169
 #: classes/feeds.php:115
 #: js/FeedTree.js:138
 #: js/FeedTree.js:166
@@ -302,7 +301,7 @@ msgid "Feed actions:"
 msgstr "Acções do Feed:"
 
 #: index.php:244
-#: classes/handler/public.php:672
+#: classes/handler/public.php:583
 msgid "Subscribe to feed..."
 msgstr "Assinar feed..."
 
@@ -316,8 +315,8 @@ msgstr "Reclassificar assinatura"
 
 #: index.php:247
 #: classes/pref/feeds.php:785
-#: classes/pref/feeds.php:1357
-#: js/PrefFeedTree.js:78
+#: classes/pref/feeds.php:1331
+#: js/PrefFeedTree.js:80
 msgid "Unsubscribe"
 msgstr "Cancelar assinatura"
 
@@ -334,7 +333,7 @@ msgid "Other actions:"
 msgstr "Outras acções:"
 
 #: index.php:252
-#: include/functions2.php:81
+#: include/functions.php:1155
 msgid "Toggle widescreen mode"
 msgstr "Activa/Desactiva modo widescreen"
 
@@ -360,7 +359,7 @@ msgstr ""
 
 #: prefs.php:33
 #: prefs.php:136
-#: include/functions2.php:110
+#: include/functions.php:1184
 #: classes/pref/prefs.php:435
 msgid "Preferences"
 msgstr "Preferências"
@@ -375,20 +374,19 @@ msgstr "Sair das preferências"
 
 #: prefs.php:139
 #: classes/pref/feeds.php:112
-#: classes/pref/feeds.php:1297
-#: classes/pref/feeds.php:1346
+#: classes/pref/feeds.php:1271
+#: classes/pref/feeds.php:1320
 msgid "Feeds"
 msgstr "Assinaturas"
 
 #: prefs.php:142
-#: classes/pref/filters.php:248
+#: classes/pref/filters.php:273
 msgid "Filters"
 msgstr "Filtros"
 
 #: prefs.php:145
-#: include/functions.php:1327
-#: include/functions.php:1979
 #: classes/pref/labels.php:90
+#: classes/feeds.php:1718
 msgid "Labels"
 msgstr "Marcadores"
 
@@ -417,13 +415,13 @@ msgstr "O registro de novos utilizadores foi desactivado pelo administrador"
 #: register.php:337
 #: register.php:347
 #: register.php:359
-#: classes/handler/public.php:742
-#: classes/handler/public.php:813
-#: classes/handler/public.php:911
-#: classes/handler/public.php:990
-#: classes/handler/public.php:1004
-#: classes/handler/public.php:1011
-#: classes/handler/public.php:1036
+#: classes/handler/public.php:653
+#: classes/handler/public.php:724
+#: classes/handler/public.php:822
+#: classes/handler/public.php:901
+#: classes/handler/public.php:915
+#: classes/handler/public.php:922
+#: classes/handler/public.php:947
 msgid "Return to Tiny Tiny RSS"
 msgstr "Voltar ao TT-Rss"
 
@@ -440,12 +438,12 @@ msgid "Check availability"
 msgstr "Verificar disponibilidade"
 
 #: register.php:229
-#: classes/handler/public.php:829
+#: classes/handler/public.php:740
 msgid "Email:"
 msgstr "E-mail: "
 
 #: register.php:232
-#: classes/handler/public.php:834
+#: classes/handler/public.php:745
 msgid "How much is two plus two:"
 msgstr "Quanto é dois mais dois:"
 
@@ -473,17 +471,23 @@ msgstr "Conta criada com sucesso."
 msgid "New user registrations are currently closed."
 msgstr "O registro de novos utilizador está actualmente suspenso."
 
-#: update.php:67
+#: update.php:66
 msgid "Tiny Tiny RSS data update script."
 msgstr "Script de actualização do Tiny Tiny RSS."
 
-#: include/digest.php:109
-#: include/functions.php:1336
-#: include/functions.php:1880
-#: include/functions.php:1965
-#: include/functions.php:1987
-#: classes/opml.php:421
+#: include/controls.php:83
+#: classes/pref/filters.php:242
+#: classes/pref/filters.php:253
+#: classes/pref/filters.php:544
+msgid "All feeds"
+msgstr "Todos os feeds"
+
+#: include/controls.php:134
+#: include/controls.php:316
 #: classes/pref/feeds.php:228
+#: classes/opml.php:486
+#: classes/feeds.php:1727
+#: classes/digest.php:113
 msgid "Uncategorized"
 msgstr "Não Categorizado"
 
@@ -498,394 +502,288 @@ msgstr[1] "%d artigos arquivados"
 msgid "No feeds found."
 msgstr "Sem assinaturas para exibir."
 
-#: include/functions.php:1029
+#: include/functions.php:900
 #, php-format
 msgid "%d min"
 msgstr ""
 
-#: include/functions.php:1325
-#: include/functions.php:1977
-msgid "Special"
-msgstr "Especial"
-
-#: include/functions.php:1828
-#: classes/pref/filters.php:229
-#: classes/pref/filters.php:507
-msgid "All feeds"
-msgstr "Todos os feeds"
-
-#: include/functions.php:2032
-msgid "Starred articles"
-msgstr "Artigos com estrela"
-
-#: include/functions.php:2034
-msgid "Published articles"
-msgstr "Artigos publicados"
-
-#: include/functions.php:2036
-msgid "Fresh articles"
-msgstr "Últimas notícias"
-
-#: include/functions.php:2038
-#: include/functions2.php:105
-msgid "All articles"
-msgstr "Todas as inscrições"
-
-#: include/functions.php:2040
-msgid "Archived articles"
-msgstr "Artigos arquivados"
-
-#: include/functions.php:2042
-msgid "Recently read"
-msgstr "Lidos recentemente"
-
-#: include/functions2.php:57
+#: include/functions.php:1131
 msgid "Navigation"
 msgstr "Navegação"
 
-#: include/functions2.php:58
+#: include/functions.php:1132
 msgid "Open next feed"
 msgstr "Abrir a próxima assinatura"
 
-#: include/functions2.php:59
+#: include/functions.php:1133
 msgid "Open previous feed"
 msgstr "Abrir a assinatura anterior"
 
-#: include/functions2.php:60
+#: include/functions.php:1134
 msgid "Open next article"
 msgstr "Abrir o próximo artigo"
 
-#: include/functions2.php:61
+#: include/functions.php:1135
 msgid "Open previous article"
 msgstr "Abrir o artigo anterior"
 
-#: include/functions2.php:62
+#: include/functions.php:1136
 msgid "Open next article (don't scroll long articles)"
 msgstr "Abrir o próximo artigo (não rolar artigos longos)"
 
-#: include/functions2.php:63
+#: include/functions.php:1137
 msgid "Open previous article (don't scroll long articles)"
 msgstr "Abrir o artigo anterior (não rolar artigos longos)"
 
-#: include/functions2.php:64
+#: include/functions.php:1138
 msgid "Move to next article (don't expand or mark read)"
 msgstr "Mover para o próximo artigo (não expandir ou marcar como lido)"
 
-#: include/functions2.php:65
+#: include/functions.php:1139
 msgid "Move to previous article (don't expand or mark read)"
 msgstr "Mover para o artigo anterior (não expandir ou marcar como lido)"
 
-#: include/functions2.php:66
+#: include/functions.php:1140
 msgid "Show search dialog"
 msgstr "Mostrar diálogo de pesquisa"
 
-#: include/functions2.php:67
+#: include/functions.php:1141
 msgid "Article"
 msgstr "Artigo"
 
-#: include/functions2.php:68
-#: js/viewfeed.js:1699
+#: include/functions.php:1142
+#: js/viewfeed.js:1701
 msgid "Toggle starred"
 msgstr "Incluir/Remover estrela"
 
-#: include/functions2.php:69
-#: js/viewfeed.js:1711
+#: include/functions.php:1143
+#: js/viewfeed.js:1713
 msgid "Toggle published"
 msgstr "Marcar/Desmarcar como publicado"
 
-#: include/functions2.php:70
-#: js/viewfeed.js:1686
+#: include/functions.php:1144
+#: js/viewfeed.js:1688
 msgid "Toggle unread"
 msgstr "Marcar como não lido"
 
-#: include/functions2.php:71
+#: include/functions.php:1145
 msgid "Edit tags"
 msgstr "Editar Tags"
 
-#: include/functions2.php:72
+#: include/functions.php:1146
 msgid "Open in new window"
 msgstr "Abrir em uma nova janela"
 
-#: include/functions2.php:73
-#: js/viewfeed.js:1732
+#: include/functions.php:1147
+#: js/viewfeed.js:1734
 msgid "Mark below as read"
 msgstr "Marcar abaixo como lido"
 
-#: include/functions2.php:74
-#: js/viewfeed.js:1725
+#: include/functions.php:1148
+#: js/viewfeed.js:1727
 msgid "Mark above as read"
 msgstr "Marcar acima como lido"
 
-#: include/functions2.php:75
+#: include/functions.php:1149
 msgid "Scroll down"
 msgstr "Rolar para baixo"
 
-#: include/functions2.php:76
+#: include/functions.php:1150
 msgid "Scroll up"
 msgstr "Rolar para cima"
 
-#: include/functions2.php:77
+#: include/functions.php:1151
 msgid "Select article under cursor"
 msgstr "Selecionar artigo sob o cursor"
 
-#: include/functions2.php:78
+#: include/functions.php:1152
 msgid "Email article"
 msgstr "Enviar artigo por e-mail"
 
-#: include/functions2.php:79
+#: include/functions.php:1153
 msgid "Close/collapse article"
 msgstr "Fechar/Abrir artigo"
 
-#: include/functions2.php:80
+#: include/functions.php:1154
 msgid "Toggle article expansion (combined mode)"
 msgstr "Ativar/Desativar expansão de artigo (modo combinado)"
 
-#: include/functions2.php:82
+#: include/functions.php:1156
 #: plugins/embed_original/init.php:31
 msgid "Toggle embed original"
 msgstr "Ativar/Desativar inclusão do original"
 
-#: include/functions2.php:83
+#: include/functions.php:1157
 msgid "Article selection"
 msgstr "Seleção de artigos"
 
-#: include/functions2.php:84
+#: include/functions.php:1158
 msgid "Select all articles"
 msgstr "Selecionar todos os artigos"
 
-#: include/functions2.php:85
+#: include/functions.php:1159
 msgid "Select unread"
 msgstr "Selecionar os não lidos"
 
-#: include/functions2.php:86
+#: include/functions.php:1160
 msgid "Select starred"
 msgstr "Selecionar artigos com estrela"
 
-#: include/functions2.php:87
+#: include/functions.php:1161
 msgid "Select published"
 msgstr "Selecionar artigos publicados"
 
-#: include/functions2.php:88
+#: include/functions.php:1162
 msgid "Invert selection"
 msgstr "Inverter seleção"
 
-#: include/functions2.php:89
+#: include/functions.php:1163
 msgid "Deselect everything"
 msgstr "Desmarcar tudo"
 
-#: include/functions2.php:90
+#: include/functions.php:1164
 #: classes/pref/feeds.php:555
-#: classes/pref/feeds.php:823
+#: classes/pref/feeds.php:811
 msgid "Feed"
 msgstr "Feed"
 
-#: include/functions2.php:91
+#: include/functions.php:1165
 msgid "Refresh current feed"
 msgstr "Atualizar inscrição atual"
 
-#: include/functions2.php:92
+#: include/functions.php:1166
 msgid "Un/hide read feeds"
 msgstr "Ocultar/mostrar inscrições lidas"
 
-#: include/functions2.php:93
-#: classes/pref/feeds.php:1349
+#: include/functions.php:1167
+#: classes/pref/feeds.php:1323
 msgid "Subscribe to feed"
 msgstr "Assinar"
 
-#: include/functions2.php:94
+#: include/functions.php:1168
 #: js/FeedTree.js:145
-#: js/PrefFeedTree.js:72
-#: js/viewfeed.js:1853
+#: js/PrefFeedTree.js:74
+#: js/viewfeed.js:1855
 msgid "Edit feed"
 msgstr "Editar inscrição"
 
-#: include/functions2.php:96
+#: include/functions.php:1170
 #, fuzzy
 msgid "Reverse headlines"
 msgstr "Remover as categorias selecionadas?"
 
-#: include/functions2.php:97
+#: include/functions.php:1171
 msgid "Toggle headline grouping"
 msgstr ""
 
-#: include/functions2.php:98
+#: include/functions.php:1172
 msgid "Debug feed update"
 msgstr "Debugar atualização de inscrições"
 
-#: include/functions2.php:99
+#: include/functions.php:1173
 #, fuzzy
 msgid "Debug viewfeed()"
 msgstr "Debugar atualização de inscrições"
 
-#: include/functions2.php:100
+#: include/functions.php:1174
 #: js/FeedTree.js:194
 msgid "Mark all feeds as read"
 msgstr "Marcar todas as inscrições como lidas"
 
-#: include/functions2.php:101
+#: include/functions.php:1175
 msgid "Un/collapse current category"
 msgstr "Mostrar/Ocultar categoria atual"
 
-#: include/functions2.php:102
+#: include/functions.php:1176
 msgid "Toggle combined mode"
 msgstr "Ativar/Desativar modo combinado"
 
-#: include/functions2.php:103
+#: include/functions.php:1177
 msgid "Toggle auto expand in combined mode"
 msgstr "Ativar/Desativar expansão no modo combinado"
 
-#: include/functions2.php:104
+#: include/functions.php:1178
 msgid "Go to"
 msgstr "Ir para"
 
-#: include/functions2.php:106
+#: include/functions.php:1179
+#: classes/feeds.php:1602
+msgid "All articles"
+msgstr "Todas as inscrições"
+
+#: include/functions.php:1180
 msgid "Fresh"
 msgstr "Recentes"
 
-#: include/functions2.php:109
-#: js/tt-rss.js:494
-#: js/tt-rss.js:663
+#: include/functions.php:1183
+#: js/tt-rss.js:495
+#: js/tt-rss.js:664
 msgid "Tag cloud"
 msgstr "Núvem de tags"
 
-#: include/functions2.php:111
+#: include/functions.php:1185
 msgid "Other"
 msgstr "Outros"
 
-#: include/functions2.php:112
+#: include/functions.php:1186
 #: classes/pref/labels.php:267
 msgid "Create label"
 msgstr "Criar marcador"
 
-#: include/functions2.php:113
-#: classes/pref/filters.php:753
+#: include/functions.php:1187
+#: classes/pref/filters.php:793
 msgid "Create filter"
 msgstr "Criar filtro"
 
-#: include/functions2.php:114
+#: include/functions.php:1188
 msgid "Un/collapse sidebar"
 msgstr "Mostrar/Ocultar barra lateral"
 
-#: include/functions2.php:115
+#: include/functions.php:1189
 msgid "Show help dialog"
 msgstr "Mostrar dialogo de ajuda"
 
-#: include/functions2.php:670
-#, php-format
-msgid "Search results: %s"
-msgstr "Resultados da pesquisa: %s"
-
-#: include/functions2.php:1336
-#: classes/feeds.php:752
-#, fuzzy
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] "Conteúdo"
-msgstr[1] "Conteúdo"
-
-#: include/functions2.php:1340
-#: classes/feeds.php:756
-#, fuzzy
-msgid "comments"
-msgstr "Conteúdo"
-
-#: include/functions2.php:1366
-msgid " - "
-msgstr " - "
-
-#: include/functions2.php:1397
-#: include/functions2.php:1648
-#: classes/article.php:311
-msgid "no tags"
-msgstr "sem tags"
-
-#: include/functions2.php:1407
-#: classes/feeds.php:738
-msgid "Edit tags for this article"
-msgstr "Editar tags deste artigo"
-
-#: include/functions2.php:1439
-#: classes/feeds.php:690
-msgid "Originally from:"
-msgstr "Originalmente de:"
-
-#: include/functions2.php:1452
-#: classes/pref/feeds.php:574
-#: classes/feeds.php:703
-msgid "Feed URL"
-msgstr "URL da inscrição"
-
-#: include/functions2.php:1489
-#: classes/backend.php:105
-#: classes/dlg.php:37
-#: classes/dlg.php:60
-#: classes/dlg.php:93
-#: classes/dlg.php:159
-#: classes/dlg.php:186
-#: classes/pref/feeds.php:1652
-#: classes/pref/feeds.php:1718
-#: classes/pref/filters.php:204
-#: classes/pref/prefs.php:1097
-#: plugins/af_psql_trgm/init.php:102
-#: plugins/import_export/init.php:415
-#: plugins/import_export/init.php:461
-#: plugins/share/init.php:121
-msgid "Close this window"
-msgstr "Fechar esta janela"
-
-#: include/functions2.php:1686
-msgid "(edit note)"
-msgstr "Editar nota"
-
-#: include/functions2.php:1960
-msgid "unknown type"
-msgstr "tipo desconhecido"
-
-#: include/functions2.php:2037
-msgid "Attachments"
-msgstr "Anexos"
-
-#: include/functions2.php:2496
+#: include/functions.php:2456
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: include/functions2.php:2497
+#: include/functions.php:2457
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: include/functions2.php:2498
+#: include/functions.php:2458
 msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
 msgstr ""
 
-#: include/functions2.php:2499
+#: include/functions.php:2459
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: include/functions2.php:2500
+#: include/functions.php:2460
 #, fuzzy
 msgid "No file was uploaded"
 msgstr "Nenhum arquivo enviado."
 
-#: include/functions2.php:2501
+#: include/functions.php:2461
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: include/functions2.php:2502
+#: include/functions.php:2462
 msgid "Failed to write file to disk."
 msgstr ""
 
-#: include/functions2.php:2503
+#: include/functions.php:2463
 msgid "A PHP extension stopped the file upload."
 msgstr ""
 
 #: include/login_form.php:197
-#: classes/handler/public.php:569
-#: classes/handler/public.php:824
+#: classes/handler/public.php:480
+#: classes/handler/public.php:735
 msgid "Login:"
 msgstr "Nome de usuário:"
 
 #: include/login_form.php:207
-#: classes/handler/public.php:572
+#: classes/handler/public.php:483
 msgid "Password:"
 msgstr "Senha:"
 
@@ -898,7 +796,7 @@ msgid "Profile:"
 msgstr "Perfil:"
 
 #: include/login_form.php:223
-#: classes/handler/public.php:311
+#: classes/handler/public.php:287
 #: classes/pref/prefs.php:1035
 #: classes/rpc.php:63
 msgid "Default profile"
@@ -917,7 +815,7 @@ msgid "Remember me"
 msgstr "Continuar conectado"
 
 #: include/login_form.php:249
-#: classes/handler/public.php:577
+#: classes/handler/public.php:488
 msgid "Log in"
 msgstr "Login"
 
@@ -933,145 +831,44 @@ msgstr "Falha ao validar a sessão (Usuário não encontrado)"
 msgid "Session failed to validate (password changed)"
 msgstr "Falha ao validar a sessão (A senha foi alterada)"
 
-#: classes/article.php:25
-msgid "Article not found."
-msgstr "Artigo não encontrado."
-
-#: classes/article.php:197
-msgid "Tags for this article (separated by commas):"
-msgstr "Tags para esse artigo (separadas por vírgula):"
-
-#: classes/article.php:222
-#: classes/pref/labels.php:79
-#: classes/pref/users.php:98
-#: classes/pref/feeds.php:801
-#: classes/pref/feeds.php:943
-#: classes/pref/filters.php:485
-#: classes/pref/prefs.php:981
-#: plugins/instances/init.php:245
-#: plugins/nsfw/init.php:85
-#: plugins/note/init.php:51
-#: plugins/af_readability/init.php:68
-#: plugins/af_redditimgur/init.php:60
-#: plugins/af_psql_trgm/init.php:181
-#: plugins/mail/init.php:64
-#: plugins/af_zz_imgproxy/init.php:213
-msgid "Save"
-msgstr "Salvar"
-
-#: classes/article.php:224
-#: classes/handler/public.php:546
-#: classes/handler/public.php:580
-#: classes/pref/labels.php:81
-#: classes/pref/users.php:100
-#: classes/pref/feeds.php:802
-#: classes/pref/feeds.php:946
-#: classes/pref/feeds.php:1859
-#: classes/pref/filters.php:488
-#: classes/pref/filters.php:902
-#: classes/pref/filters.php:983
-#: classes/pref/filters.php:1076
-#: classes/pref/prefs.php:983
-#: classes/feeds.php:1105
-#: classes/feeds.php:1155
-#: classes/feeds.php:1192
-#: plugins/instances/init.php:248
-#: plugins/instances/init.php:436
-#: plugins/note/init.php:53
-#: plugins/mail/init.php:173
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: classes/opml.php:28
-#: classes/opml.php:33
-msgid "OPML Utility"
-msgstr "Utilitário OPML"
-
-#: classes/opml.php:37
-msgid "Importing OPML..."
-msgstr "Importando OPML..."
-
-#: classes/opml.php:41
-msgid "Return to preferences"
-msgstr "Retornar às preferências"
-
-#: classes/opml.php:271
-#, php-format
-msgid "Adding feed: %s"
-msgstr "Adicionando feed: %s"
-
-#: classes/opml.php:282
-#, php-format
-msgid "Duplicate feed: %s"
-msgstr "Feed duplicado: %s"
-
-#: classes/opml.php:296
-#, php-format
-msgid "Adding label %s"
-msgstr "Adicionando marcador %s"
-
-#: classes/opml.php:299
-#, php-format
-msgid "Duplicate label: %s"
-msgstr "Marcador duplicado: %s"
-
-#: classes/opml.php:311
-#, php-format
-msgid "Setting preference key %s to %s"
-msgstr "Ajustando chave de configuração %s para %s"
-
-#: classes/opml.php:343
-msgid "Adding filter..."
-msgstr "Adicionando filtro..."
-
-#: classes/opml.php:421
-#, php-format
-msgid "Processing category: %s"
-msgstr "Processando categoria: %s"
-
-#: classes/opml.php:470
-#, php-format
-msgid "Upload failed with error code %d"
-msgstr "Enviou falhou com o código de erro %d"
-
-#: classes/opml.php:484
-#: plugins/import_export/init.php:442
-msgid "Unable to move uploaded file."
-msgstr "Incapaz de mover arquivo enviado."
-
-#: classes/opml.php:488
-#: plugins/import_export/init.php:446
-msgid "Error: please upload OPML file."
-msgstr "Erro: Por favor envie um arquivo OPML."
-
-#: classes/opml.php:499
-msgid "Error: unable to find moved OPML file."
-msgstr "Erro: Arquivo OPML movido não foi encontrado"
-
-#: classes/opml.php:506
-msgid "Error while parsing document."
-msgstr "Erro ao processar o documento."
-
-#: classes/backend.php:33
+#: classes/backend.php:31
 msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
 msgstr "Outras dicas de interface estão disponíveis no wiki to Tiny Tiny RSS."
 
-#: classes/backend.php:38
+#: classes/backend.php:36
 msgid "Keyboard Shortcuts"
 msgstr "Atalhos de teclado"
 
-#: classes/backend.php:61
+#: classes/backend.php:59
 msgid "Shift"
 msgstr ""
 
-#: classes/backend.php:64
+#: classes/backend.php:62
 msgid "Ctrl"
 msgstr ""
 
-#: classes/backend.php:99
+#: classes/backend.php:97
 msgid "Help topic not found."
 msgstr "Tópico de ajuda não encontrado."
 
+#: classes/backend.php:103
+#: classes/dlg.php:37
+#: classes/dlg.php:60
+#: classes/dlg.php:93
+#: classes/dlg.php:159
+#: classes/dlg.php:186
+#: classes/article.php:744
+#: classes/pref/filters.php:206
+#: classes/pref/prefs.php:1097
+#: classes/pref/feeds.php:1626
+#: classes/pref/feeds.php:1692
+#: plugins/import_export/init.php:421
+#: plugins/import_export/init.php:467
+#: plugins/af_psql_trgm/init.php:102
+#: plugins/share/init.php:120
+msgid "Close this window"
+msgstr "Fechar esta janela"
+
 #: classes/dlg.php:17
 msgid "If you have imported labels and/or filters, you might need to reload preferences to see your new data."
 msgstr ""
@@ -1082,7 +879,7 @@ msgstr "Sua URL OPML pública é:"
 
 #: classes/dlg.php:57
 #: classes/dlg.php:183
-#: plugins/share/init.php:118
+#: plugins/share/init.php:117
 msgid "Generate new URL"
 msgstr "Gerar nova URL"
 
@@ -1103,130 +900,226 @@ msgstr "O serviço de atualização está demorando demais para atualizar um fee
 msgid "You can view this feed as RSS using the following URL:"
 msgstr "Você pode ver essa assinatura como RSS usando a seguinte URL:"
 
-#: classes/handler/public.php:510
+#: classes/article.php:25
+msgid "Article not found."
+msgstr "Artigo não encontrado."
+
+#: classes/article.php:197
+msgid "Tags for this article (separated by commas):"
+msgstr "Tags para esse artigo (separadas por vírgula):"
+
+#: classes/article.php:222
+#: classes/pref/labels.php:79
+#: classes/pref/filters.php:519
+#: classes/pref/users.php:98
+#: classes/pref/prefs.php:981
+#: classes/pref/feeds.php:789
+#: classes/pref/feeds.php:931
+#: plugins/af_psql_trgm/init.php:181
+#: plugins/nsfw/init.php:85
+#: plugins/af_readability/init.php:68
+#: plugins/mail/init.php:64
+#: plugins/af_redditimgur/init.php:60
+#: plugins/note/init.php:51
+#: plugins/af_zz_imgproxy/init.php:240
+msgid "Save"
+msgstr "Salvar"
+
+#: classes/article.php:224
+#: classes/handler/public.php:457
+#: classes/handler/public.php:491
+#: classes/pref/labels.php:81
+#: classes/pref/filters.php:522
+#: classes/pref/filters.php:942
+#: classes/pref/filters.php:1022
+#: classes/pref/filters.php:1115
+#: classes/pref/users.php:100
+#: classes/pref/prefs.php:983
+#: classes/pref/feeds.php:790
+#: classes/pref/feeds.php:934
+#: classes/pref/feeds.php:1833
+#: classes/feeds.php:1098
+#: classes/feeds.php:1148
+#: classes/feeds.php:1185
+#: plugins/mail/init.php:173
+#: plugins/note/init.php:53
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: classes/article.php:311
+#: classes/article.php:652
+#: classes/article.php:805
+msgid "no tags"
+msgstr "sem tags"
+
+#: classes/article.php:419
+msgid "unknown type"
+msgstr "tipo desconhecido"
+
+#: classes/article.php:496
+msgid "Attachments"
+msgstr "Anexos"
+
+#: classes/article.php:591
+#: classes/feeds.php:741
+#, fuzzy
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] "Conteúdo"
+msgstr[1] "Conteúdo"
+
+#: classes/article.php:595
+#: classes/feeds.php:745
+#, fuzzy
+msgid "comments"
+msgstr "Conteúdo"
+
+#: classes/article.php:621
+msgid " - "
+msgstr " - "
+
+#: classes/article.php:662
+#: classes/feeds.php:727
+msgid "Edit tags for this article"
+msgstr "Editar tags deste artigo"
+
+#: classes/article.php:694
+#: classes/feeds.php:681
+msgid "Originally from:"
+msgstr "Originalmente de:"
+
+#: classes/article.php:707
+#: classes/pref/feeds.php:574
+#: classes/feeds.php:694
+msgid "Feed URL"
+msgstr "URL da inscrição"
+
+#: classes/article.php:843
+msgid "(edit note)"
+msgstr "Editar nota"
+
+#: classes/handler/public.php:421
 #: plugins/bookmarklets/init.php:40
 msgid "Share with Tiny Tiny RSS"
 msgstr "Compartilhar com TT-Rss"
 
-#: classes/handler/public.php:518
+#: classes/handler/public.php:429
 msgid "Title:"
 msgstr "Título"
 
-#: classes/handler/public.php:520
+#: classes/handler/public.php:431
 #: classes/pref/feeds.php:572
-#: plugins/instances/init.php:212
-#: plugins/instances/init.php:401
 msgid "URL:"
 msgstr "URL:"
 
-#: classes/handler/public.php:522
+#: classes/handler/public.php:433
 msgid "Content:"
 msgstr "Conteúdo:"
 
-#: classes/handler/public.php:524
+#: classes/handler/public.php:435
 msgid "Labels:"
 msgstr "Marcadores:"
 
-#: classes/handler/public.php:543
+#: classes/handler/public.php:454
 msgid "Shared article will appear in the Published feed."
 msgstr "Artigo compartilhado vai aparecer nos publicados."
 
-#: classes/handler/public.php:545
+#: classes/handler/public.php:456
 msgid "Share"
 msgstr "Compartilhar"
 
-#: classes/handler/public.php:567
+#: classes/handler/public.php:478
 msgid "Not logged in"
 msgstr "Não logado"
 
-#: classes/handler/public.php:626
+#: classes/handler/public.php:537
 msgid "Incorrect username or password"
 msgstr "Usuário ou senha inválidos"
 
-#: classes/handler/public.php:678
+#: classes/handler/public.php:589
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "Já inscrito em <b>%s</b>"
 
-#: classes/handler/public.php:681
+#: classes/handler/public.php:592
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "Inscrito em <b>%s</b>."
 
-#: classes/handler/public.php:684
+#: classes/handler/public.php:595
 #, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "Não foi possível inscrever em <b>%s</b>"
 
-#: classes/handler/public.php:687
+#: classes/handler/public.php:598
 #, php-format
 msgid "No feeds found in <b>%s</b>."
 msgstr "Nenhum feed encontrado em <b>%s</b>."
 
-#: classes/handler/public.php:690
+#: classes/handler/public.php:601
 msgid "Multiple feed URLs found."
 msgstr "Multiplas URLs encontradas."
 
-#: classes/handler/public.php:694
+#: classes/handler/public.php:605
 #, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr "A inscrição em <b>%s</b> não foi possível.<br>Incapaz de baixar a URL do feed RSS."
 
-#: classes/handler/public.php:712
+#: classes/handler/public.php:623
 msgid "Subscribe to selected feed"
 msgstr "Inscrever no feed selecionado"
 
-#: classes/handler/public.php:737
+#: classes/handler/public.php:648
 msgid "Edit subscription options"
 msgstr "Editar opções de assinatura"
 
-#: classes/handler/public.php:774
+#: classes/handler/public.php:685
 msgid "Password recovery"
 msgstr "Recuperação de senha"
 
-#: classes/handler/public.php:817
+#: classes/handler/public.php:728
 #, fuzzy
 msgid "You will need to provide valid account name and email. A password reset link will be sent to your email address."
 msgstr "Você precisa informar um nome de usuário válido e endereço de e-mail. Uma nova senha será enviada para seu endereço de e-mail."
 
-#: classes/handler/public.php:839
-#: classes/pref/users.php:350
+#: classes/handler/public.php:750
+#: classes/pref/users.php:349
 msgid "Reset password"
 msgstr "Redefinir a senha"
 
-#: classes/handler/public.php:849
+#: classes/handler/public.php:760
 msgid "Some of the required form parameters are missing or incorrect."
 msgstr "Alguns dos parâmetros necessários estão faltando ou incorretos."
 
-#: classes/handler/public.php:853
-#: classes/handler/public.php:919
+#: classes/handler/public.php:764
+#: classes/handler/public.php:830
 msgid "Go back"
 msgstr "Voltar"
 
-#: classes/handler/public.php:890
+#: classes/handler/public.php:801
 #, fuzzy
 msgid "[tt-rss] Password reset request"
 msgstr "[tt-rss] Notificação de troca de senh"
 
-#: classes/handler/public.php:915
+#: classes/handler/public.php:826
 msgid "Sorry, login and email combination not found."
 msgstr "Desculpe, Nome de usuário e e-mail não encontrados."
 
-#: classes/handler/public.php:937
+#: classes/handler/public.php:848
 msgid "Your access level is insufficient to run this script."
 msgstr "Seu nível de acesso é insuficiente para executar esse script."
 
-#: classes/handler/public.php:963
+#: classes/handler/public.php:874
 msgid "Database Updater"
 msgstr "Atualizador do banco de dados"
 
-#: classes/handler/public.php:1028
+#: classes/handler/public.php:939
 msgid "Perform updates"
 msgstr "Executar atualização"
 
 #: classes/pref/labels.php:22
-#: classes/pref/filters.php:348
-#: classes/pref/filters.php:823
+#: classes/pref/filters.php:373
+#: classes/pref/filters.php:863
 msgid "Caption"
 msgstr "Título"
 
@@ -1248,59 +1141,55 @@ msgid "Created label <b>%s</b>"
 msgstr "Marcador <b>%s</b> criado"
 
 #: classes/pref/labels.php:258
-#: classes/pref/users.php:334
-#: classes/pref/feeds.php:1337
-#: classes/pref/feeds.php:1600
-#: classes/pref/feeds.php:1664
-#: classes/pref/filters.php:359
-#: classes/pref/filters.php:407
-#: classes/pref/filters.php:744
-#: classes/pref/filters.php:832
-#: classes/pref/filters.php:859
+#: classes/pref/filters.php:384
+#: classes/pref/filters.php:441
+#: classes/pref/filters.php:784
+#: classes/pref/filters.php:872
+#: classes/pref/filters.php:899
+#: classes/pref/users.php:333
 #: classes/pref/prefs.php:992
-#: plugins/instances/init.php:284
+#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1574
+#: classes/pref/feeds.php:1638
 msgid "Select"
 msgstr "Selecione"
 
 #: classes/pref/labels.php:261
-#: classes/pref/users.php:337
-#: classes/pref/feeds.php:1340
-#: classes/pref/feeds.php:1603
-#: classes/pref/feeds.php:1667
-#: classes/pref/filters.php:362
-#: classes/pref/filters.php:410
-#: classes/pref/filters.php:747
-#: classes/pref/filters.php:835
-#: classes/pref/filters.php:862
+#: classes/pref/filters.php:387
+#: classes/pref/filters.php:444
+#: classes/pref/filters.php:787
+#: classes/pref/filters.php:875
+#: classes/pref/filters.php:902
+#: classes/pref/users.php:336
 #: classes/pref/prefs.php:995
+#: classes/pref/feeds.php:1314
+#: classes/pref/feeds.php:1577
+#: classes/pref/feeds.php:1641
 #: classes/feeds.php:102
-#: plugins/instances/init.php:287
 msgid "All"
 msgstr "Tudo"
 
 #: classes/pref/labels.php:263
-#: classes/pref/users.php:339
-#: classes/pref/feeds.php:1342
-#: classes/pref/feeds.php:1605
-#: classes/pref/feeds.php:1669
-#: classes/pref/filters.php:364
-#: classes/pref/filters.php:412
-#: classes/pref/filters.php:749
-#: classes/pref/filters.php:837
-#: classes/pref/filters.php:864
+#: classes/pref/filters.php:389
+#: classes/pref/filters.php:446
+#: classes/pref/filters.php:789
+#: classes/pref/filters.php:877
+#: classes/pref/filters.php:904
+#: classes/pref/users.php:338
 #: classes/pref/prefs.php:997
+#: classes/pref/feeds.php:1316
+#: classes/pref/feeds.php:1579
+#: classes/pref/feeds.php:1643
 #: classes/feeds.php:105
-#: plugins/instances/init.php:289
 msgid "None"
 msgstr "Nenhum"
 
 #: classes/pref/labels.php:270
-#: classes/pref/users.php:348
+#: classes/pref/filters.php:512
+#: classes/pref/filters.php:806
+#: classes/pref/users.php:347
 #: classes/pref/feeds.php:767
-#: classes/pref/filters.php:478
-#: classes/pref/filters.php:766
-#: classes/feeds.php:1154
-#: plugins/instances/init.php:294
+#: classes/feeds.php:1147
 msgid "Remove"
 msgstr "Remover"
 
@@ -1308,9 +1197,173 @@ msgstr "Remover"
 msgid "Clear colors"
 msgstr "Limpar cores"
 
+#: classes/pref/filters.php:153
+#, fuzzy
+msgid "Preview article"
+msgstr "Favoritos"
+
+#: classes/pref/filters.php:264
+#: classes/pref/filters.php:558
+msgid "(inverse)"
+msgstr "(invertido)"
+
+#: classes/pref/filters.php:260
+#: classes/pref/filters.php:557
+#, php-format
+msgid "%s on %s in %s %s"
+msgstr ""
+
+#: classes/pref/filters.php:379
+#: classes/pref/filters.php:867
+#: classes/pref/filters.php:981
+msgid "Match"
+msgstr ""
+
+#: classes/pref/filters.php:393
+#: classes/pref/filters.php:450
+#: classes/pref/filters.php:881
+#: classes/pref/filters.php:908
+msgid "Add"
+msgstr ""
+
+#: classes/pref/filters.php:396
+#: classes/pref/filters.php:453
+#: classes/pref/filters.php:884
+#: classes/pref/filters.php:911
+#: classes/feeds.php:122
+msgid "Delete"
+msgstr "Apaga"
+
+#: classes/pref/filters.php:436
+#: classes/pref/filters.php:894
+msgid "Apply actions"
+msgstr "Aplicar ações"
+
+#: classes/pref/filters.php:486
+#: classes/pref/filters.php:923
+msgid "Enabled"
+msgstr "Ativado"
+
+#: classes/pref/filters.php:495
+#: classes/pref/filters.php:926
+#, fuzzy
+msgid "Match any rule"
+msgstr "Favoritos"
+
+#: classes/pref/filters.php:504
+#: classes/pref/filters.php:929
+#, fuzzy
+msgid "Inverse matching"
+msgstr "Favoritos"
+
+#: classes/pref/filters.php:516
+#: classes/pref/filters.php:936
+msgid "Test"
+msgstr "Teste"
+
+#: classes/pref/filters.php:780
+#: classes/pref/users.php:323
+#: classes/pref/feeds.php:1307
+#: classes/feeds.php:1118
+#: classes/feeds.php:1184
+#: js/tt-rss.js:165
+msgid "Search"
+msgstr "Pesquisar"
+
+#: classes/pref/filters.php:796
+msgid "Combine"
+msgstr ""
+
+#: classes/pref/filters.php:799
+#: classes/pref/users.php:345
+msgid "Edit"
+msgstr "Editar"
+
+#: classes/pref/filters.php:802
+#: classes/pref/feeds.php:1327
+#: classes/pref/feeds.php:1341
+msgid "Reset sort order"
+msgstr "Reiniciar ordenação"
+
+#: classes/pref/filters.php:810
+#: classes/pref/feeds.php:1363
+msgid "Rescore articles"
+msgstr "Reclassificar artigos"
+
+#: classes/pref/filters.php:939
+msgid "Create"
+msgstr "Criar"
+
+#: classes/pref/filters.php:993
+msgid "Inverse regular expression matching"
+msgstr "Inverter o teste da expressão regular"
+
+#: classes/pref/filters.php:995
+msgid "on field"
+msgstr "no campo"
+
+#: classes/pref/filters.php:1001
+#: js/PrefFilterTree.js:64
+msgid "in"
+msgstr "em"
+
+#: classes/pref/filters.php:1014
+#, fuzzy
+msgid "Wiki: Filters"
+msgstr "Filtros"
+
+#: classes/pref/filters.php:1019
+msgid "Save rule"
+msgstr "Salvar regra"
+
+#: classes/pref/filters.php:1019
+#: js/functions.js:865
+msgid "Add rule"
+msgstr "Adicionar regra"
+
+#: classes/pref/filters.php:1042
+msgid "Perform Action"
+msgstr "Executar ação"
+
+#: classes/pref/filters.php:1093
+#, fuzzy
+msgid "No actions available"
+msgstr "Nova versão disponível!"
+
+#: classes/pref/filters.php:1112
+msgid "Save action"
+msgstr "Salvar ação"
+
+#: classes/pref/filters.php:1112
+#: js/functions.js:887
+msgid "Add action"
+msgstr "Adicionar ação"
+
+#: classes/pref/filters.php:1136
+msgid "[No caption]"
+msgstr "[Sem título]"
+
+#: classes/pref/filters.php:1138
+#, fuzzy, php-format
+msgid "%s (%d rule)"
+msgid_plural "%s (%d rules)"
+msgstr[0] "Adicionar regra"
+msgstr[1] "Adicionar regra"
+
+#: classes/pref/filters.php:1153
+#, fuzzy
+msgid "matches any rule"
+msgstr "Favoritos"
+
+#: classes/pref/filters.php:1156
+#, fuzzy, php-format
+msgid "%s (+%d action)"
+msgid_plural "%s (+%d actions)"
+msgstr[0] "Adicionar ação"
+msgstr[1] "Adicionar ação"
+
 #: classes/pref/users.php:6
 #: classes/pref/system.php:8
-#: plugins/instances/init.php:154
 msgid "Your access level is insufficient to open this tab."
 msgstr "Seu nível de acesso é insuficiente para abrir esta aba."
 
@@ -1321,8 +1374,8 @@ msgstr "Editar regra"
 
 #: classes/pref/users.php:56
 #: classes/pref/feeds.php:637
-#: classes/pref/feeds.php:878
-#: classes/feeds.php:1075
+#: classes/pref/feeds.php:866
+#: classes/feeds.php:1068
 msgid "Authentication"
 msgstr "Autenticação"
 
@@ -1332,7 +1385,7 @@ msgstr "Nível de acesso:"
 
 #: classes/pref/users.php:77
 #: classes/pref/feeds.php:667
-#: classes/pref/feeds.php:896
+#: classes/pref/feeds.php:884
 msgid "Options"
 msgstr "Opções"
 
@@ -1346,7 +1399,7 @@ msgid "User not found"
 msgstr "Usuário não encontrado"
 
 #: classes/pref/users.php:132
-#: classes/pref/users.php:400
+#: classes/pref/users.php:399
 msgid "Registered"
 msgstr "Registrado"
 
@@ -1364,7 +1417,7 @@ msgid "Stored articles"
 msgstr "Artigos com estrela"
 
 #: classes/pref/users.php:145
-#: classes/pref/users.php:399
+#: classes/pref/users.php:398
 msgid "Subscribed feeds"
 msgstr "Inscrições"
 
@@ -1383,509 +1436,57 @@ msgstr "Não pode criar o usuário <b>%s</b>"
 msgid "User <b>%s</b> already exists."
 msgstr "O usuário <b>%s</b> já existe."
 
-#: classes/pref/users.php:265
+#: classes/pref/users.php:264
 #, php-format
 msgid "Changed password of user <b>%s</b> to <b>%s</b>"
 msgstr "Senha do usuário <b>%s</b>alterada para <b>%s</b>"
 
-#: classes/pref/users.php:267
+#: classes/pref/users.php:266
 #, php-format
 msgid "Sending new password of user <b>%s</b> to <b>%s</b>"
 msgstr "Enviando nova senha do usuário <b>%s</b> para <b>%s</b>"
 
-#: classes/pref/users.php:291
+#: classes/pref/users.php:290
 msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] Notificação de troca de senh"
 
-#: classes/pref/users.php:324
-#: classes/pref/feeds.php:1333
-#: classes/pref/filters.php:740
-#: classes/feeds.php:1125
-#: classes/feeds.php:1191
-#: js/tt-rss.js:165
-msgid "Search"
-msgstr "Pesquisar"
-
-#: classes/pref/users.php:342
+#: classes/pref/users.php:341
 msgid "Create user"
 msgstr "Criar um usuário"
 
-#: classes/pref/users.php:346
-#: classes/pref/filters.php:759
-#: plugins/instances/init.php:293
-msgid "Edit"
-msgstr "Editar"
-
-#: classes/pref/users.php:397
+#: classes/pref/users.php:396
 #: classes/pref/feeds.php:643
-#: classes/pref/feeds.php:882
-#: classes/pref/feeds.php:1836
-#: classes/feeds.php:1079
+#: classes/pref/feeds.php:870
+#: classes/pref/feeds.php:1810
+#: classes/feeds.php:1072
 msgid "Login"
 msgstr "Login"
 
-#: classes/pref/users.php:398
+#: classes/pref/users.php:397
 msgid "Access Level"
 msgstr "Nível de acesso"
 
-#: classes/pref/users.php:401
+#: classes/pref/users.php:400
 msgid "Last login"
 msgstr "Último Login"
 
-#: classes/pref/users.php:420
-#: plugins/instances/init.php:334
+#: classes/pref/users.php:419
 msgid "Click to edit"
 msgstr "Clique para editar"
 
-#: classes/pref/users.php:441
+#: classes/pref/users.php:440
 msgid "No users defined."
 msgstr "Nenhum usuário definido."
 
-#: classes/pref/users.php:443
+#: classes/pref/users.php:442
 msgid "No matching users found."
 msgstr "Nenhum usuário encontrado."
 
-#: classes/pref/system.php:29
-msgid "Error Log"
-msgstr "Registro de erros"
-
-#: classes/pref/system.php:40
-msgid "Refresh"
-msgstr "Atualizar"
-
-#: classes/pref/system.php:43
-msgid "Clear log"
-msgstr "Limpar o log"
-
-#: classes/pref/system.php:48
-msgid "Error"
-msgstr "Erro"
-
-#: classes/pref/system.php:49
-msgid "Filename"
-msgstr "Nome do arquivo"
-
-#: classes/pref/system.php:50
-msgid "Message"
-msgstr "Mensagem"
-
-#: classes/pref/system.php:52
-msgid "Date"
-msgstr "Data"
-
-#: classes/pref/feeds.php:15
-msgid "Check to enable field"
-msgstr "Clique para habilitar campo"
-
-#: classes/pref/feeds.php:65
-#: classes/pref/feeds.php:214
-#: classes/pref/feeds.php:258
-#: classes/pref/feeds.php:264
-#: classes/pref/feeds.php:290
-#, fuzzy, php-format
-msgid "(%d feed)"
-msgid_plural "(%d feeds)"
-msgstr[0] "Editar"
-msgstr[1] "Editar"
-
-#: classes/pref/feeds.php:537
 #: classes/pref/prefs.php:18
+#: classes/pref/feeds.php:537
 msgid "General"
 msgstr "Geral"
 
-#: classes/pref/feeds.php:561
-msgid "Feed Title"
-msgstr "Título da inscrição"
-
-#: classes/pref/feeds.php:595
-#: classes/pref/feeds.php:830
-#: classes/pref/feeds.php:1822
-#: classes/feeds.php:1055
-msgid "Place in category:"
-msgstr "Colocar na categoria:"
-
-#: classes/pref/feeds.php:608
-#: classes/pref/feeds.php:844
-#, fuzzy
-msgid "Language:"
-msgstr "Língua"
-
-#: classes/pref/feeds.php:615
-#: classes/pref/feeds.php:853
-msgid "Update"
-msgstr "Atualizar"
-
-#: classes/pref/feeds.php:630
-#: classes/pref/feeds.php:869
-msgid "Article purging:"
-msgstr "Apagando artigo:"
-
-#: classes/pref/feeds.php:658
-#: classes/pref/feeds.php:890
-#: classes/pref/feeds.php:1839
-#: classes/pref/prefs.php:245
-#: classes/feeds.php:1083
-msgid "Password"
-msgstr "Senha"
-
-#: classes/pref/feeds.php:662
-msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
-msgstr "<b>Hint:</b> Você precisa preencher suas informações de login se a assinatura precisa de autenticação, exceto para as assinaturas do Twitter."
-
-#: classes/pref/feeds.php:681
-#: classes/pref/feeds.php:900
-msgid "Hide from Popular feeds"
-msgstr "Ocultar das inscrições populares"
-
-#: classes/pref/feeds.php:693
-#: classes/pref/feeds.php:906
-msgid "Include in e-mail digest"
-msgstr "Incluir no resumo por e-mail"
-
-#: classes/pref/feeds.php:706
-#: classes/pref/feeds.php:912
-msgid "Always display image attachments"
-msgstr "Sempre mostrar imagens anexas"
-
-#: classes/pref/feeds.php:719
-#: classes/pref/feeds.php:920
-msgid "Do not embed images"
-msgstr "Não embutir imagens"
-
-#: classes/pref/feeds.php:732
-#: classes/pref/feeds.php:928
-msgid "Cache media"
-msgstr ""
-
-#: classes/pref/feeds.php:744
-#: classes/pref/feeds.php:934
-msgid "Mark updated articles as unread"
-msgstr "Marcar artigos atualizados como não lidos"
-
-#: classes/pref/feeds.php:748
-msgid "Icon"
-msgstr "Ícone"
-
-#: classes/pref/feeds.php:765
-msgid "Replace"
-msgstr "Substituir"
-
-#: classes/pref/feeds.php:772
-#: classes/pref/prefs.php:698
-msgid "Plugins"
-msgstr ""
-
-#: classes/pref/feeds.php:792
-msgid "Resubscribe to push updates"
-msgstr "Reassine para atualizar"
-
-#: classes/pref/feeds.php:799
-msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
-msgstr ""
-
-#: classes/pref/feeds.php:1200
-#: classes/pref/feeds.php:1253
-msgid "All done."
-msgstr "Completo."
-
-#: classes/pref/feeds.php:1308
-msgid "Feeds with errors"
-msgstr "Inscrições com erro"
-
-#: classes/pref/feeds.php:1315
-msgid "Inactive feeds"
-msgstr "Inscrições inativas"
-
-#: classes/pref/feeds.php:1351
-msgid "Edit selected feeds"
-msgstr "Editar inscrições selecionadas"
-
-#: classes/pref/feeds.php:1353
-#: classes/pref/feeds.php:1367
-#: classes/pref/filters.php:762
-msgid "Reset sort order"
-msgstr "Reiniciar ordenação"
-
-#: classes/pref/feeds.php:1355
-#: js/prefs.js:1622
-msgid "Batch subscribe"
-msgstr "Assinatura em lote"
-
-#: classes/pref/feeds.php:1362
-msgid "Categories"
-msgstr "Categorias"
-
-#: classes/pref/feeds.php:1365
-msgid "Add category"
-msgstr "Adicionar categoria"
-
-#: classes/pref/feeds.php:1369
-msgid "Remove selected"
-msgstr "Remover selecionados"
-
-#: classes/pref/feeds.php:1380
-msgid "More actions..."
-msgstr "Mais ações..."
-
-#: classes/pref/feeds.php:1384
-msgid "Manual purge"
-msgstr "Apagar manualmente"
-
-#: classes/pref/feeds.php:1388
-msgid "Clear feed data"
-msgstr "Limpar dados da inscrição"
-
-#: classes/pref/feeds.php:1389
-#: classes/pref/filters.php:770
-msgid "Rescore articles"
-msgstr "Reclassificar artigos"
-
-#: classes/pref/feeds.php:1442
-msgid "OPML"
-msgstr "OPML"
-
-#: classes/pref/feeds.php:1444
-msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
-msgstr "Usando OPML você pode exportar e importar suas assinaturas, filtros, marcadores e configurações do Tiny Tin RSS."
-
-#: classes/pref/feeds.php:1445
-msgid "Only main settings profile can be migrated using OPML."
-msgstr ""
-
-#: classes/pref/feeds.php:1458
-msgid "Import my OPML"
-msgstr "Importar OPML"
-
-#: classes/pref/feeds.php:1464
-msgid "Filename:"
-msgstr "Nome do arquivo:"
-
-#: classes/pref/feeds.php:1466
-msgid "Include settings"
-msgstr "Incluir configurações"
-
-#: classes/pref/feeds.php:1470
-msgid "Export OPML"
-msgstr "Exportar OPML"
-
-#: classes/pref/feeds.php:1474
-msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
-msgstr "Seu  OPML pode ser publicado e assinado por qualquer um que conheça a URL abaixo."
-
-#: classes/pref/feeds.php:1478
-msgid "Public OPML URL"
-msgstr "URL OPML pública"
-
-#: classes/pref/feeds.php:1479
-msgid "Display published OPML URL"
-msgstr "Mostrar a URL OPML publicada"
-
-#: classes/pref/feeds.php:1488
-msgid "Firefox integration"
-msgstr "Integração com o firefox"
-
-#: classes/pref/feeds.php:1490
-msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
-msgstr "Este Tiny Tiny RSS pode ser usado como um leitor de feeds no firefox clicando no link abaixo."
-
-#: classes/pref/feeds.php:1497
-msgid "Click here to register this site as a feed reader."
-msgstr "Clique aqui para registrar esse site com um leitor de feeds."
-
-#: classes/pref/feeds.php:1505
-msgid "Published & shared articles / Generated feeds"
-msgstr "Artigos publicados & compartilhados / Feeds gerados"
-
-#: classes/pref/feeds.php:1507
-msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
-msgstr ""
-
-#: classes/pref/feeds.php:1514
-#: classes/feeds.php:54
-#: classes/feeds.php:140
-msgid "View as RSS"
-msgstr "Ver como RSS"
-
-#: classes/pref/feeds.php:1515
-msgid "Display URL"
-msgstr "Mostrar URL"
-
-#: classes/pref/feeds.php:1518
-msgid "Clear all generated URLs"
-msgstr "Limpar todas as URLs geradas"
-
-#: classes/pref/feeds.php:1596
-msgid "These feeds have not been updated with new content for 3 months (oldest first):"
-msgstr "Estas assinaturas não foram atualizadas a 3 meses (mais antiga primeiro):"
-
-#: classes/pref/feeds.php:1630
-#: classes/pref/feeds.php:1694
-msgid "Click to edit feed"
-msgstr "Clique para editar inscrição"
-
-#: classes/pref/feeds.php:1648
-#: classes/pref/feeds.php:1714
-msgid "Unsubscribe from selected feeds"
-msgstr "Cancelar inscrições selecionadas"
-
-#: classes/pref/feeds.php:1819
-msgid "Add one valid RSS feed per line (no feed detection is done)"
-msgstr "Inclua uma assinatura RSS por linha (detecção de feeds não será feita)"
-
-#: classes/pref/feeds.php:1828
-msgid "Feeds to subscribe, One per line"
-msgstr "Feeds para assinar, um por linha"
-
-#: classes/pref/feeds.php:1851
-msgid "Feeds require authentication."
-msgstr "Inscrição requer autenticação."
-
-#: classes/pref/feeds.php:1858
-#: classes/feeds.php:1099
-#: classes/feeds.php:1153
-msgid "Subscribe"
-msgstr "Assinar"
-
-#: classes/pref/filters.php:151
-#, fuzzy
-msgid "Preview article"
-msgstr "Favoritos"
-
-#: classes/pref/filters.php:239
-#: classes/pref/filters.php:518
-msgid "(inverse)"
-msgstr "(invertido)"
-
-#: classes/pref/filters.php:235
-#: classes/pref/filters.php:517
-#, php-format
-msgid "%s on %s in %s %s"
-msgstr ""
-
-#: classes/pref/filters.php:354
-#: classes/pref/filters.php:827
-#: classes/pref/filters.php:942
-msgid "Match"
-msgstr ""
-
-#: classes/pref/filters.php:368
-#: classes/pref/filters.php:416
-#: classes/pref/filters.php:841
-#: classes/pref/filters.php:868
-msgid "Add"
-msgstr ""
-
-#: classes/pref/filters.php:371
-#: classes/pref/filters.php:419
-#: classes/pref/filters.php:844
-#: classes/pref/filters.php:871
-#: classes/feeds.php:122
-msgid "Delete"
-msgstr "Apaga"
-
-#: classes/pref/filters.php:402
-#: classes/pref/filters.php:854
-msgid "Apply actions"
-msgstr "Aplicar ações"
-
-#: classes/pref/filters.php:452
-#: classes/pref/filters.php:883
-msgid "Enabled"
-msgstr "Ativado"
-
-#: classes/pref/filters.php:461
-#: classes/pref/filters.php:886
-#, fuzzy
-msgid "Match any rule"
-msgstr "Favoritos"
-
-#: classes/pref/filters.php:470
-#: classes/pref/filters.php:889
-#, fuzzy
-msgid "Inverse matching"
-msgstr "Favoritos"
-
-#: classes/pref/filters.php:482
-#: classes/pref/filters.php:896
-msgid "Test"
-msgstr "Teste"
-
-#: classes/pref/filters.php:756
-msgid "Combine"
-msgstr ""
-
-#: classes/pref/filters.php:899
-msgid "Create"
-msgstr "Criar"
-
-#: classes/pref/filters.php:954
-msgid "Inverse regular expression matching"
-msgstr "Inverter o teste da expressão regular"
-
-#: classes/pref/filters.php:956
-msgid "on field"
-msgstr "no campo"
-
-#: classes/pref/filters.php:962
-#: js/PrefFilterTree.js:64
-msgid "in"
-msgstr "em"
-
-#: classes/pref/filters.php:975
-#, fuzzy
-msgid "Wiki: Filters"
-msgstr "Filtros"
-
-#: classes/pref/filters.php:980
-msgid "Save rule"
-msgstr "Salvar regra"
-
-#: classes/pref/filters.php:980
-#: js/functions.js:865
-msgid "Add rule"
-msgstr "Adicionar regra"
-
-#: classes/pref/filters.php:1003
-msgid "Perform Action"
-msgstr "Executar ação"
-
-#: classes/pref/filters.php:1054
-#, fuzzy
-msgid "No actions available"
-msgstr "Nova versão disponível!"
-
-#: classes/pref/filters.php:1073
-msgid "Save action"
-msgstr "Salvar ação"
-
-#: classes/pref/filters.php:1073
-#: js/functions.js:887
-msgid "Add action"
-msgstr "Adicionar ação"
-
-#: classes/pref/filters.php:1097
-msgid "[No caption]"
-msgstr "[Sem título]"
-
-#: classes/pref/filters.php:1099
-#, fuzzy, php-format
-msgid "%s (%d rule)"
-msgid_plural "%s (%d rules)"
-msgstr[0] "Adicionar regra"
-msgstr[1] "Adicionar regra"
-
-#: classes/pref/filters.php:1114
-#, fuzzy
-msgid "matches any rule"
-msgstr "Favoritos"
-
-#: classes/pref/filters.php:1117
-#, fuzzy, php-format
-msgid "%s (+%d action)"
-msgid_plural "%s (+%d actions)"
-msgstr[0] "Adicionar ação"
-msgstr[1] "Adicionar ação"
-
 #: classes/pref/prefs.php:19
 msgid "Interface"
 msgstr "Interface"
@@ -2059,7 +1660,7 @@ msgid "Strip all but most common HTML tags when reading articles."
 msgstr "Remover todas as tags HTML exceto as mais comuns ao ler artigos."
 
 #: classes/pref/prefs.php:53
-#: js/prefs.js:1584
+#: js/prefs.js:1580
 msgid "Customize stylesheet"
 msgstr "Personalize a folha de estilo"
 
@@ -2127,6 +1728,14 @@ msgstr "Nível de acesso"
 msgid "Save data"
 msgstr "Salvar"
 
+#: classes/pref/prefs.php:245
+#: classes/pref/feeds.php:658
+#: classes/pref/feeds.php:878
+#: classes/pref/feeds.php:1813
+#: classes/feeds.php:1076
+msgid "Password"
+msgstr "Senha"
+
 #: classes/pref/prefs.php:254
 msgid "Your password is at default value, please change it."
 msgstr "Sua senha é a padrão, você deve mudá-la."
@@ -2225,18 +1834,23 @@ msgstr "Gerenciar perfis"
 msgid "Reset to defaults"
 msgstr "Reiniciar para o padrão"
 
+#: classes/pref/prefs.php:698
+#: classes/pref/feeds.php:772
+msgid "Plugins"
+msgstr ""
+
 #: classes/pref/prefs.php:700
 msgid "You will need to reload Tiny Tiny RSS for plugin changes to take effect."
 msgstr "Você precisa reiniciar o TT-RSS para que as mudanças de plugin façam efeito."
 
-#: classes/pref/prefs.php:702
-msgid "Download more plugins at tt-rss.org <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forums</a> or <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a>."
-msgstr "Obtenha mais plugins no <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forum</a> ou <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a> do tt-rss."
-
-#: classes/pref/prefs.php:732
+#: classes/pref/prefs.php:730
 msgid "System plugins"
 msgstr "Plugins de sistema"
 
+#: classes/pref/prefs.php:731
+msgid "System plugins are enabled in <strong>config.php</strong> for all users."
+msgstr ""
+
 #: classes/pref/prefs.php:736
 #: classes/pref/prefs.php:792
 msgid "Plugin"
@@ -2306,6 +1920,340 @@ msgstr "Remover os perfis selecionados?"
 msgid "Activate profile"
 msgstr "Ativar perfil"
 
+#: classes/pref/feeds.php:15
+msgid "Check to enable field"
+msgstr "Clique para habilitar campo"
+
+#: classes/pref/feeds.php:65
+#: classes/pref/feeds.php:214
+#: classes/pref/feeds.php:258
+#: classes/pref/feeds.php:264
+#: classes/pref/feeds.php:290
+#, fuzzy, php-format
+msgid "(%d feed)"
+msgid_plural "(%d feeds)"
+msgstr[0] "Editar"
+msgstr[1] "Editar"
+
+#: classes/pref/feeds.php:561
+msgid "Feed Title"
+msgstr "Título da inscrição"
+
+#: classes/pref/feeds.php:595
+#: classes/pref/feeds.php:818
+#: classes/pref/feeds.php:1796
+#: classes/feeds.php:1048
+msgid "Place in category:"
+msgstr "Colocar na categoria:"
+
+#: classes/pref/feeds.php:608
+#: classes/pref/feeds.php:832
+#, fuzzy
+msgid "Language:"
+msgstr "Língua"
+
+#: classes/pref/feeds.php:615
+#: classes/pref/feeds.php:841
+msgid "Update"
+msgstr "Atualizar"
+
+#: classes/pref/feeds.php:630
+#: classes/pref/feeds.php:857
+msgid "Article purging:"
+msgstr "Apagando artigo:"
+
+#: classes/pref/feeds.php:662
+msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
+msgstr "<b>Hint:</b> Você precisa preencher suas informações de login se a assinatura precisa de autenticação, exceto para as assinaturas do Twitter."
+
+#: classes/pref/feeds.php:681
+#: classes/pref/feeds.php:888
+msgid "Hide from Popular feeds"
+msgstr "Ocultar das inscrições populares"
+
+#: classes/pref/feeds.php:693
+#: classes/pref/feeds.php:894
+msgid "Include in e-mail digest"
+msgstr "Incluir no resumo por e-mail"
+
+#: classes/pref/feeds.php:706
+#: classes/pref/feeds.php:900
+msgid "Always display image attachments"
+msgstr "Sempre mostrar imagens anexas"
+
+#: classes/pref/feeds.php:719
+#: classes/pref/feeds.php:908
+msgid "Do not embed images"
+msgstr "Não embutir imagens"
+
+#: classes/pref/feeds.php:732
+#: classes/pref/feeds.php:916
+msgid "Cache media"
+msgstr ""
+
+#: classes/pref/feeds.php:744
+#: classes/pref/feeds.php:922
+msgid "Mark updated articles as unread"
+msgstr "Marcar artigos atualizados como não lidos"
+
+#: classes/pref/feeds.php:748
+msgid "Icon"
+msgstr "Ícone"
+
+#: classes/pref/feeds.php:765
+msgid "Replace"
+msgstr "Substituir"
+
+#: classes/pref/feeds.php:1174
+#: classes/pref/feeds.php:1227
+msgid "All done."
+msgstr "Completo."
+
+#: classes/pref/feeds.php:1282
+msgid "Feeds with errors"
+msgstr "Inscrições com erro"
+
+#: classes/pref/feeds.php:1289
+msgid "Inactive feeds"
+msgstr "Inscrições inativas"
+
+#: classes/pref/feeds.php:1325
+msgid "Edit selected feeds"
+msgstr "Editar inscrições selecionadas"
+
+#: classes/pref/feeds.php:1329
+#: js/prefs.js:1618
+msgid "Batch subscribe"
+msgstr "Assinatura em lote"
+
+#: classes/pref/feeds.php:1336
+msgid "Categories"
+msgstr "Categorias"
+
+#: classes/pref/feeds.php:1339
+msgid "Add category"
+msgstr "Adicionar categoria"
+
+#: classes/pref/feeds.php:1343
+msgid "Remove selected"
+msgstr "Remover selecionados"
+
+#: classes/pref/feeds.php:1354
+msgid "More actions..."
+msgstr "Mais ações..."
+
+#: classes/pref/feeds.php:1358
+msgid "Manual purge"
+msgstr "Apagar manualmente"
+
+#: classes/pref/feeds.php:1362
+msgid "Clear feed data"
+msgstr "Limpar dados da inscrição"
+
+#: classes/pref/feeds.php:1416
+msgid "OPML"
+msgstr "OPML"
+
+#: classes/pref/feeds.php:1418
+msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
+msgstr "Usando OPML você pode exportar e importar suas assinaturas, filtros, marcadores e configurações do Tiny Tin RSS."
+
+#: classes/pref/feeds.php:1419
+msgid "Only main settings profile can be migrated using OPML."
+msgstr ""
+
+#: classes/pref/feeds.php:1432
+msgid "Import my OPML"
+msgstr "Importar OPML"
+
+#: classes/pref/feeds.php:1438
+msgid "Filename:"
+msgstr "Nome do arquivo:"
+
+#: classes/pref/feeds.php:1440
+msgid "Include settings"
+msgstr "Incluir configurações"
+
+#: classes/pref/feeds.php:1444
+msgid "Export OPML"
+msgstr "Exportar OPML"
+
+#: classes/pref/feeds.php:1448
+msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
+msgstr "Seu  OPML pode ser publicado e assinado por qualquer um que conheça a URL abaixo."
+
+#: classes/pref/feeds.php:1452
+msgid "Public OPML URL"
+msgstr "URL OPML pública"
+
+#: classes/pref/feeds.php:1453
+msgid "Display published OPML URL"
+msgstr "Mostrar a URL OPML publicada"
+
+#: classes/pref/feeds.php:1462
+msgid "Firefox integration"
+msgstr "Integração com o firefox"
+
+#: classes/pref/feeds.php:1464
+msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
+msgstr "Este Tiny Tiny RSS pode ser usado como um leitor de feeds no firefox clicando no link abaixo."
+
+#: classes/pref/feeds.php:1471
+msgid "Click here to register this site as a feed reader."
+msgstr "Clique aqui para registrar esse site com um leitor de feeds."
+
+#: classes/pref/feeds.php:1479
+msgid "Published & shared articles / Generated feeds"
+msgstr "Artigos publicados & compartilhados / Feeds gerados"
+
+#: classes/pref/feeds.php:1481
+msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
+msgstr ""
+
+#: classes/pref/feeds.php:1488
+#: classes/feeds.php:54
+#: classes/feeds.php:140
+msgid "View as RSS"
+msgstr "Ver como RSS"
+
+#: classes/pref/feeds.php:1489
+msgid "Display URL"
+msgstr "Mostrar URL"
+
+#: classes/pref/feeds.php:1492
+msgid "Clear all generated URLs"
+msgstr "Limpar todas as URLs geradas"
+
+#: classes/pref/feeds.php:1570
+msgid "These feeds have not been updated with new content for 3 months (oldest first):"
+msgstr "Estas assinaturas não foram atualizadas a 3 meses (mais antiga primeiro):"
+
+#: classes/pref/feeds.php:1604
+#: classes/pref/feeds.php:1668
+msgid "Click to edit feed"
+msgstr "Clique para editar inscrição"
+
+#: classes/pref/feeds.php:1622
+#: classes/pref/feeds.php:1688
+msgid "Unsubscribe from selected feeds"
+msgstr "Cancelar inscrições selecionadas"
+
+#: classes/pref/feeds.php:1793
+msgid "Add one valid RSS feed per line (no feed detection is done)"
+msgstr "Inclua uma assinatura RSS por linha (detecção de feeds não será feita)"
+
+#: classes/pref/feeds.php:1802
+msgid "Feeds to subscribe, One per line"
+msgstr "Feeds para assinar, um por linha"
+
+#: classes/pref/feeds.php:1825
+msgid "Feeds require authentication."
+msgstr "Inscrição requer autenticação."
+
+#: classes/pref/feeds.php:1832
+#: classes/feeds.php:1092
+#: classes/feeds.php:1146
+msgid "Subscribe"
+msgstr "Assinar"
+
+#: classes/pref/system.php:29
+msgid "Error Log"
+msgstr "Registro de erros"
+
+#: classes/pref/system.php:40
+msgid "Refresh"
+msgstr "Atualizar"
+
+#: classes/pref/system.php:43
+msgid "Clear log"
+msgstr "Limpar o log"
+
+#: classes/pref/system.php:48
+msgid "Error"
+msgstr "Erro"
+
+#: classes/pref/system.php:49
+msgid "Filename"
+msgstr "Nome do arquivo"
+
+#: classes/pref/system.php:50
+msgid "Message"
+msgstr "Mensagem"
+
+#: classes/pref/system.php:52
+msgid "Date"
+msgstr "Data"
+
+#: classes/opml.php:28
+#: classes/opml.php:33
+msgid "OPML Utility"
+msgstr "Utilitário OPML"
+
+#: classes/opml.php:37
+msgid "Importing OPML..."
+msgstr "Importando OPML..."
+
+#: classes/opml.php:41
+msgid "Return to preferences"
+msgstr "Retornar às preferências"
+
+#: classes/opml.php:295
+#, php-format
+msgid "Adding feed: %s"
+msgstr "Adicionando feed: %s"
+
+#: classes/opml.php:306
+#, php-format
+msgid "Duplicate feed: %s"
+msgstr "Feed duplicado: %s"
+
+#: classes/opml.php:320
+#, php-format
+msgid "Adding label %s"
+msgstr "Adicionando marcador %s"
+
+#: classes/opml.php:323
+#, php-format
+msgid "Duplicate label: %s"
+msgstr "Marcador duplicado: %s"
+
+#: classes/opml.php:335
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr "Ajustando chave de configuração %s para %s"
+
+#: classes/opml.php:367
+msgid "Adding filter..."
+msgstr "Adicionando filtro..."
+
+#: classes/opml.php:486
+#, php-format
+msgid "Processing category: %s"
+msgstr "Processando categoria: %s"
+
+#: classes/opml.php:532
+#, php-format
+msgid "Upload failed with error code %d"
+msgstr "Enviou falhou com o código de erro %d"
+
+#: classes/opml.php:544
+#: plugins/import_export/init.php:448
+msgid "Unable to move uploaded file."
+msgstr "Incapaz de mover arquivo enviado."
+
+#: classes/opml.php:548
+#: plugins/import_export/init.php:452
+msgid "Error: please upload OPML file."
+msgstr "Erro: Por favor envie um arquivo OPML."
+
+#: classes/opml.php:559
+msgid "Error: unable to find moved OPML file."
+msgstr "Erro: Arquivo OPML movido não foi encontrado"
+
+#: classes/opml.php:566
+msgid "Error while parsing document."
+msgstr "Erro ao processar o documento."
+
 #: classes/feeds.php:53
 msgid "View as RSS feed"
 msgstr "Ver como um feed rss"
@@ -2346,8 +2294,8 @@ msgstr "Retornar"
 
 #: classes/feeds.php:127
 #: classes/feeds.php:132
-#: plugins/mail/init.php:75
 #: plugins/mailto/init.php:25
+#: plugins/mail/init.php:75
 msgid "Forward by email"
 msgstr "Encaminhar por e-mail"
 
@@ -2355,320 +2303,146 @@ msgstr "Encaminhar por e-mail"
 msgid "Feed:"
 msgstr "Feed:"
 
-#: classes/feeds.php:229
-#: classes/feeds.php:892
+#: classes/feeds.php:228
+#: classes/feeds.php:885
 msgid "Feed not found."
 msgstr "Feed não encontrado."
 
-#: classes/feeds.php:300
+#: classes/feeds.php:291
 msgid "Never"
 msgstr "Nunca"
 
-#: classes/feeds.php:413
+#: classes/feeds.php:405
 #, php-format
 msgid "Imported at %s"
 msgstr "Importado em %s"
 
-#: classes/feeds.php:472
-#: classes/feeds.php:569
+#: classes/feeds.php:464
+#: classes/feeds.php:561
 #, fuzzy
 msgid "mark feed as read"
 msgstr "Marcar como lido"
 
-#: classes/feeds.php:630
+#: classes/feeds.php:622
 msgid "Collapse article"
 msgstr "Fechar artigo"
 
-#: classes/feeds.php:791
+#: classes/feeds.php:784
 msgid "No unread articles found to display."
 msgstr "Sem artigos não lidos para exibir."
 
-#: classes/feeds.php:794
+#: classes/feeds.php:787
 msgid "No updated articles found to display."
 msgstr "Sem artigos atualizados para exibir."
 
-#: classes/feeds.php:797
+#: classes/feeds.php:790
 msgid "No starred articles found to display."
 msgstr "Sem artigos com estrela para exibir."
 
-#: classes/feeds.php:801
+#: classes/feeds.php:794
 msgid "No articles found to display. You can assign articles to labels manually from article header context menu (applies to all selected articles) or use a filter."
 msgstr "Nenhum artigo encontrado para mostrar. Você pode associar artigos a marcadores manualmente pelo menu de contexto no título (altera todos os artigos selecionados) ou usar um filtro."
 
-#: classes/feeds.php:803
+#: classes/feeds.php:796
 msgid "No articles found to display."
 msgstr "Nenhum artigo foi encontrado para exibir."
 
-#: classes/feeds.php:818
-#: classes/feeds.php:992
+#: classes/feeds.php:811
+#: classes/feeds.php:985
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "Inscrições atualizadas em %s"
 
-#: classes/feeds.php:828
-#: classes/feeds.php:1002
+#: classes/feeds.php:821
+#: classes/feeds.php:995
 msgid "Some feeds have update errors (click for details)"
 msgstr "Alguns feeds estão com erros (clique aqui para detalhes)"
 
-#: classes/feeds.php:982
+#: classes/feeds.php:975
 msgid "No feed selected."
 msgstr "Nenhum feed foi selecionado."
 
-#: classes/feeds.php:1041
-#: classes/feeds.php:1049
+#: classes/feeds.php:1034
+#: classes/feeds.php:1042
 msgid "Feed or site URL"
 msgstr "URL do site ou feed"
 
-#: classes/feeds.php:1063
+#: classes/feeds.php:1056
 msgid "Available feeds"
 msgstr "Feeds disponíveis"
 
-#: classes/feeds.php:1094
+#: classes/feeds.php:1087
 msgid "This feed requires authentication."
 msgstr "Este feed requer autenticação."
 
-#: classes/feeds.php:1102
+#: classes/feeds.php:1095
 msgid "More feeds"
 msgstr "Mais inscrições"
 
-#: classes/feeds.php:1129
+#: classes/feeds.php:1122
 msgid "Popular feeds"
 msgstr "Inscrições populares"
 
-#: classes/feeds.php:1130
+#: classes/feeds.php:1123
 msgid "Feed archive"
 msgstr "Arquivo de inscrições"
 
-#: classes/feeds.php:1133
+#: classes/feeds.php:1126
 msgid "limit:"
 msgstr "limite:"
 
-#: classes/feeds.php:1165
+#: classes/feeds.php:1158
 msgid "Look for"
 msgstr "Procurar por"
 
-#: classes/feeds.php:1173
+#: classes/feeds.php:1166
 #, php-format
 msgid "in %s"
 msgstr ""
 
-#: classes/feeds.php:1178
+#: classes/feeds.php:1171
 msgid "Used for word stemming"
 msgstr ""
 
-#: classes/feeds.php:1187
+#: classes/feeds.php:1180
 #, fuzzy
 msgid "Search syntax"
 msgstr "Pesquisar"
 
-#: plugins/instances/init.php:141
-#, fuzzy
-msgid "Linked"
-msgstr "Link"
-
-#: plugins/instances/init.php:204
-#: plugins/instances/init.php:395
-msgid "Instance"
-msgstr "Instância"
-
-#: plugins/instances/init.php:215
-#: plugins/instances/init.php:312
-#: plugins/instances/init.php:404
-msgid "Instance URL"
-msgstr "URL da instância"
-
-#: plugins/instances/init.php:226
-#: plugins/instances/init.php:414
-msgid "Access key:"
-msgstr "Chave de acesso:"
-
-#: plugins/instances/init.php:229
-#: plugins/instances/init.php:313
-#: plugins/instances/init.php:417
-msgid "Access key"
-msgstr "Chave de acesso"
-
-#: plugins/instances/init.php:233
-#: plugins/instances/init.php:421
-msgid "Use one access key for both linked instances."
-msgstr "Use uma chave de acesso para ambas as instâncias."
-
-#: plugins/instances/init.php:241
-#: plugins/instances/init.php:429
-msgid "Generate new key"
-msgstr "Gerar uma nova chave"
-
-#: plugins/instances/init.php:292
-msgid "Link instance"
-msgstr "Conectar instância"
-
-#: plugins/instances/init.php:304
-msgid "You can connect other instances of Tiny Tiny RSS to this one to share Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
-msgstr "Você pode conectar outras instâncias to Tiny Tiny RSS a esta para compartilhar assinaturas populares. Conecte a esta instância do Tiny Tiny RSS usando esta URL:"
-
-#: plugins/instances/init.php:314
-msgid "Last connected"
-msgstr "Última conexão"
-
-#: plugins/instances/init.php:315
-msgid "Status"
-msgstr ""
-
-#: plugins/instances/init.php:316
-msgid "Stored feeds"
-msgstr "Inscrições armazenadas"
+#: classes/feeds.php:1596
+msgid "Starred articles"
+msgstr "Artigos com estrela"
 
-#: plugins/instances/init.php:433
-msgid "Create link"
-msgstr "Criar link"
+#: classes/feeds.php:1598
+msgid "Published articles"
+msgstr "Artigos publicados"
 
-#: plugins/nsfw/init.php:30
-#: plugins/nsfw/init.php:42
-msgid "Not work safe (click to toggle)"
-msgstr ""
+#: classes/feeds.php:1600
+msgid "Fresh articles"
+msgstr "Últimas notícias"
 
-#: plugins/nsfw/init.php:52
-msgid "NSFW Plugin"
-msgstr ""
+#: classes/feeds.php:1604
+msgid "Archived articles"
+msgstr "Artigos arquivados"
 
-#: plugins/nsfw/init.php:79
-msgid "Tags to consider NSFW (comma-separated)"
-msgstr "Tags para considerar NSFW (separadas por vírgula)"
+#: classes/feeds.php:1606
+msgid "Recently read"
+msgstr "Lidos recentemente"
 
-#: plugins/nsfw/init.php:100
-msgid "Configuration saved."
-msgstr "Configuração salva."
+#: classes/feeds.php:1716
+msgid "Special"
+msgstr "Especial"
 
-#: plugins/note/init.php:26
-#: plugins/note/note.js:11
-msgid "Edit article note"
-msgstr "Editar anotação sobre o artigo"
+#: classes/feeds.php:1962
+#, php-format
+msgid "Search results: %s"
+msgstr "Resultados da pesquisa: %s"
 
 #: plugins/vf_shared/init.php:16
-#: plugins/vf_shared/init.php:69
+#: plugins/vf_shared/init.php:60
 msgid "Shared articles"
 msgstr "Artigos compartilhados"
 
-#: plugins/auth_internal/init.php:65
-msgid "Please enter your one time password:"
-msgstr "Por favor, entre sua senha temporária"
-
-#: plugins/auth_internal/init.php:188
-msgid "Password has been changed."
-msgstr "Senha foi alterada."
-
-#: plugins/auth_internal/init.php:190
-msgid "Old password is incorrect."
-msgstr "Senha antiga incorreta"
-
-#: plugins/af_readability/init.php:21
-msgid "Data saved."
-msgstr ""
-
-#: plugins/af_readability/init.php:33
-#, fuzzy
-msgid "Inline content"
-msgstr "Editar anotação sobre o artigo"
-
-#: plugins/af_readability/init.php:39
-msgid "Readability settings (af_readability)"
-msgstr ""
-
-#: plugins/af_readability/init.php:66
-msgid "Use Readability for pages shared via bookmarklet."
-msgstr ""
-
-#: plugins/af_readability/init.php:78
-#: plugins/af_psql_trgm/init.php:191
-msgid "Currently enabled for (click to edit):"
-msgstr ""
-
-#: plugins/af_readability/init.php:95
-#, fuzzy
-msgid "Readability"
-msgstr "Verificar disponibilidade"
-
-#: plugins/af_readability/init.php:106
-#, fuzzy
-msgid "Inline article content"
-msgstr "Editar anotação sobre o artigo"
-
-#: plugins/af_redditimgur/init.php:25
-msgid "Reddit content settings (af_redditimgur)"
-msgstr ""
-
-#: plugins/af_redditimgur/init.php:50
-msgid "Uses Readability (full-text-rss) implementation by <a target='_blank' href='https://bitbucket.org/fivefilters/'>FiveFilters.org</a>"
-msgstr ""
-
-#: plugins/af_redditimgur/init.php:54
-msgid "Extract missing content using Readability"
-msgstr ""
-
-#: plugins/af_redditimgur/init.php:59
-msgid "Enable additional duplicate checking"
-msgstr ""
-
-#: plugins/af_redditimgur/init.php:73
-#: plugins/af_zz_imgproxy/init.php:225
-#, fuzzy
-msgid "Configuration saved"
-msgstr "Configuração salva."
-
-#: plugins/af_psql_trgm/init.php:28
-#, php-format
-msgid "Data saved (%s, %d)"
-msgstr ""
-
-#: plugins/af_psql_trgm/init.php:112
-#, fuzzy
-msgid "Show related articles"
-msgstr "Artigos compartilhados"
-
-#: plugins/af_psql_trgm/init.php:118
-#: plugins/af_psql_trgm/init.php:220
-#, fuzzy
-msgid "Mark similar articles as read"
-msgstr "Marcar todos os artigos como lidos?"
-
-#: plugins/af_psql_trgm/init.php:157
-msgid "PostgreSQL trigram extension returns string similarity as a floating point number (0-1). Setting it too low might produce false positives, zero disables checking."
-msgstr ""
-
-#: plugins/af_psql_trgm/init.php:160
-#, fuzzy
-msgid "Global settings"
-msgstr "Incluir configurações"
-
-#: plugins/af_psql_trgm/init.php:164
-msgid "Minimum similarity:"
-msgstr ""
-
-#: plugins/af_psql_trgm/init.php:169
-msgid "Minimum title length:"
-msgstr ""
-
-#: plugins/af_psql_trgm/init.php:174
-#, fuzzy
-msgid "Enable for all feeds:"
-msgstr "Favoritos"
-
-#: plugins/af_psql_trgm/init.php:209
-msgid "Similarity (pg_trgm)"
-msgstr ""
-
-#: plugins/af_comics/init.php:40
-msgid "Feeds supported by af_comics"
-msgstr ""
-
-#: plugins/af_comics/init.php:42
-msgid "The following comics are currently supported:"
-msgstr ""
-
-#: plugins/af_comics/init.php:60
-msgid "GoComics requires a specific URL to workaround their lack of feed support: <code>http://feeds.feedburner.com/uclick/<em>comic_name</em></code> (e.g. <code>http://www.gocomics.com/garfield</code> uses <code>http://feeds.feedburner.com/uclick/garfield</code>)."
-msgstr ""
-
 #: plugins/import_export/init.php:58
 msgid "Import and export"
 msgstr "Importar e exportar"
@@ -2685,96 +2459,83 @@ msgstr "Exportar meus dados"
 msgid "Import"
 msgstr "Importar"
 
-#: plugins/import_export/init.php:225
+#: plugins/import_export/init.php:231
 msgid "Could not import: incorrect schema version."
 msgstr ""
 
-#: plugins/import_export/init.php:230
+#: plugins/import_export/init.php:236
 msgid "Could not import: unrecognized document format."
 msgstr "Não foi possível importar: Formato de documento desconhecido."
 
-#: plugins/import_export/init.php:391
+#: plugins/import_export/init.php:397
 msgid "Finished: "
 msgstr "Terminado:"
 
-#: plugins/import_export/init.php:392
+#: plugins/import_export/init.php:398
 #, php-format
 msgid "%d article processed, "
 msgid_plural "%d articles processed, "
 msgstr[0] "%d artigo processado, "
 msgstr[1] "%d artigos processados, "
 
-#: plugins/import_export/init.php:393
+#: plugins/import_export/init.php:399
 #, php-format
 msgid "%d imported, "
 msgid_plural "%d imported, "
 msgstr[0] "%d importado, "
 msgstr[1] "%d importados, "
 
-#: plugins/import_export/init.php:394
+#: plugins/import_export/init.php:400
 #, php-format
 msgid "%d feed created."
 msgid_plural "%d feeds created."
 msgstr[0] "%d feed criado."
 msgstr[1] "%d feeds criados."
 
-#: plugins/import_export/init.php:399
+#: plugins/import_export/init.php:405
 msgid "Could not load XML document."
 msgstr "Não foi possível ler o documento XML."
 
-#: plugins/import_export/init.php:411
+#: plugins/import_export/init.php:417
 msgid "Prepare data"
 msgstr "Preparar dados"
 
-#: plugins/import_export/init.php:428
+#: plugins/import_export/init.php:434
 #, fuzzy, php-format
 msgid "Upload failed with error code %d (%s)"
 msgstr "Enviou falhou com o código de erro %d"
 
-#: plugins/import_export/init.php:454
+#: plugins/import_export/init.php:460
 msgid "No file uploaded."
 msgstr "Nenhum arquivo enviado."
 
-#: plugins/mail/init.php:28
-msgid "Mail addresses saved."
-msgstr ""
-
-#: plugins/mail/init.php:34
-#, fuzzy
-msgid "Mail plugin"
-msgstr "Plugins de usuário"
-
-#: plugins/mail/init.php:36
-msgid "You can set predefined email addressed here (comma-separated list):"
-msgstr ""
-
+#: plugins/mailto/init.php:48
+#: plugins/mailto/init.php:54
 #: plugins/mail/init.php:112
 #: plugins/mail/init.php:118
-#: plugins/mailto/init.php:49
-#: plugins/mailto/init.php:55
 msgid "[Forwarded]"
 msgstr "[Encaminhado]"
 
+#: plugins/mailto/init.php:48
 #: plugins/mail/init.php:112
-#: plugins/mailto/init.php:49
 msgid "Multiple articles"
 msgstr "Múltiplos artigos"
 
-#: plugins/mail/init.php:140
-msgid "To:"
-msgstr "Para:"
+#: plugins/mailto/init.php:70
+msgid "Clicking the following link to invoke your mail client:"
+msgstr "Clique no link seguinte para ativar seu cliente de e-mail:"
 
-#: plugins/mail/init.php:155
-msgid "Subject:"
-msgstr "Assunto:"
+#: plugins/mailto/init.php:74
+msgid "Forward selected article(s) by email."
+msgstr "Encaminhar artigo(s) selecionados por e-mail."
 
-#: plugins/mail/init.php:172
-msgid "Send e-mail"
-msgstr "Enviar e-mail"
+#: plugins/mailto/init.php:77
+msgid "You should be able to edit the message before sending in your mail client."
+msgstr "Você deve poder editar a mensagem antes de enviar em seu cliente de e-mail."
 
-#: plugins/close_button/init.php:22
-msgid "Close article"
-msgstr "Fechar artigo"
+#: plugins/mailto/init.php:82
+msgid "Close this dialog"
+msgstr "Fechar esta janela"
 
 #: plugins/bookmarklets/init.php:20
 msgid "Bookmarklets"
@@ -2797,35 +2558,126 @@ msgstr "Assinar em TT-Rss"
 msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
 msgstr ""
 
+#: plugins/af_psql_trgm/init.php:28
+#, php-format
+msgid "Data saved (%s, %d)"
+msgstr ""
+
+#: plugins/af_psql_trgm/init.php:112
+#, fuzzy
+msgid "Show related articles"
+msgstr "Artigos compartilhados"
+
+#: plugins/af_psql_trgm/init.php:118
+#: plugins/af_psql_trgm/init.php:220
+#, fuzzy
+msgid "Mark similar articles as read"
+msgstr "Marcar todos os artigos como lidos?"
+
+#: plugins/af_psql_trgm/init.php:157
+msgid "PostgreSQL trigram extension returns string similarity as a floating point number (0-1). Setting it too low might produce false positives, zero disables checking."
+msgstr ""
+
+#: plugins/af_psql_trgm/init.php:160
+#, fuzzy
+msgid "Global settings"
+msgstr "Incluir configurações"
+
+#: plugins/af_psql_trgm/init.php:164
+msgid "Minimum similarity:"
+msgstr ""
+
+#: plugins/af_psql_trgm/init.php:169
+msgid "Minimum title length:"
+msgstr ""
+
+#: plugins/af_psql_trgm/init.php:174
+#, fuzzy
+msgid "Enable for all feeds:"
+msgstr "Favoritos"
+
+#: plugins/af_psql_trgm/init.php:191
+#: plugins/af_readability/init.php:78
+msgid "Currently enabled for (click to edit):"
+msgstr ""
+
+#: plugins/af_psql_trgm/init.php:209
+msgid "Similarity (pg_trgm)"
+msgstr ""
+
+#: plugins/nsfw/init.php:30
+#: plugins/nsfw/init.php:42
+msgid "Not work safe (click to toggle)"
+msgstr ""
+
+#: plugins/nsfw/init.php:52
+msgid "NSFW Plugin"
+msgstr ""
+
+#: plugins/nsfw/init.php:79
+msgid "Tags to consider NSFW (comma-separated)"
+msgstr "Tags para considerar NSFW (separadas por vírgula)"
+
+#: plugins/nsfw/init.php:100
+msgid "Configuration saved."
+msgstr "Configuração salva."
+
 #: plugins/toggle_sidebar/init.php:23
 #, fuzzy
 msgid "Collapse feedlist"
 msgstr "Fechar lista de feeds"
 
-#: plugins/af_zz_imgproxy/init.php:186
-msgid "Image proxy settings (af_zz_imgproxy)"
+#: plugins/af_readability/init.php:21
+msgid "Data saved."
 msgstr ""
 
-#: plugins/af_zz_imgproxy/init.php:211
+#: plugins/af_readability/init.php:33
 #, fuzzy
-msgid "Enable proxy for all remote images."
-msgstr "Favoritos"
+msgid "Inline content"
+msgstr "Editar anotação sobre o artigo"
 
-#: plugins/mailto/init.php:71
-msgid "Clicking the following link to invoke your mail client:"
-msgstr "Clique no link seguinte para ativar seu cliente de e-mail:"
+#: plugins/af_readability/init.php:39
+msgid "Readability settings (af_readability)"
+msgstr ""
 
-#: plugins/mailto/init.php:75
-msgid "Forward selected article(s) by email."
-msgstr "Encaminhar artigo(s) selecionados por e-mail."
+#: plugins/af_readability/init.php:66
+msgid "Use Readability for pages shared via bookmarklet."
+msgstr ""
 
-#: plugins/mailto/init.php:78
-msgid "You should be able to edit the message before sending in your mail client."
-msgstr "Você deve poder editar a mensagem antes de enviar em seu cliente de e-mail."
+#: plugins/af_readability/init.php:95
+#, fuzzy
+msgid "Readability"
+msgstr "Verificar disponibilidade"
 
-#: plugins/mailto/init.php:83
-msgid "Close this dialog"
-msgstr "Fechar esta janela"
+#: plugins/af_readability/init.php:106
+#, fuzzy
+msgid "Inline article content"
+msgstr "Editar anotação sobre o artigo"
+
+#: plugins/mail/init.php:28
+msgid "Mail addresses saved."
+msgstr ""
+
+#: plugins/mail/init.php:34
+#, fuzzy
+msgid "Mail plugin"
+msgstr "Plugins de usuário"
+
+#: plugins/mail/init.php:36
+msgid "You can set predefined email addressed here (comma-separated list):"
+msgstr ""
+
+#: plugins/mail/init.php:140
+msgid "To:"
+msgstr "Para:"
+
+#: plugins/mail/init.php:155
+msgid "Subject:"
+msgstr "Assunto:"
+
+#: plugins/mail/init.php:172
+msgid "Send e-mail"
+msgstr "Enviar e-mail"
 
 #: plugins/share/init.php:39
 msgid "You can disable all articles shared by unique URLs here."
@@ -2839,24 +2691,97 @@ msgstr "Cancelar compartilhamento de todos os artigos"
 msgid "Share by URL"
 msgstr "Compartilhar pela URL"
 
-#: plugins/share/init.php:97
+#: plugins/share/init.php:96
 msgid "You can share this article by the following unique URL:"
 msgstr "Você pode compartilhar esse artigo pela seguinte URL:"
 
-#: plugins/share/init.php:115
+#: plugins/share/init.php:114
 msgid "Unshare article"
 msgstr "Remover compartilhamento"
 
+#: plugins/af_comics/init.php:48
+msgid "Feeds supported by af_comics"
+msgstr ""
+
+#: plugins/af_comics/init.php:50
+msgid "The following comics are currently supported:"
+msgstr ""
+
+#: plugins/af_comics/init.php:68
+msgid "GoComics requires a specific URL to workaround their lack of feed support: <code>http://feeds.feedburner.com/uclick/<em>comic_name</em></code> (e.g. <code>http://www.gocomics.com/garfield</code> uses <code>http://feeds.feedburner.com/uclick/garfield</code>)."
+msgstr ""
+
+#: plugins/af_comics/init.php:70
+msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:25
+msgid "Reddit content settings (af_redditimgur)"
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:50
+msgid "Uses Readability (full-text-rss) implementation by <a target='_blank' href='https://bitbucket.org/fivefilters/'>FiveFilters.org</a>"
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:54
+msgid "Extract missing content using Readability"
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:59
+msgid "Enable additional duplicate checking"
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:73
+#: plugins/af_zz_imgproxy/init.php:254
+#, fuzzy
+msgid "Configuration saved"
+msgstr "Configuração salva."
+
+#: plugins/note/init.php:26
+#: plugins/note/note.js:11
+msgid "Edit article note"
+msgstr "Editar anotação sobre o artigo"
+
+#: plugins/close_button/init.php:25
+msgid "Close article"
+msgstr "Fechar artigo"
+
+#: plugins/af_zz_imgproxy/init.php:210
+msgid "Image proxy settings (af_zz_imgproxy)"
+msgstr ""
+
+#: plugins/af_zz_imgproxy/init.php:234
+#, fuzzy
+msgid "Enable proxy for all remote images."
+msgstr "Favoritos"
+
+#: plugins/af_zz_imgproxy/init.php:238
+#, fuzzy
+msgid "Don't cache files locally."
+msgstr "Guardar imagens no cache local"
+
+#: plugins/auth_internal/init.php:65
+msgid "Please enter your one time password:"
+msgstr "Por favor, entre sua senha temporária"
+
+#: plugins/auth_internal/init.php:188
+msgid "Password has been changed."
+msgstr "Senha foi alterada."
+
+#: plugins/auth_internal/init.php:190
+msgid "Old password is incorrect."
+msgstr "Senha antiga incorreta"
+
 #: js/FeedTree.js:172
 #, fuzzy
 msgid "(Un)collapse"
 msgstr "Mostrar/Ocultar barra lateral"
 
-#: js/PrefFeedTree.js:52
+#: js/PrefFeedTree.js:54
 msgid "Edit category"
 msgstr "Editar categoria"
 
-#: js/PrefFeedTree.js:59
+#: js/PrefFeedTree.js:61
 msgid "Remove category"
 msgstr "Remover categoria"
 
@@ -2891,63 +2816,55 @@ msgid "Create Filter"
 msgstr "Criar um filtro"
 
 #: js/functions.js:1128
-msgid "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification hub again on next feed update."
-msgstr "Reiniciar a assinatura? Tiny Tiny RSS vai tentar reassinar no hub de notificações na próxima atualização."
-
-#: js/functions.js:1139
-msgid "Subscription reset."
-msgstr "Reiniciar assinatura."
-
-#: js/functions.js:1149
-#: js/tt-rss.js:695
+#: js/tt-rss.js:696
 #, perl-format
 msgid "Unsubscribe from %s?"
 msgstr "Cancelar inscrição de %s?"
 
-#: js/functions.js:1152
+#: js/functions.js:1131
 msgid "Removing feed..."
 msgstr "Removendo o Feed..."
 
-#: js/functions.js:1225
+#: js/functions.js:1204
 msgid "Please enter category title:"
 msgstr "Por favor entre o título da categoria:"
 
-#: js/functions.js:1250
+#: js/functions.js:1229
 msgid "Generate new syndication address for this feed?"
 msgstr ""
 
-#: js/functions.js:1254
-#: js/prefs.js:1154
+#: js/functions.js:1233
+#: js/prefs.js:1150
 msgid "Trying to change address..."
 msgstr "Tentando alterar endereço ..."
 
-#: js/functions.js:1497
-#: js/functions.js:1606
+#: js/functions.js:1476
+#: js/functions.js:1585
 #: js/prefs.js:398
 #: js/prefs.js:424
 #: js/prefs.js:456
 #: js/prefs.js:599
 #: js/prefs.js:617
-#: js/prefs.js:1136
-#: js/prefs.js:1263
+#: js/prefs.js:1132
+#: js/prefs.js:1259
 msgid "No feeds are selected."
 msgstr "Nenhum feed foi selecionado."
 
-#: js/functions.js:1540
+#: js/functions.js:1519
 msgid "Remove selected feeds from the archive? Feeds with stored articles will not be removed."
 msgstr "Remover as assinaturas selecionadas do arquivo? Assinaturas com artigos armazenados não serão removidas."
 
-#: js/functions.js:1577
+#: js/functions.js:1556
 msgid "Feeds with update errors"
 msgstr "Inscrições com erro na atualização"
 
-#: js/functions.js:1588
-#: js/prefs.js:1117
+#: js/functions.js:1567
+#: js/prefs.js:1113
 msgid "Remove selected feeds?"
 msgstr "Remover inscrições selecionadas?"
 
-#: js/functions.js:1591
-#: js/prefs.js:1120
+#: js/functions.js:1570
+#: js/prefs.js:1116
 msgid "Removing selected feeds..."
 msgstr "Removendo inscrições selecionadas…"
 
@@ -2970,9 +2887,7 @@ msgstr "Editor de usuários"
 #: js/prefs.js:100
 #: js/prefs.js:209
 #: js/prefs.js:706
-#: plugins/instances/instances.js:26
-#: plugins/instances/instances.js:89
-#: js/functions.js:1408
+#: js/functions.js:1387
 msgid "Saving data..."
 msgstr "Salvando dados..."
 
@@ -2997,7 +2912,7 @@ msgid "Removing selected labels..."
 msgstr "Removendo marcadores selecionados..."
 
 #: js/prefs.js:308
-#: js/prefs.js:1304
+#: js/prefs.js:1300
 msgid "No labels are selected."
 msgstr "Nenhum marcador está selecionado."
 
@@ -3096,28 +3011,28 @@ msgstr "Salvar alterações nas inscrições selecionadas?"
 msgid "OPML Import"
 msgstr "Importar OPML"
 
-#: js/prefs.js:764
+#: js/prefs.js:759
 msgid "Please choose an OPML file first."
 msgstr "Por favor selecione um arquivo OPML."
 
-#: js/prefs.js:767
+#: js/prefs.js:762
 #: plugins/import_export/import_export.js:115
 msgid "Importing, please wait..."
 msgstr "Importando, por favor aguarde..."
 
-#: js/prefs.js:928
+#: js/prefs.js:924
 msgid "Reset to defaults?"
 msgstr "Usar o padrão?"
 
-#: js/prefs.js:1628
+#: js/prefs.js:1624
 msgid "Subscribing to feeds..."
 msgstr "Adicionando inscrições..."
 
-#: js/prefs.js:1647
+#: js/prefs.js:1643
 msgid "Clear stored data for this plugin?"
 msgstr "Limpar dados armazenados para este plugin?"
 
-#: js/prefs.js:1661
+#: js/prefs.js:1657
 msgid "Clear all messages in the error log?"
 msgstr "Limpar todas as mensagems no registro de erro?"
 
@@ -3129,180 +3044,150 @@ msgstr "Marcar todos os artigos como lidos?"
 msgid "Marking all feeds as read..."
 msgstr "Marcando todos os feeds como lidos..."
 
-#: js/tt-rss.js:401
+#: js/tt-rss.js:402
 msgid "Please enable mail plugin first."
 msgstr "Por favor habilite o plugin de e-mail."
 
-#: js/tt-rss.js:449
-#: js/functions.js:1387
-#: js/tt-rss.js:676
+#: js/tt-rss.js:450
+#: js/functions.js:1366
+#: js/tt-rss.js:677
 msgid "You can't edit this kind of feed."
 msgstr "Você não pode editar esse tipo de feed."
 
-#: js/tt-rss.js:530
+#: js/tt-rss.js:531
 msgid "Please enable embed_original plugin first."
 msgstr "Por favor, habilite o plugin \"embed_original\"."
 
-#: js/tt-rss.js:543
-#: js/tt-rss.js:726
+#: js/tt-rss.js:544
+#: js/tt-rss.js:727
 msgid "Widescreen is not available in combined mode."
 msgstr ""
 
-#: js/tt-rss.js:824
+#: js/tt-rss.js:825
 msgid "You can't rescore this kind of feed."
 msgstr "Você não pode classificar esse tipo de assinatura."
 
-#: js/tt-rss.js:829
-#: js/tt-rss.js:689
+#: js/tt-rss.js:830
+#: js/tt-rss.js:690
 msgid "Please select some feed first."
 msgstr "Por favor selecione alguma inscrição."
 
-#: js/tt-rss.js:834
+#: js/tt-rss.js:835
 #, perl-format
 msgid "Rescore articles in %s?"
 msgstr "Reclassificar artigos em %s?"
 
-#: js/tt-rss.js:837
+#: js/tt-rss.js:838
 msgid "Rescoring articles..."
 msgstr "Reclassificando artigos..."
 
-#: js/viewfeed.js:919
-#: js/viewfeed.js:957
-#: js/viewfeed.js:1005
-#: js/viewfeed.js:1931
-#: plugins/mail/mail.js:7
+#: js/viewfeed.js:921
+#: js/viewfeed.js:959
+#: js/viewfeed.js:1007
+#: js/viewfeed.js:1933
 #: plugins/mailto/init.js:7
-#: js/viewfeed.js:677
-#: js/viewfeed.js:699
-#: js/viewfeed.js:720
-#: js/viewfeed.js:779
-#: js/viewfeed.js:807
+#: plugins/mail/mail.js:7
+#: js/viewfeed.js:679
+#: js/viewfeed.js:701
+#: js/viewfeed.js:722
+#: js/viewfeed.js:781
+#: js/viewfeed.js:809
 msgid "No articles are selected."
 msgstr "Nenhum artigo foi selecionado."
 
-#: js/viewfeed.js:927
+#: js/viewfeed.js:929
 #, perl-format
 msgid "Delete %d selected article in %s?"
 msgid_plural "Delete %d selected articles in %s?"
 msgstr[0] "Apagar %d artigo selecionado em %s?"
 msgstr[1] "Apagar %d artigos selecionados em %s?"
 
-#: js/viewfeed.js:929
+#: js/viewfeed.js:931
 #, perl-format
 msgid "Delete %d selected article?"
 msgid_plural "Delete %d selected articles?"
 msgstr[0] "Apagar %d artigo selecionado?"
 msgstr[1] "Apagar %d artigos selecionados?"
 
-#: js/viewfeed.js:966
+#: js/viewfeed.js:968
 #, perl-format
 msgid "Archive %d selected article in %s?"
 msgid_plural "Archive %d selected articles in %s?"
 msgstr[0] "Arquivar %d artigo em %s?"
 msgstr[1] "Arquivar %d artigos em %s?"
 
-#: js/viewfeed.js:969
+#: js/viewfeed.js:971
 #, perl-format
 msgid "Move %d archived article back?"
 msgid_plural "Move %d archived articles back?"
 msgstr[0] "Mover %d artigo de volta?"
 msgstr[1] "Mover %d artigos de volta?"
 
-#: js/viewfeed.js:971
+#: js/viewfeed.js:973
 msgid "Please note that unstarred articles might get purged on next feed update."
 msgstr "Por favor note que artigos sem estrela podem ser removidos na próxima atualização."
 
-#: js/viewfeed.js:1011
+#: js/viewfeed.js:1013
 #, perl-format
 msgid "Mark %d selected article in %s as read?"
 msgid_plural "Mark %d selected articles in %s as read?"
 msgstr[0] "Marcar %d artigo selecionado em %s como lido?"
 msgstr[1] "Marcar %d artigos selecionados em %s como lidos?"
 
-#: js/viewfeed.js:1031
+#: js/viewfeed.js:1033
 msgid "Edit article Tags"
 msgstr "Editar Tags do artigo"
 
-#: js/viewfeed.js:1037
+#: js/viewfeed.js:1039
 msgid "Saving article tags..."
 msgstr "Salvando tags..."
 
-#: js/viewfeed.js:1670
+#: js/viewfeed.js:1672
 msgid "Open original article"
 msgstr "Abrir o artigo original"
 
-#: js/viewfeed.js:1677
+#: js/viewfeed.js:1679
 msgid "Display article URL"
 msgstr "Mostrar URL do artigo"
 
-#: js/viewfeed.js:1787
+#: js/viewfeed.js:1789
 msgid "Assign label"
 msgstr "Incluir marcador"
 
-#: js/viewfeed.js:1792
+#: js/viewfeed.js:1794
 msgid "Remove label"
 msgstr "Remover marcador"
 
-#: js/viewfeed.js:1824
+#: js/viewfeed.js:1826
 #, fuzzy
 msgid "Select articles in group"
 msgstr "Selecionar artigo sob o cursor"
 
-#: js/viewfeed.js:1834
+#: js/viewfeed.js:1836
 #, fuzzy
 msgid "Mark group as read"
 msgstr "Marcar como lido"
 
-#: js/viewfeed.js:1846
+#: js/viewfeed.js:1848
 #, fuzzy
 msgid "Mark feed as read"
 msgstr "Marcar como lido"
 
-#: js/viewfeed.js:1899
+#: js/viewfeed.js:1901
 msgid "Please enter new score for selected articles:"
 msgstr "Por favor entre uma nova classificação para os artigos selecionados:"
 
-#: js/viewfeed.js:1962
+#: js/viewfeed.js:1964
 msgid "Please enter new score for this article:"
 msgstr "Por favor entre uma nova classificação para esse artigo:"
 
-#: js/viewfeed.js:1993
+#: js/viewfeed.js:1995
 msgid "Article URL:"
 msgstr "URL do artigo:"
 
-#: plugins/instances/instances.js:10
-msgid "Link Instance"
-msgstr "Conectar instância"
-
-#: plugins/instances/instances.js:73
-msgid "Edit Instance"
-msgstr "Editar instância"
-
-#: plugins/instances/instances.js:122
-msgid "Remove selected instances?"
-msgstr "Remover as instâncias selecionadas?"
-
-#: plugins/instances/instances.js:125
-msgid "Removing selected instances..."
-msgstr "Removendo instâncias selecionadas..."
-
-#: plugins/instances/instances.js:139
-#: plugins/instances/instances.js:151
-msgid "No instances are selected."
-msgstr "Nenhuma instância foi selecionada."
-
-#: plugins/instances/instances.js:156
-msgid "Please select only one instance."
-msgstr "Por favor selecione apenas uma instância"
-
-#: plugins/note/note.js:17
-msgid "Saving article note..."
-msgstr "Salvando anotação..."
-
-#: plugins/af_psql_trgm/init.js:11
-#, fuzzy
-msgid "Related articles"
-msgstr "Favoritos"
+#: plugins/embed_original/init.js:6
+msgid "Sorry, your browser does not support sandboxed iframes."
+msgstr ""
 
 #: plugins/import_export/import_export.js:13
 msgid "Export Data"
@@ -3323,11 +3208,16 @@ msgstr "Importar dados"
 msgid "Please choose the file first."
 msgstr "Por favor selecione primeiro o arquivo."
 
-#: plugins/mail/mail.js:21
 #: plugins/mailto/init.js:21
+#: plugins/mail/mail.js:21
 msgid "Forward article by email"
 msgstr "Encaminhar artigo por email"
 
+#: plugins/af_psql_trgm/init.js:11
+#, fuzzy
+msgid "Related articles"
+msgstr "Favoritos"
+
 #: plugins/mail/mail.js:36
 msgid "Error sending email:"
 msgstr ""
@@ -3337,10 +3227,6 @@ msgstr ""
 msgid "Your message has been sent."
 msgstr "Seus dados pessoais foram salvos."
 
-#: plugins/embed_original/init.js:6
-msgid "Sorry, your browser does not support sandboxed iframes."
-msgstr ""
-
 #: plugins/shorten_expanded/init.js:39
 #, fuzzy
 msgid "Click to expand article"
@@ -3371,7 +3257,7 @@ msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr ""
 
 #: plugins/share/share_prefs.js:6
-#: js/prefs.js:1437
+#: js/prefs.js:1433
 msgid "Clearing URLs..."
 msgstr "Limpando URLs..."
 
@@ -3379,23 +3265,44 @@ msgstr "Limpando URLs..."
 msgid "Shared URLs cleared."
 msgstr ""
 
+#: plugins/note/note.js:17
+msgid "Saving article note..."
+msgstr "Salvando anotação..."
+
 #: js/feedlist.js:429
-#: js/feedlist.js:496
 msgid "Mark all articles in %s as read?"
 msgstr "Marcar todos os artigos em %s como lidos?"
 
 #: js/feedlist.js:487
-msgid "Mark all articles in %s older than 1 day as read?"
+#, fuzzy
+msgid "Mark %w in %s older than 1 day as read?"
 msgstr "Marcar todos os artigos em %s e com mais de 1 dia como lidos?"
 
 #: js/feedlist.js:490
-msgid "Mark all articles in %s older than 1 week as read?"
+#, fuzzy
+msgid "Mark %w in %s older than 1 week as read?"
 msgstr "Marcar todos os artigos em %s e com mais de 1 semana como lidos?"
 
 #: js/feedlist.js:493
-msgid "Mark all articles in %s older than 2 weeks as read?"
+#, fuzzy
+msgid "Mark %w in %s older than 2 weeks as read?"
 msgstr "Marcar todos os artigos em %s e com mais de 2 semanas como lidos?"
 
+#: js/feedlist.js:496
+#, fuzzy
+msgid "Mark %w in %s as read?"
+msgstr "Marcar todos os artigos em %s como lidos?"
+
+#: js/feedlist.js:499
+#, fuzzy
+msgid "search results"
+msgstr "Resultados da pesquisa: %s"
+
+#: js/feedlist.js:499
+#, fuzzy
+msgid "all articles"
+msgstr "Todas as inscrições"
+
 #: js/functions.js:506
 msgid "Error explained"
 msgstr "Detalhamento do erro"
@@ -3476,179 +3383,243 @@ msgstr "Você já assinou este feed."
 msgid "Edit rule"
 msgstr "Editar regra"
 
-#: js/functions.js:1402
+#: js/functions.js:1381
 msgid "Edit Feed"
 msgstr "Editar inscrição"
 
-#: js/functions.js:1435
+#: js/functions.js:1414
 msgid "More Feeds"
 msgstr "Mais inscrições"
 
-#: js/functions.js:1631
+#: js/functions.js:1610
 msgid "Help"
 msgstr "Ajuda,"
 
-#: js/prefs.js:1032
+#: js/prefs.js:1028
 msgid "Remove category %s? Any nested feeds would be placed into Uncategorized."
 msgstr "Remover a categoria %s? As assinaturas associadas serão colocadas em \"Não categorizadas\"."
 
-#: js/prefs.js:1038
+#: js/prefs.js:1034
 msgid "Removing category..."
 msgstr "Removendo categoria..."
 
-#: js/prefs.js:1056
+#: js/prefs.js:1052
 msgid "Remove selected categories?"
 msgstr "Remover as categorias selecionadas?"
 
-#: js/prefs.js:1059
+#: js/prefs.js:1055
 msgid "Removing selected categories..."
 msgstr "Removendo categorias selecionadas…"
 
-#: js/prefs.js:1072
+#: js/prefs.js:1068
 msgid "No categories are selected."
 msgstr "Nenhuma categoria foi selecionada."
 
-#: js/prefs.js:1079
+#: js/prefs.js:1075
 msgid "Category title:"
 msgstr "Título da categoria..."
 
-#: js/prefs.js:1083
+#: js/prefs.js:1079
 msgid "Creating category..."
 msgstr "Criando categoria..."
 
-#: js/prefs.js:1106
+#: js/prefs.js:1102
 msgid "Feeds without recent updates"
 msgstr "Inscrições sem atualização recente"
 
-#: js/prefs.js:1150
+#: js/prefs.js:1146
 msgid "Replace current OPML publishing address with a new one?"
 msgstr "Substituir o endereço de publicação OPML por um novo?"
 
-#: js/prefs.js:1227
+#: js/prefs.js:1223
 msgid "Clearing feed..."
 msgstr "Limpando inscrição..."
 
-#: js/prefs.js:1247
+#: js/prefs.js:1243
 msgid "Rescore articles in selected feeds?"
 msgstr "Reclassificar artigos nas inscrições selecionadas?"
 
-#: js/prefs.js:1250
+#: js/prefs.js:1246
 msgid "Rescoring selected feeds..."
 msgstr "Removendo inscrições selecionadas…"
 
-#: js/prefs.js:1270
+#: js/prefs.js:1266
 msgid "Rescore all articles? This operation may take a lot of time."
 msgstr "Reclassificar todos os artigos? Esta operação pode demorar um bom tempo."
 
-#: js/prefs.js:1273
+#: js/prefs.js:1269
 msgid "Rescoring feeds..."
 msgstr "Reclassificando assinaturas..."
 
-#: js/prefs.js:1289
+#: js/prefs.js:1285
 msgid "Reset selected labels to default colors?"
 msgstr "Reiniciar marcadores selecionados para a cor padrão?"
 
-#: js/prefs.js:1321
+#: js/prefs.js:1317
 #, fuzzy
 msgid "Settings Profiles"
 msgstr "Criando perfil..."
 
-#: js/prefs.js:1330
+#: js/prefs.js:1326
 msgid "Remove selected profiles? Active and default profiles will not be removed."
 msgstr "Remover os perfis selecionados? O perfil ativo e os perfis padrão não serão removidos."
 
-#: js/prefs.js:1333
+#: js/prefs.js:1329
 msgid "Removing selected profiles..."
 msgstr "Removendo perfis selecionados…"
 
-#: js/prefs.js:1349
+#: js/prefs.js:1345
 msgid "No profiles are selected."
 msgstr "Nenhum perfil está selecionado."
 
-#: js/prefs.js:1357
-#: js/prefs.js:1410
+#: js/prefs.js:1353
+#: js/prefs.js:1406
 msgid "Activate selected profile?"
 msgstr "Ativar o perfil selecionado?"
 
-#: js/prefs.js:1374
-#: js/prefs.js:1426
+#: js/prefs.js:1370
+#: js/prefs.js:1422
 msgid "Please choose a profile to activate."
 msgstr "Por favor, selecione um perfil para ativar."
 
-#: js/prefs.js:1379
+#: js/prefs.js:1375
 msgid "Creating profile..."
 msgstr "Criando perfil..."
 
-#: js/prefs.js:1434
+#: js/prefs.js:1430
 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr ""
 
-#: js/prefs.js:1444
+#: js/prefs.js:1440
 msgid "Generated URLs cleared."
 msgstr "URLs automaticas limpas."
 
-#: js/prefs.js:1516
+#: js/prefs.js:1512
 msgid "Label Editor"
 msgstr "Editor de marcador"
 
-#: js/tt-rss.js:684
+#: js/tt-rss.js:685
 msgid "You can't unsubscribe from the category."
 msgstr "Você não pode cancelar a inscrição dessa categoria."
 
-#: js/viewfeed.js:125
-#: js/viewfeed.js:175
-#: js/viewfeed.js:192
+#: js/viewfeed.js:127
+#: js/viewfeed.js:177
+#: js/viewfeed.js:194
 #, fuzzy
 msgid "Click to open next unread feed."
 msgstr "Clique para editar inscrição"
 
-#: js/viewfeed.js:129
+#: js/viewfeed.js:131
 msgid "Cancel search"
 msgstr "Cancelar pesquisa"
 
-#: js/viewfeed.js:189
+#: js/viewfeed.js:191
 #, fuzzy
 msgid "New articles found, reload feed to continue."
 msgstr "Nenhum artigo foi encontrado para exibir."
 
-#: js/viewfeed.js:424
+#: js/viewfeed.js:426
 msgid "Unstar article"
 msgstr "Remover estrela"
 
-#: js/viewfeed.js:428
+#: js/viewfeed.js:430
 msgid "Star article"
 msgstr "Incluir estrela"
 
-#: js/viewfeed.js:478
+#: js/viewfeed.js:480
 msgid "Unpublish article"
 msgstr "Cancelar publicação"
 
-#: js/viewfeed.js:482
+#: js/viewfeed.js:484
 msgid "Publish article"
 msgstr "Publicar artigo"
 
-#: js/viewfeed.js:622
+#: js/viewfeed.js:624
 msgid "%d article selected"
 msgid_plural "%d articles selected"
 msgstr[0] "%d artigo selecionado"
 msgstr[1] "%d artigos selecionados"
 
-#: js/viewfeed.js:1286
+#: js/viewfeed.js:1288
 msgid "No article is selected."
 msgstr "Nenhum artigo foi selecionado."
 
-#: js/viewfeed.js:1321
+#: js/viewfeed.js:1323
 msgid "No articles found to mark"
 msgstr "Nenhum artigo foi encontrado para marcar"
 
-#: js/viewfeed.js:1323
+#: js/viewfeed.js:1325
 msgid "Mark %d article as read?"
 msgid_plural "Mark %d articles as read?"
 msgstr[0] "Marcar %d artigo como lido?"
 msgstr[1] "Marcar %d artigos como lidos?"
 
-#~ msgid "Cache images locally"
-#~ msgstr "Guardar imagens no cache local"
+#~ msgid "Resubscribe to push updates"
+#~ msgstr "Reassine para atualizar"
+
+#~ msgid "Download more plugins at tt-rss.org <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forums</a> or <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a>."
+#~ msgstr "Obtenha mais plugins no <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forum</a> ou <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a> do tt-rss."
+
+#, fuzzy
+#~ msgid "Linked"
+#~ msgstr "Link"
+
+#~ msgid "Instance"
+#~ msgstr "Instância"
+
+#~ msgid "Instance URL"
+#~ msgstr "URL da instância"
+
+#~ msgid "Access key:"
+#~ msgstr "Chave de acesso:"
+
+#~ msgid "Access key"
+#~ msgstr "Chave de acesso"
+
+#~ msgid "Use one access key for both linked instances."
+#~ msgstr "Use uma chave de acesso para ambas as instâncias."
+
+#~ msgid "Generate new key"
+#~ msgstr "Gerar uma nova chave"
+
+#~ msgid "Link instance"
+#~ msgstr "Conectar instância"
+
+#~ msgid "You can connect other instances of Tiny Tiny RSS to this one to share Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
+#~ msgstr "Você pode conectar outras instâncias to Tiny Tiny RSS a esta para compartilhar assinaturas populares. Conecte a esta instância do Tiny Tiny RSS usando esta URL:"
+
+#~ msgid "Last connected"
+#~ msgstr "Última conexão"
+
+#~ msgid "Stored feeds"
+#~ msgstr "Inscrições armazenadas"
+
+#~ msgid "Create link"
+#~ msgstr "Criar link"
+
+#~ msgid "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification hub again on next feed update."
+#~ msgstr "Reiniciar a assinatura? Tiny Tiny RSS vai tentar reassinar no hub de notificações na próxima atualização."
+
+#~ msgid "Subscription reset."
+#~ msgstr "Reiniciar assinatura."
+
+#~ msgid "Link Instance"
+#~ msgstr "Conectar instância"
+
+#~ msgid "Edit Instance"
+#~ msgstr "Editar instância"
+
+#~ msgid "Remove selected instances?"
+#~ msgstr "Remover as instâncias selecionadas?"
+
+#~ msgid "Removing selected instances..."
+#~ msgstr "Removendo instâncias selecionadas..."
+
+#~ msgid "No instances are selected."
+#~ msgstr "Nenhuma instância foi selecionada."
+
+#~ msgid "Please select only one instance."
+#~ msgstr "Por favor selecione apenas uma instância"
 
 #~ msgid "The error will be reported to the configured log destination."
 #~ msgstr "O erro será enviado para o arquivo de log configurado."
diff --git a/locale/ru_RU/LC_MESSAGES/messages.mo b/locale/ru_RU/LC_MESSAGES/messages.mo
index a99edb647..1a9fc2be6 100644
--- a/locale/ru_RU/LC_MESSAGES/messages.mo
+++ b/locale/ru_RU/LC_MESSAGES/messages.mo
diff --git a/locale/ru_RU/LC_MESSAGES/messages.po b/locale/ru_RU/LC_MESSAGES/messages.po
index 2ec56d52b..f0d48000f 100644
--- a/locale/ru_RU/LC_MESSAGES/messages.po
+++ b/locale/ru_RU/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tt-rss git\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 15:25+0300\n"
+"POT-Creation-Date: 2017-07-04 16:29+0300\n"
 "PO-Revision-Date: 2013-07-16 23:45+0400\n"
 "Last-Translator: cyberbat <[email protected]>\n"
 "Language-Team: Russian <>\n"
@@ -174,31 +174,30 @@ msgstr "Пользователь не найден"
 #: prefs.php:118
 #: classes/backend.php:5
 #: classes/pref/labels.php:282
-#: classes/pref/feeds.php:1402
-#: classes/pref/filters.php:779
+#: classes/pref/filters.php:819
+#: classes/pref/feeds.php:1376
 #: js/feedlist.js:149
-#: js/functions.js:1131
-#: js/functions.js:1231
-#: js/functions.js:1478
+#: js/functions.js:1210
+#: js/functions.js:1457
 #: js/prefs.js:621
-#: js/prefs.js:818
-#: js/prefs.js:1648
-#: js/prefs.js:1663
-#: js/tt-rss.js:550
-#: js/viewfeed.js:1182
+#: js/prefs.js:813
+#: js/prefs.js:1644
+#: js/prefs.js:1659
+#: js/tt-rss.js:551
+#: js/viewfeed.js:1184
 #: plugins/import_export/import_export.js:17
 #: js/feedlist.js:467
-#: js/feedlist.js:512
+#: js/feedlist.js:515
 #: js/functions.js:372
 #: js/functions.js:630
-#: js/prefs.js:1360
-#: js/prefs.js:1413
-#: js/prefs.js:1452
-#: js/prefs.js:1465
-#: js/prefs.js:1476
-#: js/prefs.js:1491
-#: js/tt-rss.js:567
-#: js/viewfeed.js:762
+#: js/prefs.js:1356
+#: js/prefs.js:1409
+#: js/prefs.js:1448
+#: js/prefs.js:1461
+#: js/prefs.js:1472
+#: js/prefs.js:1487
+#: js/tt-rss.js:568
+#: js/viewfeed.js:764
 msgid "Loading, please wait..."
 msgstr "Идет загрузка..."
 
@@ -215,13 +214,13 @@ msgid "All Articles"
 msgstr "Все статьи"
 
 #: index.php:192
-#: include/functions2.php:107
+#: include/functions.php:1181
 #: classes/feeds.php:110
 msgid "Starred"
 msgstr "Отмеченные"
 
 #: index.php:193
-#: include/functions2.php:108
+#: include/functions.php:1182
 #: classes/feeds.php:111
 msgid "Published"
 msgstr "Опубликован"
@@ -262,7 +261,7 @@ msgstr "Заголовок"
 
 #: index.php:209
 #: index.php:249
-#: include/functions2.php:95
+#: include/functions.php:1169
 #: classes/feeds.php:115
 #: js/FeedTree.js:138
 #: js/FeedTree.js:166
@@ -302,7 +301,7 @@ msgid "Feed actions:"
 msgstr "Действия над каналами:"
 
 #: index.php:244
-#: classes/handler/public.php:672
+#: classes/handler/public.php:583
 msgid "Subscribe to feed..."
 msgstr "Подписаться на канал..."
 
@@ -316,8 +315,8 @@ msgstr "Заново оценить канал"
 
 #: index.php:247
 #: classes/pref/feeds.php:785
-#: classes/pref/feeds.php:1357
-#: js/PrefFeedTree.js:78
+#: classes/pref/feeds.php:1331
+#: js/PrefFeedTree.js:80
 msgid "Unsubscribe"
 msgstr "Отписаться"
 
@@ -334,7 +333,7 @@ msgid "Other actions:"
 msgstr "Другие действия:"
 
 #: index.php:252
-#: include/functions2.php:81
+#: include/functions.php:1155
 msgid "Toggle widescreen mode"
 msgstr "Переключить широкоэкранный режим"
 
@@ -360,7 +359,7 @@ msgstr ""
 
 #: prefs.php:33
 #: prefs.php:136
-#: include/functions2.php:110
+#: include/functions.php:1184
 #: classes/pref/prefs.php:435
 msgid "Preferences"
 msgstr "Настройки"
@@ -375,20 +374,19 @@ msgstr "Закрыть настройки"
 
 #: prefs.php:139
 #: classes/pref/feeds.php:112
-#: classes/pref/feeds.php:1297
-#: classes/pref/feeds.php:1346
+#: classes/pref/feeds.php:1271
+#: classes/pref/feeds.php:1320
 msgid "Feeds"
 msgstr "Каналы"
 
 #: prefs.php:142
-#: classes/pref/filters.php:248
+#: classes/pref/filters.php:273
 msgid "Filters"
 msgstr "Фильтры"
 
 #: prefs.php:145
-#: include/functions.php:1327
-#: include/functions.php:1979
 #: classes/pref/labels.php:90
+#: classes/feeds.php:1718
 msgid "Labels"
 msgstr "Метки"
 
@@ -417,13 +415,13 @@ msgstr "Регистрация новых пользователей запре�
 #: register.php:337
 #: register.php:347
 #: register.php:359
-#: classes/handler/public.php:742
-#: classes/handler/public.php:813
-#: classes/handler/public.php:911
-#: classes/handler/public.php:990
-#: classes/handler/public.php:1004
-#: classes/handler/public.php:1011
-#: classes/handler/public.php:1036
+#: classes/handler/public.php:653
+#: classes/handler/public.php:724
+#: classes/handler/public.php:822
+#: classes/handler/public.php:901
+#: classes/handler/public.php:915
+#: classes/handler/public.php:922
+#: classes/handler/public.php:947
 msgid "Return to Tiny Tiny RSS"
 msgstr "Вернуться к Tiny Tiny RSS"
 
@@ -440,12 +438,12 @@ msgid "Check availability"
 msgstr "Проверить доступность"
 
 #: register.php:229
-#: classes/handler/public.php:829
+#: classes/handler/public.php:740
 msgid "Email:"
 msgstr "E-mail: "
 
 #: register.php:232
-#: classes/handler/public.php:834
+#: classes/handler/public.php:745
 msgid "How much is two plus two:"
 msgstr "Сколько будет, два плюс два:"
 
@@ -473,17 +471,23 @@ msgstr "Аккаунт успешно создан."
 msgid "New user registrations are currently closed."
 msgstr "Регистрация новых пользователей временно закрыта."
 
-#: update.php:67
+#: update.php:66
 msgid "Tiny Tiny RSS data update script."
 msgstr "Скрипт обновления данных Tiny Tiny RSS"
 
-#: include/digest.php:109
-#: include/functions.php:1336
-#: include/functions.php:1880
-#: include/functions.php:1965
-#: include/functions.php:1987
-#: classes/opml.php:421
+#: include/controls.php:83
+#: classes/pref/filters.php:242
+#: classes/pref/filters.php:253
+#: classes/pref/filters.php:544
+msgid "All feeds"
+msgstr "Все каналы"
+
+#: include/controls.php:134
+#: include/controls.php:316
 #: classes/pref/feeds.php:228
+#: classes/opml.php:486
+#: classes/feeds.php:1727
+#: classes/digest.php:113
 msgid "Uncategorized"
 msgstr "Без категории"
 
@@ -499,392 +503,287 @@ msgstr[2] "%d архивных статей"
 msgid "No feeds found."
 msgstr "Каналы не найдены."
 
-#: include/functions.php:1029
+#: include/functions.php:900
 #, php-format
 msgid "%d min"
 msgstr ""
 
-#: include/functions.php:1325
-#: include/functions.php:1977
-msgid "Special"
-msgstr "Особые"
-
-#: include/functions.php:1828
-#: classes/pref/filters.php:229
-#: classes/pref/filters.php:507
-msgid "All feeds"
-msgstr "Все каналы"
-
-#: include/functions.php:2032
-msgid "Starred articles"
-msgstr "Отмеченные"
-
-#: include/functions.php:2034
-msgid "Published articles"
-msgstr "Опубликованные"
-
-#: include/functions.php:2036
-msgid "Fresh articles"
-msgstr "Свежие"
-
-#: include/functions.php:2038
-#: include/functions2.php:105
-msgid "All articles"
-msgstr "Все статьи"
-
-#: include/functions.php:2040
-msgid "Archived articles"
-msgstr "Архив статей"
-
-#: include/functions.php:2042
-msgid "Recently read"
-msgstr "Недавно прочитанные"
-
-#: include/functions2.php:57
+#: include/functions.php:1131
 msgid "Navigation"
 msgstr "Навигация"
 
-#: include/functions2.php:58
+#: include/functions.php:1132
 msgid "Open next feed"
 msgstr "Открыть следующий канал"
 
-#: include/functions2.php:59
+#: include/functions.php:1133
 msgid "Open previous feed"
 msgstr "Открыть предыдущий канал"
 
-#: include/functions2.php:60
+#: include/functions.php:1134
 msgid "Open next article"
 msgstr "Открыть следующую статью"
 
-#: include/functions2.php:61
+#: include/functions.php:1135
 msgid "Open previous article"
 msgstr "Открыть предыдущую статью"
 
-#: include/functions2.php:62
+#: include/functions.php:1136
 msgid "Open next article (don't scroll long articles)"
 msgstr "Открыть следующую статью (не прокручивать длинные статьи)"
 
-#: include/functions2.php:63
+#: include/functions.php:1137
 msgid "Open previous article (don't scroll long articles)"
 msgstr "Открыть предыдущую статью (не прокручивать длинные статьи)"
 
-#: include/functions2.php:64
+#: include/functions.php:1138
 msgid "Move to next article (don't expand or mark read)"
 msgstr "Перейти к следующей статье (не разворачивать или помечать прочитанной)"
 
-#: include/functions2.php:65
+#: include/functions.php:1139
 msgid "Move to previous article (don't expand or mark read)"
 msgstr "Перейти к предыдущей статье (не разворачивать или помечать прочитанной)"
 
-#: include/functions2.php:66
+#: include/functions.php:1140
 msgid "Show search dialog"
 msgstr "Показать диалог поиска"
 
-#: include/functions2.php:67
+#: include/functions.php:1141
 msgid "Article"
 msgstr "Статья"
 
-#: include/functions2.php:68
-#: js/viewfeed.js:1699
+#: include/functions.php:1142
+#: js/viewfeed.js:1701
 msgid "Toggle starred"
 msgstr "Отметить / снять отметку"
 
-#: include/functions2.php:69
-#: js/viewfeed.js:1711
+#: include/functions.php:1143
+#: js/viewfeed.js:1713
 msgid "Toggle published"
 msgstr "Опубликовано / не опубликовано"
 
-#: include/functions2.php:70
-#: js/viewfeed.js:1686
+#: include/functions.php:1144
+#: js/viewfeed.js:1688
 msgid "Toggle unread"
 msgstr "Прочитано / не прочитано"
 
-#: include/functions2.php:71
+#: include/functions.php:1145
 msgid "Edit tags"
 msgstr "Редактировать теги"
 
-#: include/functions2.php:72
+#: include/functions.php:1146
 msgid "Open in new window"
 msgstr "Открыть в новом окне"
 
-#: include/functions2.php:73
-#: js/viewfeed.js:1732
+#: include/functions.php:1147
+#: js/viewfeed.js:1734
 msgid "Mark below as read"
 msgstr "Отметить статьи ниже как прочитанные"
 
-#: include/functions2.php:74
-#: js/viewfeed.js:1725
+#: include/functions.php:1148
+#: js/viewfeed.js:1727
 msgid "Mark above as read"
 msgstr "Отметить статьи выше как прочитанные"
 
-#: include/functions2.php:75
+#: include/functions.php:1149
 msgid "Scroll down"
 msgstr "Пролистать вниз"
 
-#: include/functions2.php:76
+#: include/functions.php:1150
 msgid "Scroll up"
 msgstr "Пролистать вверх"
 
-#: include/functions2.php:77
+#: include/functions.php:1151
 msgid "Select article under cursor"
 msgstr "Выбрать статью под курсором мыши"
 
-#: include/functions2.php:78
+#: include/functions.php:1152
 msgid "Email article"
 msgstr "Отправить по почте"
 
-#: include/functions2.php:79
+#: include/functions.php:1153
 msgid "Close/collapse article"
 msgstr "Закрыть статью"
 
-#: include/functions2.php:80
+#: include/functions.php:1154
 msgid "Toggle article expansion (combined mode)"
 msgstr "Переключить растяжение статьи (комбинированный режим)"
 
-#: include/functions2.php:82
+#: include/functions.php:1156
 #: plugins/embed_original/init.php:31
 msgid "Toggle embed original"
 msgstr "Переключить отображение оригинала"
 
-#: include/functions2.php:83
+#: include/functions.php:1157
 msgid "Article selection"
 msgstr "Выбрать статью"
 
-#: include/functions2.php:84
+#: include/functions.php:1158
 msgid "Select all articles"
 msgstr "Выбрать все статьи"
 
-#: include/functions2.php:85
+#: include/functions.php:1159
 msgid "Select unread"
 msgstr "Выбрать непрочитанные"
 
-#: include/functions2.php:86
+#: include/functions.php:1160
 msgid "Select starred"
 msgstr "Выбрать отмеченные"
 
-#: include/functions2.php:87
+#: include/functions.php:1161
 msgid "Select published"
 msgstr "Выбрать опубликованные"
 
-#: include/functions2.php:88
+#: include/functions.php:1162
 msgid "Invert selection"
 msgstr "Инвертировать выделение"
 
-#: include/functions2.php:89
+#: include/functions.php:1163
 msgid "Deselect everything"
 msgstr "Снять выделение"
 
-#: include/functions2.php:90
+#: include/functions.php:1164
 #: classes/pref/feeds.php:555
-#: classes/pref/feeds.php:823
+#: classes/pref/feeds.php:811
 msgid "Feed"
 msgstr "Канал"
 
-#: include/functions2.php:91
+#: include/functions.php:1165
 msgid "Refresh current feed"
 msgstr "Обновить активный канал"
 
-#: include/functions2.php:92
+#: include/functions.php:1166
 msgid "Un/hide read feeds"
 msgstr "Показать/скрыть прочитанные"
 
-#: include/functions2.php:93
-#: classes/pref/feeds.php:1349
+#: include/functions.php:1167
+#: classes/pref/feeds.php:1323
 msgid "Subscribe to feed"
 msgstr "Подписаться на канал"
 
-#: include/functions2.php:94
+#: include/functions.php:1168
 #: js/FeedTree.js:145
-#: js/PrefFeedTree.js:72
-#: js/viewfeed.js:1853
+#: js/PrefFeedTree.js:74
+#: js/viewfeed.js:1855
 msgid "Edit feed"
 msgstr "Редактировать канал"
 
-#: include/functions2.php:96
+#: include/functions.php:1170
 msgid "Reverse headlines"
 msgstr "Обратный порядок заголовков"
 
-#: include/functions2.php:97
+#: include/functions.php:1171
 msgid "Toggle headline grouping"
 msgstr ""
 
-#: include/functions2.php:98
+#: include/functions.php:1172
 msgid "Debug feed update"
 msgstr "Отлаживать обновление канала"
 
-#: include/functions2.php:99
+#: include/functions.php:1173
 #, fuzzy
 msgid "Debug viewfeed()"
 msgstr "Отлаживать обновление канала"
 
-#: include/functions2.php:100
+#: include/functions.php:1174
 #: js/FeedTree.js:194
 msgid "Mark all feeds as read"
 msgstr "Отметить все каналы как прочитанные"
 
-#: include/functions2.php:101
+#: include/functions.php:1175
 msgid "Un/collapse current category"
 msgstr "Свернуть/развернуть категорию"
 
-#: include/functions2.php:102
+#: include/functions.php:1176
 msgid "Toggle combined mode"
 msgstr "Переключить комбинированный режим"
 
-#: include/functions2.php:103
+#: include/functions.php:1177
 msgid "Toggle auto expand in combined mode"
 msgstr "Переключить автоматическое разворачивание в комбинированном режиме"
 
-#: include/functions2.php:104
+#: include/functions.php:1178
 msgid "Go to"
 msgstr "Перейти к.."
 
-#: include/functions2.php:106
+#: include/functions.php:1179
+#: classes/feeds.php:1602
+msgid "All articles"
+msgstr "Все статьи"
+
+#: include/functions.php:1180
 msgid "Fresh"
 msgstr "Свежие"
 
-#: include/functions2.php:109
-#: js/tt-rss.js:494
-#: js/tt-rss.js:663
+#: include/functions.php:1183
+#: js/tt-rss.js:495
+#: js/tt-rss.js:664
 msgid "Tag cloud"
 msgstr "Облако тегов"
 
-#: include/functions2.php:111
+#: include/functions.php:1185
 msgid "Other"
 msgstr "Другой"
 
-#: include/functions2.php:112
+#: include/functions.php:1186
 #: classes/pref/labels.php:267
 msgid "Create label"
 msgstr "Создать метку"
 
-#: include/functions2.php:113
-#: classes/pref/filters.php:753
+#: include/functions.php:1187
+#: classes/pref/filters.php:793
 msgid "Create filter"
 msgstr "Создать фильтр"
 
-#: include/functions2.php:114
+#: include/functions.php:1188
 msgid "Un/collapse sidebar"
 msgstr "Свернуть/развернуть боковую панель"
 
-#: include/functions2.php:115
+#: include/functions.php:1189
 msgid "Show help dialog"
 msgstr "Показать диалог помощи"
 
-#: include/functions2.php:670
-#, php-format
-msgid "Search results: %s"
-msgstr "Результаты поиска: %s"
-
-#: include/functions2.php:1336
-#: classes/feeds.php:752
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] "комментарий"
-msgstr[1] "комментария"
-msgstr[2] "комментариев"
-
-#: include/functions2.php:1340
-#: classes/feeds.php:756
-msgid "comments"
-msgstr "комментарии"
-
-#: include/functions2.php:1366
-msgid " - "
-msgstr " - "
-
-#: include/functions2.php:1397
-#: include/functions2.php:1648
-#: classes/article.php:311
-msgid "no tags"
-msgstr "нет тегов"
-
-#: include/functions2.php:1407
-#: classes/feeds.php:738
-msgid "Edit tags for this article"
-msgstr "Редактировать теги статьи"
-
-#: include/functions2.php:1439
-#: classes/feeds.php:690
-msgid "Originally from:"
-msgstr "Оригинал:"
-
-#: include/functions2.php:1452
-#: classes/pref/feeds.php:574
-#: classes/feeds.php:703
-msgid "Feed URL"
-msgstr "URL канала"
-
-#: include/functions2.php:1489
-#: classes/backend.php:105
-#: classes/dlg.php:37
-#: classes/dlg.php:60
-#: classes/dlg.php:93
-#: classes/dlg.php:159
-#: classes/dlg.php:186
-#: classes/pref/feeds.php:1652
-#: classes/pref/feeds.php:1718
-#: classes/pref/filters.php:204
-#: classes/pref/prefs.php:1097
-#: plugins/af_psql_trgm/init.php:102
-#: plugins/import_export/init.php:415
-#: plugins/import_export/init.php:461
-#: plugins/share/init.php:121
-msgid "Close this window"
-msgstr "Закрыть это окно"
-
-#: include/functions2.php:1686
-msgid "(edit note)"
-msgstr "(править заметку)"
-
-#: include/functions2.php:1960
-msgid "unknown type"
-msgstr "неизвестный тип"
-
-#: include/functions2.php:2037
-msgid "Attachments"
-msgstr "Вложения"
-
-#: include/functions2.php:2496
+#: include/functions.php:2456
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: include/functions2.php:2497
+#: include/functions.php:2457
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: include/functions2.php:2498
+#: include/functions.php:2458
 msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
 msgstr ""
 
-#: include/functions2.php:2499
+#: include/functions.php:2459
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: include/functions2.php:2500
+#: include/functions.php:2460
 #, fuzzy
 msgid "No file was uploaded"
 msgstr "Ни одного файла не загружено."
 
-#: include/functions2.php:2501
+#: include/functions.php:2461
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: include/functions2.php:2502
+#: include/functions.php:2462
 msgid "Failed to write file to disk."
 msgstr ""
 
-#: include/functions2.php:2503
+#: include/functions.php:2463
 msgid "A PHP extension stopped the file upload."
 msgstr ""
 
 #: include/login_form.php:197
-#: classes/handler/public.php:569
-#: classes/handler/public.php:824
+#: classes/handler/public.php:480
+#: classes/handler/public.php:735
 msgid "Login:"
 msgstr "Логин:"
 
 #: include/login_form.php:207
-#: classes/handler/public.php:572
+#: classes/handler/public.php:483
 msgid "Password:"
 msgstr "Пароль:"
 
@@ -897,7 +796,7 @@ msgid "Profile:"
 msgstr "Профиль:"
 
 #: include/login_form.php:223
-#: classes/handler/public.php:311
+#: classes/handler/public.php:287
 #: classes/pref/prefs.php:1035
 #: classes/rpc.php:63
 msgid "Default profile"
@@ -916,7 +815,7 @@ msgid "Remember me"
 msgstr "Запомнить меня"
 
 #: include/login_form.php:249
-#: classes/handler/public.php:577
+#: classes/handler/public.php:488
 msgid "Log in"
 msgstr "Войти"
 
@@ -932,145 +831,44 @@ msgstr "Ошибка проверки сессии (пользователь н�
 msgid "Session failed to validate (password changed)"
 msgstr "Ошибка проверки сессии (пароль изменен)"
 
-#: classes/article.php:25
-msgid "Article not found."
-msgstr "Статья не найдена"
-
-#: classes/article.php:197
-msgid "Tags for this article (separated by commas):"
-msgstr "Теги для этой статьи (разделенные запятыми):"
-
-#: classes/article.php:222
-#: classes/pref/labels.php:79
-#: classes/pref/users.php:98
-#: classes/pref/feeds.php:801
-#: classes/pref/feeds.php:943
-#: classes/pref/filters.php:485
-#: classes/pref/prefs.php:981
-#: plugins/instances/init.php:245
-#: plugins/nsfw/init.php:85
-#: plugins/note/init.php:51
-#: plugins/af_readability/init.php:68
-#: plugins/af_redditimgur/init.php:60
-#: plugins/af_psql_trgm/init.php:181
-#: plugins/mail/init.php:64
-#: plugins/af_zz_imgproxy/init.php:213
-msgid "Save"
-msgstr "Сохранить"
-
-#: classes/article.php:224
-#: classes/handler/public.php:546
-#: classes/handler/public.php:580
-#: classes/pref/labels.php:81
-#: classes/pref/users.php:100
-#: classes/pref/feeds.php:802
-#: classes/pref/feeds.php:946
-#: classes/pref/feeds.php:1859
-#: classes/pref/filters.php:488
-#: classes/pref/filters.php:902
-#: classes/pref/filters.php:983
-#: classes/pref/filters.php:1076
-#: classes/pref/prefs.php:983
-#: classes/feeds.php:1105
-#: classes/feeds.php:1155
-#: classes/feeds.php:1192
-#: plugins/instances/init.php:248
-#: plugins/instances/init.php:436
-#: plugins/note/init.php:53
-#: plugins/mail/init.php:173
-msgid "Cancel"
-msgstr "Отмена"
-
-#: classes/opml.php:28
-#: classes/opml.php:33
-msgid "OPML Utility"
-msgstr "Утилита OPML"
-
-#: classes/opml.php:37
-msgid "Importing OPML..."
-msgstr "Импортирую OPML..."
-
-#: classes/opml.php:41
-msgid "Return to preferences"
-msgstr "Вернуться к настройкам"
-
-#: classes/opml.php:271
-#, php-format
-msgid "Adding feed: %s"
-msgstr "Добавляю канал: %s"
-
-#: classes/opml.php:282
-#, php-format
-msgid "Duplicate feed: %s"
-msgstr "Канал уже существует: %s"
-
-#: classes/opml.php:296
-#, php-format
-msgid "Adding label %s"
-msgstr "Добавляю метку %s"
-
-#: classes/opml.php:299
-#, php-format
-msgid "Duplicate label: %s"
-msgstr "Метка уже существует: %s"
-
-#: classes/opml.php:311
-#, php-format
-msgid "Setting preference key %s to %s"
-msgstr "Устанавливаю ключ настроек %s в %s"
-
-#: classes/opml.php:343
-msgid "Adding filter..."
-msgstr "Добавляю фильтр..."
-
-#: classes/opml.php:421
-#, php-format
-msgid "Processing category: %s"
-msgstr "Обрабатываю категорию: %s"
-
-#: classes/opml.php:470
-#, php-format
-msgid "Upload failed with error code %d"
-msgstr "Ошибка загрузки, код ошибки: %d"
-
-#: classes/opml.php:484
-#: plugins/import_export/init.php:442
-msgid "Unable to move uploaded file."
-msgstr "Не могу переместить загруженный файл."
-
-#: classes/opml.php:488
-#: plugins/import_export/init.php:446
-msgid "Error: please upload OPML file."
-msgstr "Ошибка: пожалуйста загрузите OPML файл."
-
-#: classes/opml.php:499
-msgid "Error: unable to find moved OPML file."
-msgstr "Ошибка: не могу найти перемещенный OPML файл."
-
-#: classes/opml.php:506
-msgid "Error while parsing document."
-msgstr "Ошибка при разборе документа."
-
-#: classes/backend.php:33
+#: classes/backend.php:31
 msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
 msgstr "Другие советы по использованию доступны в вики проекта  Tiny Tiny RSS."
 
-#: classes/backend.php:38
+#: classes/backend.php:36
 msgid "Keyboard Shortcuts"
 msgstr "Горячие Клавиши"
 
-#: classes/backend.php:61
+#: classes/backend.php:59
 msgid "Shift"
 msgstr "Shift"
 
-#: classes/backend.php:64
+#: classes/backend.php:62
 msgid "Ctrl"
 msgstr "Ctrl"
 
-#: classes/backend.php:99
+#: classes/backend.php:97
 msgid "Help topic not found."
 msgstr "Раздел помощи не найден."
 
+#: classes/backend.php:103
+#: classes/dlg.php:37
+#: classes/dlg.php:60
+#: classes/dlg.php:93
+#: classes/dlg.php:159
+#: classes/dlg.php:186
+#: classes/article.php:744
+#: classes/pref/filters.php:206
+#: classes/pref/prefs.php:1097
+#: classes/pref/feeds.php:1626
+#: classes/pref/feeds.php:1692
+#: plugins/import_export/init.php:421
+#: plugins/import_export/init.php:467
+#: plugins/af_psql_trgm/init.php:102
+#: plugins/share/init.php:120
+msgid "Close this window"
+msgstr "Закрыть это окно"
+
 #: classes/dlg.php:17
 msgid "If you have imported labels and/or filters, you might need to reload preferences to see your new data."
 msgstr "Если вы импортировали метки или фильтры, вам возможно придется перезагрузить настройки чтобы увидеть новые данные."
@@ -1081,7 +879,7 @@ msgstr "Ссылка на ваш опубликованный OPML:"
 
 #: classes/dlg.php:57
 #: classes/dlg.php:183
-#: plugins/share/init.php:118
+#: plugins/share/init.php:117
 msgid "Generate new URL"
 msgstr "Создать новую ссылку"
 
@@ -1107,128 +905,223 @@ msgstr ""
 msgid "You can view this feed as RSS using the following URL:"
 msgstr "Вы можете использовать данный канал через RSS с помощью следующего URL:"
 
-#: classes/handler/public.php:510
+#: classes/article.php:25
+msgid "Article not found."
+msgstr "Статья не найдена"
+
+#: classes/article.php:197
+msgid "Tags for this article (separated by commas):"
+msgstr "Теги для этой статьи (разделенные запятыми):"
+
+#: classes/article.php:222
+#: classes/pref/labels.php:79
+#: classes/pref/filters.php:519
+#: classes/pref/users.php:98
+#: classes/pref/prefs.php:981
+#: classes/pref/feeds.php:789
+#: classes/pref/feeds.php:931
+#: plugins/af_psql_trgm/init.php:181
+#: plugins/nsfw/init.php:85
+#: plugins/af_readability/init.php:68
+#: plugins/mail/init.php:64
+#: plugins/af_redditimgur/init.php:60
+#: plugins/note/init.php:51
+#: plugins/af_zz_imgproxy/init.php:240
+msgid "Save"
+msgstr "Сохранить"
+
+#: classes/article.php:224
+#: classes/handler/public.php:457
+#: classes/handler/public.php:491
+#: classes/pref/labels.php:81
+#: classes/pref/filters.php:522
+#: classes/pref/filters.php:942
+#: classes/pref/filters.php:1022
+#: classes/pref/filters.php:1115
+#: classes/pref/users.php:100
+#: classes/pref/prefs.php:983
+#: classes/pref/feeds.php:790
+#: classes/pref/feeds.php:934
+#: classes/pref/feeds.php:1833
+#: classes/feeds.php:1098
+#: classes/feeds.php:1148
+#: classes/feeds.php:1185
+#: plugins/mail/init.php:173
+#: plugins/note/init.php:53
+msgid "Cancel"
+msgstr "Отмена"
+
+#: classes/article.php:311
+#: classes/article.php:652
+#: classes/article.php:805
+msgid "no tags"
+msgstr "нет тегов"
+
+#: classes/article.php:419
+msgid "unknown type"
+msgstr "неизвестный тип"
+
+#: classes/article.php:496
+msgid "Attachments"
+msgstr "Вложения"
+
+#: classes/article.php:591
+#: classes/feeds.php:741
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] "комментарий"
+msgstr[1] "комментария"
+msgstr[2] "комментариев"
+
+#: classes/article.php:595
+#: classes/feeds.php:745
+msgid "comments"
+msgstr "комментарии"
+
+#: classes/article.php:621
+msgid " - "
+msgstr " - "
+
+#: classes/article.php:662
+#: classes/feeds.php:727
+msgid "Edit tags for this article"
+msgstr "Редактировать теги статьи"
+
+#: classes/article.php:694
+#: classes/feeds.php:681
+msgid "Originally from:"
+msgstr "Оригинал:"
+
+#: classes/article.php:707
+#: classes/pref/feeds.php:574
+#: classes/feeds.php:694
+msgid "Feed URL"
+msgstr "URL канала"
+
+#: classes/article.php:843
+msgid "(edit note)"
+msgstr "(править заметку)"
+
+#: classes/handler/public.php:421
 #: plugins/bookmarklets/init.php:40
 msgid "Share with Tiny Tiny RSS"
 msgstr "Опубликовать с помощью Tiny Tiny RSS"
 
-#: classes/handler/public.php:518
+#: classes/handler/public.php:429
 msgid "Title:"
 msgstr "Заголовок:"
 
-#: classes/handler/public.php:520
+#: classes/handler/public.php:431
 #: classes/pref/feeds.php:572
-#: plugins/instances/init.php:212
-#: plugins/instances/init.php:401
 msgid "URL:"
 msgstr "URL:"
 
-#: classes/handler/public.php:522
+#: classes/handler/public.php:433
 msgid "Content:"
 msgstr "Содержимое:"
 
-#: classes/handler/public.php:524
+#: classes/handler/public.php:435
 msgid "Labels:"
 msgstr "Метки:"
 
-#: classes/handler/public.php:543
+#: classes/handler/public.php:454
 msgid "Shared article will appear in the Published feed."
 msgstr "Опубликованная статья появится в канале \"Опубликованные\""
 
-#: classes/handler/public.php:545
+#: classes/handler/public.php:456
 msgid "Share"
 msgstr "Опубликовать"
 
-#: classes/handler/public.php:567
+#: classes/handler/public.php:478
 msgid "Not logged in"
 msgstr "Вход не произведен"
 
-#: classes/handler/public.php:626
+#: classes/handler/public.php:537
 msgid "Incorrect username or password"
 msgstr "Некорректное имя пользователя или пароль"
 
-#: classes/handler/public.php:678
+#: classes/handler/public.php:589
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "Канал <b>%s</b> уже подписан."
 
-#: classes/handler/public.php:681
+#: classes/handler/public.php:592
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "Добавлена подписка на <b>%s</b>."
 
-#: classes/handler/public.php:684
+#: classes/handler/public.php:595
 #, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "Не могу подписаться на <b>%s</b>."
 
-#: classes/handler/public.php:687
+#: classes/handler/public.php:598
 #, php-format
 msgid "No feeds found in <b>%s</b>."
 msgstr "Не найдены каналы в <b>%s</b>."
 
-#: classes/handler/public.php:690
+#: classes/handler/public.php:601
 msgid "Multiple feed URLs found."
 msgstr "Обнаружено несколько URL канала."
 
-#: classes/handler/public.php:694
+#: classes/handler/public.php:605
 #, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr "Не могу подписаться на <b>%s</b>. Не могу загрузить URL канала."
 
-#: classes/handler/public.php:712
+#: classes/handler/public.php:623
 msgid "Subscribe to selected feed"
 msgstr "Подписаться на выбранные каналы"
 
-#: classes/handler/public.php:737
+#: classes/handler/public.php:648
 msgid "Edit subscription options"
 msgstr "Редактировать опции  подписки"
 
-#: classes/handler/public.php:774
+#: classes/handler/public.php:685
 msgid "Password recovery"
 msgstr "Восстановление пароля"
 
-#: classes/handler/public.php:817
+#: classes/handler/public.php:728
 msgid "You will need to provide valid account name and email. A password reset link will be sent to your email address."
 msgstr "Введите ваш логин и электронный адрес. Новый пароль будет выслан на указанный адрес."
 
-#: classes/handler/public.php:839
-#: classes/pref/users.php:350
+#: classes/handler/public.php:750
+#: classes/pref/users.php:349
 msgid "Reset password"
 msgstr "Сбросить пароль"
 
-#: classes/handler/public.php:849
+#: classes/handler/public.php:760
 msgid "Some of the required form parameters are missing or incorrect."
 msgstr "Некоторые поля формы пусты или некорректно заполнены"
 
-#: classes/handler/public.php:853
-#: classes/handler/public.php:919
+#: classes/handler/public.php:764
+#: classes/handler/public.php:830
 msgid "Go back"
 msgstr "Перейти назад"
 
-#: classes/handler/public.php:890
+#: classes/handler/public.php:801
 msgid "[tt-rss] Password reset request"
 msgstr "[tt-rss] Уведомление о смене пароля"
 
-#: classes/handler/public.php:915
+#: classes/handler/public.php:826
 msgid "Sorry, login and email combination not found."
 msgstr "Извините, комбинация логина и электронного адреса не обнаружена."
 
-#: classes/handler/public.php:937
+#: classes/handler/public.php:848
 msgid "Your access level is insufficient to run this script."
 msgstr "В доступе отказано - недостаточный уровень привилегий."
 
-#: classes/handler/public.php:963
+#: classes/handler/public.php:874
 msgid "Database Updater"
 msgstr "Обновление базы данных"
 
-#: classes/handler/public.php:1028
+#: classes/handler/public.php:939
 msgid "Perform updates"
 msgstr "Применить обновления"
 
 #: classes/pref/labels.php:22
-#: classes/pref/filters.php:348
-#: classes/pref/filters.php:823
+#: classes/pref/filters.php:373
+#: classes/pref/filters.php:863
 msgid "Caption"
 msgstr "Заголовок"
 
@@ -1250,59 +1143,55 @@ msgid "Created label <b>%s</b>"
 msgstr "Добавлена метка <b>%s</b>"
 
 #: classes/pref/labels.php:258
-#: classes/pref/users.php:334
-#: classes/pref/feeds.php:1337
-#: classes/pref/feeds.php:1600
-#: classes/pref/feeds.php:1664
-#: classes/pref/filters.php:359
-#: classes/pref/filters.php:407
-#: classes/pref/filters.php:744
-#: classes/pref/filters.php:832
-#: classes/pref/filters.php:859
+#: classes/pref/filters.php:384
+#: classes/pref/filters.php:441
+#: classes/pref/filters.php:784
+#: classes/pref/filters.php:872
+#: classes/pref/filters.php:899
+#: classes/pref/users.php:333
 #: classes/pref/prefs.php:992
-#: plugins/instances/init.php:284
+#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1574
+#: classes/pref/feeds.php:1638
 msgid "Select"
 msgstr "Выбрать"
 
 #: classes/pref/labels.php:261
-#: classes/pref/users.php:337
-#: classes/pref/feeds.php:1340
-#: classes/pref/feeds.php:1603
-#: classes/pref/feeds.php:1667
-#: classes/pref/filters.php:362
-#: classes/pref/filters.php:410
-#: classes/pref/filters.php:747
-#: classes/pref/filters.php:835
-#: classes/pref/filters.php:862
+#: classes/pref/filters.php:387
+#: classes/pref/filters.php:444
+#: classes/pref/filters.php:787
+#: classes/pref/filters.php:875
+#: classes/pref/filters.php:902
+#: classes/pref/users.php:336
 #: classes/pref/prefs.php:995
+#: classes/pref/feeds.php:1314
+#: classes/pref/feeds.php:1577
+#: classes/pref/feeds.php:1641
 #: classes/feeds.php:102
-#: plugins/instances/init.php:287
 msgid "All"
 msgstr "Все"
 
 #: classes/pref/labels.php:263
-#: classes/pref/users.php:339
-#: classes/pref/feeds.php:1342
-#: classes/pref/feeds.php:1605
-#: classes/pref/feeds.php:1669
-#: classes/pref/filters.php:364
-#: classes/pref/filters.php:412
-#: classes/pref/filters.php:749
-#: classes/pref/filters.php:837
-#: classes/pref/filters.php:864
+#: classes/pref/filters.php:389
+#: classes/pref/filters.php:446
+#: classes/pref/filters.php:789
+#: classes/pref/filters.php:877
+#: classes/pref/filters.php:904
+#: classes/pref/users.php:338
 #: classes/pref/prefs.php:997
+#: classes/pref/feeds.php:1316
+#: classes/pref/feeds.php:1579
+#: classes/pref/feeds.php:1643
 #: classes/feeds.php:105
-#: plugins/instances/init.php:289
 msgid "None"
 msgstr "Ничего"
 
 #: classes/pref/labels.php:270
-#: classes/pref/users.php:348
+#: classes/pref/filters.php:512
+#: classes/pref/filters.php:806
+#: classes/pref/users.php:347
 #: classes/pref/feeds.php:767
-#: classes/pref/filters.php:478
-#: classes/pref/filters.php:766
-#: classes/feeds.php:1154
-#: plugins/instances/init.php:294
+#: classes/feeds.php:1147
 msgid "Remove"
 msgstr "Удалить"
 
@@ -1310,9 +1199,172 @@ msgstr "Удалить"
 msgid "Clear colors"
 msgstr "Очистить цвета"
 
+#: classes/pref/filters.php:153
+#, fuzzy
+msgid "Preview article"
+msgstr "Отфильтровать статью"
+
+#: classes/pref/filters.php:264
+#: classes/pref/filters.php:558
+msgid "(inverse)"
+msgstr "(Инвертирован)"
+
+#: classes/pref/filters.php:260
+#: classes/pref/filters.php:557
+#, php-format
+msgid "%s on %s in %s %s"
+msgstr "%s на %s в %s %s"
+
+#: classes/pref/filters.php:379
+#: classes/pref/filters.php:867
+#: classes/pref/filters.php:981
+msgid "Match"
+msgstr "Искать"
+
+#: classes/pref/filters.php:393
+#: classes/pref/filters.php:450
+#: classes/pref/filters.php:881
+#: classes/pref/filters.php:908
+msgid "Add"
+msgstr "Добавить"
+
+#: classes/pref/filters.php:396
+#: classes/pref/filters.php:453
+#: classes/pref/filters.php:884
+#: classes/pref/filters.php:911
+#: classes/feeds.php:122
+msgid "Delete"
+msgstr "Удалить"
+
+#: classes/pref/filters.php:436
+#: classes/pref/filters.php:894
+msgid "Apply actions"
+msgstr "Применить действия"
+
+#: classes/pref/filters.php:486
+#: classes/pref/filters.php:923
+msgid "Enabled"
+msgstr "Включен"
+
+#: classes/pref/filters.php:495
+#: classes/pref/filters.php:926
+msgid "Match any rule"
+msgstr "Удовлетворяет любому правилу"
+
+#: classes/pref/filters.php:504
+#: classes/pref/filters.php:929
+msgid "Inverse matching"
+msgstr "Инвертировать фильтр"
+
+#: classes/pref/filters.php:516
+#: classes/pref/filters.php:936
+msgid "Test"
+msgstr "Проверить"
+
+#: classes/pref/filters.php:780
+#: classes/pref/users.php:323
+#: classes/pref/feeds.php:1307
+#: classes/feeds.php:1118
+#: classes/feeds.php:1184
+#: js/tt-rss.js:165
+msgid "Search"
+msgstr "Поиск"
+
+#: classes/pref/filters.php:796
+msgid "Combine"
+msgstr "Комбинировать"
+
+#: classes/pref/filters.php:799
+#: classes/pref/users.php:345
+msgid "Edit"
+msgstr "Редактировать"
+
+#: classes/pref/filters.php:802
+#: classes/pref/feeds.php:1327
+#: classes/pref/feeds.php:1341
+msgid "Reset sort order"
+msgstr "Сбросить сортировку"
+
+#: classes/pref/filters.php:810
+#: classes/pref/feeds.php:1363
+msgid "Rescore articles"
+msgstr "Заново оценить статьи"
+
+#: classes/pref/filters.php:939
+msgid "Create"
+msgstr "Создать"
+
+#: classes/pref/filters.php:993
+msgid "Inverse regular expression matching"
+msgstr "Инвертировать совпадение с регулярным выражением"
+
+#: classes/pref/filters.php:995
+msgid "on field"
+msgstr "по полю:"
+
+#: classes/pref/filters.php:1001
+#: js/PrefFilterTree.js:64
+msgid "in"
+msgstr "в"
+
+#: classes/pref/filters.php:1014
+msgid "Wiki: Filters"
+msgstr "Фильтры на Вики"
+
+#: classes/pref/filters.php:1019
+msgid "Save rule"
+msgstr "Сохранить правило"
+
+#: classes/pref/filters.php:1019
+#: js/functions.js:865
+msgid "Add rule"
+msgstr "Добавить правило..."
+
+#: classes/pref/filters.php:1042
+msgid "Perform Action"
+msgstr "Выполнить действия"
+
+#: classes/pref/filters.php:1093
+#, fuzzy
+msgid "No actions available"
+msgstr "Доступная новая версия!"
+
+#: classes/pref/filters.php:1112
+msgid "Save action"
+msgstr "Сохранить действие"
+
+#: classes/pref/filters.php:1112
+#: js/functions.js:887
+msgid "Add action"
+msgstr "Добавить действие"
+
+#: classes/pref/filters.php:1136
+msgid "[No caption]"
+msgstr "[Нет заголовка]"
+
+#: classes/pref/filters.php:1138
+#, php-format
+msgid "%s (%d rule)"
+msgid_plural "%s (%d rules)"
+msgstr[0] "%s (%d метка)"
+msgstr[1] "%s (%d метки)"
+msgstr[2] "%s (%d меток)"
+
+#: classes/pref/filters.php:1153
+#, fuzzy
+msgid "matches any rule"
+msgstr "Удовлетворяет любому правилу"
+
+#: classes/pref/filters.php:1156
+#, php-format
+msgid "%s (+%d action)"
+msgid_plural "%s (+%d actions)"
+msgstr[0] "%s (+%d действие)"
+msgstr[1] "%s (+%d действия)"
+msgstr[2] "%s (+%d действий)"
+
 #: classes/pref/users.php:6
 #: classes/pref/system.php:8
-#: plugins/instances/init.php:154
 msgid "Your access level is insufficient to open this tab."
 msgstr "Вашего уровня доступа недостаточно для открытия этой вкладки."
 
@@ -1323,8 +1375,8 @@ msgstr "Редактировать правило"
 
 #: classes/pref/users.php:56
 #: classes/pref/feeds.php:637
-#: classes/pref/feeds.php:878
-#: classes/feeds.php:1075
+#: classes/pref/feeds.php:866
+#: classes/feeds.php:1068
 msgid "Authentication"
 msgstr "Авторизация"
 
@@ -1334,7 +1386,7 @@ msgstr "Уровень доступа:"
 
 #: classes/pref/users.php:77
 #: classes/pref/feeds.php:667
-#: classes/pref/feeds.php:896
+#: classes/pref/feeds.php:884
 msgid "Options"
 msgstr "Опции:"
 
@@ -1348,7 +1400,7 @@ msgid "User not found"
 msgstr "Пользователь не найден"
 
 #: classes/pref/users.php:132
-#: classes/pref/users.php:400
+#: classes/pref/users.php:399
 msgid "Registered"
 msgstr "Зарегистрирован"
 
@@ -1366,7 +1418,7 @@ msgid "Stored articles"
 msgstr "Отмеченные"
 
 #: classes/pref/users.php:145
-#: classes/pref/users.php:399
+#: classes/pref/users.php:398
 msgid "Subscribed feeds"
 msgstr "Подписан на каналы"
 
@@ -1385,509 +1437,57 @@ msgstr "Не могу добавить пользователя <b>%s</b>"
 msgid "User <b>%s</b> already exists."
 msgstr "Пользователь <b>%s</b> уже существует."
 
-#: classes/pref/users.php:265
+#: classes/pref/users.php:264
 #, php-format
 msgid "Changed password of user <b>%s</b> to <b>%s</b>"
 msgstr "Пароль пользователя <b>%s</b> изменен на <b>%s</b>"
 
-#: classes/pref/users.php:267
+#: classes/pref/users.php:266
 #, php-format
 msgid "Sending new password of user <b>%s</b> to <b>%s</b>"
 msgstr "Пароль пользователя <b>%s</b> изменен на <b>%s</b>"
 
-#: classes/pref/users.php:291
+#: classes/pref/users.php:290
 msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] Уведомление о смене пароля"
 
-#: classes/pref/users.php:324
-#: classes/pref/feeds.php:1333
-#: classes/pref/filters.php:740
-#: classes/feeds.php:1125
-#: classes/feeds.php:1191
-#: js/tt-rss.js:165
-msgid "Search"
-msgstr "Поиск"
-
-#: classes/pref/users.php:342
+#: classes/pref/users.php:341
 msgid "Create user"
 msgstr "Добавить пользователя"
 
-#: classes/pref/users.php:346
-#: classes/pref/filters.php:759
-#: plugins/instances/init.php:293
-msgid "Edit"
-msgstr "Редактировать"
-
-#: classes/pref/users.php:397
+#: classes/pref/users.php:396
 #: classes/pref/feeds.php:643
-#: classes/pref/feeds.php:882
-#: classes/pref/feeds.php:1836
-#: classes/feeds.php:1079
+#: classes/pref/feeds.php:870
+#: classes/pref/feeds.php:1810
+#: classes/feeds.php:1072
 msgid "Login"
 msgstr "Пользователь:"
 
-#: classes/pref/users.php:398
+#: classes/pref/users.php:397
 msgid "Access Level"
 msgstr "Уровень доступа:"
 
-#: classes/pref/users.php:401
+#: classes/pref/users.php:400
 msgid "Last login"
 msgstr "Последний вход"
 
-#: classes/pref/users.php:420
-#: plugins/instances/init.php:334
+#: classes/pref/users.php:419
 msgid "Click to edit"
 msgstr "Щёлкните для редактирования"
 
-#: classes/pref/users.php:441
+#: classes/pref/users.php:440
 msgid "No users defined."
 msgstr "Пользователи не определены."
 
-#: classes/pref/users.php:443
+#: classes/pref/users.php:442
 msgid "No matching users found."
 msgstr "Подходящих пользователей не найдено."
 
-#: classes/pref/system.php:29
-msgid "Error Log"
-msgstr "Журнал ошибок"
-
-#: classes/pref/system.php:40
-msgid "Refresh"
-msgstr "Обновить"
-
-#: classes/pref/system.php:43
-msgid "Clear log"
-msgstr "Очистить журнал"
-
-#: classes/pref/system.php:48
-msgid "Error"
-msgstr "Ошибка"
-
-#: classes/pref/system.php:49
-msgid "Filename"
-msgstr "Имя файла"
-
-#: classes/pref/system.php:50
-msgid "Message"
-msgstr "Сообщение"
-
-#: classes/pref/system.php:52
-msgid "Date"
-msgstr "Дата"
-
-#: classes/pref/feeds.php:15
-msgid "Check to enable field"
-msgstr "Проверить доступность поля"
-
-#: classes/pref/feeds.php:65
-#: classes/pref/feeds.php:214
-#: classes/pref/feeds.php:258
-#: classes/pref/feeds.php:264
-#: classes/pref/feeds.php:290
-#, php-format
-msgid "(%d feed)"
-msgid_plural "(%d feeds)"
-msgstr[0] "(%d канал)"
-msgstr[1] "(%d канала)"
-msgstr[2] "(%d каналов)"
-
-#: classes/pref/feeds.php:537
 #: classes/pref/prefs.php:18
+#: classes/pref/feeds.php:537
 msgid "General"
 msgstr "Общие"
 
-#: classes/pref/feeds.php:561
-msgid "Feed Title"
-msgstr "Заголовок"
-
-#: classes/pref/feeds.php:595
-#: classes/pref/feeds.php:830
-#: classes/pref/feeds.php:1822
-#: classes/feeds.php:1055
-msgid "Place in category:"
-msgstr "Поместить в категорию:"
-
-#: classes/pref/feeds.php:608
-#: classes/pref/feeds.php:844
-#, fuzzy
-msgid "Language:"
-msgstr "Язык"
-
-#: classes/pref/feeds.php:615
-#: classes/pref/feeds.php:853
-msgid "Update"
-msgstr "Обновить"
-
-#: classes/pref/feeds.php:630
-#: classes/pref/feeds.php:869
-msgid "Article purging:"
-msgstr "Удаление сообщений:"
-
-#: classes/pref/feeds.php:658
-#: classes/pref/feeds.php:890
-#: classes/pref/feeds.php:1839
-#: classes/pref/prefs.php:245
-#: classes/feeds.php:1083
-msgid "Password"
-msgstr "Пароль"
-
-#: classes/pref/feeds.php:662
-msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
-msgstr "<b>Подсказка:</b> Вам потребуется задать Ваши учетные данные, если канал требует авторизацию, за исключением каналов в Twitter."
-
-#: classes/pref/feeds.php:681
-#: classes/pref/feeds.php:900
-msgid "Hide from Popular feeds"
-msgstr "Спрятать из списка популярных каналов"
-
-#: classes/pref/feeds.php:693
-#: classes/pref/feeds.php:906
-msgid "Include in e-mail digest"
-msgstr "Включить в e-mail дайджест"
-
-#: classes/pref/feeds.php:706
-#: classes/pref/feeds.php:912
-msgid "Always display image attachments"
-msgstr "Всегда показывать вложенные изображения"
-
-#: classes/pref/feeds.php:719
-#: classes/pref/feeds.php:920
-msgid "Do not embed images"
-msgstr "Не показывать изображения"
-
-#: classes/pref/feeds.php:732
-#: classes/pref/feeds.php:928
-msgid "Cache media"
-msgstr ""
-
-#: classes/pref/feeds.php:744
-#: classes/pref/feeds.php:934
-msgid "Mark updated articles as unread"
-msgstr "Пометить все статьи как прочитанные?"
-
-#: classes/pref/feeds.php:748
-msgid "Icon"
-msgstr "Иконка"
-
-#: classes/pref/feeds.php:765
-msgid "Replace"
-msgstr "Заменить"
-
-#: classes/pref/feeds.php:772
-#: classes/pref/prefs.php:698
-msgid "Plugins"
-msgstr "Плагины"
-
-#: classes/pref/feeds.php:792
-msgid "Resubscribe to push updates"
-msgstr "Переподписаться на PUSH обновления"
-
-#: classes/pref/feeds.php:799
-msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
-msgstr "Сбрасывает статусподписки с помощью механизма PubSubHubbub"
-
-#: classes/pref/feeds.php:1200
-#: classes/pref/feeds.php:1253
-msgid "All done."
-msgstr "Всё выполнено."
-
-#: classes/pref/feeds.php:1308
-msgid "Feeds with errors"
-msgstr "Каналы с ошибками"
-
-#: classes/pref/feeds.php:1315
-msgid "Inactive feeds"
-msgstr "Неактивные каналы"
-
-#: classes/pref/feeds.php:1351
-msgid "Edit selected feeds"
-msgstr "Редактировать выбранные каналы"
-
-#: classes/pref/feeds.php:1353
-#: classes/pref/feeds.php:1367
-#: classes/pref/filters.php:762
-msgid "Reset sort order"
-msgstr "Сбросить сортировку"
-
-#: classes/pref/feeds.php:1355
-#: js/prefs.js:1622
-msgid "Batch subscribe"
-msgstr "Массовая подписка"
-
-#: classes/pref/feeds.php:1362
-msgid "Categories"
-msgstr "Категории"
-
-#: classes/pref/feeds.php:1365
-msgid "Add category"
-msgstr "Добавить категорию"
-
-#: classes/pref/feeds.php:1369
-msgid "Remove selected"
-msgstr "Удалить выбранное"
-
-#: classes/pref/feeds.php:1380
-msgid "More actions..."
-msgstr "Действия..."
-
-#: classes/pref/feeds.php:1384
-msgid "Manual purge"
-msgstr "Ручная очистка"
-
-#: classes/pref/feeds.php:1388
-msgid "Clear feed data"
-msgstr "Очистить данные канала."
-
-#: classes/pref/feeds.php:1389
-#: classes/pref/filters.php:770
-msgid "Rescore articles"
-msgstr "Заново оценить статьи"
-
-#: classes/pref/feeds.php:1442
-msgid "OPML"
-msgstr "OPML"
-
-#: classes/pref/feeds.php:1444
-msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
-msgstr "Используя OPML Вы можете экспортировать и импортировать Ваши каналы, фильтры, метки и настройки Tiny Tiny RSS."
-
-#: classes/pref/feeds.php:1445
-msgid "Only main settings profile can be migrated using OPML."
-msgstr "Только главный профиль настроек будет экспортирован в OPML."
-
-#: classes/pref/feeds.php:1458
-msgid "Import my OPML"
-msgstr "Импортировать мой OPML"
-
-#: classes/pref/feeds.php:1464
-msgid "Filename:"
-msgstr "Имя файла:"
-
-#: classes/pref/feeds.php:1466
-msgid "Include settings"
-msgstr "Включить настройки"
-
-#: classes/pref/feeds.php:1470
-msgid "Export OPML"
-msgstr "Экспортировать OPML"
-
-#: classes/pref/feeds.php:1474
-msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
-msgstr "Ваш OPML может быть опубликован и на него могут подписаться те, кто знает URL, указанный ниже."
-
-#: classes/pref/feeds.php:1478
-msgid "Public OPML URL"
-msgstr "Публичная ссылка на OPML"
-
-#: classes/pref/feeds.php:1479
-msgid "Display published OPML URL"
-msgstr "Отобразить публичный OPML URL"
-
-#: classes/pref/feeds.php:1488
-msgid "Firefox integration"
-msgstr "Интеграция в Firefox"
-
-#: classes/pref/feeds.php:1490
-msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
-msgstr "Этот сайт с Tiny Tiny RSS можно использовать в Firefox как агрегатор RSS. Для этого щёлкните по ссылке ниже."
-
-#: classes/pref/feeds.php:1497
-msgid "Click here to register this site as a feed reader."
-msgstr "Щёлкните здесь для регистрации сайта в роли RSS агрегатора"
-
-#: classes/pref/feeds.php:1505
-msgid "Published & shared articles / Generated feeds"
-msgstr "Опубликованные & общие каналы / Автоматически созданные каналы"
-
-#: classes/pref/feeds.php:1507
-msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
-msgstr "Опубликованные статьи экспортируется в качестве общего RSS канала и могут быть подписаны кем-либо ещё, кто знает URL, указанный ниже."
-
-#: classes/pref/feeds.php:1514
-#: classes/feeds.php:54
-#: classes/feeds.php:140
-msgid "View as RSS"
-msgstr "Показать в формате RSS"
-
-#: classes/pref/feeds.php:1515
-msgid "Display URL"
-msgstr "Показать URL"
-
-#: classes/pref/feeds.php:1518
-msgid "Clear all generated URLs"
-msgstr "Очистить все созданные URL"
-
-#: classes/pref/feeds.php:1596
-msgid "These feeds have not been updated with new content for 3 months (oldest first):"
-msgstr "Эти каналы не были обновлены в течение трех месяцев:"
-
-#: classes/pref/feeds.php:1630
-#: classes/pref/feeds.php:1694
-msgid "Click to edit feed"
-msgstr "Щёлкните для редактирования"
-
-#: classes/pref/feeds.php:1648
-#: classes/pref/feeds.php:1714
-msgid "Unsubscribe from selected feeds"
-msgstr "Отписаться от выбранных каналов?"
-
-#: classes/pref/feeds.php:1819
-msgid "Add one valid RSS feed per line (no feed detection is done)"
-msgstr "Впишите по одному действительному RSS каналу на строчку (валидность канала не проверяется)"
-
-#: classes/pref/feeds.php:1828
-msgid "Feeds to subscribe, One per line"
-msgstr "Каналы для подписки. По одному на строчку"
-
-#: classes/pref/feeds.php:1851
-msgid "Feeds require authentication."
-msgstr "Каналы требуют авторизацию."
-
-#: classes/pref/feeds.php:1858
-#: classes/feeds.php:1099
-#: classes/feeds.php:1153
-msgid "Subscribe"
-msgstr "Подписаться"
-
-#: classes/pref/filters.php:151
-#, fuzzy
-msgid "Preview article"
-msgstr "Отфильтровать статью"
-
-#: classes/pref/filters.php:239
-#: classes/pref/filters.php:518
-msgid "(inverse)"
-msgstr "(Инвертирован)"
-
-#: classes/pref/filters.php:235
-#: classes/pref/filters.php:517
-#, php-format
-msgid "%s on %s in %s %s"
-msgstr "%s на %s в %s %s"
-
-#: classes/pref/filters.php:354
-#: classes/pref/filters.php:827
-#: classes/pref/filters.php:942
-msgid "Match"
-msgstr "Искать"
-
-#: classes/pref/filters.php:368
-#: classes/pref/filters.php:416
-#: classes/pref/filters.php:841
-#: classes/pref/filters.php:868
-msgid "Add"
-msgstr "Добавить"
-
-#: classes/pref/filters.php:371
-#: classes/pref/filters.php:419
-#: classes/pref/filters.php:844
-#: classes/pref/filters.php:871
-#: classes/feeds.php:122
-msgid "Delete"
-msgstr "Удалить"
-
-#: classes/pref/filters.php:402
-#: classes/pref/filters.php:854
-msgid "Apply actions"
-msgstr "Применить действия"
-
-#: classes/pref/filters.php:452
-#: classes/pref/filters.php:883
-msgid "Enabled"
-msgstr "Включен"
-
-#: classes/pref/filters.php:461
-#: classes/pref/filters.php:886
-msgid "Match any rule"
-msgstr "Удовлетворяет любому правилу"
-
-#: classes/pref/filters.php:470
-#: classes/pref/filters.php:889
-msgid "Inverse matching"
-msgstr "Инвертировать фильтр"
-
-#: classes/pref/filters.php:482
-#: classes/pref/filters.php:896
-msgid "Test"
-msgstr "Проверить"
-
-#: classes/pref/filters.php:756
-msgid "Combine"
-msgstr "Комбинировать"
-
-#: classes/pref/filters.php:899
-msgid "Create"
-msgstr "Создать"
-
-#: classes/pref/filters.php:954
-msgid "Inverse regular expression matching"
-msgstr "Инвертировать совпадение с регулярным выражением"
-
-#: classes/pref/filters.php:956
-msgid "on field"
-msgstr "по полю:"
-
-#: classes/pref/filters.php:962
-#: js/PrefFilterTree.js:64
-msgid "in"
-msgstr "в"
-
-#: classes/pref/filters.php:975
-msgid "Wiki: Filters"
-msgstr "Фильтры на Вики"
-
-#: classes/pref/filters.php:980
-msgid "Save rule"
-msgstr "Сохранить правило"
-
-#: classes/pref/filters.php:980
-#: js/functions.js:865
-msgid "Add rule"
-msgstr "Добавить правило..."
-
-#: classes/pref/filters.php:1003
-msgid "Perform Action"
-msgstr "Выполнить действия"
-
-#: classes/pref/filters.php:1054
-#, fuzzy
-msgid "No actions available"
-msgstr "Доступная новая версия!"
-
-#: classes/pref/filters.php:1073
-msgid "Save action"
-msgstr "Сохранить действие"
-
-#: classes/pref/filters.php:1073
-#: js/functions.js:887
-msgid "Add action"
-msgstr "Добавить действие"
-
-#: classes/pref/filters.php:1097
-msgid "[No caption]"
-msgstr "[Нет заголовка]"
-
-#: classes/pref/filters.php:1099
-#, php-format
-msgid "%s (%d rule)"
-msgid_plural "%s (%d rules)"
-msgstr[0] "%s (%d метка)"
-msgstr[1] "%s (%d метки)"
-msgstr[2] "%s (%d меток)"
-
-#: classes/pref/filters.php:1114
-#, fuzzy
-msgid "matches any rule"
-msgstr "Удовлетворяет любому правилу"
-
-#: classes/pref/filters.php:1117
-#, php-format
-msgid "%s (+%d action)"
-msgid_plural "%s (+%d actions)"
-msgstr[0] "%s (+%d действие)"
-msgstr[1] "%s (+%d действия)"
-msgstr[2] "%s (+%d действий)"
-
 #: classes/pref/prefs.php:19
 msgid "Interface"
 msgstr "Интерфейс"
@@ -2061,7 +1661,7 @@ msgid "Strip all but most common HTML tags when reading articles."
 msgstr "Вырезать все, кроме основных HTML тегов при показе статей."
 
 #: classes/pref/prefs.php:53
-#: js/prefs.js:1584
+#: js/prefs.js:1580
 msgid "Customize stylesheet"
 msgstr "Изменить пользовательские стили"
 
@@ -2129,6 +1729,14 @@ msgstr "Уровень доступа:"
 msgid "Save data"
 msgstr "Сохранить"
 
+#: classes/pref/prefs.php:245
+#: classes/pref/feeds.php:658
+#: classes/pref/feeds.php:878
+#: classes/pref/feeds.php:1813
+#: classes/feeds.php:1076
+msgid "Password"
+msgstr "Пароль"
+
 #: classes/pref/prefs.php:254
 msgid "Your password is at default value, please change it."
 msgstr "Используется пароль по умолчанию, пожалуйста, измените его."
@@ -2227,18 +1835,23 @@ msgstr "Управление профилями"
 msgid "Reset to defaults"
 msgstr "Сбросить настройки"
 
+#: classes/pref/prefs.php:698
+#: classes/pref/feeds.php:772
+msgid "Plugins"
+msgstr "Плагины"
+
 #: classes/pref/prefs.php:700
 msgid "You will need to reload Tiny Tiny RSS for plugin changes to take effect."
 msgstr "Вам понадобится перезагрузить Tiny Tiny RSS, чтобы изменения в плагинах возымели силу."
 
-#: classes/pref/prefs.php:702
-msgid "Download more plugins at tt-rss.org <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forums</a> or <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a>."
-msgstr "Скачайте больше плагинов на tt-rss.org <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">форумах</a> или <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">вики</a>."
-
-#: classes/pref/prefs.php:732
+#: classes/pref/prefs.php:730
 msgid "System plugins"
 msgstr "Системные плагины"
 
+#: classes/pref/prefs.php:731
+msgid "System plugins are enabled in <strong>config.php</strong> for all users."
+msgstr ""
+
 #: classes/pref/prefs.php:736
 #: classes/pref/prefs.php:792
 msgid "Plugin"
@@ -2308,6 +1921,341 @@ msgstr "Удалить выбранные профили?"
 msgid "Activate profile"
 msgstr "Активировать профиль"
 
+#: classes/pref/feeds.php:15
+msgid "Check to enable field"
+msgstr "Проверить доступность поля"
+
+#: classes/pref/feeds.php:65
+#: classes/pref/feeds.php:214
+#: classes/pref/feeds.php:258
+#: classes/pref/feeds.php:264
+#: classes/pref/feeds.php:290
+#, php-format
+msgid "(%d feed)"
+msgid_plural "(%d feeds)"
+msgstr[0] "(%d канал)"
+msgstr[1] "(%d канала)"
+msgstr[2] "(%d каналов)"
+
+#: classes/pref/feeds.php:561
+msgid "Feed Title"
+msgstr "Заголовок"
+
+#: classes/pref/feeds.php:595
+#: classes/pref/feeds.php:818
+#: classes/pref/feeds.php:1796
+#: classes/feeds.php:1048
+msgid "Place in category:"
+msgstr "Поместить в категорию:"
+
+#: classes/pref/feeds.php:608
+#: classes/pref/feeds.php:832
+#, fuzzy
+msgid "Language:"
+msgstr "Язык"
+
+#: classes/pref/feeds.php:615
+#: classes/pref/feeds.php:841
+msgid "Update"
+msgstr "Обновить"
+
+#: classes/pref/feeds.php:630
+#: classes/pref/feeds.php:857
+msgid "Article purging:"
+msgstr "Удаление сообщений:"
+
+#: classes/pref/feeds.php:662
+msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
+msgstr "<b>Подсказка:</b> Вам потребуется задать Ваши учетные данные, если канал требует авторизацию, за исключением каналов в Twitter."
+
+#: classes/pref/feeds.php:681
+#: classes/pref/feeds.php:888
+msgid "Hide from Popular feeds"
+msgstr "Спрятать из списка популярных каналов"
+
+#: classes/pref/feeds.php:693
+#: classes/pref/feeds.php:894
+msgid "Include in e-mail digest"
+msgstr "Включить в e-mail дайджест"
+
+#: classes/pref/feeds.php:706
+#: classes/pref/feeds.php:900
+msgid "Always display image attachments"
+msgstr "Всегда показывать вложенные изображения"
+
+#: classes/pref/feeds.php:719
+#: classes/pref/feeds.php:908
+msgid "Do not embed images"
+msgstr "Не показывать изображения"
+
+#: classes/pref/feeds.php:732
+#: classes/pref/feeds.php:916
+msgid "Cache media"
+msgstr ""
+
+#: classes/pref/feeds.php:744
+#: classes/pref/feeds.php:922
+msgid "Mark updated articles as unread"
+msgstr "Пометить все статьи как прочитанные?"
+
+#: classes/pref/feeds.php:748
+msgid "Icon"
+msgstr "Иконка"
+
+#: classes/pref/feeds.php:765
+msgid "Replace"
+msgstr "Заменить"
+
+#: classes/pref/feeds.php:1174
+#: classes/pref/feeds.php:1227
+msgid "All done."
+msgstr "Всё выполнено."
+
+#: classes/pref/feeds.php:1282
+msgid "Feeds with errors"
+msgstr "Каналы с ошибками"
+
+#: classes/pref/feeds.php:1289
+msgid "Inactive feeds"
+msgstr "Неактивные каналы"
+
+#: classes/pref/feeds.php:1325
+msgid "Edit selected feeds"
+msgstr "Редактировать выбранные каналы"
+
+#: classes/pref/feeds.php:1329
+#: js/prefs.js:1618
+msgid "Batch subscribe"
+msgstr "Массовая подписка"
+
+#: classes/pref/feeds.php:1336
+msgid "Categories"
+msgstr "Категории"
+
+#: classes/pref/feeds.php:1339
+msgid "Add category"
+msgstr "Добавить категорию"
+
+#: classes/pref/feeds.php:1343
+msgid "Remove selected"
+msgstr "Удалить выбранное"
+
+#: classes/pref/feeds.php:1354
+msgid "More actions..."
+msgstr "Действия..."
+
+#: classes/pref/feeds.php:1358
+msgid "Manual purge"
+msgstr "Ручная очистка"
+
+#: classes/pref/feeds.php:1362
+msgid "Clear feed data"
+msgstr "Очистить данные канала."
+
+#: classes/pref/feeds.php:1416
+msgid "OPML"
+msgstr "OPML"
+
+#: classes/pref/feeds.php:1418
+msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
+msgstr "Используя OPML Вы можете экспортировать и импортировать Ваши каналы, фильтры, метки и настройки Tiny Tiny RSS."
+
+#: classes/pref/feeds.php:1419
+msgid "Only main settings profile can be migrated using OPML."
+msgstr "Только главный профиль настроек будет экспортирован в OPML."
+
+#: classes/pref/feeds.php:1432
+msgid "Import my OPML"
+msgstr "Импортировать мой OPML"
+
+#: classes/pref/feeds.php:1438
+msgid "Filename:"
+msgstr "Имя файла:"
+
+#: classes/pref/feeds.php:1440
+msgid "Include settings"
+msgstr "Включить настройки"
+
+#: classes/pref/feeds.php:1444
+msgid "Export OPML"
+msgstr "Экспортировать OPML"
+
+#: classes/pref/feeds.php:1448
+msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
+msgstr "Ваш OPML может быть опубликован и на него могут подписаться те, кто знает URL, указанный ниже."
+
+#: classes/pref/feeds.php:1452
+msgid "Public OPML URL"
+msgstr "Публичная ссылка на OPML"
+
+#: classes/pref/feeds.php:1453
+msgid "Display published OPML URL"
+msgstr "Отобразить публичный OPML URL"
+
+#: classes/pref/feeds.php:1462
+msgid "Firefox integration"
+msgstr "Интеграция в Firefox"
+
+#: classes/pref/feeds.php:1464
+msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
+msgstr "Этот сайт с Tiny Tiny RSS можно использовать в Firefox как агрегатор RSS. Для этого щёлкните по ссылке ниже."
+
+#: classes/pref/feeds.php:1471
+msgid "Click here to register this site as a feed reader."
+msgstr "Щёлкните здесь для регистрации сайта в роли RSS агрегатора"
+
+#: classes/pref/feeds.php:1479
+msgid "Published & shared articles / Generated feeds"
+msgstr "Опубликованные & общие каналы / Автоматически созданные каналы"
+
+#: classes/pref/feeds.php:1481
+msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
+msgstr "Опубликованные статьи экспортируется в качестве общего RSS канала и могут быть подписаны кем-либо ещё, кто знает URL, указанный ниже."
+
+#: classes/pref/feeds.php:1488
+#: classes/feeds.php:54
+#: classes/feeds.php:140
+msgid "View as RSS"
+msgstr "Показать в формате RSS"
+
+#: classes/pref/feeds.php:1489
+msgid "Display URL"
+msgstr "Показать URL"
+
+#: classes/pref/feeds.php:1492
+msgid "Clear all generated URLs"
+msgstr "Очистить все созданные URL"
+
+#: classes/pref/feeds.php:1570
+msgid "These feeds have not been updated with new content for 3 months (oldest first):"
+msgstr "Эти каналы не были обновлены в течение трех месяцев:"
+
+#: classes/pref/feeds.php:1604
+#: classes/pref/feeds.php:1668
+msgid "Click to edit feed"
+msgstr "Щёлкните для редактирования"
+
+#: classes/pref/feeds.php:1622
+#: classes/pref/feeds.php:1688
+msgid "Unsubscribe from selected feeds"
+msgstr "Отписаться от выбранных каналов?"
+
+#: classes/pref/feeds.php:1793
+msgid "Add one valid RSS feed per line (no feed detection is done)"
+msgstr "Впишите по одному действительному RSS каналу на строчку (валидность канала не проверяется)"
+
+#: classes/pref/feeds.php:1802
+msgid "Feeds to subscribe, One per line"
+msgstr "Каналы для подписки. По одному на строчку"
+
+#: classes/pref/feeds.php:1825
+msgid "Feeds require authentication."
+msgstr "Каналы требуют авторизацию."
+
+#: classes/pref/feeds.php:1832
+#: classes/feeds.php:1092
+#: classes/feeds.php:1146
+msgid "Subscribe"
+msgstr "Подписаться"
+
+#: classes/pref/system.php:29
+msgid "Error Log"
+msgstr "Журнал ошибок"
+
+#: classes/pref/system.php:40
+msgid "Refresh"
+msgstr "Обновить"
+
+#: classes/pref/system.php:43
+msgid "Clear log"
+msgstr "Очистить журнал"
+
+#: classes/pref/system.php:48
+msgid "Error"
+msgstr "Ошибка"
+
+#: classes/pref/system.php:49
+msgid "Filename"
+msgstr "Имя файла"
+
+#: classes/pref/system.php:50
+msgid "Message"
+msgstr "Сообщение"
+
+#: classes/pref/system.php:52
+msgid "Date"
+msgstr "Дата"
+
+#: classes/opml.php:28
+#: classes/opml.php:33
+msgid "OPML Utility"
+msgstr "Утилита OPML"
+
+#: classes/opml.php:37
+msgid "Importing OPML..."
+msgstr "Импортирую OPML..."
+
+#: classes/opml.php:41
+msgid "Return to preferences"
+msgstr "Вернуться к настройкам"
+
+#: classes/opml.php:295
+#, php-format
+msgid "Adding feed: %s"
+msgstr "Добавляю канал: %s"
+
+#: classes/opml.php:306
+#, php-format
+msgid "Duplicate feed: %s"
+msgstr "Канал уже существует: %s"
+
+#: classes/opml.php:320
+#, php-format
+msgid "Adding label %s"
+msgstr "Добавляю метку %s"
+
+#: classes/opml.php:323
+#, php-format
+msgid "Duplicate label: %s"
+msgstr "Метка уже существует: %s"
+
+#: classes/opml.php:335
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr "Устанавливаю ключ настроек %s в %s"
+
+#: classes/opml.php:367
+msgid "Adding filter..."
+msgstr "Добавляю фильтр..."
+
+#: classes/opml.php:486
+#, php-format
+msgid "Processing category: %s"
+msgstr "Обрабатываю категорию: %s"
+
+#: classes/opml.php:532
+#, php-format
+msgid "Upload failed with error code %d"
+msgstr "Ошибка загрузки, код ошибки: %d"
+
+#: classes/opml.php:544
+#: plugins/import_export/init.php:448
+msgid "Unable to move uploaded file."
+msgstr "Не могу переместить загруженный файл."
+
+#: classes/opml.php:548
+#: plugins/import_export/init.php:452
+msgid "Error: please upload OPML file."
+msgstr "Ошибка: пожалуйста загрузите OPML файл."
+
+#: classes/opml.php:559
+msgid "Error: unable to find moved OPML file."
+msgstr "Ошибка: не могу найти перемещенный OPML файл."
+
+#: classes/opml.php:566
+msgid "Error while parsing document."
+msgstr "Ошибка при разборе документа."
+
 #: classes/feeds.php:53
 msgid "View as RSS feed"
 msgstr "Показать в виде RSS-канала"
@@ -2348,8 +2296,8 @@ msgstr "Переместить назад"
 
 #: classes/feeds.php:127
 #: classes/feeds.php:132
-#: plugins/mail/init.php:75
 #: plugins/mailto/init.php:25
+#: plugins/mail/init.php:75
 msgid "Forward by email"
 msgstr "Отправить по почте"
 
@@ -2357,314 +2305,144 @@ msgstr "Отправить по почте"
 msgid "Feed:"
 msgstr "Канал:"
 
-#: classes/feeds.php:229
-#: classes/feeds.php:892
+#: classes/feeds.php:228
+#: classes/feeds.php:885
 msgid "Feed not found."
 msgstr "Канал не найден."
 
-#: classes/feeds.php:300
+#: classes/feeds.php:291
 msgid "Never"
 msgstr "Никогда"
 
-#: classes/feeds.php:413
+#: classes/feeds.php:405
 #, php-format
 msgid "Imported at %s"
 msgstr "Импортировано в %s"
 
-#: classes/feeds.php:472
-#: classes/feeds.php:569
+#: classes/feeds.php:464
+#: classes/feeds.php:561
 msgid "mark feed as read"
 msgstr "Отметить канал как прочитанный"
 
-#: classes/feeds.php:630
+#: classes/feeds.php:622
 msgid "Collapse article"
 msgstr "Свернуть статью"
 
-#: classes/feeds.php:791
+#: classes/feeds.php:784
 msgid "No unread articles found to display."
 msgstr "Не найдено не прочитанных статей"
 
-#: classes/feeds.php:794
+#: classes/feeds.php:787
 msgid "No updated articles found to display."
 msgstr "Не найдено не прочитанных статей."
 
-#: classes/feeds.php:797
+#: classes/feeds.php:790
 msgid "No starred articles found to display."
 msgstr "Не найдено отмеченных статей"
 
-#: classes/feeds.php:801
+#: classes/feeds.php:794
 msgid "No articles found to display. You can assign articles to labels manually from article header context menu (applies to all selected articles) or use a filter."
 msgstr "Нет статей для показа. Вы можете присвоить метку вручную из контекстного меню заголовка статьи (будет присвоено всем выбранным статьям) или используйте фильтр."
 
-#: classes/feeds.php:803
+#: classes/feeds.php:796
 msgid "No articles found to display."
 msgstr "Статей не найдено."
 
-#: classes/feeds.php:818
-#: classes/feeds.php:992
+#: classes/feeds.php:811
+#: classes/feeds.php:985
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "Последнее обновление в %s"
 
-#: classes/feeds.php:828
-#: classes/feeds.php:1002
+#: classes/feeds.php:821
+#: classes/feeds.php:995
 msgid "Some feeds have update errors (click for details)"
 msgstr "Некоторые каналы не могут быть обновлены (щёлкните для подробностей)"
 
-#: classes/feeds.php:982
+#: classes/feeds.php:975
 msgid "No feed selected."
 msgstr "Канал не выбран."
 
-#: classes/feeds.php:1041
-#: classes/feeds.php:1049
+#: classes/feeds.php:1034
+#: classes/feeds.php:1042
 msgid "Feed or site URL"
 msgstr "Канал или URL сайта"
 
-#: classes/feeds.php:1063
+#: classes/feeds.php:1056
 msgid "Available feeds"
 msgstr "Доступные каналы"
 
-#: classes/feeds.php:1094
+#: classes/feeds.php:1087
 msgid "This feed requires authentication."
 msgstr "Этот канал требует авторизации."
 
-#: classes/feeds.php:1102
+#: classes/feeds.php:1095
 msgid "More feeds"
 msgstr "Другие каналы"
 
-#: classes/feeds.php:1129
+#: classes/feeds.php:1122
 msgid "Popular feeds"
 msgstr "Популярные каналы"
 
-#: classes/feeds.php:1130
+#: classes/feeds.php:1123
 msgid "Feed archive"
 msgstr "Архив канала"
 
-#: classes/feeds.php:1133
+#: classes/feeds.php:1126
 msgid "limit:"
 msgstr "Ограничение:"
 
-#: classes/feeds.php:1165
+#: classes/feeds.php:1158
 msgid "Look for"
 msgstr "Искать"
 
-#: classes/feeds.php:1173
+#: classes/feeds.php:1166
 #, php-format
 msgid "in %s"
 msgstr ""
 
-#: classes/feeds.php:1178
+#: classes/feeds.php:1171
 msgid "Used for word stemming"
 msgstr ""
 
-#: classes/feeds.php:1187
+#: classes/feeds.php:1180
 msgid "Search syntax"
 msgstr "Искать метку"
 
-#: plugins/instances/init.php:141
-msgid "Linked"
-msgstr "Связанные"
-
-#: plugins/instances/init.php:204
-#: plugins/instances/init.php:395
-msgid "Instance"
-msgstr "Инсталляция"
-
-#: plugins/instances/init.php:215
-#: plugins/instances/init.php:312
-#: plugins/instances/init.php:404
-msgid "Instance URL"
-msgstr "URL инсталляции"
-
-#: plugins/instances/init.php:226
-#: plugins/instances/init.php:414
-msgid "Access key:"
-msgstr "Ключ доступа:"
-
-#: plugins/instances/init.php:229
-#: plugins/instances/init.php:313
-#: plugins/instances/init.php:417
-msgid "Access key"
-msgstr "Ключ доступа"
-
-#: plugins/instances/init.php:233
-#: plugins/instances/init.php:421
-msgid "Use one access key for both linked instances."
-msgstr "Используйте один ключ доступа для обоих инсталляций"
-
-#: plugins/instances/init.php:241
-#: plugins/instances/init.php:429
-msgid "Generate new key"
-msgstr "Создать новый ключ"
-
-#: plugins/instances/init.php:292
-msgid "Link instance"
-msgstr "Связать инсталляцию"
-
-#: plugins/instances/init.php:304
-msgid "You can connect other instances of Tiny Tiny RSS to this one to share Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
-msgstr "Вы можете связывать другие инсталляции Tiny Tiny RSS с этой, чтоб объединять \"Популярные\" каналы. Свяжите с этой инсталляцией Tiny Tiny RSS, используя этот URL:"
-
-#: plugins/instances/init.php:314
-msgid "Last connected"
-msgstr "Последнее соединение"
-
-#: plugins/instances/init.php:315
-msgid "Status"
-msgstr "Статус"
-
-#: plugins/instances/init.php:316
-msgid "Stored feeds"
-msgstr "Хранимые каналы"
-
-#: plugins/instances/init.php:433
-msgid "Create link"
-msgstr "Создать ссылку"
+#: classes/feeds.php:1596
+msgid "Starred articles"
+msgstr "Отмеченные"
 
-#: plugins/nsfw/init.php:30
-#: plugins/nsfw/init.php:42
-msgid "Not work safe (click to toggle)"
-msgstr "Не безопасно на работе (кликните, чтоб переключить)"
+#: classes/feeds.php:1598
+msgid "Published articles"
+msgstr "Опубликованные"
 
-#: plugins/nsfw/init.php:52
-msgid "NSFW Plugin"
-msgstr "Не-безопасно-на-работе плагин"
+#: classes/feeds.php:1600
+msgid "Fresh articles"
+msgstr "Свежие"
 
-#: plugins/nsfw/init.php:79
-msgid "Tags to consider NSFW (comma-separated)"
-msgstr "Теги для признания Не Безопасным на Работе (разделенные запятой)"
+#: classes/feeds.php:1604
+msgid "Archived articles"
+msgstr "Архив статей"
 
-#: plugins/nsfw/init.php:100
-msgid "Configuration saved."
-msgstr "Конфигурация сохранена."
+#: classes/feeds.php:1606
+msgid "Recently read"
+msgstr "Недавно прочитанные"
 
-#: plugins/note/init.php:26
-#: plugins/note/note.js:11
-msgid "Edit article note"
-msgstr "Редактировать заметку"
+#: classes/feeds.php:1716
+msgid "Special"
+msgstr "Особые"
+
+#: classes/feeds.php:1962
+#, php-format
+msgid "Search results: %s"
+msgstr "Результаты поиска: %s"
 
 #: plugins/vf_shared/init.php:16
-#: plugins/vf_shared/init.php:69
+#: plugins/vf_shared/init.php:60
 msgid "Shared articles"
 msgstr "Общие статьи"
 
-#: plugins/auth_internal/init.php:65
-msgid "Please enter your one time password:"
-msgstr "Пожалуйста, введите Ваш одноразовый пароль:"
-
-#: plugins/auth_internal/init.php:188
-msgid "Password has been changed."
-msgstr "Пароль был изменен."
-
-#: plugins/auth_internal/init.php:190
-msgid "Old password is incorrect."
-msgstr "Старый пароль неправилен."
-
-#: plugins/af_readability/init.php:21
-msgid "Data saved."
-msgstr ""
-
-#: plugins/af_readability/init.php:33
-#, fuzzy
-msgid "Inline content"
-msgstr "Прокрутить содержимое статьи"
-
-#: plugins/af_readability/init.php:39
-msgid "Readability settings (af_readability)"
-msgstr ""
-
-#: plugins/af_readability/init.php:66
-msgid "Use Readability for pages shared via bookmarklet."
-msgstr ""
-
-#: plugins/af_readability/init.php:78
-#: plugins/af_psql_trgm/init.php:191
-msgid "Currently enabled for (click to edit):"
-msgstr ""
-
-#: plugins/af_readability/init.php:95
-#, fuzzy
-msgid "Readability"
-msgstr "Проверить доступность"
-
-#: plugins/af_readability/init.php:106
-#, fuzzy
-msgid "Inline article content"
-msgstr "Прокрутить содержимое статьи"
-
-#: plugins/af_redditimgur/init.php:25
-msgid "Reddit content settings (af_redditimgur)"
-msgstr ""
-
-#: plugins/af_redditimgur/init.php:50
-msgid "Uses Readability (full-text-rss) implementation by <a target='_blank' href='https://bitbucket.org/fivefilters/'>FiveFilters.org</a>"
-msgstr ""
-
-#: plugins/af_redditimgur/init.php:54
-msgid "Extract missing content using Readability"
-msgstr ""
-
-#: plugins/af_redditimgur/init.php:59
-msgid "Enable additional duplicate checking"
-msgstr ""
-
-#: plugins/af_redditimgur/init.php:73
-#: plugins/af_zz_imgproxy/init.php:225
-#, fuzzy
-msgid "Configuration saved"
-msgstr "Конфигурация сохранена."
-
-#: plugins/af_psql_trgm/init.php:28
-#, php-format
-msgid "Data saved (%s, %d)"
-msgstr ""
-
-#: plugins/af_psql_trgm/init.php:112
-msgid "Show related articles"
-msgstr "Показать похожие статьи"
-
-#: plugins/af_psql_trgm/init.php:118
-#: plugins/af_psql_trgm/init.php:220
-msgid "Mark similar articles as read"
-msgstr "Пометить похожие статьи как прочитанные?"
-
-#: plugins/af_psql_trgm/init.php:157
-msgid "PostgreSQL trigram extension returns string similarity as a floating point number (0-1). Setting it too low might produce false positives, zero disables checking."
-msgstr ""
-
-#: plugins/af_psql_trgm/init.php:160
-msgid "Global settings"
-msgstr "Общие настройки"
-
-#: plugins/af_psql_trgm/init.php:164
-msgid "Minimum similarity:"
-msgstr ""
-
-#: plugins/af_psql_trgm/init.php:169
-msgid "Minimum title length:"
-msgstr ""
-
-#: plugins/af_psql_trgm/init.php:174
-#, fuzzy
-msgid "Enable for all feeds:"
-msgstr "Обновить все каналы"
-
-#: plugins/af_psql_trgm/init.php:209
-msgid "Similarity (pg_trgm)"
-msgstr ""
-
-#: plugins/af_comics/init.php:40
-msgid "Feeds supported by af_comics"
-msgstr ""
-
-#: plugins/af_comics/init.php:42
-msgid "The following comics are currently supported:"
-msgstr ""
-
-#: plugins/af_comics/init.php:60
-msgid "GoComics requires a specific URL to workaround their lack of feed support: <code>http://feeds.feedburner.com/uclick/<em>comic_name</em></code> (e.g. <code>http://www.gocomics.com/garfield</code> uses <code>http://feeds.feedburner.com/uclick/garfield</code>)."
-msgstr ""
-
 #: plugins/import_export/init.php:58
 msgid "Import and export"
 msgstr "Импорт и экспорт"
@@ -2681,19 +2459,19 @@ msgstr "Экспортировать данные"
 msgid "Import"
 msgstr "Импортировать"
 
-#: plugins/import_export/init.php:225
+#: plugins/import_export/init.php:231
 msgid "Could not import: incorrect schema version."
 msgstr "Не могу импортировать данные: некорректная версия схемы."
 
-#: plugins/import_export/init.php:230
+#: plugins/import_export/init.php:236
 msgid "Could not import: unrecognized document format."
 msgstr "Не могу импортировать данные: неизвестный формат данных."
 
-#: plugins/import_export/init.php:391
+#: plugins/import_export/init.php:397
 msgid "Finished: "
 msgstr "Завершено:"
 
-#: plugins/import_export/init.php:392
+#: plugins/import_export/init.php:398
 #, php-format
 msgid "%d article processed, "
 msgid_plural "%d articles processed, "
@@ -2701,7 +2479,7 @@ msgstr[0] "%d статья обработана"
 msgstr[1] "%d статьи обработано"
 msgstr[2] "%d статей обработано"
 
-#: plugins/import_export/init.php:393
+#: plugins/import_export/init.php:399
 #, php-format
 msgid "%d imported, "
 msgid_plural "%d imported, "
@@ -2709,7 +2487,7 @@ msgstr[0] "%d импортирован."
 msgstr[1] "%d импортировано."
 msgstr[2] "%d импортировано."
 
-#: plugins/import_export/init.php:394
+#: plugins/import_export/init.php:400
 #, php-format
 msgid "%d feed created."
 msgid_plural "%d feeds created."
@@ -2717,62 +2495,50 @@ msgstr[0] "%d канал создан."
 msgstr[1] "%d канала создано."
 msgstr[2] "%d каналов создано."
 
-#: plugins/import_export/init.php:399
+#: plugins/import_export/init.php:405
 msgid "Could not load XML document."
 msgstr "Не могу загрузить XML документ."
 
-#: plugins/import_export/init.php:411
+#: plugins/import_export/init.php:417
 msgid "Prepare data"
 msgstr "Подготовить данные"
 
-#: plugins/import_export/init.php:428
+#: plugins/import_export/init.php:434
 #, fuzzy, php-format
 msgid "Upload failed with error code %d (%s)"
 msgstr "Ошибка загрузки, код ошибки: %d"
 
-#: plugins/import_export/init.php:454
+#: plugins/import_export/init.php:460
 msgid "No file uploaded."
 msgstr "Ни одного файла не загружено."
 
-#: plugins/mail/init.php:28
-msgid "Mail addresses saved."
-msgstr ""
-
-#: plugins/mail/init.php:34
-msgid "Mail plugin"
-msgstr "Почтовый плагин"
-
-#: plugins/mail/init.php:36
-msgid "You can set predefined email addressed here (comma-separated list):"
-msgstr ""
-
+#: plugins/mailto/init.php:48
+#: plugins/mailto/init.php:54
 #: plugins/mail/init.php:112
 #: plugins/mail/init.php:118
-#: plugins/mailto/init.php:49
-#: plugins/mailto/init.php:55
 msgid "[Forwarded]"
 msgstr "[Переслано]"
 
+#: plugins/mailto/init.php:48
 #: plugins/mail/init.php:112
-#: plugins/mailto/init.php:49
 msgid "Multiple articles"
 msgstr "Все статьи"
 
-#: plugins/mail/init.php:140
-msgid "To:"
-msgstr "Кому:"
+#: plugins/mailto/init.php:70
+msgid "Clicking the following link to invoke your mail client:"
+msgstr "Кликните по следующей ссылке, чтоб запустить Ваш почтовый клиент:"
 
-#: plugins/mail/init.php:155
-msgid "Subject:"
-msgstr "Заголовок:"
+#: plugins/mailto/init.php:74
+msgid "Forward selected article(s) by email."
+msgstr "Переслать выбранные статьи по электронной почте"
 
-#: plugins/mail/init.php:172
-msgid "Send e-mail"
-msgstr "Отправить письмо"
+#: plugins/mailto/init.php:77
+msgid "You should be able to edit the message before sending in your mail client."
+msgstr "Вы сможете отредактировать сообщение перед посылкой в почтовом клиенте."
 
-#: plugins/close_button/init.php:22
-msgid "Close article"
-msgstr "Закрыть статью"
+#: plugins/mailto/init.php:82
+msgid "Close this dialog"
+msgstr "Закрыть это окно"
 
 #: plugins/bookmarklets/init.php:20
 msgid "Bookmarklets"
@@ -2795,34 +2561,121 @@ msgstr "Подписаться в Tiny Tiny RSS"
 msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
 msgstr "Используйте этот букмарклет для опубликования отдельных страниц с помощью Tiny Tiny RSS"
 
+#: plugins/af_psql_trgm/init.php:28
+#, php-format
+msgid "Data saved (%s, %d)"
+msgstr ""
+
+#: plugins/af_psql_trgm/init.php:112
+msgid "Show related articles"
+msgstr "Показать похожие статьи"
+
+#: plugins/af_psql_trgm/init.php:118
+#: plugins/af_psql_trgm/init.php:220
+msgid "Mark similar articles as read"
+msgstr "Пометить похожие статьи как прочитанные?"
+
+#: plugins/af_psql_trgm/init.php:157
+msgid "PostgreSQL trigram extension returns string similarity as a floating point number (0-1). Setting it too low might produce false positives, zero disables checking."
+msgstr ""
+
+#: plugins/af_psql_trgm/init.php:160
+msgid "Global settings"
+msgstr "Общие настройки"
+
+#: plugins/af_psql_trgm/init.php:164
+msgid "Minimum similarity:"
+msgstr ""
+
+#: plugins/af_psql_trgm/init.php:169
+msgid "Minimum title length:"
+msgstr ""
+
+#: plugins/af_psql_trgm/init.php:174
+#, fuzzy
+msgid "Enable for all feeds:"
+msgstr "Обновить все каналы"
+
+#: plugins/af_psql_trgm/init.php:191
+#: plugins/af_readability/init.php:78
+msgid "Currently enabled for (click to edit):"
+msgstr ""
+
+#: plugins/af_psql_trgm/init.php:209
+msgid "Similarity (pg_trgm)"
+msgstr ""
+
+#: plugins/nsfw/init.php:30
+#: plugins/nsfw/init.php:42
+msgid "Not work safe (click to toggle)"
+msgstr "Не безопасно на работе (кликните, чтоб переключить)"
+
+#: plugins/nsfw/init.php:52
+msgid "NSFW Plugin"
+msgstr "Не-безопасно-на-работе плагин"
+
+#: plugins/nsfw/init.php:79
+msgid "Tags to consider NSFW (comma-separated)"
+msgstr "Теги для признания Не Безопасным на Работе (разделенные запятой)"
+
+#: plugins/nsfw/init.php:100
+msgid "Configuration saved."
+msgstr "Конфигурация сохранена."
+
 #: plugins/toggle_sidebar/init.php:23
 msgid "Collapse feedlist"
 msgstr "Свернуть список каналов"
 
-#: plugins/af_zz_imgproxy/init.php:186
-msgid "Image proxy settings (af_zz_imgproxy)"
+#: plugins/af_readability/init.php:21
+msgid "Data saved."
 msgstr ""
 
-#: plugins/af_zz_imgproxy/init.php:211
+#: plugins/af_readability/init.php:33
 #, fuzzy
-msgid "Enable proxy for all remote images."
-msgstr "Обновить все каналы"
+msgid "Inline content"
+msgstr "Прокрутить содержимое статьи"
 
-#: plugins/mailto/init.php:71
-msgid "Clicking the following link to invoke your mail client:"
-msgstr "Кликните по следующей ссылке, чтоб запустить Ваш почтовый клиент:"
+#: plugins/af_readability/init.php:39
+msgid "Readability settings (af_readability)"
+msgstr ""
 
-#: plugins/mailto/init.php:75
-msgid "Forward selected article(s) by email."
-msgstr "Переслать выбранные статьи по электронной почте"
+#: plugins/af_readability/init.php:66
+msgid "Use Readability for pages shared via bookmarklet."
+msgstr ""
 
-#: plugins/mailto/init.php:78
-msgid "You should be able to edit the message before sending in your mail client."
-msgstr "Вы сможете отредактировать сообщение перед посылкой в почтовом клиенте."
+#: plugins/af_readability/init.php:95
+#, fuzzy
+msgid "Readability"
+msgstr "Проверить доступность"
 
-#: plugins/mailto/init.php:83
-msgid "Close this dialog"
-msgstr "Закрыть это окно"
+#: plugins/af_readability/init.php:106
+#, fuzzy
+msgid "Inline article content"
+msgstr "Прокрутить содержимое статьи"
+
+#: plugins/mail/init.php:28
+msgid "Mail addresses saved."
+msgstr ""
+
+#: plugins/mail/init.php:34
+msgid "Mail plugin"
+msgstr "Почтовый плагин"
+
+#: plugins/mail/init.php:36
+msgid "You can set predefined email addressed here (comma-separated list):"
+msgstr ""
+
+#: plugins/mail/init.php:140
+msgid "To:"
+msgstr "Кому:"
+
+#: plugins/mail/init.php:155
+msgid "Subject:"
+msgstr "Заголовок:"
+
+#: plugins/mail/init.php:172
+msgid "Send e-mail"
+msgstr "Отправить письмо"
 
 #: plugins/share/init.php:39
 msgid "You can disable all articles shared by unique URLs here."
@@ -2836,24 +2689,97 @@ msgstr "Убрать все статьи из общего доступа"
 msgid "Share by URL"
 msgstr "Опубликовать статью по URL"
 
-#: plugins/share/init.php:97
+#: plugins/share/init.php:96
 msgid "You can share this article by the following unique URL:"
 msgstr "Вы можете опубликовать данную статью с помощью следующего уникального URL:"
 
-#: plugins/share/init.php:115
+#: plugins/share/init.php:114
 msgid "Unshare article"
 msgstr "Убрать статью из общего доступа"
 
+#: plugins/af_comics/init.php:48
+msgid "Feeds supported by af_comics"
+msgstr ""
+
+#: plugins/af_comics/init.php:50
+msgid "The following comics are currently supported:"
+msgstr ""
+
+#: plugins/af_comics/init.php:68
+msgid "GoComics requires a specific URL to workaround their lack of feed support: <code>http://feeds.feedburner.com/uclick/<em>comic_name</em></code> (e.g. <code>http://www.gocomics.com/garfield</code> uses <code>http://feeds.feedburner.com/uclick/garfield</code>)."
+msgstr ""
+
+#: plugins/af_comics/init.php:70
+msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:25
+msgid "Reddit content settings (af_redditimgur)"
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:50
+msgid "Uses Readability (full-text-rss) implementation by <a target='_blank' href='https://bitbucket.org/fivefilters/'>FiveFilters.org</a>"
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:54
+msgid "Extract missing content using Readability"
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:59
+msgid "Enable additional duplicate checking"
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:73
+#: plugins/af_zz_imgproxy/init.php:254
+#, fuzzy
+msgid "Configuration saved"
+msgstr "Конфигурация сохранена."
+
+#: plugins/note/init.php:26
+#: plugins/note/note.js:11
+msgid "Edit article note"
+msgstr "Редактировать заметку"
+
+#: plugins/close_button/init.php:25
+msgid "Close article"
+msgstr "Закрыть статью"
+
+#: plugins/af_zz_imgproxy/init.php:210
+msgid "Image proxy settings (af_zz_imgproxy)"
+msgstr ""
+
+#: plugins/af_zz_imgproxy/init.php:234
+#, fuzzy
+msgid "Enable proxy for all remote images."
+msgstr "Обновить все каналы"
+
+#: plugins/af_zz_imgproxy/init.php:238
+#, fuzzy
+msgid "Don't cache files locally."
+msgstr "Кэшировать изображения локально"
+
+#: plugins/auth_internal/init.php:65
+msgid "Please enter your one time password:"
+msgstr "Пожалуйста, введите Ваш одноразовый пароль:"
+
+#: plugins/auth_internal/init.php:188
+msgid "Password has been changed."
+msgstr "Пароль был изменен."
+
+#: plugins/auth_internal/init.php:190
+msgid "Old password is incorrect."
+msgstr "Старый пароль неправилен."
+
 #: js/FeedTree.js:172
 #, fuzzy
 msgid "(Un)collapse"
 msgstr "Свернуть/развернуть боковую панель"
 
-#: js/PrefFeedTree.js:52
+#: js/PrefFeedTree.js:54
 msgid "Edit category"
 msgstr "Редактировать категорию"
 
-#: js/PrefFeedTree.js:59
+#: js/PrefFeedTree.js:61
 msgid "Remove category"
 msgstr "Удалить категорию"
 
@@ -2888,63 +2814,55 @@ msgid "Create Filter"
 msgstr "Создать фильтр"
 
 #: js/functions.js:1128
-msgid "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification hub again on next feed update."
-msgstr "Перезагрузить подписку? Tiny Tiny RSS попытается подписаться к хабу обновлений в следующее обновление каналов."
-
-#: js/functions.js:1139
-msgid "Subscription reset."
-msgstr "Подписка перезагружена."
-
-#: js/functions.js:1149
-#: js/tt-rss.js:695
+#: js/tt-rss.js:696
 #, perl-format
 msgid "Unsubscribe from %s?"
 msgstr "Отписаться от %s?"
 
-#: js/functions.js:1152
+#: js/functions.js:1131
 msgid "Removing feed..."
 msgstr "Канал удаляется..."
 
-#: js/functions.js:1225
+#: js/functions.js:1204
 msgid "Please enter category title:"
 msgstr "Пожалуйста, введите название категории:"
 
-#: js/functions.js:1250
+#: js/functions.js:1229
 msgid "Generate new syndication address for this feed?"
 msgstr "Создать новый адрес распространения для этого канала?"
 
-#: js/functions.js:1254
-#: js/prefs.js:1154
+#: js/functions.js:1233
+#: js/prefs.js:1150
 msgid "Trying to change address..."
 msgstr "Попытка изменить адрес.."
 
-#: js/functions.js:1497
-#: js/functions.js:1606
+#: js/functions.js:1476
+#: js/functions.js:1585
 #: js/prefs.js:398
 #: js/prefs.js:424
 #: js/prefs.js:456
 #: js/prefs.js:599
 #: js/prefs.js:617
-#: js/prefs.js:1136
-#: js/prefs.js:1263
+#: js/prefs.js:1132
+#: js/prefs.js:1259
 msgid "No feeds are selected."
 msgstr "Нет выбранных каналов."
 
-#: js/functions.js:1540
+#: js/functions.js:1519
 msgid "Remove selected feeds from the archive? Feeds with stored articles will not be removed."
 msgstr "Удалить выбранные каналы из архива? Каналы с сохраненным статьями удалены не будут."
 
-#: js/functions.js:1577
+#: js/functions.js:1556
 msgid "Feeds with update errors"
 msgstr "Канала с ошибками обновления"
 
-#: js/functions.js:1588
-#: js/prefs.js:1117
+#: js/functions.js:1567
+#: js/prefs.js:1113
 msgid "Remove selected feeds?"
 msgstr "Удалить выбранные каналы?"
 
-#: js/functions.js:1591
-#: js/prefs.js:1120
+#: js/functions.js:1570
+#: js/prefs.js:1116
 msgid "Removing selected feeds..."
 msgstr "Выбранные каналы удаляются..."
 
@@ -2967,9 +2885,7 @@ msgstr "Редактор пользователей"
 #: js/prefs.js:100
 #: js/prefs.js:209
 #: js/prefs.js:706
-#: plugins/instances/instances.js:26
-#: plugins/instances/instances.js:89
-#: js/functions.js:1408
+#: js/functions.js:1387
 msgid "Saving data..."
 msgstr "Идёт сохранение..."
 
@@ -2994,7 +2910,7 @@ msgid "Removing selected labels..."
 msgstr "Выбранные метки удаляются..."
 
 #: js/prefs.js:308
-#: js/prefs.js:1304
+#: js/prefs.js:1300
 msgid "No labels are selected."
 msgstr "Нет выбранных меток."
 
@@ -3093,28 +3009,28 @@ msgstr "Сохранить изменения выбранных каналов?
 msgid "OPML Import"
 msgstr "Импорт OPML"
 
-#: js/prefs.js:764
+#: js/prefs.js:759
 msgid "Please choose an OPML file first."
 msgstr "Пожалуйста выберите файл OPML."
 
-#: js/prefs.js:767
+#: js/prefs.js:762
 #: plugins/import_export/import_export.js:115
 msgid "Importing, please wait..."
 msgstr "Идет импорт, пожалуйста, подождите..."
 
-#: js/prefs.js:928
+#: js/prefs.js:924
 msgid "Reset to defaults?"
 msgstr "Сбросить настройки?"
 
-#: js/prefs.js:1628
+#: js/prefs.js:1624
 msgid "Subscribing to feeds..."
 msgstr "Подписываюсь на каналы..."
 
-#: js/prefs.js:1647
+#: js/prefs.js:1643
 msgid "Clear stored data for this plugin?"
 msgstr "Удалить сохраненные данные для этого плагина?"
 
-#: js/prefs.js:1661
+#: js/prefs.js:1657
 msgid "Clear all messages in the error log?"
 msgstr "Удалить все сообщения в логе ошибок?"
 
@@ -3126,58 +3042,58 @@ msgstr "Пометить все статьи как прочитанные?"
 msgid "Marking all feeds as read..."
 msgstr "Помечаю все каналы как прочитанные..."
 
-#: js/tt-rss.js:401
+#: js/tt-rss.js:402
 msgid "Please enable mail plugin first."
 msgstr "Пожалуйста, сначала включите плагин mail."
 
-#: js/tt-rss.js:449
-#: js/functions.js:1387
-#: js/tt-rss.js:676
+#: js/tt-rss.js:450
+#: js/functions.js:1366
+#: js/tt-rss.js:677
 msgid "You can't edit this kind of feed."
 msgstr "Вы не можете редактировать этот канал."
 
-#: js/tt-rss.js:530
+#: js/tt-rss.js:531
 msgid "Please enable embed_original plugin first."
 msgstr "Пожалуйста, сначала включите плагин embed_original."
 
-#: js/tt-rss.js:543
-#: js/tt-rss.js:726
+#: js/tt-rss.js:544
+#: js/tt-rss.js:727
 msgid "Widescreen is not available in combined mode."
 msgstr ""
 
-#: js/tt-rss.js:824
+#: js/tt-rss.js:825
 msgid "You can't rescore this kind of feed."
 msgstr "Вы не можете снова оценить этот канал."
 
-#: js/tt-rss.js:829
-#: js/tt-rss.js:689
+#: js/tt-rss.js:830
+#: js/tt-rss.js:690
 msgid "Please select some feed first."
 msgstr "Пожалуйста выберите какой-нибудь канал."
 
-#: js/tt-rss.js:834
+#: js/tt-rss.js:835
 #, perl-format
 msgid "Rescore articles in %s?"
 msgstr "Установить оценку статьям в %s?"
 
-#: js/tt-rss.js:837
+#: js/tt-rss.js:838
 msgid "Rescoring articles..."
 msgstr "Переоценка статей..."
 
-#: js/viewfeed.js:919
-#: js/viewfeed.js:957
-#: js/viewfeed.js:1005
-#: js/viewfeed.js:1931
-#: plugins/mail/mail.js:7
+#: js/viewfeed.js:921
+#: js/viewfeed.js:959
+#: js/viewfeed.js:1007
+#: js/viewfeed.js:1933
 #: plugins/mailto/init.js:7
-#: js/viewfeed.js:677
-#: js/viewfeed.js:699
-#: js/viewfeed.js:720
-#: js/viewfeed.js:779
-#: js/viewfeed.js:807
+#: plugins/mail/mail.js:7
+#: js/viewfeed.js:679
+#: js/viewfeed.js:701
+#: js/viewfeed.js:722
+#: js/viewfeed.js:781
+#: js/viewfeed.js:809
 msgid "No articles are selected."
 msgstr "Нет выбранных статей."
 
-#: js/viewfeed.js:927
+#: js/viewfeed.js:929
 #, perl-format
 msgid "Delete %d selected article in %s?"
 msgid_plural "Delete %d selected articles in %s?"
@@ -3185,7 +3101,7 @@ msgstr[0] "Удалить %d выбранную статью в %s?"
 msgstr[1] "Удалить %d выбранных статьи(ей) в %s?"
 msgstr[2] "Удалить %d выбранных статьи(ей) в %s?"
 
-#: js/viewfeed.js:929
+#: js/viewfeed.js:931
 #, perl-format
 msgid "Delete %d selected article?"
 msgid_plural "Delete %d selected articles?"
@@ -3193,7 +3109,7 @@ msgstr[0] "Удалить %d выбранную статью?"
 msgstr[1] "Удалить %d выбранных статьи(ей)?"
 msgstr[2] "Удалить %d выбранных статьи(ей)?"
 
-#: js/viewfeed.js:966
+#: js/viewfeed.js:968
 #, perl-format
 msgid "Archive %d selected article in %s?"
 msgid_plural "Archive %d selected articles in %s?"
@@ -3201,7 +3117,7 @@ msgstr[0] "Архивировать %d выбранную статью в %s?"
 msgstr[1] "Архивировать %d выбранных статьи(ей) в %s?"
 msgstr[2] "Архивировать %d выбранных статьи(ей) в %s?"
 
-#: js/viewfeed.js:969
+#: js/viewfeed.js:971
 #, perl-format
 msgid "Move %d archived article back?"
 msgid_plural "Move %d archived articles back?"
@@ -3209,11 +3125,11 @@ msgstr[0] "Переместить %d архивированную статью �
 msgstr[1] "Переместить %d архивированных статьи(ей) назад?"
 msgstr[2] "Переместить %d архивированных статьи(ей) назад?"
 
-#: js/viewfeed.js:971
+#: js/viewfeed.js:973
 msgid "Please note that unstarred articles might get purged on next feed update."
 msgstr "Пожалуйста, учтите, что не отмеченные звездочкой статьи могут быть удалены при следующем обновлении каналов"
 
-#: js/viewfeed.js:1011
+#: js/viewfeed.js:1013
 #, perl-format
 msgid "Mark %d selected article in %s as read?"
 msgid_plural "Mark %d selected articles in %s as read?"
@@ -3221,86 +3137,57 @@ msgstr[0] "Отметить %d выбранную статью в %s как пр
 msgstr[1] "Отметить %d выбранных(ые) статьи(ей) в %s как прочитанные?"
 msgstr[2] "Отметить %d выбранных(ые) статьи(ей) в %s как прочитанные?"
 
-#: js/viewfeed.js:1031
+#: js/viewfeed.js:1033
 msgid "Edit article Tags"
 msgstr "Редактировать теги"
 
-#: js/viewfeed.js:1037
+#: js/viewfeed.js:1039
 msgid "Saving article tags..."
 msgstr "Сохранить теги статьи..."
 
-#: js/viewfeed.js:1670
+#: js/viewfeed.js:1672
 msgid "Open original article"
 msgstr "Показать оригинальное содержимое статьи"
 
-#: js/viewfeed.js:1677
+#: js/viewfeed.js:1679
 msgid "Display article URL"
 msgstr "Отобразить URL статьи"
 
-#: js/viewfeed.js:1787
+#: js/viewfeed.js:1789
 msgid "Assign label"
 msgstr "Применить метку"
 
-#: js/viewfeed.js:1792
+#: js/viewfeed.js:1794
 msgid "Remove label"
 msgstr "Удалить метку"
 
-#: js/viewfeed.js:1824
+#: js/viewfeed.js:1826
 msgid "Select articles in group"
 msgstr "Выбрать статьи в группе"
 
-#: js/viewfeed.js:1834
+#: js/viewfeed.js:1836
 msgid "Mark group as read"
 msgstr "Пометить группу как прочитанную"
 
-#: js/viewfeed.js:1846
+#: js/viewfeed.js:1848
 msgid "Mark feed as read"
 msgstr "Отметить канал как прочитанный"
 
-#: js/viewfeed.js:1899
+#: js/viewfeed.js:1901
 msgid "Please enter new score for selected articles:"
 msgstr "Пожалуйста, укажите новый рейтинг для выбранных статей:"
 
-#: js/viewfeed.js:1962
+#: js/viewfeed.js:1964
 msgid "Please enter new score for this article:"
 msgstr "Пожалуйста, укажите новый рейтинг для этой статьи:"
 
-#: js/viewfeed.js:1993
+#: js/viewfeed.js:1995
 msgid "Article URL:"
 msgstr "URL статьи:"
 
-#: plugins/instances/instances.js:10
-msgid "Link Instance"
-msgstr "Связать инсталляцию"
-
-#: plugins/instances/instances.js:73
-msgid "Edit Instance"
-msgstr "Редактировать инсталляцию"
-
-#: plugins/instances/instances.js:122
-msgid "Remove selected instances?"
-msgstr "Удалить выбранные инсталляции?"
-
-#: plugins/instances/instances.js:125
-msgid "Removing selected instances..."
-msgstr "Выбранные инсталляции удаляются..."
-
-#: plugins/instances/instances.js:139
-#: plugins/instances/instances.js:151
-msgid "No instances are selected."
-msgstr "Нет выбранных инсталляций."
-
-#: plugins/instances/instances.js:156
-msgid "Please select only one instance."
-msgstr "Пожалуйста выберите только одну инсталляцию."
-
-#: plugins/note/note.js:17
-msgid "Saving article note..."
-msgstr "Сохраняю заметку..."
-
-#: plugins/af_psql_trgm/init.js:11
-msgid "Related articles"
-msgstr "Похожие статьи"
+#: plugins/embed_original/init.js:6
+msgid "Sorry, your browser does not support sandboxed iframes."
+msgstr "Извините, Ваш броузер не поддерживает sandboxed iframes."
 
 #: plugins/import_export/import_export.js:13
 msgid "Export Data"
@@ -3322,11 +3209,15 @@ msgstr "Импортировать данные"
 msgid "Please choose the file first."
 msgstr "Пожалуйста выберите файл."
 
-#: plugins/mail/mail.js:21
 #: plugins/mailto/init.js:21
+#: plugins/mail/mail.js:21
 msgid "Forward article by email"
 msgstr "Переслать статью по электронной почте"
 
+#: plugins/af_psql_trgm/init.js:11
+msgid "Related articles"
+msgstr "Похожие статьи"
+
 #: plugins/mail/mail.js:36
 msgid "Error sending email:"
 msgstr ""
@@ -3335,10 +3226,6 @@ msgstr ""
 msgid "Your message has been sent."
 msgstr "Ваше сообщение было отправлено."
 
-#: plugins/embed_original/init.js:6
-msgid "Sorry, your browser does not support sandboxed iframes."
-msgstr "Извините, Ваш броузер не поддерживает sandboxed iframes."
-
 #: plugins/shorten_expanded/init.js:39
 msgid "Click to expand article"
 msgstr "Щёлкните чтобы развернуть статью"
@@ -3368,7 +3255,7 @@ msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr "Это сделает недействительными все ранее опубликованные URL статьи. Продолжить?"
 
 #: plugins/share/share_prefs.js:6
-#: js/prefs.js:1437
+#: js/prefs.js:1433
 msgid "Clearing URLs..."
 msgstr "Очистка URL..."
 
@@ -3376,23 +3263,44 @@ msgstr "Очистка URL..."
 msgid "Shared URLs cleared."
 msgstr "Общие URL очищены."
 
+#: plugins/note/note.js:17
+msgid "Saving article note..."
+msgstr "Сохраняю заметку..."
+
 #: js/feedlist.js:429
-#: js/feedlist.js:496
 msgid "Mark all articles in %s as read?"
 msgstr "Отметить все статьи в %s как прочитанные?"
 
 #: js/feedlist.js:487
-msgid "Mark all articles in %s older than 1 day as read?"
+#, fuzzy
+msgid "Mark %w in %s older than 1 day as read?"
 msgstr "Отметить все статьи в %s старше 1 дня как прочитанные?"
 
 #: js/feedlist.js:490
-msgid "Mark all articles in %s older than 1 week as read?"
+#, fuzzy
+msgid "Mark %w in %s older than 1 week as read?"
 msgstr "Отметить все статьи в %s старше 1 недели как прочитанные?"
 
 #: js/feedlist.js:493
-msgid "Mark all articles in %s older than 2 weeks as read?"
+#, fuzzy
+msgid "Mark %w in %s older than 2 weeks as read?"
 msgstr "Отметить все статьи в %s старше 2 недель как прочитанные?"
 
+#: js/feedlist.js:496
+#, fuzzy
+msgid "Mark %w in %s as read?"
+msgstr "Отметить все статьи в %s как прочитанные?"
+
+#: js/feedlist.js:499
+#, fuzzy
+msgid "search results"
+msgstr "Результаты поиска"
+
+#: js/feedlist.js:499
+#, fuzzy
+msgid "all articles"
+msgstr "Все статьи"
+
 #: js/functions.js:506
 msgid "Error explained"
 msgstr "Ошибка разъяснена"
@@ -3473,179 +3381,248 @@ msgstr "Вы уже подписаны на этот канал."
 msgid "Edit rule"
 msgstr "Редактировать правило"
 
-#: js/functions.js:1402
+#: js/functions.js:1381
 msgid "Edit Feed"
 msgstr "Редактировать канал"
 
-#: js/functions.js:1435
+#: js/functions.js:1414
 msgid "More Feeds"
 msgstr "Больше каналов"
 
-#: js/functions.js:1631
+#: js/functions.js:1610
 msgid "Help"
 msgstr "Помощь"
 
-#: js/prefs.js:1032
+#: js/prefs.js:1028
 msgid "Remove category %s? Any nested feeds would be placed into Uncategorized."
 msgstr "Удалите категорию %s? Все вложенные каналы будут помещены в \"Без категории\"."
 
-#: js/prefs.js:1038
+#: js/prefs.js:1034
 msgid "Removing category..."
 msgstr "Удаляю категорию..."
 
-#: js/prefs.js:1056
+#: js/prefs.js:1052
 msgid "Remove selected categories?"
 msgstr "Удалить выбранные категории?"
 
-#: js/prefs.js:1059
+#: js/prefs.js:1055
 msgid "Removing selected categories..."
 msgstr "Выбранные категории удаляются..."
 
-#: js/prefs.js:1072
+#: js/prefs.js:1068
 msgid "No categories are selected."
 msgstr "Нет выбранных категорий."
 
-#: js/prefs.js:1079
+#: js/prefs.js:1075
 msgid "Category title:"
 msgstr "Название категории:"
 
-#: js/prefs.js:1083
+#: js/prefs.js:1079
 msgid "Creating category..."
 msgstr "Создаю категорию..."
 
-#: js/prefs.js:1106
+#: js/prefs.js:1102
 msgid "Feeds without recent updates"
 msgstr "Давно не обновлявшиеся каналы"
 
-#: js/prefs.js:1150
+#: js/prefs.js:1146
 msgid "Replace current OPML publishing address with a new one?"
 msgstr "Изменить текущий адрес публикации OPML на новый?"
 
-#: js/prefs.js:1227
+#: js/prefs.js:1223
 msgid "Clearing feed..."
 msgstr "Очистка канала..."
 
-#: js/prefs.js:1247
+#: js/prefs.js:1243
 msgid "Rescore articles in selected feeds?"
 msgstr "Заново оценить статьи в выбранных каналах?"
 
-#: js/prefs.js:1250
+#: js/prefs.js:1246
 msgid "Rescoring selected feeds..."
 msgstr "Переоценка выбранных каналов..."
 
-#: js/prefs.js:1270
+#: js/prefs.js:1266
 msgid "Rescore all articles? This operation may take a lot of time."
 msgstr "Оценить заново все статьи? Эта операция может продолжаться длительное время."
 
-#: js/prefs.js:1273
+#: js/prefs.js:1269
 msgid "Rescoring feeds..."
 msgstr "Переоценка каналов..."
 
-#: js/prefs.js:1289
+#: js/prefs.js:1285
 msgid "Reset selected labels to default colors?"
 msgstr "Сбросить текущие метки на цвета по умолчанию?"
 
-#: js/prefs.js:1321
+#: js/prefs.js:1317
 msgid "Settings Profiles"
 msgstr "Профили настроек"
 
-#: js/prefs.js:1330
+#: js/prefs.js:1326
 msgid "Remove selected profiles? Active and default profiles will not be removed."
 msgstr "Удалить выбранные профили? Активный и профиль по умолчанию удалены не будут."
 
-#: js/prefs.js:1333
+#: js/prefs.js:1329
 msgid "Removing selected profiles..."
 msgstr "Выбранные профили удаляются..."
 
-#: js/prefs.js:1349
+#: js/prefs.js:1345
 msgid "No profiles are selected."
 msgstr "Профиль не выбран"
 
-#: js/prefs.js:1357
-#: js/prefs.js:1410
+#: js/prefs.js:1353
+#: js/prefs.js:1406
 msgid "Activate selected profile?"
 msgstr "Активировать выбранный профиль?"
 
-#: js/prefs.js:1374
-#: js/prefs.js:1426
+#: js/prefs.js:1370
+#: js/prefs.js:1422
 msgid "Please choose a profile to activate."
 msgstr "Пожалуйста выберите какой-нибудь профиль."
 
-#: js/prefs.js:1379
+#: js/prefs.js:1375
 msgid "Creating profile..."
 msgstr "Создаю профиль..."
 
-#: js/prefs.js:1434
+#: js/prefs.js:1430
 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr "Это сделает недействительными все ранее созданные URL канала. Продолжить?"
 
-#: js/prefs.js:1444
+#: js/prefs.js:1440
 msgid "Generated URLs cleared."
 msgstr "Созданные URL очищены."
 
-#: js/prefs.js:1516
+#: js/prefs.js:1512
 msgid "Label Editor"
 msgstr "Редактор Меток"
 
-#: js/tt-rss.js:684
+#: js/tt-rss.js:685
 msgid "You can't unsubscribe from the category."
 msgstr "Нельзя отписаться от категории."
 
-#: js/viewfeed.js:125
-#: js/viewfeed.js:175
-#: js/viewfeed.js:192
+#: js/viewfeed.js:127
+#: js/viewfeed.js:177
+#: js/viewfeed.js:194
 msgid "Click to open next unread feed."
 msgstr "Щёлкните чтоб открыть следующий непрочитанный канал."
 
-#: js/viewfeed.js:129
+#: js/viewfeed.js:131
 msgid "Cancel search"
 msgstr "Отменить поиск"
 
-#: js/viewfeed.js:189
+#: js/viewfeed.js:191
 #, fuzzy
 msgid "New articles found, reload feed to continue."
 msgstr "Статей не найдено."
 
-#: js/viewfeed.js:424
+#: js/viewfeed.js:426
 msgid "Unstar article"
 msgstr "Не отмеченные"
 
-#: js/viewfeed.js:428
+#: js/viewfeed.js:430
 msgid "Star article"
 msgstr "Отмеченные"
 
-#: js/viewfeed.js:478
+#: js/viewfeed.js:480
 msgid "Unpublish article"
 msgstr "Не публиковать"
 
-#: js/viewfeed.js:482
+#: js/viewfeed.js:484
 msgid "Publish article"
 msgstr "Опубликовать"
 
-#: js/viewfeed.js:622
+#: js/viewfeed.js:624
 msgid "%d article selected"
 msgid_plural "%d articles selected"
 msgstr[0] "%d статья выбрана"
 msgstr[1] "%d статьи(ей) выбрано"
 msgstr[2] "%d статьи(ей) выбрано"
 
-#: js/viewfeed.js:1286
+#: js/viewfeed.js:1288
 msgid "No article is selected."
 msgstr "Статья не выбрана"
 
-#: js/viewfeed.js:1321
+#: js/viewfeed.js:1323
 msgid "No articles found to mark"
 msgstr "Статей для отметки не найдено."
 
-#: js/viewfeed.js:1323
+#: js/viewfeed.js:1325
 msgid "Mark %d article as read?"
 msgid_plural "Mark %d articles as read?"
 msgstr[0] "Отметить %d статью как прочитанную?"
 msgstr[1] "Отметить %d статьи(ей) как прочитанные?"
 msgstr[2] "Отметить %d статьи(ей) как прочитанные?"
 
-#~ msgid "Cache images locally"
-#~ msgstr "Кэшировать изображения локально"
+#~ msgid "Resubscribe to push updates"
+#~ msgstr "Переподписаться на PUSH обновления"
+
+#~ msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
+#~ msgstr "Сбрасывает статусподписки с помощью механизма PubSubHubbub"
+
+#~ msgid "Download more plugins at tt-rss.org <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forums</a> or <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a>."
+#~ msgstr "Скачайте больше плагинов на tt-rss.org <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">форумах</a> или <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">вики</a>."
+
+#~ msgid "Linked"
+#~ msgstr "Связанные"
+
+#~ msgid "Instance"
+#~ msgstr "Инсталляция"
+
+#~ msgid "Instance URL"
+#~ msgstr "URL инсталляции"
+
+#~ msgid "Access key:"
+#~ msgstr "Ключ доступа:"
+
+#~ msgid "Access key"
+#~ msgstr "Ключ доступа"
+
+#~ msgid "Use one access key for both linked instances."
+#~ msgstr "Используйте один ключ доступа для обоих инсталляций"
+
+#~ msgid "Generate new key"
+#~ msgstr "Создать новый ключ"
+
+#~ msgid "Link instance"
+#~ msgstr "Связать инсталляцию"
+
+#~ msgid "You can connect other instances of Tiny Tiny RSS to this one to share Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
+#~ msgstr "Вы можете связывать другие инсталляции Tiny Tiny RSS с этой, чтоб объединять \"Популярные\" каналы. Свяжите с этой инсталляцией Tiny Tiny RSS, используя этот URL:"
+
+#~ msgid "Last connected"
+#~ msgstr "Последнее соединение"
+
+#~ msgid "Status"
+#~ msgstr "Статус"
+
+#~ msgid "Stored feeds"
+#~ msgstr "Хранимые каналы"
+
+#~ msgid "Create link"
+#~ msgstr "Создать ссылку"
+
+#~ msgid "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification hub again on next feed update."
+#~ msgstr "Перезагрузить подписку? Tiny Tiny RSS попытается подписаться к хабу обновлений в следующее обновление каналов."
+
+#~ msgid "Subscription reset."
+#~ msgstr "Подписка перезагружена."
+
+#~ msgid "Link Instance"
+#~ msgstr "Связать инсталляцию"
+
+#~ msgid "Edit Instance"
+#~ msgstr "Редактировать инсталляцию"
+
+#~ msgid "Remove selected instances?"
+#~ msgstr "Удалить выбранные инсталляции?"
+
+#~ msgid "Removing selected instances..."
+#~ msgstr "Выбранные инсталляции удаляются..."
+
+#~ msgid "No instances are selected."
+#~ msgstr "Нет выбранных инсталляций."
+
+#~ msgid "Please select only one instance."
+#~ msgstr "Пожалуйста выберите только одну инсталляцию."
 
 #~ msgid "The error will be reported to the configured log destination."
 #~ msgstr "Ошибка будет зафиксирована в указанном логе."
@@ -5134,8 +5111,5 @@ msgstr[2] "Отметить %d статьи(ей) как прочитанные?
 #~ msgid "Category search results"
 #~ msgstr "Результаты поиска"
 
-#~ msgid "Feed search results"
-#~ msgstr "Результаты поиска"
-
 #~ msgid "Label search results"
 #~ msgstr "Результаты поиска"
diff --git a/locale/sv_SE/LC_MESSAGES/messages.mo b/locale/sv_SE/LC_MESSAGES/messages.mo
index ba9f289ae..c0ca6c805 100644
--- a/locale/sv_SE/LC_MESSAGES/messages.mo
+++ b/locale/sv_SE/LC_MESSAGES/messages.mo
diff --git a/locale/sv_SE/LC_MESSAGES/messages.po b/locale/sv_SE/LC_MESSAGES/messages.po
index 70e19a4ac..2d845512e 100644
--- a/locale/sv_SE/LC_MESSAGES/messages.po
+++ b/locale/sv_SE/LC_MESSAGES/messages.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tiny Tiny RSS sv_SE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 15:25+0300\n"
+"POT-Creation-Date: 2017-07-04 16:29+0300\n"
 "PO-Revision-Date: 2013-05-24 19:41+0100\n"
 "Last-Translator: Mattias Tengblad <[email protected]>\n"
 "Language-Team: Mattias Tengblad <[email protected]>\n"
@@ -177,31 +177,30 @@ msgstr "Hittade inte användaren"
 #: prefs.php:118
 #: classes/backend.php:5
 #: classes/pref/labels.php:282
-#: classes/pref/feeds.php:1402
-#: classes/pref/filters.php:779
+#: classes/pref/filters.php:819
+#: classes/pref/feeds.php:1376
 #: js/feedlist.js:149
-#: js/functions.js:1131
-#: js/functions.js:1231
-#: js/functions.js:1478
+#: js/functions.js:1210
+#: js/functions.js:1457
 #: js/prefs.js:621
-#: js/prefs.js:818
-#: js/prefs.js:1648
-#: js/prefs.js:1663
-#: js/tt-rss.js:550
-#: js/viewfeed.js:1182
+#: js/prefs.js:813
+#: js/prefs.js:1644
+#: js/prefs.js:1659
+#: js/tt-rss.js:551
+#: js/viewfeed.js:1184
 #: plugins/import_export/import_export.js:17
 #: js/feedlist.js:467
-#: js/feedlist.js:512
+#: js/feedlist.js:515
 #: js/functions.js:372
 #: js/functions.js:630
-#: js/prefs.js:1360
-#: js/prefs.js:1413
-#: js/prefs.js:1452
-#: js/prefs.js:1465
-#: js/prefs.js:1476
-#: js/prefs.js:1491
-#: js/tt-rss.js:567
-#: js/viewfeed.js:762
+#: js/prefs.js:1356
+#: js/prefs.js:1409
+#: js/prefs.js:1448
+#: js/prefs.js:1461
+#: js/prefs.js:1472
+#: js/prefs.js:1487
+#: js/tt-rss.js:568
+#: js/viewfeed.js:764
 msgid "Loading, please wait..."
 msgstr "Laddar, vänta..."
 
@@ -218,13 +217,13 @@ msgid "All Articles"
 msgstr "Alla artiklar"
 
 #: index.php:192
-#: include/functions2.php:107
+#: include/functions.php:1181
 #: classes/feeds.php:110
 msgid "Starred"
 msgstr "Stjärnmärkta"
 
 #: index.php:193
-#: include/functions2.php:108
+#: include/functions.php:1182
 #: classes/feeds.php:111
 msgid "Published"
 msgstr "Publicerade"
@@ -265,7 +264,7 @@ msgstr "Titel"
 
 #: index.php:209
 #: index.php:249
-#: include/functions2.php:95
+#: include/functions.php:1169
 #: classes/feeds.php:115
 #: js/FeedTree.js:138
 #: js/FeedTree.js:166
@@ -305,7 +304,7 @@ msgid "Feed actions:"
 msgstr "Flödesåtgärder:"
 
 #: index.php:244
-#: classes/handler/public.php:672
+#: classes/handler/public.php:583
 msgid "Subscribe to feed..."
 msgstr "Prenumerera på flöde..."
 
@@ -319,8 +318,8 @@ msgstr "Beräkna flödets poäng på nytt"
 
 #: index.php:247
 #: classes/pref/feeds.php:785
-#: classes/pref/feeds.php:1357
-#: js/PrefFeedTree.js:78
+#: classes/pref/feeds.php:1331
+#: js/PrefFeedTree.js:80
 msgid "Unsubscribe"
 msgstr "Avsluta prenumeration"
 
@@ -337,7 +336,7 @@ msgid "Other actions:"
 msgstr "Andra aktiviteter:"
 
 #: index.php:252
-#: include/functions2.php:81
+#: include/functions.php:1155
 msgid "Toggle widescreen mode"
 msgstr "Växla widescreenläge"
 
@@ -363,7 +362,7 @@ msgstr ""
 
 #: prefs.php:33
 #: prefs.php:136
-#: include/functions2.php:110
+#: include/functions.php:1184
 #: classes/pref/prefs.php:435
 msgid "Preferences"
 msgstr "Inställningar"
@@ -378,20 +377,19 @@ msgstr "Lämna inställningarna"
 
 #: prefs.php:139
 #: classes/pref/feeds.php:112
-#: classes/pref/feeds.php:1297
-#: classes/pref/feeds.php:1346
+#: classes/pref/feeds.php:1271
+#: classes/pref/feeds.php:1320
 msgid "Feeds"
 msgstr "Flöden"
 
 #: prefs.php:142
-#: classes/pref/filters.php:248
+#: classes/pref/filters.php:273
 msgid "Filters"
 msgstr "Filter"
 
 #: prefs.php:145
-#: include/functions.php:1327
-#: include/functions.php:1979
 #: classes/pref/labels.php:90
+#: classes/feeds.php:1718
 msgid "Labels"
 msgstr "Etiketter"
 
@@ -420,13 +418,13 @@ msgstr "Nyregistrering av användare är inaktiverat."
 #: register.php:337
 #: register.php:347
 #: register.php:359
-#: classes/handler/public.php:742
-#: classes/handler/public.php:813
-#: classes/handler/public.php:911
-#: classes/handler/public.php:990
-#: classes/handler/public.php:1004
-#: classes/handler/public.php:1011
-#: classes/handler/public.php:1036
+#: classes/handler/public.php:653
+#: classes/handler/public.php:724
+#: classes/handler/public.php:822
+#: classes/handler/public.php:901
+#: classes/handler/public.php:915
+#: classes/handler/public.php:922
+#: classes/handler/public.php:947
 msgid "Return to Tiny Tiny RSS"
 msgstr "Återgå till Tiny Tiny RSS"
 
@@ -443,12 +441,12 @@ msgid "Check availability"
 msgstr "Kontrollera tillgänglighet"
 
 #: register.php:229
-#: classes/handler/public.php:829
+#: classes/handler/public.php:740
 msgid "Email:"
 msgstr "E-post:"
 
 #: register.php:232
-#: classes/handler/public.php:834
+#: classes/handler/public.php:745
 msgid "How much is two plus two:"
 msgstr "Hur mycket är två plus två?:"
 
@@ -476,17 +474,23 @@ msgstr "Konto skapat."
 msgid "New user registrations are currently closed."
 msgstr "Nyregistrering av användare är för närvarande avstängt."
 
-#: update.php:67
+#: update.php:66
 msgid "Tiny Tiny RSS data update script."
 msgstr "Skript för att uppdatera Tiny Tiny RSS."
 
-#: include/digest.php:109
-#: include/functions.php:1336
-#: include/functions.php:1880
-#: include/functions.php:1965
-#: include/functions.php:1987
-#: classes/opml.php:421
+#: include/controls.php:83
+#: classes/pref/filters.php:242
+#: classes/pref/filters.php:253
+#: classes/pref/filters.php:544
+msgid "All feeds"
+msgstr "Alla flöden"
+
+#: include/controls.php:134
+#: include/controls.php:316
 #: classes/pref/feeds.php:228
+#: classes/opml.php:486
+#: classes/feeds.php:1727
+#: classes/digest.php:113
 msgid "Uncategorized"
 msgstr "Okategoriserat"
 
@@ -501,393 +505,287 @@ msgstr[1] "%d arkiverade artiklar"
 msgid "No feeds found."
 msgstr "Inga flöden funna."
 
-#: include/functions.php:1029
+#: include/functions.php:900
 #, php-format
 msgid "%d min"
 msgstr ""
 
-#: include/functions.php:1325
-#: include/functions.php:1977
-msgid "Special"
-msgstr "Special"
-
-#: include/functions.php:1828
-#: classes/pref/filters.php:229
-#: classes/pref/filters.php:507
-msgid "All feeds"
-msgstr "Alla flöden"
-
-#: include/functions.php:2032
-msgid "Starred articles"
-msgstr "Stjärnmärkta artiklar"
-
-#: include/functions.php:2034
-msgid "Published articles"
-msgstr "Publicerade artiklar"
-
-#: include/functions.php:2036
-msgid "Fresh articles"
-msgstr "Nya artiklar"
-
-#: include/functions.php:2038
-#: include/functions2.php:105
-msgid "All articles"
-msgstr "Alla artiklar"
-
-#: include/functions.php:2040
-msgid "Archived articles"
-msgstr "Arkiverade artiklar"
-
-#: include/functions.php:2042
-msgid "Recently read"
-msgstr "Nyligen lästa"
-
-#: include/functions2.php:57
+#: include/functions.php:1131
 msgid "Navigation"
 msgstr "Navigation"
 
-#: include/functions2.php:58
+#: include/functions.php:1132
 msgid "Open next feed"
 msgstr "Öppna nästa flöde"
 
-#: include/functions2.php:59
+#: include/functions.php:1133
 msgid "Open previous feed"
 msgstr "Öppna föregående flöde"
 
-#: include/functions2.php:60
+#: include/functions.php:1134
 msgid "Open next article"
 msgstr "Öppna näst artikel"
 
-#: include/functions2.php:61
+#: include/functions.php:1135
 msgid "Open previous article"
 msgstr "Öppna föregående artikel"
 
-#: include/functions2.php:62
+#: include/functions.php:1136
 msgid "Open next article (don't scroll long articles)"
 msgstr "Öppna nästa artikel (skrolla inte långa artiklar)"
 
-#: include/functions2.php:63
+#: include/functions.php:1137
 msgid "Open previous article (don't scroll long articles)"
 msgstr "Öppna föregående artikel (skrolla inte långa artiklar)"
 
-#: include/functions2.php:64
+#: include/functions.php:1138
 msgid "Move to next article (don't expand or mark read)"
 msgstr "Gå till nästa artikel (expandera inte eller markera som läst)"
 
-#: include/functions2.php:65
+#: include/functions.php:1139
 msgid "Move to previous article (don't expand or mark read)"
 msgstr "Gå till föregående artikel (expandera inte eller markera som läst)"
 
-#: include/functions2.php:66
+#: include/functions.php:1140
 msgid "Show search dialog"
 msgstr "Visa sökdialogen"
 
-#: include/functions2.php:67
+#: include/functions.php:1141
 msgid "Article"
 msgstr "Artikel"
 
-#: include/functions2.php:68
-#: js/viewfeed.js:1699
+#: include/functions.php:1142
+#: js/viewfeed.js:1701
 msgid "Toggle starred"
 msgstr "Växla stjärnmarkering"
 
-#: include/functions2.php:69
-#: js/viewfeed.js:1711
+#: include/functions.php:1143
+#: js/viewfeed.js:1713
 msgid "Toggle published"
 msgstr "Växla publicering"
 
-#: include/functions2.php:70
-#: js/viewfeed.js:1686
+#: include/functions.php:1144
+#: js/viewfeed.js:1688
 msgid "Toggle unread"
 msgstr "Växla olästa"
 
-#: include/functions2.php:71
+#: include/functions.php:1145
 msgid "Edit tags"
 msgstr "Redigera taggar"
 
-#: include/functions2.php:72
+#: include/functions.php:1146
 msgid "Open in new window"
 msgstr "Öppna i nytt fönster"
 
-#: include/functions2.php:73
-#: js/viewfeed.js:1732
+#: include/functions.php:1147
+#: js/viewfeed.js:1734
 msgid "Mark below as read"
 msgstr "Märk nedanstående som lästa"
 
-#: include/functions2.php:74
-#: js/viewfeed.js:1725
+#: include/functions.php:1148
+#: js/viewfeed.js:1727
 msgid "Mark above as read"
 msgstr "Märk ovanstående som lästa"
 
-#: include/functions2.php:75
+#: include/functions.php:1149
 msgid "Scroll down"
 msgstr "Skrolla ned"
 
-#: include/functions2.php:76
+#: include/functions.php:1150
 msgid "Scroll up"
 msgstr "Skrolla upp"
 
-#: include/functions2.php:77
+#: include/functions.php:1151
 msgid "Select article under cursor"
 msgstr "Välj artikel under pekare"
 
-#: include/functions2.php:78
+#: include/functions.php:1152
 msgid "Email article"
 msgstr "Skicka artikel med e-post"
 
-#: include/functions2.php:79
+#: include/functions.php:1153
 msgid "Close/collapse article"
 msgstr "Stäng/minimera artikel"
 
-#: include/functions2.php:80
+#: include/functions.php:1154
 msgid "Toggle article expansion (combined mode)"
 msgstr "Växla expanderat artikelläge (kombinerat läge)"
 
-#: include/functions2.php:82
+#: include/functions.php:1156
 #: plugins/embed_original/init.php:31
 msgid "Toggle embed original"
 msgstr "Stäng av/sätt på inbäddade original"
 
-#: include/functions2.php:83
+#: include/functions.php:1157
 msgid "Article selection"
 msgstr "Artikelval"
 
-#: include/functions2.php:84
+#: include/functions.php:1158
 msgid "Select all articles"
 msgstr "Välj alla artiklar"
 
-#: include/functions2.php:85
+#: include/functions.php:1159
 msgid "Select unread"
 msgstr "Välj olästa"
 
-#: include/functions2.php:86
+#: include/functions.php:1160
 msgid "Select starred"
 msgstr "Välj markerade"
 
-#: include/functions2.php:87
+#: include/functions.php:1161
 msgid "Select published"
 msgstr "Välj publicerade"
 
-#: include/functions2.php:88
+#: include/functions.php:1162
 msgid "Invert selection"
 msgstr "Invertera val"
 
-#: include/functions2.php:89
+#: include/functions.php:1163
 msgid "Deselect everything"
 msgstr "Avmarkera allt"
 
-#: include/functions2.php:90
+#: include/functions.php:1164
 #: classes/pref/feeds.php:555
-#: classes/pref/feeds.php:823
+#: classes/pref/feeds.php:811
 msgid "Feed"
 msgstr "Flöde"
 
-#: include/functions2.php:91
+#: include/functions.php:1165
 msgid "Refresh current feed"
 msgstr "Uppdatera aktuellt flöde"
 
-#: include/functions2.php:92
+#: include/functions.php:1166
 msgid "Un/hide read feeds"
 msgstr "Visa/dölj lästa flöden"
 
-#: include/functions2.php:93
-#: classes/pref/feeds.php:1349
+#: include/functions.php:1167
+#: classes/pref/feeds.php:1323
 msgid "Subscribe to feed"
 msgstr "Prenumerera på flöde"
 
-#: include/functions2.php:94
+#: include/functions.php:1168
 #: js/FeedTree.js:145
-#: js/PrefFeedTree.js:72
-#: js/viewfeed.js:1853
+#: js/PrefFeedTree.js:74
+#: js/viewfeed.js:1855
 msgid "Edit feed"
 msgstr "Redigera flöde"
 
-#: include/functions2.php:96
+#: include/functions.php:1170
 msgid "Reverse headlines"
 msgstr "Omvänd sortering på rubrik"
 
-#: include/functions2.php:97
+#: include/functions.php:1171
 msgid "Toggle headline grouping"
 msgstr ""
 
-#: include/functions2.php:98
+#: include/functions.php:1172
 msgid "Debug feed update"
 msgstr "Felsök flödesuppdatering"
 
-#: include/functions2.php:99
+#: include/functions.php:1173
 #, fuzzy
 msgid "Debug viewfeed()"
 msgstr "Felsök flödesuppdatering"
 
-#: include/functions2.php:100
+#: include/functions.php:1174
 #: js/FeedTree.js:194
 msgid "Mark all feeds as read"
 msgstr "Märk alla flöden som lästa"
 
-#: include/functions2.php:101
+#: include/functions.php:1175
 msgid "Un/collapse current category"
 msgstr "Öppna/stäng aktuell kategori:"
 
-#: include/functions2.php:102
+#: include/functions.php:1176
 msgid "Toggle combined mode"
 msgstr "Växla komboläge"
 
-#: include/functions2.php:103
+#: include/functions.php:1177
 msgid "Toggle auto expand in combined mode"
 msgstr "Aktivera automatisk expandering i kombinerat läge"
 
-#: include/functions2.php:104
+#: include/functions.php:1178
 msgid "Go to"
 msgstr "Gå till"
 
-#: include/functions2.php:106
+#: include/functions.php:1179
+#: classes/feeds.php:1602
+msgid "All articles"
+msgstr "Alla artiklar"
+
+#: include/functions.php:1180
 msgid "Fresh"
 msgstr "Nya"
 
-#: include/functions2.php:109
-#: js/tt-rss.js:494
-#: js/tt-rss.js:663
+#: include/functions.php:1183
+#: js/tt-rss.js:495
+#: js/tt-rss.js:664
 msgid "Tag cloud"
 msgstr "Taggmoln"
 
-#: include/functions2.php:111
+#: include/functions.php:1185
 msgid "Other"
 msgstr "Övriga"
 
-#: include/functions2.php:112
+#: include/functions.php:1186
 #: classes/pref/labels.php:267
 msgid "Create label"
 msgstr "Skapa etikett"
 
-#: include/functions2.php:113
-#: classes/pref/filters.php:753
+#: include/functions.php:1187
+#: classes/pref/filters.php:793
 msgid "Create filter"
 msgstr "Skapa filter"
 
-#: include/functions2.php:114
+#: include/functions.php:1188
 msgid "Un/collapse sidebar"
 msgstr "Visa/dölj sidofält"
 
-#: include/functions2.php:115
+#: include/functions.php:1189
 msgid "Show help dialog"
 msgstr "Visa hjälpfönster"
 
-#: include/functions2.php:670
-#, php-format
-msgid "Search results: %s"
-msgstr "Sökresultat: %s"
-
-#: include/functions2.php:1336
-#: classes/feeds.php:752
-#, fuzzy
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] "Kommentarer?"
-msgstr[1] "Kommentarer?"
-
-#: include/functions2.php:1340
-#: classes/feeds.php:756
-#, fuzzy
-msgid "comments"
-msgstr "Kommentarer?"
-
-#: include/functions2.php:1366
-msgid " - "
-msgstr " - "
-
-#: include/functions2.php:1397
-#: include/functions2.php:1648
-#: classes/article.php:311
-msgid "no tags"
-msgstr "Inga taggar"
-
-#: include/functions2.php:1407
-#: classes/feeds.php:738
-msgid "Edit tags for this article"
-msgstr "Redigera taggar för denna artikel"
-
-#: include/functions2.php:1439
-#: classes/feeds.php:690
-msgid "Originally from:"
-msgstr "Ursprungligen från:"
-
-#: include/functions2.php:1452
-#: classes/pref/feeds.php:574
-#: classes/feeds.php:703
-msgid "Feed URL"
-msgstr "URL för flöde"
-
-#: include/functions2.php:1489
-#: classes/backend.php:105
-#: classes/dlg.php:37
-#: classes/dlg.php:60
-#: classes/dlg.php:93
-#: classes/dlg.php:159
-#: classes/dlg.php:186
-#: classes/pref/feeds.php:1652
-#: classes/pref/feeds.php:1718
-#: classes/pref/filters.php:204
-#: classes/pref/prefs.php:1097
-#: plugins/af_psql_trgm/init.php:102
-#: plugins/import_export/init.php:415
-#: plugins/import_export/init.php:461
-#: plugins/share/init.php:121
-msgid "Close this window"
-msgstr "Stäng fönstret"
-
-#: include/functions2.php:1686
-msgid "(edit note)"
-msgstr "(Redigera notering)"
-
-#: include/functions2.php:1960
-msgid "unknown type"
-msgstr "Okänd typ"
-
-#: include/functions2.php:2037
-msgid "Attachments"
-msgstr "Bilagor"
-
-#: include/functions2.php:2496
+#: include/functions.php:2456
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: include/functions2.php:2497
+#: include/functions.php:2457
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: include/functions2.php:2498
+#: include/functions.php:2458
 msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
 msgstr ""
 
-#: include/functions2.php:2499
+#: include/functions.php:2459
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: include/functions2.php:2500
+#: include/functions.php:2460
 #, fuzzy
 msgid "No file was uploaded"
 msgstr "Ingen fil uppladdad."
 
-#: include/functions2.php:2501
+#: include/functions.php:2461
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: include/functions2.php:2502
+#: include/functions.php:2462
 msgid "Failed to write file to disk."
 msgstr ""
 
-#: include/functions2.php:2503
+#: include/functions.php:2463
 msgid "A PHP extension stopped the file upload."
 msgstr ""
 
 #: include/login_form.php:197
-#: classes/handler/public.php:569
-#: classes/handler/public.php:824
+#: classes/handler/public.php:480
+#: classes/handler/public.php:735
 msgid "Login:"
 msgstr "Användarnamn:"
 
 #: include/login_form.php:207
-#: classes/handler/public.php:572
+#: classes/handler/public.php:483
 msgid "Password:"
 msgstr "Lösenord:"
 
@@ -900,7 +798,7 @@ msgid "Profile:"
 msgstr "Profil:"
 
 #: include/login_form.php:223
-#: classes/handler/public.php:311
+#: classes/handler/public.php:287
 #: classes/pref/prefs.php:1035
 #: classes/rpc.php:63
 msgid "Default profile"
@@ -919,7 +817,7 @@ msgid "Remember me"
 msgstr "Kom ihåg mig"
 
 #: include/login_form.php:249
-#: classes/handler/public.php:577
+#: classes/handler/public.php:488
 msgid "Log in"
 msgstr "Logga in"
 
@@ -938,145 +836,44 @@ msgstr "Kunde inte verifiera session (fel IP)"
 msgid "Session failed to validate (password changed)"
 msgstr "Kunde inte verifiera session (fel IP)"
 
-#: classes/article.php:25
-msgid "Article not found."
-msgstr "Hittar inte artikel."
-
-#: classes/article.php:197
-msgid "Tags for this article (separated by commas):"
-msgstr "Taggar för denna artikel (kommaseparerade):"
-
-#: classes/article.php:222
-#: classes/pref/labels.php:79
-#: classes/pref/users.php:98
-#: classes/pref/feeds.php:801
-#: classes/pref/feeds.php:943
-#: classes/pref/filters.php:485
-#: classes/pref/prefs.php:981
-#: plugins/instances/init.php:245
-#: plugins/nsfw/init.php:85
-#: plugins/note/init.php:51
-#: plugins/af_readability/init.php:68
-#: plugins/af_redditimgur/init.php:60
-#: plugins/af_psql_trgm/init.php:181
-#: plugins/mail/init.php:64
-#: plugins/af_zz_imgproxy/init.php:213
-msgid "Save"
-msgstr "Spara"
-
-#: classes/article.php:224
-#: classes/handler/public.php:546
-#: classes/handler/public.php:580
-#: classes/pref/labels.php:81
-#: classes/pref/users.php:100
-#: classes/pref/feeds.php:802
-#: classes/pref/feeds.php:946
-#: classes/pref/feeds.php:1859
-#: classes/pref/filters.php:488
-#: classes/pref/filters.php:902
-#: classes/pref/filters.php:983
-#: classes/pref/filters.php:1076
-#: classes/pref/prefs.php:983
-#: classes/feeds.php:1105
-#: classes/feeds.php:1155
-#: classes/feeds.php:1192
-#: plugins/instances/init.php:248
-#: plugins/instances/init.php:436
-#: plugins/note/init.php:53
-#: plugins/mail/init.php:173
-msgid "Cancel"
-msgstr "Avbryt"
-
-#: classes/opml.php:28
-#: classes/opml.php:33
-msgid "OPML Utility"
-msgstr "OPML-verktyg"
-
-#: classes/opml.php:37
-msgid "Importing OPML..."
-msgstr "Importera OPML..."
-
-#: classes/opml.php:41
-msgid "Return to preferences"
-msgstr "Återgå till inställningar"
-
-#: classes/opml.php:271
-#, php-format
-msgid "Adding feed: %s"
-msgstr "Lägger till flöde: %s"
-
-#: classes/opml.php:282
-#, php-format
-msgid "Duplicate feed: %s"
-msgstr "Dublett av flöde: %s"
-
-#: classes/opml.php:296
-#, php-format
-msgid "Adding label %s"
-msgstr "Lägger till etikett %s"
-
-#: classes/opml.php:299
-#, php-format
-msgid "Duplicate label: %s"
-msgstr "Etikettsdubblett: %s"
-
-#: classes/opml.php:311
-#, php-format
-msgid "Setting preference key %s to %s"
-msgstr "Sätter %s till %s"
-
-#: classes/opml.php:343
-msgid "Adding filter..."
-msgstr "Lägger till filter..."
-
-#: classes/opml.php:421
-#, php-format
-msgid "Processing category: %s"
-msgstr "Bearbetar kategori: %s"
-
-#: classes/opml.php:470
-#, php-format
-msgid "Upload failed with error code %d"
-msgstr "Uppladdningen misslyckades med felkod %d"
-
-#: classes/opml.php:484
-#: plugins/import_export/init.php:442
-msgid "Unable to move uploaded file."
-msgstr "Fel: kunde inte flytta uppladdad fil."
-
-#: classes/opml.php:488
-#: plugins/import_export/init.php:446
-msgid "Error: please upload OPML file."
-msgstr "Fel: vänligen ladda upp en OPMLfil."
-
-#: classes/opml.php:499
-msgid "Error: unable to find moved OPML file."
-msgstr "Fel: kunde inte hitta flyttad OPML-fil."
-
-#: classes/opml.php:506
-msgid "Error while parsing document."
-msgstr "Fel vid tolkning av dokument."
-
-#: classes/backend.php:33
+#: classes/backend.php:31
 msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
 msgstr "Fler tips finns i wikin."
 
-#: classes/backend.php:38
+#: classes/backend.php:36
 msgid "Keyboard Shortcuts"
 msgstr "Kortkommandon"
 
-#: classes/backend.php:61
+#: classes/backend.php:59
 msgid "Shift"
 msgstr "Shift"
 
-#: classes/backend.php:64
+#: classes/backend.php:62
 msgid "Ctrl"
 msgstr "Ctrl"
 
-#: classes/backend.php:99
+#: classes/backend.php:97
 msgid "Help topic not found."
 msgstr "Hittade inte något hjälpavsnitt."
 
+#: classes/backend.php:103
+#: classes/dlg.php:37
+#: classes/dlg.php:60
+#: classes/dlg.php:93
+#: classes/dlg.php:159
+#: classes/dlg.php:186
+#: classes/article.php:744
+#: classes/pref/filters.php:206
+#: classes/pref/prefs.php:1097
+#: classes/pref/feeds.php:1626
+#: classes/pref/feeds.php:1692
+#: plugins/import_export/init.php:421
+#: plugins/import_export/init.php:467
+#: plugins/af_psql_trgm/init.php:102
+#: plugins/share/init.php:120
+msgid "Close this window"
+msgstr "Stäng fönstret"
+
 #: classes/dlg.php:17
 msgid "If you have imported labels and/or filters, you might need to reload preferences to see your new data."
 msgstr "Om du har importerat etiketter eller filter måste du ladda om inställningarna för att se uppdateringarna"
@@ -1087,7 +884,7 @@ msgstr "Din publika OPML-URL är:"
 
 #: classes/dlg.php:57
 #: classes/dlg.php:183
-#: plugins/share/init.php:118
+#: plugins/share/init.php:117
 msgid "Generate new URL"
 msgstr "Skapa ny URL"
 
@@ -1108,130 +905,226 @@ msgstr "Uppdateringsprocessen tar för lång tid på sig att uppdatera. Detta ka
 msgid "You can view this feed as RSS using the following URL:"
 msgstr "Du kan se detta flöde som RSS på följande URL:"
 
-#: classes/handler/public.php:510
+#: classes/article.php:25
+msgid "Article not found."
+msgstr "Hittar inte artikel."
+
+#: classes/article.php:197
+msgid "Tags for this article (separated by commas):"
+msgstr "Taggar för denna artikel (kommaseparerade):"
+
+#: classes/article.php:222
+#: classes/pref/labels.php:79
+#: classes/pref/filters.php:519
+#: classes/pref/users.php:98
+#: classes/pref/prefs.php:981
+#: classes/pref/feeds.php:789
+#: classes/pref/feeds.php:931
+#: plugins/af_psql_trgm/init.php:181
+#: plugins/nsfw/init.php:85
+#: plugins/af_readability/init.php:68
+#: plugins/mail/init.php:64
+#: plugins/af_redditimgur/init.php:60
+#: plugins/note/init.php:51
+#: plugins/af_zz_imgproxy/init.php:240
+msgid "Save"
+msgstr "Spara"
+
+#: classes/article.php:224
+#: classes/handler/public.php:457
+#: classes/handler/public.php:491
+#: classes/pref/labels.php:81
+#: classes/pref/filters.php:522
+#: classes/pref/filters.php:942
+#: classes/pref/filters.php:1022
+#: classes/pref/filters.php:1115
+#: classes/pref/users.php:100
+#: classes/pref/prefs.php:983
+#: classes/pref/feeds.php:790
+#: classes/pref/feeds.php:934
+#: classes/pref/feeds.php:1833
+#: classes/feeds.php:1098
+#: classes/feeds.php:1148
+#: classes/feeds.php:1185
+#: plugins/mail/init.php:173
+#: plugins/note/init.php:53
+msgid "Cancel"
+msgstr "Avbryt"
+
+#: classes/article.php:311
+#: classes/article.php:652
+#: classes/article.php:805
+msgid "no tags"
+msgstr "Inga taggar"
+
+#: classes/article.php:419
+msgid "unknown type"
+msgstr "Okänd typ"
+
+#: classes/article.php:496
+msgid "Attachments"
+msgstr "Bilagor"
+
+#: classes/article.php:591
+#: classes/feeds.php:741
+#, fuzzy
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] "Kommentarer?"
+msgstr[1] "Kommentarer?"
+
+#: classes/article.php:595
+#: classes/feeds.php:745
+#, fuzzy
+msgid "comments"
+msgstr "Kommentarer?"
+
+#: classes/article.php:621
+msgid " - "
+msgstr " - "
+
+#: classes/article.php:662
+#: classes/feeds.php:727
+msgid "Edit tags for this article"
+msgstr "Redigera taggar för denna artikel"
+
+#: classes/article.php:694
+#: classes/feeds.php:681
+msgid "Originally from:"
+msgstr "Ursprungligen från:"
+
+#: classes/article.php:707
+#: classes/pref/feeds.php:574
+#: classes/feeds.php:694
+msgid "Feed URL"
+msgstr "URL för flöde"
+
+#: classes/article.php:843
+msgid "(edit note)"
+msgstr "(Redigera notering)"
+
+#: classes/handler/public.php:421
 #: plugins/bookmarklets/init.php:40
 msgid "Share with Tiny Tiny RSS"
 msgstr "Dela med Tiny Tiny RSS"
 
-#: classes/handler/public.php:518
+#: classes/handler/public.php:429
 msgid "Title:"
 msgstr "Titel:"
 
-#: classes/handler/public.php:520
+#: classes/handler/public.php:431
 #: classes/pref/feeds.php:572
-#: plugins/instances/init.php:212
-#: plugins/instances/init.php:401
 msgid "URL:"
 msgstr "URL:"
 
-#: classes/handler/public.php:522
+#: classes/handler/public.php:433
 msgid "Content:"
 msgstr "Innehåll:"
 
-#: classes/handler/public.php:524
+#: classes/handler/public.php:435
 msgid "Labels:"
 msgstr "Etiketter:"
 
-#: classes/handler/public.php:543
+#: classes/handler/public.php:454
 msgid "Shared article will appear in the Published feed."
 msgstr "Delad artikel visas i 'Publicerade artiklar'."
 
-#: classes/handler/public.php:545
+#: classes/handler/public.php:456
 msgid "Share"
 msgstr "Dela"
 
-#: classes/handler/public.php:567
+#: classes/handler/public.php:478
 msgid "Not logged in"
 msgstr "Inte inloggad"
 
-#: classes/handler/public.php:626
+#: classes/handler/public.php:537
 msgid "Incorrect username or password"
 msgstr "Felaktigt användarnamn eller lösenord"
 
-#: classes/handler/public.php:678
+#: classes/handler/public.php:589
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "Du prenumererar redan på <b>%s</b>."
 
-#: classes/handler/public.php:681
+#: classes/handler/public.php:592
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "Prenumererar på <b>%s</b>."
 
-#: classes/handler/public.php:684
+#: classes/handler/public.php:595
 #, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "Kunde inte prenumerera på  <b>%s</b>."
 
-#: classes/handler/public.php:687
+#: classes/handler/public.php:598
 #, php-format
 msgid "No feeds found in <b>%s</b>."
 msgstr "Hittade inga flöden i <b>%s</b>."
 
-#: classes/handler/public.php:690
+#: classes/handler/public.php:601
 msgid "Multiple feed URLs found."
 msgstr "Hittade flera flödes-URLer."
 
-#: classes/handler/public.php:694
+#: classes/handler/public.php:605
 #, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr "Kunde inte prenumerera på <b>%s</b> <br>Kan inte ladda ned URL "
 
-#: classes/handler/public.php:712
+#: classes/handler/public.php:623
 msgid "Subscribe to selected feed"
 msgstr "Prenumerera på valt flöde"
 
-#: classes/handler/public.php:737
+#: classes/handler/public.php:648
 msgid "Edit subscription options"
 msgstr "Redigera prenumerationsinställningar"
 
-#: classes/handler/public.php:774
+#: classes/handler/public.php:685
 msgid "Password recovery"
 msgstr "Återställning av lösenord"
 
-#: classes/handler/public.php:817
+#: classes/handler/public.php:728
 #, fuzzy
 msgid "You will need to provide valid account name and email. A password reset link will be sent to your email address."
 msgstr "Du måste uppge ett giltigt kontonamn och e-postadress. Ett ny lösenord kommer att skickas till din e-post."
 
-#: classes/handler/public.php:839
-#: classes/pref/users.php:350
+#: classes/handler/public.php:750
+#: classes/pref/users.php:349
 msgid "Reset password"
 msgstr "Återställ lösenord"
 
-#: classes/handler/public.php:849
+#: classes/handler/public.php:760
 msgid "Some of the required form parameters are missing or incorrect."
 msgstr "Vissa av dom obligatoriska formulärparametrarna saknas eller är inkorrekta."
 
-#: classes/handler/public.php:853
-#: classes/handler/public.php:919
+#: classes/handler/public.php:764
+#: classes/handler/public.php:830
 msgid "Go back"
 msgstr "Gå tillbaka"
 
-#: classes/handler/public.php:890
+#: classes/handler/public.php:801
 #, fuzzy
 msgid "[tt-rss] Password reset request"
 msgstr "[tt-rss] Notifikation för ändring av lösenord"
 
-#: classes/handler/public.php:915
+#: classes/handler/public.php:826
 msgid "Sorry, login and email combination not found."
 msgstr "Beklagar, kombinationen av användarnamn och e-postadress kunde inte hittas."
 
-#: classes/handler/public.php:937
+#: classes/handler/public.php:848
 msgid "Your access level is insufficient to run this script."
 msgstr "Du har inte behörighet att köra detta skript."
 
-#: classes/handler/public.php:963
+#: classes/handler/public.php:874
 msgid "Database Updater"
 msgstr "Databasuppdatering"
 
-#: classes/handler/public.php:1028
+#: classes/handler/public.php:939
 msgid "Perform updates"
 msgstr "Utför uppdatering"
 
 #: classes/pref/labels.php:22
-#: classes/pref/filters.php:348
-#: classes/pref/filters.php:823
+#: classes/pref/filters.php:373
+#: classes/pref/filters.php:863
 msgid "Caption"
 msgstr "Titel"
 
@@ -1253,59 +1146,55 @@ msgid "Created label <b>%s</b>"
 msgstr "Skapade etikett <b>%s</b>"
 
 #: classes/pref/labels.php:258
-#: classes/pref/users.php:334
-#: classes/pref/feeds.php:1337
-#: classes/pref/feeds.php:1600
-#: classes/pref/feeds.php:1664
-#: classes/pref/filters.php:359
-#: classes/pref/filters.php:407
-#: classes/pref/filters.php:744
-#: classes/pref/filters.php:832
-#: classes/pref/filters.php:859
+#: classes/pref/filters.php:384
+#: classes/pref/filters.php:441
+#: classes/pref/filters.php:784
+#: classes/pref/filters.php:872
+#: classes/pref/filters.php:899
+#: classes/pref/users.php:333
 #: classes/pref/prefs.php:992
-#: plugins/instances/init.php:284
+#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1574
+#: classes/pref/feeds.php:1638
 msgid "Select"
 msgstr "Markera"
 
 #: classes/pref/labels.php:261
-#: classes/pref/users.php:337
-#: classes/pref/feeds.php:1340
-#: classes/pref/feeds.php:1603
-#: classes/pref/feeds.php:1667
-#: classes/pref/filters.php:362
-#: classes/pref/filters.php:410
-#: classes/pref/filters.php:747
-#: classes/pref/filters.php:835
-#: classes/pref/filters.php:862
+#: classes/pref/filters.php:387
+#: classes/pref/filters.php:444
+#: classes/pref/filters.php:787
+#: classes/pref/filters.php:875
+#: classes/pref/filters.php:902
+#: classes/pref/users.php:336
 #: classes/pref/prefs.php:995
+#: classes/pref/feeds.php:1314
+#: classes/pref/feeds.php:1577
+#: classes/pref/feeds.php:1641
 #: classes/feeds.php:102
-#: plugins/instances/init.php:287
 msgid "All"
 msgstr "Alla"
 
 #: classes/pref/labels.php:263
-#: classes/pref/users.php:339
-#: classes/pref/feeds.php:1342
-#: classes/pref/feeds.php:1605
-#: classes/pref/feeds.php:1669
-#: classes/pref/filters.php:364
-#: classes/pref/filters.php:412
-#: classes/pref/filters.php:749
-#: classes/pref/filters.php:837
-#: classes/pref/filters.php:864
+#: classes/pref/filters.php:389
+#: classes/pref/filters.php:446
+#: classes/pref/filters.php:789
+#: classes/pref/filters.php:877
+#: classes/pref/filters.php:904
+#: classes/pref/users.php:338
 #: classes/pref/prefs.php:997
+#: classes/pref/feeds.php:1316
+#: classes/pref/feeds.php:1579
+#: classes/pref/feeds.php:1643
 #: classes/feeds.php:105
-#: plugins/instances/init.php:289
 msgid "None"
 msgstr "Ingen"
 
 #: classes/pref/labels.php:270
-#: classes/pref/users.php:348
+#: classes/pref/filters.php:512
+#: classes/pref/filters.php:806
+#: classes/pref/users.php:347
 #: classes/pref/feeds.php:767
-#: classes/pref/filters.php:478
-#: classes/pref/filters.php:766
-#: classes/feeds.php:1154
-#: plugins/instances/init.php:294
+#: classes/feeds.php:1147
 msgid "Remove"
 msgstr "Ta bort"
 
@@ -1313,9 +1202,171 @@ msgstr "Ta bort"
 msgid "Clear colors"
 msgstr "Rensa färger"
 
+#: classes/pref/filters.php:153
+#, fuzzy
+msgid "Preview article"
+msgstr "Nya artiklar"
+
+#: classes/pref/filters.php:264
+#: classes/pref/filters.php:558
+msgid "(inverse)"
+msgstr "(invertera)"
+
+#: classes/pref/filters.php:260
+#: classes/pref/filters.php:557
+#, php-format
+msgid "%s on %s in %s %s"
+msgstr "%s på %s i %s %s"
+
+#: classes/pref/filters.php:379
+#: classes/pref/filters.php:867
+#: classes/pref/filters.php:981
+msgid "Match"
+msgstr "Matcha"
+
+#: classes/pref/filters.php:393
+#: classes/pref/filters.php:450
+#: classes/pref/filters.php:881
+#: classes/pref/filters.php:908
+msgid "Add"
+msgstr "Lägg till"
+
+#: classes/pref/filters.php:396
+#: classes/pref/filters.php:453
+#: classes/pref/filters.php:884
+#: classes/pref/filters.php:911
+#: classes/feeds.php:122
+msgid "Delete"
+msgstr "Radera"
+
+#: classes/pref/filters.php:436
+#: classes/pref/filters.php:894
+msgid "Apply actions"
+msgstr "Tillämpa åtgärder"
+
+#: classes/pref/filters.php:486
+#: classes/pref/filters.php:923
+msgid "Enabled"
+msgstr "Aktiverat"
+
+#: classes/pref/filters.php:495
+#: classes/pref/filters.php:926
+msgid "Match any rule"
+msgstr "Matcha alla regler"
+
+#: classes/pref/filters.php:504
+#: classes/pref/filters.php:929
+msgid "Inverse matching"
+msgstr "Invertera matchning"
+
+#: classes/pref/filters.php:516
+#: classes/pref/filters.php:936
+msgid "Test"
+msgstr "Test"
+
+#: classes/pref/filters.php:780
+#: classes/pref/users.php:323
+#: classes/pref/feeds.php:1307
+#: classes/feeds.php:1118
+#: classes/feeds.php:1184
+#: js/tt-rss.js:165
+msgid "Search"
+msgstr "Sök"
+
+#: classes/pref/filters.php:796
+msgid "Combine"
+msgstr "Kombinera"
+
+#: classes/pref/filters.php:799
+#: classes/pref/users.php:345
+msgid "Edit"
+msgstr "Redigera"
+
+#: classes/pref/filters.php:802
+#: classes/pref/feeds.php:1327
+#: classes/pref/feeds.php:1341
+msgid "Reset sort order"
+msgstr "Återställ sorteringsordning"
+
+#: classes/pref/filters.php:810
+#: classes/pref/feeds.php:1363
+msgid "Rescore articles"
+msgstr "Poängsätt på nytt"
+
+#: classes/pref/filters.php:939
+msgid "Create"
+msgstr "Skapa"
+
+#: classes/pref/filters.php:993
+msgid "Inverse regular expression matching"
+msgstr "Invertera matchning av regulära uttryck"
+
+#: classes/pref/filters.php:995
+msgid "on field"
+msgstr "i fält"
+
+#: classes/pref/filters.php:1001
+#: js/PrefFilterTree.js:64
+msgid "in"
+msgstr "i"
+
+#: classes/pref/filters.php:1014
+#, fuzzy
+msgid "Wiki: Filters"
+msgstr "Filter"
+
+#: classes/pref/filters.php:1019
+msgid "Save rule"
+msgstr "Spara regel"
+
+#: classes/pref/filters.php:1019
+#: js/functions.js:865
+msgid "Add rule"
+msgstr "Tillämpa regel"
+
+#: classes/pref/filters.php:1042
+msgid "Perform Action"
+msgstr "Utför aktivitet"
+
+#: classes/pref/filters.php:1093
+#, fuzzy
+msgid "No actions available"
+msgstr "Ny version tillgänglig!"
+
+#: classes/pref/filters.php:1112
+msgid "Save action"
+msgstr "Spara aktivitet"
+
+#: classes/pref/filters.php:1112
+#: js/functions.js:887
+msgid "Add action"
+msgstr "Lägg till aktivitet"
+
+#: classes/pref/filters.php:1136
+msgid "[No caption]"
+msgstr "[Inge titel]"
+
+#: classes/pref/filters.php:1138
+#, fuzzy, php-format
+msgid "%s (%d rule)"
+msgid_plural "%s (%d rules)"
+msgstr[0] "Tillämpa regel"
+msgstr[1] "Tillämpa regel"
+
+#: classes/pref/filters.php:1153
+#, fuzzy
+msgid "matches any rule"
+msgstr "Matcha alla regler"
+
+#: classes/pref/filters.php:1156
+#, fuzzy, php-format
+msgid "%s (+%d action)"
+msgid_plural "%s (+%d actions)"
+msgstr[0] "Lägg till aktivitet"
+msgstr[1] "Lägg till aktivitet"
+
 #: classes/pref/users.php:6
 #: classes/pref/system.php:8
-#: plugins/instances/init.php:154
 msgid "Your access level is insufficient to open this tab."
 msgstr "Du saknar behörighet för att öppna denna flik"
 
@@ -1326,8 +1377,8 @@ msgstr "Redigera regel"
 
 #: classes/pref/users.php:56
 #: classes/pref/feeds.php:637
-#: classes/pref/feeds.php:878
-#: classes/feeds.php:1075
+#: classes/pref/feeds.php:866
+#: classes/feeds.php:1068
 msgid "Authentication"
 msgstr "Autentisering"
 
@@ -1337,7 +1388,7 @@ msgstr "Behörighetsnivå: "
 
 #: classes/pref/users.php:77
 #: classes/pref/feeds.php:667
-#: classes/pref/feeds.php:896
+#: classes/pref/feeds.php:884
 msgid "Options"
 msgstr "Alternativ"
 
@@ -1351,7 +1402,7 @@ msgid "User not found"
 msgstr "Hittade inte användaren"
 
 #: classes/pref/users.php:132
-#: classes/pref/users.php:400
+#: classes/pref/users.php:399
 msgid "Registered"
 msgstr "Registrerad"
 
@@ -1369,7 +1420,7 @@ msgid "Stored articles"
 msgstr "Stjärnmärkta artiklar"
 
 #: classes/pref/users.php:145
-#: classes/pref/users.php:399
+#: classes/pref/users.php:398
 msgid "Subscribed feeds"
 msgstr "Prenumererade flöden"
 
@@ -1388,508 +1439,57 @@ msgstr "Kunde inte skapa användare <b>%s</b>"
 msgid "User <b>%s</b> already exists."
 msgstr "Användaren <b>%s</b> finns redan."
 
-#: classes/pref/users.php:265
+#: classes/pref/users.php:264
 #, php-format
 msgid "Changed password of user <b>%s</b> to <b>%s</b>"
 msgstr "Lösenord för användare <b>%s</b> ändrat till <b>%s</b>"
 
-#: classes/pref/users.php:267
+#: classes/pref/users.php:266
 #, php-format
 msgid "Sending new password of user <b>%s</b> to <b>%s</b>"
 msgstr "Nytt lösenord för användare <b>%s</b> skickat till <b>%s</b>"
 
-#: classes/pref/users.php:291
+#: classes/pref/users.php:290
 msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] Notifikation för ändring av lösenord"
 
-#: classes/pref/users.php:324
-#: classes/pref/feeds.php:1333
-#: classes/pref/filters.php:740
-#: classes/feeds.php:1125
-#: classes/feeds.php:1191
-#: js/tt-rss.js:165
-msgid "Search"
-msgstr "Sök"
-
-#: classes/pref/users.php:342
+#: classes/pref/users.php:341
 msgid "Create user"
 msgstr "Skapa användare"
 
-#: classes/pref/users.php:346
-#: classes/pref/filters.php:759
-#: plugins/instances/init.php:293
-msgid "Edit"
-msgstr "Redigera"
-
-#: classes/pref/users.php:397
+#: classes/pref/users.php:396
 #: classes/pref/feeds.php:643
-#: classes/pref/feeds.php:882
-#: classes/pref/feeds.php:1836
-#: classes/feeds.php:1079
+#: classes/pref/feeds.php:870
+#: classes/pref/feeds.php:1810
+#: classes/feeds.php:1072
 msgid "Login"
 msgstr "Användarnamn"
 
-#: classes/pref/users.php:398
+#: classes/pref/users.php:397
 msgid "Access Level"
 msgstr "Behörighetsnivå"
 
-#: classes/pref/users.php:401
+#: classes/pref/users.php:400
 msgid "Last login"
 msgstr "Senaste inloggning"
 
-#: classes/pref/users.php:420
-#: plugins/instances/init.php:334
+#: classes/pref/users.php:419
 msgid "Click to edit"
 msgstr "Klicka för att redigera"
 
-#: classes/pref/users.php:441
+#: classes/pref/users.php:440
 msgid "No users defined."
 msgstr "Inga användare definierade."
 
-#: classes/pref/users.php:443
+#: classes/pref/users.php:442
 msgid "No matching users found."
 msgstr "Hittade inga matchande användare."
 
-#: classes/pref/system.php:29
-msgid "Error Log"
-msgstr "Fellogg"
-
-#: classes/pref/system.php:40
-msgid "Refresh"
-msgstr "Uppdatera"
-
-#: classes/pref/system.php:43
-#, fuzzy
-msgid "Clear log"
-msgstr "Rensa färger"
-
-#: classes/pref/system.php:48
-msgid "Error"
-msgstr "Fel"
-
-#: classes/pref/system.php:49
-msgid "Filename"
-msgstr "Filnamn"
-
-#: classes/pref/system.php:50
-msgid "Message"
-msgstr "Meddelande"
-
-#: classes/pref/system.php:52
-msgid "Date"
-msgstr "Datum"
-
-#: classes/pref/feeds.php:15
-msgid "Check to enable field"
-msgstr "Markera för att aktivera"
-
-#: classes/pref/feeds.php:65
-#: classes/pref/feeds.php:214
-#: classes/pref/feeds.php:258
-#: classes/pref/feeds.php:264
-#: classes/pref/feeds.php:290
-#, fuzzy, php-format
-msgid "(%d feed)"
-msgid_plural "(%d feeds)"
-msgstr[0] "(%d kanaler)"
-msgstr[1] "(%d kanaler)"
-
-#: classes/pref/feeds.php:537
 #: classes/pref/prefs.php:18
+#: classes/pref/feeds.php:537
 msgid "General"
 msgstr "Generellt"
 
-#: classes/pref/feeds.php:561
-msgid "Feed Title"
-msgstr "Flödestitel"
-
-#: classes/pref/feeds.php:595
-#: classes/pref/feeds.php:830
-#: classes/pref/feeds.php:1822
-#: classes/feeds.php:1055
-msgid "Place in category:"
-msgstr "Placera i kategori:"
-
-#: classes/pref/feeds.php:608
-#: classes/pref/feeds.php:844
-#, fuzzy
-msgid "Language:"
-msgstr "Språk"
-
-#: classes/pref/feeds.php:615
-#: classes/pref/feeds.php:853
-msgid "Update"
-msgstr "Uppdatera"
-
-#: classes/pref/feeds.php:630
-#: classes/pref/feeds.php:869
-msgid "Article purging:"
-msgstr "Artikelrensning:"
-
-#: classes/pref/feeds.php:658
-#: classes/pref/feeds.php:890
-#: classes/pref/feeds.php:1839
-#: classes/pref/prefs.php:245
-#: classes/feeds.php:1083
-msgid "Password"
-msgstr "Lösenord"
-
-#: classes/pref/feeds.php:662
-msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
-msgstr "<b>Tips:</b> du måste ange din inloggningsuppgifter om ditt flöde kräver autentisering, dock ej för Twitter-flöden."
-
-#: classes/pref/feeds.php:681
-#: classes/pref/feeds.php:900
-msgid "Hide from Popular feeds"
-msgstr "Dölj från populära flöden"
-
-#: classes/pref/feeds.php:693
-#: classes/pref/feeds.php:906
-msgid "Include in e-mail digest"
-msgstr "Inkludera i e-postsammanfattning"
-
-#: classes/pref/feeds.php:706
-#: classes/pref/feeds.php:912
-msgid "Always display image attachments"
-msgstr "Visa alltid bilder"
-
-#: classes/pref/feeds.php:719
-#: classes/pref/feeds.php:920
-msgid "Do not embed images"
-msgstr "Bädda inte in bilder"
-
-#: classes/pref/feeds.php:732
-#: classes/pref/feeds.php:928
-msgid "Cache media"
-msgstr ""
-
-#: classes/pref/feeds.php:744
-#: classes/pref/feeds.php:934
-msgid "Mark updated articles as unread"
-msgstr "Makera uppdaterade artiklar som olästa"
-
-#: classes/pref/feeds.php:748
-msgid "Icon"
-msgstr "Ikon"
-
-#: classes/pref/feeds.php:765
-msgid "Replace"
-msgstr "Ersätt"
-
-#: classes/pref/feeds.php:772
-#: classes/pref/prefs.php:698
-msgid "Plugins"
-msgstr "Tillägg"
-
-#: classes/pref/feeds.php:792
-msgid "Resubscribe to push updates"
-msgstr "Återprenumerera på push-uppdateringar:"
-
-#: classes/pref/feeds.php:799
-msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
-msgstr "Återställ PubSubHubbub-prenumerationer för push-uppdaterade feeds."
-
-#: classes/pref/feeds.php:1200
-#: classes/pref/feeds.php:1253
-msgid "All done."
-msgstr "Klart."
-
-#: classes/pref/feeds.php:1308
-msgid "Feeds with errors"
-msgstr "Flöden med fel"
-
-#: classes/pref/feeds.php:1315
-msgid "Inactive feeds"
-msgstr "Inaktiva flöden"
-
-#: classes/pref/feeds.php:1351
-msgid "Edit selected feeds"
-msgstr "Redigera valda flöden"
-
-#: classes/pref/feeds.php:1353
-#: classes/pref/feeds.php:1367
-#: classes/pref/filters.php:762
-msgid "Reset sort order"
-msgstr "Återställ sorteringsordning"
-
-#: classes/pref/feeds.php:1355
-#: js/prefs.js:1622
-msgid "Batch subscribe"
-msgstr "Massprenumerera"
-
-#: classes/pref/feeds.php:1362
-msgid "Categories"
-msgstr "Kategorier"
-
-#: classes/pref/feeds.php:1365
-msgid "Add category"
-msgstr "Lägg till kategori"
-
-#: classes/pref/feeds.php:1369
-msgid "Remove selected"
-msgstr "Ta bort markerade"
-
-#: classes/pref/feeds.php:1380
-msgid "More actions..."
-msgstr "Fler åtgärder..."
-
-#: classes/pref/feeds.php:1384
-msgid "Manual purge"
-msgstr "Manuell rensning"
-
-#: classes/pref/feeds.php:1388
-msgid "Clear feed data"
-msgstr "Rensa flödesdata"
-
-#: classes/pref/feeds.php:1389
-#: classes/pref/filters.php:770
-msgid "Rescore articles"
-msgstr "Poängsätt på nytt"
-
-#: classes/pref/feeds.php:1442
-msgid "OPML"
-msgstr "OPML"
-
-#: classes/pref/feeds.php:1444
-msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
-msgstr "Med OPML kan du importera och exportera dina flöden, filter, etiketter och Tin Tiny RSS-inställningar"
-
-#: classes/pref/feeds.php:1445
-msgid "Only main settings profile can be migrated using OPML."
-msgstr "Endast huvudprofilens inställningar kan migreras med OPML."
-
-#: classes/pref/feeds.php:1458
-msgid "Import my OPML"
-msgstr "Importera OPML"
-
-#: classes/pref/feeds.php:1464
-msgid "Filename:"
-msgstr "Filnamn:"
-
-#: classes/pref/feeds.php:1466
-msgid "Include settings"
-msgstr "Inkludera inställningar"
-
-#: classes/pref/feeds.php:1470
-msgid "Export OPML"
-msgstr "Exportera OPML"
-
-#: classes/pref/feeds.php:1474
-msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
-msgstr "Din OPML-fil kan publiceras publikt och den kan bli prenumererad på av alla som känner till URLen nedan"
-
-#: classes/pref/feeds.php:1478
-msgid "Public OPML URL"
-msgstr "Publik OPML-URL"
-
-#: classes/pref/feeds.php:1479
-msgid "Display published OPML URL"
-msgstr "Visa publicerad OPML-URL"
-
-#: classes/pref/feeds.php:1488
-msgid "Firefox integration"
-msgstr "Firefox-integration"
-
-#: classes/pref/feeds.php:1490
-msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
-msgstr "Denna Tiny Tiny RSS-webbplats kan användas som en flödesläsare för Firefox genom att klicka på länken nedan."
-
-#: classes/pref/feeds.php:1497
-msgid "Click here to register this site as a feed reader."
-msgstr "Klicka här för att registrera denna webbplats som en flödesläsare."
-
-#: classes/pref/feeds.php:1505
-msgid "Published & shared articles / Generated feeds"
-msgstr "Publicerade och delade artiklar / Genererade flöden"
-
-#: classes/pref/feeds.php:1507
-msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
-msgstr "Publicerade artiklar exporteras som ett publikt RSS-flöde och kan prenumeras på av alla som har URLen nedan."
-
-#: classes/pref/feeds.php:1514
-#: classes/feeds.php:54
-#: classes/feeds.php:140
-msgid "View as RSS"
-msgstr "Visa som RSS"
-
-#: classes/pref/feeds.php:1515
-msgid "Display URL"
-msgstr "Visa URL"
-
-#: classes/pref/feeds.php:1518
-msgid "Clear all generated URLs"
-msgstr "Rensa alla genererade URLer"
-
-#: classes/pref/feeds.php:1596
-msgid "These feeds have not been updated with new content for 3 months (oldest first):"
-msgstr "Följande flöden har inte uppdaterats med nytt innehåll på 3 månader (äldst först): "
-
-#: classes/pref/feeds.php:1630
-#: classes/pref/feeds.php:1694
-msgid "Click to edit feed"
-msgstr "Klicka för att redigera flöde"
-
-#: classes/pref/feeds.php:1648
-#: classes/pref/feeds.php:1714
-msgid "Unsubscribe from selected feeds"
-msgstr "Ta bort prenumeration för valda flöden"
-
-#: classes/pref/feeds.php:1819
-msgid "Add one valid RSS feed per line (no feed detection is done)"
-msgstr "Lägg till ett giltigt RSS-flöde per rad (ingen flödesupptäckt görs)"
-
-#: classes/pref/feeds.php:1828
-msgid "Feeds to subscribe, One per line"
-msgstr "Flöden att prenumerera på, ett per rad"
-
-#: classes/pref/feeds.php:1851
-msgid "Feeds require authentication."
-msgstr "Flödet kräver inloggning."
-
-#: classes/pref/feeds.php:1858
-#: classes/feeds.php:1099
-#: classes/feeds.php:1153
-msgid "Subscribe"
-msgstr "Prenumerera"
-
-#: classes/pref/filters.php:151
-#, fuzzy
-msgid "Preview article"
-msgstr "Nya artiklar"
-
-#: classes/pref/filters.php:239
-#: classes/pref/filters.php:518
-msgid "(inverse)"
-msgstr "(invertera)"
-
-#: classes/pref/filters.php:235
-#: classes/pref/filters.php:517
-#, php-format
-msgid "%s on %s in %s %s"
-msgstr "%s på %s i %s %s"
-
-#: classes/pref/filters.php:354
-#: classes/pref/filters.php:827
-#: classes/pref/filters.php:942
-msgid "Match"
-msgstr "Matcha"
-
-#: classes/pref/filters.php:368
-#: classes/pref/filters.php:416
-#: classes/pref/filters.php:841
-#: classes/pref/filters.php:868
-msgid "Add"
-msgstr "Lägg till"
-
-#: classes/pref/filters.php:371
-#: classes/pref/filters.php:419
-#: classes/pref/filters.php:844
-#: classes/pref/filters.php:871
-#: classes/feeds.php:122
-msgid "Delete"
-msgstr "Radera"
-
-#: classes/pref/filters.php:402
-#: classes/pref/filters.php:854
-msgid "Apply actions"
-msgstr "Tillämpa åtgärder"
-
-#: classes/pref/filters.php:452
-#: classes/pref/filters.php:883
-msgid "Enabled"
-msgstr "Aktiverat"
-
-#: classes/pref/filters.php:461
-#: classes/pref/filters.php:886
-msgid "Match any rule"
-msgstr "Matcha alla regler"
-
-#: classes/pref/filters.php:470
-#: classes/pref/filters.php:889
-msgid "Inverse matching"
-msgstr "Invertera matchning"
-
-#: classes/pref/filters.php:482
-#: classes/pref/filters.php:896
-msgid "Test"
-msgstr "Test"
-
-#: classes/pref/filters.php:756
-msgid "Combine"
-msgstr "Kombinera"
-
-#: classes/pref/filters.php:899
-msgid "Create"
-msgstr "Skapa"
-
-#: classes/pref/filters.php:954
-msgid "Inverse regular expression matching"
-msgstr "Invertera matchning av regulära uttryck"
-
-#: classes/pref/filters.php:956
-msgid "on field"
-msgstr "i fält"
-
-#: classes/pref/filters.php:962
-#: js/PrefFilterTree.js:64
-msgid "in"
-msgstr "i"
-
-#: classes/pref/filters.php:975
-#, fuzzy
-msgid "Wiki: Filters"
-msgstr "Filter"
-
-#: classes/pref/filters.php:980
-msgid "Save rule"
-msgstr "Spara regel"
-
-#: classes/pref/filters.php:980
-#: js/functions.js:865
-msgid "Add rule"
-msgstr "Tillämpa regel"
-
-#: classes/pref/filters.php:1003
-msgid "Perform Action"
-msgstr "Utför aktivitet"
-
-#: classes/pref/filters.php:1054
-#, fuzzy
-msgid "No actions available"
-msgstr "Ny version tillgänglig!"
-
-#: classes/pref/filters.php:1073
-msgid "Save action"
-msgstr "Spara aktivitet"
-
-#: classes/pref/filters.php:1073
-#: js/functions.js:887
-msgid "Add action"
-msgstr "Lägg till aktivitet"
-
-#: classes/pref/filters.php:1097
-msgid "[No caption]"
-msgstr "[Inge titel]"
-
-#: classes/pref/filters.php:1099
-#, fuzzy, php-format
-msgid "%s (%d rule)"
-msgid_plural "%s (%d rules)"
-msgstr[0] "Tillämpa regel"
-msgstr[1] "Tillämpa regel"
-
-#: classes/pref/filters.php:1114
-#, fuzzy
-msgid "matches any rule"
-msgstr "Matcha alla regler"
-
-#: classes/pref/filters.php:1117
-#, fuzzy, php-format
-msgid "%s (+%d action)"
-msgid_plural "%s (+%d actions)"
-msgstr[0] "Lägg till aktivitet"
-msgstr[1] "Lägg till aktivitet"
-
 #: classes/pref/prefs.php:19
 msgid "Interface"
 msgstr "Visning"
@@ -2063,7 +1663,7 @@ msgid "Strip all but most common HTML tags when reading articles."
 msgstr "Ta bort alla utom de vanligast HTML-taggarna från artiklarna."
 
 #: classes/pref/prefs.php:53
-#: js/prefs.js:1584
+#: js/prefs.js:1580
 msgid "Customize stylesheet"
 msgstr "Anpassa stilmall"
 
@@ -2131,6 +1731,14 @@ msgstr "Behörighetsnivå"
 msgid "Save data"
 msgstr "Spara"
 
+#: classes/pref/prefs.php:245
+#: classes/pref/feeds.php:658
+#: classes/pref/feeds.php:878
+#: classes/pref/feeds.php:1813
+#: classes/feeds.php:1076
+msgid "Password"
+msgstr "Lösenord"
+
 #: classes/pref/prefs.php:254
 msgid "Your password is at default value, please change it."
 msgstr "Byt lösenord."
@@ -2229,18 +1837,23 @@ msgstr "Hantera profiler"
 msgid "Reset to defaults"
 msgstr "Återställ till standard"
 
+#: classes/pref/prefs.php:698
+#: classes/pref/feeds.php:772
+msgid "Plugins"
+msgstr "Tillägg"
+
 #: classes/pref/prefs.php:700
 msgid "You will need to reload Tiny Tiny RSS for plugin changes to take effect."
 msgstr "Du kommer behöva ladda om Tiny Tiny RSS för att ändringarna för tillägg ska träda i kraft."
 
-#: classes/pref/prefs.php:702
-msgid "Download more plugins at tt-rss.org <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forums</a> or <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a>."
-msgstr "Ladda ner fler tillägg via tt-rss.org <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forum</a> eller <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a>."
-
-#: classes/pref/prefs.php:732
+#: classes/pref/prefs.php:730
 msgid "System plugins"
 msgstr "Systemtillägg"
 
+#: classes/pref/prefs.php:731
+msgid "System plugins are enabled in <strong>config.php</strong> for all users."
+msgstr ""
+
 #: classes/pref/prefs.php:736
 #: classes/pref/prefs.php:792
 msgid "Plugin"
@@ -2310,6 +1923,341 @@ msgstr "Radera markerade profiler"
 msgid "Activate profile"
 msgstr "Aktivera profil"
 
+#: classes/pref/feeds.php:15
+msgid "Check to enable field"
+msgstr "Markera för att aktivera"
+
+#: classes/pref/feeds.php:65
+#: classes/pref/feeds.php:214
+#: classes/pref/feeds.php:258
+#: classes/pref/feeds.php:264
+#: classes/pref/feeds.php:290
+#, fuzzy, php-format
+msgid "(%d feed)"
+msgid_plural "(%d feeds)"
+msgstr[0] "(%d kanaler)"
+msgstr[1] "(%d kanaler)"
+
+#: classes/pref/feeds.php:561
+msgid "Feed Title"
+msgstr "Flödestitel"
+
+#: classes/pref/feeds.php:595
+#: classes/pref/feeds.php:818
+#: classes/pref/feeds.php:1796
+#: classes/feeds.php:1048
+msgid "Place in category:"
+msgstr "Placera i kategori:"
+
+#: classes/pref/feeds.php:608
+#: classes/pref/feeds.php:832
+#, fuzzy
+msgid "Language:"
+msgstr "Språk"
+
+#: classes/pref/feeds.php:615
+#: classes/pref/feeds.php:841
+msgid "Update"
+msgstr "Uppdatera"
+
+#: classes/pref/feeds.php:630
+#: classes/pref/feeds.php:857
+msgid "Article purging:"
+msgstr "Artikelrensning:"
+
+#: classes/pref/feeds.php:662
+msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
+msgstr "<b>Tips:</b> du måste ange din inloggningsuppgifter om ditt flöde kräver autentisering, dock ej för Twitter-flöden."
+
+#: classes/pref/feeds.php:681
+#: classes/pref/feeds.php:888
+msgid "Hide from Popular feeds"
+msgstr "Dölj från populära flöden"
+
+#: classes/pref/feeds.php:693
+#: classes/pref/feeds.php:894
+msgid "Include in e-mail digest"
+msgstr "Inkludera i e-postsammanfattning"
+
+#: classes/pref/feeds.php:706
+#: classes/pref/feeds.php:900
+msgid "Always display image attachments"
+msgstr "Visa alltid bilder"
+
+#: classes/pref/feeds.php:719
+#: classes/pref/feeds.php:908
+msgid "Do not embed images"
+msgstr "Bädda inte in bilder"
+
+#: classes/pref/feeds.php:732
+#: classes/pref/feeds.php:916
+msgid "Cache media"
+msgstr ""
+
+#: classes/pref/feeds.php:744
+#: classes/pref/feeds.php:922
+msgid "Mark updated articles as unread"
+msgstr "Makera uppdaterade artiklar som olästa"
+
+#: classes/pref/feeds.php:748
+msgid "Icon"
+msgstr "Ikon"
+
+#: classes/pref/feeds.php:765
+msgid "Replace"
+msgstr "Ersätt"
+
+#: classes/pref/feeds.php:1174
+#: classes/pref/feeds.php:1227
+msgid "All done."
+msgstr "Klart."
+
+#: classes/pref/feeds.php:1282
+msgid "Feeds with errors"
+msgstr "Flöden med fel"
+
+#: classes/pref/feeds.php:1289
+msgid "Inactive feeds"
+msgstr "Inaktiva flöden"
+
+#: classes/pref/feeds.php:1325
+msgid "Edit selected feeds"
+msgstr "Redigera valda flöden"
+
+#: classes/pref/feeds.php:1329
+#: js/prefs.js:1618
+msgid "Batch subscribe"
+msgstr "Massprenumerera"
+
+#: classes/pref/feeds.php:1336
+msgid "Categories"
+msgstr "Kategorier"
+
+#: classes/pref/feeds.php:1339
+msgid "Add category"
+msgstr "Lägg till kategori"
+
+#: classes/pref/feeds.php:1343
+msgid "Remove selected"
+msgstr "Ta bort markerade"
+
+#: classes/pref/feeds.php:1354
+msgid "More actions..."
+msgstr "Fler åtgärder..."
+
+#: classes/pref/feeds.php:1358
+msgid "Manual purge"
+msgstr "Manuell rensning"
+
+#: classes/pref/feeds.php:1362
+msgid "Clear feed data"
+msgstr "Rensa flödesdata"
+
+#: classes/pref/feeds.php:1416
+msgid "OPML"
+msgstr "OPML"
+
+#: classes/pref/feeds.php:1418
+msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
+msgstr "Med OPML kan du importera och exportera dina flöden, filter, etiketter och Tin Tiny RSS-inställningar"
+
+#: classes/pref/feeds.php:1419
+msgid "Only main settings profile can be migrated using OPML."
+msgstr "Endast huvudprofilens inställningar kan migreras med OPML."
+
+#: classes/pref/feeds.php:1432
+msgid "Import my OPML"
+msgstr "Importera OPML"
+
+#: classes/pref/feeds.php:1438
+msgid "Filename:"
+msgstr "Filnamn:"
+
+#: classes/pref/feeds.php:1440
+msgid "Include settings"
+msgstr "Inkludera inställningar"
+
+#: classes/pref/feeds.php:1444
+msgid "Export OPML"
+msgstr "Exportera OPML"
+
+#: classes/pref/feeds.php:1448
+msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
+msgstr "Din OPML-fil kan publiceras publikt och den kan bli prenumererad på av alla som känner till URLen nedan"
+
+#: classes/pref/feeds.php:1452
+msgid "Public OPML URL"
+msgstr "Publik OPML-URL"
+
+#: classes/pref/feeds.php:1453
+msgid "Display published OPML URL"
+msgstr "Visa publicerad OPML-URL"
+
+#: classes/pref/feeds.php:1462
+msgid "Firefox integration"
+msgstr "Firefox-integration"
+
+#: classes/pref/feeds.php:1464
+msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
+msgstr "Denna Tiny Tiny RSS-webbplats kan användas som en flödesläsare för Firefox genom att klicka på länken nedan."
+
+#: classes/pref/feeds.php:1471
+msgid "Click here to register this site as a feed reader."
+msgstr "Klicka här för att registrera denna webbplats som en flödesläsare."
+
+#: classes/pref/feeds.php:1479
+msgid "Published & shared articles / Generated feeds"
+msgstr "Publicerade och delade artiklar / Genererade flöden"
+
+#: classes/pref/feeds.php:1481
+msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
+msgstr "Publicerade artiklar exporteras som ett publikt RSS-flöde och kan prenumeras på av alla som har URLen nedan."
+
+#: classes/pref/feeds.php:1488
+#: classes/feeds.php:54
+#: classes/feeds.php:140
+msgid "View as RSS"
+msgstr "Visa som RSS"
+
+#: classes/pref/feeds.php:1489
+msgid "Display URL"
+msgstr "Visa URL"
+
+#: classes/pref/feeds.php:1492
+msgid "Clear all generated URLs"
+msgstr "Rensa alla genererade URLer"
+
+#: classes/pref/feeds.php:1570
+msgid "These feeds have not been updated with new content for 3 months (oldest first):"
+msgstr "Följande flöden har inte uppdaterats med nytt innehåll på 3 månader (äldst först): "
+
+#: classes/pref/feeds.php:1604
+#: classes/pref/feeds.php:1668
+msgid "Click to edit feed"
+msgstr "Klicka för att redigera flöde"
+
+#: classes/pref/feeds.php:1622
+#: classes/pref/feeds.php:1688
+msgid "Unsubscribe from selected feeds"
+msgstr "Ta bort prenumeration för valda flöden"
+
+#: classes/pref/feeds.php:1793
+msgid "Add one valid RSS feed per line (no feed detection is done)"
+msgstr "Lägg till ett giltigt RSS-flöde per rad (ingen flödesupptäckt görs)"
+
+#: classes/pref/feeds.php:1802
+msgid "Feeds to subscribe, One per line"
+msgstr "Flöden att prenumerera på, ett per rad"
+
+#: classes/pref/feeds.php:1825
+msgid "Feeds require authentication."
+msgstr "Flödet kräver inloggning."
+
+#: classes/pref/feeds.php:1832
+#: classes/feeds.php:1092
+#: classes/feeds.php:1146
+msgid "Subscribe"
+msgstr "Prenumerera"
+
+#: classes/pref/system.php:29
+msgid "Error Log"
+msgstr "Fellogg"
+
+#: classes/pref/system.php:40
+msgid "Refresh"
+msgstr "Uppdatera"
+
+#: classes/pref/system.php:43
+#, fuzzy
+msgid "Clear log"
+msgstr "Rensa färger"
+
+#: classes/pref/system.php:48
+msgid "Error"
+msgstr "Fel"
+
+#: classes/pref/system.php:49
+msgid "Filename"
+msgstr "Filnamn"
+
+#: classes/pref/system.php:50
+msgid "Message"
+msgstr "Meddelande"
+
+#: classes/pref/system.php:52
+msgid "Date"
+msgstr "Datum"
+
+#: classes/opml.php:28
+#: classes/opml.php:33
+msgid "OPML Utility"
+msgstr "OPML-verktyg"
+
+#: classes/opml.php:37
+msgid "Importing OPML..."
+msgstr "Importera OPML..."
+
+#: classes/opml.php:41
+msgid "Return to preferences"
+msgstr "Återgå till inställningar"
+
+#: classes/opml.php:295
+#, php-format
+msgid "Adding feed: %s"
+msgstr "Lägger till flöde: %s"
+
+#: classes/opml.php:306
+#, php-format
+msgid "Duplicate feed: %s"
+msgstr "Dublett av flöde: %s"
+
+#: classes/opml.php:320
+#, php-format
+msgid "Adding label %s"
+msgstr "Lägger till etikett %s"
+
+#: classes/opml.php:323
+#, php-format
+msgid "Duplicate label: %s"
+msgstr "Etikettsdubblett: %s"
+
+#: classes/opml.php:335
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr "Sätter %s till %s"
+
+#: classes/opml.php:367
+msgid "Adding filter..."
+msgstr "Lägger till filter..."
+
+#: classes/opml.php:486
+#, php-format
+msgid "Processing category: %s"
+msgstr "Bearbetar kategori: %s"
+
+#: classes/opml.php:532
+#, php-format
+msgid "Upload failed with error code %d"
+msgstr "Uppladdningen misslyckades med felkod %d"
+
+#: classes/opml.php:544
+#: plugins/import_export/init.php:448
+msgid "Unable to move uploaded file."
+msgstr "Fel: kunde inte flytta uppladdad fil."
+
+#: classes/opml.php:548
+#: plugins/import_export/init.php:452
+msgid "Error: please upload OPML file."
+msgstr "Fel: vänligen ladda upp en OPMLfil."
+
+#: classes/opml.php:559
+msgid "Error: unable to find moved OPML file."
+msgstr "Fel: kunde inte hitta flyttad OPML-fil."
+
+#: classes/opml.php:566
+msgid "Error while parsing document."
+msgstr "Fel vid tolkning av dokument."
+
 #: classes/feeds.php:53
 msgid "View as RSS feed"
 msgstr "Visa RSS-flöde"
@@ -2350,8 +2298,8 @@ msgstr "Gå tillbaka"
 
 #: classes/feeds.php:127
 #: classes/feeds.php:132
-#: plugins/mail/init.php:75
 #: plugins/mailto/init.php:25
+#: plugins/mail/init.php:75
 msgid "Forward by email"
 msgstr "Skicka med e-post"
 
@@ -2359,320 +2307,147 @@ msgstr "Skicka med e-post"
 msgid "Feed:"
 msgstr "Flöde:"
 
-#: classes/feeds.php:229
-#: classes/feeds.php:892
+#: classes/feeds.php:228
+#: classes/feeds.php:885
 msgid "Feed not found."
 msgstr "Kunde inte hitta flöde."
 
-#: classes/feeds.php:300
+#: classes/feeds.php:291
 msgid "Never"
 msgstr "Aldrig"
 
-#: classes/feeds.php:413
+#: classes/feeds.php:405
 #, php-format
 msgid "Imported at %s"
 msgstr "Importerad kl. %s"
 
-#: classes/feeds.php:472
-#: classes/feeds.php:569
+#: classes/feeds.php:464
+#: classes/feeds.php:561
 #, fuzzy
 msgid "mark feed as read"
 msgstr "Flagga kanal som läst"
 
-#: classes/feeds.php:630
+#: classes/feeds.php:622
 msgid "Collapse article"
 msgstr "Minimera artikel"
 
-#: classes/feeds.php:791
+#: classes/feeds.php:784
 msgid "No unread articles found to display."
 msgstr "Hittade inga olästa artiklar."
 
-#: classes/feeds.php:794
+#: classes/feeds.php:787
 msgid "No updated articles found to display."
 msgstr "Hittade inga uppdaterade artiklar."
 
-#: classes/feeds.php:797
+#: classes/feeds.php:790
 msgid "No starred articles found to display."
 msgstr "Hittade inga stjärnmarkerade artiklar."
 
-#: classes/feeds.php:801
+#: classes/feeds.php:794
 msgid "No articles found to display. You can assign articles to labels manually from article header context menu (applies to all selected articles) or use a filter."
 msgstr "Hittade inga artiklar att visa. Du kan ge artiklar etiketter manuellt  via snabbmenyn för artiklar (gäller alla valda artiklar) eller genom att använda filter."
 
-#: classes/feeds.php:803
+#: classes/feeds.php:796
 msgid "No articles found to display."
 msgstr "Hittade inga artiklar att visa."
 
-#: classes/feeds.php:818
-#: classes/feeds.php:992
+#: classes/feeds.php:811
+#: classes/feeds.php:985
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "Flöden senast uppdaterade %s"
 
-#: classes/feeds.php:828
-#: classes/feeds.php:1002
+#: classes/feeds.php:821
+#: classes/feeds.php:995
 msgid "Some feeds have update errors (click for details)"
 msgstr "Vissa flöden har uppdateringsfel (klicka för detaljer)"
 
-#: classes/feeds.php:982
+#: classes/feeds.php:975
 msgid "No feed selected."
 msgstr "Inget flöde valt."
 
-#: classes/feeds.php:1041
-#: classes/feeds.php:1049
+#: classes/feeds.php:1034
+#: classes/feeds.php:1042
 msgid "Feed or site URL"
 msgstr "URL för flöde eller webbplats"
 
-#: classes/feeds.php:1063
+#: classes/feeds.php:1056
 msgid "Available feeds"
 msgstr "Tillgängliga flöden"
 
-#: classes/feeds.php:1094
+#: classes/feeds.php:1087
 msgid "This feed requires authentication."
 msgstr "Detta flöde kräver autentisering."
 
-#: classes/feeds.php:1102
+#: classes/feeds.php:1095
 msgid "More feeds"
 msgstr "Fler flöden"
 
-#: classes/feeds.php:1129
+#: classes/feeds.php:1122
 msgid "Popular feeds"
 msgstr "Populära flöden"
 
-#: classes/feeds.php:1130
+#: classes/feeds.php:1123
 msgid "Feed archive"
 msgstr "Flödesarkiv"
 
-#: classes/feeds.php:1133
+#: classes/feeds.php:1126
 msgid "limit:"
 msgstr "gräns:"
 
-#: classes/feeds.php:1165
+#: classes/feeds.php:1158
 msgid "Look for"
 msgstr "Sök efter"
 
-#: classes/feeds.php:1173
+#: classes/feeds.php:1166
 #, php-format
 msgid "in %s"
 msgstr ""
 
-#: classes/feeds.php:1178
+#: classes/feeds.php:1171
 msgid "Used for word stemming"
 msgstr ""
 
-#: classes/feeds.php:1187
+#: classes/feeds.php:1180
 #, fuzzy
 msgid "Search syntax"
 msgstr "Sök"
 
-#: plugins/instances/init.php:141
-msgid "Linked"
-msgstr "Länkad"
-
-#: plugins/instances/init.php:204
-#: plugins/instances/init.php:395
-msgid "Instance"
-msgstr "Instans"
-
-#: plugins/instances/init.php:215
-#: plugins/instances/init.php:312
-#: plugins/instances/init.php:404
-msgid "Instance URL"
-msgstr "Instans-URL"
-
-#: plugins/instances/init.php:226
-#: plugins/instances/init.php:414
-msgid "Access key:"
-msgstr "Accessnyckel:"
-
-#: plugins/instances/init.php:229
-#: plugins/instances/init.php:313
-#: plugins/instances/init.php:417
-msgid "Access key"
-msgstr "Accessnyckel"
-
-#: plugins/instances/init.php:233
-#: plugins/instances/init.php:421
-msgid "Use one access key for both linked instances."
-msgstr "Använd samma accessnyckel för bägge länkade instanserna"
-
-#: plugins/instances/init.php:241
-#: plugins/instances/init.php:429
-msgid "Generate new key"
-msgstr "Skapa en ny nyckel"
-
-#: plugins/instances/init.php:292
-msgid "Link instance"
-msgstr "Länka instanser"
-
-#: plugins/instances/init.php:304
-msgid "You can connect other instances of Tiny Tiny RSS to this one to share Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
-msgstr "Du kan ansluta till andra instanser av Tiny Tiny RSS för att dela populära flöde. Länka till denna instans genom att använd följande URL:"
-
-#: plugins/instances/init.php:314
-msgid "Last connected"
-msgstr "Senast ansluten"
-
-#: plugins/instances/init.php:315
-msgid "Status"
-msgstr "Status"
-
-#: plugins/instances/init.php:316
-msgid "Stored feeds"
-msgstr "Sparade flöden"
-
-#: plugins/instances/init.php:433
-msgid "Create link"
-msgstr "Skapa länk"
-
-#: plugins/nsfw/init.php:30
-#: plugins/nsfw/init.php:42
-msgid "Not work safe (click to toggle)"
-msgstr "NSFW (klicka för att växla)"
-
-#: plugins/nsfw/init.php:52
-msgid "NSFW Plugin"
-msgstr "NSFW Plugin"
-
-#: plugins/nsfw/init.php:79
-msgid "Tags to consider NSFW (comma-separated)"
-msgstr "Lista NSFW-taggar (kommaseparerade)"
-
-#: plugins/nsfw/init.php:100
-msgid "Configuration saved."
-msgstr "Inställningar sparade."
-
-#: plugins/note/init.php:26
-#: plugins/note/note.js:11
-msgid "Edit article note"
-msgstr "Redigera artikelnotering"
-
-#: plugins/vf_shared/init.php:16
-#: plugins/vf_shared/init.php:69
-#, fuzzy
-msgid "Shared articles"
+#: classes/feeds.php:1596
+msgid "Starred articles"
 msgstr "Stjärnmärkta artiklar"
 
-#: plugins/auth_internal/init.php:65
-msgid "Please enter your one time password:"
-msgstr "Ange ditt engångslösenord:"
-
-#: plugins/auth_internal/init.php:188
-msgid "Password has been changed."
-msgstr "Lösenord uppdaterat."
-
-#: plugins/auth_internal/init.php:190
-msgid "Old password is incorrect."
-msgstr "Felaktigt gammalt lösenord."
-
-#: plugins/af_readability/init.php:21
-msgid "Data saved."
-msgstr ""
-
-#: plugins/af_readability/init.php:33
-#, fuzzy
-msgid "Inline content"
-msgstr "Skrolla artikelinnehåll"
-
-#: plugins/af_readability/init.php:39
-msgid "Readability settings (af_readability)"
-msgstr ""
-
-#: plugins/af_readability/init.php:66
-msgid "Use Readability for pages shared via bookmarklet."
-msgstr ""
-
-#: plugins/af_readability/init.php:78
-#: plugins/af_psql_trgm/init.php:191
-msgid "Currently enabled for (click to edit):"
-msgstr ""
-
-#: plugins/af_readability/init.php:95
-#, fuzzy
-msgid "Readability"
-msgstr "Kontrollera tillgänglighet"
-
-#: plugins/af_readability/init.php:106
-#, fuzzy
-msgid "Inline article content"
-msgstr "Skrolla artikelinnehåll"
-
-#: plugins/af_redditimgur/init.php:25
-msgid "Reddit content settings (af_redditimgur)"
-msgstr ""
+#: classes/feeds.php:1598
+msgid "Published articles"
+msgstr "Publicerade artiklar"
 
-#: plugins/af_redditimgur/init.php:50
-msgid "Uses Readability (full-text-rss) implementation by <a target='_blank' href='https://bitbucket.org/fivefilters/'>FiveFilters.org</a>"
-msgstr ""
+#: classes/feeds.php:1600
+msgid "Fresh articles"
+msgstr "Nya artiklar"
 
-#: plugins/af_redditimgur/init.php:54
-msgid "Extract missing content using Readability"
-msgstr ""
+#: classes/feeds.php:1604
+msgid "Archived articles"
+msgstr "Arkiverade artiklar"
 
-#: plugins/af_redditimgur/init.php:59
-msgid "Enable additional duplicate checking"
-msgstr ""
+#: classes/feeds.php:1606
+msgid "Recently read"
+msgstr "Nyligen lästa"
 
-#: plugins/af_redditimgur/init.php:73
-#: plugins/af_zz_imgproxy/init.php:225
-#, fuzzy
-msgid "Configuration saved"
-msgstr "Inställningar sparade."
+#: classes/feeds.php:1716
+msgid "Special"
+msgstr "Special"
 
-#: plugins/af_psql_trgm/init.php:28
+#: classes/feeds.php:1962
 #, php-format
-msgid "Data saved (%s, %d)"
-msgstr ""
+msgid "Search results: %s"
+msgstr "Sökresultat: %s"
 
-#: plugins/af_psql_trgm/init.php:112
+#: plugins/vf_shared/init.php:16
+#: plugins/vf_shared/init.php:60
 #, fuzzy
-msgid "Show related articles"
+msgid "Shared articles"
 msgstr "Stjärnmärkta artiklar"
 
-#: plugins/af_psql_trgm/init.php:118
-#: plugins/af_psql_trgm/init.php:220
-#, fuzzy
-msgid "Mark similar articles as read"
-msgstr "Flagga alla artiklar som lästa?"
-
-#: plugins/af_psql_trgm/init.php:157
-msgid "PostgreSQL trigram extension returns string similarity as a floating point number (0-1). Setting it too low might produce false positives, zero disables checking."
-msgstr ""
-
-#: plugins/af_psql_trgm/init.php:160
-#, fuzzy
-msgid "Global settings"
-msgstr "Inkludera inställningar"
-
-#: plugins/af_psql_trgm/init.php:164
-msgid "Minimum similarity:"
-msgstr ""
-
-#: plugins/af_psql_trgm/init.php:169
-msgid "Minimum title length:"
-msgstr ""
-
-#: plugins/af_psql_trgm/init.php:174
-#, fuzzy
-msgid "Enable for all feeds:"
-msgstr "Aktivera kategorier"
-
-#: plugins/af_psql_trgm/init.php:209
-msgid "Similarity (pg_trgm)"
-msgstr ""
-
-#: plugins/af_comics/init.php:40
-msgid "Feeds supported by af_comics"
-msgstr ""
-
-#: plugins/af_comics/init.php:42
-msgid "The following comics are currently supported:"
-msgstr ""
-
-#: plugins/af_comics/init.php:60
-msgid "GoComics requires a specific URL to workaround their lack of feed support: <code>http://feeds.feedburner.com/uclick/<em>comic_name</em></code> (e.g. <code>http://www.gocomics.com/garfield</code> uses <code>http://feeds.feedburner.com/uclick/garfield</code>)."
-msgstr ""
-
 #: plugins/import_export/init.php:58
 msgid "Import and export"
 msgstr "Importera och exportera"
@@ -2690,96 +2465,83 @@ msgstr "Exportera min data"
 msgid "Import"
 msgstr "Importera"
 
-#: plugins/import_export/init.php:225
+#: plugins/import_export/init.php:231
 msgid "Could not import: incorrect schema version."
 msgstr "Kunde inte importera: inkorrekt version av databasschema"
 
-#: plugins/import_export/init.php:230
+#: plugins/import_export/init.php:236
 msgid "Could not import: unrecognized document format."
 msgstr "Kunde inte importera: okänt filformat"
 
-#: plugins/import_export/init.php:391
+#: plugins/import_export/init.php:397
 msgid "Finished: "
 msgstr "Klart:"
 
-#: plugins/import_export/init.php:392
+#: plugins/import_export/init.php:398
 #, php-format
 msgid "%d article processed, "
 msgid_plural "%d articles processed, "
 msgstr[0] "%d artikel bearbetad, "
 msgstr[1] "%d artiklar bearbetade, "
 
-#: plugins/import_export/init.php:393
+#: plugins/import_export/init.php:399
 #, php-format
 msgid "%d imported, "
 msgid_plural "%d imported, "
 msgstr[0] "%d importerat, "
 msgstr[1] "%d importerade, "
 
-#: plugins/import_export/init.php:394
+#: plugins/import_export/init.php:400
 #, php-format
 msgid "%d feed created."
 msgid_plural "%d feeds created."
 msgstr[0] "%d flöde skapat."
 msgstr[1] "%d flöden skapade."
 
-#: plugins/import_export/init.php:399
+#: plugins/import_export/init.php:405
 msgid "Could not load XML document."
 msgstr "Kunde inte ladda XML-filen."
 
-#: plugins/import_export/init.php:411
+#: plugins/import_export/init.php:417
 msgid "Prepare data"
 msgstr "Förbered data"
 
-#: plugins/import_export/init.php:428
+#: plugins/import_export/init.php:434
 #, fuzzy, php-format
 msgid "Upload failed with error code %d (%s)"
 msgstr "Uppladdningen misslyckades med felkod %d"
 
-#: plugins/import_export/init.php:454
+#: plugins/import_export/init.php:460
 msgid "No file uploaded."
 msgstr "Ingen fil uppladdad."
 
-#: plugins/mail/init.php:28
-msgid "Mail addresses saved."
-msgstr ""
-
-#: plugins/mail/init.php:34
-#, fuzzy
-msgid "Mail plugin"
-msgstr "Användartillägg"
-
-#: plugins/mail/init.php:36
-msgid "You can set predefined email addressed here (comma-separated list):"
-msgstr ""
-
+#: plugins/mailto/init.php:48
+#: plugins/mailto/init.php:54
 #: plugins/mail/init.php:112
 #: plugins/mail/init.php:118
-#: plugins/mailto/init.php:49
-#: plugins/mailto/init.php:55
 msgid "[Forwarded]"
 msgstr "[Vidarebefordrat]"
 
+#: plugins/mailto/init.php:48
 #: plugins/mail/init.php:112
-#: plugins/mailto/init.php:49
 msgid "Multiple articles"
 msgstr "Flera artiklar"
 
-#: plugins/mail/init.php:140
-msgid "To:"
-msgstr "Till:"
+#: plugins/mailto/init.php:70
+msgid "Clicking the following link to invoke your mail client:"
+msgstr "Klicka på följande länk för att skicka till ditt e-postprogram:"
 
-#: plugins/mail/init.php:155
-msgid "Subject:"
-msgstr "Ämne:"
+#: plugins/mailto/init.php:74
+msgid "Forward selected article(s) by email."
+msgstr "Vidarebefordra markerade artiklar med e-post"
 
-#: plugins/mail/init.php:172
-msgid "Send e-mail"
-msgstr "Skicka e-post"
+#: plugins/mailto/init.php:77
+msgid "You should be able to edit the message before sending in your mail client."
+msgstr "Du bör kunna redigera ditt meddelande innan det skickas"
 
-#: plugins/close_button/init.php:22
-msgid "Close article"
-msgstr "Stäng artikel"
+#: plugins/mailto/init.php:82
+msgid "Close this dialog"
+msgstr "Stäng denna dialogruta"
 
 #: plugins/bookmarklets/init.php:20
 msgid "Bookmarklets"
@@ -2802,34 +2564,125 @@ msgstr "Prenumerera i Tiny Tiny RSS"
 msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
 msgstr "Använd denna bookmarklet för att publicera webbsidor genom Tiny Tiny RSS"
 
+#: plugins/af_psql_trgm/init.php:28
+#, php-format
+msgid "Data saved (%s, %d)"
+msgstr ""
+
+#: plugins/af_psql_trgm/init.php:112
+#, fuzzy
+msgid "Show related articles"
+msgstr "Stjärnmärkta artiklar"
+
+#: plugins/af_psql_trgm/init.php:118
+#: plugins/af_psql_trgm/init.php:220
+#, fuzzy
+msgid "Mark similar articles as read"
+msgstr "Flagga alla artiklar som lästa?"
+
+#: plugins/af_psql_trgm/init.php:157
+msgid "PostgreSQL trigram extension returns string similarity as a floating point number (0-1). Setting it too low might produce false positives, zero disables checking."
+msgstr ""
+
+#: plugins/af_psql_trgm/init.php:160
+#, fuzzy
+msgid "Global settings"
+msgstr "Inkludera inställningar"
+
+#: plugins/af_psql_trgm/init.php:164
+msgid "Minimum similarity:"
+msgstr ""
+
+#: plugins/af_psql_trgm/init.php:169
+msgid "Minimum title length:"
+msgstr ""
+
+#: plugins/af_psql_trgm/init.php:174
+#, fuzzy
+msgid "Enable for all feeds:"
+msgstr "Aktivera kategorier"
+
+#: plugins/af_psql_trgm/init.php:191
+#: plugins/af_readability/init.php:78
+msgid "Currently enabled for (click to edit):"
+msgstr ""
+
+#: plugins/af_psql_trgm/init.php:209
+msgid "Similarity (pg_trgm)"
+msgstr ""
+
+#: plugins/nsfw/init.php:30
+#: plugins/nsfw/init.php:42
+msgid "Not work safe (click to toggle)"
+msgstr "NSFW (klicka för att växla)"
+
+#: plugins/nsfw/init.php:52
+msgid "NSFW Plugin"
+msgstr "NSFW Plugin"
+
+#: plugins/nsfw/init.php:79
+msgid "Tags to consider NSFW (comma-separated)"
+msgstr "Lista NSFW-taggar (kommaseparerade)"
+
+#: plugins/nsfw/init.php:100
+msgid "Configuration saved."
+msgstr "Inställningar sparade."
+
 #: plugins/toggle_sidebar/init.php:23
 msgid "Collapse feedlist"
 msgstr "Visa/dölj flödeslista"
 
-#: plugins/af_zz_imgproxy/init.php:186
-msgid "Image proxy settings (af_zz_imgproxy)"
+#: plugins/af_readability/init.php:21
+msgid "Data saved."
 msgstr ""
 
-#: plugins/af_zz_imgproxy/init.php:211
+#: plugins/af_readability/init.php:33
 #, fuzzy
-msgid "Enable proxy for all remote images."
-msgstr "Aktivera kategorier"
+msgid "Inline content"
+msgstr "Skrolla artikelinnehåll"
 
-#: plugins/mailto/init.php:71
-msgid "Clicking the following link to invoke your mail client:"
-msgstr "Klicka på följande länk för att skicka till ditt e-postprogram:"
+#: plugins/af_readability/init.php:39
+msgid "Readability settings (af_readability)"
+msgstr ""
 
-#: plugins/mailto/init.php:75
-msgid "Forward selected article(s) by email."
-msgstr "Vidarebefordra markerade artiklar med e-post"
+#: plugins/af_readability/init.php:66
+msgid "Use Readability for pages shared via bookmarklet."
+msgstr ""
 
-#: plugins/mailto/init.php:78
-msgid "You should be able to edit the message before sending in your mail client."
-msgstr "Du bör kunna redigera ditt meddelande innan det skickas"
+#: plugins/af_readability/init.php:95
+#, fuzzy
+msgid "Readability"
+msgstr "Kontrollera tillgänglighet"
 
-#: plugins/mailto/init.php:83
-msgid "Close this dialog"
-msgstr "Stäng denna dialogruta"
+#: plugins/af_readability/init.php:106
+#, fuzzy
+msgid "Inline article content"
+msgstr "Skrolla artikelinnehåll"
+
+#: plugins/mail/init.php:28
+msgid "Mail addresses saved."
+msgstr ""
+
+#: plugins/mail/init.php:34
+#, fuzzy
+msgid "Mail plugin"
+msgstr "Användartillägg"
+
+#: plugins/mail/init.php:36
+msgid "You can set predefined email addressed here (comma-separated list):"
+msgstr ""
+
+#: plugins/mail/init.php:140
+msgid "To:"
+msgstr "Till:"
+
+#: plugins/mail/init.php:155
+msgid "Subject:"
+msgstr "Ämne:"
+
+#: plugins/mail/init.php:172
+msgid "Send e-mail"
+msgstr "Skicka e-post"
 
 #: plugins/share/init.php:39
 msgid "You can disable all articles shared by unique URLs here."
@@ -2843,25 +2696,98 @@ msgstr "Ta bort delning av alla artiklar"
 msgid "Share by URL"
 msgstr "Dela via URL"
 
-#: plugins/share/init.php:97
+#: plugins/share/init.php:96
 msgid "You can share this article by the following unique URL:"
 msgstr "Du kan dela denna artikel genom följande unika URL:"
 
-#: plugins/share/init.php:115
+#: plugins/share/init.php:114
 #, fuzzy
 msgid "Unshare article"
 msgstr "Ta bort stjärnmarkering från artikeln"
 
+#: plugins/af_comics/init.php:48
+msgid "Feeds supported by af_comics"
+msgstr ""
+
+#: plugins/af_comics/init.php:50
+msgid "The following comics are currently supported:"
+msgstr ""
+
+#: plugins/af_comics/init.php:68
+msgid "GoComics requires a specific URL to workaround their lack of feed support: <code>http://feeds.feedburner.com/uclick/<em>comic_name</em></code> (e.g. <code>http://www.gocomics.com/garfield</code> uses <code>http://feeds.feedburner.com/uclick/garfield</code>)."
+msgstr ""
+
+#: plugins/af_comics/init.php:70
+msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:25
+msgid "Reddit content settings (af_redditimgur)"
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:50
+msgid "Uses Readability (full-text-rss) implementation by <a target='_blank' href='https://bitbucket.org/fivefilters/'>FiveFilters.org</a>"
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:54
+msgid "Extract missing content using Readability"
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:59
+msgid "Enable additional duplicate checking"
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:73
+#: plugins/af_zz_imgproxy/init.php:254
+#, fuzzy
+msgid "Configuration saved"
+msgstr "Inställningar sparade."
+
+#: plugins/note/init.php:26
+#: plugins/note/note.js:11
+msgid "Edit article note"
+msgstr "Redigera artikelnotering"
+
+#: plugins/close_button/init.php:25
+msgid "Close article"
+msgstr "Stäng artikel"
+
+#: plugins/af_zz_imgproxy/init.php:210
+msgid "Image proxy settings (af_zz_imgproxy)"
+msgstr ""
+
+#: plugins/af_zz_imgproxy/init.php:234
+#, fuzzy
+msgid "Enable proxy for all remote images."
+msgstr "Aktivera kategorier"
+
+#: plugins/af_zz_imgproxy/init.php:238
+#, fuzzy
+msgid "Don't cache files locally."
+msgstr "Cacha bilder lokalt"
+
+#: plugins/auth_internal/init.php:65
+msgid "Please enter your one time password:"
+msgstr "Ange ditt engångslösenord:"
+
+#: plugins/auth_internal/init.php:188
+msgid "Password has been changed."
+msgstr "Lösenord uppdaterat."
+
+#: plugins/auth_internal/init.php:190
+msgid "Old password is incorrect."
+msgstr "Felaktigt gammalt lösenord."
+
 #: js/FeedTree.js:172
 #, fuzzy
 msgid "(Un)collapse"
 msgstr "Visa/dölj sidofält"
 
-#: js/PrefFeedTree.js:52
+#: js/PrefFeedTree.js:54
 msgid "Edit category"
 msgstr "Redigera kategori"
 
-#: js/PrefFeedTree.js:59
+#: js/PrefFeedTree.js:61
 msgid "Remove category"
 msgstr "Ta bort kategori"
 
@@ -2897,63 +2823,55 @@ msgid "Create Filter"
 msgstr "Skapa filter"
 
 #: js/functions.js:1128
-msgid "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification hub again on next feed update."
-msgstr "Återställ prenumeration? Tiny Tiny RSS kommer försöka prenumerera på notifikationshubben igen vid nästa flödesuppdatering."
-
-#: js/functions.js:1139
-msgid "Subscription reset."
-msgstr "Prenumeration återställd."
-
-#: js/functions.js:1149
-#: js/tt-rss.js:695
+#: js/tt-rss.js:696
 #, perl-format
 msgid "Unsubscribe from %s?"
 msgstr "Säg upp prenumeration på %s?"
 
-#: js/functions.js:1152
+#: js/functions.js:1131
 msgid "Removing feed..."
 msgstr "Tar bort flöde..."
 
-#: js/functions.js:1225
+#: js/functions.js:1204
 msgid "Please enter category title:"
 msgstr "Ange kategorititel:"
 
-#: js/functions.js:1250
+#: js/functions.js:1229
 msgid "Generate new syndication address for this feed?"
 msgstr "Generera en ny syndikeringsadress för detta flöde?"
 
-#: js/functions.js:1254
-#: js/prefs.js:1154
+#: js/functions.js:1233
+#: js/prefs.js:1150
 msgid "Trying to change address..."
 msgstr "Försöker ändra adress..."
 
-#: js/functions.js:1497
-#: js/functions.js:1606
+#: js/functions.js:1476
+#: js/functions.js:1585
 #: js/prefs.js:398
 #: js/prefs.js:424
 #: js/prefs.js:456
 #: js/prefs.js:599
 #: js/prefs.js:617
-#: js/prefs.js:1136
-#: js/prefs.js:1263
+#: js/prefs.js:1132
+#: js/prefs.js:1259
 msgid "No feeds are selected."
 msgstr "Inget flöde valt."
 
-#: js/functions.js:1540
+#: js/functions.js:1519
 msgid "Remove selected feeds from the archive? Feeds with stored articles will not be removed."
 msgstr "Radera markerade flöden från arkivet? Flöden med sparade artiklar kommer inte raderas."
 
-#: js/functions.js:1577
+#: js/functions.js:1556
 msgid "Feeds with update errors"
 msgstr "Flöden med uppdateringsfel"
 
-#: js/functions.js:1588
-#: js/prefs.js:1117
+#: js/functions.js:1567
+#: js/prefs.js:1113
 msgid "Remove selected feeds?"
 msgstr "Ta bort markerade flöden?"
 
-#: js/functions.js:1591
-#: js/prefs.js:1120
+#: js/functions.js:1570
+#: js/prefs.js:1116
 msgid "Removing selected feeds..."
 msgstr "Tar bort valda flöden..."
 
@@ -2976,9 +2894,7 @@ msgstr "Användareditor"
 #: js/prefs.js:100
 #: js/prefs.js:209
 #: js/prefs.js:706
-#: plugins/instances/instances.js:26
-#: plugins/instances/instances.js:89
-#: js/functions.js:1408
+#: js/functions.js:1387
 msgid "Saving data..."
 msgstr "Sparar data..."
 
@@ -3003,7 +2919,7 @@ msgid "Removing selected labels..."
 msgstr "Tar bort valda etiketter..."
 
 #: js/prefs.js:308
-#: js/prefs.js:1304
+#: js/prefs.js:1300
 msgid "No labels are selected."
 msgstr "Inga etiketter valda."
 
@@ -3102,28 +3018,28 @@ msgstr "Spara ändringar för valda flöden?"
 msgid "OPML Import"
 msgstr "OPML-import"
 
-#: js/prefs.js:764
+#: js/prefs.js:759
 msgid "Please choose an OPML file first."
 msgstr "Välj en OPML-fil först."
 
-#: js/prefs.js:767
+#: js/prefs.js:762
 #: plugins/import_export/import_export.js:115
 msgid "Importing, please wait..."
 msgstr "Importerar, vänligen vänta..."
 
-#: js/prefs.js:928
+#: js/prefs.js:924
 msgid "Reset to defaults?"
 msgstr "Återställ till standardvärden?"
 
-#: js/prefs.js:1628
+#: js/prefs.js:1624
 msgid "Subscribing to feeds..."
 msgstr "Prenumererar på flöden..."
 
-#: js/prefs.js:1647
+#: js/prefs.js:1643
 msgid "Clear stored data for this plugin?"
 msgstr "Radera lagrad data för detta tillägg?"
 
-#: js/prefs.js:1661
+#: js/prefs.js:1657
 msgid "Clear all messages in the error log?"
 msgstr ""
 
@@ -3135,179 +3051,149 @@ msgstr "Flagga alla artiklar som lästa?"
 msgid "Marking all feeds as read..."
 msgstr "Markerar alla flöden som lästa..."
 
-#: js/tt-rss.js:401
+#: js/tt-rss.js:402
 msgid "Please enable mail plugin first."
 msgstr "Aktivera e-post-tillägget först."
 
-#: js/tt-rss.js:449
-#: js/functions.js:1387
-#: js/tt-rss.js:676
+#: js/tt-rss.js:450
+#: js/functions.js:1366
+#: js/tt-rss.js:677
 msgid "You can't edit this kind of feed."
 msgstr "Detta typ av flöde kan inte redigeras."
 
-#: js/tt-rss.js:530
+#: js/tt-rss.js:531
 msgid "Please enable embed_original plugin first."
 msgstr "Vänligen aktivera tillägget embed_original först."
 
-#: js/tt-rss.js:543
-#: js/tt-rss.js:726
+#: js/tt-rss.js:544
+#: js/tt-rss.js:727
 msgid "Widescreen is not available in combined mode."
 msgstr ""
 
-#: js/tt-rss.js:824
+#: js/tt-rss.js:825
 msgid "You can't rescore this kind of feed."
 msgstr "Den här typen av flöden kan inte poängsättas."
 
-#: js/tt-rss.js:829
-#: js/tt-rss.js:689
+#: js/tt-rss.js:830
+#: js/tt-rss.js:690
 msgid "Please select some feed first."
 msgstr "Välj några flöden först."
 
-#: js/tt-rss.js:834
+#: js/tt-rss.js:835
 #, perl-format
 msgid "Rescore articles in %s?"
 msgstr "Beräkna om poängen för artiklarna i %s?"
 
-#: js/tt-rss.js:837
+#: js/tt-rss.js:838
 msgid "Rescoring articles..."
 msgstr "Räknar om artikelpoäng..."
 
-#: js/viewfeed.js:919
-#: js/viewfeed.js:957
-#: js/viewfeed.js:1005
-#: js/viewfeed.js:1931
-#: plugins/mail/mail.js:7
+#: js/viewfeed.js:921
+#: js/viewfeed.js:959
+#: js/viewfeed.js:1007
+#: js/viewfeed.js:1933
 #: plugins/mailto/init.js:7
-#: js/viewfeed.js:677
-#: js/viewfeed.js:699
-#: js/viewfeed.js:720
-#: js/viewfeed.js:779
-#: js/viewfeed.js:807
+#: plugins/mail/mail.js:7
+#: js/viewfeed.js:679
+#: js/viewfeed.js:701
+#: js/viewfeed.js:722
+#: js/viewfeed.js:781
+#: js/viewfeed.js:809
 msgid "No articles are selected."
 msgstr "Inga artiklar valda."
 
-#: js/viewfeed.js:927
+#: js/viewfeed.js:929
 #, perl-format
 msgid "Delete %d selected article in %s?"
 msgid_plural "Delete %d selected articles in %s?"
 msgstr[0] "Radera %d vald artikel i %s?"
 msgstr[1] "Radera %d valda artiklar i %s?"
 
-#: js/viewfeed.js:929
+#: js/viewfeed.js:931
 #, perl-format
 msgid "Delete %d selected article?"
 msgid_plural "Delete %d selected articles?"
 msgstr[0] "Radera %d vald artikel?"
 msgstr[1] "Radera %d valda artiklar?"
 
-#: js/viewfeed.js:966
+#: js/viewfeed.js:968
 #, perl-format
 msgid "Archive %d selected article in %s?"
 msgid_plural "Archive %d selected articles in %s?"
 msgstr[0] "Arkivera %d vald artikel i %s?"
 msgstr[1] "Arkivera %d valda artiklar i %s?"
 
-#: js/viewfeed.js:969
+#: js/viewfeed.js:971
 #, perl-format
 msgid "Move %d archived article back?"
 msgid_plural "Move %d archived articles back?"
 msgstr[0] "Flytta tillbaka %d arkiverad artikel?"
 msgstr[1] "Flytta tillbaka %d arkiverade artiklar?"
 
-#: js/viewfeed.js:971
+#: js/viewfeed.js:973
 msgid "Please note that unstarred articles might get purged on next feed update."
 msgstr "Vänligen notera att icke stjärnmärkta artiklar kanske rensas vid nästa flödesuppdatering."
 
-#: js/viewfeed.js:1011
+#: js/viewfeed.js:1013
 #, perl-format
 msgid "Mark %d selected article in %s as read?"
 msgid_plural "Mark %d selected articles in %s as read?"
 msgstr[0] "Markera %d vald artikel i %s som läst?"
 msgstr[1] "Markera %d valda artiklar i %s som läst?"
 
-#: js/viewfeed.js:1031
+#: js/viewfeed.js:1033
 msgid "Edit article Tags"
 msgstr "Redigera artikeltaggar"
 
-#: js/viewfeed.js:1037
+#: js/viewfeed.js:1039
 msgid "Saving article tags..."
 msgstr "Sparar artikeltaggar..."
 
-#: js/viewfeed.js:1670
+#: js/viewfeed.js:1672
 msgid "Open original article"
 msgstr "Öppna orginalartikeln"
 
-#: js/viewfeed.js:1677
+#: js/viewfeed.js:1679
 msgid "Display article URL"
 msgstr "Visa artikel-URL"
 
-#: js/viewfeed.js:1787
+#: js/viewfeed.js:1789
 msgid "Assign label"
 msgstr "Ange etikett"
 
-#: js/viewfeed.js:1792
+#: js/viewfeed.js:1794
 msgid "Remove label"
 msgstr "Ta bort etikett"
 
-#: js/viewfeed.js:1824
+#: js/viewfeed.js:1826
 #, fuzzy
 msgid "Select articles in group"
 msgstr "Välj artikel under pekare"
 
-#: js/viewfeed.js:1834
+#: js/viewfeed.js:1836
 #, fuzzy
 msgid "Mark group as read"
 msgstr "Markera som läst"
 
-#: js/viewfeed.js:1846
+#: js/viewfeed.js:1848
 msgid "Mark feed as read"
 msgstr "Flagga kanal som läst"
 
-#: js/viewfeed.js:1899
+#: js/viewfeed.js:1901
 msgid "Please enter new score for selected articles:"
 msgstr "Ange ny poäng för markerade artiklar:"
 
-#: js/viewfeed.js:1962
+#: js/viewfeed.js:1964
 msgid "Please enter new score for this article:"
 msgstr "Ange ny poäng för denna artikel:"
 
-#: js/viewfeed.js:1993
+#: js/viewfeed.js:1995
 msgid "Article URL:"
 msgstr "URL för artikel:"
 
-#: plugins/instances/instances.js:10
-msgid "Link Instance"
-msgstr "Länka instanser"
-
-#: plugins/instances/instances.js:73
-msgid "Edit Instance"
-msgstr "Redigera instanser"
-
-#: plugins/instances/instances.js:122
-msgid "Remove selected instances?"
-msgstr "Ta bort markerade instanser?"
-
-#: plugins/instances/instances.js:125
-msgid "Removing selected instances..."
-msgstr "Tar bort markerade instanser..."
-
-#: plugins/instances/instances.js:139
-#: plugins/instances/instances.js:151
-msgid "No instances are selected."
-msgstr "Inga instanser valda."
-
-#: plugins/instances/instances.js:156
-msgid "Please select only one instance."
-msgstr "Välj enbart en instans."
-
-#: plugins/note/note.js:17
-msgid "Saving article note..."
-msgstr "Sparar artikelnotering..."
-
-#: plugins/af_psql_trgm/init.js:11
-#, fuzzy
-msgid "Related articles"
-msgstr "Radera artikel"
+#: plugins/embed_original/init.js:6
+msgid "Sorry, your browser does not support sandboxed iframes."
+msgstr "Din webbläsare stöder inte sandboxade iframes"
 
 #: plugins/import_export/import_export.js:13
 msgid "Export Data"
@@ -3328,11 +3214,16 @@ msgstr "Importera data"
 msgid "Please choose the file first."
 msgstr "Välj fil först."
 
-#: plugins/mail/mail.js:21
 #: plugins/mailto/init.js:21
+#: plugins/mail/mail.js:21
 msgid "Forward article by email"
 msgstr "Vidarebefordra artikel via e-post"
 
+#: plugins/af_psql_trgm/init.js:11
+#, fuzzy
+msgid "Related articles"
+msgstr "Radera artikel"
+
 #: plugins/mail/mail.js:36
 msgid "Error sending email:"
 msgstr ""
@@ -3342,10 +3233,6 @@ msgstr ""
 msgid "Your message has been sent."
 msgstr "Dina personliga data sparas."
 
-#: plugins/embed_original/init.js:6
-msgid "Sorry, your browser does not support sandboxed iframes."
-msgstr "Din webbläsare stöder inte sandboxade iframes"
-
 #: plugins/shorten_expanded/init.js:39
 #, fuzzy
 msgid "Click to expand article"
@@ -3380,7 +3267,7 @@ msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr "Detta tar bort alla tidigare delade artikel-URLer. Fortsätt?"
 
 #: plugins/share/share_prefs.js:6
-#: js/prefs.js:1437
+#: js/prefs.js:1433
 msgid "Clearing URLs..."
 msgstr "Rensar URLer..."
 
@@ -3388,23 +3275,44 @@ msgstr "Rensar URLer..."
 msgid "Shared URLs cleared."
 msgstr "Delade URLer rensade."
 
+#: plugins/note/note.js:17
+msgid "Saving article note..."
+msgstr "Sparar artikelnotering..."
+
 #: js/feedlist.js:429
-#: js/feedlist.js:496
 msgid "Mark all articles in %s as read?"
 msgstr "Märk alla artiklar i %s som lästa?"
 
 #: js/feedlist.js:487
-msgid "Mark all articles in %s older than 1 day as read?"
+#, fuzzy
+msgid "Mark %w in %s older than 1 day as read?"
 msgstr "Markera alla artiklar i %s äldre än 1 dag som lästa?"
 
 #: js/feedlist.js:490
-msgid "Mark all articles in %s older than 1 week as read?"
+#, fuzzy
+msgid "Mark %w in %s older than 1 week as read?"
 msgstr "Markera alla artiklar i %s äldre än 1 vecka som lästa?"
 
 #: js/feedlist.js:493
-msgid "Mark all articles in %s older than 2 weeks as read?"
+#, fuzzy
+msgid "Mark %w in %s older than 2 weeks as read?"
 msgstr "Markera alla artiklar i %s äldre än 2 veckor som lästa?"
 
+#: js/feedlist.js:496
+#, fuzzy
+msgid "Mark %w in %s as read?"
+msgstr "Märk alla artiklar i %s som lästa?"
+
+#: js/feedlist.js:499
+#, fuzzy
+msgid "search results"
+msgstr "Sökresultat: %s"
+
+#: js/feedlist.js:499
+#, fuzzy
+msgid "all articles"
+msgstr "Alla artiklar"
+
 #: js/functions.js:506
 msgid "Error explained"
 msgstr "Fel förklarat"
@@ -3485,178 +3393,247 @@ msgstr "Du prenumererar redan på detta flöde."
 msgid "Edit rule"
 msgstr "Redigera regel"
 
-#: js/functions.js:1402
+#: js/functions.js:1381
 msgid "Edit Feed"
 msgstr "Redigera flöde"
 
-#: js/functions.js:1435
+#: js/functions.js:1414
 msgid "More Feeds"
 msgstr "Fler flöden"
 
-#: js/functions.js:1631
+#: js/functions.js:1610
 msgid "Help"
 msgstr "Hjälp"
 
-#: js/prefs.js:1032
+#: js/prefs.js:1028
 msgid "Remove category %s? Any nested feeds would be placed into Uncategorized."
 msgstr "Radera kategori %s? Nästlade flöden placeras i Okategoriserat."
 
-#: js/prefs.js:1038
+#: js/prefs.js:1034
 msgid "Removing category..."
 msgstr "Tar bort kategori..."
 
-#: js/prefs.js:1056
+#: js/prefs.js:1052
 msgid "Remove selected categories?"
 msgstr "Radera markekrade kategorier?"
 
-#: js/prefs.js:1059
+#: js/prefs.js:1055
 msgid "Removing selected categories..."
 msgstr "Raderar valda kategorier..."
 
-#: js/prefs.js:1072
+#: js/prefs.js:1068
 msgid "No categories are selected."
 msgstr "Inga kategorier valda."
 
-#: js/prefs.js:1079
+#: js/prefs.js:1075
 msgid "Category title:"
 msgstr "Kategorinamn:"
 
-#: js/prefs.js:1083
+#: js/prefs.js:1079
 msgid "Creating category..."
 msgstr "Skapar kategori..."
 
-#: js/prefs.js:1106
+#: js/prefs.js:1102
 msgid "Feeds without recent updates"
 msgstr "Flöden som inte uppdaterats på länge"
 
-#: js/prefs.js:1150
+#: js/prefs.js:1146
 msgid "Replace current OPML publishing address with a new one?"
 msgstr "Byt nuvarande OPML-adress med en ny?"
 
-#: js/prefs.js:1227
+#: js/prefs.js:1223
 msgid "Clearing feed..."
 msgstr "Rensar flöde..."
 
-#: js/prefs.js:1247
+#: js/prefs.js:1243
 msgid "Rescore articles in selected feeds?"
 msgstr "Beräkna värde på artiklarna i vald flöden på nytt?"
 
-#: js/prefs.js:1250
+#: js/prefs.js:1246
 msgid "Rescoring selected feeds..."
 msgstr "Räknar om poäng för valda flöden..."
 
-#: js/prefs.js:1270
+#: js/prefs.js:1266
 msgid "Rescore all articles? This operation may take a lot of time."
 msgstr "Beräkna nya värden på alla artiklar? Detta kan ta mycket lång tid."
 
-#: js/prefs.js:1273
+#: js/prefs.js:1269
 msgid "Rescoring feeds..."
 msgstr "Räknar om flödets poäng..."
 
-#: js/prefs.js:1289
+#: js/prefs.js:1285
 msgid "Reset selected labels to default colors?"
 msgstr "Återställ valda etiketter till standardfärger?"
 
-#: js/prefs.js:1321
+#: js/prefs.js:1317
 msgid "Settings Profiles"
 msgstr "Inställningsprofiler"
 
-#: js/prefs.js:1330
+#: js/prefs.js:1326
 msgid "Remove selected profiles? Active and default profiles will not be removed."
 msgstr "Radera markerade profiler? Aktiva profiler tas inte bort."
 
-#: js/prefs.js:1333
+#: js/prefs.js:1329
 msgid "Removing selected profiles..."
 msgstr "Raderar valda profiler...."
 
-#: js/prefs.js:1349
+#: js/prefs.js:1345
 msgid "No profiles are selected."
 msgstr "Inga profiler valda."
 
-#: js/prefs.js:1357
-#: js/prefs.js:1410
+#: js/prefs.js:1353
+#: js/prefs.js:1406
 msgid "Activate selected profile?"
 msgstr "Aktivera markerad profil?"
 
-#: js/prefs.js:1374
-#: js/prefs.js:1426
+#: js/prefs.js:1370
+#: js/prefs.js:1422
 msgid "Please choose a profile to activate."
 msgstr "Välj en profil att aktivera."
 
-#: js/prefs.js:1379
+#: js/prefs.js:1375
 msgid "Creating profile..."
 msgstr "Skapar profil..."
 
-#: js/prefs.js:1434
+#: js/prefs.js:1430
 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr "Detta tar bort alla tidigare skapade flödes-URLer. Vill du fortsätta?"
 
-#: js/prefs.js:1444
+#: js/prefs.js:1440
 msgid "Generated URLs cleared."
 msgstr "Genererade URLer rensade."
 
-#: js/prefs.js:1516
+#: js/prefs.js:1512
 msgid "Label Editor"
 msgstr "Etikettseditor"
 
-#: js/tt-rss.js:684
+#: js/tt-rss.js:685
 msgid "You can't unsubscribe from the category."
 msgstr "Du kan inte säga upp prenumeration på kategorin."
 
-#: js/viewfeed.js:125
-#: js/viewfeed.js:175
-#: js/viewfeed.js:192
+#: js/viewfeed.js:127
+#: js/viewfeed.js:177
+#: js/viewfeed.js:194
 #, fuzzy
 msgid "Click to open next unread feed."
 msgstr "Klicka för att redigera flöde"
 
-#: js/viewfeed.js:129
+#: js/viewfeed.js:131
 msgid "Cancel search"
 msgstr "Avbryt sökning"
 
-#: js/viewfeed.js:189
+#: js/viewfeed.js:191
 #, fuzzy
 msgid "New articles found, reload feed to continue."
 msgstr "Hittade inga artiklar att visa."
 
-#: js/viewfeed.js:424
+#: js/viewfeed.js:426
 msgid "Unstar article"
 msgstr "Ta bort stjärnmarkering från artikeln"
 
-#: js/viewfeed.js:428
+#: js/viewfeed.js:430
 msgid "Star article"
 msgstr "Stjärnmärk artikel"
 
-#: js/viewfeed.js:478
+#: js/viewfeed.js:480
 msgid "Unpublish article"
 msgstr "Avpublicera artikeln"
 
-#: js/viewfeed.js:482
+#: js/viewfeed.js:484
 msgid "Publish article"
 msgstr "Publicera artikel"
 
-#: js/viewfeed.js:622
+#: js/viewfeed.js:624
 msgid "%d article selected"
 msgid_plural "%d articles selected"
 msgstr[0] "%d artikel vald"
 msgstr[1] "%d artiklar valda"
 
-#: js/viewfeed.js:1286
+#: js/viewfeed.js:1288
 msgid "No article is selected."
 msgstr "Ingen artikel vald."
 
-#: js/viewfeed.js:1321
+#: js/viewfeed.js:1323
 msgid "No articles found to mark"
 msgstr "Hittade inga artiklar att flagga"
 
-#: js/viewfeed.js:1323
+#: js/viewfeed.js:1325
 msgid "Mark %d article as read?"
 msgid_plural "Mark %d articles as read?"
 msgstr[0] "Markera %d artikel som läst?"
 msgstr[1] "Markera %d artiklar som lästa?"
 
-#~ msgid "Cache images locally"
-#~ msgstr "Cacha bilder lokalt"
+#~ msgid "Resubscribe to push updates"
+#~ msgstr "Återprenumerera på push-uppdateringar:"
+
+#~ msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
+#~ msgstr "Återställ PubSubHubbub-prenumerationer för push-uppdaterade feeds."
+
+#~ msgid "Download more plugins at tt-rss.org <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forums</a> or <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a>."
+#~ msgstr "Ladda ner fler tillägg via tt-rss.org <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forum</a> eller <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a>."
+
+#~ msgid "Linked"
+#~ msgstr "Länkad"
+
+#~ msgid "Instance"
+#~ msgstr "Instans"
+
+#~ msgid "Instance URL"
+#~ msgstr "Instans-URL"
+
+#~ msgid "Access key:"
+#~ msgstr "Accessnyckel:"
+
+#~ msgid "Access key"
+#~ msgstr "Accessnyckel"
+
+#~ msgid "Use one access key for both linked instances."
+#~ msgstr "Använd samma accessnyckel för bägge länkade instanserna"
+
+#~ msgid "Generate new key"
+#~ msgstr "Skapa en ny nyckel"
+
+#~ msgid "Link instance"
+#~ msgstr "Länka instanser"
+
+#~ msgid "You can connect other instances of Tiny Tiny RSS to this one to share Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
+#~ msgstr "Du kan ansluta till andra instanser av Tiny Tiny RSS för att dela populära flöde. Länka till denna instans genom att använd följande URL:"
+
+#~ msgid "Last connected"
+#~ msgstr "Senast ansluten"
+
+#~ msgid "Status"
+#~ msgstr "Status"
+
+#~ msgid "Stored feeds"
+#~ msgstr "Sparade flöden"
+
+#~ msgid "Create link"
+#~ msgstr "Skapa länk"
+
+#~ msgid "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification hub again on next feed update."
+#~ msgstr "Återställ prenumeration? Tiny Tiny RSS kommer försöka prenumerera på notifikationshubben igen vid nästa flödesuppdatering."
+
+#~ msgid "Subscription reset."
+#~ msgstr "Prenumeration återställd."
+
+#~ msgid "Link Instance"
+#~ msgstr "Länka instanser"
+
+#~ msgid "Edit Instance"
+#~ msgstr "Redigera instanser"
+
+#~ msgid "Remove selected instances?"
+#~ msgstr "Ta bort markerade instanser?"
+
+#~ msgid "Removing selected instances..."
+#~ msgstr "Tar bort markerade instanser..."
+
+#~ msgid "No instances are selected."
+#~ msgstr "Inga instanser valda."
+
+#~ msgid "Please select only one instance."
+#~ msgstr "Välj enbart en instans."
 
 #~ msgid "The error will be reported to the configured log destination."
 #~ msgstr "Felet kommer att skrivas ut i konfigurerad loggfil."
diff --git a/locale/tr_TR/LC_MESSAGES/messages.mo b/locale/tr_TR/LC_MESSAGES/messages.mo
index 409270cb5..a6cc89506 100644
--- a/locale/tr_TR/LC_MESSAGES/messages.mo
+++ b/locale/tr_TR/LC_MESSAGES/messages.mo
diff --git a/locale/tr_TR/LC_MESSAGES/messages.po b/locale/tr_TR/LC_MESSAGES/messages.po
index d0c0e3a43..ab8d47023 100644
--- a/locale/tr_TR/LC_MESSAGES/messages.po
+++ b/locale/tr_TR/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tt-rss git\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 15:25+0300\n"
+"POT-Creation-Date: 2017-07-04 16:29+0300\n"
 "PO-Revision-Date: 2013-12-08 20:20+0200\n"
 "Last-Translator: akapar <[email protected]>\n"
 "Language-Team: TURKISH <[email protected]>\n"
@@ -172,31 +172,30 @@ msgstr "Kullanıcı bulunamadı"
 #: prefs.php:118
 #: classes/backend.php:5
 #: classes/pref/labels.php:282
-#: classes/pref/feeds.php:1402
-#: classes/pref/filters.php:779
+#: classes/pref/filters.php:819
+#: classes/pref/feeds.php:1376
 #: js/feedlist.js:149
-#: js/functions.js:1131
-#: js/functions.js:1231
-#: js/functions.js:1478
+#: js/functions.js:1210
+#: js/functions.js:1457
 #: js/prefs.js:621
-#: js/prefs.js:818
-#: js/prefs.js:1648
-#: js/prefs.js:1663
-#: js/tt-rss.js:550
-#: js/viewfeed.js:1182
+#: js/prefs.js:813
+#: js/prefs.js:1644
+#: js/prefs.js:1659
+#: js/tt-rss.js:551
+#: js/viewfeed.js:1184
 #: plugins/import_export/import_export.js:17
 #: js/feedlist.js:467
-#: js/feedlist.js:512
+#: js/feedlist.js:515
 #: js/functions.js:372
 #: js/functions.js:630
-#: js/prefs.js:1360
-#: js/prefs.js:1413
-#: js/prefs.js:1452
-#: js/prefs.js:1465
-#: js/prefs.js:1476
-#: js/prefs.js:1491
-#: js/tt-rss.js:567
-#: js/viewfeed.js:762
+#: js/prefs.js:1356
+#: js/prefs.js:1409
+#: js/prefs.js:1448
+#: js/prefs.js:1461
+#: js/prefs.js:1472
+#: js/prefs.js:1487
+#: js/tt-rss.js:568
+#: js/viewfeed.js:764
 msgid "Loading, please wait..."
 msgstr "Yükleniyor, lütfen bekleyin..."
 
@@ -213,13 +212,13 @@ msgid "All Articles"
 msgstr "Tüm yazılar"
 
 #: index.php:192
-#: include/functions2.php:107
+#: include/functions.php:1181
 #: classes/feeds.php:110
 msgid "Starred"
 msgstr "Favoriler"
 
 #: index.php:193
-#: include/functions2.php:108
+#: include/functions.php:1182
 #: classes/feeds.php:111
 msgid "Published"
 msgstr "Yayınladıklarım"
@@ -260,7 +259,7 @@ msgstr "Başlık"
 
 #: index.php:209
 #: index.php:249
-#: include/functions2.php:95
+#: include/functions.php:1169
 #: classes/feeds.php:115
 #: js/FeedTree.js:138
 #: js/FeedTree.js:166
@@ -300,7 +299,7 @@ msgid "Feed actions:"
 msgstr "Özet akışı ile ilgili..."
 
 #: index.php:244
-#: classes/handler/public.php:672
+#: classes/handler/public.php:583
 msgid "Subscribe to feed..."
 msgstr "Özet akışına üye ol"
 
@@ -314,8 +313,8 @@ msgstr "Özet akışını yeniden değerlendir..."
 
 #: index.php:247
 #: classes/pref/feeds.php:785
-#: classes/pref/feeds.php:1357
-#: js/PrefFeedTree.js:78
+#: classes/pref/feeds.php:1331
+#: js/PrefFeedTree.js:80
 msgid "Unsubscribe"
 msgstr "Üyelikten çık"
 
@@ -332,7 +331,7 @@ msgid "Other actions:"
 msgstr "Diğerleri:"
 
 #: index.php:252
-#: include/functions2.php:81
+#: include/functions.php:1155
 msgid "Toggle widescreen mode"
 msgstr "Tam ekran görüntüle"
 
@@ -358,7 +357,7 @@ msgstr ""
 
 #: prefs.php:33
 #: prefs.php:136
-#: include/functions2.php:110
+#: include/functions.php:1184
 #: classes/pref/prefs.php:435
 msgid "Preferences"
 msgstr "Tercihler"
@@ -373,20 +372,19 @@ msgstr "Tercihleri kapat"
 
 #: prefs.php:139
 #: classes/pref/feeds.php:112
-#: classes/pref/feeds.php:1297
-#: classes/pref/feeds.php:1346
+#: classes/pref/feeds.php:1271
+#: classes/pref/feeds.php:1320
 msgid "Feeds"
 msgstr "Özet akışları"
 
 #: prefs.php:142
-#: classes/pref/filters.php:248
+#: classes/pref/filters.php:273
 msgid "Filters"
 msgstr "Filtreler"
 
 #: prefs.php:145
-#: include/functions.php:1327
-#: include/functions.php:1979
 #: classes/pref/labels.php:90
+#: classes/feeds.php:1718
 msgid "Labels"
 msgstr "Arama başlıkları"
 
@@ -415,13 +413,13 @@ msgstr "Yeni kullanıcı kayıtları durdurulmuştur."
 #: register.php:337
 #: register.php:347
 #: register.php:359
-#: classes/handler/public.php:742
-#: classes/handler/public.php:813
-#: classes/handler/public.php:911
-#: classes/handler/public.php:990
-#: classes/handler/public.php:1004
-#: classes/handler/public.php:1011
-#: classes/handler/public.php:1036
+#: classes/handler/public.php:653
+#: classes/handler/public.php:724
+#: classes/handler/public.php:822
+#: classes/handler/public.php:901
+#: classes/handler/public.php:915
+#: classes/handler/public.php:922
+#: classes/handler/public.php:947
 msgid "Return to Tiny Tiny RSS"
 msgstr "Tiny Tiny RSS'e geri dön"
 
@@ -438,12 +436,12 @@ msgid "Check availability"
 msgstr "Kullanılırlığını kontrol et"
 
 #: register.php:229
-#: classes/handler/public.php:829
+#: classes/handler/public.php:740
 msgid "Email:"
 msgstr "E-posta:"
 
 #: register.php:232
-#: classes/handler/public.php:834
+#: classes/handler/public.php:745
 msgid "How much is two plus two:"
 msgstr "İki kere iki kaç eder:"
 
@@ -471,17 +469,23 @@ msgstr "Hesap yaratıldı."
 msgid "New user registrations are currently closed."
 msgstr "Yeni kullanıcı kayıtları şu an için kapalıdır."
 
-#: update.php:67
+#: update.php:66
 msgid "Tiny Tiny RSS data update script."
 msgstr "Tiny Tiny RSS veri yenileme komut dosyası."
 
-#: include/digest.php:109
-#: include/functions.php:1336
-#: include/functions.php:1880
-#: include/functions.php:1965
-#: include/functions.php:1987
-#: classes/opml.php:421
+#: include/controls.php:83
+#: classes/pref/filters.php:242
+#: classes/pref/filters.php:253
+#: classes/pref/filters.php:544
+msgid "All feeds"
+msgstr "Tüm özet akışları"
+
+#: include/controls.php:134
+#: include/controls.php:316
 #: classes/pref/feeds.php:228
+#: classes/opml.php:486
+#: classes/feeds.php:1727
+#: classes/digest.php:113
 msgid "Uncategorized"
 msgstr "Kategorilenmemiş"
 
@@ -496,391 +500,287 @@ msgstr[1] "%d arşivlenmiş yazılar"
 msgid "No feeds found."
 msgstr "Özet akışı bulunamadı."
 
-#: include/functions.php:1029
+#: include/functions.php:900
 #, php-format
 msgid "%d min"
 msgstr ""
 
-#: include/functions.php:1325
-#: include/functions.php:1977
-msgid "Special"
-msgstr "Özet"
-
-#: include/functions.php:1828
-#: classes/pref/filters.php:229
-#: classes/pref/filters.php:507
-msgid "All feeds"
-msgstr "Tüm özet akışları"
-
-#: include/functions.php:2032
-msgid "Starred articles"
-msgstr "Favori yazılar"
-
-#: include/functions.php:2034
-msgid "Published articles"
-msgstr "Yayınlanmış yazılar"
-
-#: include/functions.php:2036
-msgid "Fresh articles"
-msgstr "Tazeler"
-
-#: include/functions.php:2038
-#: include/functions2.php:105
-msgid "All articles"
-msgstr "Tüm yazılar"
-
-#: include/functions.php:2040
-msgid "Archived articles"
-msgstr "Arşivlenmiş yazılar"
-
-#: include/functions.php:2042
-msgid "Recently read"
-msgstr "Yakın zamanda okunanlar"
-
-#: include/functions2.php:57
+#: include/functions.php:1131
 msgid "Navigation"
 msgstr "Dolaşma"
 
-#: include/functions2.php:58
+#: include/functions.php:1132
 msgid "Open next feed"
 msgstr "Sonraki özet akışına geç"
 
-#: include/functions2.php:59
+#: include/functions.php:1133
 msgid "Open previous feed"
 msgstr "Önceki özet akışına geç"
 
-#: include/functions2.php:60
+#: include/functions.php:1134
 msgid "Open next article"
 msgstr "Sonraki yazıya geç"
 
-#: include/functions2.php:61
+#: include/functions.php:1135
 msgid "Open previous article"
 msgstr "Önceki yazıya geç"
 
-#: include/functions2.php:62
+#: include/functions.php:1136
 msgid "Open next article (don't scroll long articles)"
 msgstr "Sonraki yazıya geç (uzun yazıları kısa geç)"
 
-#: include/functions2.php:63
+#: include/functions.php:1137
 msgid "Open previous article (don't scroll long articles)"
 msgstr "Önceki yazıya geç (uzun yazıları kısa geç)"
 
-#: include/functions2.php:64
+#: include/functions.php:1138
 msgid "Move to next article (don't expand or mark read)"
 msgstr "Sonraki yazıya geç (okundu olarak işaretleme ve yazıyı indirme)"
 
-#: include/functions2.php:65
+#: include/functions.php:1139
 msgid "Move to previous article (don't expand or mark read)"
 msgstr "Önceki yazıya geç (okundu olarak işaretleme ve yazıyı indirme)"
 
-#: include/functions2.php:66
+#: include/functions.php:1140
 msgid "Show search dialog"
 msgstr "Arama geçmişini göster"
 
-#: include/functions2.php:67
+#: include/functions.php:1141
 msgid "Article"
 msgstr "Yazı"
 
-#: include/functions2.php:68
-#: js/viewfeed.js:1699
+#: include/functions.php:1142
+#: js/viewfeed.js:1701
 msgid "Toggle starred"
 msgstr "Favorileri değişir"
 
-#: include/functions2.php:69
-#: js/viewfeed.js:1711
+#: include/functions.php:1143
+#: js/viewfeed.js:1713
 msgid "Toggle published"
 msgstr "Yayınlanmışları değiştir"
 
-#: include/functions2.php:70
-#: js/viewfeed.js:1686
+#: include/functions.php:1144
+#: js/viewfeed.js:1688
 msgid "Toggle unread"
 msgstr "Okunmamışları değiştir"
 
-#: include/functions2.php:71
+#: include/functions.php:1145
 msgid "Edit tags"
 msgstr "Etiketleri değiştir"
 
-#: include/functions2.php:72
+#: include/functions.php:1146
 msgid "Open in new window"
 msgstr "Yeni bir pencerede aç"
 
-#: include/functions2.php:73
-#: js/viewfeed.js:1732
+#: include/functions.php:1147
+#: js/viewfeed.js:1734
 msgid "Mark below as read"
 msgstr "Aşağıdakini okundu işaretle"
 
-#: include/functions2.php:74
-#: js/viewfeed.js:1725
+#: include/functions.php:1148
+#: js/viewfeed.js:1727
 msgid "Mark above as read"
 msgstr "Yukarıdakini okundu işaretle"
 
-#: include/functions2.php:75
+#: include/functions.php:1149
 msgid "Scroll down"
 msgstr "Aşağı git"
 
-#: include/functions2.php:76
+#: include/functions.php:1150
 msgid "Scroll up"
 msgstr "Yukarı git"
 
-#: include/functions2.php:77
+#: include/functions.php:1151
 msgid "Select article under cursor"
 msgstr "İmleç altındaki yazıyı seç"
 
-#: include/functions2.php:78
+#: include/functions.php:1152
 msgid "Email article"
 msgstr "Yazıyı e-posta ile yolla"
 
-#: include/functions2.php:79
+#: include/functions.php:1153
 msgid "Close/collapse article"
 msgstr "Yazıyı kapat"
 
-#: include/functions2.php:80
+#: include/functions.php:1154
 msgid "Toggle article expansion (combined mode)"
 msgstr "Yazı büyütmeyi değiştir (birleşik mod)"
 
-#: include/functions2.php:82
+#: include/functions.php:1156
 #: plugins/embed_original/init.php:31
 msgid "Toggle embed original"
 msgstr "Aslını içte göstermeyi değiştir"
 
-#: include/functions2.php:83
+#: include/functions.php:1157
 msgid "Article selection"
 msgstr "Yazı seçimi"
 
-#: include/functions2.php:84
+#: include/functions.php:1158
 msgid "Select all articles"
 msgstr "Tüm yazıları seç"
 
-#: include/functions2.php:85
+#: include/functions.php:1159
 msgid "Select unread"
 msgstr "Okunmamışları seç"
 
-#: include/functions2.php:86
+#: include/functions.php:1160
 msgid "Select starred"
 msgstr "Favorileri seç"
 
-#: include/functions2.php:87
+#: include/functions.php:1161
 msgid "Select published"
 msgstr "Yayınlanmışları seç"
 
-#: include/functions2.php:88
+#: include/functions.php:1162
 msgid "Invert selection"
 msgstr "Seçimi evir"
 
-#: include/functions2.php:89
+#: include/functions.php:1163
 msgid "Deselect everything"
 msgstr "Hiçbirini seçme"
 
-#: include/functions2.php:90
+#: include/functions.php:1164
 #: classes/pref/feeds.php:555
-#: classes/pref/feeds.php:823
+#: classes/pref/feeds.php:811
 msgid "Feed"
 msgstr "Özet akışı"
 
-#: include/functions2.php:91
+#: include/functions.php:1165
 msgid "Refresh current feed"
 msgstr "Özet akışını tazele"
 
-#: include/functions2.php:92
+#: include/functions.php:1166
 msgid "Un/hide read feeds"
 msgstr "Okunmuş özet akışlarını gizle(me)"
 
-#: include/functions2.php:93
-#: classes/pref/feeds.php:1349
+#: include/functions.php:1167
+#: classes/pref/feeds.php:1323
 msgid "Subscribe to feed"
 msgstr "Özet akışına abone ol"
 
-#: include/functions2.php:94
+#: include/functions.php:1168
 #: js/FeedTree.js:145
-#: js/PrefFeedTree.js:72
-#: js/viewfeed.js:1853
+#: js/PrefFeedTree.js:74
+#: js/viewfeed.js:1855
 msgid "Edit feed"
 msgstr "Veri akışı aboneliğini düzenle"
 
-#: include/functions2.php:96
+#: include/functions.php:1170
 msgid "Reverse headlines"
 msgstr "Yazı başlıklarını ters diz"
 
-#: include/functions2.php:97
+#: include/functions.php:1171
 msgid "Toggle headline grouping"
 msgstr ""
 
-#: include/functions2.php:98
+#: include/functions.php:1172
 msgid "Debug feed update"
 msgstr "Özet akışı yenilemesinde hata ayıkla"
 
-#: include/functions2.php:99
+#: include/functions.php:1173
 #, fuzzy
 msgid "Debug viewfeed()"
 msgstr "Özet akışı yenilemesinde hata ayıkla"
 
-#: include/functions2.php:100
+#: include/functions.php:1174
 #: js/FeedTree.js:194
 msgid "Mark all feeds as read"
 msgstr "Tüm özet akışlarını okundu işaretle"
 
-#: include/functions2.php:101
+#: include/functions.php:1175
 msgid "Un/collapse current category"
 msgstr "Bu kategoriyi aç/kapa"
 
-#: include/functions2.php:102
+#: include/functions.php:1176
 msgid "Toggle combined mode"
 msgstr "Birleşik modu değiştir"
 
-#: include/functions2.php:103
+#: include/functions.php:1177
 msgid "Toggle auto expand in combined mode"
 msgstr "Birleşik modda otomatik genişlemeyi değiştir"
 
-#: include/functions2.php:104
+#: include/functions.php:1178
 msgid "Go to"
 msgstr "Git"
 
-#: include/functions2.php:106
+#: include/functions.php:1179
+#: classes/feeds.php:1602
+msgid "All articles"
+msgstr "Tüm yazılar"
+
+#: include/functions.php:1180
 msgid "Fresh"
 msgstr "Taze"
 
-#: include/functions2.php:109
-#: js/tt-rss.js:494
-#: js/tt-rss.js:663
+#: include/functions.php:1183
+#: js/tt-rss.js:495
+#: js/tt-rss.js:664
 msgid "Tag cloud"
 msgstr "Etiket öbeği"
 
-#: include/functions2.php:111
+#: include/functions.php:1185
 msgid "Other"
 msgstr "Diğer"
 
-#: include/functions2.php:112
+#: include/functions.php:1186
 #: classes/pref/labels.php:267
 msgid "Create label"
 msgstr "Arama başlığı tanımla"
 
-#: include/functions2.php:113
-#: classes/pref/filters.php:753
+#: include/functions.php:1187
+#: classes/pref/filters.php:793
 msgid "Create filter"
 msgstr "Filtre tanımla"
 
-#: include/functions2.php:114
+#: include/functions.php:1188
 msgid "Un/collapse sidebar"
 msgstr "Kenar çubuğunu aç/kapa"
 
-#: include/functions2.php:115
+#: include/functions.php:1189
 msgid "Show help dialog"
 msgstr "Yardım diyaloğunu göster"
 
-#: include/functions2.php:670
-#, php-format
-msgid "Search results: %s"
-msgstr "Arama sonuçları: %s"
-
-#: include/functions2.php:1336
-#: classes/feeds.php:752
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] "yorum"
-msgstr[1] "yorumlar"
-
-#: include/functions2.php:1340
-#: classes/feeds.php:756
-msgid "comments"
-msgstr "Yorumlar"
-
-#: include/functions2.php:1366
-msgid " - "
-msgstr "-"
-
-#: include/functions2.php:1397
-#: include/functions2.php:1648
-#: classes/article.php:311
-msgid "no tags"
-msgstr "Etiketi yok"
-
-#: include/functions2.php:1407
-#: classes/feeds.php:738
-msgid "Edit tags for this article"
-msgstr "Bu yazı için etiketler tanımla"
-
-#: include/functions2.php:1439
-#: classes/feeds.php:690
-msgid "Originally from:"
-msgstr "Asıl kaynağı:"
-
-#: include/functions2.php:1452
-#: classes/pref/feeds.php:574
-#: classes/feeds.php:703
-msgid "Feed URL"
-msgstr "Özet akışı internet adresi"
-
-#: include/functions2.php:1489
-#: classes/backend.php:105
-#: classes/dlg.php:37
-#: classes/dlg.php:60
-#: classes/dlg.php:93
-#: classes/dlg.php:159
-#: classes/dlg.php:186
-#: classes/pref/feeds.php:1652
-#: classes/pref/feeds.php:1718
-#: classes/pref/filters.php:204
-#: classes/pref/prefs.php:1097
-#: plugins/af_psql_trgm/init.php:102
-#: plugins/import_export/init.php:415
-#: plugins/import_export/init.php:461
-#: plugins/share/init.php:121
-msgid "Close this window"
-msgstr "Bu pencereyi kapa"
-
-#: include/functions2.php:1686
-msgid "(edit note)"
-msgstr "(notu değiştir)"
-
-#: include/functions2.php:1960
-msgid "unknown type"
-msgstr "bilinmeyen tür"
-
-#: include/functions2.php:2037
-msgid "Attachments"
-msgstr "Ekler"
-
-#: include/functions2.php:2496
+#: include/functions.php:2456
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: include/functions2.php:2497
+#: include/functions.php:2457
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: include/functions2.php:2498
+#: include/functions.php:2458
 msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
 msgstr ""
 
-#: include/functions2.php:2499
+#: include/functions.php:2459
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: include/functions2.php:2500
+#: include/functions.php:2460
 #, fuzzy
 msgid "No file was uploaded"
 msgstr "Dosya yüklenemedi."
 
-#: include/functions2.php:2501
+#: include/functions.php:2461
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: include/functions2.php:2502
+#: include/functions.php:2462
 msgid "Failed to write file to disk."
 msgstr ""
 
-#: include/functions2.php:2503
+#: include/functions.php:2463
 msgid "A PHP extension stopped the file upload."
 msgstr ""
 
 #: include/login_form.php:197
-#: classes/handler/public.php:569
-#: classes/handler/public.php:824
+#: classes/handler/public.php:480
+#: classes/handler/public.php:735
 msgid "Login:"
 msgstr "Oturum aç:"
 
 #: include/login_form.php:207
-#: classes/handler/public.php:572
+#: classes/handler/public.php:483
 msgid "Password:"
 msgstr "Şifre:"
 
@@ -893,7 +793,7 @@ msgid "Profile:"
 msgstr "Profil:"
 
 #: include/login_form.php:223
-#: classes/handler/public.php:311
+#: classes/handler/public.php:287
 #: classes/pref/prefs.php:1035
 #: classes/rpc.php:63
 msgid "Default profile"
@@ -912,7 +812,7 @@ msgid "Remember me"
 msgstr "Beni hatırla"
 
 #: include/login_form.php:249
-#: classes/handler/public.php:577
+#: classes/handler/public.php:488
 msgid "Log in"
 msgstr "Oturum aç"
 
@@ -928,145 +828,44 @@ msgstr "Oturum doğrulanamadı (kullanıcı adı bulunamadı)"
 msgid "Session failed to validate (password changed)"
 msgstr "Oturum doğrulanamadı (şifre değiştirildi)"
 
-#: classes/article.php:25
-msgid "Article not found."
-msgstr "Yazı bulunamadı."
-
-#: classes/article.php:197
-msgid "Tags for this article (separated by commas):"
-msgstr "Bu yazı için etiketler (virgülle ayrılmış):"
-
-#: classes/article.php:222
-#: classes/pref/labels.php:79
-#: classes/pref/users.php:98
-#: classes/pref/feeds.php:801
-#: classes/pref/feeds.php:943
-#: classes/pref/filters.php:485
-#: classes/pref/prefs.php:981
-#: plugins/instances/init.php:245
-#: plugins/nsfw/init.php:85
-#: plugins/note/init.php:51
-#: plugins/af_readability/init.php:68
-#: plugins/af_redditimgur/init.php:60
-#: plugins/af_psql_trgm/init.php:181
-#: plugins/mail/init.php:64
-#: plugins/af_zz_imgproxy/init.php:213
-msgid "Save"
-msgstr "Kaydet"
-
-#: classes/article.php:224
-#: classes/handler/public.php:546
-#: classes/handler/public.php:580
-#: classes/pref/labels.php:81
-#: classes/pref/users.php:100
-#: classes/pref/feeds.php:802
-#: classes/pref/feeds.php:946
-#: classes/pref/feeds.php:1859
-#: classes/pref/filters.php:488
-#: classes/pref/filters.php:902
-#: classes/pref/filters.php:983
-#: classes/pref/filters.php:1076
-#: classes/pref/prefs.php:983
-#: classes/feeds.php:1105
-#: classes/feeds.php:1155
-#: classes/feeds.php:1192
-#: plugins/instances/init.php:248
-#: plugins/instances/init.php:436
-#: plugins/note/init.php:53
-#: plugins/mail/init.php:173
-msgid "Cancel"
-msgstr "İptal"
-
-#: classes/opml.php:28
-#: classes/opml.php:33
-msgid "OPML Utility"
-msgstr "OPML Utility"
-
-#: classes/opml.php:37
-msgid "Importing OPML..."
-msgstr "OPML içe aktarılıyor..."
-
-#: classes/opml.php:41
-msgid "Return to preferences"
-msgstr "Tercihlere geri dön"
-
-#: classes/opml.php:271
-#, php-format
-msgid "Adding feed: %s"
-msgstr "Özet akışı ekleniyor: %s"
-
-#: classes/opml.php:282
-#, php-format
-msgid "Duplicate feed: %s"
-msgstr "Zaten var olan özet akışı: %s"
-
-#: classes/opml.php:296
-#, php-format
-msgid "Adding label %s"
-msgstr "Arama başlığı ekleniyor %s"
-
-#: classes/opml.php:299
-#, php-format
-msgid "Duplicate label: %s"
-msgstr "Aynı arama başlığı mevcut: %s"
-
-#: classes/opml.php:311
-#, php-format
-msgid "Setting preference key %s to %s"
-msgstr "Tercih anahtarı %s %s'e ayarlanıyor"
-
-#: classes/opml.php:343
-msgid "Adding filter..."
-msgstr "Filtre ekleniyor..."
-
-#: classes/opml.php:421
-#, php-format
-msgid "Processing category: %s"
-msgstr "Kategori işleniyor: %s"
-
-#: classes/opml.php:470
-#, php-format
-msgid "Upload failed with error code %d"
-msgstr "Yükleme başarısız oldu hata kodu %d"
-
-#: classes/opml.php:484
-#: plugins/import_export/init.php:442
-msgid "Unable to move uploaded file."
-msgstr "Yüklenen dosya taşınamadı."
-
-#: classes/opml.php:488
-#: plugins/import_export/init.php:446
-msgid "Error: please upload OPML file."
-msgstr "Hata: lütfen OPML dosyasını yükleyin."
-
-#: classes/opml.php:499
-msgid "Error: unable to find moved OPML file."
-msgstr "Hata: Taşınan OPML dosyası bulunamıyor."
-
-#: classes/opml.php:506
-msgid "Error while parsing document."
-msgstr "Belge çözümlenirken hata oluştu."
-
-#: classes/backend.php:33
+#: classes/backend.php:31
 msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
 msgstr "Diğer arayüz ipuçları Tiny Tiny RSS Wiki'de mevcut."
 
-#: classes/backend.php:38
+#: classes/backend.php:36
 msgid "Keyboard Shortcuts"
 msgstr "Klavye kısayolları"
 
-#: classes/backend.php:61
+#: classes/backend.php:59
 msgid "Shift"
 msgstr "Shift"
 
-#: classes/backend.php:64
+#: classes/backend.php:62
 msgid "Ctrl"
 msgstr "Ctrl"
 
-#: classes/backend.php:99
+#: classes/backend.php:97
 msgid "Help topic not found."
 msgstr "Yardım konusu bulunamadı."
 
+#: classes/backend.php:103
+#: classes/dlg.php:37
+#: classes/dlg.php:60
+#: classes/dlg.php:93
+#: classes/dlg.php:159
+#: classes/dlg.php:186
+#: classes/article.php:744
+#: classes/pref/filters.php:206
+#: classes/pref/prefs.php:1097
+#: classes/pref/feeds.php:1626
+#: classes/pref/feeds.php:1692
+#: plugins/import_export/init.php:421
+#: plugins/import_export/init.php:467
+#: plugins/af_psql_trgm/init.php:102
+#: plugins/share/init.php:120
+msgid "Close this window"
+msgstr "Bu pencereyi kapa"
+
 #: classes/dlg.php:17
 msgid "If you have imported labels and/or filters, you might need to reload preferences to see your new data."
 msgstr "Eğer arama başlıkları veya filtreler içe aktardıysanız bunları görmek için Tercihler ekranını yenilemeniz gerekir."
@@ -1077,7 +876,7 @@ msgstr "Herkese açık OPML internet adresiniz:"
 
 #: classes/dlg.php:57
 #: classes/dlg.php:183
-#: plugins/share/init.php:118
+#: plugins/share/init.php:117
 msgid "Generate new URL"
 msgstr "Yeni internet adresi oluştur"
 
@@ -1098,130 +897,224 @@ msgstr "Yenileme geri plan yordamı çok uzun süredir çalışıyor. Bir proble
 msgid "You can view this feed as RSS using the following URL:"
 msgstr "Bu özet akışını RSS olarak şu adresten görüntüleyebilirsiniz:"
 
-#: classes/handler/public.php:510
+#: classes/article.php:25
+msgid "Article not found."
+msgstr "Yazı bulunamadı."
+
+#: classes/article.php:197
+msgid "Tags for this article (separated by commas):"
+msgstr "Bu yazı için etiketler (virgülle ayrılmış):"
+
+#: classes/article.php:222
+#: classes/pref/labels.php:79
+#: classes/pref/filters.php:519
+#: classes/pref/users.php:98
+#: classes/pref/prefs.php:981
+#: classes/pref/feeds.php:789
+#: classes/pref/feeds.php:931
+#: plugins/af_psql_trgm/init.php:181
+#: plugins/nsfw/init.php:85
+#: plugins/af_readability/init.php:68
+#: plugins/mail/init.php:64
+#: plugins/af_redditimgur/init.php:60
+#: plugins/note/init.php:51
+#: plugins/af_zz_imgproxy/init.php:240
+msgid "Save"
+msgstr "Kaydet"
+
+#: classes/article.php:224
+#: classes/handler/public.php:457
+#: classes/handler/public.php:491
+#: classes/pref/labels.php:81
+#: classes/pref/filters.php:522
+#: classes/pref/filters.php:942
+#: classes/pref/filters.php:1022
+#: classes/pref/filters.php:1115
+#: classes/pref/users.php:100
+#: classes/pref/prefs.php:983
+#: classes/pref/feeds.php:790
+#: classes/pref/feeds.php:934
+#: classes/pref/feeds.php:1833
+#: classes/feeds.php:1098
+#: classes/feeds.php:1148
+#: classes/feeds.php:1185
+#: plugins/mail/init.php:173
+#: plugins/note/init.php:53
+msgid "Cancel"
+msgstr "İptal"
+
+#: classes/article.php:311
+#: classes/article.php:652
+#: classes/article.php:805
+msgid "no tags"
+msgstr "Etiketi yok"
+
+#: classes/article.php:419
+msgid "unknown type"
+msgstr "bilinmeyen tür"
+
+#: classes/article.php:496
+msgid "Attachments"
+msgstr "Ekler"
+
+#: classes/article.php:591
+#: classes/feeds.php:741
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] "yorum"
+msgstr[1] "yorumlar"
+
+#: classes/article.php:595
+#: classes/feeds.php:745
+msgid "comments"
+msgstr "Yorumlar"
+
+#: classes/article.php:621
+msgid " - "
+msgstr "-"
+
+#: classes/article.php:662
+#: classes/feeds.php:727
+msgid "Edit tags for this article"
+msgstr "Bu yazı için etiketler tanımla"
+
+#: classes/article.php:694
+#: classes/feeds.php:681
+msgid "Originally from:"
+msgstr "Asıl kaynağı:"
+
+#: classes/article.php:707
+#: classes/pref/feeds.php:574
+#: classes/feeds.php:694
+msgid "Feed URL"
+msgstr "Özet akışı internet adresi"
+
+#: classes/article.php:843
+msgid "(edit note)"
+msgstr "(notu değiştir)"
+
+#: classes/handler/public.php:421
 #: plugins/bookmarklets/init.php:40
 msgid "Share with Tiny Tiny RSS"
 msgstr "Tiny Tiny RSS ile paylaş"
 
-#: classes/handler/public.php:518
+#: classes/handler/public.php:429
 msgid "Title:"
 msgstr "Başlık:"
 
-#: classes/handler/public.php:520
+#: classes/handler/public.php:431
 #: classes/pref/feeds.php:572
-#: plugins/instances/init.php:212
-#: plugins/instances/init.php:401
 msgid "URL:"
 msgstr "Internet adresi:"
 
-#: classes/handler/public.php:522
+#: classes/handler/public.php:433
 msgid "Content:"
 msgstr "İçerik:"
 
-#: classes/handler/public.php:524
+#: classes/handler/public.php:435
 msgid "Labels:"
 msgstr "Arama başlıkları:"
 
-#: classes/handler/public.php:543
+#: classes/handler/public.php:454
 msgid "Shared article will appear in the Published feed."
 msgstr "Paylaşılan yazı Yayınlananlar'da gözükecek"
 
-#: classes/handler/public.php:545
+#: classes/handler/public.php:456
 msgid "Share"
 msgstr "Paylaş"
 
-#: classes/handler/public.php:567
+#: classes/handler/public.php:478
 msgid "Not logged in"
 msgstr "Giriş yapılmamış"
 
-#: classes/handler/public.php:626
+#: classes/handler/public.php:537
 msgid "Incorrect username or password"
 msgstr "Geçersiz kullanıcı adı ya da şifresi"
 
-#: classes/handler/public.php:678
+#: classes/handler/public.php:589
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "<b>%s</b>'e zaten abonesiniz."
 
-#: classes/handler/public.php:681
+#: classes/handler/public.php:592
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "<b>%s</b>'e abone oldunuz."
 
-#: classes/handler/public.php:684
+#: classes/handler/public.php:595
 #, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "<b>%s</b>'e abone olunamadı."
 
-#: classes/handler/public.php:687
+#: classes/handler/public.php:598
 #, php-format
 msgid "No feeds found in <b>%s</b>."
 msgstr "<b>%s</b>'de özet akışı bulunamadı."
 
-#: classes/handler/public.php:690
+#: classes/handler/public.php:601
 msgid "Multiple feed URLs found."
 msgstr "Birçok özet akışı internet adresi bulundu."
 
-#: classes/handler/public.php:694
+#: classes/handler/public.php:605
 #, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr "<b>%s</b>' abone olunamadı. <br>Özet akışı indirilemiyor."
 
-#: classes/handler/public.php:712
+#: classes/handler/public.php:623
 msgid "Subscribe to selected feed"
 msgstr "Seçilen özet akışlarına abone ol"
 
-#: classes/handler/public.php:737
+#: classes/handler/public.php:648
 msgid "Edit subscription options"
 msgstr "Abonelik tercihlerini düzenle"
 
-#: classes/handler/public.php:774
+#: classes/handler/public.php:685
 msgid "Password recovery"
 msgstr "Şifre bulma"
 
-#: classes/handler/public.php:817
+#: classes/handler/public.php:728
 #, fuzzy
 msgid "You will need to provide valid account name and email. A password reset link will be sent to your email address."
 msgstr "Geçerli bir kullanıcı adı ve e-posta adresi vermeniz gerekiyor. Yeni şifre e-posta adresinize yollanacak."
 
-#: classes/handler/public.php:839
-#: classes/pref/users.php:350
+#: classes/handler/public.php:750
+#: classes/pref/users.php:349
 msgid "Reset password"
 msgstr "Şifremi yenile"
 
-#: classes/handler/public.php:849
+#: classes/handler/public.php:760
 msgid "Some of the required form parameters are missing or incorrect."
 msgstr "Bazı gerekli form parametreleri eksik ya da yanlış."
 
-#: classes/handler/public.php:853
-#: classes/handler/public.php:919
+#: classes/handler/public.php:764
+#: classes/handler/public.php:830
 msgid "Go back"
 msgstr "Geri git"
 
-#: classes/handler/public.php:890
+#: classes/handler/public.php:801
 #, fuzzy
 msgid "[tt-rss] Password reset request"
 msgstr "[tt-rss] Şifre değiştirme hatırlatması"
 
-#: classes/handler/public.php:915
+#: classes/handler/public.php:826
 msgid "Sorry, login and email combination not found."
 msgstr "Üzgünüz, kullanıcı adı ve e-posta kombinasyonu bulunamadı."
 
-#: classes/handler/public.php:937
+#: classes/handler/public.php:848
 msgid "Your access level is insufficient to run this script."
 msgstr "Bu kodu çalıştırmak için yeterli yetkiniz yok."
 
-#: classes/handler/public.php:963
+#: classes/handler/public.php:874
 msgid "Database Updater"
 msgstr "Veritabanı Yenileyicisi"
 
-#: classes/handler/public.php:1028
+#: classes/handler/public.php:939
 msgid "Perform updates"
 msgstr "Yenilemeleri yap"
 
 #: classes/pref/labels.php:22
-#: classes/pref/filters.php:348
-#: classes/pref/filters.php:823
+#: classes/pref/filters.php:373
+#: classes/pref/filters.php:863
 msgid "Caption"
 msgstr "Altyazı"
 
@@ -1243,59 +1136,55 @@ msgid "Created label <b>%s</b>"
 msgstr "Arama başlığı tanımlandı <b>%s</b>"
 
 #: classes/pref/labels.php:258
-#: classes/pref/users.php:334
-#: classes/pref/feeds.php:1337
-#: classes/pref/feeds.php:1600
-#: classes/pref/feeds.php:1664
-#: classes/pref/filters.php:359
-#: classes/pref/filters.php:407
-#: classes/pref/filters.php:744
-#: classes/pref/filters.php:832
-#: classes/pref/filters.php:859
+#: classes/pref/filters.php:384
+#: classes/pref/filters.php:441
+#: classes/pref/filters.php:784
+#: classes/pref/filters.php:872
+#: classes/pref/filters.php:899
+#: classes/pref/users.php:333
 #: classes/pref/prefs.php:992
-#: plugins/instances/init.php:284
+#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1574
+#: classes/pref/feeds.php:1638
 msgid "Select"
 msgstr "Seç"
 
 #: classes/pref/labels.php:261
-#: classes/pref/users.php:337
-#: classes/pref/feeds.php:1340
-#: classes/pref/feeds.php:1603
-#: classes/pref/feeds.php:1667
-#: classes/pref/filters.php:362
-#: classes/pref/filters.php:410
-#: classes/pref/filters.php:747
-#: classes/pref/filters.php:835
-#: classes/pref/filters.php:862
+#: classes/pref/filters.php:387
+#: classes/pref/filters.php:444
+#: classes/pref/filters.php:787
+#: classes/pref/filters.php:875
+#: classes/pref/filters.php:902
+#: classes/pref/users.php:336
 #: classes/pref/prefs.php:995
+#: classes/pref/feeds.php:1314
+#: classes/pref/feeds.php:1577
+#: classes/pref/feeds.php:1641
 #: classes/feeds.php:102
-#: plugins/instances/init.php:287
 msgid "All"
 msgstr "Tümü"
 
 #: classes/pref/labels.php:263
-#: classes/pref/users.php:339
-#: classes/pref/feeds.php:1342
-#: classes/pref/feeds.php:1605
-#: classes/pref/feeds.php:1669
-#: classes/pref/filters.php:364
-#: classes/pref/filters.php:412
-#: classes/pref/filters.php:749
-#: classes/pref/filters.php:837
-#: classes/pref/filters.php:864
+#: classes/pref/filters.php:389
+#: classes/pref/filters.php:446
+#: classes/pref/filters.php:789
+#: classes/pref/filters.php:877
+#: classes/pref/filters.php:904
+#: classes/pref/users.php:338
 #: classes/pref/prefs.php:997
+#: classes/pref/feeds.php:1316
+#: classes/pref/feeds.php:1579
+#: classes/pref/feeds.php:1643
 #: classes/feeds.php:105
-#: plugins/instances/init.php:289
 msgid "None"
 msgstr "Hiçbiri"
 
 #: classes/pref/labels.php:270
-#: classes/pref/users.php:348
+#: classes/pref/filters.php:512
+#: classes/pref/filters.php:806
+#: classes/pref/users.php:347
 #: classes/pref/feeds.php:767
-#: classes/pref/filters.php:478
-#: classes/pref/filters.php:766
-#: classes/feeds.php:1154
-#: plugins/instances/init.php:294
+#: classes/feeds.php:1147
 msgid "Remove"
 msgstr "Kaldır"
 
@@ -1303,9 +1192,171 @@ msgstr "Kaldır"
 msgid "Clear colors"
 msgstr "Renkleri kaldır"
 
+#: classes/pref/filters.php:153
+#, fuzzy
+msgid "Preview article"
+msgstr "Tazeler"
+
+#: classes/pref/filters.php:264
+#: classes/pref/filters.php:558
+msgid "(inverse)"
+msgstr "(ters çevir)"
+
+#: classes/pref/filters.php:260
+#: classes/pref/filters.php:557
+#, php-format
+msgid "%s on %s in %s %s"
+msgstr "%s de %s de %s %s"
+
+#: classes/pref/filters.php:379
+#: classes/pref/filters.php:867
+#: classes/pref/filters.php:981
+msgid "Match"
+msgstr "Eşle"
+
+#: classes/pref/filters.php:393
+#: classes/pref/filters.php:450
+#: classes/pref/filters.php:881
+#: classes/pref/filters.php:908
+msgid "Add"
+msgstr "Ekle"
+
+#: classes/pref/filters.php:396
+#: classes/pref/filters.php:453
+#: classes/pref/filters.php:884
+#: classes/pref/filters.php:911
+#: classes/feeds.php:122
+msgid "Delete"
+msgstr "Sil"
+
+#: classes/pref/filters.php:436
+#: classes/pref/filters.php:894
+msgid "Apply actions"
+msgstr "Uygula"
+
+#: classes/pref/filters.php:486
+#: classes/pref/filters.php:923
+msgid "Enabled"
+msgstr "Etkin"
+
+#: classes/pref/filters.php:495
+#: classes/pref/filters.php:926
+msgid "Match any rule"
+msgstr "Herhangi bir kurala eşle"
+
+#: classes/pref/filters.php:504
+#: classes/pref/filters.php:929
+msgid "Inverse matching"
+msgstr "Eşlemeyi ters çevir"
+
+#: classes/pref/filters.php:516
+#: classes/pref/filters.php:936
+msgid "Test"
+msgstr "Deneme"
+
+#: classes/pref/filters.php:780
+#: classes/pref/users.php:323
+#: classes/pref/feeds.php:1307
+#: classes/feeds.php:1118
+#: classes/feeds.php:1184
+#: js/tt-rss.js:165
+msgid "Search"
+msgstr "Ara"
+
+#: classes/pref/filters.php:796
+msgid "Combine"
+msgstr "Birleştir"
+
+#: classes/pref/filters.php:799
+#: classes/pref/users.php:345
+msgid "Edit"
+msgstr "Düzenle"
+
+#: classes/pref/filters.php:802
+#: classes/pref/feeds.php:1327
+#: classes/pref/feeds.php:1341
+msgid "Reset sort order"
+msgstr "Sıralamayı eski haline getir"
+
+#: classes/pref/filters.php:810
+#: classes/pref/feeds.php:1363
+msgid "Rescore articles"
+msgstr "Yazıları tekrar skorla"
+
+#: classes/pref/filters.php:939
+msgid "Create"
+msgstr "Tanımla"
+
+#: classes/pref/filters.php:993
+msgid "Inverse regular expression matching"
+msgstr "Düzenli ifade eşlemesini ters duruma getir"
+
+#: classes/pref/filters.php:995
+msgid "on field"
+msgstr "alanda"
+
+#: classes/pref/filters.php:1001
+#: js/PrefFilterTree.js:64
+msgid "in"
+msgstr "de"
+
+#: classes/pref/filters.php:1014
+#, fuzzy
+msgid "Wiki: Filters"
+msgstr "Filtreler"
+
+#: classes/pref/filters.php:1019
+msgid "Save rule"
+msgstr "Kuralı kaydet"
+
+#: classes/pref/filters.php:1019
+#: js/functions.js:865
+msgid "Add rule"
+msgstr "Kural ekle"
+
+#: classes/pref/filters.php:1042
+msgid "Perform Action"
+msgstr "Çalıştır"
+
+#: classes/pref/filters.php:1093
+#, fuzzy
+msgid "No actions available"
+msgstr "Yeni versiyon çıktı!"
+
+#: classes/pref/filters.php:1112
+msgid "Save action"
+msgstr "Kaydet"
+
+#: classes/pref/filters.php:1112
+#: js/functions.js:887
+msgid "Add action"
+msgstr "Ekle"
+
+#: classes/pref/filters.php:1136
+msgid "[No caption]"
+msgstr "[altyazısız]"
+
+#: classes/pref/filters.php:1138
+#, php-format
+msgid "%s (%d rule)"
+msgid_plural "%s (%d rules)"
+msgstr[0] "%s (%d kural)"
+msgstr[1] "%s (%d kurallar)"
+
+#: classes/pref/filters.php:1153
+#, fuzzy
+msgid "matches any rule"
+msgstr "Herhangi bir kurala eşle"
+
+#: classes/pref/filters.php:1156
+#, fuzzy, php-format
+msgid "%s (+%d action)"
+msgid_plural "%s (+%d actions)"
+msgstr[0] "%s (+%d eylem)"
+msgstr[1] "%s (+%d eylem)"
+
 #: classes/pref/users.php:6
 #: classes/pref/system.php:8
-#: plugins/instances/init.php:154
 msgid "Your access level is insufficient to open this tab."
 msgstr "Bu sekmeyi açmak için yeterli yetkiniz yok."
 
@@ -1316,8 +1367,8 @@ msgstr "Kuralı düzenle"
 
 #: classes/pref/users.php:56
 #: classes/pref/feeds.php:637
-#: classes/pref/feeds.php:878
-#: classes/feeds.php:1075
+#: classes/pref/feeds.php:866
+#: classes/feeds.php:1068
 msgid "Authentication"
 msgstr "Doğrulama"
 
@@ -1327,7 +1378,7 @@ msgstr "Erişim seviyesi:"
 
 #: classes/pref/users.php:77
 #: classes/pref/feeds.php:667
-#: classes/pref/feeds.php:896
+#: classes/pref/feeds.php:884
 msgid "Options"
 msgstr "Opsiyonlar"
 
@@ -1341,7 +1392,7 @@ msgid "User not found"
 msgstr "Kullanıcı bulunamadı"
 
 #: classes/pref/users.php:132
-#: classes/pref/users.php:400
+#: classes/pref/users.php:399
 msgid "Registered"
 msgstr "Kaydedildi"
 
@@ -1359,7 +1410,7 @@ msgid "Stored articles"
 msgstr "Favori yazılar"
 
 #: classes/pref/users.php:145
-#: classes/pref/users.php:399
+#: classes/pref/users.php:398
 msgid "Subscribed feeds"
 msgstr "Abone olunan özet akışları"
 
@@ -1378,507 +1429,57 @@ msgstr "Kullanıcı <b>%s</b> tanımlanamadı"
 msgid "User <b>%s</b> already exists."
 msgstr "Kullanıcı <b>%s</b> zaten var."
 
-#: classes/pref/users.php:265
+#: classes/pref/users.php:264
 #, php-format
 msgid "Changed password of user <b>%s</b> to <b>%s</b>"
 msgstr "<b>%s</b> kullanıcısının şifresi <b>%s</b> e değiştirildi"
 
-#: classes/pref/users.php:267
+#: classes/pref/users.php:266
 #, php-format
 msgid "Sending new password of user <b>%s</b> to <b>%s</b>"
 msgstr "<b>%s</b> adlı kullanıcının yeni şifresi <b>%s</b> e yollanıyor"
 
-#: classes/pref/users.php:291
+#: classes/pref/users.php:290
 msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] Şifre değiştirme hatırlatması"
 
-#: classes/pref/users.php:324
-#: classes/pref/feeds.php:1333
-#: classes/pref/filters.php:740
-#: classes/feeds.php:1125
-#: classes/feeds.php:1191
-#: js/tt-rss.js:165
-msgid "Search"
-msgstr "Ara"
-
-#: classes/pref/users.php:342
+#: classes/pref/users.php:341
 msgid "Create user"
 msgstr "Kullanıcı tanımla"
 
-#: classes/pref/users.php:346
-#: classes/pref/filters.php:759
-#: plugins/instances/init.php:293
-msgid "Edit"
-msgstr "Düzenle"
-
-#: classes/pref/users.php:397
+#: classes/pref/users.php:396
 #: classes/pref/feeds.php:643
-#: classes/pref/feeds.php:882
-#: classes/pref/feeds.php:1836
-#: classes/feeds.php:1079
+#: classes/pref/feeds.php:870
+#: classes/pref/feeds.php:1810
+#: classes/feeds.php:1072
 msgid "Login"
 msgstr "Oturum aç"
 
-#: classes/pref/users.php:398
+#: classes/pref/users.php:397
 msgid "Access Level"
 msgstr "Erişim seviyesi"
 
-#: classes/pref/users.php:401
+#: classes/pref/users.php:400
 msgid "Last login"
 msgstr "Son giriş"
 
-#: classes/pref/users.php:420
-#: plugins/instances/init.php:334
+#: classes/pref/users.php:419
 msgid "Click to edit"
 msgstr "Düzenlemek için tıklayın"
 
-#: classes/pref/users.php:441
+#: classes/pref/users.php:440
 msgid "No users defined."
 msgstr "Hiçbir kullanıcı tanımlanmadı."
 
-#: classes/pref/users.php:443
+#: classes/pref/users.php:442
 msgid "No matching users found."
 msgstr "Uyan kullanıcı bulunamadı."
 
-#: classes/pref/system.php:29
-msgid "Error Log"
-msgstr "Hata kayıt defteri"
-
-#: classes/pref/system.php:40
-msgid "Refresh"
-msgstr "Yenile"
-
-#: classes/pref/system.php:43
-msgid "Clear log"
-msgstr "Kayıt defterini temizle"
-
-#: classes/pref/system.php:48
-msgid "Error"
-msgstr "Hata"
-
-#: classes/pref/system.php:49
-msgid "Filename"
-msgstr "Dosya adı"
-
-#: classes/pref/system.php:50
-msgid "Message"
-msgstr "Mesaj"
-
-#: classes/pref/system.php:52
-msgid "Date"
-msgstr "Tarih"
-
-#: classes/pref/feeds.php:15
-msgid "Check to enable field"
-msgstr "Veri alanını etkinleştirmek için tıklayın"
-
-#: classes/pref/feeds.php:65
-#: classes/pref/feeds.php:214
-#: classes/pref/feeds.php:258
-#: classes/pref/feeds.php:264
-#: classes/pref/feeds.php:290
-#, fuzzy, php-format
-msgid "(%d feed)"
-msgid_plural "(%d feeds)"
-msgstr[0] "(%d özet akışı)"
-msgstr[1] "(%d özet akışı)"
-
-#: classes/pref/feeds.php:537
 #: classes/pref/prefs.php:18
+#: classes/pref/feeds.php:537
 msgid "General"
 msgstr "Genel"
 
-#: classes/pref/feeds.php:561
-msgid "Feed Title"
-msgstr "Özet akışı başlığı"
-
-#: classes/pref/feeds.php:595
-#: classes/pref/feeds.php:830
-#: classes/pref/feeds.php:1822
-#: classes/feeds.php:1055
-msgid "Place in category:"
-msgstr "Kategoriye yerleştir"
-
-#: classes/pref/feeds.php:608
-#: classes/pref/feeds.php:844
-#, fuzzy
-msgid "Language:"
-msgstr "Dil"
-
-#: classes/pref/feeds.php:615
-#: classes/pref/feeds.php:853
-msgid "Update"
-msgstr "Yenileme"
-
-#: classes/pref/feeds.php:630
-#: classes/pref/feeds.php:869
-msgid "Article purging:"
-msgstr "Yazıları temizleme:"
-
-#: classes/pref/feeds.php:658
-#: classes/pref/feeds.php:890
-#: classes/pref/feeds.php:1839
-#: classes/pref/prefs.php:245
-#: classes/feeds.php:1083
-msgid "Password"
-msgstr "Şifre"
-
-#: classes/pref/feeds.php:662
-msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
-msgstr "<b>İpucu:</b> Eğer özet akışınız gerektiriyorsa buraya giriş bilgilerinizi girmelisiniz. Twitter özet akışları için giriş bilgisi gerekli değildir."
-
-#: classes/pref/feeds.php:681
-#: classes/pref/feeds.php:900
-msgid "Hide from Popular feeds"
-msgstr "Popüler özet akışlarında görünmesin"
-
-#: classes/pref/feeds.php:693
-#: classes/pref/feeds.php:906
-msgid "Include in e-mail digest"
-msgstr "E-posta özetine ekle"
-
-#: classes/pref/feeds.php:706
-#: classes/pref/feeds.php:912
-msgid "Always display image attachments"
-msgstr "Daima resimleri göster"
-
-#: classes/pref/feeds.php:719
-#: classes/pref/feeds.php:920
-msgid "Do not embed images"
-msgstr "Resimleri gösterme"
-
-#: classes/pref/feeds.php:732
-#: classes/pref/feeds.php:928
-msgid "Cache media"
-msgstr ""
-
-#: classes/pref/feeds.php:744
-#: classes/pref/feeds.php:934
-msgid "Mark updated articles as unread"
-msgstr "Yenilenen yazıları okunmamış işaretle"
-
-#: classes/pref/feeds.php:748
-msgid "Icon"
-msgstr "İkon"
-
-#: classes/pref/feeds.php:765
-msgid "Replace"
-msgstr "Değiştir"
-
-#: classes/pref/feeds.php:772
-#: classes/pref/prefs.php:698
-msgid "Plugins"
-msgstr "Eklentiler"
-
-#: classes/pref/feeds.php:792
-msgid "Resubscribe to push updates"
-msgstr "Push yenilemelere tekrar abone ol"
-
-#: classes/pref/feeds.php:799
-msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
-msgstr "Push özet akışlarında PubSubHubbub abonelik durumunu tekrar kurar."
-
-#: classes/pref/feeds.php:1200
-#: classes/pref/feeds.php:1253
-msgid "All done."
-msgstr "Bitti."
-
-#: classes/pref/feeds.php:1308
-msgid "Feeds with errors"
-msgstr "Hatalı özet akışları"
-
-#: classes/pref/feeds.php:1315
-msgid "Inactive feeds"
-msgstr "Aktif olmayan özet akışları"
-
-#: classes/pref/feeds.php:1351
-msgid "Edit selected feeds"
-msgstr "Seçili özet akışlarını düzenle"
-
-#: classes/pref/feeds.php:1353
-#: classes/pref/feeds.php:1367
-#: classes/pref/filters.php:762
-msgid "Reset sort order"
-msgstr "Sıralamayı eski haline getir"
-
-#: classes/pref/feeds.php:1355
-#: js/prefs.js:1622
-msgid "Batch subscribe"
-msgstr "Toplu abone ol"
-
-#: classes/pref/feeds.php:1362
-msgid "Categories"
-msgstr "Kategoriler"
-
-#: classes/pref/feeds.php:1365
-msgid "Add category"
-msgstr "Kategori ekle"
-
-#: classes/pref/feeds.php:1369
-msgid "Remove selected"
-msgstr "Seçileni kaldır"
-
-#: classes/pref/feeds.php:1380
-msgid "More actions..."
-msgstr "Daha..."
-
-#: classes/pref/feeds.php:1384
-msgid "Manual purge"
-msgstr "Elle temizleme"
-
-#: classes/pref/feeds.php:1388
-msgid "Clear feed data"
-msgstr "Özet akışı verisini kaldır"
-
-#: classes/pref/feeds.php:1389
-#: classes/pref/filters.php:770
-msgid "Rescore articles"
-msgstr "Yazıları tekrar skorla"
-
-#: classes/pref/feeds.php:1442
-msgid "OPML"
-msgstr "OPML"
-
-#: classes/pref/feeds.php:1444
-msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
-msgstr "OPML kullanarak veri akışlarınızı, filtrelerinizi, arama başlıklarınızı ve okuyucu tercihlerinizi dışa taşıyabilirsiniz."
-
-#: classes/pref/feeds.php:1445
-msgid "Only main settings profile can be migrated using OPML."
-msgstr "OPML ile sadece ana tercihler profili nakli yapılabilir. "
-
-#: classes/pref/feeds.php:1458
-msgid "Import my OPML"
-msgstr "OPML'imi içe aktar"
-
-#: classes/pref/feeds.php:1464
-msgid "Filename:"
-msgstr "Dosya adı:"
-
-#: classes/pref/feeds.php:1466
-msgid "Include settings"
-msgstr "Ayarları dahil et"
-
-#: classes/pref/feeds.php:1470
-msgid "Export OPML"
-msgstr "OPML'i dışa aktar"
-
-#: classes/pref/feeds.php:1474
-msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
-msgstr "Aşağıdaki adresi bilen kişiler OPML'inize abone olabilir."
-
-#: classes/pref/feeds.php:1478
-msgid "Public OPML URL"
-msgstr "Herkese açık OPML adresi"
-
-#: classes/pref/feeds.php:1479
-msgid "Display published OPML URL"
-msgstr "Yayınlanan OPML adresini göster"
-
-#: classes/pref/feeds.php:1488
-msgid "Firefox integration"
-msgstr "Firefox bütünleşimi"
-
-#: classes/pref/feeds.php:1490
-msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
-msgstr "Aşağıdaki linke tıklayarak bu site Firefox Feed Reader olarak kullanılabilir."
-
-#: classes/pref/feeds.php:1497
-msgid "Click here to register this site as a feed reader."
-msgstr "Bu siteyi özet akışı okuyucu olarak tanımlamak için buraya tıklayın."
-
-#: classes/pref/feeds.php:1505
-msgid "Published & shared articles / Generated feeds"
-msgstr "Yayınlanmış ve paylaşılmış yazılar / Oluşturulan özet akışları"
-
-#: classes/pref/feeds.php:1507
-msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
-msgstr "Yayınlanmış yazılar herkese açık RSS özet beslemesi olarak dışa aktarılır ve bunun adresini bilen herkes buna abone olabilir."
-
-#: classes/pref/feeds.php:1514
-#: classes/feeds.php:54
-#: classes/feeds.php:140
-msgid "View as RSS"
-msgstr "RSS olarak görüntüle"
-
-#: classes/pref/feeds.php:1515
-msgid "Display URL"
-msgstr "Adresi göster"
-
-#: classes/pref/feeds.php:1518
-msgid "Clear all generated URLs"
-msgstr "Tüm üretilmiş adresleri temizle"
-
-#: classes/pref/feeds.php:1596
-msgid "These feeds have not been updated with new content for 3 months (oldest first):"
-msgstr "Bu özet akışları için 3 aydır yeni içerik yayınlanmadı (en eski en üstte):"
-
-#: classes/pref/feeds.php:1630
-#: classes/pref/feeds.php:1694
-msgid "Click to edit feed"
-msgstr "Özet akışını düzenlemek için tıklayın"
-
-#: classes/pref/feeds.php:1648
-#: classes/pref/feeds.php:1714
-msgid "Unsubscribe from selected feeds"
-msgstr "Seçilen özet akışlarının aboneliğinden ayrıl"
-
-#: classes/pref/feeds.php:1819
-msgid "Add one valid RSS feed per line (no feed detection is done)"
-msgstr "Satır başına bir RSS özet akışı ekle (özet akışı belirlemesi yapılmıyor)"
-
-#: classes/pref/feeds.php:1828
-msgid "Feeds to subscribe, One per line"
-msgstr "Abone olunacak özet akışları, satır başına bir tane"
-
-#: classes/pref/feeds.php:1851
-msgid "Feeds require authentication."
-msgstr "Onaylama gereken özet akışları."
-
-#: classes/pref/feeds.php:1858
-#: classes/feeds.php:1099
-#: classes/feeds.php:1153
-msgid "Subscribe"
-msgstr "Abone ol"
-
-#: classes/pref/filters.php:151
-#, fuzzy
-msgid "Preview article"
-msgstr "Tazeler"
-
-#: classes/pref/filters.php:239
-#: classes/pref/filters.php:518
-msgid "(inverse)"
-msgstr "(ters çevir)"
-
-#: classes/pref/filters.php:235
-#: classes/pref/filters.php:517
-#, php-format
-msgid "%s on %s in %s %s"
-msgstr "%s de %s de %s %s"
-
-#: classes/pref/filters.php:354
-#: classes/pref/filters.php:827
-#: classes/pref/filters.php:942
-msgid "Match"
-msgstr "Eşle"
-
-#: classes/pref/filters.php:368
-#: classes/pref/filters.php:416
-#: classes/pref/filters.php:841
-#: classes/pref/filters.php:868
-msgid "Add"
-msgstr "Ekle"
-
-#: classes/pref/filters.php:371
-#: classes/pref/filters.php:419
-#: classes/pref/filters.php:844
-#: classes/pref/filters.php:871
-#: classes/feeds.php:122
-msgid "Delete"
-msgstr "Sil"
-
-#: classes/pref/filters.php:402
-#: classes/pref/filters.php:854
-msgid "Apply actions"
-msgstr "Uygula"
-
-#: classes/pref/filters.php:452
-#: classes/pref/filters.php:883
-msgid "Enabled"
-msgstr "Etkin"
-
-#: classes/pref/filters.php:461
-#: classes/pref/filters.php:886
-msgid "Match any rule"
-msgstr "Herhangi bir kurala eşle"
-
-#: classes/pref/filters.php:470
-#: classes/pref/filters.php:889
-msgid "Inverse matching"
-msgstr "Eşlemeyi ters çevir"
-
-#: classes/pref/filters.php:482
-#: classes/pref/filters.php:896
-msgid "Test"
-msgstr "Deneme"
-
-#: classes/pref/filters.php:756
-msgid "Combine"
-msgstr "Birleştir"
-
-#: classes/pref/filters.php:899
-msgid "Create"
-msgstr "Tanımla"
-
-#: classes/pref/filters.php:954
-msgid "Inverse regular expression matching"
-msgstr "Düzenli ifade eşlemesini ters duruma getir"
-
-#: classes/pref/filters.php:956
-msgid "on field"
-msgstr "alanda"
-
-#: classes/pref/filters.php:962
-#: js/PrefFilterTree.js:64
-msgid "in"
-msgstr "de"
-
-#: classes/pref/filters.php:975
-#, fuzzy
-msgid "Wiki: Filters"
-msgstr "Filtreler"
-
-#: classes/pref/filters.php:980
-msgid "Save rule"
-msgstr "Kuralı kaydet"
-
-#: classes/pref/filters.php:980
-#: js/functions.js:865
-msgid "Add rule"
-msgstr "Kural ekle"
-
-#: classes/pref/filters.php:1003
-msgid "Perform Action"
-msgstr "Çalıştır"
-
-#: classes/pref/filters.php:1054
-#, fuzzy
-msgid "No actions available"
-msgstr "Yeni versiyon çıktı!"
-
-#: classes/pref/filters.php:1073
-msgid "Save action"
-msgstr "Kaydet"
-
-#: classes/pref/filters.php:1073
-#: js/functions.js:887
-msgid "Add action"
-msgstr "Ekle"
-
-#: classes/pref/filters.php:1097
-msgid "[No caption]"
-msgstr "[altyazısız]"
-
-#: classes/pref/filters.php:1099
-#, php-format
-msgid "%s (%d rule)"
-msgid_plural "%s (%d rules)"
-msgstr[0] "%s (%d kural)"
-msgstr[1] "%s (%d kurallar)"
-
-#: classes/pref/filters.php:1114
-#, fuzzy
-msgid "matches any rule"
-msgstr "Herhangi bir kurala eşle"
-
-#: classes/pref/filters.php:1117
-#, fuzzy, php-format
-msgid "%s (+%d action)"
-msgid_plural "%s (+%d actions)"
-msgstr[0] "%s (+%d eylem)"
-msgstr[1] "%s (+%d eylem)"
-
 #: classes/pref/prefs.php:19
 msgid "Interface"
 msgstr "Arayüz"
@@ -2052,7 +1653,7 @@ msgid "Strip all but most common HTML tags when reading articles."
 msgstr "Yazılarda HTML işaretlemelerini kaldır"
 
 #: classes/pref/prefs.php:53
-#: js/prefs.js:1584
+#: js/prefs.js:1580
 msgid "Customize stylesheet"
 msgstr "Stil sayfasını biçimlendir"
 
@@ -2120,6 +1721,14 @@ msgstr "Erişim seviyesi"
 msgid "Save data"
 msgstr "Bilgiyi kaydet"
 
+#: classes/pref/prefs.php:245
+#: classes/pref/feeds.php:658
+#: classes/pref/feeds.php:878
+#: classes/pref/feeds.php:1813
+#: classes/feeds.php:1076
+msgid "Password"
+msgstr "Şifre"
+
 #: classes/pref/prefs.php:254
 msgid "Your password is at default value, please change it."
 msgstr "Şifreniz öntanımlı şifre, güvenliğiniz için lütfen şifrenizi değiştirin"
@@ -2218,18 +1827,23 @@ msgstr "Profilleri yönet"
 msgid "Reset to defaults"
 msgstr "Öntanımlılara geri dön"
 
+#: classes/pref/prefs.php:698
+#: classes/pref/feeds.php:772
+msgid "Plugins"
+msgstr "Eklentiler"
+
 #: classes/pref/prefs.php:700
 msgid "You will need to reload Tiny Tiny RSS for plugin changes to take effect."
 msgstr "Eklenti değişikliklerinin etkin olması için Tiny Tiny RSS'in yeniden yüklenmesi gerekiyor."
 
-#: classes/pref/prefs.php:702
-msgid "Download more plugins at tt-rss.org <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forums</a> or <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a>."
-msgstr "Daha fazla ekletiyi şu adreslerde bulabilirsiniz:  tt-rss.org <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forums</a> ya da <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a>."
-
-#: classes/pref/prefs.php:732
+#: classes/pref/prefs.php:730
 msgid "System plugins"
 msgstr "Sistem eklentileri"
 
+#: classes/pref/prefs.php:731
+msgid "System plugins are enabled in <strong>config.php</strong> for all users."
+msgstr ""
+
 #: classes/pref/prefs.php:736
 #: classes/pref/prefs.php:792
 msgid "Plugin"
@@ -2299,6 +1913,340 @@ msgstr "Seçili profilleri kaldır"
 msgid "Activate profile"
 msgstr "Profili aktifleştir"
 
+#: classes/pref/feeds.php:15
+msgid "Check to enable field"
+msgstr "Veri alanını etkinleştirmek için tıklayın"
+
+#: classes/pref/feeds.php:65
+#: classes/pref/feeds.php:214
+#: classes/pref/feeds.php:258
+#: classes/pref/feeds.php:264
+#: classes/pref/feeds.php:290
+#, fuzzy, php-format
+msgid "(%d feed)"
+msgid_plural "(%d feeds)"
+msgstr[0] "(%d özet akışı)"
+msgstr[1] "(%d özet akışı)"
+
+#: classes/pref/feeds.php:561
+msgid "Feed Title"
+msgstr "Özet akışı başlığı"
+
+#: classes/pref/feeds.php:595
+#: classes/pref/feeds.php:818
+#: classes/pref/feeds.php:1796
+#: classes/feeds.php:1048
+msgid "Place in category:"
+msgstr "Kategoriye yerleştir"
+
+#: classes/pref/feeds.php:608
+#: classes/pref/feeds.php:832
+#, fuzzy
+msgid "Language:"
+msgstr "Dil"
+
+#: classes/pref/feeds.php:615
+#: classes/pref/feeds.php:841
+msgid "Update"
+msgstr "Yenileme"
+
+#: classes/pref/feeds.php:630
+#: classes/pref/feeds.php:857
+msgid "Article purging:"
+msgstr "Yazıları temizleme:"
+
+#: classes/pref/feeds.php:662
+msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
+msgstr "<b>İpucu:</b> Eğer özet akışınız gerektiriyorsa buraya giriş bilgilerinizi girmelisiniz. Twitter özet akışları için giriş bilgisi gerekli değildir."
+
+#: classes/pref/feeds.php:681
+#: classes/pref/feeds.php:888
+msgid "Hide from Popular feeds"
+msgstr "Popüler özet akışlarında görünmesin"
+
+#: classes/pref/feeds.php:693
+#: classes/pref/feeds.php:894
+msgid "Include in e-mail digest"
+msgstr "E-posta özetine ekle"
+
+#: classes/pref/feeds.php:706
+#: classes/pref/feeds.php:900
+msgid "Always display image attachments"
+msgstr "Daima resimleri göster"
+
+#: classes/pref/feeds.php:719
+#: classes/pref/feeds.php:908
+msgid "Do not embed images"
+msgstr "Resimleri gösterme"
+
+#: classes/pref/feeds.php:732
+#: classes/pref/feeds.php:916
+msgid "Cache media"
+msgstr ""
+
+#: classes/pref/feeds.php:744
+#: classes/pref/feeds.php:922
+msgid "Mark updated articles as unread"
+msgstr "Yenilenen yazıları okunmamış işaretle"
+
+#: classes/pref/feeds.php:748
+msgid "Icon"
+msgstr "İkon"
+
+#: classes/pref/feeds.php:765
+msgid "Replace"
+msgstr "Değiştir"
+
+#: classes/pref/feeds.php:1174
+#: classes/pref/feeds.php:1227
+msgid "All done."
+msgstr "Bitti."
+
+#: classes/pref/feeds.php:1282
+msgid "Feeds with errors"
+msgstr "Hatalı özet akışları"
+
+#: classes/pref/feeds.php:1289
+msgid "Inactive feeds"
+msgstr "Aktif olmayan özet akışları"
+
+#: classes/pref/feeds.php:1325
+msgid "Edit selected feeds"
+msgstr "Seçili özet akışlarını düzenle"
+
+#: classes/pref/feeds.php:1329
+#: js/prefs.js:1618
+msgid "Batch subscribe"
+msgstr "Toplu abone ol"
+
+#: classes/pref/feeds.php:1336
+msgid "Categories"
+msgstr "Kategoriler"
+
+#: classes/pref/feeds.php:1339
+msgid "Add category"
+msgstr "Kategori ekle"
+
+#: classes/pref/feeds.php:1343
+msgid "Remove selected"
+msgstr "Seçileni kaldır"
+
+#: classes/pref/feeds.php:1354
+msgid "More actions..."
+msgstr "Daha..."
+
+#: classes/pref/feeds.php:1358
+msgid "Manual purge"
+msgstr "Elle temizleme"
+
+#: classes/pref/feeds.php:1362
+msgid "Clear feed data"
+msgstr "Özet akışı verisini kaldır"
+
+#: classes/pref/feeds.php:1416
+msgid "OPML"
+msgstr "OPML"
+
+#: classes/pref/feeds.php:1418
+msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
+msgstr "OPML kullanarak veri akışlarınızı, filtrelerinizi, arama başlıklarınızı ve okuyucu tercihlerinizi dışa taşıyabilirsiniz."
+
+#: classes/pref/feeds.php:1419
+msgid "Only main settings profile can be migrated using OPML."
+msgstr "OPML ile sadece ana tercihler profili nakli yapılabilir. "
+
+#: classes/pref/feeds.php:1432
+msgid "Import my OPML"
+msgstr "OPML'imi içe aktar"
+
+#: classes/pref/feeds.php:1438
+msgid "Filename:"
+msgstr "Dosya adı:"
+
+#: classes/pref/feeds.php:1440
+msgid "Include settings"
+msgstr "Ayarları dahil et"
+
+#: classes/pref/feeds.php:1444
+msgid "Export OPML"
+msgstr "OPML'i dışa aktar"
+
+#: classes/pref/feeds.php:1448
+msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
+msgstr "Aşağıdaki adresi bilen kişiler OPML'inize abone olabilir."
+
+#: classes/pref/feeds.php:1452
+msgid "Public OPML URL"
+msgstr "Herkese açık OPML adresi"
+
+#: classes/pref/feeds.php:1453
+msgid "Display published OPML URL"
+msgstr "Yayınlanan OPML adresini göster"
+
+#: classes/pref/feeds.php:1462
+msgid "Firefox integration"
+msgstr "Firefox bütünleşimi"
+
+#: classes/pref/feeds.php:1464
+msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
+msgstr "Aşağıdaki linke tıklayarak bu site Firefox Feed Reader olarak kullanılabilir."
+
+#: classes/pref/feeds.php:1471
+msgid "Click here to register this site as a feed reader."
+msgstr "Bu siteyi özet akışı okuyucu olarak tanımlamak için buraya tıklayın."
+
+#: classes/pref/feeds.php:1479
+msgid "Published & shared articles / Generated feeds"
+msgstr "Yayınlanmış ve paylaşılmış yazılar / Oluşturulan özet akışları"
+
+#: classes/pref/feeds.php:1481
+msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
+msgstr "Yayınlanmış yazılar herkese açık RSS özet beslemesi olarak dışa aktarılır ve bunun adresini bilen herkes buna abone olabilir."
+
+#: classes/pref/feeds.php:1488
+#: classes/feeds.php:54
+#: classes/feeds.php:140
+msgid "View as RSS"
+msgstr "RSS olarak görüntüle"
+
+#: classes/pref/feeds.php:1489
+msgid "Display URL"
+msgstr "Adresi göster"
+
+#: classes/pref/feeds.php:1492
+msgid "Clear all generated URLs"
+msgstr "Tüm üretilmiş adresleri temizle"
+
+#: classes/pref/feeds.php:1570
+msgid "These feeds have not been updated with new content for 3 months (oldest first):"
+msgstr "Bu özet akışları için 3 aydır yeni içerik yayınlanmadı (en eski en üstte):"
+
+#: classes/pref/feeds.php:1604
+#: classes/pref/feeds.php:1668
+msgid "Click to edit feed"
+msgstr "Özet akışını düzenlemek için tıklayın"
+
+#: classes/pref/feeds.php:1622
+#: classes/pref/feeds.php:1688
+msgid "Unsubscribe from selected feeds"
+msgstr "Seçilen özet akışlarının aboneliğinden ayrıl"
+
+#: classes/pref/feeds.php:1793
+msgid "Add one valid RSS feed per line (no feed detection is done)"
+msgstr "Satır başına bir RSS özet akışı ekle (özet akışı belirlemesi yapılmıyor)"
+
+#: classes/pref/feeds.php:1802
+msgid "Feeds to subscribe, One per line"
+msgstr "Abone olunacak özet akışları, satır başına bir tane"
+
+#: classes/pref/feeds.php:1825
+msgid "Feeds require authentication."
+msgstr "Onaylama gereken özet akışları."
+
+#: classes/pref/feeds.php:1832
+#: classes/feeds.php:1092
+#: classes/feeds.php:1146
+msgid "Subscribe"
+msgstr "Abone ol"
+
+#: classes/pref/system.php:29
+msgid "Error Log"
+msgstr "Hata kayıt defteri"
+
+#: classes/pref/system.php:40
+msgid "Refresh"
+msgstr "Yenile"
+
+#: classes/pref/system.php:43
+msgid "Clear log"
+msgstr "Kayıt defterini temizle"
+
+#: classes/pref/system.php:48
+msgid "Error"
+msgstr "Hata"
+
+#: classes/pref/system.php:49
+msgid "Filename"
+msgstr "Dosya adı"
+
+#: classes/pref/system.php:50
+msgid "Message"
+msgstr "Mesaj"
+
+#: classes/pref/system.php:52
+msgid "Date"
+msgstr "Tarih"
+
+#: classes/opml.php:28
+#: classes/opml.php:33
+msgid "OPML Utility"
+msgstr "OPML Utility"
+
+#: classes/opml.php:37
+msgid "Importing OPML..."
+msgstr "OPML içe aktarılıyor..."
+
+#: classes/opml.php:41
+msgid "Return to preferences"
+msgstr "Tercihlere geri dön"
+
+#: classes/opml.php:295
+#, php-format
+msgid "Adding feed: %s"
+msgstr "Özet akışı ekleniyor: %s"
+
+#: classes/opml.php:306
+#, php-format
+msgid "Duplicate feed: %s"
+msgstr "Zaten var olan özet akışı: %s"
+
+#: classes/opml.php:320
+#, php-format
+msgid "Adding label %s"
+msgstr "Arama başlığı ekleniyor %s"
+
+#: classes/opml.php:323
+#, php-format
+msgid "Duplicate label: %s"
+msgstr "Aynı arama başlığı mevcut: %s"
+
+#: classes/opml.php:335
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr "Tercih anahtarı %s %s'e ayarlanıyor"
+
+#: classes/opml.php:367
+msgid "Adding filter..."
+msgstr "Filtre ekleniyor..."
+
+#: classes/opml.php:486
+#, php-format
+msgid "Processing category: %s"
+msgstr "Kategori işleniyor: %s"
+
+#: classes/opml.php:532
+#, php-format
+msgid "Upload failed with error code %d"
+msgstr "Yükleme başarısız oldu hata kodu %d"
+
+#: classes/opml.php:544
+#: plugins/import_export/init.php:448
+msgid "Unable to move uploaded file."
+msgstr "Yüklenen dosya taşınamadı."
+
+#: classes/opml.php:548
+#: plugins/import_export/init.php:452
+msgid "Error: please upload OPML file."
+msgstr "Hata: lütfen OPML dosyasını yükleyin."
+
+#: classes/opml.php:559
+msgid "Error: unable to find moved OPML file."
+msgstr "Hata: Taşınan OPML dosyası bulunamıyor."
+
+#: classes/opml.php:566
+msgid "Error while parsing document."
+msgstr "Belge çözümlenirken hata oluştu."
+
 #: classes/feeds.php:53
 msgid "View as RSS feed"
 msgstr "RSS özet akışı olarak görüntüle"
@@ -2339,8 +2287,8 @@ msgstr "Geri git"
 
 #: classes/feeds.php:127
 #: classes/feeds.php:132
-#: plugins/mail/init.php:75
 #: plugins/mailto/init.php:25
+#: plugins/mail/init.php:75
 msgid "Forward by email"
 msgstr "E-posta ile yolla"
 
@@ -2348,319 +2296,146 @@ msgstr "E-posta ile yolla"
 msgid "Feed:"
 msgstr "Özet akışı:"
 
-#: classes/feeds.php:229
-#: classes/feeds.php:892
+#: classes/feeds.php:228
+#: classes/feeds.php:885
 msgid "Feed not found."
 msgstr "Özet akışı bulunamadı."
 
-#: classes/feeds.php:300
+#: classes/feeds.php:291
 msgid "Never"
 msgstr "Asla"
 
-#: classes/feeds.php:413
+#: classes/feeds.php:405
 #, php-format
 msgid "Imported at %s"
 msgstr "%s de içe aktarıldı"
 
-#: classes/feeds.php:472
-#: classes/feeds.php:569
+#: classes/feeds.php:464
+#: classes/feeds.php:561
 #, fuzzy
 msgid "mark feed as read"
 msgstr "Okundu olarak işaretle"
 
-#: classes/feeds.php:630
+#: classes/feeds.php:622
 msgid "Collapse article"
 msgstr "Yazıyı kapat"
 
-#: classes/feeds.php:791
+#: classes/feeds.php:784
 msgid "No unread articles found to display."
 msgstr "Okunmamış yazı bulunamadı."
 
-#: classes/feeds.php:794
+#: classes/feeds.php:787
 msgid "No updated articles found to display."
 msgstr "Yenilenmiş yazı bulunamadı."
 
-#: classes/feeds.php:797
+#: classes/feeds.php:790
 msgid "No starred articles found to display."
 msgstr "Favori yazı bulunamadı."
 
-#: classes/feeds.php:801
+#: classes/feeds.php:794
 msgid "No articles found to display. You can assign articles to labels manually from article header context menu (applies to all selected articles) or use a filter."
 msgstr "Yazı bulunamadı. Yazıları arama başlıklarına elle ekleyebilir ya da filtre tanımlamayı deneyebilirsiniz."
 
-#: classes/feeds.php:803
+#: classes/feeds.php:796
 msgid "No articles found to display."
 msgstr "Yazı bulunamadı."
 
-#: classes/feeds.php:818
-#: classes/feeds.php:992
+#: classes/feeds.php:811
+#: classes/feeds.php:985
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "Özet akışları en son %s de yenilendi"
 
-#: classes/feeds.php:828
-#: classes/feeds.php:1002
+#: classes/feeds.php:821
+#: classes/feeds.php:995
 msgid "Some feeds have update errors (click for details)"
 msgstr "Bazı özet akışlarında yenileme hataları var (detaylar için tıklayın)"
 
-#: classes/feeds.php:982
+#: classes/feeds.php:975
 msgid "No feed selected."
 msgstr "Hiçbir özet akışı seçilmedi."
 
-#: classes/feeds.php:1041
-#: classes/feeds.php:1049
+#: classes/feeds.php:1034
+#: classes/feeds.php:1042
 msgid "Feed or site URL"
 msgstr "Özet akışı ya da site adresi"
 
-#: classes/feeds.php:1063
+#: classes/feeds.php:1056
 msgid "Available feeds"
 msgstr "Mevcut veri akışları"
 
-#: classes/feeds.php:1094
+#: classes/feeds.php:1087
 msgid "This feed requires authentication."
 msgstr "Bu özet akışı doğrulama gerektiriyor."
 
-#: classes/feeds.php:1102
+#: classes/feeds.php:1095
 msgid "More feeds"
 msgstr "Daha fazla özet akışı"
 
-#: classes/feeds.php:1129
+#: classes/feeds.php:1122
 msgid "Popular feeds"
 msgstr "Popüler özet akışları"
 
-#: classes/feeds.php:1130
+#: classes/feeds.php:1123
 msgid "Feed archive"
 msgstr "Özet akışı arşivi"
 
-#: classes/feeds.php:1133
+#: classes/feeds.php:1126
 msgid "limit:"
 msgstr "limit:"
 
-#: classes/feeds.php:1165
+#: classes/feeds.php:1158
 msgid "Look for"
 msgstr "Arama yap"
 
-#: classes/feeds.php:1173
+#: classes/feeds.php:1166
 #, php-format
 msgid "in %s"
 msgstr ""
 
-#: classes/feeds.php:1178
+#: classes/feeds.php:1171
 msgid "Used for word stemming"
 msgstr ""
 
-#: classes/feeds.php:1187
+#: classes/feeds.php:1180
 #, fuzzy
 msgid "Search syntax"
 msgstr "Ara"
 
-#: plugins/instances/init.php:141
-msgid "Linked"
-msgstr "Olgu bağlantıları"
-
-#: plugins/instances/init.php:204
-#: plugins/instances/init.php:395
-msgid "Instance"
-msgstr "Olgu"
-
-#: plugins/instances/init.php:215
-#: plugins/instances/init.php:312
-#: plugins/instances/init.php:404
-msgid "Instance URL"
-msgstr "Olgu adresi"
-
-#: plugins/instances/init.php:226
-#: plugins/instances/init.php:414
-msgid "Access key:"
-msgstr "Ulaşım anahtarı:"
-
-#: plugins/instances/init.php:229
-#: plugins/instances/init.php:313
-#: plugins/instances/init.php:417
-msgid "Access key"
-msgstr "Ulaşım anahtarı"
-
-#: plugins/instances/init.php:233
-#: plugins/instances/init.php:421
-msgid "Use one access key for both linked instances."
-msgstr "Her iki bağlanmış olgu için tek bir erişim anahtarı kullanın."
-
-#: plugins/instances/init.php:241
-#: plugins/instances/init.php:429
-msgid "Generate new key"
-msgstr "Yeni anahtar üret"
-
-#: plugins/instances/init.php:292
-msgid "Link instance"
-msgstr "Olgu bağlantısı ekle"
-
-#: plugins/instances/init.php:304
-msgid "You can connect other instances of Tiny Tiny RSS to this one to share Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
-msgstr "Popüler yazıları paylaşma amaçlı olarak Tiny Tiny RSS'in diğer kurulumlara bağlayabilirsiniz. Linkteki adresi kullanarak olgu bağlantısı yaratın:"
-
-#: plugins/instances/init.php:314
-msgid "Last connected"
-msgstr "Son bağlantı"
-
-#: plugins/instances/init.php:315
-msgid "Status"
-msgstr "Durum"
-
-#: plugins/instances/init.php:316
-msgid "Stored feeds"
-msgstr "Kaydedilmiş özet akışları"
-
-#: plugins/instances/init.php:433
-msgid "Create link"
-msgstr "Bağlantı üret"
-
-#: plugins/nsfw/init.php:30
-#: plugins/nsfw/init.php:42
-msgid "Not work safe (click to toggle)"
-msgstr "Emniyetli çalışmıyor (değiştirmek için tıklayın) "
-
-#: plugins/nsfw/init.php:52
-msgid "NSFW Plugin"
-msgstr "NSFW eklentisi"
-
-#: plugins/nsfw/init.php:79
-msgid "Tags to consider NSFW (comma-separated)"
-msgstr "NSFW için düşünülen etiketler (virgülle ayrılmış)"
-
-#: plugins/nsfw/init.php:100
-msgid "Configuration saved."
-msgstr "Konfigürasyon kaydedildi."
-
-#: plugins/note/init.php:26
-#: plugins/note/note.js:11
-msgid "Edit article note"
-msgstr "Yazı notunu düzenle"
-
-#: plugins/vf_shared/init.php:16
-#: plugins/vf_shared/init.php:69
-msgid "Shared articles"
-msgstr "Paylaşılmış yazılar"
-
-#: plugins/auth_internal/init.php:65
-msgid "Please enter your one time password:"
-msgstr "Lütfen tek seferlik şifrenizi girin:"
-
-#: plugins/auth_internal/init.php:188
-msgid "Password has been changed."
-msgstr "Şifre değiştirildi."
-
-#: plugins/auth_internal/init.php:190
-msgid "Old password is incorrect."
-msgstr "Eski şifreniz yanlış."
-
-#: plugins/af_readability/init.php:21
-msgid "Data saved."
-msgstr ""
-
-#: plugins/af_readability/init.php:33
-#, fuzzy
-msgid "Inline content"
-msgstr "Yazı notunu düzenle"
-
-#: plugins/af_readability/init.php:39
-msgid "Readability settings (af_readability)"
-msgstr ""
-
-#: plugins/af_readability/init.php:66
-msgid "Use Readability for pages shared via bookmarklet."
-msgstr ""
-
-#: plugins/af_readability/init.php:78
-#: plugins/af_psql_trgm/init.php:191
-msgid "Currently enabled for (click to edit):"
-msgstr ""
-
-#: plugins/af_readability/init.php:95
-#, fuzzy
-msgid "Readability"
-msgstr "Kullanılırlığını kontrol et"
-
-#: plugins/af_readability/init.php:106
-#, fuzzy
-msgid "Inline article content"
-msgstr "Yazı notunu düzenle"
+#: classes/feeds.php:1596
+msgid "Starred articles"
+msgstr "Favori yazılar"
 
-#: plugins/af_redditimgur/init.php:25
-msgid "Reddit content settings (af_redditimgur)"
-msgstr ""
+#: classes/feeds.php:1598
+msgid "Published articles"
+msgstr "Yayınlanmış yazılar"
 
-#: plugins/af_redditimgur/init.php:50
-msgid "Uses Readability (full-text-rss) implementation by <a target='_blank' href='https://bitbucket.org/fivefilters/'>FiveFilters.org</a>"
-msgstr ""
+#: classes/feeds.php:1600
+msgid "Fresh articles"
+msgstr "Tazeler"
 
-#: plugins/af_redditimgur/init.php:54
-msgid "Extract missing content using Readability"
-msgstr ""
+#: classes/feeds.php:1604
+msgid "Archived articles"
+msgstr "Arşivlenmiş yazılar"
 
-#: plugins/af_redditimgur/init.php:59
-msgid "Enable additional duplicate checking"
-msgstr ""
+#: classes/feeds.php:1606
+msgid "Recently read"
+msgstr "Yakın zamanda okunanlar"
 
-#: plugins/af_redditimgur/init.php:73
-#: plugins/af_zz_imgproxy/init.php:225
-#, fuzzy
-msgid "Configuration saved"
-msgstr "Konfigürasyon kaydedildi."
+#: classes/feeds.php:1716
+msgid "Special"
+msgstr "Özet"
 
-#: plugins/af_psql_trgm/init.php:28
+#: classes/feeds.php:1962
 #, php-format
-msgid "Data saved (%s, %d)"
-msgstr ""
+msgid "Search results: %s"
+msgstr "Arama sonuçları: %s"
 
-#: plugins/af_psql_trgm/init.php:112
-#, fuzzy
-msgid "Show related articles"
+#: plugins/vf_shared/init.php:16
+#: plugins/vf_shared/init.php:60
+msgid "Shared articles"
 msgstr "Paylaşılmış yazılar"
 
-#: plugins/af_psql_trgm/init.php:118
-#: plugins/af_psql_trgm/init.php:220
-#, fuzzy
-msgid "Mark similar articles as read"
-msgstr "Tüm yazıları okundu işaretle?"
-
-#: plugins/af_psql_trgm/init.php:157
-msgid "PostgreSQL trigram extension returns string similarity as a floating point number (0-1). Setting it too low might produce false positives, zero disables checking."
-msgstr ""
-
-#: plugins/af_psql_trgm/init.php:160
-#, fuzzy
-msgid "Global settings"
-msgstr "Ayarları dahil et"
-
-#: plugins/af_psql_trgm/init.php:164
-msgid "Minimum similarity:"
-msgstr ""
-
-#: plugins/af_psql_trgm/init.php:169
-msgid "Minimum title length:"
-msgstr ""
-
-#: plugins/af_psql_trgm/init.php:174
-#, fuzzy
-msgid "Enable for all feeds:"
-msgstr "Özet akışı kategorilerini etkinleştir"
-
-#: plugins/af_psql_trgm/init.php:209
-msgid "Similarity (pg_trgm)"
-msgstr ""
-
-#: plugins/af_comics/init.php:40
-msgid "Feeds supported by af_comics"
-msgstr ""
-
-#: plugins/af_comics/init.php:42
-msgid "The following comics are currently supported:"
-msgstr ""
-
-#: plugins/af_comics/init.php:60
-msgid "GoComics requires a specific URL to workaround their lack of feed support: <code>http://feeds.feedburner.com/uclick/<em>comic_name</em></code> (e.g. <code>http://www.gocomics.com/garfield</code> uses <code>http://feeds.feedburner.com/uclick/garfield</code>)."
-msgstr ""
-
 #: plugins/import_export/init.php:58
 msgid "Import and export"
 msgstr "İçe alma ve dışa aktarma"
@@ -2677,96 +2452,83 @@ msgstr "Verilerimi dışa aktar"
 msgid "Import"
 msgstr "İçe aktar"
 
-#: plugins/import_export/init.php:225
+#: plugins/import_export/init.php:231
 msgid "Could not import: incorrect schema version."
 msgstr "İçe aktarılamadı: doğru olmayan şema versiyonu"
 
-#: plugins/import_export/init.php:230
+#: plugins/import_export/init.php:236
 msgid "Could not import: unrecognized document format."
 msgstr "İçe aktarılamadı: tanınmayan dosya formatı"
 
-#: plugins/import_export/init.php:391
+#: plugins/import_export/init.php:397
 msgid "Finished: "
 msgstr "Tamamlandı:"
 
-#: plugins/import_export/init.php:392
+#: plugins/import_export/init.php:398
 #, fuzzy, php-format
 msgid "%d article processed, "
 msgid_plural "%d articles processed, "
 msgstr[0] "%d yazı işlendi,"
 msgstr[1] "%d yazı işlendi,"
 
-#: plugins/import_export/init.php:393
+#: plugins/import_export/init.php:399
 #, fuzzy, php-format
 msgid "%d imported, "
 msgid_plural "%d imported, "
 msgstr[0] "% içe aktarıldı"
 msgstr[1] "% içe aktarıldı"
 
-#: plugins/import_export/init.php:394
+#: plugins/import_export/init.php:400
 #, php-format
 msgid "%d feed created."
 msgid_plural "%d feeds created."
 msgstr[0] "%d özet akışı tanımlandı."
 msgstr[1] "%d özet akışları tanımlandı."
 
-#: plugins/import_export/init.php:399
+#: plugins/import_export/init.php:405
 msgid "Could not load XML document."
 msgstr "XML dokümanı yüklenemedi."
 
-#: plugins/import_export/init.php:411
+#: plugins/import_export/init.php:417
 msgid "Prepare data"
 msgstr "Verileri hazırla"
 
-#: plugins/import_export/init.php:428
+#: plugins/import_export/init.php:434
 #, fuzzy, php-format
 msgid "Upload failed with error code %d (%s)"
 msgstr "Yükleme başarısız oldu hata kodu %d"
 
-#: plugins/import_export/init.php:454
+#: plugins/import_export/init.php:460
 msgid "No file uploaded."
 msgstr "Dosya yüklenemedi."
 
-#: plugins/mail/init.php:28
-msgid "Mail addresses saved."
-msgstr ""
-
-#: plugins/mail/init.php:34
-#, fuzzy
-msgid "Mail plugin"
-msgstr "Kullanıcı eklentileri"
-
-#: plugins/mail/init.php:36
-msgid "You can set predefined email addressed here (comma-separated list):"
-msgstr ""
-
+#: plugins/mailto/init.php:48
+#: plugins/mailto/init.php:54
 #: plugins/mail/init.php:112
 #: plugins/mail/init.php:118
-#: plugins/mailto/init.php:49
-#: plugins/mailto/init.php:55
 msgid "[Forwarded]"
 msgstr "[İletildi]"
 
+#: plugins/mailto/init.php:48
 #: plugins/mail/init.php:112
-#: plugins/mailto/init.php:49
 msgid "Multiple articles"
 msgstr "Birçok yazı"
 
-#: plugins/mail/init.php:140
-msgid "To:"
-msgstr "Kime:"
+#: plugins/mailto/init.php:70
+msgid "Clicking the following link to invoke your mail client:"
+msgstr "E-posta işlemcinizi çağırmak için bu linke tıklayın:"
 
-#: plugins/mail/init.php:155
-msgid "Subject:"
-msgstr "Başlık:"
+#: plugins/mailto/init.php:74
+msgid "Forward selected article(s) by email."
+msgstr "Seçilmiş yazıları e-posta ile iletin."
 
-#: plugins/mail/init.php:172
-msgid "Send e-mail"
-msgstr "E-posta yolla"
+#: plugins/mailto/init.php:77
+msgid "You should be able to edit the message before sending in your mail client."
+msgstr "Mesajı e-posta uygulamanıza göndermeden önce düzenleyebilirsiniz. "
 
-#: plugins/close_button/init.php:22
-msgid "Close article"
-msgstr "Yazıyı kapat"
+#: plugins/mailto/init.php:82
+msgid "Close this dialog"
+msgstr "Bu ekranı kapatın"
 
 #: plugins/bookmarklets/init.php:20
 msgid "Bookmarklets"
@@ -2789,34 +2551,125 @@ msgstr "Tiny Tiny RSS ile abone ol"
 msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
 msgstr "Tiny Tiny RSS'i kullanarak yazılar yayınlamak için bu bookmarklet'i kullanın"
 
+#: plugins/af_psql_trgm/init.php:28
+#, php-format
+msgid "Data saved (%s, %d)"
+msgstr ""
+
+#: plugins/af_psql_trgm/init.php:112
+#, fuzzy
+msgid "Show related articles"
+msgstr "Paylaşılmış yazılar"
+
+#: plugins/af_psql_trgm/init.php:118
+#: plugins/af_psql_trgm/init.php:220
+#, fuzzy
+msgid "Mark similar articles as read"
+msgstr "Tüm yazıları okundu işaretle?"
+
+#: plugins/af_psql_trgm/init.php:157
+msgid "PostgreSQL trigram extension returns string similarity as a floating point number (0-1). Setting it too low might produce false positives, zero disables checking."
+msgstr ""
+
+#: plugins/af_psql_trgm/init.php:160
+#, fuzzy
+msgid "Global settings"
+msgstr "Ayarları dahil et"
+
+#: plugins/af_psql_trgm/init.php:164
+msgid "Minimum similarity:"
+msgstr ""
+
+#: plugins/af_psql_trgm/init.php:169
+msgid "Minimum title length:"
+msgstr ""
+
+#: plugins/af_psql_trgm/init.php:174
+#, fuzzy
+msgid "Enable for all feeds:"
+msgstr "Özet akışı kategorilerini etkinleştir"
+
+#: plugins/af_psql_trgm/init.php:191
+#: plugins/af_readability/init.php:78
+msgid "Currently enabled for (click to edit):"
+msgstr ""
+
+#: plugins/af_psql_trgm/init.php:209
+msgid "Similarity (pg_trgm)"
+msgstr ""
+
+#: plugins/nsfw/init.php:30
+#: plugins/nsfw/init.php:42
+msgid "Not work safe (click to toggle)"
+msgstr "Emniyetli çalışmıyor (değiştirmek için tıklayın) "
+
+#: plugins/nsfw/init.php:52
+msgid "NSFW Plugin"
+msgstr "NSFW eklentisi"
+
+#: plugins/nsfw/init.php:79
+msgid "Tags to consider NSFW (comma-separated)"
+msgstr "NSFW için düşünülen etiketler (virgülle ayrılmış)"
+
+#: plugins/nsfw/init.php:100
+msgid "Configuration saved."
+msgstr "Konfigürasyon kaydedildi."
+
 #: plugins/toggle_sidebar/init.php:23
 msgid "Collapse feedlist"
 msgstr "Özet akışı listesini kapat"
 
-#: plugins/af_zz_imgproxy/init.php:186
-msgid "Image proxy settings (af_zz_imgproxy)"
+#: plugins/af_readability/init.php:21
+msgid "Data saved."
 msgstr ""
 
-#: plugins/af_zz_imgproxy/init.php:211
+#: plugins/af_readability/init.php:33
 #, fuzzy
-msgid "Enable proxy for all remote images."
-msgstr "Özet akışı kategorilerini etkinleştir"
+msgid "Inline content"
+msgstr "Yazı notunu düzenle"
 
-#: plugins/mailto/init.php:71
-msgid "Clicking the following link to invoke your mail client:"
-msgstr "E-posta işlemcinizi çağırmak için bu linke tıklayın:"
+#: plugins/af_readability/init.php:39
+msgid "Readability settings (af_readability)"
+msgstr ""
 
-#: plugins/mailto/init.php:75
-msgid "Forward selected article(s) by email."
-msgstr "Seçilmiş yazıları e-posta ile iletin."
+#: plugins/af_readability/init.php:66
+msgid "Use Readability for pages shared via bookmarklet."
+msgstr ""
 
-#: plugins/mailto/init.php:78
-msgid "You should be able to edit the message before sending in your mail client."
-msgstr "Mesajı e-posta uygulamanıza göndermeden önce düzenleyebilirsiniz. "
+#: plugins/af_readability/init.php:95
+#, fuzzy
+msgid "Readability"
+msgstr "Kullanılırlığını kontrol et"
 
-#: plugins/mailto/init.php:83
-msgid "Close this dialog"
-msgstr "Bu ekranı kapatın"
+#: plugins/af_readability/init.php:106
+#, fuzzy
+msgid "Inline article content"
+msgstr "Yazı notunu düzenle"
+
+#: plugins/mail/init.php:28
+msgid "Mail addresses saved."
+msgstr ""
+
+#: plugins/mail/init.php:34
+#, fuzzy
+msgid "Mail plugin"
+msgstr "Kullanıcı eklentileri"
+
+#: plugins/mail/init.php:36
+msgid "You can set predefined email addressed here (comma-separated list):"
+msgstr ""
+
+#: plugins/mail/init.php:140
+msgid "To:"
+msgstr "Kime:"
+
+#: plugins/mail/init.php:155
+msgid "Subject:"
+msgstr "Başlık:"
+
+#: plugins/mail/init.php:172
+msgid "Send e-mail"
+msgstr "E-posta yolla"
 
 #: plugins/share/init.php:39
 msgid "You can disable all articles shared by unique URLs here."
@@ -2830,24 +2683,97 @@ msgstr "Tüm yazı paylaşımlarını iptal et"
 msgid "Share by URL"
 msgstr "İnternet adresi ile paylaş"
 
-#: plugins/share/init.php:97
+#: plugins/share/init.php:96
 msgid "You can share this article by the following unique URL:"
 msgstr "Bu yazıyı bu internet adresi ile paylaşabilirsiniz:"
 
-#: plugins/share/init.php:115
+#: plugins/share/init.php:114
 msgid "Unshare article"
 msgstr "Bu yazı paylaşımını iptal et"
 
+#: plugins/af_comics/init.php:48
+msgid "Feeds supported by af_comics"
+msgstr ""
+
+#: plugins/af_comics/init.php:50
+msgid "The following comics are currently supported:"
+msgstr ""
+
+#: plugins/af_comics/init.php:68
+msgid "GoComics requires a specific URL to workaround their lack of feed support: <code>http://feeds.feedburner.com/uclick/<em>comic_name</em></code> (e.g. <code>http://www.gocomics.com/garfield</code> uses <code>http://feeds.feedburner.com/uclick/garfield</code>)."
+msgstr ""
+
+#: plugins/af_comics/init.php:70
+msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:25
+msgid "Reddit content settings (af_redditimgur)"
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:50
+msgid "Uses Readability (full-text-rss) implementation by <a target='_blank' href='https://bitbucket.org/fivefilters/'>FiveFilters.org</a>"
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:54
+msgid "Extract missing content using Readability"
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:59
+msgid "Enable additional duplicate checking"
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:73
+#: plugins/af_zz_imgproxy/init.php:254
+#, fuzzy
+msgid "Configuration saved"
+msgstr "Konfigürasyon kaydedildi."
+
+#: plugins/note/init.php:26
+#: plugins/note/note.js:11
+msgid "Edit article note"
+msgstr "Yazı notunu düzenle"
+
+#: plugins/close_button/init.php:25
+msgid "Close article"
+msgstr "Yazıyı kapat"
+
+#: plugins/af_zz_imgproxy/init.php:210
+msgid "Image proxy settings (af_zz_imgproxy)"
+msgstr ""
+
+#: plugins/af_zz_imgproxy/init.php:234
+#, fuzzy
+msgid "Enable proxy for all remote images."
+msgstr "Özet akışı kategorilerini etkinleştir"
+
+#: plugins/af_zz_imgproxy/init.php:238
+#, fuzzy
+msgid "Don't cache files locally."
+msgstr "Resimleri sunucuda sakla"
+
+#: plugins/auth_internal/init.php:65
+msgid "Please enter your one time password:"
+msgstr "Lütfen tek seferlik şifrenizi girin:"
+
+#: plugins/auth_internal/init.php:188
+msgid "Password has been changed."
+msgstr "Şifre değiştirildi."
+
+#: plugins/auth_internal/init.php:190
+msgid "Old password is incorrect."
+msgstr "Eski şifreniz yanlış."
+
 #: js/FeedTree.js:172
 #, fuzzy
 msgid "(Un)collapse"
 msgstr "Kenar çubuğunu aç/kapa"
 
-#: js/PrefFeedTree.js:52
+#: js/PrefFeedTree.js:54
 msgid "Edit category"
 msgstr "Kategoriyi düzenle"
 
-#: js/PrefFeedTree.js:59
+#: js/PrefFeedTree.js:61
 msgid "Remove category"
 msgstr "Kategoriyi kaldır"
 
@@ -2882,63 +2808,55 @@ msgid "Create Filter"
 msgstr "Filtre tanımla"
 
 #: js/functions.js:1128
-msgid "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification hub again on next feed update."
-msgstr "Abonelik tekrar kurulsun mu? Tiny Tiny RSS bir sonraki özet akışı yenilemesinde tekrar abone olmaya çalışacak."
-
-#: js/functions.js:1139
-msgid "Subscription reset."
-msgstr "Abonelik tekrar kuruldu."
-
-#: js/functions.js:1149
-#: js/tt-rss.js:695
+#: js/tt-rss.js:696
 #, perl-format
 msgid "Unsubscribe from %s?"
 msgstr "%s abonelikten ayrıl?"
 
-#: js/functions.js:1152
+#: js/functions.js:1131
 msgid "Removing feed..."
 msgstr "Özet akışı siliniyor..."
 
-#: js/functions.js:1225
+#: js/functions.js:1204
 msgid "Please enter category title:"
 msgstr "Lütfen kategori ismi giriniz:"
 
-#: js/functions.js:1250
+#: js/functions.js:1229
 msgid "Generate new syndication address for this feed?"
 msgstr "Bu özet akışı için yeni bir sendikasyon adresi üretilsin mi?"
 
-#: js/functions.js:1254
-#: js/prefs.js:1154
+#: js/functions.js:1233
+#: js/prefs.js:1150
 msgid "Trying to change address..."
 msgstr "Adres değiştirilmeye çalışılınıyor..."
 
-#: js/functions.js:1497
-#: js/functions.js:1606
+#: js/functions.js:1476
+#: js/functions.js:1585
 #: js/prefs.js:398
 #: js/prefs.js:424
 #: js/prefs.js:456
 #: js/prefs.js:599
 #: js/prefs.js:617
-#: js/prefs.js:1136
-#: js/prefs.js:1263
+#: js/prefs.js:1132
+#: js/prefs.js:1259
 msgid "No feeds are selected."
 msgstr "Hiçbir özet akışı seçilmedi."
 
-#: js/functions.js:1540
+#: js/functions.js:1519
 msgid "Remove selected feeds from the archive? Feeds with stored articles will not be removed."
 msgstr "Seçilen özet akışları arşivden kaldırılsın mı? İçinde kaydedilmiş yazı olan özet akışları kaldırılmayacaktır."
 
-#: js/functions.js:1577
+#: js/functions.js:1556
 msgid "Feeds with update errors"
 msgstr "Yenileme hatası veren özet akışları"
 
-#: js/functions.js:1588
-#: js/prefs.js:1117
+#: js/functions.js:1567
+#: js/prefs.js:1113
 msgid "Remove selected feeds?"
 msgstr "Seçilen özet akışları kaldırılsın mı?"
 
-#: js/functions.js:1591
-#: js/prefs.js:1120
+#: js/functions.js:1570
+#: js/prefs.js:1116
 msgid "Removing selected feeds..."
 msgstr "Seçilen özet akışları kaldırılıyor..."
 
@@ -2961,9 +2879,7 @@ msgstr "Kullanıcı editörü"
 #: js/prefs.js:100
 #: js/prefs.js:209
 #: js/prefs.js:706
-#: plugins/instances/instances.js:26
-#: plugins/instances/instances.js:89
-#: js/functions.js:1408
+#: js/functions.js:1387
 msgid "Saving data..."
 msgstr "Veri kaydediliyor..."
 
@@ -2988,7 +2904,7 @@ msgid "Removing selected labels..."
 msgstr "Seçilen arama başlıkları kaldırılıyor..."
 
 #: js/prefs.js:308
-#: js/prefs.js:1304
+#: js/prefs.js:1300
 msgid "No labels are selected."
 msgstr "Hiçbir arama başlığı seçilmedi."
 
@@ -3087,28 +3003,28 @@ msgstr "Seçilen özet akışları için değişiklikler kaydedilsin mi?"
 msgid "OPML Import"
 msgstr "OPML içe aktarma"
 
-#: js/prefs.js:764
+#: js/prefs.js:759
 msgid "Please choose an OPML file first."
 msgstr "Lütfen önce bir OPML dosyası seçin"
 
-#: js/prefs.js:767
+#: js/prefs.js:762
 #: plugins/import_export/import_export.js:115
 msgid "Importing, please wait..."
 msgstr "İçe aktarılıyor, lütfen bekleyin..."
 
-#: js/prefs.js:928
+#: js/prefs.js:924
 msgid "Reset to defaults?"
 msgstr "Öntanımlı ayarlara geri dönülsün mü?"
 
-#: js/prefs.js:1628
+#: js/prefs.js:1624
 msgid "Subscribing to feeds..."
 msgstr "Özet akışlarına abone olunuyor..."
 
-#: js/prefs.js:1647
+#: js/prefs.js:1643
 msgid "Clear stored data for this plugin?"
 msgstr "Bu eklenti için kaydedilmiş veriler silinsin mi?"
 
-#: js/prefs.js:1661
+#: js/prefs.js:1657
 msgid "Clear all messages in the error log?"
 msgstr "Hata günlüğündeki tüm mesajlar silinsin mi?"
 
@@ -3120,180 +3036,150 @@ msgstr "Tüm yazıları okundu işaretle?"
 msgid "Marking all feeds as read..."
 msgstr "Tüm yazılar okundu olarak işaretleniyor..."
 
-#: js/tt-rss.js:401
+#: js/tt-rss.js:402
 msgid "Please enable mail plugin first."
 msgstr "Lütfen önce e-posta eklentisini aktif hale getirin."
 
-#: js/tt-rss.js:449
-#: js/functions.js:1387
-#: js/tt-rss.js:676
+#: js/tt-rss.js:450
+#: js/functions.js:1366
+#: js/tt-rss.js:677
 msgid "You can't edit this kind of feed."
 msgstr "Bu türde bir özet akışını düzenleyemezsiniz."
 
-#: js/tt-rss.js:530
+#: js/tt-rss.js:531
 msgid "Please enable embed_original plugin first."
 msgstr "Lütfen önce embed_original eklentisini aktif hale getirin."
 
-#: js/tt-rss.js:543
-#: js/tt-rss.js:726
+#: js/tt-rss.js:544
+#: js/tt-rss.js:727
 msgid "Widescreen is not available in combined mode."
 msgstr ""
 
-#: js/tt-rss.js:824
+#: js/tt-rss.js:825
 msgid "You can't rescore this kind of feed."
 msgstr "Bu tipte bir özet akışını tekrar skorlayamazsınız."
 
-#: js/tt-rss.js:829
-#: js/tt-rss.js:689
+#: js/tt-rss.js:830
+#: js/tt-rss.js:690
 msgid "Please select some feed first."
 msgstr "Lütfen önce özet akışı seçin."
 
-#: js/tt-rss.js:834
+#: js/tt-rss.js:835
 #, perl-format
 msgid "Rescore articles in %s?"
 msgstr "%s'deki yazılar tekrar skorlansın mı?"
 
-#: js/tt-rss.js:837
+#: js/tt-rss.js:838
 msgid "Rescoring articles..."
 msgstr "Yazılar tekrar skorlanıyor..."
 
-#: js/viewfeed.js:919
-#: js/viewfeed.js:957
-#: js/viewfeed.js:1005
-#: js/viewfeed.js:1931
-#: plugins/mail/mail.js:7
+#: js/viewfeed.js:921
+#: js/viewfeed.js:959
+#: js/viewfeed.js:1007
+#: js/viewfeed.js:1933
 #: plugins/mailto/init.js:7
-#: js/viewfeed.js:677
-#: js/viewfeed.js:699
-#: js/viewfeed.js:720
-#: js/viewfeed.js:779
-#: js/viewfeed.js:807
+#: plugins/mail/mail.js:7
+#: js/viewfeed.js:679
+#: js/viewfeed.js:701
+#: js/viewfeed.js:722
+#: js/viewfeed.js:781
+#: js/viewfeed.js:809
 msgid "No articles are selected."
 msgstr "Hiç yazı seçilmedi."
 
-#: js/viewfeed.js:927
+#: js/viewfeed.js:929
 #, fuzzy, perl-format
 msgid "Delete %d selected article in %s?"
 msgid_plural "Delete %d selected articles in %s?"
 msgstr[0] "%s'de seçilen %d yazı silinsin mi? "
 msgstr[1] "%s'de seçilen %d yazı silinsin mi? "
 
-#: js/viewfeed.js:929
+#: js/viewfeed.js:931
 #, fuzzy, perl-format
 msgid "Delete %d selected article?"
 msgid_plural "Delete %d selected articles?"
 msgstr[0] "Seçilen %d yazı silinsin mi?"
 msgstr[1] "Seçilen %d yazı silinsin mi?"
 
-#: js/viewfeed.js:966
+#: js/viewfeed.js:968
 #, fuzzy, perl-format
 msgid "Archive %d selected article in %s?"
 msgid_plural "Archive %d selected articles in %s?"
 msgstr[0] "%s'de seçilen %d yazı arşivlensin mi?"
 msgstr[1] "%s'de seçilen %d yazı arşivlensin mi?"
 
-#: js/viewfeed.js:969
+#: js/viewfeed.js:971
 #, fuzzy, perl-format
 msgid "Move %d archived article back?"
 msgid_plural "Move %d archived articles back?"
 msgstr[0] "Arşivden %d yazı taşınsın mı?"
 msgstr[1] "Arşivden %d yazı taşınsın mı?"
 
-#: js/viewfeed.js:971
+#: js/viewfeed.js:973
 msgid "Please note that unstarred articles might get purged on next feed update."
 msgstr "favori olarak işaretlenmemiş yazılar bir sonraki özet akışı yenilemesinde silinebilir."
 
-#: js/viewfeed.js:1011
+#: js/viewfeed.js:1013
 #, fuzzy, perl-format
 msgid "Mark %d selected article in %s as read?"
 msgid_plural "Mark %d selected articles in %s as read?"
 msgstr[0] "%s'de %d yazı okunmuş olarak işaretlensin mi?"
 msgstr[1] "%s'de %d yazı okunmuş olarak işaretlensin mi?"
 
-#: js/viewfeed.js:1031
+#: js/viewfeed.js:1033
 msgid "Edit article Tags"
 msgstr "Yazı etiketlerini düzenle"
 
-#: js/viewfeed.js:1037
+#: js/viewfeed.js:1039
 msgid "Saving article tags..."
 msgstr "Yazı etiketlerini kaydediyor..."
 
-#: js/viewfeed.js:1670
+#: js/viewfeed.js:1672
 msgid "Open original article"
 msgstr "Yazının aslını aç"
 
-#: js/viewfeed.js:1677
+#: js/viewfeed.js:1679
 msgid "Display article URL"
 msgstr "Yazı adresini göster "
 
-#: js/viewfeed.js:1787
+#: js/viewfeed.js:1789
 msgid "Assign label"
 msgstr "Arama başlığı tayin et"
 
-#: js/viewfeed.js:1792
+#: js/viewfeed.js:1794
 msgid "Remove label"
 msgstr "Arama başlığını kaldır"
 
-#: js/viewfeed.js:1824
+#: js/viewfeed.js:1826
 #, fuzzy
 msgid "Select articles in group"
 msgstr "İmleç altındaki yazıyı seç"
 
-#: js/viewfeed.js:1834
+#: js/viewfeed.js:1836
 #, fuzzy
 msgid "Mark group as read"
 msgstr "Okundu olarak işaretle"
 
-#: js/viewfeed.js:1846
+#: js/viewfeed.js:1848
 #, fuzzy
 msgid "Mark feed as read"
 msgstr "Tüm özet akışlarını okundu işaretle"
 
-#: js/viewfeed.js:1899
+#: js/viewfeed.js:1901
 msgid "Please enter new score for selected articles:"
 msgstr "Seçilen yazılar için yeni skor girin:"
 
-#: js/viewfeed.js:1962
+#: js/viewfeed.js:1964
 msgid "Please enter new score for this article:"
 msgstr "Bu yazı için yeni skor girin:"
 
-#: js/viewfeed.js:1993
+#: js/viewfeed.js:1995
 msgid "Article URL:"
 msgstr "Yazı adresi:"
 
-#: plugins/instances/instances.js:10
-msgid "Link Instance"
-msgstr "Olguyu bağla"
-
-#: plugins/instances/instances.js:73
-msgid "Edit Instance"
-msgstr "Olguyu düzenle"
-
-#: plugins/instances/instances.js:122
-msgid "Remove selected instances?"
-msgstr "Seçilen olgular kaldırılsın mı?"
-
-#: plugins/instances/instances.js:125
-msgid "Removing selected instances..."
-msgstr "Seçilen olgular kaldırılıyor..."
-
-#: plugins/instances/instances.js:139
-#: plugins/instances/instances.js:151
-msgid "No instances are selected."
-msgstr "Hiçbir olgu seçilmedi."
-
-#: plugins/instances/instances.js:156
-msgid "Please select only one instance."
-msgstr "Lütfen sadece bir olgu seçin."
-
-#: plugins/note/note.js:17
-msgid "Saving article note..."
-msgstr "Not kaydediliyor..."
-
-#: plugins/af_psql_trgm/init.js:11
-#, fuzzy
-msgid "Related articles"
-msgstr "Paylaşılmış yazılar"
+#: plugins/embed_original/init.js:6
+msgid "Sorry, your browser does not support sandboxed iframes."
+msgstr "Üzgünüm, tarayıcınız sandboxed iframes'i desteklemiyor"
 
 #: plugins/import_export/import_export.js:13
 msgid "Export Data"
@@ -3314,11 +3200,16 @@ msgstr "Veriyi içe aktar"
 msgid "Please choose the file first."
 msgstr "Lütfen ilk önce dosyayı seçin."
 
-#: plugins/mail/mail.js:21
 #: plugins/mailto/init.js:21
+#: plugins/mail/mail.js:21
 msgid "Forward article by email"
 msgstr "Yazıyı e-posta ile yolla"
 
+#: plugins/af_psql_trgm/init.js:11
+#, fuzzy
+msgid "Related articles"
+msgstr "Paylaşılmış yazılar"
+
 #: plugins/mail/mail.js:36
 msgid "Error sending email:"
 msgstr ""
@@ -3328,10 +3219,6 @@ msgstr ""
 msgid "Your message has been sent."
 msgstr "Kişisel bilgileriniz kaydedildi."
 
-#: plugins/embed_original/init.js:6
-msgid "Sorry, your browser does not support sandboxed iframes."
-msgstr "Üzgünüm, tarayıcınız sandboxed iframes'i desteklemiyor"
-
 #: plugins/shorten_expanded/init.js:39
 msgid "Click to expand article"
 msgstr "Yazıyı genişletmek için tıklayın"
@@ -3361,7 +3248,7 @@ msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr "Bu daha önce paylaşılmış yazı internet adreslerini geçersiz kılacak. Devam edeyim mi?"
 
 #: plugins/share/share_prefs.js:6
-#: js/prefs.js:1437
+#: js/prefs.js:1433
 msgid "Clearing URLs..."
 msgstr "İnternet adresleri temizleniyor..."
 
@@ -3369,23 +3256,44 @@ msgstr "İnternet adresleri temizleniyor..."
 msgid "Shared URLs cleared."
 msgstr "Seçilen internet adresleri temizlendi."
 
+#: plugins/note/note.js:17
+msgid "Saving article note..."
+msgstr "Not kaydediliyor..."
+
 #: js/feedlist.js:429
-#: js/feedlist.js:496
 msgid "Mark all articles in %s as read?"
 msgstr "%s'deki tüm yazılar okundu işaretlensin mi?"
 
 #: js/feedlist.js:487
-msgid "Mark all articles in %s older than 1 day as read?"
+#, fuzzy
+msgid "Mark %w in %s older than 1 day as read?"
 msgstr "%s'deki 1 günden eski yazılar okundu işaretlensin mi?"
 
 #: js/feedlist.js:490
-msgid "Mark all articles in %s older than 1 week as read?"
+#, fuzzy
+msgid "Mark %w in %s older than 1 week as read?"
 msgstr "%s'deki 1 haftadan eski yazılar okundu işaretlensin mi?"
 
 #: js/feedlist.js:493
-msgid "Mark all articles in %s older than 2 weeks as read?"
+#, fuzzy
+msgid "Mark %w in %s older than 2 weeks as read?"
 msgstr "%s'deki 2 haftadan eski yazılar okundu işaretlensin mi?"
 
+#: js/feedlist.js:496
+#, fuzzy
+msgid "Mark %w in %s as read?"
+msgstr "%s'deki tüm yazılar okundu işaretlensin mi?"
+
+#: js/feedlist.js:499
+#, fuzzy
+msgid "search results"
+msgstr "Arama sonuçları: %s"
+
+#: js/feedlist.js:499
+#, fuzzy
+msgid "all articles"
+msgstr "Tüm yazılar"
+
 #: js/functions.js:506
 msgid "Error explained"
 msgstr "Hata açıklandı"
@@ -3466,180 +3374,249 @@ msgstr "Bu özet akışına zaten abonesiniz."
 msgid "Edit rule"
 msgstr "Kuralı düzenle"
 
-#: js/functions.js:1402
+#: js/functions.js:1381
 msgid "Edit Feed"
 msgstr "Özet akışını düzenle"
 
-#: js/functions.js:1435
+#: js/functions.js:1414
 msgid "More Feeds"
 msgstr "Daha fazla özet akışı"
 
-#: js/functions.js:1631
+#: js/functions.js:1610
 msgid "Help"
 msgstr "Yardım"
 
-#: js/prefs.js:1032
+#: js/prefs.js:1028
 msgid "Remove category %s? Any nested feeds would be placed into Uncategorized."
 msgstr "%s kategorisi kaldırılsın mı? İçinde bulunan özet akışları Kategorize Edilmemişlere eklenecek."
 
-#: js/prefs.js:1038
+#: js/prefs.js:1034
 msgid "Removing category..."
 msgstr "Kategori kaldırılıyor..."
 
-#: js/prefs.js:1056
+#: js/prefs.js:1052
 msgid "Remove selected categories?"
 msgstr "Seçilen kategoriler kaldırılsın mı?"
 
-#: js/prefs.js:1059
+#: js/prefs.js:1055
 msgid "Removing selected categories..."
 msgstr "Seçilen kategoriler kaldırılıyor..."
 
-#: js/prefs.js:1072
+#: js/prefs.js:1068
 msgid "No categories are selected."
 msgstr "Hiçbir kategori seçilmedi."
 
-#: js/prefs.js:1079
+#: js/prefs.js:1075
 msgid "Category title:"
 msgstr "Kategori başlığı:"
 
-#: js/prefs.js:1083
+#: js/prefs.js:1079
 msgid "Creating category..."
 msgstr "Kategori tanımlanıyor..."
 
-#: js/prefs.js:1106
+#: js/prefs.js:1102
 msgid "Feeds without recent updates"
 msgstr "Yakın zamanda yenilenmeyen özet akışları"
 
-#: js/prefs.js:1150
+#: js/prefs.js:1146
 msgid "Replace current OPML publishing address with a new one?"
 msgstr "Mevcut OPML yayınlama adresi yenisiyle değiştirilsin mi?"
 
-#: js/prefs.js:1227
+#: js/prefs.js:1223
 msgid "Clearing feed..."
 msgstr "Özet akışı temizleniyor..."
 
-#: js/prefs.js:1247
+#: js/prefs.js:1243
 msgid "Rescore articles in selected feeds?"
 msgstr "Yazılar tekrar skorlansın mı?"
 
-#: js/prefs.js:1250
+#: js/prefs.js:1246
 msgid "Rescoring selected feeds..."
 msgstr "Tekrar skorlanıyor..."
 
-#: js/prefs.js:1270
+#: js/prefs.js:1266
 msgid "Rescore all articles? This operation may take a lot of time."
 msgstr "Tüm yazılar tekrar skorlansın mı? Bu işlem uzun sürebilir."
 
-#: js/prefs.js:1273
+#: js/prefs.js:1269
 msgid "Rescoring feeds..."
 msgstr "Özet akışları tekrar skorlanıyor..."
 
-#: js/prefs.js:1289
+#: js/prefs.js:1285
 msgid "Reset selected labels to default colors?"
 msgstr "Seçilen arama başlıkları öntanımlı renklerine döndürülsün mü?"
 
-#: js/prefs.js:1321
+#: js/prefs.js:1317
 msgid "Settings Profiles"
 msgstr "Profil ayarları"
 
-#: js/prefs.js:1330
+#: js/prefs.js:1326
 msgid "Remove selected profiles? Active and default profiles will not be removed."
 msgstr "Seçilen profiller kaldırılsın mı? Aktif ve varsayılan profiller kaldırılmayacak."
 
-#: js/prefs.js:1333
+#: js/prefs.js:1329
 msgid "Removing selected profiles..."
 msgstr "Seçilen profiller kaldırılıyor..."
 
-#: js/prefs.js:1349
+#: js/prefs.js:1345
 msgid "No profiles are selected."
 msgstr "Hiçbir profil seçilmedi."
 
-#: js/prefs.js:1357
-#: js/prefs.js:1410
+#: js/prefs.js:1353
+#: js/prefs.js:1406
 msgid "Activate selected profile?"
 msgstr "Seçilen profil aktif hale getirilsin mi?"
 
-#: js/prefs.js:1374
-#: js/prefs.js:1426
+#: js/prefs.js:1370
+#: js/prefs.js:1422
 msgid "Please choose a profile to activate."
 msgstr "Lütfen aktif hale getirilecek profili seçin."
 
-#: js/prefs.js:1379
+#: js/prefs.js:1375
 msgid "Creating profile..."
 msgstr "Profil yaratılıyor..."
 
-#: js/prefs.js:1434
+#: js/prefs.js:1430
 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr "Bu daha önceden oluşturulmuş tüm özet akışı adreslerini geçersiz kılacak. Devam edilsin mi?"
 
-#: js/prefs.js:1444
+#: js/prefs.js:1440
 msgid "Generated URLs cleared."
 msgstr "Oluşturulan internet adresleri temizlendi."
 
-#: js/prefs.js:1516
+#: js/prefs.js:1512
 msgid "Label Editor"
 msgstr "Arama başlığı editörü"
 
-#: js/tt-rss.js:684
+#: js/tt-rss.js:685
 msgid "You can't unsubscribe from the category."
 msgstr "Kategori aboneliğinden ayrılamazsınız."
 
-#: js/viewfeed.js:125
-#: js/viewfeed.js:175
-#: js/viewfeed.js:192
+#: js/viewfeed.js:127
+#: js/viewfeed.js:177
+#: js/viewfeed.js:194
 #, fuzzy
 msgid "Click to open next unread feed."
 msgstr "Özet akışını düzenlemek için tıklayın"
 
-#: js/viewfeed.js:129
+#: js/viewfeed.js:131
 msgid "Cancel search"
 msgstr "Aramayı iptal et"
 
-#: js/viewfeed.js:189
+#: js/viewfeed.js:191
 #, fuzzy
 msgid "New articles found, reload feed to continue."
 msgstr "Yazı bulunamadı."
 
-#: js/viewfeed.js:424
+#: js/viewfeed.js:426
 msgid "Unstar article"
 msgstr "Favori işaretini kaldır"
 
-#: js/viewfeed.js:428
+#: js/viewfeed.js:430
 msgid "Star article"
 msgstr "Favori olarak işaretle"
 
-#: js/viewfeed.js:478
+#: js/viewfeed.js:480
 msgid "Unpublish article"
 msgstr "Yazıyı yayından kaldır"
 
-#: js/viewfeed.js:482
+#: js/viewfeed.js:484
 msgid "Publish article"
 msgstr "Yazıyı yayınla"
 
-#: js/viewfeed.js:622
+#: js/viewfeed.js:624
 #, fuzzy
 msgid "%d article selected"
 msgid_plural "%d articles selected"
 msgstr[0] "%d yazı seçildi"
 msgstr[1] "%d yazı seçildi"
 
-#: js/viewfeed.js:1286
+#: js/viewfeed.js:1288
 msgid "No article is selected."
 msgstr "Hiçbir yazı seçilmedi."
 
-#: js/viewfeed.js:1321
+#: js/viewfeed.js:1323
 msgid "No articles found to mark"
 msgstr "Hiçbir yazı bulunamadı. "
 
-#: js/viewfeed.js:1323
+#: js/viewfeed.js:1325
 #, fuzzy
 msgid "Mark %d article as read?"
 msgid_plural "Mark %d articles as read?"
 msgstr[0] "%d yazı okudu olarak işaretlensin mi?"
 msgstr[1] "%d yazı okudu olarak işaretlensin mi?"
 
-#~ msgid "Cache images locally"
-#~ msgstr "Resimleri sunucuda sakla"
+#~ msgid "Resubscribe to push updates"
+#~ msgstr "Push yenilemelere tekrar abone ol"
+
+#~ msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
+#~ msgstr "Push özet akışlarında PubSubHubbub abonelik durumunu tekrar kurar."
+
+#~ msgid "Download more plugins at tt-rss.org <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forums</a> or <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a>."
+#~ msgstr "Daha fazla ekletiyi şu adreslerde bulabilirsiniz:  tt-rss.org <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forums</a> ya da <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a>."
+
+#~ msgid "Linked"
+#~ msgstr "Olgu bağlantıları"
+
+#~ msgid "Instance"
+#~ msgstr "Olgu"
+
+#~ msgid "Instance URL"
+#~ msgstr "Olgu adresi"
+
+#~ msgid "Access key:"
+#~ msgstr "Ulaşım anahtarı:"
+
+#~ msgid "Access key"
+#~ msgstr "Ulaşım anahtarı"
+
+#~ msgid "Use one access key for both linked instances."
+#~ msgstr "Her iki bağlanmış olgu için tek bir erişim anahtarı kullanın."
+
+#~ msgid "Generate new key"
+#~ msgstr "Yeni anahtar üret"
+
+#~ msgid "Link instance"
+#~ msgstr "Olgu bağlantısı ekle"
+
+#~ msgid "You can connect other instances of Tiny Tiny RSS to this one to share Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
+#~ msgstr "Popüler yazıları paylaşma amaçlı olarak Tiny Tiny RSS'in diğer kurulumlara bağlayabilirsiniz. Linkteki adresi kullanarak olgu bağlantısı yaratın:"
+
+#~ msgid "Last connected"
+#~ msgstr "Son bağlantı"
+
+#~ msgid "Status"
+#~ msgstr "Durum"
+
+#~ msgid "Stored feeds"
+#~ msgstr "Kaydedilmiş özet akışları"
+
+#~ msgid "Create link"
+#~ msgstr "Bağlantı üret"
+
+#~ msgid "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification hub again on next feed update."
+#~ msgstr "Abonelik tekrar kurulsun mu? Tiny Tiny RSS bir sonraki özet akışı yenilemesinde tekrar abone olmaya çalışacak."
+
+#~ msgid "Subscription reset."
+#~ msgstr "Abonelik tekrar kuruldu."
+
+#~ msgid "Link Instance"
+#~ msgstr "Olguyu bağla"
+
+#~ msgid "Edit Instance"
+#~ msgstr "Olguyu düzenle"
+
+#~ msgid "Remove selected instances?"
+#~ msgstr "Seçilen olgular kaldırılsın mı?"
+
+#~ msgid "Removing selected instances..."
+#~ msgstr "Seçilen olgular kaldırılıyor..."
+
+#~ msgid "No instances are selected."
+#~ msgstr "Hiçbir olgu seçilmedi."
+
+#~ msgid "Please select only one instance."
+#~ msgstr "Lütfen sadece bir olgu seçin."
 
 #~ msgid "The error will be reported to the configured log destination."
 #~ msgstr "Hata konfigürasyonda belirtilen adrese yazılacaktır."
diff --git a/locale/zh_CN/LC_MESSAGES/messages.mo b/locale/zh_CN/LC_MESSAGES/messages.mo
index 167d61445..6c4ef1c04 100644
--- a/locale/zh_CN/LC_MESSAGES/messages.mo
+++ b/locale/zh_CN/LC_MESSAGES/messages.mo
diff --git a/locale/zh_CN/LC_MESSAGES/messages.po b/locale/zh_CN/LC_MESSAGES/messages.po
index c93db8079..47f7924fd 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: 2017-03-23 15:25+0300\n"
+"POT-Creation-Date: 2017-07-04 16:29+0300\n"
 "PO-Revision-Date: 2012-02-14 08:32+0000\n"
 "Last-Translator: Hao Wu\n"
 "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/tt-rss/language/zh_CN/)\n"
@@ -176,31 +176,30 @@ msgstr "未找到用户"
 #: prefs.php:118
 #: classes/backend.php:5
 #: classes/pref/labels.php:282
-#: classes/pref/feeds.php:1402
-#: classes/pref/filters.php:779
+#: classes/pref/filters.php:819
+#: classes/pref/feeds.php:1376
 #: js/feedlist.js:149
-#: js/functions.js:1131
-#: js/functions.js:1231
-#: js/functions.js:1478
+#: js/functions.js:1210
+#: js/functions.js:1457
 #: js/prefs.js:621
-#: js/prefs.js:818
-#: js/prefs.js:1648
-#: js/prefs.js:1663
-#: js/tt-rss.js:550
-#: js/viewfeed.js:1182
+#: js/prefs.js:813
+#: js/prefs.js:1644
+#: js/prefs.js:1659
+#: js/tt-rss.js:551
+#: js/viewfeed.js:1184
 #: plugins/import_export/import_export.js:17
 #: js/feedlist.js:467
-#: js/feedlist.js:512
+#: js/feedlist.js:515
 #: js/functions.js:372
 #: js/functions.js:630
-#: js/prefs.js:1360
-#: js/prefs.js:1413
-#: js/prefs.js:1452
-#: js/prefs.js:1465
-#: js/prefs.js:1476
-#: js/prefs.js:1491
-#: js/tt-rss.js:567
-#: js/viewfeed.js:762
+#: js/prefs.js:1356
+#: js/prefs.js:1409
+#: js/prefs.js:1448
+#: js/prefs.js:1461
+#: js/prefs.js:1472
+#: js/prefs.js:1487
+#: js/tt-rss.js:568
+#: js/viewfeed.js:764
 msgid "Loading, please wait..."
 msgstr "读取中，请稍候……"
 
@@ -217,13 +216,13 @@ msgid "All Articles"
 msgstr "全部文章"
 
 #: index.php:192
-#: include/functions2.php:107
+#: include/functions.php:1181
 #: classes/feeds.php:110
 msgid "Starred"
 msgstr "加星标的"
 
 #: index.php:193
-#: include/functions2.php:108
+#: include/functions.php:1182
 #: classes/feeds.php:111
 msgid "Published"
 msgstr "已发布"
@@ -264,7 +263,7 @@ msgstr "标题"
 
 #: index.php:209
 #: index.php:249
-#: include/functions2.php:95
+#: include/functions.php:1169
 #: classes/feeds.php:115
 #: js/FeedTree.js:138
 #: js/FeedTree.js:166
@@ -305,7 +304,7 @@ msgid "Feed actions:"
 msgstr "信息源操作："
 
 #: index.php:244
-#: classes/handler/public.php:672
+#: classes/handler/public.php:583
 msgid "Subscribe to feed..."
 msgstr "订阅信息源"
 
@@ -319,8 +318,8 @@ msgstr "为信息源重新评分"
 
 #: index.php:247
 #: classes/pref/feeds.php:785
-#: classes/pref/feeds.php:1357
-#: js/PrefFeedTree.js:78
+#: classes/pref/feeds.php:1331
+#: js/PrefFeedTree.js:80
 msgid "Unsubscribe"
 msgstr "取消订阅"
 
@@ -337,7 +336,7 @@ msgid "Other actions:"
 msgstr "其他操作："
 
 #: index.php:252
-#: include/functions2.php:81
+#: include/functions.php:1155
 #, fuzzy
 msgid "Toggle widescreen mode"
 msgstr "切换宽屏模式"
@@ -364,7 +363,7 @@ msgstr ""
 
 #: prefs.php:33
 #: prefs.php:136
-#: include/functions2.php:110
+#: include/functions.php:1184
 #: classes/pref/prefs.php:435
 msgid "Preferences"
 msgstr "偏好设置"
@@ -379,20 +378,19 @@ msgstr "退出偏好设置"
 
 #: prefs.php:139
 #: classes/pref/feeds.php:112
-#: classes/pref/feeds.php:1297
-#: classes/pref/feeds.php:1346
+#: classes/pref/feeds.php:1271
+#: classes/pref/feeds.php:1320
 msgid "Feeds"
 msgstr "信息源"
 
 #: prefs.php:142
-#: classes/pref/filters.php:248
+#: classes/pref/filters.php:273
 msgid "Filters"
 msgstr "过滤器"
 
 #: prefs.php:145
-#: include/functions.php:1327
-#: include/functions.php:1979
 #: classes/pref/labels.php:90
+#: classes/feeds.php:1718
 msgid "Labels"
 msgstr "预定义标签"
 
@@ -421,13 +419,13 @@ msgstr "新用户注册功能已被管理员禁用。"
 #: register.php:337
 #: register.php:347
 #: register.php:359
-#: classes/handler/public.php:742
-#: classes/handler/public.php:813
-#: classes/handler/public.php:911
-#: classes/handler/public.php:990
-#: classes/handler/public.php:1004
-#: classes/handler/public.php:1011
-#: classes/handler/public.php:1036
+#: classes/handler/public.php:653
+#: classes/handler/public.php:724
+#: classes/handler/public.php:822
+#: classes/handler/public.php:901
+#: classes/handler/public.php:915
+#: classes/handler/public.php:922
+#: classes/handler/public.php:947
 msgid "Return to Tiny Tiny RSS"
 msgstr "返回至 Tiny Tiny RSS"
 
@@ -444,12 +442,12 @@ msgid "Check availability"
 msgstr "检查可用性"
 
 #: register.php:229
-#: classes/handler/public.php:829
+#: classes/handler/public.php:740
 msgid "Email:"
 msgstr "电子邮箱："
 
 #: register.php:232
-#: classes/handler/public.php:834
+#: classes/handler/public.php:745
 msgid "How much is two plus two:"
 msgstr "二加二等于几："
 
@@ -477,18 +475,24 @@ msgstr "帐号创建成功。"
 msgid "New user registrations are currently closed."
 msgstr "用户注册功能目前没有启用。"
 
-#: update.php:67
+#: update.php:66
 #, fuzzy
 msgid "Tiny Tiny RSS data update script."
 msgstr "Tiny Tiny RSS 数据更新脚本。"
 
-#: include/digest.php:109
-#: include/functions.php:1336
-#: include/functions.php:1880
-#: include/functions.php:1965
-#: include/functions.php:1987
-#: classes/opml.php:421
+#: include/controls.php:83
+#: classes/pref/filters.php:242
+#: classes/pref/filters.php:253
+#: classes/pref/filters.php:544
+msgid "All feeds"
+msgstr "全部信息源"
+
+#: include/controls.php:134
+#: include/controls.php:316
 #: classes/pref/feeds.php:228
+#: classes/opml.php:486
+#: classes/feeds.php:1727
+#: classes/digest.php:113
 msgid "Uncategorized"
 msgstr "未分类"
 
@@ -502,420 +506,314 @@ msgstr[0] "%d 个存档的文章"
 msgid "No feeds found."
 msgstr "未找到信息源。"
 
-#: include/functions.php:1029
+#: include/functions.php:900
 #, php-format
 msgid "%d min"
 msgstr ""
 
-#: include/functions.php:1325
-#: include/functions.php:1977
-msgid "Special"
-msgstr "特殊区域"
-
-#: include/functions.php:1828
-#: classes/pref/filters.php:229
-#: classes/pref/filters.php:507
-msgid "All feeds"
-msgstr "全部信息源"
-
-#: include/functions.php:2032
-msgid "Starred articles"
-msgstr "加星标文章"
-
-#: include/functions.php:2034
-msgid "Published articles"
-msgstr "已发布文章"
-
-#: include/functions.php:2036
-msgid "Fresh articles"
-msgstr "最新更新的文章"
-
-#: include/functions.php:2038
-#: include/functions2.php:105
-msgid "All articles"
-msgstr "全部文章"
-
-#: include/functions.php:2040
-msgid "Archived articles"
-msgstr "存档的文章"
-
-#: include/functions.php:2042
-msgid "Recently read"
-msgstr "最近的阅读"
-
-#: include/functions2.php:57
+#: include/functions.php:1131
 msgid "Navigation"
 msgstr "导航"
 
-#: include/functions2.php:58
+#: include/functions.php:1132
 #, fuzzy
 msgid "Open next feed"
 msgstr "显示下一个信息源"
 
-#: include/functions2.php:59
+#: include/functions.php:1133
 msgid "Open previous feed"
 msgstr "显示前一个信息源"
 
-#: include/functions2.php:60
+#: include/functions.php:1134
 #, fuzzy
 msgid "Open next article"
 msgstr "显示下一篇文章"
 
-#: include/functions2.php:61
+#: include/functions.php:1135
 #, fuzzy
 msgid "Open previous article"
 msgstr "显示前一篇文章"
 
-#: include/functions2.php:62
+#: include/functions.php:1136
 msgid "Open next article (don't scroll long articles)"
 msgstr "显示下一篇文章 (不要在长文章中滚动)"
 
-#: include/functions2.php:63
+#: include/functions.php:1137
 msgid "Open previous article (don't scroll long articles)"
 msgstr "显示前一篇文章 (不要在长文章中滚动)"
 
-#: include/functions2.php:64
+#: include/functions.php:1138
 msgid "Move to next article (don't expand or mark read)"
 msgstr "跳转至下一篇文章 (不要展开或标记为已读)"
 
-#: include/functions2.php:65
+#: include/functions.php:1139
 msgid "Move to previous article (don't expand or mark read)"
 msgstr "跳转至前一篇文章 (不要展开或标记为已读)"
 
-#: include/functions2.php:66
+#: include/functions.php:1140
 msgid "Show search dialog"
 msgstr "显示搜索对话框"
 
-#: include/functions2.php:67
+#: include/functions.php:1141
 #, fuzzy
 msgid "Article"
 msgstr "全部文章"
 
-#: include/functions2.php:68
-#: js/viewfeed.js:1699
+#: include/functions.php:1142
+#: js/viewfeed.js:1701
 msgid "Toggle starred"
 msgstr "锁定加星标的项"
 
-#: include/functions2.php:69
-#: js/viewfeed.js:1711
+#: include/functions.php:1143
+#: js/viewfeed.js:1713
 msgid "Toggle published"
 msgstr "锁定发布的项"
 
-#: include/functions2.php:70
-#: js/viewfeed.js:1686
+#: include/functions.php:1144
+#: js/viewfeed.js:1688
 msgid "Toggle unread"
 msgstr "锁定未读项"
 
-#: include/functions2.php:71
+#: include/functions.php:1145
 msgid "Edit tags"
 msgstr "编辑自定义标签"
 
-#: include/functions2.php:72
+#: include/functions.php:1146
 #, fuzzy
 msgid "Open in new window"
 msgstr "在新窗口打开文章"
 
-#: include/functions2.php:73
-#: js/viewfeed.js:1732
+#: include/functions.php:1147
+#: js/viewfeed.js:1734
 msgid "Mark below as read"
 msgstr "将下面文章标为已读"
 
-#: include/functions2.php:74
-#: js/viewfeed.js:1725
+#: include/functions.php:1148
+#: js/viewfeed.js:1727
 msgid "Mark above as read"
 msgstr "将上面文章标为已读"
 
-#: include/functions2.php:75
+#: include/functions.php:1149
 #, fuzzy
 msgid "Scroll down"
 msgstr "向下滚动"
 
-#: include/functions2.php:76
+#: include/functions.php:1150
 msgid "Scroll up"
 msgstr "向上滚动"
 
-#: include/functions2.php:77
+#: include/functions.php:1151
 #, fuzzy
 msgid "Select article under cursor"
 msgstr "选择鼠标指向的文章"
 
-#: include/functions2.php:78
+#: include/functions.php:1152
 msgid "Email article"
 msgstr "通过邮件发送文章"
 
-#: include/functions2.php:79
+#: include/functions.php:1153
 #, fuzzy
 msgid "Close/collapse article"
 msgstr "关闭/折叠文章"
 
-#: include/functions2.php:80
+#: include/functions.php:1154
 #, fuzzy
 msgid "Toggle article expansion (combined mode)"
 msgstr "切换文章展开 (连续模式)"
 
-#: include/functions2.php:82
+#: include/functions.php:1156
 #: plugins/embed_original/init.php:31
 #, fuzzy
 msgid "Toggle embed original"
 msgstr "切换嵌入模式"
 
-#: include/functions2.php:83
+#: include/functions.php:1157
 #, fuzzy
 msgid "Article selection"
 msgstr "文章选择"
 
-#: include/functions2.php:84
+#: include/functions.php:1158
 msgid "Select all articles"
 msgstr "选择所有文章"
 
-#: include/functions2.php:85
+#: include/functions.php:1159
 #, fuzzy
 msgid "Select unread"
 msgstr "选择未读文章"
 
-#: include/functions2.php:86
+#: include/functions.php:1160
 #, fuzzy
 msgid "Select starred"
 msgstr "选择加星标文章"
 
-#: include/functions2.php:87
+#: include/functions.php:1161
 #, fuzzy
 msgid "Select published"
 msgstr "选择已发布文章"
 
-#: include/functions2.php:88
+#: include/functions.php:1162
 #, fuzzy
 msgid "Invert selection"
 msgstr "反选文章"
 
-#: include/functions2.php:89
+#: include/functions.php:1163
 #, fuzzy
 msgid "Deselect everything"
 msgstr "取消选择所有文章"
 
-#: include/functions2.php:90
+#: include/functions.php:1164
 #: classes/pref/feeds.php:555
-#: classes/pref/feeds.php:823
+#: classes/pref/feeds.php:811
 msgid "Feed"
 msgstr "信息源"
 
-#: include/functions2.php:91
+#: include/functions.php:1165
 #, fuzzy
 msgid "Refresh current feed"
 msgstr "刷新当前信息源"
 
-#: include/functions2.php:92
+#: include/functions.php:1166
 #, fuzzy
 msgid "Un/hide read feeds"
 msgstr "显示/隐藏 已读信息"
 
-#: include/functions2.php:93
-#: classes/pref/feeds.php:1349
+#: include/functions.php:1167
+#: classes/pref/feeds.php:1323
 msgid "Subscribe to feed"
 msgstr "订阅信息源"
 
-#: include/functions2.php:94
+#: include/functions.php:1168
 #: js/FeedTree.js:145
-#: js/PrefFeedTree.js:72
-#: js/viewfeed.js:1853
+#: js/PrefFeedTree.js:74
+#: js/viewfeed.js:1855
 msgid "Edit feed"
 msgstr "编辑信息源"
 
-#: include/functions2.php:96
+#: include/functions.php:1170
 #, fuzzy
 msgid "Reverse headlines"
 msgstr "反向排序"
 
-#: include/functions2.php:97
+#: include/functions.php:1171
 msgid "Toggle headline grouping"
 msgstr ""
 
-#: include/functions2.php:98
+#: include/functions.php:1172
 #, fuzzy
 msgid "Debug feed update"
 msgstr "调试信息源更新"
 
-#: include/functions2.php:99
+#: include/functions.php:1173
 #, fuzzy
 msgid "Debug viewfeed()"
 msgstr "调试信息源更新"
 
-#: include/functions2.php:100
+#: include/functions.php:1174
 #: js/FeedTree.js:194
 msgid "Mark all feeds as read"
 msgstr "标记所有信息源为已读"
 
-#: include/functions2.php:101
+#: include/functions.php:1175
 #, fuzzy
 msgid "Un/collapse current category"
 msgstr "展开/折叠 当前分类"
 
-#: include/functions2.php:102
+#: include/functions.php:1176
 #, fuzzy
 msgid "Toggle combined mode"
 msgstr "切换连续模式"
 
-#: include/functions2.php:103
+#: include/functions.php:1177
 #, fuzzy
 msgid "Toggle auto expand in combined mode"
 msgstr "切换连续模式中的自动展开功能"
 
-#: include/functions2.php:104
+#: include/functions.php:1178
 #, fuzzy
 msgid "Go to"
 msgstr "跳转至……"
 
-#: include/functions2.php:106
+#: include/functions.php:1179
+#: classes/feeds.php:1602
+msgid "All articles"
+msgstr "全部文章"
+
+#: include/functions.php:1180
 msgid "Fresh"
 msgstr "最新的"
 
-#: include/functions2.php:109
-#: js/tt-rss.js:494
-#: js/tt-rss.js:663
+#: include/functions.php:1183
+#: js/tt-rss.js:495
+#: js/tt-rss.js:664
 msgid "Tag cloud"
 msgstr "标签云"
 
-#: include/functions2.php:111
+#: include/functions.php:1185
 #, fuzzy
 msgid "Other"
 msgstr "其他信息源"
 
-#: include/functions2.php:112
+#: include/functions.php:1186
 #: classes/pref/labels.php:267
 msgid "Create label"
 msgstr "创建预定义标签"
 
-#: include/functions2.php:113
-#: classes/pref/filters.php:753
+#: include/functions.php:1187
+#: classes/pref/filters.php:793
 msgid "Create filter"
 msgstr "创建过滤器"
 
-#: include/functions2.php:114
+#: include/functions.php:1188
 #, fuzzy
 msgid "Un/collapse sidebar"
 msgstr "收起侧边栏"
 
-#: include/functions2.php:115
+#: include/functions.php:1189
 #, fuzzy
 msgid "Show help dialog"
 msgstr "显示帮助对话框"
 
-#: include/functions2.php:670
-#, php-format
-msgid "Search results: %s"
-msgstr "搜索结果：%s"
-
-#: include/functions2.php:1336
-#: classes/feeds.php:752
-#, fuzzy
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] "评论些什么？"
-
-#: include/functions2.php:1340
-#: classes/feeds.php:756
-#, fuzzy
-msgid "comments"
-msgstr "评论些什么？"
-
-#: include/functions2.php:1366
-msgid " - "
-msgstr " - "
-
-#: include/functions2.php:1397
-#: include/functions2.php:1648
-#: classes/article.php:311
-msgid "no tags"
-msgstr "无标签"
-
-#: include/functions2.php:1407
-#: classes/feeds.php:738
-msgid "Edit tags for this article"
-msgstr "为本文编辑自定义标签"
-
-#: include/functions2.php:1439
-#: classes/feeds.php:690
-msgid "Originally from:"
-msgstr "来源："
-
-#: include/functions2.php:1452
-#: classes/pref/feeds.php:574
-#: classes/feeds.php:703
-msgid "Feed URL"
-msgstr "信息源 URL"
-
-#: include/functions2.php:1489
-#: classes/backend.php:105
-#: classes/dlg.php:37
-#: classes/dlg.php:60
-#: classes/dlg.php:93
-#: classes/dlg.php:159
-#: classes/dlg.php:186
-#: classes/pref/feeds.php:1652
-#: classes/pref/feeds.php:1718
-#: classes/pref/filters.php:204
-#: classes/pref/prefs.php:1097
-#: plugins/af_psql_trgm/init.php:102
-#: plugins/import_export/init.php:415
-#: plugins/import_export/init.php:461
-#: plugins/share/init.php:121
-msgid "Close this window"
-msgstr "关闭本窗口"
-
-#: include/functions2.php:1686
-msgid "(edit note)"
-msgstr "（编辑注记）"
-
-#: include/functions2.php:1960
-msgid "unknown type"
-msgstr "未知类型"
-
-#: include/functions2.php:2037
-#, fuzzy
-msgid "Attachments"
-msgstr "附件："
-
-#: include/functions2.php:2496
+#: include/functions.php:2456
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: include/functions2.php:2497
+#: include/functions.php:2457
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: include/functions2.php:2498
+#: include/functions.php:2458
 msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
 msgstr ""
 
-#: include/functions2.php:2499
+#: include/functions.php:2459
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: include/functions2.php:2500
+#: include/functions.php:2460
 #, fuzzy
 msgid "No file was uploaded"
 msgstr "没有文件上传。"
 
-#: include/functions2.php:2501
+#: include/functions.php:2461
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: include/functions2.php:2502
+#: include/functions.php:2462
 msgid "Failed to write file to disk."
 msgstr ""
 
-#: include/functions2.php:2503
+#: include/functions.php:2463
 msgid "A PHP extension stopped the file upload."
 msgstr ""
 
 #: include/login_form.php:197
-#: classes/handler/public.php:569
-#: classes/handler/public.php:824
+#: classes/handler/public.php:480
+#: classes/handler/public.php:735
 msgid "Login:"
 msgstr "登陆："
 
 #: include/login_form.php:207
-#: classes/handler/public.php:572
+#: classes/handler/public.php:483
 msgid "Password:"
 msgstr "密码："
 
@@ -929,7 +827,7 @@ msgid "Profile:"
 msgstr "偏好："
 
 #: include/login_form.php:223
-#: classes/handler/public.php:311
+#: classes/handler/public.php:287
 #: classes/pref/prefs.php:1035
 #: classes/rpc.php:63
 msgid "Default profile"
@@ -948,7 +846,7 @@ msgid "Remember me"
 msgstr "记住我"
 
 #: include/login_form.php:249
-#: classes/handler/public.php:577
+#: classes/handler/public.php:488
 msgid "Log in"
 msgstr "登录"
 
@@ -967,148 +865,44 @@ msgstr "无法验证会话（没有找到该用户）"
 msgid "Session failed to validate (password changed)"
 msgstr "无法验证会话（密码错误）"
 
-#: classes/article.php:25
-msgid "Article not found."
-msgstr "找不到文章。"
-
-#: classes/article.php:197
-msgid "Tags for this article (separated by commas):"
-msgstr "本文的标签，请用逗号分开："
-
-#: classes/article.php:222
-#: classes/pref/labels.php:79
-#: classes/pref/users.php:98
-#: classes/pref/feeds.php:801
-#: classes/pref/feeds.php:943
-#: classes/pref/filters.php:485
-#: classes/pref/prefs.php:981
-#: plugins/instances/init.php:245
-#: plugins/nsfw/init.php:85
-#: plugins/note/init.php:51
-#: plugins/af_readability/init.php:68
-#: plugins/af_redditimgur/init.php:60
-#: plugins/af_psql_trgm/init.php:181
-#: plugins/mail/init.php:64
-#: plugins/af_zz_imgproxy/init.php:213
-msgid "Save"
-msgstr "保存"
-
-#: classes/article.php:224
-#: classes/handler/public.php:546
-#: classes/handler/public.php:580
-#: classes/pref/labels.php:81
-#: classes/pref/users.php:100
-#: classes/pref/feeds.php:802
-#: classes/pref/feeds.php:946
-#: classes/pref/feeds.php:1859
-#: classes/pref/filters.php:488
-#: classes/pref/filters.php:902
-#: classes/pref/filters.php:983
-#: classes/pref/filters.php:1076
-#: classes/pref/prefs.php:983
-#: classes/feeds.php:1105
-#: classes/feeds.php:1155
-#: classes/feeds.php:1192
-#: plugins/instances/init.php:248
-#: plugins/instances/init.php:436
-#: plugins/note/init.php:53
-#: plugins/mail/init.php:173
-msgid "Cancel"
-msgstr "取消"
-
-#: classes/opml.php:28
-#: classes/opml.php:33
-msgid "OPML Utility"
-msgstr "OPML 工具"
-
-#: classes/opml.php:37
-msgid "Importing OPML..."
-msgstr "正在导入 OPML ……"
-
-#: classes/opml.php:41
-msgid "Return to preferences"
-msgstr "返回偏好设置"
-
-#: classes/opml.php:271
-#, php-format
-msgid "Adding feed: %s"
-msgstr "添加信息源: %s"
-
-#: classes/opml.php:282
-#, fuzzy, php-format
-msgid "Duplicate feed: %s"
-msgstr "重复的信息源"
-
-#: classes/opml.php:296
-#, php-format
-msgid "Adding label %s"
-msgstr "添加预定义标签%s"
-
-#: classes/opml.php:299
-#, php-format
-msgid "Duplicate label: %s"
-msgstr "重复预定义标签: %s"
-
-#: classes/opml.php:311
-#, php-format
-msgid "Setting preference key %s to %s"
-msgstr "将偏好按键从 %s 设置为 %s"
-
-#: classes/opml.php:343
-#, fuzzy
-msgid "Adding filter..."
-msgstr "创建过滤器"
-
-#: classes/opml.php:421
-#, fuzzy, php-format
-msgid "Processing category: %s"
-msgstr "加入到类别："
-
-#: classes/opml.php:470
-#, php-format
-msgid "Upload failed with error code %d"
-msgstr "上传错误，错误代码：%d"
-
-#: classes/opml.php:484
-#: plugins/import_export/init.php:442
-#, fuzzy
-msgid "Unable to move uploaded file."
-msgstr "无法移动已上传文件。"
-
-#: classes/opml.php:488
-#: plugins/import_export/init.php:446
-msgid "Error: please upload OPML file."
-msgstr "错误：请上传 OPML 文件。"
-
-#: classes/opml.php:499
-#, fuzzy
-msgid "Error: unable to find moved OPML file."
-msgstr "错误：无法找到移动的OPML文件。"
-
-#: classes/opml.php:506
-msgid "Error while parsing document."
-msgstr "解析文档时发生错误。"
-
-#: classes/backend.php:33
+#: classes/backend.php:31
 msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
 msgstr "在 Tiny Tiny RSS 的维基上可以找到其他界面技巧。"
 
-#: classes/backend.php:38
+#: classes/backend.php:36
 msgid "Keyboard Shortcuts"
 msgstr "快捷键"
 
-#: classes/backend.php:61
+#: classes/backend.php:59
 msgid "Shift"
 msgstr "Shift"
 
-#: classes/backend.php:64
+#: classes/backend.php:62
 msgid "Ctrl"
 msgstr "Ctrl"
 
-#: classes/backend.php:99
+#: classes/backend.php:97
 msgid "Help topic not found."
 msgstr "未找到帮助主题。"
 
+#: classes/backend.php:103
+#: classes/dlg.php:37
+#: classes/dlg.php:60
+#: classes/dlg.php:93
+#: classes/dlg.php:159
+#: classes/dlg.php:186
+#: classes/article.php:744
+#: classes/pref/filters.php:206
+#: classes/pref/prefs.php:1097
+#: classes/pref/feeds.php:1626
+#: classes/pref/feeds.php:1692
+#: plugins/import_export/init.php:421
+#: plugins/import_export/init.php:467
+#: plugins/af_psql_trgm/init.php:102
+#: plugins/share/init.php:120
+msgid "Close this window"
+msgstr "关闭本窗口"
+
 #: classes/dlg.php:17
 msgid "If you have imported labels and/or filters, you might need to reload preferences to see your new data."
 msgstr "如果你已经导入了预定义标签或过滤器，你可能需要重新加载来看到新的设置。"
@@ -1119,7 +913,7 @@ msgstr "你的公共 OPML URL 是："
 
 #: classes/dlg.php:57
 #: classes/dlg.php:183
-#: plugins/share/init.php:118
+#: plugins/share/init.php:117
 msgid "Generate new URL"
 msgstr "生成一个新的 URL"
 
@@ -1140,137 +934,233 @@ msgstr "更新进程在抓取信息更新时花费了太长时间，这可能引
 msgid "You can view this feed as RSS using the following URL:"
 msgstr "您可以通过如下 URL 以 RSS 方式查看本信息源："
 
-#: classes/handler/public.php:510
+#: classes/article.php:25
+msgid "Article not found."
+msgstr "找不到文章。"
+
+#: classes/article.php:197
+msgid "Tags for this article (separated by commas):"
+msgstr "本文的标签，请用逗号分开："
+
+#: classes/article.php:222
+#: classes/pref/labels.php:79
+#: classes/pref/filters.php:519
+#: classes/pref/users.php:98
+#: classes/pref/prefs.php:981
+#: classes/pref/feeds.php:789
+#: classes/pref/feeds.php:931
+#: plugins/af_psql_trgm/init.php:181
+#: plugins/nsfw/init.php:85
+#: plugins/af_readability/init.php:68
+#: plugins/mail/init.php:64
+#: plugins/af_redditimgur/init.php:60
+#: plugins/note/init.php:51
+#: plugins/af_zz_imgproxy/init.php:240
+msgid "Save"
+msgstr "保存"
+
+#: classes/article.php:224
+#: classes/handler/public.php:457
+#: classes/handler/public.php:491
+#: classes/pref/labels.php:81
+#: classes/pref/filters.php:522
+#: classes/pref/filters.php:942
+#: classes/pref/filters.php:1022
+#: classes/pref/filters.php:1115
+#: classes/pref/users.php:100
+#: classes/pref/prefs.php:983
+#: classes/pref/feeds.php:790
+#: classes/pref/feeds.php:934
+#: classes/pref/feeds.php:1833
+#: classes/feeds.php:1098
+#: classes/feeds.php:1148
+#: classes/feeds.php:1185
+#: plugins/mail/init.php:173
+#: plugins/note/init.php:53
+msgid "Cancel"
+msgstr "取消"
+
+#: classes/article.php:311
+#: classes/article.php:652
+#: classes/article.php:805
+msgid "no tags"
+msgstr "无标签"
+
+#: classes/article.php:419
+msgid "unknown type"
+msgstr "未知类型"
+
+#: classes/article.php:496
+#, fuzzy
+msgid "Attachments"
+msgstr "附件："
+
+#: classes/article.php:591
+#: classes/feeds.php:741
+#, fuzzy
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] "评论些什么？"
+
+#: classes/article.php:595
+#: classes/feeds.php:745
+#, fuzzy
+msgid "comments"
+msgstr "评论些什么？"
+
+#: classes/article.php:621
+msgid " - "
+msgstr " - "
+
+#: classes/article.php:662
+#: classes/feeds.php:727
+msgid "Edit tags for this article"
+msgstr "为本文编辑自定义标签"
+
+#: classes/article.php:694
+#: classes/feeds.php:681
+msgid "Originally from:"
+msgstr "来源："
+
+#: classes/article.php:707
+#: classes/pref/feeds.php:574
+#: classes/feeds.php:694
+msgid "Feed URL"
+msgstr "信息源 URL"
+
+#: classes/article.php:843
+msgid "(edit note)"
+msgstr "（编辑注记）"
+
+#: classes/handler/public.php:421
 #: plugins/bookmarklets/init.php:40
 #, fuzzy
 msgid "Share with Tiny Tiny RSS"
 msgstr "在 Tiny Tiny RSS 中分享订阅"
 
-#: classes/handler/public.php:518
+#: classes/handler/public.php:429
 #, fuzzy
 msgid "Title:"
 msgstr "标题"
 
-#: classes/handler/public.php:520
+#: classes/handler/public.php:431
 #: classes/pref/feeds.php:572
-#: plugins/instances/init.php:212
-#: plugins/instances/init.php:401
 msgid "URL:"
 msgstr "URL："
 
-#: classes/handler/public.php:522
+#: classes/handler/public.php:433
 #, fuzzy
 msgid "Content:"
 msgstr "内容"
 
-#: classes/handler/public.php:524
+#: classes/handler/public.php:435
 #, fuzzy
 msgid "Labels:"
 msgstr "预定义标签"
 
-#: classes/handler/public.php:543
+#: classes/handler/public.php:454
 msgid "Shared article will appear in the Published feed."
 msgstr "被分享的文章将会出现在已发布信息源中。"
 
-#: classes/handler/public.php:545
+#: classes/handler/public.php:456
 msgid "Share"
 msgstr "分享"
 
-#: classes/handler/public.php:567
+#: classes/handler/public.php:478
 #, fuzzy
 msgid "Not logged in"
 msgstr "未登录"
 
-#: classes/handler/public.php:626
+#: classes/handler/public.php:537
 msgid "Incorrect username or password"
 msgstr "用户名或密码错误"
 
-#: classes/handler/public.php:678
+#: classes/handler/public.php:589
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "已经订阅到 <b>%s</b>."
 
-#: classes/handler/public.php:681
+#: classes/handler/public.php:592
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "订阅到 <b>%s</b>."
 
-#: classes/handler/public.php:684
+#: classes/handler/public.php:595
 #, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "无法订阅到 <b>%s</b>。"
 
-#: classes/handler/public.php:687
+#: classes/handler/public.php:598
 #, php-format
 msgid "No feeds found in <b>%s</b>."
 msgstr "在 <b>%s</b> 中没有找到信息源。"
 
-#: classes/handler/public.php:690
+#: classes/handler/public.php:601
 #, fuzzy
 msgid "Multiple feed URLs found."
 msgstr "发现了多个信息源。"
 
-#: classes/handler/public.php:694
+#: classes/handler/public.php:605
 #, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr "无法订阅 <b>%s</b>。<br>无法下载信息源的 URL。"
 
-#: classes/handler/public.php:712
+#: classes/handler/public.php:623
 msgid "Subscribe to selected feed"
 msgstr "订阅选中的信息源"
 
-#: classes/handler/public.php:737
+#: classes/handler/public.php:648
 msgid "Edit subscription options"
 msgstr "编辑订阅选项"
 
-#: classes/handler/public.php:774
+#: classes/handler/public.php:685
 #, fuzzy
 msgid "Password recovery"
 msgstr "找回密码"
 
-#: classes/handler/public.php:817
+#: classes/handler/public.php:728
 msgid "You will need to provide valid account name and email. A password reset link will be sent to your email address."
 msgstr "你需要提供合法的用户名和Email地址。密码重置链接将会发送到你的Email中。"
 
-#: classes/handler/public.php:839
-#: classes/pref/users.php:350
+#: classes/handler/public.php:750
+#: classes/pref/users.php:349
 msgid "Reset password"
 msgstr "重置密码"
 
-#: classes/handler/public.php:849
+#: classes/handler/public.php:760
 msgid "Some of the required form parameters are missing or incorrect."
 msgstr "表单中的信息不完整或不正确。"
 
-#: classes/handler/public.php:853
-#: classes/handler/public.php:919
+#: classes/handler/public.php:764
+#: classes/handler/public.php:830
 #, fuzzy
 msgid "Go back"
 msgstr "返回"
 
-#: classes/handler/public.php:890
+#: classes/handler/public.php:801
 #, fuzzy
 msgid "[tt-rss] Password reset request"
 msgstr "[tt-rss] 密码重置请求"
 
-#: classes/handler/public.php:915
+#: classes/handler/public.php:826
 msgid "Sorry, login and email combination not found."
 msgstr "对不起，没有找到用户名和Email组合。"
 
-#: classes/handler/public.php:937
+#: classes/handler/public.php:848
 msgid "Your access level is insufficient to run this script."
 msgstr "访问级别不足，无法运行脚本。"
 
-#: classes/handler/public.php:963
+#: classes/handler/public.php:874
 msgid "Database Updater"
 msgstr "数据库更新管理器"
 
-#: classes/handler/public.php:1028
+#: classes/handler/public.php:939
 msgid "Perform updates"
 msgstr "执行更新"
 
 #: classes/pref/labels.php:22
-#: classes/pref/filters.php:348
-#: classes/pref/filters.php:823
+#: classes/pref/filters.php:373
+#: classes/pref/filters.php:863
 msgid "Caption"
 msgstr "标题"
 
@@ -1292,59 +1182,55 @@ msgid "Created label <b>%s</b>"
 msgstr "创建预定义标签 <b>%s</b>"
 
 #: classes/pref/labels.php:258
-#: classes/pref/users.php:334
-#: classes/pref/feeds.php:1337
-#: classes/pref/feeds.php:1600
-#: classes/pref/feeds.php:1664
-#: classes/pref/filters.php:359
-#: classes/pref/filters.php:407
-#: classes/pref/filters.php:744
-#: classes/pref/filters.php:832
-#: classes/pref/filters.php:859
+#: classes/pref/filters.php:384
+#: classes/pref/filters.php:441
+#: classes/pref/filters.php:784
+#: classes/pref/filters.php:872
+#: classes/pref/filters.php:899
+#: classes/pref/users.php:333
 #: classes/pref/prefs.php:992
-#: plugins/instances/init.php:284
+#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1574
+#: classes/pref/feeds.php:1638
 msgid "Select"
 msgstr "选择"
 
 #: classes/pref/labels.php:261
-#: classes/pref/users.php:337
-#: classes/pref/feeds.php:1340
-#: classes/pref/feeds.php:1603
-#: classes/pref/feeds.php:1667
-#: classes/pref/filters.php:362
-#: classes/pref/filters.php:410
-#: classes/pref/filters.php:747
-#: classes/pref/filters.php:835
-#: classes/pref/filters.php:862
+#: classes/pref/filters.php:387
+#: classes/pref/filters.php:444
+#: classes/pref/filters.php:787
+#: classes/pref/filters.php:875
+#: classes/pref/filters.php:902
+#: classes/pref/users.php:336
 #: classes/pref/prefs.php:995
+#: classes/pref/feeds.php:1314
+#: classes/pref/feeds.php:1577
+#: classes/pref/feeds.php:1641
 #: classes/feeds.php:102
-#: plugins/instances/init.php:287
 msgid "All"
 msgstr "全部"
 
 #: classes/pref/labels.php:263
-#: classes/pref/users.php:339
-#: classes/pref/feeds.php:1342
-#: classes/pref/feeds.php:1605
-#: classes/pref/feeds.php:1669
-#: classes/pref/filters.php:364
-#: classes/pref/filters.php:412
-#: classes/pref/filters.php:749
-#: classes/pref/filters.php:837
-#: classes/pref/filters.php:864
+#: classes/pref/filters.php:389
+#: classes/pref/filters.php:446
+#: classes/pref/filters.php:789
+#: classes/pref/filters.php:877
+#: classes/pref/filters.php:904
+#: classes/pref/users.php:338
 #: classes/pref/prefs.php:997
+#: classes/pref/feeds.php:1316
+#: classes/pref/feeds.php:1579
+#: classes/pref/feeds.php:1643
 #: classes/feeds.php:105
-#: plugins/instances/init.php:289
 msgid "None"
 msgstr "无"
 
 #: classes/pref/labels.php:270
-#: classes/pref/users.php:348
+#: classes/pref/filters.php:512
+#: classes/pref/filters.php:806
+#: classes/pref/users.php:347
 #: classes/pref/feeds.php:767
-#: classes/pref/filters.php:478
-#: classes/pref/filters.php:766
-#: classes/feeds.php:1154
-#: plugins/instances/init.php:294
+#: classes/feeds.php:1147
 msgid "Remove"
 msgstr "移除"
 
@@ -1352,9 +1238,176 @@ msgstr "移除"
 msgid "Clear colors"
 msgstr "清空颜色"
 
+#: classes/pref/filters.php:153
+#, fuzzy
+msgid "Preview article"
+msgstr "最新更新的文章"
+
+#: classes/pref/filters.php:264
+#: classes/pref/filters.php:558
+#, fuzzy
+msgid "(inverse)"
+msgstr "反选"
+
+#: classes/pref/filters.php:260
+#: classes/pref/filters.php:557
+#, php-format
+msgid "%s on %s in %s %s"
+msgstr ""
+
+#: classes/pref/filters.php:379
+#: classes/pref/filters.php:867
+#: classes/pref/filters.php:981
+msgid "Match"
+msgstr "匹配"
+
+#: classes/pref/filters.php:393
+#: classes/pref/filters.php:450
+#: classes/pref/filters.php:881
+#: classes/pref/filters.php:908
+msgid "Add"
+msgstr "添加"
+
+#: classes/pref/filters.php:396
+#: classes/pref/filters.php:453
+#: classes/pref/filters.php:884
+#: classes/pref/filters.php:911
+#: classes/feeds.php:122
+msgid "Delete"
+msgstr "删除"
+
+#: classes/pref/filters.php:436
+#: classes/pref/filters.php:894
+#, fuzzy
+msgid "Apply actions"
+msgstr "应用操作"
+
+#: classes/pref/filters.php:486
+#: classes/pref/filters.php:923
+msgid "Enabled"
+msgstr "已启用"
+
+#: classes/pref/filters.php:495
+#: classes/pref/filters.php:926
+msgid "Match any rule"
+msgstr "匹配任意规则"
+
+#: classes/pref/filters.php:504
+#: classes/pref/filters.php:929
+#, fuzzy
+msgid "Inverse matching"
+msgstr "反向匹配"
+
+#: classes/pref/filters.php:516
+#: classes/pref/filters.php:936
+msgid "Test"
+msgstr "测试"
+
+#: classes/pref/filters.php:780
+#: classes/pref/users.php:323
+#: classes/pref/feeds.php:1307
+#: classes/feeds.php:1118
+#: classes/feeds.php:1184
+#: js/tt-rss.js:165
+msgid "Search"
+msgstr "搜索"
+
+#: classes/pref/filters.php:796
+msgid "Combine"
+msgstr "连续"
+
+#: classes/pref/filters.php:799
+#: classes/pref/users.php:345
+msgid "Edit"
+msgstr "编辑"
+
+#: classes/pref/filters.php:802
+#: classes/pref/feeds.php:1327
+#: classes/pref/feeds.php:1341
+msgid "Reset sort order"
+msgstr "重置排序"
+
+#: classes/pref/filters.php:810
+#: classes/pref/feeds.php:1363
+msgid "Rescore articles"
+msgstr "为文章重新评分"
+
+#: classes/pref/filters.php:939
+msgid "Create"
+msgstr "创建"
+
+#: classes/pref/filters.php:993
+msgid "Inverse regular expression matching"
+msgstr "反选正则表达式匹配结果"
+
+#: classes/pref/filters.php:995
+msgid "on field"
+msgstr "on field"
+
+#: classes/pref/filters.php:1001
+#: js/PrefFilterTree.js:64
+msgid "in"
+msgstr "在"
+
+#: classes/pref/filters.php:1014
+#, fuzzy
+msgid "Wiki: Filters"
+msgstr "过滤器"
+
+#: classes/pref/filters.php:1019
+#, fuzzy
+msgid "Save rule"
+msgstr "保存规则"
+
+#: classes/pref/filters.php:1019
+#: js/functions.js:865
+msgid "Add rule"
+msgstr "添加规则"
+
+#: classes/pref/filters.php:1042
+msgid "Perform Action"
+msgstr "执行动作"
+
+#: classes/pref/filters.php:1093
+#, fuzzy
+msgid "No actions available"
+msgstr "有可用的新版本啦！"
+
+#: classes/pref/filters.php:1112
+#, fuzzy
+msgid "Save action"
+msgstr "保存操作"
+
+#: classes/pref/filters.php:1112
+#: js/functions.js:887
+#, fuzzy
+msgid "Add action"
+msgstr "添加操作"
+
+#: classes/pref/filters.php:1136
+#, fuzzy
+msgid "[No caption]"
+msgstr "[无标题]"
+
+#: classes/pref/filters.php:1138
+#, php-format
+msgid "%s (%d rule)"
+msgid_plural "%s (%d rules)"
+msgstr[0] ""
+
+#: classes/pref/filters.php:1153
+#, fuzzy
+msgid "matches any rule"
+msgstr "匹配任意规则"
+
+#: classes/pref/filters.php:1156
+#, fuzzy, php-format
+msgid "%s (+%d action)"
+msgid_plural "%s (+%d actions)"
+msgstr[0] "信息源动作"
+
 #: classes/pref/users.php:6
 #: classes/pref/system.php:8
-#: plugins/instances/init.php:154
 msgid "Your access level is insufficient to open this tab."
 msgstr "您的访问级别不够，无法打开这个舌签。"
 
@@ -1365,8 +1418,8 @@ msgstr "编辑过滤器"
 
 #: classes/pref/users.php:56
 #: classes/pref/feeds.php:637
-#: classes/pref/feeds.php:878
-#: classes/feeds.php:1075
+#: classes/pref/feeds.php:866
+#: classes/feeds.php:1068
 msgid "Authentication"
 msgstr "登录认证"
 
@@ -1376,7 +1429,7 @@ msgstr "访问级别："
 
 #: classes/pref/users.php:77
 #: classes/pref/feeds.php:667
-#: classes/pref/feeds.php:896
+#: classes/pref/feeds.php:884
 msgid "Options"
 msgstr "选项"
 
@@ -1390,7 +1443,7 @@ msgid "User not found"
 msgstr "未找到用户"
 
 #: classes/pref/users.php:132
-#: classes/pref/users.php:400
+#: classes/pref/users.php:399
 msgid "Registered"
 msgstr "注册时间"
 
@@ -1408,7 +1461,7 @@ msgid "Stored articles"
 msgstr "加星标文章"
 
 #: classes/pref/users.php:145
-#: classes/pref/users.php:399
+#: classes/pref/users.php:398
 msgid "Subscribed feeds"
 msgstr "订阅的信息源"
 
@@ -1427,521 +1480,57 @@ msgstr "无法创建用户 <b>%s</b> "
 msgid "User <b>%s</b> already exists."
 msgstr "用户 <b>%s</b> 已存在。"
 
-#: classes/pref/users.php:265
+#: classes/pref/users.php:264
 #, fuzzy, php-format
 msgid "Changed password of user <b>%s</b> to <b>%s</b>"
 msgstr "用户 <b>%s</b> ，密码修改为<b>%s</b>"
 
-#: classes/pref/users.php:267
+#: classes/pref/users.php:266
 #, fuzzy, php-format
 msgid "Sending new password of user <b>%s</b> to <b>%s</b>"
 msgstr "用户 <b>%s</b> ，新密码发送至<b>%s</b>"
 
-#: classes/pref/users.php:291
+#: classes/pref/users.php:290
 msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] 密码更换提醒"
 
-#: classes/pref/users.php:324
-#: classes/pref/feeds.php:1333
-#: classes/pref/filters.php:740
-#: classes/feeds.php:1125
-#: classes/feeds.php:1191
-#: js/tt-rss.js:165
-msgid "Search"
-msgstr "搜索"
-
-#: classes/pref/users.php:342
+#: classes/pref/users.php:341
 msgid "Create user"
 msgstr "创建用户"
 
-#: classes/pref/users.php:346
-#: classes/pref/filters.php:759
-#: plugins/instances/init.php:293
-msgid "Edit"
-msgstr "编辑"
-
-#: classes/pref/users.php:397
+#: classes/pref/users.php:396
 #: classes/pref/feeds.php:643
-#: classes/pref/feeds.php:882
-#: classes/pref/feeds.php:1836
-#: classes/feeds.php:1079
+#: classes/pref/feeds.php:870
+#: classes/pref/feeds.php:1810
+#: classes/feeds.php:1072
 msgid "Login"
 msgstr "登陆"
 
-#: classes/pref/users.php:398
+#: classes/pref/users.php:397
 msgid "Access Level"
 msgstr "访问级别"
 
-#: classes/pref/users.php:401
+#: classes/pref/users.php:400
 msgid "Last login"
 msgstr "最后登陆"
 
-#: classes/pref/users.php:420
-#: plugins/instances/init.php:334
+#: classes/pref/users.php:419
 msgid "Click to edit"
 msgstr "点击进行编辑"
 
-#: classes/pref/users.php:441
+#: classes/pref/users.php:440
 msgid "No users defined."
 msgstr "没有定义用户。"
 
-#: classes/pref/users.php:443
+#: classes/pref/users.php:442
 msgid "No matching users found."
 msgstr "没有匹配的用户。"
 
-#: classes/pref/system.php:29
-msgid "Error Log"
-msgstr "错误日志"
-
-#: classes/pref/system.php:40
-msgid "Refresh"
-msgstr "刷新"
-
-#: classes/pref/system.php:43
-#, fuzzy
-msgid "Clear log"
-msgstr "清空日志"
-
-#: classes/pref/system.php:48
-msgid "Error"
-msgstr "错误"
-
-#: classes/pref/system.php:49
-#, fuzzy
-msgid "Filename"
-msgstr "文件名："
-
-#: classes/pref/system.php:50
-msgid "Message"
-msgstr "消息"
-
-#: classes/pref/system.php:52
-msgid "Date"
-msgstr "日期"
-
-#: classes/pref/feeds.php:15
-msgid "Check to enable field"
-msgstr "勾选以启用"
-
-#: classes/pref/feeds.php:65
-#: classes/pref/feeds.php:214
-#: classes/pref/feeds.php:258
-#: classes/pref/feeds.php:264
-#: classes/pref/feeds.php:290
-#, fuzzy, php-format
-msgid "(%d feed)"
-msgid_plural "(%d feeds)"
-msgstr[0] "(%d 个信息源)"
-
-#: classes/pref/feeds.php:537
 #: classes/pref/prefs.php:18
+#: classes/pref/feeds.php:537
 msgid "General"
 msgstr "通用"
 
-#: classes/pref/feeds.php:561
-msgid "Feed Title"
-msgstr "信息源标题"
-
-#: classes/pref/feeds.php:595
-#: classes/pref/feeds.php:830
-#: classes/pref/feeds.php:1822
-#: classes/feeds.php:1055
-msgid "Place in category:"
-msgstr "加入到类别："
-
-#: classes/pref/feeds.php:608
-#: classes/pref/feeds.php:844
-#, fuzzy
-msgid "Language:"
-msgstr "语言："
-
-#: classes/pref/feeds.php:615
-#: classes/pref/feeds.php:853
-msgid "Update"
-msgstr "更新列表"
-
-#: classes/pref/feeds.php:630
-#: classes/pref/feeds.php:869
-msgid "Article purging:"
-msgstr "文章清理："
-
-#: classes/pref/feeds.php:658
-#: classes/pref/feeds.php:890
-#: classes/pref/feeds.php:1839
-#: classes/pref/prefs.php:245
-#: classes/feeds.php:1083
-msgid "Password"
-msgstr "密码"
-
-#: classes/pref/feeds.php:662
-msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
-msgstr "<b>提示：</b>如果您的信息源需要验证，那么您需要填写登录信息。Twitter 信息源除外。"
-
-#: classes/pref/feeds.php:681
-#: classes/pref/feeds.php:900
-msgid "Hide from Popular feeds"
-msgstr "从最受欢迎的信息源中隐藏"
-
-#: classes/pref/feeds.php:693
-#: classes/pref/feeds.php:906
-msgid "Include in e-mail digest"
-msgstr "包含电子邮件摘要"
-
-#: classes/pref/feeds.php:706
-#: classes/pref/feeds.php:912
-msgid "Always display image attachments"
-msgstr "始终显示图片附件"
-
-#: classes/pref/feeds.php:719
-#: classes/pref/feeds.php:920
-msgid "Do not embed images"
-msgstr "不要嵌入图片"
-
-#: classes/pref/feeds.php:732
-#: classes/pref/feeds.php:928
-msgid "Cache media"
-msgstr ""
-
-#: classes/pref/feeds.php:744
-#: classes/pref/feeds.php:934
-msgid "Mark updated articles as unread"
-msgstr "将已更新的文章标记为未读"
-
-#: classes/pref/feeds.php:748
-msgid "Icon"
-msgstr "图标"
-
-#: classes/pref/feeds.php:765
-msgid "Replace"
-msgstr "替换"
-
-#: classes/pref/feeds.php:772
-#: classes/pref/prefs.php:698
-msgid "Plugins"
-msgstr "插件"
-
-#: classes/pref/feeds.php:792
-msgid "Resubscribe to push updates"
-msgstr "重新订阅以推送更新"
-
-#: classes/pref/feeds.php:799
-msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
-msgstr "为启用推送的信息源重置 PubSubHubbub 订阅。"
-
-#: classes/pref/feeds.php:1200
-#: classes/pref/feeds.php:1253
-msgid "All done."
-msgstr "全部完成。"
-
-#: classes/pref/feeds.php:1308
-msgid "Feeds with errors"
-msgstr "有错误的信息源"
-
-#: classes/pref/feeds.php:1315
-#, fuzzy
-msgid "Inactive feeds"
-msgstr "刷新活动的信息源"
-
-#: classes/pref/feeds.php:1351
-msgid "Edit selected feeds"
-msgstr "编辑选定的信息源"
-
-#: classes/pref/feeds.php:1353
-#: classes/pref/feeds.php:1367
-#: classes/pref/filters.php:762
-msgid "Reset sort order"
-msgstr "重置排序"
-
-#: classes/pref/feeds.php:1355
-#: js/prefs.js:1622
-msgid "Batch subscribe"
-msgstr "批量订阅"
-
-#: classes/pref/feeds.php:1362
-#, fuzzy
-msgid "Categories"
-msgstr "信息源类别"
-
-#: classes/pref/feeds.php:1365
-#, fuzzy
-msgid "Add category"
-msgstr "编辑类别"
-
-#: classes/pref/feeds.php:1369
-#, fuzzy
-msgid "Remove selected"
-msgstr "移除选中的信息源"
-
-#: classes/pref/feeds.php:1380
-msgid "More actions..."
-msgstr "更多操作"
-
-#: classes/pref/feeds.php:1384
-msgid "Manual purge"
-msgstr "手动清除"
-
-#: classes/pref/feeds.php:1388
-msgid "Clear feed data"
-msgstr "清空信息源数据"
-
-#: classes/pref/feeds.php:1389
-#: classes/pref/filters.php:770
-msgid "Rescore articles"
-msgstr "为文章重新评分"
-
-#: classes/pref/feeds.php:1442
-msgid "OPML"
-msgstr "OPML"
-
-#: classes/pref/feeds.php:1444
-msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
-msgstr "使用OPML你可以导出或导入信息源feeds列表、过滤器、标签以及设置。"
-
-#: classes/pref/feeds.php:1445
-msgid "Only main settings profile can be migrated using OPML."
-msgstr "只有主要设置能够通过OPML文件来进行迁移。"
-
-#: classes/pref/feeds.php:1458
-#, fuzzy
-msgid "Import my OPML"
-msgstr "正在导入 OPML ……"
-
-#: classes/pref/feeds.php:1464
-msgid "Filename:"
-msgstr "文件名："
-
-#: classes/pref/feeds.php:1466
-msgid "Include settings"
-msgstr "包含设置"
-
-#: classes/pref/feeds.php:1470
-#, fuzzy
-msgid "Export OPML"
-msgstr "正在导入 OPML ……"
-
-#: classes/pref/feeds.php:1474
-msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
-msgstr "您可以公开发布您的 OPML 。网上的任何人都可以通过如下 URL 订阅该文件。"
-
-#: classes/pref/feeds.php:1478
-msgid "Public OPML URL"
-msgstr "公开的 OPML URL"
-
-#: classes/pref/feeds.php:1479
-#, fuzzy
-msgid "Display published OPML URL"
-msgstr "公开的 OPML URL"
-
-#: classes/pref/feeds.php:1488
-msgid "Firefox integration"
-msgstr "Firefox 集成"
-
-#: classes/pref/feeds.php:1490
-msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
-msgstr "点击如下链接，可以将本 Tiny Tiny RSS 站点作为一个 Firefox 阅读器使用。"
-
-#: classes/pref/feeds.php:1497
-msgid "Click here to register this site as a feed reader."
-msgstr "点击此处将本站注册为信息源阅读器。"
-
-#: classes/pref/feeds.php:1505
-#, fuzzy
-msgid "Published & shared articles / Generated feeds"
-msgstr "已发布的文章和生成的信息源"
-
-#: classes/pref/feeds.php:1507
-msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
-msgstr "已发布的文章将会输出为公开的 RSS 信息源，网上的任何人可以通过如下 URL 进行订阅。"
-
-#: classes/pref/feeds.php:1514
-#: classes/feeds.php:54
-#: classes/feeds.php:140
-msgid "View as RSS"
-msgstr "以 RSS 形式阅读"
-
-#: classes/pref/feeds.php:1515
-msgid "Display URL"
-msgstr "显示 URL"
-
-#: classes/pref/feeds.php:1518
-msgid "Clear all generated URLs"
-msgstr "清空所有生成的 URL"
-
-#: classes/pref/feeds.php:1596
-msgid "These feeds have not been updated with new content for 3 months (oldest first):"
-msgstr "以下信息源已经有三个月没有内容更新了（最旧的在最上）："
-
-#: classes/pref/feeds.php:1630
-#: classes/pref/feeds.php:1694
-msgid "Click to edit feed"
-msgstr "点击以编辑信息源"
-
-#: classes/pref/feeds.php:1648
-#: classes/pref/feeds.php:1714
-msgid "Unsubscribe from selected feeds"
-msgstr "取消订阅选中的信息源"
-
-#: classes/pref/feeds.php:1819
-msgid "Add one valid RSS feed per line (no feed detection is done)"
-msgstr "每行添加一条RSS源"
-
-#: classes/pref/feeds.php:1828
-msgid "Feeds to subscribe, One per line"
-msgstr "所有将订阅的Feeds, 每行一条"
-
-#: classes/pref/feeds.php:1851
-msgid "Feeds require authentication."
-msgstr "Feed需要登录认证。"
-
-#: classes/pref/feeds.php:1858
-#: classes/feeds.php:1099
-#: classes/feeds.php:1153
-msgid "Subscribe"
-msgstr "订阅"
-
-#: classes/pref/filters.php:151
-#, fuzzy
-msgid "Preview article"
-msgstr "最新更新的文章"
-
-#: classes/pref/filters.php:239
-#: classes/pref/filters.php:518
-#, fuzzy
-msgid "(inverse)"
-msgstr "反选"
-
-#: classes/pref/filters.php:235
-#: classes/pref/filters.php:517
-#, php-format
-msgid "%s on %s in %s %s"
-msgstr ""
-
-#: classes/pref/filters.php:354
-#: classes/pref/filters.php:827
-#: classes/pref/filters.php:942
-msgid "Match"
-msgstr "匹配"
-
-#: classes/pref/filters.php:368
-#: classes/pref/filters.php:416
-#: classes/pref/filters.php:841
-#: classes/pref/filters.php:868
-msgid "Add"
-msgstr "添加"
-
-#: classes/pref/filters.php:371
-#: classes/pref/filters.php:419
-#: classes/pref/filters.php:844
-#: classes/pref/filters.php:871
-#: classes/feeds.php:122
-msgid "Delete"
-msgstr "删除"
-
-#: classes/pref/filters.php:402
-#: classes/pref/filters.php:854
-#, fuzzy
-msgid "Apply actions"
-msgstr "应用操作"
-
-#: classes/pref/filters.php:452
-#: classes/pref/filters.php:883
-msgid "Enabled"
-msgstr "已启用"
-
-#: classes/pref/filters.php:461
-#: classes/pref/filters.php:886
-msgid "Match any rule"
-msgstr "匹配任意规则"
-
-#: classes/pref/filters.php:470
-#: classes/pref/filters.php:889
-#, fuzzy
-msgid "Inverse matching"
-msgstr "反向匹配"
-
-#: classes/pref/filters.php:482
-#: classes/pref/filters.php:896
-msgid "Test"
-msgstr "测试"
-
-#: classes/pref/filters.php:756
-msgid "Combine"
-msgstr "连续"
-
-#: classes/pref/filters.php:899
-msgid "Create"
-msgstr "创建"
-
-#: classes/pref/filters.php:954
-msgid "Inverse regular expression matching"
-msgstr "反选正则表达式匹配结果"
-
-#: classes/pref/filters.php:956
-msgid "on field"
-msgstr "on field"
-
-#: classes/pref/filters.php:962
-#: js/PrefFilterTree.js:64
-msgid "in"
-msgstr "在"
-
-#: classes/pref/filters.php:975
-#, fuzzy
-msgid "Wiki: Filters"
-msgstr "过滤器"
-
-#: classes/pref/filters.php:980
-#, fuzzy
-msgid "Save rule"
-msgstr "保存规则"
-
-#: classes/pref/filters.php:980
-#: js/functions.js:865
-msgid "Add rule"
-msgstr "添加规则"
-
-#: classes/pref/filters.php:1003
-msgid "Perform Action"
-msgstr "执行动作"
-
-#: classes/pref/filters.php:1054
-#, fuzzy
-msgid "No actions available"
-msgstr "有可用的新版本啦！"
-
-#: classes/pref/filters.php:1073
-#, fuzzy
-msgid "Save action"
-msgstr "保存操作"
-
-#: classes/pref/filters.php:1073
-#: js/functions.js:887
-#, fuzzy
-msgid "Add action"
-msgstr "添加操作"
-
-#: classes/pref/filters.php:1097
-#, fuzzy
-msgid "[No caption]"
-msgstr "[无标题]"
-
-#: classes/pref/filters.php:1099
-#, php-format
-msgid "%s (%d rule)"
-msgid_plural "%s (%d rules)"
-msgstr[0] ""
-
-#: classes/pref/filters.php:1114
-#, fuzzy
-msgid "matches any rule"
-msgstr "匹配任意规则"
-
-#: classes/pref/filters.php:1117
-#, fuzzy, php-format
-msgid "%s (+%d action)"
-msgid_plural "%s (+%d actions)"
-msgstr[0] "信息源动作"
-
 #: classes/pref/prefs.php:19
 msgid "Interface"
 msgstr "界面"
@@ -2125,7 +1714,7 @@ msgid "Strip all but most common HTML tags when reading articles."
 msgstr "仅加载几个最常用的 HTML 标签"
 
 #: classes/pref/prefs.php:53
-#: js/prefs.js:1584
+#: js/prefs.js:1580
 msgid "Customize stylesheet"
 msgstr "自定义样式"
 
@@ -2196,6 +1785,14 @@ msgstr "访问级别"
 msgid "Save data"
 msgstr "保存信息"
 
+#: classes/pref/prefs.php:245
+#: classes/pref/feeds.php:658
+#: classes/pref/feeds.php:878
+#: classes/pref/feeds.php:1813
+#: classes/feeds.php:1076
+msgid "Password"
+msgstr "密码"
+
 #: classes/pref/prefs.php:254
 msgid "Your password is at default value, please change it."
 msgstr "您还在使用系统默认的密码，请修改。"
@@ -2299,18 +1896,23 @@ msgstr "管理偏好文件"
 msgid "Reset to defaults"
 msgstr "恢复到默认"
 
+#: classes/pref/prefs.php:698
+#: classes/pref/feeds.php:772
+msgid "Plugins"
+msgstr "插件"
+
 #: classes/pref/prefs.php:700
 msgid "You will need to reload Tiny Tiny RSS for plugin changes to take effect."
 msgstr "需要刷新页面来使插件生效。"
 
-#: classes/pref/prefs.php:702
-msgid "Download more plugins at tt-rss.org <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forums</a> or <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a>."
-msgstr ""
-
-#: classes/pref/prefs.php:732
+#: classes/pref/prefs.php:730
 msgid "System plugins"
 msgstr "系统插件"
 
+#: classes/pref/prefs.php:731
+msgid "System plugins are enabled in <strong>config.php</strong> for all users."
+msgstr ""
+
 #: classes/pref/prefs.php:736
 #: classes/pref/prefs.php:792
 msgid "Plugin"
@@ -2384,6 +1986,352 @@ msgstr "移除选中的偏好文件"
 msgid "Activate profile"
 msgstr "启用偏好文件"
 
+#: classes/pref/feeds.php:15
+msgid "Check to enable field"
+msgstr "勾选以启用"
+
+#: classes/pref/feeds.php:65
+#: classes/pref/feeds.php:214
+#: classes/pref/feeds.php:258
+#: classes/pref/feeds.php:264
+#: classes/pref/feeds.php:290
+#, fuzzy, php-format
+msgid "(%d feed)"
+msgid_plural "(%d feeds)"
+msgstr[0] "(%d 个信息源)"
+
+#: classes/pref/feeds.php:561
+msgid "Feed Title"
+msgstr "信息源标题"
+
+#: classes/pref/feeds.php:595
+#: classes/pref/feeds.php:818
+#: classes/pref/feeds.php:1796
+#: classes/feeds.php:1048
+msgid "Place in category:"
+msgstr "加入到类别："
+
+#: classes/pref/feeds.php:608
+#: classes/pref/feeds.php:832
+#, fuzzy
+msgid "Language:"
+msgstr "语言："
+
+#: classes/pref/feeds.php:615
+#: classes/pref/feeds.php:841
+msgid "Update"
+msgstr "更新列表"
+
+#: classes/pref/feeds.php:630
+#: classes/pref/feeds.php:857
+msgid "Article purging:"
+msgstr "文章清理："
+
+#: classes/pref/feeds.php:662
+msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
+msgstr "<b>提示：</b>如果您的信息源需要验证，那么您需要填写登录信息。Twitter 信息源除外。"
+
+#: classes/pref/feeds.php:681
+#: classes/pref/feeds.php:888
+msgid "Hide from Popular feeds"
+msgstr "从最受欢迎的信息源中隐藏"
+
+#: classes/pref/feeds.php:693
+#: classes/pref/feeds.php:894
+msgid "Include in e-mail digest"
+msgstr "包含电子邮件摘要"
+
+#: classes/pref/feeds.php:706
+#: classes/pref/feeds.php:900
+msgid "Always display image attachments"
+msgstr "始终显示图片附件"
+
+#: classes/pref/feeds.php:719
+#: classes/pref/feeds.php:908
+msgid "Do not embed images"
+msgstr "不要嵌入图片"
+
+#: classes/pref/feeds.php:732
+#: classes/pref/feeds.php:916
+msgid "Cache media"
+msgstr ""
+
+#: classes/pref/feeds.php:744
+#: classes/pref/feeds.php:922
+msgid "Mark updated articles as unread"
+msgstr "将已更新的文章标记为未读"
+
+#: classes/pref/feeds.php:748
+msgid "Icon"
+msgstr "图标"
+
+#: classes/pref/feeds.php:765
+msgid "Replace"
+msgstr "替换"
+
+#: classes/pref/feeds.php:1174
+#: classes/pref/feeds.php:1227
+msgid "All done."
+msgstr "全部完成。"
+
+#: classes/pref/feeds.php:1282
+msgid "Feeds with errors"
+msgstr "有错误的信息源"
+
+#: classes/pref/feeds.php:1289
+#, fuzzy
+msgid "Inactive feeds"
+msgstr "刷新活动的信息源"
+
+#: classes/pref/feeds.php:1325
+msgid "Edit selected feeds"
+msgstr "编辑选定的信息源"
+
+#: classes/pref/feeds.php:1329
+#: js/prefs.js:1618
+msgid "Batch subscribe"
+msgstr "批量订阅"
+
+#: classes/pref/feeds.php:1336
+#, fuzzy
+msgid "Categories"
+msgstr "信息源类别"
+
+#: classes/pref/feeds.php:1339
+#, fuzzy
+msgid "Add category"
+msgstr "编辑类别"
+
+#: classes/pref/feeds.php:1343
+#, fuzzy
+msgid "Remove selected"
+msgstr "移除选中的信息源"
+
+#: classes/pref/feeds.php:1354
+msgid "More actions..."
+msgstr "更多操作"
+
+#: classes/pref/feeds.php:1358
+msgid "Manual purge"
+msgstr "手动清除"
+
+#: classes/pref/feeds.php:1362
+msgid "Clear feed data"
+msgstr "清空信息源数据"
+
+#: classes/pref/feeds.php:1416
+msgid "OPML"
+msgstr "OPML"
+
+#: classes/pref/feeds.php:1418
+msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
+msgstr "使用OPML你可以导出或导入信息源feeds列表、过滤器、标签以及设置。"
+
+#: classes/pref/feeds.php:1419
+msgid "Only main settings profile can be migrated using OPML."
+msgstr "只有主要设置能够通过OPML文件来进行迁移。"
+
+#: classes/pref/feeds.php:1432
+#, fuzzy
+msgid "Import my OPML"
+msgstr "正在导入 OPML ……"
+
+#: classes/pref/feeds.php:1438
+msgid "Filename:"
+msgstr "文件名："
+
+#: classes/pref/feeds.php:1440
+msgid "Include settings"
+msgstr "包含设置"
+
+#: classes/pref/feeds.php:1444
+#, fuzzy
+msgid "Export OPML"
+msgstr "正在导入 OPML ……"
+
+#: classes/pref/feeds.php:1448
+msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
+msgstr "您可以公开发布您的 OPML 。网上的任何人都可以通过如下 URL 订阅该文件。"
+
+#: classes/pref/feeds.php:1452
+msgid "Public OPML URL"
+msgstr "公开的 OPML URL"
+
+#: classes/pref/feeds.php:1453
+#, fuzzy
+msgid "Display published OPML URL"
+msgstr "公开的 OPML URL"
+
+#: classes/pref/feeds.php:1462
+msgid "Firefox integration"
+msgstr "Firefox 集成"
+
+#: classes/pref/feeds.php:1464
+msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
+msgstr "点击如下链接，可以将本 Tiny Tiny RSS 站点作为一个 Firefox 阅读器使用。"
+
+#: classes/pref/feeds.php:1471
+msgid "Click here to register this site as a feed reader."
+msgstr "点击此处将本站注册为信息源阅读器。"
+
+#: classes/pref/feeds.php:1479
+#, fuzzy
+msgid "Published & shared articles / Generated feeds"
+msgstr "已发布的文章和生成的信息源"
+
+#: classes/pref/feeds.php:1481
+msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
+msgstr "已发布的文章将会输出为公开的 RSS 信息源，网上的任何人可以通过如下 URL 进行订阅。"
+
+#: classes/pref/feeds.php:1488
+#: classes/feeds.php:54
+#: classes/feeds.php:140
+msgid "View as RSS"
+msgstr "以 RSS 形式阅读"
+
+#: classes/pref/feeds.php:1489
+msgid "Display URL"
+msgstr "显示 URL"
+
+#: classes/pref/feeds.php:1492
+msgid "Clear all generated URLs"
+msgstr "清空所有生成的 URL"
+
+#: classes/pref/feeds.php:1570
+msgid "These feeds have not been updated with new content for 3 months (oldest first):"
+msgstr "以下信息源已经有三个月没有内容更新了（最旧的在最上）："
+
+#: classes/pref/feeds.php:1604
+#: classes/pref/feeds.php:1668
+msgid "Click to edit feed"
+msgstr "点击以编辑信息源"
+
+#: classes/pref/feeds.php:1622
+#: classes/pref/feeds.php:1688
+msgid "Unsubscribe from selected feeds"
+msgstr "取消订阅选中的信息源"
+
+#: classes/pref/feeds.php:1793
+msgid "Add one valid RSS feed per line (no feed detection is done)"
+msgstr "每行添加一条RSS源"
+
+#: classes/pref/feeds.php:1802
+msgid "Feeds to subscribe, One per line"
+msgstr "所有将订阅的Feeds, 每行一条"
+
+#: classes/pref/feeds.php:1825
+msgid "Feeds require authentication."
+msgstr "Feed需要登录认证。"
+
+#: classes/pref/feeds.php:1832
+#: classes/feeds.php:1092
+#: classes/feeds.php:1146
+msgid "Subscribe"
+msgstr "订阅"
+
+#: classes/pref/system.php:29
+msgid "Error Log"
+msgstr "错误日志"
+
+#: classes/pref/system.php:40
+msgid "Refresh"
+msgstr "刷新"
+
+#: classes/pref/system.php:43
+#, fuzzy
+msgid "Clear log"
+msgstr "清空日志"
+
+#: classes/pref/system.php:48
+msgid "Error"
+msgstr "错误"
+
+#: classes/pref/system.php:49
+#, fuzzy
+msgid "Filename"
+msgstr "文件名："
+
+#: classes/pref/system.php:50
+msgid "Message"
+msgstr "消息"
+
+#: classes/pref/system.php:52
+msgid "Date"
+msgstr "日期"
+
+#: classes/opml.php:28
+#: classes/opml.php:33
+msgid "OPML Utility"
+msgstr "OPML 工具"
+
+#: classes/opml.php:37
+msgid "Importing OPML..."
+msgstr "正在导入 OPML ……"
+
+#: classes/opml.php:41
+msgid "Return to preferences"
+msgstr "返回偏好设置"
+
+#: classes/opml.php:295
+#, php-format
+msgid "Adding feed: %s"
+msgstr "添加信息源: %s"
+
+#: classes/opml.php:306
+#, fuzzy, php-format
+msgid "Duplicate feed: %s"
+msgstr "重复的信息源"
+
+#: classes/opml.php:320
+#, php-format
+msgid "Adding label %s"
+msgstr "添加预定义标签%s"
+
+#: classes/opml.php:323
+#, php-format
+msgid "Duplicate label: %s"
+msgstr "重复预定义标签: %s"
+
+#: classes/opml.php:335
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr "将偏好按键从 %s 设置为 %s"
+
+#: classes/opml.php:367
+#, fuzzy
+msgid "Adding filter..."
+msgstr "创建过滤器"
+
+#: classes/opml.php:486
+#, fuzzy, php-format
+msgid "Processing category: %s"
+msgstr "加入到类别："
+
+#: classes/opml.php:532
+#, php-format
+msgid "Upload failed with error code %d"
+msgstr "上传错误，错误代码：%d"
+
+#: classes/opml.php:544
+#: plugins/import_export/init.php:448
+#, fuzzy
+msgid "Unable to move uploaded file."
+msgstr "无法移动已上传文件。"
+
+#: classes/opml.php:548
+#: plugins/import_export/init.php:452
+msgid "Error: please upload OPML file."
+msgstr "错误：请上传 OPML 文件。"
+
+#: classes/opml.php:559
+#, fuzzy
+msgid "Error: unable to find moved OPML file."
+msgstr "错误：无法找到移动的OPML文件。"
+
+#: classes/opml.php:566
+msgid "Error while parsing document."
+msgstr "解析文档时发生错误。"
+
 #: classes/feeds.php:53
 msgid "View as RSS feed"
 msgstr "以RSS信息源方式阅读"
@@ -2425,8 +2373,8 @@ msgstr "移回原位"
 
 #: classes/feeds.php:127
 #: classes/feeds.php:132
-#: plugins/mail/init.php:75
 #: plugins/mailto/init.php:25
+#: plugins/mail/init.php:75
 msgid "Forward by email"
 msgstr "通过邮件转发"
 
@@ -2434,326 +2382,151 @@ msgstr "通过邮件转发"
 msgid "Feed:"
 msgstr "信息源："
 
-#: classes/feeds.php:229
-#: classes/feeds.php:892
+#: classes/feeds.php:228
+#: classes/feeds.php:885
 msgid "Feed not found."
 msgstr "找不到信息源。"
 
-#: classes/feeds.php:300
+#: classes/feeds.php:291
 #, fuzzy
 msgid "Never"
 msgstr "从不清理"
 
-#: classes/feeds.php:413
+#: classes/feeds.php:405
 #, fuzzy, php-format
 msgid "Imported at %s"
 msgstr "导入"
 
-#: classes/feeds.php:472
-#: classes/feeds.php:569
+#: classes/feeds.php:464
+#: classes/feeds.php:561
 #, fuzzy
 msgid "mark feed as read"
 msgstr "标记信息源为已读"
 
-#: classes/feeds.php:630
+#: classes/feeds.php:622
 #, fuzzy
 msgid "Collapse article"
 msgstr "折叠文章"
 
-#: classes/feeds.php:791
+#: classes/feeds.php:784
 msgid "No unread articles found to display."
 msgstr "没有未读文章。"
 
-#: classes/feeds.php:794
+#: classes/feeds.php:787
 msgid "No updated articles found to display."
 msgstr "没有最新更新的文章。"
 
-#: classes/feeds.php:797
+#: classes/feeds.php:790
 msgid "No starred articles found to display."
 msgstr "没有加星标的文章。"
 
-#: classes/feeds.php:801
+#: classes/feeds.php:794
 #, fuzzy
 msgid "No articles found to display. You can assign articles to labels manually from article header context menu (applies to all selected articles) or use a filter."
 msgstr "本标签下没有文章。你可以通过手动或过滤器的方式为文章添加预定义标签（参考上方动作菜单）。"
 
-#: classes/feeds.php:803
+#: classes/feeds.php:796
 msgid "No articles found to display."
 msgstr "暂时没有文章。"
 
-#: classes/feeds.php:818
-#: classes/feeds.php:992
+#: classes/feeds.php:811
+#: classes/feeds.php:985
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "上次信息源更新时间：%s"
 
-#: classes/feeds.php:828
-#: classes/feeds.php:1002
+#: classes/feeds.php:821
+#: classes/feeds.php:995
 msgid "Some feeds have update errors (click for details)"
 msgstr "部分信息源更新错误（点击了解详情）"
 
-#: classes/feeds.php:982
+#: classes/feeds.php:975
 msgid "No feed selected."
 msgstr "没有选中的信息源。"
 
-#: classes/feeds.php:1041
-#: classes/feeds.php:1049
+#: classes/feeds.php:1034
+#: classes/feeds.php:1042
 #, fuzzy
 msgid "Feed or site URL"
 msgstr "信息源 URL"
 
-#: classes/feeds.php:1063
+#: classes/feeds.php:1056
 msgid "Available feeds"
 msgstr "可用的信息源"
 
-#: classes/feeds.php:1094
+#: classes/feeds.php:1087
 msgid "This feed requires authentication."
 msgstr "这个信息源需要认证"
 
-#: classes/feeds.php:1102
+#: classes/feeds.php:1095
 msgid "More feeds"
 msgstr "更多信息源"
 
-#: classes/feeds.php:1129
+#: classes/feeds.php:1122
 msgid "Popular feeds"
 msgstr "最受欢迎的信息源"
 
-#: classes/feeds.php:1130
+#: classes/feeds.php:1123
 msgid "Feed archive"
 msgstr "信息源存档"
 
-#: classes/feeds.php:1133
+#: classes/feeds.php:1126
 msgid "limit:"
 msgstr "限制："
 
-#: classes/feeds.php:1165
+#: classes/feeds.php:1158
 msgid "Look for"
 msgstr "查找"
 
-#: classes/feeds.php:1173
+#: classes/feeds.php:1166
 #, php-format
 msgid "in %s"
 msgstr ""
 
-#: classes/feeds.php:1178
+#: classes/feeds.php:1171
 msgid "Used for word stemming"
 msgstr ""
 
-#: classes/feeds.php:1187
+#: classes/feeds.php:1180
 #, fuzzy
 msgid "Search syntax"
 msgstr "搜索语法"
 
-#: plugins/instances/init.php:141
-msgid "Linked"
-msgstr "链接"
-
-#: plugins/instances/init.php:204
-#: plugins/instances/init.php:395
-msgid "Instance"
-msgstr "实例"
-
-#: plugins/instances/init.php:215
-#: plugins/instances/init.php:312
-#: plugins/instances/init.php:404
-msgid "Instance URL"
-msgstr "实例 URL："
-
-#: plugins/instances/init.php:226
-#: plugins/instances/init.php:414
-msgid "Access key:"
-msgstr "访问密钥："
-
-#: plugins/instances/init.php:229
-#: plugins/instances/init.php:313
-#: plugins/instances/init.php:417
-msgid "Access key"
-msgstr "访问密钥"
-
-#: plugins/instances/init.php:233
-#: plugins/instances/init.php:421
-msgid "Use one access key for both linked instances."
-msgstr "为两个相联的实例使用一个访问密钥。"
-
-#: plugins/instances/init.php:241
-#: plugins/instances/init.php:429
-msgid "Generate new key"
-msgstr "生成新的密钥"
-
-#: plugins/instances/init.php:292
-msgid "Link instance"
-msgstr "链接实例"
-
-#: plugins/instances/init.php:304
-msgid "You can connect other instances of Tiny Tiny RSS to this one to share Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
-msgstr "您可以与其他的 Tiny Tiny RSS 实例相联，以共享最受欢迎的信息源列表。通过这个 URL 为本实例建立链接："
-
-#: plugins/instances/init.php:314
-msgid "Last connected"
-msgstr "上次连接"
-
-#: plugins/instances/init.php:315
-msgid "Status"
-msgstr "状态"
-
-#: plugins/instances/init.php:316
-msgid "Stored feeds"
-msgstr "保存的信息源"
-
-#: plugins/instances/init.php:433
-msgid "Create link"
-msgstr "创建链接"
-
-#: plugins/nsfw/init.php:30
-#: plugins/nsfw/init.php:42
-msgid "Not work safe (click to toggle)"
-msgstr ""
-
-#: plugins/nsfw/init.php:52
-msgid "NSFW Plugin"
-msgstr ""
-
-#: plugins/nsfw/init.php:79
-msgid "Tags to consider NSFW (comma-separated)"
-msgstr ""
-
-#: plugins/nsfw/init.php:100
-#, fuzzy
-msgid "Configuration saved."
-msgstr "设置已保存。"
-
-#: plugins/note/init.php:26
-#: plugins/note/note.js:11
-msgid "Edit article note"
-msgstr "编辑文章注记"
-
-#: plugins/vf_shared/init.php:16
-#: plugins/vf_shared/init.php:69
-#, fuzzy
-msgid "Shared articles"
+#: classes/feeds.php:1596
+msgid "Starred articles"
 msgstr "加星标文章"
 
-#: plugins/auth_internal/init.php:65
-#, fuzzy
-msgid "Please enter your one time password:"
-msgstr "请填写类别名称："
-
-#: plugins/auth_internal/init.php:188
-msgid "Password has been changed."
-msgstr "密码更改成功。"
-
-#: plugins/auth_internal/init.php:190
-msgid "Old password is incorrect."
-msgstr "原密码输入错误。"
-
-#: plugins/af_readability/init.php:21
-msgid "Data saved."
-msgstr ""
-
-#: plugins/af_readability/init.php:33
-#, fuzzy
-msgid "Inline content"
-msgstr "滚动文章内容"
-
-#: plugins/af_readability/init.php:39
-msgid "Readability settings (af_readability)"
-msgstr ""
-
-#: plugins/af_readability/init.php:66
-msgid "Use Readability for pages shared via bookmarklet."
-msgstr ""
-
-#: plugins/af_readability/init.php:78
-#: plugins/af_psql_trgm/init.php:191
-msgid "Currently enabled for (click to edit):"
-msgstr ""
-
-#: plugins/af_readability/init.php:95
-#, fuzzy
-msgid "Readability"
-msgstr "检查可用性"
-
-#: plugins/af_readability/init.php:106
-#, fuzzy
-msgid "Inline article content"
-msgstr "滚动文章内容"
-
-#: plugins/af_redditimgur/init.php:25
-msgid "Reddit content settings (af_redditimgur)"
-msgstr ""
+#: classes/feeds.php:1598
+msgid "Published articles"
+msgstr "已发布文章"
 
-#: plugins/af_redditimgur/init.php:50
-msgid "Uses Readability (full-text-rss) implementation by <a target='_blank' href='https://bitbucket.org/fivefilters/'>FiveFilters.org</a>"
-msgstr ""
+#: classes/feeds.php:1600
+msgid "Fresh articles"
+msgstr "最新更新的文章"
 
-#: plugins/af_redditimgur/init.php:54
-msgid "Extract missing content using Readability"
-msgstr ""
+#: classes/feeds.php:1604
+msgid "Archived articles"
+msgstr "存档的文章"
 
-#: plugins/af_redditimgur/init.php:59
-msgid "Enable additional duplicate checking"
-msgstr ""
+#: classes/feeds.php:1606
+msgid "Recently read"
+msgstr "最近的阅读"
 
-#: plugins/af_redditimgur/init.php:73
-#: plugins/af_zz_imgproxy/init.php:225
-#, fuzzy
-msgid "Configuration saved"
-msgstr "设置已保存。"
+#: classes/feeds.php:1716
+msgid "Special"
+msgstr "特殊区域"
 
-#: plugins/af_psql_trgm/init.php:28
+#: classes/feeds.php:1962
 #, php-format
-msgid "Data saved (%s, %d)"
-msgstr ""
+msgid "Search results: %s"
+msgstr "搜索结果：%s"
 
-#: plugins/af_psql_trgm/init.php:112
+#: plugins/vf_shared/init.php:16
+#: plugins/vf_shared/init.php:60
 #, fuzzy
-msgid "Show related articles"
+msgid "Shared articles"
 msgstr "加星标文章"
 
-#: plugins/af_psql_trgm/init.php:118
-#: plugins/af_psql_trgm/init.php:220
-#, fuzzy
-msgid "Mark similar articles as read"
-msgstr "将所有文章标记为已读？"
-
-#: plugins/af_psql_trgm/init.php:157
-msgid "PostgreSQL trigram extension returns string similarity as a floating point number (0-1). Setting it too low might produce false positives, zero disables checking."
-msgstr ""
-
-#: plugins/af_psql_trgm/init.php:160
-#, fuzzy
-msgid "Global settings"
-msgstr "包含设置"
-
-#: plugins/af_psql_trgm/init.php:164
-msgid "Minimum similarity:"
-msgstr ""
-
-#: plugins/af_psql_trgm/init.php:169
-msgid "Minimum title length:"
-msgstr ""
-
-#: plugins/af_psql_trgm/init.php:174
-#, fuzzy
-msgid "Enable for all feeds:"
-msgstr "启用信息源分类"
-
-#: plugins/af_psql_trgm/init.php:209
-msgid "Similarity (pg_trgm)"
-msgstr ""
-
-#: plugins/af_comics/init.php:40
-msgid "Feeds supported by af_comics"
-msgstr "af_comics的feed源"
-
-#: plugins/af_comics/init.php:42
-msgid "The following comics are currently supported:"
-msgstr "下面的comics已被支持："
-
-#: plugins/af_comics/init.php:60
-msgid "GoComics requires a specific URL to workaround their lack of feed support: <code>http://feeds.feedburner.com/uclick/<em>comic_name</em></code> (e.g. <code>http://www.gocomics.com/garfield</code> uses <code>http://feeds.feedburner.com/uclick/garfield</code>)."
-msgstr ""
-
 #: plugins/import_export/init.php:58
 msgid "Import and export"
 msgstr "导入和导出"
@@ -2770,93 +2543,82 @@ msgstr "导出我的数据"
 msgid "Import"
 msgstr "导入"
 
-#: plugins/import_export/init.php:225
+#: plugins/import_export/init.php:231
 msgid "Could not import: incorrect schema version."
 msgstr "无法导入：不正确的schema版本。"
 
-#: plugins/import_export/init.php:230
+#: plugins/import_export/init.php:236
 msgid "Could not import: unrecognized document format."
 msgstr "无法导入：不可识别的文档格式。"
 
-#: plugins/import_export/init.php:391
+#: plugins/import_export/init.php:397
 msgid "Finished: "
 msgstr "已完成："
 
-#: plugins/import_export/init.php:392
+#: plugins/import_export/init.php:398
 #, fuzzy, php-format
 msgid "%d article processed, "
 msgid_plural "%d articles processed, "
 msgstr[0] "编辑文章注记"
 
-#: plugins/import_export/init.php:393
+#: plugins/import_export/init.php:399
 #, fuzzy, php-format
 msgid "%d imported, "
 msgid_plural "%d imported, "
 msgstr[0] "已经导入过。"
 
-#: plugins/import_export/init.php:394
+#: plugins/import_export/init.php:400
 #, fuzzy, php-format
 msgid "%d feed created."
 msgid_plural "%d feeds created."
 msgstr[0] "没有选中的信息源。"
 
-#: plugins/import_export/init.php:399
+#: plugins/import_export/init.php:405
 msgid "Could not load XML document."
 msgstr "无法加载XML文档。"
 
-#: plugins/import_export/init.php:411
+#: plugins/import_export/init.php:417
 msgid "Prepare data"
 msgstr "准备数据"
 
-#: plugins/import_export/init.php:428
+#: plugins/import_export/init.php:434
 #, fuzzy, php-format
 msgid "Upload failed with error code %d (%s)"
 msgstr "上传错误，错误代码：%d"
 
-#: plugins/import_export/init.php:454
+#: plugins/import_export/init.php:460
 msgid "No file uploaded."
 msgstr "没有文件上传。"
 
-#: plugins/mail/init.php:28
-msgid "Mail addresses saved."
-msgstr ""
-
-#: plugins/mail/init.php:34
-#, fuzzy
-msgid "Mail plugin"
-msgstr "用户插件"
-
-#: plugins/mail/init.php:36
-msgid "You can set predefined email addressed here (comma-separated list):"
-msgstr ""
-
+#: plugins/mailto/init.php:48
+#: plugins/mailto/init.php:54
 #: plugins/mail/init.php:112
 #: plugins/mail/init.php:118
-#: plugins/mailto/init.php:49
-#: plugins/mailto/init.php:55
 msgid "[Forwarded]"
 msgstr "[已转发]"
 
+#: plugins/mailto/init.php:48
 #: plugins/mail/init.php:112
-#: plugins/mailto/init.php:49
 msgid "Multiple articles"
 msgstr "多个文章"
 
-#: plugins/mail/init.php:140
-msgid "To:"
-msgstr "收信人："
+#: plugins/mailto/init.php:70
+msgid "Clicking the following link to invoke your mail client:"
+msgstr "点击下面链接来启动你的邮件客户端："
 
-#: plugins/mail/init.php:155
-msgid "Subject:"
-msgstr "主题："
+#: plugins/mailto/init.php:74
+#, fuzzy
+msgid "Forward selected article(s) by email."
+msgstr "用邮件转发文章"
 
-#: plugins/mail/init.php:172
-msgid "Send e-mail"
-msgstr "发送邮件"
+#: plugins/mailto/init.php:77
+msgid "You should be able to edit the message before sending in your mail client."
+msgstr "在邮件发送前，你能够编辑消息。"
 
-#: plugins/close_button/init.php:22
-msgid "Close article"
-msgstr "关闭文章"
+#: plugins/mailto/init.php:82
+#, fuzzy
+msgid "Close this dialog"
+msgstr "关闭本界面"
 
 #: plugins/bookmarklets/init.php:20
 msgid "Bookmarklets"
@@ -2879,36 +2641,126 @@ msgstr "在 Tiny Tiny RSS 中订阅"
 msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
 msgstr ""
 
+#: plugins/af_psql_trgm/init.php:28
+#, php-format
+msgid "Data saved (%s, %d)"
+msgstr ""
+
+#: plugins/af_psql_trgm/init.php:112
+#, fuzzy
+msgid "Show related articles"
+msgstr "加星标文章"
+
+#: plugins/af_psql_trgm/init.php:118
+#: plugins/af_psql_trgm/init.php:220
+#, fuzzy
+msgid "Mark similar articles as read"
+msgstr "将所有文章标记为已读？"
+
+#: plugins/af_psql_trgm/init.php:157
+msgid "PostgreSQL trigram extension returns string similarity as a floating point number (0-1). Setting it too low might produce false positives, zero disables checking."
+msgstr ""
+
+#: plugins/af_psql_trgm/init.php:160
+#, fuzzy
+msgid "Global settings"
+msgstr "包含设置"
+
+#: plugins/af_psql_trgm/init.php:164
+msgid "Minimum similarity:"
+msgstr ""
+
+#: plugins/af_psql_trgm/init.php:169
+msgid "Minimum title length:"
+msgstr ""
+
+#: plugins/af_psql_trgm/init.php:174
+#, fuzzy
+msgid "Enable for all feeds:"
+msgstr "启用信息源分类"
+
+#: plugins/af_psql_trgm/init.php:191
+#: plugins/af_readability/init.php:78
+msgid "Currently enabled for (click to edit):"
+msgstr ""
+
+#: plugins/af_psql_trgm/init.php:209
+msgid "Similarity (pg_trgm)"
+msgstr ""
+
+#: plugins/nsfw/init.php:30
+#: plugins/nsfw/init.php:42
+msgid "Not work safe (click to toggle)"
+msgstr ""
+
+#: plugins/nsfw/init.php:52
+msgid "NSFW Plugin"
+msgstr ""
+
+#: plugins/nsfw/init.php:79
+msgid "Tags to consider NSFW (comma-separated)"
+msgstr ""
+
+#: plugins/nsfw/init.php:100
+#, fuzzy
+msgid "Configuration saved."
+msgstr "设置已保存。"
+
 #: plugins/toggle_sidebar/init.php:23
 msgid "Collapse feedlist"
 msgstr "收缩侧边栏"
 
-#: plugins/af_zz_imgproxy/init.php:186
-msgid "Image proxy settings (af_zz_imgproxy)"
+#: plugins/af_readability/init.php:21
+msgid "Data saved."
 msgstr ""
 
-#: plugins/af_zz_imgproxy/init.php:211
+#: plugins/af_readability/init.php:33
 #, fuzzy
-msgid "Enable proxy for all remote images."
-msgstr "启用信息源分类"
+msgid "Inline content"
+msgstr "滚动文章内容"
 
-#: plugins/mailto/init.php:71
-msgid "Clicking the following link to invoke your mail client:"
-msgstr "点击下面链接来启动你的邮件客户端："
+#: plugins/af_readability/init.php:39
+msgid "Readability settings (af_readability)"
+msgstr ""
 
-#: plugins/mailto/init.php:75
+#: plugins/af_readability/init.php:66
+msgid "Use Readability for pages shared via bookmarklet."
+msgstr ""
+
+#: plugins/af_readability/init.php:95
 #, fuzzy
-msgid "Forward selected article(s) by email."
-msgstr "用邮件转发文章"
+msgid "Readability"
+msgstr "检查可用性"
 
-#: plugins/mailto/init.php:78
-msgid "You should be able to edit the message before sending in your mail client."
-msgstr "在邮件发送前，你能够编辑消息。"
+#: plugins/af_readability/init.php:106
+#, fuzzy
+msgid "Inline article content"
+msgstr "滚动文章内容"
+
+#: plugins/mail/init.php:28
+msgid "Mail addresses saved."
+msgstr ""
 
-#: plugins/mailto/init.php:83
+#: plugins/mail/init.php:34
 #, fuzzy
-msgid "Close this dialog"
-msgstr "关闭本界面"
+msgid "Mail plugin"
+msgstr "用户插件"
+
+#: plugins/mail/init.php:36
+msgid "You can set predefined email addressed here (comma-separated list):"
+msgstr ""
+
+#: plugins/mail/init.php:140
+msgid "To:"
+msgstr "收信人："
+
+#: plugins/mail/init.php:155
+msgid "Subject:"
+msgstr "主题："
+
+#: plugins/mail/init.php:172
+msgid "Send e-mail"
+msgstr "发送邮件"
 
 #: plugins/share/init.php:39
 msgid "You can disable all articles shared by unique URLs here."
@@ -2922,26 +2774,100 @@ msgstr "取消所有分享"
 msgid "Share by URL"
 msgstr "通过 URL 分享"
 
-#: plugins/share/init.php:97
+#: plugins/share/init.php:96
 msgid "You can share this article by the following unique URL:"
 msgstr "您可以通过以下唯一 URL 分享本文："
 
-#: plugins/share/init.php:115
+#: plugins/share/init.php:114
 #, fuzzy
 msgid "Unshare article"
 msgstr "取消星标"
 
+#: plugins/af_comics/init.php:48
+msgid "Feeds supported by af_comics"
+msgstr "af_comics的feed源"
+
+#: plugins/af_comics/init.php:50
+msgid "The following comics are currently supported:"
+msgstr "下面的comics已被支持："
+
+#: plugins/af_comics/init.php:68
+msgid "GoComics requires a specific URL to workaround their lack of feed support: <code>http://feeds.feedburner.com/uclick/<em>comic_name</em></code> (e.g. <code>http://www.gocomics.com/garfield</code> uses <code>http://feeds.feedburner.com/uclick/garfield</code>)."
+msgstr ""
+
+#: plugins/af_comics/init.php:70
+msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:25
+msgid "Reddit content settings (af_redditimgur)"
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:50
+msgid "Uses Readability (full-text-rss) implementation by <a target='_blank' href='https://bitbucket.org/fivefilters/'>FiveFilters.org</a>"
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:54
+msgid "Extract missing content using Readability"
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:59
+msgid "Enable additional duplicate checking"
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:73
+#: plugins/af_zz_imgproxy/init.php:254
+#, fuzzy
+msgid "Configuration saved"
+msgstr "设置已保存。"
+
+#: plugins/note/init.php:26
+#: plugins/note/note.js:11
+msgid "Edit article note"
+msgstr "编辑文章注记"
+
+#: plugins/close_button/init.php:25
+msgid "Close article"
+msgstr "关闭文章"
+
+#: plugins/af_zz_imgproxy/init.php:210
+msgid "Image proxy settings (af_zz_imgproxy)"
+msgstr ""
+
+#: plugins/af_zz_imgproxy/init.php:234
+#, fuzzy
+msgid "Enable proxy for all remote images."
+msgstr "启用信息源分类"
+
+#: plugins/af_zz_imgproxy/init.php:238
+#, fuzzy
+msgid "Don't cache files locally."
+msgstr "本地缓存图片"
+
+#: plugins/auth_internal/init.php:65
+#, fuzzy
+msgid "Please enter your one time password:"
+msgstr "请填写类别名称："
+
+#: plugins/auth_internal/init.php:188
+msgid "Password has been changed."
+msgstr "密码更改成功。"
+
+#: plugins/auth_internal/init.php:190
+msgid "Old password is incorrect."
+msgstr "原密码输入错误。"
+
 #: js/FeedTree.js:172
 #, fuzzy
 msgid "(Un)collapse"
 msgstr "收起侧边栏"
 
-#: js/PrefFeedTree.js:52
+#: js/PrefFeedTree.js:54
 #, fuzzy
 msgid "Edit category"
 msgstr "编辑类别"
 
-#: js/PrefFeedTree.js:59
+#: js/PrefFeedTree.js:61
 #, fuzzy
 msgid "Remove category"
 msgstr "创建类别"
@@ -2979,64 +2905,55 @@ msgid "Create Filter"
 msgstr "创建过滤器"
 
 #: js/functions.js:1128
-msgid "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification hub again on next feed update."
-msgstr "重置订阅？ Tiny Tiny RSS 将会在下次信息源更新的时候尝试再次订阅信息提醒中心。"
-
-#: js/functions.js:1139
-#, fuzzy
-msgid "Subscription reset."
-msgstr "订阅信息源"
-
-#: js/functions.js:1149
-#: js/tt-rss.js:695
+#: js/tt-rss.js:696
 #, perl-format
 msgid "Unsubscribe from %s?"
 msgstr "从 %s 取消订阅？"
 
-#: js/functions.js:1152
+#: js/functions.js:1131
 msgid "Removing feed..."
 msgstr "删除feed..."
 
-#: js/functions.js:1225
+#: js/functions.js:1204
 msgid "Please enter category title:"
 msgstr "请填写类别名称："
 
-#: js/functions.js:1250
+#: js/functions.js:1229
 msgid "Generate new syndication address for this feed?"
 msgstr "为本信息源生成新的群地址？"
 
-#: js/functions.js:1254
-#: js/prefs.js:1154
+#: js/functions.js:1233
+#: js/prefs.js:1150
 msgid "Trying to change address..."
 msgstr "尝试更改地址..."
 
-#: js/functions.js:1497
-#: js/functions.js:1606
+#: js/functions.js:1476
+#: js/functions.js:1585
 #: js/prefs.js:398
 #: js/prefs.js:424
 #: js/prefs.js:456
 #: js/prefs.js:599
 #: js/prefs.js:617
-#: js/prefs.js:1136
-#: js/prefs.js:1263
+#: js/prefs.js:1132
+#: js/prefs.js:1259
 msgid "No feeds are selected."
 msgstr "没有选择任何信息源。"
 
-#: js/functions.js:1540
+#: js/functions.js:1519
 msgid "Remove selected feeds from the archive? Feeds with stored articles will not be removed."
 msgstr "将选中的信息源从存档中移除？包含已保存文章的信息源不会被移除。"
 
-#: js/functions.js:1577
+#: js/functions.js:1556
 msgid "Feeds with update errors"
 msgstr "更新错误的信息源"
 
-#: js/functions.js:1588
-#: js/prefs.js:1117
+#: js/functions.js:1567
+#: js/prefs.js:1113
 msgid "Remove selected feeds?"
 msgstr "移除选中的信息源？"
 
-#: js/functions.js:1591
-#: js/prefs.js:1120
+#: js/functions.js:1570
+#: js/prefs.js:1116
 #, fuzzy
 msgid "Removing selected feeds..."
 msgstr "移除选中的信息源？"
@@ -3061,9 +2978,7 @@ msgstr "编辑用户信息"
 #: js/prefs.js:100
 #: js/prefs.js:209
 #: js/prefs.js:706
-#: plugins/instances/instances.js:26
-#: plugins/instances/instances.js:89
-#: js/functions.js:1408
+#: js/functions.js:1387
 #, fuzzy
 msgid "Saving data..."
 msgstr "保存信息"
@@ -3092,7 +3007,7 @@ msgid "Removing selected labels..."
 msgstr "移除选中的预定义标签？"
 
 #: js/prefs.js:308
-#: js/prefs.js:1304
+#: js/prefs.js:1300
 msgid "No labels are selected."
 msgstr "没有选择任何预定义标签。"
 
@@ -3199,29 +3114,29 @@ msgstr "保存对信息源的更改？"
 msgid "OPML Import"
 msgstr "OPML 导入"
 
-#: js/prefs.js:764
+#: js/prefs.js:759
 msgid "Please choose an OPML file first."
 msgstr "请先选择一个 OPML 文件。"
 
-#: js/prefs.js:767
+#: js/prefs.js:762
 #: plugins/import_export/import_export.js:115
 #, fuzzy
 msgid "Importing, please wait..."
 msgstr "读取中，请稍候……"
 
-#: js/prefs.js:928
+#: js/prefs.js:924
 msgid "Reset to defaults?"
 msgstr "重置为默认状态？"
 
-#: js/prefs.js:1628
+#: js/prefs.js:1624
 msgid "Subscribing to feeds..."
 msgstr "订阅至信息源.."
 
-#: js/prefs.js:1647
+#: js/prefs.js:1643
 msgid "Clear stored data for this plugin?"
 msgstr "清除本插件已保存的数据？"
 
-#: js/prefs.js:1661
+#: js/prefs.js:1657
 msgid "Clear all messages in the error log?"
 msgstr "清除错误日志里的所有消息"
 
@@ -3234,184 +3149,152 @@ msgstr "将所有文章标记为已读？"
 msgid "Marking all feeds as read..."
 msgstr "标记所有信息源为已读"
 
-#: js/tt-rss.js:401
+#: js/tt-rss.js:402
 #, fuzzy
 msgid "Please enable mail plugin first."
 msgstr "请先选几个信息源吧。"
 
-#: js/tt-rss.js:449
-#: js/functions.js:1387
-#: js/tt-rss.js:676
+#: js/tt-rss.js:450
+#: js/functions.js:1366
+#: js/tt-rss.js:677
 msgid "You can't edit this kind of feed."
 msgstr "您无法编辑这种类型的信息源。"
 
-#: js/tt-rss.js:530
+#: js/tt-rss.js:531
 #, fuzzy
 msgid "Please enable embed_original plugin first."
 msgstr "请先选几个信息源吧。"
 
-#: js/tt-rss.js:543
-#: js/tt-rss.js:726
+#: js/tt-rss.js:544
+#: js/tt-rss.js:727
 msgid "Widescreen is not available in combined mode."
 msgstr ""
 
-#: js/tt-rss.js:824
+#: js/tt-rss.js:825
 msgid "You can't rescore this kind of feed."
 msgstr "无法重置本类信息源的评分。"
 
-#: js/tt-rss.js:829
-#: js/tt-rss.js:689
+#: js/tt-rss.js:830
+#: js/tt-rss.js:690
 msgid "Please select some feed first."
 msgstr "请先选几个信息源吧。"
 
-#: js/tt-rss.js:834
+#: js/tt-rss.js:835
 #, perl-format
 msgid "Rescore articles in %s?"
 msgstr "重置 %s 中文章的评分？"
 
-#: js/tt-rss.js:837
+#: js/tt-rss.js:838
 #, fuzzy
 msgid "Rescoring articles..."
 msgstr "为文章重新评分"
 
-#: js/viewfeed.js:919
-#: js/viewfeed.js:957
-#: js/viewfeed.js:1005
-#: js/viewfeed.js:1931
-#: plugins/mail/mail.js:7
+#: js/viewfeed.js:921
+#: js/viewfeed.js:959
+#: js/viewfeed.js:1007
+#: js/viewfeed.js:1933
 #: plugins/mailto/init.js:7
-#: js/viewfeed.js:677
-#: js/viewfeed.js:699
-#: js/viewfeed.js:720
-#: js/viewfeed.js:779
-#: js/viewfeed.js:807
+#: plugins/mail/mail.js:7
+#: js/viewfeed.js:679
+#: js/viewfeed.js:701
+#: js/viewfeed.js:722
+#: js/viewfeed.js:781
+#: js/viewfeed.js:809
 msgid "No articles are selected."
 msgstr "没有选中任何文章。"
 
-#: js/viewfeed.js:927
+#: js/viewfeed.js:929
 #, fuzzy, perl-format
 msgid "Delete %d selected article in %s?"
 msgid_plural "Delete %d selected articles in %s?"
 msgstr[0] "删除 %s 中选择的 %d 篇文章？"
 
-#: js/viewfeed.js:929
+#: js/viewfeed.js:931
 #, fuzzy, perl-format
 msgid "Delete %d selected article?"
 msgid_plural "Delete %d selected articles?"
 msgstr[0] "删除选中的 %d 篇文章？"
 
-#: js/viewfeed.js:966
+#: js/viewfeed.js:968
 #, fuzzy, perl-format
 msgid "Archive %d selected article in %s?"
 msgid_plural "Archive %d selected articles in %s?"
 msgstr[0] "将 %s 中的 %d 篇选中的文章存档？"
 
-#: js/viewfeed.js:969
+#: js/viewfeed.js:971
 #, fuzzy, perl-format
 msgid "Move %d archived article back?"
 msgid_plural "Move %d archived articles back?"
 msgstr[0] "将存档的 %d 篇文章移回原处？"
 
-#: js/viewfeed.js:971
+#: js/viewfeed.js:973
 msgid "Please note that unstarred articles might get purged on next feed update."
 msgstr ""
 
-#: js/viewfeed.js:1011
+#: js/viewfeed.js:1013
 #, fuzzy, perl-format
 msgid "Mark %d selected article in %s as read?"
 msgid_plural "Mark %d selected articles in %s as read?"
 msgstr[0] "将 %s 中选中的 %d 篇文章标记为已读？"
 
-#: js/viewfeed.js:1031
+#: js/viewfeed.js:1033
 msgid "Edit article Tags"
 msgstr "编辑文章的自定义标签"
 
-#: js/viewfeed.js:1037
+#: js/viewfeed.js:1039
 #, fuzzy
 msgid "Saving article tags..."
 msgstr "编辑文章的自定义标签"
 
-#: js/viewfeed.js:1670
+#: js/viewfeed.js:1672
 msgid "Open original article"
 msgstr "打开原文"
 
-#: js/viewfeed.js:1677
+#: js/viewfeed.js:1679
 #, fuzzy
 msgid "Display article URL"
 msgstr "显示 URL"
 
-#: js/viewfeed.js:1787
+#: js/viewfeed.js:1789
 msgid "Assign label"
 msgstr "添加预定义标签"
 
-#: js/viewfeed.js:1792
+#: js/viewfeed.js:1794
 msgid "Remove label"
 msgstr "移除预定义标签"
 
-#: js/viewfeed.js:1824
+#: js/viewfeed.js:1826
 #, fuzzy
 msgid "Select articles in group"
 msgstr "选择鼠标指向的文章"
 
-#: js/viewfeed.js:1834
+#: js/viewfeed.js:1836
 #, fuzzy
 msgid "Mark group as read"
 msgstr "标记为已读"
 
-#: js/viewfeed.js:1846
+#: js/viewfeed.js:1848
 msgid "Mark feed as read"
 msgstr "标记信息源为已读"
 
-#: js/viewfeed.js:1899
+#: js/viewfeed.js:1901
 #, fuzzy
 msgid "Please enter new score for selected articles:"
 msgstr "删除选中的 %d 篇文章？"
 
-#: js/viewfeed.js:1962
+#: js/viewfeed.js:1964
 #, fuzzy
 msgid "Please enter new score for this article:"
 msgstr "请填写类别名称："
 
-#: js/viewfeed.js:1993
+#: js/viewfeed.js:1995
 #, fuzzy
 msgid "Article URL:"
 msgstr "全部文章"
 
-#: plugins/instances/instances.js:10
-msgid "Link Instance"
-msgstr "链接实例"
-
-#: plugins/instances/instances.js:73
-msgid "Edit Instance"
-msgstr "编辑实例"
-
-#: plugins/instances/instances.js:122
-msgid "Remove selected instances?"
-msgstr "移除选中的实例？"
-
-#: plugins/instances/instances.js:125
-#, fuzzy
-msgid "Removing selected instances..."
-msgstr "移除选中的实例？"
-
-#: plugins/instances/instances.js:139
-#: plugins/instances/instances.js:151
-msgid "No instances are selected."
-msgstr "未选中任何实例。"
-
-#: plugins/instances/instances.js:156
-msgid "Please select only one instance."
-msgstr "请仅选择一个实例。"
-
-#: plugins/note/note.js:17
-#, fuzzy
-msgid "Saving article note..."
-msgstr "编辑文章注记"
-
-#: plugins/af_psql_trgm/init.js:11
-#, fuzzy
-msgid "Related articles"
-msgstr "删除文章"
+#: plugins/embed_original/init.js:6
+msgid "Sorry, your browser does not support sandboxed iframes."
+msgstr "对不起，你的浏览器不支持沙箱iframe。"
 
 #: plugins/import_export/import_export.js:13
 msgid "Export Data"
@@ -3431,11 +3314,16 @@ msgstr "导入数据"
 msgid "Please choose the file first."
 msgstr "请先选择文件。"
 
-#: plugins/mail/mail.js:21
 #: plugins/mailto/init.js:21
+#: plugins/mail/mail.js:21
 msgid "Forward article by email"
 msgstr "用邮件转发文章"
 
+#: plugins/af_psql_trgm/init.js:11
+#, fuzzy
+msgid "Related articles"
+msgstr "删除文章"
+
 #: plugins/mail/mail.js:36
 msgid "Error sending email:"
 msgstr ""
@@ -3445,10 +3333,6 @@ msgstr ""
 msgid "Your message has been sent."
 msgstr "您的个人数据已保存。"
 
-#: plugins/embed_original/init.js:6
-msgid "Sorry, your browser does not support sandboxed iframes."
-msgstr "对不起，你的浏览器不支持沙箱iframe。"
-
 #: plugins/shorten_expanded/init.js:39
 #, fuzzy
 msgid "Click to expand article"
@@ -3481,7 +3365,7 @@ msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr "之前共享文章的 URL 将会回到未认证状态。是否继续？"
 
 #: plugins/share/share_prefs.js:6
-#: js/prefs.js:1437
+#: js/prefs.js:1433
 msgid "Clearing URLs..."
 msgstr "清理 URLs..."
 
@@ -3489,26 +3373,45 @@ msgstr "清理 URLs..."
 msgid "Shared URLs cleared."
 msgstr "分享的URL已被清除。"
 
+#: plugins/note/note.js:17
+#, fuzzy
+msgid "Saving article note..."
+msgstr "编辑文章注记"
+
 #: js/feedlist.js:429
-#: js/feedlist.js:496
 msgid "Mark all articles in %s as read?"
 msgstr "将 %s 中的全部文章标记为已读？"
 
 #: js/feedlist.js:487
 #, fuzzy
-msgid "Mark all articles in %s older than 1 day as read?"
+msgid "Mark %w in %s older than 1 day as read?"
 msgstr "将 %s 中的一天前的全部文章标记为已读？"
 
 #: js/feedlist.js:490
 #, fuzzy
-msgid "Mark all articles in %s older than 1 week as read?"
+msgid "Mark %w in %s older than 1 week as read?"
 msgstr "将 %s 中的一周前的全部文章标记为已读？"
 
 #: js/feedlist.js:493
 #, fuzzy
-msgid "Mark all articles in %s older than 2 weeks as read?"
+msgid "Mark %w in %s older than 2 weeks as read?"
 msgstr "将 %s 中的两周前的全部文章标记为已读？"
 
+#: js/feedlist.js:496
+#, fuzzy
+msgid "Mark %w in %s as read?"
+msgstr "将 %s 中的全部文章标记为已读？"
+
+#: js/feedlist.js:499
+#, fuzzy
+msgid "search results"
+msgstr "搜索结果：%s"
+
+#: js/feedlist.js:499
+#, fuzzy
+msgid "all articles"
+msgstr "全部文章"
+
 #: js/functions.js:506
 msgid "Error explained"
 msgstr "Error释义 "
@@ -3595,189 +3498,257 @@ msgstr "您已经订阅过这个信息源啦。"
 msgid "Edit rule"
 msgstr "编辑过滤器"
 
-#: js/functions.js:1402
+#: js/functions.js:1381
 msgid "Edit Feed"
 msgstr "编辑信息源"
 
-#: js/functions.js:1435
+#: js/functions.js:1414
 msgid "More Feeds"
 msgstr "更多信息源"
 
-#: js/functions.js:1631
+#: js/functions.js:1610
 msgid "Help"
 msgstr "帮助"
 
-#: js/prefs.js:1032
+#: js/prefs.js:1028
 msgid "Remove category %s? Any nested feeds would be placed into Uncategorized."
 msgstr ""
 
-#: js/prefs.js:1038
+#: js/prefs.js:1034
 #, fuzzy
 msgid "Removing category..."
 msgstr "创建类别"
 
-#: js/prefs.js:1056
+#: js/prefs.js:1052
 msgid "Remove selected categories?"
 msgstr "移除选中的类别？"
 
-#: js/prefs.js:1059
+#: js/prefs.js:1055
 #, fuzzy
 msgid "Removing selected categories..."
 msgstr "移除选定的类别"
 
-#: js/prefs.js:1072
+#: js/prefs.js:1068
 msgid "No categories are selected."
 msgstr "没有选中任何类别。"
 
-#: js/prefs.js:1079
+#: js/prefs.js:1075
 #, fuzzy
 msgid "Category title:"
 msgstr "类别"
 
-#: js/prefs.js:1083
+#: js/prefs.js:1079
 #, fuzzy
 msgid "Creating category..."
 msgstr "创建过滤器"
 
-#: js/prefs.js:1106
+#: js/prefs.js:1102
 msgid "Feeds without recent updates"
 msgstr "最近没更新的信息源"
 
-#: js/prefs.js:1150
+#: js/prefs.js:1146
 msgid "Replace current OPML publishing address with a new one?"
 msgstr "将当前的 OPML 发布地址更改替换为新地址？"
 
-#: js/prefs.js:1227
+#: js/prefs.js:1223
 #, fuzzy
 msgid "Clearing feed..."
 msgstr "清空信息源数据"
 
-#: js/prefs.js:1247
+#: js/prefs.js:1243
 msgid "Rescore articles in selected feeds?"
 msgstr "为选中信息源中的文章重置评分？"
 
-#: js/prefs.js:1250
+#: js/prefs.js:1246
 #, fuzzy
 msgid "Rescoring selected feeds..."
 msgstr "为选中信息源中的文章重置评分？"
 
-#: js/prefs.js:1270
+#: js/prefs.js:1266
 msgid "Rescore all articles? This operation may take a lot of time."
 msgstr "重置所有文章的评分？这可能将花费很长时间。"
 
-#: js/prefs.js:1273
+#: js/prefs.js:1269
 #, fuzzy
 msgid "Rescoring feeds..."
 msgstr "为信息源重新评分"
 
-#: js/prefs.js:1289
+#: js/prefs.js:1285
 msgid "Reset selected labels to default colors?"
 msgstr "将选中的可选标签重置为默认颜色？"
 
-#: js/prefs.js:1321
+#: js/prefs.js:1317
 msgid "Settings Profiles"
 msgstr "偏好文件的设置"
 
-#: js/prefs.js:1330
+#: js/prefs.js:1326
 msgid "Remove selected profiles? Active and default profiles will not be removed."
 msgstr "移除选中的偏好文件？当前偏好与默认偏好不会被移除。"
 
-#: js/prefs.js:1333
+#: js/prefs.js:1329
 #, fuzzy
 msgid "Removing selected profiles..."
 msgstr "移除选中的偏好文件"
 
-#: js/prefs.js:1349
+#: js/prefs.js:1345
 msgid "No profiles are selected."
 msgstr "未选择偏好文件。"
 
-#: js/prefs.js:1357
-#: js/prefs.js:1410
+#: js/prefs.js:1353
+#: js/prefs.js:1406
 msgid "Activate selected profile?"
 msgstr "启用选中的偏好文件？"
 
-#: js/prefs.js:1374
-#: js/prefs.js:1426
+#: js/prefs.js:1370
+#: js/prefs.js:1422
 msgid "Please choose a profile to activate."
 msgstr "请选择希望启用的偏好文件。"
 
-#: js/prefs.js:1379
+#: js/prefs.js:1375
 #, fuzzy
 msgid "Creating profile..."
 msgstr "创建偏好文件"
 
-#: js/prefs.js:1434
+#: js/prefs.js:1430
 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr "之前生成的信息源 URL 将会回到未认证状态。是否继续？"
 
-#: js/prefs.js:1444
+#: js/prefs.js:1440
 #, fuzzy
 msgid "Generated URLs cleared."
 msgstr "生成一个新的 URL"
 
-#: js/prefs.js:1516
+#: js/prefs.js:1512
 msgid "Label Editor"
 msgstr "编辑预定义标签"
 
-#: js/tt-rss.js:684
+#: js/tt-rss.js:685
 msgid "You can't unsubscribe from the category."
 msgstr "您不能取消订阅一个类别。"
 
-#: js/viewfeed.js:125
-#: js/viewfeed.js:175
-#: js/viewfeed.js:192
+#: js/viewfeed.js:127
+#: js/viewfeed.js:177
+#: js/viewfeed.js:194
 #, fuzzy
 msgid "Click to open next unread feed."
 msgstr "点击以编辑信息源"
 
-#: js/viewfeed.js:129
+#: js/viewfeed.js:131
 #, fuzzy
 msgid "Cancel search"
 msgstr "取消"
 
-#: js/viewfeed.js:189
+#: js/viewfeed.js:191
 #, fuzzy
 msgid "New articles found, reload feed to continue."
 msgstr "暂时没有文章。"
 
-#: js/viewfeed.js:424
+#: js/viewfeed.js:426
 msgid "Unstar article"
 msgstr "取消星标"
 
-#: js/viewfeed.js:428
+#: js/viewfeed.js:430
 msgid "Star article"
 msgstr "加星标"
 
-#: js/viewfeed.js:478
+#: js/viewfeed.js:480
 msgid "Unpublish article"
 msgstr "取消发布文章"
 
-#: js/viewfeed.js:482
+#: js/viewfeed.js:484
 msgid "Publish article"
 msgstr "发布文章"
 
-#: js/viewfeed.js:622
+#: js/viewfeed.js:624
 #, fuzzy
 msgid "%d article selected"
 msgid_plural "%d articles selected"
 msgstr[0] "未选中任何文章。"
 
-#: js/viewfeed.js:1286
+#: js/viewfeed.js:1288
 msgid "No article is selected."
 msgstr "未选中任何文章。"
 
-#: js/viewfeed.js:1321
+#: js/viewfeed.js:1323
 msgid "No articles found to mark"
 msgstr "未找到需要标记的文章"
 
-#: js/viewfeed.js:1323
+#: js/viewfeed.js:1325
 #, fuzzy
 msgid "Mark %d article as read?"
 msgid_plural "Mark %d articles as read?"
 msgstr[0] "将 %d 篇文章标记为已读？"
 
-#~ msgid "Cache images locally"
-#~ msgstr "本地缓存图片"
+#~ msgid "Resubscribe to push updates"
+#~ msgstr "重新订阅以推送更新"
+
+#~ msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
+#~ msgstr "为启用推送的信息源重置 PubSubHubbub 订阅。"
+
+#~ msgid "Linked"
+#~ msgstr "链接"
+
+#~ msgid "Instance"
+#~ msgstr "实例"
+
+#~ msgid "Instance URL"
+#~ msgstr "实例 URL："
+
+#~ msgid "Access key:"
+#~ msgstr "访问密钥："
+
+#~ msgid "Access key"
+#~ msgstr "访问密钥"
+
+#~ msgid "Use one access key for both linked instances."
+#~ msgstr "为两个相联的实例使用一个访问密钥。"
+
+#~ msgid "Generate new key"
+#~ msgstr "生成新的密钥"
+
+#~ msgid "Link instance"
+#~ msgstr "链接实例"
+
+#~ msgid "You can connect other instances of Tiny Tiny RSS to this one to share Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
+#~ msgstr "您可以与其他的 Tiny Tiny RSS 实例相联，以共享最受欢迎的信息源列表。通过这个 URL 为本实例建立链接："
+
+#~ msgid "Last connected"
+#~ msgstr "上次连接"
+
+#~ msgid "Status"
+#~ msgstr "状态"
+
+#~ msgid "Stored feeds"
+#~ msgstr "保存的信息源"
+
+#~ msgid "Create link"
+#~ msgstr "创建链接"
+
+#~ msgid "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification hub again on next feed update."
+#~ msgstr "重置订阅？ Tiny Tiny RSS 将会在下次信息源更新的时候尝试再次订阅信息提醒中心。"
+
+#, fuzzy
+#~ msgid "Subscription reset."
+#~ msgstr "订阅信息源"
+
+#~ msgid "Link Instance"
+#~ msgstr "链接实例"
+
+#~ msgid "Edit Instance"
+#~ msgstr "编辑实例"
+
+#~ msgid "Remove selected instances?"
+#~ msgstr "移除选中的实例？"
+
+#, fuzzy
+#~ msgid "Removing selected instances..."
+#~ msgstr "移除选中的实例？"
+
+#~ msgid "No instances are selected."
+#~ msgstr "未选中任何实例。"
+
+#~ msgid "Please select only one instance."
+#~ msgstr "请仅选择一个实例。"
 
 #~ msgid "The error will be reported to the configured log destination."
 #~ msgstr "error会保存在配置的目标日志中"
diff --git a/locale/zh_TW/LC_MESSAGES/messages.mo b/locale/zh_TW/LC_MESSAGES/messages.mo
index e2d173290..d82b643c7 100644
--- a/locale/zh_TW/LC_MESSAGES/messages.mo
+++ b/locale/zh_TW/LC_MESSAGES/messages.mo
diff --git a/locale/zh_TW/LC_MESSAGES/messages.po b/locale/zh_TW/LC_MESSAGES/messages.po
index f55395dd5..f03216c01 100644
--- a/locale/zh_TW/LC_MESSAGES/messages.po
+++ b/locale/zh_TW/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tiny Tiny RSS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 15:25+0300\n"
+"POT-Creation-Date: 2017-07-04 16:29+0300\n"
 "PO-Revision-Date: 2014-02-17 23:12+0800\n"
 "Last-Translator: Yuan Chiu <[email protected]>\n"
 "Language-Team: Yuan Chiu <[email protected]>\n"
@@ -174,31 +174,30 @@ msgstr "未找到使用者"
 #: prefs.php:118
 #: classes/backend.php:5
 #: classes/pref/labels.php:282
-#: classes/pref/feeds.php:1402
-#: classes/pref/filters.php:779
+#: classes/pref/filters.php:819
+#: classes/pref/feeds.php:1376
 #: js/feedlist.js:149
-#: js/functions.js:1131
-#: js/functions.js:1231
-#: js/functions.js:1478
+#: js/functions.js:1210
+#: js/functions.js:1457
 #: js/prefs.js:621
-#: js/prefs.js:818
-#: js/prefs.js:1648
-#: js/prefs.js:1663
-#: js/tt-rss.js:550
-#: js/viewfeed.js:1182
+#: js/prefs.js:813
+#: js/prefs.js:1644
+#: js/prefs.js:1659
+#: js/tt-rss.js:551
+#: js/viewfeed.js:1184
 #: plugins/import_export/import_export.js:17
 #: js/feedlist.js:467
-#: js/feedlist.js:512
+#: js/feedlist.js:515
 #: js/functions.js:372
 #: js/functions.js:630
-#: js/prefs.js:1360
-#: js/prefs.js:1413
-#: js/prefs.js:1452
-#: js/prefs.js:1465
-#: js/prefs.js:1476
-#: js/prefs.js:1491
-#: js/tt-rss.js:567
-#: js/viewfeed.js:762
+#: js/prefs.js:1356
+#: js/prefs.js:1409
+#: js/prefs.js:1448
+#: js/prefs.js:1461
+#: js/prefs.js:1472
+#: js/prefs.js:1487
+#: js/tt-rss.js:568
+#: js/viewfeed.js:764
 msgid "Loading, please wait..."
 msgstr "載入中，請稍候……"
 
@@ -215,13 +214,13 @@ msgid "All Articles"
 msgstr "全部文章"
 
 #: index.php:192
-#: include/functions2.php:107
+#: include/functions.php:1181
 #: classes/feeds.php:110
 msgid "Starred"
 msgstr "星標"
 
 #: index.php:193
-#: include/functions2.php:108
+#: include/functions.php:1182
 #: classes/feeds.php:111
 msgid "Published"
 msgstr "已發布"
@@ -262,7 +261,7 @@ msgstr "標題"
 
 #: index.php:209
 #: index.php:249
-#: include/functions2.php:95
+#: include/functions.php:1169
 #: classes/feeds.php:115
 #: js/FeedTree.js:138
 #: js/FeedTree.js:166
@@ -302,7 +301,7 @@ msgid "Feed actions:"
 msgstr "摘要操作："
 
 #: index.php:244
-#: classes/handler/public.php:672
+#: classes/handler/public.php:583
 msgid "Subscribe to feed..."
 msgstr "訂閱摘要"
 
@@ -316,8 +315,8 @@ msgstr "為摘要重新評分"
 
 #: index.php:247
 #: classes/pref/feeds.php:785
-#: classes/pref/feeds.php:1357
-#: js/PrefFeedTree.js:78
+#: classes/pref/feeds.php:1331
+#: js/PrefFeedTree.js:80
 msgid "Unsubscribe"
 msgstr "取消訂閱"
 
@@ -334,7 +333,7 @@ msgid "Other actions:"
 msgstr "其他操作："
 
 #: index.php:252
-#: include/functions2.php:81
+#: include/functions.php:1155
 msgid "Toggle widescreen mode"
 msgstr "切換版面顯示"
 
@@ -360,7 +359,7 @@ msgstr ""
 
 #: prefs.php:33
 #: prefs.php:136
-#: include/functions2.php:110
+#: include/functions.php:1184
 #: classes/pref/prefs.php:435
 msgid "Preferences"
 msgstr "偏好設定"
@@ -375,20 +374,19 @@ msgstr "退出偏好設定"
 
 #: prefs.php:139
 #: classes/pref/feeds.php:112
-#: classes/pref/feeds.php:1297
-#: classes/pref/feeds.php:1346
+#: classes/pref/feeds.php:1271
+#: classes/pref/feeds.php:1320
 msgid "Feeds"
 msgstr "摘要"
 
 #: prefs.php:142
-#: classes/pref/filters.php:248
+#: classes/pref/filters.php:273
 msgid "Filters"
 msgstr "過濾器"
 
 #: prefs.php:145
-#: include/functions.php:1327
-#: include/functions.php:1979
 #: classes/pref/labels.php:90
+#: classes/feeds.php:1718
 msgid "Labels"
 msgstr "預定義標籤"
 
@@ -417,13 +415,13 @@ msgstr "新使用者註冊功能被管理員禁用。"
 #: register.php:337
 #: register.php:347
 #: register.php:359
-#: classes/handler/public.php:742
-#: classes/handler/public.php:813
-#: classes/handler/public.php:911
-#: classes/handler/public.php:990
-#: classes/handler/public.php:1004
-#: classes/handler/public.php:1011
-#: classes/handler/public.php:1036
+#: classes/handler/public.php:653
+#: classes/handler/public.php:724
+#: classes/handler/public.php:822
+#: classes/handler/public.php:901
+#: classes/handler/public.php:915
+#: classes/handler/public.php:922
+#: classes/handler/public.php:947
 msgid "Return to Tiny Tiny RSS"
 msgstr "返回 Tiny Tiny RSS"
 
@@ -440,12 +438,12 @@ msgid "Check availability"
 msgstr "檢查可用性"
 
 #: register.php:229
-#: classes/handler/public.php:829
+#: classes/handler/public.php:740
 msgid "Email:"
 msgstr "電子郵箱："
 
 #: register.php:232
-#: classes/handler/public.php:834
+#: classes/handler/public.php:745
 msgid "How much is two plus two:"
 msgstr "二加二等於几："
 
@@ -473,17 +471,23 @@ msgstr "帳號建立成功。"
 msgid "New user registrations are currently closed."
 msgstr "使用者註冊功能目前沒有啟用。"
 
-#: update.php:67
+#: update.php:66
 msgid "Tiny Tiny RSS data update script."
 msgstr "Tiny Tiny RSS 資料庫是最新版。"
 
-#: include/digest.php:109
-#: include/functions.php:1336
-#: include/functions.php:1880
-#: include/functions.php:1965
-#: include/functions.php:1987
-#: classes/opml.php:421
+#: include/controls.php:83
+#: classes/pref/filters.php:242
+#: classes/pref/filters.php:253
+#: classes/pref/filters.php:544
+msgid "All feeds"
+msgstr "全部摘要"
+
+#: include/controls.php:134
+#: include/controls.php:316
 #: classes/pref/feeds.php:228
+#: classes/opml.php:486
+#: classes/feeds.php:1727
+#: classes/digest.php:113
 msgid "Uncategorized"
 msgstr "未分類"
 
@@ -497,401 +501,298 @@ msgstr[0] "%d 個存檔的文章"
 msgid "No feeds found."
 msgstr "未找到摘要。"
 
-#: include/functions.php:1029
+#: include/functions.php:900
 #, php-format
 msgid "%d min"
 msgstr ""
 
-#: include/functions.php:1325
-#: include/functions.php:1977
-msgid "Special"
-msgstr "特殊區域"
-
-#: include/functions.php:1828
-#: classes/pref/filters.php:229
-#: classes/pref/filters.php:507
-msgid "All feeds"
-msgstr "全部摘要"
-
-#: include/functions.php:2032
-msgid "Starred articles"
-msgstr "加星標文章"
-
-#: include/functions.php:2034
-msgid "Published articles"
-msgstr "已發布文章"
-
-#: include/functions.php:2036
-msgid "Fresh articles"
-msgstr "最新更新的文章"
-
-#: include/functions.php:2038
-#: include/functions2.php:105
-msgid "All articles"
-msgstr "全部文章"
-
-#: include/functions.php:2040
-msgid "Archived articles"
-msgstr "已儲存的文章"
-
-#: include/functions.php:2042
-msgid "Recently read"
-msgstr "閱讀紀錄"
-
-#: include/functions2.php:57
+#: include/functions.php:1131
 msgid "Navigation"
 msgstr "導航"
 
-#: include/functions2.php:58
+#: include/functions.php:1132
 msgid "Open next feed"
 msgstr "顯示下一個摘要"
 
-#: include/functions2.php:59
+#: include/functions.php:1133
 msgid "Open previous feed"
 msgstr ""
 
-#: include/functions2.php:60
+#: include/functions.php:1134
 msgid "Open next article"
 msgstr "開啟下一個文章"
 
-#: include/functions2.php:61
+#: include/functions.php:1135
 msgid "Open previous article"
 msgstr "開啟上一個文章"
 
-#: include/functions2.php:62
+#: include/functions.php:1136
 msgid "Open next article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions2.php:63
+#: include/functions.php:1137
 msgid "Open previous article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions2.php:64
+#: include/functions.php:1138
 msgid "Move to next article (don't expand or mark read)"
 msgstr ""
 
-#: include/functions2.php:65
+#: include/functions.php:1139
 msgid "Move to previous article (don't expand or mark read)"
 msgstr ""
 
-#: include/functions2.php:66
+#: include/functions.php:1140
 msgid "Show search dialog"
 msgstr "顯示搜尋對話框"
 
-#: include/functions2.php:67
+#: include/functions.php:1141
 msgid "Article"
 msgstr "文章"
 
-#: include/functions2.php:68
-#: js/viewfeed.js:1699
+#: include/functions.php:1142
+#: js/viewfeed.js:1701
 msgid "Toggle starred"
 msgstr "鎖定加星標的項"
 
-#: include/functions2.php:69
-#: js/viewfeed.js:1711
+#: include/functions.php:1143
+#: js/viewfeed.js:1713
 msgid "Toggle published"
 msgstr "鎖定發布的項"
 
-#: include/functions2.php:70
-#: js/viewfeed.js:1686
+#: include/functions.php:1144
+#: js/viewfeed.js:1688
 msgid "Toggle unread"
 msgstr "鎖定未讀項"
 
-#: include/functions2.php:71
+#: include/functions.php:1145
 msgid "Edit tags"
 msgstr "編輯自訂標籤"
 
-#: include/functions2.php:72
+#: include/functions.php:1146
 msgid "Open in new window"
 msgstr "在新視窗打開文章"
 
-#: include/functions2.php:73
-#: js/viewfeed.js:1732
+#: include/functions.php:1147
+#: js/viewfeed.js:1734
 msgid "Mark below as read"
 msgstr "以下標記為已讀"
 
-#: include/functions2.php:74
-#: js/viewfeed.js:1725
+#: include/functions.php:1148
+#: js/viewfeed.js:1727
 msgid "Mark above as read"
 msgstr "以上標記為已讀"
 
-#: include/functions2.php:75
+#: include/functions.php:1149
 msgid "Scroll down"
 msgstr "向下捲動"
 
-#: include/functions2.php:76
+#: include/functions.php:1150
 msgid "Scroll up"
 msgstr "向上捲動"
 
-#: include/functions2.php:77
+#: include/functions.php:1151
 #, fuzzy
 msgid "Select article under cursor"
 msgstr "選擇鼠標指向的文章"
 
-#: include/functions2.php:78
+#: include/functions.php:1152
 #, fuzzy
 msgid "Email article"
 msgstr "透過郵件發送文章"
 
-#: include/functions2.php:79
+#: include/functions.php:1153
 #, fuzzy
 msgid "Close/collapse article"
 msgstr "選擇所有文章"
 
-#: include/functions2.php:80
+#: include/functions.php:1154
 #, fuzzy
 msgid "Toggle article expansion (combined mode)"
 msgstr "鎖定發布的項"
 
-#: include/functions2.php:82
+#: include/functions.php:1156
 #: plugins/embed_original/init.php:31
 msgid "Toggle embed original"
 msgstr "切換為原網頁顯示"
 
-#: include/functions2.php:83
+#: include/functions.php:1157
 msgid "Article selection"
 msgstr "選擇文章"
 
-#: include/functions2.php:84
+#: include/functions.php:1158
 msgid "Select all articles"
 msgstr "選擇所有文章"
 
-#: include/functions2.php:85
+#: include/functions.php:1159
 msgid "Select unread"
 msgstr "選擇未讀文章"
 
-#: include/functions2.php:86
+#: include/functions.php:1160
 msgid "Select starred"
 msgstr "選擇星標的"
 
-#: include/functions2.php:87
+#: include/functions.php:1161
 msgid "Select published"
 msgstr "選擇已發佈文章"
 
-#: include/functions2.php:88
+#: include/functions.php:1162
 msgid "Invert selection"
 msgstr "反向選取"
 
-#: include/functions2.php:89
+#: include/functions.php:1163
 msgid "Deselect everything"
 msgstr "取消選擇所有文章"
 
-#: include/functions2.php:90
+#: include/functions.php:1164
 #: classes/pref/feeds.php:555
-#: classes/pref/feeds.php:823
+#: classes/pref/feeds.php:811
 msgid "Feed"
 msgstr "摘要"
 
-#: include/functions2.php:91
+#: include/functions.php:1165
 msgid "Refresh current feed"
 msgstr "重新整理目前摘要"
 
-#: include/functions2.php:92
+#: include/functions.php:1166
 msgid "Un/hide read feeds"
 msgstr "隱藏（顯示）已讀信息"
 
-#: include/functions2.php:93
-#: classes/pref/feeds.php:1349
+#: include/functions.php:1167
+#: classes/pref/feeds.php:1323
 msgid "Subscribe to feed"
 msgstr "訂閱摘要"
 
-#: include/functions2.php:94
+#: include/functions.php:1168
 #: js/FeedTree.js:145
-#: js/PrefFeedTree.js:72
-#: js/viewfeed.js:1853
+#: js/PrefFeedTree.js:74
+#: js/viewfeed.js:1855
 msgid "Edit feed"
 msgstr "編輯摘要"
 
-#: include/functions2.php:96
+#: include/functions.php:1170
 #, fuzzy
 msgid "Reverse headlines"
 msgstr "反向排序"
 
-#: include/functions2.php:97
+#: include/functions.php:1171
 msgid "Toggle headline grouping"
 msgstr ""
 
-#: include/functions2.php:98
+#: include/functions.php:1172
 #, fuzzy
 msgid "Debug feed update"
 msgstr "禁用更新"
 
-#: include/functions2.php:99
+#: include/functions.php:1173
 #, fuzzy
 msgid "Debug viewfeed()"
 msgstr "禁用更新"
 
-#: include/functions2.php:100
+#: include/functions.php:1174
 #: js/FeedTree.js:194
 msgid "Mark all feeds as read"
 msgstr "標記所有摘要為已讀"
 
-#: include/functions2.php:101
+#: include/functions.php:1175
 #, fuzzy
 msgid "Un/collapse current category"
 msgstr "加入到類別："
 
-#: include/functions2.php:102
+#: include/functions.php:1176
 #, fuzzy
 msgid "Toggle combined mode"
 msgstr "鎖定發布的項"
 
-#: include/functions2.php:103
+#: include/functions.php:1177
 #, fuzzy
 msgid "Toggle auto expand in combined mode"
 msgstr "鎖定發布的項"
 
-#: include/functions2.php:104
+#: include/functions.php:1178
 msgid "Go to"
 msgstr "跳到……"
 
-#: include/functions2.php:106
+#: include/functions.php:1179
+#: classes/feeds.php:1602
+msgid "All articles"
+msgstr "全部文章"
+
+#: include/functions.php:1180
 msgid "Fresh"
 msgstr ""
 
-#: include/functions2.php:109
-#: js/tt-rss.js:494
-#: js/tt-rss.js:663
+#: include/functions.php:1183
+#: js/tt-rss.js:495
+#: js/tt-rss.js:664
 msgid "Tag cloud"
 msgstr "標籤雲"
 
-#: include/functions2.php:111
+#: include/functions.php:1185
 msgid "Other"
 msgstr "其他"
 
-#: include/functions2.php:112
+#: include/functions.php:1186
 #: classes/pref/labels.php:267
 msgid "Create label"
 msgstr "建立預定義標籤"
 
-#: include/functions2.php:113
-#: classes/pref/filters.php:753
+#: include/functions.php:1187
+#: classes/pref/filters.php:793
 msgid "Create filter"
 msgstr "建立過濾器"
 
-#: include/functions2.php:114
+#: include/functions.php:1188
 #, fuzzy
 msgid "Un/collapse sidebar"
 msgstr "折疊側邊欄"
 
-#: include/functions2.php:115
+#: include/functions.php:1189
 #, fuzzy
 msgid "Show help dialog"
 msgstr "顯示搜尋對話框"
 
-#: include/functions2.php:670
-#, php-format
-msgid "Search results: %s"
-msgstr "搜尋結果： %s"
-
-#: include/functions2.php:1336
-#: classes/feeds.php:752
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] "回應"
-
-#: include/functions2.php:1340
-#: classes/feeds.php:756
-msgid "comments"
-msgstr "回應"
-
-#: include/functions2.php:1366
-msgid " - "
-msgstr " - "
-
-#: include/functions2.php:1397
-#: include/functions2.php:1648
-#: classes/article.php:311
-msgid "no tags"
-msgstr "無標籤"
-
-#: include/functions2.php:1407
-#: classes/feeds.php:738
-msgid "Edit tags for this article"
-msgstr "為本文編輯自訂標籤"
-
-#: include/functions2.php:1439
-#: classes/feeds.php:690
-msgid "Originally from:"
-msgstr "來源："
-
-#: include/functions2.php:1452
-#: classes/pref/feeds.php:574
-#: classes/feeds.php:703
-msgid "Feed URL"
-msgstr "摘要 URL"
-
-#: include/functions2.php:1489
-#: classes/backend.php:105
-#: classes/dlg.php:37
-#: classes/dlg.php:60
-#: classes/dlg.php:93
-#: classes/dlg.php:159
-#: classes/dlg.php:186
-#: classes/pref/feeds.php:1652
-#: classes/pref/feeds.php:1718
-#: classes/pref/filters.php:204
-#: classes/pref/prefs.php:1097
-#: plugins/af_psql_trgm/init.php:102
-#: plugins/import_export/init.php:415
-#: plugins/import_export/init.php:461
-#: plugins/share/init.php:121
-msgid "Close this window"
-msgstr "關閉本視窗"
-
-#: include/functions2.php:1686
-msgid "(edit note)"
-msgstr "（編輯註記）"
-
-#: include/functions2.php:1960
-msgid "unknown type"
-msgstr "未知類型"
-
-#: include/functions2.php:2037
-msgid "Attachments"
-msgstr "附件："
-
-#: include/functions2.php:2496
+#: include/functions.php:2456
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: include/functions2.php:2497
+#: include/functions.php:2457
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: include/functions2.php:2498
+#: include/functions.php:2458
 msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
 msgstr ""
 
-#: include/functions2.php:2499
+#: include/functions.php:2459
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: include/functions2.php:2500
+#: include/functions.php:2460
 #, fuzzy
 msgid "No file was uploaded"
 msgstr "沒有上傳檔案"
 
-#: include/functions2.php:2501
+#: include/functions.php:2461
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: include/functions2.php:2502
+#: include/functions.php:2462
 msgid "Failed to write file to disk."
 msgstr ""
 
-#: include/functions2.php:2503
+#: include/functions.php:2463
 msgid "A PHP extension stopped the file upload."
 msgstr ""
 
 #: include/login_form.php:197
-#: classes/handler/public.php:569
-#: classes/handler/public.php:824
+#: classes/handler/public.php:480
+#: classes/handler/public.php:735
 msgid "Login:"
 msgstr "登入："
 
 #: include/login_form.php:207
-#: classes/handler/public.php:572
+#: classes/handler/public.php:483
 msgid "Password:"
 msgstr "密碼："
 
@@ -904,7 +805,7 @@ msgid "Profile:"
 msgstr "偏好："
 
 #: include/login_form.php:223
-#: classes/handler/public.php:311
+#: classes/handler/public.php:287
 #: classes/pref/prefs.php:1035
 #: classes/rpc.php:63
 msgid "Default profile"
@@ -923,7 +824,7 @@ msgid "Remember me"
 msgstr "記住我"
 
 #: include/login_form.php:249
-#: classes/handler/public.php:577
+#: classes/handler/public.php:488
 msgid "Log in"
 msgstr "登入"
 
@@ -941,147 +842,44 @@ msgstr "無法驗證會話（IP 錯誤）"
 msgid "Session failed to validate (password changed)"
 msgstr "無法驗證會話（IP 錯誤）"
 
-#: classes/article.php:25
-msgid "Article not found."
-msgstr "找不到文章。"
-
-#: classes/article.php:197
-msgid "Tags for this article (separated by commas):"
-msgstr "本文的標籤，請用逗號分開："
-
-#: classes/article.php:222
-#: classes/pref/labels.php:79
-#: classes/pref/users.php:98
-#: classes/pref/feeds.php:801
-#: classes/pref/feeds.php:943
-#: classes/pref/filters.php:485
-#: classes/pref/prefs.php:981
-#: plugins/instances/init.php:245
-#: plugins/nsfw/init.php:85
-#: plugins/note/init.php:51
-#: plugins/af_readability/init.php:68
-#: plugins/af_redditimgur/init.php:60
-#: plugins/af_psql_trgm/init.php:181
-#: plugins/mail/init.php:64
-#: plugins/af_zz_imgproxy/init.php:213
-msgid "Save"
-msgstr "儲存"
-
-#: classes/article.php:224
-#: classes/handler/public.php:546
-#: classes/handler/public.php:580
-#: classes/pref/labels.php:81
-#: classes/pref/users.php:100
-#: classes/pref/feeds.php:802
-#: classes/pref/feeds.php:946
-#: classes/pref/feeds.php:1859
-#: classes/pref/filters.php:488
-#: classes/pref/filters.php:902
-#: classes/pref/filters.php:983
-#: classes/pref/filters.php:1076
-#: classes/pref/prefs.php:983
-#: classes/feeds.php:1105
-#: classes/feeds.php:1155
-#: classes/feeds.php:1192
-#: plugins/instances/init.php:248
-#: plugins/instances/init.php:436
-#: plugins/note/init.php:53
-#: plugins/mail/init.php:173
-msgid "Cancel"
-msgstr "取消"
-
-#: classes/opml.php:28
-#: classes/opml.php:33
-msgid "OPML Utility"
-msgstr "OPML 工具"
-
-#: classes/opml.php:37
-msgid "Importing OPML..."
-msgstr "正在匯入 OPML ……"
-
-#: classes/opml.php:41
-msgid "Return to preferences"
-msgstr "返回偏好設定"
-
-#: classes/opml.php:271
-#, php-format
-msgid "Adding feed: %s"
-msgstr "新增摘要: %s"
-
-#: classes/opml.php:282
-#, fuzzy, php-format
-msgid "Duplicate feed: %s"
-msgstr "更新摘要"
-
-#: classes/opml.php:296
-#, php-format
-msgid "Adding label %s"
-msgstr "新增標籤: %s"
-
-#: classes/opml.php:299
-#, php-format
-msgid "Duplicate label: %s"
-msgstr "重複的標籤: %s"
-
-#: classes/opml.php:311
-#, php-format
-msgid "Setting preference key %s to %s"
-msgstr "將偏好按鍵從 %s 設定為 %s"
-
-#: classes/opml.php:343
-msgid "Adding filter..."
-msgstr "建立過濾器"
-
-#: classes/opml.php:421
-#, fuzzy, php-format
-msgid "Processing category: %s"
-msgstr "加入到類別："
-
-#: classes/opml.php:470
-#, php-format
-msgid "Upload failed with error code %d"
-msgstr "上傳失敗，失敗碼 %d"
-
-#: classes/opml.php:484
-#: plugins/import_export/init.php:442
-#, fuzzy
-msgid "Unable to move uploaded file."
-msgstr "錯誤：無法載入文章。"
-
-#: classes/opml.php:488
-#: plugins/import_export/init.php:446
-msgid "Error: please upload OPML file."
-msgstr "錯誤：請上傳 OPML 文件。"
-
-#: classes/opml.php:499
-#, fuzzy
-msgid "Error: unable to find moved OPML file."
-msgstr "錯誤：無法載入文章。"
-
-#: classes/opml.php:506
-msgid "Error while parsing document."
-msgstr "解析文檔時發生錯誤。"
-
-#: classes/backend.php:33
+#: classes/backend.php:31
 msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
 msgstr "在 Tiny Tiny RSS 的維基上可以找到其他界面技巧。"
 
-#: classes/backend.php:38
+#: classes/backend.php:36
 msgid "Keyboard Shortcuts"
 msgstr "快捷鍵"
 
-#: classes/backend.php:61
+#: classes/backend.php:59
 msgid "Shift"
 msgstr ""
 
-#: classes/backend.php:64
+#: classes/backend.php:62
 msgid "Ctrl"
 msgstr ""
 
-#: classes/backend.php:99
+#: classes/backend.php:97
 msgid "Help topic not found."
 msgstr "未找到幫助主題。"
 
+#: classes/backend.php:103
+#: classes/dlg.php:37
+#: classes/dlg.php:60
+#: classes/dlg.php:93
+#: classes/dlg.php:159
+#: classes/dlg.php:186
+#: classes/article.php:744
+#: classes/pref/filters.php:206
+#: classes/pref/prefs.php:1097
+#: classes/pref/feeds.php:1626
+#: classes/pref/feeds.php:1692
+#: plugins/import_export/init.php:421
+#: plugins/import_export/init.php:467
+#: plugins/af_psql_trgm/init.php:102
+#: plugins/share/init.php:120
+msgid "Close this window"
+msgstr "關閉本視窗"
+
 #: classes/dlg.php:17
 msgid "If you have imported labels and/or filters, you might need to reload preferences to see your new data."
 msgstr ""
@@ -1092,7 +890,7 @@ msgstr "你的公共 OPML URL 是："
 
 #: classes/dlg.php:57
 #: classes/dlg.php:183
-#: plugins/share/init.php:118
+#: plugins/share/init.php:117
 msgid "Generate new URL"
 msgstr "產生一個新的 URL"
 
@@ -1113,131 +911,224 @@ msgstr "更新進程在抓取信息更新時花費了太長時間，可能已經
 msgid "You can view this feed as RSS using the following URL:"
 msgstr "您可以透過如下 URL 以 RSS 方式查看本摘要："
 
-#: classes/handler/public.php:510
+#: classes/article.php:25
+msgid "Article not found."
+msgstr "找不到文章。"
+
+#: classes/article.php:197
+msgid "Tags for this article (separated by commas):"
+msgstr "本文的標籤，請用逗號分開："
+
+#: classes/article.php:222
+#: classes/pref/labels.php:79
+#: classes/pref/filters.php:519
+#: classes/pref/users.php:98
+#: classes/pref/prefs.php:981
+#: classes/pref/feeds.php:789
+#: classes/pref/feeds.php:931
+#: plugins/af_psql_trgm/init.php:181
+#: plugins/nsfw/init.php:85
+#: plugins/af_readability/init.php:68
+#: plugins/mail/init.php:64
+#: plugins/af_redditimgur/init.php:60
+#: plugins/note/init.php:51
+#: plugins/af_zz_imgproxy/init.php:240
+msgid "Save"
+msgstr "儲存"
+
+#: classes/article.php:224
+#: classes/handler/public.php:457
+#: classes/handler/public.php:491
+#: classes/pref/labels.php:81
+#: classes/pref/filters.php:522
+#: classes/pref/filters.php:942
+#: classes/pref/filters.php:1022
+#: classes/pref/filters.php:1115
+#: classes/pref/users.php:100
+#: classes/pref/prefs.php:983
+#: classes/pref/feeds.php:790
+#: classes/pref/feeds.php:934
+#: classes/pref/feeds.php:1833
+#: classes/feeds.php:1098
+#: classes/feeds.php:1148
+#: classes/feeds.php:1185
+#: plugins/mail/init.php:173
+#: plugins/note/init.php:53
+msgid "Cancel"
+msgstr "取消"
+
+#: classes/article.php:311
+#: classes/article.php:652
+#: classes/article.php:805
+msgid "no tags"
+msgstr "無標籤"
+
+#: classes/article.php:419
+msgid "unknown type"
+msgstr "未知類型"
+
+#: classes/article.php:496
+msgid "Attachments"
+msgstr "附件："
+
+#: classes/article.php:591
+#: classes/feeds.php:741
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] "回應"
+
+#: classes/article.php:595
+#: classes/feeds.php:745
+msgid "comments"
+msgstr "回應"
+
+#: classes/article.php:621
+msgid " - "
+msgstr " - "
+
+#: classes/article.php:662
+#: classes/feeds.php:727
+msgid "Edit tags for this article"
+msgstr "為本文編輯自訂標籤"
+
+#: classes/article.php:694
+#: classes/feeds.php:681
+msgid "Originally from:"
+msgstr "來源："
+
+#: classes/article.php:707
+#: classes/pref/feeds.php:574
+#: classes/feeds.php:694
+msgid "Feed URL"
+msgstr "摘要 URL"
+
+#: classes/article.php:843
+msgid "(edit note)"
+msgstr "（編輯註記）"
+
+#: classes/handler/public.php:421
 #: plugins/bookmarklets/init.php:40
 msgid "Share with Tiny Tiny RSS"
 msgstr "分享 Tiny Tiny RSS 中訂閱"
 
-#: classes/handler/public.php:518
+#: classes/handler/public.php:429
 msgid "Title:"
 msgstr "標題： "
 
-#: classes/handler/public.php:520
+#: classes/handler/public.php:431
 #: classes/pref/feeds.php:572
-#: plugins/instances/init.php:212
-#: plugins/instances/init.php:401
 msgid "URL:"
 msgstr "URL："
 
-#: classes/handler/public.php:522
+#: classes/handler/public.php:433
 msgid "Content:"
 msgstr "內容： "
 
-#: classes/handler/public.php:524
+#: classes/handler/public.php:435
 msgid "Labels:"
 msgstr "標籤"
 
-#: classes/handler/public.php:543
+#: classes/handler/public.php:454
 msgid "Shared article will appear in the Published feed."
 msgstr ""
 
-#: classes/handler/public.php:545
+#: classes/handler/public.php:456
 msgid "Share"
 msgstr "分享"
 
-#: classes/handler/public.php:567
+#: classes/handler/public.php:478
 msgid "Not logged in"
 msgstr "沒有登入"
 
-#: classes/handler/public.php:626
+#: classes/handler/public.php:537
 msgid "Incorrect username or password"
 msgstr "使用者名或密碼錯誤"
 
-#: classes/handler/public.php:678
+#: classes/handler/public.php:589
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "已經訂閱到 <b>%s</b>."
 
-#: classes/handler/public.php:681
+#: classes/handler/public.php:592
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "訂閱到 <b>%s</b>."
 
-#: classes/handler/public.php:684
+#: classes/handler/public.php:595
 #, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "無法訂閱 <b>%s</b>。"
 
-#: classes/handler/public.php:687
+#: classes/handler/public.php:598
 #, php-format
 msgid "No feeds found in <b>%s</b>."
 msgstr "在 <b>%s</b> 中沒有找到摘要。"
 
-#: classes/handler/public.php:690
+#: classes/handler/public.php:601
 #, fuzzy
 msgid "Multiple feed URLs found."
 msgstr "未找到摘要。"
 
-#: classes/handler/public.php:694
+#: classes/handler/public.php:605
 #, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr "無法訂閱 <b>%s</b>。<br>無法下載摘要的 URL。"
 
-#: classes/handler/public.php:712
+#: classes/handler/public.php:623
 msgid "Subscribe to selected feed"
 msgstr "訂閱選取的摘要"
 
-#: classes/handler/public.php:737
+#: classes/handler/public.php:648
 msgid "Edit subscription options"
 msgstr "編輯訂閱選項"
 
-#: classes/handler/public.php:774
+#: classes/handler/public.php:685
 msgid "Password recovery"
 msgstr "密碼救援"
 
-#: classes/handler/public.php:817
+#: classes/handler/public.php:728
 #, fuzzy
 msgid "You will need to provide valid account name and email. A password reset link will be sent to your email address."
 msgstr "你需要提供有效的電子郵件以及帳號名稱，新密碼將以電子郵件寄給你。"
 
-#: classes/handler/public.php:839
-#: classes/pref/users.php:350
+#: classes/handler/public.php:750
+#: classes/pref/users.php:349
 msgid "Reset password"
 msgstr "重設密碼"
 
-#: classes/handler/public.php:849
+#: classes/handler/public.php:760
 msgid "Some of the required form parameters are missing or incorrect."
 msgstr ""
 
-#: classes/handler/public.php:853
-#: classes/handler/public.php:919
+#: classes/handler/public.php:764
+#: classes/handler/public.php:830
 msgid "Go back"
 msgstr "回去"
 
-#: classes/handler/public.php:890
+#: classes/handler/public.php:801
 #, fuzzy
 msgid "[tt-rss] Password reset request"
 msgstr "[tt-rss] 密碼更換提醒"
 
-#: classes/handler/public.php:915
+#: classes/handler/public.php:826
 msgid "Sorry, login and email combination not found."
 msgstr "對不起，沒有找到符合的帳號密碼。"
 
-#: classes/handler/public.php:937
+#: classes/handler/public.php:848
 msgid "Your access level is insufficient to run this script."
 msgstr "此帳號等級不足，無法運行腳本。"
 
-#: classes/handler/public.php:963
+#: classes/handler/public.php:874
 msgid "Database Updater"
 msgstr "資料庫更新管理器"
 
-#: classes/handler/public.php:1028
+#: classes/handler/public.php:939
 msgid "Perform updates"
 msgstr "執行更新"
 
 #: classes/pref/labels.php:22
-#: classes/pref/filters.php:348
-#: classes/pref/filters.php:823
+#: classes/pref/filters.php:373
+#: classes/pref/filters.php:863
 msgid "Caption"
 msgstr "標題"
 
@@ -1259,59 +1150,55 @@ msgid "Created label <b>%s</b>"
 msgstr "建立預定義標籤 <b>%s</b>"
 
 #: classes/pref/labels.php:258
-#: classes/pref/users.php:334
-#: classes/pref/feeds.php:1337
-#: classes/pref/feeds.php:1600
-#: classes/pref/feeds.php:1664
-#: classes/pref/filters.php:359
-#: classes/pref/filters.php:407
-#: classes/pref/filters.php:744
-#: classes/pref/filters.php:832
-#: classes/pref/filters.php:859
+#: classes/pref/filters.php:384
+#: classes/pref/filters.php:441
+#: classes/pref/filters.php:784
+#: classes/pref/filters.php:872
+#: classes/pref/filters.php:899
+#: classes/pref/users.php:333
 #: classes/pref/prefs.php:992
-#: plugins/instances/init.php:284
+#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1574
+#: classes/pref/feeds.php:1638
 msgid "Select"
 msgstr "選擇"
 
 #: classes/pref/labels.php:261
-#: classes/pref/users.php:337
-#: classes/pref/feeds.php:1340
-#: classes/pref/feeds.php:1603
-#: classes/pref/feeds.php:1667
-#: classes/pref/filters.php:362
-#: classes/pref/filters.php:410
-#: classes/pref/filters.php:747
-#: classes/pref/filters.php:835
-#: classes/pref/filters.php:862
+#: classes/pref/filters.php:387
+#: classes/pref/filters.php:444
+#: classes/pref/filters.php:787
+#: classes/pref/filters.php:875
+#: classes/pref/filters.php:902
+#: classes/pref/users.php:336
 #: classes/pref/prefs.php:995
+#: classes/pref/feeds.php:1314
+#: classes/pref/feeds.php:1577
+#: classes/pref/feeds.php:1641
 #: classes/feeds.php:102
-#: plugins/instances/init.php:287
 msgid "All"
 msgstr "全部"
 
 #: classes/pref/labels.php:263
-#: classes/pref/users.php:339
-#: classes/pref/feeds.php:1342
-#: classes/pref/feeds.php:1605
-#: classes/pref/feeds.php:1669
-#: classes/pref/filters.php:364
-#: classes/pref/filters.php:412
-#: classes/pref/filters.php:749
-#: classes/pref/filters.php:837
-#: classes/pref/filters.php:864
+#: classes/pref/filters.php:389
+#: classes/pref/filters.php:446
+#: classes/pref/filters.php:789
+#: classes/pref/filters.php:877
+#: classes/pref/filters.php:904
+#: classes/pref/users.php:338
 #: classes/pref/prefs.php:997
+#: classes/pref/feeds.php:1316
+#: classes/pref/feeds.php:1579
+#: classes/pref/feeds.php:1643
 #: classes/feeds.php:105
-#: plugins/instances/init.php:289
 msgid "None"
 msgstr "無"
 
 #: classes/pref/labels.php:270
-#: classes/pref/users.php:348
+#: classes/pref/filters.php:512
+#: classes/pref/filters.php:806
+#: classes/pref/users.php:347
 #: classes/pref/feeds.php:767
-#: classes/pref/filters.php:478
-#: classes/pref/filters.php:766
-#: classes/feeds.php:1154
-#: plugins/instances/init.php:294
+#: classes/feeds.php:1147
 msgid "Remove"
 msgstr "移除"
 
@@ -1319,9 +1206,174 @@ msgstr "移除"
 msgid "Clear colors"
 msgstr "清空顏色"
 
+#: classes/pref/filters.php:153
+#, fuzzy
+msgid "Preview article"
+msgstr "最新更新的文章"
+
+#: classes/pref/filters.php:264
+#: classes/pref/filters.php:558
+msgid "(inverse)"
+msgstr "反向選取"
+
+#: classes/pref/filters.php:260
+#: classes/pref/filters.php:557
+#, php-format
+msgid "%s on %s in %s %s"
+msgstr ""
+
+#: classes/pref/filters.php:379
+#: classes/pref/filters.php:867
+#: classes/pref/filters.php:981
+msgid "Match"
+msgstr "匹配"
+
+#: classes/pref/filters.php:393
+#: classes/pref/filters.php:450
+#: classes/pref/filters.php:881
+#: classes/pref/filters.php:908
+msgid "Add"
+msgstr "新增"
+
+#: classes/pref/filters.php:396
+#: classes/pref/filters.php:453
+#: classes/pref/filters.php:884
+#: classes/pref/filters.php:911
+#: classes/feeds.php:122
+msgid "Delete"
+msgstr "刪除"
+
+#: classes/pref/filters.php:436
+#: classes/pref/filters.php:894
+#, fuzzy
+msgid "Apply actions"
+msgstr "摘要動作"
+
+#: classes/pref/filters.php:486
+#: classes/pref/filters.php:923
+msgid "Enabled"
+msgstr "已啟用"
+
+#: classes/pref/filters.php:495
+#: classes/pref/filters.php:926
+msgid "Match any rule"
+msgstr ""
+
+#: classes/pref/filters.php:504
+#: classes/pref/filters.php:929
+#, fuzzy
+msgid "Inverse matching"
+msgstr "反向匹配"
+
+#: classes/pref/filters.php:516
+#: classes/pref/filters.php:936
+msgid "Test"
+msgstr "測試"
+
+#: classes/pref/filters.php:780
+#: classes/pref/users.php:323
+#: classes/pref/feeds.php:1307
+#: classes/feeds.php:1118
+#: classes/feeds.php:1184
+#: js/tt-rss.js:165
+msgid "Search"
+msgstr "搜尋"
+
+#: classes/pref/filters.php:796
+msgid "Combine"
+msgstr ""
+
+#: classes/pref/filters.php:799
+#: classes/pref/users.php:345
+msgid "Edit"
+msgstr "編輯"
+
+#: classes/pref/filters.php:802
+#: classes/pref/feeds.php:1327
+#: classes/pref/feeds.php:1341
+msgid "Reset sort order"
+msgstr "重新排序"
+
+#: classes/pref/filters.php:810
+#: classes/pref/feeds.php:1363
+msgid "Rescore articles"
+msgstr "為文章重新評分"
+
+#: classes/pref/filters.php:939
+msgid "Create"
+msgstr "建立"
+
+#: classes/pref/filters.php:993
+msgid "Inverse regular expression matching"
+msgstr ""
+
+#: classes/pref/filters.php:995
+msgid "on field"
+msgstr "on field"
+
+#: classes/pref/filters.php:1001
+#: js/PrefFilterTree.js:64
+msgid "in"
+msgstr "在"
+
+#: classes/pref/filters.php:1014
+#, fuzzy
+msgid "Wiki: Filters"
+msgstr "過濾器"
+
+#: classes/pref/filters.php:1019
+#, fuzzy
+msgid "Save rule"
+msgstr "保存"
+
+#: classes/pref/filters.php:1019
+#: js/functions.js:865
+msgid "Add rule"
+msgstr "新增規則"
+
+#: classes/pref/filters.php:1042
+msgid "Perform Action"
+msgstr "執行動作"
+
+#: classes/pref/filters.php:1093
+#, fuzzy
+msgid "No actions available"
+msgstr "有可用的新版本啦！"
+
+#: classes/pref/filters.php:1112
+#, fuzzy
+msgid "Save action"
+msgstr "版面動作"
+
+#: classes/pref/filters.php:1112
+#: js/functions.js:887
+#, fuzzy
+msgid "Add action"
+msgstr "摘要動作"
+
+#: classes/pref/filters.php:1136
+#, fuzzy
+msgid "[No caption]"
+msgstr "標題"
+
+#: classes/pref/filters.php:1138
+#, php-format
+msgid "%s (%d rule)"
+msgid_plural "%s (%d rules)"
+msgstr[0] ""
+
+#: classes/pref/filters.php:1153
+msgid "matches any rule"
+msgstr ""
+
+#: classes/pref/filters.php:1156
+#, fuzzy, php-format
+msgid "%s (+%d action)"
+msgid_plural "%s (+%d actions)"
+msgstr[0] "摘要動作"
+
 #: classes/pref/users.php:6
 #: classes/pref/system.php:8
-#: plugins/instances/init.php:154
 msgid "Your access level is insufficient to open this tab."
 msgstr "您的帳號等級不夠，無法打開這個頁籤。"
 
@@ -1332,8 +1384,8 @@ msgstr "編輯過濾器"
 
 #: classes/pref/users.php:56
 #: classes/pref/feeds.php:637
-#: classes/pref/feeds.php:878
-#: classes/feeds.php:1075
+#: classes/pref/feeds.php:866
+#: classes/feeds.php:1068
 msgid "Authentication"
 msgstr "登入驗證"
 
@@ -1343,7 +1395,7 @@ msgstr "帳號等級："
 
 #: classes/pref/users.php:77
 #: classes/pref/feeds.php:667
-#: classes/pref/feeds.php:896
+#: classes/pref/feeds.php:884
 msgid "Options"
 msgstr "選項"
 
@@ -1357,7 +1409,7 @@ msgid "User not found"
 msgstr "未找到使用者"
 
 #: classes/pref/users.php:132
-#: classes/pref/users.php:400
+#: classes/pref/users.php:399
 msgid "Registered"
 msgstr "註冊時間"
 
@@ -1375,7 +1427,7 @@ msgid "Stored articles"
 msgstr "加星標文章"
 
 #: classes/pref/users.php:145
-#: classes/pref/users.php:399
+#: classes/pref/users.php:398
 msgid "Subscribed feeds"
 msgstr "訂閱的摘要"
 
@@ -1394,513 +1446,57 @@ msgstr "無法建立使用者 <b>%s</b> "
 msgid "User <b>%s</b> already exists."
 msgstr "使用者 <b>%s</b> 已存在。"
 
-#: classes/pref/users.php:265
+#: classes/pref/users.php:264
 #, fuzzy, php-format
 msgid "Changed password of user <b>%s</b> to <b>%s</b>"
 msgstr "已添加使用者 <b>%s</b> ，密碼為<b>%s</b>"
 
-#: classes/pref/users.php:267
+#: classes/pref/users.php:266
 #, fuzzy, php-format
 msgid "Sending new password of user <b>%s</b> to <b>%s</b>"
 msgstr "已添加使用者 <b>%s</b> ，密碼為<b>%s</b>"
 
-#: classes/pref/users.php:291
+#: classes/pref/users.php:290
 msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] 密碼更換提醒"
 
-#: classes/pref/users.php:324
-#: classes/pref/feeds.php:1333
-#: classes/pref/filters.php:740
-#: classes/feeds.php:1125
-#: classes/feeds.php:1191
-#: js/tt-rss.js:165
-msgid "Search"
-msgstr "搜尋"
-
-#: classes/pref/users.php:342
+#: classes/pref/users.php:341
 msgid "Create user"
 msgstr "建立使用者"
 
-#: classes/pref/users.php:346
-#: classes/pref/filters.php:759
-#: plugins/instances/init.php:293
-msgid "Edit"
-msgstr "編輯"
-
-#: classes/pref/users.php:397
+#: classes/pref/users.php:396
 #: classes/pref/feeds.php:643
-#: classes/pref/feeds.php:882
-#: classes/pref/feeds.php:1836
-#: classes/feeds.php:1079
+#: classes/pref/feeds.php:870
+#: classes/pref/feeds.php:1810
+#: classes/feeds.php:1072
 msgid "Login"
 msgstr "登入"
 
-#: classes/pref/users.php:398
+#: classes/pref/users.php:397
 msgid "Access Level"
 msgstr "帳號等級"
 
-#: classes/pref/users.php:401
+#: classes/pref/users.php:400
 msgid "Last login"
 msgstr "最後登入"
 
-#: classes/pref/users.php:420
-#: plugins/instances/init.php:334
+#: classes/pref/users.php:419
 msgid "Click to edit"
 msgstr "點擊進行編輯"
 
-#: classes/pref/users.php:441
+#: classes/pref/users.php:440
 msgid "No users defined."
 msgstr "沒有定義使用者。"
 
-#: classes/pref/users.php:443
+#: classes/pref/users.php:442
 msgid "No matching users found."
 msgstr "沒有匹配的使用者。"
 
-#: classes/pref/system.php:29
-msgid "Error Log"
-msgstr "錯誤的Log"
-
-#: classes/pref/system.php:40
-msgid "Refresh"
-msgstr "重新整理"
-
-#: classes/pref/system.php:43
-msgid "Clear log"
-msgstr "清空Log"
-
-#: classes/pref/system.php:48
-msgid "Error"
-msgstr "錯誤"
-
-#: classes/pref/system.php:49
-msgid "Filename"
-msgstr "檔案名稱路徑："
-
-#: classes/pref/system.php:50
-msgid "Message"
-msgstr "訊息"
-
-#: classes/pref/system.php:52
-msgid "Date"
-msgstr "日期"
-
-#: classes/pref/feeds.php:15
-msgid "Check to enable field"
-msgstr "勾選以啟用"
-
-#: classes/pref/feeds.php:65
-#: classes/pref/feeds.php:214
-#: classes/pref/feeds.php:258
-#: classes/pref/feeds.php:264
-#: classes/pref/feeds.php:290
-#, php-format
-msgid "(%d feed)"
-msgid_plural "(%d feeds)"
-msgstr[0] "(%d 個摘要)"
-
-#: classes/pref/feeds.php:537
 #: classes/pref/prefs.php:18
+#: classes/pref/feeds.php:537
 msgid "General"
 msgstr "通用"
 
-#: classes/pref/feeds.php:561
-msgid "Feed Title"
-msgstr "摘要標題"
-
-#: classes/pref/feeds.php:595
-#: classes/pref/feeds.php:830
-#: classes/pref/feeds.php:1822
-#: classes/feeds.php:1055
-msgid "Place in category:"
-msgstr "加入到類別："
-
-#: classes/pref/feeds.php:608
-#: classes/pref/feeds.php:844
-#, fuzzy
-msgid "Language:"
-msgstr "語言："
-
-#: classes/pref/feeds.php:615
-#: classes/pref/feeds.php:853
-msgid "Update"
-msgstr "更新列表"
-
-#: classes/pref/feeds.php:630
-#: classes/pref/feeds.php:869
-msgid "Article purging:"
-msgstr "文章清理："
-
-#: classes/pref/feeds.php:658
-#: classes/pref/feeds.php:890
-#: classes/pref/feeds.php:1839
-#: classes/pref/prefs.php:245
-#: classes/feeds.php:1083
-msgid "Password"
-msgstr "密碼"
-
-#: classes/pref/feeds.php:662
-msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
-msgstr "<b>提示：</b>如果您的摘要需要驗證，那麼您需要填寫登入資料。Twitter 摘要除外。"
-
-#: classes/pref/feeds.php:681
-#: classes/pref/feeds.php:900
-msgid "Hide from Popular feeds"
-msgstr "從最受歡迎的摘要中隱藏"
-
-#: classes/pref/feeds.php:693
-#: classes/pref/feeds.php:906
-msgid "Include in e-mail digest"
-msgstr "包含電子郵件摘要"
-
-#: classes/pref/feeds.php:706
-#: classes/pref/feeds.php:912
-msgid "Always display image attachments"
-msgstr "始終顯示圖片附件"
-
-#: classes/pref/feeds.php:719
-#: classes/pref/feeds.php:920
-msgid "Do not embed images"
-msgstr "不要包含圖片"
-
-#: classes/pref/feeds.php:732
-#: classes/pref/feeds.php:928
-msgid "Cache media"
-msgstr ""
-
-#: classes/pref/feeds.php:744
-#: classes/pref/feeds.php:934
-msgid "Mark updated articles as unread"
-msgstr "將已更新的文章標記為未讀"
-
-#: classes/pref/feeds.php:748
-msgid "Icon"
-msgstr "圖示"
-
-#: classes/pref/feeds.php:765
-msgid "Replace"
-msgstr "替換"
-
-#: classes/pref/feeds.php:772
-#: classes/pref/prefs.php:698
-msgid "Plugins"
-msgstr "擴充套件"
-
-#: classes/pref/feeds.php:792
-msgid "Resubscribe to push updates"
-msgstr "重新訂閱以推送更新"
-
-#: classes/pref/feeds.php:799
-msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
-msgstr "為啟用推送的摘要重置 PubSubHubbub 訂閱。"
-
-#: classes/pref/feeds.php:1200
-#: classes/pref/feeds.php:1253
-msgid "All done."
-msgstr "全部完成。"
-
-#: classes/pref/feeds.php:1308
-msgid "Feeds with errors"
-msgstr "有錯誤的摘要"
-
-#: classes/pref/feeds.php:1315
-msgid "Inactive feeds"
-msgstr "不活躍的摘要"
-
-#: classes/pref/feeds.php:1351
-msgid "Edit selected feeds"
-msgstr "編輯選定的摘要"
-
-#: classes/pref/feeds.php:1353
-#: classes/pref/feeds.php:1367
-#: classes/pref/filters.php:762
-msgid "Reset sort order"
-msgstr "重新排序"
-
-#: classes/pref/feeds.php:1355
-#: js/prefs.js:1622
-msgid "Batch subscribe"
-msgstr ""
-
-#: classes/pref/feeds.php:1362
-msgid "Categories"
-msgstr "類別"
-
-#: classes/pref/feeds.php:1365
-msgid "Add category"
-msgstr "新增類別"
-
-#: classes/pref/feeds.php:1369
-msgid "Remove selected"
-msgstr "移除所選擇的"
-
-#: classes/pref/feeds.php:1380
-msgid "More actions..."
-msgstr "更多動作"
-
-#: classes/pref/feeds.php:1384
-msgid "Manual purge"
-msgstr "手動清除"
-
-#: classes/pref/feeds.php:1388
-msgid "Clear feed data"
-msgstr "清空摘要數據"
-
-#: classes/pref/feeds.php:1389
-#: classes/pref/filters.php:770
-msgid "Rescore articles"
-msgstr "為文章重新評分"
-
-#: classes/pref/feeds.php:1442
-msgid "OPML"
-msgstr "OPML"
-
-#: classes/pref/feeds.php:1444
-msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
-msgstr ""
-
-#: classes/pref/feeds.php:1445
-msgid "Only main settings profile can be migrated using OPML."
-msgstr ""
-
-#: classes/pref/feeds.php:1458
-#, fuzzy
-msgid "Import my OPML"
-msgstr "正在匯入 OPML ……"
-
-#: classes/pref/feeds.php:1464
-msgid "Filename:"
-msgstr "文件名："
-
-#: classes/pref/feeds.php:1466
-msgid "Include settings"
-msgstr "包含設定"
-
-#: classes/pref/feeds.php:1470
-#, fuzzy
-msgid "Export OPML"
-msgstr "正在匯入 OPML ……"
-
-#: classes/pref/feeds.php:1474
-msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
-msgstr "您可以公開發布您的 OPML 。網上的任何人都可以透過如下 URL 訂閱該文件。"
-
-#: classes/pref/feeds.php:1478
-msgid "Public OPML URL"
-msgstr "公開的 OPML URL"
-
-#: classes/pref/feeds.php:1479
-#, fuzzy
-msgid "Display published OPML URL"
-msgstr "公開的 OPML URL"
-
-#: classes/pref/feeds.php:1488
-msgid "Firefox integration"
-msgstr "Firefox 整合"
-
-#: classes/pref/feeds.php:1490
-msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
-msgstr "按下以下連結，可以將本 Tiny Tiny RSS 站作為一個 Firefox 閱讀器使用。"
-
-#: classes/pref/feeds.php:1497
-msgid "Click here to register this site as a feed reader."
-msgstr "點擊此處將本站註冊為摘要閱讀器。"
-
-#: classes/pref/feeds.php:1505
-#, fuzzy
-msgid "Published & shared articles / Generated feeds"
-msgstr "已發布的文章和產生的摘要"
-
-#: classes/pref/feeds.php:1507
-msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
-msgstr "已發布的文章將會輸出為公開的 RSS 摘要，網上的任何人可以透過如下 URL 進行訂閱。"
-
-#: classes/pref/feeds.php:1514
-#: classes/feeds.php:54
-#: classes/feeds.php:140
-msgid "View as RSS"
-msgstr "以 RSS 形式閱讀"
-
-#: classes/pref/feeds.php:1515
-msgid "Display URL"
-msgstr "顯示 URL"
-
-#: classes/pref/feeds.php:1518
-msgid "Clear all generated URLs"
-msgstr "清空所有產生的 URL"
-
-#: classes/pref/feeds.php:1596
-msgid "These feeds have not been updated with new content for 3 months (oldest first):"
-msgstr "以下摘要已經有三個月沒有內容更新了（最舊的在最上）："
-
-#: classes/pref/feeds.php:1630
-#: classes/pref/feeds.php:1694
-msgid "Click to edit feed"
-msgstr "點擊以編輯摘要"
-
-#: classes/pref/feeds.php:1648
-#: classes/pref/feeds.php:1714
-msgid "Unsubscribe from selected feeds"
-msgstr "取消訂閱選取的摘要"
-
-#: classes/pref/feeds.php:1819
-msgid "Add one valid RSS feed per line (no feed detection is done)"
-msgstr ""
-
-#: classes/pref/feeds.php:1828
-msgid "Feeds to subscribe, One per line"
-msgstr ""
-
-#: classes/pref/feeds.php:1851
-msgid "Feeds require authentication."
-msgstr ""
-
-#: classes/pref/feeds.php:1858
-#: classes/feeds.php:1099
-#: classes/feeds.php:1153
-msgid "Subscribe"
-msgstr "訂閱"
-
-#: classes/pref/filters.php:151
-#, fuzzy
-msgid "Preview article"
-msgstr "最新更新的文章"
-
-#: classes/pref/filters.php:239
-#: classes/pref/filters.php:518
-msgid "(inverse)"
-msgstr "反向選取"
-
-#: classes/pref/filters.php:235
-#: classes/pref/filters.php:517
-#, php-format
-msgid "%s on %s in %s %s"
-msgstr ""
-
-#: classes/pref/filters.php:354
-#: classes/pref/filters.php:827
-#: classes/pref/filters.php:942
-msgid "Match"
-msgstr "匹配"
-
-#: classes/pref/filters.php:368
-#: classes/pref/filters.php:416
-#: classes/pref/filters.php:841
-#: classes/pref/filters.php:868
-msgid "Add"
-msgstr "新增"
-
-#: classes/pref/filters.php:371
-#: classes/pref/filters.php:419
-#: classes/pref/filters.php:844
-#: classes/pref/filters.php:871
-#: classes/feeds.php:122
-msgid "Delete"
-msgstr "刪除"
-
-#: classes/pref/filters.php:402
-#: classes/pref/filters.php:854
-#, fuzzy
-msgid "Apply actions"
-msgstr "摘要動作"
-
-#: classes/pref/filters.php:452
-#: classes/pref/filters.php:883
-msgid "Enabled"
-msgstr "已啟用"
-
-#: classes/pref/filters.php:461
-#: classes/pref/filters.php:886
-msgid "Match any rule"
-msgstr ""
-
-#: classes/pref/filters.php:470
-#: classes/pref/filters.php:889
-#, fuzzy
-msgid "Inverse matching"
-msgstr "反向匹配"
-
-#: classes/pref/filters.php:482
-#: classes/pref/filters.php:896
-msgid "Test"
-msgstr "測試"
-
-#: classes/pref/filters.php:756
-msgid "Combine"
-msgstr ""
-
-#: classes/pref/filters.php:899
-msgid "Create"
-msgstr "建立"
-
-#: classes/pref/filters.php:954
-msgid "Inverse regular expression matching"
-msgstr ""
-
-#: classes/pref/filters.php:956
-msgid "on field"
-msgstr "on field"
-
-#: classes/pref/filters.php:962
-#: js/PrefFilterTree.js:64
-msgid "in"
-msgstr "在"
-
-#: classes/pref/filters.php:975
-#, fuzzy
-msgid "Wiki: Filters"
-msgstr "過濾器"
-
-#: classes/pref/filters.php:980
-#, fuzzy
-msgid "Save rule"
-msgstr "保存"
-
-#: classes/pref/filters.php:980
-#: js/functions.js:865
-msgid "Add rule"
-msgstr "新增規則"
-
-#: classes/pref/filters.php:1003
-msgid "Perform Action"
-msgstr "執行動作"
-
-#: classes/pref/filters.php:1054
-#, fuzzy
-msgid "No actions available"
-msgstr "有可用的新版本啦！"
-
-#: classes/pref/filters.php:1073
-#, fuzzy
-msgid "Save action"
-msgstr "版面動作"
-
-#: classes/pref/filters.php:1073
-#: js/functions.js:887
-#, fuzzy
-msgid "Add action"
-msgstr "摘要動作"
-
-#: classes/pref/filters.php:1097
-#, fuzzy
-msgid "[No caption]"
-msgstr "標題"
-
-#: classes/pref/filters.php:1099
-#, php-format
-msgid "%s (%d rule)"
-msgid_plural "%s (%d rules)"
-msgstr[0] ""
-
-#: classes/pref/filters.php:1114
-msgid "matches any rule"
-msgstr ""
-
-#: classes/pref/filters.php:1117
-#, fuzzy, php-format
-msgid "%s (+%d action)"
-msgid_plural "%s (+%d actions)"
-msgstr[0] "摘要動作"
-
 #: classes/pref/prefs.php:19
 msgid "Interface"
 msgstr "界面"
@@ -2075,7 +1671,7 @@ msgid "Strip all but most common HTML tags when reading articles."
 msgstr "僅載入几個最常用的 HTML 標籤"
 
 #: classes/pref/prefs.php:53
-#: js/prefs.js:1584
+#: js/prefs.js:1580
 msgid "Customize stylesheet"
 msgstr "自訂樣式"
 
@@ -2144,6 +1740,14 @@ msgstr "帳號等級"
 msgid "Save data"
 msgstr "儲存資料"
 
+#: classes/pref/prefs.php:245
+#: classes/pref/feeds.php:658
+#: classes/pref/feeds.php:878
+#: classes/pref/feeds.php:1813
+#: classes/feeds.php:1076
+msgid "Password"
+msgstr "密碼"
+
 #: classes/pref/prefs.php:254
 msgid "Your password is at default value, please change it."
 msgstr "您還在使用系統預設的密碼，請修改。"
@@ -2245,18 +1849,23 @@ msgstr "管理偏好文件"
 msgid "Reset to defaults"
 msgstr "恢復到預設"
 
+#: classes/pref/prefs.php:698
+#: classes/pref/feeds.php:772
+msgid "Plugins"
+msgstr "擴充套件"
+
 #: classes/pref/prefs.php:700
 msgid "You will need to reload Tiny Tiny RSS for plugin changes to take effect."
 msgstr "你必須重新啟動 Tiny Tiny RSS 之後，才會生效喔～"
 
-#: classes/pref/prefs.php:702
-msgid "Download more plugins at tt-rss.org <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forums</a> or <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a>."
-msgstr "從 tt-rss.org下載更多擴充套件，可參閱 <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">討論區</a> 或 <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a>."
-
-#: classes/pref/prefs.php:732
+#: classes/pref/prefs.php:730
 msgid "System plugins"
 msgstr "系統擴充套件"
 
+#: classes/pref/prefs.php:731
+msgid "System plugins are enabled in <strong>config.php</strong> for all users."
+msgstr ""
+
 #: classes/pref/prefs.php:736
 #: classes/pref/prefs.php:792
 msgid "Plugin"
@@ -2327,6 +1936,345 @@ msgstr "移除選取的偏好文件"
 msgid "Activate profile"
 msgstr "啟用偏好文件"
 
+#: classes/pref/feeds.php:15
+msgid "Check to enable field"
+msgstr "勾選以啟用"
+
+#: classes/pref/feeds.php:65
+#: classes/pref/feeds.php:214
+#: classes/pref/feeds.php:258
+#: classes/pref/feeds.php:264
+#: classes/pref/feeds.php:290
+#, php-format
+msgid "(%d feed)"
+msgid_plural "(%d feeds)"
+msgstr[0] "(%d 個摘要)"
+
+#: classes/pref/feeds.php:561
+msgid "Feed Title"
+msgstr "摘要標題"
+
+#: classes/pref/feeds.php:595
+#: classes/pref/feeds.php:818
+#: classes/pref/feeds.php:1796
+#: classes/feeds.php:1048
+msgid "Place in category:"
+msgstr "加入到類別："
+
+#: classes/pref/feeds.php:608
+#: classes/pref/feeds.php:832
+#, fuzzy
+msgid "Language:"
+msgstr "語言："
+
+#: classes/pref/feeds.php:615
+#: classes/pref/feeds.php:841
+msgid "Update"
+msgstr "更新列表"
+
+#: classes/pref/feeds.php:630
+#: classes/pref/feeds.php:857
+msgid "Article purging:"
+msgstr "文章清理："
+
+#: classes/pref/feeds.php:662
+msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
+msgstr "<b>提示：</b>如果您的摘要需要驗證，那麼您需要填寫登入資料。Twitter 摘要除外。"
+
+#: classes/pref/feeds.php:681
+#: classes/pref/feeds.php:888
+msgid "Hide from Popular feeds"
+msgstr "從最受歡迎的摘要中隱藏"
+
+#: classes/pref/feeds.php:693
+#: classes/pref/feeds.php:894
+msgid "Include in e-mail digest"
+msgstr "包含電子郵件摘要"
+
+#: classes/pref/feeds.php:706
+#: classes/pref/feeds.php:900
+msgid "Always display image attachments"
+msgstr "始終顯示圖片附件"
+
+#: classes/pref/feeds.php:719
+#: classes/pref/feeds.php:908
+msgid "Do not embed images"
+msgstr "不要包含圖片"
+
+#: classes/pref/feeds.php:732
+#: classes/pref/feeds.php:916
+msgid "Cache media"
+msgstr ""
+
+#: classes/pref/feeds.php:744
+#: classes/pref/feeds.php:922
+msgid "Mark updated articles as unread"
+msgstr "將已更新的文章標記為未讀"
+
+#: classes/pref/feeds.php:748
+msgid "Icon"
+msgstr "圖示"
+
+#: classes/pref/feeds.php:765
+msgid "Replace"
+msgstr "替換"
+
+#: classes/pref/feeds.php:1174
+#: classes/pref/feeds.php:1227
+msgid "All done."
+msgstr "全部完成。"
+
+#: classes/pref/feeds.php:1282
+msgid "Feeds with errors"
+msgstr "有錯誤的摘要"
+
+#: classes/pref/feeds.php:1289
+msgid "Inactive feeds"
+msgstr "不活躍的摘要"
+
+#: classes/pref/feeds.php:1325
+msgid "Edit selected feeds"
+msgstr "編輯選定的摘要"
+
+#: classes/pref/feeds.php:1329
+#: js/prefs.js:1618
+msgid "Batch subscribe"
+msgstr ""
+
+#: classes/pref/feeds.php:1336
+msgid "Categories"
+msgstr "類別"
+
+#: classes/pref/feeds.php:1339
+msgid "Add category"
+msgstr "新增類別"
+
+#: classes/pref/feeds.php:1343
+msgid "Remove selected"
+msgstr "移除所選擇的"
+
+#: classes/pref/feeds.php:1354
+msgid "More actions..."
+msgstr "更多動作"
+
+#: classes/pref/feeds.php:1358
+msgid "Manual purge"
+msgstr "手動清除"
+
+#: classes/pref/feeds.php:1362
+msgid "Clear feed data"
+msgstr "清空摘要數據"
+
+#: classes/pref/feeds.php:1416
+msgid "OPML"
+msgstr "OPML"
+
+#: classes/pref/feeds.php:1418
+msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
+msgstr ""
+
+#: classes/pref/feeds.php:1419
+msgid "Only main settings profile can be migrated using OPML."
+msgstr ""
+
+#: classes/pref/feeds.php:1432
+#, fuzzy
+msgid "Import my OPML"
+msgstr "正在匯入 OPML ……"
+
+#: classes/pref/feeds.php:1438
+msgid "Filename:"
+msgstr "文件名："
+
+#: classes/pref/feeds.php:1440
+msgid "Include settings"
+msgstr "包含設定"
+
+#: classes/pref/feeds.php:1444
+#, fuzzy
+msgid "Export OPML"
+msgstr "正在匯入 OPML ……"
+
+#: classes/pref/feeds.php:1448
+msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
+msgstr "您可以公開發布您的 OPML 。網上的任何人都可以透過如下 URL 訂閱該文件。"
+
+#: classes/pref/feeds.php:1452
+msgid "Public OPML URL"
+msgstr "公開的 OPML URL"
+
+#: classes/pref/feeds.php:1453
+#, fuzzy
+msgid "Display published OPML URL"
+msgstr "公開的 OPML URL"
+
+#: classes/pref/feeds.php:1462
+msgid "Firefox integration"
+msgstr "Firefox 整合"
+
+#: classes/pref/feeds.php:1464
+msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
+msgstr "按下以下連結，可以將本 Tiny Tiny RSS 站作為一個 Firefox 閱讀器使用。"
+
+#: classes/pref/feeds.php:1471
+msgid "Click here to register this site as a feed reader."
+msgstr "點擊此處將本站註冊為摘要閱讀器。"
+
+#: classes/pref/feeds.php:1479
+#, fuzzy
+msgid "Published & shared articles / Generated feeds"
+msgstr "已發布的文章和產生的摘要"
+
+#: classes/pref/feeds.php:1481
+msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
+msgstr "已發布的文章將會輸出為公開的 RSS 摘要，網上的任何人可以透過如下 URL 進行訂閱。"
+
+#: classes/pref/feeds.php:1488
+#: classes/feeds.php:54
+#: classes/feeds.php:140
+msgid "View as RSS"
+msgstr "以 RSS 形式閱讀"
+
+#: classes/pref/feeds.php:1489
+msgid "Display URL"
+msgstr "顯示 URL"
+
+#: classes/pref/feeds.php:1492
+msgid "Clear all generated URLs"
+msgstr "清空所有產生的 URL"
+
+#: classes/pref/feeds.php:1570
+msgid "These feeds have not been updated with new content for 3 months (oldest first):"
+msgstr "以下摘要已經有三個月沒有內容更新了（最舊的在最上）："
+
+#: classes/pref/feeds.php:1604
+#: classes/pref/feeds.php:1668
+msgid "Click to edit feed"
+msgstr "點擊以編輯摘要"
+
+#: classes/pref/feeds.php:1622
+#: classes/pref/feeds.php:1688
+msgid "Unsubscribe from selected feeds"
+msgstr "取消訂閱選取的摘要"
+
+#: classes/pref/feeds.php:1793
+msgid "Add one valid RSS feed per line (no feed detection is done)"
+msgstr ""
+
+#: classes/pref/feeds.php:1802
+msgid "Feeds to subscribe, One per line"
+msgstr ""
+
+#: classes/pref/feeds.php:1825
+msgid "Feeds require authentication."
+msgstr ""
+
+#: classes/pref/feeds.php:1832
+#: classes/feeds.php:1092
+#: classes/feeds.php:1146
+msgid "Subscribe"
+msgstr "訂閱"
+
+#: classes/pref/system.php:29
+msgid "Error Log"
+msgstr "錯誤的Log"
+
+#: classes/pref/system.php:40
+msgid "Refresh"
+msgstr "重新整理"
+
+#: classes/pref/system.php:43
+msgid "Clear log"
+msgstr "清空Log"
+
+#: classes/pref/system.php:48
+msgid "Error"
+msgstr "錯誤"
+
+#: classes/pref/system.php:49
+msgid "Filename"
+msgstr "檔案名稱路徑："
+
+#: classes/pref/system.php:50
+msgid "Message"
+msgstr "訊息"
+
+#: classes/pref/system.php:52
+msgid "Date"
+msgstr "日期"
+
+#: classes/opml.php:28
+#: classes/opml.php:33
+msgid "OPML Utility"
+msgstr "OPML 工具"
+
+#: classes/opml.php:37
+msgid "Importing OPML..."
+msgstr "正在匯入 OPML ……"
+
+#: classes/opml.php:41
+msgid "Return to preferences"
+msgstr "返回偏好設定"
+
+#: classes/opml.php:295
+#, php-format
+msgid "Adding feed: %s"
+msgstr "新增摘要: %s"
+
+#: classes/opml.php:306
+#, fuzzy, php-format
+msgid "Duplicate feed: %s"
+msgstr "更新摘要"
+
+#: classes/opml.php:320
+#, php-format
+msgid "Adding label %s"
+msgstr "新增標籤: %s"
+
+#: classes/opml.php:323
+#, php-format
+msgid "Duplicate label: %s"
+msgstr "重複的標籤: %s"
+
+#: classes/opml.php:335
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr "將偏好按鍵從 %s 設定為 %s"
+
+#: classes/opml.php:367
+msgid "Adding filter..."
+msgstr "建立過濾器"
+
+#: classes/opml.php:486
+#, fuzzy, php-format
+msgid "Processing category: %s"
+msgstr "加入到類別："
+
+#: classes/opml.php:532
+#, php-format
+msgid "Upload failed with error code %d"
+msgstr "上傳失敗，失敗碼 %d"
+
+#: classes/opml.php:544
+#: plugins/import_export/init.php:448
+#, fuzzy
+msgid "Unable to move uploaded file."
+msgstr "錯誤：無法載入文章。"
+
+#: classes/opml.php:548
+#: plugins/import_export/init.php:452
+msgid "Error: please upload OPML file."
+msgstr "錯誤：請上傳 OPML 文件。"
+
+#: classes/opml.php:559
+#, fuzzy
+msgid "Error: unable to find moved OPML file."
+msgstr "錯誤：無法載入文章。"
+
+#: classes/opml.php:566
+msgid "Error while parsing document."
+msgstr "解析文檔時發生錯誤。"
+
 #: classes/feeds.php:53
 msgid "View as RSS feed"
 msgstr "以RSS摘要方式閱讀"
@@ -2367,8 +2315,8 @@ msgstr "移回原位"
 
 #: classes/feeds.php:127
 #: classes/feeds.php:132
-#: plugins/mail/init.php:75
 #: plugins/mailto/init.php:25
+#: plugins/mail/init.php:75
 #, fuzzy
 msgid "Forward by email"
 msgstr "透過郵件轉發"
@@ -2377,267 +2325,260 @@ msgstr "透過郵件轉發"
 msgid "Feed:"
 msgstr "摘要："
 
-#: classes/feeds.php:229
-#: classes/feeds.php:892
+#: classes/feeds.php:228
+#: classes/feeds.php:885
 msgid "Feed not found."
 msgstr "找不到摘要。"
 
-#: classes/feeds.php:300
+#: classes/feeds.php:291
 msgid "Never"
 msgstr "從未"
 
-#: classes/feeds.php:413
+#: classes/feeds.php:405
 #, fuzzy, php-format
 msgid "Imported at %s"
 msgstr "匯入"
 
-#: classes/feeds.php:472
-#: classes/feeds.php:569
+#: classes/feeds.php:464
+#: classes/feeds.php:561
 msgid "mark feed as read"
 msgstr "標記摘要為已讀"
 
-#: classes/feeds.php:630
+#: classes/feeds.php:622
 #, fuzzy
 msgid "Collapse article"
 msgstr "全部文章"
 
-#: classes/feeds.php:791
+#: classes/feeds.php:784
 msgid "No unread articles found to display."
 msgstr "沒有未讀文章。"
 
-#: classes/feeds.php:794
+#: classes/feeds.php:787
 msgid "No updated articles found to display."
 msgstr "沒有最新更新的文章。"
 
-#: classes/feeds.php:797
+#: classes/feeds.php:790
 msgid "No starred articles found to display."
 msgstr "沒有加星標的文章。"
 
-#: classes/feeds.php:801
+#: classes/feeds.php:794
 #, fuzzy
 msgid "No articles found to display. You can assign articles to labels manually from article header context menu (applies to all selected articles) or use a filter."
 msgstr "本標籤下沒有文章。你可以透過手動或過濾器的方式為文章添加預定義標籤（參考上方動作菜單）。"
 
-#: classes/feeds.php:803
+#: classes/feeds.php:796
 msgid "No articles found to display."
 msgstr "暫時沒有文章。"
 
-#: classes/feeds.php:818
-#: classes/feeds.php:992
+#: classes/feeds.php:811
+#: classes/feeds.php:985
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "上次摘要更新時間：%s"
 
-#: classes/feeds.php:828
-#: classes/feeds.php:1002
+#: classes/feeds.php:821
+#: classes/feeds.php:995
 msgid "Some feeds have update errors (click for details)"
 msgstr "部分摘要更新錯誤（點擊了解詳情）"
 
-#: classes/feeds.php:982
+#: classes/feeds.php:975
 msgid "No feed selected."
 msgstr "沒有選取的摘要。"
 
-#: classes/feeds.php:1041
-#: classes/feeds.php:1049
+#: classes/feeds.php:1034
+#: classes/feeds.php:1042
 #, fuzzy
 msgid "Feed or site URL"
 msgstr "摘要 URL"
 
-#: classes/feeds.php:1063
+#: classes/feeds.php:1056
 msgid "Available feeds"
 msgstr "可用的摘要"
 
-#: classes/feeds.php:1094
+#: classes/feeds.php:1087
 msgid "This feed requires authentication."
 msgstr "這個摘要需要認證"
 
-#: classes/feeds.php:1102
+#: classes/feeds.php:1095
 msgid "More feeds"
 msgstr "更多摘要"
 
-#: classes/feeds.php:1129
+#: classes/feeds.php:1122
 msgid "Popular feeds"
 msgstr "最受歡迎的摘要"
 
-#: classes/feeds.php:1130
+#: classes/feeds.php:1123
 msgid "Feed archive"
 msgstr "摘要存檔"
 
-#: classes/feeds.php:1133
+#: classes/feeds.php:1126
 msgid "limit:"
 msgstr "限制："
 
-#: classes/feeds.php:1165
+#: classes/feeds.php:1158
 msgid "Look for"
 msgstr "查找"
 
-#: classes/feeds.php:1173
+#: classes/feeds.php:1166
 #, php-format
 msgid "in %s"
 msgstr ""
 
-#: classes/feeds.php:1178
+#: classes/feeds.php:1171
 msgid "Used for word stemming"
 msgstr ""
 
-#: classes/feeds.php:1187
+#: classes/feeds.php:1180
 #, fuzzy
 msgid "Search syntax"
 msgstr "搜尋"
 
-#: plugins/instances/init.php:141
-msgid "Linked"
-msgstr "鏈接"
-
-#: plugins/instances/init.php:204
-#: plugins/instances/init.php:395
-msgid "Instance"
-msgstr "實例"
-
-#: plugins/instances/init.php:215
-#: plugins/instances/init.php:312
-#: plugins/instances/init.php:404
-msgid "Instance URL"
-msgstr "實例 URL："
-
-#: plugins/instances/init.php:226
-#: plugins/instances/init.php:414
-msgid "Access key:"
-msgstr "訪問金鑰："
-
-#: plugins/instances/init.php:229
-#: plugins/instances/init.php:313
-#: plugins/instances/init.php:417
-msgid "Access key"
-msgstr "訪問金鑰"
-
-#: plugins/instances/init.php:233
-#: plugins/instances/init.php:421
-msgid "Use one access key for both linked instances."
-msgstr "為兩個相聯的實例使用一個訪問金鑰。"
-
-#: plugins/instances/init.php:241
-#: plugins/instances/init.php:429
-msgid "Generate new key"
-msgstr "產生新的金鑰"
-
-#: plugins/instances/init.php:292
-msgid "Link instance"
-msgstr "鏈接實例"
-
-#: plugins/instances/init.php:304
-msgid "You can connect other instances of Tiny Tiny RSS to this one to share Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
-msgstr "您可以與其他的 Tiny Tiny RSS 實例相聯，以共享最受歡迎的摘要列表。透過這個 URL 為本實例建立鏈接："
-
-#: plugins/instances/init.php:314
-msgid "Last connected"
-msgstr "上次連接"
-
-#: plugins/instances/init.php:315
-msgid "Status"
-msgstr "狀態"
-
-#: plugins/instances/init.php:316
-msgid "Stored feeds"
-msgstr "儲存的摘要"
-
-#: plugins/instances/init.php:433
-msgid "Create link"
-msgstr "建立鏈接"
+#: classes/feeds.php:1596
+msgid "Starred articles"
+msgstr "加星標文章"
 
-#: plugins/nsfw/init.php:30
-#: plugins/nsfw/init.php:42
-msgid "Not work safe (click to toggle)"
-msgstr ""
+#: classes/feeds.php:1598
+msgid "Published articles"
+msgstr "已發布文章"
 
-#: plugins/nsfw/init.php:52
-msgid "NSFW Plugin"
-msgstr ""
+#: classes/feeds.php:1600
+msgid "Fresh articles"
+msgstr "最新更新的文章"
 
-#: plugins/nsfw/init.php:79
-msgid "Tags to consider NSFW (comma-separated)"
-msgstr ""
+#: classes/feeds.php:1604
+msgid "Archived articles"
+msgstr "已儲存的文章"
 
-#: plugins/nsfw/init.php:100
-msgid "Configuration saved."
-msgstr "設定已儲存。"
+#: classes/feeds.php:1606
+msgid "Recently read"
+msgstr "閱讀紀錄"
 
-#: plugins/note/init.php:26
-#: plugins/note/note.js:11
-msgid "Edit article note"
-msgstr "編輯文章註記"
+#: classes/feeds.php:1716
+msgid "Special"
+msgstr "特殊區域"
+
+#: classes/feeds.php:1962
+#, php-format
+msgid "Search results: %s"
+msgstr "搜尋結果： %s"
 
 #: plugins/vf_shared/init.php:16
-#: plugins/vf_shared/init.php:69
+#: plugins/vf_shared/init.php:60
 msgid "Shared articles"
 msgstr "已分享的文章"
 
-#: plugins/auth_internal/init.php:65
-#, fuzzy
-msgid "Please enter your one time password:"
-msgstr "請填寫類別名稱："
-
-#: plugins/auth_internal/init.php:188
-msgid "Password has been changed."
-msgstr "密碼更改成功。"
-
-#: plugins/auth_internal/init.php:190
-msgid "Old password is incorrect."
-msgstr "原密碼輸入錯誤。"
+#: plugins/import_export/init.php:58
+msgid "Import and export"
+msgstr "匯入和匯出"
 
-#: plugins/af_readability/init.php:21
-msgid "Data saved."
+#: plugins/import_export/init.php:60
+msgid "You can export and import your Starred and Archived articles for safekeeping or when migrating between tt-rss instances of same version."
 msgstr ""
 
-#: plugins/af_readability/init.php:33
-#, fuzzy
-msgid "Inline content"
-msgstr "滾動文章內容"
+#: plugins/import_export/init.php:65
+msgid "Export my data"
+msgstr "匯出我的資料"
 
-#: plugins/af_readability/init.php:39
-msgid "Readability settings (af_readability)"
-msgstr ""
+#: plugins/import_export/init.php:81
+msgid "Import"
+msgstr "匯入"
 
-#: plugins/af_readability/init.php:66
-msgid "Use Readability for pages shared via bookmarklet."
+#: plugins/import_export/init.php:231
+msgid "Could not import: incorrect schema version."
 msgstr ""
 
-#: plugins/af_readability/init.php:78
-#: plugins/af_psql_trgm/init.php:191
-msgid "Currently enabled for (click to edit):"
+#: plugins/import_export/init.php:236
+msgid "Could not import: unrecognized document format."
 msgstr ""
 
-#: plugins/af_readability/init.php:95
-#, fuzzy
-msgid "Readability"
-msgstr "檢查可用性"
+#: plugins/import_export/init.php:397
+msgid "Finished: "
+msgstr "完成： "
 
-#: plugins/af_readability/init.php:106
-#, fuzzy
-msgid "Inline article content"
-msgstr "滾動文章內容"
+#: plugins/import_export/init.php:398
+#, fuzzy, php-format
+msgid "%d article processed, "
+msgid_plural "%d articles processed, "
+msgstr[0] "編輯文章註記"
 
-#: plugins/af_redditimgur/init.php:25
-msgid "Reddit content settings (af_redditimgur)"
-msgstr ""
+#: plugins/import_export/init.php:399
+#, php-format
+msgid "%d imported, "
+msgid_plural "%d imported, "
+msgstr[0] "%d 個已匯入"
 
-#: plugins/af_redditimgur/init.php:50
-msgid "Uses Readability (full-text-rss) implementation by <a target='_blank' href='https://bitbucket.org/fivefilters/'>FiveFilters.org</a>"
+#: plugins/import_export/init.php:400
+#, php-format
+msgid "%d feed created."
+msgid_plural "%d feeds created."
+msgstr[0] "%d 個摘要已建立"
+
+#: plugins/import_export/init.php:405
+msgid "Could not load XML document."
 msgstr ""
 
-#: plugins/af_redditimgur/init.php:54
-msgid "Extract missing content using Readability"
+#: plugins/import_export/init.php:417
+msgid "Prepare data"
 msgstr ""
 
-#: plugins/af_redditimgur/init.php:59
-msgid "Enable additional duplicate checking"
+#: plugins/import_export/init.php:434
+#, fuzzy, php-format
+msgid "Upload failed with error code %d (%s)"
+msgstr "上傳失敗，失敗碼 %d"
+
+#: plugins/import_export/init.php:460
+msgid "No file uploaded."
+msgstr "沒有上傳檔案"
+
+#: plugins/mailto/init.php:48
+#: plugins/mailto/init.php:54
+#: plugins/mail/init.php:112
+#: plugins/mail/init.php:118
+msgid "[Forwarded]"
+msgstr "[已轉發]"
+
+#: plugins/mailto/init.php:48
+#: plugins/mail/init.php:112
+msgid "Multiple articles"
+msgstr "多個文章"
+
+#: plugins/mailto/init.php:70
+msgid "Clicking the following link to invoke your mail client:"
 msgstr ""
 
-#: plugins/af_redditimgur/init.php:73
-#: plugins/af_zz_imgproxy/init.php:225
+#: plugins/mailto/init.php:74
 #, fuzzy
-msgid "Configuration saved"
-msgstr "設定已儲存。"
+msgid "Forward selected article(s) by email."
+msgstr "用郵件轉發文章"
+
+#: plugins/mailto/init.php:77
+msgid "You should be able to edit the message before sending in your mail client."
+msgstr ""
+
+#: plugins/mailto/init.php:82
+msgid "Close this dialog"
+msgstr "關閉本對話框"
+
+#: plugins/bookmarklets/init.php:20
+msgid "Bookmarklets"
+msgstr "書籤"
+
+#: plugins/bookmarklets/init.php:22
+msgid "Drag the link below to your browser toolbar, open the feed you're interested in in your browser and click on the link to subscribe to it."
+msgstr "將以下連結按鈕拖曳至您的瀏覽器書籤工具列。之後在瀏覽器中打開您想看的摘要，然後按下此連結按鈕即可訂閱。"
+
+#: plugins/bookmarklets/init.php:26
+#, php-format
+msgid "Subscribe to %s in Tiny Tiny RSS?"
+msgstr "在 Tiny Tiny RSS 中訂閱 %s ？"
+
+#: plugins/bookmarklets/init.php:31
+msgid "Subscribe in Tiny Tiny RSS"
+msgstr "在 Tiny Tiny RSS 中訂閱"
+
+#: plugins/bookmarklets/init.php:34
+msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
+msgstr ""
 
 #: plugins/af_psql_trgm/init.php:28
 #, php-format
@@ -2677,84 +2618,62 @@ msgstr ""
 msgid "Enable for all feeds:"
 msgstr "啟用摘要分類"
 
-#: plugins/af_psql_trgm/init.php:209
-msgid "Similarity (pg_trgm)"
+#: plugins/af_psql_trgm/init.php:191
+#: plugins/af_readability/init.php:78
+msgid "Currently enabled for (click to edit):"
 msgstr ""
 
-#: plugins/af_comics/init.php:40
-msgid "Feeds supported by af_comics"
+#: plugins/af_psql_trgm/init.php:209
+msgid "Similarity (pg_trgm)"
 msgstr ""
 
-#: plugins/af_comics/init.php:42
-msgid "The following comics are currently supported:"
+#: plugins/nsfw/init.php:30
+#: plugins/nsfw/init.php:42
+msgid "Not work safe (click to toggle)"
 msgstr ""
 
-#: plugins/af_comics/init.php:60
-msgid "GoComics requires a specific URL to workaround their lack of feed support: <code>http://feeds.feedburner.com/uclick/<em>comic_name</em></code> (e.g. <code>http://www.gocomics.com/garfield</code> uses <code>http://feeds.feedburner.com/uclick/garfield</code>)."
+#: plugins/nsfw/init.php:52
+msgid "NSFW Plugin"
 msgstr ""
 
-#: plugins/import_export/init.php:58
-msgid "Import and export"
-msgstr "匯入和匯出"
-
-#: plugins/import_export/init.php:60
-msgid "You can export and import your Starred and Archived articles for safekeeping or when migrating between tt-rss instances of same version."
+#: plugins/nsfw/init.php:79
+msgid "Tags to consider NSFW (comma-separated)"
 msgstr ""
 
-#: plugins/import_export/init.php:65
-msgid "Export my data"
-msgstr "匯出我的資料"
-
-#: plugins/import_export/init.php:81
-msgid "Import"
-msgstr "匯入"
+#: plugins/nsfw/init.php:100
+msgid "Configuration saved."
+msgstr "設定已儲存。"
 
-#: plugins/import_export/init.php:225
-msgid "Could not import: incorrect schema version."
-msgstr ""
+#: plugins/toggle_sidebar/init.php:23
+msgid "Collapse feedlist"
+msgstr "收縮側邊欄"
 
-#: plugins/import_export/init.php:230
-msgid "Could not import: unrecognized document format."
+#: plugins/af_readability/init.php:21
+msgid "Data saved."
 msgstr ""
 
-#: plugins/import_export/init.php:391
-msgid "Finished: "
-msgstr "完成： "
-
-#: plugins/import_export/init.php:392
-#, fuzzy, php-format
-msgid "%d article processed, "
-msgid_plural "%d articles processed, "
-msgstr[0] "編輯文章註記"
-
-#: plugins/import_export/init.php:393
-#, php-format
-msgid "%d imported, "
-msgid_plural "%d imported, "
-msgstr[0] "%d 個已匯入"
-
-#: plugins/import_export/init.php:394
-#, php-format
-msgid "%d feed created."
-msgid_plural "%d feeds created."
-msgstr[0] "%d 個摘要已建立"
+#: plugins/af_readability/init.php:33
+#, fuzzy
+msgid "Inline content"
+msgstr "滾動文章內容"
 
-#: plugins/import_export/init.php:399
-msgid "Could not load XML document."
+#: plugins/af_readability/init.php:39
+msgid "Readability settings (af_readability)"
 msgstr ""
 
-#: plugins/import_export/init.php:411
-msgid "Prepare data"
+#: plugins/af_readability/init.php:66
+msgid "Use Readability for pages shared via bookmarklet."
 msgstr ""
 
-#: plugins/import_export/init.php:428
-#, fuzzy, php-format
-msgid "Upload failed with error code %d (%s)"
-msgstr "上傳失敗，失敗碼 %d"
+#: plugins/af_readability/init.php:95
+#, fuzzy
+msgid "Readability"
+msgstr "檢查可用性"
 
-#: plugins/import_export/init.php:454
-msgid "No file uploaded."
-msgstr "沒有上傳檔案"
+#: plugins/af_readability/init.php:106
+#, fuzzy
+msgid "Inline article content"
+msgstr "滾動文章內容"
 
 #: plugins/mail/init.php:28
 msgid "Mail addresses saved."
@@ -2769,18 +2688,6 @@ msgstr "使用者擴充套件"
 msgid "You can set predefined email addressed here (comma-separated list):"
 msgstr ""
 
-#: plugins/mail/init.php:112
-#: plugins/mail/init.php:118
-#: plugins/mailto/init.php:49
-#: plugins/mailto/init.php:55
-msgid "[Forwarded]"
-msgstr "[已轉發]"
-
-#: plugins/mail/init.php:112
-#: plugins/mailto/init.php:49
-msgid "Multiple articles"
-msgstr "多個文章"
-
 #: plugins/mail/init.php:140
 msgid "To:"
 msgstr "收信人："
@@ -2793,91 +2700,110 @@ msgstr "主題："
 msgid "Send e-mail"
 msgstr "發送郵件"
 
-#: plugins/close_button/init.php:22
-msgid "Close article"
-msgstr "關閉文章"
+#: plugins/share/init.php:39
+msgid "You can disable all articles shared by unique URLs here."
+msgstr "您可以取消所有透過 URL 分享的文章。"
 
-#: plugins/bookmarklets/init.php:20
-msgid "Bookmarklets"
-msgstr "書籤"
+#: plugins/share/init.php:42
+msgid "Unshare all articles"
+msgstr "取消所有分享"
 
-#: plugins/bookmarklets/init.php:22
-msgid "Drag the link below to your browser toolbar, open the feed you're interested in in your browser and click on the link to subscribe to it."
-msgstr "將以下連結按鈕拖曳至您的瀏覽器書籤工具列。之後在瀏覽器中打開您想看的摘要，然後按下此連結按鈕即可訂閱。"
+#: plugins/share/init.php:75
+msgid "Share by URL"
+msgstr "透過 URL 分享"
 
-#: plugins/bookmarklets/init.php:26
-#, php-format
-msgid "Subscribe to %s in Tiny Tiny RSS?"
-msgstr "在 Tiny Tiny RSS 中訂閱 %s ？"
+#: plugins/share/init.php:96
+msgid "You can share this article by the following unique URL:"
+msgstr "您可以透過此 URL 分享本文章："
 
-#: plugins/bookmarklets/init.php:31
-msgid "Subscribe in Tiny Tiny RSS"
-msgstr "在 Tiny Tiny RSS 中訂閱"
+#: plugins/share/init.php:114
+msgid "Unshare article"
+msgstr "取些分享文章"
 
-#: plugins/bookmarklets/init.php:34
-msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
+#: plugins/af_comics/init.php:48
+msgid "Feeds supported by af_comics"
 msgstr ""
 
-#: plugins/toggle_sidebar/init.php:23
-msgid "Collapse feedlist"
-msgstr "收縮側邊欄"
+#: plugins/af_comics/init.php:50
+msgid "The following comics are currently supported:"
+msgstr ""
 
-#: plugins/af_zz_imgproxy/init.php:186
-msgid "Image proxy settings (af_zz_imgproxy)"
+#: plugins/af_comics/init.php:68
+msgid "GoComics requires a specific URL to workaround their lack of feed support: <code>http://feeds.feedburner.com/uclick/<em>comic_name</em></code> (e.g. <code>http://www.gocomics.com/garfield</code> uses <code>http://feeds.feedburner.com/uclick/garfield</code>)."
 msgstr ""
 
-#: plugins/af_zz_imgproxy/init.php:211
-#, fuzzy
-msgid "Enable proxy for all remote images."
-msgstr "啟用摘要分類"
+#: plugins/af_comics/init.php:70
+msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
+msgstr ""
 
-#: plugins/mailto/init.php:71
-msgid "Clicking the following link to invoke your mail client:"
+#: plugins/af_redditimgur/init.php:25
+msgid "Reddit content settings (af_redditimgur)"
 msgstr ""
 
-#: plugins/mailto/init.php:75
-#, fuzzy
-msgid "Forward selected article(s) by email."
-msgstr "用郵件轉發文章"
+#: plugins/af_redditimgur/init.php:50
+msgid "Uses Readability (full-text-rss) implementation by <a target='_blank' href='https://bitbucket.org/fivefilters/'>FiveFilters.org</a>"
+msgstr ""
 
-#: plugins/mailto/init.php:78
-msgid "You should be able to edit the message before sending in your mail client."
+#: plugins/af_redditimgur/init.php:54
+msgid "Extract missing content using Readability"
 msgstr ""
 
-#: plugins/mailto/init.php:83
-msgid "Close this dialog"
-msgstr "關閉本對話框"
+#: plugins/af_redditimgur/init.php:59
+msgid "Enable additional duplicate checking"
+msgstr ""
 
-#: plugins/share/init.php:39
-msgid "You can disable all articles shared by unique URLs here."
-msgstr "您可以取消所有透過 URL 分享的文章。"
+#: plugins/af_redditimgur/init.php:73
+#: plugins/af_zz_imgproxy/init.php:254
+#, fuzzy
+msgid "Configuration saved"
+msgstr "設定已儲存。"
 
-#: plugins/share/init.php:42
-msgid "Unshare all articles"
-msgstr "取消所有分享"
+#: plugins/note/init.php:26
+#: plugins/note/note.js:11
+msgid "Edit article note"
+msgstr "編輯文章註記"
 
-#: plugins/share/init.php:75
-msgid "Share by URL"
-msgstr "透過 URL 分享"
+#: plugins/close_button/init.php:25
+msgid "Close article"
+msgstr "關閉文章"
 
-#: plugins/share/init.php:97
-msgid "You can share this article by the following unique URL:"
-msgstr "您可以透過此 URL 分享本文章："
+#: plugins/af_zz_imgproxy/init.php:210
+msgid "Image proxy settings (af_zz_imgproxy)"
+msgstr ""
 
-#: plugins/share/init.php:115
-msgid "Unshare article"
-msgstr "取些分享文章"
+#: plugins/af_zz_imgproxy/init.php:234
+#, fuzzy
+msgid "Enable proxy for all remote images."
+msgstr "啟用摘要分類"
+
+#: plugins/af_zz_imgproxy/init.php:238
+#, fuzzy
+msgid "Don't cache files locally."
+msgstr "本地快取圖片"
+
+#: plugins/auth_internal/init.php:65
+#, fuzzy
+msgid "Please enter your one time password:"
+msgstr "請填寫類別名稱："
+
+#: plugins/auth_internal/init.php:188
+msgid "Password has been changed."
+msgstr "密碼更改成功。"
+
+#: plugins/auth_internal/init.php:190
+msgid "Old password is incorrect."
+msgstr "原密碼輸入錯誤。"
 
 #: js/FeedTree.js:172
 #, fuzzy
 msgid "(Un)collapse"
 msgstr "折疊側邊欄"
 
-#: js/PrefFeedTree.js:52
+#: js/PrefFeedTree.js:54
 msgid "Edit category"
 msgstr "編輯類別"
 
-#: js/PrefFeedTree.js:59
+#: js/PrefFeedTree.js:61
 msgid "Remove category"
 msgstr "移除類別"
 
@@ -2914,64 +2840,55 @@ msgid "Create Filter"
 msgstr "建立過濾器"
 
 #: js/functions.js:1128
-msgid "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification hub again on next feed update."
-msgstr "重置訂閱？ Tiny Tiny RSS 將會在下次摘要更新的時候嘗試再次訂閱信息提醒中心。"
-
-#: js/functions.js:1139
-#, fuzzy
-msgid "Subscription reset."
-msgstr "訂閱摘要"
-
-#: js/functions.js:1149
-#: js/tt-rss.js:695
+#: js/tt-rss.js:696
 #, perl-format
 msgid "Unsubscribe from %s?"
 msgstr "從 %s 取消訂閱？"
 
-#: js/functions.js:1152
+#: js/functions.js:1131
 msgid "Removing feed..."
 msgstr "移除摘要"
 
-#: js/functions.js:1225
+#: js/functions.js:1204
 msgid "Please enter category title:"
 msgstr "請填寫類別名稱："
 
-#: js/functions.js:1250
+#: js/functions.js:1229
 msgid "Generate new syndication address for this feed?"
 msgstr "為本摘要產生新的群地址？"
 
-#: js/functions.js:1254
-#: js/prefs.js:1154
+#: js/functions.js:1233
+#: js/prefs.js:1150
 msgid "Trying to change address..."
 msgstr ""
 
-#: js/functions.js:1497
-#: js/functions.js:1606
+#: js/functions.js:1476
+#: js/functions.js:1585
 #: js/prefs.js:398
 #: js/prefs.js:424
 #: js/prefs.js:456
 #: js/prefs.js:599
 #: js/prefs.js:617
-#: js/prefs.js:1136
-#: js/prefs.js:1263
+#: js/prefs.js:1132
+#: js/prefs.js:1259
 msgid "No feeds are selected."
 msgstr "沒有選擇任何摘要。"
 
-#: js/functions.js:1540
+#: js/functions.js:1519
 msgid "Remove selected feeds from the archive? Feeds with stored articles will not be removed."
 msgstr "將選取的摘要從存檔中移除？包含已保存文章的摘要不會被移除。"
 
-#: js/functions.js:1577
+#: js/functions.js:1556
 msgid "Feeds with update errors"
 msgstr "更新錯誤的摘要"
 
-#: js/functions.js:1588
-#: js/prefs.js:1117
+#: js/functions.js:1567
+#: js/prefs.js:1113
 msgid "Remove selected feeds?"
 msgstr "移除選取的摘要？"
 
-#: js/functions.js:1591
-#: js/prefs.js:1120
+#: js/functions.js:1570
+#: js/prefs.js:1116
 msgid "Removing selected feeds..."
 msgstr "移除選取的摘要？"
 
@@ -2994,9 +2911,7 @@ msgstr "編輯使用者信息"
 #: js/prefs.js:100
 #: js/prefs.js:209
 #: js/prefs.js:706
-#: plugins/instances/instances.js:26
-#: plugins/instances/instances.js:89
-#: js/functions.js:1408
+#: js/functions.js:1387
 msgid "Saving data..."
 msgstr " 儲存資料"
 
@@ -3024,7 +2939,7 @@ msgid "Removing selected labels..."
 msgstr "移除選取的預定義標籤？"
 
 #: js/prefs.js:308
-#: js/prefs.js:1304
+#: js/prefs.js:1300
 msgid "No labels are selected."
 msgstr "沒有選擇任何預定義標籤。"
 
@@ -3131,28 +3046,28 @@ msgstr "儲存對摘要的更改？"
 msgid "OPML Import"
 msgstr "OPML 匯入"
 
-#: js/prefs.js:764
+#: js/prefs.js:759
 msgid "Please choose an OPML file first."
 msgstr "請先選擇一個 OPML 文件。"
 
-#: js/prefs.js:767
+#: js/prefs.js:762
 #: plugins/import_export/import_export.js:115
 msgid "Importing, please wait..."
 msgstr "匯入中，請稍候……"
 
-#: js/prefs.js:928
+#: js/prefs.js:924
 msgid "Reset to defaults?"
 msgstr "重置為預設狀態？"
 
-#: js/prefs.js:1628
+#: js/prefs.js:1624
 msgid "Subscribing to feeds..."
 msgstr ""
 
-#: js/prefs.js:1647
+#: js/prefs.js:1643
 msgid "Clear stored data for this plugin?"
 msgstr ""
 
-#: js/prefs.js:1661
+#: js/prefs.js:1657
 msgid "Clear all messages in the error log?"
 msgstr ""
 
@@ -3165,182 +3080,150 @@ msgstr "將所有文章標記為已讀？"
 msgid "Marking all feeds as read..."
 msgstr "標記所有摘要為已讀"
 
-#: js/tt-rss.js:401
+#: js/tt-rss.js:402
 #, fuzzy
 msgid "Please enable mail plugin first."
 msgstr "請先選几個摘要吧。"
 
-#: js/tt-rss.js:449
-#: js/functions.js:1387
-#: js/tt-rss.js:676
+#: js/tt-rss.js:450
+#: js/functions.js:1366
+#: js/tt-rss.js:677
 msgid "You can't edit this kind of feed."
 msgstr "您無法編輯這種類型的摘要。"
 
-#: js/tt-rss.js:530
+#: js/tt-rss.js:531
 #, fuzzy
 msgid "Please enable embed_original plugin first."
 msgstr "請先選几個摘要吧。"
 
-#: js/tt-rss.js:543
-#: js/tt-rss.js:726
+#: js/tt-rss.js:544
+#: js/tt-rss.js:727
 msgid "Widescreen is not available in combined mode."
 msgstr ""
 
-#: js/tt-rss.js:824
+#: js/tt-rss.js:825
 msgid "You can't rescore this kind of feed."
 msgstr "無法重置此分類的摘要的評分。"
 
-#: js/tt-rss.js:829
-#: js/tt-rss.js:689
+#: js/tt-rss.js:830
+#: js/tt-rss.js:690
 msgid "Please select some feed first."
 msgstr "請先選幾個摘要吧。"
 
-#: js/tt-rss.js:834
+#: js/tt-rss.js:835
 #, perl-format
 msgid "Rescore articles in %s?"
 msgstr "重置 %s 中文章的評分？"
 
-#: js/tt-rss.js:837
+#: js/tt-rss.js:838
 #, fuzzy
 msgid "Rescoring articles..."
 msgstr "為文章重新評分"
 
-#: js/viewfeed.js:919
-#: js/viewfeed.js:957
-#: js/viewfeed.js:1005
-#: js/viewfeed.js:1931
-#: plugins/mail/mail.js:7
+#: js/viewfeed.js:921
+#: js/viewfeed.js:959
+#: js/viewfeed.js:1007
+#: js/viewfeed.js:1933
 #: plugins/mailto/init.js:7
-#: js/viewfeed.js:677
-#: js/viewfeed.js:699
-#: js/viewfeed.js:720
-#: js/viewfeed.js:779
-#: js/viewfeed.js:807
+#: plugins/mail/mail.js:7
+#: js/viewfeed.js:679
+#: js/viewfeed.js:701
+#: js/viewfeed.js:722
+#: js/viewfeed.js:781
+#: js/viewfeed.js:809
 msgid "No articles are selected."
 msgstr "沒有選取任何文章。"
 
-#: js/viewfeed.js:927
+#: js/viewfeed.js:929
 #, fuzzy, perl-format
 msgid "Delete %d selected article in %s?"
 msgid_plural "Delete %d selected articles in %s?"
 msgstr[0] "刪除 %s 中選擇的 %d 篇文章？"
 
-#: js/viewfeed.js:929
+#: js/viewfeed.js:931
 #, fuzzy, perl-format
 msgid "Delete %d selected article?"
 msgid_plural "Delete %d selected articles?"
 msgstr[0] "刪除選取的 %d 篇文章？"
 
-#: js/viewfeed.js:966
+#: js/viewfeed.js:968
 #, fuzzy, perl-format
 msgid "Archive %d selected article in %s?"
 msgid_plural "Archive %d selected articles in %s?"
 msgstr[0] "將 %s 中的 %d 篇選取的文章存檔？"
 
-#: js/viewfeed.js:969
+#: js/viewfeed.js:971
 #, fuzzy, perl-format
 msgid "Move %d archived article back?"
 msgid_plural "Move %d archived articles back?"
 msgstr[0] "將存檔的 %d 篇文章移回原處？"
 
-#: js/viewfeed.js:971
+#: js/viewfeed.js:973
 msgid "Please note that unstarred articles might get purged on next feed update."
 msgstr ""
 
-#: js/viewfeed.js:1011
+#: js/viewfeed.js:1013
 #, fuzzy, perl-format
 msgid "Mark %d selected article in %s as read?"
 msgid_plural "Mark %d selected articles in %s as read?"
 msgstr[0] "將 %s 中選取的 %d 篇文章標記為已讀？"
 
-#: js/viewfeed.js:1031
+#: js/viewfeed.js:1033
 msgid "Edit article Tags"
 msgstr "編輯文章的自訂標籤"
 
-#: js/viewfeed.js:1037
+#: js/viewfeed.js:1039
 #, fuzzy
 msgid "Saving article tags..."
 msgstr "編輯文章的自訂標籤"
 
-#: js/viewfeed.js:1670
+#: js/viewfeed.js:1672
 msgid "Open original article"
 msgstr "打開原始文章"
 
-#: js/viewfeed.js:1677
+#: js/viewfeed.js:1679
 msgid "Display article URL"
 msgstr "顯示文章網址"
 
-#: js/viewfeed.js:1787
+#: js/viewfeed.js:1789
 msgid "Assign label"
 msgstr "添加預定義標籤"
 
-#: js/viewfeed.js:1792
+#: js/viewfeed.js:1794
 msgid "Remove label"
 msgstr "移除預定義標籤"
 
-#: js/viewfeed.js:1824
+#: js/viewfeed.js:1826
 #, fuzzy
 msgid "Select articles in group"
 msgstr "選擇鼠標指向的文章"
 
-#: js/viewfeed.js:1834
+#: js/viewfeed.js:1836
 #, fuzzy
 msgid "Mark group as read"
 msgstr "標記為已讀"
 
-#: js/viewfeed.js:1846
+#: js/viewfeed.js:1848
 msgid "Mark feed as read"
 msgstr "標記摘要為已讀"
 
-#: js/viewfeed.js:1899
+#: js/viewfeed.js:1901
 #, fuzzy
 msgid "Please enter new score for selected articles:"
 msgstr "刪除選取的 %d 篇文章？"
 
-#: js/viewfeed.js:1962
+#: js/viewfeed.js:1964
 #, fuzzy
 msgid "Please enter new score for this article:"
 msgstr "請填寫類別名稱："
 
-#: js/viewfeed.js:1993
+#: js/viewfeed.js:1995
 msgid "Article URL:"
 msgstr "文章網址： "
 
-#: plugins/instances/instances.js:10
-msgid "Link Instance"
-msgstr "鏈接實例"
-
-#: plugins/instances/instances.js:73
-msgid "Edit Instance"
-msgstr "編輯實例"
-
-#: plugins/instances/instances.js:122
-msgid "Remove selected instances?"
-msgstr "移除選取的實例？"
-
-#: plugins/instances/instances.js:125
-#, fuzzy
-msgid "Removing selected instances..."
-msgstr "移除選取的實例？"
-
-#: plugins/instances/instances.js:139
-#: plugins/instances/instances.js:151
-msgid "No instances are selected."
-msgstr "未選取任何實例。"
-
-#: plugins/instances/instances.js:156
-msgid "Please select only one instance."
-msgstr "請僅選擇一個實例。"
-
-#: plugins/note/note.js:17
-#, fuzzy
-msgid "Saving article note..."
-msgstr "編輯文章註記"
-
-#: plugins/af_psql_trgm/init.js:11
-#, fuzzy
-msgid "Related articles"
-msgstr "刪除文章"
+#: plugins/embed_original/init.js:6
+msgid "Sorry, your browser does not support sandboxed iframes."
+msgstr ""
 
 #: plugins/import_export/import_export.js:13
 msgid "Export Data"
@@ -3360,11 +3243,16 @@ msgstr "資料匯入"
 msgid "Please choose the file first."
 msgstr "請選擇檔案。"
 
-#: plugins/mail/mail.js:21
 #: plugins/mailto/init.js:21
+#: plugins/mail/mail.js:21
 msgid "Forward article by email"
 msgstr "用郵件轉發文章"
 
+#: plugins/af_psql_trgm/init.js:11
+#, fuzzy
+msgid "Related articles"
+msgstr "刪除文章"
+
 #: plugins/mail/mail.js:36
 msgid "Error sending email:"
 msgstr ""
@@ -3374,10 +3262,6 @@ msgstr ""
 msgid "Your message has been sent."
 msgstr "您的個人數據已儲存。"
 
-#: plugins/embed_original/init.js:6
-msgid "Sorry, your browser does not support sandboxed iframes."
-msgstr ""
-
 #: plugins/shorten_expanded/init.js:39
 #, fuzzy
 msgid "Click to expand article"
@@ -3409,7 +3293,7 @@ msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr "之前共享文章的 URL 將會回到未認證狀態。是否繼續？"
 
 #: plugins/share/share_prefs.js:6
-#: js/prefs.js:1437
+#: js/prefs.js:1433
 msgid "Clearing URLs..."
 msgstr ""
 
@@ -3417,26 +3301,45 @@ msgstr ""
 msgid "Shared URLs cleared."
 msgstr ""
 
+#: plugins/note/note.js:17
+#, fuzzy
+msgid "Saving article note..."
+msgstr "編輯文章註記"
+
 #: js/feedlist.js:429
-#: js/feedlist.js:496
 msgid "Mark all articles in %s as read?"
 msgstr "將 %s 中的全部文章標記為已讀？"
 
 #: js/feedlist.js:487
 #, fuzzy
-msgid "Mark all articles in %s older than 1 day as read?"
+msgid "Mark %w in %s older than 1 day as read?"
 msgstr "將 %s 中的全部文章標記為已讀？"
 
 #: js/feedlist.js:490
 #, fuzzy
-msgid "Mark all articles in %s older than 1 week as read?"
+msgid "Mark %w in %s older than 1 week as read?"
 msgstr "將 %s 中的全部文章標記為已讀？"
 
 #: js/feedlist.js:493
 #, fuzzy
-msgid "Mark all articles in %s older than 2 weeks as read?"
+msgid "Mark %w in %s older than 2 weeks as read?"
+msgstr "將 %s 中的全部文章標記為已讀？"
+
+#: js/feedlist.js:496
+#, fuzzy
+msgid "Mark %w in %s as read?"
 msgstr "將 %s 中的全部文章標記為已讀？"
 
+#: js/feedlist.js:499
+#, fuzzy
+msgid "search results"
+msgstr "搜尋結果： %s"
+
+#: js/feedlist.js:499
+#, fuzzy
+msgid "all articles"
+msgstr "全部文章"
+
 #: js/functions.js:506
 msgid "Error explained"
 msgstr ""
@@ -3520,186 +3423,257 @@ msgstr "您已經訂閱過這個摘要啦。"
 msgid "Edit rule"
 msgstr "編輯過濾器"
 
-#: js/functions.js:1402
+#: js/functions.js:1381
 msgid "Edit Feed"
 msgstr "編輯摘要"
 
-#: js/functions.js:1435
+#: js/functions.js:1414
 msgid "More Feeds"
 msgstr "更多摘要"
 
-#: js/functions.js:1631
+#: js/functions.js:1610
 msgid "Help"
 msgstr "說明"
 
-#: js/prefs.js:1032
+#: js/prefs.js:1028
 msgid "Remove category %s? Any nested feeds would be placed into Uncategorized."
 msgstr ""
 
-#: js/prefs.js:1038
+#: js/prefs.js:1034
 #, fuzzy
 msgid "Removing category..."
 msgstr "建立類別"
 
-#: js/prefs.js:1056
+#: js/prefs.js:1052
 msgid "Remove selected categories?"
 msgstr "移除所有選擇的類別？"
 
-#: js/prefs.js:1059
+#: js/prefs.js:1055
 #, fuzzy
 msgid "Removing selected categories..."
 msgstr "移除選定的類別"
 
-#: js/prefs.js:1072
+#: js/prefs.js:1068
 msgid "No categories are selected."
 msgstr "沒有選取任何類別。"
 
-#: js/prefs.js:1079
+#: js/prefs.js:1075
 #, fuzzy
 msgid "Category title:"
 msgstr "類別"
 
-#: js/prefs.js:1083
+#: js/prefs.js:1079
 #, fuzzy
 msgid "Creating category..."
 msgstr "建立過濾器"
 
-#: js/prefs.js:1106
+#: js/prefs.js:1102
 msgid "Feeds without recent updates"
 msgstr "最近沒更新的摘要"
 
-#: js/prefs.js:1150
+#: js/prefs.js:1146
 msgid "Replace current OPML publishing address with a new one?"
 msgstr "將當前的 OPML 發布地址更改替換為新地址？"
 
-#: js/prefs.js:1227
+#: js/prefs.js:1223
 #, fuzzy
 msgid "Clearing feed..."
 msgstr "清空摘要數據"
 
-#: js/prefs.js:1247
+#: js/prefs.js:1243
 msgid "Rescore articles in selected feeds?"
 msgstr "為選取摘要中的文章重置評分？"
 
-#: js/prefs.js:1250
+#: js/prefs.js:1246
 #, fuzzy
 msgid "Rescoring selected feeds..."
 msgstr "為選取摘要中的文章重置評分？"
 
-#: js/prefs.js:1270
+#: js/prefs.js:1266
 msgid "Rescore all articles? This operation may take a lot of time."
 msgstr "重置所有文章的評分？這可能將花費很長時間。"
 
-#: js/prefs.js:1273
+#: js/prefs.js:1269
 #, fuzzy
 msgid "Rescoring feeds..."
 msgstr "為摘要重新評分"
 
-#: js/prefs.js:1289
+#: js/prefs.js:1285
 msgid "Reset selected labels to default colors?"
 msgstr "將選取的可選標籤重置為預設顏色？"
 
-#: js/prefs.js:1321
+#: js/prefs.js:1317
 msgid "Settings Profiles"
 msgstr "偏好設定的設定"
 
-#: js/prefs.js:1330
+#: js/prefs.js:1326
 msgid "Remove selected profiles? Active and default profiles will not be removed."
 msgstr "移除選取的偏好設定？當前偏好與預設偏好不會被移除。"
 
-#: js/prefs.js:1333
+#: js/prefs.js:1329
 msgid "Removing selected profiles..."
 msgstr "移除選取的偏好設定檔"
 
-#: js/prefs.js:1349
+#: js/prefs.js:1345
 msgid "No profiles are selected."
 msgstr "未選擇偏好設定。"
 
-#: js/prefs.js:1357
-#: js/prefs.js:1410
+#: js/prefs.js:1353
+#: js/prefs.js:1406
 msgid "Activate selected profile?"
 msgstr "啟用選取的偏好設定？"
 
-#: js/prefs.js:1374
-#: js/prefs.js:1426
+#: js/prefs.js:1370
+#: js/prefs.js:1422
 msgid "Please choose a profile to activate."
 msgstr "請選擇希望啟用的偏好設定。"
 
-#: js/prefs.js:1379
+#: js/prefs.js:1375
 msgid "Creating profile..."
 msgstr "建立偏好設定檔..."
 
-#: js/prefs.js:1434
+#: js/prefs.js:1430
 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr "之前產生的摘要 URL 將會回到未認證狀態。是否繼續？"
 
-#: js/prefs.js:1444
+#: js/prefs.js:1440
 #, fuzzy
 msgid "Generated URLs cleared."
 msgstr "產生一個新的 URL"
 
-#: js/prefs.js:1516
+#: js/prefs.js:1512
 msgid "Label Editor"
 msgstr "編輯預定義標籤"
 
-#: js/tt-rss.js:684
+#: js/tt-rss.js:685
 msgid "You can't unsubscribe from the category."
 msgstr "您不能取消訂閱一個類別。"
 
-#: js/viewfeed.js:125
-#: js/viewfeed.js:175
-#: js/viewfeed.js:192
+#: js/viewfeed.js:127
+#: js/viewfeed.js:177
+#: js/viewfeed.js:194
 #, fuzzy
 msgid "Click to open next unread feed."
 msgstr "點擊以編輯摘要"
 
-#: js/viewfeed.js:129
+#: js/viewfeed.js:131
 msgid "Cancel search"
 msgstr "取消搜尋"
 
-#: js/viewfeed.js:189
+#: js/viewfeed.js:191
 #, fuzzy
 msgid "New articles found, reload feed to continue."
 msgstr "暫時沒有文章。"
 
-#: js/viewfeed.js:424
+#: js/viewfeed.js:426
 msgid "Unstar article"
 msgstr "取消此文章標示星星"
 
-#: js/viewfeed.js:428
+#: js/viewfeed.js:430
 msgid "Star article"
 msgstr "為此文章標示星星"
 
-#: js/viewfeed.js:478
+#: js/viewfeed.js:480
 msgid "Unpublish article"
 msgstr "取消發布文章"
 
-#: js/viewfeed.js:482
+#: js/viewfeed.js:484
 msgid "Publish article"
 msgstr "發布文章"
 
-#: js/viewfeed.js:622
+#: js/viewfeed.js:624
 #, fuzzy
 msgid "%d article selected"
 msgid_plural "%d articles selected"
 msgstr[0] "未選取任何文章。"
 
-#: js/viewfeed.js:1286
+#: js/viewfeed.js:1288
 msgid "No article is selected."
 msgstr "未選取任何文章。"
 
-#: js/viewfeed.js:1321
+#: js/viewfeed.js:1323
 msgid "No articles found to mark"
 msgstr "未找到需要標記的文章"
 
-#: js/viewfeed.js:1323
+#: js/viewfeed.js:1325
 #, fuzzy
 msgid "Mark %d article as read?"
 msgid_plural "Mark %d articles as read?"
 msgstr[0] "將 %d 篇文章標記為已讀？"
 
-#~ msgid "Cache images locally"
-#~ msgstr "本地快取圖片"
+#~ msgid "Resubscribe to push updates"
+#~ msgstr "重新訂閱以推送更新"
+
+#~ msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
+#~ msgstr "為啟用推送的摘要重置 PubSubHubbub 訂閱。"
+
+#~ msgid "Download more plugins at tt-rss.org <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forums</a> or <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a>."
+#~ msgstr "從 tt-rss.org下載更多擴充套件，可參閱 <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">討論區</a> 或 <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a>."
+
+#~ msgid "Linked"
+#~ msgstr "鏈接"
+
+#~ msgid "Instance"
+#~ msgstr "實例"
+
+#~ msgid "Instance URL"
+#~ msgstr "實例 URL："
+
+#~ msgid "Access key:"
+#~ msgstr "訪問金鑰："
+
+#~ msgid "Access key"
+#~ msgstr "訪問金鑰"
+
+#~ msgid "Use one access key for both linked instances."
+#~ msgstr "為兩個相聯的實例使用一個訪問金鑰。"
+
+#~ msgid "Generate new key"
+#~ msgstr "產生新的金鑰"
+
+#~ msgid "Link instance"
+#~ msgstr "鏈接實例"
+
+#~ msgid "You can connect other instances of Tiny Tiny RSS to this one to share Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
+#~ msgstr "您可以與其他的 Tiny Tiny RSS 實例相聯，以共享最受歡迎的摘要列表。透過這個 URL 為本實例建立鏈接："
+
+#~ msgid "Last connected"
+#~ msgstr "上次連接"
+
+#~ msgid "Status"
+#~ msgstr "狀態"
+
+#~ msgid "Stored feeds"
+#~ msgstr "儲存的摘要"
+
+#~ msgid "Create link"
+#~ msgstr "建立鏈接"
+
+#~ msgid "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification hub again on next feed update."
+#~ msgstr "重置訂閱？ Tiny Tiny RSS 將會在下次摘要更新的時候嘗試再次訂閱信息提醒中心。"
+
+#, fuzzy
+#~ msgid "Subscription reset."
+#~ msgstr "訂閱摘要"
+
+#~ msgid "Link Instance"
+#~ msgstr "鏈接實例"
+
+#~ msgid "Edit Instance"
+#~ msgstr "編輯實例"
+
+#~ msgid "Remove selected instances?"
+#~ msgstr "移除選取的實例？"
+
+#, fuzzy
+#~ msgid "Removing selected instances..."
+#~ msgstr "移除選取的實例？"
+
+#~ msgid "No instances are selected."
+#~ msgstr "未選取任何實例。"
+
+#~ msgid "Please select only one instance."
+#~ msgstr "請僅選擇一個實例。"
 
 #, fuzzy
 #~ msgid "Are you sure to report this exception to tt-rss.org? The report will include information about your web browser and tt-rss configuration. Your IP will be saved in the database."
diff --git a/messages.pot b/messages.pot
index 424bf9475..4bc5e777b 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: 2017-03-23 15:25+0300\n"
+"POT-Creation-Date: 2017-07-04 16:30+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -162,14 +162,13 @@ msgstr ""
 
 #: index.php:149 index.php:165 index.php:283 prefs.php:118
 #: classes/backend.php:5 classes/pref/labels.php:282
-#: classes/pref/feeds.php:1402 classes/pref/filters.php:779 js/feedlist.js:149
-#: js/functions.js:1131 js/functions.js:1231 js/functions.js:1478
-#: js/prefs.js:621 js/prefs.js:818 js/prefs.js:1648 js/prefs.js:1663
-#: js/tt-rss.js:550 js/viewfeed.js:1182
+#: classes/pref/filters.php:819 classes/pref/feeds.php:1376 js/feedlist.js:149
+#: js/functions.js:1210 js/functions.js:1457 js/prefs.js:621 js/prefs.js:813
+#: js/prefs.js:1644 js/prefs.js:1659 js/tt-rss.js:551 js/viewfeed.js:1184
 #: plugins/import_export/import_export.js:17 js/feedlist.js:467
-#: js/feedlist.js:512 js/functions.js:372 js/functions.js:630 js/prefs.js:1360
-#: js/prefs.js:1413 js/prefs.js:1452 js/prefs.js:1465 js/prefs.js:1476
-#: js/prefs.js:1491 js/tt-rss.js:567 js/viewfeed.js:762
+#: js/feedlist.js:515 js/functions.js:372 js/functions.js:630 js/prefs.js:1356
+#: js/prefs.js:1409 js/prefs.js:1448 js/prefs.js:1461 js/prefs.js:1472
+#: js/prefs.js:1487 js/tt-rss.js:568 js/viewfeed.js:764
 msgid "Loading, please wait..."
 msgstr ""
 
@@ -185,11 +184,11 @@ msgstr ""
 msgid "All Articles"
 msgstr ""
 
-#: index.php:192 include/functions2.php:107 classes/feeds.php:110
+#: index.php:192 include/functions.php:1181 classes/feeds.php:110
 msgid "Starred"
 msgstr ""
 
-#: index.php:193 include/functions2.php:108 classes/feeds.php:111
+#: index.php:193 include/functions.php:1182 classes/feeds.php:111
 msgid "Published"
 msgstr ""
 
@@ -225,7 +224,7 @@ msgstr ""
 msgid "Title"
 msgstr ""
 
-#: index.php:209 index.php:249 include/functions2.php:95 classes/feeds.php:115
+#: index.php:209 index.php:249 include/functions.php:1169 classes/feeds.php:115
 #: js/FeedTree.js:138 js/FeedTree.js:166
 msgid "Mark as read"
 msgstr ""
@@ -262,7 +261,7 @@ msgstr ""
 msgid "Feed actions:"
 msgstr ""
 
-#: index.php:244 classes/handler/public.php:672
+#: index.php:244 classes/handler/public.php:583
 msgid "Subscribe to feed..."
 msgstr ""
 
@@ -274,8 +273,8 @@ msgstr ""
 msgid "Rescore feed"
 msgstr ""
 
-#: index.php:247 classes/pref/feeds.php:785 classes/pref/feeds.php:1357
-#: js/PrefFeedTree.js:78
+#: index.php:247 classes/pref/feeds.php:785 classes/pref/feeds.php:1331
+#: js/PrefFeedTree.js:80
 msgid "Unsubscribe"
 msgstr ""
 
@@ -291,7 +290,7 @@ msgstr ""
 msgid "Other actions:"
 msgstr ""
 
-#: index.php:252 include/functions2.php:81
+#: index.php:252 include/functions.php:1155
 msgid "Toggle widescreen mode"
 msgstr ""
 
@@ -315,7 +314,7 @@ msgstr ""
 msgid "Updates are available from Git."
 msgstr ""
 
-#: prefs.php:33 prefs.php:136 include/functions2.php:110
+#: prefs.php:33 prefs.php:136 include/functions.php:1184
 #: classes/pref/prefs.php:435
 msgid "Preferences"
 msgstr ""
@@ -328,17 +327,16 @@ msgstr ""
 msgid "Exit preferences"
 msgstr ""
 
-#: prefs.php:139 classes/pref/feeds.php:112 classes/pref/feeds.php:1297
-#: classes/pref/feeds.php:1346
+#: prefs.php:139 classes/pref/feeds.php:112 classes/pref/feeds.php:1271
+#: classes/pref/feeds.php:1320
 msgid "Feeds"
 msgstr ""
 
-#: prefs.php:142 classes/pref/filters.php:248
+#: prefs.php:142 classes/pref/filters.php:273
 msgid "Filters"
 msgstr ""
 
-#: prefs.php:145 include/functions.php:1327 include/functions.php:1979
-#: classes/pref/labels.php:90
+#: prefs.php:145 classes/pref/labels.php:90 classes/feeds.php:1718
 msgid "Labels"
 msgstr ""
 
@@ -360,10 +358,10 @@ msgstr ""
 
 #: register.php:197 register.php:242 register.php:255 register.php:270
 #: register.php:289 register.php:337 register.php:347 register.php:359
-#: classes/handler/public.php:742 classes/handler/public.php:813
-#: classes/handler/public.php:911 classes/handler/public.php:990
-#: classes/handler/public.php:1004 classes/handler/public.php:1011
-#: classes/handler/public.php:1036
+#: classes/handler/public.php:653 classes/handler/public.php:724
+#: classes/handler/public.php:822 classes/handler/public.php:901
+#: classes/handler/public.php:915 classes/handler/public.php:922
+#: classes/handler/public.php:947
 msgid "Return to Tiny Tiny RSS"
 msgstr ""
 
@@ -382,11 +380,11 @@ msgstr ""
 msgid "Check availability"
 msgstr ""
 
-#: register.php:229 classes/handler/public.php:829
+#: register.php:229 classes/handler/public.php:740
 msgid "Email:"
 msgstr ""
 
-#: register.php:232 classes/handler/public.php:834
+#: register.php:232 classes/handler/public.php:745
 msgid "How much is two plus two:"
 msgstr ""
 
@@ -414,13 +412,17 @@ msgstr ""
 msgid "New user registrations are currently closed."
 msgstr ""
 
-#: update.php:67
+#: update.php:66
 msgid "Tiny Tiny RSS data update script."
 msgstr ""
 
-#: include/digest.php:109 include/functions.php:1336
-#: include/functions.php:1880 include/functions.php:1965
-#: include/functions.php:1987 classes/opml.php:421 classes/pref/feeds.php:228
+#: include/controls.php:83 classes/pref/filters.php:242
+#: classes/pref/filters.php:253 classes/pref/filters.php:544
+msgid "All feeds"
+msgstr ""
+
+#: include/controls.php:134 include/controls.php:316 classes/pref/feeds.php:228
+#: classes/opml.php:486 classes/feeds.php:1727 classes/digest.php:113
 msgid "Uncategorized"
 msgstr ""
 
@@ -435,356 +437,269 @@ msgstr[1] ""
 msgid "No feeds found."
 msgstr ""
 
-#: include/functions.php:1029
+#: include/functions.php:900
 #, php-format
 msgid "%d min"
 msgstr ""
 
-#: include/functions.php:1325 include/functions.php:1977
-msgid "Special"
-msgstr ""
-
-#: include/functions.php:1828 classes/pref/filters.php:229
-#: classes/pref/filters.php:507
-msgid "All feeds"
-msgstr ""
-
-#: include/functions.php:2032
-msgid "Starred articles"
-msgstr ""
-
-#: include/functions.php:2034
-msgid "Published articles"
-msgstr ""
-
-#: include/functions.php:2036
-msgid "Fresh articles"
-msgstr ""
-
-#: include/functions.php:2038 include/functions2.php:105
-msgid "All articles"
-msgstr ""
-
-#: include/functions.php:2040
-msgid "Archived articles"
-msgstr ""
-
-#: include/functions.php:2042
-msgid "Recently read"
-msgstr ""
-
-#: include/functions2.php:57
+#: include/functions.php:1131
 msgid "Navigation"
 msgstr ""
 
-#: include/functions2.php:58
+#: include/functions.php:1132
 msgid "Open next feed"
 msgstr ""
 
-#: include/functions2.php:59
+#: include/functions.php:1133
 msgid "Open previous feed"
 msgstr ""
 
-#: include/functions2.php:60
+#: include/functions.php:1134
 msgid "Open next article"
 msgstr ""
 
-#: include/functions2.php:61
+#: include/functions.php:1135
 msgid "Open previous article"
 msgstr ""
 
-#: include/functions2.php:62
+#: include/functions.php:1136
 msgid "Open next article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions2.php:63
+#: include/functions.php:1137
 msgid "Open previous article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions2.php:64
+#: include/functions.php:1138
 msgid "Move to next article (don't expand or mark read)"
 msgstr ""
 
-#: include/functions2.php:65
+#: include/functions.php:1139
 msgid "Move to previous article (don't expand or mark read)"
 msgstr ""
 
-#: include/functions2.php:66
+#: include/functions.php:1140
 msgid "Show search dialog"
 msgstr ""
 
-#: include/functions2.php:67
+#: include/functions.php:1141
 msgid "Article"
 msgstr ""
 
-#: include/functions2.php:68 js/viewfeed.js:1699
+#: include/functions.php:1142 js/viewfeed.js:1701
 msgid "Toggle starred"
 msgstr ""
 
-#: include/functions2.php:69 js/viewfeed.js:1711
+#: include/functions.php:1143 js/viewfeed.js:1713
 msgid "Toggle published"
 msgstr ""
 
-#: include/functions2.php:70 js/viewfeed.js:1686
+#: include/functions.php:1144 js/viewfeed.js:1688
 msgid "Toggle unread"
 msgstr ""
 
-#: include/functions2.php:71
+#: include/functions.php:1145
 msgid "Edit tags"
 msgstr ""
 
-#: include/functions2.php:72
+#: include/functions.php:1146
 msgid "Open in new window"
 msgstr ""
 
-#: include/functions2.php:73 js/viewfeed.js:1732
+#: include/functions.php:1147 js/viewfeed.js:1734
 msgid "Mark below as read"
 msgstr ""
 
-#: include/functions2.php:74 js/viewfeed.js:1725
+#: include/functions.php:1148 js/viewfeed.js:1727
 msgid "Mark above as read"
 msgstr ""
 
-#: include/functions2.php:75
+#: include/functions.php:1149
 msgid "Scroll down"
 msgstr ""
 
-#: include/functions2.php:76
+#: include/functions.php:1150
 msgid "Scroll up"
 msgstr ""
 
-#: include/functions2.php:77
+#: include/functions.php:1151
 msgid "Select article under cursor"
 msgstr ""
 
-#: include/functions2.php:78
+#: include/functions.php:1152
 msgid "Email article"
 msgstr ""
 
-#: include/functions2.php:79
+#: include/functions.php:1153
 msgid "Close/collapse article"
 msgstr ""
 
-#: include/functions2.php:80
+#: include/functions.php:1154
 msgid "Toggle article expansion (combined mode)"
 msgstr ""
 
-#: include/functions2.php:82 plugins/embed_original/init.php:31
+#: include/functions.php:1156 plugins/embed_original/init.php:31
 msgid "Toggle embed original"
 msgstr ""
 
-#: include/functions2.php:83
+#: include/functions.php:1157
 msgid "Article selection"
 msgstr ""
 
-#: include/functions2.php:84
+#: include/functions.php:1158
 msgid "Select all articles"
 msgstr ""
 
-#: include/functions2.php:85
+#: include/functions.php:1159
 msgid "Select unread"
 msgstr ""
 
-#: include/functions2.php:86
+#: include/functions.php:1160
 msgid "Select starred"
 msgstr ""
 
-#: include/functions2.php:87
+#: include/functions.php:1161
 msgid "Select published"
 msgstr ""
 
-#: include/functions2.php:88
+#: include/functions.php:1162
 msgid "Invert selection"
 msgstr ""
 
-#: include/functions2.php:89
+#: include/functions.php:1163
 msgid "Deselect everything"
 msgstr ""
 
-#: include/functions2.php:90 classes/pref/feeds.php:555
-#: classes/pref/feeds.php:823
+#: include/functions.php:1164 classes/pref/feeds.php:555
+#: classes/pref/feeds.php:811
 msgid "Feed"
 msgstr ""
 
-#: include/functions2.php:91
+#: include/functions.php:1165
 msgid "Refresh current feed"
 msgstr ""
 
-#: include/functions2.php:92
+#: include/functions.php:1166
 msgid "Un/hide read feeds"
 msgstr ""
 
-#: include/functions2.php:93 classes/pref/feeds.php:1349
+#: include/functions.php:1167 classes/pref/feeds.php:1323
 msgid "Subscribe to feed"
 msgstr ""
 
-#: include/functions2.php:94 js/FeedTree.js:145 js/PrefFeedTree.js:72
-#: js/viewfeed.js:1853
+#: include/functions.php:1168 js/FeedTree.js:145 js/PrefFeedTree.js:74
+#: js/viewfeed.js:1855
 msgid "Edit feed"
 msgstr ""
 
-#: include/functions2.php:96
+#: include/functions.php:1170
 msgid "Reverse headlines"
 msgstr ""
 
-#: include/functions2.php:97
+#: include/functions.php:1171
 msgid "Toggle headline grouping"
 msgstr ""
 
-#: include/functions2.php:98
+#: include/functions.php:1172
 msgid "Debug feed update"
 msgstr ""
 
-#: include/functions2.php:99
+#: include/functions.php:1173
 msgid "Debug viewfeed()"
 msgstr ""
 
-#: include/functions2.php:100 js/FeedTree.js:194
+#: include/functions.php:1174 js/FeedTree.js:194
 msgid "Mark all feeds as read"
 msgstr ""
 
-#: include/functions2.php:101
+#: include/functions.php:1175
 msgid "Un/collapse current category"
 msgstr ""
 
-#: include/functions2.php:102
+#: include/functions.php:1176
 msgid "Toggle combined mode"
 msgstr ""
 
-#: include/functions2.php:103
+#: include/functions.php:1177
 msgid "Toggle auto expand in combined mode"
 msgstr ""
 
-#: include/functions2.php:104
+#: include/functions.php:1178
 msgid "Go to"
 msgstr ""
 
-#: include/functions2.php:106
+#: include/functions.php:1179 classes/feeds.php:1602
+msgid "All articles"
+msgstr ""
+
+#: include/functions.php:1180
 msgid "Fresh"
 msgstr ""
 
-#: include/functions2.php:109 js/tt-rss.js:494 js/tt-rss.js:663
+#: include/functions.php:1183 js/tt-rss.js:495 js/tt-rss.js:664
 msgid "Tag cloud"
 msgstr ""
 
-#: include/functions2.php:111
+#: include/functions.php:1185
 msgid "Other"
 msgstr ""
 
-#: include/functions2.php:112 classes/pref/labels.php:267
+#: include/functions.php:1186 classes/pref/labels.php:267
 msgid "Create label"
 msgstr ""
 
-#: include/functions2.php:113 classes/pref/filters.php:753
+#: include/functions.php:1187 classes/pref/filters.php:793
 msgid "Create filter"
 msgstr ""
 
-#: include/functions2.php:114
+#: include/functions.php:1188
 msgid "Un/collapse sidebar"
 msgstr ""
 
-#: include/functions2.php:115
+#: include/functions.php:1189
 msgid "Show help dialog"
 msgstr ""
 
-#: include/functions2.php:670
-#, php-format
-msgid "Search results: %s"
-msgstr ""
-
-#: include/functions2.php:1336 classes/feeds.php:752
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] ""
-msgstr[1] ""
-
-#: include/functions2.php:1340 classes/feeds.php:756
-msgid "comments"
-msgstr ""
-
-#: include/functions2.php:1366
-msgid " - "
-msgstr ""
-
-#: include/functions2.php:1397 include/functions2.php:1648
-#: classes/article.php:311
-msgid "no tags"
-msgstr ""
-
-#: include/functions2.php:1407 classes/feeds.php:738
-msgid "Edit tags for this article"
-msgstr ""
-
-#: include/functions2.php:1439 classes/feeds.php:690
-msgid "Originally from:"
-msgstr ""
-
-#: include/functions2.php:1452 classes/pref/feeds.php:574
-#: classes/feeds.php:703
-msgid "Feed URL"
-msgstr ""
-
-#: include/functions2.php:1489 classes/backend.php:105 classes/dlg.php:37
-#: classes/dlg.php:60 classes/dlg.php:93 classes/dlg.php:159
-#: classes/dlg.php:186 classes/pref/feeds.php:1652 classes/pref/feeds.php:1718
-#: classes/pref/filters.php:204 classes/pref/prefs.php:1097
-#: plugins/af_psql_trgm/init.php:102 plugins/import_export/init.php:415
-#: plugins/import_export/init.php:461 plugins/share/init.php:121
-msgid "Close this window"
-msgstr ""
-
-#: include/functions2.php:1686
-msgid "(edit note)"
-msgstr ""
-
-#: include/functions2.php:1960
-msgid "unknown type"
-msgstr ""
-
-#: include/functions2.php:2037
-msgid "Attachments"
-msgstr ""
-
-#: include/functions2.php:2496
+#: include/functions.php:2456
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: include/functions2.php:2497
+#: include/functions.php:2457
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: include/functions2.php:2498
+#: include/functions.php:2458
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: include/functions2.php:2499
+#: include/functions.php:2459
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: include/functions2.php:2500
+#: include/functions.php:2460
 msgid "No file was uploaded"
 msgstr ""
 
-#: include/functions2.php:2501
+#: include/functions.php:2461
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: include/functions2.php:2502
+#: include/functions.php:2462
 msgid "Failed to write file to disk."
 msgstr ""
 
-#: include/functions2.php:2503
+#: include/functions.php:2463
 msgid "A PHP extension stopped the file upload."
 msgstr ""
 
-#: include/login_form.php:197 classes/handler/public.php:569
-#: classes/handler/public.php:824
+#: include/login_form.php:197 classes/handler/public.php:480
+#: classes/handler/public.php:735
 msgid "Login:"
 msgstr ""
 
-#: include/login_form.php:207 classes/handler/public.php:572
+#: include/login_form.php:207 classes/handler/public.php:483
 msgid "Password:"
 msgstr ""
 
@@ -796,7 +711,7 @@ msgstr ""
 msgid "Profile:"
 msgstr ""
 
-#: include/login_form.php:223 classes/handler/public.php:311
+#: include/login_form.php:223 classes/handler/public.php:287
 #: classes/pref/prefs.php:1035 classes/rpc.php:63
 msgid "Default profile"
 msgstr ""
@@ -813,7 +728,7 @@ msgstr ""
 msgid "Remember me"
 msgstr ""
 
-#: include/login_form.php:249 classes/handler/public.php:577
+#: include/login_form.php:249 classes/handler/public.php:488
 msgid "Log in"
 msgstr ""
 
@@ -829,279 +744,260 @@ msgstr ""
 msgid "Session failed to validate (password changed)"
 msgstr ""
 
-#: classes/article.php:25
-msgid "Article not found."
-msgstr ""
-
-#: classes/article.php:197
-msgid "Tags for this article (separated by commas):"
-msgstr ""
-
-#: classes/article.php:222 classes/pref/labels.php:79
-#: classes/pref/users.php:98 classes/pref/feeds.php:801
-#: classes/pref/feeds.php:943 classes/pref/filters.php:485
-#: classes/pref/prefs.php:981 plugins/instances/init.php:245
-#: plugins/nsfw/init.php:85 plugins/note/init.php:51
-#: plugins/af_readability/init.php:68 plugins/af_redditimgur/init.php:60
-#: plugins/af_psql_trgm/init.php:181 plugins/mail/init.php:64
-#: plugins/af_zz_imgproxy/init.php:213
-msgid "Save"
-msgstr ""
-
-#: classes/article.php:224 classes/handler/public.php:546
-#: classes/handler/public.php:580 classes/pref/labels.php:81
-#: classes/pref/users.php:100 classes/pref/feeds.php:802
-#: classes/pref/feeds.php:946 classes/pref/feeds.php:1859
-#: classes/pref/filters.php:488 classes/pref/filters.php:902
-#: classes/pref/filters.php:983 classes/pref/filters.php:1076
-#: classes/pref/prefs.php:983 classes/feeds.php:1105 classes/feeds.php:1155
-#: classes/feeds.php:1192 plugins/instances/init.php:248
-#: plugins/instances/init.php:436 plugins/note/init.php:53
-#: plugins/mail/init.php:173
-msgid "Cancel"
-msgstr ""
-
-#: classes/opml.php:28 classes/opml.php:33
-msgid "OPML Utility"
+#: classes/backend.php:31
+msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
 msgstr ""
 
-#: classes/opml.php:37
-msgid "Importing OPML..."
+#: classes/backend.php:36
+msgid "Keyboard Shortcuts"
 msgstr ""
 
-#: classes/opml.php:41
-msgid "Return to preferences"
+#: classes/backend.php:59
+msgid "Shift"
 msgstr ""
 
-#: classes/opml.php:271
-#, php-format
-msgid "Adding feed: %s"
+#: classes/backend.php:62
+msgid "Ctrl"
 msgstr ""
 
-#: classes/opml.php:282
-#, php-format
-msgid "Duplicate feed: %s"
+#: classes/backend.php:97
+msgid "Help topic not found."
 msgstr ""
 
-#: classes/opml.php:296
-#, php-format
-msgid "Adding label %s"
+#: classes/backend.php:103 classes/dlg.php:37 classes/dlg.php:60
+#: classes/dlg.php:93 classes/dlg.php:159 classes/dlg.php:186
+#: classes/article.php:744 classes/pref/filters.php:206
+#: classes/pref/prefs.php:1097 classes/pref/feeds.php:1626
+#: classes/pref/feeds.php:1692 plugins/import_export/init.php:421
+#: plugins/import_export/init.php:467 plugins/af_psql_trgm/init.php:102
+#: plugins/share/init.php:120
+msgid "Close this window"
 msgstr ""
 
-#: classes/opml.php:299
-#, php-format
-msgid "Duplicate label: %s"
+#: classes/dlg.php:17
+msgid ""
+"If you have imported labels and/or filters, you might need to reload "
+"preferences to see your new data."
 msgstr ""
 
-#: classes/opml.php:311
-#, php-format
-msgid "Setting preference key %s to %s"
+#: classes/dlg.php:48
+msgid "Your Public OPML URL is:"
 msgstr ""
 
-#: classes/opml.php:343
-msgid "Adding filter..."
+#: classes/dlg.php:57 classes/dlg.php:183 plugins/share/init.php:117
+msgid "Generate new URL"
 msgstr ""
 
-#: classes/opml.php:421
-#, php-format
-msgid "Processing category: %s"
+#: classes/dlg.php:71
+msgid ""
+"Update daemon is enabled in configuration, but daemon process is not "
+"running, which prevents all feeds from updating. Please start the daemon "
+"process or contact instance owner."
 msgstr ""
 
-#: classes/opml.php:470
-#, php-format
-msgid "Upload failed with error code %d"
+#: classes/dlg.php:75 classes/dlg.php:84
+msgid "Last update:"
 msgstr ""
 
-#: classes/opml.php:484 plugins/import_export/init.php:442
-msgid "Unable to move uploaded file."
+#: classes/dlg.php:80
+msgid ""
+"Update daemon is taking too long to perform a feed update. This could "
+"indicate a problem like crash or a hang. Please check the daemon process or "
+"contact instance owner."
 msgstr ""
 
-#: classes/opml.php:488 plugins/import_export/init.php:446
-msgid "Error: please upload OPML file."
+#: classes/dlg.php:174
+msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 
-#: classes/opml.php:499
-msgid "Error: unable to find moved OPML file."
+#: classes/article.php:25
+msgid "Article not found."
 msgstr ""
 
-#: classes/opml.php:506
-msgid "Error while parsing document."
+#: classes/article.php:197
+msgid "Tags for this article (separated by commas):"
 msgstr ""
 
-#: classes/backend.php:33
-msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
+#: classes/article.php:222 classes/pref/labels.php:79
+#: classes/pref/filters.php:519 classes/pref/users.php:98
+#: classes/pref/prefs.php:981 classes/pref/feeds.php:789
+#: classes/pref/feeds.php:931 plugins/af_psql_trgm/init.php:181
+#: plugins/nsfw/init.php:85 plugins/af_readability/init.php:68
+#: plugins/mail/init.php:64 plugins/af_redditimgur/init.php:60
+#: plugins/note/init.php:51 plugins/af_zz_imgproxy/init.php:240
+msgid "Save"
 msgstr ""
 
-#: classes/backend.php:38
-msgid "Keyboard Shortcuts"
+#: classes/article.php:224 classes/handler/public.php:457
+#: classes/handler/public.php:491 classes/pref/labels.php:81
+#: classes/pref/filters.php:522 classes/pref/filters.php:942
+#: classes/pref/filters.php:1022 classes/pref/filters.php:1115
+#: classes/pref/users.php:100 classes/pref/prefs.php:983
+#: classes/pref/feeds.php:790 classes/pref/feeds.php:934
+#: classes/pref/feeds.php:1833 classes/feeds.php:1098 classes/feeds.php:1148
+#: classes/feeds.php:1185 plugins/mail/init.php:173 plugins/note/init.php:53
+msgid "Cancel"
 msgstr ""
 
-#: classes/backend.php:61
-msgid "Shift"
+#: classes/article.php:311 classes/article.php:652 classes/article.php:805
+msgid "no tags"
 msgstr ""
 
-#: classes/backend.php:64
-msgid "Ctrl"
+#: classes/article.php:419
+msgid "unknown type"
 msgstr ""
 
-#: classes/backend.php:99
-msgid "Help topic not found."
+#: classes/article.php:496
+msgid "Attachments"
 msgstr ""
 
-#: classes/dlg.php:17
-msgid ""
-"If you have imported labels and/or filters, you might need to reload "
-"preferences to see your new data."
-msgstr ""
+#: classes/article.php:591 classes/feeds.php:741
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] ""
+msgstr[1] ""
 
-#: classes/dlg.php:48
-msgid "Your Public OPML URL is:"
+#: classes/article.php:595 classes/feeds.php:745
+msgid "comments"
 msgstr ""
 
-#: classes/dlg.php:57 classes/dlg.php:183 plugins/share/init.php:118
-msgid "Generate new URL"
+#: classes/article.php:621
+msgid " - "
 msgstr ""
 
-#: classes/dlg.php:71
-msgid ""
-"Update daemon is enabled in configuration, but daemon process is not "
-"running, which prevents all feeds from updating. Please start the daemon "
-"process or contact instance owner."
+#: classes/article.php:662 classes/feeds.php:727
+msgid "Edit tags for this article"
 msgstr ""
 
-#: classes/dlg.php:75 classes/dlg.php:84
-msgid "Last update:"
+#: classes/article.php:694 classes/feeds.php:681
+msgid "Originally from:"
 msgstr ""
 
-#: classes/dlg.php:80
-msgid ""
-"Update daemon is taking too long to perform a feed update. This could "
-"indicate a problem like crash or a hang. Please check the daemon process or "
-"contact instance owner."
+#: classes/article.php:707 classes/pref/feeds.php:574 classes/feeds.php:694
+msgid "Feed URL"
 msgstr ""
 
-#: classes/dlg.php:174
-msgid "You can view this feed as RSS using the following URL:"
+#: classes/article.php:843
+msgid "(edit note)"
 msgstr ""
 
-#: classes/handler/public.php:510 plugins/bookmarklets/init.php:40
+#: classes/handler/public.php:421 plugins/bookmarklets/init.php:40
 msgid "Share with Tiny Tiny RSS"
 msgstr ""
 
-#: classes/handler/public.php:518
+#: classes/handler/public.php:429
 msgid "Title:"
 msgstr ""
 
-#: classes/handler/public.php:520 classes/pref/feeds.php:572
-#: plugins/instances/init.php:212 plugins/instances/init.php:401
+#: classes/handler/public.php:431 classes/pref/feeds.php:572
 msgid "URL:"
 msgstr ""
 
-#: classes/handler/public.php:522
+#: classes/handler/public.php:433
 msgid "Content:"
 msgstr ""
 
-#: classes/handler/public.php:524
+#: classes/handler/public.php:435
 msgid "Labels:"
 msgstr ""
 
-#: classes/handler/public.php:543
+#: classes/handler/public.php:454
 msgid "Shared article will appear in the Published feed."
 msgstr ""
 
-#: classes/handler/public.php:545
+#: classes/handler/public.php:456
 msgid "Share"
 msgstr ""
 
-#: classes/handler/public.php:567
+#: classes/handler/public.php:478
 msgid "Not logged in"
 msgstr ""
 
-#: classes/handler/public.php:626
+#: classes/handler/public.php:537
 msgid "Incorrect username or password"
 msgstr ""
 
-#: classes/handler/public.php:678
+#: classes/handler/public.php:589
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr ""
 
-#: classes/handler/public.php:681
+#: classes/handler/public.php:592
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr ""
 
-#: classes/handler/public.php:684
+#: classes/handler/public.php:595
 #, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr ""
 
-#: classes/handler/public.php:687
+#: classes/handler/public.php:598
 #, php-format
 msgid "No feeds found in <b>%s</b>."
 msgstr ""
 
-#: classes/handler/public.php:690
+#: classes/handler/public.php:601
 msgid "Multiple feed URLs found."
 msgstr ""
 
-#: classes/handler/public.php:694
+#: classes/handler/public.php:605
 #, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr ""
 
-#: classes/handler/public.php:712
+#: classes/handler/public.php:623
 msgid "Subscribe to selected feed"
 msgstr ""
 
-#: classes/handler/public.php:737
+#: classes/handler/public.php:648
 msgid "Edit subscription options"
 msgstr ""
 
-#: classes/handler/public.php:774
+#: classes/handler/public.php:685
 msgid "Password recovery"
 msgstr ""
 
-#: classes/handler/public.php:817
+#: classes/handler/public.php:728
 msgid ""
 "You will need to provide valid account name and email. A password reset link "
 "will be sent to your email address."
 msgstr ""
 
-#: classes/handler/public.php:839 classes/pref/users.php:350
+#: classes/handler/public.php:750 classes/pref/users.php:349
 msgid "Reset password"
 msgstr ""
 
-#: classes/handler/public.php:849
+#: classes/handler/public.php:760
 msgid "Some of the required form parameters are missing or incorrect."
 msgstr ""
 
-#: classes/handler/public.php:853 classes/handler/public.php:919
+#: classes/handler/public.php:764 classes/handler/public.php:830
 msgid "Go back"
 msgstr ""
 
-#: classes/handler/public.php:890
+#: classes/handler/public.php:801
 msgid "[tt-rss] Password reset request"
 msgstr ""
 
-#: classes/handler/public.php:915
+#: classes/handler/public.php:826
 msgid "Sorry, login and email combination not found."
 msgstr ""
 
-#: classes/handler/public.php:937
+#: classes/handler/public.php:848
 msgid "Your access level is insufficient to run this script."
 msgstr ""
 
-#: classes/handler/public.php:963
+#: classes/handler/public.php:874
 msgid "Database Updater"
 msgstr ""
 
-#: classes/handler/public.php:1028
+#: classes/handler/public.php:939
 msgid "Perform updates"
 msgstr ""
 
-#: classes/pref/labels.php:22 classes/pref/filters.php:348
-#: classes/pref/filters.php:823
+#: classes/pref/labels.php:22 classes/pref/filters.php:373
+#: classes/pref/filters.php:863
 msgid "Caption"
 msgstr ""
 
@@ -1122,39 +1018,36 @@ msgstr ""
 msgid "Created label <b>%s</b>"
 msgstr ""
 
-#: classes/pref/labels.php:258 classes/pref/users.php:334
-#: classes/pref/feeds.php:1337 classes/pref/feeds.php:1600
-#: classes/pref/feeds.php:1664 classes/pref/filters.php:359
-#: classes/pref/filters.php:407 classes/pref/filters.php:744
-#: classes/pref/filters.php:832 classes/pref/filters.php:859
-#: classes/pref/prefs.php:992 plugins/instances/init.php:284
+#: classes/pref/labels.php:258 classes/pref/filters.php:384
+#: classes/pref/filters.php:441 classes/pref/filters.php:784
+#: classes/pref/filters.php:872 classes/pref/filters.php:899
+#: classes/pref/users.php:333 classes/pref/prefs.php:992
+#: classes/pref/feeds.php:1311 classes/pref/feeds.php:1574
+#: classes/pref/feeds.php:1638
 msgid "Select"
 msgstr ""
 
-#: classes/pref/labels.php:261 classes/pref/users.php:337
-#: classes/pref/feeds.php:1340 classes/pref/feeds.php:1603
-#: classes/pref/feeds.php:1667 classes/pref/filters.php:362
-#: classes/pref/filters.php:410 classes/pref/filters.php:747
-#: classes/pref/filters.php:835 classes/pref/filters.php:862
-#: classes/pref/prefs.php:995 classes/feeds.php:102
-#: plugins/instances/init.php:287
+#: classes/pref/labels.php:261 classes/pref/filters.php:387
+#: classes/pref/filters.php:444 classes/pref/filters.php:787
+#: classes/pref/filters.php:875 classes/pref/filters.php:902
+#: classes/pref/users.php:336 classes/pref/prefs.php:995
+#: classes/pref/feeds.php:1314 classes/pref/feeds.php:1577
+#: classes/pref/feeds.php:1641 classes/feeds.php:102
 msgid "All"
 msgstr ""
 
-#: classes/pref/labels.php:263 classes/pref/users.php:339
-#: classes/pref/feeds.php:1342 classes/pref/feeds.php:1605
-#: classes/pref/feeds.php:1669 classes/pref/filters.php:364
-#: classes/pref/filters.php:412 classes/pref/filters.php:749
-#: classes/pref/filters.php:837 classes/pref/filters.php:864
-#: classes/pref/prefs.php:997 classes/feeds.php:105
-#: plugins/instances/init.php:289
+#: classes/pref/labels.php:263 classes/pref/filters.php:389
+#: classes/pref/filters.php:446 classes/pref/filters.php:789
+#: classes/pref/filters.php:877 classes/pref/filters.php:904
+#: classes/pref/users.php:338 classes/pref/prefs.php:997
+#: classes/pref/feeds.php:1316 classes/pref/feeds.php:1579
+#: classes/pref/feeds.php:1643 classes/feeds.php:105
 msgid "None"
 msgstr ""
 
-#: classes/pref/labels.php:270 classes/pref/users.php:348
-#: classes/pref/feeds.php:767 classes/pref/filters.php:478
-#: classes/pref/filters.php:766 classes/feeds.php:1154
-#: plugins/instances/init.php:294
+#: classes/pref/labels.php:270 classes/pref/filters.php:512
+#: classes/pref/filters.php:806 classes/pref/users.php:347
+#: classes/pref/feeds.php:767 classes/feeds.php:1147
 msgid "Remove"
 msgstr ""
 
@@ -1162,531 +1055,257 @@ msgstr ""
 msgid "Clear colors"
 msgstr ""
 
-#: classes/pref/users.php:6 classes/pref/system.php:8
-#: plugins/instances/init.php:154
-msgid "Your access level is insufficient to open this tab."
-msgstr ""
-
-#: classes/pref/users.php:24
-msgid "Edit user"
-msgstr ""
-
-#: classes/pref/users.php:56 classes/pref/feeds.php:637
-#: classes/pref/feeds.php:878 classes/feeds.php:1075
-msgid "Authentication"
-msgstr ""
-
-#: classes/pref/users.php:59
-msgid "Access level: "
-msgstr ""
-
-#: classes/pref/users.php:77 classes/pref/feeds.php:667
-#: classes/pref/feeds.php:896
-msgid "Options"
-msgstr ""
-
-#: classes/pref/users.php:91 js/prefs.js:538
-msgid "User details"
-msgstr ""
-
-#: classes/pref/users.php:118
-msgid "User not found"
-msgstr ""
-
-#: classes/pref/users.php:132 classes/pref/users.php:400
-msgid "Registered"
+#: classes/pref/filters.php:153
+msgid "Preview article"
 msgstr ""
 
-#: classes/pref/users.php:133
-msgid "Last logged in"
+#: classes/pref/filters.php:264 classes/pref/filters.php:558
+msgid "(inverse)"
 msgstr ""
 
-#: classes/pref/users.php:140
-msgid "Subscribed feeds count"
+#: classes/pref/filters.php:260 classes/pref/filters.php:557
+#, php-format
+msgid "%s on %s in %s %s"
 msgstr ""
 
-#: classes/pref/users.php:141
-msgid "Stored articles"
+#: classes/pref/filters.php:379 classes/pref/filters.php:867
+#: classes/pref/filters.php:981
+msgid "Match"
 msgstr ""
 
-#: classes/pref/users.php:145 classes/pref/users.php:399
-msgid "Subscribed feeds"
+#: classes/pref/filters.php:393 classes/pref/filters.php:450
+#: classes/pref/filters.php:881 classes/pref/filters.php:908
+msgid "Add"
 msgstr ""
 
-#: classes/pref/users.php:232
-#, php-format
-msgid "Added user <b>%s</b> with password <b>%s</b>"
+#: classes/pref/filters.php:396 classes/pref/filters.php:453
+#: classes/pref/filters.php:884 classes/pref/filters.php:911
+#: classes/feeds.php:122
+msgid "Delete"
 msgstr ""
 
-#: classes/pref/users.php:239
-#, php-format
-msgid "Could not create user <b>%s</b>"
+#: classes/pref/filters.php:436 classes/pref/filters.php:894
+msgid "Apply actions"
 msgstr ""
 
-#: classes/pref/users.php:243
-#, php-format
-msgid "User <b>%s</b> already exists."
+#: classes/pref/filters.php:486 classes/pref/filters.php:923
+msgid "Enabled"
 msgstr ""
 
-#: classes/pref/users.php:265
-#, php-format
-msgid "Changed password of user <b>%s</b> to <b>%s</b>"
+#: classes/pref/filters.php:495 classes/pref/filters.php:926
+msgid "Match any rule"
 msgstr ""
 
-#: classes/pref/users.php:267
-#, php-format
-msgid "Sending new password of user <b>%s</b> to <b>%s</b>"
+#: classes/pref/filters.php:504 classes/pref/filters.php:929
+msgid "Inverse matching"
 msgstr ""
 
-#: classes/pref/users.php:291
-msgid "[tt-rss] Password change notification"
+#: classes/pref/filters.php:516 classes/pref/filters.php:936
+msgid "Test"
 msgstr ""
 
-#: classes/pref/users.php:324 classes/pref/feeds.php:1333
-#: classes/pref/filters.php:740 classes/feeds.php:1125 classes/feeds.php:1191
+#: classes/pref/filters.php:780 classes/pref/users.php:323
+#: classes/pref/feeds.php:1307 classes/feeds.php:1118 classes/feeds.php:1184
 #: js/tt-rss.js:165
 msgid "Search"
 msgstr ""
 
-#: classes/pref/users.php:342
-msgid "Create user"
+#: classes/pref/filters.php:796
+msgid "Combine"
 msgstr ""
 
-#: classes/pref/users.php:346 classes/pref/filters.php:759
-#: plugins/instances/init.php:293
+#: classes/pref/filters.php:799 classes/pref/users.php:345
 msgid "Edit"
 msgstr ""
 
-#: classes/pref/users.php:397 classes/pref/feeds.php:643
-#: classes/pref/feeds.php:882 classes/pref/feeds.php:1836
-#: classes/feeds.php:1079
-msgid "Login"
+#: classes/pref/filters.php:802 classes/pref/feeds.php:1327
+#: classes/pref/feeds.php:1341
+msgid "Reset sort order"
 msgstr ""
 
-#: classes/pref/users.php:398
-msgid "Access Level"
+#: classes/pref/filters.php:810 classes/pref/feeds.php:1363
+msgid "Rescore articles"
 msgstr ""
 
-#: classes/pref/users.php:401
-msgid "Last login"
+#: classes/pref/filters.php:939
+msgid "Create"
 msgstr ""
 
-#: classes/pref/users.php:420 plugins/instances/init.php:334
-msgid "Click to edit"
+#: classes/pref/filters.php:993
+msgid "Inverse regular expression matching"
 msgstr ""
 
-#: classes/pref/users.php:441
-msgid "No users defined."
+#: classes/pref/filters.php:995
+msgid "on field"
 msgstr ""
 
-#: classes/pref/users.php:443
-msgid "No matching users found."
+#: classes/pref/filters.php:1001 js/PrefFilterTree.js:64
+msgid "in"
 msgstr ""
 
-#: classes/pref/system.php:29
-msgid "Error Log"
+#: classes/pref/filters.php:1014
+msgid "Wiki: Filters"
 msgstr ""
 
-#: classes/pref/system.php:40
-msgid "Refresh"
+#: classes/pref/filters.php:1019
+msgid "Save rule"
 msgstr ""
 
-#: classes/pref/system.php:43
-msgid "Clear log"
+#: classes/pref/filters.php:1019 js/functions.js:865
+msgid "Add rule"
 msgstr ""
 
-#: classes/pref/system.php:48
-msgid "Error"
+#: classes/pref/filters.php:1042
+msgid "Perform Action"
 msgstr ""
 
-#: classes/pref/system.php:49
-msgid "Filename"
+#: classes/pref/filters.php:1093
+msgid "No actions available"
 msgstr ""
 
-#: classes/pref/system.php:50
-msgid "Message"
+#: classes/pref/filters.php:1112
+msgid "Save action"
 msgstr ""
 
-#: classes/pref/system.php:52
-msgid "Date"
+#: classes/pref/filters.php:1112 js/functions.js:887
+msgid "Add action"
 msgstr ""
 
-#: classes/pref/feeds.php:15
-msgid "Check to enable field"
+#: classes/pref/filters.php:1136
+msgid "[No caption]"
 msgstr ""
 
-#: classes/pref/feeds.php:65 classes/pref/feeds.php:214
-#: classes/pref/feeds.php:258 classes/pref/feeds.php:264
-#: classes/pref/feeds.php:290
+#: classes/pref/filters.php:1138
 #, php-format
-msgid "(%d feed)"
-msgid_plural "(%d feeds)"
+msgid "%s (%d rule)"
+msgid_plural "%s (%d rules)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: classes/pref/feeds.php:537 classes/pref/prefs.php:18
-msgid "General"
-msgstr ""
-
-#: classes/pref/feeds.php:561
-msgid "Feed Title"
-msgstr ""
-
-#: classes/pref/feeds.php:595 classes/pref/feeds.php:830
-#: classes/pref/feeds.php:1822 classes/feeds.php:1055
-msgid "Place in category:"
-msgstr ""
-
-#: classes/pref/feeds.php:608 classes/pref/feeds.php:844
-msgid "Language:"
-msgstr ""
-
-#: classes/pref/feeds.php:615 classes/pref/feeds.php:853
-msgid "Update"
-msgstr ""
-
-#: classes/pref/feeds.php:630 classes/pref/feeds.php:869
-msgid "Article purging:"
-msgstr ""
-
-#: classes/pref/feeds.php:658 classes/pref/feeds.php:890
-#: classes/pref/feeds.php:1839 classes/pref/prefs.php:245
-#: classes/feeds.php:1083
-msgid "Password"
-msgstr ""
-
-#: classes/pref/feeds.php:662
-msgid ""
-"<b>Hint:</b> you need to fill in your login information if your feed "
-"requires authentication, except for Twitter feeds."
-msgstr ""
-
-#: classes/pref/feeds.php:681 classes/pref/feeds.php:900
-msgid "Hide from Popular feeds"
-msgstr ""
-
-#: classes/pref/feeds.php:693 classes/pref/feeds.php:906
-msgid "Include in e-mail digest"
-msgstr ""
-
-#: classes/pref/feeds.php:706 classes/pref/feeds.php:912
-msgid "Always display image attachments"
-msgstr ""
-
-#: classes/pref/feeds.php:719 classes/pref/feeds.php:920
-msgid "Do not embed images"
-msgstr ""
-
-#: classes/pref/feeds.php:732 classes/pref/feeds.php:928
-msgid "Cache media"
-msgstr ""
-
-#: classes/pref/feeds.php:744 classes/pref/feeds.php:934
-msgid "Mark updated articles as unread"
-msgstr ""
-
-#: classes/pref/feeds.php:748
-msgid "Icon"
-msgstr ""
-
-#: classes/pref/feeds.php:765
-msgid "Replace"
-msgstr ""
-
-#: classes/pref/feeds.php:772 classes/pref/prefs.php:698
-msgid "Plugins"
-msgstr ""
-
-#: classes/pref/feeds.php:792
-msgid "Resubscribe to push updates"
-msgstr ""
-
-#: classes/pref/feeds.php:799
-msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
-msgstr ""
-
-#: classes/pref/feeds.php:1200 classes/pref/feeds.php:1253
-msgid "All done."
-msgstr ""
-
-#: classes/pref/feeds.php:1308
-msgid "Feeds with errors"
-msgstr ""
-
-#: classes/pref/feeds.php:1315
-msgid "Inactive feeds"
-msgstr ""
-
-#: classes/pref/feeds.php:1351
-msgid "Edit selected feeds"
-msgstr ""
-
-#: classes/pref/feeds.php:1353 classes/pref/feeds.php:1367
-#: classes/pref/filters.php:762
-msgid "Reset sort order"
-msgstr ""
-
-#: classes/pref/feeds.php:1355 js/prefs.js:1622
-msgid "Batch subscribe"
-msgstr ""
-
-#: classes/pref/feeds.php:1362
-msgid "Categories"
-msgstr ""
-
-#: classes/pref/feeds.php:1365
-msgid "Add category"
-msgstr ""
-
-#: classes/pref/feeds.php:1369
-msgid "Remove selected"
-msgstr ""
-
-#: classes/pref/feeds.php:1380
-msgid "More actions..."
-msgstr ""
-
-#: classes/pref/feeds.php:1384
-msgid "Manual purge"
-msgstr ""
-
-#: classes/pref/feeds.php:1388
-msgid "Clear feed data"
-msgstr ""
-
-#: classes/pref/feeds.php:1389 classes/pref/filters.php:770
-msgid "Rescore articles"
-msgstr ""
-
-#: classes/pref/feeds.php:1442
-msgid "OPML"
-msgstr ""
-
-#: classes/pref/feeds.php:1444
-msgid ""
-"Using OPML you can export and import your feeds, filters, labels and Tiny "
-"Tiny RSS settings."
-msgstr ""
-
-#: classes/pref/feeds.php:1445
-msgid "Only main settings profile can be migrated using OPML."
-msgstr ""
-
-#: classes/pref/feeds.php:1458
-msgid "Import my OPML"
-msgstr ""
-
-#: classes/pref/feeds.php:1464
-msgid "Filename:"
-msgstr ""
-
-#: classes/pref/feeds.php:1466
-msgid "Include settings"
-msgstr ""
-
-#: classes/pref/feeds.php:1470
-msgid "Export OPML"
-msgstr ""
-
-#: classes/pref/feeds.php:1474
-msgid ""
-"Your OPML can be published publicly and can be subscribed by anyone who "
-"knows the URL below."
-msgstr ""
-
-#: classes/pref/feeds.php:1478
-msgid "Public OPML URL"
-msgstr ""
-
-#: classes/pref/feeds.php:1479
-msgid "Display published OPML URL"
-msgstr ""
-
-#: classes/pref/feeds.php:1488
-msgid "Firefox integration"
-msgstr ""
-
-#: classes/pref/feeds.php:1490
-msgid ""
-"This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
-"link below."
-msgstr ""
-
-#: classes/pref/feeds.php:1497
-msgid "Click here to register this site as a feed reader."
-msgstr ""
-
-#: classes/pref/feeds.php:1505
-msgid "Published & shared articles / Generated feeds"
+#: classes/pref/filters.php:1153
+msgid "matches any rule"
 msgstr ""
 
-#: classes/pref/feeds.php:1507
-msgid ""
-"Published articles are exported as a public RSS feed and can be subscribed "
-"by anyone who knows the URL specified below."
-msgstr ""
+#: classes/pref/filters.php:1156
+#, php-format
+msgid "%s (+%d action)"
+msgid_plural "%s (+%d actions)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: classes/pref/feeds.php:1514 classes/feeds.php:54 classes/feeds.php:140
-msgid "View as RSS"
+#: classes/pref/users.php:6 classes/pref/system.php:8
+msgid "Your access level is insufficient to open this tab."
 msgstr ""
 
-#: classes/pref/feeds.php:1515
-msgid "Display URL"
+#: classes/pref/users.php:24
+msgid "Edit user"
 msgstr ""
 
-#: classes/pref/feeds.php:1518
-msgid "Clear all generated URLs"
+#: classes/pref/users.php:56 classes/pref/feeds.php:637
+#: classes/pref/feeds.php:866 classes/feeds.php:1068
+msgid "Authentication"
 msgstr ""
 
-#: classes/pref/feeds.php:1596
-msgid ""
-"These feeds have not been updated with new content for 3 months (oldest "
-"first):"
+#: classes/pref/users.php:59
+msgid "Access level: "
 msgstr ""
 
-#: classes/pref/feeds.php:1630 classes/pref/feeds.php:1694
-msgid "Click to edit feed"
+#: classes/pref/users.php:77 classes/pref/feeds.php:667
+#: classes/pref/feeds.php:884
+msgid "Options"
 msgstr ""
 
-#: classes/pref/feeds.php:1648 classes/pref/feeds.php:1714
-msgid "Unsubscribe from selected feeds"
+#: classes/pref/users.php:91 js/prefs.js:538
+msgid "User details"
 msgstr ""
 
-#: classes/pref/feeds.php:1819
-msgid "Add one valid RSS feed per line (no feed detection is done)"
+#: classes/pref/users.php:118
+msgid "User not found"
 msgstr ""
 
-#: classes/pref/feeds.php:1828
-msgid "Feeds to subscribe, One per line"
+#: classes/pref/users.php:132 classes/pref/users.php:399
+msgid "Registered"
 msgstr ""
 
-#: classes/pref/feeds.php:1851
-msgid "Feeds require authentication."
+#: classes/pref/users.php:133
+msgid "Last logged in"
 msgstr ""
 
-#: classes/pref/feeds.php:1858 classes/feeds.php:1099 classes/feeds.php:1153
-msgid "Subscribe"
+#: classes/pref/users.php:140
+msgid "Subscribed feeds count"
 msgstr ""
 
-#: classes/pref/filters.php:151
-msgid "Preview article"
+#: classes/pref/users.php:141
+msgid "Stored articles"
 msgstr ""
 
-#: classes/pref/filters.php:239 classes/pref/filters.php:518
-msgid "(inverse)"
+#: classes/pref/users.php:145 classes/pref/users.php:398
+msgid "Subscribed feeds"
 msgstr ""
 
-#: classes/pref/filters.php:235 classes/pref/filters.php:517
+#: classes/pref/users.php:232
 #, php-format
-msgid "%s on %s in %s %s"
-msgstr ""
-
-#: classes/pref/filters.php:354 classes/pref/filters.php:827
-#: classes/pref/filters.php:942
-msgid "Match"
-msgstr ""
-
-#: classes/pref/filters.php:368 classes/pref/filters.php:416
-#: classes/pref/filters.php:841 classes/pref/filters.php:868
-msgid "Add"
-msgstr ""
-
-#: classes/pref/filters.php:371 classes/pref/filters.php:419
-#: classes/pref/filters.php:844 classes/pref/filters.php:871
-#: classes/feeds.php:122
-msgid "Delete"
-msgstr ""
-
-#: classes/pref/filters.php:402 classes/pref/filters.php:854
-msgid "Apply actions"
-msgstr ""
-
-#: classes/pref/filters.php:452 classes/pref/filters.php:883
-msgid "Enabled"
-msgstr ""
-
-#: classes/pref/filters.php:461 classes/pref/filters.php:886
-msgid "Match any rule"
-msgstr ""
-
-#: classes/pref/filters.php:470 classes/pref/filters.php:889
-msgid "Inverse matching"
-msgstr ""
-
-#: classes/pref/filters.php:482 classes/pref/filters.php:896
-msgid "Test"
-msgstr ""
-
-#: classes/pref/filters.php:756
-msgid "Combine"
+msgid "Added user <b>%s</b> with password <b>%s</b>"
 msgstr ""
 
-#: classes/pref/filters.php:899
-msgid "Create"
+#: classes/pref/users.php:239
+#, php-format
+msgid "Could not create user <b>%s</b>"
 msgstr ""
 
-#: classes/pref/filters.php:954
-msgid "Inverse regular expression matching"
+#: classes/pref/users.php:243
+#, php-format
+msgid "User <b>%s</b> already exists."
 msgstr ""
 
-#: classes/pref/filters.php:956
-msgid "on field"
+#: classes/pref/users.php:264
+#, php-format
+msgid "Changed password of user <b>%s</b> to <b>%s</b>"
 msgstr ""
 
-#: classes/pref/filters.php:962 js/PrefFilterTree.js:64
-msgid "in"
+#: classes/pref/users.php:266
+#, php-format
+msgid "Sending new password of user <b>%s</b> to <b>%s</b>"
 msgstr ""
 
-#: classes/pref/filters.php:975
-msgid "Wiki: Filters"
+#: classes/pref/users.php:290
+msgid "[tt-rss] Password change notification"
 msgstr ""
 
-#: classes/pref/filters.php:980
-msgid "Save rule"
+#: classes/pref/users.php:341
+msgid "Create user"
 msgstr ""
 
-#: classes/pref/filters.php:980 js/functions.js:865
-msgid "Add rule"
+#: classes/pref/users.php:396 classes/pref/feeds.php:643
+#: classes/pref/feeds.php:870 classes/pref/feeds.php:1810
+#: classes/feeds.php:1072
+msgid "Login"
 msgstr ""
 
-#: classes/pref/filters.php:1003
-msgid "Perform Action"
+#: classes/pref/users.php:397
+msgid "Access Level"
 msgstr ""
 
-#: classes/pref/filters.php:1054
-msgid "No actions available"
+#: classes/pref/users.php:400
+msgid "Last login"
 msgstr ""
 
-#: classes/pref/filters.php:1073
-msgid "Save action"
+#: classes/pref/users.php:419
+msgid "Click to edit"
 msgstr ""
 
-#: classes/pref/filters.php:1073 js/functions.js:887
-msgid "Add action"
+#: classes/pref/users.php:440
+msgid "No users defined."
 msgstr ""
 
-#: classes/pref/filters.php:1097
-msgid "[No caption]"
+#: classes/pref/users.php:442
+msgid "No matching users found."
 msgstr ""
 
-#: classes/pref/filters.php:1099
-#, php-format
-msgid "%s (%d rule)"
-msgid_plural "%s (%d rules)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: classes/pref/filters.php:1114
-msgid "matches any rule"
+#: classes/pref/prefs.php:18 classes/pref/feeds.php:537
+msgid "General"
 msgstr ""
 
-#: classes/pref/filters.php:1117
-#, php-format
-msgid "%s (+%d action)"
-msgid_plural "%s (+%d actions)"
-msgstr[0] ""
-msgstr[1] ""
-
 #: classes/pref/prefs.php:19
 msgid "Interface"
 msgstr ""
@@ -1872,7 +1491,7 @@ msgstr ""
 msgid "Strip all but most common HTML tags when reading articles."
 msgstr ""
 
-#: classes/pref/prefs.php:53 js/prefs.js:1584
+#: classes/pref/prefs.php:53 js/prefs.js:1580
 msgid "Customize stylesheet"
 msgstr ""
 
@@ -1940,6 +1559,12 @@ msgstr ""
 msgid "Save data"
 msgstr ""
 
+#: classes/pref/prefs.php:245 classes/pref/feeds.php:658
+#: classes/pref/feeds.php:878 classes/pref/feeds.php:1813
+#: classes/feeds.php:1076
+msgid "Password"
+msgstr ""
+
 #: classes/pref/prefs.php:254
 msgid "Your password is at default value, please change it."
 msgstr ""
@@ -2041,21 +1666,22 @@ msgstr ""
 msgid "Reset to defaults"
 msgstr ""
 
+#: classes/pref/prefs.php:698 classes/pref/feeds.php:772
+msgid "Plugins"
+msgstr ""
+
 #: classes/pref/prefs.php:700
 msgid ""
 "You will need to reload Tiny Tiny RSS for plugin changes to take effect."
 msgstr ""
 
-#: classes/pref/prefs.php:702
-msgid ""
-"Download more plugins at tt-rss.org <a class=\"visibleLink\" target=\"_blank"
-"\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forums</a> or <a "
-"target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins"
-"\">wiki</a>."
+#: classes/pref/prefs.php:730
+msgid "System plugins"
 msgstr ""
 
-#: classes/pref/prefs.php:732
-msgid "System plugins"
+#: classes/pref/prefs.php:731
+msgid ""
+"System plugins are enabled in <strong>config.php</strong> for all users."
 msgstr ""
 
 #: classes/pref/prefs.php:736 classes/pref/prefs.php:792
@@ -2122,6 +1748,327 @@ msgstr ""
 msgid "Activate profile"
 msgstr ""
 
+#: classes/pref/feeds.php:15
+msgid "Check to enable field"
+msgstr ""
+
+#: classes/pref/feeds.php:65 classes/pref/feeds.php:214
+#: classes/pref/feeds.php:258 classes/pref/feeds.php:264
+#: classes/pref/feeds.php:290
+#, php-format
+msgid "(%d feed)"
+msgid_plural "(%d feeds)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: classes/pref/feeds.php:561
+msgid "Feed Title"
+msgstr ""
+
+#: classes/pref/feeds.php:595 classes/pref/feeds.php:818
+#: classes/pref/feeds.php:1796 classes/feeds.php:1048
+msgid "Place in category:"
+msgstr ""
+
+#: classes/pref/feeds.php:608 classes/pref/feeds.php:832
+msgid "Language:"
+msgstr ""
+
+#: classes/pref/feeds.php:615 classes/pref/feeds.php:841
+msgid "Update"
+msgstr ""
+
+#: classes/pref/feeds.php:630 classes/pref/feeds.php:857
+msgid "Article purging:"
+msgstr ""
+
+#: classes/pref/feeds.php:662
+msgid ""
+"<b>Hint:</b> you need to fill in your login information if your feed "
+"requires authentication, except for Twitter feeds."
+msgstr ""
+
+#: classes/pref/feeds.php:681 classes/pref/feeds.php:888
+msgid "Hide from Popular feeds"
+msgstr ""
+
+#: classes/pref/feeds.php:693 classes/pref/feeds.php:894
+msgid "Include in e-mail digest"
+msgstr ""
+
+#: classes/pref/feeds.php:706 classes/pref/feeds.php:900
+msgid "Always display image attachments"
+msgstr ""
+
+#: classes/pref/feeds.php:719 classes/pref/feeds.php:908
+msgid "Do not embed images"
+msgstr ""
+
+#: classes/pref/feeds.php:732 classes/pref/feeds.php:916
+msgid "Cache media"
+msgstr ""
+
+#: classes/pref/feeds.php:744 classes/pref/feeds.php:922
+msgid "Mark updated articles as unread"
+msgstr ""
+
+#: classes/pref/feeds.php:748
+msgid "Icon"
+msgstr ""
+
+#: classes/pref/feeds.php:765
+msgid "Replace"
+msgstr ""
+
+#: classes/pref/feeds.php:1174 classes/pref/feeds.php:1227
+msgid "All done."
+msgstr ""
+
+#: classes/pref/feeds.php:1282
+msgid "Feeds with errors"
+msgstr ""
+
+#: classes/pref/feeds.php:1289
+msgid "Inactive feeds"
+msgstr ""
+
+#: classes/pref/feeds.php:1325
+msgid "Edit selected feeds"
+msgstr ""
+
+#: classes/pref/feeds.php:1329 js/prefs.js:1618
+msgid "Batch subscribe"
+msgstr ""
+
+#: classes/pref/feeds.php:1336
+msgid "Categories"
+msgstr ""
+
+#: classes/pref/feeds.php:1339
+msgid "Add category"
+msgstr ""
+
+#: classes/pref/feeds.php:1343
+msgid "Remove selected"
+msgstr ""
+
+#: classes/pref/feeds.php:1354
+msgid "More actions..."
+msgstr ""
+
+#: classes/pref/feeds.php:1358
+msgid "Manual purge"
+msgstr ""
+
+#: classes/pref/feeds.php:1362
+msgid "Clear feed data"
+msgstr ""
+
+#: classes/pref/feeds.php:1416
+msgid "OPML"
+msgstr ""
+
+#: classes/pref/feeds.php:1418
+msgid ""
+"Using OPML you can export and import your feeds, filters, labels and Tiny "
+"Tiny RSS settings."
+msgstr ""
+
+#: classes/pref/feeds.php:1419
+msgid "Only main settings profile can be migrated using OPML."
+msgstr ""
+
+#: classes/pref/feeds.php:1432
+msgid "Import my OPML"
+msgstr ""
+
+#: classes/pref/feeds.php:1438
+msgid "Filename:"
+msgstr ""
+
+#: classes/pref/feeds.php:1440
+msgid "Include settings"
+msgstr ""
+
+#: classes/pref/feeds.php:1444
+msgid "Export OPML"
+msgstr ""
+
+#: classes/pref/feeds.php:1448
+msgid ""
+"Your OPML can be published publicly and can be subscribed by anyone who "
+"knows the URL below."
+msgstr ""
+
+#: classes/pref/feeds.php:1452
+msgid "Public OPML URL"
+msgstr ""
+
+#: classes/pref/feeds.php:1453
+msgid "Display published OPML URL"
+msgstr ""
+
+#: classes/pref/feeds.php:1462
+msgid "Firefox integration"
+msgstr ""
+
+#: classes/pref/feeds.php:1464
+msgid ""
+"This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
+"link below."
+msgstr ""
+
+#: classes/pref/feeds.php:1471
+msgid "Click here to register this site as a feed reader."
+msgstr ""
+
+#: classes/pref/feeds.php:1479
+msgid "Published & shared articles / Generated feeds"
+msgstr ""
+
+#: classes/pref/feeds.php:1481
+msgid ""
+"Published articles are exported as a public RSS feed and can be subscribed "
+"by anyone who knows the URL specified below."
+msgstr ""
+
+#: classes/pref/feeds.php:1488 classes/feeds.php:54 classes/feeds.php:140
+msgid "View as RSS"
+msgstr ""
+
+#: classes/pref/feeds.php:1489
+msgid "Display URL"
+msgstr ""
+
+#: classes/pref/feeds.php:1492
+msgid "Clear all generated URLs"
+msgstr ""
+
+#: classes/pref/feeds.php:1570
+msgid ""
+"These feeds have not been updated with new content for 3 months (oldest "
+"first):"
+msgstr ""
+
+#: classes/pref/feeds.php:1604 classes/pref/feeds.php:1668
+msgid "Click to edit feed"
+msgstr ""
+
+#: classes/pref/feeds.php:1622 classes/pref/feeds.php:1688
+msgid "Unsubscribe from selected feeds"
+msgstr ""
+
+#: classes/pref/feeds.php:1793
+msgid "Add one valid RSS feed per line (no feed detection is done)"
+msgstr ""
+
+#: classes/pref/feeds.php:1802
+msgid "Feeds to subscribe, One per line"
+msgstr ""
+
+#: classes/pref/feeds.php:1825
+msgid "Feeds require authentication."
+msgstr ""
+
+#: classes/pref/feeds.php:1832 classes/feeds.php:1092 classes/feeds.php:1146
+msgid "Subscribe"
+msgstr ""
+
+#: classes/pref/system.php:29
+msgid "Error Log"
+msgstr ""
+
+#: classes/pref/system.php:40
+msgid "Refresh"
+msgstr ""
+
+#: classes/pref/system.php:43
+msgid "Clear log"
+msgstr ""
+
+#: classes/pref/system.php:48
+msgid "Error"
+msgstr ""
+
+#: classes/pref/system.php:49
+msgid "Filename"
+msgstr ""
+
+#: classes/pref/system.php:50
+msgid "Message"
+msgstr ""
+
+#: classes/pref/system.php:52
+msgid "Date"
+msgstr ""
+
+#: classes/opml.php:28 classes/opml.php:33
+msgid "OPML Utility"
+msgstr ""
+
+#: classes/opml.php:37
+msgid "Importing OPML..."
+msgstr ""
+
+#: classes/opml.php:41
+msgid "Return to preferences"
+msgstr ""
+
+#: classes/opml.php:295
+#, php-format
+msgid "Adding feed: %s"
+msgstr ""
+
+#: classes/opml.php:306
+#, php-format
+msgid "Duplicate feed: %s"
+msgstr ""
+
+#: classes/opml.php:320
+#, php-format
+msgid "Adding label %s"
+msgstr ""
+
+#: classes/opml.php:323
+#, php-format
+msgid "Duplicate label: %s"
+msgstr ""
+
+#: classes/opml.php:335
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr ""
+
+#: classes/opml.php:367
+msgid "Adding filter..."
+msgstr ""
+
+#: classes/opml.php:486
+#, php-format
+msgid "Processing category: %s"
+msgstr ""
+
+#: classes/opml.php:532
+#, php-format
+msgid "Upload failed with error code %d"
+msgstr ""
+
+#: classes/opml.php:544 plugins/import_export/init.php:448
+msgid "Unable to move uploaded file."
+msgstr ""
+
+#: classes/opml.php:548 plugins/import_export/init.php:452
+msgid "Error: please upload OPML file."
+msgstr ""
+
+#: classes/opml.php:559
+msgid "Error: unable to find moved OPML file."
+msgstr ""
+
+#: classes/opml.php:566
+msgid "Error while parsing document."
+msgstr ""
+
 #: classes/feeds.php:53
 msgid "View as RSS feed"
 msgstr ""
@@ -2159,8 +2106,8 @@ msgstr ""
 msgid "Move back"
 msgstr ""
 
-#: classes/feeds.php:127 classes/feeds.php:132 plugins/mail/init.php:75
-#: plugins/mailto/init.php:25
+#: classes/feeds.php:127 classes/feeds.php:132 plugins/mailto/init.php:25
+#: plugins/mail/init.php:75
 msgid "Forward by email"
 msgstr ""
 
@@ -2168,248 +2115,256 @@ msgstr ""
 msgid "Feed:"
 msgstr ""
 
-#: classes/feeds.php:229 classes/feeds.php:892
+#: classes/feeds.php:228 classes/feeds.php:885
 msgid "Feed not found."
 msgstr ""
 
-#: classes/feeds.php:300
+#: classes/feeds.php:291
 msgid "Never"
 msgstr ""
 
-#: classes/feeds.php:413
+#: classes/feeds.php:405
 #, php-format
 msgid "Imported at %s"
 msgstr ""
 
-#: classes/feeds.php:472 classes/feeds.php:569
+#: classes/feeds.php:464 classes/feeds.php:561
 msgid "mark feed as read"
 msgstr ""
 
-#: classes/feeds.php:630
+#: classes/feeds.php:622
 msgid "Collapse article"
 msgstr ""
 
-#: classes/feeds.php:791
+#: classes/feeds.php:784
 msgid "No unread articles found to display."
 msgstr ""
 
-#: classes/feeds.php:794
+#: classes/feeds.php:787
 msgid "No updated articles found to display."
 msgstr ""
 
-#: classes/feeds.php:797
+#: classes/feeds.php:790
 msgid "No starred articles found to display."
 msgstr ""
 
-#: classes/feeds.php:801
+#: classes/feeds.php:794
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "from article header context menu (applies to all selected articles) or use a "
 "filter."
 msgstr ""
 
-#: classes/feeds.php:803
+#: classes/feeds.php:796
 msgid "No articles found to display."
 msgstr ""
 
-#: classes/feeds.php:818 classes/feeds.php:992
+#: classes/feeds.php:811 classes/feeds.php:985
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr ""
 
-#: classes/feeds.php:828 classes/feeds.php:1002
+#: classes/feeds.php:821 classes/feeds.php:995
 msgid "Some feeds have update errors (click for details)"
 msgstr ""
 
-#: classes/feeds.php:982
+#: classes/feeds.php:975
 msgid "No feed selected."
 msgstr ""
 
-#: classes/feeds.php:1041 classes/feeds.php:1049
+#: classes/feeds.php:1034 classes/feeds.php:1042
 msgid "Feed or site URL"
 msgstr ""
 
-#: classes/feeds.php:1063
+#: classes/feeds.php:1056
 msgid "Available feeds"
 msgstr ""
 
-#: classes/feeds.php:1094
+#: classes/feeds.php:1087
 msgid "This feed requires authentication."
 msgstr ""
 
-#: classes/feeds.php:1102
+#: classes/feeds.php:1095
 msgid "More feeds"
 msgstr ""
 
-#: classes/feeds.php:1129
+#: classes/feeds.php:1122
 msgid "Popular feeds"
 msgstr ""
 
-#: classes/feeds.php:1130
+#: classes/feeds.php:1123
 msgid "Feed archive"
 msgstr ""
 
-#: classes/feeds.php:1133
+#: classes/feeds.php:1126
 msgid "limit:"
 msgstr ""
 
-#: classes/feeds.php:1165
+#: classes/feeds.php:1158
 msgid "Look for"
 msgstr ""
 
-#: classes/feeds.php:1173
+#: classes/feeds.php:1166
 #, php-format
 msgid "in %s"
 msgstr ""
 
-#: classes/feeds.php:1178
+#: classes/feeds.php:1171
 msgid "Used for word stemming"
 msgstr ""
 
-#: classes/feeds.php:1187
+#: classes/feeds.php:1180
 msgid "Search syntax"
 msgstr ""
 
-#: plugins/instances/init.php:141
-msgid "Linked"
-msgstr ""
-
-#: plugins/instances/init.php:204 plugins/instances/init.php:395
-msgid "Instance"
+#: classes/feeds.php:1596
+msgid "Starred articles"
 msgstr ""
 
-#: plugins/instances/init.php:215 plugins/instances/init.php:312
-#: plugins/instances/init.php:404
-msgid "Instance URL"
+#: classes/feeds.php:1598
+msgid "Published articles"
 msgstr ""
 
-#: plugins/instances/init.php:226 plugins/instances/init.php:414
-msgid "Access key:"
+#: classes/feeds.php:1600
+msgid "Fresh articles"
 msgstr ""
 
-#: plugins/instances/init.php:229 plugins/instances/init.php:313
-#: plugins/instances/init.php:417
-msgid "Access key"
+#: classes/feeds.php:1604
+msgid "Archived articles"
 msgstr ""
 
-#: plugins/instances/init.php:233 plugins/instances/init.php:421
-msgid "Use one access key for both linked instances."
+#: classes/feeds.php:1606
+msgid "Recently read"
 msgstr ""
 
-#: plugins/instances/init.php:241 plugins/instances/init.php:429
-msgid "Generate new key"
+#: classes/feeds.php:1716
+msgid "Special"
 msgstr ""
 
-#: plugins/instances/init.php:292
-msgid "Link instance"
+#: classes/feeds.php:1962
+#, php-format
+msgid "Search results: %s"
 msgstr ""
 
-#: plugins/instances/init.php:304
-msgid ""
-"You can connect other instances of Tiny Tiny RSS to this one to share "
-"Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
+#: plugins/vf_shared/init.php:16 plugins/vf_shared/init.php:60
+msgid "Shared articles"
 msgstr ""
 
-#: plugins/instances/init.php:314
-msgid "Last connected"
+#: plugins/import_export/init.php:58
+msgid "Import and export"
 msgstr ""
 
-#: plugins/instances/init.php:315
-msgid "Status"
+#: plugins/import_export/init.php:60
+msgid ""
+"You can export and import your Starred and Archived articles for safekeeping "
+"or when migrating between tt-rss instances of same version."
 msgstr ""
 
-#: plugins/instances/init.php:316
-msgid "Stored feeds"
+#: plugins/import_export/init.php:65
+msgid "Export my data"
 msgstr ""
 
-#: plugins/instances/init.php:433
-msgid "Create link"
+#: plugins/import_export/init.php:81
+msgid "Import"
 msgstr ""
 
-#: plugins/nsfw/init.php:30 plugins/nsfw/init.php:42
-msgid "Not work safe (click to toggle)"
+#: plugins/import_export/init.php:231
+msgid "Could not import: incorrect schema version."
 msgstr ""
 
-#: plugins/nsfw/init.php:52
-msgid "NSFW Plugin"
+#: plugins/import_export/init.php:236
+msgid "Could not import: unrecognized document format."
 msgstr ""
 
-#: plugins/nsfw/init.php:79
-msgid "Tags to consider NSFW (comma-separated)"
+#: plugins/import_export/init.php:397
+msgid "Finished: "
 msgstr ""
 
-#: plugins/nsfw/init.php:100
-msgid "Configuration saved."
-msgstr ""
+#: plugins/import_export/init.php:398
+#, php-format
+msgid "%d article processed, "
+msgid_plural "%d articles processed, "
+msgstr[0] ""
+msgstr[1] ""
 
-#: plugins/note/init.php:26 plugins/note/note.js:11
-msgid "Edit article note"
-msgstr ""
+#: plugins/import_export/init.php:399
+#, php-format
+msgid "%d imported, "
+msgid_plural "%d imported, "
+msgstr[0] ""
+msgstr[1] ""
 
-#: plugins/vf_shared/init.php:16 plugins/vf_shared/init.php:69
-msgid "Shared articles"
-msgstr ""
+#: plugins/import_export/init.php:400
+#, php-format
+msgid "%d feed created."
+msgid_plural "%d feeds created."
+msgstr[0] ""
+msgstr[1] ""
 
-#: plugins/auth_internal/init.php:65
-msgid "Please enter your one time password:"
+#: plugins/import_export/init.php:405
+msgid "Could not load XML document."
 msgstr ""
 
-#: plugins/auth_internal/init.php:188
-msgid "Password has been changed."
+#: plugins/import_export/init.php:417
+msgid "Prepare data"
 msgstr ""
 
-#: plugins/auth_internal/init.php:190
-msgid "Old password is incorrect."
+#: plugins/import_export/init.php:434
+#, php-format
+msgid "Upload failed with error code %d (%s)"
 msgstr ""
 
-#: plugins/af_readability/init.php:21
-msgid "Data saved."
+#: plugins/import_export/init.php:460
+msgid "No file uploaded."
 msgstr ""
 
-#: plugins/af_readability/init.php:33
-msgid "Inline content"
+#: plugins/mailto/init.php:48 plugins/mailto/init.php:54
+#: plugins/mail/init.php:112 plugins/mail/init.php:118
+msgid "[Forwarded]"
 msgstr ""
 
-#: plugins/af_readability/init.php:39
-msgid "Readability settings (af_readability)"
+#: plugins/mailto/init.php:48 plugins/mail/init.php:112
+msgid "Multiple articles"
 msgstr ""
 
-#: plugins/af_readability/init.php:66
-msgid "Use Readability for pages shared via bookmarklet."
+#: plugins/mailto/init.php:70
+msgid "Clicking the following link to invoke your mail client:"
 msgstr ""
 
-#: plugins/af_readability/init.php:78 plugins/af_psql_trgm/init.php:191
-msgid "Currently enabled for (click to edit):"
+#: plugins/mailto/init.php:74
+msgid "Forward selected article(s) by email."
 msgstr ""
 
-#: plugins/af_readability/init.php:95
-msgid "Readability"
+#: plugins/mailto/init.php:77
+msgid ""
+"You should be able to edit the message before sending in your mail client."
 msgstr ""
 
-#: plugins/af_readability/init.php:106
-msgid "Inline article content"
+#: plugins/mailto/init.php:82
+msgid "Close this dialog"
 msgstr ""
 
-#: plugins/af_redditimgur/init.php:25
-msgid "Reddit content settings (af_redditimgur)"
+#: plugins/bookmarklets/init.php:20
+msgid "Bookmarklets"
 msgstr ""
 
-#: plugins/af_redditimgur/init.php:50
+#: plugins/bookmarklets/init.php:22
 msgid ""
-"Uses Readability (full-text-rss) implementation by <a target='_blank' "
-"href='https://bitbucket.org/fivefilters/'>FiveFilters.org</a>"
+"Drag the link below to your browser toolbar, open the feed you're interested "
+"in in your browser and click on the link to subscribe to it."
 msgstr ""
 
-#: plugins/af_redditimgur/init.php:54
-msgid "Extract missing content using Readability"
+#: plugins/bookmarklets/init.php:26
+#, php-format
+msgid "Subscribe to %s in Tiny Tiny RSS?"
 msgstr ""
 
-#: plugins/af_redditimgur/init.php:59
-msgid "Enable additional duplicate checking"
+#: plugins/bookmarklets/init.php:31
+msgid "Subscribe in Tiny Tiny RSS"
 msgstr ""
 
-#: plugins/af_redditimgur/init.php:73 plugins/af_zz_imgproxy/init.php:225
-msgid "Configuration saved"
+#: plugins/bookmarklets/init.php:34
+msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
 msgstr ""
 
 #: plugins/af_psql_trgm/init.php:28
@@ -2448,92 +2403,56 @@ msgstr ""
 msgid "Enable for all feeds:"
 msgstr ""
 
-#: plugins/af_psql_trgm/init.php:209
-msgid "Similarity (pg_trgm)"
-msgstr ""
-
-#: plugins/af_comics/init.php:40
-msgid "Feeds supported by af_comics"
-msgstr ""
-
-#: plugins/af_comics/init.php:42
-msgid "The following comics are currently supported:"
+#: plugins/af_psql_trgm/init.php:191 plugins/af_readability/init.php:78
+msgid "Currently enabled for (click to edit):"
 msgstr ""
 
-#: plugins/af_comics/init.php:60
-msgid ""
-"GoComics requires a specific URL to workaround their lack of feed support: "
-"<code>http://feeds.feedburner.com/uclick/<em>comic_name</em></code> (e.g. "
-"<code>http://www.gocomics.com/garfield</code> uses <code>http://feeds."
-"feedburner.com/uclick/garfield</code>)."
+#: plugins/af_psql_trgm/init.php:209
+msgid "Similarity (pg_trgm)"
 msgstr ""
 
-#: plugins/import_export/init.php:58
-msgid "Import and export"
+#: plugins/nsfw/init.php:30 plugins/nsfw/init.php:42
+msgid "Not work safe (click to toggle)"
 msgstr ""
 
-#: plugins/import_export/init.php:60
-msgid ""
-"You can export and import your Starred and Archived articles for safekeeping "
-"or when migrating between tt-rss instances of same version."
+#: plugins/nsfw/init.php:52
+msgid "NSFW Plugin"
 msgstr ""
 
-#: plugins/import_export/init.php:65
-msgid "Export my data"
+#: plugins/nsfw/init.php:79
+msgid "Tags to consider NSFW (comma-separated)"
 msgstr ""
 
-#: plugins/import_export/init.php:81
-msgid "Import"
+#: plugins/nsfw/init.php:100
+msgid "Configuration saved."
 msgstr ""
 
-#: plugins/import_export/init.php:225
-msgid "Could not import: incorrect schema version."
+#: plugins/toggle_sidebar/init.php:23
+msgid "Collapse feedlist"
 msgstr ""
 
-#: plugins/import_export/init.php:230
-msgid "Could not import: unrecognized document format."
+#: plugins/af_readability/init.php:21
+msgid "Data saved."
 msgstr ""
 
-#: plugins/import_export/init.php:391
-msgid "Finished: "
+#: plugins/af_readability/init.php:33
+msgid "Inline content"
 msgstr ""
 
-#: plugins/import_export/init.php:392
-#, php-format
-msgid "%d article processed, "
-msgid_plural "%d articles processed, "
-msgstr[0] ""
-msgstr[1] ""
-
-#: plugins/import_export/init.php:393
-#, php-format
-msgid "%d imported, "
-msgid_plural "%d imported, "
-msgstr[0] ""
-msgstr[1] ""
-
-#: plugins/import_export/init.php:394
-#, php-format
-msgid "%d feed created."
-msgid_plural "%d feeds created."
-msgstr[0] ""
-msgstr[1] ""
-
-#: plugins/import_export/init.php:399
-msgid "Could not load XML document."
+#: plugins/af_readability/init.php:39
+msgid "Readability settings (af_readability)"
 msgstr ""
 
-#: plugins/import_export/init.php:411
-msgid "Prepare data"
+#: plugins/af_readability/init.php:66
+msgid "Use Readability for pages shared via bookmarklet."
 msgstr ""
 
-#: plugins/import_export/init.php:428
-#, php-format
-msgid "Upload failed with error code %d (%s)"
+#: plugins/af_readability/init.php:95
+msgid "Readability"
 msgstr ""
 
-#: plugins/import_export/init.php:454
-msgid "No file uploaded."
+#: plugins/af_readability/init.php:106
+msgid "Inline article content"
 msgstr ""
 
 #: plugins/mail/init.php:28
@@ -2548,15 +2467,6 @@ msgstr ""
 msgid "You can set predefined email addressed here (comma-separated list):"
 msgstr ""
 
-#: plugins/mail/init.php:112 plugins/mail/init.php:118
-#: plugins/mailto/init.php:49 plugins/mailto/init.php:55
-msgid "[Forwarded]"
-msgstr ""
-
-#: plugins/mail/init.php:112 plugins/mailto/init.php:49
-msgid "Multiple articles"
-msgstr ""
-
 #: plugins/mail/init.php:140
 msgid "To:"
 msgstr ""
@@ -2569,91 +2479,110 @@ msgstr ""
 msgid "Send e-mail"
 msgstr ""
 
-#: plugins/close_button/init.php:22
-msgid "Close article"
+#: plugins/share/init.php:39
+msgid "You can disable all articles shared by unique URLs here."
 msgstr ""
 
-#: plugins/bookmarklets/init.php:20
-msgid "Bookmarklets"
+#: plugins/share/init.php:42
+msgid "Unshare all articles"
 msgstr ""
 
-#: plugins/bookmarklets/init.php:22
-msgid ""
-"Drag the link below to your browser toolbar, open the feed you're interested "
-"in in your browser and click on the link to subscribe to it."
+#: plugins/share/init.php:75
+msgid "Share by URL"
 msgstr ""
 
-#: plugins/bookmarklets/init.php:26
-#, php-format
-msgid "Subscribe to %s in Tiny Tiny RSS?"
+#: plugins/share/init.php:96
+msgid "You can share this article by the following unique URL:"
 msgstr ""
 
-#: plugins/bookmarklets/init.php:31
-msgid "Subscribe in Tiny Tiny RSS"
+#: plugins/share/init.php:114
+msgid "Unshare article"
 msgstr ""
 
-#: plugins/bookmarklets/init.php:34
-msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
+#: plugins/af_comics/init.php:48
+msgid "Feeds supported by af_comics"
 msgstr ""
 
-#: plugins/toggle_sidebar/init.php:23
-msgid "Collapse feedlist"
+#: plugins/af_comics/init.php:50
+msgid "The following comics are currently supported:"
 msgstr ""
 
-#: plugins/af_zz_imgproxy/init.php:186
-msgid "Image proxy settings (af_zz_imgproxy)"
+#: plugins/af_comics/init.php:68
+msgid ""
+"GoComics requires a specific URL to workaround their lack of feed support: "
+"<code>http://feeds.feedburner.com/uclick/<em>comic_name</em></code> (e.g. "
+"<code>http://www.gocomics.com/garfield</code> uses <code>http://feeds."
+"feedburner.com/uclick/garfield</code>)."
 msgstr ""
 
-#: plugins/af_zz_imgproxy/init.php:211
-msgid "Enable proxy for all remote images."
+#: plugins/af_comics/init.php:70
+msgid ""
+"Drop any updated filters into <code>filters.local</code> in plugin directory."
 msgstr ""
 
-#: plugins/mailto/init.php:71
-msgid "Clicking the following link to invoke your mail client:"
+#: plugins/af_redditimgur/init.php:25
+msgid "Reddit content settings (af_redditimgur)"
 msgstr ""
 
-#: plugins/mailto/init.php:75
-msgid "Forward selected article(s) by email."
+#: plugins/af_redditimgur/init.php:50
+msgid ""
+"Uses Readability (full-text-rss) implementation by <a target='_blank' "
+"href='https://bitbucket.org/fivefilters/'>FiveFilters.org</a>"
 msgstr ""
 
-#: plugins/mailto/init.php:78
-msgid ""
-"You should be able to edit the message before sending in your mail client."
+#: plugins/af_redditimgur/init.php:54
+msgid "Extract missing content using Readability"
 msgstr ""
 
-#: plugins/mailto/init.php:83
-msgid "Close this dialog"
+#: plugins/af_redditimgur/init.php:59
+msgid "Enable additional duplicate checking"
 msgstr ""
 
-#: plugins/share/init.php:39
-msgid "You can disable all articles shared by unique URLs here."
+#: plugins/af_redditimgur/init.php:73 plugins/af_zz_imgproxy/init.php:254
+msgid "Configuration saved"
 msgstr ""
 
-#: plugins/share/init.php:42
-msgid "Unshare all articles"
+#: plugins/note/init.php:26 plugins/note/note.js:11
+msgid "Edit article note"
 msgstr ""
 
-#: plugins/share/init.php:75
-msgid "Share by URL"
+#: plugins/close_button/init.php:25
+msgid "Close article"
 msgstr ""
 
-#: plugins/share/init.php:97
-msgid "You can share this article by the following unique URL:"
+#: plugins/af_zz_imgproxy/init.php:210
+msgid "Image proxy settings (af_zz_imgproxy)"
 msgstr ""
 
-#: plugins/share/init.php:115
-msgid "Unshare article"
+#: plugins/af_zz_imgproxy/init.php:234
+msgid "Enable proxy for all remote images."
+msgstr ""
+
+#: plugins/af_zz_imgproxy/init.php:238
+msgid "Don't cache files locally."
+msgstr ""
+
+#: plugins/auth_internal/init.php:65
+msgid "Please enter your one time password:"
+msgstr ""
+
+#: plugins/auth_internal/init.php:188
+msgid "Password has been changed."
+msgstr ""
+
+#: plugins/auth_internal/init.php:190
+msgid "Old password is incorrect."
 msgstr ""
 
 #: js/FeedTree.js:172
 msgid "(Un)collapse"
 msgstr ""
 
-#: js/PrefFeedTree.js:52
+#: js/PrefFeedTree.js:54
 msgid "Edit category"
 msgstr ""
 
-#: js/PrefFeedTree.js:59
+#: js/PrefFeedTree.js:61
 msgid "Remove category"
 msgstr ""
 
@@ -2687,58 +2616,48 @@ msgstr ""
 msgid "Create Filter"
 msgstr ""
 
-#: js/functions.js:1128
-msgid ""
-"Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
-"hub again on next feed update."
-msgstr ""
-
-#: js/functions.js:1139
-msgid "Subscription reset."
-msgstr ""
-
-#: js/functions.js:1149 js/tt-rss.js:695
+#: js/functions.js:1128 js/tt-rss.js:696
 #, perl-format
 msgid "Unsubscribe from %s?"
 msgstr ""
 
-#: js/functions.js:1152
+#: js/functions.js:1131
 msgid "Removing feed..."
 msgstr ""
 
-#: js/functions.js:1225
+#: js/functions.js:1204
 msgid "Please enter category title:"
 msgstr ""
 
-#: js/functions.js:1250
+#: js/functions.js:1229
 msgid "Generate new syndication address for this feed?"
 msgstr ""
 
-#: js/functions.js:1254 js/prefs.js:1154
+#: js/functions.js:1233 js/prefs.js:1150
 msgid "Trying to change address..."
 msgstr ""
 
-#: js/functions.js:1497 js/functions.js:1606 js/prefs.js:398 js/prefs.js:424
-#: js/prefs.js:456 js/prefs.js:599 js/prefs.js:617 js/prefs.js:1136
-#: js/prefs.js:1263
+#: js/functions.js:1476 js/functions.js:1585 js/prefs.js:398 js/prefs.js:424
+#: js/prefs.js:456 js/prefs.js:599 js/prefs.js:617 js/prefs.js:1132
+#: js/prefs.js:1259
 msgid "No feeds are selected."
 msgstr ""
 
-#: js/functions.js:1540
+#: js/functions.js:1519
 msgid ""
 "Remove selected feeds from the archive? Feeds with stored articles will not "
 "be removed."
 msgstr ""
 
-#: js/functions.js:1577
+#: js/functions.js:1556
 msgid "Feeds with update errors"
 msgstr ""
 
-#: js/functions.js:1588 js/prefs.js:1117
+#: js/functions.js:1567 js/prefs.js:1113
 msgid "Remove selected feeds?"
 msgstr ""
 
-#: js/functions.js:1591 js/prefs.js:1120
+#: js/functions.js:1570 js/prefs.js:1116
 msgid "Removing selected feeds..."
 msgstr ""
 
@@ -2758,9 +2677,7 @@ msgstr ""
 msgid "User Editor"
 msgstr ""
 
-#: js/prefs.js:100 js/prefs.js:209 js/prefs.js:706
-#: plugins/instances/instances.js:26 plugins/instances/instances.js:89
-#: js/functions.js:1408
+#: js/prefs.js:100 js/prefs.js:209 js/prefs.js:706 js/functions.js:1387
 msgid "Saving data..."
 msgstr ""
 
@@ -2784,7 +2701,7 @@ msgstr ""
 msgid "Removing selected labels..."
 msgstr ""
 
-#: js/prefs.js:308 js/prefs.js:1304
+#: js/prefs.js:308 js/prefs.js:1300
 msgid "No labels are selected."
 msgstr ""
 
@@ -2878,27 +2795,27 @@ msgstr ""
 msgid "OPML Import"
 msgstr ""
 
-#: js/prefs.js:764
+#: js/prefs.js:759
 msgid "Please choose an OPML file first."
 msgstr ""
 
-#: js/prefs.js:767 plugins/import_export/import_export.js:115
+#: js/prefs.js:762 plugins/import_export/import_export.js:115
 msgid "Importing, please wait..."
 msgstr ""
 
-#: js/prefs.js:928
+#: js/prefs.js:924
 msgid "Reset to defaults?"
 msgstr ""
 
-#: js/prefs.js:1628
+#: js/prefs.js:1624
 msgid "Subscribing to feeds..."
 msgstr ""
 
-#: js/prefs.js:1647
+#: js/prefs.js:1643
 msgid "Clear stored data for this plugin?"
 msgstr ""
 
-#: js/prefs.js:1661
+#: js/prefs.js:1657
 msgid "Clear all messages in the error log?"
 msgstr ""
 
@@ -2910,164 +2827,136 @@ msgstr ""
 msgid "Marking all feeds as read..."
 msgstr ""
 
-#: js/tt-rss.js:401
+#: js/tt-rss.js:402
 msgid "Please enable mail plugin first."
 msgstr ""
 
-#: js/tt-rss.js:449 js/functions.js:1387 js/tt-rss.js:676
+#: js/tt-rss.js:450 js/functions.js:1366 js/tt-rss.js:677
 msgid "You can't edit this kind of feed."
 msgstr ""
 
-#: js/tt-rss.js:530
+#: js/tt-rss.js:531
 msgid "Please enable embed_original plugin first."
 msgstr ""
 
-#: js/tt-rss.js:543 js/tt-rss.js:726
+#: js/tt-rss.js:544 js/tt-rss.js:727
 msgid "Widescreen is not available in combined mode."
 msgstr ""
 
-#: js/tt-rss.js:824
+#: js/tt-rss.js:825
 msgid "You can't rescore this kind of feed."
 msgstr ""
 
-#: js/tt-rss.js:829 js/tt-rss.js:689
+#: js/tt-rss.js:830 js/tt-rss.js:690
 msgid "Please select some feed first."
 msgstr ""
 
-#: js/tt-rss.js:834
+#: js/tt-rss.js:835
 #, perl-format
 msgid "Rescore articles in %s?"
 msgstr ""
 
-#: js/tt-rss.js:837
+#: js/tt-rss.js:838
 msgid "Rescoring articles..."
 msgstr ""
 
-#: js/viewfeed.js:919 js/viewfeed.js:957 js/viewfeed.js:1005
-#: js/viewfeed.js:1931 plugins/mail/mail.js:7 plugins/mailto/init.js:7
-#: js/viewfeed.js:677 js/viewfeed.js:699 js/viewfeed.js:720 js/viewfeed.js:779
-#: js/viewfeed.js:807
+#: js/viewfeed.js:921 js/viewfeed.js:959 js/viewfeed.js:1007
+#: js/viewfeed.js:1933 plugins/mailto/init.js:7 plugins/mail/mail.js:7
+#: js/viewfeed.js:679 js/viewfeed.js:701 js/viewfeed.js:722 js/viewfeed.js:781
+#: js/viewfeed.js:809
 msgid "No articles are selected."
 msgstr ""
 
-#: js/viewfeed.js:927
+#: js/viewfeed.js:929
 #, perl-format
 msgid "Delete %d selected article in %s?"
 msgid_plural "Delete %d selected articles in %s?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/viewfeed.js:929
+#: js/viewfeed.js:931
 #, perl-format
 msgid "Delete %d selected article?"
 msgid_plural "Delete %d selected articles?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/viewfeed.js:966
+#: js/viewfeed.js:968
 #, perl-format
 msgid "Archive %d selected article in %s?"
 msgid_plural "Archive %d selected articles in %s?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/viewfeed.js:969
+#: js/viewfeed.js:971
 #, perl-format
 msgid "Move %d archived article back?"
 msgid_plural "Move %d archived articles back?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/viewfeed.js:971
+#: js/viewfeed.js:973
 msgid ""
 "Please note that unstarred articles might get purged on next feed update."
 msgstr ""
 
-#: js/viewfeed.js:1011
+#: js/viewfeed.js:1013
 #, perl-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/viewfeed.js:1031
+#: js/viewfeed.js:1033
 msgid "Edit article Tags"
 msgstr ""
 
-#: js/viewfeed.js:1037
+#: js/viewfeed.js:1039
 msgid "Saving article tags..."
 msgstr ""
 
-#: js/viewfeed.js:1670
+#: js/viewfeed.js:1672
 msgid "Open original article"
 msgstr ""
 
-#: js/viewfeed.js:1677
+#: js/viewfeed.js:1679
 msgid "Display article URL"
 msgstr ""
 
-#: js/viewfeed.js:1787
+#: js/viewfeed.js:1789
 msgid "Assign label"
 msgstr ""
 
-#: js/viewfeed.js:1792
+#: js/viewfeed.js:1794
 msgid "Remove label"
 msgstr ""
 
-#: js/viewfeed.js:1824
+#: js/viewfeed.js:1826
 msgid "Select articles in group"
 msgstr ""
 
-#: js/viewfeed.js:1834
+#: js/viewfeed.js:1836
 msgid "Mark group as read"
 msgstr ""
 
-#: js/viewfeed.js:1846
+#: js/viewfeed.js:1848
 msgid "Mark feed as read"
 msgstr ""
 
-#: js/viewfeed.js:1899
+#: js/viewfeed.js:1901
 msgid "Please enter new score for selected articles:"
 msgstr ""
 
-#: js/viewfeed.js:1962
+#: js/viewfeed.js:1964
 msgid "Please enter new score for this article:"
 msgstr ""
 
-#: js/viewfeed.js:1993
+#: js/viewfeed.js:1995
 msgid "Article URL:"
 msgstr ""
 
-#: plugins/instances/instances.js:10
-msgid "Link Instance"
-msgstr ""
-
-#: plugins/instances/instances.js:73
-msgid "Edit Instance"
-msgstr ""
-
-#: plugins/instances/instances.js:122
-msgid "Remove selected instances?"
-msgstr ""
-
-#: plugins/instances/instances.js:125
-msgid "Removing selected instances..."
-msgstr ""
-
-#: plugins/instances/instances.js:139 plugins/instances/instances.js:151
-msgid "No instances are selected."
-msgstr ""
-
-#: plugins/instances/instances.js:156
-msgid "Please select only one instance."
-msgstr ""
-
-#: plugins/note/note.js:17
-msgid "Saving article note..."
-msgstr ""
-
-#: plugins/af_psql_trgm/init.js:11
-msgid "Related articles"
+#: plugins/embed_original/init.js:6
+msgid "Sorry, your browser does not support sandboxed iframes."
 msgstr ""
 
 #: plugins/import_export/import_export.js:13
@@ -3093,10 +2982,14 @@ msgstr ""
 msgid "Please choose the file first."
 msgstr ""
 
-#: plugins/mail/mail.js:21 plugins/mailto/init.js:21
+#: plugins/mailto/init.js:21 plugins/mail/mail.js:21
 msgid "Forward article by email"
 msgstr ""
 
+#: plugins/af_psql_trgm/init.js:11
+msgid "Related articles"
+msgstr ""
+
 #: plugins/mail/mail.js:36
 msgid "Error sending email:"
 msgstr ""
@@ -3105,10 +2998,6 @@ msgstr ""
 msgid "Your message has been sent."
 msgstr ""
 
-#: plugins/embed_original/init.js:6
-msgid "Sorry, your browser does not support sandboxed iframes."
-msgstr ""
-
 #: plugins/shorten_expanded/init.js:39
 msgid "Click to expand article"
 msgstr ""
@@ -3137,7 +3026,7 @@ msgstr ""
 msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr ""
 
-#: plugins/share/share_prefs.js:6 js/prefs.js:1437
+#: plugins/share/share_prefs.js:6 js/prefs.js:1433
 msgid "Clearing URLs..."
 msgstr ""
 
@@ -3145,20 +3034,36 @@ msgstr ""
 msgid "Shared URLs cleared."
 msgstr ""
 
-#: js/feedlist.js:429 js/feedlist.js:496
+#: plugins/note/note.js:17
+msgid "Saving article note..."
+msgstr ""
+
+#: js/feedlist.js:429
 msgid "Mark all articles in %s as read?"
 msgstr ""
 
 #: js/feedlist.js:487
-msgid "Mark all articles in %s older than 1 day as read?"
+msgid "Mark %w in %s older than 1 day as read?"
 msgstr ""
 
 #: js/feedlist.js:490
-msgid "Mark all articles in %s older than 1 week as read?"
+msgid "Mark %w in %s older than 1 week as read?"
 msgstr ""
 
 #: js/feedlist.js:493
-msgid "Mark all articles in %s older than 2 weeks as read?"
+msgid "Mark %w in %s older than 2 weeks as read?"
+msgstr ""
+
+#: js/feedlist.js:496
+msgid "Mark %w in %s as read?"
+msgstr ""
+
+#: js/feedlist.js:499
+msgid "search results"
+msgstr ""
+
+#: js/feedlist.js:499
+msgid "all articles"
 msgstr ""
 
 #: js/functions.js:506
@@ -3243,167 +3148,167 @@ msgstr ""
 msgid "Edit rule"
 msgstr ""
 
-#: js/functions.js:1402
+#: js/functions.js:1381
 msgid "Edit Feed"
 msgstr ""
 
-#: js/functions.js:1435
+#: js/functions.js:1414
 msgid "More Feeds"
 msgstr ""
 
-#: js/functions.js:1631
+#: js/functions.js:1610
 msgid "Help"
 msgstr ""
 
-#: js/prefs.js:1032
+#: js/prefs.js:1028
 msgid ""
 "Remove category %s? Any nested feeds would be placed into Uncategorized."
 msgstr ""
 
-#: js/prefs.js:1038
+#: js/prefs.js:1034
 msgid "Removing category..."
 msgstr ""
 
-#: js/prefs.js:1056
+#: js/prefs.js:1052
 msgid "Remove selected categories?"
 msgstr ""
 
-#: js/prefs.js:1059
+#: js/prefs.js:1055
 msgid "Removing selected categories..."
 msgstr ""
 
-#: js/prefs.js:1072
+#: js/prefs.js:1068
 msgid "No categories are selected."
 msgstr ""
 
-#: js/prefs.js:1079
+#: js/prefs.js:1075
 msgid "Category title:"
 msgstr ""
 
-#: js/prefs.js:1083
+#: js/prefs.js:1079
 msgid "Creating category..."
 msgstr ""
 
-#: js/prefs.js:1106
+#: js/prefs.js:1102
 msgid "Feeds without recent updates"
 msgstr ""
 
-#: js/prefs.js:1150
+#: js/prefs.js:1146
 msgid "Replace current OPML publishing address with a new one?"
 msgstr ""
 
-#: js/prefs.js:1227
+#: js/prefs.js:1223
 msgid "Clearing feed..."
 msgstr ""
 
-#: js/prefs.js:1247
+#: js/prefs.js:1243
 msgid "Rescore articles in selected feeds?"
 msgstr ""
 
-#: js/prefs.js:1250
+#: js/prefs.js:1246
 msgid "Rescoring selected feeds..."
 msgstr ""
 
-#: js/prefs.js:1270
+#: js/prefs.js:1266
 msgid "Rescore all articles? This operation may take a lot of time."
 msgstr ""
 
-#: js/prefs.js:1273
+#: js/prefs.js:1269
 msgid "Rescoring feeds..."
 msgstr ""
 
-#: js/prefs.js:1289
+#: js/prefs.js:1285
 msgid "Reset selected labels to default colors?"
 msgstr ""
 
-#: js/prefs.js:1321
+#: js/prefs.js:1317
 msgid "Settings Profiles"
 msgstr ""
 
-#: js/prefs.js:1330
+#: js/prefs.js:1326
 msgid ""
 "Remove selected profiles? Active and default profiles will not be removed."
 msgstr ""
 
-#: js/prefs.js:1333
+#: js/prefs.js:1329
 msgid "Removing selected profiles..."
 msgstr ""
 
-#: js/prefs.js:1349
+#: js/prefs.js:1345
 msgid "No profiles are selected."
 msgstr ""
 
-#: js/prefs.js:1357 js/prefs.js:1410
+#: js/prefs.js:1353 js/prefs.js:1406
 msgid "Activate selected profile?"
 msgstr ""
 
-#: js/prefs.js:1374 js/prefs.js:1426
+#: js/prefs.js:1370 js/prefs.js:1422
 msgid "Please choose a profile to activate."
 msgstr ""
 
-#: js/prefs.js:1379
+#: js/prefs.js:1375
 msgid "Creating profile..."
 msgstr ""
 
-#: js/prefs.js:1434
+#: js/prefs.js:1430
 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr ""
 
-#: js/prefs.js:1444
+#: js/prefs.js:1440
 msgid "Generated URLs cleared."
 msgstr ""
 
-#: js/prefs.js:1516
+#: js/prefs.js:1512
 msgid "Label Editor"
 msgstr ""
 
-#: js/tt-rss.js:684
+#: js/tt-rss.js:685
 msgid "You can't unsubscribe from the category."
 msgstr ""
 
-#: js/viewfeed.js:125 js/viewfeed.js:175 js/viewfeed.js:192
+#: js/viewfeed.js:127 js/viewfeed.js:177 js/viewfeed.js:194
 msgid "Click to open next unread feed."
 msgstr ""
 
-#: js/viewfeed.js:129
+#: js/viewfeed.js:131
 msgid "Cancel search"
 msgstr ""
 
-#: js/viewfeed.js:189
+#: js/viewfeed.js:191
 msgid "New articles found, reload feed to continue."
 msgstr ""
 
-#: js/viewfeed.js:424
+#: js/viewfeed.js:426
 msgid "Unstar article"
 msgstr ""
 
-#: js/viewfeed.js:428
+#: js/viewfeed.js:430
 msgid "Star article"
 msgstr ""
 
-#: js/viewfeed.js:478
+#: js/viewfeed.js:480
 msgid "Unpublish article"
 msgstr ""
 
-#: js/viewfeed.js:482
+#: js/viewfeed.js:484
 msgid "Publish article"
 msgstr ""
 
-#: js/viewfeed.js:622
+#: js/viewfeed.js:624
 msgid "%d article selected"
 msgid_plural "%d articles selected"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/viewfeed.js:1286
+#: js/viewfeed.js:1288
 msgid "No article is selected."
 msgstr ""
 
-#: js/viewfeed.js:1321
+#: js/viewfeed.js:1323
 msgid "No articles found to mark"
 msgstr ""
 
-#: js/viewfeed.js:1323
+#: js/viewfeed.js:1325
 msgid "Mark %d article as read?"
 msgid_plural "Mark %d articles as read?"
 msgstr[0] ""